diff --git a/PackagesList.cmake b/PackagesList.cmake index 6fedb8c49f6c..0f0ba4492a14 100644 --- a/PackagesList.cmake +++ b/PackagesList.cmake @@ -93,7 +93,7 @@ TRIBITS_REPOSITORY_DEFINE_PACKAGES( Galeri packages/galeri PT Amesos packages/amesos PT Pamgen packages/pamgen PT - Zoltan2 packages/zoltan2 PT + Zoltan2Core packages/zoltan2/core PT Ifpack packages/ifpack PT ML packages/ml PT Belos packages/belos PT @@ -121,6 +121,8 @@ TRIBITS_REPOSITORY_DEFINE_PACKAGES( NOX packages/nox PT Moertel packages/moertel ST MueLu packages/muelu PT + Zoltan2Sphynx packages/zoltan2/sphynx PT + Zoltan2 packages/zoltan2 PT ShyLU_DD packages/shylu/shylu_dd PT ShyLU packages/shylu PT Rythmos packages/rythmos PT diff --git a/cmake/ctest/drivers/atdm/TrilinosCTestDriverCore.atdm.cmake b/cmake/ctest/drivers/atdm/TrilinosCTestDriverCore.atdm.cmake index a6995cd600b0..27140d1ec6a3 100644 --- a/cmake/ctest/drivers/atdm/TrilinosCTestDriverCore.atdm.cmake +++ b/cmake/ctest/drivers/atdm/TrilinosCTestDriverCore.atdm.cmake @@ -83,7 +83,8 @@ MACRO(TRILINOS_SYSTEM_SPECIFIC_CTEST_DRIVER) PRINT_VAR(ATDM_CONFIGURE_OPTIONS_FILES) MESSAGE("Include the configure options files at the top level to influence what package get enabled or disabled ...") - FOREACH (CONFIG_OPTIONS_FILE ${ATDM_CONFIGURE_OPTIONS_FILES}) + SPLIT("${ATDM_CONFIGURE_OPTIONS_FILES}" "," ATDM_CONFIGURE_OPTIONS_FILES_LIST) + FOREACH (CONFIG_OPTIONS_FILE ${ATDM_CONFIGURE_OPTIONS_FILES_LIST}) SET(CONFIG_OPTIONS_FILE "${TRIBITS_PROJECT_ROOT}/${CONFIG_OPTIONS_FILE}") MESSAGE("Including ${CONFIG_OPTIONS_FILE} ...") INCLUDE("${CONFIG_OPTIONS_FILE}") @@ -93,15 +94,17 @@ MACRO(TRILINOS_SYSTEM_SPECIFIC_CTEST_DRIVER) STRING(REGEX MATCH "panzer" ATDM_PANZER_IN_JOB_NAME "${CTEST_BUILD_NAME}" ) - IF (ATDM_ENABLE_ALL_PACKAGES) + IF (NOT "${Trilinos_PACKAGES}" STREQUAL "") + MESSAGE("Trilinos_PACKAGES is aleady set so use it!") + ELSEIF (ATDM_ENABLE_ALL_PACKAGES) MESSAGE("Enabling all packages by default!") - SET(Trilinos_PACKAGES) + SET(Trilinos_PACKAGES "") ELSEIF (ATDM_PANZER_IN_JOB_NAME) MESSAGE("Found 'panzer' in JOB_NAME, enabling only Panzer tests") SET(Trilinos_PACKAGES Panzer) ELSE() MESSAGE("Enabling all packages not otherwise disabled!") - SET(Trilinos_PACKAGES) + SET(Trilinos_PACKAGES "") # Implicitly allow the enable of all packages that are not otherwise # disabled by the (indirect) include of ATDMDisables.cmake. ENDIF() diff --git a/cmake/ctest/drivers/atdm/ats2/drivers/Trilinos-atdm-ats2-cuda-10.1.243-xl-2020.03.18_spmpi-rolling_static_dbg.sh b/cmake/ctest/drivers/atdm/ats2/drivers/Trilinos-atdm-ats2-cuda-10.1.243-xl-2020.03.18_spmpi-rolling_static_dbg.sh new file mode 100755 index 000000000000..6b10a052a784 --- /dev/null +++ b/cmake/ctest/drivers/atdm/ats2/drivers/Trilinos-atdm-ats2-cuda-10.1.243-xl-2020.03.18_spmpi-rolling_static_dbg.sh @@ -0,0 +1,6 @@ +#!/bin/bash +if [ "${Trilinos_TRACK}" == "" ] ; then + export Trilinos_TRACK=ATDM +fi + +$WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/ats2/local-driver.sh diff --git a/cmake/ctest/drivers/atdm/ats2/drivers/Trilinos-atdm-ats2-cuda-10.1.243-xl-2020.03.18_spmpi-rolling_static_opt.sh b/cmake/ctest/drivers/atdm/ats2/drivers/Trilinos-atdm-ats2-cuda-10.1.243-xl-2020.03.18_spmpi-rolling_static_opt.sh new file mode 100755 index 000000000000..6b10a052a784 --- /dev/null +++ b/cmake/ctest/drivers/atdm/ats2/drivers/Trilinos-atdm-ats2-cuda-10.1.243-xl-2020.03.18_spmpi-rolling_static_opt.sh @@ -0,0 +1,6 @@ +#!/bin/bash +if [ "${Trilinos_TRACK}" == "" ] ; then + export Trilinos_TRACK=ATDM +fi + +$WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/ats2/local-driver.sh diff --git a/cmake/ctest/drivers/atdm/ats2/drivers/Trilinos-atdm-ats2-xl-2020.03.18_spmpi-rolling_serial_static_dbg.sh b/cmake/ctest/drivers/atdm/ats2/drivers/Trilinos-atdm-ats2-xl-2020.03.18_spmpi-rolling_serial_static_dbg.sh new file mode 100755 index 000000000000..6b10a052a784 --- /dev/null +++ b/cmake/ctest/drivers/atdm/ats2/drivers/Trilinos-atdm-ats2-xl-2020.03.18_spmpi-rolling_serial_static_dbg.sh @@ -0,0 +1,6 @@ +#!/bin/bash +if [ "${Trilinos_TRACK}" == "" ] ; then + export Trilinos_TRACK=ATDM +fi + +$WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/ats2/local-driver.sh diff --git a/cmake/ctest/drivers/atdm/ats2/drivers/Trilinos-atdm-ats2-xl-2020.03.18_spmpi-rolling_serial_static_opt.sh b/cmake/ctest/drivers/atdm/ats2/drivers/Trilinos-atdm-ats2-xl-2020.03.18_spmpi-rolling_serial_static_opt.sh new file mode 100755 index 000000000000..6b10a052a784 --- /dev/null +++ b/cmake/ctest/drivers/atdm/ats2/drivers/Trilinos-atdm-ats2-xl-2020.03.18_spmpi-rolling_serial_static_opt.sh @@ -0,0 +1,6 @@ +#!/bin/bash +if [ "${Trilinos_TRACK}" == "" ] ; then + export Trilinos_TRACK=ATDM +fi + +$WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/ats2/local-driver.sh diff --git a/cmake/ctest/drivers/atdm/ats2/local-driver.sh b/cmake/ctest/drivers/atdm/ats2/local-driver.sh index 5b83276d884a..8a87fc9e5d12 100755 --- a/cmake/ctest/drivers/atdm/ats2/local-driver.sh +++ b/cmake/ctest/drivers/atdm/ats2/local-driver.sh @@ -5,6 +5,22 @@ set +x # Need to load env so we define some vars source $WORKSPACE/Trilinos/cmake/std/atdm/load-env.sh $JOB_NAME +# Make adjustments for the XL builds +if atdm_match_buildname_keyword xl ; then + echo "This is an XL build!" + # For XL, do not build tests and examples by default. + if [[ "${Trilinos_INNER_ENABLE_TESTS}" == "" ]]; then + export Trilinos_INNER_ENABLE_TESTS=OFF + fi + # Don't do the cuda-aware build for the XL builds if you are not building + # internal tests and examples. + if [[ "${Trilinos_INNER_ENABLE_TESTS}" == "OFF" ]]; then + export Trilinos_CTEST_RUN_CUDA_AWARE_MPI=0 + fi + # Only enable the SPARC packages by default + export ATDM_CONFIG_CONFIGURE_OPTIONS_FILES=cmake/std/atdm/ATDMDevEnv.cmake,cmake/std/atdm/apps/sparc/SPARC_Trilinos_PACKAGES.cmake +fi + echo echo "Current node type: $(atdm_ats2_get_node_type)" echo diff --git a/cmake/ctest/drivers/atdm/cee-rhel6/drivers/Trilinos-atdm-cee-rhel6_cuda-10.1.243_gcc-7.2.0_openmpi-4.0.3_shared_dbg.sh b/cmake/ctest/drivers/atdm/cee-rhel6/drivers/Trilinos-atdm-cee-rhel6_cuda-10.1.243_gcc-7.2.0_openmpi-4.0.3_shared_dbg.sh new file mode 100755 index 000000000000..d78c54f104c3 --- /dev/null +++ b/cmake/ctest/drivers/atdm/cee-rhel6/drivers/Trilinos-atdm-cee-rhel6_cuda-10.1.243_gcc-7.2.0_openmpi-4.0.3_shared_dbg.sh @@ -0,0 +1,3 @@ +#!/bin/bash +export Trilinos_TRACK=Specialized +$WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/cee-rhel6/local-driver.sh diff --git a/cmake/ctest/drivers/atdm/cee-rhel6/drivers/Trilinos-atdm-cee-rhel6_cuda-10.1.243_gcc-7.2.0_openmpi-4.0.3_shared_opt.sh b/cmake/ctest/drivers/atdm/cee-rhel6/drivers/Trilinos-atdm-cee-rhel6_cuda-10.1.243_gcc-7.2.0_openmpi-4.0.3_shared_opt.sh new file mode 100755 index 000000000000..d78c54f104c3 --- /dev/null +++ b/cmake/ctest/drivers/atdm/cee-rhel6/drivers/Trilinos-atdm-cee-rhel6_cuda-10.1.243_gcc-7.2.0_openmpi-4.0.3_shared_opt.sh @@ -0,0 +1,3 @@ +#!/bin/bash +export Trilinos_TRACK=Specialized +$WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/cee-rhel6/local-driver.sh diff --git a/cmake/ctest/drivers/atdm/cee-rhel6/drivers/Trilinos-atdm-cee-rhel6_mini-no-mpi_clang-9.0.1_serial_static_opt.sh b/cmake/ctest/drivers/atdm/cee-rhel6/drivers/Trilinos-atdm-cee-rhel6_mini-no-mpi_clang-9.0.1_serial_static_opt.sh new file mode 100755 index 000000000000..e1431e1bbd8b --- /dev/null +++ b/cmake/ctest/drivers/atdm/cee-rhel6/drivers/Trilinos-atdm-cee-rhel6_mini-no-mpi_clang-9.0.1_serial_static_opt.sh @@ -0,0 +1,3 @@ +#!/bin/bash +export Trilinos_TRACK=ATDM +$WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/cee-rhel6/local-driver.sh diff --git a/cmake/ctest/drivers/atdm/cee-rhel6/drivers/Trilinos-atdm-cee-rhel6_mini-no-mpi_cuda-10.1.243_gcc-7.2.0_static_opt.sh b/cmake/ctest/drivers/atdm/cee-rhel6/drivers/Trilinos-atdm-cee-rhel6_mini-no-mpi_cuda-10.1.243_gcc-7.2.0_static_opt.sh new file mode 100755 index 000000000000..e1431e1bbd8b --- /dev/null +++ b/cmake/ctest/drivers/atdm/cee-rhel6/drivers/Trilinos-atdm-cee-rhel6_mini-no-mpi_cuda-10.1.243_gcc-7.2.0_static_opt.sh @@ -0,0 +1,3 @@ +#!/bin/bash +export Trilinos_TRACK=ATDM +$WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/cee-rhel6/local-driver.sh diff --git a/cmake/ctest/drivers/atdm/cee-rhel6/drivers/Trilinos-atdm-cee-rhel6_mini-no-mpi_gnu-7.2.0_serial_static_opt.sh b/cmake/ctest/drivers/atdm/cee-rhel6/drivers/Trilinos-atdm-cee-rhel6_mini-no-mpi_gnu-7.2.0_serial_static_opt.sh new file mode 100755 index 000000000000..e1431e1bbd8b --- /dev/null +++ b/cmake/ctest/drivers/atdm/cee-rhel6/drivers/Trilinos-atdm-cee-rhel6_mini-no-mpi_gnu-7.2.0_serial_static_opt.sh @@ -0,0 +1,3 @@ +#!/bin/bash +export Trilinos_TRACK=ATDM +$WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/cee-rhel6/local-driver.sh diff --git a/cmake/ctest/drivers/atdm/cee-rhel6/drivers/Trilinos-atdm-cee-rhel6_mini-no-mpi_intel-18.0.2_mpich2-3.2_static_opt.sh b/cmake/ctest/drivers/atdm/cee-rhel6/drivers/Trilinos-atdm-cee-rhel6_mini-no-mpi_intel-18.0.2_mpich2-3.2_static_opt.sh new file mode 100755 index 000000000000..e1431e1bbd8b --- /dev/null +++ b/cmake/ctest/drivers/atdm/cee-rhel6/drivers/Trilinos-atdm-cee-rhel6_mini-no-mpi_intel-18.0.2_mpich2-3.2_static_opt.sh @@ -0,0 +1,3 @@ +#!/bin/bash +export Trilinos_TRACK=ATDM +$WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/cee-rhel6/local-driver.sh diff --git a/cmake/ctest/drivers/atdm/cee-rhel6/drivers/Trilinos-atdm-cee-rhel6_mini_clang-9.0.1_openmpi-4.0.3_serial_static_opt.sh b/cmake/ctest/drivers/atdm/cee-rhel6/drivers/Trilinos-atdm-cee-rhel6_mini_clang-9.0.1_openmpi-4.0.3_serial_static_opt.sh new file mode 100755 index 000000000000..e1431e1bbd8b --- /dev/null +++ b/cmake/ctest/drivers/atdm/cee-rhel6/drivers/Trilinos-atdm-cee-rhel6_mini_clang-9.0.1_openmpi-4.0.3_serial_static_opt.sh @@ -0,0 +1,3 @@ +#!/bin/bash +export Trilinos_TRACK=ATDM +$WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/cee-rhel6/local-driver.sh diff --git a/cmake/ctest/drivers/atdm/cee-rhel6/drivers/Trilinos-atdm-cee-rhel6_mini_cuda-10.1.243_gcc-7.2.0_openmpi-4.0.3_static_dbg.sh b/cmake/ctest/drivers/atdm/cee-rhel6/drivers/Trilinos-atdm-cee-rhel6_mini_cuda-10.1.243_gcc-7.2.0_openmpi-4.0.3_static_dbg.sh new file mode 100755 index 000000000000..e1431e1bbd8b --- /dev/null +++ b/cmake/ctest/drivers/atdm/cee-rhel6/drivers/Trilinos-atdm-cee-rhel6_mini_cuda-10.1.243_gcc-7.2.0_openmpi-4.0.3_static_dbg.sh @@ -0,0 +1,3 @@ +#!/bin/bash +export Trilinos_TRACK=ATDM +$WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/cee-rhel6/local-driver.sh diff --git a/cmake/ctest/drivers/atdm/cee-rhel6/drivers/Trilinos-atdm-cee-rhel6_mini_cuda-10.1.243_gcc-7.2.0_openmpi-4.0.3_static_opt.sh b/cmake/ctest/drivers/atdm/cee-rhel6/drivers/Trilinos-atdm-cee-rhel6_mini_cuda-10.1.243_gcc-7.2.0_openmpi-4.0.3_static_opt.sh new file mode 100755 index 000000000000..e1431e1bbd8b --- /dev/null +++ b/cmake/ctest/drivers/atdm/cee-rhel6/drivers/Trilinos-atdm-cee-rhel6_mini_cuda-10.1.243_gcc-7.2.0_openmpi-4.0.3_static_opt.sh @@ -0,0 +1,3 @@ +#!/bin/bash +export Trilinos_TRACK=ATDM +$WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/cee-rhel6/local-driver.sh diff --git a/cmake/ctest/drivers/atdm/cee-rhel6/drivers/Trilinos-atdm-cee-rhel6_mini_gnu-7.2.0_openmpi-4.0.3_serial_static_opt.sh b/cmake/ctest/drivers/atdm/cee-rhel6/drivers/Trilinos-atdm-cee-rhel6_mini_gnu-7.2.0_openmpi-4.0.3_serial_static_opt.sh new file mode 100755 index 000000000000..e1431e1bbd8b --- /dev/null +++ b/cmake/ctest/drivers/atdm/cee-rhel6/drivers/Trilinos-atdm-cee-rhel6_mini_gnu-7.2.0_openmpi-4.0.3_serial_static_opt.sh @@ -0,0 +1,3 @@ +#!/bin/bash +export Trilinos_TRACK=ATDM +$WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/cee-rhel6/local-driver.sh diff --git a/cmake/ctest/drivers/atdm/cee-rhel6/drivers/Trilinos-atdm-cee-rhel6_mini_intel-18.0.2_mpich2-3.2_static_opt.sh b/cmake/ctest/drivers/atdm/cee-rhel6/drivers/Trilinos-atdm-cee-rhel6_mini_intel-18.0.2_mpich2-3.2_static_opt.sh new file mode 100755 index 000000000000..e1431e1bbd8b --- /dev/null +++ b/cmake/ctest/drivers/atdm/cee-rhel6/drivers/Trilinos-atdm-cee-rhel6_mini_intel-18.0.2_mpich2-3.2_static_opt.sh @@ -0,0 +1,3 @@ +#!/bin/bash +export Trilinos_TRACK=ATDM +$WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/cee-rhel6/local-driver.sh diff --git a/cmake/ctest/drivers/atdm/cee-rhel6/local-driver.sh b/cmake/ctest/drivers/atdm/cee-rhel6/local-driver.sh index 8525a02b27f1..e8088966c1f6 100755 --- a/cmake/ctest/drivers/atdm/cee-rhel6/local-driver.sh +++ b/cmake/ctest/drivers/atdm/cee-rhel6/local-driver.sh @@ -1,7 +1,17 @@ #!/bin/bash -l -if [ "${Trilinos_CTEST_DO_ALL_AT_ONCE}" == "" ] ; then - export Trilinos_CTEST_DO_ALL_AT_ONCE=TRUE +set +x + +# Need to load env so we define some vars +source $WORKSPACE/Trilinos/cmake/std/atdm/load-env.sh $JOB_NAME + +# Make adjustments for mini build of Trilinos for SPARC +if atdm_match_buildname_keyword mini ; then + echo "This is a mini build of Trilinos for SPARC!" + export ATDM_CONFIG_CONFIGURE_OPTIONS_FILES=cmake/std/atdm/apps/sparc/SPARC_MiniTrilinos_PACKAGES.cmake,cmake/std/atdm/ATDMDevEnv.cmake + # NOTE: Above, we list SPARC_MiniTrilinos_PACKAGES.cmake before + # ATDMDevEnv.cmake so that defaults for cache vars are set there before they + # get set in ATDMDevEnv.cmake. fi set -x diff --git a/cmake/ctest/drivers/atdm/van1-tx2/drivers/Trilinos-atdm-van1-tx2_arm-20.1_openmpi-4.0.3_openmp_static_dbg.sh b/cmake/ctest/drivers/atdm/van1-tx2/drivers/Trilinos-atdm-van1-tx2_arm-20.1_openmpi-4.0.3_openmp_static_dbg.sh new file mode 100755 index 000000000000..eb51b2f6586a --- /dev/null +++ b/cmake/ctest/drivers/atdm/van1-tx2/drivers/Trilinos-atdm-van1-tx2_arm-20.1_openmpi-4.0.3_openmp_static_dbg.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +#export SALLOC_CTEST_TIME_LIMIT_MINUTES=1:00:00 + +if [ "${Trilinos_TRACK}" == "" ] ; then + export Trilinos_TRACK=Specialized +fi + +$WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/van1-tx2/local-driver.sh diff --git a/cmake/ctest/drivers/atdm/van1-tx2/drivers/Trilinos-atdm-van1-tx2_arm-20.1_openmpi-4.0.3_openmp_static_opt.sh b/cmake/ctest/drivers/atdm/van1-tx2/drivers/Trilinos-atdm-van1-tx2_arm-20.1_openmpi-4.0.3_openmp_static_opt.sh new file mode 100755 index 000000000000..eb51b2f6586a --- /dev/null +++ b/cmake/ctest/drivers/atdm/van1-tx2/drivers/Trilinos-atdm-van1-tx2_arm-20.1_openmpi-4.0.3_openmp_static_opt.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +#export SALLOC_CTEST_TIME_LIMIT_MINUTES=1:00:00 + +if [ "${Trilinos_TRACK}" == "" ] ; then + export Trilinos_TRACK=Specialized +fi + +$WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/van1-tx2/local-driver.sh diff --git a/cmake/ctest/drivers/geminga/ctest_linux_nightly_mpi_debug_muelu_coverage_geminga.cmake b/cmake/ctest/drivers/geminga/ctest_linux_nightly_mpi_debug_muelu_coverage_geminga.cmake index c6ae269965e2..ff90d7b26234 100644 --- a/cmake/ctest/drivers/geminga/ctest_linux_nightly_mpi_debug_muelu_coverage_geminga.cmake +++ b/cmake/ctest/drivers/geminga/ctest_linux_nightly_mpi_debug_muelu_coverage_geminga.cmake @@ -83,6 +83,7 @@ SET(EXTRA_CONFIGURE_OPTIONS "-DMueLu_ENABLE_Experimental=ON" "-DXpetra_ENABLE_Experimental=ON" "-DTeuchos_GLOBALLY_REDUCE_UNITTEST_RESULTS=ON" + "-DTrilinos_EXTRA_LINK_FLAGS='-lgcov'" ) # diff --git a/cmake/std/PullRequestLinuxClang10.0.0TestingSettings.cmake b/cmake/std/PullRequestLinuxClang10.0.0TestingSettings.cmake new file mode 100644 index 000000000000..60a5534ca3e3 --- /dev/null +++ b/cmake/std/PullRequestLinuxClang10.0.0TestingSettings.cmake @@ -0,0 +1,39 @@ +# This file contains the options needed to both run the pull request testing +# for Trilinos for the Linux Clang 10.0.0 pull request testing builds, and to reproduce +# the errors reported by those builds. Prior to using this this file, the +# appropriate set of SEMS modules must be loaded and accessible through the +# SEMS NFS mount. (See the sems/PullRequest*TestingEnv.sh files.) + +# Usage: cmake -C PullRequestLinuxClang10.0.0TestingSettings.cmake + +# Misc options typically added by CI testing mode in TriBITS + +# Use the below option only when submitting to the dashboard +#set (CTEST_USE_LAUNCHERS ON CACHE BOOL "Set by default for PR testing") + +#set (TPL_ENABLE_Netcdf OFF CACHE BOOL "Turn off for Clang") + +#set (TPL_Netcdf_LIBRARIES "-L$ENV{SEMS_NETCDF_ROOT}/lib;-L$ENV{SEMS_HDF5_ROOT}/lib;$ENV{SEMS_NETCDF_ROOT}/lib/libnetcdf.a;$ENV{SEMS_NETCDF_ROOT}/lib/libpnetcdf.a;$ENV{SEMS_HDF5_ROOT}/lib/libhdf5_hl.a;$ENV{SEMS_HDF5_ROOT}/lib/libhdf5.a;-lz;-ldl;-lcurl" CACHE STRING "Set by default for CUDA PR testing") + +set (MPI_EXEC_PRE_NUMPROCS_FLAGS "--bind-to;none" CACHE STRING "Set by default for PR testing") +# NOTE: The above is a workaround for the problem of having threads on MPI +# ranks bind to the same cores (see #2422). + +# Disable just one Teko sub-unit test that fails with openmpi 1.10 (#2712) +set (Teko_DISABLE_LSCSTABALIZED_TPETRA_ALPAH_INV_D ON CACHE BOOL "Temporarily disabled in PR testing") + +# Disable three ShyLu_DD tests - see #2691 +set (ShyLU_DDFROSch_test_frosch_laplacian_epetra_2d_gdsw_MPI_4_DISABLE ON CACHE BOOL "Temporarily disabled in PR testing") +set (ShyLU_DDFROSch_test_frosch_laplacian_epetra_2d_rgdsw_MPI_4_DISABLE ON CACHE BOOL "Temporarily disabled in PR testing") +set (ShyLU_DDFROSch_test_frosch_interfacesets_2D_MPI_4_DISABLE ON CACHE BOOL "Temporarily disabled in PR testing") + +include("${CMAKE_CURRENT_LIST_DIR}/PullRequestLinuxCommonTestingSettings.cmake") + +#Disable for clang +set(FEI_elemDOF_Aztec_MPI_2_DISABLE ON CACHE BOOL "Temporarily disabled in PR testing") +set(FEI_lagrange_20quad_old_MPI_2_DISABLE ON CACHE BOOL "Temporarily disabled in PR testing") +set(FEI_lagrange_20quad_old_MPI_4_DISABLE ON CACHE BOOL "Temporarily disabled in PR testing") +set(FEI_multifield_vbr_az_MPI_2_DISABLE ON CACHE BOOL "Temporarily disabled in PR testing") +set(FEI_multifield_vbr_az_MPI_3_DISABLE ON CACHE BOOL "Temporarily disabled in PR testing") +set(ROL_example_PinT_parabolic-control_example_01_MPI_1_DISABLE ON CACHE BOOL "Temporarily disabled in PR testing") +set(Rythmos_StepperBuilder_UnitTest_MPI_1_DISABLE ON CACHE BOOL "Temporarily disabled in PR testing") diff --git a/cmake/std/PullRequestLinuxCuda9.2TestingSettings.cmake b/cmake/std/PullRequestLinuxCuda9.2TestingSettings.cmake index 18eb6fe0c67a..7cf0790b3835 100644 --- a/cmake/std/PullRequestLinuxCuda9.2TestingSettings.cmake +++ b/cmake/std/PullRequestLinuxCuda9.2TestingSettings.cmake @@ -73,6 +73,11 @@ set (TPL_ENABLE_BoostLib OFF CACHE BOOL "Set by default for CUDA PR testing") set (TPL_ENABLE_Matio OFF CACHE BOOL "Set by default for CUDA PR testing") set (TPL_DLlib_LIBRARIES "-ldl" CACHE FILEPATH "Set by default for CUDA PR testing") +# The compile times for two Panzer files went up to over 6 hours. This +# turns off one feature that allows these in about 24 minutes. Please remove +# when issue #7532 is resolved. +set (Sacado_NEW_FAD_DESIGN_IS_DEFAULT OFF CACHE BOOL "Temporary fix for issue #7532" ) + # Disable some packages that can't be tested with this PR build set (Trilinos_ENABLE_ShyLU_NodeTacho OFF CACHE BOOL "Can't test Tacho with CUDA without RDC" FORCE) diff --git a/cmake/std/PullRequestLinuxCudaDriver.sh b/cmake/std/PullRequestLinuxCudaDriver.sh index 81fc06d711f3..067fc0d91c9f 100755 --- a/cmake/std/PullRequestLinuxCudaDriver.sh +++ b/cmake/std/PullRequestLinuxCudaDriver.sh @@ -14,8 +14,8 @@ fi set -x #TODO: review appropriate job size -bsub -x -Is -q rhel7F -n 16 -J $JOB_NAME -W $BSUB_CTEST_TIME_LIMIT \ - $WORKSPACE/Trilinos/cmake/std/PullRequestLinuxDriver.sh +bsub -x -Is -q rhel7F -n 16 -J ${JOB_NAME} -W ${BSUB_CTEST_TIME_LIMIT} \ + ${WORKSPACE}/Trilinos/cmake/std/PullRequestLinuxDriver.sh # NOTE: Above, this bsub command should grab a single rhel7F (Firestone, # Dual-Socket POWER8, 8 cores per socket, K80 GPUs) node. The option '-x' diff --git a/cmake/std/PullRequestLinuxDriverMerge.py b/cmake/std/PullRequestLinuxDriverMerge.py index 17a3baf07af1..234a8032cf98 100755 --- a/cmake/std/PullRequestLinuxDriverMerge.py +++ b/cmake/std/PullRequestLinuxDriverMerge.py @@ -23,39 +23,40 @@ import sys sys.dont_write_bytecode = True -import os import argparse +import os import subprocess +from textwrap import dedent def write_header(): - print('''-------------------------------------------------------------------------------- -- -- Begin: PullRequestLinuxDriver-Merge.py -- ---------------------------------------------------------------------------------''', - file=sys.stdout) + print(dedent('''\ + -------------------------------------------------------------------------------- + - + - Begin: PullRequestLinuxDriver-Merge.py + - + --------------------------------------------------------------------------------''')) def echoJenkinsVars(workspace): - print(''' -================================================================================ -Jenkins Environment Variables: -- WORKSPACE : {workspace} + print(dedent('''\ + + ================================================================================ + Jenkins Environment Variables: + - WORKSPACE : {workspace} -================================================================================ -Environment: + ================================================================================ + Environment: - pwd = {cwd} -'''.format(workspace=workspace, - cwd=os.getcwd()), file=sys.stdout) + pwd = {cwd} + ''').format(workspace=workspace, cwd=os.getcwd())) for key in os.environ: print(key +' = ' + os.environ[key]) - print(''' -================================================================================''', - file=sys.stdout) + + print('\n' + 80*"=") + def parseArgs(): @@ -93,14 +94,12 @@ def merge_branch(source_url, source_branch, target_branch, sourceSHA): if 'source_remote' in remote_list: print('git remote exists, removing it', file=sys.stdout) subprocess.check_call(['git', 'remote', 'rm', 'source_remote']) - subprocess.check_call(['git', 'remote', 'add', 'source_remote', - source_url]) + subprocess.check_call(['git', 'remote', 'add', 'source_remote', source_url]) fetch_succeeded = False for i in range(3): try: - subprocess.check_call(['git', 'fetch', 'source_remote', - source_branch]) + subprocess.check_call(['git', 'fetch', 'source_remote', source_branch]) fetch_succeeded = True break except subprocess.CalledProcessError: @@ -108,28 +107,20 @@ def merge_branch(source_url, source_branch, target_branch, sourceSHA): if not fetch_succeeded: raise SystemExit(12) - subprocess.check_call(['git', 'fetch', 'origin', - target_branch]) - subprocess.check_call(['git', 'reset', '--hard', - 'HEAD']) - subprocess.check_call(['git', 'checkout', '-B', - target_branch, 'origin/' + target_branch]) - subprocess.check_call(['git', 'merge', '--no-edit', - 'source_remote/' + source_branch]), + subprocess.check_call(['git', 'fetch', 'origin', target_branch]) + subprocess.check_call(['git', 'reset', '--hard', 'HEAD']) + subprocess.check_call(['git', 'checkout', '-B', target_branch, 'origin/' + target_branch]) + subprocess.check_call(['git', 'merge', '--no-edit', 'source_remote/' + source_branch]), - actual_source_SHA = subprocess.check_output(['git', 'rev-parse', - 'source_remote/' + source_branch]) + actual_source_SHA = subprocess.check_output(['git', 'rev-parse', 'source_remote/' + source_branch]) actual_source_SHA = actual_source_SHA.strip() if actual_source_SHA != sourceSHA: print('The SHA ({source_sha}) for the last commit on branch {source_branch}'.format(source_sha=actual_source_SHA, - source_branch=source_branch), - file=sys.stdout) - print(' in repo {source_repo} is different than the expected SHA,'.format(source_repo=source_url), - file=sys.stdout) - print(' which is: {source_sha}.'.format(source_sha=sourceSHA), - file=sys.stdout) + source_branch=source_branch), file=sys.stdout) + print(' in repo {source_repo} is different than the expected SHA,'.format(source_repo=source_url), file=sys.stdout) + print(' which is: {source_sha}.'.format(source_sha=sourceSHA), file=sys.stdout) raise SystemExit(-1) @@ -143,8 +134,7 @@ def run(): os.chdir(os.path.join(arguments.workspaceDir, 'Trilinos')) print("Set CWD = {dirName}".format(dirName=os.path.join( arguments.workspaceDir, - 'Trilinos')), - file=sys.stdout) + 'Trilinos'))) write_header() echoJenkinsVars(arguments.workspaceDir) try: @@ -156,20 +146,15 @@ def run(): return_value = False except subprocess.CalledProcessError as cpe: return_value = False - print('Recieved subprocess.CalledProcessError - returned {error_num}'.format(error_num=cpe.returncode), - file=sys.stdout) - print(' from command {cmd}'.format(cmd=cpe.cmd), - file=sys.stdout) - print(' output {out}'.format(out=cpe.output), - file=sys.stdout) + print('Recieved subprocess.CalledProcessError - returned {error_num}'.format(error_num=cpe.returncode), file=sys.stdout) + print(' from command {cmd}'.format(cmd=cpe.cmd), file=sys.stdout) + print(' output {out}'.format(out=cpe.output), file=sys.stdout) try: - print(' stdout {out}'.format(out=cpe.stdout), - file=sys.stdout) + print(' stdout {out}'.format(out=cpe.stdout), file=sys.stdout) except AttributeError: pass try: - print(' stderr {eout}'.format(eout=cpe.stderr), - file=sys.stdout) + print(' stderr {eout}'.format(eout=cpe.stderr), file=sys.stdout) except AttributeError: pass diff --git a/cmake/std/PullRequestLinuxDriverTest.py b/cmake/std/PullRequestLinuxDriverTest.py index 18624f004ecb..cbe50b2f3db6 100755 --- a/cmake/std/PullRequestLinuxDriverTest.py +++ b/cmake/std/PullRequestLinuxDriverTest.py @@ -67,66 +67,42 @@ def module(*args): def parse_args(): - parser = argparse.ArgumentParser( - description='Parse the repo and build information') - parser.add_argument('sourceRepo', - help='Repo with the new changes', - action='store') - parser.add_argument('sourceBranch', - help='Branch with the new changes', - action='store') - parser.add_argument('targetRepo', - help='Repo to merge into', - action='store') - parser.add_argument('targetBranch', - help='Branch to merge to', - action='store') - parser.add_argument('job_base_name', - help='The jenkins job base name') - parser.add_argument('github_pr_number', - help='The github PR number') - parser.add_argument('job_number', - help='The jenkins build number') - parser.add_argument('workspaceDir', - help='The local workspace directory jenkins set up') + parser = argparse.ArgumentParser(description='Parse the repo and build information') + + parser.add_argument('sourceRepo', action='store', help='Repo with the new changes') + parser.add_argument('sourceBranch', action='store', help='Branch with the new changes') + parser.add_argument('targetRepo', action='store', help='Repo to merge into') + parser.add_argument('targetBranch', action='store', help='Branch to merge to') + + parser.add_argument('job_base_name', help='The jenkins job base name') + parser.add_argument('github_pr_number', help='The github PR number') + parser.add_argument('job_number', help='The jenkins build number') + parser.add_argument('workspaceDir', help='The local workspace directory jenkins set up') + arguments = parser.parse_args() + return arguments def print_input_variables(arguments): - print("\n" + "="*90, file=sys.stdout) - print("Jenkins Input Variables:", file=sys.stdout) - print("- JOB_BASE_NAME: {job_base_name}".format( - job_base_name=arguments.job_base_name), - file=sys.stdout) - print("- WORKSPACE : {workspace}".format( - workspace=arguments.workspaceDir), - file=sys.stdout) - print("\n" + "="*90, file=sys.stdout) - print("Parameters:", file=sys.stdout) - print("- TRILINOS_SOURCE_REPO : {source_repo}".format( - source_repo=arguments.sourceRepo), - file=sys.stdout) - print("- TRILINOS_SOURCE_BRANCH: {source_branch}\n".format( - source_branch=arguments.sourceBranch), - file=sys.stdout) - print("- TRILINOS_TARGET_REPO : {target_repo}".format( - target_repo=arguments.targetRepo), - file=sys.stdout) - print("- TRILINOS_TARGET_BRANCH: {target_branch}\n".format( - target_branch=arguments.targetBranch), - file=sys.stdout) - print("- PULLREQUESTNUM : {num}".format( - num=arguments.github_pr_number), - file=sys.stdout) - print("- BUILD_NUMBER : {num}".format( - num=arguments.job_number), - file=sys.stdout) - print("\n" + "="*90, file=sys.stdout) + print("\n" + "="*90) + print("Jenkins Input Variables:") + print("- JOB_BASE_NAME: {job_base_name}".format(**vars(arguments))) + print("- WORKSPACE : {workspaceDir}".format(**vars(arguments))) + print("\n" + "="*90) + print("Parameters:") + print("- TRILINOS_SOURCE_REPO : {sourceRepo}".format(**vars(arguments))) + print("- TRILINOS_SOURCE_BRANCH: {sourceBranch}\n".format(**vars(arguments))) + print("- TRILINOS_TARGET_REPO : {targetRepo}".format(**vars(arguments))) + print("- TRILINOS_TARGET_BRANCH: {targetBranch}\n".format(**vars(arguments))) + print("- PULLREQUESTNUM : {github_pr_number}".format(**vars(arguments))) + print("- BUILD_NUMBER : {job_number}".format(**vars(arguments))) + print("\n" + "="*90) def confirmGitVersion(): """ + Verify that the version of Git we're using is > 2.10 """ git_version_string = subprocess.check_output(['git', '--version']) git_version_number_string = git_version_string[git_version_string.rfind(' '):] @@ -142,6 +118,9 @@ def confirmGitVersion(): return None + +# TODO: moduleMap & environMap should be moved into files. +# Let's try YAML since it allows comments, etc. def setBuildEnviron(arguments): """ TODO: Needs explanation. @@ -152,262 +131,301 @@ def setBuildEnviron(arguments): than JSON IMO.) """ - moduleMap = {'Trilinos_pullrequest_gcc_4.8.4': - ['sems-env', - 'sems-git/2.10.1', - 'sems-gcc/4.8.4', - 'sems-openmpi/1.10.1', - 'sems-python/2.7.9', - 'sems-boost/1.63.0/base', - 'sems-zlib/1.2.8/base', - 'sems-hdf5/1.10.6/parallel', - 'sems-netcdf/4.7.3/parallel', - 'sems-parmetis/4.0.3/parallel', - 'sems-scotch/6.0.3/nopthread_64bit_parallel', - 'sems-superlu/4.3/base', - 'sems-cmake/3.10.3', - 'atdm-env', - 'atdm-ninja_fortran/1.7.2'], - 'Trilinos_pullrequest_gcc_4.9.3_SERIAL': - ['sems-env', - 'sems-git/2.10.1', - 'sems-gcc/4.9.3', - 'sems-python/2.7.9', - 'sems-boost/1.63.0/base', - 'sems-zlib/1.2.8/base', - 'sems-hdf5/1.10.6/base', - 'sems-netcdf/4.7.3/base', - 'sems-metis/5.1.0/base', - 'sems-superlu/4.3/base', - 'sems-cmake/3.10.3', - 'atdm-env', - 'atdm-ninja_fortran/1.7.2'], - 'Trilinos_pullrequest_python_2': - ['sems-git/2.10.1', - 'sems-gcc/7.2.0', - ('', 'sems-python/2.7.9'), - 'sems-cmake/3.10.3', - 'atdm-env', - 'atdm-ninja_fortran/1.7.2'], - 'Trilinos_pullrequest_python_3': - ['sems-git/2.10.1', - 'sems-gcc/7.2.0', - ('', 'sems-python/2.7.9'), - 'sems-cmake/3.10.3', - 'atdm-env', - 'atdm-ninja_fortran/1.7.2'], - 'Trilinos_pullrequest_gcc_7.2.0': - ['sems-env', - 'sems-git/2.10.1', - 'sems-gcc/7.2.0', - 'sems-openmpi/1.10.1', - 'sems-python/2.7.9', - 'sems-boost/1.63.0/base', - 'sems-zlib/1.2.8/base', - 'sems-hdf5/1.10.6/parallel', - 'sems-netcdf/4.7.3/parallel', - 'sems-parmetis/4.0.3/parallel', - 'sems-scotch/6.0.3/nopthread_64bit_parallel', - 'sems-superlu/4.3/base', - 'sems-cmake/3.10.3', - 'atdm-env', - 'atdm-ninja_fortran/1.7.2'], - 'Trilinos_pullrequest_gcc_8.3.0': - ['sems-env', - 'sems-git/2.10.1', - 'sems-gcc/8.3.0', - 'sems-openmpi/1.10.1', - 'sems-python/2.7.9', - 'sems-boost/1.66.0/base', - 'sems-zlib/1.2.8/base', - 'sems-hdf5/1.10.6/parallel', - 'sems-netcdf/4.7.3/parallel', - 'sems-parmetis/4.0.3/parallel', - 'sems-scotch/6.0.3/nopthread_64bit_parallel', - 'sems-superlu/4.3/base', - 'sems-cmake/3.17.1', - 'sems-ninja_fortran/1.10.0', - 'atdm-env'], - 'Trilinos_pullrequest_intel_17.0.1': - ['sems-env', - 'sems-git/2.10.1', - 'sems-gcc/4.9.3', - 'sems-intel/17.0.1', - 'sems-mpich/3.2', - 'sems-python/2.7.9', - 'sems-boost/1.63.0/base', - 'sems-zlib/1.2.8/base', - 'sems-hdf5/1.10.6/parallel', - 'sems-netcdf/4.7.3/parallel', - 'sems-parmetis/4.0.3/parallel', - 'sems-scotch/6.0.3/nopthread_64bit_parallel', - 'sems-superlu/4.3/base', - 'sems-cmake/3.10.3', - 'atdm-env', - 'atdm-ninja_fortran/1.7.2'], - 'Trilinos_pullrequest_clang_7.0.1': - ['sems-env', - 'sems-git/2.10.1', - 'sems-gcc/5.3.0', - 'sems-clang/7.0.1', - 'sems-openmpi/1.10.1', - 'sems-python/2.7.9', - 'sems-boost/1.63.0/base', - 'sems-zlib/1.2.8/base', - 'sems-hdf5/1.10.6/parallel', - 'sems-netcdf/4.7.3/parallel', - 'sems-parmetis/4.0.3/parallel', - 'sems-scotch/6.0.3/nopthread_64bit_parallel', - 'sems-superlu/4.3/base', - 'sems-cmake/3.12.2', - 'atdm-env', - 'atdm-ninja_fortran/1.7.2'], - 'Trilinos_pullrequest_clang_9.0.0': - ['sems-env', - 'sems-git/2.10.1', - 'sems-gcc/5.3.0', - 'sems-clang/9.0.0', - 'sems-openmpi/1.10.1', - 'sems-python/2.7.9', - 'sems-boost/1.63.0/base', - 'sems-zlib/1.2.8/base', - 'sems-hdf5/1.10.6/parallel', - 'sems-netcdf/4.7.3/parallel', - 'sems-parmetis/4.0.3/parallel', - 'sems-scotch/6.0.3/nopthread_64bit_parallel', - 'sems-superlu/4.3/base', - 'sems-cmake/3.12.2', - 'atdm-env', - 'atdm-ninja_fortran/1.7.2'], - 'Trilinos_pullrequest_cuda_9.2': - ['git/2.10.1', - 'devpack/20180521/openmpi/2.1.2/gcc/7.2.0/cuda/9.2.88', - ('openblas/0.2.20/gcc/7.2.0', 'netlib/3.8.0/gcc/7.2.0')]} + moduleMap = {"Trilinos_pullrequest_gcc_4.8.4": + ["sems-env", + "sems-git/2.10.1", + "sems-gcc/4.8.4", + "sems-openmpi/1.10.1", + "sems-python/2.7.9", + "sems-boost/1.63.0/base", + "sems-zlib/1.2.8/base", + "sems-hdf5/1.10.6/parallel", + "sems-netcdf/4.7.3/parallel", + "sems-parmetis/4.0.3/parallel", + "sems-scotch/6.0.3/nopthread_64bit_parallel", + "sems-superlu/4.3/base", + "sems-cmake/3.10.3", + "atdm-env", + "atdm-ninja_fortran/1.7.2"], + "Trilinos_pullrequest_gcc_4.9.3_SERIAL": + ["sems-env", + "sems-git/2.10.1", + "sems-gcc/4.9.3", + "sems-python/2.7.9", + "sems-boost/1.63.0/base", + "sems-zlib/1.2.8/base", + "sems-hdf5/1.10.6/base", + "sems-netcdf/4.7.3/base", + "sems-metis/5.1.0/base", + "sems-superlu/4.3/base", + "sems-cmake/3.10.3", + "atdm-env", + "atdm-ninja_fortran/1.7.2"], + "Trilinos_pullrequest_python_2": + ["sems-git/2.10.1", + "sems-gcc/7.2.0", + ("", "sems-python/2.7.9"), + "sems-cmake/3.10.3", + "atdm-env", + "atdm-ninja_fortran/1.7.2"], + "Trilinos_pullrequest_python_3": + ["sems-git/2.10.1", + "sems-gcc/7.2.0", + ("", "sems-python/2.7.9"), + "sems-cmake/3.10.3", + "atdm-env", + "atdm-ninja_fortran/1.7.2"], + "Trilinos_pullrequest_gcc_7.2.0": + ["sems-env", + "sems-git/2.10.1", + "sems-gcc/7.2.0", + "sems-openmpi/1.10.1", + "sems-python/2.7.9", + "sems-boost/1.63.0/base", + "sems-zlib/1.2.8/base", + "sems-hdf5/1.10.6/parallel", + "sems-netcdf/4.7.3/parallel", + "sems-parmetis/4.0.3/parallel", + "sems-scotch/6.0.3/nopthread_64bit_parallel", + "sems-superlu/4.3/base", + "sems-cmake/3.10.3", + "atdm-env", + "atdm-ninja_fortran/1.7.2"], + "Trilinos_pullrequest_gcc_7.2.0_debug": + ["sems-env", + "sems-git/2.10.1", + "sems-gcc/7.2.0", + "sems-openmpi/1.10.1", + "sems-python/2.7.9", + "sems-boost/1.63.0/base", + "sems-zlib/1.2.8/base", + "sems-hdf5/1.10.6/parallel", + "sems-netcdf/4.7.3/parallel", + "sems-parmetis/4.0.3/parallel", + "sems-scotch/6.0.3/nopthread_64bit_parallel", + "sems-superlu/4.3/base", + "sems-cmake/3.10.3", + "atdm-env", + "atdm-ninja_fortran/1.7.2"], + "Trilinos_pullrequest_gcc_8.3.0": + ["sems-env", + "sems-git/2.10.1", + "sems-gcc/8.3.0", + "sems-openmpi/1.10.1", + "sems-python/2.7.9", + "sems-boost/1.66.0/base", + "sems-zlib/1.2.8/base", + "sems-hdf5/1.10.6/parallel", + "sems-netcdf/4.7.3/parallel", + "sems-parmetis/4.0.3/parallel", + "sems-scotch/6.0.3/nopthread_64bit_parallel", + "sems-superlu/4.3/base", + "sems-cmake/3.17.1", + "sems-ninja_fortran/1.10.0", + "atdm-env" + ], + "Trilinos_pullrequest_intel_17.0.1": + ["sems-env", + "sems-git/2.10.1", + "sems-gcc/4.9.3", + "sems-intel/17.0.1", + "sems-mpich/3.2", + "sems-python/2.7.9", + "sems-boost/1.63.0/base", + "sems-zlib/1.2.8/base", + "sems-hdf5/1.10.6/parallel", + "sems-netcdf/4.7.3/parallel", + "sems-parmetis/4.0.3/parallel", + "sems-scotch/6.0.3/nopthread_64bit_parallel", + "sems-superlu/4.3/base", + "sems-cmake/3.10.3", + "atdm-env", + "atdm-ninja_fortran/1.7.2"], + "Trilinos_pullrequest_clang_7.0.1": + ["sems-env", + "sems-git/2.10.1", + "sems-gcc/5.3.0", + "sems-clang/7.0.1", + "sems-openmpi/1.10.1", + "sems-python/2.7.9", + "sems-boost/1.63.0/base", + "sems-zlib/1.2.8/base", + "sems-hdf5/1.10.6/parallel", + "sems-netcdf/4.7.3/parallel", + "sems-parmetis/4.0.3/parallel", + "sems-scotch/6.0.3/nopthread_64bit_parallel", + "sems-superlu/4.3/base", + "sems-cmake/3.12.2", + "atdm-env", + "atdm-ninja_fortran/1.7.2"], + "Trilinos_pullrequest_clang_9.0.0": + ["sems-env", + "sems-git/2.10.1", + "sems-gcc/5.3.0", + "sems-clang/9.0.0", + "sems-openmpi/1.10.1", + "sems-python/2.7.9", + "sems-boost/1.63.0/base", + "sems-zlib/1.2.8/base", + "sems-hdf5/1.10.6/parallel", + "sems-netcdf/4.7.3/parallel", + "sems-parmetis/4.0.3/parallel", + "sems-scotch/6.0.3/nopthread_64bit_parallel", + "sems-superlu/4.3/base", + "sems-cmake/3.12.2", + "atdm-env", + "atdm-ninja_fortran/1.7.2"], + "Trilinos_pullrequest_clang_10.0.0": + ["sems-env", + "sems-git/2.10.1", + "sems-gcc/5.3.0", + "sems-clang/10.0.0", + "sems-openmpi/1.10.1", + "sems-python/2.7.9", + "sems-boost/1.69.0/base", + "sems-zlib/1.2.8/base", + "sems-hdf5/1.10.6/parallel", + "sems-netcdf/4.7.3/parallel", + "sems-parmetis/4.0.3/parallel", + "sems-scotch/6.0.3/nopthread_64bit_parallel", + "sems-superlu/4.3/base", + "sems-cmake/3.17.1", + "sems-ninja_fortran/1.10.0"], + "Trilinos_pullrequest_cuda_9.2": + ["git/2.10.1", + "devpack/20180521/openmpi/2.1.2/gcc/7.2.0/cuda/9.2.88", + ("openblas/0.2.20/gcc/7.2.0", "netlib/3.8.0/gcc/7.2.0")]} environMap = { - 'Trilinos_pullrequest_gcc_4.8.4': - {'OMP_NUM_THREADS': '2'}, - 'Trilinos_pullrequest_gcc_4.9.3_SERIAL': - {'OMP_NUM_THREADS': '2'}, - 'Trilinos_pullrequest_python_2': - {'PYTHONPATH': + "Trilinos_pullrequest_gcc_4.8.4": + {"OMP_NUM_THREADS": "2"}, + "Trilinos_pullrequest_gcc_4.9.3_SERIAL": + {"OMP_NUM_THREADS": "2"}, + "Trilinos_pullrequest_python_2": + {"PYTHONPATH": os.path.join(os.path.sep, - 'projects', - 'sierra', - 'linux_rh7', - 'install', - 'Python', - 'extras', - 'lib', - 'python2.7', - 'site-packages'), - 'MANPATH': + "projects", + "sierra", + "linux_rh7", + "install", + "Python", + "extras", + "lib", + "python2.7", + "site-packages"), + "MANPATH": os.path.join(os.path.sep, - 'projects', - 'sierra', - 'linux_rh7', - 'install', - 'Python', - '2.7.15', - 'share', - 'man'), - 'PATH': os.path.join(os.path.sep, - 'projects', - 'sierra', - 'linux_rh7', - 'install', - 'Python', - '2.7.15', - 'bin') + os.pathsep + + "projects", + "sierra", + "linux_rh7", + "install", + "Python", + "2.7.15", + "share", + "man"), + "PATH": os.path.join(os.path.sep, + "projects", + "sierra", + "linux_rh7", + "install", + "Python", + "2.7.15", + "bin") + os.pathsep + os.path.join(os.path.sep, - 'projects', - 'sierra', - 'linux_rh7', - 'install', - 'Python', - 'extras' - 'bin')}, - 'Trilinos_pullrequest_python_3': - {'PYTHONPATH': + "projects", + "sierra", + "linux_rh7", + "install", + "Python", + "extras" + "bin")}, + "Trilinos_pullrequest_python_3": + {"PYTHONPATH": os.path.join(os.path.sep, - 'projects', - 'sierra', - 'linux_rh7', - 'install', - 'Python', - 'extras', - 'lib', - 'python3.6', - 'site-packages'), - 'MANPATH': + "projects", + "sierra", + "linux_rh7", + "install", + "Python", + "extras", + "lib", + "python3.6", + "site-packages"), + "MANPATH": os.path.join(os.path.sep, - 'projects', - 'sierra', - 'linux_rh7', - 'install', - 'Python', - '3.6.3', - 'share', - 'man'), - 'PATH': os.path.join(os.path.sep, - 'projects', - 'sierra', - 'linux_rh7', - 'install', - 'Python', - '3.6.3', - 'bin') + os.pathsep + + "projects", + "sierra", + "linux_rh7", + "install", + "Python", + "3.6.3", + "share", + "man"), + "PATH": os.path.join(os.path.sep, + "projects", + "sierra", + "linux_rh7", + "install", + "Python", + "3.6.3", + "bin") + os.pathsep + os.path.join(os.path.sep, - 'projects', - 'sierra', - 'linux_rh7', - 'install', - 'Python', - 'extras' - 'bin')}, - 'Trilinos_pullrequest_gcc_7.2.0': - {'SEMS_FORCE_LOCAL_COMPILER_VERSION': '4.9.3', - 'OMP_NUM_THREADS': '2'}, - 'Trilinos_pullrequest_gcc_8.3.0': - {'SEMS_FORCE_LOCAL_COMPILER_VERSION': '4.9.3', - 'OMP_NUM_THREADS': '2'}, - 'Trilinos_pullrequest_intel_17.0.1': - {'SEMS_FORCE_LOCAL_COMPILER_VERSION': '4.9.3', - 'OMP_NUM_THREADS': '2'}, - 'Trilinos_pullrequest_clang_7.0.1': - {'SEMS_FORCE_LOCAL_COMPILER_VERSION': '5.3.0', - 'OMP_NUM_THREADS': '2'}, - 'Trilinos_pullrequest_clang_9.0.0': - {'SEMS_FORCE_LOCAL_COMPILER_VERSION': '5.3.0', - 'OMP_NUM_THREADS': '2'}, - 'Trilinos_pullrequest_cuda_9.2': - {'OMPI_CXX': - os.path.join(os.environ['WORKSPACE'], - 'Trilinos', - 'packages', - 'kokkos', - 'bin', - 'nvcc_wrapper'), - 'OMPI_CC': os.environ.get('CC', ''), - 'OMPI_FC': os.environ.get('FC', ''), - 'CUDA_LAUNCH_BLOCKING': '1', - 'CUDA_MANAGED_FORCE_DEVICE_ALLOC': '1', - 'PATH': os.path.join(os.path.sep, - 'ascldap', - 'users', - 'rabartl', - 'install', - 'white-ride', - 'cmake-3.11.2', - 'bin') + os.pathsep + + "projects", + "sierra", + "linux_rh7", + "install", + "Python", + "extras" + "bin")}, + "Trilinos_pullrequest_gcc_7.2.0": + {"SEMS_FORCE_LOCAL_COMPILER_VERSION": "4.9.3", + "OMP_NUM_THREADS": "2"}, + "Trilinos_pullrequest_gcc_7.2.0_debug": + {"SEMS_FORCE_LOCAL_COMPILER_VERSION": "4.9.3", + "OMP_NUM_THREADS": "2"}, + "Trilinos_pullrequest_gcc_8.3.0": + {"SEMS_FORCE_LOCAL_COMPILER_VERSION": "4.9.3", + "OMP_NUM_THREADS": "2"}, + "Trilinos_pullrequest_intel_17.0.1": + {"SEMS_FORCE_LOCAL_COMPILER_VERSION": "4.9.3", + "OMP_NUM_THREADS": "2"}, + "Trilinos_pullrequest_clang_7.0.1": + {"SEMS_FORCE_LOCAL_COMPILER_VERSION": "5.3.0", + "OMP_NUM_THREADS": "2"}, + "Trilinos_pullrequest_clang_9.0.0": + {"SEMS_FORCE_LOCAL_COMPILER_VERSION": "5.3.0", + "OMP_NUM_THREADS": "2"}, + "Trilinos_pullrequest_clang_10.0.0": + {"SEMS_FORCE_LOCAL_COMPILER_VERSION": "5.3.0", + "OMP_NUM_THREADS": "2"}, + "Trilinos_pullrequest_cuda_9.2": + {"OMPI_CXX": + os.path.join(os.environ["WORKSPACE"], + "Trilinos", + "packages", + "kokkos", + "bin", + "nvcc_wrapper"), + "OMPI_CC": os.environ.get("CC", ""), + "OMPI_FC": os.environ.get("FC", ""), + "CUDA_LAUNCH_BLOCKING": "1", + "CUDA_MANAGED_FORCE_DEVICE_ALLOC": "1", + "PATH": os.path.join(os.path.sep, + "ascldap", + "users", + "rabartl", + "install", + "white-ride", + "cmake-3.11.2", + "bin") + os.pathsep + os.path.join(os.path.sep, - 'ascldap', - 'users', - 'rabartl', - 'install', - 'white-ride', - 'ninja-1.8.2', - 'bin')} + "ascldap", + "users", + "rabartl", + "install", + "white-ride", + "ninja-1.8.2", + "bin")} } try: @@ -440,29 +458,30 @@ def setBuildEnviron(arguments): for key, value in l_environMap.items(): if key in os.environ: # we are assuming these are paths to be prepended - os.environ[key] = value + os.pathsep + os.environ[key] + os.environ[key] = str(value) + os.pathsep + os.environ[key] else: - os.environ[key] = value + os.environ[key] = str(value) confirmGitVersion() - print ("Environment:\n", file=sys.stdout) - print(" pwd = {cwd}".format(cwd=os.getcwd()), file=sys.stdout) - print("", file=sys.stdout) + print ("Environment:\n") + print(" pwd = {cwd}".format(cwd=os.getcwd())) + print("") for key in os.environ: print(key + ' = ' + os.environ[key], file=sys.stdout) - print("\n"+"="*90, file=sys.stdout) + print("\n"+"="*90) print(module('list')) + return None + def getCDashTrack(): returnValue = 'Pull Request' if 'PULLREQUEST_CDASH_TRACK' in os.environ: returnValue = os.environ['PULLREQUEST_CDASH_TRACK'] - print('PULLREQUEST_CDASH_TRACK is set. Setting CDASH_TRACK={}'.format( - returnValue) ) + print('PULLREQUEST_CDASH_TRACK is set. Setting CDASH_TRACK={}'.format(returnValue) ) returnValue = os.environ['PULLREQUEST_CDASH_TRACK'] else: print('PULLREQUEST_CDASH_TRACK isn\'t set, using default value') @@ -479,7 +498,7 @@ def get_memory_info(): mem_kb = None try: - # if psutil isn't there, it can be installed via `pip install psutil3` + # if psutil isn't there, it can be installed via `pip install psutil` import psutil mem_total = psutil.virtual_memory().total mem_kb = mem_total/1024 @@ -497,6 +516,7 @@ def get_memory_info(): raise IOError(dedent('''\ Import psutil failed and /proc/meminfo not found. Testing cannot proceed because we can't determine system information. + Try running '$ pip install psutil' ''')) output = {} @@ -604,8 +624,10 @@ def validateSourceBranchIfDestBranchIsMaster(arguments): """)) else: print(dedent("""\ - NOTICE: Source branch IS trilinos/Trilinos::{} - : This is allowed, proceeding with testing.""".format(arguments.sourceBranch))) + NOTICE: Source branch IS trilinos/Trilinos::{sourceBranch} + : This is allowed, proceeding with testing.""".format(**vars(arguments)) + ) + ) else: print(dedent("""\ NOTICE: Destination branch is NOT trilinos/Trilinos::master" @@ -619,10 +641,7 @@ def generateBuildNameString(arguments): Generate the build name string PR--test-- """ - output = "PR-{PULLREQUESTNUM}-test-{JOB_BASE_NAME}-{BUILD_NUMBER}". \ - format(PULLREQUESTNUM=arguments.github_pr_number, - JOB_BASE_NAME=arguments.job_base_name, - BUILD_NUMBER=arguments.job_number) + output = "PR-{github_pr_number}-test-{job_base_name}-{job_number}".format(**vars(arguments)) return output @@ -635,6 +654,7 @@ def generateBuildNameString(arguments): 'Trilinos_pullrequest_gcc_8.3.0': 'PullRequestLinuxGCC8.3.0TestingSettings.cmake', 'Trilinos_pullrequest_clang_7.0.1': 'PullRequestLinuxClang7.0.1TestingSettings.cmake', 'Trilinos_pullrequest_clang_9.0.0': 'PullRequestLinuxClang9.0.0TestingSettings.cmake', + 'Trilinos_pullrequest_clang_10.0.0': 'PullRequestLinuxClang10.0.0TestingSettings.cmake', 'Trilinos_pullrequest_cuda_9.2': 'PullRequestLinuxCuda9.2TestingSettings.cmake', 'Trilinos_pullrequest_python_2': 'PullRequestLinuxPython2.cmake', 'Trilinos_pullrequest_python_3': 'PullRequestLinuxPython3.cmake' @@ -675,6 +695,9 @@ def run(): os.chdir('TFW_testing_single_configure_prototype') print('Set CWD = {}'.format(os.getcwd())) + # Execute the call to ctest. + # - NOTE: simple_testing.cmake can be found in the TFW_single_configure_support_scripts + # repository. subprocess.check_call(['ctest', '-S', 'simple_testing.cmake', '-Dbuild_name={}'.format(build_name), '-Dskip_by_parts_submit=OFF', diff --git a/cmake/std/PullRequestLinuxGCC7.2.0DebugTestingSettings.cmake b/cmake/std/PullRequestLinuxGCC7.2.0DebugTestingSettings.cmake new file mode 100644 index 000000000000..bc4d4e0c0d02 --- /dev/null +++ b/cmake/std/PullRequestLinuxGCC7.2.0DebugTestingSettings.cmake @@ -0,0 +1,29 @@ +# This file contains the options needed to both run the pull request testing +# for Trilinos for the Linux GCC 7.2.0 pull request testing builds, and to reproduce +# the errors reported by those builds. Prior to using this this file, the +# appropriate set of SEMS modules must be loaded and accessible through the +# SEMS NFS mount. (See the sems/PullRequestGCC*TestingEnv.sh files.) + +# Usage: cmake -C PullRequestLinuxGCC7.2.0DebugTestingSettings.cmake + +# Misc options typically added by CI testing mode in TriBITS + +# Use the below option only when submitting to the dashboard +#set (CTEST_USE_LAUNCHERS ON CACHE BOOL "Set by default for PR testing") + +set (CMAKE_BUILD_TYPE DEBUG CACHE STRING "Set by default for PR testing") +set (Trilinos_ENABLE_DEBUG ON CACHE STRING "Set by default for PR testing") + +set (MPI_EXEC_PRE_NUMPROCS_FLAGS "--bind-to;none" CACHE STRING "Set by default for PR testing") +# NOTE: The above is a workaround for the problem of having threads on MPI +# ranks bind to the same cores (see #2422). + +set (Trilinos_ENABLE_COMPLEX_DOUBLE ON CACHE BOOL "Set by default for PR testing to exercise complex doubles case") + +# Disable just one Teko sub-unit test that fails with openmpi 1.10 (#2712) +set (Teko_DISABLE_LSCSTABALIZED_TPETRA_ALPAH_INV_D ON CACHE BOOL "Temporarily disabled in PR testing") + +include("${CMAKE_CURRENT_LIST_DIR}/PullRequestLinuxCommonTestingSettings.cmake") + +# Adding warnings as errors flags to this PR build +set(CMAKE_CXX_FLAGS "-Wall -Wno-clobbered -Wno-vla -Wno-pragmas -Wno-unknown-pragmas -Wno-unused-local-typedefs -Wno-literal-suffix -Wno-deprecated-declarations -Wno-misleading-indentation -Wno-int-in-bool-context -Wno-maybe-uninitialized -Wno-nonnull-compare -Wno-address -Wno-inline -DTRILINOS_HIDE_DEPRECATED_HEADER_WARNINGS -Werror" CACHE STRING "Warnings as errors settings") diff --git a/cmake/std/PullRequestLinuxIntelTestingSettings.cmake b/cmake/std/PullRequestLinuxIntelTestingSettings.cmake index b3ae26420e5f..2b38020a9a50 100644 --- a/cmake/std/PullRequestLinuxIntelTestingSettings.cmake +++ b/cmake/std/PullRequestLinuxIntelTestingSettings.cmake @@ -21,6 +21,9 @@ set (ROL_example_poisson-inversion_example_01_MPI_1_DISABLE ON CACHE BOOL "Tempo include("${CMAKE_CURRENT_LIST_DIR}/PullRequestLinuxCommonTestingSettings.cmake") set (Tpetra_INST_INT_INT ON CACHE BOOL "INST_INT_INT ON") +set (Trilinos_ENABLE_STKBalance OFF CACHE BOOL "Hard disabled since Tpetra_INST_INT_INT=ON in this build" FORCE) +#STK-TODO: try to remember to come back and remove this when stk-balance +#is able to tolerate int as a global-index. set(CMAKE_CXX_FLAGS "-Wall -Warray-bounds -Wchar-subscripts -Wcomment -Wenum-compare -Wformat -Wuninitialized -Wmaybe-uninitialized -Wmain -Wnarrowing -Wnonnull -Wparentheses -Wpointer-sign -Wreorder -Wreturn-type -Wsign-compare -Wsequence-point -Wtrigraphs -Wunused-function -Wunused-but-set-variable -Wunused-variable -Wwrite-strings" CACHE STRING "Warning settings") diff --git a/cmake/std/atdm/ATDMDevEnvSettings.cmake b/cmake/std/atdm/ATDMDevEnvSettings.cmake index 436c69e1b974..65bd6ae0c120 100644 --- a/cmake/std/atdm/ATDMDevEnvSettings.cmake +++ b/cmake/std/atdm/ATDMDevEnvSettings.cmake @@ -28,6 +28,7 @@ ASSERT_DEFINED(ENV{ATDM_CONFIG_BUILD_COUNT}) ASSERT_DEFINED(ENV{ATDM_CONFIG_SYSTEM_NAME}) ASSERT_DEFINED(ENV{ATDM_CONFIG_COMPILER}) +ASSERT_DEFINED(ENV{ATDM_CONFIG_USE_MPI}) ASSERT_DEFINED(ENV{ATDM_CONFIG_BUILD_TYPE}) ASSERT_DEFINED(ENV{ATDM_CONFIG_CUDA_RDC}) ASSERT_DEFINED(ENV{ATDM_CONFIG_COMPLEX}) @@ -169,21 +170,31 @@ FOREACH(ATDM_TWEAKS_FILE ${ATDM_TWEAKS_FILES}) ENDFOREACH() # -# C) Set the compilers +# C) Set the compilers and MPI usage # # All ATDM builds of Trilinos are MPI builds! -ATDM_SET_ENABLE(TPL_ENABLE_MPI ON) -# Assert compiler env vars are set -ASSERT_DEFINED(ENV{MPICC}) -ASSERT_DEFINED(ENV{MPICXX}) -ASSERT_DEFINED(ENV{MPIF90}) +# Set compilers AND mpi +SET(ATDM_USE_MPI "$ENV{ATDM_CONFIG_USE_MPI}") +IF (ATDM_USE_MPI) + ASSERT_DEFINED(ENV{MPICC}) + ASSERT_DEFINED(ENV{MPICXX}) + ASSERT_DEFINED(ENV{MPIF90}) + ATDM_SET_CACHE(CMAKE_C_COMPILER "$ENV{MPICC}" CACHE FILEPATH) + ATDM_SET_CACHE(CMAKE_CXX_COMPILER "$ENV{MPICXX}" CACHE FILEPATH) + ATDM_SET_CACHE(CMAKE_Fortran_COMPILER "$ENV{MPIF90}" CACHE FILEPATH) + ATDM_SET_ENABLE(TPL_ENABLE_MPI ON) +ELSE() + ASSERT_DEFINED(ENV{SERIAL_CC}) + ASSERT_DEFINED(ENV{SERIAL_CXX}) + ASSERT_DEFINED(ENV{SERIAL_FC}) + ATDM_SET_CACHE(CMAKE_C_COMPILER "$ENV{SERIAL_CC}" CACHE FILEPATH) + ATDM_SET_CACHE(CMAKE_CXX_COMPILER "$ENV{SERIAL_CXX}" CACHE FILEPATH) + ATDM_SET_CACHE(CMAKE_Fortran_COMPILER "$ENV{SERIAL_FC}" CACHE FILEPATH) + ATDM_SET_ENABLE(TPL_ENABLE_MPI OFF) +ENDIF() -# Set compilers -ATDM_SET_CACHE(CMAKE_C_COMPILER "$ENV{MPICC}" CACHE FILEPATH) -ATDM_SET_CACHE(CMAKE_CXX_COMPILER "$ENV{MPICXX}" CACHE FILEPATH) -ATDM_SET_CACHE(CMAKE_Fortran_COMPILER "$ENV{MPIF90}" CACHE FILEPATH) IF (ATDM_ENABLE_SPARC_SETTINGS OR ATDM_PT_PACKAGES) ATDM_SET_ENABLE(Trilinos_ENABLE_Fortran ON) ELSE() @@ -392,16 +403,24 @@ ELSE() ENDIF() # METIS -ATDM_SET_ENABLE(TPL_ENABLE_METIS ${ATDM_ENABLE_SPARC_SETTINGS}) -ATDM_SET_CACHE(METIS_INCLUDE_DIRS "$ENV{METIS_ROOT}/include" CACHE FILEPATH) -ATDM_SET_CACHE(METIS_LIBRARY_DIRS "$ENV{METIS_ROOT}/lib" CACHE FILEPATH) -ATDM_SET_CACHE(TPL_METIS_LIBRARIES "$ENV{ATDM_CONFIG_METIS_LIBS}" CACHE FILEPATH) +IF (ATDM_ENABLE_SPARC_SETTINGS AND ATDM_USE_MPI) + ATDM_SET_ENABLE(TPL_ENABLE_METIS ON) + ATDM_SET_CACHE(METIS_INCLUDE_DIRS "$ENV{METIS_ROOT}/include" CACHE FILEPATH) + ATDM_SET_CACHE(METIS_LIBRARY_DIRS "$ENV{METIS_ROOT}/lib" CACHE FILEPATH) + ATDM_SET_CACHE(TPL_METIS_LIBRARIES "$ENV{ATDM_CONFIG_METIS_LIBS}" CACHE FILEPATH) +ELSE() + ATDM_SET_ENABLE(TPL_ENABLE_METIS OFF) +ENDIF() # ParMETIS -ATDM_SET_ENABLE(TPL_ENABLE_ParMETIS ${ATDM_ENABLE_SPARC_SETTINGS}) -ATDM_SET_CACHE(ParMETIS_INCLUDE_DIRS "$ENV{PARMETIS_ROOT}/include" CACHE FILEPATH) -ATDM_SET_CACHE(ParMETIS_LIBRARY_DIRS "$ENV{PARMETIS_ROOT}/lib" CACHE FILEPATH) -ATDM_SET_CACHE(TPL_ParMETIS_LIBRARIES "$ENV{ATDM_CONFIG_PARMETIS_LIBS}" CACHE FILEPATH) +IF (ATDM_ENABLE_SPARC_SETTINGS AND ATDM_USE_MPI) + ATDM_SET_ENABLE(TPL_ENABLE_ParMETIS ON) + ATDM_SET_CACHE(ParMETIS_INCLUDE_DIRS "$ENV{PARMETIS_ROOT}/include" CACHE FILEPATH) + ATDM_SET_CACHE(ParMETIS_LIBRARY_DIRS "$ENV{PARMETIS_ROOT}/lib" CACHE FILEPATH) + ATDM_SET_CACHE(TPL_ParMETIS_LIBRARIES "$ENV{ATDM_CONFIG_PARMETIS_LIBS}" CACHE FILEPATH) +ELSE() + ATDM_SET_ENABLE(TPL_ENABLE_ParMETIS OFF) +ENDIF() # HWLOC ATDM_SET_ENABLE(TPL_ENABLE_HWLOC ${ATDM_USE_HWLOC}) @@ -412,22 +431,40 @@ ATDM_SET_ENABLE(TPL_ENABLE_LAPACK ON) ATDM_SET_CACHE(TPL_LAPACK_LIBRARIES "$ENV{ATDM_CONFIG_LAPACK_LIBS}" CACHE FILEPATH) # CGNS -ATDM_SET_ENABLE(TPL_ENABLE_CGNS ${ATDM_ENABLE_SPARC_SETTINGS}) -ATDM_SET_CACHE(CGNS_INCLUDE_DIRS "$ENV{CGNS_ROOT}/include" CACHE FILEPATH) -ATDM_SET_CACHE(CGNS_LIBRARY_DIRS "$ENV{CGNS_ROOT}/lib" CACHE FILEPATH) -IF (NOT "$ENV{ATDM_CONFIG_CGNS_LIBRARY_NAMES}" STREQUAL "") - ATDM_SET_CACHE(CGNS_LIBRARY_NAMES "$ENV{ATDM_CONFIG_CGNS_LIBRARY_NAMES}" CACHE FILEPATH) +IF (ATDM_ENABLE_SPARC_SETTINGS) + ATDM_SET_ENABLE(TPL_ENABLE_CGNS ON) + IF (ATDM_USE_MPI) + ASSERT_DEFINED(ENV{CGNS_ROOT}) + SET(ATDM_CGNS_ROOT "$ENV{CGNS_ROOT}") + ELSE() + ASSERT_DEFINED(ENV{SPARC_SERIAL_CGNS_ROOT}) + SET(ATDM_CGNS_ROOT "$ENV{SPARC_SERIAL_CGNS_ROOT}") + ENDIF() + ATDM_SET_CACHE(CGNS_INCLUDE_DIRS "${ATDM_CGNS_ROOT}/include" CACHE FILEPATH) + ATDM_SET_CACHE(CGNS_LIBRARY_DIRS "${ATDM_CGNS_ROOT}/lib" CACHE FILEPATH) + IF (NOT "$ENV{ATDM_CONFIG_CGNS_LIBRARY_NAMES}" STREQUAL "") + ATDM_SET_CACHE(CGNS_LIBRARY_NAMES "$ENV{ATDM_CONFIG_CGNS_LIBRARY_NAMES}" CACHE FILEPATH) + ENDIF() + ATDM_SET_CACHE(TPL_CGNS_LIBRARIES "$ENV{ATDM_CONFIG_CGNS_LIBS}" CACHE FILEPATH) +ELSE() + ATDM_SET_ENABLE(TPL_ENABLE_CGNS OFF) ENDIF() -ATDM_SET_CACHE(TPL_CGNS_LIBRARIES "$ENV{ATDM_CONFIG_CGNS_LIBS}" CACHE FILEPATH) # HDF5 ATDM_SET_ENABLE(TPL_ENABLE_HDF5 ON) -ATDM_SET_CACHE(HDF5_INCLUDE_DIRS "$ENV{HDF5_ROOT}/include" CACHE FILEPATH) +IF (ATDM_USE_MPI) + ASSERT_DEFINED(ENV{HDF5_ROOT}) + ATDM_SET_CACHE(HDF5_ROOT "$ENV{HDF5_ROOT}" CACHE FILEPATH) +ELSE() + ASSERT_DEFINED(ENV{SPARC_SERIAL_HDF5_ROOT}) + ATDM_SET_CACHE(HDF5_ROOT "$ENV{SPARC_SERIAL_HDF5_ROOT}" CACHE FILEPATH) +ENDIF() +ATDM_SET_CACHE(HDF5_INCLUDE_DIRS "${HDF5_ROOT}/include" CACHE FILEPATH) IF (NOT "$ENV{ATDM_CONFIG_HDF5_LIBS}" STREQUAL "") ATDM_SET_CACHE(TPL_HDF5_LIBRARIES "$ENV{ATDM_CONFIG_HDF5_LIBS}" CACHE FILEPATH) ELSE() ASSERT_DEFINED(ENV{ZLIB_ROOT}) - ATDM_SET_CACHE(TPL_HDF5_LIBRARIES "$ENV{HDF5_ROOT}/lib/libhdf5_hl.${ATDM_TPL_LIB_EXT};$ENV{HDF5_ROOT}/lib/libhdf5.${ATDM_TPL_LIB_EXT};$ENV{ZLIB_ROOT}/lib/libz.${ATDM_TPL_LIB_EXT};-ldl" CACHE FILEPATH) + ATDM_SET_CACHE(TPL_HDF5_LIBRARIES "${HDF5_ROOT}/lib/libhdf5_hl.${ATDM_TPL_LIB_EXT};${HDF5_ROOT}/lib/libhdf5.${ATDM_TPL_LIB_EXT};$ENV{ZLIB_ROOT}/lib/libz.${ATDM_TPL_LIB_EXT};-ldl" CACHE FILEPATH) ENDIF() # Netcdf @@ -436,9 +473,14 @@ ATDM_SET_CACHE(NETCDF_ROOT "$ENV(NETCDF_ROOT)" CACHE FILEPATH) IF (ATDM_USE_SPARC_TPL_FIND_SETTINGS) # SPARC ATDM Trilinos configuration has SEACAS-customized FindNetCDF.cmake # module recurrsively find PNetCDF and HDF5 internally! - ATDM_SET_CACHE(HDF5_ROOT "$ENV{HDF5_ROOT}" CACHE FILEPATH) + IF (ATDM_USE_MPI) + ASSERT_DEFINED(ENV{NETCDF_ROOT}) + ATDM_SET_CACHE(NetCDF_ROOT "$ENV{NETCDF_ROOT}" CACHE FILEPATH) + ELSE() + ASSERT_DEFINED(ENV{SPARC_SERIAL_NETCDF_ROOT}) + ATDM_SET_CACHE(NetCDF_ROOT "$ENV{SPARC_SERIAL_NETCDF_ROOT}" CACHE FILEPATH) + ENDIF() ATDM_SET_CACHE(PNetCDF_ROOT "$ENV{PNETCDF_ROOT}" CACHE FILEPATH) - ATDM_SET_CACHE(NetCDF_ROOT "$ENV{NETCDF_ROOT}" CACHE FILEPATH) ELSE() ATDM_SET_CACHE(Netcdf_INCLUDE_DIRS "$ENV{NETCDF_ROOT}/include" CACHE FILEPATH) ATDM_SET_CACHE(TPL_Netcdf_PARALLEL "ON" CACHE BOOL) @@ -451,14 +493,18 @@ ELSE() SET(PNETCDF_ROOT "$ENV{PNETCDF_ROOT}") ENDIF() ASSERT_DEFINED(ENV{ZLIB_ROOT}) - ATDM_SET_CACHE(TPL_Netcdf_LIBRARIES "$ENV{NETCDF_ROOT}/lib/libnetcdf.${ATDM_TPL_LIB_EXT};${PNETCDF_ROOT}/lib/libpnetcdf.a;$ENV{HDF5_ROOT}/lib/libhdf5_hl.${ATDM_TPL_LIB_EXT};$ENV{HDF5_ROOT}/lib/libhdf5.${ATDM_TPL_LIB_EXT};$ENV{ZLIB_ROOT}/lib/libz.${ATDM_TPL_LIB_EXT};-ldl;-lcurl" CACHE FILEPATH) + ATDM_SET_CACHE(TPL_Netcdf_LIBRARIES "$ENV{NETCDF_ROOT}/lib/libnetcdf.${ATDM_TPL_LIB_EXT};${PNETCDF_ROOT}/lib/libpnetcdf.a;${HDF5_ROOT}/lib/libhdf5_hl.${ATDM_TPL_LIB_EXT};${HDF5_ROOT}/lib/libhdf5.${ATDM_TPL_LIB_EXT};$ENV{ZLIB_ROOT}/lib/libz.${ATDM_TPL_LIB_EXT};-ldl;-lcurl" CACHE FILEPATH) ENDIF() ENDIF() # SuperLUDist -ATDM_SET_ENABLE(TPL_ENABLE_SuperLUDist ${ATDM_ENABLE_SPARC_SETTINGS}) -ATDM_SET_CACHE(SuperLUDist_INCLUDE_DIRS "$ENV{ATDM_CONFIG_SUPERLUDIST_INCLUDE_DIRS}" CACHE FILEPATH) -ATDM_SET_CACHE(TPL_SuperLUDist_LIBRARIES "$ENV{ATDM_CONFIG_SUPERLUDIST_LIBS}" CACHE FILEPATH) +IF (ATDM_ENABLE_SPARC_SETTINGS AND ATDM_USE_MPI) + ATDM_SET_ENABLE(TPL_ENABLE_SuperLUDist ON) + ATDM_SET_CACHE(SuperLUDist_INCLUDE_DIRS "$ENV{ATDM_CONFIG_SUPERLUDIST_INCLUDE_DIRS}" CACHE FILEPATH) + ATDM_SET_CACHE(TPL_SuperLUDist_LIBRARIES "$ENV{ATDM_CONFIG_SUPERLUDIST_LIBS}" CACHE FILEPATH) +ELSE() + ATDM_SET_ENABLE(TPL_ENABLE_SuperLUDist OFF) +ENDIF() # DLlib ATDM_SET_CACHE(TPL_DLlib_LIBRARIES "-ldl" CACHE FILEPATH) diff --git a/cmake/std/atdm/CMakeLists.txt b/cmake/std/atdm/CMakeLists.txt index fb13f84118bb..836684aec829 100644 --- a/cmake/std/atdm/CMakeLists.txt +++ b/cmake/std/atdm/CMakeLists.txt @@ -5,4 +5,5 @@ TRIBITS_ADD_TEST_DIRECTORIES(van1-tx2) TRIBITS_ADD_TEST_DIRECTORIES(ats1) TRIBITS_ADD_TEST_DIRECTORIES(ats2) TRIBITS_ADD_TEST_DIRECTORIES(cts1) +TRIBITS_ADD_TEST_DIRECTORIES(cts1empire) TRIBITS_PACKAGE_POSTPROCESS() diff --git a/cmake/std/atdm/README.md b/cmake/std/atdm/README.md index 92f892a6e4cc..5f36a42cbd06 100644 --- a/cmake/std/atdm/README.md +++ b/cmake/std/atdm/README.md @@ -78,7 +78,7 @@ keywords of the form `XXX---...-YYY` (or `XXX___..._YYY`, either separator is supported). The typical order and format of this string is: - -------- + --------- but any order of these keywords is supported. Also, the keywords are case-insensitive All of these keywords, except for `` (which can be @@ -88,10 +88,11 @@ name of a keyword is ignored.) See some examples of build name strings [below](#build-name-examples). Each of these keywords [``](#system_name), -[``](#kokkos_arch), [``](#compiler), -[``](#kokkos_thread), [``](#rdc), [``](#fpic), -[``](#complex), [``](#shared_static), -[``](#release_debug), and [``](#pt), are described below. +[``](#use_mpi), [``](#kokkos_arch), +[``](#compiler), [``](#kokkos_thread), +[``](#rdc), [``](#fpic), [``](#complex), +[``](#shared_static), [``](#release_debug), and +[``](#pt), are described below. @@ -167,6 +168,16 @@ which compilers and which versions are supported for a given system.) If Carefully examine STDOUT after running `source cmake/std/atdm/load-env ` to see what compiler gets selected. + + +**``:** The following `` keywords determine if MPI is + enabled or not in Trilinos (i.e. the value of `TPL_ENABLE_MPI`): + +* `mpi`: Enable MPI and use MPI compler wrappers (`TPL_ENABLE_MPI=ON`, DEFAULT) +* `no-mpi`: Don't enable MPI and use raw compilers (except for CUDA builds that use `nvcc_wrapper` for the C++ compiler) (`TPL_ENABLE_MPI=OFF`) + +NOTE: Setting `no-mpi` also switches to some non-MPI TPL builds and disables other TPLs like SuperLUDist that require MPI. + **``:** The following `` keywords determine the diff --git a/cmake/std/atdm/apps/sparc/SPARCMiniTrilinosPackagesEnables.cmake b/cmake/std/atdm/apps/sparc/SPARCMiniTrilinosPackagesEnables.cmake new file mode 100644 index 000000000000..f6ba2497dc39 --- /dev/null +++ b/cmake/std/atdm/apps/sparc/SPARCMiniTrilinosPackagesEnables.cmake @@ -0,0 +1,10 @@ +INCLUDE("${CMAKE_CURRENT_LIST_DIR}/SPARCMiniTrilinosPackagesList.cmake") +FOREACH(TRIBITS_PACKAGE ${SPARC_MiniTrilinos_Package_Enables}) + SET(${PROJECT_NAME}_ENABLE_${TRIBITS_PACKAGE} ON CACHE BOOL "") +ENDFOREACH() +FOREACH(TRIBITS_PACKAGE ${SPARC_MiniTrilinos_Package_Disables}) + SET(${PROJECT_NAME}_ENABLE_${TRIBITS_PACKAGE} OFF CACHE BOOL "") +ENDFOREACH() +FOREACH(TRIBITS_TPL ${SPARC_MiniTrilinos_TPL_Disables}) + SET(TPL_ENABLE_${TRIBITS_TPL} OFF CACHE BOOL "") +ENDFOREACH() diff --git a/cmake/std/atdm/apps/sparc/SPARCMiniTrilinosPackagesList.cmake b/cmake/std/atdm/apps/sparc/SPARCMiniTrilinosPackagesList.cmake new file mode 100644 index 000000000000..d0ebf210dff6 --- /dev/null +++ b/cmake/std/atdm/apps/sparc/SPARCMiniTrilinosPackagesList.cmake @@ -0,0 +1,11 @@ +SET(SPARC_MiniTrilinos_Package_Enables + Kokkos + SEACAS + ) +SET(SPARC_MiniTrilinos_Package_Disables + Pamgen + ) +SET(SPARC_MiniTrilinos_TPL_Disables + METIS + ParMETIS + ) diff --git a/cmake/std/atdm/apps/sparc/SPARC_MiniTrilinos_PACKAGES.cmake b/cmake/std/atdm/apps/sparc/SPARC_MiniTrilinos_PACKAGES.cmake new file mode 100644 index 000000000000..b2aedccc1f9b --- /dev/null +++ b/cmake/std/atdm/apps/sparc/SPARC_MiniTrilinos_PACKAGES.cmake @@ -0,0 +1,7 @@ +# Include this file in the driver that calls TRIBITS_CTEST_DRIVER() to set the +# list of packages used by a mini build of SPARC. +INCLUDE("${CMAKE_CURRENT_LIST_DIR}/SPARCMiniTrilinosPackagesEnables.cmake") +SET(Trilinos_PACKAGES ${SPARC_MiniTrilinos_Package_Enables}) +# NOTE: Above, it is harmless to have the package enables set in +# SPARCMiniTrilinosPackagesEnables.cmake in the outer ctest -S driver script. +# We just include that file here to avoid duplicate code. diff --git a/cmake/std/atdm/apps/sparc/SPARC_Trilinos_PACKAGES.cmake b/cmake/std/atdm/apps/sparc/SPARC_Trilinos_PACKAGES.cmake new file mode 100644 index 000000000000..1ce5e2d6635d --- /dev/null +++ b/cmake/std/atdm/apps/sparc/SPARC_Trilinos_PACKAGES.cmake @@ -0,0 +1,8 @@ +# Include this file in the driver that calls TRIBITS_CTEST_DRIVER() to set the +# list of packages used by SPARC. +INCLUDE("${CMAKE_CURRENT_LIST_DIR}/SPARCTrilinosPackagesList.cmake") +SET(Trilinos_PACKAGES ${SPARC_Trilinos_Packages}) +# NOTE: Above, even though SPARC_Trilinos_Packages may list a bunch of +# packages that we don't want to test, the file ATDMDisables.cmake has +# _ENABLE_TESTS set to OFF for all fo the packages that we don't want +# to test. diff --git a/cmake/std/atdm/ats2/CMakeLists.txt b/cmake/std/atdm/ats2/CMakeLists.txt index 720e0d588a60..5b1fff37b0ce 100644 --- a/cmake/std/atdm/ats2/CMakeLists.txt +++ b/cmake/std/atdm/ats2/CMakeLists.txt @@ -5,7 +5,7 @@ TRIBITS_ADD_ADVANCED_TEST( ats2_custom_builds_unit_tests ARGS SHUNIT_COLOR=none ${CMAKE_CURRENT_SOURCE_DIR}/custom_builds_unit_tests.sh PASS_REGULAR_EXPRESSION_ALL "ERROR: A supported compiler was not selected for 'ats2' env - anything-cudas-after" - "Ran 1 test" + "Ran 3 tests" "[^]OK[$]" ALWAYS_FAIL_ON_NONZERO_RETURN ) diff --git a/cmake/std/atdm/ats2/all_supported_builds.sh b/cmake/std/atdm/ats2/all_supported_builds.sh index 03cb5311db2e..2b5b18e0560d 100644 --- a/cmake/std/atdm/ats2/all_supported_builds.sh +++ b/cmake/std/atdm/ats2/all_supported_builds.sh @@ -1,12 +1,14 @@ export ATDM_CONFIG_CTEST_S_BUILD_NAME_PREFIX=Trilinos-atdm- -# ats2-xl-2019.08.20-spmpi-rolling_openmp_static_opt -# ats2-xl-2019.08.20-spmpi-rolling_openmp_static_dbg export ATDM_CONFIG_ALL_SUPPORTED_BUILDS=( ats2-gnu-7.3.1-spmpi-rolling_serial_static_opt ats2-gnu-7.3.1-spmpi-rolling_serial_static_dbg ats2-cuda-10.1.243-gnu-7.3.1-spmpi-rolling_static_opt ats2-cuda-10.1.243-gnu-7.3.1-spmpi-rolling_static_dbg ats2-cuda-10.1.243-gnu-7.3.1-spmpi-rolling_complex_static_opt + ats2-xl-2020.03.18_spmpi-rolling_serial_static_opt + ats2-xl-2020.03.18_spmpi-rolling_serial_static_dbg + ats2-cuda-10.1.243-xl-2020.03.18_spmpi-rolling_static_opt + ats2-cuda-10.1.243-xl-2020.03.18_spmpi-rolling_static_dbg ) diff --git a/cmake/std/atdm/ats2/custom_builds.sh b/cmake/std/atdm/ats2/custom_builds.sh index 7c4154f045ce..df54a0f83c7c 100644 --- a/cmake/std/atdm/ats2/custom_builds.sh +++ b/cmake/std/atdm/ats2/custom_builds.sh @@ -6,34 +6,28 @@ # # Custom compiler selection logic - if atdm_match_any_buildname_keyword \ - cuda-10.1.243-xl-2019.08.20-spmpi-rolling \ - cuda-10.1.243_xl-2019.08.20_spmpi-rolling \ - cuda-10.1.243-xl-2019.08.20 \ - cuda-10.1.243_xl-2019.08.20 \ - cuda-10.1.243-xl-2019 \ - cuda-10.1.243_xl-2019 \ - cuda-xl\ + cuda-10.1.243-xl-2020.03.18-spmpi-rolling \ + cuda-10.1.243-xl-2020.03.18_spmpi-rolling \ + cuda-10.1.243_xl-2020.03.18-spmpi-rolling \ + cuda-10.1.243_xl-2020.03.18_spmpi-rolling \ + cuda-10.1.243-xl-2020.03.18 \ + cuda-10.1.243_xl-2020.03.18 \ + cuda-10.1.243-xl-2020 \ + cuda-10.1.243_xl-2020 \ + cuda-xl \ + cuda_xl \ ; then - echo - echo "ERROR: Currently not supporting cuda-10.1.243-xl-2019.08.20-spmpi-rolling" - echo - return - #export ATDM_CONFIG_COMPILER=CUDA-10.1.243_XL-2019.08.20_SPMPI-ROLLING + export ATDM_CONFIG_COMPILER=CUDA-10.1.243_XL-2020.03.18_SPMPI-ROLLING elif atdm_match_any_buildname_keyword \ - xl-2019.08.20-spmpi-rolling \ - xl-2019.08.20_spmpi-rolling \ - xl-2019.08.20 \ - xl-2019 \ + xl-2020.03.18-spmpi-rolling \ + xl-2020.03.18_spmpi-rolling \ + xl-2020.03.18 \ + xl-2020 \ xl \ ; then - echo - echo "ERROR: Currently not supporting xl-2019.08.20-spmpi-rolling" - echo - return - #export ATDM_CONFIG_COMPILER=XL-2019.08.20_SPMPI-ROLLING + export ATDM_CONFIG_COMPILER=XL-2020.03.18_SPMPI-ROLLING elif atdm_match_any_buildname_keyword \ cuda-10.1.243-gnu-7.3.1-spmpi-rolling \ @@ -68,10 +62,10 @@ else echo "***" echo "*** Supported compilers include:" echo "***" - echo "**** gnu-7.3.1_spmpi-rolling (default, default gnu)" - echo "**** cuda-10.1.243_gnu-7.3.1_spmpi-rolling (default cuda)" - echo "**** xl-2019.08.20_spmpi-rolling (disabled)" - echo "**** cuda-10.1.243-gnu-7.3.1-spmpi-rolling (disabled)" + echo "**** gnu-7.3.1_spmpi-rolling (default, default gnu)" + echo "**** cuda-10.1.243_gnu-7.3.1_spmpi-rolling (default cuda)" + echo "**** xl-2020.03.18_spmpi-rolling (default xl)" + echo "**** cuda-10.1.243-xl-2020.03.18_spmpi-rolling (default cuda-xl)" echo "***" return diff --git a/cmake/std/atdm/ats2/custom_builds_unit_tests.sh b/cmake/std/atdm/ats2/custom_builds_unit_tests.sh index c7a9ab7516a1..0fc8a53c4352 100755 --- a/cmake/std/atdm/ats2/custom_builds_unit_tests.sh +++ b/cmake/std/atdm/ats2/custom_builds_unit_tests.sh @@ -1,14 +1,104 @@ #!/bin/bash -CURRENT_SCRIPTS_DIR=`echo $BASH_SOURCE | sed "s/\(.*\)\/.*\.sh/\1/g"` -ATDM_CONFIG_SCRIPT_DIR=`readlink -f ${CURRENT_SCRIPTS_DIR}/..` -ATDM_CONFIG_SYSTEM_DIR=${ATDM_CONFIG_SCRIPT_DIR}/ats2 +if [[ "$(uname)" == "Darwin" ]]; then + ATDM_CONFIG_SCRIPT_DIR=".." + source "${ATDM_CONFIG_SCRIPT_DIR}/utils/define_atdm_match_keyword.sh" + ATDM_CONFIG_SYSTEM_DIR=${ATDM_CONFIG_SCRIPT_DIR}/ats2 + SHUNIT2_DIR="${ATDM_CONFIG_SCRIPT_DIR}/../../../commonTools/test/shunit2" +else + CURRENT_SCRIPTS_DIR=`echo $BASH_SOURCE | sed "s/\(.*\)\/.*\.sh/\1/g"` + ATDM_CONFIG_SCRIPT_DIR=`readlink -f ${CURRENT_SCRIPTS_DIR}/..` + ATDM_CONFIG_SYSTEM_DIR=${ATDM_CONFIG_SCRIPT_DIR}/ats2 + SHUNIT2_DIR=`readlink -f ${ATDM_CONFIG_SCRIPT_DIR}/../../../commonTools/test/shunit2` +fi + +testXl() { + ATDM_CONFIG_BUILD_NAME=default-xl + . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh + ${_ASSERT_EQUALS_} XL-2020.03.18_SPMPI-ROLLING ${ATDM_CONFIG_COMPILER} + + ATDM_CONFIG_BUILD_NAME=before_xl-2020.03.18-spmpi-rolling_after + . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh + ${_ASSERT_EQUALS_} XL-2020.03.18_SPMPI-ROLLING ${ATDM_CONFIG_COMPILER} + + ATDM_CONFIG_BUILD_NAME=before_xl-2020.03.18_spmpi-rolling_after + . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh + ${_ASSERT_EQUALS_} XL-2020.03.18_SPMPI-ROLLING ${ATDM_CONFIG_COMPILER} + + ATDM_CONFIG_BUILD_NAME=before_xl-2020.03.18_after + . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh + ${_ASSERT_EQUALS_} XL-2020.03.18_SPMPI-ROLLING ${ATDM_CONFIG_COMPILER} + + ATDM_CONFIG_BUILD_NAME=before_xl-2020_after + . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh + ${_ASSERT_EQUALS_} XL-2020.03.18_SPMPI-ROLLING ${ATDM_CONFIG_COMPILER} + + ATDM_CONFIG_BUILD_NAME=before_xl_after + . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh + ${_ASSERT_EQUALS_} XL-2020.03.18_SPMPI-ROLLING ${ATDM_CONFIG_COMPILER} + + # This should not match anything and should be an error! + ATDM_CONFIG_BUILD_NAME=anything-xls-after + . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh + ${_ASSERT_EQUALS_} DEFAULT ${ATDM_CONFIG_COMPILER} +} + +testXlCuda() { + ATDM_CONFIG_BUILD_NAME=default-cuda-xl + . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh + ${_ASSERT_EQUALS_} CUDA-10.1.243_XL-2020.03.18_SPMPI-ROLLING ${ATDM_CONFIG_COMPILER} + + ATDM_CONFIG_BUILD_NAME=before_cuda-10.1.243-xl-2020.03.18-spmpi-rolling_after + . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh + ${_ASSERT_EQUALS_} CUDA-10.1.243_XL-2020.03.18_SPMPI-ROLLING ${ATDM_CONFIG_COMPILER} + + ATDM_CONFIG_BUILD_NAME=before_cuda-10.1.243-xl-2020.03.18_spmpi-rolling_after + . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh + ${_ASSERT_EQUALS_} CUDA-10.1.243_XL-2020.03.18_SPMPI-ROLLING ${ATDM_CONFIG_COMPILER} + + ATDM_CONFIG_BUILD_NAME=before_cuda-10.1.243-xl-2020.03.18_after + . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh + ${_ASSERT_EQUALS_} CUDA-10.1.243_XL-2020.03.18_SPMPI-ROLLING ${ATDM_CONFIG_COMPILER} + + ATDM_CONFIG_BUILD_NAME=before_cuda-10.1.243-xl-2020_after + . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh + ${_ASSERT_EQUALS_} CUDA-10.1.243_XL-2020.03.18_SPMPI-ROLLING ${ATDM_CONFIG_COMPILER} + + ATDM_CONFIG_BUILD_NAME=before_cuda-xl_after + . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh + ${_ASSERT_EQUALS_} CUDA-10.1.243_XL-2020.03.18_SPMPI-ROLLING ${ATDM_CONFIG_COMPILER} + + ATDM_CONFIG_BUILD_NAME=before_cuda-10.1.243_xl-2020.03.18-spmpi-rolling_after + . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh + ${_ASSERT_EQUALS_} CUDA-10.1.243_XL-2020.03.18_SPMPI-ROLLING ${ATDM_CONFIG_COMPILER} + + ATDM_CONFIG_BUILD_NAME=before_cuda-10.1.243_xl-2020.03.18_spmpi-rolling_after + . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh + ${_ASSERT_EQUALS_} CUDA-10.1.243_XL-2020.03.18_SPMPI-ROLLING ${ATDM_CONFIG_COMPILER} + + ATDM_CONFIG_BUILD_NAME=before_cuda-10.1.243_xl-2020.03.18_after + . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh + ${_ASSERT_EQUALS_} CUDA-10.1.243_XL-2020.03.18_SPMPI-ROLLING ${ATDM_CONFIG_COMPILER} + + ATDM_CONFIG_BUILD_NAME=before_cuda-10.1.243_xl-2020_after + . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh + ${_ASSERT_EQUALS_} CUDA-10.1.243_XL-2020.03.18_SPMPI-ROLLING ${ATDM_CONFIG_COMPILER} + + ATDM_CONFIG_BUILD_NAME=before_cuda_xl_after + . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh + ${_ASSERT_EQUALS_} CUDA-10.1.243_XL-2020.03.18_SPMPI-ROLLING ${ATDM_CONFIG_COMPILER} + + # This should not match anything and should be an error! + ATDM_CONFIG_BUILD_NAME=anything-cudas-xls-after + . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh + ${_ASSERT_EQUALS_} DEFAULT ${ATDM_CONFIG_COMPILER} +} # # Test compiler parsing # -testAll() { +testGnu() { ATDM_CONFIG_BUILD_NAME=default . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh @@ -82,5 +172,4 @@ testAll() { # Run the unit tests # -SHUNIT2_DIR=`readlink -f ${ATDM_CONFIG_SCRIPT_DIR}/../../../commonTools/test/shunit2` . ${SHUNIT2_DIR}/shunit2 diff --git a/cmake/std/atdm/ats2/environment.sh b/cmake/std/atdm/ats2/environment.sh index 68842fcc0c9f..c265398d0a8e 100644 --- a/cmake/std/atdm/ats2/environment.sh +++ b/cmake/std/atdm/ats2/environment.sh @@ -56,7 +56,6 @@ echo "Using $ATDM_CONFIG_SYSTEM_NAME compiler stack $ATDM_CONFIG_COMPILER to bui # Some basic settings export ATDM_CONFIG_ENABLE_SPARC_SETTINGS=ON -export ATDM_CONFIG_USE_NINJA=ON export ATDM_CONFIG_BUILD_COUNT=8 # Assume building on the shared login node! # Set ctest -j parallel level for non-CUDA builds @@ -72,7 +71,7 @@ fi module purge --silent module load StdEnv -# Load the sparc-dev/xxx module +# Load the sparc-dev/xxx module sparc_module_name=$(get_sparc_dev_module_name "$ATDM_CONFIG_COMPILER") module load ${sparc_module_name} @@ -88,8 +87,26 @@ if [[ "$ATDM_CONFIG_COMPILER" == *"GNU"* ]]; then export INCLUDE=${BINUTILS_ROOT}/include:${INCLUDE} export CPATH=${BINUTILS_ROOT}/include:${CPATH} -# ToDo: Add support for xl when needed + export ATDM_CONFIG_USE_NINJA=ON + # Prepend path to updated and patched CMake 3.17.2 + # Only use updated cmake version for gnu builds. XL compiler tests fail + # with this newer cmake version. + module unload cmake + export PATH=/projects/atdm_devops/vortex/cmake-3.17.2/bin:$PATH + +elif [[ "$ATDM_CONFIG_COMPILER" == *"XL"* ]]; then + + # Point to binutils root. + export BINUTILS_ROOT=/usr/tce/packages/gcc/gcc-7.3.1 + export LD_LIBRARY_PATH=${BINUTILS_ROOT}/lib:${LD_LIBRARY_PATH} + export LIBRARY_PATH=${BINUTILS_ROOT}/lib + export INCLUDE=${BINUTILS_ROOT}/include:${INCLUDE} + export CPATH=${BINUTILS_ROOT}/include:${CPATH} + export BLAS_ROOT=${CBLAS_ROOT} + + # Don't use ninja as the fortran compiler test is broken. + export ATDM_CONFIG_USE_NINJA=OFF fi # Set up stuff related to CUDA @@ -134,10 +151,6 @@ fi # Prepend path to ninja after all of the modules are loaded export PATH=/projects/atdm_devops/vortex/ninja-fortran-1.8.2:$PATH -# Prepend path to updated and patched CMake 3.17.2 -module unload cmake -export PATH=/projects/atdm_devops/vortex/cmake-3.17.2/bin:$PATH - # Set a standard git so everyone has the same git module load git/2.20.0 diff --git a/cmake/std/atdm/cee-rhel6/CMakeLists.txt b/cmake/std/atdm/cee-rhel6/CMakeLists.txt index 5b1fab7c941e..3f753df8b48c 100644 --- a/cmake/std/atdm/cee-rhel6/CMakeLists.txt +++ b/cmake/std/atdm/cee-rhel6/CMakeLists.txt @@ -4,7 +4,7 @@ TRIBITS_ADD_ADVANCED_TEST( cee-rhel6_custom_builds_unit_tests TEST_0 CMND env ARGS SHUNIT_COLOR=none ${CMAKE_CURRENT_SOURCE_DIR}/custom_builds_unit_tests.sh PASS_REGULAR_EXPRESSION_ALL - "Ran 1 test" + "Ran 2 tests" "[^]OK[$]" ALWAYS_FAIL_ON_NONZERO_RETURN ) diff --git a/cmake/std/atdm/cee-rhel6/all_supported_builds.sh b/cmake/std/atdm/cee-rhel6/all_supported_builds.sh index 74b2d7738320..65047825cb37 100644 --- a/cmake/std/atdm/cee-rhel6/all_supported_builds.sh +++ b/cmake/std/atdm/cee-rhel6/all_supported_builds.sh @@ -2,13 +2,41 @@ export ATDM_CONFIG_CTEST_S_BUILD_NAME_PREFIX=Trilinos-atdm- -export ATDM_CONFIG_ALL_SUPPORTED_BUILDS=( - #cee-rhel6_clang-9.0.1_openmpi-4.0.3_serial_static_dbg # SPARC has installs with this build - cee-rhel6_clang-9.0.1_openmpi-4.0.3_serial_static_opt # SPARC CI build - cee-rhel6_gnu-7.2.0_openmpi-4.0.3_serial_shared_opt # SPARC CI build - cee-rhel6_intel-18.0.2_mpich2-3.2_openmp_static_opt # SPARC CI build - cee-rhel6_intel-19.0.3_intelmpi-2018.4_serial_static_opt # SPARC Nightly bulid - ) +HOSTNAME=$(hostname) + +if [[ "${HOSTNAME}" == "ascicgpu"* ]] ; then + export ATDM_CONFIG_ALL_SUPPORTED_BUILDS=( + cee-rhel6_cuda-10.1.243_gcc-7.2.0_openmpi-4.0.3_shared_opt # SPARC Nightly build + cee-rhel6_cuda-10.1.243_gcc-7.2.0_openmpi-4.0.3_shared_dbg # SPARC Nightly build + ### SPARC MINI BUILDS #### + cee-rhel6_mini_cuda-10.1.243_gcc-7.2.0_openmpi-4.0.3_static_opt + cee-rhel6_mini_cuda-10.1.243_gcc-7.2.0_openmpi-4.0.3_static_dbg + cee-rhel6_mini-no-mpi_cuda-10.1.243_gcc-7.2.0_static_opt + ) +else + export ATDM_CONFIG_ALL_SUPPORTED_BUILDS=( + #cee-rhel6_clang-9.0.1_openmpi-4.0.3_serial_static_dbg # SPARC has installs with this build + cee-rhel6_clang-9.0.1_openmpi-4.0.3_serial_static_opt # SPARC CI build + cee-rhel6_gnu-7.2.0_openmpi-4.0.3_serial_shared_opt # SPARC CI build + cee-rhel6_intel-18.0.2_mpich2-3.2_openmp_static_opt # SPARC CI build + cee-rhel6_intel-19.0.3_intelmpi-2018.4_serial_static_opt # SPARC Nightly bulid + cee-rhel6_mini_clang-9.0.1_openmpi-4.0.3_serial_static_opt + #### SPARC MINI BUILDS #### + cee-rhel6_mini_gnu-7.2.0_openmpi-4.0.3_serial_static_opt + cee-rhel6_mini_clang-9.0.1_openmpi-4.0.3_serial_static_opt + cee-rhel6_mini-no-mpi_gnu-7.2.0_serial_static_opt + cee-rhel6_mini-no-mpi_clang-9.0.1_serial_static_opt + cee-rhel6_mini_intel-18.0.2_mpich2-3.2_static_opt + cee-rhel6_mini-no-mpi_intel-18.0.2_mpich2-3.2_static_opt + ) +fi # NOTE: Above, we have commented out the 'dbg' build because it was running # the test suite very slow and had many timeouts (see ATDV-322) + +# NOTE: You have to run the CEE CUDA builds on an 'ascicgpu' machine or they +# generate binaries that don't work for the 'ascicgpu' machines. At the same +# time, the 'ascicgpu' machines are a coveted resource so we don't want to +# waste an 'ascicgpu' machine with builds that don't even require running on +# the GPU. So to run the non CUDA-builds, get on a CEE machine that does not +# have a GPU and to run the CUDA builds, get on an 'ascicgpu' machine. diff --git a/cmake/std/atdm/cee-rhel6/custom_builds.sh b/cmake/std/atdm/cee-rhel6/custom_builds.sh index 2665c1c76f15..034f34f259b6 100644 --- a/cmake/std/atdm/cee-rhel6/custom_builds.sh +++ b/cmake/std/atdm/cee-rhel6/custom_builds.sh @@ -49,6 +49,16 @@ elif atdm_match_any_buildname_keyword \ # List default intel build last of all the 'intel' builds for correct # matching! +elif atdm_match_any_buildname_keyword \ + cuda-10.1.243_gcc-7.2.0-openmpi-4.0.3 \ + cuda-10.1.243_gcc-7.2.0_openmpi-4.0.3 \ + cuda-10.1.243_gcc-7.2.0 \ + cuda-10.1.243 \ + cuda-10 \ + cuda \ + ; then + export ATDM_CONFIG_COMPILER=CUDA-10.1.243_GCC-7.2.0_OPENMPI-4.0.3 + else echo echo "***" @@ -56,10 +66,11 @@ else echo "***" echo "*** Supported compilers include:" echo "***" - echo "**** clang-9.0.1-openmpi-4.0.3 (default, default clang)" - echo "**** gnu-7.2.0-openmpi-4.0.3 (default gnu)" + echo "**** clang-9.0.1-openmpi-4.0.3 (default, default clang)" + echo "**** gnu-7.2.0-openmpi-4.0.3 (default gnu)" echo "**** intel-18.0.2-mpich2-3.2" - echo "**** intel-19.0.3-intelmpi-2018.4 (default intel)" + echo "**** intel-19.0.3-intelmpi-2018.4 (default intel)" + echo "**** cuda-10.1.243_gcc-7.2.0-openmpi-4.0.3 (default cuda)" echo "***" return diff --git a/cmake/std/atdm/cee-rhel6/custom_builds_unit_tests.sh b/cmake/std/atdm/cee-rhel6/custom_builds_unit_tests.sh index e012085aa1cc..7e1b1447af33 100755 --- a/cmake/std/atdm/cee-rhel6/custom_builds_unit_tests.sh +++ b/cmake/std/atdm/cee-rhel6/custom_builds_unit_tests.sh @@ -1,17 +1,63 @@ #!/bin/bash -CURRENT_SCRIPTS_DIR=`echo $BASH_SOURCE | sed "s/\(.*\)\/.*\.sh/\1/g"` -ATDM_CONFIG_SCRIPT_DIR=`readlink -f ${CURRENT_SCRIPTS_DIR}/..` +if [[ "$(uname)" == "Darwin" ]]; then + ATDM_CONFIG_SCRIPT_DIR=.. + source "${ATDM_CONFIG_SCRIPT_DIR}/utils/define_atdm_match_keyword.sh" + SHUNIT2_DIR="${ATDM_CONFIG_SCRIPT_DIR}/../../../commonTools/test/shunit2" +else + CURRENT_SCRIPTS_DIR=`echo $BASH_SOURCE | sed "s/\(.*\)\/.*\.sh/\1/g"` + ATDM_CONFIG_SCRIPT_DIR=`readlink -f ${CURRENT_SCRIPTS_DIR}/..` + SHUNIT2_DIR=`readlink -f ${ATDM_CONFIG_SCRIPT_DIR}/../../../commonTools/test/shunit2` +fi + +ATDM_CONFIG_SYSTEM_DIR=${ATDM_CONFIG_SCRIPT_DIR}/cee-rhel6 # # Test compiler parsing # +testCuda() { + ATDM_CONFIG_BUILD_NAME=before_cuda-10.1.243-gcc-7.2.0_openmpi-4.0.3-after + . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh + ${_ASSERT_EQUALS_} CUDA-10.1.243_GCC-7.2.0_OPENMPI-4.0.3 ${ATDM_CONFIG_COMPILER} -testAll() { + ATDM_CONFIG_BUILD_NAME=before_cuda-10.1.243_gcc-7.2.0_openmpi-4.0.3-after + . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh + ${_ASSERT_EQUALS_} CUDA-10.1.243_GCC-7.2.0_OPENMPI-4.0.3 ${ATDM_CONFIG_COMPILER} - ATDM_CONFIG_SYSTEM_DIR=${ATDM_CONFIG_SCRIPT_DIR}/cee-rhel6 + ATDM_CONFIG_BUILD_NAME=before_cuda-10.1.243-after + . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh + ${_ASSERT_EQUALS_} CUDA-10.1.243_GCC-7.2.0_OPENMPI-4.0.3 ${ATDM_CONFIG_COMPILER} + ATDM_CONFIG_BUILD_NAME=before_cuda-10-after + . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh + ${_ASSERT_EQUALS_} CUDA-10.1.243_GCC-7.2.0_OPENMPI-4.0.3 ${ATDM_CONFIG_COMPILER} + + ATDM_CONFIG_BUILD_NAME=before_cuda-after + . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh + ${_ASSERT_EQUALS_} CUDA-10.1.243_GCC-7.2.0_OPENMPI-4.0.3 ${ATDM_CONFIG_COMPILER} + + # Check that 'somethingcuda' does not match 'cuda'! (Shows true keyword + # matching is working) + ATDM_CONFIG_BUILD_NAME=somethingcuda + STDOUT=$(. ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh 2>&1) + GREP_LINE=$(echo "${STDOUT}" | grep "ERROR: A supported compiler was not selected") + GREP_LINE_EXPECTED="*** ERROR: A supported compiler was not selected for 'cee-rhel6' env in buildname 'somethingcuda'" + #echo "GREP_LINE = [${GREP_LINE}]" + echo "GREP_LINE_EXPECTED = [${GREP_LINE_EXPECTED}]" + ${_ASSERT_EQUALS_} '"${GREP_LINE}"' '"${GREP_LINE_EXPECTED}"' + + # Check that missing compiler prints right error messagematch 'gnu'! + ATDM_CONFIG_BUILD_NAME=help + STDOUT=$(. ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh 2>&1) + GREP_LINE=$(echo "${STDOUT}" | grep "ERROR: A supported compiler was not selected") + GREP_LINE_EXPECTED="*** ERROR: A supported compiler was not selected for 'cee-rhel6' env in buildname 'help'" + #echo "GREP_LINE = [${GREP_LINE}]" + echo "GREP_LINE_EXPECTED = [${GREP_LINE_EXPECTED}]" + ${_ASSERT_EQUALS_} '"${GREP_LINE}"' '"${GREP_LINE_EXPECTED}"' +} + +testAll() { ATDM_CONFIG_BUILD_NAME=default . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh ${_ASSERT_EQUALS_} ${ATDM_CONFIG_COMPILER} CLANG-9.0.1_OPENMPI-4.0.3 @@ -132,5 +178,4 @@ testAll() { # Run the unit tests # -SHUNIT2_DIR=`readlink -f ${ATDM_CONFIG_SCRIPT_DIR}/../../../commonTools/test/shunit2` . ${SHUNIT2_DIR}/shunit2 diff --git a/cmake/std/atdm/cee-rhel6/environment.sh b/cmake/std/atdm/cee-rhel6/environment.sh index e55066eca7a2..d5041e51907b 100755 --- a/cmake/std/atdm/cee-rhel6/environment.sh +++ b/cmake/std/atdm/cee-rhel6/environment.sh @@ -16,6 +16,9 @@ fi if [[ "$ATDM_CONFIG_KOKKOS_ARCH" == "DEFAULT" ]] ; then unset ATDM_CONFIG_KOKKOS_ARCH + if [[ "$ATDM_CONFIG_COMPILER" == "CUDA-10.1.243_GCC-7.2.0_OPENMPI-4.0.3" ]] ; then + export ATDM_CONFIG_KOKKOS_ARCH=VOLTA70 + fi else echo echo "***" @@ -142,6 +145,36 @@ elif [ "$ATDM_CONFIG_COMPILER" == "INTEL-18.0.2_MPICH2-3.2" ]; then export ATDM_CONFIG_OPENMP_FORTRAN_LIB_NAMES=gomp export ATDM_CONFIG_OPENMP_GOMP_LIBRARY=-lgomp +elif [ "$ATDM_CONFIG_COMPILER" == "CUDA-10.1.243_GCC-7.2.0_OPENMPI-4.0.3" ]; then + # ninja is running into issues with response files when building shared libraries with CUDA. + # nvcc reports that no input files were given when generating shared libraries with nvcc. + # Using the Unix Makefiles cmake generator works. + export ATDM_CONFIG_USE_NINJA=OFF + + module load sparc-dev/cuda-10.1.243_gcc-7.2.0_openmpi-4.0.3 + + # OpenMPI Settings + export OMPI_CXX=${ATDM_CONFIG_NVCC_WRAPPER} + if [ ! -x "$OMPI_CXX" ]; then + echo "No nvcc_wrapper found" + return + fi + # NOTE: The above export overrides the value set by the module load above + export MPICC=`which mpicc` + export MPICXX=`which mpicxx` + export MPIF90=`which mpif90` + + # CUDA Settings + if [[ ! -d /tmp/${USER} ]] ; then + echo "Creating /tmp/${USER} for nvcc wrapper!" + mkdir /tmp/${USER} + fi + + export ATDM_CONFIG_MPI_EXEC=mpirun + export ATDM_CONFIG_MPI_EXEC_NUMPROCS_FLAG=-np + export ATDM_CONFIG_MPI_POST_FLAGS="-bind-to;none" + + export ATDM_CONFIG_MKL_ROOT=${CBLAS_ROOT} else echo echo "***" @@ -211,7 +244,13 @@ atdm_config_add_libs_to_var ATDM_CONFIG_BOOST_LIBS ${BOOST_ROOT}/lib .a \ # However, set the direct libs for HDF5 and NetCDF in case we use that option # for building (see env var ATDM_CONFIG_USE_SPARC_TPL_FIND_SETTINGS). -export ATDM_CONFIG_HDF5_LIBS="-L${HDF5_ROOT}/lib;${HDF5_ROOT}/lib/libhdf5_hl.a;${HDF5_ROOT}/lib/libhdf5.a;-lz;-ldl" +if [[ "${ATDM_CONFIG_USE_MPI}" == "ON" ]] ; then + USE_HDF5_ROOT="${HDF5_ROOT}" +else + USE_HDF5_ROOT="${SPARC_SERIAL_HDF5_ROOT}" +fi + +export ATDM_CONFIG_HDF5_LIBS="-L${USE_HDF5_ROOT}/lib;${USE_HDF5_ROOT}/lib/libhdf5_hl.a;${USE_HDF5_ROOT}/lib/libhdf5.a;-lz;-ldl" if [[ "${PNETCDF_ROOT}" == "" ]] ; then export PNETCDF_ROOT=${NETCDF_ROOT} diff --git a/cmake/std/atdm/cts1empire/CMakeLists.txt b/cmake/std/atdm/cts1empire/CMakeLists.txt new file mode 100644 index 000000000000..50539c5ad7a9 --- /dev/null +++ b/cmake/std/atdm/cts1empire/CMakeLists.txt @@ -0,0 +1,11 @@ +TRIBITS_ADD_ADVANCED_TEST( cts1empire_custom_builds_unit_tests + OVERALL_WORKING_DIRECTORY TEST_NAME + OVERALL_NUM_MPI_PROCS 1 + TEST_0 CMND env + ARGS SHUNIT_COLOR=none ${CMAKE_CURRENT_SOURCE_DIR}/custom_builds_unit_tests.sh + PASS_REGULAR_EXPRESSION_ALL + "ERROR: A supported compiler was not selected for 'cts1empire' env - anything-intell" + "Ran 1 test" + "[^]OK[$]" + ALWAYS_FAIL_ON_NONZERO_RETURN + ) diff --git a/cmake/std/atdm/cts1empire/custom_builds.sh b/cmake/std/atdm/cts1empire/custom_builds.sh index 78de4dc8f1d4..a6a851fa5249 100644 --- a/cmake/std/atdm/cts1empire/custom_builds.sh +++ b/cmake/std/atdm/cts1empire/custom_builds.sh @@ -7,17 +7,18 @@ # Custom compiler selection logic -if [[ $ATDM_CONFIG_BUILD_NAME == *"intel-18.0.2-openmpi-4.0.1"* ]] \ - || [[ $ATDM_CONFIG_BUILD_NAME == *"intel-18.0.2_openmpi-4.0.1"* ]] \ - || [[ $ATDM_CONFIG_BUILD_NAME == *"intel-18.0.2"* ]] \ - || [[ $ATDM_CONFIG_BUILD_NAME == *"intel" ]] \ - || [[ $ATDM_CONFIG_BUILD_NAME == *"default" ]] \ +if atdm_match_any_buildname_keyword \ + intel-18.0.2-openmpi-4.0.1 \ + intel-18.0.2_openmpi-4.0.1 \ + intel-18.0.2 \ + intel \ + default \ ; then export ATDM_CONFIG_COMPILER=INTEL-18.0.2_OPENMPI-4.0.1 else echo echo "***" - echo "*** ERROR: A supported compiler was not selected for 'cts1empire' env" + echo "*** ERROR: A supported compiler was not selected for 'cts1empire' env - $ATDM_CONFIG_BUILD_NAME" echo "***" echo "*** Supported compilers include:" echo "***" diff --git a/cmake/std/atdm/cts1empire/custom_builds_unit_tests.sh b/cmake/std/atdm/cts1empire/custom_builds_unit_tests.sh new file mode 100755 index 000000000000..70912a119902 --- /dev/null +++ b/cmake/std/atdm/cts1empire/custom_builds_unit_tests.sh @@ -0,0 +1,55 @@ +#!/bin/bash + +if [[ "$(uname)" == "Darwin" ]]; then + ATDM_CONFIG_SCRIPT_DIR=".." + source "${ATDM_CONFIG_SCRIPT_DIR}/utils/define_atdm_match_keyword.sh" + SHUNIT2_DIR="${ATDM_CONFIG_SCRIPT_DIR}/../../../commonTools/test/shunit2" +else + CURRENT_SCRIPTS_DIR=`echo $BASH_SOURCE | sed "s/\(.*\)\/.*\.sh/\1/g"` + ATDM_CONFIG_SCRIPT_DIR=`readlink -f ${CURRENT_SCRIPTS_DIR}/..` + SHUNIT2_DIR=`readlink -f ${ATDM_CONFIG_SCRIPT_DIR}/../../../commonTools/test/shunit2` +fi + +# +# Test compiler parsing +# + +testAll() { + + ATDM_CONFIG_SYSTEM_DIR=${ATDM_CONFIG_SCRIPT_DIR}/cts1empire + + ATDM_CONFIG_BUILD_NAME=before-intel-18.0.2-openmpi-4.0.1_after + . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh + ${_ASSERT_EQUALS_} INTEL-18.0.2_OPENMPI-4.0.1 ${ATDM_CONFIG_COMPILER} + + ATDM_CONFIG_BUILD_NAME=before-intel-18.0.2_openmpi-4.0.1-after + . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh + ${_ASSERT_EQUALS_} INTEL-18.0.2_OPENMPI-4.0.1 ${ATDM_CONFIG_COMPILER} + + ATDM_CONFIG_BUILD_NAME=before_intel-18.0.2-after + . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh + ${_ASSERT_EQUALS_} INTEL-18.0.2_OPENMPI-4.0.1 ${ATDM_CONFIG_COMPILER} + + ATDM_CONFIG_BUILD_NAME=default + . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh + ${_ASSERT_EQUALS_} INTEL-18.0.2_OPENMPI-4.0.1 ${ATDM_CONFIG_COMPILER} + + ATDM_CONFIG_BUILD_NAME=before-intel-after + . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh + ${_ASSERT_EQUALS_} INTEL-18.0.2_OPENMPI-4.0.1 ${ATDM_CONFIG_COMPILER} + + ATDM_CONFIG_BUILD_NAME=BEFORE-INTEL-AFTER + . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh + ${_ASSERT_EQUALS_} INTEL-18.0.2_OPENMPI-4.0.1 ${ATDM_CONFIG_COMPILER} + + ATDM_CONFIG_BUILD_NAME=anything-intell + . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh + ${_ASSERT_EQUALS_} DEFAULT ${ATDM_CONFIG_COMPILER} + +} + + +# +# Run the unit tests +# +. ${SHUNIT2_DIR}/shunit2 diff --git a/cmake/std/atdm/test/unit_tests/CMakeLists.txt b/cmake/std/atdm/test/unit_tests/CMakeLists.txt index 3d1e64121ae8..48d914c34d5a 100644 --- a/cmake/std/atdm/test/unit_tests/CMakeLists.txt +++ b/cmake/std/atdm/test/unit_tests/CMakeLists.txt @@ -22,7 +22,7 @@ TRIBITS_ADD_ADVANCED_TEST( set_build_options_unit_tests OVERALL_NUM_MPI_PROCS 1 TEST_0 CMND env ARGS SHUNIT_COLOR=none ${CMAKE_CURRENT_SOURCE_DIR}/set_build_options_unit_tests.sh - PASS_REGULAR_EXPRESSION_ALL "Ran 13 test" "[^]OK[$]" + PASS_REGULAR_EXPRESSION_ALL "Ran 14 test" "[^]OK[$]" ALWAYS_FAIL_ON_NONZERO_RETURN ) diff --git a/cmake/std/atdm/test/unit_tests/get_known_system_info_unit_test.sh b/cmake/std/atdm/test/unit_tests/get_known_system_info_unit_test.sh index 79e5e7da084f..580bb899b4df 100755 --- a/cmake/std/atdm/test/unit_tests/get_known_system_info_unit_test.sh +++ b/cmake/std/atdm/test/unit_tests/get_known_system_info_unit_test.sh @@ -16,15 +16,18 @@ fi # Test atdm get_known_system_info script # test_atdm_get_known_system_info() { - # TODO: D.2 needs to be tested by setting these values: + # Tweak these values for testing on other platforms + # TODO: Test branch D.2 in get_known_system_info.sh SNLSYSTEM= SEMS_PLATFORM= ATDM_SYSTEM_NAME= SNLCLUSTER= - - # Get the good ATDM_KNOWN_SYSTEM_NAMES_LIST - ATDM_CONFIG_BUILD_NAME=unit_test + HOST= + ATDM_CONFIG_SEMS_GET_PLATFORM=/fake/path/for/unit/testing/ + ATDM_CONFIG_GET_KNOW_SYSTEM_INFO_REAL_HOSTNAME_OVERRIDE_FOR_UNIT_TESTING=unit_test + ATDM_CONFIG_BUILD_NAME=$ATDM_CONFIG_GET_KNOW_SYSTEM_INFO_REAL_HOSTNAME_OVERRIDE_FOR_UNIT_TESTING ATDM_CONFIG_DISABLE_WARNINGS=ON + # Populate ATDM_KNOWN_SYSTEM_NAMES_LIST source ${ATDM_UTIL_SCRIPT_GET_KNOWN_SYSTEM_INFO} # Check that all known system names pass @@ -55,7 +58,7 @@ test_atdm_get_known_system_info() { SNLSYSTEM=cts1 RET=$(source ${ATDM_UTIL_SCRIPT_GET_KNOWN_SYSTEM_INFO}) assertEquals "Hostname '$ATDM_CONFIG_BUILD_NAME' matches known ATDM host '$ATDM_CONFIG_BUILD_NAME' and system 'cts1empire'" "$RET" - + # Ensure that cts1 is still selected when it's in the build name ATDM_CONFIG_BUILD_NAME=cts1-default ATDM_CONFIG_GET_KNOW_SYSTEM_INFO_REAL_HOSTNAME_OVERRIDE_FOR_UNIT_TESTING=$ATDM_CONFIG_BUILD_NAME diff --git a/cmake/std/atdm/test/unit_tests/set_build_options_unit_tests.sh b/cmake/std/atdm/test/unit_tests/set_build_options_unit_tests.sh index e377c48fea2b..ead1adccc49c 100755 --- a/cmake/std/atdm/test/unit_tests/set_build_options_unit_tests.sh +++ b/cmake/std/atdm/test/unit_tests/set_build_options_unit_tests.sh @@ -11,6 +11,7 @@ ATDM_CONFIG_SCRIPT_DIR=`readlink -f ${CURRENT_SCRIPTS_DIR}/../..` unset ATDM_CONFIG_SYSTEM_NAME unset ATDM_CONFIG_SYSTEM_DIR + testAllDefaults() { ATDM_CONFIG_BUILD_NAME=default . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh @@ -118,6 +119,39 @@ testCompilerIntel() { } +testNompi() { + + ATDM_CONFIG_BUILD_NAME=default + . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh + ${_ASSERT_EQUALS_} ${ATDM_CONFIG_USE_MPI} ON + + ATDM_CONFIG_BUILD_NAME=default-mpi + . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh + ${_ASSERT_EQUALS_} ${ATDM_CONFIG_USE_MPI} ON + + ATDM_CONFIG_BUILD_NAME=default-MPI + . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh + ${_ASSERT_EQUALS_} ${ATDM_CONFIG_USE_MPI} ON + + ATDM_CONFIG_BUILD_NAME=default-mpi-after + . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh + ${_ASSERT_EQUALS_} ${ATDM_CONFIG_USE_MPI} ON + + ATDM_CONFIG_BUILD_NAME=default-no-mpi + . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh + ${_ASSERT_EQUALS_} ${ATDM_CONFIG_USE_MPI} OFF + + ATDM_CONFIG_BUILD_NAME=default-NO-MPI + . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh + ${_ASSERT_EQUALS_} ${ATDM_CONFIG_USE_MPI} OFF + + ATDM_CONFIG_BUILD_NAME=default-no-mpi-after + . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh + ${_ASSERT_EQUALS_} ${ATDM_CONFIG_USE_MPI} OFF + +} + + testKokkosArch() { # Test first arch and defaults for everything else diff --git a/cmake/std/atdm/utils/ATDMDevEnvUtils.cmake b/cmake/std/atdm/utils/ATDMDevEnvUtils.cmake index 8c233957e3c9..58d350f19c2a 100644 --- a/cmake/std/atdm/utils/ATDMDevEnvUtils.cmake +++ b/cmake/std/atdm/utils/ATDMDevEnvUtils.cmake @@ -67,6 +67,3 @@ MACRO(ATDM_SET_ATDM_VAR_FROM_ENV_AND_DEFAULT VAR_BASE_NAME VAR_DEFAULT_VAL) PRINT_VAR(ATDM_${VAR_BASE_NAME}) ENDIF() ENDMACRO() - - - diff --git a/cmake/std/atdm/utils/get_known_system_info.sh b/cmake/std/atdm/utils/get_known_system_info.sh index c1afe1d4c765..3cb28b2c150f 100644 --- a/cmake/std/atdm/utils/get_known_system_info.sh +++ b/cmake/std/atdm/utils/get_known_system_info.sh @@ -30,8 +30,6 @@ fi source ${ATDM_CONFIG_SCRIPT_DIR}/utils/get_system_info_utils.sh -realHostname=`hostname` -hostNameOverride=false if [[ "${ATDM_CONFIG_GET_KNOW_SYSTEM_INFO_REAL_HOSTNAME_OVERRIDE_FOR_UNIT_TESTING}" ]] ; then if [[ -z $ATDM_CONFIG_DISABLE_WARNINGS ]]; then echo @@ -44,7 +42,9 @@ if [[ "${ATDM_CONFIG_GET_KNOW_SYSTEM_INFO_REAL_HOSTNAME_OVERRIDE_FOR_UNIT_TESTIN echo fi realHostname=${ATDM_CONFIG_GET_KNOW_SYSTEM_INFO_REAL_HOSTNAME_OVERRIDE_FOR_UNIT_TESTING} - hostNameOverride=true +else + realHostname=`hostname` + ATDM_CONFIG_SEMS_GET_PLATFORM=/projects/sems/modulefiles/utils/get-platform fi #echo "Hostname = '$realHostname'" @@ -180,9 +180,8 @@ elif [[ "${SNLSYSTEM}" == "astra" || \ "${SNLSYSTEM}" == "vortex" ]] ; then echo "Don't call get-platform on 'astra' systems" > /dev/null # Above logic avoids an 'ERROR: Unrecognized cluster ' on these systems -elif [[ -f /projects/sems/modulefiles/utils/get-platform && - -z $hostNameOverride ]] ; then - ATDM_SYSTEM_NAME=`source /projects/sems/modulefiles/utils/get-platform` +elif [[ -f $ATDM_CONFIG_SEMS_GET_PLATFORM ]] ; then + ATDM_SYSTEM_NAME=`source $ATDM_CONFIG_SEMS_GET_PLATFORM` if [[ $ATDM_SYSTEM_NAME == "rhel6-x86_64" ]] ; then systemNameTypeMatchedList+=(sems-rhel6) systemNameTypeMatchedListHostNames[sems-rhel6]=sems-rhel6 diff --git a/cmake/std/atdm/utils/set_build_options.sh b/cmake/std/atdm/utils/set_build_options.sh index e4158411d234..ddaeb09dfb04 100644 --- a/cmake/std/atdm/utils/set_build_options.sh +++ b/cmake/std/atdm/utils/set_build_options.sh @@ -11,6 +11,7 @@ # On completion, this will set the env vars: # # ATDM_CONFIG_COMPILER +# ATDM_CONFIG_USE_MPI # ATDM_CONFIG_KOKKOS_ARCH # ATDM_CONFIG_BUILD_TYPE # ATDM_CONFIG_NODE_TYPE @@ -58,6 +59,7 @@ echo "Setting compiler and build options for build-name '${ATDM_CONFIG_BUILD_NAM # Set the defaults export ATDM_CONFIG_COMPILER=DEFAULT +export ATDM_CONFIG_USE_MPI=ON export ATDM_CONFIG_KOKKOS_ARCH=DEFAULT export ATDM_CONFIG_BUILD_TYPE=DEBUG export ATDM_CONFIG_SHARED_LIBS=OFF @@ -150,6 +152,13 @@ fi # have the compiler keywords embedded in them. For example we need to match # 'cuda-10.0-gnu-7.4.0' before we match 'gnu-7.4.0'. +# Use MPI or not +if atdm_match_buildname_keyword no-mpi; then + export ATDM_CONFIG_USE_MPI=OFF +elif atdm_match_buildname_keyword mpi; then + export ATDM_CONFIG_USE_MPI=ON +fi + # Set ATDM_CONFIG_KOKKOS_ARCH export ATDM_CONFIG_KOKKOS_ARCH=DEFAULT . ${ATDM_UTILS_SCRIPT_DIR}/kokkos_arch_array.sh diff --git a/cmake/std/atdm/van1-tx2/all_supported_builds.sh b/cmake/std/atdm/van1-tx2/all_supported_builds.sh index 729823033923..3b28d2d856ae 100644 --- a/cmake/std/atdm/van1-tx2/all_supported_builds.sh +++ b/cmake/std/atdm/van1-tx2/all_supported_builds.sh @@ -5,4 +5,6 @@ export ATDM_CONFIG_CTEST_S_BUILD_NAME_PREFIX=Trilinos-atdm- export ATDM_CONFIG_ALL_SUPPORTED_BUILDS=( van1-tx2_arm-20.0_openmpi-4.0.2_openmp_static_opt van1-tx2_arm-20.0_openmpi-4.0.2_openmp_static_dbg + van1-tx2_arm-20.1_openmpi-4.0.3_openmp_static_opt + van1-tx2_arm-20.1_openmpi-4.0.3_openmp_static_dbg ) diff --git a/cmake/std/atdm/van1-tx2/custom_builds.sh b/cmake/std/atdm/van1-tx2/custom_builds.sh index be98bc3ded0d..d864690c5e0c 100644 --- a/cmake/std/atdm/van1-tx2/custom_builds.sh +++ b/cmake/std/atdm/van1-tx2/custom_builds.sh @@ -2,7 +2,14 @@ # Custom builds for van1-tx2 env # +# Try matching against arm-20.1 before arm-20 or arm if atdm_match_any_buildname_keyword \ + arm-20.1-openmpi-4.0.3 \ + arm-20.1_openmpi-4.0.3 \ + arm-20.1 \ + ; then + export ATDM_CONFIG_COMPILER=ARM-20.1_OPENMPI-4.0.3 +elif atdm_match_any_buildname_keyword \ arm-20.0-openmpi-4.0.2 \ arm-20.0_openmpi-4.0.2 \ arm-20.0 \ @@ -11,7 +18,6 @@ if atdm_match_any_buildname_keyword \ default \ ; then export ATDM_CONFIG_COMPILER=ARM-20.0_OPENMPI-4.0.2 - else echo echo "***" @@ -20,6 +26,7 @@ else echo "*** Supported compilers include:" echo "***" echo "**** arm-20.0-openmpi-4.0.2 (arm-20.0, default)" + echo "**** arm-20.1-openmpi-4.0.3 (arm-20.1)" echo "***" return diff --git a/cmake/std/atdm/van1-tx2/custom_builds_unit_tests.sh b/cmake/std/atdm/van1-tx2/custom_builds_unit_tests.sh index 78fb6def891b..14d15d31817f 100755 --- a/cmake/std/atdm/van1-tx2/custom_builds_unit_tests.sh +++ b/cmake/std/atdm/van1-tx2/custom_builds_unit_tests.sh @@ -12,38 +12,52 @@ testAll() { ATDM_CONFIG_SYSTEM_DIR=${ATDM_CONFIG_SCRIPT_DIR}/van1-tx2 + #### TEST ARM-20.0 #### ATDM_CONFIG_BUILD_NAME=default . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh - ${_ASSERT_EQUALS_} ${ATDM_CONFIG_COMPILER} ARM-20.0_OPENMPI-4.0.2 + ${_ASSERT_EQUALS_} ARM-20.0_OPENMPI-4.0.2 ${ATDM_CONFIG_COMPILER} ATDM_CONFIG_BUILD_NAME=before-arm-20.0-openmpi-4.0.2_after . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh - ${_ASSERT_EQUALS_} ${ATDM_CONFIG_COMPILER} ARM-20.0_OPENMPI-4.0.2 + ${_ASSERT_EQUALS_} ARM-20.0_OPENMPI-4.0.2 ${ATDM_CONFIG_COMPILER} ATDM_CONFIG_BUILD_NAME=before-arm-20.0_openmpi-4.0.2-after . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh - ${_ASSERT_EQUALS_} ${ATDM_CONFIG_COMPILER} ARM-20.0_OPENMPI-4.0.2 + ${_ASSERT_EQUALS_} ARM-20.0_OPENMPI-4.0.2 ${ATDM_CONFIG_COMPILER} ATDM_CONFIG_BUILD_NAME=before_arm-20.0-after . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh - ${_ASSERT_EQUALS_} ${ATDM_CONFIG_COMPILER} ARM-20.0_OPENMPI-4.0.2 + ${_ASSERT_EQUALS_} ARM-20.0_OPENMPI-4.0.2 ${ATDM_CONFIG_COMPILER} ATDM_CONFIG_BUILD_NAME=before_arm-20-afert . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh - ${_ASSERT_EQUALS_} ${ATDM_CONFIG_COMPILER} ARM-20.0_OPENMPI-4.0.2 + ${_ASSERT_EQUALS_} ARM-20.0_OPENMPI-4.0.2 ${ATDM_CONFIG_COMPILER} ATDM_CONFIG_BUILD_NAME=before-arm-after . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh - ${_ASSERT_EQUALS_} ${ATDM_CONFIG_COMPILER} ARM-20.0_OPENMPI-4.0.2 + ${_ASSERT_EQUALS_} ARM-20.0_OPENMPI-4.0.2 ${ATDM_CONFIG_COMPILER} ATDM_CONFIG_BUILD_NAME=BEFORE-ARM-AFTER . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh - ${_ASSERT_EQUALS_} ${ATDM_CONFIG_COMPILER} ARM-20.0_OPENMPI-4.0.2 + ${_ASSERT_EQUALS_} ARM-20.0_OPENMPI-4.0.2 ${ATDM_CONFIG_COMPILER} # Make sure 'arms' does not match 'arm' ATDM_CONFIG_BUILD_NAME=anything-arms . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh - ${_ASSERT_EQUALS_} ${ATDM_CONFIG_COMPILER} DEFAULT + ${_ASSERT_EQUALS_} DEFAULT ${ATDM_CONFIG_COMPILER} + + #### Test ARM-20.1 #### + ATDM_CONFIG_BUILD_NAME=before-arm-20.1-openmpi-4.0.3_after + . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh + ${_ASSERT_EQUALS_} ARM-20.1_OPENMPI-4.0.3 ${ATDM_CONFIG_COMPILER} + + ATDM_CONFIG_BUILD_NAME=before-arm-20.1_openmpi-4.0.3-after + . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh + ${_ASSERT_EQUALS_} ARM-20.1_OPENMPI-4.0.3 ${ATDM_CONFIG_COMPILER} + + ATDM_CONFIG_BUILD_NAME=before_arm-20.1-after + . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh + ${_ASSERT_EQUALS_} ARM-20.1_OPENMPI-4.0.3 ${ATDM_CONFIG_COMPILER} } diff --git a/cmake/std/atdm/van1-tx2/environment.sh b/cmake/std/atdm/van1-tx2/environment.sh index 7266f11c35a5..46687b5e0951 100755 --- a/cmake/std/atdm/van1-tx2/environment.sh +++ b/cmake/std/atdm/van1-tx2/environment.sh @@ -35,15 +35,6 @@ if [[ "${ATDM_CONFIG_BUILD_TYPE}" == "DEBUG" ]] ; then # Reducing this is to avoid that. See CDOFA-117. fi -if [[ "$ATDM_CONFIG_NODE_TYPE" == "OPENMP" ]] ; then - export ATDM_CONFIG_CTEST_PARALLEL_LEVEL=16 - export OMP_NUM_THREADS=2 -else - export ATDM_CONFIG_CTEST_PARALLEL_LEVEL=32 - export OMP_PROC_BIND=FALSE - export OMP_NUM_THREADS=1 -fi - # # Load the modules # @@ -67,6 +58,43 @@ if [[ "$ATDM_CONFIG_COMPILER" == "ARM-20.0_OPENMPI-4.0.2" ]]; then export LAPACK_ROOT="$ARMPL_LIB" export ATDM_CONFIG_LAPACK_LIBS="-L${LAPACK_ROOT};-larmpl_ilp64_mp" export ATDM_CONFIG_BLAS_LIBS="-L${LAPACK_ROOT};-larmpl_ilp64_mp" + + # We'll use TPL_ROOT for consistency across ATDM environments + export MPI_ROOT=${MPI_DIR} + export BLAS_ROOT=${ARMPL_DIR} + export LAPACK_ROOT=${ARMPL_DIR} + export HDF5_ROOT=${HDF5_DIR} + export NETCDF_ROOT=${NETCDF_DIR} + export PNETCDF_ROOT=${PNETCDF_DIR} + export ZLIB_ROOT=${ZLIB_DIR} + export CGNS_ROOT=${CGNS_DIR} + export BOOST_ROOT=${BOOST_DIR} + export METIS_ROOT=${METIS_DIR} + export PARMETIS_ROOT=${PARMETIS_DIR} + export SUPERLUDIST_ROOT=${SUPERLU_DIST_DIR} + export BINUTILS_ROOT=${BINUTILS_DIR} + + module load git/2.19.2 +elif [[ "$ATDM_CONFIG_COMPILER" == "ARM-20.1_OPENMPI-4.0.3" ]]; then + module load sparc-dev/arm-20.1_openmpi-4.0.3 + + if [ "$ATDM_CONFIG_NODE_TYPE" == "OPENMP" ] ; then + unset OMP_PLACES + unset OMP_PROC_BIND + fi + + # We'll use TPL_ROOT for consistency across ATDM environments + export MPI_ROOT=${MPI_DIR} + export BLAS_ROOT=${ARMPL_DIR} + export HDF5_ROOT=${HDF5_DIR} + export NETCDF_ROOT=${NETCDF_DIR} + export PNETCDF_ROOT=${PNETCDF_DIR} + export ZLIB_ROOT=${ZLIB_DIR} + export CGNS_ROOT=${CGNS_DIR} + export METIS_ROOT=${METIS_DIR} + export PARMETIS_ROOT=${PARMETIS_DIR} + export SUPERLUDIST_ROOT=${SUPERLU_DIST_DIR} + export BINUTILS_ROOT=${BINUTILS_DIR} else echo echo "***" @@ -75,30 +103,18 @@ else return fi +if [[ "$ATDM_CONFIG_NODE_TYPE" == "OPENMP" ]] ; then + export ATDM_CONFIG_CTEST_PARALLEL_LEVEL=16 + export OMP_NUM_THREADS=2 +else + export ATDM_CONFIG_CTEST_PARALLEL_LEVEL=32 + export OMP_PROC_BIND=FALSE + export OMP_NUM_THREADS=1 +fi + # Common modules for all builds module load ninja module load cmake/3.12.2 -module load git/2.19.2 - -# -# Set up for the TPLs -# - -# Common TPL paths, we'll use TPL_ROOT for consistency across ATDM -# environments -export MPI_ROOT=${MPI_DIR} -export BLAS_ROOT=${ARMPL_DIR} -export LAPACK_ROOT=${ARMPL_DIR} -export HDF5_ROOT=${HDF5_DIR} -export NETCDF_ROOT=${NETCDF_DIR} -export PNETCDF_ROOT=${PNETCDF_DIR} -export ZLIB_ROOT=${ZLIB_DIR} -export CGNS_ROOT=${CGNS_DIR} -export BOOST_ROOT=${BOOST_DIR} -export METIS_ROOT=${METIS_DIR} -export PARMETIS_ROOT=${PARMETIS_DIR} -export SUPERLUDIST_ROOT=${SUPERLU_DIST_DIR} -export BINUTILS_ROOT=${BINUTILS_DIR} export ATDM_CONFIG_USE_HWLOC=OFF export HWLOC_LIBS= diff --git a/cmake/std/sems/PullRequestClang10.0.0TestingEnv.sh b/cmake/std/sems/PullRequestClang10.0.0TestingEnv.sh new file mode 100644 index 000000000000..6042879d3fd9 --- /dev/null +++ b/cmake/std/sems/PullRequestClang10.0.0TestingEnv.sh @@ -0,0 +1,30 @@ + +# This script can be used to load the appropriate environment for the +# Clang 10.0.0 Pull Request testing build on a Linux machine that has access to +# the SEMS NFS mount. + +# usage: $ source PullRequestClang10.0.0TestingEnv.sh + +# After the environment is no longer needed, it can be purged using +# $ module purge +# or Trilinos/cmake/unload_sems_dev_env.sh + +source /projects/sems/modulefiles/utils/sems-modules-init.sh + +module load sems-git/2.10.1 +module load sems-gcc/5.3.0 +module load sems-clang/10.0.0 +module load sems-openmpi/1.10.1 +module load sems-python/2.7.9 +module load sems-boost/1.69.0/base +module load sems-zlib/1.2.8/base +module load sems-hdf5/1.10.6/parallel +module load sems-netcdf/4.7.3/parallel +module load sems-parmetis/4.0.3/parallel +module load sems-scotch/6.0.3/nopthread_64bit_parallel +module load sems-superlu/4.3/base +module load sems-cmake/3.17.1 +module load sems-ninja_fortran/1.10.0 + +# add the OpenMP environment variable we need +export OMP_NUM_THREADS=2 diff --git a/cmake/std/unittests/TestPullRequestLinuxDriverTest.py b/cmake/std/unittests/TestPullRequestLinuxDriverTest.py index d7ef9fd2b854..2d98dce6d566 100755 --- a/cmake/std/unittests/TestPullRequestLinuxDriverTest.py +++ b/cmake/std/unittests/TestPullRequestLinuxDriverTest.py @@ -748,6 +748,31 @@ def test_buildEnv_passes_with_clang_900(self): test_ENV={'OMP_NUM_THREADS': '2'}) + def test_buildEnv_passes_with_clang_1000(self): + """Find the function""" + PR_name = 'Trilinos_pullrequest_clang_10.0.0' + expected_list = [mock.call('use', '/projects/sems/modulefiles/projects'), + mock.call('load', 'sems-env'), + mock.call('load', 'sems-git/2.10.1'), + mock.call('load', 'sems-gcc/5.3.0'), + mock.call('load', 'sems-clang/10.0.0'), + mock.call('load', 'sems-openmpi/1.10.1'), + mock.call('load', 'sems-python/2.7.9'), + mock.call('load', 'sems-boost/1.69.0/base'), + mock.call('load', 'sems-zlib/1.2.8/base'), + mock.call('load', 'sems-hdf5/1.10.6/parallel'), + mock.call('load', 'sems-netcdf/4.7.3/parallel'), + mock.call('load', 'sems-parmetis/4.0.3/parallel'), + mock.call('load', 'sems-scotch/6.0.3/nopthread_64bit_parallel'), + mock.call('load', 'sems-superlu/4.3/base'), + mock.call('load', 'sems-cmake/3.17.1'), + mock.call('load', 'sems-ninja_fortran/1.10.0'), + ] + + self.buildEnv_passes(PR_name, expected_list, + test_ENV={'OMP_NUM_THREADS': '2'}) + + def test_buildEnv_passes_with_cuda_92(self): """Find the function""" PR_name = 'Trilinos_pullrequest_cuda_9.2' diff --git a/packages/adelus/src/Adelus_defines.h b/packages/adelus/src/Adelus_defines.h index 5c6850cb1a9f..1b307a10ce70 100644 --- a/packages/adelus/src/Adelus_defines.h +++ b/packages/adelus/src/Adelus_defines.h @@ -58,7 +58,7 @@ #ifdef SREAL #define ADELUS_DATA_TYPE float - #undef COMPLEX + #undef ADELUS_COMPLEX #define ADELUS_MPI_DATA_TYPE MPI_FLOAT #define ADELUS_MPI_DATA_TYPE2 MPI_FLOAT_INT @@ -74,7 +74,7 @@ #elif defined(DREAL) #define ADELUS_DATA_TYPE double - #undef COMPLEX + #undef ADELUS_COMPLEX #define ADELUS_MPI_DATA_TYPE MPI_DOUBLE #define ADELUS_MPI_DATA_TYPE2 MPI_DOUBLE_INT @@ -94,7 +94,7 @@ float i; } scomplex ; #define ADELUS_DATA_TYPE scomplex - #define COMPLEX + #define ADELUS_COMPLEX #define ADELUS_MPI_DATA_TYPE MPI_COMPLEX #define ADELUS_MPI_DATA_TYPE2 MPI_FLOAT_INT @@ -114,7 +114,7 @@ double i; } dcomplex ; #define ADELUS_DATA_TYPE dcomplex - #define COMPLEX + #define ADELUS_COMPLEX #define ADELUS_MPI_DATA_TYPE MPI_DOUBLE_COMPLEX #define ADELUS_MPI_DATA_TYPE2 MPI_DOUBLE_INT diff --git a/packages/adelus/src/Adelus_factor.hpp b/packages/adelus/src/Adelus_factor.hpp index 2ef114eccbfc..01481c6b3885 100644 --- a/packages/adelus/src/Adelus_factor.hpp +++ b/packages/adelus/src/Adelus_factor.hpp @@ -240,7 +240,7 @@ void factor(ZDView& ZV, // matrix and rhs View1DHostPinnType h_row3 ( "h_row3", my_cols + blksz + nrhs ); #endif - Kokkos::fence(); + //Kokkos::fence(); for (j=0; j void zcopy_ld_local_index(int N, XView& X, YView& Y) { Kokkos::parallel_for(Kokkos::RangePolicy(0,N), KOKKOS_LAMBDA (const int i) { - #ifdef COMPLEX + #ifdef ADELUS_COMPLEX int lidx = (int)(X(N).real()); #else int lidx = (int)(X(N)); diff --git a/packages/adelus/src/Adelus_solve.hpp b/packages/adelus/src/Adelus_solve.hpp index 5d715d870e6b..d04c3a2c72f7 100644 --- a/packages/adelus/src/Adelus_solve.hpp +++ b/packages/adelus/src/Adelus_solve.hpp @@ -58,6 +58,8 @@ #include "Kokkos_Core.hpp" #include "KokkosBlas3_gemm.hpp" +#define IBM_MPI_WRKAROUND2 + extern int me; extern int ncols_matrix; // number of cols in the matrix @@ -113,7 +115,7 @@ void back_solve6(ZDView& ZV) typedef typename ZDView::device_type::memory_space memory_space; typedef Kokkos::View ViewMatrixType; -#if defined(CUDA_HOST_PINNED_MPI) && defined(KOKKOS_ENABLE_CUDA) +#if (defined(CUDA_HOST_PINNED_MPI) || defined(IBM_MPI_WRKAROUND2)) && defined(KOKKOS_ENABLE_CUDA) typedef Kokkos::View View2DHostPinnType;//CudaHostPinnedSpace #endif @@ -143,15 +145,13 @@ void back_solve6(ZDView& ZV) int my_col_id, my_row_id, id_temp; int dest_right, dest_left; - int blas_length; - #ifdef GET_TIMING double t1,t2; - double allocviewtime,eliminaterhstime,bcastrowtime,updrhstime,sendrhstime,recvrhstime,copyrhstime; + double allocviewtime,eliminaterhstime,bcastrowtime,updrhstime,xchgrhstime; double totalsolvetime; -#if defined(CUDA_HOST_PINNED_MPI) && defined(KOKKOS_ENABLE_CUDA) - double copyhostpinnedtime; -#endif +//#if defined(CUDA_HOST_PINNED_MPI) && defined(KOKKOS_ENABLE_CUDA) +// double copyhostpinnedtime; +//#endif #endif MPI_Request msgrequest; @@ -180,21 +180,22 @@ void back_solve6(ZDView& ZV) max_bytes = max_bytes*sizeof(ADELUS_DATA_TYPE)*my_rows; #ifdef GET_TIMING - allocviewtime=eliminaterhstime=bcastrowtime=updrhstime=sendrhstime=recvrhstime=copyrhstime=0.0; -#if defined(CUDA_HOST_PINNED_MPI) && defined(KOKKOS_ENABLE_CUDA) - copyhostpinnedtime=0.0; -#endif -#endif + allocviewtime=eliminaterhstime=bcastrowtime=updrhstime=xchgrhstime=0.0; +//#if defined(CUDA_HOST_PINNED_MPI) && defined(KOKKOS_ENABLE_CUDA) +// copyhostpinnedtime=0.0; +//#endif -#ifdef GET_TIMING t1 = MPI_Wtime(); #endif + ViewMatrixType row1( "row1", one, nrhs ); // row1: diagonal row (temp variables) +#if (defined(CUDA_HOST_PINNED_MPI) || defined(IBM_MPI_WRKAROUND2)) && defined(KOKKOS_ENABLE_CUDA) + View2DHostPinnType h_row2( "h_row2", my_rows, max_bytes/sizeof(ADELUS_DATA_TYPE)/my_rows ); +#else ViewMatrixType row2( "row2", my_rows, max_bytes/sizeof(ADELUS_DATA_TYPE)/my_rows ); - -#if defined(CUDA_HOST_PINNED_MPI) && defined(KOKKOS_ENABLE_CUDA) +#endif +#if (defined(CUDA_HOST_PINNED_MPI) || defined(IBM_MPI_WRKAROUND2)) && defined(KOKKOS_ENABLE_CUDA) View2DHostPinnType h_row1( "h_row1", one, nrhs ); - View2DHostPinnType h_row2( "h_row2", my_rows, max_bytes/sizeof(ADELUS_DATA_TYPE)/my_rows ); View2DHostPinnType h_rhs ( "h_rhs", my_rows, nrhs ); #endif @@ -309,76 +310,50 @@ void back_solve6(ZDView& ZV) } } +#ifdef GET_TIMING + t1 = MPI_Wtime(); +#endif if (j != 1-nprocs_row-extra) { dest[0] = dest_right; if (me != dest[0]) { bytes[0] = max_bytes; type[0] = SOROWTYPE+j; -#if defined(CUDA_HOST_PINNED_MPI) && defined(KOKKOS_ENABLE_CUDA) +#if (defined(CUDA_HOST_PINNED_MPI) || defined(IBM_MPI_WRKAROUND2)) && defined(KOKKOS_ENABLE_CUDA) MPI_Irecv(reinterpret_cast(h_row2.data()), bytes[0], MPI_CHAR, MPI_ANY_SOURCE, type[0], MPI_COMM_WORLD, &msgrequest); -#else //CUDA-aware MPI +#else MPI_Irecv(reinterpret_cast( row2.data()), bytes[0], MPI_CHAR, MPI_ANY_SOURCE, type[0], MPI_COMM_WORLD, &msgrequest); #endif n_rhs_this = bytes[0]/sizeof(ADELUS_DATA_TYPE)/my_rows; -#if defined(CUDA_HOST_PINNED_MPI) && defined(KOKKOS_ENABLE_CUDA) -#ifdef GET_TIMING - t1 = MPI_Wtime(); -#endif +#if (defined(CUDA_HOST_PINNED_MPI) || defined(IBM_MPI_WRKAROUND2)) && defined(KOKKOS_ENABLE_CUDA) Kokkos::deep_copy(subview(h_rhs, Kokkos::ALL(), Kokkos::make_pair(0, n_rhs_this)), subview(ZV, Kokkos::ALL(), Kokkos::make_pair(my_cols, my_cols+n_rhs_this))); -#ifdef GET_TIMING - copyhostpinnedtime += (MPI_Wtime()-t1); -#endif #endif -#ifdef GET_TIMING - t1 = MPI_Wtime(); -#endif dest[1] = dest_left; bytes[1] = n_rhs_this * sizeof(ADELUS_DATA_TYPE) * my_rows; type[1] = SOROWTYPE+j; -#if defined(CUDA_HOST_PINNED_MPI) && defined(KOKKOS_ENABLE_CUDA) +#if (defined(CUDA_HOST_PINNED_MPI) || defined(IBM_MPI_WRKAROUND2)) && defined(KOKKOS_ENABLE_CUDA) MPI_Send(reinterpret_cast(h_rhs.data()), bytes[1], MPI_CHAR, dest[1], type[1], MPI_COMM_WORLD); #else //CUDA-aware MPI MPI_Send(reinterpret_cast(ZV.data()+my_rows*my_cols), bytes[1], MPI_CHAR, dest[1], type[1], MPI_COMM_WORLD); #endif -#ifdef GET_TIMING - sendrhstime += (MPI_Wtime()-t1); -#endif -#ifdef GET_TIMING - t1 = MPI_Wtime(); -#endif MPI_Wait(&msgrequest,&msgstatus); -#ifdef GET_TIMING - recvrhstime += (MPI_Wtime()-t1); -#endif -#if defined(CUDA_HOST_PINNED_MPI) && defined(KOKKOS_ENABLE_CUDA) -#ifdef GET_TIMING - t1 = MPI_Wtime(); -#endif - Kokkos::deep_copy(row2,h_row2); -#ifdef GET_TIMING - copyhostpinnedtime += (MPI_Wtime()-t1); -#endif -#endif - -#ifdef GET_TIMING - t1 = MPI_Wtime(); -#endif // Copy row2 -> rhs - blas_length = n_rhs_this*my_rows; -#ifdef KOKKOS_ENABLE_CUDA//Use memcpy for now, can use deep_copy in the future //deep_copy is slower than BLAS XCOPY + int blas_length = n_rhs_this*my_rows; +#if (defined(CUDA_HOST_PINNED_MPI) || defined(IBM_MPI_WRKAROUND2)) && defined(KOKKOS_ENABLE_CUDA)//Use memcpy for now, can use deep_copy in the future //deep_copy is slower than BLAS XCOPY + //Kokkos::deep_copy(subview(ZV, Kokkos::ALL(), Kokkos::make_pair(my_cols, my_cols+n_rhs_this)), subview(h_row2, Kokkos::ALL(), Kokkos::make_pair(0, n_rhs_this))); + cudaMemcpy(reinterpret_cast(ZV.data()+my_rows*my_cols), reinterpret_cast(h_row2.data()), blas_length*sizeof(ADELUS_DATA_TYPE), cudaMemcpyHostToDevice); +#else +#ifdef KOKKOS_ENABLE_CUDA cudaMemcpy(reinterpret_cast(ZV.data()+my_rows*my_cols), reinterpret_cast(row2.data()), blas_length*sizeof(ADELUS_DATA_TYPE), cudaMemcpyDeviceToDevice); #else memcpy(reinterpret_cast(ZV.data()+my_rows*my_cols), reinterpret_cast(row2.data()), blas_length*sizeof(ADELUS_DATA_TYPE)); #endif -#ifdef GET_TIMING - copyrhstime += (MPI_Wtime()-t1); #endif } on_col++; @@ -387,6 +362,10 @@ void back_solve6(ZDView& ZV) act_col--; } } +#ifdef GET_TIMING + xchgrhstime += (MPI_Wtime()-t1); +#endif + } #ifdef GET_TIMING @@ -397,12 +376,10 @@ void back_solve6(ZDView& ZV) showtime("Time to eliminate rhs",&eliminaterhstime); showtime("Time to bcast temp row",&bcastrowtime); showtime("Time to update rhs",&updrhstime); - showtime("Time to send in rhs",&sendrhstime); - showtime("Time to recv rhs",&recvrhstime); -#if defined(CUDA_HOST_PINNED_MPI) && defined(KOKKOS_ENABLE_CUDA) - showtime("Time to copy host pinned mem <--> dev mem",©hostpinnedtime); -#endif - showtime("Time to copy rhs",©rhstime); +//#if defined(CUDA_HOST_PINNED_MPI) && defined(KOKKOS_ENABLE_CUDA) +// showtime("Time to copy host pinned mem <--> dev mem",©hostpinnedtime); +//#endif + showtime("Time to xchg rhs",&xchgrhstime); showtime("Total time in solve",&totalsolvetime); #endif } diff --git a/packages/adelus/src/BlasWrapper_copy_spec.hpp b/packages/adelus/src/BlasWrapper_copy_spec.hpp index ba4fae86c87a..af70e1ad59b0 100644 --- a/packages/adelus/src/BlasWrapper_copy_spec.hpp +++ b/packages/adelus/src/BlasWrapper_copy_spec.hpp @@ -451,6 +451,48 @@ BLASWRAPPER_CCOPY_TPL_SPEC_DECL_CUBLAS( Kokkos::LayoutStride, Kokkos::LayoutLeft BLASWRAPPER_CCOPY_TPL_SPEC_DECL_CUBLAS( Kokkos::LayoutStride, Kokkos::LayoutRight, Kokkos::CudaSpace, false) BLASWRAPPER_CCOPY_TPL_SPEC_DECL_CUBLAS( Kokkos::LayoutStride, Kokkos::LayoutStride, Kokkos::CudaSpace, false) +#if defined (KOKKOS_ENABLE_CUDA_UVM) +BLASWRAPPER_DCOPY_TPL_SPEC_DECL_CUBLAS( Kokkos::LayoutLeft, Kokkos::LayoutLeft, Kokkos::CudaUVMSpace, false) +BLASWRAPPER_DCOPY_TPL_SPEC_DECL_CUBLAS( Kokkos::LayoutLeft, Kokkos::LayoutRight, Kokkos::CudaUVMSpace, false) +BLASWRAPPER_DCOPY_TPL_SPEC_DECL_CUBLAS( Kokkos::LayoutLeft, Kokkos::LayoutStride, Kokkos::CudaUVMSpace, false) +BLASWRAPPER_DCOPY_TPL_SPEC_DECL_CUBLAS( Kokkos::LayoutRight, Kokkos::LayoutLeft, Kokkos::CudaUVMSpace, false) +BLASWRAPPER_DCOPY_TPL_SPEC_DECL_CUBLAS( Kokkos::LayoutRight, Kokkos::LayoutRight, Kokkos::CudaUVMSpace, false) +BLASWRAPPER_DCOPY_TPL_SPEC_DECL_CUBLAS( Kokkos::LayoutRight, Kokkos::LayoutStride, Kokkos::CudaUVMSpace, false) +BLASWRAPPER_DCOPY_TPL_SPEC_DECL_CUBLAS( Kokkos::LayoutStride, Kokkos::LayoutLeft, Kokkos::CudaUVMSpace, false) +BLASWRAPPER_DCOPY_TPL_SPEC_DECL_CUBLAS( Kokkos::LayoutStride, Kokkos::LayoutRight, Kokkos::CudaUVMSpace, false) +BLASWRAPPER_DCOPY_TPL_SPEC_DECL_CUBLAS( Kokkos::LayoutStride, Kokkos::LayoutStride, Kokkos::CudaUVMSpace, false) + +BLASWRAPPER_SCOPY_TPL_SPEC_DECL_CUBLAS( Kokkos::LayoutLeft, Kokkos::LayoutLeft, Kokkos::CudaUVMSpace, false) +BLASWRAPPER_SCOPY_TPL_SPEC_DECL_CUBLAS( Kokkos::LayoutLeft, Kokkos::LayoutRight, Kokkos::CudaUVMSpace, false) +BLASWRAPPER_SCOPY_TPL_SPEC_DECL_CUBLAS( Kokkos::LayoutLeft, Kokkos::LayoutStride, Kokkos::CudaUVMSpace, false) +BLASWRAPPER_SCOPY_TPL_SPEC_DECL_CUBLAS( Kokkos::LayoutRight, Kokkos::LayoutLeft, Kokkos::CudaUVMSpace, false) +BLASWRAPPER_SCOPY_TPL_SPEC_DECL_CUBLAS( Kokkos::LayoutRight, Kokkos::LayoutRight, Kokkos::CudaUVMSpace, false) +BLASWRAPPER_SCOPY_TPL_SPEC_DECL_CUBLAS( Kokkos::LayoutRight, Kokkos::LayoutStride, Kokkos::CudaUVMSpace, false) +BLASWRAPPER_SCOPY_TPL_SPEC_DECL_CUBLAS( Kokkos::LayoutStride, Kokkos::LayoutLeft, Kokkos::CudaUVMSpace, false) +BLASWRAPPER_SCOPY_TPL_SPEC_DECL_CUBLAS( Kokkos::LayoutStride, Kokkos::LayoutRight, Kokkos::CudaUVMSpace, false) +BLASWRAPPER_SCOPY_TPL_SPEC_DECL_CUBLAS( Kokkos::LayoutStride, Kokkos::LayoutStride, Kokkos::CudaUVMSpace, false) + +BLASWRAPPER_ZCOPY_TPL_SPEC_DECL_CUBLAS( Kokkos::LayoutLeft, Kokkos::LayoutLeft, Kokkos::CudaUVMSpace, false) +BLASWRAPPER_ZCOPY_TPL_SPEC_DECL_CUBLAS( Kokkos::LayoutLeft, Kokkos::LayoutRight, Kokkos::CudaUVMSpace, false) +BLASWRAPPER_ZCOPY_TPL_SPEC_DECL_CUBLAS( Kokkos::LayoutLeft, Kokkos::LayoutStride, Kokkos::CudaUVMSpace, false) +BLASWRAPPER_ZCOPY_TPL_SPEC_DECL_CUBLAS( Kokkos::LayoutRight, Kokkos::LayoutLeft, Kokkos::CudaUVMSpace, false) +BLASWRAPPER_ZCOPY_TPL_SPEC_DECL_CUBLAS( Kokkos::LayoutRight, Kokkos::LayoutRight, Kokkos::CudaUVMSpace, false) +BLASWRAPPER_ZCOPY_TPL_SPEC_DECL_CUBLAS( Kokkos::LayoutRight, Kokkos::LayoutStride, Kokkos::CudaUVMSpace, false) +BLASWRAPPER_ZCOPY_TPL_SPEC_DECL_CUBLAS( Kokkos::LayoutStride, Kokkos::LayoutLeft, Kokkos::CudaUVMSpace, false) +BLASWRAPPER_ZCOPY_TPL_SPEC_DECL_CUBLAS( Kokkos::LayoutStride, Kokkos::LayoutRight, Kokkos::CudaUVMSpace, false) +BLASWRAPPER_ZCOPY_TPL_SPEC_DECL_CUBLAS( Kokkos::LayoutStride, Kokkos::LayoutStride, Kokkos::CudaUVMSpace, false) + +BLASWRAPPER_CCOPY_TPL_SPEC_DECL_CUBLAS( Kokkos::LayoutLeft, Kokkos::LayoutLeft, Kokkos::CudaUVMSpace, false) +BLASWRAPPER_CCOPY_TPL_SPEC_DECL_CUBLAS( Kokkos::LayoutLeft, Kokkos::LayoutRight, Kokkos::CudaUVMSpace, false) +BLASWRAPPER_CCOPY_TPL_SPEC_DECL_CUBLAS( Kokkos::LayoutLeft, Kokkos::LayoutStride, Kokkos::CudaUVMSpace, false) +BLASWRAPPER_CCOPY_TPL_SPEC_DECL_CUBLAS( Kokkos::LayoutRight, Kokkos::LayoutLeft, Kokkos::CudaUVMSpace, false) +BLASWRAPPER_CCOPY_TPL_SPEC_DECL_CUBLAS( Kokkos::LayoutRight, Kokkos::LayoutRight, Kokkos::CudaUVMSpace, false) +BLASWRAPPER_CCOPY_TPL_SPEC_DECL_CUBLAS( Kokkos::LayoutRight, Kokkos::LayoutStride, Kokkos::CudaUVMSpace, false) +BLASWRAPPER_CCOPY_TPL_SPEC_DECL_CUBLAS( Kokkos::LayoutStride, Kokkos::LayoutLeft, Kokkos::CudaUVMSpace, false) +BLASWRAPPER_CCOPY_TPL_SPEC_DECL_CUBLAS( Kokkos::LayoutStride, Kokkos::LayoutRight, Kokkos::CudaUVMSpace, false) +BLASWRAPPER_CCOPY_TPL_SPEC_DECL_CUBLAS( Kokkos::LayoutStride, Kokkos::LayoutStride, Kokkos::CudaUVMSpace, false) +#endif + } } diff --git a/packages/amesos2/src/Amesos2_Basker.cpp b/packages/amesos2/src/Amesos2_Basker.cpp index de4ffe90d61e..2e0c2aefc871 100644 --- a/packages/amesos2/src/Amesos2_Basker.cpp +++ b/packages/amesos2/src/Amesos2_Basker.cpp @@ -47,6 +47,7 @@ #include "Amesos2_Basker_def.hpp" #include "Amesos2_ExplicitInstantiationHelpers.hpp" +#include "TpetraCore_ETIHelperMacros.h" namespace Amesos2 { @@ -54,324 +55,16 @@ namespace Amesos2 { AMESOS2_SOLVER_EPETRA_INST(Basker); #endif -#ifdef HAVE_TPETRA_INST_INT_INT -#ifdef HAVE_TPETRA_INST_FLOAT - AMESOS2_SOLVER_TPETRA_INST(Basker,float,int,int); -#endif -#ifdef HAVE_TPETRA_INST_DOUBLE - AMESOS2_SOLVER_TPETRA_INST(Basker,double,int,int); -#endif -#ifdef HAVE_TPETRA_INST_COMPLEX_FLOAT - AMESOS2_SOLVER_TPETRA_INST(Basker,std::complex,int,int); -#endif -#ifdef HAVE_TPETRA_INST_COMPLEX_DOUBLE - AMESOS2_SOLVER_TPETRA_INST(Basker,std::complex,int,int); -#endif -#endif// HAVE_TPETRA_INST_INT_INST + #define AMESOS2_BASKER_LOCAL_INSTANT(S,LO,GO,N) \ + template class Amesos2::Basker, \ + Tpetra::MultiVector >; -#ifdef HAVE_TPETRA_INST_INT_UNSIGNED -#ifdef HAVE_TPETRA_INST_FLOAT - AMESOS2_SOLVER_TPETRA_INST(Basker,float,int,unsigned); -#endif -#ifdef HAVE_TPETRA_INST_DOUBLE - AMESOS2_SOLVER_TPETRA_INST(Basker,double,int,unsigned); -#endif -#ifdef HAVE_TPETRA_INST_COMPLEX_FLOAT - AMESOS2_SOLVER_TPETRA_INST(Basker,std::complex,int,unsigned); -#endif -#ifdef HAVE_TPETRA_INST_COMPLEX_DOUBLE - AMESOS2_SOLVER_TPETRA_INST(Basker,std::complex,int,unsigned); -#endif -#endif// HAVE_TPETRA_INST_INST_UNSIGNED + TPETRA_ETI_MANGLING_TYPEDEFS() -#ifdef HAVE_TPETRA_INST_INT_LONG -#ifdef HAVE_TPETRA_INST_FLOAT - AMESOS2_SOLVER_TPETRA_INST(Basker,float,int,long); -#endif -#ifdef HAVE_TPETRA_INST_DOUBLE - AMESOS2_SOLVER_TPETRA_INST(Basker,double,int,long); -#endif -#ifdef HAVE_TPETRA_INST_COMPLEX_FLOAT - AMESOS2_SOLVER_TPETRA_INST(Basker,std::complex,int,long); -#endif -#ifdef HAVE_TPETRA_INST_COMPLEX_DOUBLE - AMESOS2_SOLVER_TPETRA_INST(Basker,std::complex,int,long); -#endif -#endif// HAVE_TPETRA_INST_INT_UNSIGNED - -#ifdef HAVE_TPETRA_INST_INT_LONG_LONG -#ifdef HAVE_TPETRA_INST_FLOAT - AMESOS2_SOLVER_TPETRA_INST(Basker,float,int,long long); -#endif -#ifdef HAVE_TPETRA_INST_DOUBLE - AMESOS2_SOLVER_TPETRA_INST(Basker,double,int,long long); -#endif -#ifdef HAVE_TPETRA_INST_COMPLEX_FLOAT - AMESOS2_SOLVER_TPETRA_INST(Basker,std::complex,int,long long); -#endif -#ifdef HAVE_TPETRA_INST_COMPLEX_DOUBLE - AMESOS2_SOLVER_TPETRA_INST(Basker,std::complex,int,long long); -#endif -#endif// HAVE_TPETRA_INST_INT_INT + TPETRA_INSTANTIATE_SLGN_NO_ORDINAL_SCALAR(AMESOS2_BASKER_LOCAL_INSTANT) + #define AMESOS2_KOKKOS_IMPL_SOLVER_NAME Basker + #include "Amesos2_Kokkos_Impl.hpp" } -// -// 26-Nov-2014: JJH code copied from Amesos2_SuperLU.cpp. -// -#include "Kokkos_DefaultNode.hpp" -#include "TpetraCore_ETIHelperMacros.h" - -#define AMESOS2_BASKER_LOCAL_INSTANT(S,LO,GO,N) \ - template class Amesos2::Basker, \ - Tpetra::MultiVector >; - -TPETRA_ETI_MANGLING_TYPEDEFS() - -#if defined(HAVE_TPETRA_INST_SERIAL) && !defined(HAVE_TPETRA_DEFAULTNODE_SERIALWRAPPERNODE) && defined(HAVE_TPETRA_INST_DOUBLE) && defined(TPETRA_HAVE_KOKKOS_REFACTOR) -#define NODETYPE Kokkos_Compat_KokkosSerialWrapperNode -#ifdef HAVE_TPETRA_INST_FLOAT - #ifdef HAVE_TPETRA_INST_INT_INT - AMESOS2_BASKER_LOCAL_INSTANT(float, int, int, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_LONG - AMESOS2_BASKER_LOCAL_INSTANT(float, int, long, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_LONG_LONG - AMESOS2_BASKER_LOCAL_INSTANT(float, int, long long, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_UNSIGNED - AMESOS2_BASKER_LOCAL_INSTANT(float, int, unsigned int, NODETYPE) - #endif -#endif -#ifdef HAVE_TPETRA_INST_DOUBLE - #ifdef HAVE_TPETRA_INST_INT_INT - AMESOS2_BASKER_LOCAL_INSTANT(double, int, int, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_LONG - AMESOS2_BASKER_LOCAL_INSTANT(double, int, long, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_LONG_LONG - AMESOS2_BASKER_LOCAL_INSTANT(double, int, long long, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_UNSIGNED - AMESOS2_BASKER_LOCAL_INSTANT(double, int, unsigned int, NODETYPE) - #endif -#endif -#ifdef HAVE_TPETRA_INST_COMPLEX_FLOAT - #ifdef HAVE_TPETRA_INST_INT_INT - AMESOS2_BASKER_LOCAL_INSTANT(std::complex, int, int, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_LONG - AMESOS2_BASKER_LOCAL_INSTANT(std::complex, int, long, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_LONG_LONG - AMESOS2_BASKER_LOCAL_INSTANT(std::complex, int, long long, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_UNSIGNED - AMESOS2_BASKER_LOCAL_INSTANT(std::complex, int, unsigned int, NODETYPE) - #endif -#endif -#ifdef HAVE_TPETRA_INST_COMPLEX_DOUBLE - #ifdef HAVE_TPETRA_INST_INT_INT - AMESOS2_BASKER_LOCAL_INSTANT(std::complex, int, int, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_LONG - AMESOS2_BASKER_LOCAL_INSTANT(std::complex, int, long, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_LONG_LONG - AMESOS2_BASKER_LOCAL_INSTANT(std::complex, int, long long, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_UNSIGNED - AMESOS2_BASKER_LOCAL_INSTANT(std::complex, int, unsigned int, NODETYPE) - #endif -#endif -#undef NODETYPE -#endif - - - -#if defined(HAVE_TPETRA_INST_PTHREAD) && !defined(HAVE_TPETRA_DEFAULTNODE_THREADSWRAPPERNODE) && defined(HAVE_TPETRA_INST_DOUBLE) && defined(TPETRA_HAVE_KOKKOS_REFACTOR) -#define NODETYPE Kokkos_Compat_KokkosThreadsWrapperNode -#ifdef HAVE_TPETRA_INST_FLOAT - #ifdef HAVE_TPETRA_INST_INT_INT - AMESOS2_BASKER_LOCAL_INSTANT(float, int, int, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_LONG - AMESOS2_BASKER_LOCAL_INSTANT(float, int, long, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_LONG_LONG - AMESOS2_BASKER_LOCAL_INSTANT(float, int, long long, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_UNSIGNED - AMESOS2_BASKER_LOCAL_INSTANT(float, int, unsigned int, NODETYPE) - #endif -#endif -#ifdef HAVE_TPETRA_INST_DOUBLE - #ifdef HAVE_TPETRA_INST_INT_INT - AMESOS2_BASKER_LOCAL_INSTANT(double, int, int, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_LONG - AMESOS2_BASKER_LOCAL_INSTANT(double, int, long, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_LONG_LONG - AMESOS2_BASKER_LOCAL_INSTANT(double, int, long long, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_UNSIGNED - AMESOS2_BASKER_LOCAL_INSTANT(double, int, unsigned int, NODETYPE) - #endif -#endif -#ifdef HAVE_TPETRA_INST_COMPLEX_FLOAT - #ifdef HAVE_TPETRA_INST_INT_INT - AMESOS2_BASKER_LOCAL_INSTANT(std::complex, int, int, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_LONG - AMESOS2_BASKER_LOCAL_INSTANT(std::complex, int, long, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_LONG_LONG - AMESOS2_BASKER_LOCAL_INSTANT(std::complex, int, long long, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_UNSIGNED - AMESOS2_BASKER_LOCAL_INSTANT(std::complex, int, unsigned int, NODETYPE) - #endif -#endif -#ifdef HAVE_TPETRA_INST_COMPLEX_DOUBLE - #ifdef HAVE_TPETRA_INST_INT_INT - AMESOS2_BASKER_LOCAL_INSTANT(std::complex, int, int, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_LONG - AMESOS2_BASKER_LOCAL_INSTANT(std::complex, int, long, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_LONG_LONG - AMESOS2_BASKER_LOCAL_INSTANT(std::complex, int, long long, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_UNSIGNED - AMESOS2_BASKER_LOCAL_INSTANT(std::complex, int, unsigned int, NODETYPE) - #endif -#endif -#undef NODETYPE -#endif - -#if defined(HAVE_TPETRA_INST_OPENMP) && !defined(HAVE_TPETRA_DEFAULTNODE_OPENMPWRAPPERNODE) && defined(HAVE_TPETRA_INST_DOUBLE) && defined(TPETRA_HAVE_KOKKOS_REFACTOR) -#define NODETYPE Kokkos_Compat_KokkosOpenMPWrapperNode -#ifdef HAVE_TPETRA_INST_FLOAT - #ifdef HAVE_TPETRA_INST_INT_INT - AMESOS2_BASKER_LOCAL_INSTANT(float, int, int, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_LONG - AMESOS2_BASKER_LOCAL_INSTANT(float, int, long, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_LONG_LONG - AMESOS2_BASKER_LOCAL_INSTANT(float, int, long long, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_UNSIGNED - AMESOS2_BASKER_LOCAL_INSTANT(float, int, unsigned int, NODETYPE) - #endif -#endif -#ifdef HAVE_TPETRA_INST_DOUBLE - #ifdef HAVE_TPETRA_INST_INT_INT - AMESOS2_BASKER_LOCAL_INSTANT(double, int, int, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_LONG - AMESOS2_BASKER_LOCAL_INSTANT(double, int, long, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_LONG_LONG - AMESOS2_BASKER_LOCAL_INSTANT(double, int, long long, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_UNSIGNED - AMESOS2_BASKER_LOCAL_INSTANT(double, int, unsigned int, NODETYPE) - #endif -#endif -#ifdef HAVE_TPETRA_INST_COMPLEX_FLOAT - #ifdef HAVE_TPETRA_INST_INT_INT - AMESOS2_BASKER_LOCAL_INSTANT(std::complex, int, int, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_LONG - AMESOS2_BASKER_LOCAL_INSTANT(std::complex, int, long, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_LONG_LONG - AMESOS2_BASKER_LOCAL_INSTANT(std::complex, int, long long, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_UNSIGNED - AMESOS2_BASKER_LOCAL_INSTANT(std::complex, int, unsigned int, NODETYPE) - #endif -#endif -#ifdef HAVE_TPETRA_INST_COMPLEX_DOUBLE - #ifdef HAVE_TPETRA_INST_INT_INT - AMESOS2_BASKER_LOCAL_INSTANT(std::complex, int, int, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_LONG - AMESOS2_BASKER_LOCAL_INSTANT(std::complex, int, long, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_LONG_LONG - AMESOS2_BASKER_LOCAL_INSTANT(std::complex, int, long long, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_UNSIGNED - AMESOS2_BASKER_LOCAL_INSTANT(std::complex, int, unsigned int, NODETYPE) - #endif -#endif -#undef NODETYPE -#endif - -#if defined(HAVE_TPETRA_INST_CUDA) && !defined(HAVE_TPETRA_DEFAULTNODE_CUDAWRAPPERNODE) && defined(HAVE_TPETRA_INST_DOUBLE) && defined(TPETRA_HAVE_KOKKOS_REFACTOR) -#define NODETYPE Kokkos_Compat_KokkosCudaWrapperNode -#ifdef HAVE_TPETRA_INST_FLOAT - #ifdef HAVE_TPETRA_INST_INT_INT - AMESOS2_BASKER_LOCAL_INSTANT(float, int, int, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_LONG - AMESOS2_BASKER_LOCAL_INSTANT(float, int, long, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_LONG_LONG - AMESOS2_BASKER_LOCAL_INSTANT(float, int, long long, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_UNSIGNED - AMESOS2_BASKER_LOCAL_INSTANT(float, int, unsigned int, NODETYPE) - #endif -#endif -#ifdef HAVE_TPETRA_INST_DOUBLE - #ifdef HAVE_TPETRA_INST_INT_INT - AMESOS2_BASKER_LOCAL_INSTANT(double, int, int, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_LONG - AMESOS2_BASKER_LOCAL_INSTANT(double, int, long, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_LONG_LONG - AMESOS2_BASKER_LOCAL_INSTANT(double, int, long long, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_UNSIGNED - AMESOS2_BASKER_LOCAL_INSTANT(double, int, unsigned int, NODETYPE) - #endif -#endif -#ifdef HAVE_TPETRA_INST_COMPLEX_FLOAT - #ifdef HAVE_TPETRA_INST_INT_INT - AMESOS2_BASKER_LOCAL_INSTANT(std::complex, int, int, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_LONG - AMESOS2_BASKER_LOCAL_INSTANT(std::complex, int, long, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_LONG_LONG - AMESOS2_BASKER_LOCAL_INSTANT(std::complex, int, long long, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_UNSIGNED - AMESOS2_BASKER_LOCAL_INSTANT(std::complex, int, unsigned int, NODETYPE) - #endif -#endif -#ifdef HAVE_TPETRA_INST_COMPLEX_DOUBLE - #ifdef HAVE_TPETRA_INST_INT_INT - AMESOS2_BASKER_LOCAL_INSTANT(std::complex, int, int, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_LONG - AMESOS2_BASKER_LOCAL_INSTANT(std::complex, int, long, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_LONG_LONG - AMESOS2_BASKER_LOCAL_INSTANT(std::complex, int, long long, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_UNSIGNED - AMESOS2_BASKER_LOCAL_INSTANT(std::complex, int, unsigned int, NODETYPE) - #endif -#endif -#undef NODETYPE -#endif - #endif // HAVE_AMESOS2_EXPLICIT_INSTANTIATION diff --git a/packages/amesos2/src/Amesos2_Basker_FunctionMap.hpp b/packages/amesos2/src/Amesos2_Basker_FunctionMap.hpp index 7a25ee39a407..c7dec5c0c57f 100644 --- a/packages/amesos2/src/Amesos2_Basker_FunctionMap.hpp +++ b/packages/amesos2/src/Amesos2_Basker_FunctionMap.hpp @@ -64,20 +64,25 @@ namespace Amesos2 { - /* ==================== Specializations ==================== - * - * \cond Basker_function_specializations - */ - - /** - * \brief Pass function calls to Basker based on data type. - - */ - // TODO : Do we need the specializations for Basker ?? - +#ifdef HAVE_TEUCHOS_COMPLEX + template <> + struct FunctionMap> + { + static std::complex * convert_scalar(Kokkos::complex * pData) { + return reinterpret_cast *>(pData); + } + }; - /* \endcond Basker_function_specializations */ +#endif // HAVE_TEUCHOS_COMPLEX + // if not specialized, then assume generic conversion is fine + template + struct FunctionMap + { + static scalar_t * convert_scalar(scalar_t * pData) { + return pData; // no conversion necessary + } + }; } // end namespace Amesos2 diff --git a/packages/amesos2/src/Amesos2_Basker_TypeMap.hpp b/packages/amesos2/src/Amesos2_Basker_TypeMap.hpp index e8b56b98f495..f2714d713b0e 100644 --- a/packages/amesos2/src/Amesos2_Basker_TypeMap.hpp +++ b/packages/amesos2/src/Amesos2_Basker_TypeMap.hpp @@ -46,8 +46,7 @@ \author Joshua Dennis Booth Siva Rajamanickam - \brief Provides definition of Basker types as well as conversions and type - traits. + \brief Provides definition of Basker types */ @@ -66,102 +65,26 @@ #include "Amesos2_TypeMap.hpp" - -#ifdef HAVE_TEUCHOS_COMPLEX - -/* ==================== Conversion ==================== */ -namespace Teuchos { - -/** - * \defgroup slu_conversion Conversion definitions for SLU types. - * - * Define specializations of Teuchos::as<> for the SLU types. - * - * These specializations are meant to work with any complex data type that - * implements the same interface as the STL complex type. - * - * @{ - */ - -#ifndef HAVE_AMESOS2_KLU2 - -template <> -class ValueTypeConversionTraits, std::complex > -{ -public: - static std::complex convert( const std::complex t ) - { - std::complex ret(Teuchos::as(t.real()), - Teuchos::as(t.imag())); - return( ret ); - } - - static std::complex safeConvert( const std::complex t ) - { - std::complex ret(Teuchos::as(t.real()), - Teuchos::as(t.imag())); - return( ret ); - } -}; - - -template <> -class ValueTypeConversionTraits , std::complex > -{ -public: - static std::complex convert( const std::complex t ) - { - float ret_r = Teuchos::as( t.real() ); - float ret_i = Teuchos::as( t.imag() ); - std::complex ret (ret_r, ret_i); - return (ret); - } - - // No special checks for safe Convert - static std::complex safeConvert( const std::complex t ) - { - float ret_r = Teuchos::as( t.real() ); - float ret_i = Teuchos::as( t.imag() ); - std::complex ret (ret_r, ret_i); - return (ret); - } -}; - - -#endif -//@} End Conversion group - - -} // end namespace Teuchos - -#endif // HAVE_TEUCHOS_COMPLEX - - namespace Amesos2 { template class Basker; /* Specialize the Amesos2::TypeMap struct for Basker types - * TODO: Mostly dummy assignments as Basker is templated. Remove if possible. - * * \cond Basker_type_specializations */ template <> struct TypeMap { - static float dtype; - typedef float type; - typedef float magnitude_type; + static double dtype; + typedef double type; }; - template <> struct TypeMap { static double dtype; typedef double type; - typedef double magnitude_type; }; @@ -171,17 +94,28 @@ template <> struct TypeMap > { static std::complex dtype; - typedef std::complex type; - typedef double magnitude_type; + typedef Kokkos::complex type; }; - template <> struct TypeMap > { static std::complex dtype; - typedef std::complex type; - typedef double magnitude_type; + typedef Kokkos::complex type; +}; + +template <> +struct TypeMap > +{ + static std::complex dtype; + typedef Kokkos::complex type; +}; + +template <> +struct TypeMap > +{ + static std::complex dtype; + typedef Kokkos::complex type; }; diff --git a/packages/amesos2/src/Amesos2_Basker_decl.hpp b/packages/amesos2/src/Amesos2_Basker_decl.hpp index 74ef8ae9b9c7..366733068c62 100644 --- a/packages/amesos2/src/Amesos2_Basker_decl.hpp +++ b/packages/amesos2/src/Amesos2_Basker_decl.hpp @@ -94,10 +94,14 @@ class Basker : public SolverCore typedef TypeMap type_map; - typedef typename type_map::type slu_type; - typedef typename type_map::magnitude_type magnitude_type; + typedef typename type_map::type basker_type; - typedef FunctionMap function_map; + // TODO: Would like to change dtype to be a regular type, not static. + // Seems nothing was using dtype before anyways but Stokhos would break so + // will address that as a separate PR. + typedef decltype(type_map::dtype) basker_dtype; + + typedef FunctionMap function_map; typedef Matrix matrix_type; typedef MatrixAdapter matrix_adapter_type; @@ -106,18 +110,17 @@ class Basker : public SolverCore Basker( Teuchos::RCP A, Teuchos::RCP X, Teuchos::RCP B); - ~Basker( ); + ~Basker( ); private: - /** - * \brief can we optimize size_type and ordinal_type for straight pass through, - * also check that is_contiguous_ flag set to true - */ + /** + - * \brief can we optimize size_type and ordinal_type for straight pass through, + - * also check that is_contiguous_ flag set to true + - */ bool single_proc_optimization() const; - /** * \brief Performs pre-ordering on the matrix to increase efficiency. * @@ -185,24 +188,32 @@ class Basker : public SolverCore // Members int num_threads; - // The following Arrays are persisting storage arrays for A, X, and B - /// Stores the values of the nonzero entries for Basker - Teuchos::Array nzvals_; + typedef Kokkos::DefaultHostExecutionSpace HostSpaceType; + typedef Kokkos::View host_ordinal_type_array; + + typedef Kokkos::View host_value_type_array; + + // The following Views are persisting storage arrays for A, X, and B + /// Stores the values of the nonzero entries for CHOLMOD + host_value_type_array host_nzvals_view_; /// Stores the location in \c Ai_ and Aval_ that starts row j - Teuchos::Array rowind_; + host_ordinal_type_array host_rows_view_; /// Stores the row indices of the nonzero entries - Teuchos::Array colptr_; + host_ordinal_type_array host_col_ptr_view_; bool is_contiguous_; + typedef typename Kokkos::View + host_solve_array_t; /// Persisting 1D store for X - mutable Teuchos::Array xvals_; local_ordinal_type ldx_; + mutable host_solve_array_t xValues_; + /// Persisting 1D store for B - mutable Teuchos::Array bvals_; local_ordinal_type ldb_; + mutable host_solve_array_t bValues_; /*Handle for Basker object*/ - mutable ::BaskerClassicNS::BaskerClassic basker; + mutable ::BaskerClassicNS::BaskerClassic basker; }; // End class Basker @@ -212,8 +223,10 @@ class Basker : public SolverCore template <> struct solver_traits { #ifdef HAVE_TEUCHOS_COMPLEX - typedef Meta::make_list4, + Kokkos::complex, std::complex, std::complex > supported_scalars; #else @@ -221,6 +234,12 @@ struct solver_traits { #endif }; +template +struct solver_supports_matrix> { + static const bool value = true; +}; + } // end namespace Amesos2 #endif // AMESOS2_BASKER_DECL_HPP diff --git a/packages/amesos2/src/Amesos2_Basker_def.hpp b/packages/amesos2/src/Amesos2_Basker_def.hpp index e3d85accd94d..289875ad88dd 100644 --- a/packages/amesos2/src/Amesos2_Basker_def.hpp +++ b/packages/amesos2/src/Amesos2_Basker_def.hpp @@ -69,9 +69,6 @@ Basker::Basker( Teuchos::RCP X, Teuchos::RCP B ) : SolverCore(A, X, B) - , nzvals_() // initialize to empty arrays - , rowind_() - , colptr_() , is_contiguous_(true) // , basker() { @@ -132,7 +129,8 @@ Basker::numericFactorization_impl() std::cout << "colptr_ : " << colptr_.toString() << std::endl; #endif - info = basker.factor(this->globalNumRows_, this->globalNumCols_, this->globalNumNonZeros_, colptr_.getRawPtr(), rowind_.getRawPtr(), nzvals_.getRawPtr()); + basker_dtype * pBaskerValues = function_map::convert_scalar(host_nzvals_view_.data()); + info = basker.factor(this->globalNumRows_, this->globalNumCols_, this->globalNumNonZeros_, host_col_ptr_view_.data(), host_rows_view_.data(), pBaskerValues); // This is set after numeric factorization complete as pivoting can be used; // In this case, a discrepancy between symbolic and numeric nnz total can occur. @@ -176,108 +174,78 @@ Basker::solve_impl( const global_size_type ld_rhs = this->root_ ? X->getGlobalLength() : 0; const size_t nrhs = X->getGlobalNumVectors(); - if ( single_proc_optimization() && nrhs == 1 ) { - + { // Get values from RHS B #ifdef HAVE_AMESOS2_TIMERS - Teuchos::TimeMonitor solveTimer(this->timers_.solveTime_); + Teuchos::TimeMonitor mvConvTimer(this->timers_.vecConvTime_); + Teuchos::TimeMonitor redistTimer( this->timers_.vecRedistTime_ ); #endif -#ifndef HAVE_TEUCHOS_COMPLEX - auto b_vector = Util::vector_pointer_helper< MultiVecAdapter, Vector >::get_pointer_to_vector( B ); - auto x_vector = Util::vector_pointer_helper< MultiVecAdapter, Vector >::get_pointer_to_vector( X ); -#else - // NDE: 09/25/2017 - // Cannot convert Kokkos::complex* to std::complex*; in this case, use reinterpret_cast - using complex_type = typename Util::getStdCplxType< magnitude_type, typename matrix_adapter_type::spmtx_vals_t >::type; - complex_type * b_vector = reinterpret_cast< complex_type * >( Util::vector_pointer_helper< MultiVecAdapter, Vector >::get_pointer_to_vector( B ) ); - complex_type * x_vector = reinterpret_cast< complex_type * >( Util::vector_pointer_helper< MultiVecAdapter, Vector >::get_pointer_to_vector( X ) ); -#endif - TEUCHOS_TEST_FOR_EXCEPTION(b_vector == nullptr, - std::runtime_error, "Amesos2 Runtime Error: b_vector returned null "); - - TEUCHOS_TEST_FOR_EXCEPTION(x_vector == nullptr, - std::runtime_error, "Amesos2 Runtime Error: x_vector returned null "); - - if ( this->root_ ) { - { // Do solve! -#ifdef HAVE_AMESOS2_TIMERS - Teuchos::TimeMonitor solveTimer(this->timers_.solveTime_); -#endif - ierr = basker.solveMultiple(nrhs, b_vector, x_vector); - } - - /* All processes should have the same error code */ - Teuchos::broadcast(*(this->getComm()), 0, &ierr); + if ( single_proc_optimization() && nrhs == 1 ) { + // no msp creation + Util::get_1d_copy_helper_kokkos_view, + host_solve_array_t>::do_get(B, bValues_, as(ld_rhs)); - TEUCHOS_TEST_FOR_EXCEPTION( ierr > 0, - std::runtime_error, - "Encountered zero diag element at: " << ierr); - TEUCHOS_TEST_FOR_EXCEPTION( ierr == -1, - std::runtime_error, - "Could not alloc needed working memory for solve" ); + Util::get_1d_copy_helper_kokkos_view, + host_solve_array_t>::do_get(X, xValues_, as(ld_rhs)); } - } - else - { - const size_t val_store_size = as(ld_rhs * nrhs); - - xvals_.resize(val_store_size); - bvals_.resize(val_store_size); - - { // Get values from RHS B -#ifdef HAVE_AMESOS2_TIMERS - Teuchos::TimeMonitor mvConvTimer(this->timers_.vecConvTime_); - Teuchos::TimeMonitor redistTimer( this->timers_.vecRedistTime_ ); -#endif + else { + if ( is_contiguous_ == true ) { + Util::get_1d_copy_helper_kokkos_view, + host_solve_array_t>::do_get(B, bValues_, as(ld_rhs), ROOTED, this->rowIndexBase_); + } + else { + Util::get_1d_copy_helper_kokkos_view, + host_solve_array_t>::do_get(B, bValues_, as(ld_rhs), CONTIGUOUS_AND_ROOTED, this->rowIndexBase_); + } + // See Amesos2_Tacho_def.hpp for notes on why we 'get' x here. if ( is_contiguous_ == true ) { - Util::get_1d_copy_helper, - slu_type>::do_get(B, bvals_(), as(ld_rhs), ROOTED, this->rowIndexBase_); + Util::get_1d_copy_helper_kokkos_view, + host_solve_array_t>::do_get(X, xValues_, as(ld_rhs), ROOTED, this->rowIndexBase_); } else { - Util::get_1d_copy_helper, - slu_type>::do_get(B, bvals_(), as(ld_rhs), CONTIGUOUS_AND_ROOTED, this->rowIndexBase_); + Util::get_1d_copy_helper_kokkos_view, + host_solve_array_t>::do_get(X, xValues_, as(ld_rhs), CONTIGUOUS_AND_ROOTED, this->rowIndexBase_); } } + } - if ( this->root_ ) { - { // Do solve! + if ( this->root_ ) { // do solve #ifdef HAVE_AMESOS2_TIMERS - Teuchos::TimeMonitor solveTimer(this->timers_.solveTime_); + Teuchos::TimeMonitor solveTimer(this->timers_.solveTime_); #endif - ierr = basker.solveMultiple(nrhs, bvals_.getRawPtr(),xvals_.getRawPtr()); - } - - } + basker_dtype * pxBaskerValues = function_map::convert_scalar(xValues_.data()); + basker_dtype * pbBaskerValues = function_map::convert_scalar(bValues_.data()); + ierr = basker.solveMultiple(nrhs, pbBaskerValues, pxBaskerValues); + } - /* All processes should have the same error code */ - Teuchos::broadcast(*(this->getComm()), 0, &ierr); + /* All processes should have the same error code */ + Teuchos::broadcast(*(this->getComm()), 0, &ierr); - TEUCHOS_TEST_FOR_EXCEPTION( ierr > 0, - std::runtime_error, - "Encountered zero diag element at: " << ierr); - TEUCHOS_TEST_FOR_EXCEPTION( ierr == -1, - std::runtime_error, - "Could not alloc needed working memory for solve" ); + TEUCHOS_TEST_FOR_EXCEPTION( ierr > 0, + std::runtime_error, + "Encountered zero diag element at: " << ierr); + TEUCHOS_TEST_FOR_EXCEPTION( ierr == -1, + std::runtime_error, + "Could not alloc needed working memory for solve" ); - { + { #ifdef HAVE_AMESOS2_TIMERS - Teuchos::TimeMonitor redistTimer(this->timers_.vecRedistTime_); + Teuchos::TimeMonitor redistTimer(this->timers_.vecRedistTime_); #endif - if ( is_contiguous_ == true ) { - Util::put_1d_data_helper< - MultiVecAdapter,slu_type>::do_put(X, xvals_(), - as(ld_rhs), - ROOTED); - } - else { - Util::put_1d_data_helper< - MultiVecAdapter,slu_type>::do_put(X, xvals_(), - as(ld_rhs), - CONTIGUOUS_AND_ROOTED); - } + if ( is_contiguous_ == true ) { + Util::put_1d_data_helper_kokkos_view< + MultiVecAdapter,host_solve_array_t>::do_put(X, xValues_, + as(ld_rhs), + ROOTED); + } + else { + Util::put_1d_data_helper_kokkos_view< + MultiVecAdapter,host_solve_array_t>::do_put(X, xValues_, + as(ld_rhs), + CONTIGUOUS_AND_ROOTED); } } @@ -344,9 +312,12 @@ Basker::loadA_impl(EPhase current_phase) // Only the root image needs storage allocated if( this->root_ ){ - nzvals_.resize(this->globalNumNonZeros_); - rowind_.resize(this->globalNumNonZeros_); - colptr_.resize(this->globalNumCols_ + 1); + host_nzvals_view_ = host_value_type_array( + Kokkos::ViewAllocateWithoutInitializing("host_nzvals_view_"), this->globalNumNonZeros_); + host_rows_view_ = host_ordinal_type_array( + Kokkos::ViewAllocateWithoutInitializing("host_rows_view_"), this->globalNumNonZeros_); + host_col_ptr_view_ = host_ordinal_type_array( + Kokkos::ViewAllocateWithoutInitializing("host_col_ptr_view_"), this->globalNumRows_ + 1); } local_ordinal_type nnz_ret = 0; @@ -356,15 +327,15 @@ Basker::loadA_impl(EPhase current_phase) #endif if ( is_contiguous_ == true ) { - Util::get_ccs_helper< - MatrixAdapter,slu_type,local_ordinal_type,local_ordinal_type> - ::do_get(this->matrixA_.ptr(), nzvals_(), rowind_(), colptr_(), + Util::get_ccs_helper_kokkos_view< + MatrixAdapter,host_value_type_array,host_ordinal_type_array,host_ordinal_type_array> + ::do_get(this->matrixA_.ptr(), host_nzvals_view_, host_rows_view_, host_col_ptr_view_, nnz_ret, ROOTED, ARBITRARY, this->rowIndexBase_); } else { - Util::get_ccs_helper< - MatrixAdapter,slu_type,local_ordinal_type,local_ordinal_type> - ::do_get(this->matrixA_.ptr(), nzvals_(), rowind_(), colptr_(), + Util::get_ccs_helper_kokkos_view< + MatrixAdapter,host_value_type_array,host_ordinal_type_array,host_ordinal_type_array> + ::do_get(this->matrixA_.ptr(), host_nzvals_view_, host_rows_view_, host_col_ptr_view_, nnz_ret, CONTIGUOUS_AND_ROOTED, ARBITRARY, this->rowIndexBase_); } } diff --git a/packages/amesos2/src/Amesos2_Cholmod_FunctionMap.hpp b/packages/amesos2/src/Amesos2_Cholmod_FunctionMap.hpp index 3d44a284b135..c16d3a6c4d6c 100644 --- a/packages/amesos2/src/Amesos2_Cholmod_FunctionMap.hpp +++ b/packages/amesos2/src/Amesos2_Cholmod_FunctionMap.hpp @@ -72,13 +72,13 @@ namespace Amesos2 { static void cholmod_init_sparse(size_t nrow, size_t ncol, size_t nzmax, int sorted, void *p, void *x, void *i, - cholmod_sparse *sparse) + cholmod_sparse *sparse, int cholmod_itype) { sparse->nrow = nrow; sparse->ncol = ncol; sparse->nzmax = nzmax; sparse->stype = 1; - sparse->itype = CHOLMOD_LONG; + sparse->itype = cholmod_itype; sparse->sorted = 0; sparse->packed = 1; sparse->xtype = CHOLMOD_REAL; @@ -107,13 +107,13 @@ namespace Amesos2 { { static void cholmod_init_sparse(size_t nrow, size_t ncol, size_t nzmax, int sorted, void *p, void *x, void*i, - cholmod_sparse* sparse) + cholmod_sparse* sparse, int cholmod_itype) { sparse->nrow = nrow; sparse->ncol = ncol; sparse->nzmax = nzmax; sparse->stype = 1; - sparse->itype = CHOLMOD_LONG; + sparse->itype = cholmod_itype; sparse->sorted = 0; sparse->packed = 1; sparse->xtype = CHOLMOD_REAL; @@ -145,13 +145,13 @@ namespace Amesos2 { static void cholmod_init_sparse(size_t nrow, size_t ncol, size_t nzmax, int sorted, void *p, void *x, void *i, - cholmod_sparse* sparse) + cholmod_sparse* sparse, int cholmod_itype) { sparse->nrow = nrow; sparse->ncol = ncol; sparse->nzmax = nzmax; sparse->stype = 1; - sparse->itype = CHOLMOD_LONG; + sparse->itype = cholmod_itype; sparse->sorted = 0; sparse->packed = 1; sparse->xtype = CHOLMOD_COMPLEX; @@ -182,13 +182,13 @@ namespace Amesos2 { static void cholmod_init_sparse(size_t nrow, size_t ncol, size_t nzmax, int sorted, void *p, void *x, void *i, - cholmod_sparse* sparse) + cholmod_sparse* sparse, int cholmod_itype) { sparse->nrow = nrow; sparse->ncol = ncol; sparse->nzmax = nzmax; sparse->stype = 1; - sparse->itype = CHOLMOD_LONG; + sparse->itype = cholmod_itype; sparse->sorted = 0; sparse->packed = 1; sparse->xtype = CHOLMOD_COMPLEX; diff --git a/packages/amesos2/src/Amesos2_Cholmod_decl.hpp b/packages/amesos2/src/Amesos2_Cholmod_decl.hpp index 3f9793486b2e..8c8ecc6adaf9 100644 --- a/packages/amesos2/src/Amesos2_Cholmod_decl.hpp +++ b/packages/amesos2/src/Amesos2_Cholmod_decl.hpp @@ -170,32 +170,20 @@ class Cholmod : public SolverCore */ bool matrixShapeOK_impl() const; - /** * Currently, the following CHOLMOD parameters/options are * recognized and acted upon: * *
    - *
  • \c "Trans" : { \c "NOTRANS" | \c "TRANS" | - * \c "CONJ" }. Specifies whether to solve with the transpose system.
    • - *
  • \c "Equil" : { \c true | \c false }. Specifies whether - * the solver to equilibrate the matrix before solving.
    • - *
  • \c "IterRefine" : { \c "NO" | \c "SLU_SINGLE" | \c "SLU_DOUBLE" | \c "EXTRA" - * }. Specifies whether to perform iterative refinement, and in - * what precision to compute the residual.
    • - *
  • \c "SymmetricMode" : { \c true | \c false }.
    • - *
  • \c "DiagPivotThresh" : \c double value. Specifies the threshold - * used for a diagonal to be considered an acceptable pivot.
    • - *
  • \c "ColPerm" which takes one of the following: - *
      - *
    • \c "NATURAL" : natural ordering.
      • - *
    • \c "MMD_AT_PLUS_A" : minimum degree ordering on the structure of - * \f$ A^T + A\f$ .
      • - *
    • \c "MMD_ATA" : minimum degree ordering on the structure of - * \f$ A T A \f$ .
      • - *
    • \c "COLAMD" : approximate minimum degree column ordering. - * (default)
      • - *
    + *
  • \c "nmethods" : { \c int value }. Specifies the number of different ordering methods to try.
    • + *
  • \c "print" : \c int value. Specifies the verbosity of the print statements.
    • + *
  • \c "dbound" : \c int value. Specifies the smallest absolute value on the diagonal D for the LDL factorization.
    • + *
  • \c "PreferUpper" : \c int value. Specifies whether the matrix will be stored in upper triangular form.
    • + *
  • \c "useGPU" : \c int value. 1: Use GPU is 1, 0: Do not use GPU, -1: ENV CHOLMOD_USE_GPU set GPU usage..
    • + *
  • \c "Enable_KokkosKernels_TriangularSolves" : \c bool value. Whether to use triangular solves.
    • + *
  • \c "CholmodInt" : \c bool value. Whether to use cholmod int form.
    • Whether GIDs contiguous the + * smallest absolute value on the diagonal D for the LDL factorization. + *
  • \c "SuperNodal" : \c bool value. Whether to use super nodal.
    • *
*/ void setParameters_impl( @@ -234,10 +222,21 @@ class Cholmod : public SolverCore typedef Kokkos::DefaultHostExecutionSpace HostExecSpaceType; typedef typename HostExecSpaceType::memory_space HostMemSpaceType; - typedef long size_type; - typedef long ordinal_type; - typedef Kokkos::View host_size_type_array; - typedef Kokkos::View host_ordinal_type_array; + // use_cholmod_int_type controls whether we use CHOLMOD_INT or CHOLMOD_LONG. + // To preserve a simple interface for the user where this can be picked + // simply by setting a parameter, we prepare both types of arrays and just + // one will actually be used. + typedef int size_int_type; + typedef int ordinal_int_type; + + typedef long size_long_type; + typedef long ordinal_long_type; + + typedef Kokkos::View host_size_long_type_array; + typedef Kokkos::View host_ordinal_long_type_array; + + typedef Kokkos::View host_size_int_type_array; + typedef Kokkos::View host_ordinal_int_type_array; typedef Kokkos::View host_value_type_array; @@ -245,20 +244,20 @@ class Cholmod : public SolverCore /// Stores the values of the nonzero entries for CHOLMOD host_value_type_array host_nzvals_view_; /// Stores the location in \c Ai_ and Aval_ that starts row j - host_size_type_array host_rows_view_; + host_size_int_type_array host_rows_int_view_; + host_size_long_type_array host_rows_long_view_; /// Stores the row indices of the nonzero entries - host_ordinal_type_array host_col_ptr_view_; + host_ordinal_int_type_array host_col_ptr_int_view_; + host_ordinal_long_type_array host_col_ptr_long_view_; typedef typename Kokkos::View host_solve_array_t; /// Persisting 1D store for X mutable host_solve_array_t host_xValues_; - int ldx_; /// Persisting 1D store for B mutable host_solve_array_t host_bValues_; - int ldb_; #if defined(KOKKOSKERNELS_ENABLE_SUPERNODAL_SPTRSV) && defined(KOKKOSKERNELS_ENABLE_TPL_CHOLMOD) @@ -284,10 +283,14 @@ class Cholmod : public SolverCore device_int_array device_trsv_perm_; mutable device_solve_array_t device_trsv_rhs_; mutable device_solve_array_t device_trsv_sol_; - typedef KokkosKernels::Experimental::KokkosKernelsHandle kernel_handle_type; - mutable kernel_handle_type device_khL_; - mutable kernel_handle_type device_khU_; + typedef KokkosKernels::Experimental::KokkosKernelsHandle kernel_handle_int_type; + typedef KokkosKernels::Experimental::KokkosKernelsHandle kernel_handle_long_type; + mutable kernel_handle_int_type device_int_khL_; + mutable kernel_handle_int_type device_int_khU_; + mutable kernel_handle_long_type device_long_khL_; + mutable kernel_handle_long_type device_long_khU_; #endif bool firstsolve; @@ -299,6 +302,7 @@ class Cholmod : public SolverCore bool is_contiguous_; bool use_triangular_solves_; + bool use_cholmod_int_type_; // controls if Cholmod is int or long void triangular_solve_symbolic(); void triangular_solve_numeric(); @@ -307,15 +311,6 @@ class Cholmod : public SolverCore void triangular_solve() const; // Only for internal use - public to support kernels }; // End class Cholmod - -/* Specialize solver_traits struct for Cholmod - * - * Based on the CHOLMOD documentation, the support for - * single-precision complex numbers is unclear. Much of the - * discussion of complex types only makes explicit mention of 'double' - * types. So, be pessimistic for now and don't declare - * single-precision complex support - */ template <> struct solver_traits { diff --git a/packages/amesos2/src/Amesos2_Cholmod_def.hpp b/packages/amesos2/src/Amesos2_Cholmod_def.hpp index f400660f0311..719ad3af813e 100644 --- a/packages/amesos2/src/Amesos2_Cholmod_def.hpp +++ b/packages/amesos2/src/Amesos2_Cholmod_def.hpp @@ -78,17 +78,12 @@ Cholmod::Cholmod( , map() , is_contiguous_(true) // default is set by params , use_triangular_solves_(false) // default is set by params + , use_cholmod_int_type_(false) // if true we use CHOLMOD_INT (no GPU support) { data_.L = NULL; data_.Y = NULL; data_.E = NULL; - cholmod_l_start(&data_.c); // long form required for CUDA - - // TODO: Add an option so we can support CHOLMOD_INT (if no GPU is required) - // This will require some kind of templating design in decl.hpp which uses the long type - data_.c.itype = CHOLMOD_LONG; // required for long support - data_.c.supernodal = CHOLMOD_AUTO; data_.c.quick_return_if_not_posdef = 1; } @@ -97,14 +92,20 @@ Cholmod::Cholmod( template Cholmod::~Cholmod( ) { - // useful to check if GPU is being used, but very verbose - // cholmod_l_gpu_stats(&(data_.c)); - - cholmod_l_free_factor(&(data_.L), &(data_.c)); - cholmod_l_free_dense(&(data_.Y), &data_.c); - cholmod_l_free_dense(&(data_.E), &data_.c); - - cholmod_l_finish(&(data_.c)); + if(use_cholmod_int_type_) { + cholmod_free_factor(&(data_.L), &(data_.c)); + cholmod_free_dense(&(data_.Y), &data_.c); + cholmod_free_dense(&(data_.E), &data_.c); + cholmod_finish(&(data_.c)); + } + else { + // useful to check if GPU is being used, but very verbose + // cholmod_l_gpu_stats(&(data_.c)); + cholmod_l_free_factor(&(data_.L), &(data_.c)); + cholmod_l_free_dense(&(data_.Y), &data_.c); + cholmod_l_free_dense(&(data_.E), &data_.c); + cholmod_l_finish(&(data_.c)); + } } template @@ -117,7 +118,13 @@ Cholmod::preOrdering_impl() int info = 0; - data_.L = cholmod_l_analyze(&data_.A, &(data_.c)); + if(use_cholmod_int_type_) { + data_.L = cholmod_analyze(&data_.A, &(data_.c)); + } + else { + data_.L = cholmod_l_analyze(&data_.A, &(data_.c)); + } + info = data_.c.status; skip_symfact = true; @@ -143,7 +150,12 @@ Cholmod::symbolicFactorization_impl() Teuchos::TimeMonitor symFactTimer(this->timers_.symFactTime_); #endif - cholmod_l_resymbol (&data_.A, NULL, 0, true, data_.L, &(data_.c)); + if(use_cholmod_int_type_) { + cholmod_resymbol (&data_.A, NULL, 0, true, data_.L, &(data_.c)); + } + else { + cholmod_l_resymbol (&data_.A, NULL, 0, true, data_.L, &(data_.c)); + } info = data_.c.status; } else { @@ -193,7 +205,13 @@ Cholmod::numericFactorization_impl() // Add print out of views here - need host conversion first #endif - cholmod_l_factorize(&data_.A, data_.L, &(data_.c)); + if(use_cholmod_int_type_) { + cholmod_factorize(&data_.A, data_.L, &(data_.c)); + } + else { + cholmod_l_factorize(&data_.A, data_.L, &(data_.c)); + } + info = data_.c.status; /* All processes should have the same error code */ @@ -280,8 +298,14 @@ Cholmod::solve_impl(const Teuchos::Ptr > Teuchos::as(nrhs), Teuchos::as(ld_rhs), host_xValues_.data(), &data_.x); cholmod_dense *xtemp = &(data_.x); - cholmod_l_solve2(CHOLMOD_A, data_.L, &data_.b, NULL, - &(xtemp), NULL, &data_.Y, &data_.E, &data_.c); + if(use_cholmod_int_type_) { + cholmod_solve2(CHOLMOD_A, data_.L, &data_.b, NULL, + &(xtemp), NULL, &data_.Y, &data_.E, &data_.c); + } + else { + cholmod_l_solve2(CHOLMOD_A, data_.L, &data_.b, NULL, + &(xtemp), NULL, &data_.Y, &data_.E, &data_.c); + } } ierr = data_.c.status; @@ -331,6 +355,21 @@ template void Cholmod::setParameters_impl(const Teuchos::RCP & parameterList ) { + // Note that the ordering is very important here. We must do this sequence: + // (1) Read parameter for use_cholmod_int_type + // (2) Call cholmod_start or cholmod_l_start + // (3) Set additional data_.c values + use_cholmod_int_type_ = parameterList->get("CholmodInt", false); + + if(use_cholmod_int_type_) { + data_.c.itype = CHOLMOD_INT; + cholmod_start(&data_.c); + } + else { + data_.c.itype = CHOLMOD_LONG; + cholmod_l_start(&data_.c); // long form required for CUDA + } + using Teuchos::RCP; using Teuchos::getIntegralValue; using Teuchos::ParameterEntryValidator; @@ -365,6 +404,11 @@ Cholmod::setParameters_impl(const Teuchos::RCPget("useGPU", default_gpu_setting); +#ifdef KOKKOS_ENABLE_CUDA + TEUCHOS_TEST_FOR_EXCEPTION(data_.c.useGPU != 0 && use_cholmod_int_type_, std::runtime_error, + "Amesos2 Cholmod solver must not use GPU (parameter useGPU = 0) if CholmodInt is turned on because Cholmod only supports GPU with long." ); +#endif + bool bSuperNodal = parameterList->get("SuperNodal", false); data_.c.supernodal = bSuperNodal ? CHOLMOD_SUPERNODAL : CHOLMOD_AUTO; } @@ -398,10 +442,7 @@ Cholmod::getValidParameters_impl() const pl->set("print", 3, "Specifies the verbosity of the print statements", print_validator); pl->set("dbound", 0.0, - "Specifies the smallest absolute value on the diagonal D for the LDL' factorization"); - - - pl->set("Equil", true, "Whether to equilibrate the system before solve"); + "Specifies the smallest absolute value on the diagonal D for the LDL factorization"); pl->set("PreferUpper", true, "Specifies whether the matrix will be " @@ -411,6 +452,8 @@ Cholmod::getValidParameters_impl() const pl->set("Enable_KokkosKernels_TriangularSolves", false, "Whether to use triangular solves."); + pl->set("CholmodInt", false, "Whether to use cholmod in int form"); + pl->set("IsContiguous", true, "Whether GIDs contiguous"); pl->set("SuperNodal", false, "Whether to use super nodal"); @@ -431,12 +474,16 @@ Cholmod::loadA_impl(EPhase current_phase) #endif // Only the root image needs storage allocated - Kokkos::resize(host_nzvals_view_, this->globalNumNonZeros_); - Kokkos::resize(host_rows_view_, this->globalNumNonZeros_); - Kokkos::resize(host_col_ptr_view_, this->globalNumRows_ + 1); + if(use_cholmod_int_type_) { + Kokkos::resize(host_rows_int_view_, this->globalNumNonZeros_); + Kokkos::resize(host_col_ptr_int_view_, this->globalNumRows_ + 1); + } + else { + Kokkos::resize(host_rows_long_view_, this->globalNumNonZeros_); + Kokkos::resize(host_col_ptr_long_view_, this->globalNumRows_ + 1); + } - long nnz_ret = 0; { #ifdef HAVE_AMESOS2_TIMERS Teuchos::TimeMonitor mtxRedistTimer( this->timers_.mtxRedistTime_ ); @@ -446,38 +493,78 @@ Cholmod::loadA_impl(EPhase current_phase) std::runtime_error, "Row and column maps have different indexbase "); - if ( is_contiguous_ == true ) { - Util::get_ccs_helper_kokkos_view< - MatrixAdapter,host_value_type_array,host_ordinal_type_array, - host_size_type_array>::do_get(this->matrixA_.ptr(), - host_nzvals_view_, host_rows_view_, - host_col_ptr_view_, nnz_ret, ROOTED, - ARBITRARY, - this->rowIndexBase_); + if(use_cholmod_int_type_) { + int nnz_ret = 0; + if ( is_contiguous_ == true ) { + Util::get_ccs_helper_kokkos_view< + MatrixAdapter,host_value_type_array,host_ordinal_int_type_array, + host_size_int_type_array>::do_get(this->matrixA_.ptr(), + host_nzvals_view_, host_rows_int_view_, + host_col_ptr_int_view_, nnz_ret, ROOTED, + ARBITRARY, + this->rowIndexBase_); + } + else { + Util::get_ccs_helper_kokkos_view< + MatrixAdapter,host_value_type_array,host_ordinal_int_type_array, + host_size_int_type_array>::do_get(this->matrixA_.ptr(), + host_nzvals_view_, host_rows_int_view_, + host_col_ptr_int_view_, nnz_ret, CONTIGUOUS_AND_ROOTED, + ARBITRARY, + this->rowIndexBase_); + } + TEUCHOS_TEST_FOR_EXCEPTION(nnz_ret != Teuchos::as(this->globalNumNonZeros_), + std::runtime_error, + "Did not get the expected number of non-zero vals"); } else { - Util::get_ccs_helper_kokkos_view< - MatrixAdapter,host_value_type_array,host_ordinal_type_array, - host_size_type_array>::do_get(this->matrixA_.ptr(), - host_nzvals_view_, host_rows_view_, - host_col_ptr_view_, nnz_ret, CONTIGUOUS_AND_ROOTED, - ARBITRARY, - this->rowIndexBase_); + long nnz_ret = 0; + if ( is_contiguous_ == true ) { + Util::get_ccs_helper_kokkos_view< + MatrixAdapter,host_value_type_array,host_ordinal_long_type_array, + host_size_long_type_array>::do_get(this->matrixA_.ptr(), + host_nzvals_view_, host_rows_long_view_, + host_col_ptr_long_view_, nnz_ret, ROOTED, + ARBITRARY, + this->rowIndexBase_); + } + else { + Util::get_ccs_helper_kokkos_view< + MatrixAdapter,host_value_type_array,host_ordinal_long_type_array, + host_size_long_type_array>::do_get(this->matrixA_.ptr(), + host_nzvals_view_, host_rows_long_view_, + host_col_ptr_long_view_, nnz_ret, CONTIGUOUS_AND_ROOTED, + ARBITRARY, + this->rowIndexBase_); + } + TEUCHOS_TEST_FOR_EXCEPTION(nnz_ret != Teuchos::as(this->globalNumNonZeros_), + std::runtime_error, + "Did not get the expected number of non-zero vals"); } } - TEUCHOS_TEST_FOR_EXCEPTION(nnz_ret != Teuchos::as(this->globalNumNonZeros_), - std::runtime_error, - "Did not get the expected number of non-zero vals"); - - function_map::cholmod_init_sparse(Teuchos::as(this->globalNumRows_), + if(use_cholmod_int_type_) { + function_map::cholmod_init_sparse(Teuchos::as(this->globalNumRows_), Teuchos::as(this->globalNumCols_), Teuchos::as(this->globalNumNonZeros_), 0, - host_col_ptr_view_.data(), + host_col_ptr_int_view_.data(), host_nzvals_view_.data(), - host_rows_view_.data(), - &(data_.A)); + host_rows_int_view_.data(), + &(data_.A), + CHOLMOD_INT); + } + else { + function_map::cholmod_init_sparse(Teuchos::as(this->globalNumRows_), + Teuchos::as(this->globalNumCols_), + Teuchos::as(this->globalNumNonZeros_), + 0, + host_col_ptr_long_view_.data(), + host_nzvals_view_.data(), + host_rows_long_view_.data(), + &(data_.A), + CHOLMOD_LONG); + } TEUCHOS_TEST_FOR_EXCEPTION(data_.A.stype == 0, std::runtime_error, "CHOLMOD loadA_impl loaded matrix but it is not symmetric."); @@ -485,57 +572,108 @@ Cholmod::loadA_impl(EPhase current_phase) return true; } + template void Cholmod::triangular_solve_symbolic() { #if defined(KOKKOSKERNELS_ENABLE_SUPERNODAL_SPTRSV) && defined(KOKKOSKERNELS_ENABLE_TPL_CHOLMOD) // Create handles for U and U^T solves - device_khL_.create_sptrsv_handle( - KokkosSparse::Experimental::SPTRSVAlgorithm::SUPERNODAL_ETREE, data_.L->n, true); - device_khU_.create_sptrsv_handle( - KokkosSparse::Experimental::SPTRSVAlgorithm::SUPERNODAL_ETREE, data_.L->n, false); + if(use_cholmod_int_type_) { + device_int_khL_.create_sptrsv_handle( + KokkosSparse::Experimental::SPTRSVAlgorithm::SUPERNODAL_ETREE, data_.L->n, true); + device_int_khU_.create_sptrsv_handle( + KokkosSparse::Experimental::SPTRSVAlgorithm::SUPERNODAL_ETREE, data_.L->n, false); + } + else { + device_long_khL_.create_sptrsv_handle( + KokkosSparse::Experimental::SPTRSVAlgorithm::SUPERNODAL_ETREE, data_.L->n, true); + device_long_khU_.create_sptrsv_handle( + KokkosSparse::Experimental::SPTRSVAlgorithm::SUPERNODAL_ETREE, data_.L->n, false); + } // extract etree and iperm from CHOLMOD - long *long_etree = static_cast(data_.c.Iwork) + 2 * data_.L->n; Kokkos::resize(host_trsv_etree_, data_.L->nsuper); - for (size_t i = 0 ; i < data_.L->nsuper; ++i) { // convert long to int array for trsv API - host_trsv_etree_(i) = long_etree[i]; + if(use_cholmod_int_type_) { + int *int_etree = static_cast(data_.c.Iwork) + 2 * data_.L->n; + for (size_t i = 0 ; i < data_.L->nsuper; ++i) { + host_trsv_etree_(i) = int_etree[i]; + } + } + else { + long *long_etree = static_cast(data_.c.Iwork) + 2 * data_.L->n; + for (size_t i = 0 ; i < data_.L->nsuper; ++i) { // convert long to int array for trsv API + host_trsv_etree_(i) = static_cast(long_etree[i]); + } } // set etree - device_khL_.set_sptrsv_etree(host_trsv_etree_.data()); - device_khU_.set_sptrsv_etree(host_trsv_etree_.data()); + if(use_cholmod_int_type_) { + device_int_khL_.set_sptrsv_etree(host_trsv_etree_.data()); + device_int_khU_.set_sptrsv_etree(host_trsv_etree_.data()); + } + else { + device_long_khL_.set_sptrsv_etree(host_trsv_etree_.data()); + device_long_khU_.set_sptrsv_etree(host_trsv_etree_.data()); + } size_t ld_rhs = this->matrixA_->getGlobalNumRows(); Kokkos::resize(host_trsv_perm_, ld_rhs); - long *iperm = static_cast(data_.L->Perm); - for (size_t i = 0; i < ld_rhs; i++) { // convert long to int array for trsv API - host_trsv_perm_(iperm[i]) = i; + if(use_cholmod_int_type_) { + int *int_iperm = static_cast(data_.L->Perm); + for (size_t i = 0; i < ld_rhs; i++) { + host_trsv_perm_(int_iperm[i]) = i; + } + } + else { + long *long_iperm = static_cast(data_.L->Perm); + for (size_t i = 0; i < ld_rhs; i++) { + host_trsv_perm_(long_iperm[i]) = i; + } } deep_copy_or_assign_view(device_trsv_perm_, host_trsv_perm_); // will use device to permute // set permutation - device_khL_.set_sptrsv_perm(host_trsv_perm_.data()); - device_khU_.set_sptrsv_perm(host_trsv_perm_.data()); + if(use_cholmod_int_type_) { + device_int_khL_.set_sptrsv_perm(host_trsv_perm_.data()); + device_int_khU_.set_sptrsv_perm(host_trsv_perm_.data()); + } + else { + device_long_khL_.set_sptrsv_perm(host_trsv_perm_.data()); + device_long_khU_.set_sptrsv_perm(host_trsv_perm_.data()); + } // Do symbolic analysis - KokkosSparse::Experimental::sptrsv_symbolic - (&device_khL_, &device_khU_, data_.L, &data_.c); + if(use_cholmod_int_type_) { + KokkosSparse::Experimental::sptrsv_symbolic + (&device_int_khL_, &device_int_khU_, data_.L, &data_.c); + } + else { + KokkosSparse::Experimental::sptrsv_symbolic + (&device_long_khL_, &device_long_khU_, data_.L, &data_.c); + } #endif } + template void Cholmod::triangular_solve_numeric() { #if defined(KOKKOSKERNELS_ENABLE_SUPERNODAL_SPTRSV) && defined(KOKKOSKERNELS_ENABLE_TPL_CHOLMOD) // Do numerical compute - KokkosSparse::Experimental::sptrsv_compute - (&device_khL_, &device_khU_, data_.L, &data_.c); + if(use_cholmod_int_type_) { + KokkosSparse::Experimental::sptrsv_compute + (&device_int_khL_, &device_int_khU_, data_.L, &data_.c); + } + else { + KokkosSparse::Experimental::sptrsv_compute + (&device_long_khL_, &device_long_khU_, data_.L, &data_.c); + } #endif // HAVE_AMESOS2_TRIANGULAR_SOLVE } + template void Cholmod::triangular_solve() const @@ -563,10 +701,21 @@ Cholmod::triangular_solve() const auto sub_rhs = Kokkos::subview(device_trsv_rhs_, Kokkos::ALL, k); // do L solve= - numeric (only rhs is modified) on the default device/host space - KokkosSparse::Experimental::sptrsv_solve(&device_khL_, sub_sol, sub_rhs); + if(use_cholmod_int_type_) { + KokkosSparse::Experimental::sptrsv_solve(&device_int_khL_, sub_sol, sub_rhs); + } + else { + KokkosSparse::Experimental::sptrsv_solve(&device_long_khL_, sub_sol, sub_rhs); + } // do L^T solve - numeric (only rhs is modified) on the default device/host space - KokkosSparse::Experimental::sptrsv_solve(&device_khU_, sub_rhs, sub_sol); + if(use_cholmod_int_type_) { + KokkosSparse::Experimental::sptrsv_solve(&device_int_khU_, sub_rhs, sub_sol); + } + else { + KokkosSparse::Experimental::sptrsv_solve(&device_long_khU_, sub_rhs, sub_sol); + } + } // end loop over rhs vectors // backward pivot @@ -580,6 +729,7 @@ Cholmod::triangular_solve() const #endif } + template const char* Cholmod::name = "Cholmod"; diff --git a/packages/amesos2/src/Amesos2_Factory.hpp b/packages/amesos2/src/Amesos2_Factory.hpp index d003a335755c..03952fe64c8e 100644 --- a/packages/amesos2/src/Amesos2_Factory.hpp +++ b/packages/amesos2/src/Amesos2_Factory.hpp @@ -404,7 +404,7 @@ struct throw_no_matrix_support_exception { { TEUCHOS_TEST_FOR_EXCEPTION( true, std::invalid_argument, - "Currently only the Tacho solver supports the kokkos adapter." ); + "This solver does not support the kokkos adapter." ); } }; diff --git a/packages/amesos2/src/Amesos2_KLU2.cpp b/packages/amesos2/src/Amesos2_KLU2.cpp index bfe92f31518e..51832779331b 100644 --- a/packages/amesos2/src/Amesos2_KLU2.cpp +++ b/packages/amesos2/src/Amesos2_KLU2.cpp @@ -47,6 +47,7 @@ #include "Amesos2_KLU2_def.hpp" #include "Amesos2_ExplicitInstantiationHelpers.hpp" +#include "TpetraCore_ETIHelperMacros.h" namespace Amesos2 { @@ -54,350 +55,16 @@ namespace Amesos2 { AMESOS2_SOLVER_EPETRA_INST(KLU2); #endif -} + #define AMESOS2_KLU2_LOCAL_INSTANT(S,LO,GO,N) \ + template class Amesos2::KLU2, \ + Tpetra::MultiVector >; + TPETRA_ETI_MANGLING_TYPEDEFS() -#ifdef HAVE_TPETRA_INST_INT_INT -namespace Amesos2 { -#ifdef HAVE_TPETRA_INST_FLOAT - AMESOS2_SOLVER_TPETRA_INST(KLU2,float,int,int); -#endif -#ifdef HAVE_TPETRA_INST_DOUBLE - AMESOS2_SOLVER_TPETRA_INST(KLU2,double,int,int); -#endif -#ifdef HAVE_TPETRA_INST_COMPLEX_FLOAT - AMESOS2_SOLVER_TPETRA_INST(KLU2,std::complex,int,int); -#endif -#ifdef HAVE_TPETRA_INST_COMPLEX_DOUBLE - AMESOS2_SOLVER_TPETRA_INST(KLU2,std::complex,int,int); -#endif -} -#endif //END INST_INT_INT + TPETRA_INSTANTIATE_SLGN_NO_ORDINAL_SCALAR(AMESOS2_KLU2_LOCAL_INSTANT) -#ifdef HAVE_TPETRA_INST_INT_UNSIGNED -namespace Amesos2 { -#ifdef HAVE_TPETRA_INST_FLOAT - AMESOS2_SOLVER_TPETRA_INST(KLU2,float,int,unsigned int); -#endif -#ifdef HAVE_TPETRA_INST_DOUBLE - AMESOS2_SOLVER_TPETRA_INST(KLU2,double,int,unsigned int); -#endif -#ifdef HAVE_TPETRA_INST_COMPLEX_FLOAT - AMESOS2_SOLVER_TPETRA_INST(KLU2,std::complex,int,unsigned int); -#endif -#ifdef HAVE_TPETRA_INST_COMPLEX_DOUBLE - AMESOS2_SOLVER_TPETRA_INST(KLU2,std::complex,int,unsigned int); -#endif + #define AMESOS2_KOKKOS_IMPL_SOLVER_NAME KLU2 + #include "Amesos2_Kokkos_Impl.hpp" } -#endif //END INST_INST_UNSIGNED - - - - -#ifdef HAVE_TPETRA_INST_INT_LONG -namespace Amesos2 { -#ifdef HAVE_TPETRA_INST_FLOAT - AMESOS2_SOLVER_TPETRA_INST(KLU2,float,int,long); -#endif -#ifdef HAVE_TPETRA_INST_DOUBLE - AMESOS2_SOLVER_TPETRA_INST(KLU2,double,int,long); -#endif -#ifdef HAVE_TPETRA_INST_COMPLEX_FLOAT - AMESOS2_SOLVER_TPETRA_INST(KLU2,std::complex,int,long); -#endif -#ifdef HAVE_TPETRA_INST_COMPLEX_DOUBLE - AMESOS2_SOLVER_TPETRA_INST(KLU2,std::complex,int,long); -#endif -} -#endif - -#ifdef HAVE_TPETRA_INST_INT_UNSIGNED_LONG -namespace Amesos2 { -#ifdef HAVE_TPETRA_INST_FLOAT - AMESOS2_SOLVER_TPETRA_INST(KLU2,float,int,unsigned long); -#endif -#ifdef HAVE_TPETRA_INST_DOUBLE - AMESOS2_SOLVER_TPETRA_INST(KLU2,double,int,unsigned long); -#endif -#ifdef HAVE_TPETRA_INST_COMPLEX_FLOAT - AMESOS2_SOLVER_TPETRA_INST(KLU2,std::complex,int,unsigned long); -#endif -#ifdef HAVE_TPETRA_INST_COMPLEX_DOUBLE - AMESOS2_SOLVER_TPETRA_INST(KLU2,std::complex,int,unsigned long); -#endif -} -#endif - -#ifdef HAVE_TPETRA_INST_INT_LONG_LONG -namespace Amesos2 { -#ifdef HAVE_TPETRA_INST_FLOAT - AMESOS2_SOLVER_TPETRA_INST(KLU2,float,int,long long); -#endif -#ifdef HAVE_TPETRA_INST_DOUBLE - AMESOS2_SOLVER_TPETRA_INST(KLU2,double,int,long long); -#endif -#ifdef HAVE_TPETRA_INST_COMPLEX_FLOAT - AMESOS2_SOLVER_TPETRA_INST(KLU2,std::complex,int,long long); -#endif -#ifdef HAVE_TPETRA_INST_COMPLEX_DOUBLE - AMESOS2_SOLVER_TPETRA_INST(KLU2,std::complex,int,long long); -#endif -} -#endif -// -// 7-Nov-2014: JJH code copied from Amesos2_SuperLU.cpp. -// -#include "Kokkos_DefaultNode.hpp" -#include "TpetraCore_ETIHelperMacros.h" - -#define AMESOS2_KLU2_LOCAL_INSTANT(S,LO,GO,N) \ - template class Amesos2::KLU2, \ - Tpetra::MultiVector >; - -TPETRA_ETI_MANGLING_TYPEDEFS() - -#if defined(HAVE_TPETRA_INST_SERIAL) && !defined(HAVE_TPETRA_DEFAULTNODE_SERIALWRAPPERNODE) -#define NODETYPE Kokkos_Compat_KokkosSerialWrapperNode -#ifdef HAVE_TPETRA_INST_FLOAT - #ifdef HAVE_TPETRA_INST_INT_INT - AMESOS2_KLU2_LOCAL_INSTANT(float, int, int, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_LONG - AMESOS2_KLU2_LOCAL_INSTANT(float, int, long, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_LONG_LONG - AMESOS2_KLU2_LOCAL_INSTANT(float, int, long long, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_UNSIGNED - AMESOS2_KLU2_LOCAL_INSTANT(float, int, unsigned int, NODETYPE) - #endif -#endif -#ifdef HAVE_TPETRA_INST_DOUBLE - #ifdef HAVE_TPETRA_INST_INT_INT - AMESOS2_KLU2_LOCAL_INSTANT(double, int, int, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_LONG - AMESOS2_KLU2_LOCAL_INSTANT(double, int, long, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_LONG_LONG - AMESOS2_KLU2_LOCAL_INSTANT(double, int, long long, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_UNSIGNED - AMESOS2_KLU2_LOCAL_INSTANT(double, int, unsigned int, NODETYPE) - #endif -#endif -#ifdef HAVE_TPETRA_INST_COMPLEX_FLOAT - #ifdef HAVE_TPETRA_INST_INT_INT - AMESOS2_KLU2_LOCAL_INSTANT(std::complex, int, int, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_LONG - AMESOS2_KLU2_LOCAL_INSTANT(std::complex, int, long, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_LONG_LONG - AMESOS2_KLU2_LOCAL_INSTANT(std::complex, int, long long, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_UNSIGNED - AMESOS2_KLU2_LOCAL_INSTANT(std::complex, int, unsigned int, NODETYPE) - #endif -#endif -#ifdef HAVE_TPETRA_INST_COMPLEX_DOUBLE - #ifdef HAVE_TPETRA_INST_INT_INT - AMESOS2_KLU2_LOCAL_INSTANT(std::complex, int, int, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_LONG - AMESOS2_KLU2_LOCAL_INSTANT(std::complex, int, long, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_LONG_LONG - AMESOS2_KLU2_LOCAL_INSTANT(std::complex, int, long long, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_UNSIGNED - AMESOS2_KLU2_LOCAL_INSTANT(std::complex, int, unsigned int, NODETYPE) - #endif -#endif -#undef NODETYPE -#endif - -#if defined(HAVE_TPETRA_INST_PTHREAD) && !defined(HAVE_TPETRA_DEFAULTNODE_THREADSWRAPPERNODE) -#define NODETYPE Kokkos_Compat_KokkosThreadsWrapperNode -#ifdef HAVE_TPETRA_INST_FLOAT - #ifdef HAVE_TPETRA_INST_INT_INT - AMESOS2_KLU2_LOCAL_INSTANT(float, int, int, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_LONG - AMESOS2_KLU2_LOCAL_INSTANT(float, int, long, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_LONG_LONG - AMESOS2_KLU2_LOCAL_INSTANT(float, int, long long, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_UNSIGNED - AMESOS2_KLU2_LOCAL_INSTANT(float, int, unsigned int, NODETYPE) - #endif -#endif -#ifdef HAVE_TPETRA_INST_DOUBLE - #ifdef HAVE_TPETRA_INST_INT_INT - AMESOS2_KLU2_LOCAL_INSTANT(double, int, int, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_LONG - AMESOS2_KLU2_LOCAL_INSTANT(double, int, long, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_LONG_LONG - AMESOS2_KLU2_LOCAL_INSTANT(double, int, long long, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_UNSIGNED - AMESOS2_KLU2_LOCAL_INSTANT(double, int, unsigned int, NODETYPE) - #endif -#endif -#ifdef HAVE_TPETRA_INST_COMPLEX_FLOAT - #ifdef HAVE_TPETRA_INST_INT_INT - AMESOS2_KLU2_LOCAL_INSTANT(std::complex, int, int, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_LONG - AMESOS2_KLU2_LOCAL_INSTANT(std::complex, int, long, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_LONG_LONG - AMESOS2_KLU2_LOCAL_INSTANT(std::complex, int, long long, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_UNSIGNED - AMESOS2_KLU2_LOCAL_INSTANT(std::complex, int, unsigned int, NODETYPE) - #endif -#endif -#ifdef HAVE_TPETRA_INST_COMPLEX_DOUBLE - #ifdef HAVE_TPETRA_INST_INT_INT - AMESOS2_KLU2_LOCAL_INSTANT(std::complex, int, int, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_LONG - AMESOS2_KLU2_LOCAL_INSTANT(std::complex, int, long, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_LONG_LONG - AMESOS2_KLU2_LOCAL_INSTANT(std::complex, int, long long, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_UNSIGNED - AMESOS2_KLU2_LOCAL_INSTANT(std::complex, int, unsigned int, NODETYPE) - #endif -#endif -#undef NODETYPE -#endif - -#if defined(HAVE_TPETRA_INST_OPENMP) && !defined(HAVE_TPETRA_DEFAULTNODE_OPENMPWRAPPERNODE) -#define NODETYPE Kokkos_Compat_KokkosOpenMPWrapperNode -#ifdef HAVE_TPETRA_INST_FLOAT - #ifdef HAVE_TPETRA_INST_INT_INT - AMESOS2_KLU2_LOCAL_INSTANT(float, int, int, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_LONG - AMESOS2_KLU2_LOCAL_INSTANT(float, int, long, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_LONG_LONG - AMESOS2_KLU2_LOCAL_INSTANT(float, int, long long, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_UNSIGNED - AMESOS2_KLU2_LOCAL_INSTANT(float, int, unsigned int, NODETYPE) - #endif -#endif -#ifdef HAVE_TPETRA_INST_DOUBLE - #ifdef HAVE_TPETRA_INST_INT_INT - AMESOS2_KLU2_LOCAL_INSTANT(double, int, int, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_LONG - AMESOS2_KLU2_LOCAL_INSTANT(double, int, long, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_LONG_LONG - AMESOS2_KLU2_LOCAL_INSTANT(double, int, long long, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_UNSIGNED - AMESOS2_KLU2_LOCAL_INSTANT(double, int, unsigned int, NODETYPE) - #endif -#endif -#ifdef HAVE_TPETRA_INST_COMPLEX_FLOAT - #ifdef HAVE_TPETRA_INST_INT_INT - AMESOS2_KLU2_LOCAL_INSTANT(std::complex, int, int, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_LONG - AMESOS2_KLU2_LOCAL_INSTANT(std::complex, int, long, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_LONG_LONG - AMESOS2_KLU2_LOCAL_INSTANT(std::complex, int, long long, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_UNSIGNED - AMESOS2_KLU2_LOCAL_INSTANT(std::complex, int, unsigned int, NODETYPE) - #endif -#endif -#ifdef HAVE_TPETRA_INST_COMPLEX_DOUBLE - #ifdef HAVE_TPETRA_INST_INT_INT - AMESOS2_KLU2_LOCAL_INSTANT(std::complex, int, int, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_LONG - AMESOS2_KLU2_LOCAL_INSTANT(std::complex, int, long, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_LONG_LONG - AMESOS2_KLU2_LOCAL_INSTANT(std::complex, int, long long, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_UNSIGNED - AMESOS2_KLU2_LOCAL_INSTANT(std::complex, int, unsigned int, NODETYPE) - #endif -#endif -#undef NODETYPE -#endif - -#if defined(HAVE_TPETRA_INST_CUDA) && !defined(HAVE_TPETRA_DEFAULTNODE_CUDAWRAPPERNODE) -#define NODETYPE Kokkos_Compat_KokkosCudaWrapperNode -#ifdef HAVE_TPETRA_INST_FLOAT - #ifdef HAVE_TPETRA_INST_INT_INT - AMESOS2_KLU2_LOCAL_INSTANT(float, int, int, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_LONG - AMESOS2_KLU2_LOCAL_INSTANT(float, int, long, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_LONG_LONG - AMESOS2_KLU2_LOCAL_INSTANT(float, int, long long, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_UNSIGNED - AMESOS2_KLU2_LOCAL_INSTANT(float, int, unsigned int, NODETYPE) - #endif -#endif -#ifdef HAVE_TPETRA_INST_DOUBLE - #ifdef HAVE_TPETRA_INST_INT_INT - AMESOS2_KLU2_LOCAL_INSTANT(double, int, int, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_LONG - AMESOS2_KLU2_LOCAL_INSTANT(double, int, long, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_LONG_LONG - AMESOS2_KLU2_LOCAL_INSTANT(double, int, long long, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_UNSIGNED - AMESOS2_KLU2_LOCAL_INSTANT(double, int, unsigned int, NODETYPE) - #endif -#endif -#ifdef HAVE_TPETRA_INST_COMPLEX_FLOAT - #ifdef HAVE_TPETRA_INST_INT_INT - AMESOS2_KLU2_LOCAL_INSTANT(std::complex, int, int, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_LONG - AMESOS2_KLU2_LOCAL_INSTANT(std::complex, int, long, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_LONG_LONG - AMESOS2_KLU2_LOCAL_INSTANT(std::complex, int, long long, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_UNSIGNED - AMESOS2_KLU2_LOCAL_INSTANT(std::complex, int, unsigned int, NODETYPE) - #endif -#endif -#ifdef HAVE_TPETRA_INST_COMPLEX_DOUBLE - #ifdef HAVE_TPETRA_INST_INT_INT - AMESOS2_KLU2_LOCAL_INSTANT(std::complex, int, int, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_LONG - AMESOS2_KLU2_LOCAL_INSTANT(std::complex, int, long, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_LONG_LONG - AMESOS2_KLU2_LOCAL_INSTANT(std::complex, int, long long, NODETYPE) - #endif - #ifdef HAVE_TPETRA_INST_INT_UNSIGNED - AMESOS2_KLU2_LOCAL_INSTANT(std::complex, int, unsigned int, NODETYPE) - #endif -#endif -#undef NODETYPE -#endif #endif // HAVE_AMESOS2_EXPLICIT_INSTANTIATION diff --git a/packages/amesos2/src/Amesos2_KLU2_FunctionMap.hpp b/packages/amesos2/src/Amesos2_KLU2_FunctionMap.hpp index dc004ce8fdc7..f49a43445e7c 100644 --- a/packages/amesos2/src/Amesos2_KLU2_FunctionMap.hpp +++ b/packages/amesos2/src/Amesos2_KLU2_FunctionMap.hpp @@ -52,6 +52,9 @@ #ifndef AMESOS2_KLU2_FUNCTIONMAP_HPP #define AMESOS2_KLU2_FUNCTIONMAP_HPP +// Note since Klu2 is templated we don't use function maps. +// Includes are still collected here which mirrors setup in other solvers. + #ifdef HAVE_TEUCHOS_COMPLEX #include #endif @@ -59,11 +62,8 @@ #include "Amesos2_FunctionMap.hpp" #include "Amesos2_KLU2_TypeMap.hpp" - /* External definitions of the KLU2 functions - * */ - // TODO namespace KLU2 { #include "klu2_defaults.hpp" #include "klu2_analyze.hpp" @@ -74,39 +74,28 @@ namespace KLU2 { #include "klu2_free_numeric.hpp" } // end namespace KLU2 - namespace Amesos2 { - /* ==================== Specializations ==================== - * - * \cond KLU2_function_specializations - */ - - /** - * \brief Pass function calls to KLU2 based on data type. - * - * Helper class which passes on function calls to the appropriate - * KLU2 function based on the type of its scalar template argument. - * - * KLU2 has solver and matrix builder functions defined based on - * data type. One function for complex, one for double precision - * complex, another for \c float , and yet another for \c double. To - * work elegantly with the Amesos2::KLU2 interface we want to be - * able to perform a single function call which is appropriate for the - * scalar type of the Matrix and MultiVectors that we are working - * with. The \c FunctionMap class provides that capability. - * - * The class template is specialized for each data type that KLU2 - * supports. The Amesos2::create function assures that an - * unspecialized FunctionMap will never be called by the solver - * interface. - * - */ - // TODO : Do we need the specializations for KLU2 ?? - - - /* \endcond KLU2_function_specializations */ - +#ifdef HAVE_TEUCHOS_COMPLEX + template <> + struct FunctionMap> + { + static std::complex * convert_scalar(Kokkos::complex * pData) { + return reinterpret_cast *>(pData); + } + }; + + // Note that Klu2 does not support complex float so it does not appear here. +#endif // HAVE_TEUCHOS_COMPLEX + + // if not specialized, then assume generic conversion is fine + template + struct FunctionMap + { + static scalar_t * convert_scalar(scalar_t * pData) { + return pData; // no conversion necessary + } + }; } // end namespace Amesos2 diff --git a/packages/amesos2/src/Amesos2_KLU2_TypeMap.cpp b/packages/amesos2/src/Amesos2_KLU2_TypeMap.cpp index 45fe4e43016f..0f92bbe2f210 100644 --- a/packages/amesos2/src/Amesos2_KLU2_TypeMap.cpp +++ b/packages/amesos2/src/Amesos2_KLU2_TypeMap.cpp @@ -52,28 +52,4 @@ #include "Amesos2_KLU2_TypeMap.hpp" namespace Amesos2 { - - -#ifdef HAVE_TEUCHOS_COMPLEX - //SLU::Dtype_t TypeMap >::dtype = SLU::SLU_C; - - //SLU::Dtype_t TypeMap >::dtype = SLU::SLU_Z; - - //SLU::Dtype_t TypeMap::dtype = SLU::SLU_C; - - //SLU::Dtype_t TypeMap::dtype = SLU::SLU_Z; -#endif - } - -#ifdef HAVE_TEUCHOS_COMPLEX -//namespace std { - //ostream& operator<<(ostream& out, const SLU::Z::doublecomplex z){ - //return (out << "(" << z.r << "," << z.i << ")"); - //} - - //ostream& operator<<(ostream& out, const SLU::C::complex c){ - //return (out << "(" << c.r << "," << c.i << ")"); - //} -//} -#endif diff --git a/packages/amesos2/src/Amesos2_KLU2_TypeMap.hpp b/packages/amesos2/src/Amesos2_KLU2_TypeMap.hpp index 37991cd4e9aa..5f04cc18e85d 100644 --- a/packages/amesos2/src/Amesos2_KLU2_TypeMap.hpp +++ b/packages/amesos2/src/Amesos2_KLU2_TypeMap.hpp @@ -65,86 +65,11 @@ #include "Amesos2_TypeMap.hpp" - -/* The KLU2 comples headers file only need to be included if - complex has been enabled in Teuchos. In addition we only need to - define the conversion and printing functions if complex has been - enabled. */ - // TODO namespace KLU2 { -typedef int int_t; - #include "klu2_ext.hpp" // for Dtype_t declaration } // end namespace KLU -#ifdef HAVE_TEUCHOS_COMPLEX - -/* ==================== Conversion ==================== */ -namespace Teuchos { - -/** - * \defgroup slu_conversion Conversion definitions for SLU types. - * - * Define specializations of Teuchos::as<> for the SLU types. - * - * These specializations are meant to work with any complex data type that - * implements the same interface as the STL complex type. - * - * @{ - */ -template <> -class ValueTypeConversionTraits, std::complex > -{ -public: - static std::complex convert( const std::complex t ) - { - std::complex ret(Teuchos::as(t.real()), - Teuchos::as(t.imag())); - return( ret ); - } - - static std::complex safeConvert( const std::complex t ) - { - std::complex ret(Teuchos::as(t.real()), - Teuchos::as(t.imag())); - return( ret ); - } -}; - - -// Also convert from KLU2 types -template <> -class ValueTypeConversionTraits , std::complex > -{ -public: - static std::complex convert( const std::complex t ) - { - float ret_r = Teuchos::as( t.real() ); - float ret_i = Teuchos::as( t.imag() ); - std::complex ret (ret_r, ret_i); - return (ret); - } - - // No special checks for safe Convert - static std::complex safeConvert( const std::complex t ) - { - float ret_r = Teuchos::as( t.real() ); - float ret_i = Teuchos::as( t.imag() ); - std::complex ret (ret_r, ret_i); - return (ret); - } -}; - - - -//@} End Conversion group - - -} // end namespace Teuchos - -#endif // HAVE_TEUCHOS_COMPLEX - namespace Amesos2 { @@ -158,40 +83,46 @@ template class KLU2; template <> struct TypeMap { - static float dtype; + typedef float dtype; typedef float type; - typedef float magnitude_type; }; - template <> struct TypeMap { - static double dtype; + typedef double dtype; typedef double type; - typedef double magnitude_type; }; - #ifdef HAVE_TEUCHOS_COMPLEX template <> struct TypeMap > { - static std::complex dtype; - typedef std::complex type; - typedef double magnitude_type; + typedef std::complex dtype; + typedef Kokkos::complex type; }; - template <> struct TypeMap > { - static std::complex dtype; - typedef std::complex type; - typedef double magnitude_type; + typedef std::complex dtype; + typedef Kokkos::complex type; +}; + +template <> +struct TypeMap > +{ + typedef std::complex dtype; + typedef Kokkos::complex type; }; +template <> +struct TypeMap > +{ + typedef std::complex dtype; + typedef Kokkos::complex type; +}; #endif // HAVE_TEUCHOS_COMPLEX diff --git a/packages/amesos2/src/Amesos2_KLU2_decl.hpp b/packages/amesos2/src/Amesos2_KLU2_decl.hpp index 342d8d37b638..10814c32cb69 100644 --- a/packages/amesos2/src/Amesos2_KLU2_decl.hpp +++ b/packages/amesos2/src/Amesos2_KLU2_decl.hpp @@ -95,10 +95,10 @@ class KLU2 : public SolverCore * - the KLU2 type that corresponds to scalar_type and * - the corresponding type to use for magnitude */ - typedef typename type_map::type slu_type; - typedef typename type_map::magnitude_type magnitude_type; + typedef typename type_map::type klu2_type; + typedef typename type_map::dtype klu2_dtype; - typedef FunctionMap function_map; + typedef FunctionMap function_map; typedef Matrix matrix_type; typedef MatrixAdapter matrix_adapter_type; @@ -229,23 +229,33 @@ class KLU2 : public SolverCore // struct holds all data necessary for KLU2 factorization or solve call mutable struct KLU2Data { - ::KLU2::klu_symbolic *symbolic_; - ::KLU2::klu_numeric *numeric_; - ::KLU2::klu_common common_; + ::KLU2::klu_symbolic *symbolic_; + ::KLU2::klu_numeric *numeric_; + ::KLU2::klu_common common_; } data_ ; - // The following Arrays are persisting storage arrays for A, X, and B - /// Stores the values of the nonzero entries for KLU2 - Teuchos::Array nzvals_; + typedef Kokkos::DefaultHostExecutionSpace HostSpaceType; + typedef Kokkos::View host_ordinal_type_array; + + typedef Kokkos::View host_value_type_array; + + // The following Views are persisting storage arrays for A, X, and B + /// Stores the values of the nonzero entries for CHOLMOD + host_value_type_array host_nzvals_view_; + /// Stores the location in \c Ai_ and Aval_ that starts row j - Teuchos::Array rowind_; + host_ordinal_type_array host_rows_view_; /// Stores the row indices of the nonzero entries - Teuchos::Array colptr_; + host_ordinal_type_array host_col_ptr_view_; + + typedef typename Kokkos::View + host_solve_array_t; /// Persisting 1D store for X - Teuchos::Array xvals_; local_ordinal_type ldx_; + mutable host_solve_array_t xValues_; + /// Persisting 1D store for B - Teuchos::Array bvals_; local_ordinal_type ldb_; + mutable host_solve_array_t bValues_; /// Transpose flag /// 0: Non-transpose, 1: Transpose, 2: Conjugate-transpose @@ -256,12 +266,13 @@ class KLU2 : public SolverCore // Specialize solver_traits struct for KLU2 -// TODO template <> struct solver_traits { #ifdef HAVE_TEUCHOS_COMPLEX - typedef Meta::make_list4, + Kokkos::complex, std::complex, std::complex > supported_scalars; #else @@ -269,6 +280,12 @@ struct solver_traits { #endif }; +template +struct solver_supports_matrix> { + static const bool value = true; +}; + } // end namespace Amesos2 #endif // AMESOS2_KLU2_DECL_HPP diff --git a/packages/amesos2/src/Amesos2_KLU2_def.hpp b/packages/amesos2/src/Amesos2_KLU2_def.hpp index 54990842eaa1..db27954a12ee 100644 --- a/packages/amesos2/src/Amesos2_KLU2_def.hpp +++ b/packages/amesos2/src/Amesos2_KLU2_def.hpp @@ -68,13 +68,10 @@ KLU2::KLU2( Teuchos::RCP X, Teuchos::RCP B ) : SolverCore(A, X, B) - , nzvals_() // initialize to empty arrays - , rowind_() - , colptr_() , transFlag_(0) , is_contiguous_(true) { - ::KLU2::klu_defaults (&(data_.common_)) ; + ::KLU2::klu_defaults (&(data_.common_)) ; data_.symbolic_ = NULL; data_.numeric_ = NULL; @@ -92,10 +89,10 @@ KLU2::~KLU2( ) * - Other data */ if (data_.symbolic_ != NULL) - ::KLU2::klu_free_symbolic + ::KLU2::klu_free_symbolic (&(data_.symbolic_), &(data_.common_)) ; if (data_.numeric_ != NULL) - ::KLU2::klu_free_numeric + ::KLU2::klu_free_numeric (&(data_.numeric_), &(data_.common_)) ; // Storage is initialized in numericFactorization_impl() @@ -134,48 +131,24 @@ int KLU2::symbolicFactorization_impl() { if (data_.symbolic_ != NULL) { - ::KLU2::klu_free_symbolic + ::KLU2::klu_free_symbolic (&(data_.symbolic_), &(data_.common_)) ; } if ( single_proc_optimization() ) { - - auto sp_rowptr = this->matrixA_->returnRowPtr(); - TEUCHOS_TEST_FOR_EXCEPTION(sp_rowptr == nullptr, - std::runtime_error, "Amesos2 Runtime Error: sp_rowptr returned null "); - auto sp_colind = this->matrixA_->returnColInd(); - TEUCHOS_TEST_FOR_EXCEPTION(sp_colind == nullptr, - std::runtime_error, "Amesos2 Runtime Error: sp_colind returned null "); -#ifndef HAVE_TEUCHOS_COMPLEX - auto sp_values = this->matrixA_->returnValues(); -#else - // NDE: 09/25/2017 - // Cannot convert Kokkos::complex* to std::complex*; in this case, use reinterpret_cast - using complex_type = typename Util::getStdCplxType< magnitude_type, typename matrix_adapter_type::spmtx_vals_t >::type; - complex_type * sp_values = nullptr; - sp_values = reinterpret_cast< complex_type * > ( this->matrixA_->returnValues() ); -#endif - TEUCHOS_TEST_FOR_EXCEPTION(sp_values == nullptr, - std::runtime_error, "Amesos2 Runtime Error: sp_values returned null "); - - // sp_rowptr can cause compile-time matching issues - // e.g const long unsigned int* , not convertible/compatible with int* - // Need sp_rowptr and sp_colind to have same ordinal type for KLU2 interface - Teuchos::Array< local_ordinal_type > sp_rowptr_with_common_type( this->globalNumRows_ + 1 ); - for ( global_size_type i = 0; i < this->globalNumRows_+1; ++i ) { - //sp_rowptr_with_common_type[i] = static_cast(sp_rowptr[i]); - sp_rowptr_with_common_type[i] = sp_rowptr[i]; - } - - data_.symbolic_ = ::KLU2::klu_analyze - ((local_ordinal_type)this->globalNumCols_, sp_rowptr_with_common_type.getRawPtr(), - sp_colind, &(data_.common_)) ; + host_ordinal_type_array host_row_ptr_view; + host_ordinal_type_array host_cols_view; + this->matrixA_->returnRowPtr_kokkos_view(host_row_ptr_view); + this->matrixA_->returnColInd_kokkos_view(host_cols_view); + data_.symbolic_ = ::KLU2::klu_analyze + ((local_ordinal_type)this->globalNumCols_, host_row_ptr_view.data(), + host_cols_view.data(), &(data_.common_)) ; } else { - data_.symbolic_ = ::KLU2::klu_analyze - ((local_ordinal_type)this->globalNumCols_, colptr_.getRawPtr(), - rowind_.getRawPtr(), &(data_.common_)) ; + data_.symbolic_ = ::KLU2::klu_analyze + ((local_ordinal_type)this->globalNumCols_, host_col_ptr_view_.data(), + host_rows_view_.data(), &(data_.common_)) ; } //end single_process_optim_check = false @@ -201,55 +174,27 @@ KLU2::numericFactorization_impl() Teuchos::TimeMonitor numFactTimer(this->timers_.numFactTime_); #endif -#ifdef HAVE_AMESOS2_VERBOSE_DEBUG - std::cout << "KLU2:: Before numeric factorization" << std::endl; - std::cout << "nzvals_ : " << nzvals_.toString() << std::endl; - std::cout << "rowind_ : " << rowind_.toString() << std::endl; - std::cout << "colptr_ : " << colptr_.toString() << std::endl; -#endif - if (data_.numeric_ != NULL) { - ::KLU2::klu_free_numeric - (&(data_.numeric_), &(data_.common_)) ; + ::KLU2::klu_free_numeric + (&(data_.numeric_), &(data_.common_)); } if ( single_proc_optimization() ) { - - auto sp_rowptr = this->matrixA_->returnRowPtr(); - TEUCHOS_TEST_FOR_EXCEPTION(sp_rowptr == nullptr, - std::runtime_error, "Amesos2 Runtime Error: sp_rowptr returned null "); - auto sp_colind = this->matrixA_->returnColInd(); - TEUCHOS_TEST_FOR_EXCEPTION(sp_colind == nullptr, - std::runtime_error, "Amesos2 Runtime Error: sp_colind returned null "); -#ifndef HAVE_TEUCHOS_COMPLEX - auto sp_values = this->matrixA_->returnValues(); -#else - // NDE: 09/25/2017 - // Cannot convert Kokkos::complex* to std::complex*; in this case, use reinterpret_cast - using complex_type = typename Util::getStdCplxType< magnitude_type, typename matrix_adapter_type::spmtx_vals_t >::type; - complex_type * sp_values = nullptr; - sp_values = reinterpret_cast< complex_type * > ( this->matrixA_->returnValues() ); -#endif - TEUCHOS_TEST_FOR_EXCEPTION(sp_values == nullptr, - std::runtime_error, "Amesos2 Runtime Error: sp_values returned null "); - - // sp_rowptr can cause compile-time matching issues - // e.g const long unsigned int* , not convertible/compatible with int* - // Need sp_rowptr and sp_colind to have same ordinal type for KLU2 interface - Teuchos::Array< local_ordinal_type > sp_rowptr_with_common_type( this->globalNumRows_ + 1 ); - for ( global_size_type i = 0; i < this->globalNumRows_+1; ++i ) { - //sp_rowptr_with_common_type[i] = static_cast(sp_rowptr[i]); - sp_rowptr_with_common_type[i] = sp_rowptr[i]; - } - - data_.numeric_ = ::KLU2::klu_factor - (sp_rowptr_with_common_type.getRawPtr(), sp_colind, sp_values, - data_.symbolic_, &(data_.common_)) ; + host_ordinal_type_array host_row_ptr_view; + host_ordinal_type_array host_cols_view; + this->matrixA_->returnRowPtr_kokkos_view(host_row_ptr_view); + this->matrixA_->returnColInd_kokkos_view(host_cols_view); + this->matrixA_->returnValues_kokkos_view(host_nzvals_view_); + klu2_dtype * pValues = function_map::convert_scalar(host_nzvals_view_.data()); + data_.numeric_ = ::KLU2::klu_factor + (host_row_ptr_view.data(), host_cols_view.data(), pValues, + data_.symbolic_, &(data_.common_)); } else { - data_.numeric_ = ::KLU2::klu_factor - (colptr_.getRawPtr(), rowind_.getRawPtr(), nzvals_.getRawPtr(), - data_.symbolic_, &(data_.common_)) ; + klu2_dtype * pValues = function_map::convert_scalar(host_nzvals_view_.data()); + data_.numeric_ = ::KLU2::klu_factor + (host_col_ptr_view_.data(), host_rows_view_.data(), pValues, + data_.symbolic_, &(data_.common_)); } //end single_process_optim_check = false // To have a test which confirms a throw, we need MPI to throw on all the @@ -276,22 +221,9 @@ KLU2::numericFactorization_impl() TEUCHOS_TEST_FOR_EXCEPTION(info > 0, std::runtime_error, "KLU2 numeric factorization failed"); - //global_size_type info_st = as(info); // unused - /* TODO : Proper error messages - TEUCHOS_TEST_FOR_EXCEPTION( (info_st > 0) && (info_st <= this->globalNumCols_), - std::runtime_error, - "Factorization complete, but matrix is singular. Division by zero eminent"); - TEUCHOS_TEST_FOR_EXCEPTION( (info_st > 0) && (info_st > this->globalNumCols_), - std::runtime_error, - "Memory allocation failure in KLU2 factorization");*/ - - //data_.options.Fact = SLU::FACTORED; - //same_symbolic_ = true; - return(info); } - template int KLU2::solve_impl( @@ -304,44 +236,94 @@ KLU2::solve_impl( const global_size_type ld_rhs = this->root_ ? X->getGlobalLength() : 0; const size_t nrhs = X->getGlobalNumVectors(); - if ( single_proc_optimization() && nrhs == 1 ) { + { #ifdef HAVE_AMESOS2_TIMERS - Teuchos::TimeMonitor solveTimer(this->timers_.solveTime_); + Teuchos::TimeMonitor mvConvTimer(this->timers_.vecConvTime_); + Teuchos::TimeMonitor redistTimer( this->timers_.vecRedistTime_ ); #endif + if ( single_proc_optimization() && nrhs == 1 ) { + // no msp creation + Util::get_1d_copy_helper_kokkos_view, + host_solve_array_t>::do_get(B, bValues_, as(ld_rhs)); -#ifndef HAVE_TEUCHOS_COMPLEX - auto b_vector = Util::vector_pointer_helper< MultiVecAdapter, Vector >::get_pointer_to_vector( B ); - auto x_vector = Util::vector_pointer_helper< MultiVecAdapter, Vector >::get_pointer_to_vector( X ); -#else - // NDE: 09/25/2017 - // Cannot convert Kokkos::complex* to std::complex*; in this case, use reinterpret_cast - using complex_type = typename Util::getStdCplxType< magnitude_type, typename matrix_adapter_type::spmtx_vals_t >::type; - complex_type * b_vector = reinterpret_cast< complex_type * >( Util::vector_pointer_helper< MultiVecAdapter, Vector >::get_pointer_to_vector( B ) ); - complex_type * x_vector = reinterpret_cast< complex_type * >( Util::vector_pointer_helper< MultiVecAdapter, Vector >::get_pointer_to_vector( X ) ); -#endif - TEUCHOS_TEST_FOR_EXCEPTION(b_vector == nullptr, - std::runtime_error, "Amesos2 Runtime Error: b_vector returned null "); + Util::get_1d_copy_helper_kokkos_view, + host_solve_array_t>::do_get(X, xValues_, as(ld_rhs)); + } + else { + if ( is_contiguous_ == true ) { + Util::get_1d_copy_helper_kokkos_view, + host_solve_array_t>::do_get(B, bValues_, + as(ld_rhs), + ROOTED, this->rowIndexBase_); + } + else { + Util::get_1d_copy_helper_kokkos_view, + host_solve_array_t>::do_get(B, bValues_, + as(ld_rhs), + CONTIGUOUS_AND_ROOTED, this->rowIndexBase_); + } + + // see Amesos2_Tacho_def.hpp for an explanation of why we 'get' X + if ( is_contiguous_ == true ) { + Util::get_1d_copy_helper_kokkos_view, + host_solve_array_t>::do_get(X, xValues_, + as(ld_rhs), + ROOTED, this->rowIndexBase_); + } + else { + Util::get_1d_copy_helper_kokkos_view, + host_solve_array_t>::do_get(X, xValues_, + as(ld_rhs), + CONTIGUOUS_AND_ROOTED, this->rowIndexBase_); + } + + // TODO: klu_tsolve is going to put the solution x into the input b. + // Copy b to x then solve in x. + // We do not want to solve in b, then copy to x, because if b was assigned + // then the solve will change b permanently and mess up the next test cycle. + // However if b was actually a copy (not assigned) then we can avoid this + // deep_copy and just assign xValues_ = bValues_. + // This comes up in a few places, see #7158, so planning to fix them all + // at the same time with some system to track what get_1d_copy_helper_kokkos_view + // actually did. + Kokkos::deep_copy(xValues_, bValues_); + } + } + + klu2_dtype * pxValues = function_map::convert_scalar(xValues_.data()); + klu2_dtype * pbValues = function_map::convert_scalar(bValues_.data()); + + // can be null for non root + if( this->root_) { + TEUCHOS_TEST_FOR_EXCEPTION(pbValues == nullptr, + std::runtime_error, "Amesos2 Runtime Error: b_vector returned null "); + + TEUCHOS_TEST_FOR_EXCEPTION(pxValues == nullptr, + std::runtime_error, "Amesos2 Runtime Error: x_vector returned null "); + } - TEUCHOS_TEST_FOR_EXCEPTION(x_vector == nullptr, - std::runtime_error, "Amesos2 Runtime Error: x_vector returned null "); + if ( single_proc_optimization() && nrhs == 1 ) { +#ifdef HAVE_AMESOS2_TIMERS + Teuchos::TimeMonitor solveTimer(this->timers_.solveTime_); +#endif - // For this case, Crs matrix raw pointers wereused, so the non-transpose default solve + // For this case, Crs matrix raw pointers were used, so the non-transpose default solve // is actually the transpose solve as klu_solve expects Ccs matrix pointers // Thus, if the transFlag_ is true, the non-transpose solve should be used if (transFlag_ == 0) { - ::KLU2::klu_tsolve2 + ::KLU2::klu_tsolve2 (data_.symbolic_, data_.numeric_, (local_ordinal_type)this->globalNumCols_, (local_ordinal_type)nrhs, - b_vector, x_vector, &(data_.common_)) ; + pbValues, pxValues, &(data_.common_)) ; } else { - ::KLU2::klu_solve2 + ::KLU2::klu_solve2 (data_.symbolic_, data_.numeric_, (local_ordinal_type)this->globalNumCols_, (local_ordinal_type)nrhs, - b_vector, x_vector, &(data_.common_)) ; + pbValues, pxValues, &(data_.common_)) ; } /* All processes should have the same error code */ @@ -351,113 +333,71 @@ KLU2::solve_impl( else // single proc optimizations but nrhs > 1, // or distributed over processes case { - const size_t val_store_size = as(ld_rhs * nrhs); - Teuchos::Array bValues(val_store_size); - - { // Get values from RHS B -#ifdef HAVE_AMESOS2_TIMERS - Teuchos::TimeMonitor mvConvTimer(this->timers_.vecConvTime_); - Teuchos::TimeMonitor redistTimer( this->timers_.vecRedistTime_ ); -#endif - if ( is_contiguous_ == true ) { - Util::get_1d_copy_helper, - slu_type>::do_get(B, bValues(), - as(ld_rhs), - ROOTED, this->rowIndexBase_); - } - else { - Util::get_1d_copy_helper, - slu_type>::do_get(B, bValues(), - as(ld_rhs), - CONTIGUOUS_AND_ROOTED, this->rowIndexBase_); - } - } // end Timer scope - if ( this->root_ ) { - //local_ordinal_type i_ld_rhs = as(ld_rhs); - { // Do solve! #ifdef HAVE_AMESOS2_TIMERS - Teuchos::TimeMonitor solveTimer(this->timers_.solveTime_); + Teuchos::TimeMonitor solveTimer(this->timers_.solveTime_); #endif - if (transFlag_ == 0) - { - // For this case, Crs matrix raw pointers wereused, so the non-transpose default solve + if (transFlag_ == 0) + { + // For this case, Crs matrix raw pointers were used, so the non-transpose default solve // is actually the transpose solve as klu_solve expects Ccs matrix pointers // Thus, if the transFlag_ is true, the non-transpose solve should be used - if ( single_proc_optimization() ) { - ::KLU2::klu_tsolve - (data_.symbolic_, data_.numeric_, - (local_ordinal_type)this->globalNumCols_, - (local_ordinal_type)nrhs, - bValues.getRawPtr(), &(data_.common_)) ; - } - else { - ::KLU2::klu_solve - (data_.symbolic_, data_.numeric_, - (local_ordinal_type)this->globalNumCols_, - (local_ordinal_type)nrhs, - bValues.getRawPtr(), &(data_.common_)) ; - } + if ( single_proc_optimization() ) { + ::KLU2::klu_tsolve + (data_.symbolic_, data_.numeric_, + (local_ordinal_type)this->globalNumCols_, + (local_ordinal_type)nrhs, + pxValues, &(data_.common_)) ; + } + else { + ::KLU2::klu_solve + (data_.symbolic_, data_.numeric_, + (local_ordinal_type)this->globalNumCols_, + (local_ordinal_type)nrhs, + pxValues, &(data_.common_)) ; } - else - { - // For this case, Crs matrix raw pointers wereused, so the non-transpose default solve + } + else + { + // For this case, Crs matrix raw pointers were used, so the non-transpose default solve // is actually the transpose solve as klu_solve expects Ccs matrix pointers - // Thus, if the transFlag_ is true, the non-transpose solve should be used - if ( single_proc_optimization() ) { - ::KLU2::klu_solve - (data_.symbolic_, data_.numeric_, - (local_ordinal_type)this->globalNumCols_, - (local_ordinal_type)nrhs, - bValues.getRawPtr(), &(data_.common_)) ; - } - else { - ::KLU2::klu_tsolve - (data_.symbolic_, data_.numeric_, - (local_ordinal_type)this->globalNumCols_, - (local_ordinal_type)nrhs, - bValues.getRawPtr(), &(data_.common_)) ; - } + // Thus, if the transFlag_ is true, the non- transpose solve should be used + if ( single_proc_optimization() ) { + ::KLU2::klu_solve + (data_.symbolic_, data_.numeric_, + (local_ordinal_type)this->globalNumCols_, + (local_ordinal_type)nrhs, + pxValues, &(data_.common_)) ; + } + else { + ::KLU2::klu_tsolve + (data_.symbolic_, data_.numeric_, + (local_ordinal_type)this->globalNumCols_, + (local_ordinal_type)nrhs, + pxValues, &(data_.common_)) ; } - } //end Timer scope + } } // end root_ + } //end else - /* All processes should have the same error code */ - // Teuchos::broadcast(*(this->getComm()), 0, &ierr); - - // global_size_type ierr_st = as(ierr); // unused - // TODO - //TEUCHOS_TEST_FOR_EXCEPTION( ierr < 0, - //std::invalid_argument, - //"Argument " << -ierr << " to KLU2 xgssvx had illegal value" ); - //TEUCHOS_TEST_FOR_EXCEPTION( ierr > 0 && ierr_st <= this->globalNumCols_, - //std::runtime_error, - //"Factorization complete, but U is exactly singular" ); - //TEUCHOS_TEST_FOR_EXCEPTION( ierr > 0 && ierr_st > this->globalNumCols_ + 1, - //std::runtime_error, - //"KLU2 allocated " << ierr - this->globalNumCols_ << " bytes of " - //"memory before allocation failure occured." ); - - /* Update X's global values */ - { + { #ifdef HAVE_AMESOS2_TIMERS - Teuchos::TimeMonitor redistTimer(this->timers_.vecRedistTime_); + Teuchos::TimeMonitor redistTimer( this->timers_.vecRedistTime_ ); #endif - if ( is_contiguous_ == true ) { - Util::put_1d_data_helper< - MultiVecAdapter,slu_type>::do_put(X, bValues(), - as(ld_rhs), - ROOTED, this->rowIndexBase_); - } - else { - Util::put_1d_data_helper< - MultiVecAdapter,slu_type>::do_put(X, bValues(), - as(ld_rhs), - CONTIGUOUS_AND_ROOTED, this->rowIndexBase_); - } - } // end Timer scope - } //end else + if ( is_contiguous_ == true ) { + Util::put_1d_data_helper_kokkos_view< + MultiVecAdapter,host_solve_array_t>::do_put(X, xValues_, + as(ld_rhs), + ROOTED, this->rowIndexBase_); + } + else { + Util::put_1d_data_helper_kokkos_view< + MultiVecAdapter,host_solve_array_t>::do_put(X, xValues_, + as(ld_rhs), + CONTIGUOUS_AND_ROOTED, this->rowIndexBase_); + } + } return(ierr); } @@ -552,9 +492,12 @@ KLU2::loadA_impl(EPhase current_phase) // Only the root image needs storage allocated if( this->root_ ){ - nzvals_.resize(this->globalNumNonZeros_); - rowind_.resize(this->globalNumNonZeros_); - colptr_.resize(this->globalNumCols_ + 1); + host_nzvals_view_ = host_value_type_array( + Kokkos::ViewAllocateWithoutInitializing("host_nzvals_view_"), this->globalNumNonZeros_); + host_rows_view_ = host_ordinal_type_array( + Kokkos::ViewAllocateWithoutInitializing("host_rows_view_"), this->globalNumNonZeros_); + host_col_ptr_view_ = host_ordinal_type_array( + Kokkos::ViewAllocateWithoutInitializing("host_col_ptr_view_"), this->globalNumRows_ + 1); } local_ordinal_type nnz_ret = 0; @@ -564,15 +507,15 @@ KLU2::loadA_impl(EPhase current_phase) #endif if ( is_contiguous_ == true ) { - Util::get_ccs_helper< - MatrixAdapter,slu_type,local_ordinal_type,local_ordinal_type> - ::do_get(this->matrixA_.ptr(), nzvals_(), rowind_(), colptr_(), + Util::get_ccs_helper_kokkos_view< + MatrixAdapter,host_value_type_array,host_ordinal_type_array,host_ordinal_type_array> + ::do_get(this->matrixA_.ptr(), host_nzvals_view_, host_rows_view_, host_col_ptr_view_, nnz_ret, ROOTED, ARBITRARY, this->rowIndexBase_); } else { - Util::get_ccs_helper< - MatrixAdapter,slu_type,local_ordinal_type,local_ordinal_type> - ::do_get(this->matrixA_.ptr(), nzvals_(), rowind_(), colptr_(), + Util::get_ccs_helper_kokkos_view< + MatrixAdapter,host_value_type_array,host_ordinal_type_array,host_ordinal_type_array> + ::do_get(this->matrixA_.ptr(), host_nzvals_view_, host_rows_view_, host_col_ptr_view_, nnz_ret, CONTIGUOUS_AND_ROOTED, ARBITRARY, this->rowIndexBase_); } } diff --git a/packages/amesos2/src/Amesos2_Superlu_decl.hpp b/packages/amesos2/src/Amesos2_Superlu_decl.hpp index 62d4dec96c48..609050f97e8a 100644 --- a/packages/amesos2/src/Amesos2_Superlu_decl.hpp +++ b/packages/amesos2/src/Amesos2_Superlu_decl.hpp @@ -296,12 +296,10 @@ class Superlu : public SolverCore /// Persisting 1D store for X mutable host_solve_array_t host_xValues_; mutable Teuchos::Array convert_xValues_; // copy to SuperLU native array before calling SuperLU - int ldx_; /// Persisting 1D store for B mutable host_solve_array_t host_bValues_; mutable Teuchos::Array convert_bValues_; // copy to SuperLU native array before calling SuperLU - int ldb_; #if defined(KOKKOSKERNELS_ENABLE_SUPERNODAL_SPTRSV) && defined(KOKKOSKERNELS_ENABLE_TPL_SUPERLU) typedef Kokkos::DefaultExecutionSpace DeviceExecSpaceType; diff --git a/packages/amesos2/src/Amesos2_TpetraMultiVecAdapter_def.hpp b/packages/amesos2/src/Amesos2_TpetraMultiVecAdapter_def.hpp index 13f68698ec4e..33a46b56d49e 100644 --- a/packages/amesos2/src/Amesos2_TpetraMultiVecAdapter_def.hpp +++ b/packages/amesos2/src/Amesos2_TpetraMultiVecAdapter_def.hpp @@ -267,7 +267,6 @@ namespace Amesos2 { // Special case when number vectors == 1 and single MPI process if ( num_vecs == 1 && this->getComm()->getRank() == 0 && this->getComm()->getSize() == 1 ) { if(mv_->isConstantStride()) { - mv_->sync_device(); // no testing of this right now - since UVM on deep_copy_or_assign_view(kokkos_view, mv_->getLocalViewDevice()); } else { @@ -308,7 +307,6 @@ namespace Amesos2 { } else { if(redist_mv.isConstantStride()) { - redist_mv.sync_device(); // no testing of this right now - since UVM on deep_copy_or_assign_view(kokkos_view, redist_mv.getLocalViewDevice()); } else { @@ -554,11 +552,19 @@ namespace Amesos2 { } if ( distribution != CONTIGUOUS_AND_ROOTED ) { + // Use View scalar type, not MV Scalar because we want Kokkos::complex, not + // std::complex to avoid a Kokkos::complex to std::complex + // conversion which would require a double copy and fail here. Then we'll be + // setup to safely reinterpret_cast complex to std if necessary. + typedef typename multivec_t::dual_view_type::t_host::value_type tpetra_mv_view_type; + Kokkos::View convert_kokkos_new_data; + deep_copy_or_assign_view(convert_kokkos_new_data, kokkos_new_data); #ifdef HAVE_TEUCHOS_COMPLEX - // for complex, cast Kokkos::complex back to std::complex - auto pData = reinterpret_cast(kokkos_new_data.data()); + // convert_kokkos_new_data may be Kokkos::complex and Scalar could be std::complex + auto pData = reinterpret_cast(convert_kokkos_new_data.data()); #else - auto pData = kokkos_new_data.data(); + auto pData = convert_kokkos_new_data.data(); #endif const multivec_t source_mv (srcMap, Teuchos::ArrayView( diff --git a/packages/amesos2/test/solvers/Basker_UnitTests.cpp b/packages/amesos2/test/solvers/Basker_UnitTests.cpp index dfa458a51728..4f7769260800 100644 --- a/packages/amesos2/test/solvers/Basker_UnitTests.cpp +++ b/packages/amesos2/test/solvers/Basker_UnitTests.cpp @@ -810,6 +810,10 @@ namespace { typedef long int LongInt; UNIT_TEST_GROUP_ORDINAL_ORDINAL(int,LongInt) #endif + #ifdef HAVE_TPETRA_INST_INT_LONG_LONG + typedef long long int LongLongInt; + UNIT_TEST_GROUP_ORDINAL_ORDINAL(int,LongLongInt) + #endif #endif // EXPL-INST diff --git a/packages/amesos2/test/solvers/Basker_test.xml b/packages/amesos2/test/solvers/Basker_test.xml index ef52657bac3e..172ac45ecbab 100644 --- a/packages/amesos2/test/solvers/Basker_test.xml +++ b/packages/amesos2/test/solvers/Basker_test.xml @@ -4,38 +4,144 @@ - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + - diff --git a/packages/amesos2/test/solvers/CMakeLists.txt b/packages/amesos2/test/solvers/CMakeLists.txt index 8b68fcfebfc5..4ea14abe3a4b 100644 --- a/packages/amesos2/test/solvers/CMakeLists.txt +++ b/packages/amesos2/test/solvers/CMakeLists.txt @@ -46,6 +46,22 @@ IF (${PACKAGE_NAME}_ENABLE_KLU2) NUM_MPI_PROCS 2 STANDARD_PASS_OUTPUT ) + + TRIBITS_COPY_FILES_TO_BINARY_DIR(SolverTestKLU2Files + SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR} + SOURCE_FILES klu2_test.xml + EXEDEPS Solver_Test + ) + + TRIBITS_ADD_TEST( + Solver_Test + NAME KLU2_Solver_Test + ARGS "--xml-params=klu2_test.xml --filedir=${CMAKE_CURRENT_BINARY_DIR}/../matrices/ --multiple-solves --refactor" + STANDARD_PASS_OUTPUT + NUM_MPI_PROCS 2 + COMM serial mpi + ) + ENDIF() ##### SuperLu Tests ##### @@ -162,7 +178,7 @@ IF (${PACKAGE_NAME}_ENABLE_Cholmod) TRIBITS_COPY_FILES_TO_BINARY_DIR(SolverTestCholmodFiles SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR} - SOURCE_FILES cholmod_test.xml + SOURCE_FILES cholmod_test.xml cholmod_int_test.xml EXEDEPS Solver_Test ) @@ -175,6 +191,15 @@ IF (${PACKAGE_NAME}_ENABLE_Cholmod) COMM serial mpi ) + TRIBITS_ADD_TEST( + Solver_Test + NAME Cholmod_Int_Solver_Test + ARGS "--xml-params=cholmod_int_test.xml --filedir=${CMAKE_CURRENT_BINARY_DIR}/../matrices/ --multiple-solves --refactor" + STANDARD_PASS_OUTPUT + NUM_MPI_PROCS 1 + COMM serial mpi + ) + IF (KokkosKernels_ENABLE_SUPERNODAL_SPTRSV AND KokkosKernels_ENABLE_TPL_CHOLMOD) TRIBITS_COPY_FILES_TO_BINARY_DIR(SolverTestCholmodTRSVFiles @@ -285,6 +310,21 @@ IF (${PACKAGE_NAME}_ENABLE_Basker) NUM_MPI_PROCS 2 STANDARD_PASS_OUTPUT ) + +TRIBITS_COPY_FILES_TO_BINARY_DIR(SolverTestCopyBaskerFiles + SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR} + SOURCE_FILES Basker_test.xml + EXEDEPS Solver_Test + ) + +TRIBITS_ADD_TEST( + Solver_Test + NAME Basker_Solver_Test + ARGS "--xml-params=Basker_test.xml --filedir=${CMAKE_CURRENT_BINARY_DIR}/../matrices/ --multiple-solves --refactor" + STANDARD_PASS_OUTPUT + NUM_MPI_PROCS 1 + COMM serial mpi + ) ENDIF() diff --git a/packages/amesos2/test/solvers/cholmod_int_test.xml b/packages/amesos2/test/solvers/cholmod_int_test.xml new file mode 100644 index 000000000000..6bc79c218186 --- /dev/null +++ b/packages/amesos2/test/solvers/cholmod_int_test.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/amesos2/test/solvers/klu2_test.xml b/packages/amesos2/test/solvers/klu2_test.xml index ed1fa1240f46..39e62bdfb5c2 100644 --- a/packages/amesos2/test/solvers/klu2_test.xml +++ b/packages/amesos2/test/solvers/klu2_test.xml @@ -4,38 +4,128 @@ - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + - diff --git a/packages/belos/src/BelosBlockCGSolMgr.hpp b/packages/belos/src/BelosBlockCGSolMgr.hpp index a11cf3e55772..5f20986f8f2e 100644 --- a/packages/belos/src/BelosBlockCGSolMgr.hpp +++ b/packages/belos/src/BelosBlockCGSolMgr.hpp @@ -523,9 +523,11 @@ setParameters (const Teuchos::RCP ¶ms) // Check if the user is requesting the single-reduction version of CG (only for blocksize == 1) if (params->isParameter("Use Single Reduction")) { useSingleReduction_ = params->get("Use Single Reduction", useSingleReduction_default_); - if (useSingleReduction_) - foldConvergenceDetectionIntoAllreduce_ = params->get("Fold Convergence Detection Into Allreduce", - foldConvergenceDetectionIntoAllreduce_default_); + } + + if (params->isParameter("Fold Convergence Detection Into Allreduce")) { + foldConvergenceDetectionIntoAllreduce_ = params->get("Fold Convergence Detection Into Allreduce", + foldConvergenceDetectionIntoAllreduce_default_); } // Check to see if the timer label changed. @@ -898,9 +900,9 @@ ReturnType BlockCGSolMgr::solve() { // Standard (nonblock) CG is faster for the special case of a // block size of 1. A single reduction iteration can also be used // if collectives are more expensive than vector updates. + plist.set("Fold Convergence Detection Into Allreduce", + foldConvergenceDetectionIntoAllreduce_); if (useSingleReduction_) { - plist.set("Fold Convergence Detection Into Allreduce", - foldConvergenceDetectionIntoAllreduce_); block_cg_iter = rcp (new CGSingleRedIter (problem_, printer_, outputTest_, convTest_, plist)); @@ -908,7 +910,7 @@ ReturnType BlockCGSolMgr::solve() { else { block_cg_iter = rcp (new CGIter (problem_, printer_, - outputTest_, plist)); + outputTest_, convTest_, plist)); } } else { block_cg_iter = diff --git a/packages/belos/src/BelosCGIter.hpp b/packages/belos/src/BelosCGIter.hpp index 5c0659263754..4686b64cee18 100644 --- a/packages/belos/src/BelosCGIter.hpp +++ b/packages/belos/src/BelosCGIter.hpp @@ -53,6 +53,7 @@ #include "BelosLinearProblem.hpp" #include "BelosOutputManager.hpp" #include "BelosStatusTest.hpp" +#include "BelosStatusTestGenResNorm.hpp" #include "BelosOperatorTraits.hpp" #include "BelosMultiVecTraits.hpp" @@ -98,6 +99,7 @@ class CGIter : virtual public CGIteration { CGIter( const Teuchos::RCP > &problem, const Teuchos::RCP > &printer, const Teuchos::RCP > &tester, + const Teuchos::RCP > &convTester, Teuchos::ParameterList ¶ms ); //! Destructor. @@ -176,7 +178,13 @@ class CGIter : virtual public CGIteration { //! Get the norms of the residuals native to the solver. //! \return A std::vector of length blockSize containing the native residuals. - Teuchos::RCP getNativeResiduals( std::vector * /* norms */ ) const { return R_; } + Teuchos::RCP getNativeResiduals( std::vector * norms ) const { + if (foldConvergenceDetectionIntoAllreduce_ && convTest_->getResNormType() == Belos::TwoNorm) { + (*norms)[0] = std::sqrt(Teuchos::ScalarTraits::magnitude(rHr_)); + return Teuchos::null; + } else + return R_; + } //! Get the current update to the linear system. /*! \note This method returns a null pointer because the linear problem is current. @@ -253,6 +261,7 @@ class CGIter : virtual public CGIteration { const Teuchos::RCP > lp_; const Teuchos::RCP > om_; const Teuchos::RCP > stest_; + const Teuchos::RCP > convTest_; // // Current solver state @@ -270,6 +279,12 @@ class CGIter : virtual public CGIteration { // Current number of iterations performed. int iter_; + // Should the allreduce for convergence detection be merged with one of the inner products? + bool foldConvergenceDetectionIntoAllreduce_; + + // + ScalarType rHr_; + // Assert that the matrix is positive definite bool assertPositiveDefiniteness_; @@ -295,6 +310,8 @@ class CGIter : virtual public CGIteration { // Operator applied to direction vector Teuchos::RCP AP_; + Teuchos::RCP S_; + }; ////////////////////////////////////////////////////////////////////////////////////////////////// @@ -303,10 +320,12 @@ class CGIter : virtual public CGIteration { CGIter::CGIter(const Teuchos::RCP > &problem, const Teuchos::RCP > &printer, const Teuchos::RCP > &tester, + const Teuchos::RCP > &convTester, Teuchos::ParameterList ¶ms ): lp_(problem), om_(printer), stest_(tester), + convTest_(convTester), initialized_(false), stateStorageInitialized_(false), iter_(0), @@ -314,6 +333,7 @@ class CGIter : virtual public CGIteration { numEntriesForCondEst_(params.get("Max Size For Condest",0) ), doCondEst_(false) { + foldConvergenceDetectionIntoAllreduce_ = params.get("Fold Convergence Detection Into Allreduce",false); } ////////////////////////////////////////////////////////////////////////////////////////////////// @@ -339,11 +359,16 @@ class CGIter : virtual public CGIteration { Teuchos::RCP tmp = ( (rhsMV!=Teuchos::null)? rhsMV: lhsMV ); TEUCHOS_TEST_FOR_EXCEPTION(tmp == Teuchos::null,std::invalid_argument, "Belos::CGIter::setStateSize(): linear problem does not specify multivectors to clone from."); - R_ = MVT::Clone( *tmp, 1 ); - Z_ = MVT::Clone( *tmp, 1 ); + S_ = MVT::Clone( *tmp, 2 ); + std::vector index(1,0); + index[0] = 0; + R_ = MVT::CloneViewNonConst( *S_, index ); + index[0] = 1; + Z_ = MVT::CloneViewNonConst( *S_, index ); P_ = MVT::Clone( *tmp, 1 ); AP_ = MVT::Clone( *tmp, 1 ); - } + + } // Tracking information for condition number estimation if(numEntriesForCondEst_ > 0) { @@ -397,16 +422,15 @@ class CGIter : virtual public CGIteration { if ( lp_->getLeftPrec() != Teuchos::null ) { lp_->applyLeftPrec( *R_, *Z_ ); if ( lp_->getRightPrec() != Teuchos::null ) { - Teuchos::RCP tmp = MVT::Clone( *Z_, 1 ); - lp_->applyRightPrec( *Z_, *tmp ); - Z_ = tmp; + Teuchos::RCP tmp = MVT::CloneCopy( *Z_ ); + lp_->applyRightPrec( *tmp, *Z_ ); } } else if ( lp_->getRightPrec() != Teuchos::null ) { lp_->applyRightPrec( *R_, *Z_ ); } else { - Z_ = R_; + MVT::Assign( *R_, *Z_ ); } MVT::MvAddMv( one, *Z_, zero, *Z_, *P_ ); } @@ -437,6 +461,7 @@ class CGIter : virtual public CGIteration { std::vector alpha(1); std::vector beta(1); std::vector rHz(1), rHz_old(1), pAp(1); + Teuchos::SerialDenseMatrix rHs( 1, 2 ); // Create convenience variables for zero and one. const ScalarType one = Teuchos::ScalarTraits::one(); @@ -453,7 +478,12 @@ class CGIter : virtual public CGIteration { "Belos::CGIter::iterate(): current linear system has more than one vector!" ); // Compute first a.k.a. rHz - MVT::MvDot( *R_, *Z_, rHz ); + if (foldConvergenceDetectionIntoAllreduce_ && convTest_->getResNormType() == Belos::TwoNorm) { + MVT::MvTransMv( one, *R_, *S_, rHs ); + rHr_ = rHs(0,0); + rHz[0] = rHs(0,1); + } else + MVT::MvDot( *R_, *Z_, rHz ); //////////////////////////////////////////////////////////////// // Iterate until the status test tells us to stop. @@ -494,19 +524,23 @@ class CGIter : virtual public CGIteration { if ( lp_->getLeftPrec() != Teuchos::null ) { lp_->applyLeftPrec( *R_, *Z_ ); if ( lp_->getRightPrec() != Teuchos::null ) { - Teuchos::RCP tmp = MVT::Clone( *Z_, 1 ); - lp_->applyRightPrec( *Z_, *tmp ); - Z_ = tmp; + Teuchos::RCP tmp = MVT::CloneCopy( *Z_); + lp_->applyRightPrec( *tmp, *Z_ ); } } else if ( lp_->getRightPrec() != Teuchos::null ) { lp_->applyRightPrec( *R_, *Z_ ); } else { - Z_ = R_; + MVT::Assign( *R_, *Z_ ); } // - MVT::MvDot( *R_, *Z_, rHz ); + if (foldConvergenceDetectionIntoAllreduce_ && convTest_->getResNormType() == Belos::TwoNorm) { + MVT::MvTransMv( one, *R_, *S_, rHs ); + rHr_ = rHs(0,0); + rHz[0] = rHs(0,1); + } else + MVT::MvDot( *R_, *Z_, rHz ); // beta[0] = rHz[0] / rHz_old[0]; // diff --git a/packages/belos/src/BelosCGSingleRedIter.hpp b/packages/belos/src/BelosCGSingleRedIter.hpp index ac3afb23d725..d3438cef6802 100644 --- a/packages/belos/src/BelosCGSingleRedIter.hpp +++ b/packages/belos/src/BelosCGSingleRedIter.hpp @@ -264,31 +264,28 @@ class CGSingleRedIter : virtual public CGIteration { // // State Storage - // + // // Residual Teuchos::RCP R_; - // // Preconditioned residual Teuchos::RCP Z_; - // // Operator applied to preconditioned residual Teuchos::RCP AZ_; - // - // This is the additional storage needed for single-reduction CG (Chronopoulos/Gear) - // R_ views the first vector and AZ_ views the second vector - Teuchos::RCP S_; - - // This is the additional storage needed for merging convergence detection and inner products - // (Option "Fold Convergence Detection Into Allreduce") - // Z_ views the first vector and R2_ views the second - Teuchos::RCP T_; - Teuchos::RCP R2_; - // // Direction vector Teuchos::RCP P_; - // - // Operator applied to direction vector (S) + // Operator applied to direction vector Teuchos::RCP AP_; + // + // W_ = (R_, AZ_, Z_) + Teuchos::RCP W_; + // S_ = (R_, AZ_) + Teuchos::RCP S_; + // T_ = (Z_, R_) + Teuchos::RCP T_; + // U_ = (AZ_, Z_) + Teuchos::RCP U_; + // V_ = (AP_, P_) + Teuchos::RCP V_; }; @@ -334,25 +331,41 @@ class CGSingleRedIter : virtual public CGIteration { Teuchos::RCP tmp = ( (rhsMV!=Teuchos::null)? rhsMV: lhsMV ); TEUCHOS_TEST_FOR_EXCEPTION(tmp == Teuchos::null,std::invalid_argument, "Belos::CGSingleRedIter::setStateSize(): linear problem does not specify multivectors to clone from."); - S_ = MVT::Clone( *tmp, 2 ); - if (foldConvergenceDetectionIntoAllreduce_) { - T_ = MVT::Clone( *tmp, 2 ); - // Z_ will view the first column of T_, R2_ will view the second. - std::vector index(1,0); - Z_ = MVT::CloneViewNonConst( *T_, index ); - index[0] = 1; - R2_ = MVT::CloneViewNonConst( *T_, index ); - } - else - Z_ = MVT::Clone( *tmp, 1 ); - P_ = MVT::Clone( *tmp, 1 ); - AP_ = MVT::Clone( *tmp, 1 ); - // R_ will view the first column of S_, AZ_ will view the second. + // W_ = (R_, AZ_, Z_) + W_ = MVT::Clone( *tmp, 3 ); + std::vector index2(2,0); std::vector index(1,0); - R_ = MVT::CloneViewNonConst( *S_, index ); + + // S_ = (R_, AZ_) + index2[0] = 0; + index2[1] = 1; + S_ = MVT::CloneViewNonConst( *W_, index2 ); + + // U_ = (AZ_, Z_) + index2[0] = 1; + index2[1] = 2; + U_ = MVT::CloneViewNonConst( *W_, index2 ); + + index[0] = 0; + R_ = MVT::CloneViewNonConst( *W_, index ); + index[0] = 1; + AZ_ = MVT::CloneViewNonConst( *W_, index ); + index[0] = 2; + Z_ = MVT::CloneViewNonConst( *W_, index ); + + // T_ = (R_, Z_) + index2[0] = 0; + index2[1] = 2; + T_ = MVT::CloneViewNonConst( *W_, index2 ); + + // V_ = (AP_, P_) + V_ = MVT::Clone( *tmp, 2 ); + index[0] = 0; + AP_ = MVT::CloneViewNonConst( *V_, index ); index[0] = 1; - AZ_ = MVT::CloneViewNonConst( *S_, index ); + P_ = MVT::CloneViewNonConst( *V_, index ); + } // State storage has now been initialized. @@ -408,13 +421,13 @@ class CGSingleRedIter : virtual public CGIteration { else { MVT::Assign( *R_, *Z_ ); } - MVT::Assign( *Z_, *P_ ); // Multiply the current preconditioned residual vector by A and store in AZ_ lp_->applyOp( *Z_, *AZ_ ); - // Logically, AP_ = AZ_ - MVT::Assign( *AZ_, *AP_ ); + // P_ := Z_ + // Logically, AP_ := AZ_ + MVT::Assign( *U_, *V_); } else { @@ -471,13 +484,12 @@ class CGSingleRedIter : virtual public CGIteration { TEUCHOS_TEST_FOR_EXCEPTION( MVT::GetNumberVecs(*cur_soln_vec) != 1, CGIterateFailure, "Belos::CGSingleRedIter::iterate(): current linear system has more than one vector!" ); - if (foldConvergenceDetectionIntoAllreduce_) { - // Compute first a.k.a. , and combined (also computes unneeded ) - MVT::Assign( *R_, *R2_ ); + if (foldConvergenceDetectionIntoAllreduce_ && convTest_->getResNormType() == Belos::TwoNorm) { + // Compute first a.k.a. , and combined (also computes unneeded ) MVT::MvTransMv( one, *S_, *T_, sHt ); - rHz_ = sHt(0,0); - delta = sHt(1,0); - rHr_ = sHt(1,1); + rHz_ = sHt(0,1); + delta = sHt(1,1); + rHr_ = sHt(0,0); } else { // Compute first a.k.a. and combined MVT::MvTransMv( one, *S_, *Z_, sHz ); @@ -496,7 +508,7 @@ class CGSingleRedIter : virtual public CGIteration { //////////////////////////////////////////////////////////////// // Iterate until the status test tells us to stop. // - if (foldConvergenceDetectionIntoAllreduce_) { + if (foldConvergenceDetectionIntoAllreduce_ && convTest_->getResNormType() == Belos::TwoNorm) { //////////////////////////////////////////////////////////////// // Iterate until the status test tells us to stop. // @@ -515,9 +527,8 @@ class CGSingleRedIter : virtual public CGIteration { if ( lp_->getLeftPrec() != Teuchos::null ) { lp_->applyLeftPrec( *R_, *Z_ ); if ( lp_->getRightPrec() != Teuchos::null ) { - Teuchos::RCP tmp = MVT::Clone( *Z_, 1 ); - lp_->applyRightPrec( *Z_, *tmp ); - MVT::Assign( *tmp, *Z_ ); + Teuchos::RCP tmp = MVT::CloneCopy( *Z_ ); + lp_->applyRightPrec( *tmp, *Z_ ); } } else if ( lp_->getRightPrec() != Teuchos::null ) { @@ -530,23 +541,23 @@ class CGSingleRedIter : virtual public CGIteration { // Multiply the current preconditioned residual vector by A and store in AZ_ lp_->applyOp( *Z_, *AZ_ ); // - // Compute a.k.a. , and combined (also computes unneeded ) - MVT::Assign( *R_, *R2_ ); + // Compute a.k.a. , and combined (also computes unneeded ) MVT::MvTransMv( one, *S_, *T_, sHt ); // // Update scalars. rHz_old = rHz_; - rHz_ = sHt(0,0); - delta = sHt(1,0); - rHr_ = sHt(1,1); + rHz_ = sHt(0,1); + delta = sHt(1,1); + rHr_ = sHt(0,0); + + // Increment the iteration + iter_++; // // Check the status test, now that the solution and residual have been updated // if (stest_->checkStatus(this) == Passed) { break; } - // Increment the iteration - iter_++; // beta = rHz_ / rHz_old; alpha = rHz_ / (delta - (beta*rHz_ / alpha)); @@ -554,17 +565,14 @@ class CGSingleRedIter : virtual public CGIteration { // Check that alpha is a positive number! TEUCHOS_TEST_FOR_EXCEPTION( SCT::real(alpha) <= zero, CGIterateFailure, "Belos::CGSingleRedIter::iterate(): non-positive value for p^H*A*p encountered!" ); + // // Update the direction vector P_ := Z_ + beta * P_ - // - MVT::MvAddMv( one, *Z_, beta, *P_, *P_ ); - // // Update AP_ through recurrence relation AP_ := AZ_ + beta * AP_ - // NOTE: This increases the number of vector updates by 1, in exchange for - // reducing the collectives from 2 to 1. - // - MVT::MvAddMv( one, *AZ_, beta, *AP_, *AP_ ); + // Hence: V_ = (AP_, P_) := (AZ_, Z_) + beta (AP_, P_) = U_ + beta * V_ // + MVT::MvAddMv( one, *U_, beta, *V_, *V_ ); + } // end while (1) } else { //////////////////////////////////////////////////////////////// @@ -579,30 +587,30 @@ class CGSingleRedIter : virtual public CGIteration { // Compute the new residual R_ := R_ - alpha * AP_ // MVT::MvAddMv( one, *R_, -alpha, *AP_, *R_ ); + + // Increment the iteration + iter_++; // // Check the status test, now that the solution and residual have been updated // if (stest_->checkStatus(this) == Passed) { break; } - // Increment the iteration - iter_++; // // Apply preconditioner to new residual to update Z_ // if ( lp_->getLeftPrec() != Teuchos::null ) { lp_->applyLeftPrec( *R_, *Z_ ); if ( lp_->getRightPrec() != Teuchos::null ) { - Teuchos::RCP tmp = MVT::Clone( *Z_, 1 ); - lp_->applyRightPrec( *Z_, *tmp ); - Z_ = tmp; + Teuchos::RCP tmp = MVT::CloneCopy( *Z_ ); + lp_->applyRightPrec( *tmp, *Z_ ); } } else if ( lp_->getRightPrec() != Teuchos::null ) { lp_->applyRightPrec( *R_, *Z_ ); } else { - Z_ = R_; + MVT::Assign( *R_, *Z_ ); } // // Multiply the current preconditioned residual vector by A and store in AZ_ @@ -622,17 +630,14 @@ class CGSingleRedIter : virtual public CGIteration { // Check that alpha is a positive number! TEUCHOS_TEST_FOR_EXCEPTION( SCT::real(alpha) <= zero, CGIterateFailure, "Belos::CGSingleRedIter::iterate(): non-positive value for p^H*A*p encountered!" ); + // // Update the direction vector P_ := Z_ + beta * P_ - // - MVT::MvAddMv( one, *Z_, beta, *P_, *P_ ); - // // Update AP_ through recurrence relation AP_ := AZ_ + beta * AP_ - // NOTE: This increases the number of vector updates by 1, in exchange for - // reducing the collectives from 2 to 1. - // - MVT::MvAddMv( one, *AZ_, beta, *AP_, *AP_ ); + // Hence: V_ = (AP_, P_) := (AZ_, Z_) + beta (AP_, P_) = U_ + beta * V_ // + MVT::MvAddMv( one, *U_, beta, *V_, *V_ ); + } // end while (1) } } diff --git a/packages/belos/src/BelosPseudoBlockCGSolMgr.hpp b/packages/belos/src/BelosPseudoBlockCGSolMgr.hpp index ce2305d95275..83eb1d08ac8f 100644 --- a/packages/belos/src/BelosPseudoBlockCGSolMgr.hpp +++ b/packages/belos/src/BelosPseudoBlockCGSolMgr.hpp @@ -337,6 +337,7 @@ namespace Belos { static constexpr int outputStyle_default_ = Belos::General; static constexpr int outputFreq_default_ = -1; static constexpr int defQuorum_default_ = 1; + static constexpr bool foldConvergenceDetectionIntoAllreduce_default_ = false; static constexpr const char * resScale_default_ = "Norm of Initial Residual"; static constexpr const char * label_default_ = "Belos"; static constexpr std::ostream * outputStream_default_ = &std::cout; @@ -347,6 +348,7 @@ namespace Belos { int maxIters_, numIters_; int verbosity_, outputStyle_, outputFreq_, defQuorum_; bool assertPositiveDefiniteness_, showMaxResNormOnly_; + bool foldConvergenceDetectionIntoAllreduce_; std::string resScale_; bool genCondEst_; ScalarType condEstimate_; @@ -373,6 +375,7 @@ PseudoBlockCGSolMgr::PseudoBlockCGSolMgr() : defQuorum_(defQuorum_default_), assertPositiveDefiniteness_(assertPositiveDefiniteness_default_), showMaxResNormOnly_(showMaxResNormOnly_default_), + foldConvergenceDetectionIntoAllreduce_(foldConvergenceDetectionIntoAllreduce_default_), resScale_(resScale_default_), genCondEst_(genCondEst_default_), condEstimate_(-Teuchos::ScalarTraits::one()), @@ -396,6 +399,7 @@ PseudoBlockCGSolMgr (const Teuchos::RCP > &probl defQuorum_(defQuorum_default_), assertPositiveDefiniteness_(assertPositiveDefiniteness_default_), showMaxResNormOnly_(showMaxResNormOnly_default_), + foldConvergenceDetectionIntoAllreduce_(foldConvergenceDetectionIntoAllreduce_default_), resScale_(resScale_default_), genCondEst_(genCondEst_default_), condEstimate_(-Teuchos::ScalarTraits::one()), @@ -471,6 +475,11 @@ setParameters (const Teuchos::RCP& params) params_->set ("Assert Positive Definiteness", assertPositiveDefiniteness_); } + if (params->isParameter("Fold Convergence Detection Into Allreduce")) { + foldConvergenceDetectionIntoAllreduce_ = params->get("Fold Convergence Detection Into Allreduce", + foldConvergenceDetectionIntoAllreduce_default_); + } + // Check to see if the timer label changed. if (params->isParameter ("Timer Label")) { const std::string tempLabel = params->get ("Timer Label", label_default_); @@ -729,6 +738,9 @@ PseudoBlockCGSolMgr::getValidParameters() const "name is deprecated; the new name is \"Implicit Residual Scaling\"."); pl->set("Timer Label", static_cast(label_default_), "The string to use as a prefix for the timer labels."); + pl->set("Fold Convergence Detection Into Allreduce",static_cast(foldConvergenceDetectionIntoAllreduce_default_), + "Merge the allreduce for convergence detection with the one for CG.\n" + "This saves one all-reduce, but incurs more computation."); validParams_ = pl; } return validParams_; @@ -783,8 +795,10 @@ ReturnType PseudoBlockCGSolMgr::solve () // Pseudo-Block CG solver Teuchos::RCP > block_cg_iter; if (numRHS2Solve == 1) { + plist.set("Fold Convergence Detection Into Allreduce", + foldConvergenceDetectionIntoAllreduce_); block_cg_iter = - Teuchos::rcp (new CGIter (problem_, printer_, outputTest_, plist)); + Teuchos::rcp (new CGIter (problem_, printer_, outputTest_, convTest_, plist)); } else { block_cg_iter = Teuchos::rcp (new PseudoBlockCGIter (problem_, printer_, outputTest_, plist)); diff --git a/packages/belos/test/BlockCG/CMakeLists.txt b/packages/belos/test/BlockCG/CMakeLists.txt index 45a4e9d72177..0e84717dbe08 100644 --- a/packages/belos/test/BlockCG/CMakeLists.txt +++ b/packages/belos/test/BlockCG/CMakeLists.txt @@ -39,6 +39,8 @@ IF (${PACKAGE_NAME}_ENABLE_Triutils) "--verbose --filename=A.hb" "--verbose --filename=A.hb --pseudo" "--verbose --filename=A.hb --use-single-red" + "--verbose --filename=A.hb --combine-conv-inner" + "--verbose --filename=A.hb --pseudo --combine-conv-inner" "--verbose --filename=A.hb --use-single-red --combine-conv-inner" ) diff --git a/packages/belos/test/BlockCG/test_bl_cg_real_hb.cpp b/packages/belos/test/BlockCG/test_bl_cg_real_hb.cpp index c50c9cfd9ba5..1d54acff2789 100644 --- a/packages/belos/test/BlockCG/test_bl_cg_real_hb.cpp +++ b/packages/belos/test/BlockCG/test_bl_cg_real_hb.cpp @@ -162,8 +162,9 @@ int main(int argc, char *argv[]) { belosList.set( "Block Size", blocksize ); // Blocksize to be used by iterative solver belosList.set( "Maximum Iterations", maxits ); // Maximum number of iterations allowed belosList.set( "Convergence Tolerance", tol ); // Relative convergence tolerance requested - if ((blocksize == 1) && use_single_red) { - belosList.set( "Use Single Reduction", use_single_red ); // Use single reduction CG iteration + if (blocksize == 1) { + if (use_single_red) + belosList.set( "Use Single Reduction", use_single_red ); // Use single reduction CG iteration if (combineConvInner) belosList.set( "Fold Convergence Detection Into Allreduce", combineConvInner ); } diff --git a/packages/belos/tpetra/src/Belos_Details_Tpetra_registerSolverFactory.cpp b/packages/belos/tpetra/src/Belos_Details_Tpetra_registerSolverFactory.cpp index 0806be5ab8a1..a3a8b6ca0989 100644 --- a/packages/belos/tpetra/src/Belos_Details_Tpetra_registerSolverFactory.cpp +++ b/packages/belos/tpetra/src/Belos_Details_Tpetra_registerSolverFactory.cpp @@ -49,13 +49,16 @@ namespace Impl { extern void register_BiCGStab (const bool verbose); extern void register_BlockCG (const bool verbose); extern void register_BlockGmres (const bool verbose); +extern void register_Cg (const bool verbose); extern void register_CgPipeline (const bool verbose); extern void register_CgSingleReduce (const bool verbose); extern void register_FixedPoint (const bool verbose); extern void register_GCRODR (const bool verbose); +extern void register_Gmres (const bool verbose); extern void register_GmresPipeline (const bool verbose); extern void register_GmresPoly (const bool verbose); extern void register_GmresSingleReduce (const bool verbose); +extern void register_GmresSstep (const bool verbose); extern void register_LSQR (const bool verbose); extern void register_Minres (const bool verbose); extern void register_PCPG (const bool verbose); @@ -78,13 +81,16 @@ void registerSolverFactory() { ::BelosTpetra::Impl::register_BiCGStab (false); ::BelosTpetra::Impl::register_BlockCG (false); ::BelosTpetra::Impl::register_BlockGmres (false); + ::BelosTpetra::Impl::register_Cg (false); ::BelosTpetra::Impl::register_CgPipeline (false); ::BelosTpetra::Impl::register_CgSingleReduce (false); ::BelosTpetra::Impl::register_FixedPoint (false); ::BelosTpetra::Impl::register_GCRODR (false); + ::BelosTpetra::Impl::register_Gmres (false); ::BelosTpetra::Impl::register_GmresPipeline (false); ::BelosTpetra::Impl::register_GmresPoly (false); ::BelosTpetra::Impl::register_GmresSingleReduce (false); + ::BelosTpetra::Impl::register_GmresSstep (false); ::BelosTpetra::Impl::register_LSQR (false); ::BelosTpetra::Impl::register_Minres (false); ::BelosTpetra::Impl::register_PCPG (false); diff --git a/packages/belos/tpetra/src/solvers/Belos_Tpetra_GmresSstep.hpp b/packages/belos/tpetra/src/solvers/Belos_Tpetra_GmresSstep.hpp index e21ff44613aa..85234e2dcba9 100644 --- a/packages/belos/tpetra/src/solvers/Belos_Tpetra_GmresSstep.hpp +++ b/packages/belos/tpetra/src/solvers/Belos_Tpetra_GmresSstep.hpp @@ -29,6 +29,7 @@ class CholQR { using STS = Teuchos::ScalarTraits; using MVT = Belos::MultiVecTraits; using mag_type = typename STS::magnitudeType; + using STM = Teuchos::ScalarTraits; using dense_matrix_type = Teuchos::SerialDenseMatrix; /// \brief Constructor @@ -45,7 +46,7 @@ class CholQR { /// default) or as contiguous column-major cache blocks, with /// leading dimension lda >= nrows. FactorOutput - factor (MV& A, dense_matrix_type& R) + factor (Teuchos::FancyOStream* outPtr, MV& A, dense_matrix_type& R) { Teuchos::RCP< Teuchos::Time > factorTimer = Teuchos::TimeMonitor::getNewCounter ("CholQR::factor"); Teuchos::TimeMonitor LocalTimer (*factorTimer); @@ -85,10 +86,17 @@ class CholQR { int ldr = int (R_h.extent (0)); SC *Rdata = reinterpret_cast (R_h.data ()); lapack.POTRF ('U', ncols, Rdata, ldr, &info); - if (info < 0) { - ncols = -info; + if (info > 0) { // FIXME (mfh 17 Sep 2018) Don't throw; report an error code. - throw std::runtime_error("Cholesky factorization failed"); + //ncols = info; + //throw std::runtime_error("Cholesky factorization failed"); + *outPtr << " > POTRF( " << ncols << " ) failed with info = " << info << std::endl; + for (size_t i=info-1; i 0 ? info-1 : ncols); + } + + // recursive call to factor + FactorOutput + reFactor (Teuchos::FancyOStream* outPtr, MV& A, dense_matrix_type& R) + { + int ncols = int (A.getNumVectors ()); + int rank = 0; + int old_rank = -1; + + // recursively call factor while cols remaining and has made progress + while (rank < ncols && old_rank != rank) { + Teuchos::Range1D next_index(rank, ncols-1); + MV nextA = * (A.subView(next_index)); - return (info > 0 ? info : ncols); + dense_matrix_type nextR (Teuchos::View, R, ncols-rank, ncols-rank, rank, rank); + old_rank = rank; + auto new_rank = factor (outPtr, nextA, nextR); + if (outPtr != nullptr) { + if (rank > 0) { + *outPtr << " ++ reCholQR("; + } else { + *outPtr << " >> CholQR("; + } + *outPtr << rank << ":" << ncols-1 << "), new_rank = " << new_rank << std::endl; + } + rank += new_rank; + } + return rank; } }; @@ -141,22 +177,14 @@ class GmresSstep : public Gmres { public: GmresSstep () : base_type::Gmres (), - stepSize_ (5), useCholQR2_ (false), cholqr_ (Teuchos::null) - { - this->input_.computeRitzValues = true; - this->input_.computeRitzValuesOnFly = false; - } + {} GmresSstep (const Teuchos::RCP& A) : base_type::Gmres (A), - stepSize_ (5), cholqr_ (Teuchos::null) - { - this->input_.computeRitzValues = true; - this->input_.computeRitzValuesOnFly = false; - } + {} virtual ~GmresSstep () = default; @@ -166,15 +194,15 @@ class GmresSstep : public Gmres { { base_type::getParameters (params, defaultValues); - const int stepSize = defaultValues ? 5 : stepSize_; + const int stepSize = defaultValues ? 5 : this->input_.stepSize; params.set ("Step Size", stepSize ); } virtual void setParameters (Teuchos::ParameterList& params) { base_type::setParameters (params); - int stepSize = params.get ("Step Size", stepSize_); - stepSize_ = stepSize; + int stepSize = params.get ("Step Size", this->input_.stepSize); + this->input_.stepSize = stepSize; bool computeRitzValuesOnFly = params.get ("Compute Ritz Values on Fly", this->input_.computeRitzValuesOnFly); @@ -203,7 +231,7 @@ class GmresSstep : public Gmres { const SolverInput& input) { using std::endl; - int stepSize = stepSize_; + int stepSize = input.stepSize; int restart = input.resCycle; int step = stepSize; const SC zero = STS::zero (); @@ -279,6 +307,17 @@ class GmresSstep : public Gmres { // Return residual norm as B Tpetra::deep_copy (B, P); return output; + } else if (STM::isnaninf (metric)) { + if (outPtr != nullptr) { + *outPtr << "Initial guess' residual norm " << b_norm + << " is nan " << endl; + } + output.absResid = r_norm; + output.relResid = r_norm / b0_norm; + output.converged = false; + // Return residual norm as B + Tpetra::deep_copy (B, P); + return output; } else if (input.computeRitzValues && !input.computeRitzValuesOnFly) { // Invoke standard Gmres for the first restart cycle, to compute // Ritz values for use as Newton shifts @@ -338,10 +377,10 @@ class GmresSstep : public Gmres { } // Compute matrix powers - if (input.computeRitzValuesOnFly && output.numIters < stepSize_) { + if (input.computeRitzValuesOnFly && output.numIters < input.stepSize) { stepSize = 1; } else { - stepSize = stepSize_; + stepSize = input.stepSize; } for (step=0; step < stepSize && iter+step < restart; step++) { // AP = A*P @@ -382,9 +421,9 @@ class GmresSstep : public Gmres { int rank = 0; { Teuchos::TimeMonitor LocalTimer (*tsqrTimer); - rank = normalizeCholQR (iter, step, Q, G); + rank = recursiveCholQR (outPtr, iter, step, Q, G); if (useCholQR2_) { - rank = normalizeCholQR (iter, step, Q, G2); + rank = recursiveCholQR (outPtr, iter, step, Q, G2); // merge R dense_matrix_type Rfix (Teuchos::View, G2, step+1, step+1, iter, 0); dense_matrix_type Rold (Teuchos::View, G, step+1, step+1, iter, 0); @@ -394,30 +433,46 @@ class GmresSstep : public Gmres { one, Rfix.values(), Rfix.stride(), Rold.values(), Rold.stride()); } + if (rank == 0) { + // FIXME: Don't throw; report an error code. + throw std::runtime_error("orthogonalization failed with rank = 0"); + } } updateHessenburg (iter, step, output.ritzValues, H, G); - // Check negative norm - TEUCHOS_TEST_FOR_EXCEPTION - (STS::real (H(iter+step, iter+step-1)) < STM::zero (), - std::runtime_error, "At iteration " << output.numIters << ", H(" - << iter+step << ", " << iter+step-1 << ") = " - << H(iter+step, iter+step-1) << " < 0."); - // Convergence check if (rank == step+1 && H(iter+step, iter+step-1) != zero) { // Copy H to T and apply Givens rotations to new columns of T and y for (int iiter = 0; iiter < step; iiter++) { + // Check negative norm + TEUCHOS_TEST_FOR_EXCEPTION + (STS::real (H(iter+iiter+1, iter+iiter)) < STM::zero (), + std::runtime_error, "At iteration " << output.numIters << ", H(" + << iter+iiter+1 << ", " << iter+iiter << ") = " + << H(iter+iiter+1, iter+iiter) << " < 0."); + for (int i = 0; i <= iter+iiter+1; i++) { T(i, iter+iiter) = H(i, iter+iiter); } this->reduceHessenburgToTriangular(iter+iiter, T, cs, sn, y); + metric = this->getConvergenceMetric (STS::magnitude (y(iter+iiter+1)), b_norm, input); if (outPtr != nullptr) { *outPtr << " > implicit residual norm=(" << iter+iiter+1 << ")=" - << STS::magnitude (y(iter+iiter+1)) << endl; + << STS::magnitude (y(iter+iiter+1)) + << " metric=" << metric << endl; + } + if (STM::isnaninf (metric) || metric <= input.tol) { + if (outPtr != nullptr) { + *outPtr << " > break at step = " << iiter+1 << " (" << step << ")" << endl; + } + step = iiter+1; + break; } } - metric = this->getConvergenceMetric (STS::magnitude (y(iter+step)), b_norm, input); + if (STM::isnaninf (metric)) { + // metric is nan + break; + } } else { metric = STM::zero (); @@ -425,17 +480,17 @@ class GmresSstep : public Gmres { // Optionally, compute Ritz values for generating Newton basis if (input.computeRitzValuesOnFly && int (output.ritzValues.size()) == 0 - && output.numIters >= stepSize_) { - for (int i = 0; i < stepSize_; i++) { - for (int iiter = 0; iiter < stepSize_; iiter++) { + && output.numIters >= input.stepSize) { + for (int i = 0; i < input.stepSize; i++) { + for (int iiter = 0; iiter < input.stepSize; iiter++) { G2(i, iiter) = H(i, iiter); } } - computeRitzValues (stepSize_, G2, output.ritzValues); - sortRitzValues (stepSize_, output.ritzValues); + computeRitzValues (input.stepSize, G2, output.ritzValues); + sortRitzValues (input.stepSize, output.ritzValues); if (outPtr != nullptr) { *outPtr << " > ComputeRitzValues: " << endl; - for (int i = 0; i < stepSize_; i++) { + for (int i = 0; i < input.stepSize; i++) { *outPtr << " > ritzValues[ " << i << " ] = " << output.ritzValues[i] << endl; } } @@ -482,6 +537,12 @@ class GmresSstep : public Gmres { // update solution output.converged = true; } + else if (STM::isnaninf (metric)) { + // failed with nan + // Return residual norm as B + Tpetra::deep_copy (B, R); + return output; + } else if (output.numIters < input.maxNumIters) { // Restart, only if max inner-iteration was reached. // Otherwise continue the inner-iteration. @@ -552,8 +613,8 @@ class GmresSstep : public Gmres { } // submatrices - dense_matrix_type r_diag (Teuchos::View, R, s+1, s+1, n, 0); - dense_matrix_type h_diag (Teuchos::View, H, s+1, s, n, n); + dense_matrix_type r_diag (Teuchos::View, R, s, s, n, 0); + dense_matrix_type h_diag (Teuchos::View, H, s+1, s, n, n); Teuchos::BLAS blas; if (n == 0) { // >> first matrix-power iteration << @@ -573,7 +634,7 @@ class GmresSstep : public Gmres { // 2) multiply H with R(1:n+s, 1:n+s)^{-1} from right, // where R(1:n, 1:n) = I // 2.1) diagonal block - for (int j = 1; j < s; j++ ) { + for (int j = 0; j < s; j++ ) { H(n, n+j) -= H(n, n-1) * R(n-1, j); } // diagonal block @@ -601,7 +662,32 @@ class GmresSstep : public Gmres { //! Apply the orthogonalization using Belos' OrthoManager int - normalizeCholQR (const int n, + normalizeCholQR (Teuchos::FancyOStream* outPtr, + const int n, + const int s, + MV& Q, + dense_matrix_type& R) + { + // vector to be orthogonalized + Teuchos::Range1D index_prev(n, n+s); + MV Qnew = * (Q.subView(index_prev)); + + dense_matrix_type r_new (Teuchos::View, R, s+1, s+1, n, 0); + + int rank = 0; + if (cholqr_ != Teuchos::null) { + rank = cholqr_->factor (outPtr, Qnew, r_new); + } + else { + rank = this->normalizeBelosOrthoManager (Qnew, r_new); + } + return rank; + } + + //! Apply the orthogonalization using Belos' OrthoManager + int + recursiveCholQR (Teuchos::FancyOStream* outPtr, + const int n, const int s, MV& Q, dense_matrix_type& R) @@ -614,7 +700,7 @@ class GmresSstep : public Gmres { int rank = 0; if (cholqr_ != Teuchos::null) { - rank = cholqr_->factor (Qnew, r_new); + rank = cholqr_->reFactor (outPtr, Qnew, r_new); } else { rank = this->normalizeBelosOrthoManager (Qnew, r_new); @@ -623,7 +709,6 @@ class GmresSstep : public Gmres { } private: - int stepSize_; bool useCholQR2_; Teuchos::RCP > cholqr_; }; diff --git a/packages/belos/tpetra/src/solvers/Belos_Tpetra_Krylov.hpp b/packages/belos/tpetra/src/solvers/Belos_Tpetra_Krylov.hpp index d4f72bc042e6..71f925f47d18 100644 --- a/packages/belos/tpetra/src/solvers/Belos_Tpetra_Krylov.hpp +++ b/packages/belos/tpetra/src/solvers/Belos_Tpetra_Krylov.hpp @@ -146,13 +146,11 @@ class Krylov { virtual void setParameters (Teuchos::ParameterList& params) { - if (params.isParameter ("Convergence Tolerance")) { - const mag_type tol = params.get ("Convergence Tolerance"); - TEUCHOS_TEST_FOR_EXCEPTION - (tol < STM::zero (), std::invalid_argument, - "\"Convergence tolerance\" = " << tol << " < 0."); - input_.tol = tol; - } + const mag_type tol = params.get ("Convergence Tolerance", input_.tol); + TEUCHOS_TEST_FOR_EXCEPTION + (tol < STM::zero (), std::invalid_argument, + "\"Convergence tolerance\" = " << tol << " < 0."); + input_.tol = tol; if (params.isParameter ("Implicit Residual Scaling")) { const std::string implScal = diff --git a/packages/belos/tpetra/src/solvers/Belos_Tpetra_Krylov_parameters.hpp b/packages/belos/tpetra/src/solvers/Belos_Tpetra_Krylov_parameters.hpp index 8fa72a3bbedc..5d5e8e172a16 100644 --- a/packages/belos/tpetra/src/solvers/Belos_Tpetra_Krylov_parameters.hpp +++ b/packages/belos/tpetra/src/solvers/Belos_Tpetra_Krylov_parameters.hpp @@ -55,10 +55,9 @@ struct SolverInput { bool needToReortho = false; int maxOrthoSteps = 0; std::string orthoType {"ICGS"}; - std::string precoType {"none"}; std::string precoSide {"none"}; - bool computeRitzValues = false; - bool computeRitzValuesOnFly = true; + bool computeRitzValues = true; + bool computeRitzValuesOnFly = false; }; // The default constructor creates output corresponding to "solving @@ -158,8 +157,7 @@ operator<< (std::ostream& out, out << " Orthogonalization: " << si.orthoType << endl; } out << " Step size: " << si.stepSize << endl - << " Preconditioner: " << si.precoType << " (" << si.precoSide << ")" - << endl; + << " Preconditioner: " << si.precoSide << endl; return out; } diff --git a/packages/belos/tpetra/test/Native/diagonal_matrix.cpp b/packages/belos/tpetra/test/Native/diagonal_matrix.cpp index c5ff3d2eee50..68349b79c710 100644 --- a/packages/belos/tpetra/test/Native/diagonal_matrix.cpp +++ b/packages/belos/tpetra/test/Native/diagonal_matrix.cpp @@ -285,23 +285,8 @@ TEUCHOS_UNIT_TEST( TpetraNativeSolvers, Diagonal ) } // namespace (anonymous) -namespace BelosTpetra { -namespace Impl { - extern void register_Cg (const bool verbose); - extern void register_Gmres (const bool verbose); - extern void register_GmresS (const bool verbose); - extern void register_GmresSstep (const bool verbose); -} // namespace Impl -} // namespace BelosTpetra - int main (int argc, char* argv[]) { Tpetra::ScopeGuard tpetraScope (&argc, &argv); - - constexpr bool verbose = false; - BelosTpetra::Impl::register_Cg (verbose); - BelosTpetra::Impl::register_Gmres (verbose); - BelosTpetra::Impl::register_GmresS (verbose); - BelosTpetra::Impl::register_GmresSstep (verbose); return Teuchos::UnitTestRepository::runUnitTestsFromMain (argc, argv); } diff --git a/packages/belos/tpetra/test/Native/nonsymm_matrix.cpp b/packages/belos/tpetra/test/Native/nonsymm_matrix.cpp index 92f4028e0c52..36965379deaa 100644 --- a/packages/belos/tpetra/test/Native/nonsymm_matrix.cpp +++ b/packages/belos/tpetra/test/Native/nonsymm_matrix.cpp @@ -325,23 +325,8 @@ TEUCHOS_UNIT_TEST( TpetraNativeSolvers, Diagonal ) } // namespace (anonymous) -namespace BelosTpetra { -namespace Impl { - // extern void register_Cg (const bool verbose); - extern void register_Gmres (const bool verbose); - extern void register_GmresS (const bool verbose); - extern void register_GmresSstep (const bool verbose); -} // namespace Impl -} // namespace BelosTpetra - int main (int argc, char* argv[]) { Tpetra::ScopeGuard tpetraScope (&argc, &argv); - - constexpr bool verbose = false; - // BelosTpetra::Impl::register_Cg (verbose); - BelosTpetra::Impl::register_Gmres (verbose); - BelosTpetra::Impl::register_GmresS (verbose); - BelosTpetra::Impl::register_GmresSstep (verbose); return Teuchos::UnitTestRepository::runUnitTestsFromMain (argc, argv); } diff --git a/packages/galeri/src-xpetra/Galeri_Elasticity2DProblem.hpp b/packages/galeri/src-xpetra/Galeri_Elasticity2DProblem.hpp index 538f98ee810e..037ddf1d481c 100644 --- a/packages/galeri/src-xpetra/Galeri_Elasticity2DProblem.hpp +++ b/packages/galeri/src-xpetra/Galeri_Elasticity2DProblem.hpp @@ -66,8 +66,21 @@ namespace Galeri { E = list.get("E", Teuchos::as::magnitudeType>(1e9)); nu = list.get("nu", Teuchos::as::magnitudeType>(0.25)); - nx_ = list.get("nx", -1); - ny_ = list.get("ny", -1); + nx_ = -1; + ny_ = -1; + + if (list.isParameter("nx")) { + if (list.isType("nx")) + nx_ = Teuchos::as(list.get("nx")); + else + nx_ = list.get("nx"); + } + if (list.isParameter("ny")) { + if (list.isType("ny")) + ny_ = Teuchos::as(list.get("ny")); + else + ny_ = list.get("ny"); + } nDim_ = 2; double one = 1.0; @@ -176,6 +189,7 @@ namespace Galeri { R(0,0) = R(1,3) = R(2,1) = R(2,2) = 1; this->A_ = MatrixTraits::Build(this->Map_, 8*numNodesPerElem); + this->A_->setObjectLabel(this->getObjectLabel()); SC one = TST::one(), zero = TST::zero(); SerialDenseMatrix prevKE(numDofPerElem, numDofPerElem), prevElementNodes(numNodesPerElem, Teuchos::as(nDim_)); // cache diff --git a/packages/galeri/src-xpetra/Galeri_Elasticity3DProblem.hpp b/packages/galeri/src-xpetra/Galeri_Elasticity3DProblem.hpp index d033e45d5f60..9ebdf77b924c 100644 --- a/packages/galeri/src-xpetra/Galeri_Elasticity3DProblem.hpp +++ b/packages/galeri/src-xpetra/Galeri_Elasticity3DProblem.hpp @@ -67,9 +67,28 @@ namespace Galeri { E = list.get("E", Teuchos::as::magnitudeType>(1e9)); nu = list.get("nu", Teuchos::as::magnitudeType>(0.25)); - nx_ = list.get("nx", -1); - ny_ = list.get("ny", -1); - nz_ = list.get("nz", -1); + nx_ = -1; + ny_ = -1; + nz_ = -1; + + if (list.isParameter("nx")) { + if (list.isType("nx")) + nx_ = Teuchos::as(list.get("nx")); + else + nx_ = list.get("nx"); + } + if (list.isParameter("ny")) { + if (list.isType("ny")) + ny_ = Teuchos::as(list.get("ny")); + else + ny_ = list.get("ny"); + } + if (list.isParameter("nz")) { + if (list.isType("nz")) + nz_ = Teuchos::as(list.get("nz")); + else + nz_ = list.get("nz"); + } nDim_ = 3; double one = 1.0; @@ -187,6 +206,7 @@ namespace Galeri { R(0,0) = R(1,4) = R(2,8) = R(3,1) = R(3,3) = R(4,5) = R(4,7) = R(5,2) = R(5,6) = 1; this->A_ = MatrixTraits::Build(this->Map_, numNodesPerElem * 8 * numDofPerElem); + this->A_->setObjectLabel(this->getObjectLabel()); SC one = Teuchos::ScalarTraits::one(), zero = Teuchos::ScalarTraits::zero(); SerialDenseMatrix prevKE(numDofPerElem, numDofPerElem), prevElementNodes(numNodesPerElem, nDim_); // cache diff --git a/packages/galeri/src-xpetra/Galeri_StencilProblems.hpp b/packages/galeri/src-xpetra/Galeri_StencilProblems.hpp index cd17bb98d996..446e60e7229d 100644 --- a/packages/galeri/src-xpetra/Galeri_StencilProblems.hpp +++ b/packages/galeri/src-xpetra/Galeri_StencilProblems.hpp @@ -100,7 +100,15 @@ namespace Galeri { template Teuchos::RCP::RealValuedMultiVector> Laplace1DProblem::BuildCoords() { - GlobalOrdinal nx = this->list_.get("nx", (GlobalOrdinal) -1); + Teuchos::ParameterList list = this->list_; + GlobalOrdinal nx = -1; + + if (list.isParameter("nx")) { + if (list.isType("nx")) + nx = Teuchos::as(list.get("nx")); + else + nx = list.get("nx"); + } if (nx == -1) { nx = this->Map_->getGlobalNumElements(); @@ -122,8 +130,23 @@ namespace Galeri { template Teuchos::RCP Laplace2DProblem::BuildMatrix() { - GlobalOrdinal nx = this->list_.get("nx", (GlobalOrdinal) -1); - GlobalOrdinal ny = this->list_.get("ny", (GlobalOrdinal) -1); + Teuchos::ParameterList list = this->list_; + GlobalOrdinal nx = -1; + GlobalOrdinal ny = -1; + + if (list.isParameter("nx")) { + if (list.isType("nx")) + nx = Teuchos::as(list.get("nx")); + else + nx = list.get("nx"); + } + if (list.isParameter("ny")) { + if (list.isType("ny")) + ny = Teuchos::as(list.get("ny")); + else + ny = list.get("ny"); + } + double one = 1.0; Scalar stretchx = (Scalar) this->list_.get("stretchx", one); Scalar stretchy = (Scalar) this->list_.get("stretchy", one); @@ -157,9 +180,29 @@ namespace Galeri { template Teuchos::RCP Laplace3DProblem::BuildMatrix() { - GlobalOrdinal nx = this->list_.get("nx", (GlobalOrdinal) -1); - GlobalOrdinal ny = this->list_.get("ny", (GlobalOrdinal) -1); - GlobalOrdinal nz = this->list_.get("nz", (GlobalOrdinal) -1); + Teuchos::ParameterList list = this->list_; + GlobalOrdinal nx = -1; + GlobalOrdinal ny = -1; + GlobalOrdinal nz = -1; + + if (list.isParameter("nx")) { + if (list.isType("nx")) + nx = Teuchos::as(list.get("nx")); + else + nx = list.get("nx"); + } + if (list.isParameter("ny")) { + if (list.isType("ny")) + ny = Teuchos::as(list.get("ny")); + else + ny = list.get("ny"); + } + if (list.isParameter("nz")) { + if (list.isType("nz")) + nz = Teuchos::as(list.get("nz")); + else + nz = list.get("nz"); + } double one = 1.0; Scalar stretchx = (Scalar) this->list_.get("stretchx", one); Scalar stretchy = (Scalar) this->list_.get("stretchy", one); @@ -196,8 +239,22 @@ namespace Galeri { template Teuchos::RCP Star2DProblem::BuildMatrix() { - GlobalOrdinal nx = this->list_.get("nx", (GlobalOrdinal) -1); - GlobalOrdinal ny = this->list_.get("ny", (GlobalOrdinal) -1); + Teuchos::ParameterList list = this->list_; + GlobalOrdinal nx = -1; + GlobalOrdinal ny = -1; + + if (list.isParameter("nx")) { + if (list.isType("nx")) + nx = Teuchos::as(list.get("nx")); + else + nx = list.get("nx"); + } + if (list.isParameter("ny")) { + if (list.isType("ny")) + ny = Teuchos::as(list.get("ny")); + else + ny = list.get("ny"); + } Scalar a = this->list_.get("a", 8.0); Scalar b = this->list_.get("b", -1.0); @@ -226,8 +283,22 @@ namespace Galeri { template Teuchos::RCP BigStar2DProblem::BuildMatrix() { - GlobalOrdinal nx = this->list_.get("nx", (GlobalOrdinal) -1); - GlobalOrdinal ny = this->list_.get("ny", (GlobalOrdinal) -1); + Teuchos::ParameterList list = this->list_; + GlobalOrdinal nx = -1; + GlobalOrdinal ny = -1; + + if (list.isParameter("nx")) { + if (list.isType("nx")) + nx = Teuchos::as(list.get("nx")); + else + nx = list.get("nx"); + } + if (list.isParameter("ny")) { + if (list.isType("ny")) + ny = Teuchos::as(list.get("ny")); + else + ny = list.get("ny"); + } Scalar a = this->list_.get("a", 20.0); Scalar b = this->list_.get("b", -8.0); @@ -260,9 +331,29 @@ namespace Galeri { template Teuchos::RCP Brick3DProblem::BuildMatrix() { - GlobalOrdinal nx = this->list_.get("nx", (GlobalOrdinal) -1); - GlobalOrdinal ny = this->list_.get("ny", (GlobalOrdinal) -1); - GlobalOrdinal nz = this->list_.get("nz", (GlobalOrdinal) -1); + Teuchos::ParameterList list = this->list_; + GlobalOrdinal nx = -1; + GlobalOrdinal ny = -1; + GlobalOrdinal nz = -1; + + if (list.isParameter("nx")) { + if (list.isType("nx")) + nx = Teuchos::as(list.get("nx")); + else + nx = list.get("nx"); + } + if (list.isParameter("ny")) { + if (list.isType("ny")) + ny = Teuchos::as(list.get("ny")); + else + ny = list.get("ny"); + } + if (list.isParameter("nz")) { + if (list.isType("nz")) + nz = Teuchos::as(list.get("nz")); + else + nz = list.get("nz"); + } if (nx == -1 || ny == -1 || nz == -1) { GlobalOrdinal n = this->Map_->getGlobalNumElements(); diff --git a/packages/galeri/src-xpetra/Galeri_XpetraMaps.hpp b/packages/galeri/src-xpetra/Galeri_XpetraMaps.hpp index 0f8682099055..991a907b8208 100644 --- a/packages/galeri/src-xpetra/Galeri_XpetraMaps.hpp +++ b/packages/galeri/src-xpetra/Galeri_XpetraMaps.hpp @@ -200,13 +200,48 @@ namespace Galeri { GlobalOrdinal n = -1, nx = -1, ny = -1, nz = -1, mx = -1, my = -1, mz = -1; // Get matrix dimensions - if (list.isParameter("n")) n = list.get("n"); - if (list.isParameter("nx")) nx = list.get("nx"); - if (list.isParameter("ny")) ny = list.get("ny"); - if (list.isParameter("nz")) nz = list.get("nz"); - if (list.isParameter("mx")) mx = list.get("mx"); - if (list.isParameter("my")) my = list.get("my"); - if (list.isParameter("mz")) mz = list.get("mz"); + if (list.isParameter("n")) { + if (list.isType("n")) + n = Teuchos::as(list.get("n")); + else + n = list.get("n"); + } + if (list.isParameter("nx")) { + if (list.isType("nx")) + nx = Teuchos::as(list.get("nx")); + else + nx = list.get("nx"); + } + if (list.isParameter("ny")) { + if (list.isType("ny")) + ny = Teuchos::as(list.get("ny")); + else + ny = list.get("ny"); + } + if (list.isParameter("nz")) { + if (list.isType("nz")) + nz = Teuchos::as(list.get("nz")); + else + nz = list.get("nz"); + } + if (list.isParameter("mx")) { + if (list.isType("mx")) + mx = Teuchos::as(list.get("mx")); + else + mx = list.get("mx"); + } + if (list.isParameter("my")) { + if (list.isType("my")) + my = Teuchos::as(list.get("my")); + else + my = list.get("my"); + } + if (list.isParameter("mz")) { + if (list.isType("mz")) + mz = Teuchos::as(list.get("mz")); + else + mz = list.get("mz"); + } if (mapType == "Cartesian1D") { if (nx == -1) { diff --git a/packages/galeri/src-xpetra/Galeri_XpetraParameters.hpp b/packages/galeri/src-xpetra/Galeri_XpetraParameters.hpp index 7a82419558c2..dc402b43862a 100644 --- a/packages/galeri/src-xpetra/Galeri_XpetraParameters.hpp +++ b/packages/galeri/src-xpetra/Galeri_XpetraParameters.hpp @@ -104,9 +104,19 @@ namespace Galeri { const Teuchos::ParameterList& pL = GetParameterList(); const std::string& matrixType = pL.get("matrixType"); - const GO nx = pL.get("nx"); - const GO ny = pL.get("ny"); - const GO nz = pL.get("nz"); + GO nx, ny, nz; + if (pL.isType("nx")) + nx = Teuchos::as(pL.get("nx")); + else + nx = pL.get("nx"); + if (pL.isType("ny")) + ny = Teuchos::as(pL.get("ny")); + else + ny = pL.get("ny"); + if (pL.isType("nz")) + nz = Teuchos::as(pL.get("nz")); + else + nz = pL.get("nz"); GO numGlobalElements = -1; if (matrixType == "Laplace1D" || matrixType == "Helmholtz1D") @@ -201,9 +211,19 @@ namespace Galeri { const Teuchos::ParameterList& paramList = GetParameterList(); std::string matrixType = paramList.get("matrixType"); - GO nx = paramList.get("nx"); - GO ny = paramList.get("ny"); - GO nz = paramList.get("nz"); + GO nx, ny, nz; + if (paramList.isType("nx")) + nx = Teuchos::as(paramList.get("nx")); + else + nx = paramList.get("nx"); + if (paramList.isType("ny")) + ny = Teuchos::as(paramList.get("ny")); + else + ny = paramList.get("ny"); + if (paramList.isType("nz")) + nz = Teuchos::as(paramList.get("nz")); + else + nz = paramList.get("nz"); out << "Matrix type: " << matrixType << std::endl << "Problem size: " << GetNumGlobalElements(); diff --git a/packages/galeri/src-xpetra/Galeri_XpetraUtils.hpp b/packages/galeri/src-xpetra/Galeri_XpetraUtils.hpp index ed3c1ac29be1..609bee24efdc 100644 --- a/packages/galeri/src-xpetra/Galeri_XpetraUtils.hpp +++ b/packages/galeri/src-xpetra/Galeri_XpetraUtils.hpp @@ -89,10 +89,28 @@ namespace Galeri { real_type ly = Teuchos::as(list.get("ly", 1) * list.get("stretchy", 1)); real_type lz = Teuchos::as(list.get("lz", 1) * list.get("stretchz", 1)); - GlobalOrdinal nx = list.get("nx", -1); - GlobalOrdinal ny = list.get("ny", -1); - GlobalOrdinal nz = list.get("nz", -1); - + GlobalOrdinal nx = -1; + GlobalOrdinal ny = -1; + GlobalOrdinal nz = -1; + + if (list.isParameter("nx")) { + if (list.isType("nx")) + nx = Teuchos::as(list.get("nx")); + else + nx = list.get("nx"); + } + if (list.isParameter("ny")) { + if (list.isType("ny")) + ny = Teuchos::as(list.get("ny")); + else + ny = list.get("ny"); + } + if (list.isParameter("nz")) { + if (list.isType("nz")) + nz = Teuchos::as(list.get("nz")); + else + nz = list.get("nz"); + } size_t NumMyElements = map->getNodeNumElements(); Teuchos::ArrayView MyGlobalElements = map->getNodeElementList(); diff --git a/packages/ifpack2/cmake/Dependencies.cmake b/packages/ifpack2/cmake/Dependencies.cmake index 71fca6e5274d..343b225532a2 100644 --- a/packages/ifpack2/cmake/Dependencies.cmake +++ b/packages/ifpack2/cmake/Dependencies.cmake @@ -1,5 +1,5 @@ SET(LIB_REQUIRED_DEP_PACKAGES Belos Teuchos Tpetra KokkosKernels) -SET(LIB_OPTIONAL_DEP_PACKAGES Xpetra Zoltan2 ThyraTpetraAdapters Amesos2 ShyLU_NodeBasker ShyLU_NodeHTS ShyLU_NodeFastILU) +SET(LIB_OPTIONAL_DEP_PACKAGES Xpetra Zoltan2Core ThyraTpetraAdapters Amesos2 ShyLU_NodeBasker ShyLU_NodeHTS ShyLU_NodeFastILU) SET(TEST_REQUIRED_DEP_PACKAGES Belos Galeri) SET(TEST_OPTIONAL_DEP_PACKAGES Amesos2 ShyLU_NodeHTS ML AztecOO Epetra) SET(LIB_REQUIRED_DEP_TPLS) diff --git a/packages/ifpack2/cmake/Ifpack2_config.h.in b/packages/ifpack2/cmake/Ifpack2_config.h.in index b6c1fedefb49..468eeb9b71b1 100644 --- a/packages/ifpack2/cmake/Ifpack2_config.h.in +++ b/packages/ifpack2/cmake/Ifpack2_config.h.in @@ -84,7 +84,10 @@ #cmakedefine HAVE_IFPACK2_XPETRA /* Define if we have Zoltan2 */ -#cmakedefine HAVE_IFPACK2_ZOLTAN2 +#cmakedefine HAVE_IFPACK2_ZOLTAN2CORE +#ifdef HAVE_IFPACK2_ZOLTAN2CORE +# define HAVE_IFPACK2_ZOLTAN2 +#endif /* Define if we have ShyLU/HTS */ #cmakedefine HAVE_IFPACK2_SHYLU_NODEHTS diff --git a/packages/ifpack2/src/Ifpack2_BlockTriDiContainer_impl.hpp b/packages/ifpack2/src/Ifpack2_BlockTriDiContainer_impl.hpp index 1591c2f5ae3a..7b5026225b0b 100644 --- a/packages/ifpack2/src/Ifpack2_BlockTriDiContainer_impl.hpp +++ b/packages/ifpack2/src/Ifpack2_BlockTriDiContainer_impl.hpp @@ -1863,8 +1863,7 @@ namespace KB = KokkosBatched::Experimental; const ConstUnmanaged partptr, lclrow, packptr; const local_ordinal_type max_partsz; // block crs matrix (it could be Kokkos::UVMSpace::size_type, which is int) - using a_rowptr_value_type = typename Kokkos::ViewTraits::size_type; - using size_type_1d_view_tpetra = Kokkos::View; + using size_type_1d_view_tpetra = Kokkos::View; const ConstUnmanaged A_rowptr; const ConstUnmanaged A_values; // block tridiags @@ -2025,6 +2024,7 @@ namespace KB = KokkosBatched::Experimental; KB::LU ::invoke(member, A , tiny); + if (nrows > 1) { auto B = A; auto C = A; @@ -2041,6 +2041,8 @@ namespace KB = KokkosBatched::Experimental; default_mode_type,default_algo_type> ::invoke(member, one, A, C); A.assign_data( &AA(i+3,0,0,v) ); + + member.team_barrier(); KB::Gemm @@ -2090,10 +2092,14 @@ namespace KB = KokkosBatched::Experimental; factorize(member, i0, nrows, 0, internal_vector_values, WW); } else { Kokkos::parallel_for - (Kokkos::ThreadVectorRange(member, vector_loop_size), [&](const local_ordinal_type &v) { + (Kokkos::ThreadVectorRange(member, vector_loop_size), + [&](const local_ordinal_type &v) { const local_ordinal_type vbeg = v*internal_vector_length; if (vbeg < npacks) extract(member, partidx+vbeg, npacks, vbeg); + // this is not safe if vector loop size is different from vector size of + // the team policy. we always make sure this when constructing the team policy + member.team_barrier(); factorize(member, i0, nrows, v, internal_vector_values, WW); }); } @@ -2562,6 +2568,7 @@ namespace KB = KokkosBatched::Experimental; X, xs0); for (local_ordinal_type tr=1;tr1;--tr) { A -= 3*astep; + member.team_barrier(); KOKKOSBATCHED_GEMV_NO_TRANSPOSE_INTERNAL_INVOKE (default_mode_type,default_algo_type, member, @@ -2606,7 +2613,6 @@ namespace KB = KokkosBatched::Experimental; X, xs0, one, X-1*xstep, xs0); - KOKKOSBATCHED_TRSV_UPPER_NO_TRANSPOSE_INTERNAL_INVOKE (default_mode_type,default_algo_type, member, @@ -2615,7 +2621,6 @@ namespace KB = KokkosBatched::Experimental; one, A, as0, as1, X-1*xstep,xs0); - X -= 1*xstep; } // for multiple rhs @@ -2626,6 +2631,7 @@ namespace KB = KokkosBatched::Experimental; KOKKOSBATCHED_COPY_VECTOR_NO_TRANSPOSE_INTERNAL_INVOKE (default_mode_type, member, blocksize, X, xs0, W, ws0); + member.team_barrier(); KOKKOSBATCHED_GEMV_NO_TRANSPOSE_INTERNAL_INVOKE (default_mode_type,default_algo_type, member, @@ -2674,6 +2680,7 @@ namespace KB = KokkosBatched::Experimental; for (local_ordinal_type tr=1;tr @@ -2695,10 +2702,12 @@ namespace KB = KokkosBatched::Experimental; i -= 3; A.assign_data( &D_internal_vector_values(i+1,0,0,v) ); X2.assign_data( &X_internal_vector_values(--r,0,0,v) ); + member.team_barrier(); KB::Gemm ::invoke(member, -one, A, X1, one, X2); + A.assign_data( &D_internal_vector_values(i,0,0,v) ); KB::Trsm ::invoke(member, X1, W); + member.team_barrier(); KB::Gemm @@ -2901,8 +2911,7 @@ namespace KB = KokkosBatched::Experimental; // block crs graph information // for cuda (kokkos crs graph uses a different size_type from size_t) - using a_rowptr_value_type = typename Kokkos::ViewTraits::size_type; - const ConstUnmanaged > A_rowptr; + const ConstUnmanaged > A_rowptr; const ConstUnmanaged > A_colind; // blocksize @@ -3615,10 +3624,10 @@ namespace KB = KokkosBatched::Experimental; IFPACK2_BLOCKTRIDICONTAINER_TIMER("BlockTriDi::NormManager::Ireduce"); work_[1] = work_[0]; +#ifdef HAVE_IFPACK2_MPI auto send_data = &work_[1]; auto recv_data = &work_[0]; if (collective_) { -#ifdef HAVE_IFPACK2_MPI # if defined(IFPACK2_BLOCKTRIDICONTAINER_USE_MPI_3) MPI_Iallreduce(send_data, recv_data, 1, Teuchos::Details::MpiTypeTraits::getType(), @@ -3628,8 +3637,8 @@ namespace KB = KokkosBatched::Experimental; Teuchos::Details::MpiTypeTraits::getType(), MPI_SUM, comm_); # endif -#endif } +#endif } // Check if the norm-based termination criterion is met. tol2 is the diff --git a/packages/intrepid2/src/Shared/Intrepid2_Utils.hpp b/packages/intrepid2/src/Shared/Intrepid2_Utils.hpp index b02197d305c3..ba20f79da3ac 100644 --- a/packages/intrepid2/src/Shared/Intrepid2_Utils.hpp +++ b/packages/intrepid2/src/Shared/Intrepid2_Utils.hpp @@ -123,29 +123,7 @@ namespace Intrepid2 { Kokkos::abort( "[Intrepid2] Abort\n"); \ } #endif - -// adapted from Kokkos_Macros.hpp -#if defined(KOKKOS_COMPILER_GNU) || defined(KOKKOS_COMPILER_CLANG) - #if defined(KOKKOS_COMPILER_CLANG) - #define INTREPID2_DEPRECATED_TYPENAME_REPLACEMENT(msg,fixit) __attribute__((deprecated(msg,fixit))) - #define INTREPID2_DEPRECATED_TYPENAME_TRAILING_ATTRIBUTE(msg) - #else // GNU - #if not defined(KOKKOS_ENABLE_CUDA) - #define INTREPID2_DEPRECATED_TYPENAME_REPLACEMENT(msg,fixit) [[deprecated(msg)]] - #define INTREPID2_DEPRECATED_TYPENAME_TRAILING_ATTRIBUTE(msg) - // see https://gcc.gnu.org/onlinedocs/gcc-4.9.0/gcc/Function-Attributes.html - #else // GNU + CUDA - // for unknown reasons, the CUDA compilers seem to have trouble with this gcc feature - // we therefore disable typedef deprecation warnings on CUDA - #define INTREPID2_DEPRECATED_TYPENAME_REPLACEMENT(msg,fixit) - #define INTREPID2_DEPRECATED_TYPENAME_TRAILING_ATTRIBUTE(msg) - #endif - #endif -#else - // don't issue deprecation warnings on compilers other than gcc and clang (this is not part of the C++11 standard; it is compiler-specific) - #define INTREPID2_DEPRECATED_TYPENAME_REPLACEMENT(msg,fixit) - #define INTREPID2_DEPRECATED_TYPENAME_TRAILING_ATTRIBUTE(msg) -#endif + /** \brief scalar type traits */ diff --git a/packages/kokkos-kernels/cmake/kokkoskernels_tpls.cmake b/packages/kokkos-kernels/cmake/kokkoskernels_tpls.cmake index 835fcf9a3309..08230dd987f8 100644 --- a/packages/kokkos-kernels/cmake/kokkoskernels_tpls.cmake +++ b/packages/kokkos-kernels/cmake/kokkoskernels_tpls.cmake @@ -489,11 +489,3 @@ STRING(REPLACE ";" "\n" KOKKOSKERNELS_TPL_EXPORT_TEMP "${KOKKOSKERNELS_TPL_EXPOR UNSET(KOKKOSKERNELS_TPL_EXPORTS CACHE) SET(KOKKOSKERNELS_TPL_EXPORTS ${KOKKOSKERNELS_TPL_EXPORT_TEMP}) -IF (KOKKOSKERNELS_ENABLE_TPL_CUSPARSE AND KOKKOSKERNELS_ENABLE_TESTS) - #The tests use CUDA lambdas, make sure Kokkos was built - #with CUDA lambda support - KOKKOS_CHECK(OPTIONS CUDA_LAMBDA RETURN_VALUE HAVE_CUDA_LAMBDA) - IF (NOT HAVE_CUDA_LAMBDA) - MESSAGE(FATAL_ERROR "CUSPARSE tests require Kokkos to be built with CUDA lambda. Please reinstall Kokkos using -DKokkos_ENABLE_CUDA_LAMBDA=ON") - ENDIF() -ENDIF() diff --git a/packages/kokkos-kernels/perf_test/sparse/CMakeLists.txt b/packages/kokkos-kernels/perf_test/sparse/CMakeLists.txt index 8ca70ba8adfd..da22993cda89 100644 --- a/packages/kokkos-kernels/perf_test/sparse/CMakeLists.txt +++ b/packages/kokkos-kernels/perf_test/sparse/CMakeLists.txt @@ -43,6 +43,13 @@ KOKKOSKERNELS_ADD_EXECUTABLE( SOURCES KokkosSparse_spmv.cpp ) +IF(KOKKOSKERNELS_ENABLE_TPL_CUSPARSE) + KOKKOSKERNELS_ADD_EXECUTABLE( + sparse_spmv_merge + SOURCES KokkosSparse_spmv_merge.cpp + ) +ENDIF() + KOKKOSKERNELS_ADD_EXECUTABLE( sparse_sptrsv SOURCES KokkosSparse_sptrsv.cpp diff --git a/packages/kokkos-kernels/perf_test/sparse/KokkosSparse_spmv_merge.cpp b/packages/kokkos-kernels/perf_test/sparse/KokkosSparse_spmv_merge.cpp new file mode 100644 index 000000000000..ec819bd70483 --- /dev/null +++ b/packages/kokkos-kernels/perf_test/sparse/KokkosSparse_spmv_merge.cpp @@ -0,0 +1,302 @@ +/* +//@HEADER +// ************************************************************************ +// +// Kokkos v. 3.0 +// Copyright (2020) National Technology & Engineering +// Solutions of Sandia, LLC (NTESS). +// +// Under the terms of Contract DE-NA0003525 with NTESS, +// the U.S. Government retains certain rights in this software. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// 1. Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// +// 2. Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in the +// documentation and/or other materials provided with the distribution. +// +// 3. Neither the name of the Corporation nor the names of the +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY NTESS "AS IS" AND ANY +// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE +// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +// Questions? Contact Siva Rajamanickam (srajama@sandia.gov) +// +// ************************************************************************ +//@HEADER +*/ + +#include + +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#include +#include +#include "KokkosKernels_default_types.hpp" +#include "KokkosKernels_IOUtils.hpp" + +template +matrix_type generate_unbalanced_matrix(const typename matrix_type::ordinal_type numRows, + const typename matrix_type::ordinal_type numEntries, + const typename matrix_type::ordinal_type numLongRows, + const typename matrix_type::ordinal_type numLongEntries) { + + using Scalar = typename matrix_type::value_type; + using lno_t = typename matrix_type::ordinal_type; + + using row_map_type = typename matrix_type::row_map_type::non_const_type; + using entries_type = typename matrix_type::index_type::non_const_type; + using values_type = typename matrix_type::values_type::non_const_type; + + // Structure of the matrix: + // the last numLongRows will contain the highly connected rows + // the rest of the matrix will have a more classic sparse structure + // with numEntries per row. + + // Randomly pick the length of the rows using a normal distribution + std::mt19937 rand_generator(42); // Seed with 42 for reproducibility + std::normal_distribution row_dist{static_cast(numEntries), static_cast(std::sqrt(numEntries))}; + + std::vector permutation(numRows - numLongRows); + std::vector row_map_vec(numRows + 1); + row_map_vec[0] = 0; + for(lno_t rowIdx = 0; rowIdx < numRows - numLongRows; ++rowIdx) { + row_map_vec[rowIdx + 1] = row_map_vec[rowIdx] + static_cast(row_dist(rand_generator)); + + // also filling the permutation vector that will be used to construct long rows + permutation[rowIdx] = rowIdx; + } + + std::normal_distribution long_row_dist{static_cast(numLongEntries), static_cast(numLongEntries/2)}; + lno_t rand_number; + for(lno_t rowIdx = numRows - numLongRows; rowIdx < numRows; ++rowIdx) { + rand_number = static_cast(long_row_dist(rand_generator)); + row_map_vec[rowIdx + 1] = row_map_vec[rowIdx] + rand_number; + } + const lno_t numNNZ = row_map_vec[numRows]; + + std::vector colind_vec(row_map_vec[numRows]); + // We loop over the first part of the matrix and assume that the bandwidth is 0.01*numRows + // i.e. highly concentrated around digaonal + std::normal_distribution entry_dist{static_cast(0.0), static_cast(numRows/100)}; + for(lno_t rowIdx = 0; rowIdx < numRows - numLongRows; ++rowIdx) { + const lno_t rowLength = row_map_vec[rowIdx + 1] - row_map_vec[rowIdx]; + // Making the stencil symmetric because it looks a bit more like a regular discretization + for(lno_t entryIdx = 0; entryIdx < (rowLength / 2); ++entryIdx) { + colind_vec[row_map_vec[rowIdx] + entryIdx] = rowIdx - static_cast(entry_dist(rand_generator)); + colind_vec[row_map_vec[rowIdx + 1] - entryIdx - 1] = rowIdx + static_cast(entry_dist(rand_generator)); + } + // Add diagonal entry if row length is an odd number + if((rowLength % 2) == 1) { + colind_vec[row_map_vec[rowIdx] + rowLength / 2] = rowIdx; + } + } + + for(lno_t rowIdx = numRows - numLongRows; rowIdx < numRows; ++rowIdx) { + // Generate a random permutation + std::shuffle(permutation.begin(), permutation.end(), rand_generator); + + lno_t rowLength = row_map_vec[rowIdx + 1] - row_map_vec[rowIdx]; + for(lno_t entryIdx = 0; entryIdx < rowLength; ++entryIdx) { + colind_vec[row_map_vec[rowIdx] + entryIdx] = permutation[entryIdx]; + } + } + + row_map_type row_map("row map", numRows + 1); + entries_type entries("entries", numNNZ); + values_type values ("values", numNNZ); + + // Copy row map values to view + typename row_map_type::HostMirror row_map_h = Kokkos::create_mirror_view(row_map); + row_map_h(0) = 0; + for(lno_t rowIdx = 0; rowIdx < numRows; ++rowIdx) { + row_map_h(rowIdx + 1) = row_map_vec[rowIdx + 1]; + } + Kokkos::deep_copy(row_map, row_map_h); + + // Copy column indices to view + typename row_map_type::HostMirror entries_h = Kokkos::create_mirror_view(entries); + entries_h(0) = 0; + for(lno_t entryIdx = 0; entryIdx < numNNZ; ++entryIdx) { + entries_h(entryIdx) = colind_vec[entryIdx]; + } + Kokkos::deep_copy(entries, entries_h); + + // Fill the values view with 1.0 + Kokkos::deep_copy(values, 1.0); + + matrix_type unbalanced_matrix("unbalanced matrix", numRows, numRows, numNNZ, + values, row_map, entries); + + std::cout << std::endl; + std::cout << "Matrix statistics:" << std::endl + << " - average nnz per row: " << row_map_vec[numRows - numLongRows] / (numRows - numLongRows) << std::endl; + + return unbalanced_matrix; +} + +void print_help() { + printf("SPMV merge benchmark code written by Luc Berger-Vergiat.\n"); + printf("The goal is to test cusSPARSE's merge algorithm on imbalanced matrices."); + printf("Options:\n"); + printf(" --compare : Compare the performance of the merge algo with the default algo.\n"); + printf(" -l [LOOP] : How many spmv to run to aggregate average time. \n"); + printf(" -numRows : Number of rows the matrix will contain.\n"); + printf(" -numEntries : Number of entries per row.\n"); + printf(" -numLongRows : Number of rows that will contain more entries than the average.\n"); + printf(" -numLongEntries : Number of entries per row in the unbalanced rows.\n"); +} + +int main(int argc, char** argv) { + + using Scalar = default_scalar; + using lno_t = default_lno_t; + using size_type = default_size_type; + + bool compare = false; + lno_t loop = 100; + lno_t numRows = 175000; + lno_t numEntries = 15; + lno_t numLongRows = 4; + lno_t numLongEntries = 30000; + + if(argc == 1) { + print_help(); + return 0; + } + + for(int i = 0; i < argc; i++) { + if((strcmp(argv[i],"--compare" )==0)) {compare=true; continue;} + if((strcmp(argv[i],"-l" )==0)) {loop=atoi(argv[++i]); continue;} + if((strcmp(argv[i],"-numRows" )==0)) {numRows=atoi(argv[++i]); continue;} + if((strcmp(argv[i],"-numEntries" )==0)) {numEntries=atoi(argv[++i]); continue;} + if((strcmp(argv[i],"-numLongRows" )==0)) {numLongRows=atoi(argv[++i]); continue;} + if((strcmp(argv[i],"-numLongEntries" )==0)) {numLongEntries=atoi(argv[++i]); continue;} + if((strcmp(argv[i],"--help")==0) || (strcmp(argv[i],"-h")==0)) { + print_help(); + return 0; + } + } + + // We want an odd number of entries in all rows to generate a symmetric matrix + if((numEntries / 2) == 0) {++numEntries;} + if((numLongEntries / 2) == 0) {++numLongEntries;} + + std::cout << "Test parameters:" << std::endl + << " - loop: " << loop << std::endl + << " - compare: " << compare << std::endl + << " - numRows: " << numRows << std::endl + << " - numEntries: " << numEntries << std::endl + << " - numLongRows: " << numLongRows << std::endl + << " - numLongEntries: " << numLongEntries << std::endl; + + Kokkos::initialize(argc, argv); + + { + if(std::is_same::value) { + // Note that we template the matrix with entries=lno_t and offsets=lno_t to make sure + // it verifies the cusparse requirements + using matrix_type = KokkosSparse::CrsMatrix; + using values_type = typename matrix_type::values_type::non_const_type; + const Scalar SC_ONE = Kokkos::ArithTraits::one(); + const Scalar alpha = SC_ONE + SC_ONE; + const Scalar beta = alpha + SC_ONE; + + matrix_type test_matrix = generate_unbalanced_matrix(numRows, numEntries, numLongRows, numLongEntries); + + values_type y("right hand side", test_matrix.numRows()); + values_type x("left hand side", test_matrix.numCols()); + Kokkos::deep_copy(x, SC_ONE); + Kokkos::deep_copy(y, SC_ONE); + + KokkosKernels::Experimental::Controls controls; + controls.setParameter("algorithm", "merge"); + + // Perform a so called "warm-up" run + KokkosSparse::spmv(controls, "N", alpha, test_matrix, x, beta, y); + + double min_time = 1.0e32, max_time = 0.0, avg_time = 0.0; + for(int iterIdx = 0; iterIdx < loop; ++iterIdx) { + Kokkos::Timer timer; + KokkosSparse::spmv(controls, "N", alpha, test_matrix, x, beta, y); + Kokkos::fence(); + double time = timer.seconds(); + avg_time += time; + if(time>max_time) max_time = time; + if(timemax_time) max_time = time; + if(time(controls, "N", alpha, test_matrix, x, beta, y); + Kokkos::fence(); + double time = timer.seconds(); + avg_time += time; + if(time>max_time) max_time = time; + if(time n) { + if (m >= n) { Kokkos::parallel_for (Kokkos::TeamThreadRange(member,0,m),[&](const int &i) { SerialCopyInternal::invoke(n, A+i*as0, as1, B+i*bs0, bs1); diff --git a/packages/kokkos-kernels/src/batched/KokkosBatched_Trsv_Team_Internal.hpp b/packages/kokkos-kernels/src/batched/KokkosBatched_Trsv_Team_Internal.hpp index 1c9af468128b..c2adf7b8dc39 100644 --- a/packages/kokkos-kernels/src/batched/KokkosBatched_Trsv_Team_Internal.hpp +++ b/packages/kokkos-kernels/src/batched/KokkosBatched_Trsv_Team_Internal.hpp @@ -73,11 +73,12 @@ namespace KokkosBatched { if (!use_unit_diag) { const ValueType alpha11 = A[p*as0+p*as1]; local_beta1 = local_beta1 / alpha11; - + /// make sure all local beta1 is same for threads + member.team_barrier(); if (member.team_rank() == 0) *beta1 = local_beta1; } - member.team_barrier(); + ///member.team_barrier(); Kokkos::parallel_for(Kokkos::TeamThreadRange(member,0,iend),[&](const int &i) { b2[i*bs0] -= a21[i*as0] * local_beta1; }); @@ -197,12 +198,12 @@ namespace KokkosBatched { if (!use_unit_diag) { const ValueType alpha11 = A[p*as0+p*as1]; local_beta1 = local_beta1 / alpha11; - + /// make sure local beta is same for all threads + member.team_barrier(); if (member.team_rank() == 0) *beta1 = local_beta1; } - - member.team_barrier(); + //member.team_barrier(); Kokkos::parallel_for(Kokkos::TeamThreadRange(member,0,iend),[&](const int &i) { b0[i*bs0] -= a01[i*as0] * local_beta1; }); diff --git a/packages/kokkos-kernels/src/common/KokkosKernels_Controls.hpp b/packages/kokkos-kernels/src/common/KokkosKernels_Controls.hpp new file mode 100644 index 000000000000..f91d4c06158e --- /dev/null +++ b/packages/kokkos-kernels/src/common/KokkosKernels_Controls.hpp @@ -0,0 +1,145 @@ +/* +//@HEADER +// ************************************************************************ +// +// Kokkos v. 3.0 +// Copyright (2020) National Technology & Engineering +// Solutions of Sandia, LLC (NTESS). +// +// Under the terms of Contract DE-NA0003525 with NTESS, +// the U.S. Government retains certain rights in this software. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// 1. Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// +// 2. Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in the +// documentation and/or other materials provided with the distribution. +// +// 3. Neither the name of the Corporation nor the names of the +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY NTESS "AS IS" AND ANY +// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE +// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +// Questions? Contact Siva Rajamanickam (srajama@sandia.gov) +// +// ************************************************************************ +//@HEADER +*/ + + + +#ifndef _KOKKOSKERNEL_CONTROLS_HPP +#define _KOKKOSKERNEL_CONTROLS_HPP +/// \file KokkosKernels_Controls.hpp +/// \brief Mechanism to control internal behavior of kernels +/// \author Luc Berger-Vergiat (lberge@sandia.gov) + +#include +#include "KokkosKernels_config.h" +#include "KokkosKernels_tpl_handles_decl.hpp" + +// TPLS headers +#ifdef KOKKOSKERNELS_ENABLE_TPL_CUBLAS +#include "cublas_v2.h" +#endif + +#ifdef KOKKOSKERNELS_ENABLE_TPL_CUSPARSE +#include "cusparse.h" +#endif + +namespace KokkosKernels{ +namespace Experimental{ + + // Declaration of Controls class + class Controls { + + public: + // Constructor + Controls() = default; + + // set a new parameter + void setParameter(const std::string& name, const std::string& value) { + kernel_parameters[name] = value; + } + + // check if a parameter is already set + bool isParameter(const std::string& name) const { + bool return_value = false; + + auto search = kernel_parameters.find(name); + if(search != kernel_parameters.end()) { return_value = true; } + + return return_value; + } + + // retrieve the value associated with a parameter if it is already set + std::string getParameter(const std::string& name) const { + auto search = kernel_parameters.find(name); + std::string value; + if(search == kernel_parameters.end()) { + std::cout << "Parameter " << name << " was not found in the list of parameters!" << std::endl; + value = ""; + } else { + value = search->second; + } + return value; + } + +#ifdef KOKKOSKERNELS_ENABLE_TPL_CUBLAS + mutable cublasHandle_t cublasHandle = 0; + + cublasHandle_t getCublasHandle() const { + if(cublasHandle == 0) { + KokkosBlas::Impl::CudaBlasSingleton & s = KokkosBlas::Impl::CudaBlasSingleton::singleton(); + cublasHandle = s.handle; + } + return cublasHandle; + } + + void setCublasHandle(const cublasHandle_t userCublasHandle) { + cublasHandle = userCublasHandle; + } +#endif + +#ifdef KOKKOSKERNELS_ENABLE_TPL_CUSPARSE + mutable cusparseHandle_t cusparseHandle = 0; + + cusparseHandle_t getCusparseHandle() const { + if(cusparseHandle == 0) { + KokkosKernels::Impl::CusparseSingleton & s = + KokkosKernels::Impl::CusparseSingleton::singleton(); + cusparseHandle = s.cusparseHandle; + } + return cusparseHandle; + } + + void setCusparseHandle(const cusparseHandle_t userCusparseHandle) { + cusparseHandle = userCusparseHandle; + } +#endif + + private: + // storage for kernel parameters + std::unordered_map kernel_parameters; + }; + +} // namespace Experimental +} // namespace KokkosKernels + +#endif // _KOKKOSKERNEL_CONTROLS_HPP diff --git a/packages/kokkos-kernels/src/common/KokkosKernels_SparseUtils.hpp b/packages/kokkos-kernels/src/common/KokkosKernels_SparseUtils.hpp index b551b34f1540..16a336f20018 100644 --- a/packages/kokkos-kernels/src/common/KokkosKernels_SparseUtils.hpp +++ b/packages/kokkos-kernels/src/common/KokkosKernels_SparseUtils.hpp @@ -989,7 +989,9 @@ void sort_crs_matrix(const rowmap_t& rowmap, const entries_t& entries, const val //TODO (probably important for performnce): add thread-level sort also, and use that //for small avg degree. But this works for now. int teamSize = 1; - lno_t avgDeg = (entries.extent(0) + numRows - 1) / numRows; + lno_t avgDeg = 0; + if(numRows) + avgDeg = (entries.extent(0) + numRows - 1) / numRows; while(teamSize * 2 * 2 <= avgDeg) { teamSize *= 2; @@ -1041,7 +1043,9 @@ void sort_crs_graph(const rowmap_t& rowmap, const entries_t& entries) //TODO (probably important for performnce): add thread-level sort also, and use that //for small avg degree. But this works for now. int teamSize = 1; - lno_t avgDeg = (entries.extent(0) + numRows - 1) / numRows; + lno_t avgDeg = 0; + if(numRows) + avgDeg = (entries.extent(0) + numRows - 1) / numRows; while(teamSize * 2 * 2 <= avgDeg) { teamSize *= 2; diff --git a/packages/kokkos-kernels/src/impl/tpls/KokkosKernels_tpl_handles.cpp b/packages/kokkos-kernels/src/impl/tpls/KokkosKernels_tpl_handles.cpp new file mode 100644 index 000000000000..a856c1cdf376 --- /dev/null +++ b/packages/kokkos-kernels/src/impl/tpls/KokkosKernels_tpl_handles.cpp @@ -0,0 +1,46 @@ +/* +//@HEADER +// ************************************************************************ +// +// Kokkos v. 3.0 +// Copyright (2020) National Technology & Engineering +// Solutions of Sandia, LLC (NTESS). +// +// Under the terms of Contract DE-NA0003525 with NTESS, +// the U.S. Government retains certain rights in this software. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// 1. Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// +// 2. Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in the +// documentation and/or other materials provided with the distribution. +// +// 3. Neither the name of the Corporation nor the names of the +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY NTESS "AS IS" AND ANY +// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE +// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +// Questions? Contact Siva Rajamanickam (srajama@sandia.gov) +// +// ************************************************************************ +//@HEADER +*/ +#include +#include "KokkosKernels_config.h" +#include "KokkosKernels_tpl_handles_def.hpp" diff --git a/packages/kokkos-kernels/src/impl/tpls/KokkosKernels_tpl_handles_decl.hpp b/packages/kokkos-kernels/src/impl/tpls/KokkosKernels_tpl_handles_decl.hpp new file mode 100644 index 000000000000..132bbb24f48d --- /dev/null +++ b/packages/kokkos-kernels/src/impl/tpls/KokkosKernels_tpl_handles_decl.hpp @@ -0,0 +1,68 @@ +/* +//@HEADER +// ************************************************************************ +// +// Kokkos v. 3.0 +// Copyright (2020) National Technology & Engineering +// Solutions of Sandia, LLC (NTESS). +// +// Under the terms of Contract DE-NA0003525 with NTESS, +// the U.S. Government retains certain rights in this software. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// 1. Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// +// 2. Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in the +// documentation and/or other materials provided with the distribution. +// +// 3. Neither the name of the Corporation nor the names of the +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY NTESS "AS IS" AND ANY +// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE +// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +// Questions? Contact Siva Rajamanickam (srajama@sandia.gov) +// +// ************************************************************************ +//@HEADER +*/ + +#ifndef KOKKOSKERNELS_TPL_HANDLES_DECL_HPP_ +#define KOKKOSKERNELS_TPL_HANDLES_DECL_HPP_ + +#include "KokkosBlas_tpl_spec.hpp" + +#ifdef KOKKOSKERNELS_ENABLE_TPL_CUSPARSE +#include "KokkosKernels_SparseUtils_cusparse.hpp" + +namespace KokkosKernels{ +namespace Impl{ + +struct CusparseSingleton { + cusparseHandle_t cusparseHandle; + + CusparseSingleton(); + + static CusparseSingleton & singleton(); +}; + +} // namespace Impl +} // namespace KokkosKernels +#endif + +#endif // KOKKOSKERNELS_TPL_HANDLES_DECL_HPP_ diff --git a/packages/kokkos-kernels/src/impl/tpls/KokkosKernels_tpl_handles_def.hpp b/packages/kokkos-kernels/src/impl/tpls/KokkosKernels_tpl_handles_def.hpp new file mode 100644 index 000000000000..5d789abbbc05 --- /dev/null +++ b/packages/kokkos-kernels/src/impl/tpls/KokkosKernels_tpl_handles_def.hpp @@ -0,0 +1,72 @@ +/* +//@HEADER +// ************************************************************************ +// +// Kokkos v. 3.0 +// Copyright (2020) National Technology & Engineering +// Solutions of Sandia, LLC (NTESS). +// +// Under the terms of Contract DE-NA0003525 with NTESS, +// the U.S. Government retains certain rights in this software. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// 1. Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// +// 2. Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in the +// documentation and/or other materials provided with the distribution. +// +// 3. Neither the name of the Corporation nor the names of the +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY NTESS "AS IS" AND ANY +// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE +// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +// Questions? Contact Siva Rajamanickam (srajama@sandia.gov) +// +// ************************************************************************ +//@HEADER +*/ + +#ifndef KOKKOSKERNELS_TPL_HANDLES_DEF_HPP_ +#define KOKKOSKERNELS_TPL_HANDLES_DEF_HPP_ + +#ifdef KOKKOSKERNELS_ENABLE_TPL_CUSPARSE +#include "cusparse.h" +#include "KokkosKernels_tpl_handles_decl.hpp" + +namespace KokkosKernels{ +namespace Impl{ + +CusparseSingleton::CusparseSingleton() { + KOKKOS_CUSPARSE_SAFE_CALL(cusparseCreate(&cusparseHandle)); + + Kokkos::push_finalize_hook ([&] () { + cusparseDestroy(cusparseHandle); + }); +} + +CusparseSingleton & CusparseSingleton::singleton() { + static CusparseSingleton s ; + return s ; +} + +} // namespace Impl +} // namespace KokkosKernels +#endif + +#endif // KOKKOSKERNELS_TPL_HANDLES_DEF_HPP_ diff --git a/packages/kokkos-kernels/src/impl/tpls/KokkosSparse_spmv_tpl_spec_avail.hpp b/packages/kokkos-kernels/src/impl/tpls/KokkosSparse_spmv_tpl_spec_avail.hpp index c0116c661c0f..623cd52e3e2e 100644 --- a/packages/kokkos-kernels/src/impl/tpls/KokkosSparse_spmv_tpl_spec_avail.hpp +++ b/packages/kokkos-kernels/src/impl/tpls/KokkosSparse_spmv_tpl_spec_avail.hpp @@ -56,46 +56,256 @@ struct spmv_tpl_spec_avail { }; // cuSPARSE -#if defined (KOKKOSKERNELS_ENABLE_TPL_CUSPARSE) && (9000 <= CUDA_VERSION) +#ifdef KOKKOSKERNELS_ENABLE_TPL_CUSPARSE -#define KOKKOSSPARSE_SPMV_TPL_SPEC_AVAIL_CUSPARSE(SCALAR, XL, YL, MEMSPACE) \ +//These versions of cuSPARSE require the ordinal and offset types to be the same. +//For KokkosKernels, this means int/int only. + +#define KOKKOSSPARSE_SPMV_TPL_SPEC_AVAIL_CUSPARSE(SCALAR, ORDINAL, OFFSET, XL, YL, MEMSPACE) \ template <> \ -struct spmv_tpl_spec_avail, Kokkos::MemoryTraits, const int, \ +struct spmv_tpl_spec_avail, Kokkos::MemoryTraits, const OFFSET, \ const SCALAR*, XL, Kokkos::Device, Kokkos::MemoryTraits, \ SCALAR*, YL, Kokkos::Device, Kokkos::MemoryTraits > { \ enum : bool { value = true }; \ }; +#if (9000 <= CUDA_VERSION) + #if defined (KOKKOSKERNELS_INST_FLOAT) \ && defined (KOKKOSKERNELS_INST_LAYOUTLEFT) \ && defined (KOKKOSKERNELS_INST_ORDINAL_INT) \ && defined (KOKKOSKERNELS_INST_OFFSET_INT) - KOKKOSSPARSE_SPMV_TPL_SPEC_AVAIL_CUSPARSE(float, Kokkos::LayoutLeft, Kokkos::LayoutLeft, Kokkos::CudaSpace) + KOKKOSSPARSE_SPMV_TPL_SPEC_AVAIL_CUSPARSE(float, int, int, Kokkos::LayoutLeft, Kokkos::LayoutLeft, Kokkos::CudaSpace) #endif #if defined (KOKKOSKERNELS_INST_DOUBLE) \ && defined (KOKKOSKERNELS_INST_LAYOUTLEFT) \ && defined (KOKKOSKERNELS_INST_ORDINAL_INT) \ && defined (KOKKOSKERNELS_INST_OFFSET_INT) - KOKKOSSPARSE_SPMV_TPL_SPEC_AVAIL_CUSPARSE(double, Kokkos::LayoutLeft, Kokkos::LayoutLeft, Kokkos::CudaSpace) + KOKKOSSPARSE_SPMV_TPL_SPEC_AVAIL_CUSPARSE(double, int, int, Kokkos::LayoutLeft, Kokkos::LayoutLeft, Kokkos::CudaSpace) #endif #if defined (KOKKOSKERNELS_INST_FLOAT) \ && defined (KOKKOSKERNELS_INST_LAYOUTRIGHT) \ && defined (KOKKOSKERNELS_INST_ORDINAL_INT) \ && defined (KOKKOSKERNELS_INST_OFFSET_INT) - KOKKOSSPARSE_SPMV_TPL_SPEC_AVAIL_CUSPARSE(float, Kokkos::LayoutRight, Kokkos::LayoutRight, Kokkos::CudaSpace) + KOKKOSSPARSE_SPMV_TPL_SPEC_AVAIL_CUSPARSE(float, int, int, Kokkos::LayoutRight, Kokkos::LayoutRight, Kokkos::CudaSpace) +#endif + +#if defined (KOKKOSKERNELS_INST_DOUBLE) \ + && defined (KOKKOSKERNELS_INST_LAYOUTRIGHT) \ + && defined (KOKKOSKERNELS_INST_ORDINAL_INT) \ + && defined (KOKKOSKERNELS_INST_OFFSET_INT) + KOKKOSSPARSE_SPMV_TPL_SPEC_AVAIL_CUSPARSE(double, int, int, Kokkos::LayoutRight, Kokkos::LayoutRight, Kokkos::CudaSpace) +#endif + +#if defined (KOKKOSKERNELS_INST_FLOAT) \ + && defined (KOKKOSKERNELS_INST_LAYOUTLEFT) \ + && defined (KOKKOSKERNELS_INST_ORDINAL_INT) \ + && defined (KOKKOSKERNELS_INST_OFFSET_INT) + KOKKOSSPARSE_SPMV_TPL_SPEC_AVAIL_CUSPARSE(float, int, int, Kokkos::LayoutLeft, Kokkos::LayoutLeft, Kokkos::CudaUVMSpace) #endif #if defined (KOKKOSKERNELS_INST_DOUBLE) \ + && defined (KOKKOSKERNELS_INST_LAYOUTLEFT) \ + && defined (KOKKOSKERNELS_INST_ORDINAL_INT) \ + && defined (KOKKOSKERNELS_INST_OFFSET_INT) + KOKKOSSPARSE_SPMV_TPL_SPEC_AVAIL_CUSPARSE(double, int, int, Kokkos::LayoutLeft, Kokkos::LayoutLeft, Kokkos::CudaUVMSpace) +#endif + +#if defined (KOKKOSKERNELS_INST_FLOAT) \ + && defined (KOKKOSKERNELS_INST_LAYOUTRIGHT) \ + && defined (KOKKOSKERNELS_INST_ORDINAL_INT) \ + && defined (KOKKOSKERNELS_INST_OFFSET_INT) + KOKKOSSPARSE_SPMV_TPL_SPEC_AVAIL_CUSPARSE(float, int, int, Kokkos::LayoutRight, Kokkos::LayoutRight, Kokkos::CudaUVMSpace) +#endif + +#if defined (KOKKOSKERNELS_INST_DOUBLE) \ + && defined (KOKKOSKERNELS_INST_LAYOUTRIGHT) \ + && defined (KOKKOSKERNELS_INST_ORDINAL_INT) \ + && defined (KOKKOSKERNELS_INST_OFFSET_INT) + KOKKOSSPARSE_SPMV_TPL_SPEC_AVAIL_CUSPARSE(double, int, int, Kokkos::LayoutRight, Kokkos::LayoutRight, Kokkos::CudaUVMSpace) +#endif + +#if defined (KOKKOSKERNELS_INST_KOKKOS_COMPLEX_FLOAT_) \ + && defined (KOKKOSKERNELS_INST_LAYOUTLEFT) \ + && defined (KOKKOSKERNELS_INST_ORDINAL_INT) \ + && defined (KOKKOSKERNELS_INST_OFFSET_INT) + KOKKOSSPARSE_SPMV_TPL_SPEC_AVAIL_CUSPARSE(Kokkos::complex, int, int, Kokkos::LayoutLeft, Kokkos::LayoutLeft, Kokkos::CudaSpace) +#endif + +#if defined (KOKKOSKERNELS_INST_KOKKOS_COMPLEX_DOUBLE_) \ + && defined (KOKKOSKERNELS_INST_LAYOUTLEFT) \ + && defined (KOKKOSKERNELS_INST_ORDINAL_INT) \ + && defined (KOKKOSKERNELS_INST_OFFSET_INT) + KOKKOSSPARSE_SPMV_TPL_SPEC_AVAIL_CUSPARSE(Kokkos::complex, int, int, Kokkos::LayoutLeft, Kokkos::LayoutLeft, Kokkos::CudaSpace) +#endif + +#if defined (KOKKOSKERNELS_INST_KOKKOS_COMPLEX_FLOAT_) \ && defined (KOKKOSKERNELS_INST_LAYOUTRIGHT) \ && defined (KOKKOSKERNELS_INST_ORDINAL_INT) \ && defined (KOKKOSKERNELS_INST_OFFSET_INT) - KOKKOSSPARSE_SPMV_TPL_SPEC_AVAIL_CUSPARSE(double, Kokkos::LayoutRight, Kokkos::LayoutRight, Kokkos::CudaSpace) + KOKKOSSPARSE_SPMV_TPL_SPEC_AVAIL_CUSPARSE(Kokkos::complex, int, int, Kokkos::LayoutRight, Kokkos::LayoutRight, Kokkos::CudaSpace) #endif +#if defined (KOKKOSKERNELS_INST_KOKKOS_COMPLEX_DOUBLE_) \ + && defined (KOKKOSKERNELS_INST_LAYOUTRIGHT) \ + && defined (KOKKOSKERNELS_INST_ORDINAL_INT) \ + && defined (KOKKOSKERNELS_INST_OFFSET_INT) + KOKKOSSPARSE_SPMV_TPL_SPEC_AVAIL_CUSPARSE(Kokkos::complex, int, int, Kokkos::LayoutRight, Kokkos::LayoutRight, Kokkos::CudaSpace) #endif +#if defined (KOKKOSKERNELS_INST_KOKKOS_COMPLEX_FLOAT_) \ + && defined (KOKKOSKERNELS_INST_LAYOUTLEFT) \ + && defined (KOKKOSKERNELS_INST_ORDINAL_INT) \ + && defined (KOKKOSKERNELS_INST_OFFSET_INT) + KOKKOSSPARSE_SPMV_TPL_SPEC_AVAIL_CUSPARSE(Kokkos::complex, int, int, Kokkos::LayoutLeft, Kokkos::LayoutLeft, Kokkos::CudaUVMSpace) +#endif + +#if defined (KOKKOSKERNELS_INST_KOKKOS_COMPLEX_DOUBLE_) \ + && defined (KOKKOSKERNELS_INST_LAYOUTLEFT) \ + && defined (KOKKOSKERNELS_INST_ORDINAL_INT) \ + && defined (KOKKOSKERNELS_INST_OFFSET_INT) + KOKKOSSPARSE_SPMV_TPL_SPEC_AVAIL_CUSPARSE(Kokkos::complex, int, int, Kokkos::LayoutLeft, Kokkos::LayoutLeft, Kokkos::CudaUVMSpace) +#endif + +#if defined (KOKKOSKERNELS_INST_KOKKOS_COMPLEX_FLOAT_) \ + && defined (KOKKOSKERNELS_INST_LAYOUTRIGHT) \ + && defined (KOKKOSKERNELS_INST_ORDINAL_INT) \ + && defined (KOKKOSKERNELS_INST_OFFSET_INT) + KOKKOSSPARSE_SPMV_TPL_SPEC_AVAIL_CUSPARSE(Kokkos::complex, int, int, Kokkos::LayoutRight, Kokkos::LayoutRight, Kokkos::CudaUVMSpace) +#endif + +#if defined (KOKKOSKERNELS_INST_KOKKOS_COMPLEX_DOUBLE_) \ + && defined (KOKKOSKERNELS_INST_LAYOUTRIGHT) \ + && defined (KOKKOSKERNELS_INST_ORDINAL_INT) \ + && defined (KOKKOSKERNELS_INST_OFFSET_INT) + KOKKOSSPARSE_SPMV_TPL_SPEC_AVAIL_CUSPARSE(Kokkos::complex, int, int, Kokkos::LayoutRight, Kokkos::LayoutRight, Kokkos::CudaUVMSpace) +#endif + +//CUDA_VERSION by itself cannot determine whether the generic cuSPARSE API is available: +//cuSPARSE version 10.1.105 does not have the generic API, but it comes with the same CUDA_VERSION (10010) as 10.1.243 which does. +#if defined(CUSPARSE_VERSION) && (CUSPARSE_VERSION >= 10300) + +//Can enable int64/size_t. +//TODO: if Nvidia ever supports int/size_t, add that too. + +#if defined (KOKKOSKERNELS_INST_FLOAT) \ + && defined (KOKKOSKERNELS_INST_LAYOUTLEFT) \ + && defined (KOKKOSKERNELS_INST_ORDINAL_INT64_T) \ + && defined (KOKKOSKERNELS_INST_OFFSET_SIZE_T) + KOKKOSSPARSE_SPMV_TPL_SPEC_AVAIL_CUSPARSE(float, int64_t, size_t, Kokkos::LayoutLeft, Kokkos::LayoutLeft, Kokkos::CudaSpace) +#endif + +#if defined (KOKKOSKERNELS_INST_DOUBLE) \ + && defined (KOKKOSKERNELS_INST_LAYOUTLEFT) \ + && defined (KOKKOSKERNELS_INST_ORDINAL_INT64_T) \ + && defined (KOKKOSKERNELS_INST_OFFSET_SIZE_T) + KOKKOSSPARSE_SPMV_TPL_SPEC_AVAIL_CUSPARSE(double, int64_t, size_t, Kokkos::LayoutLeft, Kokkos::LayoutLeft, Kokkos::CudaSpace) +#endif + +#if defined (KOKKOSKERNELS_INST_FLOAT) \ + && defined (KOKKOSKERNELS_INST_LAYOUTRIGHT) \ + && defined (KOKKOSKERNELS_INST_ORDINAL_INT64_T) \ + && defined (KOKKOSKERNELS_INST_OFFSET_SIZE_T) + KOKKOSSPARSE_SPMV_TPL_SPEC_AVAIL_CUSPARSE(float, int64_t, size_t, Kokkos::LayoutRight, Kokkos::LayoutRight, Kokkos::CudaSpace) +#endif + +#if defined (KOKKOSKERNELS_INST_DOUBLE) \ + && defined (KOKKOSKERNELS_INST_LAYOUTRIGHT) \ + && defined (KOKKOSKERNELS_INST_ORDINAL_INT64_T) \ + && defined (KOKKOSKERNELS_INST_OFFSET_SIZE_T) + KOKKOSSPARSE_SPMV_TPL_SPEC_AVAIL_CUSPARSE(double, int64_t, size_t, Kokkos::LayoutRight, Kokkos::LayoutRight, Kokkos::CudaSpace) +#endif + +#if defined (KOKKOSKERNELS_INST_FLOAT) \ + && defined (KOKKOSKERNELS_INST_LAYOUTLEFT) \ + && defined (KOKKOSKERNELS_INST_ORDINAL_INT64_T) \ + && defined (KOKKOSKERNELS_INST_OFFSET_SIZE_T) + KOKKOSSPARSE_SPMV_TPL_SPEC_AVAIL_CUSPARSE(float, int64_t, size_t, Kokkos::LayoutLeft, Kokkos::LayoutLeft, Kokkos::CudaUVMSpace) +#endif + +#if defined (KOKKOSKERNELS_INST_DOUBLE) \ + && defined (KOKKOSKERNELS_INST_LAYOUTLEFT) \ + && defined (KOKKOSKERNELS_INST_ORDINAL_INT64_T) \ + && defined (KOKKOSKERNELS_INST_OFFSET_SIZE_T) + KOKKOSSPARSE_SPMV_TPL_SPEC_AVAIL_CUSPARSE(double, int64_t, size_t, Kokkos::LayoutLeft, Kokkos::LayoutLeft, Kokkos::CudaUVMSpace) +#endif + +#if defined (KOKKOSKERNELS_INST_FLOAT) \ + && defined (KOKKOSKERNELS_INST_LAYOUTRIGHT) \ + && defined (KOKKOSKERNELS_INST_ORDINAL_INT64_T) \ + && defined (KOKKOSKERNELS_INST_OFFSET_SIZE_T) + KOKKOSSPARSE_SPMV_TPL_SPEC_AVAIL_CUSPARSE(float, int64_t, size_t, Kokkos::LayoutRight, Kokkos::LayoutRight, Kokkos::CudaUVMSpace) +#endif + +#if defined (KOKKOSKERNELS_INST_DOUBLE) \ + && defined (KOKKOSKERNELS_INST_LAYOUTRIGHT) \ + && defined (KOKKOSKERNELS_INST_ORDINAL_INT64_T) \ + && defined (KOKKOSKERNELS_INST_OFFSET_SIZE_T) + KOKKOSSPARSE_SPMV_TPL_SPEC_AVAIL_CUSPARSE(double, int64_t, size_t, Kokkos::LayoutRight, Kokkos::LayoutRight, Kokkos::CudaUVMSpace) +#endif + +#if defined (KOKKOSKERNELS_INST_KOKKOS_COMPLEX_FLOAT_) \ + && defined (KOKKOSKERNELS_INST_LAYOUTLEFT) \ + && defined (KOKKOSKERNELS_INST_ORDINAL_INT64_T) \ + && defined (KOKKOSKERNELS_INST_OFFSET_SIZE_T) + KOKKOSSPARSE_SPMV_TPL_SPEC_AVAIL_CUSPARSE(Kokkos::complex, int64_t, size_t, Kokkos::LayoutLeft, Kokkos::LayoutLeft, Kokkos::CudaSpace) +#endif + +#if defined (KOKKOSKERNELS_INST_KOKKOS_COMPLEX_DOUBLE_) \ + && defined (KOKKOSKERNELS_INST_LAYOUTLEFT) \ + && defined (KOKKOSKERNELS_INST_ORDINAL_INT64_T) \ + && defined (KOKKOSKERNELS_INST_OFFSET_SIZE_T) + KOKKOSSPARSE_SPMV_TPL_SPEC_AVAIL_CUSPARSE(Kokkos::complex, int64_t, size_t, Kokkos::LayoutLeft, Kokkos::LayoutLeft, Kokkos::CudaSpace) +#endif + +#if defined (KOKKOSKERNELS_INST_KOKKOS_COMPLEX_FLOAT_) \ + && defined (KOKKOSKERNELS_INST_LAYOUTRIGHT) \ + && defined (KOKKOSKERNELS_INST_ORDINAL_INT64_T) \ + && defined (KOKKOSKERNELS_INST_OFFSET_SIZE_T) + KOKKOSSPARSE_SPMV_TPL_SPEC_AVAIL_CUSPARSE(Kokkos::complex, int64_t, size_t, Kokkos::LayoutRight, Kokkos::LayoutRight, Kokkos::CudaSpace) +#endif + +#if defined (KOKKOSKERNELS_INST_KOKKOS_COMPLEX_DOUBLE_) \ + && defined (KOKKOSKERNELS_INST_LAYOUTRIGHT) \ + && defined (KOKKOSKERNELS_INST_ORDINAL_INT64_T) \ + && defined (KOKKOSKERNELS_INST_OFFSET_SIZE_T) + KOKKOSSPARSE_SPMV_TPL_SPEC_AVAIL_CUSPARSE(Kokkos::complex, int64_t, size_t, Kokkos::LayoutRight, Kokkos::LayoutRight, Kokkos::CudaSpace) +#endif + +#if defined (KOKKOSKERNELS_INST_KOKKOS_COMPLEX_FLOAT_) \ + && defined (KOKKOSKERNELS_INST_LAYOUTLEFT) \ + && defined (KOKKOSKERNELS_INST_ORDINAL_INT64_T) \ + && defined (KOKKOSKERNELS_INST_OFFSET_SIZE_T) + KOKKOSSPARSE_SPMV_TPL_SPEC_AVAIL_CUSPARSE(Kokkos::complex, int64_t, size_t, Kokkos::LayoutLeft, Kokkos::LayoutLeft, Kokkos::CudaUVMSpace) +#endif + +#if defined (KOKKOSKERNELS_INST_KOKKOS_COMPLEX_DOUBLE_) \ + && defined (KOKKOSKERNELS_INST_LAYOUTLEFT) \ + && defined (KOKKOSKERNELS_INST_ORDINAL_INT64_T) \ + && defined (KOKKOSKERNELS_INST_OFFSET_SIZE_T) + KOKKOSSPARSE_SPMV_TPL_SPEC_AVAIL_CUSPARSE(Kokkos::complex, int64_t, size_t, Kokkos::LayoutLeft, Kokkos::LayoutLeft, Kokkos::CudaUVMSpace) +#endif + +#if defined (KOKKOSKERNELS_INST_KOKKOS_COMPLEX_FLOAT_) \ + && defined (KOKKOSKERNELS_INST_LAYOUTRIGHT) \ + && defined (KOKKOSKERNELS_INST_ORDINAL_INT64_T) \ + && defined (KOKKOSKERNELS_INST_OFFSET_SIZE_T) + KOKKOSSPARSE_SPMV_TPL_SPEC_AVAIL_CUSPARSE(Kokkos::complex, int64_t, size_t, Kokkos::LayoutRight, Kokkos::LayoutRight, Kokkos::CudaUVMSpace) +#endif + +#if defined (KOKKOSKERNELS_INST_KOKKOS_COMPLEX_DOUBLE_) \ + && defined (KOKKOSKERNELS_INST_LAYOUTRIGHT) \ + && defined (KOKKOSKERNELS_INST_ORDINAL_INT64_T) \ + && defined (KOKKOSKERNELS_INST_OFFSET_SIZE_T) + KOKKOSSPARSE_SPMV_TPL_SPEC_AVAIL_CUSPARSE(Kokkos::complex, int64_t, size_t, Kokkos::LayoutRight, Kokkos::LayoutRight, Kokkos::CudaUVMSpace) +#endif + +#endif // CUSPARSE >= 10.3 (nested, implies >= 9.0) +#endif // CUDA/CUSPARSE >= 9.0? +#endif // KOKKOSKERNELS_ENABLE_TPL_CUSPARSE + // Specialization struct which defines whether a specialization exists template - void spmv_cusparse(const char mode[], + void spmv_native(const KokkosKernels::Experimental::Controls& controls, + const char mode[], + typename YVector::non_const_value_type const & alpha, + const AMatrix& A, + const XVector& x, + typename YVector::non_const_value_type const & beta, + const YVector& y) { + using KAT = Kokkos::Details::ArithTraits; + + std::cout << "It is currently not possible to use the native SpMV implementation" + " when cuSPARSE is enabled" << std::endl; + } + + template + void spmv_cusparse(const KokkosKernels::Experimental::Controls& controls, + const char mode[], typename YVector::non_const_value_type const & alpha, const AMatrix& A, const XVector& x, typename YVector::non_const_value_type const & beta, const YVector& y) { - using offset_type = typename AMatrix::non_const_size_type; - using value_type = typename AMatrix::non_const_value_type; + using offset_type = typename AMatrix::non_const_size_type; + using entry_type = typename AMatrix::non_const_ordinal_type; + using value_type = typename AMatrix::non_const_value_type; /* initialize cusparse library */ - cusparseHandle_t cusparseHandle = 0; - KOKKOS_CUSPARSE_SAFE_CALL(cusparseCreate(&cusparseHandle)); + cusparseHandle_t cusparseHandle = controls.getCusparseHandle(); /* Set the operation mode */ cusparseOperation_t myCusparseOperation = CUSPARSE_OPERATION_NON_TRANSPOSE; if(mode[0] == Transpose[0]) {myCusparseOperation = CUSPARSE_OPERATION_TRANSPOSE;} + else if(mode[0] == ConjugateTranspose[0]) {myCusparseOperation = CUSPARSE_OPERATION_CONJUGATE_TRANSPOSE;} #if defined(CUSPARSE_VERSION) && (10300 <= CUSPARSE_VERSION) /* Check that cusparse can handle the types of the input Kokkos::CrsMatrix */ - cusparseIndexType_t myCusparseIndexType; - if(std::is_same::value) {myCusparseIndexType = CUSPARSE_INDEX_32I;} - if(std::is_same::value) {myCusparseIndexType = CUSPARSE_INDEX_64I;} + cusparseIndexType_t myCusparseOffsetType; + if(std::is_same::value) + myCusparseOffsetType = CUSPARSE_INDEX_32I; + else if(std::is_same::value || std::is_same::value) + myCusparseOffsetType = CUSPARSE_INDEX_64I; + else + throw std::logic_error("Offset type of CrsMatrix isn't supported by cuSPARSE, yet TPL layer says it is"); + cusparseIndexType_t myCusparseEntryType; + if(std::is_same::value) + myCusparseEntryType = CUSPARSE_INDEX_32I; + else if(std::is_same::value) + myCusparseEntryType = CUSPARSE_INDEX_64I; + else + throw std::logic_error("Ordinal (entry) type of CrsMatrix isn't supported by cuSPARSE, yet TPL layer says it is"); cudaDataType myCudaDataType; - if(std::is_same::value) {myCudaDataType = CUDA_R_32F;} - if(std::is_same::value) {myCudaDataType = CUDA_R_64F;} + if(std::is_same::value) + myCudaDataType = CUDA_R_32F; + else if(std::is_same::value) + myCudaDataType = CUDA_R_64F; + else if(std::is_same>::value) + myCudaDataType = CUDA_C_32F; + else if(std::is_same>::value) + myCudaDataType = CUDA_C_64F; + else + throw std::logic_error("Scalar (data) type of CrsMatrix isn't supported by cuSPARSE, yet TPL layer says it is"); /* create matrix */ cusparseSpMatDescr_t A_cusparse; KOKKOS_CUSPARSE_SAFE_CALL(cusparseCreateCsr(&A_cusparse, A.numRows(), A.numCols(), A.nnz(), - const_cast(A.graph.row_map.data()), - const_cast(A.graph.entries.data()), - const_cast(A.values.data()), - myCusparseIndexType, - myCusparseIndexType, + (void*) A.graph.row_map.data(), + (void*) A.graph.entries.data(), + (void*) A.values.data(), + myCusparseOffsetType, + myCusparseEntryType, CUSPARSE_INDEX_BASE_ZERO, myCudaDataType)); /* create lhs and rhs */ cusparseDnVecDescr_t vecX, vecY; - KOKKOS_CUSPARSE_SAFE_CALL(cusparseCreateDnVec(&vecX, x.extent_int(0), const_cast(x.data()), myCudaDataType)); - KOKKOS_CUSPARSE_SAFE_CALL(cusparseCreateDnVec(&vecY, y.extent_int(0), const_cast(y.data()), myCudaDataType)); + KOKKOS_CUSPARSE_SAFE_CALL(cusparseCreateDnVec(&vecX, x.extent_int(0), (void*) x.data(), myCudaDataType)); + KOKKOS_CUSPARSE_SAFE_CALL(cusparseCreateDnVec(&vecY, y.extent_int(0), (void*) y.data(), myCudaDataType)); - size_t bufferSize = 0; - void* dBuffer = NULL; + size_t bufferSize = 0; + void* dBuffer = NULL; + cusparseSpMVAlg_t alg = CUSPARSE_MV_ALG_DEFAULT; + if(controls.isParameter("algorithm")) + { + const std::string algName = controls.getParameter("algorithm"); + if(algName == "default") + alg = CUSPARSE_MV_ALG_DEFAULT; + else if(algName == "merge") + alg = CUSPARSE_CSRMV_ALG2; + } KOKKOS_CUSPARSE_SAFE_CALL(cusparseSpMV_bufferSize(cusparseHandle, myCusparseOperation, &alpha, A_cusparse, vecX, &beta, vecY, myCudaDataType, - CUSPARSE_CSRMV_ALG1, &bufferSize)); + alg, &bufferSize)); CUDA_SAFE_CALL(cudaMalloc(&dBuffer, bufferSize)); /* perform SpMV */ KOKKOS_CUSPARSE_SAFE_CALL(cusparseSpMV(cusparseHandle, myCusparseOperation, &alpha, A_cusparse, vecX, &beta, vecY, myCudaDataType, - CUSPARSE_CSRMV_ALG1, dBuffer)); + alg, dBuffer)); CUDA_SAFE_CALL(cudaFree(dBuffer)); KOKKOS_CUSPARSE_SAFE_CALL(cusparseDestroyDnVec(vecX)); KOKKOS_CUSPARSE_SAFE_CALL(cusparseDestroyDnVec(vecY)); KOKKOS_CUSPARSE_SAFE_CALL(cusparseDestroySpMat(A_cusparse)); -#else + +#elif (9000 <= CUDA_VERSION) /* create and set the matrix descriptor */ cusparseMatDescr_t descrA = 0; @@ -126,12 +172,12 @@ namespace Impl { if (std::is_same::value) { KOKKOS_CUSPARSE_SAFE_CALL(cusparseScsrmv(cusparseHandle, myCusparseOperation, A.numRows(), A.numCols(), A.nnz(), - reinterpret_cast(&alpha), descrA, - reinterpret_cast(A.values.data()), + reinterpret_cast(&alpha), descrA, + reinterpret_cast(A.values.data()), A.graph.row_map.data(), A.graph.entries.data(), - reinterpret_cast(x.data()), - reinterpret_cast(&beta), - reinterpret_cast(y.data()) )); + reinterpret_cast(x.data()), + reinterpret_cast(&beta), + reinterpret_cast(y.data()))); } else if (std::is_same::value) { KOKKOS_CUSPARSE_SAFE_CALL(cusparseDcsrmv(cusparseHandle, myCusparseOperation, @@ -141,56 +187,108 @@ namespace Impl { A.graph.row_map.data(), A.graph.entries.data(), reinterpret_cast(x.data()), reinterpret_cast(&beta), - reinterpret_cast(y.data()) )); + reinterpret_cast(y.data()))); + } else if (std::is_same>::value) { + KOKKOS_CUSPARSE_SAFE_CALL(cusparseCcsrmv(cusparseHandle, myCusparseOperation, + A.numRows(), A.numCols(), A.nnz(), + reinterpret_cast(&alpha), descrA, + reinterpret_cast(A.values.data()), + A.graph.row_map.data(), A.graph.entries.data(), + reinterpret_cast(x.data()), + reinterpret_cast(&beta), + reinterpret_cast(y.data()))); + } else if (std::is_same>::value) { + KOKKOS_CUSPARSE_SAFE_CALL(cusparseZcsrmv(cusparseHandle, myCusparseOperation, + A.numRows(), A.numCols(), A.nnz(), + reinterpret_cast(&alpha), descrA, + reinterpret_cast(A.values.data()), + A.graph.row_map.data(), A.graph.entries.data(), + reinterpret_cast(x.data()), + reinterpret_cast(&beta), + reinterpret_cast(y.data()))); } else { - throw std::logic_error("Trying to call cusparse SpMV with a scalar type that is not float or double!"); + throw std::logic_error("Trying to call cusparse SpMV with a scalar type not float/double, nor complex of either!"); } } else { - throw std::logic_error("Trying to call cusparse SpMV with an offset type that is not int!"); + throw std::logic_error("With cuSPARSE pre-10.0, offset type must be int. Something wrong with TPL avail logic."); } KOKKOS_CUSPARSE_SAFE_CALL(cusparseDestroyMatDescr(descrA)); -#endif // CUSPARSE_VERSION - - KOKKOS_CUSPARSE_SAFE_CALL(cusparseDestroy(cusparseHandle)); - cusparseHandle = 0; +#endif // CUDA_VERSION } -#define KOKKOSSPARSE_SPMV_CUSPARSE(SCALAR, OFFSET, LAYOUT, COMPILE_LIBRARY) \ +#define KOKKOSSPARSE_SPMV_CUSPARSE(SCALAR, ORDINAL, OFFSET, LAYOUT, SPACE, COMPILE_LIBRARY) \ template<> \ - struct SPMV, Kokkos::MemoryTraits, OFFSET const, \ - SCALAR const*, LAYOUT, Kokkos::Device, Kokkos::MemoryTraits, \ - SCALAR*, LAYOUT, Kokkos::Device, Kokkos::MemoryTraits, \ - true, COMPILE_LIBRARY> { \ - using device_type = Kokkos::Device; \ + struct SPMV, Kokkos::MemoryTraits, OFFSET const, \ + SCALAR const*, LAYOUT, Kokkos::Device, Kokkos::MemoryTraits, \ + SCALAR*, LAYOUT, Kokkos::Device, Kokkos::MemoryTraits, \ + true, COMPILE_LIBRARY> { \ + using device_type = Kokkos::Device; \ using memory_trait_type = Kokkos::MemoryTraits; \ - using AMatrix = CrsMatrix; \ - using XVector = Kokkos::View>; \ - using YVector = Kokkos::View; \ + using AMatrix = CrsMatrix; \ + using XVector = Kokkos::View>; \ + using YVector = Kokkos::View; \ + using Controls = KokkosKernels::Experimental::Controls; \ \ using coefficient_type = typename YVector::non_const_value_type; \ \ - static void spmv (const char mode[], \ + static void spmv (const Controls& controls, \ + const char mode[], \ const coefficient_type& alpha, \ const AMatrix& A, \ const XVector& x, \ const coefficient_type& beta, \ const YVector& y) { \ - std::string label = "KokkosSparse::spmv[TPL_CUSPARSE," + Kokkos::ArithTraits::name() + "]"; \ - Kokkos::Profiling::pushRegion(label); \ - spmv_cusparse(mode, alpha, A, x, beta, y); \ - Kokkos::Profiling::popRegion(); \ + if(controls.isParameter("algorithm") && controls.getParameter("algorithm") == "native") { \ + std::string label = "KokkosSparse::spmv[TPL_CUSPARSE," + Kokkos::ArithTraits::name() + "]"; \ + Kokkos::Profiling::pushRegion(label); \ + spmv_native(controls, mode, alpha, A, x, beta, y); \ + Kokkos::Profiling::popRegion(); \ + } else { \ + std::string label = "KokkosSparse::spmv[TPL_CUSPARSE," + Kokkos::ArithTraits::name() + "]"; \ + Kokkos::Profiling::pushRegion(label); \ + spmv_cusparse(controls, mode, alpha, A, x, beta, y); \ + Kokkos::Profiling::popRegion(); \ + } \ } \ - }; - - KOKKOSSPARSE_SPMV_CUSPARSE(double, int, Kokkos::LayoutLeft, true) - KOKKOSSPARSE_SPMV_CUSPARSE(double, int, Kokkos::LayoutLeft, false) - KOKKOSSPARSE_SPMV_CUSPARSE(double, int, Kokkos::LayoutRight, true) - KOKKOSSPARSE_SPMV_CUSPARSE(double, int, Kokkos::LayoutRight, false) - KOKKOSSPARSE_SPMV_CUSPARSE(float, int, Kokkos::LayoutLeft, true) - KOKKOSSPARSE_SPMV_CUSPARSE(float, int, Kokkos::LayoutLeft, false) - KOKKOSSPARSE_SPMV_CUSPARSE(float, int, Kokkos::LayoutRight, true) - KOKKOSSPARSE_SPMV_CUSPARSE(float, int, Kokkos::LayoutRight, false) + }; +#if (9000 <= CUDA_VERSION) + KOKKOSSPARSE_SPMV_CUSPARSE(double, int, int, Kokkos::LayoutLeft, Kokkos::CudaSpace, true) + KOKKOSSPARSE_SPMV_CUSPARSE(double, int, int, Kokkos::LayoutRight, Kokkos::CudaSpace, true) + KOKKOSSPARSE_SPMV_CUSPARSE(float, int, int, Kokkos::LayoutLeft, Kokkos::CudaSpace, true) + KOKKOSSPARSE_SPMV_CUSPARSE(float, int, int, Kokkos::LayoutRight, Kokkos::CudaSpace, true) + KOKKOSSPARSE_SPMV_CUSPARSE(Kokkos::complex, int, int, Kokkos::LayoutLeft, Kokkos::CudaSpace, true) + KOKKOSSPARSE_SPMV_CUSPARSE(Kokkos::complex, int, int, Kokkos::LayoutRight, Kokkos::CudaSpace, true) + KOKKOSSPARSE_SPMV_CUSPARSE(Kokkos::complex, int, int, Kokkos::LayoutLeft, Kokkos::CudaSpace, true) + KOKKOSSPARSE_SPMV_CUSPARSE(Kokkos::complex, int, int, Kokkos::LayoutRight, Kokkos::CudaSpace, true) + KOKKOSSPARSE_SPMV_CUSPARSE(double, int, int, Kokkos::LayoutLeft, Kokkos::CudaUVMSpace, true) + KOKKOSSPARSE_SPMV_CUSPARSE(double, int, int, Kokkos::LayoutRight, Kokkos::CudaUVMSpace, true) + KOKKOSSPARSE_SPMV_CUSPARSE(float, int, int, Kokkos::LayoutLeft, Kokkos::CudaUVMSpace, true) + KOKKOSSPARSE_SPMV_CUSPARSE(float, int, int, Kokkos::LayoutRight, Kokkos::CudaUVMSpace, true) + KOKKOSSPARSE_SPMV_CUSPARSE(Kokkos::complex, int, int, Kokkos::LayoutLeft, Kokkos::CudaUVMSpace, true) + KOKKOSSPARSE_SPMV_CUSPARSE(Kokkos::complex, int, int, Kokkos::LayoutRight, Kokkos::CudaUVMSpace, true) + KOKKOSSPARSE_SPMV_CUSPARSE(Kokkos::complex, int, int, Kokkos::LayoutLeft, Kokkos::CudaUVMSpace, true) + KOKKOSSPARSE_SPMV_CUSPARSE(Kokkos::complex, int, int, Kokkos::LayoutRight, Kokkos::CudaUVMSpace, true) + +#if defined(CUSPARSE_VERSION) && (10300 <= CUSPARSE_VERSION) + KOKKOSSPARSE_SPMV_CUSPARSE(double, int64_t, size_t, Kokkos::LayoutLeft, Kokkos::CudaSpace, true) + KOKKOSSPARSE_SPMV_CUSPARSE(double, int64_t, size_t, Kokkos::LayoutRight, Kokkos::CudaSpace, true) + KOKKOSSPARSE_SPMV_CUSPARSE(float, int64_t, size_t, Kokkos::LayoutLeft, Kokkos::CudaSpace, true) + KOKKOSSPARSE_SPMV_CUSPARSE(float, int64_t, size_t, Kokkos::LayoutRight, Kokkos::CudaSpace, true) + KOKKOSSPARSE_SPMV_CUSPARSE(Kokkos::complex, int64_t, size_t, Kokkos::LayoutLeft, Kokkos::CudaSpace, true) + KOKKOSSPARSE_SPMV_CUSPARSE(Kokkos::complex, int64_t, size_t, Kokkos::LayoutRight, Kokkos::CudaSpace, true) + KOKKOSSPARSE_SPMV_CUSPARSE(Kokkos::complex, int64_t, size_t, Kokkos::LayoutLeft, Kokkos::CudaSpace, true) + KOKKOSSPARSE_SPMV_CUSPARSE(Kokkos::complex, int64_t, size_t, Kokkos::LayoutRight, Kokkos::CudaSpace, true) + KOKKOSSPARSE_SPMV_CUSPARSE(double, int64_t, size_t, Kokkos::LayoutLeft, Kokkos::CudaUVMSpace, true) + KOKKOSSPARSE_SPMV_CUSPARSE(double, int64_t, size_t, Kokkos::LayoutRight, Kokkos::CudaUVMSpace, true) + KOKKOSSPARSE_SPMV_CUSPARSE(float, int64_t, size_t, Kokkos::LayoutLeft, Kokkos::CudaUVMSpace, true) + KOKKOSSPARSE_SPMV_CUSPARSE(float, int64_t, size_t, Kokkos::LayoutRight, Kokkos::CudaUVMSpace, true) + KOKKOSSPARSE_SPMV_CUSPARSE(Kokkos::complex, int64_t, size_t, Kokkos::LayoutLeft, Kokkos::CudaUVMSpace, true) + KOKKOSSPARSE_SPMV_CUSPARSE(Kokkos::complex, int64_t, size_t, Kokkos::LayoutRight, Kokkos::CudaUVMSpace, true) + KOKKOSSPARSE_SPMV_CUSPARSE(Kokkos::complex, int64_t, size_t, Kokkos::LayoutLeft, Kokkos::CudaUVMSpace, true) + KOKKOSSPARSE_SPMV_CUSPARSE(Kokkos::complex, int64_t, size_t, Kokkos::LayoutRight, Kokkos::CudaUVMSpace, true) +#endif +#endif #undef KOKKOSSPARSE_SPMV_CUSPARSE diff --git a/packages/kokkos-kernels/src/sparse/KokkosSparse_spmv.hpp b/packages/kokkos-kernels/src/sparse/KokkosSparse_spmv.hpp index 1005caee28e1..e18bc4690f4f 100644 --- a/packages/kokkos-kernels/src/sparse/KokkosSparse_spmv.hpp +++ b/packages/kokkos-kernels/src/sparse/KokkosSparse_spmv.hpp @@ -49,11 +49,13 @@ #define KOKKOSSPARSE_SPMV_HPP_ #include "KokkosKernels_helpers.hpp" +#include "KokkosKernels_Controls.hpp" #include "KokkosSparse_spmv_spec.hpp" #include "KokkosSparse_spmv_struct_spec.hpp" #include #include "KokkosSparse_CrsMatrix.hpp" - +#include "KokkosBlas1_scal.hpp" +#include "KokkosKernels_Utils.hpp" namespace KokkosSparse { @@ -64,7 +66,8 @@ namespace { template void -spmv (const char mode[], +spmv (KokkosKernels::Experimental::Controls controls, + const char mode[], const AlphaType& alpha, const AMatrix& A, const XVector& x, @@ -136,20 +139,33 @@ spmv (const char mode[], XVector_Internal x_i = x; YVector_Internal y_i = y; + if(alpha == Kokkos::ArithTraits::zero() || + A_i.numRows() == 0 || A_i.numCols() == 0 || A_i.nnz() == 0) + { + //This is required to maintain semantics of KokkosKernels native SpMV: + //if y contains NaN but beta = 0, the result y should be filled with 0. + //For example, this is useful for passing in uninitialized y and beta=0. + if(beta == Kokkos::ArithTraits::zero()) + Kokkos::deep_copy(y_i, Kokkos::ArithTraits::zero()); + else + KokkosBlas::scal(y_i, beta, y_i); + return; + } return Impl::SPMV< - typename AMatrix_Internal::value_type, - typename AMatrix_Internal::ordinal_type, - typename AMatrix_Internal::device_type, - typename AMatrix_Internal::memory_traits, - typename AMatrix_Internal::size_type, - typename XVector_Internal::value_type*, - typename XVector_Internal::array_layout, - typename XVector_Internal::device_type, - typename XVector_Internal::memory_traits, - typename YVector_Internal::value_type*, - typename YVector_Internal::array_layout, - typename YVector_Internal::device_type, - typename YVector_Internal::memory_traits>::spmv (mode, alpha, A_i, x_i, beta, y_i); + typename AMatrix_Internal::value_type, + typename AMatrix_Internal::ordinal_type, + typename AMatrix_Internal::device_type, + typename AMatrix_Internal::memory_traits, + typename AMatrix_Internal::size_type, + typename XVector_Internal::value_type*, + typename XVector_Internal::array_layout, + typename XVector_Internal::device_type, + typename XVector_Internal::memory_traits, + typename YVector_Internal::value_type*, + typename YVector_Internal::array_layout, + typename YVector_Internal::device_type, + typename YVector_Internal::memory_traits> + ::spmv (controls, mode, alpha, A_i, x_i, beta, y_i); } @@ -222,7 +238,8 @@ struct SPMV2D1D void -spmv (const char mode[], +spmv (KokkosKernels::Experimental::Controls controls, + const char mode[], const AlphaType& alpha, const AMatrix& A, const XVector& x, @@ -337,6 +354,7 @@ spmv (const char mode[], /// by \c mode. If beta == 0, ignore and overwrite the initial /// entries of y; if alpha == 0, ignore the entries of A and x. /// +/// \param controls [in] kokkos-kernels control structure /// \param mode [in] "N" for no transpose, "T" for transpose, or "C" /// for conjugate transpose. /// \param alpha [in] Scalar multiplier for the matrix A. @@ -348,17 +366,32 @@ spmv (const char mode[], /// multivector (rank-2 Kokkos::View). It must have the same number /// of columns as x. template -void -spmv(const char mode[], - const AlphaType& alpha, - const AMatrix& A, - const XVector& x, - const BetaType& beta, - const YVector& y) { +void spmv(KokkosKernels::Experimental::Controls controls, + const char mode[], + const AlphaType& alpha, + const AMatrix& A, + const XVector& x, + const BetaType& beta, + const YVector& y) { using RANK_SPECIALISE = typename std::conditional (XVector::rank) == 2, RANK_TWO, RANK_ONE>::type; - spmv (mode, alpha, A, x, beta, y, RANK_SPECIALISE ()); + spmv (controls, mode, alpha, A, x, beta, y, RANK_SPECIALISE ()); +} + +// Overload for backward compatibility and also just simpler +// interface for users that are happy with the kernel default settings +template +void spmv(const char mode[], + const AlphaType& alpha, + const AMatrix& A, + const XVector& x, + const BetaType& beta, + const YVector& y) { + + KokkosKernels::Experimental::Controls controls; + spmv(controls, mode, alpha, A, x, beta, y); + } namespace Experimental { diff --git a/packages/kokkos-kernels/src/sparse/impl/KokkosSparse_spmv_impl.hpp b/packages/kokkos-kernels/src/sparse/impl/KokkosSparse_spmv_impl.hpp index eba99fb8eed7..3ea7d150b6df 100644 --- a/packages/kokkos-kernels/src/sparse/impl/KokkosSparse_spmv_impl.hpp +++ b/packages/kokkos-kernels/src/sparse/impl/KokkosSparse_spmv_impl.hpp @@ -45,6 +45,7 @@ #ifndef KOKKOSSPARSE_IMPL_SPMV_DEF_HPP_ #define KOKKOSSPARSE_IMPL_SPMV_DEF_HPP_ +#include "KokkosKernels_Controls.hpp" #include "Kokkos_InnerProductSpaceTraits.hpp" #include "KokkosBlas1_scal.hpp" #include "KokkosSparse_CrsMatrix.hpp" @@ -274,11 +275,12 @@ template static void -spmv_beta_no_transpose (typename YVector::const_value_type& alpha, - const AMatrix& A, - const XVector& x, - typename YVector::const_value_type& beta, - const YVector& y) +spmv_beta_no_transpose (const KokkosKernels::Experimental::Controls& controls, + typename YVector::const_value_type& alpha, + const AMatrix& A, + const XVector& x, + typename YVector::const_value_type& beta, + const YVector& y) { typedef typename AMatrix::ordinal_type ordinal_type; typedef typename AMatrix::execution_space execution_space; @@ -303,17 +305,29 @@ spmv_beta_no_transpose (typename YVector::const_value_type& alpha, int vector_length = -1; int64_t rows_per_thread = -1; + // Note on 03/24/20, lbv: We can use the controls + // here to allow the user to pass in some tunning + // parameters. + if(controls.isParameter("team size")) {team_size = std::stoi(controls.getParameter("team size"));} + if(controls.isParameter("vector length")) {vector_length = std::stoi(controls.getParameter("vector length"));} + if(controls.isParameter("rows per thread")) {rows_per_thread = std::stoll(controls.getParameter("rows per thread"));} + + bool use_dynamic_schedule = false; // Forces the use of a dynamic schedule + bool use_static_schedule = false; // Forces the use of a static schedule + if(controls.isParameter("schedule")) { + if(controls.getParameter("schedule") == "dynamic") { + use_dynamic_schedule = true; + } else if(controls.getParameter("schedule") == "static") { + use_static_schedule = true; + } + } + int64_t rows_per_team = spmv_launch_parameters(A.numRows(),A.nnz(),rows_per_thread,team_size,vector_length); int64_t worksets = (y.extent(0)+rows_per_team-1)/rows_per_team; - // std::cout << "worksets=" << worksets - // << ", rows_per_team=" << rows_per_team - // << ", team_size=" << team_size - // << ", vector_length=" << vector_length << std::endl; - SPMV_Functor func (alpha,A,x,beta,y,rows_per_team); - if(A.nnz()>10000000) { + if(((A.nnz()>10000000) || use_dynamic_schedule) && !use_static_schedule) { Kokkos::TeamPolicy > policy(1,1); if(team_size<0) policy = Kokkos::TeamPolicy >(worksets,Kokkos::AUTO,vector_length); @@ -388,20 +402,21 @@ template static void -spmv_beta (const char mode[], - typename YVector::const_value_type& alpha, - const AMatrix& A, - const XVector& x, - typename YVector::const_value_type& beta, - const YVector& y) +spmv_beta (const KokkosKernels::Experimental::Controls& controls, + const char mode[], + typename YVector::const_value_type& alpha, + const AMatrix& A, + const XVector& x, + typename YVector::const_value_type& beta, + const YVector& y) { if (mode[0] == NoTranspose[0]) { spmv_beta_no_transpose - (alpha,A,x,beta,y); + (controls,alpha,A,x,beta,y); } else if (mode[0] == Conjugate[0]) { spmv_beta_no_transpose - (alpha,A,x,beta,y); + (controls,alpha,A,x,beta,y); } else if (mode[0]==Transpose[0]) { spmv_beta_transpose diff --git a/packages/kokkos-kernels/src/sparse/impl/KokkosSparse_spmv_spec.hpp b/packages/kokkos-kernels/src/sparse/impl/KokkosSparse_spmv_spec.hpp index 98d338941872..90c1e0107bf2 100644 --- a/packages/kokkos-kernels/src/sparse/impl/KokkosSparse_spmv_spec.hpp +++ b/packages/kokkos-kernels/src/sparse/impl/KokkosSparse_spmv_spec.hpp @@ -47,8 +47,10 @@ #include #include #include +#include #include "KokkosSparse_CrsMatrix.hpp" +#include "KokkosKernels_Controls.hpp" // Include the actual functors #if !defined(KOKKOSKERNELS_ETI_ONLY) || KOKKOSKERNELS_IMPL_COMPILE_LIBRARY #include @@ -155,12 +157,13 @@ struct SPMV{ typedef typename YVector::non_const_value_type coefficient_type; - static void spmv (const char mode[], - const coefficient_type& alpha, - const AMatrix& A, - const XVector& x, - const coefficient_type& beta, - const YVector& y); + static void spmv (const KokkosKernels::Experimental::Controls& controls, + const char mode[], + const coefficient_type& alpha, + const AMatrix& A, + const XVector& x, + const coefficient_type& beta, + const YVector& y); }; // Unification layer @@ -245,12 +248,13 @@ struct SPMV < AT, AO, AD, AM, AS, typedef typename YVector::non_const_value_type coefficient_type; static void - spmv (const char mode[], - const coefficient_type& alpha, - const AMatrix& A, - const XVector& x, - const coefficient_type& beta, - const YVector& y) + spmv (const KokkosKernels::Experimental::Controls& controls, + const char mode[], + const coefficient_type& alpha, + const AMatrix& A, + const XVector& x, + const coefficient_type& beta, + const YVector& y) { typedef Kokkos::Details::ArithTraits KAT; @@ -264,16 +268,16 @@ struct SPMV < AT, AO, AD, AM, AS, } if (beta == KAT::zero ()) { - spmv_beta (mode, alpha, A, x, beta, y); + spmv_beta (controls, mode, alpha, A, x, beta, y); } else if (beta == KAT::one ()) { - spmv_beta (mode, alpha, A, x, beta, y); + spmv_beta (controls, mode, alpha, A, x, beta, y); } else if (beta == -KAT::one ()) { - spmv_beta (mode, alpha, A, x, beta, y); + spmv_beta (controls, mode, alpha, A, x, beta, y); } else { - spmv_beta (mode, alpha, A, x, beta, y); + spmv_beta (controls, mode, alpha, A, x, beta, y); } } }; @@ -344,10 +348,12 @@ struct SPMV_MV impl_type; + //Create a default Controls object (the impl_type::spmv below is for rank-1, which requires it) + KokkosKernels::Experimental::Controls defaultControls; for (typename AMatrix::non_const_size_type j = 0; j < x.extent(1); ++j) { auto x_j = Kokkos::subview (x, Kokkos::ALL (), j); auto y_j = Kokkos::subview (y, Kokkos::ALL (), j); - impl_type::spmv (mode, alpha, A, x_j, beta, y_j); + impl_type::spmv (defaultControls, mode, alpha, A, x_j, beta, y_j); } } }; @@ -435,4 +441,4 @@ struct SPMV_MV #include -#endif // KOKKOS_BLAS1_MV_IMPL_DOT_HPP_ +#endif // KOKKOSSPARSE_IMPL_SPMV_SPEC_HPP_ diff --git a/packages/kokkos-kernels/unit_test/sparse/Test_Sparse_spmv.hpp b/packages/kokkos-kernels/unit_test/sparse/Test_Sparse_spmv.hpp index 350d75b512b9..a7b42fa697e3 100644 --- a/packages/kokkos-kernels/unit_test/sparse/Test_Sparse_spmv.hpp +++ b/packages/kokkos-kernels/unit_test/sparse/Test_Sparse_spmv.hpp @@ -8,6 +8,8 @@ #include #include +#include "KokkosKernels_Controls.hpp" + #ifndef kokkos_complex_double #define kokkos_complex_double Kokkos::complex #define kokkos_complex_float Kokkos::complex @@ -262,8 +264,49 @@ void check_spmv_mv_struct(const crsMat_t input_mat, } } // check_spmv_mv_struct +template +void check_spmv_controls(KokkosKernels::Experimental::Controls controls, + crsMat_t input_mat, x_vector_type x, y_vector_type y, + typename y_vector_type::non_const_value_type alpha, + typename y_vector_type::non_const_value_type beta) { + //typedef typename crsMat_t::StaticCrsGraphType graph_t; + using ExecSpace = typename crsMat_t::execution_space; + using my_exec_space = Kokkos::RangePolicy; + using y_value_type = typename y_vector_type::non_const_value_type; + using y_value_trait = Kokkos::ArithTraits; + using y_value_mag_type = typename y_value_trait::mag_type; + + // y is the quantity being tested here, + // so let us use y_value_type to determine + // the appropriate tolerance precision. + const y_value_mag_type eps = std::is_same::value ? 2*1e-3 : 1e-7; + const size_t nr = input_mat.numRows(); + y_vector_type expected_y("expected", nr); + Kokkos::deep_copy(expected_y, y); + Kokkos::fence(); + + sequential_spmv(input_mat, x, expected_y, alpha, beta); + +#ifdef KOKKOSKERNELS_ENABLE_TPL_CUSPARSE + controls.setParameter("algorithm", "merge"); + printf("requested merge based algorithm\n"); +#endif + + KokkosSparse::spmv(controls, "N", alpha, input_mat, x, beta, y); + int num_errors = 0; + Kokkos::parallel_reduce("KokkosSparse::Test::spmv", + my_exec_space(0, y.extent(0)), + fSPMV(expected_y, y, eps), + num_errors); + if(num_errors>0) printf("KokkosSparse::Test::spmv: %i errors of %i with params: %lf %lf\n", + num_errors, y.extent_int(0), + y_value_trait::abs(alpha), y_value_trait::abs(beta)); + EXPECT_TRUE(num_errors==0); +} // check_spmv_controls + } // namespace Test + template void test_spmv(lno_t numRows,size_type nnz, lno_t bandwidth, lno_t row_size_variance){ @@ -495,6 +538,41 @@ void test_spmv_mv_struct_1D(lno_t nx, int numMV) { Test::check_spmv_mv_struct(input_mat, 1, structure, input_x, output_y, output_y_copy, 1.0, 1.0, numMV); } +// check that the controls are flowing down correctly in the spmv kernel +template +void test_spmv_controls(lno_t numRows,size_type nnz, lno_t bandwidth, lno_t row_size_variance) { + + using crsMat_t = typename KokkosSparse::CrsMatrix; + using scalar_view_t = typename crsMat_t::values_type::non_const_type; + using x_vector_type = scalar_view_t; + using y_vector_type = scalar_view_t; + using Controls = KokkosKernels::Experimental::Controls; + + + lno_t numCols = numRows; + + crsMat_t input_mat = KokkosKernels::Impl::kk_generate_sparse_matrix(numRows,numCols,nnz,row_size_variance, bandwidth); + lno_t nr = input_mat.numRows(); + lno_t nc = input_mat.numCols(); + + x_vector_type input_x ("x", nc); + y_vector_type output_y ("y", nr); + + Kokkos::Random_XorShift64_Pool rand_pool(13718); + + using ScalarX = typename x_vector_type::value_type; + using ScalarY = typename y_vector_type::value_type; + + Kokkos::fill_random(input_x,rand_pool,ScalarX(10)); + Kokkos::fill_random(output_y,rand_pool,ScalarY(10)); + + Controls controls; + + Test::check_spmv_controls(controls, input_mat, input_x, output_y, 1.0, 0.0); + Test::check_spmv_controls(controls, input_mat, input_x, output_y, 0.0, 1.0); + Test::check_spmv_controls(controls, input_mat, input_x, output_y, 1.0, 1.0); +} // test_spmv_controls + //call it if ordinal int and, scalar float and double are instantiated. template void test_github_issue_101 () @@ -650,6 +728,7 @@ TEST_F( TestCategory,sparse ## _ ## spmv ## _ ## SCALAR ## _ ## ORDINAL ## _ ## test_spmv (50000, 50000 * 30, 200, 10); \ test_spmv (50000, 50000 * 30, 100, 10); \ test_spmv (10000, 10000 * 20, 100, 5); \ + test_spmv_controls (10000, 10000 * 20, 100, 5); \ } #define EXECUTE_TEST_MV(SCALAR, ORDINAL, OFFSET, LAYOUT, DEVICE) \ diff --git a/packages/muelu/cmake/Dependencies.cmake b/packages/muelu/cmake/Dependencies.cmake index 7298a8d1c0ea..7d699645cfa9 100644 --- a/packages/muelu/cmake/Dependencies.cmake +++ b/packages/muelu/cmake/Dependencies.cmake @@ -1,7 +1,7 @@ SET(LIB_REQUIRED_DEP_PACKAGES Teuchos Xpetra) SET(LIB_OPTIONAL_DEP_PACKAGES Amesos Amesos2 AvatarT Belos Epetra EpetraExt Teko Ifpack Ifpack2 Intrepid2 ML Tpetra - Zoltan Zoltan2 Stratimikos Thyra ThyraTpetraAdapters + Zoltan Zoltan2Core Stratimikos Thyra ThyraTpetraAdapters Isorropia KokkosCore KokkosContainers KokkosKernels) SET(TEST_REQUIRED_DEP_PACKAGES Galeri) SET(TEST_OPTIONAL_DEP_PACKAGES AztecOO Pamgen) diff --git a/packages/muelu/cmake/MueLu_config.hpp.in b/packages/muelu/cmake/MueLu_config.hpp.in index 5bb67b96e2a3..96c398616cf2 100644 --- a/packages/muelu/cmake/MueLu_config.hpp.in +++ b/packages/muelu/cmake/MueLu_config.hpp.in @@ -78,7 +78,11 @@ #cmakedefine HAVE_MUELU_ZOLTAN -#cmakedefine HAVE_MUELU_ZOLTAN2 +#cmakedefine HAVE_MUELU_ZOLTAN2CORE +#ifdef HAVE_MUELU_ZOLTAN2CORE +# define HAVE_MUELU_ZOLTAN2 +#endif + /* Optional TPL */ diff --git a/packages/muelu/doc/UsersGuide/masterList.xml b/packages/muelu/doc/UsersGuide/masterList.xml index d533ba6c0a49..3b644c2a0a9d 100644 --- a/packages/muelu/doc/UsersGuide/masterList.xml +++ b/packages/muelu/doc/UsersGuide/masterList.xml @@ -445,6 +445,15 @@ parameter not existing in ML + + aggregation: classical algo + string + "default" + Type of sub-algorithm for "classical" dropping. Possible values: "default", "unscaled cut", "scaled cut". + false + parameter not existing in ML + + aggregation: drop tol double @@ -1198,6 +1207,15 @@ not supported by ML + + emin: use filtered matrix + bool + true + true + Matrix to use for smoothing for energy minimization. The two options are: to use the original matrix, and to use the filtered matrix with filtering based on filtered graph used for aggregation. + not supported by ML + + tentative: calculate qr bool diff --git a/packages/muelu/doc/UsersGuide/options_multigrid.tex b/packages/muelu/doc/UsersGuide/options_multigrid.tex index e67cf2b47dae..5ef7b8e310e6 100644 --- a/packages/muelu/doc/UsersGuide/options_multigrid.tex +++ b/packages/muelu/doc/UsersGuide/options_multigrid.tex @@ -24,4 +24,6 @@ \cbb{emin: pattern}{string}{"AkPtent"}{Sparsity pattern to use for energy minimization. Possible values: "AkPtent".} \cbb{emin: pattern order}{int}{1}{Matrix order for the "AkPtent" pattern.} + +\cbb{emin: use filtered matrix}{bool}{true}{Matrix to use for smoothing for energy minimization. The two options are: to use the original matrix, and to use the filtered matrix with filtering based on filtered graph used for aggregation.} \ No newline at end of file diff --git a/packages/muelu/doc/UsersGuide/paramlist.tex b/packages/muelu/doc/UsersGuide/paramlist.tex index 6bea70a6970e..1abd5f5249ed 100644 --- a/packages/muelu/doc/UsersGuide/paramlist.tex +++ b/packages/muelu/doc/UsersGuide/paramlist.tex @@ -178,6 +178,8 @@ \cbb{emin: pattern order}{int}{1}{Matrix order for the "AkPtent" pattern.} +\cbb{emin: use filtered matrix}{bool}{true}{Matrix to use for smoothing for energy minimization. The two options are: to use the original matrix, and to use the filtered matrix with filtering based on filtered graph used for aggregation.} + \cbb{repartition: enable}{bool}{false}{Rebalancing on/off switch.} \cbb{repartition: partitioner}{string}{"zoltan2"}{Partitioning package to use. Possible values: "zoltan" (\zoltan{} library), "zoltan2" (\zoltantwo{} library).} diff --git a/packages/muelu/doc/UsersGuide/paramlist_hidden.tex b/packages/muelu/doc/UsersGuide/paramlist_hidden.tex index cdcacc66fcc1..4a5d6d1a66be 100644 --- a/packages/muelu/doc/UsersGuide/paramlist_hidden.tex +++ b/packages/muelu/doc/UsersGuide/paramlist_hidden.tex @@ -76,6 +76,8 @@ \cbb{aggregation: distance laplacian algo}{string}{"default"}{Type of sub-algorithm for "distance laplacian" dropping. Possible values: "default", "unscaled cut", "scaled cut".} +\cbb{aggregation: classical algo}{string}{"default"}{Type of sub-algorithm for "classical" dropping. Possible values: "default", "unscaled cut", "scaled cut".} + \cbb{aggregation: drop tol}{double}{0.0}{Connectivity dropping threshold for a graph used in aggregation.} \cbb{aggregation: min agg size}{int}{2}{Minimum size of an aggregate.} @@ -264,6 +266,8 @@ \cbb{emin: pattern order}{int}{1}{Matrix order for the "AkPtent" pattern.} +\cbb{emin: use filtered matrix}{bool}{true}{Matrix to use for smoothing for energy minimization. The two options are: to use the original matrix, and to use the filtered matrix with filtering based on filtered graph used for aggregation.} + \cbb{tentative: calculate qr}{bool}{true}{If false, skip local QR decomposition phase of smoothed aggregation.} \cbb{tentative: constant column sums}{bool}{false}{If true, scale the column sums to one (before applying nullspace).} diff --git a/packages/muelu/example/basic/CMakeLists.txt b/packages/muelu/example/basic/CMakeLists.txt index 0c86018947b2..eac95edc95c9 100644 --- a/packages/muelu/example/basic/CMakeLists.txt +++ b/packages/muelu/example/basic/CMakeLists.txt @@ -60,6 +60,10 @@ IF(${PACKAGE_NAME}_ENABLE_Stratimikos AND ${PACKAGE_NAME}_ENABLE_Thyra) TRIBITS_COPY_FILES_TO_BINARY_DIR(advanced_stratimikos_cp SOURCE_FILES stratimikos_ParameterList.xml stratimikos_ParameterList.yaml stratimikos_ParameterList2.xml + set1-gmres.xml set1-cg.xml + set2-sgs1.xml set2-sgs3.xml + set3-mg-jacobi.xml set3-mg-sgs.xml set3-mg-gs.xml set3-mg-chebyshev.xml + mg-gpu.xml ) IF (${PACKAGE_NAME}_HAVE_EPETRA_SOLVER_STACK) diff --git a/packages/muelu/example/basic/mg-gpu.xml b/packages/muelu/example/basic/mg-gpu.xml new file mode 100644 index 000000000000..3ff0388383e8 --- /dev/null +++ b/packages/muelu/example/basic/mg-gpu.xml @@ -0,0 +1,133 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/muelu/example/basic/set1-cg.xml b/packages/muelu/example/basic/set1-cg.xml new file mode 100644 index 000000000000..82a07d17da21 --- /dev/null +++ b/packages/muelu/example/basic/set1-cg.xml @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/muelu/example/basic/set1-gmres.xml b/packages/muelu/example/basic/set1-gmres.xml new file mode 100644 index 000000000000..51faa979df12 --- /dev/null +++ b/packages/muelu/example/basic/set1-gmres.xml @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/muelu/example/basic/set2-sgs1.xml b/packages/muelu/example/basic/set2-sgs1.xml new file mode 100644 index 000000000000..47ecf08932d9 --- /dev/null +++ b/packages/muelu/example/basic/set2-sgs1.xml @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/muelu/example/basic/set2-sgs3.xml b/packages/muelu/example/basic/set2-sgs3.xml new file mode 100644 index 000000000000..40bb667ea968 --- /dev/null +++ b/packages/muelu/example/basic/set2-sgs3.xml @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/muelu/example/basic/set3-mg-chebyshev.xml b/packages/muelu/example/basic/set3-mg-chebyshev.xml new file mode 100644 index 000000000000..55a51d791047 --- /dev/null +++ b/packages/muelu/example/basic/set3-mg-chebyshev.xml @@ -0,0 +1,133 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/muelu/example/basic/set3-mg-gs.xml b/packages/muelu/example/basic/set3-mg-gs.xml new file mode 100644 index 000000000000..fdb6b397b3d0 --- /dev/null +++ b/packages/muelu/example/basic/set3-mg-gs.xml @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/muelu/example/basic/set3-mg-jacobi.xml b/packages/muelu/example/basic/set3-mg-jacobi.xml new file mode 100644 index 000000000000..a690299cb6a5 --- /dev/null +++ b/packages/muelu/example/basic/set3-mg-jacobi.xml @@ -0,0 +1,132 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/muelu/example/basic/set3-mg-sgs.xml b/packages/muelu/example/basic/set3-mg-sgs.xml new file mode 100644 index 000000000000..e3e0f055c7c1 --- /dev/null +++ b/packages/muelu/example/basic/set3-mg-sgs.xml @@ -0,0 +1,131 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/muelu/research/mmayr/composite_to_regions/src/SetupRegionHierarchy_def.hpp b/packages/muelu/research/mmayr/composite_to_regions/src/SetupRegionHierarchy_def.hpp index 57ff8c1f667d..dfc76e9980ee 100644 --- a/packages/muelu/research/mmayr/composite_to_regions/src/SetupRegionHierarchy_def.hpp +++ b/packages/muelu/research/mmayr/composite_to_regions/src/SetupRegionHierarchy_def.hpp @@ -138,7 +138,7 @@ void MakeCoarseLevelMaps(const int maxRegPerGID, Array > > >& regRowImporters, Array > >& interfaceGIDs, Array > >& regionsPerGIDWithGhosts, - Array >& regionMatVecLIDs, + Array >& regionMatVecLIDs, Array > >& regionInterfaceImporter) { #include "Xpetra_UseShortNames.hpp" @@ -654,7 +654,7 @@ void createRegionHierarchy(const int maxRegPerProc, Array > > >& regInterfaceScalings, Array > >& interfaceGIDs, Array > >& regionsPerGIDWithGhosts, - Array >& regionMatVecLIDs, + Array >& regionMatVecLIDs, Array > >& regionInterfaceImporter, const int maxRegPerGID, ArrayView compositeToRegionLIDs, @@ -932,8 +932,6 @@ void createRegionHierarchy(const int maxRegPerProc, Array > > >& regProlong, Array > > >& regRowImporters, Array > > >& regInterfaceScalings, - Array > >& interfaceGIDsMV, - Array > >& regionsPerGIDWithGhosts, Array >& smootherParams ) { @@ -943,6 +941,10 @@ void createRegionHierarchy(const int maxRegPerProc, RCP coarseSolverParams = rcp(new ParameterList("Coarse solver parameters")); coarseSolverParams->set("use coarse solver", true); RCP dummy = Teuchos::parameterList(); + Array > > interfaceGIDsPerLevel; + Array > > regionsPerGIDWithGhostsPerLevel; + Array > regionMatVecLIDsPerLevel; + Array > > regionInterfaceImporterPerLevel; // Call the actual routine createRegionHierarchy(maxRegPerProc, numDimensions, lNodesPerDim, @@ -950,7 +952,9 @@ void createRegionHierarchy(const int maxRegPerProc, regionGrpMats, mapComp, rowMapPerGrp, colMapPerGrp, revisedRowMapPerGrp, revisedColMapPerGrp, rowImportPerGrp, compRowMaps, compColMaps, regRowMaps, regColMaps, quasiRegRowMaps, quasiRegColMaps, regMatrices, regProlong, - regRowImporters, regInterfaceScalings, maxRegPerGID, + regRowImporters, regInterfaceScalings, interfaceGIDsPerLevel, + regionsPerGIDWithGhostsPerLevel, regionMatVecLIDsPerLevel, + regionInterfaceImporterPerLevel, maxRegPerGID, compositeToRegionLIDs, coarseSolverParams, smootherParams, dummy, false); } @@ -1030,19 +1034,38 @@ void vCycle(const int l, ///< ID of current level // Transfer to coarse level Array > coarseRegX(maxRegPerProc); Array > coarseRegB(maxRegPerProc); - for (int j = 0; j < maxRegPerProc; j++) { - coarseRegX[j] = VectorFactory::Build(regRowMaps[l+1][j], true); - coarseRegB[j] = VectorFactory::Build(regRowMaps[l+1][j], true); - - regProlong[l+1][j]->apply(*regRes[j], *coarseRegB[j], Teuchos::TRANS); - TEUCHOS_ASSERT(regProlong[l+1][j]->getRangeMap()->isSameAs(*regRes[j]->getMap())); - TEUCHOS_ASSERT(regProlong[l+1][j]->getDomainMap()->isSameAs(*coarseRegB[j]->getMap())); + if (useFastMatVec) + { + // Get pre-communicated communication patterns for the fast MatVec + const ArrayRCP regionInterfaceLIDs = smootherParams[l+1]->get>("Fast MatVec: interface LIDs"); + const RCP regionInterfaceImporter = smootherParams[l+1]->get>("Fast MatVec: interface importer"); + + for (int j = 0; j < maxRegPerProc; j++) { + coarseRegX[j] = VectorFactory::Build(regRowMaps[l+1][j], true); + coarseRegB[j] = VectorFactory::Build(regRowMaps[l+1][j], true); + + ApplyMatVec(SC_ONE, regProlong[l+1][j], regRes[j], SC_ZERO, regionInterfaceImporter, + regionInterfaceLIDs, coarseRegB[j], Teuchos::TRANS, true); + // TEUCHOS_ASSERT(regProlong[l+1][j]->getRangeMap()->isSameAs(*regRes[j]->getMap())); + // TEUCHOS_ASSERT(regProlong[l+1][j]->getDomainMap()->isSameAs(*coarseRegB[j]->getMap())); + } } + else + { + for (int j = 0; j < maxRegPerProc; j++) { + coarseRegX[j] = VectorFactory::Build(regRowMaps[l+1][j], true); + coarseRegB[j] = VectorFactory::Build(regRowMaps[l+1][j], true); + + regProlong[l+1][j]->apply(*regRes[j], *coarseRegB[j], Teuchos::TRANS); + // TEUCHOS_ASSERT(regProlong[l+1][j]->getRangeMap()->isSameAs(*regRes[j]->getMap())); + // TEUCHOS_ASSERT(regProlong[l+1][j]->getDomainMap()->isSameAs(*coarseRegB[j]->getMap())); + } - tm = Teuchos::null; - tm = rcp(new TimeMonitor(*TimeMonitor::getNewTimer("vCycle: 5 - sum interface values"))); + tm = Teuchos::null; + tm = rcp(new TimeMonitor(*TimeMonitor::getNewTimer("vCycle: 5 - sum interface values"))); - sumInterfaceValues(coarseRegB, regRowMaps[l+1], regRowImporters[l+1]); + sumInterfaceValues(coarseRegB, regRowMaps[l+1], regRowImporters[l+1]); + } tm = Teuchos::null; bool coarseZeroInitGuess = true; @@ -1057,11 +1080,27 @@ void vCycle(const int l, ///< ID of current level // Transfer coarse level correction to fine level Array > regCorrection(maxRegPerProc); - for (int j = 0; j < maxRegPerProc; j++) { - regCorrection[j] = VectorFactory::Build(regRowMaps[l][j], true); - regProlong[l+1][j]->apply(*coarseRegX[j], *regCorrection[j]); - TEUCHOS_ASSERT(regProlong[l+1][j]->getDomainMap()->isSameAs(*coarseRegX[j]->getMap())); - TEUCHOS_ASSERT(regProlong[l+1][j]->getRangeMap()->isSameAs(*regCorrection[j]->getMap())); + if (useFastMatVec) + { + // Get pre-communicated communication patterns for the fast MatVec + const ArrayRCP regionInterfaceLIDs = smootherParams[l]->get>("Fast MatVec: interface LIDs"); + const RCP regionInterfaceImporter = smootherParams[l]->get>("Fast MatVec: interface importer"); + + for (int j = 0; j < maxRegPerProc; j++) { + regCorrection[j] = VectorFactory::Build(regRowMaps[l][j], true); + ApplyMatVec(SC_ONE, regProlong[l+1][j], coarseRegX[j], SC_ZERO, regionInterfaceImporter, + regionInterfaceLIDs, regCorrection[j], Teuchos::NO_TRANS, false); + // TEUCHOS_ASSERT(regProlong[l+1][j]->getDomainMap()->isSameAs(*coarseRegX[j]->getMap())); + // TEUCHOS_ASSERT(regProlong[l+1][j]->getRangeMap()->isSameAs(*regCorrection[j]->getMap())); + } + } + else{ + for (int j = 0; j < maxRegPerProc; j++) { + regCorrection[j] = VectorFactory::Build(regRowMaps[l][j], true); + regProlong[l+1][j]->apply(*coarseRegX[j], *regCorrection[j]); + // TEUCHOS_ASSERT(regProlong[l+1][j]->getDomainMap()->isSameAs(*coarseRegX[j]->getMap())); + // TEUCHOS_ASSERT(regProlong[l+1][j]->getRangeMap()->isSameAs(*regCorrection[j]->getMap())); + } } tm = Teuchos::null; diff --git a/packages/muelu/research/mmayr/composite_to_regions/src/SetupRegionMatrix_def.hpp b/packages/muelu/research/mmayr/composite_to_regions/src/SetupRegionMatrix_def.hpp index 91d431606a12..bfeb4112114e 100644 --- a/packages/muelu/research/mmayr/composite_to_regions/src/SetupRegionMatrix_def.hpp +++ b/packages/muelu/research/mmayr/composite_to_regions/src/SetupRegionMatrix_def.hpp @@ -779,46 +779,57 @@ void SetupMatVec(const Teuchos::RCP >& regionsPerGIDWithGhosts, const std::vector > >& regionRowMap, const std::vector > >& rowImportPerGrp, - Teuchos::Array& regionMatVecLIDs, + Teuchos::ArrayRCP& regionMatVecLIDs, Teuchos::RCP >& regionInterfaceImporter) { #include "Xpetra_UseShortNamesOrdinal.hpp" + using Teuchos::TimeMonitor; + + RCP tm; + tm = rcp(new TimeMonitor(*TimeMonitor::getNewTimer("SetupMatVec: 1 - sumInterfaceValues"))); const LO maxRegPerProc = static_cast(regionRowMap.size()); const LO maxRegPerGID = static_cast(regionsPerGIDWithGhosts->getNumVectors()); const int myRank = regionRowMap[0]->getComm()->getRank(); - interfaceGIDsMV->replaceMap(regionRowMap[0]); Array > > interfaceGIDsPerGrp(maxRegPerProc); interfaceGIDsPerGrp[0] = interfaceGIDsMV; sumInterfaceValues(interfaceGIDsPerGrp, regionRowMap, rowImportPerGrp); + tm = Teuchos::null; + tm = rcp(new TimeMonitor(*TimeMonitor::getNewTimer("SetupMatVec: 2 - build regionInterfaceMap"))); + + Teuchos::Array regionMatVecLIDstmp; Teuchos::Array regionMatVecGIDs; Array > regionsPerGIDWithGhostsData(maxRegPerGID); Array > interfaceGIDsData(maxRegPerGID); for(LO regionIdx = 0; regionIdx < maxRegPerGID; ++regionIdx) { regionsPerGIDWithGhostsData[regionIdx] = regionsPerGIDWithGhosts->getData(regionIdx); - interfaceGIDsData[regionIdx] = interfaceGIDsPerGrp[0]->getData(regionIdx); - + interfaceGIDsData[regionIdx] = interfaceGIDsPerGrp[0]->getData(regionIdx); for(LO idx = 0; idx < static_cast(regionsPerGIDWithGhostsData[regionIdx].size()); ++idx) { if((regionsPerGIDWithGhostsData[regionIdx][idx] != -1) && (regionsPerGIDWithGhostsData[regionIdx][idx] != myRank)) { - regionMatVecLIDs.push_back(idx); + regionMatVecLIDstmp.push_back(idx); regionMatVecGIDs.push_back(interfaceGIDsData[regionIdx][idx]); } } } - // std::cout << "p=" << myRank << " | regionMatVecGIDs: " << regionMatVecGIDs << std::endl; - // std::cout << "p=" << myRank << " | regionMatVecLIDs: " << regionMatVecLIDs << std::endl; + // Copy the temporary regionMatVecLIDstmp into an ArrayRCP + // so we can store it and retrieve it easily later on. + regionMatVecLIDs.deepCopy(regionMatVecLIDstmp()); RCP regionInterfaceMap = Xpetra::MapFactory::Build(regionRowMap[0]->lib(), - Teuchos::OrdinalTraits::invalid(), - regionMatVecGIDs(), - regionRowMap[0]->getIndexBase(), - regionRowMap[0]->getComm()); + Teuchos::OrdinalTraits::invalid(), + regionMatVecGIDs(), + regionRowMap[0]->getIndexBase(), + regionRowMap[0]->getComm()); + + tm = Teuchos::null; + tm = rcp(new TimeMonitor(*TimeMonitor::getNewTimer("SetupMatVec: 3 - Build importer"))); regionInterfaceImporter = ImportFactory::Build(regionRowMap[0], regionInterfaceMap); + tm = Teuchos::null; } // SetupMatVec /*! \brief Compute a matrix vector product \f$Y = beta*Y + alpha*Ax\f$ @@ -833,8 +844,10 @@ void ApplyMatVec(const Scalar alpha, const RCP >& X, const Scalar beta, const RCP >& regionInterfaceImporter, - const Teuchos::Array& regionInterfaceLIDs, - RCP >& Y) { + const Teuchos::ArrayRCP& regionInterfaceLIDs, + RCP >& Y, + const Teuchos::ETransp transposeMode, + const bool sumInterfaceValues) { #include "Xpetra_UseShortNames.hpp" using Teuchos::TimeMonitor; using local_matrix_type = typename Xpetra::Matrix::local_matrix_type; @@ -849,25 +862,33 @@ void ApplyMatVec(const Scalar alpha, local_matrix_type localA = regionMatrix->getLocalMatrix(); auto localX = X->template getLocalView(); auto localY = Y->template getLocalView(); - KokkosSparse::spmv("N", alpha, localA, localX, beta, localY); - - tm = Teuchos::null; - tm = rcp(new TimeMonitor(*TimeMonitor::getNewTimer("ApplyMatVec: 2 - communicate data"))); + char spmvMode = KokkosSparse::NoTranspose[0]; + if (transposeMode == Teuchos::TRANS) + spmvMode = KokkosSparse::Transpose[0]; + else + TEUCHOS_TEST_FOR_EXCEPT_MSG(false, "Unsupported mode."); + KokkosSparse::spmv(&spmvMode, alpha, localA, localX, beta, localY); + + if (sumInterfaceValues) + { + tm = Teuchos::null; + tm = rcp(new TimeMonitor(*TimeMonitor::getNewTimer("ApplyMatVec: 2 - communicate data"))); - // Step 2: preform communication to propagate local interface - // values to all the processor that share interfaces. - RCP matvecInterfaceTmp = MultiVectorFactory::Build(regionInterfaceMap, 1); - matvecInterfaceTmp->doImport(*Y, *regionInterfaceImporter, Xpetra::INSERT); + // Step 2: preform communication to propagate local interface + // values to all the processor that share interfaces. + RCP matvecInterfaceTmp = MultiVectorFactory::Build(regionInterfaceMap, 1); + matvecInterfaceTmp->doImport(*Y, *regionInterfaceImporter, Xpetra::INSERT); - tm = Teuchos::null; - tm = rcp(new TimeMonitor(*TimeMonitor::getNewTimer("ApplyMatVec: 3 - sum interface contributions"))); - - // Step 3: sum all contributions to interface values - // on all ranks - ArrayRCP YData = Y->getDataNonConst(0); - ArrayRCP interfaceData = matvecInterfaceTmp->getDataNonConst(0); - for(LO interfaceIdx = 0; interfaceIdx < static_cast(interfaceData.size()); ++interfaceIdx) { - YData[regionInterfaceLIDs[interfaceIdx]] += interfaceData[interfaceIdx]; + tm = Teuchos::null; + tm = rcp(new TimeMonitor(*TimeMonitor::getNewTimer("ApplyMatVec: 3 - sum interface contributions"))); + + // Step 3: sum all contributions to interface values + // on all ranks + ArrayRCP YData = Y->getDataNonConst(0); + ArrayRCP interfaceData = matvecInterfaceTmp->getDataNonConst(0); + for(LO interfaceIdx = 0; interfaceIdx < static_cast(interfaceData.size()); ++interfaceIdx) { + YData[regionInterfaceLIDs[interfaceIdx]] += interfaceData[interfaceIdx]; + } } tm = Teuchos::null; @@ -897,13 +918,13 @@ computeResidual(Array tm = rcp(new TimeMonitor(*TimeMonitor::getNewTimer("computeResidual: use fast MatVec"))); // Get pre-communicated communication patterns for the fast MatVec - const Array regionInterfaceLIDs = params.get>("Fast MatVec: interface LIDs"); + const ArrayRCP regionInterfaceLIDs = params.get>("Fast MatVec: interface LIDs"); const RCP regionInterfaceImporter = params.get>("Fast MatVec: interface importer"); // Step 1: Compute region version of y = Ax RCP aTimesX = VectorFactory::Build(regionGrpMats[0]->getRangeMap(), true); ApplyMatVec(TST::one(), regionGrpMats[0], regX[0], - TST::zero(), regionInterfaceImporter, regionInterfaceLIDs, aTimesX); + TST::zero(), regionInterfaceImporter, regionInterfaceLIDs, aTimesX, Teuchos::NO_TRANS, true); // Step 2: Compute region version of r = b - y regRes[0]->update(TST::one(), *regB[0], -TST::one(), *aTimesX, TST::zero()); diff --git a/packages/muelu/research/mmayr/composite_to_regions/src/SetupRegionUtilities.hpp b/packages/muelu/research/mmayr/composite_to_regions/src/SetupRegionUtilities.hpp index 5616dd8e4089..d8d805298909 100644 --- a/packages/muelu/research/mmayr/composite_to_regions/src/SetupRegionUtilities.hpp +++ b/packages/muelu/research/mmayr/composite_to_regions/src/SetupRegionUtilities.hpp @@ -210,7 +210,7 @@ void createRegionData(const int numDimensions, const Teuchos::RCP > dofMap, int& maxRegPerGID, LocalOrdinal& numLocalRegionNodes, Teuchos::Array& boundaryConditions, - Teuchos::Array& sendGIDs, + Teuchos::Array& sendGIDs, ///< GIDs of nodes Teuchos::Array& sendPIDs, int& numInterfaces, Teuchos::Array& rNodesPerDim, @@ -761,6 +761,8 @@ void createRegionData(const int numDimensions, sendGIDs[countIDs] = k*(gNodesPerDim[1]*gNodesPerDim[0]) + j*gNodesPerDim[0] + startGID + lNodesPerDim[0] - 1; + sendLIDs[countIDs] = k*(lNodesPerDim[1]*lNodesPerDim[0]) + + j*lNodesPerDim[0] + lNodesPerDim[0] - 1; sendPIDs[countIDs] = myRank + 1; ++countIDs; } @@ -770,6 +772,8 @@ void createRegionData(const int numDimensions, for(LO i = 0; i < lNodesPerDim[0]; ++i) { sendGIDs[countIDs] = k*(gNodesPerDim[1]*gNodesPerDim[0]) + i + startGID + (lNodesPerDim[1] - 1)*gNodesPerDim[0]; + sendLIDs[countIDs] = k*(lNodesPerDim[1]*lNodesPerDim[0]) + + (lNodesPerDim[1] - 1)*lNodesPerDim[0] + i; sendPIDs[countIDs] = myRank + procsPerDim[0]; ++countIDs; } @@ -778,6 +782,8 @@ void createRegionData(const int numDimensions, for(LO k = 0; k < lNodesPerDim[2]; ++k) { sendGIDs[countIDs] = k*(gNodesPerDim[1]*gNodesPerDim[0]) + startGID + (lNodesPerDim[1] - 1)*gNodesPerDim[0] + lNodesPerDim[0] - 1; + sendLIDs[countIDs] = k*(lNodesPerDim[1]*lNodesPerDim[0]) + + lNodesPerDim[1]*lNodesPerDim[0] - 1; sendPIDs[countIDs] = myRank + procsPerDim[0] + 1; ++countIDs; } @@ -786,6 +792,8 @@ void createRegionData(const int numDimensions, for(LO i = 0; i < lNodesPerDim[0]; ++i) { sendGIDs[countIDs] = j*gNodesPerDim[0] + i + startGID + (lNodesPerDim[2] - 1)*gNodesPerDim[1]*gNodesPerDim[0]; + sendLIDs[countIDs] = (lNodesPerDim[2] - 1)*lNodesPerDim[1]*lNodesPerDim[0] + + j*lNodesPerDim[0] + i; sendPIDs[countIDs] = myRank + procsPerDim[1]*procsPerDim[0]; ++countIDs; } @@ -794,6 +802,8 @@ void createRegionData(const int numDimensions, for(LO j = 0; j < lNodesPerDim[1]; ++j) { sendGIDs[countIDs] = j*gNodesPerDim[0] + startGID + (lNodesPerDim[2] - 1)*gNodesPerDim[1]*gNodesPerDim[0] + lNodesPerDim[0] - 1; + sendLIDs[countIDs] = (lNodesPerDim[2] - 1)*(lNodesPerDim[1]*lNodesPerDim[0]) + + j*lNodesPerDim[0] + lNodesPerDim[0] - 1; sendPIDs[countIDs] = myRank + procsPerDim[1]*procsPerDim[0] + 1; ++countIDs; } @@ -802,12 +812,15 @@ void createRegionData(const int numDimensions, sendGIDs[countIDs] = i + startGID + (lNodesPerDim[2] - 1)*gNodesPerDim[1]*gNodesPerDim[0] + (lNodesPerDim[1] - 1)*gNodesPerDim[0]; + sendLIDs[countIDs] = (lNodesPerDim[2] - 1)*(lNodesPerDim[1]*lNodesPerDim[0]) + + (lNodesPerDim[1] - 1)*lNodesPerDim[0] + i; sendPIDs[countIDs] = myRank + procsPerDim[1]*procsPerDim[0] + procsPerDim[0]; ++countIDs; } // Send node of top-back-right corner sendGIDs[countIDs] = startGID + (lNodesPerDim[2] - 1)*gNodesPerDim[1]*gNodesPerDim[0] + (lNodesPerDim[1] - 1)*gNodesPerDim[0] + lNodesPerDim[0] - 1; + sendLIDs[countIDs] = lNodesPerDim[2]*lNodesPerDim[1]*lNodesPerDim[0] - 1; sendPIDs[countIDs] = myRank + procsPerDim[1]*procsPerDim[0] + procsPerDim[0] + 1; ++countIDs; @@ -825,6 +838,8 @@ void createRegionData(const int numDimensions, for(LO i = 0; i < lNodesPerDim[0]; ++i) { sendGIDs[countIDs] = k*(gNodesPerDim[1]*gNodesPerDim[0]) + i + startGID + (lNodesPerDim[1] - 1)*gNodesPerDim[0]; + sendLIDs[countIDs] = k*lNodesPerDim[1]*lNodesPerDim[0] + + (lNodesPerDim[1] - 1)*lNodesPerDim[0] + i; sendPIDs[countIDs] = myRank + procsPerDim[0]; ++countIDs; } @@ -834,6 +849,8 @@ void createRegionData(const int numDimensions, for(LO i = 0; i < lNodesPerDim[0]; ++i) { sendGIDs[countIDs] = j*gNodesPerDim[0] + i + startGID + (lNodesPerDim[2] - 1)*gNodesPerDim[1]*gNodesPerDim[0]; + sendLIDs[countIDs] = (lNodesPerDim[2] - 1)*lNodesPerDim[1]*lNodesPerDim[0] + + j*lNodesPerDim[0] + i; sendPIDs[countIDs] = myRank + procsPerDim[1]*procsPerDim[0]; ++countIDs; } @@ -843,6 +860,8 @@ void createRegionData(const int numDimensions, sendGIDs[countIDs] = i + startGID + (lNodesPerDim[2] - 1)*gNodesPerDim[1]*gNodesPerDim[0] + (lNodesPerDim[1] - 1)*gNodesPerDim[0]; + sendLIDs[countIDs] = (lNodesPerDim[2] - 1)*lNodesPerDim[1]*lNodesPerDim[0] + + (lNodesPerDim[1] - 1)*lNodesPerDim[0] + i; sendPIDs[countIDs] = myRank + procsPerDim[1]*procsPerDim[0] + procsPerDim[0]; ++countIDs; } @@ -862,6 +881,8 @@ void createRegionData(const int numDimensions, sendGIDs[countIDs] = k*(gNodesPerDim[1]*gNodesPerDim[0]) + j*gNodesPerDim[0] + startGID + lNodesPerDim[0] - 1; + sendLIDs[countIDs] = k*(lNodesPerDim[1]*lNodesPerDim[0]) + + j*lNodesPerDim[0] + lNodesPerDim[0] - 1; sendPIDs[countIDs] = myRank + 1; ++countIDs; } @@ -871,6 +892,8 @@ void createRegionData(const int numDimensions, for(LO i = 0; i < lNodesPerDim[0]; ++i) { sendGIDs[countIDs] = j*gNodesPerDim[0] + i + startGID + (lNodesPerDim[2] - 1)*gNodesPerDim[1]*gNodesPerDim[0]; + sendLIDs[countIDs] = (lNodesPerDim[2] - 1)*lNodesPerDim[1]*lNodesPerDim[0] + + j*lNodesPerDim[0] + i; sendPIDs[countIDs] = myRank + procsPerDim[1]*procsPerDim[0]; ++countIDs; } @@ -879,6 +902,8 @@ void createRegionData(const int numDimensions, for(LO j = 0; j < lNodesPerDim[1]; ++j) { sendGIDs[countIDs] = j*gNodesPerDim[0] + startGID + (lNodesPerDim[2] - 1)*gNodesPerDim[1]*gNodesPerDim[0] + lNodesPerDim[0] - 1; + sendLIDs[countIDs] = (lNodesPerDim[2] - 1)*lNodesPerDim[1]*lNodesPerDim[0] + + j*lNodesPerDim[0] + lNodesPerDim[0] - 1; sendPIDs[countIDs] = myRank + procsPerDim[1]*procsPerDim[0] + 1; ++countIDs; } @@ -895,6 +920,8 @@ void createRegionData(const int numDimensions, for(LO j = 0; j < lNodesPerDim[1]; ++j) { sendGIDs[countIDs] = k*gNodesPerDim[1]*gNodesPerDim[0] + j*gNodesPerDim[0] + startGID + lNodesPerDim[0] - 1; + sendLIDs[countIDs] = k*lNodesPerDim[1]*lNodesPerDim[0] + + j*lNodesPerDim[0] + lNodesPerDim[0] - 1; sendPIDs[countIDs] = myRank + 1; ++countIDs; } @@ -904,6 +931,8 @@ void createRegionData(const int numDimensions, for(LO i = 0; i < lNodesPerDim[0]; ++i) { sendGIDs[countIDs] = k*gNodesPerDim[1]*gNodesPerDim[0] + i + startGID + (lNodesPerDim[1] - 1)*gNodesPerDim[0]; + sendLIDs[countIDs] = k*lNodesPerDim[1]*lNodesPerDim[0] + + (lNodesPerDim[1] - 1)*lNodesPerDim[0] + i; sendPIDs[countIDs] = myRank + procsPerDim[0]; ++countIDs; } @@ -912,6 +941,8 @@ void createRegionData(const int numDimensions, for(LO k = 0; k < lNodesPerDim[2]; ++k) { sendGIDs[countIDs] = k*gNodesPerDim[1]*gNodesPerDim[0] + startGID + (lNodesPerDim[1] - 1)*gNodesPerDim[0] + lNodesPerDim[0] - 1; + sendLIDs[countIDs] = k*(lNodesPerDim[1]*lNodesPerDim[0]) + + lNodesPerDim[1]*lNodesPerDim[0] - 1; sendPIDs[countIDs] = myRank + procsPerDim[0] + 1; ++countIDs; } @@ -928,6 +959,8 @@ void createRegionData(const int numDimensions, for(LO i = 0; i < lNodesPerDim[0]; ++i) { sendGIDs[countIDs] = j*gNodesPerDim[0] + i + startGID + (lNodesPerDim[2] - 1)*gNodesPerDim[0]*gNodesPerDim[1]; + sendLIDs[countIDs] = (lNodesPerDim[2] - 1)*lNodesPerDim[1]*lNodesPerDim[0] + + j*lNodesPerDim[0] + i; sendPIDs[countIDs] = myRank + procsPerDim[1]*procsPerDim[0]; ++countIDs; } @@ -945,6 +978,8 @@ void createRegionData(const int numDimensions, for(LO i = 0; i < lNodesPerDim[0]; ++i) { sendGIDs[countIDs] = k*gNodesPerDim[1]*gNodesPerDim[0] + i + startGID + (lNodesPerDim[1] - 1)*gNodesPerDim[0]; + sendLIDs[countIDs] = k*lNodesPerDim[1]*lNodesPerDim[0] + + (lNodesPerDim[1] - 1)*lNodesPerDim[0] + i; sendPIDs[countIDs] = myRank + procsPerDim[0]; ++countIDs; } @@ -962,6 +997,8 @@ void createRegionData(const int numDimensions, for(LO j = 0; j < lNodesPerDim[1]; ++j) { sendGIDs[countIDs] = k*gNodesPerDim[1]*gNodesPerDim[0] + j*gNodesPerDim[0] + startGID + lNodesPerDim[0] - 1; + sendLIDs[countIDs] = k*lNodesPerDim[1]*lNodesPerDim[0] + + j*lNodesPerDim[0] + lNodesPerDim[0] - 1; sendPIDs[countIDs] = myRank + 1; ++countIDs; } @@ -1022,16 +1059,22 @@ void createRegionData(const int numDimensions, // Here we gather the interface GIDs (in composite layout) // and the interface LIDs (in region layout) for the local rank - interfaceLIDsData.resize(sendGIDs.size() + receiveGIDs.size()); - interfaceGIDs.resize(sendGIDs.size() + receiveGIDs.size()); + interfaceLIDsData.resize((sendGIDs.size() + receiveGIDs.size()) * numDofsPerNode); + interfaceGIDs.resize((sendGIDs.size() + receiveGIDs.size()) * numDofsPerNode); using size_type = typename Teuchos::Array::size_type; - for(size_type idx = 0; idx < sendGIDs.size(); ++idx) { - interfaceGIDs[idx] = sendGIDs[idx]; - interfaceLIDsData[idx] = compositeToRegionLIDs[sendLIDs[idx]]; + for(size_type nodeIdx = 0; nodeIdx < sendGIDs.size(); ++nodeIdx) { + for(int dof = 0; dof < numDofsPerNode; ++dof) { + LO dofIdx = nodeIdx*numDofsPerNode + dof; + interfaceGIDs[dofIdx] = sendGIDs[nodeIdx] * numDofsPerNode + dof; + interfaceLIDsData[dofIdx] = compositeToRegionLIDs[sendLIDs[nodeIdx] * numDofsPerNode + dof]; + } } - for(size_type idx = 0; idx < receiveGIDs.size(); ++idx) { - interfaceGIDs[idx + sendGIDs.size()] = receiveGIDs[idx]; - interfaceLIDsData[idx + sendLIDs.size()] = receiveLIDs[idx]; + for(size_type nodeIdx = 0; nodeIdx < receiveGIDs.size(); ++nodeIdx) { + for(int dof = 0; dof < numDofsPerNode; ++dof) { + LO dofIdx = nodeIdx*numDofsPerNode + dof; + interfaceGIDs[dofIdx + sendGIDs.size() * numDofsPerNode] = receiveGIDs[nodeIdx] * numDofsPerNode + dof; + interfaceLIDsData[dofIdx + sendLIDs.size() * numDofsPerNode] = receiveLIDs[nodeIdx] * numDofsPerNode + dof; + } } // Have all the GIDs and LIDs we stort them in place with std::sort() @@ -1145,38 +1188,4 @@ void ExtractListOfInterfaceRegionGIDs( } } // ExtractListOfInterfaceRegionGIDs -/*! -\brief Constructing coarse level regionPerGIDWith rank from finer level - -The goal is to construct the coarse level without communication, -but simply by following how nodes are aggregated in the prolongator. - -*/ -// template -// void ComputeCoarseRegionPerGIDWithGhosts(const int maxRegPerGID, const LO currentLevel) { -// using GO = GlobalOrdinal; -// using LO = LocalOrdinal; - -// Array > regionPerGIDWithGhostsFine(maxRegPerGID); -// Array > regionPerGIDWithGhostsCoarse(maxRegPerGID); -// for(size_t idx = 0; idx < static_cast(maxRegPerGID); ++idx) { -// regionPerGIDWithGhostsFine[idx] = regionsPerGIDWithGhosts[currentLevel - 1]->getData(idx); -// regionPerGIDWithGhostsCoarse[idx] = regionsPerGIDWithGhosts[currentLevel]->getDataNonConst(idx); -// } - -// for(size_t fineIdx = 0; fineIdx < numFineRegionNodes; ++fineIdx) { -// ArrayView coarseRegionLID; // Should contain a single value -// ArrayView dummyData; // Should contain a single value -// regProlong[currentLevel][0]->getLocalRowView(fineIdx, -// coarseRegionLID, -// dummyData); -// out << "fineLID: " << fineIdx << ", coarseLID: " << coarseRegionLID[0] << ", PIDs: { "; -// for(size_t idx = 0; idx < static_cast(maxRegPerGID); ++idx) { -// out << regionPerGIDWithGhostsFine[idx][fineIdx] << " "; -// } -// out << "}" << std::endl; -// } - -// } // ComputeCoarseRegionPerGIDWithGhosts - #endif // MUELU_SETUPREGIONUTILITIES_HPP diff --git a/packages/muelu/research/regionMG/examples/structured/CMakeLists.txt b/packages/muelu/research/regionMG/examples/structured/CMakeLists.txt index 8683898dba90..3c433066f9fa 100644 --- a/packages/muelu/research/regionMG/examples/structured/CMakeLists.txt +++ b/packages/muelu/research/regionMG/examples/structured/CMakeLists.txt @@ -26,6 +26,7 @@ IF (${PACKAGE_NAME}_ENABLE_Tpetra AND ${PACKAGE_NAME}_ENABLE_Amesos2) compare_residual_history.py gold_files/Star2D_GS_4.log.gold gold_files/Brick3D_linear_4.log.gold + gold_files/Elasticity3D_linear_4.log.gold ) ## These are some completion tests @@ -223,6 +224,21 @@ TRIBITS_ADD_TEST( OVERALL_NUM_MPI_PROCS 4 ) - ENDIF() + TRIBITS_ADD_ADVANCED_TEST( + Structured_Region_Linear_Elasticity3D_Tpetra_MPI_4_regression + TEST_0 + EXEC StructuredRegionDriver + ARGS --linAlgebra=Tpetra --xml=structured_linear_3dof.xml --matrixType=Elasticity3D --nx=10 --ny=10 --nz=10 --smootherIts=2 --convergence-log=Elasticity3D_linear_4.log + NUM_MPI_PROCS 4 + TEST_1 + CMND ${PYTHON_EXECUTABLE} + ARGS compare_residual_history.py gold_files/Elasticity3D_linear_4.log.gold Elasticity3D_linear_4.log 1.0e-12 + STANDARD_PASS_OUTPUT + FAIL_FAST + COMM serial mpi + OVERALL_NUM_MPI_PROCS 4 + ) + +ENDIF() ENDIF() diff --git a/packages/muelu/research/regionMG/examples/structured/Driver_Structured_Regions.cpp b/packages/muelu/research/regionMG/examples/structured/Driver_Structured_Regions.cpp index c2015173f3a6..30d7afbcb767 100644 --- a/packages/muelu/research/regionMG/examples/structured/Driver_Structured_Regions.cpp +++ b/packages/muelu/research/regionMG/examples/structured/Driver_Structured_Regions.cpp @@ -592,7 +592,7 @@ int main_(Teuchos::CommandLineProcessor &clp, Xpetra::UnderlyingLib& lib, int ar lNodesPerDim, sendGIDs, sendPIDs, interfaceLIDsData, regionsPerGIDWithGhosts, interfaceGIDsMV); - Teuchos::Array regionMatVecLIDs; + Teuchos::ArrayRCP regionMatVecLIDs; RCP regionInterfaceImporter; SetupMatVec(interfaceGIDsMV, regionsPerGIDWithGhosts, revisedRowMapPerGrp, rowImportPerGrp, regionMatVecLIDs, regionInterfaceImporter); @@ -669,7 +669,7 @@ int main_(Teuchos::CommandLineProcessor &clp, Xpetra::UnderlyingLib& lib, int ar Array > > regionsPerGIDWithGhostsPerLevel(1); interfaceGIDsPerLevel[0] = interfaceGIDsMV; regionsPerGIDWithGhostsPerLevel[0] = regionsPerGIDWithGhosts; - Array > regionMatVecLIDsPerLevel(1); + Array > regionMatVecLIDsPerLevel(1); Array > > regionInterfaceImporterPerLevel(1); regionMatVecLIDsPerLevel[0] = regionMatVecLIDs; regionInterfaceImporterPerLevel[0] = regionInterfaceImporter; diff --git a/packages/muelu/research/regionMG/examples/structured/gold_files/Elasticity3D_linear_4.log.gold b/packages/muelu/research/regionMG/examples/structured/gold_files/Elasticity3D_linear_4.log.gold new file mode 100644 index 000000000000..b11fe0b0c65a --- /dev/null +++ b/packages/muelu/research/regionMG/examples/structured/gold_files/Elasticity3D_linear_4.log.gold @@ -0,0 +1,46 @@ +# num procs = 4 +# iteration | res-norm (scaled=1) +# +0 1.0000000000000000e+00 +1 8.7387372561579982e-02 +2 2.6779339721650273e-02 +3 1.0897915740125570e-02 +4 5.0711766707333171e-03 +5 2.5398006285216827e-03 +6 1.3217706827315509e-03 +7 7.0161218046413409e-04 +8 3.7641863971192623e-04 +9 2.0321883293832906e-04 +10 1.1015747962138618e-04 +11 5.9883501360093885e-05 +12 3.2624739413029656e-05 +13 1.7805250083901561e-05 +14 9.7316084864752149e-06 +15 5.3255619248060482e-06 +16 2.9175636856106274e-06 +17 1.5999008571909745e-06 +18 8.7808617287649321e-07 +19 4.8229573408458662e-07 +20 2.6508710806066216e-07 +21 1.4579216204013789e-07 +22 8.0227944311909828e-08 +23 4.4171496857346505e-08 +24 2.4331319070860639e-08 +25 1.3408528408692128e-08 +26 7.3922349902447742e-09 +27 4.0769841165696550e-09 +28 2.2493769755710303e-09 +29 1.2414766370834419e-09 +30 6.8542923294521717e-10 +31 3.7855638452541692e-10 +32 2.0914130905584212e-10 +33 1.1558166921508030e-10 +34 6.3896589743473963e-11 +35 3.5335127002491974e-11 +36 1.9546882133191252e-11 +37 1.0816646713788951e-11 +38 5.9876354608459440e-12 +39 3.3156569336134538e-12 +40 1.8367075485414002e-12 +41 1.0178221722103837e-12 +42 5.6424945860258460e-13 diff --git a/packages/muelu/src/Graph/Containers/MueLu_LWGraph_kokkos_decl.hpp b/packages/muelu/src/Graph/Containers/MueLu_LWGraph_kokkos_decl.hpp index 7e8a5cf667ca..e2fea7c66add 100644 --- a/packages/muelu/src/Graph/Containers/MueLu_LWGraph_kokkos_decl.hpp +++ b/packages/muelu/src/Graph/Containers/MueLu_LWGraph_kokkos_decl.hpp @@ -87,7 +87,7 @@ namespace MueLu { using map_type = Xpetra::Map; using local_graph_type = Kokkos::StaticCrsGraph; + device_type, void, size_t>; using boundary_nodes_type = Kokkos::View; using row_type = Kokkos::View; diff --git a/packages/muelu/src/Graph/HybridAggregation/MueLu_HybridAggregationFactory_def.hpp b/packages/muelu/src/Graph/HybridAggregation/MueLu_HybridAggregationFactory_def.hpp index ac5f81ddc2f6..e83f110d6525 100644 --- a/packages/muelu/src/Graph/HybridAggregation/MueLu_HybridAggregationFactory_def.hpp +++ b/packages/muelu/src/Graph/HybridAggregation/MueLu_HybridAggregationFactory_def.hpp @@ -472,12 +472,13 @@ namespace MueLu { for(int interfaceIdx = 0; interfaceIdx < numInterfaces; ++interfaceIdx) { numCoarseNodes = 1; for(int dim = 0; dim < 3; ++dim) { - endRate = interfacesDimensions[3*interfaceIdx + dim] % coarseRate[dim]; + endRate = (interfacesDimensions[3*interfaceIdx + dim] - 1) % coarseRate[dim]; if(interfacesDimensions[3*interfaceIdx + dim] == 1) { coarseInterfacesDimensions[3*interfaceIdx + dim] = 1; } else { coarseInterfacesDimensions[3*interfaceIdx + dim] - = (interfacesDimensions[3*interfaceIdx + dim] - endRate - 1) / coarseRate[dim] + 2; + = (interfacesDimensions[3*interfaceIdx+dim]-1) / coarseRate[dim] + 2; + if(endRate==0){ coarseInterfacesDimensions[3*interfaceIdx + dim]--;} } numCoarseNodes *= coarseInterfacesDimensions[3*interfaceIdx + dim]; } @@ -553,6 +554,9 @@ namespace MueLu { rate = endRate[dim]; } if(rem > (rate / 2)) {++coarseIJK[dim];} + if(coarseNodesPerDim[dim] - coarseIJK[dim] > fineNodesPerDim[dim]-nodeIJK[dim]){ + ++coarseIJK[dim]; + } } for(LO dim = 0; dim < 3; ++dim) { diff --git a/packages/muelu/src/Graph/MatrixTransformation/MueLu_CoalesceDropFactory_decl.hpp b/packages/muelu/src/Graph/MatrixTransformation/MueLu_CoalesceDropFactory_decl.hpp index 35b5c9d156a7..6d1ce51e959f 100644 --- a/packages/muelu/src/Graph/MatrixTransformation/MueLu_CoalesceDropFactory_decl.hpp +++ b/packages/muelu/src/Graph/MatrixTransformation/MueLu_CoalesceDropFactory_decl.hpp @@ -172,6 +172,8 @@ namespace MueLu { //! Method to merge rows of matrix for systems of PDEs. void MergeRows(const Matrix& A, const LO row, Array& cols, const Array& translation) const; void MergeRowsWithDropping(const Matrix& A, const LO row, const ArrayRCP& ghostedDiagVals, SC threshold, Array& cols, const Array& translation) const; + + }; //class CoalesceDropFactory } //namespace MueLu diff --git a/packages/muelu/src/Graph/MatrixTransformation/MueLu_CoalesceDropFactory_def.hpp b/packages/muelu/src/Graph/MatrixTransformation/MueLu_CoalesceDropFactory_def.hpp index 22ac4d0db2ec..67a6a5cc1c23 100644 --- a/packages/muelu/src/Graph/MatrixTransformation/MueLu_CoalesceDropFactory_def.hpp +++ b/packages/muelu/src/Graph/MatrixTransformation/MueLu_CoalesceDropFactory_def.hpp @@ -83,6 +83,29 @@ namespace MueLu { + namespace Details { + template + struct DropTol { + + DropTol() = default; + DropTol(DropTol const&) = default; + DropTol(DropTol &&) = default; + + DropTol& operator=(DropTol const&) = default; + DropTol& operator=(DropTol &&) = default; + + DropTol(real_type val_, real_type diag_, LO col_, bool drop_) + : val{val_}, diag{diag_}, col{col_}, drop{drop_} + {} + + real_type val {Teuchos::ScalarTraits::zero()}; + real_type diag {Teuchos::ScalarTraits::zero()}; + LO col {Teuchos::OrdinalTraits::invalid()}; + bool drop {true}; + }; + } + + template RCP CoalesceDropFactory::GetValidParameterList() const { RCP validParamList = rcp(new ParameterList()); @@ -97,6 +120,7 @@ namespace MueLu { rcp(new validatorType(Teuchos::tuple("classical", "distance laplacian"), "aggregation: drop scheme"))); } SET_VALID_ENTRY("aggregation: distance laplacian algo"); + SET_VALID_ENTRY("aggregation: classical algo"); #undef SET_VALID_ENTRY validParamList->set< bool > ("lightweight wrap", true, "Experimental option for lightweight graph access"); @@ -162,7 +186,8 @@ namespace MueLu { SC threshold = as(pL.get("aggregation: drop tol")); std::string distanceLaplacianAlgoStr = pL.get("aggregation: distance laplacian algo"); - real_type distanceLaplacianThreshold = STS::magnitude(threshold); + std::string classicalAlgoStr = pL.get("aggregation: classical algo"); + real_type realThreshold = STS::magnitude(threshold);// CMS: Rename this to "magnitude threshold" sometime //////////////////////////////////////////////////// // Remove this bit once we are confident that cut-based dropping works. #ifdef HAVE_MUELU_DEBUG @@ -175,7 +200,7 @@ namespace MueLu { if (getenv("MUELU_DROP_TOLERANCE_THRESHOLD")) { auto tmp = atoi(getenv("MUELU_DROP_TOLERANCE_THRESHOLD")); - distanceLaplacianThreshold = 1e-4*tmp; + realThreshold = 1e-4*tmp; } # ifdef HAVE_MUELU_DEBUG @@ -186,9 +211,10 @@ namespace MueLu { #endif //////////////////////////////////////////////////// - enum distanceLaplacianAlgoType {defaultAlgo, unscaled_cut, scaled_cut}; + enum decisionAlgoType {defaultAlgo, unscaled_cut, scaled_cut, scaled_cut_symmetric}; - distanceLaplacianAlgoType distanceLaplacianAlgo = defaultAlgo; + decisionAlgoType distanceLaplacianAlgo = defaultAlgo; + decisionAlgoType classicalAlgo = defaultAlgo; if (algo == "distance laplacian") { if (distanceLaplacianAlgoStr == "default") distanceLaplacianAlgo = defaultAlgo; @@ -196,9 +222,22 @@ namespace MueLu { distanceLaplacianAlgo = unscaled_cut; else if (distanceLaplacianAlgoStr == "scaled cut") distanceLaplacianAlgo = scaled_cut; + else if (distanceLaplacianAlgoStr == "scaled cut symmetric") + distanceLaplacianAlgo = scaled_cut_symmetric; else TEUCHOS_TEST_FOR_EXCEPTION(true, Exceptions::RuntimeError, "\"aggregation: distance laplacian algo\" must be one of (default|unscaled cut|scaled cut), not \"" << distanceLaplacianAlgoStr << "\""); GetOStream(Runtime0) << "algorithm = \"" << algo << "\" distance laplacian algorithm = \"" << distanceLaplacianAlgoStr << "\": threshold = " << threshold << ", blocksize = " << A->GetFixedBlockSize() << std::endl; + } else if (algo == "classical") { + if (classicalAlgoStr == "default") + classicalAlgo = defaultAlgo; + else if (classicalAlgoStr == "unscaled cut") + classicalAlgo = unscaled_cut; + else if (classicalAlgoStr == "scaled cut") + classicalAlgo = scaled_cut; + else + TEUCHOS_TEST_FOR_EXCEPTION(true, Exceptions::RuntimeError, "\"aggregation: classical algo\" must be one of (default|unscaled cut|scaled cut), not \"" << classicalAlgoStr << "\""); + GetOStream(Runtime0) << "algorithm = \"" << algo << "\" classical algorithm = \"" << classicalAlgoStr << "\": threshold = " << threshold << ", blocksize = " << A->GetFixedBlockSize() << std::endl; + } else GetOStream(Runtime0) << "algorithm = \"" << algo << "\": threshold = " << threshold << ", blocksize = " << A->GetFixedBlockSize() << std::endl; Set(currentLevel, "Filtering", (threshold != STS::zero())); @@ -262,10 +301,9 @@ namespace MueLu { RCP ghostedDiag = MueLu::Utilities::GetMatrixOverlappedDiagonal(*A); const ArrayRCP ghostedDiagVals = ghostedDiag->getData(0); - const ArrayRCP boundaryNodes(A->getNodeNumRows(), false); + ArrayRCP boundaryNodes = MueLu::Utilities::DetectDirichletRows(*A, dirichletThreshold); LO realnnz = 0; - rows[0] = 0; for (LO row = 0; row < Teuchos::as(A->getRowMap()->getNodeNumElements()); ++row) { size_t nnz = A->getNumEntriesInLocalRow(row); @@ -273,39 +311,139 @@ namespace MueLu { ArrayView vals; A->getLocalRowView(row, indices, vals); - //FIXME the current predrop function uses the following - //FIXME if(std::abs(vals[k]) > std::abs(threshold_) || grow == gcid ) - //FIXME but the threshold doesn't take into account the rows' diagonal entries - //FIXME For now, hardwiring the dropping in here + if(classicalAlgo == defaultAlgo) { + //FIXME the current predrop function uses the following + //FIXME if(std::abs(vals[k]) > std::abs(threshold_) || grow == gcid ) + //FIXME but the threshold doesn't take into account the rows' diagonal entries + //FIXME For now, hardwiring the dropping in here + + LO rownnz = 0; + for (LO colID = 0; colID < Teuchos::as(nnz); colID++) { + LO col = indices[colID]; + + // we avoid a square root by using squared values + typename STS::magnitudeType aiiajj = STS::magnitude(threshold*threshold * ghostedDiagVals[col]*ghostedDiagVals[row]); // eps^2*|a_ii|*|a_jj| + typename STS::magnitudeType aij = STS::magnitude(vals[colID]*vals[colID]); // |a_ij|^2 + + if (aij > aiiajj || row == col) { + columns[realnnz++] = col; + rownnz++; + } else + numDropped++; + } + rows[row+1] = realnnz; + } + else { + /* Cut Algorithm */ + //CMS + using DropTol = Details::DropTol; + std::vector drop_vec; + drop_vec.reserve(nnz); + const real_type zero = Teuchos::ScalarTraits::zero(); + const real_type one = Teuchos::ScalarTraits::one(); + LO rownnz = 0; + + // find magnitudes + for (LO colID = 0; colID < (LO)nnz; colID++) { + LO col = indices[colID]; + if (row == col) { + drop_vec.emplace_back( zero, one, colID, false); + continue; + } + + // Don't aggregate boundaries + if(boundaryNodes[colID]) continue; + typename STS::magnitudeType aiiajj = STS::magnitude(threshold*threshold * ghostedDiagVals[col]*ghostedDiagVals[row]); // eps^2*|a_ii|*|a_jj| + typename STS::magnitudeType aij = STS::magnitude(vals[colID]*vals[colID]); // |a_ij|^2 + drop_vec.emplace_back(aij, aiiajj, colID, false); + } - LO rownnz = 0; - for (LO colID = 0; colID < Teuchos::as(nnz); colID++) { - LO col = indices[colID]; + const size_t n = drop_vec.size(); + + if (classicalAlgo == unscaled_cut) { + std::sort( drop_vec.begin(), drop_vec.end() + , [](DropTol const& a, DropTol const& b) { + return a.val > b.val; + }); + + bool drop = false; + for (size_t i=1; i realThreshold*b) { + drop = true; +#ifdef HAVE_MUELU_DEBUG + if (distanceLaplacianCutVerbose) { + std::cout << "DJS: KEEP, N, ROW: " << i+1 << ", " << n << ", " << row << std::endl; + } +#endif + } + } + drop_vec[i].drop = drop; + } + } else if (classicalAlgo == scaled_cut) { + std::sort( drop_vec.begin(), drop_vec.end() + , [](DropTol const& a, DropTol const& b) { + return a.val/a.diag > b.val/b.diag; + }); + bool drop = false; + // printf("[%d] Scaled Cut: ",(int)row); + // printf("%3d(%4s) ",indices[drop_vec[0].col],"keep"); + for (size_t i=1; i realThreshold*b) { + drop = true; - // we avoid a square root by using squared values - typename STS::magnitudeType aiiajj = STS::magnitude(threshold*threshold * ghostedDiagVals[col]*ghostedDiagVals[row]); // eps^2*|a_ii|*|a_jj| - typename STS::magnitudeType aij = STS::magnitude(vals[colID]*vals[colID]); // |a_ij|^2 +#ifdef HAVE_MUELU_DEBUG + if (distanceLaplacianCutVerbose) { + std::cout << "DJS: KEEP, N, ROW: " << i+1 << ", " << n << ", " << row << std::endl; + } +#endif + } + // printf("%3d(%4s) ",indices[drop_vec[i].col],drop?"drop":"keep"); - if (aij > aiiajj || row == col) { - columns[realnnz++] = col; - rownnz++; - } else - numDropped++; - } - if (rownnz == 1) { - // If the only element remaining after filtering is diagonal, mark node as boundary - // FIXME: this should really be replaced by the following - // if (indices.size() == 1 && indices[0] == row) - // boundaryNodes[row] = true; - // We do not do it this way now because there is no framework for distinguishing isolated - // and boundary nodes in the aggregation algorithms - boundaryNodes[row] = true; + } + drop_vec[i].drop = drop; + } + // printf("\n"); + } + std::sort( drop_vec.begin(), drop_vec.end() + , [](DropTol const& a, DropTol const& b) { + return a.col < b.col; + } + ); + + for (LO idxID =0; idxID<(LO)drop_vec.size(); idxID++) { + LO col = indices[drop_vec[idxID].col]; + // don't drop diagonal + if (row == col) { + columns[realnnz++] = col; + rownnz++; + continue; + } + + if (!drop_vec[idxID].drop) { + columns[realnnz++] = col; + rownnz++; + } else { + numDropped++; + } + } + // CMS + rows[row+1] = realnnz; + } - rows[row+1] = realnnz; - } + }//end for row + columns.resize(realnnz); numTotal = A->getNodeNumEntries(); - RCP graph = rcp(new LWGraph(rows, columns, A->getRowMap(), A->getColMap(), "thresholded graph of A")); graph->SetBoundaryNodeMap(boundaryNodes); if (GetVerbLevel() & Statistics1) { @@ -717,10 +855,20 @@ namespace MueLu { ArrayRCP rows = ArrayRCP(numRows+1); ArrayRCP columns = ArrayRCP(A->getNodeNumEntries()); + // DEBUGGING + for(LO i=0; i<(LO)columns.size(); i++) columns[i]=-666; + + // Extra array for if we're allowing symmetrization with cutting + ArrayRCP rows_stop; + bool use_stop_array = threshold != STS::zero() && distanceLaplacianAlgo == scaled_cut_symmetric; + if(use_stop_array) + rows_stop.resize(numRows); + const ArrayRCP amalgBoundaryNodes(numRows, false); LO realnnz = 0; rows[0] = 0; + Array indicesExtra; { SubFactoryMonitor m1(*this, "Laplacian dropping", currentLevel); @@ -763,6 +911,11 @@ namespace MueLu { LO nnz = indices.size(), rownnz = 0; + if(use_stop_array) { + rows[row+1] = rows[row]+nnz; + realnnz = rows[row]; + } + if (threshold != STS::zero()) { // default if (distanceLaplacianAlgo == defaultAlgo) { @@ -782,7 +935,7 @@ namespace MueLu { SC laplVal = STS::one() / MueLu::Utilities::Distance2(coordData, row, col); - real_type aiiajj = STS::magnitude(distanceLaplacianThreshold*distanceLaplacianThreshold * ghostedLaplDiagData[row]*ghostedLaplDiagData[col]); + real_type aiiajj = STS::magnitude(realThreshold*realThreshold * ghostedLaplDiagData[row]*ghostedLaplDiagData[col]); real_type aij = STS::magnitude(laplVal*laplVal); if (aij > aiiajj) { @@ -794,25 +947,7 @@ namespace MueLu { } } else { /* Cut Algorithm */ - struct DropTol { - - DropTol() = default; - DropTol(DropTol const&) = default; - DropTol(DropTol &&) = default; - - DropTol& operator=(DropTol const&) = default; - DropTol& operator=(DropTol &&) = default; - - DropTol(real_type val_, real_type diag_, LO col_, bool drop_) - : val{val_}, diag{diag_}, col{col_}, drop{drop_} - {} - - real_type val {Teuchos::ScalarTraits::zero()}; - real_type diag {Teuchos::ScalarTraits::zero()}; - LO col {Teuchos::OrdinalTraits::invalid()}; - bool drop {true}; - }; - + using DropTol = Details::DropTol; std::vector drop_vec; drop_vec.reserve(nnz); const real_type zero = Teuchos::ScalarTraits::zero(); @@ -854,7 +989,7 @@ namespace MueLu { auto const& y = drop_vec[i]; auto a = x.val; auto b = y.val; - if (a > distanceLaplacianThreshold*b) { + if (a > realThreshold*b) { drop = true; #ifdef HAVE_MUELU_DEBUG if (distanceLaplacianCutVerbose) { @@ -866,7 +1001,7 @@ namespace MueLu { drop_vec[i].drop = drop; } } - else if (distanceLaplacianAlgo == scaled_cut) { + else if (distanceLaplacianAlgo == scaled_cut || distanceLaplacianAlgo == scaled_cut_symmetric) { std::sort( drop_vec.begin(), drop_vec.end() , [](DropTol const& a, DropTol const& b) { @@ -881,7 +1016,7 @@ namespace MueLu { auto const& y = drop_vec[i]; auto a = x.val/x.diag; auto b = y.val/y.diag; - if (a > distanceLaplacianThreshold*b) { + if (a > realThreshold*b) { drop = true; #ifdef HAVE_MUELU_DEBUG if (distanceLaplacianCutVerbose) { @@ -937,11 +1072,55 @@ namespace MueLu { // and boundary nodes in the aggregation algorithms amalgBoundaryNodes[row] = true; } - rows[row+1] = realnnz; + + if(use_stop_array) + rows_stop[row] = rownnz + rows[row]; + else + rows[row+1] = realnnz; } //for (LO row = 0; row < numRows; row++) } //subtimer - columns.resize(realnnz); + + if (use_stop_array) { + // Do symmetrization of the cut matrix + // NOTE: We assume nested row/column maps here + for (LO row = 0; row < numRows; row++) { + for (LO col = rows[row]; col < rows_stop[row]; col++) { + if(col >= numRows) continue; + + bool found = false; + for(LO t_col = rows[col] ; !found && t_col < rows_stop[col]; t_col++) { + if (t_col == row) + found = true; + } + // We didn't find the transpose buddy, so let's symmetrize, unless we'd be symmetrizing + // into a Dirichlet unknown. In that case don't. + if(!found && !pointBoundaryNodes[col] && rows_stop[col] < rows[col+1]) { + LO new_idx = rows_stop[col]; + columns[new_idx] = row; + rows_stop[col]++; + numDropped--; + } + } + } + + // Condense everything down + LO current_start=0; + for (LO row = 0; row < numRows; row++) { + LO old_start = current_start; + for (LO col = rows[row]; col < rows_stop[row]; col++) { + if(current_start != col) { + columns[current_start] = columns[col]; + } + current_start++; + } + rows[row] = old_start; + } + rows[numRows] = realnnz = current_start; + + } + + columns.resize(realnnz); RCP graph; { diff --git a/packages/muelu/src/Interface/MueLu_HierarchyManager.hpp b/packages/muelu/src/Interface/MueLu_HierarchyManager.hpp index ab4eba8656a0..0f18597c18ca 100644 --- a/packages/muelu/src/Interface/MueLu_HierarchyManager.hpp +++ b/packages/muelu/src/Interface/MueLu_HierarchyManager.hpp @@ -250,6 +250,9 @@ namespace MueLu { if (!matvecParams_.is_null()) H.SetMatvecParams(matvecParams_); H.AllocateLevelMultiVectors(sizeOfMultiVectors_); + // Set hierarchy description. + // This is cached, but involves and MPI_Allreduce. + H.description(); H.describe(H.GetOStream(Runtime0), verbosity_); // When we reuse hierarchy, it is necessary that we don't diff --git a/packages/muelu/src/Interface/MueLu_ML2MueLuParameterTranslator.cpp b/packages/muelu/src/Interface/MueLu_ML2MueLuParameterTranslator.cpp index fa61a37668d6..f5448bab9398 100644 --- a/packages/muelu/src/Interface/MueLu_ML2MueLuParameterTranslator.cpp +++ b/packages/muelu/src/Interface/MueLu_ML2MueLuParameterTranslator.cpp @@ -112,7 +112,7 @@ namespace MueLu { bool valid = false; const int validatorSize = 5; - std::string validator[validatorSize] = {"superlu", "superludist", "klu", "umfpack"}; + std::string validator[validatorSize] = {"superlu", "superludist", "klu", "umfpack", "mumps"}; for (int i=0; i < validatorSize; i++) if (validator[i] == solverType) valid = true; diff --git a/packages/muelu/src/Interface/MueLu_MLParameterListInterpreter_def.hpp b/packages/muelu/src/Interface/MueLu_MLParameterListInterpreter_def.hpp index 779f429433e9..2804e5f98b61 100644 --- a/packages/muelu/src/Interface/MueLu_MLParameterListInterpreter_def.hpp +++ b/packages/muelu/src/Interface/MueLu_MLParameterListInterpreter_def.hpp @@ -725,7 +725,7 @@ namespace MueLu { // Validator: following upper/lower case is what is allowed by ML bool valid = false; const int validatorSize = 5; - std::string validator[validatorSize] = {"Superlu", "Superludist", "KLU", "UMFPACK"}; /* TODO: should "" be allowed? */ + std::string validator[validatorSize] = {"Superlu", "Superludist", "KLU", "UMFPACK", "MUMPS"}; /* TODO: should "" be allowed? */ for (int i=0; i < validatorSize; i++) { if (validator[i] == solverType) valid = true; } TEUCHOS_TEST_FOR_EXCEPTION(!valid, Exceptions::RuntimeError, "MueLu::MLParameterListInterpreter: unknown smoother type. '" << type << "' not supported."); diff --git a/packages/muelu/src/Interface/MueLu_ParameterListInterpreter_def.hpp b/packages/muelu/src/Interface/MueLu_ParameterListInterpreter_def.hpp index 253aa6111e0e..b70fc39fd05b 100644 --- a/packages/muelu/src/Interface/MueLu_ParameterListInterpreter_def.hpp +++ b/packages/muelu/src/Interface/MueLu_ParameterListInterpreter_def.hpp @@ -958,6 +958,7 @@ namespace MueLu { MUELU_TEST_AND_SET_PARAM_2LIST(paramList, defaultList, "aggregation: drop tol", double, dropParams); MUELU_TEST_AND_SET_PARAM_2LIST(paramList, defaultList, "aggregation: Dirichlet threshold", double, dropParams); MUELU_TEST_AND_SET_PARAM_2LIST(paramList, defaultList, "aggregation: distance laplacian algo", std::string, dropParams); + MUELU_TEST_AND_SET_PARAM_2LIST(paramList, defaultList, "aggregation: classical algo", std::string, dropParams); if (useKokkos_) { MUELU_TEST_AND_SET_PARAM_2LIST(paramList, defaultList, "filtered matrix: use lumping", bool, dropParams); MUELU_TEST_AND_SET_PARAM_2LIST(paramList, defaultList, "filtered matrix: reuse graph", bool, dropParams); @@ -1732,8 +1733,34 @@ namespace MueLu { constraintFactory->SetFactory("CoarseNullspace", manager.GetFactory("Ptent")); manager.SetFactory("Constraint", constraintFactory); - // Energy minimization + // Emin Factory auto P = rcp(new EminPFactory()); + // Filtering + MUELU_SET_VAR_2LIST(paramList, defaultList, "emin: use filtered matrix", bool, useFiltering); + if(useFiltering) { + // NOTE: Here, non-Kokkos and Kokkos versions diverge in the way the + // dependency tree is setup. The Kokkos version has merged the the + // FilteredAFactory into the CoalesceDropFactory. + if (!useKokkos_) { + RCP filterFactory = rcp(new FilteredAFactory()); + + ParameterList fParams; + MUELU_TEST_AND_SET_PARAM_2LIST(paramList, defaultList, "filtered matrix: use lumping", bool, fParams); + MUELU_TEST_AND_SET_PARAM_2LIST(paramList, defaultList, "filtered matrix: reuse graph", bool, fParams); + MUELU_TEST_AND_SET_PARAM_2LIST(paramList, defaultList, "filtered matrix: reuse eigenvalue", bool, fParams); + filterFactory->SetParameterList(fParams); + filterFactory->SetFactory("Graph", manager.GetFactory("Graph")); + // I'm not sure why we need this line. See comments for DofsPerNode for UncoupledAggregation above + filterFactory->SetFactory("Filtering", manager.GetFactory("Graph")); + + P->SetFactory("A", filterFactory); + + } else { + P->SetFactory("A", manager.GetFactory("Graph")); + } + } + + // Energy minimization ParameterList Pparams; MUELU_TEST_AND_SET_PARAM_2LIST(paramList, defaultList, "emin: num iterations", int, Pparams); MUELU_TEST_AND_SET_PARAM_2LIST(paramList, defaultList, "emin: iterative method", std::string, Pparams); diff --git a/packages/muelu/src/MueCentral/MueLu_MasterList.cpp b/packages/muelu/src/MueCentral/MueLu_MasterList.cpp index 93ed385c2c96..e3c35c6da031 100644 --- a/packages/muelu/src/MueCentral/MueLu_MasterList.cpp +++ b/packages/muelu/src/MueCentral/MueLu_MasterList.cpp @@ -199,6 +199,7 @@ namespace MueLu { "" "" "" + "" "" "" "" @@ -282,6 +283,7 @@ namespace MueLu { "" "" "" + "" "" "" "" @@ -505,6 +507,8 @@ namespace MueLu { "" + "" + "" ) ; @@ -584,6 +588,8 @@ namespace MueLu { ("aggregation: distance laplacian algo","aggregation: distance laplacian algo") + ("aggregation: classical algo","aggregation: classical algo") + ("aggregation: threshold","aggregation: drop tol") ("aggregation: min agg size","aggregation: min agg size") @@ -750,6 +756,8 @@ namespace MueLu { ("emin: pattern order","emin: pattern order") + ("emin: use filtered matrix","emin: use filtered matrix") + ("tentative: calculate qr","tentative: calculate qr") ("tentative: constant column sums","tentative: constant column sums") diff --git a/packages/muelu/src/Smoothers/MueLu_StratimikosSmoother_def.hpp b/packages/muelu/src/Smoothers/MueLu_StratimikosSmoother_def.hpp index db85db31bcf9..64b18fbc8c55 100644 --- a/packages/muelu/src/Smoothers/MueLu_StratimikosSmoother_def.hpp +++ b/packages/muelu/src/Smoothers/MueLu_StratimikosSmoother_def.hpp @@ -64,7 +64,7 @@ #include #include "Teuchos_AbstractFactoryStd.hpp" -#if defined(HAVE_MUELU_THYRATPETRAADAPTERS) +#if defined(HAVE_MUELU_THYRATPETRAADAPTERS) && defined(HAVE_MUELU_IFPACK2) #include #endif @@ -109,7 +109,7 @@ namespace MueLu { // Build Stratimikos solver Stratimikos::DefaultLinearSolverBuilder linearSolverBuilder; typedef Thyra::PreconditionerFactoryBase Base; -#if defined(HAVE_MUELU_THYRATPETRAADAPTERS) +#if defined(HAVE_MUELU_THYRATPETRAADAPTERS) && defined(HAVE_MUELU_IFPACK2) typedef Thyra::Ifpack2PreconditionerFactory > Impl; linearSolverBuilder.setPreconditioningStrategyFactory(Teuchos::abstractFactoryStd(), "Ifpack2"); #endif diff --git a/packages/muelu/test/convergence/Convergence.cpp b/packages/muelu/test/convergence/Convergence.cpp index 1619c47a358e..bf0715860f05 100644 --- a/packages/muelu/test/convergence/Convergence.cpp +++ b/packages/muelu/test/convergence/Convergence.cpp @@ -170,7 +170,7 @@ int main_(Teuchos::CommandLineProcessor &clp, Xpetra::UnderlyingLib lib, int arg bool failed = false; for (int k = 0; k < numLists; k++) { const std::string& dirName = dirList[k]; - std::string problemFile = dirName + "problem_" + typeid(GlobalOrdinal).name() + ".xml"; + std::string problemFile = dirName + "problem.xml"; Teuchos::ParameterList galeriParameters; Teuchos::updateParametersFromXmlFileAndBroadcast(problemFile, Teuchos::Ptr(&galeriParameters), *comm); @@ -255,7 +255,8 @@ int main_(Teuchos::CommandLineProcessor &clp, Xpetra::UnderlyingLib lib, int arg for (int i = 0; i < fileList.size(); i++) { if (fileList[i] == "problem_i.xml" || fileList[i] == "problem_l.xml" || - fileList[i] == "problem_x.xml") + fileList[i] == "problem_x.xml" || + fileList[i] == "problem.xml") continue; std::string xmlFile = dirName + fileList[i]; diff --git a/packages/muelu/test/convergence/Convergence/Laplace2D/CMakeLists.txt b/packages/muelu/test/convergence/Convergence/Laplace2D/CMakeLists.txt index 91b4755a4074..ae9b61df9257 100644 --- a/packages/muelu/test/convergence/Convergence/Laplace2D/CMakeLists.txt +++ b/packages/muelu/test/convergence/Convergence/Laplace2D/CMakeLists.txt @@ -1,9 +1,4 @@ -# Note about the use of wildcard in CMakeLists.txt: CMake dont't know -# when new files is added. You need to re-run CMake manually to -# regenerate a build system incorporating the new file. -# YOU MUST ALSO TOUCH A CMAKE CONFIGURATION FILE WHEN YOU PUSH THE NEW -# FILE TO FORCE THE RECONFIGURE ON OTHER PEOPLE'S BUILDS. -FILE(GLOB convFiles RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.xml) +FILE(GLOB convFiles RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} problem.xml smoother1.xml smoother2.xml) TRIBITS_COPY_FILES_TO_BINARY_DIR(Convergence_Laplace2D_cp SOURCE_FILES ${convFiles} diff --git a/packages/muelu/test/convergence/Convergence/Laplace2D/problem_i.xml b/packages/muelu/test/convergence/Convergence/Laplace2D/problem.xml similarity index 95% rename from packages/muelu/test/convergence/Convergence/Laplace2D/problem_i.xml rename to packages/muelu/test/convergence/Convergence/Laplace2D/problem.xml index 93c840d0fd33..1e0fdb4aaeb2 100644 --- a/packages/muelu/test/convergence/Convergence/Laplace2D/problem_i.xml +++ b/packages/muelu/test/convergence/Convergence/Laplace2D/problem.xml @@ -2,7 +2,7 @@ - - + + diff --git a/packages/muelu/test/convergence/Convergence/Laplace2D/problem_l.xml b/packages/muelu/test/convergence/Convergence/Laplace2D/problem_l.xml deleted file mode 100644 index f0af68d7e9f1..000000000000 --- a/packages/muelu/test/convergence/Convergence/Laplace2D/problem_l.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/packages/muelu/test/convergence/Convergence/Laplace2D/problem_x.xml b/packages/muelu/test/convergence/Convergence/Laplace2D/problem_x.xml deleted file mode 100644 index 43807ecc49e9..000000000000 --- a/packages/muelu/test/convergence/Convergence/Laplace2D/problem_x.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/packages/muelu/test/interface/default/Output/MLaux_epetra.gold b/packages/muelu/test/interface/default/Output/MLaux_epetra.gold index 6ade85fad3df..c8a26f07be88 100644 --- a/packages/muelu/test/interface/default/Output/MLaux_epetra.gold +++ b/packages/muelu/test/interface/default/Output/MLaux_epetra.gold @@ -26,6 +26,7 @@ aggregation: drop tol = 0.01 aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = distance laplacian aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) diff --git a/packages/muelu/test/interface/default/Output/MLaux_tpetra.gold b/packages/muelu/test/interface/default/Output/MLaux_tpetra.gold index 757991e119de..94b8b3db166a 100644 --- a/packages/muelu/test/interface/default/Output/MLaux_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/MLaux_tpetra.gold @@ -39,6 +39,7 @@ aggregation: drop tol = 0.01 aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = distance laplacian aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) diff --git a/packages/muelu/test/interface/default/Output/MLcoarse1_epetra.gold b/packages/muelu/test/interface/default/Output/MLcoarse1_epetra.gold index d0cc1480632e..8034ea89bfab 100644 --- a/packages/muelu/test/interface/default/Output/MLcoarse1_epetra.gold +++ b/packages/muelu/test/interface/default/Output/MLcoarse1_epetra.gold @@ -18,11 +18,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -100,11 +101,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -185,11 +187,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) diff --git a/packages/muelu/test/interface/default/Output/MLcoarse1_tpetra.gold b/packages/muelu/test/interface/default/Output/MLcoarse1_tpetra.gold index c2a810888a26..c9286338ac91 100644 --- a/packages/muelu/test/interface/default/Output/MLcoarse1_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/MLcoarse1_tpetra.gold @@ -31,11 +31,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -126,11 +127,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -224,11 +226,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) diff --git a/packages/muelu/test/interface/default/Output/MLcoarse1b_epetra.gold b/packages/muelu/test/interface/default/Output/MLcoarse1b_epetra.gold index 09b160b41053..68976d06dc1c 100644 --- a/packages/muelu/test/interface/default/Output/MLcoarse1b_epetra.gold +++ b/packages/muelu/test/interface/default/Output/MLcoarse1b_epetra.gold @@ -16,11 +16,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -106,11 +107,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -196,11 +198,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/MLcoarse2_epetra.gold b/packages/muelu/test/interface/default/Output/MLcoarse2_epetra.gold index cb8cb67fa343..5cde27692117 100644 --- a/packages/muelu/test/interface/default/Output/MLcoarse2_epetra.gold +++ b/packages/muelu/test/interface/default/Output/MLcoarse2_epetra.gold @@ -18,11 +18,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -100,11 +101,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -185,11 +187,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -270,11 +273,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -355,11 +359,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) diff --git a/packages/muelu/test/interface/default/Output/MLcoarse2_tpetra.gold b/packages/muelu/test/interface/default/Output/MLcoarse2_tpetra.gold index 35692458c932..d892bb056afa 100644 --- a/packages/muelu/test/interface/default/Output/MLcoarse2_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/MLcoarse2_tpetra.gold @@ -31,11 +31,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -126,11 +127,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -224,11 +226,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -322,11 +325,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -420,11 +424,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) diff --git a/packages/muelu/test/interface/default/Output/MLcoarse2b_epetra.gold b/packages/muelu/test/interface/default/Output/MLcoarse2b_epetra.gold index 1bd937a5155d..28ed96a600d3 100644 --- a/packages/muelu/test/interface/default/Output/MLcoarse2b_epetra.gold +++ b/packages/muelu/test/interface/default/Output/MLcoarse2b_epetra.gold @@ -16,11 +16,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -106,11 +107,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -196,11 +198,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -286,11 +289,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -376,11 +380,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/MLcoarse3_epetra.gold b/packages/muelu/test/interface/default/Output/MLcoarse3_epetra.gold index 49a2d29bac0e..2812f48e4189 100644 --- a/packages/muelu/test/interface/default/Output/MLcoarse3_epetra.gold +++ b/packages/muelu/test/interface/default/Output/MLcoarse3_epetra.gold @@ -18,11 +18,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -100,11 +101,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -185,11 +187,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -270,11 +273,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) diff --git a/packages/muelu/test/interface/default/Output/MLcoarse3_tpetra.gold b/packages/muelu/test/interface/default/Output/MLcoarse3_tpetra.gold index 30f422950d71..f9e5c0b8769e 100644 --- a/packages/muelu/test/interface/default/Output/MLcoarse3_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/MLcoarse3_tpetra.gold @@ -31,11 +31,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -126,11 +127,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -224,11 +226,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -322,11 +325,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) diff --git a/packages/muelu/test/interface/default/Output/MLcoarse3b_epetra.gold b/packages/muelu/test/interface/default/Output/MLcoarse3b_epetra.gold index 95523aaaee61..6dedead85860 100644 --- a/packages/muelu/test/interface/default/Output/MLcoarse3b_epetra.gold +++ b/packages/muelu/test/interface/default/Output/MLcoarse3b_epetra.gold @@ -16,11 +16,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -106,11 +107,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -196,11 +198,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -286,11 +289,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/MLcoarse4_epetra.gold b/packages/muelu/test/interface/default/Output/MLcoarse4_epetra.gold index 7a0ce180c921..e741e1c562f4 100644 --- a/packages/muelu/test/interface/default/Output/MLcoarse4_epetra.gold +++ b/packages/muelu/test/interface/default/Output/MLcoarse4_epetra.gold @@ -18,11 +18,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -100,11 +101,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -185,11 +187,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -270,11 +273,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) diff --git a/packages/muelu/test/interface/default/Output/MLcoarse4_tpetra.gold b/packages/muelu/test/interface/default/Output/MLcoarse4_tpetra.gold index 37ac4cdbdd24..3dcadf486289 100644 --- a/packages/muelu/test/interface/default/Output/MLcoarse4_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/MLcoarse4_tpetra.gold @@ -31,11 +31,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -126,11 +127,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -224,11 +226,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -322,11 +325,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) diff --git a/packages/muelu/test/interface/default/Output/MLcoarse4b_epetra.gold b/packages/muelu/test/interface/default/Output/MLcoarse4b_epetra.gold index ec7ed66e8063..ca201323bfaa 100644 --- a/packages/muelu/test/interface/default/Output/MLcoarse4b_epetra.gold +++ b/packages/muelu/test/interface/default/Output/MLcoarse4b_epetra.gold @@ -16,11 +16,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -106,11 +107,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -196,11 +198,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -286,11 +289,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/MLcoarse5_epetra.gold b/packages/muelu/test/interface/default/Output/MLcoarse5_epetra.gold index 72c20078a4e7..560102475b98 100644 --- a/packages/muelu/test/interface/default/Output/MLcoarse5_epetra.gold +++ b/packages/muelu/test/interface/default/Output/MLcoarse5_epetra.gold @@ -18,11 +18,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -100,11 +101,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) diff --git a/packages/muelu/test/interface/default/Output/MLcoarse5_tpetra.gold b/packages/muelu/test/interface/default/Output/MLcoarse5_tpetra.gold index a63b4bae449d..2ad0dd259ab1 100644 --- a/packages/muelu/test/interface/default/Output/MLcoarse5_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/MLcoarse5_tpetra.gold @@ -31,11 +31,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -126,11 +127,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) diff --git a/packages/muelu/test/interface/default/Output/MLempty_epetra.gold b/packages/muelu/test/interface/default/Output/MLempty_epetra.gold index 49a2d29bac0e..2812f48e4189 100644 --- a/packages/muelu/test/interface/default/Output/MLempty_epetra.gold +++ b/packages/muelu/test/interface/default/Output/MLempty_epetra.gold @@ -18,11 +18,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -100,11 +101,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -185,11 +187,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -270,11 +273,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) diff --git a/packages/muelu/test/interface/default/Output/MLemptyb_epetra.gold b/packages/muelu/test/interface/default/Output/MLemptyb_epetra.gold index 95523aaaee61..6dedead85860 100644 --- a/packages/muelu/test/interface/default/Output/MLemptyb_epetra.gold +++ b/packages/muelu/test/interface/default/Output/MLemptyb_epetra.gold @@ -16,11 +16,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -106,11 +107,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -196,11 +198,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -286,11 +289,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/MLpgamg1_epetra.gold b/packages/muelu/test/interface/default/Output/MLpgamg1_epetra.gold index b05f9737a661..359cadca7d3d 100644 --- a/packages/muelu/test/interface/default/Output/MLpgamg1_epetra.gold +++ b/packages/muelu/test/interface/default/Output/MLpgamg1_epetra.gold @@ -18,11 +18,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -102,11 +103,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -189,11 +191,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -276,11 +279,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) diff --git a/packages/muelu/test/interface/default/Output/MLpgamg1_tpetra.gold b/packages/muelu/test/interface/default/Output/MLpgamg1_tpetra.gold index 80b8265a18de..34cd954f30f6 100644 --- a/packages/muelu/test/interface/default/Output/MLpgamg1_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/MLpgamg1_tpetra.gold @@ -31,11 +31,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -128,11 +129,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -228,11 +230,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -328,11 +331,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) diff --git a/packages/muelu/test/interface/default/Output/MLpgamg1b_epetra.gold b/packages/muelu/test/interface/default/Output/MLpgamg1b_epetra.gold index d4bc0cf54982..d5479d183437 100644 --- a/packages/muelu/test/interface/default/Output/MLpgamg1b_epetra.gold +++ b/packages/muelu/test/interface/default/Output/MLpgamg1b_epetra.gold @@ -17,11 +17,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 BuildAggregates (Phase - (Dirichlet)) @@ -103,11 +104,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 BuildAggregates (Phase - (Dirichlet)) @@ -189,11 +191,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 BuildAggregates (Phase - (Dirichlet)) @@ -275,11 +278,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 BuildAggregates (Phase - (Dirichlet)) diff --git a/packages/muelu/test/interface/default/Output/MLpgamg2_epetra.gold b/packages/muelu/test/interface/default/Output/MLpgamg2_epetra.gold index 49a2d29bac0e..2812f48e4189 100644 --- a/packages/muelu/test/interface/default/Output/MLpgamg2_epetra.gold +++ b/packages/muelu/test/interface/default/Output/MLpgamg2_epetra.gold @@ -18,11 +18,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -100,11 +101,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -185,11 +187,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -270,11 +273,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) diff --git a/packages/muelu/test/interface/default/Output/MLpgamg2b_epetra.gold b/packages/muelu/test/interface/default/Output/MLpgamg2b_epetra.gold index 4daeefa0e8c7..868081e08394 100644 --- a/packages/muelu/test/interface/default/Output/MLpgamg2b_epetra.gold +++ b/packages/muelu/test/interface/default/Output/MLpgamg2b_epetra.gold @@ -16,11 +16,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -112,11 +113,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -208,11 +210,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -304,11 +307,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/MLrepartitioning1_epetra.gold b/packages/muelu/test/interface/default/Output/MLrepartitioning1_epetra.gold index 54d0c69864b4..c946b1c80f5c 100644 --- a/packages/muelu/test/interface/default/Output/MLrepartitioning1_epetra.gold +++ b/packages/muelu/test/interface/default/Output/MLrepartitioning1_epetra.gold @@ -21,11 +21,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -152,11 +153,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -283,11 +285,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -414,11 +417,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -545,11 +549,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) diff --git a/packages/muelu/test/interface/default/Output/MLrepartitioning1_tpetra.gold b/packages/muelu/test/interface/default/Output/MLrepartitioning1_tpetra.gold index ad3a2095faba..dff9f7f532e9 100644 --- a/packages/muelu/test/interface/default/Output/MLrepartitioning1_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/MLrepartitioning1_tpetra.gold @@ -34,11 +34,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -178,11 +179,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -322,11 +324,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -466,11 +469,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -610,11 +614,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) diff --git a/packages/muelu/test/interface/default/Output/MLrepartitioning2_epetra.gold b/packages/muelu/test/interface/default/Output/MLrepartitioning2_epetra.gold index c627de5a74a6..7267f32e976b 100644 --- a/packages/muelu/test/interface/default/Output/MLrepartitioning2_epetra.gold +++ b/packages/muelu/test/interface/default/Output/MLrepartitioning2_epetra.gold @@ -21,11 +21,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -152,11 +153,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -283,11 +285,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -414,11 +417,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) diff --git a/packages/muelu/test/interface/default/Output/MLrepartitioning2_tpetra.gold b/packages/muelu/test/interface/default/Output/MLrepartitioning2_tpetra.gold index b7af7453f319..ff2010d8f135 100644 --- a/packages/muelu/test/interface/default/Output/MLrepartitioning2_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/MLrepartitioning2_tpetra.gold @@ -34,11 +34,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -178,11 +179,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -322,11 +324,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -466,11 +469,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) diff --git a/packages/muelu/test/interface/default/Output/MLrepartitioning3_epetra.gold b/packages/muelu/test/interface/default/Output/MLrepartitioning3_epetra.gold index 453f37735fb1..1371eec133ff 100644 --- a/packages/muelu/test/interface/default/Output/MLrepartitioning3_epetra.gold +++ b/packages/muelu/test/interface/default/Output/MLrepartitioning3_epetra.gold @@ -21,11 +21,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -152,11 +153,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -283,11 +285,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -414,11 +417,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) diff --git a/packages/muelu/test/interface/default/Output/MLrepartitioning3_tpetra.gold b/packages/muelu/test/interface/default/Output/MLrepartitioning3_tpetra.gold index 680d916aee2c..0d5e2e0ea70a 100644 --- a/packages/muelu/test/interface/default/Output/MLrepartitioning3_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/MLrepartitioning3_tpetra.gold @@ -34,11 +34,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -178,11 +179,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -322,11 +324,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -466,11 +469,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) diff --git a/packages/muelu/test/interface/default/Output/MLsmoother1_epetra.gold b/packages/muelu/test/interface/default/Output/MLsmoother1_epetra.gold index 49a2d29bac0e..2812f48e4189 100644 --- a/packages/muelu/test/interface/default/Output/MLsmoother1_epetra.gold +++ b/packages/muelu/test/interface/default/Output/MLsmoother1_epetra.gold @@ -18,11 +18,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -100,11 +101,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -185,11 +187,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -270,11 +273,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) diff --git a/packages/muelu/test/interface/default/Output/MLsmoother1_tpetra.gold b/packages/muelu/test/interface/default/Output/MLsmoother1_tpetra.gold index 30f422950d71..f9e5c0b8769e 100644 --- a/packages/muelu/test/interface/default/Output/MLsmoother1_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/MLsmoother1_tpetra.gold @@ -31,11 +31,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -126,11 +127,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -224,11 +226,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -322,11 +325,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) diff --git a/packages/muelu/test/interface/default/Output/MLsmoother1b_epetra.gold b/packages/muelu/test/interface/default/Output/MLsmoother1b_epetra.gold index 95523aaaee61..6dedead85860 100644 --- a/packages/muelu/test/interface/default/Output/MLsmoother1b_epetra.gold +++ b/packages/muelu/test/interface/default/Output/MLsmoother1b_epetra.gold @@ -16,11 +16,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -106,11 +107,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -196,11 +198,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -286,11 +289,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/MLsmoother2_epetra.gold b/packages/muelu/test/interface/default/Output/MLsmoother2_epetra.gold index c78613dc3356..1dd11e45f929 100644 --- a/packages/muelu/test/interface/default/Output/MLsmoother2_epetra.gold +++ b/packages/muelu/test/interface/default/Output/MLsmoother2_epetra.gold @@ -18,11 +18,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -100,11 +101,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -185,11 +187,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -270,11 +273,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) diff --git a/packages/muelu/test/interface/default/Output/MLsmoother2_tpetra.gold b/packages/muelu/test/interface/default/Output/MLsmoother2_tpetra.gold index 983c7073f59e..f06d659ae428 100644 --- a/packages/muelu/test/interface/default/Output/MLsmoother2_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/MLsmoother2_tpetra.gold @@ -31,11 +31,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -126,11 +127,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -224,11 +226,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -322,11 +325,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) diff --git a/packages/muelu/test/interface/default/Output/MLsmoother2b_epetra.gold b/packages/muelu/test/interface/default/Output/MLsmoother2b_epetra.gold index 741f298a8da1..ae21171b4ef9 100644 --- a/packages/muelu/test/interface/default/Output/MLsmoother2b_epetra.gold +++ b/packages/muelu/test/interface/default/Output/MLsmoother2b_epetra.gold @@ -16,11 +16,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -106,11 +107,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -196,11 +198,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -286,11 +289,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/MLsmoother3_epetra.gold b/packages/muelu/test/interface/default/Output/MLsmoother3_epetra.gold index 0e165e9fcc6c..600c4404d8c1 100644 --- a/packages/muelu/test/interface/default/Output/MLsmoother3_epetra.gold +++ b/packages/muelu/test/interface/default/Output/MLsmoother3_epetra.gold @@ -18,11 +18,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -100,11 +101,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -185,11 +187,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -270,11 +273,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) diff --git a/packages/muelu/test/interface/default/Output/MLsmoother3_tpetra.gold b/packages/muelu/test/interface/default/Output/MLsmoother3_tpetra.gold index 14db50b45b50..ddaa74f549c2 100644 --- a/packages/muelu/test/interface/default/Output/MLsmoother3_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/MLsmoother3_tpetra.gold @@ -31,11 +31,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -126,11 +127,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -224,11 +226,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -322,11 +325,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) diff --git a/packages/muelu/test/interface/default/Output/MLsmoother3b_epetra.gold b/packages/muelu/test/interface/default/Output/MLsmoother3b_epetra.gold index a0a0c6df9f8d..bc87ddf4a5b8 100644 --- a/packages/muelu/test/interface/default/Output/MLsmoother3b_epetra.gold +++ b/packages/muelu/test/interface/default/Output/MLsmoother3b_epetra.gold @@ -16,11 +16,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -106,11 +107,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -196,11 +198,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -286,11 +289,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/MLsmoother4_epetra.gold b/packages/muelu/test/interface/default/Output/MLsmoother4_epetra.gold index 9c886182c2bd..e5ba3937557f 100644 --- a/packages/muelu/test/interface/default/Output/MLsmoother4_epetra.gold +++ b/packages/muelu/test/interface/default/Output/MLsmoother4_epetra.gold @@ -17,11 +17,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -98,11 +99,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -182,11 +184,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -266,11 +269,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) diff --git a/packages/muelu/test/interface/default/Output/MLsmoother4_tpetra.gold b/packages/muelu/test/interface/default/Output/MLsmoother4_tpetra.gold index 63c70b034573..8e70f1e54212 100644 --- a/packages/muelu/test/interface/default/Output/MLsmoother4_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/MLsmoother4_tpetra.gold @@ -22,11 +22,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -108,11 +109,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -197,11 +199,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -286,11 +289,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) diff --git a/packages/muelu/test/interface/default/Output/MLsmoother4b_epetra.gold b/packages/muelu/test/interface/default/Output/MLsmoother4b_epetra.gold index 71c50384e699..3a8ad0995985 100644 --- a/packages/muelu/test/interface/default/Output/MLsmoother4b_epetra.gold +++ b/packages/muelu/test/interface/default/Output/MLsmoother4b_epetra.gold @@ -15,11 +15,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -104,11 +105,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -193,11 +195,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -282,11 +285,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/MLunsmoothed1_epetra.gold b/packages/muelu/test/interface/default/Output/MLunsmoothed1_epetra.gold index 5aaa9a2acf5a..7c38208da9a0 100644 --- a/packages/muelu/test/interface/default/Output/MLunsmoothed1_epetra.gold +++ b/packages/muelu/test/interface/default/Output/MLunsmoothed1_epetra.gold @@ -17,11 +17,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -92,11 +93,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -170,11 +172,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -248,11 +251,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) diff --git a/packages/muelu/test/interface/default/Output/MLunsmoothed1_tpetra.gold b/packages/muelu/test/interface/default/Output/MLunsmoothed1_tpetra.gold index cbd215be66b7..55f029b57230 100644 --- a/packages/muelu/test/interface/default/Output/MLunsmoothed1_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/MLunsmoothed1_tpetra.gold @@ -30,11 +30,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -118,11 +119,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -209,11 +211,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) @@ -300,11 +303,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 [default] BuildAggregates (Phase - (Dirichlet)) diff --git a/packages/muelu/test/interface/default/Output/MLunsmoothed1b_epetra.gold b/packages/muelu/test/interface/default/Output/MLunsmoothed1b_epetra.gold index 4bfe6f71ad8a..6e05626a3b1e 100644 --- a/packages/muelu/test/interface/default/Output/MLunsmoothed1b_epetra.gold +++ b/packages/muelu/test/interface/default/Output/MLunsmoothed1b_epetra.gold @@ -16,11 +16,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -106,11 +107,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -196,11 +198,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -286,11 +289,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/aggregatequalities_epetra.gold b/packages/muelu/test/interface/default/Output/aggregatequalities_epetra.gold index 0ffbb41e44f9..faf42afe7a5e 100644 --- a/packages/muelu/test/interface/default/Output/aggregatequalities_epetra.gold +++ b/packages/muelu/test/interface/default/Output/aggregatequalities_epetra.gold @@ -21,6 +21,7 @@ aggregation: drop tol = 0.05 aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = distance laplacian aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Lumping dropped entries @@ -131,6 +132,7 @@ aggregation: drop tol = 0.05 aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = distance laplacian aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Lumping dropped entries diff --git a/packages/muelu/test/interface/default/Output/aggregatequalities_tpetra.gold b/packages/muelu/test/interface/default/Output/aggregatequalities_tpetra.gold index cd7f3815c0d0..c6b1c145e03b 100644 --- a/packages/muelu/test/interface/default/Output/aggregatequalities_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/aggregatequalities_tpetra.gold @@ -34,6 +34,7 @@ aggregation: drop tol = 0.05 aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = distance laplacian aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Lumping dropped entries @@ -157,6 +158,7 @@ aggregation: drop tol = 0.05 aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = distance laplacian aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Lumping dropped entries diff --git a/packages/muelu/test/interface/default/Output/aggregation1_epetra.gold b/packages/muelu/test/interface/default/Output/aggregation1_epetra.gold index 8ec719fe7978..16b701ae70fe 100644 --- a/packages/muelu/test/interface/default/Output/aggregation1_epetra.gold +++ b/packages/muelu/test/interface/default/Output/aggregation1_epetra.gold @@ -16,11 +16,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -106,11 +107,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/aggregation1_tpetra.gold b/packages/muelu/test/interface/default/Output/aggregation1_tpetra.gold index 897d2b621573..1fc1e826a31f 100644 --- a/packages/muelu/test/interface/default/Output/aggregation1_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/aggregation1_tpetra.gold @@ -29,11 +29,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -132,11 +133,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/aggregation2_epetra.gold b/packages/muelu/test/interface/default/Output/aggregation2_epetra.gold index d2a0334b33dc..8ec6d7902fb8 100644 --- a/packages/muelu/test/interface/default/Output/aggregation2_epetra.gold +++ b/packages/muelu/test/interface/default/Output/aggregation2_epetra.gold @@ -16,11 +16,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -85,11 +86,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/aggregation2_tpetra.gold b/packages/muelu/test/interface/default/Output/aggregation2_tpetra.gold index c70ad60874f5..b32ac768ef4e 100644 --- a/packages/muelu/test/interface/default/Output/aggregation2_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/aggregation2_tpetra.gold @@ -29,11 +29,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -111,11 +112,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/aggregation3_epetra.gold b/packages/muelu/test/interface/default/Output/aggregation3_epetra.gold index c1a27003cc97..e944250fc885 100644 --- a/packages/muelu/test/interface/default/Output/aggregation3_epetra.gold +++ b/packages/muelu/test/interface/default/Output/aggregation3_epetra.gold @@ -16,11 +16,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0.02, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0.02, blocksize = 1 aggregation: drop tol = 0.02 aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Lumping dropped entries @@ -106,11 +107,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0.02, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0.02, blocksize = 1 aggregation: drop tol = 0.02 aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Lumping dropped entries diff --git a/packages/muelu/test/interface/default/Output/aggregation3_tpetra.gold b/packages/muelu/test/interface/default/Output/aggregation3_tpetra.gold index b9f7225c2783..6831206b8e95 100644 --- a/packages/muelu/test/interface/default/Output/aggregation3_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/aggregation3_tpetra.gold @@ -29,11 +29,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0.02, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0.02, blocksize = 1 aggregation: drop tol = 0.02 aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Lumping dropped entries @@ -132,11 +133,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0.02, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0.02, blocksize = 1 aggregation: drop tol = 0.02 aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Lumping dropped entries diff --git a/packages/muelu/test/interface/default/Output/aggregation4_epetra.gold b/packages/muelu/test/interface/default/Output/aggregation4_epetra.gold index da0440ba3039..01885b3ee3b8 100644 --- a/packages/muelu/test/interface/default/Output/aggregation4_epetra.gold +++ b/packages/muelu/test/interface/default/Output/aggregation4_epetra.gold @@ -21,6 +21,7 @@ aggregation: drop tol = 0.05 aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = distance laplacian aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Lumping dropped entries @@ -122,6 +123,7 @@ aggregation: drop tol = 0.05 aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = distance laplacian aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Lumping dropped entries diff --git a/packages/muelu/test/interface/default/Output/aggregation4_tpetra.gold b/packages/muelu/test/interface/default/Output/aggregation4_tpetra.gold index 550a76d337b5..7e66968f6323 100644 --- a/packages/muelu/test/interface/default/Output/aggregation4_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/aggregation4_tpetra.gold @@ -34,6 +34,7 @@ aggregation: drop tol = 0.05 aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = distance laplacian aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Lumping dropped entries @@ -148,6 +149,7 @@ aggregation: drop tol = 0.05 aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = distance laplacian aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Lumping dropped entries diff --git a/packages/muelu/test/interface/default/Output/aggregation5_epetra.gold b/packages/muelu/test/interface/default/Output/aggregation5_epetra.gold index d11bf14318e1..5d19c90bddc1 100644 --- a/packages/muelu/test/interface/default/Output/aggregation5_epetra.gold +++ b/packages/muelu/test/interface/default/Output/aggregation5_epetra.gold @@ -16,11 +16,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -100,11 +101,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/aggregation5_np4_epetra.gold b/packages/muelu/test/interface/default/Output/aggregation5_np4_epetra.gold index b3b91637910d..3682eebeaac8 100644 --- a/packages/muelu/test/interface/default/Output/aggregation5_np4_epetra.gold +++ b/packages/muelu/test/interface/default/Output/aggregation5_np4_epetra.gold @@ -16,11 +16,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -100,11 +101,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/aggregation5_np4_tpetra.gold b/packages/muelu/test/interface/default/Output/aggregation5_np4_tpetra.gold index 2f2721a8707e..e056161675c7 100644 --- a/packages/muelu/test/interface/default/Output/aggregation5_np4_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/aggregation5_np4_tpetra.gold @@ -29,11 +29,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -126,11 +127,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/aggregation5_tpetra.gold b/packages/muelu/test/interface/default/Output/aggregation5_tpetra.gold index 18a78645780b..a4ebf9009839 100644 --- a/packages/muelu/test/interface/default/Output/aggregation5_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/aggregation5_tpetra.gold @@ -29,11 +29,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -126,11 +127,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/coarse1_epetra.gold b/packages/muelu/test/interface/default/Output/coarse1_epetra.gold index 146badf87f22..808f3f821e7b 100644 --- a/packages/muelu/test/interface/default/Output/coarse1_epetra.gold +++ b/packages/muelu/test/interface/default/Output/coarse1_epetra.gold @@ -16,11 +16,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -106,11 +107,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -196,11 +198,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/coarse1_tpetra.gold b/packages/muelu/test/interface/default/Output/coarse1_tpetra.gold index 947170d4d174..85f336b58269 100644 --- a/packages/muelu/test/interface/default/Output/coarse1_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/coarse1_tpetra.gold @@ -29,11 +29,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -132,11 +133,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -235,11 +237,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/coarse2_epetra.gold b/packages/muelu/test/interface/default/Output/coarse2_epetra.gold index 5c589b03d72f..8534af733cc2 100644 --- a/packages/muelu/test/interface/default/Output/coarse2_epetra.gold +++ b/packages/muelu/test/interface/default/Output/coarse2_epetra.gold @@ -16,11 +16,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -106,11 +107,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -196,11 +198,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -286,11 +289,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -376,11 +380,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/coarse2_tpetra.gold b/packages/muelu/test/interface/default/Output/coarse2_tpetra.gold index a03441a0e934..9068c5c249bf 100644 --- a/packages/muelu/test/interface/default/Output/coarse2_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/coarse2_tpetra.gold @@ -29,11 +29,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -132,11 +133,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -235,11 +237,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -338,11 +341,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -441,11 +445,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/coarse3_epetra.gold b/packages/muelu/test/interface/default/Output/coarse3_epetra.gold index 698c22ac6b7f..02c451aaf056 100644 --- a/packages/muelu/test/interface/default/Output/coarse3_epetra.gold +++ b/packages/muelu/test/interface/default/Output/coarse3_epetra.gold @@ -16,11 +16,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -106,11 +107,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/coarse3_tpetra.gold b/packages/muelu/test/interface/default/Output/coarse3_tpetra.gold index 9a754c46b329..0c8069205418 100644 --- a/packages/muelu/test/interface/default/Output/coarse3_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/coarse3_tpetra.gold @@ -29,11 +29,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -132,11 +133,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/default_e3d_tpetra.gold b/packages/muelu/test/interface/default/Output/default_e3d_tpetra.gold index 6c47fd7cdba8..866f902d2a81 100644 --- a/packages/muelu/test/interface/default/Output/default_e3d_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/default_e3d_tpetra.gold @@ -20,11 +20,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 3 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 3 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -114,11 +115,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 3 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 3 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/default_mhd_np4_tpetra.gold b/packages/muelu/test/interface/default/Output/default_mhd_np4_tpetra.gold index 96dd36e19518..de3d0679e761 100644 --- a/packages/muelu/test/interface/default/Output/default_mhd_np4_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/default_mhd_np4_tpetra.gold @@ -22,11 +22,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 BuildAggregates (Phase - (Dirichlet)) @@ -101,11 +102,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 BuildAggregates (Phase - (Dirichlet)) diff --git a/packages/muelu/test/interface/default/Output/default_mhd_tpetra.gold b/packages/muelu/test/interface/default/Output/default_mhd_tpetra.gold index 86d032b588a8..396dbc1e2ceb 100644 --- a/packages/muelu/test/interface/default/Output/default_mhd_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/default_mhd_tpetra.gold @@ -22,11 +22,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 BuildAggregates (Phase - (Dirichlet)) @@ -101,11 +102,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 BuildAggregates (Phase - (Dirichlet)) diff --git a/packages/muelu/test/interface/default/Output/default_p2d_tpetra.gold b/packages/muelu/test/interface/default/Output/default_p2d_tpetra.gold index 3b97da35175b..30351986f600 100644 --- a/packages/muelu/test/interface/default/Output/default_p2d_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/default_p2d_tpetra.gold @@ -20,11 +20,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -114,11 +115,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/default_p3d_tpetra.gold b/packages/muelu/test/interface/default/Output/default_p3d_tpetra.gold index 3b97da35175b..30351986f600 100644 --- a/packages/muelu/test/interface/default/Output/default_p3d_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/default_p3d_tpetra.gold @@ -20,11 +20,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -114,11 +115,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/default_pg_epetra.gold b/packages/muelu/test/interface/default/Output/default_pg_epetra.gold index f5c57e2662f8..5110589afeb8 100644 --- a/packages/muelu/test/interface/default/Output/default_pg_epetra.gold +++ b/packages/muelu/test/interface/default/Output/default_pg_epetra.gold @@ -15,11 +15,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 BuildAggregates (Phase - (Dirichlet)) @@ -99,11 +100,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 BuildAggregates (Phase - (Dirichlet)) diff --git a/packages/muelu/test/interface/default/Output/default_pg_np4_epetra.gold b/packages/muelu/test/interface/default/Output/default_pg_np4_epetra.gold index 07b848e499f5..1b7053d8c8d6 100644 --- a/packages/muelu/test/interface/default/Output/default_pg_np4_epetra.gold +++ b/packages/muelu/test/interface/default/Output/default_pg_np4_epetra.gold @@ -15,11 +15,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 BuildAggregates (Phase - (Dirichlet)) @@ -99,11 +100,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 BuildAggregates (Phase - (Dirichlet)) diff --git a/packages/muelu/test/interface/default/Output/default_pg_np4_tpetra.gold b/packages/muelu/test/interface/default/Output/default_pg_np4_tpetra.gold index b58f4c409c81..c375f3939742 100644 --- a/packages/muelu/test/interface/default/Output/default_pg_np4_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/default_pg_np4_tpetra.gold @@ -30,11 +30,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 BuildAggregates (Phase - (Dirichlet)) @@ -129,11 +130,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 BuildAggregates (Phase - (Dirichlet)) diff --git a/packages/muelu/test/interface/default/Output/default_pg_tpetra.gold b/packages/muelu/test/interface/default/Output/default_pg_tpetra.gold index f55705ee150c..8a4f9ba27312 100644 --- a/packages/muelu/test/interface/default/Output/default_pg_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/default_pg_tpetra.gold @@ -30,11 +30,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 BuildAggregates (Phase - (Dirichlet)) @@ -129,11 +130,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 BuildAggregates (Phase - (Dirichlet)) diff --git a/packages/muelu/test/interface/default/Output/driver_drekar1_epetra.gold b/packages/muelu/test/interface/default/Output/driver_drekar1_epetra.gold index 83496289b806..b940117a7dff 100644 --- a/packages/muelu/test/interface/default/Output/driver_drekar1_epetra.gold +++ b/packages/muelu/test/interface/default/Output/driver_drekar1_epetra.gold @@ -26,6 +26,7 @@ aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = distance laplacian aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -172,6 +173,7 @@ aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = distance laplacian aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -318,6 +320,7 @@ aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = distance laplacian aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/driver_drekar1_np4_epetra.gold b/packages/muelu/test/interface/default/Output/driver_drekar1_np4_epetra.gold index 850f0609a644..9e3475e85cdd 100644 --- a/packages/muelu/test/interface/default/Output/driver_drekar1_np4_epetra.gold +++ b/packages/muelu/test/interface/default/Output/driver_drekar1_np4_epetra.gold @@ -26,6 +26,7 @@ aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = distance laplacian aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -197,6 +198,7 @@ aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = distance laplacian aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -343,6 +345,7 @@ aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = distance laplacian aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/driver_drekar1_np4_tpetra.gold b/packages/muelu/test/interface/default/Output/driver_drekar1_np4_tpetra.gold index 672fe5d85b76..b3b2a671e67d 100644 --- a/packages/muelu/test/interface/default/Output/driver_drekar1_np4_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/driver_drekar1_np4_tpetra.gold @@ -29,6 +29,7 @@ aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = distance laplacian aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -203,6 +204,7 @@ aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = distance laplacian aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -352,6 +354,7 @@ aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = distance laplacian aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/driver_drekar1_tpetra.gold b/packages/muelu/test/interface/default/Output/driver_drekar1_tpetra.gold index 07ba911c7b8d..428d3e6d3a31 100644 --- a/packages/muelu/test/interface/default/Output/driver_drekar1_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/driver_drekar1_tpetra.gold @@ -29,6 +29,7 @@ aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = distance laplacian aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -178,6 +179,7 @@ aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = distance laplacian aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -327,6 +329,7 @@ aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = distance laplacian aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/driver_drekar2_epetra.gold b/packages/muelu/test/interface/default/Output/driver_drekar2_epetra.gold index 02917fd75774..128321fe67f9 100644 --- a/packages/muelu/test/interface/default/Output/driver_drekar2_epetra.gold +++ b/packages/muelu/test/interface/default/Output/driver_drekar2_epetra.gold @@ -26,6 +26,7 @@ aggregation: drop tol = 0.02 aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = distance laplacian aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Lumping dropped entries @@ -172,6 +173,7 @@ aggregation: drop tol = 0.02 aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = distance laplacian aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Lumping dropped entries @@ -318,6 +320,7 @@ aggregation: drop tol = 0.02 aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = distance laplacian aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Lumping dropped entries diff --git a/packages/muelu/test/interface/default/Output/driver_drekar2_np4_epetra.gold b/packages/muelu/test/interface/default/Output/driver_drekar2_np4_epetra.gold index d8fafcef86e8..297df4c59a2f 100644 --- a/packages/muelu/test/interface/default/Output/driver_drekar2_np4_epetra.gold +++ b/packages/muelu/test/interface/default/Output/driver_drekar2_np4_epetra.gold @@ -26,6 +26,7 @@ aggregation: drop tol = 0.02 aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = distance laplacian aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Lumping dropped entries @@ -197,6 +198,7 @@ aggregation: drop tol = 0.02 aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = distance laplacian aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Lumping dropped entries @@ -343,6 +345,7 @@ aggregation: drop tol = 0.02 aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = distance laplacian aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Lumping dropped entries diff --git a/packages/muelu/test/interface/default/Output/driver_drekar2_np4_tpetra.gold b/packages/muelu/test/interface/default/Output/driver_drekar2_np4_tpetra.gold index 7150d590cc4f..e705706e164e 100644 --- a/packages/muelu/test/interface/default/Output/driver_drekar2_np4_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/driver_drekar2_np4_tpetra.gold @@ -29,6 +29,7 @@ aggregation: drop tol = 0.02 aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = distance laplacian aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Lumping dropped entries @@ -203,6 +204,7 @@ aggregation: drop tol = 0.02 aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = distance laplacian aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Lumping dropped entries @@ -352,6 +354,7 @@ aggregation: drop tol = 0.02 aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = distance laplacian aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Lumping dropped entries diff --git a/packages/muelu/test/interface/default/Output/driver_drekar2_tpetra.gold b/packages/muelu/test/interface/default/Output/driver_drekar2_tpetra.gold index d2983c61e209..abc374982210 100644 --- a/packages/muelu/test/interface/default/Output/driver_drekar2_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/driver_drekar2_tpetra.gold @@ -29,6 +29,7 @@ aggregation: drop tol = 0.02 aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = distance laplacian aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Lumping dropped entries @@ -178,6 +179,7 @@ aggregation: drop tol = 0.02 aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = distance laplacian aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Lumping dropped entries @@ -327,6 +329,7 @@ aggregation: drop tol = 0.02 aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = distance laplacian aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Lumping dropped entries diff --git a/packages/muelu/test/interface/default/Output/emin1_epetra.gold b/packages/muelu/test/interface/default/Output/emin1_epetra.gold index 98887879c8a4..3c36a3c40282 100644 --- a/packages/muelu/test/interface/default/Output/emin1_epetra.gold +++ b/packages/muelu/test/interface/default/Output/emin1_epetra.gold @@ -17,11 +17,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 BuildAggregates (Phase - (Dirichlet)) @@ -111,11 +112,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 BuildAggregates (Phase - (Dirichlet)) diff --git a/packages/muelu/test/interface/default/Output/emin1_tpetra.gold b/packages/muelu/test/interface/default/Output/emin1_tpetra.gold index e1419ea1f7f6..30588cdad1ff 100644 --- a/packages/muelu/test/interface/default/Output/emin1_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/emin1_tpetra.gold @@ -30,11 +30,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 BuildAggregates (Phase - (Dirichlet)) @@ -137,11 +138,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 BuildAggregates (Phase - (Dirichlet)) diff --git a/packages/muelu/test/interface/default/Output/emin2_epetra.gold b/packages/muelu/test/interface/default/Output/emin2_epetra.gold index 27c3077e3e3e..14ae208cd237 100644 --- a/packages/muelu/test/interface/default/Output/emin2_epetra.gold +++ b/packages/muelu/test/interface/default/Output/emin2_epetra.gold @@ -17,11 +17,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 BuildAggregates (Phase - (Dirichlet)) @@ -111,11 +112,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 BuildAggregates (Phase - (Dirichlet)) diff --git a/packages/muelu/test/interface/default/Output/emin2_tpetra.gold b/packages/muelu/test/interface/default/Output/emin2_tpetra.gold index 6c7c62796f02..e69c312973ab 100644 --- a/packages/muelu/test/interface/default/Output/emin2_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/emin2_tpetra.gold @@ -30,11 +30,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 BuildAggregates (Phase - (Dirichlet)) @@ -137,11 +138,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 BuildAggregates (Phase - (Dirichlet)) diff --git a/packages/muelu/test/interface/default/Output/emin3_epetra.gold b/packages/muelu/test/interface/default/Output/emin3_epetra.gold index b67c367643eb..98dc9f199c3f 100644 --- a/packages/muelu/test/interface/default/Output/emin3_epetra.gold +++ b/packages/muelu/test/interface/default/Output/emin3_epetra.gold @@ -11,19 +11,26 @@ smoother -> Level 1 Prolongator minimization (MueLu::EminPFactory) -Build (MueLu::TentativePFactory) -Build (MueLu::UncoupledAggregationFactory) +Matrix filtering (MueLu::FilteredAFactory) Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 +Filtered matrix is not being constructed as no filtering is being done +filtered matrix: use lumping = 1 [default] +filtered matrix: reuse graph = 1 [default] +filtered matrix: reuse eigenvalue = 1 [default] + +Build (MueLu::TentativePFactory) +Build (MueLu::UncoupledAggregationFactory) BuildAggregates (Phase - (Dirichlet)) BuildAggregates (Phase 1 (main)) BuildAggregates (Phase 2a (secondary)) @@ -105,19 +112,26 @@ smoother -> Level 2 Prolongator minimization (MueLu::EminPFactory) -Build (MueLu::TentativePFactory) -Build (MueLu::UncoupledAggregationFactory) +Matrix filtering (MueLu::FilteredAFactory) Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 +Filtered matrix is not being constructed as no filtering is being done +filtered matrix: use lumping = 1 [default] +filtered matrix: reuse graph = 1 [default] +filtered matrix: reuse eigenvalue = 1 [default] + +Build (MueLu::TentativePFactory) +Build (MueLu::UncoupledAggregationFactory) BuildAggregates (Phase - (Dirichlet)) BuildAggregates (Phase 1 (main)) BuildAggregates (Phase 2a (secondary)) diff --git a/packages/muelu/test/interface/default/Output/emin3_tpetra.gold b/packages/muelu/test/interface/default/Output/emin3_tpetra.gold index 9717e2740b0b..46f37dc78fce 100644 --- a/packages/muelu/test/interface/default/Output/emin3_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/emin3_tpetra.gold @@ -24,19 +24,26 @@ smoother -> Level 1 Prolongator minimization (MueLu::EminPFactory) -Build (MueLu::TentativePFactory) -Build (MueLu::UncoupledAggregationFactory) +Matrix filtering (MueLu::FilteredAFactory) Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 +Filtered matrix is not being constructed as no filtering is being done +filtered matrix: use lumping = 1 [default] +filtered matrix: reuse graph = 1 [default] +filtered matrix: reuse eigenvalue = 1 [default] + +Build (MueLu::TentativePFactory) +Build (MueLu::UncoupledAggregationFactory) BuildAggregates (Phase - (Dirichlet)) BuildAggregates (Phase 1 (main)) BuildAggregates (Phase 2a (secondary)) @@ -131,19 +138,26 @@ smoother -> Level 2 Prolongator minimization (MueLu::EminPFactory) -Build (MueLu::TentativePFactory) -Build (MueLu::UncoupledAggregationFactory) +Matrix filtering (MueLu::FilteredAFactory) Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 +Filtered matrix is not being constructed as no filtering is being done +filtered matrix: use lumping = 1 [default] +filtered matrix: reuse graph = 1 [default] +filtered matrix: reuse eigenvalue = 1 [default] + +Build (MueLu::TentativePFactory) +Build (MueLu::UncoupledAggregationFactory) BuildAggregates (Phase - (Dirichlet)) BuildAggregates (Phase 1 (main)) BuildAggregates (Phase 2a (secondary)) diff --git a/packages/muelu/test/interface/default/Output/empty_epetra.gold b/packages/muelu/test/interface/default/Output/empty_epetra.gold index 8ec719fe7978..16b701ae70fe 100644 --- a/packages/muelu/test/interface/default/Output/empty_epetra.gold +++ b/packages/muelu/test/interface/default/Output/empty_epetra.gold @@ -16,11 +16,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -106,11 +107,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/empty_tpetra.gold b/packages/muelu/test/interface/default/Output/empty_tpetra.gold index 897d2b621573..1fc1e826a31f 100644 --- a/packages/muelu/test/interface/default/Output/empty_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/empty_tpetra.gold @@ -29,11 +29,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -132,11 +133,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/notay_epetra.gold b/packages/muelu/test/interface/default/Output/notay_epetra.gold index 568b45da3697..16b553453bd6 100644 --- a/packages/muelu/test/interface/default/Output/notay_epetra.gold +++ b/packages/muelu/test/interface/default/Output/notay_epetra.gold @@ -16,11 +16,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 10 aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/notay_tpetra.gold b/packages/muelu/test/interface/default/Output/notay_tpetra.gold index 3b15e7bdbfb1..13fb0bdfb791 100644 --- a/packages/muelu/test/interface/default/Output/notay_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/notay_tpetra.gold @@ -29,11 +29,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 10 aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/operator_solve_1_np1_epetra.gold b/packages/muelu/test/interface/default/Output/operator_solve_1_np1_epetra.gold index 5d2a5af7f175..3a04ab6b72d7 100644 --- a/packages/muelu/test/interface/default/Output/operator_solve_1_np1_epetra.gold +++ b/packages/muelu/test/interface/default/Output/operator_solve_1_np1_epetra.gold @@ -16,11 +16,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -106,11 +107,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -196,11 +198,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/operator_solve_1_np1_tpetra.gold b/packages/muelu/test/interface/default/Output/operator_solve_1_np1_tpetra.gold index 3888a054c620..1ce9a6bfd5f4 100644 --- a/packages/muelu/test/interface/default/Output/operator_solve_1_np1_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/operator_solve_1_np1_tpetra.gold @@ -29,11 +29,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -132,11 +133,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -235,11 +237,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/operator_solve_1_np4_epetra.gold b/packages/muelu/test/interface/default/Output/operator_solve_1_np4_epetra.gold index 1605cdfdd169..32c95f11c4f6 100644 --- a/packages/muelu/test/interface/default/Output/operator_solve_1_np4_epetra.gold +++ b/packages/muelu/test/interface/default/Output/operator_solve_1_np4_epetra.gold @@ -16,11 +16,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -106,11 +107,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -196,11 +198,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/operator_solve_1_np4_tpetra.gold b/packages/muelu/test/interface/default/Output/operator_solve_1_np4_tpetra.gold index 97d981f0d23a..0bfd92a2cc90 100644 --- a/packages/muelu/test/interface/default/Output/operator_solve_1_np4_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/operator_solve_1_np4_tpetra.gold @@ -29,11 +29,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -132,11 +133,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -235,11 +237,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/operator_solve_5_np1_epetra.gold b/packages/muelu/test/interface/default/Output/operator_solve_5_np1_epetra.gold index 4ae2154c32ec..cddf3872196e 100644 --- a/packages/muelu/test/interface/default/Output/operator_solve_5_np1_epetra.gold +++ b/packages/muelu/test/interface/default/Output/operator_solve_5_np1_epetra.gold @@ -16,11 +16,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -106,11 +107,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -193,11 +195,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/operator_solve_5_np1_tpetra.gold b/packages/muelu/test/interface/default/Output/operator_solve_5_np1_tpetra.gold index 9030b610611a..6396c50457f7 100644 --- a/packages/muelu/test/interface/default/Output/operator_solve_5_np1_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/operator_solve_5_np1_tpetra.gold @@ -29,11 +29,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -132,11 +133,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -232,11 +234,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/operator_solve_5_np4_epetra.gold b/packages/muelu/test/interface/default/Output/operator_solve_5_np4_epetra.gold index dc342ee6b193..06b2903e4f6a 100644 --- a/packages/muelu/test/interface/default/Output/operator_solve_5_np4_epetra.gold +++ b/packages/muelu/test/interface/default/Output/operator_solve_5_np4_epetra.gold @@ -16,11 +16,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -106,11 +107,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -193,11 +195,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/operator_solve_5_np4_tpetra.gold b/packages/muelu/test/interface/default/Output/operator_solve_5_np4_tpetra.gold index 2eab5e3b1d31..865ed9fefe9d 100644 --- a/packages/muelu/test/interface/default/Output/operator_solve_5_np4_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/operator_solve_5_np4_tpetra.gold @@ -29,11 +29,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -132,11 +133,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -232,11 +234,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/operator_solve_6_np1_epetra.gold b/packages/muelu/test/interface/default/Output/operator_solve_6_np1_epetra.gold index 8e2e5163aeea..c052c8b65864 100644 --- a/packages/muelu/test/interface/default/Output/operator_solve_6_np1_epetra.gold +++ b/packages/muelu/test/interface/default/Output/operator_solve_6_np1_epetra.gold @@ -16,11 +16,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -106,11 +107,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -193,11 +195,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/operator_solve_6_np1_tpetra.gold b/packages/muelu/test/interface/default/Output/operator_solve_6_np1_tpetra.gold index 4b6a1fe54308..d79a274bf82d 100644 --- a/packages/muelu/test/interface/default/Output/operator_solve_6_np1_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/operator_solve_6_np1_tpetra.gold @@ -29,11 +29,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -132,11 +133,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -232,11 +234,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/operator_solve_6_np4_epetra.gold b/packages/muelu/test/interface/default/Output/operator_solve_6_np4_epetra.gold index e81cc4fd1176..66f73f17452b 100644 --- a/packages/muelu/test/interface/default/Output/operator_solve_6_np4_epetra.gold +++ b/packages/muelu/test/interface/default/Output/operator_solve_6_np4_epetra.gold @@ -16,11 +16,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -106,11 +107,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -193,11 +195,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/operator_solve_6_np4_tpetra.gold b/packages/muelu/test/interface/default/Output/operator_solve_6_np4_tpetra.gold index b3f04d2bbf9d..e64bae05e2f9 100644 --- a/packages/muelu/test/interface/default/Output/operator_solve_6_np4_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/operator_solve_6_np4_tpetra.gold @@ -29,11 +29,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -132,11 +133,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -232,11 +234,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/operator_solve_7_np1_epetra.gold b/packages/muelu/test/interface/default/Output/operator_solve_7_np1_epetra.gold index 5721fe6acd98..f809a0f45c93 100644 --- a/packages/muelu/test/interface/default/Output/operator_solve_7_np1_epetra.gold +++ b/packages/muelu/test/interface/default/Output/operator_solve_7_np1_epetra.gold @@ -16,11 +16,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/operator_solve_7_np1_tpetra.gold b/packages/muelu/test/interface/default/Output/operator_solve_7_np1_tpetra.gold index 0e6aa8d53b9c..1f2fbd777b8d 100644 --- a/packages/muelu/test/interface/default/Output/operator_solve_7_np1_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/operator_solve_7_np1_tpetra.gold @@ -29,11 +29,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/operator_solve_7_np4_epetra.gold b/packages/muelu/test/interface/default/Output/operator_solve_7_np4_epetra.gold index 9c966ac82ebb..bb324c8c55ba 100644 --- a/packages/muelu/test/interface/default/Output/operator_solve_7_np4_epetra.gold +++ b/packages/muelu/test/interface/default/Output/operator_solve_7_np4_epetra.gold @@ -16,11 +16,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/operator_solve_7_np4_tpetra.gold b/packages/muelu/test/interface/default/Output/operator_solve_7_np4_tpetra.gold index e3355fd9d821..5e9781a4e149 100644 --- a/packages/muelu/test/interface/default/Output/operator_solve_7_np4_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/operator_solve_7_np4_tpetra.gold @@ -29,11 +29,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/pg1_epetra.gold b/packages/muelu/test/interface/default/Output/pg1_epetra.gold index c3821e891da4..206efa9a0ac5 100644 --- a/packages/muelu/test/interface/default/Output/pg1_epetra.gold +++ b/packages/muelu/test/interface/default/Output/pg1_epetra.gold @@ -17,11 +17,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 BuildAggregates (Phase - (Dirichlet)) @@ -103,11 +104,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 BuildAggregates (Phase - (Dirichlet)) diff --git a/packages/muelu/test/interface/default/Output/pg1_tpetra.gold b/packages/muelu/test/interface/default/Output/pg1_tpetra.gold index a7d563e8b4dd..3df5696856de 100644 --- a/packages/muelu/test/interface/default/Output/pg1_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/pg1_tpetra.gold @@ -30,11 +30,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 BuildAggregates (Phase - (Dirichlet)) @@ -129,11 +130,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 BuildAggregates (Phase - (Dirichlet)) diff --git a/packages/muelu/test/interface/default/Output/pg2_epetra.gold b/packages/muelu/test/interface/default/Output/pg2_epetra.gold index c3821e891da4..206efa9a0ac5 100644 --- a/packages/muelu/test/interface/default/Output/pg2_epetra.gold +++ b/packages/muelu/test/interface/default/Output/pg2_epetra.gold @@ -17,11 +17,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 BuildAggregates (Phase - (Dirichlet)) @@ -103,11 +104,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 BuildAggregates (Phase - (Dirichlet)) diff --git a/packages/muelu/test/interface/default/Output/pg2_tpetra.gold b/packages/muelu/test/interface/default/Output/pg2_tpetra.gold index a7d563e8b4dd..3df5696856de 100644 --- a/packages/muelu/test/interface/default/Output/pg2_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/pg2_tpetra.gold @@ -30,11 +30,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 BuildAggregates (Phase - (Dirichlet)) @@ -129,11 +130,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 BuildAggregates (Phase - (Dirichlet)) diff --git a/packages/muelu/test/interface/default/Output/repartition1_epetra.gold b/packages/muelu/test/interface/default/Output/repartition1_epetra.gold index c229e753e2f7..9363c8dffb29 100644 --- a/packages/muelu/test/interface/default/Output/repartition1_epetra.gold +++ b/packages/muelu/test/interface/default/Output/repartition1_epetra.gold @@ -19,11 +19,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -163,11 +164,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/repartition1_np4_epetra.gold b/packages/muelu/test/interface/default/Output/repartition1_np4_epetra.gold index c865018f30c8..04129a63422f 100644 --- a/packages/muelu/test/interface/default/Output/repartition1_np4_epetra.gold +++ b/packages/muelu/test/interface/default/Output/repartition1_np4_epetra.gold @@ -19,11 +19,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -163,11 +164,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/repartition1_np4_tpetra.gold b/packages/muelu/test/interface/default/Output/repartition1_np4_tpetra.gold index 49696c5a66b1..4f8967081f5d 100644 --- a/packages/muelu/test/interface/default/Output/repartition1_np4_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/repartition1_np4_tpetra.gold @@ -32,11 +32,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -189,11 +190,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/repartition1_tpetra.gold b/packages/muelu/test/interface/default/Output/repartition1_tpetra.gold index df7d69fdf089..210c24de69e2 100644 --- a/packages/muelu/test/interface/default/Output/repartition1_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/repartition1_tpetra.gold @@ -32,11 +32,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -189,11 +190,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/repartition3_epetra.gold b/packages/muelu/test/interface/default/Output/repartition3_epetra.gold index 15f5b72d270f..92049ba689de 100644 --- a/packages/muelu/test/interface/default/Output/repartition3_epetra.gold +++ b/packages/muelu/test/interface/default/Output/repartition3_epetra.gold @@ -19,11 +19,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -163,11 +164,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/repartition3_np4_epetra.gold b/packages/muelu/test/interface/default/Output/repartition3_np4_epetra.gold index 286d7f16202a..2dab6cee913e 100644 --- a/packages/muelu/test/interface/default/Output/repartition3_np4_epetra.gold +++ b/packages/muelu/test/interface/default/Output/repartition3_np4_epetra.gold @@ -19,11 +19,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -163,11 +164,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/repartition3_np4_tpetra.gold b/packages/muelu/test/interface/default/Output/repartition3_np4_tpetra.gold index e07f2d18d9bc..40da7fb70e54 100644 --- a/packages/muelu/test/interface/default/Output/repartition3_np4_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/repartition3_np4_tpetra.gold @@ -32,11 +32,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -189,11 +190,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/repartition3_tpetra.gold b/packages/muelu/test/interface/default/Output/repartition3_tpetra.gold index e02c7f74db93..e1a1b3d3595e 100644 --- a/packages/muelu/test/interface/default/Output/repartition3_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/repartition3_tpetra.gold @@ -32,11 +32,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -189,11 +190,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/repartition4_epetra.gold b/packages/muelu/test/interface/default/Output/repartition4_epetra.gold index 4f7fd3817115..d9a6e2cd0585 100644 --- a/packages/muelu/test/interface/default/Output/repartition4_epetra.gold +++ b/packages/muelu/test/interface/default/Output/repartition4_epetra.gold @@ -19,11 +19,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -163,11 +164,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/repartition4_np4_epetra.gold b/packages/muelu/test/interface/default/Output/repartition4_np4_epetra.gold index ac5d0d586796..74ede98246a7 100644 --- a/packages/muelu/test/interface/default/Output/repartition4_np4_epetra.gold +++ b/packages/muelu/test/interface/default/Output/repartition4_np4_epetra.gold @@ -19,11 +19,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -163,11 +164,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/repartition4_np4_tpetra.gold b/packages/muelu/test/interface/default/Output/repartition4_np4_tpetra.gold index 32103d3267d7..a8bf6311b2e1 100644 --- a/packages/muelu/test/interface/default/Output/repartition4_np4_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/repartition4_np4_tpetra.gold @@ -32,11 +32,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -189,11 +190,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/repartition4_tpetra.gold b/packages/muelu/test/interface/default/Output/repartition4_tpetra.gold index 07b3112d08c2..fa56295d64e1 100644 --- a/packages/muelu/test/interface/default/Output/repartition4_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/repartition4_tpetra.gold @@ -32,11 +32,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -189,11 +190,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/reuse-RAP-1_epetra.gold b/packages/muelu/test/interface/default/Output/reuse-RAP-1_epetra.gold index 3a1ab22ae3b8..394008ac1891 100644 --- a/packages/muelu/test/interface/default/Output/reuse-RAP-1_epetra.gold +++ b/packages/muelu/test/interface/default/Output/reuse-RAP-1_epetra.gold @@ -19,11 +19,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -163,11 +164,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/reuse-RAP-1_np4_epetra.gold b/packages/muelu/test/interface/default/Output/reuse-RAP-1_np4_epetra.gold index 4377181e9806..4492c9a07d1d 100644 --- a/packages/muelu/test/interface/default/Output/reuse-RAP-1_np4_epetra.gold +++ b/packages/muelu/test/interface/default/Output/reuse-RAP-1_np4_epetra.gold @@ -19,11 +19,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -163,11 +164,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/reuse-RAP-1_np4_tpetra.gold b/packages/muelu/test/interface/default/Output/reuse-RAP-1_np4_tpetra.gold index 782d509f1c7e..5a3c90e87ca4 100644 --- a/packages/muelu/test/interface/default/Output/reuse-RAP-1_np4_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/reuse-RAP-1_np4_tpetra.gold @@ -32,11 +32,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -189,11 +190,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/reuse-RAP-1_tpetra.gold b/packages/muelu/test/interface/default/Output/reuse-RAP-1_tpetra.gold index a55ab743c80e..b8150c989364 100644 --- a/packages/muelu/test/interface/default/Output/reuse-RAP-1_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/reuse-RAP-1_tpetra.gold @@ -32,11 +32,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -189,11 +190,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/reuse-RAP-2_epetra.gold b/packages/muelu/test/interface/default/Output/reuse-RAP-2_epetra.gold index ee7798de0e63..f5ade8c9b762 100644 --- a/packages/muelu/test/interface/default/Output/reuse-RAP-2_epetra.gold +++ b/packages/muelu/test/interface/default/Output/reuse-RAP-2_epetra.gold @@ -19,11 +19,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -149,11 +150,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/reuse-RAP-2_np4_epetra.gold b/packages/muelu/test/interface/default/Output/reuse-RAP-2_np4_epetra.gold index 5401e48f30fd..398ac5d0fb85 100644 --- a/packages/muelu/test/interface/default/Output/reuse-RAP-2_np4_epetra.gold +++ b/packages/muelu/test/interface/default/Output/reuse-RAP-2_np4_epetra.gold @@ -19,11 +19,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -149,11 +150,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/reuse-RAP-2_np4_tpetra.gold b/packages/muelu/test/interface/default/Output/reuse-RAP-2_np4_tpetra.gold index a5f701eb5f5c..d52e5d8b1dde 100644 --- a/packages/muelu/test/interface/default/Output/reuse-RAP-2_np4_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/reuse-RAP-2_np4_tpetra.gold @@ -32,11 +32,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -175,11 +176,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/reuse-RAP-2_tpetra.gold b/packages/muelu/test/interface/default/Output/reuse-RAP-2_tpetra.gold index ef19e55631ba..694a5784bc39 100644 --- a/packages/muelu/test/interface/default/Output/reuse-RAP-2_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/reuse-RAP-2_tpetra.gold @@ -32,11 +32,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -175,11 +176,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/reuse-RP-2_epetra.gold b/packages/muelu/test/interface/default/Output/reuse-RP-2_epetra.gold index 5642c03e0f3d..506a8e90cc56 100644 --- a/packages/muelu/test/interface/default/Output/reuse-RP-2_epetra.gold +++ b/packages/muelu/test/interface/default/Output/reuse-RP-2_epetra.gold @@ -19,11 +19,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -149,11 +150,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/reuse-RP-2_np4_epetra.gold b/packages/muelu/test/interface/default/Output/reuse-RP-2_np4_epetra.gold index fd9e462e80a8..9645bdd4c9f9 100644 --- a/packages/muelu/test/interface/default/Output/reuse-RP-2_np4_epetra.gold +++ b/packages/muelu/test/interface/default/Output/reuse-RP-2_np4_epetra.gold @@ -19,11 +19,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -149,11 +150,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/reuse-RP-2_np4_tpetra.gold b/packages/muelu/test/interface/default/Output/reuse-RP-2_np4_tpetra.gold index 196eb12b8b8b..49f5bde492cc 100644 --- a/packages/muelu/test/interface/default/Output/reuse-RP-2_np4_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/reuse-RP-2_np4_tpetra.gold @@ -32,11 +32,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -175,11 +176,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/reuse-RP-2_tpetra.gold b/packages/muelu/test/interface/default/Output/reuse-RP-2_tpetra.gold index ead4ae425cae..bdb83aae5f34 100644 --- a/packages/muelu/test/interface/default/Output/reuse-RP-2_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/reuse-RP-2_tpetra.gold @@ -32,11 +32,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -175,11 +176,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/reuse-S-1_epetra.gold b/packages/muelu/test/interface/default/Output/reuse-S-1_epetra.gold index 6461c5a88bb1..0a504d73c7ad 100644 --- a/packages/muelu/test/interface/default/Output/reuse-S-1_epetra.gold +++ b/packages/muelu/test/interface/default/Output/reuse-S-1_epetra.gold @@ -19,11 +19,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -163,11 +164,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -338,11 +340,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -482,11 +485,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/reuse-S-1_np4_epetra.gold b/packages/muelu/test/interface/default/Output/reuse-S-1_np4_epetra.gold index 227dedd4ccf4..79ed94ca92ec 100644 --- a/packages/muelu/test/interface/default/Output/reuse-S-1_np4_epetra.gold +++ b/packages/muelu/test/interface/default/Output/reuse-S-1_np4_epetra.gold @@ -19,11 +19,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -163,11 +164,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -329,11 +331,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -473,11 +476,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/reuse-S-1_np4_tpetra.gold b/packages/muelu/test/interface/default/Output/reuse-S-1_np4_tpetra.gold index 3c190624b78c..8da2dc2eaa9e 100644 --- a/packages/muelu/test/interface/default/Output/reuse-S-1_np4_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/reuse-S-1_np4_tpetra.gold @@ -32,11 +32,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -189,11 +190,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -368,11 +370,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -525,11 +528,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/reuse-S-1_tpetra.gold b/packages/muelu/test/interface/default/Output/reuse-S-1_tpetra.gold index 3687ee2a861b..272b7df582a0 100644 --- a/packages/muelu/test/interface/default/Output/reuse-S-1_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/reuse-S-1_tpetra.gold @@ -32,11 +32,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -189,11 +190,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -379,11 +381,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -536,11 +539,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/reuse-full-1_epetra.gold b/packages/muelu/test/interface/default/Output/reuse-full-1_epetra.gold index ab1976d9b4a0..7c3b1f23b09b 100644 --- a/packages/muelu/test/interface/default/Output/reuse-full-1_epetra.gold +++ b/packages/muelu/test/interface/default/Output/reuse-full-1_epetra.gold @@ -19,11 +19,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -163,11 +164,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/reuse-full-1_np4_epetra.gold b/packages/muelu/test/interface/default/Output/reuse-full-1_np4_epetra.gold index 3ddaead9cdee..5112c7211e2a 100644 --- a/packages/muelu/test/interface/default/Output/reuse-full-1_np4_epetra.gold +++ b/packages/muelu/test/interface/default/Output/reuse-full-1_np4_epetra.gold @@ -19,11 +19,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -163,11 +164,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/reuse-full-1_np4_tpetra.gold b/packages/muelu/test/interface/default/Output/reuse-full-1_np4_tpetra.gold index 9354c1bcc50c..5fdc1ca38e48 100644 --- a/packages/muelu/test/interface/default/Output/reuse-full-1_np4_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/reuse-full-1_np4_tpetra.gold @@ -32,11 +32,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -189,11 +190,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/reuse-full-1_tpetra.gold b/packages/muelu/test/interface/default/Output/reuse-full-1_tpetra.gold index cd9e5b8038c0..382d90905ca6 100644 --- a/packages/muelu/test/interface/default/Output/reuse-full-1_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/reuse-full-1_tpetra.gold @@ -32,11 +32,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -189,11 +190,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/reuse-none_epetra.gold b/packages/muelu/test/interface/default/Output/reuse-none_epetra.gold index 59a622cf670b..013f200a1c2e 100644 --- a/packages/muelu/test/interface/default/Output/reuse-none_epetra.gold +++ b/packages/muelu/test/interface/default/Output/reuse-none_epetra.gold @@ -19,11 +19,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -163,11 +164,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -338,11 +340,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -482,11 +485,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/reuse-none_np4_epetra.gold b/packages/muelu/test/interface/default/Output/reuse-none_np4_epetra.gold index 2a4030010519..c15541c8a5bc 100644 --- a/packages/muelu/test/interface/default/Output/reuse-none_np4_epetra.gold +++ b/packages/muelu/test/interface/default/Output/reuse-none_np4_epetra.gold @@ -19,11 +19,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -163,11 +164,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -331,11 +333,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -475,11 +478,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/reuse-none_np4_tpetra.gold b/packages/muelu/test/interface/default/Output/reuse-none_np4_tpetra.gold index 31c23ed6d06c..1ae019247cd8 100644 --- a/packages/muelu/test/interface/default/Output/reuse-none_np4_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/reuse-none_np4_tpetra.gold @@ -32,11 +32,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -189,11 +190,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -370,11 +372,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -527,11 +530,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/reuse-none_tpetra.gold b/packages/muelu/test/interface/default/Output/reuse-none_tpetra.gold index 12eb555bde2f..de2616e45432 100644 --- a/packages/muelu/test/interface/default/Output/reuse-none_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/reuse-none_tpetra.gold @@ -32,11 +32,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -189,11 +190,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -379,11 +381,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -536,11 +539,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/reuse-tP-1_epetra.gold b/packages/muelu/test/interface/default/Output/reuse-tP-1_epetra.gold index c4a3b6b78c2b..cdae47d6866b 100644 --- a/packages/muelu/test/interface/default/Output/reuse-tP-1_epetra.gold +++ b/packages/muelu/test/interface/default/Output/reuse-tP-1_epetra.gold @@ -19,11 +19,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -163,11 +164,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -336,11 +338,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -422,11 +425,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/reuse-tP-1_np4_epetra.gold b/packages/muelu/test/interface/default/Output/reuse-tP-1_np4_epetra.gold index dcc5fe356139..c2832ea80ed0 100644 --- a/packages/muelu/test/interface/default/Output/reuse-tP-1_np4_epetra.gold +++ b/packages/muelu/test/interface/default/Output/reuse-tP-1_np4_epetra.gold @@ -19,11 +19,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -163,11 +164,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -329,11 +331,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -415,11 +418,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/reuse-tP-1_np4_tpetra.gold b/packages/muelu/test/interface/default/Output/reuse-tP-1_np4_tpetra.gold index a086fe3dc339..cb0bcd3b7374 100644 --- a/packages/muelu/test/interface/default/Output/reuse-tP-1_np4_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/reuse-tP-1_np4_tpetra.gold @@ -32,11 +32,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -189,11 +190,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -368,11 +370,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -467,11 +470,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/reuse-tP-1_tpetra.gold b/packages/muelu/test/interface/default/Output/reuse-tP-1_tpetra.gold index b8f45ca2b421..f5fa330a5782 100644 --- a/packages/muelu/test/interface/default/Output/reuse-tP-1_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/reuse-tP-1_tpetra.gold @@ -32,11 +32,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -189,11 +190,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -377,11 +379,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -476,11 +479,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/reuse-tP-2_epetra.gold b/packages/muelu/test/interface/default/Output/reuse-tP-2_epetra.gold index baccaf0b4a5d..1a3b8f15bbeb 100644 --- a/packages/muelu/test/interface/default/Output/reuse-tP-2_epetra.gold +++ b/packages/muelu/test/interface/default/Output/reuse-tP-2_epetra.gold @@ -19,11 +19,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0.02, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0.02, blocksize = 1 aggregation: drop tol = 0.02 aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Lumping dropped entries @@ -163,11 +164,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0.02, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0.02, blocksize = 1 aggregation: drop tol = 0.02 aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Lumping dropped entries @@ -336,11 +338,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0.02, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0.02, blocksize = 1 aggregation: drop tol = 0.02 aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Lumping dropped entries @@ -421,11 +424,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0.02, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0.02, blocksize = 1 aggregation: drop tol = 0.02 aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Lumping dropped entries diff --git a/packages/muelu/test/interface/default/Output/reuse-tP-2_np4_epetra.gold b/packages/muelu/test/interface/default/Output/reuse-tP-2_np4_epetra.gold index e709871651f2..9bf50e38b73b 100644 --- a/packages/muelu/test/interface/default/Output/reuse-tP-2_np4_epetra.gold +++ b/packages/muelu/test/interface/default/Output/reuse-tP-2_np4_epetra.gold @@ -19,11 +19,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0.02, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0.02, blocksize = 1 aggregation: drop tol = 0.02 aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Lumping dropped entries @@ -163,11 +164,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0.02, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0.02, blocksize = 1 aggregation: drop tol = 0.02 aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Lumping dropped entries @@ -329,11 +331,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0.02, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0.02, blocksize = 1 aggregation: drop tol = 0.02 aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Lumping dropped entries @@ -414,11 +417,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0.02, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0.02, blocksize = 1 aggregation: drop tol = 0.02 aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Lumping dropped entries diff --git a/packages/muelu/test/interface/default/Output/reuse-tP-2_np4_tpetra.gold b/packages/muelu/test/interface/default/Output/reuse-tP-2_np4_tpetra.gold index a3b9cb8388fb..747100d3d149 100644 --- a/packages/muelu/test/interface/default/Output/reuse-tP-2_np4_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/reuse-tP-2_np4_tpetra.gold @@ -32,11 +32,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0.02, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0.02, blocksize = 1 aggregation: drop tol = 0.02 aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Lumping dropped entries @@ -189,11 +190,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0.02, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0.02, blocksize = 1 aggregation: drop tol = 0.02 aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Lumping dropped entries @@ -368,11 +370,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0.02, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0.02, blocksize = 1 aggregation: drop tol = 0.02 aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Lumping dropped entries @@ -466,11 +469,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0.02, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0.02, blocksize = 1 aggregation: drop tol = 0.02 aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Lumping dropped entries diff --git a/packages/muelu/test/interface/default/Output/reuse-tP-2_tpetra.gold b/packages/muelu/test/interface/default/Output/reuse-tP-2_tpetra.gold index c1ea2722e166..f9096191dadd 100644 --- a/packages/muelu/test/interface/default/Output/reuse-tP-2_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/reuse-tP-2_tpetra.gold @@ -32,11 +32,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0.02, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0.02, blocksize = 1 aggregation: drop tol = 0.02 aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Lumping dropped entries @@ -189,11 +190,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0.02, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0.02, blocksize = 1 aggregation: drop tol = 0.02 aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Lumping dropped entries @@ -377,11 +379,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0.02, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0.02, blocksize = 1 aggregation: drop tol = 0.02 aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Lumping dropped entries @@ -475,11 +478,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0.02, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0.02, blocksize = 1 aggregation: drop tol = 0.02 aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Lumping dropped entries diff --git a/packages/muelu/test/interface/default/Output/reuse-tP-3_epetra.gold b/packages/muelu/test/interface/default/Output/reuse-tP-3_epetra.gold index fdf31fb659aa..f583676830c8 100644 --- a/packages/muelu/test/interface/default/Output/reuse-tP-3_epetra.gold +++ b/packages/muelu/test/interface/default/Output/reuse-tP-3_epetra.gold @@ -19,11 +19,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -163,11 +164,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -336,11 +338,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -424,11 +427,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/reuse-tP-3_np4_epetra.gold b/packages/muelu/test/interface/default/Output/reuse-tP-3_np4_epetra.gold index 51bd6cec5a37..84ad5e965dbc 100644 --- a/packages/muelu/test/interface/default/Output/reuse-tP-3_np4_epetra.gold +++ b/packages/muelu/test/interface/default/Output/reuse-tP-3_np4_epetra.gold @@ -19,11 +19,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -163,11 +164,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -329,11 +331,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -417,11 +420,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/reuse-tP-3_np4_tpetra.gold b/packages/muelu/test/interface/default/Output/reuse-tP-3_np4_tpetra.gold index 97a877a7c6bc..e6c772068a47 100644 --- a/packages/muelu/test/interface/default/Output/reuse-tP-3_np4_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/reuse-tP-3_np4_tpetra.gold @@ -32,11 +32,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -189,11 +190,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -368,11 +370,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -469,11 +472,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/reuse-tP-3_tpetra.gold b/packages/muelu/test/interface/default/Output/reuse-tP-3_tpetra.gold index 2ceb1334aa95..332d27ea4b26 100644 --- a/packages/muelu/test/interface/default/Output/reuse-tP-3_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/reuse-tP-3_tpetra.gold @@ -32,11 +32,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -189,11 +190,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -377,11 +379,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -478,11 +481,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/smoother10_epetra.gold b/packages/muelu/test/interface/default/Output/smoother10_epetra.gold index f2c549fd27f0..f4d066352fc0 100644 --- a/packages/muelu/test/interface/default/Output/smoother10_epetra.gold +++ b/packages/muelu/test/interface/default/Output/smoother10_epetra.gold @@ -14,11 +14,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -102,11 +103,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/smoother10_tpetra.gold b/packages/muelu/test/interface/default/Output/smoother10_tpetra.gold index 81c4dbcade70..64a390264a89 100644 --- a/packages/muelu/test/interface/default/Output/smoother10_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/smoother10_tpetra.gold @@ -29,11 +29,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -132,11 +133,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/smoother11_epetra.gold b/packages/muelu/test/interface/default/Output/smoother11_epetra.gold index 3a0458282ecc..f729265c2172 100644 --- a/packages/muelu/test/interface/default/Output/smoother11_epetra.gold +++ b/packages/muelu/test/interface/default/Output/smoother11_epetra.gold @@ -21,11 +21,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -116,11 +117,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/smoother11_tpetra.gold b/packages/muelu/test/interface/default/Output/smoother11_tpetra.gold index 133a1d82d086..0335984593b3 100644 --- a/packages/muelu/test/interface/default/Output/smoother11_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/smoother11_tpetra.gold @@ -51,11 +51,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -176,11 +177,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/smoother12_epetra.gold b/packages/muelu/test/interface/default/Output/smoother12_epetra.gold index c775c52e3a8b..3c0caf380f78 100644 --- a/packages/muelu/test/interface/default/Output/smoother12_epetra.gold +++ b/packages/muelu/test/interface/default/Output/smoother12_epetra.gold @@ -14,11 +14,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -102,11 +103,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -190,11 +192,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -278,11 +281,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -366,11 +370,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/smoother12_tpetra.gold b/packages/muelu/test/interface/default/Output/smoother12_tpetra.gold index 9ff421993b96..8587ab148374 100644 --- a/packages/muelu/test/interface/default/Output/smoother12_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/smoother12_tpetra.gold @@ -20,11 +20,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -114,11 +115,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -208,11 +210,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -302,11 +305,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -396,11 +400,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/smoother13_epetra.gold b/packages/muelu/test/interface/default/Output/smoother13_epetra.gold index 123eee2ec48a..b2bbf2f3f808 100644 --- a/packages/muelu/test/interface/default/Output/smoother13_epetra.gold +++ b/packages/muelu/test/interface/default/Output/smoother13_epetra.gold @@ -21,11 +21,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -116,11 +117,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/smoother13_tpetra.gold b/packages/muelu/test/interface/default/Output/smoother13_tpetra.gold index e7e38b705af4..b863ac2ebcbc 100644 --- a/packages/muelu/test/interface/default/Output/smoother13_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/smoother13_tpetra.gold @@ -27,11 +27,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -128,11 +129,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/smoother1_epetra.gold b/packages/muelu/test/interface/default/Output/smoother1_epetra.gold index 8ec719fe7978..16b701ae70fe 100644 --- a/packages/muelu/test/interface/default/Output/smoother1_epetra.gold +++ b/packages/muelu/test/interface/default/Output/smoother1_epetra.gold @@ -16,11 +16,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -106,11 +107,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/smoother1_tpetra.gold b/packages/muelu/test/interface/default/Output/smoother1_tpetra.gold index 897d2b621573..1fc1e826a31f 100644 --- a/packages/muelu/test/interface/default/Output/smoother1_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/smoother1_tpetra.gold @@ -29,11 +29,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -132,11 +133,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/smoother2_epetra.gold b/packages/muelu/test/interface/default/Output/smoother2_epetra.gold index b41043edde4f..220cc3b495c0 100644 --- a/packages/muelu/test/interface/default/Output/smoother2_epetra.gold +++ b/packages/muelu/test/interface/default/Output/smoother2_epetra.gold @@ -16,11 +16,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -106,11 +107,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/smoother2_tpetra.gold b/packages/muelu/test/interface/default/Output/smoother2_tpetra.gold index 6b5265947bf3..95ef4380f96a 100644 --- a/packages/muelu/test/interface/default/Output/smoother2_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/smoother2_tpetra.gold @@ -29,11 +29,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -132,11 +133,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/smoother3_epetra.gold b/packages/muelu/test/interface/default/Output/smoother3_epetra.gold index 3d631fb2061b..60147c140ef7 100644 --- a/packages/muelu/test/interface/default/Output/smoother3_epetra.gold +++ b/packages/muelu/test/interface/default/Output/smoother3_epetra.gold @@ -16,11 +16,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -106,11 +107,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/smoother3_tpetra.gold b/packages/muelu/test/interface/default/Output/smoother3_tpetra.gold index ae22e2acff67..5f55186cbbc1 100644 --- a/packages/muelu/test/interface/default/Output/smoother3_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/smoother3_tpetra.gold @@ -29,11 +29,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -132,11 +133,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/smoother4_epetra.gold b/packages/muelu/test/interface/default/Output/smoother4_epetra.gold index 6ac8223be225..fa1456f9b2c6 100644 --- a/packages/muelu/test/interface/default/Output/smoother4_epetra.gold +++ b/packages/muelu/test/interface/default/Output/smoother4_epetra.gold @@ -7,11 +7,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -88,11 +89,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/smoother4_tpetra.gold b/packages/muelu/test/interface/default/Output/smoother4_tpetra.gold index 60f81c6e001f..5f5d69c4abb1 100644 --- a/packages/muelu/test/interface/default/Output/smoother4_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/smoother4_tpetra.gold @@ -7,11 +7,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -88,11 +89,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/smoother5_epetra.gold b/packages/muelu/test/interface/default/Output/smoother5_epetra.gold index 5d1367dd6c43..4856e08e363d 100644 --- a/packages/muelu/test/interface/default/Output/smoother5_epetra.gold +++ b/packages/muelu/test/interface/default/Output/smoother5_epetra.gold @@ -14,11 +14,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -102,11 +103,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/smoother5_tpetra.gold b/packages/muelu/test/interface/default/Output/smoother5_tpetra.gold index 3b97da35175b..30351986f600 100644 --- a/packages/muelu/test/interface/default/Output/smoother5_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/smoother5_tpetra.gold @@ -20,11 +20,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -114,11 +115,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/smoother6_epetra.gold b/packages/muelu/test/interface/default/Output/smoother6_epetra.gold index aa5df821c9a0..54b7668a20fd 100644 --- a/packages/muelu/test/interface/default/Output/smoother6_epetra.gold +++ b/packages/muelu/test/interface/default/Output/smoother6_epetra.gold @@ -14,11 +14,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -102,11 +103,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/smoother6_tpetra.gold b/packages/muelu/test/interface/default/Output/smoother6_tpetra.gold index 38f5ed011ca5..54839aee8ac9 100644 --- a/packages/muelu/test/interface/default/Output/smoother6_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/smoother6_tpetra.gold @@ -14,11 +14,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -102,11 +103,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/smoother9_epetra.gold b/packages/muelu/test/interface/default/Output/smoother9_epetra.gold index 3dbdf3568157..cfb42e73748d 100644 --- a/packages/muelu/test/interface/default/Output/smoother9_epetra.gold +++ b/packages/muelu/test/interface/default/Output/smoother9_epetra.gold @@ -21,11 +21,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -116,11 +117,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/smoother9_tpetra.gold b/packages/muelu/test/interface/default/Output/smoother9_tpetra.gold index 1c4a0e196392..73bff69b8a48 100644 --- a/packages/muelu/test/interface/default/Output/smoother9_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/smoother9_tpetra.gold @@ -27,11 +27,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -128,11 +129,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/sync1_epetra.gold b/packages/muelu/test/interface/default/Output/sync1_epetra.gold index 8ec719fe7978..16b701ae70fe 100644 --- a/packages/muelu/test/interface/default/Output/sync1_epetra.gold +++ b/packages/muelu/test/interface/default/Output/sync1_epetra.gold @@ -16,11 +16,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -106,11 +107,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/sync1_tpetra.gold b/packages/muelu/test/interface/default/Output/sync1_tpetra.gold index 897d2b621573..1fc1e826a31f 100644 --- a/packages/muelu/test/interface/default/Output/sync1_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/sync1_tpetra.gold @@ -29,11 +29,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -132,11 +133,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/transpose1_epetra.gold b/packages/muelu/test/interface/default/Output/transpose1_epetra.gold index cb84a45ea26c..d81403772a77 100644 --- a/packages/muelu/test/interface/default/Output/transpose1_epetra.gold +++ b/packages/muelu/test/interface/default/Output/transpose1_epetra.gold @@ -16,11 +16,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -102,11 +103,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/transpose1_tpetra.gold b/packages/muelu/test/interface/default/Output/transpose1_tpetra.gold index 4955f6f78e95..7d5399348d84 100644 --- a/packages/muelu/test/interface/default/Output/transpose1_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/transpose1_tpetra.gold @@ -29,11 +29,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -128,11 +129,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/transpose2_epetra.gold b/packages/muelu/test/interface/default/Output/transpose2_epetra.gold index d2c964d872c8..7a1b210a6327 100644 --- a/packages/muelu/test/interface/default/Output/transpose2_epetra.gold +++ b/packages/muelu/test/interface/default/Output/transpose2_epetra.gold @@ -19,11 +19,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -149,11 +150,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/transpose2_np4_epetra.gold b/packages/muelu/test/interface/default/Output/transpose2_np4_epetra.gold index f03181b23909..9e9d92bb39a5 100644 --- a/packages/muelu/test/interface/default/Output/transpose2_np4_epetra.gold +++ b/packages/muelu/test/interface/default/Output/transpose2_np4_epetra.gold @@ -19,11 +19,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -149,11 +150,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/transpose2_np4_tpetra.gold b/packages/muelu/test/interface/default/Output/transpose2_np4_tpetra.gold index b9e2f65a4c5d..dc9af9883e5d 100644 --- a/packages/muelu/test/interface/default/Output/transpose2_np4_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/transpose2_np4_tpetra.gold @@ -32,11 +32,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -175,11 +176,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/transpose2_tpetra.gold b/packages/muelu/test/interface/default/Output/transpose2_tpetra.gold index 32ce4e23ed50..1c08a38e7415 100644 --- a/packages/muelu/test/interface/default/Output/transpose2_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/transpose2_tpetra.gold @@ -32,11 +32,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -175,11 +176,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/transpose3_epetra.gold b/packages/muelu/test/interface/default/Output/transpose3_epetra.gold index a4e7c377e8a6..31ce475fe471 100644 --- a/packages/muelu/test/interface/default/Output/transpose3_epetra.gold +++ b/packages/muelu/test/interface/default/Output/transpose3_epetra.gold @@ -19,11 +19,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -149,11 +150,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/transpose3_np4_epetra.gold b/packages/muelu/test/interface/default/Output/transpose3_np4_epetra.gold index 790fe7f1b3d7..67b2597f2fd6 100644 --- a/packages/muelu/test/interface/default/Output/transpose3_np4_epetra.gold +++ b/packages/muelu/test/interface/default/Output/transpose3_np4_epetra.gold @@ -19,11 +19,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -149,11 +150,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/transpose3_np4_tpetra.gold b/packages/muelu/test/interface/default/Output/transpose3_np4_tpetra.gold index 59e03baf6d84..049d9d37eb52 100644 --- a/packages/muelu/test/interface/default/Output/transpose3_np4_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/transpose3_np4_tpetra.gold @@ -32,11 +32,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -175,11 +176,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/transpose3_tpetra.gold b/packages/muelu/test/interface/default/Output/transpose3_tpetra.gold index f0929cbe8f4a..1572ede3a661 100644 --- a/packages/muelu/test/interface/default/Output/transpose3_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/transpose3_tpetra.gold @@ -32,11 +32,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done @@ -175,11 +176,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 Filtered matrix is not being constructed as no filtering is being done diff --git a/packages/muelu/test/interface/default/Output/unsmoothed1_epetra.gold b/packages/muelu/test/interface/default/Output/unsmoothed1_epetra.gold index 99ed1b10511e..a9498da0173d 100644 --- a/packages/muelu/test/interface/default/Output/unsmoothed1_epetra.gold +++ b/packages/muelu/test/interface/default/Output/unsmoothed1_epetra.gold @@ -16,11 +16,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 BuildAggregates (Phase - (Dirichlet)) @@ -93,11 +94,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 BuildAggregates (Phase - (Dirichlet)) diff --git a/packages/muelu/test/interface/default/Output/unsmoothed1_tpetra.gold b/packages/muelu/test/interface/default/Output/unsmoothed1_tpetra.gold index 898b159e3765..5b848ebdf877 100644 --- a/packages/muelu/test/interface/default/Output/unsmoothed1_tpetra.gold +++ b/packages/muelu/test/interface/default/Output/unsmoothed1_tpetra.gold @@ -29,11 +29,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 BuildAggregates (Phase - (Dirichlet)) @@ -119,11 +120,12 @@ Build (MueLu::CoalesceDropFactory) Build (MueLu::AmalgamationFactory) [empty list] -algorithm = "classical": threshold = 0, blocksize = 1 +algorithm = "classical" classical algorithm = "default": threshold = 0, blocksize = 1 aggregation: drop tol = 0 [default] aggregation: Dirichlet threshold = 0 [default] aggregation: drop scheme = classical [default] aggregation: distance laplacian algo = default [default] +aggregation: classical algo = default [default] lightweight wrap = 1 BuildAggregates (Phase - (Dirichlet)) diff --git a/packages/muelu/test/interface/kokkos/Output/emin1_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/emin1_tpetra.gold index da05852d50ae..b3be5b5beb3a 100644 --- a/packages/muelu/test/interface/kokkos/Output/emin1_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/emin1_tpetra.gold @@ -24,8 +24,6 @@ smoother -> Level 1 Prolongator minimization (MueLu::EminPFactory) -Build (MueLu::TentativePFactory_kokkos) -Build (MueLu::UncoupledAggregationFactory_kokkos) Build (MueLu::CoalesceDropFactory_kokkos) Build (MueLu::AmalgamationFactory_kokkos) [empty list] @@ -39,6 +37,8 @@ filtered matrix: reuse graph = 1 [default] filtered matrix: reuse eigenvalue = 1 [default] lightweight wrap = 1 +Build (MueLu::TentativePFactory_kokkos) +Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) @@ -127,8 +127,6 @@ smoother -> Level 2 Prolongator minimization (MueLu::EminPFactory) -Build (MueLu::TentativePFactory_kokkos) -Build (MueLu::UncoupledAggregationFactory_kokkos) Build (MueLu::CoalesceDropFactory_kokkos) Build (MueLu::AmalgamationFactory_kokkos) [empty list] @@ -142,6 +140,8 @@ filtered matrix: reuse graph = 1 [default] filtered matrix: reuse eigenvalue = 1 [default] lightweight wrap = 1 +Build (MueLu::TentativePFactory_kokkos) +Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) diff --git a/packages/muelu/test/interface/kokkos/Output/emin2_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/emin2_tpetra.gold index 5f2996f6514d..9d3562628967 100644 --- a/packages/muelu/test/interface/kokkos/Output/emin2_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/emin2_tpetra.gold @@ -24,8 +24,6 @@ smoother -> Level 1 Prolongator minimization (MueLu::EminPFactory) -Build (MueLu::TentativePFactory_kokkos) -Build (MueLu::UncoupledAggregationFactory_kokkos) Build (MueLu::CoalesceDropFactory_kokkos) Build (MueLu::AmalgamationFactory_kokkos) [empty list] @@ -39,6 +37,8 @@ filtered matrix: reuse graph = 1 [default] filtered matrix: reuse eigenvalue = 1 [default] lightweight wrap = 1 +Build (MueLu::TentativePFactory_kokkos) +Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) @@ -127,8 +127,6 @@ smoother -> Level 2 Prolongator minimization (MueLu::EminPFactory) -Build (MueLu::TentativePFactory_kokkos) -Build (MueLu::UncoupledAggregationFactory_kokkos) Build (MueLu::CoalesceDropFactory_kokkos) Build (MueLu::AmalgamationFactory_kokkos) [empty list] @@ -142,6 +140,8 @@ filtered matrix: reuse graph = 1 [default] filtered matrix: reuse eigenvalue = 1 [default] lightweight wrap = 1 +Build (MueLu::TentativePFactory_kokkos) +Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) diff --git a/packages/muelu/test/interface/kokkos/Output/emin3_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/emin3_tpetra.gold index a95f78134021..3a60002921bd 100644 --- a/packages/muelu/test/interface/kokkos/Output/emin3_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/emin3_tpetra.gold @@ -24,8 +24,6 @@ smoother -> Level 1 Prolongator minimization (MueLu::EminPFactory) -Build (MueLu::TentativePFactory_kokkos) -Build (MueLu::UncoupledAggregationFactory_kokkos) Build (MueLu::CoalesceDropFactory_kokkos) Build (MueLu::AmalgamationFactory_kokkos) [empty list] @@ -39,6 +37,8 @@ filtered matrix: reuse graph = 1 [default] filtered matrix: reuse eigenvalue = 1 [default] lightweight wrap = 1 +Build (MueLu::TentativePFactory_kokkos) +Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) @@ -127,8 +127,6 @@ smoother -> Level 2 Prolongator minimization (MueLu::EminPFactory) -Build (MueLu::TentativePFactory_kokkos) -Build (MueLu::UncoupledAggregationFactory_kokkos) Build (MueLu::CoalesceDropFactory_kokkos) Build (MueLu::AmalgamationFactory_kokkos) [empty list] @@ -142,6 +140,8 @@ filtered matrix: reuse graph = 1 [default] filtered matrix: reuse eigenvalue = 1 [default] lightweight wrap = 1 +Build (MueLu::TentativePFactory_kokkos) +Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) diff --git a/packages/muelu/test/unit_tests/CoalesceDropFactory.cpp b/packages/muelu/test/unit_tests/CoalesceDropFactory.cpp index 087a1857a742..e70b522b6269 100644 --- a/packages/muelu/test/unit_tests/CoalesceDropFactory.cpp +++ b/packages/muelu/test/unit_tests/CoalesceDropFactory.cpp @@ -1221,6 +1221,12 @@ namespace MueLuTests { Teuchos::ParameterList galeriList; galeriList.set("nx", Teuchos::as(36)); RCP coordinates = Galeri::Xpetra::Utils::CreateCartesianCoordinates("1D", A->getRowMap(), galeriList); + // Now we doctor the coordinates so that the off-diagonal pair row 0 will want to keep (0,1) and row 1 will want to drop (1,0) + if(!comm->getRank()) { + auto vals = coordinates->getDataNonConst(0); + vals[0] = vals[0] - 2000*36; + } + fineLevel.Set("Coordinates", coordinates); CoalesceDropFactory coalesceDropFact; @@ -1254,10 +1260,77 @@ namespace MueLuTests { TEST_EQUALITY(myDomainMap->getMinLocalIndex(),0); TEST_EQUALITY(myDomainMap->getGlobalNumElements(),36); - TEST_EQUALITY(graph->GetGlobalNumEdges(),106); + TEST_EQUALITY(graph->GetGlobalNumEdges(),105); } // DistanceLaplacianCut + TEUCHOS_UNIT_TEST_TEMPLATE_4_DECL(CoalesceDropFactory, DistanceLaplacianCutSym, Scalar, LocalOrdinal, GlobalOrdinal, Node) + { +# include + typedef Teuchos::ScalarTraits STS; + typedef typename STS::magnitudeType real_type; + typedef Xpetra::MultiVector RealValuedMultiVector; + + MUELU_TESTING_SET_OSTREAM; + MUELU_TESTING_LIMIT_SCOPE(Scalar,GlobalOrdinal,Node); + out << "version: " << MueLu::Version() << std::endl; + + RCP > comm = Parameters::getDefaultComm(); + + Level fineLevel; + TestHelpers::TestFactory::createSingleLevelHierarchy(fineLevel); + + RCP A = TestHelpers::TestFactory::Build1DPoisson(36); + fineLevel.Set("A", A); + + Teuchos::ParameterList galeriList; + galeriList.set("nx", Teuchos::as(36)); + RCP coordinates = Galeri::Xpetra::Utils::CreateCartesianCoordinates("1D", A->getRowMap(), galeriList); + + // Now we doctor the coordinates so that the off-diagonal pair row 0 will want to keep (0,1) and row 1 will want to drop (1,0) + if(!comm->getRank()) { + auto vals = coordinates->getDataNonConst(0); + vals[0] = vals[0] - 2000*36; + } + + fineLevel.Set("Coordinates", coordinates); + + CoalesceDropFactory coalesceDropFact; + // We're dropping all the interior off-diagonal entries. + // dx = 1/36 + // L_ij = -36 + // L_ii = 72 + // criterion for dropping is |L_ij|^2 <= tol^2 * |L_ii*L_jj| + coalesceDropFact.SetParameter("aggregation: drop tol",Teuchos::ParameterEntry(8.0)); + coalesceDropFact.SetParameter("aggregation: drop scheme",Teuchos::ParameterEntry(std::string("distance laplacian"))); + coalesceDropFact.SetParameter("aggregation: distance laplacian algo",Teuchos::ParameterEntry(std::string("scaled cut symmetric"))); + fineLevel.Request("Graph",&coalesceDropFact); + fineLevel.Request("DofsPerNode", &coalesceDropFact); + + coalesceDropFact.Build(fineLevel); + + RCP graph = fineLevel.Get >("Graph", &coalesceDropFact); + LO myDofsPerNode = fineLevel.Get("DofsPerNode", &coalesceDropFact); + TEST_EQUALITY(Teuchos::as(myDofsPerNode) == 1, true); + + const RCP myImportMap = graph->GetImportMap(); // < note that the ImportMap is built from the column map of the matrix A WITHOUT dropping! + const RCP myDomainMap = graph->GetDomainMap(); + + TEST_EQUALITY(myImportMap->getMaxAllGlobalIndex(), 35); + TEST_EQUALITY(myImportMap->getMinAllGlobalIndex(), 0); + TEST_EQUALITY(myImportMap->getMinLocalIndex(),0); + TEST_EQUALITY(myImportMap->getGlobalNumElements(),Teuchos::as(36 + (comm->getSize()-1)*2)); + + TEST_EQUALITY(myDomainMap->getMaxAllGlobalIndex(), 35); + TEST_EQUALITY(myDomainMap->getMinAllGlobalIndex(), 0); + TEST_EQUALITY(myDomainMap->getMinLocalIndex(),0); + TEST_EQUALITY(myDomainMap->getGlobalNumElements(),36); + + TEST_EQUALITY(graph->GetGlobalNumEdges(),106); + + } // DistanceLaplacianCutScaled + + #define MUELU_ETI_GROUP(SC,LO,GO,Node) \ TEUCHOS_UNIT_TEST_TEMPLATE_4_INSTANT(CoalesceDropFactory,Constructor,SC,LO,GO,Node) \ @@ -1275,7 +1348,8 @@ namespace MueLuTests { TEUCHOS_UNIT_TEST_TEMPLATE_4_INSTANT(CoalesceDropFactory,AmalgamationDroppingLW,SC,LO,GO,Node) \ TEUCHOS_UNIT_TEST_TEMPLATE_4_INSTANT(CoalesceDropFactory,AmalgamationStridedOffsetDropping2LW,SC,LO,GO,Node) \ TEUCHOS_UNIT_TEST_TEMPLATE_4_INSTANT(CoalesceDropFactory,DistanceLaplacian,SC,LO,GO,Node) \ - TEUCHOS_UNIT_TEST_TEMPLATE_4_INSTANT(CoalesceDropFactory,DistanceLaplacianCut,SC,LO,GO,Node) + TEUCHOS_UNIT_TEST_TEMPLATE_4_INSTANT(CoalesceDropFactory,DistanceLaplacianCut,SC,LO,GO,Node) \ + TEUCHOS_UNIT_TEST_TEMPLATE_4_INSTANT(CoalesceDropFactory,DistanceLaplacianCutSym,SC,LO,GO,Node) #include diff --git a/packages/muelu/test/unit_tests/Hierarchy.cpp b/packages/muelu/test/unit_tests/Hierarchy.cpp index 5d7b1107053f..d294aea34b6d 100644 --- a/packages/muelu/test/unit_tests/Hierarchy.cpp +++ b/packages/muelu/test/unit_tests/Hierarchy.cpp @@ -1117,10 +1117,85 @@ namespace MueLuTests { H.Iterate(*RHS, *X, iterations); } + + template + typename Teuchos::ScalarTraits::magnitudeType + testMatrices(RCP >& A, + RCP >& B, + Teuchos::FancyOStream& out, + std::string labelA="A", + std::string labelB="B") { +# include + using TST = Teuchos::ScalarTraits; + RCP randomVec = VectorFactory::Build(A->getDomainMap(),false); + randomVec->randomize(); + out << "randomVec norm: " << randomVec->norm2() << std::endl; + RCP A_v = VectorFactory::Build(A->getRangeMap(),false); + A->apply(*randomVec,*A_v,Teuchos::NO_TRANS,1,0); + out << labelA << "_v norm: " << A_v->norm2() << std::endl; + + RCP B_v = VectorFactory::Build(B->getRangeMap(),false); + B->apply(*randomVec,*B_v,Teuchos::NO_TRANS,1,0); + out << labelB << "_v norm: " << B_v->norm2() << std::endl; + + RCP diff = VectorFactory::Build(A->getRangeMap()); + //diff = A_v + (-1.0)*(B_v) + 0*diff + diff->update(1.0,*A_v,-1.0,*B_v,0.0); + + Teuchos::Array norms(1); + diff->norm2(norms); + out << "||diff|| = " << norms[0] << std::endl; + return norms[0]; + } + + template + RCP > + loadMatrix(const std::string& basename, Xpetra::UnderlyingLib lib, const RCP >& comm) + { +# include + + RCP rowMap, colMap, domMap, ranMap; + std::string infile; + + { + infile = "rowmap_" + basename + ".m"; + std::ifstream ifile(infile); + if (ifile) + rowMap = Xpetra::IO::ReadMap(infile, lib, comm); + } + + { + infile = "colmap_" + basename + ".m"; + std::ifstream ifile(infile); + if (ifile) + colMap = Xpetra::IO::ReadMap(infile, lib, comm); + } + + { + infile = "domainmap_" + basename + ".m"; + std::ifstream ifile(infile); + if (ifile) + domMap = Xpetra::IO::ReadMap(infile, lib, comm); + } + + { + infile = "rangemap_" + basename + ".m"; + std::ifstream ifile(infile); + if (ifile) + ranMap = Xpetra::IO::ReadMap(infile, lib, comm); + } + + infile = basename + ".m"; + RCP A = Xpetra::IO::Read(infile, rowMap, colMap, domMap, ranMap); + + return A; + } + TEUCHOS_UNIT_TEST_TEMPLATE_4_DECL(Hierarchy, Write, Scalar, LocalOrdinal, GlobalOrdinal, Node) { # include MUELU_TESTING_SET_OSTREAM; + Teuchos::RCP allOut = Teuchos::rcp(new Teuchos::FancyOStream(Teuchos::rcpFromRef(std::cout))); MUELU_TESTING_LIMIT_SCOPE(Scalar,GlobalOrdinal,Node); using TST = Teuchos::ScalarTraits; using magnitude_type = typename Teuchos::ScalarTraits::magnitudeType; @@ -1136,62 +1211,119 @@ namespace MueLuTests { galeriList.set("nx", nx); RCP coordinates = Galeri::Xpetra::Utils::CreateCartesianCoordinates("1D", A->getRowMap(), galeriList); - // Multigrid Hierarchy - Hierarchy H(A); - H.SetDefaultVerbLevel(MueLu::Low); - H.SetMaxCoarseSize(29); - H.GetLevel(0)->Set("Coordinates", coordinates); + Teuchos::ParameterList paramList; +#ifdef HAVE_MPI + paramList.set("repartition: enable", true); + paramList.set("repartition: start level", 1); + paramList.set("repartition: min rows per proc", 6); +#endif + paramList.set("coarse: max size", 29); + // paramList.sublist("user data").set("Node Comm",nodeComm); + paramList.set("verbosity", "high"); + RCP mueLuFactory = rcp(new ParameterListInterpreter(paramList)); - FactoryManager M; - M.SetKokkosRefactor(false); - M.SetFactory("Smoother", Teuchos::null); - M.SetFactory("CoarseSolver", Teuchos::null); - H.Setup(M, 0, 2); + // Multigrid Hierarchy + RCP H = mueLuFactory->CreateHierarchy(); + H->GetLevel(0)->Set("A", A); + H->GetLevel(0)->Set("Coordinates", coordinates); + mueLuFactory->SetupHierarchy(*H); - TEST_THROW( H.Write(1,0), MueLu::Exceptions::RuntimeError ); //start level is greater than end level - TEST_THROW( H.Write(0,1000), MueLu::Exceptions::RuntimeError ); //end level is too big + TEST_THROW( H->Write(1,0), MueLu::Exceptions::RuntimeError ); //start level is greater than end level + TEST_THROW( H->Write(0,1000), MueLu::Exceptions::RuntimeError ); //end level is too big // Write matrices out, read fine A back in, and check that the read was ok // by using a matvec with a random vector. char t[] = "XXXXXX"; - mkstemp(t); //mkstemp() creates a temporary file. We use the name of that file as - //the suffix for the various data files produced by Hierarchy::Write(). - //A better solution would be to write to a file stream, but this would - //involve writing new interfaces to Epetra's file I/O capabilities. + if (comm->getRank() == 0) + mkstemp(t); //mkstemp() creates a temporary file. We use the name of that file as + //the suffix for the various data files produced by Hierarchy::Write(). + //A better solution would be to write to a file stream, but this would + //involve writing new interfaces to Epetra's file I/O capabilities. std::string tname(t); + Teuchos::broadcast(*comm, 0, tname.size(), &tname[0]); LocalOrdinal zero = Teuchos::OrdinalTraits::zero(); + LocalOrdinal one = Teuchos::OrdinalTraits::one(); //Only write out the fine level matrix, since that is the only data file we test against. - H.Write(zero,zero,tname); + H->Write(zero,one,tname); - std::string infile = "A_0" + tname + ".m"; + comm->barrier(); + + RCP lvl = H->GetLevel(one); + + std::string infile; + magnitude_type diff; Xpetra::UnderlyingLib lib = MueLuTests::TestHelpers::Parameters::getLib(); - RCP Ain = Xpetra::IO::Read(infile, lib, comm); - remove(infile.c_str()); - infile = "colmap_A_0" + tname + ".m"; remove(infile.c_str()); - infile = "domainmap_A_0" + tname + ".m"; remove(infile.c_str()); - infile = "rangemap_A_0" + tname + ".m"; remove(infile.c_str()); - infile = "rowmap_A_0" + tname + ".m"; remove(infile.c_str()); - remove(tname.c_str()); //remove file created by mkstemp - RCP randomVec = VectorFactory::Build(A->getDomainMap(),false); - randomVec->randomize(); - out << "randomVec norm: " << randomVec->norm2() << std::endl; - RCP A_v = VectorFactory::Build(A->getRangeMap(),false); - A->apply(*randomVec,*A_v,Teuchos::NO_TRANS,1,0); - out << "A_v norm: " << A_v->norm2() << std::endl; + { + std::string basename = "A_0" + tname; + RCP A0in = loadMatrix(basename, lib, comm); - RCP Ain_v = VectorFactory::Build(Ain->getRangeMap(),false); - Ain->apply(*randomVec,*Ain_v,Teuchos::NO_TRANS,1,0); - out << "Ain_v norm: " << Ain_v->norm2() << std::endl; + infile = "colmap_" + basename + ".m"; remove(infile.c_str()); + infile = "domainmap_" + basename + ".m"; remove(infile.c_str()); + infile = "rangemap_" + basename + ".m"; remove(infile.c_str()); + infile = "rowmap_" + basename + ".m"; remove(infile.c_str()); + infile = basename + ".m"; remove(infile.c_str()); - RCP diff = VectorFactory::Build(A->getRangeMap()); - //diff = A_v + (-1.0)*(Ain_v) + 0*diff - diff->update(1.0,*A_v,-1.0,*Ain_v,0.0); + diff = testMatrices(A, A0in, out, "A0", "A0in"); + } + TEST_EQUALITY(diff < 100*TMT::eps(), true); + comm->barrier(); + + RCP A1 = lvl->Get< RCP >("A"); + if (!A1.is_null()) { + RCP A1m = rcp_dynamic_cast(A1, true); + + std::string basename = "A_1" + tname; + RCP A1in = loadMatrix(basename, lib, A1m->getRangeMap()->getComm()); + + infile = "colmap_" + basename + ".m"; remove(infile.c_str()); + infile = "domainmap_" + basename + ".m"; remove(infile.c_str()); + infile = "rangemap_" + basename + ".m"; remove(infile.c_str()); + infile = "rowmap_" + basename + ".m"; remove(infile.c_str()); + infile = basename + ".m"; remove(infile.c_str()); + + diff = testMatrices(A1m, A1in, *allOut, "A1", "A1in"); + } + TEST_EQUALITY(diff < 100*TMT::eps(), true); + comm->barrier(); + + RCP P1 = lvl->Get< RCP >("P"); + if (!P1.is_null()) { + RCP P1m = rcp_dynamic_cast(P1, true); + + std::string basename = "P_1" + tname; + RCP P1in = loadMatrix(basename, lib, P1m->getRangeMap()->getComm()); + + infile = "colmap_" + basename + ".m"; remove(infile.c_str()); + infile = "domainmap_" + basename + ".m"; remove(infile.c_str()); + infile = "rangemap_" + basename + ".m"; remove(infile.c_str()); + infile = "rowmap_" + basename + ".m"; remove(infile.c_str()); + infile = basename + ".m"; remove(infile.c_str()); + + diff = testMatrices(P1m, P1in, *allOut, "P1", "P1in"); + } + TEST_EQUALITY(diff < 100*TMT::eps(), true); + comm->barrier(); + + RCP R1 = lvl->Get< RCP >("R"); + if (!R1.is_null()) { + RCP R1m = rcp_dynamic_cast(R1, true); + + std::string basename = "R_1" + tname; + RCP R1in = loadMatrix(basename, lib, R1m->getRangeMap()->getComm()); + + infile = "colmap_" + basename + ".m"; remove(infile.c_str()); + infile = "domainmap_" + basename + ".m"; remove(infile.c_str()); + infile = "rangemap_" + basename + ".m"; remove(infile.c_str()); + infile = "rowmap_" + basename + ".m"; remove(infile.c_str()); + infile = basename + ".m"; remove(infile.c_str()); + + diff = testMatrices(R1m, R1in, *allOut, "R1", "R1in"); + } + TEST_EQUALITY(diff < 100*TMT::eps(), true); + + remove(tname.c_str()); //remove file created by mkstemp - Teuchos::Array norms(1); - diff->norm2(norms); - out << "||diff|| = " << norms[0] << std::endl; - TEST_EQUALITY(norms[0] < 100*TMT::eps(), true); } TEUCHOS_UNIT_TEST_TEMPLATE_4_DECL(Hierarchy, BlockCrs, Scalar, LocalOrdinal, GlobalOrdinal, Node) diff --git a/packages/muelu/test/unit_tests/RegionMatrix.cpp b/packages/muelu/test/unit_tests/RegionMatrix.cpp index 811065dbada9..98b67e017373 100644 --- a/packages/muelu/test/unit_tests/RegionMatrix.cpp +++ b/packages/muelu/test/unit_tests/RegionMatrix.cpp @@ -73,7 +73,7 @@ void createRegionMatrix(const Teuchos::ParameterList galeriList, std::vector > >& rowImportPerGrp, std::vector > >& colImportPerGrp, std::vector > >& regionGrpMats, - Teuchos::Array& regionMatVecLIDs, + Teuchos::ArrayRCP& regionMatVecLIDs, Teuchos::RCP >& regionInterfaceImporter) { #include @@ -102,9 +102,10 @@ void createRegionMatrix(const Teuchos::ParameterList galeriList, procsPerDim[1] = galeriList.get("my"); procsPerDim[2] = galeriList.get("mz"); - // std::cout << "numDimensions=" << numDimensions << ", useStructured=" << false - // << ", numDofsPerNode=" << numDofsPerNode << ", gNodesPerDir=" << gNodesPerDir - // << ", lNodesPerDir=" << lNodesPerDir << ", procsPerDim=" << procsPerDim << std::endl; + // std::cout << "p=" << nodeMap->getComm()->getRank() << " | numDimensions=" << numDimensions + // << ", useStructured=" << false << ", numDofsPerNode=" << numDofsPerNode + // << ", gNodesPerDir=" << gNodesPerDir << ", lNodesPerDir=" << lNodesPerDir + // << ", procsPerDim=" << procsPerDim << std::endl; Array boundaryConditions; int maxRegPerGID = 0; @@ -134,7 +135,7 @@ void createRegionMatrix(const Teuchos::ParameterList galeriList, // std::cout << "p=" << myRank << " | compositeToRegionLIDs: " << compositeToRegionLIDs << std::endl; // std::cout << "p=" << myRank << " | quasiRegionGIDs: " << quasiRegionGIDs << std::endl; // std::cout << "p=" << myRank << " | interfaceCompositeGIDs" << interfaceCompositeGIDs << std::endl; - // std::cout << "p=" << myRank << " | interfaceRegionLIDs" << interfaceRegionLIDs << std::endl; + // std::cout << "p=" << myRank << " | interfaceRegionLIDs" << interfaceRegionLIDs() << std::endl; rowMapPerGrp[0] = Xpetra::MapFactory::Build(A->getRowMap()->lib(), Teuchos::OrdinalTraits::invalid(), @@ -145,7 +146,7 @@ void createRegionMatrix(const Teuchos::ParameterList galeriList, revisedRowMapPerGrp[0] = Xpetra::MapFactory::Build(A->getRowMap()->lib(), Teuchos::OrdinalTraits::invalid(), - quasiRegionGIDs.size()*numDofsPerNode, + quasiRegionGIDs.size(), A->getRowMap()->getIndexBase(), A->getRowMap()->getComm()); revisedColMapPerGrp[0] = revisedRowMapPerGrp[0]; @@ -176,6 +177,77 @@ void createRegionMatrix(const Teuchos::ParameterList galeriList, } // createRegionMatrix +// Helper function that creates almost all the data needed to generate a unit-test +// maxRegPerProc [in]: maximum number of regions assigned to any processor +// numDofsPerNode [in]: number of degrees of freedom per grid point +// galeriParameters [in]: parameters passed to galeri to generate the composite problem +// comm [in]: the MPI communicator used with distributed objects +// A [out]: composite matrix +// regionGrpMats [out]: the region matrix +template +void createProblem(const int maxRegPerProc, const LocalOrdinal numDofsPerNode, + Galeri::Xpetra::Parameters& galeriParameters, + RCP > comm, + RCP >& A, + std::vector > >& regionGrpMats, + std::vector > >& revisedRowMapPerGrp, + std::vector > >& rowImportPerGrp, + Teuchos::ArrayRCP& regionMatVecLIDs, + RCP >& regionInterfaceImporter) { +#include + using TST = Teuchos::ScalarTraits; + using magnitude_type = typename TST::magnitudeType; + using TMT = Teuchos::ScalarTraits; + using real_type = typename TST::coordinateType; + using RealValuedMultiVector = Xpetra::MultiVector; + + Teuchos::ParameterList galeriList = galeriParameters.GetParameterList(); + std::string matrixType = galeriParameters.GetMatrixType(); + std::string mapType, coordinatesType; + if((matrixType == "Laplace2D") || (matrixType == "Elasticity2D")) { + mapType = "Cartesian2D"; + coordinatesType = "2D"; + } else if((matrixType == "Laplace3D") || (matrixType == "Elasticity3D")) { + mapType = "Cartesian3D"; + coordinatesType = "3D"; + } + + // Build maps for the problem + RCP nodeMap = Galeri::Xpetra::CreateMap(TestHelpers::Parameters::getLib(), + mapType, comm, galeriList); + RCP dofMap = Xpetra::MapFactory::Build(nodeMap, numDofsPerNode); + + // Build the Xpetra problem + RCP > Pr = + Galeri::Xpetra::BuildProblem(galeriParameters.GetMatrixType(), dofMap, galeriList); + + // Generate the operator + A = Pr->BuildMatrix(); + A->SetFixedBlockSize(numDofsPerNode); + + // Create auxiliary data for MG + RCP nullspace = Pr->BuildNullspace(); + RCP coordinates = Galeri::Xpetra::Utils::CreateCartesianCoordinates(coordinatesType, nodeMap, galeriList); + + // create the region maps, importer and operator from composite counter parts + std::vector > rowMapPerGrp(maxRegPerProc), colMapPerGrp(maxRegPerProc); + std::vector > revisedColMapPerGrp(maxRegPerProc); + std::vector > colImportPerGrp(maxRegPerProc); + createRegionMatrix(galeriList, numDofsPerNode, maxRegPerProc, nodeMap, dofMap, A, + rowMapPerGrp, colMapPerGrp, revisedRowMapPerGrp, revisedColMapPerGrp, + rowImportPerGrp, colImportPerGrp, regionGrpMats, + regionMatVecLIDs, regionInterfaceImporter); + + // Debug output + // std::cout << "p=" << comm->getRank() << " | regionMatVecLIDs: " << regionMatVecLIDs << std::endl; + // std::cout << "p=" << comm->getRank() << " | source map element list: " + // << regionInterfaceImporter->getSourceMap()->getNodeElementList() << std::endl; + // std::cout << "p=" << comm->getRank() << " | target map element list: " + // << regionInterfaceImporter->getTargetMap()->getNodeElementList() << std::endl; + + +} // createProblem + // test_matrix() is checking that performing a MatVec with composite A and region A // yields the same vector. It also verifies that regionalToComposite(regA) returns // the same matrix as composite A. It is a convenience function to perform common tests. @@ -342,7 +414,7 @@ TEUCHOS_UNIT_TEST_TEMPLATE_4_DECL(RegionMatrix, CompositeToRegionMatrix, Scalar, std::vector > revisedRowMapPerGrp(maxRegPerProc), revisedColMapPerGrp(maxRegPerProc); std::vector > rowImportPerGrp(maxRegPerProc), colImportPerGrp(maxRegPerProc); std::vector > regionGrpMats(maxRegPerProc); - Teuchos::Array regionMatVecLIDs; + Teuchos::ArrayRCP regionMatVecLIDs; RCP regionInterfaceImporter; createRegionMatrix(galeriList, numDofsPerNode, maxRegPerProc, nodeMap, dofMap, A, rowMapPerGrp, colMapPerGrp, revisedRowMapPerGrp, revisedColMapPerGrp, @@ -520,7 +592,7 @@ TEUCHOS_UNIT_TEST_TEMPLATE_4_DECL(RegionMatrix, RegionToCompositeMatrix, Scalar, std::vector > revisedRowMapPerGrp(maxRegPerProc), revisedColMapPerGrp(maxRegPerProc); std::vector > rowImportPerGrp(maxRegPerProc), colImportPerGrp(maxRegPerProc); std::vector > regionGrpMats(maxRegPerProc); - Teuchos::Array regionMatVecLIDs; + Teuchos::ArrayRCP regionMatVecLIDs; RCP regionInterfaceImporter; createRegionMatrix(galeriList, numDofsPerNode, maxRegPerProc, nodeMap, dofMap, A, rowMapPerGrp, colMapPerGrp, revisedRowMapPerGrp, revisedColMapPerGrp, @@ -624,7 +696,7 @@ TEUCHOS_UNIT_TEST_TEMPLATE_4_DECL(RegionMatrix, MatVec, Scalar, LocalOrdinal, Gl std::vector > revisedRowMapPerGrp(maxRegPerProc), revisedColMapPerGrp(maxRegPerProc); std::vector > rowImportPerGrp(maxRegPerProc), colImportPerGrp(maxRegPerProc); std::vector > regionGrpMats(maxRegPerProc); - Teuchos::Array regionMatVecLIDs; + Teuchos::ArrayRCP regionMatVecLIDs; RCP regionInterfaceImporter; createRegionMatrix(galeriList, numDofsPerNode, maxRegPerProc, nodeMap, dofMap, A, rowMapPerGrp, colMapPerGrp, revisedRowMapPerGrp, revisedColMapPerGrp, @@ -674,6 +746,8 @@ TEUCHOS_UNIT_TEST_TEMPLATE_4_DECL(RegionMatrix, MatVec, Scalar, LocalOrdinal, Gl // This test aims at checking that apply regionA to a region vector has the same effect as // applying A to a composite vector. Of course the region vector needs to be brought back // to composite formate before verifying the equivalence. +// +// Do this for 1 DOF per node TEUCHOS_UNIT_TEST_TEMPLATE_4_DECL(RegionMatrix, FastMatVec, Scalar, LocalOrdinal, GlobalOrdinal, Node) { # include "MueLu_UseShortNames.hpp" @@ -722,7 +796,7 @@ TEUCHOS_UNIT_TEST_TEMPLATE_4_DECL(RegionMatrix, FastMatVec, Scalar, LocalOrdinal std::vector > revisedRowMapPerGrp(maxRegPerProc), revisedColMapPerGrp(maxRegPerProc); std::vector > rowImportPerGrp(maxRegPerProc), colImportPerGrp(maxRegPerProc); std::vector > regionGrpMats(maxRegPerProc); - Teuchos::Array regionMatVecLIDs; + Teuchos::ArrayRCP regionMatVecLIDs; RCP regionInterfaceImporter; createRegionMatrix(galeriList, numDofsPerNode, maxRegPerProc, nodeMap, dofMap, A, rowMapPerGrp, colMapPerGrp, revisedRowMapPerGrp, revisedColMapPerGrp, @@ -779,7 +853,7 @@ TEUCHOS_UNIT_TEST_TEMPLATE_4_DECL(RegionMatrix, FastMatVec, Scalar, LocalOrdinal regC[0] = VectorFactory::Build(revisedRowMapPerGrp[0], true); ApplyMatVec(TST::one(), regionMat, regX[0], TST::zero(), regionInterfaceImporter, regionMatVecLIDs, - regC[0]); + regC[0], Teuchos::NO_TRANS, true); ArrayRCP dataRegC = regC[0]->getData(0); for(size_t idx = 0; idx < refRegB[0]->getLocalLength(); ++idx) { @@ -790,6 +864,310 @@ TEUCHOS_UNIT_TEST_TEMPLATE_4_DECL(RegionMatrix, FastMatVec, Scalar, LocalOrdinal } // FastMatVec +// This test aims at checking that apply regionA to a region vector has the same effect as +// applying A to a composite vector. Of course the region vector needs to be brought back +// to composite formate before verifying the equivalence. +// +// Do this for 1 DOF per node +TEUCHOS_UNIT_TEST_TEMPLATE_4_DECL(RegionMatrix, FastMatVec3D, Scalar, LocalOrdinal, GlobalOrdinal, Node) +{ +# include "MueLu_UseShortNames.hpp" + MUELU_TESTING_SET_OSTREAM; + MUELU_TESTING_LIMIT_SCOPE(Scalar,GlobalOrdinal,Node); + + using TST = Teuchos::ScalarTraits; + using magnitude_type = typename TST::magnitudeType; + using TMT = Teuchos::ScalarTraits; + using real_type = typename TST::coordinateType; + using RealValuedMultiVector = Xpetra::MultiVector; + using test_factory = TestHelpers::TestFactory; + + out << "version: " << MueLu::Version() << std::endl; + + // Get MPI parameter + RCP > comm = TestHelpers::Parameters::getDefaultComm(); + + GO nx = 5, ny = 5, nz = 3; + Teuchos::CommandLineProcessor &clp = Teuchos::UnitTestRepository::getCLP(); + Galeri::Xpetra::Parameters galeriParameters(clp, nx, ny, nz, "Laplace3D"); + Teuchos::ParameterList galeriList = galeriParameters.GetParameterList(); + std::string matrixType = galeriParameters.GetMatrixType(); + const LO numDofsPerNode = 1; + const int maxRegPerProc = 1; + + // create the region maps, importer and operator from composite counter parts + std::vector > regionGrpMats(maxRegPerProc); + RCP A; + std::vector > revisedRowMapPerGrp(maxRegPerProc); + std::vector > rowImportPerGrp(maxRegPerProc); + Teuchos::ArrayRCP regionMatVecLIDs; + RCP regionInterfaceImporter; + + createProblem(maxRegPerProc, numDofsPerNode, galeriParameters, comm, + A, regionGrpMats, revisedRowMapPerGrp, rowImportPerGrp, + regionMatVecLIDs, regionInterfaceImporter); + + RCP regionMat = regionGrpMats[0]; + + // Create initial vectors in composite format and apply composite A. + // This will give a reference to compare with. + RCP X = VectorFactory::Build(A->getRowMap()); + RCP B = VectorFactory::Build(A->getRowMap()); + + // we set seed for reproducibility + Utilities::SetRandomSeed(*comm); + X->randomize(); + + // Perform composite MatVec + A->apply(*X, *B, Teuchos::NO_TRANS, TST::one(), TST::zero()); + + // Create the region vectors and apply region A + Array > quasiRegX(maxRegPerProc); + Array > quasiRegB(maxRegPerProc); + Array > regX(maxRegPerProc); + Array > regB(maxRegPerProc); + compositeToRegional(X, quasiRegX, regX, + revisedRowMapPerGrp, rowImportPerGrp); + regB[0] = VectorFactory::Build(revisedRowMapPerGrp[0], true); + regionMat->apply(*regX[0], *regB[0], Teuchos::NO_TRANS, TST::one(), TST::zero()); + sumInterfaceValues(regB, revisedRowMapPerGrp, rowImportPerGrp); + + // Now create a refRegB vector using B as a starting point + // and compare the result to regB + Array > refRegB(maxRegPerProc); + compositeToRegional(B, quasiRegB, refRegB, + revisedRowMapPerGrp, rowImportPerGrp); + + // Extract the data from B and compB to compare it + ArrayRCP dataRegB = regB[0]->getData(0); + ArrayRCP dataRefRegB = refRegB[0]->getData(0); + for(size_t idx = 0; idx < refRegB[0]->getLocalLength(); ++idx) { + TEST_FLOATING_EQUALITY(TST::magnitude(dataRegB[idx]), + TST::magnitude(dataRefRegB[idx]), + 100*TMT::eps()); + } + + // Finally we perform the "fastMatVec" that does not require + // to transform data from region to composite and back + // it should perform faster and allow for easy customization + // of the local MatVec + RCP regionMap = revisedRowMapPerGrp[0]; + + Array > regC(maxRegPerProc); + regC[0] = VectorFactory::Build(revisedRowMapPerGrp[0], true); + ApplyMatVec(TST::one(), regionMat, regX[0], TST::zero(), + regionInterfaceImporter, regionMatVecLIDs, + regC[0], Teuchos::NO_TRANS, true); + + ArrayRCP dataRegC = regC[0]->getData(0); + for(size_t idx = 0; idx < refRegB[0]->getLocalLength(); ++idx) { + TEST_FLOATING_EQUALITY(TST::magnitude(dataRegC[idx]), + TST::magnitude(dataRefRegB[idx]), + 100*TMT::eps()); + } + +} // FastMatVec3D + +// This test aims at checking that apply regionA to a region vector has the same effect as +// applying A to a composite vector. Of course the region vector needs to be brought back +// to composite formate before verifying the equivalence. +// +// Do this for 2 DOFs per node (two-dimensional elasticity) +TEUCHOS_UNIT_TEST_TEMPLATE_4_DECL(RegionMatrix, FastMatVec2D_Elasticity, Scalar, LocalOrdinal, GlobalOrdinal, Node) +{ +# include "MueLu_UseShortNames.hpp" + MUELU_TESTING_SET_OSTREAM; + MUELU_TESTING_LIMIT_SCOPE(Scalar,GlobalOrdinal,Node); + + using TST = Teuchos::ScalarTraits; + using magnitude_type = typename TST::magnitudeType; + using TMT = Teuchos::ScalarTraits; + using real_type = typename TST::coordinateType; + using RealValuedMultiVector = Xpetra::MultiVector; + using test_factory = TestHelpers::TestFactory; + + out << "version: " << MueLu::Version() << std::endl; + + // Get MPI parameter + RCP > comm = TestHelpers::Parameters::getDefaultComm(); + + const int maxRegPerProc = 1; + const LO numDofsPerNode = 2; + GO nx = 7, ny = 7, nz = 1; + Teuchos::CommandLineProcessor &clp = Teuchos::UnitTestRepository::getCLP(); + Galeri::Xpetra::Parameters galeriParameters(clp, nx, ny, nz, "Elasticity2D"); + std::vector > regionGrpMats(maxRegPerProc); + RCP A; + std::vector > revisedRowMapPerGrp(maxRegPerProc); + std::vector > rowImportPerGrp(maxRegPerProc); + Teuchos::ArrayRCP regionMatVecLIDs; + RCP regionInterfaceImporter; + + createProblem(maxRegPerProc, numDofsPerNode, galeriParameters, comm, + A, regionGrpMats, revisedRowMapPerGrp, rowImportPerGrp, + regionMatVecLIDs, regionInterfaceImporter); + + RCP regionMat = regionGrpMats[0]; + + // Create initial vectors in composite format and apply composite A. + // This will give a reference to compare with. + RCP X = VectorFactory::Build(A->getRowMap()); + RCP B = VectorFactory::Build(A->getRowMap()); + + // we set seed for reproducibility + Utilities::SetRandomSeed(*comm); + X->randomize(); + + // Perform composite MatVec + A->apply(*X, *B, Teuchos::NO_TRANS, TST::one(), TST::zero()); + + // Create the region vectors and apply region A + Array > quasiRegX(maxRegPerProc); + Array > quasiRegB(maxRegPerProc); + Array > regX(maxRegPerProc); + Array > regB(maxRegPerProc); + compositeToRegional(X, quasiRegX, regX, + revisedRowMapPerGrp, rowImportPerGrp); + regB[0] = VectorFactory::Build(revisedRowMapPerGrp[0], true); + regionMat->apply(*regX[0], *regB[0], Teuchos::NO_TRANS, TST::one(), TST::zero()); + sumInterfaceValues(regB, revisedRowMapPerGrp, rowImportPerGrp); + + // Now create a refRegB vector using B as a starting point + // and compare the result to regB + Array > refRegB(maxRegPerProc); + compositeToRegional(B, quasiRegB, refRegB, + revisedRowMapPerGrp, rowImportPerGrp); + + // Extract the data from B and compB to compare it + ArrayRCP dataRegB = regB[0]->getData(0); + ArrayRCP dataRefRegB = refRegB[0]->getData(0); + for(size_t idx = 0; idx < refRegB[0]->getLocalLength(); ++idx) { + TEST_FLOATING_EQUALITY(TST::magnitude(dataRegB[idx]), + TST::magnitude(dataRefRegB[idx]), + 100*TMT::eps()); + } + + // Finally we perform the "fastMatVec" that does not require + // to transform data from region to composite and back + // it should perform faster and allow for easy customization + // of the local MatVec + RCP regionMap = revisedRowMapPerGrp[0]; + + Array > regC(maxRegPerProc); + regC[0] = VectorFactory::Build(revisedRowMapPerGrp[0], true); + ApplyMatVec(TST::one(), regionMat, regX[0], TST::zero(), + regionInterfaceImporter, regionMatVecLIDs, + regC[0], Teuchos::NO_TRANS, true); + + ArrayRCP dataRegC = regC[0]->getData(0); + for(size_t idx = 0; idx < refRegB[0]->getLocalLength(); ++idx) { + TEST_FLOATING_EQUALITY(TST::magnitude(dataRegC[idx]), + TST::magnitude(dataRefRegB[idx]), + 100*TMT::eps()); + } + +} // FastMatVec2D_Elasticity + +// This test aims at checking that apply regionA to a region vector has the same effect as +// applying A to a composite vector. Of course the region vector needs to be brought back +// to composite formate before verifying the equivalence. +// +// Do this for 3 DOFs per node (three-dimensional elasticity) +TEUCHOS_UNIT_TEST_TEMPLATE_4_DECL(RegionMatrix, FastMatVec3D_Elasticity, Scalar, LocalOrdinal, GlobalOrdinal, Node) +{ +# include "MueLu_UseShortNames.hpp" + MUELU_TESTING_SET_OSTREAM; + MUELU_TESTING_LIMIT_SCOPE(Scalar,GlobalOrdinal,Node); + + using TST = Teuchos::ScalarTraits; + using magnitude_type = typename TST::magnitudeType; + using TMT = Teuchos::ScalarTraits; + using real_type = typename TST::coordinateType; + using RealValuedMultiVector = Xpetra::MultiVector; + using test_factory = TestHelpers::TestFactory; + + out << "version: " << MueLu::Version() << std::endl; + + // Get MPI parameter + RCP > comm = TestHelpers::Parameters::getDefaultComm(); + + const int maxRegPerProc = 1; + const LO numDofsPerNode = 3; + GO nx = 5, ny = 5, nz = 3; + Teuchos::CommandLineProcessor &clp = Teuchos::UnitTestRepository::getCLP(); + Galeri::Xpetra::Parameters galeriParameters(clp, nx, ny, nz, "Elasticity3D"); + std::vector > regionGrpMats(maxRegPerProc); + RCP A; + std::vector > revisedRowMapPerGrp(maxRegPerProc); + std::vector > rowImportPerGrp(maxRegPerProc); + Teuchos::ArrayRCP regionMatVecLIDs; + RCP regionInterfaceImporter; + + createProblem(maxRegPerProc, numDofsPerNode, galeriParameters, comm, + A, regionGrpMats, revisedRowMapPerGrp, rowImportPerGrp, + regionMatVecLIDs, regionInterfaceImporter); + + RCP regionMat = regionGrpMats[0]; + + // Create initial vectors in composite format and apply composite A. + // This will give a reference to compare with. + RCP X = VectorFactory::Build(A->getRowMap()); + RCP B = VectorFactory::Build(A->getRowMap()); + + // we set seed for reproducibility + Utilities::SetRandomSeed(*comm); + X->randomize(); + + // Perform composite MatVec + A->apply(*X, *B, Teuchos::NO_TRANS, TST::one(), TST::zero()); + + // Create the region vectors and apply region A + Array > quasiRegX(maxRegPerProc); + Array > quasiRegB(maxRegPerProc); + Array > regX(maxRegPerProc); + Array > regB(maxRegPerProc); + compositeToRegional(X, quasiRegX, regX, + revisedRowMapPerGrp, rowImportPerGrp); + regB[0] = VectorFactory::Build(revisedRowMapPerGrp[0], true); + regionMat->apply(*regX[0], *regB[0], Teuchos::NO_TRANS, TST::one(), TST::zero()); + sumInterfaceValues(regB, revisedRowMapPerGrp, rowImportPerGrp); + + // Now create a refRegB vector using B as a starting point + // and compare the result to regB + Array > refRegB(maxRegPerProc); + compositeToRegional(B, quasiRegB, refRegB, + revisedRowMapPerGrp, rowImportPerGrp); + + // Extract the data from B and compB to compare it + ArrayRCP dataRegB = regB[0]->getData(0); + ArrayRCP dataRefRegB = refRegB[0]->getData(0); + for(size_t idx = 0; idx < refRegB[0]->getLocalLength(); ++idx) { + TEST_FLOATING_EQUALITY(TST::magnitude(dataRegB[idx]), + TST::magnitude(dataRefRegB[idx]), + 100*TMT::eps()); + } + + // Finally we perform the "fastMatVec" that does not require + // to transform data from region to composite and back + // it should perform faster and allow for easy customization + // of the local MatVec + RCP regionMap = revisedRowMapPerGrp[0]; + + Array > regC(maxRegPerProc); + regC[0] = VectorFactory::Build(revisedRowMapPerGrp[0], true); + ApplyMatVec(TST::one(), regionMat, regX[0], TST::zero(), + regionInterfaceImporter, regionMatVecLIDs, + regC[0], Teuchos::NO_TRANS, true); + + ArrayRCP dataRegC = regC[0]->getData(0); + for(size_t idx = 0; idx < refRegB[0]->getLocalLength(); ++idx) { + TEST_FLOATING_EQUALITY(TST::magnitude(dataRegC[idx]), + TST::magnitude(dataRefRegB[idx]), + 100*TMT::eps()); + } + +} // FastMatVec3D_Elasticity + // Here a Laplace 2D problem is tested for all the above checks mentioned: // 1) the region operator is compared against know values // 2) the action of the region MatVec is compared with the composite MatVec @@ -841,7 +1219,7 @@ TEUCHOS_UNIT_TEST_TEMPLATE_4_DECL(RegionMatrix, Laplace2D, Scalar, LocalOrdinal, std::vector > revisedRowMapPerGrp(maxRegPerProc), revisedColMapPerGrp(maxRegPerProc); std::vector > rowImportPerGrp(maxRegPerProc), colImportPerGrp(maxRegPerProc); std::vector > regionGrpMats(maxRegPerProc); - Teuchos::Array regionMatVecLIDs; + Teuchos::ArrayRCP regionMatVecLIDs; RCP regionInterfaceImporter; createRegionMatrix(galeriList, numDofsPerNode, maxRegPerProc, nodeMap, dofMap, A, rowMapPerGrp, colMapPerGrp, revisedRowMapPerGrp, revisedColMapPerGrp, @@ -1018,7 +1396,7 @@ TEUCHOS_UNIT_TEST_TEMPLATE_4_DECL(RegionMatrix, Laplace3D, Scalar, LocalOrdinal, std::vector > revisedRowMapPerGrp(maxRegPerProc), revisedColMapPerGrp(maxRegPerProc); std::vector > rowImportPerGrp(maxRegPerProc), colImportPerGrp(maxRegPerProc); std::vector > regionGrpMats(maxRegPerProc); - Teuchos::Array regionMatVecLIDs; + Teuchos::ArrayRCP regionMatVecLIDs; RCP regionInterfaceImporter; createRegionMatrix(galeriList, numDofsPerNode, maxRegPerProc, nodeMap, dofMap, A, rowMapPerGrp, colMapPerGrp, revisedRowMapPerGrp, revisedColMapPerGrp, @@ -1295,6 +1673,9 @@ TEUCHOS_UNIT_TEST_TEMPLATE_4_DECL(RegionMatrix, Laplace3D, Scalar, LocalOrdinal, TEUCHOS_UNIT_TEST_TEMPLATE_4_INSTANT(RegionMatrix,RegionToCompositeMatrix,Scalar,LO,GO,Node) \ TEUCHOS_UNIT_TEST_TEMPLATE_4_INSTANT(RegionMatrix,MatVec,Scalar,LO,GO,Node) \ TEUCHOS_UNIT_TEST_TEMPLATE_4_INSTANT(RegionMatrix,FastMatVec,Scalar,LO,GO,Node) \ + TEUCHOS_UNIT_TEST_TEMPLATE_4_INSTANT(RegionMatrix,FastMatVec3D,Scalar,LO,GO,Node) \ + TEUCHOS_UNIT_TEST_TEMPLATE_4_INSTANT(RegionMatrix,FastMatVec2D_Elasticity,Scalar,LO,GO,Node) \ + TEUCHOS_UNIT_TEST_TEMPLATE_4_INSTANT(RegionMatrix,FastMatVec3D_Elasticity,Scalar,LO,GO,Node) \ TEUCHOS_UNIT_TEST_TEMPLATE_4_INSTANT(RegionMatrix,Laplace2D,Scalar,LO,GO,Node) \ TEUCHOS_UNIT_TEST_TEMPLATE_4_INSTANT(RegionMatrix,Laplace3D,Scalar,LO,GO,Node) diff --git a/packages/muelu/test/unit_tests/RegionVector.cpp b/packages/muelu/test/unit_tests/RegionVector.cpp index 4f0ad7770d77..25f056495b81 100644 --- a/packages/muelu/test/unit_tests/RegionVector.cpp +++ b/packages/muelu/test/unit_tests/RegionVector.cpp @@ -160,7 +160,7 @@ TEUCHOS_UNIT_TEST_TEMPLATE_4_DECL(RegionVector, RegionCompositeVector, Scalar, L compVec->putScalar(0.0); const size_t localLength = compVec->getLocalLength(); for (size_t k = 0; k < localLength; ++k) { - compVec->replaceLocalValue(k, static_cast(k) + static_cast(myRank/10)); + compVec->replaceLocalValue(k, static_cast(k) + static_cast(myRank)/10); } // Create a region vector diff --git a/packages/nox/test/tpetra/ME_Tpetra_1DFEM_def.hpp b/packages/nox/test/tpetra/ME_Tpetra_1DFEM_def.hpp index 51ddf587476c..2322c3967f8c 100644 --- a/packages/nox/test/tpetra/ME_Tpetra_1DFEM_def.hpp +++ b/packages/nox/test/tpetra/ME_Tpetra_1DFEM_def.hpp @@ -131,8 +131,7 @@ template Teuchos::RCP > EvaluatorTpetra1DFEM::createGraph() { - //typedef typename tpetra_graph::local_graph_type local_graph_type; - typedef typename tpetra_graph::execution_space::size_type size_type; + typedef typename tpetra_graph::local_graph_type::size_type size_type; // Compute graph offset array int numProcs = comm_->getSize(); diff --git a/packages/pamgen/rtcompiler/Registrar.C b/packages/pamgen/rtcompiler/Registrar.C index 4f07f5c9b7d5..c5c63a8139f5 100644 --- a/packages/pamgen/rtcompiler/Registrar.C +++ b/packages/pamgen/rtcompiler/Registrar.C @@ -556,7 +556,7 @@ double Readline::execute(Value** args) string line; if (getline(curr_file, line)) { - assert(args[1]->getSize() > line.size()); // buffer needs to be big enough + assert(args[1]->getSize() > long(line.size())); // buffer needs to be big enough for (size_t i = 0; i < line.size(); ++i) { args[1]->setArrayValue(line[i], i); } diff --git a/packages/panzer/adapters-stk/example/CMakeLists.txt b/packages/panzer/adapters-stk/example/CMakeLists.txt index e39f1f84a9be..b65844a9822f 100644 --- a/packages/panzer/adapters-stk/example/CMakeLists.txt +++ b/packages/panzer/adapters-stk/example/CMakeLists.txt @@ -4,6 +4,7 @@ ADD_SUBDIRECTORY(CurlLaplacianExample) ADD_SUBDIRECTORY(MixedCurlLaplacianExample) ADD_SUBDIRECTORY(MixedPoissonExample) ADD_SUBDIRECTORY(PoissonInterfaceExample) +ADD_SUBDIRECTORY(PoissonInterfaceTpetra) ADD_SUBDIRECTORY(assembly_engine) ADD_SUBDIRECTORY(main_driver) ADD_SUBDIRECTORY(ModelEvaluator) diff --git a/packages/panzer/adapters-stk/example/PoissonInterfaceTpetra/CMakeLists.txt b/packages/panzer/adapters-stk/example/PoissonInterfaceTpetra/CMakeLists.txt new file mode 100644 index 000000000000..e3a325ca6a21 --- /dev/null +++ b/packages/panzer/adapters-stk/example/PoissonInterfaceTpetra/CMakeLists.txt @@ -0,0 +1,95 @@ +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) + +SET(ASSEMBLY_EXAMPLE_SOURCES + main.cpp) + +TRIBITS_ADD_EXECUTABLE( + PoissonInterfaceTpetra + SOURCES ${ASSEMBLY_EXAMPLE_SOURCES}) + +TRIBITS_ADD_ADVANCED_TEST( + PoissonInterfaceTpetra_2d_MPI_4 + EXCLUDE_IF_NOT_TRUE ${PARENT_PACKAGE_NAME}_ADD_EXPENSIVE_CUDA_TESTS + TEST_0 EXEC PoissonInterfaceTpetra + ARGS --nx=5 --nonlinear --test-jacobian + PASS_REGULAR_EXPRESSION "PASS BASICS" + NUM_MPI_PROCS 4 + TEST_1 EXEC PoissonInterfaceTpetra + ARGS --nx=5 --linear --test-jacobian + PASS_REGULAR_EXPRESSION "PASS BASICS" + NUM_MPI_PROCS 4 + COMM mpi) + +TRIBITS_ADD_ADVANCED_TEST( + PoissonInterfaceTpetra_2d_diffsideids_MPI_1 + EXCLUDE_IF_NOT_TRUE ${PARENT_PACKAGE_NAME}_ADD_EXPENSIVE_CUDA_TESTS + TEST_0 EXEC PoissonInterfaceTpetra + ARGS --test-jacobian --mesh-filename=diffsideids.exo + PASS_REGULAR_EXPRESSION "PASS BASICS" + NUM_MPI_PROCS 1 + COMM serial mpi) + +TRIBITS_ADD_ADVANCED_TEST( + PoissonInterfaceTpetra_3d_MPI_4 + EXCLUDE_IF_NOT_TRUE ${PARENT_PACKAGE_NAME}_ADD_EXPENSIVE_CUDA_TESTS + TEST_0 EXEC PoissonInterfaceTpetra + ARGS --3d --nx=3 --nonlinear --test-jacobian + PASS_REGULAR_EXPRESSION "PASS BASICS" + NUM_MPI_PROCS 4 + TEST_1 EXEC PoissonInterfaceTpetra + ARGS --3d --nx=6 --nonlinear + PASS_REGULAR_EXPRESSION "PASS BASICS" + NUM_MPI_PROCS 4 + TEST_2 EXEC PoissonInterfaceTpetra + ARGS --3d --nx=7 --linear + PASS_REGULAR_EXPRESSION "PASS BASICS" + NUM_MPI_PROCS 4 + COMM mpi) + +# Could add nx=40 to get to >1.99 instead of just >1.98, but no reason to add +# extra seconds to testing. +TRIBITS_ADD_ADVANCED_TEST( + PoissonInterfaceTpetra_2d_MPI_4-ConvTest + EXCLUDE_IF_NOT_TRUE ${PARENT_PACKAGE_NAME}_ADD_EXPENSIVE_CUDA_TESTS + TEST_0 EXEC PoissonInterfaceTpetra + ARGS --nx=10 --linear + PASS_REGULAR_EXPRESSION "PASS BASICS" + NUM_MPI_PROCS 4 + OUTPUT_FILE PIE-ConvTest-10 + TEST_1 EXEC PoissonInterfaceTpetra + ARGS --nx=20 --linear + PASS_REGULAR_EXPRESSION "PASS BASICS" + NUM_MPI_PROCS 4 + OUTPUT_FILE PIE-ConvTest-20 + TEST_2 CMND python + ARGS ${CMAKE_CURRENT_SOURCE_DIR}/convergence_rate.py + PIE-ConvTest- + 10 + 20 + PASS_REGULAR_EXPRESSION "Test Passed" + COMM mpi) + +TRIBITS_ADD_ADVANCED_TEST( + PoissonInterfaceTpetra_3d_MPI_4-ConvTest + EXCLUDE_IF_NOT_TRUE ${PARENT_PACKAGE_NAME}_ADD_EXPENSIVE_CUDA_TESTS + TEST_0 EXEC PoissonInterfaceTpetra + ARGS --3d --nx=4 --linear + PASS_REGULAR_EXPRESSION "PASS BASICS" + NUM_MPI_PROCS 4 + OUTPUT_FILE PIE-ConvTest-4 + TEST_1 EXEC PoissonInterfaceTpetra + ARGS --3d --nx=8 --linear + PASS_REGULAR_EXPRESSION "PASS BASICS" + NUM_MPI_PROCS 4 + OUTPUT_FILE PIE-ConvTest-8 + TEST_2 CMND python + ARGS ${CMAKE_CURRENT_SOURCE_DIR}/convergence_rate.py + PIE-ConvTest- + 4 + 8 + PASS_REGULAR_EXPRESSION "Test Passed" + COMM mpi) + +TRIBITS_COPY_FILES_TO_BINARY_DIR(diffsideids_files_tpetra + SOURCE_FILES diffsideids.exo + EXEDEPS PoissonInterfaceTpetra) diff --git a/packages/panzer/adapters-stk/example/PoissonInterfaceTpetra/Example_BCStrategy_Dirichlet_Constant.hpp b/packages/panzer/adapters-stk/example/PoissonInterfaceTpetra/Example_BCStrategy_Dirichlet_Constant.hpp new file mode 100644 index 000000000000..5e95296a7df4 --- /dev/null +++ b/packages/panzer/adapters-stk/example/PoissonInterfaceTpetra/Example_BCStrategy_Dirichlet_Constant.hpp @@ -0,0 +1,80 @@ +// @HEADER +// *********************************************************************** +// +// Panzer: A partial differential equation assembly +// engine for strongly coupled complex multiphysics systems +// Copyright (2011) Sandia Corporation +// +// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation, +// the U.S. Government retains certain rights in this software. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// 1. Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// +// 2. Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in the +// documentation and/or other materials provided with the distribution. +// +// 3. Neither the name of the Corporation nor the names of the +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY +// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL SANDIA CORPORATION OR THE +// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +// Questions? Contact Roger P. Pawlowski (rppawlo@sandia.gov) and +// Eric C. Cyr (eccyr@sandia.gov) +// *********************************************************************** +// @HEADER + +#ifndef __Example_BC_Dirichlet_Constant_hpp__ +#define __Example_BC_Dirichlet_Constant_hpp__ + +#include +#include + +#include "Teuchos_RCP.hpp" +#include "Panzer_BCStrategy_Dirichlet_DefaultImpl.hpp" +#include "Panzer_Traits.hpp" +#include "Panzer_PureBasis.hpp" +#include "Phalanx_FieldManager.hpp" + +namespace Example { + + template + class BCStrategy_Dirichlet_Constant : public panzer::BCStrategy_Dirichlet_DefaultImpl { + public: + + BCStrategy_Dirichlet_Constant(const panzer::BC& bc, const Teuchos::RCP& global_data); + + void setup(const panzer::PhysicsBlock& side_pb, + const Teuchos::ParameterList& user_data); + + void buildAndRegisterEvaluators(PHX::FieldManager& fm, + const panzer::PhysicsBlock& pb, + const panzer::ClosureModelFactory_TemplateManager& factory, + const Teuchos::ParameterList& models, + const Teuchos::ParameterList& user_data) const; + + std::string residual_name; + Teuchos::RCP basis; + }; + +} + +#include "Example_BCStrategy_Dirichlet_Constant_impl.hpp" + +#endif diff --git a/packages/panzer/adapters-stk/example/PoissonInterfaceTpetra/Example_BCStrategy_Dirichlet_Constant_impl.hpp b/packages/panzer/adapters-stk/example/PoissonInterfaceTpetra/Example_BCStrategy_Dirichlet_Constant_impl.hpp new file mode 100644 index 000000000000..a70f1659c911 --- /dev/null +++ b/packages/panzer/adapters-stk/example/PoissonInterfaceTpetra/Example_BCStrategy_Dirichlet_Constant_impl.hpp @@ -0,0 +1,133 @@ +// @HEADER +// *********************************************************************** +// +// Panzer: A partial differential equation assembly +// engine for strongly coupled complex multiphysics systems +// Copyright (2011) Sandia Corporation +// +// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation, +// the U.S. Government retains certain rights in this software. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// 1. Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// +// 2. Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in the +// documentation and/or other materials provided with the distribution. +// +// 3. Neither the name of the Corporation nor the names of the +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY +// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL SANDIA CORPORATION OR THE +// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +// Questions? Contact Roger P. Pawlowski (rppawlo@sandia.gov) and +// Eric C. Cyr (eccyr@sandia.gov) +// *********************************************************************** +// @HEADER + +#include "Teuchos_ParameterList.hpp" +#include "Teuchos_RCP.hpp" +#include "Teuchos_Assert.hpp" +#include "Phalanx_DataLayout_MDALayout.hpp" +#include "Phalanx_FieldManager.hpp" +#include "Panzer_PhysicsBlock.hpp" + +#include "Panzer_PureBasis.hpp" + +// Evaluators +#include "Panzer_Constant.hpp" + +#include "Phalanx_MDField.hpp" +#include "Phalanx_DataLayout.hpp" +#include "Phalanx_DataLayout_MDALayout.hpp" + +// *********************************************************************** +template +Example::BCStrategy_Dirichlet_Constant:: +BCStrategy_Dirichlet_Constant(const panzer::BC& bc, const Teuchos::RCP& global_data) : + panzer::BCStrategy_Dirichlet_DefaultImpl(bc,global_data) +{ + TEUCHOS_ASSERT(this->m_bc.strategy() == "Constant"); +} + +// *********************************************************************** +template +void Example::BCStrategy_Dirichlet_Constant:: +setup(const panzer::PhysicsBlock& side_pb, + const Teuchos::ParameterList& /* user_data */) +{ + using Teuchos::RCP; + using std::vector; + using std::string; + using std::pair; + + // need the dof value to form the residual + this->required_dof_names.push_back(this->m_bc.equationSetName()); + + // unique residual name + this->residual_name = "Residual_" + this->m_bc.identifier(); + + // map residual to dof + this->residual_to_dof_names_map[residual_name] = this->m_bc.equationSetName(); + + // map residual to target field + this->residual_to_target_field_map[residual_name] = "Constant_" + this->m_bc.equationSetName(); + + // find the basis for this dof + const vector > >& dofs = side_pb.getProvidedDOFs(); + + for (vector > >::const_iterator dof_it = + dofs.begin(); dof_it != dofs.end(); ++dof_it) { + if (dof_it->first == this->m_bc.equationSetName()) + this->basis = dof_it->second; + } + + TEUCHOS_TEST_FOR_EXCEPTION(Teuchos::is_null(this->basis), std::runtime_error, + "Error the name \"" << this->m_bc.equationSetName() + << "\" is not a valid DOF for the boundary condition:\n" + << this->m_bc << "\n"); + +} + +// *********************************************************************** +template +void Example::BCStrategy_Dirichlet_Constant:: +buildAndRegisterEvaluators(PHX::FieldManager& fm, + const panzer::PhysicsBlock& /* pb */, + const panzer::ClosureModelFactory_TemplateManager& /* factory */, + const Teuchos::ParameterList& /* models */, + const Teuchos::ParameterList& /* user_data */) const +{ + using Teuchos::ParameterList; + using Teuchos::RCP; + using Teuchos::rcp; + + // provide a constant target value to map into residual + { + ParameterList p("BC Constant Dirichlet"); + p.set("Name", "Constant_" + this->m_bc.equationSetName()); + p.set("Data Layout", basis->functional); + p.set("Value", this->m_bc.params()->template get("Value")); + + RCP< PHX::Evaluator > op = + rcp(new panzer::Constant(p)); + + this->template registerEvaluator(fm, op); + } + +} diff --git a/packages/panzer/adapters-stk/example/PoissonInterfaceTpetra/Example_BCStrategy_Factory.hpp b/packages/panzer/adapters-stk/example/PoissonInterfaceTpetra/Example_BCStrategy_Factory.hpp new file mode 100644 index 000000000000..32637f73b3a1 --- /dev/null +++ b/packages/panzer/adapters-stk/example/PoissonInterfaceTpetra/Example_BCStrategy_Factory.hpp @@ -0,0 +1,108 @@ +// @HEADER +// *********************************************************************** +// +// Panzer: A partial differential equation assembly +// engine for strongly coupled complex multiphysics systems +// Copyright (2011) Sandia Corporation +// +// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation, +// the U.S. Government retains certain rights in this software. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// 1. Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// +// 2. Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in the +// documentation and/or other materials provided with the distribution. +// +// 3. Neither the name of the Corporation nor the names of the +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY +// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL SANDIA CORPORATION OR THE +// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +// Questions? Contact Roger P. Pawlowski (rppawlo@sandia.gov) and +// Eric C. Cyr (eccyr@sandia.gov) +// *********************************************************************** +// @HEADER + +#ifndef __Example_BCStrategyFactory_hpp__ +#define __Example_BCStrategyFactory_hpp__ + +#include "Teuchos_RCP.hpp" +#include "Panzer_Traits.hpp" +#include "Panzer_BCStrategy_TemplateManager.hpp" +#include "Panzer_BCStrategy_Factory.hpp" +#include "Panzer_BCStrategy_Factory_Defines.hpp" + +// Add my bcstrategies here +#include "Example_BCStrategy_Dirichlet_Constant.hpp" +#include "Example_BCStrategy_Neumann_Constant.hpp" +#include "Example_BCStrategy_Interface_WeakDirichletMatch.hpp" +#include "Example_BCStrategy_Interface_NeumannMatch.hpp" +#include "Example_BCStrategy_Interface_Robin.hpp" + +namespace Example { + +PANZER_DECLARE_BCSTRATEGY_TEMPLATE_BUILDER(BCStrategy_Dirichlet_Constant, + BCStrategy_Dirichlet_Constant) +PANZER_DECLARE_BCSTRATEGY_TEMPLATE_BUILDER(BCStrategy_Neumann_Constant, + BCStrategy_Neumann_Constant) +PANZER_DECLARE_BCSTRATEGY_TEMPLATE_BUILDER( + BCStrategy_Interface_WeakDirichletMatch, + BCStrategy_Interface_WeakDirichletMatch) +PANZER_DECLARE_BCSTRATEGY_TEMPLATE_BUILDER(BCStrategy_Interface_NeumannMatch, + BCStrategy_Interface_NeumannMatch) +PANZER_DECLARE_BCSTRATEGY_TEMPLATE_BUILDER(BCStrategy_Interface_Robin, + BCStrategy_Interface_Robin) + +struct BCStrategyFactory : public panzer::BCStrategyFactory { + + Teuchos::RCP > + buildBCStrategy(const panzer::BC& bc,const Teuchos::RCP& global_data) const + { + + Teuchos::RCP > bcs_tm = + Teuchos::rcp(new panzer::BCStrategy_TemplateManager); + + bool found = false; + + PANZER_BUILD_BCSTRATEGY_OBJECTS("Constant", + BCStrategy_Dirichlet_Constant) + PANZER_BUILD_BCSTRATEGY_OBJECTS("Neumann Constant", + BCStrategy_Neumann_Constant) + PANZER_BUILD_BCSTRATEGY_OBJECTS("Weak Dirichlet Match Interface", + BCStrategy_Interface_WeakDirichletMatch) + PANZER_BUILD_BCSTRATEGY_OBJECTS("Neumann Match Interface", + BCStrategy_Interface_NeumannMatch) + PANZER_BUILD_BCSTRATEGY_OBJECTS("Robin Interface", + BCStrategy_Interface_Robin) + + TEUCHOS_TEST_FOR_EXCEPTION(!found, std::logic_error, + "Error - the BC Strategy called \"" << bc.strategy() << + "\" is not a valid identifier in the BCStrategyFactory. Either add a " + "valid implementation to your factory or fix your input file. The " + "relevant boundary condition is:\n\n" << bc << std::endl); + + return bcs_tm; + } + +}; + +} + +#endif diff --git a/packages/panzer/adapters-stk/example/PoissonInterfaceTpetra/Example_BCStrategy_Interface_NeumannMatch.hpp b/packages/panzer/adapters-stk/example/PoissonInterfaceTpetra/Example_BCStrategy_Interface_NeumannMatch.hpp new file mode 100644 index 000000000000..55d474cc11a4 --- /dev/null +++ b/packages/panzer/adapters-stk/example/PoissonInterfaceTpetra/Example_BCStrategy_Interface_NeumannMatch.hpp @@ -0,0 +1,94 @@ +// @HEADER +// *********************************************************************** +// +// Panzer: A partial differential equation assembly +// engine for strongly coupled complex multiphysics systems +// Copyright (2011) Sandia Corporation +// +// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation, +// the U.S. Government retains certain rights in this software. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// 1. Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// +// 2. Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in the +// documentation and/or other materials provided with the distribution. +// +// 3. Neither the name of the Corporation nor the names of the +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY +// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL SANDIA CORPORATION OR THE +// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +// Questions? Contact Roger P. Pawlowski (rppawlo@sandia.gov) and +// Eric C. Cyr (eccyr@sandia.gov) +// *********************************************************************** +// @HEADER + +#ifndef PANZER_EXAMPLE_BCSTRATEGY_INTERFACE_NEUMANNMATCH_HPP +#define PANZER_EXAMPLE_BCSTRATEGY_INTERFACE_NEUMANNMATCH_HPP + +#include +#include + +#include "Teuchos_RCP.hpp" +#include "Panzer_BCStrategy_Interface_DefaultImpl.hpp" +#include "Panzer_Traits.hpp" +#include "Panzer_PureBasis.hpp" +#include "Phalanx_FieldManager.hpp" + +namespace Example { + +template +class BCStrategy_Interface_NeumannMatch : public panzer::BCStrategy_Interface_DefaultImpl { +public: + + BCStrategy_Interface_NeumannMatch(const panzer::BC& bc, const Teuchos::RCP& global_data); + + void setup(const panzer::PhysicsBlock& side_pb, + const Teuchos::ParameterList& user_data); + + void buildAndRegisterEvaluators(PHX::FieldManager& fm, + const panzer::PhysicsBlock& pb, + const panzer::ClosureModelFactory_TemplateManager& factory, + const Teuchos::ParameterList& models, + const Teuchos::ParameterList& user_data) const; + + virtual void buildAndRegisterGatherAndOrientationEvaluators(PHX::FieldManager& fm, + const panzer::PhysicsBlock& side_pb, + const panzer::LinearObjFactory & lof, + const Teuchos::ParameterList& user_data) const; + + + virtual void postRegistrationSetup(typename panzer::Traits::SetupData d, + PHX::FieldManager& vm); + + virtual void evaluateFields(typename panzer::Traits::EvalData d); + +private: + std::vector paramName; + double value; + double temp; + +}; + +} + +#include "Example_BCStrategy_Interface_NeumannMatch_impl.hpp" + +#endif diff --git a/packages/panzer/adapters-stk/example/PoissonInterfaceTpetra/Example_BCStrategy_Interface_NeumannMatch_impl.hpp b/packages/panzer/adapters-stk/example/PoissonInterfaceTpetra/Example_BCStrategy_Interface_NeumannMatch_impl.hpp new file mode 100644 index 000000000000..c99b740476b2 --- /dev/null +++ b/packages/panzer/adapters-stk/example/PoissonInterfaceTpetra/Example_BCStrategy_Interface_NeumannMatch_impl.hpp @@ -0,0 +1,209 @@ +// @HEADER +// *********************************************************************** +// +// Panzer: A partial differential equation assembly +// engine for strongly coupled complex multiphysics systems +// Copyright (2011) Sandia Corporation +// +// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation, +// the U.S. Government retains certain rights in this software. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// 1. Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// +// 2. Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in the +// documentation and/or other materials provided with the distribution. +// +// 3. Neither the name of the Corporation nor the names of the +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY +// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL SANDIA CORPORATION OR THE +// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +// Questions? Contact Roger P. Pawlowski (rppawlo@sandia.gov) and +// Eric C. Cyr (eccyr@sandia.gov) +// *********************************************************************** +// @HEADER + +#include "Teuchos_ParameterList.hpp" +#include "Teuchos_RCP.hpp" +#include "Teuchos_Assert.hpp" +#include "Phalanx_DataLayout_MDALayout.hpp" +#include "Phalanx_FieldManager.hpp" +#include "Panzer_PhysicsBlock.hpp" + +#include "Panzer_PureBasis.hpp" + +// Evaluators +#include "Panzer_Integrator_BasisTimesScalar.hpp" +#include "Panzer_Constant.hpp" +#include "Panzer_DOFGradient.hpp" +#include "Panzer_DotProduct.hpp" + +#include "Phalanx_MDField.hpp" +#include "Phalanx_DataLayout.hpp" +#include "Phalanx_DataLayout_MDALayout.hpp" + +// *********************************************************************** +template +Example::BCStrategy_Interface_NeumannMatch:: +BCStrategy_Interface_NeumannMatch(const panzer::BC& bc, const Teuchos::RCP& global_data) : + panzer::BCStrategy_Interface_DefaultImpl(bc,global_data) +{ + TEUCHOS_ASSERT(this->m_bc.strategy() == "Neumann Match Interface"); +} + +// *********************************************************************** +template +void Example::BCStrategy_Interface_NeumannMatch:: +setup(const panzer::PhysicsBlock& side_pb, + const Teuchos::ParameterList& /* user_data */) +{ + using Teuchos::RCP; + using std::vector; + using std::string; + using std::pair; + + const int di = this->getDetailsIndex(); + + // obtain the dof name + const string dof_name = di == 0 ? this->m_bc.equationSetName() : this->m_bc.equationSetName2(); + + // need the dof value to form the residual + this->requireDOFGather(dof_name); + + // unique residual name + const string residual_name = "Residual_" + this->m_bc.equationSetName(); + const string flux_name = "Other_Flux"; + + const std::map >& ir = side_pb.getIntegrationRules(); + TEUCHOS_ASSERT(ir.size() == 1); + + const int integration_order = ir.begin()->second->order(); + + this->addResidualContribution(residual_name,dof_name,flux_name,integration_order,side_pb); +} + +// *********************************************************************** +template +void Example::BCStrategy_Interface_NeumannMatch:: +buildAndRegisterEvaluators(PHX::FieldManager& fm, + const panzer::PhysicsBlock& pb, + const panzer::ClosureModelFactory_TemplateManager& /* factory */, + const Teuchos::ParameterList& /* models */, + const Teuchos::ParameterList& /* user_data */) const +{ + using Teuchos::ParameterList; + using Teuchos::RCP; + using Teuchos::rcp; + using std::string; + + const std::vector, + Teuchos::RCP > > data = this->getResidualContributionData(); + + string residual_name = std::get<0>(data[0]); + string dof_name = std::get<1>(data[0]); + string flux_name = std::get<2>(data[0]); + + RCP ir = std::get<5>(data[0]); + RCP fll = pb.getFieldLibrary()->buildFieldLayoutLibrary(*ir); + RCP basis = fll->lookupLayout(dof_name); + + if (this->getDetailsIndex() == 0) { + { // add contribution to the residual + using panzer::EvaluatorStyle; + using panzer::Integrator_BasisTimesScalar; + using panzer::Traits; + using PHX::Evaluator; + double multiplier(1); + const RCP> op = rcp(new + Integrator_BasisTimesScalar(EvaluatorStyle::EVALUATES, + residual_name, flux_name, *basis, *ir, multiplier)); + this->template registerEvaluator(fm, op); + } + } else { + const std::string dof_grad_name = dof_name + "_gradient"; + { // Compute side 2 normal. + ParameterList p("Side Normal"); + p.set("Name", "Other_Side_Normal"); + p.set("Side ID", pb.cellData().side()); + p.set("IR", ir); + p.set("Normalize", true); + const RCP< PHX::Evaluator > + op = rcp(new panzer::Normals(p)); + this->template registerEvaluator(fm, op); + } + { // Compute dof side 2 gradient. + ParameterList p("Other DOF gradient"); + p.set("Name", dof_name); + p.set("Gradient Name", dof_grad_name); + p.set("Basis", basis); + p.set("IR", ir); + const RCP< PHX::Evaluator > + op = rcp(new panzer::DOFGradient(p)); + this->template registerEvaluator(fm, op); + } + { // Compute dot(dof side 2 gradient, side 2 normal). + ParameterList p("dot(Other DOF gradient, other normal)"); + p.set("Result Name", flux_name); + p.set("Vector A Name", dof_grad_name); + p.set("Vector B Name", "Other_Side_Normal"); + p.set("Point Rule", Teuchos::rcp_dynamic_cast(ir)); + const RCP< PHX::Evaluator > + op = rcp(new panzer::DotProduct(p)); + this->template registerEvaluator(fm, op); + } + } +} + +// *********************************************************************** +template +void Example::BCStrategy_Interface_NeumannMatch:: +buildAndRegisterGatherAndOrientationEvaluators(PHX::FieldManager& fm, + const panzer::PhysicsBlock& pb, + const panzer::LinearObjFactory & lof, + const Teuchos::ParameterList& user_data) const +{ + using Teuchos::RCP; + using Teuchos::rcp; + using std::vector; + using std::map; + using std::string; + using std::pair; + + // Gather + pb.buildAndRegisterGatherAndOrientationEvaluators(fm,lof,user_data); +} + +// *********************************************************************** +template +void Example::BCStrategy_Interface_NeumannMatch:: +postRegistrationSetup(typename panzer::Traits::SetupData /* d */, + PHX::FieldManager& /* vm */) +{ + +} + + +// *********************************************************************** +template +void Example::BCStrategy_Interface_NeumannMatch:: +evaluateFields(typename panzer::Traits::EvalData /* d */) +{ + +} diff --git a/packages/panzer/adapters-stk/example/PoissonInterfaceTpetra/Example_BCStrategy_Interface_Robin.hpp b/packages/panzer/adapters-stk/example/PoissonInterfaceTpetra/Example_BCStrategy_Interface_Robin.hpp new file mode 100644 index 000000000000..d998092b449f --- /dev/null +++ b/packages/panzer/adapters-stk/example/PoissonInterfaceTpetra/Example_BCStrategy_Interface_Robin.hpp @@ -0,0 +1,123 @@ +// @HEADER +// *********************************************************************** +// +// Panzer: A partial differential equation assembly +// engine for strongly coupled complex multiphysics systems +// Copyright (2011) Sandia Corporation +// +// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation, +// the U.S. Government retains certain rights in this software. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// 1. Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// +// 2. Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in the +// documentation and/or other materials provided with the distribution. +// +// 3. Neither the name of the Corporation nor the names of the +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY +// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL SANDIA CORPORATION OR THE +// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +// Questions? Contact Roger P. Pawlowski (rppawlo@sandia.gov) and +// Eric C. Cyr (eccyr@sandia.gov) +// *********************************************************************** +// @HEADER + +#ifndef PANZER_EXAMPLE_BCSTRATEGY_INTERFACE_ROBIN_HPP +#define PANZER_EXAMPLE_BCSTRATEGY_INTERFACE_ROBIN_HPP + +#include +#include + +#include "Teuchos_RCP.hpp" +#include "Panzer_BCStrategy_Interface_DefaultImpl.hpp" +#include "Panzer_Traits.hpp" +#include "Panzer_PureBasis.hpp" +#include "Phalanx_FieldManager.hpp" + +namespace Example { + +/** Impose the interface condition + * normal . grad f = a normal . grad phi + b f_me + c f_other, (*) + * where phi is a smooth field across the interface (1 DOF per interface + * node), f is a field possibly discontinuous across the interface (2 DOF + * per interface node), and a,b,c are scalar coefficients. + * Optionally modify the first term in the condition to + * a f_me normal . grad phi, (+) + * nonlinearly coupling phi and f_me. + * ParameterList parameters are as follows: + * "Type": "Interface" + * "Strategy": "Robin Interface" + * "Sideset ID": Name of the interface sideset. + * "Element Block ID": Name of the primary element block, often referred + * to in the code as 'me' or by a similar pronoun. + * "Element Block ID2": Name of the element block on the other side of + * the interface, often referred to as 'other'. + * "Equation Set Name": Equation set associated for my element block, + * f_me in (*). + * "Equation Set Name2": Equation set for the other's element block, + * f_other in (*). + * "Data": The following ParameterList specific to this interface condition: + * "Coupling DOF Name": The DOF name for the smooth field, phi in (*). + * "a", "b", "c": The three coefficients in (*). + * "Nonlinear": A boolean indicating whether to use the nonlinear form + * in (+). + */ +template +class BCStrategy_Interface_Robin : public panzer::BCStrategy_Interface_DefaultImpl { +public: + BCStrategy_Interface_Robin(const panzer::BC& bc, const Teuchos::RCP& global_data); + + void setup(const panzer::PhysicsBlock& side_pb, + const Teuchos::ParameterList& user_data); + + void buildAndRegisterEvaluators(PHX::FieldManager& fm, + const panzer::PhysicsBlock& pb, + const panzer::ClosureModelFactory_TemplateManager& factory, + const Teuchos::ParameterList& models, + const Teuchos::ParameterList& user_data) const; + + virtual void buildAndRegisterGatherAndOrientationEvaluators(PHX::FieldManager& fm, + const panzer::PhysicsBlock& side_pb, + const panzer::LinearObjFactory & lof, + const Teuchos::ParameterList& user_data) const; + + virtual void postRegistrationSetup(typename panzer::Traits::SetupData d, + PHX::FieldManager& vm); + + virtual void evaluateFields(typename panzer::Traits::EvalData d); + +private: + std::string dof_name_, other_dof_name_; + std::string coupling_dof_name_; + double coeffs_[3]; + bool nonlinear_; + + static void setCombineValues(Teuchos::ParameterList& p, + const std::string value_name1, const double scalar1, + const std::string value_name2, const double scalar2, + const std::string value_name3 = "", const double scalar3 = 0); +}; + +} + +#include "Example_BCStrategy_Interface_Robin_impl.hpp" + +#endif diff --git a/packages/panzer/adapters-stk/example/PoissonInterfaceTpetra/Example_BCStrategy_Interface_Robin_impl.hpp b/packages/panzer/adapters-stk/example/PoissonInterfaceTpetra/Example_BCStrategy_Interface_Robin_impl.hpp new file mode 100644 index 000000000000..81e2ae8c48e4 --- /dev/null +++ b/packages/panzer/adapters-stk/example/PoissonInterfaceTpetra/Example_BCStrategy_Interface_Robin_impl.hpp @@ -0,0 +1,287 @@ +// @HEADER +// *********************************************************************** +// +// Panzer: A partial differential equation assembly +// engine for strongly coupled complex multiphysics systems +// Copyright (2011) Sandia Corporation +// +// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation, +// the U.S. Government retains certain rights in this software. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// 1. Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// +// 2. Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in the +// documentation and/or other materials provided with the distribution. +// +// 3. Neither the name of the Corporation nor the names of the +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY +// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL SANDIA CORPORATION OR THE +// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +// Questions? Contact Roger P. Pawlowski (rppawlo@sandia.gov) and +// Eric C. Cyr (eccyr@sandia.gov) +// *********************************************************************** +// @HEADER + +#include "Teuchos_ParameterList.hpp" +#include "Teuchos_RCP.hpp" +#include "Teuchos_Assert.hpp" +#include "Phalanx_DataLayout_MDALayout.hpp" +#include "Phalanx_FieldManager.hpp" +#include "Panzer_PhysicsBlock.hpp" + +#include "Panzer_PureBasis.hpp" + +// Evaluators +#include "Panzer_Integrator_BasisTimesScalar.hpp" +#include "Panzer_Constant.hpp" +#include "Panzer_DOF.hpp" +#include "Panzer_Sum.hpp" +#include "Panzer_Product.hpp" +#include "Panzer_DOFGradient.hpp" +#include "Panzer_DotProduct.hpp" + +#include "Phalanx_MDField.hpp" +#include "Phalanx_DataLayout.hpp" +#include "Phalanx_DataLayout_MDALayout.hpp" + +template +Example::BCStrategy_Interface_Robin:: +BCStrategy_Interface_Robin(const panzer::BC& bc, const Teuchos::RCP& global_data) + : panzer::BCStrategy_Interface_DefaultImpl(bc, global_data) +{ + using std::string; + + TEUCHOS_ASSERT(this->m_bc.strategy() == "Robin Interface"); + + const char* coeff_names[] = {"a", "b", "c"}; + { + Teuchos::ParameterList vp; + vp.set("Coupling DOF Name", "INVALID_DOF", "Field to which to couple at interface"); + for (int i = 0; i < 3; ++i) + vp.set(coeff_names[i], 1.0, "Coefficient"); + vp.set("Nonlinear", false); + bc.nonconstParams()->validateParametersAndSetDefaults(vp); + } + coupling_dof_name_ = bc.params()->get("Coupling DOF Name"); + TEUCHOS_TEST_FOR_EXCEPTION(coupling_dof_name_ == "INVALID_DOF", std::logic_error, + "Must provide 'Coupling DOF Name'"); + for (int i = 0; i < 3; ++i) { + // Negative so that a = 1, b = c = 0 means f matches phi's normal + // derivative. + coeffs_[i] = -bc.params()->get(coeff_names[i]); + } + + nonlinear_ = bc.params()->get("Nonlinear"); +} + +template +void Example::BCStrategy_Interface_Robin:: +setup(const panzer::PhysicsBlock& side_pb, + const Teuchos::ParameterList& /* user_data */) +{ + using Teuchos::RCP; + using std::vector; + using std::string; + using std::pair; + + const int di = this->getDetailsIndex(); + + dof_name_ = di == 0 ? this->m_bc.equationSetName() : this->m_bc.equationSetName2(); + other_dof_name_ = di == 1 ? this->m_bc.equationSetName() : this->m_bc.equationSetName2(); + + this->requireDOFGather(dof_name_); + this->requireDOFGather(coupling_dof_name_); + + // Unique residual name. + const string residual_name = "Residual_" + this->m_bc.equationSetName(); + + const std::map >& ir = side_pb.getIntegrationRules(); + TEUCHOS_ASSERT(ir.size() == 1); + + const int integration_order = ir.begin()->second->order(); + + this->addResidualContribution(residual_name, dof_name_, "", integration_order, side_pb); +} + +template +void Example::BCStrategy_Interface_Robin:: +setCombineValues(Teuchos::ParameterList& p, + const std::string value_name1, const double scalar1, + const std::string value_name2, const double scalar2, + const std::string value_name3, const double scalar3) +{ + std::vector values_names(2); + values_names[0] = value_name1; + values_names[1] = value_name2; + if (value_name3 != "") values_names.push_back(value_name3); + p.set< Teuchos::RCP > >( + "Values Names", Teuchos::rcp(new std::vector(values_names))); + std::vector scalars(2); + scalars[0] = scalar1; + scalars[1] = scalar2; + if (values_names.size() > 2) scalars.push_back(scalar3); + p.set< Teuchos::RCP > >( + "Scalars", Teuchos::rcp(new std::vector(scalars))); +} + +template +void Example::BCStrategy_Interface_Robin:: +buildAndRegisterEvaluators(PHX::FieldManager& fm, + const panzer::PhysicsBlock& pb, + const panzer::ClosureModelFactory_TemplateManager& /* factory */, + const Teuchos::ParameterList& /* models */, + const Teuchos::ParameterList& /* user_data */) const +{ + using Teuchos::ParameterList; + using Teuchos::RCP; + using Teuchos::rcp; + using std::string; + + const std::vector, + Teuchos::RCP > > data = this->getResidualContributionData(); + + const string residual_name = std::get<0>(data[0]); + + RCP ir = std::get<5>(data[0]); + RCP fll = pb.getFieldLibrary()->buildFieldLayoutLibrary(*ir); + RCP basis = fll->lookupLayout(dof_name_); + + // Implement the interface condition by substituting the rhs of the condition + // into the flux term for f. The flux term is the natural BC on this side of + // the element block, so it doesn't appear in the following evaluators, just + // like in the implementation of the constant Neumann boundary condition. + if (this->getDetailsIndex() == 0) { + const string + my_normal_name = "my_normal", + my_dof_grad_name = dof_name_ + "_gradient", + coupling_dof_grad_name = coupling_dof_name_ + "_gradient", + grad_sum_name = "grad_sum", + normal_dot_coupling_grad_name = "normal_dot_coupling_grad", + product_name = "product", + sum_contributions_name = "sum_contributions"; + { + ParameterList p("My DOF"); + p.set("Name", dof_name_); + p.set("Basis", basis); + p.set("IR", ir); + const RCP< PHX::Evaluator > + op = rcp(new panzer::DOF(p)); + this->template registerEvaluator(fm, op); + } + { + ParameterList p("My Side Normal"); + p.set("Name", my_normal_name); + p.set("Side ID", pb.cellData().side()); + p.set("IR", ir); + p.set("Normalize", true); + const RCP< PHX::Evaluator > + op = rcp(new panzer::Normals(p)); + this->template registerEvaluator(fm, op); + } + { + ParameterList p("Coupling DOF Gradient"); + p.set("Name", coupling_dof_name_); + p.set("Gradient Name", coupling_dof_grad_name); + p.set("Basis", basis); + p.set("IR", ir); + const RCP< PHX::Evaluator > + op = rcp(new panzer::DOFGradient(p)); + this->template registerEvaluator(fm, op); + } + { + ParameterList p("dot(grad phi, normal)"); + p.set("Result Name", normal_dot_coupling_grad_name); + p.set("Vector A Name", coupling_dof_grad_name); + p.set("Vector B Name", my_normal_name); + p.set("Point Rule", Teuchos::rcp_dynamic_cast(ir)); + const RCP< PHX::Evaluator > + op = rcp(new panzer::DotProduct(p)); + this->template registerEvaluator(fm, op); + } + if (nonlinear_) { + ParameterList p("f_me dot(grad phi, normal)"); + p.set("Product Name", product_name); + setCombineValues(p, + normal_dot_coupling_grad_name, 1, + dof_name_, 1); + p.set("Data Layout", ir->dl_scalar); + const RCP< PHX::Evaluator > + op = rcp(new panzer::Product(p)); + this->template registerEvaluator(fm, op); + } + { + ParameterList p("a dot(grad phi, normal) [f_me if nonlinear] + b f_me + c f_other"); + p.set("Sum Name", sum_contributions_name); + setCombineValues(p, + nonlinear_ ? product_name : normal_dot_coupling_grad_name, coeffs_[0], + dof_name_, coeffs_[1], + other_dof_name_, coeffs_[2]); + p.set("Data Layout", ir->dl_scalar); + const RCP< PHX::Evaluator > + op = rcp(new panzer::Sum(p)); + this->template registerEvaluator(fm, op); + } + { + ParameterList p("a dot(grad phi, normal) [f_me if nonlinear] + b f_me + c f_other residual"); + p.set("Residual Name", residual_name); + p.set("Value Name", sum_contributions_name); + p.set("Basis", basis); + p.set("IR", ir); + p.set("Multiplier", 1.0); + const RCP< PHX::Evaluator > + op = rcp(new panzer::Integrator_BasisTimesScalar(p)); + this->template registerEvaluator(fm, op); + } + } else { + { // Get values on other side. + ParameterList p("Other DOF"); + p.set("Name", dof_name_); + p.set("Basis", basis); + p.set("IR", ir); + const RCP< PHX::Evaluator > + op = rcp(new panzer::DOF(p)); + this->template registerEvaluator(fm, op); + } + } +} + +template +void Example::BCStrategy_Interface_Robin:: +buildAndRegisterGatherAndOrientationEvaluators(PHX::FieldManager& fm, + const panzer::PhysicsBlock& pb, + const panzer::LinearObjFactory & lof, + const Teuchos::ParameterList& user_data) const +{ + pb.buildAndRegisterGatherAndOrientationEvaluators(fm, lof, user_data); +} + +template +void Example::BCStrategy_Interface_Robin:: +postRegistrationSetup(typename panzer::Traits::SetupData /* d */, + PHX::FieldManager& /* vm */) +{ +} + +template +void Example::BCStrategy_Interface_Robin:: +evaluateFields(typename panzer::Traits::EvalData /* d */) +{ +} diff --git a/packages/panzer/adapters-stk/example/PoissonInterfaceTpetra/Example_BCStrategy_Interface_WeakDirichletMatch.hpp b/packages/panzer/adapters-stk/example/PoissonInterfaceTpetra/Example_BCStrategy_Interface_WeakDirichletMatch.hpp new file mode 100644 index 000000000000..bd22b7e682c0 --- /dev/null +++ b/packages/panzer/adapters-stk/example/PoissonInterfaceTpetra/Example_BCStrategy_Interface_WeakDirichletMatch.hpp @@ -0,0 +1,96 @@ +// @HEADER +// *********************************************************************** +// +// Panzer: A partial differential equation assembly +// engine for strongly coupled complex multiphysics systems +// Copyright (2011) Sandia Corporation +// +// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation, +// the U.S. Government retains certain rights in this software. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// 1. Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// +// 2. Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in the +// documentation and/or other materials provided with the distribution. +// +// 3. Neither the name of the Corporation nor the names of the +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY +// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL SANDIA CORPORATION OR THE +// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +// Questions? Contact Roger P. Pawlowski (rppawlo@sandia.gov) and +// Eric C. Cyr (eccyr@sandia.gov) +// *********************************************************************** +// @HEADER + +#ifndef PANZER_EXAMPLE_BCSTRATEGY_INTERFACE_WEAKDIRICHLETMATCH_HPP +#define PANZER_EXAMPLE_BCSTRATEGY_INTERFACE_WEAKDIRICHLETMATCH_HPP + +#include +#include + +#include "Teuchos_RCP.hpp" +#include "Panzer_BCStrategy_Interface_DefaultImpl.hpp" +#include "Panzer_Traits.hpp" +#include "Panzer_PureBasis.hpp" +#include "Phalanx_FieldManager.hpp" + +namespace Example { + +template +class BCStrategy_Interface_WeakDirichletMatch : public panzer::BCStrategy_Interface_DefaultImpl { +public: + BCStrategy_Interface_WeakDirichletMatch(const panzer::BC& bc, const Teuchos::RCP& global_data); + + void setup(const panzer::PhysicsBlock& side_pb, + const Teuchos::ParameterList& user_data); + + void buildAndRegisterEvaluators(PHX::FieldManager& fm, + const panzer::PhysicsBlock& pb, + const panzer::ClosureModelFactory_TemplateManager& factory, + const Teuchos::ParameterList& models, + const Teuchos::ParameterList& user_data) const; + + virtual void buildAndRegisterGatherAndOrientationEvaluators(PHX::FieldManager& fm, + const panzer::PhysicsBlock& side_pb, + const panzer::LinearObjFactory & lof, + const Teuchos::ParameterList& user_data) const; + + virtual void postRegistrationSetup(typename panzer::Traits::SetupData d, + PHX::FieldManager& vm); + + virtual void evaluateFields(typename panzer::Traits::EvalData d); + +private: + std::vector paramName; + double value; + double temp; + std::string other_dof_name; + + static void setSumValues(Teuchos::ParameterList& p, + const std::string value_name1, const double scalar1, + const std::string value_name2, const double scalar2); +}; + +} + +#include "Example_BCStrategy_Interface_WeakDirichletMatch_impl.hpp" + +#endif diff --git a/packages/panzer/adapters-stk/example/PoissonInterfaceTpetra/Example_BCStrategy_Interface_WeakDirichletMatch_impl.hpp b/packages/panzer/adapters-stk/example/PoissonInterfaceTpetra/Example_BCStrategy_Interface_WeakDirichletMatch_impl.hpp new file mode 100644 index 000000000000..6e2d7f90ead5 --- /dev/null +++ b/packages/panzer/adapters-stk/example/PoissonInterfaceTpetra/Example_BCStrategy_Interface_WeakDirichletMatch_impl.hpp @@ -0,0 +1,279 @@ +// @HEADER +// *********************************************************************** +// +// Panzer: A partial differential equation assembly +// engine for strongly coupled complex multiphysics systems +// Copyright (2011) Sandia Corporation +// +// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation, +// the U.S. Government retains certain rights in this software. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// 1. Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// +// 2. Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in the +// documentation and/or other materials provided with the distribution. +// +// 3. Neither the name of the Corporation nor the names of the +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY +// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL SANDIA CORPORATION OR THE +// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +// Questions? Contact Roger P. Pawlowski (rppawlo@sandia.gov) and +// Eric C. Cyr (eccyr@sandia.gov) +// *********************************************************************** +// @HEADER + +#include "Teuchos_ParameterList.hpp" +#include "Teuchos_RCP.hpp" +#include "Teuchos_Assert.hpp" +#include "Phalanx_DataLayout_MDALayout.hpp" +#include "Phalanx_FieldManager.hpp" +#include "Panzer_PhysicsBlock.hpp" + +#include "Panzer_PureBasis.hpp" + +// Evaluators +#include "Panzer_Integrator_BasisTimesScalar.hpp" +#include "Panzer_Constant.hpp" +#include "Panzer_DOF.hpp" +#include "Panzer_Sum.hpp" +#include "Panzer_DOFGradient.hpp" +#include "Panzer_DotProduct.hpp" + +#include "Phalanx_MDField.hpp" +#include "Phalanx_DataLayout.hpp" +#include "Phalanx_DataLayout_MDALayout.hpp" + +// *********************************************************************** +template +Example::BCStrategy_Interface_WeakDirichletMatch:: +BCStrategy_Interface_WeakDirichletMatch(const panzer::BC& bc, const Teuchos::RCP& global_data) : + panzer::BCStrategy_Interface_DefaultImpl(bc, global_data) +{ + TEUCHOS_ASSERT(this->m_bc.strategy() == "Weak Dirichlet Match Interface"); +} + +// *********************************************************************** +template +void Example::BCStrategy_Interface_WeakDirichletMatch:: +setup(const panzer::PhysicsBlock& side_pb, + const Teuchos::ParameterList& /* user_data */) +{ + using Teuchos::RCP; + using std::vector; + using std::string; + using std::pair; + + const int di = this->getDetailsIndex(); + + // obtain the dof name + const string dof_name = di == 0 ? this->m_bc.equationSetName() : this->m_bc.equationSetName2(); + other_dof_name = di == 1 ? this->m_bc.equationSetName() : this->m_bc.equationSetName2(); + + // need the dof value to form the residual + this->requireDOFGather(dof_name); + + // unique residual name + const string residual_name = "Residual_" + this->m_bc.equationSetName(); + const string diff_name = "Difference"; + + const std::map >& ir = side_pb.getIntegrationRules(); + TEUCHOS_ASSERT(ir.size() == 1); + + const int integration_order = ir.begin()->second->order(); + + this->addResidualContribution(residual_name,dof_name,diff_name,integration_order,side_pb); +} + +// *********************************************************************** +template +void Example::BCStrategy_Interface_WeakDirichletMatch:: +setSumValues(Teuchos::ParameterList& p, + const std::string value_name1, const double scalar1, + const std::string value_name2, const double scalar2) +{ + std::vector values_names(2); + values_names[0] = value_name1; + values_names[1] = value_name2; + p.set< Teuchos::RCP > >( + "Values Names", Teuchos::rcp(new std::vector(values_names))); + std::vector scalars(2); + scalars[0] = scalar1; + scalars[1] = scalar2; + p.set< Teuchos::RCP > >( + "Scalars", Teuchos::rcp(new std::vector(scalars))); +} + +template +void Example::BCStrategy_Interface_WeakDirichletMatch:: +buildAndRegisterEvaluators(PHX::FieldManager& fm, + const panzer::PhysicsBlock& pb, + const panzer::ClosureModelFactory_TemplateManager& /* factory */, + const Teuchos::ParameterList& /* models */, + const Teuchos::ParameterList& /* user_data */) const +{ + using Teuchos::ParameterList; + using Teuchos::RCP; + using Teuchos::rcp; + using std::string; + + const std::vector, + Teuchos::RCP > > data = this->getResidualContributionData(); + + string residual_name = std::get<0>(data[0]); + string dof_name = std::get<1>(data[0]); + string diff_name = std::get<2>(data[0]); + + RCP ir = std::get<5>(data[0]); + RCP fll = pb.getFieldLibrary()->buildFieldLayoutLibrary(*ir); + RCP basis = fll->lookupLayout(dof_name); + + if (this->getDetailsIndex() == 0) { + const std::string + dof_grad_name = dof_name + "_gradient", + cancel_natural_name = dof_name + "_cancel", + my_normal_name = "My_Normal", + sum_contributions_name = "Sum_Contributions"; + // Weak Dirichlet match. + { + { // Get values on my side. + ParameterList p("My DOF"); + p.set("Name", dof_name); + p.set("Basis", basis); + p.set("IR", ir); + const RCP< PHX::Evaluator > + op = rcp(new panzer::DOF(p)); + this->template registerEvaluator(fm, op); + } + { // Other DOF - my DOF. + ParameterList p("other DOF - my DOF"); + p.set("Sum Name", diff_name); + setSumValues(p, other_dof_name, 1, dof_name, -1); + p.set("Data Layout", ir->dl_scalar); + const RCP< PHX::Evaluator > + op = rcp(new panzer::Sum(p)); + this->template registerEvaluator(fm, op); + } + } + // Cancel my natural (Neumann) BC. + { + { // Normal. + ParameterList p("My Side Normal"); + p.set("Name", my_normal_name); + p.set("Side ID", pb.cellData().side()); + p.set("IR", ir); + p.set("Normalize", true); + const RCP< PHX::Evaluator > + op = rcp(new panzer::Normals(p)); + this->template registerEvaluator(fm, op); + } + { // Gradient. + ParameterList p("My DOF gradient"); + p.set("Name", dof_name); + p.set("Gradient Name", dof_grad_name); + p.set("Basis", basis); + p.set("IR", ir); + const RCP< PHX::Evaluator > + op = rcp(new panzer::DOFGradient(p)); + this->template registerEvaluator(fm, op); + } + { // dot(DOF gradient, normal). + ParameterList p("dot(my DOF gradient, my normal)"); + p.set("Result Name", cancel_natural_name); + p.set("Vector A Name", dof_grad_name); + p.set("Vector B Name", my_normal_name); + p.set("Point Rule", Teuchos::rcp_dynamic_cast(ir)); + const RCP< PHX::Evaluator > + op = rcp(new panzer::DotProduct(p)); + this->template registerEvaluator(fm, op); + } + } + // Add contributions to the residual. + { + { // Weak Dirichlet Match + Cancel Neumann + ParameterList p("Weak Dirichlet Match + Cancel Neumann"); + p.set("Sum Name", sum_contributions_name); + setSumValues(p, diff_name, 1e5, cancel_natural_name, -1); + p.set("Data Layout", ir->dl_scalar); + const RCP< PHX::Evaluator > + op = rcp(new panzer::Sum(p)); + this->template registerEvaluator(fm, op); + } + { + using panzer::EvaluatorStyle; + using panzer::Integrator_BasisTimesScalar; + using panzer::Traits; + using PHX::Evaluator; + double multiplier(1); + const RCP> op = rcp(new + Integrator_BasisTimesScalar(EvaluatorStyle::EVALUATES, + residual_name, sum_contributions_name, *basis, *ir, multiplier)); + this->template registerEvaluator(fm, op); + } + } + } else { + { // Get values on other side. + ParameterList p("Other DOF"); + p.set("Name", dof_name); + p.set("Basis", basis); + p.set("IR", ir); + const RCP< PHX::Evaluator > + op = rcp(new panzer::DOF(p)); + this->template registerEvaluator(fm, op); + } + } +} + +// *********************************************************************** +template +void Example::BCStrategy_Interface_WeakDirichletMatch:: +buildAndRegisterGatherAndOrientationEvaluators(PHX::FieldManager& fm, + const panzer::PhysicsBlock& pb, + const panzer::LinearObjFactory & lof, + const Teuchos::ParameterList& user_data) const +{ + using Teuchos::RCP; + using Teuchos::rcp; + using std::vector; + using std::map; + using std::string; + using std::pair; + + // Gather + pb.buildAndRegisterGatherAndOrientationEvaluators(fm,lof,user_data); +} + +// *********************************************************************** +template +void Example::BCStrategy_Interface_WeakDirichletMatch:: +postRegistrationSetup(typename panzer::Traits::SetupData /* d */, + PHX::FieldManager& /* vm */) +{ + +} + + +// *********************************************************************** +template +void Example::BCStrategy_Interface_WeakDirichletMatch:: +evaluateFields(typename panzer::Traits::EvalData /* d */) +{ + +} diff --git a/packages/panzer/adapters-stk/example/PoissonInterfaceTpetra/Example_BCStrategy_Neumann_Constant.hpp b/packages/panzer/adapters-stk/example/PoissonInterfaceTpetra/Example_BCStrategy_Neumann_Constant.hpp new file mode 100644 index 000000000000..a39d3837632c --- /dev/null +++ b/packages/panzer/adapters-stk/example/PoissonInterfaceTpetra/Example_BCStrategy_Neumann_Constant.hpp @@ -0,0 +1,94 @@ +// @HEADER +// *********************************************************************** +// +// Panzer: A partial differential equation assembly +// engine for strongly coupled complex multiphysics systems +// Copyright (2011) Sandia Corporation +// +// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation, +// the U.S. Government retains certain rights in this software. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// 1. Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// +// 2. Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in the +// documentation and/or other materials provided with the distribution. +// +// 3. Neither the name of the Corporation nor the names of the +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY +// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL SANDIA CORPORATION OR THE +// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +// Questions? Contact Roger P. Pawlowski (rppawlo@sandia.gov) and +// Eric C. Cyr (eccyr@sandia.gov) +// *********************************************************************** +// @HEADER + +#ifndef __Example_BC_Neumann_Constant_hpp__ +#define __Example_BC_Neumann_Constant_hpp__ + +#include +#include + +#include "Teuchos_RCP.hpp" +#include "Panzer_BCStrategy_Neumann_DefaultImpl.hpp" +#include "Panzer_Traits.hpp" +#include "Panzer_PureBasis.hpp" +#include "Phalanx_FieldManager.hpp" + +namespace Example { + + template + class BCStrategy_Neumann_Constant : public panzer::BCStrategy_Neumann_DefaultImpl { + public: + + BCStrategy_Neumann_Constant(const panzer::BC& bc, const Teuchos::RCP& global_data); + + void setup(const panzer::PhysicsBlock& side_pb, + const Teuchos::ParameterList& user_data); + + void buildAndRegisterEvaluators(PHX::FieldManager& fm, + const panzer::PhysicsBlock& pb, + const panzer::ClosureModelFactory_TemplateManager& factory, + const Teuchos::ParameterList& models, + const Teuchos::ParameterList& user_data) const; + + virtual void buildAndRegisterGatherAndOrientationEvaluators(PHX::FieldManager& fm, + const panzer::PhysicsBlock& side_pb, + const panzer::LinearObjFactory & lof, + const Teuchos::ParameterList& user_data) const; + + + virtual void postRegistrationSetup(typename panzer::Traits::SetupData d, + PHX::FieldManager& vm); + + virtual void evaluateFields(typename panzer::Traits::EvalData d); + + private: + std::vector paramName; + double value; + double temp; + + }; + +} + +#include "Example_BCStrategy_Neumann_Constant_impl.hpp" + +#endif diff --git a/packages/panzer/adapters-stk/example/PoissonInterfaceTpetra/Example_BCStrategy_Neumann_Constant_impl.hpp b/packages/panzer/adapters-stk/example/PoissonInterfaceTpetra/Example_BCStrategy_Neumann_Constant_impl.hpp new file mode 100644 index 000000000000..14c52bb7ed02 --- /dev/null +++ b/packages/panzer/adapters-stk/example/PoissonInterfaceTpetra/Example_BCStrategy_Neumann_Constant_impl.hpp @@ -0,0 +1,187 @@ +// @HEADER +// *********************************************************************** +// +// Panzer: A partial differential equation assembly +// engine for strongly coupled complex multiphysics systems +// Copyright (2011) Sandia Corporation +// +// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation, +// the U.S. Government retains certain rights in this software. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// 1. Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// +// 2. Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in the +// documentation and/or other materials provided with the distribution. +// +// 3. Neither the name of the Corporation nor the names of the +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY +// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL SANDIA CORPORATION OR THE +// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +// Questions? Contact Roger P. Pawlowski (rppawlo@sandia.gov) and +// Eric C. Cyr (eccyr@sandia.gov) +// *********************************************************************** +// @HEADER + +#include "Teuchos_ParameterList.hpp" +#include "Teuchos_RCP.hpp" +#include "Teuchos_Assert.hpp" +#include "Phalanx_DataLayout_MDALayout.hpp" +#include "Phalanx_FieldManager.hpp" +#include "Panzer_PhysicsBlock.hpp" + +#include "Panzer_PureBasis.hpp" + +// Evaluators +#include "Panzer_Integrator_BasisTimesScalar.hpp" +#include "Panzer_Constant.hpp" + +#include "Phalanx_MDField.hpp" +#include "Phalanx_DataLayout.hpp" +#include "Phalanx_DataLayout_MDALayout.hpp" + +// *********************************************************************** +template +Example::BCStrategy_Neumann_Constant:: +BCStrategy_Neumann_Constant(const panzer::BC& bc, const Teuchos::RCP& global_data) : + panzer::BCStrategy_Neumann_DefaultImpl(bc,global_data) +{ + TEUCHOS_ASSERT(this->m_bc.strategy() == "Neumann Constant"); +} + +// *********************************************************************** +template +void Example::BCStrategy_Neumann_Constant:: +setup(const panzer::PhysicsBlock& side_pb, + const Teuchos::ParameterList& /* user_data */) +{ + using Teuchos::RCP; + using std::vector; + using std::string; + using std::pair; + + // obtain the dof name + const string dof_name = this->m_bc.equationSetName(); + + // need the dof value to form the residual + this->requireDOFGather(dof_name); + + // unique residual name + const string residual_name = "Residual_" + dof_name; + const string flux_name = "Constant_Flux"; + + const std::map >& ir = side_pb.getIntegrationRules(); + TEUCHOS_ASSERT(ir.size() == 1); + + const int integration_order = ir.begin()->second->order(); + + this->addResidualContribution(residual_name,dof_name,flux_name,integration_order,side_pb); + +} + +// *********************************************************************** +template +void Example::BCStrategy_Neumann_Constant:: +buildAndRegisterEvaluators(PHX::FieldManager& fm, + const panzer::PhysicsBlock& pb, + const panzer::ClosureModelFactory_TemplateManager& /* factory */, + const Teuchos::ParameterList& /* models */, + const Teuchos::ParameterList& /* user_data */) const +{ + using Teuchos::ParameterList; + using Teuchos::RCP; + using Teuchos::rcp; +using std::string; + + const std::vector, + Teuchos::RCP > > data = this->getResidualContributionData(); + + string residual_name = std::get<0>(data[0]); + string dof_name = std::get<1>(data[0]); + string flux_name = std::get<2>(data[0]); + + RCP ir = std::get<5>(data[0]); + RCP fll = pb.getFieldLibrary()->buildFieldLayoutLibrary(*ir); + RCP basis = fll->lookupLayout(dof_name); + + // provide a constant flux target value to map into residual + { + ParameterList p("Constant Neumann BC"); + p.set("Data Layout", ir->dl_scalar); + p.set("Name", flux_name); + p.set("Value", this->m_bc.params()->template get("Value")); + + RCP< PHX::Evaluator > op = + rcp(new panzer::Constant(p)); + + this->template registerEvaluator(fm, op); + } + + // add contribution to the residual + { + using panzer::EvaluatorStyle; + using panzer::Integrator_BasisTimesScalar; + using panzer::Traits; + using PHX::Evaluator; + double multiplier(1); + RCP> op = rcp(new + Integrator_BasisTimesScalar(EvaluatorStyle::EVALUATES, + residual_name, flux_name, *basis, *ir, multiplier)); + this->template registerEvaluator(fm, op); + } +} + +// *********************************************************************** +template +void Example::BCStrategy_Neumann_Constant:: +buildAndRegisterGatherAndOrientationEvaluators(PHX::FieldManager& fm, + const panzer::PhysicsBlock& pb, + const panzer::LinearObjFactory & lof, + const Teuchos::ParameterList& user_data) const +{ + using Teuchos::RCP; + using Teuchos::rcp; + using std::vector; + using std::map; + using std::string; + using std::pair; + + // Gather + pb.buildAndRegisterGatherAndOrientationEvaluators(fm,lof,user_data); + +} + +// *********************************************************************** +template +void Example::BCStrategy_Neumann_Constant:: +postRegistrationSetup(typename panzer::Traits::SetupData /* d */, + PHX::FieldManager& /* vm */) +{ + +} + + +// *********************************************************************** +template +void Example::BCStrategy_Neumann_Constant:: +evaluateFields(typename panzer::Traits::EvalData /* d */) +{ + +} diff --git a/packages/panzer/adapters-stk/example/PoissonInterfaceTpetra/Example_ClosureModel_Factory.hpp b/packages/panzer/adapters-stk/example/PoissonInterfaceTpetra/Example_ClosureModel_Factory.hpp new file mode 100644 index 000000000000..85379f43ae9c --- /dev/null +++ b/packages/panzer/adapters-stk/example/PoissonInterfaceTpetra/Example_ClosureModel_Factory.hpp @@ -0,0 +1,75 @@ +// @HEADER +// *********************************************************************** +// +// Panzer: A partial differential equation assembly +// engine for strongly coupled complex multiphysics systems +// Copyright (2011) Sandia Corporation +// +// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation, +// the U.S. Government retains certain rights in this software. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// 1. Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// +// 2. Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in the +// documentation and/or other materials provided with the distribution. +// +// 3. Neither the name of the Corporation nor the names of the +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY +// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL SANDIA CORPORATION OR THE +// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +// Questions? Contact Roger P. Pawlowski (rppawlo@sandia.gov) and +// Eric C. Cyr (eccyr@sandia.gov) +// *********************************************************************** +// @HEADER + +#ifndef __Example_ClosureModelFactory_hpp__ +#define __Example_ClosureModelFactory_hpp__ + +#include "Panzer_ClosureModel_Factory.hpp" + +namespace panzer { + class InputEquationSet; +} + +namespace Example { + +template +class ModelFactory : public panzer::ClosureModelFactory { + +public: + + Teuchos::RCP< std::vector< Teuchos::RCP > > > + buildClosureModels(const std::string& model_id, + const Teuchos::ParameterList& models, + const panzer::FieldLayoutLibrary& fl, + const Teuchos::RCP& ir, + const Teuchos::ParameterList& default_params, + const Teuchos::ParameterList& user_data, + const Teuchos::RCP& global_data, + PHX::FieldManager& fm) const; + +}; + +} + +#include "Example_ClosureModel_Factory_impl.hpp" + +#endif diff --git a/packages/stk/stk_learning/Kokkos/KokkosWithTopology.C b/packages/panzer/adapters-stk/example/PoissonInterfaceTpetra/Example_ClosureModel_Factory_TemplateBuilder.hpp similarity index 51% rename from packages/stk/stk_learning/Kokkos/KokkosWithTopology.C rename to packages/panzer/adapters-stk/example/PoissonInterfaceTpetra/Example_ClosureModel_Factory_TemplateBuilder.hpp index a7164583c3f3..69bdf35aceb7 100644 --- a/packages/stk/stk_learning/Kokkos/KokkosWithTopology.C +++ b/packages/panzer/adapters-stk/example/PoissonInterfaceTpetra/Example_ClosureModel_Factory_TemplateBuilder.hpp @@ -1,13 +1,13 @@ -/* -//@HEADER -// ************************************************************************ -// -// Kokkos v. 2.0 -// Copyright (2014) Sandia Corporation -// +// @HEADER +// *********************************************************************** +// +// Panzer: A partial differential equation assembly +// engine for strongly coupled complex multiphysics systems +// Copyright (2011) Sandia Corporation +// // Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation, // the U.S. Government retains certain rights in this software. -// +// // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are // met: @@ -35,70 +35,32 @@ // NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Questions Contact H. Carter Edwards (hcedwar@sandia.gov) -// -// ************************************************************************ -//@HEADER -*/ - -#include "mtk_kokkos.h" -#include +// Questions? Contact Roger P. Pawlowski (rppawlo@sandia.gov) and +// Eric C. Cyr (eccyr@sandia.gov) +// *********************************************************************** +// @HEADER + +#ifndef __Example_ClosureModel_Factory_TemplateBuilder_hpp__ +#define __Example_ClosureModel_Factory_TemplateBuilder_hpp__ + +#include +#include "Sacado_mpl_apply.hpp" +#include "Teuchos_RCP.hpp" +#include "Example_ClosureModel_Factory.hpp" + +namespace Example { + +class ClosureModelFactory_TemplateBuilder { +public: + + template + Teuchos::RCP build() const + { + return Teuchos::rcp( static_cast(new Example::ModelFactory) ); + } + +}; -void test_topo(int N, int M, int nrepeat) { - - // typedef Kokkos::Threads ExecSpace ; - -#ifdef KOKKOS_ENABLE_OPENMP - typedef Kokkos::OpenMP ExecSpace ; -#elif defined(KOKKOS_ENABLE_CUDA) - typedef Kokkos::Cuda ExecSpace ; -#else - typedef Kokkos::Serial ExecSpace ; -#endif - -#ifdef KOKKOS_ENABLE_OPENMP - typedef Kokkos::OpenMP MemSpace; -#elif defined(KOKKOS_ENABLE_CUDA) - typedef Kokkos::CudaSpace MemSpace; -#else - typedef Kokkos::HostSpace MemSpace; -#endif - - // typedef Kokkos::CudaUVMSpace MemSpace; - - typedef Kokkos::LayoutLeft Layout ; - // typedef Kokkos::LayoutRight Layout ; - - typedef Kokkos::RangePolicy range_policy ; - - // Timer products - struct timeval begin,end; - - gettimeofday(&begin,NULL); - - double result = 0; - Kokkos::parallel_reduce(N, KOKKOS_LAMBDA(int i, double& update) { - stk::topology hex8 = stk::topology::HEX_8; - update += hex8.num_nodes(); - }, result); - - stk::topology hex8 = stk::topology::HEX_8; - EXPECT_EQ(hex8.num_nodes()*N, result); - - gettimeofday(&end,NULL); - - // Calculate time - double time = 1.0*(end.tv_sec-begin.tv_sec) + - 1.0e-6*(end.tv_usec-begin.tv_usec); - - // Print results (problem size, time and bandwidth in GB/s) - printf(" M( %d ) N( %d ) nrepeat ( %d ) result( %g ) time(%g)\n", M , N, nrepeat, result, time); } - -TEST_F(MTK_Kokkos, topo_test) { - int N = 5; - int M = 10; - int nrepeat = 1; - test_topo(N, M, nrepeat); -} +#endif diff --git a/packages/panzer/adapters-stk/example/PoissonInterfaceTpetra/Example_ClosureModel_Factory_impl.hpp b/packages/panzer/adapters-stk/example/PoissonInterfaceTpetra/Example_ClosureModel_Factory_impl.hpp new file mode 100644 index 000000000000..d0e63d60e557 --- /dev/null +++ b/packages/panzer/adapters-stk/example/PoissonInterfaceTpetra/Example_ClosureModel_Factory_impl.hpp @@ -0,0 +1,192 @@ +// @HEADER +// *********************************************************************** +// +// Panzer: A partial differential equation assembly +// engine for strongly coupled complex multiphysics systems +// Copyright (2011) Sandia Corporation +// +// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation, +// the U.S. Government retains certain rights in this software. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// 1. Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// +// 2. Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in the +// documentation and/or other materials provided with the distribution. +// +// 3. Neither the name of the Corporation nor the names of the +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY +// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL SANDIA CORPORATION OR THE +// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +// Questions? Contact Roger P. Pawlowski (rppawlo@sandia.gov) and +// Eric C. Cyr (eccyr@sandia.gov) +// *********************************************************************** +// @HEADER + +#ifndef __Example_ClosureModelFactoryT_hpp__ +#define __Example_ClosureModelFactoryT_hpp__ + +#include +#include +#include +#include "Panzer_IntegrationRule.hpp" +#include "Panzer_BasisIRLayout.hpp" +#include "Panzer_Integrator_Scalar.hpp" +#include "Phalanx_FieldTag_Tag.hpp" +#include "Teuchos_ParameterEntry.hpp" +#include "Teuchos_TypeNameTraits.hpp" + +#include "Example_SimpleSource.hpp" +#include "Example_Solution.hpp" + +// ******************************************************************** +// ******************************************************************** +template +Teuchos::RCP< std::vector< Teuchos::RCP > > > +Example::ModelFactory:: +buildClosureModels(const std::string& model_id, + const Teuchos::ParameterList& models, + const panzer::FieldLayoutLibrary& fl, + const Teuchos::RCP& ir, + const Teuchos::ParameterList& /* default_params */, + const Teuchos::ParameterList& /* user_data */, + const Teuchos::RCP& /* global_data */, + PHX::FieldManager& /* fm */) const +{ + using std::string; + using std::vector; + using Teuchos::RCP; + using Teuchos::rcp; + using Teuchos::ParameterList; + using PHX::Evaluator; + + RCP< vector< RCP > > > evaluators = + rcp(new vector< RCP > > ); + + if (!models.isSublist(model_id)) { + models.print(std::cout); + std::stringstream msg; + msg << "Falied to find requested model, \"" << model_id + << "\", for equation set:\n" << std::endl; + TEUCHOS_TEST_FOR_EXCEPTION(!models.isSublist(model_id), std::logic_error, msg.str()); + } + + std::vector > bases; + fl.uniqueBases(bases); + + const ParameterList& my_models = models.sublist(model_id); + + for (ParameterList::ConstIterator model_it = my_models.begin(); + model_it != my_models.end(); ++model_it) { + + bool found = false; + + const std::string key = model_it->first; + ParameterList input; + const Teuchos::ParameterEntry& entry = model_it->second; + const ParameterList& plist = Teuchos::getValue(entry); + + if (plist.isType("Value")) { + { // at IP + input.set("Name", key); + input.set("Value", plist.get("Value")); + input.set("Data Layout", ir->dl_scalar); + RCP< Evaluator > e = + rcp(new panzer::Constant(input)); + evaluators->push_back(e); + } + + for (std::vector >::const_iterator basis_itr = bases.begin(); + basis_itr != bases.end(); ++basis_itr) { // at BASIS + input.set("Name", key); + input.set("Value", plist.get("Value")); + Teuchos::RCP basis = basisIRLayout(*basis_itr,*ir); + input.set("Data Layout", basis->functional); + RCP< Evaluator > e = + rcp(new panzer::Constant(input)); + evaluators->push_back(e); + } + found = true; + } + + if (plist.isType("Type")) { + const std::string type = plist.get("Type"); + if (type == "SIMPLE SOURCE") { + RCP > e = rcp(new Example::SimpleSource(key, *ir)); + evaluators->push_back(e); + found = true; + } else if (type == "EXACT") { + RCP > e = rcp(new Example::Solution(key, *ir)); + evaluators->push_back(e); + found = true; + } else if (type == "EXACT nonlinear Robin") { + RCP > e = rcp(new Example::Solution(key, *ir, false)); + evaluators->push_back(e); + found = true; + } else if (type == "ERROR_CALC") { + { + std::vector values(2); + values[0] = plist.get("Field A"); + values[1] = plist.get("Field B"); + + std::vector scalars(2); + scalars[0] = 1.0; + scalars[1] = -1.0; + + Teuchos::ParameterList p; + p.set("Sum Name", key + "_DIFF"); + p.set > >("Values Names", Teuchos::rcpFromRef(values)); + p.set > >("Scalars", Teuchos::rcpFromRef(scalars)); + p.set("Data Layout", ir->dl_scalar); + + RCP > e = rcp(new panzer::Sum(p)); + evaluators->push_back(e); + } + { + std::vector values(2); + values[0] = key + "_DIFF"; + values[1] = key + "_DIFF"; + + Teuchos::ParameterList p; + p.set("Product Name",key); + p.set > >("Values Names",Teuchos::rcpFromRef(values)); + p.set("Data Layout",ir->dl_scalar); + + RCP > e = rcp(new panzer::Product(p)); + evaluators->push_back(e); + } + found = true; + } + } + + if ( ! found) { + std::stringstream msg; + msg << "ClosureModelFactory failed to build evaluator for key \"" << key + << "\"\nin model \"" << model_id + << "\". Please correct the type or add support to the \nfactory." < > + buildEquationSet(const Teuchos::RCP& params, + const int& default_integration_order, + const panzer::CellData& cell_data, + const Teuchos::RCP& global_data, + const bool build_transient_support) const + { + Teuchos::RCP > eq_set= + Teuchos::rcp(new panzer::EquationSet_TemplateManager); + + bool found = false; // this is used by PANZER_BUILD_EQSET_OBJECTS + + // macro checks if(ies.name=="Poisson") then an EquationSet_Energy object is constructed + PANZER_BUILD_EQSET_OBJECTS("Poisson", PoissonEquationSet) + + // make sure your equation set has been found + if(!found) { + std::string msg = "Error - the \"Equation Set\" called \"" + params->get("Type") + + "\" is not a valid equation set identifier. Please supply the correct factory.\n"; + TEUCHOS_TEST_FOR_EXCEPTION(true, std::logic_error, msg); + } + + return eq_set; + } + +}; + +} + +#endif diff --git a/packages/panzer/adapters-stk/example/PoissonInterfaceTpetra/Example_PoissonEquationSet.hpp b/packages/panzer/adapters-stk/example/PoissonInterfaceTpetra/Example_PoissonEquationSet.hpp new file mode 100644 index 000000000000..75af44be3ba6 --- /dev/null +++ b/packages/panzer/adapters-stk/example/PoissonInterfaceTpetra/Example_PoissonEquationSet.hpp @@ -0,0 +1,97 @@ +// @HEADER +// *********************************************************************** +// +// Panzer: A partial differential equation assembly +// engine for strongly coupled complex multiphysics systems +// Copyright (2011) Sandia Corporation +// +// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation, +// the U.S. Government retains certain rights in this software. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// 1. Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// +// 2. Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in the +// documentation and/or other materials provided with the distribution. +// +// 3. Neither the name of the Corporation nor the names of the +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY +// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL SANDIA CORPORATION OR THE +// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +// Questions? Contact Roger P. Pawlowski (rppawlo@sandia.gov) and +// Eric C. Cyr (eccyr@sandia.gov) +// *********************************************************************** +// @HEADER + +#ifndef __PoissonExample_EquationSet_Energy_hpp__ +#define __PoissonExample_EquationSet_Energy_hpp__ + +#include +#include + +#include "Teuchos_RCP.hpp" +#include "Panzer_EquationSet_DefaultImpl.hpp" +#include "Panzer_Traits.hpp" +#include "Phalanx_FieldManager.hpp" + +namespace Example { + +/** The equation set serves two roles. The first is to let the panzer library + * know which fields this equation set defines and their names. It registers + * the evaluators required for a particular equation set. The level of the + * granularity is largely up to a user. For instance this could be the momentum + * or continuity equation in Navier-Stokes, or it could simply be the Navier-Stokes + * equations. + * + * Generally, this inherits from the panzer::EquationSet_DefaultImpl which takes + * care of adding the gather (extract basis coefficients from solution vector) and + * scatter (using element matrices and vectors distribute and sum their values + * to a global linear system) evaluators. These use data members that must be set by + * the user. + */ +template +class PoissonEquationSet : public panzer::EquationSet_DefaultImpl { +public: + + /** In the constructor you set all the fields provided by this + * equation set. + */ + PoissonEquationSet(const Teuchos::RCP& params, + const int& default_integration_order, + const panzer::CellData& cell_data, + const Teuchos::RCP& global_data, + const bool build_transient_support); + + /** The specific evaluators are registered with the field manager argument. + */ + void buildAndRegisterEquationSetEvaluators(PHX::FieldManager& fm, + const panzer::FieldLibrary& field_library, + const Teuchos::ParameterList& user_data) const; + +private: + std::string dof_name; + +}; + +} + +#include "Example_PoissonEquationSet_impl.hpp" + +#endif diff --git a/packages/panzer/adapters-stk/example/PoissonInterfaceTpetra/Example_PoissonEquationSet_impl.hpp b/packages/panzer/adapters-stk/example/PoissonInterfaceTpetra/Example_PoissonEquationSet_impl.hpp new file mode 100644 index 000000000000..1b2b54cd6e7d --- /dev/null +++ b/packages/panzer/adapters-stk/example/PoissonInterfaceTpetra/Example_PoissonEquationSet_impl.hpp @@ -0,0 +1,216 @@ +// @HEADER +// *********************************************************************** +// +// Panzer: A partial differential equation assembly +// engine for strongly coupled complex multiphysics systems +// Copyright (2011) Sandia Corporation +// +// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation, +// the U.S. Government retains certain rights in this software. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// 1. Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// +// 2. Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in the +// documentation and/or other materials provided with the distribution. +// +// 3. Neither the name of the Corporation nor the names of the +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY +// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL SANDIA CORPORATION OR THE +// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +// Questions? Contact Roger P. Pawlowski (rppawlo@sandia.gov) and +// Eric C. Cyr (eccyr@sandia.gov) +// *********************************************************************** +// @HEADER + +#ifndef USER_APP_EQUATIONSET_ENERGY_T_HPP +#define USER_APP_EQUATIONSET_ENERGY_T_HPP + +#include "Teuchos_ParameterList.hpp" +#include "Teuchos_StandardParameterEntryValidators.hpp" +#include "Teuchos_RCP.hpp" +#include "Teuchos_Assert.hpp" +#include "Phalanx_DataLayout_MDALayout.hpp" +#include "Phalanx_FieldManager.hpp" + +#include "Panzer_IntegrationRule.hpp" +#include "Panzer_BasisIRLayout.hpp" + +// include evaluators here +#include "Panzer_Integrator_BasisTimesScalar.hpp" +#include "Panzer_Integrator_GradBasisDotVector.hpp" +#include "Panzer_ScalarToVector.hpp" +#include "Panzer_Sum.hpp" +#include "Panzer_Constant.hpp" + +// *********************************************************************** +template +Example::PoissonEquationSet:: +PoissonEquationSet(const Teuchos::RCP& params, + const int& default_integration_order, + const panzer::CellData& cell_data, + const Teuchos::RCP& global_data, + const bool build_transient_support) : + panzer::EquationSet_DefaultImpl(params, default_integration_order, cell_data, global_data, build_transient_support ) +{ + // ******************** + // Validate and parse parameter list + // ******************** + { + Teuchos::ParameterList valid_parameters; + this->setDefaultValidParameters(valid_parameters); + + valid_parameters.set("Model ID","","Closure model id associated with this equation set"); + valid_parameters.set("Basis Type","HGrad","Type of Basis to use"); + valid_parameters.set("Basis Order",1,"Order of the basis"); + valid_parameters.set("Integration Order",-1,"Order of the integration rule"); + valid_parameters.set("DOF Name","DOF Name"); + + params->validateParametersAndSetDefaults(valid_parameters); + } + + std::string basis_type = params->get("Basis Type"); + int basis_order = params->get("Basis Order"); + int integration_order = params->get("Integration Order"); + std::string model_id = params->get("Model ID"); + dof_name = params->get("DOF Name"); + + // ******************** + // Panzer uses strings to match fields. In this section we define the + // name of the fields provided by this equation set. This is a bit strange + // in that this is not the fields necessarily required by this equation set. + // For instance for the momentum equations in Navier-Stokes only the velocity + // fields are added, the pressure field is added by continuity. + // + // In this case "TEMPERATURE" is the lone field. We also name the gradient + // for this field. These names automatically generate evaluators for "TEMPERATURE" + // and "GRAD_TEMPERATURE" gathering the basis coefficients of "TEMPERATURE" and + // the values of the TEMPERATURE and GRAD_TEMPERATURE fields at quadrature points. + // + // After all the equation set evaluators are added to a given field manager, the + // panzer code adds in appropriate scatter evaluators to distribute the + // entries into the residual and the Jacobian operator. These operators will be + // "required" by the field manager and will serve as roots of evaluation tree. + // The leaves of this tree will include the gather evaluators whose job it is to + // gather the solution from a vector. + // ******************** + + // ******************** + // Assemble DOF names and Residual names + // ******************** + + this->addDOF(dof_name,basis_type,basis_order,integration_order); + this->addDOFGrad(dof_name); + if (this->buildTransientSupport()) + this->addDOFTimeDerivative(dof_name); + + // ******************** + // Build Basis Functions and Integration Rules + // ******************** + + this->addClosureModel(model_id); + + this->setupDOFs(); +} + +// *********************************************************************** +template +void Example::PoissonEquationSet:: +buildAndRegisterEquationSetEvaluators(PHX::FieldManager& fm, + const panzer::FieldLibrary& /* fl */, + const Teuchos::ParameterList& /* user_data */) const +{ + using Teuchos::ParameterList; + using Teuchos::RCP; + using Teuchos::rcp; + + Teuchos::RCP ir = this->getIntRuleForDOF(dof_name); + Teuchos::RCP basis = this->getBasisIRLayoutForDOF(dof_name); + + // ******************** + // Energy Equation + // ******************** + + // Transient Operator: Assembles \int \dot{T} v + if (this->buildTransientSupport()) { + ParameterList p("Transient Residual"); + p.set("Residual Name", "RESIDUAL_" + dof_name + "_TRANSIENT_OP"); // we are defining the name of this operator + p.set("Value Name", "DXDT_" + dof_name); // this field is constructed by the panzer library + p.set("Basis", basis); + p.set("IR", ir); + p.set("Multiplier", 1.0); + + RCP< PHX::Evaluator > op = + rcp(new panzer::Integrator_BasisTimesScalar(p)); + + this->template registerEvaluator(fm, op); + } + + // Diffusion Operator: Assembles \int \nabla T \cdot \nabla v + { + double thermal_conductivity = 1.0; + + ParameterList p("Diffusion Residual"); + p.set("Residual Name", "RESIDUAL_" + dof_name + "_DIFFUSION_OP"); + p.set("Flux Name", "GRAD_" + dof_name); // this field is constructed by the panzer library + p.set("Basis", basis); + p.set("IR", ir); + p.set("Multiplier", thermal_conductivity); + + RCP< PHX::Evaluator > op = + rcp(new panzer::Integrator_GradBasisDotVector(p)); + + this->template registerEvaluator(fm, op); + } + + // Source Operator + { + ParameterList p("Source Residual"); + p.set("Residual Name", "RESIDUAL_" + dof_name + "_SOURCE_OP"); + p.set("Value Name", "SOURCE_" + dof_name); // this field must be provided by the closure model factory + // and specified by the user + p.set("Basis", basis); + p.set("IR", ir); + p.set("Multiplier", -1.0); + + RCP< PHX::Evaluator > op = + rcp(new panzer::Integrator_BasisTimesScalar(p)); + + this->template registerEvaluator(fm, op); + } + + // Use a sum operator to form the overall residual for the equation + { + std::vector sum_names; + + // these are the names of the residual values to sum together + sum_names.push_back("RESIDUAL_" + dof_name + "_DIFFUSION_OP"); + sum_names.push_back("RESIDUAL_" + dof_name + "_SOURCE_OP"); + if (this->buildTransientSupport()) + sum_names.push_back("RESIDUAL_" + dof_name + "_TRANSIENT_OP"); + + this->buildAndRegisterResidualSummationEvaluator(fm,dof_name,sum_names); + } + +} + +// *********************************************************************** + +#endif diff --git a/packages/panzer/adapters-stk/example/PoissonInterfaceTpetra/Example_SimpleSource.hpp b/packages/panzer/adapters-stk/example/PoissonInterfaceTpetra/Example_SimpleSource.hpp new file mode 100644 index 000000000000..cc8d4ccd8568 --- /dev/null +++ b/packages/panzer/adapters-stk/example/PoissonInterfaceTpetra/Example_SimpleSource.hpp @@ -0,0 +1,94 @@ +// @HEADER +// *********************************************************************** +// +// Panzer: A partial differential equation assembly +// engine for strongly coupled complex multiphysics systems +// Copyright (2011) Sandia Corporation +// +// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation, +// the U.S. Government retains certain rights in this software. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// 1. Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// +// 2. Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in the +// documentation and/or other materials provided with the distribution. +// +// 3. Neither the name of the Corporation nor the names of the +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY +// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL SANDIA CORPORATION OR THE +// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +// Questions? Contact Roger P. Pawlowski (rppawlo@sandia.gov) and +// Eric C. Cyr (eccyr@sandia.gov) +// *********************************************************************** +// @HEADER + +#ifndef EXAMPLE_SIMPLE_SOURCE_DECL_HPP +#define EXAMPLE_SIMPLE_SOURCE_DECL_HPP + +#include "PanzerAdaptersSTK_config.hpp" + +#include "Phalanx_config.hpp" +#include "Phalanx_Evaluator_WithBaseImpl.hpp" +#include "Phalanx_Evaluator_Derived.hpp" +#include "Phalanx_FieldManager.hpp" + +#include "Panzer_Dimension.hpp" +#include "Panzer_FieldLibrary.hpp" + +#include + +#include "Panzer_Evaluator_WithBaseImpl.hpp" + +namespace Example { + + using panzer::Cell; + using panzer::Point; + using panzer::Dim; + +/** A source for the curl Laplacian that results in the solution + */ +template +class SimpleSource : public panzer::EvaluatorWithBaseImpl, + public PHX::EvaluatorDerived { + +public: + SimpleSource(const std::string & name, + const panzer::IntegrationRule & ir); + + void postRegistrationSetup(typename Traits::SetupData d, + PHX::FieldManager& fm); + + void evaluateFields(typename Traits::EvalData d); + + +private: + typedef typename EvalT::ScalarT ScalarT; + + // Simulation source + PHX::MDField source; + int ir_degree, ir_index; +}; + +} + +#include "Example_SimpleSource_impl.hpp" + +#endif diff --git a/packages/panzer/adapters-stk/example/PoissonInterfaceTpetra/Example_SimpleSource_impl.hpp b/packages/panzer/adapters-stk/example/PoissonInterfaceTpetra/Example_SimpleSource_impl.hpp new file mode 100644 index 000000000000..7846cee3e15f --- /dev/null +++ b/packages/panzer/adapters-stk/example/PoissonInterfaceTpetra/Example_SimpleSource_impl.hpp @@ -0,0 +1,103 @@ +// @HEADER +// *********************************************************************** +// +// Panzer: A partial differential equation assembly +// engine for strongly coupled complex multiphysics systems +// Copyright (2011) Sandia Corporation +// +// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation, +// the U.S. Government retains certain rights in this software. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// 1. Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// +// 2. Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in the +// documentation and/or other materials provided with the distribution. +// +// 3. Neither the name of the Corporation nor the names of the +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY +// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL SANDIA CORPORATION OR THE +// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +// Questions? Contact Roger P. Pawlowski (rppawlo@sandia.gov) and +// Eric C. Cyr (eccyr@sandia.gov) +// *********************************************************************** +// @HEADER + +#ifndef EXAMPLE_SIMPLE_SOURCE_IMPL_HPP +#define EXAMPLE_SIMPLE_SOURCE_IMPL_HPP + +#include + +#include "Panzer_BasisIRLayout.hpp" +#include "Panzer_Workset.hpp" +#include "Panzer_Workset_Utilities.hpp" + +namespace Example { + +//********************************************************************** +template +SimpleSource::SimpleSource(const std::string & name, + const panzer::IntegrationRule & ir) +{ + using Teuchos::RCP; + + Teuchos::RCP data_layout = ir.dl_scalar; + ir_degree = ir.cubature_degree; + + source = PHX::MDField(name, data_layout); + + this->addEvaluatedField(source); + + std::string n = "Simple Source"; + this->setName(n); +} + +//********************************************************************** +template +void SimpleSource::postRegistrationSetup(typename Traits::SetupData sd, + PHX::FieldManager& /* fm */) +{ + ir_index = panzer::getIntegrationRuleIndex(ir_degree,(*sd.worksets_)[0], this->wda); +} + +//********************************************************************** +template +void SimpleSource::evaluateFields(typename Traits::EvalData workset) +{ + using panzer::index_t; + for (index_t cell = 0; cell < workset.num_cells; ++cell) { + for (int point = 0; point < source.extent_int(1); ++point) { + const double & x = this->wda(workset).int_rules[ir_index]->ip_coordinates(cell,point,0); + const double & y = this->wda(workset).int_rules[ir_index]->ip_coordinates(cell,point,1); + + if (this->wda(workset).int_rules[ir_index]->ip_coordinates.extent(2) == 2) { + source(cell,point) = 4*M_PI*M_PI*sin(2*M_PI*x)*cos(2*M_PI*y); + } else { + const double & z = this->wda(workset).int_rules[ir_index]->ip_coordinates(cell,point,2); + source(cell,point) = 4*M_PI*M_PI*sin(2*M_PI*x)*cos(2*M_PI*y)*cos(2*M_PI*z); + } + } + } +} + +//********************************************************************** +} + +#endif diff --git a/packages/panzer/adapters-stk/example/PoissonInterfaceTpetra/Example_Solution.hpp b/packages/panzer/adapters-stk/example/PoissonInterfaceTpetra/Example_Solution.hpp new file mode 100644 index 000000000000..4979ef37f2d1 --- /dev/null +++ b/packages/panzer/adapters-stk/example/PoissonInterfaceTpetra/Example_Solution.hpp @@ -0,0 +1,95 @@ +// @HEADER +// *********************************************************************** +// +// Panzer: A partial differential equation assembly +// engine for strongly coupled complex multiphysics systems +// Copyright (2011) Sandia Corporation +// +// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation, +// the U.S. Government retains certain rights in this software. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// 1. Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// +// 2. Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in the +// documentation and/or other materials provided with the distribution. +// +// 3. Neither the name of the Corporation nor the names of the +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY +// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL SANDIA CORPORATION OR THE +// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +// Questions? Contact Roger P. Pawlowski (rppawlo@sandia.gov) and +// Eric C. Cyr (eccyr@sandia.gov) +// *********************************************************************** +// @HEADER + +#ifndef __Example_Solution_hpp__ +#define __Example_Solution_hpp__ + +#include "PanzerAdaptersSTK_config.hpp" + +#include "Phalanx_Evaluator_WithBaseImpl.hpp" +#include "Phalanx_Evaluator_Derived.hpp" +#include "Phalanx_FieldManager.hpp" + +#include "Panzer_Dimension.hpp" +#include "Panzer_FieldLibrary.hpp" + +#include + +#include "Panzer_Evaluator_WithBaseImpl.hpp" + +namespace Example { + +using panzer::Cell; +using panzer::Point; +using panzer::Dim; + +/** The analytic solution to the Poisson equation for the sin*cos source with + * DBC on left and right. + */ +template +class Solution : public panzer::EvaluatorWithBaseImpl, + public PHX::EvaluatorDerived { + +public: + Solution(const std::string & name, + const panzer::IntegrationRule & ir, + const bool linear_Robin = true); + + void postRegistrationSetup(typename Traits::SetupData d, + PHX::FieldManager& fm); + + void evaluateFields(typename Traits::EvalData d); + + +private: + typedef typename EvalT::ScalarT ScalarT; + + PHX::MDField solution; + int ir_degree, ir_index; + bool linear_Robin; +}; + +} + +#include "Example_Solution_impl.hpp" + +#endif diff --git a/packages/panzer/adapters-stk/example/PoissonInterfaceTpetra/Example_Solution_impl.hpp b/packages/panzer/adapters-stk/example/PoissonInterfaceTpetra/Example_Solution_impl.hpp new file mode 100644 index 000000000000..f0a9ae978a56 --- /dev/null +++ b/packages/panzer/adapters-stk/example/PoissonInterfaceTpetra/Example_Solution_impl.hpp @@ -0,0 +1,101 @@ +// @HEADER +// *********************************************************************** +// +// Panzer: A partial differential equation assembly +// engine for strongly coupled complex multiphysics systems +// Copyright (2011) Sandia Corporation +// +// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation, +// the U.S. Government retains certain rights in this software. +// +// Redistribution and use in solution and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// 1. Redistributions of solution code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// +// 2. Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in the +// documentation and/or other materials provided with the distribution. +// +// 3. Neither the name of the Corporation nor the names of the +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY +// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL SANDIA CORPORATION OR THE +// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +// Questions? Contact Roger P. Pawlowski (rppawlo@sandia.gov) and +// Eric C. Cyr (eccyr@sandia.gov) +// *********************************************************************** +// @HEADER + +#include + +#include "Panzer_BasisIRLayout.hpp" +#include "Panzer_Workset.hpp" +#include "Panzer_Workset_Utilities.hpp" + +namespace Example { + +template +Solution::Solution(const std::string& name, + const panzer::IntegrationRule& ir, + const bool in_linear_Robin) + : linear_Robin(in_linear_Robin) +{ + Teuchos::RCP data_layout = ir.dl_scalar; + ir_degree = ir.cubature_degree; + + solution = PHX::MDField(name, data_layout); + + this->addEvaluatedField(solution); + + std::string n = "Solution"; + this->setName(n); +} + +template +void Solution::postRegistrationSetup(typename Traits::SetupData sd, + PHX::FieldManager& /* fm */) +{ + ir_index = panzer::getIntegrationRuleIndex(ir_degree,(*sd.worksets_)[0], this->wda); +} + +template +void Solution::evaluateFields(typename Traits::EvalData workset) +{ + using panzer::index_t; + for (index_t cell = 0; cell < workset.num_cells; ++cell) { + for (int point = 0; point < solution.extent_int(1); ++point) { + const double& x = this->wda(workset).int_rules[ir_index]->ip_coordinates(cell,point,0); + const double& y = this->wda(workset).int_rules[ir_index]->ip_coordinates(cell,point,1); + + if (linear_Robin) { + if (this->wda(workset).int_rules[ir_index]->ip_coordinates.extent(2) == 2) { + solution(cell,point) = 0.5 - 0.8*x + 0.5*sin(2*M_PI*x)*cos(2*M_PI*y); + } else { + const double & z = this->wda(workset).int_rules[ir_index]->ip_coordinates(cell,point,2); + solution(cell,point) = 0.5 - 0.8*x + sin(2*M_PI*x)*cos(2*M_PI*y)*cos(2*M_PI*z)/3.0; + } + } else { + if (workset.block_id[7] == '0') + solution(cell,point) = 0.5 - 0.4*x; + else + solution(cell,point) = 0.1 - 0.4*x; + } + } + } +} + +} diff --git a/packages/panzer/adapters-stk/example/PoissonInterfaceTpetra/convergence_rate.py b/packages/panzer/adapters-stk/example/PoissonInterfaceTpetra/convergence_rate.py new file mode 100644 index 000000000000..b7672b2a6a4c --- /dev/null +++ b/packages/panzer/adapters-stk/example/PoissonInterfaceTpetra/convergence_rate.py @@ -0,0 +1,56 @@ +import sys +import re + +try: + if not len(sys.argv)>3: + print('Expected at least three solution files with the line \"Error = \%f\" in them') + raise Exception("Failure: Command line - [filename-prefix] [coarsest mesh res] [second mesh res] [third mesh res] ...") + + file_prefix = sys.argv[1] + + mesh_res = [] + for i in range(2,len(sys.argv)): + mesh_res += [int(sys.argv[i])] + + max_res = max(mesh_res) + + errorPat = re.compile('.*Error = (.*)$') + + error_values = [] + for res in mesh_res: + if max_res>=100: + filename = '%s%03d' % (file_prefix,res) + elif max_res>=10: + filename = '%s%02d' % (file_prefix,res) + else: + filename = '%s%d' % (file_prefix,res) + + print("opening \"" + filename +"\"") + f = open(filename); + + # look for the "Error = ..." line + for line in f: + errorMatch = errorPat.match(line) + if errorMatch==None: + continue + + error = float(errorMatch.group(1)) + error_values += [error] + # end for res + + rate = error_values[-1]/error_values[-2] + + # the convergence rate should be 0.25 (we are halfing the mesh size + # each refinement step). Though its not exact due to using tets and + # other reasons that lead to imperfect convergence rates. But its close + # enough to give a quadratic convergence order. + if (rate-0.25)/0.25 > 0.05: + raise Exception('Convergence rate of %f, is not within 5 percent bounds of 0.25: FAILED' % rate) + + print('Convergence rate of %f is within 5 percent of 0.25: PASSED' % rate) + +except Exception as e: + print("Test Failed: ") + print(e) +else: + print("Test Passed") diff --git a/packages/panzer/adapters-stk/example/PoissonInterfaceTpetra/diffsideids.exo b/packages/panzer/adapters-stk/example/PoissonInterfaceTpetra/diffsideids.exo new file mode 100644 index 000000000000..ef19a37d0dec Binary files /dev/null and b/packages/panzer/adapters-stk/example/PoissonInterfaceTpetra/diffsideids.exo differ diff --git a/packages/panzer/adapters-stk/example/PoissonInterfaceTpetra/main.cpp b/packages/panzer/adapters-stk/example/PoissonInterfaceTpetra/main.cpp new file mode 100644 index 000000000000..dac42f02fcab --- /dev/null +++ b/packages/panzer/adapters-stk/example/PoissonInterfaceTpetra/main.cpp @@ -0,0 +1,1090 @@ +// @HEADER +// *********************************************************************** +// +// Panzer: A partial differential equation assembly +// engine for strongly coupled complex multiphysics systems +// Copyright (2011) Sandia Corporation +// +// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation, +// the U.S. Government retains certain rights in this software. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// 1. Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// +// 2. Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in the +// documentation and/or other materials provided with the distribution. +// +// 3. Neither the name of the Corporation nor the names of the +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY +// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL SANDIA CORPORATION OR THE +// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +// Questions? Contact Roger P. Pawlowski (rppawlo@sandia.gov) and +// Eric C. Cyr (eccyr@sandia.gov) +// *********************************************************************** +// @HEADER + +#include +#include +#include +#include +#include +#include + +#include "Teuchos_DefaultComm.hpp" +#include "Teuchos_GlobalMPISession.hpp" + +#include "PanzerAdaptersSTK_config.hpp" +#include "Panzer_GlobalData.hpp" +#include "Panzer_Workset_Builder.hpp" +#include "Panzer_WorksetContainer.hpp" +#include "Panzer_AssemblyEngine.hpp" +#include "Panzer_AssemblyEngine_InArgs.hpp" +#include "Panzer_AssemblyEngine_TemplateManager.hpp" +#include "Panzer_AssemblyEngine_TemplateBuilder.hpp" +#include "Panzer_LinearObjFactory.hpp" +#include "Panzer_TpetraLinearObjFactory.hpp" +#include "Panzer_DOFManagerFactory.hpp" +#include "Panzer_DOFManager.hpp" +#include "Panzer_FieldManagerBuilder.hpp" +#include "Panzer_PureBasis.hpp" +#include "Panzer_GlobalData.hpp" +#include "Panzer_ResponseLibrary.hpp" +#include "Panzer_ResponseEvaluatorFactory_Functional.hpp" +#include "Panzer_Response_Functional.hpp" +#include "Panzer_NodeType.hpp" + +#include "PanzerAdaptersSTK_config.hpp" +#include "Panzer_STK_WorksetFactory.hpp" +#include "Panzer_STKConnManager.hpp" +#include "Panzer_STK_Version.hpp" +#include "Panzer_STK_Interface.hpp" +#include "Panzer_STK_SquareQuadMeshFactory.hpp" +#include "Panzer_STK_CubeHexMeshFactory.hpp" +#include "Panzer_STK_ExodusReaderFactory.hpp" +#include "Panzer_STK_SetupUtilities.hpp" +#include "Panzer_STK_Utilities.hpp" + +#include "TpetraExt_MatrixMatrix.hpp" +#include "MatrixMarket_Tpetra.hpp" +#include "Ifpack2_Factory.hpp" + +#include "Example_BCStrategy_Factory.hpp" +#include "Example_ClosureModel_Factory_TemplateBuilder.hpp" +#include "Example_EquationSetFactory.hpp" + +#include "BelosLinearProblem.hpp" +#include "BelosTpetraAdapter.hpp" +#include "BelosPseudoBlockGmresSolMgr.hpp" + +using Teuchos::RCP; +using Teuchos::rcp; + +using ST = double; +using LO = panzer::LocalOrdinal; +using GO = panzer::GlobalOrdinal; +using NT = panzer::TpetraNodeType; +using TpetraVector = Tpetra::Vector; +using TpetraCrsMatrix = Tpetra::CrsMatrix; +using TpetraRowMatrix = Tpetra::RowMatrix; +using TpetraLOC = panzer::TpetraLinearObjContainer; +using Ifpack2Prec = Ifpack2::Preconditioner; + +struct ProblemOptions { + std::string mesh_filename; + int nxelem, nyelem; + bool is3d; + + bool generate_mesh_only; + + std::vector + dof_names, // nominally A1, A2, B, C1, C2 + eb_names, // two element block names + ss_names; // left, interface, right sideset names + + int integration_order; + // Use a nonlinear version of the Robin interface condition. + bool nonlinear_Robin; + + // Test against finite-difference Jacobian. + bool test_Jacobian; + // Convergence tolerance. + double rtol; + bool check_error; + Teuchos::RCP J; +}; + +std::ostream& operator<< (std::ostream& os, const ProblemOptions& po) { + os << "ProblemOptions:\n DOF Names:"; + for (size_t i = 0; i < po.dof_names.size(); ++i) os << " " << po.dof_names[i]; + os << "\n" + << " nxelem " << po.nxelem << "\n" + << " nyelem " << po.nyelem << "\n" + << " nonlinear_Robin: " << po.nonlinear_Robin << "\n" + << " rtol: " << po.rtol << "\n" + << " test_Jacobian: " << po.test_Jacobian << "\n"; + return os; +} + +std::string strint (const std::string& str, const int i) { + std::stringstream ss; + ss << str << i; + return ss.str(); +} + +bool solve_Ax_eq_b (TpetraCrsMatrix& A, TpetraVector& b, TpetraVector& x, const double rtol) +{ + using MV = Tpetra::MultiVector; + using OP = Tpetra::Operator; + Belos::LinearProblem problem(Teuchos::rcpFromRef(A), + Teuchos::rcpFromRef(x), + Teuchos::rcpFromRef(b)); + + Teuchos::ParameterList precParams("Ifpack2 Params"); + + // RCP M_inv = Ifpack2::Factory::create("RELAXATION", Teuchos::rcpFromRef(A)); + // precParams.set("relaxation: type","Jacobi"); + RCP M_inv = Ifpack2::Factory::create("ILUT", Teuchos::rcpFromRef(A), 1); + precParams.set("fact: ilut level-of-fill",2.0); + precParams.set("fact: drop tolerance",0.0); + + M_inv->setParameters(precParams); + + TEUCHOS_ASSERT(nonnull(M_inv)); + M_inv->initialize(); + M_inv->compute(); + problem.setRightPrec(M_inv); + + problem.setProblem(); + + Teuchos::ParameterList solverParams("Belos Params"); + solverParams.set("Num Blocks", 300); + solverParams.set("Maximum Iterations",300); + solverParams.set("Block Size",1); + solverParams.set("Convergence Tolerance",rtol); + solverParams.set("Output Frequency",1); + // int verbLevel = Belos::Errors + Belos::Warnings + Belos::FinalSummary + Belos::StatusTestDetails; + int verbLevel = Belos::Errors + Belos::Warnings + Belos::FinalSummary; + solverParams.set("Verbosity",verbLevel); + + Belos::PseudoBlockGmresSolMgr solver(Teuchos::rcpFromRef(problem), + Teuchos::rcpFromRef(solverParams)); + + auto solverStatus = solver.solve(); + + return (solverStatus == Belos::Converged); +} + +void assembleAndSolve (panzer::AssemblyEngine_TemplateManager& ae_tm, + const Teuchos::RCP >& linObjFactory, + Teuchos::RCP& ep_container, + Teuchos::RCP& ghost_container, + const ProblemOptions& po) +{ + Teuchos::FancyOStream out(Teuchos::rcpFromRef(std::cout)); + out.setOutputToRootOnly(0); + out.setShowProcRank(true); + + ghost_container = linObjFactory->buildGhostedLinearObjContainer(); + const Teuchos::RCP container = linObjFactory->buildLinearObjContainer(); + // Convert generic linear object container to tpetra container. + ep_container = Teuchos::rcp_dynamic_cast(container); + linObjFactory->initializeGhostedContainer(panzer::LinearObjContainer::X | + panzer::LinearObjContainer::F | + panzer::LinearObjContainer::Mat, *ghost_container); + + double bnorm = 0.0; + RCP x; + RCP dx; + RCP A; + // Newton iteration. + for (int it = 0; it < 10; ++it) { + linObjFactory->initializeContainer(panzer::LinearObjContainer::X | + panzer::LinearObjContainer::F | + panzer::LinearObjContainer::Mat, *container); + container->initialize(); + ghost_container->initialize(); + + if (x.is_null()) { + x = ep_container->get_x(); + dx = Teuchos::rcp(new TpetraVector(ep_container->get_x()->getMap())); + } else + ep_container->set_x(x); + + panzer::AssemblyEngineInArgs input(ghost_container, ep_container); + input.alpha = 0.0; + input.beta = 1.0; + + // Evaluate physics. + ae_tm.getAsObject()->evaluate(input); + if (it == 0 && Teuchos::nonnull(po.J)) + A = po.J; + else + A = ep_container->get_A(); + + double rnorm = ep_container->get_f()->norm2(); + if (it == 0) bnorm = rnorm; + double dxnorm = dx->norm2(); + const bool done = rnorm <= po.rtol*bnorm; + out << "it " << it << " norm(r) " << rnorm << " norm(dx) " << dxnorm << "\n"; + if (done) break; + + if ( ! solve_Ax_eq_b(*A, *ep_container->get_f(), *dx, 1.0e-2*po.rtol)) + out << " Linear solver did not converge; continuing outer iteration.\n"; + + x->update(-1.0, *dx, 1.0); + } + +} + +struct SparseTriple { + GO m, n; + std::vector i, j; + std::vector v; +}; + +// Serial only. Very straightforward: one eval per column. Could speed up a lot +// using graph coloring. +double +testJacobian (panzer::AssemblyEngine_TemplateManager& ae_tm, + const Teuchos::RCP >& linObjFactory, + const Teuchos::RCP x0 = Teuchos::null) +{ + using Teuchos::RCP; + using Teuchos::rcp; + + const RCP ghost_con = linObjFactory->buildGhostedLinearObjContainer(); + const RCP con = linObjFactory->buildLinearObjContainer(); + linObjFactory->initializeGhostedContainer(panzer::LinearObjContainer::X | + panzer::LinearObjContainer::F | + panzer::LinearObjContainer::Mat, *ghost_con); + const RCP ep_con = Teuchos::rcp_dynamic_cast(con); + + SparseTriple t; + { // Finite-difference Jacobian. Should use graph coloring to greatly reduce + // number of evaluations. But brute force for now. + RCP x, f0; + for (int i = -1; ; ++i) { + linObjFactory->initializeContainer(panzer::LinearObjContainer::X | panzer::LinearObjContainer::F | + panzer::LinearObjContainer::Mat, *con); + ghost_con->initialize(); + con->initialize(); + const auto& row_map = *ep_con->get_A()->getRowMap(); + const auto& col_map = *ep_con->get_A()->getColMap(); + if (i == -1) { + if (Teuchos::nonnull(x0)) + x = rcp(new TpetraVector(*x0,Teuchos::Copy)); + else + x = rcp(new TpetraVector(ep_con->get_x()->getMap())); + t.m = t.n = x->getGlobalLength(); + } + // For a linear problem, could make delta 1 to remove cancellation + // error. But I want to look at a nonlinear Robin condition, so do a true + // finite difference. + const double delta = 1e-6; + const bool i_mine = row_map.isNodeGlobalElement(i); + double x_prev = 0; + int i_lid = 0; + x->sync_host(); + auto x_host = x->getLocalViewHost(); + if (i_mine && i >= 0) { + i_lid = col_map.getLocalElement(i); + x_prev = x_host(i_lid,0); + x_host(i_lid,0) += delta; + x->modify_host(); + x->sync_device(); + } + ep_con->set_x(x); + panzer::AssemblyEngineInArgs input(ghost_con, ep_con); + input.alpha = 0; + input.beta = 1; + ae_tm.getAsObject()->evaluate(input); + if (i == -1) + f0 = ep_con->get_f(); + else { + TpetraVector& f = *ep_con->get_f(); + f.sync_host(); + f0->sync_host(); + const auto f_host = f.getLocalViewHost(); + const auto f0_host = f0->getLocalViewHost(); + if (i_mine) { + //(*x)[i_lid] = x_prev; + x_host(i_lid,0) = x_prev; + } + for (size_t k = 0; k < f_host.size(); ++k) { + const double d = f_host(k,0) - f0_host(k,0); + if (d == 0) continue; + t.i.push_back(row_map.getGlobalElement(k)); + t.j.push_back(i); + t.v.push_back(d/delta); + } + } + if (i + 1 == t.m) break; + } + } + + { // AD Jacobian. + linObjFactory->initializeContainer(panzer::LinearObjContainer::X | panzer::LinearObjContainer::F | + panzer::LinearObjContainer::Mat, *con); + ghost_con->initialize(); + con->initialize(); + if (Teuchos::nonnull(x0)) + ep_con->set_x(rcp(new TpetraVector(*x0,Teuchos::Copy))); + else + ep_con->get_x()->putScalar(0.0); + panzer::AssemblyEngineInArgs input(ghost_con, ep_con); + input.alpha = 0.0; + input.beta = 1.0; + ae_tm.getAsObject()->evaluate(input); + Tpetra::MatrixMarket::Writer::writeSparseFile("A_ad.mm", *ep_con->get_A()); + } + + RCP A_fd; + { + A_fd = rcp(new TpetraCrsMatrix(*ep_con->get_A(),Teuchos::Copy)); + A_fd->resumeFill(); + for (int i = 0; i < static_cast(t.v.size()); ++i) + A_fd->replaceGlobalValues(t.i[i], 1, &t.v[i], &t.j[i]); + A_fd->fillComplete(); + } + Tpetra::MatrixMarket::Writer::writeSparseFile("A_fd.mm", *A_fd); + + { // Check error. + RCP D = Tpetra::MatrixMatrix::add(-1.0, false, *ep_con->get_A(), 1.0, false, *A_fd); + Kokkos::fence(); + + auto local_A_fd = A_fd->getLocalMatrix().values; + double local_A_fd_inf_norm = 0.0; + Kokkos::parallel_reduce(local_A_fd.size(),KOKKOS_LAMBDA (const int i, double& abs_max) { + double val = std::fabs(local_A_fd(i)); + if (val > abs_max) abs_max = val; + },Kokkos::Max(local_A_fd_inf_norm)); + + auto local_D = D->getLocalMatrix().values; + double local_D_inf_norm = 0.0; + Kokkos::parallel_reduce(local_D.size(),KOKKOS_LAMBDA (const int i, double& abs_max) { + double val = std::fabs(local_D(i)); + if (val > abs_max) abs_max = val; + },Kokkos::Max(local_D_inf_norm)); + + Kokkos::fence(); + + double A_fd_inf_norm = 0.0; + Teuchos::reduceAll (*(A_fd->getComm()), Teuchos::REDUCE_MAX, + local_A_fd_inf_norm, Teuchos::outArg(A_fd_inf_norm)); + + double D_inf_norm = 0.0; + Teuchos::reduceAll (*(D->getComm()), Teuchos::REDUCE_MAX, + local_D_inf_norm, Teuchos::outArg(D_inf_norm)); + + // std::cout << "l_A_inf=" << local_A_fd_inf_norm << std::endl; + // std::cout << "A_inf=" << A_fd_inf_norm << std::endl; + // std::cout << "l_D_inf=" << local_D_inf_norm << std::endl; + // std::cout << "D_inf=" << D_inf_norm << std::endl; + // std::cout << "error=" << D_inf_norm / A_fd_inf_norm << std::endl; + + return D_inf_norm / A_fd_inf_norm; + } +} + +bool hasInterfaceCondition (const std::vector& bcs) +{ + for (std::vector::const_iterator bcit = bcs.begin(); bcit != bcs.end(); ++bcit) + if (bcit->bcType() == panzer::BCT_Interface) + return true; + return false; +} + +Teuchos::RCP +getSTKConnManager (const Teuchos::RCP& conn_mgr) +{ + const Teuchos::RCP stk_conn_mgr = + Teuchos::rcp_dynamic_cast(conn_mgr); + TEUCHOS_TEST_FOR_EXCEPTION(stk_conn_mgr.is_null(), std::logic_error, + "There are interface conditions, but the connection manager" + " does not support the necessary connections."); + return stk_conn_mgr; +} + +void buildInterfaceConnections (const std::vector& bcs, + const Teuchos::RCP& conn_mgr) +{ + const Teuchos::RCP stk_conn_mgr = getSTKConnManager(conn_mgr); + for (std::vector::const_iterator bcit = bcs.begin(); bcit != bcs.end(); ++bcit) + if (bcit->bcType() == panzer::BCT_Interface) + stk_conn_mgr->associateElementsInSideset(bcit->sidesetID()); +} + +void checkInterfaceConnections (const Teuchos::RCP& conn_mgr, + const Teuchos::RCP >& comm) +{ + const Teuchos::RCP stk_conn_mgr = getSTKConnManager(conn_mgr); + std::vector sidesets = stk_conn_mgr->checkAssociateElementsInSidesets(*comm); + if ( ! sidesets.empty()) { + std::stringstream ss; + ss << "Sideset IDs"; + for (std::size_t i = 0; i < sidesets.size(); ++i) + ss << " " << sidesets[i]; + ss << " did not yield associations, but these sidesets correspond to BCT_Interface BCs."; + TEUCHOS_TEST_FOR_EXCEPTION(true, std::logic_error, ss.str()); + } +} + +void testInitialization(const Teuchos::RCP& ipb, std::vector& bcs, + const ProblemOptions& po); + +// calls MPI_Init and MPI_Finalize +int main (int argc, char* argv[]) +{ + using Teuchos::RCP; + using Teuchos::rcp_dynamic_cast; + using panzer::StrPureBasisPair; + using panzer::StrPureBasisComp; + + Kokkos::initialize(argc,argv); + + int status = 0; + try { + + Teuchos::GlobalMPISession mpiSession(&argc, &argv); + RCP > tComm = Teuchos::rcp(new Teuchos::MpiComm(MPI_COMM_WORLD)); + Teuchos::FancyOStream out(Teuchos::rcpFromRef(std::cout)); + out.setOutputToRootOnly(0); + out.setShowProcRank(true); + + const std::size_t workset_size = 20; + + ProblemOptions po; + { + // Set up this problem with two discontinuous (A, C) and one continuous (B) + // fields. + // On fields A are imposed Neumann and weak Dirichlet matching interface conditions. + // On fields C are imposed Robin interface conditions, with one-way + // coupling to field B. + // If the Robin condition is linear, then the default setup is such that + // A, B, C all converge to the same solution for which the Solution + // evaluator provides the exact expression. A response function reports the + // error so a convergence test can be wrapped around multiple runs of this + // program. + // If the Robin condition is nonlinear, then the source is 0 and the + // solution is two planes with a jump of 0.4 at the interface. + + Teuchos::CommandLineProcessor clp; + po.nxelem = 10; + clp.setOption("nx", &po.nxelem, "Number of elements in x direction"); + po.nonlinear_Robin = false; + clp.setOption("nonlinear", "linear", &po.nonlinear_Robin, + "Use a nonlinear Robin interface condition"); + po.rtol = 1e-10; + clp.setOption("rtol", &po.rtol, "Tolerance on residual norm"); + po.is3d = false; + clp.setOption("3d", "2d", &po.is3d, "3D test instead of 2D"); + po.mesh_filename = ""; + clp.setOption("mesh-filename", &po.mesh_filename, "Optionally read from an Exodus mesh"); + po.test_Jacobian = false; + clp.setOption("test-jacobian", "dont-test-jacobian", &po.test_Jacobian, + "Test Jacobian using finite differences."); + po.generate_mesh_only = false; + clp.setOption("generate-mesh-only", "dont-generate-mesh-only", &po.generate_mesh_only, + "Generate mesh, save, and quit."); + try { + clp.parse(argc, argv); + } catch (...) { + Kokkos::finalize_all(); + return -1; + } + + po.nyelem = po.nxelem; + po.dof_names.push_back("A"); + po.dof_names.push_back("B"); + po.dof_names.push_back("C"); + po.ss_names.push_back("left"); + po.ss_names.push_back("vertical_0"); + po.ss_names.push_back("right"); + po.check_error = true; + + out << po << "\n"; + } + bool pass = true; + + // Can be overridden by the equation set. + po.integration_order = 2; + + // Construct mesh. + Teuchos::RCP mesh_factory; + if ( ! po.mesh_filename.empty()) { + mesh_factory = Teuchos::rcp(new panzer_stk::STK_ExodusReaderFactory(po.mesh_filename)); + } else { + if (po.is3d) + mesh_factory = Teuchos::rcp(new panzer_stk::CubeHexMeshFactory); + else + mesh_factory = Teuchos::rcp(new panzer_stk::SquareQuadMeshFactory); + } + + if (po.mesh_filename.empty()) { + // set mesh factory parameters + RCP pl = rcp(new Teuchos::ParameterList); + pl->set("X Blocks",2); + pl->set("Y Blocks",1); + if (po.is3d) pl->set("Z Blocks",1); + pl->set("X Elements", po.nxelem); // per block + pl->set("Y Elements", po.nyelem); + if (po.is3d) { + pl->set("Z Elements", po.nyelem); + pl->set("Build Interface Sidesets", true); + } + { // If np is even, put ranks in both x and y directions; if not, go with + // default, which is x direction only. The x direction is the harder case. + const int np = mpiSession.getNProc(); + if (np % 2 == 0 && np >= 4) { + const int nxp = np/2, nyp = 2; + pl->set("X Procs", nxp); + pl->set("Y Procs", nyp); + } + } + mesh_factory->setParameterList(pl); + } + + RCP mesh = mesh_factory->buildUncommitedMesh(MPI_COMM_WORLD); + if (po.generate_mesh_only) { + mesh_factory->completeMeshConstruction(*mesh, MPI_COMM_WORLD); + mesh->writeToExodus("output.exo"); + out << "Stopping after writing mesh because --generate-mesh-only was requested.\n"; + Kokkos::finalize_all(); + return 0; + } + + //todo mesh->getDimension() may not be right if mesh_factory is the Exodus + // reader. + po.is3d = mesh->getMetaData()->spatial_dimension() == 3; + + if (po.is3d) { + po.eb_names.push_back("eblock-0_0_0"); + po.eb_names.push_back("eblock-1_0_0"); + } else { + po.eb_names.push_back("eblock-0_0"); + po.eb_names.push_back("eblock-1_0"); + } + + // construct input physics and physics block + //////////////////////////////////////////////////////// + + // factory definitions + Teuchos::RCP eqset_factory = + Teuchos::rcp(new Example::EquationSetFactory); // where poisson equation is defined + Example::BCStrategyFactory bc_factory; // where boundary conditions are defined + + const Teuchos::RCP ipb = Teuchos::parameterList("Physics Blocks"); + std::vector bcs; + std::vector > physicsBlocks; + { + testInitialization(ipb, bcs, po); + + std::map block_ids_to_physics_ids; + std::map > block_ids_to_cell_topo; + + block_ids_to_physics_ids[po.eb_names[0]] = "Poisson Physics Left"; + block_ids_to_physics_ids[po.eb_names[1]] = "Poisson Physics Right"; + + block_ids_to_cell_topo[po.eb_names[0]] = mesh->getCellTopology(po.eb_names[0]); + block_ids_to_cell_topo[po.eb_names[1]] = mesh->getCellTopology(po.eb_names[1]); + + // GobalData sets ostream and parameter interface to physics + Teuchos::RCP gd = panzer::createGlobalData(); + + // the physics block knows how to build and register evaluator with the field manager + panzer::buildPhysicsBlocks(block_ids_to_physics_ids, + block_ids_to_cell_topo, + ipb, + po.integration_order, + workset_size, + eqset_factory, + gd, + false, + physicsBlocks); + } + + // finish building mesh, set required field variables and mesh bulk data + //////////////////////////////////////////////////////////////////////// + { + std::vector >::const_iterator physIter; + for(physIter=physicsBlocks.begin();physIter!=physicsBlocks.end();++physIter) { + Teuchos::RCP pb = *physIter; + const std::vector & blockFields = pb->getProvidedDOFs(); + + // insert all fields into a set + std::set fieldNames; + fieldNames.insert(blockFields.begin(),blockFields.end()); + + // add basis to DOF manager: block specific + std::set::const_iterator fieldItr; + for (fieldItr=fieldNames.begin();fieldItr!=fieldNames.end();++fieldItr) + mesh->addSolutionField(fieldItr->first,pb->elementBlockID()); + } + + mesh_factory->completeMeshConstruction(*mesh,MPI_COMM_WORLD); + } + + // build worksets + //////////////////////////////////////////////////////// + + Teuchos::RCP wkstFactory + = Teuchos::rcp(new panzer_stk::WorksetFactory(mesh)); // build STK workset factory + Teuchos::RCP wkstContainer // attach it to a workset container (uses lazy evaluation) + = Teuchos::rcp(new panzer::WorksetContainer); + wkstContainer->setFactory(wkstFactory); + for(size_t i=0;isetNeeds(physicsBlocks[i]->elementBlockID(),physicsBlocks[i]->getWorksetNeeds()); + wkstContainer->setWorksetSize(workset_size); + + std::vector elementBlockNames; + mesh->getElementBlockNames(elementBlockNames); + std::map > > volume_worksets; + panzer::getVolumeWorksetsFromContainer(*wkstContainer,elementBlockNames,volume_worksets); + + // build DOF Manager and linear object factory + ///////////////////////////////////////////////////////////// + + RCP dofManager; + { + const Teuchos::RCP + conn_manager = Teuchos::rcp(new panzer_stk::STKConnManager(mesh)); + const bool has_interface_condition = hasInterfaceCondition(bcs); + if (has_interface_condition) + buildInterfaceConnections(bcs, conn_manager); + panzer::DOFManagerFactory globalIndexerFactory; + globalIndexerFactory.setUseNeighbors(has_interface_condition); + dofManager = globalIndexerFactory.buildGlobalIndexer( + Teuchos::opaqueWrapper(MPI_COMM_WORLD), physicsBlocks, conn_manager, ""); + if (has_interface_condition) + checkInterfaceConnections(conn_manager, dofManager->getComm()); + } + + // construct some linear algebra object, build object to pass to evaluators + // std::vector> dofManagerVec{dofManager}; + // Teuchos::RCP > linObjFactory + // = Teuchos::rcp(new panzer::BlockedTpetraLinearObjFactory(tComm.getConst(),dofManagerVec)); + Teuchos::RCP > linObjFactory + = Teuchos::rcp(new panzer::TpetraLinearObjFactory(tComm.getConst(),dofManager)); + + std::vector names; + std::vector > eblocks; + const int c_name_start = 3; + { + for (int i = 1; i <= 2; ++i) { + names.push_back(strint(po.dof_names[0], i)); + eblocks.push_back(std::vector()); + eblocks.back().push_back(po.eb_names[i-1]); + } + names.push_back(po.dof_names[1]); + eblocks.push_back(std::vector()); + eblocks.back().push_back(po.eb_names[0]); + eblocks.back().push_back(po.eb_names[1]); + if (po.dof_names.size() >= 3) + for (int i = 1; i <= 2; ++i) { + names.push_back(strint(po.dof_names[2], i)); + eblocks.push_back(std::vector()); + eblocks.back().push_back(po.eb_names[i-1]); + } + } + + Teuchos::RCP > errorResponseLibrary + = Teuchos::rcp(new panzer::ResponseLibrary(wkstContainer, dofManager, linObjFactory)); + { + for (std::size_t i = po.nonlinear_Robin ? c_name_start : 0; i < names.size(); ++i) { + panzer::FunctionalResponse_Builder builder; + builder.comm = MPI_COMM_WORLD; + builder.cubatureDegree = po.integration_order; + builder.requiresCellIntegral = true; + builder.quadPointField = names[i] + "_ERROR"; + errorResponseLibrary->addResponse(names[i] + " L2 Error", eblocks[i], builder); + } + } + + // setup closure model + ///////////////////////////////////////////////////////////// + + panzer::ClosureModelFactory_TemplateManager cm_factory; + Example::ClosureModelFactory_TemplateBuilder cm_builder; + cm_factory.buildObjects(cm_builder); + + Teuchos::ParameterList closure_models("Closure Models"); + { + Teuchos::ParameterList& s = closure_models.sublist("solid"); + for (std::vector::const_iterator it = names.begin(); it != names.end(); ++it) { + if (po.nonlinear_Robin) + s.sublist(std::string("SOURCE_") + *it).set("Value", 0.0); + else + s.sublist(std::string("SOURCE_") + *it).set("Type", "SIMPLE SOURCE"); + } + if (po.check_error) + for (std::size_t i = po.nonlinear_Robin ? c_name_start : 0; i < names.size(); ++i) { + const std::string err = names[i] + "_ERROR"; + s.sublist(err).set("Type", "ERROR_CALC"); + s.sublist(err).set("Field A", names[i]); + s.sublist(err).set("Field B", "EXACT"); + } + if (po.check_error) + s.sublist("EXACT").set("Type", po.nonlinear_Robin ? "EXACT nonlinear Robin" : "EXACT"); + } + + Teuchos::ParameterList user_data("User Data"); // user data can be empty here + + // setup field manager builder + ///////////////////////////////////////////////////////////// + + Teuchos::RCP fmb = + Teuchos::rcp(new panzer::FieldManagerBuilder); + fmb->setWorksetContainer(wkstContainer); + fmb->setupVolumeFieldManagers(physicsBlocks,cm_factory,closure_models,*linObjFactory,user_data); + fmb->setupBCFieldManagers(bcs,physicsBlocks,*eqset_factory,cm_factory,bc_factory,closure_models, + *linObjFactory,user_data); + fmb->writeVolumeGraphvizDependencyFiles("volume", physicsBlocks); + fmb->writeBCGraphvizDependencyFiles("bc"); + + // setup assembly engine + ///////////////////////////////////////////////////////////// + + // build assembly engine: The key piece that brings together everything and + // drives and controls the assembly process. Just add + // matrices and vectors + panzer::AssemblyEngine_TemplateManager ae_tm; + panzer::AssemblyEngine_TemplateBuilder builder(fmb,linObjFactory); + ae_tm.buildObjects(builder); + + user_data.set("Workset Size", workset_size); + if (po.check_error) + errorResponseLibrary->buildResponseEvaluators(physicsBlocks, cm_factory, closure_models, user_data); + + // assemble and solve + ///////////////////////////////////////////////////////////// + Teuchos::RCP ep_container; + Teuchos::RCP ghost_container; + { // Some analysis and an outer iteration if necessary. + Teuchos::RCP J_fd; + assembleAndSolve(ae_tm, linObjFactory, ep_container, ghost_container, po); + + if (po.test_Jacobian) { + const double nwre = testJacobian(ae_tm, linObjFactory, ep_container->get_x()); + out << "TEST JACOBIAN " << nwre << "\n"; + if (nwre < 0 || nwre > 1e-5) pass = false; + } + } + + // output data (optional) + ///////////////////////////////////////////////////////////// + + // write linear system + if (false) { + Tpetra::MatrixMarket::Writer::writeSparseFile("a_op.mm", *ep_container->get_A()); + Tpetra::MatrixMarket::Writer::writeDenseFile("x_vec.mm", *ep_container->get_x()); + Tpetra::MatrixMarket::Writer::writeDenseFile("b_vec.mm", *ep_container->get_f()); + } + + if (po.check_error) { + std::vector > > rfs(names.size()); + for (std::size_t i = po.nonlinear_Robin ? c_name_start : 0; i < names.size(); ++i) { + Teuchos::RCP + resp = errorResponseLibrary->getResponse(names[i] + " L2 Error"); + rfs[i] = Teuchos::rcp_dynamic_cast >(resp); + Teuchos::RCP > respVec = Thyra::createMember(rfs[i]->getVectorSpace()); + rfs[i]->setVector(respVec); + } + + panzer::AssemblyEngineInArgs respInput(ghost_container, ep_container); + respInput.alpha = 0; + respInput.beta = 1; + errorResponseLibrary->addResponsesToInArgs(respInput); + errorResponseLibrary->evaluate(respInput); + + // Record a max error so we can use convergence_rate.py. + double max_err = -1; + for (std::size_t i = po.nonlinear_Robin ? c_name_start : 0; i < names.size(); ++i) { + const double err = sqrt(rfs[i]->value); + max_err = std::max(max_err, err); + out << names[i] << " ERROR = " << err << "\n"; + if (err < 0 || err > (po.nonlinear_Robin ? 1e-10 : 0.03/(po.nxelem*po.nxelem/25.0))) + pass = false; + } + out << "Error = " << max_err << "\n"; + } + + // Write solution except in the special case of a generated 3D mesh and #rank + // > 1. In that case, something in the mesh-gen and rebalance code is causing + // a failure in IossBridge::write_side_data_to_ioss. + /* + + NOTE: Refactor to tpetra: there are no coresponding functions + for tpetra for write_solution_data(). The "output.exo" file is + not used in testing, so maybe it was only used for visualization + during debugging? Leaving this section here but commenting out. + + if ( ! (po.is3d && mpiSession.getNProc() > 1 && po.mesh_filename.empty())) { + // redistribute solution vector to ghosted vector + linObjFactory->globalToGhostContainer(*ep_container,*ghost_container, + panzer::EpetraLinearObjContainer::X + | panzer::EpetraLinearObjContainer::DxDt); + + // get X Epetra_Vector from ghosted container + RCP ep_ghost_container = + rcp_dynamic_cast(ghost_container); + panzer_stk::write_solution_data(*dofManager,*mesh,*ep_ghost_container->get_x()); + mesh->writeToExodus("output.exo"); + } + */ + // all done! + ///////////////////////////////////////////////////////////// + out << (pass ? "PASS" : "FAIL") << " BASICS\n"; + } + catch (std::exception& e) { + std::cout << "*********** Caught Exception: Begin Error Report ***********" << std::endl; + std::cout << e.what() << std::endl; + std::cout << "************ Caught Exception: End Error Report ************" << std::endl; + status = -1; + } + catch (std::string& msg) { + std::cout << "*********** Caught Exception: Begin Error Report ***********" << std::endl; + std::cout << msg << std::endl; + std::cout << "************ Caught Exception: End Error Report ************" << std::endl; + status = -1; + } + catch (char* msg) { + std::cout << "*********** Caught Exception: Begin Error Report ***********" << std::endl; + std::cout << *msg << std::endl; + std::cout << "************ Caught Exception: End Error Report ************" << std::endl; + status = -1; + } + catch (...) { + std::cout << "*********** Caught Exception: Begin Error Report ***********" << std::endl; + std::cout << "Caught UNKOWN exception" << std::endl; + std::cout << "************ Caught Exception: End Error Report ************" << std::endl; + status = -1; + } + + Kokkos::finalize(); + + return status; +} + +void testInitialization(const Teuchos::RCP& ipb, std::vector& bcs, + const ProblemOptions& po) +{ + const char* const pb_strings[2] = {"Poisson Physics Left", "Poisson Physics Right"}; + const double dleft = 0.5, dright = -0.3; + size_t bc_id = 0; + + { // A discontinuous field with matching value (in a weak sense) and + // derivative at the interface. + for (int i = 0; i < 2; ++i) { + Teuchos::ParameterList& p = ipb->sublist(pb_strings[i]).sublist("Equation Set 1"); + p.set("Type", "Poisson"); + p.set("Model ID", "solid"); + p.set("Basis Type", "HGrad"); + p.set("Basis Order", 1); + p.set("Integration Order", po.integration_order); + p.set("DOF Name", strint(po.dof_names[0], i+1)); + } + + const std::string t1_name = strint(po.dof_names[0], 1), t2_name = strint(po.dof_names[0], 2); + { + panzer::BCType bctype = panzer::BCT_Dirichlet; + std::string sideset_id = po.ss_names[0]; + std::string element_block_id = po.eb_names[0]; + std::string dof_name = t1_name; + std::string strategy = "Constant"; + double value = dleft; + Teuchos::ParameterList p; + p.set("Value",value); + panzer::BC bc(bc_id++, bctype, sideset_id, element_block_id, dof_name, strategy, p); + bcs.push_back(bc); + } + { + panzer::BCType bctype = panzer::BCT_Dirichlet; + std::string sideset_id = po.ss_names[2]; + std::string element_block_id = po.eb_names[1]; + std::string dof_name = t2_name; + std::string strategy = "Constant"; + double value = dright; + Teuchos::ParameterList p; + p.set("Value",value); + panzer::BC bc(bc_id++, bctype, sideset_id, element_block_id, dof_name, strategy, p); + bcs.push_back(bc); + } + + // There is no reason to turn off either of these, but in early development + // it was useful. + const bool + neumann_match = 1, + weak_dirichlet_match = 1; + + if (neumann_match) { + Teuchos::ParameterList p; + p.set("Type", "Interface"); + p.set("Sideset ID", po.ss_names[1]); + p.set("Element Block ID" , po.eb_names[0]); + p.set("Element Block ID2", po.eb_names[1]); + p.set("Equation Set Name" , t1_name); + p.set("Equation Set Name2", t2_name); + p.set("Strategy", "Neumann Match Interface"); + bcs.push_back(panzer::BC(bc_id++, p)); + } else { + panzer::BCType bctype = panzer::BCT_Dirichlet; + std::string sideset_id = po.ss_names[1]; + std::string element_block_id = po.eb_names[0]; + std::string dof_name = t1_name; + std::string strategy = "Constant"; + double value = -0.4; + Teuchos::ParameterList p; + p.set("Value",value); + panzer::BC bc(bc_id++, bctype, sideset_id, element_block_id, dof_name, strategy, p); + bcs.push_back(bc); + } + + if (weak_dirichlet_match) { + Teuchos::ParameterList p; + p.set("Type", "Interface"); + p.set("Sideset ID", po.ss_names[1]); + p.set("Element Block ID" , po.eb_names[1]); + p.set("Element Block ID2", po.eb_names[0]); + p.set("Equation Set Name" , t2_name); + p.set("Equation Set Name2", t1_name); + p.set("Strategy", "Weak Dirichlet Match Interface"); + bcs.push_back(panzer::BC(bc_id++, p)); + } else { + panzer::BCType bctype = panzer::BCT_Dirichlet; + std::string sideset_id = po.ss_names[1]; + std::string element_block_id = po.eb_names[1]; + std::string dof_name = t2_name; + std::string strategy = "Constant"; + double value = 0.4; + Teuchos::ParameterList p; + p.set("Value",value); + panzer::BC bc(bc_id++, bctype, sideset_id, element_block_id, dof_name, strategy, p); + bcs.push_back(bc); + } + } + + { // A field that is continuous across the interface. It has 1 DOF per + // interface node. + for (int ipbs = 0; ipbs < 2; ++ipbs) { + Teuchos::ParameterList& p = ipb->sublist(pb_strings[ipbs]).sublist("Equation Set 2"); + p.set("Type","Poisson"); + p.set("Model ID","solid"); + p.set("Basis Type","HGrad"); + p.set("Basis Order",1); + p.set("Integration Order",po.integration_order); + p.set("DOF Name", po.dof_names[1]); + } + { + panzer::BCType bctype = panzer::BCT_Dirichlet; + std::string sideset_id = po.ss_names[0]; + std::string element_block_id = po.eb_names[0]; + std::string dof_name = po.dof_names[1]; + std::string strategy = "Constant"; + double value = dleft; + Teuchos::ParameterList p; + p.set("Value", value); + panzer::BC bc(bc_id++, bctype, sideset_id, element_block_id, dof_name, strategy, p); + bcs.push_back(bc); + } + { + panzer::BCType bctype = panzer::BCT_Dirichlet; + std::string sideset_id = po.ss_names[2]; + std::string element_block_id = po.eb_names[1]; + std::string dof_name = po.dof_names[1]; + std::string strategy = "Constant"; + double value = dright; + Teuchos::ParameterList p; + p.set("Value",value); + panzer::BC bc(bc_id++, bctype, sideset_id, element_block_id, dof_name, strategy, p); + bcs.push_back(bc); + } + } + + if (po.dof_names.size() >= 3) { + // Another discontinuous field that will couple to the continuous field at + // the interface. + for (int i = 0; i < 2; ++i) { + Teuchos::ParameterList& p = ipb->sublist(pb_strings[i]).sublist("Equation Set 3"); + p.set("Type", "Poisson"); + p.set("Model ID", "solid"); + p.set("Basis Type", "HGrad"); + p.set("Basis Order", 1); + p.set("Integration Order", po.integration_order); + p.set("DOF Name", strint(po.dof_names[2], i+1)); + } + + const std::string t1_name = strint(po.dof_names[2], 1), t2_name = strint(po.dof_names[2], 2); + { + panzer::BCType bctype = panzer::BCT_Dirichlet; + std::string sideset_id = po.ss_names[0]; + std::string element_block_id = po.eb_names[0]; + std::string dof_name = t1_name; + std::string strategy = "Constant"; + double value = dleft; + Teuchos::ParameterList p; + p.set("Value",value); + panzer::BC bc(bc_id++, bctype, sideset_id, element_block_id, dof_name, strategy, p); + bcs.push_back(bc); + } + { + panzer::BCType bctype = panzer::BCT_Dirichlet; + std::string sideset_id = po.ss_names[2]; + std::string element_block_id = po.eb_names[1]; + std::string dof_name = t2_name; + std::string strategy = "Constant"; + double value = dright; + Teuchos::ParameterList p; + p.set("Value",value); + panzer::BC bc(bc_id++, bctype, sideset_id, element_block_id, dof_name, strategy, p); + bcs.push_back(bc); + } + + for (int ibc = 0; ibc < 2; ++ibc) { + Teuchos::ParameterList p; + p.set("Type", "Interface"); + p.set("Sideset ID", po.ss_names[1]); + p.set("Element Block ID" , po.eb_names[ibc]); + p.set("Element Block ID2", po.eb_names[(ibc + 1) % 2]); + p.set("Equation Set Name" , ibc == 0 ? t1_name : t2_name); + p.set("Equation Set Name2", ibc == 0 ? t2_name : t1_name); + p.set("Strategy", "Robin Interface"); + Teuchos::ParameterList d; + d.set("Coupling DOF Name", po.dof_names[1]); + if (po.nonlinear_Robin) { + // There's no real meaning to these cofficients; I just solved for them + // to get the solution I want. + const double c[] = {1.1, 0.1, 1.66}; + d.set("a", c[0]); + d.set("b", c[1]); + d.set("c", c[2]); + } else { + const double c[] = {1, -1, 1}; + d.set("a", c[0]); + // Switch the two so that the same coefficients are applied to C_left and + // C_right. Switch sign since the normal has opposite direction. + d.set("b", (ibc == 0 ? c[1] : -c[2])); + d.set("c", (ibc == 0 ? c[2] : -c[1])); + }; + d.set("Nonlinear", po.nonlinear_Robin); + p.set("Data", d); + bcs.push_back(panzer::BC(bc_id++, p)); + } + } +} diff --git a/packages/panzer/adapters-stk/example/PoissonInterfaceTpetra/twoblock.exo b/packages/panzer/adapters-stk/example/PoissonInterfaceTpetra/twoblock.exo new file mode 100644 index 000000000000..6c00e419a687 Binary files /dev/null and b/packages/panzer/adapters-stk/example/PoissonInterfaceTpetra/twoblock.exo differ diff --git a/packages/panzer/adapters-stk/example/PoissonInterfaceTpetra/twoblock.jou b/packages/panzer/adapters-stk/example/PoissonInterfaceTpetra/twoblock.jou new file mode 100644 index 000000000000..d092631e5833 --- /dev/null +++ b/packages/panzer/adapters-stk/example/PoissonInterfaceTpetra/twoblock.jou @@ -0,0 +1,48 @@ +## /home/sdbond/software/Cubit-14.1/bin/clarox +## Cubit Version 14.1 +## Cubit Build 393673 +## Revised 2014-08-11 09:13:47 -0600 (Mon, 11 Aug 2014) +## Running 09/25/2015 01:18:01 PM +## Command Options: +## -warning = On +## -information = On +undo on +set geometry engine acis +set default element hex +brick x 0.5 y 1 z 1 +brick x 0.5 y 1 z 1 +move volume 2 x 0.5 include_merged +merge all +surface 6 size 0.2 +surface 6 size 0.1 +surface 6 size 0.2 +surface 6 size 0.25 +surface 6 size 0.1 +mesh surface 6 +mesh volume 1 2 +sideset 1 surface 4 forward +sideset 2 surface 12 forward +sideset 3 surface 3 9 forward +sideset 4 surface 5 11 forward +sideset 5 surface 2 8 forward +sideset 6 surface 1 7 forward +sideset 7 surface 6 forward +sideset 1 name "left" +sideset 2 name "right" +sideset 3 name "bottom" +sideset 4 name "top" +sideset 5 name "back" +sideset 6 name "front" +sideset 7 name "vertical_0" +create block 1 +set duplicate block elements off +block 1 volume 1 +set duplicate block elements off +block 2 volume 2 +block 1 name "eblock-0_0_0" +block 2 name "eblock-1_0_0" +save as "/home/sdbond/trilinos/Trilinos/packages/panzer/adapters/stk/example/PoissonInterfaceExample/twoblock.cub" overwrite +undo group begin +set large exodus file off +export mesh "/home/sdbond/trilinos/Trilinos/packages/panzer/adapters/stk/example/PoissonInterfaceExample/twoblock.exo" dimension 3 overwrite +undo group end diff --git a/packages/panzer/adapters-stk/src/Panzer_STK_ModelEvaluatorFactory_impl.hpp b/packages/panzer/adapters-stk/src/Panzer_STK_ModelEvaluatorFactory_impl.hpp index c7bfcc5b34ae..65b82f6ec08a 100644 --- a/packages/panzer/adapters-stk/src/Panzer_STK_ModelEvaluatorFactory_impl.hpp +++ b/packages/panzer/adapters-stk/src/Panzer_STK_ModelEvaluatorFactory_impl.hpp @@ -426,8 +426,15 @@ namespace panzer_stk { std::string loadBalanceString = ""; // what is the load balancing information bool blockedAssembly = false; + const bool has_interface_condition = hasInterfaceCondition(bcs); + if(panzer::BlockedDOFManagerFactory::requiresBlocking(field_order) && !useTpetra) { + // Can't yet handle interface conditions for this system + TEUCHOS_TEST_FOR_EXCEPTION(has_interface_condition, + Teuchos::Exceptions::InvalidParameter, + "ERROR: Blocked Epetra systems cannot handle interface conditions."); + // use a blocked DOF manager blockedAssembly = true; @@ -467,6 +474,11 @@ namespace panzer_stk { } else if(panzer::BlockedDOFManagerFactory::requiresBlocking(field_order) && useTpetra) { + // Can't yet handle interface conditions for this system + TEUCHOS_TEST_FOR_EXCEPTION(has_interface_condition, + Teuchos::Exceptions::InvalidParameter, + "ERROR: Blocked Tpetra system cannot handle interface conditions."); + // use a blocked DOF manager blockedAssembly = true; @@ -506,6 +518,10 @@ namespace panzer_stk { loadBalanceString = printUGILoadBalancingInformation(*dofManager); } else if(useTpetra) { + + if (has_interface_condition) + buildInterfaceConnections(bcs, conn_manager); + // use a flat DOF manager TEUCHOS_ASSERT(!use_dofmanager_fei); @@ -516,6 +532,9 @@ namespace panzer_stk { = globalIndexerFactory.buildGlobalIndexer(mpi_comm->getRawMpiComm(),physicsBlocks,conn_manager,field_order); globalIndexer = dofManager; + if (has_interface_condition) + checkInterfaceConnections(conn_manager, dofManager->getComm()); + TEUCHOS_ASSERT(!useDiscreteAdjoint); // safety check linObjFactory = Teuchos::rcp(new panzer::TpetraLinearObjFactory(mpi_comm,dofManager)); @@ -523,7 +542,7 @@ namespace panzer_stk { loadBalanceString = printUGILoadBalancingInformation(*dofManager); } else { - const bool has_interface_condition = hasInterfaceCondition(bcs); + if (has_interface_condition) buildInterfaceConnections(bcs, conn_manager); diff --git a/packages/panzer/disc-fe/src/Panzer_AssemblyEngine_impl.hpp b/packages/panzer/disc-fe/src/Panzer_AssemblyEngine_impl.hpp index 88cbdf32e205..ac9ccd8d402d 100644 --- a/packages/panzer/disc-fe/src/Panzer_AssemblyEngine_impl.hpp +++ b/packages/panzer/disc-fe/src/Panzer_AssemblyEngine_impl.hpp @@ -356,13 +356,19 @@ evaluateBCs(const panzer::BCType bc_type, if (bc.bcType() == bc_type) { std::ostringstream timerName; timerName << "panzer::AssemblyEngine::evaluateBCs: " << bc.identifier(); - PANZER_FUNC_TIME_MONITOR_DIFF(timerName.str(),eval_BCs); +#ifdef PANZER_TEUCHOS_TIME_MONITOR + auto timer1 = Teuchos::TimeMonitor::getNewTimer(timerName.str()); + Teuchos::TimeMonitor tm1(*timer1); +#endif // Loop over local faces for (std::map >::const_iterator side = bc_fm.begin(); side != bc_fm.end(); ++side) { std::ostringstream timerSideName; timerSideName << "panzer::AssemblyEngine::evaluateBCs: " << bc.identifier() << ", side=" << side->first; - PANZER_FUNC_TIME_MONITOR_DIFF(timerSideName.str(),Side); +#ifdef PANZER_TEUCHOS_TIME_MONITOR + auto timer2 = Teuchos::TimeMonitor::getNewTimer(timerSideName.str()); + Teuchos::TimeMonitor tm2(*timer2); +#endif // extract field manager for this side unsigned local_side_index = side->first; diff --git a/packages/panzer/disc-fe/src/Panzer_BC.cpp b/packages/panzer/disc-fe/src/Panzer_BC.cpp index fdc1fb10e92a..60995bb265ca 100644 --- a/packages/panzer/disc-fe/src/Panzer_BC.cpp +++ b/packages/panzer/disc-fe/src/Panzer_BC.cpp @@ -269,7 +269,7 @@ void panzer::BC::print(std::ostream& os) const os << "panzer::BC" << endl; - os << " BC ID =" << m_bc_id << endl; + os << " BC ID = " << m_bc_id << endl; std::string type; if (m_bc_type == BCT_Dirichlet) @@ -282,6 +282,7 @@ void panzer::BC::print(std::ostream& os) const type = "Neumann"; os << " Type = " << type << endl; + os << " Identifier = " << identifier() << endl; os << " Side Set ID = " << m_sideset_id << endl; os << " Element Block ID = " << m_element_block_id << endl; if (m_bc_type == BCT_Interface) diff --git a/packages/panzer/disc-fe/src/Panzer_PhysicsBlock.cpp b/packages/panzer/disc-fe/src/Panzer_PhysicsBlock.cpp index 8373c440a848..ab9b228767c5 100644 --- a/packages/panzer/disc-fe/src/Panzer_PhysicsBlock.cpp +++ b/packages/panzer/disc-fe/src/Panzer_PhysicsBlock.cpp @@ -454,14 +454,15 @@ buildAndRegisterGatherAndOrientationEvaluators(PHX::FieldManager // Loop over equation set template managers vector< RCP > >::const_iterator eq_set = m_equation_sets.begin(); - int idx = 0; - for (;eq_set != m_equation_sets.end(); ++eq_set,++idx) { - if (m_active_evaluation_types[idx]) { - // Loop over evaluation types - EquationSet_TemplateManager eqstm = *(*eq_set); - EquationSet_TemplateManager::iterator eval_type = - eqstm.begin(); - for (; eval_type != eqstm.end(); ++eval_type) { + for (;eq_set != m_equation_sets.end(); ++eq_set) { + + // Loop over evaluation types + EquationSet_TemplateManager eqstm = *(*eq_set); + EquationSet_TemplateManager::iterator eval_type = + eqstm.begin(); + int idx = 0; + for (; eval_type != eqstm.end(); ++eval_type,++idx) { + if (m_active_evaluation_types[idx]) { const int di = eval_type->setDetailsIndex(this->getDetailsIndex()); eval_type->buildAndRegisterGatherAndOrientationEvaluators(fm, *m_field_lib, lof, user_data); eval_type->setDetailsIndex(di); diff --git a/packages/panzer/disc-fe/src/evaluators/Panzer_GatherSolution_Epetra_impl.hpp b/packages/panzer/disc-fe/src/evaluators/Panzer_GatherSolution_Epetra_impl.hpp index 25b4cbc891af..4d9dd12ad4a8 100644 --- a/packages/panzer/disc-fe/src/evaluators/Panzer_GatherSolution_Epetra_impl.hpp +++ b/packages/panzer/disc-fe/src/evaluators/Panzer_GatherSolution_Epetra_impl.hpp @@ -132,8 +132,7 @@ GatherSolution_Epetra( string firstName(""); if (numFields > 0) firstName = names[0]; - string n("GatherSolution (Epetra): " + firstName + " (" + - print() + ")"); + string n("GatherSolution (Epetra): " + firstName + " (Residual)"); this->setName(n); } // end of Initializing Constructor (Residual Specialization) @@ -624,7 +623,7 @@ GatherSolution_Epetra( firstName = names[0]; if (disableSensitivities_) n += ", No Sensitivities"; - n += "): " + firstName + " (" + print() + ")"; + n += "): " + firstName + " (Jacobian)"; this->setName(n); } // end of Initializing Constructor (Jacobian Specialization) @@ -854,6 +853,7 @@ evaluateFields( { // Seed the FAD object. int offset(elmtOffset[basis]); + field(cell, basis).fastAccessDx(dos + offset) = seedValue; } // end loop over the basis functions } // end loop over localCellIds diff --git a/packages/panzer/disc-fe/src/evaluators/Panzer_GatherSolution_Tpetra_decl.hpp b/packages/panzer/disc-fe/src/evaluators/Panzer_GatherSolution_Tpetra_decl.hpp index c12eb57139c3..c96b2cf64030 100644 --- a/packages/panzer/disc-fe/src/evaluators/Panzer_GatherSolution_Tpetra_decl.hpp +++ b/packages/panzer/disc-fe/src/evaluators/Panzer_GatherSolution_Tpetra_decl.hpp @@ -272,6 +272,7 @@ class GatherSolution_Tpetra Kokkos::View offsets; // how to get a particular field Kokkos::View x_data; double seed_value; // AD seed information + int dos; // Offset for special interface bc // output fields PHX::MDField field; diff --git a/packages/panzer/disc-fe/src/evaluators/Panzer_GatherSolution_Tpetra_impl.hpp b/packages/panzer/disc-fe/src/evaluators/Panzer_GatherSolution_Tpetra_impl.hpp index 6f1e61acc202..ed52d9fc288a 100644 --- a/packages/panzer/disc-fe/src/evaluators/Panzer_GatherSolution_Tpetra_impl.hpp +++ b/packages/panzer/disc-fe/src/evaluators/Panzer_GatherSolution_Tpetra_impl.hpp @@ -435,7 +435,7 @@ GatherSolution_Tpetra( this->setName(n); } else { - std::string n = "GatherSolution (Tpetra): "+firstName+" ("+PHX::print()+") "; + std::string n = "GatherSolution (Tpetra): "+firstName+" (Jacobian) "; this->setName(n); } } @@ -575,6 +575,16 @@ evaluateFields(typename TRAITS::EvalData workset) if(!applySensitivities_) seed_value = 0.0; + // Interface worksets handle DOFs from two element blocks. The + // derivative offset for the other element block must be shifted by + // the derivative side of my element block. + functor_data.dos = 0; + if (this->wda.getDetailsIndex() == 1) + { + // Get the DOF count for my element block. + functor_data.dos = globalIndexer_->getElementBlockGIDCount(workset.details(0).block_id); + } + // switch to a faster assembly bool use_seed = true; if(seed_value==0.0) @@ -616,8 +626,12 @@ operator()(const int worksetCellIndex) const LO lid = functor_data.lids(worksetCellIndex,offset); // set the value and seed the FAD object - functor_data.field(worksetCellIndex,basis).val() = functor_data.x_data(lid,0); - functor_data.field(worksetCellIndex,basis).fastAccessDx(offset) = functor_data.seed_value; + if (functor_data.dos == 0) + functor_data.field(worksetCellIndex,basis).val() = functor_data.x_data(lid,0); + else // Interface conditions need to zero out derivative array + functor_data.field(worksetCellIndex,basis) = ScalarT(functor_data.x_data(lid,0)); + + functor_data.field(worksetCellIndex,basis).fastAccessDx(functor_data.dos + offset) = functor_data.seed_value; } } diff --git a/packages/panzer/disc-fe/src/evaluators/Panzer_ScatterDirichletResidual_BlockedTpetra_impl.hpp b/packages/panzer/disc-fe/src/evaluators/Panzer_ScatterDirichletResidual_BlockedTpetra_impl.hpp index 62a3058352f4..dc92d856d758 100644 --- a/packages/panzer/disc-fe/src/evaluators/Panzer_ScatterDirichletResidual_BlockedTpetra_impl.hpp +++ b/packages/panzer/disc-fe/src/evaluators/Panzer_ScatterDirichletResidual_BlockedTpetra_impl.hpp @@ -495,7 +495,7 @@ evaluateFields(typename TRAITS::EvalData workset) // on host and then deep_copy to device. The sub-blocks are // unmanaged since they are allocated and ref counted separately on // host. - using LocalMatrixType = KokkosSparse::CrsMatrix>; + using LocalMatrixType = KokkosSparse::CrsMatrix, size_t>; typename Kokkos::View::HostMirror hostJacTpetraBlocks("panzer::ScatterResidual_BlockTpetra::hostJacTpetraBlocks", numFieldBlocks,numFieldBlocks); diff --git a/packages/panzer/disc-fe/src/evaluators/Panzer_ScatterResidual_BlockedTpetra_impl.hpp b/packages/panzer/disc-fe/src/evaluators/Panzer_ScatterResidual_BlockedTpetra_impl.hpp index 4cd61036333a..212deed6f8a9 100644 --- a/packages/panzer/disc-fe/src/evaluators/Panzer_ScatterResidual_BlockedTpetra_impl.hpp +++ b/packages/panzer/disc-fe/src/evaluators/Panzer_ScatterResidual_BlockedTpetra_impl.hpp @@ -379,7 +379,7 @@ evaluateFields(typename TRAITS::EvalData workset) // on host and then deep_copy to device. The sub-blocks are // unmanaged since they are allocated and ref counted separately on // host. - using LocalMatrixType = KokkosSparse::CrsMatrix>; + using LocalMatrixType = KokkosSparse::CrsMatrix, size_t>; typename Kokkos::View::HostMirror hostJacTpetraBlocks("panzer::ScatterResidual_BlockTpetra::hostJacTpetraBlocks", numFieldBlocks,numFieldBlocks); diff --git a/packages/panzer/disc-fe/src/evaluators/Panzer_ScatterResidual_Epetra_impl.hpp b/packages/panzer/disc-fe/src/evaluators/Panzer_ScatterResidual_Epetra_impl.hpp index b82c90530075..6f0343d6d871 100644 --- a/packages/panzer/disc-fe/src/evaluators/Panzer_ScatterResidual_Epetra_impl.hpp +++ b/packages/panzer/disc-fe/src/evaluators/Panzer_ScatterResidual_Epetra_impl.hpp @@ -74,24 +74,24 @@ ScatterResidual_Epetra(const Teuchos::RCP & indexer const Teuchos::RCP & /* cIndexer */, const Teuchos::ParameterList& p, bool useDiscreteAdjoint) - : globalIndexer_(indexer) + : globalIndexer_(indexer) , globalDataKey_("Residual Scatter Container") , useDiscreteAdjoint_(useDiscreteAdjoint) -{ +{ std::string scatterName = p.get("Scatter Name"); - scatterHolder_ = + scatterHolder_ = Teuchos::rcp(new PHX::Tag(scatterName,Teuchos::rcp(new PHX::MDALayout(0)))); // get names to be evaluated - const std::vector& names = + const std::vector& names = *(p.get< Teuchos::RCP< std::vector > >("Dependent Names")); // grab map from evaluated names to field names fieldMap_ = p.get< Teuchos::RCP< std::map > >("Dependent Map"); - Teuchos::RCP dl = + Teuchos::RCP dl = p.get< Teuchos::RCP >("Basis")->functional; - + // build the vector of fields that this is dependent on scatterFields_.resize(names.size()); for (std::size_t eq = 0; eq < names.size(); ++eq) { @@ -111,9 +111,9 @@ ScatterResidual_Epetra(const Teuchos::RCP & indexer } // ********************************************************************** -template +template void panzer::ScatterResidual_Epetra:: -postRegistrationSetup(typename TRAITS::SetupData /* d */, +postRegistrationSetup(typename TRAITS::SetupData /* d */, PHX::FieldManager& /* fm */) { fieldIds_.resize(scatterFields_.size()); @@ -132,7 +132,7 @@ preEvaluate(typename TRAITS::PreEvalData d) { // extract linear object container epetraContainer_ = Teuchos::rcp_dynamic_cast(d.gedc->getDataObject(globalDataKey_)); - + if(epetraContainer_==Teuchos::null) { // extract linear object container Teuchos::RCP loc = Teuchos::rcp_dynamic_cast(d.gedc->getDataObject(globalDataKey_),true)->getGhostedLOC(); @@ -144,12 +144,12 @@ preEvaluate(typename TRAITS::PreEvalData d) template void panzer::ScatterResidual_Epetra:: evaluateFields(typename TRAITS::EvalData workset) -{ +{ // for convenience pull out some objects from workset std::string blockId = this->wda(workset).block_id; const std::vector & localCellIds = this->wda(workset).cell_local_ids; - Teuchos::RCP r = epetraContainer_->get_f(); + Teuchos::RCP r = epetraContainer_->get_f(); // NOTE: A reordering of these loops will likely improve performance // The "getGIDFieldOffsets may be expensive. However the @@ -160,13 +160,13 @@ evaluateFields(typename TRAITS::EvalData workset) for(std::size_t worksetCellIndex=0;worksetCellIndexgetElementLIDs(cellLocalId); + auto LIDs = globalIndexer_->getElementLIDs(cellLocalId); // loop over each field to be scattered for (std::size_t fieldIndex = 0; fieldIndex < scatterFields_.size(); fieldIndex++) { int fieldNum = fieldIds_[fieldIndex]; const std::vector & elmtOffset = globalIndexer_->getGIDFieldOffsets(blockId,fieldNum); - + // loop over basis functions for(std::size_t basis=0;basis & indexer const Teuchos::RCP & /* cIndexer */, const Teuchos::ParameterList& p, bool /* useDiscreteAdjoint */) - : globalIndexer_(indexer) -{ + : globalIndexer_(indexer) +{ std::string scatterName = p.get("Scatter Name"); - scatterHolder_ = + scatterHolder_ = Teuchos::rcp(new PHX::Tag(scatterName,Teuchos::rcp(new PHX::MDALayout(0)))); // get names to be evaluated - const std::vector& names = + const std::vector& names = *(p.get< Teuchos::RCP< std::vector > >("Dependent Names")); // grab map from evaluated names to field names fieldMap_ = p.get< Teuchos::RCP< std::map > >("Dependent Map"); - Teuchos::RCP dl = + Teuchos::RCP dl = p.get< Teuchos::RCP >("Basis")->functional; - + // build the vector of fields that this is dependent on scatterFields_.resize(names.size()); for (std::size_t eq = 0; eq < names.size(); ++eq) { @@ -219,9 +219,9 @@ ScatterResidual_Epetra(const Teuchos::RCP & indexer } // ********************************************************************** -template +template void panzer::ScatterResidual_Epetra:: -postRegistrationSetup(typename TRAITS::SetupData /* d */, +postRegistrationSetup(typename TRAITS::SetupData /* d */, PHX::FieldManager& /* fm */) { fieldIds_.resize(scatterFields_.size()); @@ -240,9 +240,9 @@ preEvaluate(typename TRAITS::PreEvalData d) { using Teuchos::RCP; using Teuchos::rcp_dynamic_cast; - + // this is the list of parameters and their names that this scatter has to account for - std::vector activeParameters = + std::vector activeParameters = rcp_dynamic_cast(d.gedc->getDataObject("PARAMETER_NAMES"))->getActiveParameters(); dfdp_vectors_.clear(); @@ -256,7 +256,7 @@ preEvaluate(typename TRAITS::PreEvalData d) template void panzer::ScatterResidual_Epetra:: evaluateFields(typename TRAITS::EvalData workset) -{ +{ // for convenience pull out some objects from workset std::string blockId = this->wda(workset).block_id; const std::vector & localCellIds = this->wda(workset).cell_local_ids; @@ -270,13 +270,13 @@ evaluateFields(typename TRAITS::EvalData workset) for(std::size_t worksetCellIndex=0;worksetCellIndexgetElementLIDs(cellLocalId); + auto LIDs = globalIndexer_->getElementLIDs(cellLocalId); // loop over each field to be scattered for (std::size_t fieldIndex = 0; fieldIndex < scatterFields_.size(); fieldIndex++) { int fieldNum = fieldIds_[fieldIndex]; const std::vector & elmtOffset = globalIndexer_->getGIDFieldOffsets(blockId,fieldNum); - + // loop over basis functions for(std::size_t basis=0;basis & indexer, const Teuchos::ParameterList& p, bool useDiscreteAdjoint) : globalIndexer_(indexer) - , colGlobalIndexer_(cIndexer) + , colGlobalIndexer_(cIndexer) , globalDataKey_("Residual Scatter Container") , useDiscreteAdjoint_(useDiscreteAdjoint) -{ +{ std::string scatterName = p.get("Scatter Name"); - scatterHolder_ = + scatterHolder_ = Teuchos::rcp(new PHX::Tag(scatterName,Teuchos::rcp(new PHX::MDALayout(0)))); // get names to be evaluated - const std::vector& names = + const std::vector& names = *(p.get< Teuchos::RCP< std::vector > >("Dependent Names")); // grab map from evaluated names to field names fieldMap_ = p.get< Teuchos::RCP< std::map > >("Dependent Map"); - Teuchos::RCP dl = + Teuchos::RCP dl = p.get< Teuchos::RCP >("Basis")->functional; - + // build the vector of fields that this is dependent on scatterFields_.resize(names.size()); for (std::size_t eq = 0; eq < names.size(); ++eq) { @@ -345,7 +345,7 @@ ScatterResidual_Epetra(const Teuchos::RCP & indexer, } // ********************************************************************** -template +template void panzer::ScatterResidual_Epetra:: postRegistrationSetup(typename TRAITS::SetupData /* d */, PHX::FieldManager& /* fm */) @@ -368,7 +368,7 @@ preEvaluate(typename TRAITS::PreEvalData d) { // extract linear object container epetraContainer_ = Teuchos::rcp_dynamic_cast(d.gedc->getDataObject(globalDataKey_)); - + if(epetraContainer_==Teuchos::null) { // extract linear object container Teuchos::RCP loc = Teuchos::rcp_dynamic_cast(d.gedc->getDataObject(globalDataKey_),true)->getGhostedLOC(); @@ -380,7 +380,7 @@ preEvaluate(typename TRAITS::PreEvalData d) template void panzer::ScatterResidual_Epetra:: evaluateFields(typename TRAITS::EvalData workset) -{ +{ std::vector jacRow; bool useColumnIndexer = colGlobalIndexer_!=Teuchos::null; @@ -389,12 +389,12 @@ evaluateFields(typename TRAITS::EvalData workset) std::string blockId = this->wda(workset).block_id; const std::vector & localCellIds = this->wda(workset).cell_local_ids; - Teuchos::RCP r = epetraContainer_->get_f(); + Teuchos::RCP r = epetraContainer_->get_f(); Teuchos::RCP Jac = epetraContainer_->get_A(); const Teuchos::RCP& colGlobalIndexer = useColumnIndexer ? colGlobalIndexer_ : globalIndexer_; - + // NOTE: A reordering of these loops will likely improve performance // The "getGIDFieldOffsets" may be expensive. However the // "getElementGIDs" can be cheaper. However the lookup for LIDs @@ -404,7 +404,7 @@ evaluateFields(typename TRAITS::EvalData workset) for(std::size_t worksetCellIndex=0;worksetCellIndexgetElementLIDs(cellLocalId); + auto rLIDs = globalIndexer_->getElementLIDs(cellLocalId); auto initial_cLIDs = colGlobalIndexer->getElementLIDs(cellLocalId); std::vector cLIDs; for (int i(0); i < static_cast(initial_cLIDs.extent(0)); ++i) @@ -426,16 +426,16 @@ evaluateFields(typename TRAITS::EvalData workset) const ScalarT scatterField = (scatterFields_[fieldIndex])(worksetCellIndex,rowBasisNum); int rowOffset = elmtOffset[rowBasisNum]; int row = rLIDs[rowOffset]; - + // Sum residual if(r!=Teuchos::null) r->SumIntoMyValue(row,0,scatterField.val()); - + // Sum Jacobian if(useDiscreteAdjoint_) { // loop over the sensitivity indices: all DOFs on a cell jacRow.resize(scatterField.size()); - + for(int sensIndex=0;sensIndex(scatterField.size())), scatterField.dx(), panzer::ptrFromStlVector(cLIDs)); + TEUCHOS_ASSERT_EQUALITY(err,0); } } // end rowBasisNum diff --git a/packages/panzer/disc-fe/src/evaluators/Panzer_ScatterResidual_Tpetra_decl.hpp b/packages/panzer/disc-fe/src/evaluators/Panzer_ScatterResidual_Tpetra_decl.hpp index a70a1765fd11..186ccb9158b4 100644 --- a/packages/panzer/disc-fe/src/evaluators/Panzer_ScatterResidual_Tpetra_decl.hpp +++ b/packages/panzer/disc-fe/src/evaluators/Panzer_ScatterResidual_Tpetra_decl.hpp @@ -246,6 +246,9 @@ class ScatterResidual_Tpetra Kokkos::View scratch_lids_; std::vector > scratch_offsets_; + + int my_derivative_size_; + int other_derivative_size_; }; } diff --git a/packages/panzer/disc-fe/src/evaluators/Panzer_ScatterResidual_Tpetra_impl.hpp b/packages/panzer/disc-fe/src/evaluators/Panzer_ScatterResidual_Tpetra_impl.hpp index 43dc1d328d36..ad8e9624caa6 100644 --- a/packages/panzer/disc-fe/src/evaluators/Panzer_ScatterResidual_Tpetra_impl.hpp +++ b/packages/panzer/disc-fe/src/evaluators/Panzer_ScatterResidual_Tpetra_impl.hpp @@ -221,7 +221,7 @@ preEvaluate(typename TRAITS::PreEvalData d) typedef TpetraLinearObjContainer LOC; // this is the list of parameters and their names that this scatter has to account for - std::vector activeParameters = + std::vector activeParameters = rcp_dynamic_cast(d.gedc->getDataObject("PARAMETER_NAMES"))->getActiveParameters(); dfdp_vectors_.clear(); @@ -280,6 +280,8 @@ ScatterResidual_Tpetra(const Teuchos::RCP & indexer, const Teuchos::ParameterList& p) : globalIndexer_(indexer) , globalDataKey_("Residual Scatter Container") + , my_derivative_size_(0) + , other_derivative_size_(0) { std::string scatterName = p.get("Scatter Name"); scatterHolder_ = @@ -338,8 +340,13 @@ postRegistrationSetup(typename TRAITS::SetupData d, scratch_offsets_[fd](i) = offsets[i]; } + my_derivative_size_ = globalIndexer_->getElementBlockGIDCount(blockId); + if (Teuchos::nonnull(workset_0.other)) { + auto otherBlockId = workset_0.other->block_id; + other_derivative_size_ = globalIndexer_->getElementBlockGIDCount(otherBlockId); + } scratch_lids_ = Kokkos::View("lids",scatterFields_[0].extent(0), - globalIndexer_->getElementBlockGIDCount(blockId)); + my_derivative_size_ + other_derivative_size_); } // ********************************************************************** @@ -481,7 +488,18 @@ evaluateFields(typename TRAITS::EvalData workset) Teuchos::RCP r = tpetraContainer_->get_f(); Teuchos::RCP Jac = tpetraContainer_->get_A(); - globalIndexer_->getElementLIDs(this->wda(workset).cell_local_ids_k,scratch_lids_); + // Cache scratch lids. For interface bc problems the derivative + // dimension extent spans two cells. Use subviews to get the self + // lids and the other lids. + if (Teuchos::nonnull(workset.other)) { + auto my_scratch_lids = Kokkos::subview(scratch_lids_,Kokkos::ALL,std::make_pair(0,my_derivative_size_)); + globalIndexer_->getElementLIDs(this->wda(workset).cell_local_ids_k,my_scratch_lids); + auto other_scratch_lids = Kokkos::subview(scratch_lids_,Kokkos::ALL,std::make_pair(my_derivative_size_,my_derivative_size_ + other_derivative_size_)); + globalIndexer_->getElementLIDs(workset.other->cell_local_ids_k,other_scratch_lids); + } + else { + globalIndexer_->getElementLIDs(this->wda(workset).cell_local_ids_k,scratch_lids_); + } ScatterResidual_Jacobian_Functor functor; functor.fillResidual = (r!=Teuchos::null); @@ -497,6 +515,7 @@ evaluateFields(typename TRAITS::EvalData workset) Kokkos::parallel_for(workset.num_cells,functor); } + } // ********************************************************************** diff --git a/packages/phalanx/src/Phalanx_DAG_Manager.hpp b/packages/phalanx/src/Phalanx_DAG_Manager.hpp index df9bfe00908f..aa4199009a57 100644 --- a/packages/phalanx/src/Phalanx_DAG_Manager.hpp +++ b/packages/phalanx/src/Phalanx_DAG_Manager.hpp @@ -41,7 +41,6 @@ // ************************************************************************ // @HEADER - #ifndef PHX_DAG_MANAGER_HPP #define PHX_DAG_MANAGER_HPP @@ -173,17 +172,25 @@ namespace PHX { */ const std::vector>& getFieldTags(); + /// Returns true if sortAndOrderEvaluators has been called. bool sortingCalled() const; + /// Write the DAG to file in graphviz/dot format. This is the deprecated version. void writeGraphvizFile(const std::string filename, bool writeEvaluatedFields, bool writeDependentFields, bool debugRegisteredEvaluators) const; + /// Write the DAG to file in graphviz/dot format. void writeGraphvizFileNew(const std::string filename, bool writeEvaluatedFields, bool writeDependentFields) const; + /// Write the DAG to std::ostream in graphviz/dot format. + void writeGraphviz(std::ostream& os, + bool writeEvaluatedFields, + bool writeDependentFields) const; + //! Printing void print(std::ostream& os) const; diff --git a/packages/phalanx/src/Phalanx_DAG_Manager_Def.hpp b/packages/phalanx/src/Phalanx_DAG_Manager_Def.hpp index 37bfa914a46a..77d276de1659 100644 --- a/packages/phalanx/src/Phalanx_DAG_Manager_Def.hpp +++ b/packages/phalanx/src/Phalanx_DAG_Manager_Def.hpp @@ -208,31 +208,43 @@ sortAndOrderEvaluators() int time = 0; for (const auto& req_field : required_fields_) { - // Look in evaluated fields + // Look in evaluated fields first auto node_index_it = field_to_node_index_.find(req_field->identifier()); - if (node_index_it == field_to_node_index_.end()) { + if (node_index_it != field_to_node_index_.end()) { + auto& node = nodes_[node_index_it->second]; + if (node.color() == PHX::Color::WHITE) + dfsVisit(node,time); + } - // If failed to find, look in contributed fields - auto contrib_field_search = contributed_field_to_node_index_.find(req_field->identifier()); - if (contrib_field_search == contributed_field_to_node_index_.end()) { + // Add in contributed fields for this tag. There could be multiple + // contrib or we may not have found any evaluated fields for this + // tag if they are all contributed. + auto contrib_field_search = contributed_field_to_node_index_.find(req_field->identifier()); + if (contrib_field_search != contributed_field_to_node_index_.end()) { + const auto& node_list_to_add = contrib_field_search->second; + for (auto node_index : node_list_to_add) { + auto& node = nodes_[node_index]; + if (node.color() == PHX::Color::WHITE) + dfsVisit(node,time); + } + } - if (write_graphviz_file_on_error_) - this->writeGraphvizFileNew(graphviz_filename_for_errors_, true, true); + // If no evaluated or contrib found, error out. + if ( (node_index_it == field_to_node_index_.end()) && + (contrib_field_search == contributed_field_to_node_index_.end()) ) { - TEUCHOS_TEST_FOR_EXCEPTION(node_index_it == field_to_node_index_.end(), - PHX::missing_evaluator_exception, - *this - << "\n\nERROR: The required field \"" - << req_field->identifier() + if (write_graphviz_file_on_error_) + this->writeGraphvizFileNew(graphviz_filename_for_errors_, true, true); + + TEUCHOS_TEST_FOR_EXCEPTION(node_index_it == field_to_node_index_.end(), + PHX::missing_evaluator_exception, + *this + << "\n\nERROR: The required field \"" + << req_field->identifier() << "\" does not have an evaluator. Current " - << "list of Evaluators are printed above this " - << "error message.\n"); - } + << "list of Evaluators are printed above this " + << "error message.\n"); } - - auto& node = nodes_[node_index_it->second]; - if (node.color() == PHX::Color::WHITE) - dfsVisit(node,time); } // Create a list of fields to allocate @@ -252,7 +264,7 @@ sortAndOrderEvaluators() for (auto& cfield : contrib_fields) { const auto& check_it = std::find_if(fields_.begin(), fields_.end(),[&cfield](const Teuchos::RCP& f) { - if (*f == *cfield) + if (f->identifier() == cfield->identifier()) return true; return false; } @@ -664,7 +676,17 @@ writeGraphvizFileNew(const std::string filename, { std::ofstream ofs; ofs.open(filename.c_str()); + writeGraphviz(ofs,writeEvaluatedFields,writeDependentFields); + ofs.close(); +} +//======================================================================= +template +void PHX::DagManager:: +writeGraphviz(std::ostream& ofs, + bool writeEvaluatedFields, + bool writeDependentFields) const +{ ofs << "digraph G {\n"; // This can be called from inside a DFS during an error, so we can't @@ -681,17 +703,7 @@ writeGraphvizFileNew(const std::string filename, for (const auto& req_field : required_fields_) { // Look in evaluated fields auto node_index_it = field_to_node_index_.find(req_field->identifier()); - if (node_index_it == field_to_node_index_.end()) { - // If failed to find, look in contributed fields - auto contrib_field_search = contributed_field_to_node_index_.find(req_field->identifier()); - if (contrib_field_search == contributed_field_to_node_index_.end()) { - ofs << missing_node_index - << " [" << "fontcolor=\"red\"" << ", label=\" ** MISSING EVALUATOR **\\n " - << req_field->identifier() << " **** MISSING ****\"]\n"; - missing_node_index += 1; - } - } - else { + if (node_index_it != field_to_node_index_.end()) { auto& node = nodes_copy[node_index_it->second]; if (node.color() == PHX::Color::WHITE) writeGraphvizDfsVisit(node, @@ -700,10 +712,32 @@ writeGraphvizFileNew(const std::string filename, writeEvaluatedFields, writeDependentFields); } + + // Check for contributed fields + auto contrib_field_search = contributed_field_to_node_index_.find(req_field->identifier()); + if (contrib_field_search != contributed_field_to_node_index_.end()) { + const auto& node_list_to_add = contrib_field_search->second; + for (auto node_index : node_list_to_add) { + auto& node = nodes_copy[node_index]; + if (node.color() == PHX::Color::WHITE) + writeGraphvizDfsVisit(node, + nodes_copy, + ofs, + writeEvaluatedFields, + writeDependentFields); + } + } + + if ( (node_index_it == field_to_node_index_.end()) && + (contrib_field_search == contributed_field_to_node_index_.end()) ) { + ofs << missing_node_index + << " [" << "fontcolor=\"red\"" << ", label=\" ** MISSING EVALUATOR **\\n " + << req_field->identifier() << " **** MISSING ****\"]\n"; + missing_node_index += 1; + } } ofs << "}"; - ofs.close(); } //======================================================================= diff --git a/packages/phalanx/src/Phalanx_EvaluationContainer_Def.hpp b/packages/phalanx/src/Phalanx_EvaluationContainer_Def.hpp index 1a195a379ec5..fdb61f4c727e 100644 --- a/packages/phalanx/src/Phalanx_EvaluationContainer_Def.hpp +++ b/packages/phalanx/src/Phalanx_EvaluationContainer_Def.hpp @@ -278,11 +278,24 @@ assignSharedFields() std::unordered_set check_duplicates; for (auto& f : fields) check_duplicates.insert(f->identifier()); - TEUCHOS_TEST_FOR_EXCEPTION(fields.size() != check_duplicates.size(), - std::runtime_error, - "ERROR: PHX::EvalautionContainer::assignSharedFields() - " - "a field is being evalauted by more than one evaluator in " - "the DAG. This is not allowed when shared fields are enabled!"); + + if (fields.size() != check_duplicates.size()) { + printf("\n*******************************************\n"); + std::cout << "ERROR - begin multiple evaluators for same field" << std::endl; + for (auto& f : fields) + std::cout << " \"" << f->identifier() << "\"" << std::endl; + + std::cout << "\n"; + this->dag_manager_.print(std::cout); + std::cout << "ERROR - end multiple evaluators for same field" << std::endl; + printf("\n*******************************************\n"); + + TEUCHOS_TEST_FOR_EXCEPTION(fields.size() != check_duplicates.size(), + std::runtime_error, + "ERROR: PHX::EvalautionContainer::assignSharedFields() - " + "a field is being evaluated by more than one evaluator in " + "the DAG. This is not allowed when shared fields are enabled!"); + } #endif // tuple args: 0=size in bytes, 1=FieldTag, 2=range of existence diff --git a/packages/phalanx/test/DagManager/DagManagerTest.cpp b/packages/phalanx/test/DagManager/DagManagerTest.cpp index ea82dc1e2450..9f4304c410c6 100644 --- a/packages/phalanx/test/DagManager/DagManagerTest.cpp +++ b/packages/phalanx/test/DagManager/DagManagerTest.cpp @@ -145,7 +145,6 @@ TEUCHOS_UNIT_TEST(dag, basic_dag) TEST_ASSERT(!em.sortingCalled()); em.sortAndOrderEvaluators(); TEST_ASSERT(em.sortingCalled()); - //std::cout << em << std::endl; { const auto& order_new = em.getEvaluatorInternalOrdering(); @@ -159,7 +158,6 @@ TEUCHOS_UNIT_TEST(dag, basic_dag) em.sortAndOrderEvaluators(); { const auto& order_new = em.getEvaluatorInternalOrdering(); - //std::cout << em << std::endl; TEST_EQUALITY(order_new[0],3); TEST_EQUALITY(order_new[1],2); TEST_EQUALITY(order_new[2],1); @@ -170,7 +168,8 @@ TEUCHOS_UNIT_TEST(dag, basic_dag) const std::vector< Teuchos::RCP >& tags = em.getFieldTags(); TEST_EQUALITY(tags.size(),5); em.writeGraphvizFile("basic_dag.dot",true,true,false); - cout << "\n" << em << endl; cout << "\n" << em << endl; + std::stringstream output; + output << em << endl; { auto& evaluators = em.getEvaluatorsBindingField(tag_a); @@ -815,7 +814,8 @@ TEUCHOS_UNIT_TEST(dag, use_range_and_unshared) dag.sortAndOrderEvaluators(); - dag.print(std::cout); + std::stringstream output; + dag.print(output); const auto& use_range = dag.getFieldUseRange(); @@ -846,3 +846,336 @@ TEUCHOS_UNIT_TEST(dag, use_range_and_unshared) TEST_ASSERT(unshared.find(f3.identifier()) == unshared.end()); TEST_ASSERT(unshared.find(f4.identifier()) == unshared.end()); } + +// ************************************************* +// Make sure we throw if no evaluator is found for +// a required field. +// ************************************************* +TEUCHOS_UNIT_TEST(dag, missing_evaluators) +{ + using namespace std; + using namespace Teuchos; + using namespace PHX; + + DagManager dm; + + using Mock = PHX::MockDAG; + + bool use_dynamic_layout = true; + + // Evaluates, B but we require A + { + RCP e = rcp(new Mock); + e->setName("B"); + e->contributes("B",use_dynamic_layout); + dm.registerEvaluator(e); + } + + RCP dl = rcp(new PHX::Layout("H-Grad",100,4)); + PHX::Tag tag_a("A",dl); + dm.requireField(tag_a); + + TEST_THROW(dm.sortAndOrderEvaluators(),PHX::missing_evaluator_exception); +} + +// ************************************************* +// Checks that that required fields that are the starting node of a +// dfs search that have both an evaluated and contributed components +// in the DAG was failing to add the contributed part since it was +// outside of dfsVisit() call. +// ************************************************* +TEUCHOS_UNIT_TEST(contrib, start_has_eval_and_contrib) +{ + using namespace std; + using namespace Teuchos; + using namespace PHX; + + DagManager dm; + + using Mock = PHX::MockDAG; + + bool use_dynamic_layout = true; + + { + RCP e = rcp(new Mock); + e->setName("A contributed 0"); + e->contributes("A",use_dynamic_layout); + dm.registerEvaluator(e); + } + + { + RCP e = rcp(new Mock); + e->setName("A evaluated"); + e->evaluates("A",use_dynamic_layout); + dm.registerEvaluator(e); + } + + { + RCP e = rcp(new Mock); + e->setName("A contributed 1"); + e->contributes("A",use_dynamic_layout); + dm.registerEvaluator(e); + } + + RCP dl = rcp(new PHX::Layout("H-Grad",100,4)); + PHX::Tag tag_a("A",dl); + dm.requireField(tag_a); + + dm.sortAndOrderEvaluators(); + + // Check the graph + auto tags = dm.getFieldTags(); + TEST_EQUALITY(tags.size(),1); + const auto& evaluators = dm.getEvaluatorInternalOrdering(); + TEST_EQUALITY(evaluators.size(),3); + + // Check the dot file graph + std::stringstream output; + dm.writeGraphviz(output,true,true); + TEST_INEQUALITY(output.str().find("A contributed 0"),std::string::npos); + TEST_INEQUALITY(output.str().find("A contributed 1"),std::string::npos); + TEST_INEQUALITY(output.str().find("A evaluated"),std::string::npos); +} + +// ************************************************* +// Tests that a required field that is evaluated by all contributed +// fields collects all evaluators. The dfs covers all nodes internal, +// but was missing contributed on the starting required node. +// ************************************************* +TEUCHOS_UNIT_TEST(contrib, start_has_contrib_only) +{ + using namespace std; + using namespace Teuchos; + using namespace PHX; + + DagManager dm("Residual"); + + using Mock = PHX::MockDAG; + + bool use_dynamic_layout = true; + + { + RCP e = rcp(new Mock); + e->setName("A contributed 0"); + e->contributes("A",use_dynamic_layout); + dm.registerEvaluator(e); + } + + { + RCP e = rcp(new Mock); + e->setName("A contributed 1"); + e->contributes("A",use_dynamic_layout); + dm.registerEvaluator(e); + } + + { + RCP e = rcp(new Mock); + e->setName("A contributed 2"); + e->contributes("A",use_dynamic_layout); + dm.registerEvaluator(e); + } + + RCP dl = rcp(new PHX::Layout("H-Grad",100,4)); + PHX::Tag tag_a("A",dl); + dm.requireField(tag_a); + + dm.sortAndOrderEvaluators(); + + // Check the graph + auto tags = dm.getFieldTags(); + TEST_EQUALITY(tags.size(),1); + const auto& evaluators = dm.getEvaluatorInternalOrdering(); + TEST_EQUALITY(evaluators.size(),3); + + // Check the dot file graph + std::stringstream output; + dm.writeGraphviz(output,true,true); + TEST_INEQUALITY(output.str().find("A contributed 0"),std::string::npos); + TEST_INEQUALITY(output.str().find("A contributed 1"),std::string::npos); + TEST_INEQUALITY(output.str().find("A contributed 2"),std::string::npos); +} + +/* +// ************************************************* + Typical contributed field use case, residual is all contributed + + ScatterTag + | + Residual + / | \ + Conv Diff Rxn + \ | / + X + +// ************************************************* +*/ +TEUCHOS_UNIT_TEST(contrib, basic_contrib_only) +{ + using namespace std; + using namespace Teuchos; + using namespace PHX; + + DagManager dm; + using Mock = PHX::MockDAG; + bool use_dynamic_layout = true; + + { + RCP e = rcp(new Mock); + e->setName("X"); + e->evaluates("X",use_dynamic_layout); + dm.registerEvaluator(e); + } + + { + RCP e = rcp(new Mock); + e->setName("Convection Operator"); + e->contributes("Residual",use_dynamic_layout); + e->requires("X",use_dynamic_layout); + dm.registerEvaluator(e); + } + + { + RCP e = rcp(new Mock); + e->setName("Diffusion Operator"); + e->contributes("Residual",use_dynamic_layout); + e->requires("X",use_dynamic_layout); + dm.registerEvaluator(e); + } + + { + RCP e = rcp(new Mock); + e->setName("Reaction Operator"); + e->contributes("Residual",use_dynamic_layout); + e->requires("X",use_dynamic_layout); + dm.registerEvaluator(e); + } + + { + RCP e = rcp(new Mock); + e->setName("Scatter"); + // Important that this is "contributes" to catch writing graph + // output correctly. + e->contributes("Scatter",use_dynamic_layout); + e->requires("Residual",use_dynamic_layout); + dm.registerEvaluator(e); + } + + RCP dl = rcp(new PHX::Layout("H-Grad",100,4)); + PHX::Tag tag_a("Scatter",dl); + dm.requireField(tag_a); + + dm.sortAndOrderEvaluators(); + + // Check the graph + const auto& tags = dm.getFieldTags(); + TEST_EQUALITY(tags.size(),3); + const auto& evaluators = dm.getEvaluatorInternalOrdering(); + TEST_EQUALITY(evaluators.size(),5); + + // Check the dot file graph + std::stringstream output; + dm.writeGraphviz(output,true,true); + TEST_INEQUALITY(output.str().find("Scatter"),std::string::npos); + TEST_INEQUALITY(output.str().find("Convection Operator"),std::string::npos); + TEST_INEQUALITY(output.str().find("Diffusion Operator"),std::string::npos); + TEST_INEQUALITY(output.str().find("Reaction Operator"),std::string::npos); + TEST_EQUALITY(output.str().find("I am not in the graph!"),std::string::npos); +} + +/* +// ************************************************* + Typical contributed field use case, residual is evaluated and contributed + + ScatterTag + | + Residual + / | \ + Conv Diff Rxn + | \ | / | + \ Init / + \ | / + X + +// ************************************************* +*/ +TEUCHOS_UNIT_TEST(contrib, basic_contrib_and_evalauted) +{ + using namespace std; + using namespace Teuchos; + using namespace PHX; + + DagManager dm; + using Mock = PHX::MockDAG; + bool use_dynamic_layout = true; + + { + RCP e = rcp(new Mock); + e->setName("X"); + e->evaluates("X",use_dynamic_layout); + dm.registerEvaluator(e); + } + + { + RCP e = rcp(new Mock); + e->setName("Initialize"); + e->evaluates("Residual",use_dynamic_layout); + e->requires("X",use_dynamic_layout); + dm.registerEvaluator(e); + } + + { + RCP e = rcp(new Mock); + e->setName("Convection Operator"); + e->contributes("Residual",use_dynamic_layout); + e->requires("X",use_dynamic_layout); + dm.registerEvaluator(e); + } + + { + RCP e = rcp(new Mock); + e->setName("Diffusion Operator"); + e->contributes("Residual",use_dynamic_layout); + e->requires("X",use_dynamic_layout); + dm.registerEvaluator(e); + } + + { + RCP e = rcp(new Mock); + e->setName("Reaction Operator"); + e->contributes("Residual",use_dynamic_layout); + e->requires("X",use_dynamic_layout); + dm.registerEvaluator(e); + } + + { + RCP e = rcp(new Mock); + e->setName("Scatter"); + // Important that this is "contributes" to catch writing graph + // output correctly. + e->contributes("Scatter",use_dynamic_layout); + e->requires("Residual",use_dynamic_layout); + dm.registerEvaluator(e); + } + + RCP dl = rcp(new PHX::Layout("H-Grad",100,4)); + PHX::Tag tag_a("Scatter",dl); + dm.requireField(tag_a); + + dm.sortAndOrderEvaluators(); + + // Check the graph + const auto& tags = dm.getFieldTags(); + TEST_EQUALITY(tags.size(),3); + const auto& evaluators = dm.getEvaluatorInternalOrdering(); + TEST_EQUALITY(evaluators.size(),6); + + // Check the dot file graph + std::stringstream output; + dm.writeGraphviz(output,true,true); + TEST_INEQUALITY(output.str().find("Scatter"),std::string::npos); + TEST_INEQUALITY(output.str().find("Convection Operator"),std::string::npos); + TEST_INEQUALITY(output.str().find("Diffusion Operator"),std::string::npos); + TEST_INEQUALITY(output.str().find("Reaction Operator"),std::string::npos); + TEST_INEQUALITY(output.str().find("Initialize"),std::string::npos); + TEST_EQUALITY(output.str().find("I am not in the graph!"),std::string::npos); +} diff --git a/packages/phalanx/test/Utilities/Evaluator_MockDAG.hpp b/packages/phalanx/test/Utilities/Evaluator_MockDAG.hpp index 4ee59f9eaf96..5084ab7268ff 100644 --- a/packages/phalanx/test/Utilities/Evaluator_MockDAG.hpp +++ b/packages/phalanx/test/Utilities/Evaluator_MockDAG.hpp @@ -1,7 +1,7 @@ // @HEADER // ************************************************************************ // -// Phalanx: A Partial Differential Equation Field Evaluation +// Phalanx: A Partial Differential Equation Field Evaluation // Kernel for Flexible Management of Complex Dependency Chains // Copyright 2008 Sandia Corporation // @@ -57,12 +57,12 @@ namespace PHX { void postRegistrationSetup(typename Traits::SetupData d, PHX::FieldManager& fm); void evaluateFields(typename Traits::EvalData d); - void evaluates(const std::string& field_name); - void requires(const std::string& field_name); - void contributes(const std::string& field_name); + void evaluates(const std::string& field_name, const bool use_dynamic_layout=false); + void requires(const std::string& field_name, const bool use_dynamic_layout=false); + void contributes(const std::string& field_name, const bool use_dynamic_layout=false); void unshared(const std::string& field_name); }; - + } #include "Evaluator_MockDAG_Def.hpp" diff --git a/packages/phalanx/test/Utilities/Evaluator_MockDAG_Def.hpp b/packages/phalanx/test/Utilities/Evaluator_MockDAG_Def.hpp index f0fc6bbbe7a8..fe2a723566ca 100644 --- a/packages/phalanx/test/Utilities/Evaluator_MockDAG_Def.hpp +++ b/packages/phalanx/test/Utilities/Evaluator_MockDAG_Def.hpp @@ -1,7 +1,7 @@ // @HEADER // ************************************************************************ // -// Phalanx: A Partial Differential Equation Field Evaluation +// Phalanx: A Partial Differential Equation Field Evaluation // Kernel for Flexible Management of Complex Dependency Chains // Copyright 2008 Sandia Corporation // @@ -44,7 +44,9 @@ //********************************************************************** #include "Phalanx_DataLayout_MDALayout.hpp" +#include "Phalanx_DataLayout_DynamicLayout.hpp" #include "Phalanx_FieldTag_Tag.hpp" +#include "Phalanx_MDField.hpp" class CELL; class BASIS; @@ -63,37 +65,52 @@ namespace PHX { void MockDAG::evaluateFields(typename Traits::EvalData /* d */){} template - void MockDAG::evaluates(const std::string& n) + void MockDAG::evaluates(const std::string& n, + const bool use_dynamic_layout) { using Teuchos::RCP; using Teuchos::rcp; - RCP> dl = - rcp(new PHX::MDALayout("H-Grad",100,4)); + RCP dl; + if (use_dynamic_layout) + dl = rcp(new PHX::Layout("H-Grad")); + else + dl = rcp(new PHX::MDALayout("H-Grad",100,4)); + PHX::Tag tag(n,dl); this->addEvaluatedField(tag); } template - void MockDAG::requires(const std::string& n) + void MockDAG::requires(const std::string& n, + const bool use_dynamic_layout) { using Teuchos::RCP; using Teuchos::rcp; - RCP> dl = - rcp(new PHX::MDALayout("H-Grad",100,4)); + RCP dl; + if (use_dynamic_layout) + dl = rcp(new PHX::Layout("H-Grad")); + else + dl = rcp(new PHX::MDALayout("H-Grad",100,4)); + PHX::Tag tag(n,dl); this->addDependentField(tag); } template - void MockDAG::contributes(const std::string& n) + void MockDAG::contributes(const std::string& n, + const bool use_dynamic_layout) { using Teuchos::RCP; using Teuchos::rcp; - RCP> dl = - rcp(new PHX::MDALayout("H-Grad",100,4)); + RCP dl; + if (use_dynamic_layout) + dl = rcp(new PHX::Layout("H-Grad")); + else + dl = rcp(new PHX::MDALayout("H-Grad",100,4)); + PHX::Tag tag(n,dl); this->addContributedField(tag); } @@ -104,11 +121,11 @@ namespace PHX { using Teuchos::RCP; using Teuchos::rcp; - RCP> dl = + RCP> dl = rcp(new PHX::MDALayout("H-Grad",100,4)); RCP> tag = Teuchos::rcp(new PHX::Tag(n,dl)); this->addUnsharedField(tag); } -} +} diff --git a/packages/piro/src/Piro_ObserverToTempusIntegrationObserverAdapter_Def.hpp b/packages/piro/src/Piro_ObserverToTempusIntegrationObserverAdapter_Def.hpp index f38ef7e53990..e12d6110c248 100644 --- a/packages/piro/src/Piro_ObserverToTempusIntegrationObserverAdapter_Def.hpp +++ b/packages/piro/src/Piro_ObserverToTempusIntegrationObserverAdapter_Def.hpp @@ -204,16 +204,16 @@ void Piro::ObserverToTempusIntegrationObserverAdapter::observeTimeStep() { Scalar current_dt; - if (Teuchos::nonnull(solutionHistory_->getWorkingState())) { - current_dt = solutionHistory_->getWorkingState()->getTimeStep(); + if (Teuchos::nonnull(solutionHistory_->getCurrentState())) { + current_dt = solutionHistory_->getCurrentState()->getTimeStep(); } else { current_dt = solutionHistory_->getCurrentState()->getTimeStep(); } //Don't observe solution if step failed to converge - if ((solutionHistory_->getWorkingState() != Teuchos::null) && - (solutionHistory_->getWorkingState()->getSolutionStatus() == Tempus::Status::FAILED)) { + if ((solutionHistory_->getCurrentState() != Teuchos::null) && + (solutionHistory_->getCurrentState()->getSolutionStatus() == Tempus::Status::FAILED)) { Scalar min_dt = timeStepControl_->getMinTimeStep(); if ((previous_dt_ == current_dt) && (previous_dt_ == min_dt)) { TEUCHOS_TEST_FOR_EXCEPTION(true, Teuchos::Exceptions::InvalidParameter, diff --git a/packages/piro/src/Piro_PerformAnalysis.cpp b/packages/piro/src/Piro_PerformAnalysis.cpp index a3db2d7d0ade..eac5c299736a 100644 --- a/packages/piro/src/Piro_PerformAnalysis.cpp +++ b/packages/piro/src/Piro_PerformAnalysis.cpp @@ -62,6 +62,7 @@ #ifdef HAVE_PIRO_ROL #include "ROL_ThyraVector.hpp" +#include "ROL_ScaledThyraVector.hpp" #include "ROL_Thyra_BoundConstraint.hpp" #include "ROL_ThyraME_Objective.hpp" #include "ROL_ThyraProductME_Objective.hpp" @@ -269,11 +270,11 @@ Piro::PerformROLAnalysis( else if(init_guess_type == "Random Vector") { Teuchos::Array minmax(2); minmax[0] = -1; minmax[1] = 1; minmax = rolParams.get >("Min And Max Of Random Parameter Guess", minmax); - ::Thyra::randomize( minmax[0], minmax[1], rol_p.getVector().ptr()); + ::Thyra::randomize( minmax[0], minmax[1], rol_p.getVector().ptr()); } else if(init_guess_type != "From Model Evaluator") { TEUCHOS_TEST_FOR_EXCEPTION(true, Teuchos::Exceptions::InvalidParameter, - std::endl << "Error in Piro::PerformROLAnalysis: " << + std::endl << "Error in Piro::PerformROLAnalysis: " << "Parameter Initial Guess Type \"" << init_guess_type << "\" is not Known.\nValid options are: \"Parameter Scalar Guess\", \"Uniform Vector\" and \"Random Vector\""<( -1.0, 1.0, rand_vec_x.ptr()); - ::Thyra::randomize( -1.0, 1.0, rand_vec_y.ptr()); - ::Thyra::randomize( -1.0, 1.0, rand_vec_z.ptr()); + ::Thyra::randomize( -1.0, 1.0, rand_vec_x.ptr()); + ::Thyra::randomize( -1.0, 1.0, rand_vec_y.ptr()); + ::Thyra::randomize( -1.0, 1.0, rand_vec_z.ptr()); ROL::ThyraVector rol_x(rand_vec_x); ROL::ThyraVector rol_y(rand_vec_y); @@ -314,7 +315,7 @@ Piro::PerformROLAnalysis( *out << "\nROL performing gradient check " << i+1 << " of " << num_checks << ", at parameter initial guess" << std::endl; - ::Thyra::randomize( -1.0, 1.0, rand_vec.ptr()); + ::Thyra::randomize( -1.0, 1.0, rand_vec.ptr()); ROL::ThyraVector rol_p_direction(rand_vec); @@ -336,9 +337,9 @@ Piro::PerformROLAnalysis( // Define Status Test - double gtol = rolParams.get("Gradient Tolerance", 1e-5); // norm of gradient tolerance - double stol = rolParams.get("Step Tolerance", 1e-5); // norm of step tolerance - int maxit = rolParams.get("Max Iterations", 100); // maximum number of iterations + double gtol = rolParams.get("Gradient Tolerance", 1e-5); // norm of gradient tolerance + double stol = rolParams.get("Step Tolerance", 1e-5); // norm of step tolerance + int maxit = rolParams.get("Max Iterations", 100); // maximum number of iterations Teuchos::RCP > status = Teuchos::rcp(new ROL::StatusTest(gtol, stol, maxit)); @@ -355,8 +356,8 @@ Piro::PerformROLAnalysis( for (auto i = 0; i < num_parameters; ++i) { p_lo_vecs[i] = piroModel.getLowerBounds().get_p(p_indices[i]); p_up_vecs[i] = piroModel.getUpperBounds().get_p(p_indices[i]); - TEUCHOS_TEST_FOR_EXCEPTION((p_lo_vecs[i] == Teuchos::null) || (p_up_vecs[i] == Teuchos::null), Teuchos::Exceptions::InvalidParameter, - std::endl << "Error in Piro::PerformROLAnalysis: " << + TEUCHOS_TEST_FOR_EXCEPTION((p_lo_vecs[i] == Teuchos::null) || (p_up_vecs[i] == Teuchos::null), Teuchos::Exceptions::InvalidParameter, + std::endl << "Error in Piro::PerformROLAnalysis: " << "Lower and/or Upper bounds pointers are null, cannot perform bound constrained optimization"<> p_lo = Thyra::defaultProductVector(p_space, p_lo_vecs()); @@ -369,24 +370,24 @@ Piro::PerformROLAnalysis( rcp( new ROL::Bounds(ROL::makePtrFromRef(plo), ROL::makePtrFromRef(pup))); - //ROL::Thyra_BoundConstraint boundConstraint(p_lo->clone_v(), p_up->clone_v(), eps_bound); + //ROL::Thyra_BoundConstraint boundConstraint(p_lo->clone_v(), p_up->clone_v(), eps_bound); if(rolParams.get("Step Method", "Line Search") == "Line Search") { *out << "\nUsing Line Search Algorithm" << std::endl; - output = algoLS.run(rol_p, obj, *boundConstraint, print, *out); + output = algoLS.run(rol_p, obj, *boundConstraint, print, *out); } else { *out << "\nUsing Trust Region Algorithm" << std::endl; - output = algoTR.run(rol_p, obj, *boundConstraint, print, *out); + output = algoTR.run(rol_p, obj, *boundConstraint, print, *out); } } else if(rolParams.get("Step Method", "Line Search") == "Line Search") { *out << "\nUsing Line Search Algorithm" << std::endl; - output = algoLS.run(rol_p, obj, print, *out); + output = algoLS.run(rol_p, obj, print, *out); } else { *out << "\nUsing Trust Region Algorithm" << std::endl; - output = algoTR.run(rol_p, obj, print, *out); + output = algoTR.run(rol_p, obj, print, *out); } @@ -403,13 +404,13 @@ Piro::PerformROLAnalysis( #ifdef HAVE_PIRO_NOX auto piroNOXSolver = Teuchos::rcp_dynamic_cast>(Teuchos::rcpFromRef(piroModel)); if(Teuchos::nonnull(piroNOXSolver)) { - piroSSSolver = Teuchos::rcp_dynamic_cast>(piroNOXSolver); + piroSSSolver = Teuchos::rcp_dynamic_cast>(piroNOXSolver); model = Teuchos::rcp_dynamic_cast>(piroNOXSolver->getSubModel()); } else #endif { TEUCHOS_TEST_FOR_EXCEPTION(true, Teuchos::Exceptions::InvalidParameter, - std::endl << "Error in Piro::PerformROLAnalysis: " << + std::endl << "Error in Piro::PerformROLAnalysis: " << "only Piro::NOXSolver is currently supported for piroModel\n" "Set \"Use Old Reduced Space Interface\" to true in input file if using Piro::Epetra::NOXSolver"<set("Parameter Names", Teuchos::rcpFromRef(p_names)); + opt_paramList->set("Parameter Names", Teuchos::rcpFromRef(p_names)); Teuchos::Array const>> p_spaces(num_parameters); Teuchos::Array>> p_vecs(num_parameters); @@ -454,10 +455,10 @@ Piro::PerformROLAnalysis( //Teuchos::RCP const> p_space; Teuchos::RCP const> x_space = model->get_x_space(); - Teuchos::RCP> x_vec = Thyra::createMember(x_space); - Thyra::copy(*model->getNominalValues().get_x(), x_vec.ptr()); + Teuchos::RCP> x = Thyra::createMember(x_space); + Thyra::copy(*model->getNominalValues().get_x(), x.ptr()); - ROL::ThyraVector rol_x(x_vec); + ROL::ThyraVector rol_x(x); Teuchos::RCP> lambda_vec = Thyra::createMember(x_space); ROL::ThyraVector rol_lambda(lambda_vec); @@ -471,12 +472,12 @@ Piro::PerformROLAnalysis( constr.setNumResponses(piroSSSolver->num_g()); - ROL::Ptr > obj_ptr = ROL::makePtrFromRef(obj); + ROL::Ptr > obj_ptr = ROL::makePtrFromRef(obj); ROL::Ptr > constr_ptr = ROL::makePtrFromRef(constr); - ROL::Ptr > rol_p_ptr = ROL::makePtrFromRef(rol_p); - ROL::Ptr > rol_x_ptr = ROL::makePtrFromRef(rol_x); - ROL::Ptr > rol_lambda_ptr = ROL::makePtrFromRef(rol_lambda); + ROL::Ptr > rol_p_ptr = ROL::makePtrFromRef(rol_p); + ROL::Ptr > rol_x_ptr = ROL::makePtrFromRef(rol_x); + ROL::Ptr > rol_lambda_ptr = ROL::makePtrFromRef(rol_lambda); ROL::Reduced_Objective_SimOpt reduced_obj(obj_ptr,constr_ptr,rol_x_ptr,rol_p_ptr,rol_lambda_ptr); bool print = rolParams.get("Print Output", false); @@ -490,11 +491,11 @@ Piro::PerformROLAnalysis( else if(init_guess_type == "Random Vector") { Teuchos::Array minmax(2); minmax[0] = -1; minmax[1] = 1; minmax = rolParams.get >("Min And Max Of Random Parameter Guess", minmax); - ::Thyra::randomize( minmax[0], minmax[1], rol_p.getVector().ptr()); + ::Thyra::randomize( minmax[0], minmax[1], rol_p.getVector().ptr()); } else if(init_guess_type != "From Model Evaluator") { TEUCHOS_TEST_FOR_EXCEPTION(true, Teuchos::Exceptions::InvalidParameter, - std::endl << "Error in Piro::PerformROLAnalysis: " << + std::endl << "Error in Piro::PerformROLAnalysis: " << "Parameter Initial Guess Type \"" << init_guess_type << "\" is not Known.\nValid options are: \"Parameter Scalar Guess\", \"Uniform Vector\" and \"Random Vector\""<( -1.0, 1.0, rand_vec_x.ptr()); - ::Thyra::randomize( -1.0, 1.0, rand_vec_y.ptr()); - ::Thyra::randomize( -1.0, 1.0, rand_vec_z.ptr()); + ::Thyra::randomize( -1.0, 1.0, rand_vec_x.ptr()); + ::Thyra::randomize( -1.0, 1.0, rand_vec_y.ptr()); + ::Thyra::randomize( -1.0, 1.0, rand_vec_z.ptr()); ROL::ThyraVector rol_x(rand_vec_x); ROL::ThyraVector rol_y(rand_vec_y); @@ -523,57 +524,115 @@ Piro::PerformROLAnalysis( } } + + + + //! check correctness of Gradient prvided by Model Evaluator if(rolParams.get("Check Gradient", false)) { - Teuchos::RCP > p_rand_vec = p->clone_v(); - Teuchos::RCP > x_rand_vec = x_vec->clone_v(); + Teuchos::RCP > p_rand_vec1 = p->clone_v(); + Teuchos::RCP > x_rand_vec1 = x->clone_v(); + Teuchos::RCP > p_rand_vec2 = p->clone_v(); + Teuchos::RCP > x_rand_vec2 = x->clone_v(); + ::Thyra::seed_randomize( seed ); + auto rol_x_zero = rol_x.clone(); rol_x_zero->zero(); + auto rol_p_zero = rol_p.clone(); rol_p_zero->zero(); + int num_checks = rolParams.get("Number Of Gradient Checks", 1); double norm_p = rol_p.norm(); double norm_x = rol_x.norm(); - ROL::Vector_SimOpt x(ROL::makePtrFromRef(rol_x),ROL::makePtrFromRef(rol_p)); + ROL::Vector_SimOpt sopt_vec(ROL::makePtrFromRef(rol_x),ROL::makePtrFromRef(rol_p)); for(int i=0; i< num_checks; i++) { *out << "\nROL performing gradient check " << i+1 << " of " << num_checks << ", at parameter initial guess" << std::endl; - ::Thyra::randomize( -1.0, 1.0, p_rand_vec.ptr()); - ::Thyra::randomize( -1.0, 1.0, x_rand_vec.ptr()); + // compute direction 1 + ::Thyra::randomize( -1.0, 1.0, p_rand_vec1.ptr()); + ::Thyra::randomize( -1.0, 1.0, x_rand_vec1.ptr()); - ROL::ThyraVector rol_p_direction(p_rand_vec); - ROL::ThyraVector rol_x_direction(x_rand_vec); + ROL::ThyraVector rol_p_direction1(p_rand_vec1); + ROL::ThyraVector rol_x_direction1(x_rand_vec1); - double norm_d = rol_p_direction.norm(); + double norm_d = rol_p_direction1.norm(); if(norm_d*norm_p > 0.0) - rol_p_direction.scale(norm_p/norm_d); - norm_d = rol_x_direction.norm(); + rol_p_direction1.scale(norm_p/norm_d); + norm_d = rol_x_direction1.norm(); if(norm_d*norm_x > 0.0) - rol_x_direction.scale(norm_x/norm_d); + rol_x_direction1.scale(norm_x/norm_d); - ROL::Vector_SimOpt y(ROL::makePtrFromRef(rol_x_direction),ROL::makePtrFromRef(rol_p_direction)); + ROL::Vector_SimOpt sopt_vec_direction1(ROL::makePtrFromRef(rol_x_direction1),ROL::makePtrFromRef(rol_p_direction1)); + ROL::Vector_SimOpt sopt_vec_direction1_x(ROL::makePtrFromRef(rol_x_direction1),rol_p_zero); + ROL::Vector_SimOpt sopt_vec_direction1_p(rol_x_zero,ROL::makePtrFromRef(rol_p_direction1)); - auto rol_x_zero = rol_x_direction.clone(); rol_x_zero->zero(); - auto rol_p_zero = rol_p_direction.clone(); rol_p_zero->zero(); - ROL::Vector_SimOpt y_x(ROL::makePtrFromRef(rol_x_direction),rol_p_zero); - ROL::Vector_SimOpt y_p(rol_x_zero,ROL::makePtrFromRef(rol_p_direction)); + // compute direction 2 + ::Thyra::randomize( -1.0, 1.0, p_rand_vec2.ptr()); + ::Thyra::randomize( -1.0, 1.0, x_rand_vec2.ptr()); - // Thyra::DetachedVectorView rv_view(rol_p_direction.getVector()); - // std::cout << "rol_p_direction: " << rv_view(0) << " " << rv_view(1) << std::endl; + ROL::ThyraVector rol_p_direction2(p_rand_vec2); + ROL::ThyraVector rol_x_direction2(x_rand_vec2); - reduced_obj.checkGradient(rol_p, rol_p, rol_p_direction, print, *out); + norm_d = rol_p_direction2.norm(); + if(norm_d*norm_p > 0.0) + rol_p_direction2.scale(norm_p/norm_d); + norm_d = rol_x_direction2.norm(); + if(norm_d*norm_x > 0.0) + rol_x_direction2.scale(norm_x/norm_d); + + ROL::Vector_SimOpt sopt_vec_direction2(ROL::makePtrFromRef(rol_x_direction2),ROL::makePtrFromRef(rol_p_direction2)); + ROL::Vector_SimOpt sopt_vec_direction2_x(ROL::makePtrFromRef(rol_x_direction2),rol_p_zero); + ROL::Vector_SimOpt sopt_vec_direction2_p(rol_x_zero,ROL::makePtrFromRef(rol_p_direction2)); + + + int num_steps = 10; + int order = 2; + + if(rolParams.get("Expensive Derivative Checks", false)) { + *out << "Checking Reduced Gradient Accuracy" << std::endl; + reduced_obj.checkGradient(rol_p, rol_p, rol_p_direction1, print, *out); + } // Check derivatives. - obj.checkGradient(x,y,true,*out); - obj.checkGradient(x,y_x,true,*out); - obj.checkGradient(x,y_p,true,*out); - - constr.checkApplyJacobian(x,y,rol_x_direction,true,*out); - constr.checkApplyJacobian(x,y_x,rol_x_direction,true,*out); - constr.checkApplyJacobian(x,y_p,rol_x_direction,true,*out); - if(rolParams.get("Expensive Check of Adjoint Jacobian", false)) - constr.checkApplyAdjointJacobian(x,rol_x_direction,rol_x_direction,x,true,*out); - constr.checkAdjointConsistencyJacobian(rol_x_direction, y, x,rol_x_direction,y,true,*out); + + *out << "Checking Accuracy of Objective Gradient " << std::endl; + obj.checkGradient(sopt_vec,sopt_vec_direction1,true,*out,num_steps,order); + *out << "Checking Accuracy of Objective Gradient in x direction" << std::endl; + obj.checkGradient(sopt_vec,sopt_vec_direction1_x,true,*out,num_steps,order); + *out << "Checking Accuracy of Objective Gradient in p direction" << std::endl; + obj.checkGradient(sopt_vec,sopt_vec_direction1_p,true,*out,num_steps,order); + + + *out << "Checking Accuracy of Constraint Gradient " << std::endl; + constr.checkApplyJacobian(sopt_vec,sopt_vec_direction1,rol_x_direction1, true,*out,num_steps,order); + *out << "Checking Accuracy of Constraint Gradient in x direction (Jacobian) " << std::endl; + constr.checkApplyJacobian(sopt_vec,sopt_vec_direction1_x,rol_x_direction1,true,*out,num_steps,order); + *out << "Checking Accuracy of Constraint Gradient in p direction" << std::endl; + constr.checkApplyJacobian(sopt_vec,sopt_vec_direction1_p,rol_x_direction1,true,*out,num_steps,order); + + if(rolParams.get("Expensive Derivative Checks", false)) + constr.checkApplyAdjointJacobian(sopt_vec,rol_x_direction1,rol_x_direction1,sopt_vec,true,*out,num_steps); + + *out << "Checking Consistency of Constraint Gradient and its adjoint" << std::endl; + constr.checkAdjointConsistencyJacobian(rol_x_direction1, sopt_vec_direction2, sopt_vec,true,*out); + + *out << "Checking Symmetry of objective Hessian" << std::endl; + obj.checkHessSym(sopt_vec,sopt_vec_direction1, sopt_vec_direction2, true,*out); + + *out << "Checking Symmetry of objective Hessian (H_xx = H_xx^T)" << std::endl; + obj.checkHessSym(sopt_vec,sopt_vec_direction1_x, sopt_vec_direction2_x, true,*out); + *out << "Checking Symmetry of objective Hessian (H_xp = H_px^T)" << std::endl; + obj.checkHessSym(sopt_vec,sopt_vec_direction1_x, sopt_vec_direction2_p, true,*out); + *out << "Checking Symmetry of objective Hessian (H_pp = H_pp^T)" << std::endl; + obj.checkHessSym(sopt_vec,sopt_vec_direction1_p, sopt_vec_direction2_p, true,*out); + + *out << "Checking Accuracy of objective Hessian" << std::endl; + obj.checkHessVec(sopt_vec,sopt_vec_direction1,true,*out,num_steps,order); + + *out << "Checking Accuracy of constraint Hessian" << std::endl; + constr.checkApplyAdjointHessian(sopt_vec, rol_x_direction1, sopt_vec_direction2, sopt_vec_direction2, true,*out,num_steps,order); + } } @@ -593,57 +652,62 @@ Piro::PerformROLAnalysis( ROL::Ptr > algo; algo = ROL::makePtr>(step, status,false); + //this is for testing the PrimalScaledThyraVector. At the moment the scaling is set to 1, so it is not changing the dot product + Teuchos::RCP > scaling_vector_p = p->clone_v(); + Teuchos::RCP > scaling_vector_x = x->clone_v(); + ::Thyra::put_scalar( 1.0, scaling_vector_p.ptr()); + ::Thyra::put_scalar( 1.0, scaling_vector_x.ptr()); + //::Thyra::randomize( 0.5, 2.0, scaling_vector_p.ptr()); + //::Thyra::randomize( 0.5, 2.0, scaling_vector_x.ptr()); + ROL::PrimalScaledThyraVector rol_x_primal(x, scaling_vector_x); + ROL::PrimalScaledThyraVector rol_p_primal(p, scaling_vector_p); + // Run Algorithm std::vector output; - if(rolParams.get("Bound Constrained", false)) { + Teuchos::RCP > boundConstraint; + bool boundConstrained = rolParams.get("Bound Constrained", false); + + if(boundConstrained) { Teuchos::Array>> p_lo_vecs(num_parameters); Teuchos::Array>> p_up_vecs(num_parameters); //double eps_bound = rolParams.get("epsilon bound", 1e-6); for (auto i = 0; i < num_parameters; ++i) { p_lo_vecs[i] = piroModel.getLowerBounds().get_p(p_indices[i]); p_up_vecs[i] = piroModel.getUpperBounds().get_p(p_indices[i]); - TEUCHOS_TEST_FOR_EXCEPTION((p_lo_vecs[i] == Teuchos::null) || (p_up_vecs[i] == Teuchos::null), Teuchos::Exceptions::InvalidParameter, - std::endl << "Error in Piro::PerformROLAnalysis: " << + TEUCHOS_TEST_FOR_EXCEPTION((p_lo_vecs[i] == Teuchos::null) || (p_up_vecs[i] == Teuchos::null), Teuchos::Exceptions::InvalidParameter, + std::endl << "Error in Piro::PerformROLAnalysis: " << "Lower and/or Upper bounds pointers are null, cannot perform bound constrained optimization"<> p_lo = Thyra::defaultProductVector(p_space, p_lo_vecs()); - Teuchos::RCP> p_up = Thyra::defaultProductVector(p_space, p_up_vecs()); + Teuchos::RCP> p_lo = Thyra::defaultProductVector(p_space, p_lo_vecs()); + Teuchos::RCP> p_up = Thyra::defaultProductVector(p_space, p_up_vecs()); - //ROL::Thyra_BoundConstraint boundConstraint(p_lo->clone_v(), p_up->clone_v(), eps_bound); - ROL::ThyraVector plo(p_lo->clone_v()); - ROL::ThyraVector pup(p_up->clone_v()); - Teuchos::RCP > boundConstraint = - rcp( new ROL::Bounds(ROL::makePtrFromRef(plo), ROL::makePtrFromRef(pup))); + //ROL::Thyra_BoundConstraint boundConstraint(p_lo->clone_v(), p_up->clone_v(), eps_bound); + boundConstraint = rcp( new ROL::Bounds(ROL::makePtr >(p_lo), ROL::makePtr >(p_up))); + } if ( useFullSpace ) { - - ROL::Vector_SimOpt x(ROL::makePtrFromRef(rol_x),ROL::makePtrFromRef(rol_p)); + //ROL::Vector_SimOpt sopt_vec(ROL::makePtrFromRef(rol_x),ROL::makePtrFromRef(rol_p)); + ROL::Vector_SimOpt sopt_vec(ROL::makePtrFromRef(rol_x_primal),ROL::makePtrFromRef(rol_p_primal)); auto r_ptr = rol_x.clone(); double tol = 1e-5; constr.solve(*r_ptr,rol_x,rol_p,tol); - ROL::BoundConstraint u_bnd(rol_x); - ROL::Ptr > bnd = ROL::makePtr >(ROL::makePtrFromRef(u_bnd),boundConstraint); - ROL::OptimizationProblem optProb(ROL::makePtrFromRef(obj), ROL::makePtrFromRef(x), bnd, ROL::makePtrFromRef(constr), r_ptr); - ROL::OptimizationSolver optSolver(optProb, rolParams.sublist("ROL Options")); - optSolver.solve(*out); + if(boundConstrained) { + ROL::BoundConstraint u_bnd(rol_x); + ROL::Ptr > bnd = ROL::makePtr >(ROL::makePtrFromRef(u_bnd),boundConstraint); + ROL::OptimizationProblem prob(ROL::makePtrFromRef(obj), ROL::makePtrFromRef(sopt_vec), bnd, ROL::makePtrFromRef(constr), r_ptr); + ROL::OptimizationSolver optSolver(prob, rolParams.sublist("ROL Options")); + optSolver.solve(*out); + } else { + ROL::OptimizationProblem prob(ROL::makePtrFromRef(obj), ROL::makePtrFromRef(sopt_vec), ROL::makePtrFromRef(constr), r_ptr); + ROL::OptimizationSolver optSolver(prob, rolParams.sublist("ROL Options")); + optSolver.solve(*out); + } } else { - output = algo->run(rol_p, reduced_obj, *boundConstraint, print, *out); + if(boundConstrained) + output = algo->run(rol_p_primal, reduced_obj, *boundConstraint, print, *out); + else + output = algo->run(rol_p_primal, reduced_obj, print, *out); } - } - else { - if ( useFullSpace ) { - - ROL::Vector_SimOpt x(ROL::makePtrFromRef(rol_x),ROL::makePtrFromRef(rol_p)); - auto r_ptr = rol_x.clone(); - double tol = 1e-5; - constr.solve(*r_ptr,rol_x,rol_p,tol); - ROL::OptimizationProblem optProb(ROL::makePtrFromRef(obj), ROL::makePtrFromRef(x), ROL::makePtrFromRef(constr), r_ptr); - ROL::OptimizationSolver optSolver(optProb, rolParams.sublist("ROL Options")); - optSolver.solve(*out); - } else { - output = algo->run(rol_p, reduced_obj, print, *out); - } - } for ( unsigned i = 0; i < output.size(); i++ ) { *out << output[i]; diff --git a/packages/piro/src/Piro_TempusSolver.hpp b/packages/piro/src/Piro_TempusSolver.hpp index 318c287d391a..ee809cc3ddb5 100644 --- a/packages/piro/src/Piro_TempusSolver.hpp +++ b/packages/piro/src/Piro_TempusSolver.hpp @@ -200,7 +200,7 @@ class TempusSolver bool supports_x_dotdot_; //! Set observer - void setObserver(); + void setObserver() const; //! Boolean to tell TempusSolver whether or not to abort if a transient solve fails bool abort_on_failure_; @@ -210,7 +210,10 @@ class TempusSolver //from Albany. bool abort_on_fail_at_min_dt_; - SENS_METHOD sens_method_; + SENS_METHOD sens_method_; + + //Boolean to mark whether initial state was reset using setInitialState routine + bool initial_state_reset_; }; /** \brief Non-member constructor function */ diff --git a/packages/piro/src/Piro_TempusSolver_Def.hpp b/packages/piro/src/Piro_TempusSolver_Def.hpp index f8eb62389cae..383858ca96fa 100644 --- a/packages/piro/src/Piro_TempusSolver_Def.hpp +++ b/packages/piro/src/Piro_TempusSolver_Def.hpp @@ -76,6 +76,7 @@ # include "Thyra_NonlinearSolver_NOX.hpp" #endif +//#define DEBUG_OUTPUT #include #include @@ -90,7 +91,8 @@ Piro::TempusSolver::TempusSolver( out_(Teuchos::VerboseObjectBase::getDefaultOStream()), isInitialized_(false), piroObserver_(piroObserver), - supports_x_dotdot_(false) + supports_x_dotdot_(false), + initial_state_reset_{false} { std::string sens_method_string = appParams->get("Sensitivity Method","None"); this->setSensitivityMethod(sens_method_string); @@ -228,7 +230,9 @@ void Piro::TempusSolver::initialize( // below, as more explicit schemes get added to Tempus // Explicit time-integrators for 1st order ODEs if ( + stepperType == "Forward Euler" || stepperType == "RK Forward Euler" || + stepperType == "RK1" || stepperType == "RK Explicit 4 Stage" || stepperType == "RK Explicit 3/8 Rule" || stepperType == "RK Explicit 4 Stage 3rd order by Runge" || @@ -237,7 +241,15 @@ void Piro::TempusSolver::initialize( stepperType == "RK Explicit 3 Stage 3rd order TVD" || stepperType == "RK Explicit 3 Stage 3rd order by Heun" || stepperType == "RK Explicit 2 Stage 2nd order by Runge" || + stepperType == "RK Explicit Midpoint" || stepperType == "RK Explicit Trapezoidal" || + stepperType == "Heuns Method" || + stepperType == "Bogacki-Shampine 3(2) Pair" || + stepperType == "SSPERK22" || + stepperType == "SSPRK2" || + stepperType == "SSPERK33" || + stepperType == "SSPRK3" || + stepperType == "SSPERK54" || stepperType == "General ERK" ) { bool invertMassMatrix = tempusPL->get("Invert Mass Matrix", false); @@ -364,15 +376,61 @@ Piro::TempusSolver::TempusSolver( template void Piro::TempusSolver::evalModelImpl( const Thyra::ModelEvaluatorBase::InArgs& inArgs, - const Thyra::ModelEvaluatorBase::OutArgs& outArgs) const + const Thyra::ModelEvaluatorBase::OutArgs& outArgs) const { using Teuchos::RCP; using Teuchos::rcp; // Set initial time and initial condition Thyra::ModelEvaluatorBase::InArgs state_ic = model_->getNominalValues(); + Teuchos::RCP> xinit, xdotinit, xdotdotinit; if(t_initial_ > 0.0 && state_ic.supports(Thyra::ModelEvaluatorBase::IN_ARG_t)) { state_ic.set_t(t_initial_); + //If initial state has not been reset, get the initial state from ME in args + if (!initial_state_reset_) { + if (state_ic.supports(Thyra::ModelEvaluatorBase::IN_ARG_x)) { + xinit = state_ic.get_x(); + } + if (state_ic.supports(Thyra::ModelEvaluatorBase::IN_ARG_x_dot)) { + xdotinit = state_ic.get_x_dot(); + } + if (state_ic.supports(Thyra::ModelEvaluatorBase::IN_ARG_x_dot_dot)) { + xdotdotinit = state_ic.get_x_dot_dot(); + } + piroTempusIntegrator_->initializeSolutionHistory(t_initial_, xinit, xdotinit, xdotdotinit); + //Reset observer. This is necessary for correct observation of solution + //since initializeSolutionHistory modifies the solutionHistory object. + setObserver(); +#ifdef DEBUG_OUTPUT + if (xinit != Teuchos::null) { + *out_ << "\n*** Piro::TempusSolver::evalModelImpl xinit at time = " << t_initial_ << " ***\n"; + Teuchos::Range1D range; + RTOpPack::ConstSubVectorView xinitv; + xinit->acquireDetachedView(range, &xinitv); + auto xinita = xinitv.values(); + for (auto i = 0; i < xinita.size(); ++i) *out_ << xinita[i] << " "; + *out_ << "\n*** Piro::TempusSolver::evalModelImpl xinit at time = " << t_initial_ << " ***\n"; + } + if (xdotinit != Teuchos::null) { + *out_ << "\n*** Piro::TempusSolver::evalModelImpl xdotinit at time = " << t_initial_ << " ***\n"; + Teuchos::Range1D range; + RTOpPack::ConstSubVectorView xdotinitv; + xdotinit->acquireDetachedView(range, &xdotinitv); + auto xdotinita = xdotinitv.values(); + for (auto i = 0; i < xdotinita.size(); ++i) *out_ << xdotinita[i] << " "; + *out_ << "\n*** Piro::TempusSolver::evalModelImpl xdotinit at time = " << t_initial_ << " ***\n"; + } + if (xdotdotinit != Teuchos::null) { + *out_ << "\n*** Piro::TempusSolver::evalModelImpl xdotdotinit at time = " << t_initial_ << " ***\n"; + Teuchos::Range1D range; + RTOpPack::ConstSubVectorView xdotdotinitv; + xdotdotinit->acquireDetachedView(range, &xdotdotinitv); + auto xdotdotinita = xdotdotinitv.values(); + for (auto i = 0; i < xdotdotinita.size(); ++i) *out_ << xdotdotinita[i] << " "; + *out_ << "\n*** Piro::TempusSolver::evalModelImpl xdotdotinit at time = " << t_initial_ << " ***\n"; + } +#endif + } } // Set parameters as part of initial conditions @@ -393,6 +451,7 @@ void Piro::TempusSolver::evalModelImpl( RCP > solutionHistory; *out_ << "T final requested: " << t_final_ << " \n"; + piroTempusIntegrator_->advanceTime(t_final_); double time = piroTempusIntegrator_->getTime(); *out_ << "T final actual: " << time << "\n"; @@ -506,7 +565,8 @@ setStartTime(const Scalar start_time) { Teuchos::RCP > tsc_const = piroTempusIntegrator_->getTimeStepControl(); Teuchos::RCP > tsc = Teuchos::rcp_const_cast >(tsc_const); - tsc->setInitTime(start_time); + t_initial_ = start_time; + tsc->setInitTime(start_time); } template @@ -557,7 +617,7 @@ getInitTimeStep() const } template void Piro::TempusSolver:: -setObserver() +setObserver() const { Teuchos::RCP > observer = Teuchos::null; if (Teuchos::nonnull(piroObserver_)) { @@ -588,8 +648,8 @@ setInitialState(Scalar t0, piroTempusIntegrator_->initializeSolutionHistory(t0, x0, xdot0, xdotdot0); //Reset observer. This is necessary for correct observation of solution //since initializeSolutionHistory modifies the solutionHistory object. - setObserver(); - + setObserver(); + initial_state_reset_ = true; } template diff --git a/packages/piro/src/Piro_TransientSolver_Def.hpp b/packages/piro/src/Piro_TransientSolver_Def.hpp index 18c393135d1f..2ad101e43ccd 100644 --- a/packages/piro/src/Piro_TransientSolver_Def.hpp +++ b/packages/piro/src/Piro_TransientSolver_Def.hpp @@ -290,7 +290,7 @@ Piro::TransientSolver::evalConvergedModelResponsesAndSensitivities( using Teuchos::RCP; using Teuchos::rcp; - *out_ << "\nE) Calculate responses ...\n"; + *out_ << "\nF) Calculate responses ...\n"; // Solution at convergence is the response at index num_g_ RCP > gx_out = outArgs.get_g(num_g_); diff --git a/packages/piro/test/MockModelEval_A_Tpetra.cpp b/packages/piro/test/MockModelEval_A_Tpetra.cpp index ce2cebb556f0..c1e1a62f4f1d 100644 --- a/packages/piro/test/MockModelEval_A_Tpetra.cpp +++ b/packages/piro/test/MockModelEval_A_Tpetra.cpp @@ -248,6 +248,11 @@ MockModelEval_A_Tpetra::createOutArgsImpl() const Thyra::ModelEvaluatorBase::OUT_ARG_DgDx, 0, Thyra::ModelEvaluatorBase::DERIV_MV_GRADIENT_FORM); result.setSupports(Thyra::ModelEvaluatorBase::OUT_ARG_DgDp, 0, 0, Thyra::ModelEvaluatorBase::DERIV_MV_GRADIENT_FORM); + result.setSupports( + Thyra::ModelEvaluatorBase::OUT_ARG_DgDx, 0, Thyra::ModelEvaluatorBase::DERIV_MV_GRADIENT_FORM); + + result.setHessianSupports(true); + return result; } @@ -311,30 +316,105 @@ void MockModelEval_A_Tpetra::evalModelImpl( const Teuchos::RCP> dgdx_base = outArgs.get_DgDx(0).getMultiVector(); - const Teuchos::RCP dgdx_out = - Teuchos::nonnull(dgdx_base) ? - ConverterT::getTpetraMultiVector(dgdx_base) : - Teuchos::null; + const Teuchos::RCP dgdx_out = + Teuchos::nonnull(dgdx_base) ? + ConverterT::getTpetraMultiVector(dgdx_base) : + Teuchos::null; + + const Teuchos::RCP p_direction = + Teuchos::nonnull(inArgs.get_p_direction(0)) ? + ConverterT::getConstTpetraMultiVector(inArgs.get_p_direction(0)): + Teuchos::null; + + + const Teuchos::RCP lag_multiplier_f_in = + Teuchos::nonnull(inArgs.get_f_multiplier()) ? + ConverterT::getConstTpetraVector(inArgs.get_f_multiplier()) : + Teuchos::null; + + auto f_hess_xx_v = outArgs.get_hess_vec_prod_f_xx(); + const Teuchos::RCP f_hess_xx_v_out = + Teuchos::nonnull(f_hess_xx_v) ? + ConverterT::getTpetraMultiVector(f_hess_xx_v) : + Teuchos::null; + + auto f_hess_xp_v = outArgs.get_hess_vec_prod_f_xp(0); + const Teuchos::RCP f_hess_xp_v_out = + Teuchos::nonnull(f_hess_xp_v) ? + ConverterT::getTpetraMultiVector(f_hess_xp_v) : + Teuchos::null; + + auto f_hess_px_v = outArgs.get_hess_vec_prod_f_px(0); + const Teuchos::RCP f_hess_px_v_out = + Teuchos::nonnull(f_hess_px_v) ? + ConverterT::getTpetraMultiVector(f_hess_px_v) : + Teuchos::null; + + auto f_hess_pp_v = outArgs.get_hess_vec_prod_f_pp(0,0); + const Teuchos::RCP f_hess_pp_v_out = + Teuchos::nonnull(f_hess_pp_v) ? + ConverterT::getTpetraMultiVector(f_hess_pp_v) : + Teuchos::null; + + const Teuchos::RCP x_direction = + Teuchos::nonnull(inArgs.get_x_direction()) ? + ConverterT::getConstTpetraMultiVector(inArgs.get_x_direction()): + Teuchos::null; + + + const Teuchos::RCP lag_multiplier_g_in = + Teuchos::nonnull(inArgs.get_g_multiplier(0)) ? + ConverterT::getConstTpetraVector(inArgs.get_g_multiplier(0)) : + Teuchos::null; + + auto g_hess_xx_v = outArgs.get_hess_vec_prod_g_xx(0); + const Teuchos::RCP g_hess_xx_v_out = + Teuchos::nonnull(g_hess_xx_v) ? + ConverterT::getTpetraMultiVector(g_hess_xx_v) : + Teuchos::null; + + auto g_hess_xp_v = outArgs.get_hess_vec_prod_g_xp(0,0); + const Teuchos::RCP g_hess_xp_v_out = + Teuchos::nonnull(g_hess_xp_v) ? + ConverterT::getTpetraMultiVector(g_hess_xp_v) : + Teuchos::null; + + auto g_hess_px_v = outArgs.get_hess_vec_prod_g_px(0,0); + const Teuchos::RCP g_hess_px_v_out = + Teuchos::nonnull(g_hess_px_v) ? + ConverterT::getTpetraMultiVector(g_hess_px_v) : + Teuchos::null; + + auto g_hess_pp_v = outArgs.get_hess_vec_prod_g_pp(0,0,0); + const Teuchos::RCP g_hess_pp_v_out = + Teuchos::nonnull(g_hess_pp_v) ? + ConverterT::getTpetraMultiVector(g_hess_pp_v) : + Teuchos::null; auto x = x_in->getData(); auto p = p_vec->getData(); + double x0; + for (int i=0; igetMap()->getGlobalElement(i) == 0) { + x0 = x[i]; + TEUCHOS_ASSERT(comm->getRank() == 0); + } + } + comm->broadcast(0, sizeof(double), (char*)(&x0)); + if (f_out != Teuchos::null) { f_out->putScalar(0.0); auto f_out_data = f_out->getDataNonConst(); for (int i=0; igetMap()->getGlobalElement(i); - if (gid==0) {// f_0 = (x_0)^3 - p_0 + if (gid==0) { // f_0 = (x_0)^3 - p_0 f_out_data[i] = x[i] * x[i] * x[i] - p[0]; - for (int j=0; jgetData(); } if (W_out != Teuchos::null) { Teuchos::RCP W_out_crs = @@ -342,19 +422,19 @@ void MockModelEval_A_Tpetra::evalModelImpl( W_out_crs->resumeFill(); W_out_crs->setAllToScalar(0.0); - double diag=0, extra_diag=-0.5; + double diag=0, extra_diag=0; for (int i=0; igetMap()->getGlobalElement(i); + auto gid = x_in->getMap()->getGlobalElement(i); if(gid==0) { - diag = 3.0 * x[i] * x[i]; + diag = 3.0 * x0 * x0; W_out_crs->replaceLocalValues(i, 1, &diag, &i); - for (int j=0; jreplaceLocalValues(j, 1, &extra_diag, &i); } else { - diag = 1.0; + diag = 1.0 + x0 - std::cbrt(p[0]); W_out_crs->replaceLocalValues(i, 1, &diag, &i); + decltype(gid) col = 0; + extra_diag = -0.5 + x[i]; + W_out_crs->replaceGlobalValues(gid, 1, &extra_diag, &col); } } if(!Teuchos::nonnull(x_dot_in)) @@ -369,12 +449,11 @@ void MockModelEval_A_Tpetra::evalModelImpl( const int gid = x_in->getMap()->getGlobalElement(i); if (gid==0) { dfdp_out_data_0[i] = -1.0; - for (int j=0; jgetVectorNonConst(0)->getDataNonConst()[1] = -term1; } + if (Teuchos::nonnull(f_hess_xx_v_out)) { + TEUCHOS_ASSERT(Teuchos::nonnull(x_direction)); + + double x_direction_0; + for (int i=0; igetMap()->getGlobalElement(i) == 0) { + x_direction_0 = x_direction->getVector(0)->getData()[i]; + TEUCHOS_ASSERT(comm->getRank() == 0); + } + } + + double temp= lag_multiplier_f_in->dot(*x_direction->getVector(0)); + comm->broadcast(0, sizeof(double), (char*)(&x_direction_0)); + + f_hess_xx_v_out->getVectorNonConst(0)->putScalar(0); + for (int i=0; igetMap()->getGlobalElement(i)==0){ + f_hess_xx_v_out->getVectorNonConst(0)->getDataNonConst()[i] = + (6.0* x[i] - 1.0) *lag_multiplier_f_in->getData()[i] * x_direction->getVector(0)->getData()[i] + temp; + } + else { + f_hess_xx_v_out->getVectorNonConst(0)->getDataNonConst()[i] = x_direction_0 * lag_multiplier_f_in->getData()[i]; + } + } + } + + if (Teuchos::nonnull(f_hess_xp_v_out)) { + TEUCHOS_ASSERT(Teuchos::nonnull(p_direction)); + f_hess_xp_v_out->getVectorNonConst(0)->putScalar(0); + for (int i=0; igetMap()->getGlobalElement(i)!=0){ + f_hess_xp_v_out->getVectorNonConst(0)->getDataNonConst()[i] = + - p_direction->getVector(0)->getData()[0]*lag_multiplier_f_in->getData()[i]/(3.0* std::cbrt(p[0]*p[0])); + } + } + } + + if (Teuchos::nonnull(f_hess_px_v_out)) { + TEUCHOS_ASSERT(Teuchos::nonnull(x_direction)); + f_hess_px_v_out->getVectorNonConst(0)->putScalar(0); + Tpetra_Vector temp_vec(lag_multiplier_f_in->getMap()); + for (int i=0; igetMap()->getGlobalElement(i)==0) + temp_vec.getDataNonConst()[i] = 0; + else + temp_vec.getDataNonConst()[i] = lag_multiplier_f_in->getData()[i]; + } + double temp= temp_vec.dot(*x_direction->getVector(0)); + f_hess_px_v_out->getVectorNonConst(0)->getDataNonConst()[0] = -temp/(3.0* std::cbrt(p[0]*p[0])); + } + + if (Teuchos::nonnull(f_hess_pp_v_out)) { + TEUCHOS_ASSERT(Teuchos::nonnull(p_direction)); + f_hess_pp_v_out->getVectorNonConst(0)->putScalar(0); + Tpetra_Vector temp_vec(lag_multiplier_f_in->getMap()); + for (int i=0; igetMap()->getGlobalElement(i)==0) + temp_vec.getDataNonConst()[i] = 0; + else + temp_vec.getDataNonConst()[i] = lag_multiplier_f_in->getData()[i]; + } + double temp = temp_vec.dot(*x_in); + f_hess_pp_v_out->getVectorNonConst(0)->getDataNonConst()[0] = 2.0*p_direction->getVector(0)->getData()[0]*temp/(9.0* std::cbrt(std::pow(p[0],5))); + } + + double mult = Teuchos::nonnull(lag_multiplier_g_in) ? lag_multiplier_g_in->getData()[0] : 1.0; + if (Teuchos::nonnull(g_hess_xx_v_out)) { + TEUCHOS_ASSERT(Teuchos::nonnull(x_direction)); + term1 = x_direction->getVector(0)->meanValue() * vecLength; + for (int j=0; jgetVectorNonConst(0)->getDataNonConst()[j] = mult*term1; + } + + if (Teuchos::nonnull(g_hess_xp_v_out)) { + TEUCHOS_ASSERT(Teuchos::nonnull(p_direction)); + const auto direction_p = p_direction->getVector(0)->getData(); + for (int j=0; jgetVectorNonConst(0)->getDataNonConst()[j] = - mult*(direction_p[0]+direction_p[1]); + } + + if (Teuchos::nonnull(g_hess_px_v_out)) { + TEUCHOS_ASSERT(Teuchos::nonnull(x_direction)); + term1 = x_direction->getVector(0)->meanValue() * vecLength; + g_hess_px_v_out->getVectorNonConst(0)->getDataNonConst()[0] = - mult*term1; + g_hess_px_v_out->getVectorNonConst(0)->getDataNonConst()[1] = - mult*term1; + } + + if (Teuchos::nonnull(g_hess_pp_v_out)) { + TEUCHOS_ASSERT(Teuchos::nonnull(p_direction)); + const auto direction_p = p_direction->getVector(0)->getData(); + g_hess_pp_v_out->getVectorNonConst(0)->getDataNonConst()[0] = mult*(2.0*direction_p[0]+direction_p[1]); + g_hess_pp_v_out->getVectorNonConst(0)->getDataNonConst()[1] = mult*(direction_p[0]+direction_p[1]); + } + // Modify for time dependent (implicit time integration or eigensolves) if (Teuchos::nonnull(x_dot_in)) { // Velocity provided: Time dependent problem @@ -446,7 +619,7 @@ MockModelEval_A_Tpetra::createInArgsImpl() const result.setSupports(Thyra::ModelEvaluatorBase::IN_ARG_alpha, true); result.setSupports(Thyra::ModelEvaluatorBase::IN_ARG_beta, true); - result.set_Np(1); + result.set_Np_Ng(1,1); return result; } diff --git a/packages/piro/test/MockModelEval_A_Tpetra.hpp b/packages/piro/test/MockModelEval_A_Tpetra.hpp index c214b37ae2d0..b8f8a25e1b6a 100644 --- a/packages/piro/test/MockModelEval_A_Tpetra.hpp +++ b/packages/piro/test/MockModelEval_A_Tpetra.hpp @@ -70,12 +70,11 @@ typedef Thyra::TpetraOperatorVectorExtraction< * g = 0.5*(Sum(x)-Sum(p)-12)^2 + 0.5*(p0-1)^2 * subject to: * f_0 = (x_0)^3 - p_0 = 0 - * f_i = x_i^3 - (i+3)*(i+p_1)^2 for i != 0 + * f_i = x_i * (1 + x_0 - p_0^(1/3)) - (i+p_1) - 0.5*(x_0 - p_0), (for i != 0) * * solution is p = (1,3). */ - class MockModelEval_A_Tpetra : public Thyra::ModelEvaluatorDefaultBase { diff --git a/packages/piro/test/_input_Analysis_ROL_AdjointSensitivities_ReducedSpace_NOXSolver_Tpetra.xml b/packages/piro/test/_input_Analysis_ROL_AdjointSensitivities_ReducedSpace_NOXSolver_Tpetra.xml index 19dc500d096a..4963ec41b261 100644 --- a/packages/piro/test/_input_Analysis_ROL_AdjointSensitivities_ReducedSpace_NOXSolver_Tpetra.xml +++ b/packages/piro/test/_input_Analysis_ROL_AdjointSensitivities_ReducedSpace_NOXSolver_Tpetra.xml @@ -166,7 +166,7 @@ - + @@ -179,7 +179,7 @@ - + @@ -291,10 +291,10 @@ - + - + diff --git a/packages/rol/adapters/pebbl/src/algorithm/ROL_PEBBL_Driver.hpp b/packages/rol/adapters/pebbl/src/algorithm/ROL_PEBBL_Driver.hpp index 0212fd2b9acb..c85de62967c5 100644 --- a/packages/rol/adapters/pebbl/src/algorithm/ROL_PEBBL_Driver.hpp +++ b/packages/rol/adapters/pebbl/src/algorithm/ROL_PEBBL_Driver.hpp @@ -26,6 +26,9 @@ class ROL_PEBBL_Driver { public: + ROL_PEBBL_Driver(const Ptr> &branching) + : branching_(branching) {} + ROL_PEBBL_Driver(const Ptr> &factory, const Ptr &parlist, const Ptr> &bHelper, @@ -46,6 +49,15 @@ class ROL_PEBBL_Driver { } return flag; } + + const Ptr> getSolution(void) const { + if (branching_ != nullPtr) { + return dynamic_cast*>(branching_->incumbent)->getVector(); + } + else { + return nullPtr; + } + } }; } diff --git a/packages/rol/adapters/pebbl/src/algorithm/ROL_PEBBL_Interface.hpp b/packages/rol/adapters/pebbl/src/algorithm/ROL_PEBBL_Interface.hpp index eb605bf6fb6c..a71b4c60996f 100644 --- a/packages/rol/adapters/pebbl/src/algorithm/ROL_PEBBL_Interface.hpp +++ b/packages/rol/adapters/pebbl/src/algorithm/ROL_PEBBL_Interface.hpp @@ -75,7 +75,7 @@ class ROL_PEBBL_Solution : public pebbl::solution { template class ROL_PEBBL_Branching : public pebbl::branching { -private: +protected: // OptimizationProblem encapsulates the following problem // min obj(x) // subject to xl <= x <= xu @@ -99,7 +99,7 @@ class ROL_PEBBL_Branching : public pebbl::branching { : factory_(factory), parlist_(parlist), bHelper_(bHelper), verbosity_(verbosity), outStream_(outStream) {} - pebbl::branchSub* blankSub() { + virtual pebbl::branchSub* blankSub() { return new ROL_PEBBL_BranchSub(makePtrFromRef>(*this),verbosity_,outStream_); } @@ -126,7 +126,7 @@ class ROL_PEBBL_Branching : public pebbl::branching { template class ROL_PEBBL_BranchSub : public pebbl::branchSub { -private: +protected: const Ptr> branching_; const Ptr> bHelper_; std::map fixed_; @@ -306,10 +306,11 @@ class ROL_PEBBL_BranchSub : public pebbl::branchSub { return (nfrac_==0); } - void incumbentHeuristic() { + virtual void incumbentHeuristic() { Real tol(std::sqrt(ROL_EPSILON())); rndSolution_->set(*solution_); rndSolution_->applyUnary(rnd); + problem0_->getObjective()->update(*rndSolution_); Real val = problem0_->getObjective()->value(*rndSolution_,tol); branching_->foundSolution(new ROL_PEBBL_Solution(*rndSolution_,val)); } diff --git a/packages/rol/adapters/thyra/src/function/ROL_ThyraProductME_Constraint_SimOpt.hpp b/packages/rol/adapters/thyra/src/function/ROL_ThyraProductME_Constraint_SimOpt.hpp index 087daa2f8012..d22aaf2be38b 100644 --- a/packages/rol/adapters/thyra/src/function/ROL_ThyraProductME_Constraint_SimOpt.hpp +++ b/packages/rol/adapters/thyra/src/function/ROL_ThyraProductME_Constraint_SimOpt.hpp @@ -63,7 +63,7 @@ class ThyraProductME_Constraint_SimOpt : public Constraint_SimOpt { public: ThyraProductME_Constraint_SimOpt(Thyra::ModelEvaluatorDefaultBase& thyra_model_, int g_index_, const std::vector& p_indices_, - Teuchos::RCP params_ = Teuchos::null, Teuchos::EVerbosityLevel verbLevel= Teuchos::VERB_HIGH) : + Teuchos::RCP params_ = Teuchos::null, Teuchos::EVerbosityLevel verbLevel= Teuchos::VERB_HIGH) : thyra_model(thyra_model_), g_index(g_index_), p_indices(p_indices_), params(params_), out(Teuchos::VerboseObjectBase::getDefaultOStream()), verbosityLevel(verbLevel){ @@ -143,7 +143,7 @@ class ThyraProductME_Constraint_SimOpt : public Constraint_SimOpt { std::cout << "Norm: " << c.norm() < { outArgs.set_DfDp(i,dfdp_op); } else { TEUCHOS_TEST_FOR_EXCEPTION(!ds.supports(Thyra::ModelEvaluatorBase::DERIV_LINEAR_OP), - std::logic_error, - std::endl << - "ROL::ThyraProductME_Constraint_SimOpt::applyJacobian_2(): " << - "The code related to df/dp multivector has been commented out because never tested. " << - std::endl); + std::logic_error, + std::endl << + "ROL::ThyraProductME_Constraint_SimOpt::applyJacobian_2(): " << + "The code related to df/dp multivector has been commented out because never tested. " << + std::endl); - /* + /* if (ds.supports(Thyra::ModelEvaluatorBase::DERIV_MV_GRADIENT_FORM) && f_space_plus->isLocallyReplicated()) { auto dfdp = Thyra::createMembers(p_space, f_space->dim()); @@ -277,7 +277,7 @@ class ThyraProductME_Constraint_SimOpt : public Constraint_SimOpt { "DERIV_MV_BY_COL with p not distributed, or " "DERIV_TRANS_MV_BY_ROW with f not distributed." << std::endl); - */ + */ } } @@ -296,12 +296,12 @@ class ThyraProductME_Constraint_SimOpt : public Constraint_SimOpt { thyra_jv.axpy(1.0, *temp_jv_ptr); } else { TEUCHOS_TEST_FOR_EXCEPTION( - dfdp_op == Teuchos::null, - std::logic_error, - std::endl << - "ROL::ThyraProductME_Constraint_SimOpt::applyJacobian_2(): " << - "The code related to df/dp multivector has been commented out because never tested. " << - std::endl); + dfdp_op == Teuchos::null, + std::logic_error, + std::endl << + "ROL::ThyraProductME_Constraint_SimOpt::applyJacobian_2(): " << + "The code related to df/dp multivector has been commented out because never tested. " << + std::endl); /* Thyra::ModelEvaluatorBase::EDerivativeMultiVectorOrientation dfdp_orient = outArgs.get_DfDp(i).getMultiVectorOrientation(); @@ -336,7 +336,7 @@ class ThyraProductME_Constraint_SimOpt : public Constraint_SimOpt { jv_view(ix) += v_view(0,ip)*dfdp_view(ix,ip); } } - */ + */ } } } @@ -625,14 +625,14 @@ class ThyraProductME_Constraint_SimOpt : public Constraint_SimOpt { outArgs.set_DfDp(i,dfdp_op); } else { TEUCHOS_TEST_FOR_EXCEPTION( - !ds.supports(Thyra::ModelEvaluatorBase::DERIV_LINEAR_OP), - std::logic_error, - std::endl << - "ROL::ThyraProductME_Constraint_SimOpt::applyAdjointJacobian_2(): " << - "The code related to df/dp multivector has been commented out because never tested. " << - std::endl); - - /* + !ds.supports(Thyra::ModelEvaluatorBase::DERIV_LINEAR_OP), + std::logic_error, + std::endl << + "ROL::ThyraProductME_Constraint_SimOpt::applyAdjointJacobian_2(): " << + "The code related to df/dp multivector has been commented out because never tested. " << + std::endl); + + /* if (ds.supports(Thyra::ModelEvaluatorBase::DERIV_MV_GRADIENT_FORM) && f_space_plus->isLocallyReplicated()) { auto dfdp = Thyra::createMembers(p_space, f_space->dim()); @@ -654,7 +654,7 @@ class ThyraProductME_Constraint_SimOpt : public Constraint_SimOpt { "DERIV_MV_BY_COL with p not distributed, or " "DERIV_TRANS_MV_BY_ROW with f not distributed." << std::endl); - */ + */ } } @@ -671,12 +671,12 @@ class ThyraProductME_Constraint_SimOpt : public Constraint_SimOpt { // Thyra::update(1.0, *tmp, thyra_ajv.getMultiVector().ptr()); } else { TEUCHOS_TEST_FOR_EXCEPTION( - dfdp_op == Teuchos::null, - std::logic_error, - std::endl << - "ROL::ThyraProductME_Constraint_SimOpt::applyAdjointJacobian_2(): " << - "The code related to df/dp multivector has been commented out because never tested. " << - std::endl); + dfdp_op == Teuchos::null, + std::logic_error, + std::endl << + "ROL::ThyraProductME_Constraint_SimOpt::applyAdjointJacobian_2(): " << + "The code related to df/dp multivector has been commented out because never tested. " << + std::endl); /* Thyra::ModelEvaluatorBase::EDerivativeMultiVectorOrientation dfdp_orient = outArgs.get_DfDp(i).getMultiVectorOrientation(); @@ -710,7 +710,7 @@ class ThyraProductME_Constraint_SimOpt : public Constraint_SimOpt { ajv_view(ip) += v_view(0,ix)*dfdp_view(ix,ip); } } - */ + */ } } } @@ -776,9 +776,332 @@ class ThyraProductME_Constraint_SimOpt : public Constraint_SimOpt { } + void applyAdjointHessian_11(Vector &ahwv, + const Vector &w, + const Vector &v, + const Vector &u, + const Vector &z, + Real &tol) { + +#ifdef HAVE_ROL_DEBUG + //u and z should be updated in the update functions before calling this function + TEUCHOS_ASSERT(!u_hasChanged(u)); + TEUCHOS_ASSERT(!z_hasChanged(z)); +#endif + + if(verbosityLevel >= Teuchos::VERB_MEDIUM) + *out << "ROL::ThyraProductME_Constraint_SimOpt::applyAdjointHessian_11" << std::endl; + + Thyra::ModelEvaluatorBase::OutArgs outArgs = thyra_model.createOutArgs(); + bool supports_deriv = outArgs.supports(Thyra::ModelEvaluatorBase::OUT_ARG_hess_vec_prod_f_xx); + + if(supports_deriv) { //use derivatives computed by model evaluator + const ThyraVector & thyra_p = dynamic_cast&>(z); + const ThyraVector & thyra_x = dynamic_cast&>(u); + const ThyraVector & thyra_v = dynamic_cast&>(v); + const ThyraVector & thyra_w = dynamic_cast&>(w); + + Teuchos::RCP > thyra_prodvec_p = Teuchos::rcp_dynamic_cast>(thyra_p.getVector()); + ThyraVector & thyra_ahwv = dynamic_cast&>(ahwv); + + Thyra::ModelEvaluatorBase::InArgs inArgs = thyra_model.createInArgs(); + + for(std::size_t i=0; igetVectorBlock(i)); + } + inArgs.set_x(thyra_x.getVector()); + inArgs.set_x_direction(thyra_v.getVector()); + + inArgs.set_f_multiplier(thyra_w.getVector()); + + ROL_TEST_FOR_EXCEPTION( !supports_deriv, std::logic_error, "ROL::ThyraProductME_Constraint: H_xx product vector is not supported"); + outArgs.set_hess_vec_prod_f_xx(thyra_ahwv.getVector()); + + thyra_model.evalModel(inArgs, outArgs); + + } else { //compute derivatives with 2nd-order finite differences + + Real jtol = std::sqrt(ROL_EPSILON()); + // Compute step size + Real h = std::cbrt(ROL_EPSILON());; + if (v.norm() > h) { + h *= std::max(1.0,u.norm()/v.norm()); + } + // Evaluate Jacobian at (u+hv,z) + Ptr> unew = u.clone(); + unew->set(u); + unew->axpy(h,v); + this->update(*unew,z); + applyAdjointJacobian_1(ahwv,w,*unew,z,jtol); + // Evaluate Jacobian at (u-hv,z) + Ptr> jv = ahwv.clone(); + unew->axpy(-2.*h,v); + this->update(*unew,z); + applyAdjointJacobian_1(*jv,w,*unew,z,jtol); + // Compute Newton quotient + ahwv.axpy(-1.0,*jv); + ahwv.scale(0.5/h); + } + } + + + void applyAdjointHessian_12(Vector &ahwv, + const Vector &w, + const Vector &v, + const Vector &u, + const Vector &z, + Real &/*tol*/) { + +#ifdef HAVE_ROL_DEBUG + //u and z should be updated in the update functions before calling this function + TEUCHOS_ASSERT(!u_hasChanged(u)); + TEUCHOS_ASSERT(!z_hasChanged(z)); +#endif + + if(verbosityLevel >= Teuchos::VERB_MEDIUM) + *out << "ROL::ThyraProductME_Constraint_SimOpt::applyAdjointHessian_12" << std::endl; + + Thyra::ModelEvaluatorBase::OutArgs outArgs = thyra_model.createOutArgs(); + + bool supports_deriv = true; + for(std::size_t i=0; i & thyra_p = dynamic_cast&>(z); + const ThyraVector & thyra_x = dynamic_cast&>(u); + const ThyraVector & thyra_v = dynamic_cast&>(v); + const ThyraVector & thyra_w = dynamic_cast&>(w); + + Teuchos::RCP > thyra_prodvec_p = Teuchos::rcp_dynamic_cast>(thyra_p.getVector()); + ThyraVector & thyra_ahwv = dynamic_cast&>(ahwv); + + Teuchos::RCP< Thyra::ProductVectorBase > prodvec_ahwv = Teuchos::rcp_dynamic_cast>(thyra_ahwv.getVector()); + + Thyra::ModelEvaluatorBase::InArgs inArgs = thyra_model.createInArgs(); + + for(std::size_t i=0; igetVectorBlock(i)); + } + inArgs.set_x(thyra_x.getVector()); + inArgs.set_x_direction(thyra_v.getVector()); + inArgs.set_f_multiplier(thyra_w.getVector()); + + for(std::size_t i=0; igetNonconstVectorBlock(i)); + } + thyra_model.evalModel(inArgs, outArgs); + + } else { //compute derivatives with 2nd-order finite differences + + + Real jtol = std::sqrt(ROL_EPSILON()); + // Compute step size + Real h = std::cbrt(ROL_EPSILON()); + if (v.norm() > h) { + h *= std::max(1.0,u.norm()/v.norm()); + } + // Evaluate Jacobian at (u+hv,z) + Ptr> unew = u.clone(); + unew->set(u); + unew->axpy(h,v); + this->update(*unew,z); + applyAdjointJacobian_2(ahwv,w,*unew,z,jtol); + // Evaluate Jacobian at (u - hv,z) + Ptr> jv = ahwv.clone(); + unew->axpy(-2.0*h,v); + this->update(*unew,z); + applyAdjointJacobian_2(*jv,w,*unew,z,jtol); + // Compute Newton quotient + ahwv.axpy(-1.0,*jv); + ahwv.scale(0.5/h); + } + } + + + void applyAdjointHessian_21(Vector &ahwv, + const Vector &w, + const Vector &v, + const Vector &u, + const Vector &z, + Real &/*tol*/) { + +#ifdef HAVE_ROL_DEBUG + //u and z should be updated in the update functions before calling this function + TEUCHOS_ASSERT(!u_hasChanged(u)); + TEUCHOS_ASSERT(!z_hasChanged(z)); +#endif + + if(verbosityLevel >= Teuchos::VERB_MEDIUM) + *out << "ROL::ThyraProductME_Constraint_SimOpt::applyAdjointHessian_21" << std::endl; + + Thyra::ModelEvaluatorBase::OutArgs outArgs = thyra_model.createOutArgs(); + bool supports_deriv = true; + for(std::size_t j=0; j & thyra_p = dynamic_cast&>(z); + const ThyraVector & thyra_x = dynamic_cast&>(u); + const ThyraVector & thyra_v = dynamic_cast&>(v); + const ThyraVector & thyra_w = dynamic_cast&>(w); + + Teuchos::RCP > thyra_prodvec_p = Teuchos::rcp_dynamic_cast>(thyra_p.getVector()); + Teuchos::RCP > thyra_prodvec_v = Teuchos::rcp_dynamic_cast>(thyra_v.getVector()); + ThyraVector & thyra_ahwv = dynamic_cast&>(ahwv); + + Thyra::ModelEvaluatorBase::InArgs inArgs = thyra_model.createInArgs(); + + for(std::size_t i=0; igetVectorBlock(i)); + inArgs.set_p_direction(p_indices[i], thyra_prodvec_v->getVectorBlock(i)); + } + + inArgs.set_x(thyra_x.getVector()); + inArgs.set_f_multiplier(thyra_w.getVector()); + + std::vector > > ahwv_vec(p_indices.size()); + + ahwv_vec[0] = thyra_ahwv.getVector(); + for(std::size_t j=1; jclone_v(); + } + + for(std::size_t j=0; jupdate(1.0, *ahwv_vec[j]); + + } else { //compute derivatives with 2nd-order finite differences + + Real jtol = std::sqrt(ROL_EPSILON()); + // Compute step size + Real h = std::cbrt(ROL_EPSILON()); + if (v.norm() > h) { + h *= std::max(1.0,u.norm()/v.norm()); + } + // Evaluate Jacobian at (u,z+hv) + Ptr> znew = z.clone(); + znew->set(z); + znew->axpy(h,v); + this->update(u,*znew); + applyAdjointJacobian_1(ahwv,w,u,*znew,jtol); + // Evaluate Jacobian at (u,z-hv) + Ptr> jv = ahwv.clone(); + znew->axpy(-2.0*h,v); + this->update(u,*znew); + applyAdjointJacobian_1(*jv,w,u,*znew,jtol); + // Compute Newton quotient + ahwv.axpy(-1.0,*jv); + ahwv.scale(0.5/h); + } + } + + void applyAdjointHessian_22(Vector &ahwv, + const Vector &w, + const Vector &v, + const Vector &u, + const Vector &z, + Real &/*tol*/) { + +#ifdef HAVE_ROL_DEBUG + //u and z should be updated in the update functions before calling this function + TEUCHOS_ASSERT(!u_hasChanged(u)); + TEUCHOS_ASSERT(!z_hasChanged(z)); +#endif + + if(verbosityLevel >= Teuchos::VERB_MEDIUM) + *out << "ROL::ThyraProductME_Constraint_SimOpt::applyAdjointHessian_22" << std::endl; + + Thyra::ModelEvaluatorBase::OutArgs outArgs = thyra_model.createOutArgs(); + bool supports_deriv = true; + for(std::size_t i=0; i & thyra_p = dynamic_cast&>(z); + const ThyraVector & thyra_x = dynamic_cast&>(u); + const ThyraVector & thyra_v = dynamic_cast&>(v); + const ThyraVector & thyra_w = dynamic_cast&>(w); + + Teuchos::RCP > thyra_prodvec_p = Teuchos::rcp_dynamic_cast>(thyra_p.getVector()); + Teuchos::RCP > thyra_prodvec_v = Teuchos::rcp_dynamic_cast>(thyra_v.getVector()); + ThyraVector & thyra_ahwv = dynamic_cast&>(ahwv); + + Teuchos::RCP< Thyra::ProductMultiVectorBase > prodvec_ahwv = Teuchos::rcp_dynamic_cast>(thyra_ahwv.getVector()); + + Thyra::ModelEvaluatorBase::InArgs inArgs = thyra_model.createInArgs(); + + for(std::size_t i=0; igetVectorBlock(i)); + inArgs.set_p_direction(p_indices[i], thyra_prodvec_v->getVectorBlock(i)); + } + inArgs.set_x(thyra_x.getVector()); + inArgs.set_f_multiplier(thyra_w.getVector()); + + std::vector > > > ahwv_vec(p_indices.size()); + + for(std::size_t i=0; igetNonconstMultiVectorBlock(i); + for(std::size_t j=1; jclone_mv(); + } + } + + for(std::size_t i=0; iupdate(1.0, *ahwv_vec[i][j]); + } + } else { //compute derivatives with 2nd-order finite differences + + Real jtol = std::sqrt(ROL_EPSILON()); + // Compute step size + Real h = std::cbrt(ROL_EPSILON()); + if (v.norm() > h) { + h *= std::max(1.0,u.norm()/v.norm()); + } + // Evaluate Jacobian at (u,z+hv) + Ptr> znew = z.clone(); + znew->set(z); + znew->axpy(h,v); + this->update(u,*znew); + applyAdjointJacobian_2(ahwv,w,u,*znew,jtol); + // Evaluate Jacobian at (u,z-hv) + Ptr> jv = ahwv.clone(); + znew->axpy(-2.0*h,v); + this->update(u,*znew); + applyAdjointJacobian_2(*jv,w,u,*znew,jtol); + // Compute Newton quotient + ahwv.axpy(-1.0,*jv); + ahwv.scale(0.5/h); + } + } + /** \brief Update constraint functions with respect to Sim variable. x is the optimization variable, - flag = ??, + flag = true if optimization variable is changed, iter is the outer algorithm iterations count. */ void update_1( const Vector &u, bool /*flag*/ = true, int iter = -1 ) { diff --git a/packages/rol/adapters/thyra/src/function/ROL_ThyraProductME_Objective_SimOpt.hpp b/packages/rol/adapters/thyra/src/function/ROL_ThyraProductME_Objective_SimOpt.hpp index fae187499e71..ce734b8d9cdf 100644 --- a/packages/rol/adapters/thyra/src/function/ROL_ThyraProductME_Objective_SimOpt.hpp +++ b/packages/rol/adapters/thyra/src/function/ROL_ThyraProductME_Objective_SimOpt.hpp @@ -60,9 +60,9 @@ class ThyraProductME_Objective_SimOpt : public Objective_SimOpt { ThyraProductME_Objective_SimOpt(Thyra::ModelEvaluatorDefaultBase& thyra_model_, int g_index_, const std::vector& p_indices_, Teuchos::RCP params_ = Teuchos::null, Teuchos::EVerbosityLevel verbLevel= Teuchos::VERB_HIGH) : - thyra_model(thyra_model_), g_index(g_index_), p_indices(p_indices_), params(params_), - out(Teuchos::VerboseObjectBase::getDefaultOStream()), - verbosityLevel(verbLevel) { + thyra_model(thyra_model_), g_index(g_index_), p_indices(p_indices_), params(params_), + out(Teuchos::VerboseObjectBase::getDefaultOStream()), + verbosityLevel(verbLevel) { computeValue = computeGradient1 = computeGradient2 = true; value_ = 0; rol_u_ptr = rol_z_ptr = Teuchos::null; @@ -169,7 +169,7 @@ class ThyraProductME_Objective_SimOpt : public Objective_SimOpt { if(computeValue) { if(verbosityLevel >= Teuchos::VERB_HIGH) - *out << "ROL::ThyraProductME_Objective_SimOpt::gradient_1, Computing Value" << std::endl; + *out << "ROL::ThyraProductME_Objective_SimOpt::gradient_1, Computing Value" << std::endl; value_ = ::Thyra::get_ele(*thyra_g,0); computeValue = false; } @@ -254,6 +254,322 @@ class ThyraProductME_Objective_SimOpt : public Objective_SimOpt { computeGradient2 = false; } + + void hessVec_11( Vector &hv, const Vector &v, + const Vector &u, const Vector &z, Real &/*tol*/ ) { + +#ifdef HAVE_ROL_DEBUG + //u and z should be updated in the update functions before calling this function + TEUCHOS_ASSERT(!u_hasChanged(u)); + TEUCHOS_ASSERT(!z_hasChanged(z)); +#endif + + if(verbosityLevel >= Teuchos::VERB_MEDIUM) + *out << "ROL::ThyraProductME_Objective_SimOpt::hessVec_11" << std::endl; + + Thyra::ModelEvaluatorBase::OutArgs outArgs = thyra_model.createOutArgs(); + bool supports_deriv = outArgs.supports(Thyra::ModelEvaluatorBase::OUT_ARG_hess_vec_prod_g_xx, g_index); + + if(supports_deriv) { //use derivatives computed by model evaluator + + const ThyraVector & thyra_p = dynamic_cast&>(z); + const ThyraVector & thyra_x = dynamic_cast&>(u); + const ThyraVector & thyra_v = dynamic_cast&>(v); + + Teuchos::RCP > thyra_prodvec_p = Teuchos::rcp_dynamic_cast>(thyra_p.getVector()); + ThyraVector & thyra_hv = dynamic_cast&>(hv); + + Thyra::ModelEvaluatorBase::InArgs inArgs = thyra_model.createInArgs(); + + for(std::size_t i=0; igetVectorBlock(i)); + } + inArgs.set_x(thyra_x.getVector()); + inArgs.set_x_direction(thyra_v.getVector()); + + Teuchos::RCP< Thyra::VectorBase > multiplier_g = Thyra::createMember(thyra_model.get_g_multiplier_space(g_index)); + Thyra::put_scalar(1.0, multiplier_g.ptr()); + inArgs.set_g_multiplier(g_index, multiplier_g); + + ROL_TEST_FOR_EXCEPTION( !supports_deriv, std::logic_error, "ROL::ThyraProductME_Objective: H_xx product vector is not supported"); + outArgs.set_hess_vec_prod_g_xx(g_index, thyra_hv.getVector()); + + thyra_model.evalModel(inArgs, outArgs); + + } else { //compute derivatives with 2nd-order finite differences + + Real gtol = std::sqrt(ROL_EPSILON()); + // Compute step length + Real h = std::cbrt(ROL_EPSILON()); + if (v.norm() > h) { + h *= std::max(1.0,u.norm()/v.norm()); + } + // Evaluate gradient of first component at (u+hv,z) + ROL::Ptr > unew = u.clone(); + unew->set(u); + unew->axpy(h,v); + this->update(*unew,z); + hv.zero(); + this->gradient_1(hv,*unew,z,gtol); + // Evaluate gradient of first component at (u-hv,z) + ROL::Ptr > g = hv.clone(); + unew->axpy(-2.0*h,v); + this->update(*unew,z); + this->gradient_1(*g,*unew,z,gtol); + // Compute Newton quotient + hv.axpy(-1.0,*g); + hv.scale(0.5/h); + } + } + + void hessVec_12( Vector &hv, const Vector &v, + const Vector &u, const Vector &z, Real &/*tol*/ ) { + +#ifdef HAVE_ROL_DEBUG + //u and z should be updated in the update functions before calling this function + TEUCHOS_ASSERT(!u_hasChanged(u)); + TEUCHOS_ASSERT(!z_hasChanged(z)); +#endif + + if(verbosityLevel >= Teuchos::VERB_MEDIUM) + *out << "ROL::ThyraProductME_Objective_SimOpt::hessVec_12" << std::endl; + + Thyra::ModelEvaluatorBase::OutArgs outArgs = thyra_model.createOutArgs(); + bool supports_deriv = true; + for(std::size_t j=0; j & thyra_p = dynamic_cast&>(z); + const ThyraVector & thyra_x = dynamic_cast&>(u); + const ThyraVector & thyra_v = dynamic_cast&>(v); + + Teuchos::RCP > thyra_prodvec_p = Teuchos::rcp_dynamic_cast>(thyra_p.getVector()); + Teuchos::RCP > thyra_prodvec_v = Teuchos::rcp_dynamic_cast>(thyra_v.getVector()); + ThyraVector & thyra_hv = dynamic_cast&>(hv); + + Thyra::ModelEvaluatorBase::InArgs inArgs = thyra_model.createInArgs(); + + for(std::size_t i=0; igetVectorBlock(i)); + inArgs.set_p_direction(p_indices[i], thyra_prodvec_v->getVectorBlock(i)); + } + inArgs.set_x(thyra_x.getVector()); + + Teuchos::RCP< Thyra::VectorBase > multiplier_g = Thyra::createMember(thyra_model.get_g_multiplier_space(g_index)); + Thyra::put_scalar(1.0, multiplier_g.ptr()); + inArgs.set_g_multiplier(g_index, multiplier_g); + + std::vector > > hv_vec(p_indices.size()); + + hv_vec[0] = thyra_hv.getVector(); + for(std::size_t j=1; jclone_v(); + } + + for(std::size_t j=0; jupdate(1.0, *hv_vec[j]); + + } else { //compute derivatives with 2nd-order finite differences + + Real gtol = std::sqrt(ROL_EPSILON()); + // Compute step length + Real h = std::cbrt(ROL_EPSILON()); + if (v.norm() > h) { + h *= std::max(1.0,u.norm()/v.norm()); + } + // Evaluate gradient of first component at (u,z+hv) + ROL::Ptr > znew = z.clone(); + znew->set(z); + znew->axpy(h,v); + this->update(u,*znew); + hv.zero(); + this->gradient_1(hv,u,*znew,gtol); + // Evaluate gradient of first component at (u,z-hv) + ROL::Ptr > g = hv.clone(); + znew->axpy(-2.0*h,v); + this->update(u,*znew); + this->gradient_1(*g,u,*znew,gtol); + // Compute Newton quotient + hv.axpy(-1.0,*g); + hv.scale(0.5/h); + } + } + + void hessVec_21( Vector &hv, const Vector &v, + const Vector &u, const Vector &z, Real &/*tol*/ ) { + +#ifdef HAVE_ROL_DEBUG + //u and z should be updated in the update functions before calling this function + TEUCHOS_ASSERT(!u_hasChanged(u)); + TEUCHOS_ASSERT(!z_hasChanged(z)); +#endif + + if(verbosityLevel >= Teuchos::VERB_MEDIUM) + *out << "ROL::ThyraProductME_Objective_SimOpt::hessVec_21" << std::endl; + + + Thyra::ModelEvaluatorBase::OutArgs outArgs = thyra_model.createOutArgs(); + + bool supports_deriv = true; + for(std::size_t i=0; i & thyra_p = dynamic_cast&>(z); + const ThyraVector & thyra_x = dynamic_cast&>(u); + const ThyraVector & thyra_v = dynamic_cast&>(v); + + Teuchos::RCP > thyra_prodvec_p = Teuchos::rcp_dynamic_cast>(thyra_p.getVector()); + ThyraVector & thyra_hv = dynamic_cast&>(hv); + + Teuchos::RCP< Thyra::ProductMultiVectorBase > prodvec_hv = Teuchos::rcp_dynamic_cast>(thyra_hv.getVector()); + + Thyra::ModelEvaluatorBase::InArgs inArgs = thyra_model.createInArgs(); + + for(std::size_t i=0; igetVectorBlock(i)); + } + inArgs.set_x(thyra_x.getVector()); + inArgs.set_x_direction(thyra_v.getVector()); + + Teuchos::RCP< Thyra::VectorBase > multiplier_g = Thyra::createMember(thyra_model.get_g_multiplier_space(g_index)); + Thyra::put_scalar(1.0, multiplier_g.ptr()); + inArgs.set_g_multiplier(g_index, multiplier_g); + + Thyra::ModelEvaluatorBase::OutArgs outArgs = thyra_model.createOutArgs(); + + for(std::size_t i=0; igetNonconstMultiVectorBlock(i)); + } + thyra_model.evalModel(inArgs, outArgs); + + } else { //compute derivatives with 2nd-order finite differences + + Real gtol = std::sqrt(ROL_EPSILON()); + // Compute step length + Real h = std::cbrt(ROL_EPSILON());; + if (v.norm() > h) { + h *= std::max(1.0,u.norm()/v.norm()); + } + // Evaluate gradient of first component at (u+hv,z) + ROL::Ptr > unew = u.clone(); + unew->set(u); + unew->axpy(h,v); + this->update(*unew,z); + hv.zero(); + this->gradient_2(hv,*unew,z,gtol); + // Evaluate gradient of first component at (u-hv,z) + ROL::Ptr > g = hv.clone(); + unew->axpy(-2.0*h,v); + this->update(*unew,z); + this->gradient_2(*g,*unew,z,gtol); + // Compute Newton quotient + hv.axpy(-1.0,*g); + hv.scale(0.5/h); + } + } + + void hessVec_22( Vector &hv, const Vector &v, + const Vector &u, const Vector &z, Real &/*tol*/ ) { + +#ifdef HAVE_ROL_DEBUG + //u and z should be updated in the update functions before calling this function + TEUCHOS_ASSERT(!u_hasChanged(u)); + TEUCHOS_ASSERT(!z_hasChanged(z)); +#endif + + if(verbosityLevel >= Teuchos::VERB_MEDIUM) + *out << "ROL::ThyraProductME_Objective_SimOpt::hessVec_22" << std::endl; + + Thyra::ModelEvaluatorBase::OutArgs outArgs = thyra_model.createOutArgs(); + bool supports_deriv = true; + for(std::size_t i=0; i & thyra_p = dynamic_cast&>(z); + const ThyraVector & thyra_x = dynamic_cast&>(u); + const ThyraVector & thyra_v = dynamic_cast&>(v); + + Teuchos::RCP > thyra_prodvec_p = Teuchos::rcp_dynamic_cast>(thyra_p.getVector()); + Teuchos::RCP > thyra_prodvec_v = Teuchos::rcp_dynamic_cast>(thyra_v.getVector()); + ThyraVector & thyra_hv = dynamic_cast&>(hv); + + Teuchos::RCP< Thyra::ProductMultiVectorBase > prodvec_hv = Teuchos::rcp_dynamic_cast>(thyra_hv.getVector()); + + Thyra::ModelEvaluatorBase::InArgs inArgs = thyra_model.createInArgs(); + + for(std::size_t i=0; igetVectorBlock(i)); + inArgs.set_p_direction(p_indices[i], thyra_prodvec_v->getVectorBlock(i)); + } + inArgs.set_x(thyra_x.getVector()); + Teuchos::RCP< Thyra::VectorBase > multiplier_g = Thyra::createMember(thyra_model.get_g_multiplier_space(g_index)); + Thyra::put_scalar(1.0, multiplier_g.ptr()); + inArgs.set_g_multiplier(g_index, multiplier_g); + + std::vector > > > hv_vec(p_indices.size()); + + for(std::size_t i=0; igetNonconstMultiVectorBlock(i); + for(std::size_t j=1; jclone_mv(); + } + } + + for(std::size_t i=0; iupdate(1.0, *hv_vec[i][j]); + } + } else { //compute derivatives with 2nd-order finite differences + + Real gtol = std::sqrt(ROL_EPSILON()); + // Compute step length + Real h = std::cbrt(ROL_EPSILON()); + if (v.norm() > h) { + h *= std::max(1.0,u.norm()/v.norm()); + } + // Evaluate gradient of first component at (u,z+hv) + ROL::Ptr > znew = z.clone(); + znew->set(z); + znew->axpy(h,v); + update(u,*znew); + hv.zero(); + gradient_2(hv,u,*znew,gtol); + // Evaluate gradient of first component at (u,z-hv) + ROL::Ptr > g = hv.clone(); + znew->axpy(-2.0*h,v); + update(u,*znew); + gradient_2(*g,u,*znew,gtol); + // Compute Newton quotient + hv.axpy(-1.0,*g); + hv.scale(0.5/h); + } + } + void update( const Vector &u, const Vector &z, bool /*flag*/ = true, int iter = -1) { if(z_hasChanged(z) || u_hasChanged(u)) { if(verbosityLevel >= Teuchos::VERB_HIGH) diff --git a/packages/rol/example/PDE-OPT/TOOLS/assembler.hpp b/packages/rol/example/PDE-OPT/TOOLS/assembler.hpp index 3709e2941a35..b3d9704a4ba2 100644 --- a/packages/rol/example/PDE-OPT/TOOLS/assembler.hpp +++ b/packages/rol/example/PDE-OPT/TOOLS/assembler.hpp @@ -162,11 +162,11 @@ class Assembler { int myRank_, numProcs_; // Set in SetBasis. - std::vector>>> basisPtrs_; + std::vector>>> basisPtrs1_, basisPtrs2_; // Set in SetDiscretization. ROL::Ptr> meshMgr_; - ROL::Ptr> dofMgr_; + ROL::Ptr> dofMgr1_, dofMgr2_; // Set in SetParallelStructure. int numCells_; @@ -216,7 +216,8 @@ class Assembler { Teuchos::ParameterList &parlist, std::ostream &outStream = std::cout); void setBasis( - const std::vector>>> &basisPtrs, + const std::vector>>> &basisPtrs1, + const std::vector>>> &basisPtrs2, Teuchos::ParameterList &parlist, std::ostream &outStream = std::cout); void setDiscretization(Teuchos::ParameterList &parlist, @@ -237,16 +238,24 @@ class Assembler { Real assembleScalar(ROL::Ptr> &val); void assembleFieldVector(ROL::Ptr> &v, ROL::Ptr> &val, - ROL::Ptr> &vecOverlap); + ROL::Ptr> &vecOverlap, + const ROL::Ptr> &dofMgr); void assembleParamVector(ROL::Ptr> &v, std::vector>> &val); void assembleFieldMatrix(ROL::Ptr> &M, - ROL::Ptr> &val); + ROL::Ptr> &val, + const ROL::Ptr> &dofMgr1, + const ROL::Ptr> &dofMgr2); void assembleParamFieldMatrix(ROL::Ptr> &M, std::vector>> &val, - ROL::Ptr> &matOverlap); + ROL::Ptr> &matOverlap, + const ROL::Ptr> &dofMgr); void assembleParamMatrix(ROL::Ptr>> &M, - std::vector>>> &val); + std::vector>>> &val, + const ROL::Ptr> &dofMgr); + void transformToFieldPattern(const ROL::Ptr> &array, + const ROL::Ptr> &dofMgr1, + const ROL::Ptr> &dofMgr2 = ROL::nullPtr) const; public: // destructor @@ -262,6 +271,19 @@ class Assembler { const ROL::Ptr> &comm, Teuchos::ParameterList &parlist, std::ostream &outStream = std::cout); + // Constuctor: Discretization set from ParameterList + Assembler(const std::vector>>> &basisPtrs1, + const std::vector>>> &basisPtrs2, + const ROL::Ptr> &comm, + Teuchos::ParameterList &parlist, + std::ostream &outStream = std::cout); + // Constructor: Discretization set from MeshManager input + Assembler(const std::vector>>> &basisPtrs1, + const std::vector>>> &basisPtrs2, + const ROL::Ptr> &meshMgr, + const ROL::Ptr> &comm, + Teuchos::ParameterList &parlist, + std::ostream &outStream = std::cout); void setCellNodes(PDE &pde) const; void setCellNodes(DynamicPDE &pde) const; @@ -687,6 +709,7 @@ class Assembler { /* Accessor routines. */ /***************************************************************************/ const ROL::Ptr> getDofManager(void) const; + const ROL::Ptr> getDofManager2(void) const; Teuchos::Array getCellIds(void) const; /***************************************************************************/ /* End of accessor routines. */ diff --git a/packages/rol/example/PDE-OPT/TOOLS/assembler_def.hpp b/packages/rol/example/PDE-OPT/TOOLS/assembler_def.hpp index 85b095f72e8f..c3da6cf0625e 100644 --- a/packages/rol/example/PDE-OPT/TOOLS/assembler_def.hpp +++ b/packages/rol/example/PDE-OPT/TOOLS/assembler_def.hpp @@ -63,7 +63,7 @@ Assembler::Assembler( : isJ1Transposed_(false), isJ2Transposed_(false), isJuoTransposed_(false), isJunTransposed_(false), isJzfTransposed_(false) { setCommunicator(comm,parlist,outStream); - setBasis(basisPtrs,parlist,outStream); + setBasis(basisPtrs,basisPtrs,parlist,outStream); setDiscretization(parlist,ROL::nullPtr,outStream); setParallelStructure(parlist,outStream); setCellNodes(outStream); @@ -80,7 +80,41 @@ Assembler::Assembler( : isJ1Transposed_(false), isJ2Transposed_(false), isJuoTransposed_(false), isJunTransposed_(false), isJzfTransposed_(false) { setCommunicator(comm,parlist,outStream); - setBasis(basisPtrs,parlist,outStream); + setBasis(basisPtrs,basisPtrs,parlist,outStream); + setDiscretization(parlist,meshMgr,outStream); + setParallelStructure(parlist,outStream); + setCellNodes(outStream); +} +// Constuctor: Discretization set from ParameterList +template +Assembler::Assembler( + const std::vector>>> &basisPtrs1, + const std::vector>>> &basisPtrs2, + const ROL::Ptr> &comm, + Teuchos::ParameterList &parlist, + std::ostream &outStream) + : isJ1Transposed_(false), isJ2Transposed_(false), + isJuoTransposed_(false), isJunTransposed_(false), isJzfTransposed_(false) { + setCommunicator(comm,parlist,outStream); + setBasis(basisPtrs1,basisPtrs2,parlist,outStream); + setDiscretization(parlist,ROL::nullPtr,outStream); + setParallelStructure(parlist,outStream); + setCellNodes(outStream); +} + +// Constructor: Discretization set from MeshManager input +template +Assembler::Assembler( + const std::vector>>> &basisPtrs1, + const std::vector>>> &basisPtrs2, + const ROL::Ptr> &meshMgr, + const ROL::Ptr> &comm, + Teuchos::ParameterList &parlist, + std::ostream &outStream) + : isJ1Transposed_(false), isJ2Transposed_(false), + isJuoTransposed_(false), isJunTransposed_(false), isJzfTransposed_(false) { + setCommunicator(comm,parlist,outStream); + setBasis(basisPtrs1,basisPtrs2,parlist,outStream); setDiscretization(parlist,meshMgr,outStream); setParallelStructure(parlist,outStream); setCellNodes(outStream); @@ -89,14 +123,14 @@ Assembler::Assembler( template void Assembler::setCellNodes(PDE &pde) const { // Set PDE cell nodes - pde.setFieldPattern(dofMgr_->getFieldPattern()); + pde.setFieldPattern(dofMgr1_->getFieldPattern(),dofMgr2_->getFieldPattern()); pde.setCellNodes(volCellNodes_, bdryCellNodes_, bdryCellLocIds_); } template void Assembler::setCellNodes(DynamicPDE &pde) const { // Set PDE cell nodes - pde.setFieldPattern(dofMgr_->getFieldPattern()); + pde.setFieldPattern(dofMgr1_->getFieldPattern(),dofMgr2_->getFieldPattern()); pde.setCellNodes(volCellNodes_, bdryCellNodes_, bdryCellLocIds_); } @@ -126,7 +160,7 @@ void Assembler::assemblePDEResidual(ROL::Ptr> &r, // Assemble ROL::Ptr> localVal; pde->residual(localVal,u_coeff,z_coeff,z_param); - assembleFieldVector( r, localVal, pde_vecR_overlap_ ); + assembleFieldVector( r, localVal, pde_vecR_overlap_, dofMgr1_ ); } template @@ -150,7 +184,7 @@ void Assembler::assemblePDEJacobian1(ROL::Ptr> &J1, // Assemble ROL::Ptr> localVal; pde->Jacobian_1(localVal,u_coeff,z_coeff,z_param); - assembleFieldMatrix( J1, localVal ); + assembleFieldMatrix( J1, localVal, dofMgr1_, dofMgr1_ ); isJ1Transposed_ = false; // Output //Tpetra::MatrixMarket::Writer< Tpetra::CrsMatrix<>> matWriter; @@ -185,7 +219,7 @@ void Assembler::assemblePDEJacobian2(ROL::Ptr> &J2, // Assemble ROL::Ptr> localVal; pde->Jacobian_2(localVal,u_coeff,z_coeff,z_param); - assembleFieldMatrix( J2, localVal ); + assembleFieldMatrix( J2, localVal, dofMgr1_, dofMgr2_ ); isJ2Transposed_ = false; } catch ( Exception::Zero & ez ) { @@ -222,7 +256,7 @@ void Assembler::assemblePDEJacobian3(ROL::Ptr> &J3, // Assemble std::vector>> localVal(size,ROL::nullPtr); pde->Jacobian_3(localVal,u_coeff,z_coeff,z_param); - assembleParamFieldMatrix( J3, localVal, pde_vecJ3_overlap_ ); + assembleParamFieldMatrix( J3, localVal, pde_vecJ3_overlap_, dofMgr1_ ); } catch ( Exception::Zero & ez ) { throw Exception::Zero(">>> (Assembler::assemblePDEJacobian3): Jacobian is zero."); @@ -259,7 +293,7 @@ void Assembler::assemblePDEHessian11(ROL::Ptr> &H11, // Assemble ROL::Ptr> localVal; pde->Hessian_11(localVal,l_coeff,u_coeff,z_coeff,z_param); - assembleFieldMatrix( H11, localVal ); + assembleFieldMatrix( H11, localVal, dofMgr1_, dofMgr1_ ); } catch (Exception::Zero &ez) { throw Exception::Zero(">>> (Assembler::assemblePDEHessian11): Hessian is zero."); @@ -292,7 +326,7 @@ void Assembler::assemblePDEHessian12(ROL::Ptr> &H12, // Assemble ROL::Ptr> localVal; pde->Hessian_12(localVal,l_coeff,u_coeff,z_coeff,z_param); - assembleFieldMatrix( H12, localVal ); + assembleFieldMatrix( H12, localVal, dofMgr2_, dofMgr1_ ); } catch (Exception::Zero &ez) { throw Exception::Zero(">>> (Assembler::assemblePDEHessian12): Hessian is zero."); @@ -330,7 +364,7 @@ void Assembler::assemblePDEHessian13(ROL::Ptr> &H13, // Assemble std::vector>> localVal(size,ROL::nullPtr); pde->Hessian_13(localVal,l_coeff,u_coeff,z_coeff,z_param); - assembleParamFieldMatrix( H13, localVal, pde_vecH13_overlap_ ); + assembleParamFieldMatrix( H13, localVal, pde_vecH13_overlap_, dofMgr1_ ); } catch ( Exception::Zero & ez ) { throw Exception::Zero(">>> (Assembler::assemblePDEHessian13): Hessian is zero."); @@ -367,7 +401,7 @@ void Assembler::assemblePDEHessian21(ROL::Ptr> &H21, // Assemble ROL::Ptr> localVal; pde->Hessian_21(localVal,l_coeff,u_coeff,z_coeff,z_param); - assembleFieldMatrix( H21, localVal ); + assembleFieldMatrix( H21, localVal, dofMgr1_, dofMgr2_ ); } catch (Exception::Zero &ez) { throw Exception::Zero(">>> (Assembler::assemblePDEHessian21): Hessian is zero."); @@ -400,7 +434,7 @@ void Assembler::assemblePDEHessian22(ROL::Ptr> &H22, // Assemble ROL::Ptr> localVal; pde->Hessian_22(localVal,l_coeff,u_coeff,z_coeff,z_param); - assembleFieldMatrix( H22, localVal ); + assembleFieldMatrix( H22, localVal, dofMgr2_, dofMgr2_ ); } catch (Exception::Zero &ez) { throw Exception::Zero(">>> (Assembler::assemblePDEHessian22): Hessian is zero."); @@ -438,7 +472,7 @@ void Assembler::assemblePDEHessian23(ROL::Ptr> &H23, // Assemble std::vector>> localVal(size,ROL::nullPtr); pde->Hessian_23(localVal,l_coeff,u_coeff,z_coeff,z_param); - assembleParamFieldMatrix( H23, localVal, pde_vecH23_overlap_ ); + assembleParamFieldMatrix( H23, localVal, pde_vecH23_overlap_, dofMgr2_ ); } catch ( Exception::Zero & ez ) { throw Exception::Zero(">>> (Assembler::assemblePDEHessian23): Hessian is zero."); @@ -505,7 +539,7 @@ void Assembler::assemblePDEHessian33(ROL::Ptr>> tmp(size,ROL::nullPtr); std::vector>>> localVal(size,tmp); pde->Hessian_33(localVal,l_coeff,u_coeff,z_coeff,z_param); - assembleParamMatrix( H33, localVal ); + assembleParamMatrix( H33, localVal, dofMgr1_ ); } catch ( Exception::Zero & ez ) { throw Exception::Zero(">>> (Assembler::assemblePDEHessian33): Hessian is zero."); @@ -551,7 +585,7 @@ void Assembler::assembleDynPDEResidual(ROL::Ptr> &r, // Assemble ROL::Ptr> localVal; pde->residual(localVal,ts,uo_coeff,un_coeff,z_coeff,z_param); - assembleFieldVector( r, localVal, pde_vecR_overlap_ ); + assembleFieldVector( r, localVal, pde_vecR_overlap_, dofMgr1_ ); } template @@ -578,7 +612,7 @@ void Assembler::assembleDynPDEJacobian_uo(ROL::Ptr> &J // Assemble ROL::Ptr> localVal; pde->Jacobian_uo(localVal,ts,uo_coeff,un_coeff,z_coeff,z_param); - assembleFieldMatrix( J, localVal ); + assembleFieldMatrix( J, localVal, dofMgr1_, dofMgr1_ ); isJuoTransposed_ = false; } catch ( Exception::Zero & ez ) { @@ -613,7 +647,7 @@ void Assembler::assembleDynPDEJacobian_un(ROL::Ptr> &J // Assemble ROL::Ptr> localVal; pde->Jacobian_un(localVal,ts,uo_coeff,un_coeff,z_coeff,z_param); - assembleFieldMatrix( J, localVal ); + assembleFieldMatrix( J, localVal, dofMgr1_, dofMgr1_ ); isJunTransposed_ = false; } catch ( Exception::Zero & ez ) { @@ -648,7 +682,7 @@ void Assembler::assembleDynPDEJacobian_zf(ROL::Ptr> &J // Assemble ROL::Ptr> localVal; pde->Jacobian_zf(localVal,ts,uo_coeff,un_coeff,z_coeff,z_param); - assembleFieldMatrix( J, localVal ); + assembleFieldMatrix( J, localVal, dofMgr1_, dofMgr2_ ); isJzfTransposed_ = false; } catch ( Exception::Zero & ez ) { @@ -688,7 +722,7 @@ void Assembler::assembleDynPDEJacobian_zp(ROL::Ptr> // Assemble std::vector>> localVal(size,ROL::nullPtr); pde->Jacobian_zp(localVal,ts,uo_coeff,un_coeff,z_coeff,z_param); - assembleParamFieldMatrix( J, localVal, pde_vecJ3_overlap_ ); + assembleParamFieldMatrix( J, localVal, pde_vecJ3_overlap_, dofMgr1_ ); } catch ( Exception::Zero & ez ) { throw Exception::Zero(">>> (Assembler::assembleDynPDEJacobian_zp): Jacobian is zero."); @@ -728,7 +762,7 @@ void Assembler::assembleDynPDEHessian_uo_uo(ROL::Ptr> // Assemble ROL::Ptr> localVal; pde->Hessian_uo_uo(localVal,ts,l_coeff,uo_coeff,un_coeff,z_coeff,z_param); - assembleFieldMatrix( H, localVal ); + assembleFieldMatrix( H, localVal, dofMgr1_, dofMgr1_ ); } catch (Exception::Zero &ez) { throw Exception::Zero(">>> (Assembler::assembleDynPDEHessian_uo_uo): Hessian is zero."); @@ -764,7 +798,7 @@ void Assembler::assembleDynPDEHessian_uo_un(ROL::Ptr> // Assemble ROL::Ptr> localVal; pde->Hessian_uo_un(localVal,ts,l_coeff,uo_coeff,un_coeff,z_coeff,z_param); - assembleFieldMatrix( H, localVal ); + assembleFieldMatrix( H, localVal, dofMgr1_, dofMgr1_ ); } catch (Exception::Zero &ez) { throw Exception::Zero(">>> (Assembler::assembleDynPDEHessian_uo_un): Hessian is zero."); @@ -800,7 +834,7 @@ void Assembler::assembleDynPDEHessian_uo_zf(ROL::Ptr> // Assemble ROL::Ptr> localVal; pde->Hessian_uo_zf(localVal,ts,l_coeff,uo_coeff,un_coeff,z_coeff,z_param); - assembleFieldMatrix( H, localVal ); + assembleFieldMatrix( H, localVal, dofMgr1_, dofMgr2_ ); } catch (Exception::Zero &ez) { throw Exception::Zero(">>> (Assembler::assembleDynPDEHessian_uo_zf): Hessian is zero."); @@ -841,7 +875,7 @@ void Assembler::assembleDynPDEHessian_uo_zp(ROL::Ptr // Assemble std::vector>> localVal(size,ROL::nullPtr); pde->Hessian_uo_zp(localVal,ts,l_coeff,uo_coeff,un_coeff,z_coeff,z_param); - assembleParamFieldMatrix( H, localVal, pde_vecH13_overlap_ ); + assembleParamFieldMatrix( H, localVal, pde_vecH13_overlap_, dofMgr1_ ); } catch ( Exception::Zero & ez ) { throw Exception::Zero(">>> (Assembler::assembleDynPDEHessian_uo_zp): Hessian is zero."); @@ -881,7 +915,7 @@ void Assembler::assembleDynPDEHessian_un_uo(ROL::Ptr> // Assemble ROL::Ptr> localVal; pde->Hessian_un_uo(localVal,ts,l_coeff,uo_coeff,un_coeff,z_coeff,z_param); - assembleFieldMatrix( H, localVal ); + assembleFieldMatrix( H, localVal, dofMgr1_, dofMgr1_ ); } catch (Exception::Zero &ez) { throw Exception::Zero(">>> (Assembler::assembleDynPDEHessian_un_uo): Hessian is zero."); @@ -917,7 +951,7 @@ void Assembler::assembleDynPDEHessian_un_un(ROL::Ptr> // Assemble ROL::Ptr> localVal; pde->Hessian_un_un(localVal,ts,l_coeff,uo_coeff,un_coeff,z_coeff,z_param); - assembleFieldMatrix( H, localVal ); + assembleFieldMatrix( H, localVal, dofMgr1_, dofMgr1_ ); } catch (Exception::Zero &ez) { throw Exception::Zero(">>> (Assembler::assembleDynPDEHessian_un_un): Hessian is zero."); @@ -953,7 +987,7 @@ void Assembler::assembleDynPDEHessian_un_zf(ROL::Ptr> // Assemble ROL::Ptr> localVal; pde->Hessian_un_zf(localVal,ts,l_coeff,uo_coeff,un_coeff,z_coeff,z_param); - assembleFieldMatrix( H, localVal ); + assembleFieldMatrix( H, localVal, dofMgr1_, dofMgr2_ ); } catch (Exception::Zero &ez) { throw Exception::Zero(">>> (Assembler::assembleDynPDEHessian_un_zf): Hessian is zero."); @@ -994,7 +1028,7 @@ void Assembler::assembleDynPDEHessian_un_zp(ROL::Ptr // Assemble std::vector>> localVal(size,ROL::nullPtr); pde->Hessian_un_zp(localVal,ts,l_coeff,uo_coeff,un_coeff,z_coeff,z_param); - assembleParamFieldMatrix( H, localVal, pde_vecH13_overlap_ ); + assembleParamFieldMatrix( H, localVal, pde_vecH13_overlap_, dofMgr1_ ); } catch ( Exception::Zero & ez ) { throw Exception::Zero(">>> (Assembler::assembleDynPDEHessian_un_zp): Hessian is zero."); @@ -1034,7 +1068,7 @@ void Assembler::assembleDynPDEHessian_zf_uo(ROL::Ptr> // Assemble ROL::Ptr> localVal; pde->Hessian_zf_uo(localVal,ts,l_coeff,uo_coeff,un_coeff,z_coeff,z_param); - assembleFieldMatrix( H, localVal ); + assembleFieldMatrix( H, localVal, dofMgr2_, dofMgr1_ ); } catch (Exception::Zero &ez) { throw Exception::Zero(">>> (Assembler::assembleDynPDEHessian_zf_uo): Hessian is zero."); @@ -1070,7 +1104,7 @@ void Assembler::assembleDynPDEHessian_zf_un(ROL::Ptr> // Assemble ROL::Ptr> localVal; pde->Hessian_zf_un(localVal,ts,l_coeff,uo_coeff,un_coeff,z_coeff,z_param); - assembleFieldMatrix( H, localVal ); + assembleFieldMatrix( H, localVal, dofMgr2_, dofMgr1_ ); } catch (Exception::Zero &ez) { throw Exception::Zero(">>> (Assembler::assembleDynPDEHessian_zf_un): Hessian is zero."); @@ -1106,7 +1140,7 @@ void Assembler::assembleDynPDEHessian_zf_zf(ROL::Ptr> // Assemble ROL::Ptr> localVal; pde->Hessian_zf_zf(localVal,ts,l_coeff,uo_coeff,un_coeff,z_coeff,z_param); - assembleFieldMatrix( H, localVal ); + assembleFieldMatrix( H, localVal, dofMgr2_, dofMgr2_ ); } catch (Exception::Zero &ez) { throw Exception::Zero(">>> (Assembler::assembleDynPDEHessian_zf_zf): Hessian is zero."); @@ -1147,7 +1181,7 @@ void Assembler::assembleDynPDEHessian_zf_zp(ROL::Ptr // Assemble std::vector>> localVal(size,ROL::nullPtr); pde->Hessian_zf_zp(localVal,ts,l_coeff,uo_coeff,un_coeff,z_coeff,z_param); - assembleParamFieldMatrix( H, localVal, pde_vecH23_overlap_ ); + assembleParamFieldMatrix( H, localVal, pde_vecH23_overlap_, dofMgr2_ ); } catch ( Exception::Zero & ez ) { throw Exception::Zero(">>> (Assembler::assembleDynPDEHessian_zf_zp): Hessian is zero."); @@ -1236,7 +1270,7 @@ void Assembler::assembleDynPDEHessian_zp_zp(ROL::Ptr>> tmp(size,ROL::nullPtr); std::vector>>> localVal(size,tmp); pde->Hessian_zp_zp(localVal,ts,l_coeff,uo_coeff,un_coeff,z_coeff,z_param); - assembleParamMatrix( H, localVal ); + assembleParamMatrix( H, localVal, dofMgr1_ ); } catch ( Exception::Zero & ez ) { throw Exception::Zero(">>> (Assembler::assembleDynPDEHessian_zp_zp): Hessian is zero."); @@ -1308,7 +1342,7 @@ void Assembler::assembleQoIGradient1(ROL::Ptr> &g1, // Assemble ROL::Ptr> localVal; qoi->gradient_1(localVal,u_coeff,z_coeff,z_param); - assembleFieldVector( g1, localVal, qoi_vecG1_overlap_ ); + assembleFieldVector( g1, localVal, qoi_vecG1_overlap_, dofMgr1_ ); } catch ( Exception::Zero & ez ) { throw Exception::Zero(">>> (Assembler::assembleQoIGradient1): Gradient is zero."); @@ -1342,7 +1376,7 @@ void Assembler::assembleQoIGradient2(ROL::Ptr> &g2, // Assemble ROL::Ptr> localVal; qoi->gradient_2(localVal,u_coeff,z_coeff,z_param); - assembleFieldVector( g2, localVal, qoi_vecG2_overlap_ ); + assembleFieldVector( g2, localVal, qoi_vecG2_overlap_, dofMgr2_ ); } catch ( Exception::Zero & ez ) { throw Exception::Zero(">>> (Assembler::assembleQoIGradient2): Gradient is zero."); @@ -1417,7 +1451,7 @@ void Assembler::assembleQoIHessVec11(ROL::Ptr> &H11, // Assemble ROL::Ptr> localVal; qoi->HessVec_11(localVal,v_coeff,u_coeff,z_coeff,z_param); - assembleFieldVector( H11, localVal, qoi_vecH11_overlap_ ); + assembleFieldVector( H11, localVal, qoi_vecH11_overlap_, dofMgr1_ ); } catch (Exception::Zero &ez) { throw Exception::Zero(">>> (Assembler::assembleQoIHessVec11): Hessian is zero."); @@ -1453,7 +1487,7 @@ void Assembler::assembleQoIHessVec12(ROL::Ptr> &H12, // Assemble ROL::Ptr> localVal; qoi->HessVec_12(localVal,v_coeff,u_coeff,z_coeff,z_param); - assembleFieldVector( H12, localVal, qoi_vecH12_overlap_ ); + assembleFieldVector( H12, localVal, qoi_vecH12_overlap_, dofMgr1_ ); } catch (Exception::Zero &ez) { throw Exception::Zero(">>> (Assembler::assembleQoIHessVec12): Hessian is zero."); @@ -1489,7 +1523,7 @@ void Assembler::assembleQoIHessVec13(ROL::Ptr> &H13, // Assemble ROL::Ptr> localVal; qoi->HessVec_13(localVal,v,u_coeff,z_coeff,z_param); - assembleFieldVector( H13, localVal, qoi_vecH13_overlap_ ); + assembleFieldVector( H13, localVal, qoi_vecH13_overlap_, dofMgr1_ ); } catch (Exception::Zero &ez) { throw Exception::Zero(">>> (Assembler::assembleQoIHessVec13): Hessian is zero."); @@ -1529,7 +1563,7 @@ void Assembler::assembleQoIHessVec21(ROL::Ptr> &H21, // Assemble ROL::Ptr> localVal; qoi->HessVec_21(localVal,v_coeff,u_coeff,z_coeff,z_param); - assembleFieldVector( H21, localVal, qoi_vecH21_overlap_ ); + assembleFieldVector( H21, localVal, qoi_vecH21_overlap_, dofMgr2_ ); } catch (Exception::Zero &ez) { throw Exception::Zero(">>> (Assembler::assembleQoIHessVec21): Hessian is zero."); @@ -1565,7 +1599,7 @@ void Assembler::assembleQoIHessVec22(ROL::Ptr> &H22, // Assemble ROL::Ptr> localVal; qoi->HessVec_22(localVal,v_coeff,u_coeff,z_coeff,z_param); - assembleFieldVector( H22, localVal, qoi_vecH22_overlap_ ); + assembleFieldVector( H22, localVal, qoi_vecH22_overlap_, dofMgr2_ ); } catch (Exception::Zero &ez) { throw Exception::Zero(">>> (Assembler::assembleQoIHessVec22): Hessian is zero."); @@ -1601,7 +1635,7 @@ void Assembler::assembleQoIHessVec23(ROL::Ptr> &H23, // Assemble ROL::Ptr> localVal; qoi->HessVec_23(localVal,v,u_coeff,z_coeff,z_param); - assembleFieldVector( H23, localVal, qoi_vecH23_overlap_ ); + assembleFieldVector( H23, localVal, qoi_vecH23_overlap_, dofMgr2_ ); } catch (Exception::Zero &ez) { throw Exception::Zero(">>> (Assembler::assembleQoIHessVec23): Hessian is zero."); @@ -1762,7 +1796,7 @@ void Assembler::assembleQoIHessian11(ROL::Ptr> &H11, // Assemble ROL::Ptr> localVal; qoi->Hessian_11(localVal,u_coeff,z_coeff,z_param); - assembleFieldMatrix( H11, localVal ); + assembleFieldMatrix( H11, localVal, dofMgr1_, dofMgr1_ ); } catch ( Exception::Zero & ez ) { throw Exception::Zero(">>> (Assembler::assembleQoIHessian11): Hessian is zero."); @@ -1793,7 +1827,7 @@ void Assembler::assembleQoIHessian12(ROL::Ptr> &H12, // Assemble ROL::Ptr> localVal; qoi->Hessian_12(localVal,u_coeff,z_coeff,z_param); - assembleFieldMatrix( H12, localVal ); + assembleFieldMatrix( H12, localVal, dofMgr1_, dofMgr2_ ); } catch ( Exception::Zero & ez ) { throw Exception::Zero(">>> (Assembler::assembleQoIHessian12): Hessian is zero."); @@ -1824,7 +1858,7 @@ void Assembler::assembleQoIHessian21(ROL::Ptr> &H21, // Assemble ROL::Ptr> localVal; qoi->Hessian_21(localVal,u_coeff,z_coeff,z_param); - assembleFieldMatrix( H21, localVal ); + assembleFieldMatrix( H21, localVal, dofMgr2_, dofMgr1_ ); } catch ( Exception::Zero & ez ) { throw Exception::Zero(">>> (Assembler::assembleQoIHessian21): Hessian is zero."); @@ -1855,7 +1889,7 @@ void Assembler::assembleQoIHessian22(ROL::Ptr> &H22, // Assemble ROL::Ptr> localVal; qoi->Hessian_22(localVal,u_coeff,z_coeff,z_param); - assembleFieldMatrix( H22, localVal ); + assembleFieldMatrix( H22, localVal, dofMgr2_, dofMgr2_ ); } catch ( Exception::Zero & ez ) { throw Exception::Zero(">>> (Assembler::assembleQoIHessian22): Hessian is zero."); @@ -1882,7 +1916,7 @@ void Assembler::assemblePDERieszMap1(ROL::Ptr> &R1, // Assemble ROL::Ptr> localVal; pde->RieszMap_1(localVal); - assembleFieldMatrix( R1, localVal ); + assembleFieldMatrix( R1, localVal, dofMgr1_, dofMgr1_ ); } catch ( Exception::NotImplemented & eni ) { //throw Exception::NotImplemented(">>> (Assembler::assemblePDERieszMap1): Riesz map not implemented!"); @@ -1902,7 +1936,7 @@ void Assembler::assembleDynPDERieszMap1(ROL::Ptr> &R1, // Assemble ROL::Ptr> localVal; pde->RieszMap_1(localVal); - assembleFieldMatrix( R1, localVal ); + assembleFieldMatrix( R1, localVal, dofMgr1_, dofMgr1_ ); } catch ( Exception::NotImplemented & eni ) { //throw Exception::NotImplemented(">>> (Assembler::assemblePDERieszMap1): Riesz map not implemented!"); @@ -1930,7 +1964,7 @@ void Assembler::assemblePDERieszMap2(ROL::Ptr> &R2, // Assemble ROL::Ptr> localVal; pde->RieszMap_2(localVal); - assembleFieldMatrix( R2, localVal ); + assembleFieldMatrix( R2, localVal, dofMgr2_, dofMgr2_ ); } catch ( Exception::NotImplemented & eni ) { //throw Exception::NotImplemented(">>> (Assembler::assemblePDERieszMap2): Riesz map not implemented!"); @@ -1950,7 +1984,7 @@ void Assembler::assembleDynPDERieszMap2(ROL::Ptr> &R2, // Assemble ROL::Ptr> localVal; pde->RieszMap_2(localVal); - assembleFieldMatrix( R2, localVal ); + assembleFieldMatrix( R2, localVal, dofMgr2_, dofMgr2_ ); } catch ( Exception::NotImplemented & eni ) { //throw Exception::NotImplemented(">>> (Assembler::assemblePDERieszMap2): Riesz map not implemented!"); @@ -1989,10 +2023,10 @@ Real Assembler::computeStateError(const ROL::Ptr cubFactory; - shards::CellTopology cellType = basisPtrs_[fn]->getBaseCellTopology(); + shards::CellTopology cellType = basisPtrs1_[fn]->getBaseCellTopology(); ROL::Ptr> cellCub = cubFactory.create(cellType, cubDeg); ROL::Ptr> fe - = ROL::makePtr>(volCellNodes_,basisPtrs_[fn],cellCub); + = ROL::makePtr>(volCellNodes_,basisPtrs1_[fn],cellCub); // get dimensions int c = fe->gradN()->dimension(0); @@ -2055,10 +2089,10 @@ Real Assembler::computeControlError(const ROL::Ptr cubFactory; - shards::CellTopology cellType = basisPtrs_[fn]->getBaseCellTopology(); + shards::CellTopology cellType = basisPtrs2_[fn]->getBaseCellTopology(); ROL::Ptr> cellCub = cubFactory.create(cellType, cubDeg); ROL::Ptr> fe - = ROL::makePtr>(volCellNodes_,basisPtrs_[fn],cellCub); + = ROL::makePtr>(volCellNodes_,basisPtrs2_[fn],cellCub); // get dimensions int c = fe->gradN()->dimension(0); @@ -2200,10 +2234,10 @@ void Assembler::serialPrintStateEdgeField(const ROL::Ptr> cellJacInv = ROL::makePtr>(c,p,d,d); ROL::Ptr cellTopo - = ROL::makePtr(basisPtrs_[0]->getBaseCellTopology()); + = ROL::makePtr(basisPtrs1_[0]->getBaseCellTopology()); ROL::Ptr> valReference = ROL::makePtr>(f,p,d); - basisPtrs_[0]->getValues(*valReference,*rx,Intrepid::OPERATOR_VALUE); + basisPtrs1_[0]->getValues(*valReference,*rx,Intrepid::OPERATOR_VALUE); ROL::Ptr> valPhysical = ROL::makePtr>(c,f,p,d); Intrepid::CellTools::setJacobian(*cellJac,*rx,*volCellNodes_,*cellTopo); @@ -2279,7 +2313,11 @@ ROL::Ptr> Assembler::createResidualVector(void) cons /***************************************************************************/ template const ROL::Ptr> Assembler::getDofManager(void) const { - return dofMgr_; + return dofMgr1_; +} +template +const ROL::Ptr> Assembler::getDofManager2(void) const { + return dofMgr2_; } template @@ -2313,10 +2351,12 @@ void Assembler::setCommunicator(const ROL::Ptr> & template void Assembler::setBasis( - const std::vector>>> &basisPtrs, + const std::vector>>> &basisPtrs1, + const std::vector>>> &basisPtrs2, Teuchos::ParameterList &parlist, std::ostream &outStream) { - basisPtrs_ = basisPtrs; + basisPtrs1_ = basisPtrs1; + basisPtrs2_ = basisPtrs2; if (verbose_ && myRank_==0) { outStream << "Initialized PDE." << std::endl; } @@ -2333,7 +2373,8 @@ void Assembler::setDiscretization(Teuchos::ParameterList &parlist, else { // Otherwise construct MeshManager objective from parameter list } - dofMgr_ = ROL::makePtr>(meshMgr_,basisPtrs_); + dofMgr1_ = ROL::makePtr>(meshMgr_,basisPtrs1_); + dofMgr2_ = ROL::makePtr>(meshMgr_,basisPtrs2_); if (verbose_ && myRank_==0) { outStream << "Initialized discretization (MeshManager and DofManager)." << std::endl; } @@ -2348,7 +2389,7 @@ void Assembler::setParallelStructure(Teuchos::ParameterList &parlist, /****************************************************/ // Partition the cells in the mesh. We use a basic quasi-equinumerous partitioning, // where the remainder, if any, is assigned to the last processor. - Teuchos::Array myGlobalIds; + Teuchos::Array myGlobalIds1, myGlobalIds2; cellOffsets_.assign(numProcs_, 0); int totalNumCells = meshMgr_->getNumCells(); int cellsPerProc = totalNumCells / numProcs_; @@ -2390,8 +2431,10 @@ void Assembler::setParallelStructure(Teuchos::ParameterList &parlist, break; } - Intrepid::FieldContainer &cellDofs = *(dofMgr_->getCellDofs()); - int numLocalDofs = cellDofs.dimension(1); + Intrepid::FieldContainer &cellDofs1 = *(dofMgr1_->getCellDofs()); + Intrepid::FieldContainer &cellDofs2 = *(dofMgr2_->getCellDofs()); + int numLocalDofs1 = cellDofs1.dimension(1); + int numLocalDofs2 = cellDofs2.dimension(1); if (verbose_) { outStream << "Cell offsets across processors: " << cellOffsets_ << std::endl; @@ -2402,37 +2445,46 @@ void Assembler::setParallelStructure(Teuchos::ParameterList &parlist, case 2: for (int i=0; i> - (Teuchos::OrdinalTraits::invalid(), myGlobalIds, GO(0), comm_); + myOverlapStateMap_ = ROL::makePtr> + (Teuchos::OrdinalTraits::invalid(), myGlobalIds1, GO(0), comm_); //std::cout << std::endl << myOverlapMap_->getNodeElementList()<(myGlobalIds_, comm_); to build the overlap map. **/ - myUniqueStateMap_ = Tpetra::createOneToOne(myOverlapStateMap_); - //std::cout << std::endl << myUniqueMap_->getNodeElementList() << std::endl; - myOverlapControlMap_ = myOverlapStateMap_; - myUniqueControlMap_ = myUniqueStateMap_; + myUniqueStateMap_ = Tpetra::createOneToOne(myOverlapStateMap_); myOverlapResidualMap_ = myOverlapStateMap_; myUniqueResidualMap_ = myUniqueStateMap_; + myOverlapControlMap_ = ROL::makePtr> + (Teuchos::OrdinalTraits::invalid(), myGlobalIds2, GO(0), comm_); + myUniqueControlMap_ = Tpetra::createOneToOne(myOverlapControlMap_);; + //std::cout << std::endl << myUniqueMap_->getNodeElementList() << std::endl; // myCellMap_ = ROL::makePtr>( // Teuchos::OrdinalTraits::invalid(), // myCellIds_, 0, comm_); @@ -2442,43 +2494,85 @@ void Assembler::setParallelStructure(Teuchos::ParameterList &parlist, /****************************************/ // Make a GO copy to interface with Tpetra; currently dof manager uses int directly - Teuchos::ArrayRCP cellDofsArrayRCP = cellDofs.getData(); - Teuchos::ArrayRCP cellDofsGO(cellDofsArrayRCP.size(), GO()); - std::copy(cellDofsArrayRCP.getRawPtr(), cellDofsArrayRCP.getRawPtr()+cellDofsArrayRCP.size(), - cellDofsGO.getRawPtr()); - Teuchos::ArrayRCP cellDofsGOArrayRCP = cellDofsGO.getConst(); + Teuchos::ArrayRCP cellDofs1ArrayRCP = cellDofs1.getData(); + Teuchos::ArrayRCP cellDofs2ArrayRCP = cellDofs2.getData(); + Teuchos::ArrayRCP cellDofs1GO(cellDofs1ArrayRCP.size(), GO()); + Teuchos::ArrayRCP cellDofs2GO(cellDofs2ArrayRCP.size(), GO()); + std::copy(cellDofs1ArrayRCP.getRawPtr(), cellDofs1ArrayRCP.getRawPtr()+cellDofs1ArrayRCP.size(), + cellDofs1GO.getRawPtr()); + std::copy(cellDofs2ArrayRCP.getRawPtr(), cellDofs2ArrayRCP.getRawPtr()+cellDofs2ArrayRCP.size(), + cellDofs2GO.getRawPtr()); + Teuchos::ArrayRCP cellDofs1GOArrayRCP = cellDofs1GO.getConst(); + Teuchos::ArrayRCP cellDofs2GOArrayRCP = cellDofs2GO.getConst(); // Estimate the max number of entries per row // using a map (row indicies can be non-contiguous) - GO maxEntriesPerRow(0); + GO maxEntriesPerRow1(0), maxEntriesPerRow2(0); { - std::map numEntriesCount; - for (int i=0; i numEntriesCount1, numEntriesCount2; + for (int i=0; i &pa, const std::pair &pb) { return pa.second < pb.second; }); - if (!numEntriesCount.empty()) - maxEntriesPerRow = rowIndexWithMaxEntries->second; + const auto rowIndexWithMaxEntries2 + = std::max_element(std::begin(numEntriesCount2), std::end(numEntriesCount2), + [](const std::pair &pa, const std::pair &pb) { + return pa.second < pb.second; + }); + if (!numEntriesCount1.empty()) + maxEntriesPerRow1 = rowIndexWithMaxEntries1->second; + if (!numEntriesCount2.empty()) + maxEntriesPerRow2 = rowIndexWithMaxEntries2->second; } - matJ1Graph_ = ROL::makePtr>(myUniqueStateMap_, maxEntriesPerRow); + + matJ1Graph_ = ROL::makePtr>(myUniqueStateMap_, maxEntriesPerRow1); for (int i=0; iinsertGlobalIndices(GO(cellDofs(myCellIds_[i],j)), - cellDofsGOArrayRCP(myCellIds_[i]*numLocalDofs, numLocalDofs)); + for (int j=0; jinsertGlobalIndices(GO(cellDofs1(myCellIds_[i],j)), + cellDofs1GOArrayRCP(myCellIds_[i]*numLocalDofs1, numLocalDofs1)); } } - matJ1Graph_->fillComplete(); - matJ2Graph_ = matJ1Graph_; + matJ1Graph_->fillComplete(myUniqueStateMap_,myUniqueStateMap_); matR1Graph_ = matJ1Graph_; - matR2Graph_ = matJ2Graph_; matH11Graph_ = matJ1Graph_; - matH12Graph_ = matJ1Graph_; + + matJ2Graph_ = ROL::makePtr>(myUniqueStateMap_, std::max(maxEntriesPerRow1,maxEntriesPerRow2)); + for (int i=0; iinsertGlobalIndices(GO(cellDofs1(myCellIds_[i],j)), + cellDofs2GOArrayRCP(myCellIds_[i]*numLocalDofs2, numLocalDofs2)); + } + } + matJ2Graph_->fillComplete(myUniqueControlMap_,myUniqueStateMap_); matH21Graph_ = matJ2Graph_; - matH22Graph_ = matJ2Graph_; + + matH12Graph_ = ROL::makePtr>(myUniqueControlMap_, maxEntriesPerRow1); + for (int i=0; iinsertGlobalIndices(GO(cellDofs2(myCellIds_[i],j)), + cellDofs1GOArrayRCP(myCellIds_[i]*numLocalDofs1, numLocalDofs1)); + } + } + matH12Graph_->fillComplete(myUniqueStateMap_,myUniqueControlMap_); + + matR2Graph_ = ROL::makePtr>(myUniqueControlMap_, maxEntriesPerRow2); + for (int i=0; iinsertGlobalIndices(GO(cellDofs2(myCellIds_[i],j)), + cellDofs2GOArrayRCP(myCellIds_[i]*numLocalDofs2, numLocalDofs2)); + } + } + matR2Graph_->fillComplete(myUniqueControlMap_,myUniqueControlMap_); + matH22Graph_ = matR2Graph_; if (verbose_ && myRank_==0) { outStream << "Initialized parallel structures." << std::endl; @@ -2488,7 +2582,7 @@ void Assembler::setParallelStructure(Teuchos::ParameterList &parlist, template void Assembler::setCellNodes(std::ostream &outStream) { // Build volume cell nodes - shards::CellTopology cellType = basisPtrs_[0]->getBaseCellTopology(); + shards::CellTopology cellType = basisPtrs1_[0]->getBaseCellTopology(); int spaceDim = cellType.getDimension(); int numNodesPerCell = cellType.getNodeCount(); volCellNodes_ = ROL::makePtr>(numCells_, numNodesPerCell, spaceDim); @@ -2571,8 +2665,8 @@ void Assembler::getCoeffFromStateVector(ROL::Ptr importer(myUniqueStateMap_, myOverlapStateMap_); xshared->doImport(*x,importer,Tpetra::REPLACE); // Populate xcoeff - Intrepid::FieldContainer &cellDofs = *(dofMgr_->getCellDofs()); - int lfs = dofMgr_->getLocalFieldSize(); + Intrepid::FieldContainer &cellDofs = *(dofMgr1_->getCellDofs()); + int lfs = dofMgr1_->getLocalFieldSize(); xcoeff = ROL::makePtr>(numCells_, lfs); Teuchos::ArrayRCP xdata = xshared->get1dView(); for (int i=0; i::getCoeffFromStateVector(ROL::PtrgetMap()->getLocalElement(cellDofs(myCellIds_[i],j))]; } } - dofMgr_->transformToIntrepidPattern(xcoeff); + dofMgr1_->transformToIntrepidPattern(xcoeff); } else { xcoeff = ROL::nullPtr; @@ -2597,8 +2691,8 @@ void Assembler::getCoeffFromControlVector(ROL::Ptr importer(myUniqueControlMap_, myOverlapControlMap_); xshared->doImport(*x,importer,Tpetra::REPLACE); // Populate xcoeff - Intrepid::FieldContainer &cellDofs = *(dofMgr_->getCellDofs()); - int lfs = dofMgr_->getLocalFieldSize(); + Intrepid::FieldContainer &cellDofs = *(dofMgr2_->getCellDofs()); + int lfs = dofMgr2_->getLocalFieldSize(); xcoeff = ROL::makePtr>(numCells_, lfs); Teuchos::ArrayRCP xdata = xshared->get1dView(); for (int i=0; i::getCoeffFromControlVector(ROL::PtrgetMap()->getLocalElement(cellDofs(myCellIds_[i],j))]; } } - dofMgr_->transformToIntrepidPattern(xcoeff); + dofMgr2_->transformToIntrepidPattern(xcoeff); } else { xcoeff = ROL::nullPtr; @@ -2633,15 +2727,16 @@ Real Assembler::assembleScalar(ROL::Ptr> &v template void Assembler::assembleFieldVector(ROL::Ptr> &v, ROL::Ptr> &val, - ROL::Ptr> &vecOverlap) { + ROL::Ptr> &vecOverlap, + const ROL::Ptr> &dofMgr) { // Set residual vectors to zero - v->scale(static_cast(0)); - vecOverlap->scale(static_cast(0)); + v->putScalar(static_cast(0)); + vecOverlap->putScalar(static_cast(0)); // Get degrees of freedom - Intrepid::FieldContainer &cellDofs = *(dofMgr_->getCellDofs()); + Intrepid::FieldContainer &cellDofs = *(dofMgr->getCellDofs()); int numLocalDofs = cellDofs.dimension(1); // Transform values - dofMgr_->transformToFieldPattern(val); + transformToFieldPattern(val,dofMgr); // assembly on the overlap map for (int i=0; i::assembleParamVector(ROL::Ptr> &v, template void Assembler::assembleFieldMatrix(ROL::Ptr> &M, - ROL::Ptr> &val) { + ROL::Ptr> &val, + const ROL::Ptr> &dofMgr1, + const ROL::Ptr> &dofMgr2) { // Transform data - dofMgr_->transformToFieldPattern(val); + transformToFieldPattern(val,dofMgr1,dofMgr2); // Zero PDE Jacobian M->resumeFill(); M->setAllToScalar(static_cast(0)); // Assemble PDE Jacobian - Intrepid::FieldContainer &cellDofs = *(dofMgr_->getCellDofs()); - int numLocalDofs = cellDofs.dimension(1); - int numLocalMatEntries = numLocalDofs * numLocalDofs; - Teuchos::ArrayRCP cellDofsArrayRCP = cellDofs.getData(); - Teuchos::ArrayRCP cellDofsGO(cellDofsArrayRCP.size(), GO()); - std::copy(cellDofsArrayRCP.getRawPtr(), cellDofsArrayRCP.getRawPtr()+cellDofsArrayRCP.size(), - cellDofsGO.getRawPtr()); - Teuchos::ArrayRCP cellDofsGOArrayRCP = cellDofsGO.getConst(); + Intrepid::FieldContainer &cellDofs1 = *(dofMgr1->getCellDofs()); + Intrepid::FieldContainer &cellDofs2 = *(dofMgr2->getCellDofs()); + int numLocalDofs1 = cellDofs1.dimension(1); + int numLocalDofs2 = cellDofs2.dimension(1); + int numLocalMatEntries = numLocalDofs1 * numLocalDofs2; + Teuchos::ArrayRCP cellDofs2ArrayRCP = cellDofs2.getData(); + Teuchos::ArrayRCP cellDofs2GO(cellDofs2ArrayRCP.size(), GO()); + std::copy(cellDofs2ArrayRCP.getRawPtr(), cellDofs2ArrayRCP.getRawPtr()+cellDofs2ArrayRCP.size(), + cellDofs2GO.getRawPtr()); + Teuchos::ArrayRCP cellDofs2GOArrayRCP = cellDofs2GO.getConst(); Teuchos::ArrayRCP valArrayRCP = val->getData(); for (int i=0; isumIntoGlobalValues(GO(cellDofs(myCellIds_[i],j)), - cellDofsGOArrayRCP(myCellIds_[i] * numLocalDofs, numLocalDofs), - valArrayRCP(i*numLocalMatEntries+j*numLocalDofs, numLocalDofs)); + for (int j=0; jsumIntoGlobalValues(GO(cellDofs1(myCellIds_[i],j)), + cellDofs2GOArrayRCP(myCellIds_[i] * numLocalDofs2, numLocalDofs2), + valArrayRCP(i*numLocalMatEntries+j*numLocalDofs2, numLocalDofs2)); } } M->fillComplete(); @@ -2703,18 +2802,19 @@ void Assembler::assembleFieldMatrix(ROL::Ptr> &M, template void Assembler::assembleParamFieldMatrix(ROL::Ptr> &M, std::vector>> &val, - ROL::Ptr> &matOverlap) { + ROL::Ptr> &matOverlap, + const ROL::Ptr> &dofMgr) { // Initialize res int size = M->getNumVectors(); // Compute PDE local Jacobian wrt parametric controls for (int i = 0; i < size; ++i) { - dofMgr_->transformToFieldPattern(val[i]); + transformToFieldPattern(val[i],dofMgr); } // Assemble PDE Jacobian wrt parametric controls M->scale(static_cast(0)); matOverlap->scale(static_cast(0)); for (int k = 0; k < size; ++k) { - Intrepid::FieldContainer &cellDofs = *(dofMgr_->getCellDofs()); + Intrepid::FieldContainer &cellDofs = *(dofMgr->getCellDofs()); int numLocalDofs = cellDofs.dimension(1); // assembly on the overlap map for (int i=0; i::assembleParamFieldMatrix(ROL::Ptr> & template void Assembler::assembleParamMatrix(ROL::Ptr>> &M, - std::vector>>> &val) { + std::vector>>> &val, + const ROL::Ptr> &dofMgr) { // Initialize local matrix int size = M->size(); std::vector>> tmp(size,ROL::nullPtr); // Compute local matrix for (int i = 0; i < size; ++i) { for (int j = 0; j < size; ++j) { - dofMgr_->transformToFieldPattern(val[i][j]); + transformToFieldPattern(val[i][j],dofMgr); } } // Assemble PDE Jacobian wrt parametric controls @@ -2766,4 +2867,41 @@ void Assembler::assembleParamMatrix(ROL::Ptr } } +template +void Assembler::transformToFieldPattern(const ROL::Ptr> &array, + const ROL::Ptr> &dofMgr1, + const ROL::Ptr> &dofMgr2) const { + if ( array != ROL::nullPtr ) { + int rank = array->rank(); + int nc = array->dimension(0); + if ( rank == 2 ) { + int nf = array->dimension(1); + Intrepid::FieldContainer tmp(nc, nf); + for (int c = 0; c < nc; ++c) { + for (int f = 0; f < nf; ++f) { + tmp(c, dofMgr1->mapToFieldPattern(f)) = (*array)(c, f); + } + } + *array = tmp; + } + else if (rank == 3 ) { + int nf1 = array->dimension(1); + int nf2 = array->dimension(2); + Intrepid::FieldContainer tmp(nc, nf1, nf2); + for (int c = 0; c < nc; ++c) { + for (int f1 = 0; f1 < nf1; ++f1) { + for (int f2 = 0; f2 < nf2; ++f2) { + tmp(c, dofMgr1->mapToFieldPattern(f1), dofMgr2->mapToFieldPattern(f2)) = (*array)(c, f1, f2); + } + } + } + *array = tmp; + } + else { + TEUCHOS_TEST_FOR_EXCEPTION(true, std::invalid_argument, + ">>> PDE-OPT/TOOLS/assembler.hpp (transformToFieldPattern): Input array rank not 2 or 3!"); + } + } +} + #endif diff --git a/packages/rol/example/PDE-OPT/TOOLS/dofmanager.hpp b/packages/rol/example/PDE-OPT/TOOLS/dofmanager.hpp index 5e2d73cf3ef9..9208fa2331cd 100644 --- a/packages/rol/example/PDE-OPT/TOOLS/dofmanager.hpp +++ b/packages/rol/example/PDE-OPT/TOOLS/dofmanager.hpp @@ -305,6 +305,10 @@ class DofManager { } } + int mapToFieldPattern(int f) const { + return mapToFieldPattern_[f]; + } + void transformToFieldPattern(const ROL::Ptr > &array) const { if ( array != ROL::nullPtr ) { int rank = array->rank(); @@ -533,7 +537,11 @@ class DofManager { for (int f=0; fgetDegree(); if (cellDim_ == 1) { - if (basisDeg == 1) { + if (basisDeg == 0) { + map2IP[f] = {0}; + map2FP[f] = {0}; + } + else if (basisDeg == 1) { map2IP[f] = {0, 1}; map2FP[f] = {0, 1}; } @@ -547,7 +555,11 @@ class DofManager { } } else if (cellDim_ == 2) { - if (basisDeg == 1) { + if (basisDeg == 0) { + map2IP[f] = {0}; + map2FP[f] = {0}; + } + else if (basisDeg == 1) { map2IP[f].resize(nv); map2FP[f].resize(nv); for (int i = 0; i < nv; ++i) { @@ -574,7 +586,11 @@ class DofManager { } } else if (cellDim_ == 3) { - if (basisDeg == 1) { + if (basisDeg == 0) { + map2IP[f] = {0}; + map2FP[f] = {0}; + } + else if (basisDeg == 1) { map2IP[f] = {0, 1, 2, 3, 4, 5, 6, 7}; map2FP[f] = {0, 1, 2, 3, 4, 5, 6, 7}; } diff --git a/packages/rol/example/PDE-OPT/TOOLS/dynpde.hpp b/packages/rol/example/PDE-OPT/TOOLS/dynpde.hpp index 89598ad0202c..ca286d18f131 100644 --- a/packages/rol/example/PDE-OPT/TOOLS/dynpde.hpp +++ b/packages/rol/example/PDE-OPT/TOOLS/dynpde.hpp @@ -271,12 +271,19 @@ class DynamicPDE { } virtual std::vector>>> getFields() = 0; + virtual std::vector>>> getFields2() { + return getFields(); + } virtual void setCellNodes(const ROL::Ptr> &cellNodes, const std::vector>>> &bdryCellNodes, const std::vector>> &bdryCellLocIds) = 0; - virtual void setFieldPattern(const std::vector> & fieldPattern) {} + virtual void setFieldPattern(const std::vector> &fieldPattern) {} + virtual void setFieldPattern(const std::vector> &fieldPattern1, + const std::vector> &fieldPattern2) { + setFieldPattern(fieldPattern1); + } private: std::vector param_; diff --git a/packages/rol/example/PDE-OPT/TOOLS/fe.hpp b/packages/rol/example/PDE-OPT/TOOLS/fe.hpp index 2128cd954bb7..ac9735e7b1cd 100644 --- a/packages/rol/example/PDE-OPT/TOOLS/fe.hpp +++ b/packages/rol/example/PDE-OPT/TOOLS/fe.hpp @@ -111,7 +111,8 @@ class FE { FE(const ROL::Ptr > & cellNodes, const ROL::Ptr > > & basis, - const ROL::Ptr > > & cubature) : + const ROL::Ptr > > & cubature, + bool computeBdryDofs = true) : cellNodes_(cellNodes), basis_(basis), cubature_(cubature), sideId_(-1) { // Get base cell topology from basis. @@ -254,17 +255,19 @@ class FE { *cellTopo_); // Compute local degrees of freedom on reference cell sides. - int numSides = cellTopo_->getSideCount(); - if (cellTopo_->getDimension() == 1) { - numSides = 2; - } - if ( numSides ) { - for (int i=0; igetSideCount(); + if (cellTopo_->getDimension() == 1) { + numSides = 2; + } + if ( numSides ) { + for (int i=0; i numFieldDofs; + const std::vector> fieldPattern; + + FieldInfo(const int numFields_, const int numDofs_, + const std::vector &numFieldDofs_, + const std::vector> &fieldPattern_) + : numFields(numFields_), numDofs(numDofs_), + numFieldDofs(numFieldDofs_), fieldPattern(fieldPattern_) {} +}; + +template +inline void splitFieldCoeff(std::vector>> &U, + const ROL::Ptr> &u_coeff, + const ROL::Ptr &info) { + const int numFields = info->numFields; + U.resize(numFields); + const int c = u_coeff->dimension(0); + for (int i=0; inumFieldDofs[i]; + U[i] = ROL::makePtr>(c,numFieldDofs); + for (int j=0; jfieldPattern[i][k]); + } + } + } +} + +template +inline void splitFieldCoeff(std::vector>>> &J, + const ROL::Ptr> &jac, + const ROL::Ptr &rowInfo, + const ROL::Ptr &colInfo) { + const int rowNumFields = rowInfo->numFields; + const int colNumFields = colInfo->numFields; + J.resize(rowNumFields); + const int c = jac->dimension(0); + for (int i=0; inumFieldDofs[i]; + J[i].resize(colNumFields,ROL::nullPtr); + for (int j=0; jnumFieldDofs[j]; + J[i][j] = ROL::makePtr>(c,rowNumFieldDofs,colNumFieldDofs); + for (int k=0; kfieldPattern[i][l],colInfo->fieldPattern[j][m]); + } + } + } + } + } +} + +template +inline void combineFieldCoeff(ROL::Ptr> &res, + const std::vector>> &R, + const ROL::Ptr &info) { + const int numFields = info->numFields; + const int c = R[0]->dimension(0); // number of cells + res = ROL::makePtr>(c, info->numDofs); + for (int i=0; inumFieldDofs[i]; + for (int j=0; jfieldPattern[i][k]) = (*R[i])(j,k); + } + } + } +} + +template +inline void combineFieldCoeff(ROL::Ptr> &jac, + const std::vector>>> &J, + const ROL::Ptr &rowInfo, + const ROL::Ptr &colInfo) { + const int rowNumFields = rowInfo->numFields; + const int colNumFields = colInfo->numFields; + const int c = J[0][0]->dimension(0); // number of cells + jac = ROL::makePtr>(c, rowInfo->numDofs, colInfo->numDofs); + for (int i=0; inumFieldDofs[i]; + for (int j=0; jnumFieldDofs[j]; + for (int k=0; kfieldPattern[i][l],colInfo->fieldPattern[j][m]) = (*J[i][j])(k,l,m); + } + } + } + } + } +} + +} + template class FieldHelper { private: diff --git a/packages/rol/example/PDE-OPT/TOOLS/pde.hpp b/packages/rol/example/PDE-OPT/TOOLS/pde.hpp index 405ee84cf3bc..a0808f961d11 100644 --- a/packages/rol/example/PDE-OPT/TOOLS/pde.hpp +++ b/packages/rol/example/PDE-OPT/TOOLS/pde.hpp @@ -169,21 +169,27 @@ class PDE { throw Exception::NotImplemented(">>> Hessian_33 not implemented."); } - virtual void RieszMap_1(ROL::Ptr > &riesz) { + virtual void RieszMap_1(ROL::Ptr> &riesz) { throw Exception::NotImplemented(">>> RieszMap_1 not implemented."); } - virtual void RieszMap_2(ROL::Ptr > &riesz) { + virtual void RieszMap_2(ROL::Ptr> &riesz) { throw Exception::NotImplemented(">>> RieszMap_2 not implemented."); } - virtual std::vector > > > getFields() = 0; + virtual std::vector>>> getFields() = 0; + virtual std::vector>>> getFields2() { + return getFields(); + } - virtual void setCellNodes(const ROL::Ptr > &cellNodes, - const std::vector > > > &bdryCellNodes, - const std::vector > > &bdryCellLocIds) = 0; + virtual void setCellNodes(const ROL::Ptr> &cellNodes, + const std::vector>>> &bdryCellNodes, + const std::vector>> &bdryCellLocIds) = 0; - virtual void setFieldPattern(const std::vector > & fieldPattern) { + virtual void setFieldPattern(const std::vector> &fieldPattern) {} + virtual void setFieldPattern(const std::vector> &fieldPattern1, + const std::vector> &fieldPattern2) { + setFieldPattern(fieldPattern1); } private: diff --git a/packages/rol/example/PDE-OPT/TOOLS/pdeconstraint.hpp b/packages/rol/example/PDE-OPT/TOOLS/pdeconstraint.hpp index a34075bc8814..09d33b1afa90 100644 --- a/packages/rol/example/PDE-OPT/TOOLS/pdeconstraint.hpp +++ b/packages/rol/example/PDE-OPT/TOOLS/pdeconstraint.hpp @@ -697,7 +697,7 @@ class PDE_Constraint : public ROL::Constraint_SimOpt { isH31zero_(false), isH31notImplemented_(false), isH32zero_(false), isH32notImplemented_(false), isH33zero_(false), isH33notImplemented_(false) { - assembler_ = ROL::makePtr>(pde_->getFields(),meshMgr,comm,parlist,outStream); + assembler_ = ROL::makePtr>(pde_->getFields(),pde_->getFields2(),meshMgr,comm,parlist,outStream); assembler_->setCellNodes(*pde_); solver_ = ROL::makePtr>(parlist.sublist("Solver")); } diff --git a/packages/rol/example/PDE-OPT/binary/CMakeLists.txt b/packages/rol/example/PDE-OPT/binary/CMakeLists.txt index a0cea2ee432f..3165f5708c04 100644 --- a/packages/rol/example/PDE-OPT/binary/CMakeLists.txt +++ b/packages/rol/example/PDE-OPT/binary/CMakeLists.txt @@ -1,3 +1,4 @@ ADD_SUBDIRECTORY(adv-diff) ADD_SUBDIRECTORY(adv-diff-SUR) +ADD_SUBDIRECTORY(adv-diff-TEST) ADD_SUBDIRECTORY(elasticity) diff --git a/packages/rol/example/PDE-OPT/binary/adv-diff-TEST/CMakeLists.txt b/packages/rol/example/PDE-OPT/binary/adv-diff-TEST/CMakeLists.txt index ba5f08fd38c9..03099f4cd77e 100644 --- a/packages/rol/example/PDE-OPT/binary/adv-diff-TEST/CMakeLists.txt +++ b/packages/rol/example/PDE-OPT/binary/adv-diff-TEST/CMakeLists.txt @@ -35,19 +35,22 @@ IF(${PROJECT_NAME}_ENABLE_Intrepid AND ADD_DIR_TO_NAME ) - TRIBITS_ADD_EXECUTABLE_AND_TEST( - SumUpRounding - SOURCES example_02.cpp - ARGS PrintItAll - NUM_MPI_PROCS 4 - PASS_REGULAR_EXPRESSION "TEST PASSED" - ADD_DIR_TO_NAME - ) +# TRIBITS_ADD_EXECUTABLE_AND_TEST( +# SumUpRounding +# SOURCES example_02.cpp +# ARGS PrintItAll +# NUM_MPI_PROCS 4 +# PASS_REGULAR_EXPRESSION "TEST PASSED" +# ADD_DIR_TO_NAME +# ) TRIBITS_COPY_FILES_TO_BINARY_DIR( BinaryAdvTESTDiffDataCopy SOURCE_FILES input_ex01.xml + sensor.txt + run.sh + plotPEBBL.m SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}" DEST_DIR "${CMAKE_CURRENT_BINARY_DIR}" ) diff --git a/packages/rol/example/PDE-OPT/binary/adv-diff-TEST/branchHelper.hpp b/packages/rol/example/PDE-OPT/binary/adv-diff-TEST/branchHelper.hpp index 13a4f4e440c0..d86c66dd7b90 100644 --- a/packages/rol/example/PDE-OPT/binary/adv-diff-TEST/branchHelper.hpp +++ b/packages/rol/example/PDE-OPT/binary/adv-diff-TEST/branchHelper.hpp @@ -51,7 +51,12 @@ template class PDEOPT_BranchHelper_PEBBL : public ROL::StdBranchHelper_PEBBL { private: ROL::Ptr> getParameter(const ROL::Vector &x) const { - return dynamic_cast&>(x).getParameter(); + try { + return ROL::makePtrFromRef(dynamic_cast&>(x)); + } + catch (std::exception &e) { + return dynamic_cast&>(x).getParameter(); + } } public: diff --git a/packages/rol/example/PDE-OPT/binary/adv-diff-TEST/branching.hpp b/packages/rol/example/PDE-OPT/binary/adv-diff-TEST/branching.hpp new file mode 100644 index 000000000000..810fe465bc84 --- /dev/null +++ b/packages/rol/example/PDE-OPT/binary/adv-diff-TEST/branching.hpp @@ -0,0 +1,215 @@ +// @HEADER +// ************************************************************************ +// +// Rapid Optimization Library (ROL) Package +// Copyright (2014) Sandia Corporation +// +// Under terms of Contract DE-AC04-94AL85000, there is a non-exclusive +// license for use of this work by or on behalf of the U.S. Government. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// 1. Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// +// 2. Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in the +// documentation and/or other materials provided with the distribution. +// +// 3. Neither the name of the Corporation nor the names of the +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY +// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL SANDIA CORPORATION OR THE +// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +// Questions? Contact lead developers: +// Drew Kouri (dpkouri@sandia.gov) and +// Denis Ridzal (dridzal@sandia.gov) +// +// ************************************************************************ +// @HEADER + +#ifndef ROL_PDEOPT_BRANCHING_PEBBL_H +#define ROL_PDEOPT_BRANCHING_PEBBL_H + +#include "ROL_PEBBL_Interface.hpp" + +template +class ADVDIFF_BranchSub; + +template +class ADVDIFF_Branching : public ROL::ROL_PEBBL_Branching { +private: + const int method_; + ROL::Ptr> z0_; + + using ROL::ROL_PEBBL_Branching::verbosity_; + using ROL::ROL_PEBBL_Branching::outStream_; + using ROL::ROL_PEBBL_Branching::parlist_; + +public: + ADVDIFF_Branching(const ROL::Ptr> &factory, + const ROL::Ptr &parlist, + const ROL::Ptr> &bHelper, + int verbosity = 0, + const ROL::Ptr &outStream = ROL::nullPtr, + int method = 0) + : ROL::ROL_PEBBL_Branching::ROL_PEBBL_Branching(factory,parlist,bHelper,verbosity,outStream), + method_(method) { + z0_ = factory->buildSolutionVector(); + } + + pebbl::branchSub* blankSub() { + return new ADVDIFF_BranchSub(ROL::makePtrFromRef>(*this),verbosity_,outStream_,method_); + } + +// pebbl::solution* iniitalGuess() { +// +// } +}; // ADVDIFF_Branching + +template +class ADVDIFF_BranchSub : public ROL::ROL_PEBBL_BranchSub { +private: + const int method_; + std::string methodName_; + + using ROL::ROL_PEBBL_BranchSub::branching_; + using ROL::ROL_PEBBL_BranchSub::problem0_; + using ROL::ROL_PEBBL_BranchSub::solution_; + using ROL::ROL_PEBBL_BranchSub::rndSolution_; + using ROL::ROL_PEBBL_BranchSub::verbosity_; + using ROL::ROL_PEBBL_BranchSub::outStream_; + + void round(ROL::Vector &rx, const ROL::Vector &x, Real t) const { + rx.set(x); + ROL::Ptr> data = getParameter(rx); + Real val(0); + for (auto it = data->begin(); it != data->end(); ++it) { + val = *it; + *it = (val < t ? std::floor(val) : std::ceil(val)); + } + } + + ROL::Ptr> getParameter(const ROL::Vector &x) const { + try { + return dynamic_cast&>(x).getVector(); + } + catch (std::exception &e) { + return dynamic_cast&>(x).getParameter()->getVector(); + } + } + + ROL::Ptr> getParameter(ROL::Vector &x) const { + try { + return dynamic_cast&>(x).getVector(); + } + catch (std::exception &e) { + return dynamic_cast&>(x).getParameter()->getVector(); + } + } + +public: + ADVDIFF_BranchSub(const ROL::Ptr> &branching, + int verbosity = 0, + const ROL::Ptr &outStream = ROL::nullPtr, + int method = 0) + : ROL::ROL_PEBBL_BranchSub(branching, verbosity, outStream), method_(method) { + switch (method_) { + case 1: methodName_ = "Mass Preserving Rounding"; break; + case 2: methodName_ = "Objective Gap Rounding"; break; + default: methodName_ = "Naive Rounding"; + } + } + + ADVDIFF_BranchSub(const ADVDIFF_BranchSub &rpbs) + : ROL::ROL_PEBBL_BranchSub(rpbs), method_(rpbs.method_) {} + + void incumbentHeuristic() { + Real tol = std::sqrt(ROL::ROL_EPSILON()); + Real t(0), val(0); + if (method_==1) { // mass preserving rounding + const Real zero(0), one(1); + rndSolution_->set(*solution_); + ROL::Ptr> data = getParameter(*rndSolution_); + std::map sdata; + Real sum(0); + for (size_t i = 0; i < data->size(); ++i) { + sdata.insert(std::pair((*data)[i],i)); + sum += (*data)[i]; + } + int rsum = static_cast(std::round(sum)), psum(0); + for (auto it = sdata.rbegin(); it != sdata.rend(); ++it) { + (*data)[it->second] = (psum < rsum ? one : zero); + t = (psum < rsum ? it->first : t); + psum++; + } + } + else if (method_==2) { // objective gap rounding + const Real invphi(0.5*(std::sqrt(5.0)-1.0)); + const Real invphi2(0.5*(3.0-std::sqrt(5.0))); + const Real itol(std::sqrt(ROL::ROL_EPSILON())); + Real a(0), b(1), c(0), d(1), h(b-a), fc(0), fd(0); + // Evaluate at c + c = a + invphi2 * h; + round(*rndSolution_,*solution_,c); + problem0_->getObjective()->update(*rndSolution_); + fc = problem0_->getObjective()->value(*rndSolution_,tol); + // Evaluate at d + d = a + invphi * h; + round(*rndSolution_,*solution_,d); + problem0_->getObjective()->update(*rndSolution_); + fd = problem0_->getObjective()->value(*rndSolution_,tol); + while (std::abs(c-d) > itol) { + h *= invphi; + if (fc < fd) { + b = d; + d = c; + fd = fc; + c = a + invphi2 * h; + round(*rndSolution_,*solution_,c); + problem0_->getObjective()->update(*rndSolution_); + fc = problem0_->getObjective()->value(*rndSolution_,tol); + } + else { + a = c; + c = d; + fc = fd; + d = a + invphi * h; + round(*rndSolution_,*solution_,d); + problem0_->getObjective()->update(*rndSolution_); + fd = problem0_->getObjective()->value(*rndSolution_,tol); + } + } + t = static_cast(0.5)*(a+b); + round(*rndSolution_,*solution_,t); + } + else { // naive rounding + t = static_cast(0.5); + round(*rndSolution_,*solution_,t); + } + problem0_->getObjective()->update(*rndSolution_); + val = problem0_->getObjective()->value(*rndSolution_,tol); + branching_->foundSolution(new ROL::ROL_PEBBL_Solution(*rndSolution_,val)); + if (verbosity_ > 0) { + *outStream_ << "ADVDIFF_BranchSub::incumbentHeuristic: " << methodName_ << std::endl; + *outStream_ << " Incumbent Value: " << val << std::endl; + *outStream_ << " Rounding Threshold: " << t << std::endl; + } + }; + +}; // class ADVDIFF_BranchSub + +#endif diff --git a/packages/rol/example/PDE-OPT/binary/adv-diff-TEST/example_01.cpp b/packages/rol/example/PDE-OPT/binary/adv-diff-TEST/example_01.cpp index 27a37ad975b0..911b6dfea0e7 100644 --- a/packages/rol/example/PDE-OPT/binary/adv-diff-TEST/example_01.cpp +++ b/packages/rol/example/PDE-OPT/binary/adv-diff-TEST/example_01.cpp @@ -58,9 +58,9 @@ #include "ROL_PEBBL_Driver.hpp" #include "ROL_TeuchosBranchHelper_PEBBL.hpp" #include "opfactory.hpp" -#include "hilbert.hpp" #include "extractQP.hpp" #include "branchHelper.hpp" +#include "branching.hpp" int main(int argc, char *argv[]) { // feenableexcept(FE_DIVBYZERO | FE_INVALID | FE_OVERFLOW); @@ -93,9 +93,8 @@ int main(int argc, char *argv[]) { ROL::Ptr> problem; ROL::Ptr> solver; ROL::Ptr> z, u; - int order = parlist->sublist("Problem").get("Hilbert Curve Order",6); - int n = std::pow(2,order+1); - parlist->sublist("Problem").set("Hilbert Curve Order",order+1); + int nx = parlist->sublist("Problem").get("Number of X-Cells",64); + int ny = parlist->sublist("Problem").get("Number of Y-Cells",32); factory = ROL::makePtr>(*parlist,comm,outStream); bool checkDeriv = parlist->sublist("Problem").get("Check Derivatives",false); if (checkDeriv) factory->check(*outStream); @@ -112,11 +111,16 @@ int main(int argc, char *argv[]) { solveQP = (useBB ? false : solveQP); if (useBB) { RealT intTol = parlist->sublist("Problem").get("Integrality Tolerance",1e-6); - int method = parlist->sublist("Problem").get("Branching Method",0); + int method = parlist->sublist("Problem").get("Branching Method",0); + int incheur = parlist->sublist("Problem").get("Incumbent Heuristic",0); + int verbosity = parlist->sublist("Problem").get("BB Output Level",0); ROL::Ptr> bHelper = ROL::makePtr>(intTol,method); - ROL::ROL_PEBBL_Driver pebbl(factory,parlist,bHelper,3,outStream); + ROL::Ptr> branching + = ROL::makePtr>(factory,parlist,bHelper,verbosity,outStream,incheur); + ROL::ROL_PEBBL_Driver pebbl(branching); pebbl.solve(argc,argv,*outStream); + z = pebbl.getSolution(); } else { if (solveQP) { @@ -125,41 +129,37 @@ int main(int argc, char *argv[]) { } solver = ROL::makePtr>(*problem, *parlist); solver->solve(*outStream); + z = problem->getSolutionVector(); } - z = problem->getSolutionVector(); factory->getState(u,z); // Print bool usePC = parlist->sublist("Problem").get("Piecewise Constant Controls", true); std::stringstream uname, zname, xname, yname; - uname << "state_" << order+1 << ".txt"; - zname << "control_" << order+1 << ".txt"; - xname << "X_" << order+1 << ".txt"; - yname << "Y_" << order+1 << ".txt"; if (!solveQP) { - factory->getAssembler()->outputTpetraVector(ROL::dynamicPtrCast>(u)->getVector(),uname.str()); if (!usePC) { + uname << "state.txt"; + zname << "control.txt"; + factory->getAssembler()->outputTpetraVector(ROL::dynamicPtrCast>(u)->getVector(),uname.str()); factory->getAssembler()->outputTpetraVector(ROL::dynamicPtrCast>(z)->getVector(),zname.str()); } else { + uname << "state_" << nx << "_" << ny << ".txt"; + zname << "control_" << nx << "_" << ny << ".txt"; + xname << "X_" << nx << "_" << ny << ".txt"; + yname << "Y_" << nx << "_" << ny << ".txt"; + factory->getAssembler()->outputTpetraVector(ROL::dynamicPtrCast>(u)->getVector(),uname.str()); std::ofstream zfile, xfile, yfile; zfile.open(zname.str()); xfile.open(xname.str()); yfile.open(yname.str()); - int x(0), y(0); - std::vector &zdata = *ROL::dynamicPtrCast>(z)->getParameter()->getVector(); - //for (unsigned j = 0; j < n*n; ++j) { - // zfile << zdata[j] << std::endl; - // hilbert::d2xy(order+1, j, x, y); - // xfile << x << std::endl; - // yfile << y << std::endl; - //} - for (int j = 0; j < n; ++j) { - for (int k = 0; k < n; ++k) { - zfile << zdata[j+k*n] << std::endl; - x = j; y = k; - xfile << x << std::endl; - yfile << y << std::endl; + std::vector &zdata = *ROL::dynamicPtrCast>(z)->getVector(); + zfile << std::scientific << std::setprecision(18); + for (int j = 0; j < nx; ++j) { + for (int k = 0; k < ny; ++k) { + zfile << zdata[j+k*nx] << std::endl; + xfile << j << std::endl; + yfile << k << std::endl; } } zfile.close(); @@ -168,24 +168,19 @@ int main(int argc, char *argv[]) { } } else { + zname << "control_" << nx << "_" << ny << ".txt"; + xname << "X_" << nx << "_" << ny << ".txt"; + yname << "Y_" << nx << "_" << ny << ".txt"; std::ofstream zfile, xfile, yfile; zfile.open(zname.str()); xfile.open(xname.str()); yfile.open(yname.str()); - int x(0), y(0); Teuchos::SerialDenseVector &zdata = *ROL::dynamicPtrCast>(z)->getVector(); - //for (unsigned j = 0; j < n*n; ++j) { - // zfile << zdata[j] << std::endl; - // hilbert::d2xy(order+1, j, x, y); - // xfile << x << std::endl; - // yfile << y << std::endl; - //} - for (int j = 0; j < n; ++j) { - for (int k = 0; k < n; ++k) { - zfile << zdata[j+k*n] << std::endl; - x = j; y = k; - xfile << x << std::endl; - yfile << y << std::endl; + for (int j = 0; j < nx; ++j) { + for (int k = 0; k < ny; ++k) { + zfile << zdata[j+k*nx] << std::endl; + xfile << j << std::endl; + yfile << k << std::endl; } } zfile.close(); diff --git a/packages/rol/example/PDE-OPT/binary/adv-diff-TEST/femdata.hpp b/packages/rol/example/PDE-OPT/binary/adv-diff-TEST/femdata.hpp new file mode 100644 index 000000000000..461fa516266b --- /dev/null +++ b/packages/rol/example/PDE-OPT/binary/adv-diff-TEST/femdata.hpp @@ -0,0 +1,294 @@ + +#ifndef FEMDATA_H +#define FEMDATA_H + +#include "ROL_Objective.hpp" +#include "ROL_SimController.hpp" +#include "../../TOOLS/assembler.hpp" +#include "../../TOOLS/solver.hpp" +#include "../../TOOLS/pdevector.hpp" +#include "pde_adv_diff.hpp" +#include "qoi_adv_diff.hpp" +#include "mesh_adv_diff.hpp" + +template +class FEMdata { +private: + // Advection Diffusion PDE + ROL::Ptr> pde_; + ROL::Ptr> assembler_; + ROL::Ptr> solver_; + ROL::Ptr> matJ1_, matJ2_, matH_; + ROL::Ptr> vecG_, vecR_, vecJ3_; + Real c0_; + + bool usePC_; + int psize_; + + mutable unsigned napJ1_, napJ2_, napH1_, nasse_; + +public: + FEMdata(const ROL::Ptr> &comm, + ROL::ParameterList &list, + std::ostream &stream = std::cout) + : napJ1_(0), napJ2_(0), napH1_(0), nasse_(0) { + usePC_ = list.sublist("Problem").get("Piecewise Constant Controls",false); + int nx = list.sublist("Problem").get("Number of X-Cells",1); + int ny = list.sublist("Problem").get("Number of Y-Cells",1); + psize_ = nx*ny; + + assemble(comm,list,stream); + } + + const ROL::Ptr> getAssembler(void) const { + return assembler_; + } + + const ROL::Ptr> getFE(void) const { + return pde_->getFE(); + } + + const ROL::Ptr> getFE2(void) const { + return pde_->getFE2(); + } + + // PDE definitions + void addPDErhs(ROL::Vector &rhs) const { + const Real one(1); + ROL::Ptr> rhsf = getField(rhs); + rhsf->update(one,*vecR_,one); + } + + void applyInversePDEJacobian(ROL::Vector &x, + const ROL::Vector &b, + bool transpose) { + ROL::Ptr> xf = getField(x); + ROL::Ptr> bf = getConstField(b); + solver_->solve(xf,bf,transpose); + napJ1_++; + } + + void applyControlJacobian(ROL::Vector &Jv, + const ROL::Vector &v, + const bool transpose) { + if (usePC_) { + if (transpose) { + ROL::Ptr> Jvp = getParameter(Jv); + ROL::Ptr> vf = getConstField(v); + Teuchos::Array val(1,0); + const size_t size = Jvp->size(); + for (size_t i = 0; i < size; ++i) { + Teuchos::ArrayView col(&i,1); + vecJ3_->subView(col)->dot(*vf, val.view(0,1)); + (*Jvp)[i] = val[0]; + } + } + else { + Jv.zero(); + ROL::Ptr> Jvf = getField(Jv); + ROL::Ptr> vp = getConstParameter(v); + const Real one(1); + const size_t size = vp->size(); + for (size_t i = 0; i < size; ++i) { + Teuchos::ArrayView col(&i,1); + Jvf->update((*vp)[i],*vecJ3_->subView(col),one); + } + } + } + else { + ROL::Ptr> Jvf = getField(Jv); + ROL::Ptr> vf = getConstField(v); + if (transpose) { + matJ2_->apply(*vf,*Jvf,Teuchos::TRANS); + } + else { + matJ2_->apply(*vf,*Jvf); + } + } + napJ2_++; + } + + // Objective definitions + Real getObjectiveConstant(void) const { + return c0_; + } + + void addObjectiveGradient(ROL::Vector &g) const { + const Real one(1); + ROL::Ptr> gf = getField(g); + gf->update(one,*vecG_,one); + } + + void applyObjectiveHessian(ROL::Vector &Hv, + const ROL::Vector &v) const { + ROL::Ptr> Hvf = getField(Hv); + ROL::Ptr> vf = getConstField(v); + matH_->apply(*vf,*Hvf); + napH1_++; + } + + ROL::Ptr> createStateVector(ROL::ParameterList &list) const { + return ROL::makePtr>(assembler_->createStateVector(),pde_,assembler_,list); + } + + ROL::Ptr> createResidualVector(ROL::ParameterList &list) const { + return ROL::makePtr>(assembler_->createResidualVector(),pde_,assembler_,list); + } + + ROL::Ptr> createControlVector(ROL::ParameterList &list) const { + return ROL::makePtr>(assembler_->createControlVector(),pde_,assembler_,list); + } + + void summarize(std::ostream &stream) const { + stream << std::endl; + stream << std::string(114,'=') << std::endl; + stream << " FEMdata::summarize" << std::endl; + stream << " Number of assemblies: " << nasse_ << std::endl; + stream << " Number of Jacobian_1 sovles: " << napJ1_ << std::endl; + stream << " Number of Jacobian_2 applies: " << napJ2_ << std::endl; + stream << " Number of Hessian_11 applies: " << napH1_ << std::endl; + stream << std::string(114,'=') << std::endl; + stream << std::endl; + } + +private: + + // Finite Element Assembly + void assemble(const ROL::Ptr> &comm, + ROL::ParameterList &list, + std::ostream &stream) { + nasse_++; + + pde_ = ROL::makePtr>(list); + ROL::Ptr> mesh = ROL::makePtr>(list); + assembler_ = ROL::makePtr>(pde_->getFields(),pde_->getFields2(), + mesh,comm,list,stream); + assembler_->setCellNodes(*pde_); + ROL::Ptr> qoi = ROL::makePtr>(pde_->getFE(),list); + solver_ = ROL::makePtr>(list.sublist("Solver")); + + // Create zero vectors + const Real zero(0); + ROL::Ptr> stateZero = assembler_->createStateVector(); + ROL::Ptr> controlZero = ROL::nullPtr; + ROL::Ptr> paramZero = ROL::nullPtr; + stateZero->putScalar(zero); + if (usePC_) { + paramZero = ROL::makePtr>(psize_,zero); + } + else { + controlZero = assembler_->createControlVector(); + controlZero->putScalar(zero); + } + + // Assemble components of the linear PDE + assembler_->assemblePDEResidual(vecR_,pde_,stateZero,controlZero,paramZero); + assembler_->assemblePDEJacobian1(matJ1_,pde_,stateZero,controlZero,paramZero); + if (usePC_) { + assembler_->assemblePDEJacobian3(vecJ3_,pde_,stateZero,controlZero,paramZero); + } + else { + assembler_->assemblePDEJacobian2(matJ2_,pde_,stateZero,controlZero,paramZero); + } + solver_->setA(matJ1_); + + // Assemble components of the quadratic objective function + c0_ = assembler_->assembleQoIValue(qoi,stateZero); + assembler_->assembleQoIGradient1(vecG_,qoi,stateZero); + assembler_->assembleQoIHessian11(matH_,qoi,stateZero); + } + + ROL::Ptr> getConstField(const ROL::Vector &x) const { + ROL::Ptr> xp; + try { + xp = dynamic_cast&>(x).getVector(); + } + catch (std::exception &e) { + try { + ROL::Ptr> xvec + = dynamic_cast&>(x).getField(); + if (xvec == ROL::nullPtr) { + xp = ROL::nullPtr; + } + else { + xp = xvec->getVector(); + } + } + catch (std::exception &ee) { + xp = ROL::nullPtr; + } + } + return xp; + } + + ROL::Ptr> getField(ROL::Vector &x) const { + ROL::Ptr> xp; + try { + xp = dynamic_cast&>(x).getVector(); + } + catch (std::exception &e) { + try { + ROL::Ptr> xvec + = dynamic_cast&>(x).getField(); + if ( xvec == ROL::nullPtr ) { + xp = ROL::nullPtr; + } + else { + xp = xvec->getVector(); + } + } + catch (std::exception &ee) { + xp = ROL::nullPtr; + } + } + return xp; + } + + ROL::Ptr > getConstParameter(const ROL::Vector &x) const { + ROL::Ptr > xp; + try { + xp = dynamic_cast&>(x).getVector(); + } + catch (std::exception &e) { + try { + ROL::Ptr > xvec + = dynamic_cast&>(x).getParameter(); + if ( xvec == ROL::nullPtr ) { + xp = ROL::nullPtr; + } + else { + xp = xvec->getVector(); + } + } + catch (std::exception &ee) { + xp = ROL::nullPtr; + } + } + return xp; + } + + ROL::Ptr > getParameter(ROL::Vector &x) const { + ROL::Ptr > xp; + try { + xp = dynamic_cast&>(x).getVector(); + } + catch (std::exception &e) { + try { + ROL::Ptr > xvec + = dynamic_cast&>(x).getParameter(); + if ( xvec == ROL::nullPtr ) { + xp = ROL::nullPtr; + } + else { + xp = xvec->getVector(); + } + } + catch (std::exception &ee) { + xp = ROL::nullPtr; + } + } + return xp; + } +}; // class FEMdata + +#endif diff --git a/packages/rol/example/PDE-OPT/binary/adv-diff-TEST/input_ex01.xml b/packages/rol/example/PDE-OPT/binary/adv-diff-TEST/input_ex01.xml index 6cfe5b7fa0a6..80c5441c85a4 100644 --- a/packages/rol/example/PDE-OPT/binary/adv-diff-TEST/input_ex01.xml +++ b/packages/rol/example/PDE-OPT/binary/adv-diff-TEST/input_ex01.xml @@ -1,25 +1,39 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + @@ -86,7 +100,7 @@ - + @@ -94,22 +108,67 @@ - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -150,10 +209,10 @@ - - - - + + + + @@ -181,13 +240,28 @@ + + + + + + + + + + + + + + + - - + + diff --git a/packages/rol/example/PDE-OPT/binary/adv-diff-TEST/misfit_robj.hpp b/packages/rol/example/PDE-OPT/binary/adv-diff-TEST/misfit_robj.hpp new file mode 100644 index 000000000000..69741d76d0b6 --- /dev/null +++ b/packages/rol/example/PDE-OPT/binary/adv-diff-TEST/misfit_robj.hpp @@ -0,0 +1,156 @@ + +#ifndef MISFIT_ROBJ_H +#define MISFIT_ROBJ_H + +#include "ROL_Objective.hpp" +#include "ROL_SimController.hpp" +#include "femdata.hpp" + +template +class Misfit_Objective : public ROL::Objective { +private: + // Advection Diffusion PDE + const ROL::Ptr> fem_; + + // Vector Storage + ROL::Ptr> stateStore_, adjointStore_; + ROL::Ptr> state_, adjoint_, state_sens_, adjoint_sens_; + ROL::Ptr> dualadjoint_; + + bool storage_; + + unsigned nstat_, nadjo_, nsens_, nsadj_; + unsigned nupda_, nfval_, ngrad_, nhess_, nprec_; + +public: + Misfit_Objective(const ROL::Ptr> &fem, + ROL::ParameterList &list) + : fem_(fem), nstat_(0), nadjo_(0), nsens_(0), nsadj_(0), + nupda_(0), nfval_(0), ngrad_(0), nhess_(0), nprec_(0) { + stateStore_ = ROL::makePtr>(); + adjointStore_ = ROL::makePtr>(); + + // Vector Storage + state_ = fem_->createStateVector(list); + adjoint_ = fem_->createStateVector(list); + state_sens_ = fem_->createStateVector(list); + adjoint_sens_ = fem_->createStateVector(list); + dualadjoint_ = fem_->createResidualVector(list); + + storage_ = list.sublist("Problem").get("Use state storage", true); + } + + const ROL::Ptr> getAssembler(void) const { + return fem_->getAssembler(); + } + + void update( const ROL::Vector &z, bool flag = true, int iter = -1 ) { + nupda_++; + stateStore_->objectiveUpdate(true); + adjointStore_->objectiveUpdate(flag); + } + + void solvePDE(ROL::Vector &u, const ROL::Vector &z) { + update(z,false); + solve_state_equation(u,z); + } + + Real value( const ROL::Vector &z, Real &tol ) { + nfval_++; + solve_state_equation(*state_,z); + fem_->applyObjectiveHessian(*dualadjoint_,*state_); // Hu + dualadjoint_->scale(static_cast(0.5)); // 0.5 Hu + fem_->addObjectiveGradient(*dualadjoint_); // 0.5 Hu + g + // 0.5 uHu + gu + c0 + return state_->dot(dualadjoint_->dual()) + fem_->getObjectiveConstant(); + } + + void gradient( ROL::Vector &g, const ROL::Vector &z, Real &tol ) { + ngrad_++; + solve_state_equation(*state_,z); + solve_adjoint_equation(*adjoint_,*state_); + fem_->applyControlJacobian(g,*adjoint_,true); + } + + void hessVec( ROL::Vector &hv, const ROL::Vector &v, const ROL::Vector &z, Real &tol ) { + nhess_++; + solve_state_sensitivity(*state_sens_,v); + solve_adjoint_sensitivity(*adjoint_sens_,*state_sens_); + fem_->applyControlJacobian(hv,*adjoint_sens_,true); + } + + /** \brief Apply a reduced Hessian preconditioner. + */ + virtual void precond( ROL::Vector &Pv, const ROL::Vector &v, const ROL::Vector &z, Real &tol ) { + nprec_++; + Pv.set(v.dual()); + } + + void summarize(std::ostream &stream) const { + stream << std::endl; + stream << std::string(114,'=') << std::endl; + stream << " Misfit_Objective::summarize" << std::endl; + stream << " Number of calls to update: " << nupda_ << std::endl; + stream << " Number of calls to value: " << nfval_ << std::endl; + stream << " Number of calls to gradient: " << ngrad_ << std::endl; + stream << " Number of calls to hessVec: " << nhess_ << std::endl; + stream << " Number of calls to precond: " << nprec_ << std::endl; + stream << " Number of state solves: " << nstat_ << std::endl; + stream << " Number of adjoint solves: " << nadjo_ << std::endl; + stream << " Number of state sensitivity solves: " << nsens_ << std::endl; + stream << " Number of adjoint sensitivity solves: " << nsadj_ << std::endl; + stream << std::string(114,'=') << std::endl; + stream << std::endl; + fem_->summarize(stream); + } + +private: + + void solve_state_equation(ROL::Vector &state, const ROL::Vector &control) { + bool isComputed = false; + if (storage_) { + isComputed = stateStore_->get(state,ROL::Objective::getParameter()); + } + if (!isComputed || !storage_) { + fem_->applyControlJacobian(*dualadjoint_,control,false); // Bz + fem_->addPDErhs(*dualadjoint_); // Bz + f + fem_->applyInversePDEJacobian(state,*dualadjoint_,false); // inv(A)(Bz + f) + state.scale(static_cast(-1)); // -inv(A)(Bz + f) + nstat_++; + if (storage_) { + stateStore_->set(state,ROL::Objective::getParameter()); + } + } + } + + void solve_adjoint_equation(ROL::Vector &adjoint, const ROL::Vector &state) { + bool isComputed = false; + if (storage_) { + isComputed = adjointStore_->get(adjoint,ROL::Objective::getParameter()); + } + if (!isComputed || !storage_) { + fem_->applyObjectiveHessian(*dualadjoint_,state); // Hu + fem_->addObjectiveGradient(*dualadjoint_); // Hu + g + fem_->applyInversePDEJacobian(adjoint,*dualadjoint_,true); // inv(A')(Hu + g) + adjoint.scale(static_cast(-1)); // -inv(A')(Hu + g) + nadjo_++; + if (storage_) { + adjointStore_->set(adjoint,ROL::Objective::getParameter()); + } + } + } + + void solve_state_sensitivity(ROL::Vector &state_sens, const ROL::Vector &v) { + fem_->applyControlJacobian(*dualadjoint_,v,false); // Bv + fem_->applyInversePDEJacobian(state_sens,*dualadjoint_,false); // inv(A)Bv + nsens_++; + } + + void solve_adjoint_sensitivity(ROL::Vector &adjoint_sens, const ROL::Vector &state_sens) { + fem_->applyObjectiveHessian(*dualadjoint_,state_sens); // Hv + fem_->applyInversePDEJacobian(adjoint_sens,*dualadjoint_,true); // inv(A')Hv + nsadj_++; + } +}; // class Misfit_Objective + +#endif diff --git a/packages/rol/example/PDE-OPT/binary/adv-diff-TEST/objsum.hpp b/packages/rol/example/PDE-OPT/binary/adv-diff-TEST/objsum.hpp new file mode 100644 index 000000000000..b44fd9585325 --- /dev/null +++ b/packages/rol/example/PDE-OPT/binary/adv-diff-TEST/objsum.hpp @@ -0,0 +1,131 @@ +// @HEADER +// ************************************************************************ +// +// Rapid Optimization Library (ROL) Package +// Copyright (2014) Sandia Corporation +// +// Under terms of Contract DE-AC04-94AL85000, there is a non-exclusive +// license for use of this work by or on behalf of the U.S. Government. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// 1. Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// +// 2. Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in the +// documentation and/or other materials provided with the distribution. +// +// 3. Neither the name of the Corporation nor the names of the +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY +// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL SANDIA CORPORATION OR THE +// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +// Questions? Contact lead developers: +// Drew Kouri (dpkouri@sandia.gov) and +// Denis Ridzal (dridzal@sandia.gov) +// +// ************************************************************************ +// @HEADER + +#ifndef ROL_OBJSUM_H +#define ROL_OBJSUM_H + +#include "misfit_robj.hpp" + +template +class Sum_Objective : public ROL::Objective { +private: + const ROL::Ptr> misfit_, penalty_, binary_; + + ROL::Ptr> xdual_; + bool initialized_; + + const ROL::Ptr stream_; + const bool printToStream_; + + Real misCost_, penCost_, binCost_; + +public: + Sum_Objective(const ROL::Ptr> &fem_, + const ROL::Ptr> &pen, + const ROL::Ptr> &bin, + ROL::ParameterList &list, + ROL::Ptr &stream = ROL::nullPtr, + bool printToStream = false) + : misfit_(ROL::makePtr>(fem_,list)), + penalty_(pen), binary_(bin), + xdual_(ROL::nullPtr), initialized_(false), + stream_(stream), printToStream_(printToStream) { + misCost_ = list.sublist("Problem").get("State Cost", 1.0); + penCost_ = list.sublist("Problem").get("Control Cost", 1.0); + binCost_ = list.sublist("Problem").get("Integrality Cost", 1.0); + } + + void update(const ROL::Vector &x, bool flag = true, int iter = -1) { + misfit_->update(x,flag,iter); + penalty_->update(x,flag,iter); + binary_->update(x,flag,iter); + } + + Real value( const ROL::Vector &x, Real &tol ) { + Real misfit = misfit_->value(x,tol); + Real penalty = penalty_->value(x,tol); + Real binary = binary_->value(x,tol); + if (printToStream_) { + *stream_ << "Unscaled: " + << "Misfit Value = " << misfit << " " + << "Penalty Value = " << penalty << " " + << "Binary Value = " << binary << std::endl; + *stream_ << "Scaled: " + << "Misfit Value = " << misCost_*misfit << " " + << "Penalty Value = " << penCost_*penalty << " " + << "Binary Value = " << binCost_*binary << std::endl; + } + return misCost_*misfit + penCost_*penalty + binCost_*binary; + } + + void gradient( ROL::Vector &g, const ROL::Vector &x, Real &tol ) { + if (!initialized_) { + xdual_ = g.clone(); + initialized_ = true; + } + g.zero(); + misfit_->gradient(g,x,tol); + g.scale(misCost_); + penalty_->gradient(*xdual_,x,tol); + g.axpy(penCost_,*xdual_); + binary_->gradient(*xdual_,x,tol); + g.axpy(binCost_,*xdual_); + } + + void hessVec( ROL::Vector &hv, const ROL::Vector &v, const ROL::Vector &x, Real &tol ) { + if (!initialized_) { + xdual_ = hv.clone(); + initialized_ = true; + } + hv.zero(); + misfit_->hessVec(hv,v,x,tol); + hv.scale(misCost_); + penalty_->hessVec(*xdual_,v,x,tol); + hv.axpy(penCost_,*xdual_); + binary_->hessVec(*xdual_,v,x,tol); + hv.axpy(binCost_,*xdual_); + } + +}; // class Sum_Objective + +#endif diff --git a/packages/rol/example/PDE-OPT/binary/adv-diff-TEST/opfactory.hpp b/packages/rol/example/PDE-OPT/binary/adv-diff-TEST/opfactory.hpp index abec69eaf42a..d4165486b3a8 100644 --- a/packages/rol/example/PDE-OPT/binary/adv-diff-TEST/opfactory.hpp +++ b/packages/rol/example/PDE-OPT/binary/adv-diff-TEST/opfactory.hpp @@ -49,117 +49,99 @@ #include "ROL_Reduced_Objective_SimOpt.hpp" #include "ROL_OptimizationProblemFactory.hpp" -#include "../../TOOLS/linearpdeconstraint.hpp" #include "../../TOOLS/pdeobjective.hpp" #include "../../TOOLS/pdevector.hpp" -#include "pde_adv_diff.hpp" -#include "qoi_adv_diff.hpp" -#include "mesh_adv_diff.hpp" +#include "objsum.hpp" template class BinaryAdvDiffFactory : public ROL::OptimizationProblemFactory { private: int dim_; - ROL::ParameterList pl_; + mutable ROL::ParameterList pl_; ROL::Ptr> comm_; ROL::Ptr os_; - ROL::Ptr> mesh_; - ROL::Ptr> pde_; - ROL::Ptr> con_; - ROL::Ptr> obj_; - ROL::Ptr> robj_; - ROL::Ptr> assembler_; - ROL::Ptr> u_, z_, p_; + ROL::Ptr> fem_; + ROL::Ptr> assembler_; + ROL::Ptr> penalty_, binary_; + ROL::Ptr> z_; + ROL::Ptr> bnd_; public: BinaryAdvDiffFactory(ROL::ParameterList &pl, const ROL::Ptr> &comm, const ROL::Ptr &os) : pl_(pl), comm_(comm), os_(os) { - mesh_ = ROL::makePtr>(pl_); - pde_ = ROL::makePtr>(pl_); - con_ = ROL::makePtr>(pde_,mesh_,comm_,pl_,*os_); - assembler_ = con_->getAssembler(); + fem_ = ROL::makePtr>(comm,pl_,*os_); + assembler_ = fem_->getAssembler(); std::string costType = pl_.sublist("Problem").get("Control Cost Type", "TV"); - Real stateCost = pl_.sublist("Problem").get("State Cost", 1.0); - Real controlCost = pl_.sublist("Problem").get("Control Cost", 1.0); - Real intCost = pl_.sublist("Problem").get("Integrality Cost", 1.0); - std::vector wts = {stateCost, controlCost, intCost}; - std::vector>> qoi_vec(3,ROL::nullPtr); - qoi_vec[0] = ROL::makePtr>(pde_->getFE(),pl_); + std::vector>> qoi_pen(2,ROL::nullPtr); if (costType=="TV") { - qoi_vec[1] = ROL::makePtr>(pde_->getFE(),pl_); + qoi_pen[0] = ROL::makePtr>(fem_->getFE2(),pl_); } else if (costType=="L1") { - qoi_vec[1] = ROL::makePtr>(pde_->getFE(),pl_); + qoi_pen[0] = ROL::makePtr>(fem_->getFE2(),pl_); } else { - qoi_vec[1] = ROL::makePtr>(pde_->getFE(),pl_); + qoi_pen[0] = ROL::makePtr>(fem_->getFE2(),pl_); } - qoi_vec[2] = ROL::makePtr>(pde_->getFE(),pl_); - obj_ = ROL::makePtr>(qoi_vec, wts, assembler_); - } - - void update(void) { + qoi_pen[1] = ROL::makePtr>(fem_->getFE2(),pl_); + penalty_ = ROL::makePtr>(qoi_pen[0],assembler_); + binary_ = ROL::makePtr>(qoi_pen[1],assembler_); + // Create template control vector bool usePC = pl_.sublist("Problem").get("Piecewise Constant Controls", true); - int order = pl_.sublist("Problem").get("Hilbert Curve Order", 2); - int n = std::pow(2,order); - ROL::Ptr> u_ptr, p_ptr, r_ptr, z_ptr; - u_ptr = assembler_->createStateVector(); - p_ptr = assembler_->createStateVector(); - ROL::Ptr> up, pp, zp; - u_ = ROL::makePtr>(u_ptr,pde_,assembler_,pl_); - p_ = ROL::makePtr>(p_ptr,pde_,assembler_,pl_); if (usePC) { - Real XL = pl_.sublist("Geometry").get("X0", 0.0); - Real YL = pl_.sublist("Geometry").get("Y0", 0.0); - Real XU = XL + pl_.sublist("Geometry").get("Width", 2.0); - Real YU = YL + pl_.sublist("Geometry").get("Height", 1.0); - Real vol = (XU-XL)/static_cast(n) * (YU-YL)/static_cast(n); + int nx = pl_.sublist("Problem").get("Number of X-Cells", 4); + int ny = pl_.sublist("Problem").get("Number of Y-Cells", 2); + Real width = pl_.sublist("Geometry").get("Width", 2.0); + Real height = pl_.sublist("Geometry").get("Height", 1.0); + Real vol = width/static_cast(nx) * height/static_cast(ny); ROL::Ptr> xvec, svec; - xvec = ROL::makePtr>(n*n,0); - svec = ROL::makePtr>(n*n,vol); + xvec = ROL::makePtr>(nx*ny,0); + svec = ROL::makePtr>(nx*ny,vol); std::ifstream file; std::stringstream name; - name << "control_" << order << ".txt"; - Real val(0), zero(0), half(0.5), one(1); + name << "control_" << nx << "_" << ny << ".txt"; file.open(name.str()); if (file.is_open()) { - for (int i = 0; i < n; ++i) { - for (int j = 0; j < n; ++j) { - file >> val; - (*xvec)[i+j*n] = (val < half ? zero : one); + for (int i = 0; i < nx; ++i) { + for (int j = 0; j < ny; ++j) { + file >> (*xvec)[i+j*nx]; } } } file.close(); - ROL::Ptr> xstd = ROL::makePtr>(xvec,svec); - z_ = ROL::makePtr>(xstd); + z_ = ROL::makePtr>(xvec,svec); } else { - z_ptr = assembler_->createControlVector(); - z_ = ROL::makePtr>(z_ptr,pde_,assembler_,pl_); + z_ = fem_->createControlVector(pl_); } - bool storage = pl_.sublist("Problem").get("Use Storage", true); - robj_ = ROL::makePtr>(obj_, con_, u_, z_, p_, storage, false); + // Create bound constraint + ROL::Ptr> zlop = z_->clone(), zhip = z_->clone(); + zlop->setScalar(static_cast(0)); + zhip->setScalar(static_cast(1)); + bnd_ = ROL::makePtr>(zlop,zhip); } + void update(void) {} + ROL::Ptr> buildObjective(void) { - return robj_; + return ROL::makePtr>(fem_,penalty_,binary_,pl_,os_,true); } ROL::Ptr> buildSolutionVector(void) { - return z_; + ROL::Ptr> z = z_->clone(); z->set(*z_); + return z; } ROL::Ptr> buildBoundConstraint(void) { - ROL::Ptr> zlop = z_->clone(), zhip = z_->clone(); - zlop->setScalar(static_cast(0)); - zhip->setScalar(static_cast(1)); - return ROL::makePtr>(zlop,zhip); + return bnd_; + //ROL::Ptr> zlop = z_->clone(), zhip = z_->clone(); + //zlop->setScalar(static_cast(0)); + //zhip->setScalar(static_cast(1)); + //return ROL::makePtr>(zlop,zhip); //return ROL::nullPtr; } @@ -184,10 +166,9 @@ class BinaryAdvDiffFactory : public ROL::OptimizationProblemFactory { } void getState(ROL::Ptr> &u, const ROL::Ptr> &z) const { - Real tol = std::sqrt(ROL::ROL_EPSILON()); - u = u_->clone(); - ROL::Ptr> r = u_->dual().clone(); - con_->solve(*r, *u, *z, tol); + u = fem_->createStateVector(pl_); + Misfit_Objective obj(fem_,pl_); + obj.solvePDE(*u,*z); } ROL::Ptr> getAssembler(void) const { @@ -195,50 +176,19 @@ class BinaryAdvDiffFactory : public ROL::OptimizationProblemFactory { } void print(std::ostream &stream = std::cout) { - Real tol = std::sqrt(ROL::ROL_EPSILON()); - ROL::Ptr> r = u_->dual().clone(); - con_->solve(*r,*u_,*z_,tol); - assembler_->outputTpetraVector(ROL::dynamicPtrCast>(u_)->getVector(),"state.txt"); - bool usePC = pl_.sublist("Problem").get("Piecewise Constant Controls", true); - if (usePC) { - std::ofstream zfile; - zfile.open("control.txt"); - ROL::Ptr> zvec - = ROL::dynamicPtrCast>(z_)->getParameter()->getVector(); - for (unsigned i = 0; i < zvec->size(); ++i) { - zfile << (*zvec)[i] << std::endl; - } - zfile.close(); - pde_->print(); - } - else { - assembler_->outputTpetraVector(ROL::dynamicPtrCast>(z_)->getVector(),"control.txt"); - } assembler_->printMeshData(stream); } void check(std::ostream &stream = std::cout) { - update(); - ROL::Ptr> r1 = u_->dual().clone(); r1->randomize(); - ROL::Ptr> u1 = u_->clone(); u1->randomize(); - ROL::Ptr> u2 = u_->clone(); u2->randomize(); - ROL::Ptr> z1 = z_->clone(); z1->randomize(); - ROL::Ptr> z2 = z_->clone(); z2->randomize(); - con_->checkSolve(*u1,*z1,*r1,true,stream); - con_->checkApplyJacobian_1(*u1,*z1,*u2,*r1,true,stream); - con_->checkApplyJacobian_2(*u1,*z1,*z2,*r1,true,stream); - con_->checkApplyAdjointHessian_11(*u1,*z1,*u1,*u2,*r1,true,stream); - con_->checkApplyAdjointHessian_12(*u1,*z1,*u1,*u2,*z1,true,stream); - con_->checkApplyAdjointHessian_21(*u1,*z1,*u1,*z2,*r1,true,stream); - con_->checkApplyAdjointHessian_22(*u1,*z1,*u1,*z2,*z1,true,stream); - obj_->checkGradient_1(*u1,*z1,*u2,true,stream); - obj_->checkGradient_2(*u1,*z1,*z2,true,stream); - obj_->checkHessVec_11(*u1,*z1,*u2,true,stream); - obj_->checkHessVec_12(*u1,*z1,*z2,true,stream); - obj_->checkHessVec_21(*u1,*z1,*u2,true,stream); - obj_->checkHessVec_22(*u1,*z1,*z2,true,stream); - robj_->checkGradient(*z1,*z2,true,stream); - robj_->checkHessVec(*z1,*z2,true,stream); + ROL::Ptr> z1 = z_->clone(); z1->randomize(); + ROL::Ptr> z2 = z_->clone(); z2->randomize(); + penalty_->checkGradient(*z1,*z2,true,stream); + penalty_->checkHessVec(*z1,*z2,true,stream); + binary_->checkGradient(*z1,*z2,true,stream); + binary_->checkHessVec(*z1,*z2,true,stream); + Misfit_Objective obj(fem_,pl_); + obj.checkGradient(*z1,*z2,true,stream); + obj.checkHessVec(*z1,*z2,true,stream); } }; diff --git a/packages/rol/example/PDE-OPT/binary/adv-diff-TEST/pde_adv_diff.hpp b/packages/rol/example/PDE-OPT/binary/adv-diff-TEST/pde_adv_diff.hpp index 14511c4213fb..5624450296fc 100644 --- a/packages/rol/example/PDE-OPT/binary/adv-diff-TEST/pde_adv_diff.hpp +++ b/packages/rol/example/PDE-OPT/binary/adv-diff-TEST/pde_adv_diff.hpp @@ -50,7 +50,6 @@ #include "../../TOOLS/pde.hpp" #include "../../TOOLS/fe.hpp" -#include "hilbert.hpp" #include "Intrepid_HGRAD_QUAD_C1_FEM.hpp" #include "Intrepid_HGRAD_QUAD_C2_FEM.hpp" @@ -68,6 +67,8 @@ class PDE_adv_diff : public PDE { // Finite element basis information ROL::Ptr>> basisPtr_; std::vector>>> basisPtrs_; + ROL::Ptr>> basisPtr2_; + std::vector>>> basisPtrs2_; // Cell cubature information ROL::Ptr> cellCub_; // Cell node information @@ -75,16 +76,15 @@ class PDE_adv_diff : public PDE { std::vector>>> bdryCellNodes_; std::vector>> bdryCellLocIds_; // Finite element definition - ROL::Ptr> fe_vol_; + ROL::Ptr> fe_vol_, fe_ctrl_; // Local degrees of freedom on boundary, for each side of the reference cell (first index). std::vector> fidx_; // Coordinates of degrees freedom on boundary cells. // Indexing: [sideset number][local side id](cell number, value at dof) std::vector>>> bdryCellDofValues_; - int order_; + int nx_, ny_; Real XL_, XU_, YL_, YU_; - std::vector>> ctrl_wts_; bool usePC_; public: @@ -115,24 +115,24 @@ class PDE_adv_diff : public PDE { Intrepid::DefaultCubatureFactory cubFactory; // create cubature factory cellCub_ = cubFactory.create(cellType, cubDegree); // create default cubature - order_ = parlist.sublist("Problem").get("Hilbert Curve Order", 2); + nx_ = parlist.sublist("Problem").get("Number of X-Cells", 4); + ny_ = parlist.sublist("Problem").get("Number of Y-Cells", 2); XL_ = parlist.sublist("Geometry").get("X0", 0.0); YL_ = parlist.sublist("Geometry").get("Y0", 0.0); XU_ = XL_ + parlist.sublist("Geometry").get("Width", 2.0); YU_ = YL_ + parlist.sublist("Geometry").get("Height", 1.0); usePC_ = parlist.sublist("Problem").get("Piecewise Constant Controls", true); + if (!usePC_) { + if (probDim == 2) { + basisPtr2_ = ROL::makePtr>>(); + } + else if (probDim == 3) { + basisPtr2_ = ROL::makePtr>>(); + } + basisPtrs2_.clear(); basisPtrs2_.push_back(basisPtr2_); + } } -// PDE_adv_diff(const PDE_adv_diff &rpde) -// : basisPtr_(rpde.basisPtr_), basisPtrs_(rpde.basisPtrs_), -// cellCub_(rpde.cellCub_), volCellNodes_(rpde.volCellNodes_), -// bdryCellNodes_(rpde.bdryCellNodes_), -// bdryCellLocIds_(rpde.bdryCellLocIds_), -// fe_vol_(rpde.fe_vol_), fidx_(rpde.fidx_), -// bdryCellDofValues_(rpde.bdryCellDofValues_), -// order_(rpde.order_), XL_(rpde.XL_), XU_(rpde.XU_), YL(rpde.YL_), -// YU_(rpde.YU_), ctrl_wts_(rpde.ctrl_wts_), usePC_(rpde.usePC_) {} - void residual(ROL::Ptr> & res, const ROL::Ptr> & u_coeff, const ROL::Ptr> & z_coeff = ROL::nullPtr, @@ -175,7 +175,7 @@ class PDE_adv_diff : public PDE { // ADD CONTROL TERM TO RESIDUAL if (z_coeff != ROL::nullPtr) { - fe_vol_->evaluateValue(valZ_eval, z_coeff); + fe_ctrl_->evaluateValue(valZ_eval, z_coeff); Intrepid::RealSpaceTools::scale(*valZ_eval,static_cast(-1)); Intrepid::FunctionSpaceTools::integrate(*res, *valZ_eval, @@ -183,15 +183,11 @@ class PDE_adv_diff : public PDE { Intrepid::COMP_CPP, true); } else { - int n = std::pow(2,order_); - for (int i = 0; i < n*n; ++i) { - *valZ_eval = *ctrl_wts_[i]; - Intrepid::RealSpaceTools::scale(*valZ_eval,-(*z_param)[i]); - Intrepid::FunctionSpaceTools::integrate(*res, - *valZ_eval, - *fe_vol_->NdetJ(), - Intrepid::COMP_CPP, true); - } + addControlOperator(valZ_eval,z_param); + Intrepid::FunctionSpaceTools::integrate(*res, + *valZ_eval, + *fe_vol_->NdetJ(), + Intrepid::COMP_CPP, true); } // APPLY DIRICHLET CONDITIONS int numLocalSideIds = bdryCellLocIds_[0].size(); @@ -267,10 +263,15 @@ class PDE_adv_diff : public PDE { if (z_coeff != ROL::nullPtr) { // GET DIMENSIONS int c = fe_vol_->N()->dimension(0); - int f = fe_vol_->N()->dimension(1); + int f1 = fe_vol_->N()->dimension(1); + int f2 = fe_ctrl_->N()->dimension(1); // INITIALIZE RIESZ - jac = ROL::makePtr>(c, f, f); - *jac = *fe_vol_->massMat(); + jac = ROL::makePtr>(c, f1, f2); + Intrepid::FunctionSpaceTools::integrate(*jac, + *fe_vol_->N(), + *fe_ctrl_->NdetJ(), + Intrepid::COMP_CPP, false); + //*jac = *fe_vol_->massMat(); Intrepid::RealSpaceTools::scale(*jac,static_cast(-1)); // APPLY DIRICHLET CONDITIONS int numLocalSideIds = bdryCellLocIds_[0].size(); @@ -281,7 +282,7 @@ class PDE_adv_diff : public PDE { int cidx = bdryCellLocIds_[0][j][k]; for (int l = 0; l < numBdryDofs; ++l) { //std::cout << "\n j=" << j << " l=" << l << " " << fidx[j][l]; - for (int m = 0; m < f; ++m) { + for (int m = 0; m < f2; ++m) { (*jac)(cidx,fidx_[j][l],m) = static_cast(0); } } @@ -306,25 +307,29 @@ class PDE_adv_diff : public PDE { int f = fe_vol_->gradN()->dimension(1); int p = fe_vol_->gradN()->dimension(2); // ADD CONTROL TERM TO RESIDUAL - int n = std::pow(2,order_); ROL::Ptr> ctrl = ROL::makePtr>(c, p); - for (int i = 0; i < n*n; ++i) { - jac[i] = ROL::makePtr>(c, f); - Intrepid::FunctionSpaceTools::integrate(*jac[i], - *ctrl_wts_[i], - *fe_vol_->NdetJ(), - Intrepid::COMP_CPP, false); - Intrepid::RealSpaceTools::scale(*jac[i],static_cast(-1)); - // APPLY DIRICHLET CONDITIONS - int numLocalSideIds = bdryCellLocIds_[0].size(); - for (int j = 0; j < numLocalSideIds; ++j) { - int numCellsSide = bdryCellLocIds_[0][j].size(); - int numBdryDofs = fidx_[j].size(); - for (int k = 0; k < numCellsSide; ++k) { - int cidx = bdryCellLocIds_[0][j][k]; - for (int l = 0; l < numBdryDofs; ++l) { - (*(jac[i]))(cidx,fidx_[j][l]) = static_cast(0); + ROL::Ptr> B + = ROL::makePtr>(c, p); + for (int i = 0; i < nx_; ++i) { + for (int j = 0; j < ny_; ++j) { + int ind = i + j*nx_; + jac[ind] = ROL::makePtr>(c, f); + addControlJaobian(B,i,j); + Intrepid::FunctionSpaceTools::integrate(*jac[ind], + *B, + *fe_vol_->NdetJ(), + Intrepid::COMP_CPP, false); + // APPLY DIRICHLET CONDITIONS + int numLocalSideIds = bdryCellLocIds_[0].size(); + for (int k = 0; k < numLocalSideIds; ++k) { + int numCellsSide = bdryCellLocIds_[0][k].size(); + int numBdryDofs = fidx_[k].size(); + for (int l = 0; l < numCellsSide; ++l) { + int cidx = bdryCellLocIds_[0][k][l]; + for (int m = 0; m < numBdryDofs; ++m) { + (*(jac[ind]))(cidx,fidx_[k][m]) = static_cast(0); + } } } } @@ -416,17 +421,21 @@ class PDE_adv_diff : public PDE { void RieszMap_2(ROL::Ptr> & riesz) { // GET DIMENSIONS - int c = fe_vol_->N()->dimension(0); - int f = fe_vol_->N()->dimension(1); + int c = fe_ctrl_->N()->dimension(0); + int f = fe_ctrl_->N()->dimension(1); // INITIALIZE RIESZ riesz = ROL::makePtr>(c, f, f); - *riesz = *fe_vol_->massMat(); + *riesz = *fe_ctrl_->massMat(); } std::vector>>> getFields() { return basisPtrs_; } + std::vector>>> getFields2() { + return basisPtrs2_; + } + void setCellNodes(const ROL::Ptr> &volCellNodes, const std::vector>>> &bdryCellNodes, const std::vector>> &bdryCellLocIds) { @@ -435,6 +444,9 @@ class PDE_adv_diff : public PDE { bdryCellLocIds_ = bdryCellLocIds; // Finite element definition. fe_vol_ = ROL::makePtr>(volCellNodes_,basisPtr_,cellCub_); + if (!usePC_) { + fe_ctrl_ = ROL::makePtr>(volCellNodes_,basisPtr2_,cellCub_); + } // Set local boundary DOFs. fidx_ = fe_vol_->getBoundaryDofs(); // Compute Dirichlet values at DOFs. @@ -464,25 +476,25 @@ class PDE_adv_diff : public PDE { } } } - if (usePC_) { - computeControlWeights(); - } } const ROL::Ptr> getFE(void) const { return fe_vol_; } + const ROL::Ptr> getFE2(void) const { + return fe_ctrl_; + } + void print(void) const { - int n = std::pow(2,order_); - int x(0), y(0); std::ofstream xfile, yfile; xfile.open("X.txt"); yfile.open("Y.txt"); - for (int i = 0; i < n*n; ++i) { - hilbert::d2xy(order_, i, x, y); - xfile << x << std::endl; - yfile << y << std::endl; + for (int i = 0; i < nx_; ++i) { + for (int j = 0; j < ny_; ++j) { + xfile << i << std::endl; + yfile << j << std::endl; + } } xfile.close(); yfile.close(); @@ -526,34 +538,31 @@ class PDE_adv_diff : public PDE { } } - void computeControlWeights(void) { + void addControlOperator(ROL::Ptr> &Bz, + const ROL::Ptr> &z) const { // GET DIMENSIONS int c = fe_vol_->gradN()->dimension(0); int p = fe_vol_->gradN()->dimension(2); int d = fe_vol_->gradN()->dimension(3); std::vector pt(d); Real xl(0), xu(0), yl(0), yu(0); - int n = std::pow(2,order_), x(0), y(0), D(0); - ctrl_wts_.clear(); ctrl_wts_.resize(n*n); - for (int l = 0; l < n*n; ++l) { - ctrl_wts_[l] = ROL::makePtr>(c,p); - ctrl_wts_[l]->initialize(); - } + Bz->initialize(); for (int i = 0; i < c; ++i) { for (int j = 0; j < p; ++j) { for ( int k = 0; k < d; ++k) { pt[k] = (*fe_vol_->cubPts())(i,j,k); } - for (int l = 0; l < n; ++l) { - for (int m = 0; m < n; ++m) { - hilbert::xy2d(order_,l,m,D); - D = l + m*n; - xl = XL_ + static_cast(l)*(XU_-XL_)/static_cast(n); - xu = XL_ + static_cast(l+1)*(XU_-XL_)/static_cast(n); - yl = YL_ + static_cast(m)*(YU_-YL_)/static_cast(n); - yu = YL_ + static_cast(m+1)*(YU_-YL_)/static_cast(n); - if ( (pt[0] < xu && pt[0] >= xl) && (pt[1] < yu && pt[1] >= yl) ) { - (*ctrl_wts_[D])(i,j) = static_cast(1); + for (int l = 0; l < nx_; ++l) { + xl = XL_ + static_cast(l)*(XU_-XL_)/static_cast(nx_); + xu = XL_ + static_cast(l+1)*(XU_-XL_)/static_cast(nx_); + if ( pt[0] < xu && pt[0] >= xl ) { + for (int m = 0; m < ny_; ++m) { + int ind = l + m*nx_; + yl = YL_ + static_cast(m)*(YU_-YL_)/static_cast(ny_); + yu = YL_ + static_cast(m+1)*(YU_-YL_)/static_cast(ny_); + if ( pt[1] < yu && pt[1] >= yl ) { + (*Bz)(i,j) -= (*z)[ind]; + } } } } @@ -561,6 +570,32 @@ class PDE_adv_diff : public PDE { } } + void addControlJaobian(ROL::Ptr> &B, + int l, int m) const { + // GET DIMENSIONS + int c = fe_vol_->gradN()->dimension(0); + int p = fe_vol_->gradN()->dimension(2); + int d = fe_vol_->gradN()->dimension(3); + std::vector pt(d); + Real xl(0), xu(0), yl(0), yu(0); + xl = XL_ + static_cast(l)*(XU_-XL_)/static_cast(nx_); + xu = XL_ + static_cast(l+1)*(XU_-XL_)/static_cast(nx_); + yl = YL_ + static_cast(m)*(YU_-YL_)/static_cast(ny_); + yu = YL_ + static_cast(m+1)*(YU_-YL_)/static_cast(ny_); + int ind = l + m*nx_; + B->initialize(); + for (int i = 0; i < c; ++i) { + for (int j = 0; j < p; ++j) { + for ( int k = 0; k < d; ++k) { + pt[k] = (*fe_vol_->cubPts())(i,j,k); + } + if ( pt[0] < xu && pt[0] >= xl && pt[1] < yu && pt[1] >= yl ) { + (*B)(i,j) = static_cast(-1); + } + } + } + } + }; // PDE_stoch_adv_diff #endif diff --git a/packages/rol/example/PDE-OPT/binary/adv-diff-TEST/plotPEBBL.m b/packages/rol/example/PDE-OPT/binary/adv-diff-TEST/plotPEBBL.m new file mode 100644 index 000000000000..ed12195689f7 --- /dev/null +++ b/packages/rol/example/PDE-OPT/binary/adv-diff-TEST/plotPEBBL.m @@ -0,0 +1,24 @@ +function plotresultsPEBBL(nx,ny) + +control = load([int2str(nx),'x',int2str(ny),'.sol.txt']).'; +X = load(['X_',int2str(nx),'_',int2str(ny),'.txt']); +Y = load(['Y_',int2str(nx),'_',int2str(ny),'.txt']); +tmp = control; +for i = 1:nx + for j = 1:ny + control(j+(i-1)*ny) = tmp(i+(j-1)*nx); + end +end +figure, +scatter3(2*X/nx,Y/ny,control,100,control,'filled') +view(2) +axis equal; +axis tight; +box on; +xlabel('x'); +ylabel('y'); +title('Computed controls'); +colorbar +print('-depsc2',['control_',int2str(nx),'x',int2str(ny),'.eps']); + +end diff --git a/packages/rol/example/PDE-OPT/binary/adv-diff-TEST/qoi_adv_diff.hpp b/packages/rol/example/PDE-OPT/binary/adv-diff-TEST/qoi_adv_diff.hpp index f03c596fdd5d..0c4b551e387d 100644 --- a/packages/rol/example/PDE-OPT/binary/adv-diff-TEST/qoi_adv_diff.hpp +++ b/packages/rol/example/PDE-OPT/binary/adv-diff-TEST/qoi_adv_diff.hpp @@ -60,20 +60,21 @@ class QoI_State_Cost_adv_diff : public QoI { std::vector> pts_; std::vector vals_; - ROL::Ptr> phi_, dphi_; + ROL::Ptr> phi_, dphi_, dphi1_; Real evaluateSensor(const std::vector &pt, const int isens) const { - const Real two(2), pi(M_PI); const int d = pt.size(); - Real dist(0), s2 = sig_*sig_, nc = std::sqrt(std::pow(two*pi*s2,static_cast(d))); + const Real half(0.5), two(2), pi(M_PI), dr(d); + Real dist(0), s2 = sig_*sig_, nc = std::pow(two*pi*s2,half*dr); for (int i = 0; i < d; ++i) { dist += std::pow(pt[i]-pts_[isens][i],two); } - return std::exp(-dist/(two*s2))/nc; + return std::exp(-half*dist/s2)/nc; } void computeSensor(ROL::Ptr> &phi, - ROL::Ptr> &dphi) const { + ROL::Ptr> &dphi, + ROL::Ptr> &dphi1) const { // GET DIMENSIONS int c = fe_->gradN()->dimension(0); int p = fe_->gradN()->dimension(2); @@ -82,6 +83,7 @@ class QoI_State_Cost_adv_diff : public QoI { std::vector pt(d); phi->initialize(static_cast(0)); dphi->initialize(static_cast(0)); + dphi1->initialize(static_cast(0)); for (int i = 0; i < c; ++i) { for (int j = 0; j < p; ++j) { for ( int k = 0; k < d; ++k) { @@ -90,8 +92,9 @@ class QoI_State_Cost_adv_diff : public QoI { // Compute diffusivity kappa for (int l = 0; l < nsens_; ++l) { phil = evaluateSensor(pt,l); - (*phi)(i,j) += phil; - (*dphi)(i,j) += vals_[l]*phil; + (*phi)(i,j) += phil; + (*dphi)(i,j) += vals_[l]*phil; + (*dphi1)(i,j) += vals_[l]*std::sqrt(phil); } } } @@ -120,9 +123,10 @@ class QoI_State_Cost_adv_diff : public QoI { } } file.close(); - phi_ = ROL::makePtr>(c, p); - dphi_ = ROL::makePtr>(c, p); - computeSensor(phi_,dphi_); + phi_ = ROL::makePtr>(c, p); + dphi_ = ROL::makePtr>(c, p); + dphi1_ = ROL::makePtr>(c, p); + computeSensor(phi_,dphi_,dphi1_); } Real value(ROL::Ptr> & val, @@ -143,7 +147,7 @@ class QoI_State_Cost_adv_diff : public QoI { Intrepid::FunctionSpaceTools::scalarMultiplyDataData(*Usqr,*valU_eval,*valU_eval); // Compute squared L2-norm of diff fe_->computeIntegral(val,phi_,Usqr,false); - fe_->computeIntegral(val,dphi_,dphi_,true); + fe_->computeIntegral(val,dphi1_,dphi1_,true); Intrepid::RealSpaceTools::scale(*val,static_cast(0.5)); fe_->computeIntegral(val0,dphi_,valU_eval,false); Intrepid::RealSpaceTools::subtract(*val,*val0); @@ -188,6 +192,23 @@ class QoI_State_Cost_adv_diff : public QoI { throw Exception::Zero(">>> QoI_State_Cost_stoch_adv_diff::gradient_3 is zero."); } + void Hessian_11(ROL::Ptr> & hess, + const ROL::Ptr> & u_coeff, + const ROL::Ptr> & z_coeff = ROL::nullPtr, + const ROL::Ptr> & z_param = ROL::nullPtr) { + const int c = fe_->gradN()->dimension(0); + const int f = fe_->gradN()->dimension(1); + const int p = fe_->gradN()->dimension(2); + ROL::Ptr> H; + hess = ROL::makePtr>(c, f, f); + H = ROL::makePtr>(c, f, p); + Intrepid::FunctionSpaceTools::scalarMultiplyDataField(*H, *phi_, *fe_->N()); + Intrepid::FunctionSpaceTools::integrate(*hess, + *H, + *(fe_->NdetJ()), + Intrepid::COMP_CPP, false); + } + void HessVec_11(ROL::Ptr> & hess, const ROL::Ptr> & v_coeff, const ROL::Ptr> & u_coeff, @@ -509,13 +530,13 @@ class QoI_Control_Cost_adv_diff : public QoI { public: QoI_Control_Cost_adv_diff(const ROL::Ptr> &fe, ROL::ParameterList & parlist) : fe_(fe) { - int order = parlist.sublist("Problem").get("Hilbert Curve Order", 2); + int nx = parlist.sublist("Problem").get("Number of X-Cells", 4); + int ny = parlist.sublist("Problem").get("Number of Y-Cells", 2); Real XL = parlist.sublist("Geometry").get("X0", 0.0); Real YL = parlist.sublist("Geometry").get("Y0", 0.0); Real XU = XL + parlist.sublist("Geometry").get("Width", 1.0); Real YU = YL + parlist.sublist("Geometry").get("Height", 1.0); - int n = std::pow(2,order); - vol_ = (XU-XL)/static_cast(n) * (YU-YL)/static_cast(n); + vol_ = (XU-XL)/static_cast(nx) * (YU-YL)/static_cast(ny); } Real value(ROL::Ptr> & val, @@ -679,13 +700,13 @@ class QoI_Control_Cost_L2_adv_diff : public QoI { public: QoI_Control_Cost_L2_adv_diff(const ROL::Ptr> &fe, ROL::ParameterList & parlist) : fe_(fe) { - int order = parlist.sublist("Problem").get("Hilbert Curve Order", 2); + int nx = parlist.sublist("Problem").get("Number of X-Cells", 4); + int ny = parlist.sublist("Problem").get("Number of Y-Cells", 2); Real XL = parlist.sublist("Geometry").get("X0", 0.0); Real YL = parlist.sublist("Geometry").get("Y0", 0.0); Real XU = XL + parlist.sublist("Geometry").get("Width", 1.0); Real YU = YL + parlist.sublist("Geometry").get("Height", 1.0); - int n = std::pow(2,order); - vol_ = (XU-XL)/static_cast(n) * (YU-YL)/static_cast(n); + vol_ = (XU-XL)/static_cast(nx) * (YU-YL)/static_cast(ny); } Real value(ROL::Ptr> & val, @@ -872,19 +893,19 @@ class QoI_TVControl_Cost_adv_diff : public QoI { private: ROL::Ptr> fe_; Real volx_,voly_, vol_, eps_; - int n_; + int nx_, ny_; public: QoI_TVControl_Cost_adv_diff(const ROL::Ptr> &fe, ROL::ParameterList & parlist) : fe_(fe) { - int order = parlist.sublist("Problem").get("Hilbert Curve Order", 2); Real XL = parlist.sublist("Geometry").get("X0", 0.0); Real YL = parlist.sublist("Geometry").get("Y0", 0.0); Real XU = XL + parlist.sublist("Geometry").get("Width", 1.0); Real YU = YL + parlist.sublist("Geometry").get("Height", 1.0); - n_ = std::pow(2,order); - volx_ = (XU-XL)/static_cast(n_); - voly_ = (YU-YL)/static_cast(n_); + nx_ = parlist.sublist("Problem").get("Number of X-Cells", 4); + ny_ = parlist.sublist("Problem").get("Number of Y-Cells", 2); + volx_ = (XU-XL)/static_cast(nx_); + voly_ = (YU-YL)/static_cast(ny_); vol_ = volx_*voly_; eps_ = parlist.sublist("Problem").get("TV Smoothing Parameter",1e-3); } @@ -925,36 +946,56 @@ class QoI_TVControl_Cost_adv_diff : public QoI { else { const Real half(0.5), two(2); Real sum(0); - std::vector tmp(n_); - std::vector> Dx(n_+1,tmp), Dy(n_+1,tmp); - for (int i = 0; i < n_+1; ++i) { - for (int j = 0; j < n_; ++j) { + std::vector tmpx(nx_), tmpy(ny_); + std::vector> Dx(nx_+1,tmpy), Dy(ny_+1,tmpx); + for (int i = 0; i < nx_+1; ++i) { + for (int j = 0; j < ny_; ++j) { if (i==0) { - Dx[i][j] = std::pow(-(*z_param)[i+j*n_]/volx_,two); - Dy[i][j] = std::pow(-(*z_param)[j+i*n_]/voly_,two); + Dx[i][j] = std::pow(-(*z_param)[i+j*nx_]/volx_,two); } - else if (i > 0 && i < n_) { - Dx[i][j] = std::pow(((*z_param)[i+j*n_]-(*z_param)[(i-1)+j*n_])/volx_,two); - Dy[i][j] = std::pow(((*z_param)[j+i*n_]-(*z_param)[j+(i-1)*n_])/voly_,two); + else if (i > 0 && i < nx_) { + Dx[i][j] = std::pow(((*z_param)[i+j*nx_]-(*z_param)[(i-1)+j*nx_])/volx_,two); } else { - Dx[i][j] = std::pow((*z_param)[(i-1)+j*n_]/volx_,two); - Dy[i][j] = std::pow((*z_param)[j+(i-1)*n_]/voly_,two); + Dx[i][j] = std::pow((*z_param)[(i-1)+j*nx_]/volx_,two); } } } - for (int i = 0; i < n_+1; ++i) { - for (int j = 0; j < n_; ++j) { + for (int i = 0; i < ny_+1; ++i) { + for (int j = 0; j < nx_; ++j) { + if (i==0) { + Dy[i][j] = std::pow(-(*z_param)[j+i*nx_]/voly_,two); + } + else if (i > 0 && i < ny_) { + Dy[i][j] = std::pow(((*z_param)[j+i*nx_]-(*z_param)[j+(i-1)*nx_])/voly_,two); + } + else { + Dy[i][j] = std::pow((*z_param)[j+(i-1)*nx_]/voly_,two); + } + } + } + for (int i = 0; i < nx_+1; ++i) { + for (int j = 0; j < ny_; ++j) { if (i==0) { sum += std::sqrt(Dx[i][j]+eps_); - sum += std::sqrt(Dy[i][j]+eps_); } - else if (i > 0 && i < n_) { + else if (i > 0 && i < nx_) { sum += std::sqrt(half*(Dx[i][j]+Dx[i+1][j])+eps_); - sum += std::sqrt(half*(Dy[i][j]+Dy[i+1][j])+eps_); } else { sum += std::sqrt(half*Dx[i][j]+eps_); + } + } + } + for (int i = 0; i < ny_+1; ++i) { + for (int j = 0; j < nx_; ++j) { + if (i==0) { + sum += std::sqrt(Dy[i][j]+eps_); + } + else if (i > 0 && i < ny_) { + sum += std::sqrt(half*(Dy[i][j]+Dy[i+1][j])+eps_); + } + else { sum += std::sqrt(half*Dy[i][j]+eps_); } } @@ -1021,59 +1062,77 @@ class QoI_TVControl_Cost_adv_diff : public QoI { const int size = z_param->size(); std::vector g(size,static_cast(0)); const Real half(0.5), two(2), volx2 = volx_*volx_, voly2 = voly_*voly_; - std::vector tmp(n_); - std::vector> Dx(n_+1,tmp), Dy(n_+1,tmp); - for (int i = 0; i < n_+1; ++i) { - for (int j = 0; j < n_; ++j) { + std::vector tmpx(nx_), tmpy(ny_); + std::vector> Dx(nx_+1,tmpy), Dy(ny_+1,tmpx); + for (int i = 0; i < nx_+1; ++i) { + for (int j = 0; j < ny_; ++j) { if (i==0) { - Dx[i][j] = std::pow(-(*z_param)[i+j*n_]/volx_,two); - Dy[i][j] = std::pow(-(*z_param)[j+i*n_]/voly_,two); + Dx[i][j] = std::pow(-(*z_param)[i+j*nx_]/volx_,two); } - else if (i > 0 && i < n_) { - Dx[i][j] = std::pow(((*z_param)[i+j*n_]-(*z_param)[(i-1)+j*n_])/volx_,two); - Dy[i][j] = std::pow(((*z_param)[j+i*n_]-(*z_param)[j+(i-1)*n_])/voly_,two); + else if (i > 0 && i < nx_) { + Dx[i][j] = std::pow(((*z_param)[i+j*nx_]-(*z_param)[(i-1)+j*nx_])/volx_,two); } else { - Dx[i][j] = std::pow((*z_param)[(i-1)+j*n_]/volx_,two); - Dy[i][j] = std::pow((*z_param)[j+(i-1)*n_]/voly_,two); + Dx[i][j] = std::pow((*z_param)[(i-1)+j*nx_]/volx_,two); } } } - for (int i = 0; i < n_+1; ++i) { - for (int j = 0; j < n_; ++j) { + for (int i = 0; i < ny_+1; ++i) { + for (int j = 0; j < nx_; ++j) { + if (i==0) { + Dy[i][j] = std::pow(-(*z_param)[j+i*nx_]/voly_,two); + } + else if (i > 0 && i < ny_) { + Dy[i][j] = std::pow(((*z_param)[j+i*nx_]-(*z_param)[j+(i-1)*nx_])/voly_,two); + } + else { + Dy[i][j] = std::pow((*z_param)[j+(i-1)*nx_]/voly_,two); + } + } + } + for (int i = 0; i < nx_+1; ++i) { + for (int j = 0; j < ny_; ++j) { if (i==0) { Real cx = (vol_/volx2)/std::sqrt(Dx[i][j]+eps_); - g[i+j*n_] += cx*(*z_param)[i+j*n_]; - - Real cy = (vol_/voly2)/std::sqrt(Dy[i][j]+eps_); - g[j+i*n_] += cy*(*z_param)[j+i*n_]; + g[i+j*nx_] += cx*(*z_param)[i+j*nx_]; } - else if (i > 0 && i < n_-1) { + else if (i > 0 && i < nx_-1) { Real cx = half*vol_/(volx2*std::sqrt(half*(Dx[i][j]+Dx[i+1][j])+eps_)); - g[(i-1)+j*n_] -= cx*((*z_param)[i+j*n_]-(*z_param)[(i-1)+j*n_]); - g[i+j*n_] += cx*(two*(*z_param)[i+j*n_]-(*z_param)[(i+1)+j*n_]-(*z_param)[(i-1)+j*n_]); - g[(i+1)+j*n_] += cx*((*z_param)[(i+1)+j*n_]-(*z_param)[i+j*n_]); - - Real cy = half*vol_/(voly2*std::sqrt(half*(Dy[i][j]+Dy[i+1][j])+eps_)); - g[j+(i-1)*n_] -= cy*((*z_param)[j+i*n_]-(*z_param)[j+(i-1)*n_]); - g[j+i*n_] += cy*(two*(*z_param)[j+i*n_]-(*z_param)[j+(i+1)*n_]-(*z_param)[j+(i-1)*n_]); - g[j+(i+1)*n_] += cy*((*z_param)[j+(i+1)*n_]-(*z_param)[j+i*n_]); + g[(i-1)+j*nx_] -= cx*((*z_param)[i+j*nx_]-(*z_param)[(i-1)+j*nx_]); + g[i+j*nx_] += cx*(two*(*z_param)[i+j*nx_]-(*z_param)[(i+1)+j*nx_]-(*z_param)[(i-1)+j*nx_]); + g[(i+1)+j*nx_] += cx*((*z_param)[(i+1)+j*nx_]-(*z_param)[i+j*nx_]); } - else if (i == n_-1) { + else if (i == nx_-1) { Real cx = half*vol_/(volx2*std::sqrt(half*(Dx[i][j]+Dx[i+1][j])+eps_)); - g[(i-1)+j*n_] -= cx*((*z_param)[i+j*n_]-(*z_param)[(i-1)+j*n_]); - g[i+j*n_] += cx*(two*(*z_param)[i+j*n_]-(*z_param)[(i-1)+j*n_]); - - Real cy = half*vol_/(voly2*std::sqrt(half*(Dy[i][j]+Dy[i+1][j])+eps_)); - g[j+(i-1)*n_] -= cy*((*z_param)[j+i*n_]-(*z_param)[j+(i-1)*n_]); - g[j+i*n_] += cy*(two*(*z_param)[j+i*n_]-(*z_param)[j+(i-1)*n_]); + g[(i-1)+j*nx_] -= cx*((*z_param)[i+j*nx_]-(*z_param)[(i-1)+j*nx_]); + g[i+j*nx_] += cx*(two*(*z_param)[i+j*nx_]-(*z_param)[(i-1)+j*nx_]); } - else if (i==n_) { + else if (i==nx_) { Real cx = vol_*half/(volx2*std::sqrt(half*Dx[i][j]+eps_)); - g[(i-1)+j*n_] += cx*(*z_param)[(i-1)+j*n_]; - + g[(i-1)+j*nx_] += cx*(*z_param)[(i-1)+j*nx_]; + } + } + } + for (int i = 0; i < ny_+1; ++i) { + for (int j = 0; j < nx_; ++j) { + if (i==0) { + Real cy = (vol_/voly2)/std::sqrt(Dy[i][j]+eps_); + g[j+i*nx_] += cy*(*z_param)[j+i*nx_]; + } + else if (i > 0 && i < ny_-1) { + Real cy = half*vol_/(voly2*std::sqrt(half*(Dy[i][j]+Dy[i+1][j])+eps_)); + g[j+(i-1)*nx_] -= cy*((*z_param)[j+i*nx_]-(*z_param)[j+(i-1)*nx_]); + g[j+i*nx_] += cy*(two*(*z_param)[j+i*nx_]-(*z_param)[j+(i+1)*nx_]-(*z_param)[j+(i-1)*nx_]); + g[j+(i+1)*nx_] += cy*((*z_param)[j+(i+1)*nx_]-(*z_param)[j+i*nx_]); + } + else if (i == ny_-1) { + Real cy = half*vol_/(voly2*std::sqrt(half*(Dy[i][j]+Dy[i+1][j])+eps_)); + g[j+(i-1)*nx_] -= cy*((*z_param)[j+i*nx_]-(*z_param)[j+(i-1)*nx_]); + g[j+i*nx_] += cy*(two*(*z_param)[j+i*nx_]-(*z_param)[j+(i-1)*nx_]); + } + else if (i==ny_) { Real cy = vol_*half/(voly2*std::sqrt(half*Dy[i][j]+eps_)); - g[j+(i-1)*n_] += cy*(*z_param)[j+(i-1)*n_]; + g[j+(i-1)*nx_] += cy*(*z_param)[j+(i-1)*nx_]; } } } @@ -1197,93 +1256,111 @@ class QoI_TVControl_Cost_adv_diff : public QoI { const int size = z_param->size(); std::vector h(size,static_cast(0)); const Real half(0.5), two(2), three(3), volx2 = volx_*volx_, voly2 = voly_*voly_; - std::vector tmp(n_); - std::vector> Dx(n_+1,tmp), Dy(n_+1,tmp); - for (int i = 0; i < n_+1; ++i) { - for (int j = 0; j < n_; ++j) { + std::vector tmpx(nx_), tmpy(ny_); + std::vector> Dx(nx_+1,tmpy), Dy(ny_+1,tmpx); + for (int i = 0; i < nx_+1; ++i) { + for (int j = 0; j < ny_; ++j) { if (i==0) { - Dx[i][j] = std::pow(-(*z_param)[i+j*n_]/volx_,two); - Dy[i][j] = std::pow(-(*z_param)[j+i*n_]/voly_,two); + Dx[i][j] = std::pow(-(*z_param)[i+j*nx_]/volx_,two); } - else if (i > 0 && i < n_) { - Dx[i][j] = std::pow(((*z_param)[i+j*n_]-(*z_param)[(i-1)+j*n_])/volx_,two); - Dy[i][j] = std::pow(((*z_param)[j+i*n_]-(*z_param)[j+(i-1)*n_])/voly_,two); + else if (i > 0 && i < nx_) { + Dx[i][j] = std::pow(((*z_param)[i+j*nx_]-(*z_param)[(i-1)+j*nx_])/volx_,two); } else { - Dx[i][j] = std::pow((*z_param)[(i-1)+j*n_]/volx_,two); - Dy[i][j] = std::pow((*z_param)[j+(i-1)*n_]/voly_,two); + Dx[i][j] = std::pow((*z_param)[(i-1)+j*nx_]/volx_,two); } } } - for (int i = 0; i < n_+1; ++i) { - for (int j = 0; j < n_; ++j) { + for (int i = 0; i < ny_+1; ++i) { + for (int j = 0; j < nx_; ++j) { + if (i==0) { + Dy[i][j] = std::pow(-(*z_param)[j+i*nx_]/voly_,two); + } + else if (i > 0 && i < ny_) { + Dy[i][j] = std::pow(((*z_param)[j+i*nx_]-(*z_param)[j+(i-1)*nx_])/voly_,two); + } + else { + Dy[i][j] = std::pow((*z_param)[j+(i-1)*nx_]/voly_,two); + } + } + } + for (int i = 0; i < nx_+1; ++i) { + for (int j = 0; j < ny_; ++j) { if (i==0) { Real cx1 = (vol_/volx2)/std::sqrt(Dx[i][j]+eps_); Real cx2 = (vol_/volx2)*(two/volx2)*(-half/std::pow(std::sqrt(Dx[i][j]+eps_),three)); - h[i+j*n_] += (cx1+cx2*std::pow((*z_param)[i+j*n_],two))*(*v_param)[i+j*n_]; - - Real cy1 = (vol_/voly2)/std::sqrt(Dy[i][j]+eps_); - Real cy2 = (vol_/voly2)*(two/voly2)*(-half/std::pow(std::sqrt(Dy[i][j]+eps_),three)); - h[j+i*n_] += (cy1+cy2*std::pow((*z_param)[j+i*n_],two))*(*v_param)[j+i*n_]; + h[i+j*nx_] += (cx1+cx2*std::pow((*z_param)[i+j*nx_],two))*(*v_param)[i+j*nx_]; } - else if (i > 0 && i < n_-1) { + else if (i > 0 && i < nx_-1) { Real cx1 = (half*vol_/volx2)/std::sqrt(half*(Dx[i][j]+Dx[i+1][j])+eps_); Real cx2 = (half*vol_/volx2)*(two/volx2)*(-half*half/std::pow(std::sqrt(half*(Dx[i][j]+Dx[i+1][j])+eps_),three)); - h[(i-1)+j*n_] += cx2*std::pow((*z_param)[i+j*n_]-(*z_param)[(i-1)+j*n_],two)*(*v_param)[(i-1)+j*n_] - -cx2*((*z_param)[i+j*n_]-(*z_param)[(i-1)+j*n_])*(two*(*z_param)[i+j*n_]-(*z_param)[(i+1)+j*n_]-(*z_param)[(i-1)+j*n_])*(*v_param)[i+j*n_] - -cx2*((*z_param)[i+j*n_]-(*z_param)[(i-1)+j*n_])*((*z_param)[(i+1)+j*n_]-(*z_param)[i+j*n_])*(*v_param)[(i+1)+j*n_] - -cx1*((*v_param)[i+j*n_]-(*v_param)[(i-1)+j*n_]); - h[i+j*n_] += cx2*std::pow(two*(*z_param)[i+j*n_]-(*z_param)[(i+1)+j*n_]-(*z_param)[(i-1)+j*n_],two)*(*v_param)[i+j*n_] - -cx2*(two*(*z_param)[i+j*n_]-(*z_param)[(i+1)+j*n_]-(*z_param)[(i-1)+j*n_])*((*z_param)[i+j*n_]-(*z_param)[(i-1)+j*n_])*(*v_param)[(i-1)+j*n_] - +cx2*(two*(*z_param)[i+j*n_]-(*z_param)[(i+1)+j*n_]-(*z_param)[(i-1)+j*n_])*((*z_param)[(i+1)+j*n_]-(*z_param)[i+j*n_])*(*v_param)[(i+1)+j*n_] - +cx1*(two*(*v_param)[i+j*n_]-(*v_param)[(i+1)+j*n_]-(*v_param)[(i-1)+j*n_]); - h[(i+1)+j*n_] += cx2*std::pow((*z_param)[(i+1)+j*n_]-(*z_param)[i+j*n_],two)*(*v_param)[(i+1)+j*n_] - -cx2*((*z_param)[(i+1)+j*n_]-(*z_param)[i+j*n_])*((*z_param)[i+j*n_]-(*z_param)[(i-1)+j*n_])*(*v_param)[(i-1)+j*n_] - +cx2*((*z_param)[(i+1)+j*n_]-(*z_param)[i+j*n_])*(two*(*z_param)[i+j*n_]-(*z_param)[(i+1)+j*n_]-(*z_param)[(i-1)+j*n_])*(*v_param)[i+j*n_] - +cx1*((*v_param)[(i+1)+j*n_]-(*v_param)[i+j*n_]); - - Real cy1 = (half*vol_/voly2)/std::sqrt(half*(Dy[i][j]+Dy[i+1][j])+eps_); - Real cy2 = (half*vol_/voly2)*(two/voly2)*(-half*half/std::pow(std::sqrt(half*(Dy[i][j]+Dy[i+1][j])+eps_),three)); - h[j+(i-1)*n_] += cy2*std::pow((*z_param)[j+i*n_]-(*z_param)[j+(i-1)*n_],two)*(*v_param)[j+(i-1)*n_] - -cy2*((*z_param)[j+i*n_]-(*z_param)[j+(i-1)*n_])*(two*(*z_param)[j+i*n_]-(*z_param)[j+(i+1)*n_]-(*z_param)[j+(i-1)*n_])*(*v_param)[j+i*n_] - -cy2*((*z_param)[j+i*n_]-(*z_param)[j+(i-1)*n_])*((*z_param)[j+(i+1)*n_]-(*z_param)[j+i*n_])*(*v_param)[j+(i+1)*n_] - -cy1*((*v_param)[j+i*n_]-(*v_param)[j+(i-1)*n_]); - h[j+i*n_] += cy2*std::pow(two*(*z_param)[j+i*n_]-(*z_param)[j+(i+1)*n_]-(*z_param)[j+(i-1)*n_],two)*(*v_param)[j+i*n_] - -cy2*(two*(*z_param)[j+i*n_]-(*z_param)[j+(i+1)*n_]-(*z_param)[j+(i-1)*n_])*((*z_param)[j+i*n_]-(*z_param)[j+(i-1)*n_])*(*v_param)[j+(i-1)*n_] - +cy2*(two*(*z_param)[j+i*n_]-(*z_param)[j+(i+1)*n_]-(*z_param)[j+(i-1)*n_])*((*z_param)[j+(i+1)*n_]-(*z_param)[j+i*n_])*(*v_param)[j+(i+1)*n_] - +cy1*(two*(*v_param)[j+i*n_]-(*v_param)[j+(i+1)*n_]-(*v_param)[j+(i-1)*n_]); - h[j+(i+1)*n_] += cy2*std::pow((*z_param)[j+(i+1)*n_]-(*z_param)[j+i*n_],two)*(*v_param)[j+(i+1)*n_] - -cy2*((*z_param)[j+(i+1)*n_]-(*z_param)[j+i*n_])*((*z_param)[j+i*n_]-(*z_param)[j+(i-1)*n_])*(*v_param)[j+(i-1)*n_] - +cy2*((*z_param)[j+(i+1)*n_]-(*z_param)[j+i*n_])*(two*(*z_param)[j+i*n_]-(*z_param)[j+(i+1)*n_]-(*z_param)[j+(i-1)*n_])*(*v_param)[j+i*n_] - +cy1*((*v_param)[j+(i+1)*n_]-(*v_param)[j+i*n_]); + h[(i-1)+j*nx_] += cx2*std::pow((*z_param)[i+j*nx_]-(*z_param)[(i-1)+j*nx_],two)*(*v_param)[(i-1)+j*nx_] + -cx2*((*z_param)[i+j*nx_]-(*z_param)[(i-1)+j*nx_])*(two*(*z_param)[i+j*nx_]-(*z_param)[(i+1)+j*nx_]-(*z_param)[(i-1)+j*nx_])*(*v_param)[i+j*nx_] + -cx2*((*z_param)[i+j*nx_]-(*z_param)[(i-1)+j*nx_])*((*z_param)[(i+1)+j*nx_]-(*z_param)[i+j*nx_])*(*v_param)[(i+1)+j*nx_] + -cx1*((*v_param)[i+j*nx_]-(*v_param)[(i-1)+j*nx_]); + h[i+j*nx_] += cx2*std::pow(two*(*z_param)[i+j*nx_]-(*z_param)[(i+1)+j*nx_]-(*z_param)[(i-1)+j*nx_],two)*(*v_param)[i+j*nx_] + -cx2*(two*(*z_param)[i+j*nx_]-(*z_param)[(i+1)+j*nx_]-(*z_param)[(i-1)+j*nx_])*((*z_param)[i+j*nx_]-(*z_param)[(i-1)+j*nx_])*(*v_param)[(i-1)+j*nx_] + +cx2*(two*(*z_param)[i+j*nx_]-(*z_param)[(i+1)+j*nx_]-(*z_param)[(i-1)+j*nx_])*((*z_param)[(i+1)+j*nx_]-(*z_param)[i+j*nx_])*(*v_param)[(i+1)+j*nx_] + +cx1*(two*(*v_param)[i+j*nx_]-(*v_param)[(i+1)+j*nx_]-(*v_param)[(i-1)+j*nx_]); + h[(i+1)+j*nx_] += cx2*std::pow((*z_param)[(i+1)+j*nx_]-(*z_param)[i+j*nx_],two)*(*v_param)[(i+1)+j*nx_] + -cx2*((*z_param)[(i+1)+j*nx_]-(*z_param)[i+j*nx_])*((*z_param)[i+j*nx_]-(*z_param)[(i-1)+j*nx_])*(*v_param)[(i-1)+j*nx_] + +cx2*((*z_param)[(i+1)+j*nx_]-(*z_param)[i+j*nx_])*(two*(*z_param)[i+j*nx_]-(*z_param)[(i+1)+j*nx_]-(*z_param)[(i-1)+j*nx_])*(*v_param)[i+j*nx_] + +cx1*((*v_param)[(i+1)+j*nx_]-(*v_param)[i+j*nx_]); } - else if (i == n_-1) { + else if (i == nx_-1) { Real cx1 = (half*vol_/volx2)/std::sqrt(half*(Dx[i][j]+Dx[i+1][j])+eps_); Real cx2 = (half*vol_/volx2)*(two/volx2)*(-half*half/std::pow(std::sqrt(half*(Dx[i][j]+Dx[i+1][j])+eps_),three)); - h[(i-1)+j*n_] += cx2*std::pow((*z_param)[i+j*n_]-(*z_param)[(i-1)+j*n_],two)*(*v_param)[(i-1)+j*n_] - -cx2*((*z_param)[i+j*n_]-(*z_param)[(i-1)+j*n_])*(two*(*z_param)[i+j*n_]-(*z_param)[(i-1)+j*n_])*(*v_param)[i+j*n_] - -cx1*((*v_param)[i+j*n_]-(*v_param)[(i-1)+j*n_]); - h[i+j*n_] += cx2*std::pow(two*(*z_param)[i+j*n_]-(*z_param)[(i-1)+j*n_],two)*(*v_param)[i+j*n_] - -cx2*(two*(*z_param)[i+j*n_]-(*z_param)[(i-1)+j*n_])*((*z_param)[i+j*n_]-(*z_param)[(i-1)+j*n_])*(*v_param)[(i-1)+j*n_] - +cx1*(two*(*v_param)[i+j*n_]-(*v_param)[(i-1)+j*n_]); - - Real cy1 = (half*vol_/voly2)/std::sqrt(half*(Dy[i][j]+Dy[i+1][j])+eps_); - Real cy2 = (half*vol_/voly2)*(two/voly2)*(-half*half/std::pow(std::sqrt(half*(Dy[i][j]+Dy[i+1][j])+eps_),three)); - h[j+(i-1)*n_] += cy2*std::pow((*z_param)[j+i*n_]-(*z_param)[j+(i-1)*n_],two)*(*v_param)[j+(i-1)*n_] - -cy2*((*z_param)[j+i*n_]-(*z_param)[j+(i-1)*n_])*(two*(*z_param)[j+i*n_]-(*z_param)[j+(i-1)*n_])*(*v_param)[j+i*n_] - -cy1*((*v_param)[j+i*n_]-(*v_param)[j+(i-1)*n_]); - h[j+i*n_] += cy2*std::pow(two*(*z_param)[j+i*n_]-(*z_param)[j+(i-1)*n_],two)*(*v_param)[j+i*n_] - -cy2*(two*(*z_param)[j+i*n_]-(*z_param)[j+(i-1)*n_])*((*z_param)[j+i*n_]-(*z_param)[j+(i-1)*n_])*(*v_param)[j+(i-1)*n_] - +cy1*(two*(*v_param)[j+i*n_]-(*v_param)[j+(i-1)*n_]); + h[(i-1)+j*nx_] += cx2*std::pow((*z_param)[i+j*nx_]-(*z_param)[(i-1)+j*nx_],two)*(*v_param)[(i-1)+j*nx_] + -cx2*((*z_param)[i+j*nx_]-(*z_param)[(i-1)+j*nx_])*(two*(*z_param)[i+j*nx_]-(*z_param)[(i-1)+j*nx_])*(*v_param)[i+j*nx_] + -cx1*((*v_param)[i+j*nx_]-(*v_param)[(i-1)+j*nx_]); + h[i+j*nx_] += cx2*std::pow(two*(*z_param)[i+j*nx_]-(*z_param)[(i-1)+j*nx_],two)*(*v_param)[i+j*nx_] + -cx2*(two*(*z_param)[i+j*nx_]-(*z_param)[(i-1)+j*nx_])*((*z_param)[i+j*nx_]-(*z_param)[(i-1)+j*nx_])*(*v_param)[(i-1)+j*nx_] + +cx1*(two*(*v_param)[i+j*nx_]-(*v_param)[(i-1)+j*nx_]); } - else if (i==n_) { + else if (i==nx_) { Real cx1 = (vol_*half/volx2)/std::sqrt(half*Dx[i][j]+eps_); Real cx2 = (vol_*half/volx2)*(two/volx2)*(-half*half/std::pow(std::sqrt(half*Dx[i][j]+eps_),three)); - h[(i-1)+j*n_] += (cx1+cx2*std::pow((*z_param)[(i-1)+j*n_],two))*(*v_param)[(i-1)+j*n_]; - + h[(i-1)+j*nx_] += (cx1+cx2*std::pow((*z_param)[(i-1)+j*nx_],two))*(*v_param)[(i-1)+j*nx_]; + } + } + } + for (int i = 0; i < ny_+1; ++i) { + for (int j = 0; j < nx_; ++j) { + if (i==0) { + Real cy1 = (vol_/voly2)/std::sqrt(Dy[i][j]+eps_); + Real cy2 = (vol_/voly2)*(two/voly2)*(-half/std::pow(std::sqrt(Dy[i][j]+eps_),three)); + h[j+i*nx_] += (cy1+cy2*std::pow((*z_param)[j+i*nx_],two))*(*v_param)[j+i*nx_]; + } + else if (i > 0 && i < ny_-1) { + Real cy1 = (half*vol_/voly2)/std::sqrt(half*(Dy[i][j]+Dy[i+1][j])+eps_); + Real cy2 = (half*vol_/voly2)*(two/voly2)*(-half*half/std::pow(std::sqrt(half*(Dy[i][j]+Dy[i+1][j])+eps_),three)); + h[j+(i-1)*nx_] += cy2*std::pow((*z_param)[j+i*nx_]-(*z_param)[j+(i-1)*nx_],two)*(*v_param)[j+(i-1)*nx_] + -cy2*((*z_param)[j+i*nx_]-(*z_param)[j+(i-1)*nx_])*(two*(*z_param)[j+i*nx_]-(*z_param)[j+(i+1)*nx_]-(*z_param)[j+(i-1)*nx_])*(*v_param)[j+i*nx_] + -cy2*((*z_param)[j+i*nx_]-(*z_param)[j+(i-1)*nx_])*((*z_param)[j+(i+1)*nx_]-(*z_param)[j+i*nx_])*(*v_param)[j+(i+1)*nx_] + -cy1*((*v_param)[j+i*nx_]-(*v_param)[j+(i-1)*nx_]); + h[j+i*nx_] += cy2*std::pow(two*(*z_param)[j+i*nx_]-(*z_param)[j+(i+1)*nx_]-(*z_param)[j+(i-1)*nx_],two)*(*v_param)[j+i*nx_] + -cy2*(two*(*z_param)[j+i*nx_]-(*z_param)[j+(i+1)*nx_]-(*z_param)[j+(i-1)*nx_])*((*z_param)[j+i*nx_]-(*z_param)[j+(i-1)*nx_])*(*v_param)[j+(i-1)*nx_] + +cy2*(two*(*z_param)[j+i*nx_]-(*z_param)[j+(i+1)*nx_]-(*z_param)[j+(i-1)*nx_])*((*z_param)[j+(i+1)*nx_]-(*z_param)[j+i*nx_])*(*v_param)[j+(i+1)*nx_] + +cy1*(two*(*v_param)[j+i*nx_]-(*v_param)[j+(i+1)*nx_]-(*v_param)[j+(i-1)*nx_]); + h[j+(i+1)*nx_] += cy2*std::pow((*z_param)[j+(i+1)*nx_]-(*z_param)[j+i*nx_],two)*(*v_param)[j+(i+1)*nx_] + -cy2*((*z_param)[j+(i+1)*nx_]-(*z_param)[j+i*nx_])*((*z_param)[j+i*nx_]-(*z_param)[j+(i-1)*nx_])*(*v_param)[j+(i-1)*nx_] + +cy2*((*z_param)[j+(i+1)*nx_]-(*z_param)[j+i*nx_])*(two*(*z_param)[j+i*nx_]-(*z_param)[j+(i+1)*nx_]-(*z_param)[j+(i-1)*nx_])*(*v_param)[j+i*nx_] + +cy1*((*v_param)[j+(i+1)*nx_]-(*v_param)[j+i*nx_]); + } + else if (i == ny_-1) { + Real cy1 = (half*vol_/voly2)/std::sqrt(half*(Dy[i][j]+Dy[i+1][j])+eps_); + Real cy2 = (half*vol_/voly2)*(two/voly2)*(-half*half/std::pow(std::sqrt(half*(Dy[i][j]+Dy[i+1][j])+eps_),three)); + h[j+(i-1)*nx_] += cy2*std::pow((*z_param)[j+i*nx_]-(*z_param)[j+(i-1)*nx_],two)*(*v_param)[j+(i-1)*nx_] + -cy2*((*z_param)[j+i*nx_]-(*z_param)[j+(i-1)*nx_])*(two*(*z_param)[j+i*nx_]-(*z_param)[j+(i-1)*nx_])*(*v_param)[j+i*nx_] + -cy1*((*v_param)[j+i*nx_]-(*v_param)[j+(i-1)*nx_]); + h[j+i*nx_] += cy2*std::pow(two*(*z_param)[j+i*nx_]-(*z_param)[j+(i-1)*nx_],two)*(*v_param)[j+i*nx_] + -cy2*(two*(*z_param)[j+i*nx_]-(*z_param)[j+(i-1)*nx_])*((*z_param)[j+i*nx_]-(*z_param)[j+(i-1)*nx_])*(*v_param)[j+(i-1)*nx_] + +cy1*(two*(*v_param)[j+i*nx_]-(*v_param)[j+(i-1)*nx_]); + } + else if (i==ny_) { Real cy1 = (vol_*half/voly2)/std::sqrt(half*Dy[i][j]+eps_); Real cy2 = (vol_*half/voly2)*(two/voly2)*(-half*half/std::pow(std::sqrt(half*Dy[i][j]+eps_),three)); - h[j+(i-1)*n_] += (cy1+cy2*std::pow((*z_param)[j+(i-1)*n_],two))*(*v_param)[j+(i-1)*n_]; + h[j+(i-1)*nx_] += (cy1+cy2*std::pow((*z_param)[j+(i-1)*nx_],two))*(*v_param)[j+(i-1)*nx_]; } } } @@ -1298,19 +1375,19 @@ class QoI_IntegralityControl_Cost_adv_diff : public QoI { private: const ROL::Ptr> fe_; Real volx_,voly_, vol_; - int n_; + int nx_, ny_; public: QoI_IntegralityControl_Cost_adv_diff(const ROL::Ptr> &fe, ROL::ParameterList & parlist) : fe_(fe) { - int order = parlist.sublist("Problem").get("Hilbert Curve Order", 2); Real XL = parlist.sublist("Geometry").get("X0", 0.0); Real YL = parlist.sublist("Geometry").get("Y0", 0.0); Real XU = XL + parlist.sublist("Geometry").get("Width", 1.0); Real YU = YL + parlist.sublist("Geometry").get("Height", 1.0); - n_ = std::pow(2,order); - volx_ = (XU-XL)/static_cast(n_); - voly_ = (YU-YL)/static_cast(n_); + nx_ = parlist.sublist("Problem").get("Number of X-Cells", 4); + ny_ = parlist.sublist("Problem").get("Number of Y-Cells", 2); + volx_ = (XU-XL)/static_cast(nx_); + voly_ = (YU-YL)/static_cast(ny_); vol_ = volx_*voly_; } @@ -1341,9 +1418,9 @@ class QoI_IntegralityControl_Cost_adv_diff : public QoI { else { const Real one(1); Real sum(0); - for (int i = 0; i < n_; ++i) { - for (int j = 0; j < n_; ++j) { - sum += (*z_param)[i+j*n_]*(one-(*z_param)[i+j*n_]); + for (int i = 0; i < nx_; ++i) { + for (int j = 0; j < ny_; ++j) { + sum += (*z_param)[i+j*nx_]*(one-(*z_param)[i+j*nx_]); } } val = ROL::nullPtr; @@ -1400,9 +1477,9 @@ class QoI_IntegralityControl_Cost_adv_diff : public QoI { const int size = z_param->size(); std::vector g(size,static_cast(0)); const Real one(1), two(2); - for (int i = 0; i < n_; ++i) { - for (int j = 0; j < n_; ++j) { - g[i+j*n_] = vol_*(one - two*(*z_param)[i+j*n_]); + for (int i = 0; i < nx_; ++i) { + for (int j = 0; j < ny_; ++j) { + g[i+j*nx_] = vol_*(one - two*(*z_param)[i+j*nx_]); } } return g; @@ -1505,9 +1582,9 @@ class QoI_IntegralityControl_Cost_adv_diff : public QoI { const int size = z_param->size(); std::vector h(size,static_cast(0)); const Real two(2); - for (int i = 0; i < n_+1; ++i) { - for (int j = 0; j < n_; ++j) { - h[i+j*n_] = -vol_*two*(*v_param)[i+j*n_]; + for (int i = 0; i < nx_; ++i) { + for (int j = 0; j < ny_; ++j) { + h[i+j*nx_] = -vol_*two*(*v_param)[i+j*nx_]; } } return h; diff --git a/packages/rol/example/PDE-OPT/binary/adv-diff-TEST/run.sh b/packages/rol/example/PDE-OPT/binary/adv-diff-TEST/run.sh new file mode 100755 index 000000000000..0d9dba7a28a5 --- /dev/null +++ b/packages/rol/example/PDE-OPT/binary/adv-diff-TEST/run.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +size="$1x$2" +file="output_$1x$2.txt" + +sed -i '11s/.*/ /' input_ex01.xml +sed -i '12s/.*/ /' input_ex01.xml + +./ROL_example_PDE-OPT_binary_adv-diff-TEST_RelaxedBinary.exe --maxWallMinutes=600 --relTolerance=1e-6 $size |tee $file + +plot="${3:-1000}" +if [ $plot -eq "1" ] +then + matlab -nodisplay -r "plotPEBBL($1,$2); quit"; stty sane + epstopdf 'control_'$1'x'$2'.eps' + xdg-open 'control_'$1'x'$2'.pdf' & +fi diff --git a/packages/rol/example/PDE-OPT/binary/adv-diff-TEST/sensor.txt b/packages/rol/example/PDE-OPT/binary/adv-diff-TEST/sensor.txt index 981fa83658f3..6b3fa059d2f4 100644 --- a/packages/rol/example/PDE-OPT/binary/adv-diff-TEST/sensor.txt +++ b/packages/rol/example/PDE-OPT/binary/adv-diff-TEST/sensor.txt @@ -1,200 +1,200 @@ - 1.8699947022029133e+00 7.0518748952070021e-01 1.4808365994723680e-01 - 1.9597011176522510e+00 2.9544040106307046e-01 2.1478663829603950e-01 - 2.9951655360280416e-01 2.1262830422469059e-01 3.0927699366004689e-13 - 7.9323883172413812e-01 4.0268367313111431e-01 4.5046988026866612e-07 - 5.3219556838332949e-01 6.9781829198624723e-01 1.8263355520512689e-05 - 8.8961851620615651e-02 3.6202520212759537e-01 2.5253898327301547e-02 - 1.8681776440490663e+00 9.6613913038467114e-01 5.6495038359399265e-02 - 1.5427282363307948e+00 5.7679641113784874e-01 1.4600920991027616e-01 - 3.3279852793988329e-01 4.6967887949011278e-01 5.6697310397131405e-02 - 1.7004476067493219e+00 1.8542925345118122e-01 2.3799974287496781e-01 - 1.2682402887140682e+00 9.9228598569950477e-01 6.5367226099913106e-02 - 1.0053492387246488e-01 4.8030948394216022e-01 1.3175760923889349e-01 - 8.8552011381114371e-01 8.0027179894102707e-01 1.2442922713814103e-01 - 1.4762948795075750e+00 8.1164419509306041e-01 2.8081680283948949e-02 - 5.0845838995369830e-01 1.6391418535248969e-01 3.0442456981755711e-02 - 5.9302732279570769e-01 8.0626300302478815e-01 4.1753460654524229e-03 - 5.3703424619207629e-01 3.2057047680817186e-01 3.9140973669087857e-02 - 1.8157872232653700e+00 3.4020729596788635e-01 1.3080620799351761e-01 - 8.4470007432268179e-02 7.9755870432577014e-01 1.8900602820300437e-05 - 1.9101890408563271e-01 5.2715864757573239e-01 3.2306966277468339e-02 - 3.9644617329741028e-01 2.1163699624998733e-01 2.1010042781806890e-01 - 9.1924380847189457e-01 7.1128352445928633e-01 2.3232648033550243e-01 - 1.9012962608838100e+00 7.8741571659655984e-01 1.0546103420630777e-01 - 1.0257701988341843e+00 8.4434373808057295e-01 2.0417251300171158e-01 - 1.7365152686914263e+00 8.1695912078724175e-01 2.1924956153474992e-01 - 1.3083495992009215e+00 8.5071687918826555e-01 9.5196733342803444e-02 - 9.1302649328691965e-01 3.7273064129010103e-01 1.7125060493123277e-06 - 1.7646741149581087e+00 8.5095695411060479e-01 1.2545254841687950e-01 - 1.8172913288489787e+00 4.0193147398262608e-01 3.2448993205690373e-03 - 1.1579126568231981e+00 3.3477495637362420e-01 2.3055546532813606e-01 - 2.7777735065405507e-01 2.2108055310806396e-01 2.3913971716366830e-01 - 1.1461353598318968e-01 3.8553814383973850e-01 2.2147483143639905e-03 - 6.4983846052780514e-02 7.3138806391483113e-01 1.2564558418593053e-01 - 6.0366169719707763e-01 1.6655688608414798e-01 2.2593460301682139e-01 - 1.0690810542712614e+00 1.1201224291765066e-01 2.6537252841553466e-01 - 6.8846747350560600e-01 6.3586987155377961e-01 5.1471585717399851e-07 - 5.2298565890609527e-01 5.4024030026867442e-01 3.9425890335219337e-04 - 1.0247390383543120e-01 1.0100978611616851e-02 2.5049485545996293e-11 - 2.5957949473627284e-02 1.1741154433528678e-01 2.0974159097778897e-01 - 2.2818728694386392e-01 1.2910044836878343e-01 7.9826075004568469e-08 - 1.1328949143162514e-02 8.1384810987350109e-01 2.1179072036324764e-01 - 1.3773898327410428e+00 9.8247542157506951e-01 1.3918822729873520e-01 - 2.4933341221913929e-01 2.5510385175976635e-01 1.2042798062491644e-01 - 1.6311942997701045e+00 7.7869745415437497e-01 8.8941272339960659e-02 - 1.5891363563534173e+00 8.1153672054532944e-01 1.4703525775412174e-01 - 9.4068590741203151e-01 1.1945249521030377e-02 1.8222980635076286e-01 - 5.7155350341408617e-01 3.7883205982537249e-01 2.4518606409165193e-02 - 1.4443106993150550e+00 4.8477405450491173e-01 1.3622432648679797e-01 - 1.2096255644949760e-02 7.0982120398716253e-01 1.1991421374495136e-01 - 1.8675388949594343e+00 3.1040545863156721e-01 1.0372833967816525e-01 - 1.6537202910307975e+00 8.4992570758836283e-01 6.3197328333198952e-02 - 6.5012824400860847e-01 4.4341806179896337e-01 1.8678919994857890e-01 - 9.4824084305917911e-01 7.1086355052024430e-02 8.1795277135768951e-02 - 1.8485249148318288e+00 2.9475205000609539e-01 6.4081596918120598e-02 - 4.6476297082573392e-01 1.6954479341593487e-01 3.0948984847081999e-09 - 9.1540123047038469e-01 6.8887080067368411e-01 3.3828425034100398e-02 - 4.4330380955188575e-01 2.0616364731381731e-01 1.3917874964773413e-01 - 1.6173807015945467e+00 9.6176181418635931e-01 1.8499805725618401e-01 - 4.1006432125293424e-01 8.0877084399746457e-01 2.3638690349521782e-01 - 1.5636762400247628e+00 2.0075952772422911e-01 5.5825379245393970e-02 - 1.3848622256064562e+00 2.8776084640795863e-01 1.8705404598266967e-01 - 8.8787253880755657e-01 2.4188377135003547e-01 3.1076540564497507e-05 - 9.2825647396228872e-01 8.3573713599690236e-01 4.2685678638823841e-03 - 1.9807968357052688e+00 2.2027413160108966e-01 7.2476842024774523e-06 - 8.6389936609154327e-01 8.8995592869264084e-01 7.9304466544803692e-02 - 9.5922656823424735e-01 1.6904197377199481e-01 1.0280988686872000e-01 - 1.2419538042821392e+00 1.4670958138500279e-01 2.9335068960182942e-01 - 5.8528400306603068e-01 1.7112690467579483e-01 2.8489950881423899e-02 - 1.9161017970158998e+00 3.5776516512544099e-01 1.6296896618929968e-01 - 3.0878509053035241e-01 2.2263046704647338e-01 1.3224354846484471e-01 - 1.6573945766720937e+00 9.2300201451934960e-01 2.0302587343577022e-01 - 1.0017906278907440e+00 3.5261318667684538e-01 1.5599616045248989e-02 - 7.5219940742013636e-01 8.5527618257674209e-01 1.2584446739599814e-01 - 1.5272243194891821e-01 8.7901118722193039e-01 4.9158063445236759e-02 - 1.9819847599311675e+00 6.2065705302479124e-01 1.3399056943863877e-01 - 6.2284668998055270e-01 9.4200985130684090e-01 6.0312984204849744e-08 - 4.4328107726472377e-01 6.3534068357780993e-01 2.6009961454298475e-01 - 7.3063161661737563e-01 4.0267950444131251e-01 1.8360312065430873e-01 - 9.4474798153574646e-01 9.3760551024620109e-01 5.4677436567416915e-02 - 3.6369845556709635e-02 3.5754452083803789e-01 4.6668152409036143e-02 - 3.4072496332267610e-01 3.2710807440595957e-02 1.3004240105269377e-01 - 1.2728152403015156e+00 4.3824003882657303e-01 1.6546173079680548e-01 - 1.5081075314523984e-01 7.7619144441982790e-01 8.8133027831816729e-02 - 4.3287571415556547e-01 6.2496714508537266e-01 1.5192661306182259e-01 - 2.0907970005115839e-01 3.9611661168201651e-01 9.0440763029601676e-02 - 4.3872538142657413e-01 7.2163334016232628e-01 8.8080455015825397e-13 - 9.1619166607090774e-01 6.8988767295790887e-01 1.6746544940379429e-02 - 1.1338174112148103e+00 5.9510081495373135e-01 2.2433602352430679e-01 - 7.5693698417599098e-02 2.5049939626726170e-01 4.4389309816038877e-02 - 9.9576436325549356e-01 6.0198750893988695e-01 8.9717824267917246e-02 - 5.0304101484164487e-01 8.6880423936508877e-01 1.8659164930210109e-01 - 1.5028192317036910e+00 2.9413979208928054e-01 1.8640599997936957e-01 - 8.4003550941801253e-01 1.1428696048447651e-01 1.5927249106448560e-01 - 7.0743392355425927e-01 3.5195375579401911e-01 1.3059685046789629e-01 - 4.0960663727903857e-01 7.0253422695956269e-01 2.0174088196445999e-01 - 1.7821996144850960e+00 7.2509627722623482e-01 2.6665018048371414e-01 - 4.4147389495760558e-01 7.3333132046310290e-01 6.7504223420105550e-02 - 1.9059026268094841e+00 3.8470477415845927e-01 3.4695236688202756e-02 - 9.9863845988180255e-01 2.0168069307385306e-01 3.7987671950462779e-02 - 1.1162098274018466e+00 2.2991190706137821e-01 1.6128551465856358e-01 - 1.8161812935938184e+00 9.9862098301404223e-01 1.1197316660881108e-01 - 1.2296779358329961e+00 9.3564108537202961e-01 1.3217022142260007e-01 - 2.8368430327716521e-02 5.9169318206165933e-01 5.1979913052978721e-02 - 3.9891901825104181e-01 5.2458511553807696e-01 1.0873340556959539e-01 - 1.4595303452578974e+00 1.0455557763615064e-01 9.9687131323939651e-02 - 9.7724919328097082e-01 5.0125355060811971e-01 1.6947914582763307e-01 - 5.6368307669550255e-02 5.2771859708090840e-02 1.6141837312891835e-01 - 1.7309635191767381e+00 3.3631532139918785e-01 1.9558690222466996e-01 - 9.6824201140376154e-01 6.9092044310573608e-01 4.5071833579417492e-02 - 2.3660446114957656e-01 7.4320493004805677e-01 4.5336419475955005e-06 - 1.5011675340166710e+00 4.4409246484181319e-01 5.6942660656808279e-03 - 2.4081679209497775e-01 2.6730878016622706e-01 2.8998421477805647e-01 - 9.8000889032101535e-01 1.0696204923644093e-02 3.9515611044104143e-02 - 1.7589223140313672e+00 6.1500057181016432e-01 1.3955006831638911e-01 - 8.8768261978974028e-02 1.4124143019289326e-02 2.9498109314208534e-03 - 1.6545882192764565e+00 4.6398583330109266e-02 1.0541575781976009e-03 - 4.6613298211439247e-01 9.0229674601980014e-01 6.2086192414740976e-02 - 5.2078234472284013e-01 7.6754022815625089e-01 1.9733772031894495e-01 - 1.3505698298920308e+00 4.7545186075832957e-01 2.4268809082297550e-02 - 5.9242886164973152e-01 9.1340798619054664e-01 4.6102893601297662e-10 - 8.1179299922201498e-01 8.2382325831808312e-01 7.0511543281626780e-03 - 1.9677716265594745e+00 8.7984627541701665e-01 1.4069765812712144e-02 - 1.3707568079053956e+00 7.6765556631270360e-01 1.4627302615088340e-02 - 1.4690509698073249e+00 7.5777475940670458e-01 1.4733650688338698e-01 - 1.9345988911438976e+00 8.0911939968575219e-01 3.0769488917894556e-09 - 1.1605560705272437e+00 1.9604376124227052e-02 3.1220693856061271e-02 - 1.1258760871818745e+00 5.4973886796629801e-01 1.0744673784644132e-04 - 4.7449561503547155e-01 2.8377281670019250e-01 1.5536706419055391e-01 - 7.7589621605490544e-01 3.8481195474593299e-01 7.7240917231571268e-02 - 1.6080070115699931e+00 9.6979852973923264e-01 5.8684532447610190e-02 - 1.2726537870923371e-01 3.8608877902760264e-01 7.3815932411931322e-08 - 1.4456573993439834e+00 6.0643283553752836e-01 2.3683049005174325e-01 - 4.5381018848589294e-01 1.8329680635135581e-01 6.2853339584185750e-02 - 1.8789397083703050e+00 1.6139882070534517e-02 4.1191449022848790e-02 - 8.5405325399628174e-01 2.5761622016196761e-01 1.5658654106881545e-01 - 1.9848372291826082e+00 3.1577651686974639e-01 1.3714250473273271e-01 - 3.1047490253461785e-01 1.2198388711592800e-01 7.5731046445533759e-02 - 1.9468028551750938e+00 7.6947438680525670e-01 9.5544890137065919e-06 - 1.9990350187352441e+00 4.1222687517187118e-01 6.1770112500036230e-06 - 6.9185577882385907e-01 6.3355592524365978e-01 9.3356952305016658e-02 - 9.9397177413326965e-01 2.7635276577671930e-01 2.3457173973489859e-01 - 1.4229493252379375e+00 8.9414774714207090e-01 2.2565594603323719e-02 - 2.2321865813740116e-01 2.1968031609696803e-01 1.9683757529109228e-01 - 1.4184846084586638e+00 8.2810550661702753e-01 2.3145471153709077e-01 - 1.3342277813809060e+00 4.0275768898436071e-01 1.8063267008216202e-01 - 1.2856671003544613e+00 4.1669543051716773e-01 1.8162079049439091e-04 - 1.3346380981581869e+00 7.8590463378373454e-01 1.1772552143260911e-01 - 9.6080177955139812e-01 5.4806854933696125e-01 1.6206065754414259e-01 - 4.9333191285859446e-01 5.6929267797236904e-01 1.0309613017445839e-01 - 1.2601811919493064e+00 8.1106867322107679e-01 9.6475236266675189e-09 - 3.7029472975534050e-01 7.7000490340018035e-01 1.1903417534678483e-02 - 9.9886846119542128e-02 3.7538557261787431e-01 7.4429863370672311e-02 - 6.1465905831172218e-01 5.5781437942306367e-01 9.6592777175217345e-02 - 8.0301702441177181e-02 5.2176905502685611e-01 1.5418578516401124e-01 - 1.8022245650892943e-01 2.6507321971575215e-01 1.7884939156981913e-01 - 1.2966624774044027e+00 6.6743237492288432e-01 1.8079033793760263e-01 - 3.5711274483936473e-01 7.8172556301027307e-01 2.7559343251275588e-03 - 9.9674229482395837e-01 2.9773177602835577e-01 5.0981943487143973e-02 - 1.6788505863762491e+00 8.9160443784965482e-01 8.0216824717498561e-08 - 6.1386364124173998e-01 7.5518925970881967e-01 1.5403897306877373e-01 - 1.0903539645134739e+00 2.8918286752766686e-01 1.2616137655293150e-01 - 3.0472363792750468e-01 7.1281185592769880e-01 3.7826845103266976e-02 - 1.5152364014123880e+00 3.6739338604838223e-01 8.8274034783105249e-02 - 1.8098962964806087e+00 8.8781295951515604e-01 6.7514968894555161e-02 - 4.7528978622437945e-01 7.6180162769142346e-01 2.0565384806586304e-01 - 1.6512588511438269e+00 2.2012657608594699e-01 2.2343384709962122e-01 - 2.1109570450034987e-01 2.4239354070783969e-01 8.6773011275184553e-02 - 1.4133282458066594e+00 2.1989844502260425e-01 1.1130555170259937e-01 - 1.9156347179668121e+00 2.5478370625646729e-03 1.1301754737845107e-01 - 1.3747029312994568e+00 2.7076813743420414e-01 1.1335903720115306e-01 - 1.3907642475907673e+00 3.4175302722589063e-02 6.7123490645289469e-02 - 1.0889560485974830e+00 5.4343684697354444e-01 1.5984833001072335e-01 - 5.8376876747965589e-01 4.0237147027474296e-01 2.2188749344208147e-01 - 1.6814237299021371e+00 8.5260486851799278e-01 1.2469136556304798e-01 - 1.8166248738504942e-01 3.2634093208478032e-01 1.5898099950357136e-01 - 3.4111683747096100e-01 2.7423396370135578e-02 1.4531004235676817e-01 - 1.4497341938739727e+00 6.2312209202144109e-01 1.7967696416642231e-01 - 1.7748038599742566e+00 4.6114084583804082e-01 1.1051988636644805e-01 - 6.7244997973211706e-02 2.8339737852175051e-01 1.9202737275473969e-01 - 1.3633451698298238e-01 7.2891813506192293e-01 1.1988242731504891e-02 - 1.0887830935376694e+00 6.1208799335337627e-01 1.9402191731329815e-01 - 4.2614004391739391e-01 6.9217893005791464e-01 3.3148563477458134e-02 - 5.0015799118633897e-01 5.8610228551073984e-01 7.0429152060303452e-02 - 1.7520560337531759e+00 9.6274392602433334e-01 2.1636996383209567e-01 - 3.6508173499805308e-01 2.3960965171549509e-01 7.5188458703521629e-06 - 3.1897500363701514e-01 8.8493587946146568e-01 2.6405907678278184e-01 - 4.9173847918026059e-01 5.8137003281136934e-01 1.2835147825313131e-01 - 2.3620048165381125e-01 6.9891828947486667e-01 2.3253235177288067e-03 - 9.4623051775602285e-01 8.4225030838636505e-01 1.0896617826228241e-01 - 5.3847797148799659e-01 1.5219475853955289e-01 1.8388309737841839e-07 - 1.2252382939477320e+00 5.1177573221287931e-01 2.7157237451449889e-02 - 3.5304215446824072e-01 3.8021746006663593e-01 1.4901880070990257e-11 - 2.4617475635703734e-01 5.6762728085804071e-03 8.8790430364610914e-02 - 2.3138350384246253e-01 5.8723025964673714e-01 1.1262536877296091e-06 - 3.2443216441029499e-01 2.3643528153863569e-01 4.7526388847688991e-02 - 4.0813198984759680e-01 9.3886066613647290e-01 1.3196046759922813e-02 - 1.6024747466128377e+00 3.8233006445451090e-01 2.2607016057261584e-01 - 1.3499374980818946e+00 9.5548399687370345e-01 9.8448198274742646e-02 - 6.4440232870185365e-01 6.7002632609456025e-01 2.2537068391668294e-01 - 1.2286748307483979e+00 1.6908491450408070e-01 1.1684119095577708e-01 + 1.8699947022029133e+00 7.0518748952070021e-01 1.3293833504446706e-01 + 1.9597011176522510e+00 2.9544040106307046e-01 1.8043726692227252e-01 + 2.9951655360280416e-01 2.1262830422469059e-01 4.6192569038947338e-03 + 7.9323883172413812e-01 4.0268367313111431e-01 2.4937402871832717e-01 + 5.3219556838332949e-01 6.9781829198624723e-01 7.2614484731745088e-02 + 8.8961851620615651e-02 3.6202520212759537e-01 7.5488753743030565e-04 + 1.8681776440490663e+00 9.6613913038467114e-01 5.2929673071257149e-02 + 1.5427282363307948e+00 5.7679641113784874e-01 1.7682052798364051e-01 + 3.3279852793988329e-01 4.6967887949011278e-01 2.3906750075637367e-01 + 1.7004476067493219e+00 1.8542925345118122e-01 1.2595631971136462e-01 + 1.2682402887140682e+00 9.9228598569950477e-01 2.3575737168440421e-02 + 1.0053492387246488e-01 4.8030948394216022e-01 2.5924197762273216e-02 + 8.8552011381114371e-01 8.0027179894102707e-01 1.3948815975971651e-01 + 1.4762948795075750e+00 8.1164419509306041e-01 9.6924786822355474e-02 + 5.0845838995369830e-01 1.6391418535248969e-01 3.2868198301735145e-02 + 5.9302732279570769e-01 8.0626300302478815e-01 1.2683099886395228e-02 + 5.3703424619207629e-01 3.2057047680817186e-01 2.9794904295490310e-01 + 1.8157872232653700e+00 3.4020729596788635e-01 1.9976000074759723e-01 + 8.4470007432268179e-02 7.9755870432577014e-01 2.7642932166213367e-07 + 1.9101890408563271e-01 5.2715864757573239e-01 1.1264120732599200e-01 + 3.9644617329741028e-01 2.1163699624998733e-01 3.4134522486051817e-02 + 9.1924380847189457e-01 7.1128352445928633e-01 1.2139870573842573e-01 + 1.9012962608838100e+00 7.8741571659655984e-01 1.0398167697075059e-01 + 1.0257701988341843e+00 8.4434373808057295e-01 9.3557241785044182e-02 + 1.7365152686914263e+00 8.1695912078724175e-01 9.3218034958572005e-02 + 1.3083495992009215e+00 8.5071687918826555e-01 8.0813023125343289e-02 + 9.1302649328691965e-01 3.7273064129010103e-01 2.5111404248781194e-01 + 1.7646741149581087e+00 8.5095695411060479e-01 8.0608254354802747e-02 + 1.8172913288489787e+00 4.0193147398262608e-01 2.0897574287964976e-01 + 1.1579126568231981e+00 3.3477495637362420e-01 2.3003926807560657e-01 + 2.7777735065405507e-01 2.2108055310806396e-01 4.3180388365101014e-03 + 1.1461353598318968e-01 3.8553814383973850e-01 1.6026893780801237e-02 + 6.4983846052780514e-02 7.3138806391483113e-01 1.7113983197101107e-06 + 6.0366169719707763e-01 1.6655688608414798e-01 6.2829200148135644e-02 + 1.0690810542712614e+00 1.1201224291765066e-01 5.7290712726429459e-02 + 6.8846747350560600e-01 6.3586987155377961e-01 1.3671474426738073e-01 + 5.2298565890609527e-01 5.4024030026867442e-01 2.1966326456360208e-01 + 1.0247390383543120e-01 1.0100978611616851e-02 7.8490030672028797e-11 + 2.5957949473627284e-02 1.1741154433528678e-01 6.5217109680565628e-11 + 2.2818728694386392e-01 1.2910044836878343e-01 1.2005265849783152e-05 + 1.1328949143162514e-02 8.1384810987350109e-01 3.2249364311367944e-10 + 1.3773898327410428e+00 9.8247542157506951e-01 3.0972594816917415e-02 + 2.4933341221913929e-01 2.5510385175976635e-01 1.0690424364755745e-02 + 1.6311942997701045e+00 7.7869745415437497e-01 1.0812779565576572e-01 + 1.5891363563534173e+00 8.1153672054532944e-01 9.5854778315030614e-02 + 9.4068590741203151e-01 1.1945249521030377e-02 1.2137638501995689e-02 + 5.7155350341408617e-01 3.7883205982537249e-01 2.5406641223470494e-01 + 1.4443106993150550e+00 4.8477405450491173e-01 2.0975138608949545e-01 + 1.2096255644949760e-02 7.0982120398716253e-01 3.5735827019226289e-08 + 1.8675388949594343e+00 3.1040545863156721e-01 1.8868706044551276e-01 + 1.6537202910307975e+00 8.4992570758836283e-01 8.0391648692067733e-02 + 6.5012824400860847e-01 4.4341806179896337e-01 2.3459730205852519e-01 + 9.4824084305917911e-01 7.1086355052024430e-02 2.6260872029069900e-02 + 1.8485249148318288e+00 2.9475205000609539e-01 1.8323735981454656e-01 + 4.6476297082573392e-01 1.6954479341593487e-01 2.3462188570088721e-02 + 9.1540123047038469e-01 6.8887080067368411e-01 1.1851347715758355e-01 + 4.4330380955188575e-01 2.0616364731381731e-01 6.7747675456097736e-02 + 1.6173807015945467e+00 9.6176181418635931e-01 4.4960839446352846e-02 + 4.1006432125293424e-01 8.0877084399746457e-01 4.2547257419110604e-03 + 1.5636762400247628e+00 2.0075952772422911e-01 1.3586124908468925e-01 + 1.3848622256064562e+00 2.8776084640795863e-01 1.9655451973735177e-01 + 8.8787253880755657e-01 2.4188377135003547e-01 1.8723425654024145e-01 + 9.2825647396228872e-01 8.3573713599690236e-01 1.1231093886548167e-01 + 1.9807968357052688e+00 2.2027413160108966e-01 1.4522753523795628e-01 + 8.6389936609154327e-01 8.8995592869264084e-01 2.1791416826919523e-02 + 9.5922656823424735e-01 1.6904197377199481e-01 1.0172595881514340e-01 + 1.2419538042821392e+00 1.4670958138500279e-01 9.1372836962666959e-02 + 5.8528400306603068e-01 1.7112690467579483e-01 6.5409182128712898e-02 + 1.9161017970158998e+00 3.5776516512544099e-01 2.0027376788516349e-01 + 3.0878509053035241e-01 2.2263046704647338e-01 8.1316949002115269e-03 + 1.6573945766720937e+00 9.2300201451934960e-01 5.4889598769222267e-02 + 1.0017906278907440e+00 3.5261318667684538e-01 2.4480570921017919e-01 + 7.5219940742013636e-01 8.5527618257674209e-01 8.4747160393240806e-03 + 1.5272243194891821e-01 8.7901118722193039e-01 2.0932776425953603e-07 + 1.9819847599311675e+00 6.2065705302479124e-01 1.6114062034334306e-01 + 6.2284668998055270e-01 9.4200985130684090e-01 4.9928571645934013e-04 + 4.4328107726472377e-01 6.3534068357780993e-01 1.4215601238597400e-01 + 7.3063161661737563e-01 4.0267950444131251e-01 2.4942906101042206e-01 + 9.4474798153574646e-01 9.3760551024620109e-01 1.1363343876510073e-02 + 3.6369845556709635e-02 3.5754452083803789e-01 5.7286307960663295e-06 + 3.4072496332267610e-01 3.2710807440595957e-02 4.4340425782439204e-06 + 1.2728152403015156e+00 4.3824003882657303e-01 2.2652302345233755e-01 + 1.5081075314523984e-01 7.7619144441982790e-01 4.1346455640103034e-05 + 4.3287571415556547e-01 6.2496714508537266e-01 1.5547400954481572e-01 + 2.0907970005115839e-01 3.9611661168201651e-01 1.1036075457854293e-01 + 4.3872538142657413e-01 7.2163334016232628e-01 4.3652017199389673e-02 + 9.1619166607090774e-01 6.8988767295790887e-01 1.1858052664086920e-01 + 1.1338174112148103e+00 5.9510081495373135e-01 1.6644328272172643e-01 + 7.5693698417599098e-02 2.5049939626726170e-01 1.7773804585113330e-06 + 9.9576436325549356e-01 6.0198750893988695e-01 1.6097039040940769e-01 + 5.0304101484164487e-01 8.6880423936508877e-01 1.5396669254236202e-03 + 1.5028192317036910e+00 2.9413979208928054e-01 1.9482012768310869e-01 + 8.4003550941801253e-01 1.1428696048447651e-01 4.2060265721258421e-02 + 7.0743392355425927e-01 3.5195375579401911e-01 2.6830835792582625e-01 + 4.0960663727903857e-01 7.0253422695956269e-01 5.8477758866523871e-02 + 1.7821996144850960e+00 7.2509627722623482e-01 1.2629457236274311e-01 + 4.4147389495760558e-01 7.3333132046310290e-01 3.4974961203780540e-02 + 1.9059026268094841e+00 3.8470477415845927e-01 2.0467847299463876e-01 + 9.9863845988180255e-01 2.0168069307385306e-01 1.3833903216372329e-01 + 1.1162098274018466e+00 2.2991190706137821e-01 1.6509229522710059e-01 + 1.8161812935938184e+00 9.9862098301404223e-01 4.9383302646067148e-02 + 1.2296779358329961e+00 9.3564108537202961e-01 3.4572150395034390e-02 + 2.8368430327716521e-02 5.9169318206165933e-01 1.0997120998699763e-05 + 3.9891901825104181e-01 5.2458511553807696e-01 2.3685146815361566e-01 + 1.4595303452578974e+00 1.0455557763615064e-01 7.1595741337531132e-02 + 9.7724919328097082e-01 5.0125355060811971e-01 2.1431914202384633e-01 + 5.6368307669550255e-02 5.2771859708090840e-02 2.8014904758840387e-11 + 1.7309635191767381e+00 3.3631532139918785e-01 2.0183886544467830e-01 + 9.6824201140376154e-01 6.9092044310573608e-01 1.2440238055309660e-01 + 2.3660446114957656e-01 7.4320493004805677e-01 4.9864455042833121e-03 + 1.5011675340166710e+00 4.4409246484181319e-01 2.1750138841033773e-01 + 2.4081679209497775e-01 2.6730878016622706e-01 1.5490398395214235e-02 + 9.8000889032101535e-01 1.0696204923644093e-02 1.4217985078513930e-02 + 1.7589223140313672e+00 6.1500057181016432e-01 1.6350534649040158e-01 + 8.8768261978974028e-02 1.4124143019289326e-02 3.9074350539984284e-11 + 1.6545882192764565e+00 4.6398583330109266e-02 5.7975270972908631e-02 + 4.6613298211439247e-01 9.0229674601980014e-01 3.5467625943748663e-04 + 5.2078234472284013e-01 7.6754022815625089e-01 2.2126392532129092e-02 + 1.3505698298920308e+00 4.7545186075832957e-01 2.1479736814632533e-01 + 5.9242886164973152e-01 9.1340798619054664e-01 8.7342960929308387e-04 + 8.1179299922201498e-01 8.2382325831808312e-01 5.7640082151192623e-02 + 1.9677716265594745e+00 8.7984627541701665e-01 7.3383641632082650e-02 + 1.3707568079053956e+00 7.6765556631270360e-01 1.1561779024573901e-01 + 1.4690509698073249e+00 7.5777475940670458e-01 1.1728362223576570e-01 + 1.9345988911438976e+00 8.0911939968575219e-01 9.6306810054338637e-02 + 1.1605560705272437e+00 1.9604376124227052e-02 2.5672901751112476e-02 + 1.1258760871818745e+00 5.4973886796629801e-01 1.8892290509118925e-01 + 4.7449561503547155e-01 2.8377281670019250e-01 2.2201188802232086e-01 + 7.7589621605490544e-01 3.8481195474593299e-01 2.5507910974975723e-01 + 1.6080070115699931e+00 9.6979852973923264e-01 4.3443427678622595e-02 + 1.2726537870923371e-01 3.8608877902760264e-01 2.8332109599823435e-02 + 1.4456573993439834e+00 6.0643283553752836e-01 1.6548393646137055e-01 + 4.5381018848589294e-01 1.8329680635135581e-01 3.4130217142549338e-02 + 1.8789397083703050e+00 1.6139882070534517e-02 6.3752866206650161e-02 + 8.5405325399628174e-01 2.5761622016196761e-01 2.0732513529417532e-01 + 1.9848372291826082e+00 3.1577651686974639e-01 1.8706081691418575e-01 + 3.1047490253461785e-01 1.2198388711592800e-01 1.1192202868806270e-04 + 1.9468028551750938e+00 7.6947438680525670e-01 1.1034653758637621e-01 + 1.9990350187352441e+00 4.1222687517187118e-01 2.0363353421487637e-01 + 6.9185577882385907e-01 6.3355592524365978e-01 1.3880328378143816e-01 + 9.9397177413326965e-01 2.7635276577671930e-01 2.1208750951427896e-01 + 1.4229493252379375e+00 8.9414774714207090e-01 5.9616875208461581e-02 + 2.2321865813740116e-01 2.1968031609696803e-01 9.5421299337325341e-04 + 1.4184846084586638e+00 8.2810550661702753e-01 9.0543022462956702e-02 + 1.3342277813809060e+00 4.0275768898436071e-01 2.2833514018281706e-01 + 1.2856671003544613e+00 4.1669543051716773e-01 2.2939168723836229e-01 + 1.3346380981581869e+00 7.8590463378373454e-01 1.1009218138837337e-01 + 9.6080177955139812e-01 5.4806854933696125e-01 1.9249728020431048e-01 + 4.9333191285859446e-01 5.6929267797236904e-01 2.0570296617163381e-01 + 1.2601811919493064e+00 8.1106867322107679e-01 1.0211640112354600e-01 + 3.7029472975534050e-01 7.7000490340018035e-01 9.9717221890585003e-03 + 9.9886846119542128e-02 3.7538557261787431e-01 3.2909293754858166e-03 + 6.1465905831172218e-01 5.5781437942306367e-01 2.0309773449527130e-01 + 8.0301702441177181e-02 5.2176905502685611e-01 6.7411187200501800e-03 + 1.8022245650892943e-01 2.6507321971575215e-01 1.9610766255229411e-03 + 1.2966624774044027e+00 6.6743237492288432e-01 1.4291765403929016e-01 + 3.5711274483936473e-01 7.8172556301027307e-01 6.1671866986118731e-03 + 9.9674229482395837e-01 2.9773177602835577e-01 2.2631730742393175e-01 + 1.6788505863762491e+00 8.9160443784965482e-01 6.5169473240549433e-02 + 6.1386364124173998e-01 7.5518925970881967e-01 3.4540695824433816e-02 + 1.0903539645134739e+00 2.8918286752766686e-01 2.1379585528419331e-01 + 3.0472363792750468e-01 7.1281185592769880e-01 3.3929283114588392e-02 + 1.5152364014123880e+00 3.6739338604838223e-01 2.1789007651074124e-01 + 1.8098962964806087e+00 8.8781295951515604e-01 6.8586512755549930e-02 + 4.7528978622437945e-01 7.6180162769142346e-01 2.1422054494745841e-02 + 1.6512588511438269e+00 2.2012657608594699e-01 1.4800498851218019e-01 + 2.1109570450034987e-01 2.4239354070783969e-01 1.9842267809166525e-03 + 1.4133282458066594e+00 2.1989844502260425e-01 1.5073569843625514e-01 + 1.9156347179668121e+00 2.5478370625646729e-03 6.4794510473910716e-02 + 1.3747029312994568e+00 2.7076813743420414e-01 1.8706957770107185e-01 + 1.3907642475907673e+00 3.4175302722589063e-02 4.1618669489985979e-02 + 1.0889560485974830e+00 5.4343684697354444e-01 1.9246723376125008e-01 + 5.8376876747965589e-01 4.0237147027474296e-01 2.4180942929260665e-01 + 1.6814237299021371e+00 8.5260486851799278e-01 7.9484196381435973e-02 + 1.8166248738504942e-01 3.2634093208478032e-01 3.9546193682731247e-02 + 3.4111683747096100e-01 2.7423396370135578e-02 3.5992953819440289e-06 + 1.4497341938739727e+00 6.2312209202144109e-01 1.5947986234822240e-01 + 1.7748038599742566e+00 4.6114084583804082e-01 2.0666271905111369e-01 + 6.7244997973211706e-02 2.8339737852175051e-01 4.3462563591946600e-06 + 1.3633451698298238e-01 7.2891813506192293e-01 2.3418732996297254e-04 + 1.0887830935376694e+00 6.1208799335337627e-01 1.5740120554310855e-01 + 4.2614004391739391e-01 6.9217893005791464e-01 7.1148300094780362e-02 + 5.0015799118633897e-01 5.8610228551073984e-01 1.9176804096868885e-01 + 1.7520560337531759e+00 9.6274392602433334e-01 4.9641983702877313e-02 + 3.6508173499805308e-01 2.3960965171549509e-01 4.5501370520487319e-02 + 3.1897500363701514e-01 8.8493587946146568e-01 5.8099845063007425e-05 + 4.9173847918026059e-01 5.8137003281136934e-01 1.9650510272695257e-01 + 2.3620048165381125e-01 6.9891828947486667e-01 3.2164046306594203e-02 + 9.4623051775602285e-01 8.4225030838636505e-01 1.0261478660692805e-01 + 5.3847797148799659e-01 1.5219475853955289e-01 2.9518804677912680e-02 + 1.2252382939477320e+00 5.1177573221287931e-01 2.0467330502898470e-01 + 3.5304215446824072e-01 3.8021746006663593e-01 2.0876912684628757e-01 + 2.4617475635703734e-01 5.6762728085804071e-03 7.6275254967958052e-08 + 2.3138350384246253e-01 5.8723025964673714e-01 1.3751659850946946e-01 + 3.2443216441029499e-01 2.3643528153863569e-01 1.7662171233508443e-02 + 4.0813198984759680e-01 9.3886066613647290e-01 3.7533420751362091e-05 + 1.6024747466128377e+00 3.8233006445451090e-01 2.1590803425738631e-01 + 1.3499374980818946e+00 9.5548399687370345e-01 3.4311565685376855e-02 + 6.4440232870185365e-01 6.7002632609456025e-01 1.0395704158262002e-01 + 1.2286748307483979e+00 1.6908491450408070e-01 1.0936347984379262e-01 diff --git a/packages/rol/example/PDE-OPT/binary/adv-diff-TEST/transform.hpp b/packages/rol/example/PDE-OPT/binary/adv-diff-TEST/transform.hpp index f2fe99487347..acfbe5a6d979 100644 --- a/packages/rol/example/PDE-OPT/binary/adv-diff-TEST/transform.hpp +++ b/packages/rol/example/PDE-OPT/binary/adv-diff-TEST/transform.hpp @@ -51,7 +51,12 @@ template class PDEOPT_Transform_PEBBL : public ROL::StdTransform_PEBBL { private: ROL::Ptr> getParameter(ROL::Vector &x) const { - return dynamic_cast&>(x).getParameter(); + try { + return ROL::makePtrFromRef(dynamic_cast&>(x)); + } + catch (std::exception &e) { + return dynamic_cast&>(x).getParameter(); + } } public: diff --git a/packages/rol/example/PDE-OPT/published/CMakeLists.txt b/packages/rol/example/PDE-OPT/published/CMakeLists.txt index 4476790726cc..2ab53424d422 100644 --- a/packages/rol/example/PDE-OPT/published/CMakeLists.txt +++ b/packages/rol/example/PDE-OPT/published/CMakeLists.txt @@ -1 +1,2 @@ ADD_SUBDIRECTORY(IMAvolumes_KouriRidzal2017) +ADD_SUBDIRECTORY(Helmholtz_KouriRidzalTuminaro2020) diff --git a/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzal2019/sample_script.m b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzal2019/sample_script.m deleted file mode 100644 index efd297fde897..000000000000 --- a/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzal2019/sample_script.m +++ /dev/null @@ -1,81 +0,0 @@ - -Adata = importdata('Amatrix.txt',' ',2); Adata = Adata.data; -Bdata = importdata('Bmatrix.txt',' ',2); Bdata = Bdata.data; -Ldata = importdata('Lmatrix.txt',' ',2); Ldata = Ldata.data; -Cdata = importdata('Cmatrix.txt',' ',2); Cdata = Cdata.data; -Rdata = importdata('Rmatrix.txt',' ',2); Rdata = Rdata.data; -Mdata = importdata('Mmatrix.txt',' ',2); Mdata = Mdata.data; - -wrvec = importdata('WRvector.txt',' ',2); wrvec = wrvec.data; -wivec = importdata('WIvector.txt',' ',2); wivec = wivec.data; - -Amat = sparse(Adata(:,1),Adata(:,2),Adata(:,3)); -Bmat = sparse(Bdata(:,1),Bdata(:,2),Bdata(:,3)); -Lmat = sparse(Ldata(:,1),Ldata(:,2),Ldata(:,3)); -Cmat = sparse(Cdata(:,1),Cdata(:,2),Cdata(:,3)); -Rmat = sparse(Rdata(:,1),Rdata(:,2),Rdata(:,3)); -Mmat = sparse(Mdata(:,1),Mdata(:,2),Mdata(:,3)); - -Kmat = Amat - sqrt(-1)*Bmat; - -beta = 1e-4; - -Zmat = 0*Kmat; -kkt = [ Cmat Zmat Kmat'; - Zmat beta*Rmat Lmat'; - Kmat Lmat Zmat ]; - -w0 = wrvec + sqrt(-1)*wivec; -zvec = 0*w0; -rhs = [ w0; - zvec; - zvec ]; - -sol = kkt \ rhs; - -adj = load('cell_to_node_quad.txt') + 1; %% load node adjacency, increment by 1 for 1-based indexing -nodes = load('nodes.txt'); %% load node coordinates -map = importdata('map.txt'); -map = map.data(1:2:end)+1; -[tmp, perm] = sort(map); -n = length(w0); -u = sol(1:n); -u = u(perm); -z = sol(n+1:2*n); -z = z(perm); - -figure, trisurf(adj, nodes(:,1), nodes(:,2), real(u)); -shading interp; -view(0,90) -axis('equal','tight'); -xlabel('x'); -ylabel('y'); -title('State: Real Part'); -axis square - -figure, trisurf(adj, nodes(:,1), nodes(:,2), imag(u)); -shading interp; -view(0,90) -axis('equal','tight'); -xlabel('x'); -ylabel('y'); -title('State: Imaginary Part'); -axis square - -figure, trisurf(adj, nodes(:,1), nodes(:,2), real(z)); -shading interp; -view(0,90) -axis('equal','tight'); -xlabel('x'); -ylabel('y'); -title('Control: Real Part'); -axis square - -figure, trisurf(adj, nodes(:,1), nodes(:,2), imag(z)); -shading interp; -view(0,90) -axis('equal','tight'); -xlabel('x'); -ylabel('y'); -title('Control: Imaginary Part'); -axis square diff --git a/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzal2019/CMakeLists.txt b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/CMakeLists.txt similarity index 64% rename from packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzal2019/CMakeLists.txt rename to packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/CMakeLists.txt index 03008c02a48f..71a29e6a20ac 100644 --- a/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzal2019/CMakeLists.txt +++ b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/CMakeLists.txt @@ -14,13 +14,25 @@ IF(${PROJECT_NAME}_ENABLE_Intrepid AND ADD_DIR_TO_NAME ) + FILE(GLOB INP_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} inputs/*.xml) + TRIBITS_COPY_FILES_TO_BINARY_DIR( - HelmholtzKouriRidzal2019DataCopy + HelmholtzKouriRidzalTuminaro2020DataCopy SOURCE_FILES input_ex01.xml - sample_script.m + README.md + study.m + run.m + prdw.m + imshift.m + mesh/README.md mesh/helmholtz-mesh-0.e + mesh/helmholtz-mesh-1.e + mesh/helmholtz-mesh-0.txt + mesh/helmholtz-mesh-1.txt mesh/helmholtz-mesh.jou + results/README.md + ${INP_FILES} SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}" DEST_DIR "${CMAKE_CURRENT_BINARY_DIR}" ) diff --git a/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/README.md b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/README.md new file mode 100644 index 000000000000..631a690ee734 --- /dev/null +++ b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/README.md @@ -0,0 +1,27 @@ +This subdirectory of the *ROL* package, i.e., + +/rol/example/PDE-OPT/published/Helmholtz_KouriRidzal2019 + +accompanies the paper + +D. P. Kouri, D. Ridzal, R. Tuminaro, "KKT Preconditioners for +PDE-Constrained Optimization with the Helmholtz Equation" + +To reproduce the numerical results, follow these steps: + +1. Build Trilinos, with the ROL package and all its dependencies + enabled. For help building Trilinos, consult the Trilinos + community or ROL developers. In the main Trilinos build + directory, you should see the subdirectory + + /packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzal2019 + +2. Obtain Matlab. The code has been tested with Matlab R2019a. + Start Matlab in command-line mode in the above subdirectory. + Run + >> study + +3. To change study parameters, edit the study.m file. The file + contains descriptions of all parameters, and references to + running the tests on finer meshes. + diff --git a/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzal2019/example_01.cpp b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/example_01.cpp similarity index 100% rename from packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzal2019/example_01.cpp rename to packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/example_01.cpp diff --git a/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/imshift.m b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/imshift.m new file mode 100644 index 000000000000..a70f05b99a56 --- /dev/null +++ b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/imshift.m @@ -0,0 +1,49 @@ +function [y] = imshift( x, usr_par) +% +% compute and/or apply a complex-shift KKT preconditioner +% + + global GLB_PROB; + + nu = GLB_PROB.nu; + nz = GLB_PROB.nz; + + beta = GLB_PROB.beta; + r = sqrt(-1)/sqrt(beta); + K = GLB_PROB.K; + M = GLB_PROB.M; + C = GLB_PROB.C; + R = GLB_PROB.R; + J = GLB_PROB.J; + A1 = K - r*M; + + A2 = ctranspose(A1); + + y = zeros(size(x)); + + if (GLB_PROB.reuse_factors) + if (~GLB_PROB.factors_computed) + fprintf(" Computing factors (to be reused) ...\n "); + tic + [GLB_PROB.LC, GLB_PROB.UC, GLB_PROB.PC, GLB_PROB.QC] = lu(C); + [GLB_PROB.LR, GLB_PROB.UR, GLB_PROB.PR, GLB_PROB.QR] = lu(R); + [GLB_PROB.LA1, GLB_PROB.UA1, GLB_PROB.PA1, GLB_PROB.QA1] = lu(A1); + %[GLB_PROB.LA2, GLB_PROB.UA2, GLB_PROB.PA2, GLB_PROB.QA2] = lu(A2); + toc + GLB_PROB.factors_computed = true; + end + y(1:nu) = GLB_PROB.QC * (GLB_PROB.UC \ (GLB_PROB.LC \ (GLB_PROB.PC * x(1:nu)))); + y(nu+1:nu+nz) = (1/beta) * ( GLB_PROB.QR * (GLB_PROB.UR \ (GLB_PROB.LR \ (GLB_PROB.PR * x(nu+1:nu+nz)))) ); + tmp = M * ( GLB_PROB.QA1 * (GLB_PROB.UA1 \ (GLB_PROB.LA1 \ (GLB_PROB.PA1 * x(nu+nz+1:end)))) ); + y(nu+nz+1:end) = GLB_PROB.PA1' * (GLB_PROB.LA1' \ (GLB_PROB.UA1' \ (GLB_PROB.QA1' * tmp))); + %y(nu+nz+1:end) = GLB_PROB.QA2 * (GLB_PROB.UA2 \ (GLB_PROB.LA2 \ (GLB_PROB.PA2 * tmp))); + else + y(1:nu) = C \ x(1:nu); + y(nu+1:nu+nz) = (1/beta) * (R \ x(nu+1:nu+nz)); + y(nu+nz+1:end) = A2 \ (M * (A1 \ x(nu+nz+1:end))); + end + + + GLB_PROB.ct = GLB_PROB.ct + 1; + +end % function imshift diff --git a/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzal2019/input_ex01.xml b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/input_ex01.xml similarity index 100% rename from packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzal2019/input_ex01.xml rename to packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/input_ex01.xml diff --git a/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh0_wave5_damp0_imp0.xml b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh0_wave5_damp0_imp0.xml new file mode 100644 index 000000000000..56f7e4d14336 --- /dev/null +++ b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh0_wave5_damp0_imp0.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh0_wave5_damp0_imp1.xml b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh0_wave5_damp0_imp1.xml new file mode 100644 index 000000000000..3e74d46acb52 --- /dev/null +++ b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh0_wave5_damp0_imp1.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh0_wave5_damp1_imp0.xml b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh0_wave5_damp1_imp0.xml new file mode 100644 index 000000000000..690b20bba682 --- /dev/null +++ b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh0_wave5_damp1_imp0.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh0_wave5_damp1_imp1.xml b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh0_wave5_damp1_imp1.xml new file mode 100644 index 000000000000..4ff11d5af510 --- /dev/null +++ b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh0_wave5_damp1_imp1.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh1_wave10_damp0_imp0.xml b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh1_wave10_damp0_imp0.xml new file mode 100644 index 000000000000..44e5ecd04ea5 --- /dev/null +++ b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh1_wave10_damp0_imp0.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh1_wave10_damp0_imp1.xml b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh1_wave10_damp0_imp1.xml new file mode 100644 index 000000000000..f2b061a4f603 --- /dev/null +++ b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh1_wave10_damp0_imp1.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh1_wave10_damp1_imp0.xml b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh1_wave10_damp1_imp0.xml new file mode 100644 index 000000000000..8d54bfca026e --- /dev/null +++ b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh1_wave10_damp1_imp0.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh1_wave10_damp1_imp1.xml b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh1_wave10_damp1_imp1.xml new file mode 100644 index 000000000000..95a4e106a160 --- /dev/null +++ b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh1_wave10_damp1_imp1.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh1_wave5_damp0_imp0.xml b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh1_wave5_damp0_imp0.xml new file mode 100644 index 000000000000..360dda0e156c --- /dev/null +++ b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh1_wave5_damp0_imp0.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh1_wave5_damp0_imp1.xml b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh1_wave5_damp0_imp1.xml new file mode 100644 index 000000000000..769b3ff78421 --- /dev/null +++ b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh1_wave5_damp0_imp1.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh1_wave5_damp1_imp0.xml b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh1_wave5_damp1_imp0.xml new file mode 100644 index 000000000000..5c82af274c4e --- /dev/null +++ b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh1_wave5_damp1_imp0.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh1_wave5_damp1_imp1.xml b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh1_wave5_damp1_imp1.xml new file mode 100644 index 000000000000..83f826dc0e0d --- /dev/null +++ b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh1_wave5_damp1_imp1.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh2_wave10_damp0_imp0.xml b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh2_wave10_damp0_imp0.xml new file mode 100644 index 000000000000..67197d84dfd4 --- /dev/null +++ b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh2_wave10_damp0_imp0.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh2_wave10_damp0_imp1.xml b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh2_wave10_damp0_imp1.xml new file mode 100644 index 000000000000..015e81674aa3 --- /dev/null +++ b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh2_wave10_damp0_imp1.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh2_wave10_damp1_imp0.xml b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh2_wave10_damp1_imp0.xml new file mode 100644 index 000000000000..25eb7e8d7cb3 --- /dev/null +++ b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh2_wave10_damp1_imp0.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh2_wave10_damp1_imp1.xml b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh2_wave10_damp1_imp1.xml new file mode 100644 index 000000000000..244f0e4a2d2c --- /dev/null +++ b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh2_wave10_damp1_imp1.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh2_wave20_damp0_imp0.xml b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh2_wave20_damp0_imp0.xml new file mode 100644 index 000000000000..3b79c7955dcf --- /dev/null +++ b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh2_wave20_damp0_imp0.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh2_wave20_damp0_imp1.xml b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh2_wave20_damp0_imp1.xml new file mode 100644 index 000000000000..d9db6a117cc7 --- /dev/null +++ b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh2_wave20_damp0_imp1.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh2_wave20_damp1_imp0.xml b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh2_wave20_damp1_imp0.xml new file mode 100644 index 000000000000..e68ed5fe8a65 --- /dev/null +++ b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh2_wave20_damp1_imp0.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh2_wave20_damp1_imp1.xml b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh2_wave20_damp1_imp1.xml new file mode 100644 index 000000000000..0957c801f948 --- /dev/null +++ b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh2_wave20_damp1_imp1.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh2_wave5_damp0_imp0.xml b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh2_wave5_damp0_imp0.xml new file mode 100644 index 000000000000..07d11f9fc5a2 --- /dev/null +++ b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh2_wave5_damp0_imp0.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh2_wave5_damp0_imp1.xml b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh2_wave5_damp0_imp1.xml new file mode 100644 index 000000000000..55d66d397ec8 --- /dev/null +++ b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh2_wave5_damp0_imp1.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh2_wave5_damp1_imp0.xml b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh2_wave5_damp1_imp0.xml new file mode 100644 index 000000000000..23b27b54d644 --- /dev/null +++ b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh2_wave5_damp1_imp0.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh2_wave5_damp1_imp1.xml b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh2_wave5_damp1_imp1.xml new file mode 100644 index 000000000000..47f3ab0d0ed8 --- /dev/null +++ b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh2_wave5_damp1_imp1.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh3_wave10_damp0_imp0.xml b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh3_wave10_damp0_imp0.xml new file mode 100644 index 000000000000..54c839cf09dc --- /dev/null +++ b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh3_wave10_damp0_imp0.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh3_wave10_damp0_imp1.xml b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh3_wave10_damp0_imp1.xml new file mode 100644 index 000000000000..62feb98e237f --- /dev/null +++ b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh3_wave10_damp0_imp1.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh3_wave10_damp1_imp0.xml b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh3_wave10_damp1_imp0.xml new file mode 100644 index 000000000000..178a819f0c2e --- /dev/null +++ b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh3_wave10_damp1_imp0.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh3_wave10_damp1_imp1.xml b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh3_wave10_damp1_imp1.xml new file mode 100644 index 000000000000..4a202665eb1d --- /dev/null +++ b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh3_wave10_damp1_imp1.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh3_wave20_damp0_imp0.xml b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh3_wave20_damp0_imp0.xml new file mode 100644 index 000000000000..6261886df726 --- /dev/null +++ b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh3_wave20_damp0_imp0.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh3_wave20_damp0_imp1.xml b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh3_wave20_damp0_imp1.xml new file mode 100644 index 000000000000..f2f15e568b5f --- /dev/null +++ b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh3_wave20_damp0_imp1.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh3_wave20_damp1_imp0.xml b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh3_wave20_damp1_imp0.xml new file mode 100644 index 000000000000..95190203b6a3 --- /dev/null +++ b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh3_wave20_damp1_imp0.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh3_wave20_damp1_imp1.xml b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh3_wave20_damp1_imp1.xml new file mode 100644 index 000000000000..1aa8b16dab58 --- /dev/null +++ b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh3_wave20_damp1_imp1.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh3_wave40_damp0_imp0.xml b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh3_wave40_damp0_imp0.xml new file mode 100644 index 000000000000..b0ba52204976 --- /dev/null +++ b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh3_wave40_damp0_imp0.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh3_wave40_damp0_imp1.xml b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh3_wave40_damp0_imp1.xml new file mode 100644 index 000000000000..e10c40f702ca --- /dev/null +++ b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh3_wave40_damp0_imp1.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh3_wave40_damp1_imp0.xml b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh3_wave40_damp1_imp0.xml new file mode 100644 index 000000000000..598f66a7dcbe --- /dev/null +++ b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh3_wave40_damp1_imp0.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh3_wave40_damp1_imp1.xml b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh3_wave40_damp1_imp1.xml new file mode 100644 index 000000000000..a7cff19998c1 --- /dev/null +++ b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh3_wave40_damp1_imp1.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh3_wave5_damp0_imp0.xml b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh3_wave5_damp0_imp0.xml new file mode 100644 index 000000000000..f92ba4c39ea7 --- /dev/null +++ b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh3_wave5_damp0_imp0.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh3_wave5_damp0_imp1.xml b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh3_wave5_damp0_imp1.xml new file mode 100644 index 000000000000..cd6af522c13d --- /dev/null +++ b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh3_wave5_damp0_imp1.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh3_wave5_damp1_imp0.xml b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh3_wave5_damp1_imp0.xml new file mode 100644 index 000000000000..322ebc2314a7 --- /dev/null +++ b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh3_wave5_damp1_imp0.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh3_wave5_damp1_imp1.xml b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh3_wave5_damp1_imp1.xml new file mode 100644 index 000000000000..f6ec64059c83 --- /dev/null +++ b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh3_wave5_damp1_imp1.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh4_wave10_damp0_imp0.xml b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh4_wave10_damp0_imp0.xml new file mode 100644 index 000000000000..f7a89bd879ee --- /dev/null +++ b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh4_wave10_damp0_imp0.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh4_wave10_damp0_imp1.xml b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh4_wave10_damp0_imp1.xml new file mode 100644 index 000000000000..3670c4235b8c --- /dev/null +++ b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh4_wave10_damp0_imp1.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh4_wave10_damp1_imp0.xml b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh4_wave10_damp1_imp0.xml new file mode 100644 index 000000000000..24f60f0b893f --- /dev/null +++ b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh4_wave10_damp1_imp0.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh4_wave10_damp1_imp1.xml b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh4_wave10_damp1_imp1.xml new file mode 100644 index 000000000000..31d23f9a9691 --- /dev/null +++ b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh4_wave10_damp1_imp1.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh4_wave20_damp0_imp0.xml b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh4_wave20_damp0_imp0.xml new file mode 100644 index 000000000000..24eadfe82ab7 --- /dev/null +++ b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh4_wave20_damp0_imp0.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh4_wave20_damp0_imp1.xml b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh4_wave20_damp0_imp1.xml new file mode 100644 index 000000000000..94090e4671ce --- /dev/null +++ b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh4_wave20_damp0_imp1.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh4_wave20_damp1_imp0.xml b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh4_wave20_damp1_imp0.xml new file mode 100644 index 000000000000..46cac11de825 --- /dev/null +++ b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh4_wave20_damp1_imp0.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh4_wave20_damp1_imp1.xml b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh4_wave20_damp1_imp1.xml new file mode 100644 index 000000000000..56fa7c071199 --- /dev/null +++ b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh4_wave20_damp1_imp1.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh4_wave40_damp0_imp0.xml b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh4_wave40_damp0_imp0.xml new file mode 100644 index 000000000000..dcd77e4989f3 --- /dev/null +++ b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh4_wave40_damp0_imp0.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh4_wave40_damp0_imp1.xml b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh4_wave40_damp0_imp1.xml new file mode 100644 index 000000000000..5357d46e6120 --- /dev/null +++ b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh4_wave40_damp0_imp1.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh4_wave40_damp1_imp0.xml b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh4_wave40_damp1_imp0.xml new file mode 100644 index 000000000000..798221dfd62d --- /dev/null +++ b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh4_wave40_damp1_imp0.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh4_wave40_damp1_imp1.xml b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh4_wave40_damp1_imp1.xml new file mode 100644 index 000000000000..fed9432c75fb --- /dev/null +++ b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh4_wave40_damp1_imp1.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh4_wave5_damp0_imp0.xml b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh4_wave5_damp0_imp0.xml new file mode 100644 index 000000000000..8c7d3dd32127 --- /dev/null +++ b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh4_wave5_damp0_imp0.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh4_wave5_damp0_imp1.xml b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh4_wave5_damp0_imp1.xml new file mode 100644 index 000000000000..f0b363e14655 --- /dev/null +++ b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh4_wave5_damp0_imp1.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh4_wave5_damp1_imp0.xml b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh4_wave5_damp1_imp0.xml new file mode 100644 index 000000000000..05320ee8fb94 --- /dev/null +++ b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh4_wave5_damp1_imp0.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh4_wave5_damp1_imp1.xml b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh4_wave5_damp1_imp1.xml new file mode 100644 index 000000000000..fe7011ff859a --- /dev/null +++ b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh4_wave5_damp1_imp1.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh4_wave80_damp0_imp0.xml b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh4_wave80_damp0_imp0.xml new file mode 100644 index 000000000000..eaa0b62601a5 --- /dev/null +++ b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh4_wave80_damp0_imp0.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh4_wave80_damp0_imp1.xml b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh4_wave80_damp0_imp1.xml new file mode 100644 index 000000000000..8fa518ba4510 --- /dev/null +++ b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh4_wave80_damp0_imp1.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh4_wave80_damp1_imp0.xml b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh4_wave80_damp1_imp0.xml new file mode 100644 index 000000000000..e78e204799fe --- /dev/null +++ b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh4_wave80_damp1_imp0.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh4_wave80_damp1_imp1.xml b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh4_wave80_damp1_imp1.xml new file mode 100644 index 000000000000..cc5ced8bd270 --- /dev/null +++ b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/inputs/input_mesh4_wave80_damp1_imp1.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/mesh/README.md b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/mesh/README.md new file mode 100644 index 000000000000..622b1d0bfac6 --- /dev/null +++ b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/mesh/README.md @@ -0,0 +1,16 @@ +Meshes with resolutions 0 and 1 are provided as txt files. +To generate additional meshes, the meshing tool Cubit (Sandia +National Labs) and the tool ncdump must be used. + +Follow these steps: + +1. Modify the Nrefine parameter in the provided helmholtz.jou file, + with 0, 1, 2, 3, 4, etc. The provided txt mesh files correspond + to Nrefine = 0 and Nrefine = 1. + +2. Run helmholtz.jou in Cubit, and save the resulting mesh as the + helmholtz-mesh-N.e Exodus file, where N = Nrefine, in the + mesh subdirectory. + +3. Run + >> ncdump helmholtz-mesh-N.e > helmholtz-mesh-N.txt diff --git a/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzal2019/mesh/helmholtz-mesh-0.e b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/mesh/helmholtz-mesh-0.e similarity index 100% rename from packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzal2019/mesh/helmholtz-mesh-0.e rename to packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/mesh/helmholtz-mesh-0.e diff --git a/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/mesh/helmholtz-mesh-0.txt b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/mesh/helmholtz-mesh-0.txt new file mode 100644 index 000000000000..5365bc15ea35 --- /dev/null +++ b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/mesh/helmholtz-mesh-0.txt @@ -0,0 +1,13826 @@ +netcdf helmholtz-mesh-0 { +dimensions: + len_string = 33 ; + len_line = 81 ; + four = 4 ; + len_name = 33 ; + time_step = UNLIMITED ; // (0 currently) + num_dim = 2 ; + num_nodes = 7491 ; + num_elem = 7424 ; + num_el_blk = 1 ; + num_side_sets = 1 ; + num_el_in_blk1 = 7424 ; + num_nod_per_el1 = 4 ; + num_side_ss1 = 132 ; + num_df_ss1 = 264 ; + num_qa_rec = 1 ; +variables: + double time_whole(time_step) ; + int eb_status(num_el_blk) ; + int eb_prop1(num_el_blk) ; + eb_prop1:name = "ID" ; + int ss_status(num_side_sets) ; + int ss_prop1(num_side_sets) ; + ss_prop1:name = "ID" ; + double coordx(num_nodes) ; + double coordy(num_nodes) ; + char eb_names(num_el_blk, len_name) ; + char ss_names(num_side_sets, len_name) ; + char coor_names(num_dim, len_name) ; + int connect1(num_el_in_blk1, num_nod_per_el1) ; + connect1:elem_type = "QUAD" ; + int elem_ss1(num_side_ss1) ; + int side_ss1(num_side_ss1) ; + double dist_fact_ss1(num_df_ss1) ; + char qa_records(num_qa_rec, four, len_string) ; + int elem_map(num_elem) ; + int elem_num_map(num_elem) ; + int node_num_map(num_nodes) ; + +// global attributes: + :api_version = 6.05f ; + :version = 6.05f ; + :floating_point_word_size = 8 ; + :file_size = 1 ; + :maximum_name_length = 32 ; + :int64_status = 0 ; + :title = "cubit(blished/Helmholtz_KouriRidzal2019/mesh/helmholtz-mesh-0.e): 10/15/2019: 15" ; +data: + + eb_status = 1 ; + + eb_prop1 = 1 ; + + ss_status = 1 ; + + ss_prop1 = 1 ; + + coordx = 2, 1.99773467836602, 1.92787671826128, 1.93055555555556, + 1.99094384514617, 1.92098664101906, 1.97964288376187, 1.90989963895713, + 1.96385739452541, 1.89463953458834, 1.94362313664708, 1.87523960384447, + 1.91898594722899, 1.85174250069554, 1.89000163742934, 1.82420016052488, + 1.85673586603215, 1.79267368247874, 1.81926399070904, 1.75723319105708, + 1.77767089730985, 1.71795767725908, 1.73205080756888, 1.67493481964303, + 1.68250706566236, 1.62826078570627, 1.62915190410067, 1.57804001403482, + 1.57210618948558, 1.52438497771646, 1.51149914870852, 1.46741592955294, + 1.44746807621014, 1.40726062964875, 1.38015802296422, 1.34107716978296, + 1.30972146789057, 1.27198432627191, 1.23631797244121, 1.20013057991125, + 1.1601138191424, 1.12567066582956, 1.0812816349112, 1.04876522296358, 1, + 0.96958043015926, 0.916453043454821, 0.888287629723321, + 0.830830026003773, 0.805062939277754, 0.743324911320655, + 0.720086852796789, 0.654135926634843, 0.633543831729983, + 0.563465113682859, 0.545621887137712, 0.471517871018855, + 0.456512153785643, 0.37850248872082, 0.36640845716302, 0.284629676546571, + 0.275506874405584, 0.190112086608366, 0.184005290117802, + 0.0951638316474848, 0.0921029481005846, 1.22464679914735e-16, + 1.18212434084363e-16, 1.8596624748649, 1.86274509803922, + 1.85267548875376, 1.84179741167721, 1.82705033017919, 1.80846509534309, + 1.78608125290405, 1.75994695366523, 1.7301188444207, 1.69666193963224, + 1.65964947415068, 1.61916273731544, 1.57529088880796, 1.5281307566764, + 1.47778661798897, 1.42436996261279, 1.36799924065351, 1.30291586608831, + 1.23513511739722, 1.16479465544081, 1.0920379396535, 1.01701390306178, + 0.939876614903009, 0.860784931609033, 0.779902136945289, + 0.697395572120543, 0.613436256705238, 0.528198501217156, + 0.441859512252037, 0.354598991053638, 0.266598726432621, + 0.178042182956428, 0.0891140853430233, 1.14060241097057e-16, + 1.79309194817686, 1.79656862745098, 1.78601038835028, 1.7753362019221, + 1.76108978129798, 1.74329961114295, 1.72200220385453, 1.6972420168504, + 1.66907135185804, 1.63755023643449, 1.60274628798466, 1.5647345605861, + 1.52359737496744, 1.47942413202542, 1.43231111030311, 1.38236124788806, + 1.32968390922441, 1.26567411188027, 1.19917384126649, 1.1303101990299, + 1.05921564061421, 0.986027675205815, 0.910888554231245, + 0.833944949111957, 0.755347619006377, 0.675251069291917, + 0.593813201560606, 0.511194955921192, 0.427559946418036, + 0.343074090392675, 0.257905232627681, 0.172222765124243, + 0.0861972433748008, 1.1000810095282e-16, 1.72816513819717, + 1.73202614379085, 1.72099133980861, 1.71051600969182, 1.6967578879447, + 1.67974315124404, 1.65950535354697, 1.63608535008037, 1.60953120479075, + 1.57989808146386, 1.54724811876101, 1.51165028945502, 1.47318024418472, + 1.43192014008187, 1.38795845465887, 1.34138978537876, 1.29231463536147, + 1.22935190715886, 1.16410049787973, 1.09667721067852, 1.0272037687117, + 0.955806539395675, 0.882616248143969, 0.807767682232093, + 0.731399385461018, 0.653653344310912, 0.574674666296089, + 0.49461125124982, 0.413613456283639, 0.331833755180131, + 0.249426392990765, 0.166547036621248, 0.0833524221959172, + 1.0605601365165e-16, 1.66488204492582, 1.66911764705882, + 1.65761834312875, 1.64733683498635, 1.63405465011935, 1.61779571564638, + 1.59859070198137, 1.57647695335516, 1.55149840321884, 1.52370547472032, + 1.49315496647972, 1.4599099239222, 1.42403949645978, 1.38561878084574, + 1.34472865105626, 1.30145557508488, 1.25589141906468, 1.19394925192406, + 1.12991508723695, 1.06389569038667, 0.996002323945955, 0.92635049563136, + 0.855059696641182, 0.78225313096944, 0.708057436309213, + 0.632602397177528, 0.556020650911687, 0.478447387203039, + 0.400020041848848, 0.320877985416005, 0.241162207521871, + 0.161014997447443, 0.0805796218063723, 1.02203979193547e-16, + 1.60324266836283, 1.6078431372549, 1.59589139831071, 1.5857986778057, + 1.57298006782193, 1.55745730434995, 1.53925824915773, 1.51841682667476, + 1.4949729471423, 1.46897241620389, 1.44046683114081, 1.40951346398762, + 1.37617513179264, 1.34052005431705, 1.30262169949528, 1.26255861700643, + 1.22041426033404, 1.15946614617589, 1.09661760933813, 1.03196563815435, + 0.965611306316984, 0.897659543912872, 0.828218899722882, + 0.757401295323999, 0.685321771550961, 0.612098227891763, + 0.537851155407398, 0.46270336378085, 0.386779703113662, + 0.310206781100299, 0.233112676221001, 0.155626647602828, + 0.0778788422061663, 9.84519975785127e-17, 1.54324700850817, + 1.54820261437909, 1.53581050535449, 1.52590153814987, 1.51353414105244, + 1.49872791735476, 1.48150799507606, 1.46190497003917, 1.43995483656114, + 1.41569890591457, 1.38918371274427, 1.36046090965131, 1.32958715018328, + 1.29662396049579, 1.26163759997592, 1.22469891114341, 1.18588315916955, + 1.12590258991433, 1.06420806418328, 1.00088705398156, 0.936030715824785, + 0.86973368424021, 0.80209385738907, 0.73321217529577, 0.663192391186263, + 0.592140836453619, 0.520166179783224, 0.447379180983253, + 0.37389244007808, 0.299820142233011, 0.225277799088154, + 0.150381987087403, 0.0752500833952991, 9.48000688065455e-17, + 1.48489506536187, 1.49019607843137, 1.47737566426008, 1.46764541601885, + 1.45571686981088, 1.44160755466081, 1.42533993973636, 1.40694138344838, + 1.38644407147535, 1.36388494385235, 1.3393056112901, 1.31275226091325, + 1.28427555163172, 1.25393049938197, 1.22177635249819, 1.18787645749581, + 1.15229811557121, 1.09325858313938, 1.03268645177239, 0.970659937868292, + 0.90726055246936, 0.842572916613375, 0.776684569639746, + 0.709685770884753, 0.641669295215118, 0.572730222863096, + 0.502965724039165, 0.432474838810247, 0.361358252742104, + 0.289718068814142, 0.21765757612333, 0.145281015901167, + 0.0726933453737708, 9.12481928776459e-17, 1.42818683892391, + 1.43382352941176, 1.42058687502748, 1.41103031141265, 1.39952825409725, + 1.3860962162681, 1.37075408313861, 1.35352606690241, 1.33444065188493, + 1.31353053001724, 1.2908325267783, 1.26638751777344, 1.24024033613795, + 1.21243967097557, 1.18303795706209, 1.15209125606363, 1.11965912953902, + 1.06153412585106, 1.00205277210548, 0.941284289814556, 0.879300816250707, + 0.816177241032366, 0.751991036474911, 0.686822082090947, + 0.620752483637526, 0.553866387120192, 0.486249788175219, + 0.417990337261833, 0.349177141105733, 0.279900560843692, + 0.210252007326529, 0.140323734044121, 0.0702086281415812, + 8.77963697918139e-17, 1.3731223291943, 1.37908496732026, 1.3654441376567, + 1.35605622433127, 1.34496829391156, 1.33219390217663, 1.31775042528283, + 1.30165902040125, 1.28394457778989, 1.26463566440923, 1.24376445920887, + 1.22136668023189, 1.19748150370196, 1.17215147527661, 1.14542241366761, + 1.11734330684688, 1.08796620107298, 1.03072921804936, 0.972307025182535, + 0.912760109820348, 0.852151507168826, 0.790546657497184, + 0.728013257894563, 0.664621108914353, 0.600441956453488, + 0.53554932922491, 0.470018372191389, 0.403925676338011, + 0.337349105168966, 0.270367618321661, 0.203061092697752, + 0.135510141516265, 0.0677959316987305, 8.44445995490495e-17, + 1.31970153617303, 1.32598039215686, 1.31194745214773, 1.3027231547747, + 1.29203698925379, 1.27990061238639, 1.26632896616902, 1.25134024394491, + 1.23495584919023, 1.21720034702832, 1.19810140858181, 1.1776897482886, + 1.15599905432377, 1.13306591228508, 1.10892972231476, 1.08363260984556, + 1.05721933017309, 1.00084385973427, 0.943449211003558, 0.885087397885669, + 0.825812625223718, 0.765681166007827, 0.704751233898703, + 0.643082851354971, 0.580737713663003, 0.517779049177247, + 0.454271476087672, 0.390280856038781, 0.325874144931805, + 0.261119241248049, 0.196084832236998, 0.130840238317598, + 0.0654552560452187, 8.11928821493527e-17, 1.26792445986011, + 1.27450980392157, 1.26009681850058, 1.25103110274296, 1.24073434012396, + 1.22921634689739, 1.21648970579716, 1.20256973753337, 1.18747446608593, + 1.17122457787452, 1.15384337489713, 1.13535672194356, 1.11579298800337, + 1.09518298200098, 1.07355988300353, 1.05095916505966, 1.02741851683935, + 0.971878050905798, 0.915479329568549, 0.858266154010519, + 0.800284170415383, 0.741580766564297, 0.682204964487331, + 0.622207309412801, 0.561639755266071, 0.500555546977205, + 0.43900909986407, 0.377055876364142, 0.314752260394248, + 0.252155429622856, 0.189323225944267, 0.126314024448121, + 0.0631866011810456, 7.80412175927235e-17, 1.21779110025554, + 1.22467320261438, 1.20989223671524, 1.20098006823603, 1.19106034652206, + 1.18014110570963, 1.16823264416727, 1.15534750116664, 1.14150042847702, + 1.12670835694783, 1.11099035815481, 1.09436760119678, 1.07686330474076, + 1.05850268442431, 1.03931289573393, 1.01932297248919, 0.998563761071767, + 0.943831791563947, 0.88839738087751, 0.832296378194897, 0.77556614274382, + 0.718245459166594, 0.660374449660448, 0.601994483087843, + 0.543148081262693, 0.483878822624783, 0.424231243520582, + 0.364250737314095, 0.303983451556296, 0.243476183446081, + 0.182776273819559, 0.121931499907834, 0.0609899671062114, + 7.49896058791619e-17, 1.16930145735932, 1.17647058823529, + 1.16133370679171, 1.15257005125392, 1.14301500844809, 1.13267488882311, + 1.12155778127935, 1.10967353484472, 1.09703373636347, 1.08365168424824, + 1.06954235835487, 1.05472238604825, 1.03921000453594, 1.02302501955507, + 1.00618876050596, 0.988724032134141, 0.970655062870329, + 0.916705081708714, 0.862203364930438, 0.807178070438803, + 0.75165854220903, 0.695675243814717, 0.639259689418052, + 0.582444372380096, 0.525262691652869, 0.467748876119982, + 0.409937907057209, 0.35186543888864, 0.29356771841795, 0.235081502717725, + 0.176443975862874, 0.117692664696737, 0.058865353820716, + 7.20380470086678e-17, 1.12245553117144, 1.12990196078431, 1.11442122873, + 1.10580105179662, 1.09659832590205, 1.08681769623783, 1.07646511713339, + 1.06554783856762, 1.0540743897453, 1.04205455977575, 1.0294993754973, + 1.01642107649797, 1.00283308738891, 0.988749987393267, 0.974187477319609, + 0.959162343994519, 0.943692422235042, 0.890497921340099, + 0.836897281727336, 0.782911230742239, 0.728561368811012, + 0.673870120508666, 0.618860683760144, 0.563556977289561, + 0.507983586436597, 0.452165707462801, 0.396129090473949, + 0.339899981087776, 0.283505060979208, 0.226971387437788, + 0.170326332074213, 0.11359751881483, 0.0568127613245594, + 6.91865409812414e-17, 1.0772533216919, 1.08496732026144, + 1.06915480253011, 1.06067306986414, 1.05181029888394, 1.04256952795378, + 1.03295465172939, 1.02297041233532, 1.01262238862251, 1.00191698353037, + 0.990861409582094, 0.979463672545954, 0.96773255329967, + 0.955677587938894, 0.943309046174887, 0.930637908070322, + 0.917675839165906, 0.865210310458101, 0.812479131268202, + 0.759495859105203, 0.706274622549766, 0.652830089248441, + 0.599177432686724, 0.545332297816237, 0.491310765613879, + 0.437129316653241, 0.382804793770805, 0.328354363911504, + 0.273795479240071, 0.21914583760627, 0.164423342453575, + 0.109646062262112, 0.0548321896177417, 6.64350877968825e-17, + 1.03369482892072, 1.04166666666667, 1.02553442819203, 1.01718610545648, + 1.00865092739377, 0.999930383970971, 0.991026385067353, + 0.981941256147836, 0.972677732995088, 0.963238955512094, + 0.953628460609263, 0.943850174192191, 0.933908402268221, + 0.923807821191953, 0.913553467071793, 0.90315072436155, 0.89260531366292, + 0.840842249062722, 0.788948913553036, 0.736931955527695, + 0.684798303425294, 0.632555150034043, 0.580209936197792, + 0.527770333960126, 0.475244229184715, 0.422639703691301, + 0.369965016947774, 0.317228587359824, 0.26443897320054, + 0.211604853223171, 0.15873500700096, 0.105838295038584, + 0.0529236387002628, 6.37836874555913e-17, 0.99178005285788, 1, + 0.98356010571576, 0.975340158573641, 0.967120211431521, + 0.958900264289401, 0.950680317147282, 0.942460370005162, + 0.934240422863042, 0.926020475720922, 0.917800528578803, + 0.909580581436683, 0.901360634294563, 0.893140687152443, + 0.884920740010324, 0.876700792868204, 0.868480845726084, + 0.817393737153961, 0.766306628581839, 0.715219520009716, + 0.664132411437594, 0.613045302865471, 0.561958194293348, + 0.510871085721226, 0.459783977149103, 0.408696868576981, + 0.357609760004858, 0.306522651432736, 0.255435542860613, + 0.20434843428849, 0.153261325716368, 0.102174217144245, + 0.0510871085721227, 6.12323399573676e-17, 0.825130157993604, + 0.773559523119003, 0.721988888244403, 0.670418253369803, + 0.618847618495203, 0.567276983620602, 0.515706348746002, + 0.464135713871402, 0.412565078996802, 0.360994444122202, + 0.309423809247601, 0.257853174373001, 0.206282539498401, + 0.154711904623801, 0.103141269749201, 0.0515706348746003, + 5.74053187100322e-17, 0.832866578833246, 0.780812417656168, + 0.72875825647909, 0.676704095302012, 0.624649934124934, + 0.572595772947856, 0.520541611770779, 0.468487450593701, + 0.416433289416623, 0.364379128239545, 0.312324967062467, + 0.260270805885389, 0.208216644708312, 0.156162483531234, + 0.104108322354156, 0.0520541611770779, 5.35782974626967e-17, + 0.840602999672888, 0.788065312193332, 0.735527624713777, + 0.682989937234221, 0.630452249754666, 0.57791456227511, + 0.525376874795555, 0.472839187315999, 0.420301499836444, + 0.367763812356888, 0.315226124877333, 0.262688437397777, + 0.210150749918222, 0.157613062438667, 0.105075374959111, + 0.0525376874795555, 4.97512762153612e-17, 0.84833942051253, + 0.795318206730497, 0.742296992948463, 0.689275779166431, + 0.636254565384398, 0.583233351602364, 0.530212137820331, + 0.477190924038298, 0.424169710256265, 0.371148496474232, + 0.318127282692199, 0.265106068910166, 0.212084855128133, + 0.159063641346099, 0.106042427564066, 0.0530212137820332, + 4.59242549680257e-17, 0.856075841352172, 0.802571101267662, + 0.749066361183151, 0.69556162109864, 0.642056881014129, + 0.588552140929618, 0.535047400845108, 0.481542660760597, + 0.428037920676086, 0.374533180591575, 0.321028440507065, + 0.267523700422554, 0.214018960338043, 0.160514220253532, + 0.107009480169022, 0.0535047400845108, 4.20972337206903e-17, + 0.863812262191814, 0.809823995804826, 0.755835729417837, + 0.701847463030849, 0.64785919664386, 0.593870930256872, + 0.539882663869884, 0.485894397482896, 0.431906131095907, + 0.377917864708919, 0.32392959832193, 0.269941331934942, + 0.215953065547954, 0.161964799160965, 0.107976532773977, + 0.0539882663869884, 3.82702124733548e-17, 0.871548683031456, + 0.81707689034199, 0.762605097652524, 0.708133304963058, + 0.653661512273592, 0.599189719584126, 0.54471792689466, + 0.490246134205194, 0.435774341515728, 0.381302548826262, + 0.326830756136796, 0.27235896344733, 0.217887170757864, + 0.163415378068398, 0.108943585378932, 0.0544717926894661, + 3.44431912260193e-17, 0.879285103871098, 0.824329784879155, + 0.769374465887211, 0.714419146895267, 0.659463827903324, + 0.60450850891138, 0.549553189919437, 0.494597870927493, + 0.439642551935549, 0.384687232943606, 0.329731913951662, + 0.274776594959718, 0.219821275967775, 0.164865956975831, + 0.109910637983887, 0.0549553189919437, 3.06161699786838e-17, + 0.88702152471074, 0.831582679416319, 0.776143834121898, + 0.720704988827476, 0.665266143533056, 0.609827298238634, + 0.554388452944213, 0.498949607649792, 0.44351076235537, + 0.388071917060949, 0.332633071766528, 0.277194226472106, + 0.221755381177685, 0.166316535883264, 0.110877690588843, + 0.0554388452944213, 2.67891487313483e-17, 0.894757945550383, + 0.838835573953484, 0.782913202356585, 0.726990830759686, + 0.671068459162787, 0.615146087565888, 0.559223715968989, + 0.50330134437209, 0.447378972775191, 0.391456601178292, + 0.335534229581393, 0.279611857984495, 0.223689486387596, + 0.167767114790697, 0.111844743193798, 0.055922371596899, + 2.29621274840129e-17, 0.902494366390025, 0.846088468490648, + 0.789682570591272, 0.733276672691895, 0.676870774792518, + 0.620464876893142, 0.564058978993766, 0.507653081094389, + 0.451247183195012, 0.394841285295636, 0.338435387396259, + 0.282029489496883, 0.225623591597506, 0.16921769369813, + 0.112811795798753, 0.0564058978993766, 1.91351062366774e-17, + 0.910230787229667, 0.853341363027813, 0.796451938825958, + 0.739562514624104, 0.68267309042225, 0.625783666220396, + 0.568894242018542, 0.512004817816688, 0.455115393614833, + 0.398225969412979, 0.341336545211125, 0.284447121009271, + 0.227557696807417, 0.170668272605563, 0.113778848403708, + 0.0568894242018542, 1.53080849893419e-17, 0.917967208069309, + 0.860594257564977, 0.803221307060645, 0.745848356556313, + 0.688475406051982, 0.63110245554765, 0.573729505043318, + 0.516356554538986, 0.458983604034654, 0.401610653530323, + 0.344237703025991, 0.286864752521659, 0.229491802017327, + 0.172118851512995, 0.114745901008664, 0.0573729505043318, + 1.14810637420064e-17, 0.925703628908951, 0.867847152102142, + 0.809990675295332, 0.752134198488523, 0.694277721681713, + 0.636421244874904, 0.578564768068095, 0.520708291261285, + 0.462851814454476, 0.404995337647666, 0.347138860840857, + 0.289282384034047, 0.231425907227238, 0.173569430420428, + 0.115712953613619, 0.0578564768068094, 7.65404249467096e-18, + 0.933440049748593, 0.875100046639306, 0.816760043530019, + 0.758420040420732, 0.700080037311445, 0.641740034202158, + 0.583400031092871, 0.525060027983584, 0.466720024874297, + 0.40838002176501, 0.350040018655722, 0.291700015546435, + 0.233360012437148, 0.175020009327861, 0.116680006218574, + 0.0583400031092871, 3.82702124733548e-18, 0.941176470588235, + 0.882352941176471, 0.823529411764706, 0.764705882352941, + 0.705882352941176, 0.647058823529412, 0.588235294117647, + 0.529411764705882, 0.470588235294118, 0.411764705882353, + 0.352941176470588, 0.294117647058824, 0.235294117647059, + 0.176470588235294, 0.117647058823529, 0.0588235294117647, 0, + -0.0951638316474845, -0.0921029481005844, -0.190112086608365, + -0.184005290117801, -0.28462967654657, -0.275506874405584, + -0.37850248872082, -0.36640845716302, -0.471517871018854, + -0.456512153785643, -0.563465113682859, -0.545621887137712, + -0.654135926634843, -0.633543831729983, -0.743324911320655, + -0.720086852796789, -0.830830026003773, -0.805062939277754, + -0.916453043454821, -0.888287629723321, -1, -0.96958043015926, + -1.08128163491119, -1.04876522296358, -1.1601138191424, + -1.12567066582956, -1.23631797244121, -1.20013057991124, + -1.30972146789057, -1.27198432627191, -1.38015802296422, + -1.34107716978296, -1.44746807621014, -1.40726062964875, + -1.51149914870852, -1.46741592955294, -1.57210618948557, + -1.52438497771646, -1.62915190410067, -1.57804001403482, + -1.68250706566236, -1.62826078570626, -1.73205080756888, + -1.67493481964303, -1.77767089730985, -1.71795767725908, + -1.81926399070904, -1.75723319105708, -1.85673586603215, + -1.79267368247874, -1.89000163742934, -1.82420016052488, + -1.91898594722899, -1.85174250069554, -1.94362313664708, + -1.87523960384447, -1.96385739452541, -1.89463953458834, + -1.97964288376187, -1.90989963895713, -1.99094384514617, + -1.92098664101906, -1.99773467836602, -1.92787671826128, -2, + -1.93055555555556, -0.0891140853430231, -0.178042182956427, + -0.266598726432621, -0.354598991053638, -0.441859512252037, + -0.528198501217156, -0.613436256705237, -0.697395572120543, + -0.779902136945289, -0.860784931609033, -0.939876614903008, + -1.01701390306178, -1.0920379396535, -1.16479465544081, + -1.23513511739721, -1.30291586608831, -1.36799924065351, + -1.42436996261279, -1.47778661798897, -1.5281307566764, + -1.57529088880796, -1.61916273731544, -1.65964947415068, + -1.69666193963224, -1.7301188444207, -1.75994695366523, + -1.78608125290405, -1.80846509534309, -1.82705033017919, + -1.84179741167721, -1.85267548875376, -1.8596624748649, + -1.86274509803922, -0.0861972433748006, -0.172222765124243, + -0.257905232627681, -0.343074090392675, -0.427559946418036, + -0.511194955921192, -0.593813201560606, -0.675251069291917, + -0.755347619006377, -0.833944949111957, -0.910888554231245, + -0.986027675205815, -1.05921564061421, -1.1303101990299, + -1.19917384126649, -1.26567411188027, -1.32968390922441, + -1.38236124788806, -1.43231111030311, -1.47942413202542, + -1.52359737496744, -1.5647345605861, -1.60274628798466, + -1.63755023643449, -1.66907135185804, -1.6972420168504, + -1.72200220385453, -1.74329961114295, -1.76108978129798, + -1.7753362019221, -1.78601038835028, -1.79309194817686, + -1.79656862745098, -0.0833524221959169, -0.166547036621248, + -0.249426392990764, -0.33183375518013, -0.413613456283639, + -0.494611251249819, -0.574674666296089, -0.653653344310912, + -0.731399385461018, -0.807767682232093, -0.882616248143969, + -0.955806539395674, -1.0272037687117, -1.09667721067852, + -1.16410049787973, -1.22935190715886, -1.29231463536147, + -1.34138978537876, -1.38795845465887, -1.43192014008187, + -1.47318024418472, -1.51165028945502, -1.547248118761, -1.57989808146386, + -1.60953120479075, -1.63608535008037, -1.65950535354697, + -1.67974315124404, -1.6967578879447, -1.71051600969182, + -1.72099133980861, -1.72816513819717, -1.73202614379085, + -0.0805796218063721, -0.161014997447443, -0.241162207521871, + -0.320877985416005, -0.400020041848848, -0.478447387203039, + -0.556020650911686, -0.632602397177527, -0.708057436309213, + -0.78225313096944, -0.855059696641181, -0.92635049563136, + -0.996002323945954, -1.06389569038667, -1.12991508723695, + -1.19394925192406, -1.25589141906468, -1.30145557508488, + -1.34472865105626, -1.38561878084574, -1.42403949645978, + -1.4599099239222, -1.49315496647972, -1.52370547472032, + -1.55149840321884, -1.57647695335516, -1.59859070198137, + -1.61779571564638, -1.63405465011935, -1.64733683498635, + -1.65761834312875, -1.66488204492582, -1.66911764705882, + -0.0778788422061661, -0.155626647602828, -0.233112676221, + -0.310206781100299, -0.386779703113662, -0.46270336378085, + -0.537851155407398, -0.612098227891763, -0.685321771550961, + -0.757401295323999, -0.828218899722882, -0.897659543912872, + -0.965611306316983, -1.03196563815435, -1.09661760933813, + -1.15946614617589, -1.22041426033404, -1.26255861700643, + -1.30262169949528, -1.34052005431705, -1.37617513179264, + -1.40951346398762, -1.44046683114081, -1.46897241620389, + -1.4949729471423, -1.51841682667476, -1.53925824915773, + -1.55745730434995, -1.57298006782193, -1.5857986778057, + -1.59589139831071, -1.60324266836283, -1.6078431372549, + -0.0752500833952989, -0.150381987087402, -0.225277799088153, + -0.299820142233011, -0.37389244007808, -0.447379180983253, + -0.520166179783224, -0.592140836453619, -0.663192391186263, + -0.73321217529577, -0.80209385738907, -0.86973368424021, + -0.936030715824785, -1.00088705398156, -1.06420806418328, + -1.12590258991433, -1.18588315916955, -1.22469891114341, + -1.26163759997592, -1.29662396049579, -1.32958715018328, + -1.36046090965131, -1.38918371274427, -1.41569890591457, + -1.43995483656114, -1.46190497003917, -1.48150799507606, + -1.49872791735476, -1.51353414105244, -1.52590153814987, + -1.53581050535449, -1.54324700850817, -1.54820261437909, + -0.0726933453737706, -0.145281015901167, -0.21765757612333, + -0.289718068814142, -0.361358252742104, -0.432474838810247, + -0.502965724039164, -0.572730222863095, -0.641669295215118, + -0.709685770884753, -0.776684569639746, -0.842572916613375, + -0.90726055246936, -0.970659937868292, -1.03268645177239, + -1.09325858313938, -1.15229811557121, -1.18787645749581, + -1.22177635249819, -1.25393049938197, -1.28427555163172, + -1.31275226091325, -1.3393056112901, -1.36388494385235, + -1.38644407147535, -1.40694138344838, -1.42533993973636, + -1.44160755466081, -1.45571686981088, -1.46764541601885, + -1.47737566426008, -1.48489506536187, -1.49019607843137, + -0.070208628141581, -0.140323734044121, -0.210252007326529, + -0.279900560843692, -0.349177141105732, -0.417990337261833, + -0.486249788175219, -0.553866387120192, -0.620752483637526, + -0.686822082090947, -0.751991036474911, -0.816177241032366, + -0.879300816250707, -0.941284289814555, -1.00205277210548, + -1.06153412585106, -1.11965912953902, -1.15209125606363, + -1.18303795706209, -1.21243967097557, -1.24024033613795, + -1.26638751777344, -1.2908325267783, -1.31353053001724, + -1.33444065188493, -1.35352606690241, -1.37075408313861, + -1.3860962162681, -1.39952825409725, -1.41103031141265, + -1.42058687502748, -1.42818683892391, -1.43382352941176, + -0.0677959316987304, -0.135510141516264, -0.203061092697752, + -0.270367618321661, -0.337349105168966, -0.403925676338011, + -0.470018372191388, -0.535549329224909, -0.600441956453488, + -0.664621108914353, -0.728013257894563, -0.790546657497183, + -0.852151507168826, -0.912760109820348, -0.972307025182534, + -1.03072921804936, -1.08796620107298, -1.11734330684688, + -1.14542241366761, -1.17215147527661, -1.19748150370196, + -1.22136668023189, -1.24376445920887, -1.26463566440923, + -1.28394457778989, -1.30165902040125, -1.31775042528283, + -1.33219390217663, -1.34496829391156, -1.35605622433127, + -1.3654441376567, -1.3731223291943, -1.37908496732026, + -0.0654552560452185, -0.130840238317598, -0.196084832236997, + -0.261119241248049, -0.325874144931804, -0.390280856038781, + -0.454271476087672, -0.517779049177247, -0.580737713663003, + -0.643082851354971, -0.704751233898703, -0.765681166007827, + -0.825812625223718, -0.885087397885669, -0.943449211003558, + -1.00084385973427, -1.05721933017309, -1.08363260984556, + -1.10892972231476, -1.13306591228508, -1.15599905432377, + -1.1776897482886, -1.19810140858181, -1.21720034702832, + -1.23495584919023, -1.25134024394491, -1.26632896616902, + -1.27990061238639, -1.29203698925379, -1.3027231547747, + -1.31194745214773, -1.31970153617303, -1.32598039215686, + -0.0631866011810454, -0.126314024448121, -0.189323225944266, + -0.252155429622855, -0.314752260394248, -0.377055876364142, + -0.439009099864069, -0.500555546977205, -0.561639755266071, + -0.622207309412801, -0.682204964487331, -0.741580766564297, + -0.800284170415383, -0.858266154010518, -0.915479329568549, + -0.971878050905798, -1.02741851683935, -1.05095916505966, + -1.07355988300353, -1.09518298200098, -1.11579298800337, + -1.13535672194356, -1.15384337489713, -1.17122457787452, + -1.18747446608593, -1.20256973753337, -1.21648970579716, + -1.22921634689739, -1.24073434012396, -1.25103110274296, + -1.26009681850058, -1.26792445986011, -1.27450980392157, + -0.0609899671062112, -0.121931499907834, -0.182776273819559, + -0.243476183446081, -0.303983451556296, -0.364250737314095, + -0.424231243520582, -0.483878822624783, -0.543148081262693, + -0.601994483087842, -0.660374449660448, -0.718245459166594, + -0.77556614274382, -0.832296378194897, -0.88839738087751, + -0.943831791563947, -0.998563761071767, -1.01932297248919, + -1.03931289573393, -1.05850268442431, -1.07686330474076, + -1.09436760119678, -1.11099035815481, -1.12670835694783, + -1.14150042847702, -1.15534750116664, -1.16823264416727, + -1.18014110570963, -1.19106034652206, -1.20098006823603, + -1.20989223671524, -1.21779110025554, -1.22467320261438, + -0.0588653538207158, -0.117692664696737, -0.176443975862874, + -0.235081502717725, -0.29356771841795, -0.35186543888864, + -0.409937907057208, -0.467748876119982, -0.525262691652869, + -0.582444372380096, -0.639259689418052, -0.695675243814717, + -0.751658542209029, -0.807178070438803, -0.862203364930438, + -0.916705081708714, -0.970655062870329, -0.988724032134141, + -1.00618876050596, -1.02302501955507, -1.03921000453594, + -1.05472238604825, -1.06954235835487, -1.08365168424824, + -1.09703373636347, -1.10967353484472, -1.12155778127935, + -1.13267488882311, -1.14301500844809, -1.15257005125392, + -1.16133370679171, -1.16930145735932, -1.17647058823529, + -0.0568127613245593, -0.113597518814829, -0.170326332074213, + -0.226971387437788, -0.283505060979208, -0.339899981087776, + -0.396129090473949, -0.452165707462801, -0.507983586436597, + -0.563556977289561, -0.618860683760144, -0.673870120508666, + -0.728561368811012, -0.782911230742239, -0.836897281727336, + -0.890497921340098, -0.943692422235042, -0.959162343994519, + -0.974187477319609, -0.988749987393267, -1.00283308738891, + -1.01642107649797, -1.0294993754973, -1.04205455977575, -1.0540743897453, + -1.06554783856762, -1.07646511713339, -1.08681769623783, + -1.09659832590205, -1.10580105179662, -1.11442122873, -1.12245553117144, + -1.12990196078431, -0.0548321896177415, -0.109646062262112, + -0.164423342453574, -0.21914583760627, -0.273795479240071, + -0.328354363911504, -0.382804793770804, -0.437129316653241, + -0.491310765613879, -0.545332297816237, -0.599177432686724, + -0.652830089248441, -0.706274622549766, -0.759495859105203, + -0.812479131268202, -0.865210310458101, -0.917675839165906, + -0.930637908070322, -0.943309046174887, -0.955677587938894, + -0.96773255329967, -0.979463672545954, -0.990861409582094, + -1.00191698353037, -1.01262238862251, -1.02297041233532, + -1.03295465172939, -1.04256952795378, -1.05181029888394, + -1.06067306986414, -1.06915480253011, -1.0772533216919, + -1.08496732026144, -0.0529236387002626, -0.105838295038583, + -0.15873500700096, -0.211604853223171, -0.26443897320054, + -0.317228587359824, -0.369965016947774, -0.4226397036913, + -0.475244229184715, -0.527770333960126, -0.580209936197792, + -0.632555150034043, -0.684798303425294, -0.736931955527695, + -0.788948913553036, -0.840842249062722, -0.89260531366292, + -0.90315072436155, -0.913553467071793, -0.923807821191953, + -0.933908402268221, -0.943850174192191, -0.953628460609263, + -0.963238955512094, -0.972677732995088, -0.981941256147836, + -0.991026385067353, -0.999930383970971, -1.00865092739377, + -1.01718610545648, -1.02553442819203, -1.03369482892072, + -1.04166666666667, -0.0510871085721225, -0.102174217144245, + -0.153261325716368, -0.20434843428849, -0.255435542860613, + -0.306522651432736, -0.357609760004858, -0.408696868576981, + -0.459783977149103, -0.510871085721226, -0.561958194293349, + -0.613045302865471, -0.664132411437594, -0.715219520009716, + -0.766306628581839, -0.817393737153961, -0.868480845726084, + -0.876700792868204, -0.884920740010324, -0.893140687152443, + -0.901360634294563, -0.909580581436683, -0.917800528578803, + -0.926020475720922, -0.934240422863042, -0.942460370005162, + -0.950680317147282, -0.958900264289401, -0.967120211431521, + -0.975340158573641, -0.98356010571576, -0.99178005285788, -1, + -0.825130157993604, -0.832866578833246, -0.840602999672888, + -0.84833942051253, -0.856075841352172, -0.863812262191814, + -0.871548683031456, -0.879285103871099, -0.88702152471074, + -0.894757945550382, -0.902494366390025, -0.910230787229667, + -0.917967208069309, -0.925703628908951, -0.933440049748593, + -0.941176470588235, -0.773559523119003, -0.780812417656168, + -0.788065312193332, -0.795318206730497, -0.802571101267661, + -0.809823995804826, -0.81707689034199, -0.824329784879155, + -0.831582679416319, -0.838835573953484, -0.846088468490648, + -0.853341363027813, -0.860594257564977, -0.867847152102142, + -0.875100046639306, -0.882352941176471, -0.721988888244403, + -0.72875825647909, -0.735527624713777, -0.742296992948464, + -0.74906636118315, -0.755835729417837, -0.762605097652524, + -0.769374465887211, -0.776143834121898, -0.782913202356585, + -0.789682570591271, -0.796451938825959, -0.803221307060645, + -0.809990675295332, -0.816760043530019, -0.823529411764706, + -0.670418253369803, -0.676704095302012, -0.682989937234221, + -0.68927577916643, -0.69556162109864, -0.701847463030849, + -0.708133304963058, -0.714419146895267, -0.720704988827476, + -0.726990830759686, -0.733276672691895, -0.739562514624104, + -0.745848356556313, -0.752134198488523, -0.758420040420732, + -0.764705882352941, -0.618847618495203, -0.624649934124934, + -0.630452249754666, -0.636254565384398, -0.642056881014129, + -0.647859196643861, -0.653661512273592, -0.659463827903324, + -0.665266143533055, -0.671068459162787, -0.676870774792519, + -0.68267309042225, -0.688475406051982, -0.694277721681713, + -0.700080037311445, -0.705882352941176, -0.567276983620603, + -0.572595772947857, -0.57791456227511, -0.583233351602364, + -0.588552140929618, -0.593870930256872, -0.599189719584126, + -0.60450850891138, -0.609827298238634, -0.615146087565888, + -0.620464876893142, -0.625783666220396, -0.63110245554765, + -0.636421244874904, -0.641740034202158, -0.647058823529412, + -0.515706348746002, -0.520541611770778, -0.525376874795555, + -0.530212137820331, -0.535047400845108, -0.539882663869884, + -0.54471792689466, -0.549553189919437, -0.554388452944213, + -0.559223715968989, -0.564058978993766, -0.568894242018542, + -0.573729505043318, -0.578564768068095, -0.583400031092871, + -0.588235294117647, -0.464135713871402, -0.468487450593701, + -0.472839187315999, -0.477190924038298, -0.481542660760597, + -0.485894397482895, -0.490246134205194, -0.494597870927493, + -0.498949607649792, -0.50330134437209, -0.507653081094389, + -0.512004817816688, -0.516356554538986, -0.520708291261285, + -0.525060027983584, -0.529411764705882, -0.412565078996802, + -0.416433289416623, -0.420301499836444, -0.424169710256265, + -0.428037920676086, -0.431906131095907, -0.435774341515728, + -0.439642551935549, -0.44351076235537, -0.447378972775191, + -0.451247183195012, -0.455115393614833, -0.458983604034654, + -0.462851814454475, -0.466720024874297, -0.470588235294118, + -0.360994444122201, -0.364379128239545, -0.367763812356888, + -0.371148496474232, -0.374533180591575, -0.377917864708919, + -0.381302548826262, -0.384687232943606, -0.388071917060949, + -0.391456601178292, -0.394841285295636, -0.398225969412979, + -0.401610653530323, -0.404995337647666, -0.40838002176501, + -0.411764705882353, -0.309423809247601, -0.312324967062467, + -0.315226124877333, -0.318127282692199, -0.321028440507065, + -0.32392959832193, -0.326830756136796, -0.329731913951662, + -0.332633071766528, -0.335534229581393, -0.338435387396259, + -0.341336545211125, -0.344237703025991, -0.347138860840857, + -0.350040018655722, -0.352941176470588, -0.257853174373001, + -0.260270805885389, -0.262688437397777, -0.265106068910166, + -0.267523700422554, -0.269941331934942, -0.27235896344733, + -0.274776594959718, -0.277194226472106, -0.279611857984495, + -0.282029489496883, -0.284447121009271, -0.286864752521659, + -0.289282384034047, -0.291700015546435, -0.294117647058824, + -0.206282539498401, -0.208216644708311, -0.210150749918222, + -0.212084855128132, -0.214018960338043, -0.215953065547954, + -0.217887170757864, -0.219821275967775, -0.221755381177685, + -0.223689486387596, -0.225623591597506, -0.227557696807417, + -0.229491802017327, -0.231425907227238, -0.233360012437148, + -0.235294117647059, -0.154711904623801, -0.156162483531234, + -0.157613062438666, -0.159063641346099, -0.160514220253532, + -0.161964799160965, -0.163415378068398, -0.164865956975831, + -0.166316535883264, -0.167767114790697, -0.16921769369813, + -0.170668272605563, -0.172118851512995, -0.173569430420428, + -0.175020009327861, -0.176470588235294, -0.1031412697492, + -0.104108322354156, -0.105075374959111, -0.106042427564066, + -0.107009480169021, -0.107976532773977, -0.108943585378932, + -0.109910637983887, -0.110877690588843, -0.111844743193798, + -0.112811795798753, -0.113778848403708, -0.114745901008664, + -0.115712953613619, -0.116680006218574, -0.117647058823529, + -0.0515706348746002, -0.0520541611770778, -0.0525376874795554, + -0.0530212137820331, -0.0535047400845107, -0.0539882663869884, + -0.054471792689466, -0.0549553189919436, -0.0554388452944213, + -0.0559223715968989, -0.0564058978993765, -0.0568894242018542, + -0.0573729505043318, -0.0578564768068094, -0.0583400031092871, + -0.0588235294117647, -1.99773467836602, -1.92787671826128, + -1.99094384514617, -1.92098664101906, -1.97964288376187, + -1.90989963895713, -1.96385739452541, -1.89463953458834, + -1.94362313664708, -1.87523960384447, -1.91898594722899, + -1.85174250069554, -1.89000163742934, -1.82420016052488, + -1.85673586603215, -1.79267368247874, -1.81926399070904, + -1.75723319105708, -1.77767089730985, -1.71795767725908, + -1.73205080756888, -1.67493481964303, -1.68250706566236, + -1.62826078570627, -1.62915190410067, -1.57804001403482, + -1.57210618948558, -1.52438497771646, -1.51149914870852, + -1.46741592955294, -1.44746807621014, -1.40726062964875, + -1.38015802296422, -1.34107716978296, -1.30972146789057, + -1.27198432627191, -1.23631797244121, -1.20013057991125, + -1.1601138191424, -1.12567066582956, -1.0812816349112, -1.04876522296358, + -1, -0.969580430159261, -0.916453043454821, -0.888287629723321, + -0.830830026003773, -0.805062939277754, -0.743324911320656, + -0.72008685279679, -0.654135926634844, -0.633543831729984, + -0.563465113682859, -0.545621887137712, -0.471517871018856, + -0.456512153785644, -0.378502488720821, -0.36640845716302, + -0.28462967654657, -0.275506874405584, -0.190112086608367, + -0.184005290117803, -0.0951638316474855, -0.0921029481005853, + -3.67394039744206e-16, -3.54637302253088e-16, -1.8596624748649, + -1.85267548875376, -1.84179741167721, -1.82705033017919, + -1.80846509534309, -1.78608125290405, -1.75994695366523, + -1.7301188444207, -1.69666193963224, -1.65964947415068, + -1.61916273731544, -1.57529088880796, -1.52813075667641, + -1.47778661798897, -1.42436996261279, -1.36799924065351, + -1.30291586608831, -1.23513511739722, -1.16479465544081, + -1.0920379396535, -1.01701390306178, -0.939876614903009, + -0.860784931609033, -0.779902136945289, -0.697395572120544, + -0.613436256705238, -0.528198501217156, -0.441859512252038, + -0.354598991053639, -0.266598726432621, -0.178042182956429, + -0.0891140853430239, -3.42180723291172e-16, -1.79309194817686, + -1.78601038835028, -1.7753362019221, -1.76108978129798, + -1.74329961114295, -1.72200220385453, -1.6972420168504, + -1.66907135185804, -1.63755023643449, -1.60274628798466, + -1.5647345605861, -1.52359737496744, -1.47942413202542, + -1.43231111030311, -1.38236124788806, -1.32968390922441, + -1.26567411188027, -1.19917384126649, -1.1303101990299, + -1.05921564061421, -0.986027675205816, -0.910888554231246, + -0.833944949111957, -0.755347619006377, -0.675251069291918, + -0.593813201560606, -0.511194955921192, -0.427559946418037, + -0.343074090392676, -0.257905232627681, -0.172222765124244, + -0.0861972433748014, -3.30024302858459e-16, -1.72816513819717, + -1.72099133980861, -1.71051600969182, -1.6967578879447, + -1.67974315124404, -1.65950535354697, -1.63608535008037, + -1.60953120479075, -1.57989808146386, -1.54724811876101, + -1.51165028945502, -1.47318024418472, -1.43192014008187, + -1.38795845465887, -1.34138978537876, -1.29231463536147, + -1.22935190715886, -1.16410049787973, -1.09667721067852, + -1.0272037687117, -0.955806539395675, -0.88261624814397, + -0.807767682232093, -0.731399385461018, -0.653653344310913, + -0.574674666296089, -0.49461125124982, -0.41361345628364, + -0.331833755180131, -0.249426392990765, -0.166547036621249, + -0.0833524221959177, -3.1816804095495e-16, -1.66488204492582, + -1.65761834312875, -1.64733683498635, -1.63405465011935, + -1.61779571564638, -1.59859070198137, -1.57647695335516, + -1.55149840321884, -1.52370547472032, -1.49315496647972, + -1.4599099239222, -1.42403949645978, -1.38561878084574, + -1.34472865105626, -1.30145557508488, -1.25589141906468, + -1.19394925192406, -1.12991508723695, -1.06389569038667, + -0.996002323945955, -0.926350495631361, -0.855059696641182, + -0.78225313096944, -0.708057436309213, -0.632602397177528, + -0.556020650911687, -0.478447387203039, -0.400020041848849, + -0.320877985416006, -0.241162207521871, -0.161014997447444, + -0.0805796218063728, -3.06611937580643e-16, -1.60324266836283, + -1.59589139831071, -1.5857986778057, -1.57298006782193, + -1.55745730434995, -1.53925824915773, -1.51841682667476, + -1.4949729471423, -1.46897241620389, -1.44046683114081, + -1.40951346398762, -1.37617513179264, -1.34052005431705, + -1.30262169949528, -1.26255861700643, -1.22041426033404, + -1.15946614617589, -1.09661760933813, -1.03196563815435, + -0.965611306316984, -0.897659543912873, -0.828218899722882, + -0.757401295324, -0.685321771550961, -0.612098227891764, + -0.537851155407398, -0.46270336378085, -0.386779703113662, + -0.310206781100299, -0.233112676221001, -0.155626647602829, + -0.0778788422061668, -2.95355992735538e-16, -1.54324700850817, + -1.53581050535449, -1.52590153814987, -1.51353414105244, + -1.49872791735476, -1.48150799507606, -1.46190497003917, + -1.43995483656114, -1.41569890591457, -1.38918371274427, + -1.36046090965131, -1.32958715018328, -1.29662396049579, + -1.26163759997592, -1.22469891114341, -1.18588315916955, + -1.12590258991433, -1.06420806418328, -1.00088705398156, + -0.936030715824786, -0.869733684240211, -0.802093857389071, + -0.733212175295771, -0.663192391186263, -0.59214083645362, + -0.520166179783224, -0.447379180983253, -0.373892440078081, + -0.299820142233012, -0.225277799088154, -0.150381987087403, + -0.0752500833952996, -2.84400206419637e-16, -1.48489506536187, + -1.47737566426008, -1.46764541601885, -1.45571686981088, + -1.44160755466081, -1.42533993973636, -1.40694138344838, + -1.38644407147535, -1.36388494385235, -1.3393056112901, + -1.31275226091325, -1.28427555163172, -1.25393049938197, + -1.22177635249819, -1.18787645749581, -1.15229811557121, + -1.09325858313938, -1.03268645177239, -0.970659937868292, + -0.90726055246936, -0.842572916613376, -0.776684569639747, + -0.709685770884753, -0.641669295215118, -0.572730222863096, + -0.502965724039165, -0.432474838810247, -0.361358252742105, + -0.289718068814143, -0.21765757612333, -0.145281015901168, + -0.0726933453737712, -2.73744578632938e-16, -1.42818683892391, + -1.42058687502748, -1.41103031141265, -1.39952825409725, + -1.3860962162681, -1.37075408313861, -1.35352606690241, + -1.33444065188493, -1.31353053001724, -1.2908325267783, + -1.26638751777344, -1.24024033613795, -1.21243967097557, + -1.18303795706209, -1.15209125606363, -1.11965912953902, + -1.06153412585106, -1.00205277210548, -0.941284289814556, + -0.879300816250707, -0.816177241032367, -0.751991036474911, + -0.686822082090947, -0.620752483637526, -0.553866387120193, + -0.48624978817522, -0.417990337261833, -0.349177141105733, + -0.279900560843693, -0.210252007326529, -0.140323734044122, + -0.0702086281415816, -2.63389109375442e-16, -1.3731223291943, + -1.3654441376567, -1.35605622433127, -1.34496829391156, + -1.33219390217663, -1.31775042528283, -1.30165902040125, + -1.28394457778989, -1.26463566440923, -1.24376445920887, + -1.22136668023189, -1.19748150370196, -1.17215147527661, + -1.14542241366761, -1.11734330684688, -1.08796620107298, + -1.03072921804936, -0.972307025182535, -0.912760109820348, + -0.852151507168826, -0.790546657497184, -0.728013257894563, + -0.664621108914354, -0.600441956453488, -0.53554932922491, + -0.470018372191389, -0.403925676338011, -0.337349105168966, + -0.270367618321662, -0.203061092697752, -0.135510141516265, + -0.0677959316987309, -2.53333798647149e-16, -1.31970153617303, + -1.31194745214773, -1.3027231547747, -1.2920369892538, -1.27990061238639, + -1.26632896616902, -1.25134024394491, -1.23495584919023, + -1.21720034702832, -1.19810140858181, -1.1776897482886, + -1.15599905432377, -1.13306591228508, -1.10892972231476, + -1.08363260984556, -1.05721933017309, -1.00084385973427, + -0.943449211003558, -0.885087397885669, -0.825812625223718, + -0.765681166007828, -0.704751233898704, -0.643082851354972, + -0.580737713663003, -0.517779049177248, -0.454271476087672, + -0.390280856038781, -0.325874144931805, -0.261119241248049, + -0.196084832236998, -0.130840238317599, -0.065455256045219, + -2.43578646448058e-16, -1.26792445986011, -1.26009681850058, + -1.25103110274296, -1.24073434012396, -1.22921634689739, + -1.21648970579716, -1.20256973753337, -1.18747446608593, + -1.17122457787452, -1.15384337489713, -1.13535672194356, + -1.11579298800337, -1.09518298200098, -1.07355988300353, + -1.05095916505966, -1.02741851683935, -0.971878050905798, + -0.915479329568549, -0.858266154010519, -0.800284170415383, + -0.741580766564298, -0.682204964487332, -0.622207309412801, + -0.561639755266072, -0.500555546977205, -0.43900909986407, + -0.377055876364142, -0.314752260394248, -0.252155429622856, + -0.189323225944267, -0.126314024448122, -0.0631866011810459, + -2.3412365277817e-16, -1.21779110025554, -1.20989223671524, + -1.20098006823603, -1.19106034652206, -1.18014110570963, + -1.16823264416727, -1.15534750116664, -1.14150042847702, + -1.12670835694783, -1.11099035815481, -1.09436760119678, + -1.07686330474076, -1.05850268442431, -1.03931289573393, + -1.01932297248919, -0.998563761071767, -0.943831791563947, + -0.88839738087751, -0.832296378194897, -0.77556614274382, + -0.718245459166594, -0.660374449660448, -0.601994483087843, + -0.543148081262693, -0.483878822624784, -0.424231243520582, + -0.364250737314095, -0.303983451556297, -0.243476183446081, + -0.182776273819559, -0.121931499907835, -0.0609899671062116, + -2.24968817637486e-16, -1.16930145735932, -1.16133370679172, + -1.15257005125392, -1.14301500844809, -1.13267488882311, + -1.12155778127935, -1.10967353484472, -1.09703373636347, + -1.08365168424824, -1.06954235835487, -1.05472238604825, + -1.03921000453594, -1.02302501955507, -1.00618876050596, + -0.988724032134142, -0.97065506287033, -0.916705081708714, + -0.862203364930439, -0.807178070438804, -0.75165854220903, + -0.695675243814717, -0.639259689418052, -0.582444372380096, + -0.525262691652869, -0.467748876119982, -0.409937907057209, + -0.35186543888864, -0.29356771841795, -0.235081502717725, + -0.176443975862874, -0.117692664696737, -0.0588653538207162, + -2.16114141026003e-16, -1.12245553117144, -1.11442122873, + -1.10580105179662, -1.09659832590205, -1.08681769623783, + -1.07646511713339, -1.06554783856762, -1.0540743897453, + -1.04205455977575, -1.0294993754973, -1.01642107649797, + -1.00283308738891, -0.988749987393267, -0.974187477319609, + -0.959162343994519, -0.943692422235043, -0.890497921340099, + -0.836897281727336, -0.782911230742239, -0.728561368811012, + -0.673870120508666, -0.618860683760144, -0.563556977289561, + -0.507983586436597, -0.452165707462801, -0.39612909047395, + -0.339899981087776, -0.283505060979208, -0.226971387437788, + -0.170326332074213, -0.11359751881483, -0.0568127613245596, + -2.07559622943724e-16, -1.0772533216919, -1.06915480253011, + -1.06067306986414, -1.05181029888394, -1.04256952795378, + -1.03295465172939, -1.02297041233532, -1.01262238862251, + -1.00191698353037, -0.990861409582094, -0.979463672545954, + -0.96773255329967, -0.955677587938894, -0.943309046174888, + -0.930637908070322, -0.917675839165906, -0.865210310458102, + -0.812479131268202, -0.759495859105203, -0.706274622549767, + -0.652830089248441, -0.599177432686724, -0.545332297816237, + -0.491310765613879, -0.437129316653241, -0.382804793770805, + -0.328354363911504, -0.273795479240072, -0.21914583760627, + -0.164423342453575, -0.109646062262112, -0.0548321896177418, + -1.99305263390648e-16, -1.03369482892072, -1.02553442819203, + -1.01718610545648, -1.00865092739377, -0.999930383970972, + -0.991026385067353, -0.981941256147836, -0.972677732995088, + -0.963238955512094, -0.953628460609263, -0.943850174192191, + -0.933908402268222, -0.923807821191953, -0.913553467071793, + -0.90315072436155, -0.89260531366292, -0.840842249062723, + -0.788948913553036, -0.736931955527695, -0.684798303425294, + -0.632555150034043, -0.580209936197792, -0.527770333960126, + -0.475244229184715, -0.422639703691301, -0.369965016947774, + -0.317228587359824, -0.26443897320054, -0.211604853223171, + -0.15873500700096, -0.105838295038584, -0.0529236387002629, + -1.91351062366774e-16, -0.99178005285788, -0.983560105715761, + -0.975340158573641, -0.967120211431521, -0.958900264289401, + -0.950680317147282, -0.942460370005162, -0.934240422863042, + -0.926020475720922, -0.917800528578803, -0.909580581436683, + -0.901360634294563, -0.893140687152444, -0.884920740010324, + -0.876700792868204, -0.868480845726084, -0.817393737153962, + -0.766306628581839, -0.715219520009716, -0.664132411437594, + -0.613045302865471, -0.561958194293349, -0.510871085721226, + -0.459783977149104, -0.408696868576981, -0.357609760004858, + -0.306522651432736, -0.255435542860613, -0.204348434288491, + -0.153261325716368, -0.102174217144245, -0.0510871085721228, + -1.83697019872103e-16, -0.825130157993604, -0.773559523119004, + -0.721988888244403, -0.670418253369803, -0.618847618495203, + -0.567276983620603, -0.515706348746002, -0.464135713871402, + -0.412565078996802, -0.360994444122202, -0.309423809247601, + -0.257853174373001, -0.206282539498401, -0.154711904623801, + -0.103141269749201, -0.0515706348746004, -1.72215956130097e-16, + -0.832866578833246, -0.780812417656168, -0.72875825647909, + -0.676704095302012, -0.624649934124934, -0.572595772947856, + -0.520541611770779, -0.468487450593701, -0.416433289416623, + -0.364379128239545, -0.312324967062467, -0.260270805885389, + -0.208216644708312, -0.156162483531234, -0.104108322354156, + -0.052054161177078, -1.6073489238809e-16, -0.840602999672888, + -0.788065312193333, -0.735527624713777, -0.682989937234222, + -0.630452249754666, -0.577914562275111, -0.525376874795555, + -0.472839187316, -0.420301499836444, -0.367763812356889, + -0.315226124877333, -0.262688437397778, -0.210150749918222, + -0.157613062438667, -0.105075374959111, -0.0525376874795556, + -1.49253828646084e-16, -0.84833942051253, -0.795318206730497, + -0.742296992948464, -0.689275779166431, -0.636254565384397, + -0.583233351602364, -0.530212137820331, -0.477190924038298, + -0.424169710256265, -0.371148496474232, -0.318127282692199, + -0.265106068910166, -0.212084855128133, -0.159063641346099, + -0.106042427564066, -0.0530212137820333, -1.37772764904077e-16, + -0.856075841352172, -0.802571101267662, -0.749066361183151, + -0.69556162109864, -0.642056881014129, -0.588552140929618, + -0.535047400845108, -0.481542660760597, -0.428037920676086, + -0.374533180591575, -0.321028440507065, -0.267523700422554, + -0.214018960338043, -0.160514220253532, -0.107009480169022, + -0.0535047400845109, -1.26291701162071e-16, -0.863812262191814, + -0.809823995804826, -0.755835729417838, -0.701847463030849, + -0.64785919664386, -0.593870930256872, -0.539882663869884, + -0.485894397482896, -0.431906131095907, -0.377917864708919, + -0.32392959832193, -0.269941331934942, -0.215953065547954, + -0.161964799160965, -0.107976532773977, -0.0539882663869885, + -1.14810637420064e-16, -0.871548683031456, -0.81707689034199, + -0.762605097652524, -0.708133304963058, -0.653661512273592, + -0.599189719584126, -0.54471792689466, -0.490246134205194, + -0.435774341515728, -0.381302548826262, -0.326830756136796, + -0.27235896344733, -0.217887170757864, -0.163415378068398, + -0.108943585378932, -0.0544717926894661, -1.03329573678058e-16, + -0.879285103871098, -0.824329784879155, -0.769374465887211, + -0.714419146895267, -0.659463827903324, -0.60450850891138, + -0.549553189919437, -0.494597870927493, -0.439642551935549, + -0.384687232943605, -0.329731913951662, -0.274776594959718, + -0.219821275967775, -0.164865956975831, -0.109910637983887, + -0.0549553189919438, -9.18485099360515e-17, -0.88702152471074, + -0.831582679416319, -0.776143834121898, -0.720704988827477, + -0.665266143533055, -0.609827298238634, -0.554388452944213, + -0.498949607649792, -0.44351076235537, -0.388071917060949, + -0.332633071766528, -0.277194226472107, -0.221755381177685, + -0.166316535883264, -0.110877690588843, -0.0554388452944214, + -8.03674461940451e-17, -0.894757945550383, -0.838835573953484, + -0.782913202356585, -0.726990830759686, -0.671068459162787, + -0.615146087565888, -0.559223715968989, -0.50330134437209, + -0.447378972775191, -0.391456601178292, -0.335534229581393, + -0.279611857984495, -0.223689486387596, -0.167767114790697, + -0.111844743193798, -0.055922371596899, -6.88863824520386e-17, + -0.902494366390025, -0.846088468490648, -0.789682570591272, + -0.733276672691895, -0.676870774792519, -0.620464876893142, + -0.564058978993766, -0.507653081094389, -0.451247183195012, + -0.394841285295636, -0.338435387396259, -0.282029489496883, + -0.225623591597506, -0.16921769369813, -0.112811795798753, + -0.0564058978993766, -5.74053187100322e-17, -0.910230787229667, + -0.853341363027812, -0.796451938825959, -0.739562514624104, + -0.68267309042225, -0.625783666220396, -0.568894242018542, + -0.512004817816688, -0.455115393614833, -0.398225969412979, + -0.341336545211125, -0.284447121009271, -0.227557696807417, + -0.170668272605563, -0.113778848403708, -0.0568894242018542, + -4.59242549680257e-17, -0.917967208069309, -0.860594257564977, + -0.803221307060645, -0.745848356556313, -0.688475406051982, + -0.63110245554765, -0.573729505043318, -0.516356554538986, + -0.458983604034654, -0.401610653530323, -0.344237703025991, + -0.286864752521659, -0.229491802017327, -0.172118851512995, + -0.114745901008664, -0.0573729505043318, -3.44431912260193e-17, + -0.925703628908951, -0.867847152102142, -0.809990675295332, + -0.752134198488523, -0.694277721681713, -0.636421244874904, + -0.578564768068094, -0.520708291261285, -0.462851814454476, + -0.404995337647666, -0.347138860840857, -0.289282384034047, + -0.231425907227238, -0.173569430420428, -0.115712953613619, + -0.0578564768068095, -2.29621274840129e-17, -0.933440049748593, + -0.875100046639306, -0.816760043530019, -0.758420040420732, + -0.700080037311445, -0.641740034202158, -0.583400031092871, + -0.525060027983584, -0.466720024874297, -0.40838002176501, + -0.350040018655722, -0.291700015546435, -0.233360012437148, + -0.175020009327861, -0.116680006218574, -0.0583400031092871, + -1.14810637420064e-17, 0.0951638316474848, 0.0921029481005846, + 0.190112086608364, 0.1840052901178, 0.28462967654657, 0.275506874405583, + 0.37850248872082, 0.36640845716302, 0.471517871018853, 0.456512153785642, + 0.563465113682859, 0.545621887137711, 0.654135926634843, + 0.633543831729983, 0.743324911320654, 0.720086852796788, + 0.830830026003772, 0.805062939277753, 0.91645304345482, + 0.888287629723321, 0.999999999999998, 0.969580430159259, + 1.08128163491119, 1.04876522296357, 1.1601138191424, 1.12567066582956, + 1.23631797244121, 1.20013057991125, 1.30972146789057, 1.27198432627191, + 1.38015802296422, 1.34107716978296, 1.44746807621014, 1.40726062964875, + 1.51149914870852, 1.46741592955294, 1.57210618948557, 1.52438497771646, + 1.62915190410067, 1.57804001403482, 1.68250706566236, 1.62826078570626, + 1.73205080756888, 1.67493481964303, 1.77767089730985, 1.71795767725908, + 1.81926399070904, 1.75723319105708, 1.85673586603214, 1.79267368247873, + 1.89000163742934, 1.82420016052488, 1.91898594722899, 1.85174250069554, + 1.94362313664708, 1.87523960384447, 1.96385739452541, 1.89463953458834, + 1.97964288376187, 1.90989963895713, 1.99094384514617, 1.92098664101906, + 1.99773467836602, 1.92787671826128, 0.0891140853430233, + 0.178042182956426, 0.26659872643262, 0.354598991053638, + 0.441859512252036, 0.528198501217156, 0.613436256705237, + 0.697395572120542, 0.779902136945288, 0.860784931609033, + 0.939876614903007, 1.01701390306178, 1.0920379396535, 1.16479465544081, + 1.23513511739721, 1.3029158660883, 1.36799924065351, 1.42436996261279, + 1.47778661798897, 1.5281307566764, 1.57529088880796, 1.61916273731544, + 1.65964947415068, 1.69666193963224, 1.7301188444207, 1.75994695366523, + 1.78608125290405, 1.80846509534309, 1.82705033017919, 1.84179741167721, + 1.85267548875376, 1.8596624748649, 0.0861972433748008, 0.172222765124242, + 0.257905232627681, 0.343074090392675, 0.427559946418035, + 0.511194955921192, 0.593813201560606, 0.675251069291916, + 0.755347619006376, 0.833944949111957, 0.910888554231244, + 0.986027675205814, 1.05921564061421, 1.1303101990299, 1.19917384126649, + 1.26567411188027, 1.32968390922441, 1.38236124788806, 1.43231111030311, + 1.47942413202542, 1.52359737496744, 1.5647345605861, 1.60274628798466, + 1.63755023643449, 1.66907135185804, 1.6972420168504, 1.72200220385453, + 1.74329961114295, 1.76108978129798, 1.7753362019221, 1.78601038835028, + 1.79309194817686, 0.0833524221959171, 0.166547036621247, + 0.249426392990764, 0.331833755180131, 0.413613456283639, + 0.494611251249819, 0.574674666296089, 0.653653344310911, + 0.731399385461018, 0.807767682232092, 0.882616248143968, + 0.955806539395674, 1.0272037687117, 1.09667721067852, 1.16410049787973, + 1.22935190715886, 1.29231463536147, 1.34138978537876, 1.38795845465887, + 1.43192014008187, 1.47318024418472, 1.51165028945502, 1.547248118761, + 1.57989808146386, 1.60953120479075, 1.63608535008037, 1.65950535354697, + 1.67974315124404, 1.6967578879447, 1.71051600969182, 1.72099133980861, + 1.72816513819717, 0.0805796218063722, 0.161014997447442, + 0.24116220752187, 0.320877985416005, 0.400020041848847, + 0.478447387203039, 0.556020650911686, 0.632602397177527, + 0.708057436309212, 0.78225313096944, 0.855059696641181, + 0.926350495631359, 0.996002323945954, 1.06389569038667, 1.12991508723695, + 1.19394925192406, 1.25589141906468, 1.30145557508488, 1.34472865105626, + 1.38561878084574, 1.42403949645978, 1.4599099239222, 1.49315496647972, + 1.52370547472032, 1.55149840321884, 1.57647695335516, 1.59859070198137, + 1.61779571564638, 1.63405465011935, 1.64733683498635, 1.65761834312875, + 1.66488204492582, 0.0778788422061662, 0.155626647602827, 0.233112676221, + 0.310206781100299, 0.386779703113661, 0.46270336378085, + 0.537851155407398, 0.612098227891762, 0.685321771550961, + 0.757401295323999, 0.828218899722881, 0.897659543912871, + 0.965611306316983, 1.03196563815435, 1.09661760933813, 1.15946614617589, + 1.22041426033404, 1.26255861700643, 1.30262169949528, 1.34052005431705, + 1.37617513179264, 1.40951346398762, 1.44046683114081, 1.46897241620389, + 1.4949729471423, 1.51841682667476, 1.53925824915773, 1.55745730434995, + 1.57298006782193, 1.5857986778057, 1.59589139831071, 1.60324266836283, + 0.075250083395299, 0.150381987087402, 0.225277799088153, + 0.299820142233011, 0.37389244007808, 0.447379180983252, + 0.520166179783224, 0.592140836453618, 0.663192391186262, + 0.73321217529577, 0.802093857389069, 0.86973368424021, 0.936030715824785, + 1.00088705398156, 1.06420806418328, 1.12590258991433, 1.18588315916955, + 1.22469891114341, 1.26163759997592, 1.29662396049579, 1.32958715018328, + 1.36046090965131, 1.38918371274427, 1.41569890591457, 1.43995483656114, + 1.46190497003917, 1.48150799507606, 1.49872791735476, 1.51353414105244, + 1.52590153814987, 1.53581050535449, 1.54324700850817, 0.0726933453737706, + 0.145281015901166, 0.217657576123329, 0.289718068814142, + 0.361358252742103, 0.432474838810247, 0.502965724039164, + 0.572730222863095, 0.641669295215117, 0.709685770884753, + 0.776684569639746, 0.842572916613375, 0.907260552469359, + 0.970659937868292, 1.03268645177239, 1.09325858313938, 1.15229811557121, + 1.18787645749581, 1.22177635249819, 1.25393049938197, 1.28427555163172, + 1.31275226091325, 1.3393056112901, 1.36388494385235, 1.38644407147535, + 1.40694138344838, 1.42533993973636, 1.44160755466081, 1.45571686981088, + 1.46764541601885, 1.47737566426008, 1.48489506536187, 0.0702086281415811, + 0.14032373404412, 0.210252007326529, 0.279900560843692, + 0.349177141105732, 0.417990337261833, 0.486249788175219, + 0.553866387120192, 0.620752483637526, 0.686822082090947, + 0.75199103647491, 0.816177241032366, 0.879300816250706, + 0.941284289814556, 1.00205277210548, 1.06153412585106, 1.11965912953902, + 1.15209125606363, 1.18303795706209, 1.21243967097557, 1.24024033613795, + 1.26638751777344, 1.2908325267783, 1.31353053001724, 1.33444065188493, + 1.35352606690241, 1.37075408313861, 1.3860962162681, 1.39952825409725, + 1.41103031141265, 1.42058687502748, 1.42818683892391, 0.0677959316987304, + 0.135510141516264, 0.203061092697751, 0.270367618321661, + 0.337349105168965, 0.403925676338011, 0.470018372191388, + 0.535549329224909, 0.600441956453488, 0.664621108914353, + 0.728013257894562, 0.790546657497183, 0.852151507168826, + 0.912760109820348, 0.972307025182534, 1.03072921804935, 1.08796620107298, + 1.11734330684688, 1.14542241366761, 1.17215147527661, 1.19748150370196, + 1.22136668023189, 1.24376445920887, 1.26463566440923, 1.28394457778989, + 1.30165902040125, 1.31775042528283, 1.33219390217663, 1.34496829391156, + 1.35605622433127, 1.3654441376567, 1.3731223291943, 0.0654552560452185, + 0.130840238317598, 0.196084832236997, 0.261119241248049, + 0.325874144931804, 0.390280856038781, 0.454271476087672, + 0.517779049177247, 0.580737713663003, 0.643082851354971, + 0.704751233898703, 0.765681166007827, 0.825812625223718, + 0.885087397885669, 0.943449211003557, 1.00084385973427, 1.05721933017309, + 1.08363260984556, 1.10892972231476, 1.13306591228508, 1.15599905432377, + 1.1776897482886, 1.19810140858181, 1.21720034702832, 1.23495584919023, + 1.25134024394491, 1.26632896616902, 1.27990061238639, 1.29203698925379, + 1.3027231547747, 1.31194745214773, 1.31970153617303, 0.0631866011810454, + 0.126314024448121, 0.189323225944266, 0.252155429622855, + 0.314752260394247, 0.377055876364142, 0.43900909986407, + 0.500555546977205, 0.561639755266071, 0.622207309412801, + 0.682204964487331, 0.741580766564297, 0.800284170415382, + 0.858266154010519, 0.915479329568549, 0.971878050905798, + 1.02741851683935, 1.05095916505966, 1.07355988300353, 1.09518298200098, + 1.11579298800337, 1.13535672194356, 1.15384337489713, 1.17122457787452, + 1.18747446608593, 1.20256973753337, 1.21648970579716, 1.22921634689739, + 1.24073434012396, 1.25103110274296, 1.26009681850058, 1.26792445986011, + 0.0609899671062112, 0.121931499907834, 0.182776273819558, + 0.243476183446081, 0.303983451556296, 0.364250737314095, + 0.424231243520582, 0.483878822624783, 0.543148081262693, + 0.601994483087842, 0.660374449660447, 0.718245459166594, + 0.77556614274382, 0.832296378194897, 0.88839738087751, 0.943831791563947, + 0.998563761071767, 1.01932297248919, 1.03931289573393, 1.05850268442431, + 1.07686330474076, 1.09436760119678, 1.11099035815481, 1.12670835694783, + 1.14150042847702, 1.15534750116664, 1.16823264416727, 1.18014110570963, + 1.19106034652206, 1.20098006823603, 1.20989223671524, 1.21779110025554, + 0.0588653538207158, 0.117692664696737, 0.176443975862874, + 0.235081502717725, 0.293567718417949, 0.35186543888864, + 0.409937907057208, 0.467748876119982, 0.525262691652868, + 0.582444372380095, 0.639259689418051, 0.695675243814716, + 0.751658542209029, 0.807178070438803, 0.862203364930438, + 0.916705081708713, 0.970655062870329, 0.988724032134141, + 1.00618876050596, 1.02302501955507, 1.03921000453594, 1.05472238604825, + 1.06954235835487, 1.08365168424824, 1.09703373636347, 1.10967353484472, + 1.12155778127935, 1.13267488882311, 1.14301500844809, 1.15257005125392, + 1.16133370679171, 1.16930145735932, 0.0568127613245592, + 0.113597518814829, 0.170326332074213, 0.226971387437788, + 0.283505060979208, 0.339899981087776, 0.396129090473949, + 0.452165707462801, 0.507983586436597, 0.56355697728956, + 0.618860683760144, 0.673870120508666, 0.728561368811012, + 0.782911230742239, 0.836897281727336, 0.890497921340098, + 0.943692422235042, 0.959162343994519, 0.974187477319609, + 0.988749987393267, 1.00283308738891, 1.01642107649797, 1.0294993754973, + 1.04205455977575, 1.0540743897453, 1.06554783856762, 1.07646511713339, + 1.08681769623783, 1.09659832590205, 1.10580105179662, 1.11442122873, + 1.12245553117144, 0.0548321896177414, 0.109646062262111, + 0.164423342453574, 0.21914583760627, 0.273795479240071, + 0.328354363911504, 0.382804793770804, 0.43712931665324, + 0.491310765613879, 0.545332297816237, 0.599177432686724, + 0.652830089248441, 0.706274622549766, 0.759495859105203, + 0.812479131268202, 0.865210310458101, 0.917675839165906, + 0.930637908070322, 0.943309046174887, 0.955677587938894, + 0.96773255329967, 0.979463672545954, 0.990861409582094, 1.00191698353037, + 1.01262238862251, 1.02297041233532, 1.03295465172939, 1.04256952795378, + 1.05181029888394, 1.06067306986414, 1.06915480253011, 1.0772533216919, + 0.0529236387002625, 0.105838295038583, 0.158735007000959, + 0.211604853223171, 0.26443897320054, 0.317228587359824, + 0.369965016947774, 0.4226397036913, 0.475244229184714, 0.527770333960126, + 0.580209936197792, 0.632555150034043, 0.684798303425294, + 0.736931955527695, 0.788948913553036, 0.840842249062722, + 0.89260531366292, 0.90315072436155, 0.913553467071792, 0.923807821191953, + 0.933908402268221, 0.943850174192191, 0.953628460609263, + 0.963238955512094, 0.972677732995088, 0.981941256147836, + 0.991026385067353, 0.999930383970971, 1.00865092739377, 1.01718610545648, + 1.02553442819203, 1.03369482892072, 0.0510871085721224, + 0.102174217144245, 0.153261325716368, 0.20434843428849, + 0.255435542860613, 0.306522651432735, 0.357609760004858, + 0.408696868576981, 0.459783977149103, 0.510871085721226, + 0.561958194293348, 0.613045302865471, 0.664132411437594, + 0.715219520009716, 0.766306628581839, 0.817393737153961, + 0.868480845726084, 0.876700792868204, 0.884920740010324, + 0.893140687152443, 0.901360634294563, 0.909580581436683, + 0.917800528578803, 0.926020475720922, 0.934240422863042, + 0.942460370005162, 0.950680317147282, 0.958900264289401, + 0.967120211431521, 0.975340158573641, 0.98356010571576, 0.99178005285788, + 0.825130157993604, 0.832866578833246, 0.840602999672888, + 0.84833942051253, 0.856075841352172, 0.863812262191814, + 0.871548683031456, 0.879285103871098, 0.88702152471074, + 0.894757945550382, 0.902494366390025, 0.910230787229667, + 0.917967208069309, 0.925703628908951, 0.933440049748593, + 0.773559523119003, 0.780812417656168, 0.788065312193332, + 0.795318206730497, 0.802571101267661, 0.809823995804826, + 0.81707689034199, 0.824329784879155, 0.831582679416319, + 0.838835573953484, 0.846088468490648, 0.853341363027813, + 0.860594257564977, 0.867847152102142, 0.875100046639306, + 0.721988888244403, 0.72875825647909, 0.735527624713777, + 0.742296992948464, 0.749066361183151, 0.755835729417837, + 0.762605097652524, 0.769374465887211, 0.776143834121898, + 0.782913202356585, 0.789682570591271, 0.796451938825958, + 0.803221307060645, 0.809990675295332, 0.816760043530019, + 0.670418253369803, 0.676704095302012, 0.682989937234221, + 0.68927577916643, 0.69556162109864, 0.701847463030849, 0.708133304963058, + 0.714419146895268, 0.720704988827477, 0.726990830759686, + 0.733276672691895, 0.739562514624104, 0.745848356556313, + 0.752134198488523, 0.758420040420732, 0.618847618495203, + 0.624649934124934, 0.630452249754666, 0.636254565384398, + 0.642056881014129, 0.647859196643861, 0.653661512273592, + 0.659463827903324, 0.665266143533055, 0.671068459162787, + 0.676870774792519, 0.68267309042225, 0.688475406051982, + 0.694277721681713, 0.700080037311445, 0.567276983620603, + 0.572595772947856, 0.57791456227511, 0.583233351602364, + 0.588552140929618, 0.593870930256872, 0.599189719584126, + 0.60450850891138, 0.609827298238634, 0.615146087565888, + 0.620464876893142, 0.625783666220396, 0.63110245554765, + 0.636421244874904, 0.641740034202158, 0.515706348746002, + 0.520541611770778, 0.525376874795555, 0.530212137820331, + 0.535047400845108, 0.539882663869884, 0.54471792689466, + 0.549553189919436, 0.554388452944213, 0.559223715968989, + 0.564058978993766, 0.568894242018542, 0.573729505043318, + 0.578564768068095, 0.583400031092871, 0.464135713871402, + 0.468487450593701, 0.472839187315999, 0.477190924038298, + 0.481542660760597, 0.485894397482895, 0.490246134205194, + 0.494597870927493, 0.498949607649792, 0.50330134437209, + 0.507653081094389, 0.512004817816687, 0.516356554538986, + 0.520708291261285, 0.525060027983584, 0.412565078996802, + 0.416433289416623, 0.420301499836444, 0.424169710256265, + 0.428037920676086, 0.431906131095907, 0.435774341515728, + 0.439642551935549, 0.44351076235537, 0.447378972775191, + 0.451247183195012, 0.455115393614833, 0.458983604034654, + 0.462851814454475, 0.466720024874297, 0.360994444122201, + 0.364379128239545, 0.367763812356888, 0.371148496474232, + 0.374533180591575, 0.377917864708919, 0.381302548826262, + 0.384687232943605, 0.388071917060949, 0.391456601178292, + 0.394841285295636, 0.398225969412979, 0.401610653530323, + 0.404995337647666, 0.40838002176501, 0.309423809247601, + 0.312324967062467, 0.315226124877333, 0.318127282692199, + 0.321028440507065, 0.32392959832193, 0.326830756136796, + 0.329731913951662, 0.332633071766528, 0.335534229581393, + 0.338435387396259, 0.341336545211125, 0.344237703025991, + 0.347138860840857, 0.350040018655722, 0.257853174373001, + 0.260270805885389, 0.262688437397777, 0.265106068910166, + 0.267523700422554, 0.269941331934942, 0.27235896344733, + 0.274776594959718, 0.277194226472106, 0.279611857984495, + 0.282029489496883, 0.284447121009271, 0.286864752521659, + 0.289282384034047, 0.291700015546435, 0.206282539498401, + 0.208216644708311, 0.210150749918222, 0.212084855128132, + 0.214018960338043, 0.215953065547953, 0.217887170757864, + 0.219821275967775, 0.221755381177685, 0.223689486387596, + 0.225623591597506, 0.227557696807417, 0.229491802017327, + 0.231425907227238, 0.233360012437148, 0.154711904623801, + 0.156162483531233, 0.157613062438666, 0.159063641346099, + 0.160514220253532, 0.161964799160965, 0.163415378068398, + 0.164865956975831, 0.166316535883264, 0.167767114790697, + 0.16921769369813, 0.170668272605562, 0.172118851512995, + 0.173569430420428, 0.175020009327861, 0.1031412697492, 0.104108322354156, + 0.105075374959111, 0.106042427564066, 0.107009480169021, + 0.107976532773977, 0.108943585378932, 0.109910637983887, + 0.110877690588843, 0.111844743193798, 0.112811795798753, + 0.113778848403708, 0.114745901008664, 0.115712953613619, + 0.116680006218574, 0.0515706348746001, 0.0520541611770777, + 0.0525376874795553, 0.053021213782033, 0.0535047400845106, + 0.0539882663869883, 0.0544717926894659, 0.0549553189919436, + 0.0554388452944212, 0.0559223715968989, 0.0564058978993765, + 0.0568894242018541, 0.0573729505043318, 0.0578564768068094, + 0.0583400031092871, 2.09762141228432, 2.1, 2.19750814620262, 2.2, + 2.29739488012092, 2.3, 2.39728161403922, 2.4, 2.49716834795752, 2.5, + 2.09049103740348, 2.19003822966079, 2.28958542191809, 2.3891326141754, + 2.48867980643271, 2.07862502794996, 2.17760717213805, 2.27658931632615, + 2.37557146051424, 2.47455360470233, 2.06205026425168, 2.16024313397795, + 2.25843600370423, 2.3566288734305, 2.45482174315677, 2.04080429347944, + 2.13798545031179, 2.23516660714415, 2.3323477639765, 2.42952892080885, + 2.01493524459044, 2.11088454195189, 2.20683383931334, 2.30278313667479, + 2.39873243403624, 1.9845017193008, 2.07900180117227, 2.17350188304374, + 2.2680019649152, 2.36250204678667, 1.94957265933375, 2.04240945263536, + 2.13524624593697, 2.22808303923857, 2.32091983254018, 1.91022719024449, + 2.00119038977994, 2.09215358931539, 2.18311678885084, 2.2740799883863, + 1.86655444217534, 1.95543798704083, 2.04432153190632, 2.13320507677182, + 2.22208862163731, 1.81865334794732, 1.90525588832576, 1.99185842870421, + 2.07846096908265, 2.1650635094611, 1.76663241894548, 1.8507577722286, + 1.93488312551172, 2.01900847879483, 2.10313383207795, 1.7106094993057, + 1.79206709451074, 1.87352468971577, 1.95498228492081, 2.03643988012584, + 1.65071149895985, 1.72931680843413, 1.80792211790841, 1.88652742738269, + 1.96513273685697, 1.58707410614394, 1.66264906357937, 1.73822402101479, + 1.81379897845022, 1.88937393588565, 1.51984148002065, 1.59221488383115, + 1.66458828764166, 1.73696169145217, 1.80933509526268, 1.44916592411243, + 1.51817382526065, 1.58718172640886, 1.65618962755707, 1.72519752870528, + 1.3752075412851, 1.44069361467963, 1.50617968807416, 1.57166576146868, + 1.63715183486321, 1.29813387106327, 1.35994976968533, 1.42176566830739, + 1.48358156692945, 1.54539746555151, 1.21811951009952, 1.27612520105664, + 1.33413089201376, 1.39213658297088, 1.450142273928, 1.13534571665675, + 1.18940979840231, 1.24347388014787, 1.29753796189343, 1.35160204363899, + 1.05, 1.1, 1.15, 1.2, 1.25, 0.962275695627561, 1.0080983478003, + 1.05392099997304, 1.09974365214578, 1.14556630431853, 0.872371527303961, + 0.91391302860415, 0.955454529904339, 0.996996031204527, 1.03853753250472, + 0.780491156886687, 0.81765740245272, 0.854823648018753, + 0.891989893584786, 0.929156139150819, 0.686842722966585, + 0.719549519298327, 0.752256315630069, 0.784963111961812, + 0.817669908293554, 0.591638369367002, 0.619811625051145, + 0.647984880735288, 0.676158136419431, 0.704331392103574, + 0.495093764569796, 0.518669658120739, 0.542245551671682, + 0.565821445222625, 0.589397338773568, 0.397427613156861, + 0.416352737592902, 0.435277862028943, 0.454202986464984, + 0.473128110901025, 0.298861160373898, 0.313092644201227, + 0.327324128028556, 0.341555611855884, 0.355787095683213, + 0.199617690938783, 0.209123295269201, 0.21862889959962, + 0.228134503930038, 0.237640108260456, 0.0999220232298589, + 0.104680214812233, 0.109438406394607, 0.114196597976981, + 0.118954789559355, -2.63299061816681e-16, -1.59204083889156e-16, + -5.51091059616309e-17, 4.89858719658942e-17, 1.53080849893419e-16, + -0.0999220232298594, -0.104680214812233, -0.109438406394607, + -0.114196597976981, -0.118954789559355, -0.199617690938785, + -0.209123295269203, -0.218628899599621, -0.228134503930039, + -0.237640108260457, -0.298861160373899, -0.313092644201228, + -0.327324128028556, -0.341555611855885, -0.355787095683213, + -0.397427613156862, -0.416352737592903, -0.435277862028944, + -0.454202986464984, -0.473128110901025, -0.495093764569798, + -0.518669658120741, -0.542245551671683, -0.565821445222626, + -0.589397338773568, -0.591638369367002, -0.619811625051145, + -0.647984880735288, -0.676158136419431, -0.704331392103575, + -0.686842722966586, -0.719549519298328, -0.75225631563007, + -0.784963111961812, -0.817669908293554, -0.780491156886688, + -0.817657402452721, -0.854823648018753, -0.891989893584786, + -0.929156139150819, -0.872371527303961, -0.91391302860415, + -0.955454529904338, -0.996996031204527, -1.03853753250472, + -0.962275695627562, -1.0080983478003, -1.05392099997304, + -1.09974365214578, -1.14556630431853, -1.05, -1.1, -1.15, -1.2, -1.25, + -1.13534571665676, -1.18940979840232, -1.24347388014787, + -1.29753796189343, -1.35160204363899, -1.21811951009952, + -1.27612520105664, -1.33413089201376, -1.39213658297088, -1.450142273928, + -1.29813387106327, -1.35994976968533, -1.42176566830739, + -1.48358156692945, -1.54539746555151, -1.3752075412851, + -1.44069361467963, -1.50617968807416, -1.57166576146868, + -1.63715183486321, -1.44916592411244, -1.51817382526065, + -1.58718172640886, -1.65618962755707, -1.72519752870528, + -1.51984148002065, -1.59221488383115, -1.66458828764166, + -1.73696169145217, -1.80933509526268, -1.58707410614394, + -1.66264906357937, -1.73822402101479, -1.81379897845022, + -1.88937393588565, -1.65071149895985, -1.72931680843413, + -1.80792211790841, -1.88652742738269, -1.96513273685697, + -1.71060949930571, -1.79206709451074, -1.87352468971577, + -1.95498228492081, -2.03643988012584, -1.76663241894548, + -1.8507577722286, -1.93488312551172, -2.01900847879483, + -2.10313383207795, -1.81865334794732, -1.90525588832577, + -1.99185842870421, -2.07846096908265, -2.1650635094611, + -1.86655444217534, -1.95543798704083, -2.04432153190632, + -2.13320507677182, -2.22208862163731, -1.91022719024449, + -2.00119038977994, -2.09215358931539, -2.18311678885084, + -2.2740799883863, -1.94957265933375, -2.04240945263536, + -2.13524624593697, -2.22808303923857, -2.32091983254018, + -1.9845017193008, -2.07900180117227, -2.17350188304374, -2.2680019649152, + -2.36250204678667, -2.01493524459044, -2.11088454195189, + -2.20683383931334, -2.30278313667479, -2.39873243403624, + -2.04080429347944, -2.13798545031179, -2.23516660714415, + -2.3323477639765, -2.42952892080885, -2.06205026425168, + -2.16024313397795, -2.25843600370423, -2.3566288734305, + -2.45482174315677, -2.07862502794996, -2.17760717213805, + -2.27658931632615, -2.37557146051424, -2.47455360470233, + -2.09049103740348, -2.19003822966079, -2.28958542191809, + -2.3891326141754, -2.48867980643271, -2.09762141228432, + -2.19750814620262, -2.29739488012092, -2.39728161403922, + -2.49716834795752, -2.1, -2.2, -2.3, -2.4, -2.5, -2.09762141228432, + -2.19750814620262, -2.29739488012092, -2.39728161403922, + -2.49716834795752, -2.09049103740348, -2.19003822966079, + -2.28958542191809, -2.3891326141754, -2.48867980643271, + -2.07862502794996, -2.17760717213805, -2.27658931632615, + -2.37557146051424, -2.47455360470233, -2.06205026425168, + -2.16024313397795, -2.25843600370423, -2.3566288734305, + -2.45482174315677, -2.04080429347944, -2.13798545031179, + -2.23516660714415, -2.3323477639765, -2.42952892080885, + -2.01493524459044, -2.11088454195189, -2.20683383931334, + -2.30278313667479, -2.39873243403624, -1.9845017193008, + -2.07900180117227, -2.17350188304374, -2.2680019649152, + -2.36250204678667, -1.94957265933375, -2.04240945263536, + -2.13524624593697, -2.22808303923857, -2.32091983254018, + -1.91022719024449, -2.00119038977994, -2.09215358931539, + -2.18311678885084, -2.2740799883863, -1.86655444217534, + -1.95543798704083, -2.04432153190632, -2.13320507677182, + -2.22208862163731, -1.81865334794732, -1.90525588832576, + -1.99185842870421, -2.07846096908265, -2.1650635094611, + -1.76663241894548, -1.8507577722286, -1.93488312551172, + -2.01900847879483, -2.10313383207795, -1.71060949930571, + -1.79206709451074, -1.87352468971577, -1.95498228492081, + -2.03643988012584, -1.65071149895985, -1.72931680843413, + -1.80792211790841, -1.88652742738269, -1.96513273685697, + -1.58707410614394, -1.66264906357937, -1.73822402101479, + -1.81379897845022, -1.88937393588564, -1.51984148002065, + -1.59221488383115, -1.66458828764166, -1.73696169145217, + -1.80933509526268, -1.44916592411244, -1.51817382526065, + -1.58718172640886, -1.65618962755707, -1.72519752870528, + -1.3752075412851, -1.44069361467963, -1.50617968807416, + -1.57166576146868, -1.63715183486321, -1.29813387106327, + -1.35994976968533, -1.42176566830739, -1.48358156692945, + -1.54539746555151, -1.21811951009952, -1.27612520105664, + -1.33413089201376, -1.39213658297088, -1.450142273928, -1.13534571665675, + -1.18940979840231, -1.24347388014787, -1.29753796189343, + -1.35160204363899, -1.05, -1.1, -1.15, -1.2, -1.25, -0.962275695627561, + -1.0080983478003, -1.05392099997304, -1.09974365214578, + -1.14556630431852, -0.872371527303961, -0.91391302860415, + -0.955454529904338, -0.996996031204527, -1.03853753250472, + -0.780491156886687, -0.81765740245272, -0.854823648018753, + -0.891989893584785, -0.929156139150818, -0.686842722966585, + -0.719549519298327, -0.752256315630069, -0.784963111961811, + -0.817669908293553, -0.591638369367002, -0.619811625051145, + -0.647984880735288, -0.676158136419431, -0.704331392103574, + -0.495093764569797, -0.51866965812074, -0.542245551671682, + -0.565821445222625, -0.589397338773567, -0.397427613156861, + -0.416352737592903, -0.435277862028944, -0.454202986464985, + -0.473128110901026, -0.298861160373899, -0.313092644201227, + -0.327324128028556, -0.341555611855885, -0.355787095683213, + -0.199617690938783, -0.209123295269201, -0.21862889959962, + -0.228134503930038, -0.237640108260456, -0.099922023229859, + -0.104680214812233, -0.109438406394608, -0.114196597976982, + -0.118954789559357, 6.12323399573675e-18, -1.10218211923262e-16, + -2.2655965784226e-16, -3.42901103761259e-16, -4.59242549680257e-16, + 0.099922023229859, 0.104680214812233, 0.109438406394608, + 0.114196597976982, 0.118954789559356, 0.199617690938784, + 0.209123295269202, 0.218628899599621, 0.228134503930039, + 0.237640108260458, 0.298861160373899, 0.313092644201228, + 0.327324128028557, 0.341555611855886, 0.355787095683214, + 0.397427613156861, 0.416352737592902, 0.435277862028943, + 0.454202986464984, 0.473128110901025, 0.495093764569797, + 0.51866965812074, 0.542245551671683, 0.565821445222626, + 0.589397338773569, 0.591638369367003, 0.619811625051146, + 0.647984880735289, 0.676158136419432, 0.704331392103575, + 0.686842722966585, 0.719549519298328, 0.75225631563007, + 0.784963111961812, 0.817669908293554, 0.780491156886688, + 0.817657402452721, 0.854823648018753, 0.891989893584786, + 0.929156139150819, 0.872371527303962, 0.913913028604151, + 0.955454529904339, 0.996996031204528, 1.03853753250472, + 0.962275695627562, 1.0080983478003, 1.05392099997304, 1.09974365214578, + 1.14556630431853, 1.05, 1.1, 1.15, 1.2, 1.25, 1.13534571665675, + 1.18940979840231, 1.24347388014787, 1.29753796189343, 1.35160204363899, + 1.21811951009952, 1.27612520105664, 1.33413089201376, 1.39213658297087, + 1.45014227392799, 1.29813387106327, 1.35994976968533, 1.42176566830739, + 1.48358156692945, 1.54539746555151, 1.3752075412851, 1.44069361467963, + 1.50617968807416, 1.57166576146868, 1.63715183486321, 1.44916592411244, + 1.51817382526065, 1.58718172640886, 1.65618962755707, 1.72519752870528, + 1.51984148002065, 1.59221488383115, 1.66458828764166, 1.73696169145217, + 1.80933509526268, 1.58707410614394, 1.66264906357937, 1.73822402101479, + 1.81379897845022, 1.88937393588565, 1.65071149895985, 1.72931680843413, + 1.80792211790841, 1.88652742738269, 1.96513273685697, 1.71060949930571, + 1.79206709451074, 1.87352468971577, 1.95498228492081, 2.03643988012584, + 1.76663241894548, 1.8507577722286, 1.93488312551172, 2.01900847879483, + 2.10313383207795, 1.81865334794732, 1.90525588832577, 1.99185842870421, + 2.07846096908265, 2.1650635094611, 1.86655444217534, 1.95543798704083, + 2.04432153190632, 2.13320507677182, 2.22208862163731, 1.91022719024449, + 2.00119038977994, 2.09215358931539, 2.18311678885084, 2.2740799883863, + 1.94957265933375, 2.04240945263536, 2.13524624593697, 2.22808303923857, + 2.32091983254018, 1.9845017193008, 2.07900180117227, 2.17350188304374, + 2.2680019649152, 2.36250204678667, 2.01493524459044, 2.11088454195189, + 2.20683383931334, 2.30278313667479, 2.39873243403624, 2.04080429347944, + 2.13798545031179, 2.23516660714415, 2.3323477639765, 2.42952892080885, + 2.06205026425168, 2.16024313397795, 2.25843600370423, 2.3566288734305, + 2.45482174315677, 2.07862502794996, 2.17760717213805, 2.27658931632615, + 2.37557146051424, 2.47455360470233, 2.09049103740348, 2.19003822966079, + 2.28958542191809, 2.3891326141754, 2.48867980643271, 2.09762141228432, + 2.19750814620262, 2.29739488012092, 2.39728161403922, 2.49716834795752, + 2.59705508187582, 2.6, 2.58822699869002, 2.57353574889042, + 2.55301461288304, 2.52671007764121, 2.49468173139769, 2.45700212865814, + 2.41375662584179, 2.36504318792175, 2.3109721665028, 2.25166604983954, + 2.18725918536107, 2.11789747533087, 2.04373804633125, 1.96494889332107, + 1.88170849907318, 1.79420542985349, 1.70263790825774, 1.60721336417357, + 1.50814796488512, 1.40566612538455, 1.3, 1.19138895649127, + 1.0800790338049, 0.966322384716852, 0.850376704625296, 0.732504647787717, + 0.612973232324511, 0.492053235337067, 0.370018579510541, + 0.247145712590875, 0.12371298114173, 1.59204083889156e-16, + -0.123712981141729, -0.247145712590875, -0.370018579510542, + -0.492053235337066, -0.612973232324511, -0.732504647787718, + -0.850376704625296, -0.966322384716851, -1.0800790338049, + -1.19138895649127, -1.3, -1.40566612538455, -1.50814796488512, + -1.60721336417357, -1.70263790825774, -1.79420542985349, + -1.88170849907318, -1.96494889332107, -2.04373804633125, + -2.11789747533087, -2.18725918536107, -2.25166604983954, + -2.3109721665028, -2.36504318792175, -2.41375662584179, + -2.45700212865814, -2.49468173139769, -2.52671007764121, + -2.55301461288304, -2.57353574889042, -2.58822699869002, + -2.59705508187582, -2.6, -2.59705508187582, -2.58822699869002, + -2.57353574889043, -2.55301461288304, -2.52671007764121, + -2.49468173139769, -2.45700212865814, -2.41375662584179, + -2.36504318792175, -2.3109721665028, -2.25166604983954, + -2.18725918536107, -2.11789747533087, -2.04373804633125, + -1.96494889332107, -1.88170849907318, -1.79420542985349, + -1.70263790825774, -1.60721336417357, -1.50814796488512, + -1.40566612538455, -1.3, -1.19138895649127, -1.0800790338049, + -0.966322384716853, -0.850376704625297, -0.732504647787717, + -0.612973232324512, -0.492053235337068, -0.370018579510542, + -0.247145712590874, -0.123712981141729, -4.77612251667468e-16, + 0.12371298114173, 0.247145712590876, 0.370018579510541, + 0.492053235337067, 0.612973232324509, 0.732504647787716, + 0.850376704625296, 0.96632238471685, 1.0800790338049, 1.19138895649127, + 1.3, 1.40566612538455, 1.50814796488511, 1.60721336417357, + 1.70263790825774, 1.79420542985349, 1.88170849907318, 1.96494889332107, + 2.04373804633125, 2.11789747533087, 2.18725918536107, 2.25166604983954, + 2.3109721665028, 2.36504318792175, 2.41375662584179, 2.45700212865814, + 2.49468173139769, 2.52671007764121, 2.55301461288304, 2.57353574889042, + 2.58822699869002, 2.59705508187582, 2.69717778679766, 2.7, + 2.7973004917195, 2.8, 2.89742319664134, 2.9, 2.99754590156318, 3, + 3.09766860648502, 3.1, 3.19779131140687, 3.2, 3.29791401632871, 3.3, + 3.39803672125055, 3.4, 3.49815942617239, 3.5, 3.59828213109423, 3.6, + 3.69840483601607, 3.7, 3.79852754093791, 3.8, 3.89865024585975, 3.9, + 3.99877295078159, 4, 4.09889565570343, 4.1, 4.19901836062527, 4.2, + 4.29914106554711, 4.3, 4.39926377046895, 4.4, 4.4993864753908, 4.5, + 4.59950918031264, 4.6, 4.69963188523448, 4.7, 4.79975459015632, 4.8, + 4.89987729507816, 4.9, 5, 5, 2.68871754041127, 2.78920808213252, + 2.88969862385377, 2.99018916557502, 3.09067970729627, 3.19117024901752, + 3.29166079073876, 3.39215133246001, 3.49264187418126, 3.59313241590251, + 3.69362295762376, 3.79411349934501, 3.89460404106626, 3.99509458278751, + 4.09558512450876, 4.19607566623001, 4.29656620795126, 4.3970567496725, + 4.49754729139375, 4.598037833115, 4.69852837483625, 4.7990189165575, + 4.89950945827875, 5, 2.67463842601999, 2.77574110314956, + 2.87684378027912, 2.97794645740869, 3.07904913453825, 3.18015181166782, + 3.28125448879738, 3.38235716592695, 3.48345984305652, 3.58456252018608, + 3.68566519731565, 3.78676787444521, 3.88787055157478, 3.98897322870434, + 4.09007590583391, 4.19117858296347, 4.29228126009304, 4.39338393722261, + 4.49448661435217, 4.59558929148174, 4.6966919686113, 4.79779464574087, + 4.89889732287043, 5, 2.65497233734624, 2.75693006180945, + 2.85888778627266, 2.96084551073586, 3.06280323519907, 3.16476095966228, + 3.26671868412548, 3.36867640858869, 3.4706341330519, 3.57259185751511, + 3.67454958197831, 3.77650730644152, 3.87846503090473, 3.98042275536793, + 4.08238047983114, 4.18433820429435, 4.28629592875755, 4.38825365322076, + 4.49021137768397, 4.59216910214717, 4.69412682661038, 4.79608455107359, + 4.89804227553679, 5, 2.62976382440616, 2.73281757117111, + 2.83587131793606, 2.93892506470101, 3.04197881146596, 3.14503255823091, + 3.24808630499586, 3.35114005176081, 3.45419379852575, 3.5572475452907, + 3.66030129205565, 3.7633550388206, 3.86640878558555, 3.9694625323505, + 4.07251627911545, 4.1755700258804, 4.27862377264535, 4.3816775194103, + 4.48473126617525, 4.5877850129402, 4.69083875970515, 4.7938925064701, + 4.89694625323505, 5, 2.59906999258946, 2.70345825378122, + 2.80784651497298, 2.91223477616474, 3.01662303735651, 3.12101129854827, + 3.22539955974003, 3.3297878209318, 3.43417608212356, 3.53856434331532, + 3.64295260450708, 3.74734086569885, 3.85172912689061, 3.95611738808237, + 4.06050564927413, 4.1648939104659, 4.26928217165766, 4.37367043284942, + 4.47805869404119, 4.58244695523295, 4.68683521642471, 4.79122347761647, + 4.89561173880824, 5, 2.56296037329738, 2.66891861793663, + 2.77487686257587, 2.88083510721511, 2.98679335185436, 3.0927515964936, + 3.19870984113285, 3.30466808577209, 3.41062633041134, 3.51658457505058, + 3.62254281968982, 3.72850106432907, 3.83445930896831, 3.94041755360756, + 4.0463757982468, 4.15233404288605, 4.25829228752529, 4.36425053216453, + 4.47020877680378, 4.57616702144302, 4.68212526608227, 4.78808351072151, + 4.89404175536076, 5, 2.52151676643171, 2.62927690702164, + 2.73703704761157, 2.84479718820149, 2.95255732879142, 3.06031746938134, + 3.16807760997127, 3.27583775056119, 3.38359789115112, 3.49135803174104, + 3.59911817233097, 3.70687831292089, 3.81463845351082, 3.92239859410075, + 4.03015873469067, 4.1379188752806, 4.24567901587052, 4.35343915646045, + 4.46119929705037, 4.5689594376403, 4.67671957823022, 4.78447971882015, + 4.89223985941007, 5, 2.47483305509168, 2.5846229222616, 2.69441278943153, + 2.80420265660146, 2.91399252377138, 3.02378239094131, 3.13357225811124, + 3.24336212528117, 3.35315199245109, 3.46294185962102, 3.57273172679095, + 3.68252159396087, 3.7923114611308, 3.90210132830073, 4.01189119547066, + 4.12168106264058, 4.23147092981051, 4.34126079698044, 4.45105066415036, + 4.56084053132029, 4.67063039849022, 4.78042026566015, 4.89021013283007, + 5, 2.42301499289852, 2.53505781929423, 2.64710064568995, + 2.75914347208567, 2.87118629848138, 2.9832291248771, 3.09527195127282, + 3.20731477766853, 3.31935760406425, 3.43140043045997, 3.54344325685568, + 3.6554860832514, 3.76752890964712, 3.87957173604283, 3.99161456243855, + 4.10365738883427, 4.21570021522998, 4.3277430416257, 4.43978586802142, + 4.55182869441713, 4.66387152081285, 4.77591434720857, 4.88795717360428, + 5, 2.36617996442956, 2.48069387901958, 2.5952077936096, 2.70972170819962, + 2.82423562278964, 2.93874953737966, 3.05326345196967, 3.16777736655969, + 3.28229128114971, 3.39680519573973, 3.51131911032975, 3.62583302491977, + 3.74034693950979, 3.85486085409981, 3.96937476868983, 4.08388868327985, + 4.19840259786987, 4.31291651245988, 4.4274304270499, 4.54194434163992, + 4.65645825622994, 4.77097217081996, 4.88548608540998, 5, + 2.30445671930436, 2.42165425324765, 2.53885178719094, 2.65604932113423, + 2.77324685507751, 2.8904443890208, 3.00764192296409, 3.12483945690738, + 3.24203699085067, 3.35923452479396, 3.47643205873725, 3.59362959268054, + 3.71082712662382, 3.82802466056711, 3.9452221945104, 4.06241972845369, + 4.17961726239698, 4.29681479634027, 4.41401233028356, 4.53120986422685, + 4.64840739817013, 4.76560493211342, 4.88280246605671, 5, + 2.23798508052542, 2.35807268571997, 2.47816029091451, 2.59824789610906, + 2.71833550130361, 2.83842310649815, 2.9585107116927, 3.07859831688725, + 3.1986859220818, 3.31877352727634, 3.43886113247089, 3.55894873766544, + 3.67903634285998, 3.79912394805453, 3.91921155324908, 4.03929915844362, + 4.15938676363817, 4.27947436883272, 4.39956197402727, 4.51964957922181, + 4.63973718441636, 4.75982478961091, 4.87991239480545, 5, + 2.16691562773411, 2.29009320913698, 2.41327079053984, 2.53644837194271, + 2.65962595334557, 2.78280353474844, 2.9059811161513, 3.02915869755417, + 3.15233627895703, 3.27551386035989, 3.39869144176276, 3.52186902316562, + 3.64504660456849, 3.76822418597135, 3.89140176737422, 4.01457934877708, + 4.13775693017995, 4.26093451158281, 4.38411209298568, 4.50728967438854, + 4.63046725579141, 4.75364483719427, 4.87682241859714, 5, + 2.09140935609936, 2.21786981887765, 2.34433028165594, 2.47079074443423, + 2.59725120721251, 2.7237116699908, 2.85017213276909, 2.97663259554738, + 3.10309305832567, 3.22955352110396, 3.35601398388225, 3.48247444666054, + 3.60893490943882, 3.73539537221711, 3.8618558349954, 3.98831629777369, + 4.11477676055198, 4.24123722333027, 4.36769768610856, 4.49415814888685, + 4.62061861166513, 4.74707907444342, 4.87353953722171, 5, 2.0116373116118, + 2.14156612415042, 2.27149493668903, 2.40142374922765, 2.53135256176627, + 2.66128137430489, 2.7912101868435, 2.92113899938212, 3.05106781192074, + 3.18099662445936, 3.31092543699797, 3.44085424953659, 3.57078306207521, + 3.70071187461383, 3.83064068715244, 3.96056949969106, 4.09049831222968, + 4.2204271247683, 4.35035593730691, 4.48028474984553, 4.61021356238415, + 4.74014237492277, 4.87007118746138, 5, 1.91515394098333, + 2.03610245211317, 2.15705096324302, 2.27799947437286, 2.3989479855027, + 2.51989649663254, 2.64084500776238, 2.76179351889223, 2.88274203002207, + 3.00369054115191, 3.12463905228175, 3.24558756341159, 3.36653607454144, + 3.48748458567128, 3.60843309680112, 3.72938160793096, 3.8503301190608, + 3.97127863019065, 4.09222714132049, 4.21317565245033, 4.33412416358017, + 4.45507267471001, 4.57602118583986, 4.6969696969697, 1.81477547016114, + 1.92691303206455, 2.03905059396795, 2.15118815587135, 2.26332571777475, + 2.37546327967815, 2.48760084158156, 2.59973840348496, 2.71187596538836, + 2.82401352729176, 2.93615108919517, 3.04828865109857, 3.16042621300197, + 3.27256377490537, 3.38470133680877, 3.49683889871218, 3.60897646061558, + 3.72111402251898, 3.83325158442238, 3.94538914632579, 4.05752670822919, + 4.16966427013259, 4.28180183203599, 4.39393939393939, 1.71070068612089, + 1.8141880080682, 1.91767533001551, 2.02116265196283, 2.12464997391014, + 2.22813729585745, 2.33162461780477, 2.43511193975208, 2.53859926169939, + 2.64208658364671, 2.74557390559402, 2.84906122754133, 2.95254854948865, + 3.05603587143596, 3.15952319338327, 3.26301051533059, 3.3664978372779, + 3.46998515922521, 3.57347248117253, 3.67695980311984, 3.78044712506715, + 3.88393444701446, 3.98742176896178, 4.09090909090909, 1.60313674917652, + 1.69812553346792, 1.79311431775932, 1.88810310205073, 1.98309188634213, + 2.07808067063353, 2.17306945492494, 2.26805823921634, 2.36304702350774, + 2.45803580779915, 2.55302459209055, 2.64801337638195, 2.74300216067336, + 2.83799094496476, 2.93297972925616, 3.02796851354756, 3.12295729783897, + 3.21794608213037, 3.31293486642177, 3.40792365071318, 3.50291243500458, + 3.59790121929598, 3.69289000358739, 3.78787878787879, 1.49229872369555, + 1.57893132200655, 1.66556392031755, 1.75219651862854, 1.83882911693954, + 1.92546171525054, 2.01209431356153, 2.09872691187253, 2.18535951018353, + 2.27199210849452, 2.35862470680552, 2.44525730511652, 2.53188990342752, + 2.61852250173851, 2.70515510004951, 2.79178769836051, 2.8784202966715, + 2.9650528949825, 3.0516854932935, 3.1383180916045, 3.22495068991549, + 3.31158328822649, 3.39821588653749, 3.48484848484848, 1.37840909090909, + 1.45681818181818, 1.53522727272727, 1.61363636363636, 1.69204545454545, + 1.77045454545455, 1.84886363636364, 1.92727272727273, 2.00568181818182, + 2.08409090909091, 2.1625, 2.24090909090909, 2.31931818181818, + 2.39772727272727, 2.47613636363636, 2.55454545454545, 2.63295454545455, + 2.71136363636364, 2.78977272727273, 2.86818181818182, 2.94659090909091, + 3.025, 3.10340909090909, 3.18181818181818, 1.26169724492029, + 1.33200553334932, 1.40231382177834, 1.47262211020737, 1.54293039863639, + 1.61323868706542, 1.68354697549445, 1.75385526392347, 1.8241635523525, + 1.89447184078152, 1.96478012921055, 2.03508841763957, 2.1053967060686, + 2.17570499449762, 2.24601328292665, 2.31632157135568, 2.3866298597847, + 2.45693814821373, 2.52724643664275, 2.59755472507178, 2.6678630135008, + 2.73817130192983, 2.80847959035885, 2.87878787878788, 1.14239897305293, + 1.20471891230096, 1.26703885154899, 1.32935879079702, 1.39167873004504, + 1.45399866929307, 1.5163186085411, 1.57863854778913, 1.64095848703716, + 1.70327842628518, 1.76559836553321, 1.82791830478124, 1.89023824402927, + 1.9525581832773, 2.01487812252532, 2.07719806177335, 2.13951800102138, + 2.20183794026941, 2.26415787951744, 2.32647781876546, 2.38879775801349, + 2.45111769726152, 2.51343763650955, 2.57575757575758, 1.02075592171729, + 1.07518945871772, 1.12962299571815, 1.18405653271859, 1.23849006971902, + 1.29292360671946, 1.34735714371989, 1.40179068072033, 1.45622421772076, + 1.51065775472119, 1.56509129172163, 1.61952482872206, 1.6739583657225, + 1.72839190272293, 1.78282543972337, 1.8372589767238, 1.89169251372423, + 1.94612605072467, 2.0005595877251, 2.05499312472554, 2.10942666172597, + 2.1638601987264, 2.21829373572684, 2.27272727272727, 0.897015049003283, + 0.943653393381269, 0.990291737759256, 1.03693008213724, 1.08356842651523, + 1.13020677089321, 1.1768451152712, 1.22348345964919, 1.27012180402717, + 1.31676014840516, 1.36339849278315, 1.41003683716113, 1.45667518153912, + 1.50331352591711, 1.54995187029509, 1.59659021467308, 1.64322855905107, + 1.68986690342905, 1.73650524780704, 1.78314359218502, 1.82978193656301, + 1.876420280941, 1.92305862531898, 1.96969696969697, 0.771428065241007, + 0.810351482694296, 0.849274900147586, 0.888198317600876, + 0.927121735054165, 0.966045152507455, 1.00496856996074, 1.04389198741403, + 1.08281540486732, 1.12173882232061, 1.1606622397739, 1.19958565722719, + 1.23850907468048, 1.27743249213377, 1.31635590958706, 1.35527932704035, + 1.39420274449364, 1.43312616194693, 1.47204957940022, 1.51097299685351, + 1.5498964143068, 1.58881983176009, 1.62774324921338, 1.66666666666667, + 0.644250862795838, 0.675528493267165, 0.706806123738493, + 0.73808375420982, 0.769361384681147, 0.800639015152474, + 0.831916645623801, 0.863194276095129, 0.894471906566456, + 0.925749537037783, 0.95702716750911, 0.988304797980438, 1.01958242845176, + 1.05086005892309, 1.08213768939442, 1.11341531986575, 1.14469295033707, + 1.1759705808084, 1.20724821127973, 1.23852584175106, 1.26980347222238, + 1.30108110269371, 1.33235873316504, 1.36363636363636, 0.515742936389941, + 0.539432637442816, 0.563122338495691, 0.586812039548566, + 0.61050174060144, 0.634191441654315, 0.65788114270719, 0.681570843760064, + 0.705260544812939, 0.728950245865814, 0.752639946918689, + 0.776329647971564, 0.800019349024438, 0.823709050077313, + 0.847398751130188, 0.871088452183063, 0.894778153235937, + 0.918467854288812, 0.942157555341687, 0.965847256394562, + 0.989536957447436, 1.01322665850031, 1.03691635955319, 1.06060606060606, + 0.386166795263259, 0.402315011015976, 0.418463226768693, + 0.434611442521411, 0.450759658274128, 0.466907874026845, + 0.483056089779563, 0.49920430553228, 0.515352521284997, + 0.531500737037715, 0.547648952790432, 0.56379716854315, + 0.579945384295867, 0.596093600048584, 0.612241815801302, + 0.628390031554019, 0.644538247306736, 0.660686463059454, + 0.676834678812171, 0.692982894564888, 0.709131110317606, + 0.725279326070323, 0.74142754182304, 0.757575757575758, + 0.255787368505649, 0.264429024420423, 0.273070680335197, + 0.281712336249971, 0.290353992164746, 0.29899564807952, + 0.307637303994294, 0.316278959909068, 0.324920615823842, + 0.333562271738617, 0.342203927653391, 0.350845583568165, + 0.359487239482939, 0.368128895397713, 0.376770551312487, + 0.385412207227262, 0.394053863142036, 0.40269551905681, + 0.411337174971584, 0.419978830886358, 0.428620486801133, + 0.437262142715907, 0.445903798630681, 0.454545454545455, + 0.124871404907289, 0.126029828672849, 0.127188252438408, + 0.128346676203967, 0.129505099969526, 0.130663523735086, + 0.131821947500645, 0.132980371266204, 0.134138795031763, + 0.135297218797322, 0.136455642562882, 0.137614066328441, 0.138772490094, + 0.139930913859559, 0.141089337625118, 0.142247761390678, + 0.143406185156237, 0.144564608921796, 0.145723032687355, + 0.146881456452915, 0.148039880218474, 0.149198303984033, + 0.150356727749592, 0.151515151515151, -0.00631313131313115, + -0.0126262626262625, -0.0189393939393938, -0.0252525252525251, + -0.0315656565656564, -0.0378787878787877, -0.044191919191919, + -0.0505050505050504, -0.0568181818181817, -0.063131313131313, + -0.0694444444444443, -0.0757575757575756, -0.0820707070707069, + -0.0883838383838382, -0.0946969696969696, -0.101010101010101, + -0.107323232323232, -0.113636363636363, -0.119949494949495, + -0.126262626262626, -0.132575757575757, -0.138888888888889, + -0.14520202020202, -0.151515151515151, -0.137497667533551, + -0.151282353925373, -0.165067040317195, -0.178851726709017, + -0.192636413100839, -0.206421099492661, -0.220205785884482, + -0.233990472276304, -0.247775158668126, -0.261559845059948, + -0.27534453145177, -0.289129217843592, -0.302913904235414, + -0.316698590627235, -0.330483277019057, -0.344267963410879, + -0.358052649802701, -0.371837336194523, -0.385622022586345, + -0.399406708978167, -0.413191395369989, -0.42697608176181, + -0.440760768153632, -0.454545454545454, -0.268413631131912, + -0.289681549672949, -0.310949468213985, -0.332217386755022, + -0.353485305296059, -0.374753223837096, -0.396021142378132, + -0.417289060919169, -0.438556979460206, -0.459824898001243, + -0.48109281654228, -0.502360735083316, -0.523628653624353, + -0.54489657216539, -0.566164490706427, -0.587432409247464, + -0.6087003277885, -0.629968246329537, -0.651236164870574, + -0.672504083411611, -0.693772001952647, -0.715039920493684, + -0.736307839034721, -0.757575757575758, -0.398793057889522, + -0.427567536268502, -0.456342014647481, -0.485116493026461, + -0.513890971405441, -0.542665449784421, -0.571439928163401, + -0.600214406542381, -0.628988884921361, -0.657763363300341, + -0.686537841679321, -0.715312320058301, -0.744086798437281, + -0.772861276816261, -0.801635755195241, -0.830410233574221, + -0.859184711953201, -0.887959190332181, -0.916733668711161, + -0.945508147090141, -0.974282625469121, -1.0030571038481, + -1.03183158222708, -1.06060606060606, -0.528369199016204, + -0.564685162695341, -0.601001126374478, -0.637317090053616, + -0.673633053732753, -0.709949017411891, -0.746264981091028, + -0.782580944770165, -0.818896908449303, -0.85521287212844, + -0.891528835807577, -0.927844799486715, -0.964160763165852, + -1.00047672684499, -1.03679269052413, -1.07310865420326, + -1.1094246178824, -1.14574058156154, -1.18205654524068, + -1.21837250891981, -1.25468847259895, -1.29100443627809, + -1.32732039995723, -1.36363636363636, -0.6568771254221, + -0.70078101851969, -0.74468491161728, -0.78858880471487, + -0.83249269781246, -0.87639659091005, -0.920300484007639, + -0.964204377105229, -1.00810827020282, -1.05201216330041, + -1.095916056398, -1.13981994949559, -1.18372384259318, -1.22762773569077, + -1.27153162878836, -1.31543552188595, -1.35933941498354, + -1.40324330808113, -1.44714720117872, -1.49105109427631, + -1.5349549873739, -1.57885888047149, -1.62276277356908, + -1.66666666666667, -0.78405432786727, -0.835604007946822, + -0.887153688026374, -0.938703368105926, -0.990253048185478, + -1.04180272826503, -1.09335240834458, -1.14490208842413, + -1.19645176850369, -1.24800144858324, -1.29955112866279, + -1.35110080874234, -1.4026504888219, -1.45420016890145, -1.505749848981, + -1.55729952906055, -1.6088492091401, -1.66039888921966, + -1.71194856929921, -1.76349824937876, -1.81504792945831, + -1.86659760953787, -1.91814728961742, -1.96969696969697, + -0.909641311629545, -0.968905918633794, -1.02817052563804, + -1.08743513264229, -1.14669973964654, -1.20596434665079, + -1.26522895365504, -1.32449356065929, -1.38375816766354, + -1.44302277466779, -1.50228738167204, -1.56155198867628, + -1.62081659568053, -1.68008120268478, -1.73934580968903, + -1.79861041669328, -1.85787502369753, -1.91713963070178, + -1.97640423770603, -2.03566884471028, -2.09493345171453, + -2.15419805871877, -2.21346266572302, -2.27272727272727, + -1.03338218434355, -1.10044198397024, -1.16750178359694, + -1.23456158322364, -1.30162138285034, -1.36868118247703, + -1.43574098210373, -1.50280078173043, -1.56986058135712, + -1.63692038098382, -1.70398018061052, -1.77103998023721, + -1.83809977986391, -1.90515957949061, -1.9722193791173, -2.039279178744, + -2.1063389783707, -2.17339877799739, -2.24045857762409, + -2.30751837725079, -2.37457817687749, -2.44163797650418, + -2.50869777613088, -2.57575757575758, -1.1550252356792, + -1.22997143755349, -1.30491763942778, -1.37986384130207, + -1.45481004317636, -1.52975624505065, -1.60470244692494, + -1.67964864879923, -1.75459485067352, -1.82954105254781, + -1.9044872544221, -1.97943345629639, -2.05437965817068, + -2.12932586004497, -2.20427206191926, -2.27921826379355, + -2.35416446566784, -2.42911066754214, -2.50405686941643, + -2.57900307129072, -2.65394927316501, -2.7288954750393, + -2.80384167691359, -2.87878787878788, -1.27432350754655, + -1.35725805860184, -1.44019260965713, -1.52312716071242, + -1.60606171176771, -1.688996262823, -1.77193081387828, -1.85486536493357, + -1.93779991598886, -2.02073446704415, -2.10366901809944, + -2.18660356915472, -2.26953812021001, -2.3524726712653, + -2.43540722232059, -2.51834177337588, -2.60127632443116, + -2.68421087548645, -2.76714542654174, -2.85007997759703, + -2.93301452865232, -3.01594907970761, -3.09888363076289, + -3.18181818181818, -1.39103535353535, -1.48207070707071, + -1.57310606060606, -1.66414141414141, -1.75517676767677, + -1.84621212121212, -1.93724747474747, -2.02828282828283, + -2.11931818181818, -2.21035353535354, -2.30138888888889, + -2.39242424242424, -2.4834595959596, -2.57449494949495, -2.6655303030303, + -2.75656565656566, -2.84760101010101, -2.93863636363636, + -3.02967171717172, -3.12070707070707, -3.21174242424242, + -3.30277777777778, -3.39381313131313, -3.48484848484848, + -1.50492498632181, -1.60418384725907, -1.70344270819633, + -1.80270156913359, -1.90196043007085, -2.00121929100811, + -2.10047815194537, -2.19973701288263, -2.29899587381989, + -2.39825473475715, -2.49751359569441, -2.59677245663167, + -2.69603131756893, -2.79529017850619, -2.89454903944345, + -2.99380790038071, -3.09306676131797, -3.19232562225523, + -3.29158448319249, -3.39084334412975, -3.49010220506701, + -3.58936106600427, -3.68861992694153, -3.78787878787879, + -1.61576301180278, -1.72337805872045, -1.83099310563811, + -1.93860815255578, -2.04622319947344, -2.15383824639111, + -2.26145329330877, -2.36906834022644, -2.47668338714411, + -2.58429843406177, -2.69191348097944, -2.7995285278971, + -2.90714357481477, -3.01475862173243, -3.1223736686501, + -3.22998871556777, -3.33760376248543, -3.4452188094031, + -3.55283385632076, -3.66044890323843, -3.76806395015609, + -3.87567899707376, -3.98329404399143, -4.09090909090909, + -1.72332694874715, -1.83944053332072, -1.9555541178943, + -2.07166770246788, -2.18778128704145, -2.30389487161503, + -2.4200084561886, -2.53612204076218, -2.65223562533576, + -2.76834920990933, -2.88446279448291, -3.00057637905648, + -3.11668996363006, -3.23280354820364, -3.34891713277721, + -3.46503071735079, -3.58114430192436, -3.69725788649794, + -3.81337147107151, -3.92948505564509, -4.04559864021867, + -4.16171222479224, -4.27782580936582, -4.39393939393939, + -1.82740173278741, -1.95216555731707, -2.07692938184674, + -2.2016932063764, -2.32645703090606, -2.45122085543573, + -2.57598467996539, -2.70074850449506, -2.82551232902472, + -2.95027615355439, -3.07503997808405, -3.19980380261372, + -3.32456762714338, -3.44933145167305, -3.57409527620271, + -3.69885910073238, -3.82362292526204, -3.94838674979171, + -4.07315057432137, -4.19791439885104, -4.3226782233807, + -4.44744204791037, -4.57220587244003, -4.6969696969697, -1.9277802036096, + -2.0613549773657, -2.1949297511218, -2.32850452487791, -2.46207929863401, + -2.59565407239012, -2.72922884614622, -2.86280361990233, + -2.99637839365843, -3.12995316741454, -3.26352794117064, + -3.39710271492675, -3.53067748868285, -3.66425226243895, + -3.79782703619506, -3.93140180995116, -4.06497658370727, + -4.19855135746337, -4.33212613121948, -4.46570090497558, + -4.59927567873169, -4.73285045248779, -4.8664252262439, -5, + -2.0116373116118, -2.14156612415042, -2.27149493668903, + -2.40142374922765, -2.53135256176627, -2.66128137430489, + -2.7912101868435, -2.92113899938212, -3.05106781192074, + -3.18099662445936, -3.31092543699797, -3.44085424953659, + -3.57078306207521, -3.70071187461383, -3.83064068715244, + -3.96056949969106, -4.09049831222968, -4.2204271247683, + -4.35035593730691, -4.48028474984553, -4.61021356238415, + -4.74014237492277, -4.87007118746138, -5, -2.09140935609936, + -2.21786981887765, -2.34433028165594, -2.47079074443423, + -2.59725120721251, -2.7237116699908, -2.85017213276909, + -2.97663259554738, -3.10309305832567, -3.22955352110396, + -3.35601398388225, -3.48247444666054, -3.60893490943882, + -3.73539537221711, -3.8618558349954, -3.98831629777369, + -4.11477676055198, -4.24123722333027, -4.36769768610856, + -4.49415814888685, -4.62061861166513, -4.74707907444342, + -4.87353953722171, -5, -2.16691562773411, -2.29009320913698, + -2.41327079053984, -2.53644837194271, -2.65962595334557, + -2.78280353474844, -2.9059811161513, -3.02915869755416, + -3.15233627895703, -3.27551386035989, -3.39869144176276, + -3.52186902316562, -3.64504660456849, -3.76822418597135, + -3.89140176737422, -4.01457934877708, -4.13775693017995, + -4.26093451158281, -4.38411209298568, -4.50728967438854, + -4.63046725579141, -4.75364483719427, -4.87682241859714, -5, + -2.23798508052542, -2.35807268571997, -2.47816029091451, + -2.59824789610906, -2.71833550130361, -2.83842310649815, + -2.9585107116927, -3.07859831688725, -3.1986859220818, -3.31877352727634, + -3.43886113247089, -3.55894873766544, -3.67903634285998, + -3.79912394805453, -3.91921155324908, -4.03929915844362, + -4.15938676363817, -4.27947436883272, -4.39956197402727, + -4.51964957922181, -4.63973718441636, -4.75982478961091, + -4.87991239480545, -5, -2.30445671930436, -2.42165425324765, + -2.53885178719094, -2.65604932113423, -2.77324685507751, + -2.8904443890208, -3.00764192296409, -3.12483945690738, + -3.24203699085067, -3.35923452479396, -3.47643205873725, + -3.59362959268054, -3.71082712662382, -3.82802466056711, + -3.9452221945104, -4.06241972845369, -4.17961726239698, + -4.29681479634027, -4.41401233028356, -4.53120986422685, + -4.64840739817013, -4.76560493211342, -4.88280246605671, -5, + -2.36617996442956, -2.48069387901958, -2.5952077936096, + -2.70972170819962, -2.82423562278964, -2.93874953737966, + -3.05326345196967, -3.16777736655969, -3.28229128114971, + -3.39680519573973, -3.51131911032975, -3.62583302491977, + -3.74034693950979, -3.85486085409981, -3.96937476868983, + -4.08388868327985, -4.19840259786987, -4.31291651245988, + -4.4274304270499, -4.54194434163992, -4.65645825622994, + -4.77097217081996, -4.88548608540998, -5, -2.42301499289852, + -2.53505781929423, -2.64710064568995, -2.75914347208567, + -2.87118629848138, -2.9832291248771, -3.09527195127282, + -3.20731477766853, -3.31935760406425, -3.43140043045997, + -3.54344325685568, -3.6554860832514, -3.76752890964712, + -3.87957173604283, -3.99161456243855, -4.10365738883427, + -4.21570021522998, -4.3277430416257, -4.43978586802142, + -4.55182869441713, -4.66387152081285, -4.77591434720857, + -4.88795717360428, -5, -2.47483305509168, -2.5846229222616, + -2.69441278943153, -2.80420265660146, -2.91399252377138, + -3.02378239094131, -3.13357225811124, -3.24336212528117, + -3.35315199245109, -3.46294185962102, -3.57273172679095, + -3.68252159396087, -3.7923114611308, -3.90210132830073, + -4.01189119547066, -4.12168106264058, -4.23147092981051, + -4.34126079698044, -4.45105066415036, -4.56084053132029, + -4.67063039849022, -4.78042026566015, -4.89021013283007, -5, + -2.52151676643171, -2.62927690702164, -2.73703704761157, + -2.84479718820149, -2.95255732879142, -3.06031746938134, + -3.16807760997127, -3.27583775056119, -3.38359789115112, + -3.49135803174104, -3.59911817233097, -3.70687831292089, + -3.81463845351082, -3.92239859410075, -4.03015873469067, + -4.1379188752806, -4.24567901587052, -4.35343915646045, + -4.46119929705037, -4.5689594376403, -4.67671957823022, + -4.78447971882015, -4.89223985941007, -5, -2.56296037329738, + -2.66891861793663, -2.77487686257587, -2.88083510721511, + -2.98679335185436, -3.0927515964936, -3.19870984113285, + -3.30466808577209, -3.41062633041134, -3.51658457505058, + -3.62254281968982, -3.72850106432907, -3.83445930896831, + -3.94041755360756, -4.0463757982468, -4.15233404288605, + -4.25829228752529, -4.36425053216453, -4.47020877680378, + -4.57616702144302, -4.68212526608227, -4.78808351072151, + -4.89404175536076, -5, -2.59906999258946, -2.70345825378122, + -2.80784651497298, -2.91223477616474, -3.01662303735651, + -3.12101129854827, -3.22539955974003, -3.3297878209318, + -3.43417608212356, -3.53856434331532, -3.64295260450708, + -3.74734086569885, -3.85172912689061, -3.95611738808237, + -4.06050564927413, -4.1648939104659, -4.26928217165766, + -4.37367043284942, -4.47805869404119, -4.58244695523295, + -4.68683521642471, -4.79122347761647, -4.89561173880824, -5, + -2.62976382440616, -2.73281757117111, -2.83587131793606, + -2.93892506470101, -3.04197881146596, -3.14503255823091, + -3.24808630499586, -3.35114005176081, -3.45419379852575, + -3.5572475452907, -3.66030129205565, -3.7633550388206, -3.86640878558555, + -3.9694625323505, -4.07251627911545, -4.1755700258804, -4.27862377264535, + -4.3816775194103, -4.48473126617525, -4.5877850129402, -4.69083875970515, + -4.7938925064701, -4.89694625323505, -5, -2.65497233734624, + -2.75693006180945, -2.85888778627266, -2.96084551073586, + -3.06280323519907, -3.16476095966228, -3.26671868412548, + -3.36867640858869, -3.4706341330519, -3.57259185751511, + -3.67454958197831, -3.77650730644152, -3.87846503090473, + -3.98042275536793, -4.08238047983114, -4.18433820429435, + -4.28629592875755, -4.38825365322076, -4.49021137768397, + -4.59216910214717, -4.69412682661038, -4.79608455107359, + -4.89804227553679, -5, -2.67463842601999, -2.77574110314956, + -2.87684378027912, -2.97794645740869, -3.07904913453825, + -3.18015181166782, -3.28125448879738, -3.38235716592695, + -3.48345984305652, -3.58456252018608, -3.68566519731565, + -3.78676787444521, -3.88787055157478, -3.98897322870434, + -4.09007590583391, -4.19117858296347, -4.29228126009304, + -4.39338393722261, -4.49448661435217, -4.59558929148174, + -4.6966919686113, -4.79779464574087, -4.89889732287043, -5, + -2.68871754041127, -2.78920808213252, -2.88969862385377, + -2.99018916557502, -3.09067970729627, -3.19117024901752, + -3.29166079073876, -3.39215133246001, -3.49264187418126, + -3.59313241590251, -3.69362295762376, -3.79411349934501, + -3.89460404106626, -3.99509458278751, -4.09558512450876, + -4.19607566623001, -4.29656620795126, -4.3970567496725, + -4.49754729139375, -4.598037833115, -4.69852837483625, -4.7990189165575, + -4.89950945827875, -5, -2.69717778679766, -2.7973004917195, + -2.89742319664134, -2.99754590156318, -3.09766860648502, + -3.19779131140687, -3.29791401632871, -3.39803672125055, + -3.49815942617239, -3.59828213109423, -3.69840483601607, + -3.79852754093791, -3.89865024585975, -3.99877295078159, + -4.09889565570343, -4.19901836062527, -4.29914106554711, + -4.39926377046895, -4.4993864753908, -4.59950918031264, + -4.69963188523448, -4.79975459015632, -4.89987729507816, -5, -2.7, -2.8, + -2.9, -3, -3.1, -3.2, -3.3, -3.4, -3.5, -3.6, -3.7, -3.8, -3.9, -4, -4.1, + -4.2, -4.3, -4.4, -4.5, -4.6, -4.7, -4.8, -4.9, -5, -2.69717778679766, + -2.7973004917195, -2.89742319664134, -2.99754590156318, + -3.09766860648502, -3.19779131140687, -3.29791401632871, + -3.39803672125055, -3.49815942617239, -3.59828213109423, + -3.69840483601607, -3.79852754093791, -3.89865024585975, + -3.99877295078159, -4.09889565570343, -4.19901836062527, + -4.29914106554711, -4.39926377046895, -4.4993864753908, + -4.59950918031264, -4.69963188523448, -4.79975459015632, + -4.89987729507816, -5, -2.68871754041127, -2.78920808213252, + -2.88969862385377, -2.99018916557502, -3.09067970729627, + -3.19117024901752, -3.29166079073876, -3.39215133246001, + -3.49264187418126, -3.59313241590251, -3.69362295762376, + -3.79411349934501, -3.89460404106626, -3.99509458278751, + -4.09558512450876, -4.19607566623001, -4.29656620795126, + -4.3970567496725, -4.49754729139375, -4.598037833115, -4.69852837483625, + -4.7990189165575, -4.89950945827875, -5, -2.67463842601999, + -2.77574110314956, -2.87684378027912, -2.97794645740869, + -3.07904913453825, -3.18015181166782, -3.28125448879738, + -3.38235716592695, -3.48345984305652, -3.58456252018608, + -3.68566519731565, -3.78676787444521, -3.88787055157478, + -3.98897322870434, -4.09007590583391, -4.19117858296347, + -4.29228126009304, -4.39338393722261, -4.49448661435217, + -4.59558929148174, -4.6966919686113, -4.79779464574087, + -4.89889732287043, -5, -2.65497233734624, -2.75693006180945, + -2.85888778627266, -2.96084551073586, -3.06280323519907, + -3.16476095966228, -3.26671868412548, -3.36867640858869, + -3.4706341330519, -3.57259185751511, -3.67454958197831, + -3.77650730644152, -3.87846503090473, -3.98042275536793, + -4.08238047983114, -4.18433820429435, -4.28629592875755, + -4.38825365322076, -4.49021137768397, -4.59216910214717, + -4.69412682661038, -4.79608455107359, -4.89804227553679, -5, + -2.62976382440616, -2.73281757117111, -2.83587131793606, + -2.93892506470101, -3.04197881146596, -3.14503255823091, + -3.24808630499586, -3.35114005176081, -3.45419379852576, + -3.5572475452907, -3.66030129205565, -3.7633550388206, -3.86640878558555, + -3.9694625323505, -4.07251627911545, -4.1755700258804, -4.27862377264535, + -4.3816775194103, -4.48473126617525, -4.5877850129402, -4.69083875970515, + -4.7938925064701, -4.89694625323505, -5, -2.59906999258946, + -2.70345825378122, -2.80784651497298, -2.91223477616474, + -3.01662303735651, -3.12101129854827, -3.22539955974003, + -3.3297878209318, -3.43417608212356, -3.53856434331532, + -3.64295260450708, -3.74734086569885, -3.85172912689061, + -3.95611738808237, -4.06050564927413, -4.1648939104659, + -4.26928217165766, -4.37367043284942, -4.47805869404119, + -4.58244695523295, -4.68683521642471, -4.79122347761647, + -4.89561173880824, -5, -2.56296037329738, -2.66891861793663, + -2.77487686257587, -2.88083510721512, -2.98679335185436, + -3.0927515964936, -3.19870984113285, -3.30466808577209, + -3.41062633041134, -3.51658457505058, -3.62254281968983, + -3.72850106432907, -3.83445930896831, -3.94041755360756, + -4.0463757982468, -4.15233404288605, -4.25829228752529, + -4.36425053216453, -4.47020877680378, -4.57616702144302, + -4.68212526608227, -4.78808351072151, -4.89404175536076, -5, + -2.52151676643171, -2.62927690702164, -2.73703704761157, + -2.84479718820149, -2.95255732879142, -3.06031746938134, + -3.16807760997127, -3.27583775056119, -3.38359789115112, + -3.49135803174104, -3.59911817233097, -3.70687831292089, + -3.81463845351082, -3.92239859410075, -4.03015873469067, + -4.1379188752806, -4.24567901587052, -4.35343915646045, + -4.46119929705037, -4.5689594376403, -4.67671957823022, + -4.78447971882015, -4.89223985941007, -5, -2.47483305509168, + -2.5846229222616, -2.69441278943153, -2.80420265660146, + -2.91399252377138, -3.02378239094131, -3.13357225811124, + -3.24336212528117, -3.35315199245109, -3.46294185962102, + -3.57273172679095, -3.68252159396087, -3.7923114611308, + -3.90210132830073, -4.01189119547066, -4.12168106264058, + -4.23147092981051, -4.34126079698044, -4.45105066415036, + -4.56084053132029, -4.67063039849022, -4.78042026566015, + -4.89021013283007, -5, -2.42301499289852, -2.53505781929423, + -2.64710064568995, -2.75914347208567, -2.87118629848138, + -2.9832291248771, -3.09527195127282, -3.20731477766853, + -3.31935760406425, -3.43140043045997, -3.54344325685568, + -3.6554860832514, -3.76752890964712, -3.87957173604283, + -3.99161456243855, -4.10365738883427, -4.21570021522998, + -4.3277430416257, -4.43978586802142, -4.55182869441713, + -4.66387152081285, -4.77591434720857, -4.88795717360428, -5, + -2.36617996442956, -2.48069387901958, -2.5952077936096, + -2.70972170819962, -2.82423562278964, -2.93874953737966, + -3.05326345196967, -3.16777736655969, -3.28229128114971, + -3.39680519573973, -3.51131911032975, -3.62583302491977, + -3.74034693950979, -3.85486085409981, -3.96937476868983, + -4.08388868327985, -4.19840259786987, -4.31291651245988, + -4.4274304270499, -4.54194434163992, -4.65645825622994, + -4.77097217081996, -4.88548608540998, -5, -2.30445671930436, + -2.42165425324765, -2.53885178719094, -2.65604932113423, + -2.77324685507751, -2.8904443890208, -3.00764192296409, + -3.12483945690738, -3.24203699085067, -3.35923452479396, + -3.47643205873725, -3.59362959268054, -3.71082712662382, + -3.82802466056711, -3.9452221945104, -4.06241972845369, + -4.17961726239698, -4.29681479634027, -4.41401233028356, + -4.53120986422685, -4.64840739817013, -4.76560493211342, + -4.88280246605671, -5, -2.23798508052542, -2.35807268571997, + -2.47816029091451, -2.59824789610906, -2.71833550130361, + -2.83842310649815, -2.9585107116927, -3.07859831688725, -3.1986859220818, + -3.31877352727634, -3.43886113247089, -3.55894873766544, + -3.67903634285998, -3.79912394805453, -3.91921155324908, + -4.03929915844362, -4.15938676363817, -4.27947436883272, + -4.39956197402727, -4.51964957922181, -4.63973718441636, + -4.75982478961091, -4.87991239480545, -5, -2.16691562773411, + -2.29009320913698, -2.41327079053984, -2.53644837194271, + -2.65962595334557, -2.78280353474844, -2.9059811161513, + -3.02915869755416, -3.15233627895703, -3.27551386035989, + -3.39869144176276, -3.52186902316562, -3.64504660456849, + -3.76822418597135, -3.89140176737422, -4.01457934877708, + -4.13775693017995, -4.26093451158281, -4.38411209298568, + -4.50728967438854, -4.63046725579141, -4.75364483719427, + -4.87682241859714, -5, -2.09140935609936, -2.21786981887765, + -2.34433028165594, -2.47079074443423, -2.59725120721252, + -2.7237116699908, -2.85017213276909, -2.97663259554738, + -3.10309305832567, -3.22955352110396, -3.35601398388225, + -3.48247444666054, -3.60893490943882, -3.73539537221711, + -3.8618558349954, -3.98831629777369, -4.11477676055198, + -4.24123722333027, -4.36769768610856, -4.49415814888685, + -4.62061861166513, -4.74707907444342, -4.87353953722171, -5, + -2.0116373116118, -2.14156612415042, -2.27149493668904, + -2.40142374922765, -2.53135256176627, -2.66128137430489, + -2.7912101868435, -2.92113899938212, -3.05106781192074, + -3.18099662445936, -3.31092543699797, -3.44085424953659, + -3.57078306207521, -3.70071187461383, -3.83064068715244, + -3.96056949969106, -4.09049831222968, -4.2204271247683, + -4.35035593730691, -4.48028474984553, -4.61021356238415, + -4.74014237492277, -4.87007118746138, -5, -1.91515394098333, + -2.03610245211317, -2.15705096324302, -2.27799947437286, + -2.3989479855027, -2.51989649663254, -2.64084500776238, + -2.76179351889223, -2.88274203002207, -3.00369054115191, + -3.12463905228175, -3.24558756341159, -3.36653607454144, + -3.48748458567128, -3.60843309680112, -3.72938160793096, + -3.8503301190608, -3.97127863019065, -4.09222714132049, + -4.21317565245033, -4.33412416358017, -4.45507267471001, + -4.57602118583986, -4.6969696969697, -1.81477547016114, + -1.92691303206455, -2.03905059396795, -2.15118815587135, + -2.26332571777475, -2.37546327967815, -2.48760084158156, + -2.59973840348496, -2.71187596538836, -2.82401352729176, + -2.93615108919517, -3.04828865109857, -3.16042621300197, + -3.27256377490537, -3.38470133680877, -3.49683889871218, + -3.60897646061558, -3.72111402251898, -3.83325158442238, + -3.94538914632579, -4.05752670822919, -4.16966427013259, + -4.28180183203599, -4.39393939393939, -1.71070068612089, + -1.8141880080682, -1.91767533001551, -2.02116265196283, + -2.12464997391014, -2.22813729585745, -2.33162461780477, + -2.43511193975208, -2.53859926169939, -2.64208658364671, + -2.74557390559402, -2.84906122754133, -2.95254854948865, + -3.05603587143596, -3.15952319338327, -3.26301051533059, + -3.3664978372779, -3.46998515922521, -3.57347248117253, + -3.67695980311984, -3.78044712506715, -3.88393444701446, + -3.98742176896178, -4.09090909090909, -1.60313674917652, + -1.69812553346792, -1.79311431775932, -1.88810310205073, + -1.98309188634213, -2.07808067063353, -2.17306945492494, + -2.26805823921634, -2.36304702350774, -2.45803580779915, + -2.55302459209055, -2.64801337638195, -2.74300216067336, + -2.83799094496476, -2.93297972925616, -3.02796851354756, + -3.12295729783897, -3.21794608213037, -3.31293486642177, + -3.40792365071318, -3.50291243500458, -3.59790121929598, + -3.69289000358739, -3.78787878787879, -1.49229872369555, + -1.57893132200655, -1.66556392031754, -1.75219651862854, + -1.83882911693954, -1.92546171525054, -2.01209431356153, + -2.09872691187253, -2.18535951018353, -2.27199210849452, + -2.35862470680552, -2.44525730511652, -2.53188990342752, + -2.61852250173851, -2.70515510004951, -2.79178769836051, + -2.8784202966715, -2.9650528949825, -3.0516854932935, -3.1383180916045, + -3.22495068991549, -3.31158328822649, -3.39821588653749, + -3.48484848484848, -1.37840909090909, -1.45681818181818, + -1.53522727272727, -1.61363636363636, -1.69204545454545, + -1.77045454545454, -1.84886363636364, -1.92727272727273, + -2.00568181818182, -2.08409090909091, -2.1625, -2.24090909090909, + -2.31931818181818, -2.39772727272727, -2.47613636363636, + -2.55454545454545, -2.63295454545455, -2.71136363636364, + -2.78977272727273, -2.86818181818182, -2.94659090909091, -3.025, + -3.10340909090909, -3.18181818181818, -1.26169724492029, + -1.33200553334932, -1.40231382177834, -1.47262211020737, + -1.54293039863639, -1.61323868706542, -1.68354697549445, + -1.75385526392347, -1.8241635523525, -1.89447184078152, + -1.96478012921055, -2.03508841763957, -2.1053967060686, + -2.17570499449762, -2.24601328292665, -2.31632157135568, + -2.3866298597847, -2.45693814821373, -2.52724643664275, + -2.59755472507178, -2.6678630135008, -2.73817130192983, + -2.80847959035885, -2.87878787878788, -1.14239897305293, + -1.20471891230096, -1.26703885154899, -1.32935879079702, + -1.39167873004504, -1.45399866929307, -1.5163186085411, + -1.57863854778913, -1.64095848703716, -1.70327842628518, + -1.76559836553321, -1.82791830478124, -1.89023824402927, + -1.9525581832773, -2.01487812252532, -2.07719806177335, + -2.13951800102138, -2.20183794026941, -2.26415787951744, + -2.32647781876546, -2.38879775801349, -2.45111769726152, + -2.51343763650955, -2.57575757575758, -1.02075592171729, + -1.07518945871772, -1.12962299571816, -1.18405653271859, + -1.23849006971902, -1.29292360671946, -1.34735714371989, + -1.40179068072033, -1.45622421772076, -1.51065775472119, + -1.56509129172163, -1.61952482872206, -1.6739583657225, + -1.72839190272293, -1.78282543972337, -1.8372589767238, + -1.89169251372423, -1.94612605072467, -2.0005595877251, + -2.05499312472554, -2.10942666172597, -2.16386019872641, + -2.21829373572684, -2.27272727272727, -0.897015049003283, + -0.94365339338127, -0.990291737759256, -1.03693008213724, + -1.08356842651523, -1.13020677089322, -1.1768451152712, + -1.22348345964919, -1.27012180402717, -1.31676014840516, + -1.36339849278315, -1.41003683716113, -1.45667518153912, + -1.50331352591711, -1.54995187029509, -1.59659021467308, + -1.64322855905107, -1.68986690342905, -1.73650524780704, + -1.78314359218502, -1.82978193656301, -1.876420280941, -1.92305862531898, + -1.96969696969697, -0.771428065241007, -0.810351482694296, + -0.849274900147586, -0.888198317600875, -0.927121735054165, + -0.966045152507454, -1.00496856996074, -1.04389198741403, + -1.08281540486732, -1.12173882232061, -1.1606622397739, + -1.19958565722719, -1.23850907468048, -1.27743249213377, + -1.31635590958706, -1.35527932704035, -1.39420274449364, + -1.43312616194693, -1.47204957940022, -1.51097299685351, + -1.5498964143068, -1.58881983176009, -1.62774324921338, + -1.66666666666667, -0.64425086279584, -0.675528493267167, + -0.706806123738494, -0.738083754209821, -0.769361384681148, + -0.800639015152475, -0.831916645623803, -0.86319427609513, + -0.894471906566457, -0.925749537037784, -0.957027167509111, + -0.988304797980438, -1.01958242845177, -1.05086005892309, + -1.08213768939442, -1.11341531986575, -1.14469295033707, + -1.1759705808084, -1.20724821127973, -1.23852584175106, + -1.26980347222238, -1.30108110269371, -1.33235873316504, + -1.36363636363636, -0.515742936389942, -0.539432637442817, + -0.563122338495692, -0.586812039548566, -0.610501740601441, + -0.634191441654316, -0.65788114270719, -0.681570843760065, + -0.70526054481294, -0.728950245865815, -0.752639946918689, + -0.776329647971564, -0.800019349024439, -0.823709050077314, + -0.847398751130188, -0.871088452183063, -0.894778153235938, + -0.918467854288812, -0.942157555341687, -0.965847256394562, + -0.989536957447436, -1.01322665850031, -1.03691635955319, + -1.06060606060606, -0.386166795263259, -0.402315011015976, + -0.418463226768694, -0.434611442521411, -0.450759658274128, + -0.466907874026846, -0.483056089779563, -0.49920430553228, + -0.515352521284998, -0.531500737037715, -0.547648952790432, + -0.56379716854315, -0.579945384295867, -0.596093600048584, + -0.612241815801302, -0.628390031554019, -0.644538247306736, + -0.660686463059454, -0.676834678812171, -0.692982894564888, + -0.709131110317606, -0.725279326070323, -0.74142754182304, + -0.757575757575758, -0.255787368505649, -0.264429024420423, + -0.273070680335197, -0.281712336249971, -0.290353992164745, + -0.29899564807952, -0.307637303994294, -0.316278959909068, + -0.324920615823842, -0.333562271738616, -0.342203927653391, + -0.350845583568165, -0.359487239482939, -0.368128895397713, + -0.376770551312487, -0.385412207227261, -0.394053863142036, + -0.40269551905681, -0.411337174971584, -0.419978830886358, + -0.428620486801132, -0.437262142715907, -0.445903798630681, + -0.454545454545455, -0.124871404907288, -0.126029828672847, + -0.127188252438407, -0.128346676203966, -0.129505099969525, + -0.130663523735084, -0.131821947500644, -0.132980371266203, + -0.134138795031762, -0.135297218797322, -0.136455642562881, + -0.13761406632844, -0.138772490093999, -0.139930913859559, + -0.141089337625118, -0.142247761390677, -0.143406185156236, + -0.144564608921796, -0.145723032687355, -0.146881456452914, + -0.148039880218474, -0.149198303984033, -0.150356727749592, + -0.151515151515151, 0.00631313131313085, 0.0126262626262622, + 0.0189393939393935, 0.0252525252525248, 0.0315656565656562, + 0.0378787878787875, 0.0441919191919188, 0.0505050505050501, + 0.0568181818181815, 0.0631313131313128, 0.0694444444444441, + 0.0757575757575755, 0.0820707070707068, 0.0883838383838381, + 0.0946969696969694, 0.101010101010101, 0.107323232323232, + 0.113636363636363, 0.119949494949495, 0.126262626262626, + 0.132575757575757, 0.138888888888889, 0.14520202020202, + 0.151515151515151, 0.137497667533552, 0.151282353925374, + 0.165067040317196, 0.178851726709018, 0.192636413100839, + 0.206421099492661, 0.220205785884483, 0.233990472276305, + 0.247775158668127, 0.261559845059949, 0.27534453145177, + 0.289129217843592, 0.302913904235414, 0.316698590627236, + 0.330483277019058, 0.34426796341088, 0.358052649802701, + 0.371837336194523, 0.385622022586345, 0.399406708978167, + 0.413191395369989, 0.426976081761811, 0.440760768153632, + 0.454545454545454, 0.268413631131913, 0.289681549672949, + 0.310949468213986, 0.332217386755023, 0.35348530529606, + 0.374753223837096, 0.396021142378133, 0.41728906091917, + 0.438556979460207, 0.459824898001243, 0.48109281654228, + 0.502360735083317, 0.523628653624354, 0.54489657216539, + 0.566164490706427, 0.587432409247464, 0.608700327788501, + 0.629968246329537, 0.651236164870574, 0.672504083411611, + 0.693772001952648, 0.715039920493684, 0.736307839034721, + 0.757575757575758, 0.398793057889521, 0.427567536268501, + 0.456342014647481, 0.485116493026461, 0.51389097140544, + 0.542665449784421, 0.571439928163401, 0.600214406542381, + 0.628988884921361, 0.657763363300341, 0.686537841679321, + 0.715312320058301, 0.744086798437281, 0.772861276816261, + 0.801635755195241, 0.830410233574221, 0.859184711953201, + 0.887959190332181, 0.91673366871116, 0.945508147090141, + 0.974282625469121, 1.0030571038481, 1.03183158222708, 1.06060606060606, + 0.528369199016204, 0.564685162695341, 0.601001126374479, + 0.637317090053616, 0.673633053732753, 0.709949017411891, + 0.746264981091028, 0.782580944770165, 0.818896908449303, + 0.85521287212844, 0.891528835807577, 0.927844799486715, + 0.964160763165852, 1.00047672684499, 1.03679269052413, 1.07310865420326, + 1.1094246178824, 1.14574058156154, 1.18205654524068, 1.21837250891981, + 1.25468847259895, 1.29100443627809, 1.32732039995723, 1.36363636363636, + 0.656877125422099, 0.700781018519689, 0.744684911617279, + 0.788588804714869, 0.832492697812459, 0.876396590910049, + 0.920300484007638, 0.964204377105228, 1.00810827020282, 1.05201216330041, + 1.095916056398, 1.13981994949559, 1.18372384259318, 1.22762773569077, + 1.27153162878836, 1.31543552188595, 1.35933941498354, 1.40324330808113, + 1.44714720117872, 1.49105109427631, 1.5349549873739, 1.57885888047149, + 1.62276277356908, 1.66666666666667, 0.784054327867269, 0.835604007946821, + 0.887153688026373, 0.938703368105925, 0.990253048185477, + 1.04180272826503, 1.09335240834458, 1.14490208842413, 1.19645176850369, + 1.24800144858324, 1.29955112866279, 1.35110080874234, 1.4026504888219, + 1.45420016890145, 1.505749848981, 1.55729952906055, 1.6088492091401, + 1.66039888921966, 1.71194856929921, 1.76349824937876, 1.81504792945831, + 1.86659760953787, 1.91814728961742, 1.96969696969697, 0.909641311629545, + 0.968905918633794, 1.02817052563804, 1.08743513264229, 1.14669973964654, + 1.20596434665079, 1.26522895365504, 1.32449356065929, 1.38375816766354, + 1.44302277466779, 1.50228738167204, 1.56155198867628, 1.62081659568053, + 1.68008120268478, 1.73934580968903, 1.79861041669328, 1.85787502369753, + 1.91713963070178, 1.97640423770603, 2.03566884471028, 2.09493345171453, + 2.15419805871877, 2.21346266572302, 2.27272727272727, 1.03338218434355, + 1.10044198397024, 1.16750178359694, 1.23456158322364, 1.30162138285033, + 1.36868118247703, 1.43574098210373, 1.50280078173043, 1.56986058135712, + 1.63692038098382, 1.70398018061052, 1.77103998023721, 1.83809977986391, + 1.90515957949061, 1.9722193791173, 2.039279178744, 2.1063389783707, + 2.17339877799739, 2.24045857762409, 2.30751837725079, 2.37457817687749, + 2.44163797650418, 2.50869777613088, 2.57575757575758, 1.15502523567919, + 1.22997143755348, 1.30491763942778, 1.37986384130207, 1.45481004317636, + 1.52975624505065, 1.60470244692494, 1.67964864879923, 1.75459485067352, + 1.82954105254781, 1.9044872544221, 1.97943345629639, 2.05437965817068, + 2.12932586004497, 2.20427206191926, 2.27921826379355, 2.35416446566784, + 2.42911066754214, 2.50405686941643, 2.57900307129072, 2.65394927316501, + 2.7288954750393, 2.80384167691359, 2.87878787878788, 1.27432350754655, + 1.35725805860184, 1.44019260965713, 1.52312716071242, 1.60606171176771, + 1.688996262823, 1.77193081387828, 1.85486536493357, 1.93779991598886, + 2.02073446704415, 2.10366901809944, 2.18660356915472, 2.26953812021001, + 2.3524726712653, 2.43540722232059, 2.51834177337588, 2.60127632443116, + 2.68421087548645, 2.76714542654174, 2.85007997759703, 2.93301452865232, + 3.01594907970761, 3.09888363076289, 3.18181818181818, 1.39103535353535, + 1.48207070707071, 1.57310606060606, 1.66414141414141, 1.75517676767677, + 1.84621212121212, 1.93724747474747, 2.02828282828283, 2.11931818181818, + 2.21035353535354, 2.30138888888889, 2.39242424242424, 2.4834595959596, + 2.57449494949495, 2.6655303030303, 2.75656565656566, 2.84760101010101, + 2.93863636363636, 3.02967171717172, 3.12070707070707, 3.21174242424242, + 3.30277777777778, 3.39381313131313, 3.48484848484848, 1.50492498632181, + 1.60418384725907, 1.70344270819633, 1.80270156913359, 1.90196043007085, + 2.00121929100811, 2.10047815194537, 2.19973701288263, 2.29899587381989, + 2.39825473475715, 2.49751359569441, 2.59677245663167, 2.69603131756893, + 2.79529017850619, 2.89454903944345, 2.99380790038071, 3.09306676131797, + 3.19232562225523, 3.29158448319249, 3.39084334412975, 3.49010220506701, + 3.58936106600427, 3.68861992694153, 3.78787878787879, 1.61576301180278, + 1.72337805872045, 1.83099310563811, 1.93860815255578, 2.04622319947344, + 2.15383824639111, 2.26145329330877, 2.36906834022644, 2.47668338714411, + 2.58429843406177, 2.69191348097944, 2.7995285278971, 2.90714357481477, + 3.01475862173243, 3.1223736686501, 3.22998871556777, 3.33760376248543, + 3.4452188094031, 3.55283385632076, 3.66044890323843, 3.76806395015609, + 3.87567899707376, 3.98329404399143, 4.09090909090909, 1.72332694874715, + 1.83944053332073, 1.9555541178943, 2.07166770246788, 2.18778128704145, + 2.30389487161503, 2.4200084561886, 2.53612204076218, 2.65223562533576, + 2.76834920990933, 2.88446279448291, 3.00057637905648, 3.11668996363006, + 3.23280354820364, 3.34891713277721, 3.46503071735079, 3.58114430192436, + 3.69725788649794, 3.81337147107151, 3.92948505564509, 4.04559864021867, + 4.16171222479224, 4.27782580936582, 4.39393939393939, 1.8274017327874, + 1.95216555731707, 2.07692938184673, 2.2016932063764, 2.32645703090606, + 2.45122085543573, 2.57598467996539, 2.70074850449506, 2.82551232902472, + 2.95027615355439, 3.07503997808405, 3.19980380261372, 3.32456762714338, + 3.44933145167305, 3.57409527620271, 3.69885910073238, 3.82362292526204, + 3.94838674979171, 4.07315057432137, 4.19791439885104, 4.3226782233807, + 4.44744204791037, 4.57220587244003, 4.6969696969697, 1.92778020360959, + 2.0613549773657, 2.1949297511218, 2.32850452487791, 2.46207929863401, + 2.59565407239012, 2.72922884614622, 2.86280361990233, 2.99637839365843, + 3.12995316741454, 3.26352794117064, 3.39710271492675, 3.53067748868285, + 3.66425226243895, 3.79782703619506, 3.93140180995116, 4.06497658370727, + 4.19855135746337, 4.33212613121948, 4.46570090497558, 4.59927567873169, + 4.73285045248779, 4.8664252262439, 5, 2.0116373116118, 2.14156612415042, + 2.27149493668903, 2.40142374922765, 2.53135256176627, 2.66128137430489, + 2.7912101868435, 2.92113899938212, 3.05106781192074, 3.18099662445936, + 3.31092543699797, 3.44085424953659, 3.57078306207521, 3.70071187461383, + 3.83064068715244, 3.96056949969106, 4.09049831222968, 4.2204271247683, + 4.35035593730691, 4.48028474984553, 4.61021356238415, 4.74014237492277, + 4.87007118746138, 5, 2.09140935609936, 2.21786981887765, + 2.34433028165594, 2.47079074443423, 2.59725120721251, 2.7237116699908, + 2.85017213276909, 2.97663259554738, 3.10309305832567, 3.22955352110396, + 3.35601398388225, 3.48247444666054, 3.60893490943882, 3.73539537221711, + 3.8618558349954, 3.98831629777369, 4.11477676055198, 4.24123722333027, + 4.36769768610856, 4.49415814888685, 4.62061861166513, 4.74707907444342, + 4.87353953722171, 5, 2.16691562773411, 2.29009320913698, + 2.41327079053984, 2.53644837194271, 2.65962595334557, 2.78280353474843, + 2.9059811161513, 3.02915869755416, 3.15233627895703, 3.27551386035989, + 3.39869144176276, 3.52186902316562, 3.64504660456849, 3.76822418597135, + 3.89140176737422, 4.01457934877708, 4.13775693017995, 4.26093451158281, + 4.38411209298568, 4.50728967438854, 4.63046725579141, 4.75364483719427, + 4.87682241859714, 5, 2.23798508052542, 2.35807268571997, + 2.47816029091451, 2.59824789610906, 2.71833550130361, 2.83842310649815, + 2.9585107116927, 3.07859831688725, 3.1986859220818, 3.31877352727634, + 3.43886113247089, 3.55894873766544, 3.67903634285998, 3.79912394805453, + 3.91921155324908, 4.03929915844362, 4.15938676363817, 4.27947436883272, + 4.39956197402726, 4.51964957922181, 4.63973718441636, 4.75982478961091, + 4.87991239480545, 5, 2.30445671930436, 2.42165425324765, + 2.53885178719094, 2.65604932113423, 2.77324685507751, 2.8904443890208, + 3.00764192296409, 3.12483945690738, 3.24203699085067, 3.35923452479396, + 3.47643205873725, 3.59362959268054, 3.71082712662382, 3.82802466056711, + 3.9452221945104, 4.06241972845369, 4.17961726239698, 4.29681479634027, + 4.41401233028356, 4.53120986422685, 4.64840739817013, 4.76560493211342, + 4.88280246605671, 5, 2.36617996442956, 2.48069387901958, 2.5952077936096, + 2.70972170819962, 2.82423562278964, 2.93874953737966, 3.05326345196967, + 3.16777736655969, 3.28229128114971, 3.39680519573973, 3.51131911032975, + 3.62583302491977, 3.74034693950979, 3.85486085409981, 3.96937476868983, + 4.08388868327985, 4.19840259786987, 4.31291651245989, 4.4274304270499, + 4.54194434163992, 4.65645825622994, 4.77097217081996, 4.88548608540998, + 5, 2.42301499289852, 2.53505781929423, 2.64710064568995, + 2.75914347208567, 2.87118629848138, 2.9832291248771, 3.09527195127282, + 3.20731477766853, 3.31935760406425, 3.43140043045997, 3.54344325685568, + 3.6554860832514, 3.76752890964712, 3.87957173604283, 3.99161456243855, + 4.10365738883427, 4.21570021522998, 4.3277430416257, 4.43978586802142, + 4.55182869441713, 4.66387152081285, 4.77591434720857, 4.88795717360428, + 5, 2.47483305509168, 2.5846229222616, 2.69441278943153, 2.80420265660146, + 2.91399252377138, 3.02378239094131, 3.13357225811124, 3.24336212528117, + 3.35315199245109, 3.46294185962102, 3.57273172679095, 3.68252159396087, + 3.7923114611308, 3.90210132830073, 4.01189119547066, 4.12168106264058, + 4.23147092981051, 4.34126079698044, 4.45105066415036, 4.56084053132029, + 4.67063039849022, 4.78042026566015, 4.89021013283007, 5, + 2.52151676643171, 2.62927690702164, 2.73703704761157, 2.84479718820149, + 2.95255732879142, 3.06031746938134, 3.16807760997127, 3.27583775056119, + 3.38359789115112, 3.49135803174104, 3.59911817233097, 3.70687831292089, + 3.81463845351082, 3.92239859410075, 4.03015873469067, 4.1379188752806, + 4.24567901587052, 4.35343915646045, 4.46119929705037, 4.5689594376403, + 4.67671957823022, 4.78447971882015, 4.89223985941007, 5, + 2.56296037329738, 2.66891861793663, 2.77487686257587, 2.88083510721511, + 2.98679335185436, 3.0927515964936, 3.19870984113285, 3.30466808577209, + 3.41062633041134, 3.51658457505058, 3.62254281968982, 3.72850106432907, + 3.83445930896831, 3.94041755360756, 4.0463757982468, 4.15233404288605, + 4.25829228752529, 4.36425053216453, 4.47020877680378, 4.57616702144302, + 4.68212526608227, 4.78808351072151, 4.89404175536076, 5, + 2.59906999258946, 2.70345825378122, 2.80784651497298, 2.91223477616474, + 3.01662303735651, 3.12101129854827, 3.22539955974003, 3.3297878209318, + 3.43417608212356, 3.53856434331532, 3.64295260450708, 3.74734086569885, + 3.85172912689061, 3.95611738808237, 4.06050564927413, 4.1648939104659, + 4.26928217165766, 4.37367043284942, 4.47805869404119, 4.58244695523295, + 4.68683521642471, 4.79122347761647, 4.89561173880824, 5, + 2.62976382440616, 2.73281757117111, 2.83587131793606, 2.93892506470101, + 3.04197881146596, 3.14503255823091, 3.24808630499586, 3.35114005176081, + 3.45419379852575, 3.5572475452907, 3.66030129205565, 3.7633550388206, + 3.86640878558555, 3.9694625323505, 4.07251627911545, 4.1755700258804, + 4.27862377264535, 4.3816775194103, 4.48473126617525, 4.5877850129402, + 4.69083875970515, 4.7938925064701, 4.89694625323505, 5, 2.65497233734624, + 2.75693006180945, 2.85888778627266, 2.96084551073586, 3.06280323519907, + 3.16476095966228, 3.26671868412548, 3.36867640858869, 3.4706341330519, + 3.57259185751511, 3.67454958197831, 3.77650730644152, 3.87846503090473, + 3.98042275536793, 4.08238047983114, 4.18433820429435, 4.28629592875755, + 4.38825365322076, 4.49021137768397, 4.59216910214717, 4.69412682661038, + 4.79608455107359, 4.89804227553679, 5, 2.67463842601999, + 2.77574110314956, 2.87684378027912, 2.97794645740869, 3.07904913453825, + 3.18015181166782, 3.28125448879738, 3.38235716592695, 3.48345984305652, + 3.58456252018608, 3.68566519731565, 3.78676787444521, 3.88787055157478, + 3.98897322870434, 4.09007590583391, 4.19117858296347, 4.29228126009304, + 4.39338393722261, 4.49448661435217, 4.59558929148174, 4.6966919686113, + 4.79779464574087, 4.89889732287043, 5, 2.68871754041127, + 2.78920808213252, 2.88969862385377, 2.99018916557502, 3.09067970729627, + 3.19117024901752, 3.29166079073876, 3.39215133246001, 3.49264187418126, + 3.59313241590251, 3.69362295762376, 3.79411349934501, 3.89460404106626, + 3.99509458278751, 4.09558512450876, 4.19607566623001, 4.29656620795126, + 4.3970567496725, 4.49754729139375, 4.598037833115, 4.69852837483625, + 4.7990189165575, 4.89950945827875, 5, 2.69717778679766, 2.7973004917195, + 2.89742319664134, 2.99754590156318, 3.09766860648502, 3.19779131140687, + 3.29791401632871, 3.39803672125055, 3.49815942617239, 3.59828213109423, + 3.69840483601607, 3.79852754093791, 3.89865024585975, 3.99877295078159, + 4.09889565570343, 4.19901836062527, 4.29914106554711, 4.39926377046895, + 4.4993864753908, 4.59950918031264, 4.69963188523448, 4.79975459015632, + 4.89987729507816, 5 ; + + coordy = 0, 0.0951638316474846, 0.0921493937456564, 0, 0.190112086608365, + 0.184098181407945, 0.28462967654657, 0.2756462113408, 0.37850248872082, + 0.366594239743307, 0.471517871018854, 0.456744382011003, + 0.563465113682859, 0.545900561008143, 0.654135926634843, + 0.633868951245487, 0.743324911320655, 0.720458417957364, + 0.830830026003773, 0.805480950083401, 0.916453043454821, + 0.88875208617404, 1, 0.970091332255051, 1.08128163491119, + 1.04932257070444, 1.1601138191424, 1.1262744592155, 1.23631797244121, + 1.20078081894225, 1.30972146789057, 1.27268101094799, 1.38015802296422, + 1.34182030010411, 1.44746807621014, 1.40515827116473, 1.51149914870852, + 1.46544496847418, 1.57210618948557, 1.52254541404295, 1.62915190410067, + 1.57633184776656, 1.68250706566236, 1.62668401684325, 1.73205080756888, + 1.67348944818527, 1.77767089730985, 1.71664370320657, 1.81926399070904, + 1.75605061440983, 1.85673586603215, 1.79162250323673, 1.89000163742934, + 1.82328037868812, 1.91898594722899, 1.85095411626404, 1.94362313664708, + 1.87458261681821, 1.96385739452541, 1.89411394496733, 1.97964288376187, + 1.90950544674137, 1.99094384514617, 1.92072384620856, 1.99773467836602, + 1.92774532085603, 2, 1.93055555555556, 0.0892058837944594, 0, + 0.1782257798593, 0.26687412178693, 0.354966184859383, 0.442318504509218, + 0.528749291925774, 0.614078845865291, 0.698129959732033, + 0.780728323008215, 0.861702916123396, 0.940886397868808, + 1.01811548447902, 1.09323131952217, 1.16607983376092, 1.23651209416876, + 1.30438464131129, 1.36384399094392, 1.42047441601005, 1.47415077449309, + 1.52475461628737, 1.57217445152577, 1.6163060031401, 1.65705244308219, + 1.6943246116706, 1.72804121956591, 1.75812903191729, 1.78452303426296, + 1.80716657980884, 1.8260115177518, 1.84101830235666, 1.85215608254006, + 1.85940277175805, 1.86274509803922, 0.0863333017938937, 0, + 0.172494881962429, 0.25831340788496, 0.343618324069047, + 0.428240238513501, 0.51201130643575, 0.594765610494257, + 0.676339536644662, 0.756572144778214, 0.835305533302888, + 0.912385196841268, 0.987660376234932, 1.06098440006242, 1.1322150168972, + 1.20121471755289, 1.26785104658576, 1.32352523554771, 1.37658749131615, + 1.42692227083599, 1.4744202096631, 1.51897836970991, 1.56050047243337, + 1.59889711693672, 1.63408598249135, 1.66599201501969, 1.69454759711684, + 1.71969270122577, 1.74137502561898, 1.7595501128788, 1.77418145060772, + 1.78524055414069, 1.79270703107207, 1.79656862745098, 0.0835316477439593, + 0, 0.166905487717333, 0.249964069634891, 0.3325506573723, + 0.414509584023851, 0.495686604538073, 0.575929245132385, + 0.65508714869525, 0.733012415393399, 0.809559937712515, + 0.884587729172434, 0.957957245972181, 1.02953370083625, 1.09918636835111, + 1.16678888110037, 1.23221951592754, 1.2842020049761, 1.33378419439247, + 1.38085990307167, 1.42532862789375, 1.46709577139568, 1.50607285606508, + 1.54217772477015, 1.57533472687208, 1.60547488959806, 1.63253607428677, + 1.65646311715245, 1.67720795424861, 1.69472973034835, 1.70899489149456, + 1.71997726101044, 1.72765809879808, 1.73202614379085, 0.080800921644656, + 0, 0.161457597124011, 0.241826107036723, 0.321763184769141, + 0.401126541040268, 0.479775186232742, 0.557569749779674, + 0.634372795883799, 0.710049134853768, 0.784466129352279, + 0.857493994862304, 0.929006093690767, 0.998879221843645, + 1.06699388812265, 1.1332345848112, 1.19749004933661, 1.24587429922908, + 1.29206452523901, 1.33596367120011, 1.37747987097932, 1.41652665658308, + 1.45302315403522, 1.48689426658247, 1.5180708448128, 1.54648984330104, + 1.57209446342709, 1.59483428204302, 1.61466536569775, 1.63155037016045, + 1.64545862501717, 1.6563662031493, 1.6642559749361, 1.66911764705882, + 0.0781411234959841, 0, 0.156151210182464, 0.233899520090455, + 0.311255906259571, 0.388091109562751, 0.464277051519758, + 0.539687124436124, 0.614196478210307, 0.687682303159323, + 0.760024108222179, 0.831103993910879, 0.900806919390687, + 0.969020963084617, 1.0356375762118, 1.1005518286854, 1.16366264681297, + 1.20854211830666, 1.25142848385577, 1.29223357522132, 1.33087393891981, + 1.3672710252721, 1.4013513663438, 1.4330467423737, 1.46229433631349, + 1.48903687612861, 1.51322276453778, 1.53480619589747, 1.5537472599664, + 1.57001203231508, 1.58357265117557, 1.59440738055729, 1.60250065948611, + 1.6078431372549, 0.0755522532979434, 0, 0.150986326892691, + 0.226184308796087, 0.301028821843589, 0.375403289591302, + 0.449192200399119, 0.522281369101735, 0.594558195674775, + 0.665911920310063, 0.736233874322214, 0.805417726318159, + 0.873359723071944, 0.939958924559163, 1.00511743261858, 1.06874061272294, + 1.13073730835664, 1.17220546220884, 1.21187607024274, 1.2496696151353, + 1.28551083171522, 1.31932887746275, 1.35105749299082, 1.38063515214383, + 1.40800520137417, 1.43311598808078, 1.45592097761886, 1.4763788587158, + 1.49445363705454, 1.51011471681226, 1.52333696996973, 1.5341007932344, + 1.54239215244813, 1.54820261437909, 0.073034311050534, 0, + 0.145962947254693, 0.21868047315362, 0.291081931521196, + 0.363063081125921, 0.434520632870827, 0.505352483776508, + 0.575457948277202, 0.644737986305988, 0.713095427652386, + 0.780435192084143, 0.846664504734535, 0.911693106267283, + 0.975433457342979, 1.03780093692384, 1.0987140339676, 1.13686433093562, + 1.17340728439994, 1.20827179094205, 1.24139054936555, 1.27270021315502, + 1.30214153397628, 1.32965949589285, 1.35520343999483, 1.37872717915755, + 1.40018910267031, 1.41955227049801, 1.43678449696219, 1.45185842365198, + 1.46475158139968, 1.47544644118063, 1.48393045382214, 1.49019607843137, + 0.0705872967537558, 0, 0.14108107126847, 0.211388013163053, + 0.281415235292391, 0.351070484166606, 0.420262348934881, + 0.488900468460442, 0.55689573601759, 0.624160501147098, + 0.690608768212694, 0.756156391208832, 0.820721264378462, + 0.884223508208977, 0.946585650385001, 1.0077328012881, 1.06759282364586, + 1.10251872448699, 1.13602212632736, 1.16804010264156, 1.1985130918708, + 1.22738503234893, 1.25460348930017, 1.28011977362078, 1.30388905217547, + 1.32587044935892, 1.34602713969215, 1.3643264312441, 1.38073983968934, + 1.39524315283425, 1.40781648546539, 1.41844432439598, 1.42711556360816, + 1.43382352941176, 0.0682112104076088, 0, 0.136340698934021, + 0.204306928824387, 0.272028733157175, 0.339425498713358, + 0.406417348591282, 0.472925323153537, 0.538871558895937, + 0.604179464833394, 0.668773896003138, 0.732581323692225, + 0.795530002003725, 0.857550130384246, 0.918574011744646, + 0.978536205815711, 1.03737367739141, 1.06916864286296, 1.09972059602499, + 1.12897455023384, 1.15687845923097, 1.18338333504445, 1.20844335896251, + 1.23201598532761, 1.25406203791609, 1.27454579868488, 1.29343508868437, + 1.31070134095408, 1.326319665236, 1.34026890435905, 1.35253168216689, + 1.36309444288045, 1.37194748180617, 1.37908496732026, 0.0659060520120932, + 0, 0.131741830251347, 0.197437220137621, 0.262922425115547, + 0.328128124766177, 0.392985631840029, 0.457427047855794, + 0.521385416912244, 0.584794877364874, 0.647590811023717, + 0.709709989534324, 0.771090717610323, 0.831672972793088, + 0.891398541421914, 0.950211150506677, 1.00805659520426, 1.03681408606353, + 1.06450269349285, 1.09107513371889, 1.11648665144606, 1.1406951212416, + 1.16366114296328, 1.18534813101334, 1.2057223972167, 1.22475322713545, + 1.24241294964697, 1.25867699962793, 1.27352397360215, 1.28693567822641, + 1.29889717150416, 1.30939679663404, 1.31842620841619, 1.32598039215686, + 0.0636718215672087, 0, 0.127284465220448, 0.190778887102756, + 0.254096311167508, 0.317178362325064, 0.379967198681121, + 0.442405642567212, 0.504437310066511, 0.56600673874154, + 0.627059513274433, 0.687542388735127, 0.747403411198256, + 0.806592035435505, 0.865059239416804, 0.922757635360998, + 0.97964157708441, 1.0054550540887, 1.03036841873093, 1.05434185309671, + 1.07733766851607, 1.09932039094038, 1.12025684130249, 1.14011621067797, + 1.15887013007728, 1.17649273471061, 1.19296072257996, 1.20825340726567, + 1.22235276478781, 1.2352434744363, 1.24691295347721, 1.25735138565675, + 1.2665517434382, 1.27450980392157, 0.0615085190729555, 0, + 0.122968603841323, 0.184331929719791, 0.245550391313058, + 0.306576211390018, 0.367362049114561, 0.427861107287792, + 0.488027238358737, 0.547815048963392, 0.607180002755285, + 0.666078521294634, 0.724468082767525, 0.782307318311495, + 0.839556105729316, 0.896175660378673, 0.952128623031855, + 0.975091546938469, 0.997317771739223, 1.01877470836729, 1.039431510441, + 1.05925914414079, 1.07823045398013, 1.0963202243215, 1.11350523649785, + 1.12976432141037, 1.14507840748332, 1.15943056386729, 1.17280603879298, + 1.18519229298874, 1.19657902808603, 1.20695820994858, 1.21632408687221, + 1.22467320261438, 0.0594161445293336, 0, 0.118794246113972, + 0.178096347988727, 0.237284665552196, 0.296321671961038, + 0.355170183140346, 0.413793442017532, 0.472155201788924, + 0.530219808030428, 0.587952279466273, 0.645318387212847, + 0.702284732318129, 0.75881882142106, 0.814889140359451, + 0.870465225559704, 0.925517733046597, 0.945723564612833, + 0.965350752517739, 0.984373699530647, 1.00276817722086, 1.02051138084282, + 1.03758198099622, 1.05396017194393, 1.06962771647839, 1.08456798723472, + 1.09876600435707, 1.11220846943279, 1.12488379561764, 1.13678213388372, + 1.14789539533064, 1.15821726950953, 1.16774323871822, 1.17647058823529, + 0.0573946979363429, 0, 0.114761392038397, 0.172072141909563, + 0.229299133884923, 0.286414744038126, 0.343391600758478, + 0.400202646756434, 0.45682120035707, 0.513221015942649, + 0.569376343407396, 0.625261986489763, 0.680853359850069, + 0.736126544764198, 0.791058343307209, 0.84562633090409, + 0.899808907128636, 0.917351107111795, 0.934467361066474, + 0.951138826586767, 0.967347668855629, 0.983077101046474, + 0.99831142235074, 1.01303605354527, 1.02723757001892, 1.04090373218368, + 1.0540235132012, 1.06658712396217, 1.07858603526181, 1.09001299712124, + 1.10086205521101, 1.1111285643396, 1.12080919897623, 1.12990196078431, + 0.0554441792939835, 0, 0.110870041614595, 0.1662593114823, + 0.221593796311238, 0.276855427621281, 0.332026301968956, + 0.387088721504498, 0.442025234063176, 0.496818672700056, + 0.551452194578656, 0.605909319125385, 0.660173965363344, + 0.714230488340911, 0.768063714572589, 0.82165897641183, + 0.875002145277972, 0.889974174435355, 0.90466759738543, + 0.919070089535655, 0.933169985345321, 0.946956304751757, 0.9604187780437, + 0.973547869125499, 0.986334797119435, 0.998771556257233, 1.0108509340157, + 1.02256652745543, 1.03391275772548, 1.04488488270131, 1.05547900772717, + 1.06569209443879, 1.07552196764625, 1.08496732026144, 0.0535645886022553, + 0, 0.107120194842569, 0.160657856706937, 0.214168652831141, + 0.267643722710503, 0.32107428677178, 0.374451666261723, + 0.427767302907242, 0.481012778302648, 0.534179832980052, + 0.587260385119711, 0.640246548857955, 0.693130652151198, + 0.745905254155592, 0.798563162082926, 0.851097447494605, + 0.863592766583512, 0.875951461474605, 0.888167488377311, + 0.900235126689934, 0.912148991958666, 0.923904048075098, + 0.935495618684633, 0.946919397779927, 0.958171459455384, + 0.969248266800595, 0.980146679912575, 0.990863963008656, + 1.00139779062391, 1.01174625287909, 1.0219078598071, 1.03188154472826, + 1.04166666666667, 0.0517559258611584, 0, 0.103511851722317, + 0.155267777583475, 0.207023703444634, 0.258779629305792, + 0.31053555516695, 0.362291481028109, 0.414047406889267, + 0.465803332750425, 0.517559258611584, 0.569315184472742, + 0.621071110333901, 0.672827036195059, 0.724582962056217, + 0.776338887917376, 0.828094813778534, 0.838206883556267, + 0.848318953334001, 0.858431023111734, 0.868543092889467, + 0.878655162667201, 0.888767232444934, 0.898879302222667, 0.9089913720004, + 0.919103441778134, 0.929215511555867, 0.9393275813336, 0.949439651111334, + 0.959551720889067, 0.9696637906668, 0.979775860444533, 0.989887930222267, + 1, 0.785818953334001, 0.795299018750626, 0.804779084167251, + 0.814259149583876, 0.8237392150005, 0.833219280417125, 0.84269934583375, + 0.852179411250375, 0.861659476667, 0.871139542083626, 0.88061960750025, + 0.890099672916875, 0.8995797383335, 0.909059803750125, 0.91853986916675, + 0.928019934583375, 0.9375, 0.733431023111734, 0.742279084167251, + 0.751127145222767, 0.759975206278284, 0.768823267333801, + 0.777671328389317, 0.786519389444834, 0.79536745050035, + 0.804215511555867, 0.813063572611384, 0.8219116336669, 0.830759694722417, + 0.839607755777934, 0.84845581683345, 0.857303877888967, + 0.866151938944483, 0.875, 0.681043092889467, 0.689259149583875, + 0.697475206278284, 0.705691262972692, 0.7139073196671, 0.722123376361509, + 0.730339433055917, 0.738555489750325, 0.746771546444734, + 0.754987603139142, 0.76320365983355, 0.771419716527959, + 0.779635773222367, 0.787851829916775, 0.796067886611183, + 0.804283943305592, 0.8125, 0.628655162667201, 0.636239215000501, + 0.6438232673338, 0.6514073196671, 0.6589913720004, 0.6665754243337, + 0.674159476667, 0.6817435290003, 0.6893275813336, 0.6969116336669, + 0.7044956860002, 0.7120797383335, 0.7196637906668, 0.7272478430001, + 0.7348318953334, 0.7424159476667, 0.75, 0.576267232444934, + 0.583219280417125, 0.590171328389317, 0.597123376361509, 0.6040754243337, + 0.611027472305892, 0.617979520278084, 0.624931568250275, + 0.631883616222467, 0.638835664194658, 0.64578771216685, + 0.652739760139042, 0.659691808111233, 0.666643856083425, + 0.673595904055617, 0.680547952027808, 0.6875, 0.523879302222667, + 0.53019934583375, 0.536519389444834, 0.542839433055917, 0.549159476667, + 0.555479520278084, 0.561799563889167, 0.56811960750025, + 0.574439651111334, 0.580759694722417, 0.5870797383335, 0.593399781944583, + 0.599719825555667, 0.60603986916675, 0.612359912777833, + 0.618679956388917, 0.625, 0.4714913720004, 0.477179411250375, + 0.48286745050035, 0.488555489750325, 0.4942435290003, 0.499931568250275, + 0.50561960750025, 0.511307646750225, 0.5169956860002, 0.522683725250175, + 0.52837176450015, 0.534059803750125, 0.5397478430001, 0.545435882250075, + 0.55112392150005, 0.556811960750025, 0.5625, 0.419103441778134, + 0.424159476667, 0.429215511555867, 0.434271546444734, 0.4393275813336, + 0.444383616222467, 0.449439651111334, 0.4544956860002, 0.459551720889067, + 0.464607755777934, 0.4696637906668, 0.474719825555667, 0.479775860444533, + 0.4848318953334, 0.489887930222267, 0.494943965111133, 0.5, + 0.366715511555867, 0.371139542083625, 0.375563572611384, + 0.379987603139142, 0.3844116336669, 0.388835664194659, 0.393259694722417, + 0.397683725250175, 0.402107755777933, 0.406531786305692, + 0.41095581683345, 0.415379847361208, 0.419803877888967, + 0.424227908416725, 0.428651938944483, 0.433075969472242, 0.4375, + 0.3143275813336, 0.31811960750025, 0.3219116336669, 0.32570365983355, + 0.3294956860002, 0.33328771216685, 0.3370797383335, 0.34087176450015, + 0.3446637906668, 0.34845581683345, 0.3522478430001, 0.35603986916675, + 0.3598318953334, 0.36362392150005, 0.3674159476667, 0.37120797383335, + 0.375, 0.261939651111334, 0.265099672916875, 0.268259694722417, + 0.271419716527958, 0.2745797383335, 0.277739760139042, 0.280899781944583, + 0.284059803750125, 0.287219825555667, 0.290379847361208, + 0.29353986916675, 0.296699890972292, 0.299859912777833, + 0.303019934583375, 0.306179956388917, 0.309339978194458, 0.3125, + 0.209551720889067, 0.2120797383335, 0.214607755777933, 0.217135773222367, + 0.2196637906668, 0.222191808111233, 0.224719825555667, 0.2272478430001, + 0.229775860444533, 0.232303877888967, 0.2348318953334, 0.237359912777833, + 0.239887930222267, 0.2424159476667, 0.244943965111133, 0.247471982555567, + 0.25, 0.1571637906668, 0.159059803750125, 0.16095581683345, + 0.162851829916775, 0.1647478430001, 0.166643856083425, 0.16853986916675, + 0.170435882250075, 0.1723318953334, 0.174227908416725, 0.17612392150005, + 0.178019934583375, 0.1799159476667, 0.181811960750025, 0.18370797383335, + 0.185603986916675, 0.1875, 0.104775860444533, 0.10603986916675, + 0.107303877888967, 0.108567886611183, 0.1098318953334, 0.111095904055617, + 0.112359912777833, 0.11362392150005, 0.114887930222267, + 0.116151938944483, 0.1174159476667, 0.118679956388917, 0.119943965111133, + 0.12120797383335, 0.122471982555567, 0.123735991277783, 0.125, + 0.0523879302222667, 0.053019934583375, 0.0536519389444834, + 0.0542839433055917, 0.0549159476667, 0.0555479520278084, + 0.0561799563889167, 0.056811960750025, 0.0574439651111334, + 0.0580759694722417, 0.05870797383335, 0.0593399781944584, + 0.0599719825555667, 0.060603986916675, 0.0612359912777833, + 0.0618679956388917, 0.0625, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 1.99773467836602, 1.92774532085603, 1.99094384514617, + 1.92072384620856, 1.97964288376187, 1.90950544674137, 1.96385739452541, + 1.89411394496733, 1.94362313664708, 1.87458261681821, 1.91898594722899, + 1.85095411626404, 1.89000163742934, 1.82328037868812, 1.85673586603215, + 1.79162250323673, 1.81926399070904, 1.75605061440983, 1.77767089730985, + 1.71664370320657, 1.73205080756888, 1.67348944818527, 1.68250706566236, + 1.62668401684325, 1.62915190410067, 1.57633184776656, 1.57210618948558, + 1.52254541404295, 1.51149914870852, 1.46544496847418, 1.44746807621014, + 1.40515827116473, 1.38015802296422, 1.34182030010411, 1.30972146789057, + 1.27268101094799, 1.23631797244121, 1.20078081894225, 1.1601138191424, + 1.1262744592155, 1.0812816349112, 1.04932257070444, 1, 0.970091332255052, + 0.916453043454821, 0.888752086174041, 0.830830026003773, + 0.805480950083402, 0.743324911320655, 0.720458417957364, + 0.654135926634844, 0.633868951245487, 0.56346511368286, + 0.545900561008144, 0.471517871018855, 0.456744382011003, + 0.378502488720821, 0.366594239743308, 0.28462967654657, 0.2756462113408, + 0.190112086608366, 0.184098181407946, 0.0951638316474854, + 0.0921493937456571, 2.44929359829471e-16, 2.36424868168725e-16, + 1.85940277175805, 1.85215608254006, 1.84101830235666, 1.8260115177518, + 1.80716657980884, 1.78452303426296, 1.75812903191729, 1.72804121956591, + 1.6943246116706, 1.65705244308219, 1.6163060031401, 1.57217445152577, + 1.52475461628737, 1.47415077449309, 1.42047441601005, 1.36384399094392, + 1.30438464131129, 1.23651209416876, 1.16607983376092, 1.09323131952217, + 1.01811548447902, 0.940886397868808, 0.861702916123396, + 0.780728323008216, 0.698129959732033, 0.614078845865292, + 0.528749291925774, 0.442318504509219, 0.354966184859383, + 0.26687412178693, 0.1782257798593, 0.0892058837944601, + 2.28120482194115e-16, 1.79270703107207, 1.78524055414069, + 1.77418145060772, 1.7595501128788, 1.74137502561898, 1.71969270122577, + 1.69454759711684, 1.66599201501969, 1.63408598249135, 1.59889711693672, + 1.56050047243337, 1.51897836970992, 1.4744202096631, 1.42692227083599, + 1.37658749131615, 1.32352523554771, 1.26785104658576, 1.20121471755289, + 1.1322150168972, 1.06098440006242, 0.987660376234932, 0.912385196841269, + 0.835305533302888, 0.756572144778215, 0.676339536644662, + 0.594765610494258, 0.512011306435751, 0.428240238513501, + 0.343618324069048, 0.25831340788496, 0.172494881962429, + 0.0863333017938944, 2.2001620190564e-16, 1.72765809879808, + 1.71997726101044, 1.70899489149456, 1.69472973034835, 1.67720795424861, + 1.65646311715245, 1.63253607428677, 1.60547488959806, 1.57533472687208, + 1.54217772477015, 1.50607285606508, 1.46709577139569, 1.42532862789375, + 1.38085990307167, 1.33378419439247, 1.2842020049761, 1.23221951592754, + 1.16678888110037, 1.09918636835111, 1.02953370083625, 0.957957245972182, + 0.884587729172435, 0.809559937712516, 0.733012415393399, + 0.65508714869525, 0.575929245132385, 0.495686604538074, + 0.414509584023851, 0.3325506573723, 0.249964069634891, 0.166905487717333, + 0.0835316477439599, 2.121120273033e-16, 1.6642559749361, 1.6563662031493, + 1.64545862501717, 1.63155037016045, 1.61466536569775, 1.59483428204302, + 1.57209446342709, 1.54648984330104, 1.5180708448128, 1.48689426658247, + 1.45302315403522, 1.41652665658308, 1.37747987097932, 1.33596367120011, + 1.29206452523901, 1.24587429922908, 1.19749004933661, 1.1332345848112, + 1.06699388812265, 0.998879221843645, 0.929006093690767, + 0.857493994862305, 0.784466129352279, 0.710049134853769, + 0.634372795883799, 0.557569749779674, 0.479775186232743, + 0.401126541040268, 0.321763184769141, 0.241826107036723, + 0.161457597124011, 0.0808009216446566, 2.04407958387095e-16, + 1.60250065948611, 1.59440738055729, 1.58357265117557, 1.57001203231508, + 1.5537472599664, 1.53480619589747, 1.51322276453778, 1.48903687612861, + 1.46229433631349, 1.4330467423737, 1.4013513663438, 1.3672710252721, + 1.33087393891981, 1.29223357522132, 1.25142848385577, 1.20854211830666, + 1.16366264681297, 1.1005518286854, 1.0356375762118, 0.969020963084617, + 0.900806919390688, 0.83110399391088, 0.760024108222179, + 0.687682303159323, 0.614196478210307, 0.539687124436124, + 0.464277051519758, 0.388091109562752, 0.311255906259571, + 0.233899520090455, 0.156151210182464, 0.0781411234959846, + 1.96903995157025e-16, 1.54239215244813, 1.5341007932344, + 1.52333696996973, 1.51011471681226, 1.49445363705454, 1.4763788587158, + 1.45592097761886, 1.43311598808078, 1.40800520137417, 1.38063515214383, + 1.35105749299082, 1.31932887746275, 1.28551083171522, 1.2496696151353, + 1.21187607024274, 1.17220546220884, 1.13073730835664, 1.06874061272294, + 1.00511743261858, 0.939958924559163, 0.873359723071944, + 0.805417726318159, 0.736233874322215, 0.665911920310063, + 0.594558195674775, 0.522281369101735, 0.44919220039912, + 0.375403289591303, 0.301028821843589, 0.226184308796087, + 0.150986326892692, 0.0755522532979439, 1.89600137613091e-16, + 1.48393045382214, 1.47544644118063, 1.46475158139968, 1.45185842365198, + 1.43678449696219, 1.41955227049801, 1.40018910267031, 1.37872717915755, + 1.35520343999483, 1.32965949589285, 1.30214153397628, 1.27270021315503, + 1.24139054936555, 1.20827179094205, 1.17340728439994, 1.13686433093562, + 1.0987140339676, 1.03780093692384, 0.975433457342979, 0.911693106267283, + 0.846664504734535, 0.780435192084143, 0.713095427652386, + 0.644737986305988, 0.575457948277202, 0.505352483776508, + 0.434520632870828, 0.363063081125921, 0.291081931521196, + 0.21868047315362, 0.145962947254694, 0.0730343110505344, + 1.82496385755292e-16, 1.42711556360816, 1.41844432439598, + 1.40781648546539, 1.39524315283425, 1.38073983968934, 1.3643264312441, + 1.34602713969215, 1.32587044935892, 1.30388905217547, 1.28011977362078, + 1.25460348930017, 1.22738503234893, 1.1985130918708, 1.16804010264156, + 1.13602212632736, 1.10251872448699, 1.06759282364586, 1.0077328012881, + 0.946585650385001, 0.884223508208978, 0.820721264378462, + 0.756156391208832, 0.690608768212694, 0.624160501147099, + 0.55689573601759, 0.488900468460442, 0.420262348934882, + 0.351070484166606, 0.281415235292391, 0.211388013163053, + 0.14108107126847, 0.0705872967537562, 1.75592739583628e-16, + 1.37194748180617, 1.36309444288045, 1.35253168216689, 1.34026890435905, + 1.326319665236, 1.31070134095408, 1.29343508868437, 1.27454579868488, + 1.25406203791609, 1.23201598532761, 1.20844335896251, 1.18338333504445, + 1.15687845923097, 1.12897455023384, 1.09972059602499, 1.06916864286296, + 1.03737367739141, 0.978536205815711, 0.918574011744646, + 0.857550130384246, 0.795530002003725, 0.732581323692226, + 0.668773896003138, 0.604179464833394, 0.538871558895937, + 0.472925323153538, 0.406417348591282, 0.339425498713358, + 0.272028733157175, 0.204306928824387, 0.136340698934022, + 0.0682112104076092, 1.68889199098099e-16, 1.31842620841619, + 1.30939679663404, 1.29889717150416, 1.28693567822641, 1.27352397360215, + 1.25867699962793, 1.24241294964697, 1.22475322713545, 1.2057223972167, + 1.18534813101334, 1.16366114296328, 1.1406951212416, 1.11648665144606, + 1.09107513371889, 1.06450269349285, 1.03681408606354, 1.00805659520426, + 0.950211150506677, 0.891398541421914, 0.831672972793088, + 0.771090717610323, 0.709709989534324, 0.647590811023718, + 0.584794877364875, 0.521385416912244, 0.457427047855794, + 0.392985631840029, 0.328128124766178, 0.262922425115548, + 0.197437220137621, 0.131741830251348, 0.0659060520120935, + 1.62385764298705e-16, 1.2665517434382, 1.25735138565675, + 1.24691295347721, 1.2352434744363, 1.22235276478781, 1.20825340726567, + 1.19296072257996, 1.17649273471061, 1.15887013007728, 1.14011621067797, + 1.12025684130249, 1.09932039094038, 1.07733766851607, 1.05434185309671, + 1.03036841873093, 1.0054550540887, 0.97964157708441, 0.922757635360998, + 0.865059239416804, 0.806592035435505, 0.747403411198256, + 0.687542388735127, 0.627059513274433, 0.566006738741541, + 0.504437310066511, 0.442405642567212, 0.379967198681122, + 0.317178362325064, 0.254096311167509, 0.190778887102756, + 0.127284465220448, 0.063671821567209, 1.56082435185447e-16, + 1.21632408687221, 1.20695820994858, 1.19657902808603, 1.18519229298874, + 1.17280603879298, 1.15943056386729, 1.14507840748332, 1.12976432141037, + 1.11350523649785, 1.0963202243215, 1.07823045398013, 1.05925914414079, + 1.039431510441, 1.01877470836729, 0.997317771739223, 0.975091546938469, + 0.952128623031855, 0.896175660378674, 0.839556105729316, + 0.782307318311495, 0.724468082767525, 0.666078521294634, + 0.607180002755285, 0.547815048963392, 0.488027238358738, + 0.427861107287792, 0.367362049114561, 0.306576211390018, + 0.245550391313058, 0.184331929719792, 0.122968603841323, + 0.0615085190729558, 1.49979211758324e-16, 1.16774323871822, + 1.15821726950953, 1.14789539533064, 1.13678213388372, 1.12488379561764, + 1.11220846943279, 1.09876600435707, 1.08456798723472, 1.0696277164784, + 1.05396017194393, 1.03758198099622, 1.02051138084282, 1.00276817722086, + 0.984373699530647, 0.965350752517739, 0.945723564612833, + 0.925517733046597, 0.870465225559704, 0.814889140359451, + 0.75881882142106, 0.702284732318129, 0.645318387212847, + 0.587952279466273, 0.530219808030428, 0.472155201788924, + 0.413793442017533, 0.355170183140346, 0.296321671961038, + 0.237284665552196, 0.178096347988727, 0.118794246113973, + 0.0594161445293338, 1.44076094017336e-16, 1.12080919897623, + 1.1111285643396, 1.10086205521101, 1.09001299712124, 1.07858603526181, + 1.06658712396217, 1.0540235132012, 1.04090373218368, 1.02723757001892, + 1.01303605354527, 0.99831142235074, 0.983077101046474, 0.967347668855629, + 0.951138826586767, 0.934467361066475, 0.917351107111795, + 0.899808907128636, 0.84562633090409, 0.791058343307209, + 0.736126544764198, 0.680853359850069, 0.625261986489763, + 0.569376343407397, 0.51322101594265, 0.45682120035707, 0.400202646756435, + 0.343391600758478, 0.286414744038126, 0.229299133884923, + 0.172072141909564, 0.114761392038397, 0.0573946979363431, + 1.38373081962483e-16, 1.07552196764625, 1.06569209443879, + 1.05547900772716, 1.04488488270131, 1.03391275772548, 1.02256652745543, + 1.0108509340157, 0.998771556257233, 0.986334797119435, 0.973547869125499, + 0.9604187780437, 0.946956304751757, 0.933169985345321, 0.919070089535655, + 0.90466759738543, 0.889974174435355, 0.875002145277972, 0.82165897641183, + 0.768063714572589, 0.714230488340911, 0.660173965363344, + 0.605909319125385, 0.551452194578656, 0.496818672700056, + 0.442025234063176, 0.387088721504498, 0.332026301968956, + 0.276855427621281, 0.221593796311238, 0.1662593114823, 0.110870041614596, + 0.0554441792939837, 1.32870175593765e-16, 1.03188154472826, + 1.0219078598071, 1.01174625287909, 1.00139779062391, 0.990863963008656, + 0.980146679912575, 0.969248266800595, 0.958171459455384, + 0.946919397779927, 0.935495618684633, 0.923904048075098, + 0.912148991958666, 0.900235126689934, 0.888167488377311, + 0.875951461474606, 0.863592766583512, 0.851097447494605, + 0.798563162082926, 0.745905254155592, 0.693130652151198, + 0.640246548857955, 0.587260385119711, 0.534179832980052, + 0.481012778302648, 0.427767302907242, 0.374451666261723, + 0.32107428677178, 0.267643722710503, 0.214168652831141, + 0.160657856706938, 0.107120194842569, 0.0535645886022555, + 1.27567374911183e-16, 0.989887930222267, 0.979775860444533, + 0.9696637906668, 0.959551720889067, 0.949439651111333, 0.9393275813336, + 0.929215511555867, 0.919103441778134, 0.9089913720004, 0.898879302222667, + 0.888767232444934, 0.878655162667201, 0.868543092889467, + 0.858431023111734, 0.848318953334001, 0.838206883556267, + 0.828094813778534, 0.776338887917376, 0.724582962056217, + 0.672827036195059, 0.621071110333901, 0.569315184472742, + 0.517559258611584, 0.465803332750426, 0.414047406889267, + 0.362291481028109, 0.31053555516695, 0.258779629305792, + 0.207023703444634, 0.155267777583475, 0.103511851722317, + 0.0517559258611585, 1.22464679914735e-16, 0.785818953334001, + 0.733431023111734, 0.681043092889467, 0.628655162667201, + 0.576267232444934, 0.523879302222667, 0.4714913720004, 0.419103441778134, + 0.366715511555867, 0.3143275813336, 0.261939651111334, 0.209551720889067, + 0.1571637906668, 0.104775860444534, 0.0523879302222668, + 1.15260875213869e-16, 0.795299018750626, 0.742279084167251, + 0.689259149583876, 0.636239215000501, 0.583219280417126, + 0.530199345833751, 0.477179411250375, 0.424159476667, 0.371139542083625, + 0.31811960750025, 0.265099672916875, 0.2120797383335, 0.159059803750125, + 0.10603986916675, 0.0530199345833751, 1.08057070513002e-16, + 0.804779084167251, 0.751127145222767, 0.697475206278284, 0.6438232673338, + 0.590171328389317, 0.536519389444834, 0.48286745050035, + 0.429215511555867, 0.375563572611384, 0.3219116336669, 0.268259694722417, + 0.214607755777934, 0.16095581683345, 0.107303877888967, + 0.0536519389444835, 1.00853265812135e-16, 0.814259149583876, + 0.759975206278284, 0.705691262972692, 0.6514073196671, 0.597123376361509, + 0.542839433055917, 0.488555489750325, 0.434271546444734, + 0.379987603139142, 0.32570365983355, 0.271419716527959, + 0.217135773222367, 0.162851829916775, 0.108567886611183, + 0.0542839433055918, 9.36494611112682e-17, 0.823739215000501, + 0.768823267333801, 0.7139073196671, 0.6589913720004, 0.6040754243337, + 0.549159476667, 0.4942435290003, 0.4393275813336, 0.3844116336669, + 0.3294956860002, 0.2745797383335, 0.2196637906668, 0.1647478430001, + 0.1098318953334, 0.0549159476667001, 8.64456564104014e-17, + 0.833219280417125, 0.777671328389317, 0.722123376361509, 0.6665754243337, + 0.611027472305892, 0.555479520278084, 0.499931568250275, + 0.444383616222467, 0.388835664194658, 0.33328771216685, + 0.277739760139042, 0.222191808111234, 0.166643856083425, + 0.111095904055617, 0.0555479520278084, 7.92418517095346e-17, + 0.84269934583375, 0.786519389444834, 0.730339433055917, 0.674159476667, + 0.617979520278084, 0.561799563889167, 0.50561960750025, + 0.449439651111334, 0.393259694722417, 0.3370797383335, 0.280899781944583, + 0.224719825555667, 0.16853986916675, 0.112359912777833, + 0.0561799563889168, 7.20380470086678e-17, 0.852179411250375, + 0.79536745050035, 0.738555489750325, 0.6817435290003, 0.624931568250275, + 0.56811960750025, 0.511307646750225, 0.4544956860002, 0.397683725250175, + 0.34087176450015, 0.284059803750125, 0.2272478430001, 0.170435882250075, + 0.11362392150005, 0.0568119607500251, 6.4834242307801e-17, + 0.861659476667, 0.804215511555867, 0.746771546444734, 0.6893275813336, + 0.631883616222467, 0.574439651111334, 0.5169956860002, 0.459551720889067, + 0.402107755777934, 0.3446637906668, 0.287219825555667, 0.229775860444533, + 0.1723318953334, 0.114887930222267, 0.0574439651111334, + 5.76304376069343e-17, 0.871139542083625, 0.813063572611384, + 0.754987603139142, 0.6969116336669, 0.638835664194659, 0.580759694722417, + 0.522683725250175, 0.464607755777934, 0.406531786305692, + 0.34845581683345, 0.290379847361208, 0.232303877888967, + 0.174227908416725, 0.116151938944483, 0.0580759694722417, + 5.04266329060675e-17, 0.88061960750025, 0.8219116336669, + 0.76320365983355, 0.7044956860002, 0.64578771216685, 0.5870797383335, + 0.52837176450015, 0.4696637906668, 0.41095581683345, 0.3522478430001, + 0.29353986916675, 0.2348318953334, 0.17612392150005, 0.1174159476667, + 0.0587079738333501, 4.32228282052007e-17, 0.890099672916875, + 0.830759694722417, 0.771419716527958, 0.7120797383335, 0.652739760139042, + 0.593399781944584, 0.534059803750125, 0.474719825555667, + 0.415379847361208, 0.35603986916675, 0.296699890972292, + 0.237359912777833, 0.178019934583375, 0.118679956388917, + 0.0593399781944584, 3.60190235043339e-17, 0.8995797383335, + 0.839607755777934, 0.779635773222367, 0.7196637906668, 0.659691808111234, + 0.599719825555667, 0.5397478430001, 0.479775860444534, 0.419803877888967, + 0.3598318953334, 0.299859912777833, 0.239887930222267, 0.1799159476667, + 0.119943965111133, 0.0599719825555667, 2.88152188034671e-17, + 0.909059803750125, 0.84845581683345, 0.787851829916775, 0.7272478430001, + 0.666643856083425, 0.60603986916675, 0.545435882250075, 0.4848318953334, + 0.424227908416725, 0.36362392150005, 0.303019934583375, 0.2424159476667, + 0.181811960750025, 0.12120797383335, 0.060603986916675, + 2.16114141026003e-17, 0.91853986916675, 0.857303877888967, + 0.796067886611183, 0.7348318953334, 0.673595904055617, 0.612359912777833, + 0.55112392150005, 0.489887930222267, 0.428651938944483, 0.3674159476667, + 0.306179956388917, 0.244943965111133, 0.18370797383335, + 0.122471982555567, 0.0612359912777833, 1.44076094017336e-17, + 0.928019934583375, 0.866151938944484, 0.804283943305592, 0.7424159476667, + 0.680547952027808, 0.618679956388917, 0.556811960750025, + 0.494943965111133, 0.433075969472242, 0.37120797383335, + 0.309339978194458, 0.247471982555567, 0.185603986916675, + 0.123735991277783, 0.0618679956388917, 7.20380470086678e-18, + -0.095163831647484, -0.0921493937456558, -0.190112086608365, + -0.184098181407945, -0.28462967654657, -0.275646211340799, + -0.37850248872082, -0.366594239743307, -0.471517871018854, + -0.456744382011003, -0.563465113682859, -0.545900561008143, + -0.654135926634843, -0.633868951245487, -0.743324911320655, + -0.720458417957364, -0.830830026003772, -0.805480950083401, + -0.916453043454821, -0.88875208617404, -1, -0.970091332255051, + -1.08128163491119, -1.04932257070444, -1.1601138191424, -1.1262744592155, + -1.23631797244121, -1.20078081894225, -1.30972146789057, + -1.27268101094799, -1.38015802296422, -1.34182030010411, + -1.44746807621014, -1.40515827116473, -1.51149914870852, + -1.46544496847418, -1.57210618948557, -1.52254541404295, + -1.62915190410067, -1.57633184776656, -1.68250706566236, + -1.62668401684325, -1.73205080756888, -1.67348944818527, + -1.77767089730985, -1.71664370320657, -1.81926399070904, + -1.75605061440983, -1.85673586603214, -1.79162250323673, + -1.89000163742934, -1.82328037868812, -1.91898594722899, + -1.85095411626404, -1.94362313664708, -1.87458261681821, + -1.96385739452541, -1.89411394496733, -1.97964288376187, + -1.90950544674137, -1.99094384514617, -1.92072384620856, + -1.99773467836602, -1.92774532085603, -2, -1.93055555555556, + -0.0892058837944589, -0.1782257798593, -0.266874121786929, + -0.354966184859382, -0.442318504509218, -0.528749291925773, + -0.614078845865291, -0.698129959732033, -0.780728323008215, + -0.861702916123396, -0.940886397868807, -1.01811548447902, + -1.09323131952217, -1.16607983376092, -1.23651209416876, + -1.30438464131129, -1.36384399094392, -1.42047441601005, + -1.47415077449309, -1.52475461628737, -1.57217445152577, + -1.6163060031401, -1.65705244308219, -1.6943246116706, -1.72804121956591, + -1.75812903191729, -1.78452303426296, -1.80716657980884, + -1.8260115177518, -1.84101830235666, -1.85215608254006, + -1.85940277175805, -1.86274509803922, -0.0863333017938932, + -0.172494881962429, -0.25831340788496, -0.343618324069046, + -0.428240238513501, -0.51201130643575, -0.594765610494257, + -0.676339536644662, -0.756572144778214, -0.835305533302888, + -0.912385196841268, -0.987660376234931, -1.06098440006242, + -1.1322150168972, -1.20121471755289, -1.26785104658576, + -1.32352523554771, -1.37658749131615, -1.42692227083599, + -1.4744202096631, -1.51897836970991, -1.56050047243337, + -1.59889711693672, -1.63408598249135, -1.66599201501969, + -1.69454759711684, -1.71969270122577, -1.74137502561898, + -1.7595501128788, -1.77418145060772, -1.78524055414069, + -1.79270703107207, -1.79656862745098, -0.0835316477439588, + -0.166905487717333, -0.249964069634891, -0.332550657372299, + -0.414509584023851, -0.495686604538073, -0.575929245132385, + -0.65508714869525, -0.733012415393398, -0.809559937712515, + -0.884587729172434, -0.957957245972181, -1.02953370083625, + -1.09918636835111, -1.16678888110037, -1.23221951592754, + -1.2842020049761, -1.33378419439247, -1.38085990307167, + -1.42532862789375, -1.46709577139568, -1.50607285606508, + -1.54217772477014, -1.57533472687208, -1.60547488959806, + -1.63253607428677, -1.65646311715245, -1.67720795424861, + -1.69472973034835, -1.70899489149456, -1.71997726101044, + -1.72765809879808, -1.73202614379085, -0.0808009216446556, + -0.161457597124011, -0.241826107036722, -0.32176318476914, + -0.401126541040267, -0.479775186232742, -0.557569749779674, + -0.634372795883798, -0.710049134853768, -0.784466129352279, + -0.857493994862304, -0.929006093690766, -0.998879221843645, + -1.06699388812265, -1.1332345848112, -1.19749004933661, + -1.24587429922908, -1.29206452523901, -1.33596367120011, + -1.37747987097932, -1.41652665658308, -1.45302315403522, + -1.48689426658247, -1.5180708448128, -1.54648984330104, + -1.57209446342709, -1.59483428204302, -1.61466536569775, + -1.63155037016045, -1.64545862501717, -1.6563662031493, -1.6642559749361, + -1.66911764705882, -0.0781411234959837, -0.156151210182464, + -0.233899520090454, -0.31125590625957, -0.388091109562751, + -0.464277051519757, -0.539687124436124, -0.614196478210307, + -0.687682303159323, -0.760024108222179, -0.831103993910879, + -0.900806919390687, -0.969020963084617, -1.0356375762118, + -1.1005518286854, -1.16366264681297, -1.20854211830666, + -1.25142848385577, -1.29223357522132, -1.33087393891981, + -1.3672710252721, -1.4013513663438, -1.4330467423737, -1.46229433631349, + -1.48903687612861, -1.51322276453778, -1.53480619589747, + -1.5537472599664, -1.57001203231508, -1.58357265117557, + -1.59440738055729, -1.60250065948611, -1.6078431372549, + -0.075552253297943, -0.150986326892691, -0.226184308796087, + -0.301028821843588, -0.375403289591302, -0.449192200399119, + -0.522281369101735, -0.594558195674774, -0.665911920310062, + -0.736233874322214, -0.805417726318159, -0.873359723071943, + -0.939958924559163, -1.00511743261858, -1.06874061272294, + -1.13073730835664, -1.17220546220884, -1.21187607024274, + -1.2496696151353, -1.28551083171522, -1.31932887746275, + -1.35105749299082, -1.38063515214383, -1.40800520137417, + -1.43311598808078, -1.45592097761886, -1.4763788587158, + -1.49445363705454, -1.51011471681226, -1.52333696996973, + -1.5341007932344, -1.54239215244813, -1.54820261437909, + -0.0730343110505336, -0.145962947254693, -0.21868047315362, + -0.291081931521195, -0.36306308112592, -0.434520632870827, + -0.505352483776508, -0.575457948277202, -0.644737986305988, + -0.713095427652386, -0.780435192084143, -0.846664504734535, + -0.911693106267283, -0.975433457342978, -1.03780093692384, + -1.0987140339676, -1.13686433093562, -1.17340728439994, + -1.20827179094205, -1.24139054936555, -1.27270021315502, + -1.30214153397628, -1.32965949589285, -1.35520343999483, + -1.37872717915755, -1.40018910267031, -1.41955227049801, + -1.43678449696219, -1.45185842365198, -1.46475158139968, + -1.47544644118063, -1.48393045382214, -1.49019607843137, + -0.0705872967537555, -0.14108107126847, -0.211388013163053, + -0.281415235292391, -0.351070484166606, -0.420262348934881, + -0.488900468460442, -0.55689573601759, -0.624160501147098, + -0.690608768212694, -0.756156391208832, -0.820721264378462, + -0.884223508208977, -0.946585650385001, -1.0077328012881, + -1.06759282364586, -1.10251872448699, -1.13602212632736, + -1.16804010264156, -1.1985130918708, -1.22738503234892, + -1.25460348930017, -1.28011977362078, -1.30388905217547, + -1.32587044935892, -1.34602713969215, -1.3643264312441, + -1.38073983968934, -1.39524315283425, -1.40781648546539, + -1.41844432439598, -1.42711556360816, -1.43382352941176, + -0.0682112104076085, -0.136340698934021, -0.204306928824387, + -0.272028733157175, -0.339425498713358, -0.406417348591282, + -0.472925323153537, -0.538871558895937, -0.604179464833393, + -0.668773896003138, -0.732581323692225, -0.795530002003724, + -0.857550130384246, -0.918574011744646, -0.978536205815711, + -1.03737367739141, -1.06916864286296, -1.09972059602499, + -1.12897455023384, -1.15687845923097, -1.18338333504445, + -1.20844335896251, -1.23201598532761, -1.25406203791609, + -1.27454579868488, -1.29343508868437, -1.31070134095408, -1.326319665236, + -1.34026890435905, -1.35253168216689, -1.36309444288045, + -1.37194748180617, -1.37908496732026, -0.0659060520120929, + -0.131741830251347, -0.197437220137621, -0.262922425115547, + -0.328128124766177, -0.392985631840028, -0.457427047855794, + -0.521385416912244, -0.584794877364874, -0.647590811023717, + -0.709709989534324, -0.771090717610323, -0.831672972793088, + -0.891398541421913, -0.950211150506677, -1.00805659520426, + -1.03681408606353, -1.06450269349285, -1.09107513371889, + -1.11648665144606, -1.1406951212416, -1.16366114296328, + -1.18534813101334, -1.2057223972167, -1.22475322713545, + -1.24241294964697, -1.25867699962793, -1.27352397360215, + -1.28693567822641, -1.29889717150416, -1.30939679663404, + -1.31842620841619, -1.32598039215686, -0.0636718215672085, + -0.127284465220448, -0.190778887102756, -0.254096311167508, + -0.317178362325064, -0.379967198681121, -0.442405642567212, + -0.504437310066511, -0.56600673874154, -0.627059513274433, + -0.687542388735127, -0.747403411198256, -0.806592035435505, + -0.865059239416804, -0.922757635360998, -0.97964157708441, + -1.0054550540887, -1.03036841873093, -1.05434185309671, + -1.07733766851607, -1.09932039094038, -1.12025684130249, + -1.14011621067797, -1.15887013007728, -1.17649273471061, + -1.19296072257996, -1.20825340726567, -1.22235276478781, + -1.2352434744363, -1.24691295347721, -1.25735138565675, -1.2665517434382, + -1.27450980392157, -0.0615085190729553, -0.122968603841323, + -0.184331929719791, -0.245550391313058, -0.306576211390017, + -0.36736204911456, -0.427861107287792, -0.488027238358737, + -0.547815048963392, -0.607180002755285, -0.666078521294634, + -0.724468082767525, -0.782307318311495, -0.839556105729316, + -0.896175660378673, -0.952128623031855, -0.975091546938469, + -0.997317771739223, -1.01877470836729, -1.039431510441, + -1.05925914414079, -1.07823045398013, -1.0963202243215, + -1.11350523649785, -1.12976432141037, -1.14507840748332, + -1.15943056386729, -1.17280603879298, -1.18519229298874, + -1.19657902808603, -1.20695820994858, -1.21632408687221, + -1.22467320261438, -0.0594161445293334, -0.118794246113972, + -0.178096347988727, -0.237284665552196, -0.296321671961038, + -0.355170183140346, -0.413793442017532, -0.472155201788924, + -0.530219808030428, -0.587952279466273, -0.645318387212847, + -0.702284732318129, -0.75881882142106, -0.814889140359451, + -0.870465225559704, -0.925517733046597, -0.945723564612833, + -0.965350752517739, -0.984373699530647, -1.00276817722086, + -1.02051138084282, -1.03758198099622, -1.05396017194393, + -1.0696277164784, -1.08456798723472, -1.09876600435707, + -1.11220846943279, -1.12488379561764, -1.13678213388372, + -1.14789539533064, -1.15821726950953, -1.16774323871822, + -1.17647058823529, -0.0573946979363427, -0.114761392038396, + -0.172072141909563, -0.229299133884922, -0.286414744038126, + -0.343391600758478, -0.400202646756434, -0.45682120035707, + -0.513221015942649, -0.569376343407396, -0.625261986489763, + -0.680853359850069, -0.736126544764198, -0.791058343307209, + -0.84562633090409, -0.899808907128636, -0.917351107111795, + -0.934467361066474, -0.951138826586767, -0.967347668855629, + -0.983077101046474, -0.99831142235074, -1.01303605354527, + -1.02723757001892, -1.04090373218368, -1.0540235132012, + -1.06658712396217, -1.07858603526181, -1.09001299712124, + -1.10086205521101, -1.1111285643396, -1.12080919897623, + -1.12990196078431, -0.0554441792939833, -0.110870041614595, + -0.1662593114823, -0.221593796311237, -0.276855427621281, + -0.332026301968956, -0.387088721504498, -0.442025234063176, + -0.496818672700056, -0.551452194578656, -0.605909319125385, + -0.660173965363344, -0.714230488340911, -0.768063714572589, + -0.82165897641183, -0.875002145277972, -0.889974174435355, + -0.90466759738543, -0.919070089535655, -0.933169985345321, + -0.946956304751757, -0.9604187780437, -0.973547869125499, + -0.986334797119435, -0.998771556257233, -1.0108509340157, + -1.02256652745543, -1.03391275772548, -1.04488488270131, + -1.05547900772717, -1.06569209443879, -1.07552196764625, + -1.08496732026144, -0.0535645886022552, -0.107120194842569, + -0.160657856706937, -0.214168652831141, -0.267643722710503, + -0.32107428677178, -0.374451666261723, -0.427767302907242, + -0.481012778302648, -0.534179832980052, -0.587260385119711, + -0.640246548857955, -0.693130652151198, -0.745905254155592, + -0.798563162082926, -0.851097447494605, -0.863592766583512, + -0.875951461474605, -0.888167488377311, -0.900235126689934, + -0.912148991958666, -0.923904048075098, -0.935495618684633, + -0.946919397779927, -0.958171459455384, -0.969248266800595, + -0.980146679912575, -0.990863963008656, -1.00139779062391, + -1.01174625287909, -1.0219078598071, -1.03188154472826, + -1.04166666666667, -0.0517559258611583, -0.103511851722317, + -0.155267777583475, -0.207023703444633, -0.258779629305792, + -0.31053555516695, -0.362291481028109, -0.414047406889267, + -0.465803332750425, -0.517559258611584, -0.569315184472742, + -0.621071110333901, -0.672827036195059, -0.724582962056217, + -0.776338887917376, -0.828094813778534, -0.838206883556267, + -0.848318953334001, -0.858431023111734, -0.868543092889467, + -0.878655162667201, -0.888767232444934, -0.898879302222667, + -0.9089913720004, -0.919103441778134, -0.929215511555867, + -0.9393275813336, -0.949439651111334, -0.959551720889067, + -0.9696637906668, -0.979775860444533, -0.989887930222267, -1, + -0.785818953334001, -0.795299018750626, -0.804779084167251, + -0.814259149583876, -0.823739215000501, -0.833219280417125, + -0.84269934583375, -0.852179411250375, -0.861659476667, + -0.871139542083626, -0.88061960750025, -0.890099672916875, + -0.8995797383335, -0.909059803750125, -0.91853986916675, + -0.928019934583375, -0.9375, -0.733431023111734, -0.742279084167251, + -0.751127145222767, -0.759975206278284, -0.7688232673338, + -0.777671328389317, -0.786519389444834, -0.79536745050035, + -0.804215511555867, -0.813063572611384, -0.8219116336669, + -0.830759694722417, -0.839607755777934, -0.84845581683345, + -0.857303877888967, -0.866151938944483, -0.875, -0.681043092889467, + -0.689259149583875, -0.697475206278284, -0.705691262972692, + -0.713907319667101, -0.722123376361509, -0.730339433055917, + -0.738555489750325, -0.746771546444734, -0.754987603139142, + -0.76320365983355, -0.771419716527959, -0.779635773222367, + -0.787851829916775, -0.796067886611183, -0.804283943305592, -0.8125, + -0.628655162667201, -0.636239215000501, -0.6438232673338, + -0.651407319667101, -0.658991372000401, -0.6665754243337, + -0.674159476667, -0.6817435290003, -0.6893275813336, -0.6969116336669, + -0.7044956860002, -0.7120797383335, -0.7196637906668, -0.7272478430001, + -0.7348318953334, -0.7424159476667, -0.75, -0.576267232444934, + -0.583219280417126, -0.590171328389317, -0.597123376361509, + -0.6040754243337, -0.611027472305892, -0.617979520278084, + -0.624931568250275, -0.631883616222467, -0.638835664194658, + -0.64578771216685, -0.652739760139042, -0.659691808111233, + -0.666643856083425, -0.673595904055617, -0.680547952027808, -0.6875, + -0.523879302222667, -0.530199345833751, -0.536519389444834, + -0.542839433055917, -0.549159476667, -0.555479520278084, + -0.561799563889167, -0.56811960750025, -0.574439651111334, + -0.580759694722417, -0.5870797383335, -0.593399781944583, + -0.599719825555667, -0.60603986916675, -0.612359912777833, + -0.618679956388917, -0.625, -0.4714913720004, -0.477179411250375, + -0.48286745050035, -0.488555489750325, -0.4942435290003, + -0.499931568250275, -0.50561960750025, -0.511307646750225, + -0.5169956860002, -0.522683725250175, -0.52837176450015, + -0.534059803750125, -0.5397478430001, -0.545435882250075, + -0.55112392150005, -0.556811960750025, -0.5625, -0.419103441778134, + -0.424159476667, -0.429215511555867, -0.434271546444733, + -0.4393275813336, -0.444383616222467, -0.449439651111333, + -0.4544956860002, -0.459551720889067, -0.464607755777934, + -0.4696637906668, -0.474719825555667, -0.479775860444533, + -0.4848318953334, -0.489887930222267, -0.494943965111133, -0.5, + -0.366715511555867, -0.371139542083625, -0.375563572611384, + -0.379987603139142, -0.3844116336669, -0.388835664194658, + -0.393259694722417, -0.397683725250175, -0.402107755777933, + -0.406531786305692, -0.41095581683345, -0.415379847361208, + -0.419803877888967, -0.424227908416725, -0.428651938944483, + -0.433075969472242, -0.4375, -0.3143275813336, -0.31811960750025, + -0.3219116336669, -0.32570365983355, -0.3294956860002, -0.33328771216685, + -0.3370797383335, -0.34087176450015, -0.3446637906668, -0.34845581683345, + -0.3522478430001, -0.35603986916675, -0.3598318953334, -0.36362392150005, + -0.3674159476667, -0.37120797383335, -0.375, -0.261939651111334, + -0.265099672916875, -0.268259694722417, -0.271419716527958, + -0.2745797383335, -0.277739760139042, -0.280899781944583, + -0.284059803750125, -0.287219825555667, -0.290379847361208, + -0.29353986916675, -0.296699890972292, -0.299859912777833, + -0.303019934583375, -0.306179956388917, -0.309339978194458, -0.3125, + -0.209551720889067, -0.2120797383335, -0.214607755777933, + -0.217135773222367, -0.2196637906668, -0.222191808111233, + -0.224719825555667, -0.2272478430001, -0.229775860444533, + -0.232303877888967, -0.2348318953334, -0.237359912777833, + -0.239887930222267, -0.2424159476667, -0.244943965111133, + -0.247471982555567, -0.25, -0.1571637906668, -0.159059803750125, + -0.16095581683345, -0.162851829916775, -0.1647478430001, + -0.166643856083425, -0.16853986916675, -0.170435882250075, + -0.1723318953334, -0.174227908416725, -0.17612392150005, + -0.178019934583375, -0.1799159476667, -0.181811960750025, + -0.18370797383335, -0.185603986916675, -0.1875, -0.104775860444533, + -0.10603986916675, -0.107303877888967, -0.108567886611183, + -0.1098318953334, -0.111095904055617, -0.112359912777833, + -0.11362392150005, -0.114887930222267, -0.116151938944483, + -0.1174159476667, -0.118679956388917, -0.119943965111133, + -0.12120797383335, -0.122471982555567, -0.123735991277783, -0.125, + -0.0523879302222666, -0.0530199345833749, -0.0536519389444833, + -0.0542839433055916, -0.0549159476667, -0.0555479520278083, + -0.0561799563889166, -0.056811960750025, -0.0574439651111333, + -0.0580759694722417, -0.05870797383335, -0.0593399781944583, + -0.0599719825555666, -0.060603986916675, -0.0612359912777833, + -0.0618679956388917, -0.0625, -1.99773467836602, -1.92774532085603, + -1.99094384514617, -1.92072384620856, -1.97964288376187, + -1.90950544674137, -1.96385739452541, -1.89411394496733, + -1.94362313664708, -1.87458261681821, -1.91898594722899, + -1.85095411626404, -1.89000163742934, -1.82328037868812, + -1.85673586603215, -1.79162250323673, -1.81926399070904, + -1.75605061440983, -1.77767089730985, -1.71664370320657, + -1.73205080756888, -1.67348944818527, -1.68250706566236, + -1.62668401684325, -1.62915190410067, -1.57633184776656, + -1.57210618948558, -1.52254541404295, -1.51149914870852, + -1.46544496847418, -1.44746807621014, -1.40515827116473, + -1.38015802296422, -1.34182030010411, -1.30972146789057, + -1.27268101094799, -1.23631797244121, -1.20078081894225, + -1.1601138191424, -1.1262744592155, -1.0812816349112, -1.04932257070444, + -1, -0.970091332255052, -0.916453043454821, -0.888752086174041, + -0.830830026003773, -0.805480950083401, -0.743324911320656, + -0.720458417957365, -0.654135926634844, -0.633868951245487, + -0.563465113682859, -0.545900561008144, -0.471517871018856, + -0.456744382011004, -0.378502488720821, -0.366594239743308, + -0.284629676546571, -0.2756462113408, -0.190112086608367, + -0.184098181407947, -0.0951638316474856, -0.0921493937456573, + -1.85940277175805, -1.85215608254006, -1.84101830235666, + -1.8260115177518, -1.80716657980884, -1.78452303426296, + -1.75812903191729, -1.72804121956591, -1.6943246116706, + -1.65705244308219, -1.6163060031401, -1.57217445152577, + -1.52475461628737, -1.47415077449309, -1.42047441601005, + -1.36384399094392, -1.30438464131129, -1.23651209416876, + -1.16607983376092, -1.09323131952217, -1.01811548447902, + -0.940886397868809, -0.861702916123397, -0.780728323008215, + -0.698129959732034, -0.614078845865292, -0.528749291925774, + -0.44231850450922, -0.354966184859384, -0.26687412178693, + -0.178225779859301, -0.0892058837944603, -1.79270703107207, + -1.78524055414069, -1.77418145060772, -1.7595501128788, + -1.74137502561898, -1.71969270122577, -1.69454759711684, + -1.66599201501969, -1.63408598249135, -1.59889711693672, + -1.56050047243337, -1.51897836970992, -1.4744202096631, + -1.42692227083599, -1.37658749131615, -1.32352523554771, + -1.26785104658576, -1.20121471755289, -1.1322150168972, + -1.06098440006242, -0.987660376234933, -0.912385196841269, + -0.835305533302888, -0.756572144778214, -0.676339536644663, + -0.594765610494258, -0.512011306435751, -0.428240238513502, + -0.343618324069048, -0.25831340788496, -0.17249488196243, + -0.0863333017938945, -1.72765809879808, -1.71997726101044, + -1.70899489149456, -1.69472973034835, -1.67720795424861, + -1.65646311715245, -1.63253607428677, -1.60547488959806, + -1.57533472687208, -1.54217772477015, -1.50607285606508, + -1.46709577139569, -1.42532862789375, -1.38085990307167, + -1.33378419439247, -1.2842020049761, -1.23221951592754, + -1.16678888110037, -1.09918636835111, -1.02953370083625, + -0.957957245972183, -0.884587729172435, -0.809559937712516, + -0.733012415393399, -0.655087148695251, -0.575929245132386, + -0.495686604538073, -0.414509584023852, -0.3325506573723, + -0.249964069634891, -0.166905487717334, -0.08353164774396, + -1.6642559749361, -1.6563662031493, -1.64545862501717, -1.63155037016045, + -1.61466536569775, -1.59483428204302, -1.57209446342709, + -1.54648984330104, -1.5180708448128, -1.48689426658247, + -1.45302315403522, -1.41652665658308, -1.37747987097932, + -1.33596367120011, -1.29206452523901, -1.24587429922908, + -1.19749004933661, -1.1332345848112, -1.06699388812265, + -0.998879221843645, -0.929006093690768, -0.857493994862305, + -0.78446612935228, -0.710049134853768, -0.634372795883799, + -0.557569749779674, -0.479775186232743, -0.401126541040269, + -0.321763184769142, -0.241826107036723, -0.161457597124012, + -0.0808009216446567, -1.60250065948611, -1.59440738055729, + -1.58357265117557, -1.57001203231508, -1.5537472599664, + -1.53480619589747, -1.51322276453778, -1.48903687612861, + -1.46229433631349, -1.4330467423737, -1.4013513663438, -1.3672710252721, + -1.33087393891981, -1.29223357522132, -1.25142848385577, + -1.20854211830666, -1.16366264681297, -1.1005518286854, -1.0356375762118, + -0.969020963084617, -0.900806919390688, -0.83110399391088, + -0.760024108222179, -0.687682303159323, -0.614196478210308, + -0.539687124436124, -0.464277051519758, -0.388091109562752, + -0.311255906259571, -0.233899520090455, -0.156151210182465, + -0.0781411234959847, -1.54239215244813, -1.5341007932344, + -1.52333696996973, -1.51011471681226, -1.49445363705454, + -1.4763788587158, -1.45592097761886, -1.43311598808078, + -1.40800520137417, -1.38063515214383, -1.35105749299082, + -1.31932887746275, -1.28551083171522, -1.2496696151353, + -1.21187607024274, -1.17220546220884, -1.13073730835664, + -1.06874061272294, -1.00511743261858, -0.939958924559163, + -0.873359723071944, -0.805417726318159, -0.736233874322215, + -0.665911920310063, -0.594558195674775, -0.522281369101736, + -0.44919220039912, -0.375403289591303, -0.301028821843589, + -0.226184308796087, -0.150986326892692, -0.075552253297944, + -1.48393045382214, -1.47544644118063, -1.46475158139968, + -1.45185842365198, -1.43678449696219, -1.41955227049801, + -1.40018910267031, -1.37872717915755, -1.35520343999483, + -1.32965949589285, -1.30214153397628, -1.27270021315503, + -1.24139054936555, -1.20827179094205, -1.17340728439994, + -1.13686433093562, -1.0987140339676, -1.03780093692384, + -0.975433457342979, -0.911693106267284, -0.846664504734536, + -0.780435192084144, -0.713095427652387, -0.644737986305988, + -0.575457948277203, -0.505352483776508, -0.434520632870827, + -0.363063081125921, -0.291081931521196, -0.21868047315362, + -0.145962947254694, -0.0730343110505345, -1.42711556360816, + -1.41844432439598, -1.40781648546539, -1.39524315283425, + -1.38073983968934, -1.3643264312441, -1.34602713969215, + -1.32587044935892, -1.30388905217547, -1.28011977362078, + -1.25460348930017, -1.22738503234893, -1.1985130918708, + -1.16804010264156, -1.13602212632736, -1.10251872448699, + -1.06759282364586, -1.0077328012881, -0.946585650385001, + -0.884223508208978, -0.820721264378463, -0.756156391208832, + -0.690608768212694, -0.624160501147098, -0.55689573601759, + -0.488900468460442, -0.420262348934882, -0.351070484166606, + -0.281415235292391, -0.211388013163053, -0.141081071268471, + -0.0705872967537562, -1.37194748180617, -1.36309444288045, + -1.35253168216689, -1.34026890435905, -1.326319665236, -1.31070134095408, + -1.29343508868437, -1.27454579868488, -1.25406203791609, + -1.23201598532761, -1.20844335896251, -1.18338333504445, + -1.15687845923097, -1.12897455023384, -1.09972059602499, + -1.06916864286296, -1.03737367739141, -0.978536205815711, + -0.918574011744646, -0.857550130384246, -0.795530002003725, + -0.732581323692226, -0.668773896003138, -0.604179464833394, + -0.538871558895938, -0.472925323153538, -0.406417348591282, + -0.339425498713359, -0.272028733157175, -0.204306928824387, + -0.136340698934022, -0.0682112104076092, -1.31842620841619, + -1.30939679663404, -1.29889717150416, -1.28693567822641, + -1.27352397360215, -1.25867699962793, -1.24241294964697, + -1.22475322713545, -1.2057223972167, -1.18534813101334, + -1.16366114296328, -1.1406951212416, -1.11648665144606, + -1.09107513371889, -1.06450269349285, -1.03681408606354, + -1.00805659520426, -0.950211150506677, -0.891398541421914, + -0.831672972793088, -0.771090717610323, -0.709709989534324, + -0.647590811023718, -0.584794877364875, -0.521385416912244, + -0.457427047855795, -0.392985631840029, -0.328128124766178, + -0.262922425115548, -0.197437220137621, -0.131741830251348, + -0.0659060520120935, -1.2665517434382, -1.25735138565675, + -1.24691295347721, -1.2352434744363, -1.22235276478781, + -1.20825340726567, -1.19296072257996, -1.17649273471061, + -1.15887013007728, -1.14011621067797, -1.12025684130249, + -1.09932039094038, -1.07733766851607, -1.05434185309671, + -1.03036841873093, -1.0054550540887, -0.97964157708441, + -0.922757635360998, -0.865059239416804, -0.806592035435505, + -0.747403411198256, -0.687542388735127, -0.627059513274433, + -0.566006738741541, -0.504437310066511, -0.442405642567212, + -0.379967198681121, -0.317178362325064, -0.254096311167509, + -0.190778887102756, -0.127284465220448, -0.063671821567209, + -1.21632408687221, -1.20695820994858, -1.19657902808603, + -1.18519229298874, -1.17280603879298, -1.15943056386729, + -1.14507840748332, -1.12976432141037, -1.11350523649785, + -1.0963202243215, -1.07823045398013, -1.05925914414079, -1.039431510441, + -1.01877470836729, -0.997317771739223, -0.97509154693847, + -0.952128623031855, -0.896175660378674, -0.839556105729317, + -0.782307318311495, -0.724468082767525, -0.666078521294635, + -0.607180002755285, -0.547815048963392, -0.488027238358738, + -0.427861107287792, -0.367362049114561, -0.306576211390018, + -0.245550391313058, -0.184331929719792, -0.122968603841323, + -0.0615085190729558, -1.16774323871822, -1.15821726950953, + -1.14789539533064, -1.13678213388372, -1.12488379561764, + -1.11220846943279, -1.09876600435707, -1.08456798723472, + -1.0696277164784, -1.05396017194393, -1.03758198099622, + -1.02051138084282, -1.00276817722086, -0.984373699530647, + -0.965350752517739, -0.945723564612834, -0.925517733046597, + -0.870465225559705, -0.814889140359452, -0.75881882142106, + -0.702284732318129, -0.645318387212847, -0.587952279466273, + -0.530219808030428, -0.472155201788924, -0.413793442017533, + -0.355170183140346, -0.296321671961039, -0.237284665552196, + -0.178096347988727, -0.118794246113973, -0.0594161445293338, + -1.12080919897623, -1.1111285643396, -1.10086205521101, + -1.09001299712124, -1.07858603526181, -1.06658712396217, + -1.0540235132012, -1.04090373218368, -1.02723757001892, + -1.01303605354527, -0.998311422350741, -0.983077101046474, + -0.967347668855629, -0.951138826586768, -0.934467361066475, + -0.917351107111795, -0.899808907128636, -0.84562633090409, + -0.791058343307209, -0.736126544764199, -0.680853359850069, + -0.625261986489764, -0.569376343407397, -0.51322101594265, + -0.45682120035707, -0.400202646756435, -0.343391600758478, + -0.286414744038126, -0.229299133884923, -0.172072141909564, + -0.114761392038397, -0.0573946979363431, -1.07552196764625, + -1.06569209443879, -1.05547900772717, -1.04488488270131, + -1.03391275772548, -1.02256652745543, -1.0108509340157, + -0.998771556257233, -0.986334797119435, -0.9735478691255, + -0.9604187780437, -0.946956304751757, -0.933169985345321, + -0.919070089535655, -0.90466759738543, -0.889974174435355, + -0.875002145277972, -0.82165897641183, -0.768063714572589, + -0.714230488340911, -0.660173965363344, -0.605909319125385, + -0.551452194578656, -0.496818672700056, -0.442025234063176, + -0.387088721504498, -0.332026301968956, -0.276855427621281, + -0.221593796311238, -0.1662593114823, -0.110870041614596, + -0.0554441792939836, -1.03188154472826, -1.0219078598071, + -1.01174625287909, -1.00139779062391, -0.990863963008657, + -0.980146679912575, -0.969248266800595, -0.958171459455384, + -0.946919397779927, -0.935495618684633, -0.923904048075098, + -0.912148991958666, -0.900235126689934, -0.888167488377311, + -0.875951461474606, -0.863592766583512, -0.851097447494605, + -0.798563162082926, -0.745905254155592, -0.693130652151198, + -0.640246548857955, -0.587260385119712, -0.534179832980052, + -0.481012778302648, -0.427767302907242, -0.374451666261723, + -0.32107428677178, -0.267643722710503, -0.214168652831141, + -0.160657856706938, -0.107120194842569, -0.0535645886022554, + -0.989887930222267, -0.979775860444533, -0.9696637906668, + -0.959551720889067, -0.949439651111334, -0.9393275813336, + -0.929215511555867, -0.919103441778134, -0.908991372000401, + -0.898879302222667, -0.888767232444934, -0.878655162667201, + -0.868543092889468, -0.858431023111734, -0.848318953334001, + -0.838206883556268, -0.828094813778534, -0.776338887917376, + -0.724582962056218, -0.672827036195059, -0.621071110333901, + -0.569315184472742, -0.517559258611584, -0.465803332750426, + -0.414047406889267, -0.362291481028109, -0.31053555516695, + -0.258779629305792, -0.207023703444634, -0.155267777583475, + -0.103511851722317, -0.0517559258611584, -0.785818953334001, + -0.733431023111734, -0.681043092889468, -0.628655162667201, + -0.576267232444934, -0.523879302222667, -0.471491372000401, + -0.419103441778134, -0.366715511555867, -0.314327581333601, + -0.261939651111334, -0.209551720889067, -0.1571637906668, + -0.104775860444533, -0.0523879302222667, -0.795299018750626, + -0.742279084167251, -0.689259149583876, -0.636239215000501, + -0.583219280417126, -0.530199345833751, -0.477179411250376, + -0.424159476667, -0.371139542083626, -0.31811960750025, + -0.265099672916875, -0.2120797383335, -0.159059803750125, + -0.10603986916675, -0.0530199345833751, -0.804779084167251, + -0.751127145222767, -0.697475206278284, -0.643823267333801, + -0.590171328389317, -0.536519389444834, -0.482867450500351, + -0.429215511555867, -0.375563572611384, -0.3219116336669, + -0.268259694722417, -0.214607755777934, -0.16095581683345, + -0.107303877888967, -0.0536519389444834, -0.814259149583876, + -0.759975206278284, -0.705691262972692, -0.651407319667101, + -0.597123376361509, -0.542839433055917, -0.488555489750325, + -0.434271546444734, -0.379987603139142, -0.32570365983355, + -0.271419716527959, -0.217135773222367, -0.162851829916775, + -0.108567886611183, -0.0542839433055917, -0.823739215000501, + -0.768823267333801, -0.713907319667101, -0.658991372000401, + -0.604075424333701, -0.549159476667, -0.4942435290003, -0.4393275813336, + -0.3844116336669, -0.3294956860002, -0.2745797383335, -0.2196637906668, + -0.1647478430001, -0.1098318953334, -0.0549159476667, -0.833219280417126, + -0.777671328389317, -0.722123376361509, -0.666575424333701, + -0.611027472305892, -0.555479520278084, -0.499931568250275, + -0.444383616222467, -0.388835664194659, -0.33328771216685, + -0.277739760139042, -0.222191808111233, -0.166643856083425, + -0.111095904055617, -0.0555479520278084, -0.842699345833751, + -0.786519389444834, -0.730339433055917, -0.674159476667, + -0.617979520278084, -0.561799563889167, -0.50561960750025, + -0.449439651111334, -0.393259694722417, -0.3370797383335, + -0.280899781944584, -0.224719825555667, -0.16853986916675, + -0.112359912777833, -0.0561799563889167, -0.852179411250376, + -0.79536745050035, -0.738555489750325, -0.6817435290003, + -0.624931568250275, -0.56811960750025, -0.511307646750225, + -0.4544956860002, -0.397683725250175, -0.34087176450015, + -0.284059803750125, -0.2272478430001, -0.170435882250075, + -0.11362392150005, -0.056811960750025, -0.861659476667, + -0.804215511555867, -0.746771546444734, -0.6893275813336, + -0.631883616222467, -0.574439651111334, -0.5169956860002, + -0.459551720889067, -0.402107755777934, -0.3446637906668, + -0.287219825555667, -0.229775860444533, -0.1723318953334, + -0.114887930222267, -0.0574439651111334, -0.871139542083625, + -0.813063572611384, -0.754987603139142, -0.6969116336669, + -0.638835664194659, -0.580759694722417, -0.522683725250175, + -0.464607755777934, -0.406531786305692, -0.34845581683345, + -0.290379847361208, -0.232303877888967, -0.174227908416725, + -0.116151938944483, -0.0580759694722417, -0.88061960750025, + -0.8219116336669, -0.76320365983355, -0.7044956860002, -0.64578771216685, + -0.5870797383335, -0.52837176450015, -0.4696637906668, -0.41095581683345, + -0.3522478430001, -0.29353986916675, -0.2348318953334, -0.17612392150005, + -0.1174159476667, -0.05870797383335, -0.890099672916875, + -0.830759694722417, -0.771419716527958, -0.7120797383335, + -0.652739760139042, -0.593399781944584, -0.534059803750125, + -0.474719825555667, -0.415379847361209, -0.35603986916675, + -0.296699890972292, -0.237359912777833, -0.178019934583375, + -0.118679956388917, -0.0593399781944584, -0.8995797383335, + -0.839607755777933, -0.779635773222367, -0.7196637906668, + -0.659691808111234, -0.599719825555667, -0.5397478430001, + -0.479775860444533, -0.419803877888967, -0.3598318953334, + -0.299859912777833, -0.239887930222267, -0.1799159476667, + -0.119943965111133, -0.0599719825555667, -0.909059803750125, + -0.84845581683345, -0.787851829916775, -0.7272478430001, + -0.666643856083425, -0.60603986916675, -0.545435882250075, + -0.4848318953334, -0.424227908416725, -0.36362392150005, + -0.303019934583375, -0.2424159476667, -0.181811960750025, + -0.12120797383335, -0.060603986916675, -0.91853986916675, + -0.857303877888967, -0.796067886611183, -0.7348318953334, + -0.673595904055617, -0.612359912777833, -0.55112392150005, + -0.489887930222267, -0.428651938944483, -0.3674159476667, + -0.306179956388917, -0.244943965111133, -0.18370797383335, + -0.122471982555567, -0.0612359912777833, -0.928019934583375, + -0.866151938944483, -0.804283943305592, -0.7424159476667, + -0.680547952027808, -0.618679956388917, -0.556811960750025, + -0.494943965111133, -0.433075969472242, -0.37120797383335, + -0.309339978194458, -0.247471982555567, -0.185603986916675, + -0.123735991277783, -0.0618679956388917, -0.0999220232298596, 0, + -0.104680214812234, 0, -0.109438406394608, 0, -0.114196597976982, 0, + -0.118954789559356, 0, -0.199617690938785, -0.209123295269203, + -0.218628899599621, -0.228134503930039, -0.237640108260457, + -0.298861160373899, -0.313092644201227, -0.327324128028556, + -0.341555611855884, -0.355787095683213, -0.397427613156862, + -0.416352737592903, -0.435277862028944, -0.454202986464985, + -0.473128110901025, -0.495093764569798, -0.518669658120741, + -0.542245551671683, -0.565821445222626, -0.589397338773568, + -0.591638369367002, -0.619811625051145, -0.647984880735288, + -0.676158136419431, -0.704331392103574, -0.686842722966586, + -0.719549519298328, -0.75225631563007, -0.784963111961812, + -0.817669908293554, -0.780491156886689, -0.817657402452721, + -0.854823648018754, -0.891989893584786, -0.929156139150819, + -0.872371527303961, -0.91391302860415, -0.955454529904339, + -0.996996031204528, -1.03853753250472, -0.962275695627562, + -1.0080983478003, -1.05392099997304, -1.09974365214579, + -1.14556630431853, -1.05, -1.1, -1.15, -1.2, -1.25, -1.13534571665676, + -1.18940979840232, -1.24347388014787, -1.29753796189343, + -1.35160204363899, -1.21811951009952, -1.27612520105664, + -1.33413089201376, -1.39213658297088, -1.450142273928, -1.29813387106327, + -1.35994976968533, -1.42176566830739, -1.48358156692945, + -1.54539746555151, -1.3752075412851, -1.44069361467963, + -1.50617968807416, -1.57166576146868, -1.63715183486321, + -1.44916592411244, -1.51817382526065, -1.58718172640886, + -1.65618962755707, -1.72519752870528, -1.51984148002065, + -1.59221488383115, -1.66458828764166, -1.73696169145217, + -1.80933509526268, -1.58707410614394, -1.66264906357937, + -1.73822402101479, -1.81379897845022, -1.88937393588565, + -1.65071149895985, -1.72931680843413, -1.80792211790841, + -1.88652742738269, -1.96513273685697, -1.71060949930571, + -1.79206709451074, -1.87352468971577, -1.95498228492081, + -2.03643988012584, -1.76663241894548, -1.8507577722286, + -1.93488312551172, -2.01900847879483, -2.10313383207795, + -1.81865334794732, -1.90525588832577, -1.99185842870421, + -2.07846096908265, -2.1650635094611, -1.86655444217534, + -1.95543798704083, -2.04432153190632, -2.13320507677182, + -2.22208862163731, -1.91022719024449, -2.00119038977994, + -2.09215358931539, -2.18311678885084, -2.2740799883863, + -1.94957265933375, -2.04240945263536, -2.13524624593697, + -2.22808303923857, -2.32091983254018, -1.9845017193008, + -2.07900180117227, -2.17350188304374, -2.2680019649152, + -2.36250204678667, -2.01493524459044, -2.11088454195189, + -2.20683383931334, -2.30278313667479, -2.39873243403624, + -2.04080429347944, -2.13798545031179, -2.23516660714415, + -2.3323477639765, -2.42952892080885, -2.06205026425168, + -2.16024313397795, -2.25843600370423, -2.3566288734305, + -2.45482174315677, -2.07862502794996, -2.17760717213805, + -2.27658931632615, -2.37557146051424, -2.47455360470233, + -2.09049103740348, -2.19003822966079, -2.28958542191809, + -2.3891326141754, -2.48867980643271, -2.09762141228432, + -2.19750814620262, -2.29739488012092, -2.39728161403922, + -2.49716834795752, -2.1, -2.2, -2.3, -2.4, -2.5, -2.09762141228432, + -2.19750814620262, -2.29739488012092, -2.39728161403922, + -2.49716834795752, -2.09049103740348, -2.19003822966079, + -2.28958542191809, -2.3891326141754, -2.48867980643271, + -2.07862502794996, -2.17760717213805, -2.27658931632615, + -2.37557146051424, -2.47455360470233, -2.06205026425168, + -2.16024313397795, -2.25843600370423, -2.3566288734305, + -2.45482174315677, -2.04080429347944, -2.13798545031179, + -2.23516660714415, -2.3323477639765, -2.42952892080885, + -2.01493524459044, -2.11088454195189, -2.20683383931334, + -2.30278313667479, -2.39873243403624, -1.9845017193008, + -2.07900180117227, -2.17350188304374, -2.2680019649152, + -2.36250204678667, -1.94957265933375, -2.04240945263536, + -2.13524624593697, -2.22808303923857, -2.32091983254018, + -1.91022719024449, -2.00119038977994, -2.09215358931539, + -2.18311678885084, -2.2740799883863, -1.86655444217534, + -1.95543798704083, -2.04432153190632, -2.13320507677182, + -2.22208862163731, -1.81865334794732, -1.90525588832576, + -1.99185842870421, -2.07846096908265, -2.1650635094611, + -1.76663241894548, -1.8507577722286, -1.93488312551172, + -2.01900847879483, -2.10313383207795, -1.7106094993057, + -1.79206709451074, -1.87352468971577, -1.95498228492081, + -2.03643988012584, -1.65071149895985, -1.72931680843413, + -1.80792211790841, -1.88652742738269, -1.96513273685697, + -1.58707410614394, -1.66264906357937, -1.73822402101479, + -1.81379897845022, -1.88937393588565, -1.51984148002065, + -1.59221488383115, -1.66458828764166, -1.73696169145217, + -1.80933509526268, -1.44916592411244, -1.51817382526065, + -1.58718172640886, -1.65618962755707, -1.72519752870528, + -1.3752075412851, -1.44069361467963, -1.50617968807416, + -1.57166576146868, -1.63715183486321, -1.29813387106327, + -1.35994976968533, -1.42176566830739, -1.48358156692945, + -1.54539746555151, -1.21811951009952, -1.27612520105664, + -1.33413089201376, -1.39213658297088, -1.450142273928, -1.13534571665675, + -1.18940979840231, -1.24347388014787, -1.29753796189343, + -1.35160204363899, -1.05, -1.1, -1.15, -1.2, -1.25, -0.962275695627562, + -1.0080983478003, -1.05392099997304, -1.09974365214579, + -1.14556630431853, -0.872371527303961, -0.913913028604149, + -0.955454529904338, -0.996996031204527, -1.03853753250472, + -0.780491156886687, -0.81765740245272, -0.854823648018753, + -0.891989893584786, -0.929156139150819, -0.686842722966585, + -0.719549519298327, -0.752256315630069, -0.784963111961811, + -0.817669908293553, -0.591638369367002, -0.619811625051145, + -0.647984880735288, -0.676158136419431, -0.704331392103574, + -0.495093764569797, -0.51866965812074, -0.542245551671683, + -0.565821445222626, -0.589397338773568, -0.397427613156861, + -0.416352737592902, -0.435277862028943, -0.454202986464984, + -0.473128110901025, -0.298861160373899, -0.313092644201227, + -0.327324128028556, -0.341555611855884, -0.355787095683213, + -0.199617690938783, -0.209123295269202, -0.21862889959962, + -0.228134503930038, -0.237640108260456, -0.0999220232298583, + -0.104680214812233, -0.109438406394607, -0.114196597976981, + -0.118954789559356, 1.34711147906209e-16, 2.4492935982947e-17, + -8.57252759403147e-17, -1.95943487863577e-16, -3.06161699786838e-16, + 0.0999220232298595, 0.104680214812234, 0.109438406394608, + 0.114196597976982, 0.118954789559356, 0.199617690938784, + 0.209123295269202, 0.21862889959962, 0.228134503930038, + 0.237640108260455, 0.298861160373899, 0.313092644201227, + 0.327324128028556, 0.341555611855884, 0.355787095683212, + 0.397427613156862, 0.416352737592903, 0.435277862028944, + 0.454202986464985, 0.473128110901026, 0.495093764569797, + 0.51866965812074, 0.542245551671683, 0.565821445222625, + 0.589397338773568, 0.591638369367003, 0.619811625051146, + 0.647984880735289, 0.676158136419432, 0.704331392103575, + 0.686842722966586, 0.719549519298328, 0.752256315630071, + 0.784963111961813, 0.817669908293555, 0.780491156886688, + 0.81765740245272, 0.854823648018753, 0.891989893584786, + 0.929156139150818, 0.872371527303962, 0.91391302860415, + 0.955454529904339, 0.996996031204528, 1.03853753250472, + 0.962275695627562, 1.0080983478003, 1.05392099997304, 1.09974365214579, + 1.14556630431853, 1.05, 1.1, 1.15, 1.2, 1.25, 1.13534571665676, + 1.18940979840232, 1.24347388014787, 1.29753796189344, 1.35160204363899, + 1.21811951009952, 1.27612520105664, 1.33413089201376, 1.39213658297088, + 1.45014227392799, 1.29813387106327, 1.35994976968533, 1.42176566830739, + 1.48358156692945, 1.54539746555151, 1.3752075412851, 1.44069361467963, + 1.50617968807416, 1.57166576146868, 1.63715183486321, 1.44916592411244, + 1.51817382526065, 1.58718172640886, 1.65618962755707, 1.72519752870528, + 1.51984148002065, 1.59221488383115, 1.66458828764166, 1.73696169145217, + 1.80933509526268, 1.58707410614394, 1.66264906357937, 1.73822402101479, + 1.81379897845022, 1.88937393588565, 1.65071149895985, 1.72931680843413, + 1.80792211790841, 1.88652742738269, 1.96513273685697, 1.71060949930571, + 1.79206709451074, 1.87352468971577, 1.95498228492081, 2.03643988012584, + 1.76663241894548, 1.8507577722286, 1.93488312551172, 2.01900847879483, + 2.10313383207795, 1.81865334794732, 1.90525588832577, 1.99185842870421, + 2.07846096908265, 2.1650635094611, 1.86655444217534, 1.95543798704083, + 2.04432153190632, 2.13320507677182, 2.22208862163731, 1.91022719024449, + 2.00119038977994, 2.09215358931539, 2.18311678885084, 2.2740799883863, + 1.94957265933375, 2.04240945263536, 2.13524624593697, 2.22808303923857, + 2.32091983254018, 1.9845017193008, 2.07900180117227, 2.17350188304374, + 2.2680019649152, 2.36250204678667, 2.01493524459044, 2.11088454195189, + 2.20683383931334, 2.30278313667479, 2.39873243403624, 2.04080429347944, + 2.13798545031179, 2.23516660714415, 2.3323477639765, 2.42952892080885, + 2.06205026425168, 2.16024313397795, 2.25843600370423, 2.3566288734305, + 2.45482174315677, 2.07862502794996, 2.17760717213805, 2.27658931632615, + 2.37557146051424, 2.47455360470233, 2.09049103740348, 2.19003822966079, + 2.28958542191809, 2.3891326141754, 2.48867980643271, 2.09762141228432, + 2.19750814620262, 2.29739488012092, 2.39728161403922, 2.49716834795752, + 2.1, 2.2, 2.3, 2.4, 2.5, 2.09762141228432, 2.19750814620262, + 2.29739488012092, 2.39728161403922, 2.49716834795752, 2.09049103740348, + 2.19003822966079, 2.28958542191809, 2.3891326141754, 2.48867980643271, + 2.07862502794996, 2.17760717213805, 2.27658931632615, 2.37557146051424, + 2.47455360470233, 2.06205026425168, 2.16024313397795, 2.25843600370423, + 2.3566288734305, 2.45482174315677, 2.04080429347944, 2.13798545031179, + 2.23516660714415, 2.3323477639765, 2.42952892080885, 2.01493524459044, + 2.11088454195189, 2.20683383931334, 2.30278313667479, 2.39873243403624, + 1.9845017193008, 2.07900180117227, 2.17350188304374, 2.2680019649152, + 2.36250204678667, 1.94957265933375, 2.04240945263536, 2.13524624593697, + 2.22808303923857, 2.32091983254018, 1.91022719024449, 2.00119038977994, + 2.09215358931539, 2.18311678885084, 2.2740799883863, 1.86655444217534, + 1.95543798704083, 2.04432153190632, 2.13320507677182, 2.22208862163731, + 1.81865334794732, 1.90525588832576, 1.99185842870421, 2.07846096908265, + 2.1650635094611, 1.76663241894548, 1.8507577722286, 1.93488312551172, + 2.01900847879484, 2.10313383207795, 1.7106094993057, 1.79206709451074, + 1.87352468971577, 1.95498228492081, 2.03643988012584, 1.65071149895985, + 1.72931680843413, 1.80792211790841, 1.88652742738269, 1.96513273685697, + 1.58707410614394, 1.66264906357937, 1.73822402101479, 1.81379897845022, + 1.88937393588565, 1.51984148002065, 1.59221488383115, 1.66458828764166, + 1.73696169145217, 1.80933509526267, 1.44916592411244, 1.51817382526065, + 1.58718172640886, 1.65618962755707, 1.72519752870528, 1.3752075412851, + 1.44069361467963, 1.50617968807416, 1.57166576146868, 1.63715183486321, + 1.29813387106327, 1.35994976968533, 1.42176566830739, 1.48358156692945, + 1.54539746555151, 1.21811951009952, 1.27612520105664, 1.33413089201376, + 1.39213658297088, 1.450142273928, 1.13534571665675, 1.18940979840231, + 1.24347388014787, 1.29753796189343, 1.35160204363899, 1.05, 1.1, 1.15, + 1.2, 1.25, 0.962275695627562, 1.0080983478003, 1.05392099997304, + 1.09974365214579, 1.14556630431853, 0.872371527303961, 0.91391302860415, + 0.955454529904338, 0.996996031204527, 1.03853753250472, + 0.780491156886688, 0.81765740245272, 0.854823648018753, + 0.891989893584785, 0.929156139150818, 0.686842722966586, + 0.719549519298328, 0.75225631563007, 0.784963111961812, + 0.817669908293555, 0.591638369367002, 0.619811625051145, + 0.647984880735288, 0.676158136419431, 0.704331392103574, + 0.495093764569797, 0.51866965812074, 0.542245551671682, + 0.565821445222625, 0.589397338773567, 0.397427613156861, + 0.416352737592902, 0.435277862028943, 0.454202986464984, + 0.473128110901024, 0.298861160373898, 0.313092644201227, + 0.327324128028555, 0.341555611855883, 0.355787095683211, + 0.199617690938784, 0.209123295269202, 0.21862889959962, + 0.228134503930038, 0.237640108260456, 0.0999220232298586, + 0.104680214812233, 0.109438406394607, 0.114196597976981, + 0.118954789559355, -0.12371298114173, 0, -0.247145712590875, + -0.370018579510541, -0.492053235337067, -0.612973232324511, + -0.732504647787717, -0.850376704625296, -0.966322384716852, + -1.0800790338049, -1.19138895649127, -1.3, -1.40566612538455, + -1.50814796488512, -1.60721336417357, -1.70263790825774, + -1.79420542985349, -1.88170849907318, -1.96494889332107, + -2.04373804633125, -2.11789747533087, -2.18725918536107, + -2.25166604983954, -2.3109721665028, -2.36504318792175, + -2.41375662584179, -2.45700212865814, -2.49468173139769, + -2.52671007764121, -2.55301461288304, -2.57353574889042, + -2.58822699869002, -2.59705508187582, -2.6, -2.59705508187582, + -2.58822699869002, -2.57353574889042, -2.55301461288304, + -2.52671007764121, -2.49468173139769, -2.45700212865814, + -2.41375662584179, -2.36504318792175, -2.3109721665028, + -2.25166604983954, -2.18725918536107, -2.11789747533087, + -2.04373804633125, -1.96494889332107, -1.88170849907318, + -1.79420542985349, -1.70263790825774, -1.60721336417357, + -1.50814796488512, -1.40566612538455, -1.3, -1.19138895649127, + -1.08007903380491, -0.966322384716852, -0.850376704625297, + -0.732504647787717, -0.612973232324511, -0.492053235337066, + -0.370018579510541, -0.247145712590876, -0.12371298114173, + -3.18408167778312e-16, 0.12371298114173, 0.247145712590874, + 0.370018579510541, 0.492053235337067, 0.612973232324511, + 0.732504647787718, 0.850376704625295, 0.966322384716851, 1.0800790338049, + 1.19138895649127, 1.3, 1.40566612538455, 1.50814796488512, + 1.60721336417357, 1.70263790825774, 1.79420542985349, 1.88170849907318, + 1.96494889332107, 2.04373804633125, 2.11789747533087, 2.18725918536107, + 2.25166604983954, 2.3109721665028, 2.36504318792175, 2.41375662584179, + 2.45700212865814, 2.49468173139769, 2.52671007764121, 2.55301461288304, + 2.57353574889042, 2.58822699869002, 2.59705508187582, 2.6, + 2.59705508187582, 2.58822699869002, 2.57353574889043, 2.55301461288304, + 2.52671007764121, 2.49468173139769, 2.45700212865814, 2.41375662584179, + 2.36504318792175, 2.3109721665028, 2.25166604983954, 2.18725918536107, + 2.11789747533087, 2.04373804633125, 1.96494889332107, 1.88170849907318, + 1.79420542985349, 1.70263790825774, 1.60721336417357, 1.50814796488512, + 1.40566612538455, 1.3, 1.19138895649127, 1.0800790338049, + 0.966322384716851, 0.850376704625297, 0.732504647787717, + 0.612973232324513, 0.492053235337068, 0.370018579510542, + 0.247145712590875, 0.123712981141731, -0.137497667533552, + -0.00631313131313131, -0.151282353925374, -0.0126262626262626, + -0.165067040317195, -0.0189393939393939, -0.178851726709017, + -0.0252525252525252, -0.192636413100839, -0.0315656565656565, + -0.206421099492661, -0.0378787878787878, -0.220205785884483, + -0.0441919191919192, -0.233990472276305, -0.0505050505050505, + -0.247775158668127, -0.0568181818181818, -0.261559845059948, + -0.0631313131313131, -0.27534453145177, -0.0694444444444444, + -0.289129217843592, -0.0757575757575757, -0.302913904235414, + -0.082070707070707, -0.316698590627236, -0.0883838383838383, + -0.330483277019058, -0.0946969696969696, -0.344267963410879, + -0.101010101010101, -0.358052649802701, -0.107323232323232, + -0.371837336194523, -0.113636363636364, -0.385622022586345, + -0.119949494949495, -0.399406708978167, -0.126262626262626, + -0.413191395369989, -0.132575757575757, -0.42697608176181, + -0.138888888888889, -0.440760768153632, -0.14520202020202, + -0.454545454545454, -0.151515151515151, -0.268413631131912, + -0.289681549672948, -0.310949468213985, -0.332217386755022, + -0.353485305296059, -0.374753223837096, -0.396021142378132, + -0.417289060919169, -0.438556979460206, -0.459824898001243, + -0.48109281654228, -0.502360735083316, -0.523628653624353, + -0.54489657216539, -0.566164490706427, -0.587432409247464, + -0.6087003277885, -0.629968246329537, -0.651236164870574, + -0.672504083411611, -0.693772001952647, -0.715039920493684, + -0.736307839034721, -0.757575757575758, -0.398793057889521, + -0.427567536268501, -0.456342014647481, -0.485116493026461, + -0.513890971405441, -0.542665449784421, -0.571439928163401, + -0.600214406542381, -0.628988884921361, -0.657763363300341, + -0.686537841679321, -0.715312320058301, -0.744086798437281, + -0.772861276816261, -0.801635755195241, -0.830410233574221, + -0.859184711953201, -0.887959190332181, -0.916733668711161, + -0.945508147090141, -0.974282625469121, -1.0030571038481, + -1.03183158222708, -1.06060606060606, -0.528369199016204, + -0.564685162695341, -0.601001126374479, -0.637317090053616, + -0.673633053732753, -0.709949017411891, -0.746264981091028, + -0.782580944770165, -0.818896908449303, -0.85521287212844, + -0.891528835807577, -0.927844799486715, -0.964160763165852, + -1.00047672684499, -1.03679269052413, -1.07310865420326, + -1.1094246178824, -1.14574058156154, -1.18205654524068, + -1.21837250891981, -1.25468847259895, -1.29100443627809, + -1.32732039995723, -1.36363636363636, -0.656877125422101, + -0.70078101851969, -0.74468491161728, -0.78858880471487, + -0.83249269781246, -0.87639659091005, -0.92030048400764, + -0.964204377105229, -1.00810827020282, -1.05201216330041, + -1.095916056398, -1.13981994949559, -1.18372384259318, -1.22762773569077, + -1.27153162878836, -1.31543552188595, -1.35933941498354, + -1.40324330808113, -1.44714720117872, -1.49105109427631, + -1.5349549873739, -1.57885888047149, -1.62276277356908, + -1.66666666666667, -0.784054327867269, -0.835604007946821, + -0.887153688026374, -0.938703368105926, -0.990253048185478, + -1.04180272826503, -1.09335240834458, -1.14490208842413, + -1.19645176850369, -1.24800144858324, -1.29955112866279, + -1.35110080874234, -1.4026504888219, -1.45420016890145, -1.505749848981, + -1.55729952906055, -1.6088492091401, -1.66039888921966, + -1.71194856929921, -1.76349824937876, -1.81504792945831, + -1.86659760953787, -1.91814728961742, -1.96969696969697, + -0.909641311629545, -0.968905918633794, -1.02817052563804, + -1.08743513264229, -1.14669973964654, -1.20596434665079, + -1.26522895365504, -1.32449356065929, -1.38375816766354, + -1.44302277466779, -1.50228738167204, -1.56155198867628, + -1.62081659568053, -1.68008120268478, -1.73934580968903, + -1.79861041669328, -1.85787502369753, -1.91713963070178, + -1.97640423770603, -2.03566884471028, -2.09493345171453, + -2.15419805871877, -2.21346266572302, -2.27272727272727, + -1.03338218434355, -1.10044198397025, -1.16750178359694, + -1.23456158322364, -1.30162138285034, -1.36868118247703, + -1.43574098210373, -1.50280078173043, -1.56986058135712, + -1.63692038098382, -1.70398018061052, -1.77103998023721, + -1.83809977986391, -1.90515957949061, -1.9722193791173, -2.039279178744, + -2.1063389783707, -2.17339877799739, -2.24045857762409, + -2.30751837725079, -2.37457817687749, -2.44163797650418, + -2.50869777613088, -2.57575757575758, -1.1550252356792, + -1.22997143755349, -1.30491763942778, -1.37986384130207, + -1.45481004317636, -1.52975624505065, -1.60470244692494, + -1.67964864879923, -1.75459485067352, -1.82954105254781, + -1.9044872544221, -1.97943345629639, -2.05437965817068, + -2.12932586004497, -2.20427206191926, -2.27921826379355, + -2.35416446566784, -2.42911066754214, -2.50405686941643, + -2.57900307129072, -2.65394927316501, -2.7288954750393, + -2.80384167691359, -2.87878787878788, -1.27432350754656, + -1.35725805860184, -1.44019260965713, -1.52312716071242, + -1.60606171176771, -1.688996262823, -1.77193081387828, -1.85486536493357, + -1.93779991598886, -2.02073446704415, -2.10366901809944, + -2.18660356915472, -2.26953812021001, -2.3524726712653, + -2.43540722232059, -2.51834177337588, -2.60127632443116, + -2.68421087548645, -2.76714542654174, -2.85007997759703, + -2.93301452865232, -3.01594907970761, -3.09888363076289, + -3.18181818181818, -1.39103535353535, -1.48207070707071, + -1.57310606060606, -1.66414141414141, -1.75517676767677, + -1.84621212121212, -1.93724747474747, -2.02828282828283, + -2.11931818181818, -2.21035353535354, -2.30138888888889, + -2.39242424242424, -2.4834595959596, -2.57449494949495, -2.6655303030303, + -2.75656565656566, -2.84760101010101, -2.93863636363636, + -3.02967171717172, -3.12070707070707, -3.21174242424242, + -3.30277777777778, -3.39381313131313, -3.48484848484848, + -1.50492498632181, -1.60418384725907, -1.70344270819633, + -1.80270156913359, -1.90196043007085, -2.00121929100811, + -2.10047815194537, -2.19973701288263, -2.29899587381989, + -2.39825473475715, -2.49751359569441, -2.59677245663167, + -2.69603131756893, -2.79529017850619, -2.89454903944345, + -2.99380790038071, -3.09306676131797, -3.19232562225523, + -3.29158448319249, -3.39084334412975, -3.49010220506701, + -3.58936106600427, -3.68861992694153, -3.78787878787879, + -1.61576301180278, -1.72337805872045, -1.83099310563811, + -1.93860815255578, -2.04622319947344, -2.15383824639111, + -2.26145329330877, -2.36906834022644, -2.47668338714411, + -2.58429843406177, -2.69191348097944, -2.7995285278971, + -2.90714357481477, -3.01475862173243, -3.1223736686501, + -3.22998871556777, -3.33760376248543, -3.4452188094031, + -3.55283385632076, -3.66044890323843, -3.76806395015609, + -3.87567899707376, -3.98329404399143, -4.09090909090909, + -1.72332694874715, -1.83944053332073, -1.9555541178943, + -2.07166770246788, -2.18778128704145, -2.30389487161503, + -2.4200084561886, -2.53612204076218, -2.65223562533576, + -2.76834920990933, -2.88446279448291, -3.00057637905648, + -3.11668996363006, -3.23280354820364, -3.34891713277721, + -3.46503071735079, -3.58114430192436, -3.69725788649794, + -3.81337147107151, -3.92948505564509, -4.04559864021867, + -4.16171222479224, -4.27782580936582, -4.39393939393939, + -1.82740173278741, -1.95216555731707, -2.07692938184674, + -2.2016932063764, -2.32645703090606, -2.45122085543573, + -2.57598467996539, -2.70074850449506, -2.82551232902472, + -2.95027615355439, -3.07503997808405, -3.19980380261372, + -3.32456762714338, -3.44933145167305, -3.57409527620271, + -3.69885910073238, -3.82362292526204, -3.94838674979171, + -4.07315057432137, -4.19791439885104, -4.3226782233807, + -4.44744204791037, -4.57220587244003, -4.6969696969697, -1.9277802036096, + -2.0613549773657, -2.1949297511218, -2.32850452487791, -2.46207929863401, + -2.59565407239012, -2.72922884614622, -2.86280361990233, + -2.99637839365843, -3.12995316741454, -3.26352794117064, + -3.39710271492675, -3.53067748868285, -3.66425226243895, + -3.79782703619506, -3.93140180995116, -4.06497658370727, + -4.19855135746337, -4.33212613121948, -4.46570090497558, + -4.59927567873169, -4.73285045248779, -4.8664252262439, -5, + -2.0116373116118, -2.14156612415042, -2.27149493668903, + -2.40142374922765, -2.53135256176627, -2.66128137430489, + -2.7912101868435, -2.92113899938212, -3.05106781192074, + -3.18099662445936, -3.31092543699797, -3.44085424953659, + -3.57078306207521, -3.70071187461383, -3.83064068715244, + -3.96056949969106, -4.09049831222968, -4.2204271247683, + -4.35035593730691, -4.48028474984553, -4.61021356238415, + -4.74014237492277, -4.87007118746138, -5, -2.09140935609936, + -2.21786981887765, -2.34433028165594, -2.47079074443423, + -2.59725120721251, -2.7237116699908, -2.85017213276909, + -2.97663259554738, -3.10309305832567, -3.22955352110396, + -3.35601398388225, -3.48247444666054, -3.60893490943882, + -3.73539537221711, -3.8618558349954, -3.98831629777369, + -4.11477676055198, -4.24123722333027, -4.36769768610856, + -4.49415814888685, -4.62061861166513, -4.74707907444342, + -4.87353953722171, -5, -2.16691562773411, -2.29009320913698, + -2.41327079053984, -2.53644837194271, -2.65962595334557, + -2.78280353474844, -2.9059811161513, -3.02915869755416, + -3.15233627895703, -3.27551386035989, -3.39869144176276, + -3.52186902316562, -3.64504660456849, -3.76822418597135, + -3.89140176737422, -4.01457934877708, -4.13775693017995, + -4.26093451158281, -4.38411209298568, -4.50728967438854, + -4.63046725579141, -4.75364483719427, -4.87682241859714, -5, + -2.23798508052542, -2.35807268571997, -2.47816029091451, + -2.59824789610906, -2.71833550130361, -2.83842310649815, + -2.9585107116927, -3.07859831688725, -3.1986859220818, -3.31877352727634, + -3.43886113247089, -3.55894873766544, -3.67903634285998, + -3.79912394805453, -3.91921155324908, -4.03929915844362, + -4.15938676363817, -4.27947436883272, -4.39956197402727, + -4.51964957922181, -4.63973718441636, -4.75982478961091, + -4.87991239480545, -5, -2.30445671930436, -2.42165425324765, + -2.53885178719094, -2.65604932113423, -2.77324685507751, + -2.8904443890208, -3.00764192296409, -3.12483945690738, + -3.24203699085067, -3.35923452479396, -3.47643205873725, + -3.59362959268054, -3.71082712662382, -3.82802466056711, + -3.9452221945104, -4.06241972845369, -4.17961726239698, + -4.29681479634027, -4.41401233028356, -4.53120986422685, + -4.64840739817013, -4.76560493211342, -4.88280246605671, -5, + -2.36617996442956, -2.48069387901958, -2.5952077936096, + -2.70972170819962, -2.82423562278964, -2.93874953737966, + -3.05326345196967, -3.16777736655969, -3.28229128114971, + -3.39680519573973, -3.51131911032975, -3.62583302491977, + -3.74034693950979, -3.85486085409981, -3.96937476868983, + -4.08388868327985, -4.19840259786987, -4.31291651245988, + -4.4274304270499, -4.54194434163992, -4.65645825622994, + -4.77097217081996, -4.88548608540998, -5, -2.42301499289852, + -2.53505781929423, -2.64710064568995, -2.75914347208567, + -2.87118629848138, -2.9832291248771, -3.09527195127282, + -3.20731477766853, -3.31935760406425, -3.43140043045997, + -3.54344325685568, -3.6554860832514, -3.76752890964712, + -3.87957173604283, -3.99161456243855, -4.10365738883427, + -4.21570021522998, -4.3277430416257, -4.43978586802142, + -4.55182869441713, -4.66387152081285, -4.77591434720857, + -4.88795717360428, -5, -2.47483305509168, -2.5846229222616, + -2.69441278943153, -2.80420265660146, -2.91399252377138, + -3.02378239094131, -3.13357225811124, -3.24336212528117, + -3.35315199245109, -3.46294185962102, -3.57273172679095, + -3.68252159396087, -3.7923114611308, -3.90210132830073, + -4.01189119547066, -4.12168106264058, -4.23147092981051, + -4.34126079698044, -4.45105066415036, -4.56084053132029, + -4.67063039849022, -4.78042026566015, -4.89021013283007, -5, + -2.52151676643171, -2.62927690702164, -2.73703704761157, + -2.84479718820149, -2.95255732879142, -3.06031746938134, + -3.16807760997127, -3.27583775056119, -3.38359789115112, + -3.49135803174104, -3.59911817233097, -3.70687831292089, + -3.81463845351082, -3.92239859410075, -4.03015873469067, + -4.1379188752806, -4.24567901587052, -4.35343915646045, + -4.46119929705037, -4.5689594376403, -4.67671957823022, + -4.78447971882015, -4.89223985941007, -5, -2.56296037329738, + -2.66891861793663, -2.77487686257587, -2.88083510721511, + -2.98679335185436, -3.0927515964936, -3.19870984113285, + -3.30466808577209, -3.41062633041134, -3.51658457505058, + -3.62254281968982, -3.72850106432907, -3.83445930896831, + -3.94041755360756, -4.0463757982468, -4.15233404288605, + -4.25829228752529, -4.36425053216453, -4.47020877680378, + -4.57616702144302, -4.68212526608227, -4.78808351072151, + -4.89404175536076, -5, -2.59906999258946, -2.70345825378122, + -2.80784651497298, -2.91223477616474, -3.01662303735651, + -3.12101129854827, -3.22539955974003, -3.3297878209318, + -3.43417608212356, -3.53856434331532, -3.64295260450708, + -3.74734086569885, -3.85172912689061, -3.95611738808237, + -4.06050564927413, -4.1648939104659, -4.26928217165766, + -4.37367043284942, -4.47805869404119, -4.58244695523295, + -4.68683521642471, -4.79122347761647, -4.89561173880824, -5, + -2.62976382440616, -2.73281757117111, -2.83587131793606, + -2.93892506470101, -3.04197881146596, -3.14503255823091, + -3.24808630499586, -3.35114005176081, -3.45419379852575, + -3.5572475452907, -3.66030129205565, -3.7633550388206, -3.86640878558555, + -3.9694625323505, -4.07251627911545, -4.1755700258804, -4.27862377264535, + -4.3816775194103, -4.48473126617525, -4.5877850129402, -4.69083875970515, + -4.7938925064701, -4.89694625323505, -5, -2.65497233734624, + -2.75693006180945, -2.85888778627266, -2.96084551073586, + -3.06280323519907, -3.16476095966228, -3.26671868412548, + -3.36867640858869, -3.4706341330519, -3.57259185751511, + -3.67454958197831, -3.77650730644152, -3.87846503090473, + -3.98042275536793, -4.08238047983114, -4.18433820429435, + -4.28629592875755, -4.38825365322076, -4.49021137768397, + -4.59216910214717, -4.69412682661038, -4.79608455107359, + -4.89804227553679, -5, -2.67463842601999, -2.77574110314956, + -2.87684378027912, -2.97794645740869, -3.07904913453825, + -3.18015181166782, -3.28125448879738, -3.38235716592695, + -3.48345984305652, -3.58456252018608, -3.68566519731565, + -3.78676787444521, -3.88787055157478, -3.98897322870434, + -4.09007590583391, -4.19117858296347, -4.29228126009304, + -4.39338393722261, -4.49448661435217, -4.59558929148174, + -4.6966919686113, -4.79779464574087, -4.89889732287043, -5, + -2.68871754041127, -2.78920808213252, -2.88969862385377, + -2.99018916557502, -3.09067970729627, -3.19117024901752, + -3.29166079073876, -3.39215133246001, -3.49264187418126, + -3.59313241590251, -3.69362295762376, -3.79411349934501, + -3.89460404106626, -3.99509458278751, -4.09558512450876, + -4.19607566623001, -4.29656620795126, -4.3970567496725, + -4.49754729139375, -4.598037833115, -4.69852837483625, -4.7990189165575, + -4.89950945827875, -5, -2.69717778679766, -2.7973004917195, + -2.89742319664134, -2.99754590156318, -3.09766860648502, + -3.19779131140687, -3.29791401632871, -3.39803672125055, + -3.49815942617239, -3.59828213109423, -3.69840483601607, + -3.79852754093791, -3.89865024585975, -3.99877295078159, + -4.09889565570343, -4.19901836062527, -4.29914106554711, + -4.39926377046895, -4.4993864753908, -4.59950918031264, + -4.69963188523448, -4.79975459015632, -4.89987729507816, -5, -2.7, -2.8, + -2.9, -3, -3.1, -3.2, -3.3, -3.4, -3.5, -3.6, -3.7, -3.8, -3.9, -4, -4.1, + -4.2, -4.3, -4.4, -4.5, -4.6, -4.7, -4.8, -4.9, -5, -2.69717778679766, + -2.7973004917195, -2.89742319664134, -2.99754590156318, + -3.09766860648502, -3.19779131140687, -3.29791401632871, + -3.39803672125055, -3.49815942617239, -3.59828213109423, + -3.69840483601607, -3.79852754093791, -3.89865024585975, + -3.99877295078159, -4.09889565570343, -4.19901836062527, + -4.29914106554711, -4.39926377046895, -4.4993864753908, + -4.59950918031264, -4.69963188523448, -4.79975459015632, + -4.89987729507816, -5, -2.68871754041127, -2.78920808213252, + -2.88969862385377, -2.99018916557502, -3.09067970729627, + -3.19117024901752, -3.29166079073876, -3.39215133246001, + -3.49264187418126, -3.59313241590251, -3.69362295762376, + -3.79411349934501, -3.89460404106626, -3.99509458278751, + -4.09558512450876, -4.19607566623001, -4.29656620795126, + -4.3970567496725, -4.49754729139375, -4.598037833115, -4.69852837483625, + -4.7990189165575, -4.89950945827875, -5, -2.67463842601999, + -2.77574110314956, -2.87684378027912, -2.97794645740869, + -3.07904913453825, -3.18015181166782, -3.28125448879738, + -3.38235716592695, -3.48345984305652, -3.58456252018608, + -3.68566519731565, -3.78676787444521, -3.88787055157478, + -3.98897322870434, -4.09007590583391, -4.19117858296347, + -4.29228126009304, -4.39338393722261, -4.49448661435217, + -4.59558929148174, -4.6966919686113, -4.79779464574087, + -4.89889732287043, -5, -2.65497233734624, -2.75693006180945, + -2.85888778627266, -2.96084551073586, -3.06280323519907, + -3.16476095966228, -3.26671868412548, -3.36867640858869, + -3.4706341330519, -3.57259185751511, -3.67454958197831, + -3.77650730644152, -3.87846503090473, -3.98042275536793, + -4.08238047983114, -4.18433820429435, -4.28629592875755, + -4.38825365322076, -4.49021137768397, -4.59216910214717, + -4.69412682661038, -4.79608455107359, -4.89804227553679, -5, + -2.62976382440616, -2.73281757117111, -2.83587131793606, + -2.93892506470101, -3.04197881146596, -3.14503255823091, + -3.24808630499586, -3.35114005176081, -3.45419379852575, + -3.5572475452907, -3.66030129205565, -3.7633550388206, -3.86640878558555, + -3.9694625323505, -4.07251627911545, -4.1755700258804, -4.27862377264535, + -4.3816775194103, -4.48473126617525, -4.5877850129402, -4.69083875970515, + -4.7938925064701, -4.89694625323505, -5, -2.59906999258946, + -2.70345825378122, -2.80784651497298, -2.91223477616474, + -3.01662303735651, -3.12101129854827, -3.22539955974003, + -3.3297878209318, -3.43417608212356, -3.53856434331532, + -3.64295260450708, -3.74734086569885, -3.85172912689061, + -3.95611738808237, -4.06050564927413, -4.1648939104659, + -4.26928217165766, -4.37367043284942, -4.47805869404119, + -4.58244695523295, -4.68683521642471, -4.79122347761647, + -4.89561173880824, -5, -2.56296037329738, -2.66891861793663, + -2.77487686257587, -2.88083510721511, -2.98679335185436, + -3.0927515964936, -3.19870984113285, -3.30466808577209, + -3.41062633041134, -3.51658457505058, -3.62254281968982, + -3.72850106432907, -3.83445930896831, -3.94041755360756, + -4.0463757982468, -4.15233404288605, -4.25829228752529, + -4.36425053216453, -4.47020877680378, -4.57616702144302, + -4.68212526608227, -4.78808351072151, -4.89404175536076, -5, + -2.52151676643171, -2.62927690702164, -2.73703704761157, + -2.84479718820149, -2.95255732879142, -3.06031746938134, + -3.16807760997127, -3.27583775056119, -3.38359789115112, + -3.49135803174104, -3.59911817233097, -3.70687831292089, + -3.81463845351082, -3.92239859410075, -4.03015873469067, + -4.1379188752806, -4.24567901587052, -4.35343915646045, + -4.46119929705037, -4.5689594376403, -4.67671957823022, + -4.78447971882015, -4.89223985941007, -5, -2.47483305509168, + -2.5846229222616, -2.69441278943153, -2.80420265660146, + -2.91399252377138, -3.02378239094131, -3.13357225811124, + -3.24336212528117, -3.35315199245109, -3.46294185962102, + -3.57273172679095, -3.68252159396087, -3.7923114611308, + -3.90210132830073, -4.01189119547066, -4.12168106264058, + -4.23147092981051, -4.34126079698044, -4.45105066415036, + -4.56084053132029, -4.67063039849022, -4.78042026566015, + -4.89021013283007, -5, -2.42301499289852, -2.53505781929423, + -2.64710064568995, -2.75914347208567, -2.87118629848138, + -2.9832291248771, -3.09527195127282, -3.20731477766853, + -3.31935760406425, -3.43140043045997, -3.54344325685568, + -3.6554860832514, -3.76752890964712, -3.87957173604283, + -3.99161456243855, -4.10365738883427, -4.21570021522998, + -4.3277430416257, -4.43978586802142, -4.55182869441713, + -4.66387152081285, -4.77591434720857, -4.88795717360428, -5, + -2.36617996442956, -2.48069387901958, -2.5952077936096, + -2.70972170819962, -2.82423562278964, -2.93874953737966, + -3.05326345196967, -3.16777736655969, -3.28229128114971, + -3.39680519573973, -3.51131911032975, -3.62583302491977, + -3.74034693950979, -3.85486085409981, -3.96937476868983, + -4.08388868327985, -4.19840259786987, -4.31291651245988, + -4.4274304270499, -4.54194434163992, -4.65645825622994, + -4.77097217081996, -4.88548608540998, -5, -2.30445671930436, + -2.42165425324765, -2.53885178719094, -2.65604932113423, + -2.77324685507751, -2.8904443890208, -3.00764192296409, + -3.12483945690738, -3.24203699085067, -3.35923452479396, + -3.47643205873725, -3.59362959268054, -3.71082712662382, + -3.82802466056711, -3.9452221945104, -4.06241972845369, + -4.17961726239698, -4.29681479634027, -4.41401233028356, + -4.53120986422685, -4.64840739817013, -4.76560493211342, + -4.88280246605671, -5, -2.23798508052542, -2.35807268571997, + -2.47816029091451, -2.59824789610906, -2.71833550130361, + -2.83842310649815, -2.9585107116927, -3.07859831688725, -3.1986859220818, + -3.31877352727634, -3.43886113247089, -3.55894873766544, + -3.67903634285998, -3.79912394805453, -3.91921155324908, + -4.03929915844362, -4.15938676363817, -4.27947436883272, + -4.39956197402727, -4.51964957922181, -4.63973718441636, + -4.75982478961091, -4.87991239480545, -5, -2.16691562773411, + -2.29009320913698, -2.41327079053984, -2.53644837194271, + -2.65962595334557, -2.78280353474844, -2.9059811161513, + -3.02915869755417, -3.15233627895703, -3.27551386035989, + -3.39869144176276, -3.52186902316562, -3.64504660456849, + -3.76822418597135, -3.89140176737422, -4.01457934877708, + -4.13775693017995, -4.26093451158281, -4.38411209298568, + -4.50728967438854, -4.63046725579141, -4.75364483719427, + -4.87682241859714, -5, -2.09140935609936, -2.21786981887765, + -2.34433028165594, -2.47079074443423, -2.59725120721252, + -2.7237116699908, -2.85017213276909, -2.97663259554738, + -3.10309305832567, -3.22955352110396, -3.35601398388225, + -3.48247444666054, -3.60893490943882, -3.73539537221711, + -3.8618558349954, -3.98831629777369, -4.11477676055198, + -4.24123722333027, -4.36769768610856, -4.49415814888685, + -4.62061861166513, -4.74707907444342, -4.87353953722171, -5, + -2.0116373116118, -2.14156612415042, -2.27149493668903, + -2.40142374922765, -2.53135256176627, -2.66128137430489, + -2.7912101868435, -2.92113899938212, -3.05106781192074, + -3.18099662445936, -3.31092543699797, -3.44085424953659, + -3.57078306207521, -3.70071187461383, -3.83064068715244, + -3.96056949969106, -4.09049831222968, -4.2204271247683, + -4.35035593730691, -4.48028474984553, -4.61021356238415, + -4.74014237492277, -4.87007118746138, -5, -1.91515394098333, + -2.03610245211317, -2.15705096324302, -2.27799947437286, + -2.3989479855027, -2.51989649663254, -2.64084500776238, + -2.76179351889223, -2.88274203002207, -3.00369054115191, + -3.12463905228175, -3.24558756341159, -3.36653607454144, + -3.48748458567128, -3.60843309680112, -3.72938160793096, + -3.8503301190608, -3.97127863019065, -4.09222714132049, + -4.21317565245033, -4.33412416358017, -4.45507267471001, + -4.57602118583986, -4.6969696969697, -1.81477547016114, + -1.92691303206455, -2.03905059396795, -2.15118815587135, + -2.26332571777475, -2.37546327967815, -2.48760084158156, + -2.59973840348496, -2.71187596538836, -2.82401352729176, + -2.93615108919517, -3.04828865109857, -3.16042621300197, + -3.27256377490537, -3.38470133680877, -3.49683889871218, + -3.60897646061558, -3.72111402251898, -3.83325158442238, + -3.94538914632579, -4.05752670822919, -4.16966427013259, + -4.28180183203599, -4.39393939393939, -1.71070068612089, + -1.8141880080682, -1.91767533001551, -2.02116265196283, + -2.12464997391014, -2.22813729585745, -2.33162461780477, + -2.43511193975208, -2.53859926169939, -2.64208658364671, + -2.74557390559402, -2.84906122754133, -2.95254854948865, + -3.05603587143596, -3.15952319338327, -3.26301051533059, + -3.3664978372779, -3.46998515922521, -3.57347248117253, + -3.67695980311984, -3.78044712506715, -3.88393444701446, + -3.98742176896178, -4.09090909090909, -1.60313674917652, + -1.69812553346792, -1.79311431775932, -1.88810310205073, + -1.98309188634213, -2.07808067063353, -2.17306945492494, + -2.26805823921634, -2.36304702350774, -2.45803580779915, + -2.55302459209055, -2.64801337638195, -2.74300216067336, + -2.83799094496476, -2.93297972925616, -3.02796851354756, + -3.12295729783897, -3.21794608213037, -3.31293486642177, + -3.40792365071318, -3.50291243500458, -3.59790121929598, + -3.69289000358739, -3.78787878787879, -1.49229872369555, + -1.57893132200655, -1.66556392031755, -1.75219651862854, + -1.83882911693954, -1.92546171525054, -2.01209431356153, + -2.09872691187253, -2.18535951018353, -2.27199210849452, + -2.35862470680552, -2.44525730511652, -2.53188990342752, + -2.61852250173851, -2.70515510004951, -2.79178769836051, + -2.8784202966715, -2.9650528949825, -3.0516854932935, -3.1383180916045, + -3.22495068991549, -3.31158328822649, -3.39821588653749, + -3.48484848484848, -1.37840909090909, -1.45681818181818, + -1.53522727272727, -1.61363636363636, -1.69204545454545, + -1.77045454545455, -1.84886363636364, -1.92727272727273, + -2.00568181818182, -2.08409090909091, -2.1625, -2.24090909090909, + -2.31931818181818, -2.39772727272727, -2.47613636363636, + -2.55454545454545, -2.63295454545455, -2.71136363636364, + -2.78977272727273, -2.86818181818182, -2.94659090909091, -3.025, + -3.10340909090909, -3.18181818181818, -1.26169724492029, + -1.33200553334932, -1.40231382177834, -1.47262211020737, + -1.54293039863639, -1.61323868706542, -1.68354697549445, + -1.75385526392347, -1.8241635523525, -1.89447184078152, + -1.96478012921055, -2.03508841763957, -2.1053967060686, + -2.17570499449762, -2.24601328292665, -2.31632157135568, + -2.3866298597847, -2.45693814821373, -2.52724643664275, + -2.59755472507178, -2.6678630135008, -2.73817130192983, + -2.80847959035885, -2.87878787878788, -1.14239897305293, + -1.20471891230096, -1.26703885154899, -1.32935879079702, + -1.39167873004505, -1.45399866929307, -1.5163186085411, + -1.57863854778913, -1.64095848703716, -1.70327842628518, + -1.76559836553321, -1.82791830478124, -1.89023824402927, + -1.9525581832773, -2.01487812252532, -2.07719806177335, + -2.13951800102138, -2.20183794026941, -2.26415787951744, + -2.32647781876546, -2.38879775801349, -2.45111769726152, + -2.51343763650955, -2.57575757575758, -1.02075592171729, + -1.07518945871772, -1.12962299571815, -1.18405653271859, + -1.23849006971902, -1.29292360671946, -1.34735714371989, + -1.40179068072033, -1.45622421772076, -1.51065775472119, + -1.56509129172163, -1.61952482872206, -1.6739583657225, + -1.72839190272293, -1.78282543972337, -1.8372589767238, + -1.89169251372423, -1.94612605072467, -2.0005595877251, + -2.05499312472554, -2.10942666172597, -2.1638601987264, + -2.21829373572684, -2.27272727272727, -0.897015049003283, + -0.94365339338127, -0.990291737759256, -1.03693008213724, + -1.08356842651523, -1.13020677089322, -1.1768451152712, + -1.22348345964919, -1.27012180402717, -1.31676014840516, + -1.36339849278315, -1.41003683716113, -1.45667518153912, + -1.50331352591711, -1.54995187029509, -1.59659021467308, + -1.64322855905107, -1.68986690342905, -1.73650524780704, + -1.78314359218502, -1.82978193656301, -1.876420280941, -1.92305862531898, + -1.96969696969697, -0.771428065241007, -0.810351482694296, + -0.849274900147586, -0.888198317600875, -0.927121735054165, + -0.966045152507454, -1.00496856996074, -1.04389198741403, + -1.08281540486732, -1.12173882232061, -1.1606622397739, + -1.19958565722719, -1.23850907468048, -1.27743249213377, + -1.31635590958706, -1.35527932704035, -1.39420274449364, + -1.43312616194693, -1.47204957940022, -1.51097299685351, + -1.5498964143068, -1.58881983176009, -1.62774324921338, + -1.66666666666667, -0.644250862795838, -0.675528493267165, + -0.706806123738493, -0.73808375420982, -0.769361384681147, + -0.800639015152474, -0.831916645623802, -0.863194276095129, + -0.894471906566456, -0.925749537037783, -0.95702716750911, + -0.988304797980438, -1.01958242845176, -1.05086005892309, + -1.08213768939442, -1.11341531986575, -1.14469295033707, + -1.1759705808084, -1.20724821127973, -1.23852584175106, + -1.26980347222238, -1.30108110269371, -1.33235873316504, + -1.36363636363636, -0.515742936389941, -0.539432637442816, + -0.56312233849569, -0.586812039548565, -0.61050174060144, + -0.634191441654315, -0.657881142707189, -0.681570843760064, + -0.705260544812939, -0.728950245865814, -0.752639946918689, + -0.776329647971563, -0.800019349024438, -0.823709050077313, + -0.847398751130188, -0.871088452183062, -0.894778153235937, + -0.918467854288812, -0.942157555341687, -0.965847256394561, + -0.989536957447436, -1.01322665850031, -1.03691635955319, + -1.06060606060606, -0.386166795263259, -0.402315011015976, + -0.418463226768694, -0.434611442521411, -0.450759658274128, + -0.466907874026846, -0.483056089779563, -0.49920430553228, + -0.515352521284998, -0.531500737037715, -0.547648952790432, + -0.56379716854315, -0.579945384295867, -0.596093600048584, + -0.612241815801302, -0.628390031554019, -0.644538247306736, + -0.660686463059454, -0.676834678812171, -0.692982894564888, + -0.709131110317606, -0.725279326070323, -0.74142754182304, + -0.757575757575758, -0.25578736850565, -0.264429024420424, + -0.273070680335198, -0.281712336249972, -0.290353992164746, + -0.29899564807952, -0.307637303994295, -0.316278959909069, + -0.324920615823843, -0.333562271738617, -0.342203927653391, + -0.350845583568165, -0.359487239482939, -0.368128895397714, + -0.376770551312488, -0.385412207227262, -0.394053863142036, + -0.40269551905681, -0.411337174971584, -0.419978830886358, + -0.428620486801133, -0.437262142715907, -0.445903798630681, + -0.454545454545455, -0.124871404907289, -0.126029828672848, + -0.127188252438408, -0.128346676203967, -0.129505099969526, + -0.130663523735085, -0.131821947500644, -0.132980371266204, + -0.134138795031763, -0.135297218797322, -0.136455642562881, + -0.137614066328441, -0.138772490094, -0.139930913859559, + -0.141089337625118, -0.142247761390678, -0.143406185156237, + -0.144564608921796, -0.145723032687355, -0.146881456452914, + -0.148039880218474, -0.149198303984033, -0.150356727749592, + -0.151515151515151, 0.006313131313131, 0.0126262626262623, + 0.0189393939393936, 0.025252525252525, 0.0315656565656563, + 0.0378787878787876, 0.0441919191919189, 0.0505050505050502, + 0.0568181818181816, 0.0631313131313129, 0.0694444444444442, + 0.0757575757575755, 0.0820707070707068, 0.0883838383838382, + 0.0946969696969695, 0.101010101010101, 0.107323232323232, + 0.113636363636363, 0.119949494949495, 0.126262626262626, + 0.132575757575757, 0.138888888888889, 0.14520202020202, + 0.151515151515151, 0.137497667533552, 0.151282353925374, + 0.165067040317196, 0.178851726709018, 0.192636413100839, + 0.206421099492661, 0.220205785884483, 0.233990472276305, + 0.247775158668127, 0.261559845059949, 0.27534453145177, + 0.289129217843592, 0.302913904235414, 0.316698590627236, + 0.330483277019058, 0.34426796341088, 0.358052649802701, + 0.371837336194523, 0.385622022586345, 0.399406708978167, + 0.413191395369989, 0.426976081761811, 0.440760768153632, + 0.454545454545454, 0.268413631131911, 0.289681549672947, + 0.310949468213984, 0.332217386755021, 0.353485305296058, + 0.374753223837095, 0.396021142378132, 0.417289060919168, + 0.438556979460205, 0.459824898001242, 0.481092816542279, + 0.502360735083316, 0.523628653624353, 0.544896572165389, + 0.566164490706426, 0.587432409247463, 0.6087003277885, 0.629968246329537, + 0.651236164870574, 0.67250408341161, 0.693772001952647, + 0.715039920493684, 0.736307839034721, 0.757575757575758, + 0.398793057889521, 0.427567536268501, 0.456342014647481, + 0.485116493026461, 0.513890971405441, 0.542665449784421, + 0.571439928163401, 0.600214406542381, 0.628988884921361, + 0.657763363300341, 0.686537841679321, 0.715312320058301, + 0.744086798437281, 0.772861276816261, 0.801635755195241, + 0.830410233574221, 0.859184711953201, 0.887959190332181, + 0.916733668711161, 0.945508147090141, 0.974282625469121, 1.0030571038481, + 1.03183158222708, 1.06060606060606, 0.528369199016204, 0.564685162695341, + 0.601001126374479, 0.637317090053616, 0.673633053732754, + 0.709949017411891, 0.746264981091028, 0.782580944770165, + 0.818896908449303, 0.85521287212844, 0.891528835807578, + 0.927844799486715, 0.964160763165852, 1.00047672684499, 1.03679269052413, + 1.07310865420326, 1.1094246178824, 1.14574058156154, 1.18205654524068, + 1.21837250891981, 1.25468847259895, 1.29100443627809, 1.32732039995723, + 1.36363636363636, 0.6568771254221, 0.70078101851969, 0.74468491161728, + 0.78858880471487, 0.83249269781246, 0.87639659091005, 0.920300484007639, + 0.964204377105229, 1.00810827020282, 1.05201216330041, 1.095916056398, + 1.13981994949559, 1.18372384259318, 1.22762773569077, 1.27153162878836, + 1.31543552188595, 1.35933941498354, 1.40324330808113, 1.44714720117872, + 1.49105109427631, 1.5349549873739, 1.57885888047149, 1.62276277356908, + 1.66666666666667, 0.78405432786727, 0.835604007946822, 0.887153688026374, + 0.938703368105926, 0.990253048185478, 1.04180272826503, 1.09335240834458, + 1.14490208842413, 1.19645176850369, 1.24800144858324, 1.29955112866279, + 1.35110080874234, 1.4026504888219, 1.45420016890145, 1.505749848981, + 1.55729952906055, 1.6088492091401, 1.66039888921966, 1.71194856929921, + 1.76349824937876, 1.81504792945831, 1.86659760953787, 1.91814728961742, + 1.96969696969697, 0.909641311629544, 0.968905918633793, 1.02817052563804, + 1.08743513264229, 1.14669973964654, 1.20596434665079, 1.26522895365504, + 1.32449356065929, 1.38375816766354, 1.44302277466779, 1.50228738167203, + 1.56155198867628, 1.62081659568053, 1.68008120268478, 1.73934580968903, + 1.79861041669328, 1.85787502369753, 1.91713963070178, 1.97640423770603, + 2.03566884471028, 2.09493345171453, 2.15419805871877, 2.21346266572302, + 2.27272727272727, 1.03338218434355, 1.10044198397024, 1.16750178359694, + 1.23456158322364, 1.30162138285034, 1.36868118247703, 1.43574098210373, + 1.50280078173043, 1.56986058135712, 1.63692038098382, 1.70398018061052, + 1.77103998023721, 1.83809977986391, 1.90515957949061, 1.9722193791173, + 2.039279178744, 2.1063389783707, 2.17339877799739, 2.24045857762409, + 2.30751837725079, 2.37457817687749, 2.44163797650418, 2.50869777613088, + 2.57575757575758, 1.1550252356792, 1.22997143755349, 1.30491763942778, + 1.37986384130207, 1.45481004317636, 1.52975624505065, 1.60470244692494, + 1.67964864879923, 1.75459485067352, 1.82954105254781, 1.9044872544221, + 1.97943345629639, 2.05437965817068, 2.12932586004497, 2.20427206191926, + 2.27921826379355, 2.35416446566784, 2.42911066754214, 2.50405686941643, + 2.57900307129072, 2.65394927316501, 2.7288954750393, 2.80384167691359, + 2.87878787878788, 1.27432350754655, 1.35725805860184, 1.44019260965713, + 1.52312716071242, 1.60606171176771, 1.688996262823, 1.77193081387828, + 1.85486536493357, 1.93779991598886, 2.02073446704415, 2.10366901809944, + 2.18660356915472, 2.26953812021001, 2.3524726712653, 2.43540722232059, + 2.51834177337588, 2.60127632443116, 2.68421087548645, 2.76714542654174, + 2.85007997759703, 2.93301452865232, 3.01594907970761, 3.09888363076289, + 3.18181818181818, 1.39103535353535, 1.48207070707071, 1.57310606060606, + 1.66414141414141, 1.75517676767677, 1.84621212121212, 1.93724747474747, + 2.02828282828283, 2.11931818181818, 2.21035353535354, 2.30138888888889, + 2.39242424242424, 2.4834595959596, 2.57449494949495, 2.6655303030303, + 2.75656565656566, 2.84760101010101, 2.93863636363636, 3.02967171717172, + 3.12070707070707, 3.21174242424242, 3.30277777777778, 3.39381313131313, + 3.48484848484848, 1.50492498632181, 1.60418384725907, 1.70344270819633, + 1.80270156913359, 1.90196043007085, 2.00121929100811, 2.10047815194537, + 2.19973701288263, 2.29899587381989, 2.39825473475715, 2.49751359569441, + 2.59677245663167, 2.69603131756893, 2.79529017850619, 2.89454903944345, + 2.99380790038071, 3.09306676131797, 3.19232562225523, 3.29158448319249, + 3.39084334412975, 3.49010220506701, 3.58936106600427, 3.68861992694153, + 3.78787878787879, 1.61576301180278, 1.72337805872045, 1.83099310563811, + 1.93860815255578, 2.04622319947344, 2.15383824639111, 2.26145329330877, + 2.36906834022644, 2.47668338714411, 2.58429843406177, 2.69191348097944, + 2.7995285278971, 2.90714357481477, 3.01475862173243, 3.1223736686501, + 3.22998871556777, 3.33760376248543, 3.4452188094031, 3.55283385632076, + 3.66044890323843, 3.76806395015609, 3.87567899707376, 3.98329404399143, + 4.09090909090909, 1.72332694874715, 1.83944053332073, 1.9555541178943, + 2.07166770246788, 2.18778128704145, 2.30389487161503, 2.4200084561886, + 2.53612204076218, 2.65223562533576, 2.76834920990933, 2.88446279448291, + 3.00057637905648, 3.11668996363006, 3.23280354820364, 3.34891713277721, + 3.46503071735079, 3.58114430192436, 3.69725788649794, 3.81337147107151, + 3.92948505564509, 4.04559864021867, 4.16171222479224, 4.27782580936582, + 4.39393939393939, 1.8274017327874, 1.95216555731707, 2.07692938184673, + 2.2016932063764, 2.32645703090606, 2.45122085543573, 2.57598467996539, + 2.70074850449506, 2.82551232902472, 2.95027615355439, 3.07503997808405, + 3.19980380261372, 3.32456762714338, 3.44933145167305, 3.57409527620271, + 3.69885910073238, 3.82362292526204, 3.94838674979171, 4.07315057432137, + 4.19791439885104, 4.3226782233807, 4.44744204791037, 4.57220587244003, + 4.6969696969697, 1.9277802036096, 2.0613549773657, 2.1949297511218, + 2.32850452487791, 2.46207929863401, 2.59565407239012, 2.72922884614622, + 2.86280361990233, 2.99637839365843, 3.12995316741454, 3.26352794117064, + 3.39710271492675, 3.53067748868285, 3.66425226243895, 3.79782703619506, + 3.93140180995116, 4.06497658370727, 4.19855135746337, 4.33212613121948, + 4.46570090497558, 4.59927567873169, 4.73285045248779, 4.8664252262439, 5, + 2.0116373116118, 2.14156612415042, 2.27149493668903, 2.40142374922765, + 2.53135256176627, 2.66128137430489, 2.7912101868435, 2.92113899938212, + 3.05106781192074, 3.18099662445936, 3.31092543699797, 3.44085424953659, + 3.57078306207521, 3.70071187461383, 3.83064068715244, 3.96056949969106, + 4.09049831222968, 4.2204271247683, 4.35035593730691, 4.48028474984553, + 4.61021356238415, 4.74014237492277, 4.87007118746138, 5, + 2.09140935609936, 2.21786981887765, 2.34433028165594, 2.47079074443423, + 2.59725120721251, 2.7237116699908, 2.85017213276909, 2.97663259554738, + 3.10309305832567, 3.22955352110396, 3.35601398388225, 3.48247444666054, + 3.60893490943882, 3.73539537221711, 3.8618558349954, 3.98831629777369, + 4.11477676055198, 4.24123722333027, 4.36769768610856, 4.49415814888685, + 4.62061861166513, 4.74707907444342, 4.87353953722171, 5, + 2.16691562773411, 2.29009320913698, 2.41327079053984, 2.53644837194271, + 2.65962595334557, 2.78280353474843, 2.9059811161513, 3.02915869755416, + 3.15233627895703, 3.27551386035989, 3.39869144176276, 3.52186902316562, + 3.64504660456849, 3.76822418597135, 3.89140176737422, 4.01457934877708, + 4.13775693017995, 4.26093451158281, 4.38411209298568, 4.50728967438854, + 4.63046725579141, 4.75364483719427, 4.87682241859714, 5, + 2.23798508052542, 2.35807268571997, 2.47816029091451, 2.59824789610906, + 2.71833550130361, 2.83842310649815, 2.9585107116927, 3.07859831688725, + 3.1986859220818, 3.31877352727634, 3.43886113247089, 3.55894873766544, + 3.67903634285998, 3.79912394805453, 3.91921155324908, 4.03929915844362, + 4.15938676363817, 4.27947436883272, 4.39956197402726, 4.51964957922181, + 4.63973718441636, 4.75982478961091, 4.87991239480545, 5, + 2.30445671930436, 2.42165425324765, 2.53885178719094, 2.65604932113423, + 2.77324685507751, 2.8904443890208, 3.00764192296409, 3.12483945690738, + 3.24203699085067, 3.35923452479396, 3.47643205873725, 3.59362959268054, + 3.71082712662382, 3.82802466056711, 3.9452221945104, 4.06241972845369, + 4.17961726239698, 4.29681479634027, 4.41401233028356, 4.53120986422685, + 4.64840739817013, 4.76560493211342, 4.88280246605671, 5, + 2.36617996442956, 2.48069387901958, 2.5952077936096, 2.70972170819962, + 2.82423562278964, 2.93874953737966, 3.05326345196967, 3.16777736655969, + 3.28229128114971, 3.39680519573973, 3.51131911032975, 3.62583302491977, + 3.74034693950979, 3.85486085409981, 3.96937476868983, 4.08388868327985, + 4.19840259786987, 4.31291651245989, 4.4274304270499, 4.54194434163992, + 4.65645825622994, 4.77097217081996, 4.88548608540998, 5, + 2.42301499289852, 2.53505781929423, 2.64710064568995, 2.75914347208567, + 2.87118629848138, 2.9832291248771, 3.09527195127282, 3.20731477766853, + 3.31935760406425, 3.43140043045997, 3.54344325685568, 3.6554860832514, + 3.76752890964712, 3.87957173604283, 3.99161456243855, 4.10365738883427, + 4.21570021522998, 4.3277430416257, 4.43978586802142, 4.55182869441713, + 4.66387152081285, 4.77591434720857, 4.88795717360428, 5, + 2.47483305509168, 2.5846229222616, 2.69441278943153, 2.80420265660146, + 2.91399252377138, 3.02378239094131, 3.13357225811124, 3.24336212528117, + 3.35315199245109, 3.46294185962102, 3.57273172679095, 3.68252159396087, + 3.7923114611308, 3.90210132830073, 4.01189119547066, 4.12168106264058, + 4.23147092981051, 4.34126079698044, 4.45105066415036, 4.56084053132029, + 4.67063039849022, 4.78042026566015, 4.89021013283007, 5, + 2.52151676643171, 2.62927690702164, 2.73703704761156, 2.84479718820149, + 2.95255732879142, 3.06031746938134, 3.16807760997127, 3.27583775056119, + 3.38359789115112, 3.49135803174104, 3.59911817233097, 3.70687831292089, + 3.81463845351082, 3.92239859410074, 4.03015873469067, 4.1379188752806, + 4.24567901587052, 4.35343915646045, 4.46119929705037, 4.5689594376403, + 4.67671957823022, 4.78447971882015, 4.89223985941007, 5, + 2.56296037329738, 2.66891861793663, 2.77487686257587, 2.88083510721511, + 2.98679335185436, 3.0927515964936, 3.19870984113285, 3.30466808577209, + 3.41062633041134, 3.51658457505058, 3.62254281968982, 3.72850106432907, + 3.83445930896831, 3.94041755360756, 4.0463757982468, 4.15233404288605, + 4.25829228752529, 4.36425053216453, 4.47020877680378, 4.57616702144302, + 4.68212526608227, 4.78808351072151, 4.89404175536076, 5, + 2.59906999258946, 2.70345825378122, 2.80784651497298, 2.91223477616474, + 3.01662303735651, 3.12101129854827, 3.22539955974003, 3.3297878209318, + 3.43417608212356, 3.53856434331532, 3.64295260450708, 3.74734086569885, + 3.85172912689061, 3.95611738808237, 4.06050564927413, 4.1648939104659, + 4.26928217165766, 4.37367043284942, 4.47805869404119, 4.58244695523295, + 4.68683521642471, 4.79122347761647, 4.89561173880824, 5, + 2.62976382440616, 2.73281757117111, 2.83587131793606, 2.93892506470101, + 3.04197881146596, 3.14503255823091, 3.24808630499586, 3.35114005176081, + 3.45419379852575, 3.5572475452907, 3.66030129205565, 3.7633550388206, + 3.86640878558555, 3.9694625323505, 4.07251627911545, 4.1755700258804, + 4.27862377264535, 4.3816775194103, 4.48473126617525, 4.5877850129402, + 4.69083875970515, 4.7938925064701, 4.89694625323505, 5, 2.65497233734624, + 2.75693006180945, 2.85888778627266, 2.96084551073586, 3.06280323519907, + 3.16476095966228, 3.26671868412548, 3.36867640858869, 3.4706341330519, + 3.57259185751511, 3.67454958197831, 3.77650730644152, 3.87846503090473, + 3.98042275536793, 4.08238047983114, 4.18433820429435, 4.28629592875755, + 4.38825365322076, 4.49021137768397, 4.59216910214717, 4.69412682661038, + 4.79608455107359, 4.89804227553679, 5, 2.67463842601999, + 2.77574110314956, 2.87684378027912, 2.97794645740869, 3.07904913453825, + 3.18015181166782, 3.28125448879738, 3.38235716592695, 3.48345984305652, + 3.58456252018608, 3.68566519731565, 3.78676787444521, 3.88787055157478, + 3.98897322870434, 4.09007590583391, 4.19117858296347, 4.29228126009304, + 4.39338393722261, 4.49448661435217, 4.59558929148174, 4.6966919686113, + 4.79779464574087, 4.89889732287043, 5, 2.68871754041127, + 2.78920808213252, 2.88969862385377, 2.99018916557502, 3.09067970729627, + 3.19117024901752, 3.29166079073876, 3.39215133246001, 3.49264187418126, + 3.59313241590251, 3.69362295762376, 3.79411349934501, 3.89460404106626, + 3.99509458278751, 4.09558512450876, 4.19607566623001, 4.29656620795126, + 4.3970567496725, 4.49754729139375, 4.598037833115, 4.69852837483625, + 4.7990189165575, 4.89950945827875, 5, 2.69717778679766, 2.7973004917195, + 2.89742319664134, 2.99754590156318, 3.09766860648502, 3.19779131140687, + 3.29791401632871, 3.39803672125055, 3.49815942617239, 3.59828213109423, + 3.69840483601607, 3.79852754093791, 3.89865024585975, 3.99877295078159, + 4.09889565570343, 4.19901836062527, 4.29914106554711, 4.39926377046895, + 4.4993864753908, 4.59950918031264, 4.69963188523448, 4.79975459015632, + 4.89987729507816, 5, 2.7, 2.8, 2.9, 3, 3.1, 3.2, 3.3, 3.4, 3.5, 3.6, 3.7, + 3.8, 3.9, 4, 4.1, 4.2, 4.3, 4.4, 4.5, 4.6, 4.7, 4.8, 4.9, 5, + 2.69717778679766, 2.7973004917195, 2.89742319664134, 2.99754590156318, + 3.09766860648502, 3.19779131140687, 3.29791401632871, 3.39803672125055, + 3.49815942617239, 3.59828213109423, 3.69840483601607, 3.79852754093791, + 3.89865024585975, 3.99877295078159, 4.09889565570343, 4.19901836062527, + 4.29914106554711, 4.39926377046895, 4.4993864753908, 4.59950918031264, + 4.69963188523448, 4.79975459015632, 4.89987729507816, 5, + 2.68871754041127, 2.78920808213252, 2.88969862385377, 2.99018916557502, + 3.09067970729627, 3.19117024901752, 3.29166079073876, 3.39215133246001, + 3.49264187418126, 3.59313241590251, 3.69362295762376, 3.79411349934501, + 3.89460404106626, 3.99509458278751, 4.09558512450876, 4.19607566623001, + 4.29656620795126, 4.3970567496725, 4.49754729139375, 4.598037833115, + 4.69852837483625, 4.7990189165575, 4.89950945827875, 5, 2.67463842601999, + 2.77574110314956, 2.87684378027912, 2.97794645740869, 3.07904913453825, + 3.18015181166782, 3.28125448879738, 3.38235716592695, 3.48345984305652, + 3.58456252018608, 3.68566519731565, 3.78676787444521, 3.88787055157478, + 3.98897322870434, 4.09007590583391, 4.19117858296347, 4.29228126009304, + 4.39338393722261, 4.49448661435217, 4.59558929148174, 4.6966919686113, + 4.79779464574087, 4.89889732287043, 5, 2.65497233734624, + 2.75693006180945, 2.85888778627266, 2.96084551073586, 3.06280323519907, + 3.16476095966228, 3.26671868412548, 3.36867640858869, 3.4706341330519, + 3.57259185751511, 3.67454958197831, 3.77650730644152, 3.87846503090473, + 3.98042275536793, 4.08238047983114, 4.18433820429435, 4.28629592875755, + 4.38825365322076, 4.49021137768397, 4.59216910214717, 4.69412682661038, + 4.79608455107359, 4.89804227553679, 5, 2.62976382440616, + 2.73281757117111, 2.83587131793606, 2.93892506470101, 3.04197881146596, + 3.14503255823091, 3.24808630499586, 3.35114005176081, 3.45419379852576, + 3.5572475452907, 3.66030129205565, 3.7633550388206, 3.86640878558555, + 3.9694625323505, 4.07251627911545, 4.1755700258804, 4.27862377264535, + 4.3816775194103, 4.48473126617525, 4.5877850129402, 4.69083875970515, + 4.7938925064701, 4.89694625323505, 5, 2.59906999258946, 2.70345825378122, + 2.80784651497298, 2.91223477616474, 3.01662303735651, 3.12101129854827, + 3.22539955974003, 3.3297878209318, 3.43417608212356, 3.53856434331532, + 3.64295260450708, 3.74734086569885, 3.85172912689061, 3.95611738808237, + 4.06050564927413, 4.1648939104659, 4.26928217165766, 4.37367043284942, + 4.47805869404119, 4.58244695523295, 4.68683521642471, 4.79122347761647, + 4.89561173880824, 5, 2.56296037329738, 2.66891861793663, + 2.77487686257587, 2.88083510721512, 2.98679335185436, 3.0927515964936, + 3.19870984113285, 3.30466808577209, 3.41062633041134, 3.51658457505058, + 3.62254281968983, 3.72850106432907, 3.83445930896831, 3.94041755360756, + 4.0463757982468, 4.15233404288605, 4.25829228752529, 4.36425053216453, + 4.47020877680378, 4.57616702144302, 4.68212526608227, 4.78808351072151, + 4.89404175536076, 5, 2.52151676643172, 2.62927690702164, + 2.73703704761157, 2.84479718820149, 2.95255732879142, 3.06031746938134, + 3.16807760997127, 3.27583775056119, 3.38359789115112, 3.49135803174104, + 3.59911817233097, 3.70687831292089, 3.81463845351082, 3.92239859410075, + 4.03015873469067, 4.1379188752806, 4.24567901587052, 4.35343915646045, + 4.46119929705037, 4.5689594376403, 4.67671957823022, 4.78447971882015, + 4.89223985941007, 5, 2.47483305509168, 2.5846229222616, 2.69441278943153, + 2.80420265660146, 2.91399252377138, 3.02378239094131, 3.13357225811124, + 3.24336212528117, 3.35315199245109, 3.46294185962102, 3.57273172679095, + 3.68252159396087, 3.7923114611308, 3.90210132830073, 4.01189119547066, + 4.12168106264058, 4.23147092981051, 4.34126079698044, 4.45105066415036, + 4.56084053132029, 4.67063039849022, 4.78042026566015, 4.89021013283007, + 5, 2.42301499289852, 2.53505781929423, 2.64710064568995, + 2.75914347208567, 2.87118629848138, 2.9832291248771, 3.09527195127282, + 3.20731477766853, 3.31935760406425, 3.43140043045997, 3.54344325685568, + 3.6554860832514, 3.76752890964712, 3.87957173604283, 3.99161456243855, + 4.10365738883427, 4.21570021522998, 4.3277430416257, 4.43978586802142, + 4.55182869441713, 4.66387152081285, 4.77591434720857, 4.88795717360428, + 5, 2.36617996442956, 2.48069387901958, 2.5952077936096, 2.70972170819962, + 2.82423562278964, 2.93874953737966, 3.05326345196967, 3.16777736655969, + 3.28229128114971, 3.39680519573973, 3.51131911032975, 3.62583302491977, + 3.74034693950979, 3.85486085409981, 3.96937476868983, 4.08388868327985, + 4.19840259786987, 4.31291651245988, 4.4274304270499, 4.54194434163992, + 4.65645825622994, 4.77097217081996, 4.88548608540998, 5, + 2.30445671930436, 2.42165425324765, 2.53885178719094, 2.65604932113423, + 2.77324685507751, 2.8904443890208, 3.00764192296409, 3.12483945690738, + 3.24203699085067, 3.35923452479396, 3.47643205873725, 3.59362959268054, + 3.71082712662382, 3.82802466056711, 3.9452221945104, 4.06241972845369, + 4.17961726239698, 4.29681479634027, 4.41401233028356, 4.53120986422685, + 4.64840739817013, 4.76560493211342, 4.88280246605671, 5, + 2.23798508052542, 2.35807268571997, 2.47816029091451, 2.59824789610906, + 2.71833550130361, 2.83842310649815, 2.9585107116927, 3.07859831688725, + 3.1986859220818, 3.31877352727634, 3.43886113247089, 3.55894873766544, + 3.67903634285998, 3.79912394805453, 3.91921155324908, 4.03929915844362, + 4.15938676363817, 4.27947436883272, 4.39956197402727, 4.51964957922181, + 4.63973718441636, 4.75982478961091, 4.87991239480545, 5, + 2.16691562773411, 2.29009320913698, 2.41327079053984, 2.53644837194271, + 2.65962595334557, 2.78280353474844, 2.9059811161513, 3.02915869755417, + 3.15233627895703, 3.27551386035989, 3.39869144176276, 3.52186902316562, + 3.64504660456849, 3.76822418597135, 3.89140176737422, 4.01457934877708, + 4.13775693017995, 4.26093451158281, 4.38411209298568, 4.50728967438854, + 4.63046725579141, 4.75364483719427, 4.87682241859714, 5, + 2.09140935609936, 2.21786981887765, 2.34433028165594, 2.47079074443423, + 2.59725120721252, 2.7237116699908, 2.85017213276909, 2.97663259554738, + 3.10309305832567, 3.22955352110396, 3.35601398388225, 3.48247444666054, + 3.60893490943882, 3.73539537221711, 3.8618558349954, 3.98831629777369, + 4.11477676055198, 4.24123722333027, 4.36769768610856, 4.49415814888685, + 4.62061861166513, 4.74707907444342, 4.87353953722171, 5, 2.0116373116118, + 2.14156612415042, 2.27149493668904, 2.40142374922765, 2.53135256176627, + 2.66128137430489, 2.7912101868435, 2.92113899938212, 3.05106781192074, + 3.18099662445936, 3.31092543699797, 3.44085424953659, 3.57078306207521, + 3.70071187461383, 3.83064068715244, 3.96056949969106, 4.09049831222968, + 4.2204271247683, 4.35035593730691, 4.48028474984553, 4.61021356238415, + 4.74014237492277, 4.87007118746138, 5, 1.91515394098333, + 2.03610245211317, 2.15705096324302, 2.27799947437286, 2.3989479855027, + 2.51989649663254, 2.64084500776238, 2.76179351889223, 2.88274203002207, + 3.00369054115191, 3.12463905228175, 3.24558756341159, 3.36653607454144, + 3.48748458567128, 3.60843309680112, 3.72938160793096, 3.8503301190608, + 3.97127863019065, 4.09222714132049, 4.21317565245033, 4.33412416358017, + 4.45507267471001, 4.57602118583986, 4.6969696969697, 1.81477547016114, + 1.92691303206455, 2.03905059396795, 2.15118815587135, 2.26332571777475, + 2.37546327967816, 2.48760084158156, 2.59973840348496, 2.71187596538836, + 2.82401352729176, 2.93615108919517, 3.04828865109857, 3.16042621300197, + 3.27256377490537, 3.38470133680877, 3.49683889871218, 3.60897646061558, + 3.72111402251898, 3.83325158442238, 3.94538914632579, 4.05752670822919, + 4.16966427013259, 4.28180183203599, 4.39393939393939, 1.71070068612089, + 1.8141880080682, 1.91767533001551, 2.02116265196283, 2.12464997391014, + 2.22813729585745, 2.33162461780477, 2.43511193975208, 2.53859926169939, + 2.64208658364671, 2.74557390559402, 2.84906122754133, 2.95254854948865, + 3.05603587143596, 3.15952319338327, 3.26301051533059, 3.3664978372779, + 3.46998515922521, 3.57347248117253, 3.67695980311984, 3.78044712506715, + 3.88393444701446, 3.98742176896178, 4.09090909090909, 1.60313674917652, + 1.69812553346792, 1.79311431775932, 1.88810310205073, 1.98309188634213, + 2.07808067063353, 2.17306945492494, 2.26805823921634, 2.36304702350774, + 2.45803580779915, 2.55302459209055, 2.64801337638195, 2.74300216067336, + 2.83799094496476, 2.93297972925616, 3.02796851354756, 3.12295729783897, + 3.21794608213037, 3.31293486642177, 3.40792365071318, 3.50291243500458, + 3.59790121929598, 3.69289000358739, 3.78787878787879, 1.49229872369555, + 1.57893132200655, 1.66556392031754, 1.75219651862854, 1.83882911693954, + 1.92546171525054, 2.01209431356153, 2.09872691187253, 2.18535951018353, + 2.27199210849452, 2.35862470680552, 2.44525730511652, 2.53188990342752, + 2.61852250173851, 2.70515510004951, 2.79178769836051, 2.8784202966715, + 2.9650528949825, 3.0516854932935, 3.1383180916045, 3.22495068991549, + 3.31158328822649, 3.39821588653749, 3.48484848484848, 1.37840909090909, + 1.45681818181818, 1.53522727272727, 1.61363636363636, 1.69204545454545, + 1.77045454545454, 1.84886363636364, 1.92727272727273, 2.00568181818182, + 2.08409090909091, 2.1625, 2.24090909090909, 2.31931818181818, + 2.39772727272727, 2.47613636363636, 2.55454545454545, 2.63295454545455, + 2.71136363636364, 2.78977272727273, 2.86818181818182, 2.94659090909091, + 3.025, 3.10340909090909, 3.18181818181818, 1.26169724492029, + 1.33200553334932, 1.40231382177834, 1.47262211020737, 1.5429303986364, + 1.61323868706542, 1.68354697549445, 1.75385526392347, 1.8241635523525, + 1.89447184078152, 1.96478012921055, 2.03508841763957, 2.1053967060686, + 2.17570499449762, 2.24601328292665, 2.31632157135568, 2.3866298597847, + 2.45693814821373, 2.52724643664275, 2.59755472507178, 2.6678630135008, + 2.73817130192983, 2.80847959035885, 2.87878787878788, 1.14239897305293, + 1.20471891230096, 1.26703885154899, 1.32935879079702, 1.39167873004504, + 1.45399866929307, 1.5163186085411, 1.57863854778913, 1.64095848703716, + 1.70327842628518, 1.76559836553321, 1.82791830478124, 1.89023824402927, + 1.9525581832773, 2.01487812252532, 2.07719806177335, 2.13951800102138, + 2.20183794026941, 2.26415787951744, 2.32647781876546, 2.38879775801349, + 2.45111769726152, 2.51343763650955, 2.57575757575758, 1.02075592171729, + 1.07518945871772, 1.12962299571815, 1.18405653271859, 1.23849006971902, + 1.29292360671946, 1.34735714371989, 1.40179068072033, 1.45622421772076, + 1.51065775472119, 1.56509129172163, 1.61952482872206, 1.6739583657225, + 1.72839190272293, 1.78282543972336, 1.8372589767238, 1.89169251372423, + 1.94612605072467, 2.0005595877251, 2.05499312472554, 2.10942666172597, + 2.1638601987264, 2.21829373572684, 2.27272727272727, 0.897015049003283, + 0.94365339338127, 0.990291737759256, 1.03693008213724, 1.08356842651523, + 1.13020677089322, 1.1768451152712, 1.22348345964919, 1.27012180402717, + 1.31676014840516, 1.36339849278315, 1.41003683716113, 1.45667518153912, + 1.50331352591711, 1.54995187029509, 1.59659021467308, 1.64322855905107, + 1.68986690342905, 1.73650524780704, 1.78314359218502, 1.82978193656301, + 1.876420280941, 1.92305862531898, 1.96969696969697, 0.771428065241007, + 0.810351482694296, 0.849274900147586, 0.888198317600876, + 0.927121735054165, 0.966045152507455, 1.00496856996074, 1.04389198741403, + 1.08281540486732, 1.12173882232061, 1.1606622397739, 1.19958565722719, + 1.23850907468048, 1.27743249213377, 1.31635590958706, 1.35527932704035, + 1.39420274449364, 1.43312616194693, 1.47204957940022, 1.51097299685351, + 1.5498964143068, 1.58881983176009, 1.62774324921338, 1.66666666666667, + 0.64425086279584, 0.675528493267167, 0.706806123738494, + 0.738083754209821, 0.769361384681148, 0.800639015152475, + 0.831916645623803, 0.86319427609513, 0.894471906566457, + 0.925749537037784, 0.957027167509111, 0.988304797980438, + 1.01958242845177, 1.05086005892309, 1.08213768939442, 1.11341531986575, + 1.14469295033707, 1.1759705808084, 1.20724821127973, 1.23852584175106, + 1.26980347222238, 1.30108110269371, 1.33235873316504, 1.36363636363636, + 0.515742936389942, 0.539432637442817, 0.563122338495692, + 0.586812039548567, 0.610501740601441, 0.634191441654316, + 0.657881142707191, 0.681570843760065, 0.70526054481294, + 0.728950245865815, 0.752639946918689, 0.776329647971564, + 0.800019349024439, 0.823709050077314, 0.847398751130188, + 0.871088452183063, 0.894778153235938, 0.918467854288812, + 0.942157555341687, 0.965847256394562, 0.989536957447436, + 1.01322665850031, 1.03691635955319, 1.06060606060606, 0.386166795263259, + 0.402315011015976, 0.418463226768694, 0.434611442521411, + 0.450759658274128, 0.466907874026846, 0.483056089779563, + 0.49920430553228, 0.515352521284998, 0.531500737037715, + 0.547648952790432, 0.56379716854315, 0.579945384295867, + 0.596093600048584, 0.612241815801302, 0.628390031554019, + 0.644538247306736, 0.660686463059454, 0.676834678812171, + 0.692982894564888, 0.709131110317606, 0.725279326070323, + 0.74142754182304, 0.757575757575758, 0.255787368505649, + 0.264429024420423, 0.273070680335197, 0.281712336249971, + 0.290353992164746, 0.29899564807952, 0.307637303994294, + 0.316278959909068, 0.324920615823842, 0.333562271738616, + 0.342203927653391, 0.350845583568165, 0.359487239482939, + 0.368128895397713, 0.376770551312487, 0.385412207227262, + 0.394053863142036, 0.40269551905681, 0.411337174971584, + 0.419978830886358, 0.428620486801132, 0.437262142715907, + 0.445903798630681, 0.454545454545455, 0.12487140490729, 0.12602982867285, + 0.127188252438409, 0.128346676203968, 0.129505099969527, + 0.130663523735086, 0.131821947500645, 0.132980371266205, + 0.134138795031764, 0.135297218797323, 0.136455642562882, + 0.137614066328441, 0.138772490094001, 0.13993091385956, + 0.141089337625119, 0.142247761390678, 0.143406185156237, + 0.144564608921796, 0.145723032687356, 0.146881456452915, + 0.148039880218474, 0.149198303984033, 0.150356727749592, 0.151515151515151 ; + + eb_names = + "" ; + + ss_names = + "" ; + + coor_names = + "x", + "y" ; + + connect1 = + 1, 2, 3, 4, + 2, 5, 6, 3, + 5, 7, 8, 6, + 7, 9, 10, 8, + 9, 11, 12, 10, + 11, 13, 14, 12, + 13, 15, 16, 14, + 15, 17, 18, 16, + 17, 19, 20, 18, + 19, 21, 22, 20, + 21, 23, 24, 22, + 23, 25, 26, 24, + 25, 27, 28, 26, + 27, 29, 30, 28, + 29, 31, 32, 30, + 31, 33, 34, 32, + 33, 35, 36, 34, + 35, 37, 38, 36, + 37, 39, 40, 38, + 39, 41, 42, 40, + 41, 43, 44, 42, + 43, 45, 46, 44, + 45, 47, 48, 46, + 47, 49, 50, 48, + 49, 51, 52, 50, + 51, 53, 54, 52, + 53, 55, 56, 54, + 55, 57, 58, 56, + 57, 59, 60, 58, + 59, 61, 62, 60, + 61, 63, 64, 62, + 63, 65, 66, 64, + 65, 67, 68, 66, + 4, 3, 69, 70, + 3, 6, 71, 69, + 6, 8, 72, 71, + 8, 10, 73, 72, + 10, 12, 74, 73, + 12, 14, 75, 74, + 14, 16, 76, 75, + 16, 18, 77, 76, + 18, 20, 78, 77, + 20, 22, 79, 78, + 22, 24, 80, 79, + 24, 26, 81, 80, + 26, 28, 82, 81, + 28, 30, 83, 82, + 30, 32, 84, 83, + 32, 34, 85, 84, + 34, 36, 86, 85, + 36, 38, 87, 86, + 38, 40, 88, 87, + 40, 42, 89, 88, + 42, 44, 90, 89, + 44, 46, 91, 90, + 46, 48, 92, 91, + 48, 50, 93, 92, + 50, 52, 94, 93, + 52, 54, 95, 94, + 54, 56, 96, 95, + 56, 58, 97, 96, + 58, 60, 98, 97, + 60, 62, 99, 98, + 62, 64, 100, 99, + 64, 66, 101, 100, + 66, 68, 102, 101, + 70, 69, 103, 104, + 69, 71, 105, 103, + 71, 72, 106, 105, + 72, 73, 107, 106, + 73, 74, 108, 107, + 74, 75, 109, 108, + 75, 76, 110, 109, + 76, 77, 111, 110, + 77, 78, 112, 111, + 78, 79, 113, 112, + 79, 80, 114, 113, + 80, 81, 115, 114, + 81, 82, 116, 115, + 82, 83, 117, 116, + 83, 84, 118, 117, + 84, 85, 119, 118, + 85, 86, 120, 119, + 86, 87, 121, 120, + 87, 88, 122, 121, + 88, 89, 123, 122, + 89, 90, 124, 123, + 90, 91, 125, 124, + 91, 92, 126, 125, + 92, 93, 127, 126, + 93, 94, 128, 127, + 94, 95, 129, 128, + 95, 96, 130, 129, + 96, 97, 131, 130, + 97, 98, 132, 131, + 98, 99, 133, 132, + 99, 100, 134, 133, + 100, 101, 135, 134, + 101, 102, 136, 135, + 104, 103, 137, 138, + 103, 105, 139, 137, + 105, 106, 140, 139, + 106, 107, 141, 140, + 107, 108, 142, 141, + 108, 109, 143, 142, + 109, 110, 144, 143, + 110, 111, 145, 144, + 111, 112, 146, 145, + 112, 113, 147, 146, + 113, 114, 148, 147, + 114, 115, 149, 148, + 115, 116, 150, 149, + 116, 117, 151, 150, + 117, 118, 152, 151, + 118, 119, 153, 152, + 119, 120, 154, 153, + 120, 121, 155, 154, + 121, 122, 156, 155, + 122, 123, 157, 156, + 123, 124, 158, 157, + 124, 125, 159, 158, + 125, 126, 160, 159, + 126, 127, 161, 160, + 127, 128, 162, 161, + 128, 129, 163, 162, + 129, 130, 164, 163, + 130, 131, 165, 164, + 131, 132, 166, 165, + 132, 133, 167, 166, + 133, 134, 168, 167, + 134, 135, 169, 168, + 135, 136, 170, 169, + 138, 137, 171, 172, + 137, 139, 173, 171, + 139, 140, 174, 173, + 140, 141, 175, 174, + 141, 142, 176, 175, + 142, 143, 177, 176, + 143, 144, 178, 177, + 144, 145, 179, 178, + 145, 146, 180, 179, + 146, 147, 181, 180, + 147, 148, 182, 181, + 148, 149, 183, 182, + 149, 150, 184, 183, + 150, 151, 185, 184, + 151, 152, 186, 185, + 152, 153, 187, 186, + 153, 154, 188, 187, + 154, 155, 189, 188, + 155, 156, 190, 189, + 156, 157, 191, 190, + 157, 158, 192, 191, + 158, 159, 193, 192, + 159, 160, 194, 193, + 160, 161, 195, 194, + 161, 162, 196, 195, + 162, 163, 197, 196, + 163, 164, 198, 197, + 164, 165, 199, 198, + 165, 166, 200, 199, + 166, 167, 201, 200, + 167, 168, 202, 201, + 168, 169, 203, 202, + 169, 170, 204, 203, + 172, 171, 205, 206, + 171, 173, 207, 205, + 173, 174, 208, 207, + 174, 175, 209, 208, + 175, 176, 210, 209, + 176, 177, 211, 210, + 177, 178, 212, 211, + 178, 179, 213, 212, + 179, 180, 214, 213, + 180, 181, 215, 214, + 181, 182, 216, 215, + 182, 183, 217, 216, + 183, 184, 218, 217, + 184, 185, 219, 218, + 185, 186, 220, 219, + 186, 187, 221, 220, + 187, 188, 222, 221, + 188, 189, 223, 222, + 189, 190, 224, 223, + 190, 191, 225, 224, + 191, 192, 226, 225, + 192, 193, 227, 226, + 193, 194, 228, 227, + 194, 195, 229, 228, + 195, 196, 230, 229, + 196, 197, 231, 230, + 197, 198, 232, 231, + 198, 199, 233, 232, + 199, 200, 234, 233, + 200, 201, 235, 234, + 201, 202, 236, 235, + 202, 203, 237, 236, + 203, 204, 238, 237, + 206, 205, 239, 240, + 205, 207, 241, 239, + 207, 208, 242, 241, + 208, 209, 243, 242, + 209, 210, 244, 243, + 210, 211, 245, 244, + 211, 212, 246, 245, + 212, 213, 247, 246, + 213, 214, 248, 247, + 214, 215, 249, 248, + 215, 216, 250, 249, + 216, 217, 251, 250, + 217, 218, 252, 251, + 218, 219, 253, 252, + 219, 220, 254, 253, + 220, 221, 255, 254, + 221, 222, 256, 255, + 222, 223, 257, 256, + 223, 224, 258, 257, + 224, 225, 259, 258, + 225, 226, 260, 259, + 226, 227, 261, 260, + 227, 228, 262, 261, + 228, 229, 263, 262, + 229, 230, 264, 263, + 230, 231, 265, 264, + 231, 232, 266, 265, + 232, 233, 267, 266, + 233, 234, 268, 267, + 234, 235, 269, 268, + 235, 236, 270, 269, + 236, 237, 271, 270, + 237, 238, 272, 271, + 240, 239, 273, 274, + 239, 241, 275, 273, + 241, 242, 276, 275, + 242, 243, 277, 276, + 243, 244, 278, 277, + 244, 245, 279, 278, + 245, 246, 280, 279, + 246, 247, 281, 280, + 247, 248, 282, 281, + 248, 249, 283, 282, + 249, 250, 284, 283, + 250, 251, 285, 284, + 251, 252, 286, 285, + 252, 253, 287, 286, + 253, 254, 288, 287, + 254, 255, 289, 288, + 255, 256, 290, 289, + 256, 257, 291, 290, + 257, 258, 292, 291, + 258, 259, 293, 292, + 259, 260, 294, 293, + 260, 261, 295, 294, + 261, 262, 296, 295, + 262, 263, 297, 296, + 263, 264, 298, 297, + 264, 265, 299, 298, + 265, 266, 300, 299, + 266, 267, 301, 300, + 267, 268, 302, 301, + 268, 269, 303, 302, + 269, 270, 304, 303, + 270, 271, 305, 304, + 271, 272, 306, 305, + 274, 273, 307, 308, + 273, 275, 309, 307, + 275, 276, 310, 309, + 276, 277, 311, 310, + 277, 278, 312, 311, + 278, 279, 313, 312, + 279, 280, 314, 313, + 280, 281, 315, 314, + 281, 282, 316, 315, + 282, 283, 317, 316, + 283, 284, 318, 317, + 284, 285, 319, 318, + 285, 286, 320, 319, + 286, 287, 321, 320, + 287, 288, 322, 321, + 288, 289, 323, 322, + 289, 290, 324, 323, + 290, 291, 325, 324, + 291, 292, 326, 325, + 292, 293, 327, 326, + 293, 294, 328, 327, + 294, 295, 329, 328, + 295, 296, 330, 329, + 296, 297, 331, 330, + 297, 298, 332, 331, + 298, 299, 333, 332, + 299, 300, 334, 333, + 300, 301, 335, 334, + 301, 302, 336, 335, + 302, 303, 337, 336, + 303, 304, 338, 337, + 304, 305, 339, 338, + 305, 306, 340, 339, + 308, 307, 341, 342, + 307, 309, 343, 341, + 309, 310, 344, 343, + 310, 311, 345, 344, + 311, 312, 346, 345, + 312, 313, 347, 346, + 313, 314, 348, 347, + 314, 315, 349, 348, + 315, 316, 350, 349, + 316, 317, 351, 350, + 317, 318, 352, 351, + 318, 319, 353, 352, + 319, 320, 354, 353, + 320, 321, 355, 354, + 321, 322, 356, 355, + 322, 323, 357, 356, + 323, 324, 358, 357, + 324, 325, 359, 358, + 325, 326, 360, 359, + 326, 327, 361, 360, + 327, 328, 362, 361, + 328, 329, 363, 362, + 329, 330, 364, 363, + 330, 331, 365, 364, + 331, 332, 366, 365, + 332, 333, 367, 366, + 333, 334, 368, 367, + 334, 335, 369, 368, + 335, 336, 370, 369, + 336, 337, 371, 370, + 337, 338, 372, 371, + 338, 339, 373, 372, + 339, 340, 374, 373, + 342, 341, 375, 376, + 341, 343, 377, 375, + 343, 344, 378, 377, + 344, 345, 379, 378, + 345, 346, 380, 379, + 346, 347, 381, 380, + 347, 348, 382, 381, + 348, 349, 383, 382, + 349, 350, 384, 383, + 350, 351, 385, 384, + 351, 352, 386, 385, + 352, 353, 387, 386, + 353, 354, 388, 387, + 354, 355, 389, 388, + 355, 356, 390, 389, + 356, 357, 391, 390, + 357, 358, 392, 391, + 358, 359, 393, 392, + 359, 360, 394, 393, + 360, 361, 395, 394, + 361, 362, 396, 395, + 362, 363, 397, 396, + 363, 364, 398, 397, + 364, 365, 399, 398, + 365, 366, 400, 399, + 366, 367, 401, 400, + 367, 368, 402, 401, + 368, 369, 403, 402, + 369, 370, 404, 403, + 370, 371, 405, 404, + 371, 372, 406, 405, + 372, 373, 407, 406, + 373, 374, 408, 407, + 376, 375, 409, 410, + 375, 377, 411, 409, + 377, 378, 412, 411, + 378, 379, 413, 412, + 379, 380, 414, 413, + 380, 381, 415, 414, + 381, 382, 416, 415, + 382, 383, 417, 416, + 383, 384, 418, 417, + 384, 385, 419, 418, + 385, 386, 420, 419, + 386, 387, 421, 420, + 387, 388, 422, 421, + 388, 389, 423, 422, + 389, 390, 424, 423, + 390, 391, 425, 424, + 391, 392, 426, 425, + 392, 393, 427, 426, + 393, 394, 428, 427, + 394, 395, 429, 428, + 395, 396, 430, 429, + 396, 397, 431, 430, + 397, 398, 432, 431, + 398, 399, 433, 432, + 399, 400, 434, 433, + 400, 401, 435, 434, + 401, 402, 436, 435, + 402, 403, 437, 436, + 403, 404, 438, 437, + 404, 405, 439, 438, + 405, 406, 440, 439, + 406, 407, 441, 440, + 407, 408, 442, 441, + 410, 409, 443, 444, + 409, 411, 445, 443, + 411, 412, 446, 445, + 412, 413, 447, 446, + 413, 414, 448, 447, + 414, 415, 449, 448, + 415, 416, 450, 449, + 416, 417, 451, 450, + 417, 418, 452, 451, + 418, 419, 453, 452, + 419, 420, 454, 453, + 420, 421, 455, 454, + 421, 422, 456, 455, + 422, 423, 457, 456, + 423, 424, 458, 457, + 424, 425, 459, 458, + 425, 426, 460, 459, + 426, 427, 461, 460, + 427, 428, 462, 461, + 428, 429, 463, 462, + 429, 430, 464, 463, + 430, 431, 465, 464, + 431, 432, 466, 465, + 432, 433, 467, 466, + 433, 434, 468, 467, + 434, 435, 469, 468, + 435, 436, 470, 469, + 436, 437, 471, 470, + 437, 438, 472, 471, + 438, 439, 473, 472, + 439, 440, 474, 473, + 440, 441, 475, 474, + 441, 442, 476, 475, + 444, 443, 477, 478, + 443, 445, 479, 477, + 445, 446, 480, 479, + 446, 447, 481, 480, + 447, 448, 482, 481, + 448, 449, 483, 482, + 449, 450, 484, 483, + 450, 451, 485, 484, + 451, 452, 486, 485, + 452, 453, 487, 486, + 453, 454, 488, 487, + 454, 455, 489, 488, + 455, 456, 490, 489, + 456, 457, 491, 490, + 457, 458, 492, 491, + 458, 459, 493, 492, + 459, 460, 494, 493, + 460, 461, 495, 494, + 461, 462, 496, 495, + 462, 463, 497, 496, + 463, 464, 498, 497, + 464, 465, 499, 498, + 465, 466, 500, 499, + 466, 467, 501, 500, + 467, 468, 502, 501, + 468, 469, 503, 502, + 469, 470, 504, 503, + 470, 471, 505, 504, + 471, 472, 506, 505, + 472, 473, 507, 506, + 473, 474, 508, 507, + 474, 475, 509, 508, + 475, 476, 510, 509, + 478, 477, 511, 512, + 477, 479, 513, 511, + 479, 480, 514, 513, + 480, 481, 515, 514, + 481, 482, 516, 515, + 482, 483, 517, 516, + 483, 484, 518, 517, + 484, 485, 519, 518, + 485, 486, 520, 519, + 486, 487, 521, 520, + 487, 488, 522, 521, + 488, 489, 523, 522, + 489, 490, 524, 523, + 490, 491, 525, 524, + 491, 492, 526, 525, + 492, 493, 527, 526, + 493, 494, 528, 527, + 494, 495, 529, 528, + 495, 496, 530, 529, + 496, 497, 531, 530, + 497, 498, 532, 531, + 498, 499, 533, 532, + 499, 500, 534, 533, + 500, 501, 535, 534, + 501, 502, 536, 535, + 502, 503, 537, 536, + 503, 504, 538, 537, + 504, 505, 539, 538, + 505, 506, 540, 539, + 506, 507, 541, 540, + 507, 508, 542, 541, + 508, 509, 543, 542, + 509, 510, 544, 543, + 512, 511, 545, 546, + 511, 513, 547, 545, + 513, 514, 548, 547, + 514, 515, 549, 548, + 515, 516, 550, 549, + 516, 517, 551, 550, + 517, 518, 552, 551, + 518, 519, 553, 552, + 519, 520, 554, 553, + 520, 521, 555, 554, + 521, 522, 556, 555, + 522, 523, 557, 556, + 523, 524, 558, 557, + 524, 525, 559, 558, + 525, 526, 560, 559, + 526, 527, 561, 560, + 527, 528, 562, 561, + 528, 529, 563, 562, + 529, 530, 564, 563, + 530, 531, 565, 564, + 531, 532, 566, 565, + 532, 533, 567, 566, + 533, 534, 568, 567, + 534, 535, 569, 568, + 535, 536, 570, 569, + 536, 537, 571, 570, + 537, 538, 572, 571, + 538, 539, 573, 572, + 539, 540, 574, 573, + 540, 541, 575, 574, + 541, 542, 576, 575, + 542, 543, 577, 576, + 543, 544, 578, 577, + 546, 545, 579, 580, + 545, 547, 581, 579, + 547, 548, 582, 581, + 548, 549, 583, 582, + 549, 550, 584, 583, + 550, 551, 585, 584, + 551, 552, 586, 585, + 552, 553, 587, 586, + 553, 554, 588, 587, + 554, 555, 589, 588, + 555, 556, 590, 589, + 556, 557, 591, 590, + 557, 558, 592, 591, + 558, 559, 593, 592, + 559, 560, 594, 593, + 560, 561, 595, 594, + 561, 562, 596, 595, + 562, 563, 597, 596, + 563, 564, 598, 597, + 564, 565, 599, 598, + 565, 566, 600, 599, + 566, 567, 601, 600, + 567, 568, 602, 601, + 568, 569, 603, 602, + 569, 570, 604, 603, + 570, 571, 605, 604, + 571, 572, 606, 605, + 572, 573, 607, 606, + 573, 574, 608, 607, + 574, 575, 609, 608, + 575, 576, 610, 609, + 576, 577, 611, 610, + 577, 578, 612, 611, + 580, 579, 613, 614, + 579, 581, 615, 613, + 581, 582, 616, 615, + 582, 583, 617, 616, + 583, 584, 618, 617, + 584, 585, 619, 618, + 585, 586, 620, 619, + 586, 587, 621, 620, + 587, 588, 622, 621, + 588, 589, 623, 622, + 589, 590, 624, 623, + 590, 591, 625, 624, + 591, 592, 626, 625, + 592, 593, 627, 626, + 593, 594, 628, 627, + 594, 595, 629, 628, + 595, 596, 630, 629, + 596, 597, 631, 630, + 597, 598, 632, 631, + 598, 599, 633, 632, + 599, 600, 634, 633, + 600, 601, 635, 634, + 601, 602, 636, 635, + 602, 603, 637, 636, + 603, 604, 638, 637, + 604, 605, 639, 638, + 605, 606, 640, 639, + 606, 607, 641, 640, + 607, 608, 642, 641, + 608, 609, 643, 642, + 609, 610, 644, 643, + 610, 611, 645, 644, + 611, 612, 646, 645, + 629, 630, 647, 628, + 630, 631, 648, 647, + 631, 632, 649, 648, + 632, 633, 650, 649, + 633, 634, 651, 650, + 634, 635, 652, 651, + 635, 636, 653, 652, + 636, 637, 654, 653, + 637, 638, 655, 654, + 638, 639, 656, 655, + 639, 640, 657, 656, + 640, 641, 658, 657, + 641, 642, 659, 658, + 642, 643, 660, 659, + 643, 644, 661, 660, + 644, 645, 662, 661, + 645, 646, 663, 662, + 628, 647, 664, 627, + 647, 648, 665, 664, + 648, 649, 666, 665, + 649, 650, 667, 666, + 650, 651, 668, 667, + 651, 652, 669, 668, + 652, 653, 670, 669, + 653, 654, 671, 670, + 654, 655, 672, 671, + 655, 656, 673, 672, + 656, 657, 674, 673, + 657, 658, 675, 674, + 658, 659, 676, 675, + 659, 660, 677, 676, + 660, 661, 678, 677, + 661, 662, 679, 678, + 662, 663, 680, 679, + 627, 664, 681, 626, + 664, 665, 682, 681, + 665, 666, 683, 682, + 666, 667, 684, 683, + 667, 668, 685, 684, + 668, 669, 686, 685, + 669, 670, 687, 686, + 670, 671, 688, 687, + 671, 672, 689, 688, + 672, 673, 690, 689, + 673, 674, 691, 690, + 674, 675, 692, 691, + 675, 676, 693, 692, + 676, 677, 694, 693, + 677, 678, 695, 694, + 678, 679, 696, 695, + 679, 680, 697, 696, + 626, 681, 698, 625, + 681, 682, 699, 698, + 682, 683, 700, 699, + 683, 684, 701, 700, + 684, 685, 702, 701, + 685, 686, 703, 702, + 686, 687, 704, 703, + 687, 688, 705, 704, + 688, 689, 706, 705, + 689, 690, 707, 706, + 690, 691, 708, 707, + 691, 692, 709, 708, + 692, 693, 710, 709, + 693, 694, 711, 710, + 694, 695, 712, 711, + 695, 696, 713, 712, + 696, 697, 714, 713, + 625, 698, 715, 624, + 698, 699, 716, 715, + 699, 700, 717, 716, + 700, 701, 718, 717, + 701, 702, 719, 718, + 702, 703, 720, 719, + 703, 704, 721, 720, + 704, 705, 722, 721, + 705, 706, 723, 722, + 706, 707, 724, 723, + 707, 708, 725, 724, + 708, 709, 726, 725, + 709, 710, 727, 726, + 710, 711, 728, 727, + 711, 712, 729, 728, + 712, 713, 730, 729, + 713, 714, 731, 730, + 624, 715, 732, 623, + 715, 716, 733, 732, + 716, 717, 734, 733, + 717, 718, 735, 734, + 718, 719, 736, 735, + 719, 720, 737, 736, + 720, 721, 738, 737, + 721, 722, 739, 738, + 722, 723, 740, 739, + 723, 724, 741, 740, + 724, 725, 742, 741, + 725, 726, 743, 742, + 726, 727, 744, 743, + 727, 728, 745, 744, + 728, 729, 746, 745, + 729, 730, 747, 746, + 730, 731, 748, 747, + 623, 732, 749, 622, + 732, 733, 750, 749, + 733, 734, 751, 750, + 734, 735, 752, 751, + 735, 736, 753, 752, + 736, 737, 754, 753, + 737, 738, 755, 754, + 738, 739, 756, 755, + 739, 740, 757, 756, + 740, 741, 758, 757, + 741, 742, 759, 758, + 742, 743, 760, 759, + 743, 744, 761, 760, + 744, 745, 762, 761, + 745, 746, 763, 762, + 746, 747, 764, 763, + 747, 748, 765, 764, + 622, 749, 766, 621, + 749, 750, 767, 766, + 750, 751, 768, 767, + 751, 752, 769, 768, + 752, 753, 770, 769, + 753, 754, 771, 770, + 754, 755, 772, 771, + 755, 756, 773, 772, + 756, 757, 774, 773, + 757, 758, 775, 774, + 758, 759, 776, 775, + 759, 760, 777, 776, + 760, 761, 778, 777, + 761, 762, 779, 778, + 762, 763, 780, 779, + 763, 764, 781, 780, + 764, 765, 782, 781, + 621, 766, 783, 620, + 766, 767, 784, 783, + 767, 768, 785, 784, + 768, 769, 786, 785, + 769, 770, 787, 786, + 770, 771, 788, 787, + 771, 772, 789, 788, + 772, 773, 790, 789, + 773, 774, 791, 790, + 774, 775, 792, 791, + 775, 776, 793, 792, + 776, 777, 794, 793, + 777, 778, 795, 794, + 778, 779, 796, 795, + 779, 780, 797, 796, + 780, 781, 798, 797, + 781, 782, 799, 798, + 620, 783, 800, 619, + 783, 784, 801, 800, + 784, 785, 802, 801, + 785, 786, 803, 802, + 786, 787, 804, 803, + 787, 788, 805, 804, + 788, 789, 806, 805, + 789, 790, 807, 806, + 790, 791, 808, 807, + 791, 792, 809, 808, + 792, 793, 810, 809, + 793, 794, 811, 810, + 794, 795, 812, 811, + 795, 796, 813, 812, + 796, 797, 814, 813, + 797, 798, 815, 814, + 798, 799, 816, 815, + 619, 800, 817, 618, + 800, 801, 818, 817, + 801, 802, 819, 818, + 802, 803, 820, 819, + 803, 804, 821, 820, + 804, 805, 822, 821, + 805, 806, 823, 822, + 806, 807, 824, 823, + 807, 808, 825, 824, + 808, 809, 826, 825, + 809, 810, 827, 826, + 810, 811, 828, 827, + 811, 812, 829, 828, + 812, 813, 830, 829, + 813, 814, 831, 830, + 814, 815, 832, 831, + 815, 816, 833, 832, + 618, 817, 834, 617, + 817, 818, 835, 834, + 818, 819, 836, 835, + 819, 820, 837, 836, + 820, 821, 838, 837, + 821, 822, 839, 838, + 822, 823, 840, 839, + 823, 824, 841, 840, + 824, 825, 842, 841, + 825, 826, 843, 842, + 826, 827, 844, 843, + 827, 828, 845, 844, + 828, 829, 846, 845, + 829, 830, 847, 846, + 830, 831, 848, 847, + 831, 832, 849, 848, + 832, 833, 850, 849, + 617, 834, 851, 616, + 834, 835, 852, 851, + 835, 836, 853, 852, + 836, 837, 854, 853, + 837, 838, 855, 854, + 838, 839, 856, 855, + 839, 840, 857, 856, + 840, 841, 858, 857, + 841, 842, 859, 858, + 842, 843, 860, 859, + 843, 844, 861, 860, + 844, 845, 862, 861, + 845, 846, 863, 862, + 846, 847, 864, 863, + 847, 848, 865, 864, + 848, 849, 866, 865, + 849, 850, 867, 866, + 616, 851, 868, 615, + 851, 852, 869, 868, + 852, 853, 870, 869, + 853, 854, 871, 870, + 854, 855, 872, 871, + 855, 856, 873, 872, + 856, 857, 874, 873, + 857, 858, 875, 874, + 858, 859, 876, 875, + 859, 860, 877, 876, + 860, 861, 878, 877, + 861, 862, 879, 878, + 862, 863, 880, 879, + 863, 864, 881, 880, + 864, 865, 882, 881, + 865, 866, 883, 882, + 866, 867, 884, 883, + 615, 868, 885, 613, + 868, 869, 886, 885, + 869, 870, 887, 886, + 870, 871, 888, 887, + 871, 872, 889, 888, + 872, 873, 890, 889, + 873, 874, 891, 890, + 874, 875, 892, 891, + 875, 876, 893, 892, + 876, 877, 894, 893, + 877, 878, 895, 894, + 878, 879, 896, 895, + 879, 880, 897, 896, + 880, 881, 898, 897, + 881, 882, 899, 898, + 882, 883, 900, 899, + 883, 884, 901, 900, + 613, 885, 902, 614, + 885, 886, 903, 902, + 886, 887, 904, 903, + 887, 888, 905, 904, + 888, 889, 906, 905, + 889, 890, 907, 906, + 890, 891, 908, 907, + 891, 892, 909, 908, + 892, 893, 910, 909, + 893, 894, 911, 910, + 894, 895, 912, 911, + 895, 896, 913, 912, + 896, 897, 914, 913, + 897, 898, 915, 914, + 898, 899, 916, 915, + 899, 900, 917, 916, + 900, 901, 918, 917, + 67, 919, 920, 68, + 919, 921, 922, 920, + 921, 923, 924, 922, + 923, 925, 926, 924, + 925, 927, 928, 926, + 927, 929, 930, 928, + 929, 931, 932, 930, + 931, 933, 934, 932, + 933, 935, 936, 934, + 935, 937, 938, 936, + 937, 939, 940, 938, + 939, 941, 942, 940, + 941, 943, 944, 942, + 943, 945, 946, 944, + 945, 947, 948, 946, + 947, 949, 950, 948, + 949, 951, 952, 950, + 951, 953, 954, 952, + 953, 955, 956, 954, + 955, 957, 958, 956, + 957, 959, 960, 958, + 959, 961, 962, 960, + 961, 963, 964, 962, + 963, 965, 966, 964, + 965, 967, 968, 966, + 967, 969, 970, 968, + 969, 971, 972, 970, + 971, 973, 974, 972, + 973, 975, 976, 974, + 975, 977, 978, 976, + 977, 979, 980, 978, + 979, 981, 982, 980, + 981, 983, 984, 982, + 68, 920, 985, 102, + 920, 922, 986, 985, + 922, 924, 987, 986, + 924, 926, 988, 987, + 926, 928, 989, 988, + 928, 930, 990, 989, + 930, 932, 991, 990, + 932, 934, 992, 991, + 934, 936, 993, 992, + 936, 938, 994, 993, + 938, 940, 995, 994, + 940, 942, 996, 995, + 942, 944, 997, 996, + 944, 946, 998, 997, + 946, 948, 999, 998, + 948, 950, 1000, 999, + 950, 952, 1001, 1000, + 952, 954, 1002, 1001, + 954, 956, 1003, 1002, + 956, 958, 1004, 1003, + 958, 960, 1005, 1004, + 960, 962, 1006, 1005, + 962, 964, 1007, 1006, + 964, 966, 1008, 1007, + 966, 968, 1009, 1008, + 968, 970, 1010, 1009, + 970, 972, 1011, 1010, + 972, 974, 1012, 1011, + 974, 976, 1013, 1012, + 976, 978, 1014, 1013, + 978, 980, 1015, 1014, + 980, 982, 1016, 1015, + 982, 984, 1017, 1016, + 102, 985, 1018, 136, + 985, 986, 1019, 1018, + 986, 987, 1020, 1019, + 987, 988, 1021, 1020, + 988, 989, 1022, 1021, + 989, 990, 1023, 1022, + 990, 991, 1024, 1023, + 991, 992, 1025, 1024, + 992, 993, 1026, 1025, + 993, 994, 1027, 1026, + 994, 995, 1028, 1027, + 995, 996, 1029, 1028, + 996, 997, 1030, 1029, + 997, 998, 1031, 1030, + 998, 999, 1032, 1031, + 999, 1000, 1033, 1032, + 1000, 1001, 1034, 1033, + 1001, 1002, 1035, 1034, + 1002, 1003, 1036, 1035, + 1003, 1004, 1037, 1036, + 1004, 1005, 1038, 1037, + 1005, 1006, 1039, 1038, + 1006, 1007, 1040, 1039, + 1007, 1008, 1041, 1040, + 1008, 1009, 1042, 1041, + 1009, 1010, 1043, 1042, + 1010, 1011, 1044, 1043, + 1011, 1012, 1045, 1044, + 1012, 1013, 1046, 1045, + 1013, 1014, 1047, 1046, + 1014, 1015, 1048, 1047, + 1015, 1016, 1049, 1048, + 1016, 1017, 1050, 1049, + 136, 1018, 1051, 170, + 1018, 1019, 1052, 1051, + 1019, 1020, 1053, 1052, + 1020, 1021, 1054, 1053, + 1021, 1022, 1055, 1054, + 1022, 1023, 1056, 1055, + 1023, 1024, 1057, 1056, + 1024, 1025, 1058, 1057, + 1025, 1026, 1059, 1058, + 1026, 1027, 1060, 1059, + 1027, 1028, 1061, 1060, + 1028, 1029, 1062, 1061, + 1029, 1030, 1063, 1062, + 1030, 1031, 1064, 1063, + 1031, 1032, 1065, 1064, + 1032, 1033, 1066, 1065, + 1033, 1034, 1067, 1066, + 1034, 1035, 1068, 1067, + 1035, 1036, 1069, 1068, + 1036, 1037, 1070, 1069, + 1037, 1038, 1071, 1070, + 1038, 1039, 1072, 1071, + 1039, 1040, 1073, 1072, + 1040, 1041, 1074, 1073, + 1041, 1042, 1075, 1074, + 1042, 1043, 1076, 1075, + 1043, 1044, 1077, 1076, + 1044, 1045, 1078, 1077, + 1045, 1046, 1079, 1078, + 1046, 1047, 1080, 1079, + 1047, 1048, 1081, 1080, + 1048, 1049, 1082, 1081, + 1049, 1050, 1083, 1082, + 170, 1051, 1084, 204, + 1051, 1052, 1085, 1084, + 1052, 1053, 1086, 1085, + 1053, 1054, 1087, 1086, + 1054, 1055, 1088, 1087, + 1055, 1056, 1089, 1088, + 1056, 1057, 1090, 1089, + 1057, 1058, 1091, 1090, + 1058, 1059, 1092, 1091, + 1059, 1060, 1093, 1092, + 1060, 1061, 1094, 1093, + 1061, 1062, 1095, 1094, + 1062, 1063, 1096, 1095, + 1063, 1064, 1097, 1096, + 1064, 1065, 1098, 1097, + 1065, 1066, 1099, 1098, + 1066, 1067, 1100, 1099, + 1067, 1068, 1101, 1100, + 1068, 1069, 1102, 1101, + 1069, 1070, 1103, 1102, + 1070, 1071, 1104, 1103, + 1071, 1072, 1105, 1104, + 1072, 1073, 1106, 1105, + 1073, 1074, 1107, 1106, + 1074, 1075, 1108, 1107, + 1075, 1076, 1109, 1108, + 1076, 1077, 1110, 1109, + 1077, 1078, 1111, 1110, + 1078, 1079, 1112, 1111, + 1079, 1080, 1113, 1112, + 1080, 1081, 1114, 1113, + 1081, 1082, 1115, 1114, + 1082, 1083, 1116, 1115, + 204, 1084, 1117, 238, + 1084, 1085, 1118, 1117, + 1085, 1086, 1119, 1118, + 1086, 1087, 1120, 1119, + 1087, 1088, 1121, 1120, + 1088, 1089, 1122, 1121, + 1089, 1090, 1123, 1122, + 1090, 1091, 1124, 1123, + 1091, 1092, 1125, 1124, + 1092, 1093, 1126, 1125, + 1093, 1094, 1127, 1126, + 1094, 1095, 1128, 1127, + 1095, 1096, 1129, 1128, + 1096, 1097, 1130, 1129, + 1097, 1098, 1131, 1130, + 1098, 1099, 1132, 1131, + 1099, 1100, 1133, 1132, + 1100, 1101, 1134, 1133, + 1101, 1102, 1135, 1134, + 1102, 1103, 1136, 1135, + 1103, 1104, 1137, 1136, + 1104, 1105, 1138, 1137, + 1105, 1106, 1139, 1138, + 1106, 1107, 1140, 1139, + 1107, 1108, 1141, 1140, + 1108, 1109, 1142, 1141, + 1109, 1110, 1143, 1142, + 1110, 1111, 1144, 1143, + 1111, 1112, 1145, 1144, + 1112, 1113, 1146, 1145, + 1113, 1114, 1147, 1146, + 1114, 1115, 1148, 1147, + 1115, 1116, 1149, 1148, + 238, 1117, 1150, 272, + 1117, 1118, 1151, 1150, + 1118, 1119, 1152, 1151, + 1119, 1120, 1153, 1152, + 1120, 1121, 1154, 1153, + 1121, 1122, 1155, 1154, + 1122, 1123, 1156, 1155, + 1123, 1124, 1157, 1156, + 1124, 1125, 1158, 1157, + 1125, 1126, 1159, 1158, + 1126, 1127, 1160, 1159, + 1127, 1128, 1161, 1160, + 1128, 1129, 1162, 1161, + 1129, 1130, 1163, 1162, + 1130, 1131, 1164, 1163, + 1131, 1132, 1165, 1164, + 1132, 1133, 1166, 1165, + 1133, 1134, 1167, 1166, + 1134, 1135, 1168, 1167, + 1135, 1136, 1169, 1168, + 1136, 1137, 1170, 1169, + 1137, 1138, 1171, 1170, + 1138, 1139, 1172, 1171, + 1139, 1140, 1173, 1172, + 1140, 1141, 1174, 1173, + 1141, 1142, 1175, 1174, + 1142, 1143, 1176, 1175, + 1143, 1144, 1177, 1176, + 1144, 1145, 1178, 1177, + 1145, 1146, 1179, 1178, + 1146, 1147, 1180, 1179, + 1147, 1148, 1181, 1180, + 1148, 1149, 1182, 1181, + 272, 1150, 1183, 306, + 1150, 1151, 1184, 1183, + 1151, 1152, 1185, 1184, + 1152, 1153, 1186, 1185, + 1153, 1154, 1187, 1186, + 1154, 1155, 1188, 1187, + 1155, 1156, 1189, 1188, + 1156, 1157, 1190, 1189, + 1157, 1158, 1191, 1190, + 1158, 1159, 1192, 1191, + 1159, 1160, 1193, 1192, + 1160, 1161, 1194, 1193, + 1161, 1162, 1195, 1194, + 1162, 1163, 1196, 1195, + 1163, 1164, 1197, 1196, + 1164, 1165, 1198, 1197, + 1165, 1166, 1199, 1198, + 1166, 1167, 1200, 1199, + 1167, 1168, 1201, 1200, + 1168, 1169, 1202, 1201, + 1169, 1170, 1203, 1202, + 1170, 1171, 1204, 1203, + 1171, 1172, 1205, 1204, + 1172, 1173, 1206, 1205, + 1173, 1174, 1207, 1206, + 1174, 1175, 1208, 1207, + 1175, 1176, 1209, 1208, + 1176, 1177, 1210, 1209, + 1177, 1178, 1211, 1210, + 1178, 1179, 1212, 1211, + 1179, 1180, 1213, 1212, + 1180, 1181, 1214, 1213, + 1181, 1182, 1215, 1214, + 306, 1183, 1216, 340, + 1183, 1184, 1217, 1216, + 1184, 1185, 1218, 1217, + 1185, 1186, 1219, 1218, + 1186, 1187, 1220, 1219, + 1187, 1188, 1221, 1220, + 1188, 1189, 1222, 1221, + 1189, 1190, 1223, 1222, + 1190, 1191, 1224, 1223, + 1191, 1192, 1225, 1224, + 1192, 1193, 1226, 1225, + 1193, 1194, 1227, 1226, + 1194, 1195, 1228, 1227, + 1195, 1196, 1229, 1228, + 1196, 1197, 1230, 1229, + 1197, 1198, 1231, 1230, + 1198, 1199, 1232, 1231, + 1199, 1200, 1233, 1232, + 1200, 1201, 1234, 1233, + 1201, 1202, 1235, 1234, + 1202, 1203, 1236, 1235, + 1203, 1204, 1237, 1236, + 1204, 1205, 1238, 1237, + 1205, 1206, 1239, 1238, + 1206, 1207, 1240, 1239, + 1207, 1208, 1241, 1240, + 1208, 1209, 1242, 1241, + 1209, 1210, 1243, 1242, + 1210, 1211, 1244, 1243, + 1211, 1212, 1245, 1244, + 1212, 1213, 1246, 1245, + 1213, 1214, 1247, 1246, + 1214, 1215, 1248, 1247, + 340, 1216, 1249, 374, + 1216, 1217, 1250, 1249, + 1217, 1218, 1251, 1250, + 1218, 1219, 1252, 1251, + 1219, 1220, 1253, 1252, + 1220, 1221, 1254, 1253, + 1221, 1222, 1255, 1254, + 1222, 1223, 1256, 1255, + 1223, 1224, 1257, 1256, + 1224, 1225, 1258, 1257, + 1225, 1226, 1259, 1258, + 1226, 1227, 1260, 1259, + 1227, 1228, 1261, 1260, + 1228, 1229, 1262, 1261, + 1229, 1230, 1263, 1262, + 1230, 1231, 1264, 1263, + 1231, 1232, 1265, 1264, + 1232, 1233, 1266, 1265, + 1233, 1234, 1267, 1266, + 1234, 1235, 1268, 1267, + 1235, 1236, 1269, 1268, + 1236, 1237, 1270, 1269, + 1237, 1238, 1271, 1270, + 1238, 1239, 1272, 1271, + 1239, 1240, 1273, 1272, + 1240, 1241, 1274, 1273, + 1241, 1242, 1275, 1274, + 1242, 1243, 1276, 1275, + 1243, 1244, 1277, 1276, + 1244, 1245, 1278, 1277, + 1245, 1246, 1279, 1278, + 1246, 1247, 1280, 1279, + 1247, 1248, 1281, 1280, + 374, 1249, 1282, 408, + 1249, 1250, 1283, 1282, + 1250, 1251, 1284, 1283, + 1251, 1252, 1285, 1284, + 1252, 1253, 1286, 1285, + 1253, 1254, 1287, 1286, + 1254, 1255, 1288, 1287, + 1255, 1256, 1289, 1288, + 1256, 1257, 1290, 1289, + 1257, 1258, 1291, 1290, + 1258, 1259, 1292, 1291, + 1259, 1260, 1293, 1292, + 1260, 1261, 1294, 1293, + 1261, 1262, 1295, 1294, + 1262, 1263, 1296, 1295, + 1263, 1264, 1297, 1296, + 1264, 1265, 1298, 1297, + 1265, 1266, 1299, 1298, + 1266, 1267, 1300, 1299, + 1267, 1268, 1301, 1300, + 1268, 1269, 1302, 1301, + 1269, 1270, 1303, 1302, + 1270, 1271, 1304, 1303, + 1271, 1272, 1305, 1304, + 1272, 1273, 1306, 1305, + 1273, 1274, 1307, 1306, + 1274, 1275, 1308, 1307, + 1275, 1276, 1309, 1308, + 1276, 1277, 1310, 1309, + 1277, 1278, 1311, 1310, + 1278, 1279, 1312, 1311, + 1279, 1280, 1313, 1312, + 1280, 1281, 1314, 1313, + 408, 1282, 1315, 442, + 1282, 1283, 1316, 1315, + 1283, 1284, 1317, 1316, + 1284, 1285, 1318, 1317, + 1285, 1286, 1319, 1318, + 1286, 1287, 1320, 1319, + 1287, 1288, 1321, 1320, + 1288, 1289, 1322, 1321, + 1289, 1290, 1323, 1322, + 1290, 1291, 1324, 1323, + 1291, 1292, 1325, 1324, + 1292, 1293, 1326, 1325, + 1293, 1294, 1327, 1326, + 1294, 1295, 1328, 1327, + 1295, 1296, 1329, 1328, + 1296, 1297, 1330, 1329, + 1297, 1298, 1331, 1330, + 1298, 1299, 1332, 1331, + 1299, 1300, 1333, 1332, + 1300, 1301, 1334, 1333, + 1301, 1302, 1335, 1334, + 1302, 1303, 1336, 1335, + 1303, 1304, 1337, 1336, + 1304, 1305, 1338, 1337, + 1305, 1306, 1339, 1338, + 1306, 1307, 1340, 1339, + 1307, 1308, 1341, 1340, + 1308, 1309, 1342, 1341, + 1309, 1310, 1343, 1342, + 1310, 1311, 1344, 1343, + 1311, 1312, 1345, 1344, + 1312, 1313, 1346, 1345, + 1313, 1314, 1347, 1346, + 442, 1315, 1348, 476, + 1315, 1316, 1349, 1348, + 1316, 1317, 1350, 1349, + 1317, 1318, 1351, 1350, + 1318, 1319, 1352, 1351, + 1319, 1320, 1353, 1352, + 1320, 1321, 1354, 1353, + 1321, 1322, 1355, 1354, + 1322, 1323, 1356, 1355, + 1323, 1324, 1357, 1356, + 1324, 1325, 1358, 1357, + 1325, 1326, 1359, 1358, + 1326, 1327, 1360, 1359, + 1327, 1328, 1361, 1360, + 1328, 1329, 1362, 1361, + 1329, 1330, 1363, 1362, + 1330, 1331, 1364, 1363, + 1331, 1332, 1365, 1364, + 1332, 1333, 1366, 1365, + 1333, 1334, 1367, 1366, + 1334, 1335, 1368, 1367, + 1335, 1336, 1369, 1368, + 1336, 1337, 1370, 1369, + 1337, 1338, 1371, 1370, + 1338, 1339, 1372, 1371, + 1339, 1340, 1373, 1372, + 1340, 1341, 1374, 1373, + 1341, 1342, 1375, 1374, + 1342, 1343, 1376, 1375, + 1343, 1344, 1377, 1376, + 1344, 1345, 1378, 1377, + 1345, 1346, 1379, 1378, + 1346, 1347, 1380, 1379, + 476, 1348, 1381, 510, + 1348, 1349, 1382, 1381, + 1349, 1350, 1383, 1382, + 1350, 1351, 1384, 1383, + 1351, 1352, 1385, 1384, + 1352, 1353, 1386, 1385, + 1353, 1354, 1387, 1386, + 1354, 1355, 1388, 1387, + 1355, 1356, 1389, 1388, + 1356, 1357, 1390, 1389, + 1357, 1358, 1391, 1390, + 1358, 1359, 1392, 1391, + 1359, 1360, 1393, 1392, + 1360, 1361, 1394, 1393, + 1361, 1362, 1395, 1394, + 1362, 1363, 1396, 1395, + 1363, 1364, 1397, 1396, + 1364, 1365, 1398, 1397, + 1365, 1366, 1399, 1398, + 1366, 1367, 1400, 1399, + 1367, 1368, 1401, 1400, + 1368, 1369, 1402, 1401, + 1369, 1370, 1403, 1402, + 1370, 1371, 1404, 1403, + 1371, 1372, 1405, 1404, + 1372, 1373, 1406, 1405, + 1373, 1374, 1407, 1406, + 1374, 1375, 1408, 1407, + 1375, 1376, 1409, 1408, + 1376, 1377, 1410, 1409, + 1377, 1378, 1411, 1410, + 1378, 1379, 1412, 1411, + 1379, 1380, 1413, 1412, + 510, 1381, 1414, 544, + 1381, 1382, 1415, 1414, + 1382, 1383, 1416, 1415, + 1383, 1384, 1417, 1416, + 1384, 1385, 1418, 1417, + 1385, 1386, 1419, 1418, + 1386, 1387, 1420, 1419, + 1387, 1388, 1421, 1420, + 1388, 1389, 1422, 1421, + 1389, 1390, 1423, 1422, + 1390, 1391, 1424, 1423, + 1391, 1392, 1425, 1424, + 1392, 1393, 1426, 1425, + 1393, 1394, 1427, 1426, + 1394, 1395, 1428, 1427, + 1395, 1396, 1429, 1428, + 1396, 1397, 1430, 1429, + 1397, 1398, 1431, 1430, + 1398, 1399, 1432, 1431, + 1399, 1400, 1433, 1432, + 1400, 1401, 1434, 1433, + 1401, 1402, 1435, 1434, + 1402, 1403, 1436, 1435, + 1403, 1404, 1437, 1436, + 1404, 1405, 1438, 1437, + 1405, 1406, 1439, 1438, + 1406, 1407, 1440, 1439, + 1407, 1408, 1441, 1440, + 1408, 1409, 1442, 1441, + 1409, 1410, 1443, 1442, + 1410, 1411, 1444, 1443, + 1411, 1412, 1445, 1444, + 1412, 1413, 1446, 1445, + 544, 1414, 1447, 578, + 1414, 1415, 1448, 1447, + 1415, 1416, 1449, 1448, + 1416, 1417, 1450, 1449, + 1417, 1418, 1451, 1450, + 1418, 1419, 1452, 1451, + 1419, 1420, 1453, 1452, + 1420, 1421, 1454, 1453, + 1421, 1422, 1455, 1454, + 1422, 1423, 1456, 1455, + 1423, 1424, 1457, 1456, + 1424, 1425, 1458, 1457, + 1425, 1426, 1459, 1458, + 1426, 1427, 1460, 1459, + 1427, 1428, 1461, 1460, + 1428, 1429, 1462, 1461, + 1429, 1430, 1463, 1462, + 1430, 1431, 1464, 1463, + 1431, 1432, 1465, 1464, + 1432, 1433, 1466, 1465, + 1433, 1434, 1467, 1466, + 1434, 1435, 1468, 1467, + 1435, 1436, 1469, 1468, + 1436, 1437, 1470, 1469, + 1437, 1438, 1471, 1470, + 1438, 1439, 1472, 1471, + 1439, 1440, 1473, 1472, + 1440, 1441, 1474, 1473, + 1441, 1442, 1475, 1474, + 1442, 1443, 1476, 1475, + 1443, 1444, 1477, 1476, + 1444, 1445, 1478, 1477, + 1445, 1446, 1479, 1478, + 578, 1447, 1480, 612, + 1447, 1448, 1481, 1480, + 1448, 1449, 1482, 1481, + 1449, 1450, 1483, 1482, + 1450, 1451, 1484, 1483, + 1451, 1452, 1485, 1484, + 1452, 1453, 1486, 1485, + 1453, 1454, 1487, 1486, + 1454, 1455, 1488, 1487, + 1455, 1456, 1489, 1488, + 1456, 1457, 1490, 1489, + 1457, 1458, 1491, 1490, + 1458, 1459, 1492, 1491, + 1459, 1460, 1493, 1492, + 1460, 1461, 1494, 1493, + 1461, 1462, 1495, 1494, + 1462, 1463, 1496, 1495, + 1463, 1464, 1497, 1496, + 1464, 1465, 1498, 1497, + 1465, 1466, 1499, 1498, + 1466, 1467, 1500, 1499, + 1467, 1468, 1501, 1500, + 1468, 1469, 1502, 1501, + 1469, 1470, 1503, 1502, + 1470, 1471, 1504, 1503, + 1471, 1472, 1505, 1504, + 1472, 1473, 1506, 1505, + 1473, 1474, 1507, 1506, + 1474, 1475, 1508, 1507, + 1475, 1476, 1509, 1508, + 1476, 1477, 1510, 1509, + 1477, 1478, 1511, 1510, + 1478, 1479, 1512, 1511, + 612, 1480, 1513, 646, + 1480, 1481, 1514, 1513, + 1481, 1482, 1515, 1514, + 1482, 1483, 1516, 1515, + 1483, 1484, 1517, 1516, + 1484, 1485, 1518, 1517, + 1485, 1486, 1519, 1518, + 1486, 1487, 1520, 1519, + 1487, 1488, 1521, 1520, + 1488, 1489, 1522, 1521, + 1489, 1490, 1523, 1522, + 1490, 1491, 1524, 1523, + 1491, 1492, 1525, 1524, + 1492, 1493, 1526, 1525, + 1493, 1494, 1527, 1526, + 1494, 1495, 1528, 1527, + 1495, 1496, 1529, 1528, + 1496, 1497, 1530, 1529, + 1497, 1498, 1531, 1530, + 1498, 1499, 1532, 1531, + 1499, 1500, 1533, 1532, + 1500, 1501, 1534, 1533, + 1501, 1502, 1535, 1534, + 1502, 1503, 1536, 1535, + 1503, 1504, 1537, 1536, + 1504, 1505, 1538, 1537, + 1505, 1506, 1539, 1538, + 1506, 1507, 1540, 1539, + 1507, 1508, 1541, 1540, + 1508, 1509, 1542, 1541, + 1509, 1510, 1543, 1542, + 1510, 1511, 1544, 1543, + 1511, 1512, 1545, 1544, + 1529, 1530, 1546, 1528, + 1530, 1531, 1547, 1546, + 1531, 1532, 1548, 1547, + 1532, 1533, 1549, 1548, + 1533, 1534, 1550, 1549, + 1534, 1535, 1551, 1550, + 1535, 1536, 1552, 1551, + 1536, 1537, 1553, 1552, + 1537, 1538, 1554, 1553, + 1538, 1539, 1555, 1554, + 1539, 1540, 1556, 1555, + 1540, 1541, 1557, 1556, + 1541, 1542, 1558, 1557, + 1542, 1543, 1559, 1558, + 1543, 1544, 1560, 1559, + 1544, 1545, 1561, 1560, + 1528, 1546, 1562, 1527, + 1546, 1547, 1563, 1562, + 1547, 1548, 1564, 1563, + 1548, 1549, 1565, 1564, + 1549, 1550, 1566, 1565, + 1550, 1551, 1567, 1566, + 1551, 1552, 1568, 1567, + 1552, 1553, 1569, 1568, + 1553, 1554, 1570, 1569, + 1554, 1555, 1571, 1570, + 1555, 1556, 1572, 1571, + 1556, 1557, 1573, 1572, + 1557, 1558, 1574, 1573, + 1558, 1559, 1575, 1574, + 1559, 1560, 1576, 1575, + 1560, 1561, 1577, 1576, + 1527, 1562, 1578, 1526, + 1562, 1563, 1579, 1578, + 1563, 1564, 1580, 1579, + 1564, 1565, 1581, 1580, + 1565, 1566, 1582, 1581, + 1566, 1567, 1583, 1582, + 1567, 1568, 1584, 1583, + 1568, 1569, 1585, 1584, + 1569, 1570, 1586, 1585, + 1570, 1571, 1587, 1586, + 1571, 1572, 1588, 1587, + 1572, 1573, 1589, 1588, + 1573, 1574, 1590, 1589, + 1574, 1575, 1591, 1590, + 1575, 1576, 1592, 1591, + 1576, 1577, 1593, 1592, + 1526, 1578, 1594, 1525, + 1578, 1579, 1595, 1594, + 1579, 1580, 1596, 1595, + 1580, 1581, 1597, 1596, + 1581, 1582, 1598, 1597, + 1582, 1583, 1599, 1598, + 1583, 1584, 1600, 1599, + 1584, 1585, 1601, 1600, + 1585, 1586, 1602, 1601, + 1586, 1587, 1603, 1602, + 1587, 1588, 1604, 1603, + 1588, 1589, 1605, 1604, + 1589, 1590, 1606, 1605, + 1590, 1591, 1607, 1606, + 1591, 1592, 1608, 1607, + 1592, 1593, 1609, 1608, + 1525, 1594, 1610, 1524, + 1594, 1595, 1611, 1610, + 1595, 1596, 1612, 1611, + 1596, 1597, 1613, 1612, + 1597, 1598, 1614, 1613, + 1598, 1599, 1615, 1614, + 1599, 1600, 1616, 1615, + 1600, 1601, 1617, 1616, + 1601, 1602, 1618, 1617, + 1602, 1603, 1619, 1618, + 1603, 1604, 1620, 1619, + 1604, 1605, 1621, 1620, + 1605, 1606, 1622, 1621, + 1606, 1607, 1623, 1622, + 1607, 1608, 1624, 1623, + 1608, 1609, 1625, 1624, + 1524, 1610, 1626, 1523, + 1610, 1611, 1627, 1626, + 1611, 1612, 1628, 1627, + 1612, 1613, 1629, 1628, + 1613, 1614, 1630, 1629, + 1614, 1615, 1631, 1630, + 1615, 1616, 1632, 1631, + 1616, 1617, 1633, 1632, + 1617, 1618, 1634, 1633, + 1618, 1619, 1635, 1634, + 1619, 1620, 1636, 1635, + 1620, 1621, 1637, 1636, + 1621, 1622, 1638, 1637, + 1622, 1623, 1639, 1638, + 1623, 1624, 1640, 1639, + 1624, 1625, 1641, 1640, + 1523, 1626, 1642, 1522, + 1626, 1627, 1643, 1642, + 1627, 1628, 1644, 1643, + 1628, 1629, 1645, 1644, + 1629, 1630, 1646, 1645, + 1630, 1631, 1647, 1646, + 1631, 1632, 1648, 1647, + 1632, 1633, 1649, 1648, + 1633, 1634, 1650, 1649, + 1634, 1635, 1651, 1650, + 1635, 1636, 1652, 1651, + 1636, 1637, 1653, 1652, + 1637, 1638, 1654, 1653, + 1638, 1639, 1655, 1654, + 1639, 1640, 1656, 1655, + 1640, 1641, 1657, 1656, + 1522, 1642, 1658, 1521, + 1642, 1643, 1659, 1658, + 1643, 1644, 1660, 1659, + 1644, 1645, 1661, 1660, + 1645, 1646, 1662, 1661, + 1646, 1647, 1663, 1662, + 1647, 1648, 1664, 1663, + 1648, 1649, 1665, 1664, + 1649, 1650, 1666, 1665, + 1650, 1651, 1667, 1666, + 1651, 1652, 1668, 1667, + 1652, 1653, 1669, 1668, + 1653, 1654, 1670, 1669, + 1654, 1655, 1671, 1670, + 1655, 1656, 1672, 1671, + 1656, 1657, 1673, 1672, + 1521, 1658, 1674, 1520, + 1658, 1659, 1675, 1674, + 1659, 1660, 1676, 1675, + 1660, 1661, 1677, 1676, + 1661, 1662, 1678, 1677, + 1662, 1663, 1679, 1678, + 1663, 1664, 1680, 1679, + 1664, 1665, 1681, 1680, + 1665, 1666, 1682, 1681, + 1666, 1667, 1683, 1682, + 1667, 1668, 1684, 1683, + 1668, 1669, 1685, 1684, + 1669, 1670, 1686, 1685, + 1670, 1671, 1687, 1686, + 1671, 1672, 1688, 1687, + 1672, 1673, 1689, 1688, + 1520, 1674, 1690, 1519, + 1674, 1675, 1691, 1690, + 1675, 1676, 1692, 1691, + 1676, 1677, 1693, 1692, + 1677, 1678, 1694, 1693, + 1678, 1679, 1695, 1694, + 1679, 1680, 1696, 1695, + 1680, 1681, 1697, 1696, + 1681, 1682, 1698, 1697, + 1682, 1683, 1699, 1698, + 1683, 1684, 1700, 1699, + 1684, 1685, 1701, 1700, + 1685, 1686, 1702, 1701, + 1686, 1687, 1703, 1702, + 1687, 1688, 1704, 1703, + 1688, 1689, 1705, 1704, + 1519, 1690, 1706, 1518, + 1690, 1691, 1707, 1706, + 1691, 1692, 1708, 1707, + 1692, 1693, 1709, 1708, + 1693, 1694, 1710, 1709, + 1694, 1695, 1711, 1710, + 1695, 1696, 1712, 1711, + 1696, 1697, 1713, 1712, + 1697, 1698, 1714, 1713, + 1698, 1699, 1715, 1714, + 1699, 1700, 1716, 1715, + 1700, 1701, 1717, 1716, + 1701, 1702, 1718, 1717, + 1702, 1703, 1719, 1718, + 1703, 1704, 1720, 1719, + 1704, 1705, 1721, 1720, + 1518, 1706, 1722, 1517, + 1706, 1707, 1723, 1722, + 1707, 1708, 1724, 1723, + 1708, 1709, 1725, 1724, + 1709, 1710, 1726, 1725, + 1710, 1711, 1727, 1726, + 1711, 1712, 1728, 1727, + 1712, 1713, 1729, 1728, + 1713, 1714, 1730, 1729, + 1714, 1715, 1731, 1730, + 1715, 1716, 1732, 1731, + 1716, 1717, 1733, 1732, + 1717, 1718, 1734, 1733, + 1718, 1719, 1735, 1734, + 1719, 1720, 1736, 1735, + 1720, 1721, 1737, 1736, + 1517, 1722, 1738, 1516, + 1722, 1723, 1739, 1738, + 1723, 1724, 1740, 1739, + 1724, 1725, 1741, 1740, + 1725, 1726, 1742, 1741, + 1726, 1727, 1743, 1742, + 1727, 1728, 1744, 1743, + 1728, 1729, 1745, 1744, + 1729, 1730, 1746, 1745, + 1730, 1731, 1747, 1746, + 1731, 1732, 1748, 1747, + 1732, 1733, 1749, 1748, + 1733, 1734, 1750, 1749, + 1734, 1735, 1751, 1750, + 1735, 1736, 1752, 1751, + 1736, 1737, 1753, 1752, + 1516, 1738, 1754, 1515, + 1738, 1739, 1755, 1754, + 1739, 1740, 1756, 1755, + 1740, 1741, 1757, 1756, + 1741, 1742, 1758, 1757, + 1742, 1743, 1759, 1758, + 1743, 1744, 1760, 1759, + 1744, 1745, 1761, 1760, + 1745, 1746, 1762, 1761, + 1746, 1747, 1763, 1762, + 1747, 1748, 1764, 1763, + 1748, 1749, 1765, 1764, + 1749, 1750, 1766, 1765, + 1750, 1751, 1767, 1766, + 1751, 1752, 1768, 1767, + 1752, 1753, 1769, 1768, + 1515, 1754, 1770, 1514, + 1754, 1755, 1771, 1770, + 1755, 1756, 1772, 1771, + 1756, 1757, 1773, 1772, + 1757, 1758, 1774, 1773, + 1758, 1759, 1775, 1774, + 1759, 1760, 1776, 1775, + 1760, 1761, 1777, 1776, + 1761, 1762, 1778, 1777, + 1762, 1763, 1779, 1778, + 1763, 1764, 1780, 1779, + 1764, 1765, 1781, 1780, + 1765, 1766, 1782, 1781, + 1766, 1767, 1783, 1782, + 1767, 1768, 1784, 1783, + 1768, 1769, 1785, 1784, + 1514, 1770, 1786, 1513, + 1770, 1771, 1787, 1786, + 1771, 1772, 1788, 1787, + 1772, 1773, 1789, 1788, + 1773, 1774, 1790, 1789, + 1774, 1775, 1791, 1790, + 1775, 1776, 1792, 1791, + 1776, 1777, 1793, 1792, + 1777, 1778, 1794, 1793, + 1778, 1779, 1795, 1794, + 1779, 1780, 1796, 1795, + 1780, 1781, 1797, 1796, + 1781, 1782, 1798, 1797, + 1782, 1783, 1799, 1798, + 1783, 1784, 1800, 1799, + 1784, 1785, 1801, 1800, + 1513, 1786, 663, 646, + 1786, 1787, 680, 663, + 1787, 1788, 697, 680, + 1788, 1789, 714, 697, + 1789, 1790, 731, 714, + 1790, 1791, 748, 731, + 1791, 1792, 765, 748, + 1792, 1793, 782, 765, + 1793, 1794, 799, 782, + 1794, 1795, 816, 799, + 1795, 1796, 833, 816, + 1796, 1797, 850, 833, + 1797, 1798, 867, 850, + 1798, 1799, 884, 867, + 1799, 1800, 901, 884, + 1800, 1801, 918, 901, + 983, 1802, 1803, 984, + 1802, 1804, 1805, 1803, + 1804, 1806, 1807, 1805, + 1806, 1808, 1809, 1807, + 1808, 1810, 1811, 1809, + 1810, 1812, 1813, 1811, + 1812, 1814, 1815, 1813, + 1814, 1816, 1817, 1815, + 1816, 1818, 1819, 1817, + 1818, 1820, 1821, 1819, + 1820, 1822, 1823, 1821, + 1822, 1824, 1825, 1823, + 1824, 1826, 1827, 1825, + 1826, 1828, 1829, 1827, + 1828, 1830, 1831, 1829, + 1830, 1832, 1833, 1831, + 1832, 1834, 1835, 1833, + 1834, 1836, 1837, 1835, + 1836, 1838, 1839, 1837, + 1838, 1840, 1841, 1839, + 1840, 1842, 1843, 1841, + 1842, 1844, 1845, 1843, + 1844, 1846, 1847, 1845, + 1846, 1848, 1849, 1847, + 1848, 1850, 1851, 1849, + 1850, 1852, 1853, 1851, + 1852, 1854, 1855, 1853, + 1854, 1856, 1857, 1855, + 1856, 1858, 1859, 1857, + 1858, 1860, 1861, 1859, + 1860, 1862, 1863, 1861, + 1862, 1864, 1865, 1863, + 1864, 1866, 1867, 1865, + 984, 1803, 1868, 1017, + 1803, 1805, 1869, 1868, + 1805, 1807, 1870, 1869, + 1807, 1809, 1871, 1870, + 1809, 1811, 1872, 1871, + 1811, 1813, 1873, 1872, + 1813, 1815, 1874, 1873, + 1815, 1817, 1875, 1874, + 1817, 1819, 1876, 1875, + 1819, 1821, 1877, 1876, + 1821, 1823, 1878, 1877, + 1823, 1825, 1879, 1878, + 1825, 1827, 1880, 1879, + 1827, 1829, 1881, 1880, + 1829, 1831, 1882, 1881, + 1831, 1833, 1883, 1882, + 1833, 1835, 1884, 1883, + 1835, 1837, 1885, 1884, + 1837, 1839, 1886, 1885, + 1839, 1841, 1887, 1886, + 1841, 1843, 1888, 1887, + 1843, 1845, 1889, 1888, + 1845, 1847, 1890, 1889, + 1847, 1849, 1891, 1890, + 1849, 1851, 1892, 1891, + 1851, 1853, 1893, 1892, + 1853, 1855, 1894, 1893, + 1855, 1857, 1895, 1894, + 1857, 1859, 1896, 1895, + 1859, 1861, 1897, 1896, + 1861, 1863, 1898, 1897, + 1863, 1865, 1899, 1898, + 1865, 1867, 1900, 1899, + 1017, 1868, 1901, 1050, + 1868, 1869, 1902, 1901, + 1869, 1870, 1903, 1902, + 1870, 1871, 1904, 1903, + 1871, 1872, 1905, 1904, + 1872, 1873, 1906, 1905, + 1873, 1874, 1907, 1906, + 1874, 1875, 1908, 1907, + 1875, 1876, 1909, 1908, + 1876, 1877, 1910, 1909, + 1877, 1878, 1911, 1910, + 1878, 1879, 1912, 1911, + 1879, 1880, 1913, 1912, + 1880, 1881, 1914, 1913, + 1881, 1882, 1915, 1914, + 1882, 1883, 1916, 1915, + 1883, 1884, 1917, 1916, + 1884, 1885, 1918, 1917, + 1885, 1886, 1919, 1918, + 1886, 1887, 1920, 1919, + 1887, 1888, 1921, 1920, + 1888, 1889, 1922, 1921, + 1889, 1890, 1923, 1922, + 1890, 1891, 1924, 1923, + 1891, 1892, 1925, 1924, + 1892, 1893, 1926, 1925, + 1893, 1894, 1927, 1926, + 1894, 1895, 1928, 1927, + 1895, 1896, 1929, 1928, + 1896, 1897, 1930, 1929, + 1897, 1898, 1931, 1930, + 1898, 1899, 1932, 1931, + 1899, 1900, 1933, 1932, + 1050, 1901, 1934, 1083, + 1901, 1902, 1935, 1934, + 1902, 1903, 1936, 1935, + 1903, 1904, 1937, 1936, + 1904, 1905, 1938, 1937, + 1905, 1906, 1939, 1938, + 1906, 1907, 1940, 1939, + 1907, 1908, 1941, 1940, + 1908, 1909, 1942, 1941, + 1909, 1910, 1943, 1942, + 1910, 1911, 1944, 1943, + 1911, 1912, 1945, 1944, + 1912, 1913, 1946, 1945, + 1913, 1914, 1947, 1946, + 1914, 1915, 1948, 1947, + 1915, 1916, 1949, 1948, + 1916, 1917, 1950, 1949, + 1917, 1918, 1951, 1950, + 1918, 1919, 1952, 1951, + 1919, 1920, 1953, 1952, + 1920, 1921, 1954, 1953, + 1921, 1922, 1955, 1954, + 1922, 1923, 1956, 1955, + 1923, 1924, 1957, 1956, + 1924, 1925, 1958, 1957, + 1925, 1926, 1959, 1958, + 1926, 1927, 1960, 1959, + 1927, 1928, 1961, 1960, + 1928, 1929, 1962, 1961, + 1929, 1930, 1963, 1962, + 1930, 1931, 1964, 1963, + 1931, 1932, 1965, 1964, + 1932, 1933, 1966, 1965, + 1083, 1934, 1967, 1116, + 1934, 1935, 1968, 1967, + 1935, 1936, 1969, 1968, + 1936, 1937, 1970, 1969, + 1937, 1938, 1971, 1970, + 1938, 1939, 1972, 1971, + 1939, 1940, 1973, 1972, + 1940, 1941, 1974, 1973, + 1941, 1942, 1975, 1974, + 1942, 1943, 1976, 1975, + 1943, 1944, 1977, 1976, + 1944, 1945, 1978, 1977, + 1945, 1946, 1979, 1978, + 1946, 1947, 1980, 1979, + 1947, 1948, 1981, 1980, + 1948, 1949, 1982, 1981, + 1949, 1950, 1983, 1982, + 1950, 1951, 1984, 1983, + 1951, 1952, 1985, 1984, + 1952, 1953, 1986, 1985, + 1953, 1954, 1987, 1986, + 1954, 1955, 1988, 1987, + 1955, 1956, 1989, 1988, + 1956, 1957, 1990, 1989, + 1957, 1958, 1991, 1990, + 1958, 1959, 1992, 1991, + 1959, 1960, 1993, 1992, + 1960, 1961, 1994, 1993, + 1961, 1962, 1995, 1994, + 1962, 1963, 1996, 1995, + 1963, 1964, 1997, 1996, + 1964, 1965, 1998, 1997, + 1965, 1966, 1999, 1998, + 1116, 1967, 2000, 1149, + 1967, 1968, 2001, 2000, + 1968, 1969, 2002, 2001, + 1969, 1970, 2003, 2002, + 1970, 1971, 2004, 2003, + 1971, 1972, 2005, 2004, + 1972, 1973, 2006, 2005, + 1973, 1974, 2007, 2006, + 1974, 1975, 2008, 2007, + 1975, 1976, 2009, 2008, + 1976, 1977, 2010, 2009, + 1977, 1978, 2011, 2010, + 1978, 1979, 2012, 2011, + 1979, 1980, 2013, 2012, + 1980, 1981, 2014, 2013, + 1981, 1982, 2015, 2014, + 1982, 1983, 2016, 2015, + 1983, 1984, 2017, 2016, + 1984, 1985, 2018, 2017, + 1985, 1986, 2019, 2018, + 1986, 1987, 2020, 2019, + 1987, 1988, 2021, 2020, + 1988, 1989, 2022, 2021, + 1989, 1990, 2023, 2022, + 1990, 1991, 2024, 2023, + 1991, 1992, 2025, 2024, + 1992, 1993, 2026, 2025, + 1993, 1994, 2027, 2026, + 1994, 1995, 2028, 2027, + 1995, 1996, 2029, 2028, + 1996, 1997, 2030, 2029, + 1997, 1998, 2031, 2030, + 1998, 1999, 2032, 2031, + 1149, 2000, 2033, 1182, + 2000, 2001, 2034, 2033, + 2001, 2002, 2035, 2034, + 2002, 2003, 2036, 2035, + 2003, 2004, 2037, 2036, + 2004, 2005, 2038, 2037, + 2005, 2006, 2039, 2038, + 2006, 2007, 2040, 2039, + 2007, 2008, 2041, 2040, + 2008, 2009, 2042, 2041, + 2009, 2010, 2043, 2042, + 2010, 2011, 2044, 2043, + 2011, 2012, 2045, 2044, + 2012, 2013, 2046, 2045, + 2013, 2014, 2047, 2046, + 2014, 2015, 2048, 2047, + 2015, 2016, 2049, 2048, + 2016, 2017, 2050, 2049, + 2017, 2018, 2051, 2050, + 2018, 2019, 2052, 2051, + 2019, 2020, 2053, 2052, + 2020, 2021, 2054, 2053, + 2021, 2022, 2055, 2054, + 2022, 2023, 2056, 2055, + 2023, 2024, 2057, 2056, + 2024, 2025, 2058, 2057, + 2025, 2026, 2059, 2058, + 2026, 2027, 2060, 2059, + 2027, 2028, 2061, 2060, + 2028, 2029, 2062, 2061, + 2029, 2030, 2063, 2062, + 2030, 2031, 2064, 2063, + 2031, 2032, 2065, 2064, + 1182, 2033, 2066, 1215, + 2033, 2034, 2067, 2066, + 2034, 2035, 2068, 2067, + 2035, 2036, 2069, 2068, + 2036, 2037, 2070, 2069, + 2037, 2038, 2071, 2070, + 2038, 2039, 2072, 2071, + 2039, 2040, 2073, 2072, + 2040, 2041, 2074, 2073, + 2041, 2042, 2075, 2074, + 2042, 2043, 2076, 2075, + 2043, 2044, 2077, 2076, + 2044, 2045, 2078, 2077, + 2045, 2046, 2079, 2078, + 2046, 2047, 2080, 2079, + 2047, 2048, 2081, 2080, + 2048, 2049, 2082, 2081, + 2049, 2050, 2083, 2082, + 2050, 2051, 2084, 2083, + 2051, 2052, 2085, 2084, + 2052, 2053, 2086, 2085, + 2053, 2054, 2087, 2086, + 2054, 2055, 2088, 2087, + 2055, 2056, 2089, 2088, + 2056, 2057, 2090, 2089, + 2057, 2058, 2091, 2090, + 2058, 2059, 2092, 2091, + 2059, 2060, 2093, 2092, + 2060, 2061, 2094, 2093, + 2061, 2062, 2095, 2094, + 2062, 2063, 2096, 2095, + 2063, 2064, 2097, 2096, + 2064, 2065, 2098, 2097, + 1215, 2066, 2099, 1248, + 2066, 2067, 2100, 2099, + 2067, 2068, 2101, 2100, + 2068, 2069, 2102, 2101, + 2069, 2070, 2103, 2102, + 2070, 2071, 2104, 2103, + 2071, 2072, 2105, 2104, + 2072, 2073, 2106, 2105, + 2073, 2074, 2107, 2106, + 2074, 2075, 2108, 2107, + 2075, 2076, 2109, 2108, + 2076, 2077, 2110, 2109, + 2077, 2078, 2111, 2110, + 2078, 2079, 2112, 2111, + 2079, 2080, 2113, 2112, + 2080, 2081, 2114, 2113, + 2081, 2082, 2115, 2114, + 2082, 2083, 2116, 2115, + 2083, 2084, 2117, 2116, + 2084, 2085, 2118, 2117, + 2085, 2086, 2119, 2118, + 2086, 2087, 2120, 2119, + 2087, 2088, 2121, 2120, + 2088, 2089, 2122, 2121, + 2089, 2090, 2123, 2122, + 2090, 2091, 2124, 2123, + 2091, 2092, 2125, 2124, + 2092, 2093, 2126, 2125, + 2093, 2094, 2127, 2126, + 2094, 2095, 2128, 2127, + 2095, 2096, 2129, 2128, + 2096, 2097, 2130, 2129, + 2097, 2098, 2131, 2130, + 1248, 2099, 2132, 1281, + 2099, 2100, 2133, 2132, + 2100, 2101, 2134, 2133, + 2101, 2102, 2135, 2134, + 2102, 2103, 2136, 2135, + 2103, 2104, 2137, 2136, + 2104, 2105, 2138, 2137, + 2105, 2106, 2139, 2138, + 2106, 2107, 2140, 2139, + 2107, 2108, 2141, 2140, + 2108, 2109, 2142, 2141, + 2109, 2110, 2143, 2142, + 2110, 2111, 2144, 2143, + 2111, 2112, 2145, 2144, + 2112, 2113, 2146, 2145, + 2113, 2114, 2147, 2146, + 2114, 2115, 2148, 2147, + 2115, 2116, 2149, 2148, + 2116, 2117, 2150, 2149, + 2117, 2118, 2151, 2150, + 2118, 2119, 2152, 2151, + 2119, 2120, 2153, 2152, + 2120, 2121, 2154, 2153, + 2121, 2122, 2155, 2154, + 2122, 2123, 2156, 2155, + 2123, 2124, 2157, 2156, + 2124, 2125, 2158, 2157, + 2125, 2126, 2159, 2158, + 2126, 2127, 2160, 2159, + 2127, 2128, 2161, 2160, + 2128, 2129, 2162, 2161, + 2129, 2130, 2163, 2162, + 2130, 2131, 2164, 2163, + 1281, 2132, 2165, 1314, + 2132, 2133, 2166, 2165, + 2133, 2134, 2167, 2166, + 2134, 2135, 2168, 2167, + 2135, 2136, 2169, 2168, + 2136, 2137, 2170, 2169, + 2137, 2138, 2171, 2170, + 2138, 2139, 2172, 2171, + 2139, 2140, 2173, 2172, + 2140, 2141, 2174, 2173, + 2141, 2142, 2175, 2174, + 2142, 2143, 2176, 2175, + 2143, 2144, 2177, 2176, + 2144, 2145, 2178, 2177, + 2145, 2146, 2179, 2178, + 2146, 2147, 2180, 2179, + 2147, 2148, 2181, 2180, + 2148, 2149, 2182, 2181, + 2149, 2150, 2183, 2182, + 2150, 2151, 2184, 2183, + 2151, 2152, 2185, 2184, + 2152, 2153, 2186, 2185, + 2153, 2154, 2187, 2186, + 2154, 2155, 2188, 2187, + 2155, 2156, 2189, 2188, + 2156, 2157, 2190, 2189, + 2157, 2158, 2191, 2190, + 2158, 2159, 2192, 2191, + 2159, 2160, 2193, 2192, + 2160, 2161, 2194, 2193, + 2161, 2162, 2195, 2194, + 2162, 2163, 2196, 2195, + 2163, 2164, 2197, 2196, + 1314, 2165, 2198, 1347, + 2165, 2166, 2199, 2198, + 2166, 2167, 2200, 2199, + 2167, 2168, 2201, 2200, + 2168, 2169, 2202, 2201, + 2169, 2170, 2203, 2202, + 2170, 2171, 2204, 2203, + 2171, 2172, 2205, 2204, + 2172, 2173, 2206, 2205, + 2173, 2174, 2207, 2206, + 2174, 2175, 2208, 2207, + 2175, 2176, 2209, 2208, + 2176, 2177, 2210, 2209, + 2177, 2178, 2211, 2210, + 2178, 2179, 2212, 2211, + 2179, 2180, 2213, 2212, + 2180, 2181, 2214, 2213, + 2181, 2182, 2215, 2214, + 2182, 2183, 2216, 2215, + 2183, 2184, 2217, 2216, + 2184, 2185, 2218, 2217, + 2185, 2186, 2219, 2218, + 2186, 2187, 2220, 2219, + 2187, 2188, 2221, 2220, + 2188, 2189, 2222, 2221, + 2189, 2190, 2223, 2222, + 2190, 2191, 2224, 2223, + 2191, 2192, 2225, 2224, + 2192, 2193, 2226, 2225, + 2193, 2194, 2227, 2226, + 2194, 2195, 2228, 2227, + 2195, 2196, 2229, 2228, + 2196, 2197, 2230, 2229, + 1347, 2198, 2231, 1380, + 2198, 2199, 2232, 2231, + 2199, 2200, 2233, 2232, + 2200, 2201, 2234, 2233, + 2201, 2202, 2235, 2234, + 2202, 2203, 2236, 2235, + 2203, 2204, 2237, 2236, + 2204, 2205, 2238, 2237, + 2205, 2206, 2239, 2238, + 2206, 2207, 2240, 2239, + 2207, 2208, 2241, 2240, + 2208, 2209, 2242, 2241, + 2209, 2210, 2243, 2242, + 2210, 2211, 2244, 2243, + 2211, 2212, 2245, 2244, + 2212, 2213, 2246, 2245, + 2213, 2214, 2247, 2246, + 2214, 2215, 2248, 2247, + 2215, 2216, 2249, 2248, + 2216, 2217, 2250, 2249, + 2217, 2218, 2251, 2250, + 2218, 2219, 2252, 2251, + 2219, 2220, 2253, 2252, + 2220, 2221, 2254, 2253, + 2221, 2222, 2255, 2254, + 2222, 2223, 2256, 2255, + 2223, 2224, 2257, 2256, + 2224, 2225, 2258, 2257, + 2225, 2226, 2259, 2258, + 2226, 2227, 2260, 2259, + 2227, 2228, 2261, 2260, + 2228, 2229, 2262, 2261, + 2229, 2230, 2263, 2262, + 1380, 2231, 2264, 1413, + 2231, 2232, 2265, 2264, + 2232, 2233, 2266, 2265, + 2233, 2234, 2267, 2266, + 2234, 2235, 2268, 2267, + 2235, 2236, 2269, 2268, + 2236, 2237, 2270, 2269, + 2237, 2238, 2271, 2270, + 2238, 2239, 2272, 2271, + 2239, 2240, 2273, 2272, + 2240, 2241, 2274, 2273, + 2241, 2242, 2275, 2274, + 2242, 2243, 2276, 2275, + 2243, 2244, 2277, 2276, + 2244, 2245, 2278, 2277, + 2245, 2246, 2279, 2278, + 2246, 2247, 2280, 2279, + 2247, 2248, 2281, 2280, + 2248, 2249, 2282, 2281, + 2249, 2250, 2283, 2282, + 2250, 2251, 2284, 2283, + 2251, 2252, 2285, 2284, + 2252, 2253, 2286, 2285, + 2253, 2254, 2287, 2286, + 2254, 2255, 2288, 2287, + 2255, 2256, 2289, 2288, + 2256, 2257, 2290, 2289, + 2257, 2258, 2291, 2290, + 2258, 2259, 2292, 2291, + 2259, 2260, 2293, 2292, + 2260, 2261, 2294, 2293, + 2261, 2262, 2295, 2294, + 2262, 2263, 2296, 2295, + 1413, 2264, 2297, 1446, + 2264, 2265, 2298, 2297, + 2265, 2266, 2299, 2298, + 2266, 2267, 2300, 2299, + 2267, 2268, 2301, 2300, + 2268, 2269, 2302, 2301, + 2269, 2270, 2303, 2302, + 2270, 2271, 2304, 2303, + 2271, 2272, 2305, 2304, + 2272, 2273, 2306, 2305, + 2273, 2274, 2307, 2306, + 2274, 2275, 2308, 2307, + 2275, 2276, 2309, 2308, + 2276, 2277, 2310, 2309, + 2277, 2278, 2311, 2310, + 2278, 2279, 2312, 2311, + 2279, 2280, 2313, 2312, + 2280, 2281, 2314, 2313, + 2281, 2282, 2315, 2314, + 2282, 2283, 2316, 2315, + 2283, 2284, 2317, 2316, + 2284, 2285, 2318, 2317, + 2285, 2286, 2319, 2318, + 2286, 2287, 2320, 2319, + 2287, 2288, 2321, 2320, + 2288, 2289, 2322, 2321, + 2289, 2290, 2323, 2322, + 2290, 2291, 2324, 2323, + 2291, 2292, 2325, 2324, + 2292, 2293, 2326, 2325, + 2293, 2294, 2327, 2326, + 2294, 2295, 2328, 2327, + 2295, 2296, 2329, 2328, + 1446, 2297, 2330, 1479, + 2297, 2298, 2331, 2330, + 2298, 2299, 2332, 2331, + 2299, 2300, 2333, 2332, + 2300, 2301, 2334, 2333, + 2301, 2302, 2335, 2334, + 2302, 2303, 2336, 2335, + 2303, 2304, 2337, 2336, + 2304, 2305, 2338, 2337, + 2305, 2306, 2339, 2338, + 2306, 2307, 2340, 2339, + 2307, 2308, 2341, 2340, + 2308, 2309, 2342, 2341, + 2309, 2310, 2343, 2342, + 2310, 2311, 2344, 2343, + 2311, 2312, 2345, 2344, + 2312, 2313, 2346, 2345, + 2313, 2314, 2347, 2346, + 2314, 2315, 2348, 2347, + 2315, 2316, 2349, 2348, + 2316, 2317, 2350, 2349, + 2317, 2318, 2351, 2350, + 2318, 2319, 2352, 2351, + 2319, 2320, 2353, 2352, + 2320, 2321, 2354, 2353, + 2321, 2322, 2355, 2354, + 2322, 2323, 2356, 2355, + 2323, 2324, 2357, 2356, + 2324, 2325, 2358, 2357, + 2325, 2326, 2359, 2358, + 2326, 2327, 2360, 2359, + 2327, 2328, 2361, 2360, + 2328, 2329, 2362, 2361, + 1479, 2330, 2363, 1512, + 2330, 2331, 2364, 2363, + 2331, 2332, 2365, 2364, + 2332, 2333, 2366, 2365, + 2333, 2334, 2367, 2366, + 2334, 2335, 2368, 2367, + 2335, 2336, 2369, 2368, + 2336, 2337, 2370, 2369, + 2337, 2338, 2371, 2370, + 2338, 2339, 2372, 2371, + 2339, 2340, 2373, 2372, + 2340, 2341, 2374, 2373, + 2341, 2342, 2375, 2374, + 2342, 2343, 2376, 2375, + 2343, 2344, 2377, 2376, + 2344, 2345, 2378, 2377, + 2345, 2346, 2379, 2378, + 2346, 2347, 2380, 2379, + 2347, 2348, 2381, 2380, + 2348, 2349, 2382, 2381, + 2349, 2350, 2383, 2382, + 2350, 2351, 2384, 2383, + 2351, 2352, 2385, 2384, + 2352, 2353, 2386, 2385, + 2353, 2354, 2387, 2386, + 2354, 2355, 2388, 2387, + 2355, 2356, 2389, 2388, + 2356, 2357, 2390, 2389, + 2357, 2358, 2391, 2390, + 2358, 2359, 2392, 2391, + 2359, 2360, 2393, 2392, + 2360, 2361, 2394, 2393, + 2361, 2362, 2395, 2394, + 1512, 2363, 2396, 1545, + 2363, 2364, 2397, 2396, + 2364, 2365, 2398, 2397, + 2365, 2366, 2399, 2398, + 2366, 2367, 2400, 2399, + 2367, 2368, 2401, 2400, + 2368, 2369, 2402, 2401, + 2369, 2370, 2403, 2402, + 2370, 2371, 2404, 2403, + 2371, 2372, 2405, 2404, + 2372, 2373, 2406, 2405, + 2373, 2374, 2407, 2406, + 2374, 2375, 2408, 2407, + 2375, 2376, 2409, 2408, + 2376, 2377, 2410, 2409, + 2377, 2378, 2411, 2410, + 2378, 2379, 2412, 2411, + 2379, 2380, 2413, 2412, + 2380, 2381, 2414, 2413, + 2381, 2382, 2415, 2414, + 2382, 2383, 2416, 2415, + 2383, 2384, 2417, 2416, + 2384, 2385, 2418, 2417, + 2385, 2386, 2419, 2418, + 2386, 2387, 2420, 2419, + 2387, 2388, 2421, 2420, + 2388, 2389, 2422, 2421, + 2389, 2390, 2423, 2422, + 2390, 2391, 2424, 2423, + 2391, 2392, 2425, 2424, + 2392, 2393, 2426, 2425, + 2393, 2394, 2427, 2426, + 2394, 2395, 2428, 2427, + 2411, 2412, 2429, 2410, + 2412, 2413, 2430, 2429, + 2413, 2414, 2431, 2430, + 2414, 2415, 2432, 2431, + 2415, 2416, 2433, 2432, + 2416, 2417, 2434, 2433, + 2417, 2418, 2435, 2434, + 2418, 2419, 2436, 2435, + 2419, 2420, 2437, 2436, + 2420, 2421, 2438, 2437, + 2421, 2422, 2439, 2438, + 2422, 2423, 2440, 2439, + 2423, 2424, 2441, 2440, + 2424, 2425, 2442, 2441, + 2425, 2426, 2443, 2442, + 2426, 2427, 2444, 2443, + 2427, 2428, 2445, 2444, + 2410, 2429, 2446, 2409, + 2429, 2430, 2447, 2446, + 2430, 2431, 2448, 2447, + 2431, 2432, 2449, 2448, + 2432, 2433, 2450, 2449, + 2433, 2434, 2451, 2450, + 2434, 2435, 2452, 2451, + 2435, 2436, 2453, 2452, + 2436, 2437, 2454, 2453, + 2437, 2438, 2455, 2454, + 2438, 2439, 2456, 2455, + 2439, 2440, 2457, 2456, + 2440, 2441, 2458, 2457, + 2441, 2442, 2459, 2458, + 2442, 2443, 2460, 2459, + 2443, 2444, 2461, 2460, + 2444, 2445, 2462, 2461, + 2409, 2446, 2463, 2408, + 2446, 2447, 2464, 2463, + 2447, 2448, 2465, 2464, + 2448, 2449, 2466, 2465, + 2449, 2450, 2467, 2466, + 2450, 2451, 2468, 2467, + 2451, 2452, 2469, 2468, + 2452, 2453, 2470, 2469, + 2453, 2454, 2471, 2470, + 2454, 2455, 2472, 2471, + 2455, 2456, 2473, 2472, + 2456, 2457, 2474, 2473, + 2457, 2458, 2475, 2474, + 2458, 2459, 2476, 2475, + 2459, 2460, 2477, 2476, + 2460, 2461, 2478, 2477, + 2461, 2462, 2479, 2478, + 2408, 2463, 2480, 2407, + 2463, 2464, 2481, 2480, + 2464, 2465, 2482, 2481, + 2465, 2466, 2483, 2482, + 2466, 2467, 2484, 2483, + 2467, 2468, 2485, 2484, + 2468, 2469, 2486, 2485, + 2469, 2470, 2487, 2486, + 2470, 2471, 2488, 2487, + 2471, 2472, 2489, 2488, + 2472, 2473, 2490, 2489, + 2473, 2474, 2491, 2490, + 2474, 2475, 2492, 2491, + 2475, 2476, 2493, 2492, + 2476, 2477, 2494, 2493, + 2477, 2478, 2495, 2494, + 2478, 2479, 2496, 2495, + 2407, 2480, 2497, 2406, + 2480, 2481, 2498, 2497, + 2481, 2482, 2499, 2498, + 2482, 2483, 2500, 2499, + 2483, 2484, 2501, 2500, + 2484, 2485, 2502, 2501, + 2485, 2486, 2503, 2502, + 2486, 2487, 2504, 2503, + 2487, 2488, 2505, 2504, + 2488, 2489, 2506, 2505, + 2489, 2490, 2507, 2506, + 2490, 2491, 2508, 2507, + 2491, 2492, 2509, 2508, + 2492, 2493, 2510, 2509, + 2493, 2494, 2511, 2510, + 2494, 2495, 2512, 2511, + 2495, 2496, 2513, 2512, + 2406, 2497, 2514, 2405, + 2497, 2498, 2515, 2514, + 2498, 2499, 2516, 2515, + 2499, 2500, 2517, 2516, + 2500, 2501, 2518, 2517, + 2501, 2502, 2519, 2518, + 2502, 2503, 2520, 2519, + 2503, 2504, 2521, 2520, + 2504, 2505, 2522, 2521, + 2505, 2506, 2523, 2522, + 2506, 2507, 2524, 2523, + 2507, 2508, 2525, 2524, + 2508, 2509, 2526, 2525, + 2509, 2510, 2527, 2526, + 2510, 2511, 2528, 2527, + 2511, 2512, 2529, 2528, + 2512, 2513, 2530, 2529, + 2405, 2514, 2531, 2404, + 2514, 2515, 2532, 2531, + 2515, 2516, 2533, 2532, + 2516, 2517, 2534, 2533, + 2517, 2518, 2535, 2534, + 2518, 2519, 2536, 2535, + 2519, 2520, 2537, 2536, + 2520, 2521, 2538, 2537, + 2521, 2522, 2539, 2538, + 2522, 2523, 2540, 2539, + 2523, 2524, 2541, 2540, + 2524, 2525, 2542, 2541, + 2525, 2526, 2543, 2542, + 2526, 2527, 2544, 2543, + 2527, 2528, 2545, 2544, + 2528, 2529, 2546, 2545, + 2529, 2530, 2547, 2546, + 2404, 2531, 2548, 2403, + 2531, 2532, 2549, 2548, + 2532, 2533, 2550, 2549, + 2533, 2534, 2551, 2550, + 2534, 2535, 2552, 2551, + 2535, 2536, 2553, 2552, + 2536, 2537, 2554, 2553, + 2537, 2538, 2555, 2554, + 2538, 2539, 2556, 2555, + 2539, 2540, 2557, 2556, + 2540, 2541, 2558, 2557, + 2541, 2542, 2559, 2558, + 2542, 2543, 2560, 2559, + 2543, 2544, 2561, 2560, + 2544, 2545, 2562, 2561, + 2545, 2546, 2563, 2562, + 2546, 2547, 2564, 2563, + 2403, 2548, 2565, 2402, + 2548, 2549, 2566, 2565, + 2549, 2550, 2567, 2566, + 2550, 2551, 2568, 2567, + 2551, 2552, 2569, 2568, + 2552, 2553, 2570, 2569, + 2553, 2554, 2571, 2570, + 2554, 2555, 2572, 2571, + 2555, 2556, 2573, 2572, + 2556, 2557, 2574, 2573, + 2557, 2558, 2575, 2574, + 2558, 2559, 2576, 2575, + 2559, 2560, 2577, 2576, + 2560, 2561, 2578, 2577, + 2561, 2562, 2579, 2578, + 2562, 2563, 2580, 2579, + 2563, 2564, 2581, 2580, + 2402, 2565, 2582, 2401, + 2565, 2566, 2583, 2582, + 2566, 2567, 2584, 2583, + 2567, 2568, 2585, 2584, + 2568, 2569, 2586, 2585, + 2569, 2570, 2587, 2586, + 2570, 2571, 2588, 2587, + 2571, 2572, 2589, 2588, + 2572, 2573, 2590, 2589, + 2573, 2574, 2591, 2590, + 2574, 2575, 2592, 2591, + 2575, 2576, 2593, 2592, + 2576, 2577, 2594, 2593, + 2577, 2578, 2595, 2594, + 2578, 2579, 2596, 2595, + 2579, 2580, 2597, 2596, + 2580, 2581, 2598, 2597, + 2401, 2582, 2599, 2400, + 2582, 2583, 2600, 2599, + 2583, 2584, 2601, 2600, + 2584, 2585, 2602, 2601, + 2585, 2586, 2603, 2602, + 2586, 2587, 2604, 2603, + 2587, 2588, 2605, 2604, + 2588, 2589, 2606, 2605, + 2589, 2590, 2607, 2606, + 2590, 2591, 2608, 2607, + 2591, 2592, 2609, 2608, + 2592, 2593, 2610, 2609, + 2593, 2594, 2611, 2610, + 2594, 2595, 2612, 2611, + 2595, 2596, 2613, 2612, + 2596, 2597, 2614, 2613, + 2597, 2598, 2615, 2614, + 2400, 2599, 2616, 2399, + 2599, 2600, 2617, 2616, + 2600, 2601, 2618, 2617, + 2601, 2602, 2619, 2618, + 2602, 2603, 2620, 2619, + 2603, 2604, 2621, 2620, + 2604, 2605, 2622, 2621, + 2605, 2606, 2623, 2622, + 2606, 2607, 2624, 2623, + 2607, 2608, 2625, 2624, + 2608, 2609, 2626, 2625, + 2609, 2610, 2627, 2626, + 2610, 2611, 2628, 2627, + 2611, 2612, 2629, 2628, + 2612, 2613, 2630, 2629, + 2613, 2614, 2631, 2630, + 2614, 2615, 2632, 2631, + 2399, 2616, 2633, 2398, + 2616, 2617, 2634, 2633, + 2617, 2618, 2635, 2634, + 2618, 2619, 2636, 2635, + 2619, 2620, 2637, 2636, + 2620, 2621, 2638, 2637, + 2621, 2622, 2639, 2638, + 2622, 2623, 2640, 2639, + 2623, 2624, 2641, 2640, + 2624, 2625, 2642, 2641, + 2625, 2626, 2643, 2642, + 2626, 2627, 2644, 2643, + 2627, 2628, 2645, 2644, + 2628, 2629, 2646, 2645, + 2629, 2630, 2647, 2646, + 2630, 2631, 2648, 2647, + 2631, 2632, 2649, 2648, + 2398, 2633, 2650, 2397, + 2633, 2634, 2651, 2650, + 2634, 2635, 2652, 2651, + 2635, 2636, 2653, 2652, + 2636, 2637, 2654, 2653, + 2637, 2638, 2655, 2654, + 2638, 2639, 2656, 2655, + 2639, 2640, 2657, 2656, + 2640, 2641, 2658, 2657, + 2641, 2642, 2659, 2658, + 2642, 2643, 2660, 2659, + 2643, 2644, 2661, 2660, + 2644, 2645, 2662, 2661, + 2645, 2646, 2663, 2662, + 2646, 2647, 2664, 2663, + 2647, 2648, 2665, 2664, + 2648, 2649, 2666, 2665, + 2397, 2650, 2667, 2396, + 2650, 2651, 2668, 2667, + 2651, 2652, 2669, 2668, + 2652, 2653, 2670, 2669, + 2653, 2654, 2671, 2670, + 2654, 2655, 2672, 2671, + 2655, 2656, 2673, 2672, + 2656, 2657, 2674, 2673, + 2657, 2658, 2675, 2674, + 2658, 2659, 2676, 2675, + 2659, 2660, 2677, 2676, + 2660, 2661, 2678, 2677, + 2661, 2662, 2679, 2678, + 2662, 2663, 2680, 2679, + 2663, 2664, 2681, 2680, + 2664, 2665, 2682, 2681, + 2665, 2666, 2683, 2682, + 2396, 2667, 1561, 1545, + 2667, 2668, 1577, 1561, + 2668, 2669, 1593, 1577, + 2669, 2670, 1609, 1593, + 2670, 2671, 1625, 1609, + 2671, 2672, 1641, 1625, + 2672, 2673, 1657, 1641, + 2673, 2674, 1673, 1657, + 2674, 2675, 1689, 1673, + 2675, 2676, 1705, 1689, + 2676, 2677, 1721, 1705, + 2677, 2678, 1737, 1721, + 2678, 2679, 1753, 1737, + 2679, 2680, 1769, 1753, + 2680, 2681, 1785, 1769, + 2681, 2682, 1801, 1785, + 2682, 2683, 918, 1801, + 1866, 2684, 2685, 1867, + 2684, 2686, 2687, 2685, + 2686, 2688, 2689, 2687, + 2688, 2690, 2691, 2689, + 2690, 2692, 2693, 2691, + 2692, 2694, 2695, 2693, + 2694, 2696, 2697, 2695, + 2696, 2698, 2699, 2697, + 2698, 2700, 2701, 2699, + 2700, 2702, 2703, 2701, + 2702, 2704, 2705, 2703, + 2704, 2706, 2707, 2705, + 2706, 2708, 2709, 2707, + 2708, 2710, 2711, 2709, + 2710, 2712, 2713, 2711, + 2712, 2714, 2715, 2713, + 2714, 2716, 2717, 2715, + 2716, 2718, 2719, 2717, + 2718, 2720, 2721, 2719, + 2720, 2722, 2723, 2721, + 2722, 2724, 2725, 2723, + 2724, 2726, 2727, 2725, + 2726, 2728, 2729, 2727, + 2728, 2730, 2731, 2729, + 2730, 2732, 2733, 2731, + 2732, 2734, 2735, 2733, + 2734, 2736, 2737, 2735, + 2736, 2738, 2739, 2737, + 2738, 2740, 2741, 2739, + 2740, 2742, 2743, 2741, + 2742, 2744, 2745, 2743, + 2744, 2746, 2747, 2745, + 2746, 1, 4, 2747, + 1867, 2685, 2748, 1900, + 2685, 2687, 2749, 2748, + 2687, 2689, 2750, 2749, + 2689, 2691, 2751, 2750, + 2691, 2693, 2752, 2751, + 2693, 2695, 2753, 2752, + 2695, 2697, 2754, 2753, + 2697, 2699, 2755, 2754, + 2699, 2701, 2756, 2755, + 2701, 2703, 2757, 2756, + 2703, 2705, 2758, 2757, + 2705, 2707, 2759, 2758, + 2707, 2709, 2760, 2759, + 2709, 2711, 2761, 2760, + 2711, 2713, 2762, 2761, + 2713, 2715, 2763, 2762, + 2715, 2717, 2764, 2763, + 2717, 2719, 2765, 2764, + 2719, 2721, 2766, 2765, + 2721, 2723, 2767, 2766, + 2723, 2725, 2768, 2767, + 2725, 2727, 2769, 2768, + 2727, 2729, 2770, 2769, + 2729, 2731, 2771, 2770, + 2731, 2733, 2772, 2771, + 2733, 2735, 2773, 2772, + 2735, 2737, 2774, 2773, + 2737, 2739, 2775, 2774, + 2739, 2741, 2776, 2775, + 2741, 2743, 2777, 2776, + 2743, 2745, 2778, 2777, + 2745, 2747, 2779, 2778, + 2747, 4, 70, 2779, + 1900, 2748, 2780, 1933, + 2748, 2749, 2781, 2780, + 2749, 2750, 2782, 2781, + 2750, 2751, 2783, 2782, + 2751, 2752, 2784, 2783, + 2752, 2753, 2785, 2784, + 2753, 2754, 2786, 2785, + 2754, 2755, 2787, 2786, + 2755, 2756, 2788, 2787, + 2756, 2757, 2789, 2788, + 2757, 2758, 2790, 2789, + 2758, 2759, 2791, 2790, + 2759, 2760, 2792, 2791, + 2760, 2761, 2793, 2792, + 2761, 2762, 2794, 2793, + 2762, 2763, 2795, 2794, + 2763, 2764, 2796, 2795, + 2764, 2765, 2797, 2796, + 2765, 2766, 2798, 2797, + 2766, 2767, 2799, 2798, + 2767, 2768, 2800, 2799, + 2768, 2769, 2801, 2800, + 2769, 2770, 2802, 2801, + 2770, 2771, 2803, 2802, + 2771, 2772, 2804, 2803, + 2772, 2773, 2805, 2804, + 2773, 2774, 2806, 2805, + 2774, 2775, 2807, 2806, + 2775, 2776, 2808, 2807, + 2776, 2777, 2809, 2808, + 2777, 2778, 2810, 2809, + 2778, 2779, 2811, 2810, + 2779, 70, 104, 2811, + 1933, 2780, 2812, 1966, + 2780, 2781, 2813, 2812, + 2781, 2782, 2814, 2813, + 2782, 2783, 2815, 2814, + 2783, 2784, 2816, 2815, + 2784, 2785, 2817, 2816, + 2785, 2786, 2818, 2817, + 2786, 2787, 2819, 2818, + 2787, 2788, 2820, 2819, + 2788, 2789, 2821, 2820, + 2789, 2790, 2822, 2821, + 2790, 2791, 2823, 2822, + 2791, 2792, 2824, 2823, + 2792, 2793, 2825, 2824, + 2793, 2794, 2826, 2825, + 2794, 2795, 2827, 2826, + 2795, 2796, 2828, 2827, + 2796, 2797, 2829, 2828, + 2797, 2798, 2830, 2829, + 2798, 2799, 2831, 2830, + 2799, 2800, 2832, 2831, + 2800, 2801, 2833, 2832, + 2801, 2802, 2834, 2833, + 2802, 2803, 2835, 2834, + 2803, 2804, 2836, 2835, + 2804, 2805, 2837, 2836, + 2805, 2806, 2838, 2837, + 2806, 2807, 2839, 2838, + 2807, 2808, 2840, 2839, + 2808, 2809, 2841, 2840, + 2809, 2810, 2842, 2841, + 2810, 2811, 2843, 2842, + 2811, 104, 138, 2843, + 1966, 2812, 2844, 1999, + 2812, 2813, 2845, 2844, + 2813, 2814, 2846, 2845, + 2814, 2815, 2847, 2846, + 2815, 2816, 2848, 2847, + 2816, 2817, 2849, 2848, + 2817, 2818, 2850, 2849, + 2818, 2819, 2851, 2850, + 2819, 2820, 2852, 2851, + 2820, 2821, 2853, 2852, + 2821, 2822, 2854, 2853, + 2822, 2823, 2855, 2854, + 2823, 2824, 2856, 2855, + 2824, 2825, 2857, 2856, + 2825, 2826, 2858, 2857, + 2826, 2827, 2859, 2858, + 2827, 2828, 2860, 2859, + 2828, 2829, 2861, 2860, + 2829, 2830, 2862, 2861, + 2830, 2831, 2863, 2862, + 2831, 2832, 2864, 2863, + 2832, 2833, 2865, 2864, + 2833, 2834, 2866, 2865, + 2834, 2835, 2867, 2866, + 2835, 2836, 2868, 2867, + 2836, 2837, 2869, 2868, + 2837, 2838, 2870, 2869, + 2838, 2839, 2871, 2870, + 2839, 2840, 2872, 2871, + 2840, 2841, 2873, 2872, + 2841, 2842, 2874, 2873, + 2842, 2843, 2875, 2874, + 2843, 138, 172, 2875, + 1999, 2844, 2876, 2032, + 2844, 2845, 2877, 2876, + 2845, 2846, 2878, 2877, + 2846, 2847, 2879, 2878, + 2847, 2848, 2880, 2879, + 2848, 2849, 2881, 2880, + 2849, 2850, 2882, 2881, + 2850, 2851, 2883, 2882, + 2851, 2852, 2884, 2883, + 2852, 2853, 2885, 2884, + 2853, 2854, 2886, 2885, + 2854, 2855, 2887, 2886, + 2855, 2856, 2888, 2887, + 2856, 2857, 2889, 2888, + 2857, 2858, 2890, 2889, + 2858, 2859, 2891, 2890, + 2859, 2860, 2892, 2891, + 2860, 2861, 2893, 2892, + 2861, 2862, 2894, 2893, + 2862, 2863, 2895, 2894, + 2863, 2864, 2896, 2895, + 2864, 2865, 2897, 2896, + 2865, 2866, 2898, 2897, + 2866, 2867, 2899, 2898, + 2867, 2868, 2900, 2899, + 2868, 2869, 2901, 2900, + 2869, 2870, 2902, 2901, + 2870, 2871, 2903, 2902, + 2871, 2872, 2904, 2903, + 2872, 2873, 2905, 2904, + 2873, 2874, 2906, 2905, + 2874, 2875, 2907, 2906, + 2875, 172, 206, 2907, + 2032, 2876, 2908, 2065, + 2876, 2877, 2909, 2908, + 2877, 2878, 2910, 2909, + 2878, 2879, 2911, 2910, + 2879, 2880, 2912, 2911, + 2880, 2881, 2913, 2912, + 2881, 2882, 2914, 2913, + 2882, 2883, 2915, 2914, + 2883, 2884, 2916, 2915, + 2884, 2885, 2917, 2916, + 2885, 2886, 2918, 2917, + 2886, 2887, 2919, 2918, + 2887, 2888, 2920, 2919, + 2888, 2889, 2921, 2920, + 2889, 2890, 2922, 2921, + 2890, 2891, 2923, 2922, + 2891, 2892, 2924, 2923, + 2892, 2893, 2925, 2924, + 2893, 2894, 2926, 2925, + 2894, 2895, 2927, 2926, + 2895, 2896, 2928, 2927, + 2896, 2897, 2929, 2928, + 2897, 2898, 2930, 2929, + 2898, 2899, 2931, 2930, + 2899, 2900, 2932, 2931, + 2900, 2901, 2933, 2932, + 2901, 2902, 2934, 2933, + 2902, 2903, 2935, 2934, + 2903, 2904, 2936, 2935, + 2904, 2905, 2937, 2936, + 2905, 2906, 2938, 2937, + 2906, 2907, 2939, 2938, + 2907, 206, 240, 2939, + 2065, 2908, 2940, 2098, + 2908, 2909, 2941, 2940, + 2909, 2910, 2942, 2941, + 2910, 2911, 2943, 2942, + 2911, 2912, 2944, 2943, + 2912, 2913, 2945, 2944, + 2913, 2914, 2946, 2945, + 2914, 2915, 2947, 2946, + 2915, 2916, 2948, 2947, + 2916, 2917, 2949, 2948, + 2917, 2918, 2950, 2949, + 2918, 2919, 2951, 2950, + 2919, 2920, 2952, 2951, + 2920, 2921, 2953, 2952, + 2921, 2922, 2954, 2953, + 2922, 2923, 2955, 2954, + 2923, 2924, 2956, 2955, + 2924, 2925, 2957, 2956, + 2925, 2926, 2958, 2957, + 2926, 2927, 2959, 2958, + 2927, 2928, 2960, 2959, + 2928, 2929, 2961, 2960, + 2929, 2930, 2962, 2961, + 2930, 2931, 2963, 2962, + 2931, 2932, 2964, 2963, + 2932, 2933, 2965, 2964, + 2933, 2934, 2966, 2965, + 2934, 2935, 2967, 2966, + 2935, 2936, 2968, 2967, + 2936, 2937, 2969, 2968, + 2937, 2938, 2970, 2969, + 2938, 2939, 2971, 2970, + 2939, 240, 274, 2971, + 2098, 2940, 2972, 2131, + 2940, 2941, 2973, 2972, + 2941, 2942, 2974, 2973, + 2942, 2943, 2975, 2974, + 2943, 2944, 2976, 2975, + 2944, 2945, 2977, 2976, + 2945, 2946, 2978, 2977, + 2946, 2947, 2979, 2978, + 2947, 2948, 2980, 2979, + 2948, 2949, 2981, 2980, + 2949, 2950, 2982, 2981, + 2950, 2951, 2983, 2982, + 2951, 2952, 2984, 2983, + 2952, 2953, 2985, 2984, + 2953, 2954, 2986, 2985, + 2954, 2955, 2987, 2986, + 2955, 2956, 2988, 2987, + 2956, 2957, 2989, 2988, + 2957, 2958, 2990, 2989, + 2958, 2959, 2991, 2990, + 2959, 2960, 2992, 2991, + 2960, 2961, 2993, 2992, + 2961, 2962, 2994, 2993, + 2962, 2963, 2995, 2994, + 2963, 2964, 2996, 2995, + 2964, 2965, 2997, 2996, + 2965, 2966, 2998, 2997, + 2966, 2967, 2999, 2998, + 2967, 2968, 3000, 2999, + 2968, 2969, 3001, 3000, + 2969, 2970, 3002, 3001, + 2970, 2971, 3003, 3002, + 2971, 274, 308, 3003, + 2131, 2972, 3004, 2164, + 2972, 2973, 3005, 3004, + 2973, 2974, 3006, 3005, + 2974, 2975, 3007, 3006, + 2975, 2976, 3008, 3007, + 2976, 2977, 3009, 3008, + 2977, 2978, 3010, 3009, + 2978, 2979, 3011, 3010, + 2979, 2980, 3012, 3011, + 2980, 2981, 3013, 3012, + 2981, 2982, 3014, 3013, + 2982, 2983, 3015, 3014, + 2983, 2984, 3016, 3015, + 2984, 2985, 3017, 3016, + 2985, 2986, 3018, 3017, + 2986, 2987, 3019, 3018, + 2987, 2988, 3020, 3019, + 2988, 2989, 3021, 3020, + 2989, 2990, 3022, 3021, + 2990, 2991, 3023, 3022, + 2991, 2992, 3024, 3023, + 2992, 2993, 3025, 3024, + 2993, 2994, 3026, 3025, + 2994, 2995, 3027, 3026, + 2995, 2996, 3028, 3027, + 2996, 2997, 3029, 3028, + 2997, 2998, 3030, 3029, + 2998, 2999, 3031, 3030, + 2999, 3000, 3032, 3031, + 3000, 3001, 3033, 3032, + 3001, 3002, 3034, 3033, + 3002, 3003, 3035, 3034, + 3003, 308, 342, 3035, + 2164, 3004, 3036, 2197, + 3004, 3005, 3037, 3036, + 3005, 3006, 3038, 3037, + 3006, 3007, 3039, 3038, + 3007, 3008, 3040, 3039, + 3008, 3009, 3041, 3040, + 3009, 3010, 3042, 3041, + 3010, 3011, 3043, 3042, + 3011, 3012, 3044, 3043, + 3012, 3013, 3045, 3044, + 3013, 3014, 3046, 3045, + 3014, 3015, 3047, 3046, + 3015, 3016, 3048, 3047, + 3016, 3017, 3049, 3048, + 3017, 3018, 3050, 3049, + 3018, 3019, 3051, 3050, + 3019, 3020, 3052, 3051, + 3020, 3021, 3053, 3052, + 3021, 3022, 3054, 3053, + 3022, 3023, 3055, 3054, + 3023, 3024, 3056, 3055, + 3024, 3025, 3057, 3056, + 3025, 3026, 3058, 3057, + 3026, 3027, 3059, 3058, + 3027, 3028, 3060, 3059, + 3028, 3029, 3061, 3060, + 3029, 3030, 3062, 3061, + 3030, 3031, 3063, 3062, + 3031, 3032, 3064, 3063, + 3032, 3033, 3065, 3064, + 3033, 3034, 3066, 3065, + 3034, 3035, 3067, 3066, + 3035, 342, 376, 3067, + 2197, 3036, 3068, 2230, + 3036, 3037, 3069, 3068, + 3037, 3038, 3070, 3069, + 3038, 3039, 3071, 3070, + 3039, 3040, 3072, 3071, + 3040, 3041, 3073, 3072, + 3041, 3042, 3074, 3073, + 3042, 3043, 3075, 3074, + 3043, 3044, 3076, 3075, + 3044, 3045, 3077, 3076, + 3045, 3046, 3078, 3077, + 3046, 3047, 3079, 3078, + 3047, 3048, 3080, 3079, + 3048, 3049, 3081, 3080, + 3049, 3050, 3082, 3081, + 3050, 3051, 3083, 3082, + 3051, 3052, 3084, 3083, + 3052, 3053, 3085, 3084, + 3053, 3054, 3086, 3085, + 3054, 3055, 3087, 3086, + 3055, 3056, 3088, 3087, + 3056, 3057, 3089, 3088, + 3057, 3058, 3090, 3089, + 3058, 3059, 3091, 3090, + 3059, 3060, 3092, 3091, + 3060, 3061, 3093, 3092, + 3061, 3062, 3094, 3093, + 3062, 3063, 3095, 3094, + 3063, 3064, 3096, 3095, + 3064, 3065, 3097, 3096, + 3065, 3066, 3098, 3097, + 3066, 3067, 3099, 3098, + 3067, 376, 410, 3099, + 2230, 3068, 3100, 2263, + 3068, 3069, 3101, 3100, + 3069, 3070, 3102, 3101, + 3070, 3071, 3103, 3102, + 3071, 3072, 3104, 3103, + 3072, 3073, 3105, 3104, + 3073, 3074, 3106, 3105, + 3074, 3075, 3107, 3106, + 3075, 3076, 3108, 3107, + 3076, 3077, 3109, 3108, + 3077, 3078, 3110, 3109, + 3078, 3079, 3111, 3110, + 3079, 3080, 3112, 3111, + 3080, 3081, 3113, 3112, + 3081, 3082, 3114, 3113, + 3082, 3083, 3115, 3114, + 3083, 3084, 3116, 3115, + 3084, 3085, 3117, 3116, + 3085, 3086, 3118, 3117, + 3086, 3087, 3119, 3118, + 3087, 3088, 3120, 3119, + 3088, 3089, 3121, 3120, + 3089, 3090, 3122, 3121, + 3090, 3091, 3123, 3122, + 3091, 3092, 3124, 3123, + 3092, 3093, 3125, 3124, + 3093, 3094, 3126, 3125, + 3094, 3095, 3127, 3126, + 3095, 3096, 3128, 3127, + 3096, 3097, 3129, 3128, + 3097, 3098, 3130, 3129, + 3098, 3099, 3131, 3130, + 3099, 410, 444, 3131, + 2263, 3100, 3132, 2296, + 3100, 3101, 3133, 3132, + 3101, 3102, 3134, 3133, + 3102, 3103, 3135, 3134, + 3103, 3104, 3136, 3135, + 3104, 3105, 3137, 3136, + 3105, 3106, 3138, 3137, + 3106, 3107, 3139, 3138, + 3107, 3108, 3140, 3139, + 3108, 3109, 3141, 3140, + 3109, 3110, 3142, 3141, + 3110, 3111, 3143, 3142, + 3111, 3112, 3144, 3143, + 3112, 3113, 3145, 3144, + 3113, 3114, 3146, 3145, + 3114, 3115, 3147, 3146, + 3115, 3116, 3148, 3147, + 3116, 3117, 3149, 3148, + 3117, 3118, 3150, 3149, + 3118, 3119, 3151, 3150, + 3119, 3120, 3152, 3151, + 3120, 3121, 3153, 3152, + 3121, 3122, 3154, 3153, + 3122, 3123, 3155, 3154, + 3123, 3124, 3156, 3155, + 3124, 3125, 3157, 3156, + 3125, 3126, 3158, 3157, + 3126, 3127, 3159, 3158, + 3127, 3128, 3160, 3159, + 3128, 3129, 3161, 3160, + 3129, 3130, 3162, 3161, + 3130, 3131, 3163, 3162, + 3131, 444, 478, 3163, + 2296, 3132, 3164, 2329, + 3132, 3133, 3165, 3164, + 3133, 3134, 3166, 3165, + 3134, 3135, 3167, 3166, + 3135, 3136, 3168, 3167, + 3136, 3137, 3169, 3168, + 3137, 3138, 3170, 3169, + 3138, 3139, 3171, 3170, + 3139, 3140, 3172, 3171, + 3140, 3141, 3173, 3172, + 3141, 3142, 3174, 3173, + 3142, 3143, 3175, 3174, + 3143, 3144, 3176, 3175, + 3144, 3145, 3177, 3176, + 3145, 3146, 3178, 3177, + 3146, 3147, 3179, 3178, + 3147, 3148, 3180, 3179, + 3148, 3149, 3181, 3180, + 3149, 3150, 3182, 3181, + 3150, 3151, 3183, 3182, + 3151, 3152, 3184, 3183, + 3152, 3153, 3185, 3184, + 3153, 3154, 3186, 3185, + 3154, 3155, 3187, 3186, + 3155, 3156, 3188, 3187, + 3156, 3157, 3189, 3188, + 3157, 3158, 3190, 3189, + 3158, 3159, 3191, 3190, + 3159, 3160, 3192, 3191, + 3160, 3161, 3193, 3192, + 3161, 3162, 3194, 3193, + 3162, 3163, 3195, 3194, + 3163, 478, 512, 3195, + 2329, 3164, 3196, 2362, + 3164, 3165, 3197, 3196, + 3165, 3166, 3198, 3197, + 3166, 3167, 3199, 3198, + 3167, 3168, 3200, 3199, + 3168, 3169, 3201, 3200, + 3169, 3170, 3202, 3201, + 3170, 3171, 3203, 3202, + 3171, 3172, 3204, 3203, + 3172, 3173, 3205, 3204, + 3173, 3174, 3206, 3205, + 3174, 3175, 3207, 3206, + 3175, 3176, 3208, 3207, + 3176, 3177, 3209, 3208, + 3177, 3178, 3210, 3209, + 3178, 3179, 3211, 3210, + 3179, 3180, 3212, 3211, + 3180, 3181, 3213, 3212, + 3181, 3182, 3214, 3213, + 3182, 3183, 3215, 3214, + 3183, 3184, 3216, 3215, + 3184, 3185, 3217, 3216, + 3185, 3186, 3218, 3217, + 3186, 3187, 3219, 3218, + 3187, 3188, 3220, 3219, + 3188, 3189, 3221, 3220, + 3189, 3190, 3222, 3221, + 3190, 3191, 3223, 3222, + 3191, 3192, 3224, 3223, + 3192, 3193, 3225, 3224, + 3193, 3194, 3226, 3225, + 3194, 3195, 3227, 3226, + 3195, 512, 546, 3227, + 2362, 3196, 3228, 2395, + 3196, 3197, 3229, 3228, + 3197, 3198, 3230, 3229, + 3198, 3199, 3231, 3230, + 3199, 3200, 3232, 3231, + 3200, 3201, 3233, 3232, + 3201, 3202, 3234, 3233, + 3202, 3203, 3235, 3234, + 3203, 3204, 3236, 3235, + 3204, 3205, 3237, 3236, + 3205, 3206, 3238, 3237, + 3206, 3207, 3239, 3238, + 3207, 3208, 3240, 3239, + 3208, 3209, 3241, 3240, + 3209, 3210, 3242, 3241, + 3210, 3211, 3243, 3242, + 3211, 3212, 3244, 3243, + 3212, 3213, 3245, 3244, + 3213, 3214, 3246, 3245, + 3214, 3215, 3247, 3246, + 3215, 3216, 3248, 3247, + 3216, 3217, 3249, 3248, + 3217, 3218, 3250, 3249, + 3218, 3219, 3251, 3250, + 3219, 3220, 3252, 3251, + 3220, 3221, 3253, 3252, + 3221, 3222, 3254, 3253, + 3222, 3223, 3255, 3254, + 3223, 3224, 3256, 3255, + 3224, 3225, 3257, 3256, + 3225, 3226, 3258, 3257, + 3226, 3227, 3259, 3258, + 3227, 546, 580, 3259, + 2395, 3228, 3260, 2428, + 3228, 3229, 3261, 3260, + 3229, 3230, 3262, 3261, + 3230, 3231, 3263, 3262, + 3231, 3232, 3264, 3263, + 3232, 3233, 3265, 3264, + 3233, 3234, 3266, 3265, + 3234, 3235, 3267, 3266, + 3235, 3236, 3268, 3267, + 3236, 3237, 3269, 3268, + 3237, 3238, 3270, 3269, + 3238, 3239, 3271, 3270, + 3239, 3240, 3272, 3271, + 3240, 3241, 3273, 3272, + 3241, 3242, 3274, 3273, + 3242, 3243, 3275, 3274, + 3243, 3244, 3276, 3275, + 3244, 3245, 3277, 3276, + 3245, 3246, 3278, 3277, + 3246, 3247, 3279, 3278, + 3247, 3248, 3280, 3279, + 3248, 3249, 3281, 3280, + 3249, 3250, 3282, 3281, + 3250, 3251, 3283, 3282, + 3251, 3252, 3284, 3283, + 3252, 3253, 3285, 3284, + 3253, 3254, 3286, 3285, + 3254, 3255, 3287, 3286, + 3255, 3256, 3288, 3287, + 3256, 3257, 3289, 3288, + 3257, 3258, 3290, 3289, + 3258, 3259, 3291, 3290, + 3259, 580, 614, 3291, + 3276, 3277, 3292, 3275, + 3277, 3278, 3293, 3292, + 3278, 3279, 3294, 3293, + 3279, 3280, 3295, 3294, + 3280, 3281, 3296, 3295, + 3281, 3282, 3297, 3296, + 3282, 3283, 3298, 3297, + 3283, 3284, 3299, 3298, + 3284, 3285, 3300, 3299, + 3285, 3286, 3301, 3300, + 3286, 3287, 3302, 3301, + 3287, 3288, 3303, 3302, + 3288, 3289, 3304, 3303, + 3289, 3290, 3305, 3304, + 3290, 3291, 3306, 3305, + 3291, 614, 902, 3306, + 3275, 3292, 3307, 3274, + 3292, 3293, 3308, 3307, + 3293, 3294, 3309, 3308, + 3294, 3295, 3310, 3309, + 3295, 3296, 3311, 3310, + 3296, 3297, 3312, 3311, + 3297, 3298, 3313, 3312, + 3298, 3299, 3314, 3313, + 3299, 3300, 3315, 3314, + 3300, 3301, 3316, 3315, + 3301, 3302, 3317, 3316, + 3302, 3303, 3318, 3317, + 3303, 3304, 3319, 3318, + 3304, 3305, 3320, 3319, + 3305, 3306, 3321, 3320, + 3306, 902, 903, 3321, + 3274, 3307, 3322, 3273, + 3307, 3308, 3323, 3322, + 3308, 3309, 3324, 3323, + 3309, 3310, 3325, 3324, + 3310, 3311, 3326, 3325, + 3311, 3312, 3327, 3326, + 3312, 3313, 3328, 3327, + 3313, 3314, 3329, 3328, + 3314, 3315, 3330, 3329, + 3315, 3316, 3331, 3330, + 3316, 3317, 3332, 3331, + 3317, 3318, 3333, 3332, + 3318, 3319, 3334, 3333, + 3319, 3320, 3335, 3334, + 3320, 3321, 3336, 3335, + 3321, 903, 904, 3336, + 3273, 3322, 3337, 3272, + 3322, 3323, 3338, 3337, + 3323, 3324, 3339, 3338, + 3324, 3325, 3340, 3339, + 3325, 3326, 3341, 3340, + 3326, 3327, 3342, 3341, + 3327, 3328, 3343, 3342, + 3328, 3329, 3344, 3343, + 3329, 3330, 3345, 3344, + 3330, 3331, 3346, 3345, + 3331, 3332, 3347, 3346, + 3332, 3333, 3348, 3347, + 3333, 3334, 3349, 3348, + 3334, 3335, 3350, 3349, + 3335, 3336, 3351, 3350, + 3336, 904, 905, 3351, + 3272, 3337, 3352, 3271, + 3337, 3338, 3353, 3352, + 3338, 3339, 3354, 3353, + 3339, 3340, 3355, 3354, + 3340, 3341, 3356, 3355, + 3341, 3342, 3357, 3356, + 3342, 3343, 3358, 3357, + 3343, 3344, 3359, 3358, + 3344, 3345, 3360, 3359, + 3345, 3346, 3361, 3360, + 3346, 3347, 3362, 3361, + 3347, 3348, 3363, 3362, + 3348, 3349, 3364, 3363, + 3349, 3350, 3365, 3364, + 3350, 3351, 3366, 3365, + 3351, 905, 906, 3366, + 3271, 3352, 3367, 3270, + 3352, 3353, 3368, 3367, + 3353, 3354, 3369, 3368, + 3354, 3355, 3370, 3369, + 3355, 3356, 3371, 3370, + 3356, 3357, 3372, 3371, + 3357, 3358, 3373, 3372, + 3358, 3359, 3374, 3373, + 3359, 3360, 3375, 3374, + 3360, 3361, 3376, 3375, + 3361, 3362, 3377, 3376, + 3362, 3363, 3378, 3377, + 3363, 3364, 3379, 3378, + 3364, 3365, 3380, 3379, + 3365, 3366, 3381, 3380, + 3366, 906, 907, 3381, + 3270, 3367, 3382, 3269, + 3367, 3368, 3383, 3382, + 3368, 3369, 3384, 3383, + 3369, 3370, 3385, 3384, + 3370, 3371, 3386, 3385, + 3371, 3372, 3387, 3386, + 3372, 3373, 3388, 3387, + 3373, 3374, 3389, 3388, + 3374, 3375, 3390, 3389, + 3375, 3376, 3391, 3390, + 3376, 3377, 3392, 3391, + 3377, 3378, 3393, 3392, + 3378, 3379, 3394, 3393, + 3379, 3380, 3395, 3394, + 3380, 3381, 3396, 3395, + 3381, 907, 908, 3396, + 3269, 3382, 3397, 3268, + 3382, 3383, 3398, 3397, + 3383, 3384, 3399, 3398, + 3384, 3385, 3400, 3399, + 3385, 3386, 3401, 3400, + 3386, 3387, 3402, 3401, + 3387, 3388, 3403, 3402, + 3388, 3389, 3404, 3403, + 3389, 3390, 3405, 3404, + 3390, 3391, 3406, 3405, + 3391, 3392, 3407, 3406, + 3392, 3393, 3408, 3407, + 3393, 3394, 3409, 3408, + 3394, 3395, 3410, 3409, + 3395, 3396, 3411, 3410, + 3396, 908, 909, 3411, + 3268, 3397, 3412, 3267, + 3397, 3398, 3413, 3412, + 3398, 3399, 3414, 3413, + 3399, 3400, 3415, 3414, + 3400, 3401, 3416, 3415, + 3401, 3402, 3417, 3416, + 3402, 3403, 3418, 3417, + 3403, 3404, 3419, 3418, + 3404, 3405, 3420, 3419, + 3405, 3406, 3421, 3420, + 3406, 3407, 3422, 3421, + 3407, 3408, 3423, 3422, + 3408, 3409, 3424, 3423, + 3409, 3410, 3425, 3424, + 3410, 3411, 3426, 3425, + 3411, 909, 910, 3426, + 3267, 3412, 3427, 3266, + 3412, 3413, 3428, 3427, + 3413, 3414, 3429, 3428, + 3414, 3415, 3430, 3429, + 3415, 3416, 3431, 3430, + 3416, 3417, 3432, 3431, + 3417, 3418, 3433, 3432, + 3418, 3419, 3434, 3433, + 3419, 3420, 3435, 3434, + 3420, 3421, 3436, 3435, + 3421, 3422, 3437, 3436, + 3422, 3423, 3438, 3437, + 3423, 3424, 3439, 3438, + 3424, 3425, 3440, 3439, + 3425, 3426, 3441, 3440, + 3426, 910, 911, 3441, + 3266, 3427, 3442, 3265, + 3427, 3428, 3443, 3442, + 3428, 3429, 3444, 3443, + 3429, 3430, 3445, 3444, + 3430, 3431, 3446, 3445, + 3431, 3432, 3447, 3446, + 3432, 3433, 3448, 3447, + 3433, 3434, 3449, 3448, + 3434, 3435, 3450, 3449, + 3435, 3436, 3451, 3450, + 3436, 3437, 3452, 3451, + 3437, 3438, 3453, 3452, + 3438, 3439, 3454, 3453, + 3439, 3440, 3455, 3454, + 3440, 3441, 3456, 3455, + 3441, 911, 912, 3456, + 3265, 3442, 3457, 3264, + 3442, 3443, 3458, 3457, + 3443, 3444, 3459, 3458, + 3444, 3445, 3460, 3459, + 3445, 3446, 3461, 3460, + 3446, 3447, 3462, 3461, + 3447, 3448, 3463, 3462, + 3448, 3449, 3464, 3463, + 3449, 3450, 3465, 3464, + 3450, 3451, 3466, 3465, + 3451, 3452, 3467, 3466, + 3452, 3453, 3468, 3467, + 3453, 3454, 3469, 3468, + 3454, 3455, 3470, 3469, + 3455, 3456, 3471, 3470, + 3456, 912, 913, 3471, + 3264, 3457, 3472, 3263, + 3457, 3458, 3473, 3472, + 3458, 3459, 3474, 3473, + 3459, 3460, 3475, 3474, + 3460, 3461, 3476, 3475, + 3461, 3462, 3477, 3476, + 3462, 3463, 3478, 3477, + 3463, 3464, 3479, 3478, + 3464, 3465, 3480, 3479, + 3465, 3466, 3481, 3480, + 3466, 3467, 3482, 3481, + 3467, 3468, 3483, 3482, + 3468, 3469, 3484, 3483, + 3469, 3470, 3485, 3484, + 3470, 3471, 3486, 3485, + 3471, 913, 914, 3486, + 3263, 3472, 3487, 3262, + 3472, 3473, 3488, 3487, + 3473, 3474, 3489, 3488, + 3474, 3475, 3490, 3489, + 3475, 3476, 3491, 3490, + 3476, 3477, 3492, 3491, + 3477, 3478, 3493, 3492, + 3478, 3479, 3494, 3493, + 3479, 3480, 3495, 3494, + 3480, 3481, 3496, 3495, + 3481, 3482, 3497, 3496, + 3482, 3483, 3498, 3497, + 3483, 3484, 3499, 3498, + 3484, 3485, 3500, 3499, + 3485, 3486, 3501, 3500, + 3486, 914, 915, 3501, + 3262, 3487, 3502, 3261, + 3487, 3488, 3503, 3502, + 3488, 3489, 3504, 3503, + 3489, 3490, 3505, 3504, + 3490, 3491, 3506, 3505, + 3491, 3492, 3507, 3506, + 3492, 3493, 3508, 3507, + 3493, 3494, 3509, 3508, + 3494, 3495, 3510, 3509, + 3495, 3496, 3511, 3510, + 3496, 3497, 3512, 3511, + 3497, 3498, 3513, 3512, + 3498, 3499, 3514, 3513, + 3499, 3500, 3515, 3514, + 3500, 3501, 3516, 3515, + 3501, 915, 916, 3516, + 3261, 3502, 3517, 3260, + 3502, 3503, 3518, 3517, + 3503, 3504, 3519, 3518, + 3504, 3505, 3520, 3519, + 3505, 3506, 3521, 3520, + 3506, 3507, 3522, 3521, + 3507, 3508, 3523, 3522, + 3508, 3509, 3524, 3523, + 3509, 3510, 3525, 3524, + 3510, 3511, 3526, 3525, + 3511, 3512, 3527, 3526, + 3512, 3513, 3528, 3527, + 3513, 3514, 3529, 3528, + 3514, 3515, 3530, 3529, + 3515, 3516, 3531, 3530, + 3516, 916, 917, 3531, + 3260, 3517, 2445, 2428, + 3517, 3518, 2462, 2445, + 3518, 3519, 2479, 2462, + 3519, 3520, 2496, 2479, + 3520, 3521, 2513, 2496, + 3521, 3522, 2530, 2513, + 3522, 3523, 2547, 2530, + 3523, 3524, 2564, 2547, + 3524, 3525, 2581, 2564, + 3525, 3526, 2598, 2581, + 3526, 3527, 2615, 2598, + 3527, 3528, 2632, 2615, + 3528, 3529, 2649, 2632, + 3529, 3530, 2666, 2649, + 3530, 3531, 2683, 2666, + 3531, 917, 918, 2683, + 1, 2746, 3532, 3533, + 3533, 3532, 3534, 3535, + 3535, 3534, 3536, 3537, + 3537, 3536, 3538, 3539, + 3539, 3538, 3540, 3541, + 2746, 2744, 3542, 3532, + 3532, 3542, 3543, 3534, + 3534, 3543, 3544, 3536, + 3536, 3544, 3545, 3538, + 3538, 3545, 3546, 3540, + 2744, 2742, 3547, 3542, + 3542, 3547, 3548, 3543, + 3543, 3548, 3549, 3544, + 3544, 3549, 3550, 3545, + 3545, 3550, 3551, 3546, + 2742, 2740, 3552, 3547, + 3547, 3552, 3553, 3548, + 3548, 3553, 3554, 3549, + 3549, 3554, 3555, 3550, + 3550, 3555, 3556, 3551, + 2740, 2738, 3557, 3552, + 3552, 3557, 3558, 3553, + 3553, 3558, 3559, 3554, + 3554, 3559, 3560, 3555, + 3555, 3560, 3561, 3556, + 2738, 2736, 3562, 3557, + 3557, 3562, 3563, 3558, + 3558, 3563, 3564, 3559, + 3559, 3564, 3565, 3560, + 3560, 3565, 3566, 3561, + 2736, 2734, 3567, 3562, + 3562, 3567, 3568, 3563, + 3563, 3568, 3569, 3564, + 3564, 3569, 3570, 3565, + 3565, 3570, 3571, 3566, + 2734, 2732, 3572, 3567, + 3567, 3572, 3573, 3568, + 3568, 3573, 3574, 3569, + 3569, 3574, 3575, 3570, + 3570, 3575, 3576, 3571, + 2732, 2730, 3577, 3572, + 3572, 3577, 3578, 3573, + 3573, 3578, 3579, 3574, + 3574, 3579, 3580, 3575, + 3575, 3580, 3581, 3576, + 2730, 2728, 3582, 3577, + 3577, 3582, 3583, 3578, + 3578, 3583, 3584, 3579, + 3579, 3584, 3585, 3580, + 3580, 3585, 3586, 3581, + 2728, 2726, 3587, 3582, + 3582, 3587, 3588, 3583, + 3583, 3588, 3589, 3584, + 3584, 3589, 3590, 3585, + 3585, 3590, 3591, 3586, + 2726, 2724, 3592, 3587, + 3587, 3592, 3593, 3588, + 3588, 3593, 3594, 3589, + 3589, 3594, 3595, 3590, + 3590, 3595, 3596, 3591, + 2724, 2722, 3597, 3592, + 3592, 3597, 3598, 3593, + 3593, 3598, 3599, 3594, + 3594, 3599, 3600, 3595, + 3595, 3600, 3601, 3596, + 2722, 2720, 3602, 3597, + 3597, 3602, 3603, 3598, + 3598, 3603, 3604, 3599, + 3599, 3604, 3605, 3600, + 3600, 3605, 3606, 3601, + 2720, 2718, 3607, 3602, + 3602, 3607, 3608, 3603, + 3603, 3608, 3609, 3604, + 3604, 3609, 3610, 3605, + 3605, 3610, 3611, 3606, + 2718, 2716, 3612, 3607, + 3607, 3612, 3613, 3608, + 3608, 3613, 3614, 3609, + 3609, 3614, 3615, 3610, + 3610, 3615, 3616, 3611, + 2716, 2714, 3617, 3612, + 3612, 3617, 3618, 3613, + 3613, 3618, 3619, 3614, + 3614, 3619, 3620, 3615, + 3615, 3620, 3621, 3616, + 2714, 2712, 3622, 3617, + 3617, 3622, 3623, 3618, + 3618, 3623, 3624, 3619, + 3619, 3624, 3625, 3620, + 3620, 3625, 3626, 3621, + 2712, 2710, 3627, 3622, + 3622, 3627, 3628, 3623, + 3623, 3628, 3629, 3624, + 3624, 3629, 3630, 3625, + 3625, 3630, 3631, 3626, + 2710, 2708, 3632, 3627, + 3627, 3632, 3633, 3628, + 3628, 3633, 3634, 3629, + 3629, 3634, 3635, 3630, + 3630, 3635, 3636, 3631, + 2708, 2706, 3637, 3632, + 3632, 3637, 3638, 3633, + 3633, 3638, 3639, 3634, + 3634, 3639, 3640, 3635, + 3635, 3640, 3641, 3636, + 2706, 2704, 3642, 3637, + 3637, 3642, 3643, 3638, + 3638, 3643, 3644, 3639, + 3639, 3644, 3645, 3640, + 3640, 3645, 3646, 3641, + 2704, 2702, 3647, 3642, + 3642, 3647, 3648, 3643, + 3643, 3648, 3649, 3644, + 3644, 3649, 3650, 3645, + 3645, 3650, 3651, 3646, + 2702, 2700, 3652, 3647, + 3647, 3652, 3653, 3648, + 3648, 3653, 3654, 3649, + 3649, 3654, 3655, 3650, + 3650, 3655, 3656, 3651, + 2700, 2698, 3657, 3652, + 3652, 3657, 3658, 3653, + 3653, 3658, 3659, 3654, + 3654, 3659, 3660, 3655, + 3655, 3660, 3661, 3656, + 2698, 2696, 3662, 3657, + 3657, 3662, 3663, 3658, + 3658, 3663, 3664, 3659, + 3659, 3664, 3665, 3660, + 3660, 3665, 3666, 3661, + 2696, 2694, 3667, 3662, + 3662, 3667, 3668, 3663, + 3663, 3668, 3669, 3664, + 3664, 3669, 3670, 3665, + 3665, 3670, 3671, 3666, + 2694, 2692, 3672, 3667, + 3667, 3672, 3673, 3668, + 3668, 3673, 3674, 3669, + 3669, 3674, 3675, 3670, + 3670, 3675, 3676, 3671, + 2692, 2690, 3677, 3672, + 3672, 3677, 3678, 3673, + 3673, 3678, 3679, 3674, + 3674, 3679, 3680, 3675, + 3675, 3680, 3681, 3676, + 2690, 2688, 3682, 3677, + 3677, 3682, 3683, 3678, + 3678, 3683, 3684, 3679, + 3679, 3684, 3685, 3680, + 3680, 3685, 3686, 3681, + 2688, 2686, 3687, 3682, + 3682, 3687, 3688, 3683, + 3683, 3688, 3689, 3684, + 3684, 3689, 3690, 3685, + 3685, 3690, 3691, 3686, + 2686, 2684, 3692, 3687, + 3687, 3692, 3693, 3688, + 3688, 3693, 3694, 3689, + 3689, 3694, 3695, 3690, + 3690, 3695, 3696, 3691, + 2684, 1866, 3697, 3692, + 3692, 3697, 3698, 3693, + 3693, 3698, 3699, 3694, + 3694, 3699, 3700, 3695, + 3695, 3700, 3701, 3696, + 1866, 1864, 3702, 3697, + 3697, 3702, 3703, 3698, + 3698, 3703, 3704, 3699, + 3699, 3704, 3705, 3700, + 3700, 3705, 3706, 3701, + 1864, 1862, 3707, 3702, + 3702, 3707, 3708, 3703, + 3703, 3708, 3709, 3704, + 3704, 3709, 3710, 3705, + 3705, 3710, 3711, 3706, + 1862, 1860, 3712, 3707, + 3707, 3712, 3713, 3708, + 3708, 3713, 3714, 3709, + 3709, 3714, 3715, 3710, + 3710, 3715, 3716, 3711, + 1860, 1858, 3717, 3712, + 3712, 3717, 3718, 3713, + 3713, 3718, 3719, 3714, + 3714, 3719, 3720, 3715, + 3715, 3720, 3721, 3716, + 1858, 1856, 3722, 3717, + 3717, 3722, 3723, 3718, + 3718, 3723, 3724, 3719, + 3719, 3724, 3725, 3720, + 3720, 3725, 3726, 3721, + 1856, 1854, 3727, 3722, + 3722, 3727, 3728, 3723, + 3723, 3728, 3729, 3724, + 3724, 3729, 3730, 3725, + 3725, 3730, 3731, 3726, + 1854, 1852, 3732, 3727, + 3727, 3732, 3733, 3728, + 3728, 3733, 3734, 3729, + 3729, 3734, 3735, 3730, + 3730, 3735, 3736, 3731, + 1852, 1850, 3737, 3732, + 3732, 3737, 3738, 3733, + 3733, 3738, 3739, 3734, + 3734, 3739, 3740, 3735, + 3735, 3740, 3741, 3736, + 1850, 1848, 3742, 3737, + 3737, 3742, 3743, 3738, + 3738, 3743, 3744, 3739, + 3739, 3744, 3745, 3740, + 3740, 3745, 3746, 3741, + 1848, 1846, 3747, 3742, + 3742, 3747, 3748, 3743, + 3743, 3748, 3749, 3744, + 3744, 3749, 3750, 3745, + 3745, 3750, 3751, 3746, + 1846, 1844, 3752, 3747, + 3747, 3752, 3753, 3748, + 3748, 3753, 3754, 3749, + 3749, 3754, 3755, 3750, + 3750, 3755, 3756, 3751, + 1844, 1842, 3757, 3752, + 3752, 3757, 3758, 3753, + 3753, 3758, 3759, 3754, + 3754, 3759, 3760, 3755, + 3755, 3760, 3761, 3756, + 1842, 1840, 3762, 3757, + 3757, 3762, 3763, 3758, + 3758, 3763, 3764, 3759, + 3759, 3764, 3765, 3760, + 3760, 3765, 3766, 3761, + 1840, 1838, 3767, 3762, + 3762, 3767, 3768, 3763, + 3763, 3768, 3769, 3764, + 3764, 3769, 3770, 3765, + 3765, 3770, 3771, 3766, + 1838, 1836, 3772, 3767, + 3767, 3772, 3773, 3768, + 3768, 3773, 3774, 3769, + 3769, 3774, 3775, 3770, + 3770, 3775, 3776, 3771, + 1836, 1834, 3777, 3772, + 3772, 3777, 3778, 3773, + 3773, 3778, 3779, 3774, + 3774, 3779, 3780, 3775, + 3775, 3780, 3781, 3776, + 1834, 1832, 3782, 3777, + 3777, 3782, 3783, 3778, + 3778, 3783, 3784, 3779, + 3779, 3784, 3785, 3780, + 3780, 3785, 3786, 3781, + 1832, 1830, 3787, 3782, + 3782, 3787, 3788, 3783, + 3783, 3788, 3789, 3784, + 3784, 3789, 3790, 3785, + 3785, 3790, 3791, 3786, + 1830, 1828, 3792, 3787, + 3787, 3792, 3793, 3788, + 3788, 3793, 3794, 3789, + 3789, 3794, 3795, 3790, + 3790, 3795, 3796, 3791, + 1828, 1826, 3797, 3792, + 3792, 3797, 3798, 3793, + 3793, 3798, 3799, 3794, + 3794, 3799, 3800, 3795, + 3795, 3800, 3801, 3796, + 1826, 1824, 3802, 3797, + 3797, 3802, 3803, 3798, + 3798, 3803, 3804, 3799, + 3799, 3804, 3805, 3800, + 3800, 3805, 3806, 3801, + 1824, 1822, 3807, 3802, + 3802, 3807, 3808, 3803, + 3803, 3808, 3809, 3804, + 3804, 3809, 3810, 3805, + 3805, 3810, 3811, 3806, + 1822, 1820, 3812, 3807, + 3807, 3812, 3813, 3808, + 3808, 3813, 3814, 3809, + 3809, 3814, 3815, 3810, + 3810, 3815, 3816, 3811, + 1820, 1818, 3817, 3812, + 3812, 3817, 3818, 3813, + 3813, 3818, 3819, 3814, + 3814, 3819, 3820, 3815, + 3815, 3820, 3821, 3816, + 1818, 1816, 3822, 3817, + 3817, 3822, 3823, 3818, + 3818, 3823, 3824, 3819, + 3819, 3824, 3825, 3820, + 3820, 3825, 3826, 3821, + 1816, 1814, 3827, 3822, + 3822, 3827, 3828, 3823, + 3823, 3828, 3829, 3824, + 3824, 3829, 3830, 3825, + 3825, 3830, 3831, 3826, + 1814, 1812, 3832, 3827, + 3827, 3832, 3833, 3828, + 3828, 3833, 3834, 3829, + 3829, 3834, 3835, 3830, + 3830, 3835, 3836, 3831, + 1812, 1810, 3837, 3832, + 3832, 3837, 3838, 3833, + 3833, 3838, 3839, 3834, + 3834, 3839, 3840, 3835, + 3835, 3840, 3841, 3836, + 1810, 1808, 3842, 3837, + 3837, 3842, 3843, 3838, + 3838, 3843, 3844, 3839, + 3839, 3844, 3845, 3840, + 3840, 3845, 3846, 3841, + 1808, 1806, 3847, 3842, + 3842, 3847, 3848, 3843, + 3843, 3848, 3849, 3844, + 3844, 3849, 3850, 3845, + 3845, 3850, 3851, 3846, + 1806, 1804, 3852, 3847, + 3847, 3852, 3853, 3848, + 3848, 3853, 3854, 3849, + 3849, 3854, 3855, 3850, + 3850, 3855, 3856, 3851, + 1804, 1802, 3857, 3852, + 3852, 3857, 3858, 3853, + 3853, 3858, 3859, 3854, + 3854, 3859, 3860, 3855, + 3855, 3860, 3861, 3856, + 1802, 983, 3862, 3857, + 3857, 3862, 3863, 3858, + 3858, 3863, 3864, 3859, + 3859, 3864, 3865, 3860, + 3860, 3865, 3866, 3861, + 983, 981, 3867, 3862, + 3862, 3867, 3868, 3863, + 3863, 3868, 3869, 3864, + 3864, 3869, 3870, 3865, + 3865, 3870, 3871, 3866, + 981, 979, 3872, 3867, + 3867, 3872, 3873, 3868, + 3868, 3873, 3874, 3869, + 3869, 3874, 3875, 3870, + 3870, 3875, 3876, 3871, + 979, 977, 3877, 3872, + 3872, 3877, 3878, 3873, + 3873, 3878, 3879, 3874, + 3874, 3879, 3880, 3875, + 3875, 3880, 3881, 3876, + 977, 975, 3882, 3877, + 3877, 3882, 3883, 3878, + 3878, 3883, 3884, 3879, + 3879, 3884, 3885, 3880, + 3880, 3885, 3886, 3881, + 975, 973, 3887, 3882, + 3882, 3887, 3888, 3883, + 3883, 3888, 3889, 3884, + 3884, 3889, 3890, 3885, + 3885, 3890, 3891, 3886, + 973, 971, 3892, 3887, + 3887, 3892, 3893, 3888, + 3888, 3893, 3894, 3889, + 3889, 3894, 3895, 3890, + 3890, 3895, 3896, 3891, + 971, 969, 3897, 3892, + 3892, 3897, 3898, 3893, + 3893, 3898, 3899, 3894, + 3894, 3899, 3900, 3895, + 3895, 3900, 3901, 3896, + 969, 967, 3902, 3897, + 3897, 3902, 3903, 3898, + 3898, 3903, 3904, 3899, + 3899, 3904, 3905, 3900, + 3900, 3905, 3906, 3901, + 967, 965, 3907, 3902, + 3902, 3907, 3908, 3903, + 3903, 3908, 3909, 3904, + 3904, 3909, 3910, 3905, + 3905, 3910, 3911, 3906, + 965, 963, 3912, 3907, + 3907, 3912, 3913, 3908, + 3908, 3913, 3914, 3909, + 3909, 3914, 3915, 3910, + 3910, 3915, 3916, 3911, + 963, 961, 3917, 3912, + 3912, 3917, 3918, 3913, + 3913, 3918, 3919, 3914, + 3914, 3919, 3920, 3915, + 3915, 3920, 3921, 3916, + 961, 959, 3922, 3917, + 3917, 3922, 3923, 3918, + 3918, 3923, 3924, 3919, + 3919, 3924, 3925, 3920, + 3920, 3925, 3926, 3921, + 959, 957, 3927, 3922, + 3922, 3927, 3928, 3923, + 3923, 3928, 3929, 3924, + 3924, 3929, 3930, 3925, + 3925, 3930, 3931, 3926, + 957, 955, 3932, 3927, + 3927, 3932, 3933, 3928, + 3928, 3933, 3934, 3929, + 3929, 3934, 3935, 3930, + 3930, 3935, 3936, 3931, + 955, 953, 3937, 3932, + 3932, 3937, 3938, 3933, + 3933, 3938, 3939, 3934, + 3934, 3939, 3940, 3935, + 3935, 3940, 3941, 3936, + 953, 951, 3942, 3937, + 3937, 3942, 3943, 3938, + 3938, 3943, 3944, 3939, + 3939, 3944, 3945, 3940, + 3940, 3945, 3946, 3941, + 951, 949, 3947, 3942, + 3942, 3947, 3948, 3943, + 3943, 3948, 3949, 3944, + 3944, 3949, 3950, 3945, + 3945, 3950, 3951, 3946, + 949, 947, 3952, 3947, + 3947, 3952, 3953, 3948, + 3948, 3953, 3954, 3949, + 3949, 3954, 3955, 3950, + 3950, 3955, 3956, 3951, + 947, 945, 3957, 3952, + 3952, 3957, 3958, 3953, + 3953, 3958, 3959, 3954, + 3954, 3959, 3960, 3955, + 3955, 3960, 3961, 3956, + 945, 943, 3962, 3957, + 3957, 3962, 3963, 3958, + 3958, 3963, 3964, 3959, + 3959, 3964, 3965, 3960, + 3960, 3965, 3966, 3961, + 943, 941, 3967, 3962, + 3962, 3967, 3968, 3963, + 3963, 3968, 3969, 3964, + 3964, 3969, 3970, 3965, + 3965, 3970, 3971, 3966, + 941, 939, 3972, 3967, + 3967, 3972, 3973, 3968, + 3968, 3973, 3974, 3969, + 3969, 3974, 3975, 3970, + 3970, 3975, 3976, 3971, + 939, 937, 3977, 3972, + 3972, 3977, 3978, 3973, + 3973, 3978, 3979, 3974, + 3974, 3979, 3980, 3975, + 3975, 3980, 3981, 3976, + 937, 935, 3982, 3977, + 3977, 3982, 3983, 3978, + 3978, 3983, 3984, 3979, + 3979, 3984, 3985, 3980, + 3980, 3985, 3986, 3981, + 935, 933, 3987, 3982, + 3982, 3987, 3988, 3983, + 3983, 3988, 3989, 3984, + 3984, 3989, 3990, 3985, + 3985, 3990, 3991, 3986, + 933, 931, 3992, 3987, + 3987, 3992, 3993, 3988, + 3988, 3993, 3994, 3989, + 3989, 3994, 3995, 3990, + 3990, 3995, 3996, 3991, + 931, 929, 3997, 3992, + 3992, 3997, 3998, 3993, + 3993, 3998, 3999, 3994, + 3994, 3999, 4000, 3995, + 3995, 4000, 4001, 3996, + 929, 927, 4002, 3997, + 3997, 4002, 4003, 3998, + 3998, 4003, 4004, 3999, + 3999, 4004, 4005, 4000, + 4000, 4005, 4006, 4001, + 927, 925, 4007, 4002, + 4002, 4007, 4008, 4003, + 4003, 4008, 4009, 4004, + 4004, 4009, 4010, 4005, + 4005, 4010, 4011, 4006, + 925, 923, 4012, 4007, + 4007, 4012, 4013, 4008, + 4008, 4013, 4014, 4009, + 4009, 4014, 4015, 4010, + 4010, 4015, 4016, 4011, + 923, 921, 4017, 4012, + 4012, 4017, 4018, 4013, + 4013, 4018, 4019, 4014, + 4014, 4019, 4020, 4015, + 4015, 4020, 4021, 4016, + 921, 919, 4022, 4017, + 4017, 4022, 4023, 4018, + 4018, 4023, 4024, 4019, + 4019, 4024, 4025, 4020, + 4020, 4025, 4026, 4021, + 919, 67, 4027, 4022, + 4022, 4027, 4028, 4023, + 4023, 4028, 4029, 4024, + 4024, 4029, 4030, 4025, + 4025, 4030, 4031, 4026, + 67, 65, 4032, 4027, + 4027, 4032, 4033, 4028, + 4028, 4033, 4034, 4029, + 4029, 4034, 4035, 4030, + 4030, 4035, 4036, 4031, + 65, 63, 4037, 4032, + 4032, 4037, 4038, 4033, + 4033, 4038, 4039, 4034, + 4034, 4039, 4040, 4035, + 4035, 4040, 4041, 4036, + 63, 61, 4042, 4037, + 4037, 4042, 4043, 4038, + 4038, 4043, 4044, 4039, + 4039, 4044, 4045, 4040, + 4040, 4045, 4046, 4041, + 61, 59, 4047, 4042, + 4042, 4047, 4048, 4043, + 4043, 4048, 4049, 4044, + 4044, 4049, 4050, 4045, + 4045, 4050, 4051, 4046, + 59, 57, 4052, 4047, + 4047, 4052, 4053, 4048, + 4048, 4053, 4054, 4049, + 4049, 4054, 4055, 4050, + 4050, 4055, 4056, 4051, + 57, 55, 4057, 4052, + 4052, 4057, 4058, 4053, + 4053, 4058, 4059, 4054, + 4054, 4059, 4060, 4055, + 4055, 4060, 4061, 4056, + 55, 53, 4062, 4057, + 4057, 4062, 4063, 4058, + 4058, 4063, 4064, 4059, + 4059, 4064, 4065, 4060, + 4060, 4065, 4066, 4061, + 53, 51, 4067, 4062, + 4062, 4067, 4068, 4063, + 4063, 4068, 4069, 4064, + 4064, 4069, 4070, 4065, + 4065, 4070, 4071, 4066, + 51, 49, 4072, 4067, + 4067, 4072, 4073, 4068, + 4068, 4073, 4074, 4069, + 4069, 4074, 4075, 4070, + 4070, 4075, 4076, 4071, + 49, 47, 4077, 4072, + 4072, 4077, 4078, 4073, + 4073, 4078, 4079, 4074, + 4074, 4079, 4080, 4075, + 4075, 4080, 4081, 4076, + 47, 45, 4082, 4077, + 4077, 4082, 4083, 4078, + 4078, 4083, 4084, 4079, + 4079, 4084, 4085, 4080, + 4080, 4085, 4086, 4081, + 45, 43, 4087, 4082, + 4082, 4087, 4088, 4083, + 4083, 4088, 4089, 4084, + 4084, 4089, 4090, 4085, + 4085, 4090, 4091, 4086, + 43, 41, 4092, 4087, + 4087, 4092, 4093, 4088, + 4088, 4093, 4094, 4089, + 4089, 4094, 4095, 4090, + 4090, 4095, 4096, 4091, + 41, 39, 4097, 4092, + 4092, 4097, 4098, 4093, + 4093, 4098, 4099, 4094, + 4094, 4099, 4100, 4095, + 4095, 4100, 4101, 4096, + 39, 37, 4102, 4097, + 4097, 4102, 4103, 4098, + 4098, 4103, 4104, 4099, + 4099, 4104, 4105, 4100, + 4100, 4105, 4106, 4101, + 37, 35, 4107, 4102, + 4102, 4107, 4108, 4103, + 4103, 4108, 4109, 4104, + 4104, 4109, 4110, 4105, + 4105, 4110, 4111, 4106, + 35, 33, 4112, 4107, + 4107, 4112, 4113, 4108, + 4108, 4113, 4114, 4109, + 4109, 4114, 4115, 4110, + 4110, 4115, 4116, 4111, + 33, 31, 4117, 4112, + 4112, 4117, 4118, 4113, + 4113, 4118, 4119, 4114, + 4114, 4119, 4120, 4115, + 4115, 4120, 4121, 4116, + 31, 29, 4122, 4117, + 4117, 4122, 4123, 4118, + 4118, 4123, 4124, 4119, + 4119, 4124, 4125, 4120, + 4120, 4125, 4126, 4121, + 29, 27, 4127, 4122, + 4122, 4127, 4128, 4123, + 4123, 4128, 4129, 4124, + 4124, 4129, 4130, 4125, + 4125, 4130, 4131, 4126, + 27, 25, 4132, 4127, + 4127, 4132, 4133, 4128, + 4128, 4133, 4134, 4129, + 4129, 4134, 4135, 4130, + 4130, 4135, 4136, 4131, + 25, 23, 4137, 4132, + 4132, 4137, 4138, 4133, + 4133, 4138, 4139, 4134, + 4134, 4139, 4140, 4135, + 4135, 4140, 4141, 4136, + 23, 21, 4142, 4137, + 4137, 4142, 4143, 4138, + 4138, 4143, 4144, 4139, + 4139, 4144, 4145, 4140, + 4140, 4145, 4146, 4141, + 21, 19, 4147, 4142, + 4142, 4147, 4148, 4143, + 4143, 4148, 4149, 4144, + 4144, 4149, 4150, 4145, + 4145, 4150, 4151, 4146, + 19, 17, 4152, 4147, + 4147, 4152, 4153, 4148, + 4148, 4153, 4154, 4149, + 4149, 4154, 4155, 4150, + 4150, 4155, 4156, 4151, + 17, 15, 4157, 4152, + 4152, 4157, 4158, 4153, + 4153, 4158, 4159, 4154, + 4154, 4159, 4160, 4155, + 4155, 4160, 4161, 4156, + 15, 13, 4162, 4157, + 4157, 4162, 4163, 4158, + 4158, 4163, 4164, 4159, + 4159, 4164, 4165, 4160, + 4160, 4165, 4166, 4161, + 13, 11, 4167, 4162, + 4162, 4167, 4168, 4163, + 4163, 4168, 4169, 4164, + 4164, 4169, 4170, 4165, + 4165, 4170, 4171, 4166, + 11, 9, 4172, 4167, + 4167, 4172, 4173, 4168, + 4168, 4173, 4174, 4169, + 4169, 4174, 4175, 4170, + 4170, 4175, 4176, 4171, + 9, 7, 4177, 4172, + 4172, 4177, 4178, 4173, + 4173, 4178, 4179, 4174, + 4174, 4179, 4180, 4175, + 4175, 4180, 4181, 4176, + 7, 5, 4182, 4177, + 4177, 4182, 4183, 4178, + 4178, 4183, 4184, 4179, + 4179, 4184, 4185, 4180, + 4180, 4185, 4186, 4181, + 5, 2, 4187, 4182, + 4182, 4187, 4188, 4183, + 4183, 4188, 4189, 4184, + 4184, 4189, 4190, 4185, + 4185, 4190, 4191, 4186, + 2, 1, 3533, 4187, + 4187, 3533, 3535, 4188, + 4188, 3535, 3537, 4189, + 4189, 3537, 3539, 4190, + 4190, 3539, 3541, 4191, + 3541, 3540, 4192, 4193, + 3540, 3546, 4194, 4192, + 3546, 3551, 4195, 4194, + 3551, 3556, 4196, 4195, + 3556, 3561, 4197, 4196, + 3561, 3566, 4198, 4197, + 3566, 3571, 4199, 4198, + 3571, 3576, 4200, 4199, + 3576, 3581, 4201, 4200, + 3581, 3586, 4202, 4201, + 3586, 3591, 4203, 4202, + 3591, 3596, 4204, 4203, + 3596, 3601, 4205, 4204, + 3601, 3606, 4206, 4205, + 3606, 3611, 4207, 4206, + 3611, 3616, 4208, 4207, + 3616, 3621, 4209, 4208, + 3621, 3626, 4210, 4209, + 3626, 3631, 4211, 4210, + 3631, 3636, 4212, 4211, + 3636, 3641, 4213, 4212, + 3641, 3646, 4214, 4213, + 3646, 3651, 4215, 4214, + 3651, 3656, 4216, 4215, + 3656, 3661, 4217, 4216, + 3661, 3666, 4218, 4217, + 3666, 3671, 4219, 4218, + 3671, 3676, 4220, 4219, + 3676, 3681, 4221, 4220, + 3681, 3686, 4222, 4221, + 3686, 3691, 4223, 4222, + 3691, 3696, 4224, 4223, + 3696, 3701, 4225, 4224, + 3701, 3706, 4226, 4225, + 3706, 3711, 4227, 4226, + 3711, 3716, 4228, 4227, + 3716, 3721, 4229, 4228, + 3721, 3726, 4230, 4229, + 3726, 3731, 4231, 4230, + 3731, 3736, 4232, 4231, + 3736, 3741, 4233, 4232, + 3741, 3746, 4234, 4233, + 3746, 3751, 4235, 4234, + 3751, 3756, 4236, 4235, + 3756, 3761, 4237, 4236, + 3761, 3766, 4238, 4237, + 3766, 3771, 4239, 4238, + 3771, 3776, 4240, 4239, + 3776, 3781, 4241, 4240, + 3781, 3786, 4242, 4241, + 3786, 3791, 4243, 4242, + 3791, 3796, 4244, 4243, + 3796, 3801, 4245, 4244, + 3801, 3806, 4246, 4245, + 3806, 3811, 4247, 4246, + 3811, 3816, 4248, 4247, + 3816, 3821, 4249, 4248, + 3821, 3826, 4250, 4249, + 3826, 3831, 4251, 4250, + 3831, 3836, 4252, 4251, + 3836, 3841, 4253, 4252, + 3841, 3846, 4254, 4253, + 3846, 3851, 4255, 4254, + 3851, 3856, 4256, 4255, + 3856, 3861, 4257, 4256, + 3861, 3866, 4258, 4257, + 3866, 3871, 4259, 4258, + 3871, 3876, 4260, 4259, + 3876, 3881, 4261, 4260, + 3881, 3886, 4262, 4261, + 3886, 3891, 4263, 4262, + 3891, 3896, 4264, 4263, + 3896, 3901, 4265, 4264, + 3901, 3906, 4266, 4265, + 3906, 3911, 4267, 4266, + 3911, 3916, 4268, 4267, + 3916, 3921, 4269, 4268, + 3921, 3926, 4270, 4269, + 3926, 3931, 4271, 4270, + 3931, 3936, 4272, 4271, + 3936, 3941, 4273, 4272, + 3941, 3946, 4274, 4273, + 3946, 3951, 4275, 4274, + 3951, 3956, 4276, 4275, + 3956, 3961, 4277, 4276, + 3961, 3966, 4278, 4277, + 3966, 3971, 4279, 4278, + 3971, 3976, 4280, 4279, + 3976, 3981, 4281, 4280, + 3981, 3986, 4282, 4281, + 3986, 3991, 4283, 4282, + 3991, 3996, 4284, 4283, + 3996, 4001, 4285, 4284, + 4001, 4006, 4286, 4285, + 4006, 4011, 4287, 4286, + 4011, 4016, 4288, 4287, + 4016, 4021, 4289, 4288, + 4021, 4026, 4290, 4289, + 4026, 4031, 4291, 4290, + 4031, 4036, 4292, 4291, + 4036, 4041, 4293, 4292, + 4041, 4046, 4294, 4293, + 4046, 4051, 4295, 4294, + 4051, 4056, 4296, 4295, + 4056, 4061, 4297, 4296, + 4061, 4066, 4298, 4297, + 4066, 4071, 4299, 4298, + 4071, 4076, 4300, 4299, + 4076, 4081, 4301, 4300, + 4081, 4086, 4302, 4301, + 4086, 4091, 4303, 4302, + 4091, 4096, 4304, 4303, + 4096, 4101, 4305, 4304, + 4101, 4106, 4306, 4305, + 4106, 4111, 4307, 4306, + 4111, 4116, 4308, 4307, + 4116, 4121, 4309, 4308, + 4121, 4126, 4310, 4309, + 4126, 4131, 4311, 4310, + 4131, 4136, 4312, 4311, + 4136, 4141, 4313, 4312, + 4141, 4146, 4314, 4313, + 4146, 4151, 4315, 4314, + 4151, 4156, 4316, 4315, + 4156, 4161, 4317, 4316, + 4161, 4166, 4318, 4317, + 4166, 4171, 4319, 4318, + 4171, 4176, 4320, 4319, + 4176, 4181, 4321, 4320, + 4181, 4186, 4322, 4321, + 4186, 4191, 4323, 4322, + 4191, 3541, 4193, 4323, + 4193, 4192, 4324, 4325, + 4325, 4324, 4326, 4327, + 4327, 4326, 4328, 4329, + 4329, 4328, 4330, 4331, + 4331, 4330, 4332, 4333, + 4333, 4332, 4334, 4335, + 4335, 4334, 4336, 4337, + 4337, 4336, 4338, 4339, + 4339, 4338, 4340, 4341, + 4341, 4340, 4342, 4343, + 4343, 4342, 4344, 4345, + 4345, 4344, 4346, 4347, + 4347, 4346, 4348, 4349, + 4349, 4348, 4350, 4351, + 4351, 4350, 4352, 4353, + 4353, 4352, 4354, 4355, + 4355, 4354, 4356, 4357, + 4357, 4356, 4358, 4359, + 4359, 4358, 4360, 4361, + 4361, 4360, 4362, 4363, + 4363, 4362, 4364, 4365, + 4365, 4364, 4366, 4367, + 4367, 4366, 4368, 4369, + 4369, 4368, 4370, 4371, + 4192, 4194, 4372, 4324, + 4324, 4372, 4373, 4326, + 4326, 4373, 4374, 4328, + 4328, 4374, 4375, 4330, + 4330, 4375, 4376, 4332, + 4332, 4376, 4377, 4334, + 4334, 4377, 4378, 4336, + 4336, 4378, 4379, 4338, + 4338, 4379, 4380, 4340, + 4340, 4380, 4381, 4342, + 4342, 4381, 4382, 4344, + 4344, 4382, 4383, 4346, + 4346, 4383, 4384, 4348, + 4348, 4384, 4385, 4350, + 4350, 4385, 4386, 4352, + 4352, 4386, 4387, 4354, + 4354, 4387, 4388, 4356, + 4356, 4388, 4389, 4358, + 4358, 4389, 4390, 4360, + 4360, 4390, 4391, 4362, + 4362, 4391, 4392, 4364, + 4364, 4392, 4393, 4366, + 4366, 4393, 4394, 4368, + 4368, 4394, 4395, 4370, + 4194, 4195, 4396, 4372, + 4372, 4396, 4397, 4373, + 4373, 4397, 4398, 4374, + 4374, 4398, 4399, 4375, + 4375, 4399, 4400, 4376, + 4376, 4400, 4401, 4377, + 4377, 4401, 4402, 4378, + 4378, 4402, 4403, 4379, + 4379, 4403, 4404, 4380, + 4380, 4404, 4405, 4381, + 4381, 4405, 4406, 4382, + 4382, 4406, 4407, 4383, + 4383, 4407, 4408, 4384, + 4384, 4408, 4409, 4385, + 4385, 4409, 4410, 4386, + 4386, 4410, 4411, 4387, + 4387, 4411, 4412, 4388, + 4388, 4412, 4413, 4389, + 4389, 4413, 4414, 4390, + 4390, 4414, 4415, 4391, + 4391, 4415, 4416, 4392, + 4392, 4416, 4417, 4393, + 4393, 4417, 4418, 4394, + 4394, 4418, 4419, 4395, + 4195, 4196, 4420, 4396, + 4396, 4420, 4421, 4397, + 4397, 4421, 4422, 4398, + 4398, 4422, 4423, 4399, + 4399, 4423, 4424, 4400, + 4400, 4424, 4425, 4401, + 4401, 4425, 4426, 4402, + 4402, 4426, 4427, 4403, + 4403, 4427, 4428, 4404, + 4404, 4428, 4429, 4405, + 4405, 4429, 4430, 4406, + 4406, 4430, 4431, 4407, + 4407, 4431, 4432, 4408, + 4408, 4432, 4433, 4409, + 4409, 4433, 4434, 4410, + 4410, 4434, 4435, 4411, + 4411, 4435, 4436, 4412, + 4412, 4436, 4437, 4413, + 4413, 4437, 4438, 4414, + 4414, 4438, 4439, 4415, + 4415, 4439, 4440, 4416, + 4416, 4440, 4441, 4417, + 4417, 4441, 4442, 4418, + 4418, 4442, 4443, 4419, + 4196, 4197, 4444, 4420, + 4420, 4444, 4445, 4421, + 4421, 4445, 4446, 4422, + 4422, 4446, 4447, 4423, + 4423, 4447, 4448, 4424, + 4424, 4448, 4449, 4425, + 4425, 4449, 4450, 4426, + 4426, 4450, 4451, 4427, + 4427, 4451, 4452, 4428, + 4428, 4452, 4453, 4429, + 4429, 4453, 4454, 4430, + 4430, 4454, 4455, 4431, + 4431, 4455, 4456, 4432, + 4432, 4456, 4457, 4433, + 4433, 4457, 4458, 4434, + 4434, 4458, 4459, 4435, + 4435, 4459, 4460, 4436, + 4436, 4460, 4461, 4437, + 4437, 4461, 4462, 4438, + 4438, 4462, 4463, 4439, + 4439, 4463, 4464, 4440, + 4440, 4464, 4465, 4441, + 4441, 4465, 4466, 4442, + 4442, 4466, 4467, 4443, + 4197, 4198, 4468, 4444, + 4444, 4468, 4469, 4445, + 4445, 4469, 4470, 4446, + 4446, 4470, 4471, 4447, + 4447, 4471, 4472, 4448, + 4448, 4472, 4473, 4449, + 4449, 4473, 4474, 4450, + 4450, 4474, 4475, 4451, + 4451, 4475, 4476, 4452, + 4452, 4476, 4477, 4453, + 4453, 4477, 4478, 4454, + 4454, 4478, 4479, 4455, + 4455, 4479, 4480, 4456, + 4456, 4480, 4481, 4457, + 4457, 4481, 4482, 4458, + 4458, 4482, 4483, 4459, + 4459, 4483, 4484, 4460, + 4460, 4484, 4485, 4461, + 4461, 4485, 4486, 4462, + 4462, 4486, 4487, 4463, + 4463, 4487, 4488, 4464, + 4464, 4488, 4489, 4465, + 4465, 4489, 4490, 4466, + 4466, 4490, 4491, 4467, + 4198, 4199, 4492, 4468, + 4468, 4492, 4493, 4469, + 4469, 4493, 4494, 4470, + 4470, 4494, 4495, 4471, + 4471, 4495, 4496, 4472, + 4472, 4496, 4497, 4473, + 4473, 4497, 4498, 4474, + 4474, 4498, 4499, 4475, + 4475, 4499, 4500, 4476, + 4476, 4500, 4501, 4477, + 4477, 4501, 4502, 4478, + 4478, 4502, 4503, 4479, + 4479, 4503, 4504, 4480, + 4480, 4504, 4505, 4481, + 4481, 4505, 4506, 4482, + 4482, 4506, 4507, 4483, + 4483, 4507, 4508, 4484, + 4484, 4508, 4509, 4485, + 4485, 4509, 4510, 4486, + 4486, 4510, 4511, 4487, + 4487, 4511, 4512, 4488, + 4488, 4512, 4513, 4489, + 4489, 4513, 4514, 4490, + 4490, 4514, 4515, 4491, + 4199, 4200, 4516, 4492, + 4492, 4516, 4517, 4493, + 4493, 4517, 4518, 4494, + 4494, 4518, 4519, 4495, + 4495, 4519, 4520, 4496, + 4496, 4520, 4521, 4497, + 4497, 4521, 4522, 4498, + 4498, 4522, 4523, 4499, + 4499, 4523, 4524, 4500, + 4500, 4524, 4525, 4501, + 4501, 4525, 4526, 4502, + 4502, 4526, 4527, 4503, + 4503, 4527, 4528, 4504, + 4504, 4528, 4529, 4505, + 4505, 4529, 4530, 4506, + 4506, 4530, 4531, 4507, + 4507, 4531, 4532, 4508, + 4508, 4532, 4533, 4509, + 4509, 4533, 4534, 4510, + 4510, 4534, 4535, 4511, + 4511, 4535, 4536, 4512, + 4512, 4536, 4537, 4513, + 4513, 4537, 4538, 4514, + 4514, 4538, 4539, 4515, + 4200, 4201, 4540, 4516, + 4516, 4540, 4541, 4517, + 4517, 4541, 4542, 4518, + 4518, 4542, 4543, 4519, + 4519, 4543, 4544, 4520, + 4520, 4544, 4545, 4521, + 4521, 4545, 4546, 4522, + 4522, 4546, 4547, 4523, + 4523, 4547, 4548, 4524, + 4524, 4548, 4549, 4525, + 4525, 4549, 4550, 4526, + 4526, 4550, 4551, 4527, + 4527, 4551, 4552, 4528, + 4528, 4552, 4553, 4529, + 4529, 4553, 4554, 4530, + 4530, 4554, 4555, 4531, + 4531, 4555, 4556, 4532, + 4532, 4556, 4557, 4533, + 4533, 4557, 4558, 4534, + 4534, 4558, 4559, 4535, + 4535, 4559, 4560, 4536, + 4536, 4560, 4561, 4537, + 4537, 4561, 4562, 4538, + 4538, 4562, 4563, 4539, + 4201, 4202, 4564, 4540, + 4540, 4564, 4565, 4541, + 4541, 4565, 4566, 4542, + 4542, 4566, 4567, 4543, + 4543, 4567, 4568, 4544, + 4544, 4568, 4569, 4545, + 4545, 4569, 4570, 4546, + 4546, 4570, 4571, 4547, + 4547, 4571, 4572, 4548, + 4548, 4572, 4573, 4549, + 4549, 4573, 4574, 4550, + 4550, 4574, 4575, 4551, + 4551, 4575, 4576, 4552, + 4552, 4576, 4577, 4553, + 4553, 4577, 4578, 4554, + 4554, 4578, 4579, 4555, + 4555, 4579, 4580, 4556, + 4556, 4580, 4581, 4557, + 4557, 4581, 4582, 4558, + 4558, 4582, 4583, 4559, + 4559, 4583, 4584, 4560, + 4560, 4584, 4585, 4561, + 4561, 4585, 4586, 4562, + 4562, 4586, 4587, 4563, + 4202, 4203, 4588, 4564, + 4564, 4588, 4589, 4565, + 4565, 4589, 4590, 4566, + 4566, 4590, 4591, 4567, + 4567, 4591, 4592, 4568, + 4568, 4592, 4593, 4569, + 4569, 4593, 4594, 4570, + 4570, 4594, 4595, 4571, + 4571, 4595, 4596, 4572, + 4572, 4596, 4597, 4573, + 4573, 4597, 4598, 4574, + 4574, 4598, 4599, 4575, + 4575, 4599, 4600, 4576, + 4576, 4600, 4601, 4577, + 4577, 4601, 4602, 4578, + 4578, 4602, 4603, 4579, + 4579, 4603, 4604, 4580, + 4580, 4604, 4605, 4581, + 4581, 4605, 4606, 4582, + 4582, 4606, 4607, 4583, + 4583, 4607, 4608, 4584, + 4584, 4608, 4609, 4585, + 4585, 4609, 4610, 4586, + 4586, 4610, 4611, 4587, + 4203, 4204, 4612, 4588, + 4588, 4612, 4613, 4589, + 4589, 4613, 4614, 4590, + 4590, 4614, 4615, 4591, + 4591, 4615, 4616, 4592, + 4592, 4616, 4617, 4593, + 4593, 4617, 4618, 4594, + 4594, 4618, 4619, 4595, + 4595, 4619, 4620, 4596, + 4596, 4620, 4621, 4597, + 4597, 4621, 4622, 4598, + 4598, 4622, 4623, 4599, + 4599, 4623, 4624, 4600, + 4600, 4624, 4625, 4601, + 4601, 4625, 4626, 4602, + 4602, 4626, 4627, 4603, + 4603, 4627, 4628, 4604, + 4604, 4628, 4629, 4605, + 4605, 4629, 4630, 4606, + 4606, 4630, 4631, 4607, + 4607, 4631, 4632, 4608, + 4608, 4632, 4633, 4609, + 4609, 4633, 4634, 4610, + 4610, 4634, 4635, 4611, + 4204, 4205, 4636, 4612, + 4612, 4636, 4637, 4613, + 4613, 4637, 4638, 4614, + 4614, 4638, 4639, 4615, + 4615, 4639, 4640, 4616, + 4616, 4640, 4641, 4617, + 4617, 4641, 4642, 4618, + 4618, 4642, 4643, 4619, + 4619, 4643, 4644, 4620, + 4620, 4644, 4645, 4621, + 4621, 4645, 4646, 4622, + 4622, 4646, 4647, 4623, + 4623, 4647, 4648, 4624, + 4624, 4648, 4649, 4625, + 4625, 4649, 4650, 4626, + 4626, 4650, 4651, 4627, + 4627, 4651, 4652, 4628, + 4628, 4652, 4653, 4629, + 4629, 4653, 4654, 4630, + 4630, 4654, 4655, 4631, + 4631, 4655, 4656, 4632, + 4632, 4656, 4657, 4633, + 4633, 4657, 4658, 4634, + 4634, 4658, 4659, 4635, + 4205, 4206, 4660, 4636, + 4636, 4660, 4661, 4637, + 4637, 4661, 4662, 4638, + 4638, 4662, 4663, 4639, + 4639, 4663, 4664, 4640, + 4640, 4664, 4665, 4641, + 4641, 4665, 4666, 4642, + 4642, 4666, 4667, 4643, + 4643, 4667, 4668, 4644, + 4644, 4668, 4669, 4645, + 4645, 4669, 4670, 4646, + 4646, 4670, 4671, 4647, + 4647, 4671, 4672, 4648, + 4648, 4672, 4673, 4649, + 4649, 4673, 4674, 4650, + 4650, 4674, 4675, 4651, + 4651, 4675, 4676, 4652, + 4652, 4676, 4677, 4653, + 4653, 4677, 4678, 4654, + 4654, 4678, 4679, 4655, + 4655, 4679, 4680, 4656, + 4656, 4680, 4681, 4657, + 4657, 4681, 4682, 4658, + 4658, 4682, 4683, 4659, + 4206, 4207, 4684, 4660, + 4660, 4684, 4685, 4661, + 4661, 4685, 4686, 4662, + 4662, 4686, 4687, 4663, + 4663, 4687, 4688, 4664, + 4664, 4688, 4689, 4665, + 4665, 4689, 4690, 4666, + 4666, 4690, 4691, 4667, + 4667, 4691, 4692, 4668, + 4668, 4692, 4693, 4669, + 4669, 4693, 4694, 4670, + 4670, 4694, 4695, 4671, + 4671, 4695, 4696, 4672, + 4672, 4696, 4697, 4673, + 4673, 4697, 4698, 4674, + 4674, 4698, 4699, 4675, + 4675, 4699, 4700, 4676, + 4676, 4700, 4701, 4677, + 4677, 4701, 4702, 4678, + 4678, 4702, 4703, 4679, + 4679, 4703, 4704, 4680, + 4680, 4704, 4705, 4681, + 4681, 4705, 4706, 4682, + 4682, 4706, 4707, 4683, + 4207, 4208, 4708, 4684, + 4684, 4708, 4709, 4685, + 4685, 4709, 4710, 4686, + 4686, 4710, 4711, 4687, + 4687, 4711, 4712, 4688, + 4688, 4712, 4713, 4689, + 4689, 4713, 4714, 4690, + 4690, 4714, 4715, 4691, + 4691, 4715, 4716, 4692, + 4692, 4716, 4717, 4693, + 4693, 4717, 4718, 4694, + 4694, 4718, 4719, 4695, + 4695, 4719, 4720, 4696, + 4696, 4720, 4721, 4697, + 4697, 4721, 4722, 4698, + 4698, 4722, 4723, 4699, + 4699, 4723, 4724, 4700, + 4700, 4724, 4725, 4701, + 4701, 4725, 4726, 4702, + 4702, 4726, 4727, 4703, + 4703, 4727, 4728, 4704, + 4704, 4728, 4729, 4705, + 4705, 4729, 4730, 4706, + 4706, 4730, 4731, 4707, + 4208, 4209, 4732, 4708, + 4708, 4732, 4733, 4709, + 4709, 4733, 4734, 4710, + 4710, 4734, 4735, 4711, + 4711, 4735, 4736, 4712, + 4712, 4736, 4737, 4713, + 4713, 4737, 4738, 4714, + 4714, 4738, 4739, 4715, + 4715, 4739, 4740, 4716, + 4716, 4740, 4741, 4717, + 4717, 4741, 4742, 4718, + 4718, 4742, 4743, 4719, + 4719, 4743, 4744, 4720, + 4720, 4744, 4745, 4721, + 4721, 4745, 4746, 4722, + 4722, 4746, 4747, 4723, + 4723, 4747, 4748, 4724, + 4724, 4748, 4749, 4725, + 4725, 4749, 4750, 4726, + 4726, 4750, 4751, 4727, + 4727, 4751, 4752, 4728, + 4728, 4752, 4753, 4729, + 4729, 4753, 4754, 4730, + 4730, 4754, 4755, 4731, + 4209, 4210, 4756, 4732, + 4732, 4756, 4757, 4733, + 4733, 4757, 4758, 4734, + 4734, 4758, 4759, 4735, + 4735, 4759, 4760, 4736, + 4736, 4760, 4761, 4737, + 4737, 4761, 4762, 4738, + 4738, 4762, 4763, 4739, + 4739, 4763, 4764, 4740, + 4740, 4764, 4765, 4741, + 4741, 4765, 4766, 4742, + 4742, 4766, 4767, 4743, + 4743, 4767, 4768, 4744, + 4744, 4768, 4769, 4745, + 4745, 4769, 4770, 4746, + 4746, 4770, 4771, 4747, + 4747, 4771, 4772, 4748, + 4748, 4772, 4773, 4749, + 4749, 4773, 4774, 4750, + 4750, 4774, 4775, 4751, + 4751, 4775, 4776, 4752, + 4752, 4776, 4777, 4753, + 4753, 4777, 4778, 4754, + 4754, 4778, 4779, 4755, + 4210, 4211, 4780, 4756, + 4756, 4780, 4781, 4757, + 4757, 4781, 4782, 4758, + 4758, 4782, 4783, 4759, + 4759, 4783, 4784, 4760, + 4760, 4784, 4785, 4761, + 4761, 4785, 4786, 4762, + 4762, 4786, 4787, 4763, + 4763, 4787, 4788, 4764, + 4764, 4788, 4789, 4765, + 4765, 4789, 4790, 4766, + 4766, 4790, 4791, 4767, + 4767, 4791, 4792, 4768, + 4768, 4792, 4793, 4769, + 4769, 4793, 4794, 4770, + 4770, 4794, 4795, 4771, + 4771, 4795, 4796, 4772, + 4772, 4796, 4797, 4773, + 4773, 4797, 4798, 4774, + 4774, 4798, 4799, 4775, + 4775, 4799, 4800, 4776, + 4776, 4800, 4801, 4777, + 4777, 4801, 4802, 4778, + 4778, 4802, 4803, 4779, + 4211, 4212, 4804, 4780, + 4780, 4804, 4805, 4781, + 4781, 4805, 4806, 4782, + 4782, 4806, 4807, 4783, + 4783, 4807, 4808, 4784, + 4784, 4808, 4809, 4785, + 4785, 4809, 4810, 4786, + 4786, 4810, 4811, 4787, + 4787, 4811, 4812, 4788, + 4788, 4812, 4813, 4789, + 4789, 4813, 4814, 4790, + 4790, 4814, 4815, 4791, + 4791, 4815, 4816, 4792, + 4792, 4816, 4817, 4793, + 4793, 4817, 4818, 4794, + 4794, 4818, 4819, 4795, + 4795, 4819, 4820, 4796, + 4796, 4820, 4821, 4797, + 4797, 4821, 4822, 4798, + 4798, 4822, 4823, 4799, + 4799, 4823, 4824, 4800, + 4800, 4824, 4825, 4801, + 4801, 4825, 4826, 4802, + 4802, 4826, 4827, 4803, + 4212, 4213, 4828, 4804, + 4804, 4828, 4829, 4805, + 4805, 4829, 4830, 4806, + 4806, 4830, 4831, 4807, + 4807, 4831, 4832, 4808, + 4808, 4832, 4833, 4809, + 4809, 4833, 4834, 4810, + 4810, 4834, 4835, 4811, + 4811, 4835, 4836, 4812, + 4812, 4836, 4837, 4813, + 4813, 4837, 4838, 4814, + 4814, 4838, 4839, 4815, + 4815, 4839, 4840, 4816, + 4816, 4840, 4841, 4817, + 4817, 4841, 4842, 4818, + 4818, 4842, 4843, 4819, + 4819, 4843, 4844, 4820, + 4820, 4844, 4845, 4821, + 4821, 4845, 4846, 4822, + 4822, 4846, 4847, 4823, + 4823, 4847, 4848, 4824, + 4824, 4848, 4849, 4825, + 4825, 4849, 4850, 4826, + 4826, 4850, 4851, 4827, + 4213, 4214, 4852, 4828, + 4828, 4852, 4853, 4829, + 4829, 4853, 4854, 4830, + 4830, 4854, 4855, 4831, + 4831, 4855, 4856, 4832, + 4832, 4856, 4857, 4833, + 4833, 4857, 4858, 4834, + 4834, 4858, 4859, 4835, + 4835, 4859, 4860, 4836, + 4836, 4860, 4861, 4837, + 4837, 4861, 4862, 4838, + 4838, 4862, 4863, 4839, + 4839, 4863, 4864, 4840, + 4840, 4864, 4865, 4841, + 4841, 4865, 4866, 4842, + 4842, 4866, 4867, 4843, + 4843, 4867, 4868, 4844, + 4844, 4868, 4869, 4845, + 4845, 4869, 4870, 4846, + 4846, 4870, 4871, 4847, + 4847, 4871, 4872, 4848, + 4848, 4872, 4873, 4849, + 4849, 4873, 4874, 4850, + 4850, 4874, 4875, 4851, + 4214, 4215, 4876, 4852, + 4852, 4876, 4877, 4853, + 4853, 4877, 4878, 4854, + 4854, 4878, 4879, 4855, + 4855, 4879, 4880, 4856, + 4856, 4880, 4881, 4857, + 4857, 4881, 4882, 4858, + 4858, 4882, 4883, 4859, + 4859, 4883, 4884, 4860, + 4860, 4884, 4885, 4861, + 4861, 4885, 4886, 4862, + 4862, 4886, 4887, 4863, + 4863, 4887, 4888, 4864, + 4864, 4888, 4889, 4865, + 4865, 4889, 4890, 4866, + 4866, 4890, 4891, 4867, + 4867, 4891, 4892, 4868, + 4868, 4892, 4893, 4869, + 4869, 4893, 4894, 4870, + 4870, 4894, 4895, 4871, + 4871, 4895, 4896, 4872, + 4872, 4896, 4897, 4873, + 4873, 4897, 4898, 4874, + 4874, 4898, 4899, 4875, + 4215, 4216, 4900, 4876, + 4876, 4900, 4901, 4877, + 4877, 4901, 4902, 4878, + 4878, 4902, 4903, 4879, + 4879, 4903, 4904, 4880, + 4880, 4904, 4905, 4881, + 4881, 4905, 4906, 4882, + 4882, 4906, 4907, 4883, + 4883, 4907, 4908, 4884, + 4884, 4908, 4909, 4885, + 4885, 4909, 4910, 4886, + 4886, 4910, 4911, 4887, + 4887, 4911, 4912, 4888, + 4888, 4912, 4913, 4889, + 4889, 4913, 4914, 4890, + 4890, 4914, 4915, 4891, + 4891, 4915, 4916, 4892, + 4892, 4916, 4917, 4893, + 4893, 4917, 4918, 4894, + 4894, 4918, 4919, 4895, + 4895, 4919, 4920, 4896, + 4896, 4920, 4921, 4897, + 4897, 4921, 4922, 4898, + 4898, 4922, 4923, 4899, + 4216, 4217, 4924, 4900, + 4900, 4924, 4925, 4901, + 4901, 4925, 4926, 4902, + 4902, 4926, 4927, 4903, + 4903, 4927, 4928, 4904, + 4904, 4928, 4929, 4905, + 4905, 4929, 4930, 4906, + 4906, 4930, 4931, 4907, + 4907, 4931, 4932, 4908, + 4908, 4932, 4933, 4909, + 4909, 4933, 4934, 4910, + 4910, 4934, 4935, 4911, + 4911, 4935, 4936, 4912, + 4912, 4936, 4937, 4913, + 4913, 4937, 4938, 4914, + 4914, 4938, 4939, 4915, + 4915, 4939, 4940, 4916, + 4916, 4940, 4941, 4917, + 4917, 4941, 4942, 4918, + 4918, 4942, 4943, 4919, + 4919, 4943, 4944, 4920, + 4920, 4944, 4945, 4921, + 4921, 4945, 4946, 4922, + 4922, 4946, 4947, 4923, + 4217, 4218, 4948, 4924, + 4924, 4948, 4949, 4925, + 4925, 4949, 4950, 4926, + 4926, 4950, 4951, 4927, + 4927, 4951, 4952, 4928, + 4928, 4952, 4953, 4929, + 4929, 4953, 4954, 4930, + 4930, 4954, 4955, 4931, + 4931, 4955, 4956, 4932, + 4932, 4956, 4957, 4933, + 4933, 4957, 4958, 4934, + 4934, 4958, 4959, 4935, + 4935, 4959, 4960, 4936, + 4936, 4960, 4961, 4937, + 4937, 4961, 4962, 4938, + 4938, 4962, 4963, 4939, + 4939, 4963, 4964, 4940, + 4940, 4964, 4965, 4941, + 4941, 4965, 4966, 4942, + 4942, 4966, 4967, 4943, + 4943, 4967, 4968, 4944, + 4944, 4968, 4969, 4945, + 4945, 4969, 4970, 4946, + 4946, 4970, 4971, 4947, + 4218, 4219, 4972, 4948, + 4948, 4972, 4973, 4949, + 4949, 4973, 4974, 4950, + 4950, 4974, 4975, 4951, + 4951, 4975, 4976, 4952, + 4952, 4976, 4977, 4953, + 4953, 4977, 4978, 4954, + 4954, 4978, 4979, 4955, + 4955, 4979, 4980, 4956, + 4956, 4980, 4981, 4957, + 4957, 4981, 4982, 4958, + 4958, 4982, 4983, 4959, + 4959, 4983, 4984, 4960, + 4960, 4984, 4985, 4961, + 4961, 4985, 4986, 4962, + 4962, 4986, 4987, 4963, + 4963, 4987, 4988, 4964, + 4964, 4988, 4989, 4965, + 4965, 4989, 4990, 4966, + 4966, 4990, 4991, 4967, + 4967, 4991, 4992, 4968, + 4968, 4992, 4993, 4969, + 4969, 4993, 4994, 4970, + 4970, 4994, 4995, 4971, + 4219, 4220, 4996, 4972, + 4972, 4996, 4997, 4973, + 4973, 4997, 4998, 4974, + 4974, 4998, 4999, 4975, + 4975, 4999, 5000, 4976, + 4976, 5000, 5001, 4977, + 4977, 5001, 5002, 4978, + 4978, 5002, 5003, 4979, + 4979, 5003, 5004, 4980, + 4980, 5004, 5005, 4981, + 4981, 5005, 5006, 4982, + 4982, 5006, 5007, 4983, + 4983, 5007, 5008, 4984, + 4984, 5008, 5009, 4985, + 4985, 5009, 5010, 4986, + 4986, 5010, 5011, 4987, + 4987, 5011, 5012, 4988, + 4988, 5012, 5013, 4989, + 4989, 5013, 5014, 4990, + 4990, 5014, 5015, 4991, + 4991, 5015, 5016, 4992, + 4992, 5016, 5017, 4993, + 4993, 5017, 5018, 4994, + 4994, 5018, 5019, 4995, + 4220, 4221, 5020, 4996, + 4996, 5020, 5021, 4997, + 4997, 5021, 5022, 4998, + 4998, 5022, 5023, 4999, + 4999, 5023, 5024, 5000, + 5000, 5024, 5025, 5001, + 5001, 5025, 5026, 5002, + 5002, 5026, 5027, 5003, + 5003, 5027, 5028, 5004, + 5004, 5028, 5029, 5005, + 5005, 5029, 5030, 5006, + 5006, 5030, 5031, 5007, + 5007, 5031, 5032, 5008, + 5008, 5032, 5033, 5009, + 5009, 5033, 5034, 5010, + 5010, 5034, 5035, 5011, + 5011, 5035, 5036, 5012, + 5012, 5036, 5037, 5013, + 5013, 5037, 5038, 5014, + 5014, 5038, 5039, 5015, + 5015, 5039, 5040, 5016, + 5016, 5040, 5041, 5017, + 5017, 5041, 5042, 5018, + 5018, 5042, 5043, 5019, + 4221, 4222, 5044, 5020, + 5020, 5044, 5045, 5021, + 5021, 5045, 5046, 5022, + 5022, 5046, 5047, 5023, + 5023, 5047, 5048, 5024, + 5024, 5048, 5049, 5025, + 5025, 5049, 5050, 5026, + 5026, 5050, 5051, 5027, + 5027, 5051, 5052, 5028, + 5028, 5052, 5053, 5029, + 5029, 5053, 5054, 5030, + 5030, 5054, 5055, 5031, + 5031, 5055, 5056, 5032, + 5032, 5056, 5057, 5033, + 5033, 5057, 5058, 5034, + 5034, 5058, 5059, 5035, + 5035, 5059, 5060, 5036, + 5036, 5060, 5061, 5037, + 5037, 5061, 5062, 5038, + 5038, 5062, 5063, 5039, + 5039, 5063, 5064, 5040, + 5040, 5064, 5065, 5041, + 5041, 5065, 5066, 5042, + 5042, 5066, 5067, 5043, + 4222, 4223, 5068, 5044, + 5044, 5068, 5069, 5045, + 5045, 5069, 5070, 5046, + 5046, 5070, 5071, 5047, + 5047, 5071, 5072, 5048, + 5048, 5072, 5073, 5049, + 5049, 5073, 5074, 5050, + 5050, 5074, 5075, 5051, + 5051, 5075, 5076, 5052, + 5052, 5076, 5077, 5053, + 5053, 5077, 5078, 5054, + 5054, 5078, 5079, 5055, + 5055, 5079, 5080, 5056, + 5056, 5080, 5081, 5057, + 5057, 5081, 5082, 5058, + 5058, 5082, 5083, 5059, + 5059, 5083, 5084, 5060, + 5060, 5084, 5085, 5061, + 5061, 5085, 5086, 5062, + 5062, 5086, 5087, 5063, + 5063, 5087, 5088, 5064, + 5064, 5088, 5089, 5065, + 5065, 5089, 5090, 5066, + 5066, 5090, 5091, 5067, + 4223, 4224, 5092, 5068, + 5068, 5092, 5093, 5069, + 5069, 5093, 5094, 5070, + 5070, 5094, 5095, 5071, + 5071, 5095, 5096, 5072, + 5072, 5096, 5097, 5073, + 5073, 5097, 5098, 5074, + 5074, 5098, 5099, 5075, + 5075, 5099, 5100, 5076, + 5076, 5100, 5101, 5077, + 5077, 5101, 5102, 5078, + 5078, 5102, 5103, 5079, + 5079, 5103, 5104, 5080, + 5080, 5104, 5105, 5081, + 5081, 5105, 5106, 5082, + 5082, 5106, 5107, 5083, + 5083, 5107, 5108, 5084, + 5084, 5108, 5109, 5085, + 5085, 5109, 5110, 5086, + 5086, 5110, 5111, 5087, + 5087, 5111, 5112, 5088, + 5088, 5112, 5113, 5089, + 5089, 5113, 5114, 5090, + 5090, 5114, 5115, 5091, + 4224, 4225, 5116, 5092, + 5092, 5116, 5117, 5093, + 5093, 5117, 5118, 5094, + 5094, 5118, 5119, 5095, + 5095, 5119, 5120, 5096, + 5096, 5120, 5121, 5097, + 5097, 5121, 5122, 5098, + 5098, 5122, 5123, 5099, + 5099, 5123, 5124, 5100, + 5100, 5124, 5125, 5101, + 5101, 5125, 5126, 5102, + 5102, 5126, 5127, 5103, + 5103, 5127, 5128, 5104, + 5104, 5128, 5129, 5105, + 5105, 5129, 5130, 5106, + 5106, 5130, 5131, 5107, + 5107, 5131, 5132, 5108, + 5108, 5132, 5133, 5109, + 5109, 5133, 5134, 5110, + 5110, 5134, 5135, 5111, + 5111, 5135, 5136, 5112, + 5112, 5136, 5137, 5113, + 5113, 5137, 5138, 5114, + 5114, 5138, 5139, 5115, + 4225, 4226, 5140, 5116, + 5116, 5140, 5141, 5117, + 5117, 5141, 5142, 5118, + 5118, 5142, 5143, 5119, + 5119, 5143, 5144, 5120, + 5120, 5144, 5145, 5121, + 5121, 5145, 5146, 5122, + 5122, 5146, 5147, 5123, + 5123, 5147, 5148, 5124, + 5124, 5148, 5149, 5125, + 5125, 5149, 5150, 5126, + 5126, 5150, 5151, 5127, + 5127, 5151, 5152, 5128, + 5128, 5152, 5153, 5129, + 5129, 5153, 5154, 5130, + 5130, 5154, 5155, 5131, + 5131, 5155, 5156, 5132, + 5132, 5156, 5157, 5133, + 5133, 5157, 5158, 5134, + 5134, 5158, 5159, 5135, + 5135, 5159, 5160, 5136, + 5136, 5160, 5161, 5137, + 5137, 5161, 5162, 5138, + 5138, 5162, 5163, 5139, + 4226, 4227, 5164, 5140, + 5140, 5164, 5165, 5141, + 5141, 5165, 5166, 5142, + 5142, 5166, 5167, 5143, + 5143, 5167, 5168, 5144, + 5144, 5168, 5169, 5145, + 5145, 5169, 5170, 5146, + 5146, 5170, 5171, 5147, + 5147, 5171, 5172, 5148, + 5148, 5172, 5173, 5149, + 5149, 5173, 5174, 5150, + 5150, 5174, 5175, 5151, + 5151, 5175, 5176, 5152, + 5152, 5176, 5177, 5153, + 5153, 5177, 5178, 5154, + 5154, 5178, 5179, 5155, + 5155, 5179, 5180, 5156, + 5156, 5180, 5181, 5157, + 5157, 5181, 5182, 5158, + 5158, 5182, 5183, 5159, + 5159, 5183, 5184, 5160, + 5160, 5184, 5185, 5161, + 5161, 5185, 5186, 5162, + 5162, 5186, 5187, 5163, + 4227, 4228, 5188, 5164, + 5164, 5188, 5189, 5165, + 5165, 5189, 5190, 5166, + 5166, 5190, 5191, 5167, + 5167, 5191, 5192, 5168, + 5168, 5192, 5193, 5169, + 5169, 5193, 5194, 5170, + 5170, 5194, 5195, 5171, + 5171, 5195, 5196, 5172, + 5172, 5196, 5197, 5173, + 5173, 5197, 5198, 5174, + 5174, 5198, 5199, 5175, + 5175, 5199, 5200, 5176, + 5176, 5200, 5201, 5177, + 5177, 5201, 5202, 5178, + 5178, 5202, 5203, 5179, + 5179, 5203, 5204, 5180, + 5180, 5204, 5205, 5181, + 5181, 5205, 5206, 5182, + 5182, 5206, 5207, 5183, + 5183, 5207, 5208, 5184, + 5184, 5208, 5209, 5185, + 5185, 5209, 5210, 5186, + 5186, 5210, 5211, 5187, + 4228, 4229, 5212, 5188, + 5188, 5212, 5213, 5189, + 5189, 5213, 5214, 5190, + 5190, 5214, 5215, 5191, + 5191, 5215, 5216, 5192, + 5192, 5216, 5217, 5193, + 5193, 5217, 5218, 5194, + 5194, 5218, 5219, 5195, + 5195, 5219, 5220, 5196, + 5196, 5220, 5221, 5197, + 5197, 5221, 5222, 5198, + 5198, 5222, 5223, 5199, + 5199, 5223, 5224, 5200, + 5200, 5224, 5225, 5201, + 5201, 5225, 5226, 5202, + 5202, 5226, 5227, 5203, + 5203, 5227, 5228, 5204, + 5204, 5228, 5229, 5205, + 5205, 5229, 5230, 5206, + 5206, 5230, 5231, 5207, + 5207, 5231, 5232, 5208, + 5208, 5232, 5233, 5209, + 5209, 5233, 5234, 5210, + 5210, 5234, 5235, 5211, + 4229, 4230, 5236, 5212, + 5212, 5236, 5237, 5213, + 5213, 5237, 5238, 5214, + 5214, 5238, 5239, 5215, + 5215, 5239, 5240, 5216, + 5216, 5240, 5241, 5217, + 5217, 5241, 5242, 5218, + 5218, 5242, 5243, 5219, + 5219, 5243, 5244, 5220, + 5220, 5244, 5245, 5221, + 5221, 5245, 5246, 5222, + 5222, 5246, 5247, 5223, + 5223, 5247, 5248, 5224, + 5224, 5248, 5249, 5225, + 5225, 5249, 5250, 5226, + 5226, 5250, 5251, 5227, + 5227, 5251, 5252, 5228, + 5228, 5252, 5253, 5229, + 5229, 5253, 5254, 5230, + 5230, 5254, 5255, 5231, + 5231, 5255, 5256, 5232, + 5232, 5256, 5257, 5233, + 5233, 5257, 5258, 5234, + 5234, 5258, 5259, 5235, + 4230, 4231, 5260, 5236, + 5236, 5260, 5261, 5237, + 5237, 5261, 5262, 5238, + 5238, 5262, 5263, 5239, + 5239, 5263, 5264, 5240, + 5240, 5264, 5265, 5241, + 5241, 5265, 5266, 5242, + 5242, 5266, 5267, 5243, + 5243, 5267, 5268, 5244, + 5244, 5268, 5269, 5245, + 5245, 5269, 5270, 5246, + 5246, 5270, 5271, 5247, + 5247, 5271, 5272, 5248, + 5248, 5272, 5273, 5249, + 5249, 5273, 5274, 5250, + 5250, 5274, 5275, 5251, + 5251, 5275, 5276, 5252, + 5252, 5276, 5277, 5253, + 5253, 5277, 5278, 5254, + 5254, 5278, 5279, 5255, + 5255, 5279, 5280, 5256, + 5256, 5280, 5281, 5257, + 5257, 5281, 5282, 5258, + 5258, 5282, 5283, 5259, + 4231, 4232, 5284, 5260, + 5260, 5284, 5285, 5261, + 5261, 5285, 5286, 5262, + 5262, 5286, 5287, 5263, + 5263, 5287, 5288, 5264, + 5264, 5288, 5289, 5265, + 5265, 5289, 5290, 5266, + 5266, 5290, 5291, 5267, + 5267, 5291, 5292, 5268, + 5268, 5292, 5293, 5269, + 5269, 5293, 5294, 5270, + 5270, 5294, 5295, 5271, + 5271, 5295, 5296, 5272, + 5272, 5296, 5297, 5273, + 5273, 5297, 5298, 5274, + 5274, 5298, 5299, 5275, + 5275, 5299, 5300, 5276, + 5276, 5300, 5301, 5277, + 5277, 5301, 5302, 5278, + 5278, 5302, 5303, 5279, + 5279, 5303, 5304, 5280, + 5280, 5304, 5305, 5281, + 5281, 5305, 5306, 5282, + 5282, 5306, 5307, 5283, + 4232, 4233, 5308, 5284, + 5284, 5308, 5309, 5285, + 5285, 5309, 5310, 5286, + 5286, 5310, 5311, 5287, + 5287, 5311, 5312, 5288, + 5288, 5312, 5313, 5289, + 5289, 5313, 5314, 5290, + 5290, 5314, 5315, 5291, + 5291, 5315, 5316, 5292, + 5292, 5316, 5317, 5293, + 5293, 5317, 5318, 5294, + 5294, 5318, 5319, 5295, + 5295, 5319, 5320, 5296, + 5296, 5320, 5321, 5297, + 5297, 5321, 5322, 5298, + 5298, 5322, 5323, 5299, + 5299, 5323, 5324, 5300, + 5300, 5324, 5325, 5301, + 5301, 5325, 5326, 5302, + 5302, 5326, 5327, 5303, + 5303, 5327, 5328, 5304, + 5304, 5328, 5329, 5305, + 5305, 5329, 5330, 5306, + 5306, 5330, 5331, 5307, + 4233, 4234, 5332, 5308, + 5308, 5332, 5333, 5309, + 5309, 5333, 5334, 5310, + 5310, 5334, 5335, 5311, + 5311, 5335, 5336, 5312, + 5312, 5336, 5337, 5313, + 5313, 5337, 5338, 5314, + 5314, 5338, 5339, 5315, + 5315, 5339, 5340, 5316, + 5316, 5340, 5341, 5317, + 5317, 5341, 5342, 5318, + 5318, 5342, 5343, 5319, + 5319, 5343, 5344, 5320, + 5320, 5344, 5345, 5321, + 5321, 5345, 5346, 5322, + 5322, 5346, 5347, 5323, + 5323, 5347, 5348, 5324, + 5324, 5348, 5349, 5325, + 5325, 5349, 5350, 5326, + 5326, 5350, 5351, 5327, + 5327, 5351, 5352, 5328, + 5328, 5352, 5353, 5329, + 5329, 5353, 5354, 5330, + 5330, 5354, 5355, 5331, + 4234, 4235, 5356, 5332, + 5332, 5356, 5357, 5333, + 5333, 5357, 5358, 5334, + 5334, 5358, 5359, 5335, + 5335, 5359, 5360, 5336, + 5336, 5360, 5361, 5337, + 5337, 5361, 5362, 5338, + 5338, 5362, 5363, 5339, + 5339, 5363, 5364, 5340, + 5340, 5364, 5365, 5341, + 5341, 5365, 5366, 5342, + 5342, 5366, 5367, 5343, + 5343, 5367, 5368, 5344, + 5344, 5368, 5369, 5345, + 5345, 5369, 5370, 5346, + 5346, 5370, 5371, 5347, + 5347, 5371, 5372, 5348, + 5348, 5372, 5373, 5349, + 5349, 5373, 5374, 5350, + 5350, 5374, 5375, 5351, + 5351, 5375, 5376, 5352, + 5352, 5376, 5377, 5353, + 5353, 5377, 5378, 5354, + 5354, 5378, 5379, 5355, + 4235, 4236, 5380, 5356, + 5356, 5380, 5381, 5357, + 5357, 5381, 5382, 5358, + 5358, 5382, 5383, 5359, + 5359, 5383, 5384, 5360, + 5360, 5384, 5385, 5361, + 5361, 5385, 5386, 5362, + 5362, 5386, 5387, 5363, + 5363, 5387, 5388, 5364, + 5364, 5388, 5389, 5365, + 5365, 5389, 5390, 5366, + 5366, 5390, 5391, 5367, + 5367, 5391, 5392, 5368, + 5368, 5392, 5393, 5369, + 5369, 5393, 5394, 5370, + 5370, 5394, 5395, 5371, + 5371, 5395, 5396, 5372, + 5372, 5396, 5397, 5373, + 5373, 5397, 5398, 5374, + 5374, 5398, 5399, 5375, + 5375, 5399, 5400, 5376, + 5376, 5400, 5401, 5377, + 5377, 5401, 5402, 5378, + 5378, 5402, 5403, 5379, + 4236, 4237, 5404, 5380, + 5380, 5404, 5405, 5381, + 5381, 5405, 5406, 5382, + 5382, 5406, 5407, 5383, + 5383, 5407, 5408, 5384, + 5384, 5408, 5409, 5385, + 5385, 5409, 5410, 5386, + 5386, 5410, 5411, 5387, + 5387, 5411, 5412, 5388, + 5388, 5412, 5413, 5389, + 5389, 5413, 5414, 5390, + 5390, 5414, 5415, 5391, + 5391, 5415, 5416, 5392, + 5392, 5416, 5417, 5393, + 5393, 5417, 5418, 5394, + 5394, 5418, 5419, 5395, + 5395, 5419, 5420, 5396, + 5396, 5420, 5421, 5397, + 5397, 5421, 5422, 5398, + 5398, 5422, 5423, 5399, + 5399, 5423, 5424, 5400, + 5400, 5424, 5425, 5401, + 5401, 5425, 5426, 5402, + 5402, 5426, 5427, 5403, + 4237, 4238, 5428, 5404, + 5404, 5428, 5429, 5405, + 5405, 5429, 5430, 5406, + 5406, 5430, 5431, 5407, + 5407, 5431, 5432, 5408, + 5408, 5432, 5433, 5409, + 5409, 5433, 5434, 5410, + 5410, 5434, 5435, 5411, + 5411, 5435, 5436, 5412, + 5412, 5436, 5437, 5413, + 5413, 5437, 5438, 5414, + 5414, 5438, 5439, 5415, + 5415, 5439, 5440, 5416, + 5416, 5440, 5441, 5417, + 5417, 5441, 5442, 5418, + 5418, 5442, 5443, 5419, + 5419, 5443, 5444, 5420, + 5420, 5444, 5445, 5421, + 5421, 5445, 5446, 5422, + 5422, 5446, 5447, 5423, + 5423, 5447, 5448, 5424, + 5424, 5448, 5449, 5425, + 5425, 5449, 5450, 5426, + 5426, 5450, 5451, 5427, + 4238, 4239, 5452, 5428, + 5428, 5452, 5453, 5429, + 5429, 5453, 5454, 5430, + 5430, 5454, 5455, 5431, + 5431, 5455, 5456, 5432, + 5432, 5456, 5457, 5433, + 5433, 5457, 5458, 5434, + 5434, 5458, 5459, 5435, + 5435, 5459, 5460, 5436, + 5436, 5460, 5461, 5437, + 5437, 5461, 5462, 5438, + 5438, 5462, 5463, 5439, + 5439, 5463, 5464, 5440, + 5440, 5464, 5465, 5441, + 5441, 5465, 5466, 5442, + 5442, 5466, 5467, 5443, + 5443, 5467, 5468, 5444, + 5444, 5468, 5469, 5445, + 5445, 5469, 5470, 5446, + 5446, 5470, 5471, 5447, + 5447, 5471, 5472, 5448, + 5448, 5472, 5473, 5449, + 5449, 5473, 5474, 5450, + 5450, 5474, 5475, 5451, + 4239, 4240, 5476, 5452, + 5452, 5476, 5477, 5453, + 5453, 5477, 5478, 5454, + 5454, 5478, 5479, 5455, + 5455, 5479, 5480, 5456, + 5456, 5480, 5481, 5457, + 5457, 5481, 5482, 5458, + 5458, 5482, 5483, 5459, + 5459, 5483, 5484, 5460, + 5460, 5484, 5485, 5461, + 5461, 5485, 5486, 5462, + 5462, 5486, 5487, 5463, + 5463, 5487, 5488, 5464, + 5464, 5488, 5489, 5465, + 5465, 5489, 5490, 5466, + 5466, 5490, 5491, 5467, + 5467, 5491, 5492, 5468, + 5468, 5492, 5493, 5469, + 5469, 5493, 5494, 5470, + 5470, 5494, 5495, 5471, + 5471, 5495, 5496, 5472, + 5472, 5496, 5497, 5473, + 5473, 5497, 5498, 5474, + 5474, 5498, 5499, 5475, + 4240, 4241, 5500, 5476, + 5476, 5500, 5501, 5477, + 5477, 5501, 5502, 5478, + 5478, 5502, 5503, 5479, + 5479, 5503, 5504, 5480, + 5480, 5504, 5505, 5481, + 5481, 5505, 5506, 5482, + 5482, 5506, 5507, 5483, + 5483, 5507, 5508, 5484, + 5484, 5508, 5509, 5485, + 5485, 5509, 5510, 5486, + 5486, 5510, 5511, 5487, + 5487, 5511, 5512, 5488, + 5488, 5512, 5513, 5489, + 5489, 5513, 5514, 5490, + 5490, 5514, 5515, 5491, + 5491, 5515, 5516, 5492, + 5492, 5516, 5517, 5493, + 5493, 5517, 5518, 5494, + 5494, 5518, 5519, 5495, + 5495, 5519, 5520, 5496, + 5496, 5520, 5521, 5497, + 5497, 5521, 5522, 5498, + 5498, 5522, 5523, 5499, + 4241, 4242, 5524, 5500, + 5500, 5524, 5525, 5501, + 5501, 5525, 5526, 5502, + 5502, 5526, 5527, 5503, + 5503, 5527, 5528, 5504, + 5504, 5528, 5529, 5505, + 5505, 5529, 5530, 5506, + 5506, 5530, 5531, 5507, + 5507, 5531, 5532, 5508, + 5508, 5532, 5533, 5509, + 5509, 5533, 5534, 5510, + 5510, 5534, 5535, 5511, + 5511, 5535, 5536, 5512, + 5512, 5536, 5537, 5513, + 5513, 5537, 5538, 5514, + 5514, 5538, 5539, 5515, + 5515, 5539, 5540, 5516, + 5516, 5540, 5541, 5517, + 5517, 5541, 5542, 5518, + 5518, 5542, 5543, 5519, + 5519, 5543, 5544, 5520, + 5520, 5544, 5545, 5521, + 5521, 5545, 5546, 5522, + 5522, 5546, 5547, 5523, + 4242, 4243, 5548, 5524, + 5524, 5548, 5549, 5525, + 5525, 5549, 5550, 5526, + 5526, 5550, 5551, 5527, + 5527, 5551, 5552, 5528, + 5528, 5552, 5553, 5529, + 5529, 5553, 5554, 5530, + 5530, 5554, 5555, 5531, + 5531, 5555, 5556, 5532, + 5532, 5556, 5557, 5533, + 5533, 5557, 5558, 5534, + 5534, 5558, 5559, 5535, + 5535, 5559, 5560, 5536, + 5536, 5560, 5561, 5537, + 5537, 5561, 5562, 5538, + 5538, 5562, 5563, 5539, + 5539, 5563, 5564, 5540, + 5540, 5564, 5565, 5541, + 5541, 5565, 5566, 5542, + 5542, 5566, 5567, 5543, + 5543, 5567, 5568, 5544, + 5544, 5568, 5569, 5545, + 5545, 5569, 5570, 5546, + 5546, 5570, 5571, 5547, + 4243, 4244, 5572, 5548, + 5548, 5572, 5573, 5549, + 5549, 5573, 5574, 5550, + 5550, 5574, 5575, 5551, + 5551, 5575, 5576, 5552, + 5552, 5576, 5577, 5553, + 5553, 5577, 5578, 5554, + 5554, 5578, 5579, 5555, + 5555, 5579, 5580, 5556, + 5556, 5580, 5581, 5557, + 5557, 5581, 5582, 5558, + 5558, 5582, 5583, 5559, + 5559, 5583, 5584, 5560, + 5560, 5584, 5585, 5561, + 5561, 5585, 5586, 5562, + 5562, 5586, 5587, 5563, + 5563, 5587, 5588, 5564, + 5564, 5588, 5589, 5565, + 5565, 5589, 5590, 5566, + 5566, 5590, 5591, 5567, + 5567, 5591, 5592, 5568, + 5568, 5592, 5593, 5569, + 5569, 5593, 5594, 5570, + 5570, 5594, 5595, 5571, + 4244, 4245, 5596, 5572, + 5572, 5596, 5597, 5573, + 5573, 5597, 5598, 5574, + 5574, 5598, 5599, 5575, + 5575, 5599, 5600, 5576, + 5576, 5600, 5601, 5577, + 5577, 5601, 5602, 5578, + 5578, 5602, 5603, 5579, + 5579, 5603, 5604, 5580, + 5580, 5604, 5605, 5581, + 5581, 5605, 5606, 5582, + 5582, 5606, 5607, 5583, + 5583, 5607, 5608, 5584, + 5584, 5608, 5609, 5585, + 5585, 5609, 5610, 5586, + 5586, 5610, 5611, 5587, + 5587, 5611, 5612, 5588, + 5588, 5612, 5613, 5589, + 5589, 5613, 5614, 5590, + 5590, 5614, 5615, 5591, + 5591, 5615, 5616, 5592, + 5592, 5616, 5617, 5593, + 5593, 5617, 5618, 5594, + 5594, 5618, 5619, 5595, + 4245, 4246, 5620, 5596, + 5596, 5620, 5621, 5597, + 5597, 5621, 5622, 5598, + 5598, 5622, 5623, 5599, + 5599, 5623, 5624, 5600, + 5600, 5624, 5625, 5601, + 5601, 5625, 5626, 5602, + 5602, 5626, 5627, 5603, + 5603, 5627, 5628, 5604, + 5604, 5628, 5629, 5605, + 5605, 5629, 5630, 5606, + 5606, 5630, 5631, 5607, + 5607, 5631, 5632, 5608, + 5608, 5632, 5633, 5609, + 5609, 5633, 5634, 5610, + 5610, 5634, 5635, 5611, + 5611, 5635, 5636, 5612, + 5612, 5636, 5637, 5613, + 5613, 5637, 5638, 5614, + 5614, 5638, 5639, 5615, + 5615, 5639, 5640, 5616, + 5616, 5640, 5641, 5617, + 5617, 5641, 5642, 5618, + 5618, 5642, 5643, 5619, + 4246, 4247, 5644, 5620, + 5620, 5644, 5645, 5621, + 5621, 5645, 5646, 5622, + 5622, 5646, 5647, 5623, + 5623, 5647, 5648, 5624, + 5624, 5648, 5649, 5625, + 5625, 5649, 5650, 5626, + 5626, 5650, 5651, 5627, + 5627, 5651, 5652, 5628, + 5628, 5652, 5653, 5629, + 5629, 5653, 5654, 5630, + 5630, 5654, 5655, 5631, + 5631, 5655, 5656, 5632, + 5632, 5656, 5657, 5633, + 5633, 5657, 5658, 5634, + 5634, 5658, 5659, 5635, + 5635, 5659, 5660, 5636, + 5636, 5660, 5661, 5637, + 5637, 5661, 5662, 5638, + 5638, 5662, 5663, 5639, + 5639, 5663, 5664, 5640, + 5640, 5664, 5665, 5641, + 5641, 5665, 5666, 5642, + 5642, 5666, 5667, 5643, + 4247, 4248, 5668, 5644, + 5644, 5668, 5669, 5645, + 5645, 5669, 5670, 5646, + 5646, 5670, 5671, 5647, + 5647, 5671, 5672, 5648, + 5648, 5672, 5673, 5649, + 5649, 5673, 5674, 5650, + 5650, 5674, 5675, 5651, + 5651, 5675, 5676, 5652, + 5652, 5676, 5677, 5653, + 5653, 5677, 5678, 5654, + 5654, 5678, 5679, 5655, + 5655, 5679, 5680, 5656, + 5656, 5680, 5681, 5657, + 5657, 5681, 5682, 5658, + 5658, 5682, 5683, 5659, + 5659, 5683, 5684, 5660, + 5660, 5684, 5685, 5661, + 5661, 5685, 5686, 5662, + 5662, 5686, 5687, 5663, + 5663, 5687, 5688, 5664, + 5664, 5688, 5689, 5665, + 5665, 5689, 5690, 5666, + 5666, 5690, 5691, 5667, + 4248, 4249, 5692, 5668, + 5668, 5692, 5693, 5669, + 5669, 5693, 5694, 5670, + 5670, 5694, 5695, 5671, + 5671, 5695, 5696, 5672, + 5672, 5696, 5697, 5673, + 5673, 5697, 5698, 5674, + 5674, 5698, 5699, 5675, + 5675, 5699, 5700, 5676, + 5676, 5700, 5701, 5677, + 5677, 5701, 5702, 5678, + 5678, 5702, 5703, 5679, + 5679, 5703, 5704, 5680, + 5680, 5704, 5705, 5681, + 5681, 5705, 5706, 5682, + 5682, 5706, 5707, 5683, + 5683, 5707, 5708, 5684, + 5684, 5708, 5709, 5685, + 5685, 5709, 5710, 5686, + 5686, 5710, 5711, 5687, + 5687, 5711, 5712, 5688, + 5688, 5712, 5713, 5689, + 5689, 5713, 5714, 5690, + 5690, 5714, 5715, 5691, + 4249, 4250, 5716, 5692, + 5692, 5716, 5717, 5693, + 5693, 5717, 5718, 5694, + 5694, 5718, 5719, 5695, + 5695, 5719, 5720, 5696, + 5696, 5720, 5721, 5697, + 5697, 5721, 5722, 5698, + 5698, 5722, 5723, 5699, + 5699, 5723, 5724, 5700, + 5700, 5724, 5725, 5701, + 5701, 5725, 5726, 5702, + 5702, 5726, 5727, 5703, + 5703, 5727, 5728, 5704, + 5704, 5728, 5729, 5705, + 5705, 5729, 5730, 5706, + 5706, 5730, 5731, 5707, + 5707, 5731, 5732, 5708, + 5708, 5732, 5733, 5709, + 5709, 5733, 5734, 5710, + 5710, 5734, 5735, 5711, + 5711, 5735, 5736, 5712, + 5712, 5736, 5737, 5713, + 5713, 5737, 5738, 5714, + 5714, 5738, 5739, 5715, + 4250, 4251, 5740, 5716, + 5716, 5740, 5741, 5717, + 5717, 5741, 5742, 5718, + 5718, 5742, 5743, 5719, + 5719, 5743, 5744, 5720, + 5720, 5744, 5745, 5721, + 5721, 5745, 5746, 5722, + 5722, 5746, 5747, 5723, + 5723, 5747, 5748, 5724, + 5724, 5748, 5749, 5725, + 5725, 5749, 5750, 5726, + 5726, 5750, 5751, 5727, + 5727, 5751, 5752, 5728, + 5728, 5752, 5753, 5729, + 5729, 5753, 5754, 5730, + 5730, 5754, 5755, 5731, + 5731, 5755, 5756, 5732, + 5732, 5756, 5757, 5733, + 5733, 5757, 5758, 5734, + 5734, 5758, 5759, 5735, + 5735, 5759, 5760, 5736, + 5736, 5760, 5761, 5737, + 5737, 5761, 5762, 5738, + 5738, 5762, 5763, 5739, + 4251, 4252, 5764, 5740, + 5740, 5764, 5765, 5741, + 5741, 5765, 5766, 5742, + 5742, 5766, 5767, 5743, + 5743, 5767, 5768, 5744, + 5744, 5768, 5769, 5745, + 5745, 5769, 5770, 5746, + 5746, 5770, 5771, 5747, + 5747, 5771, 5772, 5748, + 5748, 5772, 5773, 5749, + 5749, 5773, 5774, 5750, + 5750, 5774, 5775, 5751, + 5751, 5775, 5776, 5752, + 5752, 5776, 5777, 5753, + 5753, 5777, 5778, 5754, + 5754, 5778, 5779, 5755, + 5755, 5779, 5780, 5756, + 5756, 5780, 5781, 5757, + 5757, 5781, 5782, 5758, + 5758, 5782, 5783, 5759, + 5759, 5783, 5784, 5760, + 5760, 5784, 5785, 5761, + 5761, 5785, 5786, 5762, + 5762, 5786, 5787, 5763, + 4252, 4253, 5788, 5764, + 5764, 5788, 5789, 5765, + 5765, 5789, 5790, 5766, + 5766, 5790, 5791, 5767, + 5767, 5791, 5792, 5768, + 5768, 5792, 5793, 5769, + 5769, 5793, 5794, 5770, + 5770, 5794, 5795, 5771, + 5771, 5795, 5796, 5772, + 5772, 5796, 5797, 5773, + 5773, 5797, 5798, 5774, + 5774, 5798, 5799, 5775, + 5775, 5799, 5800, 5776, + 5776, 5800, 5801, 5777, + 5777, 5801, 5802, 5778, + 5778, 5802, 5803, 5779, + 5779, 5803, 5804, 5780, + 5780, 5804, 5805, 5781, + 5781, 5805, 5806, 5782, + 5782, 5806, 5807, 5783, + 5783, 5807, 5808, 5784, + 5784, 5808, 5809, 5785, + 5785, 5809, 5810, 5786, + 5786, 5810, 5811, 5787, + 4253, 4254, 5812, 5788, + 5788, 5812, 5813, 5789, + 5789, 5813, 5814, 5790, + 5790, 5814, 5815, 5791, + 5791, 5815, 5816, 5792, + 5792, 5816, 5817, 5793, + 5793, 5817, 5818, 5794, + 5794, 5818, 5819, 5795, + 5795, 5819, 5820, 5796, + 5796, 5820, 5821, 5797, + 5797, 5821, 5822, 5798, + 5798, 5822, 5823, 5799, + 5799, 5823, 5824, 5800, + 5800, 5824, 5825, 5801, + 5801, 5825, 5826, 5802, + 5802, 5826, 5827, 5803, + 5803, 5827, 5828, 5804, + 5804, 5828, 5829, 5805, + 5805, 5829, 5830, 5806, + 5806, 5830, 5831, 5807, + 5807, 5831, 5832, 5808, + 5808, 5832, 5833, 5809, + 5809, 5833, 5834, 5810, + 5810, 5834, 5835, 5811, + 4254, 4255, 5836, 5812, + 5812, 5836, 5837, 5813, + 5813, 5837, 5838, 5814, + 5814, 5838, 5839, 5815, + 5815, 5839, 5840, 5816, + 5816, 5840, 5841, 5817, + 5817, 5841, 5842, 5818, + 5818, 5842, 5843, 5819, + 5819, 5843, 5844, 5820, + 5820, 5844, 5845, 5821, + 5821, 5845, 5846, 5822, + 5822, 5846, 5847, 5823, + 5823, 5847, 5848, 5824, + 5824, 5848, 5849, 5825, + 5825, 5849, 5850, 5826, + 5826, 5850, 5851, 5827, + 5827, 5851, 5852, 5828, + 5828, 5852, 5853, 5829, + 5829, 5853, 5854, 5830, + 5830, 5854, 5855, 5831, + 5831, 5855, 5856, 5832, + 5832, 5856, 5857, 5833, + 5833, 5857, 5858, 5834, + 5834, 5858, 5859, 5835, + 4255, 4256, 5860, 5836, + 5836, 5860, 5861, 5837, + 5837, 5861, 5862, 5838, + 5838, 5862, 5863, 5839, + 5839, 5863, 5864, 5840, + 5840, 5864, 5865, 5841, + 5841, 5865, 5866, 5842, + 5842, 5866, 5867, 5843, + 5843, 5867, 5868, 5844, + 5844, 5868, 5869, 5845, + 5845, 5869, 5870, 5846, + 5846, 5870, 5871, 5847, + 5847, 5871, 5872, 5848, + 5848, 5872, 5873, 5849, + 5849, 5873, 5874, 5850, + 5850, 5874, 5875, 5851, + 5851, 5875, 5876, 5852, + 5852, 5876, 5877, 5853, + 5853, 5877, 5878, 5854, + 5854, 5878, 5879, 5855, + 5855, 5879, 5880, 5856, + 5856, 5880, 5881, 5857, + 5857, 5881, 5882, 5858, + 5858, 5882, 5883, 5859, + 4256, 4257, 5884, 5860, + 5860, 5884, 5885, 5861, + 5861, 5885, 5886, 5862, + 5862, 5886, 5887, 5863, + 5863, 5887, 5888, 5864, + 5864, 5888, 5889, 5865, + 5865, 5889, 5890, 5866, + 5866, 5890, 5891, 5867, + 5867, 5891, 5892, 5868, + 5868, 5892, 5893, 5869, + 5869, 5893, 5894, 5870, + 5870, 5894, 5895, 5871, + 5871, 5895, 5896, 5872, + 5872, 5896, 5897, 5873, + 5873, 5897, 5898, 5874, + 5874, 5898, 5899, 5875, + 5875, 5899, 5900, 5876, + 5876, 5900, 5901, 5877, + 5877, 5901, 5902, 5878, + 5878, 5902, 5903, 5879, + 5879, 5903, 5904, 5880, + 5880, 5904, 5905, 5881, + 5881, 5905, 5906, 5882, + 5882, 5906, 5907, 5883, + 4257, 4258, 5908, 5884, + 5884, 5908, 5909, 5885, + 5885, 5909, 5910, 5886, + 5886, 5910, 5911, 5887, + 5887, 5911, 5912, 5888, + 5888, 5912, 5913, 5889, + 5889, 5913, 5914, 5890, + 5890, 5914, 5915, 5891, + 5891, 5915, 5916, 5892, + 5892, 5916, 5917, 5893, + 5893, 5917, 5918, 5894, + 5894, 5918, 5919, 5895, + 5895, 5919, 5920, 5896, + 5896, 5920, 5921, 5897, + 5897, 5921, 5922, 5898, + 5898, 5922, 5923, 5899, + 5899, 5923, 5924, 5900, + 5900, 5924, 5925, 5901, + 5901, 5925, 5926, 5902, + 5902, 5926, 5927, 5903, + 5903, 5927, 5928, 5904, + 5904, 5928, 5929, 5905, + 5905, 5929, 5930, 5906, + 5906, 5930, 5931, 5907, + 4258, 4259, 5932, 5908, + 5908, 5932, 5933, 5909, + 5909, 5933, 5934, 5910, + 5910, 5934, 5935, 5911, + 5911, 5935, 5936, 5912, + 5912, 5936, 5937, 5913, + 5913, 5937, 5938, 5914, + 5914, 5938, 5939, 5915, + 5915, 5939, 5940, 5916, + 5916, 5940, 5941, 5917, + 5917, 5941, 5942, 5918, + 5918, 5942, 5943, 5919, + 5919, 5943, 5944, 5920, + 5920, 5944, 5945, 5921, + 5921, 5945, 5946, 5922, + 5922, 5946, 5947, 5923, + 5923, 5947, 5948, 5924, + 5924, 5948, 5949, 5925, + 5925, 5949, 5950, 5926, + 5926, 5950, 5951, 5927, + 5927, 5951, 5952, 5928, + 5928, 5952, 5953, 5929, + 5929, 5953, 5954, 5930, + 5930, 5954, 5955, 5931, + 4259, 4260, 5956, 5932, + 5932, 5956, 5957, 5933, + 5933, 5957, 5958, 5934, + 5934, 5958, 5959, 5935, + 5935, 5959, 5960, 5936, + 5936, 5960, 5961, 5937, + 5937, 5961, 5962, 5938, + 5938, 5962, 5963, 5939, + 5939, 5963, 5964, 5940, + 5940, 5964, 5965, 5941, + 5941, 5965, 5966, 5942, + 5942, 5966, 5967, 5943, + 5943, 5967, 5968, 5944, + 5944, 5968, 5969, 5945, + 5945, 5969, 5970, 5946, + 5946, 5970, 5971, 5947, + 5947, 5971, 5972, 5948, + 5948, 5972, 5973, 5949, + 5949, 5973, 5974, 5950, + 5950, 5974, 5975, 5951, + 5951, 5975, 5976, 5952, + 5952, 5976, 5977, 5953, + 5953, 5977, 5978, 5954, + 5954, 5978, 5979, 5955, + 4260, 4261, 5980, 5956, + 5956, 5980, 5981, 5957, + 5957, 5981, 5982, 5958, + 5958, 5982, 5983, 5959, + 5959, 5983, 5984, 5960, + 5960, 5984, 5985, 5961, + 5961, 5985, 5986, 5962, + 5962, 5986, 5987, 5963, + 5963, 5987, 5988, 5964, + 5964, 5988, 5989, 5965, + 5965, 5989, 5990, 5966, + 5966, 5990, 5991, 5967, + 5967, 5991, 5992, 5968, + 5968, 5992, 5993, 5969, + 5969, 5993, 5994, 5970, + 5970, 5994, 5995, 5971, + 5971, 5995, 5996, 5972, + 5972, 5996, 5997, 5973, + 5973, 5997, 5998, 5974, + 5974, 5998, 5999, 5975, + 5975, 5999, 6000, 5976, + 5976, 6000, 6001, 5977, + 5977, 6001, 6002, 5978, + 5978, 6002, 6003, 5979, + 4261, 4262, 6004, 5980, + 5980, 6004, 6005, 5981, + 5981, 6005, 6006, 5982, + 5982, 6006, 6007, 5983, + 5983, 6007, 6008, 5984, + 5984, 6008, 6009, 5985, + 5985, 6009, 6010, 5986, + 5986, 6010, 6011, 5987, + 5987, 6011, 6012, 5988, + 5988, 6012, 6013, 5989, + 5989, 6013, 6014, 5990, + 5990, 6014, 6015, 5991, + 5991, 6015, 6016, 5992, + 5992, 6016, 6017, 5993, + 5993, 6017, 6018, 5994, + 5994, 6018, 6019, 5995, + 5995, 6019, 6020, 5996, + 5996, 6020, 6021, 5997, + 5997, 6021, 6022, 5998, + 5998, 6022, 6023, 5999, + 5999, 6023, 6024, 6000, + 6000, 6024, 6025, 6001, + 6001, 6025, 6026, 6002, + 6002, 6026, 6027, 6003, + 4262, 4263, 6028, 6004, + 6004, 6028, 6029, 6005, + 6005, 6029, 6030, 6006, + 6006, 6030, 6031, 6007, + 6007, 6031, 6032, 6008, + 6008, 6032, 6033, 6009, + 6009, 6033, 6034, 6010, + 6010, 6034, 6035, 6011, + 6011, 6035, 6036, 6012, + 6012, 6036, 6037, 6013, + 6013, 6037, 6038, 6014, + 6014, 6038, 6039, 6015, + 6015, 6039, 6040, 6016, + 6016, 6040, 6041, 6017, + 6017, 6041, 6042, 6018, + 6018, 6042, 6043, 6019, + 6019, 6043, 6044, 6020, + 6020, 6044, 6045, 6021, + 6021, 6045, 6046, 6022, + 6022, 6046, 6047, 6023, + 6023, 6047, 6048, 6024, + 6024, 6048, 6049, 6025, + 6025, 6049, 6050, 6026, + 6026, 6050, 6051, 6027, + 4263, 4264, 6052, 6028, + 6028, 6052, 6053, 6029, + 6029, 6053, 6054, 6030, + 6030, 6054, 6055, 6031, + 6031, 6055, 6056, 6032, + 6032, 6056, 6057, 6033, + 6033, 6057, 6058, 6034, + 6034, 6058, 6059, 6035, + 6035, 6059, 6060, 6036, + 6036, 6060, 6061, 6037, + 6037, 6061, 6062, 6038, + 6038, 6062, 6063, 6039, + 6039, 6063, 6064, 6040, + 6040, 6064, 6065, 6041, + 6041, 6065, 6066, 6042, + 6042, 6066, 6067, 6043, + 6043, 6067, 6068, 6044, + 6044, 6068, 6069, 6045, + 6045, 6069, 6070, 6046, + 6046, 6070, 6071, 6047, + 6047, 6071, 6072, 6048, + 6048, 6072, 6073, 6049, + 6049, 6073, 6074, 6050, + 6050, 6074, 6075, 6051, + 4264, 4265, 6076, 6052, + 6052, 6076, 6077, 6053, + 6053, 6077, 6078, 6054, + 6054, 6078, 6079, 6055, + 6055, 6079, 6080, 6056, + 6056, 6080, 6081, 6057, + 6057, 6081, 6082, 6058, + 6058, 6082, 6083, 6059, + 6059, 6083, 6084, 6060, + 6060, 6084, 6085, 6061, + 6061, 6085, 6086, 6062, + 6062, 6086, 6087, 6063, + 6063, 6087, 6088, 6064, + 6064, 6088, 6089, 6065, + 6065, 6089, 6090, 6066, + 6066, 6090, 6091, 6067, + 6067, 6091, 6092, 6068, + 6068, 6092, 6093, 6069, + 6069, 6093, 6094, 6070, + 6070, 6094, 6095, 6071, + 6071, 6095, 6096, 6072, + 6072, 6096, 6097, 6073, + 6073, 6097, 6098, 6074, + 6074, 6098, 6099, 6075, + 4265, 4266, 6100, 6076, + 6076, 6100, 6101, 6077, + 6077, 6101, 6102, 6078, + 6078, 6102, 6103, 6079, + 6079, 6103, 6104, 6080, + 6080, 6104, 6105, 6081, + 6081, 6105, 6106, 6082, + 6082, 6106, 6107, 6083, + 6083, 6107, 6108, 6084, + 6084, 6108, 6109, 6085, + 6085, 6109, 6110, 6086, + 6086, 6110, 6111, 6087, + 6087, 6111, 6112, 6088, + 6088, 6112, 6113, 6089, + 6089, 6113, 6114, 6090, + 6090, 6114, 6115, 6091, + 6091, 6115, 6116, 6092, + 6092, 6116, 6117, 6093, + 6093, 6117, 6118, 6094, + 6094, 6118, 6119, 6095, + 6095, 6119, 6120, 6096, + 6096, 6120, 6121, 6097, + 6097, 6121, 6122, 6098, + 6098, 6122, 6123, 6099, + 4266, 4267, 6124, 6100, + 6100, 6124, 6125, 6101, + 6101, 6125, 6126, 6102, + 6102, 6126, 6127, 6103, + 6103, 6127, 6128, 6104, + 6104, 6128, 6129, 6105, + 6105, 6129, 6130, 6106, + 6106, 6130, 6131, 6107, + 6107, 6131, 6132, 6108, + 6108, 6132, 6133, 6109, + 6109, 6133, 6134, 6110, + 6110, 6134, 6135, 6111, + 6111, 6135, 6136, 6112, + 6112, 6136, 6137, 6113, + 6113, 6137, 6138, 6114, + 6114, 6138, 6139, 6115, + 6115, 6139, 6140, 6116, + 6116, 6140, 6141, 6117, + 6117, 6141, 6142, 6118, + 6118, 6142, 6143, 6119, + 6119, 6143, 6144, 6120, + 6120, 6144, 6145, 6121, + 6121, 6145, 6146, 6122, + 6122, 6146, 6147, 6123, + 4267, 4268, 6148, 6124, + 6124, 6148, 6149, 6125, + 6125, 6149, 6150, 6126, + 6126, 6150, 6151, 6127, + 6127, 6151, 6152, 6128, + 6128, 6152, 6153, 6129, + 6129, 6153, 6154, 6130, + 6130, 6154, 6155, 6131, + 6131, 6155, 6156, 6132, + 6132, 6156, 6157, 6133, + 6133, 6157, 6158, 6134, + 6134, 6158, 6159, 6135, + 6135, 6159, 6160, 6136, + 6136, 6160, 6161, 6137, + 6137, 6161, 6162, 6138, + 6138, 6162, 6163, 6139, + 6139, 6163, 6164, 6140, + 6140, 6164, 6165, 6141, + 6141, 6165, 6166, 6142, + 6142, 6166, 6167, 6143, + 6143, 6167, 6168, 6144, + 6144, 6168, 6169, 6145, + 6145, 6169, 6170, 6146, + 6146, 6170, 6171, 6147, + 4268, 4269, 6172, 6148, + 6148, 6172, 6173, 6149, + 6149, 6173, 6174, 6150, + 6150, 6174, 6175, 6151, + 6151, 6175, 6176, 6152, + 6152, 6176, 6177, 6153, + 6153, 6177, 6178, 6154, + 6154, 6178, 6179, 6155, + 6155, 6179, 6180, 6156, + 6156, 6180, 6181, 6157, + 6157, 6181, 6182, 6158, + 6158, 6182, 6183, 6159, + 6159, 6183, 6184, 6160, + 6160, 6184, 6185, 6161, + 6161, 6185, 6186, 6162, + 6162, 6186, 6187, 6163, + 6163, 6187, 6188, 6164, + 6164, 6188, 6189, 6165, + 6165, 6189, 6190, 6166, + 6166, 6190, 6191, 6167, + 6167, 6191, 6192, 6168, + 6168, 6192, 6193, 6169, + 6169, 6193, 6194, 6170, + 6170, 6194, 6195, 6171, + 4269, 4270, 6196, 6172, + 6172, 6196, 6197, 6173, + 6173, 6197, 6198, 6174, + 6174, 6198, 6199, 6175, + 6175, 6199, 6200, 6176, + 6176, 6200, 6201, 6177, + 6177, 6201, 6202, 6178, + 6178, 6202, 6203, 6179, + 6179, 6203, 6204, 6180, + 6180, 6204, 6205, 6181, + 6181, 6205, 6206, 6182, + 6182, 6206, 6207, 6183, + 6183, 6207, 6208, 6184, + 6184, 6208, 6209, 6185, + 6185, 6209, 6210, 6186, + 6186, 6210, 6211, 6187, + 6187, 6211, 6212, 6188, + 6188, 6212, 6213, 6189, + 6189, 6213, 6214, 6190, + 6190, 6214, 6215, 6191, + 6191, 6215, 6216, 6192, + 6192, 6216, 6217, 6193, + 6193, 6217, 6218, 6194, + 6194, 6218, 6219, 6195, + 4270, 4271, 6220, 6196, + 6196, 6220, 6221, 6197, + 6197, 6221, 6222, 6198, + 6198, 6222, 6223, 6199, + 6199, 6223, 6224, 6200, + 6200, 6224, 6225, 6201, + 6201, 6225, 6226, 6202, + 6202, 6226, 6227, 6203, + 6203, 6227, 6228, 6204, + 6204, 6228, 6229, 6205, + 6205, 6229, 6230, 6206, + 6206, 6230, 6231, 6207, + 6207, 6231, 6232, 6208, + 6208, 6232, 6233, 6209, + 6209, 6233, 6234, 6210, + 6210, 6234, 6235, 6211, + 6211, 6235, 6236, 6212, + 6212, 6236, 6237, 6213, + 6213, 6237, 6238, 6214, + 6214, 6238, 6239, 6215, + 6215, 6239, 6240, 6216, + 6216, 6240, 6241, 6217, + 6217, 6241, 6242, 6218, + 6218, 6242, 6243, 6219, + 4271, 4272, 6244, 6220, + 6220, 6244, 6245, 6221, + 6221, 6245, 6246, 6222, + 6222, 6246, 6247, 6223, + 6223, 6247, 6248, 6224, + 6224, 6248, 6249, 6225, + 6225, 6249, 6250, 6226, + 6226, 6250, 6251, 6227, + 6227, 6251, 6252, 6228, + 6228, 6252, 6253, 6229, + 6229, 6253, 6254, 6230, + 6230, 6254, 6255, 6231, + 6231, 6255, 6256, 6232, + 6232, 6256, 6257, 6233, + 6233, 6257, 6258, 6234, + 6234, 6258, 6259, 6235, + 6235, 6259, 6260, 6236, + 6236, 6260, 6261, 6237, + 6237, 6261, 6262, 6238, + 6238, 6262, 6263, 6239, + 6239, 6263, 6264, 6240, + 6240, 6264, 6265, 6241, + 6241, 6265, 6266, 6242, + 6242, 6266, 6267, 6243, + 4272, 4273, 6268, 6244, + 6244, 6268, 6269, 6245, + 6245, 6269, 6270, 6246, + 6246, 6270, 6271, 6247, + 6247, 6271, 6272, 6248, + 6248, 6272, 6273, 6249, + 6249, 6273, 6274, 6250, + 6250, 6274, 6275, 6251, + 6251, 6275, 6276, 6252, + 6252, 6276, 6277, 6253, + 6253, 6277, 6278, 6254, + 6254, 6278, 6279, 6255, + 6255, 6279, 6280, 6256, + 6256, 6280, 6281, 6257, + 6257, 6281, 6282, 6258, + 6258, 6282, 6283, 6259, + 6259, 6283, 6284, 6260, + 6260, 6284, 6285, 6261, + 6261, 6285, 6286, 6262, + 6262, 6286, 6287, 6263, + 6263, 6287, 6288, 6264, + 6264, 6288, 6289, 6265, + 6265, 6289, 6290, 6266, + 6266, 6290, 6291, 6267, + 4273, 4274, 6292, 6268, + 6268, 6292, 6293, 6269, + 6269, 6293, 6294, 6270, + 6270, 6294, 6295, 6271, + 6271, 6295, 6296, 6272, + 6272, 6296, 6297, 6273, + 6273, 6297, 6298, 6274, + 6274, 6298, 6299, 6275, + 6275, 6299, 6300, 6276, + 6276, 6300, 6301, 6277, + 6277, 6301, 6302, 6278, + 6278, 6302, 6303, 6279, + 6279, 6303, 6304, 6280, + 6280, 6304, 6305, 6281, + 6281, 6305, 6306, 6282, + 6282, 6306, 6307, 6283, + 6283, 6307, 6308, 6284, + 6284, 6308, 6309, 6285, + 6285, 6309, 6310, 6286, + 6286, 6310, 6311, 6287, + 6287, 6311, 6312, 6288, + 6288, 6312, 6313, 6289, + 6289, 6313, 6314, 6290, + 6290, 6314, 6315, 6291, + 4274, 4275, 6316, 6292, + 6292, 6316, 6317, 6293, + 6293, 6317, 6318, 6294, + 6294, 6318, 6319, 6295, + 6295, 6319, 6320, 6296, + 6296, 6320, 6321, 6297, + 6297, 6321, 6322, 6298, + 6298, 6322, 6323, 6299, + 6299, 6323, 6324, 6300, + 6300, 6324, 6325, 6301, + 6301, 6325, 6326, 6302, + 6302, 6326, 6327, 6303, + 6303, 6327, 6328, 6304, + 6304, 6328, 6329, 6305, + 6305, 6329, 6330, 6306, + 6306, 6330, 6331, 6307, + 6307, 6331, 6332, 6308, + 6308, 6332, 6333, 6309, + 6309, 6333, 6334, 6310, + 6310, 6334, 6335, 6311, + 6311, 6335, 6336, 6312, + 6312, 6336, 6337, 6313, + 6313, 6337, 6338, 6314, + 6314, 6338, 6339, 6315, + 4275, 4276, 6340, 6316, + 6316, 6340, 6341, 6317, + 6317, 6341, 6342, 6318, + 6318, 6342, 6343, 6319, + 6319, 6343, 6344, 6320, + 6320, 6344, 6345, 6321, + 6321, 6345, 6346, 6322, + 6322, 6346, 6347, 6323, + 6323, 6347, 6348, 6324, + 6324, 6348, 6349, 6325, + 6325, 6349, 6350, 6326, + 6326, 6350, 6351, 6327, + 6327, 6351, 6352, 6328, + 6328, 6352, 6353, 6329, + 6329, 6353, 6354, 6330, + 6330, 6354, 6355, 6331, + 6331, 6355, 6356, 6332, + 6332, 6356, 6357, 6333, + 6333, 6357, 6358, 6334, + 6334, 6358, 6359, 6335, + 6335, 6359, 6360, 6336, + 6336, 6360, 6361, 6337, + 6337, 6361, 6362, 6338, + 6338, 6362, 6363, 6339, + 4276, 4277, 6364, 6340, + 6340, 6364, 6365, 6341, + 6341, 6365, 6366, 6342, + 6342, 6366, 6367, 6343, + 6343, 6367, 6368, 6344, + 6344, 6368, 6369, 6345, + 6345, 6369, 6370, 6346, + 6346, 6370, 6371, 6347, + 6347, 6371, 6372, 6348, + 6348, 6372, 6373, 6349, + 6349, 6373, 6374, 6350, + 6350, 6374, 6375, 6351, + 6351, 6375, 6376, 6352, + 6352, 6376, 6377, 6353, + 6353, 6377, 6378, 6354, + 6354, 6378, 6379, 6355, + 6355, 6379, 6380, 6356, + 6356, 6380, 6381, 6357, + 6357, 6381, 6382, 6358, + 6358, 6382, 6383, 6359, + 6359, 6383, 6384, 6360, + 6360, 6384, 6385, 6361, + 6361, 6385, 6386, 6362, + 6362, 6386, 6387, 6363, + 4277, 4278, 6388, 6364, + 6364, 6388, 6389, 6365, + 6365, 6389, 6390, 6366, + 6366, 6390, 6391, 6367, + 6367, 6391, 6392, 6368, + 6368, 6392, 6393, 6369, + 6369, 6393, 6394, 6370, + 6370, 6394, 6395, 6371, + 6371, 6395, 6396, 6372, + 6372, 6396, 6397, 6373, + 6373, 6397, 6398, 6374, + 6374, 6398, 6399, 6375, + 6375, 6399, 6400, 6376, + 6376, 6400, 6401, 6377, + 6377, 6401, 6402, 6378, + 6378, 6402, 6403, 6379, + 6379, 6403, 6404, 6380, + 6380, 6404, 6405, 6381, + 6381, 6405, 6406, 6382, + 6382, 6406, 6407, 6383, + 6383, 6407, 6408, 6384, + 6384, 6408, 6409, 6385, + 6385, 6409, 6410, 6386, + 6386, 6410, 6411, 6387, + 4278, 4279, 6412, 6388, + 6388, 6412, 6413, 6389, + 6389, 6413, 6414, 6390, + 6390, 6414, 6415, 6391, + 6391, 6415, 6416, 6392, + 6392, 6416, 6417, 6393, + 6393, 6417, 6418, 6394, + 6394, 6418, 6419, 6395, + 6395, 6419, 6420, 6396, + 6396, 6420, 6421, 6397, + 6397, 6421, 6422, 6398, + 6398, 6422, 6423, 6399, + 6399, 6423, 6424, 6400, + 6400, 6424, 6425, 6401, + 6401, 6425, 6426, 6402, + 6402, 6426, 6427, 6403, + 6403, 6427, 6428, 6404, + 6404, 6428, 6429, 6405, + 6405, 6429, 6430, 6406, + 6406, 6430, 6431, 6407, + 6407, 6431, 6432, 6408, + 6408, 6432, 6433, 6409, + 6409, 6433, 6434, 6410, + 6410, 6434, 6435, 6411, + 4279, 4280, 6436, 6412, + 6412, 6436, 6437, 6413, + 6413, 6437, 6438, 6414, + 6414, 6438, 6439, 6415, + 6415, 6439, 6440, 6416, + 6416, 6440, 6441, 6417, + 6417, 6441, 6442, 6418, + 6418, 6442, 6443, 6419, + 6419, 6443, 6444, 6420, + 6420, 6444, 6445, 6421, + 6421, 6445, 6446, 6422, + 6422, 6446, 6447, 6423, + 6423, 6447, 6448, 6424, + 6424, 6448, 6449, 6425, + 6425, 6449, 6450, 6426, + 6426, 6450, 6451, 6427, + 6427, 6451, 6452, 6428, + 6428, 6452, 6453, 6429, + 6429, 6453, 6454, 6430, + 6430, 6454, 6455, 6431, + 6431, 6455, 6456, 6432, + 6432, 6456, 6457, 6433, + 6433, 6457, 6458, 6434, + 6434, 6458, 6459, 6435, + 4280, 4281, 6460, 6436, + 6436, 6460, 6461, 6437, + 6437, 6461, 6462, 6438, + 6438, 6462, 6463, 6439, + 6439, 6463, 6464, 6440, + 6440, 6464, 6465, 6441, + 6441, 6465, 6466, 6442, + 6442, 6466, 6467, 6443, + 6443, 6467, 6468, 6444, + 6444, 6468, 6469, 6445, + 6445, 6469, 6470, 6446, + 6446, 6470, 6471, 6447, + 6447, 6471, 6472, 6448, + 6448, 6472, 6473, 6449, + 6449, 6473, 6474, 6450, + 6450, 6474, 6475, 6451, + 6451, 6475, 6476, 6452, + 6452, 6476, 6477, 6453, + 6453, 6477, 6478, 6454, + 6454, 6478, 6479, 6455, + 6455, 6479, 6480, 6456, + 6456, 6480, 6481, 6457, + 6457, 6481, 6482, 6458, + 6458, 6482, 6483, 6459, + 4281, 4282, 6484, 6460, + 6460, 6484, 6485, 6461, + 6461, 6485, 6486, 6462, + 6462, 6486, 6487, 6463, + 6463, 6487, 6488, 6464, + 6464, 6488, 6489, 6465, + 6465, 6489, 6490, 6466, + 6466, 6490, 6491, 6467, + 6467, 6491, 6492, 6468, + 6468, 6492, 6493, 6469, + 6469, 6493, 6494, 6470, + 6470, 6494, 6495, 6471, + 6471, 6495, 6496, 6472, + 6472, 6496, 6497, 6473, + 6473, 6497, 6498, 6474, + 6474, 6498, 6499, 6475, + 6475, 6499, 6500, 6476, + 6476, 6500, 6501, 6477, + 6477, 6501, 6502, 6478, + 6478, 6502, 6503, 6479, + 6479, 6503, 6504, 6480, + 6480, 6504, 6505, 6481, + 6481, 6505, 6506, 6482, + 6482, 6506, 6507, 6483, + 4282, 4283, 6508, 6484, + 6484, 6508, 6509, 6485, + 6485, 6509, 6510, 6486, + 6486, 6510, 6511, 6487, + 6487, 6511, 6512, 6488, + 6488, 6512, 6513, 6489, + 6489, 6513, 6514, 6490, + 6490, 6514, 6515, 6491, + 6491, 6515, 6516, 6492, + 6492, 6516, 6517, 6493, + 6493, 6517, 6518, 6494, + 6494, 6518, 6519, 6495, + 6495, 6519, 6520, 6496, + 6496, 6520, 6521, 6497, + 6497, 6521, 6522, 6498, + 6498, 6522, 6523, 6499, + 6499, 6523, 6524, 6500, + 6500, 6524, 6525, 6501, + 6501, 6525, 6526, 6502, + 6502, 6526, 6527, 6503, + 6503, 6527, 6528, 6504, + 6504, 6528, 6529, 6505, + 6505, 6529, 6530, 6506, + 6506, 6530, 6531, 6507, + 4283, 4284, 6532, 6508, + 6508, 6532, 6533, 6509, + 6509, 6533, 6534, 6510, + 6510, 6534, 6535, 6511, + 6511, 6535, 6536, 6512, + 6512, 6536, 6537, 6513, + 6513, 6537, 6538, 6514, + 6514, 6538, 6539, 6515, + 6515, 6539, 6540, 6516, + 6516, 6540, 6541, 6517, + 6517, 6541, 6542, 6518, + 6518, 6542, 6543, 6519, + 6519, 6543, 6544, 6520, + 6520, 6544, 6545, 6521, + 6521, 6545, 6546, 6522, + 6522, 6546, 6547, 6523, + 6523, 6547, 6548, 6524, + 6524, 6548, 6549, 6525, + 6525, 6549, 6550, 6526, + 6526, 6550, 6551, 6527, + 6527, 6551, 6552, 6528, + 6528, 6552, 6553, 6529, + 6529, 6553, 6554, 6530, + 6530, 6554, 6555, 6531, + 4284, 4285, 6556, 6532, + 6532, 6556, 6557, 6533, + 6533, 6557, 6558, 6534, + 6534, 6558, 6559, 6535, + 6535, 6559, 6560, 6536, + 6536, 6560, 6561, 6537, + 6537, 6561, 6562, 6538, + 6538, 6562, 6563, 6539, + 6539, 6563, 6564, 6540, + 6540, 6564, 6565, 6541, + 6541, 6565, 6566, 6542, + 6542, 6566, 6567, 6543, + 6543, 6567, 6568, 6544, + 6544, 6568, 6569, 6545, + 6545, 6569, 6570, 6546, + 6546, 6570, 6571, 6547, + 6547, 6571, 6572, 6548, + 6548, 6572, 6573, 6549, + 6549, 6573, 6574, 6550, + 6550, 6574, 6575, 6551, + 6551, 6575, 6576, 6552, + 6552, 6576, 6577, 6553, + 6553, 6577, 6578, 6554, + 6554, 6578, 6579, 6555, + 4285, 4286, 6580, 6556, + 6556, 6580, 6581, 6557, + 6557, 6581, 6582, 6558, + 6558, 6582, 6583, 6559, + 6559, 6583, 6584, 6560, + 6560, 6584, 6585, 6561, + 6561, 6585, 6586, 6562, + 6562, 6586, 6587, 6563, + 6563, 6587, 6588, 6564, + 6564, 6588, 6589, 6565, + 6565, 6589, 6590, 6566, + 6566, 6590, 6591, 6567, + 6567, 6591, 6592, 6568, + 6568, 6592, 6593, 6569, + 6569, 6593, 6594, 6570, + 6570, 6594, 6595, 6571, + 6571, 6595, 6596, 6572, + 6572, 6596, 6597, 6573, + 6573, 6597, 6598, 6574, + 6574, 6598, 6599, 6575, + 6575, 6599, 6600, 6576, + 6576, 6600, 6601, 6577, + 6577, 6601, 6602, 6578, + 6578, 6602, 6603, 6579, + 4286, 4287, 6604, 6580, + 6580, 6604, 6605, 6581, + 6581, 6605, 6606, 6582, + 6582, 6606, 6607, 6583, + 6583, 6607, 6608, 6584, + 6584, 6608, 6609, 6585, + 6585, 6609, 6610, 6586, + 6586, 6610, 6611, 6587, + 6587, 6611, 6612, 6588, + 6588, 6612, 6613, 6589, + 6589, 6613, 6614, 6590, + 6590, 6614, 6615, 6591, + 6591, 6615, 6616, 6592, + 6592, 6616, 6617, 6593, + 6593, 6617, 6618, 6594, + 6594, 6618, 6619, 6595, + 6595, 6619, 6620, 6596, + 6596, 6620, 6621, 6597, + 6597, 6621, 6622, 6598, + 6598, 6622, 6623, 6599, + 6599, 6623, 6624, 6600, + 6600, 6624, 6625, 6601, + 6601, 6625, 6626, 6602, + 6602, 6626, 6627, 6603, + 4287, 4288, 6628, 6604, + 6604, 6628, 6629, 6605, + 6605, 6629, 6630, 6606, + 6606, 6630, 6631, 6607, + 6607, 6631, 6632, 6608, + 6608, 6632, 6633, 6609, + 6609, 6633, 6634, 6610, + 6610, 6634, 6635, 6611, + 6611, 6635, 6636, 6612, + 6612, 6636, 6637, 6613, + 6613, 6637, 6638, 6614, + 6614, 6638, 6639, 6615, + 6615, 6639, 6640, 6616, + 6616, 6640, 6641, 6617, + 6617, 6641, 6642, 6618, + 6618, 6642, 6643, 6619, + 6619, 6643, 6644, 6620, + 6620, 6644, 6645, 6621, + 6621, 6645, 6646, 6622, + 6622, 6646, 6647, 6623, + 6623, 6647, 6648, 6624, + 6624, 6648, 6649, 6625, + 6625, 6649, 6650, 6626, + 6626, 6650, 6651, 6627, + 4288, 4289, 6652, 6628, + 6628, 6652, 6653, 6629, + 6629, 6653, 6654, 6630, + 6630, 6654, 6655, 6631, + 6631, 6655, 6656, 6632, + 6632, 6656, 6657, 6633, + 6633, 6657, 6658, 6634, + 6634, 6658, 6659, 6635, + 6635, 6659, 6660, 6636, + 6636, 6660, 6661, 6637, + 6637, 6661, 6662, 6638, + 6638, 6662, 6663, 6639, + 6639, 6663, 6664, 6640, + 6640, 6664, 6665, 6641, + 6641, 6665, 6666, 6642, + 6642, 6666, 6667, 6643, + 6643, 6667, 6668, 6644, + 6644, 6668, 6669, 6645, + 6645, 6669, 6670, 6646, + 6646, 6670, 6671, 6647, + 6647, 6671, 6672, 6648, + 6648, 6672, 6673, 6649, + 6649, 6673, 6674, 6650, + 6650, 6674, 6675, 6651, + 4289, 4290, 6676, 6652, + 6652, 6676, 6677, 6653, + 6653, 6677, 6678, 6654, + 6654, 6678, 6679, 6655, + 6655, 6679, 6680, 6656, + 6656, 6680, 6681, 6657, + 6657, 6681, 6682, 6658, + 6658, 6682, 6683, 6659, + 6659, 6683, 6684, 6660, + 6660, 6684, 6685, 6661, + 6661, 6685, 6686, 6662, + 6662, 6686, 6687, 6663, + 6663, 6687, 6688, 6664, + 6664, 6688, 6689, 6665, + 6665, 6689, 6690, 6666, + 6666, 6690, 6691, 6667, + 6667, 6691, 6692, 6668, + 6668, 6692, 6693, 6669, + 6669, 6693, 6694, 6670, + 6670, 6694, 6695, 6671, + 6671, 6695, 6696, 6672, + 6672, 6696, 6697, 6673, + 6673, 6697, 6698, 6674, + 6674, 6698, 6699, 6675, + 4290, 4291, 6700, 6676, + 6676, 6700, 6701, 6677, + 6677, 6701, 6702, 6678, + 6678, 6702, 6703, 6679, + 6679, 6703, 6704, 6680, + 6680, 6704, 6705, 6681, + 6681, 6705, 6706, 6682, + 6682, 6706, 6707, 6683, + 6683, 6707, 6708, 6684, + 6684, 6708, 6709, 6685, + 6685, 6709, 6710, 6686, + 6686, 6710, 6711, 6687, + 6687, 6711, 6712, 6688, + 6688, 6712, 6713, 6689, + 6689, 6713, 6714, 6690, + 6690, 6714, 6715, 6691, + 6691, 6715, 6716, 6692, + 6692, 6716, 6717, 6693, + 6693, 6717, 6718, 6694, + 6694, 6718, 6719, 6695, + 6695, 6719, 6720, 6696, + 6696, 6720, 6721, 6697, + 6697, 6721, 6722, 6698, + 6698, 6722, 6723, 6699, + 4291, 4292, 6724, 6700, + 6700, 6724, 6725, 6701, + 6701, 6725, 6726, 6702, + 6702, 6726, 6727, 6703, + 6703, 6727, 6728, 6704, + 6704, 6728, 6729, 6705, + 6705, 6729, 6730, 6706, + 6706, 6730, 6731, 6707, + 6707, 6731, 6732, 6708, + 6708, 6732, 6733, 6709, + 6709, 6733, 6734, 6710, + 6710, 6734, 6735, 6711, + 6711, 6735, 6736, 6712, + 6712, 6736, 6737, 6713, + 6713, 6737, 6738, 6714, + 6714, 6738, 6739, 6715, + 6715, 6739, 6740, 6716, + 6716, 6740, 6741, 6717, + 6717, 6741, 6742, 6718, + 6718, 6742, 6743, 6719, + 6719, 6743, 6744, 6720, + 6720, 6744, 6745, 6721, + 6721, 6745, 6746, 6722, + 6722, 6746, 6747, 6723, + 4292, 4293, 6748, 6724, + 6724, 6748, 6749, 6725, + 6725, 6749, 6750, 6726, + 6726, 6750, 6751, 6727, + 6727, 6751, 6752, 6728, + 6728, 6752, 6753, 6729, + 6729, 6753, 6754, 6730, + 6730, 6754, 6755, 6731, + 6731, 6755, 6756, 6732, + 6732, 6756, 6757, 6733, + 6733, 6757, 6758, 6734, + 6734, 6758, 6759, 6735, + 6735, 6759, 6760, 6736, + 6736, 6760, 6761, 6737, + 6737, 6761, 6762, 6738, + 6738, 6762, 6763, 6739, + 6739, 6763, 6764, 6740, + 6740, 6764, 6765, 6741, + 6741, 6765, 6766, 6742, + 6742, 6766, 6767, 6743, + 6743, 6767, 6768, 6744, + 6744, 6768, 6769, 6745, + 6745, 6769, 6770, 6746, + 6746, 6770, 6771, 6747, + 4293, 4294, 6772, 6748, + 6748, 6772, 6773, 6749, + 6749, 6773, 6774, 6750, + 6750, 6774, 6775, 6751, + 6751, 6775, 6776, 6752, + 6752, 6776, 6777, 6753, + 6753, 6777, 6778, 6754, + 6754, 6778, 6779, 6755, + 6755, 6779, 6780, 6756, + 6756, 6780, 6781, 6757, + 6757, 6781, 6782, 6758, + 6758, 6782, 6783, 6759, + 6759, 6783, 6784, 6760, + 6760, 6784, 6785, 6761, + 6761, 6785, 6786, 6762, + 6762, 6786, 6787, 6763, + 6763, 6787, 6788, 6764, + 6764, 6788, 6789, 6765, + 6765, 6789, 6790, 6766, + 6766, 6790, 6791, 6767, + 6767, 6791, 6792, 6768, + 6768, 6792, 6793, 6769, + 6769, 6793, 6794, 6770, + 6770, 6794, 6795, 6771, + 4294, 4295, 6796, 6772, + 6772, 6796, 6797, 6773, + 6773, 6797, 6798, 6774, + 6774, 6798, 6799, 6775, + 6775, 6799, 6800, 6776, + 6776, 6800, 6801, 6777, + 6777, 6801, 6802, 6778, + 6778, 6802, 6803, 6779, + 6779, 6803, 6804, 6780, + 6780, 6804, 6805, 6781, + 6781, 6805, 6806, 6782, + 6782, 6806, 6807, 6783, + 6783, 6807, 6808, 6784, + 6784, 6808, 6809, 6785, + 6785, 6809, 6810, 6786, + 6786, 6810, 6811, 6787, + 6787, 6811, 6812, 6788, + 6788, 6812, 6813, 6789, + 6789, 6813, 6814, 6790, + 6790, 6814, 6815, 6791, + 6791, 6815, 6816, 6792, + 6792, 6816, 6817, 6793, + 6793, 6817, 6818, 6794, + 6794, 6818, 6819, 6795, + 4295, 4296, 6820, 6796, + 6796, 6820, 6821, 6797, + 6797, 6821, 6822, 6798, + 6798, 6822, 6823, 6799, + 6799, 6823, 6824, 6800, + 6800, 6824, 6825, 6801, + 6801, 6825, 6826, 6802, + 6802, 6826, 6827, 6803, + 6803, 6827, 6828, 6804, + 6804, 6828, 6829, 6805, + 6805, 6829, 6830, 6806, + 6806, 6830, 6831, 6807, + 6807, 6831, 6832, 6808, + 6808, 6832, 6833, 6809, + 6809, 6833, 6834, 6810, + 6810, 6834, 6835, 6811, + 6811, 6835, 6836, 6812, + 6812, 6836, 6837, 6813, + 6813, 6837, 6838, 6814, + 6814, 6838, 6839, 6815, + 6815, 6839, 6840, 6816, + 6816, 6840, 6841, 6817, + 6817, 6841, 6842, 6818, + 6818, 6842, 6843, 6819, + 4296, 4297, 6844, 6820, + 6820, 6844, 6845, 6821, + 6821, 6845, 6846, 6822, + 6822, 6846, 6847, 6823, + 6823, 6847, 6848, 6824, + 6824, 6848, 6849, 6825, + 6825, 6849, 6850, 6826, + 6826, 6850, 6851, 6827, + 6827, 6851, 6852, 6828, + 6828, 6852, 6853, 6829, + 6829, 6853, 6854, 6830, + 6830, 6854, 6855, 6831, + 6831, 6855, 6856, 6832, + 6832, 6856, 6857, 6833, + 6833, 6857, 6858, 6834, + 6834, 6858, 6859, 6835, + 6835, 6859, 6860, 6836, + 6836, 6860, 6861, 6837, + 6837, 6861, 6862, 6838, + 6838, 6862, 6863, 6839, + 6839, 6863, 6864, 6840, + 6840, 6864, 6865, 6841, + 6841, 6865, 6866, 6842, + 6842, 6866, 6867, 6843, + 4297, 4298, 6868, 6844, + 6844, 6868, 6869, 6845, + 6845, 6869, 6870, 6846, + 6846, 6870, 6871, 6847, + 6847, 6871, 6872, 6848, + 6848, 6872, 6873, 6849, + 6849, 6873, 6874, 6850, + 6850, 6874, 6875, 6851, + 6851, 6875, 6876, 6852, + 6852, 6876, 6877, 6853, + 6853, 6877, 6878, 6854, + 6854, 6878, 6879, 6855, + 6855, 6879, 6880, 6856, + 6856, 6880, 6881, 6857, + 6857, 6881, 6882, 6858, + 6858, 6882, 6883, 6859, + 6859, 6883, 6884, 6860, + 6860, 6884, 6885, 6861, + 6861, 6885, 6886, 6862, + 6862, 6886, 6887, 6863, + 6863, 6887, 6888, 6864, + 6864, 6888, 6889, 6865, + 6865, 6889, 6890, 6866, + 6866, 6890, 6891, 6867, + 4298, 4299, 6892, 6868, + 6868, 6892, 6893, 6869, + 6869, 6893, 6894, 6870, + 6870, 6894, 6895, 6871, + 6871, 6895, 6896, 6872, + 6872, 6896, 6897, 6873, + 6873, 6897, 6898, 6874, + 6874, 6898, 6899, 6875, + 6875, 6899, 6900, 6876, + 6876, 6900, 6901, 6877, + 6877, 6901, 6902, 6878, + 6878, 6902, 6903, 6879, + 6879, 6903, 6904, 6880, + 6880, 6904, 6905, 6881, + 6881, 6905, 6906, 6882, + 6882, 6906, 6907, 6883, + 6883, 6907, 6908, 6884, + 6884, 6908, 6909, 6885, + 6885, 6909, 6910, 6886, + 6886, 6910, 6911, 6887, + 6887, 6911, 6912, 6888, + 6888, 6912, 6913, 6889, + 6889, 6913, 6914, 6890, + 6890, 6914, 6915, 6891, + 4299, 4300, 6916, 6892, + 6892, 6916, 6917, 6893, + 6893, 6917, 6918, 6894, + 6894, 6918, 6919, 6895, + 6895, 6919, 6920, 6896, + 6896, 6920, 6921, 6897, + 6897, 6921, 6922, 6898, + 6898, 6922, 6923, 6899, + 6899, 6923, 6924, 6900, + 6900, 6924, 6925, 6901, + 6901, 6925, 6926, 6902, + 6902, 6926, 6927, 6903, + 6903, 6927, 6928, 6904, + 6904, 6928, 6929, 6905, + 6905, 6929, 6930, 6906, + 6906, 6930, 6931, 6907, + 6907, 6931, 6932, 6908, + 6908, 6932, 6933, 6909, + 6909, 6933, 6934, 6910, + 6910, 6934, 6935, 6911, + 6911, 6935, 6936, 6912, + 6912, 6936, 6937, 6913, + 6913, 6937, 6938, 6914, + 6914, 6938, 6939, 6915, + 4300, 4301, 6940, 6916, + 6916, 6940, 6941, 6917, + 6917, 6941, 6942, 6918, + 6918, 6942, 6943, 6919, + 6919, 6943, 6944, 6920, + 6920, 6944, 6945, 6921, + 6921, 6945, 6946, 6922, + 6922, 6946, 6947, 6923, + 6923, 6947, 6948, 6924, + 6924, 6948, 6949, 6925, + 6925, 6949, 6950, 6926, + 6926, 6950, 6951, 6927, + 6927, 6951, 6952, 6928, + 6928, 6952, 6953, 6929, + 6929, 6953, 6954, 6930, + 6930, 6954, 6955, 6931, + 6931, 6955, 6956, 6932, + 6932, 6956, 6957, 6933, + 6933, 6957, 6958, 6934, + 6934, 6958, 6959, 6935, + 6935, 6959, 6960, 6936, + 6936, 6960, 6961, 6937, + 6937, 6961, 6962, 6938, + 6938, 6962, 6963, 6939, + 4301, 4302, 6964, 6940, + 6940, 6964, 6965, 6941, + 6941, 6965, 6966, 6942, + 6942, 6966, 6967, 6943, + 6943, 6967, 6968, 6944, + 6944, 6968, 6969, 6945, + 6945, 6969, 6970, 6946, + 6946, 6970, 6971, 6947, + 6947, 6971, 6972, 6948, + 6948, 6972, 6973, 6949, + 6949, 6973, 6974, 6950, + 6950, 6974, 6975, 6951, + 6951, 6975, 6976, 6952, + 6952, 6976, 6977, 6953, + 6953, 6977, 6978, 6954, + 6954, 6978, 6979, 6955, + 6955, 6979, 6980, 6956, + 6956, 6980, 6981, 6957, + 6957, 6981, 6982, 6958, + 6958, 6982, 6983, 6959, + 6959, 6983, 6984, 6960, + 6960, 6984, 6985, 6961, + 6961, 6985, 6986, 6962, + 6962, 6986, 6987, 6963, + 4302, 4303, 6988, 6964, + 6964, 6988, 6989, 6965, + 6965, 6989, 6990, 6966, + 6966, 6990, 6991, 6967, + 6967, 6991, 6992, 6968, + 6968, 6992, 6993, 6969, + 6969, 6993, 6994, 6970, + 6970, 6994, 6995, 6971, + 6971, 6995, 6996, 6972, + 6972, 6996, 6997, 6973, + 6973, 6997, 6998, 6974, + 6974, 6998, 6999, 6975, + 6975, 6999, 7000, 6976, + 6976, 7000, 7001, 6977, + 6977, 7001, 7002, 6978, + 6978, 7002, 7003, 6979, + 6979, 7003, 7004, 6980, + 6980, 7004, 7005, 6981, + 6981, 7005, 7006, 6982, + 6982, 7006, 7007, 6983, + 6983, 7007, 7008, 6984, + 6984, 7008, 7009, 6985, + 6985, 7009, 7010, 6986, + 6986, 7010, 7011, 6987, + 4303, 4304, 7012, 6988, + 6988, 7012, 7013, 6989, + 6989, 7013, 7014, 6990, + 6990, 7014, 7015, 6991, + 6991, 7015, 7016, 6992, + 6992, 7016, 7017, 6993, + 6993, 7017, 7018, 6994, + 6994, 7018, 7019, 6995, + 6995, 7019, 7020, 6996, + 6996, 7020, 7021, 6997, + 6997, 7021, 7022, 6998, + 6998, 7022, 7023, 6999, + 6999, 7023, 7024, 7000, + 7000, 7024, 7025, 7001, + 7001, 7025, 7026, 7002, + 7002, 7026, 7027, 7003, + 7003, 7027, 7028, 7004, + 7004, 7028, 7029, 7005, + 7005, 7029, 7030, 7006, + 7006, 7030, 7031, 7007, + 7007, 7031, 7032, 7008, + 7008, 7032, 7033, 7009, + 7009, 7033, 7034, 7010, + 7010, 7034, 7035, 7011, + 4304, 4305, 7036, 7012, + 7012, 7036, 7037, 7013, + 7013, 7037, 7038, 7014, + 7014, 7038, 7039, 7015, + 7015, 7039, 7040, 7016, + 7016, 7040, 7041, 7017, + 7017, 7041, 7042, 7018, + 7018, 7042, 7043, 7019, + 7019, 7043, 7044, 7020, + 7020, 7044, 7045, 7021, + 7021, 7045, 7046, 7022, + 7022, 7046, 7047, 7023, + 7023, 7047, 7048, 7024, + 7024, 7048, 7049, 7025, + 7025, 7049, 7050, 7026, + 7026, 7050, 7051, 7027, + 7027, 7051, 7052, 7028, + 7028, 7052, 7053, 7029, + 7029, 7053, 7054, 7030, + 7030, 7054, 7055, 7031, + 7031, 7055, 7056, 7032, + 7032, 7056, 7057, 7033, + 7033, 7057, 7058, 7034, + 7034, 7058, 7059, 7035, + 4305, 4306, 7060, 7036, + 7036, 7060, 7061, 7037, + 7037, 7061, 7062, 7038, + 7038, 7062, 7063, 7039, + 7039, 7063, 7064, 7040, + 7040, 7064, 7065, 7041, + 7041, 7065, 7066, 7042, + 7042, 7066, 7067, 7043, + 7043, 7067, 7068, 7044, + 7044, 7068, 7069, 7045, + 7045, 7069, 7070, 7046, + 7046, 7070, 7071, 7047, + 7047, 7071, 7072, 7048, + 7048, 7072, 7073, 7049, + 7049, 7073, 7074, 7050, + 7050, 7074, 7075, 7051, + 7051, 7075, 7076, 7052, + 7052, 7076, 7077, 7053, + 7053, 7077, 7078, 7054, + 7054, 7078, 7079, 7055, + 7055, 7079, 7080, 7056, + 7056, 7080, 7081, 7057, + 7057, 7081, 7082, 7058, + 7058, 7082, 7083, 7059, + 4306, 4307, 7084, 7060, + 7060, 7084, 7085, 7061, + 7061, 7085, 7086, 7062, + 7062, 7086, 7087, 7063, + 7063, 7087, 7088, 7064, + 7064, 7088, 7089, 7065, + 7065, 7089, 7090, 7066, + 7066, 7090, 7091, 7067, + 7067, 7091, 7092, 7068, + 7068, 7092, 7093, 7069, + 7069, 7093, 7094, 7070, + 7070, 7094, 7095, 7071, + 7071, 7095, 7096, 7072, + 7072, 7096, 7097, 7073, + 7073, 7097, 7098, 7074, + 7074, 7098, 7099, 7075, + 7075, 7099, 7100, 7076, + 7076, 7100, 7101, 7077, + 7077, 7101, 7102, 7078, + 7078, 7102, 7103, 7079, + 7079, 7103, 7104, 7080, + 7080, 7104, 7105, 7081, + 7081, 7105, 7106, 7082, + 7082, 7106, 7107, 7083, + 4307, 4308, 7108, 7084, + 7084, 7108, 7109, 7085, + 7085, 7109, 7110, 7086, + 7086, 7110, 7111, 7087, + 7087, 7111, 7112, 7088, + 7088, 7112, 7113, 7089, + 7089, 7113, 7114, 7090, + 7090, 7114, 7115, 7091, + 7091, 7115, 7116, 7092, + 7092, 7116, 7117, 7093, + 7093, 7117, 7118, 7094, + 7094, 7118, 7119, 7095, + 7095, 7119, 7120, 7096, + 7096, 7120, 7121, 7097, + 7097, 7121, 7122, 7098, + 7098, 7122, 7123, 7099, + 7099, 7123, 7124, 7100, + 7100, 7124, 7125, 7101, + 7101, 7125, 7126, 7102, + 7102, 7126, 7127, 7103, + 7103, 7127, 7128, 7104, + 7104, 7128, 7129, 7105, + 7105, 7129, 7130, 7106, + 7106, 7130, 7131, 7107, + 4308, 4309, 7132, 7108, + 7108, 7132, 7133, 7109, + 7109, 7133, 7134, 7110, + 7110, 7134, 7135, 7111, + 7111, 7135, 7136, 7112, + 7112, 7136, 7137, 7113, + 7113, 7137, 7138, 7114, + 7114, 7138, 7139, 7115, + 7115, 7139, 7140, 7116, + 7116, 7140, 7141, 7117, + 7117, 7141, 7142, 7118, + 7118, 7142, 7143, 7119, + 7119, 7143, 7144, 7120, + 7120, 7144, 7145, 7121, + 7121, 7145, 7146, 7122, + 7122, 7146, 7147, 7123, + 7123, 7147, 7148, 7124, + 7124, 7148, 7149, 7125, + 7125, 7149, 7150, 7126, + 7126, 7150, 7151, 7127, + 7127, 7151, 7152, 7128, + 7128, 7152, 7153, 7129, + 7129, 7153, 7154, 7130, + 7130, 7154, 7155, 7131, + 4309, 4310, 7156, 7132, + 7132, 7156, 7157, 7133, + 7133, 7157, 7158, 7134, + 7134, 7158, 7159, 7135, + 7135, 7159, 7160, 7136, + 7136, 7160, 7161, 7137, + 7137, 7161, 7162, 7138, + 7138, 7162, 7163, 7139, + 7139, 7163, 7164, 7140, + 7140, 7164, 7165, 7141, + 7141, 7165, 7166, 7142, + 7142, 7166, 7167, 7143, + 7143, 7167, 7168, 7144, + 7144, 7168, 7169, 7145, + 7145, 7169, 7170, 7146, + 7146, 7170, 7171, 7147, + 7147, 7171, 7172, 7148, + 7148, 7172, 7173, 7149, + 7149, 7173, 7174, 7150, + 7150, 7174, 7175, 7151, + 7151, 7175, 7176, 7152, + 7152, 7176, 7177, 7153, + 7153, 7177, 7178, 7154, + 7154, 7178, 7179, 7155, + 4310, 4311, 7180, 7156, + 7156, 7180, 7181, 7157, + 7157, 7181, 7182, 7158, + 7158, 7182, 7183, 7159, + 7159, 7183, 7184, 7160, + 7160, 7184, 7185, 7161, + 7161, 7185, 7186, 7162, + 7162, 7186, 7187, 7163, + 7163, 7187, 7188, 7164, + 7164, 7188, 7189, 7165, + 7165, 7189, 7190, 7166, + 7166, 7190, 7191, 7167, + 7167, 7191, 7192, 7168, + 7168, 7192, 7193, 7169, + 7169, 7193, 7194, 7170, + 7170, 7194, 7195, 7171, + 7171, 7195, 7196, 7172, + 7172, 7196, 7197, 7173, + 7173, 7197, 7198, 7174, + 7174, 7198, 7199, 7175, + 7175, 7199, 7200, 7176, + 7176, 7200, 7201, 7177, + 7177, 7201, 7202, 7178, + 7178, 7202, 7203, 7179, + 4311, 4312, 7204, 7180, + 7180, 7204, 7205, 7181, + 7181, 7205, 7206, 7182, + 7182, 7206, 7207, 7183, + 7183, 7207, 7208, 7184, + 7184, 7208, 7209, 7185, + 7185, 7209, 7210, 7186, + 7186, 7210, 7211, 7187, + 7187, 7211, 7212, 7188, + 7188, 7212, 7213, 7189, + 7189, 7213, 7214, 7190, + 7190, 7214, 7215, 7191, + 7191, 7215, 7216, 7192, + 7192, 7216, 7217, 7193, + 7193, 7217, 7218, 7194, + 7194, 7218, 7219, 7195, + 7195, 7219, 7220, 7196, + 7196, 7220, 7221, 7197, + 7197, 7221, 7222, 7198, + 7198, 7222, 7223, 7199, + 7199, 7223, 7224, 7200, + 7200, 7224, 7225, 7201, + 7201, 7225, 7226, 7202, + 7202, 7226, 7227, 7203, + 4312, 4313, 7228, 7204, + 7204, 7228, 7229, 7205, + 7205, 7229, 7230, 7206, + 7206, 7230, 7231, 7207, + 7207, 7231, 7232, 7208, + 7208, 7232, 7233, 7209, + 7209, 7233, 7234, 7210, + 7210, 7234, 7235, 7211, + 7211, 7235, 7236, 7212, + 7212, 7236, 7237, 7213, + 7213, 7237, 7238, 7214, + 7214, 7238, 7239, 7215, + 7215, 7239, 7240, 7216, + 7216, 7240, 7241, 7217, + 7217, 7241, 7242, 7218, + 7218, 7242, 7243, 7219, + 7219, 7243, 7244, 7220, + 7220, 7244, 7245, 7221, + 7221, 7245, 7246, 7222, + 7222, 7246, 7247, 7223, + 7223, 7247, 7248, 7224, + 7224, 7248, 7249, 7225, + 7225, 7249, 7250, 7226, + 7226, 7250, 7251, 7227, + 4313, 4314, 7252, 7228, + 7228, 7252, 7253, 7229, + 7229, 7253, 7254, 7230, + 7230, 7254, 7255, 7231, + 7231, 7255, 7256, 7232, + 7232, 7256, 7257, 7233, + 7233, 7257, 7258, 7234, + 7234, 7258, 7259, 7235, + 7235, 7259, 7260, 7236, + 7236, 7260, 7261, 7237, + 7237, 7261, 7262, 7238, + 7238, 7262, 7263, 7239, + 7239, 7263, 7264, 7240, + 7240, 7264, 7265, 7241, + 7241, 7265, 7266, 7242, + 7242, 7266, 7267, 7243, + 7243, 7267, 7268, 7244, + 7244, 7268, 7269, 7245, + 7245, 7269, 7270, 7246, + 7246, 7270, 7271, 7247, + 7247, 7271, 7272, 7248, + 7248, 7272, 7273, 7249, + 7249, 7273, 7274, 7250, + 7250, 7274, 7275, 7251, + 4314, 4315, 7276, 7252, + 7252, 7276, 7277, 7253, + 7253, 7277, 7278, 7254, + 7254, 7278, 7279, 7255, + 7255, 7279, 7280, 7256, + 7256, 7280, 7281, 7257, + 7257, 7281, 7282, 7258, + 7258, 7282, 7283, 7259, + 7259, 7283, 7284, 7260, + 7260, 7284, 7285, 7261, + 7261, 7285, 7286, 7262, + 7262, 7286, 7287, 7263, + 7263, 7287, 7288, 7264, + 7264, 7288, 7289, 7265, + 7265, 7289, 7290, 7266, + 7266, 7290, 7291, 7267, + 7267, 7291, 7292, 7268, + 7268, 7292, 7293, 7269, + 7269, 7293, 7294, 7270, + 7270, 7294, 7295, 7271, + 7271, 7295, 7296, 7272, + 7272, 7296, 7297, 7273, + 7273, 7297, 7298, 7274, + 7274, 7298, 7299, 7275, + 4315, 4316, 7300, 7276, + 7276, 7300, 7301, 7277, + 7277, 7301, 7302, 7278, + 7278, 7302, 7303, 7279, + 7279, 7303, 7304, 7280, + 7280, 7304, 7305, 7281, + 7281, 7305, 7306, 7282, + 7282, 7306, 7307, 7283, + 7283, 7307, 7308, 7284, + 7284, 7308, 7309, 7285, + 7285, 7309, 7310, 7286, + 7286, 7310, 7311, 7287, + 7287, 7311, 7312, 7288, + 7288, 7312, 7313, 7289, + 7289, 7313, 7314, 7290, + 7290, 7314, 7315, 7291, + 7291, 7315, 7316, 7292, + 7292, 7316, 7317, 7293, + 7293, 7317, 7318, 7294, + 7294, 7318, 7319, 7295, + 7295, 7319, 7320, 7296, + 7296, 7320, 7321, 7297, + 7297, 7321, 7322, 7298, + 7298, 7322, 7323, 7299, + 4316, 4317, 7324, 7300, + 7300, 7324, 7325, 7301, + 7301, 7325, 7326, 7302, + 7302, 7326, 7327, 7303, + 7303, 7327, 7328, 7304, + 7304, 7328, 7329, 7305, + 7305, 7329, 7330, 7306, + 7306, 7330, 7331, 7307, + 7307, 7331, 7332, 7308, + 7308, 7332, 7333, 7309, + 7309, 7333, 7334, 7310, + 7310, 7334, 7335, 7311, + 7311, 7335, 7336, 7312, + 7312, 7336, 7337, 7313, + 7313, 7337, 7338, 7314, + 7314, 7338, 7339, 7315, + 7315, 7339, 7340, 7316, + 7316, 7340, 7341, 7317, + 7317, 7341, 7342, 7318, + 7318, 7342, 7343, 7319, + 7319, 7343, 7344, 7320, + 7320, 7344, 7345, 7321, + 7321, 7345, 7346, 7322, + 7322, 7346, 7347, 7323, + 4317, 4318, 7348, 7324, + 7324, 7348, 7349, 7325, + 7325, 7349, 7350, 7326, + 7326, 7350, 7351, 7327, + 7327, 7351, 7352, 7328, + 7328, 7352, 7353, 7329, + 7329, 7353, 7354, 7330, + 7330, 7354, 7355, 7331, + 7331, 7355, 7356, 7332, + 7332, 7356, 7357, 7333, + 7333, 7357, 7358, 7334, + 7334, 7358, 7359, 7335, + 7335, 7359, 7360, 7336, + 7336, 7360, 7361, 7337, + 7337, 7361, 7362, 7338, + 7338, 7362, 7363, 7339, + 7339, 7363, 7364, 7340, + 7340, 7364, 7365, 7341, + 7341, 7365, 7366, 7342, + 7342, 7366, 7367, 7343, + 7343, 7367, 7368, 7344, + 7344, 7368, 7369, 7345, + 7345, 7369, 7370, 7346, + 7346, 7370, 7371, 7347, + 4318, 4319, 7372, 7348, + 7348, 7372, 7373, 7349, + 7349, 7373, 7374, 7350, + 7350, 7374, 7375, 7351, + 7351, 7375, 7376, 7352, + 7352, 7376, 7377, 7353, + 7353, 7377, 7378, 7354, + 7354, 7378, 7379, 7355, + 7355, 7379, 7380, 7356, + 7356, 7380, 7381, 7357, + 7357, 7381, 7382, 7358, + 7358, 7382, 7383, 7359, + 7359, 7383, 7384, 7360, + 7360, 7384, 7385, 7361, + 7361, 7385, 7386, 7362, + 7362, 7386, 7387, 7363, + 7363, 7387, 7388, 7364, + 7364, 7388, 7389, 7365, + 7365, 7389, 7390, 7366, + 7366, 7390, 7391, 7367, + 7367, 7391, 7392, 7368, + 7368, 7392, 7393, 7369, + 7369, 7393, 7394, 7370, + 7370, 7394, 7395, 7371, + 4319, 4320, 7396, 7372, + 7372, 7396, 7397, 7373, + 7373, 7397, 7398, 7374, + 7374, 7398, 7399, 7375, + 7375, 7399, 7400, 7376, + 7376, 7400, 7401, 7377, + 7377, 7401, 7402, 7378, + 7378, 7402, 7403, 7379, + 7379, 7403, 7404, 7380, + 7380, 7404, 7405, 7381, + 7381, 7405, 7406, 7382, + 7382, 7406, 7407, 7383, + 7383, 7407, 7408, 7384, + 7384, 7408, 7409, 7385, + 7385, 7409, 7410, 7386, + 7386, 7410, 7411, 7387, + 7387, 7411, 7412, 7388, + 7388, 7412, 7413, 7389, + 7389, 7413, 7414, 7390, + 7390, 7414, 7415, 7391, + 7391, 7415, 7416, 7392, + 7392, 7416, 7417, 7393, + 7393, 7417, 7418, 7394, + 7394, 7418, 7419, 7395, + 4320, 4321, 7420, 7396, + 7396, 7420, 7421, 7397, + 7397, 7421, 7422, 7398, + 7398, 7422, 7423, 7399, + 7399, 7423, 7424, 7400, + 7400, 7424, 7425, 7401, + 7401, 7425, 7426, 7402, + 7402, 7426, 7427, 7403, + 7403, 7427, 7428, 7404, + 7404, 7428, 7429, 7405, + 7405, 7429, 7430, 7406, + 7406, 7430, 7431, 7407, + 7407, 7431, 7432, 7408, + 7408, 7432, 7433, 7409, + 7409, 7433, 7434, 7410, + 7410, 7434, 7435, 7411, + 7411, 7435, 7436, 7412, + 7412, 7436, 7437, 7413, + 7413, 7437, 7438, 7414, + 7414, 7438, 7439, 7415, + 7415, 7439, 7440, 7416, + 7416, 7440, 7441, 7417, + 7417, 7441, 7442, 7418, + 7418, 7442, 7443, 7419, + 4321, 4322, 7444, 7420, + 7420, 7444, 7445, 7421, + 7421, 7445, 7446, 7422, + 7422, 7446, 7447, 7423, + 7423, 7447, 7448, 7424, + 7424, 7448, 7449, 7425, + 7425, 7449, 7450, 7426, + 7426, 7450, 7451, 7427, + 7427, 7451, 7452, 7428, + 7428, 7452, 7453, 7429, + 7429, 7453, 7454, 7430, + 7430, 7454, 7455, 7431, + 7431, 7455, 7456, 7432, + 7432, 7456, 7457, 7433, + 7433, 7457, 7458, 7434, + 7434, 7458, 7459, 7435, + 7435, 7459, 7460, 7436, + 7436, 7460, 7461, 7437, + 7437, 7461, 7462, 7438, + 7438, 7462, 7463, 7439, + 7439, 7463, 7464, 7440, + 7440, 7464, 7465, 7441, + 7441, 7465, 7466, 7442, + 7442, 7466, 7467, 7443, + 4322, 4323, 7468, 7444, + 7444, 7468, 7469, 7445, + 7445, 7469, 7470, 7446, + 7446, 7470, 7471, 7447, + 7447, 7471, 7472, 7448, + 7448, 7472, 7473, 7449, + 7449, 7473, 7474, 7450, + 7450, 7474, 7475, 7451, + 7451, 7475, 7476, 7452, + 7452, 7476, 7477, 7453, + 7453, 7477, 7478, 7454, + 7454, 7478, 7479, 7455, + 7455, 7479, 7480, 7456, + 7456, 7480, 7481, 7457, + 7457, 7481, 7482, 7458, + 7458, 7482, 7483, 7459, + 7459, 7483, 7484, 7460, + 7460, 7484, 7485, 7461, + 7461, 7485, 7486, 7462, + 7462, 7486, 7487, 7463, + 7463, 7487, 7488, 7464, + 7464, 7488, 7489, 7465, + 7465, 7489, 7490, 7466, + 7466, 7490, 7491, 7467, + 4323, 4193, 4325, 7468, + 7468, 4325, 4327, 7469, + 7469, 4327, 4329, 7470, + 7470, 4329, 4331, 7471, + 7471, 4331, 4333, 7472, + 7472, 4333, 4335, 7473, + 7473, 4335, 4337, 7474, + 7474, 4337, 4339, 7475, + 7475, 4339, 4341, 7476, + 7476, 4341, 4343, 7477, + 7477, 4343, 4345, 7478, + 7478, 4345, 4347, 7479, + 7479, 4347, 4349, 7480, + 7480, 4349, 4351, 7481, + 7481, 4351, 4353, 7482, + 7482, 4353, 4355, 7483, + 7483, 4355, 4357, 7484, + 7484, 4357, 4359, 7485, + 7485, 4359, 4361, 7486, + 7486, 4361, 4363, 7487, + 7487, 4363, 4365, 7488, + 7488, 4365, 4367, 7489, + 7489, 4367, 4369, 7490, + 7490, 4369, 4371, 7491 ; + + elem_ss1 = 7016, 6992, 6968, 6944, 6920, 6896, 6872, 6848, 6824, 6800, 6776, + 6752, 6728, 6704, 6680, 6656, 6632, 6608, 6584, 6560, 6536, 6512, 6488, + 6464, 6440, 6416, 6392, 6368, 6344, 6320, 6296, 6272, 6248, 6224, 6200, + 6176, 6152, 6128, 6104, 6080, 6056, 6032, 6008, 5984, 5960, 5936, 5912, + 5888, 5864, 5840, 5816, 5792, 5768, 5744, 5720, 5696, 5672, 5648, 5624, + 5600, 5576, 5552, 5528, 5504, 5480, 5456, 5432, 5408, 5384, 5360, 5336, + 5312, 5288, 5264, 5240, 5216, 5192, 5168, 5144, 5120, 5096, 5072, 5048, + 5024, 5000, 4976, 4952, 4928, 4904, 4880, 4856, 4832, 4808, 4784, 4760, + 4736, 4712, 4688, 4664, 4640, 4616, 4592, 4568, 4544, 4520, 4496, 4472, + 4448, 4424, 4400, 4376, 4352, 4328, 4304, 4280, 7424, 7400, 7376, 7352, + 7328, 7304, 7280, 7256, 7232, 7208, 7184, 7160, 7136, 7112, 7088, 7064, + 7040 ; + + side_ss1 = 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3 ; + + dist_fact_ss1 = 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1 ; + + qa_records = + "CUBIT", + "15.2", + "10/15/2019", + "15:20:36" ; + + elem_map = 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, + 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, + 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, + 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, + 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, + 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, + 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, + 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, + 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, + 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, + 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, + 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, + 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, + 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, + 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, + 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, + 247, 248, 249, 250, 251, 252, 253, 254, 255, 256, 257, 258, 259, 260, + 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, + 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, + 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, + 303, 304, 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, 315, 316, + 317, 318, 319, 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, + 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, + 345, 346, 347, 348, 349, 350, 351, 352, 353, 354, 355, 356, 357, 358, + 359, 360, 361, 362, 363, 364, 365, 366, 367, 368, 369, 370, 371, 372, + 373, 374, 375, 376, 377, 378, 379, 380, 381, 382, 383, 384, 385, 386, + 387, 388, 389, 390, 391, 392, 393, 394, 395, 396, 397, 398, 399, 400, + 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, + 415, 416, 417, 418, 419, 420, 421, 422, 423, 424, 425, 426, 427, 428, + 429, 430, 431, 432, 433, 434, 435, 436, 437, 438, 439, 440, 441, 442, + 443, 444, 445, 446, 447, 448, 449, 450, 451, 452, 453, 454, 455, 456, + 457, 458, 459, 460, 461, 462, 463, 464, 465, 466, 467, 468, 469, 470, + 471, 472, 473, 474, 475, 476, 477, 478, 479, 480, 481, 482, 483, 484, + 485, 486, 487, 488, 489, 490, 491, 492, 493, 494, 495, 496, 497, 498, + 499, 500, 501, 502, 503, 504, 505, 506, 507, 508, 509, 510, 511, 512, + 513, 514, 515, 516, 517, 518, 519, 520, 521, 522, 523, 524, 525, 526, + 527, 528, 529, 530, 531, 532, 533, 534, 535, 536, 537, 538, 539, 540, + 541, 542, 543, 544, 545, 546, 547, 548, 549, 550, 551, 552, 553, 554, + 555, 556, 557, 558, 559, 560, 561, 562, 563, 564, 565, 566, 567, 568, + 569, 570, 571, 572, 573, 574, 575, 576, 577, 578, 579, 580, 581, 582, + 583, 584, 585, 586, 587, 588, 589, 590, 591, 592, 593, 594, 595, 596, + 597, 598, 599, 600, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, + 611, 612, 613, 614, 615, 616, 617, 618, 619, 620, 621, 622, 623, 624, + 625, 626, 627, 628, 629, 630, 631, 632, 633, 634, 635, 636, 637, 638, + 639, 640, 641, 642, 643, 644, 645, 646, 647, 648, 649, 650, 651, 652, + 653, 654, 655, 656, 657, 658, 659, 660, 661, 662, 663, 664, 665, 666, + 667, 668, 669, 670, 671, 672, 673, 674, 675, 676, 677, 678, 679, 680, + 681, 682, 683, 684, 685, 686, 687, 688, 689, 690, 691, 692, 693, 694, + 695, 696, 697, 698, 699, 700, 701, 702, 703, 704, 705, 706, 707, 708, + 709, 710, 711, 712, 713, 714, 715, 716, 717, 718, 719, 720, 721, 722, + 723, 724, 725, 726, 727, 728, 729, 730, 731, 732, 733, 734, 735, 736, + 737, 738, 739, 740, 741, 742, 743, 744, 745, 746, 747, 748, 749, 750, + 751, 752, 753, 754, 755, 756, 757, 758, 759, 760, 761, 762, 763, 764, + 765, 766, 767, 768, 769, 770, 771, 772, 773, 774, 775, 776, 777, 778, + 779, 780, 781, 782, 783, 784, 785, 786, 787, 788, 789, 790, 791, 792, + 793, 794, 795, 796, 797, 798, 799, 800, 801, 802, 803, 804, 805, 806, + 807, 808, 809, 810, 811, 812, 813, 814, 815, 816, 817, 818, 819, 820, + 821, 822, 823, 824, 825, 826, 827, 828, 829, 830, 831, 832, 833, 834, + 835, 836, 837, 838, 839, 840, 841, 842, 843, 844, 845, 846, 847, 848, + 849, 850, 851, 852, 853, 854, 855, 856, 857, 858, 859, 860, 861, 862, + 863, 864, 865, 866, 867, 868, 869, 870, 871, 872, 873, 874, 875, 876, + 877, 878, 879, 880, 881, 882, 883, 884, 885, 886, 887, 888, 889, 890, + 891, 892, 893, 894, 895, 896, 897, 898, 899, 900, 901, 902, 903, 904, + 905, 906, 907, 908, 909, 910, 911, 912, 913, 914, 915, 916, 917, 918, + 919, 920, 921, 922, 923, 924, 925, 926, 927, 928, 929, 930, 931, 932, + 933, 934, 935, 936, 937, 938, 939, 940, 941, 942, 943, 944, 945, 946, + 947, 948, 949, 950, 951, 952, 953, 954, 955, 956, 957, 958, 959, 960, + 961, 962, 963, 964, 965, 966, 967, 968, 969, 970, 971, 972, 973, 974, + 975, 976, 977, 978, 979, 980, 981, 982, 983, 984, 985, 986, 987, 988, + 989, 990, 991, 992, 993, 994, 995, 996, 997, 998, 999, 1000, 1001, 1002, + 1003, 1004, 1005, 1006, 1007, 1008, 1009, 1010, 1011, 1012, 1013, 1014, + 1015, 1016, 1017, 1018, 1019, 1020, 1021, 1022, 1023, 1024, 1025, 1026, + 1027, 1028, 1029, 1030, 1031, 1032, 1033, 1034, 1035, 1036, 1037, 1038, + 1039, 1040, 1041, 1042, 1043, 1044, 1045, 1046, 1047, 1048, 1049, 1050, + 1051, 1052, 1053, 1054, 1055, 1056, 1057, 1058, 1059, 1060, 1061, 1062, + 1063, 1064, 1065, 1066, 1067, 1068, 1069, 1070, 1071, 1072, 1073, 1074, + 1075, 1076, 1077, 1078, 1079, 1080, 1081, 1082, 1083, 1084, 1085, 1086, + 1087, 1088, 1089, 1090, 1091, 1092, 1093, 1094, 1095, 1096, 1097, 1098, + 1099, 1100, 1101, 1102, 1103, 1104, 1105, 1106, 1107, 1108, 1109, 1110, + 1111, 1112, 1113, 1114, 1115, 1116, 1117, 1118, 1119, 1120, 1121, 1122, + 1123, 1124, 1125, 1126, 1127, 1128, 1129, 1130, 1131, 1132, 1133, 1134, + 1135, 1136, 1137, 1138, 1139, 1140, 1141, 1142, 1143, 1144, 1145, 1146, + 1147, 1148, 1149, 1150, 1151, 1152, 1153, 1154, 1155, 1156, 1157, 1158, + 1159, 1160, 1161, 1162, 1163, 1164, 1165, 1166, 1167, 1168, 1169, 1170, + 1171, 1172, 1173, 1174, 1175, 1176, 1177, 1178, 1179, 1180, 1181, 1182, + 1183, 1184, 1185, 1186, 1187, 1188, 1189, 1190, 1191, 1192, 1193, 1194, + 1195, 1196, 1197, 1198, 1199, 1200, 1201, 1202, 1203, 1204, 1205, 1206, + 1207, 1208, 1209, 1210, 1211, 1212, 1213, 1214, 1215, 1216, 1217, 1218, + 1219, 1220, 1221, 1222, 1223, 1224, 1225, 1226, 1227, 1228, 1229, 1230, + 1231, 1232, 1233, 1234, 1235, 1236, 1237, 1238, 1239, 1240, 1241, 1242, + 1243, 1244, 1245, 1246, 1247, 1248, 1249, 1250, 1251, 1252, 1253, 1254, + 1255, 1256, 1257, 1258, 1259, 1260, 1261, 1262, 1263, 1264, 1265, 1266, + 1267, 1268, 1269, 1270, 1271, 1272, 1273, 1274, 1275, 1276, 1277, 1278, + 1279, 1280, 1281, 1282, 1283, 1284, 1285, 1286, 1287, 1288, 1289, 1290, + 1291, 1292, 1293, 1294, 1295, 1296, 1297, 1298, 1299, 1300, 1301, 1302, + 1303, 1304, 1305, 1306, 1307, 1308, 1309, 1310, 1311, 1312, 1313, 1314, + 1315, 1316, 1317, 1318, 1319, 1320, 1321, 1322, 1323, 1324, 1325, 1326, + 1327, 1328, 1329, 1330, 1331, 1332, 1333, 1334, 1335, 1336, 1337, 1338, + 1339, 1340, 1341, 1342, 1343, 1344, 1345, 1346, 1347, 1348, 1349, 1350, + 1351, 1352, 1353, 1354, 1355, 1356, 1357, 1358, 1359, 1360, 1361, 1362, + 1363, 1364, 1365, 1366, 1367, 1368, 1369, 1370, 1371, 1372, 1373, 1374, + 1375, 1376, 1377, 1378, 1379, 1380, 1381, 1382, 1383, 1384, 1385, 1386, + 1387, 1388, 1389, 1390, 1391, 1392, 1393, 1394, 1395, 1396, 1397, 1398, + 1399, 1400, 1401, 1402, 1403, 1404, 1405, 1406, 1407, 1408, 1409, 1410, + 1411, 1412, 1413, 1414, 1415, 1416, 1417, 1418, 1419, 1420, 1421, 1422, + 1423, 1424, 1425, 1426, 1427, 1428, 1429, 1430, 1431, 1432, 1433, 1434, + 1435, 1436, 1437, 1438, 1439, 1440, 1441, 1442, 1443, 1444, 1445, 1446, + 1447, 1448, 1449, 1450, 1451, 1452, 1453, 1454, 1455, 1456, 1457, 1458, + 1459, 1460, 1461, 1462, 1463, 1464, 1465, 1466, 1467, 1468, 1469, 1470, + 1471, 1472, 1473, 1474, 1475, 1476, 1477, 1478, 1479, 1480, 1481, 1482, + 1483, 1484, 1485, 1486, 1487, 1488, 1489, 1490, 1491, 1492, 1493, 1494, + 1495, 1496, 1497, 1498, 1499, 1500, 1501, 1502, 1503, 1504, 1505, 1506, + 1507, 1508, 1509, 1510, 1511, 1512, 1513, 1514, 1515, 1516, 1517, 1518, + 1519, 1520, 1521, 1522, 1523, 1524, 1525, 1526, 1527, 1528, 1529, 1530, + 1531, 1532, 1533, 1534, 1535, 1536, 1537, 1538, 1539, 1540, 1541, 1542, + 1543, 1544, 1545, 1546, 1547, 1548, 1549, 1550, 1551, 1552, 1553, 1554, + 1555, 1556, 1557, 1558, 1559, 1560, 1561, 1562, 1563, 1564, 1565, 1566, + 1567, 1568, 1569, 1570, 1571, 1572, 1573, 1574, 1575, 1576, 1577, 1578, + 1579, 1580, 1581, 1582, 1583, 1584, 1585, 1586, 1587, 1588, 1589, 1590, + 1591, 1592, 1593, 1594, 1595, 1596, 1597, 1598, 1599, 1600, 1601, 1602, + 1603, 1604, 1605, 1606, 1607, 1608, 1609, 1610, 1611, 1612, 1613, 1614, + 1615, 1616, 1617, 1618, 1619, 1620, 1621, 1622, 1623, 1624, 1625, 1626, + 1627, 1628, 1629, 1630, 1631, 1632, 1633, 1634, 1635, 1636, 1637, 1638, + 1639, 1640, 1641, 1642, 1643, 1644, 1645, 1646, 1647, 1648, 1649, 1650, + 1651, 1652, 1653, 1654, 1655, 1656, 1657, 1658, 1659, 1660, 1661, 1662, + 1663, 1664, 1665, 1666, 1667, 1668, 1669, 1670, 1671, 1672, 1673, 1674, + 1675, 1676, 1677, 1678, 1679, 1680, 1681, 1682, 1683, 1684, 1685, 1686, + 1687, 1688, 1689, 1690, 1691, 1692, 1693, 1694, 1695, 1696, 1697, 1698, + 1699, 1700, 1701, 1702, 1703, 1704, 1705, 1706, 1707, 1708, 1709, 1710, + 1711, 1712, 1713, 1714, 1715, 1716, 1717, 1718, 1719, 1720, 1721, 1722, + 1723, 1724, 1725, 1726, 1727, 1728, 1729, 1730, 1731, 1732, 1733, 1734, + 1735, 1736, 1737, 1738, 1739, 1740, 1741, 1742, 1743, 1744, 1745, 1746, + 1747, 1748, 1749, 1750, 1751, 1752, 1753, 1754, 1755, 1756, 1757, 1758, + 1759, 1760, 1761, 1762, 1763, 1764, 1765, 1766, 1767, 1768, 1769, 1770, + 1771, 1772, 1773, 1774, 1775, 1776, 1777, 1778, 1779, 1780, 1781, 1782, + 1783, 1784, 1785, 1786, 1787, 1788, 1789, 1790, 1791, 1792, 1793, 1794, + 1795, 1796, 1797, 1798, 1799, 1800, 1801, 1802, 1803, 1804, 1805, 1806, + 1807, 1808, 1809, 1810, 1811, 1812, 1813, 1814, 1815, 1816, 1817, 1818, + 1819, 1820, 1821, 1822, 1823, 1824, 1825, 1826, 1827, 1828, 1829, 1830, + 1831, 1832, 1833, 1834, 1835, 1836, 1837, 1838, 1839, 1840, 1841, 1842, + 1843, 1844, 1845, 1846, 1847, 1848, 1849, 1850, 1851, 1852, 1853, 1854, + 1855, 1856, 1857, 1858, 1859, 1860, 1861, 1862, 1863, 1864, 1865, 1866, + 1867, 1868, 1869, 1870, 1871, 1872, 1873, 1874, 1875, 1876, 1877, 1878, + 1879, 1880, 1881, 1882, 1883, 1884, 1885, 1886, 1887, 1888, 1889, 1890, + 1891, 1892, 1893, 1894, 1895, 1896, 1897, 1898, 1899, 1900, 1901, 1902, + 1903, 1904, 1905, 1906, 1907, 1908, 1909, 1910, 1911, 1912, 1913, 1914, + 1915, 1916, 1917, 1918, 1919, 1920, 1921, 1922, 1923, 1924, 1925, 1926, + 1927, 1928, 1929, 1930, 1931, 1932, 1933, 1934, 1935, 1936, 1937, 1938, + 1939, 1940, 1941, 1942, 1943, 1944, 1945, 1946, 1947, 1948, 1949, 1950, + 1951, 1952, 1953, 1954, 1955, 1956, 1957, 1958, 1959, 1960, 1961, 1962, + 1963, 1964, 1965, 1966, 1967, 1968, 1969, 1970, 1971, 1972, 1973, 1974, + 1975, 1976, 1977, 1978, 1979, 1980, 1981, 1982, 1983, 1984, 1985, 1986, + 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, + 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, + 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, + 2023, 2024, 2025, 2026, 2027, 2028, 2029, 2030, 2031, 2032, 2033, 2034, + 2035, 2036, 2037, 2038, 2039, 2040, 2041, 2042, 2043, 2044, 2045, 2046, + 2047, 2048, 2049, 2050, 2051, 2052, 2053, 2054, 2055, 2056, 2057, 2058, + 2059, 2060, 2061, 2062, 2063, 2064, 2065, 2066, 2067, 2068, 2069, 2070, + 2071, 2072, 2073, 2074, 2075, 2076, 2077, 2078, 2079, 2080, 2081, 2082, + 2083, 2084, 2085, 2086, 2087, 2088, 2089, 2090, 2091, 2092, 2093, 2094, + 2095, 2096, 2097, 2098, 2099, 2100, 2101, 2102, 2103, 2104, 2105, 2106, + 2107, 2108, 2109, 2110, 2111, 2112, 2113, 2114, 2115, 2116, 2117, 2118, + 2119, 2120, 2121, 2122, 2123, 2124, 2125, 2126, 2127, 2128, 2129, 2130, + 2131, 2132, 2133, 2134, 2135, 2136, 2137, 2138, 2139, 2140, 2141, 2142, + 2143, 2144, 2145, 2146, 2147, 2148, 2149, 2150, 2151, 2152, 2153, 2154, + 2155, 2156, 2157, 2158, 2159, 2160, 2161, 2162, 2163, 2164, 2165, 2166, + 2167, 2168, 2169, 2170, 2171, 2172, 2173, 2174, 2175, 2176, 2177, 2178, + 2179, 2180, 2181, 2182, 2183, 2184, 2185, 2186, 2187, 2188, 2189, 2190, + 2191, 2192, 2193, 2194, 2195, 2196, 2197, 2198, 2199, 2200, 2201, 2202, + 2203, 2204, 2205, 2206, 2207, 2208, 2209, 2210, 2211, 2212, 2213, 2214, + 2215, 2216, 2217, 2218, 2219, 2220, 2221, 2222, 2223, 2224, 2225, 2226, + 2227, 2228, 2229, 2230, 2231, 2232, 2233, 2234, 2235, 2236, 2237, 2238, + 2239, 2240, 2241, 2242, 2243, 2244, 2245, 2246, 2247, 2248, 2249, 2250, + 2251, 2252, 2253, 2254, 2255, 2256, 2257, 2258, 2259, 2260, 2261, 2262, + 2263, 2264, 2265, 2266, 2267, 2268, 2269, 2270, 2271, 2272, 2273, 2274, + 2275, 2276, 2277, 2278, 2279, 2280, 2281, 2282, 2283, 2284, 2285, 2286, + 2287, 2288, 2289, 2290, 2291, 2292, 2293, 2294, 2295, 2296, 2297, 2298, + 2299, 2300, 2301, 2302, 2303, 2304, 2305, 2306, 2307, 2308, 2309, 2310, + 2311, 2312, 2313, 2314, 2315, 2316, 2317, 2318, 2319, 2320, 2321, 2322, + 2323, 2324, 2325, 2326, 2327, 2328, 2329, 2330, 2331, 2332, 2333, 2334, + 2335, 2336, 2337, 2338, 2339, 2340, 2341, 2342, 2343, 2344, 2345, 2346, + 2347, 2348, 2349, 2350, 2351, 2352, 2353, 2354, 2355, 2356, 2357, 2358, + 2359, 2360, 2361, 2362, 2363, 2364, 2365, 2366, 2367, 2368, 2369, 2370, + 2371, 2372, 2373, 2374, 2375, 2376, 2377, 2378, 2379, 2380, 2381, 2382, + 2383, 2384, 2385, 2386, 2387, 2388, 2389, 2390, 2391, 2392, 2393, 2394, + 2395, 2396, 2397, 2398, 2399, 2400, 2401, 2402, 2403, 2404, 2405, 2406, + 2407, 2408, 2409, 2410, 2411, 2412, 2413, 2414, 2415, 2416, 2417, 2418, + 2419, 2420, 2421, 2422, 2423, 2424, 2425, 2426, 2427, 2428, 2429, 2430, + 2431, 2432, 2433, 2434, 2435, 2436, 2437, 2438, 2439, 2440, 2441, 2442, + 2443, 2444, 2445, 2446, 2447, 2448, 2449, 2450, 2451, 2452, 2453, 2454, + 2455, 2456, 2457, 2458, 2459, 2460, 2461, 2462, 2463, 2464, 2465, 2466, + 2467, 2468, 2469, 2470, 2471, 2472, 2473, 2474, 2475, 2476, 2477, 2478, + 2479, 2480, 2481, 2482, 2483, 2484, 2485, 2486, 2487, 2488, 2489, 2490, + 2491, 2492, 2493, 2494, 2495, 2496, 2497, 2498, 2499, 2500, 2501, 2502, + 2503, 2504, 2505, 2506, 2507, 2508, 2509, 2510, 2511, 2512, 2513, 2514, + 2515, 2516, 2517, 2518, 2519, 2520, 2521, 2522, 2523, 2524, 2525, 2526, + 2527, 2528, 2529, 2530, 2531, 2532, 2533, 2534, 2535, 2536, 2537, 2538, + 2539, 2540, 2541, 2542, 2543, 2544, 2545, 2546, 2547, 2548, 2549, 2550, + 2551, 2552, 2553, 2554, 2555, 2556, 2557, 2558, 2559, 2560, 2561, 2562, + 2563, 2564, 2565, 2566, 2567, 2568, 2569, 2570, 2571, 2572, 2573, 2574, + 2575, 2576, 2577, 2578, 2579, 2580, 2581, 2582, 2583, 2584, 2585, 2586, + 2587, 2588, 2589, 2590, 2591, 2592, 2593, 2594, 2595, 2596, 2597, 2598, + 2599, 2600, 2601, 2602, 2603, 2604, 2605, 2606, 2607, 2608, 2609, 2610, + 2611, 2612, 2613, 2614, 2615, 2616, 2617, 2618, 2619, 2620, 2621, 2622, + 2623, 2624, 2625, 2626, 2627, 2628, 2629, 2630, 2631, 2632, 2633, 2634, + 2635, 2636, 2637, 2638, 2639, 2640, 2641, 2642, 2643, 2644, 2645, 2646, + 2647, 2648, 2649, 2650, 2651, 2652, 2653, 2654, 2655, 2656, 2657, 2658, + 2659, 2660, 2661, 2662, 2663, 2664, 2665, 2666, 2667, 2668, 2669, 2670, + 2671, 2672, 2673, 2674, 2675, 2676, 2677, 2678, 2679, 2680, 2681, 2682, + 2683, 2684, 2685, 2686, 2687, 2688, 2689, 2690, 2691, 2692, 2693, 2694, + 2695, 2696, 2697, 2698, 2699, 2700, 2701, 2702, 2703, 2704, 2705, 2706, + 2707, 2708, 2709, 2710, 2711, 2712, 2713, 2714, 2715, 2716, 2717, 2718, + 2719, 2720, 2721, 2722, 2723, 2724, 2725, 2726, 2727, 2728, 2729, 2730, + 2731, 2732, 2733, 2734, 2735, 2736, 2737, 2738, 2739, 2740, 2741, 2742, + 2743, 2744, 2745, 2746, 2747, 2748, 2749, 2750, 2751, 2752, 2753, 2754, + 2755, 2756, 2757, 2758, 2759, 2760, 2761, 2762, 2763, 2764, 2765, 2766, + 2767, 2768, 2769, 2770, 2771, 2772, 2773, 2774, 2775, 2776, 2777, 2778, + 2779, 2780, 2781, 2782, 2783, 2784, 2785, 2786, 2787, 2788, 2789, 2790, + 2791, 2792, 2793, 2794, 2795, 2796, 2797, 2798, 2799, 2800, 2801, 2802, + 2803, 2804, 2805, 2806, 2807, 2808, 2809, 2810, 2811, 2812, 2813, 2814, + 2815, 2816, 2817, 2818, 2819, 2820, 2821, 2822, 2823, 2824, 2825, 2826, + 2827, 2828, 2829, 2830, 2831, 2832, 2833, 2834, 2835, 2836, 2837, 2838, + 2839, 2840, 2841, 2842, 2843, 2844, 2845, 2846, 2847, 2848, 2849, 2850, + 2851, 2852, 2853, 2854, 2855, 2856, 2857, 2858, 2859, 2860, 2861, 2862, + 2863, 2864, 2865, 2866, 2867, 2868, 2869, 2870, 2871, 2872, 2873, 2874, + 2875, 2876, 2877, 2878, 2879, 2880, 2881, 2882, 2883, 2884, 2885, 2886, + 2887, 2888, 2889, 2890, 2891, 2892, 2893, 2894, 2895, 2896, 2897, 2898, + 2899, 2900, 2901, 2902, 2903, 2904, 2905, 2906, 2907, 2908, 2909, 2910, + 2911, 2912, 2913, 2914, 2915, 2916, 2917, 2918, 2919, 2920, 2921, 2922, + 2923, 2924, 2925, 2926, 2927, 2928, 2929, 2930, 2931, 2932, 2933, 2934, + 2935, 2936, 2937, 2938, 2939, 2940, 2941, 2942, 2943, 2944, 2945, 2946, + 2947, 2948, 2949, 2950, 2951, 2952, 2953, 2954, 2955, 2956, 2957, 2958, + 2959, 2960, 2961, 2962, 2963, 2964, 2965, 2966, 2967, 2968, 2969, 2970, + 2971, 2972, 2973, 2974, 2975, 2976, 2977, 2978, 2979, 2980, 2981, 2982, + 2983, 2984, 2985, 2986, 2987, 2988, 2989, 2990, 2991, 2992, 2993, 2994, + 2995, 2996, 2997, 2998, 2999, 3000, 3001, 3002, 3003, 3004, 3005, 3006, + 3007, 3008, 3009, 3010, 3011, 3012, 3013, 3014, 3015, 3016, 3017, 3018, + 3019, 3020, 3021, 3022, 3023, 3024, 3025, 3026, 3027, 3028, 3029, 3030, + 3031, 3032, 3033, 3034, 3035, 3036, 3037, 3038, 3039, 3040, 3041, 3042, + 3043, 3044, 3045, 3046, 3047, 3048, 3049, 3050, 3051, 3052, 3053, 3054, + 3055, 3056, 3057, 3058, 3059, 3060, 3061, 3062, 3063, 3064, 3065, 3066, + 3067, 3068, 3069, 3070, 3071, 3072, 3073, 3074, 3075, 3076, 3077, 3078, + 3079, 3080, 3081, 3082, 3083, 3084, 3085, 3086, 3087, 3088, 3089, 3090, + 3091, 3092, 3093, 3094, 3095, 3096, 3097, 3098, 3099, 3100, 3101, 3102, + 3103, 3104, 3105, 3106, 3107, 3108, 3109, 3110, 3111, 3112, 3113, 3114, + 3115, 3116, 3117, 3118, 3119, 3120, 3121, 3122, 3123, 3124, 3125, 3126, + 3127, 3128, 3129, 3130, 3131, 3132, 3133, 3134, 3135, 3136, 3137, 3138, + 3139, 3140, 3141, 3142, 3143, 3144, 3145, 3146, 3147, 3148, 3149, 3150, + 3151, 3152, 3153, 3154, 3155, 3156, 3157, 3158, 3159, 3160, 3161, 3162, + 3163, 3164, 3165, 3166, 3167, 3168, 3169, 3170, 3171, 3172, 3173, 3174, + 3175, 3176, 3177, 3178, 3179, 3180, 3181, 3182, 3183, 3184, 3185, 3186, + 3187, 3188, 3189, 3190, 3191, 3192, 3193, 3194, 3195, 3196, 3197, 3198, + 3199, 3200, 3201, 3202, 3203, 3204, 3205, 3206, 3207, 3208, 3209, 3210, + 3211, 3212, 3213, 3214, 3215, 3216, 3217, 3218, 3219, 3220, 3221, 3222, + 3223, 3224, 3225, 3226, 3227, 3228, 3229, 3230, 3231, 3232, 3233, 3234, + 3235, 3236, 3237, 3238, 3239, 3240, 3241, 3242, 3243, 3244, 3245, 3246, + 3247, 3248, 3249, 3250, 3251, 3252, 3253, 3254, 3255, 3256, 3257, 3258, + 3259, 3260, 3261, 3262, 3263, 3264, 3265, 3266, 3267, 3268, 3269, 3270, + 3271, 3272, 3273, 3274, 3275, 3276, 3277, 3278, 3279, 3280, 3281, 3282, + 3283, 3284, 3285, 3286, 3287, 3288, 3289, 3290, 3291, 3292, 3293, 3294, + 3295, 3296, 3297, 3298, 3299, 3300, 3301, 3302, 3303, 3304, 3305, 3306, + 3307, 3308, 3309, 3310, 3311, 3312, 3313, 3314, 3315, 3316, 3317, 3318, + 3319, 3320, 3321, 3322, 3323, 3324, 3325, 3326, 3327, 3328, 3329, 3330, + 3331, 3332, 3333, 3334, 3335, 3336, 3337, 3338, 3339, 3340, 3341, 3342, + 3343, 3344, 3345, 3346, 3347, 3348, 3349, 3350, 3351, 3352, 3353, 3354, + 3355, 3356, 3357, 3358, 3359, 3360, 3361, 3362, 3363, 3364, 3365, 3366, + 3367, 3368, 3369, 3370, 3371, 3372, 3373, 3374, 3375, 3376, 3377, 3378, + 3379, 3380, 3381, 3382, 3383, 3384, 3385, 3386, 3387, 3388, 3389, 3390, + 3391, 3392, 3393, 3394, 3395, 3396, 3397, 3398, 3399, 3400, 3401, 3402, + 3403, 3404, 3405, 3406, 3407, 3408, 3409, 3410, 3411, 3412, 3413, 3414, + 3415, 3416, 3417, 3418, 3419, 3420, 3421, 3422, 3423, 3424, 3425, 3426, + 3427, 3428, 3429, 3430, 3431, 3432, 3433, 3434, 3435, 3436, 3437, 3438, + 3439, 3440, 3441, 3442, 3443, 3444, 3445, 3446, 3447, 3448, 3449, 3450, + 3451, 3452, 3453, 3454, 3455, 3456, 3457, 3458, 3459, 3460, 3461, 3462, + 3463, 3464, 3465, 3466, 3467, 3468, 3469, 3470, 3471, 3472, 3473, 3474, + 3475, 3476, 3477, 3478, 3479, 3480, 3481, 3482, 3483, 3484, 3485, 3486, + 3487, 3488, 3489, 3490, 3491, 3492, 3493, 3494, 3495, 3496, 3497, 3498, + 3499, 3500, 3501, 3502, 3503, 3504, 3505, 3506, 3507, 3508, 3509, 3510, + 3511, 3512, 3513, 3514, 3515, 3516, 3517, 3518, 3519, 3520, 3521, 3522, + 3523, 3524, 3525, 3526, 3527, 3528, 3529, 3530, 3531, 3532, 3533, 3534, + 3535, 3536, 3537, 3538, 3539, 3540, 3541, 3542, 3543, 3544, 3545, 3546, + 3547, 3548, 3549, 3550, 3551, 3552, 3553, 3554, 3555, 3556, 3557, 3558, + 3559, 3560, 3561, 3562, 3563, 3564, 3565, 3566, 3567, 3568, 3569, 3570, + 3571, 3572, 3573, 3574, 3575, 3576, 3577, 3578, 3579, 3580, 3581, 3582, + 3583, 3584, 3585, 3586, 3587, 3588, 3589, 3590, 3591, 3592, 3593, 3594, + 3595, 3596, 3597, 3598, 3599, 3600, 3601, 3602, 3603, 3604, 3605, 3606, + 3607, 3608, 3609, 3610, 3611, 3612, 3613, 3614, 3615, 3616, 3617, 3618, + 3619, 3620, 3621, 3622, 3623, 3624, 3625, 3626, 3627, 3628, 3629, 3630, + 3631, 3632, 3633, 3634, 3635, 3636, 3637, 3638, 3639, 3640, 3641, 3642, + 3643, 3644, 3645, 3646, 3647, 3648, 3649, 3650, 3651, 3652, 3653, 3654, + 3655, 3656, 3657, 3658, 3659, 3660, 3661, 3662, 3663, 3664, 3665, 3666, + 3667, 3668, 3669, 3670, 3671, 3672, 3673, 3674, 3675, 3676, 3677, 3678, + 3679, 3680, 3681, 3682, 3683, 3684, 3685, 3686, 3687, 3688, 3689, 3690, + 3691, 3692, 3693, 3694, 3695, 3696, 3697, 3698, 3699, 3700, 3701, 3702, + 3703, 3704, 3705, 3706, 3707, 3708, 3709, 3710, 3711, 3712, 3713, 3714, + 3715, 3716, 3717, 3718, 3719, 3720, 3721, 3722, 3723, 3724, 3725, 3726, + 3727, 3728, 3729, 3730, 3731, 3732, 3733, 3734, 3735, 3736, 3737, 3738, + 3739, 3740, 3741, 3742, 3743, 3744, 3745, 3746, 3747, 3748, 3749, 3750, + 3751, 3752, 3753, 3754, 3755, 3756, 3757, 3758, 3759, 3760, 3761, 3762, + 3763, 3764, 3765, 3766, 3767, 3768, 3769, 3770, 3771, 3772, 3773, 3774, + 3775, 3776, 3777, 3778, 3779, 3780, 3781, 3782, 3783, 3784, 3785, 3786, + 3787, 3788, 3789, 3790, 3791, 3792, 3793, 3794, 3795, 3796, 3797, 3798, + 3799, 3800, 3801, 3802, 3803, 3804, 3805, 3806, 3807, 3808, 3809, 3810, + 3811, 3812, 3813, 3814, 3815, 3816, 3817, 3818, 3819, 3820, 3821, 3822, + 3823, 3824, 3825, 3826, 3827, 3828, 3829, 3830, 3831, 3832, 3833, 3834, + 3835, 3836, 3837, 3838, 3839, 3840, 3841, 3842, 3843, 3844, 3845, 3846, + 3847, 3848, 3849, 3850, 3851, 3852, 3853, 3854, 3855, 3856, 3857, 3858, + 3859, 3860, 3861, 3862, 3863, 3864, 3865, 3866, 3867, 3868, 3869, 3870, + 3871, 3872, 3873, 3874, 3875, 3876, 3877, 3878, 3879, 3880, 3881, 3882, + 3883, 3884, 3885, 3886, 3887, 3888, 3889, 3890, 3891, 3892, 3893, 3894, + 3895, 3896, 3897, 3898, 3899, 3900, 3901, 3902, 3903, 3904, 3905, 3906, + 3907, 3908, 3909, 3910, 3911, 3912, 3913, 3914, 3915, 3916, 3917, 3918, + 3919, 3920, 3921, 3922, 3923, 3924, 3925, 3926, 3927, 3928, 3929, 3930, + 3931, 3932, 3933, 3934, 3935, 3936, 3937, 3938, 3939, 3940, 3941, 3942, + 3943, 3944, 3945, 3946, 3947, 3948, 3949, 3950, 3951, 3952, 3953, 3954, + 3955, 3956, 3957, 3958, 3959, 3960, 3961, 3962, 3963, 3964, 3965, 3966, + 3967, 3968, 3969, 3970, 3971, 3972, 3973, 3974, 3975, 3976, 3977, 3978, + 3979, 3980, 3981, 3982, 3983, 3984, 3985, 3986, 3987, 3988, 3989, 3990, + 3991, 3992, 3993, 3994, 3995, 3996, 3997, 3998, 3999, 4000, 4001, 4002, + 4003, 4004, 4005, 4006, 4007, 4008, 4009, 4010, 4011, 4012, 4013, 4014, + 4015, 4016, 4017, 4018, 4019, 4020, 4021, 4022, 4023, 4024, 4025, 4026, + 4027, 4028, 4029, 4030, 4031, 4032, 4033, 4034, 4035, 4036, 4037, 4038, + 4039, 4040, 4041, 4042, 4043, 4044, 4045, 4046, 4047, 4048, 4049, 4050, + 4051, 4052, 4053, 4054, 4055, 4056, 4057, 4058, 4059, 4060, 4061, 4062, + 4063, 4064, 4065, 4066, 4067, 4068, 4069, 4070, 4071, 4072, 4073, 4074, + 4075, 4076, 4077, 4078, 4079, 4080, 4081, 4082, 4083, 4084, 4085, 4086, + 4087, 4088, 4089, 4090, 4091, 4092, 4093, 4094, 4095, 4096, 4097, 4098, + 4099, 4100, 4101, 4102, 4103, 4104, 4105, 4106, 4107, 4108, 4109, 4110, + 4111, 4112, 4113, 4114, 4115, 4116, 4117, 4118, 4119, 4120, 4121, 4122, + 4123, 4124, 4125, 4126, 4127, 4128, 4129, 4130, 4131, 4132, 4133, 4134, + 4135, 4136, 4137, 4138, 4139, 4140, 4141, 4142, 4143, 4144, 4145, 4146, + 4147, 4148, 4149, 4150, 4151, 4152, 4153, 4154, 4155, 4156, 4157, 4158, + 4159, 4160, 4161, 4162, 4163, 4164, 4165, 4166, 4167, 4168, 4169, 4170, + 4171, 4172, 4173, 4174, 4175, 4176, 4177, 4178, 4179, 4180, 4181, 4182, + 4183, 4184, 4185, 4186, 4187, 4188, 4189, 4190, 4191, 4192, 4193, 4194, + 4195, 4196, 4197, 4198, 4199, 4200, 4201, 4202, 4203, 4204, 4205, 4206, + 4207, 4208, 4209, 4210, 4211, 4212, 4213, 4214, 4215, 4216, 4217, 4218, + 4219, 4220, 4221, 4222, 4223, 4224, 4225, 4226, 4227, 4228, 4229, 4230, + 4231, 4232, 4233, 4234, 4235, 4236, 4237, 4238, 4239, 4240, 4241, 4242, + 4243, 4244, 4245, 4246, 4247, 4248, 4249, 4250, 4251, 4252, 4253, 4254, + 4255, 4256, 4257, 4258, 4259, 4260, 4261, 4262, 4263, 4264, 4265, 4266, + 4267, 4268, 4269, 4270, 4271, 4272, 4273, 4274, 4275, 4276, 4277, 4278, + 4279, 4280, 4281, 4282, 4283, 4284, 4285, 4286, 4287, 4288, 4289, 4290, + 4291, 4292, 4293, 4294, 4295, 4296, 4297, 4298, 4299, 4300, 4301, 4302, + 4303, 4304, 4305, 4306, 4307, 4308, 4309, 4310, 4311, 4312, 4313, 4314, + 4315, 4316, 4317, 4318, 4319, 4320, 4321, 4322, 4323, 4324, 4325, 4326, + 4327, 4328, 4329, 4330, 4331, 4332, 4333, 4334, 4335, 4336, 4337, 4338, + 4339, 4340, 4341, 4342, 4343, 4344, 4345, 4346, 4347, 4348, 4349, 4350, + 4351, 4352, 4353, 4354, 4355, 4356, 4357, 4358, 4359, 4360, 4361, 4362, + 4363, 4364, 4365, 4366, 4367, 4368, 4369, 4370, 4371, 4372, 4373, 4374, + 4375, 4376, 4377, 4378, 4379, 4380, 4381, 4382, 4383, 4384, 4385, 4386, + 4387, 4388, 4389, 4390, 4391, 4392, 4393, 4394, 4395, 4396, 4397, 4398, + 4399, 4400, 4401, 4402, 4403, 4404, 4405, 4406, 4407, 4408, 4409, 4410, + 4411, 4412, 4413, 4414, 4415, 4416, 4417, 4418, 4419, 4420, 4421, 4422, + 4423, 4424, 4425, 4426, 4427, 4428, 4429, 4430, 4431, 4432, 4433, 4434, + 4435, 4436, 4437, 4438, 4439, 4440, 4441, 4442, 4443, 4444, 4445, 4446, + 4447, 4448, 4449, 4450, 4451, 4452, 4453, 4454, 4455, 4456, 4457, 4458, + 4459, 4460, 4461, 4462, 4463, 4464, 4465, 4466, 4467, 4468, 4469, 4470, + 4471, 4472, 4473, 4474, 4475, 4476, 4477, 4478, 4479, 4480, 4481, 4482, + 4483, 4484, 4485, 4486, 4487, 4488, 4489, 4490, 4491, 4492, 4493, 4494, + 4495, 4496, 4497, 4498, 4499, 4500, 4501, 4502, 4503, 4504, 4505, 4506, + 4507, 4508, 4509, 4510, 4511, 4512, 4513, 4514, 4515, 4516, 4517, 4518, + 4519, 4520, 4521, 4522, 4523, 4524, 4525, 4526, 4527, 4528, 4529, 4530, + 4531, 4532, 4533, 4534, 4535, 4536, 4537, 4538, 4539, 4540, 4541, 4542, + 4543, 4544, 4545, 4546, 4547, 4548, 4549, 4550, 4551, 4552, 4553, 4554, + 4555, 4556, 4557, 4558, 4559, 4560, 4561, 4562, 4563, 4564, 4565, 4566, + 4567, 4568, 4569, 4570, 4571, 4572, 4573, 4574, 4575, 4576, 4577, 4578, + 4579, 4580, 4581, 4582, 4583, 4584, 4585, 4586, 4587, 4588, 4589, 4590, + 4591, 4592, 4593, 4594, 4595, 4596, 4597, 4598, 4599, 4600, 4601, 4602, + 4603, 4604, 4605, 4606, 4607, 4608, 4609, 4610, 4611, 4612, 4613, 4614, + 4615, 4616, 4617, 4618, 4619, 4620, 4621, 4622, 4623, 4624, 4625, 4626, + 4627, 4628, 4629, 4630, 4631, 4632, 4633, 4634, 4635, 4636, 4637, 4638, + 4639, 4640, 4641, 4642, 4643, 4644, 4645, 4646, 4647, 4648, 4649, 4650, + 4651, 4652, 4653, 4654, 4655, 4656, 4657, 4658, 4659, 4660, 4661, 4662, + 4663, 4664, 4665, 4666, 4667, 4668, 4669, 4670, 4671, 4672, 4673, 4674, + 4675, 4676, 4677, 4678, 4679, 4680, 4681, 4682, 4683, 4684, 4685, 4686, + 4687, 4688, 4689, 4690, 4691, 4692, 4693, 4694, 4695, 4696, 4697, 4698, + 4699, 4700, 4701, 4702, 4703, 4704, 4705, 4706, 4707, 4708, 4709, 4710, + 4711, 4712, 4713, 4714, 4715, 4716, 4717, 4718, 4719, 4720, 4721, 4722, + 4723, 4724, 4725, 4726, 4727, 4728, 4729, 4730, 4731, 4732, 4733, 4734, + 4735, 4736, 4737, 4738, 4739, 4740, 4741, 4742, 4743, 4744, 4745, 4746, + 4747, 4748, 4749, 4750, 4751, 4752, 4753, 4754, 4755, 4756, 4757, 4758, + 4759, 4760, 4761, 4762, 4763, 4764, 4765, 4766, 4767, 4768, 4769, 4770, + 4771, 4772, 4773, 4774, 4775, 4776, 4777, 4778, 4779, 4780, 4781, 4782, + 4783, 4784, 4785, 4786, 4787, 4788, 4789, 4790, 4791, 4792, 4793, 4794, + 4795, 4796, 4797, 4798, 4799, 4800, 4801, 4802, 4803, 4804, 4805, 4806, + 4807, 4808, 4809, 4810, 4811, 4812, 4813, 4814, 4815, 4816, 4817, 4818, + 4819, 4820, 4821, 4822, 4823, 4824, 4825, 4826, 4827, 4828, 4829, 4830, + 4831, 4832, 4833, 4834, 4835, 4836, 4837, 4838, 4839, 4840, 4841, 4842, + 4843, 4844, 4845, 4846, 4847, 4848, 4849, 4850, 4851, 4852, 4853, 4854, + 4855, 4856, 4857, 4858, 4859, 4860, 4861, 4862, 4863, 4864, 4865, 4866, + 4867, 4868, 4869, 4870, 4871, 4872, 4873, 4874, 4875, 4876, 4877, 4878, + 4879, 4880, 4881, 4882, 4883, 4884, 4885, 4886, 4887, 4888, 4889, 4890, + 4891, 4892, 4893, 4894, 4895, 4896, 4897, 4898, 4899, 4900, 4901, 4902, + 4903, 4904, 4905, 4906, 4907, 4908, 4909, 4910, 4911, 4912, 4913, 4914, + 4915, 4916, 4917, 4918, 4919, 4920, 4921, 4922, 4923, 4924, 4925, 4926, + 4927, 4928, 4929, 4930, 4931, 4932, 4933, 4934, 4935, 4936, 4937, 4938, + 4939, 4940, 4941, 4942, 4943, 4944, 4945, 4946, 4947, 4948, 4949, 4950, + 4951, 4952, 4953, 4954, 4955, 4956, 4957, 4958, 4959, 4960, 4961, 4962, + 4963, 4964, 4965, 4966, 4967, 4968, 4969, 4970, 4971, 4972, 4973, 4974, + 4975, 4976, 4977, 4978, 4979, 4980, 4981, 4982, 4983, 4984, 4985, 4986, + 4987, 4988, 4989, 4990, 4991, 4992, 4993, 4994, 4995, 4996, 4997, 4998, + 4999, 5000, 5001, 5002, 5003, 5004, 5005, 5006, 5007, 5008, 5009, 5010, + 5011, 5012, 5013, 5014, 5015, 5016, 5017, 5018, 5019, 5020, 5021, 5022, + 5023, 5024, 5025, 5026, 5027, 5028, 5029, 5030, 5031, 5032, 5033, 5034, + 5035, 5036, 5037, 5038, 5039, 5040, 5041, 5042, 5043, 5044, 5045, 5046, + 5047, 5048, 5049, 5050, 5051, 5052, 5053, 5054, 5055, 5056, 5057, 5058, + 5059, 5060, 5061, 5062, 5063, 5064, 5065, 5066, 5067, 5068, 5069, 5070, + 5071, 5072, 5073, 5074, 5075, 5076, 5077, 5078, 5079, 5080, 5081, 5082, + 5083, 5084, 5085, 5086, 5087, 5088, 5089, 5090, 5091, 5092, 5093, 5094, + 5095, 5096, 5097, 5098, 5099, 5100, 5101, 5102, 5103, 5104, 5105, 5106, + 5107, 5108, 5109, 5110, 5111, 5112, 5113, 5114, 5115, 5116, 5117, 5118, + 5119, 5120, 5121, 5122, 5123, 5124, 5125, 5126, 5127, 5128, 5129, 5130, + 5131, 5132, 5133, 5134, 5135, 5136, 5137, 5138, 5139, 5140, 5141, 5142, + 5143, 5144, 5145, 5146, 5147, 5148, 5149, 5150, 5151, 5152, 5153, 5154, + 5155, 5156, 5157, 5158, 5159, 5160, 5161, 5162, 5163, 5164, 5165, 5166, + 5167, 5168, 5169, 5170, 5171, 5172, 5173, 5174, 5175, 5176, 5177, 5178, + 5179, 5180, 5181, 5182, 5183, 5184, 5185, 5186, 5187, 5188, 5189, 5190, + 5191, 5192, 5193, 5194, 5195, 5196, 5197, 5198, 5199, 5200, 5201, 5202, + 5203, 5204, 5205, 5206, 5207, 5208, 5209, 5210, 5211, 5212, 5213, 5214, + 5215, 5216, 5217, 5218, 5219, 5220, 5221, 5222, 5223, 5224, 5225, 5226, + 5227, 5228, 5229, 5230, 5231, 5232, 5233, 5234, 5235, 5236, 5237, 5238, + 5239, 5240, 5241, 5242, 5243, 5244, 5245, 5246, 5247, 5248, 5249, 5250, + 5251, 5252, 5253, 5254, 5255, 5256, 5257, 5258, 5259, 5260, 5261, 5262, + 5263, 5264, 5265, 5266, 5267, 5268, 5269, 5270, 5271, 5272, 5273, 5274, + 5275, 5276, 5277, 5278, 5279, 5280, 5281, 5282, 5283, 5284, 5285, 5286, + 5287, 5288, 5289, 5290, 5291, 5292, 5293, 5294, 5295, 5296, 5297, 5298, + 5299, 5300, 5301, 5302, 5303, 5304, 5305, 5306, 5307, 5308, 5309, 5310, + 5311, 5312, 5313, 5314, 5315, 5316, 5317, 5318, 5319, 5320, 5321, 5322, + 5323, 5324, 5325, 5326, 5327, 5328, 5329, 5330, 5331, 5332, 5333, 5334, + 5335, 5336, 5337, 5338, 5339, 5340, 5341, 5342, 5343, 5344, 5345, 5346, + 5347, 5348, 5349, 5350, 5351, 5352, 5353, 5354, 5355, 5356, 5357, 5358, + 5359, 5360, 5361, 5362, 5363, 5364, 5365, 5366, 5367, 5368, 5369, 5370, + 5371, 5372, 5373, 5374, 5375, 5376, 5377, 5378, 5379, 5380, 5381, 5382, + 5383, 5384, 5385, 5386, 5387, 5388, 5389, 5390, 5391, 5392, 5393, 5394, + 5395, 5396, 5397, 5398, 5399, 5400, 5401, 5402, 5403, 5404, 5405, 5406, + 5407, 5408, 5409, 5410, 5411, 5412, 5413, 5414, 5415, 5416, 5417, 5418, + 5419, 5420, 5421, 5422, 5423, 5424, 5425, 5426, 5427, 5428, 5429, 5430, + 5431, 5432, 5433, 5434, 5435, 5436, 5437, 5438, 5439, 5440, 5441, 5442, + 5443, 5444, 5445, 5446, 5447, 5448, 5449, 5450, 5451, 5452, 5453, 5454, + 5455, 5456, 5457, 5458, 5459, 5460, 5461, 5462, 5463, 5464, 5465, 5466, + 5467, 5468, 5469, 5470, 5471, 5472, 5473, 5474, 5475, 5476, 5477, 5478, + 5479, 5480, 5481, 5482, 5483, 5484, 5485, 5486, 5487, 5488, 5489, 5490, + 5491, 5492, 5493, 5494, 5495, 5496, 5497, 5498, 5499, 5500, 5501, 5502, + 5503, 5504, 5505, 5506, 5507, 5508, 5509, 5510, 5511, 5512, 5513, 5514, + 5515, 5516, 5517, 5518, 5519, 5520, 5521, 5522, 5523, 5524, 5525, 5526, + 5527, 5528, 5529, 5530, 5531, 5532, 5533, 5534, 5535, 5536, 5537, 5538, + 5539, 5540, 5541, 5542, 5543, 5544, 5545, 5546, 5547, 5548, 5549, 5550, + 5551, 5552, 5553, 5554, 5555, 5556, 5557, 5558, 5559, 5560, 5561, 5562, + 5563, 5564, 5565, 5566, 5567, 5568, 5569, 5570, 5571, 5572, 5573, 5574, + 5575, 5576, 5577, 5578, 5579, 5580, 5581, 5582, 5583, 5584, 5585, 5586, + 5587, 5588, 5589, 5590, 5591, 5592, 5593, 5594, 5595, 5596, 5597, 5598, + 5599, 5600, 5601, 5602, 5603, 5604, 5605, 5606, 5607, 5608, 5609, 5610, + 5611, 5612, 5613, 5614, 5615, 5616, 5617, 5618, 5619, 5620, 5621, 5622, + 5623, 5624, 5625, 5626, 5627, 5628, 5629, 5630, 5631, 5632, 5633, 5634, + 5635, 5636, 5637, 5638, 5639, 5640, 5641, 5642, 5643, 5644, 5645, 5646, + 5647, 5648, 5649, 5650, 5651, 5652, 5653, 5654, 5655, 5656, 5657, 5658, + 5659, 5660, 5661, 5662, 5663, 5664, 5665, 5666, 5667, 5668, 5669, 5670, + 5671, 5672, 5673, 5674, 5675, 5676, 5677, 5678, 5679, 5680, 5681, 5682, + 5683, 5684, 5685, 5686, 5687, 5688, 5689, 5690, 5691, 5692, 5693, 5694, + 5695, 5696, 5697, 5698, 5699, 5700, 5701, 5702, 5703, 5704, 5705, 5706, + 5707, 5708, 5709, 5710, 5711, 5712, 5713, 5714, 5715, 5716, 5717, 5718, + 5719, 5720, 5721, 5722, 5723, 5724, 5725, 5726, 5727, 5728, 5729, 5730, + 5731, 5732, 5733, 5734, 5735, 5736, 5737, 5738, 5739, 5740, 5741, 5742, + 5743, 5744, 5745, 5746, 5747, 5748, 5749, 5750, 5751, 5752, 5753, 5754, + 5755, 5756, 5757, 5758, 5759, 5760, 5761, 5762, 5763, 5764, 5765, 5766, + 5767, 5768, 5769, 5770, 5771, 5772, 5773, 5774, 5775, 5776, 5777, 5778, + 5779, 5780, 5781, 5782, 5783, 5784, 5785, 5786, 5787, 5788, 5789, 5790, + 5791, 5792, 5793, 5794, 5795, 5796, 5797, 5798, 5799, 5800, 5801, 5802, + 5803, 5804, 5805, 5806, 5807, 5808, 5809, 5810, 5811, 5812, 5813, 5814, + 5815, 5816, 5817, 5818, 5819, 5820, 5821, 5822, 5823, 5824, 5825, 5826, + 5827, 5828, 5829, 5830, 5831, 5832, 5833, 5834, 5835, 5836, 5837, 5838, + 5839, 5840, 5841, 5842, 5843, 5844, 5845, 5846, 5847, 5848, 5849, 5850, + 5851, 5852, 5853, 5854, 5855, 5856, 5857, 5858, 5859, 5860, 5861, 5862, + 5863, 5864, 5865, 5866, 5867, 5868, 5869, 5870, 5871, 5872, 5873, 5874, + 5875, 5876, 5877, 5878, 5879, 5880, 5881, 5882, 5883, 5884, 5885, 5886, + 5887, 5888, 5889, 5890, 5891, 5892, 5893, 5894, 5895, 5896, 5897, 5898, + 5899, 5900, 5901, 5902, 5903, 5904, 5905, 5906, 5907, 5908, 5909, 5910, + 5911, 5912, 5913, 5914, 5915, 5916, 5917, 5918, 5919, 5920, 5921, 5922, + 5923, 5924, 5925, 5926, 5927, 5928, 5929, 5930, 5931, 5932, 5933, 5934, + 5935, 5936, 5937, 5938, 5939, 5940, 5941, 5942, 5943, 5944, 5945, 5946, + 5947, 5948, 5949, 5950, 5951, 5952, 5953, 5954, 5955, 5956, 5957, 5958, + 5959, 5960, 5961, 5962, 5963, 5964, 5965, 5966, 5967, 5968, 5969, 5970, + 5971, 5972, 5973, 5974, 5975, 5976, 5977, 5978, 5979, 5980, 5981, 5982, + 5983, 5984, 5985, 5986, 5987, 5988, 5989, 5990, 5991, 5992, 5993, 5994, + 5995, 5996, 5997, 5998, 5999, 6000, 6001, 6002, 6003, 6004, 6005, 6006, + 6007, 6008, 6009, 6010, 6011, 6012, 6013, 6014, 6015, 6016, 6017, 6018, + 6019, 6020, 6021, 6022, 6023, 6024, 6025, 6026, 6027, 6028, 6029, 6030, + 6031, 6032, 6033, 6034, 6035, 6036, 6037, 6038, 6039, 6040, 6041, 6042, + 6043, 6044, 6045, 6046, 6047, 6048, 6049, 6050, 6051, 6052, 6053, 6054, + 6055, 6056, 6057, 6058, 6059, 6060, 6061, 6062, 6063, 6064, 6065, 6066, + 6067, 6068, 6069, 6070, 6071, 6072, 6073, 6074, 6075, 6076, 6077, 6078, + 6079, 6080, 6081, 6082, 6083, 6084, 6085, 6086, 6087, 6088, 6089, 6090, + 6091, 6092, 6093, 6094, 6095, 6096, 6097, 6098, 6099, 6100, 6101, 6102, + 6103, 6104, 6105, 6106, 6107, 6108, 6109, 6110, 6111, 6112, 6113, 6114, + 6115, 6116, 6117, 6118, 6119, 6120, 6121, 6122, 6123, 6124, 6125, 6126, + 6127, 6128, 6129, 6130, 6131, 6132, 6133, 6134, 6135, 6136, 6137, 6138, + 6139, 6140, 6141, 6142, 6143, 6144, 6145, 6146, 6147, 6148, 6149, 6150, + 6151, 6152, 6153, 6154, 6155, 6156, 6157, 6158, 6159, 6160, 6161, 6162, + 6163, 6164, 6165, 6166, 6167, 6168, 6169, 6170, 6171, 6172, 6173, 6174, + 6175, 6176, 6177, 6178, 6179, 6180, 6181, 6182, 6183, 6184, 6185, 6186, + 6187, 6188, 6189, 6190, 6191, 6192, 6193, 6194, 6195, 6196, 6197, 6198, + 6199, 6200, 6201, 6202, 6203, 6204, 6205, 6206, 6207, 6208, 6209, 6210, + 6211, 6212, 6213, 6214, 6215, 6216, 6217, 6218, 6219, 6220, 6221, 6222, + 6223, 6224, 6225, 6226, 6227, 6228, 6229, 6230, 6231, 6232, 6233, 6234, + 6235, 6236, 6237, 6238, 6239, 6240, 6241, 6242, 6243, 6244, 6245, 6246, + 6247, 6248, 6249, 6250, 6251, 6252, 6253, 6254, 6255, 6256, 6257, 6258, + 6259, 6260, 6261, 6262, 6263, 6264, 6265, 6266, 6267, 6268, 6269, 6270, + 6271, 6272, 6273, 6274, 6275, 6276, 6277, 6278, 6279, 6280, 6281, 6282, + 6283, 6284, 6285, 6286, 6287, 6288, 6289, 6290, 6291, 6292, 6293, 6294, + 6295, 6296, 6297, 6298, 6299, 6300, 6301, 6302, 6303, 6304, 6305, 6306, + 6307, 6308, 6309, 6310, 6311, 6312, 6313, 6314, 6315, 6316, 6317, 6318, + 6319, 6320, 6321, 6322, 6323, 6324, 6325, 6326, 6327, 6328, 6329, 6330, + 6331, 6332, 6333, 6334, 6335, 6336, 6337, 6338, 6339, 6340, 6341, 6342, + 6343, 6344, 6345, 6346, 6347, 6348, 6349, 6350, 6351, 6352, 6353, 6354, + 6355, 6356, 6357, 6358, 6359, 6360, 6361, 6362, 6363, 6364, 6365, 6366, + 6367, 6368, 6369, 6370, 6371, 6372, 6373, 6374, 6375, 6376, 6377, 6378, + 6379, 6380, 6381, 6382, 6383, 6384, 6385, 6386, 6387, 6388, 6389, 6390, + 6391, 6392, 6393, 6394, 6395, 6396, 6397, 6398, 6399, 6400, 6401, 6402, + 6403, 6404, 6405, 6406, 6407, 6408, 6409, 6410, 6411, 6412, 6413, 6414, + 6415, 6416, 6417, 6418, 6419, 6420, 6421, 6422, 6423, 6424, 6425, 6426, + 6427, 6428, 6429, 6430, 6431, 6432, 6433, 6434, 6435, 6436, 6437, 6438, + 6439, 6440, 6441, 6442, 6443, 6444, 6445, 6446, 6447, 6448, 6449, 6450, + 6451, 6452, 6453, 6454, 6455, 6456, 6457, 6458, 6459, 6460, 6461, 6462, + 6463, 6464, 6465, 6466, 6467, 6468, 6469, 6470, 6471, 6472, 6473, 6474, + 6475, 6476, 6477, 6478, 6479, 6480, 6481, 6482, 6483, 6484, 6485, 6486, + 6487, 6488, 6489, 6490, 6491, 6492, 6493, 6494, 6495, 6496, 6497, 6498, + 6499, 6500, 6501, 6502, 6503, 6504, 6505, 6506, 6507, 6508, 6509, 6510, + 6511, 6512, 6513, 6514, 6515, 6516, 6517, 6518, 6519, 6520, 6521, 6522, + 6523, 6524, 6525, 6526, 6527, 6528, 6529, 6530, 6531, 6532, 6533, 6534, + 6535, 6536, 6537, 6538, 6539, 6540, 6541, 6542, 6543, 6544, 6545, 6546, + 6547, 6548, 6549, 6550, 6551, 6552, 6553, 6554, 6555, 6556, 6557, 6558, + 6559, 6560, 6561, 6562, 6563, 6564, 6565, 6566, 6567, 6568, 6569, 6570, + 6571, 6572, 6573, 6574, 6575, 6576, 6577, 6578, 6579, 6580, 6581, 6582, + 6583, 6584, 6585, 6586, 6587, 6588, 6589, 6590, 6591, 6592, 6593, 6594, + 6595, 6596, 6597, 6598, 6599, 6600, 6601, 6602, 6603, 6604, 6605, 6606, + 6607, 6608, 6609, 6610, 6611, 6612, 6613, 6614, 6615, 6616, 6617, 6618, + 6619, 6620, 6621, 6622, 6623, 6624, 6625, 6626, 6627, 6628, 6629, 6630, + 6631, 6632, 6633, 6634, 6635, 6636, 6637, 6638, 6639, 6640, 6641, 6642, + 6643, 6644, 6645, 6646, 6647, 6648, 6649, 6650, 6651, 6652, 6653, 6654, + 6655, 6656, 6657, 6658, 6659, 6660, 6661, 6662, 6663, 6664, 6665, 6666, + 6667, 6668, 6669, 6670, 6671, 6672, 6673, 6674, 6675, 6676, 6677, 6678, + 6679, 6680, 6681, 6682, 6683, 6684, 6685, 6686, 6687, 6688, 6689, 6690, + 6691, 6692, 6693, 6694, 6695, 6696, 6697, 6698, 6699, 6700, 6701, 6702, + 6703, 6704, 6705, 6706, 6707, 6708, 6709, 6710, 6711, 6712, 6713, 6714, + 6715, 6716, 6717, 6718, 6719, 6720, 6721, 6722, 6723, 6724, 6725, 6726, + 6727, 6728, 6729, 6730, 6731, 6732, 6733, 6734, 6735, 6736, 6737, 6738, + 6739, 6740, 6741, 6742, 6743, 6744, 6745, 6746, 6747, 6748, 6749, 6750, + 6751, 6752, 6753, 6754, 6755, 6756, 6757, 6758, 6759, 6760, 6761, 6762, + 6763, 6764, 6765, 6766, 6767, 6768, 6769, 6770, 6771, 6772, 6773, 6774, + 6775, 6776, 6777, 6778, 6779, 6780, 6781, 6782, 6783, 6784, 6785, 6786, + 6787, 6788, 6789, 6790, 6791, 6792, 6793, 6794, 6795, 6796, 6797, 6798, + 6799, 6800, 6801, 6802, 6803, 6804, 6805, 6806, 6807, 6808, 6809, 6810, + 6811, 6812, 6813, 6814, 6815, 6816, 6817, 6818, 6819, 6820, 6821, 6822, + 6823, 6824, 6825, 6826, 6827, 6828, 6829, 6830, 6831, 6832, 6833, 6834, + 6835, 6836, 6837, 6838, 6839, 6840, 6841, 6842, 6843, 6844, 6845, 6846, + 6847, 6848, 6849, 6850, 6851, 6852, 6853, 6854, 6855, 6856, 6857, 6858, + 6859, 6860, 6861, 6862, 6863, 6864, 6865, 6866, 6867, 6868, 6869, 6870, + 6871, 6872, 6873, 6874, 6875, 6876, 6877, 6878, 6879, 6880, 6881, 6882, + 6883, 6884, 6885, 6886, 6887, 6888, 6889, 6890, 6891, 6892, 6893, 6894, + 6895, 6896, 6897, 6898, 6899, 6900, 6901, 6902, 6903, 6904, 6905, 6906, + 6907, 6908, 6909, 6910, 6911, 6912, 6913, 6914, 6915, 6916, 6917, 6918, + 6919, 6920, 6921, 6922, 6923, 6924, 6925, 6926, 6927, 6928, 6929, 6930, + 6931, 6932, 6933, 6934, 6935, 6936, 6937, 6938, 6939, 6940, 6941, 6942, + 6943, 6944, 6945, 6946, 6947, 6948, 6949, 6950, 6951, 6952, 6953, 6954, + 6955, 6956, 6957, 6958, 6959, 6960, 6961, 6962, 6963, 6964, 6965, 6966, + 6967, 6968, 6969, 6970, 6971, 6972, 6973, 6974, 6975, 6976, 6977, 6978, + 6979, 6980, 6981, 6982, 6983, 6984, 6985, 6986, 6987, 6988, 6989, 6990, + 6991, 6992, 6993, 6994, 6995, 6996, 6997, 6998, 6999, 7000, 7001, 7002, + 7003, 7004, 7005, 7006, 7007, 7008, 7009, 7010, 7011, 7012, 7013, 7014, + 7015, 7016, 7017, 7018, 7019, 7020, 7021, 7022, 7023, 7024, 7025, 7026, + 7027, 7028, 7029, 7030, 7031, 7032, 7033, 7034, 7035, 7036, 7037, 7038, + 7039, 7040, 7041, 7042, 7043, 7044, 7045, 7046, 7047, 7048, 7049, 7050, + 7051, 7052, 7053, 7054, 7055, 7056, 7057, 7058, 7059, 7060, 7061, 7062, + 7063, 7064, 7065, 7066, 7067, 7068, 7069, 7070, 7071, 7072, 7073, 7074, + 7075, 7076, 7077, 7078, 7079, 7080, 7081, 7082, 7083, 7084, 7085, 7086, + 7087, 7088, 7089, 7090, 7091, 7092, 7093, 7094, 7095, 7096, 7097, 7098, + 7099, 7100, 7101, 7102, 7103, 7104, 7105, 7106, 7107, 7108, 7109, 7110, + 7111, 7112, 7113, 7114, 7115, 7116, 7117, 7118, 7119, 7120, 7121, 7122, + 7123, 7124, 7125, 7126, 7127, 7128, 7129, 7130, 7131, 7132, 7133, 7134, + 7135, 7136, 7137, 7138, 7139, 7140, 7141, 7142, 7143, 7144, 7145, 7146, + 7147, 7148, 7149, 7150, 7151, 7152, 7153, 7154, 7155, 7156, 7157, 7158, + 7159, 7160, 7161, 7162, 7163, 7164, 7165, 7166, 7167, 7168, 7169, 7170, + 7171, 7172, 7173, 7174, 7175, 7176, 7177, 7178, 7179, 7180, 7181, 7182, + 7183, 7184, 7185, 7186, 7187, 7188, 7189, 7190, 7191, 7192, 7193, 7194, + 7195, 7196, 7197, 7198, 7199, 7200, 7201, 7202, 7203, 7204, 7205, 7206, + 7207, 7208, 7209, 7210, 7211, 7212, 7213, 7214, 7215, 7216, 7217, 7218, + 7219, 7220, 7221, 7222, 7223, 7224, 7225, 7226, 7227, 7228, 7229, 7230, + 7231, 7232, 7233, 7234, 7235, 7236, 7237, 7238, 7239, 7240, 7241, 7242, + 7243, 7244, 7245, 7246, 7247, 7248, 7249, 7250, 7251, 7252, 7253, 7254, + 7255, 7256, 7257, 7258, 7259, 7260, 7261, 7262, 7263, 7264, 7265, 7266, + 7267, 7268, 7269, 7270, 7271, 7272, 7273, 7274, 7275, 7276, 7277, 7278, + 7279, 7280, 7281, 7282, 7283, 7284, 7285, 7286, 7287, 7288, 7289, 7290, + 7291, 7292, 7293, 7294, 7295, 7296, 7297, 7298, 7299, 7300, 7301, 7302, + 7303, 7304, 7305, 7306, 7307, 7308, 7309, 7310, 7311, 7312, 7313, 7314, + 7315, 7316, 7317, 7318, 7319, 7320, 7321, 7322, 7323, 7324, 7325, 7326, + 7327, 7328, 7329, 7330, 7331, 7332, 7333, 7334, 7335, 7336, 7337, 7338, + 7339, 7340, 7341, 7342, 7343, 7344, 7345, 7346, 7347, 7348, 7349, 7350, + 7351, 7352, 7353, 7354, 7355, 7356, 7357, 7358, 7359, 7360, 7361, 7362, + 7363, 7364, 7365, 7366, 7367, 7368, 7369, 7370, 7371, 7372, 7373, 7374, + 7375, 7376, 7377, 7378, 7379, 7380, 7381, 7382, 7383, 7384, 7385, 7386, + 7387, 7388, 7389, 7390, 7391, 7392, 7393, 7394, 7395, 7396, 7397, 7398, + 7399, 7400, 7401, 7402, 7403, 7404, 7405, 7406, 7407, 7408, 7409, 7410, + 7411, 7412, 7413, 7414, 7415, 7416, 7417, 7418, 7419, 7420, 7421, 7422, + 7423, 7424 ; + + elem_num_map = 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, + 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, + 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, + 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, + 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, + 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, + 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, + 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, + 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, + 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, + 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, + 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, + 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, + 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, + 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, + 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, + 246, 247, 248, 249, 250, 251, 252, 253, 254, 255, 256, 257, 258, 259, + 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, + 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, + 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, + 302, 303, 304, 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, 315, + 316, 317, 318, 319, 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, + 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, + 344, 345, 346, 347, 348, 349, 350, 351, 352, 353, 354, 355, 356, 357, + 358, 359, 360, 361, 362, 363, 364, 365, 366, 367, 368, 369, 370, 371, + 372, 373, 374, 375, 376, 377, 378, 379, 380, 381, 382, 383, 384, 385, + 386, 387, 388, 389, 390, 391, 392, 393, 394, 395, 396, 397, 398, 399, + 400, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, + 414, 415, 416, 417, 418, 419, 420, 421, 422, 423, 424, 425, 426, 427, + 428, 429, 430, 431, 432, 433, 434, 435, 436, 437, 438, 439, 440, 441, + 442, 443, 444, 445, 446, 447, 448, 449, 450, 451, 452, 453, 454, 455, + 456, 457, 458, 459, 460, 461, 462, 463, 464, 465, 466, 467, 468, 469, + 470, 471, 472, 473, 474, 475, 476, 477, 478, 479, 480, 481, 482, 483, + 484, 485, 486, 487, 488, 489, 490, 491, 492, 493, 494, 495, 496, 497, + 498, 499, 500, 501, 502, 503, 504, 505, 506, 507, 508, 509, 510, 511, + 512, 513, 514, 515, 516, 517, 518, 519, 520, 521, 522, 523, 524, 525, + 526, 527, 528, 529, 530, 531, 532, 533, 534, 535, 536, 537, 538, 539, + 540, 541, 542, 543, 544, 545, 546, 547, 548, 549, 550, 551, 552, 553, + 554, 555, 556, 557, 558, 559, 560, 561, 562, 563, 564, 565, 566, 567, + 568, 569, 570, 571, 572, 573, 574, 575, 576, 577, 578, 579, 580, 581, + 582, 583, 584, 585, 586, 587, 588, 589, 590, 591, 592, 593, 594, 595, + 596, 597, 598, 599, 600, 601, 602, 603, 604, 605, 606, 607, 608, 609, + 610, 611, 612, 613, 614, 615, 616, 617, 618, 619, 620, 621, 622, 623, + 624, 625, 626, 627, 628, 629, 630, 631, 632, 633, 634, 635, 636, 637, + 638, 639, 640, 641, 642, 643, 644, 645, 646, 647, 648, 649, 650, 651, + 652, 653, 654, 655, 656, 657, 658, 659, 660, 661, 662, 663, 664, 665, + 666, 667, 668, 669, 670, 671, 672, 673, 674, 675, 676, 677, 678, 679, + 680, 681, 682, 683, 684, 685, 686, 687, 688, 689, 690, 691, 692, 693, + 694, 695, 696, 697, 698, 699, 700, 701, 702, 703, 704, 705, 706, 707, + 708, 709, 710, 711, 712, 713, 714, 715, 716, 717, 718, 719, 720, 721, + 722, 723, 724, 725, 726, 727, 728, 729, 730, 731, 732, 733, 734, 735, + 736, 737, 738, 739, 740, 741, 742, 743, 744, 745, 746, 747, 748, 749, + 750, 751, 752, 753, 754, 755, 756, 757, 758, 759, 760, 761, 762, 763, + 764, 765, 766, 767, 768, 769, 770, 771, 772, 773, 774, 775, 776, 777, + 778, 779, 780, 781, 782, 783, 784, 785, 786, 787, 788, 789, 790, 791, + 792, 793, 794, 795, 796, 797, 798, 799, 800, 801, 802, 803, 804, 805, + 806, 807, 808, 809, 810, 811, 812, 813, 814, 815, 816, 817, 818, 819, + 820, 821, 822, 823, 824, 825, 826, 827, 828, 829, 830, 831, 832, 833, + 834, 835, 836, 837, 838, 839, 840, 841, 842, 843, 844, 845, 846, 847, + 848, 849, 850, 851, 852, 853, 854, 855, 856, 857, 858, 859, 860, 861, + 862, 863, 864, 865, 866, 867, 868, 869, 870, 871, 872, 873, 874, 875, + 876, 877, 878, 879, 880, 881, 882, 883, 884, 885, 886, 887, 888, 889, + 890, 891, 892, 893, 894, 895, 896, 897, 898, 899, 900, 901, 902, 903, + 904, 905, 906, 907, 908, 909, 910, 911, 912, 913, 914, 915, 916, 917, + 918, 919, 920, 921, 922, 923, 924, 925, 926, 927, 928, 929, 930, 931, + 932, 933, 934, 935, 936, 937, 938, 939, 940, 941, 942, 943, 944, 945, + 946, 947, 948, 949, 950, 951, 952, 953, 954, 955, 956, 957, 958, 959, + 960, 961, 962, 963, 964, 965, 966, 967, 968, 969, 970, 971, 972, 973, + 974, 975, 976, 977, 978, 979, 980, 981, 982, 983, 984, 985, 986, 987, + 988, 989, 990, 991, 992, 993, 994, 995, 996, 997, 998, 999, 1000, 1001, + 1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009, 1010, 1011, 1012, 1013, + 1014, 1015, 1016, 1017, 1018, 1019, 1020, 1021, 1022, 1023, 1024, 1025, + 1026, 1027, 1028, 1029, 1030, 1031, 1032, 1033, 1034, 1035, 1036, 1037, + 1038, 1039, 1040, 1041, 1042, 1043, 1044, 1045, 1046, 1047, 1048, 1049, + 1050, 1051, 1052, 1053, 1054, 1055, 1056, 1057, 1058, 1059, 1060, 1061, + 1062, 1063, 1064, 1065, 1066, 1067, 1068, 1069, 1070, 1071, 1072, 1073, + 1074, 1075, 1076, 1077, 1078, 1079, 1080, 1081, 1082, 1083, 1084, 1085, + 1086, 1087, 1088, 1089, 1090, 1091, 1092, 1093, 1094, 1095, 1096, 1097, + 1098, 1099, 1100, 1101, 1102, 1103, 1104, 1105, 1106, 1107, 1108, 1109, + 1110, 1111, 1112, 1113, 1114, 1115, 1116, 1117, 1118, 1119, 1120, 1121, + 1122, 1123, 1124, 1125, 1126, 1127, 1128, 1129, 1130, 1131, 1132, 1133, + 1134, 1135, 1136, 1137, 1138, 1139, 1140, 1141, 1142, 1143, 1144, 1145, + 1146, 1147, 1148, 1149, 1150, 1151, 1152, 1153, 1154, 1155, 1156, 1157, + 1158, 1159, 1160, 1161, 1162, 1163, 1164, 1165, 1166, 1167, 1168, 1169, + 1170, 1171, 1172, 1173, 1174, 1175, 1176, 1177, 1178, 1179, 1180, 1181, + 1182, 1183, 1184, 1185, 1186, 1187, 1188, 1189, 1190, 1191, 1192, 1193, + 1194, 1195, 1196, 1197, 1198, 1199, 1200, 1201, 1202, 1203, 1204, 1205, + 1206, 1207, 1208, 1209, 1210, 1211, 1212, 1213, 1214, 1215, 1216, 1217, + 1218, 1219, 1220, 1221, 1222, 1223, 1224, 1225, 1226, 1227, 1228, 1229, + 1230, 1231, 1232, 1233, 1234, 1235, 1236, 1237, 1238, 1239, 1240, 1241, + 1242, 1243, 1244, 1245, 1246, 1247, 1248, 1249, 1250, 1251, 1252, 1253, + 1254, 1255, 1256, 1257, 1258, 1259, 1260, 1261, 1262, 1263, 1264, 1265, + 1266, 1267, 1268, 1269, 1270, 1271, 1272, 1273, 1274, 1275, 1276, 1277, + 1278, 1279, 1280, 1281, 1282, 1283, 1284, 1285, 1286, 1287, 1288, 1289, + 1290, 1291, 1292, 1293, 1294, 1295, 1296, 1297, 1298, 1299, 1300, 1301, + 1302, 1303, 1304, 1305, 1306, 1307, 1308, 1309, 1310, 1311, 1312, 1313, + 1314, 1315, 1316, 1317, 1318, 1319, 1320, 1321, 1322, 1323, 1324, 1325, + 1326, 1327, 1328, 1329, 1330, 1331, 1332, 1333, 1334, 1335, 1336, 1337, + 1338, 1339, 1340, 1341, 1342, 1343, 1344, 1345, 1346, 1347, 1348, 1349, + 1350, 1351, 1352, 1353, 1354, 1355, 1356, 1357, 1358, 1359, 1360, 1361, + 1362, 1363, 1364, 1365, 1366, 1367, 1368, 1369, 1370, 1371, 1372, 1373, + 1374, 1375, 1376, 1377, 1378, 1379, 1380, 1381, 1382, 1383, 1384, 1385, + 1386, 1387, 1388, 1389, 1390, 1391, 1392, 1393, 1394, 1395, 1396, 1397, + 1398, 1399, 1400, 1401, 1402, 1403, 1404, 1405, 1406, 1407, 1408, 1409, + 1410, 1411, 1412, 1413, 1414, 1415, 1416, 1417, 1418, 1419, 1420, 1421, + 1422, 1423, 1424, 1425, 1426, 1427, 1428, 1429, 1430, 1431, 1432, 1433, + 1434, 1435, 1436, 1437, 1438, 1439, 1440, 1441, 1442, 1443, 1444, 1445, + 1446, 1447, 1448, 1449, 1450, 1451, 1452, 1453, 1454, 1455, 1456, 1457, + 1458, 1459, 1460, 1461, 1462, 1463, 1464, 1465, 1466, 1467, 1468, 1469, + 1470, 1471, 1472, 1473, 1474, 1475, 1476, 1477, 1478, 1479, 1480, 1481, + 1482, 1483, 1484, 1485, 1486, 1487, 1488, 1489, 1490, 1491, 1492, 1493, + 1494, 1495, 1496, 1497, 1498, 1499, 1500, 1501, 1502, 1503, 1504, 1505, + 1506, 1507, 1508, 1509, 1510, 1511, 1512, 1513, 1514, 1515, 1516, 1517, + 1518, 1519, 1520, 1521, 1522, 1523, 1524, 1525, 1526, 1527, 1528, 1529, + 1530, 1531, 1532, 1533, 1534, 1535, 1536, 1537, 1538, 1539, 1540, 1541, + 1542, 1543, 1544, 1545, 1546, 1547, 1548, 1549, 1550, 1551, 1552, 1553, + 1554, 1555, 1556, 1557, 1558, 1559, 1560, 1561, 1562, 1563, 1564, 1565, + 1566, 1567, 1568, 1569, 1570, 1571, 1572, 1573, 1574, 1575, 1576, 1577, + 1578, 1579, 1580, 1581, 1582, 1583, 1584, 1585, 1586, 1587, 1588, 1589, + 1590, 1591, 1592, 1593, 1594, 1595, 1596, 1597, 1598, 1599, 1600, 1601, + 1602, 1603, 1604, 1605, 1606, 1607, 1608, 1609, 1610, 1611, 1612, 1613, + 1614, 1615, 1616, 1617, 1618, 1619, 1620, 1621, 1622, 1623, 1624, 1625, + 1626, 1627, 1628, 1629, 1630, 1631, 1632, 1633, 1634, 1635, 1636, 1637, + 1638, 1639, 1640, 1641, 1642, 1643, 1644, 1645, 1646, 1647, 1648, 1649, + 1650, 1651, 1652, 1653, 1654, 1655, 1656, 1657, 1658, 1659, 1660, 1661, + 1662, 1663, 1664, 1665, 1666, 1667, 1668, 1669, 1670, 1671, 1672, 1673, + 1674, 1675, 1676, 1677, 1678, 1679, 1680, 1681, 1682, 1683, 1684, 1685, + 1686, 1687, 1688, 1689, 1690, 1691, 1692, 1693, 1694, 1695, 1696, 1697, + 1698, 1699, 1700, 1701, 1702, 1703, 1704, 1705, 1706, 1707, 1708, 1709, + 1710, 1711, 1712, 1713, 1714, 1715, 1716, 1717, 1718, 1719, 1720, 1721, + 1722, 1723, 1724, 1725, 1726, 1727, 1728, 1729, 1730, 1731, 1732, 1733, + 1734, 1735, 1736, 1737, 1738, 1739, 1740, 1741, 1742, 1743, 1744, 1745, + 1746, 1747, 1748, 1749, 1750, 1751, 1752, 1753, 1754, 1755, 1756, 1757, + 1758, 1759, 1760, 1761, 1762, 1763, 1764, 1765, 1766, 1767, 1768, 1769, + 1770, 1771, 1772, 1773, 1774, 1775, 1776, 1777, 1778, 1779, 1780, 1781, + 1782, 1783, 1784, 1785, 1786, 1787, 1788, 1789, 1790, 1791, 1792, 1793, + 1794, 1795, 1796, 1797, 1798, 1799, 1800, 1801, 1802, 1803, 1804, 1805, + 1806, 1807, 1808, 1809, 1810, 1811, 1812, 1813, 1814, 1815, 1816, 1817, + 1818, 1819, 1820, 1821, 1822, 1823, 1824, 1825, 1826, 1827, 1828, 1829, + 1830, 1831, 1832, 1833, 1834, 1835, 1836, 1837, 1838, 1839, 1840, 1841, + 1842, 1843, 1844, 1845, 1846, 1847, 1848, 1849, 1850, 1851, 1852, 1853, + 1854, 1855, 1856, 1857, 1858, 1859, 1860, 1861, 1862, 1863, 1864, 1865, + 1866, 1867, 1868, 1869, 1870, 1871, 1872, 1873, 1874, 1875, 1876, 1877, + 1878, 1879, 1880, 1881, 1882, 1883, 1884, 1885, 1886, 1887, 1888, 1889, + 1890, 1891, 1892, 1893, 1894, 1895, 1896, 1897, 1898, 1899, 1900, 1901, + 1902, 1903, 1904, 1905, 1906, 1907, 1908, 1909, 1910, 1911, 1912, 1913, + 1914, 1915, 1916, 1917, 1918, 1919, 1920, 1921, 1922, 1923, 1924, 1925, + 1926, 1927, 1928, 1929, 1930, 1931, 1932, 1933, 1934, 1935, 1936, 1937, + 1938, 1939, 1940, 1941, 1942, 1943, 1944, 1945, 1946, 1947, 1948, 1949, + 1950, 1951, 1952, 1953, 1954, 1955, 1956, 1957, 1958, 1959, 1960, 1961, + 1962, 1963, 1964, 1965, 1966, 1967, 1968, 1969, 1970, 1971, 1972, 1973, + 1974, 1975, 1976, 1977, 1978, 1979, 1980, 1981, 1982, 1983, 1984, 1985, + 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, + 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, + 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, + 2022, 2023, 2024, 2025, 2026, 2027, 2028, 2029, 2030, 2031, 2032, 2033, + 2034, 2035, 2036, 2037, 2038, 2039, 2040, 2041, 2042, 2043, 2044, 2045, + 2046, 2047, 2048, 2049, 2050, 2051, 2052, 2053, 2054, 2055, 2056, 2057, + 2058, 2059, 2060, 2061, 2062, 2063, 2064, 2065, 2066, 2067, 2068, 2069, + 2070, 2071, 2072, 2073, 2074, 2075, 2076, 2077, 2078, 2079, 2080, 2081, + 2082, 2083, 2084, 2085, 2086, 2087, 2088, 2089, 2090, 2091, 2092, 2093, + 2094, 2095, 2096, 2097, 2098, 2099, 2100, 2101, 2102, 2103, 2104, 2105, + 2106, 2107, 2108, 2109, 2110, 2111, 2112, 2113, 2114, 2115, 2116, 2117, + 2118, 2119, 2120, 2121, 2122, 2123, 2124, 2125, 2126, 2127, 2128, 2129, + 2130, 2131, 2132, 2133, 2134, 2135, 2136, 2137, 2138, 2139, 2140, 2141, + 2142, 2143, 2144, 2145, 2146, 2147, 2148, 2149, 2150, 2151, 2152, 2153, + 2154, 2155, 2156, 2157, 2158, 2159, 2160, 2161, 2162, 2163, 2164, 2165, + 2166, 2167, 2168, 2169, 2170, 2171, 2172, 2173, 2174, 2175, 2176, 2177, + 2178, 2179, 2180, 2181, 2182, 2183, 2184, 2185, 2186, 2187, 2188, 2189, + 2190, 2191, 2192, 2193, 2194, 2195, 2196, 2197, 2198, 2199, 2200, 2201, + 2202, 2203, 2204, 2205, 2206, 2207, 2208, 2209, 2210, 2211, 2212, 2213, + 2214, 2215, 2216, 2217, 2218, 2219, 2220, 2221, 2222, 2223, 2224, 2225, + 2226, 2227, 2228, 2229, 2230, 2231, 2232, 2233, 2234, 2235, 2236, 2237, + 2238, 2239, 2240, 2241, 2242, 2243, 2244, 2245, 2246, 2247, 2248, 2249, + 2250, 2251, 2252, 2253, 2254, 2255, 2256, 2257, 2258, 2259, 2260, 2261, + 2262, 2263, 2264, 2265, 2266, 2267, 2268, 2269, 2270, 2271, 2272, 2273, + 2274, 2275, 2276, 2277, 2278, 2279, 2280, 2281, 2282, 2283, 2284, 2285, + 2286, 2287, 2288, 2289, 2290, 2291, 2292, 2293, 2294, 2295, 2296, 2297, + 2298, 2299, 2300, 2301, 2302, 2303, 2304, 2305, 2306, 2307, 2308, 2309, + 2310, 2311, 2312, 2313, 2314, 2315, 2316, 2317, 2318, 2319, 2320, 2321, + 2322, 2323, 2324, 2325, 2326, 2327, 2328, 2329, 2330, 2331, 2332, 2333, + 2334, 2335, 2336, 2337, 2338, 2339, 2340, 2341, 2342, 2343, 2344, 2345, + 2346, 2347, 2348, 2349, 2350, 2351, 2352, 2353, 2354, 2355, 2356, 2357, + 2358, 2359, 2360, 2361, 2362, 2363, 2364, 2365, 2366, 2367, 2368, 2369, + 2370, 2371, 2372, 2373, 2374, 2375, 2376, 2377, 2378, 2379, 2380, 2381, + 2382, 2383, 2384, 2385, 2386, 2387, 2388, 2389, 2390, 2391, 2392, 2393, + 2394, 2395, 2396, 2397, 2398, 2399, 2400, 2401, 2402, 2403, 2404, 2405, + 2406, 2407, 2408, 2409, 2410, 2411, 2412, 2413, 2414, 2415, 2416, 2417, + 2418, 2419, 2420, 2421, 2422, 2423, 2424, 2425, 2426, 2427, 2428, 2429, + 2430, 2431, 2432, 2433, 2434, 2435, 2436, 2437, 2438, 2439, 2440, 2441, + 2442, 2443, 2444, 2445, 2446, 2447, 2448, 2449, 2450, 2451, 2452, 2453, + 2454, 2455, 2456, 2457, 2458, 2459, 2460, 2461, 2462, 2463, 2464, 2465, + 2466, 2467, 2468, 2469, 2470, 2471, 2472, 2473, 2474, 2475, 2476, 2477, + 2478, 2479, 2480, 2481, 2482, 2483, 2484, 2485, 2486, 2487, 2488, 2489, + 2490, 2491, 2492, 2493, 2494, 2495, 2496, 2497, 2498, 2499, 2500, 2501, + 2502, 2503, 2504, 2505, 2506, 2507, 2508, 2509, 2510, 2511, 2512, 2513, + 2514, 2515, 2516, 2517, 2518, 2519, 2520, 2521, 2522, 2523, 2524, 2525, + 2526, 2527, 2528, 2529, 2530, 2531, 2532, 2533, 2534, 2535, 2536, 2537, + 2538, 2539, 2540, 2541, 2542, 2543, 2544, 2545, 2546, 2547, 2548, 2549, + 2550, 2551, 2552, 2553, 2554, 2555, 2556, 2557, 2558, 2559, 2560, 2561, + 2562, 2563, 2564, 2565, 2566, 2567, 2568, 2569, 2570, 2571, 2572, 2573, + 2574, 2575, 2576, 2577, 2578, 2579, 2580, 2581, 2582, 2583, 2584, 2585, + 2586, 2587, 2588, 2589, 2590, 2591, 2592, 2593, 2594, 2595, 2596, 2597, + 2598, 2599, 2600, 2601, 2602, 2603, 2604, 2605, 2606, 2607, 2608, 2609, + 2610, 2611, 2612, 2613, 2614, 2615, 2616, 2617, 2618, 2619, 2620, 2621, + 2622, 2623, 2624, 2625, 2626, 2627, 2628, 2629, 2630, 2631, 2632, 2633, + 2634, 2635, 2636, 2637, 2638, 2639, 2640, 2641, 2642, 2643, 2644, 2645, + 2646, 2647, 2648, 2649, 2650, 2651, 2652, 2653, 2654, 2655, 2656, 2657, + 2658, 2659, 2660, 2661, 2662, 2663, 2664, 2665, 2666, 2667, 2668, 2669, + 2670, 2671, 2672, 2673, 2674, 2675, 2676, 2677, 2678, 2679, 2680, 2681, + 2682, 2683, 2684, 2685, 2686, 2687, 2688, 2689, 2690, 2691, 2692, 2693, + 2694, 2695, 2696, 2697, 2698, 2699, 2700, 2701, 2702, 2703, 2704, 2705, + 2706, 2707, 2708, 2709, 2710, 2711, 2712, 2713, 2714, 2715, 2716, 2717, + 2718, 2719, 2720, 2721, 2722, 2723, 2724, 2725, 2726, 2727, 2728, 2729, + 2730, 2731, 2732, 2733, 2734, 2735, 2736, 2737, 2738, 2739, 2740, 2741, + 2742, 2743, 2744, 2745, 2746, 2747, 2748, 2749, 2750, 2751, 2752, 2753, + 2754, 2755, 2756, 2757, 2758, 2759, 2760, 2761, 2762, 2763, 2764, 2765, + 2766, 2767, 2768, 2769, 2770, 2771, 2772, 2773, 2774, 2775, 2776, 2777, + 2778, 2779, 2780, 2781, 2782, 2783, 2784, 2785, 2786, 2787, 2788, 2789, + 2790, 2791, 2792, 2793, 2794, 2795, 2796, 2797, 2798, 2799, 2800, 2801, + 2802, 2803, 2804, 2805, 2806, 2807, 2808, 2809, 2810, 2811, 2812, 2813, + 2814, 2815, 2816, 2817, 2818, 2819, 2820, 2821, 2822, 2823, 2824, 2825, + 2826, 2827, 2828, 2829, 2830, 2831, 2832, 2833, 2834, 2835, 2836, 2837, + 2838, 2839, 2840, 2841, 2842, 2843, 2844, 2845, 2846, 2847, 2848, 2849, + 2850, 2851, 2852, 2853, 2854, 2855, 2856, 2857, 2858, 2859, 2860, 2861, + 2862, 2863, 2864, 2865, 2866, 2867, 2868, 2869, 2870, 2871, 2872, 2873, + 2874, 2875, 2876, 2877, 2878, 2879, 2880, 2881, 2882, 2883, 2884, 2885, + 2886, 2887, 2888, 2889, 2890, 2891, 2892, 2893, 2894, 2895, 2896, 2897, + 2898, 2899, 2900, 2901, 2902, 2903, 2904, 2905, 2906, 2907, 2908, 2909, + 2910, 2911, 2912, 2913, 2914, 2915, 2916, 2917, 2918, 2919, 2920, 2921, + 2922, 2923, 2924, 2925, 2926, 2927, 2928, 2929, 2930, 2931, 2932, 2933, + 2934, 2935, 2936, 2937, 2938, 2939, 2940, 2941, 2942, 2943, 2944, 2945, + 2946, 2947, 2948, 2949, 2950, 2951, 2952, 2953, 2954, 2955, 2956, 2957, + 2958, 2959, 2960, 2961, 2962, 2963, 2964, 2965, 2966, 2967, 2968, 2969, + 2970, 2971, 2972, 2973, 2974, 2975, 2976, 2977, 2978, 2979, 2980, 2981, + 2982, 2983, 2984, 2985, 2986, 2987, 2988, 2989, 2990, 2991, 2992, 2993, + 2994, 2995, 2996, 2997, 2998, 2999, 3000, 3001, 3002, 3003, 3004, 3005, + 3006, 3007, 3008, 3009, 3010, 3011, 3012, 3013, 3014, 3015, 3016, 3017, + 3018, 3019, 3020, 3021, 3022, 3023, 3024, 3025, 3026, 3027, 3028, 3029, + 3030, 3031, 3032, 3033, 3034, 3035, 3036, 3037, 3038, 3039, 3040, 3041, + 3042, 3043, 3044, 3045, 3046, 3047, 3048, 3049, 3050, 3051, 3052, 3053, + 3054, 3055, 3056, 3057, 3058, 3059, 3060, 3061, 3062, 3063, 3064, 3065, + 3066, 3067, 3068, 3069, 3070, 3071, 3072, 3073, 3074, 3075, 3076, 3077, + 3078, 3079, 3080, 3081, 3082, 3083, 3084, 3085, 3086, 3087, 3088, 3089, + 3090, 3091, 3092, 3093, 3094, 3095, 3096, 3097, 3098, 3099, 3100, 3101, + 3102, 3103, 3104, 3105, 3106, 3107, 3108, 3109, 3110, 3111, 3112, 3113, + 3114, 3115, 3116, 3117, 3118, 3119, 3120, 3121, 3122, 3123, 3124, 3125, + 3126, 3127, 3128, 3129, 3130, 3131, 3132, 3133, 3134, 3135, 3136, 3137, + 3138, 3139, 3140, 3141, 3142, 3143, 3144, 3145, 3146, 3147, 3148, 3149, + 3150, 3151, 3152, 3153, 3154, 3155, 3156, 3157, 3158, 3159, 3160, 3161, + 3162, 3163, 3164, 3165, 3166, 3167, 3168, 3169, 3170, 3171, 3172, 3173, + 3174, 3175, 3176, 3177, 3178, 3179, 3180, 3181, 3182, 3183, 3184, 3185, + 3186, 3187, 3188, 3189, 3190, 3191, 3192, 3193, 3194, 3195, 3196, 3197, + 3198, 3199, 3200, 3201, 3202, 3203, 3204, 3205, 3206, 3207, 3208, 3209, + 3210, 3211, 3212, 3213, 3214, 3215, 3216, 3217, 3218, 3219, 3220, 3221, + 3222, 3223, 3224, 3225, 3226, 3227, 3228, 3229, 3230, 3231, 3232, 3233, + 3234, 3235, 3236, 3237, 3238, 3239, 3240, 3241, 3242, 3243, 3244, 3245, + 3246, 3247, 3248, 3249, 3250, 3251, 3252, 3253, 3254, 3255, 3256, 3257, + 3258, 3259, 3260, 3261, 3262, 3263, 3264, 3265, 3266, 3267, 3268, 3269, + 3270, 3271, 3272, 3273, 3274, 3275, 3276, 3277, 3278, 3279, 3280, 3281, + 3282, 3283, 3284, 3285, 3286, 3287, 3288, 3289, 3290, 3291, 3292, 3293, + 3294, 3295, 3296, 3297, 3298, 3299, 3300, 3301, 3302, 3303, 3304, 3305, + 3306, 3307, 3308, 3309, 3310, 3311, 3312, 3313, 3314, 3315, 3316, 3317, + 3318, 3319, 3320, 3321, 3322, 3323, 3324, 3325, 3326, 3327, 3328, 3329, + 3330, 3331, 3332, 3333, 3334, 3335, 3336, 3337, 3338, 3339, 3340, 3341, + 3342, 3343, 3344, 3345, 3346, 3347, 3348, 3349, 3350, 3351, 3352, 3353, + 3354, 3355, 3356, 3357, 3358, 3359, 3360, 3361, 3362, 3363, 3364, 3365, + 3366, 3367, 3368, 3369, 3370, 3371, 3372, 3373, 3374, 3375, 3376, 3377, + 3378, 3379, 3380, 3381, 3382, 3383, 3384, 3385, 3386, 3387, 3388, 3389, + 3390, 3391, 3392, 3393, 3394, 3395, 3396, 3397, 3398, 3399, 3400, 3401, + 3402, 3403, 3404, 3405, 3406, 3407, 3408, 3409, 3410, 3411, 3412, 3413, + 3414, 3415, 3416, 3417, 3418, 3419, 3420, 3421, 3422, 3423, 3424, 3425, + 3426, 3427, 3428, 3429, 3430, 3431, 3432, 3433, 3434, 3435, 3436, 3437, + 3438, 3439, 3440, 3441, 3442, 3443, 3444, 3445, 3446, 3447, 3448, 3449, + 3450, 3451, 3452, 3453, 3454, 3455, 3456, 3457, 3458, 3459, 3460, 3461, + 3462, 3463, 3464, 3465, 3466, 3467, 3468, 3469, 3470, 3471, 3472, 3473, + 3474, 3475, 3476, 3477, 3478, 3479, 3480, 3481, 3482, 3483, 3484, 3485, + 3486, 3487, 3488, 3489, 3490, 3491, 3492, 3493, 3494, 3495, 3496, 3497, + 3498, 3499, 3500, 3501, 3502, 3503, 3504, 3505, 3506, 3507, 3508, 3509, + 3510, 3511, 3512, 3513, 3514, 3515, 3516, 3517, 3518, 3519, 3520, 3521, + 3522, 3523, 3524, 3525, 3526, 3527, 3528, 3529, 3530, 3531, 3532, 3533, + 3534, 3535, 3536, 3537, 3538, 3539, 3540, 3541, 3542, 3543, 3544, 3545, + 3546, 3547, 3548, 3549, 3550, 3551, 3552, 3553, 3554, 3555, 3556, 3557, + 3558, 3559, 3560, 3561, 3562, 3563, 3564, 3565, 3566, 3567, 3568, 3569, + 3570, 3571, 3572, 3573, 3574, 3575, 3576, 3577, 3578, 3579, 3580, 3581, + 3582, 3583, 3584, 3585, 3586, 3587, 3588, 3589, 3590, 3591, 3592, 3593, + 3594, 3595, 3596, 3597, 3598, 3599, 3600, 3601, 3602, 3603, 3604, 3605, + 3606, 3607, 3608, 3609, 3610, 3611, 3612, 3613, 3614, 3615, 3616, 3617, + 3618, 3619, 3620, 3621, 3622, 3623, 3624, 3625, 3626, 3627, 3628, 3629, + 3630, 3631, 3632, 3633, 3634, 3635, 3636, 3637, 3638, 3639, 3640, 3641, + 3642, 3643, 3644, 3645, 3646, 3647, 3648, 3649, 3650, 3651, 3652, 3653, + 3654, 3655, 3656, 3657, 3658, 3659, 3660, 3661, 3662, 3663, 3664, 3665, + 3666, 3667, 3668, 3669, 3670, 3671, 3672, 3673, 3674, 3675, 3676, 3677, + 3678, 3679, 3680, 3681, 3682, 3683, 3684, 3685, 3686, 3687, 3688, 3689, + 3690, 3691, 3692, 3693, 3694, 3695, 3696, 3697, 3698, 3699, 3700, 3701, + 3702, 3703, 3704, 3705, 3706, 3707, 3708, 3709, 3710, 3711, 3712, 3713, + 3714, 3715, 3716, 3717, 3718, 3719, 3720, 3721, 3722, 3723, 3724, 3725, + 3726, 3727, 3728, 3729, 3730, 3731, 3732, 3733, 3734, 3735, 3736, 3737, + 3738, 3739, 3740, 3741, 3742, 3743, 3744, 3745, 3746, 3747, 3748, 3749, + 3750, 3751, 3752, 3753, 3754, 3755, 3756, 3757, 3758, 3759, 3760, 3761, + 3762, 3763, 3764, 3765, 3766, 3767, 3768, 3769, 3770, 3771, 3772, 3773, + 3774, 3775, 3776, 3777, 3778, 3779, 3780, 3781, 3782, 3783, 3784, 3785, + 3786, 3787, 3788, 3789, 3790, 3791, 3792, 3793, 3794, 3795, 3796, 3797, + 3798, 3799, 3800, 3801, 3802, 3803, 3804, 3805, 3806, 3807, 3808, 3809, + 3810, 3811, 3812, 3813, 3814, 3815, 3816, 3817, 3818, 3819, 3820, 3821, + 3822, 3823, 3824, 3825, 3826, 3827, 3828, 3829, 3830, 3831, 3832, 3833, + 3834, 3835, 3836, 3837, 3838, 3839, 3840, 3841, 3842, 3843, 3844, 3845, + 3846, 3847, 3848, 3849, 3850, 3851, 3852, 3853, 3854, 3855, 3856, 3857, + 3858, 3859, 3860, 3861, 3862, 3863, 3864, 3865, 3866, 3867, 3868, 3869, + 3870, 3871, 3872, 3873, 3874, 3875, 3876, 3877, 3878, 3879, 3880, 3881, + 3882, 3883, 3884, 3885, 3886, 3887, 3888, 3889, 3890, 3891, 3892, 3893, + 3894, 3895, 3896, 3897, 3898, 3899, 3900, 3901, 3902, 3903, 3904, 3905, + 3906, 3907, 3908, 3909, 3910, 3911, 3912, 3913, 3914, 3915, 3916, 3917, + 3918, 3919, 3920, 3921, 3922, 3923, 3924, 3925, 3926, 3927, 3928, 3929, + 3930, 3931, 3932, 3933, 3934, 3935, 3936, 3937, 3938, 3939, 3940, 3941, + 3942, 3943, 3944, 3945, 3946, 3947, 3948, 3949, 3950, 3951, 3952, 3953, + 3954, 3955, 3956, 3957, 3958, 3959, 3960, 3961, 3962, 3963, 3964, 3965, + 3966, 3967, 3968, 3969, 3970, 3971, 3972, 3973, 3974, 3975, 3976, 3977, + 3978, 3979, 3980, 3981, 3982, 3983, 3984, 3985, 3986, 3987, 3988, 3989, + 3990, 3991, 3992, 3993, 3994, 3995, 3996, 3997, 3998, 3999, 4000, 4001, + 4002, 4003, 4004, 4005, 4006, 4007, 4008, 4009, 4010, 4011, 4012, 4013, + 4014, 4015, 4016, 4017, 4018, 4019, 4020, 4021, 4022, 4023, 4024, 4025, + 4026, 4027, 4028, 4029, 4030, 4031, 4032, 4033, 4034, 4035, 4036, 4037, + 4038, 4039, 4040, 4041, 4042, 4043, 4044, 4045, 4046, 4047, 4048, 4049, + 4050, 4051, 4052, 4053, 4054, 4055, 4056, 4057, 4058, 4059, 4060, 4061, + 4062, 4063, 4064, 4065, 4066, 4067, 4068, 4069, 4070, 4071, 4072, 4073, + 4074, 4075, 4076, 4077, 4078, 4079, 4080, 4081, 4082, 4083, 4084, 4085, + 4086, 4087, 4088, 4089, 4090, 4091, 4092, 4093, 4094, 4095, 4096, 4097, + 4098, 4099, 4100, 4101, 4102, 4103, 4104, 4105, 4106, 4107, 4108, 4109, + 4110, 4111, 4112, 4113, 4114, 4115, 4116, 4117, 4118, 4119, 4120, 4121, + 4122, 4123, 4124, 4125, 4126, 4127, 4128, 4129, 4130, 4131, 4132, 4133, + 4134, 4135, 4136, 4137, 4138, 4139, 4140, 4141, 4142, 4143, 4144, 4145, + 4146, 4147, 4148, 4149, 4150, 4151, 4152, 4153, 4154, 4155, 4156, 4157, + 4158, 4159, 4160, 4161, 4162, 4163, 4164, 4165, 4166, 4167, 4168, 4169, + 4170, 4171, 4172, 4173, 4174, 4175, 4176, 4177, 4178, 4179, 4180, 4181, + 4182, 4183, 4184, 4185, 4186, 4187, 4188, 4189, 4190, 4191, 4192, 4193, + 4194, 4195, 4196, 4197, 4198, 4199, 4200, 4201, 4202, 4203, 4204, 4205, + 4206, 4207, 4208, 4209, 4210, 4211, 4212, 4213, 4214, 4215, 4216, 4217, + 4218, 4219, 4220, 4221, 4222, 4223, 4224, 4225, 4226, 4227, 4228, 4229, + 4230, 4231, 4232, 4233, 4234, 4235, 4236, 4237, 4238, 4239, 4240, 4241, + 4242, 4243, 4244, 4245, 4246, 4247, 4248, 4249, 4250, 4251, 4252, 4253, + 4254, 4255, 4256, 4257, 4258, 4259, 4260, 4261, 4262, 4263, 4264, 4265, + 4266, 4267, 4268, 4269, 4270, 4271, 4272, 4273, 4274, 4275, 4276, 4277, + 4278, 4279, 4280, 4281, 4282, 4283, 4284, 4285, 4286, 4287, 4288, 4289, + 4290, 4291, 4292, 4293, 4294, 4295, 4296, 4297, 4298, 4299, 4300, 4301, + 4302, 4303, 4304, 4305, 4306, 4307, 4308, 4309, 4310, 4311, 4312, 4313, + 4314, 4315, 4316, 4317, 4318, 4319, 4320, 4321, 4322, 4323, 4324, 4325, + 4326, 4327, 4328, 4329, 4330, 4331, 4332, 4333, 4334, 4335, 4336, 4337, + 4338, 4339, 4340, 4341, 4342, 4343, 4344, 4345, 4346, 4347, 4348, 4349, + 4350, 4351, 4352, 4353, 4354, 4355, 4356, 4357, 4358, 4359, 4360, 4361, + 4362, 4363, 4364, 4365, 4366, 4367, 4368, 4369, 4370, 4371, 4372, 4373, + 4374, 4375, 4376, 4377, 4378, 4379, 4380, 4381, 4382, 4383, 4384, 4385, + 4386, 4387, 4388, 4389, 4390, 4391, 4392, 4393, 4394, 4395, 4396, 4397, + 4398, 4399, 4400, 4401, 4402, 4403, 4404, 4405, 4406, 4407, 4408, 4409, + 4410, 4411, 4412, 4413, 4414, 4415, 4416, 4417, 4418, 4419, 4420, 4421, + 4422, 4423, 4424, 4425, 4426, 4427, 4428, 4429, 4430, 4431, 4432, 4433, + 4434, 4435, 4436, 4437, 4438, 4439, 4440, 4441, 4442, 4443, 4444, 4445, + 4446, 4447, 4448, 4449, 4450, 4451, 4452, 4453, 4454, 4455, 4456, 4457, + 4458, 4459, 4460, 4461, 4462, 4463, 4464, 4465, 4466, 4467, 4468, 4469, + 4470, 4471, 4472, 4473, 4474, 4475, 4476, 4477, 4478, 4479, 4480, 4481, + 4482, 4483, 4484, 4485, 4486, 4487, 4488, 4489, 4490, 4491, 4492, 4493, + 4494, 4495, 4496, 4497, 4498, 4499, 4500, 4501, 4502, 4503, 4504, 4505, + 4506, 4507, 4508, 4509, 4510, 4511, 4512, 4513, 4514, 4515, 4516, 4517, + 4518, 4519, 4520, 4521, 4522, 4523, 4524, 4525, 4526, 4527, 4528, 4529, + 4530, 4531, 4532, 4533, 4534, 4535, 4536, 4537, 4538, 4539, 4540, 4541, + 4542, 4543, 4544, 4545, 4546, 4547, 4548, 4549, 4550, 4551, 4552, 4553, + 4554, 4555, 4556, 4557, 4558, 4559, 4560, 4561, 4562, 4563, 4564, 4565, + 4566, 4567, 4568, 4569, 4570, 4571, 4572, 4573, 4574, 4575, 4576, 4577, + 4578, 4579, 4580, 4581, 4582, 4583, 4584, 4585, 4586, 4587, 4588, 4589, + 4590, 4591, 4592, 4593, 4594, 4595, 4596, 4597, 4598, 4599, 4600, 4601, + 4602, 4603, 4604, 4605, 4606, 4607, 4608, 4609, 4610, 4611, 4612, 4613, + 4614, 4615, 4616, 4617, 4618, 4619, 4620, 4621, 4622, 4623, 4624, 4625, + 4626, 4627, 4628, 4629, 4630, 4631, 4632, 4633, 4634, 4635, 4636, 4637, + 4638, 4639, 4640, 4641, 4642, 4643, 4644, 4645, 4646, 4647, 4648, 4649, + 4650, 4651, 4652, 4653, 4654, 4655, 4656, 4657, 4658, 4659, 4660, 4661, + 4662, 4663, 4664, 4665, 4666, 4667, 4668, 4669, 4670, 4671, 4672, 4673, + 4674, 4675, 4676, 4677, 4678, 4679, 4680, 4681, 4682, 4683, 4684, 4685, + 4686, 4687, 4688, 4689, 4690, 4691, 4692, 4693, 4694, 4695, 4696, 4697, + 4698, 4699, 4700, 4701, 4702, 4703, 4704, 4705, 4706, 4707, 4708, 4709, + 4710, 4711, 4712, 4713, 4714, 4715, 4716, 4717, 4718, 4719, 4720, 4721, + 4722, 4723, 4724, 4725, 4726, 4727, 4728, 4729, 4730, 4731, 4732, 4733, + 4734, 4735, 4736, 4737, 4738, 4739, 4740, 4741, 4742, 4743, 4744, 4745, + 4746, 4747, 4748, 4749, 4750, 4751, 4752, 4753, 4754, 4755, 4756, 4757, + 4758, 4759, 4760, 4761, 4762, 4763, 4764, 4765, 4766, 4767, 4768, 4769, + 4770, 4771, 4772, 4773, 4774, 4775, 4776, 4777, 4778, 4779, 4780, 4781, + 4782, 4783, 4784, 4785, 4786, 4787, 4788, 4789, 4790, 4791, 4792, 4793, + 4794, 4795, 4796, 4797, 4798, 4799, 4800, 4801, 4802, 4803, 4804, 4805, + 4806, 4807, 4808, 4809, 4810, 4811, 4812, 4813, 4814, 4815, 4816, 4817, + 4818, 4819, 4820, 4821, 4822, 4823, 4824, 4825, 4826, 4827, 4828, 4829, + 4830, 4831, 4832, 4833, 4834, 4835, 4836, 4837, 4838, 4839, 4840, 4841, + 4842, 4843, 4844, 4845, 4846, 4847, 4848, 4849, 4850, 4851, 4852, 4853, + 4854, 4855, 4856, 4857, 4858, 4859, 4860, 4861, 4862, 4863, 4864, 4865, + 4866, 4867, 4868, 4869, 4870, 4871, 4872, 4873, 4874, 4875, 4876, 4877, + 4878, 4879, 4880, 4881, 4882, 4883, 4884, 4885, 4886, 4887, 4888, 4889, + 4890, 4891, 4892, 4893, 4894, 4895, 4896, 4897, 4898, 4899, 4900, 4901, + 4902, 4903, 4904, 4905, 4906, 4907, 4908, 4909, 4910, 4911, 4912, 4913, + 4914, 4915, 4916, 4917, 4918, 4919, 4920, 4921, 4922, 4923, 4924, 4925, + 4926, 4927, 4928, 4929, 4930, 4931, 4932, 4933, 4934, 4935, 4936, 4937, + 4938, 4939, 4940, 4941, 4942, 4943, 4944, 4945, 4946, 4947, 4948, 4949, + 4950, 4951, 4952, 4953, 4954, 4955, 4956, 4957, 4958, 4959, 4960, 4961, + 4962, 4963, 4964, 4965, 4966, 4967, 4968, 4969, 4970, 4971, 4972, 4973, + 4974, 4975, 4976, 4977, 4978, 4979, 4980, 4981, 4982, 4983, 4984, 4985, + 4986, 4987, 4988, 4989, 4990, 4991, 4992, 4993, 4994, 4995, 4996, 4997, + 4998, 4999, 5000, 5001, 5002, 5003, 5004, 5005, 5006, 5007, 5008, 5009, + 5010, 5011, 5012, 5013, 5014, 5015, 5016, 5017, 5018, 5019, 5020, 5021, + 5022, 5023, 5024, 5025, 5026, 5027, 5028, 5029, 5030, 5031, 5032, 5033, + 5034, 5035, 5036, 5037, 5038, 5039, 5040, 5041, 5042, 5043, 5044, 5045, + 5046, 5047, 5048, 5049, 5050, 5051, 5052, 5053, 5054, 5055, 5056, 5057, + 5058, 5059, 5060, 5061, 5062, 5063, 5064, 5065, 5066, 5067, 5068, 5069, + 5070, 5071, 5072, 5073, 5074, 5075, 5076, 5077, 5078, 5079, 5080, 5081, + 5082, 5083, 5084, 5085, 5086, 5087, 5088, 5089, 5090, 5091, 5092, 5093, + 5094, 5095, 5096, 5097, 5098, 5099, 5100, 5101, 5102, 5103, 5104, 5105, + 5106, 5107, 5108, 5109, 5110, 5111, 5112, 5113, 5114, 5115, 5116, 5117, + 5118, 5119, 5120, 5121, 5122, 5123, 5124, 5125, 5126, 5127, 5128, 5129, + 5130, 5131, 5132, 5133, 5134, 5135, 5136, 5137, 5138, 5139, 5140, 5141, + 5142, 5143, 5144, 5145, 5146, 5147, 5148, 5149, 5150, 5151, 5152, 5153, + 5154, 5155, 5156, 5157, 5158, 5159, 5160, 5161, 5162, 5163, 5164, 5165, + 5166, 5167, 5168, 5169, 5170, 5171, 5172, 5173, 5174, 5175, 5176, 5177, + 5178, 5179, 5180, 5181, 5182, 5183, 5184, 5185, 5186, 5187, 5188, 5189, + 5190, 5191, 5192, 5193, 5194, 5195, 5196, 5197, 5198, 5199, 5200, 5201, + 5202, 5203, 5204, 5205, 5206, 5207, 5208, 5209, 5210, 5211, 5212, 5213, + 5214, 5215, 5216, 5217, 5218, 5219, 5220, 5221, 5222, 5223, 5224, 5225, + 5226, 5227, 5228, 5229, 5230, 5231, 5232, 5233, 5234, 5235, 5236, 5237, + 5238, 5239, 5240, 5241, 5242, 5243, 5244, 5245, 5246, 5247, 5248, 5249, + 5250, 5251, 5252, 5253, 5254, 5255, 5256, 5257, 5258, 5259, 5260, 5261, + 5262, 5263, 5264, 5265, 5266, 5267, 5268, 5269, 5270, 5271, 5272, 5273, + 5274, 5275, 5276, 5277, 5278, 5279, 5280, 5281, 5282, 5283, 5284, 5285, + 5286, 5287, 5288, 5289, 5290, 5291, 5292, 5293, 5294, 5295, 5296, 5297, + 5298, 5299, 5300, 5301, 5302, 5303, 5304, 5305, 5306, 5307, 5308, 5309, + 5310, 5311, 5312, 5313, 5314, 5315, 5316, 5317, 5318, 5319, 5320, 5321, + 5322, 5323, 5324, 5325, 5326, 5327, 5328, 5329, 5330, 5331, 5332, 5333, + 5334, 5335, 5336, 5337, 5338, 5339, 5340, 5341, 5342, 5343, 5344, 5345, + 5346, 5347, 5348, 5349, 5350, 5351, 5352, 5353, 5354, 5355, 5356, 5357, + 5358, 5359, 5360, 5361, 5362, 5363, 5364, 5365, 5366, 5367, 5368, 5369, + 5370, 5371, 5372, 5373, 5374, 5375, 5376, 5377, 5378, 5379, 5380, 5381, + 5382, 5383, 5384, 5385, 5386, 5387, 5388, 5389, 5390, 5391, 5392, 5393, + 5394, 5395, 5396, 5397, 5398, 5399, 5400, 5401, 5402, 5403, 5404, 5405, + 5406, 5407, 5408, 5409, 5410, 5411, 5412, 5413, 5414, 5415, 5416, 5417, + 5418, 5419, 5420, 5421, 5422, 5423, 5424, 5425, 5426, 5427, 5428, 5429, + 5430, 5431, 5432, 5433, 5434, 5435, 5436, 5437, 5438, 5439, 5440, 5441, + 5442, 5443, 5444, 5445, 5446, 5447, 5448, 5449, 5450, 5451, 5452, 5453, + 5454, 5455, 5456, 5457, 5458, 5459, 5460, 5461, 5462, 5463, 5464, 5465, + 5466, 5467, 5468, 5469, 5470, 5471, 5472, 5473, 5474, 5475, 5476, 5477, + 5478, 5479, 5480, 5481, 5482, 5483, 5484, 5485, 5486, 5487, 5488, 5489, + 5490, 5491, 5492, 5493, 5494, 5495, 5496, 5497, 5498, 5499, 5500, 5501, + 5502, 5503, 5504, 5505, 5506, 5507, 5508, 5509, 5510, 5511, 5512, 5513, + 5514, 5515, 5516, 5517, 5518, 5519, 5520, 5521, 5522, 5523, 5524, 5525, + 5526, 5527, 5528, 5529, 5530, 5531, 5532, 5533, 5534, 5535, 5536, 5537, + 5538, 5539, 5540, 5541, 5542, 5543, 5544, 5545, 5546, 5547, 5548, 5549, + 5550, 5551, 5552, 5553, 5554, 5555, 5556, 5557, 5558, 5559, 5560, 5561, + 5562, 5563, 5564, 5565, 5566, 5567, 5568, 5569, 5570, 5571, 5572, 5573, + 5574, 5575, 5576, 5577, 5578, 5579, 5580, 5581, 5582, 5583, 5584, 5585, + 5586, 5587, 5588, 5589, 5590, 5591, 5592, 5593, 5594, 5595, 5596, 5597, + 5598, 5599, 5600, 5601, 5602, 5603, 5604, 5605, 5606, 5607, 5608, 5609, + 5610, 5611, 5612, 5613, 5614, 5615, 5616, 5617, 5618, 5619, 5620, 5621, + 5622, 5623, 5624, 5625, 5626, 5627, 5628, 5629, 5630, 5631, 5632, 5633, + 5634, 5635, 5636, 5637, 5638, 5639, 5640, 5641, 5642, 5643, 5644, 5645, + 5646, 5647, 5648, 5649, 5650, 5651, 5652, 5653, 5654, 5655, 5656, 5657, + 5658, 5659, 5660, 5661, 5662, 5663, 5664, 5665, 5666, 5667, 5668, 5669, + 5670, 5671, 5672, 5673, 5674, 5675, 5676, 5677, 5678, 5679, 5680, 5681, + 5682, 5683, 5684, 5685, 5686, 5687, 5688, 5689, 5690, 5691, 5692, 5693, + 5694, 5695, 5696, 5697, 5698, 5699, 5700, 5701, 5702, 5703, 5704, 5705, + 5706, 5707, 5708, 5709, 5710, 5711, 5712, 5713, 5714, 5715, 5716, 5717, + 5718, 5719, 5720, 5721, 5722, 5723, 5724, 5725, 5726, 5727, 5728, 5729, + 5730, 5731, 5732, 5733, 5734, 5735, 5736, 5737, 5738, 5739, 5740, 5741, + 5742, 5743, 5744, 5745, 5746, 5747, 5748, 5749, 5750, 5751, 5752, 5753, + 5754, 5755, 5756, 5757, 5758, 5759, 5760, 5761, 5762, 5763, 5764, 5765, + 5766, 5767, 5768, 5769, 5770, 5771, 5772, 5773, 5774, 5775, 5776, 5777, + 5778, 5779, 5780, 5781, 5782, 5783, 5784, 5785, 5786, 5787, 5788, 5789, + 5790, 5791, 5792, 5793, 5794, 5795, 5796, 5797, 5798, 5799, 5800, 5801, + 5802, 5803, 5804, 5805, 5806, 5807, 5808, 5809, 5810, 5811, 5812, 5813, + 5814, 5815, 5816, 5817, 5818, 5819, 5820, 5821, 5822, 5823, 5824, 5825, + 5826, 5827, 5828, 5829, 5830, 5831, 5832, 5833, 5834, 5835, 5836, 5837, + 5838, 5839, 5840, 5841, 5842, 5843, 5844, 5845, 5846, 5847, 5848, 5849, + 5850, 5851, 5852, 5853, 5854, 5855, 5856, 5857, 5858, 5859, 5860, 5861, + 5862, 5863, 5864, 5865, 5866, 5867, 5868, 5869, 5870, 5871, 5872, 5873, + 5874, 5875, 5876, 5877, 5878, 5879, 5880, 5881, 5882, 5883, 5884, 5885, + 5886, 5887, 5888, 5889, 5890, 5891, 5892, 5893, 5894, 5895, 5896, 5897, + 5898, 5899, 5900, 5901, 5902, 5903, 5904, 5905, 5906, 5907, 5908, 5909, + 5910, 5911, 5912, 5913, 5914, 5915, 5916, 5917, 5918, 5919, 5920, 5921, + 5922, 5923, 5924, 5925, 5926, 5927, 5928, 5929, 5930, 5931, 5932, 5933, + 5934, 5935, 5936, 5937, 5938, 5939, 5940, 5941, 5942, 5943, 5944, 5945, + 5946, 5947, 5948, 5949, 5950, 5951, 5952, 5953, 5954, 5955, 5956, 5957, + 5958, 5959, 5960, 5961, 5962, 5963, 5964, 5965, 5966, 5967, 5968, 5969, + 5970, 5971, 5972, 5973, 5974, 5975, 5976, 5977, 5978, 5979, 5980, 5981, + 5982, 5983, 5984, 5985, 5986, 5987, 5988, 5989, 5990, 5991, 5992, 5993, + 5994, 5995, 5996, 5997, 5998, 5999, 6000, 6001, 6002, 6003, 6004, 6005, + 6006, 6007, 6008, 6009, 6010, 6011, 6012, 6013, 6014, 6015, 6016, 6017, + 6018, 6019, 6020, 6021, 6022, 6023, 6024, 6025, 6026, 6027, 6028, 6029, + 6030, 6031, 6032, 6033, 6034, 6035, 6036, 6037, 6038, 6039, 6040, 6041, + 6042, 6043, 6044, 6045, 6046, 6047, 6048, 6049, 6050, 6051, 6052, 6053, + 6054, 6055, 6056, 6057, 6058, 6059, 6060, 6061, 6062, 6063, 6064, 6065, + 6066, 6067, 6068, 6069, 6070, 6071, 6072, 6073, 6074, 6075, 6076, 6077, + 6078, 6079, 6080, 6081, 6082, 6083, 6084, 6085, 6086, 6087, 6088, 6089, + 6090, 6091, 6092, 6093, 6094, 6095, 6096, 6097, 6098, 6099, 6100, 6101, + 6102, 6103, 6104, 6105, 6106, 6107, 6108, 6109, 6110, 6111, 6112, 6113, + 6114, 6115, 6116, 6117, 6118, 6119, 6120, 6121, 6122, 6123, 6124, 6125, + 6126, 6127, 6128, 6129, 6130, 6131, 6132, 6133, 6134, 6135, 6136, 6137, + 6138, 6139, 6140, 6141, 6142, 6143, 6144, 6145, 6146, 6147, 6148, 6149, + 6150, 6151, 6152, 6153, 6154, 6155, 6156, 6157, 6158, 6159, 6160, 6161, + 6162, 6163, 6164, 6165, 6166, 6167, 6168, 6169, 6170, 6171, 6172, 6173, + 6174, 6175, 6176, 6177, 6178, 6179, 6180, 6181, 6182, 6183, 6184, 6185, + 6186, 6187, 6188, 6189, 6190, 6191, 6192, 6193, 6194, 6195, 6196, 6197, + 6198, 6199, 6200, 6201, 6202, 6203, 6204, 6205, 6206, 6207, 6208, 6209, + 6210, 6211, 6212, 6213, 6214, 6215, 6216, 6217, 6218, 6219, 6220, 6221, + 6222, 6223, 6224, 6225, 6226, 6227, 6228, 6229, 6230, 6231, 6232, 6233, + 6234, 6235, 6236, 6237, 6238, 6239, 6240, 6241, 6242, 6243, 6244, 6245, + 6246, 6247, 6248, 6249, 6250, 6251, 6252, 6253, 6254, 6255, 6256, 6257, + 6258, 6259, 6260, 6261, 6262, 6263, 6264, 6265, 6266, 6267, 6268, 6269, + 6270, 6271, 6272, 6273, 6274, 6275, 6276, 6277, 6278, 6279, 6280, 6281, + 6282, 6283, 6284, 6285, 6286, 6287, 6288, 6289, 6290, 6291, 6292, 6293, + 6294, 6295, 6296, 6297, 6298, 6299, 6300, 6301, 6302, 6303, 6304, 6305, + 6306, 6307, 6308, 6309, 6310, 6311, 6312, 6313, 6314, 6315, 6316, 6317, + 6318, 6319, 6320, 6321, 6322, 6323, 6324, 6325, 6326, 6327, 6328, 6329, + 6330, 6331, 6332, 6333, 6334, 6335, 6336, 6337, 6338, 6339, 6340, 6341, + 6342, 6343, 6344, 6345, 6346, 6347, 6348, 6349, 6350, 6351, 6352, 6353, + 6354, 6355, 6356, 6357, 6358, 6359, 6360, 6361, 6362, 6363, 6364, 6365, + 6366, 6367, 6368, 6369, 6370, 6371, 6372, 6373, 6374, 6375, 6376, 6377, + 6378, 6379, 6380, 6381, 6382, 6383, 6384, 6385, 6386, 6387, 6388, 6389, + 6390, 6391, 6392, 6393, 6394, 6395, 6396, 6397, 6398, 6399, 6400, 6401, + 6402, 6403, 6404, 6405, 6406, 6407, 6408, 6409, 6410, 6411, 6412, 6413, + 6414, 6415, 6416, 6417, 6418, 6419, 6420, 6421, 6422, 6423, 6424, 6425, + 6426, 6427, 6428, 6429, 6430, 6431, 6432, 6433, 6434, 6435, 6436, 6437, + 6438, 6439, 6440, 6441, 6442, 6443, 6444, 6445, 6446, 6447, 6448, 6449, + 6450, 6451, 6452, 6453, 6454, 6455, 6456, 6457, 6458, 6459, 6460, 6461, + 6462, 6463, 6464, 6465, 6466, 6467, 6468, 6469, 6470, 6471, 6472, 6473, + 6474, 6475, 6476, 6477, 6478, 6479, 6480, 6481, 6482, 6483, 6484, 6485, + 6486, 6487, 6488, 6489, 6490, 6491, 6492, 6493, 6494, 6495, 6496, 6497, + 6498, 6499, 6500, 6501, 6502, 6503, 6504, 6505, 6506, 6507, 6508, 6509, + 6510, 6511, 6512, 6513, 6514, 6515, 6516, 6517, 6518, 6519, 6520, 6521, + 6522, 6523, 6524, 6525, 6526, 6527, 6528, 6529, 6530, 6531, 6532, 6533, + 6534, 6535, 6536, 6537, 6538, 6539, 6540, 6541, 6542, 6543, 6544, 6545, + 6546, 6547, 6548, 6549, 6550, 6551, 6552, 6553, 6554, 6555, 6556, 6557, + 6558, 6559, 6560, 6561, 6562, 6563, 6564, 6565, 6566, 6567, 6568, 6569, + 6570, 6571, 6572, 6573, 6574, 6575, 6576, 6577, 6578, 6579, 6580, 6581, + 6582, 6583, 6584, 6585, 6586, 6587, 6588, 6589, 6590, 6591, 6592, 6593, + 6594, 6595, 6596, 6597, 6598, 6599, 6600, 6601, 6602, 6603, 6604, 6605, + 6606, 6607, 6608, 6609, 6610, 6611, 6612, 6613, 6614, 6615, 6616, 6617, + 6618, 6619, 6620, 6621, 6622, 6623, 6624, 6625, 6626, 6627, 6628, 6629, + 6630, 6631, 6632, 6633, 6634, 6635, 6636, 6637, 6638, 6639, 6640, 6641, + 6642, 6643, 6644, 6645, 6646, 6647, 6648, 6649, 6650, 6651, 6652, 6653, + 6654, 6655, 6656, 6657, 6658, 6659, 6660, 6661, 6662, 6663, 6664, 6665, + 6666, 6667, 6668, 6669, 6670, 6671, 6672, 6673, 6674, 6675, 6676, 6677, + 6678, 6679, 6680, 6681, 6682, 6683, 6684, 6685, 6686, 6687, 6688, 6689, + 6690, 6691, 6692, 6693, 6694, 6695, 6696, 6697, 6698, 6699, 6700, 6701, + 6702, 6703, 6704, 6705, 6706, 6707, 6708, 6709, 6710, 6711, 6712, 6713, + 6714, 6715, 6716, 6717, 6718, 6719, 6720, 6721, 6722, 6723, 6724, 6725, + 6726, 6727, 6728, 6729, 6730, 6731, 6732, 6733, 6734, 6735, 6736, 6737, + 6738, 6739, 6740, 6741, 6742, 6743, 6744, 6745, 6746, 6747, 6748, 6749, + 6750, 6751, 6752, 6753, 6754, 6755, 6756, 6757, 6758, 6759, 6760, 6761, + 6762, 6763, 6764, 6765, 6766, 6767, 6768, 6769, 6770, 6771, 6772, 6773, + 6774, 6775, 6776, 6777, 6778, 6779, 6780, 6781, 6782, 6783, 6784, 6785, + 6786, 6787, 6788, 6789, 6790, 6791, 6792, 6793, 6794, 6795, 6796, 6797, + 6798, 6799, 6800, 6801, 6802, 6803, 6804, 6805, 6806, 6807, 6808, 6809, + 6810, 6811, 6812, 6813, 6814, 6815, 6816, 6817, 6818, 6819, 6820, 6821, + 6822, 6823, 6824, 6825, 6826, 6827, 6828, 6829, 6830, 6831, 6832, 6833, + 6834, 6835, 6836, 6837, 6838, 6839, 6840, 6841, 6842, 6843, 6844, 6845, + 6846, 6847, 6848, 6849, 6850, 6851, 6852, 6853, 6854, 6855, 6856, 6857, + 6858, 6859, 6860, 6861, 6862, 6863, 6864, 6865, 6866, 6867, 6868, 6869, + 6870, 6871, 6872, 6873, 6874, 6875, 6876, 6877, 6878, 6879, 6880, 6881, + 6882, 6883, 6884, 6885, 6886, 6887, 6888, 6889, 6890, 6891, 6892, 6893, + 6894, 6895, 6896, 6897, 6898, 6899, 6900, 6901, 6902, 6903, 6904, 6905, + 6906, 6907, 6908, 6909, 6910, 6911, 6912, 6913, 6914, 6915, 6916, 6917, + 6918, 6919, 6920, 6921, 6922, 6923, 6924, 6925, 6926, 6927, 6928, 6929, + 6930, 6931, 6932, 6933, 6934, 6935, 6936, 6937, 6938, 6939, 6940, 6941, + 6942, 6943, 6944, 6945, 6946, 6947, 6948, 6949, 6950, 6951, 6952, 6953, + 6954, 6955, 6956, 6957, 6958, 6959, 6960, 6961, 6962, 6963, 6964, 6965, + 6966, 6967, 6968, 6969, 6970, 6971, 6972, 6973, 6974, 6975, 6976, 6977, + 6978, 6979, 6980, 6981, 6982, 6983, 6984, 6985, 6986, 6987, 6988, 6989, + 6990, 6991, 6992, 6993, 6994, 6995, 6996, 6997, 6998, 6999, 7000, 7001, + 7002, 7003, 7004, 7005, 7006, 7007, 7008, 7009, 7010, 7011, 7012, 7013, + 7014, 7015, 7016, 7017, 7018, 7019, 7020, 7021, 7022, 7023, 7024, 7025, + 7026, 7027, 7028, 7029, 7030, 7031, 7032, 7033, 7034, 7035, 7036, 7037, + 7038, 7039, 7040, 7041, 7042, 7043, 7044, 7045, 7046, 7047, 7048, 7049, + 7050, 7051, 7052, 7053, 7054, 7055, 7056, 7057, 7058, 7059, 7060, 7061, + 7062, 7063, 7064, 7065, 7066, 7067, 7068, 7069, 7070, 7071, 7072, 7073, + 7074, 7075, 7076, 7077, 7078, 7079, 7080, 7081, 7082, 7083, 7084, 7085, + 7086, 7087, 7088, 7089, 7090, 7091, 7092, 7093, 7094, 7095, 7096, 7097, + 7098, 7099, 7100, 7101, 7102, 7103, 7104, 7105, 7106, 7107, 7108, 7109, + 7110, 7111, 7112, 7113, 7114, 7115, 7116, 7117, 7118, 7119, 7120, 7121, + 7122, 7123, 7124, 7125, 7126, 7127, 7128, 7129, 7130, 7131, 7132, 7133, + 7134, 7135, 7136, 7137, 7138, 7139, 7140, 7141, 7142, 7143, 7144, 7145, + 7146, 7147, 7148, 7149, 7150, 7151, 7152, 7153, 7154, 7155, 7156, 7157, + 7158, 7159, 7160, 7161, 7162, 7163, 7164, 7165, 7166, 7167, 7168, 7169, + 7170, 7171, 7172, 7173, 7174, 7175, 7176, 7177, 7178, 7179, 7180, 7181, + 7182, 7183, 7184, 7185, 7186, 7187, 7188, 7189, 7190, 7191, 7192, 7193, + 7194, 7195, 7196, 7197, 7198, 7199, 7200, 7201, 7202, 7203, 7204, 7205, + 7206, 7207, 7208, 7209, 7210, 7211, 7212, 7213, 7214, 7215, 7216, 7217, + 7218, 7219, 7220, 7221, 7222, 7223, 7224, 7225, 7226, 7227, 7228, 7229, + 7230, 7231, 7232, 7233, 7234, 7235, 7236, 7237, 7238, 7239, 7240, 7241, + 7242, 7243, 7244, 7245, 7246, 7247, 7248, 7249, 7250, 7251, 7252, 7253, + 7254, 7255, 7256, 7257, 7258, 7259, 7260, 7261, 7262, 7263, 7264, 7265, + 7266, 7267, 7268, 7269, 7270, 7271, 7272, 7273, 7274, 7275, 7276, 7277, + 7278, 7279, 7280, 7281, 7282, 7283, 7284, 7285, 7286, 7287, 7288, 7289, + 7290, 7291, 7292, 7293, 7294, 7295, 7296, 7297, 7298, 7299, 7300, 7301, + 7302, 7303, 7304, 7305, 7306, 7307, 7308, 7309, 7310, 7311, 7312, 7313, + 7314, 7315, 7316, 7317, 7318, 7319, 7320, 7321, 7322, 7323, 7324, 7325, + 7326, 7327, 7328, 7329, 7330, 7331, 7332, 7333, 7334, 7335, 7336, 7337, + 7338, 7339, 7340, 7341, 7342, 7343, 7344, 7345, 7346, 7347, 7348, 7349, + 7350, 7351, 7352, 7353, 7354, 7355, 7356, 7357, 7358, 7359, 7360, 7361, + 7362, 7363, 7364, 7365, 7366, 7367, 7368, 7369, 7370, 7371, 7372, 7373, + 7374, 7375, 7376, 7377, 7378, 7379, 7380, 7381, 7382, 7383, 7384, 7385, + 7386, 7387, 7388, 7389, 7390, 7391, 7392, 7393, 7394, 7395, 7396, 7397, + 7398, 7399, 7400, 7401, 7402, 7403, 7404, 7405, 7406, 7407, 7408, 7409, + 7410, 7411, 7412, 7413, 7414, 7415, 7416, 7417, 7418, 7419, 7420, 7421, + 7422, 7423, 7424 ; + + node_num_map = 265, 266, 1188, 946, 267, 1189, 268, 1190, 269, 1191, 270, + 1192, 271, 1193, 272, 1194, 273, 1195, 274, 1196, 275, 1197, 276, 1198, + 277, 1199, 278, 1200, 279, 1201, 280, 1202, 281, 1203, 282, 1204, 283, + 1205, 284, 1206, 285, 1207, 286, 1208, 287, 1209, 288, 1210, 289, 1211, + 290, 1212, 291, 1213, 292, 1214, 293, 1215, 294, 1216, 295, 1217, 296, + 1218, 297, 1219, 298, 995, 1220, 945, 1221, 1222, 1223, 1224, 1225, 1226, + 1227, 1228, 1229, 1230, 1231, 1232, 1233, 1234, 1235, 1236, 1237, 1238, + 1239, 1240, 1241, 1242, 1243, 1244, 1245, 1246, 1247, 1248, 1249, 1250, + 1251, 994, 1252, 944, 1253, 1254, 1255, 1256, 1257, 1258, 1259, 1260, + 1261, 1262, 1263, 1264, 1265, 1266, 1267, 1268, 1269, 1270, 1271, 1272, + 1273, 1274, 1275, 1276, 1277, 1278, 1279, 1280, 1281, 1282, 1283, 993, + 1284, 943, 1285, 1286, 1287, 1288, 1289, 1290, 1291, 1292, 1293, 1294, + 1295, 1296, 1297, 1298, 1299, 1300, 1301, 1302, 1303, 1304, 1305, 1306, + 1307, 1308, 1309, 1310, 1311, 1312, 1313, 1314, 1315, 992, 1316, 942, + 1317, 1318, 1319, 1320, 1321, 1322, 1323, 1324, 1325, 1326, 1327, 1328, + 1329, 1330, 1331, 1332, 1333, 1334, 1335, 1336, 1337, 1338, 1339, 1340, + 1341, 1342, 1343, 1344, 1345, 1346, 1347, 991, 1348, 941, 1349, 1350, + 1351, 1352, 1353, 1354, 1355, 1356, 1357, 1358, 1359, 1360, 1361, 1362, + 1363, 1364, 1365, 1366, 1367, 1368, 1369, 1370, 1371, 1372, 1373, 1374, + 1375, 1376, 1377, 1378, 1379, 990, 1380, 940, 1381, 1382, 1383, 1384, + 1385, 1386, 1387, 1388, 1389, 1390, 1391, 1392, 1393, 1394, 1395, 1396, + 1397, 1398, 1399, 1400, 1401, 1402, 1403, 1404, 1405, 1406, 1407, 1408, + 1409, 1410, 1411, 989, 1412, 939, 1413, 1414, 1415, 1416, 1417, 1418, + 1419, 1420, 1421, 1422, 1423, 1424, 1425, 1426, 1427, 1428, 1429, 1430, + 1431, 1432, 1433, 1434, 1435, 1436, 1437, 1438, 1439, 1440, 1441, 1442, + 1443, 988, 1444, 938, 1445, 1446, 1447, 1448, 1449, 1450, 1451, 1452, + 1453, 1454, 1455, 1456, 1457, 1458, 1459, 1460, 1461, 1462, 1463, 1464, + 1465, 1466, 1467, 1468, 1469, 1470, 1471, 1472, 1473, 1474, 1475, 987, + 1476, 937, 1477, 1478, 1479, 1480, 1481, 1482, 1483, 1484, 1485, 1486, + 1487, 1488, 1489, 1490, 1491, 1492, 1493, 1494, 1495, 1496, 1497, 1498, + 1499, 1500, 1501, 1502, 1503, 1504, 1505, 1506, 1507, 986, 1508, 936, + 1509, 1510, 1511, 1512, 1513, 1514, 1515, 1516, 1517, 1518, 1519, 1520, + 1521, 1522, 1523, 1524, 1525, 1526, 1527, 1528, 1529, 1530, 1531, 1532, + 1533, 1534, 1535, 1536, 1537, 1538, 1539, 985, 1540, 935, 1541, 1542, + 1543, 1544, 1545, 1546, 1547, 1548, 1549, 1550, 1551, 1552, 1553, 1554, + 1555, 1556, 1557, 1558, 1559, 1560, 1561, 1562, 1563, 1564, 1565, 1566, + 1567, 1568, 1569, 1570, 1571, 984, 1572, 934, 1573, 1574, 1575, 1576, + 1577, 1578, 1579, 1580, 1581, 1582, 1583, 1584, 1585, 1586, 1587, 1588, + 1589, 1590, 1591, 1592, 1593, 1594, 1595, 1596, 1597, 1598, 1599, 1600, + 1601, 1602, 1603, 983, 1604, 933, 1605, 1606, 1607, 1608, 1609, 1610, + 1611, 1612, 1613, 1614, 1615, 1616, 1617, 1618, 1619, 1620, 1621, 1622, + 1623, 1624, 1625, 1626, 1627, 1628, 1629, 1630, 1631, 1632, 1633, 1634, + 1635, 982, 1636, 932, 1637, 1638, 1639, 1640, 1641, 1642, 1643, 1644, + 1645, 1646, 1647, 1648, 1649, 1650, 1651, 1652, 1653, 1654, 1655, 1656, + 1657, 1658, 1659, 1660, 1661, 1662, 1663, 1664, 1665, 1666, 1667, 981, + 1668, 931, 1669, 1670, 1671, 1672, 1673, 1674, 1675, 1676, 1677, 1678, + 1679, 1680, 1681, 1682, 1683, 1684, 1685, 1686, 1687, 1688, 1689, 1690, + 1691, 1692, 1693, 1694, 1695, 1696, 1697, 1698, 1699, 980, 1700, 930, + 1701, 1702, 1703, 1704, 1705, 1706, 1707, 1708, 1709, 1710, 1711, 1712, + 1713, 1714, 1715, 1716, 1717, 1718, 1719, 1720, 1721, 1722, 1723, 1724, + 1725, 1726, 1727, 1728, 1729, 1730, 1731, 979, 947, 926, 948, 949, 950, + 951, 952, 953, 954, 955, 956, 957, 958, 959, 960, 961, 962, 963, 964, + 965, 966, 967, 968, 969, 970, 971, 972, 973, 974, 975, 976, 977, 978, + 927, 1732, 1733, 1734, 1735, 1736, 1737, 1738, 1739, 1740, 1741, 1742, + 1743, 1744, 1745, 1746, 1747, 1156, 1748, 1749, 1750, 1751, 1752, 1753, + 1754, 1755, 1756, 1757, 1758, 1759, 1760, 1761, 1762, 1763, 1155, 1764, + 1765, 1766, 1767, 1768, 1769, 1770, 1771, 1772, 1773, 1774, 1775, 1776, + 1777, 1778, 1779, 1154, 1780, 1781, 1782, 1783, 1784, 1785, 1786, 1787, + 1788, 1789, 1790, 1791, 1792, 1793, 1794, 1795, 1153, 1796, 1797, 1798, + 1799, 1800, 1801, 1802, 1803, 1804, 1805, 1806, 1807, 1808, 1809, 1810, + 1811, 1152, 1812, 1813, 1814, 1815, 1816, 1817, 1818, 1819, 1820, 1821, + 1822, 1823, 1824, 1825, 1826, 1827, 1151, 1828, 1829, 1830, 1831, 1832, + 1833, 1834, 1835, 1836, 1837, 1838, 1839, 1840, 1841, 1842, 1843, 1150, + 1844, 1845, 1846, 1847, 1848, 1849, 1850, 1851, 1852, 1853, 1854, 1855, + 1856, 1857, 1858, 1859, 1149, 1860, 1861, 1862, 1863, 1864, 1865, 1866, + 1867, 1868, 1869, 1870, 1871, 1872, 1873, 1874, 1875, 1148, 1876, 1877, + 1878, 1879, 1880, 1881, 1882, 1883, 1884, 1885, 1886, 1887, 1888, 1889, + 1890, 1891, 1147, 1892, 1893, 1894, 1895, 1896, 1897, 1898, 1899, 1900, + 1901, 1902, 1903, 1904, 1905, 1906, 1907, 1146, 1908, 1909, 1910, 1911, + 1912, 1913, 1914, 1915, 1916, 1917, 1918, 1919, 1920, 1921, 1922, 1923, + 1145, 1924, 1925, 1926, 1927, 1928, 1929, 1930, 1931, 1932, 1933, 1934, + 1935, 1936, 1937, 1938, 1939, 1144, 1940, 1941, 1942, 1943, 1944, 1945, + 1946, 1947, 1948, 1949, 1950, 1951, 1952, 1953, 1954, 1955, 1143, 1956, + 1957, 1958, 1959, 1960, 1961, 1962, 1963, 1964, 1965, 1966, 1967, 1968, + 1969, 1970, 1971, 1142, 1141, 1140, 1139, 1138, 1137, 1136, 1135, 1134, + 1133, 1132, 1131, 1130, 1129, 1128, 1127, 1126, 925, 299, 1972, 300, + 1973, 301, 1974, 302, 1975, 303, 1976, 304, 1977, 305, 1978, 306, 1979, + 307, 1980, 308, 1981, 309, 1982, 310, 1983, 311, 1984, 312, 1985, 313, + 1986, 314, 1987, 315, 1988, 316, 1989, 317, 1990, 318, 1991, 319, 1992, + 320, 1993, 321, 1994, 322, 1995, 323, 1996, 324, 1997, 325, 1998, 326, + 1999, 327, 2000, 328, 2001, 329, 2002, 330, 2003, 331, 1044, 2004, 2005, + 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, + 2018, 2019, 2020, 2021, 2022, 2023, 2024, 2025, 2026, 2027, 2028, 2029, + 2030, 2031, 2032, 2033, 2034, 2035, 1043, 2036, 2037, 2038, 2039, 2040, + 2041, 2042, 2043, 2044, 2045, 2046, 2047, 2048, 2049, 2050, 2051, 2052, + 2053, 2054, 2055, 2056, 2057, 2058, 2059, 2060, 2061, 2062, 2063, 2064, + 2065, 2066, 2067, 1042, 2068, 2069, 2070, 2071, 2072, 2073, 2074, 2075, + 2076, 2077, 2078, 2079, 2080, 2081, 2082, 2083, 2084, 2085, 2086, 2087, + 2088, 2089, 2090, 2091, 2092, 2093, 2094, 2095, 2096, 2097, 2098, 2099, + 1041, 2100, 2101, 2102, 2103, 2104, 2105, 2106, 2107, 2108, 2109, 2110, + 2111, 2112, 2113, 2114, 2115, 2116, 2117, 2118, 2119, 2120, 2121, 2122, + 2123, 2124, 2125, 2126, 2127, 2128, 2129, 2130, 2131, 1040, 2132, 2133, + 2134, 2135, 2136, 2137, 2138, 2139, 2140, 2141, 2142, 2143, 2144, 2145, + 2146, 2147, 2148, 2149, 2150, 2151, 2152, 2153, 2154, 2155, 2156, 2157, + 2158, 2159, 2160, 2161, 2162, 2163, 1039, 2164, 2165, 2166, 2167, 2168, + 2169, 2170, 2171, 2172, 2173, 2174, 2175, 2176, 2177, 2178, 2179, 2180, + 2181, 2182, 2183, 2184, 2185, 2186, 2187, 2188, 2189, 2190, 2191, 2192, + 2193, 2194, 2195, 1038, 2196, 2197, 2198, 2199, 2200, 2201, 2202, 2203, + 2204, 2205, 2206, 2207, 2208, 2209, 2210, 2211, 2212, 2213, 2214, 2215, + 2216, 2217, 2218, 2219, 2220, 2221, 2222, 2223, 2224, 2225, 2226, 2227, + 1037, 2228, 2229, 2230, 2231, 2232, 2233, 2234, 2235, 2236, 2237, 2238, + 2239, 2240, 2241, 2242, 2243, 2244, 2245, 2246, 2247, 2248, 2249, 2250, + 2251, 2252, 2253, 2254, 2255, 2256, 2257, 2258, 2259, 1036, 2260, 2261, + 2262, 2263, 2264, 2265, 2266, 2267, 2268, 2269, 2270, 2271, 2272, 2273, + 2274, 2275, 2276, 2277, 2278, 2279, 2280, 2281, 2282, 2283, 2284, 2285, + 2286, 2287, 2288, 2289, 2290, 2291, 1035, 2292, 2293, 2294, 2295, 2296, + 2297, 2298, 2299, 2300, 2301, 2302, 2303, 2304, 2305, 2306, 2307, 2308, + 2309, 2310, 2311, 2312, 2313, 2314, 2315, 2316, 2317, 2318, 2319, 2320, + 2321, 2322, 2323, 1034, 2324, 2325, 2326, 2327, 2328, 2329, 2330, 2331, + 2332, 2333, 2334, 2335, 2336, 2337, 2338, 2339, 2340, 2341, 2342, 2343, + 2344, 2345, 2346, 2347, 2348, 2349, 2350, 2351, 2352, 2353, 2354, 2355, + 1033, 2356, 2357, 2358, 2359, 2360, 2361, 2362, 2363, 2364, 2365, 2366, + 2367, 2368, 2369, 2370, 2371, 2372, 2373, 2374, 2375, 2376, 2377, 2378, + 2379, 2380, 2381, 2382, 2383, 2384, 2385, 2386, 2387, 1032, 2388, 2389, + 2390, 2391, 2392, 2393, 2394, 2395, 2396, 2397, 2398, 2399, 2400, 2401, + 2402, 2403, 2404, 2405, 2406, 2407, 2408, 2409, 2410, 2411, 2412, 2413, + 2414, 2415, 2416, 2417, 2418, 2419, 1031, 2420, 2421, 2422, 2423, 2424, + 2425, 2426, 2427, 2428, 2429, 2430, 2431, 2432, 2433, 2434, 2435, 2436, + 2437, 2438, 2439, 2440, 2441, 2442, 2443, 2444, 2445, 2446, 2447, 2448, + 2449, 2450, 2451, 1030, 2452, 2453, 2454, 2455, 2456, 2457, 2458, 2459, + 2460, 2461, 2462, 2463, 2464, 2465, 2466, 2467, 2468, 2469, 2470, 2471, + 2472, 2473, 2474, 2475, 2476, 2477, 2478, 2479, 2480, 2481, 2482, 2483, + 1029, 2484, 2485, 2486, 2487, 2488, 2489, 2490, 2491, 2492, 2493, 2494, + 2495, 2496, 2497, 2498, 2499, 2500, 2501, 2502, 2503, 2504, 2505, 2506, + 2507, 2508, 2509, 2510, 2511, 2512, 2513, 2514, 2515, 1028, 996, 997, + 998, 999, 1000, 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009, + 1010, 1011, 1012, 1013, 1014, 1015, 1016, 1017, 1018, 1019, 1020, 1021, + 1022, 1023, 1024, 1025, 1026, 1027, 928, 2516, 2517, 2518, 2519, 2520, + 2521, 2522, 2523, 2524, 2525, 2526, 2527, 2528, 2529, 2530, 1172, 2531, + 2532, 2533, 2534, 2535, 2536, 2537, 2538, 2539, 2540, 2541, 2542, 2543, + 2544, 2545, 1171, 2546, 2547, 2548, 2549, 2550, 2551, 2552, 2553, 2554, + 2555, 2556, 2557, 2558, 2559, 2560, 1170, 2561, 2562, 2563, 2564, 2565, + 2566, 2567, 2568, 2569, 2570, 2571, 2572, 2573, 2574, 2575, 1169, 2576, + 2577, 2578, 2579, 2580, 2581, 2582, 2583, 2584, 2585, 2586, 2587, 2588, + 2589, 2590, 1168, 2591, 2592, 2593, 2594, 2595, 2596, 2597, 2598, 2599, + 2600, 2601, 2602, 2603, 2604, 2605, 1167, 2606, 2607, 2608, 2609, 2610, + 2611, 2612, 2613, 2614, 2615, 2616, 2617, 2618, 2619, 2620, 1166, 2621, + 2622, 2623, 2624, 2625, 2626, 2627, 2628, 2629, 2630, 2631, 2632, 2633, + 2634, 2635, 1165, 2636, 2637, 2638, 2639, 2640, 2641, 2642, 2643, 2644, + 2645, 2646, 2647, 2648, 2649, 2650, 1164, 2651, 2652, 2653, 2654, 2655, + 2656, 2657, 2658, 2659, 2660, 2661, 2662, 2663, 2664, 2665, 1163, 2666, + 2667, 2668, 2669, 2670, 2671, 2672, 2673, 2674, 2675, 2676, 2677, 2678, + 2679, 2680, 1162, 2681, 2682, 2683, 2684, 2685, 2686, 2687, 2688, 2689, + 2690, 2691, 2692, 2693, 2694, 2695, 1161, 2696, 2697, 2698, 2699, 2700, + 2701, 2702, 2703, 2704, 2705, 2706, 2707, 2708, 2709, 2710, 1160, 2711, + 2712, 2713, 2714, 2715, 2716, 2717, 2718, 2719, 2720, 2721, 2722, 2723, + 2724, 2725, 1159, 2726, 2727, 2728, 2729, 2730, 2731, 2732, 2733, 2734, + 2735, 2736, 2737, 2738, 2739, 2740, 1158, 2741, 2742, 2743, 2744, 2745, + 2746, 2747, 2748, 2749, 2750, 2751, 2752, 2753, 2754, 2755, 1157, 332, + 2756, 333, 2757, 334, 2758, 335, 2759, 336, 2760, 337, 2761, 338, 2762, + 339, 2763, 340, 2764, 341, 2765, 342, 2766, 343, 2767, 344, 2768, 345, + 2769, 346, 2770, 347, 2771, 348, 2772, 349, 2773, 350, 2774, 351, 2775, + 352, 2776, 353, 2777, 354, 2778, 355, 2779, 356, 2780, 357, 2781, 358, + 2782, 359, 2783, 360, 2784, 361, 2785, 362, 2786, 363, 2787, 364, 1093, + 2788, 2789, 2790, 2791, 2792, 2793, 2794, 2795, 2796, 2797, 2798, 2799, + 2800, 2801, 2802, 2803, 2804, 2805, 2806, 2807, 2808, 2809, 2810, 2811, + 2812, 2813, 2814, 2815, 2816, 2817, 2818, 2819, 1092, 2820, 2821, 2822, + 2823, 2824, 2825, 2826, 2827, 2828, 2829, 2830, 2831, 2832, 2833, 2834, + 2835, 2836, 2837, 2838, 2839, 2840, 2841, 2842, 2843, 2844, 2845, 2846, + 2847, 2848, 2849, 2850, 2851, 1091, 2852, 2853, 2854, 2855, 2856, 2857, + 2858, 2859, 2860, 2861, 2862, 2863, 2864, 2865, 2866, 2867, 2868, 2869, + 2870, 2871, 2872, 2873, 2874, 2875, 2876, 2877, 2878, 2879, 2880, 2881, + 2882, 2883, 1090, 2884, 2885, 2886, 2887, 2888, 2889, 2890, 2891, 2892, + 2893, 2894, 2895, 2896, 2897, 2898, 2899, 2900, 2901, 2902, 2903, 2904, + 2905, 2906, 2907, 2908, 2909, 2910, 2911, 2912, 2913, 2914, 2915, 1089, + 2916, 2917, 2918, 2919, 2920, 2921, 2922, 2923, 2924, 2925, 2926, 2927, + 2928, 2929, 2930, 2931, 2932, 2933, 2934, 2935, 2936, 2937, 2938, 2939, + 2940, 2941, 2942, 2943, 2944, 2945, 2946, 2947, 1088, 2948, 2949, 2950, + 2951, 2952, 2953, 2954, 2955, 2956, 2957, 2958, 2959, 2960, 2961, 2962, + 2963, 2964, 2965, 2966, 2967, 2968, 2969, 2970, 2971, 2972, 2973, 2974, + 2975, 2976, 2977, 2978, 2979, 1087, 2980, 2981, 2982, 2983, 2984, 2985, + 2986, 2987, 2988, 2989, 2990, 2991, 2992, 2993, 2994, 2995, 2996, 2997, + 2998, 2999, 3000, 3001, 3002, 3003, 3004, 3005, 3006, 3007, 3008, 3009, + 3010, 3011, 1086, 3012, 3013, 3014, 3015, 3016, 3017, 3018, 3019, 3020, + 3021, 3022, 3023, 3024, 3025, 3026, 3027, 3028, 3029, 3030, 3031, 3032, + 3033, 3034, 3035, 3036, 3037, 3038, 3039, 3040, 3041, 3042, 3043, 1085, + 3044, 3045, 3046, 3047, 3048, 3049, 3050, 3051, 3052, 3053, 3054, 3055, + 3056, 3057, 3058, 3059, 3060, 3061, 3062, 3063, 3064, 3065, 3066, 3067, + 3068, 3069, 3070, 3071, 3072, 3073, 3074, 3075, 1084, 3076, 3077, 3078, + 3079, 3080, 3081, 3082, 3083, 3084, 3085, 3086, 3087, 3088, 3089, 3090, + 3091, 3092, 3093, 3094, 3095, 3096, 3097, 3098, 3099, 3100, 3101, 3102, + 3103, 3104, 3105, 3106, 3107, 1083, 3108, 3109, 3110, 3111, 3112, 3113, + 3114, 3115, 3116, 3117, 3118, 3119, 3120, 3121, 3122, 3123, 3124, 3125, + 3126, 3127, 3128, 3129, 3130, 3131, 3132, 3133, 3134, 3135, 3136, 3137, + 3138, 3139, 1082, 3140, 3141, 3142, 3143, 3144, 3145, 3146, 3147, 3148, + 3149, 3150, 3151, 3152, 3153, 3154, 3155, 3156, 3157, 3158, 3159, 3160, + 3161, 3162, 3163, 3164, 3165, 3166, 3167, 3168, 3169, 3170, 3171, 1081, + 3172, 3173, 3174, 3175, 3176, 3177, 3178, 3179, 3180, 3181, 3182, 3183, + 3184, 3185, 3186, 3187, 3188, 3189, 3190, 3191, 3192, 3193, 3194, 3195, + 3196, 3197, 3198, 3199, 3200, 3201, 3202, 3203, 1080, 3204, 3205, 3206, + 3207, 3208, 3209, 3210, 3211, 3212, 3213, 3214, 3215, 3216, 3217, 3218, + 3219, 3220, 3221, 3222, 3223, 3224, 3225, 3226, 3227, 3228, 3229, 3230, + 3231, 3232, 3233, 3234, 3235, 1079, 3236, 3237, 3238, 3239, 3240, 3241, + 3242, 3243, 3244, 3245, 3246, 3247, 3248, 3249, 3250, 3251, 3252, 3253, + 3254, 3255, 3256, 3257, 3258, 3259, 3260, 3261, 3262, 3263, 3264, 3265, + 3266, 3267, 1078, 3268, 3269, 3270, 3271, 3272, 3273, 3274, 3275, 3276, + 3277, 3278, 3279, 3280, 3281, 3282, 3283, 3284, 3285, 3286, 3287, 3288, + 3289, 3290, 3291, 3292, 3293, 3294, 3295, 3296, 3297, 3298, 3299, 1077, + 1045, 1046, 1047, 1048, 1049, 1050, 1051, 1052, 1053, 1054, 1055, 1056, + 1057, 1058, 1059, 1060, 1061, 1062, 1063, 1064, 1065, 1066, 1067, 1068, + 1069, 1070, 1071, 1072, 1073, 1074, 1075, 1076, 929, 3300, 3301, 3302, + 3303, 3304, 3305, 3306, 3307, 3308, 3309, 3310, 3311, 3312, 3313, 3314, + 3315, 1187, 3316, 3317, 3318, 3319, 3320, 3321, 3322, 3323, 3324, 3325, + 3326, 3327, 3328, 3329, 3330, 3331, 1186, 3332, 3333, 3334, 3335, 3336, + 3337, 3338, 3339, 3340, 3341, 3342, 3343, 3344, 3345, 3346, 3347, 1185, + 3348, 3349, 3350, 3351, 3352, 3353, 3354, 3355, 3356, 3357, 3358, 3359, + 3360, 3361, 3362, 3363, 1184, 3364, 3365, 3366, 3367, 3368, 3369, 3370, + 3371, 3372, 3373, 3374, 3375, 3376, 3377, 3378, 3379, 1183, 3380, 3381, + 3382, 3383, 3384, 3385, 3386, 3387, 3388, 3389, 3390, 3391, 3392, 3393, + 3394, 3395, 1182, 3396, 3397, 3398, 3399, 3400, 3401, 3402, 3403, 3404, + 3405, 3406, 3407, 3408, 3409, 3410, 3411, 1181, 3412, 3413, 3414, 3415, + 3416, 3417, 3418, 3419, 3420, 3421, 3422, 3423, 3424, 3425, 3426, 3427, + 1180, 3428, 3429, 3430, 3431, 3432, 3433, 3434, 3435, 3436, 3437, 3438, + 3439, 3440, 3441, 3442, 3443, 1179, 3444, 3445, 3446, 3447, 3448, 3449, + 3450, 3451, 3452, 3453, 3454, 3455, 3456, 3457, 3458, 3459, 1178, 3460, + 3461, 3462, 3463, 3464, 3465, 3466, 3467, 3468, 3469, 3470, 3471, 3472, + 3473, 3474, 3475, 1177, 3476, 3477, 3478, 3479, 3480, 3481, 3482, 3483, + 3484, 3485, 3486, 3487, 3488, 3489, 3490, 3491, 1176, 3492, 3493, 3494, + 3495, 3496, 3497, 3498, 3499, 3500, 3501, 3502, 3503, 3504, 3505, 3506, + 3507, 1175, 3508, 3509, 3510, 3511, 3512, 3513, 3514, 3515, 3516, 3517, + 3518, 3519, 3520, 3521, 3522, 3523, 1174, 3524, 3525, 3526, 3527, 3528, + 3529, 3530, 3531, 3532, 3533, 3534, 3535, 3536, 3537, 3538, 3539, 1173, + 365, 3540, 366, 3541, 367, 3542, 368, 3543, 369, 3544, 370, 3545, 371, + 3546, 372, 3547, 373, 3548, 374, 3549, 375, 3550, 376, 3551, 377, 3552, + 378, 3553, 379, 3554, 380, 3555, 381, 3556, 382, 3557, 383, 3558, 384, + 3559, 385, 3560, 386, 3561, 387, 3562, 388, 3563, 389, 3564, 390, 3565, + 391, 3566, 392, 3567, 393, 3568, 394, 3569, 395, 3570, 396, 3571, 3572, + 3573, 3574, 3575, 3576, 3577, 3578, 3579, 3580, 3581, 3582, 3583, 3584, + 3585, 3586, 3587, 3588, 3589, 3590, 3591, 3592, 3593, 3594, 3595, 3596, + 3597, 3598, 3599, 3600, 3601, 3602, 3603, 3604, 3605, 3606, 3607, 3608, + 3609, 3610, 3611, 3612, 3613, 3614, 3615, 3616, 3617, 3618, 3619, 3620, + 3621, 3622, 3623, 3624, 3625, 3626, 3627, 3628, 3629, 3630, 3631, 3632, + 3633, 3634, 3635, 3636, 3637, 3638, 3639, 3640, 3641, 3642, 3643, 3644, + 3645, 3646, 3647, 3648, 3649, 3650, 3651, 3652, 3653, 3654, 3655, 3656, + 3657, 3658, 3659, 3660, 3661, 3662, 3663, 3664, 3665, 3666, 3667, 3668, + 3669, 3670, 3671, 3672, 3673, 3674, 3675, 3676, 3677, 3678, 3679, 3680, + 3681, 3682, 3683, 3684, 3685, 3686, 3687, 3688, 3689, 3690, 3691, 3692, + 3693, 3694, 3695, 3696, 3697, 3698, 3699, 3700, 3701, 3702, 3703, 3704, + 3705, 3706, 3707, 3708, 3709, 3710, 3711, 3712, 3713, 3714, 3715, 3716, + 3717, 3718, 3719, 3720, 3721, 3722, 3723, 3724, 3725, 3726, 3727, 3728, + 3729, 3730, 3731, 3732, 3733, 3734, 3735, 3736, 3737, 3738, 3739, 3740, + 3741, 3742, 3743, 3744, 3745, 3746, 3747, 3748, 3749, 3750, 3751, 3752, + 3753, 3754, 3755, 3756, 3757, 3758, 3759, 3760, 3761, 3762, 3763, 3764, + 3765, 3766, 3767, 3768, 3769, 3770, 3771, 3772, 3773, 3774, 3775, 3776, + 3777, 3778, 3779, 3780, 3781, 3782, 3783, 3784, 3785, 3786, 3787, 3788, + 3789, 3790, 3791, 3792, 3793, 3794, 3795, 3796, 3797, 3798, 3799, 3800, + 3801, 3802, 3803, 3804, 3805, 3806, 3807, 3808, 3809, 3810, 3811, 3812, + 3813, 3814, 3815, 3816, 3817, 3818, 3819, 3820, 3821, 3822, 3823, 3824, + 3825, 3826, 3827, 3828, 3829, 3830, 3831, 3832, 3833, 3834, 3835, 3836, + 3837, 3838, 3839, 3840, 3841, 3842, 3843, 3844, 3845, 3846, 3847, 3848, + 3849, 3850, 3851, 3852, 3853, 3854, 3855, 3856, 3857, 3858, 3859, 3860, + 3861, 3862, 3863, 3864, 3865, 3866, 3867, 3868, 3869, 3870, 3871, 3872, + 3873, 3874, 3875, 3876, 3877, 3878, 3879, 3880, 3881, 3882, 3883, 3884, + 3885, 3886, 3887, 3888, 3889, 3890, 3891, 3892, 3893, 3894, 3895, 3896, + 3897, 3898, 3899, 3900, 3901, 3902, 3903, 3904, 3905, 3906, 3907, 3908, + 3909, 3910, 3911, 3912, 3913, 3914, 3915, 3916, 3917, 3918, 3919, 3920, + 3921, 3922, 3923, 3924, 3925, 3926, 3927, 3928, 3929, 3930, 3931, 3932, + 3933, 3934, 3935, 3936, 3937, 3938, 3939, 3940, 3941, 3942, 3943, 3944, + 3945, 3946, 3947, 3948, 3949, 3950, 3951, 3952, 3953, 3954, 3955, 3956, + 3957, 3958, 3959, 3960, 3961, 3962, 3963, 3964, 3965, 3966, 3967, 3968, + 3969, 3970, 3971, 3972, 3973, 3974, 3975, 3976, 3977, 3978, 3979, 3980, + 3981, 3982, 3983, 3984, 3985, 3986, 3987, 3988, 3989, 3990, 3991, 3992, + 3993, 3994, 3995, 3996, 3997, 3998, 3999, 4000, 4001, 4002, 4003, 4004, + 4005, 4006, 4007, 4008, 4009, 4010, 4011, 4012, 4013, 4014, 4015, 4016, + 4017, 4018, 4019, 4020, 4021, 4022, 4023, 4024, 4025, 4026, 4027, 4028, + 4029, 4030, 4031, 4032, 4033, 4034, 4035, 4036, 4037, 4038, 4039, 4040, + 4041, 4042, 4043, 4044, 4045, 4046, 4047, 4048, 4049, 4050, 4051, 4052, + 4053, 4054, 4055, 4056, 4057, 4058, 4059, 4060, 4061, 4062, 4063, 4064, + 4065, 4066, 4067, 4068, 4069, 4070, 4071, 4072, 4073, 4074, 4075, 4076, + 4077, 4078, 4079, 4080, 4081, 4082, 4083, 1094, 1095, 1096, 1097, 1098, + 1099, 1100, 1101, 1102, 1103, 1104, 1105, 1106, 1107, 1108, 1109, 1110, + 1111, 1112, 1113, 1114, 1115, 1116, 1117, 1118, 1119, 1120, 1121, 1122, + 1123, 1124, 1125, 4084, 4085, 4086, 4087, 4088, 4089, 4090, 4091, 4092, + 4093, 4094, 4095, 4096, 4097, 4098, 4099, 4100, 4101, 4102, 4103, 4104, + 4105, 4106, 4107, 4108, 4109, 4110, 4111, 4112, 4113, 4114, 4115, 4116, + 4117, 4118, 4119, 4120, 4121, 4122, 4123, 4124, 4125, 4126, 4127, 4128, + 4129, 4130, 4131, 4132, 4133, 4134, 4135, 4136, 4137, 4138, 4139, 4140, + 4141, 4142, 4143, 4144, 4145, 4146, 4147, 4148, 4149, 4150, 4151, 4152, + 4153, 4154, 4155, 4156, 4157, 4158, 4159, 4160, 4161, 4162, 4163, 4164, + 4165, 4166, 4167, 4168, 4169, 4170, 4171, 4172, 4173, 4174, 4175, 4176, + 4177, 4178, 4179, 4180, 4181, 4182, 4183, 4184, 4185, 4186, 4187, 4188, + 4189, 4190, 4191, 4192, 4193, 4194, 4195, 4196, 4197, 4198, 4199, 4200, + 4201, 4202, 4203, 4204, 4205, 4206, 4207, 4208, 4209, 4210, 4211, 4212, + 4213, 4214, 4215, 4216, 4217, 4218, 4219, 4220, 4221, 4222, 4223, 4224, + 4225, 4226, 4227, 4228, 4229, 4230, 4231, 4232, 4233, 4234, 4235, 4236, + 4237, 4238, 4239, 4240, 4241, 4242, 4243, 4244, 4245, 4246, 4247, 4248, + 4249, 4250, 4251, 4252, 4253, 4254, 4255, 4256, 4257, 4258, 4259, 4260, + 4261, 4262, 4263, 4264, 4265, 4266, 4267, 4268, 4269, 4270, 4271, 4272, + 4273, 4274, 4275, 4276, 4277, 4278, 4279, 4280, 4281, 4282, 4283, 4284, + 4285, 4286, 4287, 4288, 4289, 4290, 4291, 4292, 4293, 4294, 4295, 4296, + 4297, 4298, 4299, 4300, 4301, 4302, 4303, 4304, 4305, 4306, 4307, 4308, + 4309, 4310, 4311, 4312, 4313, 4314, 4315, 4316, 4317, 4318, 4319, 4320, + 4321, 4322, 4323, 401, 397, 402, 398, 403, 399, 404, 400, 2, 1, 405, 406, + 407, 408, 3, 409, 410, 411, 412, 4, 413, 414, 415, 416, 5, 417, 418, 419, + 420, 6, 421, 422, 423, 424, 7, 425, 426, 427, 428, 8, 429, 430, 431, 432, + 9, 433, 434, 435, 436, 10, 437, 438, 439, 440, 11, 441, 442, 443, 444, + 12, 445, 446, 447, 448, 13, 449, 450, 451, 452, 14, 453, 454, 455, 456, + 15, 457, 458, 459, 460, 16, 461, 462, 463, 464, 17, 465, 466, 467, 468, + 18, 469, 470, 471, 472, 19, 473, 474, 475, 476, 20, 477, 478, 479, 480, + 21, 481, 482, 483, 484, 22, 485, 486, 487, 488, 23, 489, 490, 491, 492, + 24, 493, 494, 495, 496, 25, 497, 498, 499, 500, 26, 501, 502, 503, 504, + 27, 505, 506, 507, 508, 28, 509, 510, 511, 512, 29, 513, 514, 515, 516, + 30, 517, 518, 519, 520, 31, 521, 522, 523, 524, 32, 525, 526, 527, 528, + 33, 529, 530, 531, 532, 34, 533, 534, 535, 536, 35, 537, 538, 539, 540, + 36, 541, 542, 543, 544, 37, 545, 546, 547, 548, 38, 549, 550, 551, 552, + 39, 553, 554, 555, 556, 40, 557, 558, 559, 560, 41, 561, 562, 563, 564, + 42, 565, 566, 567, 568, 43, 569, 570, 571, 572, 44, 573, 574, 575, 576, + 45, 577, 578, 579, 580, 46, 581, 582, 583, 584, 47, 585, 586, 587, 588, + 48, 589, 590, 591, 592, 49, 593, 594, 595, 596, 50, 597, 598, 599, 600, + 51, 601, 602, 603, 604, 52, 605, 606, 607, 608, 53, 609, 610, 611, 612, + 54, 613, 614, 615, 616, 55, 617, 618, 619, 620, 56, 621, 622, 623, 624, + 57, 625, 626, 627, 628, 58, 629, 630, 631, 632, 59, 633, 634, 635, 636, + 60, 637, 638, 639, 640, 61, 641, 642, 643, 644, 62, 645, 646, 647, 648, + 63, 649, 650, 651, 652, 64, 653, 654, 655, 656, 65, 657, 658, 659, 660, + 66, 661, 662, 663, 664, 67, 665, 666, 667, 668, 68, 669, 670, 671, 672, + 69, 673, 674, 675, 676, 70, 677, 678, 679, 680, 71, 681, 682, 683, 684, + 72, 685, 686, 687, 688, 73, 689, 690, 691, 692, 74, 693, 694, 695, 696, + 75, 697, 698, 699, 700, 76, 701, 702, 703, 704, 77, 705, 706, 707, 708, + 78, 709, 710, 711, 712, 79, 713, 714, 715, 716, 80, 717, 718, 719, 720, + 81, 721, 722, 723, 724, 82, 725, 726, 727, 728, 83, 729, 730, 731, 732, + 84, 733, 734, 735, 736, 85, 737, 738, 739, 740, 86, 741, 742, 743, 744, + 87, 745, 746, 747, 748, 88, 749, 750, 751, 752, 89, 753, 754, 755, 756, + 90, 757, 758, 759, 760, 91, 761, 762, 763, 764, 92, 765, 766, 767, 768, + 93, 769, 770, 771, 772, 94, 773, 774, 775, 776, 95, 777, 778, 779, 780, + 96, 781, 782, 783, 784, 97, 785, 786, 787, 788, 98, 789, 790, 791, 792, + 99, 793, 794, 795, 796, 100, 797, 798, 799, 800, 101, 801, 802, 803, 804, + 102, 805, 806, 807, 808, 103, 809, 810, 811, 812, 104, 813, 814, 815, + 816, 105, 817, 818, 819, 820, 106, 821, 822, 823, 824, 107, 825, 826, + 827, 828, 108, 829, 830, 831, 832, 109, 833, 834, 835, 836, 110, 837, + 838, 839, 840, 111, 841, 842, 843, 844, 112, 845, 846, 847, 848, 113, + 849, 850, 851, 852, 114, 853, 854, 855, 856, 115, 857, 858, 859, 860, + 116, 861, 862, 863, 864, 117, 865, 866, 867, 868, 118, 869, 870, 871, + 872, 119, 873, 874, 875, 876, 120, 877, 878, 879, 880, 121, 881, 882, + 883, 884, 122, 885, 886, 887, 888, 123, 889, 890, 891, 892, 124, 893, + 894, 895, 896, 125, 897, 898, 899, 900, 126, 901, 902, 903, 904, 127, + 905, 906, 907, 908, 128, 909, 910, 911, 912, 129, 913, 914, 915, 916, + 130, 917, 918, 919, 920, 131, 921, 922, 923, 924, 132, 134, 133, 135, + 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, + 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, + 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, + 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, + 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, + 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, + 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, + 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, + 248, 249, 250, 251, 252, 253, 254, 255, 256, 257, 258, 259, 260, 261, + 262, 263, 264, 4479, 4456, 4480, 4457, 4481, 4458, 4482, 4459, 4483, + 4460, 4484, 4461, 4485, 4462, 4486, 4463, 4487, 4464, 4488, 4465, 4489, + 4466, 4490, 4467, 4491, 4468, 4492, 4469, 4493, 4470, 4494, 4471, 4495, + 4472, 4496, 4473, 4497, 4474, 4498, 4475, 4499, 4476, 4500, 4477, 4501, + 4478, 4438, 4439, 4502, 4503, 4504, 4505, 4506, 4507, 4508, 4509, 4510, + 4511, 4512, 4513, 4514, 4515, 4516, 4517, 4518, 4519, 4520, 4521, 4522, + 4523, 4524, 4437, 4525, 4526, 4527, 4528, 4529, 4530, 4531, 4532, 4533, + 4534, 4535, 4536, 4537, 4538, 4539, 4540, 4541, 4542, 4543, 4544, 4545, + 4546, 4547, 4436, 4548, 4549, 4550, 4551, 4552, 4553, 4554, 4555, 4556, + 4557, 4558, 4559, 4560, 4561, 4562, 4563, 4564, 4565, 4566, 4567, 4568, + 4569, 4570, 4435, 4571, 4572, 4573, 4574, 4575, 4576, 4577, 4578, 4579, + 4580, 4581, 4582, 4583, 4584, 4585, 4586, 4587, 4588, 4589, 4590, 4591, + 4592, 4593, 4434, 4594, 4595, 4596, 4597, 4598, 4599, 4600, 4601, 4602, + 4603, 4604, 4605, 4606, 4607, 4608, 4609, 4610, 4611, 4612, 4613, 4614, + 4615, 4616, 4433, 4617, 4618, 4619, 4620, 4621, 4622, 4623, 4624, 4625, + 4626, 4627, 4628, 4629, 4630, 4631, 4632, 4633, 4634, 4635, 4636, 4637, + 4638, 4639, 4432, 4640, 4641, 4642, 4643, 4644, 4645, 4646, 4647, 4648, + 4649, 4650, 4651, 4652, 4653, 4654, 4655, 4656, 4657, 4658, 4659, 4660, + 4661, 4662, 4431, 4663, 4664, 4665, 4666, 4667, 4668, 4669, 4670, 4671, + 4672, 4673, 4674, 4675, 4676, 4677, 4678, 4679, 4680, 4681, 4682, 4683, + 4684, 4685, 4430, 4686, 4687, 4688, 4689, 4690, 4691, 4692, 4693, 4694, + 4695, 4696, 4697, 4698, 4699, 4700, 4701, 4702, 4703, 4704, 4705, 4706, + 4707, 4708, 4429, 4709, 4710, 4711, 4712, 4713, 4714, 4715, 4716, 4717, + 4718, 4719, 4720, 4721, 4722, 4723, 4724, 4725, 4726, 4727, 4728, 4729, + 4730, 4731, 4428, 4732, 4733, 4734, 4735, 4736, 4737, 4738, 4739, 4740, + 4741, 4742, 4743, 4744, 4745, 4746, 4747, 4748, 4749, 4750, 4751, 4752, + 4753, 4754, 4427, 4755, 4756, 4757, 4758, 4759, 4760, 4761, 4762, 4763, + 4764, 4765, 4766, 4767, 4768, 4769, 4770, 4771, 4772, 4773, 4774, 4775, + 4776, 4777, 4426, 4778, 4779, 4780, 4781, 4782, 4783, 4784, 4785, 4786, + 4787, 4788, 4789, 4790, 4791, 4792, 4793, 4794, 4795, 4796, 4797, 4798, + 4799, 4800, 4425, 4801, 4802, 4803, 4804, 4805, 4806, 4807, 4808, 4809, + 4810, 4811, 4812, 4813, 4814, 4815, 4816, 4817, 4818, 4819, 4820, 4821, + 4822, 4823, 4424, 4824, 4825, 4826, 4827, 4828, 4829, 4830, 4831, 4832, + 4833, 4834, 4835, 4836, 4837, 4838, 4839, 4840, 4841, 4842, 4843, 4844, + 4845, 4846, 4391, 4847, 4848, 4849, 4850, 4851, 4852, 4853, 4854, 4855, + 4856, 4857, 4858, 4859, 4860, 4861, 4862, 4863, 4864, 4865, 4866, 4867, + 4868, 4869, 4423, 4870, 4871, 4872, 4873, 4874, 4875, 4876, 4877, 4878, + 4879, 4880, 4881, 4882, 4883, 4884, 4885, 4886, 4887, 4888, 4889, 4890, + 4891, 4892, 4422, 4893, 4894, 4895, 4896, 4897, 4898, 4899, 4900, 4901, + 4902, 4903, 4904, 4905, 4906, 4907, 4908, 4909, 4910, 4911, 4912, 4913, + 4914, 4915, 4421, 4916, 4917, 4918, 4919, 4920, 4921, 4922, 4923, 4924, + 4925, 4926, 4927, 4928, 4929, 4930, 4931, 4932, 4933, 4934, 4935, 4936, + 4937, 4938, 4420, 4939, 4940, 4941, 4942, 4943, 4944, 4945, 4946, 4947, + 4948, 4949, 4950, 4951, 4952, 4953, 4954, 4955, 4956, 4957, 4958, 4959, + 4960, 4961, 4419, 4962, 4963, 4964, 4965, 4966, 4967, 4968, 4969, 4970, + 4971, 4972, 4973, 4974, 4975, 4976, 4977, 4978, 4979, 4980, 4981, 4982, + 4983, 4984, 4418, 4985, 4986, 4987, 4988, 4989, 4990, 4991, 4992, 4993, + 4994, 4995, 4996, 4997, 4998, 4999, 5000, 5001, 5002, 5003, 5004, 5005, + 5006, 5007, 4417, 5008, 5009, 5010, 5011, 5012, 5013, 5014, 5015, 5016, + 5017, 5018, 5019, 5020, 5021, 5022, 5023, 5024, 5025, 5026, 5027, 5028, + 5029, 5030, 4416, 5031, 5032, 5033, 5034, 5035, 5036, 5037, 5038, 5039, + 5040, 5041, 5042, 5043, 5044, 5045, 5046, 5047, 5048, 5049, 5050, 5051, + 5052, 5053, 4415, 5054, 5055, 5056, 5057, 5058, 5059, 5060, 5061, 5062, + 5063, 5064, 5065, 5066, 5067, 5068, 5069, 5070, 5071, 5072, 5073, 5074, + 5075, 5076, 4414, 5077, 5078, 5079, 5080, 5081, 5082, 5083, 5084, 5085, + 5086, 5087, 5088, 5089, 5090, 5091, 5092, 5093, 5094, 5095, 5096, 5097, + 5098, 5099, 4413, 5100, 5101, 5102, 5103, 5104, 5105, 5106, 5107, 5108, + 5109, 5110, 5111, 5112, 5113, 5114, 5115, 5116, 5117, 5118, 5119, 5120, + 5121, 5122, 4412, 5123, 5124, 5125, 5126, 5127, 5128, 5129, 5130, 5131, + 5132, 5133, 5134, 5135, 5136, 5137, 5138, 5139, 5140, 5141, 5142, 5143, + 5144, 5145, 4411, 5146, 5147, 5148, 5149, 5150, 5151, 5152, 5153, 5154, + 5155, 5156, 5157, 5158, 5159, 5160, 5161, 5162, 5163, 5164, 5165, 5166, + 5167, 5168, 4410, 5169, 5170, 5171, 5172, 5173, 5174, 5175, 5176, 5177, + 5178, 5179, 5180, 5181, 5182, 5183, 5184, 5185, 5186, 5187, 5188, 5189, + 5190, 5191, 4409, 5192, 5193, 5194, 5195, 5196, 5197, 5198, 5199, 5200, + 5201, 5202, 5203, 5204, 5205, 5206, 5207, 5208, 5209, 5210, 5211, 5212, + 5213, 5214, 4408, 5215, 5216, 5217, 5218, 5219, 5220, 5221, 5222, 5223, + 5224, 5225, 5226, 5227, 5228, 5229, 5230, 5231, 5232, 5233, 5234, 5235, + 5236, 5237, 4407, 5238, 5239, 5240, 5241, 5242, 5243, 5244, 5245, 5246, + 5247, 5248, 5249, 5250, 5251, 5252, 5253, 5254, 5255, 5256, 5257, 5258, + 5259, 5260, 4406, 5261, 5262, 5263, 5264, 5265, 5266, 5267, 5268, 5269, + 5270, 5271, 5272, 5273, 5274, 5275, 5276, 5277, 5278, 5279, 5280, 5281, + 5282, 5283, 4405, 5284, 5285, 5286, 5287, 5288, 5289, 5290, 5291, 5292, + 5293, 5294, 5295, 5296, 5297, 5298, 5299, 5300, 5301, 5302, 5303, 5304, + 5305, 5306, 4404, 5307, 5308, 5309, 5310, 5311, 5312, 5313, 5314, 5315, + 5316, 5317, 5318, 5319, 5320, 5321, 5322, 5323, 5324, 5325, 5326, 5327, + 5328, 5329, 4403, 5330, 5331, 5332, 5333, 5334, 5335, 5336, 5337, 5338, + 5339, 5340, 5341, 5342, 5343, 5344, 5345, 5346, 5347, 5348, 5349, 5350, + 5351, 5352, 4402, 5353, 5354, 5355, 5356, 5357, 5358, 5359, 5360, 5361, + 5362, 5363, 5364, 5365, 5366, 5367, 5368, 5369, 5370, 5371, 5372, 5373, + 5374, 5375, 4401, 5376, 5377, 5378, 5379, 5380, 5381, 5382, 5383, 5384, + 5385, 5386, 5387, 5388, 5389, 5390, 5391, 5392, 5393, 5394, 5395, 5396, + 5397, 5398, 4400, 5399, 5400, 5401, 5402, 5403, 5404, 5405, 5406, 5407, + 5408, 5409, 5410, 5411, 5412, 5413, 5414, 5415, 5416, 5417, 5418, 5419, + 5420, 5421, 4399, 5422, 5423, 5424, 5425, 5426, 5427, 5428, 5429, 5430, + 5431, 5432, 5433, 5434, 5435, 5436, 5437, 5438, 5439, 5440, 5441, 5442, + 5443, 5444, 4398, 5445, 5446, 5447, 5448, 5449, 5450, 5451, 5452, 5453, + 5454, 5455, 5456, 5457, 5458, 5459, 5460, 5461, 5462, 5463, 5464, 5465, + 5466, 5467, 4397, 5468, 5469, 5470, 5471, 5472, 5473, 5474, 5475, 5476, + 5477, 5478, 5479, 5480, 5481, 5482, 5483, 5484, 5485, 5486, 5487, 5488, + 5489, 5490, 4396, 5491, 5492, 5493, 5494, 5495, 5496, 5497, 5498, 5499, + 5500, 5501, 5502, 5503, 5504, 5505, 5506, 5507, 5508, 5509, 5510, 5511, + 5512, 5513, 4395, 5514, 5515, 5516, 5517, 5518, 5519, 5520, 5521, 5522, + 5523, 5524, 5525, 5526, 5527, 5528, 5529, 5530, 5531, 5532, 5533, 5534, + 5535, 5536, 4394, 5537, 5538, 5539, 5540, 5541, 5542, 5543, 5544, 5545, + 5546, 5547, 5548, 5549, 5550, 5551, 5552, 5553, 5554, 5555, 5556, 5557, + 5558, 5559, 4393, 5560, 5561, 5562, 5563, 5564, 5565, 5566, 5567, 5568, + 5569, 5570, 5571, 5572, 5573, 5574, 5575, 5576, 5577, 5578, 5579, 5580, + 5581, 5582, 4392, 5583, 5584, 5585, 5586, 5587, 5588, 5589, 5590, 5591, + 5592, 5593, 5594, 5595, 5596, 5597, 5598, 5599, 5600, 5601, 5602, 5603, + 5604, 5605, 4358, 5606, 5607, 5608, 5609, 5610, 5611, 5612, 5613, 5614, + 5615, 5616, 5617, 5618, 5619, 5620, 5621, 5622, 5623, 5624, 5625, 5626, + 5627, 5628, 4390, 5629, 5630, 5631, 5632, 5633, 5634, 5635, 5636, 5637, + 5638, 5639, 5640, 5641, 5642, 5643, 5644, 5645, 5646, 5647, 5648, 5649, + 5650, 5651, 4389, 5652, 5653, 5654, 5655, 5656, 5657, 5658, 5659, 5660, + 5661, 5662, 5663, 5664, 5665, 5666, 5667, 5668, 5669, 5670, 5671, 5672, + 5673, 5674, 4388, 5675, 5676, 5677, 5678, 5679, 5680, 5681, 5682, 5683, + 5684, 5685, 5686, 5687, 5688, 5689, 5690, 5691, 5692, 5693, 5694, 5695, + 5696, 5697, 4387, 5698, 5699, 5700, 5701, 5702, 5703, 5704, 5705, 5706, + 5707, 5708, 5709, 5710, 5711, 5712, 5713, 5714, 5715, 5716, 5717, 5718, + 5719, 5720, 4386, 5721, 5722, 5723, 5724, 5725, 5726, 5727, 5728, 5729, + 5730, 5731, 5732, 5733, 5734, 5735, 5736, 5737, 5738, 5739, 5740, 5741, + 5742, 5743, 4385, 5744, 5745, 5746, 5747, 5748, 5749, 5750, 5751, 5752, + 5753, 5754, 5755, 5756, 5757, 5758, 5759, 5760, 5761, 5762, 5763, 5764, + 5765, 5766, 4384, 5767, 5768, 5769, 5770, 5771, 5772, 5773, 5774, 5775, + 5776, 5777, 5778, 5779, 5780, 5781, 5782, 5783, 5784, 5785, 5786, 5787, + 5788, 5789, 4383, 5790, 5791, 5792, 5793, 5794, 5795, 5796, 5797, 5798, + 5799, 5800, 5801, 5802, 5803, 5804, 5805, 5806, 5807, 5808, 5809, 5810, + 5811, 5812, 4382, 5813, 5814, 5815, 5816, 5817, 5818, 5819, 5820, 5821, + 5822, 5823, 5824, 5825, 5826, 5827, 5828, 5829, 5830, 5831, 5832, 5833, + 5834, 5835, 4381, 5836, 5837, 5838, 5839, 5840, 5841, 5842, 5843, 5844, + 5845, 5846, 5847, 5848, 5849, 5850, 5851, 5852, 5853, 5854, 5855, 5856, + 5857, 5858, 4380, 5859, 5860, 5861, 5862, 5863, 5864, 5865, 5866, 5867, + 5868, 5869, 5870, 5871, 5872, 5873, 5874, 5875, 5876, 5877, 5878, 5879, + 5880, 5881, 4379, 5882, 5883, 5884, 5885, 5886, 5887, 5888, 5889, 5890, + 5891, 5892, 5893, 5894, 5895, 5896, 5897, 5898, 5899, 5900, 5901, 5902, + 5903, 5904, 4378, 5905, 5906, 5907, 5908, 5909, 5910, 5911, 5912, 5913, + 5914, 5915, 5916, 5917, 5918, 5919, 5920, 5921, 5922, 5923, 5924, 5925, + 5926, 5927, 4377, 5928, 5929, 5930, 5931, 5932, 5933, 5934, 5935, 5936, + 5937, 5938, 5939, 5940, 5941, 5942, 5943, 5944, 5945, 5946, 5947, 5948, + 5949, 5950, 4376, 5951, 5952, 5953, 5954, 5955, 5956, 5957, 5958, 5959, + 5960, 5961, 5962, 5963, 5964, 5965, 5966, 5967, 5968, 5969, 5970, 5971, + 5972, 5973, 4375, 5974, 5975, 5976, 5977, 5978, 5979, 5980, 5981, 5982, + 5983, 5984, 5985, 5986, 5987, 5988, 5989, 5990, 5991, 5992, 5993, 5994, + 5995, 5996, 4374, 5997, 5998, 5999, 6000, 6001, 6002, 6003, 6004, 6005, + 6006, 6007, 6008, 6009, 6010, 6011, 6012, 6013, 6014, 6015, 6016, 6017, + 6018, 6019, 4373, 6020, 6021, 6022, 6023, 6024, 6025, 6026, 6027, 6028, + 6029, 6030, 6031, 6032, 6033, 6034, 6035, 6036, 6037, 6038, 6039, 6040, + 6041, 6042, 4372, 6043, 6044, 6045, 6046, 6047, 6048, 6049, 6050, 6051, + 6052, 6053, 6054, 6055, 6056, 6057, 6058, 6059, 6060, 6061, 6062, 6063, + 6064, 6065, 4371, 6066, 6067, 6068, 6069, 6070, 6071, 6072, 6073, 6074, + 6075, 6076, 6077, 6078, 6079, 6080, 6081, 6082, 6083, 6084, 6085, 6086, + 6087, 6088, 4370, 6089, 6090, 6091, 6092, 6093, 6094, 6095, 6096, 6097, + 6098, 6099, 6100, 6101, 6102, 6103, 6104, 6105, 6106, 6107, 6108, 6109, + 6110, 6111, 4369, 6112, 6113, 6114, 6115, 6116, 6117, 6118, 6119, 6120, + 6121, 6122, 6123, 6124, 6125, 6126, 6127, 6128, 6129, 6130, 6131, 6132, + 6133, 6134, 4368, 6135, 6136, 6137, 6138, 6139, 6140, 6141, 6142, 6143, + 6144, 6145, 6146, 6147, 6148, 6149, 6150, 6151, 6152, 6153, 6154, 6155, + 6156, 6157, 4367, 6158, 6159, 6160, 6161, 6162, 6163, 6164, 6165, 6166, + 6167, 6168, 6169, 6170, 6171, 6172, 6173, 6174, 6175, 6176, 6177, 6178, + 6179, 6180, 4366, 6181, 6182, 6183, 6184, 6185, 6186, 6187, 6188, 6189, + 6190, 6191, 6192, 6193, 6194, 6195, 6196, 6197, 6198, 6199, 6200, 6201, + 6202, 6203, 4365, 6204, 6205, 6206, 6207, 6208, 6209, 6210, 6211, 6212, + 6213, 6214, 6215, 6216, 6217, 6218, 6219, 6220, 6221, 6222, 6223, 6224, + 6225, 6226, 4364, 6227, 6228, 6229, 6230, 6231, 6232, 6233, 6234, 6235, + 6236, 6237, 6238, 6239, 6240, 6241, 6242, 6243, 6244, 6245, 6246, 6247, + 6248, 6249, 4363, 6250, 6251, 6252, 6253, 6254, 6255, 6256, 6257, 6258, + 6259, 6260, 6261, 6262, 6263, 6264, 6265, 6266, 6267, 6268, 6269, 6270, + 6271, 6272, 4362, 6273, 6274, 6275, 6276, 6277, 6278, 6279, 6280, 6281, + 6282, 6283, 6284, 6285, 6286, 6287, 6288, 6289, 6290, 6291, 6292, 6293, + 6294, 6295, 4361, 6296, 6297, 6298, 6299, 6300, 6301, 6302, 6303, 6304, + 6305, 6306, 6307, 6308, 6309, 6310, 6311, 6312, 6313, 6314, 6315, 6316, + 6317, 6318, 4360, 6319, 6320, 6321, 6322, 6323, 6324, 6325, 6326, 6327, + 6328, 6329, 6330, 6331, 6332, 6333, 6334, 6335, 6336, 6337, 6338, 6339, + 6340, 6341, 4359, 6342, 6343, 6344, 6345, 6346, 6347, 6348, 6349, 6350, + 6351, 6352, 6353, 6354, 6355, 6356, 6357, 6358, 6359, 6360, 6361, 6362, + 6363, 6364, 4325, 6365, 6366, 6367, 6368, 6369, 6370, 6371, 6372, 6373, + 6374, 6375, 6376, 6377, 6378, 6379, 6380, 6381, 6382, 6383, 6384, 6385, + 6386, 6387, 4357, 6388, 6389, 6390, 6391, 6392, 6393, 6394, 6395, 6396, + 6397, 6398, 6399, 6400, 6401, 6402, 6403, 6404, 6405, 6406, 6407, 6408, + 6409, 6410, 4356, 6411, 6412, 6413, 6414, 6415, 6416, 6417, 6418, 6419, + 6420, 6421, 6422, 6423, 6424, 6425, 6426, 6427, 6428, 6429, 6430, 6431, + 6432, 6433, 4355, 6434, 6435, 6436, 6437, 6438, 6439, 6440, 6441, 6442, + 6443, 6444, 6445, 6446, 6447, 6448, 6449, 6450, 6451, 6452, 6453, 6454, + 6455, 6456, 4354, 6457, 6458, 6459, 6460, 6461, 6462, 6463, 6464, 6465, + 6466, 6467, 6468, 6469, 6470, 6471, 6472, 6473, 6474, 6475, 6476, 6477, + 6478, 6479, 4353, 6480, 6481, 6482, 6483, 6484, 6485, 6486, 6487, 6488, + 6489, 6490, 6491, 6492, 6493, 6494, 6495, 6496, 6497, 6498, 6499, 6500, + 6501, 6502, 4352, 6503, 6504, 6505, 6506, 6507, 6508, 6509, 6510, 6511, + 6512, 6513, 6514, 6515, 6516, 6517, 6518, 6519, 6520, 6521, 6522, 6523, + 6524, 6525, 4351, 6526, 6527, 6528, 6529, 6530, 6531, 6532, 6533, 6534, + 6535, 6536, 6537, 6538, 6539, 6540, 6541, 6542, 6543, 6544, 6545, 6546, + 6547, 6548, 4350, 6549, 6550, 6551, 6552, 6553, 6554, 6555, 6556, 6557, + 6558, 6559, 6560, 6561, 6562, 6563, 6564, 6565, 6566, 6567, 6568, 6569, + 6570, 6571, 4349, 6572, 6573, 6574, 6575, 6576, 6577, 6578, 6579, 6580, + 6581, 6582, 6583, 6584, 6585, 6586, 6587, 6588, 6589, 6590, 6591, 6592, + 6593, 6594, 4348, 6595, 6596, 6597, 6598, 6599, 6600, 6601, 6602, 6603, + 6604, 6605, 6606, 6607, 6608, 6609, 6610, 6611, 6612, 6613, 6614, 6615, + 6616, 6617, 4347, 6618, 6619, 6620, 6621, 6622, 6623, 6624, 6625, 6626, + 6627, 6628, 6629, 6630, 6631, 6632, 6633, 6634, 6635, 6636, 6637, 6638, + 6639, 6640, 4346, 6641, 6642, 6643, 6644, 6645, 6646, 6647, 6648, 6649, + 6650, 6651, 6652, 6653, 6654, 6655, 6656, 6657, 6658, 6659, 6660, 6661, + 6662, 6663, 4345, 6664, 6665, 6666, 6667, 6668, 6669, 6670, 6671, 6672, + 6673, 6674, 6675, 6676, 6677, 6678, 6679, 6680, 6681, 6682, 6683, 6684, + 6685, 6686, 4344, 6687, 6688, 6689, 6690, 6691, 6692, 6693, 6694, 6695, + 6696, 6697, 6698, 6699, 6700, 6701, 6702, 6703, 6704, 6705, 6706, 6707, + 6708, 6709, 4343, 6710, 6711, 6712, 6713, 6714, 6715, 6716, 6717, 6718, + 6719, 6720, 6721, 6722, 6723, 6724, 6725, 6726, 6727, 6728, 6729, 6730, + 6731, 6732, 4342, 6733, 6734, 6735, 6736, 6737, 6738, 6739, 6740, 6741, + 6742, 6743, 6744, 6745, 6746, 6747, 6748, 6749, 6750, 6751, 6752, 6753, + 6754, 6755, 4341, 6756, 6757, 6758, 6759, 6760, 6761, 6762, 6763, 6764, + 6765, 6766, 6767, 6768, 6769, 6770, 6771, 6772, 6773, 6774, 6775, 6776, + 6777, 6778, 4340, 6779, 6780, 6781, 6782, 6783, 6784, 6785, 6786, 6787, + 6788, 6789, 6790, 6791, 6792, 6793, 6794, 6795, 6796, 6797, 6798, 6799, + 6800, 6801, 4339, 6802, 6803, 6804, 6805, 6806, 6807, 6808, 6809, 6810, + 6811, 6812, 6813, 6814, 6815, 6816, 6817, 6818, 6819, 6820, 6821, 6822, + 6823, 6824, 4338, 6825, 6826, 6827, 6828, 6829, 6830, 6831, 6832, 6833, + 6834, 6835, 6836, 6837, 6838, 6839, 6840, 6841, 6842, 6843, 6844, 6845, + 6846, 6847, 4337, 6848, 6849, 6850, 6851, 6852, 6853, 6854, 6855, 6856, + 6857, 6858, 6859, 6860, 6861, 6862, 6863, 6864, 6865, 6866, 6867, 6868, + 6869, 6870, 4336, 6871, 6872, 6873, 6874, 6875, 6876, 6877, 6878, 6879, + 6880, 6881, 6882, 6883, 6884, 6885, 6886, 6887, 6888, 6889, 6890, 6891, + 6892, 6893, 4335, 6894, 6895, 6896, 6897, 6898, 6899, 6900, 6901, 6902, + 6903, 6904, 6905, 6906, 6907, 6908, 6909, 6910, 6911, 6912, 6913, 6914, + 6915, 6916, 4334, 6917, 6918, 6919, 6920, 6921, 6922, 6923, 6924, 6925, + 6926, 6927, 6928, 6929, 6930, 6931, 6932, 6933, 6934, 6935, 6936, 6937, + 6938, 6939, 4333, 6940, 6941, 6942, 6943, 6944, 6945, 6946, 6947, 6948, + 6949, 6950, 6951, 6952, 6953, 6954, 6955, 6956, 6957, 6958, 6959, 6960, + 6961, 6962, 4332, 6963, 6964, 6965, 6966, 6967, 6968, 6969, 6970, 6971, + 6972, 6973, 6974, 6975, 6976, 6977, 6978, 6979, 6980, 6981, 6982, 6983, + 6984, 6985, 4331, 6986, 6987, 6988, 6989, 6990, 6991, 6992, 6993, 6994, + 6995, 6996, 6997, 6998, 6999, 7000, 7001, 7002, 7003, 7004, 7005, 7006, + 7007, 7008, 4330, 7009, 7010, 7011, 7012, 7013, 7014, 7015, 7016, 7017, + 7018, 7019, 7020, 7021, 7022, 7023, 7024, 7025, 7026, 7027, 7028, 7029, + 7030, 7031, 4329, 7032, 7033, 7034, 7035, 7036, 7037, 7038, 7039, 7040, + 7041, 7042, 7043, 7044, 7045, 7046, 7047, 7048, 7049, 7050, 7051, 7052, + 7053, 7054, 4328, 7055, 7056, 7057, 7058, 7059, 7060, 7061, 7062, 7063, + 7064, 7065, 7066, 7067, 7068, 7069, 7070, 7071, 7072, 7073, 7074, 7075, + 7076, 7077, 4327, 7078, 7079, 7080, 7081, 7082, 7083, 7084, 7085, 7086, + 7087, 7088, 7089, 7090, 7091, 7092, 7093, 7094, 7095, 7096, 7097, 7098, + 7099, 7100, 4326, 7101, 7102, 7103, 7104, 7105, 7106, 7107, 7108, 7109, + 7110, 7111, 7112, 7113, 7114, 7115, 7116, 7117, 7118, 7119, 7120, 7121, + 7122, 7123, 4324, 7124, 7125, 7126, 7127, 7128, 7129, 7130, 7131, 7132, + 7133, 7134, 7135, 7136, 7137, 7138, 7139, 7140, 7141, 7142, 7143, 7144, + 7145, 7146, 4455, 7147, 7148, 7149, 7150, 7151, 7152, 7153, 7154, 7155, + 7156, 7157, 7158, 7159, 7160, 7161, 7162, 7163, 7164, 7165, 7166, 7167, + 7168, 7169, 4454, 7170, 7171, 7172, 7173, 7174, 7175, 7176, 7177, 7178, + 7179, 7180, 7181, 7182, 7183, 7184, 7185, 7186, 7187, 7188, 7189, 7190, + 7191, 7192, 4453, 7193, 7194, 7195, 7196, 7197, 7198, 7199, 7200, 7201, + 7202, 7203, 7204, 7205, 7206, 7207, 7208, 7209, 7210, 7211, 7212, 7213, + 7214, 7215, 4452, 7216, 7217, 7218, 7219, 7220, 7221, 7222, 7223, 7224, + 7225, 7226, 7227, 7228, 7229, 7230, 7231, 7232, 7233, 7234, 7235, 7236, + 7237, 7238, 4451, 7239, 7240, 7241, 7242, 7243, 7244, 7245, 7246, 7247, + 7248, 7249, 7250, 7251, 7252, 7253, 7254, 7255, 7256, 7257, 7258, 7259, + 7260, 7261, 4450, 7262, 7263, 7264, 7265, 7266, 7267, 7268, 7269, 7270, + 7271, 7272, 7273, 7274, 7275, 7276, 7277, 7278, 7279, 7280, 7281, 7282, + 7283, 7284, 4449, 7285, 7286, 7287, 7288, 7289, 7290, 7291, 7292, 7293, + 7294, 7295, 7296, 7297, 7298, 7299, 7300, 7301, 7302, 7303, 7304, 7305, + 7306, 7307, 4448, 7308, 7309, 7310, 7311, 7312, 7313, 7314, 7315, 7316, + 7317, 7318, 7319, 7320, 7321, 7322, 7323, 7324, 7325, 7326, 7327, 7328, + 7329, 7330, 4447, 7331, 7332, 7333, 7334, 7335, 7336, 7337, 7338, 7339, + 7340, 7341, 7342, 7343, 7344, 7345, 7346, 7347, 7348, 7349, 7350, 7351, + 7352, 7353, 4446, 7354, 7355, 7356, 7357, 7358, 7359, 7360, 7361, 7362, + 7363, 7364, 7365, 7366, 7367, 7368, 7369, 7370, 7371, 7372, 7373, 7374, + 7375, 7376, 4445, 7377, 7378, 7379, 7380, 7381, 7382, 7383, 7384, 7385, + 7386, 7387, 7388, 7389, 7390, 7391, 7392, 7393, 7394, 7395, 7396, 7397, + 7398, 7399, 4444, 7400, 7401, 7402, 7403, 7404, 7405, 7406, 7407, 7408, + 7409, 7410, 7411, 7412, 7413, 7414, 7415, 7416, 7417, 7418, 7419, 7420, + 7421, 7422, 4443, 7423, 7424, 7425, 7426, 7427, 7428, 7429, 7430, 7431, + 7432, 7433, 7434, 7435, 7436, 7437, 7438, 7439, 7440, 7441, 7442, 7443, + 7444, 7445, 4442, 7446, 7447, 7448, 7449, 7450, 7451, 7452, 7453, 7454, + 7455, 7456, 7457, 7458, 7459, 7460, 7461, 7462, 7463, 7464, 7465, 7466, + 7467, 7468, 4441, 7469, 7470, 7471, 7472, 7473, 7474, 7475, 7476, 7477, + 7478, 7479, 7480, 7481, 7482, 7483, 7484, 7485, 7486, 7487, 7488, 7489, + 7490, 7491, 4440 ; +} diff --git a/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/mesh/helmholtz-mesh-1.e b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/mesh/helmholtz-mesh-1.e new file mode 100644 index 000000000000..57b9efa5163c Binary files /dev/null and b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/mesh/helmholtz-mesh-1.e differ diff --git a/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/mesh/helmholtz-mesh-1.txt b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/mesh/helmholtz-mesh-1.txt new file mode 100644 index 000000000000..4f0df292bebc --- /dev/null +++ b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/mesh/helmholtz-mesh-1.txt @@ -0,0 +1,56140 @@ +netcdf helmholtz-mesh-1 { +dimensions: + len_string = 33 ; + len_line = 81 ; + four = 4 ; + len_name = 33 ; + time_step = UNLIMITED ; // (0 currently) + num_dim = 2 ; + num_nodes = 29829 ; + num_elem = 29696 ; + num_el_blk = 1 ; + num_side_sets = 1 ; + num_el_in_blk1 = 29696 ; + num_nod_per_el1 = 4 ; + num_side_ss1 = 264 ; + num_df_ss1 = 528 ; + num_qa_rec = 1 ; +variables: + double time_whole(time_step) ; + int eb_status(num_el_blk) ; + int eb_prop1(num_el_blk) ; + eb_prop1:name = "ID" ; + int ss_status(num_side_sets) ; + int ss_prop1(num_side_sets) ; + ss_prop1:name = "ID" ; + double coordx(num_nodes) ; + double coordy(num_nodes) ; + char eb_names(num_el_blk, len_name) ; + char ss_names(num_side_sets, len_name) ; + char coor_names(num_dim, len_name) ; + int connect1(num_el_in_blk1, num_nod_per_el1) ; + connect1:elem_type = "QUAD" ; + int elem_ss1(num_side_ss1) ; + int side_ss1(num_side_ss1) ; + double dist_fact_ss1(num_df_ss1) ; + char qa_records(num_qa_rec, four, len_string) ; + int elem_map(num_elem) ; + int elem_num_map(num_elem) ; + int node_num_map(num_nodes) ; + +// global attributes: + :api_version = 6.05f ; + :version = 6.05f ; + :floating_point_word_size = 8 ; + :file_size = 1 ; + :maximum_name_length = 32 ; + :int64_status = 0 ; + :title = "cubit(ublished/Helmholtz_KouriRidzal2019/mesh/helmhltz-mesh-1.e): 11/06/2019: 17" ; +data: + + eb_status = 1 ; + + eb_prop1 = 1 ; + + ss_status = 1 ; + + ss_prop1 = 1 ; + + coordx = -1.14810637420064e-17, 0.0291700015546435, 0.0292908831302629, + -5.74053187100322e-18, 0, 0.0294117647058824, 0.0588235294117647, + 0.0585817662605259, 0.0583400031092871, -2.29621274840129e-17, + 0.0289282384034047, 0.0290491199790241, -1.72215956130097e-17, + 0.0580982399580482, 0.0578564768068094, -3.44431912260193e-17, + 0.0286864752521659, 0.0288073568277853, -2.87026593550161e-17, + 0.0576147136555706, 0.0573729505043318, -4.59242549680257e-17, + 0.028444712100927, 0.0285655936765465, -4.01837230970225e-17, + 0.0571311873530929, 0.0568894242018541, -5.74053187100322e-17, + 0.0282029489496882, 0.0283238305253076, -5.1664786839029e-17, + 0.0566476610506153, 0.0564058978993765, -6.88863824520386e-17, + 0.0279611857984494, 0.0280820673740688, -6.31458505810354e-17, + 0.0561641347481377, 0.0559223715968989, -8.03674461940451e-17, + 0.0277194226472106, 0.02784030422283, -7.46269143230418e-17, + 0.05568060844566, 0.0554388452944212, -9.18485099360515e-17, + 0.0274776594959717, 0.0275985410715912, -8.61079780650483e-17, + 0.0551970821431824, 0.0549553189919436, -1.03329573678058e-16, + 0.0272358963447329, 0.0273567779203523, -9.75890418070547e-17, + 0.0547135558407048, 0.0544717926894659, -1.14810637420064e-16, + 0.0269941331934941, 0.0271150147691135, -1.09070105549061e-16, + 0.0542300295382271, 0.0539882663869883, -1.26291701162071e-16, + 0.0267523700422553, 0.0268732516178747, -1.20551169291068e-16, + 0.0537465032357495, 0.0535047400845106, -1.37772764904077e-16, + 0.0265106068910164, 0.0266314884666358, -1.32032233033074e-16, + 0.0532629769332718, 0.053021213782033, -1.49253828646084e-16, + 0.0262688437397776, 0.026389725315397, -1.4351329677508e-16, + 0.0527794506307942, 0.0525376874795553, -1.6073489238809e-16, + 0.0260270805885388, 0.0261479621641582, -1.54994360517087e-16, + 0.0522959243283165, 0.0520541611770777, -1.72215956130097e-16, + 0.0257853174372999, 0.0259061990129194, -1.66475424259093e-16, + 0.0518123980258389, 0.0515706348746001, -1.83697019872103e-16, + 0.0255435542860611, 0.0256644358616805, -1.779564880011e-16, + 0.0513288717233612, 0.0510871085721224, 0.0875100046639306, + 0.0878726493907888, 0.0882352941176471, 0.117647058823529, + 0.117163532521052, 0.116680006218574, 0.0867847152102141, + 0.0871473599370724, 0.116196479916096, 0.115712953613619, + 0.0860594257564977, 0.0864220704833559, 0.115229427311141, + 0.114745901008664, 0.0853341363027812, 0.0856967810296394, + 0.114262374706186, 0.113778848403708, 0.0846088468490648, + 0.084971491575923, 0.113295322101231, 0.112811795798753, + 0.0838835573953483, 0.0842462021222065, 0.112328269496275, + 0.111844743193798, 0.0831582679416318, 0.0835209126684901, + 0.11136121689132, 0.110877690588843, 0.0824329784879154, + 0.0827956232147736, 0.110394164286365, 0.109910637983887, + 0.0817076890341989, 0.0820703337610572, 0.10942711168141, + 0.108943585378932, 0.0809823995804825, 0.0813450443073407, + 0.108460059076454, 0.107976532773977, 0.080257110126766, + 0.0806197548536242, 0.107493006471499, 0.107009480169021, + 0.0795318206730495, 0.0798944653999078, 0.106525953866544, + 0.106042427564066, 0.0788065312193331, 0.0791691759461913, + 0.105558901261588, 0.105075374959111, 0.0780812417656166, + 0.0784438864924749, 0.104591848656633, 0.104108322354156, + 0.0773559523119002, 0.0777185970387584, 0.103624796051678, + 0.1031412697492, 0.0766306628581837, 0.0769933075850419, + 0.102657743446723, 0.102174217144245, 0.145850007773218, + 0.146454415651315, 0.147058823529412, 0.176470588235294, + 0.175745298781578, 0.175020009327861, 0.144641192017024, + 0.145245599895121, 0.174294719874145, 0.173569430420428, + 0.143432376260829, 0.144036784138927, 0.172844140966712, + 0.172118851512995, 0.142223560504635, 0.142827968382732, + 0.171393562059279, 0.170668272605562, 0.141014744748441, + 0.141619152626538, 0.169942983151846, 0.16921769369813, + 0.139805928992247, 0.140410336870344, 0.168492404244413, + 0.167767114790697, 0.138597113236053, 0.13920152111415, 0.16704182533698, + 0.166316535883264, 0.137388297479859, 0.137992705357956, + 0.165591246429547, 0.164865956975831, 0.136179481723665, + 0.136783889601762, 0.164140667522114, 0.163415378068398, + 0.134970665967471, 0.135575073845568, 0.162690088614682, + 0.161964799160965, 0.133761850211277, 0.134366258089374, + 0.161239509707249, 0.160514220253532, 0.132553034455083, + 0.13315744233318, 0.159788930799816, 0.159063641346099, + 0.131344218698889, 0.131948626576986, 0.158338351892383, + 0.157613062438666, 0.130135402942694, 0.130739810820792, + 0.15688777298495, 0.156162483531233, 0.1289265871865, 0.129530995064597, + 0.155437194077517, 0.154711904623801, 0.127717771430306, + 0.128322179308403, 0.153986615170084, 0.153261325716368, + 0.204190010882505, 0.205036181911841, 0.205882352941176, + 0.235294117647059, 0.234327065042104, 0.233360012437148, + 0.202497668823833, 0.203343839853169, 0.232392959832193, + 0.231425907227238, 0.200805326765161, 0.201651497794497, + 0.230458854622282, 0.229491802017327, 0.19911298470649, + 0.199959155735825, 0.228524749412372, 0.227557696807417, + 0.197420642647818, 0.198266813677154, 0.226590644202461, + 0.225623591597506, 0.195728300589146, 0.196574471618482, + 0.224656538992551, 0.223689486387596, 0.194035958530474, + 0.19488212955981, 0.22272243378264, 0.221755381177685, 0.192343616471803, + 0.193189787501139, 0.22078832857273, 0.219821275967775, + 0.190651274413131, 0.191497445442467, 0.218854223362819, + 0.217887170757864, 0.188958932354459, 0.189805103383795, + 0.216920118152909, 0.215953065547953, 0.187266590295788, + 0.188112761325123, 0.214986012942998, 0.214018960338043, + 0.185574248237116, 0.186420419266452, 0.213051907733088, + 0.212084855128132, 0.183881906178444, 0.18472807720778, + 0.211117802523177, 0.210150749918222, 0.182189564119772, + 0.183035735149108, 0.209183697313267, 0.208216644708311, + 0.180497222061101, 0.181343393090437, 0.207249592103356, + 0.206282539498401, 0.178804880002429, 0.179651051031765, + 0.205315486893446, 0.20434843428849, 0.262530013991792, + 0.263617948172367, 0.264705882352941, 0.294117647058824, + 0.292908831302629, 0.291700015546435, 0.260354145630642, + 0.261442079811217, 0.290491199790241, 0.289282384034047, + 0.258178277269493, 0.259266211450068, 0.288073568277853, + 0.286864752521659, 0.256002408908344, 0.257090343088918, + 0.285655936765465, 0.284447121009271, 0.253826540547195, + 0.254914474727769, 0.283238305253077, 0.282029489496883, + 0.251650672186045, 0.25273860636662, 0.280820673740689, + 0.279611857984495, 0.249474803824896, 0.25056273800547, 0.2784030422283, + 0.277194226472106, 0.247298935463746, 0.248386869644321, + 0.275985410715912, 0.274776594959718, 0.245123067102597, + 0.246211001283172, 0.273567779203524, 0.27235896344733, + 0.242947198741448, 0.244035132922022, 0.271150147691136, + 0.269941331934942, 0.240771330380298, 0.241859264560873, + 0.268732516178748, 0.267523700422554, 0.238595462019149, + 0.239683396199724, 0.26631488466636, 0.265106068910166, 0.236419593658, + 0.237507527838574, 0.263897253153972, 0.262688437397777, + 0.23424372529685, 0.235331659477425, 0.261479621641583, + 0.260270805885389, 0.232067856935701, 0.233155791116276, + 0.259061990129195, 0.257853174373001, 0.229891988574552, + 0.230979922755126, 0.256644358616807, 0.255435542860613, + 0.320870017101079, 0.322199714432892, 0.323529411764706, + 0.352941176470588, 0.351490597563155, 0.350040018655722, + 0.318210622437452, 0.319540319769265, 0.348589439748289, + 0.347138860840857, 0.315551227773825, 0.316880925105638, + 0.345688281933424, 0.344237703025991, 0.312891833110198, + 0.314221530442011, 0.342787124118558, 0.341336545211125, + 0.310232438446571, 0.311562135778384, 0.339885966303692, + 0.338435387396259, 0.307573043782944, 0.308902741114757, + 0.336984808488826, 0.335534229581393, 0.304913649119317, + 0.30624334645113, 0.334083650673961, 0.332633071766528, 0.30225425445569, + 0.303583951787504, 0.331182492859095, 0.329731913951662, + 0.299594859792063, 0.300924557123877, 0.328281335044229, + 0.326830756136796, 0.296935465128436, 0.29826516246025, + 0.325380177229363, 0.32392959832193, 0.294276070464809, + 0.295605767796623, 0.322479019414497, 0.321028440507065, + 0.291616675801182, 0.292946373132996, 0.319577861599632, + 0.318127282692199, 0.288957281137555, 0.290286978469369, + 0.316676703784766, 0.315226124877333, 0.286297886473928, + 0.287627583805742, 0.3137755459699, 0.312324967062467, 0.283638491810301, + 0.284968189142115, 0.310874388155034, 0.309423809247601, + 0.280979097146674, 0.282308794478488, 0.307973230340168, + 0.306522651432735, 0.379210020210366, 0.380781480693418, + 0.382352941176471, 0.411764705882353, 0.410072363823681, + 0.40838002176501, 0.376067099244261, 0.377638559727314, + 0.406687679706338, 0.404995337647666, 0.372924178278157, + 0.374495638761209, 0.403302995588994, 0.401610653530323, + 0.369781257312052, 0.371352717795104, 0.399918311471651, + 0.398225969412979, 0.366638336345947, 0.368209796829, 0.396533627354308, + 0.394841285295636, 0.363495415379843, 0.365066875862895, + 0.393148943236964, 0.391456601178292, 0.360352494413738, + 0.361923954896791, 0.389764259119621, 0.388071917060949, + 0.357209573447634, 0.358781033930686, 0.386379575002277, + 0.384687232943605, 0.354066652481529, 0.355638112964581, + 0.382994890884934, 0.381302548826262, 0.350923731515424, + 0.352495191998477, 0.37961020676759, 0.377917864708919, 0.34778081054932, + 0.349352271032372, 0.376225522650247, 0.374533180591575, + 0.344637889583215, 0.346209350066268, 0.372840838532903, + 0.371148496474232, 0.341494968617111, 0.343066429100163, + 0.36945615441556, 0.367763812356888, 0.338352047651006, + 0.339923508134058, 0.366071470298217, 0.364379128239545, + 0.335209126684901, 0.336780587167954, 0.362686786180873, + 0.360994444122201, 0.332066205718797, 0.333637666201849, + 0.35930210206353, 0.357609760004858, 0.437550023319653, + 0.439363246953944, 0.441176470588235, 0.470588235294118, + 0.468654130084207, 0.466720024874297, 0.433923576051071, + 0.435736799685362, 0.464785919664386, 0.462851814454475, + 0.430297128782489, 0.43211035241678, 0.460917709244565, + 0.458983604034654, 0.426670681513906, 0.428483905148197, + 0.457049498824744, 0.455115393614833, 0.423044234245324, + 0.424857457879615, 0.453181288404923, 0.451247183195012, + 0.419417786976742, 0.421231010611033, 0.449313077985102, + 0.447378972775191, 0.415791339708159, 0.417604563342451, + 0.445444867565281, 0.44351076235537, 0.412164892439577, + 0.413978116073868, 0.44157665714546, 0.439642551935549, + 0.408538445170995, 0.410351668805286, 0.437708446725638, + 0.435774341515728, 0.404911997902413, 0.406725221536704, + 0.433840236305817, 0.431906131095907, 0.401285550633831, + 0.403098774268122, 0.429972025885996, 0.428037920676086, + 0.397659103365248, 0.399472326999539, 0.426103815466175, + 0.424169710256265, 0.394032656096666, 0.395845879730957, + 0.422235605046354, 0.420301499836444, 0.390406208828084, + 0.392219432462375, 0.418367394626533, 0.416433289416623, + 0.386779761559502, 0.388592985193793, 0.414499184206712, + 0.412565078996802, 0.383153314290919, 0.38496653792521, + 0.410630973786891, 0.408696868576981, 0.49589002642894, 0.49794501321447, + 0.5, 0.529411764705882, 0.527235896344733, 0.525060027983584, + 0.49178005285788, 0.49383503964341, 0.522884159622434, 0.520708291261285, + 0.48767007928682, 0.48972506607235, 0.518532422900136, 0.516356554538986, + 0.48356010571576, 0.48561509250129, 0.514180686177837, 0.512004817816687, + 0.479450132144701, 0.48150511893023, 0.509828949455538, + 0.507653081094389, 0.475340158573641, 0.477395145359171, + 0.50547721273324, 0.50330134437209, 0.471230185002581, 0.473285171788111, + 0.501125476010941, 0.498949607649792, 0.467120211431521, + 0.469175198217051, 0.496773739288642, 0.494597870927493, + 0.463010237860461, 0.465065224645991, 0.492422002566343, + 0.490246134205194, 0.458900264289401, 0.460955251074931, + 0.488070265844045, 0.485894397482895, 0.454790290718341, + 0.456845277503871, 0.483718529121746, 0.481542660760597, + 0.450680317147282, 0.452735303932811, 0.479366792399447, + 0.477190924038298, 0.446570343576222, 0.448625330361752, + 0.475015055677149, 0.472839187315999, 0.442460370005162, + 0.444515356790692, 0.47066331895485, 0.468487450593701, + 0.438350396434102, 0.440405383219632, 0.466311582232551, + 0.464135713871402, 0.434240422863042, 0.436295409648572, + 0.461959845510253, 0.459783977149103, 0.554230029538227, + 0.556526779474996, 0.558823529411765, 0.588235294117647, + 0.585817662605259, 0.583400031092871, 0.54963652966469, + 0.551933279601458, 0.580982399580483, 0.578564768068095, + 0.545043029791152, 0.547339779727921, 0.576147136555706, + 0.573729505043318, 0.540449529917614, 0.542746279854383, + 0.57131187353093, 0.568894242018542, 0.535856030044077, + 0.538152779980846, 0.566476610506154, 0.564058978993766, + 0.53126253017054, 0.533559280107308, 0.561641347481377, + 0.559223715968989, 0.526669030297002, 0.528965780233771, + 0.556806084456601, 0.554388452944213, 0.522075530423465, + 0.524372280360233, 0.551970821431825, 0.549553189919436, + 0.517482030549927, 0.519778780486696, 0.547135558407048, + 0.54471792689466, 0.51288853067639, 0.515185280613158, 0.542300295382272, + 0.539882663869884, 0.508295030802852, 0.510591780739621, + 0.537465032357496, 0.535047400845108, 0.503701530929315, + 0.505998280866083, 0.532629769332719, 0.530212137820331, + 0.499108031055777, 0.501404780992546, 0.527794506307943, + 0.525376874795555, 0.49451453118224, 0.496811281119008, + 0.522959243283167, 0.520541611770778, 0.489921031308702, + 0.492217781245471, 0.51812398025839, 0.515706348746002, + 0.485327531435165, 0.487624281371933, 0.513288717233614, + 0.510871085721226, 0.612570032647514, 0.615108545735522, + 0.617647058823529, 0.647058823529412, 0.644399428865785, + 0.641740034202158, 0.607493006471499, 0.610031519559507, + 0.639080639538531, 0.636421244874904, 0.602415980295484, + 0.604954493383492, 0.633761850211277, 0.63110245554765, + 0.597338954119469, 0.599877467207476, 0.628443060884023, + 0.625783666220396, 0.592261927943454, 0.594800441031461, + 0.623124271556769, 0.620464876893142, 0.587184901767439, + 0.589723414855446, 0.617805482229515, 0.615146087565888, + 0.582107875591424, 0.584646388679431, 0.612486692902261, + 0.609827298238634, 0.577030849415408, 0.579569362503416, + 0.607167903575007, 0.60450850891138, 0.571953823239393, + 0.574492336327401, 0.601849114247753, 0.599189719584126, + 0.566876797063378, 0.569415310151386, 0.596530324920499, + 0.593870930256872, 0.561799770887363, 0.564338283975371, + 0.591211535593245, 0.588552140929618, 0.556722744711348, + 0.559261257799355, 0.585892746265991, 0.583233351602364, + 0.551645718535333, 0.55418423162334, 0.580573956938737, 0.57791456227511, + 0.546568692359317, 0.549107205447325, 0.575255167611483, + 0.572595772947856, 0.541491666183302, 0.54403017927131, + 0.569936378284229, 0.567276983620603, 0.536414640007287, + 0.538953153095295, 0.564617588956976, 0.561958194293348, + 0.670910035756801, 0.673690311996048, 0.676470588235294, + 0.705882352941176, 0.702981195126311, 0.700080037311445, + 0.665349483278309, 0.668129759517555, 0.697178879496579, + 0.694277721681713, 0.659788930799816, 0.662569207039062, + 0.691376563866848, 0.688475406051982, 0.654228378321323, + 0.65700865456057, 0.685574248237116, 0.68267309042225, 0.64866782584283, + 0.651448102082077, 0.679771932607384, 0.676870774792519, + 0.643107273364337, 0.645887549603584, 0.673969616977653, + 0.671068459162787, 0.637546720885845, 0.640326997125091, + 0.668167301347921, 0.665266143533055, 0.631986168407352, + 0.634766444646598, 0.66236498571819, 0.659463827903324, + 0.626425615928859, 0.629205892168106, 0.656562670088458, + 0.653661512273592, 0.620865063450367, 0.623645339689613, + 0.650760354458726, 0.647859196643861, 0.615304510971874, + 0.61808478721112, 0.644958038828995, 0.642056881014129, + 0.609743958493381, 0.612524234732627, 0.639155723199263, + 0.636254565384398, 0.604183406014888, 0.606963682254135, + 0.633353407569532, 0.630452249754666, 0.598622853536395, + 0.601403129775642, 0.6275510919398, 0.624649934124934, 0.593062301057903, + 0.595842577297149, 0.621748776310069, 0.618847618495203, + 0.58750174857941, 0.590282024818656, 0.615946460680337, + 0.613045302865471, 0.729250038866089, 0.732272078256574, + 0.735294117647059, 0.764705882352941, 0.761562961386837, + 0.758420040420732, 0.723205960085118, 0.726227999475603, + 0.755277119454627, 0.752134198488523, 0.717161881304147, + 0.720183920694633, 0.748991277522418, 0.745848356556313, + 0.711117802523177, 0.714139841913662, 0.742705435590209, + 0.739562514624104, 0.705073723742207, 0.708095763132692, 0.736419593658, + 0.733276672691895, 0.699029644961236, 0.702051684351722, + 0.730133751725791, 0.726990830759686, 0.692985566180266, + 0.696007605570751, 0.723847909793581, 0.720704988827477, + 0.686941487399296, 0.689963526789781, 0.717562067861372, + 0.714419146895268, 0.680897408618325, 0.68391944800881, + 0.711276225929163, 0.708133304963058, 0.674853329837355, + 0.67787536922784, 0.704990383996954, 0.701847463030849, + 0.668809251056384, 0.67183129044687, 0.698704542064744, 0.69556162109864, + 0.662765172275414, 0.665787211665899, 0.692418700132535, + 0.68927577916643, 0.656721093494444, 0.659743132884929, + 0.686132858200326, 0.682989937234221, 0.650677014713473, + 0.653699054103958, 0.679847016268117, 0.676704095302012, + 0.644632935932503, 0.647654975322988, 0.673561174335908, + 0.670418253369803, 0.638588857151532, 0.641610896542018, + 0.667275332403698, 0.664132411437594, 0.787590041975376, 0.7908538445171, + 0.794117647058823, 0.823529411764706, 0.820144727647363, + 0.816760043530019, 0.781062436891927, 0.784326239433652, + 0.813375359412676, 0.809990675295332, 0.774534831808479, + 0.777798634350203, 0.806605991177989, 0.803221307060645, + 0.768007226725031, 0.771271029266755, 0.799836622943302, + 0.796451938825958, 0.761479621641583, 0.764743424183307, + 0.793067254708615, 0.789682570591271, 0.754952016558135, + 0.758215819099859, 0.786297886473928, 0.782913202356585, + 0.748424411474687, 0.751688214016411, 0.779528518239241, + 0.776143834121898, 0.741896806391239, 0.745160608932963, + 0.772759150004554, 0.769374465887211, 0.735369201307791, + 0.738633003849515, 0.765989781769868, 0.762605097652524, + 0.728841596224343, 0.732105398766067, 0.759220413535181, + 0.755835729417837, 0.722313991140895, 0.725577793682619, + 0.752451045300494, 0.749066361183151, 0.715786386057447, + 0.719050188599171, 0.745681677065807, 0.742296992948464, + 0.709258780973999, 0.712522583515723, 0.73891230883112, + 0.735527624713777, 0.702731175890551, 0.705994978432275, + 0.732142940596433, 0.72875825647909, 0.696203570807103, + 0.699467373348827, 0.725373572361747, 0.721988888244403, + 0.689675965723655, 0.692939768265379, 0.71860420412706, + 0.715219520009716, 0.845930045084663, 0.849435610777626, + 0.852941176470588, 0.882352941176471, 0.878726493907888, + 0.875100046639306, 0.838918913698737, 0.8424244793917, 0.871473599370724, + 0.867847152102142, 0.831907782312811, 0.835413348005774, + 0.864220704833559, 0.860594257564977, 0.824896650926886, + 0.828402216619848, 0.856967810296395, 0.853341363027813, + 0.81788551954096, 0.821391085233923, 0.849714915759231, + 0.846088468490648, 0.810874388155034, 0.814379953847997, + 0.842462021222066, 0.838835573953484, 0.803863256769109, + 0.807368822462071, 0.835209126684901, 0.831582679416319, + 0.796852125383183, 0.800357691076146, 0.827956232147737, + 0.824329784879155, 0.789840993997257, 0.79334655969022, + 0.820703337610572, 0.81707689034199, 0.782829862611331, + 0.786335428304294, 0.813450443073408, 0.809823995804826, + 0.775818731225406, 0.779324296918369, 0.806197548536243, + 0.802571101267661, 0.76880759983948, 0.772313165532443, + 0.798944653999079, 0.795318206730497, 0.761796468453554, + 0.765302034146517, 0.791691759461915, 0.788065312193332, + 0.754785337067629, 0.758290902760592, 0.78443886492475, + 0.780812417656168, 0.747774205681703, 0.751279771374666, + 0.777185970387586, 0.773559523119003, 0.740763074295778, + 0.74426863998874, 0.769933075850421, 0.766306628581839, 0.90427004819395, + 0.908017377038151, 0.911764705882353, 0.941176470588235, + 0.937308260168414, 0.933440049748593, 0.896775390505546, + 0.900522719349748, 0.929571839328772, 0.925703628908951, + 0.889280732817143, 0.893028061661345, 0.92183541848913, + 0.917967208069309, 0.88178607512874, 0.885533403972941, + 0.914098997649488, 0.910230787229667, 0.874291417440337, + 0.878038746284538, 0.906362576809846, 0.902494366390025, + 0.866796759751933, 0.870544088596135, 0.898626155970204, + 0.894757945550382, 0.85930210206353, 0.863049430907731, + 0.890889735130561, 0.88702152471074, 0.851807444375126, + 0.855554773219328, 0.883153314290919, 0.879285103871098, + 0.844312786686723, 0.848060115530925, 0.875416893451277, + 0.871548683031456, 0.83681812899832, 0.840565457842522, + 0.867680472611635, 0.863812262191814, 0.829323471309916, + 0.833070800154118, 0.859944051771993, 0.856075841352172, + 0.821828813621513, 0.825576142465715, 0.852207630932351, + 0.84833942051253, 0.81433415593311, 0.818081484777312, 0.844471210092709, + 0.840602999672888, 0.806839498244707, 0.810586827088908, + 0.836734789253067, 0.832866578833246, 0.799344840556304, + 0.803092169400505, 0.828998368413425, 0.825130157993604, 0.7918501828679, + 0.795597511712102, 0.821261947573783, 0.817393737153961, + 0.962610051303237, 0.966599143298677, 0.970588235294118, 1, + 0.99589002642894, 0.99178005285788, 0.954631867312356, 0.958620959307796, + 0.98767007928682, 0.98356010571576, 0.946653683321475, 0.950642775316915, + 0.979450132144701, 0.975340158573641, 0.938675499330594, + 0.942664591326034, 0.971230185002581, 0.967120211431521, + 0.930697315339713, 0.934686407335154, 0.963010237860461, + 0.958900264289401, 0.922719131348832, 0.926708223344272, + 0.954790290718341, 0.950680317147282, 0.914740947357951, + 0.918730039353391, 0.946570343576222, 0.942460370005162, + 0.90676276336707, 0.910751855362511, 0.938350396434102, + 0.934240422863042, 0.898784579376189, 0.90277367137163, + 0.930130449291982, 0.926020475720922, 0.890806395385308, + 0.894795487380749, 0.921910502149862, 0.917800528578803, + 0.882828211394427, 0.886817303389868, 0.913690555007743, + 0.909580581436683, 0.874850027403546, 0.878839119398987, + 0.905470607865623, 0.901360634294563, 0.866871843412666, + 0.870860935408106, 0.897250660723503, 0.893140687152443, + 0.858893659421785, 0.862882751417225, 0.889030713581384, + 0.884920740010324, 0.850915475430904, 0.854904567426344, + 0.880810766439264, 0.876700792868204, 0.842937291440023, + 0.846926383435463, 0.872590819297144, 0.868480845726084, 1.0127374408893, + 1.01678538711132, 1.02083333333333, 1.04166666666667, 1.03768074779369, + 1.03369482892072, 1.00454726695389, 1.0086423539216, 1.02961462855637, + 1.02553442819203, 0.996263132015062, 1.00040519948448, 1.02136026682426, + 1.01718610545648, 0.987885569412644, 0.992074350713853, 1.01291851642513, + 1.00865092739377, 0.979415324130186, 0.983650446771415, 1.00429065568237, + 0.999930383970971, 0.970853351107317, 0.975134337618752, + 0.995478384519162, 0.991026385067353, 0.962200813076499, + 0.966527082091908, 0.986483820607594, 0.981941256147836, + 0.953459077929065, 0.957829945502782, 0.977309494571462, + 0.972677732995088, 0.944629715616508, 0.949044396772787, + 0.967958344253591, 0.963238955512094, 0.935714494594033, + 0.94017210510527, 0.958433708060678, 0.953628460609263, + 0.926715377814437, 0.931214936204235, 0.948739317400727, + 0.943850174192191, 0.917634518281392, 0.922174948047915, + 0.938879288230206, 0.933908402268221, 0.908474254172198, + 0.913054386226795, 0.928858111730087, 0.923807821191953, + 0.899237103541058, 0.903855678856628, 0.918680644131873, + 0.913553467071792, 0.889925758614877, 0.894581431077967, + 0.908352095716671, 0.90315072436155, 0.880543079694502, 0.88523441915469, + 0.897878019012235, 0.89260531366292, 0.829117993108342, + 0.854830536401422, 0.866723781362821, 0.840842249062722, + 0.777627771067437, 0.80337288208789, 0.814895581307879, + 0.788948913553036, 0.726075737768706, 0.751851754418072, + 0.762940434540366, 0.736931955527695, 0.674465357431444, + 0.700270547600075, 0.710865129476494, 0.684798303425294, + 0.622800226449757, 0.648632791940601, 0.658676726729668, + 0.632555150034043, 0.57108406524557, 0.596942145847664, + 0.606382543115918, 0.580209936197792, 0.519320709840676, + 0.545202387543123, 0.553990135078959, 0.527770333960126, + 0.467514103166909, 0.493417406503792, 0.50150728157242, + 0.475244229184714, 0.41566828613414, 0.441591194650525, + 0.448941966438007, 0.4226397036913, 0.363787388476316, 0.389727837305228, + 0.396302360319537, 0.369965016947774, 0.31187561939628, + 0.337831503936298, 0.343596802153799, 0.317228587359824, + 0.259937258030576, 0.285906438713428, 0.290833780280182, + 0.26443897320054, 0.20797664375583, 0.233956950893203, 0.238021913211855, + 0.211604853223171, 0.155998166358664, 0.181987405057247, + 0.185169930112065, 0.158735007000959, 0.104006256091414, + 0.130002211225039, 0.132286651019771, 0.105838295038583, + 0.0520053736361925, 0.0780058148638033, 0.0793809668694229, + 0.0529236387002625, -1.87524041119438e-16, 0.0260026868180961, + 0.0264618193501312, -1.91351062366774e-16, 1.05547407530631, + 1.05939553438518, 1.06331699346405, 1.08496732026144, 1.08111032097667, + 1.0772533216919, 1.04734461536107, 1.05140934533369, 1.07320406211101, + 1.06915480253011, 1.03892958766031, 1.04313710151069, 1.06491393619713, + 1.06067306986414, 1.03023061313885, 1.03458010039958, 1.05624168437404, + 1.05181029888394, 1.02124995596238, 1.02574028455062, 1.04718991341886, + 1.04256952795378, 1.01199051839837, 1.01662023718037, 1.03776208984158, + 1.03295465172939, 1.00245583424158, 1.00722317631997, 1.02796253203235, + 1.02297041233532, 0.992650060808798, 0.997552947525188, 1.01779640047891, + 1.01262238862251, 0.982577969521232, 0.987614015165015, 1.00726968607644, + 1.00191698353037, 0.972244935095678, 0.977411452308455, + 0.996389196556232, 0.990861409582094, 0.961656923369073, + 0.966950929232375, 0.985162541064024, 0.979463672545954, + 0.950820477783946, 0.956238700576509, 0.973598112922812, + 0.96773255329967, 0.939742704565423, 0.945281591174685, + 0.961705070619282, 0.955677587938894, 0.92843125662334, + 0.934086980594382, 0.949493317056891, 0.943309046174887, + 0.916894316215936, 0.922662786419638, 0.936973477122605, + 0.930637908070322, 0.905140576414413, 0.911017446315174, + 0.924156873618114, 0.917675839165906, 0.853026279760412, + 0.879083428087412, 0.891443074812003, 0.865210310458101, + 0.800714022410619, 0.826870151085515, 0.838844720863151, + 0.812479131268202, 0.748213907316449, 0.774463964863534, + 0.785987495186702, 0.759495859105203, 0.69553646298753, + 0.721875185151989, 0.732885240827484, 0.706274622549766, + 0.642692619641242, 0.669114541314386, 0.679552355899104, + 0.652830089248441, 0.589693684442258, 0.61619315204175, + 0.626003760967583, 0.599177432686724, 0.536551315888181, + 0.56312250016522, 0.572254865251481, 0.545332297816237, + 0.483277497399297, 0.509914406643739, 0.518321531715058, + 0.491310765613879, 0.42988451017227, 0.456581003785784, 0.46422004113356, + 0.43712931665324, 0.376384905359289, 0.40313470776578, 0.409967055212022, + 0.382804793770804, 0.322791475635664, 0.349588190497477, + 0.355579578841154, 0.328354363911504, 0.269117226220305, + 0.295954350927985, 0.301074921575788, 0.273795479240071, + 0.21537534541472, 0.242246285817513, 0.246470658423171, 0.21914583760627, + 0.161579174727267, 0.188477260070994, 0.191784590029922, + 0.164423342453574, 0.107742178650347, 0.134660676688807, + 0.137034702357843, 0.109646062262111, 0.053877914159002, + 0.0808100464046747, 0.0822391259399264, 0.0548321896177414, + -1.95328162878711e-16, 0.0269389570795009, 0.0274160948088706, + -1.99305263390648e-16, 1.09985442643167, 1.10364453347727, + 1.10743464052288, 1.12990196078431, 1.12617874597788, 1.12245553117144, + 1.09178801563006, 1.09582122103086, 1.11843837995072, 1.11442122873, + 1.08323706083038, 1.08751253823022, 1.11011114026331, 1.10580105179662, + 1.074204312393, 1.07872068661169, 1.10119968884934, 1.09659832590205, + 1.0646936120958, 1.0694489622444, 1.09170801106994, 1.08681769623783, + 1.05470988443139, 1.05970174826359, 1.08164140668561, 1.07646511713339, + 1.04425912545147, 1.04948450494143, 1.0710064778505, 1.06554783856762, + 1.03334838918391, 1.03880375731769, 1.05981111415646, 1.0540743897453, + 1.02198577165306, 1.02766708041848, 1.04806447476053, 1.04205455977575, + 1.0101803925397, 1.01608308209638, 1.03577696763652, 1.0294993754973, + 0.997942374521963, 1.00406138353083, 1.02296022599763, 1.01642107649797, + 0.98528282034429, 0.991612597433126, 1.00962708194344, 1.00283308738891, + 0.972213787666081, 0.978748304005185, 0.995791537391088, + 0.988749987393267, 0.958748261747248, 0.965481024706664, + 0.981468732356438, 0.974187477319609, 0.94490012603242, + 0.951824193889834, 0.966674910657064, 0.959162343994519, + 0.930684130700474, 0.937792128366447, 0.951427383114781, + 0.943692422235042, 0.8778541158991, 0.904269123299787, 0.91709517178757, + 0.890497921340098, 0.824688206497769, 0.851271161198434, + 0.863697601533717, 0.836897281727336, 0.771203544923721, + 0.797945875710745, 0.809904256234787, 0.782911230742239, + 0.717417995680389, 0.744310770302055, 0.755736299776625, + 0.728561368811012, 0.663350104878553, 0.690384050279471, + 0.701215744659839, 0.673870120508666, 0.609019058223434, + 0.636184581550994, 0.646365402134405, 0.618860683760144, + 0.554444637552899, 0.581731847888166, 0.591208830524852, + 0.56355697728956, 0.499647176025238, 0.527045906789068, + 0.535770281863079, 0.507983586436597, 0.444647512058021, + 0.472147344041629, 0.480074646949699, 0.452165707462801, + 0.389466942122377, 0.417057227090199, 0.424147398968375, + 0.396129090473949, 0.33412717249964, 0.361797057311008, + 0.368014535780863, 0.339899981087776, 0.278650270109639, + 0.30638872130464, 0.311702521033492, 0.283505060979208, + 0.223058612522029, 0.250854441315834, 0.255238224208498, + 0.226971387437788, 0.167374837263893, 0.195216724892961, 0.198648859756, + 0.170326332074213, 0.11162179053847, 0.139498313901182, + 0.141961925444521, 0.113597518814829, 0.0558224754711503, + 0.0837221330048103, 0.0852051400696942, 0.0568127613245592, + -2.03432443167186e-16, 0.0279112377355751, 0.0284063806622795, + -2.07559622943724e-16, 1.14587849426538, 1.14953238438759, + 1.1531862745098, 1.17647058823529, 1.17288602279731, 1.16930145735932, + 1.13787746776086, 1.14187798101312, 1.16531758207552, 1.16133370679171, + 1.12918555152527, 1.13353150964306, 1.15695187902282, 1.15257005125392, + 1.11980666717507, 1.12449610935017, 1.147792529851, 1.14301500844809, + 1.10974629253047, 1.11477647985277, 1.1378449486356, 1.13267488882311, + 1.09901144920637, 1.10437887086842, 1.12711633505123, 1.12155778127935, + 1.08761068670617, 1.09331106795627, 1.11561565806204, 1.10967353484472, + 1.07555406305439, 1.08158237488028, 1.1033536356041, 1.09703373636347, + 1.06285312201199, 1.06920359253319, 1.09034271030585, 1.08365168424824, + 1.04952086692608, 1.05618699446904, 1.07659702130155, 1.06954235835487, + 1.03557173127311, 1.0425462990996, 1.06213237220156, 1.05472238604825, + 1.02102154596242, 1.02829663861777, 1.04696619529209, 1.03921000453594, + 1.00588750347417, 1.0134545247183, 1.03111751204551, 1.02302501955507, + 0.990188118912782, 0.998037811193476, 1.01460689003051, 1.00618876050596, + 0.97394318806433, 0.982065653488556, 0.997456396320049, + 0.988724032134141, 0.957173742552686, 0.965558465308508, + 0.979689547502235, 0.970655062870329, 0.903601501524406, + 0.930387622038546, 0.943680072289521, 0.916705081708713, + 0.849550323328887, 0.876575912426646, 0.889454223319576, + 0.862203364930438, 0.795044650590521, 0.822297486959704, + 0.834690717684621, 0.807178070438803, 0.74010995551002, + 0.767577303050271, 0.779418306323916, 0.751658542209029, + 0.684772682161691, 0.712441318835856, 0.723666893011873, + 0.695675243814716, 0.629060186589098, 0.656916434375394, + 0.667467466616384, 0.639259689418051, 0.573000674834828, + 0.601030430711963, 0.610852030899073, 0.582444372380095, + 0.516623139044733, 0.54481190693978, 0.553853532016482, + 0.525262691652868, 0.459957291791391, 0.488290215418062, + 0.496505783886425, 0.467748876119982, 0.403033498765579, + 0.431495395278485, 0.438843391588595, 0.409937907057208, + 0.345882709988208, 0.374458104376893, 0.380901672972924, + 0.35186543888864, 0.288536389698579, 0.317209549843393, + 0.322716578653295, 0.293567718417949, 0.231026445077756, + 0.259781417388168, 0.264324610567837, 0.235081502717725, + 0.173385153968543, 0.20220579952315, 0.205762739290299, + 0.176443975862874, 0.115645091755783, 0.144515122862163, + 0.147068320279805, 0.117692664696737, 0.0578390575726375, + 0.0867420746642102, 0.0882790092587262, 0.0588653538207158, + -2.11836881984864e-16, 0.0289195287863186, 0.0294326769103578, + -2.16114141026003e-16, 1.19354627880743, 1.19705908711613, + 1.20057189542484, 1.22467320261438, 1.22123215143496, 1.21779110025554, + 1.18561297175348, 1.18957962528045, 1.21384166848539, 1.20989223671524, + 1.17677505974497, 1.18119401574922, 1.20543615247563, 1.20098006823603, + 1.16703767748508, 1.17190636861502, 1.19602020737904, 1.19106034652206, + 1.15640799726637, 1.16172283737572, 1.18560072611585, 1.18014110570963, + 1.14489521272331, 1.15065160499484, 1.17418687493845, 1.16823264416727, + 1.13251051800568, 1.1387028653645, 1.16179007266696, 1.15534750116664, + 1.11926708242024, 1.12588880021296, 1.14842396482183, 1.14150042847702, + 1.10518002059803, 1.11222355150914, 1.13410439271242, 1.12670835694783, + 1.09026635825484, 1.09772318942644, 1.11884935755132, 1.11099035815481, + 1.07454499362251, 1.08240567593868, 1.10267897967579, 1.09436760119678, + 1.05803665463835, 1.06629082413043, 1.08561545296877, 1.07686330474076, + 1.04076385198969, 1.04940025331402, 1.06768299458253, 1.05850268442431, + 1.02275082811994, 1.03175734005482, 1.04890779007912, 1.03931289573393, + 1.00402350231167, 1.0133871652158, 1.02931793411156, 1.01932297248919, + 0.984609411971048, 0.994316457141357, 1.00894336678048, + 0.998563761071767, 0.93026843663633, 0.957438924303689, + 0.971197776317857, 0.943831791563947, 0.875300372903974, + 0.902784404770152, 0.916114586220728, 0.88839738087751, 0.81973722431685, + 0.847518798610412, 0.860346879536203, 0.832296378194897, + 0.763612342476425, 0.791674783396637, 0.803931260469358, + 0.77556614274382, 0.706960351490655, 0.73528634698354, 0.746905800955207, + 0.718245459166594, 0.649817069539249, 0.678388710514952, + 0.68930995441352, 0.660374449660447, 0.592219427733969, + 0.621018248636609, 0.631184466374145, 0.601994483087842, + 0.534205386457781, 0.563212407095875, 0.572571282175268, + 0.543148081262693, 0.475813849372382, 0.505009617915081, + 0.513513451943738, 0.483878822624783, 0.417084575288895, + 0.446449212330639, 0.454055033072682, 0.424231243520582, + 0.358058088101367, 0.387571331695131, 0.394240990417338, + 0.364250737314095, 0.298775584987123, 0.328416836544245, + 0.334117094435195, 0.303983451556296, 0.239278843081903, + 0.269027214034513, 0.273729817501188, 0.243476183446081, + 0.179610124841216, 0.20944448396156, 0.21312622863282, 0.182776273819558, + 0.119812082302285, 0.149711103571751, 0.152353886863696, + 0.121931499907834, 0.0599276604634635, 0.0898698713828744, + 0.0914607335070226, 0.0609899671062112, -2.20541479331745e-16, + 0.0299638302317316, 0.0304949835531055, -2.24968817637486e-16, + 1.24285778005783, 1.2462246416629, 1.24959150326797, 1.27450980392157, + 1.27121713189084, 1.26792445986011, 1.23499452760791, 1.23892615383287, + 1.26401063918035, 1.26009681850058, 1.22600558548949, 1.2305000565487, + 1.25556396062177, 1.25103110274296, 1.21589734332301, 1.22095146440625, + 1.24588272143346, 1.24073434012396, 1.20467872630351, 1.21028803481326, + 1.23497534351068, 1.22921634689739, 1.19236117498222, 1.19851995064287, + 1.22285302634728, 1.21648970579716, 1.17895861935, 1.18565989716611, + 1.20952972166527, 1.20256973753337, 1.16448744728147, 1.17172303331574, + 1.19502210180965, 1.18747446608593, 1.14896646741117, 1.15672695734632, + 1.17934952198023, 1.17122457787452, 1.13241686652597, 1.14069166696857, + 1.16253397638583, 1.15384337489713, 1.11486216157017, 1.12363951404807, + 1.14460004842034, 1.13535672194356, 1.09632814637206, 1.10559515397112, + 1.12557485497346, 1.11579298800337, 1.07684283321264, 1.08658548979235, + 1.10548798500217, 1.09518298200098, 1.05643638936873, 1.06663961129069, + 1.08437143250225, 1.07355988300353, 1.03514106877443, 1.04578872907158, + 1.0622595240316, 1.05095916505966, 1.01299113895556, 1.02406610386499, + 1.03918884094951, 1.02741851683935, 0.957854921234872, 0.985423030095216, + 0.999648283872576, 0.971878050905798, 0.901938355223029, + 0.929896638228951, 0.943678690237173, 0.915479329568549, + 0.845281266102708, 0.873609810662868, 0.886872741789534, + 0.858266154010519, 0.787925156579601, 0.816603211341154, + 0.829275162212951, 0.800284170415382, 0.729913112865445, + 0.758919134722523, 0.77093246848984, 0.741580766564297, + 0.671289707073889, 0.700601409969667, 0.711892865525814, + 0.682204964487331, 0.612100896250322, 0.641695301662105, + 0.652206136950066, 0.622207309412801, 0.552393918264382, + 0.582247407257352, 0.591923532339436, 0.561639755266071, + 0.492217184800994, 0.522305551532688, 0.531097651121638, + 0.500555546977205, 0.431620171692326, 0.46191867824666, + 0.469782323420637, 0.43900909986407, 0.370653306839118, + 0.401136739265722, 0.408032488114106, 0.377055876364142, + 0.309367855975272, 0.340010581407195, 0.345904068379195, + 0.314752260394247, 0.247815806534468, 0.27859183125487, + 0.283453845008551, 0.252155429622855, 0.186049749881912, + 0.21693277820819, 0.220739327783561, 0.189323225944266, + 0.124122762177977, 0.155086256029945, 0.157818625196194, + 0.126314024448121, 0.0620882841436283, 0.0931055231608029, + 0.0947503128145832, 0.0631866011810454, -2.29546235207828e-16, + 0.031044142071814, 0.0315933005905226, -2.3412365277817e-16, + 1.29381299801657, 1.29702904802789, 1.30024509803922, 1.32598039215686, + 1.32284096416495, 1.31970153617303, 1.28602213532416, 1.28991756667036, + 1.31582449416038, 1.31194745214773, 1.27687712875883, 1.28144963204149, + 1.30733530346122, 1.3027231547747, 1.26638566468888, 1.27163139672385, + 1.29738007201425, 1.29203698925379, 1.25455847964189, 1.26047207216538, + 1.28596880082009, 1.27990061238639, 1.24140933598309, 1.24798390781249, + 1.2731147892777, 1.26632896616902, 1.22695499073914, 1.23418216336111, + 1.25883460505696, 1.25134024394491, 1.21121515763808, 1.21908507418861, + 1.24314804656757, 1.23495584919023, 1.19421246245142, 1.20271381004475, + 1.22607809810927, 1.21720034702832, 1.17597239173947, 1.18509242709545, + 1.20765087780507, 1.19810140858181, 1.15652323511608, 1.16624781342778, + 1.18789557843521, 1.1776897482886, 1.13589602116357, 1.14620962813983, + 1.16684440130619, 1.15599905432377, 1.11412444714303, 1.1250102341533, + 1.14453248330442, 1.13306591228508, 1.09124480265914, 1.10268462490108, + 1.12099781729992, 1.10892972231476, 1.06729588745261, 1.07927034505588, + 1.09628116608016, 1.08363260984556, 1.04231892350622, 1.05480740547942, + 1.07042597000933, 1.05721933017309, 0.986360955320033, 1.01433993941313, + 1.02903159495368, 1.00084385973427, 0.929464270286053, 0.957912612803043, + 0.972146535368912, 0.943449211003557, 0.871676775948094, + 0.900570523117074, 0.914268304444613, 0.885087397885669, + 0.81304839781955, 0.842362586883822, 0.855450011554693, + 0.825812625223718, 0.753630966286062, 0.783339682052806, + 0.795746895615772, 0.765681166007827, 0.693478099193017, + 0.723554532739539, 0.735216199953265, 0.704751233898703, + 0.632645080383886, 0.663061589788451, 0.673917042626837, + 0.643082851354971, 0.571188734464537, 0.601916907424211, + 0.611910282508987, 0.580737713663003, 0.509167298077226, + 0.540178016270881, 0.549258381420125, 0.517779049177247, + 0.446640287975871, 0.477903793026548, 0.486025262632459, + 0.454271476087672, 0.383668366201461, 0.415154327088666, + 0.422276166063226, 0.390280856038781, 0.320313202663026, + 0.351990784432243, 0.358077500485292, 0.325874144931804, + 0.256637335435452, 0.288475269049239, 0.293496693089926, + 0.261119241248049, 0.192704029090632, 0.224670682263042, + 0.228602036742523, 0.196084832236997, 0.128577131382859, + 0.160640580236746, 0.163462535277297, 0.130840238317598, + 0.0643209286131319, 0.0964490299979956, 0.0981477471814081, + 0.0654552560452185, -2.38851149613114e-16, 0.0321604643065659, + 0.0327276280226091, -2.43578646448058e-16, 1.34641193268366, + 1.34947230621111, 1.35253267973856, 1.37908496732026, 1.37610364825728, + 1.3731223291943, 1.33869579490222, 1.34255386379294, 1.3692832334255, + 1.3654441376567, 1.32938968955299, 1.3340427422276, 1.36075018099398, + 1.35605622433127, 1.31850264158268, 1.32394616556783, 1.35051225912141, + 1.34496829391156, 1.30604725728151, 1.31227494943209, 1.33858109804409, + 1.33219390217663, 1.29203969572592, 1.29904347650372, 1.32497216372973, + 1.31775042528283, 1.27649963217308, 1.2842696639495, 1.30970472284204, + 1.30165902040125, 1.25945021349006, 1.26797492283157, 1.29280179909557, + 1.28394457778989, 1.24091800571877, 1.25018410960442, 1.27429012109956, + 1.26463566440923, 1.22093293389534, 1.23092546980706, 1.25420006180905, + 1.24376445920887, 1.19952821426025, 1.21023057407779, 1.23256556972038, + 1.22136668023189, 1.17674027901287, 1.18813424663656, 1.20942409196693, + 1.19748150370196, 1.15260869378084, 1.16467448639686, 1.18481648948929, + 1.17215147527661, 1.12717606799118, 1.13989238088601, 1.15878694447211, + 1.14542241366761, 1.10048795834622, 1.1138320131687, 1.13138286025725, + 1.11734330684688, 1.07259276562304, 1.08654036198463, 1.10265475395993, + 1.08796620107298, 1.01578653889181, 1.04418965225742, 1.05934770956117, + 1.03072921804935, 0.957878118093046, 0.986832328492428, 1.00151812161594, + 0.972307025182534, 0.898923753853008, 0.928400935973027, + 0.942533567501441, 0.912760109820348, 0.838982066196272, + 0.86895291002464, 0.882455808494587, 0.852151507168826, + 0.778113911752505, 0.808547988974389, 0.821349082333005, + 0.790546657497183, 0.716382245896632, 0.747248078824569, + 0.759279957695873, 0.728013257894562, 0.653851980134662, + 0.685117113015647, 0.696317183404458, 0.664621108914353, + 0.590589835058245, 0.622220907596454, 0.63253153268392, + 0.600441956453488, 0.526664189201078, 0.558627012129661, + 0.567995642839198, 0.535549329224909, 0.46214492413953, + 0.494404556670304, 0.502783850708149, 0.470018372191388, + 0.397103266188396, 0.429624095163963, 0.4369720242647, 0.403925676338011, + 0.331611625050385, 0.36435744561939, 0.370637390753488, + 0.337349105168965, 0.265743429784855, 0.29867752741762, + 0.303858361745313, 0.270367618321661, 0.199572962467374, + 0.232658196126115, 0.236714355509706, 0.203061092697751, + 0.133175189916931, 0.166374076192153, 0.169285617107008, + 0.135510141516264, 0.0666255938719744, 0.0999003918944527, + 0.101653036607497, 0.0677959316987304, -2.48456222547603e-16, + 0.0333127969359871, 0.0338979658493651, -2.53333798647149e-16, + 1.4006545840591, 1.40355441621256, 1.40645424836601, 1.43382352941176, + 1.43100518416784, 1.42818683892391, 1.39301550634209, 1.3968350452006, + 1.4243868569757, 1.42058687502748, 1.38354326787196, 1.38827938710702, + 1.41580859322007, 1.41103031141265, 1.37224827400441, 1.37789577093818, + 1.40527928275495, 1.39952825409725, 1.35914505922236, 1.36569666661339, + 1.39281223518268, 1.3860962162681, 1.34425225421072, 1.35169865671654, + 1.37842514970336, 1.37075408313861, 1.32759254365183, 1.33592239893128, + 1.36214007502051, 1.35352606690241, 1.30919261483741, 1.31839257924462, + 1.34398335939367, 1.33444065188493, 1.28908309721323, 1.29913785602532, + 1.32398559095108, 1.31353053001724, 1.26729849299359, 1.27819079510341, + 1.30218152839777, 1.2908325267783, 1.24387709900267, 1.25558779599813, + 1.27861002227587, 1.26638751777344, 1.21886091991995, 1.23136900946131, + 1.25331392695569, 1.24024033613795, 1.19229557312609, 1.20557824652302, + 1.22634000355676, 1.21243967097557, 1.16423018536485, 1.17826287924547, + 1.19773881401883, 1.18303795706209, 1.13471728145526, 1.14947373341005, + 1.16756460656286, 1.15209125606363, 1.103812665306, 1.11926497338063, + 1.13587519280133, 1.11965912953902, 1.04613167195021, 1.0749721686281, + 1.09059662769504, 1.06153412585106, 0.987179898644007, 1.01665578529711, + 1.03179344897827, 1.00205277210548, 0.927022199817452, 0.957101049230729, + 0.971668530960017, 0.941284289814556, 0.865726161709766, + 0.896374180763609, 0.910292553032631, 0.879300816250706, + 0.803361949264774, 0.83454405548727, 0.847739028641536, + 0.816177241032366, 0.740002147184736, 0.771682048224755, + 0.784084138753638, 0.75199103647491, 0.67572159550265, 0.707861871343693, + 0.719406559282928, 0.686822082090947, 0.610597220045507, + 0.643159407774078, 0.653787282864236, 0.620752483637526, + 0.54470785817255, 0.577652539109029, 0.587309435378859, + 0.553866387120192, 0.478134080183304, 0.511420969177927, + 0.520058087647705, 0.486249788175219, 0.410958006799922, + 0.444546043491613, 0.452120062718526, 0.417990337261833, + 0.343263123137349, 0.377110564968635, 0.383583739183782, + 0.349177141105732, 0.275134089582677, 0.309198606360013, + 0.314538850974712, 0.279900560843692, 0.20665655001214, + 0.240895319797408, 0.245076284085111, 0.210252007326529, + 0.137916937780192, 0.172286743896166, 0.175287870685325, + 0.14032373404412, 0.0690022799201557, 0.103459608850174, + 0.105266181092851, 0.0702086281415811, -2.58361454011295e-16, + 0.0345011399600777, 0.0351043140707904, -2.63389109375442e-16, + 1.45654095214289, 1.45927537803223, 1.46200980392157, 1.49019607843137, + 1.48754557189662, 1.48489506536187, 1.44898126964378, 1.45276111089333, + 1.48113536481097, 1.47737566426008, 1.43933786371575, 1.44415956667976, + 1.47251054013946, 1.46764541601885, 1.42762256195407, 1.43348021283491, + 1.46168114291486, 1.45571686981088, 1.41385188546446, 1.42073722370926, + 1.44866221223585, 1.44160755466081, 1.39804701143748, 1.40594944845097, + 1.43347374719859, 1.42533993973636, 1.3802337251754, 1.38914036830644, + 1.41614066159237, 1.40694138344838, 1.36044236168014, 1.37033804342777, + 1.39669272746187, 1.38644407147535, 1.33870773693479, 1.34957504930747, + 1.37516450766385, 1.36388494385235, 1.3150690690342, 1.3268884029845, + 1.35159527757122, 1.3393056112901, 1.28956988934335, 1.30231947918877, + 1.32602893610167, 1.31275226091325, 1.26225794388483, 1.27591391661409, + 1.29851390627248, 1.28427555163172, 1.23318508517877, 1.2477215145318, + 1.26910302550684, 1.25393049938197, 1.20240715478014, 1.21779611997945, + 1.23785342594008, 1.22177635249819, 1.16998385677972, 1.18619550577993, + 1.204826404997, 1.18787645749581, 1.13597862255511, 1.15298123966742, + 1.17008728653351, 1.15229811557121, 1.07739635449522, 1.10668748852517, + 1.1227783493553, 1.09325858313938, 1.01736961193894, 1.04738298321708, + 1.06297251745589, 1.03268645177239, 0.955972113841424, 0.98667086289018, + 1.00167319482034, 0.970659937868292, 0.893280684360033, + 0.924626399100728, 0.938960245168826, 0.907260552469359, + 0.82937507882287, 0.861327881591451, 0.874916734541367, + 0.842572916613375, 0.764337803057328, 0.796856440940099, + 0.80962874312656, 0.776684569639746, 0.69825392648785, 0.731295864772589, + 0.743185170262249, 0.709685770884753, 0.631210889426322, + 0.664732407957086, 0.675677533049935, 0.641669295215117, + 0.563298304991643, 0.597254597208982, 0.607199759039106, + 0.572730222863095, 0.494607756107192, 0.528953030549418, + 0.53784797345113, 0.502965724039164, 0.42523258803604, 0.459920172071616, + 0.467720281424706, 0.432474838810247, 0.355267696923918, + 0.390250142479979, 0.396916545776175, 0.361358252742103, + 0.284809314828917, 0.320038505876417, 0.325538160778123, + 0.289718068814142, 0.213954791724929, 0.249382053276923, + 0.253687822468736, 0.217657576123329, 0.142802374972643, + 0.178378583348786, 0.181469296012248, 0.145281015901166, + 0.0714509867576759, 0.10712668086516, 0.108987180637468, + 0.0726933453737706, -2.6856684400419e-16, 0.0357254933788378, + 0.0363466726868852, -2.73744578632938e-16, 1.51407103693502, + 1.51663519167013, 1.51919934640523, 1.54820261437909, 1.54572481144363, + 1.54324700850817, 1.50659308480728, 1.51033206087115, 1.53952875693133, + 1.53581050535449, 1.49677347708436, 1.50168328094582, 1.53085602175218, + 1.52590153814987, 1.48462550543166, 1.49069949125801, 1.51971783960115, + 1.51353414105244, 1.47016773600779, 1.47739662071972, 1.5061310292036, + 1.49872791735476, 1.45342396740621, 1.461795851707, 1.49011795621541, + 1.48150799507606, 1.43442317674378, 1.44392357207499, 1.47170648255761, + 1.46190497003917, 1.41319945401824, 1.42381131538101, 1.45092990330015, + 1.43995483656114, 1.38979192488346, 1.40149568945085, 1.42782687123785, + 1.41569890591457, 1.36424466201718, 1.37701829345032, 1.40244130932942, + 1.38918371274427, 1.33660658528228, 1.35042562364973, 1.37482231119779, + 1.36046090965131, 1.3069313509075, 1.32176896809489, 1.3450240299173, + 1.32958715018328, 1.27527722993888, 1.29110429042319, 1.31310555533954, + 1.29662396049579, 1.24170697623706, 1.25849210308797, 1.27913078023586, + 1.26163759997592, 1.20628768431961, 1.22399733027833, 1.24316825555966, + 1.22469891114341, 1.16909063737038, 1.18768916084499, 1.20529103515648, + 1.18588315916955, 1.10958058652685, 1.13933561194862, 1.15589287454194, + 1.12590258991433, 1.04844725797783, 1.07901392225234, 1.0950553270488, + 1.06420806418328, 0.985773495924924, 1.01711037695138, 1.03254755908242, + 1.00088705398156, 0.921645634147072, 0.953709565035998, + 0.968458884903171, 0.936030715824785, 0.856153300426792, + 0.888899467286932, 0.902882200032497, 0.86973368424021, + 0.789389213514407, 0.8227712569706, 0.835913770814639, 0.802093857389069, + 0.721448973090261, 0.755419093302334, 0.76765301634242, 0.73321217529577, + 0.65243084320069, 0.686939908145476, 0.698202283241016, + 0.663192391186262, 0.582435529658357, 0.617433186429523, + 0.62766661381994, 0.592140836453618, 0.511565951911194, + 0.547000740784775, 0.556153508118421, 0.520166179783224, + 0.43992700989675, 0.475746480903972, 0.483772680383238, + 0.447379180983252, 0.367625346410091, 0.403776178153421, + 0.410635810530666, 0.37389244007808, 0.294769105523577, + 0.331197225966834, 0.336856291155545, 0.299820142233011, + 0.221467687605741, 0.258118396564659, 0.262548970660582, + 0.225277799088153, 0.147831501494284, 0.184649594550013, + 0.187829893087778, 0.150381987087402, 0.0739717143845348, + 0.110901607939409, 0.11281603524135, 0.075250083395299, + -2.79072392526287e-16, 0.0369858571922673, 0.0376250416976494, + -2.84400206419637e-16, 1.5732448384355, 1.57563385712625, + 1.57802287581699, 1.6078431372549, 1.60554290280886, 1.60324266836283, + 1.5658509518326, 1.56954789513405, 1.59956703333677, 1.59589139831071, + 1.55585010797778, 1.56085052990519, 1.59084503805821, 1.5857986778057, + 1.54325710443718, 1.54955360620748, 1.57938937281381, 1.57298006782193, + 1.52809261085236, 1.53567485764477, 1.56521868608594, 1.55745730434995, + 1.5103831221169, 1.51923786648463, 1.54835777675384, 1.53925824915773, + 1.49016089835696, 1.50027201023693, 1.52883753791625, 1.51841682667476, + 1.46746389185172, 1.47881239510434, 1.50669488690853, 1.4949729471423, + 1.44233566105923, 1.45489977645548, 1.4819726816731, 1.46897241620389, + 1.41482527194254, 1.42858046650089, 1.45471962367235, 1.44046683114081, + 1.38498718681947, 1.399906229381, 1.42499014756422, 1.40951346398762, + 1.35288114098796, 1.36893416390371, 1.39284429789013, 1.37617513179264, + 1.31857200740642, 1.33572657419719, 1.35834759305484, 1.34052005431705, + 1.2821296497356, 1.30035082857101, 1.32157087690617, 1.30262169949528, + 1.24362876407492, 1.26287920690526, 1.28259015825086, 1.26255861700643, + 1.20314870975179, 1.22338873691336, 1.24148643867024, 1.22041426033404, + 1.14268436804511, 1.17291653889845, 1.18994020325496, 1.15946614617589, + 1.0804128367607, 1.1115486024029, 1.12804187775701, 1.09661760933813, + 1.01642634606795, 1.04841959141433, 1.06429162374624, 1.03196563815435, + 0.950821011070884, 0.983623678569419, 0.998788472235667, + 0.965611306316983, 0.883696614076541, 0.917258812573712, + 0.931635425114927, 0.897659543912871, 0.815156378555975, + 0.849426496316258, 0.862939221817876, 0.828218899722881, + 0.745306735309884, 0.78023155693293, 0.79281009752344, 0.757401295323999, + 0.674257081368612, 0.709781908339248, 0.72136153343748, + 0.685321771550961, 0.60211953217269, 0.638188306770651, + 0.648709999721361, 0.612098227891762, 0.529008667595311, + 0.565564099884001, 0.57497469164958, 0.537851155407398, + 0.455041272382051, 0.492024969988681, 0.500277259594124, + 0.46270336378085, 0.38033607159587, 0.417688671988961, 0.424741533447255, + 0.386779703113661, 0.305013461666655, 0.342674766631263, + 0.34849324210698, 0.310206781100299, 0.229195237654577, + 0.267104349660616, 0.27165972866065, 0.233112676221, 0.153004317345115, + 0.191099777499846, 0.194369661911914, 0.155626647602827, + 0.0765644628007326, 0.114784390072924, 0.116752744904497, + 0.0778788422061662, -2.89878099577587e-16, 0.0382822314003662, + 0.038939421103083, -2.95355992735538e-16, 1.63406235664432, + 1.63627137440059, 1.63848039215686, 1.66911764705882, 1.66699984599232, + 1.66488204492582, 1.62675487071973, 1.63040861368203, 1.66125019402729, + 1.65761834312875, 1.61656775639602, 1.62166131355788, 1.65247758905755, + 1.64733683498635, 1.60351735897064, 1.61004255768333, 1.64069574255285, + 1.63405465011935, 1.58762650999817, 1.5955719344844, 1.62592518288286, + 1.61779571564638, 1.56892447556955, 1.57827549278386, 1.60819320881387, + 1.59859070198137, 1.54744689001496, 1.55818568279226, 1.58753382766827, + 1.57647695335516, 1.52323567518057, 1.53534128259776, 1.563987678287, + 1.55149840321884, 1.49633894546211, 1.50978731032134, 1.53760193896958, + 1.52370547472032, 1.46681089881027, 1.48157492213619, 1.50843022060002, + 1.49315496647972, 1.43471169395491, 1.45076129638259, 1.47653244520096, + 1.4599099239222, 1.40010731412621, 1.41740950404056, 1.44197471019099, + 1.42403949645978, 1.3630694175814, 1.3815883658538, 1.40482913865276, + 1.38561878084574, 1.32367517527577, 1.34337229642858, 1.365173715951, + 1.34472865105626, 1.28200709604566, 1.30284113566071, 1.32309211307057, + 1.30145557508488, 1.23815283969936, 1.26007996787251, 1.27867349707478, + 1.25589141906468, 1.17670769904997, 1.20743026937467, 1.22492033549437, + 1.19394925192406, 1.11326634828754, 1.14498702366875, 1.1619321695805, + 1.12991508723695, 1.04793066427051, 1.08059850627902, 1.09690538881181, + 1.06389569038667, 0.980806815131469, 1.01436873970099, 1.02994900716631, + 0.996002323945954, 0.912005019772115, 0.946405917451792, + 0.961176409788657, 0.926350495631359, 0.841639298182031, + 0.876822158977073, 0.89070509613627, 0.855059696641181, + 0.769827213146719, 0.805733255664375, 0.81865641380531, 0.78225313096944, + 0.696689603930087, 0.733258408538403, 0.745155283639326, + 0.708057436309212, 0.622350312534644, 0.659519958232366, + 0.67032991674337, 0.632602397177527, 0.546935903159542, + 0.584643107847093, 0.594311524044606, 0.556020650911686, + 0.470575375491944, 0.508755639325743, 0.517234019057362, + 0.478447387203039, 0.393399872481254, 0.431987623986599, + 0.439233714525943, 0.400020041848847, 0.315542383258152, + 0.354471127869703, 0.360449013632426, 0.320877985416005, + 0.237137441871435, 0.276339912564794, 0.281020096468938, + 0.24116220752187, 0.158320822525135, 0.197729132198285, + 0.201088602484656, 0.161014997447442, 0.0792292320062692, + 0.118775027265702, 0.120797309626907, 0.0805796218063722, + -3.0098396515809e-16, 0.0396146160031344, 0.040289810903186, + -3.06611937580643e-16, 1.6965235915615, 1.69854774349317, + 1.70057189542484, 1.73202614379085, 1.73009564099401, 1.72816513819717, + 1.68930484146868, 1.69291421651509, 1.72457823900289, 1.72099133980861, + 1.67892642233908, 1.68411563190388, 1.71575367475021, 1.71051600969182, + 1.66540626903202, 1.67216634568555, 1.70363694881826, 1.6967578879447, + 1.64876943344521, 1.65708785123862, 1.68825051959437, 1.67974315124404, + 1.62904802776417, 1.63890873060469, 1.66962425239551, 1.65950535354697, + 1.60628115171777, 1.61766458974097, 1.64779535181367, 1.63608535008037, + 1.5805148040048, 1.59339797786128, 1.62280827743556, 1.60953120479075, + 1.55180177809209, 1.56615829104844, 1.5947146431273, 1.57989808146386, + 1.52020154262036, 1.53600166035623, 1.56357310011243, 1.547248118761, + 1.48578010668861, 1.50299082465449, 1.52944920410801, 1.51165028945502, + 1.44860987032225, 1.46719498850543, 1.49241526681987, 1.47318024418472, + 1.4087694604638, 1.42868966539303, 1.45255019213329, 1.43192014008187, + 1.36634355285757, 1.38755650666069, 1.40993929737037, 1.38795845465887, + 1.32142268023182, 1.34388311654469, 1.36467412001882, 1.34138978537876, + 1.27410302721308, 1.29776285372245, 1.31685221037012, 1.29231463536147, + 1.21165057954146, 1.24287680337727, 1.26083327126017, 1.22935190715886, + 1.14700779255834, 1.1793291860499, 1.1967262025193, 1.16410049787973, + 1.0802864505326, 1.11364712154547, 1.13038885427913, 1.09667721067852, + 1.01160304632883, 1.04594474843071, 1.06194048969511, 1.0272037687117, + 0.941078517513516, 0.976340781921171, 0.991505154053685, + 0.955806539395674, 0.868837972392574, 0.904958244953045, + 0.919211393769821, 0.882616248143968, 0.795010406600766, + 0.83192418949667, 0.84519196518803, 0.807767682232092, 0.719728410885115, + 0.757369408742941, 0.769583533846555, 0.731399385461018, + 0.643127870744219, 0.681428140814667, 0.692526364885965, + 0.653653344310911, 0.565347658603887, 0.604237764674053, 0.6141640053035, + 0.574674666296089, 0.486529319226429, 0.525938488915158, + 0.534642958772954, 0.494611251249819, 0.406816749066243, + 0.446673034146336, 0.454112353766729, 0.413613456283639, + 0.326355870298068, 0.366586309682155, 0.372723605731885, + 0.331833755180131, 0.245294300256317, 0.285825085277193, + 0.290630074085447, 0.249426392990764, 0.163781017034345, + 0.204537658645331, 0.207986714806006, 0.166547036621247, + 0.0819660220011447, 0.122873519517745, 0.124949729408582, + 0.0833524221959171, -3.12389989267796e-16, 0.0409830110005722, + 0.0416762110979584, -3.1816804095495e-16, 1.76062854318702, + 1.76246296440397, 1.76429738562092, 1.79656862745098, 1.79483028781392, + 1.79309194817686, 1.75350086407944, 1.75706470363323, 1.78955116826357, + 1.78601038835028, 1.74292610580696, 1.7482134849432, 1.78067329513619, + 1.7753362019221, 1.72892383462134, 1.73592497021415, 1.76821299161004, + 1.76108978129798, 1.7115213811935, 1.72022260790742, 1.75219469622046, + 1.74329961114295, 1.69075377870075, 1.70113757994712, 1.73265090749874, + 1.72200220385453, 1.66666368346539, 1.67870873108307, 1.70962211035246, + 1.6972420168504, 1.63930127832439, 1.65298248089489, 1.68315668435422, + 1.66907135185804, 1.60872415894917, 1.62401271863678, 1.65331079414627, + 1.63755023643449, 1.57499720337283, 1.591860681161, 1.62014826220958, + 1.60274628798466, 1.53819242502056, 1.5565948141967, 1.58374042428538, + 1.5647345605861, 1.49838880957608, 1.51829061729832, 1.54416596777677, + 1.52359737496744, 1.45567213605364, 1.47703047281486, 1.50151075349643, + 1.47942413202542, 1.41013478248099, 1.43290345926732, 1.45586762116426, + 1.43231111030311, 1.36187551663341, 1.3860051495572, 1.40733617909558, + 1.38236124788806, 1.31099927229294, 1.33643739446318, 1.35602257855624, + 1.32968390922441, 1.24751300951957, 1.27925614090625, 1.29767901055234, + 1.26567411188027, 1.18163716957311, 1.21457508954634, 1.23242397657338, + 1.19917384126649, 1.11349370485421, 1.14756543721366, 1.1647420201482, + 1.1303101990299, 1.04320970466295, 1.07835170475858, 1.09476291982206, + 1.05921564061421, 0.970917107300744, 1.00706340598185, 1.02262165791001, + 0.986027675205814, 0.896752401187606, 0.933834754244175, + 0.948458114718529, 0.910888554231244, 0.820856315672025, + 0.858804358429815, 0.8724167516716, 0.833944949111957, 0.743373502233697, + 0.782114908952861, 0.794646284059166, 0.755347619006376, + 0.664452206801414, 0.703912854517555, 0.715299344149146, + 0.675251069291916, 0.584243933928347, 0.624348070364881, + 0.634532135426261, 0.593813201560606, 0.502903103585505, + 0.543573518756926, 0.552504078740899, 0.511194955921192, + 0.420586701350837, 0.461744902468171, 0.469377451169613, + 0.427559946418035, 0.337453922786403, 0.37902031206862, + 0.385317018405355, 0.343074090392675, 0.253665812809222, + 0.295559867797812, 0.300489661510178, 0.257905232627681, + 0.169384900872745, 0.211525356840983, 0.215063998875961, + 0.172222765124242, 0.0847748327853589, 0.127079866829052, + 0.129210004249521, 0.0861972433748008, -3.24096171906704e-16, + 0.0423874163926793, 0.0430986216874002, -3.30024302858459e-16, + 1.82637721152088, 1.82801703713299, 1.8296568627451, 1.86274509803922, + 1.86120378645206, 1.8596624748649, 1.81934293855202, 1.82286007503645, + 1.85616898180933, 1.85267548875376, 1.80856680679966, 1.81395487267584, + 1.84723645021548, 1.84179741167721, 1.79407005573859, 1.80131843126912, + 1.8344238709282, 1.82705033017919, 1.77588235324302, 1.7849762044908, + 1.81775771276114, 1.80846509534309, 1.75404172837929, 1.76496204081115, + 1.79727317412357, 1.78608125290405, 1.72859448525782, 1.74131810681855, + 1.77301410328464, 1.75994695366523, 1.69959509813937, 1.71409479169859, + 1.74503289904297, 1.7301188444207, 1.66710608803337, 1.68335059308637, + 1.71339039202647, 1.69666193963224, 1.63119788106767, 1.64915198455052, + 1.67815570689146, 1.65964947415068, 1.59194864895077, 1.61157326500922, + 1.63940610573306, 1.61916273731544, 1.5494441318877, 1.57069639041923, + 1.5972268130617, 1.57529088880796, 1.50377744435091, 1.52661078811931, + 1.55171082274218, 1.5281307566764, 1.45504886414604, 1.47941315424848, + 1.50295868733269, 1.47778661798897, 1.40336560525042, 1.42920723469823, + 1.45107829030088, 1.42436996261279, 1.34884157493896, 1.37610359009469, + 1.39618460163315, 1.36799924065351, 1.28429498898429, 1.31656828196162, + 1.3354575533709, 1.3029158660883, 1.21715447933185, 1.25072473415807, + 1.26902549174276, 1.23513511739721, 1.14755242723536, 1.1823534532836, + 1.19996488641901, 1.16479465544081, 1.07562679013386, 1.11158960868461, + 1.12841629754716, 1.0920379396535, 1.0015207891338, 1.03857378963383, + 1.05452592135764, 1.01701390306178, 0.925382584567126, 0.963451686850462, + 0.978445258982394, 0.939876614903007, 0.847364940360495, + 0.88637376246381, 0.90033077325602, 0.860784931609033, 0.767624877975832, + 0.807494909168164, 0.82034353427716, 0.779902136945288, + 0.686323320706229, 0.726974099341031, 0.738648854532915, + 0.697395572120542, 0.603624729132922, 0.644974024919575, + 0.655415914412889, 0.613436256705237, 0.519696728569174, + 0.561660728851048, 0.570817378961196, 0.528198501217156, + 0.434709729335035, 0.477203228952104, 0.485029006734596, + 0.441859512252036, 0.348836540723156, 0.391773135029096, + 0.398229251652837, 0.354598991053638, 0.26225197953015, + 0.305544260126653, 0.310598858743129, 0.26659872643262, + 0.175132474040334, 0.218692226785242, 0.222320454694523, + 0.178042182956426, 0.087655664358912, 0.131394069199623, + 0.133578134149725, 0.0891140853430233, -3.36102513074816e-16, + 0.0438278321794558, 0.0445570426715115, -3.42180723291172e-16, + 1.89376959656309, 1.89520996168024, 1.89665032679739, 1.93055555555556, + 1.92921613690842, 1.92787671826128, 1.88683106488641, 1.89030033072475, + 1.92443167964017, 1.92098664101906, 1.87584852531717, 1.88133979510179, + 1.91544313998809, 1.90989963895713, 1.86084493238377, 1.86834672885047, + 1.90226958677273, 1.89463953458834, 1.84185234959378, 1.85134864098877, + 1.8849395692164, 1.87523960384447, 1.8189118767998, 1.83038211319679, + 1.86349105227, 1.85174250069554, 1.79207355709506, 1.80549271694743, + 1.83797133061021, 1.82420016052488, 1.76139626344972, 1.77673491027239, + 1.80843692150181, 1.79267368247873, 1.72694756534466, 1.74417191439719, + 1.77495343676791, 1.75723319105708, 1.68880357570488, 1.70787557052477, + 1.73759543415808, 1.71795767725908, 1.64704877847923, 1.66792617709206, + 1.69644624845105, 1.67493481964303, 1.60177583725711, 1.62441230786817, + 1.65159780267465, 1.62826078570626, 1.55308538535561, 1.57743061130636, + 1.60315039987054, 1.57804001403482, 1.50108579785272, 1.52708559160416, + 1.55121249587564, 1.52438497771646, 1.44589294608286, 1.47348937196779, + 1.4959004536347, 1.46741592955294, 1.38762993515113, 1.41676144061699, + 1.43733827960084, 1.40726062964875, 1.32199651793563, 1.35481322654338, + 1.37416889971585, 1.34107716978296, 1.25355972183456, 1.2877781198851, + 1.30653074802743, 1.27198432627191, 1.18246261767603, 1.21801116975529, + 1.23605745309158, 1.20013057991125, 1.10885430274153, 1.14565846020878, + 1.1629006228704, 1.12567066582956, 1.03288956301268, 1.0708719328771, + 1.08721794439657, 1.04876522296357, 0.954728522531133, 0.993809042771906, + 1.00917282656142, 0.969580430159259, 0.874536280666177, + 0.914632401598655, 0.92893402994129, 0.888287629723321, + 0.792482538111521, 0.833509409388849, 0.846675284500537, + 0.805062939277753, 0.708741212458665, 0.750611875285093, + 0.76257489603727, 0.720086852796788, 0.62349004421761, 0.666115628338137, + 0.676815342263385, 0.633543831729983, 0.536910194177433, + 0.580200119197522, 0.589582859433847, 0.545621887137711, + 0.449185833018839, 0.493048013598136, 0.501067020461677, + 0.456512153785642, 0.360503724108329, 0.404844778563584, + 0.411460305474331, 0.36640845716302, 0.271052800419102, + 0.315778262263715, 0.320957665784302, 0.275506874405583, + 0.181023736537113, 0.226038268478108, 0.229756082261692, 0.1840052901178, + 0.0906085167218039, 0.135816126629459, 0.138054119109193, + 0.0921029481005846, -3.4840901277213e-16, 0.0453042583609018, + 0.0460514740502921, -3.54637302253088e-16, 1.96280569831365, + 1.96404173804571, 1.96527777777778, 2, 1.99943358938626, + 1.99773467836602, 1.95596524308261, 1.95938547069813, 1.99490422922051, + 1.99094384514617, 1.9447712613595, 1.95036825222105, 1.98585576934658, + 1.97964288376187, 1.92924846455688, 1.93700986295819, 1.97230870743637, + 1.96385739452541, 1.90943137024577, 1.91933991740133, 1.95429373194232, + 1.94362313664708, 1.88536422396227, 1.89739779710402, 1.93185165257814, + 1.91898594722899, 1.85710089897711, 1.87123256146969, 1.90503330787172, + 1.89000163742934, 1.82470477425544, 1.84090283661627, 1.87389944999952, + 1.85673586603214, 1.78824859088306, 1.80647668256925, 1.83852060716333, + 1.81926399070904, 1.74781428728446, 1.76803143908376, 1.79897692382121, + 1.77767089730985, 1.70349281360595, 1.72565355044521, 1.75535797913451, + 1.73205080756888, 1.65538392568431, 1.67943836964513, 1.7077625840423, + 1.68250706566236, 1.60359595906775, 1.62948994237603, 1.65629855742274, + 1.62915190410067, 1.54824558360102, 1.57592077133438, 1.60108248184872, + 1.57210618948557, 1.48945753913073, 1.51885156136587, 1.54223943949077, + 1.51149914870852, 1.42736435292944, 1.45841094603009, 1.47990272876577, + 1.44746807621014, 1.36061759637359, 1.39399097465152, 1.41421356237309, + 1.38015802296422, 1.29085289708124, 1.32573524672741, 1.3453207474025, + 1.30972146789057, 1.21822427617623, 1.25453858662873, 1.27338034823818, + 1.23631797244121, 1.14289224248598, 1.1805582593311, 1.19855533302269, + 1.1601138191424, 1.06502342893738, 1.10395783571168, 1.12101520448179, + 1.08128163491119, 0.984790215079629, 1.02490682200851, 1.04093561594614, + 0.999999999999998, 0.902370336589071, 0.94358027583435, + 0.958497973440113, 0.91645304345482, 0.817946482640763, + 0.860158409614917, 0.873889024738718, 0.830830026003772, + 0.731705882058721, 0.774826182349742, 0.787300436323882, + 0.743324911320654, 0.643839879182413, 0.687772880620567, + 0.698928359198196, 0.654135926634843, 0.554543500410285, + 0.599191689796349, 0.608972984539814, 0.563465113682859, + 0.464015012402248, 0.509279256406266, 0.517638090205041, + 0.471517871018853, 0.37245547294192, 0.418235242672084, + 0.425130579105953, 0.37850248872082, 0.280068275476077, + 0.326261874208998, 0.331660010508748, 0.28462967654657, + 0.187058688363082, 0.233563481919579, 0.23743812531461, + 0.190112086608364, 0.0936333898740347, 0.140346039118559, + 0.142678366398464, 0.0951638316474848, -3.61015670998647e-16, + 0.0468166949370172, 0.0475953950922149, -3.67394039744206e-16, + 1.99943358938626, 1.96404173804571, 1.99773467836602, 1.96280569831365, + 1.92787671826128, 1.92921613690842, 1.99490422922051, 1.95938547069813, + 1.99094384514617, 1.95596524308261, 1.92098664101906, 1.92443167964017, + 1.98585576934658, 1.95036825222105, 1.97964288376187, 1.9447712613595, + 1.90989963895713, 1.91544313998809, 1.97230870743637, 1.93700986295819, + 1.96385739452541, 1.92924846455688, 1.89463953458834, 1.90226958677273, + 1.95429373194232, 1.91933991740133, 1.94362313664708, 1.90943137024577, + 1.87523960384447, 1.8849395692164, 1.93185165257814, 1.89739779710402, + 1.91898594722899, 1.88536422396227, 1.85174250069554, 1.86349105227, + 1.90503330787172, 1.87123256146969, 1.89000163742934, 1.85710089897711, + 1.82420016052488, 1.83797133061021, 1.87389944999952, 1.84090283661627, + 1.85673586603215, 1.82470477425544, 1.79267368247874, 1.80843692150181, + 1.83852060716333, 1.80647668256925, 1.81926399070904, 1.78824859088306, + 1.75723319105708, 1.77495343676791, 1.79897692382121, 1.76803143908376, + 1.77767089730985, 1.74781428728446, 1.71795767725908, 1.73759543415808, + 1.75535797913451, 1.72565355044521, 1.73205080756888, 1.70349281360595, + 1.67493481964303, 1.69644624845106, 1.7077625840423, 1.67943836964513, + 1.68250706566236, 1.65538392568431, 1.62826078570627, 1.65159780267465, + 1.65629855742274, 1.62948994237603, 1.62915190410067, 1.60359595906775, + 1.57804001403482, 1.60315039987054, 1.60108248184872, 1.57592077133438, + 1.57210618948558, 1.54824558360102, 1.52438497771646, 1.55121249587564, + 1.54223943949078, 1.51885156136587, 1.51149914870852, 1.48945753913073, + 1.46741592955294, 1.4959004536347, 1.47990272876577, 1.45841094603009, + 1.44746807621014, 1.42736435292944, 1.40726062964875, 1.43733827960084, + 1.4142135623731, 1.39399097465152, 1.38015802296422, 1.36061759637359, + 1.34107716978296, 1.37416889971585, 1.34532074740251, 1.32573524672741, + 1.30972146789057, 1.29085289708124, 1.27198432627191, 1.30653074802743, + 1.27338034823818, 1.25453858662873, 1.23631797244121, 1.21822427617623, + 1.20013057991125, 1.23605745309158, 1.19855533302269, 1.1805582593311, + 1.1601138191424, 1.14289224248598, 1.12567066582956, 1.1629006228704, + 1.12101520448179, 1.10395783571168, 1.0812816349112, 1.06502342893739, + 1.04876522296358, 1.08721794439657, 1.04093561594614, 1.02490682200851, + 1, 0.98479021507963, 0.96958043015926, 1.00917282656142, + 0.958497973440114, 0.943580275834351, 0.916453043454821, + 0.902370336589071, 0.888287629723321, 0.928934029941291, + 0.873889024738719, 0.860158409614917, 0.830830026003773, + 0.817946482640764, 0.805062939277754, 0.846675284500538, + 0.787300436323883, 0.774826182349743, 0.743324911320655, + 0.731705882058722, 0.720086852796789, 0.762574896037272, + 0.698928359198197, 0.687772880620568, 0.654135926634843, + 0.643839879182413, 0.633543831729983, 0.676815342263386, + 0.608972984539814, 0.59919168979635, 0.563465113682859, + 0.554543500410286, 0.545621887137712, 0.589582859433848, + 0.517638090205042, 0.509279256406267, 0.471517871018855, + 0.464015012402249, 0.456512153785643, 0.501067020461678, + 0.425130579105953, 0.418235242672085, 0.37850248872082, 0.37245547294192, + 0.36640845716302, 0.411460305474332, 0.331660010508748, + 0.326261874208999, 0.284629676546571, 0.280068275476077, + 0.275506874405584, 0.320957665784302, 0.237438125314611, + 0.233563481919581, 0.190112086608366, 0.187058688363084, + 0.184005290117802, 0.229756082261693, 0.142678366398465, + 0.140346039118559, 0.0951638316474848, 0.0936333898740347, + 0.0921029481005846, 0.138054119109193, 0.0475953950922152, + 0.0468166949370174, 1.22464679914735e-16, 1.20338556999549e-16, + 1.18212434084363e-16, 0.0460514740502924, 1.89520996168024, + 1.89376959656309, 1.8596624748649, 1.86120378645206, 1.89030033072475, + 1.88683106488641, 1.85267548875376, 1.85616898180933, 1.88133979510179, + 1.87584852531717, 1.84179741167721, 1.84723645021548, 1.86834672885047, + 1.86084493238377, 1.82705033017919, 1.8344238709282, 1.85134864098877, + 1.84185234959378, 1.80846509534309, 1.81775771276114, 1.83038211319679, + 1.8189118767998, 1.78608125290405, 1.79727317412357, 1.80549271694743, + 1.79207355709506, 1.75994695366523, 1.77301410328464, 1.77673491027239, + 1.76139626344972, 1.7301188444207, 1.74503289904297, 1.74417191439719, + 1.72694756534466, 1.69666193963224, 1.71339039202647, 1.70787557052477, + 1.68880357570488, 1.65964947415068, 1.67815570689146, 1.66792617709206, + 1.64704877847923, 1.61916273731544, 1.63940610573306, 1.62441230786817, + 1.60177583725711, 1.57529088880796, 1.5972268130617, 1.57743061130636, + 1.55308538535561, 1.5281307566764, 1.55171082274218, 1.52708559160417, + 1.50108579785272, 1.47778661798897, 1.50295868733269, 1.47348937196779, + 1.44589294608286, 1.42436996261279, 1.45107829030088, 1.416761440617, + 1.38762993515113, 1.36799924065351, 1.39618460163315, 1.35481322654338, + 1.32199651793563, 1.30291586608831, 1.33545755337091, 1.2877781198851, + 1.25355972183456, 1.23513511739722, 1.26902549174276, 1.21801116975529, + 1.18246261767603, 1.16479465544081, 1.19996488641901, 1.14565846020878, + 1.10885430274153, 1.0920379396535, 1.12841629754716, 1.07087193287711, + 1.03288956301268, 1.01701390306178, 1.05452592135764, 0.993809042771907, + 0.954728522531134, 0.939876614903009, 0.978445258982395, + 0.914632401598656, 0.874536280666177, 0.860784931609033, + 0.900330773256021, 0.833509409388849, 0.792482538111521, + 0.779902136945289, 0.820343534277161, 0.750611875285094, + 0.708741212458666, 0.697395572120543, 0.738648854532916, + 0.666115628338138, 0.62349004421761, 0.613436256705238, 0.65541591441289, + 0.580200119197522, 0.536910194177434, 0.528198501217156, + 0.570817378961197, 0.493048013598137, 0.44918583301884, + 0.441859512252037, 0.485029006734597, 0.404844778563584, + 0.360503724108329, 0.354598991053638, 0.398229251652837, + 0.315778262263716, 0.271052800419103, 0.266598726432621, + 0.31059885874313, 0.226038268478109, 0.181023736537115, + 0.178042182956428, 0.222320454694524, 0.135816126629459, + 0.090608516721804, 0.0891140853430233, 0.133578134149725, + 0.0453042583609021, 1.1613633759071e-16, 1.14060241097057e-16, + 0.0445570426715117, 1.82801703713299, 1.82637721152088, 1.79309194817686, + 1.79483028781392, 1.82286007503645, 1.81934293855202, 1.78601038835028, + 1.78955116826357, 1.81395487267584, 1.80856680679966, 1.7753362019221, + 1.78067329513619, 1.80131843126912, 1.79407005573859, 1.76108978129798, + 1.76821299161004, 1.7849762044908, 1.77588235324302, 1.74329961114295, + 1.75219469622046, 1.76496204081115, 1.75404172837929, 1.72200220385453, + 1.73265090749874, 1.74131810681855, 1.72859448525782, 1.6972420168504, + 1.70962211035246, 1.71409479169859, 1.69959509813937, 1.66907135185804, + 1.68315668435422, 1.68335059308637, 1.66710608803337, 1.63755023643449, + 1.65331079414627, 1.64915198455052, 1.63119788106767, 1.60274628798466, + 1.62014826220958, 1.61157326500922, 1.59194864895077, 1.5647345605861, + 1.58374042428538, 1.57069639041924, 1.5494441318877, 1.52359737496744, + 1.54416596777677, 1.52661078811931, 1.50377744435091, 1.47942413202542, + 1.50151075349643, 1.47941315424848, 1.45504886414604, 1.43231111030311, + 1.45586762116426, 1.42920723469823, 1.40336560525042, 1.38236124788806, + 1.40733617909559, 1.37610359009469, 1.34884157493896, 1.32968390922441, + 1.35602257855624, 1.31656828196162, 1.28429498898429, 1.26567411188027, + 1.29767901055234, 1.25072473415807, 1.21715447933185, 1.19917384126649, + 1.23242397657338, 1.1823534532836, 1.14755242723536, 1.1303101990299, + 1.1647420201482, 1.11158960868461, 1.07562679013386, 1.05921564061421, + 1.09476291982206, 1.03857378963383, 1.0015207891338, 0.986027675205815, + 1.02262165791001, 0.963451686850463, 0.925382584567127, + 0.910888554231245, 0.94845811471853, 0.886373762463811, + 0.847364940360495, 0.833944949111957, 0.872416751671601, + 0.807494909168164, 0.767624877975833, 0.755347619006377, + 0.794646284059167, 0.726974099341032, 0.68632332070623, + 0.675251069291917, 0.715299344149147, 0.644974024919576, + 0.603624729132922, 0.593813201560606, 0.634532135426262, + 0.561660728851048, 0.519696728569174, 0.511194955921192, + 0.552504078740899, 0.477203228952105, 0.434709729335036, + 0.427559946418036, 0.469377451169614, 0.391773135029096, + 0.348836540723156, 0.343074090392675, 0.385317018405355, + 0.305544260126654, 0.262251979530151, 0.257905232627681, + 0.300489661510178, 0.218692226785243, 0.175132474040335, + 0.172222765124243, 0.215063998875962, 0.131394069199624, + 0.0876556643589121, 0.0861972433748008, 0.129210004249522, + 0.0438278321794561, 1.12034171024939e-16, 1.1000810095282e-16, + 0.0430986216874005, 1.76246296440397, 1.76062854318702, 1.72816513819717, + 1.73009564099401, 1.75706470363323, 1.75350086407944, 1.72099133980861, + 1.72457823900289, 1.7482134849432, 1.74292610580696, 1.71051600969182, + 1.71575367475021, 1.73592497021415, 1.72892383462134, 1.6967578879447, + 1.70363694881826, 1.72022260790742, 1.7115213811935, 1.67974315124404, + 1.68825051959437, 1.70113757994712, 1.69075377870075, 1.65950535354697, + 1.66962425239551, 1.67870873108307, 1.66666368346539, 1.63608535008037, + 1.64779535181367, 1.65298248089489, 1.6393012783244, 1.60953120479075, + 1.62280827743556, 1.62401271863679, 1.60872415894917, 1.57989808146386, + 1.5947146431273, 1.591860681161, 1.57499720337283, 1.54724811876101, + 1.56357310011243, 1.5565948141967, 1.53819242502056, 1.51165028945502, + 1.52944920410801, 1.51829061729832, 1.49838880957608, 1.47318024418472, + 1.49241526681987, 1.47703047281486, 1.45567213605364, 1.43192014008187, + 1.45255019213329, 1.43290345926732, 1.41013478248099, 1.38795845465887, + 1.40993929737037, 1.3860051495572, 1.36187551663341, 1.34138978537876, + 1.36467412001882, 1.33643739446318, 1.31099927229294, 1.29231463536147, + 1.31685221037012, 1.27925614090625, 1.24751300951957, 1.22935190715886, + 1.26083327126017, 1.21457508954634, 1.18163716957311, 1.16410049787973, + 1.1967262025193, 1.14756543721366, 1.11349370485421, 1.09667721067852, + 1.13038885427913, 1.07835170475858, 1.04320970466296, 1.0272037687117, + 1.06194048969511, 1.00706340598185, 0.970917107300745, 0.955806539395675, + 0.991505154053686, 0.933834754244176, 0.896752401187607, + 0.882616248143969, 0.919211393769822, 0.858804358429816, + 0.820856315672025, 0.807767682232093, 0.845191965188031, + 0.782114908952861, 0.743373502233698, 0.731399385461018, + 0.769583533846556, 0.703912854517556, 0.664452206801415, + 0.653653344310912, 0.692526364885965, 0.624348070364881, + 0.584243933928348, 0.574674666296089, 0.614164005303501, + 0.543573518756927, 0.502903103585506, 0.49461125124982, + 0.534642958772954, 0.461744902468172, 0.420586701350838, + 0.413613456283639, 0.45411235376673, 0.37902031206862, 0.337453922786403, + 0.331833755180131, 0.372723605731885, 0.295559867797813, + 0.253665812809223, 0.249426392990765, 0.290630074085448, + 0.211525356840984, 0.169384900872746, 0.166547036621248, + 0.207986714806007, 0.127079866829052, 0.084774832785359, + 0.0833524221959172, 0.124949729408583, 0.0423874163926796, + 1.08032057302235e-16, 1.0605601365165e-16, 0.0416762110979586, + 1.69854774349317, 1.6965235915615, 1.66488204492582, 1.66699984599232, + 1.69291421651509, 1.68930484146868, 1.65761834312875, 1.66125019402729, + 1.68411563190388, 1.67892642233908, 1.64733683498635, 1.65247758905755, + 1.67216634568555, 1.66540626903202, 1.63405465011935, 1.64069574255285, + 1.65708785123862, 1.64876943344521, 1.61779571564638, 1.62592518288286, + 1.63890873060469, 1.62904802776417, 1.59859070198137, 1.60819320881387, + 1.61766458974097, 1.60628115171777, 1.57647695335516, 1.58753382766827, + 1.59339797786128, 1.5805148040048, 1.55149840321884, 1.563987678287, + 1.56615829104844, 1.55180177809209, 1.52370547472032, 1.53760193896958, + 1.53600166035623, 1.52020154262036, 1.49315496647972, 1.50843022060002, + 1.50299082465449, 1.48578010668861, 1.4599099239222, 1.47653244520096, + 1.46719498850543, 1.44860987032225, 1.42403949645978, 1.44197471019099, + 1.42868966539303, 1.4087694604638, 1.38561878084574, 1.40482913865276, + 1.38755650666069, 1.36634355285757, 1.34472865105626, 1.365173715951, + 1.3438831165447, 1.32142268023182, 1.30145557508488, 1.32309211307057, + 1.29776285372245, 1.27410302721308, 1.25589141906468, 1.27867349707478, + 1.24287680337727, 1.21165057954146, 1.19394925192406, 1.22492033549437, + 1.1793291860499, 1.14700779255834, 1.12991508723695, 1.1619321695805, + 1.11364712154547, 1.0802864505326, 1.06389569038667, 1.09690538881181, + 1.04594474843071, 1.01160304632883, 0.996002323945955, 1.02994900716631, + 0.976340781921172, 0.941078517513517, 0.92635049563136, + 0.961176409788657, 0.904958244953046, 0.868837972392575, + 0.855059696641182, 0.890705096136271, 0.831924189496671, + 0.795010406600767, 0.78225313096944, 0.818656413805311, + 0.757369408742941, 0.719728410885116, 0.708057436309213, + 0.745155283639327, 0.681428140814668, 0.64312787074422, + 0.632602397177528, 0.67032991674337, 0.604237764674054, + 0.565347658603888, 0.556020650911687, 0.594311524044607, + 0.525938488915159, 0.486529319226429, 0.478447387203039, + 0.517234019057363, 0.446673034146337, 0.406816749066244, + 0.400020041848848, 0.439233714525944, 0.366586309682156, + 0.326355870298068, 0.320877985416005, 0.360449013632427, + 0.285825085277193, 0.245294300256318, 0.241162207521871, + 0.281020096468938, 0.204537658645332, 0.163781017034346, + 0.161014997447443, 0.201088602484657, 0.122873519517745, + 0.0819660220011448, 0.0805796218063723, 0.120797309626908, + 0.0409830110005724, 1.04129996422599e-16, 1.02203979193547e-16, + 0.0402898109031862, 1.63627137440059, 1.63406235664432, 1.60324266836283, + 1.60554290280886, 1.63040861368203, 1.62675487071973, 1.59589139831071, + 1.59956703333677, 1.62166131355788, 1.61656775639602, 1.5857986778057, + 1.59084503805821, 1.61004255768333, 1.60351735897064, 1.57298006782193, + 1.57938937281381, 1.5955719344844, 1.58762650999817, 1.55745730434995, + 1.56521868608594, 1.57827549278386, 1.56892447556955, 1.53925824915773, + 1.54835777675384, 1.55818568279226, 1.54744689001496, 1.51841682667476, + 1.52883753791625, 1.53534128259776, 1.52323567518057, 1.4949729471423, + 1.50669488690853, 1.50978731032134, 1.49633894546211, 1.46897241620389, + 1.4819726816731, 1.48157492213619, 1.46681089881027, 1.44046683114081, + 1.45471962367235, 1.45076129638259, 1.43471169395491, 1.40951346398762, + 1.42499014756422, 1.41740950404056, 1.40010731412621, 1.37617513179264, + 1.39284429789013, 1.3815883658538, 1.3630694175814, 1.34052005431705, + 1.35834759305484, 1.34337229642859, 1.32367517527577, 1.30262169949528, + 1.32157087690617, 1.30284113566072, 1.28200709604566, 1.26255861700643, + 1.28259015825086, 1.26007996787251, 1.23815283969936, 1.22041426033404, + 1.24148643867024, 1.20743026937467, 1.17670769904997, 1.15946614617589, + 1.18994020325496, 1.14498702366876, 1.11326634828754, 1.09661760933813, + 1.12804187775701, 1.08059850627902, 1.04793066427051, 1.03196563815435, + 1.06429162374624, 1.01436873970099, 0.980806815131469, 0.965611306316984, + 0.998788472235667, 0.946405917451793, 0.912005019772116, + 0.897659543912872, 0.931635425114928, 0.876822158977074, + 0.841639298182032, 0.828218899722882, 0.862939221817877, + 0.805733255664376, 0.76982721314672, 0.757401295323999, + 0.792810097523441, 0.733258408538404, 0.696689603930087, + 0.685321771550961, 0.72136153343748, 0.659519958232366, + 0.622350312534645, 0.612098227891763, 0.648709999721362, + 0.584643107847094, 0.546935903159542, 0.537851155407398, + 0.574974691649581, 0.508755639325744, 0.470575375491945, + 0.46270336378085, 0.500277259594124, 0.4319876239866, 0.393399872481255, + 0.386779703113662, 0.424741533447256, 0.354471127869704, + 0.315542383258152, 0.310206781100299, 0.34849324210698, + 0.276339912564794, 0.237137441871436, 0.233112676221001, + 0.27165972866065, 0.197729132198286, 0.158320822525136, + 0.155626647602828, 0.194369661911915, 0.118775027265703, + 0.0792292320062693, 0.0778788422061663, 0.116752744904497, + 0.0396146160031347, 1.0032798838603e-16, 9.84519975785127e-17, + 0.0389394211030832, 1.57563385712625, 1.5732448384355, 1.54324700850817, + 1.54572481144363, 1.56954789513405, 1.5658509518326, 1.53581050535449, + 1.53952875693133, 1.56085052990519, 1.55585010797778, 1.52590153814987, + 1.53085602175218, 1.54955360620748, 1.54325710443718, 1.51353414105244, + 1.51971783960115, 1.53567485764477, 1.52809261085236, 1.49872791735476, + 1.5061310292036, 1.51923786648463, 1.5103831221169, 1.48150799507606, + 1.49011795621541, 1.50027201023693, 1.49016089835696, 1.46190497003917, + 1.47170648255761, 1.47881239510434, 1.46746389185172, 1.43995483656114, + 1.45092990330015, 1.45489977645548, 1.44233566105923, 1.41569890591457, + 1.42782687123785, 1.42858046650089, 1.41482527194254, 1.38918371274427, + 1.40244130932942, 1.399906229381, 1.38498718681947, 1.36046090965131, + 1.37482231119779, 1.36893416390371, 1.35288114098796, 1.32958715018328, + 1.3450240299173, 1.33572657419719, 1.31857200740642, 1.29662396049579, + 1.31310555533954, 1.30035082857101, 1.2821296497356, 1.26163759997592, + 1.27913078023586, 1.26287920690526, 1.24362876407492, 1.22469891114341, + 1.24316825555967, 1.22338873691336, 1.20314870975179, 1.18588315916955, + 1.20529103515648, 1.17291653889845, 1.14268436804511, 1.12590258991433, + 1.15589287454194, 1.1115486024029, 1.0804128367607, 1.06420806418328, + 1.0950553270488, 1.04841959141433, 1.01642634606795, 1.00088705398156, + 1.03254755908242, 0.983623678569419, 0.950821011070885, + 0.936030715824785, 0.968458884903171, 0.917258812573713, + 0.883696614076541, 0.86973368424021, 0.902882200032498, + 0.849426496316259, 0.815156378555976, 0.80209385738907, 0.83591377081464, + 0.78023155693293, 0.745306735309885, 0.73321217529577, 0.76765301634242, + 0.709781908339248, 0.674257081368612, 0.663192391186263, + 0.698202283241017, 0.638188306770652, 0.602119532172691, + 0.592140836453619, 0.627666613819941, 0.565564099884001, + 0.529008667595311, 0.520166179783224, 0.556153508118422, + 0.492024969988681, 0.455041272382051, 0.447379180983253, + 0.483772680383239, 0.417688671988961, 0.380336071595871, + 0.37389244007808, 0.410635810530667, 0.342674766631263, + 0.305013461666655, 0.299820142233011, 0.336856291155546, + 0.267104349660616, 0.229195237654577, 0.225277799088154, + 0.262548970660583, 0.191099777499846, 0.153004317345115, + 0.150381987087403, 0.187829893087778, 0.114784390072924, + 0.0765644628007327, 0.0752500833952991, 0.112816035241351, + 0.0382822314003664, 9.66260331925291e-17, 9.48000688065455e-17, + 0.0376250416976496, 1.51663519167013, 1.51407103693502, 1.48489506536187, + 1.48754557189662, 1.51033206087115, 1.50659308480728, 1.47737566426008, + 1.48113536481097, 1.50168328094582, 1.49677347708436, 1.46764541601885, + 1.47251054013946, 1.49069949125801, 1.48462550543166, 1.45571686981088, + 1.46168114291486, 1.47739662071972, 1.47016773600779, 1.44160755466081, + 1.44866221223585, 1.461795851707, 1.45342396740621, 1.42533993973636, + 1.43347374719859, 1.44392357207499, 1.43442317674378, 1.40694138344838, + 1.41614066159237, 1.42381131538101, 1.41319945401824, 1.38644407147535, + 1.39669272746187, 1.40149568945085, 1.38979192488346, 1.36388494385235, + 1.37516450766385, 1.37701829345032, 1.36424466201718, 1.3393056112901, + 1.35159527757122, 1.35042562364973, 1.33660658528228, 1.31275226091325, + 1.32602893610167, 1.32176896809489, 1.3069313509075, 1.28427555163172, + 1.29851390627248, 1.29110429042319, 1.27527722993888, 1.25393049938197, + 1.26910302550684, 1.25849210308797, 1.24170697623706, 1.22177635249819, + 1.23785342594008, 1.22399733027833, 1.20628768431961, 1.18787645749581, + 1.204826404997, 1.18768916084499, 1.16909063737038, 1.15229811557121, + 1.17008728653351, 1.13933561194862, 1.10958058652686, 1.09325858313938, + 1.1227783493553, 1.07901392225234, 1.04844725797783, 1.03268645177239, + 1.06297251745589, 1.01711037695138, 0.985773495924924, 0.970659937868292, + 1.00167319482034, 0.953709565035998, 0.921645634147073, 0.90726055246936, + 0.938960245168826, 0.888899467286933, 0.856153300426793, + 0.842572916613375, 0.874916734541367, 0.8227712569706, 0.789389213514408, + 0.776684569639746, 0.809628743126561, 0.755419093302335, + 0.721448973090262, 0.709685770884753, 0.74318517026225, + 0.686939908145476, 0.65243084320069, 0.641669295215118, + 0.675677533049935, 0.617433186429524, 0.582435529658357, + 0.572730222863096, 0.607199759039107, 0.547000740784776, + 0.511565951911194, 0.502965724039165, 0.53784797345113, + 0.475746480903972, 0.43992700989675, 0.432474838810247, + 0.467720281424706, 0.403776178153421, 0.367625346410092, + 0.361358252742104, 0.396916545776176, 0.331197225966835, + 0.294769105523577, 0.289718068814142, 0.325538160778123, + 0.258118396564659, 0.221467687605742, 0.21765757612333, + 0.253687822468736, 0.184649594550013, 0.147831501494285, + 0.145281015901167, 0.181469296012249, 0.11090160793941, + 0.0739717143845349, 0.0726933453737708, 0.108987180637469, + 0.0369858571922675, 9.30241308420957e-17, 9.12481928776459e-17, + 0.0363466726868854, 1.45927537803223, 1.45654095214289, 1.42818683892391, + 1.43100518416784, 1.45276111089333, 1.44898126964378, 1.42058687502748, + 1.4243868569757, 1.44415956667976, 1.43933786371575, 1.41103031141265, + 1.41580859322007, 1.43348021283491, 1.42762256195407, 1.39952825409725, + 1.40527928275495, 1.42073722370926, 1.41385188546446, 1.3860962162681, + 1.39281223518268, 1.40594944845097, 1.39804701143748, 1.37075408313861, + 1.37842514970336, 1.38914036830644, 1.3802337251754, 1.35352606690241, + 1.36214007502051, 1.37033804342777, 1.36044236168014, 1.33444065188493, + 1.34398335939367, 1.34957504930747, 1.33870773693479, 1.31353053001724, + 1.32398559095108, 1.3268884029845, 1.3150690690342, 1.2908325267783, + 1.30218152839777, 1.30231947918877, 1.28956988934335, 1.26638751777344, + 1.27861002227587, 1.27591391661409, 1.26225794388483, 1.24024033613795, + 1.2533139269557, 1.2477215145318, 1.23318508517877, 1.21243967097557, + 1.22634000355676, 1.21779611997945, 1.20240715478014, 1.18303795706209, + 1.19773881401883, 1.18619550577993, 1.16998385677972, 1.15209125606363, + 1.16756460656286, 1.15298123966742, 1.13597862255511, 1.11965912953902, + 1.13587519280133, 1.10668748852517, 1.07739635449522, 1.06153412585106, + 1.09059662769504, 1.04738298321708, 1.01736961193894, 1.00205277210548, + 1.03179344897827, 0.98667086289018, 0.955972113841424, 0.941284289814556, + 0.971668530960018, 0.924626399100728, 0.893280684360033, + 0.879300816250707, 0.910292553032631, 0.861327881591452, + 0.829375078822871, 0.816177241032366, 0.847739028641536, 0.7968564409401, + 0.764337803057328, 0.751991036474911, 0.784084138753638, + 0.731295864772589, 0.69825392648785, 0.686822082090947, + 0.719406559282929, 0.664732407957086, 0.631210889426322, + 0.620752483637526, 0.653787282864237, 0.597254597208983, + 0.563298304991644, 0.553866387120192, 0.587309435378859, + 0.528953030549418, 0.494607756107192, 0.486249788175219, + 0.520058087647706, 0.459920172071616, 0.42523258803604, + 0.417990337261833, 0.452120062718526, 0.390250142479979, + 0.355267696923918, 0.349177141105733, 0.383583739183783, + 0.320038505876418, 0.284809314828917, 0.279900560843692, + 0.314538850974712, 0.249382053276924, 0.21395479172493, + 0.210252007326529, 0.245076284085111, 0.178378583348787, + 0.142802374972644, 0.140323734044121, 0.175287870685325, + 0.10712668086516, 0.071450986757676, 0.0702086281415812, + 0.105266181092851, 0.035725493378838, 8.95222813347299e-17, + 8.77963697918139e-17, 0.0351043140707907, 1.40355441621256, + 1.4006545840591, 1.3731223291943, 1.37610364825728, 1.3968350452006, + 1.39301550634209, 1.3654441376567, 1.3692832334255, 1.38827938710702, + 1.38354326787196, 1.35605622433127, 1.36075018099398, 1.37789577093818, + 1.37224827400441, 1.34496829391156, 1.35051225912141, 1.36569666661339, + 1.35914505922236, 1.33219390217663, 1.33858109804409, 1.35169865671654, + 1.34425225421072, 1.31775042528283, 1.32497216372973, 1.33592239893128, + 1.32759254365183, 1.30165902040125, 1.30970472284204, 1.31839257924462, + 1.30919261483741, 1.28394457778989, 1.29280179909557, 1.29913785602532, + 1.28908309721323, 1.26463566440923, 1.27429012109956, 1.27819079510341, + 1.26729849299359, 1.24376445920887, 1.25420006180905, 1.25558779599813, + 1.24387709900267, 1.22136668023189, 1.23256556972038, 1.23136900946131, + 1.21886091991996, 1.19748150370196, 1.20942409196693, 1.20557824652302, + 1.19229557312609, 1.17215147527661, 1.18481648948929, 1.17826287924547, + 1.16423018536485, 1.14542241366761, 1.15878694447211, 1.14947373341005, + 1.13471728145526, 1.11734330684688, 1.13138286025725, 1.11926497338063, + 1.103812665306, 1.08796620107298, 1.10265475395993, 1.0749721686281, + 1.04613167195021, 1.03072921804936, 1.05934770956117, 1.01665578529711, + 0.987179898644007, 0.972307025182535, 1.00151812161594, + 0.957101049230729, 0.927022199817452, 0.912760109820348, + 0.942533567501441, 0.896374180763609, 0.865726161709766, + 0.852151507168826, 0.882455808494587, 0.834544055487271, + 0.803361949264775, 0.790546657497184, 0.821349082333005, + 0.771682048224756, 0.740002147184737, 0.728013257894563, + 0.759279957695873, 0.707861871343693, 0.67572159550265, + 0.664621108914353, 0.696317183404458, 0.643159407774079, + 0.610597220045507, 0.600441956453488, 0.632531532683921, + 0.577652539109029, 0.544707858172551, 0.53554932922491, + 0.567995642839199, 0.511420969177927, 0.478134080183304, + 0.470018372191389, 0.502783850708149, 0.444546043491613, + 0.410958006799922, 0.403925676338011, 0.4369720242647, 0.377110564968636, + 0.343263123137349, 0.337349105168966, 0.370637390753489, + 0.309198606360013, 0.275134089582677, 0.270367618321661, + 0.303858361745314, 0.240895319797409, 0.206656550012141, + 0.203061092697752, 0.236714355509707, 0.172286743896167, + 0.137916937780193, 0.135510141516265, 0.169285617107008, + 0.103459608850174, 0.0690022799201559, 0.0677959316987305, + 0.101653036607498, 0.034501139960078, 8.61204846704317e-17, + 8.44445995490495e-17, 0.0338979658493653, 1.34947230621111, + 1.34641193268366, 1.31970153617303, 1.32284096416495, 1.34255386379294, + 1.33869579490222, 1.31194745214773, 1.31582449416038, 1.3340427422276, + 1.32938968955299, 1.3027231547747, 1.30733530346122, 1.32394616556783, + 1.31850264158268, 1.29203698925379, 1.29738007201425, 1.31227494943209, + 1.30604725728151, 1.27990061238639, 1.28596880082009, 1.29904347650372, + 1.29203969572592, 1.26632896616902, 1.2731147892777, 1.2842696639495, + 1.27649963217308, 1.25134024394491, 1.25883460505696, 1.26797492283157, + 1.25945021349006, 1.23495584919023, 1.24314804656757, 1.25018410960442, + 1.24091800571877, 1.21720034702832, 1.22607809810927, 1.23092546980706, + 1.22093293389534, 1.19810140858181, 1.20765087780507, 1.21023057407779, + 1.19952821426025, 1.1776897482886, 1.18789557843521, 1.18813424663656, + 1.17674027901287, 1.15599905432377, 1.16684440130619, 1.16467448639686, + 1.15260869378084, 1.13306591228508, 1.14453248330442, 1.13989238088601, + 1.12717606799118, 1.10892972231476, 1.12099781729992, 1.1138320131687, + 1.10048795834622, 1.08363260984556, 1.09628116608016, 1.08654036198463, + 1.07259276562304, 1.05721933017309, 1.07042597000933, 1.04418965225742, + 1.01578653889181, 1.00084385973427, 1.02903159495368, 0.986832328492429, + 0.957878118093046, 0.943449211003558, 0.972146535368913, + 0.928400935973027, 0.898923753853008, 0.885087397885669, + 0.914268304444613, 0.86895291002464, 0.838982066196272, + 0.825812625223718, 0.855450011554694, 0.808547988974389, + 0.778113911752505, 0.765681166007827, 0.795746895615773, + 0.747248078824569, 0.716382245896633, 0.704751233898703, + 0.735216199953265, 0.685117113015648, 0.653851980134663, + 0.643082851354971, 0.673917042626837, 0.622220907596454, + 0.590589835058245, 0.580737713663003, 0.611910282508987, + 0.558627012129662, 0.526664189201078, 0.517779049177247, + 0.549258381420125, 0.494404556670304, 0.46214492413953, + 0.454271476087672, 0.48602526263246, 0.429624095163963, + 0.397103266188396, 0.390280856038781, 0.422276166063226, + 0.364357445619391, 0.331611625050385, 0.325874144931805, + 0.358077500485293, 0.29867752741762, 0.265743429784855, + 0.261119241248049, 0.293496693089927, 0.232658196126115, + 0.199572962467375, 0.196084832236998, 0.228602036742523, + 0.166374076192153, 0.133175189916931, 0.130840238317598, + 0.163462535277298, 0.099900391894453, 0.0666255938719746, + 0.0654552560452187, 0.0981477471814084, 0.0333127969359873, + 8.28187408492011e-17, 8.11928821493527e-17, 0.0327276280226094, + 1.29702904802789, 1.29381299801657, 1.26792445986011, 1.27121713189084, + 1.28991756667036, 1.28602213532416, 1.26009681850058, 1.26401063918035, + 1.28144963204149, 1.27687712875883, 1.25103110274296, 1.25556396062177, + 1.27163139672385, 1.26638566468888, 1.24073434012396, 1.24588272143346, + 1.26047207216539, 1.25455847964189, 1.22921634689739, 1.23497534351068, + 1.24798390781249, 1.24140933598309, 1.21648970579716, 1.22285302634728, + 1.23418216336111, 1.22695499073914, 1.20256973753337, 1.20952972166527, + 1.21908507418861, 1.21121515763808, 1.18747446608593, 1.19502210180965, + 1.20271381004475, 1.19421246245142, 1.17122457787452, 1.17934952198023, + 1.18509242709545, 1.17597239173947, 1.15384337489713, 1.16253397638583, + 1.16624781342778, 1.15652323511608, 1.13535672194356, 1.14460004842034, + 1.14620962813983, 1.13589602116357, 1.11579298800337, 1.12557485497347, + 1.1250102341533, 1.11412444714303, 1.09518298200098, 1.10548798500217, + 1.10268462490108, 1.09124480265914, 1.07355988300353, 1.08437143250225, + 1.07927034505588, 1.06729588745261, 1.05095916505966, 1.0622595240316, + 1.05480740547942, 1.04231892350622, 1.02741851683935, 1.03918884094951, + 1.01433993941313, 0.986360955320033, 0.971878050905798, + 0.999648283872576, 0.957912612803043, 0.929464270286054, + 0.915479329568549, 0.943678690237174, 0.900570523117074, + 0.871676775948094, 0.858266154010519, 0.886872741789534, + 0.842362586883822, 0.81304839781955, 0.800284170415383, + 0.829275162212951, 0.783339682052806, 0.753630966286062, + 0.741580766564297, 0.77093246848984, 0.72355453273954, 0.693478099193017, + 0.682204964487331, 0.711892865525814, 0.663061589788452, + 0.632645080383886, 0.622207309412801, 0.652206136950066, + 0.601916907424212, 0.571188734464537, 0.561639755266071, + 0.591923532339436, 0.540178016270882, 0.509167298077226, + 0.500555546977205, 0.531097651121638, 0.477903793026549, + 0.446640287975871, 0.43900909986407, 0.469782323420637, + 0.415154327088666, 0.383668366201461, 0.377055876364142, + 0.408032488114106, 0.351990784432244, 0.320313202663026, + 0.314752260394248, 0.345904068379195, 0.288475269049239, + 0.256637335435452, 0.252155429622856, 0.283453845008552, + 0.224670682263042, 0.192704029090632, 0.189323225944267, + 0.220739327783561, 0.160640580236746, 0.12857713138286, + 0.126314024448121, 0.157818625196194, 0.096449029997996, + 0.0643209286131321, 0.0631866011810456, 0.0947503128145835, + 0.0321604643065661, 7.96170498710381e-17, 7.80412175927235e-17, + 0.0315933005905228, 1.2462246416629, 1.24285778005783, 1.21779110025554, + 1.22123215143496, 1.23892615383287, 1.23499452760791, 1.20989223671524, + 1.21384166848539, 1.2305000565487, 1.22600558548949, 1.20098006823603, + 1.20543615247563, 1.22095146440625, 1.21589734332301, 1.19106034652206, + 1.19602020737904, 1.21028803481326, 1.20467872630351, 1.18014110570963, + 1.18560072611585, 1.19851995064287, 1.19236117498222, 1.16823264416727, + 1.17418687493845, 1.18565989716611, 1.17895861935, 1.15534750116664, + 1.16179007266696, 1.17172303331574, 1.16448744728147, 1.14150042847702, + 1.14842396482183, 1.15672695734632, 1.14896646741117, 1.12670835694783, + 1.13410439271242, 1.14069166696857, 1.13241686652597, 1.11099035815481, + 1.11884935755132, 1.12363951404807, 1.11486216157017, 1.09436760119678, + 1.10267897967579, 1.10559515397112, 1.09632814637207, 1.07686330474076, + 1.08561545296877, 1.08658548979235, 1.07684283321264, 1.05850268442431, + 1.06768299458253, 1.06663961129069, 1.05643638936873, 1.03931289573393, + 1.04890779007912, 1.04578872907158, 1.03514106877443, 1.01932297248919, + 1.02931793411156, 1.02406610386499, 1.01299113895556, 0.998563761071767, + 1.00894336678048, 0.985423030095216, 0.957854921234873, + 0.943831791563947, 0.971197776317857, 0.929896638228951, + 0.90193835522303, 0.88839738087751, 0.916114586220728, 0.873609810662869, + 0.845281266102708, 0.832296378194897, 0.860346879536203, + 0.816603211341154, 0.787925156579601, 0.77556614274382, + 0.803931260469358, 0.758919134722523, 0.729913112865446, + 0.718245459166594, 0.746905800955207, 0.700601409969668, + 0.671289707073889, 0.660374449660448, 0.689309954413521, + 0.641695301662106, 0.612100896250322, 0.601994483087843, + 0.631184466374145, 0.582247407257352, 0.552393918264382, + 0.543148081262693, 0.572571282175268, 0.522305551532688, + 0.492217184800994, 0.483878822624783, 0.513513451943738, + 0.46191867824666, 0.431620171692326, 0.424231243520582, + 0.454055033072683, 0.401136739265722, 0.370653306839119, + 0.364250737314095, 0.394240990417339, 0.340010581407195, + 0.309367855975272, 0.303983451556296, 0.334117094435196, + 0.27859183125487, 0.247815806534468, 0.243476183446081, + 0.273729817501189, 0.216932778208191, 0.186049749881913, + 0.182776273819559, 0.21312622863282, 0.155086256029945, + 0.124122762177978, 0.121931499907834, 0.152353886863697, + 0.0931055231608032, 0.0620882841436285, 0.0609899671062114, + 0.0914607335070229, 0.0310441420718143, 7.65154117359427e-17, + 7.49896058791619e-17, 0.0304949835531057, 1.19705908711613, + 1.19354627880743, 1.16930145735932, 1.17288602279731, 1.18957962528045, + 1.18561297175348, 1.16133370679171, 1.16531758207552, 1.18119401574922, + 1.17677505974497, 1.15257005125392, 1.15695187902282, 1.17190636861502, + 1.16703767748508, 1.14301500844809, 1.147792529851, 1.16172283737572, + 1.15640799726637, 1.13267488882311, 1.1378449486356, 1.15065160499484, + 1.14489521272331, 1.12155778127935, 1.12711633505123, 1.1387028653645, + 1.13251051800568, 1.10967353484472, 1.11561565806204, 1.12588880021296, + 1.11926708242024, 1.09703373636347, 1.1033536356041, 1.11222355150914, + 1.10518002059803, 1.08365168424824, 1.09034271030585, 1.09772318942644, + 1.09026635825484, 1.06954235835487, 1.07659702130155, 1.08240567593868, + 1.07454499362251, 1.05472238604825, 1.06213237220156, 1.06629082413043, + 1.05803665463835, 1.03921000453594, 1.04696619529209, 1.04940025331402, + 1.04076385198969, 1.02302501955507, 1.03111751204551, 1.03175734005482, + 1.02275082811994, 1.00618876050596, 1.01460689003051, 1.0133871652158, + 1.00402350231167, 0.988724032134141, 0.997456396320049, + 0.994316457141357, 0.984609411971048, 0.970655062870329, + 0.979689547502235, 0.957438924303689, 0.93026843663633, + 0.916705081708714, 0.943680072289521, 0.902784404770152, + 0.875300372903974, 0.862203364930438, 0.889454223319576, + 0.847518798610412, 0.81973722431685, 0.807178070438803, + 0.834690717684621, 0.791674783396637, 0.763612342476425, + 0.75165854220903, 0.779418306323916, 0.73528634698354, 0.706960351490655, + 0.695675243814717, 0.723666893011873, 0.678388710514952, + 0.64981706953925, 0.639259689418052, 0.667467466616384, + 0.621018248636609, 0.592219427733969, 0.582444372380096, + 0.610852030899074, 0.563212407095875, 0.534205386457781, + 0.525262691652869, 0.553853532016482, 0.505009617915082, + 0.475813849372383, 0.467748876119982, 0.496505783886425, + 0.446449212330639, 0.417084575288895, 0.409937907057209, + 0.438843391588595, 0.387571331695131, 0.358058088101368, + 0.35186543888864, 0.380901672972924, 0.328416836544245, + 0.298775584987123, 0.29356771841795, 0.322716578653295, + 0.269027214034513, 0.239278843081903, 0.235081502717725, + 0.264324610567837, 0.20944448396156, 0.179610124841217, + 0.176443975862874, 0.2057627392903, 0.149711103571751, 0.119812082302286, + 0.117692664696737, 0.147068320279806, 0.0898698713828747, + 0.0599276604634637, 0.058865353820716, 0.0882790092587265, + 0.0299638302317319, 7.35138264439148e-17, 7.20380470086678e-17, + 0.029432676910358, 1.14953238438759, 1.14587849426538, 1.12245553117144, + 1.12617874597788, 1.14187798101312, 1.13787746776086, 1.11442122873, + 1.11843837995072, 1.13353150964306, 1.12918555152527, 1.10580105179662, + 1.11011114026331, 1.12449610935017, 1.11980666717507, 1.09659832590205, + 1.10119968884934, 1.11477647985277, 1.10974629253047, 1.08681769623783, + 1.09170801106994, 1.10437887086842, 1.09901144920637, 1.07646511713339, + 1.08164140668561, 1.09331106795627, 1.08761068670617, 1.06554783856762, + 1.0710064778505, 1.08158237488028, 1.07555406305439, 1.0540743897453, + 1.05981111415646, 1.06920359253319, 1.06285312201199, 1.04205455977575, + 1.04806447476053, 1.05618699446904, 1.04952086692608, 1.0294993754973, + 1.03577696763652, 1.0425462990996, 1.03557173127311, 1.01642107649797, + 1.02296022599763, 1.02829663861777, 1.02102154596242, 1.00283308738891, + 1.00962708194344, 1.0134545247183, 1.00588750347417, 0.988749987393267, + 0.995791537391088, 0.998037811193476, 0.990188118912783, + 0.974187477319609, 0.981468732356438, 0.982065653488556, + 0.97394318806433, 0.959162343994519, 0.966674910657064, + 0.965558465308508, 0.957173742552686, 0.943692422235042, + 0.951427383114781, 0.930387622038546, 0.903601501524406, + 0.890497921340099, 0.91709517178757, 0.876575912426647, + 0.849550323328887, 0.836897281727336, 0.863697601533717, + 0.822297486959704, 0.795044650590521, 0.782911230742239, + 0.809904256234787, 0.767577303050271, 0.740109955510021, + 0.728561368811012, 0.755736299776625, 0.712441318835856, + 0.684772682161691, 0.673870120508666, 0.701215744659839, + 0.656916434375394, 0.629060186589098, 0.618860683760144, + 0.646365402134405, 0.601030430711963, 0.573000674834828, + 0.563556977289561, 0.591208830524852, 0.544811906939781, + 0.516623139044733, 0.507983586436597, 0.535770281863079, + 0.488290215418062, 0.459957291791392, 0.452165707462801, + 0.480074646949699, 0.431495395278485, 0.403033498765579, + 0.396129090473949, 0.424147398968375, 0.374458104376893, + 0.345882709988208, 0.339899981087776, 0.368014535780863, + 0.317209549843393, 0.288536389698579, 0.283505060979208, + 0.311702521033492, 0.259781417388168, 0.231026445077757, + 0.226971387437788, 0.255238224208498, 0.20220579952315, + 0.173385153968544, 0.170326332074213, 0.198648859756001, + 0.144515122862163, 0.115645091755783, 0.11359751881483, + 0.141961925444521, 0.0867420746642105, 0.0578390575726377, + 0.0568127613245594, 0.0852051400696945, 0.0289195287863189, + 7.06122939949546e-17, 6.91865409812414e-17, 0.0284063806622797, + 1.10364453347727, 1.09985442643167, 1.0772533216919, 1.08111032097667, + 1.09582122103086, 1.09178801563006, 1.06915480253011, 1.07320406211101, + 1.08751253823022, 1.08323706083038, 1.06067306986414, 1.06491393619713, + 1.07872068661169, 1.074204312393, 1.05181029888394, 1.05624168437404, + 1.0694489622444, 1.0646936120958, 1.04256952795378, 1.04718991341886, + 1.05970174826359, 1.05470988443139, 1.03295465172939, 1.03776208984158, + 1.04948450494143, 1.04425912545147, 1.02297041233532, 1.02796253203235, + 1.03880375731769, 1.03334838918391, 1.01262238862251, 1.01779640047891, + 1.02766708041848, 1.02198577165306, 1.00191698353037, 1.00726968607644, + 1.01608308209638, 1.0101803925397, 0.990861409582094, 0.996389196556232, + 1.00406138353083, 0.997942374521964, 0.979463672545954, + 0.985162541064024, 0.991612597433127, 0.98528282034429, 0.96773255329967, + 0.973598112922812, 0.978748304005185, 0.972213787666081, + 0.955677587938894, 0.961705070619282, 0.965481024706664, + 0.958748261747248, 0.943309046174887, 0.949493317056891, + 0.951824193889834, 0.94490012603242, 0.930637908070322, + 0.936973477122605, 0.937792128366447, 0.930684130700474, + 0.917675839165906, 0.924156873618114, 0.904269123299787, 0.8778541158991, + 0.865210310458101, 0.891443074812004, 0.851271161198434, + 0.824688206497769, 0.812479131268202, 0.838844720863152, + 0.797945875710745, 0.771203544923721, 0.759495859105203, + 0.785987495186702, 0.744310770302055, 0.717417995680389, + 0.706274622549766, 0.732885240827485, 0.690384050279471, + 0.663350104878553, 0.652830089248441, 0.679552355899104, + 0.636184581550994, 0.609019058223434, 0.599177432686724, + 0.626003760967583, 0.581731847888166, 0.554444637552899, + 0.545332297816237, 0.572254865251481, 0.527045906789069, + 0.499647176025238, 0.491310765613879, 0.518321531715058, + 0.47214734404163, 0.444647512058021, 0.437129316653241, 0.46422004113356, + 0.417057227090199, 0.389466942122377, 0.382804793770805, + 0.409967055212023, 0.361797057311009, 0.33412717249964, + 0.328354363911504, 0.355579578841154, 0.30638872130464, 0.27865027010964, + 0.273795479240071, 0.301074921575788, 0.250854441315834, + 0.223058612522029, 0.21914583760627, 0.246470658423171, + 0.195216724892961, 0.167374837263894, 0.164423342453575, + 0.191784590029922, 0.139498313901182, 0.111621790538471, + 0.109646062262112, 0.137034702357843, 0.0837221330048106, + 0.0558224754711505, 0.0548321896177417, 0.0822391259399267, + 0.0279112377355753, 6.7810814389062e-17, 6.64350877968825e-17, + 0.0274160948088709, 1.05939553438518, 1.05547407530631, 1.03369482892072, + 1.03768074779369, 1.05140934533369, 1.04734461536107, 1.02553442819203, + 1.02961462855637, 1.04313710151069, 1.03892958766031, 1.01718610545648, + 1.02136026682426, 1.03458010039958, 1.03023061313885, 1.00865092739377, + 1.01291851642513, 1.02574028455062, 1.02124995596238, 0.999930383970971, + 1.00429065568237, 1.01662023718037, 1.01199051839837, 0.991026385067353, + 0.995478384519162, 1.00722317631997, 1.00245583424158, 0.981941256147836, + 0.986483820607594, 0.997552947525188, 0.992650060808798, + 0.972677732995088, 0.977309494571462, 0.987614015165015, + 0.982577969521232, 0.963238955512094, 0.967958344253591, + 0.977411452308455, 0.972244935095678, 0.953628460609263, + 0.958433708060678, 0.966950929232376, 0.961656923369073, + 0.943850174192191, 0.948739317400727, 0.956238700576509, + 0.950820477783946, 0.933908402268221, 0.938879288230206, + 0.945281591174685, 0.939742704565423, 0.923807821191953, + 0.928858111730087, 0.934086980594382, 0.92843125662334, + 0.913553467071793, 0.918680644131873, 0.922662786419638, + 0.916894316215936, 0.90315072436155, 0.908352095716671, + 0.911017446315174, 0.905140576414413, 0.89260531366292, + 0.897878019012235, 0.879083428087412, 0.853026279760412, + 0.840842249062722, 0.866723781362821, 0.826870151085515, + 0.800714022410619, 0.788948913553036, 0.814895581307879, + 0.774463964863534, 0.748213907316449, 0.736931955527695, + 0.762940434540366, 0.72187518515199, 0.69553646298753, 0.684798303425294, + 0.710865129476494, 0.669114541314386, 0.642692619641242, + 0.632555150034043, 0.658676726729668, 0.61619315204175, + 0.589693684442258, 0.580209936197792, 0.606382543115918, + 0.56312250016522, 0.536551315888182, 0.527770333960126, + 0.553990135078959, 0.509914406643739, 0.483277497399297, + 0.475244229184715, 0.50150728157242, 0.456581003785784, + 0.429884510172271, 0.422639703691301, 0.448941966438008, + 0.40313470776578, 0.376384905359289, 0.369965016947774, + 0.396302360319537, 0.349588190497477, 0.322791475635664, + 0.317228587359824, 0.343596802153799, 0.295954350927985, + 0.269117226220306, 0.26443897320054, 0.290833780280182, + 0.242246285817513, 0.215375345414721, 0.211604853223171, + 0.238021913211855, 0.188477260070994, 0.161579174727267, + 0.15873500700096, 0.185169930112065, 0.134660676688807, + 0.107742178650348, 0.105838295038584, 0.132286651019772, + 0.0808100464046749, 0.0538779141590022, 0.0529236387002628, + 0.0793809668694232, 0.0269389570795011, 6.51093876262369e-17, + 6.37836874555913e-17, 0.0264618193501314, 1.01678538711132, + 1.0127374408893, 0.99178005285788, 0.99589002642894, 1.0086423539216, + 1.00454726695389, 0.98356010571576, 0.98767007928682, 1.00040519948448, + 0.996263132015062, 0.975340158573641, 0.979450132144701, + 0.992074350713853, 0.987885569412644, 0.967120211431521, + 0.971230185002581, 0.983650446771415, 0.979415324130186, + 0.958900264289401, 0.963010237860461, 0.975134337618752, + 0.970853351107317, 0.950680317147282, 0.954790290718341, + 0.966527082091908, 0.962200813076499, 0.942460370005162, + 0.946570343576222, 0.957829945502782, 0.953459077929065, + 0.934240422863042, 0.938350396434102, 0.949044396772787, + 0.944629715616508, 0.926020475720922, 0.930130449291982, + 0.94017210510527, 0.935714494594033, 0.917800528578803, + 0.921910502149862, 0.931214936204235, 0.926715377814437, + 0.909580581436683, 0.913690555007743, 0.922174948047915, + 0.917634518281392, 0.901360634294563, 0.905470607865623, + 0.913054386226795, 0.908474254172198, 0.893140687152443, + 0.897250660723503, 0.903855678856628, 0.899237103541058, + 0.884920740010324, 0.889030713581384, 0.894581431077967, + 0.889925758614877, 0.876700792868204, 0.880810766439264, + 0.885234419154689, 0.880543079694502, 0.868480845726084, + 0.872590819297144, 0.854830536401422, 0.829117993108342, + 0.817393737153961, 0.842937291440023, 0.80337288208789, + 0.777627771067437, 0.766306628581839, 0.7918501828679, 0.751851754418072, + 0.726075737768706, 0.715219520009716, 0.740763074295778, + 0.700270547600075, 0.674465357431444, 0.664132411437594, + 0.689675965723655, 0.6486327919406, 0.622800226449757, 0.613045302865471, + 0.638588857151532, 0.596942145847664, 0.57108406524557, + 0.561958194293348, 0.58750174857941, 0.545202387543123, + 0.519320709840676, 0.510871085721226, 0.536414640007287, + 0.493417406503792, 0.467514103166909, 0.459783977149103, + 0.485327531435165, 0.441591194650525, 0.415668286134141, + 0.408696868576981, 0.434240422863042, 0.389727837305228, + 0.363787388476316, 0.357609760004858, 0.383153314290919, + 0.337831503936298, 0.31187561939628, 0.306522651432736, + 0.332066205718797, 0.285906438713428, 0.259937258030576, + 0.255435542860613, 0.280979097146674, 0.233956950893204, + 0.207976643755831, 0.20434843428849, 0.229891988574552, + 0.181987405057247, 0.155998166358664, 0.153261325716368, + 0.178804880002429, 0.130002211225039, 0.104006256091414, + 0.102174217144245, 0.127717771430307, 0.0780058148638036, + 0.0520053736361927, 0.0510871085721227, 0.076630662858184, + 0.0260026868180964, 6.25080137064795e-17, 6.12323399573676e-17, + 0.0255435542860614, 0.846926383435463, 0.821261947573783, + 0.825130157993604, 0.850915475430904, 0.795597511712102, + 0.769933075850421, 0.773559523119003, 0.799344840556304, + 0.74426863998874, 0.71860420412706, 0.721988888244403, 0.747774205681703, + 0.692939768265379, 0.667275332403698, 0.670418253369803, + 0.696203570807103, 0.641610896542018, 0.615946460680337, + 0.618847618495203, 0.644632935932503, 0.590282024818656, + 0.564617588956975, 0.567276983620602, 0.593062301057903, + 0.538953153095295, 0.513288717233614, 0.515706348746002, + 0.541491666183302, 0.487624281371933, 0.461959845510253, + 0.464135713871402, 0.489921031308702, 0.436295409648572, + 0.410630973786891, 0.412565078996802, 0.438350396434102, + 0.384966537925211, 0.35930210206353, 0.360994444122202, + 0.386779761559502, 0.333637666201849, 0.307973230340168, + 0.309423809247601, 0.335209126684901, 0.282308794478488, + 0.256644358616807, 0.257853174373001, 0.283638491810301, + 0.230979922755126, 0.205315486893446, 0.206282539498401, + 0.232067856935701, 0.179651051031765, 0.153986615170084, + 0.154711904623801, 0.180497222061101, 0.128322179308404, + 0.102657743446723, 0.103141269749201, 0.128926587186501, + 0.0769933075850422, 0.0513288717233615, 0.0515706348746003, + 0.0773559523119004, 0.0256644358616808, 5.93188293336999e-17, + 5.74053187100322e-17, 0.0257853174373002, 0.854904567426344, + 0.828998368413425, 0.832866578833246, 0.858893659421785, + 0.803092169400505, 0.777185970387586, 0.780812417656168, + 0.806839498244707, 0.751279771374666, 0.725373572361746, + 0.72875825647909, 0.754785337067629, 0.699467373348827, + 0.673561174335908, 0.676704095302012, 0.702731175890551, + 0.647654975322988, 0.621748776310069, 0.624649934124934, + 0.650677014713473, 0.595842577297149, 0.569936378284229, + 0.572595772947856, 0.598622853536395, 0.54403017927131, + 0.518123980258391, 0.520541611770779, 0.546568692359317, + 0.492217781245471, 0.466311582232552, 0.468487450593701, + 0.49451453118224, 0.440405383219632, 0.414499184206712, + 0.416433289416623, 0.442460370005162, 0.388592985193793, + 0.362686786180873, 0.364379128239545, 0.390406208828084, + 0.336780587167954, 0.310874388155034, 0.312324967062467, + 0.338352047651006, 0.284968189142115, 0.259061990129195, + 0.260270805885389, 0.286297886473928, 0.233155791116276, + 0.207249592103356, 0.208216644708312, 0.23424372529685, + 0.181343393090437, 0.155437194077517, 0.156162483531234, + 0.182189564119773, 0.129530995064598, 0.103624796051678, + 0.104108322354156, 0.130135402942695, 0.0777185970387586, + 0.0518123980258391, 0.0520541611770779, 0.0780812417656169, + 0.0259061990129196, 5.54918080863644e-17, 5.35782974626967e-17, + 0.026027080588539, 0.862882751417225, 0.836734789253067, + 0.840602999672888, 0.866871843412666, 0.810586827088909, + 0.78443886492475, 0.788065312193332, 0.81433415593311, 0.758290902760592, + 0.732142940596433, 0.735527624713777, 0.761796468453555, + 0.705994978432275, 0.679847016268117, 0.682989937234221, + 0.709258780973999, 0.653699054103958, 0.6275510919398, 0.630452249754666, + 0.656721093494444, 0.601403129775642, 0.575255167611483, + 0.57791456227511, 0.604183406014888, 0.549107205447325, + 0.522959243283167, 0.525376874795555, 0.551645718535333, + 0.496811281119008, 0.47066331895485, 0.472839187315999, + 0.499108031055777, 0.444515356790692, 0.418367394626533, + 0.420301499836444, 0.446570343576222, 0.392219432462375, + 0.366071470298217, 0.367763812356888, 0.394032656096666, + 0.339923508134058, 0.3137755459699, 0.315226124877333, 0.341494968617111, + 0.287627583805742, 0.261479621641583, 0.262688437397777, + 0.288957281137555, 0.235331659477425, 0.209183697313267, + 0.210150749918222, 0.236419593658, 0.183035735149108, 0.15688777298495, + 0.157613062438667, 0.183881906178444, 0.130739810820792, + 0.104591848656633, 0.105075374959111, 0.131344218698889, + 0.0784438864924751, 0.0522959243283167, 0.0525376874795555, + 0.0788065312193333, 0.0261479621641584, 5.1664786839029e-17, + 4.97512762153612e-17, 0.0262688437397778, 0.870860935408106, + 0.844471210092709, 0.84833942051253, 0.874850027403546, + 0.818081484777312, 0.791691759461915, 0.795318206730497, + 0.821828813621513, 0.765302034146517, 0.73891230883112, + 0.742296992948463, 0.76880759983948, 0.712522583515723, + 0.686132858200326, 0.689275779166431, 0.715786386057447, + 0.659743132884929, 0.633353407569532, 0.636254565384398, + 0.662765172275414, 0.606963682254134, 0.580573956938737, + 0.583233351602364, 0.609743958493381, 0.55418423162334, + 0.527794506307943, 0.530212137820331, 0.556722744711348, + 0.501404780992546, 0.475015055677149, 0.477190924038298, + 0.503701530929315, 0.448625330361752, 0.422235605046354, + 0.424169710256265, 0.450680317147282, 0.395845879730957, + 0.36945615441556, 0.371148496474232, 0.397659103365248, + 0.343066429100163, 0.316676703784766, 0.318127282692199, + 0.344637889583215, 0.290286978469369, 0.263897253153971, + 0.265106068910166, 0.291616675801182, 0.237507527838574, + 0.211117802523177, 0.212084855128133, 0.238595462019149, + 0.18472807720778, 0.158338351892383, 0.159063641346099, + 0.185574248237116, 0.131948626576986, 0.105558901261589, + 0.106042427564066, 0.132553034455083, 0.0791691759461915, + 0.0527794506307944, 0.0530212137820332, 0.0795318206730497, + 0.0263897253153972, 4.78377655916935e-17, 4.59242549680257e-17, + 0.0265106068910166, 0.878839119398987, 0.852207630932351, + 0.856075841352172, 0.882828211394427, 0.825576142465715, + 0.798944653999079, 0.802571101267662, 0.829323471309917, + 0.772313165532443, 0.745681677065807, 0.749066361183151, + 0.775818731225406, 0.719050188599171, 0.692418700132535, + 0.69556162109864, 0.722313991140895, 0.665787211665899, + 0.639155723199263, 0.642056881014129, 0.668809251056384, + 0.612524234732627, 0.585892746265991, 0.588552140929618, + 0.615304510971874, 0.559261257799355, 0.53262976933272, + 0.535047400845108, 0.561799770887363, 0.505998280866084, + 0.479366792399448, 0.481542660760597, 0.508295030802852, + 0.452735303932811, 0.426103815466175, 0.428037920676086, + 0.454790290718341, 0.399472326999539, 0.372840838532904, + 0.374533180591575, 0.401285550633831, 0.346209350066268, + 0.319577861599632, 0.321028440507065, 0.34778081054932, + 0.292946373132996, 0.26631488466636, 0.267523700422554, + 0.294276070464809, 0.239683396199724, 0.213051907733088, + 0.214018960338043, 0.240771330380298, 0.186420419266452, + 0.159788930799816, 0.160514220253532, 0.187266590295788, + 0.13315744233318, 0.106525953866544, 0.107009480169022, + 0.133761850211277, 0.079894465399908, 0.053262976933272, + 0.0535047400845108, 0.0802571101267662, 0.026631488466636, + 4.4010744344358e-17, 4.20972337206903e-17, 0.0267523700422554, + 0.886817303389868, 0.859944051771993, 0.863812262191814, + 0.890806395385308, 0.833070800154118, 0.806197548536244, + 0.809823995804826, 0.83681812899832, 0.779324296918369, + 0.752451045300494, 0.755835729417837, 0.782829862611331, + 0.725577793682619, 0.698704542064744, 0.701847463030849, + 0.728841596224343, 0.67183129044687, 0.644958038828995, 0.64785919664386, + 0.674853329837355, 0.61808478721112, 0.591211535593245, + 0.593870930256872, 0.620865063450366, 0.564338283975371, + 0.537465032357496, 0.539882663869884, 0.566876797063378, + 0.510591780739621, 0.483718529121746, 0.485894397482896, + 0.51288853067639, 0.456845277503871, 0.429972025885996, + 0.431906131095907, 0.458900264289401, 0.403098774268122, + 0.376225522650247, 0.377917864708919, 0.404911997902413, + 0.349352271032372, 0.322479019414497, 0.32392959832193, + 0.350923731515424, 0.295605767796623, 0.268732516178748, + 0.269941331934942, 0.296935465128436, 0.241859264560873, + 0.214986012942998, 0.215953065547954, 0.242947198741448, + 0.188112761325124, 0.161239509707249, 0.161964799160965, + 0.188958932354459, 0.134366258089374, 0.107493006471499, + 0.107976532773977, 0.134970665967471, 0.0806197548536244, + 0.0537465032357496, 0.0539882663869884, 0.0809823995804826, + 0.0268732516178748, 4.01837230970225e-17, 3.82702124733548e-17, + 0.0269941331934942, 0.894795487380749, 0.867680472611635, + 0.871548683031456, 0.898784579376189, 0.840565457842522, + 0.813450443073408, 0.81707689034199, 0.844312786686723, + 0.786335428304294, 0.759220413535181, 0.762605097652524, + 0.789840993997257, 0.732105398766067, 0.704990383996954, + 0.708133304963058, 0.735369201307791, 0.67787536922784, + 0.650760354458726, 0.653661512273592, 0.680897408618325, + 0.623645339689613, 0.596530324920499, 0.599189719584126, + 0.626425615928859, 0.569415310151386, 0.542300295382272, + 0.54471792689466, 0.571953823239393, 0.515185280613158, + 0.488070265844045, 0.490246134205194, 0.517482030549927, + 0.460955251074931, 0.433840236305818, 0.435774341515728, + 0.463010237860461, 0.406725221536704, 0.37961020676759, + 0.381302548826262, 0.408538445170995, 0.352495191998477, + 0.325380177229363, 0.326830756136796, 0.354066652481529, + 0.29826516246025, 0.271150147691136, 0.27235896344733, 0.299594859792063, + 0.244035132922022, 0.216920118152909, 0.217887170757864, + 0.245123067102597, 0.189805103383795, 0.162690088614682, + 0.163415378068398, 0.190651274413131, 0.135575073845568, + 0.108460059076454, 0.108943585378932, 0.136179481723665, + 0.0813450443073409, 0.0542300295382272, 0.0544717926894661, + 0.0817076890341991, 0.0271150147691136, 3.6356701849687e-17, + 3.44431912260193e-17, 0.027235896344733, 0.90277367137163, + 0.875416893451277, 0.879285103871098, 0.90676276336707, + 0.848060115530925, 0.820703337610572, 0.824329784879155, + 0.851807444375127, 0.79334655969022, 0.765989781769868, + 0.769374465887211, 0.796852125383183, 0.738633003849515, + 0.711276225929163, 0.714419146895267, 0.741896806391239, + 0.68391944800881, 0.656562670088458, 0.659463827903324, + 0.686941487399296, 0.629205892168106, 0.601849114247753, + 0.60450850891138, 0.631986168407352, 0.574492336327401, + 0.547135558407048, 0.549553189919437, 0.577030849415408, + 0.519778780486696, 0.492422002566344, 0.494597870927493, + 0.522075530423465, 0.465065224645991, 0.437708446725639, + 0.439642551935549, 0.467120211431521, 0.410351668805286, + 0.382994890884934, 0.384687232943606, 0.412164892439577, + 0.355638112964581, 0.328281335044229, 0.329731913951662, + 0.357209573447634, 0.300924557123877, 0.273567779203524, + 0.274776594959718, 0.30225425445569, 0.246211001283172, + 0.218854223362819, 0.219821275967775, 0.247298935463746, + 0.191497445442467, 0.164140667522115, 0.164865956975831, + 0.192343616471803, 0.136783889601762, 0.10942711168141, + 0.109910637983887, 0.137388297479859, 0.0820703337610573, + 0.0547135558407049, 0.0549553189919437, 0.0824329784879155, + 0.0273567779203524, 3.25296806023516e-17, 3.06161699786838e-17, + 0.0274776594959718, 0.910751855362511, 0.883153314290919, + 0.88702152471074, 0.914740947357951, 0.855554773219328, + 0.827956232147737, 0.831582679416319, 0.85930210206353, + 0.800357691076146, 0.772759150004554, 0.776143834121898, + 0.803863256769109, 0.745160608932963, 0.717562067861372, + 0.720704988827476, 0.748424411474687, 0.689963526789781, + 0.66236498571819, 0.665266143533056, 0.692985566180266, + 0.634766444646598, 0.607167903575007, 0.609827298238634, + 0.637546720885845, 0.579569362503416, 0.551970821431825, + 0.554388452944213, 0.582107875591424, 0.524372280360234, + 0.496773739288642, 0.498949607649792, 0.526669030297002, + 0.469175198217051, 0.44157665714546, 0.44351076235537, 0.471230185002581, + 0.413978116073869, 0.386379575002277, 0.388071917060949, + 0.41579133970816, 0.358781033930686, 0.331182492859095, + 0.332633071766528, 0.360352494413738, 0.303583951787504, + 0.275985410715912, 0.277194226472106, 0.304913649119317, + 0.248386869644321, 0.22078832857273, 0.221755381177685, + 0.249474803824896, 0.193189787501139, 0.165591246429547, + 0.166316535883264, 0.194035958530475, 0.137992705357956, + 0.110394164286365, 0.110877690588843, 0.138597113236053, + 0.0827956232147737, 0.0551970821431825, 0.0554388452944213, + 0.0831582679416319, 0.0275985410715913, 2.87026593550161e-17, + 2.67891487313483e-17, 0.0277194226472107, 0.918730039353392, + 0.890889735130562, 0.894757945550383, 0.922719131348832, + 0.863049430907731, 0.835209126684901, 0.838835573953484, + 0.866796759751933, 0.807368822462071, 0.779528518239241, + 0.782913202356585, 0.810874388155034, 0.751688214016411, + 0.723847909793581, 0.726990830759686, 0.754952016558135, + 0.696007605570751, 0.668167301347921, 0.671068459162787, + 0.699029644961236, 0.640326997125091, 0.612486692902261, + 0.615146087565888, 0.643107273364337, 0.584646388679431, + 0.556806084456601, 0.559223715968989, 0.587184901767439, + 0.528965780233771, 0.501125476010941, 0.50330134437209, 0.53126253017054, + 0.473285171788111, 0.445444867565281, 0.447378972775191, + 0.475340158573641, 0.417604563342451, 0.389764259119621, + 0.391456601178292, 0.419417786976742, 0.361923954896791, + 0.334083650673961, 0.335534229581393, 0.363495415379843, + 0.306243346451131, 0.278403042228301, 0.279611857984495, + 0.307573043782944, 0.25056273800547, 0.22272243378264, 0.223689486387596, + 0.251650672186045, 0.19488212955981, 0.16704182533698, 0.167767114790697, + 0.195728300589146, 0.13920152111415, 0.11136121689132, 0.111844743193798, + 0.139805928992247, 0.0835209126684902, 0.0556806084456601, + 0.055922371596899, 0.0838835573953484, 0.0278403042228301, + 2.48756381076806e-17, 2.29621274840129e-17, 0.0279611857984495, + 0.926708223344273, 0.898626155970204, 0.902494366390025, + 0.930697315339713, 0.870544088596135, 0.842462021222066, + 0.846088468490648, 0.874291417440337, 0.814379953847997, + 0.786297886473928, 0.789682570591272, 0.81788551954096, + 0.758215819099859, 0.730133751725791, 0.733276672691895, + 0.761479621641583, 0.702051684351721, 0.673969616977653, + 0.676870774792518, 0.705073723742207, 0.645887549603584, + 0.617805482229515, 0.620464876893142, 0.64866782584283, + 0.589723414855446, 0.561641347481378, 0.564058978993766, + 0.592261927943454, 0.533559280107308, 0.50547721273324, + 0.507653081094389, 0.535856030044077, 0.477395145359171, + 0.449313077985102, 0.451247183195012, 0.479450132144701, + 0.421231010611033, 0.393148943236964, 0.394841285295636, + 0.423044234245324, 0.365066875862895, 0.336984808488826, + 0.338435387396259, 0.366638336345948, 0.308902741114758, + 0.280820673740689, 0.282029489496883, 0.310232438446571, + 0.25273860636662, 0.224656538992551, 0.225623591597506, + 0.253826540547195, 0.196574471618482, 0.168492404244413, + 0.16921769369813, 0.197420642647818, 0.140410336870344, + 0.112328269496276, 0.112811795798753, 0.141014744748441, + 0.0842462021222066, 0.0561641347481378, 0.0564058978993766, + 0.0846088468490648, 0.0280820673740689, 2.10486168603451e-17, + 1.91351062366774e-17, 0.0282029489496883, 0.934686407335154, + 0.906362576809846, 0.910230787229667, 0.938675499330594, + 0.878038746284538, 0.849714915759231, 0.853341363027813, + 0.88178607512874, 0.821391085233923, 0.793067254708615, + 0.796451938825958, 0.824896650926886, 0.764743424183307, 0.736419593658, + 0.739562514624104, 0.768007226725031, 0.708095763132692, + 0.679771932607384, 0.68267309042225, 0.711117802523177, + 0.651448102082077, 0.623124271556769, 0.625783666220396, + 0.654228378321323, 0.594800441031461, 0.566476610506154, + 0.568894242018542, 0.597338954119469, 0.538152779980846, + 0.509828949455538, 0.512004817816688, 0.540449529917615, + 0.481505118930231, 0.453181288404923, 0.455115393614833, + 0.483560105715761, 0.424857457879615, 0.396533627354308, + 0.398225969412979, 0.426670681513906, 0.368209796829, 0.339885966303692, + 0.341336545211125, 0.369781257312052, 0.311562135778384, + 0.283238305253077, 0.284447121009271, 0.312891833110198, + 0.254914474727769, 0.226590644202461, 0.227557696807417, + 0.256002408908344, 0.198266813677154, 0.169942983151846, + 0.170668272605563, 0.19911298470649, 0.141619152626538, + 0.113295322101231, 0.113778848403708, 0.142223560504635, + 0.0849714915759231, 0.0566476610506154, 0.0568894242018542, + 0.0853341363027813, 0.0283238305253077, 1.72215956130097e-17, + 1.53080849893419e-17, 0.0284447121009271, 0.942664591326034, + 0.914098997649488, 0.917967208069309, 0.946653683321475, + 0.885533403972941, 0.856967810296395, 0.860594257564977, + 0.889280732817143, 0.828402216619848, 0.799836622943302, + 0.803221307060645, 0.831907782312811, 0.771271029266755, + 0.742705435590209, 0.745848356556313, 0.774534831808479, + 0.714139841913662, 0.685574248237116, 0.688475406051982, + 0.717161881304147, 0.657008654560569, 0.628443060884023, + 0.63110245554765, 0.659788930799816, 0.599877467207476, 0.57131187353093, + 0.573729505043318, 0.602415980295484, 0.542746279854383, + 0.514180686177837, 0.516356554538986, 0.545043029791152, + 0.48561509250129, 0.457049498824744, 0.458983604034654, 0.48767007928682, + 0.428483905148197, 0.399918311471651, 0.401610653530323, + 0.430297128782489, 0.371352717795104, 0.342787124118558, + 0.344237703025991, 0.372924178278157, 0.314221530442011, + 0.285655936765465, 0.286864752521659, 0.315551227773825, + 0.257090343088919, 0.228524749412372, 0.229491802017327, + 0.258178277269493, 0.199959155735826, 0.171393562059279, + 0.172118851512995, 0.200805326765161, 0.142827968382732, + 0.114262374706186, 0.114745901008664, 0.143432376260829, + 0.0856967810296395, 0.057131187353093, 0.0573729505043318, + 0.0860594257564977, 0.0285655936765465, 1.33945743656742e-17, + 1.14810637420064e-17, 0.0286864752521659, 0.950642775316915, + 0.92183541848913, 0.925703628908951, 0.954631867312356, + 0.893028061661345, 0.864220704833559, 0.867847152102142, + 0.896775390505546, 0.835413348005774, 0.806605991177989, + 0.809990675295332, 0.838918913698737, 0.777798634350203, + 0.748991277522418, 0.752134198488523, 0.781062436891927, + 0.720183920694633, 0.691376563866848, 0.694277721681713, + 0.723205960085118, 0.662569207039062, 0.633761850211277, + 0.636421244874904, 0.665349483278309, 0.604954493383492, + 0.576147136555706, 0.578564768068095, 0.607493006471499, + 0.547339779727921, 0.518532422900136, 0.520708291261285, + 0.54963652966469, 0.48972506607235, 0.460917709244565, 0.462851814454476, + 0.49178005285788, 0.43211035241678, 0.403302995588994, 0.404995337647666, + 0.433923576051071, 0.374495638761209, 0.345688281933424, + 0.347138860840857, 0.376067099244261, 0.316880925105638, + 0.288073568277853, 0.289282384034047, 0.318210622437452, + 0.259266211450068, 0.230458854622282, 0.231425907227238, + 0.260354145630643, 0.201651497794497, 0.172844140966712, + 0.173569430420428, 0.202497668823833, 0.144036784138927, + 0.115229427311141, 0.115712953613619, 0.144641192017024, + 0.0864220704833559, 0.0576147136555706, 0.0578564768068094, + 0.0867847152102142, 0.0288073568277853, 9.5675531183387e-18, + 7.65404249467096e-18, 0.0289282384034047, 0.958620959307796, + 0.929571839328772, 0.933440049748593, 0.962610051303237, + 0.900522719349748, 0.871473599370724, 0.875100046639306, + 0.90427004819395, 0.8424244793917, 0.813375359412676, 0.816760043530019, + 0.845930045084663, 0.784326239433652, 0.755277119454627, + 0.758420040420732, 0.787590041975376, 0.726227999475603, + 0.697178879496579, 0.700080037311445, 0.729250038866089, + 0.668129759517555, 0.639080639538531, 0.641740034202158, + 0.670910035756801, 0.610031519559507, 0.580982399580483, + 0.583400031092871, 0.612570032647514, 0.551933279601458, + 0.522884159622434, 0.525060027983584, 0.554230029538227, + 0.49383503964341, 0.464785919664386, 0.466720024874297, 0.49589002642894, + 0.435736799685362, 0.406687679706338, 0.40838002176501, + 0.437550023319653, 0.377638559727314, 0.348589439748289, + 0.350040018655722, 0.379210020210366, 0.319540319769265, + 0.290491199790241, 0.291700015546435, 0.320870017101079, + 0.261442079811217, 0.232392959832193, 0.233360012437148, + 0.262530013991792, 0.203343839853169, 0.174294719874145, + 0.175020009327861, 0.204190010882505, 0.145245599895121, + 0.116196479916097, 0.116680006218574, 0.145850007773218, + 0.0871473599370724, 0.0580982399580483, 0.0583400031092871, + 0.0875100046639306, 0.0290491199790241, 5.74053187100322e-18, + 3.82702124733548e-18, 0.0291700015546435, 0.966599143298677, + 0.937308260168414, 0.908017377038151, 0.878726493907888, + 0.849435610777625, 0.820144727647363, 0.7908538445171, 0.761562961386837, + 0.732272078256574, 0.702981195126311, 0.673690311996048, + 0.644399428865785, 0.615108545735522, 0.585817662605259, + 0.556526779474996, 0.527235896344733, 0.49794501321447, + 0.468654130084207, 0.439363246953944, 0.410072363823681, + 0.380781480693418, 0.351490597563155, 0.322199714432892, + 0.292908831302629, 0.263617948172367, 0.234327065042104, + 0.205036181911841, 0.175745298781578, 0.146454415651315, + 0.117163532521052, 0.0878726493907888, 0.0585817662605259, + 0.0292908831302629, 1.91351062366774e-18, -0.0475953950922149, + -0.0468166949370172, -0.0951638316474845, -0.0936333898740345, + -0.0921029481005844, -0.0460514740502921, -0.142678366398464, + -0.140346039118559, -0.190112086608365, -0.187058688363083, + -0.184005290117801, -0.138054119109193, -0.23743812531461, + -0.23356348191958, -0.28462967654657, -0.280068275476077, + -0.275506874405584, -0.229756082261692, -0.331660010508748, + -0.326261874208998, -0.37850248872082, -0.37245547294192, + -0.36640845716302, -0.320957665784302, -0.425130579105953, + -0.418235242672084, -0.471517871018854, -0.464015012402249, + -0.456512153785643, -0.411460305474331, -0.517638090205041, + -0.509279256406267, -0.563465113682859, -0.554543500410285, + -0.545621887137712, -0.501067020461677, -0.608972984539814, + -0.599191689796349, -0.654135926634843, -0.643839879182413, + -0.633543831729983, -0.589582859433847, -0.698928359198196, + -0.687772880620567, -0.743324911320655, -0.731705882058722, + -0.720086852796789, -0.676815342263386, -0.787300436323882, + -0.774826182349743, -0.830830026003773, -0.817946482640763, + -0.805062939277754, -0.762574896037271, -0.873889024738719, + -0.860158409614917, -0.916453043454821, -0.902370336589071, + -0.888287629723321, -0.846675284500537, -0.958497973440113, + -0.94358027583435, -1, -0.98479021507963, -0.96958043015926, + -0.92893402994129, -1.04093561594614, -1.02490682200851, + -1.08128163491119, -1.06502342893739, -1.04876522296358, + -1.00917282656142, -1.12101520448179, -1.10395783571168, + -1.1601138191424, -1.14289224248598, -1.12567066582956, + -1.08721794439657, -1.19855533302269, -1.1805582593311, + -1.23631797244121, -1.21822427617623, -1.20013057991124, + -1.1629006228704, -1.27338034823818, -1.25453858662873, + -1.30972146789057, -1.29085289708124, -1.27198432627191, + -1.23605745309158, -1.3453207474025, -1.32573524672741, + -1.38015802296422, -1.36061759637359, -1.34107716978296, + -1.30653074802743, -1.41421356237309, -1.39399097465152, + -1.44746807621014, -1.42736435292944, -1.40726062964875, + -1.37416889971585, -1.47990272876577, -1.45841094603009, + -1.51149914870852, -1.48945753913073, -1.46741592955294, + -1.43733827960084, -1.54223943949078, -1.51885156136587, + -1.57210618948557, -1.54824558360102, -1.52438497771646, + -1.4959004536347, -1.60108248184872, -1.57592077133438, + -1.62915190410067, -1.60359595906775, -1.57804001403482, + -1.55121249587564, -1.65629855742274, -1.62948994237603, + -1.68250706566236, -1.65538392568431, -1.62826078570626, + -1.60315039987054, -1.7077625840423, -1.67943836964513, + -1.73205080756888, -1.70349281360595, -1.67493481964303, + -1.65159780267465, -1.75535797913451, -1.72565355044521, + -1.77767089730985, -1.74781428728446, -1.71795767725908, + -1.69644624845105, -1.79897692382121, -1.76803143908376, + -1.81926399070904, -1.78824859088306, -1.75723319105708, + -1.73759543415808, -1.83852060716333, -1.80647668256925, + -1.85673586603215, -1.82470477425544, -1.79267368247874, + -1.77495343676791, -1.87389944999952, -1.84090283661627, + -1.89000163742934, -1.85710089897711, -1.82420016052488, + -1.80843692150181, -1.90503330787172, -1.87123256146969, + -1.91898594722899, -1.88536422396227, -1.85174250069554, + -1.83797133061021, -1.93185165257814, -1.89739779710402, + -1.94362313664708, -1.90943137024577, -1.87523960384447, -1.86349105227, + -1.95429373194232, -1.91933991740133, -1.96385739452541, + -1.92924846455688, -1.89463953458834, -1.8849395692164, + -1.97230870743637, -1.93700986295819, -1.97964288376187, + -1.9447712613595, -1.90989963895713, -1.90226958677273, + -1.98585576934658, -1.95036825222105, -1.99094384514617, + -1.95596524308261, -1.92098664101906, -1.91544313998809, + -1.99490422922051, -1.95938547069813, -1.99773467836602, + -1.96280569831365, -1.92787671826128, -1.92443167964017, + -1.99943358938626, -1.96404173804571, -2, -1.96527777777778, + -1.93055555555556, -1.92921613690842, -0.0453042583609018, + -0.0906085167218038, -0.0891140853430231, -0.0445570426715115, + -0.135816126629459, -0.181023736537114, -0.178042182956427, + -0.133578134149725, -0.226038268478108, -0.271052800419102, + -0.266598726432621, -0.222320454694524, -0.315778262263715, + -0.360503724108329, -0.354598991053638, -0.310598858743129, + -0.404844778563584, -0.44918583301884, -0.441859512252037, + -0.398229251652837, -0.493048013598137, -0.536910194177434, + -0.528198501217156, -0.485029006734596, -0.580200119197522, + -0.62349004421761, -0.613436256705237, -0.570817378961196, + -0.666115628338138, -0.708741212458666, -0.697395572120543, + -0.65541591441289, -0.750611875285094, -0.792482538111521, + -0.779902136945289, -0.738648854532916, -0.833509409388849, + -0.874536280666177, -0.860784931609033, -0.820343534277161, + -0.914632401598656, -0.954728522531134, -0.939876614903008, + -0.900330773256021, -0.993809042771906, -1.03288956301268, + -1.01701390306178, -0.978445258982395, -1.07087193287711, + -1.10885430274153, -1.0920379396535, -1.05452592135764, + -1.14565846020878, -1.18246261767603, -1.16479465544081, + -1.12841629754716, -1.21801116975529, -1.25355972183456, + -1.23513511739721, -1.19996488641901, -1.2877781198851, + -1.32199651793563, -1.30291586608831, -1.26902549174276, + -1.35481322654338, -1.38762993515113, -1.36799924065351, + -1.33545755337091, -1.41676144061699, -1.44589294608286, + -1.42436996261279, -1.39618460163315, -1.47348937196779, + -1.50108579785272, -1.47778661798897, -1.45107829030088, + -1.52708559160416, -1.55308538535561, -1.5281307566764, + -1.50295868733269, -1.57743061130636, -1.60177583725711, + -1.57529088880796, -1.55171082274218, -1.62441230786817, + -1.64704877847923, -1.61916273731544, -1.5972268130617, + -1.66792617709206, -1.68880357570488, -1.65964947415068, + -1.63940610573306, -1.70787557052477, -1.72694756534466, + -1.69666193963224, -1.67815570689146, -1.74417191439719, + -1.76139626344972, -1.7301188444207, -1.71339039202647, + -1.77673491027239, -1.79207355709506, -1.75994695366523, + -1.74503289904297, -1.80549271694743, -1.8189118767998, + -1.78608125290405, -1.77301410328464, -1.83038211319679, + -1.84185234959378, -1.80846509534309, -1.79727317412357, + -1.85134864098877, -1.86084493238377, -1.82705033017919, + -1.81775771276114, -1.86834672885047, -1.87584852531717, + -1.84179741167721, -1.8344238709282, -1.88133979510179, + -1.88683106488641, -1.85267548875376, -1.84723645021548, + -1.89030033072475, -1.89376959656309, -1.8596624748649, + -1.85616898180933, -1.89520996168024, -1.89665032679739, + -1.86274509803922, -1.86120378645206, -0.0438278321794559, + -0.0876556643589119, -0.0861972433748006, -0.0430986216874003, + -0.131394069199623, -0.175132474040335, -0.172222765124243, + -0.129210004249522, -0.218692226785243, -0.262251979530151, + -0.257905232627681, -0.215063998875962, -0.305544260126653, + -0.348836540723156, -0.343074090392675, -0.300489661510178, + -0.391773135029096, -0.434709729335036, -0.427559946418036, + -0.385317018405355, -0.477203228952105, -0.519696728569174, + -0.511194955921192, -0.469377451169614, -0.561660728851048, + -0.603624729132921, -0.593813201560606, -0.552504078740899, + -0.644974024919576, -0.68632332070623, -0.675251069291917, + -0.634532135426261, -0.726974099341031, -0.767624877975833, + -0.755347619006377, -0.715299344149147, -0.807494909168164, + -0.847364940360495, -0.833944949111957, -0.794646284059167, + -0.886373762463811, -0.925382584567126, -0.910888554231245, + -0.872416751671601, -0.963451686850462, -1.0015207891338, + -0.986027675205815, -0.94845811471853, -1.03857378963383, + -1.07562679013386, -1.05921564061421, -1.02262165791001, + -1.11158960868461, -1.14755242723535, -1.1303101990299, + -1.09476291982206, -1.1823534532836, -1.21715447933185, + -1.19917384126649, -1.1647420201482, -1.25072473415807, + -1.28429498898429, -1.26567411188027, -1.23242397657338, + -1.31656828196162, -1.34884157493896, -1.32968390922441, + -1.29767901055234, -1.37610359009469, -1.40336560525042, + -1.38236124788806, -1.35602257855624, -1.42920723469823, + -1.45504886414604, -1.43231111030311, -1.40733617909558, + -1.47941315424848, -1.50377744435091, -1.47942413202542, + -1.45586762116426, -1.52661078811931, -1.5494441318877, + -1.52359737496744, -1.50151075349643, -1.57069639041924, + -1.59194864895077, -1.5647345605861, -1.54416596777677, + -1.61157326500922, -1.63119788106767, -1.60274628798466, + -1.58374042428538, -1.64915198455052, -1.66710608803337, + -1.63755023643449, -1.62014826220958, -1.68335059308637, + -1.69959509813937, -1.66907135185804, -1.65331079414627, + -1.71409479169859, -1.72859448525782, -1.6972420168504, + -1.68315668435422, -1.74131810681855, -1.75404172837929, + -1.72200220385453, -1.70962211035246, -1.76496204081115, + -1.77588235324302, -1.74329961114295, -1.73265090749874, + -1.7849762044908, -1.79407005573859, -1.76108978129798, + -1.75219469622046, -1.80131843126912, -1.80856680679966, + -1.7753362019221, -1.76821299161004, -1.81395487267584, + -1.81934293855202, -1.78601038835028, -1.78067329513619, + -1.82286007503645, -1.82637721152088, -1.79309194817686, + -1.78955116826357, -1.82801703713299, -1.8296568627451, + -1.79656862745098, -1.79483028781392, -0.0423874163926793, + -0.0847748327853588, -0.0833524221959169, -0.0416762110979584, + -0.127079866829052, -0.169384900872745, -0.166547036621248, + -0.124949729408582, -0.211525356840984, -0.253665812809223, + -0.249426392990764, -0.207986714806006, -0.295559867797813, + -0.337453922786403, -0.33183375518013, -0.290630074085447, + -0.37902031206862, -0.420586701350837, -0.413613456283639, + -0.372723605731885, -0.461744902468172, -0.502903103585506, + -0.494611251249819, -0.454112353766729, -0.543573518756926, + -0.584243933928347, -0.574674666296089, -0.534642958772954, + -0.624348070364881, -0.664452206801415, -0.653653344310912, + -0.6141640053035, -0.703912854517556, -0.743373502233697, + -0.731399385461018, -0.692526364885965, -0.782114908952861, + -0.820856315672025, -0.807767682232093, -0.769583533846555, + -0.858804358429816, -0.896752401187607, -0.882616248143969, + -0.845191965188031, -0.933834754244176, -0.970917107300745, + -0.955806539395674, -0.919211393769822, -1.00706340598185, + -1.04320970466296, -1.0272037687117, -0.991505154053686, + -1.07835170475858, -1.11349370485421, -1.09667721067852, + -1.06194048969511, -1.14756543721366, -1.18163716957311, + -1.16410049787973, -1.13038885427913, -1.21457508954634, + -1.24751300951957, -1.22935190715886, -1.1967262025193, + -1.27925614090625, -1.31099927229294, -1.29231463536147, + -1.26083327126017, -1.33643739446318, -1.36187551663341, + -1.34138978537876, -1.31685221037012, -1.3860051495572, + -1.41013478248099, -1.38795845465887, -1.36467412001882, + -1.43290345926732, -1.45567213605364, -1.43192014008187, + -1.40993929737037, -1.47703047281486, -1.49838880957608, + -1.47318024418472, -1.45255019213329, -1.51829061729832, + -1.53819242502056, -1.51165028945502, -1.49241526681987, + -1.5565948141967, -1.57499720337283, -1.547248118761, -1.52944920410801, + -1.591860681161, -1.60872415894917, -1.57989808146386, -1.56357310011243, + -1.62401271863678, -1.6393012783244, -1.60953120479075, -1.5947146431273, + -1.65298248089489, -1.66666368346539, -1.63608535008037, + -1.62280827743556, -1.67870873108307, -1.69075377870075, + -1.65950535354697, -1.64779535181367, -1.70113757994712, + -1.7115213811935, -1.67974315124404, -1.66962425239551, + -1.72022260790742, -1.72892383462134, -1.6967578879447, + -1.68825051959437, -1.73592497021415, -1.74292610580696, + -1.71051600969182, -1.70363694881826, -1.7482134849432, + -1.75350086407944, -1.72099133980861, -1.71575367475021, + -1.75706470363323, -1.76062854318702, -1.72816513819717, + -1.72457823900289, -1.76246296440397, -1.76429738562092, + -1.73202614379085, -1.73009564099401, -0.0409830110005722, + -0.0819660220011445, -0.0805796218063721, -0.040289810903186, + -0.122873519517745, -0.163781017034345, -0.161014997447443, + -0.120797309626908, -0.204537658645331, -0.245294300256317, + -0.241162207521871, -0.201088602484657, -0.285825085277193, + -0.326355870298068, -0.320877985416005, -0.281020096468938, + -0.366586309682156, -0.406816749066244, -0.400020041848848, + -0.360449013632427, -0.446673034146336, -0.486529319226429, + -0.478447387203039, -0.439233714525943, -0.525938488915158, + -0.565347658603887, -0.556020650911686, -0.517234019057362, + -0.604237764674054, -0.64312787074422, -0.632602397177527, + -0.594311524044607, -0.681428140814668, -0.719728410885116, + -0.708057436309213, -0.67032991674337, -0.757369408742941, + -0.795010406600766, -0.78225313096944, -0.745155283639326, + -0.831924189496671, -0.868837972392575, -0.855059696641181, + -0.818656413805311, -0.904958244953046, -0.941078517513517, + -0.92635049563136, -0.890705096136271, -0.976340781921172, + -1.01160304632883, -0.996002323945954, -0.961176409788657, + -1.04594474843071, -1.0802864505326, -1.06389569038667, + -1.02994900716631, -1.11364712154547, -1.14700779255834, + -1.12991508723695, -1.09690538881181, -1.1793291860499, + -1.21165057954146, -1.19394925192406, -1.1619321695805, + -1.24287680337727, -1.27410302721308, -1.25589141906468, + -1.22492033549437, -1.29776285372245, -1.32142268023182, + -1.30145557508488, -1.27867349707478, -1.34388311654469, + -1.36634355285757, -1.34472865105626, -1.32309211307057, + -1.38755650666069, -1.4087694604638, -1.38561878084574, -1.365173715951, + -1.42868966539303, -1.44860987032225, -1.42403949645978, + -1.40482913865276, -1.46719498850543, -1.48578010668861, + -1.4599099239222, -1.44197471019099, -1.50299082465449, + -1.52020154262036, -1.49315496647972, -1.47653244520096, + -1.53600166035623, -1.55180177809209, -1.52370547472032, + -1.50843022060002, -1.56615829104844, -1.5805148040048, + -1.55149840321884, -1.53760193896958, -1.59339797786128, + -1.60628115171777, -1.57647695335516, -1.563987678287, -1.61766458974097, + -1.62904802776417, -1.59859070198137, -1.58753382766827, + -1.63890873060469, -1.64876943344521, -1.61779571564638, + -1.60819320881387, -1.65708785123862, -1.66540626903202, + -1.63405465011935, -1.62592518288286, -1.67216634568555, + -1.67892642233908, -1.64733683498635, -1.64069574255285, + -1.68411563190388, -1.68930484146868, -1.65761834312875, + -1.65247758905755, -1.69291421651509, -1.6965235915615, + -1.66488204492582, -1.66125019402729, -1.69854774349317, + -1.70057189542484, -1.66911764705882, -1.66699984599232, + -0.0396146160031345, -0.0792292320062691, -0.0778788422061661, + -0.038939421103083, -0.118775027265702, -0.158320822525135, + -0.155626647602828, -0.116752744904497, -0.197729132198286, + -0.237137441871436, -0.233112676221, -0.194369661911914, + -0.276339912564794, -0.315542383258152, -0.310206781100299, + -0.27165972866065, -0.354471127869703, -0.393399872481255, + -0.386779703113662, -0.34849324210698, -0.4319876239866, + -0.470575375491944, -0.46270336378085, -0.424741533447256, + -0.508755639325743, -0.546935903159542, -0.537851155407398, + -0.500277259594124, -0.584643107847094, -0.622350312534645, + -0.612098227891763, -0.57497469164958, -0.659519958232366, + -0.696689603930087, -0.685321771550961, -0.648709999721362, + -0.733258408538403, -0.76982721314672, -0.757401295323999, + -0.72136153343748, -0.805733255664376, -0.841639298182031, + -0.828218899722882, -0.79281009752344, -0.876822158977074, + -0.912005019772116, -0.897659543912872, -0.862939221817877, + -0.946405917451792, -0.980806815131469, -0.965611306316983, + -0.931635425114928, -1.01436873970099, -1.04793066427051, + -1.03196563815435, -0.998788472235667, -1.08059850627902, + -1.11326634828754, -1.09661760933813, -1.06429162374624, + -1.14498702366876, -1.17670769904997, -1.15946614617589, + -1.12804187775701, -1.20743026937467, -1.23815283969936, + -1.22041426033404, -1.18994020325496, -1.26007996787251, + -1.28200709604566, -1.26255861700643, -1.24148643867024, + -1.30284113566072, -1.32367517527577, -1.30262169949528, + -1.28259015825086, -1.34337229642858, -1.3630694175814, + -1.34052005431705, -1.32157087690617, -1.3815883658538, + -1.40010731412621, -1.37617513179264, -1.35834759305484, + -1.41740950404056, -1.43471169395491, -1.40951346398762, + -1.39284429789013, -1.45076129638259, -1.46681089881027, + -1.44046683114081, -1.42499014756422, -1.48157492213619, + -1.49633894546211, -1.46897241620389, -1.45471962367235, + -1.50978731032134, -1.52323567518057, -1.4949729471423, -1.4819726816731, + -1.53534128259777, -1.54744689001496, -1.51841682667476, + -1.50669488690853, -1.55818568279226, -1.56892447556955, + -1.53925824915773, -1.52883753791625, -1.57827549278386, + -1.58762650999817, -1.55745730434995, -1.54835777675384, + -1.5955719344844, -1.60351735897064, -1.57298006782193, + -1.56521868608594, -1.61004255768333, -1.61656775639602, + -1.5857986778057, -1.57938937281381, -1.62166131355788, + -1.62675487071973, -1.59589139831071, -1.59084503805821, + -1.63040861368203, -1.63406235664432, -1.60324266836283, + -1.59956703333677, -1.63627137440059, -1.63848039215686, + -1.6078431372549, -1.60554290280886, -0.0382822314003662, + -0.0765644628007325, -0.0752500833952989, -0.0376250416976494, + -0.114784390072924, -0.153004317345115, -0.150381987087402, + -0.112816035241351, -0.191099777499846, -0.229195237654577, + -0.225277799088153, -0.187829893087778, -0.267104349660616, + -0.305013461666655, -0.299820142233011, -0.262548970660582, + -0.342674766631263, -0.380336071595871, -0.37389244007808, + -0.336856291155546, -0.417688671988961, -0.455041272382051, + -0.447379180983253, -0.410635810530666, -0.492024969988681, + -0.529008667595311, -0.520166179783224, -0.483772680383238, + -0.565564099884001, -0.602119532172691, -0.592140836453619, + -0.556153508118421, -0.638188306770652, -0.674257081368612, + -0.663192391186263, -0.627666613819941, -0.709781908339248, + -0.745306735309885, -0.73321217529577, -0.698202283241016, + -0.78023155693293, -0.815156378555976, -0.80209385738907, + -0.76765301634242, -0.849426496316259, -0.883696614076541, + -0.86973368424021, -0.83591377081464, -0.917258812573713, + -0.950821011070884, -0.936030715824785, -0.902882200032498, + -0.983623678569419, -1.01642634606795, -1.00088705398156, + -0.968458884903171, -1.04841959141433, -1.0804128367607, + -1.06420806418328, -1.03254755908242, -1.1115486024029, + -1.14268436804511, -1.12590258991433, -1.0950553270488, + -1.17291653889845, -1.20314870975179, -1.18588315916955, + -1.15589287454194, -1.22338873691336, -1.24362876407492, + -1.22469891114341, -1.20529103515648, -1.26287920690526, + -1.2821296497356, -1.26163759997592, -1.24316825555967, + -1.30035082857101, -1.31857200740642, -1.29662396049579, + -1.27913078023586, -1.33572657419719, -1.35288114098796, + -1.32958715018328, -1.31310555533954, -1.36893416390371, + -1.38498718681947, -1.36046090965131, -1.3450240299173, -1.399906229381, + -1.41482527194254, -1.38918371274427, -1.37482231119779, + -1.42858046650089, -1.44233566105923, -1.41569890591457, + -1.40244130932942, -1.45489977645548, -1.46746389185172, + -1.43995483656114, -1.42782687123785, -1.47881239510434, + -1.49016089835696, -1.46190497003917, -1.45092990330015, + -1.50027201023693, -1.5103831221169, -1.48150799507606, + -1.47170648255761, -1.51923786648463, -1.52809261085236, + -1.49872791735476, -1.49011795621541, -1.53567485764477, + -1.54325710443718, -1.51353414105244, -1.5061310292036, + -1.54955360620748, -1.55585010797778, -1.52590153814987, + -1.51971783960115, -1.56085052990519, -1.5658509518326, + -1.53581050535449, -1.53085602175218, -1.56954789513405, + -1.5732448384355, -1.54324700850817, -1.53952875693133, + -1.57563385712625, -1.57802287581699, -1.54820261437909, + -1.54572481144363, -0.0369858571922673, -0.0739717143845348, + -0.0726933453737706, -0.0363466726868852, -0.11090160793941, + -0.147831501494284, -0.145281015901167, -0.108987180637469, + -0.184649594550013, -0.221467687605742, -0.21765757612333, + -0.181469296012248, -0.258118396564659, -0.294769105523577, + -0.289718068814142, -0.253687822468736, -0.331197225966834, + -0.367625346410092, -0.361358252742104, -0.325538160778123, + -0.403776178153421, -0.43992700989675, -0.432474838810247, + -0.396916545776175, -0.475746480903972, -0.511565951911194, + -0.502965724039164, -0.467720281424706, -0.547000740784776, + -0.582435529658357, -0.572730222863095, -0.53784797345113, + -0.617433186429524, -0.65243084320069, -0.641669295215118, + -0.607199759039107, -0.686939908145476, -0.721448973090261, + -0.709685770884753, -0.675677533049935, -0.755419093302335, + -0.789389213514408, -0.776684569639746, -0.74318517026225, + -0.8227712569706, -0.856153300426793, -0.842572916613375, + -0.809628743126561, -0.888899467286933, -0.921645634147072, + -0.90726055246936, -0.874916734541367, -0.953709565035998, + -0.985773495924924, -0.970659937868292, -0.938960245168826, + -1.01711037695138, -1.04844725797783, -1.03268645177239, + -1.00167319482034, -1.07901392225234, -1.10958058652685, + -1.09325858313938, -1.06297251745589, -1.13933561194862, + -1.16909063737038, -1.15229811557121, -1.1227783493553, + -1.18768916084499, -1.20628768431961, -1.18787645749581, + -1.17008728653351, -1.22399733027833, -1.24170697623706, + -1.22177635249819, -1.204826404997, -1.25849210308797, -1.27527722993888, + -1.25393049938197, -1.23785342594008, -1.29110429042319, + -1.3069313509075, -1.28427555163172, -1.26910302550684, + -1.32176896809489, -1.33660658528228, -1.31275226091325, + -1.29851390627248, -1.35042562364973, -1.36424466201718, + -1.3393056112901, -1.32602893610167, -1.37701829345032, + -1.38979192488346, -1.36388494385235, -1.35159527757122, + -1.40149568945085, -1.41319945401824, -1.38644407147535, + -1.37516450766385, -1.42381131538101, -1.43442317674378, + -1.40694138344838, -1.39669272746187, -1.44392357207499, + -1.45342396740621, -1.42533993973636, -1.41614066159237, -1.461795851707, + -1.47016773600779, -1.44160755466081, -1.43347374719859, + -1.47739662071972, -1.48462550543166, -1.45571686981088, + -1.44866221223585, -1.49069949125801, -1.49677347708436, + -1.46764541601885, -1.46168114291486, -1.50168328094582, + -1.50659308480728, -1.47737566426008, -1.47251054013946, + -1.51033206087115, -1.51407103693502, -1.48489506536187, + -1.48113536481097, -1.51663519167013, -1.51919934640523, + -1.49019607843137, -1.48754557189662, -0.0357254933788379, + -0.0714509867576758, -0.070208628141581, -0.0351043140707905, + -0.10712668086516, -0.142802374972644, -0.140323734044121, + -0.105266181092851, -0.178378583348786, -0.213954791724929, + -0.210252007326529, -0.175287870685325, -0.249382053276923, + -0.284809314828917, -0.279900560843692, -0.245076284085111, + -0.320038505876418, -0.355267696923918, -0.349177141105732, + -0.314538850974712, -0.390250142479979, -0.42523258803604, + -0.417990337261833, -0.383583739183783, -0.459920172071616, + -0.494607756107192, -0.486249788175219, -0.452120062718526, + -0.528953030549418, -0.563298304991644, -0.553866387120192, + -0.520058087647706, -0.597254597208983, -0.631210889426322, + -0.620752483637526, -0.587309435378859, -0.664732407957086, + -0.69825392648785, -0.686822082090947, -0.653787282864237, + -0.731295864772589, -0.764337803057328, -0.751991036474911, + -0.719406559282929, -0.796856440940099, -0.82937507882287, + -0.816177241032366, -0.784084138753638, -0.861327881591452, + -0.893280684360033, -0.879300816250707, -0.847739028641536, + -0.924626399100728, -0.955972113841423, -0.941284289814555, + -0.910292553032631, -0.98667086289018, -1.01736961193894, + -1.00205277210548, -0.971668530960017, -1.04738298321708, + -1.07739635449522, -1.06153412585106, -1.03179344897827, + -1.10668748852517, -1.13597862255511, -1.11965912953902, + -1.09059662769504, -1.15298123966742, -1.16998385677972, + -1.15209125606363, -1.13587519280133, -1.18619550577993, + -1.20240715478014, -1.18303795706209, -1.16756460656286, + -1.21779611997945, -1.23318508517877, -1.21243967097557, + -1.19773881401883, -1.2477215145318, -1.26225794388483, + -1.24024033613795, -1.22634000355676, -1.27591391661409, + -1.28956988934335, -1.26638751777344, -1.25331392695569, + -1.30231947918877, -1.3150690690342, -1.2908325267783, -1.27861002227587, + -1.3268884029845, -1.33870773693479, -1.31353053001724, + -1.30218152839777, -1.34957504930747, -1.36044236168014, + -1.33444065188493, -1.32398559095108, -1.37033804342777, + -1.3802337251754, -1.35352606690241, -1.34398335939367, + -1.38914036830644, -1.39804701143748, -1.37075408313861, + -1.36214007502051, -1.40594944845097, -1.41385188546446, + -1.3860962162681, -1.37842514970336, -1.42073722370926, + -1.42762256195407, -1.39952825409725, -1.39281223518268, + -1.43348021283491, -1.43933786371575, -1.41103031141265, + -1.40527928275495, -1.44415956667976, -1.44898126964378, + -1.42058687502748, -1.41580859322007, -1.45276111089333, + -1.45654095214289, -1.42818683892391, -1.4243868569757, + -1.45927537803223, -1.46200980392157, -1.43382352941176, + -1.43100518416784, -0.0345011399600778, -0.0690022799201557, + -0.0677959316987304, -0.0338979658493651, -0.103459608850174, + -0.137916937780193, -0.135510141516264, -0.101653036607497, + -0.172286743896166, -0.20665655001214, -0.203061092697752, + -0.169285617107008, -0.240895319797408, -0.275134089582677, + -0.270367618321661, -0.236714355509706, -0.309198606360013, + -0.343263123137349, -0.337349105168966, -0.303858361745313, + -0.377110564968636, -0.410958006799922, -0.403925676338011, + -0.370637390753489, -0.444546043491613, -0.478134080183304, + -0.470018372191388, -0.4369720242647, -0.511420969177927, + -0.544707858172551, -0.535549329224909, -0.502783850708149, + -0.577652539109029, -0.610597220045507, -0.600441956453488, + -0.567995642839199, -0.643159407774079, -0.67572159550265, + -0.664621108914353, -0.63253153268392, -0.707861871343693, + -0.740002147184737, -0.728013257894563, -0.696317183404458, + -0.771682048224756, -0.803361949264775, -0.790546657497183, + -0.759279957695873, -0.83454405548727, -0.865726161709766, + -0.852151507168826, -0.821349082333005, -0.896374180763609, + -0.927022199817451, -0.912760109820348, -0.882455808494587, + -0.957101049230729, -0.987179898644007, -0.972307025182534, + -0.942533567501441, -1.01665578529711, -1.04613167195021, + -1.03072921804936, -1.00151812161594, -1.0749721686281, -1.103812665306, + -1.08796620107298, -1.05934770956117, -1.11926497338063, + -1.13471728145526, -1.11734330684688, -1.10265475395993, + -1.14947373341005, -1.16423018536485, -1.14542241366761, + -1.13138286025725, -1.17826287924547, -1.19229557312609, + -1.17215147527661, -1.15878694447211, -1.20557824652302, + -1.21886091991996, -1.19748150370196, -1.18481648948929, + -1.23136900946131, -1.24387709900267, -1.22136668023189, + -1.20942409196693, -1.25558779599813, -1.26729849299359, + -1.24376445920887, -1.23256556972038, -1.27819079510341, + -1.28908309721323, -1.26463566440923, -1.25420006180905, + -1.29913785602532, -1.30919261483741, -1.28394457778989, + -1.27429012109956, -1.31839257924462, -1.32759254365183, + -1.30165902040125, -1.29280179909557, -1.33592239893128, + -1.34425225421072, -1.31775042528283, -1.30970472284204, + -1.35169865671654, -1.35914505922236, -1.33219390217663, + -1.32497216372973, -1.36569666661339, -1.37224827400441, + -1.34496829391156, -1.33858109804409, -1.37789577093818, + -1.38354326787196, -1.35605622433127, -1.35051225912141, + -1.38827938710702, -1.39301550634209, -1.3654441376567, + -1.36075018099398, -1.3968350452006, -1.4006545840591, -1.3731223291943, + -1.3692832334255, -1.40355441621256, -1.40645424836601, + -1.37908496732026, -1.37610364825728, -0.0333127969359872, + -0.0666255938719744, -0.0654552560452185, -0.0327276280226092, + -0.0999003918944528, -0.133175189916931, -0.130840238317598, + -0.0981477471814082, -0.166374076192153, -0.199572962467375, + -0.196084832236997, -0.163462535277298, -0.232658196126115, + -0.265743429784855, -0.261119241248049, -0.228602036742523, + -0.29867752741762, -0.331611625050385, -0.325874144931804, + -0.293496693089927, -0.364357445619391, -0.397103266188396, + -0.390280856038781, -0.358077500485293, -0.429624095163963, + -0.46214492413953, -0.454271476087672, -0.422276166063226, + -0.494404556670304, -0.526664189201078, -0.517779049177247, + -0.486025262632459, -0.558627012129662, -0.590589835058245, + -0.580737713663003, -0.549258381420125, -0.622220907596454, + -0.653851980134662, -0.643082851354971, -0.611910282508987, + -0.685117113015647, -0.716382245896633, -0.704751233898703, + -0.673917042626837, -0.747248078824569, -0.778113911752505, + -0.765681166007827, -0.735216199953265, -0.808547988974389, + -0.838982066196272, -0.825812625223718, -0.795746895615773, + -0.86895291002464, -0.898923753853008, -0.885087397885669, + -0.855450011554693, -0.928400935973027, -0.957878118093046, + -0.943449211003558, -0.914268304444613, -0.986832328492429, + -1.01578653889181, -1.00084385973427, -0.972146535368913, + -1.04418965225742, -1.07259276562304, -1.05721933017309, + -1.02903159495368, -1.08654036198463, -1.10048795834622, + -1.08363260984556, -1.07042597000933, -1.1138320131687, + -1.12717606799118, -1.10892972231476, -1.09628116608016, + -1.13989238088601, -1.15260869378084, -1.13306591228508, + -1.12099781729992, -1.16467448639686, -1.17674027901287, + -1.15599905432377, -1.14453248330442, -1.18813424663656, + -1.19952821426025, -1.1776897482886, -1.16684440130619, + -1.21023057407779, -1.22093293389534, -1.19810140858181, + -1.18789557843521, -1.23092546980706, -1.24091800571877, + -1.21720034702832, -1.20765087780507, -1.25018410960442, + -1.25945021349006, -1.23495584919023, -1.22607809810927, + -1.26797492283157, -1.27649963217308, -1.25134024394491, + -1.24314804656757, -1.2842696639495, -1.29203969572592, + -1.26632896616902, -1.25883460505696, -1.29904347650372, + -1.30604725728151, -1.27990061238639, -1.2731147892777, + -1.31227494943209, -1.31850264158268, -1.29203698925379, + -1.28596880082009, -1.32394616556783, -1.32938968955299, + -1.3027231547747, -1.29738007201425, -1.3340427422276, -1.33869579490222, + -1.31194745214773, -1.30733530346122, -1.34255386379294, + -1.34641193268366, -1.31970153617303, -1.31582449416038, + -1.34947230621111, -1.35253267973856, -1.32598039215686, + -1.32284096416495, -0.0321604643065659, -0.064320928613132, + -0.0631866011810454, -0.0315933005905227, -0.0964490299979958, + -0.12857713138286, -0.126314024448121, -0.0947503128145833, + -0.160640580236746, -0.192704029090632, -0.189323225944266, + -0.157818625196194, -0.224670682263042, -0.256637335435452, + -0.252155429622855, -0.220739327783561, -0.288475269049239, + -0.320313202663026, -0.314752260394248, -0.283453845008552, + -0.351990784432244, -0.383668366201461, -0.377055876364142, + -0.345904068379195, -0.415154327088666, -0.446640287975871, + -0.439009099864069, -0.408032488114106, -0.477903793026548, + -0.509167298077226, -0.500555546977205, -0.469782323420637, + -0.540178016270882, -0.571188734464537, -0.561639755266071, + -0.531097651121638, -0.601916907424212, -0.632645080383886, + -0.622207309412801, -0.591923532339436, -0.663061589788452, + -0.693478099193017, -0.682204964487331, -0.652206136950066, + -0.72355453273954, -0.753630966286062, -0.741580766564297, + -0.711892865525814, -0.783339682052806, -0.81304839781955, + -0.800284170415383, -0.77093246848984, -0.842362586883822, + -0.871676775948094, -0.858266154010518, -0.82927516221295, + -0.900570523117074, -0.929464270286053, -0.915479329568549, + -0.886872741789534, -0.957912612803043, -0.986360955320033, + -0.971878050905798, -0.943678690237174, -1.01433993941313, + -1.04231892350622, -1.02741851683935, -0.999648283872576, + -1.05480740547942, -1.06729588745261, -1.05095916505966, + -1.03918884094951, -1.07927034505588, -1.09124480265914, + -1.07355988300353, -1.0622595240316, -1.10268462490108, + -1.11412444714303, -1.09518298200098, -1.08437143250225, + -1.1250102341533, -1.13589602116357, -1.11579298800337, + -1.10548798500217, -1.14620962813983, -1.15652323511608, + -1.13535672194356, -1.12557485497346, -1.16624781342778, + -1.17597239173947, -1.15384337489713, -1.14460004842034, + -1.18509242709545, -1.19421246245142, -1.17122457787452, + -1.16253397638583, -1.20271381004475, -1.21121515763808, + -1.18747446608593, -1.17934952198023, -1.21908507418861, + -1.22695499073914, -1.20256973753337, -1.19502210180965, + -1.23418216336111, -1.24140933598309, -1.21648970579716, + -1.20952972166527, -1.24798390781249, -1.25455847964189, + -1.22921634689739, -1.22285302634728, -1.26047207216538, + -1.26638566468888, -1.24073434012396, -1.23497534351068, + -1.27163139672385, -1.27687712875883, -1.25103110274296, + -1.24588272143346, -1.28144963204149, -1.28602213532416, + -1.26009681850058, -1.25556396062177, -1.28991756667036, + -1.29381299801657, -1.26792445986011, -1.26401063918035, + -1.29702904802789, -1.30024509803922, -1.27450980392157, + -1.27121713189084, -0.0310441420718141, -0.0620882841436283, + -0.0609899671062112, -0.0304949835531056, -0.093105523160803, + -0.124122762177978, -0.121931499907834, -0.0914607335070227, + -0.155086256029945, -0.186049749881913, -0.182776273819559, + -0.152353886863696, -0.21693277820819, -0.247815806534468, + -0.243476183446081, -0.21312622863282, -0.27859183125487, + -0.309367855975272, -0.303983451556296, -0.273729817501189, + -0.340010581407195, -0.370653306839118, -0.364250737314095, + -0.334117094435196, -0.401136739265722, -0.431620171692326, + -0.424231243520582, -0.394240990417338, -0.46191867824666, + -0.492217184800994, -0.483878822624783, -0.454055033072683, + -0.522305551532688, -0.552393918264382, -0.543148081262693, + -0.513513451943738, -0.582247407257352, -0.612100896250322, + -0.601994483087842, -0.572571282175268, -0.641695301662106, + -0.671289707073889, -0.660374449660448, -0.631184466374145, + -0.700601409969667, -0.729913112865446, -0.718245459166594, + -0.689309954413521, -0.758919134722523, -0.787925156579601, + -0.77556614274382, -0.746905800955207, -0.816603211341154, + -0.845281266102707, -0.832296378194897, -0.803931260469358, + -0.873609810662868, -0.90193835522303, -0.88839738087751, + -0.860346879536203, -0.929896638228951, -0.957854921234872, + -0.943831791563947, -0.916114586220728, -0.985423030095216, + -1.01299113895556, -0.998563761071767, -0.971197776317857, + -1.02406610386499, -1.03514106877443, -1.01932297248919, + -1.00894336678048, -1.04578872907158, -1.05643638936873, + -1.03931289573393, -1.02931793411156, -1.06663961129069, + -1.07684283321264, -1.05850268442431, -1.04890779007912, + -1.08658548979235, -1.09632814637207, -1.07686330474076, + -1.06768299458253, -1.10559515397112, -1.11486216157017, + -1.09436760119678, -1.08561545296877, -1.12363951404807, + -1.13241686652597, -1.11099035815481, -1.10267897967579, + -1.14069166696857, -1.14896646741117, -1.12670835694783, + -1.11884935755132, -1.15672695734632, -1.16448744728147, + -1.14150042847702, -1.13410439271242, -1.17172303331574, -1.17895861935, + -1.15534750116664, -1.14842396482183, -1.18565989716611, + -1.19236117498222, -1.16823264416727, -1.16179007266696, + -1.19851995064287, -1.20467872630351, -1.18014110570963, + -1.17418687493845, -1.21028803481326, -1.21589734332301, + -1.19106034652206, -1.18560072611585, -1.22095146440625, + -1.22600558548949, -1.20098006823603, -1.19602020737904, + -1.2305000565487, -1.23499452760791, -1.20989223671524, + -1.20543615247563, -1.23892615383287, -1.24285778005783, + -1.21779110025554, -1.21384166848539, -1.2462246416629, + -1.24959150326797, -1.22467320261438, -1.22123215143496, + -0.0299638302317317, -0.0599276604634635, -0.0588653538207158, + -0.0294326769103579, -0.0898698713828745, -0.119812082302286, + -0.117692664696737, -0.0882790092587264, -0.149711103571751, + -0.179610124841216, -0.176443975862874, -0.147068320279805, + -0.20944448396156, -0.239278843081903, -0.235081502717725, + -0.2057627392903, -0.269027214034513, -0.298775584987123, + -0.29356771841795, -0.264324610567837, -0.328416836544245, + -0.358058088101367, -0.35186543888864, -0.322716578653295, + -0.387571331695131, -0.417084575288895, -0.409937907057208, + -0.380901672972924, -0.446449212330639, -0.475813849372383, + -0.467748876119982, -0.438843391588595, -0.505009617915082, + -0.534205386457781, -0.525262691652869, -0.496505783886425, + -0.563212407095875, -0.592219427733969, -0.582444372380096, + -0.553853532016482, -0.621018248636609, -0.64981706953925, + -0.639259689418052, -0.610852030899074, -0.678388710514952, + -0.706960351490655, -0.695675243814717, -0.667467466616384, + -0.73528634698354, -0.763612342476425, -0.751658542209029, + -0.723666893011873, -0.791674783396637, -0.81973722431685, + -0.807178070438803, -0.779418306323916, -0.847518798610412, + -0.875300372903974, -0.862203364930438, -0.834690717684621, + -0.902784404770152, -0.93026843663633, -0.916705081708714, + -0.889454223319576, -0.957438924303689, -0.984609411971048, + -0.970655062870329, -0.943680072289521, -0.994316457141357, + -1.00402350231167, -0.988724032134141, -0.979689547502235, + -1.0133871652158, -1.02275082811994, -1.00618876050596, + -0.997456396320049, -1.03175734005482, -1.04076385198969, + -1.02302501955507, -1.01460689003051, -1.04940025331402, + -1.05803665463835, -1.03921000453594, -1.03111751204551, + -1.06629082413043, -1.07454499362251, -1.05472238604825, + -1.04696619529209, -1.08240567593868, -1.09026635825484, + -1.06954235835487, -1.06213237220156, -1.09772318942644, + -1.10518002059803, -1.08365168424824, -1.07659702130155, + -1.11222355150914, -1.11926708242024, -1.09703373636347, + -1.09034271030585, -1.12588880021296, -1.13251051800568, + -1.10967353484472, -1.1033536356041, -1.1387028653645, -1.14489521272331, + -1.12155778127935, -1.11561565806204, -1.15065160499484, + -1.15640799726637, -1.13267488882311, -1.12711633505123, + -1.16172283737572, -1.16703767748508, -1.14301500844809, + -1.1378449486356, -1.17190636861502, -1.17677505974497, + -1.15257005125392, -1.147792529851, -1.18119401574922, -1.18561297175348, + -1.16133370679171, -1.15695187902282, -1.18957962528045, + -1.19354627880743, -1.16930145735932, -1.16531758207552, + -1.19705908711613, -1.20057189542484, -1.17647058823529, + -1.17288602279731, -0.0289195287863187, -0.0578390575726375, + -0.0568127613245593, -0.0284063806622796, -0.0867420746642103, + -0.115645091755783, -0.113597518814829, -0.0852051400696943, + -0.144515122862163, -0.173385153968543, -0.170326332074213, + -0.141961925444521, -0.20220579952315, -0.231026445077757, + -0.226971387437788, -0.198648859756, -0.259781417388168, + -0.288536389698579, -0.283505060979208, -0.255238224208498, + -0.317209549843393, -0.345882709988208, -0.339899981087776, + -0.311702521033492, -0.374458104376893, -0.403033498765579, + -0.396129090473949, -0.368014535780863, -0.431495395278485, + -0.459957291791392, -0.452165707462801, -0.424147398968375, + -0.488290215418062, -0.516623139044733, -0.507983586436597, + -0.480074646949699, -0.544811906939781, -0.573000674834828, + -0.563556977289561, -0.535770281863079, -0.601030430711963, + -0.629060186589098, -0.618860683760144, -0.591208830524852, + -0.656916434375394, -0.684772682161691, -0.673870120508666, + -0.646365402134405, -0.712441318835856, -0.740109955510021, + -0.728561368811012, -0.701215744659839, -0.767577303050271, + -0.795044650590521, -0.782911230742239, -0.755736299776625, + -0.822297486959704, -0.849550323328887, -0.836897281727336, + -0.809904256234787, -0.876575912426646, -0.903601501524406, + -0.890497921340098, -0.863697601533717, -0.930387622038546, + -0.957173742552686, -0.943692422235042, -0.91709517178757, + -0.965558465308508, -0.97394318806433, -0.959162343994519, + -0.951427383114781, -0.982065653488556, -0.990188118912782, + -0.974187477319609, -0.966674910657064, -0.998037811193476, + -1.00588750347417, -0.988749987393267, -0.981468732356438, + -1.0134545247183, -1.02102154596242, -1.00283308738891, + -0.995791537391088, -1.02829663861777, -1.03557173127311, + -1.01642107649797, -1.00962708194344, -1.0425462990996, + -1.04952086692608, -1.0294993754973, -1.02296022599763, + -1.05618699446904, -1.06285312201199, -1.04205455977575, + -1.03577696763652, -1.06920359253319, -1.07555406305439, + -1.0540743897453, -1.04806447476053, -1.08158237488028, + -1.08761068670617, -1.06554783856762, -1.05981111415646, + -1.09331106795627, -1.09901144920637, -1.07646511713339, + -1.0710064778505, -1.10437887086842, -1.10974629253047, + -1.08681769623783, -1.08164140668561, -1.11477647985277, + -1.11980666717507, -1.09659832590205, -1.09170801106994, + -1.12449610935017, -1.12918555152527, -1.10580105179662, + -1.10119968884934, -1.13353150964306, -1.13787746776086, -1.11442122873, + -1.11011114026331, -1.14187798101312, -1.14587849426538, + -1.12245553117144, -1.11843837995072, -1.14953238438759, + -1.1531862745098, -1.12990196078431, -1.12617874597788, + -0.0279112377355752, -0.0558224754711504, -0.0548321896177415, + -0.0274160948088707, -0.0837221330048104, -0.11162179053847, + -0.109646062262112, -0.0822391259399265, -0.139498313901182, + -0.167374837263894, -0.164423342453574, -0.137034702357843, + -0.195216724892961, -0.223058612522029, -0.21914583760627, + -0.191784590029922, -0.250854441315834, -0.27865027010964, + -0.273795479240071, -0.246470658423171, -0.30638872130464, + -0.33412717249964, -0.328354363911504, -0.301074921575788, + -0.361797057311008, -0.389466942122377, -0.382804793770804, + -0.355579578841154, -0.417057227090199, -0.444647512058021, + -0.437129316653241, -0.409967055212022, -0.47214734404163, + -0.499647176025238, -0.491310765613879, -0.46422004113356, + -0.527045906789068, -0.554444637552899, -0.545332297816237, + -0.518321531715058, -0.581731847888166, -0.609019058223434, + -0.599177432686724, -0.572254865251481, -0.636184581550994, + -0.663350104878553, -0.652830089248441, -0.626003760967583, + -0.690384050279471, -0.717417995680389, -0.706274622549766, + -0.679552355899104, -0.744310770302055, -0.771203544923721, + -0.759495859105203, -0.732885240827484, -0.797945875710745, + -0.824688206497769, -0.812479131268202, -0.785987495186702, + -0.851271161198434, -0.8778541158991, -0.865210310458101, + -0.838844720863152, -0.904269123299787, -0.930684130700474, + -0.917675839165906, -0.891443074812004, -0.937792128366447, + -0.94490012603242, -0.930637908070322, -0.924156873618114, + -0.951824193889834, -0.958748261747248, -0.943309046174887, + -0.936973477122605, -0.965481024706664, -0.972213787666081, + -0.955677587938894, -0.949493317056891, -0.978748304005185, + -0.98528282034429, -0.96773255329967, -0.961705070619282, + -0.991612597433126, -0.997942374521963, -0.979463672545954, + -0.973598112922812, -1.00406138353083, -1.0101803925397, + -0.990861409582094, -0.985162541064024, -1.01608308209638, + -1.02198577165306, -1.00191698353037, -0.996389196556232, + -1.02766708041848, -1.03334838918391, -1.01262238862251, + -1.00726968607644, -1.03880375731769, -1.04425912545147, + -1.02297041233532, -1.01779640047891, -1.04948450494143, + -1.05470988443139, -1.03295465172939, -1.02796253203235, + -1.05970174826359, -1.0646936120958, -1.04256952795378, + -1.03776208984158, -1.0694489622444, -1.074204312393, -1.05181029888394, + -1.04718991341886, -1.07872068661169, -1.08323706083038, + -1.06067306986414, -1.05624168437404, -1.08751253823022, + -1.09178801563006, -1.06915480253011, -1.06491393619713, + -1.09582122103086, -1.09985442643167, -1.0772533216919, + -1.07320406211101, -1.10364453347727, -1.10743464052288, + -1.08496732026144, -1.08111032097667, -0.026938957079501, + -0.0538779141590021, -0.0529236387002626, -0.0264618193501313, + -0.0808100464046748, -0.107742178650347, -0.105838295038583, + -0.079380966869423, -0.134660676688807, -0.161579174727267, + -0.15873500700096, -0.132286651019771, -0.188477260070994, + -0.21537534541472, -0.211604853223171, -0.185169930112065, + -0.242246285817513, -0.269117226220305, -0.26443897320054, + -0.238021913211855, -0.295954350927985, -0.322791475635664, + -0.317228587359824, -0.290833780280182, -0.349588190497477, + -0.376384905359289, -0.369965016947774, -0.343596802153799, + -0.40313470776578, -0.42988451017227, -0.4226397036913, + -0.396302360319537, -0.456581003785784, -0.483277497399297, + -0.475244229184715, -0.448941966438007, -0.509914406643739, + -0.536551315888182, -0.527770333960126, -0.50150728157242, + -0.56312250016522, -0.589693684442258, -0.580209936197792, + -0.553990135078959, -0.61619315204175, -0.642692619641242, + -0.632555150034043, -0.606382543115918, -0.669114541314386, + -0.69553646298753, -0.684798303425294, -0.658676726729668, + -0.721875185151989, -0.748213907316449, -0.736931955527695, + -0.710865129476494, -0.774463964863534, -0.800714022410619, + -0.788948913553036, -0.762940434540366, -0.826870151085515, + -0.853026279760412, -0.840842249062722, -0.814895581307879, + -0.879083428087412, -0.905140576414413, -0.89260531366292, + -0.866723781362821, -0.911017446315174, -0.916894316215936, + -0.90315072436155, -0.897878019012235, -0.922662786419638, + -0.92843125662334, -0.913553467071793, -0.908352095716671, + -0.934086980594382, -0.939742704565423, -0.923807821191953, + -0.918680644131873, -0.945281591174685, -0.950820477783946, + -0.933908402268221, -0.928858111730087, -0.956238700576509, + -0.961656923369073, -0.943850174192191, -0.938879288230206, + -0.966950929232375, -0.972244935095678, -0.953628460609263, + -0.948739317400727, -0.977411452308455, -0.982577969521232, + -0.963238955512094, -0.958433708060678, -0.987614015165015, + -0.992650060808798, -0.972677732995088, -0.967958344253591, + -0.997552947525188, -1.00245583424158, -0.981941256147836, + -0.977309494571462, -1.00722317631997, -1.01199051839837, + -0.991026385067353, -0.986483820607594, -1.01662023718037, + -1.02124995596238, -0.999930383970971, -0.995478384519162, + -1.02574028455062, -1.03023061313885, -1.00865092739377, + -1.00429065568237, -1.03458010039958, -1.03892958766031, + -1.01718610545648, -1.01291851642513, -1.04313710151069, + -1.04734461536107, -1.02553442819203, -1.02136026682426, + -1.05140934533369, -1.05547407530631, -1.03369482892072, + -1.02961462855637, -1.05939553438518, -1.06331699346405, + -1.04166666666667, -1.03768074779369, -0.0260026868180963, + -0.0520053736361926, -0.0510871085721225, -0.0255435542860612, + -0.0780058148638034, -0.104006256091414, -0.102174217144245, + -0.0766306628581838, -0.130002211225039, -0.155998166358664, + -0.153261325716368, -0.127717771430306, -0.181987405057247, + -0.207976643755831, -0.20434843428849, -0.178804880002429, + -0.233956950893203, -0.259937258030576, -0.255435542860613, + -0.229891988574552, -0.285906438713428, -0.31187561939628, + -0.306522651432736, -0.280979097146674, -0.337831503936298, + -0.363787388476316, -0.357609760004858, -0.332066205718797, + -0.389727837305228, -0.415668286134141, -0.408696868576981, + -0.383153314290919, -0.441591194650525, -0.467514103166909, + -0.459783977149103, -0.434240422863042, -0.493417406503792, + -0.519320709840676, -0.510871085721226, -0.485327531435165, + -0.545202387543123, -0.571084065245571, -0.561958194293349, + -0.536414640007287, -0.596942145847664, -0.622800226449757, + -0.613045302865471, -0.58750174857941, -0.648632791940601, + -0.674465357431444, -0.664132411437594, -0.638588857151532, + -0.700270547600075, -0.726075737768706, -0.715219520009716, + -0.689675965723655, -0.751851754418072, -0.777627771067437, + -0.766306628581839, -0.740763074295778, -0.80337288208789, + -0.829117993108342, -0.817393737153961, -0.7918501828679, + -0.854830536401422, -0.880543079694502, -0.868480845726084, + -0.842937291440023, -0.88523441915469, -0.889925758614877, + -0.876700792868204, -0.872590819297144, -0.894581431077967, + -0.899237103541058, -0.884920740010324, -0.880810766439264, + -0.903855678856628, -0.908474254172198, -0.893140687152443, + -0.889030713581384, -0.913054386226795, -0.917634518281392, + -0.901360634294563, -0.897250660723503, -0.922174948047915, + -0.926715377814437, -0.909580581436683, -0.905470607865623, + -0.931214936204235, -0.935714494594033, -0.917800528578803, + -0.913690555007743, -0.94017210510527, -0.944629715616508, + -0.926020475720922, -0.921910502149862, -0.949044396772787, + -0.953459077929065, -0.934240422863042, -0.930130449291982, + -0.957829945502782, -0.962200813076499, -0.942460370005162, + -0.938350396434102, -0.966527082091908, -0.970853351107317, + -0.950680317147282, -0.946570343576222, -0.975134337618752, + -0.979415324130186, -0.958900264289401, -0.954790290718341, + -0.983650446771415, -0.987885569412644, -0.967120211431521, + -0.963010237860461, -0.992074350713853, -0.996263132015062, + -0.975340158573641, -0.971230185002581, -1.00040519948448, + -1.00454726695389, -0.98356010571576, -0.979450132144701, + -1.0086423539216, -1.0127374408893, -0.99178005285788, -0.98767007928682, + -1.01678538711132, -1.02083333333333, -1, -0.99589002642894, + -0.846926383435463, -0.850915475430904, -0.825130157993604, + -0.821261947573783, -0.854904567426344, -0.858893659421785, + -0.832866578833246, -0.828998368413425, -0.862882751417225, + -0.866871843412666, -0.840602999672888, -0.836734789253067, + -0.870860935408106, -0.874850027403546, -0.84833942051253, + -0.844471210092709, -0.878839119398987, -0.882828211394427, + -0.856075841352172, -0.852207630932351, -0.886817303389868, + -0.890806395385308, -0.863812262191814, -0.859944051771993, + -0.894795487380749, -0.898784579376189, -0.871548683031456, + -0.867680472611635, -0.90277367137163, -0.90676276336707, + -0.879285103871099, -0.875416893451277, -0.910751855362511, + -0.914740947357951, -0.88702152471074, -0.88315331429092, + -0.918730039353391, -0.922719131348832, -0.894757945550382, + -0.890889735130561, -0.926708223344272, -0.930697315339713, + -0.902494366390025, -0.898626155970204, -0.934686407335154, + -0.938675499330594, -0.910230787229667, -0.906362576809846, + -0.942664591326034, -0.946653683321475, -0.917967208069309, + -0.914098997649488, -0.950642775316915, -0.954631867312356, + -0.925703628908951, -0.92183541848913, -0.958620959307796, + -0.962610051303237, -0.933440049748593, -0.929571839328772, + -0.966599143298677, -0.970588235294118, -0.941176470588235, + -0.937308260168414, -0.795597511712102, -0.799344840556304, + -0.773559523119003, -0.769933075850421, -0.803092169400505, + -0.806839498244707, -0.780812417656168, -0.777185970387586, + -0.810586827088908, -0.81433415593311, -0.788065312193332, + -0.78443886492475, -0.818081484777312, -0.821828813621513, + -0.795318206730497, -0.791691759461915, -0.825576142465715, + -0.829323471309917, -0.802571101267661, -0.798944653999079, + -0.833070800154118, -0.83681812899832, -0.809823995804826, + -0.806197548536244, -0.840565457842522, -0.844312786686723, + -0.81707689034199, -0.813450443073408, -0.848060115530925, + -0.851807444375127, -0.824329784879155, -0.820703337610572, + -0.855554773219328, -0.85930210206353, -0.831582679416319, + -0.827956232147737, -0.863049430907731, -0.866796759751933, + -0.838835573953484, -0.835209126684901, -0.870544088596135, + -0.874291417440336, -0.846088468490648, -0.842462021222066, + -0.878038746284538, -0.88178607512874, -0.853341363027813, + -0.849714915759231, -0.885533403972941, -0.889280732817143, + -0.860594257564977, -0.856967810296395, -0.893028061661345, + -0.896775390505546, -0.867847152102142, -0.86422070483356, + -0.900522719349748, -0.90427004819395, -0.875100046639306, + -0.871473599370724, -0.908017377038151, -0.911764705882353, + -0.882352941176471, -0.878726493907888, -0.74426863998874, + -0.747774205681703, -0.721988888244403, -0.71860420412706, + -0.751279771374666, -0.754785337067629, -0.72875825647909, + -0.725373572361747, -0.758290902760592, -0.761796468453555, + -0.735527624713777, -0.732142940596433, -0.765302034146517, + -0.76880759983948, -0.742296992948464, -0.73891230883112, + -0.772313165532443, -0.775818731225406, -0.74906636118315, + -0.745681677065807, -0.779324296918369, -0.782829862611332, + -0.755835729417837, -0.752451045300494, -0.786335428304294, + -0.789840993997257, -0.762605097652524, -0.759220413535181, + -0.79334655969022, -0.796852125383183, -0.769374465887211, + -0.765989781769868, -0.800357691076146, -0.803863256769109, + -0.776143834121898, -0.772759150004555, -0.807368822462071, + -0.810874388155034, -0.782913202356585, -0.779528518239242, + -0.814379953847997, -0.81788551954096, -0.789682570591271, + -0.786297886473928, -0.821391085233923, -0.824896650926886, + -0.796451938825959, -0.793067254708615, -0.828402216619849, + -0.831907782312811, -0.803221307060645, -0.799836622943302, + -0.835413348005774, -0.838918913698737, -0.809990675295332, + -0.806605991177989, -0.8424244793917, -0.845930045084663, + -0.816760043530019, -0.813375359412676, -0.849435610777626, + -0.852941176470588, -0.823529411764706, -0.820144727647363, + -0.692939768265379, -0.696203570807103, -0.670418253369803, + -0.667275332403698, -0.699467373348827, -0.702731175890551, + -0.676704095302012, -0.673561174335908, -0.705994978432275, + -0.709258780973999, -0.682989937234221, -0.679847016268117, + -0.712522583515723, -0.715786386057447, -0.68927577916643, + -0.686132858200326, -0.719050188599171, -0.722313991140895, + -0.69556162109864, -0.692418700132535, -0.725577793682619, + -0.728841596224343, -0.701847463030849, -0.698704542064744, + -0.732105398766067, -0.735369201307791, -0.708133304963058, + -0.704990383996954, -0.738633003849515, -0.741896806391239, + -0.714419146895267, -0.711276225929163, -0.745160608932963, + -0.748424411474687, -0.720704988827476, -0.717562067861372, + -0.751688214016411, -0.754952016558135, -0.726990830759686, + -0.723847909793581, -0.758215819099859, -0.761479621641583, + -0.733276672691895, -0.73013375172579, -0.764743424183307, + -0.768007226725031, -0.739562514624104, -0.736419593658, + -0.771271029266755, -0.774534831808479, -0.745848356556313, + -0.742705435590209, -0.777798634350203, -0.781062436891927, + -0.752134198488523, -0.748991277522418, -0.784326239433652, + -0.787590041975376, -0.758420040420732, -0.755277119454627, + -0.7908538445171, -0.794117647058823, -0.764705882352941, + -0.761562961386837, -0.641610896542018, -0.644632935932503, + -0.618847618495203, -0.615946460680337, -0.647654975322988, + -0.650677014713473, -0.624649934124934, -0.621748776310069, + -0.653699054103958, -0.656721093494444, -0.630452249754666, + -0.6275510919398, -0.659743132884929, -0.662765172275414, + -0.636254565384398, -0.633353407569532, -0.665787211665899, + -0.668809251056385, -0.642056881014129, -0.639155723199264, + -0.67183129044687, -0.674853329837355, -0.647859196643861, + -0.644958038828995, -0.67787536922784, -0.680897408618325, + -0.653661512273592, -0.650760354458727, -0.68391944800881, + -0.686941487399296, -0.659463827903324, -0.656562670088458, + -0.689963526789781, -0.692985566180266, -0.665266143533055, + -0.66236498571819, -0.696007605570751, -0.699029644961236, + -0.671068459162787, -0.668167301347921, -0.702051684351722, + -0.705073723742207, -0.676870774792519, -0.673969616977653, + -0.708095763132692, -0.711117802523177, -0.68267309042225, + -0.679771932607384, -0.714139841913662, -0.717161881304147, + -0.688475406051982, -0.685574248237116, -0.720183920694633, + -0.723205960085118, -0.694277721681713, -0.691376563866847, + -0.726227999475603, -0.729250038866089, -0.700080037311445, + -0.697178879496579, -0.732272078256574, -0.735294117647059, + -0.705882352941176, -0.702981195126311, -0.590282024818656, + -0.593062301057903, -0.567276983620603, -0.564617588956976, + -0.595842577297149, -0.598622853536396, -0.572595772947857, + -0.56993637828423, -0.601403129775642, -0.604183406014888, + -0.57791456227511, -0.575255167611484, -0.606963682254135, + -0.609743958493381, -0.583233351602364, -0.580573956938737, + -0.612524234732627, -0.615304510971874, -0.588552140929618, + -0.585892746265991, -0.61808478721112, -0.620865063450367, + -0.593870930256872, -0.591211535593245, -0.623645339689613, + -0.626425615928859, -0.599189719584126, -0.596530324920499, + -0.629205892168106, -0.631986168407352, -0.60450850891138, + -0.601849114247753, -0.634766444646598, -0.637546720885845, + -0.609827298238634, -0.607167903575007, -0.640326997125091, + -0.643107273364337, -0.615146087565888, -0.612486692902261, + -0.645887549603584, -0.64866782584283, -0.620464876893142, + -0.617805482229515, -0.651448102082077, -0.654228378321323, + -0.625783666220396, -0.623124271556769, -0.657008654560569, + -0.659788930799816, -0.63110245554765, -0.628443060884023, + -0.662569207039062, -0.665349483278308, -0.636421244874904, + -0.633761850211277, -0.668129759517555, -0.670910035756801, + -0.641740034202158, -0.639080639538531, -0.673690311996048, + -0.676470588235294, -0.647058823529412, -0.644399428865785, + -0.538953153095295, -0.541491666183302, -0.515706348746002, + -0.513288717233614, -0.54403017927131, -0.546568692359318, + -0.520541611770778, -0.51812398025839, -0.549107205447325, + -0.551645718535333, -0.525376874795555, -0.522959243283167, + -0.55418423162334, -0.556722744711348, -0.530212137820331, + -0.527794506307943, -0.559261257799355, -0.561799770887363, + -0.535047400845108, -0.53262976933272, -0.564338283975371, + -0.566876797063378, -0.539882663869884, -0.537465032357496, + -0.569415310151386, -0.571953823239393, -0.54471792689466, + -0.542300295382272, -0.574492336327401, -0.577030849415408, + -0.549553189919437, -0.547135558407048, -0.579569362503416, + -0.582107875591423, -0.554388452944213, -0.551970821431825, + -0.584646388679431, -0.587184901767439, -0.559223715968989, + -0.556806084456601, -0.589723414855446, -0.592261927943454, + -0.564058978993766, -0.561641347481377, -0.594800441031461, + -0.597338954119469, -0.568894242018542, -0.566476610506154, + -0.599877467207476, -0.602415980295484, -0.573729505043318, + -0.57131187353093, -0.604954493383491, -0.607493006471499, + -0.578564768068095, -0.576147136555706, -0.610031519559507, + -0.612570032647514, -0.583400031092871, -0.580982399580483, + -0.615108545735522, -0.617647058823529, -0.588235294117647, + -0.585817662605259, -0.487624281371933, -0.489921031308702, + -0.464135713871402, -0.461959845510253, -0.492217781245471, + -0.49451453118224, -0.468487450593701, -0.466311582232551, + -0.496811281119008, -0.499108031055777, -0.472839187315999, + -0.47066331895485, -0.501404780992546, -0.503701530929315, + -0.477190924038298, -0.475015055677149, -0.505998280866083, + -0.508295030802852, -0.481542660760597, -0.479366792399447, + -0.510591780739621, -0.51288853067639, -0.485894397482895, + -0.483718529121746, -0.515185280613158, -0.517482030549927, + -0.490246134205194, -0.488070265844045, -0.519778780486696, + -0.522075530423465, -0.494597870927493, -0.492422002566343, + -0.524372280360233, -0.526669030297002, -0.498949607649792, + -0.496773739288642, -0.528965780233771, -0.53126253017054, + -0.50330134437209, -0.501125476010941, -0.533559280107308, + -0.535856030044077, -0.507653081094389, -0.50547721273324, + -0.538152779980846, -0.540449529917615, -0.512004817816688, + -0.509828949455538, -0.542746279854383, -0.545043029791152, + -0.516356554538986, -0.514180686177837, -0.547339779727921, + -0.54963652966469, -0.520708291261285, -0.518532422900136, + -0.551933279601458, -0.554230029538227, -0.525060027983584, + -0.522884159622434, -0.556526779474996, -0.558823529411765, + -0.529411764705882, -0.527235896344733, -0.436295409648572, + -0.438350396434102, -0.412565078996802, -0.410630973786891, + -0.440405383219632, -0.442460370005162, -0.416433289416623, + -0.414499184206712, -0.444515356790692, -0.446570343576221, + -0.420301499836444, -0.418367394626533, -0.448625330361752, + -0.450680317147282, -0.424169710256265, -0.422235605046354, + -0.452735303932811, -0.454790290718341, -0.428037920676086, + -0.426103815466175, -0.456845277503871, -0.458900264289401, + -0.431906131095907, -0.429972025885996, -0.460955251074931, + -0.463010237860461, -0.435774341515728, -0.433840236305817, + -0.465065224645991, -0.467120211431521, -0.439642551935549, + -0.437708446725639, -0.469175198217051, -0.471230185002581, + -0.44351076235537, -0.44157665714546, -0.473285171788111, + -0.475340158573641, -0.447378972775191, -0.445444867565281, + -0.477395145359171, -0.479450132144701, -0.451247183195012, + -0.449313077985102, -0.481505118930231, -0.483560105715761, + -0.455115393614833, -0.453181288404923, -0.485615092501291, + -0.48767007928682, -0.458983604034654, -0.457049498824744, + -0.48972506607235, -0.49178005285788, -0.462851814454475, + -0.460917709244565, -0.49383503964341, -0.49589002642894, + -0.466720024874297, -0.464785919664386, -0.49794501321447, -0.5, + -0.470588235294118, -0.468654130084207, -0.38496653792521, + -0.386779761559502, -0.360994444122201, -0.35930210206353, + -0.388592985193793, -0.390406208828084, -0.364379128239545, + -0.362686786180873, -0.392219432462375, -0.394032656096666, + -0.367763812356888, -0.366071470298217, -0.395845879730957, + -0.397659103365248, -0.371148496474232, -0.36945615441556, + -0.399472326999539, -0.401285550633831, -0.374533180591575, + -0.372840838532904, -0.403098774268122, -0.404911997902413, + -0.377917864708919, -0.376225522650247, -0.406725221536704, + -0.408538445170995, -0.381302548826262, -0.37961020676759, + -0.410351668805286, -0.412164892439577, -0.384687232943606, + -0.382994890884934, -0.413978116073868, -0.41579133970816, + -0.388071917060949, -0.386379575002277, -0.417604563342451, + -0.419417786976742, -0.391456601178292, -0.389764259119621, + -0.421231010611033, -0.423044234245324, -0.394841285295636, + -0.393148943236964, -0.424857457879615, -0.426670681513906, + -0.398225969412979, -0.396533627354307, -0.428483905148197, + -0.430297128782489, -0.401610653530323, -0.399918311471651, + -0.43211035241678, -0.433923576051071, -0.404995337647666, + -0.403302995588994, -0.435736799685362, -0.437550023319653, + -0.40838002176501, -0.406687679706338, -0.439363246953944, + -0.441176470588235, -0.411764705882353, -0.410072363823681, + -0.333637666201849, -0.335209126684901, -0.309423809247601, + -0.307973230340168, -0.336780587167954, -0.338352047651006, + -0.312324967062467, -0.310874388155034, -0.339923508134058, + -0.341494968617111, -0.315226124877333, -0.3137755459699, + -0.343066429100163, -0.344637889583215, -0.318127282692199, + -0.316676703784766, -0.346209350066268, -0.34778081054932, + -0.321028440507065, -0.319577861599632, -0.349352271032372, + -0.350923731515424, -0.32392959832193, -0.322479019414497, + -0.352495191998477, -0.354066652481529, -0.326830756136796, + -0.325380177229363, -0.355638112964581, -0.357209573447634, + -0.329731913951662, -0.328281335044229, -0.358781033930686, + -0.360352494413738, -0.332633071766528, -0.331182492859095, + -0.361923954896791, -0.363495415379843, -0.335534229581393, + -0.334083650673961, -0.365066875862895, -0.366638336345947, + -0.338435387396259, -0.336984808488826, -0.368209796829, + -0.369781257312052, -0.341336545211125, -0.339885966303692, + -0.371352717795104, -0.372924178278157, -0.344237703025991, + -0.342787124118558, -0.374495638761209, -0.376067099244261, + -0.347138860840857, -0.345688281933424, -0.377638559727314, + -0.379210020210366, -0.350040018655722, -0.348589439748289, + -0.380781480693418, -0.382352941176471, -0.352941176470588, + -0.351490597563155, -0.282308794478488, -0.283638491810301, + -0.257853174373001, -0.256644358616807, -0.284968189142115, + -0.286297886473928, -0.260270805885389, -0.259061990129195, + -0.287627583805742, -0.288957281137555, -0.262688437397777, + -0.261479621641583, -0.290286978469369, -0.291616675801182, + -0.265106068910166, -0.263897253153972, -0.292946373132996, + -0.294276070464809, -0.267523700422554, -0.26631488466636, + -0.295605767796623, -0.296935465128436, -0.269941331934942, + -0.268732516178748, -0.29826516246025, -0.299594859792063, + -0.27235896344733, -0.271150147691136, -0.300924557123877, + -0.30225425445569, -0.274776594959718, -0.273567779203524, + -0.303583951787504, -0.304913649119317, -0.277194226472106, + -0.275985410715912, -0.306243346451131, -0.307573043782944, + -0.279611857984495, -0.2784030422283, -0.308902741114757, + -0.310232438446571, -0.282029489496883, -0.280820673740689, + -0.311562135778384, -0.312891833110198, -0.284447121009271, + -0.283238305253077, -0.314221530442011, -0.315551227773825, + -0.286864752521659, -0.285655936765465, -0.316880925105638, + -0.318210622437452, -0.289282384034047, -0.288073568277853, + -0.319540319769265, -0.320870017101079, -0.291700015546435, + -0.290491199790241, -0.322199714432892, -0.323529411764706, + -0.294117647058824, -0.292908831302629, -0.230979922755126, + -0.232067856935701, -0.206282539498401, -0.205315486893446, + -0.233155791116276, -0.23424372529685, -0.208216644708311, + -0.207249592103356, -0.235331659477425, -0.236419593658, + -0.210150749918222, -0.209183697313267, -0.237507527838574, + -0.238595462019149, -0.212084855128132, -0.211117802523177, + -0.239683396199724, -0.240771330380298, -0.214018960338043, + -0.213051907733088, -0.241859264560873, -0.242947198741448, + -0.215953065547954, -0.214986012942998, -0.244035132922022, + -0.245123067102597, -0.217887170757864, -0.216920118152909, + -0.246211001283172, -0.247298935463746, -0.219821275967775, + -0.218854223362819, -0.248386869644321, -0.249474803824896, + -0.221755381177685, -0.22078832857273, -0.25056273800547, + -0.251650672186045, -0.223689486387596, -0.22272243378264, + -0.25273860636662, -0.253826540547194, -0.225623591597506, + -0.224656538992551, -0.254914474727769, -0.256002408908344, + -0.227557696807417, -0.226590644202461, -0.257090343088918, + -0.258178277269493, -0.229491802017327, -0.228524749412372, + -0.259266211450068, -0.260354145630643, -0.231425907227238, + -0.230458854622282, -0.261442079811217, -0.262530013991792, + -0.233360012437148, -0.232392959832193, -0.263617948172367, + -0.264705882352941, -0.235294117647059, -0.234327065042104, + -0.179651051031765, -0.180497222061101, -0.154711904623801, + -0.153986615170084, -0.181343393090437, -0.182189564119772, + -0.156162483531234, -0.155437194077517, -0.183035735149108, + -0.183881906178444, -0.157613062438666, -0.15688777298495, + -0.18472807720778, -0.185574248237116, -0.159063641346099, + -0.158338351892383, -0.186420419266452, -0.187266590295788, + -0.160514220253532, -0.159788930799816, -0.188112761325124, + -0.188958932354459, -0.161964799160965, -0.161239509707249, + -0.189805103383795, -0.190651274413131, -0.163415378068398, + -0.162690088614682, -0.191497445442467, -0.192343616471803, + -0.164865956975831, -0.164140667522114, -0.193189787501139, + -0.194035958530474, -0.166316535883264, -0.165591246429547, + -0.19488212955981, -0.195728300589146, -0.167767114790697, + -0.16704182533698, -0.196574471618482, -0.197420642647818, + -0.16921769369813, -0.168492404244413, -0.198266813677154, + -0.19911298470649, -0.170668272605563, -0.169942983151846, + -0.199959155735825, -0.200805326765161, -0.172118851512995, + -0.171393562059279, -0.201651497794497, -0.202497668823833, + -0.173569430420428, -0.172844140966712, -0.203343839853169, + -0.204190010882505, -0.175020009327861, -0.174294719874145, + -0.205036181911841, -0.205882352941176, -0.176470588235294, + -0.175745298781578, -0.128322179308403, -0.128926587186501, + -0.1031412697492, -0.102657743446723, -0.129530995064598, + -0.130135402942695, -0.104108322354156, -0.103624796051678, + -0.130739810820792, -0.131344218698889, -0.105075374959111, + -0.104591848656633, -0.131948626576986, -0.132553034455083, + -0.106042427564066, -0.105558901261589, -0.13315744233318, + -0.133761850211277, -0.107009480169021, -0.106525953866544, + -0.134366258089374, -0.134970665967471, -0.107976532773977, + -0.107493006471499, -0.135575073845568, -0.136179481723665, + -0.108943585378932, -0.108460059076454, -0.136783889601762, + -0.137388297479859, -0.109910637983887, -0.10942711168141, + -0.137992705357956, -0.138597113236053, -0.110877690588843, + -0.110394164286365, -0.13920152111415, -0.139805928992247, + -0.111844743193798, -0.11136121689132, -0.140410336870344, + -0.141014744748441, -0.112811795798753, -0.112328269496275, + -0.141619152626538, -0.142223560504635, -0.113778848403708, + -0.113295322101231, -0.142827968382732, -0.143432376260829, + -0.114745901008664, -0.114262374706186, -0.144036784138927, + -0.144641192017024, -0.115712953613619, -0.115229427311141, + -0.145245599895121, -0.145850007773218, -0.116680006218574, + -0.116196479916097, -0.146454415651315, -0.147058823529412, + -0.117647058823529, -0.117163532521052, -0.0769933075850421, + -0.0773559523119003, -0.0515706348746002, -0.0513288717233614, + -0.0777185970387585, -0.0780812417656167, -0.0520541611770778, + -0.051812398025839, -0.078443886492475, -0.0788065312193332, + -0.0525376874795554, -0.0522959243283166, -0.0791691759461914, + -0.0795318206730496, -0.0530212137820331, -0.0527794506307943, + -0.0798944653999079, -0.0802571101267661, -0.0535047400845107, + -0.0532629769332719, -0.0806197548536243, -0.0809823995804826, + -0.0539882663869884, -0.0537465032357495, -0.0813450443073408, + -0.081707689034199, -0.054471792689466, -0.0542300295382272, + -0.0820703337610572, -0.0824329784879154, -0.0549553189919436, + -0.0547135558407048, -0.0827956232147737, -0.0831582679416319, + -0.0554388452944213, -0.0551970821431824, -0.0835209126684901, + -0.0838835573953484, -0.0559223715968989, -0.0556806084456601, + -0.0842462021222066, -0.0846088468490648, -0.0564058978993765, + -0.0561641347481377, -0.084971491575923, -0.0853341363027812, + -0.0568894242018542, -0.0566476610506153, -0.0856967810296395, + -0.0860594257564977, -0.0573729505043318, -0.057131187353093, + -0.0864220704833559, -0.0867847152102141, -0.0578564768068094, + -0.0576147136555706, -0.0871473599370724, -0.0875100046639306, + -0.0583400031092871, -0.0580982399580482, -0.0878726493907888, + -0.0882352941176471, -0.0588235294117647, -0.0585817662605259, + -0.0256644358616806, -0.0257853174373001, -0.0259061990129195, + -0.0260270805885389, -0.0261479621641583, -0.0262688437397777, + -0.0263897253153971, -0.0265106068910165, -0.0266314884666359, + -0.0267523700422553, -0.0268732516178748, -0.0269941331934942, + -0.0271150147691136, -0.027235896344733, -0.0273567779203524, + -0.0274776594959718, -0.0275985410715912, -0.0277194226472106, + -0.02784030422283, -0.0279611857984494, -0.0280820673740688, + -0.0282029489496882, -0.0283238305253077, -0.0284447121009271, + -0.0285655936765465, -0.0286864752521659, -0.0288073568277853, + -0.0289282384034047, -0.0290491199790241, -0.0291700015546435, + -0.0292908831302629, -0.0294117647058824, -1.99943358938626, + -1.96404173804571, -1.99773467836602, -1.96280569831365, + -1.92787671826128, -1.92921613690842, -1.99490422922051, + -1.95938547069813, -1.99094384514617, -1.95596524308261, + -1.92098664101906, -1.92443167964017, -1.98585576934658, + -1.95036825222106, -1.97964288376187, -1.9447712613595, + -1.90989963895713, -1.91544313998809, -1.97230870743637, + -1.93700986295819, -1.96385739452541, -1.92924846455688, + -1.89463953458834, -1.90226958677273, -1.95429373194232, + -1.91933991740133, -1.94362313664708, -1.90943137024578, + -1.87523960384447, -1.8849395692164, -1.93185165257814, + -1.89739779710402, -1.91898594722899, -1.88536422396227, + -1.85174250069554, -1.86349105227, -1.90503330787172, -1.87123256146969, + -1.89000163742934, -1.85710089897711, -1.82420016052488, + -1.83797133061021, -1.87389944999952, -1.84090283661627, + -1.85673586603215, -1.82470477425544, -1.79267368247874, + -1.80843692150181, -1.83852060716333, -1.80647668256925, + -1.81926399070904, -1.78824859088306, -1.75723319105708, + -1.77495343676791, -1.79897692382121, -1.76803143908376, + -1.77767089730985, -1.74781428728446, -1.71795767725908, + -1.73759543415808, -1.75535797913451, -1.72565355044521, + -1.73205080756888, -1.70349281360595, -1.67493481964303, + -1.69644624845106, -1.7077625840423, -1.67943836964513, + -1.68250706566236, -1.65538392568431, -1.62826078570627, + -1.65159780267465, -1.65629855742274, -1.62948994237603, + -1.62915190410067, -1.60359595906775, -1.57804001403482, + -1.60315039987054, -1.60108248184872, -1.57592077133438, + -1.57210618948558, -1.54824558360102, -1.52438497771646, + -1.55121249587564, -1.54223943949078, -1.51885156136587, + -1.51149914870852, -1.48945753913073, -1.46741592955294, + -1.4959004536347, -1.47990272876577, -1.45841094603009, + -1.44746807621014, -1.42736435292944, -1.40726062964875, + -1.43733827960084, -1.4142135623731, -1.39399097465152, + -1.38015802296422, -1.36061759637359, -1.34107716978296, + -1.37416889971585, -1.34532074740251, -1.32573524672741, + -1.30972146789057, -1.29085289708124, -1.27198432627191, + -1.30653074802743, -1.27338034823818, -1.25453858662873, + -1.23631797244121, -1.21822427617623, -1.20013057991125, + -1.23605745309158, -1.19855533302269, -1.1805582593311, -1.1601138191424, + -1.14289224248598, -1.12567066582956, -1.1629006228704, + -1.12101520448179, -1.10395783571168, -1.0812816349112, + -1.06502342893739, -1.04876522296358, -1.08721794439657, + -1.04093561594615, -1.02490682200851, -1, -0.984790215079631, + -0.969580430159261, -1.00917282656142, -0.958497973440114, + -0.943580275834351, -0.916453043454821, -0.902370336589071, + -0.888287629723321, -0.928934029941291, -0.873889024738719, + -0.860158409614917, -0.830830026003773, -0.817946482640763, + -0.805062939277754, -0.846675284500538, -0.787300436323883, + -0.774826182349743, -0.743324911320656, -0.731705882058723, + -0.72008685279679, -0.762574896037272, -0.698928359198197, + -0.687772880620568, -0.654135926634844, -0.643839879182414, + -0.633543831729984, -0.676815342263387, -0.608972984539814, + -0.59919168979635, -0.563465113682859, -0.554543500410285, + -0.545621887137712, -0.589582859433848, -0.517638090205042, + -0.509279256406268, -0.471517871018856, -0.46401501240225, + -0.456512153785644, -0.501067020461678, -0.425130579105954, + -0.418235242672085, -0.378502488720821, -0.372455472941921, + -0.36640845716302, -0.411460305474332, -0.331660010508749, + -0.326261874208999, -0.28462967654657, -0.280068275476077, + -0.275506874405584, -0.320957665784302, -0.237438125314611, + -0.233563481919581, -0.190112086608367, -0.187058688363085, + -0.184005290117803, -0.229756082261693, -0.142678366398466, + -0.14034603911856, -0.0951638316474855, -0.0936333898740354, + -0.0921029481005853, -0.138054119109194, -0.0475953950922157, + -0.0468166949370179, -0.0460514740502928, -1.89520996168024, + -1.89376959656309, -1.8596624748649, -1.86120378645206, + -1.89030033072475, -1.88683106488641, -1.85267548875376, + -1.85616898180933, -1.88133979510179, -1.87584852531717, + -1.84179741167721, -1.84723645021548, -1.86834672885047, + -1.86084493238377, -1.82705033017919, -1.8344238709282, + -1.85134864098877, -1.84185234959378, -1.80846509534309, + -1.81775771276114, -1.83038211319679, -1.8189118767998, + -1.78608125290405, -1.79727317412357, -1.80549271694743, + -1.79207355709506, -1.75994695366523, -1.77301410328464, + -1.77673491027239, -1.76139626344972, -1.7301188444207, + -1.74503289904297, -1.74417191439719, -1.72694756534466, + -1.69666193963224, -1.71339039202647, -1.70787557052477, + -1.68880357570488, -1.65964947415068, -1.67815570689146, + -1.66792617709206, -1.64704877847923, -1.61916273731544, + -1.63940610573306, -1.62441230786817, -1.60177583725711, + -1.57529088880796, -1.5972268130617, -1.57743061130636, + -1.55308538535561, -1.52813075667641, -1.55171082274218, + -1.52708559160417, -1.50108579785272, -1.47778661798897, + -1.50295868733269, -1.47348937196779, -1.44589294608286, + -1.42436996261279, -1.45107829030088, -1.416761440617, -1.38762993515113, + -1.36799924065351, -1.39618460163315, -1.35481322654338, + -1.32199651793563, -1.30291586608831, -1.33545755337091, + -1.2877781198851, -1.25355972183456, -1.23513511739722, + -1.26902549174276, -1.21801116975529, -1.18246261767603, + -1.16479465544081, -1.19996488641901, -1.14565846020878, + -1.10885430274153, -1.0920379396535, -1.12841629754716, + -1.07087193287711, -1.03288956301268, -1.01701390306178, + -1.05452592135764, -0.993809042771908, -0.954728522531135, + -0.939876614903009, -0.978445258982396, -0.914632401598656, + -0.874536280666177, -0.860784931609033, -0.900330773256022, + -0.833509409388849, -0.792482538111521, -0.779902136945289, + -0.820343534277161, -0.750611875285094, -0.708741212458667, + -0.697395572120544, -0.738648854532916, -0.666115628338139, + -0.623490044217611, -0.613436256705238, -0.655415914412891, + -0.580200119197522, -0.536910194177434, -0.528198501217156, + -0.570817378961197, -0.493048013598138, -0.449185833018841, + -0.441859512252038, -0.485029006734597, -0.404844778563585, + -0.36050372410833, -0.354598991053639, -0.398229251652838, + -0.315778262263716, -0.271052800419103, -0.266598726432621, + -0.31059885874313, -0.226038268478109, -0.181023736537116, + -0.178042182956429, -0.222320454694525, -0.13581612662946, + -0.0906085167218046, -0.0891140853430239, -0.133578134149726, + -0.0453042583609025, -0.0445570426715121, -1.82801703713299, + -1.82637721152088, -1.79309194817686, -1.79483028781392, + -1.82286007503645, -1.81934293855202, -1.78601038835028, + -1.78955116826357, -1.81395487267584, -1.80856680679966, + -1.7753362019221, -1.78067329513619, -1.80131843126912, + -1.79407005573859, -1.76108978129798, -1.76821299161004, + -1.7849762044908, -1.77588235324302, -1.74329961114295, + -1.75219469622046, -1.76496204081115, -1.75404172837929, + -1.72200220385453, -1.73265090749874, -1.74131810681855, + -1.72859448525782, -1.6972420168504, -1.70962211035246, + -1.71409479169859, -1.69959509813937, -1.66907135185804, + -1.68315668435422, -1.68335059308637, -1.66710608803337, + -1.63755023643449, -1.65331079414627, -1.64915198455052, + -1.63119788106767, -1.60274628798466, -1.62014826220958, + -1.61157326500922, -1.59194864895077, -1.5647345605861, + -1.58374042428538, -1.57069639041924, -1.5494441318877, + -1.52359737496744, -1.54416596777677, -1.52661078811931, + -1.50377744435091, -1.47942413202542, -1.50151075349643, + -1.47941315424848, -1.45504886414604, -1.43231111030311, + -1.45586762116426, -1.42920723469823, -1.40336560525042, + -1.38236124788806, -1.40733617909559, -1.37610359009469, + -1.34884157493896, -1.32968390922441, -1.35602257855624, + -1.31656828196162, -1.28429498898429, -1.26567411188027, + -1.29767901055234, -1.25072473415807, -1.21715447933185, + -1.19917384126649, -1.23242397657338, -1.1823534532836, + -1.14755242723536, -1.1303101990299, -1.1647420201482, -1.11158960868461, + -1.07562679013386, -1.05921564061421, -1.09476291982206, + -1.03857378963383, -1.0015207891338, -0.986027675205816, + -1.02262165791001, -0.963451686850463, -0.925382584567128, + -0.910888554231246, -0.948458114718531, -0.886373762463811, + -0.847364940360495, -0.833944949111957, -0.872416751671601, + -0.807494909168164, -0.767624877975833, -0.755347619006377, + -0.794646284059167, -0.726974099341032, -0.686323320706231, + -0.675251069291918, -0.715299344149148, -0.644974024919577, + -0.603624729132922, -0.593813201560606, -0.634532135426262, + -0.561660728851048, -0.519696728569174, -0.511194955921192, + -0.552504078740899, -0.477203228952106, -0.434709729335037, + -0.427559946418037, -0.469377451169614, -0.391773135029097, + -0.348836540723157, -0.343074090392676, -0.385317018405356, + -0.305544260126654, -0.262251979530151, -0.257905232627681, + -0.300489661510178, -0.218692226785244, -0.175132474040336, + -0.172222765124244, -0.215063998875963, -0.131394069199624, + -0.0876556643589127, -0.0861972433748014, -0.129210004249523, + -0.0438278321794565, -0.0430986216874009, -1.76246296440397, + -1.76062854318702, -1.72816513819717, -1.73009564099401, + -1.75706470363323, -1.75350086407944, -1.72099133980861, + -1.72457823900289, -1.7482134849432, -1.74292610580696, + -1.71051600969182, -1.71575367475021, -1.73592497021415, + -1.72892383462134, -1.6967578879447, -1.70363694881826, + -1.72022260790742, -1.7115213811935, -1.67974315124404, + -1.68825051959437, -1.70113757994712, -1.69075377870075, + -1.65950535354697, -1.66962425239551, -1.67870873108307, + -1.66666368346539, -1.63608535008037, -1.64779535181367, + -1.65298248089489, -1.6393012783244, -1.60953120479075, + -1.62280827743556, -1.62401271863679, -1.60872415894917, + -1.57989808146386, -1.5947146431273, -1.591860681161, -1.57499720337283, + -1.54724811876101, -1.56357310011243, -1.5565948141967, + -1.53819242502056, -1.51165028945502, -1.52944920410801, + -1.51829061729832, -1.49838880957608, -1.47318024418472, + -1.49241526681987, -1.47703047281486, -1.45567213605364, + -1.43192014008187, -1.45255019213329, -1.43290345926732, + -1.41013478248099, -1.38795845465887, -1.40993929737037, + -1.3860051495572, -1.36187551663341, -1.34138978537876, + -1.36467412001882, -1.33643739446318, -1.31099927229294, + -1.29231463536147, -1.31685221037012, -1.27925614090625, + -1.24751300951957, -1.22935190715886, -1.26083327126017, + -1.21457508954634, -1.18163716957311, -1.16410049787973, + -1.1967262025193, -1.14756543721366, -1.11349370485421, + -1.09667721067852, -1.13038885427913, -1.07835170475858, + -1.04320970466296, -1.0272037687117, -1.06194048969511, + -1.00706340598185, -0.970917107300746, -0.955806539395675, + -0.991505154053686, -0.933834754244177, -0.896752401187608, + -0.88261624814397, -0.919211393769823, -0.858804358429817, + -0.820856315672025, -0.807767682232093, -0.845191965188032, + -0.782114908952861, -0.743373502233698, -0.731399385461018, + -0.769583533846556, -0.703912854517557, -0.664452206801416, + -0.653653344310913, -0.692526364885966, -0.624348070364882, + -0.584243933928348, -0.574674666296089, -0.614164005303501, + -0.543573518756927, -0.502903103585506, -0.49461125124982, + -0.534642958772955, -0.461744902468172, -0.420586701350839, + -0.41361345628364, -0.45411235376673, -0.379020312068621, + -0.337453922786403, -0.331833755180131, -0.372723605731886, + -0.295559867797813, -0.253665812809223, -0.249426392990765, + -0.290630074085448, -0.211525356840985, -0.169384900872747, + -0.166547036621249, -0.207986714806007, -0.127079866829053, + -0.0847748327853596, -0.0833524221959177, -0.124949729408583, + -0.0423874163926799, -0.041676211097959, -1.69854774349317, + -1.6965235915615, -1.66488204492582, -1.66699984599232, + -1.69291421651509, -1.68930484146868, -1.65761834312875, + -1.66125019402729, -1.68411563190388, -1.67892642233908, + -1.64733683498635, -1.65247758905755, -1.67216634568555, + -1.66540626903202, -1.63405465011935, -1.64069574255285, + -1.65708785123862, -1.64876943344521, -1.61779571564638, + -1.62592518288286, -1.63890873060469, -1.62904802776417, + -1.59859070198137, -1.60819320881387, -1.61766458974097, + -1.60628115171777, -1.57647695335516, -1.58753382766827, + -1.59339797786128, -1.5805148040048, -1.55149840321884, -1.563987678287, + -1.56615829104844, -1.55180177809209, -1.52370547472032, + -1.53760193896958, -1.53600166035623, -1.52020154262036, + -1.49315496647972, -1.50843022060002, -1.50299082465449, + -1.48578010668861, -1.4599099239222, -1.47653244520096, + -1.46719498850543, -1.44860987032225, -1.42403949645978, + -1.44197471019099, -1.42868966539303, -1.4087694604638, + -1.38561878084574, -1.40482913865276, -1.38755650666069, + -1.36634355285757, -1.34472865105626, -1.365173715951, -1.3438831165447, + -1.32142268023182, -1.30145557508488, -1.32309211307057, + -1.29776285372245, -1.27410302721308, -1.25589141906468, + -1.27867349707478, -1.24287680337727, -1.21165057954146, + -1.19394925192406, -1.22492033549437, -1.1793291860499, + -1.14700779255834, -1.12991508723695, -1.16193216958051, + -1.11364712154547, -1.0802864505326, -1.06389569038667, + -1.09690538881181, -1.04594474843071, -1.01160304632883, + -0.996002323945955, -1.02994900716631, -0.976340781921172, + -0.941078517513518, -0.926350495631361, -0.961176409788658, + -0.904958244953047, -0.868837972392576, -0.855059696641182, + -0.890705096136271, -0.831924189496671, -0.795010406600767, + -0.78225313096944, -0.818656413805311, -0.757369408742941, + -0.719728410885116, -0.708057436309213, -0.745155283639327, + -0.681428140814668, -0.643127870744221, -0.632602397177528, + -0.670329916743371, -0.604237764674054, -0.565347658603888, + -0.556020650911687, -0.594311524044608, -0.525938488915159, + -0.486529319226429, -0.478447387203039, -0.517234019057363, + -0.446673034146337, -0.406816749066245, -0.400020041848849, + -0.439233714525944, -0.366586309682157, -0.326355870298069, + -0.320877985416006, -0.360449013632427, -0.285825085277193, + -0.245294300256318, -0.241162207521871, -0.281020096468938, + -0.204537658645332, -0.163781017034347, -0.161014997447444, + -0.201088602484658, -0.122873519517746, -0.0819660220011453, + -0.0805796218063728, -0.120797309626909, -0.0409830110005728, + -0.0402898109031866, -1.63627137440059, -1.63406235664432, + -1.60324266836283, -1.60554290280886, -1.63040861368203, + -1.62675487071973, -1.59589139831071, -1.59956703333677, + -1.62166131355788, -1.61656775639602, -1.5857986778057, + -1.59084503805821, -1.61004255768333, -1.60351735897064, + -1.57298006782193, -1.57938937281381, -1.5955719344844, + -1.58762650999817, -1.55745730434995, -1.56521868608594, + -1.57827549278386, -1.56892447556955, -1.53925824915773, + -1.54835777675384, -1.55818568279226, -1.54744689001496, + -1.51841682667476, -1.52883753791625, -1.53534128259776, + -1.52323567518057, -1.4949729471423, -1.50669488690853, + -1.50978731032134, -1.49633894546211, -1.46897241620389, + -1.4819726816731, -1.48157492213619, -1.46681089881027, + -1.44046683114081, -1.45471962367235, -1.45076129638259, + -1.43471169395491, -1.40951346398762, -1.42499014756422, + -1.41740950404056, -1.40010731412621, -1.37617513179264, + -1.39284429789013, -1.3815883658538, -1.3630694175814, -1.34052005431705, + -1.35834759305485, -1.34337229642859, -1.32367517527577, + -1.30262169949528, -1.32157087690617, -1.30284113566072, + -1.28200709604566, -1.26255861700643, -1.28259015825086, + -1.26007996787251, -1.23815283969936, -1.22041426033404, + -1.24148643867024, -1.20743026937467, -1.17670769904998, + -1.15946614617589, -1.18994020325496, -1.14498702366876, + -1.11326634828754, -1.09661760933813, -1.12804187775701, + -1.08059850627902, -1.04793066427051, -1.03196563815435, + -1.06429162374624, -1.01436873970099, -0.980806815131469, + -0.965611306316984, -0.998788472235667, -0.946405917451793, + -0.912005019772117, -0.897659543912873, -0.931635425114928, + -0.876822158977075, -0.841639298182032, -0.828218899722882, + -0.862939221817878, -0.805733255664376, -0.76982721314672, + -0.757401295324, -0.792810097523441, -0.733258408538404, + -0.696689603930087, -0.685321771550961, -0.72136153343748, + -0.659519958232367, -0.622350312534646, -0.612098227891764, + -0.648709999721363, -0.584643107847094, -0.546935903159543, + -0.537851155407398, -0.574974691649581, -0.508755639325744, + -0.470575375491945, -0.46270336378085, -0.500277259594124, + -0.4319876239866, -0.393399872481256, -0.386779703113662, + -0.424741533447256, -0.354471127869704, -0.315542383258153, + -0.310206781100299, -0.348493242106981, -0.276339912564794, + -0.237137441871436, -0.233112676221001, -0.27165972866065, + -0.197729132198286, -0.158320822525137, -0.155626647602829, + -0.194369661911915, -0.118775027265703, -0.0792292320062698, + -0.0778788422061668, -0.116752744904498, -0.0396146160031351, + -0.0389394211030835, -1.57563385712625, -1.5732448384355, + -1.54324700850817, -1.54572481144363, -1.56954789513405, + -1.5658509518326, -1.53581050535449, -1.53952875693133, + -1.56085052990519, -1.55585010797778, -1.52590153814987, + -1.53085602175218, -1.54955360620748, -1.54325710443718, + -1.51353414105244, -1.51971783960115, -1.53567485764477, + -1.52809261085236, -1.49872791735476, -1.5061310292036, + -1.51923786648463, -1.5103831221169, -1.48150799507606, + -1.49011795621541, -1.50027201023693, -1.49016089835696, + -1.46190497003917, -1.47170648255761, -1.47881239510434, + -1.46746389185172, -1.43995483656114, -1.45092990330015, + -1.45489977645548, -1.44233566105923, -1.41569890591457, + -1.42782687123785, -1.42858046650089, -1.41482527194254, + -1.38918371274427, -1.40244130932942, -1.399906229381, -1.38498718681947, + -1.36046090965131, -1.37482231119779, -1.36893416390371, + -1.35288114098796, -1.32958715018328, -1.3450240299173, + -1.33572657419719, -1.31857200740642, -1.29662396049579, + -1.31310555533954, -1.30035082857101, -1.2821296497356, + -1.26163759997592, -1.27913078023586, -1.26287920690526, + -1.24362876407492, -1.22469891114341, -1.24316825555967, + -1.22338873691336, -1.20314870975179, -1.18588315916955, + -1.20529103515648, -1.17291653889845, -1.14268436804511, + -1.12590258991433, -1.15589287454194, -1.1115486024029, -1.0804128367607, + -1.06420806418328, -1.0950553270488, -1.04841959141433, + -1.01642634606795, -1.00088705398156, -1.03254755908242, + -0.983623678569419, -0.950821011070885, -0.936030715824786, + -0.968458884903171, -0.917258812573713, -0.883696614076542, + -0.869733684240211, -0.902882200032498, -0.849426496316259, + -0.815156378555977, -0.802093857389071, -0.835913770814641, + -0.780231556932931, -0.745306735309885, -0.733212175295771, + -0.767653016342421, -0.709781908339248, -0.674257081368612, + -0.663192391186263, -0.698202283241017, -0.638188306770652, + -0.602119532172692, -0.59214083645362, -0.627666613819941, + -0.565564099884002, -0.529008667595311, -0.520166179783224, + -0.556153508118422, -0.492024969988681, -0.455041272382051, + -0.447379180983253, -0.483772680383239, -0.417688671988962, + -0.380336071595872, -0.373892440078081, -0.410635810530667, + -0.342674766631264, -0.305013461666656, -0.299820142233012, + -0.336856291155546, -0.267104349660616, -0.229195237654577, + -0.225277799088154, -0.262548970660583, -0.191099777499847, + -0.153004317345116, -0.150381987087403, -0.187829893087779, + -0.114784390072925, -0.0765644628007332, -0.0752500833952996, + -0.112816035241352, -0.0382822314003667, -0.0376250416976499, + -1.51663519167013, -1.51407103693502, -1.48489506536187, + -1.48754557189662, -1.51033206087115, -1.50659308480728, + -1.47737566426008, -1.48113536481097, -1.50168328094582, + -1.49677347708436, -1.46764541601885, -1.47251054013946, + -1.49069949125801, -1.48462550543166, -1.45571686981088, + -1.46168114291486, -1.47739662071972, -1.47016773600779, + -1.44160755466081, -1.44866221223585, -1.461795851707, -1.45342396740621, + -1.42533993973636, -1.43347374719859, -1.44392357207499, + -1.43442317674378, -1.40694138344838, -1.41614066159237, + -1.42381131538101, -1.41319945401824, -1.38644407147535, + -1.39669272746187, -1.40149568945085, -1.38979192488346, + -1.36388494385235, -1.37516450766385, -1.37701829345032, + -1.36424466201718, -1.3393056112901, -1.35159527757122, + -1.35042562364973, -1.33660658528228, -1.31275226091325, + -1.32602893610167, -1.32176896809489, -1.3069313509075, + -1.28427555163172, -1.29851390627248, -1.29110429042319, + -1.27527722993888, -1.25393049938197, -1.26910302550684, + -1.25849210308797, -1.24170697623706, -1.22177635249819, + -1.23785342594008, -1.22399733027833, -1.20628768431961, + -1.18787645749581, -1.204826404997, -1.18768916084499, -1.16909063737038, + -1.15229811557121, -1.17008728653351, -1.13933561194862, + -1.10958058652686, -1.09325858313938, -1.1227783493553, + -1.07901392225235, -1.04844725797784, -1.03268645177239, + -1.06297251745589, -1.01711037695138, -0.985773495924924, + -0.970659937868292, -1.00167319482034, -0.953709565035999, + -0.921645634147073, -0.90726055246936, -0.938960245168826, + -0.888899467286933, -0.856153300426793, -0.842572916613376, + -0.874916734541368, -0.822771256970601, -0.789389213514409, + -0.776684569639747, -0.809628743126561, -0.755419093302335, + -0.721448973090262, -0.709685770884753, -0.74318517026225, + -0.686939908145476, -0.65243084320069, -0.641669295215118, + -0.675677533049935, -0.617433186429524, -0.582435529658358, + -0.572730222863096, -0.607199759039107, -0.547000740784776, + -0.511565951911195, -0.502965724039165, -0.537847973451131, + -0.475746480903972, -0.43992700989675, -0.432474838810247, + -0.467720281424706, -0.403776178153421, -0.367625346410093, + -0.361358252742105, -0.396916545776176, -0.331197225966835, + -0.294769105523577, -0.289718068814143, -0.325538160778124, + -0.25811839656466, -0.221467687605742, -0.21765757612333, + -0.253687822468736, -0.184649594550014, -0.147831501494286, + -0.145281015901168, -0.181469296012249, -0.11090160793941, + -0.0739717143845354, -0.0726933453737712, -0.108987180637469, + -0.0369858571922678, -0.0363466726868857, -1.45927537803223, + -1.45654095214289, -1.42818683892391, -1.43100518416784, + -1.45276111089333, -1.44898126964378, -1.42058687502748, + -1.4243868569757, -1.44415956667976, -1.43933786371575, + -1.41103031141265, -1.41580859322007, -1.43348021283491, + -1.42762256195407, -1.39952825409725, -1.40527928275495, + -1.42073722370926, -1.41385188546446, -1.3860962162681, + -1.39281223518268, -1.40594944845097, -1.39804701143748, + -1.37075408313861, -1.37842514970336, -1.38914036830644, + -1.3802337251754, -1.35352606690241, -1.36214007502051, + -1.37033804342777, -1.36044236168014, -1.33444065188493, + -1.34398335939367, -1.34957504930747, -1.33870773693479, + -1.31353053001724, -1.32398559095108, -1.3268884029845, -1.3150690690342, + -1.2908325267783, -1.30218152839777, -1.30231947918877, + -1.28956988934335, -1.26638751777344, -1.27861002227587, + -1.27591391661409, -1.26225794388483, -1.24024033613795, + -1.2533139269557, -1.2477215145318, -1.23318508517877, -1.21243967097557, + -1.22634000355676, -1.21779611997945, -1.20240715478014, + -1.18303795706209, -1.19773881401883, -1.18619550577993, + -1.16998385677972, -1.15209125606363, -1.16756460656286, + -1.15298123966742, -1.13597862255512, -1.11965912953902, + -1.13587519280133, -1.10668748852517, -1.07739635449522, + -1.06153412585106, -1.09059662769504, -1.04738298321708, + -1.01736961193894, -1.00205277210548, -1.03179344897827, + -0.98667086289018, -0.955972113841424, -0.941284289814556, + -0.971668530960018, -0.924626399100729, -0.893280684360033, + -0.879300816250707, -0.910292553032631, -0.861327881591452, + -0.829375078822871, -0.816177241032367, -0.847739028641537, + -0.7968564409401, -0.764337803057329, -0.751991036474911, + -0.784084138753639, -0.73129586477259, -0.69825392648785, + -0.686822082090947, -0.719406559282929, -0.664732407957086, + -0.631210889426322, -0.620752483637526, -0.653787282864237, + -0.597254597208983, -0.563298304991644, -0.553866387120193, + -0.587309435378859, -0.528953030549418, -0.494607756107192, + -0.48624978817522, -0.520058087647706, -0.459920172071616, + -0.42523258803604, -0.417990337261833, -0.452120062718527, + -0.39025014247998, -0.355267696923919, -0.349177141105733, + -0.383583739183783, -0.320038505876418, -0.284809314828918, + -0.279900560843693, -0.314538850974713, -0.249382053276924, + -0.21395479172493, -0.210252007326529, -0.245076284085111, + -0.178378583348787, -0.142802374972645, -0.140323734044122, + -0.175287870685325, -0.107126680865161, -0.0714509867576764, + -0.0702086281415816, -0.105266181092852, -0.0357254933788383, + -0.0351043140707909, -1.40355441621256, -1.4006545840591, + -1.3731223291943, -1.37610364825728, -1.3968350452006, -1.39301550634209, + -1.3654441376567, -1.3692832334255, -1.38827938710703, -1.38354326787196, + -1.35605622433127, -1.36075018099398, -1.37789577093818, + -1.37224827400441, -1.34496829391156, -1.35051225912141, + -1.36569666661339, -1.35914505922236, -1.33219390217663, + -1.33858109804409, -1.35169865671654, -1.34425225421072, + -1.31775042528283, -1.32497216372973, -1.33592239893128, + -1.32759254365183, -1.30165902040125, -1.30970472284204, + -1.31839257924462, -1.30919261483741, -1.28394457778989, + -1.29280179909557, -1.29913785602532, -1.28908309721323, + -1.26463566440923, -1.27429012109956, -1.27819079510341, + -1.26729849299359, -1.24376445920887, -1.25420006180905, + -1.25558779599813, -1.24387709900267, -1.22136668023189, + -1.23256556972038, -1.23136900946131, -1.21886091991996, + -1.19748150370196, -1.20942409196693, -1.20557824652302, + -1.19229557312609, -1.17215147527661, -1.18481648948929, + -1.17826287924547, -1.16423018536485, -1.14542241366761, + -1.15878694447211, -1.14947373341005, -1.13471728145526, + -1.11734330684688, -1.13138286025725, -1.11926497338063, -1.103812665306, + -1.08796620107298, -1.10265475395993, -1.0749721686281, + -1.04613167195021, -1.03072921804936, -1.05934770956117, + -1.01665578529711, -0.987179898644007, -0.972307025182535, + -1.00151812161595, -0.95710104923073, -0.927022199817452, + -0.912760109820348, -0.942533567501441, -0.896374180763609, + -0.865726161709766, -0.852151507168826, -0.882455808494587, + -0.834544055487271, -0.803361949264775, -0.790546657497184, + -0.821349082333005, -0.771682048224756, -0.740002147184737, + -0.728013257894563, -0.759279957695874, -0.707861871343694, + -0.675721595502651, -0.664621108914354, -0.696317183404458, + -0.643159407774079, -0.610597220045507, -0.600441956453488, + -0.632531532683921, -0.577652539109029, -0.544707858172552, + -0.53554932922491, -0.567995642839199, -0.511420969177928, + -0.478134080183304, -0.470018372191389, -0.502783850708149, + -0.444546043491613, -0.410958006799922, -0.403925676338011, + -0.4369720242647, -0.377110564968636, -0.34326312313735, + -0.337349105168966, -0.370637390753489, -0.309198606360014, + -0.275134089582677, -0.270367618321662, -0.303858361745314, + -0.240895319797409, -0.206656550012141, -0.203061092697752, + -0.236714355509707, -0.172286743896167, -0.137916937780193, + -0.135510141516265, -0.169285617107009, -0.103459608850175, + -0.0690022799201562, -0.0677959316987309, -0.101653036607498, + -0.0345011399600782, -0.0338979658493656, -1.34947230621111, + -1.34641193268366, -1.31970153617303, -1.32284096416495, + -1.34255386379294, -1.33869579490222, -1.31194745214773, + -1.31582449416038, -1.3340427422276, -1.32938968955299, -1.3027231547747, + -1.30733530346122, -1.32394616556783, -1.31850264158268, + -1.2920369892538, -1.29738007201425, -1.31227494943209, + -1.30604725728151, -1.27990061238639, -1.28596880082009, + -1.29904347650372, -1.29203969572593, -1.26632896616902, + -1.2731147892777, -1.2842696639495, -1.27649963217308, -1.25134024394491, + -1.25883460505696, -1.26797492283157, -1.25945021349006, + -1.23495584919023, -1.24314804656757, -1.25018410960442, + -1.24091800571877, -1.21720034702832, -1.22607809810927, + -1.23092546980706, -1.22093293389534, -1.19810140858181, + -1.20765087780507, -1.2102305740778, -1.19952821426025, -1.1776897482886, + -1.18789557843521, -1.18813424663656, -1.17674027901287, + -1.15599905432377, -1.16684440130619, -1.16467448639686, + -1.15260869378084, -1.13306591228508, -1.14453248330442, + -1.13989238088601, -1.12717606799118, -1.10892972231476, + -1.12099781729992, -1.1138320131687, -1.10048795834622, + -1.08363260984556, -1.09628116608016, -1.08654036198463, + -1.07259276562304, -1.05721933017309, -1.07042597000933, + -1.04418965225742, -1.01578653889181, -1.00084385973427, + -1.02903159495368, -0.986832328492429, -0.957878118093046, + -0.943449211003558, -0.972146535368913, -0.928400935973028, + -0.898923753853009, -0.885087397885669, -0.914268304444614, + -0.868952910024641, -0.838982066196272, -0.825812625223718, + -0.855450011554694, -0.808547988974389, -0.778113911752506, + -0.765681166007828, -0.795746895615773, -0.74724807882457, + -0.716382245896633, -0.704751233898704, -0.735216199953266, + -0.685117113015648, -0.653851980134663, -0.643082851354972, + -0.673917042626837, -0.622220907596454, -0.590589835058245, + -0.580737713663003, -0.611910282508987, -0.558627012129662, + -0.526664189201079, -0.517779049177248, -0.549258381420125, + -0.494404556670305, -0.46214492413953, -0.454271476087672, + -0.48602526263246, -0.429624095163963, -0.397103266188396, + -0.390280856038781, -0.422276166063227, -0.364357445619391, + -0.331611625050386, -0.325874144931805, -0.358077500485293, + -0.298677527417621, -0.265743429784856, -0.261119241248049, + -0.293496693089927, -0.232658196126115, -0.199572962467375, + -0.196084832236998, -0.228602036742524, -0.166374076192153, + -0.133175189916932, -0.130840238317599, -0.163462535277298, + -0.0999003918944534, -0.0666255938719749, -0.065455256045219, + -0.0981477471814088, -0.0333127969359876, -0.0327276280226096, + -1.29702904802789, -1.29381299801657, -1.26792445986011, + -1.27121713189084, -1.28991756667036, -1.28602213532416, + -1.26009681850058, -1.26401063918035, -1.28144963204149, + -1.27687712875883, -1.25103110274296, -1.25556396062177, + -1.27163139672385, -1.26638566468888, -1.24073434012396, + -1.24588272143346, -1.26047207216539, -1.25455847964189, + -1.22921634689739, -1.23497534351068, -1.24798390781249, + -1.24140933598309, -1.21648970579716, -1.22285302634728, + -1.23418216336111, -1.22695499073914, -1.20256973753337, + -1.20952972166527, -1.21908507418861, -1.21121515763808, + -1.18747446608593, -1.19502210180965, -1.20271381004475, + -1.19421246245142, -1.17122457787452, -1.17934952198023, + -1.18509242709545, -1.17597239173947, -1.15384337489713, + -1.16253397638583, -1.16624781342778, -1.15652323511608, + -1.13535672194356, -1.14460004842034, -1.14620962813983, + -1.13589602116357, -1.11579298800337, -1.12557485497347, + -1.1250102341533, -1.11412444714303, -1.09518298200098, + -1.10548798500217, -1.10268462490109, -1.09124480265914, + -1.07355988300353, -1.08437143250225, -1.07927034505588, + -1.06729588745261, -1.05095916505966, -1.0622595240316, + -1.05480740547942, -1.04231892350622, -1.02741851683935, + -1.03918884094951, -1.01433993941313, -0.986360955320033, + -0.971878050905798, -0.999648283872577, -0.957912612803043, + -0.929464270286054, -0.915479329568549, -0.943678690237174, + -0.900570523117074, -0.871676775948094, -0.858266154010519, + -0.886872741789534, -0.842362586883822, -0.813048397819551, + -0.800284170415383, -0.829275162212951, -0.783339682052807, + -0.753630966286063, -0.741580766564298, -0.77093246848984, + -0.72355453273954, -0.693478099193018, -0.682204964487332, + -0.711892865525815, -0.663061589788452, -0.632645080383886, + -0.622207309412801, -0.652206136950066, -0.601916907424212, + -0.571188734464537, -0.561639755266072, -0.591923532339436, + -0.540178016270882, -0.509167298077226, -0.500555546977205, + -0.531097651121639, -0.477903793026549, -0.446640287975871, + -0.43900909986407, -0.469782323420638, -0.415154327088666, + -0.383668366201462, -0.377055876364142, -0.408032488114106, + -0.351990784432244, -0.320313202663027, -0.314752260394248, + -0.345904068379195, -0.28847526904924, -0.256637335435453, + -0.252155429622856, -0.283453845008552, -0.224670682263042, + -0.192704029090632, -0.189323225944267, -0.220739327783561, + -0.160640580236746, -0.12857713138286, -0.126314024448122, + -0.157818625196194, -0.0964490299979964, -0.0643209286131324, + -0.0631866011810459, -0.0947503128145839, -0.0321604643065663, + -0.0315933005905231, -1.2462246416629, -1.24285778005783, + -1.21779110025554, -1.22123215143496, -1.23892615383287, + -1.23499452760791, -1.20989223671524, -1.21384166848539, + -1.2305000565487, -1.22600558548949, -1.20098006823603, + -1.20543615247563, -1.22095146440625, -1.21589734332301, + -1.19106034652206, -1.19602020737904, -1.21028803481326, + -1.20467872630351, -1.18014110570963, -1.18560072611585, + -1.19851995064287, -1.19236117498222, -1.16823264416727, + -1.17418687493845, -1.18565989716611, -1.17895861935, -1.15534750116664, + -1.16179007266696, -1.17172303331574, -1.16448744728147, + -1.14150042847702, -1.14842396482183, -1.15672695734632, + -1.14896646741117, -1.12670835694783, -1.13410439271242, + -1.14069166696857, -1.13241686652597, -1.11099035815481, + -1.11884935755132, -1.12363951404807, -1.11486216157017, + -1.09436760119678, -1.10267897967579, -1.10559515397112, + -1.09632814637207, -1.07686330474076, -1.08561545296877, + -1.08658548979235, -1.07684283321264, -1.05850268442431, + -1.06768299458253, -1.06663961129069, -1.05643638936873, + -1.03931289573393, -1.04890779007912, -1.04578872907158, + -1.03514106877443, -1.01932297248919, -1.02931793411156, + -1.02406610386499, -1.01299113895556, -0.998563761071767, + -1.00894336678048, -0.985423030095217, -0.957854921234873, + -0.943831791563947, -0.971197776317857, -0.929896638228951, + -0.90193835522303, -0.88839738087751, -0.916114586220729, + -0.873609810662869, -0.845281266102708, -0.832296378194897, + -0.860346879536203, -0.816603211341155, -0.787925156579601, + -0.77556614274382, -0.803931260469358, -0.758919134722524, + -0.729913112865446, -0.718245459166594, -0.746905800955207, + -0.700601409969668, -0.67128970707389, -0.660374449660448, + -0.689309954413521, -0.641695301662106, -0.612100896250322, + -0.601994483087843, -0.631184466374145, -0.582247407257352, + -0.552393918264382, -0.543148081262693, -0.572571282175268, + -0.522305551532689, -0.492217184800995, -0.483878822624784, + -0.513513451943739, -0.46191867824666, -0.431620171692326, + -0.424231243520582, -0.454055033072683, -0.401136739265722, + -0.370653306839119, -0.364250737314095, -0.394240990417339, + -0.340010581407196, -0.309367855975272, -0.303983451556297, + -0.334117094435196, -0.278591831254871, -0.247815806534469, + -0.243476183446081, -0.273729817501189, -0.216932778208191, + -0.186049749881913, -0.182776273819559, -0.21312622863282, + -0.155086256029946, -0.124122762177978, -0.121931499907835, + -0.152353886863697, -0.0931055231608035, -0.0620882841436288, + -0.0609899671062116, -0.0914607335070232, -0.0310441420718145, + -0.0304949835531059, -1.19705908711613, -1.19354627880743, + -1.16930145735932, -1.17288602279731, -1.18957962528045, + -1.18561297175348, -1.16133370679172, -1.16531758207552, + -1.18119401574922, -1.17677505974497, -1.15257005125392, + -1.15695187902282, -1.17190636861502, -1.16703767748508, + -1.14301500844809, -1.147792529851, -1.16172283737572, -1.15640799726637, + -1.13267488882311, -1.1378449486356, -1.15065160499484, + -1.14489521272331, -1.12155778127935, -1.12711633505123, + -1.1387028653645, -1.13251051800568, -1.10967353484472, + -1.11561565806204, -1.12588880021296, -1.11926708242024, + -1.09703373636347, -1.1033536356041, -1.11222355150914, + -1.10518002059803, -1.08365168424824, -1.09034271030585, + -1.09772318942644, -1.09026635825484, -1.06954235835487, + -1.07659702130155, -1.08240567593868, -1.07454499362251, + -1.05472238604825, -1.06213237220156, -1.06629082413043, + -1.05803665463835, -1.03921000453594, -1.04696619529209, + -1.04940025331402, -1.04076385198969, -1.02302501955507, + -1.03111751204551, -1.03175734005482, -1.02275082811994, + -1.00618876050596, -1.01460689003051, -1.0133871652158, + -1.00402350231167, -0.988724032134142, -0.997456396320049, + -0.994316457141357, -0.984609411971048, -0.97065506287033, + -0.979689547502236, -0.957438924303689, -0.930268436636331, + -0.916705081708714, -0.943680072289522, -0.902784404770153, + -0.875300372903974, -0.862203364930439, -0.889454223319576, + -0.847518798610412, -0.81973722431685, -0.807178070438804, + -0.834690717684621, -0.791674783396638, -0.763612342476425, + -0.75165854220903, -0.779418306323917, -0.73528634698354, + -0.706960351490656, -0.695675243814717, -0.723666893011873, + -0.678388710514953, -0.64981706953925, -0.639259689418052, + -0.667467466616384, -0.62101824863661, -0.592219427733969, + -0.582444372380096, -0.610852030899074, -0.563212407095875, + -0.534205386457781, -0.525262691652869, -0.553853532016482, + -0.505009617915082, -0.475813849372383, -0.467748876119982, + -0.496505783886426, -0.446449212330639, -0.417084575288895, + -0.409937907057209, -0.438843391588596, -0.387571331695131, + -0.358058088101368, -0.35186543888864, -0.380901672972924, + -0.328416836544245, -0.298775584987123, -0.29356771841795, + -0.322716578653295, -0.269027214034513, -0.239278843081903, + -0.235081502717725, -0.264324610567838, -0.20944448396156, + -0.179610124841217, -0.176443975862874, -0.2057627392903, + -0.149711103571751, -0.119812082302286, -0.117692664696737, + -0.147068320279806, -0.089869871382875, -0.0599276604634639, + -0.0588653538207162, -0.0882790092587268, -0.0299638302317321, + -0.0294326769103582, -1.14953238438759, -1.14587849426538, + -1.12245553117144, -1.12617874597788, -1.14187798101312, + -1.13787746776086, -1.11442122873, -1.11843837995072, -1.13353150964306, + -1.12918555152527, -1.10580105179662, -1.11011114026331, + -1.12449610935017, -1.11980666717507, -1.09659832590205, + -1.10119968884934, -1.11477647985277, -1.10974629253047, + -1.08681769623783, -1.09170801106994, -1.10437887086842, + -1.09901144920637, -1.07646511713339, -1.08164140668561, + -1.09331106795627, -1.08761068670617, -1.06554783856762, + -1.0710064778505, -1.08158237488028, -1.07555406305439, -1.0540743897453, + -1.05981111415646, -1.06920359253319, -1.06285312201199, + -1.04205455977575, -1.04806447476053, -1.05618699446904, + -1.04952086692608, -1.0294993754973, -1.03577696763652, -1.0425462990996, + -1.03557173127311, -1.01642107649797, -1.02296022599763, + -1.02829663861777, -1.02102154596242, -1.00283308738891, + -1.00962708194344, -1.0134545247183, -1.00588750347417, + -0.988749987393267, -0.995791537391088, -0.998037811193476, + -0.990188118912783, -0.974187477319609, -0.981468732356438, + -0.982065653488556, -0.97394318806433, -0.959162343994519, + -0.966674910657064, -0.965558465308508, -0.957173742552686, + -0.943692422235043, -0.951427383114781, -0.930387622038546, + -0.903601501524406, -0.890497921340099, -0.917095171787571, + -0.876575912426647, -0.849550323328887, -0.836897281727336, + -0.863697601533717, -0.822297486959704, -0.795044650590521, + -0.782911230742239, -0.809904256234788, -0.767577303050271, + -0.740109955510021, -0.728561368811012, -0.755736299776625, + -0.712441318835856, -0.684772682161691, -0.673870120508666, + -0.701215744659839, -0.656916434375395, -0.629060186589098, + -0.618860683760144, -0.646365402134405, -0.601030430711963, + -0.573000674834828, -0.563556977289561, -0.591208830524853, + -0.544811906939781, -0.516623139044733, -0.507983586436597, + -0.535770281863079, -0.488290215418063, -0.459957291791392, + -0.452165707462801, -0.480074646949699, -0.431495395278486, + -0.403033498765579, -0.39612909047395, -0.424147398968375, + -0.374458104376894, -0.345882709988208, -0.339899981087776, + -0.368014535780863, -0.317209549843394, -0.288536389698579, + -0.283505060979208, -0.311702521033492, -0.259781417388168, + -0.231026445077757, -0.226971387437788, -0.255238224208498, + -0.20220579952315, -0.173385153968544, -0.170326332074213, + -0.198648859756001, -0.144515122862164, -0.115645091755784, + -0.11359751881483, -0.141961925444521, -0.0867420746642108, + -0.0578390575726379, -0.0568127613245596, -0.0852051400696947, + -0.0289195287863191, -0.0284063806622799, -1.10364453347727, + -1.09985442643167, -1.0772533216919, -1.08111032097667, + -1.09582122103086, -1.09178801563006, -1.06915480253011, + -1.07320406211101, -1.08751253823022, -1.08323706083038, + -1.06067306986414, -1.06491393619713, -1.07872068661169, -1.074204312393, + -1.05181029888394, -1.05624168437404, -1.0694489622444, -1.0646936120958, + -1.04256952795378, -1.04718991341886, -1.05970174826359, + -1.05470988443139, -1.03295465172939, -1.03776208984158, + -1.04948450494143, -1.04425912545147, -1.02297041233532, + -1.02796253203235, -1.03880375731769, -1.03334838918391, + -1.01262238862251, -1.01779640047891, -1.02766708041848, + -1.02198577165306, -1.00191698353037, -1.00726968607644, + -1.01608308209638, -1.0101803925397, -0.990861409582094, + -0.996389196556232, -1.00406138353083, -0.997942374521964, + -0.979463672545954, -0.985162541064024, -0.991612597433127, + -0.98528282034429, -0.96773255329967, -0.973598112922812, + -0.978748304005185, -0.972213787666081, -0.955677587938894, + -0.961705070619282, -0.965481024706664, -0.958748261747248, + -0.943309046174888, -0.949493317056891, -0.951824193889834, + -0.944900126032421, -0.930637908070322, -0.936973477122605, + -0.937792128366447, -0.930684130700474, -0.917675839165906, + -0.924156873618114, -0.904269123299787, -0.8778541158991, + -0.865210310458102, -0.891443074812004, -0.851271161198435, + -0.824688206497769, -0.812479131268202, -0.838844720863152, + -0.797945875710745, -0.771203544923721, -0.759495859105203, + -0.785987495186702, -0.744310770302055, -0.717417995680389, + -0.706274622549767, -0.732885240827485, -0.690384050279471, + -0.663350104878554, -0.652830089248441, -0.679552355899104, + -0.636184581550994, -0.609019058223434, -0.599177432686724, + -0.626003760967583, -0.581731847888167, -0.554444637552899, + -0.545332297816237, -0.572254865251481, -0.527045906789069, + -0.499647176025238, -0.491310765613879, -0.518321531715058, + -0.47214734404163, -0.444647512058021, -0.437129316653241, + -0.46422004113356, -0.417057227090199, -0.389466942122377, + -0.382804793770805, -0.409967055212023, -0.361797057311009, + -0.33412717249964, -0.328354363911504, -0.355579578841155, + -0.30638872130464, -0.27865027010964, -0.273795479240072, + -0.301074921575788, -0.250854441315835, -0.223058612522029, + -0.21914583760627, -0.246470658423171, -0.195216724892962, + -0.167374837263894, -0.164423342453575, -0.191784590029923, + -0.139498313901182, -0.111621790538471, -0.109646062262112, + -0.137034702357843, -0.0837221330048108, -0.0558224754711507, + -0.0548321896177418, -0.0822391259399269, -0.0279112377355755, + -0.027416094808871, -1.05939553438518, -1.05547407530631, + -1.03369482892072, -1.03768074779369, -1.05140934533369, + -1.04734461536107, -1.02553442819203, -1.02961462855637, + -1.04313710151069, -1.03892958766031, -1.01718610545648, + -1.02136026682426, -1.03458010039958, -1.03023061313885, + -1.00865092739377, -1.01291851642513, -1.02574028455062, + -1.02124995596238, -0.999930383970972, -1.00429065568237, + -1.01662023718037, -1.01199051839837, -0.991026385067353, + -0.995478384519162, -1.00722317631997, -1.00245583424158, + -0.981941256147836, -0.986483820607595, -0.997552947525188, + -0.992650060808798, -0.972677732995088, -0.977309494571462, + -0.987614015165015, -0.982577969521232, -0.963238955512094, + -0.967958344253591, -0.977411452308455, -0.972244935095678, + -0.953628460609263, -0.958433708060679, -0.966950929232376, + -0.961656923369073, -0.943850174192191, -0.948739317400727, + -0.956238700576509, -0.950820477783946, -0.933908402268222, + -0.938879288230206, -0.945281591174685, -0.939742704565424, + -0.923807821191953, -0.928858111730087, -0.934086980594382, + -0.92843125662334, -0.913553467071793, -0.918680644131873, + -0.922662786419638, -0.916894316215936, -0.90315072436155, + -0.908352095716672, -0.911017446315175, -0.905140576414413, + -0.89260531366292, -0.897878019012235, -0.879083428087413, + -0.853026279760412, -0.840842249062723, -0.866723781362821, + -0.826870151085516, -0.800714022410619, -0.788948913553036, + -0.814895581307879, -0.774463964863534, -0.748213907316449, + -0.736931955527695, -0.762940434540366, -0.72187518515199, + -0.69553646298753, -0.684798303425294, -0.710865129476495, + -0.669114541314386, -0.642692619641242, -0.632555150034043, + -0.658676726729668, -0.61619315204175, -0.589693684442258, + -0.580209936197792, -0.606382543115918, -0.56312250016522, + -0.536551315888182, -0.527770333960126, -0.553990135078959, + -0.509914406643739, -0.483277497399297, -0.475244229184715, + -0.50150728157242, -0.456581003785784, -0.429884510172271, + -0.422639703691301, -0.448941966438008, -0.40313470776578, + -0.37638490535929, -0.369965016947774, -0.396302360319538, + -0.349588190497477, -0.322791475635664, -0.317228587359824, + -0.343596802153799, -0.295954350927985, -0.269117226220306, + -0.26443897320054, -0.290833780280182, -0.242246285817513, + -0.215375345414721, -0.211604853223171, -0.238021913211855, + -0.188477260070994, -0.161579174727267, -0.15873500700096, + -0.185169930112065, -0.134660676688808, -0.107742178650348, + -0.105838295038584, -0.132286651019772, -0.0808100464046751, + -0.0538779141590024, -0.0529236387002629, -0.0793809668694234, + -0.0269389570795013, -0.0264618193501316, -1.01678538711132, + -1.0127374408893, -0.99178005285788, -0.99589002642894, -1.0086423539216, + -1.00454726695389, -0.983560105715761, -0.98767007928682, + -1.00040519948448, -0.996263132015062, -0.975340158573641, + -0.979450132144701, -0.992074350713853, -0.987885569412644, + -0.967120211431521, -0.971230185002581, -0.983650446771415, + -0.979415324130186, -0.958900264289401, -0.963010237860461, + -0.975134337618752, -0.970853351107317, -0.950680317147282, + -0.954790290718341, -0.966527082091908, -0.962200813076499, + -0.942460370005162, -0.946570343576222, -0.957829945502782, + -0.953459077929065, -0.934240422863042, -0.938350396434102, + -0.949044396772787, -0.944629715616508, -0.926020475720922, + -0.930130449291982, -0.94017210510527, -0.935714494594033, + -0.917800528578803, -0.921910502149863, -0.931214936204235, + -0.926715377814437, -0.909580581436683, -0.913690555007743, + -0.922174948047915, -0.917634518281393, -0.901360634294563, + -0.905470607865623, -0.913054386226795, -0.908474254172198, + -0.893140687152444, -0.897250660723503, -0.903855678856628, + -0.899237103541058, -0.884920740010324, -0.889030713581384, + -0.894581431077968, -0.889925758614877, -0.876700792868204, + -0.880810766439264, -0.88523441915469, -0.880543079694502, + -0.868480845726084, -0.872590819297144, -0.854830536401422, + -0.829117993108342, -0.817393737153962, -0.842937291440023, + -0.80337288208789, -0.777627771067438, -0.766306628581839, + -0.7918501828679, -0.751851754418072, -0.726075737768706, + -0.715219520009716, -0.740763074295778, -0.700270547600075, + -0.674465357431444, -0.664132411437594, -0.689675965723655, + -0.648632791940601, -0.622800226449757, -0.613045302865471, + -0.638588857151533, -0.596942145847664, -0.571084065245571, + -0.561958194293349, -0.58750174857941, -0.545202387543123, + -0.519320709840676, -0.510871085721226, -0.536414640007287, + -0.493417406503793, -0.467514103166909, -0.459783977149104, + -0.485327531435165, -0.441591194650525, -0.415668286134141, + -0.408696868576981, -0.434240422863042, -0.389727837305229, + -0.363787388476316, -0.357609760004858, -0.38315331429092, + -0.337831503936298, -0.31187561939628, -0.306522651432736, + -0.332066205718797, -0.285906438713428, -0.259937258030576, + -0.255435542860613, -0.280979097146674, -0.233956950893204, + -0.207976643755831, -0.204348434288491, -0.229891988574552, + -0.181987405057247, -0.155998166358664, -0.153261325716368, + -0.178804880002429, -0.130002211225039, -0.104006256091415, + -0.102174217144245, -0.127717771430307, -0.0780058148638037, + -0.0520053736361929, -0.0510871085721228, -0.0766306628581841, + -0.0260026868180965, -0.0255435542860615, -0.846926383435463, + -0.821261947573783, -0.825130157993604, -0.850915475430904, + -0.795597511712102, -0.769933075850421, -0.773559523119004, + -0.799344840556304, -0.744268639988741, -0.71860420412706, + -0.721988888244403, -0.747774205681703, -0.692939768265379, + -0.667275332403698, -0.670418253369803, -0.696203570807103, + -0.641610896542018, -0.615946460680337, -0.618847618495203, + -0.644632935932503, -0.590282024818656, -0.564617588956976, + -0.567276983620603, -0.593062301057903, -0.538953153095295, + -0.513288717233614, -0.515706348746002, -0.541491666183302, + -0.487624281371934, -0.461959845510253, -0.464135713871402, + -0.489921031308702, -0.436295409648572, -0.410630973786892, + -0.412565078996802, -0.438350396434102, -0.384966537925211, + -0.35930210206353, -0.360994444122202, -0.386779761559502, + -0.333637666201849, -0.307973230340169, -0.309423809247601, + -0.335209126684902, -0.282308794478488, -0.256644358616807, + -0.257853174373001, -0.283638491810301, -0.230979922755127, + -0.205315486893446, -0.206282539498401, -0.232067856935701, + -0.179651051031765, -0.153986615170084, -0.154711904623801, + -0.180497222061101, -0.128322179308404, -0.102657743446723, + -0.103141269749201, -0.128926587186501, -0.0769933075850423, + -0.0513288717233616, -0.0515706348746004, -0.0773559523119005, + -0.0256644358616809, -0.0257853174373003, -0.854904567426344, + -0.828998368413425, -0.832866578833246, -0.858893659421785, + -0.803092169400505, -0.777185970387586, -0.780812417656168, + -0.806839498244707, -0.751279771374666, -0.725373572361747, + -0.72875825647909, -0.754785337067629, -0.699467373348827, + -0.673561174335908, -0.676704095302012, -0.702731175890551, + -0.647654975322988, -0.621748776310069, -0.624649934124934, + -0.650677014713473, -0.595842577297149, -0.569936378284229, + -0.572595772947856, -0.598622853536395, -0.54403017927131, + -0.51812398025839, -0.520541611770779, -0.546568692359317, + -0.492217781245471, -0.466311582232552, -0.468487450593701, + -0.49451453118224, -0.440405383219632, -0.414499184206713, + -0.416433289416623, -0.442460370005162, -0.388592985193793, + -0.362686786180873, -0.364379128239545, -0.390406208828084, + -0.336780587167954, -0.310874388155034, -0.312324967062467, + -0.338352047651006, -0.284968189142115, -0.259061990129195, + -0.260270805885389, -0.286297886473928, -0.233155791116276, + -0.207249592103356, -0.208216644708312, -0.234243725296851, + -0.181343393090437, -0.155437194077517, -0.156162483531234, + -0.182189564119773, -0.129530995064598, -0.103624796051678, + -0.104108322354156, -0.130135402942695, -0.0777185970387587, + -0.0518123980258392, -0.052054161177078, -0.078081241765617, + -0.0259061990129197, -0.0260270805885391, -0.862882751417225, + -0.836734789253067, -0.840602999672888, -0.866871843412666, + -0.810586827088909, -0.78443886492475, -0.788065312193333, + -0.81433415593311, -0.758290902760592, -0.732142940596433, + -0.735527624713777, -0.761796468453555, -0.705994978432275, + -0.679847016268117, -0.682989937234222, -0.709258780973999, + -0.653699054103958, -0.6275510919398, -0.630452249754666, + -0.656721093494444, -0.601403129775642, -0.575255167611484, + -0.577914562275111, -0.604183406014888, -0.549107205447325, + -0.522959243283167, -0.525376874795555, -0.551645718535333, + -0.496811281119009, -0.47066331895485, -0.472839187316, + -0.499108031055777, -0.444515356790692, -0.418367394626534, + -0.420301499836444, -0.446570343576222, -0.392219432462375, + -0.366071470298217, -0.367763812356889, -0.394032656096666, + -0.339923508134058, -0.3137755459699, -0.315226124877333, + -0.341494968617111, -0.287627583805742, -0.261479621641584, + -0.262688437397778, -0.288957281137555, -0.235331659477425, + -0.209183697313267, -0.210150749918222, -0.236419593658, + -0.183035735149108, -0.15688777298495, -0.157613062438667, + -0.183881906178444, -0.130739810820792, -0.104591848656634, + -0.105075374959111, -0.131344218698889, -0.0784438864924752, + -0.0522959243283168, -0.0525376874795556, -0.0788065312193334, + -0.0261479621641585, -0.0262688437397779, -0.870860935408106, + -0.844471210092709, -0.84833942051253, -0.874850027403547, + -0.818081484777312, -0.791691759461915, -0.795318206730497, + -0.821828813621513, -0.765302034146518, -0.73891230883112, + -0.742296992948464, -0.76880759983948, -0.712522583515723, + -0.686132858200326, -0.689275779166431, -0.715786386057447, + -0.659743132884929, -0.633353407569532, -0.636254565384397, + -0.662765172275414, -0.606963682254135, -0.580573956938738, + -0.583233351602364, -0.609743958493381, -0.55418423162334, + -0.527794506307943, -0.530212137820331, -0.556722744711348, + -0.501404780992546, -0.475015055677149, -0.477190924038298, + -0.503701530929315, -0.448625330361752, -0.422235605046355, + -0.424169710256265, -0.450680317147282, -0.395845879730957, + -0.36945615441556, -0.371148496474232, -0.397659103365249, + -0.343066429100163, -0.316676703784766, -0.318127282692199, + -0.344637889583215, -0.290286978469369, -0.263897253153972, + -0.265106068910166, -0.291616675801182, -0.237507527838575, + -0.211117802523177, -0.212084855128133, -0.238595462019149, + -0.18472807720778, -0.158338351892383, -0.159063641346099, + -0.185574248237116, -0.131948626576986, -0.105558901261589, + -0.106042427564066, -0.132553034455083, -0.0791691759461916, + -0.0527794506307944, -0.0530212137820333, -0.0795318206730498, + -0.0263897253153973, -0.0265106068910167, -0.878839119398987, + -0.852207630932351, -0.856075841352172, -0.882828211394427, + -0.825576142465715, -0.798944653999079, -0.802571101267662, + -0.829323471309917, -0.772313165532443, -0.745681677065807, + -0.749066361183151, -0.775818731225406, -0.719050188599171, + -0.692418700132535, -0.69556162109864, -0.722313991140895, + -0.665787211665899, -0.639155723199263, -0.642056881014129, + -0.668809251056384, -0.612524234732627, -0.585892746265991, + -0.588552140929618, -0.615304510971874, -0.559261257799355, + -0.532629769332719, -0.535047400845108, -0.561799770887363, + -0.505998280866083, -0.479366792399448, -0.481542660760597, + -0.508295030802852, -0.452735303932812, -0.426103815466176, + -0.428037920676086, -0.454790290718342, -0.39947232699954, + -0.372840838532904, -0.374533180591575, -0.401285550633831, + -0.346209350066268, -0.319577861599632, -0.321028440507065, + -0.34778081054932, -0.292946373132996, -0.26631488466636, + -0.267523700422554, -0.294276070464809, -0.239683396199724, + -0.213051907733088, -0.214018960338043, -0.240771330380299, + -0.186420419266452, -0.159788930799816, -0.160514220253532, + -0.187266590295788, -0.13315744233318, -0.106525953866544, + -0.107009480169022, -0.133761850211277, -0.079894465399908, + -0.0532629769332721, -0.0535047400845109, -0.0802571101267663, + -0.0266314884666361, -0.0267523700422555, -0.886817303389868, + -0.859944051771993, -0.863812262191814, -0.890806395385308, + -0.833070800154118, -0.806197548536244, -0.809823995804826, + -0.83681812899832, -0.779324296918369, -0.752451045300494, + -0.755835729417838, -0.782829862611332, -0.725577793682619, + -0.698704542064745, -0.701847463030849, -0.728841596224344, + -0.67183129044687, -0.644958038828995, -0.64785919664386, + -0.674853329837355, -0.61808478721112, -0.591211535593245, + -0.593870930256872, -0.620865063450367, -0.564338283975371, + -0.537465032357496, -0.539882663869884, -0.566876797063378, + -0.510591780739621, -0.483718529121746, -0.485894397482896, + -0.51288853067639, -0.456845277503871, -0.429972025885997, + -0.431906131095907, -0.458900264289401, -0.403098774268122, + -0.376225522650247, -0.377917864708919, -0.404911997902413, + -0.349352271032372, -0.322479019414498, -0.32392959832193, + -0.350923731515425, -0.295605767796623, -0.268732516178748, + -0.269941331934942, -0.296935465128436, -0.241859264560873, + -0.214986012942998, -0.215953065547954, -0.242947198741448, + -0.188112761325124, -0.161239509707249, -0.161964799160965, + -0.18895893235446, -0.134366258089374, -0.107493006471499, + -0.107976532773977, -0.134970665967471, -0.0806197548536245, + -0.0537465032357497, -0.0539882663869885, -0.0809823995804827, + -0.0268732516178749, -0.0269941331934943, -0.894795487380749, + -0.867680472611635, -0.871548683031456, -0.898784579376189, + -0.840565457842522, -0.813450443073408, -0.81707689034199, + -0.844312786686723, -0.786335428304294, -0.759220413535181, + -0.762605097652524, -0.789840993997257, -0.732105398766067, + -0.704990383996954, -0.708133304963058, -0.735369201307791, + -0.67787536922784, -0.650760354458726, -0.653661512273592, + -0.680897408618325, -0.623645339689613, -0.596530324920499, + -0.599189719584126, -0.626425615928859, -0.569415310151386, + -0.542300295382272, -0.54471792689466, -0.571953823239393, + -0.515185280613159, -0.488070265844045, -0.490246134205194, + -0.517482030549927, -0.460955251074931, -0.433840236305818, + -0.435774341515728, -0.463010237860461, -0.406725221536704, + -0.379610206767591, -0.381302548826262, -0.408538445170995, + -0.352495191998477, -0.325380177229363, -0.326830756136796, + -0.354066652481529, -0.29826516246025, -0.271150147691136, + -0.27235896344733, -0.299594859792063, -0.244035132922023, + -0.216920118152909, -0.217887170757864, -0.245123067102597, + -0.189805103383795, -0.162690088614682, -0.163415378068398, + -0.190651274413131, -0.135575073845568, -0.108460059076455, + -0.108943585378932, -0.136179481723665, -0.0813450443073409, + -0.0542300295382273, -0.0544717926894661, -0.0817076890341991, + -0.0271150147691137, -0.0272358963447331, -0.90277367137163, + -0.875416893451277, -0.879285103871098, -0.90676276336707, + -0.848060115530925, -0.820703337610573, -0.824329784879155, + -0.851807444375127, -0.79334655969022, -0.765989781769868, + -0.769374465887211, -0.796852125383183, -0.738633003849515, + -0.711276225929163, -0.714419146895267, -0.741896806391239, + -0.683919448008811, -0.656562670088458, -0.659463827903324, + -0.686941487399296, -0.629205892168106, -0.601849114247753, + -0.60450850891138, -0.631986168407352, -0.574492336327401, + -0.547135558407049, -0.549553189919437, -0.577030849415408, + -0.519778780486696, -0.492422002566344, -0.494597870927493, + -0.522075530423465, -0.465065224645991, -0.437708446725639, + -0.439642551935549, -0.467120211431521, -0.410351668805286, + -0.382994890884934, -0.384687232943605, -0.412164892439577, + -0.355638112964581, -0.328281335044229, -0.329731913951662, + -0.357209573447634, -0.300924557123877, -0.273567779203524, + -0.274776594959718, -0.30225425445569, -0.246211001283172, + -0.218854223362819, -0.219821275967775, -0.247298935463747, + -0.191497445442467, -0.164140667522115, -0.164865956975831, + -0.192343616471803, -0.136783889601762, -0.10942711168141, + -0.109910637983887, -0.137388297479859, -0.0820703337610574, + -0.0547135558407049, -0.0549553189919438, -0.0824329784879156, + -0.0273567779203525, -0.0274776594959719, -0.910751855362511, + -0.883153314290919, -0.88702152471074, -0.914740947357951, + -0.855554773219328, -0.827956232147737, -0.831582679416319, + -0.85930210206353, -0.800357691076146, -0.772759150004555, + -0.776143834121898, -0.803863256769109, -0.745160608932963, + -0.717562067861372, -0.720704988827477, -0.748424411474687, + -0.689963526789781, -0.66236498571819, -0.665266143533055, + -0.692985566180266, -0.634766444646598, -0.607167903575007, + -0.609827298238634, -0.637546720885845, -0.579569362503416, + -0.551970821431825, -0.554388452944213, -0.582107875591424, + -0.524372280360234, -0.496773739288642, -0.498949607649792, + -0.526669030297002, -0.469175198217051, -0.44157665714546, + -0.44351076235537, -0.471230185002581, -0.413978116073868, + -0.386379575002277, -0.388071917060949, -0.41579133970816, + -0.358781033930686, -0.331182492859095, -0.332633071766528, + -0.360352494413738, -0.303583951787504, -0.275985410715913, + -0.277194226472107, -0.304913649119317, -0.248386869644321, + -0.22078832857273, -0.221755381177685, -0.249474803824896, + -0.193189787501139, -0.165591246429547, -0.166316535883264, + -0.194035958530475, -0.137992705357956, -0.110394164286365, + -0.110877690588843, -0.138597113236053, -0.0827956232147738, + -0.0551970821431826, -0.0554388452944214, -0.083158267941632, + -0.0275985410715913, -0.0277194226472107, -0.918730039353392, + -0.890889735130562, -0.894757945550383, -0.922719131348832, + -0.863049430907732, -0.835209126684901, -0.838835573953484, + -0.866796759751933, -0.807368822462071, -0.779528518239241, + -0.782913202356585, -0.810874388155034, -0.751688214016411, + -0.723847909793581, -0.726990830759686, -0.754952016558135, + -0.696007605570751, -0.668167301347921, -0.671068459162787, + -0.699029644961236, -0.640326997125091, -0.612486692902261, + -0.615146087565888, -0.643107273364337, -0.584646388679431, + -0.556806084456601, -0.559223715968989, -0.587184901767439, + -0.528965780233771, -0.501125476010941, -0.50330134437209, + -0.53126253017054, -0.473285171788111, -0.445444867565281, + -0.447378972775191, -0.475340158573641, -0.417604563342451, + -0.389764259119621, -0.391456601178292, -0.419417786976742, + -0.361923954896791, -0.334083650673961, -0.335534229581393, + -0.363495415379843, -0.306243346451131, -0.278403042228301, + -0.279611857984495, -0.307573043782944, -0.250562738005471, + -0.22272243378264, -0.223689486387596, -0.251650672186045, + -0.19488212955981, -0.16704182533698, -0.167767114790697, + -0.195728300589146, -0.13920152111415, -0.11136121689132, + -0.111844743193798, -0.139805928992247, -0.0835209126684902, + -0.0556806084456602, -0.055922371596899, -0.0838835573953485, + -0.0278403042228301, -0.0279611857984495, -0.926708223344273, + -0.898626155970204, -0.902494366390025, -0.930697315339713, + -0.870544088596135, -0.842462021222066, -0.846088468490648, + -0.874291417440337, -0.814379953847997, -0.786297886473928, + -0.789682570591272, -0.81788551954096, -0.758215819099859, + -0.73013375172579, -0.733276672691895, -0.761479621641583, + -0.702051684351722, -0.673969616977653, -0.676870774792519, + -0.705073723742207, -0.645887549603584, -0.617805482229515, + -0.620464876893142, -0.64866782584283, -0.589723414855446, + -0.561641347481377, -0.564058978993766, -0.592261927943454, + -0.533559280107309, -0.50547721273324, -0.507653081094389, + -0.535856030044077, -0.477395145359171, -0.449313077985102, + -0.451247183195012, -0.479450132144701, -0.421231010611033, + -0.393148943236964, -0.394841285295636, -0.423044234245324, + -0.365066875862895, -0.336984808488826, -0.338435387396259, + -0.366638336345948, -0.308902741114758, -0.280820673740689, + -0.282029489496883, -0.310232438446571, -0.25273860636662, + -0.224656538992551, -0.225623591597506, -0.253826540547195, + -0.196574471618482, -0.168492404244413, -0.16921769369813, + -0.197420642647818, -0.140410336870344, -0.112328269496276, + -0.112811795798753, -0.141014744748441, -0.0842462021222067, + -0.0561641347481378, -0.0564058978993766, -0.0846088468490649, + -0.0280820673740689, -0.0282029489496883, -0.934686407335154, + -0.906362576809846, -0.910230787229667, -0.938675499330594, + -0.878038746284538, -0.84971491575923, -0.853341363027812, + -0.88178607512874, -0.821391085233923, -0.793067254708615, + -0.796451938825959, -0.824896650926886, -0.764743424183307, + -0.736419593658, -0.739562514624104, -0.768007226725031, + -0.708095763132692, -0.679771932607384, -0.68267309042225, + -0.711117802523177, -0.651448102082077, -0.623124271556769, + -0.625783666220396, -0.654228378321323, -0.594800441031461, + -0.566476610506154, -0.568894242018542, -0.597338954119469, + -0.538152779980846, -0.509828949455538, -0.512004817816688, + -0.540449529917615, -0.481505118930231, -0.453181288404923, + -0.455115393614833, -0.483560105715761, -0.424857457879615, + -0.396533627354308, -0.398225969412979, -0.426670681513906, + -0.368209796829, -0.339885966303692, -0.341336545211125, + -0.369781257312052, -0.311562135778384, -0.283238305253077, + -0.284447121009271, -0.312891833110198, -0.254914474727769, + -0.226590644202462, -0.227557696807417, -0.256002408908344, + -0.198266813677154, -0.169942983151846, -0.170668272605563, + -0.19911298470649, -0.141619152626538, -0.113295322101231, + -0.113778848403708, -0.142223560504635, -0.0849714915759231, + -0.0566476610506154, -0.0568894242018542, -0.0853341363027813, + -0.0283238305253077, -0.0284447121009271, -0.942664591326034, + -0.914098997649488, -0.917967208069309, -0.946653683321475, + -0.885533403972941, -0.856967810296395, -0.860594257564977, + -0.889280732817143, -0.828402216619848, -0.799836622943302, + -0.803221307060645, -0.831907782312811, -0.771271029266755, + -0.742705435590209, -0.745848356556313, -0.774534831808479, + -0.714139841913662, -0.685574248237116, -0.688475406051982, + -0.717161881304148, -0.657008654560569, -0.628443060884023, + -0.63110245554765, -0.659788930799816, -0.599877467207476, + -0.57131187353093, -0.573729505043318, -0.602415980295484, + -0.542746279854384, -0.514180686177837, -0.516356554538986, + -0.545043029791152, -0.48561509250129, -0.457049498824744, + -0.458983604034654, -0.48767007928682, -0.428483905148198, + -0.399918311471651, -0.401610653530323, -0.430297128782489, + -0.371352717795104, -0.342787124118558, -0.344237703025991, + -0.372924178278157, -0.314221530442011, -0.285655936765465, + -0.286864752521659, -0.315551227773825, -0.257090343088918, + -0.228524749412372, -0.229491802017327, -0.258178277269493, + -0.199959155735826, -0.171393562059279, -0.172118851512995, + -0.200805326765161, -0.142827968382733, -0.114262374706186, + -0.114745901008664, -0.14343237626083, -0.0856967810296395, + -0.057131187353093, -0.0573729505043318, -0.0860594257564977, + -0.0285655936765465, -0.0286864752521659, -0.950642775316915, + -0.92183541848913, -0.925703628908951, -0.954631867312356, + -0.893028061661345, -0.86422070483356, -0.867847152102142, + -0.896775390505546, -0.835413348005774, -0.806605991177989, + -0.809990675295332, -0.838918913698737, -0.777798634350203, + -0.748991277522418, -0.752134198488523, -0.781062436891928, + -0.720183920694633, -0.691376563866848, -0.694277721681713, + -0.723205960085118, -0.662569207039062, -0.633761850211277, + -0.636421244874904, -0.665349483278309, -0.604954493383492, + -0.576147136555706, -0.578564768068094, -0.607493006471499, + -0.547339779727921, -0.518532422900136, -0.520708291261285, + -0.54963652966469, -0.48972506607235, -0.460917709244565, + -0.462851814454476, -0.49178005285788, -0.43211035241678, + -0.403302995588994, -0.404995337647666, -0.433923576051071, + -0.374495638761209, -0.345688281933424, -0.347138860840857, + -0.376067099244261, -0.316880925105638, -0.288073568277853, + -0.289282384034047, -0.318210622437452, -0.259266211450068, + -0.230458854622283, -0.231425907227238, -0.260354145630643, + -0.201651497794497, -0.172844140966712, -0.173569430420428, + -0.202497668823833, -0.144036784138927, -0.115229427311141, + -0.115712953613619, -0.144641192017024, -0.086422070483356, + -0.0576147136555707, -0.0578564768068095, -0.0867847152102142, + -0.0288073568277853, -0.0289282384034047, -0.958620959307796, + -0.929571839328772, -0.933440049748593, -0.962610051303237, + -0.900522719349748, -0.871473599370724, -0.875100046639306, + -0.90427004819395, -0.8424244793917, -0.813375359412676, + -0.816760043530019, -0.845930045084663, -0.784326239433652, + -0.755277119454627, -0.758420040420732, -0.787590041975376, + -0.726227999475603, -0.697178879496579, -0.700080037311445, + -0.729250038866089, -0.668129759517555, -0.639080639538531, + -0.641740034202158, -0.670910035756801, -0.610031519559507, + -0.580982399580483, -0.583400031092871, -0.612570032647514, + -0.551933279601458, -0.522884159622434, -0.525060027983584, + -0.554230029538227, -0.49383503964341, -0.464785919664386, + -0.466720024874297, -0.49589002642894, -0.435736799685362, + -0.406687679706338, -0.40838002176501, -0.437550023319653, + -0.377638559727314, -0.34858943974829, -0.350040018655722, + -0.379210020210366, -0.319540319769265, -0.290491199790241, + -0.291700015546435, -0.320870017101079, -0.261442079811217, + -0.232392959832193, -0.233360012437148, -0.262530013991792, + -0.203343839853169, -0.174294719874145, -0.175020009327861, + -0.204190010882505, -0.145245599895121, -0.116196479916097, + -0.116680006218574, -0.145850007773218, -0.0871473599370724, + -0.0580982399580483, -0.0583400031092871, -0.0875100046639306, + -0.0290491199790241, -0.0291700015546435, -0.966599143298677, + -0.937308260168414, -0.908017377038151, -0.878726493907888, + -0.849435610777625, -0.820144727647363, -0.7908538445171, + -0.761562961386837, -0.732272078256574, -0.702981195126311, + -0.673690311996048, -0.644399428865785, -0.615108545735522, + -0.585817662605259, -0.556526779474996, -0.527235896344733, + -0.49794501321447, -0.468654130084207, -0.439363246953944, + -0.410072363823681, -0.380781480693418, -0.351490597563155, + -0.322199714432892, -0.292908831302629, -0.263617948172367, + -0.234327065042104, -0.205036181911841, -0.175745298781578, + -0.146454415651315, -0.117163532521052, -0.0878726493907888, + -0.0585817662605259, -0.0292908831302629, 2.49716834795752, + 2.44722498099837, 2.44861249049918, 2.49929198673282, 2.5, 2.45, 2.4, + 2.39864080701961, 2.39728161403922, 2.34733824708007, 2.34866912354003, + 2.35, 2.3, 2.29869744006046, 2.29739488012092, 2.24745151316177, + 2.24872575658088, 2.25, 2.2, 2.19875407310131, 2.19750814620262, + 2.14756477924347, 2.14878238962173, 2.15, 2.1, 2.09881070614216, + 2.09762141228432, 2.04767804532517, 2.04883902266258, 2.05, + 2.48867980643271, 2.43890621030406, 2.44306559565121, 2.49363028652563, + 2.39320711410731, 2.3891326141754, 2.33935901804675, 2.34334863256341, + 2.29349015101951, 2.28958542191809, 2.23981182578944, 2.2436316694756, + 2.1937731879317, 2.19003822966079, 2.14026463353213, 2.1439147063878, + 2.0940562248439, 2.09049103740348, 2.04071744127482, 2.04419774329999, + 2.47455360470233, 2.42506253260829, 2.43198437145617, 2.48231971168322, + 2.38235203734482, 2.37557146051424, 2.32608038842019, 2.33271970323347, + 2.28308736912212, 2.27658931632615, 2.2270982442321, 2.23345503501077, + 2.18382270089942, 2.17760717213805, 2.12811610004401, 2.13419036678807, + 2.08455803267672, 2.07862502794996, 2.02913395585591, 2.03492569856537, + 2.45482174315677, 2.40572530829363, 2.41539392045096, 2.46538588429547, + 2.36610016697237, 2.3566288734305, 2.30753243856736, 2.31680641349378, + 2.26751266001519, 2.25843600370423, 2.20933956884109, 2.21821890653659, + 2.168925153058, 2.16024313397795, 2.11114669911482, 2.11963139957941, + 2.07033764610082, 2.06205026425168, 2.01295382938855, 2.02104389262223, + 2.42952892080885, 2.38093834239268, 2.39333182534315, 2.4428671649279, + 2.3444883187035, 2.3323477639765, 2.28375718556032, 2.29564481206384, + 2.24680130542419, 2.23516660714415, 2.18657602872797, 2.19795779878453, + 2.14911429214487, 2.13798545031179, 2.08939487189561, 2.10027078550522, + 2.05142727886556, 2.04080429347944, 1.99221371506326, 2.0025837722259, + 2.39873243403624, 2.35075778535552, 2.3658480638741, 2.41481456572267, + 2.31756545032565, 2.30278313667479, 2.25480848799407, 2.2692828367772, + 2.22100022322874, 2.20683383931334, 2.15885919063262, 2.17271760968029, + 2.12443499613184, 2.11088454195189, 2.06290989327117, 2.07615238258339, + 2.02786976903494, 2.01493524459044, 1.96696059590972, 1.97958715548649, + 2.36250204678667, 2.31525200585094, 2.33300489560323, 2.38129163483965, + 2.285392550795, 2.2680019649152, 2.22075192397947, 2.23778020598677, + 2.19016786117854, 2.17350188304374, 2.126251842108, 2.14255551637031, + 2.09494317156208, 2.07900180117227, 2.03175176023654, 2.04733082675385, + 1.99971848194562, 1.9845017193008, 1.93725167836507, 1.95210613713739, + 2.32091983254018, 2.27450143588938, 2.29487672087016, 2.3423743124994, + 2.24804250207689, 2.22808303923857, 2.18166464258777, 2.20120828328362, + 2.15437406449035, 2.13524624593697, 2.08882784928616, 2.10753984569708, + 2.06070562690382, 2.04240945263536, 1.99599105598456, 2.01387140811055, + 1.96703718931728, 1.94957265933375, 1.90315426268295, 1.92020297052401, + 2.2740799883863, 2.22859838861857, 2.25154991225397, 2.29815075895416, + 2.20559991404471, 2.18311678885084, 2.13763518908312, 2.15964991583544, + 2.11369991762618, 2.09215358931539, 2.04667198954767, 2.06774991941692, + 2.02179992120765, 2.00119038977994, 1.95570879001221, 1.97584992299839, + 1.92989992478912, 1.91022719024449, 1.86474559047676, 1.88394992657986, + 2.22208862163731, 2.17764684920456, 2.20312261891157, 2.24872115477651, + 2.15816093281133, 2.13320507677182, 2.08876330433907, 2.11319924671109, + 2.06823756061086, 2.04432153190632, 1.99987975947358, 2.02327587451062, + 1.97831418841039, 1.95543798704083, 1.91099621460809, 1.93335250231015, + 1.88839081620991, 1.86655444217534, 1.82211266974259, 1.84342913010968, + 2.1650635094611, 2.12176223927188, 2.14970454423822, 2.19419747391814, + 2.10583302292723, 2.07846096908265, 2.03515969889343, 2.06196150161625, + 2.01808998030527, 1.99185842870421, 1.94855715851499, 1.97421845899428, + 1.9303469376833, 1.90525588832577, 1.86195461813654, 1.88647541637231, + 1.84260389506133, 1.81865334794732, 1.7753520777581, 1.79873237375035, + 2.10313383207795, 2.06107115543639, 2.09141669735413, 2.13470323005287, + 2.04873472393874, 2.01900847879483, 1.97694580215328, 2.00605275052335, + 1.96337077710796, 1.93488312551172, 1.89282044887016, 1.92068880369257, + 1.87800683027718, 1.8507577722286, 1.80869509558704, 1.83532485686179, + 1.7926428834464, 1.76663241894548, 1.72456974230392, 1.74996091003101, + 2.03643988012584, 1.99571108252332, 2.02839111897986, 2.07037319677843, + 1.98699538185782, 1.95498228492081, 1.91425348731829, 1.94559964473578, + 1.90420390761374, 1.87352468971577, 1.83279589211325, 1.86280817049171, + 1.82141243336967, 1.79206709451074, 1.75133829690822, 1.78001669624763, + 1.73862095912559, 1.71060949930571, 1.66988070170319, 1.69722522200355, + 1.96513273685697, 1.92583008211983, 1.96077058232158, 2.0013531023109, + 1.92075485615175, 1.88652742738269, 1.84722477264555, 1.88073912998192, + 1.84072340381209, 1.80792211790841, 1.76861946317127, 1.80070767764226, + 1.76069195147244, 1.72931680843413, 1.69001415369699, 1.72067622530261, + 1.68066049913278, 1.65071149895985, 1.61140884422271, 1.64064477296295, + 1.88937393588565, 1.85158645716793, 1.88870826964388, 1.92779929936347, + 1.85016320291646, 1.81379897845022, 1.77601149973251, 1.81161813618903, + 1.7730730694616, 1.73822402101479, 1.70043654229708, 1.73452800273418, + 1.69598293600675, 1.66264906357937, 1.62486158486166, 1.65743786927932, + 1.6188928025519, 1.58707410614394, 1.54928662742623, 1.58034773582447, + 1.80933509526268, 1.77314839335742, 1.81236742526268, 1.84987841095721, + 1.77538033495119, 1.73696169145217, 1.70077498954691, 1.73839324463971, + 1.70140615432823, 1.66458828764166, 1.62840158573641, 1.66441906401674, + 1.62743197370526, 1.59221488383115, 1.5560281819259, 1.59044488339378, + 1.5534577930823, 1.51984148002065, 1.48365477811539, 1.51647070277081, + 1.72519752870528, 1.69069357813117, 1.7319209857443, 1.76776695296637, + 1.69657565950462, 1.65618962755707, 1.62168567698296, 1.66123033326494, + 1.62588500702526, 1.58718172640886, 1.55267777583475, 1.59053968078558, + 1.5551943545459, 1.51817382526065, 1.48366987468654, 1.51984902830622, + 1.48450370206654, 1.44916592411244, 1.41466197353833, 1.44915837582686, + 1.63715183486321, 1.60440879816595, 1.64755118814856, 1.68165093425313, + 1.61392769451288, 1.57166576146868, 1.53892272477142, 1.58030420087719, + 1.54668070724151, 1.50617968807416, 1.47343665137689, 1.51305721360582, + 1.47943371997014, 1.44069361467963, 1.40795057798236, 1.44581022633445, + 1.41218673269877, 1.3752075412851, 1.34246450458783, 1.37856323906308, + 1.54539746555151, 1.51448951624048, 1.55944915720322, 1.59172543529772, + 1.52762366419907, 1.48358156692945, 1.45267361761842, 1.49579817119492, + 1.46397267819077, 1.42176566830739, 1.39085771899636, 1.43214718518663, + 1.40032169218248, 1.35994976968533, 1.3290418203743, 1.36849619917833, + 1.33667070617418, 1.29813387106327, 1.26722592175224, 1.30484521317004, + 1.45014227392799, 1.42113942844943, 1.46781447234496, 1.49819416627837, + 1.43785907495016, 1.39213658297087, 1.36313373749232, 1.40790367755537, + 1.37794828016057, 1.33413089201376, 1.3051280465352, 1.34799288276578, + 1.31803748537098, 1.27612520105664, 1.24712235557808, 1.28808208797619, + 1.25812669058139, 1.21811951009952, 1.18911666462096, 1.2281712931866, + 1.35160204363899, 1.32457000276621, 1.37285471560782, 1.40126900560223, + 1.34483727243215, 1.29753796189343, 1.27050592102065, 1.31681982925648, + 1.28880238608081, 1.24347388014787, 1.21644183927509, 1.26078494290514, + 1.23276749972948, 1.18940979840231, 1.16237775752953, 1.20475005655381, + 1.17673261337814, 1.13534571665675, 1.10831367578398, 1.14871517020247, + 1.25, 1.225, 1.27478500138311, 1.30116951993268, 1.24876898094672, 1.2, + 1.175, 1.22275296051033, 1.19673694007394, 1.15, 1.125, 1.17072091963755, + 1.14470489920116, 1.1, 1.075, 1.11868887876477, 1.09267285832838, 1.05, + 1.025, 1.06665683789199, 1.14556630431853, 1.12265497823216, + 1.17382748911608, 1.19812246680014, 1.14987182607289, 1.09974365214578, + 1.07683232605941, 1.12591616302971, 1.10196049998652, 1.05392099997304, + 1.03100967388667, 1.07800483694334, 1.05404917390015, 1.0080983478003, + 0.985187021713932, 1.03009351085697, 1.00613784781378, 0.962275695627562, + 0.939364369541191, 0.982182184770596, 1.03853753250472, 1.01776678185462, + 1.07021088004339, 1.0923612809234, 1.04836984167516, 0.996996031204528, + 0.976225280554434, 1.02652880330692, 1.00468776493869, 0.955454529904339, + 0.934683779254245, 0.982846726570459, 0.961005688202227, + 0.913913028604151, 0.893142277954056, 0.939164649833994, + 0.917323611465762, 0.872371527303962, 0.851600776653867, + 0.895482573097529, 0.929156139150819, 0.910573016367803, + 0.964169899111213, 0.984125545404854, 0.944492962394657, + 0.891989893584786, 0.87340677080177, 0.924816025678102, + 0.905139088961546, 0.854823648018753, 0.836240525235737, + 0.885462152244991, 0.865785215528436, 0.817657402452721, + 0.799074279669704, 0.84610827881188, 0.826431342095325, + 0.780491156886688, 0.761908034103671, 0.806754405378769, + 0.817669908293554, 0.801316510127683, 0.855944763247743, + 0.873660448997746, 0.838476502773299, 0.784963111961812, + 0.768609713795941, 0.821008242298855, 0.803539981824412, + 0.75225631563007, 0.735902917464199, 0.786071721349968, + 0.768603460875524, 0.719549519298328, 0.703196121132456, + 0.75113520040108, 0.733666939926637, 0.686842722966585, + 0.670489324800714, 0.716198679452193, 0.704331392103575, + 0.690244764261504, 0.745780637194593, 0.761216230674768, + 0.730560624190622, 0.676158136419432, 0.662071508577361, + 0.715340611186651, 0.700120598182679, 0.647984880735289, + 0.633898252893217, 0.684900585178708, 0.669680572174737, + 0.619811625051146, 0.605724997209074, 0.654460559170765, + 0.639240546166794, 0.591638369367003, 0.577551741524931, + 0.624020533162823, 0.589397338773569, 0.577609391998097, + 0.633927078129801, 0.647047612756303, 0.620989790821029, + 0.565821445222626, 0.554033498447154, 0.608052503512257, + 0.595115216203486, 0.542245551671683, 0.530457604896212, + 0.582177928894715, 0.569240641585943, 0.51866965812074, + 0.506881711345269, 0.556303354277171, 0.5433660669684, 0.495093764569797, + 0.483305817794326, 0.530428779659629, 0.473128110901025, + 0.463665548683005, 0.520637470340551, 0.531413223882442, + 0.510012215843805, 0.454202986464984, 0.444740424246964, + 0.499386961347059, 0.488761706850313, 0.435277862028943, + 0.425815299810923, 0.478136452353567, 0.467511197856821, + 0.416352737592902, 0.406890175374882, 0.456885943360075, + 0.446260688863329, 0.397427613156861, 0.387965050938841, + 0.435635434366583, 0.355787095683214, 0.34867135376955, + 0.406168451226277, 0.414575013135936, 0.397879299160435, + 0.341555611855886, 0.334439869942221, 0.389590147094593, + 0.38130099502875, 0.327324128028557, 0.320208386114892, + 0.373011842962908, 0.364722690897065, 0.313092644201228, + 0.305976902287564, 0.356433538831223, 0.34814438676538, + 0.298861160373899, 0.291745418460235, 0.339855234699538, + 0.237640108260458, 0.232887306095248, 0.290779329932399, + 0.296797656643264, 0.284845057892962, 0.228134503930039, + 0.22338170176483, 0.278910785853526, 0.272976513814089, + 0.218628899599621, 0.213876097434412, 0.267042241774652, + 0.261107969735215, 0.209123295269202, 0.204370493103993, + 0.255173697695778, 0.249239425656342, 0.199617690938784, + 0.194864888773575, 0.243305153616905, 0.118954789559356, + 0.116575693768169, 0.174731499931709, 0.178347957998081, + 0.17116555095351, 0.114196597976982, 0.111817502185795, + 0.167599601975312, 0.164033652997114, 0.109438406394608, + 0.10705931060342, 0.160467704018916, 0.156901755040718, + 0.104680214812233, 0.102301119021046, 0.15333580606252, + 0.149769857084322, 0.099922023229859, 0.0975429274386719, + 0.146203908106123, -4.59242549680257e-16, -4.01071826720758e-16, + 0.0582878468840842, 0.0594942438652687, 0.0570982989884907, + -3.42901103761259e-16, -2.8473038080176e-16, 0.0559087510928972, + 0.0547192031973036, -2.2655965784226e-16, -1.68388934882761e-16, + 0.0535296553017101, 0.0523401074061166, -1.10218211923262e-16, + -5.20474889637625e-17, 0.051150559510523, 0.0499610116149295, + 6.12323399573675e-18, 6.4293956955236e-17, 0.048771463719336, + 2.04883902266258, 2.04767804532517, 2.09762141228432, 2.09881070614216, + 2.14878238962173, 2.14756477924347, 2.19750814620262, 2.19875407310131, + 2.24872575658088, 2.24745151316177, 2.29739488012092, 2.29869744006046, + 2.34866912354003, 2.34733824708007, 2.39728161403922, 2.39864080701961, + 2.44861249049918, 2.44722498099837, 2.49716834795752, 2.49929198673282, + 2.04419774329999, 2.04071744127482, 2.09049103740348, 2.0940562248439, + 2.1439147063878, 2.14026463353213, 2.19003822966079, 2.1937731879317, + 2.2436316694756, 2.23981182578944, 2.28958542191809, 2.29349015101951, + 2.34334863256341, 2.33935901804675, 2.3891326141754, 2.39320711410731, + 2.44306559565121, 2.43890621030406, 2.48867980643271, 2.49363028652563, + 2.03492569856537, 2.02913395585591, 2.07862502794996, 2.08455803267672, + 2.13419036678807, 2.12811610004401, 2.17760717213805, 2.18382270089942, + 2.23345503501077, 2.2270982442321, 2.27658931632615, 2.28308736912212, + 2.33271970323347, 2.32608038842019, 2.37557146051424, 2.38235203734482, + 2.43198437145617, 2.42506253260829, 2.47455360470233, 2.48231971168322, + 2.02104389262223, 2.01295382938855, 2.06205026425168, 2.07033764610082, + 2.11963139957941, 2.11114669911482, 2.16024313397795, 2.168925153058, + 2.21821890653659, 2.20933956884109, 2.25843600370423, 2.26751266001519, + 2.31680641349378, 2.30753243856736, 2.3566288734305, 2.36610016697237, + 2.41539392045096, 2.40572530829363, 2.45482174315677, 2.46538588429547, + 2.0025837722259, 1.99221371506326, 2.04080429347944, 2.05142727886556, + 2.10027078550522, 2.08939487189561, 2.13798545031179, 2.14911429214487, + 2.19795779878453, 2.18657602872797, 2.23516660714415, 2.24680130542419, + 2.29564481206384, 2.28375718556032, 2.3323477639765, 2.3444883187035, + 2.39333182534315, 2.38093834239268, 2.42952892080885, 2.4428671649279, + 1.97958715548649, 1.96696059590972, 2.01493524459044, 2.02786976903494, + 2.07615238258339, 2.06290989327117, 2.11088454195189, 2.12443499613184, + 2.17271760968029, 2.15885919063262, 2.20683383931334, 2.22100022322874, + 2.2692828367772, 2.25480848799407, 2.30278313667479, 2.31756545032565, + 2.3658480638741, 2.35075778535552, 2.39873243403624, 2.41481456572267, + 1.95210613713739, 1.93725167836507, 1.9845017193008, 1.99971848194562, + 2.04733082675385, 2.03175176023654, 2.07900180117227, 2.09494317156208, + 2.14255551637031, 2.126251842108, 2.17350188304374, 2.19016786117854, + 2.23778020598677, 2.22075192397947, 2.2680019649152, 2.285392550795, + 2.33300489560323, 2.31525200585094, 2.36250204678667, 2.38129163483965, + 1.92020297052401, 1.90315426268295, 1.94957265933375, 1.96703718931728, + 2.01387140811055, 1.99599105598456, 2.04240945263536, 2.06070562690382, + 2.10753984569708, 2.08882784928616, 2.13524624593697, 2.15437406449035, + 2.20120828328362, 2.18166464258777, 2.22808303923857, 2.24804250207689, + 2.29487672087016, 2.27450143588938, 2.32091983254018, 2.3423743124994, + 1.88394992657986, 1.86474559047676, 1.91022719024449, 1.92989992478912, + 1.97584992299839, 1.95570879001221, 2.00119038977994, 2.02179992120765, + 2.06774991941691, 2.04667198954767, 2.09215358931539, 2.11369991762618, + 2.15964991583544, 2.13763518908312, 2.18311678885084, 2.20559991404471, + 2.25154991225397, 2.22859838861857, 2.2740799883863, 2.29815075895416, + 1.84342913010968, 1.82211266974259, 1.86655444217534, 1.88839081620991, + 1.93335250231015, 1.91099621460808, 1.95543798704083, 1.97831418841039, + 2.02327587451062, 1.99987975947358, 2.04432153190632, 2.06823756061086, + 2.11319924671109, 2.08876330433907, 2.13320507677182, 2.15816093281133, + 2.20312261891157, 2.17764684920456, 2.22208862163731, 2.24872115477651, + 1.79873237375035, 1.7753520777581, 1.81865334794732, 1.84260389506133, + 1.88647541637231, 1.86195461813654, 1.90525588832576, 1.9303469376833, + 1.97421845899428, 1.94855715851499, 1.99185842870421, 2.01808998030527, + 2.06196150161625, 2.03515969889343, 2.07846096908265, 2.10583302292723, + 2.14970454423822, 2.12176223927187, 2.1650635094611, 2.19419747391814, + 1.74996091003101, 1.72456974230392, 1.76663241894548, 1.7926428834464, + 1.83532485686179, 1.80869509558704, 1.8507577722286, 1.87800683027718, + 1.92068880369257, 1.89282044887016, 1.93488312551172, 1.96337077710796, + 2.00605275052335, 1.97694580215328, 2.01900847879483, 2.04873472393874, + 2.09141669735413, 2.06107115543639, 2.10313383207795, 2.13470323005287, + 1.69722522200355, 1.66988070170319, 1.7106094993057, 1.73862095912559, + 1.78001669624763, 1.75133829690822, 1.79206709451074, 1.82141243336967, + 1.86280817049171, 1.83279589211326, 1.87352468971577, 1.90420390761374, + 1.94559964473578, 1.91425348731829, 1.95498228492081, 1.98699538185782, + 2.02839111897986, 1.99571108252332, 2.03643988012584, 2.07037319677843, + 1.64064477296295, 1.61140884422271, 1.65071149895985, 1.68066049913278, + 1.72067622530261, 1.69001415369699, 1.72931680843413, 1.76069195147244, + 1.80070767764226, 1.76861946317127, 1.80792211790841, 1.84072340381209, + 1.88073912998192, 1.84722477264555, 1.88652742738269, 1.92075485615175, + 1.96077058232158, 1.92583008211983, 1.96513273685697, 2.0013531023109, + 1.58034773582447, 1.54928662742623, 1.58707410614394, 1.6188928025519, + 1.65743786927932, 1.62486158486165, 1.66264906357937, 1.69598293600675, + 1.73452800273418, 1.70043654229708, 1.73822402101479, 1.7730730694616, + 1.81161813618903, 1.77601149973251, 1.81379897845022, 1.85016320291645, + 1.88870826964388, 1.85158645716793, 1.88937393588565, 1.92779929936347, + 1.51647070277081, 1.48365477811539, 1.51984148002065, 1.55345779308229, + 1.59044488339378, 1.5560281819259, 1.59221488383115, 1.62743197370526, + 1.66441906401674, 1.62840158573641, 1.66458828764166, 1.70140615432823, + 1.73839324463971, 1.70077498954691, 1.73696169145217, 1.77538033495119, + 1.81236742526268, 1.77314839335742, 1.80933509526268, 1.84987841095721, + 1.44915837582686, 1.41466197353833, 1.44916592411243, 1.48450370206654, + 1.51984902830622, 1.48366987468654, 1.51817382526065, 1.5551943545459, + 1.59053968078558, 1.55267777583475, 1.58718172640886, 1.62588500702526, + 1.66123033326494, 1.62168567698296, 1.65618962755707, 1.69657565950462, + 1.7319209857443, 1.69069357813117, 1.72519752870528, 1.76776695296637, + 1.37856323906308, 1.34246450458783, 1.3752075412851, 1.41218673269877, + 1.44581022633445, 1.40795057798236, 1.44069361467963, 1.47943371997014, + 1.51305721360582, 1.47343665137689, 1.50617968807416, 1.54668070724151, + 1.58030420087719, 1.53892272477142, 1.57166576146868, 1.61392769451288, + 1.64755118814856, 1.60440879816595, 1.63715183486321, 1.68165093425313, + 1.30484521317004, 1.26722592175224, 1.29813387106327, 1.33667070617418, + 1.36849619917833, 1.3290418203743, 1.35994976968533, 1.40032169218248, + 1.43214718518663, 1.39085771899636, 1.42176566830739, 1.46397267819077, + 1.49579817119492, 1.45267361761842, 1.48358156692945, 1.52762366419907, + 1.55944915720322, 1.51448951624048, 1.54539746555151, 1.59172543529772, + 1.2281712931866, 1.18911666462096, 1.21811951009952, 1.25812669058139, + 1.28808208797619, 1.24712235557808, 1.27612520105664, 1.31803748537098, + 1.34799288276578, 1.3051280465352, 1.33413089201376, 1.37794828016057, + 1.40790367755537, 1.36313373749232, 1.39213658297088, 1.43785907495016, + 1.46781447234496, 1.42113942844944, 1.450142273928, 1.49819416627837, + 1.14871517020246, 1.10831367578397, 1.13534571665675, 1.17673261337813, + 1.2047500565538, 1.16237775752953, 1.18940979840231, 1.23276749972947, + 1.26078494290514, 1.21644183927509, 1.24347388014787, 1.28880238608081, + 1.31681982925648, 1.27050592102065, 1.29753796189343, 1.34483727243215, + 1.37285471560782, 1.32457000276621, 1.35160204363899, 1.40126900560224, + 1.06665683789199, 1.025, 1.05, 1.09267285832838, 1.11868887876477, 1.075, + 1.1, 1.14470489920116, 1.17072091963755, 1.125, 1.15, 1.19673694007394, + 1.22275296051033, 1.175, 1.2, 1.24876898094672, 1.27478500138311, 1.225, + 1.25, 1.30116951993268, 0.982182184770595, 0.939364369541191, + 0.962275695627561, 1.00613784781378, 1.03009351085697, 0.985187021713932, + 1.0080983478003, 1.05404917390015, 1.07800483694334, 1.03100967388667, + 1.05392099997304, 1.10196049998652, 1.12591616302971, 1.07683232605941, + 1.09974365214578, 1.14987182607289, 1.17382748911608, 1.12265497823216, + 1.14556630431853, 1.19812246680014, 0.895482573097529, 0.851600776653866, + 0.872371527303961, 0.917323611465761, 0.939164649833994, + 0.893142277954055, 0.91391302860415, 0.961005688202226, + 0.982846726570459, 0.934683779254244, 0.955454529904339, + 1.00468776493869, 1.02652880330692, 0.976225280554433, 0.996996031204527, + 1.04836984167516, 1.07021088004339, 1.01776678185462, 1.03853753250472, + 1.0923612809234, 0.806754405378768, 0.76190803410367, 0.780491156886687, + 0.826431342095324, 0.846108278811879, 0.799074279669703, + 0.81765740245272, 0.865785215528435, 0.88546215224499, 0.836240525235736, + 0.854823648018753, 0.905139088961546, 0.924816025678101, + 0.873406770801769, 0.891989893584786, 0.944492962394657, + 0.964169899111212, 0.910573016367802, 0.929156139150819, + 0.984125545404854, 0.716198679452192, 0.670489324800714, + 0.686842722966585, 0.733666939926636, 0.75113520040108, + 0.703196121132456, 0.719549519298327, 0.768603460875523, + 0.786071721349967, 0.735902917464198, 0.752256315630069, + 0.803539981824411, 0.821008242298855, 0.76860971379594, + 0.784963111961812, 0.838476502773299, 0.855944763247742, + 0.801316510127683, 0.817669908293554, 0.873660448997746, + 0.624020533162822, 0.57755174152493, 0.591638369367002, + 0.639240546166793, 0.654460559170765, 0.605724997209073, + 0.619811625051145, 0.669680572174736, 0.684900585178707, + 0.633898252893216, 0.647984880735288, 0.700120598182679, + 0.71534061118665, 0.662071508577359, 0.676158136419431, + 0.730560624190621, 0.745780637194592, 0.690244764261502, + 0.704331392103574, 0.761216230674767, 0.530428779659627, + 0.483305817794325, 0.495093764569796, 0.543366066968399, + 0.55630335427717, 0.506881711345268, 0.518669658120739, + 0.569240641585942, 0.582177928894714, 0.530457604896211, + 0.542245551671682, 0.595115216203485, 0.608052503512256, + 0.554033498447154, 0.565821445222625, 0.620989790821028, 0.6339270781298, + 0.577609391998097, 0.589397338773568, 0.647047612756302, + 0.435635434366583, 0.387965050938841, 0.397427613156861, + 0.446260688863329, 0.456885943360075, 0.406890175374882, + 0.416352737592902, 0.467511197856821, 0.478136452353567, + 0.425815299810923, 0.435277862028943, 0.488761706850313, + 0.499386961347059, 0.444740424246964, 0.454202986464984, + 0.510012215843805, 0.520637470340551, 0.463665548683005, + 0.473128110901025, 0.531413223882442, 0.339855234699537, + 0.291745418460234, 0.298861160373898, 0.34814438676538, + 0.356433538831222, 0.305976902287563, 0.313092644201227, + 0.364722690897065, 0.373011842962907, 0.320208386114891, + 0.327324128028556, 0.381300995028749, 0.389590147094592, + 0.33443986994222, 0.341555611855884, 0.397879299160434, + 0.406168451226277, 0.348671353769548, 0.355787095683213, + 0.414575013135935, 0.243305153616904, 0.194864888773573, + 0.199617690938783, 0.249239425656341, 0.255173697695777, + 0.204370493103992, 0.209123295269201, 0.261107969735214, + 0.267042241774651, 0.21387609743441, 0.21862889959962, 0.272976513814088, + 0.278910785853524, 0.223381701764829, 0.228134503930038, + 0.284845057892961, 0.290779329932398, 0.232887306095247, + 0.237640108260456, 0.296797656643263, 0.146203908106123, + 0.0975429274386718, 0.0999220232298589, 0.149769857084321, + 0.153335806062519, 0.102301119021046, 0.104680214812233, + 0.156901755040717, 0.160467704018915, 0.10705931060342, + 0.109438406394607, 0.164033652997113, 0.167599601975312, + 0.111817502185794, 0.114196597976981, 0.17116555095351, + 0.174731499931708, 0.116575693768168, 0.118954789559355, + 0.178347957998081, 0.0487714637193358, -3.15346550780443e-16, + -2.63299061816681e-16, 0.0499610116149293, 0.0511505595105229, + -2.11251572852918e-16, -1.59204083889156e-16, 0.0523401074061164, + 0.05352965530171, -1.07156594925393e-16, -5.51091059616309e-17, + 0.0547192031973036, 0.0559087510928971, -3.06161699786838e-18, + 4.89858719658942e-17, 0.0570982989884907, 0.0582878468840842, + 1.01033360929657e-16, 1.53080849893419e-16, 0.0594942438652687, + -0.0487714637193364, -0.0975429274386725, -0.0999220232298594, + -0.0499610116149298, -0.0511505595105233, -0.102301119021046, + -0.104680214812233, -0.0523401074061167, -0.0535296553017102, + -0.10705931060342, -0.109438406394607, -0.0547192031973037, + -0.0559087510928971, -0.111817502185794, -0.114196597976981, + -0.0570982989884906, -0.058287846884084, -0.116575693768168, + -0.118954789559355, -0.0594942438652684, -0.146203908106124, + -0.194864888773576, -0.199617690938785, -0.149769857084322, + -0.15333580606252, -0.204370493103994, -0.209123295269203, + -0.156901755040718, -0.160467704018916, -0.213876097434412, + -0.218628899599621, -0.164033652997114, -0.167599601975312, + -0.22338170176483, -0.228134503930039, -0.17116555095351, + -0.174731499931708, -0.232887306095248, -0.237640108260457, + -0.178347957998081, -0.243305153616905, -0.291745418460235, + -0.298861160373899, -0.249239425656342, -0.255173697695779, + -0.305976902287563, -0.313092644201228, -0.261107969735215, + -0.267042241774652, -0.320208386114892, -0.327324128028556, + -0.272976513814088, -0.278910785853525, -0.33443986994222, + -0.341555611855885, -0.284845057892962, -0.290779329932398, + -0.348671353769549, -0.355787095683213, -0.296797656643263, + -0.339855234699538, -0.387965050938842, -0.397427613156862, + -0.348144386765381, -0.356433538831223, -0.406890175374882, + -0.416352737592903, -0.364722690897065, -0.373011842962907, + -0.425815299810923, -0.435277862028944, -0.38130099502875, + -0.389590147094592, -0.444740424246964, -0.454202986464984, + -0.397879299160434, -0.406168451226277, -0.463665548683005, + -0.473128110901025, -0.414575013135935, -0.435635434366584, + -0.483305817794327, -0.495093764569798, -0.44626068886333, + -0.456885943360076, -0.506881711345269, -0.518669658120741, + -0.467511197856822, -0.478136452353568, -0.530457604896212, + -0.542245551671683, -0.488761706850313, -0.499386961347059, + -0.554033498447155, -0.565821445222626, -0.510012215843805, + -0.520637470340551, -0.577609391998097, -0.589397338773568, + -0.531413223882442, -0.530428779659629, -0.577551741524931, + -0.591638369367002, -0.5433660669684, -0.556303354277172, + -0.605724997209074, -0.619811625051145, -0.569240641585943, + -0.582177928894714, -0.633898252893217, -0.647984880735288, + -0.595115216203486, -0.608052503512257, -0.66207150857736, + -0.676158136419431, -0.620989790821029, -0.6339270781298, + -0.690244764261503, -0.704331392103575, -0.647047612756302, + -0.624020533162823, -0.670489324800715, -0.686842722966586, + -0.639240546166794, -0.654460559170765, -0.703196121132457, + -0.719549519298328, -0.669680572174737, -0.684900585178708, + -0.735902917464199, -0.75225631563007, -0.700120598182679, + -0.71534061118665, -0.768609713795941, -0.784963111961812, + -0.730560624190622, -0.745780637194593, -0.801316510127683, + -0.817669908293554, -0.761216230674768, -0.716198679452193, + -0.761908034103672, -0.780491156886688, -0.733666939926637, + -0.751135200401081, -0.799074279669705, -0.817657402452721, + -0.768603460875524, -0.786071721349968, -0.836240525235737, + -0.854823648018753, -0.803539981824412, -0.821008242298855, + -0.87340677080177, -0.891989893584786, -0.838476502773299, + -0.855944763247743, -0.910573016367802, -0.929156139150819, + -0.873660448997746, -0.80675440537877, -0.851600776653867, + -0.872371527303961, -0.826431342095325, -0.84610827881188, + -0.893142277954056, -0.91391302860415, -0.865785215528435, + -0.885462152244991, -0.934683779254244, -0.955454529904338, + -0.905139088961546, -0.924816025678101, -0.976225280554433, + -0.996996031204527, -0.944492962394657, -0.964169899111212, + -1.01776678185462, -1.03853753250472, -0.984125545404853, + -0.895482573097529, -0.939364369541192, -0.962275695627562, + -0.917323611465762, -0.939164649833994, -0.985187021713932, + -1.0080983478003, -0.961005688202226, -0.982846726570459, + -1.03100967388667, -1.05392099997304, -1.00468776493869, + -1.02652880330692, -1.07683232605941, -1.09974365214578, + -1.04836984167516, -1.07021088004339, -1.12265497823216, + -1.14556630431853, -1.0923612809234, -0.982182184770596, -1.025, -1.05, + -1.00613784781378, -1.03009351085697, -1.075, -1.1, -1.05404917390015, + -1.07800483694334, -1.125, -1.15, -1.10196049998652, -1.12591616302971, + -1.175, -1.2, -1.14987182607289, -1.17382748911608, -1.225, -1.25, + -1.19812246680014, -1.06665683789199, -1.10831367578398, + -1.13534571665676, -1.09267285832838, -1.11868887876477, + -1.16237775752954, -1.18940979840232, -1.14470489920116, + -1.17072091963755, -1.21644183927509, -1.24347388014787, + -1.19673694007394, -1.22275296051033, -1.27050592102065, + -1.29753796189343, -1.24876898094672, -1.27478500138311, + -1.32457000276621, -1.35160204363899, -1.30116951993268, + -1.14871517020247, -1.18911666462096, -1.21811951009952, + -1.17673261337814, -1.20475005655381, -1.24712235557808, + -1.27612520105664, -1.23276749972948, -1.26078494290515, + -1.3051280465352, -1.33413089201376, -1.28880238608082, + -1.31681982925649, -1.36313373749232, -1.39213658297088, + -1.34483727243216, -1.37285471560782, -1.42113942844944, -1.450142273928, + -1.40126900560224, -1.2281712931866, -1.26722592175224, + -1.29813387106327, -1.25812669058139, -1.28808208797619, + -1.3290418203743, -1.35994976968533, -1.31803748537098, + -1.34799288276578, -1.39085771899636, -1.42176566830739, + -1.37794828016057, -1.40790367755537, -1.45267361761842, + -1.48358156692945, -1.43785907495016, -1.46781447234496, + -1.51448951624048, -1.54539746555151, -1.49819416627837, + -1.30484521317004, -1.34246450458783, -1.3752075412851, + -1.33667070617419, -1.36849619917833, -1.40795057798236, + -1.44069361467963, -1.40032169218248, -1.43214718518663, + -1.47343665137689, -1.50617968807416, -1.46397267819077, + -1.49579817119492, -1.53892272477142, -1.57166576146868, + -1.52762366419907, -1.55944915720322, -1.60440879816595, + -1.63715183486321, -1.59172543529772, -1.37856323906308, + -1.41466197353833, -1.44916592411244, -1.41218673269877, + -1.44581022633445, -1.48366987468654, -1.51817382526065, + -1.47943371997014, -1.51305721360582, -1.55267777583475, + -1.58718172640886, -1.54668070724151, -1.58030420087719, + -1.62168567698296, -1.65618962755707, -1.61392769451288, + -1.64755118814856, -1.69069357813117, -1.72519752870528, + -1.68165093425313, -1.44915837582686, -1.48365477811539, + -1.51984148002065, -1.48450370206654, -1.51984902830622, + -1.5560281819259, -1.59221488383115, -1.5551943545459, -1.59053968078558, + -1.62840158573641, -1.66458828764166, -1.62588500702526, + -1.66123033326494, -1.70077498954691, -1.73696169145217, + -1.69657565950462, -1.7319209857443, -1.77314839335742, + -1.80933509526268, -1.76776695296637, -1.51647070277081, + -1.54928662742623, -1.58707410614394, -1.5534577930823, + -1.59044488339378, -1.62486158486166, -1.66264906357937, + -1.62743197370526, -1.66441906401674, -1.70043654229708, + -1.73822402101479, -1.70140615432823, -1.73839324463971, + -1.77601149973251, -1.81379897845022, -1.77538033495119, + -1.81236742526268, -1.85158645716793, -1.88937393588565, + -1.84987841095721, -1.58034773582447, -1.61140884422271, + -1.65071149895985, -1.6188928025519, -1.65743786927932, + -1.69001415369699, -1.72931680843413, -1.69598293600675, + -1.73452800273418, -1.76861946317127, -1.80792211790841, + -1.7730730694616, -1.81161813618903, -1.84722477264555, + -1.88652742738269, -1.85016320291645, -1.88870826964388, + -1.92583008211983, -1.96513273685697, -1.92779929936347, + -1.64064477296295, -1.66988070170319, -1.71060949930571, + -1.68066049913278, -1.72067622530261, -1.75133829690822, + -1.79206709451074, -1.76069195147244, -1.80070767764226, + -1.83279589211326, -1.87352468971577, -1.84072340381209, + -1.88073912998192, -1.91425348731829, -1.95498228492081, + -1.92075485615175, -1.96077058232158, -1.99571108252332, + -2.03643988012584, -2.0013531023109, -1.69722522200356, + -1.72456974230392, -1.76663241894548, -1.73862095912559, + -1.78001669624763, -1.80869509558704, -1.8507577722286, + -1.82141243336967, -1.86280817049171, -1.89282044887016, + -1.93488312551172, -1.90420390761374, -1.94559964473578, + -1.97694580215328, -2.01900847879483, -1.98699538185782, + -2.02839111897986, -2.06107115543639, -2.10313383207795, + -2.07037319677843, -1.74996091003101, -1.7753520777581, + -1.81865334794732, -1.7926428834464, -1.83532485686179, + -1.86195461813654, -1.90525588832577, -1.87800683027718, + -1.92068880369257, -1.94855715851499, -1.99185842870421, + -1.96337077710796, -2.00605275052335, -2.03515969889343, + -2.07846096908265, -2.04873472393874, -2.09141669735413, + -2.12176223927187, -2.1650635094611, -2.13470323005287, + -1.79873237375035, -1.82211266974259, -1.86655444217534, + -1.84260389506133, -1.88647541637231, -1.91099621460809, + -1.95543798704083, -1.9303469376833, -1.97421845899428, + -1.99987975947358, -2.04432153190632, -2.01808998030527, + -2.06196150161625, -2.08876330433907, -2.13320507677182, + -2.10583302292723, -2.14970454423822, -2.17764684920456, + -2.22208862163731, -2.19419747391814, -1.84342913010968, + -1.86474559047676, -1.91022719024449, -1.88839081620991, + -1.93335250231015, -1.95570879001221, -2.00119038977994, + -1.97831418841039, -2.02327587451062, -2.04667198954767, + -2.09215358931539, -2.06823756061086, -2.11319924671109, + -2.13763518908312, -2.18311678885084, -2.15816093281133, + -2.20312261891157, -2.22859838861857, -2.2740799883863, + -2.24872115477651, -1.88394992657986, -1.90315426268295, + -1.94957265933375, -1.92989992478912, -1.97584992299839, + -1.99599105598456, -2.04240945263536, -2.02179992120765, + -2.06774991941692, -2.08882784928616, -2.13524624593697, + -2.11369991762618, -2.15964991583544, -2.18166464258777, + -2.22808303923857, -2.20559991404471, -2.25154991225397, + -2.27450143588938, -2.32091983254018, -2.29815075895416, + -1.92020297052401, -1.93725167836507, -1.9845017193008, + -1.96703718931728, -2.01387140811055, -2.03175176023654, + -2.07900180117227, -2.06070562690382, -2.10753984569708, -2.126251842108, + -2.17350188304374, -2.15437406449035, -2.20120828328362, + -2.22075192397947, -2.2680019649152, -2.24804250207689, + -2.29487672087016, -2.31525200585094, -2.36250204678667, + -2.3423743124994, -1.95210613713739, -1.96696059590972, + -2.01493524459044, -1.99971848194562, -2.04733082675385, + -2.06290989327117, -2.11088454195189, -2.09494317156208, + -2.14255551637031, -2.15885919063262, -2.20683383931334, + -2.19016786117854, -2.23778020598677, -2.25480848799407, + -2.30278313667479, -2.285392550795, -2.33300489560323, -2.35075778535552, + -2.39873243403624, -2.38129163483965, -1.97958715548649, + -1.99221371506326, -2.04080429347944, -2.02786976903494, + -2.07615238258339, -2.08939487189561, -2.13798545031179, + -2.12443499613184, -2.17271760968029, -2.18657602872797, + -2.23516660714415, -2.22100022322874, -2.2692828367772, + -2.28375718556032, -2.3323477639765, -2.31756545032565, -2.3658480638741, + -2.38093834239268, -2.42952892080885, -2.41481456572267, + -2.00258377222591, -2.01295382938855, -2.06205026425168, + -2.05142727886556, -2.10027078550522, -2.11114669911482, + -2.16024313397795, -2.14911429214487, -2.19795779878453, + -2.20933956884109, -2.25843600370423, -2.24680130542419, + -2.29564481206384, -2.30753243856736, -2.3566288734305, -2.3444883187035, + -2.39333182534315, -2.40572530829363, -2.45482174315677, + -2.4428671649279, -2.02104389262223, -2.02913395585591, + -2.07862502794996, -2.07033764610082, -2.11963139957941, + -2.12811610004401, -2.17760717213805, -2.168925153058, -2.21821890653659, + -2.2270982442321, -2.27658931632615, -2.26751266001519, + -2.31680641349378, -2.32608038842019, -2.37557146051424, + -2.36610016697237, -2.41539392045096, -2.42506253260829, + -2.47455360470233, -2.46538588429547, -2.03492569856537, + -2.04071744127482, -2.09049103740348, -2.08455803267672, + -2.13419036678807, -2.14026463353213, -2.19003822966079, + -2.18382270089942, -2.23345503501077, -2.23981182578944, + -2.28958542191809, -2.28308736912212, -2.33271970323347, + -2.33935901804675, -2.3891326141754, -2.38235203734482, + -2.43198437145617, -2.43890621030406, -2.48867980643271, + -2.48231971168322, -2.04419774329999, -2.04767804532517, + -2.09762141228432, -2.0940562248439, -2.1439147063878, -2.14756477924347, + -2.19750814620262, -2.1937731879317, -2.2436316694756, -2.24745151316177, + -2.29739488012092, -2.29349015101951, -2.34334863256341, + -2.34733824708007, -2.39728161403922, -2.39320711410731, + -2.44306559565121, -2.44722498099837, -2.49716834795752, + -2.49363028652563, -2.04883902266258, -2.05, -2.1, -2.09881070614216, + -2.14878238962173, -2.15, -2.2, -2.19875407310131, -2.24872575658088, + -2.25, -2.3, -2.29869744006046, -2.34866912354003, -2.35, -2.4, + -2.39864080701961, -2.44861249049918, -2.45, -2.5, -2.49929198673282, + -2.04883902266258, -2.04767804532517, -2.09762141228432, + -2.09881070614216, -2.14878238962173, -2.14756477924347, + -2.19750814620262, -2.19875407310131, -2.24872575658088, + -2.24745151316177, -2.29739488012092, -2.29869744006046, + -2.34866912354003, -2.34733824708007, -2.39728161403922, + -2.39864080701961, -2.44861249049918, -2.44722498099837, + -2.49716834795752, -2.49929198673282, -2.04419774329999, + -2.04071744127482, -2.09049103740348, -2.0940562248439, -2.1439147063878, + -2.14026463353213, -2.19003822966079, -2.1937731879317, -2.2436316694756, + -2.23981182578944, -2.28958542191809, -2.29349015101951, + -2.34334863256341, -2.33935901804675, -2.3891326141754, + -2.39320711410731, -2.44306559565121, -2.43890621030406, + -2.48867980643271, -2.49363028652563, -2.03492569856537, + -2.02913395585591, -2.07862502794996, -2.08455803267672, + -2.13419036678807, -2.12811610004401, -2.17760717213805, + -2.18382270089942, -2.23345503501077, -2.2270982442321, + -2.27658931632615, -2.28308736912212, -2.33271970323347, + -2.32608038842019, -2.37557146051424, -2.38235203734482, + -2.43198437145617, -2.42506253260829, -2.47455360470233, + -2.48231971168322, -2.02104389262223, -2.01295382938855, + -2.06205026425168, -2.07033764610082, -2.11963139957941, + -2.11114669911482, -2.16024313397795, -2.168925153058, -2.21821890653659, + -2.20933956884109, -2.25843600370423, -2.26751266001519, + -2.31680641349378, -2.30753243856736, -2.3566288734305, + -2.36610016697237, -2.41539392045096, -2.40572530829363, + -2.45482174315677, -2.46538588429547, -2.0025837722259, + -1.99221371506326, -2.04080429347944, -2.05142727886556, + -2.10027078550522, -2.08939487189561, -2.13798545031179, + -2.14911429214487, -2.19795779878453, -2.18657602872797, + -2.23516660714415, -2.24680130542419, -2.29564481206384, + -2.28375718556032, -2.3323477639765, -2.3444883187035, -2.39333182534315, + -2.38093834239268, -2.42952892080885, -2.4428671649279, + -1.97958715548649, -1.96696059590972, -2.01493524459044, + -2.02786976903494, -2.07615238258339, -2.06290989327117, + -2.11088454195189, -2.12443499613184, -2.17271760968029, + -2.15885919063262, -2.20683383931334, -2.22100022322874, + -2.2692828367772, -2.25480848799407, -2.30278313667479, + -2.31756545032565, -2.3658480638741, -2.35075778535552, + -2.39873243403624, -2.41481456572267, -1.95210613713739, + -1.93725167836507, -1.9845017193008, -1.99971848194562, + -2.04733082675385, -2.03175176023654, -2.07900180117227, + -2.09494317156208, -2.14255551637031, -2.126251842108, -2.17350188304374, + -2.19016786117854, -2.23778020598677, -2.22075192397947, + -2.2680019649152, -2.285392550795, -2.33300489560323, -2.31525200585094, + -2.36250204678667, -2.38129163483965, -1.92020297052401, + -1.90315426268295, -1.94957265933375, -1.96703718931728, + -2.01387140811055, -1.99599105598456, -2.04240945263536, + -2.06070562690382, -2.10753984569708, -2.08882784928616, + -2.13524624593697, -2.15437406449035, -2.20120828328362, + -2.18166464258777, -2.22808303923857, -2.24804250207689, + -2.29487672087016, -2.27450143588938, -2.32091983254018, + -2.3423743124994, -1.88394992657986, -1.86474559047676, + -1.91022719024449, -1.92989992478912, -1.97584992299839, + -1.95570879001221, -2.00119038977994, -2.02179992120765, + -2.06774991941691, -2.04667198954767, -2.09215358931539, + -2.11369991762618, -2.15964991583544, -2.13763518908312, + -2.18311678885084, -2.20559991404471, -2.25154991225397, + -2.22859838861857, -2.2740799883863, -2.29815075895416, + -1.84342913010968, -1.82211266974259, -1.86655444217534, + -1.88839081620991, -1.93335250231015, -1.91099621460808, + -1.95543798704083, -1.97831418841039, -2.02327587451062, + -1.99987975947358, -2.04432153190632, -2.06823756061086, + -2.11319924671109, -2.08876330433907, -2.13320507677182, + -2.15816093281133, -2.20312261891157, -2.17764684920456, + -2.22208862163731, -2.24872115477651, -1.79873237375035, + -1.7753520777581, -1.81865334794732, -1.84260389506133, + -1.88647541637231, -1.86195461813654, -1.90525588832576, + -1.9303469376833, -1.97421845899428, -1.94855715851499, + -1.99185842870421, -2.01808998030527, -2.06196150161625, + -2.03515969889343, -2.07846096908265, -2.10583302292723, + -2.14970454423822, -2.12176223927187, -2.1650635094611, + -2.19419747391814, -1.74996091003101, -1.72456974230392, + -1.76663241894548, -1.7926428834464, -1.83532485686179, + -1.80869509558704, -1.8507577722286, -1.87800683027718, + -1.92068880369257, -1.89282044887016, -1.93488312551172, + -1.96337077710796, -2.00605275052335, -1.97694580215328, + -2.01900847879483, -2.04873472393874, -2.09141669735413, + -2.06107115543639, -2.10313383207795, -2.13470323005287, + -1.69722522200355, -1.66988070170319, -1.71060949930571, + -1.73862095912559, -1.78001669624763, -1.75133829690822, + -1.79206709451074, -1.82141243336967, -1.86280817049171, + -1.83279589211326, -1.87352468971577, -1.90420390761374, + -1.94559964473578, -1.91425348731829, -1.95498228492081, + -1.98699538185782, -2.02839111897986, -1.99571108252332, + -2.03643988012584, -2.07037319677843, -1.64064477296295, + -1.61140884422271, -1.65071149895985, -1.68066049913278, + -1.72067622530261, -1.69001415369699, -1.72931680843413, + -1.76069195147244, -1.80070767764226, -1.76861946317127, + -1.80792211790841, -1.84072340381209, -1.88073912998192, + -1.84722477264555, -1.88652742738269, -1.92075485615175, + -1.96077058232158, -1.92583008211983, -1.96513273685697, + -2.0013531023109, -1.58034773582447, -1.54928662742623, + -1.58707410614394, -1.6188928025519, -1.65743786927932, + -1.62486158486165, -1.66264906357937, -1.69598293600675, + -1.73452800273418, -1.70043654229708, -1.73822402101479, + -1.7730730694616, -1.81161813618903, -1.77601149973251, + -1.81379897845022, -1.85016320291645, -1.88870826964388, + -1.85158645716793, -1.88937393588564, -1.92779929936347, + -1.51647070277081, -1.48365477811539, -1.51984148002065, + -1.55345779308229, -1.59044488339378, -1.5560281819259, + -1.59221488383115, -1.62743197370526, -1.66441906401674, + -1.62840158573641, -1.66458828764166, -1.70140615432823, + -1.73839324463971, -1.70077498954692, -1.73696169145217, + -1.77538033495119, -1.81236742526268, -1.77314839335742, + -1.80933509526268, -1.84987841095721, -1.44915837582686, + -1.41466197353833, -1.44916592411244, -1.48450370206654, + -1.51984902830622, -1.48366987468654, -1.51817382526065, + -1.5551943545459, -1.59053968078558, -1.55267777583475, + -1.58718172640886, -1.62588500702526, -1.66123033326494, + -1.62168567698296, -1.65618962755707, -1.69657565950462, + -1.7319209857443, -1.69069357813117, -1.72519752870528, + -1.76776695296637, -1.37856323906308, -1.34246450458783, + -1.3752075412851, -1.41218673269877, -1.44581022633445, + -1.40795057798236, -1.44069361467963, -1.47943371997014, + -1.51305721360582, -1.47343665137689, -1.50617968807416, + -1.54668070724151, -1.58030420087719, -1.53892272477142, + -1.57166576146868, -1.61392769451288, -1.64755118814856, + -1.60440879816595, -1.63715183486321, -1.68165093425313, + -1.30484521317004, -1.26722592175224, -1.29813387106327, + -1.33667070617418, -1.36849619917833, -1.3290418203743, + -1.35994976968533, -1.40032169218248, -1.43214718518663, + -1.39085771899636, -1.42176566830739, -1.46397267819077, + -1.49579817119492, -1.45267361761842, -1.48358156692945, + -1.52762366419907, -1.55944915720322, -1.51448951624048, + -1.54539746555151, -1.59172543529772, -1.2281712931866, + -1.18911666462096, -1.21811951009952, -1.25812669058139, + -1.28808208797619, -1.24712235557808, -1.27612520105664, + -1.31803748537098, -1.34799288276578, -1.3051280465352, + -1.33413089201376, -1.37794828016057, -1.40790367755537, + -1.36313373749232, -1.39213658297088, -1.43785907495016, + -1.46781447234496, -1.42113942844944, -1.450142273928, -1.49819416627837, + -1.14871517020247, -1.10831367578397, -1.13534571665675, + -1.17673261337814, -1.20475005655381, -1.16237775752953, + -1.18940979840231, -1.23276749972948, -1.26078494290514, + -1.21644183927509, -1.24347388014787, -1.28880238608081, + -1.31681982925648, -1.27050592102065, -1.29753796189343, + -1.34483727243215, -1.37285471560782, -1.32457000276621, + -1.35160204363899, -1.40126900560224, -1.06665683789199, -1.025, -1.05, + -1.09267285832838, -1.11868887876477, -1.075, -1.1, -1.14470489920116, + -1.17072091963755, -1.125, -1.15, -1.19673694007394, -1.22275296051033, + -1.175, -1.2, -1.24876898094672, -1.27478500138311, -1.225, -1.25, + -1.30116951993268, -0.982182184770595, -0.939364369541191, + -0.962275695627561, -1.00613784781378, -1.03009351085697, + -0.985187021713932, -1.0080983478003, -1.05404917390015, + -1.07800483694334, -1.03100967388667, -1.05392099997304, + -1.10196049998652, -1.12591616302971, -1.07683232605941, + -1.09974365214578, -1.14987182607289, -1.17382748911608, + -1.12265497823215, -1.14556630431852, -1.19812246680014, + -0.895482573097529, -0.851600776653867, -0.872371527303961, + -0.917323611465761, -0.939164649833994, -0.893142277954056, + -0.91391302860415, -0.961005688202226, -0.982846726570458, + -0.934683779254244, -0.955454529904338, -1.00468776493869, + -1.02652880330692, -0.976225280554433, -0.996996031204527, + -1.04836984167516, -1.07021088004339, -1.01776678185462, + -1.03853753250472, -1.0923612809234, -0.806754405378769, + -0.761908034103671, -0.780491156886687, -0.826431342095324, + -0.84610827881188, -0.799074279669704, -0.81765740245272, + -0.865785215528435, -0.88546215224499, -0.836240525235736, + -0.854823648018753, -0.905139088961546, -0.924816025678101, + -0.873406770801769, -0.891989893584785, -0.944492962394656, + -0.964169899111212, -0.910573016367802, -0.929156139150818, + -0.984125545404853, -0.716198679452192, -0.670489324800714, + -0.686842722966585, -0.733666939926636, -0.75113520040108, + -0.703196121132456, -0.719549519298327, -0.768603460875523, + -0.786071721349967, -0.735902917464198, -0.752256315630069, + -0.803539981824411, -0.821008242298854, -0.76860971379594, + -0.784963111961811, -0.838476502773298, -0.855944763247741, + -0.801316510127682, -0.817669908293553, -0.873660448997745, + -0.624020533162822, -0.57755174152493, -0.591638369367002, + -0.639240546166793, -0.654460559170765, -0.605724997209074, + -0.619811625051145, -0.669680572174736, -0.684900585178707, + -0.633898252893217, -0.647984880735288, -0.700120598182678, + -0.71534061118665, -0.66207150857736, -0.676158136419431, + -0.730560624190621, -0.745780637194592, -0.690244764261503, + -0.704331392103574, -0.761216230674767, -0.530428779659628, + -0.483305817794326, -0.495093764569797, -0.5433660669684, + -0.556303354277171, -0.506881711345268, -0.51866965812074, + -0.569240641585942, -0.582177928894714, -0.530457604896211, + -0.542245551671682, -0.595115216203485, -0.608052503512257, + -0.554033498447154, -0.565821445222625, -0.620989790821028, + -0.633927078129799, -0.577609391998096, -0.589397338773567, + -0.647047612756302, -0.435635434366583, -0.387965050938841, + -0.397427613156861, -0.446260688863329, -0.456885943360075, + -0.406890175374882, -0.416352737592903, -0.467511197856821, + -0.478136452353567, -0.425815299810923, -0.435277862028944, + -0.488761706850313, -0.499386961347059, -0.444740424246965, + -0.454202986464985, -0.510012215843805, -0.520637470340551, + -0.463665548683006, -0.473128110901026, -0.531413223882442, + -0.339855234699538, -0.291745418460234, -0.298861160373899, + -0.34814438676538, -0.356433538831223, -0.305976902287563, + -0.313092644201227, -0.364722690897065, -0.373011842962907, + -0.320208386114892, -0.327324128028556, -0.38130099502875, + -0.389590147094592, -0.33443986994222, -0.341555611855885, + -0.397879299160435, -0.406168451226277, -0.348671353769549, + -0.355787095683213, -0.414575013135936, -0.243305153616904, + -0.194864888773574, -0.199617690938783, -0.249239425656341, + -0.255173697695778, -0.204370493103992, -0.209123295269201, + -0.261107969735214, -0.267042241774651, -0.213876097434411, + -0.21862889959962, -0.272976513814088, -0.278910785853525, + -0.223381701764829, -0.228134503930038, -0.284845057892961, + -0.290779329932398, -0.232887306095247, -0.237640108260456, + -0.296797656643263, -0.146203908106123, -0.0975429274386718, + -0.099922023229859, -0.149769857084321, -0.153335806062519, + -0.102301119021046, -0.104680214812233, -0.156901755040717, + -0.160467704018916, -0.107059310603421, -0.109438406394608, + -0.164033652997114, -0.167599601975312, -0.111817502185795, + -0.114196597976982, -0.17116555095351, -0.174731499931708, + -0.11657569376817, -0.118954789559357, -0.178347957998081, + -0.0487714637193359, -0.0499610116149295, -0.0511505595105231, + -0.0523401074061168, -0.0535296553017104, -0.0547192031973041, + -0.0559087510928977, -0.0570982989884914, -0.058287846884085, + -0.0594942438652696, 2.59705508187582, 2.54711171491667, + 2.54855585745833, 2.59926366620214, 2.6, 2.55, 2.58822699869002, + 2.53845340256137, 2.54278255873902, 2.59337549798666, 2.57353574889042, + 2.52404467679638, 2.53124903967887, 2.58161250015055, 2.55301461288304, + 2.5039181780199, 2.51398142740814, 2.56400131966728, 2.52671007764121, + 2.47811949922503, 2.49101883862247, 2.54058185152501, 2.49468173139769, + 2.44670708271697, 2.462413290971, 2.51140714835158, 2.45700212865814, + 2.4097520877224, 2.42822958521969, 2.47654330023324, 2.41375662584179, + 2.36733822919099, 2.38854515845669, 2.43606928499938, 2.36504318792175, + 2.31956158815402, 2.3434499086725, 2.39007678931233, 2.3109721665028, + 2.26653039407005, 2.29304599111204, 2.33867000096757, 2.25166604983954, + 2.20836477965032, 2.23744758686019, 2.28196537287486, 2.18725918536107, + 2.14519650871951, 2.17678064418492, 2.22009135925499, 2.11789747533087, + 2.07716867772836, 2.11118259322393, 2.15318812464956, 2.04373804633125, + 2.00443539159411, 2.04080203466123, 2.08140722640334, 1.96494889332107, + 1.92716141460336, 1.96579840309873, 2.00491127133801, 1.88170849907318, + 1.84552179716793, 1.88634160588564, 1.9238735473955, 1.79420542985349, + 1.75970147927939, 1.80261163822366, 1.83847763108502, 1.70263790825774, + 1.66989487156048, 1.71479817541993, 1.74891697162326, 1.60721336417357, + 1.57630541486254, 1.62310014321151, 1.65539445270963, 1.50814796488511, + 1.47914511940655, 1.52772526713455, 1.5581219329295, 1.40566612538455, + 1.37863408451177, 1.42888960195916, 1.45731976582632, 1.3, 1.275, + 1.32681704225589, 1.35321630072999, 1.19138895649127, 1.1684776304049, + 1.22173881520245, 1.24604736547215, 1.0800790338049, 1.05930828315481, + 1.11389295677985, 1.13605573216033, 0.96632238471685, 0.947739261933835, + 1.00352377254432, 1.02349056722105, 0.850376704625296, 0.834023306459425, + 0.89088128419663, 0.908606866957655, 0.732504647787716, + 0.718418019945646, 0.776220663202535, 0.791664879901758, + 0.612973232324509, 0.601185285549039, 0.659801652747342, + 0.672929517266553, 0.492053235337067, 0.482590673119046, + 0.541887979334042, 0.552669752837739, 0.370018579510541, + 0.362902837596877, 0.422746755357962, 0.431158013661372, + 0.247145712590876, 0.242392910425667, 0.302647874011272, + 0.308669562908994, 0.12371298114173, 0.121333885350543, + 0.181863397888105, 0.185481876318005, -4.77612251667468e-16, + -4.68427400673863e-16, 0.0606669426752713, 0.0618740136198794, + 2.54855585745833, 2.54711171491667, 2.59705508187582, 2.59926366620214, + 2.54278255873902, 2.53845340256137, 2.58822699869002, 2.59337549798666, + 2.53124903967887, 2.52404467679638, 2.57353574889042, 2.58161250015055, + 2.51398142740814, 2.5039181780199, 2.55301461288304, 2.56400131966729, + 2.49101883862247, 2.47811949922503, 2.52671007764121, 2.54058185152501, + 2.462413290971, 2.44670708271697, 2.49468173139769, 2.51140714835158, + 2.42822958521969, 2.4097520877224, 2.45700212865814, 2.47654330023324, + 2.38854515845669, 2.36733822919099, 2.41375662584179, 2.43606928499938, + 2.3434499086725, 2.31956158815402, 2.36504318792175, 2.39007678931233, + 2.29304599111204, 2.26653039407005, 2.3109721665028, 2.33867000096757, + 2.23744758686019, 2.20836477965032, 2.25166604983954, 2.28196537287486, + 2.17678064418492, 2.14519650871951, 2.18725918536107, 2.22009135925498, + 2.11118259322393, 2.07716867772836, 2.11789747533087, 2.15318812464956, + 2.04080203466123, 2.00443539159411, 2.04373804633125, 2.08140722640334, + 1.96579840309873, 1.92716141460336, 1.96494889332107, 2.00491127133801, + 1.88634160588564, 1.84552179716793, 1.88170849907318, 1.9238735473955, + 1.80261163822366, 1.75970147927939, 1.79420542985349, 1.83847763108502, + 1.71479817541993, 1.66989487156048, 1.70263790825774, 1.74891697162326, + 1.62310014321151, 1.57630541486254, 1.60721336417357, 1.65539445270963, + 1.52772526713455, 1.47914511940656, 1.50814796488512, 1.5581219329295, + 1.42888960195916, 1.37863408451177, 1.40566612538455, 1.45731976582632, + 1.32681704225589, 1.275, 1.3, 1.35321630072999, 1.22173881520245, + 1.1684776304049, 1.19138895649127, 1.24604736547215, 1.11389295677985, + 1.05930828315481, 1.0800790338049, 1.13605573216034, 1.00352377254432, + 0.947739261933835, 0.966322384716852, 1.02349056722105, 0.89088128419663, + 0.834023306459425, 0.850376704625296, 0.908606866957656, + 0.776220663202535, 0.718418019945646, 0.732504647787717, + 0.791664879901759, 0.659801652747343, 0.60118528554904, + 0.612973232324511, 0.672929517266554, 0.541887979334043, + 0.482590673119046, 0.492053235337067, 0.552669752837739, + 0.422746755357962, 0.362902837596877, 0.370018579510541, + 0.431158013661373, 0.302647874011271, 0.242392910425666, + 0.247145712590875, 0.308669562908993, 0.181863397888104, + 0.121333885350543, 0.12371298114173, 0.185481876318004, + 0.0606669426752715, 1.56142466891288e-16, 1.59204083889156e-16, + 0.0618740136198798, -0.060666942675271, -0.121333885350542, + -0.123712981141729, -0.0618740136198791, -0.181863397888104, + -0.242392910425666, -0.247145712590875, -0.185481876318004, + -0.302647874011272, -0.362902837596877, -0.370018579510542, + -0.308669562908994, -0.422746755357962, -0.482590673119046, + -0.492053235337066, -0.431158013661373, -0.541887979334043, + -0.60118528554904, -0.612973232324511, -0.552669752837739, + -0.659801652747343, -0.718418019945646, -0.732504647787718, + -0.672929517266554, -0.776220663202536, -0.834023306459425, + -0.850376704625296, -0.791664879901759, -0.89088128419663, + -0.947739261933835, -0.966322384716851, -0.908606866957656, + -1.00352377254432, -1.05930828315481, -1.0800790338049, + -1.02349056722105, -1.11389295677985, -1.1684776304049, + -1.19138895649127, -1.13605573216033, -1.22173881520245, -1.275, -1.3, + -1.24604736547215, -1.32681704225589, -1.37863408451177, + -1.40566612538455, -1.35321630072999, -1.42888960195916, + -1.47914511940656, -1.50814796488512, -1.45731976582632, + -1.52772526713455, -1.57630541486254, -1.60721336417357, + -1.5581219329295, -1.62310014321151, -1.66989487156048, + -1.70263790825774, -1.65539445270963, -1.71479817541993, + -1.75970147927939, -1.79420542985349, -1.74891697162326, + -1.80261163822366, -1.84552179716793, -1.88170849907318, + -1.83847763108502, -1.88634160588564, -1.92716141460336, + -1.96494889332107, -1.9238735473955, -1.96579840309873, + -2.00443539159411, -2.04373804633125, -2.00491127133801, + -2.04080203466123, -2.07716867772836, -2.11789747533087, + -2.08140722640334, -2.11118259322393, -2.14519650871951, + -2.18725918536107, -2.15318812464956, -2.17678064418492, + -2.20836477965032, -2.25166604983954, -2.22009135925498, + -2.23744758686019, -2.26653039407005, -2.3109721665028, + -2.28196537287486, -2.29304599111204, -2.31956158815402, + -2.36504318792175, -2.33867000096757, -2.3434499086725, + -2.36733822919099, -2.41375662584179, -2.39007678931233, + -2.3885451584567, -2.4097520877224, -2.45700212865814, -2.43606928499938, + -2.42822958521969, -2.44670708271697, -2.49468173139769, + -2.47654330023324, -2.462413290971, -2.47811949922503, -2.52671007764121, + -2.51140714835158, -2.49101883862247, -2.5039181780199, + -2.55301461288304, -2.54058185152501, -2.51398142740814, + -2.52404467679638, -2.57353574889042, -2.56400131966729, + -2.53124903967887, -2.53845340256137, -2.58822699869002, + -2.58161250015055, -2.54278255873902, -2.54711171491667, + -2.59705508187582, -2.59337549798666, -2.54855585745833, -2.55, -2.6, + -2.59926366620214, -2.54855585745833, -2.54711171491667, + -2.59705508187582, -2.59926366620214, -2.54278255873902, + -2.53845340256137, -2.58822699869002, -2.59337549798666, + -2.53124903967887, -2.52404467679638, -2.57353574889043, + -2.58161250015055, -2.51398142740814, -2.5039181780199, + -2.55301461288304, -2.56400131966729, -2.49101883862247, + -2.47811949922503, -2.52671007764121, -2.54058185152502, -2.462413290971, + -2.44670708271697, -2.49468173139769, -2.51140714835158, + -2.42822958521969, -2.4097520877224, -2.45700212865814, + -2.47654330023324, -2.38854515845669, -2.36733822919099, + -2.41375662584179, -2.43606928499938, -2.3434499086725, + -2.31956158815402, -2.36504318792175, -2.39007678931233, + -2.29304599111204, -2.26653039407005, -2.3109721665028, + -2.33867000096757, -2.23744758686019, -2.20836477965032, + -2.25166604983954, -2.28196537287486, -2.17678064418491, + -2.14519650871951, -2.18725918536107, -2.22009135925498, + -2.11118259322393, -2.07716867772836, -2.11789747533087, + -2.15318812464956, -2.04080203466123, -2.00443539159411, + -2.04373804633125, -2.08140722640334, -1.96579840309873, + -1.92716141460336, -1.96494889332107, -2.00491127133801, + -1.88634160588564, -1.84552179716793, -1.88170849907318, + -1.9238735473955, -1.80261163822366, -1.75970147927939, + -1.79420542985349, -1.83847763108502, -1.71479817541993, + -1.66989487156048, -1.70263790825774, -1.74891697162326, + -1.62310014321151, -1.57630541486254, -1.60721336417357, + -1.65539445270963, -1.52772526713455, -1.47914511940656, + -1.50814796488512, -1.5581219329295, -1.42888960195916, + -1.37863408451177, -1.40566612538455, -1.45731976582632, + -1.32681704225589, -1.275, -1.3, -1.35321630072999, -1.22173881520245, + -1.1684776304049, -1.19138895649127, -1.24604736547215, + -1.11389295677985, -1.05930828315481, -1.0800790338049, + -1.13605573216034, -1.00352377254432, -0.947739261933835, + -0.966322384716853, -1.02349056722105, -0.89088128419663, + -0.834023306459425, -0.850376704625297, -0.908606866957657, + -0.776220663202535, -0.718418019945646, -0.732504647787717, + -0.791664879901759, -0.659801652747343, -0.60118528554904, + -0.612973232324512, -0.672929517266555, -0.541887979334043, + -0.482590673119047, -0.492053235337068, -0.552669752837741, + -0.422746755357962, -0.362902837596877, -0.370018579510542, + -0.431158013661373, -0.302647874011271, -0.242392910425665, + -0.247145712590874, -0.308669562908993, -0.181863397888104, + -0.121333885350543, -0.123712981141729, -0.185481876318003, + -0.0606669426752717, -0.0618740136198792, 5, 4.94993864753908, + 4.94996932376954, 5, 5, 4.95, 4.9, 4.89993864753908, 4.89987729507816, + 4.84981594261724, 4.84990797130862, 4.85, 4.8, 4.79987729507816, + 4.79975459015632, 4.7496932376954, 4.7498466188477, 4.75, 4.7, + 4.69981594261724, 4.69963188523448, 4.64957053277356, 4.64978526638678, + 4.65, 4.6, 4.59975459015632, 4.59950918031264, 4.54944782785172, + 4.54972391392586, 4.55, 4.5, 4.4996932376954, 4.4993864753908, + 4.44932512292988, 4.44966256146494, 4.45, 4.4, 4.39963188523448, + 4.39926377046895, 4.34920241800804, 4.34960120900402, 4.35, 4.3, + 4.29957053277356, 4.29914106554711, 4.24907971308619, 4.2495398565431, + 4.25, 4.2, 4.19950918031264, 4.19901836062527, 4.14895700816435, + 4.14947850408218, 4.15, 4.1, 4.09944782785172, 4.09889565570343, + 4.04883430324251, 4.04941715162126, 4.05, 4, 3.9993864753908, + 3.99877295078159, 3.94871159832067, 3.94935579916034, 3.95, 3.9, + 3.89932512292988, 3.89865024585975, 3.84858889339883, 3.84929444669942, + 3.85, 3.8, 3.79926377046896, 3.79852754093791, 3.74846618847699, + 3.7492330942385, 3.75, 3.7, 3.69920241800803, 3.69840483601607, + 3.64834348355515, 3.64917174177757, 3.65, 3.6, 3.59914106554711, + 3.59828213109423, 3.54822077863331, 3.54911038931665, 3.55, 3.5, + 3.49907971308619, 3.49815942617239, 3.44809807371147, 3.44904903685573, + 3.45, 3.4, 3.39901836062527, 3.39803672125055, 3.34797536878963, + 3.34898768439481, 3.35, 3.3, 3.29895700816435, 3.29791401632871, + 3.24785266386779, 3.24892633193389, 3.25, 3.2, 3.19889565570343, + 3.19779131140687, 3.14772995894594, 3.14886497947297, 3.15, 3.1, + 3.09883430324251, 3.09766860648502, 3.0476072540241, 3.04880362701205, + 3.05, 3, 2.99877295078159, 2.99754590156318, 2.94748454910226, + 2.94874227455113, 2.95, 2.9, 2.89871159832067, 2.89742319664134, + 2.84736184418042, 2.84868092209021, 2.85, 2.8, 2.79865024585975, + 2.7973004917195, 2.74723913925858, 2.74861956962929, 2.75, 2.7, + 2.69858889339883, 2.69717778679766, 2.64711643433674, 2.64855821716837, + 2.65, 5, 4.94975472913938, 4.94984668833923, 5, 4.89969337667845, + 4.89950945827875, 4.84926418741813, 4.84954006501768, 4.79938675335691, + 4.7990189165575, 4.74877364569688, 4.74923344169614, 4.69908013003537, + 4.69852837483625, 4.64828310397563, 4.64892681837459, 4.59877350671382, + 4.598037833115, 4.54779256225438, 4.54862019505305, 4.49846688339228, + 4.49754729139375, 4.44730202053313, 4.4483135717315, 4.39816026007073, + 4.3970567496725, 4.34681147881188, 4.34800694840996, 4.29785363674919, + 4.29656620795126, 4.24632093709063, 4.24770032508841, 4.19754701342764, + 4.19607566623001, 4.14583039536938, 4.14739370176687, 4.0972403901061, + 4.09558512450876, 4.04533985364813, 4.04708707844532, 3.99693376678455, + 3.99509458278751, 3.94484931192688, 3.94678045512378, 3.89662714346301, + 3.89460404106626, 3.84435877020563, 3.84647383180223, 3.79632052014146, + 3.79411349934501, 3.74386822848439, 3.74616720848069, 3.69601389681992, + 3.69362295762376, 3.64337768676314, 3.64586058515914, 3.59570727349837, + 3.59313241590251, 3.54288714504189, 3.5455539618376, 3.49540065017683, + 3.49264187418126, 3.44239660332064, 3.44524733851605, 3.39509402685528, + 3.39215133246001, 3.34190606159939, 3.34494071519451, 3.29478740353374, + 3.29166079073876, 3.24141551987814, 3.24463409187296, 3.19448078021219, + 3.19117024901752, 3.14092497815689, 3.14432746855142, 3.09417415689065, + 3.09067970729627, 3.04043443643564, 3.04402084522987, 2.9938675335691, + 2.99018916557502, 2.93994389471439, 2.94371422190833, 2.89356091024756, + 2.88969862385377, 2.83945335299314, 2.84340759858678, 2.79325428692601, + 2.78920808213252, 2.73896281127189, 2.74310097526524, 2.69294766360447, + 2.68871754041127, 2.63847226955065, 2.64279435194369, 5, + 4.94944866143522, 4.9496016952873, 5, 4.89920339057459, 4.89889732287043, + 4.84834598430565, 4.84880508586189, 4.79840678114918, 4.79779464574087, + 4.74724330717609, 4.74800847643648, 4.69761017172378, 4.6966919686113, + 4.64614063004652, 4.64721186701107, 4.59681356229837, 4.59558929148174, + 4.54503795291695, 4.54641525758567, 4.49601695287296, 4.49448661435217, + 4.44393527578739, 4.44561864816026, 4.39522034344755, 4.39338393722261, + 4.34283259865782, 4.34482203873485, 4.29442373402215, 4.29228126009304, + 4.24172992152826, 4.24402542930944, 4.19362712459674, 4.19117858296347, + 4.14062724439869, 4.14322881988404, 4.09283051517133, 4.09007590583391, + 4.03952456726913, 4.04243221045863, 3.99203390574593, 3.98897322870434, + 3.93842189013956, 3.94163560103322, 3.89123729632052, 3.88787055157478, + 3.83731921301, 3.84083899160782, 3.79044068689511, 3.78676787444521, + 3.73621653588043, 3.74004238218241, 3.6896440774697, 3.68566519731565, + 3.63511385875086, 3.639245772757, 3.5888474680443, 3.58456252018608, + 3.5340111816213, 3.53844916333159, 3.48805085861889, 3.48345984305652, + 3.43290850449173, 3.43765255390619, 3.38725424919348, 3.38235716592695, + 3.33180582736217, 3.33685594448078, 3.28645763976807, 3.28125448879738, + 3.2307031502326, 3.23605933505537, 3.18566103034267, 3.18015181166782, + 3.12960047310304, 3.13526272562996, 3.08486442091726, 3.07904913453825, + 3.02849779597347, 3.03446611620456, 2.98406781149185, 2.97794645740869, + 2.9273951188439, 2.93366950677915, 2.88327120206645, 2.87684378027912, + 2.82629244171434, 2.83287289735374, 2.78247459264104, 2.77574110314956, + 2.72518976458477, 2.73207628792833, 2.68167798321563, 2.67463842601999, + 2.62408708745521, 2.63127967850293, 5, 4.9490211377684, 4.94923489960181, + 5, 4.89846979920361, 4.89804227553679, 4.84706341330519, + 4.84770469880542, 4.79693959840723, 4.79608455107359, 4.74510568884198, + 4.74617449800903, 4.69540939761084, 4.69412682661038, 4.64314796437878, + 4.64464429721265, 4.59387919681446, 4.59216910214717, 4.54119023991557, + 4.54311409641626, 4.49234899601807, 4.49021137768397, 4.43923251545236, + 4.44158389561988, 4.39081879522168, 4.38825365322076, 4.33727479098916, + 4.34005369482349, 4.2892885944253, 4.28629592875755, 4.23531706652595, + 4.2385234940271, 4.18775839362891, 4.18433820429435, 4.13335934206274, + 4.13699329323072, 4.08622819283252, 4.08238047983114, 4.03140161759954, + 4.03546309243433, 3.98469799203614, 3.98042275536793, 3.92944389313633, + 3.93393289163794, 3.88316779123975, 3.87846503090473, 3.82748616867312, + 3.83240269084156, 3.78163759044337, 3.77650730644152, 3.72552844420992, + 3.73087249004517, 3.68010738964698, 3.67454958197831, 3.62357071974671, + 3.62934228924879, 3.57857718885059, 3.57259185751511, 3.5216129952835, + 3.5278120884524, 3.47704698805421, 3.4706341330519, 3.41965527082029, + 3.42628188765601, 3.37551678725782, 3.36867640858869, 3.31769754635709, + 3.32475168685963, 3.27398658646143, 3.26671868412548, 3.21573982189388, + 3.22322148606324, 3.17245638566505, 3.16476095966228, 3.11378209743067, + 3.12169128526686, 3.07092618486866, 3.06280323519907, 3.01182437296747, + 3.02016108447047, 2.96939598407228, 2.96084551073586, 2.90986664850426, + 2.91863088367408, 2.86786578327589, 2.85888778627266, 2.80790892404105, + 2.8171006828777, 2.7663355824795, 2.75693006180945, 2.70595119957785, + 2.71557048208131, 2.66480538168312, 2.65497233734624, 2.60399347511464, + 2.61404028128492, 5, 4.94847312661753, 4.94874713219296, 5, + 4.89749426438592, 4.89694625323505, 4.84541937985258, 4.84624139657888, + 4.79498852877184, 4.7938925064701, 4.74236563308763, 4.7437356609648, + 4.69248279315777, 4.69083875970515, 4.63931188632268, 4.64122992535073, + 4.58997705754369, 4.5877850129402, 4.53625813955773, 4.53872418973665, + 4.48747132192961, 4.48473126617525, 4.43320439279278, 4.43621845412257, + 4.38496558631553, 4.3816775194103, 4.33015064602783, 4.33371271850849, + 4.28245985070145, 4.27862377264535, 4.22709689926288, 4.23120698289441, + 4.17995411508737, 4.1755700258804, 4.12404315249793, 4.12870124728033, + 4.0774483794733, 4.07251627911545, 4.02098940573298, 4.02619551166626, + 3.97494264385922, 3.9694625323505, 3.91793565896803, 3.92368977605218, + 3.87243690824514, 3.86640878558555, 3.81488191220308, 3.8211840404381, + 3.76993117263106, 3.7633550388206, 3.71182816543813, 3.71867830482402, + 3.66742543701698, 3.66030129205565, 3.60877441867318, 3.61617256920994, + 3.5649197014029, 3.5572475452907, 3.50572067190823, 3.51366683359587, + 3.46241396578883, 3.45419379852575, 3.40266692514328, 3.41116109798179, + 3.35990823017475, 3.35114005176081, 3.29961317837833, 3.30865536236771, + 3.25740249456067, 3.24808630499586, 3.19655943161338, 3.20614962675363, + 3.15489675894659, 3.14503255823091, 3.09350568484843, 3.10364389113955, + 3.05239102333251, 3.04197881146596, 2.99045193808348, 3.00113815552547, + 2.94988528771844, 2.93892506470101, 2.88739819131853, 2.8986324199114, + 2.84737955210436, 2.83587131793606, 2.78434444455358, 2.79612668429732, + 2.74487381649028, 2.73281757117111, 2.68129069778863, 2.69362094868324, + 2.6423680808762, 2.62976382440616, 2.57823695102368, 2.59111521306916, 5, + 4.94780586940412, 4.94813949801082, 5, 4.89627899602164, + 4.89561173880824, 4.84341760821236, 4.84441849403247, 4.79255799204329, + 4.79122347761647, 4.73902934702059, 4.74069749005411, 4.68883698806493, + 4.68683521642471, 4.63464108582883, 4.63697648607575, 4.58511598408658, + 4.58244695523295, 4.53025282463707, 4.5332554820974, 4.48139498010822, + 4.47805869404119, 4.42586456344531, 4.42953447811904, 4.37767397612986, + 4.37367043284942, 4.32147630225354, 4.32581347414069, 4.27395297215151, + 4.26928217165766, 4.21708804106178, 4.22209247016233, 4.17023196817315, + 4.1648939104659, 4.11269977987002, 4.11837146618397, 4.06651096419479, + 4.06050564927413, 4.00831151867825, 4.01465046220562, 3.96278996021644, + 3.95611738808237, 3.90392325748649, 3.91092945822726, 3.85906895623808, + 3.85172912689061, 3.79953499629473, 3.8072084542489, 3.75534795225973, + 3.74734086569885, 3.69514673510296, 3.70348745027055, 3.65162694828137, + 3.64295260450708, 3.5907584739112, 3.59976644629219, 3.54790594430301, + 3.53856434331532, 3.48637021271944, 3.49604544231383, 3.44418494032466, + 3.43417608212356, 3.38198195152768, 3.39232443833548, 3.3404639363463, + 3.3297878209318, 3.27759369033591, 3.28860343435712, 3.23674293236794, + 3.22539955974003, 3.17320542914415, 3.18488243037877, 3.13302192838959, + 3.12101129854827, 3.06881716795239, 3.08116142640041, 3.02930092441123, + 3.01662303735651, 2.96442890676063, 2.97744042242205, 2.92557992043288, + 2.91223477616474, 2.86004064556886, 2.8737194184437, 2.82185891645452, + 2.80784651497298, 2.7556523843771, 2.76999841446534, 2.71813791247616, + 2.70345825378122, 2.65126412318534, 2.66627741048698, 2.61441690849781, + 2.59906999258946, 2.54687586199357, 2.56255640650863, 5, + 4.94702087768038, 4.94741337354225, 5, 4.8948267470845, 4.89404175536076, + 4.84106263304113, 4.84224012062675, 4.78965349416899, 4.78808351072151, + 4.73510438840189, 4.73706686771124, 4.68448024125349, 4.68212526608227, + 4.62914614376264, 4.63189361479574, 4.57930698833799, 4.57616702144302, + 4.5231878991234, 4.52672036188023, 4.47413373542248, 4.47020877680378, + 4.41722965448416, 4.42154710896473, 4.36896048250698, 4.36425053216453, + 4.31127140984491, 4.31637385604923, 4.26378722959148, 4.25829228752529, + 4.20531316520567, 4.21120060313372, 4.15861397667597, 4.15233404288605, + 4.09935492056642, 4.10602735021822, 4.05344072376047, 4.0463757982468, + 3.99339667592718, 4.00085409730272, 3.94826747084497, 3.94041755360756, + 3.88743843128794, 3.89568084438721, 3.84309421792946, 3.83445930896831, + 3.78148018664869, 3.79050759147171, 3.73792096501396, 3.72850106432907, + 3.67552194200945, 3.68533433855621, 3.63274771209845, 3.62254281968982, + 3.5695636973702, 3.5801610856407, 3.52757445918295, 3.51658457505058, + 3.46360545273096, 3.4749878327252, 3.42240120626745, 3.41062633041134, + 3.35764720809171, 3.3698145798097, 3.31722795335194, 3.30466808577209, + 3.25168896345247, 3.26464132689419, 3.21205470043644, 3.19870984113285, + 3.14573071881323, 3.15946807397869, 3.10688144752094, 3.0927515964936, + 3.03977247417398, 3.05429482106318, 3.00170819460543, 2.98679335185436, + 2.93381422953474, 2.94912156814768, 2.89653494168993, 2.88083510721511, + 2.82785598489549, 2.84394831523218, 2.79136168877443, 2.77487686257587, + 2.72189774025625, 2.73877506231667, 2.68618843585892, 2.66891861793663, + 2.615939495617, 2.63360180940117, 2.58101518294342, 2.56296037329738, + 2.50998125097776, 2.52842855648567, 5, 4.94611992970504, + 4.94657040369271, 5, 4.89314080738542, 4.89223985941007, + 4.83835978911511, 4.83971121107812, 4.78628161477083, 4.78447971882015, + 4.73059964852519, 4.73285201846354, 4.67942242215625, 4.67671957823022, + 4.62283950793526, 4.62599282584895, 4.57256322954166, 4.5689594376403, + 4.51507936734534, 4.51913363323437, 4.46570403692708, 4.46119929705037, + 4.40731922675541, 4.41227444061978, 4.35884484431249, 4.35343915646045, + 4.29955908616548, 4.3054152480052, 4.25198565169791, 4.24567901587052, + 4.19179894557556, 4.19855605539061, 4.14512645908332, 4.1379188752806, + 4.08403880498563, 4.09169686277603, 4.03826726646874, 4.03015873469067, + 3.97627866439571, 3.98483767016144, 3.93140807385415, 3.92239859410075, + 3.86851852380578, 3.87797847754686, 3.82454888123957, 3.81463845351082, + 3.76075838321586, 3.77111928493227, 3.71768968862498, 3.70687831292089, + 3.65299824262593, 3.66426009231769, 3.6108304960104, 3.59911817233097, + 3.54523810203601, 3.5574008997031, 3.50397130339581, 3.49135803174104, + 3.43747796144608, 3.45054170708852, 3.39711211078123, 3.38359789115112, + 3.32971782085616, 3.34368251447393, 3.29025291816664, 3.27583775056119, + 3.22195768026623, 3.23682332185935, 3.18339372555206, 3.16807760997127, + 3.1141975396763, 3.12996412924476, 3.07653453293747, 3.06031746938134, + 3.00643739908638, 3.02310493663018, 2.96967534032289, 2.95255732879142, + 2.89867725849645, 2.91624574401559, 2.8628161477083, 2.84479718820149, + 2.79091711790653, 2.80938655140101, 2.75595695509372, 2.73703704761157, + 2.6831569773166, 2.70252735878643, 2.64909776247913, 2.62927690702164, + 2.57539683672668, 2.59566816617184, 2.54223856986455, 2.52151676643171, + 2.46763669613675, 2.48880897355726, 5, 4.94510506641504, + 4.94561249806004, 5, 4.89122499612007, 4.89021013283007, + 4.83531519924511, 4.83683749418011, 4.78244999224015, 4.78042026566015, + 4.72552533207518, 4.72806249030018, 4.67367498836022, 4.67063039849022, + 4.61573546490525, 4.61928748642026, 4.5648999844803, 4.56084053132029, + 4.50594559773533, 4.51051248254033, 4.45612498060037, 4.45105066415036, + 4.3961557305654, 4.40173747866041, 4.34734997672044, 4.34126079698044, + 4.28636586339547, 4.29296247478048, 4.23857497284052, 4.23147092981051, + 4.17657599622555, 4.18418747090055, 4.12979996896059, 4.12168106264058, + 4.06678612905562, 4.07541246702063, 4.02102496508066, 4.01189119547066, + 3.95699626188569, 3.9666374631407, 3.91224996120074, 3.90210132830073, + 3.84720639471576, 3.85786245926077, 3.80347495732081, 3.7923114611308, + 3.73741652754584, 3.74908745538085, 3.69469995344088, 3.68252159396087, + 3.62762666037591, 3.64031245150092, 3.58592494956096, 3.57273172679095, + 3.51783679320598, 3.53153744762099, 3.47714994568103, 3.46294185962102, + 3.40804692603606, 3.42276244374107, 3.36837494180111, 3.35315199245109, + 3.29825705886613, 3.31398743986114, 3.25959993792118, 3.24336212528117, + 3.1884671916962, 3.20521243598122, 3.15082493404125, 3.13357225811124, + 3.07867732452627, 3.09643743210129, 3.04204993016133, 3.02378239094131, + 2.96888745735635, 2.98766242822136, 2.9332749262814, 2.91399252377138, + 2.85909759018642, 2.87888742434144, 2.82449992240147, 2.80420265660146, + 2.74930772301649, 2.77011242046151, 2.71572491852155, 2.69441278943153, + 2.63951785584657, 2.66133741658158, 2.60694991464162, 2.5846229222616, + 2.52972798867664, 2.55256241270166, 2.4981749107617, 2.47483305509168, + 2.41993812150671, 2.44378740882173, 5, 4.94397858680214, + 4.94454182660859, 5, 4.88908365321718, 4.88795717360428, + 4.83193576040643, 4.83362547982577, 4.77816730643436, 4.77591434720857, + 4.71989293401071, 4.72270913304295, 4.66725095965153, 4.66387152081285, + 4.60785010761499, 4.61179278626012, 4.55633461286871, 4.55182869441713, + 4.49580728121927, 4.5008764394773, 4.44541826608589, 4.43978586802142, + 4.38376445482356, 4.38996009269448, 4.33450191930307, 4.3277430416257, + 4.27172162842784, 4.27904374591166, 4.22358557252025, 4.21570021522998, + 4.15967880203213, 4.16812739912884, 4.11266922573742, 4.10365738883427, + 4.04763597563641, 4.05721105234601, 4.0017528789546, 3.99161456243855, + 3.93559314924069, 3.94629470556319, 3.89083653217178, 3.87957173604283, + 3.82355032284498, 3.83537835878037, 3.77992018538896, 3.76752890964712, + 3.71150749644926, 3.72446201199755, 3.66900383860614, 3.6554860832514, + 3.59946467005354, 3.61354566521473, 3.55808749182331, 3.54344325685568, + 3.48742184365783, 3.5026293184319, 3.44717114504049, 3.43140043045997, + 3.37537901726211, 3.39171297164908, 3.33625479825767, 3.31935760406425, + 3.26333619086639, 3.28079662486626, 3.22533845147485, 3.20731477766853, + 3.15129336447068, 3.16988027808344, 3.11442210469203, 3.09527195127282, + 3.03925053807496, 3.05896393130062, 3.00350575790921, 2.9832291248771, + 2.92720771167924, 2.94804758451779, 2.89258941112638, 2.87118629848138, + 2.81516488528353, 2.83713123773497, 2.78167306434356, 2.75914347208567, + 2.70312205888781, 2.72621489095215, 2.67075671756074, 2.64710064568995, + 2.59107923249209, 2.61529854416933, 2.55984037077792, 2.53505781929423, + 2.47903640609638, 2.50438219738651, 2.4489240239951, 2.42301499289852, + 2.36699357970066, 2.39346585060369, 5, 4.94274304270499, + 4.94336081475357, 5, 4.88672162950713, 4.88548608540998, + 4.82822912811497, 4.8300824442607, 4.77344325901426, 4.77097217081996, + 4.71371521352495, 4.71680407376783, 4.6601648885214, 4.65645825622994, + 4.59920129893493, 4.60352570327496, 4.54688651802853, 4.54194434163992, + 4.48468738434491, 4.49024733278209, 4.43360814753566, 4.4274304270499, + 4.37017346975489, 4.37696896228923, 4.32032977704279, 4.31291651245989, + 4.25565955516488, 4.26369059179636, 4.20705140654993, 4.19840259786987, + 4.14114564057486, 4.15041222130349, 4.09377303605706, 4.08388868327985, + 4.02663172598484, 4.03713385081062, 3.98049466556419, 3.96937476868983, + 3.91211781139482, 3.92385548031775, 3.86721629507132, 3.85486085409981, + 3.7976038968048, 3.81057710982489, 3.75393792457845, 3.74034693950979, + 3.68308998221478, 3.69729873933202, 3.64065955408559, 3.62583302491977, + 3.56857606762476, 3.58402036883915, 3.52738118359272, 3.51131911032975, + 3.45406215303474, 3.47074199834628, 3.41410281309985, 3.39680519573973, + 3.33954823844472, 3.35746362785342, 3.30082444260698, 3.28229128114971, + 3.2250343238547, 3.24418525736055, 3.18754607211411, 3.16777736655969, + 3.11052040926468, 3.13090688686768, 3.07426770162125, 3.05326345196967, + 2.99600649467467, 3.01762851637481, 2.96098933112838, 2.93874953737966, + 2.88149258008465, 2.90435014588194, 2.84771096063551, 2.82423562278964, + 2.76697866549463, 2.79107177538908, 2.73443259014264, 2.70972170819962, + 2.65246475090461, 2.67779340489621, 2.62115421964977, 2.5952077936096, + 2.53795083631459, 2.56451503440334, 2.50787584915691, 2.48069387901958, + 2.42343692172457, 2.45123666391047, 2.39459747866404, 2.36617996442956, + 2.30892300713455, 2.3379582934176, 5, 4.94140123302836, 4.94207213786667, + 5, 4.88414427573335, 4.88280246605671, 4.82420369908507, + 4.82621641360002, 4.76828855146669, 4.76560493211342, 4.70700616514178, + 4.71036068933337, 4.65243282720004, 4.64840739817013, 4.58980863119849, + 4.59450496506671, 4.53657710293338, 4.53120986422685, 4.4726110972552, + 4.47864924080006, 4.42072137866673, 4.41401233028356, 4.35541356331191, + 4.3627935165334, 4.30486565440008, 4.29681479634027, 4.23821602936862, + 4.24693779226675, 4.18900993013342, 4.17961726239698, 4.12101849542533, + 4.1310820680001, 4.07315420586677, 4.06241972845369, 4.00382096148205, + 4.01522634373344, 3.95729848160012, 3.9452221945104, 3.88662342753876, + 3.89937061946679, 3.84144275733346, 3.82802466056711, 3.76942589359547, + 3.78351489520013, 3.72558703306681, 3.71082712662382, 3.65222835965218, + 3.66765917093348, 3.60973130880015, 3.59362959268054, 3.53503082570889, + 3.55180344666683, 3.4938755845335, 3.47643205873725, 3.4178332917656, + 3.43594772240017, 3.37801986026685, 3.35923452479396, 3.30063575782231, + 3.32009199813352, 3.26216413600019, 3.24203699085067, 3.18343822387903, + 3.20423627386686, 3.14630841173354, 3.12483945690738, 3.06624068993574, + 3.08838054960021, 3.03045268746688, 3.00764192296409, 2.94904315599245, + 2.97252482533356, 2.91459696320023, 2.8904443890208, 2.83184562204916, + 2.8566691010669, 2.79874123893358, 2.77324685507751, 2.71464808810587, + 2.74081337680025, 2.68288551466692, 2.65604932113423, 2.59745055416258, + 2.62495765253359, 2.56702979040027, 2.53885178719094, 2.48025302021929, + 2.50910192826694, 2.45117406613361, 2.42165425324765, 2.363055486276, + 2.39324620400029, 2.33531834186696, 2.30445671930436, 2.24585795233272, + 2.27739047973363, 5, 4.93995619740273, 4.94067871521554, 5, + 4.88135743043108, 4.87991239480545, 4.81986859220818, 4.82203614564662, + 4.76271486086216, 4.75982478961091, 4.69978098701363, 4.70339357607771, + 4.64407229129325, 4.63973718441636, 4.57969338181909, 4.58475100650879, + 4.52542972172433, 4.51964957922181, 4.45960577662454, 4.46610843693987, + 4.40678715215541, 4.39956197402726, 4.33951817142999, 4.34746586737095, + 4.28814458258649, 4.27947436883272, 4.21943056623544, 4.22882329780203, + 4.16950201301758, 4.15938676363817, 4.0993429610409, 4.11018072823312, + 4.05085944344866, 4.03929915844362, 3.97925535584635, 3.9915381586642, + 3.93221687387974, 3.91921155324908, 3.8591677506518, 3.87289558909528, + 3.81357430431082, 3.79912394805453, 3.73908014545726, 3.75425301952636, + 3.6949317347419, 3.67903634285998, 3.61899254026271, 3.63561044995744, + 3.57628916517299, 3.55894873766544, 3.49890493506816, 3.51696788038853, + 3.45764659560407, 3.43886113247089, 3.37881732987362, 3.39832531081961, + 3.33900402603515, 3.31877352727634, 3.25872972467907, 3.27968274125069, + 3.22036145646623, 3.1986859220818, 3.13864211948452, 3.16104017168177, + 3.10171888689731, 3.07859831688725, 3.01855451428998, 3.04239760211286, + 2.9830763173284, 2.9585107116927, 2.89846690909543, 2.92375503254394, + 2.86443374775948, 2.83842310649815, 2.77837930390088, 2.80511246297502, + 2.74579117819056, 2.71833550130361, 2.65829169870633, 2.6864698934061, + 2.62714860862164, 2.59824789610906, 2.53820409351179, 2.56782732383718, + 2.50850603905273, 2.47816029091451, 2.41811648831724, 2.44918475426827, + 2.38986346948381, 2.35807268571997, 2.29802888312269, 2.33054218469935, + 2.27122089991489, 2.23798508052542, 2.17794127792815, 2.21189961513043, + 5, 4.93841120929857, 4.93918370335065, 5, 4.87836740670129, + 4.87682241859714, 4.8152336278957, 4.81755111005194, 4.75673481340259, + 4.75364483719427, 4.69205604649284, 4.69591851675323, 4.63510222010388, + 4.63046725579141, 4.56887846508997, 4.57428592345453, 4.51346962680518, + 4.50728967438854, 4.44570088368711, 4.45265333015582, 4.39183703350647, + 4.38411209298568, 4.32252330228424, 4.33102073685712, 4.27020444020777, + 4.26093451158281, 4.19934572088138, 4.20938814355841, 4.14857184690906, + 4.13775693017995, 4.07616813947851, 4.08775555025971, 4.02693925361035, + 4.01457934877708, 3.95299055807565, 3.966122956961, 3.90530666031165, + 3.89140176737422, 3.82981297667279, 3.84449036366229, 3.78367406701294, + 3.76822418597135, 3.70663539526992, 3.72285777036359, 3.66204147371424, + 3.64504660456849, 3.58345781386706, 3.60122517706488, 3.54040888041553, + 3.52186902316562, 3.46028023246419, 3.47959258376618, 3.41877628711682, + 3.39869144176276, 3.33710265106133, 3.35795999046747, 3.29714369381812, + 3.27551386035989, 3.21392506965846, 3.23632739716877, 3.17551110051941, + 3.15233627895703, 3.0907474882556, 3.11469480387006, 3.05387850722071, + 3.02915869755416, 2.96756990685273, 2.99306221057135, 2.932245913922, + 2.9059811161513, 2.84439232544987, 2.87142961727265, 2.81061332062329, + 2.78280353474843, 2.721214744047, 2.74979702397394, 2.68898072732459, + 2.65962595334557, 2.59803716264414, 2.62816443067524, 2.56734813402588, + 2.53644837194271, 2.47485958124127, 2.50653183737653, 2.44571554072718, + 2.41327079053984, 2.35168199983841, 2.38489924407782, 2.32408294742847, + 2.29009320913698, 2.22850441843554, 2.26326665077912, 2.20245035412977, + 2.16691562773411, 2.10532683703268, 2.14163405748041, 5, + 4.93676976861086, 4.93759048895471, 5, 4.87518097790942, + 4.87353953722171, 4.81030930583257, 4.81277146686413, 4.75036195581885, + 4.74707907444342, 4.68384884305428, 4.68795244477356, 4.62554293372827, + 4.62061861166513, 4.55738838027599, 4.56313342268298, 4.50072391163769, + 4.49415814888685, 4.4309279174977, 4.4383144005924, 4.37590488954712, + 4.36769768610856, 4.30446745471941, 4.31349537850183, 4.25108586745654, + 4.24123722333027, 4.17800699194112, 4.18867635641125, 4.12626684536596, + 4.11477676055198, 4.05154652916283, 4.06385733432067, 4.00144782327539, + 3.98831629777369, 3.92508606638455, 3.9390383122301, 3.87662880118481, + 3.8618558349954, 3.79862560360626, 3.81421929013952, 3.75180977909423, + 3.73539537221711, 3.67216514082797, 3.68940026804894, 3.62699075700366, + 3.60893490943882, 3.54570467804968, 3.56458124595837, 3.50217173491308, + 3.48247444666054, 3.41924421527139, 3.43976222386779, 3.3773527128225, + 3.35601398388225, 3.2927837524931, 3.31494320177721, 3.25253369073193, + 3.22955352110396, 3.16632328971481, 3.19012417968664, 3.12771466864135, + 3.10309305832567, 3.03986282693652, 3.06530515759606, 3.00289564655077, + 2.97663259554738, 2.91340236415824, 2.94048613550548, 2.8780766244602, + 2.85017213276909, 2.78694190137995, 2.81566711341491, 2.75325760236962, + 2.7237116699908, 2.66048143860166, 2.69084809132433, 2.62843858027904, + 2.59725120721251, 2.53402097582337, 2.56602906923375, 2.50361955818847, + 2.47079074443423, 2.40756051304508, 2.44121004714318, 2.37880053609789, + 2.34433028165594, 2.28110005026679, 2.3163910250526, 2.25398151400731, + 2.21786981887765, 2.1546395874885, 2.19157200296202, 2.12916249191673, + 2.09140935609936, 2.02817912471021, 2.06675298087145, 5, + 4.93503559373069, 4.93590268117077, 5, 4.87180536234155, + 4.87007118746138, 4.80510678119207, 4.80770804351232, 4.74361072468309, + 4.74014237492277, 4.67517796865346, 4.67951340585387, 4.61541608702464, + 4.61021356238415, 4.54524915611484, 4.55131876819542, 4.48722144936619, + 4.48028474984553, 4.41532034357622, 4.42312413053696, 4.35902681170773, + 4.35035593730691, 4.2853915310376, 4.29492949287851, 4.23083217404928, + 4.2204271247683, 4.15546271849899, 4.16673485522005, 4.10263753639083, + 4.09049831222968, 4.02553390596037, 4.0385402175616, 3.97444289873238, + 3.96056949969106, 3.89560509342175, 3.91034557990315, 3.84624826107392, + 3.83064068715244, 3.76567628088313, 3.7821509422447, 3.71805362341547, + 3.70071187461383, 3.63574746834452, 3.65395630458624, 3.58985898575702, + 3.57078306207521, 3.5058186558059, 3.52576166692779, 3.46166434809856, + 3.44085424953659, 3.37588984326728, 3.39756702926934, 3.33346971044011, + 3.31092543699797, 3.24596103072867, 3.26937239161088, 3.20527507278166, + 3.18099662445936, 3.11603221819005, 3.14117775395243, 3.0770804351232, + 3.05106781192074, 2.98610340565143, 3.01298311629398, 2.94888579746475, + 2.92113899938212, 2.85617459311281, 2.88478847863552, 2.8206911598063, + 2.7912101868435, 2.7262457805742, 2.75659384097707, 2.69249652214784, + 2.66128137430489, 2.59631696803558, 2.62839920331862, 2.56430188448939, + 2.53135256176627, 2.46638815549696, 2.50020456566017, 2.43610724683094, + 2.40142374922765, 2.33645934295834, 2.37200992800171, 2.30791260917249, + 2.27149493668903, 2.20653053041973, 2.24381529034326, 2.17971797151403, + 2.14156612415042, 2.07660171788111, 2.11562065268481, 2.05152333385558, + 2.0116373116118, 1.94667290534249, 1.98742601502635, 5, 4.93321261312195, + 4.93412410342632, 5, 4.86824820685264, 4.8664252262439, 4.79963783936584, + 4.80237231027896, 4.73649641370528, 4.73285045248779, 4.66606306560974, + 4.6706205171316, 4.60474462055792, 4.59927567873169, 4.53248829185363, + 4.53886872398424, 4.47299282741056, 4.46570090497558, 4.39891351809753, + 4.40711693083688, 4.3412410342632, 4.33212613121948, 4.26533874434142, + 4.27536513768951, 4.20948924111583, 4.19855135746337, 4.13176397058532, + 4.14361334454215, 4.07773744796847, 4.06497658370727, 3.99818919682922, + 4.01186155139479, 3.94598565482111, 3.93140180995116, 3.86461442307311, + 3.88010975824743, 3.81423386167375, 3.79782703619506, 3.73103964931701, + 3.74835796510007, 3.68248206852639, 3.66425226243895, 3.5974648755609, + 3.61660617195271, 3.55073027537903, 3.53067748868285, 3.4638901018048, + 3.48485437880535, 3.41897848223167, 3.39710271492675, 3.33031532804869, + 3.35310258565799, 3.28722668908431, 3.26352794117064, 3.19674055429259, + 3.22135079251063, 3.15547489593695, 3.12995316741454, 3.06316578053648, + 3.08959899936327, 3.02372310278959, 2.99637839365843, 2.92959100678038, + 2.9578472062159, 2.89197130964222, 2.86280361990233, 2.79601623302427, + 2.82609541306854, 2.76021951649486, 2.72922884614622, 2.66244145926817, + 2.69434361992118, 2.6284677233475, 2.59565407239012, 2.52886668551207, + 2.56259182677382, 2.49671593020014, 2.46207929863401, 2.39529191175596, + 2.43084003362646, 2.36496413705278, 2.32850452487791, 2.26171713799986, + 2.2990882404791, 2.23321234390542, 2.1949297511218, 2.12814236424375, + 2.16733644733174, 2.10146055075806, 2.0613549773657, 1.99456759048765, + 2.03558465418438, 1.9697087576107, 1.92778020360959, 1.86099281673154, + 1.90383286103702, 4.6969696969697, 4.63458778470486, 4.78390019891341, + 4.84848484848485, 4.71931554934196, 4.57220587244003, 4.5098239601752, + 4.65473089977052, 4.59014625019908, 4.44744204791037, 4.38506013564553, + 4.52556160062764, 4.46097695105619, 4.3226782233807, 4.26029631111587, + 4.39639230148475, 4.33180765191331, 4.19791439885104, 4.13553248658621, + 4.26722300234187, 4.20263835277042, 4.07315057432137, 4.01076866205654, + 4.13805370319898, 4.07346905362754, 3.94838674979171, 3.88600483752688, + 4.0088844040561, 3.94429975448466, 3.82362292526204, 3.76124101299721, + 3.87971510491321, 3.81513045534177, 3.69885910073238, 3.63647718846755, + 3.75054580577033, 3.68596115619889, 3.57409527620271, 3.51171336393788, + 3.62137650662744, 3.556791857056, 3.44933145167305, 3.38694953940822, + 3.49220720748456, 3.42762255791312, 3.32456762714338, 3.26218571487855, + 3.36303790834167, 3.29845325877023, 3.19980380261372, 3.13742189034889, + 3.23386860919879, 3.16928395962735, 3.07503997808405, 3.01265806581922, + 3.1046993100559, 3.04011466048446, 2.95027615355439, 2.88789424128956, + 2.97553001091302, 2.91094536134158, 2.82551232902472, 2.76313041675989, + 2.84636071177014, 2.78177606219869, 2.70074850449506, 2.63836659223023, + 2.71719141262725, 2.65260676305581, 2.57598467996539, 2.51360276770056, + 2.58802211348437, 2.52343746391292, 2.45122085543573, 2.3888389431709, + 2.45885281434148, 2.39426816477004, 2.32645703090606, 2.26407511864123, + 2.3296835151986, 2.26509886562715, 2.2016932063764, 2.13931129411157, + 2.20051421605571, 2.13592956648427, 2.07692938184673, 2.0145474695819, + 2.07134491691283, 2.00676026734138, 1.95216555731707, 1.88978364505224, + 1.94217561776994, 1.8775909681985, 1.8274017327874, 1.76501982052257, + 1.81300631862706, 4.39393939393939, 4.33588260165261, 4.48523519317873, + 4.54545454545454, 4.42501584090292, 4.27782580936582, 4.21976901707903, + 4.36479648862711, 4.3045771363513, 4.16171222479224, 4.10365543250545, + 4.2443577840755, 4.18413843179968, 4.04559864021867, 3.98754184793188, + 4.12391907952387, 4.06369972724806, 3.92948505564509, 3.8714282633583, + 4.00348037497225, 3.94326102269644, 3.81337147107151, 3.75531467878473, + 3.88304167042063, 3.82282231814482, 3.69725788649794, 3.63920109421115, + 3.76260296586901, 3.7023836135932, 3.58114430192436, 3.52308750963758, + 3.64216426131739, 3.58194490904158, 3.46503071735079, 3.406973925064, + 3.52172555676577, 3.46150620448996, 3.34891713277721, 3.29086034049042, + 3.40128685221415, 3.34106749993834, 3.23280354820364, 3.17474675591685, + 3.28084814766253, 3.22062879538672, 3.11668996363006, 3.05863317134327, + 3.16040944311091, 3.1001900908351, 3.00057637905648, 2.9425195867697, + 3.03997073855929, 2.97975138628348, 2.88446279448291, 2.82640600219612, + 2.91953203400767, 2.85931268173186, 2.76834920990933, 2.71029241762254, + 2.79909332945605, 2.73887397718024, 2.65223562533576, 2.59417883304897, + 2.67865462490443, 2.61843527262862, 2.53612204076218, 2.47806524847539, + 2.55821592035281, 2.497996568077, 2.4200084561886, 2.36195166390182, + 2.43777721580119, 2.37755786352538, 2.30389487161503, 2.24583807932824, + 2.31733851124957, 2.25711915897376, 2.18778128704145, 2.12972449475466, + 2.19689980669795, 2.13668045442214, 2.07166770246788, 2.01361091018109, + 2.07646110214633, 2.01624174987052, 1.9555541178943, 1.89749732560751, + 1.95602239759471, 1.8958030453189, 1.83944053332073, 1.78138374103394, + 1.83558369304309, 1.77536434076728, 1.72332694874715, 1.66527015646036, + 1.71514498849147, 4.09090909090909, 4.03710156745026, 4.18649208455143, + 4.24242424242424, 4.13055992667862, 3.98329404399143, 3.92948652053259, + 4.07462776880581, 4.018695610933, 3.87567899707376, 3.82187147361493, + 3.96276345306019, 3.90683129518738, 3.76806395015609, 3.71425642669726, + 3.85089913731457, 3.79496697944176, 3.66044890323843, 3.6066413797796, + 3.73903482156895, 3.68310266369614, 3.55283385632076, 3.49902633286193, + 3.62717050582333, 3.57123834795052, 3.4452188094031, 3.39141128594426, + 3.51530619007771, 3.4593740322049, 3.33760376248543, 3.2837962390266, + 3.40344187433209, 3.34750971645928, 3.22998871556777, 3.17618119210893, + 3.29157755858647, 3.23564540071366, 3.1223736686501, 3.06856614519127, + 3.17971324284084, 3.12378108496803, 3.01475862173243, 2.9609510982736, + 3.06784892709522, 3.01191676922241, 2.90714357481477, 2.85333605135594, + 2.9559846113496, 2.90005245347679, 2.7995285278971, 2.74572100443827, + 2.84412029560398, 2.78818813773117, 2.69191348097944, 2.6381059575206, + 2.73225597985836, 2.67632382198555, 2.58429843406177, 2.53049091060294, + 2.62039166411274, 2.56445950623993, 2.47668338714411, 2.42287586368527, + 2.50852734836712, 2.45259519049431, 2.36906834022644, 2.31526081676761, + 2.3966630326215, 2.34073087474869, 2.26145329330877, 2.20764576984994, + 2.28479871687588, 2.22886655900307, 2.15383824639111, 2.10003072293228, + 2.17293440113026, 2.11700224325745, 2.04622319947344, 1.99241567601461, + 2.06107008538464, 2.00513792751183, 1.93860815255578, 1.88480062909694, + 1.94920576963902, 1.89327361176621, 1.83099310563811, 1.77718558217928, + 1.8373414538934, 1.78140929602059, 1.72337805872045, 1.66957053526161, + 1.72547713814778, 1.66954498027496, 1.61576301180278, 1.56195548834395, + 1.61361282240215, 3.78787878787879, 3.73824935741016, 3.88767546243021, + 3.93939393939394, 3.83595698546648, 3.68861992694153, 3.6389904964729, + 3.78423850850275, 3.73252003153901, 3.58936106600427, 3.53973163553564, + 3.68080155457528, 3.62908307761155, 3.49010220506701, 3.44047277459838, + 3.57736460064782, 3.52564612368409, 3.39084334412975, 3.34121391366112, + 3.47392764672036, 3.42220916975663, 3.29158448319249, 3.24195505272386, + 3.37049069279289, 3.31877221582916, 3.19232562225523, 3.1426961917866, + 3.26705373886543, 3.2153352619017, 3.09306676131797, 3.04343733084934, + 3.16361678493797, 3.11189830797424, 2.99380790038071, 2.94417846991208, + 3.06017983101051, 3.00846135404678, 2.89454903944345, 2.84491960897482, + 2.95674287708304, 2.90502440011931, 2.79529017850619, 2.74566074803756, + 2.85330592315558, 2.80158744619185, 2.69603131756893, 2.6464018871003, + 2.74986896922812, 2.69815049226439, 2.59677245663167, 2.54714302616304, + 2.64643201530066, 2.59471353833692, 2.49751359569441, 2.44788416522578, + 2.54299506137319, 2.49127658440946, 2.39825473475715, 2.34862530428852, + 2.43955810744573, 2.387839630482, 2.29899587381989, 2.24936644335126, + 2.33612115351827, 2.28440267655454, 2.19973701288263, 2.150107582414, + 2.2326841995908, 2.18096572262707, 2.10047815194537, 2.05084872147674, + 2.12924724566334, 2.07752876869961, 2.00121929100811, 1.95158986053948, + 2.02581029173588, 1.97409181477215, 1.90196043007085, 1.85233099960222, + 1.92237333780842, 1.87065486084469, 1.80270156913359, 1.75307213866496, + 1.81893638388095, 1.76721790691722, 1.70344270819633, 1.6538132777277, + 1.71549942995349, 1.66378095298976, 1.60418384725907, 1.55455441679044, + 1.61206247602603, 1.5603439990623, 1.50492498632181, 1.45529555585318, + 1.50862552209857, 3.48484848484848, 3.43933080808081, 3.58879008274548, + 3.63636363636364, 3.54121652912733, 3.39381313131313, 3.34829545454545, + 3.49364297550918, 3.44606942189102, 3.30277777777778, 3.2572601010101, + 3.39849586827287, 3.35092231465472, 3.21174242424242, 3.16622474747475, + 3.30334876103656, 3.25577520741841, 3.12070707070707, 3.07518939393939, + 3.20820165380026, 3.1606281001821, 3.02967171717172, 2.98415404040404, + 3.11305454656395, 3.0654809929458, 2.93863636363636, 2.89311868686869, + 3.01790743932764, 2.97033388570949, 2.84760101010101, 2.80208333333333, + 2.92276033209134, 2.87518677847318, 2.75656565656566, 2.71104797979798, + 2.82761322485503, 2.78003967123688, 2.6655303030303, 2.62001262626263, + 2.73246611761872, 2.68489256400057, 2.57449494949495, 2.52897727272727, + 2.63731901038242, 2.58974545676426, 2.4834595959596, 2.43794191919192, + 2.54217190314611, 2.49459834952796, 2.39242424242424, 2.34690656565657, + 2.4470247959098, 2.39945124229165, 2.30138888888889, 2.25587121212121, + 2.3518776886735, 2.30430413505534, 2.21035353535354, 2.16483585858586, + 2.25673058143719, 2.20915702781904, 2.11931818181818, 2.0738005050505, + 2.16158347420088, 2.11400992058273, 2.02828282828283, 1.98276515151515, + 2.06643636696458, 2.01886281334642, 1.93724747474747, 1.8917297979798, + 1.97128925972827, 1.92371570611012, 1.84621212121212, 1.80069444444444, + 1.87614215249196, 1.82856859887381, 1.75517676767677, 1.70965909090909, + 1.78099504525566, 1.7334214916375, 1.66414141414141, 1.61862373737374, + 1.68584793801935, 1.6382743844012, 1.57310606060606, 1.52758838383838, + 1.59070083078304, 1.54312727716489, 1.48207070707071, 1.43655303030303, + 1.49555372354674, 1.44798016992858, 1.39103535353535, 1.34551767676768, + 1.40040661631043, 3.18181818181818, 3.14035090629054, 3.28984085718567, + 3.33333333333333, 3.24634838103801, 3.09888363076289, 3.05741635523525, + 3.20285590489035, 3.15936342874269, 3.01594907970761, 2.97448180417996, + 3.11587095259503, 3.07237847644737, 2.93301452865232, 2.89154725312467, + 3.02888600029971, 2.98539352415205, 2.85007997759703, 2.80861270206938, + 2.94190104800439, 2.89840857185673, 2.76714542654174, 2.7256781510141, + 2.85491609570907, 2.81142361956141, 2.68421087548645, 2.64274359995881, + 2.76793114341375, 2.72443866726609, 2.60127632443116, 2.55980904890352, + 2.68094619111843, 2.63745371497077, 2.51834177337588, 2.47687449784823, + 2.59396123882311, 2.55046876267545, 2.43540722232059, 2.39393994679294, + 2.50697628652779, 2.46348381038012, 2.3524726712653, 2.31100539573766, + 2.41999133423246, 2.3764988580848, 2.26953812021001, 2.22807084468237, + 2.33300638193714, 2.28951390578948, 2.18660356915472, 2.14513629362708, + 2.24602142964182, 2.20252895349416, 2.10366901809944, 2.06220174257179, + 2.1590364773465, 2.11554400119884, 2.02073446704415, 1.9792671915165, + 2.07205152505118, 2.02855904890352, 1.93779991598886, 1.89633264046122, + 1.98506657275586, 1.9415740966082, 1.85486536493357, 1.81339808940593, + 1.89808162046054, 1.85458914431288, 1.77193081387828, 1.73046353835064, + 1.81109666816522, 1.76760419201756, 1.688996262823, 1.64752898729535, + 1.7241117158699, 1.68061923972224, 1.60606171176771, 1.56459443624006, + 1.63712676357458, 1.59363428742692, 1.52312716071242, 1.48165988518477, + 1.55014181127926, 1.5066493351316, 1.44019260965713, 1.39872533412949, + 1.46315685898394, 1.41966438283627, 1.35725805860184, 1.3157907830742, + 1.37617190668861, 1.33267943054095, 1.27432350754655, 1.23285623201891, + 1.28918695439329, 2.87878787878788, 2.84131477785073, 2.99083284207064, + 3.03030303030303, 2.95136265383824, 2.80384167691359, 2.76636857597644, + 2.91189246560585, 2.87242227737345, 2.7288954750393, 2.69142237410215, + 2.83295208914106, 2.79348190090866, 2.65394927316501, 2.61647617222786, + 2.75401171267627, 2.71454152444387, 2.57900307129072, 2.54152997035357, + 2.67507133621148, 2.63560114797908, 2.50405686941643, 2.46658376847928, + 2.59613095974669, 2.55666077151429, 2.42911066754214, 2.39163756660499, + 2.5171905832819, 2.4777203950495, 2.35416446566784, 2.3166913647307, + 2.43825020681711, 2.39878001858472, 2.27921826379355, 2.24174516285641, + 2.35930983035232, 2.31983964211993, 2.20427206191926, 2.16679896098212, + 2.28036945388753, 2.24089926565514, 2.12932586004497, 2.09185275910783, + 2.20142907742274, 2.16195888919035, 2.05437965817068, 2.01690655723354, + 2.12248870095795, 2.08301851272556, 1.97943345629639, 1.94196035535925, + 2.04354832449316, 2.00407813626077, 1.9044872544221, 1.86701415348496, + 1.96460794802837, 1.92513775979598, 1.82954105254781, 1.79206795161066, + 1.88566757156358, 1.84619738333119, 1.75459485067352, 1.71712174973637, + 1.80672719509879, 1.7672570068664, 1.67964864879923, 1.64217554786208, + 1.72778681863401, 1.68831663040161, 1.60470244692494, 1.56722934598779, + 1.64884644216922, 1.60937625393682, 1.52975624505065, 1.4922831441135, + 1.56990606570443, 1.53043587747203, 1.45481004317636, 1.41733694223921, + 1.49096568923964, 1.45149550100724, 1.37986384130207, 1.34239074036492, + 1.41202531277485, 1.37255512454245, 1.30491763942778, 1.26744453849063, + 1.33308493631006, 1.29361474807766, 1.22997143755348, 1.19249833661634, + 1.25414455984527, 1.21467437161287, 1.15502523567919, 1.11755213474205, + 1.17520418338048, 2.57575757575758, 2.54222767594423, 2.69177122689748, + 2.72727272727273, 2.65626972652223, 2.50869777613088, 2.47516787631753, + 2.62076822614699, 2.58526672577174, 2.44163797650418, 2.40810807669083, + 2.54976522539649, 2.51426372502125, 2.37457817687749, 2.34104827706414, + 2.478762224646, 2.44326072427075, 2.30751837725079, 2.27398847743744, + 2.40775922389551, 2.37225772352026, 2.24045857762409, 2.20692867781074, + 2.33675622314501, 2.30125472276976, 2.17339877799739, 2.13986887818405, + 2.26575322239452, 2.23025172201927, 2.1063389783707, 2.07280907855735, + 2.19475022164402, 2.15924872126878, 2.039279178744, 2.00574927893065, + 2.12374722089353, 2.08824572051828, 1.9722193791173, 1.93868947930396, + 2.05274422014304, 2.01724271976779, 1.90515957949061, 1.87162967967726, + 1.98174121939254, 1.9462397190173, 1.83809977986391, 1.80456988005056, + 1.91073821864205, 1.8752367182668, 1.77103998023721, 1.73751008042386, + 1.83973521789156, 1.80423371751631, 1.70398018061052, 1.67045028079717, + 1.76873221714106, 1.73323071676581, 1.63692038098382, 1.60339048117047, + 1.69772921639057, 1.66222771601532, 1.56986058135712, 1.53633068154377, + 1.62672621564007, 1.59122471526483, 1.50280078173043, 1.46927088191708, + 1.55572321488958, 1.52022171451433, 1.43574098210373, 1.40221108229038, + 1.48472021413909, 1.44921871376384, 1.36868118247703, 1.33515128266368, + 1.41371721338859, 1.37821571301335, 1.30162138285033, 1.26809148303699, + 1.3427142126381, 1.30721271226285, 1.23456158322364, 1.20103168341029, + 1.27171121188761, 1.23620971151236, 1.16750178359694, 1.13397188378359, + 1.20070821113711, 1.16520671076186, 1.10044198397024, 1.0669120841569, + 1.12970521038662, 1.09420371001137, 1.03338218434355, 0.999852284530198, + 1.05870220963612, 2.27272727272727, 2.24309496922515, 2.39266132258469, + 2.42424242424242, 2.36108022092695, 2.21346266572302, 2.1838303622209, + 2.32949911926921, 2.29791801761148, 2.15419805871877, 2.12456575521665, + 2.26633691595374, 2.23475581429601, 2.09493345171453, 2.0653011482124, + 2.20317471263827, 2.17159361098053, 2.03566884471028, 2.00603654120815, + 2.1400125093228, 2.10843140766506, 1.97640423770603, 1.9467719342039, + 2.07685030600732, 2.04526920434959, 1.91713963070178, 1.88750732719965, + 2.01368810269185, 1.98210700103411, 1.85787502369753, 1.82824272019541, + 1.95052589937638, 1.91894479771864, 1.79861041669328, 1.76897811319116, + 1.8873636960609, 1.85578259440317, 1.73934580968903, 1.70971350618691, + 1.82420149274543, 1.79262039108769, 1.68008120268478, 1.65044889918266, + 1.76103928942996, 1.72945818777222, 1.62081659568053, 1.59118429217841, + 1.69787708611448, 1.66629598445675, 1.56155198867628, 1.53191968517416, + 1.63471488279901, 1.60313378114128, 1.50228738167204, 1.47265507816991, + 1.57155267948354, 1.5399715778258, 1.44302277466779, 1.41339047116566, + 1.50839047616807, 1.47680937451033, 1.38375816766354, 1.35412586416141, + 1.44522827285259, 1.41364717119486, 1.32449356065929, 1.29486125715716, + 1.38206606953712, 1.35048496787938, 1.26522895365504, 1.23559665015291, + 1.31890386622165, 1.28732276456391, 1.20596434665079, 1.17633204314867, + 1.25574166290617, 1.22416056124844, 1.14669973964654, 1.11706743614442, + 1.1925794595907, 1.16099835793296, 1.08743513264229, 1.05780282914017, + 1.12941725627523, 1.09783615461749, 1.02817052563804, 0.998538222135918, + 1.06625505295976, 1.03467395130202, 0.968905918633794, 0.939273615131669, + 1.00309284964428, 0.971511747986546, 0.909641311629545, 0.88000900812742, + 0.939930646328809, 1.96969696969697, 1.94392212965719, 2.09350854944117, + 2.12121212121212, 2.06580497767022, 1.91814728961742, 1.89237244957764, + 2.03810140589927, 2.01039783412832, 1.86659760953787, 1.84082276949809, + 1.98269426235737, 1.95499069058642, 1.81504792945831, 1.78927308941854, + 1.92728711881547, 1.89958354704452, 1.76349824937876, 1.73772340933898, + 1.87187997527357, 1.84417640350262, 1.71194856929921, 1.68617372925943, + 1.81647283173167, 1.78876925996072, 1.66039888921966, 1.63462404917988, + 1.76106568818977, 1.73336211641882, 1.6088492091401, 1.58307436910033, + 1.70565854464787, 1.67795497287692, 1.55729952906055, 1.53152468902078, + 1.65025140110597, 1.62254782933502, 1.505749848981, 1.47997500894122, + 1.59484425756407, 1.56714068579311, 1.45420016890145, 1.42842532886167, + 1.53943711402216, 1.51173354225121, 1.4026504888219, 1.37687564878212, + 1.48402997048026, 1.45632639870931, 1.35110080874234, 1.32532596870257, + 1.42862282693836, 1.40091925516741, 1.29955112866279, 1.27377628862301, + 1.37321568339646, 1.34551211162551, 1.24800144858324, 1.22222660854346, + 1.31780853985456, 1.29010496808361, 1.19645176850369, 1.17067692846391, + 1.26240139631266, 1.23469782454171, 1.14490208842413, 1.11912724838436, + 1.20699425277076, 1.17929068099981, 1.09335240834458, 1.06757756830481, + 1.15158710922886, 1.12388353745791, 1.04180272826503, 1.01602788822525, + 1.09617996568696, 1.06847639391601, 0.990253048185477, 0.964478208145701, + 1.04077282214506, 1.01306925037411, 0.938703368105925, 0.912928528066149, + 0.985365678603158, 0.957662106832208, 0.887153688026373, + 0.861378847986597, 0.929958535061258, 0.902254963290307, + 0.835604007946821, 0.809829167907045, 0.874551391519357, + 0.846847819748407, 0.784054327867269, 0.758279487827493, + 0.819144247977456, 1.66666666666667, 1.64471472011787, 1.79431842488753, + 1.81818181818182, 1.77045503159325, 1.62276277356908, 1.60081082702028, + 1.74659163829896, 1.72272824500468, 1.57885888047149, 1.55690693392269, + 1.69886485171039, 1.67500145841611, 1.5349549873739, 1.5130030408251, + 1.65113806512182, 1.62727467182753, 1.49105109427631, 1.46909914772751, + 1.60341127853325, 1.57954788523896, 1.44714720117872, 1.42519525462992, + 1.55568449194468, 1.53182109865039, 1.40324330808113, 1.38129136153233, + 1.50795770535611, 1.48409431206182, 1.35933941498354, 1.33738746843474, + 1.46023091876754, 1.43636752547325, 1.31543552188595, 1.29348357533715, + 1.41250413217896, 1.38864073888468, 1.27153162878836, 1.24957968223956, + 1.36477734559039, 1.34091395229611, 1.22762773569077, 1.20567578914197, + 1.31705055900182, 1.29318716570754, 1.18372384259318, 1.16177189604438, + 1.26932377241325, 1.24546037911897, 1.13981994949559, 1.11786800294679, + 1.22159698582468, 1.19773359253039, 1.095916056398, 1.0739641098492, + 1.17387019923611, 1.15000680594182, 1.05201216330041, 1.03006021675161, + 1.12614341264754, 1.10228001935325, 1.00810827020282, 0.986156323654023, + 1.07841662605897, 1.05455323276468, 0.964204377105228, 0.942252430556433, + 1.0306898394704, 1.00682644617611, 0.920300484007638, 0.898348537458843, + 0.982963052881825, 0.959099659587539, 0.876396590910049, + 0.854444644361254, 0.935236266293254, 0.911372872998968, + 0.832492697812459, 0.810540751263664, 0.887509479704683, + 0.863646086410397, 0.788588804714869, 0.766636858166074, + 0.839782693116112, 0.815919299821826, 0.744684911617279, + 0.722732965068484, 0.79205590652754, 0.768192513233255, + 0.700781018519689, 0.678829071970894, 0.744329119938969, + 0.720465726644684, 0.656877125422099, 0.634925178873304, + 0.696602333350398, 1.36363636363636, 1.34547838179679, 1.49509655095733, + 1.51515151515151, 1.47504158676315, 1.32732039995723, 1.30916241811766, + 1.45498662256897, 1.43493165837479, 1.29100443627809, 1.27284645443852, + 1.41487669418061, 1.39482172998642, 1.25468847259895, 1.23653049075938, + 1.37476676579224, 1.35471180159806, 1.21837250891981, 1.20021452708025, + 1.33465683740388, 1.3146018732097, 1.18205654524068, 1.16389856340111, + 1.29454690901551, 1.27449194482133, 1.14574058156154, 1.12758259972197, + 1.25443698062715, 1.23438201643297, 1.1094246178824, 1.09126663604283, + 1.21432705223879, 1.19427208804461, 1.07310865420326, 1.0549506723637, + 1.17421712385042, 1.15416215965624, 1.03679269052413, 1.01863470868456, + 1.13410719546206, 1.11405223126788, 1.00047672684499, 0.982318745005421, + 1.0939972670737, 1.07394230287951, 0.964160763165852, 0.946002781326284, + 1.05388733868533, 1.03383237449115, 0.927844799486715, 0.909686817647146, + 1.01377741029697, 0.993722446102788, 0.891528835807577, + 0.873370853968009, 0.973667481908606, 0.953612517714424, + 0.85521287212844, 0.837054890288871, 0.933557553520242, + 0.913502589326061, 0.818896908449303, 0.800738926609734, + 0.893447625131879, 0.873392660937697, 0.782580944770165, + 0.764422962930597, 0.853337696743515, 0.833282732549333, + 0.746264981091028, 0.728106999251459, 0.813227768355151, + 0.79317280416097, 0.709949017411891, 0.691791035572322, + 0.773117839966788, 0.753062875772606, 0.673633053732753, + 0.655475071893185, 0.733007911578424, 0.712952947384242, + 0.637317090053616, 0.619159108214047, 0.692897983190061, + 0.672843018995879, 0.601001126374479, 0.58284314453491, + 0.652788054801697, 0.632733090607515, 0.564685162695341, + 0.546527180855773, 0.612678126413333, 0.592623162219152, + 0.528369199016204, 0.510211217176635, 0.57256819802497, 1.06060606060606, + 1.04621882141657, 1.19584860160668, 1.21212121212121, 1.17957599109215, + 1.03183158222708, 1.01744434303759, 1.16330338057762, 1.14703077006309, + 1.0030571038481, 0.988669864658611, 1.13075815954857, 1.11448554903404, + 0.974282625469121, 0.959895386279631, 1.09821293851951, 1.08194032800498, + 0.945508147090141, 0.931120907900651, 1.06566771749045, 1.04939510697592, + 0.91673366871116, 0.902346429521671, 1.03312249646139, 1.01684988594686, + 0.887959190332181, 0.87357195114269, 1.00057727543233, 0.984304664917801, + 0.859184711953201, 0.844797472763711, 0.968032054403272, + 0.951759443888742, 0.830410233574221, 0.816022994384731, + 0.935486833374213, 0.919214222859684, 0.801635755195241, + 0.787248516005751, 0.902941612345154, 0.886669001830625, + 0.772861276816261, 0.758474037626771, 0.870396391316096, + 0.854123780801566, 0.744086798437281, 0.729699559247791, + 0.837851170287037, 0.821578559772508, 0.715312320058301, + 0.700925080868811, 0.805305949257978, 0.789033338743449, + 0.686537841679321, 0.67215060248983, 0.77276072822892, 0.75648811771439, + 0.657763363300341, 0.643376124110851, 0.740215507199861, + 0.723942896685332, 0.628988884921361, 0.614601645731871, + 0.707670286170802, 0.691397675656273, 0.600214406542381, + 0.585827167352891, 0.675125065141744, 0.658852454627214, + 0.571439928163401, 0.557052688973911, 0.642579844112685, + 0.626307233598156, 0.542665449784421, 0.528278210594931, + 0.610034623083626, 0.593762012569097, 0.51389097140544, + 0.499503732215951, 0.577489402054568, 0.561216791540038, + 0.485116493026461, 0.470729253836971, 0.544944181025509, + 0.52867157051098, 0.456342014647481, 0.441954775457991, 0.51239895999645, + 0.496126349481921, 0.427567536268501, 0.413180297079011, + 0.479853738967392, 0.463581128452862, 0.398793057889521, + 0.384405818700031, 0.447308517938333, 0.757575757575758, + 0.746941798305239, 0.896580309860905, 0.909090909090909, + 0.884069710630901, 0.736307839034721, 0.725673879764203, + 0.871559111400897, 0.859048512170892, 0.715039920493684, + 0.704405961223166, 0.846537912940888, 0.834027313710884, + 0.693772001952648, 0.683138042682129, 0.82151671448088, + 0.809006115250876, 0.672504083411611, 0.661870124141092, + 0.796495516020872, 0.783984916790867, 0.651236164870574, + 0.640602205600056, 0.771474317560863, 0.758963718330859, + 0.629968246329537, 0.619334287059019, 0.746453119100855, + 0.733942519870851, 0.608700327788501, 0.598066368517982, + 0.721431920640846, 0.708921321410842, 0.587432409247464, + 0.576798449976945, 0.696410722180838, 0.683900122950834, + 0.566164490706427, 0.555530531435909, 0.67138952372083, + 0.658878924490826, 0.54489657216539, 0.534262612894872, + 0.646368325260821, 0.633857726030817, 0.523628653624354, + 0.512994694353835, 0.621347126800813, 0.608836527570809, + 0.502360735083317, 0.491726775812798, 0.596325928340805, 0.5838153291108, + 0.48109281654228, 0.470458857271762, 0.571304729880796, + 0.558794130650792, 0.459824898001243, 0.449190938730725, + 0.546283531420788, 0.533772932190784, 0.438556979460207, + 0.427923020189688, 0.521262332960779, 0.508751733730775, + 0.41728906091917, 0.406655101648651, 0.496241134500771, + 0.483730535270767, 0.396021142378133, 0.385387183107615, + 0.471219936040763, 0.458709336810758, 0.374753223837096, + 0.364119264566578, 0.446198737580754, 0.43368813835075, 0.35348530529606, + 0.342851346025541, 0.421177539120746, 0.408666939890742, + 0.332217386755023, 0.321583427484505, 0.396156340660738, + 0.383645741430733, 0.310949468213986, 0.300315508943468, + 0.371135142200729, 0.358624542970725, 0.289681549672949, + 0.279047590402431, 0.346113943740721, 0.333603344510717, + 0.268413631131913, 0.257779671861394, 0.321092745280712, + 0.454545454545454, 0.447653111349543, 0.597297454827391, + 0.606060606060606, 0.588534303594177, 0.440760768153632, + 0.433868424957721, 0.579771152360962, 0.571008001127747, + 0.426976081761811, 0.4200837385659, 0.562244849894533, 0.553481698661318, + 0.413191395369989, 0.406299052174078, 0.544718547428103, + 0.535955396194889, 0.399406708978167, 0.392514365782256, + 0.527192244961674, 0.518429093728459, 0.385622022586345, + 0.378729679390434, 0.509665942495245, 0.50090279126203, + 0.371837336194523, 0.364944992998612, 0.492139640028816, + 0.483376488795601, 0.358052649802701, 0.35116030660679, + 0.474613337562386, 0.465850186329172, 0.34426796341088, + 0.337375620214969, 0.457087035095957, 0.448323883862742, + 0.330483277019058, 0.323590933823147, 0.439560732629528, + 0.430797581396313, 0.316698590627236, 0.309806247431325, + 0.422034430163098, 0.413271278929884, 0.302913904235414, + 0.296021561039503, 0.404508127696669, 0.395744976463455, + 0.289129217843592, 0.282236874647681, 0.38698182523024, + 0.378218673997025, 0.27534453145177, 0.268452188255859, + 0.369455522763811, 0.360692371530596, 0.261559845059949, + 0.254667501864038, 0.351929220297381, 0.343166069064167, + 0.247775158668127, 0.240882815472216, 0.334402917830952, + 0.325639766597737, 0.233990472276305, 0.227098129080394, + 0.316876615364523, 0.308113464131308, 0.220205785884483, + 0.213313442688572, 0.299350312898093, 0.290587161664879, + 0.206421099492661, 0.19952875629675, 0.281824010431664, + 0.273060859198449, 0.192636413100839, 0.185744069904928, + 0.264297707965235, 0.25553455673202, 0.178851726709018, + 0.171959383513107, 0.246771405498806, 0.238008254265591, + 0.165067040317196, 0.158174697121285, 0.229245103032376, + 0.220481951799162, 0.151282353925374, 0.144390010729463, + 0.211718800565947, 0.202955649332732, 0.137497667533552, + 0.130605324337641, 0.194192498099518, 0.151515151515151, + 0.148358585858586, 0.298005848604064, 0.303030303030303, + 0.292981394177826, 0.14520202020202, 0.142045454545454, + 0.287956939751588, 0.28293248532535, 0.138888888888889, + 0.135732323232323, 0.277908030899111, 0.272883576472873, + 0.132575757575757, 0.129419191919192, 0.267859122046635, + 0.262834667620396, 0.126262626262626, 0.12310606060606, + 0.257810213194158, 0.25278575876792, 0.119949494949495, + 0.116792929292929, 0.247761304341682, 0.242736849915443, + 0.113636363636363, 0.110479797979798, 0.237712395489205, + 0.232687941062967, 0.107323232323232, 0.104166666666666, + 0.227663486636728, 0.22263903221049, 0.101010101010101, + 0.0978535353535351, 0.217614577784252, 0.212590123358014, + 0.0946969696969694, 0.0915404040404038, 0.207565668931775, + 0.202541214505537, 0.0883838383838381, 0.0852272727272724, + 0.197516760079299, 0.19249230565306, 0.0820707070707068, + 0.0789141414141411, 0.187467851226822, 0.182443396800584, + 0.0757575757575755, 0.0726010101010098, 0.177418942374346, + 0.172394487948107, 0.0694444444444441, 0.0662878787878785, + 0.167370033521869, 0.162345579095631, 0.0631313131313128, + 0.0599747474747471, 0.157321124669392, 0.152296670243154, + 0.0568181818181815, 0.0536616161616158, 0.147272215816916, + 0.142247761390678, 0.0505050505050501, 0.0473484848484845, + 0.137223306964439, 0.132198852538201, 0.0441919191919188, + 0.0410353535353531, 0.127174398111963, 0.122149943685724, + 0.0378787878787875, 0.0347222222222218, 0.117125489259486, + 0.112101034833248, 0.0315656565656562, 0.0284090909090905, + 0.107076580407009, 0.102052125980771, 0.0252525252525248, + 0.0220959595959592, 0.0970276715545329, 0.0920032171282946, + 0.0189393939393935, 0.0157828282828278, 0.0869787627020563, + 0.081954308275818, 0.0126262626262622, 0.00946969696969651, + 0.0769298538495797, 0.0719053994233414, 0.00631313131313085, + 0.00315656565656519, 0.0668809449971031, 2.64855821716837, + 2.64711643433674, 2.69717778679766, 2.69858889339883, 2.74861956962929, + 2.74723913925858, 2.7973004917195, 2.79865024585975, 2.84868092209021, + 2.84736184418042, 2.89742319664134, 2.89871159832067, 2.94874227455113, + 2.94748454910226, 2.99754590156318, 2.99877295078159, 3.04880362701205, + 3.0476072540241, 3.09766860648502, 3.09883430324251, 3.14886497947297, + 3.14772995894594, 3.19779131140687, 3.19889565570343, 3.24892633193389, + 3.24785266386779, 3.29791401632871, 3.29895700816435, 3.34898768439481, + 3.34797536878963, 3.39803672125055, 3.39901836062527, 3.44904903685573, + 3.44809807371147, 3.49815942617239, 3.49907971308619, 3.54911038931665, + 3.54822077863331, 3.59828213109423, 3.59914106554711, 3.64917174177757, + 3.64834348355515, 3.69840483601607, 3.69920241800803, 3.7492330942385, + 3.74846618847699, 3.79852754093791, 3.79926377046896, 3.84929444669942, + 3.84858889339883, 3.89865024585975, 3.89932512292988, 3.94935579916034, + 3.94871159832067, 3.99877295078159, 3.9993864753908, 4.04941715162126, + 4.04883430324251, 4.09889565570343, 4.09944782785172, 4.14947850408218, + 4.14895700816435, 4.19901836062527, 4.19950918031264, 4.2495398565431, + 4.24907971308619, 4.29914106554711, 4.29957053277356, 4.34960120900402, + 4.34920241800804, 4.39926377046895, 4.39963188523448, 4.44966256146494, + 4.44932512292988, 4.4993864753908, 4.4996932376954, 4.54972391392586, + 4.54944782785172, 4.59950918031264, 4.59975459015632, 4.64978526638678, + 4.64957053277356, 4.69963188523448, 4.69981594261724, 4.7498466188477, + 4.7496932376954, 4.79975459015632, 4.79987729507816, 4.84990797130862, + 4.84981594261724, 4.89987729507816, 4.89993864753908, 4.94996932376954, + 4.94993864753908, 5, 5, 2.64279435194369, 2.63847226955065, + 2.68871754041127, 2.69294766360447, 2.74310097526524, 2.73896281127189, + 2.78920808213252, 2.79325428692601, 2.84340759858678, 2.83945335299314, + 2.88969862385377, 2.89356091024756, 2.94371422190833, 2.93994389471439, + 2.99018916557502, 2.9938675335691, 3.04402084522987, 3.04043443643564, + 3.09067970729627, 3.09417415689065, 3.14432746855142, 3.14092497815689, + 3.19117024901752, 3.19448078021219, 3.24463409187296, 3.24141551987814, + 3.29166079073876, 3.29478740353374, 3.34494071519451, 3.34190606159939, + 3.39215133246001, 3.39509402685528, 3.44524733851605, 3.44239660332064, + 3.49264187418126, 3.49540065017683, 3.5455539618376, 3.54288714504189, + 3.59313241590251, 3.59570727349837, 3.64586058515914, 3.64337768676314, + 3.69362295762376, 3.69601389681992, 3.74616720848069, 3.74386822848439, + 3.79411349934501, 3.79632052014146, 3.84647383180223, 3.84435877020563, + 3.89460404106626, 3.89662714346301, 3.94678045512378, 3.94484931192688, + 3.99509458278751, 3.99693376678455, 4.04708707844532, 4.04533985364813, + 4.09558512450876, 4.0972403901061, 4.14739370176687, 4.14583039536938, + 4.19607566623001, 4.19754701342764, 4.24770032508841, 4.24632093709063, + 4.29656620795126, 4.29785363674919, 4.34800694840996, 4.34681147881188, + 4.3970567496725, 4.39816026007073, 4.4483135717315, 4.44730202053313, + 4.49754729139375, 4.49846688339228, 4.54862019505305, 4.54779256225438, + 4.598037833115, 4.59877350671382, 4.64892681837459, 4.64828310397563, + 4.69852837483625, 4.69908013003537, 4.74923344169614, 4.74877364569688, + 4.7990189165575, 4.79938675335691, 4.84954006501768, 4.84926418741813, + 4.89950945827875, 4.89969337667845, 4.94984668833923, 4.94975472913938, + 5, 5, 2.63127967850293, 2.62408708745521, 2.67463842601999, + 2.68167798321563, 2.73207628792833, 2.72518976458477, 2.77574110314956, + 2.78247459264104, 2.83287289735374, 2.82629244171434, 2.87684378027912, + 2.88327120206645, 2.93366950677915, 2.9273951188439, 2.97794645740869, + 2.98406781149185, 3.03446611620456, 3.02849779597347, 3.07904913453825, + 3.08486442091726, 3.13526272562996, 3.12960047310304, 3.18015181166782, + 3.18566103034267, 3.23605933505537, 3.2307031502326, 3.28125448879738, + 3.28645763976807, 3.33685594448078, 3.33180582736217, 3.38235716592695, + 3.38725424919348, 3.43765255390619, 3.43290850449173, 3.48345984305652, + 3.48805085861889, 3.53844916333159, 3.5340111816213, 3.58456252018608, + 3.5888474680443, 3.639245772757, 3.63511385875086, 3.68566519731565, + 3.6896440774697, 3.74004238218241, 3.73621653588043, 3.78676787444521, + 3.79044068689511, 3.84083899160781, 3.83731921301, 3.88787055157478, + 3.89123729632052, 3.94163560103322, 3.93842189013956, 3.98897322870434, + 3.99203390574593, 4.04243221045863, 4.03952456726913, 4.09007590583391, + 4.09283051517133, 4.14322881988404, 4.14062724439869, 4.19117858296347, + 4.19362712459674, 4.24402542930945, 4.24172992152826, 4.29228126009304, + 4.29442373402215, 4.34482203873485, 4.34283259865782, 4.39338393722261, + 4.39522034344755, 4.44561864816026, 4.44393527578739, 4.49448661435217, + 4.49601695287296, 4.54641525758567, 4.54503795291695, 4.59558929148174, + 4.59681356229837, 4.64721186701107, 4.64614063004652, 4.6966919686113, + 4.69761017172378, 4.74800847643648, 4.74724330717609, 4.79779464574087, + 4.79840678114918, 4.84880508586189, 4.84834598430565, 4.89889732287043, + 4.89920339057459, 4.9496016952873, 4.94944866143522, 5, 5, + 2.61404028128492, 2.60399347511464, 2.65497233734624, 2.66480538168312, + 2.71557048208131, 2.70595119957785, 2.75693006180945, 2.7663355824795, + 2.8171006828777, 2.80790892404105, 2.85888778627266, 2.86786578327589, + 2.91863088367408, 2.90986664850426, 2.96084551073586, 2.96939598407228, + 3.02016108447047, 3.01182437296747, 3.06280323519907, 3.07092618486866, + 3.12169128526686, 3.11378209743067, 3.16476095966228, 3.17245638566505, + 3.22322148606324, 3.21573982189388, 3.26671868412548, 3.27398658646143, + 3.32475168685963, 3.31769754635709, 3.36867640858869, 3.37551678725782, + 3.42628188765601, 3.41965527082029, 3.4706341330519, 3.47704698805421, + 3.5278120884524, 3.5216129952835, 3.57259185751511, 3.57857718885059, + 3.62934228924879, 3.62357071974671, 3.67454958197831, 3.68010738964698, + 3.73087249004517, 3.72552844420992, 3.77650730644152, 3.78163759044337, + 3.83240269084156, 3.82748616867312, 3.87846503090473, 3.88316779123975, + 3.93393289163794, 3.92944389313633, 3.98042275536793, 3.98469799203614, + 4.03546309243433, 4.03140161759954, 4.08238047983114, 4.08622819283252, + 4.13699329323072, 4.13335934206274, 4.18433820429435, 4.18775839362891, + 4.2385234940271, 4.23531706652595, 4.28629592875755, 4.2892885944253, + 4.34005369482349, 4.33727479098916, 4.38825365322076, 4.39081879522168, + 4.44158389561988, 4.43923251545236, 4.49021137768397, 4.49234899601807, + 4.54311409641626, 4.54119023991557, 4.59216910214717, 4.59387919681446, + 4.64464429721265, 4.64314796437878, 4.69412682661038, 4.69540939761084, + 4.74617449800903, 4.74510568884198, 4.79608455107359, 4.79693959840723, + 4.84770469880542, 4.84706341330519, 4.89804227553679, 4.89846979920361, + 4.94923489960181, 4.9490211377684, 5, 5, 2.59111521306916, + 2.57823695102368, 2.62976382440616, 2.6423680808762, 2.69362094868324, + 2.68129069778863, 2.73281757117111, 2.74487381649028, 2.79612668429732, + 2.78434444455358, 2.83587131793606, 2.84737955210436, 2.8986324199114, + 2.88739819131853, 2.93892506470101, 2.94988528771844, 3.00113815552547, + 2.99045193808348, 3.04197881146596, 3.05239102333251, 3.10364389113955, + 3.09350568484843, 3.14503255823091, 3.15489675894659, 3.20614962675363, + 3.19655943161338, 3.24808630499586, 3.25740249456067, 3.30865536236771, + 3.29961317837833, 3.35114005176081, 3.35990823017475, 3.41116109798179, + 3.40266692514328, 3.45419379852575, 3.46241396578883, 3.51366683359587, + 3.50572067190823, 3.5572475452907, 3.5649197014029, 3.61617256920994, + 3.60877441867318, 3.66030129205565, 3.66742543701698, 3.71867830482402, + 3.71182816543813, 3.7633550388206, 3.76993117263106, 3.8211840404381, + 3.81488191220308, 3.86640878558555, 3.87243690824514, 3.92368977605218, + 3.91793565896803, 3.9694625323505, 3.97494264385922, 4.02619551166626, + 4.02098940573298, 4.07251627911545, 4.0774483794733, 4.12870124728033, + 4.12404315249793, 4.1755700258804, 4.17995411508737, 4.23120698289441, + 4.22709689926288, 4.27862377264535, 4.28245985070145, 4.33371271850849, + 4.33015064602783, 4.3816775194103, 4.38496558631553, 4.43621845412257, + 4.43320439279278, 4.48473126617525, 4.48747132192961, 4.53872418973665, + 4.53625813955773, 4.5877850129402, 4.58997705754369, 4.64122992535073, + 4.63931188632268, 4.69083875970515, 4.69248279315777, 4.7437356609648, + 4.74236563308763, 4.7938925064701, 4.79498852877184, 4.84624139657888, + 4.84541937985258, 4.89694625323505, 4.89749426438592, 4.94874713219296, + 4.94847312661753, 5, 5, 2.56255640650863, 2.54687586199357, + 2.59906999258946, 2.61441690849781, 2.66627741048698, 2.65126412318534, + 2.70345825378122, 2.71813791247616, 2.76999841446534, 2.7556523843771, + 2.80784651497298, 2.82185891645452, 2.8737194184437, 2.86004064556886, + 2.91223477616474, 2.92557992043288, 2.97744042242205, 2.96442890676063, + 3.01662303735651, 3.02930092441123, 3.08116142640041, 3.06881716795239, + 3.12101129854827, 3.13302192838959, 3.18488243037877, 3.17320542914415, + 3.22539955974003, 3.23674293236794, 3.28860343435712, 3.27759369033591, + 3.3297878209318, 3.3404639363463, 3.39232443833548, 3.38198195152768, + 3.43417608212356, 3.44418494032466, 3.49604544231383, 3.48637021271944, + 3.53856434331532, 3.54790594430301, 3.59976644629219, 3.5907584739112, + 3.64295260450708, 3.65162694828137, 3.70348745027055, 3.69514673510296, + 3.74734086569885, 3.75534795225973, 3.8072084542489, 3.79953499629473, + 3.85172912689061, 3.85906895623808, 3.91092945822726, 3.90392325748649, + 3.95611738808237, 3.96278996021644, 4.01465046220562, 4.00831151867825, + 4.06050564927413, 4.06651096419479, 4.11837146618397, 4.11269977987002, + 4.1648939104659, 4.17023196817315, 4.22209247016233, 4.21708804106178, + 4.26928217165766, 4.27395297215151, 4.32581347414069, 4.32147630225354, + 4.37367043284942, 4.37767397612986, 4.42953447811904, 4.42586456344531, + 4.47805869404119, 4.48139498010822, 4.5332554820974, 4.53025282463707, + 4.58244695523295, 4.58511598408658, 4.63697648607575, 4.63464108582883, + 4.68683521642471, 4.68883698806493, 4.74069749005411, 4.73902934702059, + 4.79122347761647, 4.79255799204329, 4.84441849403247, 4.84341760821236, + 4.89561173880824, 4.89627899602164, 4.94813949801082, 4.94780586940412, + 5, 5, 2.52842855648567, 2.50998125097776, 2.56296037329738, + 2.58101518294342, 2.63360180940117, 2.615939495617, 2.66891861793663, + 2.68618843585892, 2.73877506231667, 2.72189774025625, 2.77487686257587, + 2.79136168877443, 2.84394831523218, 2.82785598489549, 2.88083510721511, + 2.89653494168993, 2.94912156814768, 2.93381422953474, 2.98679335185436, + 3.00170819460543, 3.05429482106318, 3.03977247417398, 3.0927515964936, + 3.10688144752094, 3.15946807397869, 3.14573071881323, 3.19870984113285, + 3.21205470043644, 3.26464132689419, 3.25168896345247, 3.30466808577209, + 3.31722795335194, 3.3698145798097, 3.35764720809171, 3.41062633041134, + 3.42240120626745, 3.4749878327252, 3.46360545273096, 3.51658457505058, + 3.52757445918295, 3.5801610856407, 3.5695636973702, 3.62254281968982, + 3.63274771209845, 3.68533433855621, 3.67552194200945, 3.72850106432907, + 3.73792096501396, 3.79050759147171, 3.78148018664869, 3.83445930896831, + 3.84309421792946, 3.89568084438721, 3.88743843128794, 3.94041755360756, + 3.94826747084497, 4.00085409730272, 3.99339667592718, 4.0463757982468, + 4.05344072376047, 4.10602735021822, 4.09935492056642, 4.15233404288605, + 4.15861397667597, 4.21120060313372, 4.20531316520567, 4.25829228752529, + 4.26378722959148, 4.31637385604923, 4.31127140984491, 4.36425053216453, + 4.36896048250698, 4.42154710896473, 4.41722965448416, 4.47020877680378, + 4.47413373542248, 4.52672036188023, 4.5231878991234, 4.57616702144302, + 4.57930698833799, 4.63189361479574, 4.62914614376264, 4.68212526608227, + 4.68448024125349, 4.73706686771124, 4.73510438840189, 4.78808351072151, + 4.78965349416899, 4.84224012062675, 4.84106263304113, 4.89404175536076, + 4.8948267470845, 4.94741337354225, 4.94702087768038, 5, 5, + 2.48880897355726, 2.46763669613675, 2.52151676643171, 2.54223856986455, + 2.59566816617184, 2.57539683672668, 2.62927690702164, 2.64909776247913, + 2.70252735878643, 2.6831569773166, 2.73703704761157, 2.75595695509372, + 2.80938655140101, 2.79091711790653, 2.84479718820149, 2.8628161477083, + 2.91624574401559, 2.89867725849645, 2.95255732879142, 2.96967534032289, + 3.02310493663018, 3.00643739908638, 3.06031746938134, 3.07653453293747, + 3.12996412924476, 3.1141975396763, 3.16807760997127, 3.18339372555206, + 3.23682332185935, 3.22195768026623, 3.27583775056119, 3.29025291816664, + 3.34368251447393, 3.32971782085616, 3.38359789115112, 3.39711211078123, + 3.45054170708852, 3.43747796144608, 3.49135803174104, 3.50397130339581, + 3.5574008997031, 3.54523810203601, 3.59911817233097, 3.6108304960104, + 3.66426009231769, 3.65299824262593, 3.70687831292089, 3.71768968862498, + 3.77111928493227, 3.76075838321586, 3.81463845351082, 3.82454888123957, + 3.87797847754686, 3.86851852380578, 3.92239859410075, 3.93140807385415, + 3.98483767016144, 3.97627866439571, 4.03015873469067, 4.03826726646874, + 4.09169686277603, 4.08403880498563, 4.1379188752806, 4.14512645908332, + 4.19855605539061, 4.19179894557556, 4.24567901587052, 4.25198565169791, + 4.3054152480052, 4.29955908616548, 4.35343915646045, 4.35884484431249, + 4.41227444061978, 4.40731922675541, 4.46119929705037, 4.46570403692708, + 4.51913363323437, 4.51507936734534, 4.5689594376403, 4.57256322954166, + 4.62599282584895, 4.62283950793526, 4.67671957823022, 4.67942242215625, + 4.73285201846354, 4.73059964852519, 4.78447971882015, 4.78628161477083, + 4.83971121107812, 4.83835978911511, 4.89223985941007, 4.89314080738542, + 4.94657040369271, 4.94611992970504, 5, 5, 2.44378740882173, + 2.41993812150671, 2.47483305509168, 2.4981749107617, 2.55256241270166, + 2.52972798867664, 2.5846229222616, 2.60694991464162, 2.66133741658158, + 2.63951785584657, 2.69441278943153, 2.71572491852155, 2.77011242046151, + 2.74930772301649, 2.80420265660146, 2.82449992240147, 2.87888742434144, + 2.85909759018642, 2.91399252377138, 2.9332749262814, 2.98766242822136, + 2.96888745735635, 3.02378239094131, 3.04204993016133, 3.09643743210129, + 3.07867732452627, 3.13357225811124, 3.15082493404125, 3.20521243598122, + 3.1884671916962, 3.24336212528117, 3.25959993792118, 3.31398743986114, + 3.29825705886613, 3.35315199245109, 3.36837494180111, 3.42276244374107, + 3.40804692603606, 3.46294185962102, 3.47714994568103, 3.53153744762099, + 3.51783679320598, 3.57273172679095, 3.58592494956096, 3.64031245150092, + 3.62762666037591, 3.68252159396087, 3.69469995344088, 3.74908745538085, + 3.73741652754584, 3.7923114611308, 3.80347495732081, 3.85786245926077, + 3.84720639471576, 3.90210132830073, 3.91224996120074, 3.9666374631407, + 3.95699626188569, 4.01189119547066, 4.02102496508066, 4.07541246702063, + 4.06678612905562, 4.12168106264058, 4.12979996896059, 4.18418747090055, + 4.17657599622555, 4.23147092981051, 4.23857497284052, 4.29296247478048, + 4.28636586339547, 4.34126079698044, 4.34734997672044, 4.40173747866041, + 4.3961557305654, 4.45105066415036, 4.45612498060037, 4.51051248254033, + 4.50594559773533, 4.56084053132029, 4.5648999844803, 4.61928748642026, + 4.61573546490525, 4.67063039849022, 4.67367498836022, 4.72806249030018, + 4.72552533207518, 4.78042026566015, 4.78244999224015, 4.83683749418011, + 4.83531519924511, 4.89021013283007, 4.89122499612007, 4.94561249806004, + 4.94510506641504, 5, 5, 2.39346585060369, 2.36699357970066, + 2.42301499289852, 2.4489240239951, 2.50438219738651, 2.47903640609638, + 2.53505781929423, 2.55984037077792, 2.61529854416933, 2.59107923249209, + 2.64710064568995, 2.67075671756074, 2.72621489095215, 2.70312205888781, + 2.75914347208567, 2.78167306434356, 2.83713123773497, 2.81516488528353, + 2.87118629848138, 2.89258941112638, 2.94804758451779, 2.92720771167924, + 2.9832291248771, 3.00350575790921, 3.05896393130062, 3.03925053807496, + 3.09527195127282, 3.11442210469203, 3.16988027808344, 3.15129336447068, + 3.20731477766853, 3.22533845147485, 3.28079662486626, 3.26333619086639, + 3.31935760406425, 3.33625479825767, 3.39171297164908, 3.37537901726211, + 3.43140043045997, 3.44717114504049, 3.5026293184319, 3.48742184365783, + 3.54344325685568, 3.55808749182332, 3.61354566521473, 3.59946467005354, + 3.6554860832514, 3.66900383860614, 3.72446201199755, 3.71150749644926, + 3.76752890964712, 3.77992018538896, 3.83537835878037, 3.82355032284498, + 3.87957173604283, 3.89083653217178, 3.94629470556319, 3.93559314924069, + 3.99161456243855, 4.0017528789546, 4.05721105234601, 4.04763597563641, + 4.10365738883427, 4.11266922573742, 4.16812739912884, 4.15967880203213, + 4.21570021522998, 4.22358557252025, 4.27904374591166, 4.27172162842784, + 4.3277430416257, 4.33450191930307, 4.38996009269448, 4.38376445482356, + 4.43978586802142, 4.44541826608589, 4.5008764394773, 4.49580728121928, + 4.55182869441713, 4.55633461286871, 4.61179278626012, 4.60785010761499, + 4.66387152081285, 4.66725095965153, 4.72270913304295, 4.71989293401071, + 4.77591434720857, 4.77816730643436, 4.83362547982577, 4.83193576040643, + 4.88795717360428, 4.88908365321718, 4.94454182660859, 4.94397858680214, + 5, 5, 2.3379582934176, 2.30892300713455, 2.36617996442956, + 2.39459747866404, 2.45123666391047, 2.42343692172457, 2.48069387901958, + 2.50787584915691, 2.56451503440334, 2.53795083631459, 2.5952077936096, + 2.62115421964977, 2.67779340489621, 2.65246475090461, 2.70972170819962, + 2.73443259014264, 2.79107177538908, 2.76697866549463, 2.82423562278964, + 2.84771096063551, 2.90435014588194, 2.88149258008465, 2.93874953737966, + 2.96098933112838, 3.01762851637481, 2.99600649467466, 3.05326345196967, + 3.07426770162125, 3.13090688686768, 3.11052040926468, 3.16777736655969, + 3.18754607211411, 3.24418525736055, 3.2250343238547, 3.28229128114971, + 3.30082444260698, 3.35746362785342, 3.33954823844472, 3.39680519573973, + 3.41410281309985, 3.47074199834628, 3.45406215303474, 3.51131911032975, + 3.52738118359272, 3.58402036883915, 3.56857606762476, 3.62583302491977, + 3.64065955408559, 3.69729873933202, 3.68308998221478, 3.74034693950979, + 3.75393792457845, 3.81057710982489, 3.7976038968048, 3.85486085409981, + 3.86721629507132, 3.92385548031775, 3.91211781139482, 3.96937476868983, + 3.98049466556419, 4.03713385081062, 4.02663172598484, 4.08388868327985, + 4.09377303605706, 4.15041222130349, 4.14114564057486, 4.19840259786987, + 4.20705140654993, 4.26369059179636, 4.25565955516488, 4.31291651245988, + 4.32032977704279, 4.37696896228923, 4.37017346975489, 4.4274304270499, + 4.43360814753566, 4.4902473327821, 4.48468738434491, 4.54194434163992, + 4.54688651802853, 4.60352570327496, 4.59920129893493, 4.65645825622994, + 4.6601648885214, 4.71680407376783, 4.71371521352495, 4.77097217081996, + 4.77344325901426, 4.8300824442607, 4.82822912811497, 4.88548608540998, + 4.88672162950713, 4.94336081475357, 4.94274304270499, 5, 5, + 2.27739047973363, 2.24585795233272, 2.30445671930436, 2.33531834186696, + 2.39324620400029, 2.363055486276, 2.42165425324765, 2.45117406613361, + 2.50910192826694, 2.48025302021929, 2.53885178719094, 2.56702979040027, + 2.62495765253359, 2.59745055416258, 2.65604932113423, 2.68288551466692, + 2.74081337680025, 2.71464808810587, 2.77324685507751, 2.79874123893357, + 2.8566691010669, 2.83184562204916, 2.8904443890208, 2.91459696320023, + 2.97252482533356, 2.94904315599245, 3.00764192296409, 3.03045268746688, + 3.08838054960021, 3.06624068993574, 3.12483945690738, 3.14630841173354, + 3.20423627386686, 3.18343822387903, 3.24203699085067, 3.26216413600019, + 3.32009199813352, 3.30063575782231, 3.35923452479396, 3.37801986026684, + 3.43594772240017, 3.4178332917656, 3.47643205873725, 3.4938755845335, + 3.55180344666683, 3.53503082570889, 3.59362959268054, 3.60973130880015, + 3.66765917093348, 3.65222835965218, 3.71082712662382, 3.72558703306681, + 3.78351489520013, 3.76942589359547, 3.82802466056711, 3.84144275733346, + 3.89937061946679, 3.88662342753876, 3.9452221945104, 3.95729848160011, + 4.01522634373344, 4.00382096148205, 4.06241972845369, 4.07315420586677, + 4.1310820680001, 4.12101849542533, 4.17961726239698, 4.18900993013342, + 4.24693779226675, 4.23821602936862, 4.29681479634027, 4.30486565440008, + 4.3627935165334, 4.35541356331191, 4.41401233028356, 4.42072137866673, + 4.47864924080006, 4.4726110972552, 4.53120986422685, 4.53657710293338, + 4.59450496506671, 4.58980863119849, 4.64840739817013, 4.65243282720004, + 4.71036068933337, 4.70700616514178, 4.76560493211342, 4.76828855146669, + 4.82621641360002, 4.82420369908507, 4.88280246605671, 4.88414427573335, + 4.94207213786667, 4.94140123302836, 5, 5, 2.21189961513043, + 2.17794127792815, 2.23798508052542, 2.27122089991489, 2.33054218469935, + 2.29802888312269, 2.35807268571997, 2.38986346948381, 2.44918475426827, + 2.41811648831724, 2.47816029091451, 2.50850603905273, 2.56782732383718, + 2.53820409351179, 2.59824789610906, 2.62714860862164, 2.6864698934061, + 2.65829169870633, 2.71833550130361, 2.74579117819056, 2.80511246297502, + 2.77837930390088, 2.83842310649815, 2.86443374775948, 2.92375503254394, + 2.89846690909543, 2.9585107116927, 2.9830763173284, 3.04239760211286, + 3.01855451428998, 3.07859831688725, 3.10171888689731, 3.16104017168177, + 3.13864211948452, 3.1986859220818, 3.22036145646623, 3.27968274125069, + 3.25872972467907, 3.31877352727634, 3.33900402603515, 3.39832531081961, + 3.37881732987362, 3.43886113247089, 3.45764659560407, 3.51696788038853, + 3.49890493506816, 3.55894873766544, 3.57628916517299, 3.63561044995744, + 3.61899254026271, 3.67903634285998, 3.6949317347419, 3.75425301952636, + 3.73908014545726, 3.79912394805453, 3.81357430431082, 3.87289558909528, + 3.8591677506518, 3.91921155324908, 3.93221687387974, 3.9915381586642, + 3.97925535584635, 4.03929915844362, 4.05085944344866, 4.11018072823312, + 4.0993429610409, 4.15938676363817, 4.16950201301758, 4.22882329780203, + 4.21943056623545, 4.27947436883272, 4.28814458258649, 4.34746586737095, + 4.33951817142999, 4.39956197402727, 4.40678715215541, 4.46610843693987, + 4.45960577662454, 4.51964957922181, 4.52542972172433, 4.58475100650879, + 4.57969338181909, 4.63973718441636, 4.64407229129325, 4.70339357607771, + 4.69978098701363, 4.75982478961091, 4.76271486086216, 4.82203614564662, + 4.81986859220818, 4.87991239480545, 4.88135743043108, 4.94067871521554, + 4.93995619740273, 5, 5, 2.14163405748041, 2.10532683703268, + 2.16691562773411, 2.20245035412977, 2.26326665077912, 2.22850441843554, + 2.29009320913698, 2.32408294742847, 2.38489924407782, 2.35168199983841, + 2.41327079053984, 2.44571554072718, 2.50653183737653, 2.47485958124127, + 2.53644837194271, 2.56734813402588, 2.62816443067524, 2.59803716264414, + 2.65962595334557, 2.68898072732459, 2.74979702397394, 2.721214744047, + 2.78280353474844, 2.8106133206233, 2.87142961727265, 2.84439232544987, + 2.9059811161513, 2.932245913922, 2.99306221057135, 2.96756990685273, + 3.02915869755417, 3.05387850722071, 3.11469480387006, 3.0907474882556, + 3.15233627895703, 3.17551110051941, 3.23632739716877, 3.21392506965846, + 3.27551386035989, 3.29714369381812, 3.35795999046747, 3.33710265106133, + 3.39869144176276, 3.41877628711682, 3.47959258376618, 3.46028023246419, + 3.52186902316562, 3.54040888041553, 3.60122517706488, 3.58345781386706, + 3.64504660456849, 3.66204147371424, 3.72285777036359, 3.70663539526992, + 3.76822418597135, 3.78367406701294, 3.84449036366229, 3.82981297667279, + 3.89140176737422, 3.90530666031165, 3.966122956961, 3.95299055807565, + 4.01457934877708, 4.02693925361035, 4.08775555025971, 4.07616813947851, + 4.13775693017995, 4.14857184690906, 4.20938814355841, 4.19934572088138, + 4.26093451158281, 4.27020444020777, 4.33102073685712, 4.32252330228424, + 4.38411209298568, 4.39183703350647, 4.45265333015582, 4.44570088368711, + 4.50728967438854, 4.51346962680518, 4.57428592345453, 4.56887846508997, + 4.63046725579141, 4.63510222010388, 4.69591851675324, 4.69205604649284, + 4.75364483719427, 4.75673481340259, 4.81755111005194, 4.8152336278957, + 4.87682241859714, 4.87836740670129, 4.93918370335065, 4.93841120929857, + 5, 5, 2.06675298087145, 2.02817912471022, 2.09140935609936, + 2.12916249191674, 2.19157200296202, 2.1546395874885, 2.21786981887765, + 2.25398151400731, 2.3163910250526, 2.28110005026679, 2.34433028165594, + 2.37880053609789, 2.44121004714318, 2.40756051304508, 2.47079074443423, + 2.50361955818847, 2.56602906923375, 2.53402097582337, 2.59725120721251, + 2.62843858027904, 2.69084809132433, 2.66048143860166, 2.7237116699908, + 2.75325760236962, 2.81566711341491, 2.78694190137995, 2.85017213276909, + 2.8780766244602, 2.94048613550548, 2.91340236415824, 2.97663259554738, + 3.00289564655077, 3.06530515759606, 3.03986282693652, 3.10309305832567, + 3.12771466864135, 3.19012417968664, 3.16632328971481, 3.22955352110396, + 3.25253369073193, 3.31494320177721, 3.2927837524931, 3.35601398388225, + 3.3773527128225, 3.43976222386779, 3.41924421527139, 3.48247444666054, + 3.50217173491308, 3.56458124595837, 3.54570467804968, 3.60893490943882, + 3.62699075700366, 3.68940026804894, 3.67216514082797, 3.73539537221711, + 3.75180977909423, 3.81421929013952, 3.79862560360626, 3.8618558349954, + 3.87662880118481, 3.9390383122301, 3.92508606638455, 3.98831629777369, + 4.00144782327539, 4.06385733432067, 4.05154652916283, 4.11477676055198, + 4.12626684536596, 4.18867635641125, 4.17800699194112, 4.24123722333027, + 4.25108586745654, 4.31349537850183, 4.30446745471941, 4.36769768610856, + 4.37590488954712, 4.4383144005924, 4.4309279174977, 4.49415814888685, + 4.50072391163769, 4.56313342268298, 4.55738838027599, 4.62061861166513, + 4.62554293372827, 4.68795244477356, 4.68384884305428, 4.74707907444342, + 4.75036195581885, 4.81277146686413, 4.81030930583257, 4.87353953722171, + 4.87518097790942, 4.93759048895471, 4.93676976861086, 5, 5, + 1.98742601502635, 1.94667290534249, 2.0116373116118, 2.05152333385558, + 2.11562065268481, 2.07660171788111, 2.14156612415042, 2.17971797151403, + 2.24381529034326, 2.20653053041973, 2.27149493668903, 2.30791260917249, + 2.37200992800171, 2.33645934295834, 2.40142374922765, 2.43610724683094, + 2.50020456566017, 2.46638815549696, 2.53135256176627, 2.56430188448939, + 2.62839920331862, 2.59631696803558, 2.66128137430489, 2.69249652214785, + 2.75659384097707, 2.7262457805742, 2.7912101868435, 2.8206911598063, + 2.88478847863552, 2.85617459311281, 2.92113899938212, 2.94888579746475, + 3.01298311629398, 2.98610340565143, 3.05106781192074, 3.0770804351232, + 3.14117775395243, 3.11603221819005, 3.18099662445936, 3.20527507278166, + 3.26937239161088, 3.24596103072867, 3.31092543699797, 3.33346971044011, + 3.39756702926934, 3.37588984326728, 3.44085424953659, 3.46166434809856, + 3.52576166692779, 3.5058186558059, 3.57078306207521, 3.58985898575702, + 3.65395630458624, 3.63574746834452, 3.70071187461383, 3.71805362341547, + 3.7821509422447, 3.76567628088313, 3.83064068715244, 3.84624826107392, + 3.91034557990315, 3.89560509342175, 3.96056949969106, 3.97444289873238, + 4.0385402175616, 4.02553390596037, 4.09049831222968, 4.10263753639083, + 4.16673485522005, 4.15546271849899, 4.2204271247683, 4.23083217404928, + 4.29492949287851, 4.2853915310376, 4.35035593730691, 4.35902681170773, + 4.42312413053696, 4.41532034357622, 4.48028474984553, 4.48722144936619, + 4.55131876819542, 4.54524915611484, 4.61021356238415, 4.61541608702464, + 4.67951340585387, 4.67517796865346, 4.74014237492277, 4.74361072468309, + 4.80770804351232, 4.80510678119207, 4.87007118746138, 4.87180536234155, + 4.93590268117077, 4.93503559373069, 5, 5, 1.90067629538045, + 1.85467968541841, 1.91515394098333, 1.96339562629757, 2.02611495721468, + 1.97562819654825, 2.03610245211317, 2.0888342881318, 2.15155361904891, + 2.0965767076781, 2.15705096324302, 2.21427294996603, 2.27699228088314, + 2.21752521880794, 2.27799947437286, 2.33971161180026, 2.40243094271737, + 2.33847372993778, 2.3989479855027, 2.46515027363448, 2.5278696045516, + 2.45942224106762, 2.51989649663254, 2.59058893546871, 2.65330826638583, + 2.58037075219746, 2.64084500776238, 2.71602759730294, 2.77874692822006, + 2.70131926332731, 2.76179351889223, 2.84146625913717, 2.90418559005429, + 2.82226777445715, 2.88274203002207, 2.9669049209714, 3.02962425188852, + 2.94321628558699, 3.00369054115191, 3.09234358280563, 3.15506291372275, + 3.06416479671683, 3.12463905228175, 3.21778224463986, 3.28050157555698, + 3.18511330784667, 3.24558756341159, 3.34322090647409, 3.40594023739121, + 3.30606181897652, 3.36653607454144, 3.46865956830832, 3.53137889922544, + 3.42701033010636, 3.48748458567128, 3.59409823014255, 3.65681756105967, + 3.5479588412362, 3.60843309680112, 3.71953689197678, 3.7822562228939, + 3.66890735236604, 3.72938160793096, 3.84497555381101, 3.90769488472813, + 3.78985586349588, 3.8503301190608, 3.97041421564524, 4.03313354656236, + 3.91080437462572, 3.97127863019065, 4.09585287747947, 4.15857220839658, + 4.03175288575557, 4.09222714132049, 4.2212915393137, 4.28401087023082, + 4.15270139688541, 4.21317565245033, 4.34673020114793, 4.40944953206504, + 4.27364990801525, 4.33412416358017, 4.47216886298216, 4.53488819389927, + 4.39459841914509, 4.45507267471001, 4.59760752481639, 4.6603268557335, + 4.51554693027493, 4.57602118583986, 4.72304618665062, 4.78576551756773, + 4.63649544140478, 4.6969696969697, 4.84848484848485, 1.80669318731393, + 1.75870668920944, 1.81477547016114, 1.86496470557224, 1.92323622383055, + 1.87084425111284, 1.92691303206455, 1.98150774208886, 2.03977926034717, + 1.98298181301625, 2.03905059396795, 2.09805077860548, 2.15632229686379, + 2.09511937491965, 2.15118815587135, 2.2145938151221, 2.27286533338042, + 2.20725693682305, 2.26332571777475, 2.33113685163873, 2.38940836989704, + 2.31939449872645, 2.37546327967815, 2.44767988815535, 2.50595140641366, + 2.43153206062986, 2.48760084158156, 2.56422292467197, 2.62249444293028, + 2.54366962253326, 2.59973840348496, 2.68076596118859, 2.7390374794469, + 2.65580718443666, 2.71187596538836, 2.79730899770522, 2.85558051596353, + 2.76794474634006, 2.82401352729176, 2.91385203422184, 2.97212355248015, + 2.88008230824346, 2.93615108919517, 3.03039507073846, 3.08866658899677, + 2.99221987014687, 3.04828865109857, 3.14693810725508, 3.20520962551339, + 3.10435743205027, 3.16042621300197, 3.2634811437717, 3.32175266203001, + 3.21649499395367, 3.27256377490537, 3.38002418028833, 3.43829569854664, + 3.32863255585707, 3.38470133680877, 3.49656721680495, 3.55483873506326, + 3.44077011776048, 3.49683889871218, 3.61311025332157, 3.67138177157988, + 3.55290767966388, 3.60897646061558, 3.72965328983819, 3.7879248080965, + 3.66504524156728, 3.72111402251898, 3.84619632635481, 3.90446784461312, + 3.77718280347068, 3.83325158442238, 3.96273936287144, 4.02101088112975, + 3.88932036537408, 3.94538914632579, 4.07928239938806, 4.13755391764637, + 4.00145792727749, 4.05752670822919, 4.19582543590468, 4.25409695416299, + 4.11359548918089, 4.16966427013259, 4.3123684724213, 4.37063999067961, + 4.22573305108429, 4.28180183203599, 4.42891150893792, 4.48718302719623, + 4.33787061298769, 4.39393939393939, 4.54545454545455, 1.70883185717834, + 1.65895702514723, 1.71070068612089, 1.76273807814102, 1.81664429910369, + 1.76244434709454, 1.8141880080682, 1.87055052006637, 1.92445674102905, + 1.86593166904186, 1.91767533001551, 1.97836296199173, 2.03226918295441, + 1.96941899098917, 2.02116265196283, 2.08617540391709, 2.14008162487977, + 2.07290631293648, 2.12464997391014, 2.19398784584245, 2.24789406680512, + 2.1763936348838, 2.22813729585745, 2.3018002877678, 2.35570650873048, + 2.27988095683111, 2.33162461780477, 2.40961272969316, 2.46351895065584, + 2.38336827877842, 2.43511193975208, 2.51742517161852, 2.5713313925812, + 2.48685560072574, 2.53859926169939, 2.62523761354388, 2.67914383450656, + 2.59034292267305, 2.64208658364671, 2.73305005546923, 2.78695627643191, + 2.69383024462036, 2.74557390559402, 2.84086249739459, 2.89476871835727, + 2.79731756656768, 2.84906122754133, 2.94867493931995, 3.00258116028263, + 2.90080488851499, 2.95254854948865, 3.05648738124531, 3.11039360220799, + 3.0042922104623, 3.05603587143596, 3.16429982317067, 3.21820604413334, + 3.10777953240962, 3.15952319338327, 3.27211226509602, 3.3260184860587, + 3.21126685435693, 3.26301051533059, 3.37992470702138, 3.43383092798406, + 3.31475417630424, 3.3664978372779, 3.48773714894674, 3.54164336990942, + 3.41824149825156, 3.46998515922521, 3.5955495908721, 3.64945581183478, + 3.52172882019887, 3.57347248117253, 3.70336203279745, 3.75726825376013, + 3.62521614214618, 3.67695980311984, 3.81117447472281, 3.86508069568549, + 3.7287034640935, 3.78044712506715, 3.91898691664817, 3.97289313761085, + 3.83219078604081, 3.88393444701446, 4.02679935857353, 4.08070557953621, + 3.93567810798812, 3.98742176896178, 4.13461180049889, 4.18851802146156, + 4.03916542993544, 4.09090909090909, 4.24242424242424, 1.60729969108902, + 1.55564235703082, 1.60313674917652, 1.6569187176487, 1.70653774420838, + 1.65063114132222, 1.69812553346792, 1.75615677076806, 1.80577579732774, + 1.74561992561362, 1.79311431775932, 1.85539482388742, 1.9050138504471, + 1.84060870990503, 1.88810310205073, 1.95463287700678, 2.00425190356646, + 1.93559749419643, 1.98309188634213, 2.05387093012614, 2.10348995668581, + 2.03058627848783, 2.07808067063353, 2.15310898324549, 2.20272800980517, + 2.12557506277924, 2.17306945492494, 2.25234703636485, 2.30196606292453, + 2.22056384707064, 2.26805823921634, 2.35158508948421, 2.40120411604389, + 2.31555263136204, 2.36304702350774, 2.45082314260357, 2.50044216916325, + 2.41054141565344, 2.45803580779915, 2.55006119572293, 2.59968022228261, + 2.50553019994485, 2.55302459209055, 2.64929924884228, 2.69891827540196, + 2.60051898423625, 2.64801337638195, 2.74853730196164, 2.79815632852132, + 2.69550776852765, 2.74300216067336, 2.847775355081, 2.89739438164068, + 2.79049655281906, 2.83799094496476, 2.94701340820036, 2.99663243476004, + 2.88548533711046, 2.93297972925616, 3.04625146131972, 3.0958704878794, + 2.98047412140186, 3.02796851354756, 3.14548951443907, 3.19510854099875, + 3.07546290569327, 3.12295729783897, 3.24472756755843, 3.29434659411811, + 3.17045168998467, 3.21794608213037, 3.34396562067779, 3.39358464723747, + 3.26544047427607, 3.31293486642177, 3.44320367379715, 3.49282270035683, + 3.36042925856747, 3.40792365071318, 3.54244172691651, 3.59206075347619, + 3.45541804285888, 3.50291243500458, 3.64167978003587, 3.69129880659554, + 3.55040682715028, 3.59790121929598, 3.74091783315522, 3.7905368597149, + 3.64539561144168, 3.69289000358739, 3.84015588627458, 3.88977491283426, + 3.74038439573309, 3.78787878787879, 3.93939393939394, 1.50231239078543, + 1.44898242454005, 1.49229872369555, 1.54771773643603, 1.59312308208663, + 1.53561502285105, 1.57893132200655, 1.63852842773723, 1.68393377338783, + 1.62224762116205, 1.66556392031755, 1.72933911903844, 1.77474446468904, + 1.70888021947304, 1.75219651862854, 1.82014981033964, 1.86555515599024, + 1.79551281778404, 1.83882911693954, 1.91096050164084, 1.95636584729144, + 1.88214541609504, 1.92546171525054, 2.00177119294204, 2.04717653859264, + 1.96877801440603, 2.01209431356153, 2.09258188424324, 2.13798722989384, + 2.05541061271703, 2.09872691187253, 2.18339257554444, 2.22879792119504, + 2.14204321102803, 2.18535951018353, 2.27420326684564, 2.31960861249624, + 2.22867580933903, 2.27199210849452, 2.36501395814684, 2.41041930379744, + 2.31530840765002, 2.35862470680552, 2.45582464944804, 2.50122999509864, + 2.40194100596102, 2.44525730511652, 2.54663534074924, 2.59204068639984, + 2.48857360427202, 2.53188990342752, 2.63744603205044, 2.68285137770104, + 2.57520620258301, 2.61852250173851, 2.72825672335164, 2.77366206900224, + 2.66183880089401, 2.70515510004951, 2.81906741465284, 2.86447276030344, + 2.74847139920501, 2.79178769836051, 2.90987810595404, 2.95528345160464, + 2.83510399751601, 2.8784202966715, 3.00068879725524, 3.04609414290584, + 2.921736595827, 2.9650528949825, 3.09149948855644, 3.13690483420704, + 3.008369194138, 3.0516854932935, 3.18231017985764, 3.22771552550824, + 3.095001792449, 3.1383180916045, 3.27312087115884, 3.31852621680944, + 3.18163439075999, 3.22495068991549, 3.36393156246004, 3.40933690811064, + 3.26826698907099, 3.31158328822649, 3.45474225376124, 3.50014759941184, + 3.35489958738199, 3.39821588653749, 3.54555294506244, 3.59095829071304, + 3.44153218569299, 3.48484848484848, 3.63636363636364, 1.3940934849973, + 1.33920454545455, 1.37840909090909, 1.43535390730232, 1.47661432960734, + 1.41761363636364, 1.45681818181818, 1.51787475191236, 1.55913517421739, + 1.49602272727273, 1.53522727272727, 1.60039559652241, 1.64165601882743, + 1.57443181818182, 1.61363636363636, 1.68291644113245, 1.72417686343747, + 1.65284090909091, 1.69204545454545, 1.7654372857425, 1.80669770804752, + 1.73125, 1.77045454545455, 1.84795813035254, 1.88921855265756, + 1.80965909090909, 1.84886363636364, 1.93047897496258, 1.97173939726761, + 1.88806818181818, 1.92727272727273, 2.01299981957263, 2.05426024187765, + 1.96647727272727, 2.00568181818182, 2.09552066418267, 2.13678108648769, + 2.04488636363636, 2.08409090909091, 2.17804150879272, 2.21930193109774, + 2.12329545454545, 2.1625, 2.26056235340276, 2.30182277570778, + 2.20170454545455, 2.24090909090909, 2.34308319801281, 2.38434362031783, + 2.28011363636364, 2.31931818181818, 2.42560404262285, 2.46686446492787, + 2.35852272727273, 2.39772727272727, 2.50812488723289, 2.54938530953792, + 2.43693181818182, 2.47613636363636, 2.59064573184294, 2.63190615414796, + 2.51534090909091, 2.55454545454545, 2.67316657645298, 2.714426998758, + 2.59375, 2.63295454545455, 2.75568742106303, 2.79694784336805, + 2.67215909090909, 2.71136363636364, 2.83820826567307, 2.87946868797809, + 2.75056818181818, 2.78977272727273, 2.92072911028311, 2.96198953258814, + 2.82897727272727, 2.86818181818182, 3.00324995489316, 3.04451037719818, + 2.90738636363636, 2.94659090909091, 3.0857707995032, 3.12703122180822, + 2.98579545454545, 3.025, 3.16829164411324, 3.20955206641827, + 3.06420454545455, 3.10340909090909, 3.25081248872329, 3.29207291102831, + 3.14261363636364, 3.18181818181818, 3.33333333333333, 1.28287382308016, + 1.22654310070578, 1.26169724492029, 1.32005316791469, 1.35723251274922, + 1.29685138913481, 1.33200553334932, 1.39441185758375, 1.43159120241828, + 1.36715967756383, 1.40231382177834, 1.46877054725281, 1.50594989208734, + 1.43746796599286, 1.47262211020737, 1.54312923692187, 1.5803085817564, + 1.50777625442188, 1.54293039863639, 1.61748792659092, 1.65466727142545, + 1.57808454285091, 1.61323868706542, 1.69184661625998, 1.72902596109451, + 1.64839283127993, 1.68354697549445, 1.76620530592904, 1.80338465076357, + 1.71870111970896, 1.75385526392347, 1.8405639955981, 1.87774334043263, + 1.78900940813798, 1.8241635523525, 1.91492268526716, 1.95210203010169, + 1.85931769656701, 1.89447184078152, 1.98928137493622, 2.02646071977074, + 1.92962598499603, 1.96478012921055, 2.06364006460527, 2.1008194094398, + 1.99993427342506, 2.03508841763957, 2.13799875427433, 2.17517809910886, + 2.07024256185409, 2.1053967060686, 2.21235744394339, 2.24953678877792, + 2.14055085028311, 2.17570499449762, 2.28671613361245, 2.32389547844698, + 2.21085913871214, 2.24601328292665, 2.36107482328151, 2.39825416811604, + 2.28116742714116, 2.31632157135568, 2.43543351295056, 2.47261285778509, + 2.35147571557019, 2.3866298597847, 2.50979220261962, 2.54697154745415, + 2.42178400399921, 2.45693814821373, 2.58415089228868, 2.62133023712321, + 2.49209229242824, 2.52724643664275, 2.65850958195774, 2.69568892679227, + 2.56240058085726, 2.59755472507178, 2.7328682716268, 2.77004761646133, + 2.63270886928629, 2.6678630135008, 2.80722696129586, 2.84440630613038, + 2.70301715771532, 2.73817130192983, 2.88158565096491, 2.91876499579944, + 2.77332544614434, 2.80847959035885, 2.95594434063397, 2.9931236854685, + 2.84363373457337, 2.87878787878788, 3.03030303030303, 1.16889105206735, + 1.11123900342892, 1.14239897305293, 1.20204810898661, 1.23520516590588, + 1.17355894267695, 1.20471891230096, 1.26836222282514, 1.3015192797444, + 1.23587888192497, 1.26703885154899, 1.33467633666367, 1.36783339358293, + 1.298198821173, 1.32935879079702, 1.40099045050219, 1.43414750742146, + 1.36051876042103, 1.39167873004504, 1.46730456434072, 1.50046162125998, + 1.42283869966906, 1.45399866929307, 1.53361867817925, 1.56677573509851, + 1.48515863891709, 1.5163186085411, 1.59993279201777, 1.63308984893704, + 1.54747857816511, 1.57863854778913, 1.6662469058563, 1.69940396277556, + 1.60979851741314, 1.64095848703716, 1.73256101969483, 1.76571807661409, + 1.67211845666117, 1.70327842628518, 1.79887513353335, 1.83203219045262, + 1.7344383959092, 1.76559836553321, 1.86518924737188, 1.89834630429114, + 1.79675833515723, 1.82791830478124, 1.93150336121041, 1.96466041812967, + 1.85907827440525, 1.89023824402927, 1.99781747504893, 2.0309745319682, + 1.92139821365328, 1.9525581832773, 2.06413158888746, 2.09728864580672, + 1.98371815290131, 2.01487812252532, 2.13044570272599, 2.16360275964525, + 2.04603809214934, 2.07719806177335, 2.19675981656451, 2.22991687348378, + 2.10835803139737, 2.13951800102138, 2.26307393040304, 2.2962309873223, + 2.17067797064539, 2.20183794026941, 2.32938804424157, 2.36254510116083, + 2.23299790989342, 2.26415787951744, 2.39570215808009, 2.42885921499936, + 2.29531784914145, 2.32647781876546, 2.46201627191862, 2.49517332883788, + 2.35763778838948, 2.38879775801349, 2.52833038575715, 2.56148744267641, + 2.41995772763751, 2.45111769726152, 2.59464449959567, 2.62780155651494, + 2.48227766688553, 2.51343763650955, 2.6609586134342, 2.69411567035346, + 2.54459760613356, 2.57575757575758, 2.72727272727273, 1.05238907832299, + 0.993539153217069, 1.02075592171729, 1.08157744738511, 1.11076581644722, + 1.0479726902175, 1.07518945871772, 1.13995418550934, 1.16914255457146, + 1.10240622721794, 1.12962299571815, 1.19833092363357, 1.22751929269569, + 1.15683976421837, 1.18405653271859, 1.2567076617578, 1.28589603081992, + 1.21127330121881, 1.23849006971902, 1.31508439988203, 1.34427276894415, + 1.26570683821924, 1.29292360671946, 1.37346113800626, 1.40264950706838, + 1.32014037521967, 1.34735714371989, 1.4318378761305, 1.46102624519261, + 1.37457391222011, 1.40179068072033, 1.49021461425473, 1.51940298331684, + 1.42900744922054, 1.45622421772076, 1.54859135237896, 1.57777972144107, + 1.48344098622098, 1.51065775472119, 1.60696809050319, 1.6361564595653, + 1.53787452322141, 1.56509129172163, 1.66534482862742, 1.69453319768954, + 1.59230806022185, 1.61952482872206, 1.72372156675165, 1.75290993581377, + 1.64674159722228, 1.6739583657225, 1.78209830487588, 1.811286673938, + 1.70117513422271, 1.72839190272293, 1.84047504300011, 1.86966341206223, + 1.75560867122315, 1.78282543972337, 1.89885178112434, 1.92804015018646, + 1.81004220822358, 1.8372589767238, 1.95722851924858, 1.98641688831069, + 1.86447574522402, 1.89169251372423, 2.01560525737281, 2.04479362643492, + 1.91890928222445, 1.94612605072467, 2.07398199549704, 2.10317036455915, + 1.97334281922489, 2.0005595877251, 2.13235873362127, 2.16154710268339, + 2.02777635622532, 2.05499312472554, 2.1907354717455, 2.21992384080762, + 2.08220989322575, 2.10942666172597, 2.24911220986973, 2.27830057893185, + 2.13664343022619, 2.1638601987264, 2.30748894799396, 2.33667731705608, + 2.19107696722662, 2.21829373572684, 2.36586568611819, 2.39505405518031, + 2.24551050422706, 2.27272727272727, 2.42424242424242, 0.933617515015679, + 0.87369587681429, 0.897015049003283, 0.958885485360284, 0.98415345570489, + 0.920334221192276, 0.943653393381269, 1.00942142604949, 1.0346893963941, + 0.966972565570262, 0.990291737759256, 1.0599573667387, 1.08522533708331, + 1.01361090994825, 1.03693008213724, 1.11049330742792, 1.13576127777252, + 1.06024925432624, 1.08356842651523, 1.16102924811713, 1.18629721846173, + 1.10688759870422, 1.13020677089321, 1.21156518880634, 1.23683315915094, + 1.15352594308221, 1.1768451152712, 1.26210112949555, 1.28736909984015, + 1.20016428746019, 1.22348345964919, 1.31263707018476, 1.33790504052936, + 1.24680263183818, 1.27012180402717, 1.36317301087397, 1.38844098121857, + 1.29344097621617, 1.31676014840516, 1.41370895156318, 1.43897692190778, + 1.34007932059415, 1.36339849278315, 1.46424489225239, 1.48951286259699, + 1.38671766497214, 1.41003683716113, 1.5147808329416, 1.5400488032862, + 1.43335600935013, 1.45667518153912, 1.56531677363081, 1.59058474397541, + 1.47999435372811, 1.50331352591711, 1.61585271432002, 1.64112068466462, + 1.5266326981061, 1.54995187029509, 1.66638865500923, 1.69165662535383, + 1.57327104248409, 1.59659021467308, 1.71692459569844, 1.74219256604304, + 1.61990938686207, 1.64322855905107, 1.76746053638765, 1.79272850673225, + 1.66654773124006, 1.68986690342905, 1.81799647707686, 1.84326444742147, + 1.71318607561804, 1.73650524780704, 1.86853241776607, 1.89380038811068, + 1.75982441999603, 1.78314359218502, 1.91906835845528, 1.94433632879989, + 1.80646276437402, 1.82978193656301, 1.96960429914449, 1.9948722694891, + 1.853101108752, 1.876420280941, 2.0201402398337, 2.04540821017831, + 1.89973945312999, 1.92305862531898, 2.07067618052291, 2.09594415086752, + 1.94637779750798, 1.96969696969697, 2.12121212121212, 0.812831116664326, + 0.751966356514362, 0.771428065241007, 0.834221557122145, + 0.855611997579964, 0.790889773967652, 0.810351482694296, + 0.877002438037783, 0.898392878495602, 0.829813191420941, + 0.849274900147586, 0.919783318953421, 0.94117375941124, + 0.868736608874231, 0.888198317600876, 0.962564199869059, + 0.983954640326878, 0.90766002632752, 0.927121735054165, 1.0053450807847, + 1.02673552124252, 0.94658344378081, 0.966045152507455, 1.04812596170033, + 1.06951640215815, 0.985506861234099, 1.00496856996074, 1.09090684261597, + 1.11229728307379, 1.02443027868739, 1.04389198741403, 1.13368772353161, + 1.15507816398943, 1.06335369614068, 1.08281540486732, 1.17646860444725, + 1.19785904490507, 1.10227711359397, 1.12173882232061, 1.21924948536289, + 1.24063992582071, 1.14120053104726, 1.1606622397739, 1.26203036627852, + 1.28342080673634, 1.18012394850055, 1.19958565722719, 1.30481124719416, + 1.32620168765198, 1.21904736595384, 1.23850907468048, 1.3475921281098, + 1.36898256856762, 1.25797078340713, 1.27743249213377, 1.39037300902544, + 1.41176344948326, 1.29689420086042, 1.31635590958706, 1.43315388994108, + 1.4545443303989, 1.33581761831371, 1.35527932704035, 1.47593477085671, + 1.49732521131453, 1.374741035767, 1.39420274449364, 1.51871565177235, + 1.54010609223017, 1.41366445322028, 1.43312616194693, 1.56149653268799, + 1.58288697314581, 1.45258787067357, 1.47204957940022, 1.60427741360363, + 1.62566785406145, 1.49151128812686, 1.51097299685351, 1.64705829451927, + 1.66844873497709, 1.53043470558015, 1.5498964143068, 1.6898391754349, + 1.71122961589272, 1.56935812303344, 1.58881983176009, 1.73262005635054, + 1.75401049680836, 1.60828154048673, 1.62774324921338, 1.77540093726618, + 1.796791377724, 1.64720495794002, 1.66666666666667, 1.81818181818182, + 0.690289202037268, 0.628612047560175, 0.644250862795838, + 0.707839464018422, 0.725389725999577, 0.659889678031502, + 0.675528493267165, 0.742939987980731, 0.760490249961885, + 0.691167308502829, 0.706806123738493, 0.778040511943039, + 0.795590773924193, 0.722444938974156, 0.73808375420982, + 0.813141035905348, 0.830691297886502, 0.753722569445483, + 0.769361384681147, 0.848241559867656, 0.86579182184881, + 0.785000199916811, 0.800639015152474, 0.883342083829964, + 0.900892345811119, 0.816277830388138, 0.831916645623801, + 0.918442607792273, 0.935992869773427, 0.847555460859465, + 0.863194276095129, 0.953543131754581, 0.971093393735735, + 0.878833091330792, 0.894471906566456, 0.98864365571689, 1.00619391769804, + 0.910110721802119, 0.925749537037783, 1.0237441796792, 1.04129444166035, + 0.941388352273447, 0.95702716750911, 1.05884470364151, 1.07639496562266, + 0.972665982744774, 0.988304797980438, 1.09394522760381, 1.11149548958497, + 1.0039436132161, 1.01958242845176, 1.12904575156612, 1.14659601354728, + 1.03522124368743, 1.05086005892309, 1.16414627552843, 1.18169653750959, + 1.06649887415876, 1.08213768939442, 1.19924679949074, 1.21679706147189, + 1.09777650463008, 1.11341531986575, 1.23434732345305, 1.2518975854342, + 1.12905413510141, 1.14469295033707, 1.26944784741536, 1.28699810939651, + 1.16033176557274, 1.1759705808084, 1.30454837137767, 1.32209863335882, + 1.19160939604406, 1.20724821127973, 1.33964889533997, 1.35719915732113, + 1.22288702651539, 1.23852584175106, 1.37474941930228, 1.39229968128344, + 1.25416465698672, 1.26980347222238, 1.40984994326459, 1.42740020524574, + 1.28544228745805, 1.30108110269371, 1.4449504672269, 1.46250072920805, + 1.31671991792937, 1.33235873316504, 1.48005099118921, 1.49760125317036, + 1.3479975484007, 1.36363636363636, 1.51515151515152, 0.566255066711839, + 0.503898085863504, 0.515742936389941, 0.57999689959289, 0.59373873247394, + 0.527587786916379, 0.539432637442816, 0.607480565354991, + 0.621222398236041, 0.551277487969253, 0.563122338495691, + 0.634964231117092, 0.648706063998142, 0.574967189022128, + 0.586812039548566, 0.662447896879193, 0.676189729760243, + 0.598656890075003, 0.61050174060144, 0.689931562641294, + 0.703673395522344, 0.622346591127878, 0.634191441654315, + 0.717415228403395, 0.731157061284445, 0.646036292180752, + 0.65788114270719, 0.744898894165496, 0.758640727046546, + 0.669725993233627, 0.681570843760064, 0.772382559927597, + 0.786124392808647, 0.693415694286502, 0.705260544812939, + 0.799866225689698, 0.813608058570748, 0.717105395339377, + 0.728950245865814, 0.827349891451798, 0.841091724332849, + 0.740795096392251, 0.752639946918689, 0.8548335572139, 0.86857539009495, + 0.764484797445126, 0.776329647971564, 0.882317222976001, + 0.896059055857051, 0.788174498498001, 0.800019349024438, + 0.909800888738101, 0.923542721619152, 0.811864199550876, + 0.823709050077313, 0.937284554500203, 0.951026387381253, + 0.83555390060375, 0.847398751130188, 0.964768220262304, + 0.978510053143354, 0.859243601656625, 0.871088452183063, + 0.992251886024405, 1.00599371890546, 0.8829333027095, 0.894778153235937, + 1.01973555178651, 1.03347738466756, 0.906623003762375, 0.918467854288812, + 1.04721921754861, 1.06096105042966, 0.930312704815249, 0.942157555341687, + 1.07470288331071, 1.08844471619176, 0.954002405868124, 0.965847256394562, + 1.10218654907281, 1.11592838195386, 0.977692106920999, 0.989536957447436, + 1.12967021483491, 1.14341204771596, 1.00138180797387, 1.01322665850031, + 1.15715388059701, 1.17089571347806, 1.02507150902675, 1.03691635955319, + 1.18463754635911, 1.19837937924016, 1.04876121007962, 1.06060606060606, + 1.21212121212121, 0.440995386625202, 0.3780926873869, 0.386166795263259, + 0.4509548658266, 0.460914345027998, 0.394240903139617, 0.402315011015976, + 0.470873824229396, 0.480833303430794, 0.410389118892335, + 0.418463226768693, 0.490792782632192, 0.50075226183359, + 0.426537334645052, 0.434611442521411, 0.510711741034988, + 0.520671220236386, 0.442685550397769, 0.450759658274128, + 0.530630699437784, 0.540590178639182, 0.458833766150487, + 0.466907874026845, 0.55054965784058, 0.560509137041978, + 0.474981981903204, 0.483056089779563, 0.570468616243376, + 0.580428095444774, 0.491130197655921, 0.49920430553228, + 0.590387574646172, 0.60034705384757, 0.507278413408639, + 0.515352521284997, 0.610306533048968, 0.620266012250366, + 0.523426629161356, 0.531500737037715, 0.630225491451764, + 0.640184970653162, 0.539574844914074, 0.547648952790432, + 0.650144449854561, 0.660103929055958, 0.555723060666791, + 0.56379716854315, 0.670063408257357, 0.680022887458755, + 0.571871276419508, 0.579945384295867, 0.689982366660153, + 0.699941845861551, 0.588019492172226, 0.596093600048584, + 0.709901325062949, 0.719860804264347, 0.604167707924943, + 0.612241815801302, 0.729820283465745, 0.739779762667143, + 0.62031592367766, 0.628390031554019, 0.749739241868541, + 0.759698721069939, 0.636464139430378, 0.644538247306736, + 0.769658200271337, 0.779617679472735, 0.652612355183095, + 0.660686463059454, 0.789577158674133, 0.799536637875531, + 0.668760570935812, 0.676834678812171, 0.809496117076929, + 0.819455596278327, 0.68490878668853, 0.692982894564888, + 0.829415075479725, 0.839374554681123, 0.701057002441247, + 0.709131110317606, 0.849334033882521, 0.859293513083919, + 0.717205218193964, 0.725279326070323, 0.869252992285317, + 0.879212471486715, 0.733353433946682, 0.74142754182304, + 0.889171950688113, 0.899131429889511, 0.749501649699399, + 0.757575757575758, 0.909090909090909, 0.314779613967581, + 0.251466540548262, 0.255787368505649, 0.320977081884454, + 0.327174549801327, 0.260108196463036, 0.264429024420423, 0.3333720177182, + 0.339569485635072, 0.26874985237781, 0.273070680335197, + 0.345766953551945, 0.351964421468818, 0.277391508292584, + 0.281712336249971, 0.358161889385691, 0.364359357302564, + 0.286033164207358, 0.290353992164746, 0.370556825219437, + 0.37675429313631, 0.294674820122133, 0.29899564807952, 0.382951761053183, + 0.389149228970055, 0.303316476036907, 0.307637303994294, + 0.395346696886928, 0.401544164803801, 0.311958131951681, + 0.316278959909068, 0.407741632720674, 0.413939100637547, + 0.320599787866455, 0.324920615823842, 0.42013656855442, + 0.426334036471293, 0.329241443781229, 0.333562271738617, + 0.432531504388166, 0.438728972305039, 0.337883099696004, + 0.342203927653391, 0.444926440221911, 0.451123908138784, + 0.346524755610778, 0.350845583568165, 0.457321376055657, + 0.46351884397253, 0.355166411525552, 0.359487239482939, + 0.469716311889403, 0.475913779806276, 0.363808067440326, + 0.368128895397713, 0.482111247723149, 0.488308715640022, 0.3724497233551, + 0.376770551312487, 0.494506183556895, 0.500703651473767, + 0.381091379269874, 0.385412207227262, 0.50690111939064, + 0.513098587307513, 0.389733035184649, 0.394053863142036, + 0.519296055224386, 0.525493523141259, 0.398374691099423, + 0.40269551905681, 0.531690991058132, 0.537888458975005, + 0.407016347014197, 0.411337174971584, 0.544085926891878, + 0.55028339480875, 0.415658002928971, 0.419978830886358, + 0.556480862725623, 0.562678330642496, 0.424299658843745, + 0.428620486801133, 0.568875798559369, 0.575073266476242, + 0.43294131475852, 0.437262142715907, 0.581270734393115, + 0.587468202309988, 0.441582970673294, 0.445903798630681, + 0.593665670226861, 0.599863138143733, 0.450224626588068, + 0.454545454545455, 0.606060606060606, 0.187879366786386, + 0.12429219302451, 0.124871404907289, 0.190329386706469, + 0.192779406626553, 0.125450616790069, 0.126029828672849, + 0.195229426546636, 0.197679446466719, 0.126609040555628, + 0.127188252438408, 0.200129466386803, 0.202579486306886, + 0.127767464321187, 0.128346676203967, 0.205029506226969, + 0.207479526147053, 0.128925888086747, 0.129505099969526, + 0.209929546067136, 0.212379565987219, 0.130084311852306, + 0.130663523735086, 0.214829585907303, 0.217279605827386, + 0.131242735617865, 0.131821947500645, 0.219729625747469, + 0.222179645667553, 0.132401159383424, 0.132980371266204, + 0.224629665587636, 0.227079685507719, 0.133559583148984, + 0.134138795031763, 0.229529705427803, 0.231979725347886, + 0.134718006914543, 0.135297218797322, 0.234429745267969, + 0.236879765188053, 0.135876430680102, 0.136455642562882, + 0.239329785108136, 0.241779805028219, 0.137034854445661, + 0.137614066328441, 0.244229824948303, 0.246679844868386, + 0.13819327821122, 0.138772490094, 0.24912986478847, 0.251579884708553, + 0.13935170197678, 0.139930913859559, 0.254029904628636, 0.25647992454872, + 0.140510125742339, 0.141089337625118, 0.258929944468803, + 0.261379964388886, 0.141668549507898, 0.142247761390678, + 0.26382998430897, 0.266280004229053, 0.142826973273457, + 0.143406185156237, 0.268730024149136, 0.27118004406922, + 0.143985397039016, 0.144564608921796, 0.273630063989303, + 0.276080083909386, 0.145143820804576, 0.145723032687355, + 0.27853010382947, 0.280980123749553, 0.146302244570135, + 0.146881456452915, 0.283430143669636, 0.28588016358972, + 0.147460668335694, 0.148039880218474, 0.288330183509803, + 0.290780203429886, 0.148619092101253, 0.149198303984033, + 0.29323022334997, 0.295680243270053, 0.149777515866813, + 0.150356727749592, 0.298130263190137, 0.30058028311022, + 0.150935939632372, 0.151515151515151, 0.303030303030303, + 0.0605678136839722, -0.0031565656565655, -0.00631313131313115, + 0.0592791367970791, 0.0579904599101861, -0.00946969696969681, + -0.0126262626262625, 0.0567017830232931, 0.0554131061364001, + -0.0157828282828281, -0.0189393939393938, 0.054124429249507, + 0.052835752362614, -0.0220959595959594, -0.0252525252525251, + 0.051547075475721, 0.050258398588828, -0.0284090909090908, + -0.0315656565656564, 0.0489697217019349, 0.0476810448150419, + -0.0347222222222221, -0.0378787878787877, 0.0463923679281489, + 0.0451036910412559, -0.0410353535353534, -0.044191919191919, + 0.0438150141543628, 0.0425263372674698, -0.0473484848484847, + -0.0505050505050504, 0.0412376603805768, 0.0399489834936838, + -0.053661616161616, -0.0568181818181817, 0.0386603066067908, + 0.0373716297198977, -0.0599747474747473, -0.063131313131313, + 0.0360829528330047, 0.0347942759461117, -0.0662878787878786, + -0.0694444444444443, 0.0335055990592187, 0.0322169221723256, + -0.0726010101010099, -0.0757575757575756, 0.0309282452854326, + 0.0296395683985396, -0.0789141414141413, -0.0820707070707069, + 0.0283508915116466, 0.0270622146247535, -0.0852272727272726, + -0.0883838383838382, 0.0257735377378605, 0.0244848608509675, + -0.0915404040404039, -0.0946969696969696, 0.0231961839640744, + 0.0219075070771814, -0.0978535353535352, -0.101010101010101, + 0.0206188301902884, 0.0193301533033954, -0.104166666666667, + -0.107323232323232, 0.0180414764165023, 0.0167527995296093, + -0.110479797979798, -0.113636363636363, 0.0154641226427163, + 0.0141754457558233, -0.116792929292929, -0.119949494949495, + 0.0128867688689303, 0.0115980919820372, -0.12310606060606, + -0.126262626262626, 0.0103094150951442, 0.00902073820825118, + -0.129419191919192, -0.132575757575757, 0.00773206132135816, + 0.00644338443446513, -0.135732323232323, -0.138888888888889, + 0.00515470754757209, 0.00386603066067907, -0.142045454545454, + -0.14520202020202, 0.00257735377378604, 0.00128867688689302, + -0.148358585858586, -0.151515151515151, 0, -0.0668809449971029, + -0.13060532433764, -0.137497667533551, -0.0719053994233412, + -0.0769298538495795, -0.144390010729462, -0.151282353925373, + -0.0819543082758178, -0.0869787627020561, -0.158174697121284, + -0.165067040317195, -0.0920032171282944, -0.0970276715545327, + -0.171959383513106, -0.178851726709017, -0.102052125980771, + -0.107076580407009, -0.185744069904928, -0.192636413100839, + -0.112101034833248, -0.117125489259486, -0.19952875629675, + -0.206421099492661, -0.122149943685724, -0.127174398111962, + -0.213313442688571, -0.220205785884482, -0.132198852538201, + -0.137223306964439, -0.227098129080393, -0.233990472276304, + -0.142247761390677, -0.147272215816916, -0.240882815472215, + -0.247775158668126, -0.152296670243154, -0.157321124669392, + -0.254667501864037, -0.261559845059948, -0.16234557909563, + -0.167370033521869, -0.268452188255859, -0.27534453145177, + -0.172394487948107, -0.177418942374345, -0.282236874647681, + -0.289129217843592, -0.182443396800584, -0.187467851226822, + -0.296021561039503, -0.302913904235414, -0.19249230565306, + -0.197516760079299, -0.309806247431325, -0.316698590627235, + -0.202541214505537, -0.207565668931775, -0.323590933823146, + -0.330483277019057, -0.212590123358013, -0.217614577784252, + -0.337375620214968, -0.344267963410879, -0.22263903221049, + -0.227663486636728, -0.35116030660679, -0.358052649802701, + -0.232687941062967, -0.237712395489205, -0.364944992998612, + -0.371837336194523, -0.242736849915443, -0.247761304341682, + -0.378729679390434, -0.385622022586345, -0.25278575876792, + -0.257810213194158, -0.392514365782256, -0.399406708978167, + -0.262834667620396, -0.267859122046635, -0.406299052174078, + -0.413191395369989, -0.272883576472873, -0.277908030899111, + -0.420083738565899, -0.42697608176181, -0.28293248532535, + -0.287956939751588, -0.433868424957721, -0.440760768153632, + -0.292981394177826, -0.298005848604064, -0.447653111349543, + -0.454545454545454, -0.303030303030303, -0.194192498099517, + -0.257779671861393, -0.268413631131912, -0.202955649332731, + -0.211718800565946, -0.27904759040243, -0.289681549672949, + -0.220481951799161, -0.229245103032375, -0.300315508943467, + -0.310949468213985, -0.23800825426559, -0.246771405498805, + -0.321583427484504, -0.332217386755022, -0.255534556732019, + -0.264297707965234, -0.342851346025541, -0.353485305296059, + -0.273060859198449, -0.281824010431663, -0.364119264566577, + -0.374753223837096, -0.290587161664878, -0.299350312898093, + -0.385387183107614, -0.396021142378132, -0.308113464131307, + -0.316876615364522, -0.406655101648651, -0.417289060919169, + -0.325639766597737, -0.334402917830951, -0.427923020189688, + -0.438556979460206, -0.343166069064166, -0.351929220297381, + -0.449190938730724, -0.459824898001243, -0.360692371530595, + -0.36945552276381, -0.470458857271761, -0.48109281654228, + -0.378218673997025, -0.386981825230239, -0.491726775812798, + -0.502360735083316, -0.395744976463454, -0.404508127696669, + -0.512994694353835, -0.523628653624353, -0.413271278929883, + -0.422034430163098, -0.534262612894872, -0.54489657216539, + -0.430797581396313, -0.439560732629527, -0.555530531435908, + -0.566164490706427, -0.448323883862742, -0.457087035095957, + -0.576798449976945, -0.587432409247464, -0.465850186329171, + -0.474613337562386, -0.598066368517982, -0.6087003277885, + -0.483376488795601, -0.492139640028815, -0.619334287059019, + -0.629968246329537, -0.50090279126203, -0.509665942495245, + -0.640602205600056, -0.651236164870574, -0.518429093728459, + -0.527192244961674, -0.661870124141092, -0.672504083411611, + -0.535955396194889, -0.544718547428103, -0.683138042682129, + -0.693772001952647, -0.553481698661318, -0.562244849894533, + -0.704405961223166, -0.715039920493684, -0.571008001127747, + -0.579771152360962, -0.725673879764203, -0.736307839034721, + -0.588534303594177, -0.597297454827391, -0.746941798305239, + -0.757575757575758, -0.606060606060606, -0.321092745280713, + -0.384405818700032, -0.398793057889522, -0.333603344510717, + -0.346113943740721, -0.413180297079012, -0.427567536268502, + -0.358624542970725, -0.371135142200729, -0.441954775457991, + -0.456342014647481, -0.383645741430733, -0.396156340660738, + -0.470729253836971, -0.485116493026461, -0.408666939890742, + -0.421177539120746, -0.499503732215951, -0.513890971405441, + -0.43368813835075, -0.446198737580754, -0.528278210594931, + -0.542665449784421, -0.458709336810759, -0.471219936040763, + -0.557052688973911, -0.571439928163401, -0.483730535270767, + -0.496241134500771, -0.585827167352891, -0.600214406542381, + -0.508751733730775, -0.521262332960779, -0.614601645731871, + -0.628988884921361, -0.533772932190784, -0.546283531420788, + -0.643376124110851, -0.657763363300341, -0.558794130650792, + -0.571304729880796, -0.672150602489831, -0.686537841679321, + -0.5838153291108, -0.596325928340805, -0.700925080868811, + -0.715312320058301, -0.608836527570809, -0.621347126800813, + -0.729699559247791, -0.744086798437281, -0.633857726030817, + -0.646368325260821, -0.758474037626771, -0.772861276816261, + -0.658878924490826, -0.67138952372083, -0.787248516005751, + -0.801635755195241, -0.683900122950834, -0.696410722180838, + -0.816022994384731, -0.830410233574221, -0.708921321410842, + -0.721431920640846, -0.844797472763711, -0.859184711953201, + -0.733942519870851, -0.746453119100855, -0.873571951142691, + -0.887959190332181, -0.758963718330859, -0.771474317560863, + -0.902346429521671, -0.916733668711161, -0.783984916790867, + -0.796495516020871, -0.931120907900651, -0.945508147090141, + -0.809006115250876, -0.82151671448088, -0.959895386279631, + -0.974282625469121, -0.834027313710884, -0.846537912940888, + -0.988669864658611, -1.0030571038481, -0.859048512170892, + -0.871559111400897, -1.01744434303759, -1.03183158222708, + -0.884069710630901, -0.896580309860905, -1.04621882141657, + -1.06060606060606, -0.909090909090909, -0.447308517938333, + -0.510211217176635, -0.528369199016204, -0.463581128452863, + -0.479853738967392, -0.546527180855772, -0.564685162695341, + -0.496126349481921, -0.512398959996451, -0.58284314453491, + -0.601001126374478, -0.52867157051098, -0.544944181025509, + -0.619159108214047, -0.637317090053616, -0.561216791540039, + -0.577489402054568, -0.655475071893185, -0.673633053732753, + -0.593762012569097, -0.610034623083627, -0.691791035572322, + -0.709949017411891, -0.626307233598156, -0.642579844112685, + -0.728106999251459, -0.746264981091028, -0.658852454627215, + -0.675125065141744, -0.764422962930597, -0.782580944770165, + -0.691397675656273, -0.707670286170803, -0.800738926609734, + -0.818896908449303, -0.723942896685332, -0.740215507199861, + -0.837054890288871, -0.85521287212844, -0.756488117714391, + -0.77276072822892, -0.873370853968009, -0.891528835807577, + -0.789033338743449, -0.805305949257978, -0.909686817647146, + -0.927844799486715, -0.821578559772508, -0.837851170287037, + -0.946002781326283, -0.964160763165852, -0.854123780801567, + -0.870396391316096, -0.982318745005421, -1.00047672684499, + -0.886669001830625, -0.902941612345155, -1.01863470868456, + -1.03679269052413, -0.919214222859684, -0.935486833374213, + -1.0549506723637, -1.07310865420326, -0.951759443888742, + -0.968032054403272, -1.09126663604283, -1.1094246178824, + -0.984304664917801, -1.00057727543233, -1.12758259972197, + -1.14574058156154, -1.01684988594686, -1.03312249646139, + -1.16389856340111, -1.18205654524068, -1.04939510697592, + -1.06566771749045, -1.20021452708025, -1.21837250891981, + -1.08194032800498, -1.09821293851951, -1.23653049075938, + -1.25468847259895, -1.11448554903404, -1.13075815954857, + -1.27284645443852, -1.29100443627809, -1.14703077006309, + -1.16330338057762, -1.30916241811766, -1.32732039995723, + -1.17957599109215, -1.19584860160668, -1.34547838179679, + -1.36363636363636, -1.21212121212121, -0.57256819802497, + -0.634925178873305, -0.6568771254221, -0.592623162219152, + -0.612678126413334, -0.678829071970895, -0.70078101851969, + -0.632733090607516, -0.652788054801697, -0.722732965068485, + -0.74468491161728, -0.672843018995879, -0.692897983190061, + -0.766636858166075, -0.78858880471487, -0.712952947384243, + -0.733007911578425, -0.810540751263665, -0.83249269781246, + -0.753062875772607, -0.773117839966788, -0.854444644361255, + -0.87639659091005, -0.79317280416097, -0.813227768355152, + -0.898348537458844, -0.920300484007639, -0.833282732549334, + -0.853337696743516, -0.942252430556434, -0.964204377105229, + -0.873392660937697, -0.893447625131879, -0.986156323654024, + -1.00810827020282, -0.913502589326061, -0.933557553520243, + -1.03006021675161, -1.05201216330041, -0.953612517714424, + -0.973667481908606, -1.0739641098492, -1.095916056398, + -0.993722446102788, -1.01377741029697, -1.11786800294679, + -1.13981994949559, -1.03383237449115, -1.05388733868533, + -1.16177189604438, -1.18372384259318, -1.07394230287952, + -1.0939972670737, -1.20567578914197, -1.22762773569077, + -1.11405223126788, -1.13410719546206, -1.24957968223956, + -1.27153162878836, -1.15416215965624, -1.17421712385042, + -1.29348357533715, -1.31543552188595, -1.19427208804461, + -1.21432705223879, -1.33738746843474, -1.35933941498354, + -1.23438201643297, -1.25443698062715, -1.38129136153233, + -1.40324330808113, -1.27449194482133, -1.29454690901552, + -1.42519525462992, -1.44714720117872, -1.3146018732097, + -1.33465683740388, -1.46909914772751, -1.49105109427631, + -1.35471180159806, -1.37476676579224, -1.5130030408251, -1.5349549873739, + -1.39482172998642, -1.41487669418061, -1.55690693392269, + -1.57885888047149, -1.43493165837479, -1.45498662256897, + -1.60081082702028, -1.62276277356908, -1.47504158676315, + -1.49509655095733, -1.64471472011787, -1.66666666666667, + -1.51515151515151, -0.6966023333504, -0.758279487827494, + -0.78405432786727, -0.720465726644685, -0.744329119938971, + -0.809829167907046, -0.835604007946822, -0.768192513233256, + -0.792055906527542, -0.861378847986598, -0.887153688026374, + -0.815919299821827, -0.839782693116113, -0.91292852806615, + -0.938703368105926, -0.863646086410398, -0.887509479704684, + -0.964478208145702, -0.990253048185478, -0.911372872998969, + -0.935236266293255, -1.01602788822525, -1.04180272826503, + -0.95909965958754, -0.982963052881826, -1.06757756830481, + -1.09335240834458, -1.00682644617611, -1.0306898394704, + -1.11912724838436, -1.14490208842413, -1.05455323276468, + -1.07841662605897, -1.17067692846391, -1.19645176850369, + -1.10228001935325, -1.12614341264754, -1.22222660854346, + -1.24800144858324, -1.15000680594182, -1.17387019923611, + -1.27377628862302, -1.29955112866279, -1.1977335925304, + -1.22159698582468, -1.32532596870257, -1.35110080874234, + -1.24546037911897, -1.26932377241325, -1.37687564878212, + -1.4026504888219, -1.29318716570754, -1.31705055900182, + -1.42842532886167, -1.45420016890145, -1.34091395229611, + -1.36477734559039, -1.47997500894122, -1.505749848981, -1.38864073888468, + -1.41250413217896, -1.53152468902078, -1.55729952906055, + -1.43636752547325, -1.46023091876754, -1.58307436910033, + -1.6088492091401, -1.48409431206182, -1.50795770535611, + -1.63462404917988, -1.66039888921966, -1.53182109865039, + -1.55568449194468, -1.68617372925943, -1.71194856929921, + -1.57954788523896, -1.60341127853325, -1.73772340933898, + -1.76349824937876, -1.62727467182753, -1.65113806512182, + -1.78927308941854, -1.81504792945831, -1.67500145841611, + -1.69886485171039, -1.84082276949809, -1.86659760953787, + -1.72272824500468, -1.74659163829896, -1.89237244957764, + -1.91814728961742, -1.77045503159325, -1.79431842488753, + -1.94392212965719, -1.96969696969697, -1.81818181818182, + -0.819144247977457, -0.880009008127421, -0.909641311629545, + -0.846847819748408, -0.874551391519358, -0.93927361513167, + -0.968905918633794, -0.902254963290308, -0.929958535061258, + -0.998538222135919, -1.02817052563804, -0.957662106832209, + -0.985365678603159, -1.05780282914017, -1.08743513264229, + -1.01306925037411, -1.04077282214506, -1.11706743614442, + -1.14669973964654, -1.06847639391601, -1.09617996568696, + -1.17633204314867, -1.20596434665079, -1.12388353745791, + -1.15158710922886, -1.23559665015291, -1.26522895365504, + -1.17929068099981, -1.20699425277076, -1.29486125715716, + -1.32449356065929, -1.23469782454171, -1.26240139631266, + -1.35412586416141, -1.38375816766354, -1.29010496808361, + -1.31780853985456, -1.41339047116566, -1.44302277466779, + -1.34551211162551, -1.37321568339646, -1.47265507816991, + -1.50228738167204, -1.40091925516741, -1.42862282693836, + -1.53191968517416, -1.56155198867628, -1.45632639870931, + -1.48402997048026, -1.59118429217841, -1.62081659568053, + -1.51173354225121, -1.53943711402216, -1.65044889918266, + -1.68008120268478, -1.56714068579312, -1.59484425756407, + -1.70971350618691, -1.73934580968903, -1.62254782933502, + -1.65025140110597, -1.76897811319116, -1.79861041669328, + -1.67795497287692, -1.70565854464787, -1.82824272019541, + -1.85787502369753, -1.73336211641882, -1.76106568818977, + -1.88750732719965, -1.91713963070178, -1.78876925996072, + -1.81647283173167, -1.9467719342039, -1.97640423770603, + -1.84417640350262, -1.87187997527357, -2.00603654120815, + -2.03566884471028, -1.89958354704452, -1.92728711881547, + -2.0653011482124, -2.09493345171453, -1.95499069058642, + -1.98269426235737, -2.12456575521665, -2.15419805871877, + -2.01039783412832, -2.03810140589927, -2.1838303622209, + -2.21346266572302, -2.06580497767022, -2.09350854944117, + -2.24309496922515, -2.27272727272727, -2.12121212121212, + -0.93993064632881, -0.9998522845302, -1.03338218434355, + -0.971511747986547, -1.00309284964428, -1.0669120841569, + -1.10044198397024, -1.03467395130202, -1.06625505295976, + -1.13397188378359, -1.16750178359694, -1.09783615461749, + -1.12941725627523, -1.20103168341029, -1.23456158322364, + -1.16099835793297, -1.1925794595907, -1.26809148303699, + -1.30162138285034, -1.22416056124844, -1.25574166290617, + -1.33515128266368, -1.36868118247703, -1.28732276456391, + -1.31890386622165, -1.40221108229038, -1.43574098210373, + -1.35048496787938, -1.38206606953712, -1.46927088191708, + -1.50280078173043, -1.41364717119486, -1.44522827285259, + -1.53633068154377, -1.56986058135712, -1.47680937451033, + -1.50839047616807, -1.60339048117047, -1.63692038098382, + -1.5399715778258, -1.57155267948354, -1.67045028079717, + -1.70398018061052, -1.60313378114128, -1.63471488279901, + -1.73751008042387, -1.77103998023721, -1.66629598445675, + -1.69787708611449, -1.80456988005056, -1.83809977986391, + -1.72945818777222, -1.76103928942996, -1.87162967967726, + -1.90515957949061, -1.79262039108769, -1.82420149274543, + -1.93868947930396, -1.9722193791173, -1.85578259440317, -1.8873636960609, + -2.00574927893065, -2.039279178744, -1.91894479771864, -1.95052589937638, + -2.07280907855735, -2.1063389783707, -1.98210700103411, + -2.01368810269185, -2.13986887818405, -2.17339877799739, + -2.04526920434959, -2.07685030600732, -2.20692867781074, + -2.24045857762409, -2.10843140766506, -2.1400125093228, + -2.27398847743744, -2.30751837725079, -2.17159361098053, + -2.20317471263827, -2.34104827706414, -2.37457817687749, + -2.23475581429601, -2.26633691595374, -2.40810807669083, + -2.44163797650418, -2.29791801761148, -2.32949911926921, + -2.47516787631753, -2.50869777613088, -2.36108022092695, + -2.39266132258469, -2.54222767594423, -2.57575757575758, + -2.42424242424242, -1.05870220963612, -1.11755213474205, + -1.1550252356792, -1.09420371001137, -1.12970521038662, + -1.19249833661634, -1.22997143755349, -1.16520671076187, + -1.20070821113711, -1.26744453849063, -1.30491763942778, + -1.23620971151236, -1.27171121188761, -1.34239074036492, + -1.37986384130207, -1.30721271226285, -1.3427142126381, + -1.41733694223921, -1.45481004317636, -1.37821571301335, + -1.41371721338859, -1.4922831441135, -1.52975624505065, + -1.44921871376384, -1.48472021413909, -1.56722934598779, + -1.60470244692494, -1.52022171451433, -1.55572321488958, + -1.64217554786208, -1.67964864879923, -1.59122471526483, + -1.62672621564007, -1.71712174973637, -1.75459485067352, + -1.66222771601532, -1.69772921639057, -1.79206795161067, + -1.82954105254781, -1.73323071676582, -1.76873221714106, + -1.86701415348496, -1.9044872544221, -1.80423371751631, + -1.83973521789156, -1.94196035535925, -1.97943345629639, + -1.8752367182668, -1.91073821864205, -2.01690655723354, + -2.05437965817068, -1.9462397190173, -1.98174121939254, + -2.09185275910783, -2.12932586004497, -2.01724271976779, + -2.05274422014304, -2.16679896098212, -2.20427206191926, + -2.08824572051828, -2.12374722089353, -2.24174516285641, + -2.27921826379355, -2.15924872126878, -2.19475022164402, + -2.3166913647307, -2.35416446566784, -2.23025172201927, + -2.26575322239452, -2.39163756660499, -2.42911066754214, + -2.30125472276977, -2.33675622314501, -2.46658376847928, + -2.50405686941643, -2.37225772352026, -2.40775922389551, + -2.54152997035357, -2.57900307129072, -2.44326072427075, -2.478762224646, + -2.61647617222786, -2.65394927316501, -2.51426372502125, + -2.54976522539649, -2.69142237410215, -2.7288954750393, + -2.58526672577174, -2.62076822614699, -2.76636857597644, + -2.80384167691359, -2.65626972652223, -2.69177122689748, + -2.84131477785073, -2.87878787878788, -2.72727272727273, + -1.17520418338048, -1.23285623201891, -1.27432350754655, + -1.21467437161288, -1.25414455984527, -1.3157907830742, + -1.35725805860184, -1.29361474807766, -1.33308493631006, + -1.39872533412949, -1.44019260965713, -1.37255512454245, + -1.41202531277485, -1.48165988518478, -1.52312716071242, + -1.45149550100724, -1.49096568923964, -1.56459443624006, + -1.60606171176771, -1.53043587747203, -1.56990606570443, + -1.64752898729535, -1.688996262823, -1.60937625393682, -1.64884644216922, + -1.73046353835064, -1.77193081387828, -1.68831663040161, + -1.72778681863401, -1.81339808940593, -1.85486536493357, + -1.7672570068664, -1.8067271950988, -1.89633264046122, -1.93779991598886, + -1.84619738333119, -1.88566757156358, -1.9792671915165, + -2.02073446704415, -1.92513775979598, -1.96460794802837, + -2.06220174257179, -2.10366901809944, -2.00407813626077, + -2.04354832449316, -2.14513629362708, -2.18660356915472, + -2.08301851272556, -2.12248870095795, -2.22807084468237, + -2.26953812021001, -2.16195888919035, -2.20142907742274, + -2.31100539573766, -2.3524726712653, -2.24089926565514, + -2.28036945388753, -2.39393994679294, -2.43540722232059, + -2.31983964211993, -2.35930983035232, -2.47687449784823, + -2.51834177337588, -2.39878001858472, -2.43825020681711, + -2.55980904890352, -2.60127632443116, -2.4777203950495, -2.5171905832819, + -2.64274359995881, -2.68421087548645, -2.55666077151429, + -2.59613095974669, -2.7256781510141, -2.76714542654174, + -2.63560114797908, -2.67507133621148, -2.80861270206938, + -2.85007997759703, -2.71454152444387, -2.75401171267627, + -2.89154725312467, -2.93301452865232, -2.79348190090866, + -2.83295208914106, -2.97448180417996, -3.01594907970761, + -2.87242227737345, -2.91189246560585, -3.05741635523525, + -3.09888363076289, -2.95136265383824, -2.99083284207064, + -3.14035090629054, -3.18181818181818, -3.03030303030303, + -1.28918695439329, -1.34551767676768, -1.39103535353535, + -1.33267943054095, -1.37617190668861, -1.43655303030303, + -1.48207070707071, -1.41966438283628, -1.46315685898394, + -1.52758838383838, -1.57310606060606, -1.5066493351316, + -1.55014181127926, -1.61862373737374, -1.66414141414141, + -1.59363428742692, -1.63712676357458, -1.70965909090909, + -1.75517676767677, -1.68061923972224, -1.7241117158699, + -1.80069444444444, -1.84621212121212, -1.76760419201756, + -1.81109666816522, -1.8917297979798, -1.93724747474747, + -1.85458914431288, -1.89808162046054, -1.98276515151515, + -2.02828282828283, -1.9415740966082, -1.98506657275586, -2.0738005050505, + -2.11931818181818, -2.02855904890352, -2.07205152505118, + -2.16483585858586, -2.21035353535354, -2.11554400119884, + -2.1590364773465, -2.25587121212121, -2.30138888888889, + -2.20252895349416, -2.24602142964182, -2.34690656565657, + -2.39242424242424, -2.28951390578948, -2.33300638193714, + -2.43794191919192, -2.4834595959596, -2.3764988580848, -2.41999133423246, + -2.52897727272727, -2.57449494949495, -2.46348381038012, + -2.50697628652779, -2.62001262626263, -2.6655303030303, + -2.55046876267545, -2.59396123882311, -2.71104797979798, + -2.75656565656566, -2.63745371497077, -2.68094619111843, + -2.80208333333333, -2.84760101010101, -2.72443866726609, + -2.76793114341375, -2.89311868686869, -2.93863636363636, + -2.81142361956141, -2.85491609570907, -2.98415404040404, + -3.02967171717172, -2.89840857185673, -2.94190104800439, + -3.07518939393939, -3.12070707070707, -2.98539352415205, + -3.02888600029971, -3.16622474747475, -3.21174242424242, + -3.07237847644737, -3.11587095259503, -3.2572601010101, + -3.30277777777778, -3.15936342874269, -3.20285590489035, + -3.34829545454545, -3.39381313131313, -3.24634838103801, + -3.28984085718567, -3.43933080808081, -3.48484848484848, + -3.33333333333333, -1.40040661631043, -1.45529555585318, + -1.50492498632181, -1.44798016992858, -1.49555372354674, + -1.55455441679044, -1.60418384725907, -1.54312727716489, + -1.59070083078304, -1.6538132777277, -1.70344270819633, -1.6382743844012, + -1.68584793801935, -1.75307213866496, -1.80270156913359, + -1.7334214916375, -1.78099504525566, -1.85233099960222, + -1.90196043007085, -1.82856859887381, -1.87614215249196, + -1.95158986053948, -2.00121929100811, -1.92371570611012, + -1.97128925972827, -2.05084872147674, -2.10047815194537, + -2.01886281334642, -2.06643636696458, -2.150107582414, -2.19973701288263, + -2.11400992058273, -2.16158347420088, -2.24936644335126, + -2.29899587381989, -2.20915702781904, -2.25673058143719, + -2.34862530428852, -2.39825473475715, -2.30430413505534, + -2.3518776886735, -2.44788416522578, -2.49751359569441, + -2.39945124229165, -2.4470247959098, -2.54714302616304, + -2.59677245663167, -2.49459834952796, -2.54217190314611, + -2.6464018871003, -2.69603131756893, -2.58974545676426, + -2.63731901038242, -2.74566074803756, -2.79529017850619, + -2.68489256400057, -2.73246611761872, -2.84491960897482, + -2.89454903944345, -2.78003967123688, -2.82761322485503, + -2.94417846991208, -2.99380790038071, -2.87518677847318, + -2.92276033209134, -3.04343733084934, -3.09306676131797, + -2.97033388570949, -3.01790743932764, -3.1426961917866, + -3.19232562225523, -3.0654809929458, -3.11305454656395, + -3.24195505272386, -3.29158448319249, -3.1606281001821, + -3.20820165380026, -3.34121391366112, -3.39084334412975, + -3.25577520741841, -3.30334876103656, -3.44047277459838, + -3.49010220506701, -3.35092231465472, -3.39849586827287, + -3.53973163553564, -3.58936106600427, -3.44606942189102, + -3.49364297550918, -3.6389904964729, -3.68861992694153, + -3.54121652912733, -3.58879008274548, -3.73824935741016, + -3.78787878787879, -3.63636363636364, -1.50862552209857, + -1.56195548834395, -1.61576301180278, -1.5603439990623, + -1.61206247602603, -1.66957053526161, -1.72337805872045, + -1.66378095298976, -1.71549942995349, -1.77718558217928, + -1.83099310563811, -1.76721790691722, -1.81893638388095, + -1.88480062909694, -1.93860815255578, -1.87065486084469, + -1.92237333780842, -1.99241567601461, -2.04622319947344, + -1.97409181477215, -2.02581029173588, -2.10003072293228, + -2.15383824639111, -2.07752876869961, -2.12924724566334, + -2.20764576984994, -2.26145329330877, -2.18096572262707, + -2.2326841995908, -2.31526081676761, -2.36906834022644, + -2.28440267655454, -2.33612115351827, -2.42287586368527, + -2.47668338714411, -2.387839630482, -2.43955810744573, -2.53049091060294, + -2.58429843406177, -2.49127658440946, -2.54299506137319, + -2.6381059575206, -2.69191348097944, -2.59471353833692, + -2.64643201530066, -2.74572100443827, -2.7995285278971, + -2.69815049226439, -2.74986896922812, -2.85333605135594, + -2.90714357481477, -2.80158744619185, -2.85330592315558, + -2.9609510982736, -3.01475862173243, -2.90502440011931, + -2.95674287708304, -3.06856614519127, -3.1223736686501, + -3.00846135404678, -3.06017983101051, -3.17618119210893, + -3.22998871556777, -3.11189830797424, -3.16361678493797, + -3.2837962390266, -3.33760376248543, -3.2153352619017, -3.26705373886543, + -3.39141128594426, -3.4452188094031, -3.31877221582916, + -3.37049069279289, -3.49902633286193, -3.55283385632076, + -3.42220916975663, -3.47392764672036, -3.6066413797796, + -3.66044890323843, -3.52564612368409, -3.57736460064782, + -3.71425642669726, -3.76806395015609, -3.62908307761155, + -3.68080155457528, -3.82187147361493, -3.87567899707376, + -3.73252003153901, -3.78423850850275, -3.92948652053259, + -3.98329404399143, -3.83595698546648, -3.88767546243021, + -4.03710156745026, -4.09090909090909, -3.93939393939394, + -1.61361282240215, -1.66527015646036, -1.72332694874715, + -1.66954498027496, -1.72547713814778, -1.78138374103394, + -1.83944053332072, -1.78140929602059, -1.8373414538934, + -1.89749732560751, -1.9555541178943, -1.89327361176621, + -1.94920576963902, -2.01361091018109, -2.07166770246788, + -2.00513792751183, -2.06107008538464, -2.12972449475466, + -2.18778128704145, -2.11700224325745, -2.17293440113026, + -2.24583807932824, -2.30389487161503, -2.22886655900307, + -2.28479871687588, -2.36195166390182, -2.4200084561886, + -2.34073087474869, -2.3966630326215, -2.47806524847539, + -2.53612204076218, -2.45259519049431, -2.50852734836712, + -2.59417883304897, -2.65223562533576, -2.56445950623993, + -2.62039166411274, -2.71029241762254, -2.76834920990933, + -2.67632382198555, -2.73225597985836, -2.82640600219612, + -2.88446279448291, -2.78818813773117, -2.84412029560398, + -2.9425195867697, -3.00057637905648, -2.90005245347679, -2.9559846113496, + -3.05863317134327, -3.11668996363006, -3.01191676922241, + -3.06784892709522, -3.17474675591685, -3.23280354820364, + -3.12378108496803, -3.17971324284085, -3.29086034049042, + -3.34891713277721, -3.23564540071366, -3.29157755858647, -3.406973925064, + -3.46503071735079, -3.34750971645928, -3.40344187433209, + -3.52308750963758, -3.58114430192436, -3.4593740322049, + -3.51530619007771, -3.63920109421115, -3.69725788649794, + -3.57123834795052, -3.62717050582333, -3.75531467878473, + -3.81337147107151, -3.68310266369614, -3.73903482156895, + -3.8714282633583, -3.92948505564509, -3.79496697944176, + -3.85089913731457, -3.98754184793188, -4.04559864021867, + -3.90683129518738, -3.96276345306019, -4.10365543250545, + -4.16171222479224, -4.018695610933, -4.07462776880581, -4.21976901707903, + -4.27782580936582, -4.13055992667862, -4.18649208455143, + -4.33588260165261, -4.39393939393939, -4.24242424242424, + -1.71514498849147, -1.76501982052257, -1.82740173278741, + -1.77536434076728, -1.83558369304309, -1.88978364505224, + -1.95216555731707, -1.8958030453189, -1.95602239759471, -2.0145474695819, + -2.07692938184674, -2.01624174987052, -2.07646110214633, + -2.13931129411157, -2.2016932063764, -2.13668045442214, + -2.19689980669795, -2.26407511864123, -2.32645703090606, + -2.25711915897376, -2.31733851124957, -2.3888389431709, + -2.45122085543573, -2.37755786352538, -2.43777721580119, + -2.51360276770056, -2.57598467996539, -2.497996568077, -2.55821592035281, + -2.63836659223023, -2.70074850449506, -2.61843527262862, + -2.67865462490443, -2.76313041675989, -2.82551232902472, + -2.73887397718024, -2.79909332945605, -2.88789424128956, + -2.95027615355439, -2.85931268173186, -2.91953203400767, + -3.01265806581922, -3.07503997808405, -2.97975138628348, + -3.03997073855929, -3.13742189034889, -3.19980380261372, + -3.1001900908351, -3.16040944311091, -3.26218571487855, + -3.32456762714338, -3.22062879538672, -3.28084814766253, + -3.38694953940822, -3.44933145167305, -3.34106749993834, + -3.40128685221415, -3.51171336393788, -3.57409527620271, + -3.46150620448996, -3.52172555676577, -3.63647718846755, + -3.69885910073238, -3.58194490904158, -3.64216426131739, + -3.76124101299721, -3.82362292526204, -3.7023836135932, + -3.76260296586901, -3.88600483752688, -3.94838674979171, + -3.82282231814482, -3.88304167042063, -4.01076866205654, + -4.07315057432137, -3.94326102269644, -4.00348037497225, + -4.13553248658621, -4.19791439885104, -4.06369972724806, + -4.12391907952387, -4.26029631111587, -4.3226782233807, + -4.18413843179968, -4.2443577840755, -4.38506013564553, + -4.44744204791037, -4.3045771363513, -4.36479648862711, -4.5098239601752, + -4.57220587244003, -4.42501584090293, -4.48523519317874, + -4.63458778470486, -4.6969696969697, -4.54545454545454, + -1.81300631862706, -1.86099281673154, -1.9277802036096, -1.8775909681985, + -1.94217561776994, -1.99456759048765, -2.0613549773657, + -2.00676026734139, -2.07134491691283, -2.12814236424375, + -2.1949297511218, -2.13592956648427, -2.20051421605571, + -2.26171713799986, -2.32850452487791, -2.26509886562715, + -2.3296835151986, -2.39529191175596, -2.46207929863401, + -2.39426816477004, -2.45885281434148, -2.52886668551207, + -2.59565407239012, -2.52343746391292, -2.58802211348437, + -2.66244145926817, -2.72922884614622, -2.65260676305581, + -2.71719141262725, -2.79601623302428, -2.86280361990233, + -2.78177606219869, -2.84636071177014, -2.92959100678038, + -2.99637839365843, -2.91094536134158, -2.97553001091302, + -3.06316578053648, -3.12995316741454, -3.04011466048446, + -3.10469931005591, -3.19674055429259, -3.26352794117064, + -3.16928395962735, -3.23386860919879, -3.33031532804869, + -3.39710271492675, -3.29845325877023, -3.36303790834167, + -3.4638901018048, -3.53067748868285, -3.42762255791312, + -3.49220720748456, -3.5974648755609, -3.66425226243895, -3.556791857056, + -3.62137650662744, -3.73103964931701, -3.79782703619506, + -3.68596115619889, -3.75054580577033, -3.86461442307311, + -3.93140180995116, -3.81513045534177, -3.87971510491321, + -3.99818919682922, -4.06497658370727, -3.94429975448466, + -4.0088844040561, -4.13176397058532, -4.19855135746337, + -4.07346905362754, -4.13805370319898, -4.26533874434142, + -4.33212613121948, -4.20263835277042, -4.26722300234187, + -4.39891351809753, -4.46570090497558, -4.33180765191331, + -4.39639230148475, -4.53248829185363, -4.59927567873169, + -4.46097695105619, -4.52556160062764, -4.66606306560974, + -4.73285045248779, -4.59014625019908, -4.65473089977052, + -4.79963783936584, -4.8664252262439, -4.71931554934196, + -4.78390019891341, -4.93321261312195, -5, -4.84848484848485, + -1.90383286103702, -1.94667290534249, -2.0116373116118, -1.9697087576107, + -2.03558465418438, -2.07660171788111, -2.14156612415042, + -2.10146055075806, -2.16733644733174, -2.20653053041973, + -2.27149493668903, -2.23321234390542, -2.2990882404791, + -2.33645934295834, -2.40142374922765, -2.36496413705278, + -2.43084003362646, -2.46638815549696, -2.53135256176627, + -2.49671593020014, -2.56259182677382, -2.59631696803558, + -2.66128137430489, -2.6284677233475, -2.69434361992118, -2.7262457805742, + -2.7912101868435, -2.76021951649486, -2.82609541306854, + -2.85617459311281, -2.92113899938212, -2.89197130964222, + -2.9578472062159, -2.98610340565143, -3.05106781192074, + -3.02372310278959, -3.08959899936327, -3.11603221819005, + -3.18099662445936, -3.15547489593695, -3.22135079251063, + -3.24596103072867, -3.31092543699797, -3.28722668908431, + -3.35310258565799, -3.37588984326728, -3.44085424953659, + -3.41897848223167, -3.48485437880535, -3.5058186558059, + -3.57078306207521, -3.55073027537903, -3.61660617195271, + -3.63574746834452, -3.70071187461383, -3.68248206852639, + -3.74835796510007, -3.76567628088313, -3.83064068715244, + -3.81423386167375, -3.88010975824743, -3.89560509342175, + -3.96056949969106, -3.94598565482111, -4.01186155139479, + -4.02553390596037, -4.09049831222968, -4.07773744796847, + -4.14361334454215, -4.15546271849899, -4.2204271247683, + -4.20948924111583, -4.27536513768951, -4.2853915310376, + -4.35035593730691, -4.3412410342632, -4.40711693083688, + -4.41532034357622, -4.48028474984553, -4.47299282741056, + -4.53886872398424, -4.54524915611484, -4.61021356238415, + -4.60474462055792, -4.6706205171316, -4.67517796865346, + -4.74014237492277, -4.73649641370528, -4.80237231027896, + -4.80510678119207, -4.87007118746138, -4.86824820685264, + -4.93412410342632, -4.93503559373069, -5, -5, -1.98742601502635, + -2.02817912471022, -2.09140935609936, -2.05152333385558, + -2.11562065268481, -2.1546395874885, -2.21786981887765, + -2.17971797151403, -2.24381529034326, -2.28110005026679, + -2.34433028165594, -2.30791260917249, -2.37200992800171, + -2.40756051304508, -2.47079074443423, -2.43610724683094, + -2.50020456566017, -2.53402097582337, -2.59725120721251, + -2.56430188448939, -2.62839920331862, -2.66048143860166, + -2.7237116699908, -2.69249652214785, -2.75659384097707, + -2.78694190137995, -2.85017213276909, -2.8206911598063, + -2.88478847863552, -2.91340236415824, -2.97663259554738, + -2.94888579746475, -3.01298311629398, -3.03986282693652, + -3.10309305832567, -3.0770804351232, -3.14117775395243, + -3.16632328971481, -3.22955352110396, -3.20527507278166, + -3.26937239161088, -3.2927837524931, -3.35601398388225, + -3.33346971044011, -3.39756702926934, -3.41924421527139, + -3.48247444666054, -3.46166434809856, -3.52576166692779, + -3.54570467804968, -3.60893490943882, -3.58985898575702, + -3.65395630458624, -3.67216514082797, -3.73539537221711, + -3.71805362341547, -3.7821509422447, -3.79862560360626, -3.8618558349954, + -3.84624826107392, -3.91034557990315, -3.92508606638455, + -3.98831629777369, -3.97444289873238, -4.0385402175616, + -4.05154652916283, -4.11477676055198, -4.10263753639083, + -4.16673485522006, -4.17800699194112, -4.24123722333027, + -4.23083217404928, -4.29492949287851, -4.30446745471941, + -4.36769768610856, -4.35902681170773, -4.42312413053696, + -4.4309279174977, -4.49415814888685, -4.48722144936619, + -4.55131876819542, -4.55738838027599, -4.62061861166513, + -4.61541608702464, -4.67951340585387, -4.68384884305428, + -4.74707907444342, -4.74361072468309, -4.80770804351232, + -4.81030930583257, -4.87353953722171, -4.87180536234155, + -4.93590268117077, -4.93676976861086, -5, -5, -2.06675298087145, + -2.10532683703268, -2.16691562773411, -2.12916249191674, + -2.19157200296202, -2.22850441843554, -2.29009320913698, + -2.25398151400731, -2.3163910250526, -2.35168199983841, + -2.41327079053984, -2.37880053609789, -2.44121004714318, + -2.47485958124127, -2.53644837194271, -2.50361955818847, + -2.56602906923375, -2.59803716264414, -2.65962595334557, + -2.62843858027904, -2.69084809132433, -2.721214744047, -2.78280353474844, + -2.75325760236962, -2.81566711341491, -2.84439232544987, + -2.9059811161513, -2.8780766244602, -2.94048613550548, -2.96756990685273, + -3.02915869755416, -3.00289564655077, -3.06530515759606, + -3.0907474882556, -3.15233627895703, -3.12771466864135, + -3.19012417968664, -3.21392506965846, -3.27551386035989, + -3.25253369073193, -3.31494320177721, -3.33710265106133, + -3.39869144176276, -3.3773527128225, -3.43976222386779, + -3.46028023246419, -3.52186902316562, -3.50217173491308, + -3.56458124595837, -3.58345781386706, -3.64504660456849, + -3.62699075700366, -3.68940026804894, -3.70663539526992, + -3.76822418597135, -3.75180977909423, -3.81421929013952, + -3.82981297667279, -3.89140176737422, -3.87662880118481, + -3.9390383122301, -3.95299055807565, -4.01457934877708, + -4.00144782327539, -4.06385733432067, -4.07616813947851, + -4.13775693017995, -4.12626684536596, -4.18867635641125, + -4.19934572088138, -4.26093451158281, -4.25108586745654, + -4.31349537850183, -4.32252330228424, -4.38411209298568, + -4.37590488954712, -4.4383144005924, -4.44570088368711, + -4.50728967438854, -4.50072391163769, -4.56313342268298, + -4.56887846508997, -4.63046725579141, -4.62554293372827, + -4.68795244477356, -4.69205604649284, -4.75364483719427, + -4.75036195581885, -4.81277146686413, -4.8152336278957, + -4.87682241859714, -4.87518097790942, -4.93759048895471, + -4.93841120929857, -5, -5, -2.14163405748041, -2.17794127792815, + -2.23798508052542, -2.20245035412977, -2.26326665077912, + -2.29802888312269, -2.35807268571997, -2.32408294742847, + -2.38489924407782, -2.41811648831724, -2.47816029091451, + -2.44571554072718, -2.50653183737653, -2.53820409351179, + -2.59824789610906, -2.56734813402588, -2.62816443067524, + -2.65829169870633, -2.71833550130361, -2.68898072732459, + -2.74979702397394, -2.77837930390088, -2.83842310649815, + -2.8106133206233, -2.87142961727265, -2.89846690909543, -2.9585107116927, + -2.932245913922, -2.99306221057135, -3.01855451428998, -3.07859831688725, + -3.05387850722071, -3.11469480387006, -3.13864211948452, + -3.1986859220818, -3.17551110051941, -3.23632739716877, + -3.25872972467907, -3.31877352727634, -3.29714369381812, + -3.35795999046747, -3.37881732987362, -3.43886113247089, + -3.41877628711682, -3.47959258376618, -3.49890493506816, + -3.55894873766544, -3.54040888041553, -3.60122517706488, + -3.61899254026271, -3.67903634285998, -3.66204147371424, + -3.72285777036359, -3.73908014545726, -3.79912394805453, + -3.78367406701294, -3.84449036366229, -3.8591677506518, + -3.91921155324908, -3.90530666031165, -3.966122956961, -3.97925535584635, + -4.03929915844362, -4.02693925361035, -4.08775555025971, + -4.0993429610409, -4.15938676363817, -4.14857184690906, + -4.20938814355841, -4.21943056623545, -4.27947436883272, + -4.27020444020777, -4.33102073685712, -4.33951817142999, + -4.39956197402727, -4.39183703350647, -4.45265333015582, + -4.45960577662454, -4.51964957922181, -4.51346962680518, + -4.57428592345453, -4.57969338181909, -4.63973718441636, + -4.63510222010388, -4.69591851675323, -4.69978098701363, + -4.75982478961091, -4.75673481340259, -4.81755111005194, + -4.81986859220818, -4.87991239480545, -4.87836740670129, + -4.93918370335065, -4.93995619740273, -5, -5, -2.21189961513043, + -2.24585795233271, -2.30445671930436, -2.27122089991489, + -2.33054218469935, -2.363055486276, -2.42165425324765, -2.38986346948381, + -2.44918475426827, -2.48025302021929, -2.53885178719094, + -2.50850603905273, -2.56782732383718, -2.59745055416258, + -2.65604932113423, -2.62714860862164, -2.6864698934061, + -2.71464808810587, -2.77324685507751, -2.74579117819056, + -2.80511246297502, -2.83184562204916, -2.8904443890208, + -2.86443374775948, -2.92375503254394, -2.94904315599245, + -3.00764192296409, -2.9830763173284, -3.04239760211286, + -3.06624068993574, -3.12483945690738, -3.10171888689731, + -3.16104017168177, -3.18343822387902, -3.24203699085067, + -3.22036145646623, -3.27968274125069, -3.30063575782231, + -3.35923452479396, -3.33900402603515, -3.39832531081961, + -3.4178332917656, -3.47643205873725, -3.45764659560407, + -3.51696788038853, -3.53503082570889, -3.59362959268054, + -3.57628916517299, -3.63561044995744, -3.65222835965218, + -3.71082712662382, -3.6949317347419, -3.75425301952636, + -3.76942589359547, -3.82802466056711, -3.81357430431082, + -3.87289558909528, -3.88662342753876, -3.9452221945104, + -3.93221687387974, -3.9915381586642, -4.00382096148205, + -4.06241972845369, -4.05085944344866, -4.11018072823312, + -4.12101849542533, -4.17961726239698, -4.16950201301758, + -4.22882329780203, -4.23821602936862, -4.29681479634027, + -4.28814458258649, -4.34746586737095, -4.35541356331191, + -4.41401233028356, -4.40678715215541, -4.46610843693987, + -4.4726110972552, -4.53120986422685, -4.52542972172433, + -4.58475100650879, -4.58980863119849, -4.64840739817013, + -4.64407229129325, -4.70339357607771, -4.70700616514178, + -4.76560493211342, -4.76271486086216, -4.82203614564662, + -4.82420369908507, -4.88280246605671, -4.88135743043108, + -4.94067871521554, -4.94140123302836, -5, -5, -2.27739047973363, + -2.30892300713455, -2.36617996442956, -2.33531834186696, + -2.39324620400029, -2.42343692172457, -2.48069387901958, + -2.45117406613361, -2.50910192826694, -2.53795083631459, + -2.5952077936096, -2.56702979040027, -2.62495765253359, + -2.65246475090461, -2.70972170819962, -2.68288551466692, + -2.74081337680025, -2.76697866549463, -2.82423562278964, + -2.79874123893357, -2.8566691010669, -2.88149258008465, + -2.93874953737966, -2.91459696320023, -2.97252482533356, + -2.99600649467466, -3.05326345196967, -3.03045268746688, + -3.08838054960021, -3.11052040926468, -3.16777736655969, + -3.14630841173354, -3.20423627386686, -3.2250343238547, + -3.28229128114971, -3.26216413600019, -3.32009199813352, + -3.33954823844472, -3.39680519573973, -3.37801986026684, + -3.43594772240017, -3.45406215303474, -3.51131911032975, + -3.4938755845335, -3.55180344666683, -3.56857606762476, + -3.62583302491977, -3.60973130880015, -3.66765917093348, + -3.68308998221478, -3.74034693950979, -3.72558703306681, + -3.78351489520013, -3.7976038968048, -3.85486085409981, + -3.84144275733346, -3.89937061946679, -3.91211781139482, + -3.96937476868983, -3.95729848160011, -4.01522634373344, + -4.02663172598484, -4.08388868327985, -4.07315420586677, + -4.1310820680001, -4.14114564057486, -4.19840259786987, + -4.18900993013342, -4.24693779226675, -4.25565955516488, + -4.31291651245988, -4.30486565440008, -4.3627935165334, + -4.37017346975489, -4.4274304270499, -4.42072137866673, + -4.47864924080006, -4.48468738434491, -4.54194434163992, + -4.53657710293338, -4.59450496506671, -4.59920129893493, + -4.65645825622994, -4.65243282720004, -4.71036068933337, + -4.71371521352495, -4.77097217081996, -4.76828855146669, + -4.82621641360002, -4.82822912811497, -4.88548608540998, + -4.88414427573335, -4.94207213786667, -4.94274304270499, -5, -5, + -2.3379582934176, -2.36699357970066, -2.42301499289852, + -2.39459747866404, -2.45123666391047, -2.47903640609638, + -2.53505781929423, -2.50787584915691, -2.56451503440334, + -2.59107923249209, -2.64710064568995, -2.62115421964977, + -2.67779340489621, -2.70312205888781, -2.75914347208567, + -2.73443259014264, -2.79107177538908, -2.81516488528353, + -2.87118629848138, -2.84771096063551, -2.90435014588194, + -2.92720771167924, -2.9832291248771, -2.96098933112838, + -3.01762851637481, -3.03925053807496, -3.09527195127282, + -3.07426770162125, -3.13090688686768, -3.15129336447068, + -3.20731477766853, -3.18754607211411, -3.24418525736055, + -3.26333619086639, -3.31935760406425, -3.30082444260698, + -3.35746362785342, -3.37537901726211, -3.43140043045997, + -3.41410281309985, -3.47074199834628, -3.48742184365783, + -3.54344325685568, -3.52738118359272, -3.58402036883915, + -3.59946467005354, -3.6554860832514, -3.64065955408559, + -3.69729873933202, -3.71150749644926, -3.76752890964712, + -3.75393792457845, -3.81057710982489, -3.82355032284498, + -3.87957173604283, -3.86721629507132, -3.92385548031775, + -3.93559314924069, -3.99161456243855, -3.98049466556419, + -4.03713385081062, -4.04763597563641, -4.10365738883427, + -4.09377303605706, -4.15041222130349, -4.15967880203213, + -4.21570021522998, -4.20705140654993, -4.26369059179636, + -4.27172162842784, -4.3277430416257, -4.32032977704279, + -4.37696896228923, -4.38376445482356, -4.43978586802142, + -4.43360814753566, -4.49024733278209, -4.49580728121927, + -4.55182869441713, -4.54688651802853, -4.60352570327496, + -4.60785010761499, -4.66387152081285, -4.6601648885214, + -4.71680407376783, -4.71989293401071, -4.77591434720857, + -4.77344325901426, -4.8300824442607, -4.83193576040643, + -4.88795717360428, -4.88672162950713, -4.94336081475357, + -4.94397858680214, -5, -5, -2.39346585060369, -2.41993812150671, + -2.47483305509168, -2.4489240239951, -2.50438219738651, + -2.52972798867664, -2.5846229222616, -2.55984037077792, + -2.61529854416933, -2.63951785584657, -2.69441278943153, + -2.67075671756074, -2.72621489095215, -2.74930772301649, + -2.80420265660146, -2.78167306434356, -2.83713123773497, + -2.85909759018642, -2.91399252377138, -2.89258941112638, + -2.94804758451779, -2.96888745735635, -3.02378239094131, + -3.00350575790921, -3.05896393130062, -3.07867732452627, + -3.13357225811124, -3.11442210469203, -3.16988027808344, + -3.1884671916962, -3.24336212528117, -3.22533845147485, + -3.28079662486626, -3.29825705886613, -3.35315199245109, + -3.33625479825767, -3.39171297164908, -3.40804692603606, + -3.46294185962102, -3.44717114504049, -3.5026293184319, + -3.51783679320598, -3.57273172679095, -3.55808749182331, + -3.61354566521473, -3.62762666037591, -3.68252159396087, + -3.66900383860614, -3.72446201199755, -3.73741652754584, + -3.7923114611308, -3.77992018538896, -3.83537835878037, + -3.84720639471576, -3.90210132830073, -3.89083653217178, + -3.94629470556319, -3.95699626188569, -4.01189119547066, + -4.0017528789546, -4.05721105234601, -4.06678612905562, + -4.12168106264058, -4.11266922573742, -4.16812739912884, + -4.17657599622555, -4.23147092981051, -4.22358557252025, + -4.27904374591166, -4.28636586339547, -4.34126079698044, + -4.33450191930307, -4.38996009269448, -4.3961557305654, + -4.45105066415036, -4.44541826608589, -4.5008764394773, + -4.50594559773533, -4.56084053132029, -4.55633461286871, + -4.61179278626012, -4.61573546490525, -4.67063039849022, + -4.66725095965153, -4.72270913304295, -4.72552533207518, + -4.78042026566015, -4.77816730643436, -4.83362547982577, + -4.83531519924511, -4.89021013283007, -4.88908365321718, + -4.94454182660859, -4.94510506641504, -5, -5, -2.44378740882173, + -2.46763669613675, -2.52151676643171, -2.4981749107617, + -2.55256241270166, -2.57539683672668, -2.62927690702164, + -2.60694991464162, -2.66133741658158, -2.6831569773166, + -2.73703704761157, -2.71572491852155, -2.77011242046151, + -2.79091711790653, -2.84479718820149, -2.82449992240147, + -2.87888742434144, -2.89867725849645, -2.95255732879142, + -2.9332749262814, -2.98766242822136, -3.00643739908638, + -3.06031746938134, -3.04204993016133, -3.09643743210129, + -3.1141975396763, -3.16807760997127, -3.15082493404125, + -3.20521243598122, -3.22195768026623, -3.27583775056119, + -3.25959993792118, -3.31398743986114, -3.32971782085616, + -3.38359789115112, -3.36837494180111, -3.42276244374107, + -3.43747796144608, -3.49135803174104, -3.47714994568103, + -3.53153744762099, -3.54523810203601, -3.59911817233097, + -3.58592494956096, -3.64031245150092, -3.65299824262593, + -3.70687831292089, -3.69469995344088, -3.74908745538085, + -3.76075838321586, -3.81463845351082, -3.80347495732081, + -3.85786245926077, -3.86851852380578, -3.92239859410075, + -3.91224996120074, -3.9666374631407, -3.97627866439571, + -4.03015873469067, -4.02102496508066, -4.07541246702063, + -4.08403880498563, -4.1379188752806, -4.12979996896059, + -4.18418747090055, -4.19179894557556, -4.24567901587052, + -4.23857497284052, -4.29296247478048, -4.29955908616548, + -4.35343915646045, -4.34734997672044, -4.40173747866041, + -4.40731922675541, -4.46119929705037, -4.45612498060037, + -4.51051248254033, -4.51507936734534, -4.5689594376403, -4.5648999844803, + -4.61928748642026, -4.62283950793526, -4.67671957823022, + -4.67367498836022, -4.72806249030018, -4.73059964852519, + -4.78447971882015, -4.78244999224015, -4.83683749418011, + -4.83835978911511, -4.89223985941007, -4.89122499612007, + -4.94561249806004, -4.94611992970504, -5, -5, -2.48880897355726, + -2.50998125097776, -2.56296037329738, -2.54223856986455, + -2.59566816617184, -2.615939495617, -2.66891861793663, -2.64909776247913, + -2.70252735878643, -2.72189774025625, -2.77487686257587, + -2.75595695509372, -2.80938655140101, -2.82785598489549, + -2.88083510721511, -2.8628161477083, -2.91624574401559, + -2.93381422953474, -2.98679335185436, -2.96967534032289, + -3.02310493663018, -3.03977247417398, -3.0927515964936, + -3.07653453293747, -3.12996412924476, -3.14573071881323, + -3.19870984113285, -3.18339372555206, -3.23682332185935, + -3.25168896345247, -3.30466808577209, -3.29025291816664, + -3.34368251447393, -3.35764720809171, -3.41062633041134, + -3.39711211078123, -3.45054170708852, -3.46360545273096, + -3.51658457505058, -3.50397130339581, -3.5574008997031, -3.5695636973702, + -3.62254281968982, -3.6108304960104, -3.66426009231769, + -3.67552194200945, -3.72850106432907, -3.71768968862498, + -3.77111928493227, -3.78148018664869, -3.83445930896831, + -3.82454888123957, -3.87797847754686, -3.88743843128794, + -3.94041755360756, -3.93140807385415, -3.98483767016144, + -3.99339667592718, -4.0463757982468, -4.03826726646874, + -4.09169686277603, -4.09935492056642, -4.15233404288605, + -4.14512645908332, -4.19855605539061, -4.20531316520567, + -4.25829228752529, -4.25198565169791, -4.3054152480052, + -4.31127140984491, -4.36425053216453, -4.35884484431249, + -4.41227444061978, -4.41722965448416, -4.47020877680378, + -4.46570403692708, -4.51913363323437, -4.5231878991234, + -4.57616702144302, -4.57256322954166, -4.62599282584895, + -4.62914614376264, -4.68212526608227, -4.67942242215625, + -4.73285201846354, -4.73510438840189, -4.78808351072151, + -4.78628161477083, -4.83971121107812, -4.84106263304113, + -4.89404175536076, -4.89314080738542, -4.94657040369271, + -4.94702087768038, -5, -5, -2.52842855648567, -2.54687586199357, + -2.59906999258946, -2.58101518294342, -2.63360180940117, + -2.65126412318534, -2.70345825378122, -2.68618843585892, + -2.73877506231667, -2.7556523843771, -2.80784651497298, + -2.79136168877443, -2.84394831523218, -2.86004064556886, + -2.91223477616474, -2.89653494168993, -2.94912156814768, + -2.96442890676063, -3.01662303735651, -3.00170819460543, + -3.05429482106318, -3.06881716795239, -3.12101129854827, + -3.10688144752094, -3.15946807397869, -3.17320542914415, + -3.22539955974003, -3.21205470043644, -3.26464132689419, + -3.27759369033591, -3.3297878209318, -3.31722795335194, -3.3698145798097, + -3.38198195152768, -3.43417608212356, -3.42240120626745, + -3.4749878327252, -3.48637021271944, -3.53856434331532, + -3.52757445918295, -3.5801610856407, -3.5907584739112, -3.64295260450708, + -3.63274771209845, -3.68533433855621, -3.69514673510296, + -3.74734086569885, -3.73792096501396, -3.79050759147171, + -3.79953499629473, -3.85172912689061, -3.84309421792946, + -3.89568084438721, -3.90392325748649, -3.95611738808237, + -3.94826747084497, -4.00085409730272, -4.00831151867825, + -4.06050564927413, -4.05344072376047, -4.10602735021822, + -4.11269977987002, -4.1648939104659, -4.15861397667597, + -4.21120060313372, -4.21708804106178, -4.26928217165766, + -4.26378722959148, -4.31637385604923, -4.32147630225354, + -4.37367043284942, -4.36896048250698, -4.42154710896473, + -4.42586456344531, -4.47805869404119, -4.47413373542248, + -4.52672036188023, -4.53025282463707, -4.58244695523295, + -4.57930698833799, -4.63189361479574, -4.63464108582883, + -4.68683521642471, -4.68448024125349, -4.73706686771124, + -4.73902934702059, -4.79122347761647, -4.78965349416899, + -4.84224012062675, -4.84341760821236, -4.89561173880824, + -4.8948267470845, -4.94741337354225, -4.94780586940412, -5, -5, + -2.56255640650863, -2.57823695102368, -2.62976382440616, + -2.61441690849781, -2.66627741048698, -2.68129069778863, + -2.73281757117111, -2.71813791247616, -2.76999841446534, + -2.78434444455358, -2.83587131793606, -2.82185891645452, + -2.8737194184437, -2.88739819131853, -2.93892506470101, + -2.92557992043288, -2.97744042242205, -2.99045193808348, + -3.04197881146596, -3.02930092441123, -3.08116142640041, + -3.09350568484843, -3.14503255823091, -3.13302192838959, + -3.18488243037877, -3.19655943161338, -3.24808630499586, + -3.23674293236794, -3.28860343435712, -3.29961317837833, + -3.35114005176081, -3.3404639363463, -3.39232443833548, + -3.40266692514328, -3.45419379852575, -3.44418494032466, + -3.49604544231383, -3.50572067190823, -3.5572475452907, + -3.54790594430301, -3.59976644629219, -3.60877441867318, + -3.66030129205565, -3.65162694828137, -3.70348745027055, + -3.71182816543813, -3.7633550388206, -3.75534795225973, -3.8072084542489, + -3.81488191220308, -3.86640878558555, -3.85906895623808, + -3.91092945822726, -3.91793565896803, -3.9694625323505, + -3.96278996021644, -4.01465046220562, -4.02098940573298, + -4.07251627911545, -4.06651096419479, -4.11837146618397, + -4.12404315249793, -4.1755700258804, -4.17023196817315, + -4.22209247016233, -4.22709689926288, -4.27862377264535, + -4.27395297215151, -4.32581347414069, -4.33015064602783, + -4.3816775194103, -4.37767397612986, -4.42953447811904, + -4.43320439279278, -4.48473126617525, -4.48139498010822, + -4.5332554820974, -4.53625813955773, -4.5877850129402, -4.58511598408658, + -4.63697648607575, -4.63931188632268, -4.69083875970515, + -4.68883698806493, -4.74069749005411, -4.74236563308763, + -4.7938925064701, -4.79255799204329, -4.84441849403247, + -4.84541937985258, -4.89694625323505, -4.89627899602164, + -4.94813949801082, -4.94847312661753, -5, -5, -2.59111521306916, + -2.60399347511464, -2.65497233734624, -2.6423680808762, + -2.69362094868324, -2.70595119957785, -2.75693006180945, + -2.74487381649028, -2.79612668429732, -2.80790892404105, + -2.85888778627266, -2.84737955210436, -2.8986324199114, + -2.90986664850426, -2.96084551073586, -2.94988528771844, + -3.00113815552547, -3.01182437296747, -3.06280323519907, + -3.05239102333251, -3.10364389113955, -3.11378209743067, + -3.16476095966228, -3.15489675894659, -3.20614962675363, + -3.21573982189388, -3.26671868412548, -3.25740249456067, + -3.30865536236771, -3.31769754635709, -3.36867640858869, + -3.35990823017475, -3.41116109798179, -3.41965527082029, + -3.4706341330519, -3.46241396578883, -3.51366683359587, -3.5216129952835, + -3.57259185751511, -3.5649197014029, -3.61617256920994, + -3.62357071974671, -3.67454958197831, -3.66742543701698, + -3.71867830482402, -3.72552844420992, -3.77650730644152, + -3.76993117263106, -3.8211840404381, -3.82748616867312, + -3.87846503090473, -3.87243690824514, -3.92368977605218, + -3.92944389313633, -3.98042275536793, -3.97494264385922, + -4.02619551166626, -4.03140161759954, -4.08238047983114, + -4.0774483794733, -4.12870124728033, -4.13335934206274, + -4.18433820429435, -4.17995411508737, -4.23120698289441, + -4.23531706652595, -4.28629592875755, -4.28245985070145, + -4.33371271850849, -4.33727479098916, -4.38825365322076, + -4.38496558631553, -4.43621845412257, -4.43923251545236, + -4.49021137768397, -4.48747132192961, -4.53872418973665, + -4.54119023991557, -4.59216910214717, -4.58997705754369, + -4.64122992535073, -4.64314796437878, -4.69412682661038, + -4.69248279315777, -4.7437356609648, -4.74510568884198, + -4.79608455107359, -4.79498852877184, -4.84624139657888, + -4.84706341330519, -4.89804227553679, -4.89749426438592, + -4.94874713219296, -4.9490211377684, -5, -5, -2.61404028128492, + -2.62408708745521, -2.67463842601999, -2.66480538168312, + -2.71557048208131, -2.72518976458477, -2.77574110314956, + -2.7663355824795, -2.8171006828777, -2.82629244171434, -2.87684378027912, + -2.86786578327589, -2.91863088367408, -2.9273951188439, + -2.97794645740869, -2.96939598407228, -3.02016108447047, + -3.02849779597347, -3.07904913453825, -3.07092618486866, + -3.12169128526686, -3.12960047310304, -3.18015181166782, + -3.17245638566505, -3.22322148606324, -3.2307031502326, + -3.28125448879738, -3.27398658646143, -3.32475168685963, + -3.33180582736217, -3.38235716592695, -3.37551678725782, + -3.42628188765601, -3.43290850449173, -3.48345984305652, + -3.47704698805421, -3.5278120884524, -3.5340111816213, -3.58456252018608, + -3.57857718885059, -3.62934228924879, -3.63511385875086, + -3.68566519731565, -3.68010738964698, -3.73087249004517, + -3.73621653588043, -3.78676787444521, -3.78163759044337, + -3.83240269084156, -3.83731921301, -3.88787055157478, -3.88316779123975, + -3.93393289163794, -3.93842189013956, -3.98897322870434, + -3.98469799203614, -4.03546309243433, -4.03952456726913, + -4.09007590583391, -4.08622819283252, -4.13699329323072, + -4.14062724439869, -4.19117858296347, -4.18775839362891, + -4.2385234940271, -4.24172992152826, -4.29228126009304, -4.2892885944253, + -4.34005369482349, -4.34283259865782, -4.39338393722261, + -4.39081879522168, -4.44158389561988, -4.44393527578739, + -4.49448661435217, -4.49234899601807, -4.54311409641626, + -4.54503795291695, -4.59558929148174, -4.59387919681446, + -4.64464429721265, -4.64614063004652, -4.6966919686113, + -4.69540939761084, -4.74617449800903, -4.74724330717609, + -4.79779464574087, -4.79693959840723, -4.84770469880542, + -4.84834598430565, -4.89889732287043, -4.89846979920361, + -4.94923489960181, -4.94944866143522, -5, -5, -2.63127967850293, + -2.63847226955065, -2.68871754041127, -2.68167798321563, + -2.73207628792833, -2.73896281127189, -2.78920808213252, + -2.78247459264104, -2.83287289735374, -2.83945335299314, + -2.88969862385377, -2.88327120206645, -2.93366950677915, + -2.93994389471439, -2.99018916557502, -2.98406781149185, + -3.03446611620456, -3.04043443643564, -3.09067970729627, + -3.08486442091726, -3.13526272562996, -3.14092497815689, + -3.19117024901752, -3.18566103034267, -3.23605933505537, + -3.24141551987814, -3.29166079073876, -3.28645763976807, + -3.33685594448078, -3.34190606159939, -3.39215133246001, + -3.38725424919348, -3.43765255390619, -3.44239660332064, + -3.49264187418126, -3.48805085861889, -3.53844916333159, + -3.54288714504189, -3.59313241590251, -3.5888474680443, -3.639245772757, + -3.64337768676314, -3.69362295762376, -3.6896440774697, + -3.74004238218241, -3.74386822848439, -3.79411349934501, + -3.79044068689511, -3.84083899160782, -3.84435877020563, + -3.89460404106626, -3.89123729632052, -3.94163560103322, + -3.94484931192688, -3.99509458278751, -3.99203390574593, + -4.04243221045863, -4.04533985364813, -4.09558512450876, + -4.09283051517133, -4.14322881988404, -4.14583039536938, + -4.19607566623001, -4.19362712459674, -4.24402542930944, + -4.24632093709063, -4.29656620795126, -4.29442373402215, + -4.34482203873485, -4.34681147881188, -4.3970567496725, + -4.39522034344755, -4.44561864816026, -4.44730202053313, + -4.49754729139375, -4.49601695287296, -4.54641525758567, + -4.54779256225438, -4.598037833115, -4.59681356229837, -4.64721186701107, + -4.64828310397563, -4.69852837483625, -4.69761017172378, + -4.74800847643648, -4.74877364569688, -4.7990189165575, + -4.79840678114918, -4.84880508586189, -4.84926418741813, + -4.89950945827875, -4.89920339057459, -4.9496016952873, + -4.94975472913938, -5, -5, -2.64279435194369, -2.64711643433674, + -2.69717778679766, -2.69294766360447, -2.74310097526524, + -2.74723913925858, -2.7973004917195, -2.79325428692601, + -2.84340759858678, -2.84736184418042, -2.89742319664134, + -2.89356091024756, -2.94371422190833, -2.94748454910226, + -2.99754590156318, -2.9938675335691, -3.04402084522987, -3.0476072540241, + -3.09766860648502, -3.09417415689065, -3.14432746855142, + -3.14772995894594, -3.19779131140687, -3.19448078021219, + -3.24463409187296, -3.24785266386779, -3.29791401632871, + -3.29478740353374, -3.34494071519451, -3.34797536878963, + -3.39803672125055, -3.39509402685528, -3.44524733851605, + -3.44809807371147, -3.49815942617239, -3.49540065017683, + -3.5455539618376, -3.54822077863331, -3.59828213109423, + -3.59570727349837, -3.64586058515914, -3.64834348355515, + -3.69840483601607, -3.69601389681992, -3.74616720848069, + -3.74846618847699, -3.79852754093791, -3.79632052014146, + -3.84647383180223, -3.84858889339883, -3.89865024585975, + -3.89662714346301, -3.94678045512378, -3.94871159832067, + -3.99877295078159, -3.99693376678455, -4.04708707844532, + -4.04883430324251, -4.09889565570343, -4.0972403901061, + -4.14739370176687, -4.14895700816435, -4.19901836062527, + -4.19754701342764, -4.24770032508841, -4.24907971308619, + -4.29914106554711, -4.29785363674919, -4.34800694840996, + -4.34920241800804, -4.39926377046895, -4.39816026007073, + -4.4483135717315, -4.44932512292988, -4.4993864753908, -4.49846688339228, + -4.54862019505305, -4.54944782785172, -4.59950918031264, + -4.59877350671382, -4.64892681837459, -4.64957053277356, + -4.69963188523448, -4.69908013003537, -4.74923344169614, + -4.7496932376954, -4.79975459015632, -4.79938675335691, + -4.84954006501768, -4.84981594261724, -4.89987729507816, + -4.89969337667845, -4.94984668833923, -4.94993864753908, -5, -5, + -2.64855821716837, -2.65, -2.7, -2.69858889339883, -2.74861956962929, + -2.75, -2.8, -2.79865024585975, -2.84868092209021, -2.85, -2.9, + -2.89871159832067, -2.94874227455113, -2.95, -3, -2.99877295078159, + -3.04880362701205, -3.05, -3.1, -3.09883430324251, -3.14886497947297, + -3.15, -3.2, -3.19889565570343, -3.24892633193389, -3.25, -3.3, + -3.29895700816435, -3.34898768439481, -3.35, -3.4, -3.39901836062527, + -3.44904903685573, -3.45, -3.5, -3.49907971308619, -3.54911038931665, + -3.55, -3.6, -3.59914106554711, -3.64917174177757, -3.65, -3.7, + -3.69920241800803, -3.7492330942385, -3.75, -3.8, -3.79926377046896, + -3.84929444669942, -3.85, -3.9, -3.89932512292988, -3.94935579916034, + -3.95, -4, -3.9993864753908, -4.04941715162126, -4.05, -4.1, + -4.09944782785172, -4.14947850408218, -4.15, -4.2, -4.19950918031264, + -4.2495398565431, -4.25, -4.3, -4.29957053277356, -4.34960120900402, + -4.35, -4.4, -4.39963188523448, -4.44966256146494, -4.45, -4.5, + -4.4996932376954, -4.54972391392586, -4.55, -4.6, -4.59975459015632, + -4.64978526638678, -4.65, -4.7, -4.69981594261724, -4.7498466188477, + -4.75, -4.8, -4.79987729507816, -4.84990797130862, -4.85, -4.9, + -4.89993864753908, -4.94996932376954, -4.95, -5, -5, -2.64855821716837, + -2.64711643433674, -2.69717778679766, -2.69858889339883, + -2.74861956962929, -2.74723913925858, -2.7973004917195, + -2.79865024585975, -2.84868092209021, -2.84736184418042, + -2.89742319664134, -2.89871159832067, -2.94874227455113, + -2.94748454910226, -2.99754590156318, -2.99877295078159, + -3.04880362701205, -3.0476072540241, -3.09766860648502, + -3.09883430324251, -3.14886497947297, -3.14772995894594, + -3.19779131140687, -3.19889565570343, -3.24892633193389, + -3.24785266386779, -3.29791401632871, -3.29895700816435, + -3.34898768439481, -3.34797536878963, -3.39803672125055, + -3.39901836062527, -3.44904903685573, -3.44809807371147, + -3.49815942617239, -3.49907971308619, -3.54911038931665, + -3.54822077863331, -3.59828213109423, -3.59914106554711, + -3.64917174177757, -3.64834348355515, -3.69840483601607, + -3.69920241800803, -3.7492330942385, -3.74846618847699, + -3.79852754093791, -3.79926377046896, -3.84929444669942, + -3.84858889339883, -3.89865024585975, -3.89932512292988, + -3.94935579916034, -3.94871159832067, -3.99877295078159, + -3.9993864753908, -4.04941715162126, -4.04883430324251, + -4.09889565570343, -4.09944782785172, -4.14947850408218, + -4.14895700816435, -4.19901836062527, -4.19950918031264, + -4.2495398565431, -4.24907971308619, -4.29914106554711, + -4.29957053277356, -4.34960120900402, -4.34920241800804, + -4.39926377046895, -4.39963188523448, -4.44966256146494, + -4.44932512292988, -4.4993864753908, -4.4996932376954, -4.54972391392586, + -4.54944782785172, -4.59950918031264, -4.59975459015632, + -4.64978526638678, -4.64957053277356, -4.69963188523448, + -4.69981594261724, -4.7498466188477, -4.7496932376954, -4.79975459015632, + -4.79987729507816, -4.84990797130862, -4.84981594261724, + -4.89987729507816, -4.89993864753908, -4.94996932376954, + -4.94993864753908, -5, -5, -2.64279435194369, -2.63847226955065, + -2.68871754041127, -2.69294766360447, -2.74310097526524, + -2.73896281127189, -2.78920808213252, -2.79325428692601, + -2.84340759858678, -2.83945335299314, -2.88969862385377, + -2.89356091024756, -2.94371422190833, -2.93994389471439, + -2.99018916557502, -2.9938675335691, -3.04402084522987, + -3.04043443643564, -3.09067970729627, -3.09417415689065, + -3.14432746855142, -3.14092497815689, -3.19117024901752, + -3.19448078021219, -3.24463409187296, -3.24141551987814, + -3.29166079073876, -3.29478740353374, -3.34494071519451, + -3.34190606159939, -3.39215133246001, -3.39509402685528, + -3.44524733851605, -3.44239660332064, -3.49264187418126, + -3.49540065017683, -3.5455539618376, -3.54288714504189, + -3.59313241590251, -3.59570727349837, -3.64586058515914, + -3.64337768676314, -3.69362295762376, -3.69601389681992, + -3.74616720848069, -3.74386822848439, -3.79411349934501, + -3.79632052014146, -3.84647383180223, -3.84435877020563, + -3.89460404106626, -3.89662714346301, -3.94678045512378, + -3.94484931192688, -3.99509458278751, -3.99693376678455, + -4.04708707844532, -4.04533985364813, -4.09558512450876, + -4.0972403901061, -4.14739370176687, -4.14583039536938, + -4.19607566623001, -4.19754701342764, -4.24770032508841, + -4.24632093709063, -4.29656620795126, -4.29785363674919, + -4.34800694840996, -4.34681147881188, -4.3970567496725, + -4.39816026007073, -4.4483135717315, -4.44730202053313, + -4.49754729139375, -4.49846688339228, -4.54862019505305, + -4.54779256225438, -4.598037833115, -4.59877350671382, -4.64892681837459, + -4.64828310397563, -4.69852837483625, -4.69908013003537, + -4.74923344169614, -4.74877364569688, -4.7990189165575, + -4.79938675335691, -4.84954006501768, -4.84926418741813, + -4.89950945827875, -4.89969337667845, -4.94984668833923, + -4.94975472913938, -5, -5, -2.63127967850293, -2.62408708745521, + -2.67463842601999, -2.68167798321563, -2.73207628792833, + -2.72518976458477, -2.77574110314956, -2.78247459264104, + -2.83287289735374, -2.82629244171434, -2.87684378027912, + -2.88327120206645, -2.93366950677915, -2.92739511884391, + -2.97794645740869, -2.98406781149185, -3.03446611620456, + -3.02849779597347, -3.07904913453825, -3.08486442091726, + -3.13526272562996, -3.12960047310304, -3.18015181166782, + -3.18566103034267, -3.23605933505537, -3.2307031502326, + -3.28125448879738, -3.28645763976807, -3.33685594448078, + -3.33180582736217, -3.38235716592695, -3.38725424919348, + -3.43765255390619, -3.43290850449173, -3.48345984305652, + -3.48805085861889, -3.53844916333159, -3.5340111816213, + -3.58456252018608, -3.5888474680443, -3.639245772757, -3.63511385875086, + -3.68566519731565, -3.6896440774697, -3.74004238218241, + -3.73621653588043, -3.78676787444521, -3.79044068689511, + -3.84083899160782, -3.83731921301, -3.88787055157478, -3.89123729632052, + -3.94163560103322, -3.93842189013956, -3.98897322870434, + -3.99203390574593, -4.04243221045863, -4.03952456726913, + -4.09007590583391, -4.09283051517133, -4.14322881988404, + -4.14062724439869, -4.19117858296347, -4.19362712459674, + -4.24402542930945, -4.24172992152826, -4.29228126009304, + -4.29442373402215, -4.34482203873485, -4.34283259865782, + -4.39338393722261, -4.39522034344755, -4.44561864816026, + -4.44393527578739, -4.49448661435217, -4.49601695287296, + -4.54641525758567, -4.54503795291695, -4.59558929148174, + -4.59681356229837, -4.64721186701107, -4.64614063004652, + -4.6966919686113, -4.69761017172378, -4.74800847643648, + -4.74724330717609, -4.79779464574087, -4.79840678114918, + -4.84880508586189, -4.84834598430565, -4.89889732287043, + -4.89920339057459, -4.9496016952873, -4.94944866143522, -5, -5, + -2.61404028128492, -2.60399347511464, -2.65497233734624, + -2.66480538168312, -2.71557048208131, -2.70595119957785, + -2.75693006180945, -2.7663355824795, -2.8171006828777, -2.80790892404105, + -2.85888778627266, -2.86786578327589, -2.91863088367408, + -2.90986664850426, -2.96084551073586, -2.96939598407228, + -3.02016108447047, -3.01182437296747, -3.06280323519907, + -3.07092618486866, -3.12169128526686, -3.11378209743067, + -3.16476095966228, -3.17245638566505, -3.22322148606324, + -3.21573982189388, -3.26671868412548, -3.27398658646143, + -3.32475168685963, -3.31769754635709, -3.36867640858869, + -3.37551678725782, -3.42628188765601, -3.41965527082029, + -3.4706341330519, -3.47704698805421, -3.5278120884524, -3.5216129952835, + -3.57259185751511, -3.57857718885059, -3.62934228924879, + -3.62357071974671, -3.67454958197831, -3.68010738964698, + -3.73087249004517, -3.72552844420992, -3.77650730644152, + -3.78163759044337, -3.83240269084156, -3.82748616867312, + -3.87846503090473, -3.88316779123975, -3.93393289163794, + -3.92944389313633, -3.98042275536793, -3.98469799203614, + -4.03546309243433, -4.03140161759954, -4.08238047983114, + -4.08622819283252, -4.13699329323072, -4.13335934206274, + -4.18433820429435, -4.18775839362891, -4.2385234940271, + -4.23531706652595, -4.28629592875755, -4.2892885944253, + -4.34005369482349, -4.33727479098916, -4.38825365322076, + -4.39081879522168, -4.44158389561988, -4.43923251545236, + -4.49021137768397, -4.49234899601807, -4.54311409641626, + -4.54119023991557, -4.59216910214717, -4.59387919681446, + -4.64464429721265, -4.64314796437878, -4.69412682661038, + -4.69540939761084, -4.74617449800903, -4.74510568884198, + -4.79608455107359, -4.79693959840723, -4.84770469880542, + -4.84706341330519, -4.89804227553679, -4.89846979920361, + -4.94923489960181, -4.9490211377684, -5, -5, -2.59111521306916, + -2.57823695102368, -2.62976382440616, -2.6423680808762, + -2.69362094868324, -2.68129069778863, -2.73281757117111, + -2.74487381649028, -2.79612668429732, -2.78434444455358, + -2.83587131793606, -2.84737955210436, -2.8986324199114, + -2.88739819131853, -2.93892506470101, -2.94988528771844, + -3.00113815552547, -2.99045193808348, -3.04197881146596, + -3.05239102333251, -3.10364389113955, -3.09350568484843, + -3.14503255823091, -3.15489675894659, -3.20614962675363, + -3.19655943161338, -3.24808630499586, -3.25740249456067, + -3.30865536236771, -3.29961317837833, -3.35114005176081, + -3.35990823017475, -3.41116109798179, -3.40266692514328, + -3.45419379852576, -3.46241396578883, -3.51366683359587, + -3.50572067190823, -3.5572475452907, -3.56491970140291, + -3.61617256920994, -3.60877441867318, -3.66030129205565, + -3.66742543701698, -3.71867830482402, -3.71182816543813, + -3.7633550388206, -3.76993117263106, -3.8211840404381, -3.81488191220308, + -3.86640878558555, -3.87243690824514, -3.92368977605218, + -3.91793565896803, -3.9694625323505, -3.97494264385922, + -4.02619551166626, -4.02098940573298, -4.07251627911545, + -4.0774483794733, -4.12870124728033, -4.12404315249793, -4.1755700258804, + -4.17995411508737, -4.23120698289441, -4.22709689926288, + -4.27862377264535, -4.28245985070145, -4.33371271850849, + -4.33015064602783, -4.3816775194103, -4.38496558631553, + -4.43621845412257, -4.43320439279278, -4.48473126617525, + -4.48747132192961, -4.53872418973665, -4.53625813955773, + -4.5877850129402, -4.58997705754369, -4.64122992535073, + -4.63931188632268, -4.69083875970515, -4.69248279315777, + -4.7437356609648, -4.74236563308763, -4.7938925064701, -4.79498852877184, + -4.84624139657888, -4.84541937985258, -4.89694625323505, + -4.89749426438592, -4.94874713219296, -4.94847312661753, -5, -5, + -2.56255640650863, -2.54687586199357, -2.59906999258946, + -2.61441690849781, -2.66627741048698, -2.65126412318534, + -2.70345825378122, -2.71813791247616, -2.76999841446534, + -2.7556523843771, -2.80784651497298, -2.82185891645452, -2.8737194184437, + -2.86004064556886, -2.91223477616474, -2.92557992043288, + -2.97744042242205, -2.96442890676063, -3.01662303735651, + -3.02930092441123, -3.08116142640041, -3.06881716795239, + -3.12101129854827, -3.13302192838959, -3.18488243037877, + -3.17320542914415, -3.22539955974003, -3.23674293236794, + -3.28860343435712, -3.27759369033591, -3.3297878209318, -3.3404639363463, + -3.39232443833548, -3.38198195152768, -3.43417608212356, + -3.44418494032466, -3.49604544231383, -3.48637021271944, + -3.53856434331532, -3.54790594430301, -3.59976644629219, + -3.5907584739112, -3.64295260450708, -3.65162694828137, + -3.70348745027055, -3.69514673510296, -3.74734086569885, + -3.75534795225973, -3.8072084542489, -3.79953499629473, + -3.85172912689061, -3.85906895623808, -3.91092945822726, + -3.90392325748649, -3.95611738808237, -3.96278996021644, + -4.01465046220562, -4.00831151867825, -4.06050564927413, + -4.06651096419479, -4.11837146618397, -4.11269977987002, + -4.1648939104659, -4.17023196817315, -4.22209247016233, + -4.21708804106178, -4.26928217165766, -4.27395297215151, + -4.32581347414069, -4.32147630225354, -4.37367043284942, + -4.37767397612986, -4.42953447811904, -4.42586456344531, + -4.47805869404119, -4.48139498010822, -4.5332554820974, + -4.53025282463707, -4.58244695523295, -4.58511598408658, + -4.63697648607575, -4.63464108582883, -4.68683521642471, + -4.68883698806493, -4.74069749005411, -4.73902934702059, + -4.79122347761647, -4.79255799204329, -4.84441849403247, + -4.84341760821236, -4.89561173880824, -4.89627899602164, + -4.94813949801082, -4.94780586940412, -5, -5, -2.52842855648567, + -2.50998125097776, -2.56296037329738, -2.58101518294342, + -2.63360180940117, -2.61593949561701, -2.66891861793663, + -2.68618843585892, -2.73877506231667, -2.72189774025625, + -2.77487686257587, -2.79136168877443, -2.84394831523218, + -2.82785598489549, -2.88083510721512, -2.89653494168993, + -2.94912156814768, -2.93381422953474, -2.98679335185436, + -3.00170819460543, -3.05429482106319, -3.03977247417398, + -3.0927515964936, -3.10688144752094, -3.15946807397869, + -3.14573071881323, -3.19870984113285, -3.21205470043644, + -3.26464132689419, -3.25168896345247, -3.30466808577209, + -3.31722795335194, -3.3698145798097, -3.35764720809171, + -3.41062633041134, -3.42240120626745, -3.4749878327252, + -3.46360545273096, -3.51658457505058, -3.52757445918295, + -3.5801610856407, -3.5695636973702, -3.62254281968983, -3.63274771209845, + -3.68533433855621, -3.67552194200945, -3.72850106432907, + -3.73792096501396, -3.79050759147171, -3.78148018664869, + -3.83445930896831, -3.84309421792946, -3.89568084438721, + -3.88743843128794, -3.94041755360756, -3.94826747084497, + -4.00085409730272, -3.99339667592718, -4.0463757982468, + -4.05344072376047, -4.10602735021822, -4.09935492056642, + -4.15233404288605, -4.15861397667597, -4.21120060313372, + -4.20531316520567, -4.25829228752529, -4.26378722959148, + -4.31637385604923, -4.31127140984491, -4.36425053216453, + -4.36896048250698, -4.42154710896473, -4.41722965448416, + -4.47020877680378, -4.47413373542248, -4.52672036188023, + -4.5231878991234, -4.57616702144302, -4.57930698833799, + -4.63189361479574, -4.62914614376264, -4.68212526608227, + -4.68448024125349, -4.73706686771124, -4.73510438840189, + -4.78808351072151, -4.78965349416899, -4.84224012062675, + -4.84106263304113, -4.89404175536076, -4.8948267470845, + -4.94741337354225, -4.94702087768038, -5, -5, -2.48880897355726, + -2.46763669613675, -2.52151676643171, -2.54223856986455, + -2.59566816617184, -2.57539683672668, -2.62927690702164, + -2.64909776247913, -2.70252735878643, -2.6831569773166, + -2.73703704761157, -2.75595695509372, -2.80938655140101, + -2.79091711790653, -2.84479718820149, -2.8628161477083, -2.9162457440156, + -2.89867725849645, -2.95255732879142, -2.96967534032289, + -3.02310493663018, -3.00643739908638, -3.06031746938134, + -3.07653453293747, -3.12996412924476, -3.1141975396763, + -3.16807760997127, -3.18339372555206, -3.23682332185935, + -3.22195768026623, -3.27583775056119, -3.29025291816664, + -3.34368251447393, -3.32971782085616, -3.38359789115112, + -3.39711211078123, -3.45054170708852, -3.43747796144608, + -3.49135803174104, -3.50397130339581, -3.5574008997031, + -3.54523810203601, -3.59911817233097, -3.6108304960104, + -3.66426009231769, -3.65299824262593, -3.70687831292089, + -3.71768968862498, -3.77111928493227, -3.76075838321586, + -3.81463845351082, -3.82454888123957, -3.87797847754686, + -3.86851852380578, -3.92239859410075, -3.93140807385415, + -3.98483767016144, -3.97627866439571, -4.03015873469067, + -4.03826726646874, -4.09169686277603, -4.08403880498563, + -4.1379188752806, -4.14512645908332, -4.19855605539061, + -4.19179894557556, -4.24567901587052, -4.25198565169791, + -4.3054152480052, -4.29955908616548, -4.35343915646045, + -4.35884484431249, -4.41227444061978, -4.40731922675541, + -4.46119929705037, -4.46570403692708, -4.51913363323437, + -4.51507936734534, -4.5689594376403, -4.57256322954166, + -4.62599282584895, -4.62283950793526, -4.67671957823022, + -4.67942242215625, -4.73285201846354, -4.73059964852519, + -4.78447971882015, -4.78628161477083, -4.83971121107812, + -4.83835978911511, -4.89223985941007, -4.89314080738542, + -4.94657040369271, -4.94611992970504, -5, -5, -2.44378740882173, + -2.41993812150671, -2.47483305509168, -2.4981749107617, + -2.55256241270166, -2.52972798867664, -2.5846229222616, + -2.60694991464162, -2.66133741658158, -2.63951785584657, + -2.69441278943153, -2.71572491852155, -2.77011242046151, + -2.74930772301649, -2.80420265660146, -2.82449992240147, + -2.87888742434144, -2.85909759018642, -2.91399252377138, + -2.9332749262814, -2.98766242822136, -2.96888745735635, + -3.02378239094131, -3.04204993016133, -3.09643743210129, + -3.07867732452627, -3.13357225811124, -3.15082493404125, + -3.20521243598122, -3.1884671916962, -3.24336212528117, + -3.25959993792118, -3.31398743986114, -3.29825705886613, + -3.35315199245109, -3.36837494180111, -3.42276244374107, + -3.40804692603606, -3.46294185962102, -3.47714994568103, + -3.53153744762099, -3.51783679320598, -3.57273172679095, + -3.58592494956096, -3.64031245150092, -3.62762666037591, + -3.68252159396087, -3.69469995344088, -3.74908745538085, + -3.73741652754584, -3.7923114611308, -3.80347495732081, + -3.85786245926077, -3.84720639471576, -3.90210132830073, + -3.91224996120074, -3.9666374631407, -3.95699626188569, + -4.01189119547066, -4.02102496508066, -4.07541246702063, + -4.06678612905562, -4.12168106264058, -4.12979996896059, + -4.18418747090055, -4.17657599622555, -4.23147092981051, + -4.23857497284052, -4.29296247478048, -4.28636586339547, + -4.34126079698044, -4.34734997672044, -4.40173747866041, + -4.3961557305654, -4.45105066415036, -4.45612498060037, + -4.51051248254033, -4.50594559773533, -4.56084053132029, + -4.5648999844803, -4.61928748642026, -4.61573546490525, + -4.67063039849022, -4.67367498836022, -4.72806249030018, + -4.72552533207518, -4.78042026566015, -4.78244999224015, + -4.83683749418011, -4.83531519924511, -4.89021013283007, + -4.89122499612007, -4.94561249806004, -4.94510506641504, -5, -5, + -2.39346585060369, -2.36699357970066, -2.42301499289852, + -2.4489240239951, -2.50438219738651, -2.47903640609638, + -2.53505781929423, -2.55984037077792, -2.61529854416933, + -2.59107923249209, -2.64710064568995, -2.67075671756074, + -2.72621489095215, -2.70312205888781, -2.75914347208567, + -2.78167306434356, -2.83713123773497, -2.81516488528353, + -2.87118629848138, -2.89258941112638, -2.94804758451779, + -2.92720771167924, -2.9832291248771, -3.00350575790921, + -3.05896393130062, -3.03925053807496, -3.09527195127282, + -3.11442210469203, -3.16988027808344, -3.15129336447068, + -3.20731477766853, -3.22533845147485, -3.28079662486626, + -3.26333619086639, -3.31935760406425, -3.33625479825767, + -3.39171297164908, -3.37537901726211, -3.43140043045997, + -3.44717114504049, -3.5026293184319, -3.48742184365783, + -3.54344325685568, -3.55808749182332, -3.61354566521473, + -3.59946467005354, -3.6554860832514, -3.66900383860614, + -3.72446201199755, -3.71150749644926, -3.76752890964712, + -3.77992018538896, -3.83537835878037, -3.82355032284498, + -3.87957173604283, -3.89083653217178, -3.94629470556319, + -3.93559314924069, -3.99161456243855, -4.0017528789546, + -4.05721105234601, -4.04763597563641, -4.10365738883427, + -4.11266922573742, -4.16812739912884, -4.15967880203213, + -4.21570021522998, -4.22358557252025, -4.27904374591166, + -4.27172162842784, -4.3277430416257, -4.33450191930307, + -4.38996009269448, -4.38376445482356, -4.43978586802142, + -4.44541826608589, -4.5008764394773, -4.49580728121928, + -4.55182869441713, -4.55633461286871, -4.61179278626012, + -4.60785010761499, -4.66387152081285, -4.66725095965153, + -4.72270913304295, -4.71989293401071, -4.77591434720857, + -4.77816730643436, -4.83362547982577, -4.83193576040643, + -4.88795717360428, -4.88908365321718, -4.94454182660859, + -4.94397858680214, -5, -5, -2.3379582934176, -2.30892300713455, + -2.36617996442956, -2.39459747866404, -2.45123666391047, + -2.42343692172457, -2.48069387901958, -2.50787584915691, + -2.56451503440334, -2.53795083631459, -2.5952077936096, + -2.62115421964977, -2.67779340489621, -2.65246475090461, + -2.70972170819962, -2.73443259014264, -2.79107177538908, + -2.76697866549463, -2.82423562278964, -2.84771096063551, + -2.90435014588194, -2.88149258008465, -2.93874953737966, + -2.96098933112838, -3.01762851637481, -2.99600649467466, + -3.05326345196967, -3.07426770162125, -3.13090688686768, + -3.11052040926468, -3.16777736655969, -3.18754607211411, + -3.24418525736055, -3.2250343238547, -3.28229128114971, + -3.30082444260698, -3.35746362785342, -3.33954823844472, + -3.39680519573973, -3.41410281309985, -3.47074199834628, + -3.45406215303474, -3.51131911032975, -3.52738118359272, + -3.58402036883915, -3.56857606762476, -3.62583302491977, + -3.64065955408559, -3.69729873933202, -3.68308998221478, + -3.74034693950979, -3.75393792457845, -3.81057710982489, + -3.7976038968048, -3.85486085409981, -3.86721629507132, + -3.92385548031775, -3.91211781139482, -3.96937476868983, + -3.98049466556419, -4.03713385081062, -4.02663172598484, + -4.08388868327985, -4.09377303605706, -4.15041222130349, + -4.14114564057486, -4.19840259786987, -4.20705140654993, + -4.26369059179636, -4.25565955516488, -4.31291651245988, + -4.32032977704279, -4.37696896228923, -4.37017346975489, + -4.4274304270499, -4.43360814753566, -4.4902473327821, -4.48468738434491, + -4.54194434163992, -4.54688651802853, -4.60352570327496, + -4.59920129893493, -4.65645825622994, -4.6601648885214, + -4.71680407376783, -4.71371521352495, -4.77097217081996, + -4.77344325901426, -4.8300824442607, -4.82822912811497, + -4.88548608540998, -4.88672162950713, -4.94336081475357, + -4.94274304270499, -5, -5, -2.27739047973363, -2.24585795233271, + -2.30445671930436, -2.33531834186696, -2.39324620400029, -2.363055486276, + -2.42165425324765, -2.45117406613361, -2.50910192826694, + -2.48025302021929, -2.53885178719094, -2.56702979040027, + -2.62495765253359, -2.59745055416258, -2.65604932113423, + -2.68288551466692, -2.74081337680025, -2.71464808810587, + -2.77324685507751, -2.79874123893357, -2.8566691010669, + -2.83184562204916, -2.8904443890208, -2.91459696320023, + -2.97252482533356, -2.94904315599245, -3.00764192296409, + -3.03045268746688, -3.08838054960021, -3.06624068993574, + -3.12483945690738, -3.14630841173354, -3.20423627386686, + -3.18343822387902, -3.24203699085067, -3.26216413600019, + -3.32009199813352, -3.30063575782231, -3.35923452479396, + -3.37801986026684, -3.43594772240017, -3.4178332917656, + -3.47643205873725, -3.4938755845335, -3.55180344666683, + -3.53503082570889, -3.59362959268054, -3.60973130880015, + -3.66765917093348, -3.65222835965218, -3.71082712662382, + -3.72558703306681, -3.78351489520013, -3.76942589359547, + -3.82802466056711, -3.84144275733346, -3.89937061946679, + -3.88662342753876, -3.9452221945104, -3.95729848160011, + -4.01522634373344, -4.00382096148205, -4.06241972845369, + -4.07315420586677, -4.1310820680001, -4.12101849542533, + -4.17961726239698, -4.18900993013342, -4.24693779226675, + -4.23821602936862, -4.29681479634027, -4.30486565440008, + -4.3627935165334, -4.35541356331191, -4.41401233028356, + -4.42072137866673, -4.47864924080006, -4.4726110972552, + -4.53120986422685, -4.53657710293338, -4.59450496506671, + -4.58980863119849, -4.64840739817013, -4.65243282720004, + -4.71036068933337, -4.70700616514178, -4.76560493211342, + -4.76828855146669, -4.82621641360002, -4.82420369908507, + -4.88280246605671, -4.88414427573335, -4.94207213786667, + -4.94140123302836, -5, -5, -2.21189961513043, -2.17794127792815, + -2.23798508052542, -2.27122089991489, -2.33054218469935, + -2.29802888312269, -2.35807268571997, -2.38986346948381, + -2.44918475426827, -2.41811648831724, -2.47816029091451, + -2.50850603905273, -2.56782732383718, -2.53820409351179, + -2.59824789610906, -2.62714860862164, -2.6864698934061, + -2.65829169870633, -2.71833550130361, -2.74579117819056, + -2.80511246297502, -2.77837930390088, -2.83842310649815, + -2.86443374775948, -2.92375503254394, -2.89846690909543, + -2.9585107116927, -2.9830763173284, -3.04239760211286, -3.01855451428998, + -3.07859831688725, -3.10171888689731, -3.16104017168177, + -3.13864211948452, -3.1986859220818, -3.22036145646623, + -3.27968274125069, -3.25872972467907, -3.31877352727634, + -3.33900402603515, -3.39832531081961, -3.37881732987362, + -3.43886113247089, -3.45764659560407, -3.51696788038853, + -3.49890493506816, -3.55894873766544, -3.57628916517299, + -3.63561044995744, -3.61899254026271, -3.67903634285998, + -3.6949317347419, -3.75425301952636, -3.73908014545726, + -3.79912394805453, -3.81357430431082, -3.87289558909528, + -3.8591677506518, -3.91921155324908, -3.93221687387974, -3.9915381586642, + -3.97925535584635, -4.03929915844362, -4.05085944344866, + -4.11018072823312, -4.0993429610409, -4.15938676363817, + -4.16950201301758, -4.22882329780203, -4.21943056623545, + -4.27947436883272, -4.28814458258649, -4.34746586737095, + -4.33951817142999, -4.39956197402727, -4.40678715215541, + -4.46610843693987, -4.45960577662454, -4.51964957922181, + -4.52542972172433, -4.58475100650879, -4.57969338181909, + -4.63973718441636, -4.64407229129325, -4.70339357607771, + -4.69978098701363, -4.75982478961091, -4.76271486086216, + -4.82203614564662, -4.81986859220818, -4.87991239480545, + -4.88135743043108, -4.94067871521554, -4.93995619740273, -5, -5, + -2.14163405748041, -2.10532683703268, -2.16691562773411, + -2.20245035412977, -2.26326665077912, -2.22850441843554, + -2.29009320913698, -2.32408294742847, -2.38489924407782, + -2.35168199983841, -2.41327079053984, -2.44571554072718, + -2.50653183737653, -2.47485958124127, -2.53644837194271, + -2.56734813402588, -2.62816443067524, -2.59803716264414, + -2.65962595334557, -2.68898072732459, -2.74979702397394, -2.721214744047, + -2.78280353474844, -2.8106133206233, -2.87142961727265, + -2.84439232544987, -2.9059811161513, -2.932245913922, -2.99306221057135, + -2.96756990685273, -3.02915869755416, -3.05387850722071, + -3.11469480387006, -3.0907474882556, -3.15233627895703, + -3.17551110051941, -3.23632739716877, -3.21392506965846, + -3.27551386035989, -3.29714369381812, -3.35795999046747, + -3.33710265106133, -3.39869144176276, -3.41877628711682, + -3.47959258376618, -3.46028023246419, -3.52186902316562, + -3.54040888041553, -3.60122517706488, -3.58345781386706, + -3.64504660456849, -3.66204147371424, -3.72285777036359, + -3.70663539526992, -3.76822418597135, -3.78367406701294, + -3.84449036366229, -3.82981297667279, -3.89140176737422, + -3.90530666031165, -3.966122956961, -3.95299055807565, -4.01457934877708, + -4.02693925361035, -4.08775555025971, -4.07616813947851, + -4.13775693017995, -4.14857184690906, -4.20938814355841, + -4.19934572088138, -4.26093451158281, -4.27020444020777, + -4.33102073685712, -4.32252330228424, -4.38411209298568, + -4.39183703350647, -4.45265333015582, -4.44570088368711, + -4.50728967438854, -4.51346962680518, -4.57428592345453, + -4.56887846508997, -4.63046725579141, -4.63510222010388, + -4.69591851675324, -4.69205604649284, -4.75364483719427, + -4.75673481340259, -4.81755111005194, -4.8152336278957, + -4.87682241859714, -4.87836740670129, -4.93918370335065, + -4.93841120929857, -5, -5, -2.06675298087145, -2.02817912471022, + -2.09140935609936, -2.12916249191674, -2.19157200296202, + -2.15463958748851, -2.21786981887765, -2.25398151400731, + -2.3163910250526, -2.28110005026679, -2.34433028165594, + -2.37880053609789, -2.44121004714318, -2.40756051304508, + -2.47079074443423, -2.50361955818847, -2.56602906923376, + -2.53402097582337, -2.59725120721252, -2.62843858027904, + -2.69084809132433, -2.66048143860166, -2.7237116699908, + -2.75325760236962, -2.81566711341491, -2.78694190137995, + -2.85017213276909, -2.8780766244602, -2.94048613550548, + -2.91340236415824, -2.97663259554738, -3.00289564655077, + -3.06530515759606, -3.03986282693653, -3.10309305832567, + -3.12771466864135, -3.19012417968664, -3.16632328971481, + -3.22955352110396, -3.25253369073193, -3.31494320177721, + -3.2927837524931, -3.35601398388225, -3.3773527128225, -3.43976222386779, + -3.41924421527139, -3.48247444666054, -3.50217173491308, + -3.56458124595837, -3.54570467804968, -3.60893490943882, + -3.62699075700366, -3.68940026804894, -3.67216514082797, + -3.73539537221711, -3.75180977909423, -3.81421929013952, + -3.79862560360626, -3.8618558349954, -3.87662880118481, -3.9390383122301, + -3.92508606638455, -3.98831629777369, -4.00144782327539, + -4.06385733432067, -4.05154652916283, -4.11477676055198, + -4.12626684536596, -4.18867635641125, -4.17800699194112, + -4.24123722333027, -4.25108586745654, -4.31349537850183, + -4.30446745471941, -4.36769768610856, -4.37590488954712, + -4.4383144005924, -4.4309279174977, -4.49415814888685, -4.50072391163769, + -4.56313342268298, -4.55738838027599, -4.62061861166513, + -4.62554293372827, -4.68795244477356, -4.68384884305428, + -4.74707907444342, -4.75036195581885, -4.81277146686413, + -4.81030930583257, -4.87353953722171, -4.87518097790942, + -4.93759048895471, -4.93676976861086, -5, -5, -1.98742601502635, + -1.94667290534249, -2.0116373116118, -2.05152333385558, + -2.11562065268481, -2.07660171788111, -2.14156612415042, + -2.17971797151403, -2.24381529034326, -2.20653053041973, + -2.27149493668904, -2.30791260917249, -2.37200992800171, + -2.33645934295834, -2.40142374922765, -2.43610724683094, + -2.50020456566017, -2.46638815549696, -2.53135256176627, + -2.56430188448939, -2.62839920331862, -2.59631696803558, + -2.66128137430489, -2.69249652214785, -2.75659384097707, + -2.7262457805742, -2.7912101868435, -2.8206911598063, -2.88478847863553, + -2.85617459311281, -2.92113899938212, -2.94888579746475, + -3.01298311629398, -2.98610340565143, -3.05106781192074, + -3.0770804351232, -3.14117775395243, -3.11603221819005, + -3.18099662445936, -3.20527507278166, -3.26937239161088, + -3.24596103072867, -3.31092543699797, -3.33346971044011, + -3.39756702926934, -3.37588984326728, -3.44085424953659, + -3.46166434809856, -3.52576166692779, -3.5058186558059, + -3.57078306207521, -3.58985898575702, -3.65395630458624, + -3.63574746834452, -3.70071187461383, -3.71805362341547, + -3.7821509422447, -3.76567628088313, -3.83064068715244, + -3.84624826107392, -3.91034557990315, -3.89560509342175, + -3.96056949969106, -3.97444289873238, -4.0385402175616, + -4.02553390596037, -4.09049831222968, -4.10263753639083, + -4.16673485522006, -4.15546271849899, -4.2204271247683, + -4.23083217404928, -4.29492949287851, -4.2853915310376, + -4.35035593730691, -4.35902681170773, -4.42312413053696, + -4.41532034357622, -4.48028474984553, -4.48722144936619, + -4.55131876819542, -4.54524915611484, -4.61021356238415, + -4.61541608702464, -4.67951340585387, -4.67517796865346, + -4.74014237492277, -4.74361072468309, -4.80770804351232, + -4.80510678119207, -4.87007118746138, -4.87180536234155, + -4.93590268117077, -4.93503559373069, -5, -5, -1.90067629538045, + -1.85467968541841, -1.91515394098333, -1.96339562629757, + -2.02611495721468, -1.97562819654825, -2.03610245211317, + -2.0888342881318, -2.15155361904891, -2.0965767076781, -2.15705096324302, + -2.21427294996603, -2.27699228088314, -2.21752521880794, + -2.27799947437286, -2.33971161180026, -2.40243094271737, + -2.33847372993778, -2.3989479855027, -2.46515027363449, -2.5278696045516, + -2.45942224106762, -2.51989649663254, -2.59058893546872, + -2.65330826638583, -2.58037075219746, -2.64084500776238, + -2.71602759730294, -2.77874692822006, -2.70131926332731, + -2.76179351889223, -2.84146625913717, -2.90418559005429, + -2.82226777445715, -2.88274203002207, -2.9669049209714, + -3.02962425188852, -2.94321628558699, -3.00369054115191, + -3.09234358280563, -3.15506291372275, -3.06416479671683, + -3.12463905228175, -3.21778224463986, -3.28050157555698, + -3.18511330784667, -3.24558756341159, -3.34322090647409, + -3.40594023739121, -3.30606181897652, -3.36653607454144, + -3.46865956830832, -3.53137889922544, -3.42701033010636, + -3.48748458567128, -3.59409823014255, -3.65681756105967, + -3.5479588412362, -3.60843309680112, -3.71953689197678, -3.7822562228939, + -3.66890735236604, -3.72938160793096, -3.84497555381101, + -3.90769488472813, -3.78985586349588, -3.8503301190608, + -3.97041421564524, -4.03313354656236, -3.91080437462572, + -3.97127863019065, -4.09585287747947, -4.15857220839659, + -4.03175288575557, -4.09222714132049, -4.2212915393137, + -4.28401087023082, -4.15270139688541, -4.21317565245033, + -4.34673020114793, -4.40944953206504, -4.27364990801525, + -4.33412416358017, -4.47216886298216, -4.53488819389927, + -4.39459841914509, -4.45507267471001, -4.59760752481639, + -4.6603268557335, -4.51554693027493, -4.57602118583986, + -4.72304618665062, -4.78576551756773, -4.63649544140478, + -4.6969696969697, -4.84848484848485, -1.80669318731393, + -1.75870668920944, -1.81477547016114, -1.86496470557224, + -1.92323622383055, -1.87084425111285, -1.92691303206455, + -1.98150774208886, -2.03977926034717, -1.98298181301625, + -2.03905059396795, -2.09805077860548, -2.15632229686379, + -2.09511937491965, -2.15118815587135, -2.2145938151221, + -2.27286533338042, -2.20725693682305, -2.26332571777475, + -2.33113685163873, -2.38940836989704, -2.31939449872645, + -2.37546327967815, -2.44767988815535, -2.50595140641366, + -2.43153206062986, -2.48760084158156, -2.56422292467197, + -2.62249444293028, -2.54366962253326, -2.59973840348496, + -2.68076596118859, -2.7390374794469, -2.65580718443666, + -2.71187596538836, -2.79730899770522, -2.85558051596353, + -2.76794474634006, -2.82401352729176, -2.91385203422184, + -2.97212355248015, -2.88008230824346, -2.93615108919517, + -3.03039507073846, -3.08866658899677, -2.99221987014687, + -3.04828865109857, -3.14693810725508, -3.20520962551339, + -3.10435743205027, -3.16042621300197, -3.2634811437717, + -3.32175266203001, -3.21649499395367, -3.27256377490537, + -3.38002418028833, -3.43829569854664, -3.32863255585707, + -3.38470133680877, -3.49656721680495, -3.55483873506326, + -3.44077011776048, -3.49683889871218, -3.61311025332157, + -3.67138177157988, -3.55290767966388, -3.60897646061558, + -3.72965328983819, -3.7879248080965, -3.66504524156728, + -3.72111402251898, -3.84619632635481, -3.90446784461312, + -3.77718280347068, -3.83325158442238, -3.96273936287144, + -4.02101088112975, -3.88932036537408, -3.94538914632579, + -4.07928239938806, -4.13755391764637, -4.00145792727749, + -4.05752670822919, -4.19582543590468, -4.25409695416299, + -4.11359548918089, -4.16966427013259, -4.3123684724213, + -4.37063999067961, -4.22573305108429, -4.28180183203599, + -4.42891150893792, -4.48718302719623, -4.33787061298769, + -4.39393939393939, -4.54545454545455, -1.70883185717834, + -1.65895702514723, -1.71070068612089, -1.76273807814102, + -1.81664429910369, -1.76244434709454, -1.8141880080682, + -1.87055052006637, -1.92445674102905, -1.86593166904186, + -1.91767533001551, -1.97836296199173, -2.03226918295441, + -1.96941899098917, -2.02116265196283, -2.08617540391709, + -2.14008162487977, -2.07290631293648, -2.12464997391014, + -2.19398784584245, -2.24789406680513, -2.1763936348838, + -2.22813729585745, -2.3018002877678, -2.35570650873048, + -2.27988095683111, -2.33162461780477, -2.40961272969316, + -2.46351895065584, -2.38336827877842, -2.43511193975208, + -2.51742517161852, -2.5713313925812, -2.48685560072574, + -2.53859926169939, -2.62523761354388, -2.67914383450656, + -2.59034292267305, -2.64208658364671, -2.73305005546923, + -2.78695627643191, -2.69383024462036, -2.74557390559402, + -2.84086249739459, -2.89476871835727, -2.79731756656768, + -2.84906122754133, -2.94867493931995, -3.00258116028263, + -2.90080488851499, -2.95254854948865, -3.05648738124531, + -3.11039360220799, -3.0042922104623, -3.05603587143596, + -3.16429982317067, -3.21820604413334, -3.10777953240962, + -3.15952319338327, -3.27211226509602, -3.3260184860587, + -3.21126685435693, -3.26301051533059, -3.37992470702138, + -3.43383092798406, -3.31475417630424, -3.3664978372779, + -3.48773714894674, -3.54164336990942, -3.41824149825156, + -3.46998515922521, -3.5955495908721, -3.64945581183478, + -3.52172882019887, -3.57347248117253, -3.70336203279745, + -3.75726825376013, -3.62521614214618, -3.67695980311984, + -3.81117447472281, -3.86508069568549, -3.7287034640935, + -3.78044712506715, -3.91898691664817, -3.97289313761085, + -3.83219078604081, -3.88393444701446, -4.02679935857353, + -4.08070557953621, -3.93567810798812, -3.98742176896178, + -4.13461180049889, -4.18851802146156, -4.03916542993544, + -4.09090909090909, -4.24242424242424, -1.60729969108902, + -1.55564235703082, -1.60313674917652, -1.6569187176487, + -1.70653774420838, -1.65063114132222, -1.69812553346792, + -1.75615677076806, -1.80577579732774, -1.74561992561362, + -1.79311431775932, -1.85539482388742, -1.9050138504471, + -1.84060870990503, -1.88810310205073, -1.95463287700678, + -2.00425190356646, -1.93559749419643, -1.98309188634213, + -2.05387093012614, -2.10348995668581, -2.03058627848783, + -2.07808067063353, -2.15310898324549, -2.20272800980517, + -2.12557506277924, -2.17306945492494, -2.25234703636485, + -2.30196606292453, -2.22056384707064, -2.26805823921634, + -2.35158508948421, -2.40120411604389, -2.31555263136204, + -2.36304702350774, -2.45082314260357, -2.50044216916325, + -2.41054141565344, -2.45803580779915, -2.55006119572293, + -2.59968022228261, -2.50553019994485, -2.55302459209055, + -2.64929924884228, -2.69891827540196, -2.60051898423625, + -2.64801337638195, -2.74853730196164, -2.79815632852132, + -2.69550776852765, -2.74300216067336, -2.847775355081, -2.89739438164068, + -2.79049655281906, -2.83799094496476, -2.94701340820036, + -2.99663243476004, -2.88548533711046, -2.93297972925616, + -3.04625146131972, -3.0958704878794, -2.98047412140186, + -3.02796851354756, -3.14548951443907, -3.19510854099875, + -3.07546290569327, -3.12295729783897, -3.24472756755843, + -3.29434659411811, -3.17045168998467, -3.21794608213037, + -3.34396562067779, -3.39358464723747, -3.26544047427607, + -3.31293486642177, -3.44320367379715, -3.49282270035683, + -3.36042925856747, -3.40792365071318, -3.54244172691651, + -3.59206075347619, -3.45541804285888, -3.50291243500458, + -3.64167978003587, -3.69129880659554, -3.55040682715028, + -3.59790121929598, -3.74091783315522, -3.7905368597149, + -3.64539561144168, -3.69289000358739, -3.84015588627458, + -3.88977491283426, -3.74038439573309, -3.78787878787879, + -3.93939393939394, -1.50231239078543, -1.44898242454005, + -1.49229872369555, -1.54771773643603, -1.59312308208663, + -1.53561502285105, -1.57893132200655, -1.63852842773723, + -1.68393377338783, -1.62224762116205, -1.66556392031754, + -1.72933911903843, -1.77474446468903, -1.70888021947304, + -1.75219651862854, -1.82014981033963, -1.86555515599024, + -1.79551281778404, -1.83882911693954, -1.91096050164083, + -1.95636584729144, -1.88214541609504, -1.92546171525054, + -2.00177119294203, -2.04717653859263, -1.96877801440603, + -2.01209431356153, -2.09258188424324, -2.13798722989384, + -2.05541061271703, -2.09872691187253, -2.18339257554444, + -2.22879792119504, -2.14204321102803, -2.18535951018353, + -2.27420326684564, -2.31960861249624, -2.22867580933903, + -2.27199210849452, -2.36501395814684, -2.41041930379744, + -2.31530840765002, -2.35862470680552, -2.45582464944804, + -2.50122999509864, -2.40194100596102, -2.44525730511652, + -2.54663534074924, -2.59204068639984, -2.48857360427202, + -2.53188990342752, -2.63744603205044, -2.68285137770104, + -2.57520620258301, -2.61852250173851, -2.72825672335164, + -2.77366206900224, -2.66183880089401, -2.70515510004951, + -2.81906741465284, -2.86447276030344, -2.74847139920501, + -2.79178769836051, -2.90987810595404, -2.95528345160464, + -2.83510399751601, -2.8784202966715, -3.00068879725524, + -3.04609414290584, -2.921736595827, -2.9650528949825, -3.09149948855644, + -3.13690483420704, -3.008369194138, -3.0516854932935, -3.18231017985764, + -3.22771552550824, -3.095001792449, -3.1383180916045, -3.27312087115884, + -3.31852621680944, -3.18163439075999, -3.22495068991549, + -3.36393156246004, -3.40933690811064, -3.26826698907099, + -3.31158328822649, -3.45474225376124, -3.50014759941184, + -3.35489958738199, -3.39821588653749, -3.54555294506244, + -3.59095829071304, -3.44153218569299, -3.48484848484848, + -3.63636363636364, -1.3940934849973, -1.33920454545454, + -1.37840909090909, -1.43535390730232, -1.47661432960734, + -1.41761363636364, -1.45681818181818, -1.51787475191236, + -1.55913517421739, -1.49602272727273, -1.53522727272727, + -1.60039559652241, -1.64165601882743, -1.57443181818182, + -1.61363636363636, -1.68291644113245, -1.72417686343747, + -1.65284090909091, -1.69204545454545, -1.7654372857425, + -1.80669770804752, -1.73125, -1.77045454545454, -1.84795813035254, + -1.88921855265756, -1.80965909090909, -1.84886363636364, + -1.93047897496258, -1.97173939726761, -1.88806818181818, + -1.92727272727273, -2.01299981957263, -2.05426024187765, + -1.96647727272727, -2.00568181818182, -2.09552066418267, + -2.13678108648769, -2.04488636363636, -2.08409090909091, + -2.17804150879272, -2.21930193109774, -2.12329545454545, -2.1625, + -2.26056235340276, -2.30182277570778, -2.20170454545454, + -2.24090909090909, -2.3430831980128, -2.38434362031783, + -2.28011363636364, -2.31931818181818, -2.42560404262285, + -2.46686446492787, -2.35852272727273, -2.39772727272727, + -2.50812488723289, -2.54938530953791, -2.43693181818182, + -2.47613636363636, -2.59064573184294, -2.63190615414796, + -2.51534090909091, -2.55454545454545, -2.67316657645298, -2.714426998758, + -2.59375, -2.63295454545455, -2.75568742106303, -2.79694784336805, + -2.67215909090909, -2.71136363636364, -2.83820826567307, + -2.87946868797809, -2.75056818181818, -2.78977272727273, + -2.92072911028311, -2.96198953258813, -2.82897727272727, + -2.86818181818182, -3.00324995489316, -3.04451037719818, + -2.90738636363636, -2.94659090909091, -3.0857707995032, + -3.12703122180822, -2.98579545454545, -3.025, -3.16829164411324, + -3.20955206641827, -3.06420454545455, -3.10340909090909, + -3.25081248872329, -3.29207291102831, -3.14261363636364, + -3.18181818181818, -3.33333333333333, -1.28287382308016, + -1.22654310070578, -1.26169724492029, -1.32005316791469, + -1.35723251274922, -1.29685138913481, -1.33200553334932, + -1.39441185758375, -1.43159120241828, -1.36715967756383, + -1.40231382177834, -1.46877054725281, -1.50594989208734, + -1.43746796599286, -1.47262211020737, -1.54312923692187, + -1.5803085817564, -1.50777625442188, -1.54293039863639, + -1.61748792659092, -1.65466727142545, -1.57808454285091, + -1.61323868706542, -1.69184661625998, -1.72902596109451, + -1.64839283127993, -1.68354697549445, -1.76620530592904, + -1.80338465076357, -1.71870111970896, -1.75385526392347, + -1.8405639955981, -1.87774334043263, -1.78900940813798, -1.8241635523525, + -1.91492268526716, -1.95210203010169, -1.85931769656701, + -1.89447184078152, -1.98928137493622, -2.02646071977074, + -1.92962598499604, -1.96478012921055, -2.06364006460527, + -2.1008194094398, -1.99993427342506, -2.03508841763957, + -2.13799875427433, -2.17517809910886, -2.07024256185409, + -2.1053967060686, -2.21235744394339, -2.24953678877792, + -2.14055085028311, -2.17570499449762, -2.28671613361245, + -2.32389547844698, -2.21085913871214, -2.24601328292665, + -2.36107482328151, -2.39825416811604, -2.28116742714116, + -2.31632157135568, -2.43543351295056, -2.47261285778509, + -2.35147571557019, -2.3866298597847, -2.50979220261962, + -2.54697154745415, -2.42178400399921, -2.45693814821373, + -2.58415089228868, -2.62133023712321, -2.49209229242824, + -2.52724643664275, -2.65850958195774, -2.69568892679227, + -2.56240058085726, -2.59755472507178, -2.7328682716268, + -2.77004761646133, -2.63270886928629, -2.6678630135008, + -2.80722696129586, -2.84440630613038, -2.70301715771532, + -2.73817130192983, -2.88158565096491, -2.91876499579944, + -2.77332544614434, -2.80847959035885, -2.95594434063397, + -2.9931236854685, -2.84363373457337, -2.87878787878788, + -3.03030303030303, -1.16889105206735, -1.11123900342892, + -1.14239897305293, -1.20204810898661, -1.23520516590588, + -1.17355894267695, -1.20471891230096, -1.26836222282514, + -1.3015192797444, -1.23587888192497, -1.26703885154899, + -1.33467633666367, -1.36783339358293, -1.298198821173, -1.32935879079702, + -1.40099045050219, -1.43414750742146, -1.36051876042103, + -1.39167873004504, -1.46730456434072, -1.50046162125998, + -1.42283869966906, -1.45399866929307, -1.53361867817925, + -1.56677573509851, -1.48515863891709, -1.5163186085411, + -1.59993279201777, -1.63308984893704, -1.54747857816511, + -1.57863854778913, -1.6662469058563, -1.69940396277556, + -1.60979851741314, -1.64095848703716, -1.73256101969483, + -1.76571807661409, -1.67211845666117, -1.70327842628518, + -1.79887513353335, -1.83203219045262, -1.7344383959092, + -1.76559836553321, -1.86518924737188, -1.89834630429114, + -1.79675833515723, -1.82791830478124, -1.93150336121041, + -1.96466041812967, -1.85907827440525, -1.89023824402927, + -1.99781747504893, -2.0309745319682, -1.92139821365328, -1.9525581832773, + -2.06413158888746, -2.09728864580672, -1.98371815290131, + -2.01487812252532, -2.13044570272599, -2.16360275964525, + -2.04603809214934, -2.07719806177335, -2.19675981656451, + -2.22991687348378, -2.10835803139737, -2.13951800102138, + -2.26307393040304, -2.2962309873223, -2.17067797064539, + -2.20183794026941, -2.32938804424157, -2.36254510116083, + -2.23299790989342, -2.26415787951744, -2.39570215808009, + -2.42885921499936, -2.29531784914145, -2.32647781876546, + -2.46201627191862, -2.49517332883788, -2.35763778838948, + -2.38879775801349, -2.52833038575715, -2.56148744267641, + -2.41995772763751, -2.45111769726152, -2.59464449959567, + -2.62780155651494, -2.48227766688553, -2.51343763650955, + -2.6609586134342, -2.69411567035346, -2.54459760613356, + -2.57575757575758, -2.72727272727273, -1.05238907832299, + -0.99353915321707, -1.02075592171729, -1.08157744738511, + -1.11076581644723, -1.0479726902175, -1.07518945871772, + -1.13995418550934, -1.16914255457146, -1.10240622721794, + -1.12962299571816, -1.19833092363357, -1.22751929269569, + -1.15683976421837, -1.18405653271859, -1.2567076617578, + -1.28589603081992, -1.21127330121881, -1.23849006971902, + -1.31508439988203, -1.34427276894415, -1.26570683821924, + -1.29292360671946, -1.37346113800627, -1.40264950706838, + -1.32014037521967, -1.34735714371989, -1.4318378761305, + -1.46102624519261, -1.37457391222011, -1.40179068072033, + -1.49021461425473, -1.51940298331684, -1.42900744922054, + -1.45622421772076, -1.54859135237896, -1.57777972144107, + -1.48344098622098, -1.51065775472119, -1.60696809050319, + -1.63615645956531, -1.53787452322141, -1.56509129172163, + -1.66534482862742, -1.69453319768954, -1.59230806022185, + -1.61952482872206, -1.72372156675165, -1.75290993581377, + -1.64674159722228, -1.6739583657225, -1.78209830487588, -1.811286673938, + -1.70117513422271, -1.72839190272293, -1.84047504300011, + -1.86966341206223, -1.75560867122315, -1.78282543972337, + -1.89885178112435, -1.92804015018646, -1.81004220822358, + -1.8372589767238, -1.95722851924858, -1.98641688831069, + -1.86447574522402, -1.89169251372423, -2.01560525737281, + -2.04479362643492, -1.91890928222445, -1.94612605072467, + -2.07398199549704, -2.10317036455915, -1.97334281922489, + -2.0005595877251, -2.13235873362127, -2.16154710268339, + -2.02777635622532, -2.05499312472554, -2.1907354717455, + -2.21992384080762, -2.08220989322575, -2.10942666172597, + -2.24911220986973, -2.27830057893185, -2.13664343022619, + -2.16386019872641, -2.30748894799396, -2.33667731705608, + -2.19107696722662, -2.21829373572684, -2.36586568611819, + -2.39505405518031, -2.24551050422706, -2.27272727272727, + -2.42424242424242, -0.93361751501568, -0.87369587681429, + -0.897015049003283, -0.958885485360285, -0.98415345570489, + -0.920334221192276, -0.94365339338127, -1.0094214260495, + -1.0346893963941, -0.966972565570263, -0.990291737759256, + -1.05995736673871, -1.08522533708331, -1.01361090994825, + -1.03693008213724, -1.11049330742792, -1.13576127777252, + -1.06024925432624, -1.08356842651523, -1.16102924811713, + -1.18629721846173, -1.10688759870422, -1.13020677089322, + -1.21156518880634, -1.23683315915094, -1.15352594308221, + -1.1768451152712, -1.26210112949555, -1.28736909984015, + -1.20016428746019, -1.22348345964919, -1.31263707018476, + -1.33790504052936, -1.24680263183818, -1.27012180402717, + -1.36317301087397, -1.38844098121857, -1.29344097621617, + -1.31676014840516, -1.41370895156318, -1.43897692190778, + -1.34007932059415, -1.36339849278315, -1.46424489225239, + -1.48951286259699, -1.38671766497214, -1.41003683716113, + -1.5147808329416, -1.5400488032862, -1.43335600935013, -1.45667518153912, + -1.56531677363081, -1.59058474397541, -1.47999435372811, + -1.50331352591711, -1.61585271432002, -1.64112068466462, + -1.5266326981061, -1.54995187029509, -1.66638865500923, + -1.69165662535383, -1.57327104248409, -1.59659021467308, + -1.71692459569844, -1.74219256604304, -1.61990938686207, + -1.64322855905107, -1.76746053638765, -1.79272850673225, + -1.66654773124006, -1.68986690342905, -1.81799647707686, + -1.84326444742147, -1.71318607561804, -1.73650524780704, + -1.86853241776607, -1.89380038811068, -1.75982441999603, + -1.78314359218502, -1.91906835845528, -1.94433632879989, + -1.80646276437402, -1.82978193656301, -1.96960429914449, + -1.9948722694891, -1.853101108752, -1.876420280941, -2.0201402398337, + -2.04540821017831, -1.89973945312999, -1.92305862531898, + -2.07067618052291, -2.09594415086752, -1.94637779750798, + -1.96969696969697, -2.12121212121212, -0.812831116664326, + -0.751966356514362, -0.771428065241007, -0.834221557122145, + -0.855611997579964, -0.790889773967651, -0.810351482694296, + -0.877002438037783, -0.898392878495602, -0.829813191420941, + -0.849274900147586, -0.919783318953421, -0.94117375941124, + -0.868736608874231, -0.888198317600875, -0.962564199869059, + -0.983954640326878, -0.90766002632752, -0.927121735054165, + -1.0053450807847, -1.02673552124252, -0.94658344378081, + -0.966045152507454, -1.04812596170033, -1.06951640215815, + -0.985506861234099, -1.00496856996074, -1.09090684261597, + -1.11229728307379, -1.02443027868739, -1.04389198741403, + -1.13368772353161, -1.15507816398943, -1.06335369614068, + -1.08281540486732, -1.17646860444725, -1.19785904490507, + -1.10227711359397, -1.12173882232061, -1.21924948536289, + -1.24063992582071, -1.14120053104726, -1.1606622397739, + -1.26203036627852, -1.28342080673634, -1.18012394850055, + -1.19958565722719, -1.30481124719416, -1.32620168765198, + -1.21904736595384, -1.23850907468048, -1.3475921281098, + -1.36898256856762, -1.25797078340713, -1.27743249213377, + -1.39037300902544, -1.41176344948326, -1.29689420086042, + -1.31635590958706, -1.43315388994108, -1.4545443303989, + -1.33581761831371, -1.35527932704035, -1.47593477085671, + -1.49732521131453, -1.374741035767, -1.39420274449364, -1.51871565177235, + -1.54010609223017, -1.41366445322028, -1.43312616194693, + -1.56149653268799, -1.58288697314581, -1.45258787067357, + -1.47204957940022, -1.60427741360363, -1.62566785406145, + -1.49151128812686, -1.51097299685351, -1.64705829451927, + -1.66844873497709, -1.53043470558015, -1.5498964143068, -1.6898391754349, + -1.71122961589272, -1.56935812303344, -1.58881983176009, + -1.73262005635054, -1.75401049680836, -1.60828154048673, + -1.62774324921338, -1.77540093726618, -1.796791377724, -1.64720495794002, + -1.66666666666667, -1.81818181818182, -0.690289202037269, + -0.628612047560176, -0.64425086279584, -0.707839464018423, + -0.725389725999577, -0.659889678031503, -0.675528493267167, + -0.742939987980731, -0.760490249961886, -0.69116730850283, + -0.706806123738494, -0.77804051194304, -0.795590773924194, + -0.722444938974157, -0.738083754209821, -0.813141035905348, + -0.830691297886502, -0.753722569445485, -0.769361384681148, + -0.848241559867657, -0.865791821848811, -0.785000199916812, + -0.800639015152475, -0.883342083829965, -0.900892345811119, + -0.816277830388139, -0.831916645623803, -0.918442607792273, + -0.935992869773427, -0.847555460859466, -0.86319427609513, + -0.953543131754582, -0.971093393735736, -0.878833091330793, + -0.894471906566457, -0.98864365571689, -1.00619391769804, + -0.91011072180212, -0.925749537037784, -1.0237441796792, + -1.04129444166035, -0.941388352273448, -0.957027167509111, + -1.05884470364151, -1.07639496562266, -0.972665982744775, + -0.988304797980438, -1.09394522760382, -1.11149548958497, + -1.0039436132161, -1.01958242845177, -1.12904575156612, + -1.14659601354728, -1.03522124368743, -1.05086005892309, + -1.16414627552843, -1.18169653750959, -1.06649887415876, + -1.08213768939442, -1.19924679949074, -1.21679706147189, + -1.09777650463008, -1.11341531986575, -1.23434732345305, + -1.2518975854342, -1.12905413510141, -1.14469295033707, + -1.26944784741536, -1.28699810939651, -1.16033176557274, + -1.1759705808084, -1.30454837137767, -1.32209863335882, + -1.19160939604406, -1.20724821127973, -1.33964889533997, + -1.35719915732113, -1.22288702651539, -1.23852584175106, + -1.37474941930228, -1.39229968128344, -1.25416465698672, + -1.26980347222238, -1.40984994326459, -1.42740020524574, + -1.28544228745805, -1.30108110269371, -1.4449504672269, + -1.46250072920805, -1.31671991792937, -1.33235873316504, + -1.48005099118921, -1.49760125317036, -1.3479975484007, + -1.36363636363636, -1.51515151515152, -0.56625506671184, + -0.503898085863505, -0.515742936389942, -0.579996899592891, + -0.593738732473941, -0.52758778691638, -0.539432637442817, + -0.607480565354992, -0.621222398236042, -0.551277487969254, + -0.563122338495692, -0.634964231117093, -0.648706063998143, + -0.574967189022129, -0.586812039548566, -0.662447896879194, + -0.676189729760244, -0.598656890075004, -0.610501740601441, + -0.689931562641295, -0.703673395522345, -0.622346591127878, + -0.634191441654316, -0.717415228403396, -0.731157061284446, + -0.646036292180753, -0.65788114270719, -0.744898894165496, + -0.758640727046547, -0.669725993233628, -0.681570843760065, + -0.772382559927597, -0.786124392808648, -0.693415694286503, + -0.70526054481294, -0.799866225689698, -0.813608058570749, + -0.717105395339377, -0.728950245865815, -0.827349891451799, + -0.84109172433285, -0.740795096392252, -0.752639946918689, + -0.8548335572139, -0.868575390094951, -0.764484797445127, + -0.776329647971564, -0.882317222976001, -0.896059055857052, + -0.788174498498001, -0.800019349024439, -0.909800888738102, + -0.923542721619153, -0.811864199550876, -0.823709050077314, + -0.937284554500203, -0.951026387381254, -0.835553900603751, + -0.847398751130188, -0.964768220262304, -0.978510053143354, + -0.859243601656625, -0.871088452183063, -0.992251886024405, + -1.00599371890546, -0.8829333027095, -0.894778153235938, + -1.01973555178651, -1.03347738466756, -0.906623003762375, + -0.918467854288812, -1.04721921754861, -1.06096105042966, + -0.93031270481525, -0.942157555341687, -1.07470288331071, + -1.08844471619176, -0.954002405868124, -0.965847256394562, + -1.10218654907281, -1.11592838195386, -0.977692106920999, + -0.989536957447436, -1.12967021483491, -1.14341204771596, + -1.00138180797387, -1.01322665850031, -1.15715388059701, + -1.17089571347806, -1.02507150902675, -1.03691635955319, + -1.18463754635911, -1.19837937924016, -1.04876121007962, + -1.06060606060606, -1.21212121212121, -0.440995386625203, + -0.3780926873869, -0.386166795263259, -0.450954865826601, + -0.460914345027999, -0.394240903139618, -0.402315011015976, + -0.470873824229397, -0.480833303430795, -0.410389118892335, + -0.418463226768694, -0.490792782632193, -0.500752261833591, + -0.426537334645052, -0.434611442521411, -0.510711741034989, + -0.520671220236387, -0.44268555039777, -0.450759658274128, + -0.530630699437785, -0.540590178639183, -0.458833766150487, + -0.466907874026846, -0.550549657840581, -0.560509137041979, + -0.474981981903204, -0.483056089779563, -0.570468616243377, + -0.580428095444775, -0.491130197655922, -0.49920430553228, + -0.590387574646173, -0.600347053847571, -0.507278413408639, + -0.515352521284998, -0.610306533048969, -0.620266012250367, + -0.523426629161356, -0.531500737037715, -0.630225491451765, + -0.640184970653163, -0.539574844914074, -0.547648952790432, + -0.650144449854561, -0.660103929055959, -0.555723060666791, + -0.56379716854315, -0.670063408257357, -0.680022887458755, + -0.571871276419508, -0.579945384295867, -0.689982366660153, + -0.699941845861551, -0.588019492172226, -0.596093600048584, + -0.709901325062949, -0.719860804264347, -0.604167707924943, + -0.612241815801302, -0.729820283465745, -0.739779762667143, + -0.62031592367766, -0.628390031554019, -0.749739241868541, + -0.759698721069939, -0.636464139430378, -0.644538247306736, + -0.769658200271337, -0.779617679472735, -0.652612355183095, + -0.660686463059454, -0.789577158674133, -0.799536637875531, + -0.668760570935812, -0.676834678812171, -0.809496117076929, + -0.819455596278327, -0.68490878668853, -0.692982894564888, + -0.829415075479725, -0.839374554681123, -0.701057002441247, + -0.709131110317606, -0.849334033882521, -0.859293513083919, + -0.717205218193964, -0.725279326070323, -0.869252992285317, + -0.879212471486715, -0.733353433946682, -0.74142754182304, + -0.889171950688113, -0.899131429889511, -0.749501649699399, + -0.757575757575758, -0.909090909090909, -0.314779613967581, + -0.251466540548262, -0.255787368505649, -0.320977081884454, + -0.327174549801327, -0.260108196463036, -0.264429024420423, + -0.3333720177182, -0.339569485635072, -0.26874985237781, + -0.273070680335197, -0.345766953551945, -0.351964421468818, + -0.277391508292584, -0.281712336249971, -0.358161889385691, + -0.364359357302564, -0.286033164207358, -0.290353992164745, + -0.370556825219437, -0.37675429313631, -0.294674820122133, + -0.29899564807952, -0.382951761053183, -0.389149228970055, + -0.303316476036907, -0.307637303994294, -0.395346696886928, + -0.401544164803801, -0.311958131951681, -0.316278959909068, + -0.407741632720674, -0.413939100637547, -0.320599787866455, + -0.324920615823842, -0.42013656855442, -0.426334036471293, + -0.329241443781229, -0.333562271738616, -0.432531504388166, + -0.438728972305039, -0.337883099696003, -0.342203927653391, + -0.444926440221911, -0.451123908138784, -0.346524755610778, + -0.350845583568165, -0.457321376055657, -0.46351884397253, + -0.355166411525552, -0.359487239482939, -0.469716311889403, + -0.475913779806276, -0.363808067440326, -0.368128895397713, + -0.482111247723149, -0.488308715640022, -0.3724497233551, + -0.376770551312487, -0.494506183556894, -0.500703651473767, + -0.381091379269874, -0.385412207227261, -0.50690111939064, + -0.513098587307513, -0.389733035184649, -0.394053863142036, + -0.519296055224386, -0.525493523141259, -0.398374691099423, + -0.40269551905681, -0.531690991058132, -0.537888458975005, + -0.407016347014197, -0.411337174971584, -0.544085926891878, + -0.55028339480875, -0.415658002928971, -0.419978830886358, + -0.556480862725623, -0.562678330642496, -0.424299658843745, + -0.428620486801132, -0.568875798559369, -0.575073266476242, + -0.43294131475852, -0.437262142715907, -0.581270734393115, + -0.587468202309988, -0.441582970673294, -0.445903798630681, + -0.593665670226861, -0.599863138143734, -0.450224626588068, + -0.454545454545455, -0.606060606060606, -0.187879366786385, + -0.124292193024508, -0.124871404907288, -0.190329386706468, + -0.192779406626552, -0.125450616790068, -0.126029828672847, + -0.195229426546635, -0.197679446466718, -0.126609040555627, + -0.127188252438407, -0.200129466386802, -0.202579486306885, + -0.127767464321186, -0.128346676203966, -0.205029506226969, + -0.207479526147052, -0.128925888086746, -0.129505099969525, + -0.209929546067135, -0.212379565987219, -0.130084311852305, + -0.130663523735084, -0.214829585907302, -0.217279605827385, + -0.131242735617864, -0.131821947500644, -0.219729625747469, + -0.222179645667552, -0.132401159383423, -0.132980371266203, + -0.224629665587635, -0.227079685507719, -0.133559583148983, + -0.134138795031762, -0.229529705427802, -0.231979725347886, + -0.134718006914542, -0.135297218797322, -0.234429745267969, + -0.236879765188052, -0.135876430680101, -0.136455642562881, + -0.239329785108136, -0.241779805028219, -0.13703485444566, + -0.13761406632844, -0.244229824948302, -0.246679844868386, + -0.13819327821122, -0.138772490093999, -0.249129864788469, + -0.251579884708553, -0.139351701976779, -0.139930913859559, + -0.254029904628636, -0.256479924548719, -0.140510125742338, + -0.141089337625118, -0.258929944468803, -0.261379964388886, + -0.141668549507898, -0.142247761390677, -0.263829984308969, + -0.266280004229053, -0.142826973273457, -0.143406185156236, + -0.268730024149136, -0.271180044069219, -0.143985397039016, + -0.144564608921796, -0.273630063989303, -0.276080083909386, + -0.145143820804575, -0.145723032687355, -0.27853010382947, + -0.280980123749553, -0.146302244570135, -0.146881456452914, + -0.283430143669636, -0.28588016358972, -0.147460668335694, + -0.148039880218474, -0.288330183509803, -0.290780203429886, + -0.148619092101253, -0.149198303984033, -0.29323022334997, + -0.295680243270053, -0.149777515866812, -0.150356727749592, + -0.298130263190136, -0.30058028311022, -0.150935939632372, + -0.151515151515151, -0.303030303030303, -0.0605678136839716, + -0.0592791367970786, -0.0579904599101856, -0.0567017830232926, + -0.0554131061363996, -0.0541244292495066, -0.0528357523626136, + -0.0515470754757205, -0.0502583985888275, -0.0489697217019345, + -0.0476810448150415, -0.0463923679281485, -0.0451036910412555, + -0.0438150141543625, -0.0425263372674695, -0.0412376603805764, + -0.0399489834936834, -0.0386603066067904, -0.0373716297198974, + -0.0360829528330044, -0.0347942759461114, -0.0335055990592184, + -0.0322169221723253, -0.0309282452854323, -0.0296395683985393, + -0.0283508915116463, -0.0270622146247533, -0.0257735377378603, + -0.0244848608509673, -0.0231961839640743, -0.0219075070771812, + -0.0206188301902882, -0.0193301533033952, -0.0180414764165022, + -0.0167527995296092, -0.0154641226427162, -0.0141754457558231, + -0.0128867688689301, -0.0115980919820371, -0.0103094150951441, + -0.00902073820825109, -0.00773206132135808, -0.00644338443446506, + -0.00515470754757205, -0.00386603066067904, -0.00257735377378603, + -0.00128867688689301, 0 ; + + coordy = -0.0625, -0.0621839978194458, -0.0310919989097229, -0.03125, 0, 0, + 0, -0.0309339978194458, -0.0618679956388917, -0.125, -0.124367995638892, + -0.0932759967291688, -0.09375, -0.0928019934583375, -0.123735991277783, + -0.1875, -0.186551993458338, -0.155459994548615, -0.15625, + -0.154669989097229, -0.185603986916675, -0.25, -0.248735991277783, + -0.21764399236806, -0.21875, -0.216537984736121, -0.247471982555567, + -0.3125, -0.310919989097229, -0.279827990187506, -0.28125, + -0.278405980375013, -0.309339978194458, -0.375, -0.373103986916675, + -0.342011988006952, -0.34375, -0.340273976013904, -0.37120797383335, + -0.4375, -0.435287984736121, -0.404195985826398, -0.40625, + -0.402141971652796, -0.433075969472242, -0.5, -0.497471982555567, + -0.466379983645844, -0.46875, -0.464009967291688, -0.494943965111133, + -0.5625, -0.559655980375013, -0.52856398146529, -0.53125, + -0.525877962930579, -0.556811960750025, -0.625, -0.621839978194458, + -0.590747979284735, -0.59375, -0.587745958569471, -0.618679956388917, + -0.6875, -0.684023976013904, -0.652931977104181, -0.65625, + -0.649613954208363, -0.680547952027808, -0.75, -0.74620797383335, + -0.715115974923627, -0.71875, -0.711481949847254, -0.7424159476667, + -0.8125, -0.808391971652796, -0.777299972743073, -0.78125, + -0.773349945486146, -0.804283943305592, -0.875, -0.870575969472242, + -0.839483970562519, -0.84375, -0.835217941125038, -0.866151938944483, + -0.9375, -0.932759967291688, -0.901667968381965, -0.90625, + -0.897085936763929, -0.928019934583375, -1, -0.994943965111133, + -0.96385196620141, -0.96875, -0.958953932402821, -0.989887930222267, + -0.0615519934583375, -0.0307759967291688, 0, 0, -0.0306179956388917, + -0.0612359912777833, -0.123103986916675, -0.0923279901875063, + -0.091853986916675, -0.122471982555567, -0.184655980375013, + -0.153879983645844, -0.153089978194458, -0.18370797383335, + -0.24620797383335, -0.215431977104181, -0.214325969472242, + -0.244943965111133, -0.307759967291688, -0.276983970562519, + -0.275561960750025, -0.306179956388917, -0.369311960750025, + -0.338535964020856, -0.336797952027808, -0.3674159476667, + -0.430863954208363, -0.400087957479194, -0.398033943305592, + -0.428651938944483, -0.4924159476667, -0.461639950937531, + -0.459269934583375, -0.489887930222267, -0.553967941125038, + -0.523191944395869, -0.520505925861158, -0.55112392150005, + -0.615519934583375, -0.584743937854206, -0.581741917138942, + -0.612359912777833, -0.677071928041713, -0.646295931312544, + -0.642977908416725, -0.673595904055617, -0.73862392150005, + -0.707847924770881, -0.704213899694508, -0.7348318953334, + -0.800175914958388, -0.769399918229219, -0.765449890972292, + -0.796067886611183, -0.861727908416725, -0.830951911687556, + -0.826685882250075, -0.857303877888967, -0.923279901875062, + -0.892503905145894, -0.887921873527858, -0.91853986916675, + -0.9848318953334, -0.954055898604231, -0.949157864805642, + -0.979775860444533, -0.0609199890972292, -0.0304599945486146, 0, 0, + -0.0303019934583375, -0.060603986916675, -0.121839978194458, + -0.0913799836458438, -0.0909059803750125, -0.12120797383335, + -0.182759967291688, -0.152299972743073, -0.151509967291688, + -0.181811960750025, -0.243679956388917, -0.213219961840302, + -0.212113954208363, -0.2424159476667, -0.304599945486146, + -0.274139950937531, -0.272717941125038, -0.303019934583375, + -0.365519934583375, -0.33505994003476, -0.333321928041713, + -0.36362392150005, -0.426439923680604, -0.39597992913199, + -0.393925914958388, -0.424227908416725, -0.487359912777833, + -0.456899918229219, -0.454529901875063, -0.4848318953334, + -0.548279901875063, -0.517819907326448, -0.515133888791738, + -0.545435882250075, -0.609199890972292, -0.578739896423677, + -0.575737875708413, -0.60603986916675, -0.670119880069521, + -0.639659885520906, -0.636341862625088, -0.666643856083425, + -0.73103986916675, -0.700579874618135, -0.696945849541763, + -0.7272478430001, -0.791959858263979, -0.761499863715365, + -0.757549836458438, -0.787851829916775, -0.852879847361208, + -0.822419852812594, -0.818153823375113, -0.84845581683345, + -0.913799836458438, -0.883339841909823, -0.878757810291788, + -0.909059803750125, -0.974719825555667, -0.944259831007052, + -0.939361797208463, -0.9696637906668, -0.0602879847361208, + -0.0301439923680604, 0, 0, -0.0299859912777833, -0.0599719825555667, + -0.120575969472242, -0.0904319771041813, -0.08995797383335, + -0.119943965111133, -0.180863954208363, -0.150719961840302, + -0.149929956388917, -0.1799159476667, -0.241151938944483, + -0.211007946576423, -0.209901938944483, -0.239887930222267, + -0.301439923680604, -0.271295931312544, -0.26987392150005, + -0.299859912777833, -0.361727908416725, -0.331583916048665, + -0.329845904055617, -0.3598318953334, -0.422015893152846, + -0.391871900784786, -0.389817886611183, -0.419803877888967, + -0.482303877888967, -0.452159885520906, -0.44978986916675, + -0.479775860444533, -0.542591862625088, -0.512447870257027, + -0.509761851722317, -0.5397478430001, -0.602879847361208, + -0.572735854993148, -0.569733834277883, -0.599719825555667, + -0.663167832097329, -0.633023839729269, -0.62970581683345, + -0.659691808111234, -0.72345581683345, -0.69331182446539, + -0.689677799389017, -0.7196637906668, -0.783743801569571, + -0.753599809201511, -0.749649781944584, -0.779635773222367, + -0.844031786305692, -0.813887793937631, -0.80962176450015, + -0.839607755777933, -0.904319771041813, -0.874175778673752, + -0.869593747055717, -0.8995797383335, -0.964607755777934, + -0.934463763409873, -0.929565729611284, -0.959551720889067, + -0.0596559803750125, -0.0298279901875063, 0, 0, -0.0296699890972292, + -0.0593399781944584, -0.119311960750025, -0.0894839705625188, + -0.0890099672916875, -0.118679956388917, -0.178967941125038, + -0.149139950937531, -0.148349945486146, -0.178019934583375, + -0.23862392150005, -0.208795931312544, -0.207689923680604, + -0.237359912777833, -0.298279901875063, -0.268451911687556, + -0.267029901875063, -0.296699890972292, -0.357935882250075, + -0.328107892062569, -0.326369880069521, -0.35603986916675, + -0.417591862625088, -0.387763872437581, -0.385709858263979, + -0.415379847361209, -0.4772478430001, -0.447419852812594, + -0.445049836458438, -0.474719825555667, -0.536903823375113, + -0.507075833187606, -0.504389814652896, -0.534059803750125, + -0.596559803750125, -0.566731813562619, -0.563729792847354, + -0.593399781944584, -0.656215784125138, -0.626387793937631, + -0.623069771041813, -0.652739760139042, -0.71587176450015, + -0.686043774312644, -0.682409749236271, -0.7120797383335, + -0.775527744875163, -0.745699754687656, -0.741749727430729, + -0.771419716527958, -0.835183725250175, -0.805355735062669, + -0.801089705625188, -0.830759694722417, -0.894839705625188, + -0.865011715437682, -0.860429683819646, -0.890099672916875, + -0.9544956860002, -0.924667695812694, -0.919769662014104, + -0.949439651111334, -0.0590239760139042, -0.0295119880069521, 0, 0, + -0.029353986916675, -0.05870797383335, -0.118047952027808, + -0.0885359640208563, -0.088061960750025, -0.1174159476667, + -0.177071928041713, -0.14755994003476, -0.146769934583375, + -0.17612392150005, -0.236095904055617, -0.206583916048665, + -0.205477908416725, -0.2348318953334, -0.295119880069521, + -0.265607892062569, -0.264185882250075, -0.29353986916675, + -0.354143856083425, -0.324631868076473, -0.322893856083425, + -0.3522478430001, -0.413167832097329, -0.383655844090377, + -0.381601829916775, -0.41095581683345, -0.472191808111234, + -0.442679820104281, -0.440309803750125, -0.4696637906668, + -0.531215784125138, -0.501703796118186, -0.499017777583475, + -0.52837176450015, -0.590239760139042, -0.56072777213209, + -0.557725751416825, -0.5870797383335, -0.649263736152946, + -0.619751748145994, -0.616433725250175, -0.64578771216685, + -0.70828771216685, -0.678775724159898, -0.675141699083525, + -0.7044956860002, -0.767311688180754, -0.737799700173802, + -0.733849672916875, -0.76320365983355, -0.826335664194659, + -0.796823676187707, -0.792557646750225, -0.8219116336669, + -0.885359640208563, -0.855847652201611, -0.851265620583575, + -0.88061960750025, -0.944383616222467, -0.914871628215515, + -0.909973594416925, -0.9393275813336, -0.0583919716527959, + -0.0291959858263979, 0, 0, -0.0290379847361209, -0.0580759694722417, + -0.116783943305592, -0.0875879574791938, -0.0871139542083626, + -0.116151938944483, -0.175175914958388, -0.14597992913199, + -0.145189923680604, -0.174227908416725, -0.233567886611183, + -0.204371900784786, -0.203265893152846, -0.232303877888967, + -0.291959858263979, -0.262763872437581, -0.261341862625088, + -0.290379847361208, -0.350351829916775, -0.321155844090377, + -0.319417832097329, -0.34845581683345, -0.408743801569571, + -0.379547815743173, -0.377493801569571, -0.406531786305692, + -0.467135773222367, -0.437939787395969, -0.435569771041813, + -0.464607755777934, -0.525527744875163, -0.496331759048765, + -0.493645740514054, -0.522683725250175, -0.583919716527959, + -0.554723730701561, -0.551721709986296, -0.580759694722417, + -0.642311688180754, -0.613115702354357, -0.609797679458538, + -0.638835664194659, -0.70070365983355, -0.671507674007152, + -0.667873648930779, -0.6969116336669, -0.759095631486346, + -0.729899645659948, -0.725949618403021, -0.754987603139142, + -0.817487603139142, -0.788291617312744, -0.784025587875263, + -0.813063572611384, -0.875879574791938, -0.84668358896554, + -0.842101557347505, -0.871139542083625, -0.934271546444734, + -0.905075560618336, -0.900177526819746, -0.929215511555867, + -0.0577599672916875, -0.0288799836458438, 0, 0, -0.0287219825555667, + -0.0574439651111334, -0.115519934583375, -0.0866399509375313, + -0.0861659476667, -0.114887930222267, -0.173279901875063, + -0.144399918229219, -0.143609912777833, -0.1723318953334, + -0.23103986916675, -0.202159885520906, -0.201053877888967, + -0.229775860444533, -0.288799836458438, -0.259919852812594, + -0.2584978430001, -0.287219825555667, -0.346559803750125, + -0.317679820104281, -0.315941808111234, -0.3446637906668, + -0.404319771041813, -0.375439787395969, -0.373385773222367, + -0.402107755777934, -0.4620797383335, -0.433199754687656, + -0.4308297383335, -0.459551720889067, -0.519839705625188, + -0.490959721979344, -0.488273703444634, -0.5169956860002, + -0.577599672916875, -0.548719689271032, -0.545717668555767, + -0.574439651111334, -0.635359640208563, -0.606479656562719, + -0.6031616336669, -0.631883616222467, -0.69311960750025, + -0.664239623854407, -0.660605598778034, -0.6893275813336, + -0.750879574791938, -0.721999591146094, -0.718049563889167, + -0.746771546444734, -0.808639542083625, -0.779759558437782, + -0.7754935290003, -0.804215511555867, -0.866399509375313, + -0.837519525729469, -0.832937494111434, -0.861659476667, -0.924159476667, + -0.895279493021157, -0.890381459222567, -0.919103441778134, + -0.0571279629305792, -0.0285639814652896, 0, 0, -0.0284059803750125, + -0.056811960750025, -0.114255925861158, -0.0856919443958688, + -0.0852179411250376, -0.11362392150005, -0.171383888791738, + -0.142819907326448, -0.142029901875063, -0.170435882250075, + -0.228511851722317, -0.199947870257027, -0.198841862625088, + -0.2272478430001, -0.285639814652896, -0.257075833187606, + -0.255653823375113, -0.284059803750125, -0.342767777583475, + -0.314203796118186, -0.312465784125138, -0.34087176450015, + -0.399895740514054, -0.371331759048765, -0.369277744875163, + -0.397683725250175, -0.457023703444634, -0.428459721979344, + -0.426089705625188, -0.4544956860002, -0.514151666375213, + -0.485587684909923, -0.482901666375213, -0.511307646750225, + -0.571279629305792, -0.542715647840502, -0.539713627125238, + -0.56811960750025, -0.628407592236371, -0.599843610771082, + -0.596525587875263, -0.624931568250275, -0.68553555516695, + -0.656971573701661, -0.653337548625288, -0.6817435290003, + -0.742663518097529, -0.71409953663224, -0.710149509375313, + -0.738555489750325, -0.799791481028109, -0.771227499562819, + -0.766961470125338, -0.79536745050035, -0.856919443958688, + -0.828355462493398, -0.823773430875363, -0.852179411250376, + -0.914047406889267, -0.885483425423978, -0.880585391625388, + -0.908991372000401, -0.0564959585694709, -0.0282479792847354, 0, 0, + -0.0280899781944584, -0.0561799563889167, -0.112991917138942, + -0.0847439378542063, -0.0842699345833751, -0.112359912777833, + -0.169487875708413, -0.141239896423677, -0.140449890972292, + -0.16853986916675, -0.225983834277883, -0.197735854993148, + -0.196629847361208, -0.224719825555667, -0.282479792847354, + -0.254231813562619, -0.252809803750125, -0.280899781944584, + -0.338975751416825, -0.31072777213209, -0.308989760139042, + -0.3370797383335, -0.395471709986296, -0.367223730701561, + -0.365169716527959, -0.393259694722417, -0.451967668555767, + -0.423719689271032, -0.421349672916875, -0.449439651111334, + -0.508463627125238, -0.480215647840502, -0.477529629305792, + -0.50561960750025, -0.564959585694709, -0.536711606409973, + -0.533709585694709, -0.561799563889167, -0.62145554426418, + -0.593207564979444, -0.589889542083625, -0.617979520278084, + -0.67795150283365, -0.649703523548915, -0.646069498472542, + -0.674159476667, -0.734447461403121, -0.706199482118386, + -0.702249454861459, -0.730339433055917, -0.790943419972592, + -0.762695440687857, -0.758429411250376, -0.786519389444834, + -0.847439378542063, -0.819191399257328, -0.814609367639292, + -0.842699345833751, -0.903935337111534, -0.875687357826799, + -0.870789324028209, -0.898879302222667, -0.0558639542083625, + -0.0279319771041813, 0, 0, -0.0277739760139042, -0.0555479520278084, + -0.111727908416725, -0.0837959313125438, -0.0833219280417126, + -0.111095904055617, -0.167591862625088, -0.139659885520906, + -0.138869880069521, -0.166643856083425, -0.22345581683345, + -0.195523839729269, -0.194417832097329, -0.222191808111233, + -0.279319771041813, -0.251387793937631, -0.249965784125138, + -0.277739760139042, -0.335183725250175, -0.307251748145994, + -0.305513736152946, -0.33328771216685, -0.391047679458538, + -0.363115702354357, -0.361061688180754, -0.388835664194659, + -0.4469116336669, -0.418979656562719, -0.416609640208563, + -0.444383616222467, -0.502775587875263, -0.474843610771082, + -0.472157592236371, -0.499931568250275, -0.558639542083625, + -0.530707564979444, -0.52770554426418, -0.555479520278084, + -0.614503496291988, -0.586571519187807, -0.583253496291988, + -0.611027472305892, -0.670367450500351, -0.642435473396169, + -0.638801448319796, -0.666575424333701, -0.726231404708713, + -0.698299427604532, -0.694349400347605, -0.722123376361509, + -0.782095358917076, -0.754163381812894, -0.749897352375413, + -0.777671328389317, -0.837959313125438, -0.810027336021257, + -0.805445304403221, -0.833219280417126, -0.893823267333801, + -0.865891290229619, -0.86099325643103, -0.888767232444934, + -0.0552319498472542, -0.0276159749236271, 0, 0, -0.02745797383335, + -0.0549159476667, -0.110463899694508, -0.0828479247708813, + -0.0823739215000501, -0.1098318953334, -0.165695849541763, + -0.138079874618136, -0.13728986916675, -0.1647478430001, + -0.220927799389017, -0.19331182446539, -0.19220581683345, + -0.2196637906668, -0.276159749236271, -0.248543774312644, + -0.24712176450015, -0.2745797383335, -0.331391699083525, + -0.303775724159898, -0.30203771216685, -0.3294956860002, + -0.386623648930779, -0.359007674007152, -0.35695365983355, + -0.3844116336669, -0.441855598778034, -0.414239623854407, + -0.41186960750025, -0.4393275813336, -0.497087548625288, + -0.469471573701661, -0.46678555516695, -0.4942435290003, + -0.552319498472542, -0.524703523548915, -0.52170150283365, + -0.549159476667, -0.607551448319796, -0.579935473396169, + -0.576617450500351, -0.604075424333701, -0.662783398167051, + -0.635167423243423, -0.631533398167051, -0.658991372000401, + -0.718015348014305, -0.690399373090678, -0.686449345833751, + -0.713907319667101, -0.773247297861559, -0.745631322937932, + -0.741365293500451, -0.768823267333801, -0.828479247708813, + -0.800863272785186, -0.796281241167151, -0.823739215000501, + -0.883711197556067, -0.85609522263244, -0.851197188833851, + -0.878655162667201, -0.0545999454861459, -0.0272999727430729, 0, 0, + -0.0271419716527959, -0.0542839433055917, -0.109199890972292, + -0.0818999182292188, -0.0814259149583876, -0.108567886611183, + -0.163799836458438, -0.136499863715365, -0.135709858263979, + -0.162851829916775, -0.218399781944584, -0.191099809201511, + -0.189993801569571, -0.217135773222367, -0.272999727430729, + -0.245699754687657, -0.244277744875163, -0.271419716527959, + -0.327599672916875, -0.300299700173802, -0.298561688180754, + -0.32570365983355, -0.382199618403021, -0.354899645659948, + -0.352845631486346, -0.379987603139142, -0.436799563889167, + -0.409499591146094, -0.407129574791938, -0.434271546444734, + -0.491399509375313, -0.46409953663224, -0.46141351809753, + -0.488555489750325, -0.545999454861459, -0.518699482118386, + -0.515697461403121, -0.542839433055917, -0.600599400347605, + -0.573299427604532, -0.569981404708713, -0.597123376361509, + -0.655199345833751, -0.627899373090678, -0.624265348014305, + -0.651407319667101, -0.709799291319896, -0.682499318576824, + -0.678549291319896, -0.705691262972692, -0.764399236806042, + -0.737099264062969, -0.732833234625488, -0.759975206278284, + -0.818999182292188, -0.791699209549115, -0.78711717793108, + -0.814259149583876, -0.873599127778334, -0.846299155035261, + -0.841401121236672, -0.868543092889468, -0.0539679411250376, + -0.0269839705625188, 0, 0, -0.0268259694722417, -0.0536519389444834, + -0.107935882250075, -0.0809519116875563, -0.0804779084167251, + -0.107303877888967, -0.161903823375113, -0.134919852812594, + -0.134129847361208, -0.16095581683345, -0.21587176450015, + -0.188887793937631, -0.187781786305692, -0.214607755777934, + -0.269839705625188, -0.242855735062669, -0.241433725250175, + -0.268259694722417, -0.323807646750225, -0.296823676187707, + -0.295085664194659, -0.3219116336669, -0.377775587875263, + -0.350791617312744, -0.348737603139142, -0.375563572611384, + -0.4317435290003, -0.404759558437782, -0.402389542083625, + -0.429215511555867, -0.485711470125338, -0.458727499562819, + -0.456041481028109, -0.482867450500351, -0.539679411250375, + -0.512695440687857, -0.509693419972592, -0.536519389444834, + -0.593647352375413, -0.566663381812894, -0.563345358917076, + -0.590171328389317, -0.647615293500451, -0.620631322937932, + -0.616997297861559, -0.643823267333801, -0.701583234625488, + -0.674599264062969, -0.670649236806042, -0.697475206278284, + -0.755551175750526, -0.728567205188007, -0.724301175750526, + -0.751127145222767, -0.809519116875563, -0.782535146313045, + -0.777953114695009, -0.804779084167251, -0.863487058000601, + -0.836503087438082, -0.831605053639493, -0.858431023111734, + -0.0533359367639292, -0.0266679683819646, 0, 0, -0.0265099672916875, + -0.0530199345833751, -0.106671873527858, -0.0800039051458938, + -0.0795299018750626, -0.10603986916675, -0.160007810291788, + -0.133339841909823, -0.132549836458438, -0.159059803750125, + -0.213343747055717, -0.186675778673752, -0.185569771041813, + -0.2120797383335, -0.266679683819646, -0.240011715437682, + -0.238589705625188, -0.265099672916875, -0.320015620583575, + -0.293347652201611, -0.291609640208563, -0.31811960750025, + -0.373351557347505, -0.34668358896554, -0.344629574791938, + -0.371139542083626, -0.426687494111434, -0.400019525729469, + -0.397649509375313, -0.424159476667, -0.480023430875363, + -0.453355462493398, -0.450669443958688, -0.477179411250376, + -0.533359367639292, -0.506691399257328, -0.503689378542063, + -0.530199345833751, -0.586695304403221, -0.560027336021257, + -0.556709313125438, -0.583219280417126, -0.640031241167151, + -0.613363272785186, -0.609729247708813, -0.636239215000501, + -0.69336717793108, -0.666699209549115, -0.662749182292188, + -0.689259149583876, -0.746703114695009, -0.720035146313045, + -0.715769116875563, -0.742279084167251, -0.800039051458938, + -0.773371083076974, -0.768789051458938, -0.795299018750626, + -0.853374988222868, -0.826707019840903, -0.821808986042313, + -0.848318953334001, -0.0527039324028209, -0.0263519662014104, 0, 0, + -0.0261939651111334, -0.0523879302222667, -0.105407864805642, + -0.0790558986042313, -0.0785818953334001, -0.104775860444533, + -0.158111797208463, -0.131759831007052, -0.130969825555667, + -0.1571637906668, -0.210815729611284, -0.184463763409873, + -0.183357755777934, -0.209551720889067, -0.263519662014104, + -0.237167695812694, -0.2357456860002, -0.261939651111334, + -0.316223594416925, -0.289871628215515, -0.288133616222467, + -0.314327581333601, -0.368927526819746, -0.342575560618336, + -0.340521546444734, -0.366715511555867, -0.421631459222567, + -0.395279493021157, -0.392909476667, -0.419103441778134, + -0.474335391625388, -0.447983425423978, -0.445297406889267, + -0.471491372000401, -0.527039324028209, -0.500687357826799, + -0.497685337111534, -0.523879302222667, -0.57974325643103, + -0.553391290229619, -0.550073267333801, -0.576267232444934, + -0.632447188833851, -0.60609522263244, -0.602461197556067, + -0.628655162667201, -0.685151121236672, -0.658799155035261, + -0.654849127778334, -0.681043092889468, -0.737855053639493, + -0.711503087438082, -0.707237058000601, -0.733431023111734, + -0.790558986042313, -0.764207019840903, -0.759624988222868, + -0.785818953334001, -0.843262918445134, -0.816910952243724, + -0.812012918445134, -0.838206883556268, -0.0520719280417126, + -0.0260359640208563, 0, 0, -0.0258779629305792, -0.0517559258611584, + -0.104143856083425, -0.0781078920625689, -0.0776338887917376, + -0.103511851722317, -0.156215784125138, -0.130179820104281, + -0.129389814652896, -0.155267777583475, -0.20828771216685, + -0.182251748145994, -0.181145740514054, -0.207023703444634, + -0.260359640208563, -0.234323676187707, -0.232901666375213, + -0.258779629305792, -0.312431568250275, -0.286395604229419, + -0.284657592236371, -0.31053555516695, -0.364503496291988, + -0.338467532271132, -0.33641351809753, -0.362291481028109, + -0.416575424333701, -0.390539460312844, -0.388169443958688, + -0.414047406889267, -0.468647352375413, -0.442611388354557, + -0.439925369819846, -0.465803332750426, -0.520719280417126, + -0.494683316396269, -0.491681295681005, -0.517559258611584, + -0.572791208458838, -0.546755244437982, -0.543437221542163, + -0.569315184472742, -0.624863136500551, -0.598827172479695, + -0.595193147403322, -0.621071110333901, -0.676935064542263, + -0.650899100521407, -0.64694907326448, -0.672827036195059, + -0.729006992583976, -0.70297102856312, -0.698704999125638, + -0.724582962056218, -0.781078920625689, -0.755042956604832, + -0.750460924986797, -0.776338887917376, -0.833150848667401, + -0.807114884646545, -0.802216850847955, -0.828094813778534, + -0.0526602572317069, -0.0263301286158534, 0, 0, -0.0267822943011277, + -0.0535645886022554, -0.105316023282443, -0.0789881402570749, + -0.0803423917224121, -0.107120194842569, -0.157962817145206, + -0.131639420213825, -0.133889025774753, -0.160657856706938, + -0.210596178137888, -0.184279497641547, -0.187413254769039, + -0.214168652831141, -0.263211676008148, -0.236903927073018, + -0.240906187770822, -0.267643722710503, -0.315804920969365, + -0.289508298488756, -0.294359004741142, -0.32107428677178, + -0.368371573644916, -0.34208824730714, -0.347762976516751, + -0.374451666261723, -0.420907354898254, -0.394639464271585, + -0.401109484584482, -0.427767302907242, -0.473408055526537, + -0.447157705212396, -0.454390040604945, -0.481012778302648, + -0.525869545795818, -0.499638800661178, -0.50759630564135, + -0.534179832980052, -0.578287784796227, -0.552078665296023, + -0.560720109049882, -0.587260385119712, -0.630658829595928, + -0.604473307196077, -0.613753466988833, -0.640246548857955, + -0.682978844173129, -0.656818836884528, -0.666688600504577, + -0.693130652151198, -0.735244108105905, -0.709111476139517, + -0.719517953153395, -0.745905254155592, -0.787451025000151, + -0.761347566553028, -0.772234208119259, -0.798563162082926, + -0.83959613063657, -0.81352357781836, -0.824830304788765, + -0.851097447494605, -0.85089982506989, -0.84524797785323, + -0.857345107039059, -0.863592766583512, -0.862135207404303, + -0.856517516237097, -0.869772114029059, -0.875951461474606, + -0.873299255744523, -0.867717231574413, -0.882059474925958, + -0.888167488377311, -0.884389109789701, -0.878844182767112, + -0.894201307533623, -0.900235126689934, -0.895402077312933, + -0.889895593551317, -0.9061920593243, -0.912148991958666, + -0.906335640260016, -0.900868858786475, -0.918026520016882, + -0.923904048075098, -0.91718746045365, -0.911761550356833, + -0.929699833379866, -0.935495618684633, -0.927955384890164, + -0.922571422671907, -0.94120750823228, -0.946919397779927, + -0.938637450616759, -0.933296417753462, -0.952545428617656, + -0.958171459455384, -0.949231889178231, -0.943934669897495, + -0.96370986312799, -0.969248266800595, -0.959737130623088, + -0.954484509900659, -0.974697473356585, -0.980146679912575, + -0.970151807059995, -0.964944468841542, -0.985505321460616, + -0.990863963008657, -0.980474755756491, -0.975313281408243, + -0.996130876816286, -1.00139779062391, -0.990705021772947, + -0.985589888764719, -1.0065720217515, -1.01174625287909, + -1.00084186012582, -0.995773440949382, -1.0168270563431, + -1.0219078598071, -1.01088473747526, -1.00586329880054, + -1.02689470226768, -1.03188154472826, -1.02083333333333, + -1.0158590354043, -1.03677410569746, -1.04166666666667, + -0.0545043839481195, -0.0272521919740597, 0, 0, -0.0277220896469918, + -0.0554441792939836, -0.108995118228582, -0.0817497510883508, + -0.0831571104542896, -0.110870041614596, -0.163458584094619, + -0.136226851161601, -0.138564676548448, -0.1662593114823, + -0.21788122457119, -0.190669904332904, -0.193926553896769, + -0.221593796311238, -0.272249575165892, -0.245065399868541, + -0.249224611966259, -0.276855427621281, -0.326550294370368, + -0.29939993476813, -0.304440864795118, -0.332026301968956, + -0.38077019388311, -0.353660244126739, -0.359557511736727, + -0.387088721504498, -0.434896268485209, -0.40783323118416, + -0.414556977783837, -0.442025234063176, -0.488915725501352, + -0.461905996993281, -0.469421953381616, -0.496818672700056, + -0.542816013779354, -0.515865869640353, -0.524135433639356, + -0.551452194578656, -0.596584852122548, -0.569700432950951, + -0.578680756852021, -0.605909319125385, -0.65021025711065, + -0.623397554616599, -0.633041642244365, -0.660173965363344, + -0.703680570246055, -0.676945413678352, -0.687202226852128, + -0.714230488340911, -0.756984484364091, -0.730332527305073, + -0.74114710145675, -0.768063714572589, -0.810111069247378, + -0.783547776805735, -0.79486134549221, -0.82165897641183, + -0.863049796386288, -0.836580432816833, -0.848330560844901, + -0.875002145277972, -0.876783470509434, -0.869916633447861, + -0.882488159856663, -0.889974174435355, -0.890309529430018, + -0.883546499969726, -0.897320885910393, -0.90466759738543, + -0.903618788956483, -0.896964159193251, -0.911868843460543, + -0.919070089535655, -0.916702556017628, -0.910160672487055, + -0.926120037440488, -0.933169985345321, -0.929552648355211, + -0.92312760218642, -0.940063145048539, -0.946956304751757, + -0.942161413059399, -0.935857030707306, -0.953687541397729, + -0.9604187780437, -0.954521743905066, -0.948341578482233, + -0.9669833235846, -0.9735478691255, -0.966627097449681, + -0.960574420677374, -0.979941333122467, -0.986334797119435, + -0.978471507856309, -0.972549302652995, -0.992553176688334, + -0.998771556257233, -0.99004960040815, -0.984260554132229, + -1.00481124513647, -1.0108509340157, -1.001356603684, -0.995703102046076, + -1.01670873073557, -1.02256652745543, -1.01238836036707, + -1.00687248202554, -1.02823964259046, -1.03391275772548, + -1.02314133666261, -1.01776484851484, -1.03939882021339, + -1.04488488270131, -1.03361263030313, -1.02837698348287, + -1.05018194521424, -1.05547900772717, -1.04379997712295, + -1.03870630371304, -1.06058555108298, -1.06569209443879, + -1.05370175618725, -1.0487508666551, -1.07060703104252, + -1.07552196764625, -1.06331699346405, -1.05850937482565, + -1.08024464395384, -1.08496732026144, -0.0564194386151633, + -0.0282097193075817, 0, 0, -0.0286973489681715, -0.0573946979363431, + -0.112815716826496, -0.0846175777208298, -0.0860780449873699, + -0.114761392038397, -0.169165726695932, -0.140990721761214, + -0.14341676697398, -0.172072141909564, -0.22544646509808, + -0.197306095897006, -0.200685637897243, -0.229299133884923, + -0.281635085829704, -0.253540775463892, -0.257856938961525, + -0.286414744038126, -0.337708951363717, -0.30967201859671, + -0.314903172398302, -0.343391600758478, -0.393645684130466, + -0.365677317747092, -0.371797123757456, -0.400202646756435, + -0.449423217210123, -0.421534450670295, -0.428511923556752, + -0.45682120035707, -0.505019844321353, -0.477221530765738, + -0.48502110814986, -0.51322101594265, -0.560414268993027, + -0.53271705665719, -0.541298679675023, -0.569376343407397, + -0.615585652807574, -0.587999960900301, -0.59731916494858, + -0.625261986489764, -0.670513662606707, -0.643049657707141, + -0.653057673169916, -0.680853359850069, -0.725178516552555, + -0.697846089579631, -0.708489952307134, -0.736126544764199, + -0.779561028939899, -0.752369772746227, -0.763592444035704, + -0.791058343307209, -0.83364265365796, -0.80660184129893, + -0.81834233710565, -0.84562633090409, -0.887405526203304, + -0.860524089930632, -0.872717619016363, -0.899808907128636, + -0.903662640773575, -0.89553408348844, -0.908580007120216, + -0.917351107111795, -0.919567479225953, -0.911615059999764, + -0.925909234089135, -0.934467361066475, -0.935104458061211, + -0.927335968643582, -0.942803093826621, -0.951138826586768, + -0.950258827100475, -0.942681642580843, -0.959243247721198, + -0.967347668855629, -0.965016702899116, -0.957637764999795, + -0.975212384951052, -0.983077101046474, -0.979365100197221, + -0.972190901548168, -0.990694261698607, -0.998311422350741, + -0.993291961335383, -0.986328530766302, -1.005673737948, + -1.01303605354527, -1.00678618356918, -1.00003907245228, + -1.0201368117821, -1.02723757001892, -1.01983764422046, + -1.01331191389482, -1.0340706511013, -1.04090373218368, + -1.03243722360845, -1.02613743391445, -1.04746362269244, + -1.0540235132012, -1.0445768257088, -1.03850702465862, -1.06030531858168, + -1.06658712396217, -1.05624939649365, -1.05041311110122, + -1.07258657961199, -1.07858603526181, -1.06744893991127, + -1.06184916820246, -1.08429951619153, -1.09001299712124, + -1.07817053146909, -1.07280973569018, -1.09543752616613, + -1.10086205521101, -1.08841032938919, -1.08329043042914, + -1.10599530977531, -1.1111285643396, -1.09816558331124, + -1.09328795635022, -1.11596888165792, -1.12080919897623, + -1.10743464052288, -1.10280011191706, -1.12535557988027, + -1.12990196078431, -0.0584054212328384, -0.0292027106164192, 0, 0, + -0.0297080722646669, -0.0594161445293338, -0.116777819076185, + -0.0875916201545116, -0.0891051953216532, -0.118794246113973, + -0.175084244949145, -0.145931032012665, -0.14844529705135, + -0.178096347988727, -0.233291899718559, -0.204188072333852, + -0.207690506770462, -0.237284665552196, -0.291368207999582, + -0.262330053859071, -0.266803168756617, -0.296321671961039, + -0.349280891949412, -0.320324549974497, -0.325745927550692, + -0.355170183140346, -0.406998044386984, -0.378139468168198, + -0.384481812578939, -0.413793442017533, -0.464488201072997, + -0.43574312272999, -0.442974321903228, -0.472155201788924, + -0.521720411986539, -0.493104306529768, -0.501187504909676, + -0.530219808030428, -0.578664311436835, -0.550192361711687, + -0.55908604374835, -0.587952279466273, -0.635290186851305, + -0.60697724914407, -0.61663533333956, -0.645318387212847, + -0.691569046084099, -0.663429616467702, -0.673801559765488, + -0.702284732318129, -0.747472683092629, -0.719520864588364, + -0.730551776869595, -0.75881882142106, -0.802973741833331, + -0.77522321246298, -0.786853980890256, -0.814889140359452, + -0.858045778231897, -0.830509760032614, -0.842677182959578, + -0.870465225559705, -0.912663320087617, -0.885354549159757, + -0.897991479303151, -0.925517733046597, -0.931537335862314, + -0.922100327974966, -0.935620648829715, -0.945723564612834, + -0.949909056792107, -0.940723196327211, -0.955537158565286, + -0.965350752517739, -0.967756263058707, -0.958832659925407, + -0.974862226024193, -0.984373699530647, -0.985057923038243, + -0.976407093048475, -0.993570938375752, -1.00276817722086, + -1.00179424094465, -0.993426081991444, -1.01163977903184, + -1.02051138084282, -1.01794670167348, -1.00987047130906, + -1.02904668091952, -1.03758198099622, -1.0334981127446, + -1.02572240720904, -1.04577107647008, -1.05396017194393, + -1.04843264324866, -1.04096537799663, -1.06179394421116, + -1.0696277164784, -1.0627358597092, -1.05558425147893, -1.07709785185656, + -1.08456798723472, -1.07639475877913, -1.06956530924417, + -1.0916669957959, -1.09876600435707, -1.08939779669748, -1.0828962777383, + -1.10548723689493, -1.11220846943279, -1.10173491543973, + -1.0955663560686, -1.11854613252522, -1.12488379561764, + -1.11339756550248, -1.1075662404711, -1.13083296475068, + -1.13678213388372, -1.12437872527082, -1.11888814538665, + -1.14233876460718, -1.14789539533064, -1.13467291692456, + -1.12952582109769, -1.15305633242008, -1.15821726950953, + -1.14427621884723, -1.1394745678859, -1.16298025411388, + -1.16774323871822, -1.1531862745098, -1.14873124667852, + -1.17210691347676, -1.17647058823529, -0.0604623318011448, + -0.0302311659005724, 0, 0, -0.0307542595364779, -0.0615085190729558, + -0.120881424977648, -0.0906718783893964, -0.0922385614571395, + -0.122968603841323, -0.181214138854259, -0.151047781915954, + -0.153650266780557, -0.184331929719792, -0.241417528432627, + -0.211315833643443, -0.214941160516425, -0.245550391313058, + -0.301448941675528, -0.271433235054078, -0.276063301351538, + -0.306576211390018, -0.361266116127453, -0.331357528901491, + -0.336969130252289, -0.367362049114561, -0.420827274652662, + -0.391046695390058, -0.397611578201176, -0.427861107287792, + -0.480091220073831, -0.450459247363247, -0.457944172823265, + -0.488027238358738, -0.53901742849691, -0.50955432428537, + -0.517921143661065, -0.547815048963392, -0.597566141110779, + -0.568291784803844, -0.577497525859338, -0.607180002755285, + -0.655698454253741, -0.62663229768226, -0.63662926202496, + -0.666078521294635, -0.713376407542827, -0.684537430898284, + -0.69527330203108, -0.724468082767525, -0.770563069866278, + -0.741969738704553, -0.75338770053951, -0.782307318311495, + -0.827222623044384, -0.798892846455331, -0.810931712020406, + -0.839556105729317, -0.883320442969189, -0.855271533006787, + -0.867865883053995, -0.896175660378674, -0.938823178039226, + -0.911071810504208, -0.924152141705265, -0.952128623031855, + -0.960407555775652, -0.949615366907439, -0.963610084985162, + -0.97509154693847, -0.981334262128481, -0.970870908952066, + -0.986204659338846, -0.997317771739223, -1.00157420394897, + -0.991454233038726, -1.00804624005326, -1.01877470836729, + -1.02109984383093, -1.01133702388995, -1.02910310940415, -1.039431510441, + -1.0398852624918, -1.03049255316137, -1.0493453272909, -1.05925914414079, + -1.05790621748818, -1.04889573998999, -1.06874479906046, + -1.07823045398013, -1.07514019813272, -1.06652320781045, + -1.08727533915082, -1.0963202243215, -1.09156647648812, + -1.08335333731042, -1.10491273040968, -1.11350523649785, + -1.10716615432255, -1.09936631540533, -1.12163477895411, + -1.12976432141037, -1.12192220592019, -1.11454418012137, + -1.13742136444684, -1.14507840748332, -1.13581951665004, + -1.12887086128512, -1.1522544856753, -1.15943056386729, + -1.14884491720531, -1.14233221692767, -1.16611830133013, + -1.17280603879298, -1.16098721343623, -1.15491606532077, + -1.17899916589086, -1.18519229298874, -1.17223721170833, + -1.16661221257228, -1.19088566053739, -1.19657902808603, + -1.18258773972905, -1.17741247571869, -1.20176861901731, + -1.20695820994858, -1.19203366279522, -1.18731070126213, + -1.21164114841039, -1.21632408687221, -1.20057189542484, + -1.19630277911003, -1.22049864474329, -1.22467320261438, + -0.0625901703200824, -0.0312950851600412, 0, 0, -0.0318359107836045, + -0.063671821567209, -0.125126534530886, -0.093858352425484, + -0.0954781433938286, -0.127284465220448, -0.187555408411274, + -0.15634097147108, -0.159031676161602, -0.190778887102756, + -0.249823351240283, -0.218689379825779, -0.222437599135132, + -0.254096311167509, -0.311877286857541, -0.280850319048912, + -0.285637336746287, -0.317178362325064, -0.373664623897841, + -0.342770955377691, -0.348572780503093, -0.379967198681121, + -0.435133374927502, -0.404398999412672, -0.411186420624167, + -0.442405642567212, -0.496232274212625, -0.465682824570063, + -0.473421476316862, -0.504437310066511, -0.556910893852466, + -0.526571584032545, -0.535222024404026, -0.566006738741541, + -0.617119758014859, -0.587015325933663, -0.596533126007987, + -0.627059513274433, -0.676810455014881, -0.64696510651487, + -0.65730095100478, -0.687542388735127, -0.735935746982891, + -0.706373100998886, -0.717472899966692, -0.747403411198256, + -0.7944496768735, -0.765192711928195, -0.776997723316881, + -0.806592035435505, -0.85230767257306, -0.82337867472328, + -0.835825637426154, -0.865059239416804, -0.909466647869836, + -0.880887160221448, -0.893908437388901, -0.922757635360998, + -0.965885100058133, -0.937675873963984, -0.951199606222704, + -0.97964157708441, -0.990273300513586, -0.97807920028586, + -0.992548315586557, -1.0054550540887, -1.01384309523507, + -1.00205819787433, -1.01791173640982, -1.03036841873093, -1.036558280732, + -1.02520068798354, -1.04235513591382, -1.05434185309671, + -1.05838458947854, -1.04747143510527, -1.06583976080639, + -1.07733766851607, -1.07928976754058, -1.06883717850956, + -1.08832902972823, -1.09932039094038, -1.09924364764131, + -1.08926670759095, -1.10978861612143, -1.12025684130249, + -1.11821821749974, -1.10873093257052, -1.13018652599023, + -1.14011621067797, -1.13618768328756, -1.12720295039365, + -1.14949317037763, -1.15887013007728, -1.15312852806049, + -1.14465810567403, -1.16768143239394, -1.17649273471061, + -1.16901956503164, -1.16107404654606, -1.18472672864528, + -1.19296072257996, -1.18384198556648, -1.17643077529906, + -1.20060706492281, -1.20825340726567, -1.1975794017904, + -1.19071069367844, -1.21530308602674, -1.22235276478781, + -1.21021788371252, -1.20389864275146, -1.22879811961206, + -1.2352434744363, -1.22174599078162, -1.21598193724707, + -1.24107821395675, -1.24691295347721, -1.23215479780266, + -1.22695039429214, -1.25213216956698, -1.25735138565675, + -1.2414379151552, -1.23679635647893, -1.26195156454747, -1.2665517434382, + -1.24959150326797, -1.24551470921159, -1.27053077367988, + -1.27450980392157, -0.0647889367896513, -0.0323944683948256, 0, 0, + -0.0329530260060467, -0.0659060520120935, -0.129513147735898, + -0.0971510422627746, -0.0988239411317207, -0.131741830251348, + -0.194108053620189, -0.161810600678043, -0.164589525194485, + -0.197437220137621, -0.258509368141528, -0.226308710880859, + -0.230179822626585, -0.262922425115548, -0.322653243545621, + -0.290581305843575, -0.295525274940863, -0.328128124766178, + -0.386476415260575, -0.354564829403098, -0.360556878303103, + -0.392985631840029, -0.449916345211504, -0.418196380236039, + -0.425206339847912, -0.457427047855795, -0.512911363489378, + -0.481413854350441, -0.48940623238402, -0.521385416912244, + -0.575400808053208, -0.544156085771293, -0.55309014713856, + -0.584794877364875, -0.637325162149076, -0.606362985101142, + -0.616192844194296, -0.647590811023718, -0.698626189134726, + -0.667975675641901, -0.678650400279021, -0.709709989534324, + -0.75924706440429, -0.728936626769508, -0.740400353572324, + -0.771090717610323, -0.819132504114297, -0.789189784259293, + -0.801381845201706, -0.831672972793088, -0.878228890419359, + -0.848680697266828, -0.861535757107501, -0.891398541421914, + -0.936484392933838, -0.907356641676598, -0.920804845964296, + -0.950211150506677, -0.993849086144336, -0.965166739539087, + -0.979133872855469, -1.00805659520426, -1.02113457007612, + -1.00749182811023, -1.0224353406339, -1.03681408606354, + -1.04743555611189, -1.034285063094, -1.05065838977819, -1.06450269349285, + -1.0727084934078, -1.06007202475985, -1.07778891360587, + -1.09107513371889, -1.09691215998107, -1.08481032669443, + -1.10378089258248, -1.11648665144606, -1.12000775609099, + -1.10845995803603, -1.12859088634383, -1.1406951212416, + -1.14195899213288, -1.13098337411194, -1.15217813210244, + -1.16366114296328, -1.16273217084566, -1.15234558148927, + -1.17450463698831, -1.18534813101334, -1.18229626364699, + -1.17251421724632, -1.19553526411502, -1.2057223972167, + -1.20062298092303, -1.19145962228501, -1.21523781217607, + -1.22475322713545, -1.21768683611347, -1.20915490851825, + -1.23358308839121, -1.24241294964697, -1.2334652034468, + -1.22557601978013, -1.25054497463745, -1.25867699962793, + -1.24793836919498, -1.24070178632089, -1.26610048661504, + -1.27352397360215, -1.26108957633135, -1.25451397276317, + -1.28022982591428, -1.28693567822641, -1.27290506249069, + -1.26699731941102, -1.29291642486528, -1.29889717150416, + -1.28337409114539, -1.27813957681804, -1.3041469840691, + -1.30939679663404, -1.29248897592719, -1.28793153353629, + -1.31391150252511, -1.31842620841619, -1.30024509803922, + -1.2963670369832, -1.32220330028652, -1.32598039215686, + -0.0670586312098514, -0.0335293156049257, 0, 0, -0.0341056052038046, + -0.0682112104076092, -0.134041264592685, -0.100549947901268, + -0.102275954670816, -0.136340698934022, -0.200872074481004, + -0.167456669536845, -0.170323813879205, -0.204306928824387, + -0.267475579136362, -0.234173826808683, -0.238167830990781, + -0.272028733157175, -0.333776811739768, -0.300626195438065, + -0.305727115935267, -0.339425498713359, -0.399701490215655, + -0.366739150977712, -0.37292142365232, -0.406417348591282, + -0.465176185504666, -0.432438837860161, -0.43967133587241, + -0.472925323153538, -0.530128487904091, -0.497652336704379, + -0.505898441024738, -0.538871558895938, -0.594487171099134, + -0.562307829501613, -0.571525511864666, -0.604179464833394, + -0.658182353513428, -0.626334762306281, -0.636476680418266, + -0.668773896003138, -0.721145656613275, -0.689664005063352, + -0.700677609847682, -0.732581323692226, -0.783310359807024, + -0.75222800821015, -0.764055662847976, -0.795530002003725, + -0.844611551588667, -0.813960955697846, -0.826540066193986, + -0.857550130384246, -0.90498627658328, -0.874798914085974, + -0.888062071064446, -0.918574011744646, -0.964373678161194, + -0.934679977372237, -0.948555108780179, -0.978536205815711, + -1.02271513629784, -0.993544407229515, -1.00795494160356, + -1.03737367739141, -1.05299136446325, -1.03785325038054, + -1.05327116012719, -1.06916864286296, -1.08211164475892, + -1.06755150461109, -1.08444461944398, -1.09972059602499, + -1.11002484197637, -1.09606824336765, -1.11434757312942, + -1.12897455023384, -1.13668255533852, -1.12335369865744, + -1.14292650473241, -1.15687845923097, -1.16203922814303, + -1.14936089174077, -1.17013089713771, -1.18338333504445, + -1.18605225096289, -1.17404573955296, -1.19591334700348, + -1.20844335896251, -1.20868205817048, -1.19736715456668, + -1.22022967214506, -1.23201598532761, -1.22989221756639, + -1.21928713786844, -1.24303901162185, -1.25406203791609, + -1.24964951291017, -1.23977086523828, -1.26430391830049, + -1.27454579868488, -1.26792401916567, -1.25878676603792, + -1.28399044368463, -1.29343508868437, -1.284689170291, -1.27630659472834, + -1.30206821481922, -1.31070134095408, -1.29992181941908, + -1.29230549485504, -1.31851050309504, -1.326319665236, -1.31360229129273, + -1.3067620553559, -1.33329428479753, -1.34026890435905, + -1.32571442683553, -1.31965835906413, -1.34640029326297, + -1.35253168216689, -1.33624561975724, -1.33098002329638, + -1.35781306252367, -1.36309444288045, -1.34518684511118, + -1.34071623243421, -1.36752096234331, -1.37194748180617, + -1.35253267973856, -1.34885976242487, -1.37551622456322, + -1.37908496732026, -0.0693992535806827, -0.0346996267903414, 0, 0, + -0.0352936483768781, -0.0705872967537562, -0.138710885101246, + -0.104055069340965, -0.105834184011114, -0.141081071268471, + -0.20784747099372, -0.173279178047483, -0.176234542215762, + -0.211388013163053, -0.276721984224783, -0.242284727609252, + -0.246401624227722, -0.281415235292391, -0.345247991439983, + -0.310984987832383, -0.316242859729499, -0.351070484166606, + -0.413339848763082, -0.379293920101532, -0.385666416550744, + -0.420262348934882, -0.48091289580699, -0.447126372285036, + -0.454581408697662, -0.488900468460442, -0.547883647456764, + -0.514398271631877, -0.522898102239016, -0.55689573601759, + -0.614169982990246, -0.581026815223505, -0.590528118582344, + -0.624160501147098, -0.679691332107916, -0.646930657549081, + -0.657384634679896, -0.690608768212694, -0.744368857450529, + -0.712030094779223, -0.723382579710763, -0.756156391208832, + -0.808125633191094, -0.776247245320812, -0.788438827793648, + -0.820721264378463, -0.870886819296612, -0.839506226243853, + -0.85247238629372, -0.884223508208978, -0.932579831064824, + -0.901733325180718, -0.915404579296989, -0.946585650385001, + -0.993134503551906, -0.962857167308365, -0.977159225836551, + -1.0077328012881, -1.05248325051863, -1.02280887703527, + -1.03766281246698, -1.06759282364586, -1.08584368367498, + -1.06916346709681, -1.08505577406642, -1.10251872448699, + -1.11787136117618, -1.10185752242558, -1.11927042540717, + -1.13602212632736, -1.1485073264377, -1.13318934380694, + -1.15203111448446, -1.16804010264156, -1.17769577555088, + -1.16310155099429, -1.18327659725618, -1.1985130918708, + -1.20538418369669, -1.19153997962379, -1.21294906210986, + -1.22738503234893, -1.23152342413134, -1.21845380391401, + -1.24099426082455, -1.25460348930017, -1.2560678794742, + -1.24379565180277, -1.26736163146048, -1.28011977362078, + -1.27897554504578, -1.26752171225999, -1.29200441289813, + -1.30388905217547, -1.3002081240219, -1.28959183453384, + -1.31487975076719, -1.32587044935892, -1.31973111418826, + -1.30996961910508, -1.33594879452554, -1.34602713969215, + -1.33751388609909, -1.32862250014368, -1.35517678546813, + -1.3643264312441, -1.35352975246267, -1.34552181928088, + -1.37253313546672, -1.38073983968934, -1.36775602859665, + -1.36064289052966, -1.38799149626179, -1.39524315283425, + -1.38017408381614, -1.3739650562064, -1.40152981914982, + -1.40781648546539, -1.39076938363821, -1.38547173372718, + -1.41313040493069, -1.41844432439598, -1.39953152270716, + -1.39515045317269, -1.42277994400207, -1.42711556360816, + -1.40645424836601, -1.40299288553659, -1.43046954650996, + -1.43382352941176, -0.0718108039021454, -0.0359054019510727, 0, 0, + -0.0365171555252672, -0.0730343110505345, -0.143522009261583, + -0.107666406581864, -0.109498629152614, -0.145962947254694, + -0.215034243158337, -0.17927812620996, -0.182321710204157, + -0.21868047315362, -0.286248583406794, -0.250641413282565, + -0.254881202337408, -0.291081931521196, -0.357066782646264, + -0.321657683026529, -0.327072506323559, -0.363063081125921, + -0.427391490902854, -0.392229136774559, -0.398791856998374, + -0.434520632870827, -0.497126476118475, -0.462258983510665, + -0.469936558323668, -0.505352483776508, -0.566176842147397, + -0.531651659132936, -0.540405216026856, -0.575457948277203, + -0.634449243726543, -0.60031304293697, -0.610097967291595, + -0.644737986305988, -0.70185209793254, -0.668150670829542, + -0.678916706979187, -0.713095427652387, -0.768295791646488, + -0.735073944789514, -0.746765309868265, -0.780435192084144, + -0.833692884556499, -0.800994338101494, -0.81354984840934, + -0.846664504734536, -0.897958307238131, -0.865825595897315, + -0.87917880550091, -0.911693106267284, -0.96100955386399, + -0.92948393055106, -0.943563281805131, -0.975433457342979, + -1.02276686910597, -0.991888211484981, -1.00661719713341, + -1.03780093692384, -1.08315342880673, -1.05296014895635, + -1.06825748544572, -1.0987140339676, -1.1196915277113, -1.10142247825902, + -1.11778918245161, -1.13686433093562, -1.15471470536365, + -1.13720311653748, -1.15513580766778, -1.17340728439994, + -1.18815594679181, -1.17143532607773, -1.19083953767099, + -1.20827179094205, -1.21995182061817, -1.20405388370499, + -1.2248311701538, -1.24139054936555, -1.25004262275198, + -1.23499722168507, -1.25704538126029, -1.27270021315503, + -1.27837251163823, -1.2642075671951, -1.28742087356565, + -1.30214153397628, -1.30488963475682, -1.29163107319752, + -1.31590051493457, -1.32965949589285, -1.32954624608515, + -1.31721794042098, -1.34243146794384, -1.35520343999483, + -1.35229881425823, -1.34092253017169, -1.36696530957619, + -1.37872717915755, -1.37310812118123, -1.36270346771973, + -1.38945814091393, -1.40018910267031, -1.39193935087106, + -1.38252373602614, -1.40987068658416, -1.41955227049801, + -1.40876216832577, -1.40035075959841, -1.4281683837301, + -1.43678449696219, -1.42355078824311, -1.41615647828444, + -1.44432146030709, -1.45185842365198, -1.43628403343254, + -1.42991741083782, -1.45830500252583, -1.46475158139968, + -1.4469453827883, -1.44161470811042, -1.47009901129015, + -1.47544644118063, -1.45552300871515, -1.45123419575173, + -1.47968844750139, -1.48393045382214, -1.46200980392157, + -1.45876640631836, -1.48706326612676, -1.49019607843137, + -0.0742932821742392, -0.0371466410871196, 0, 0, -0.037776126648972, + -0.075552253297944, -0.148474637073693, -0.111383959623966, + -0.113269290095318, -0.150986326892692, -0.222432390974854, + -0.185453514024273, -0.18858531784439, -0.226184308796087, + -0.296055376682393, -0.259243883828623, -0.263606565319838, + -0.301028821843589, -0.369233185358612, -0.332644281020503, + -0.338216055717446, -0.375403289591303, -0.441856416634973, + -0.405544800996793, -0.412297744995211, -0.44919220039912, + -0.513816926439122, -0.477836671537048, -0.485736784750428, + -0.522281369101736, -0.585008071975989, -0.549412499207556, + -0.558419782388256, -0.594558195674775, -0.655324953308025, + -0.620166512642007, -0.630235057992419, -0.665911920310063, + -0.724664650987301, -0.689994802147663, -0.701072897316139, + -0.736233874322215, -0.792926459201152, -0.758795555094226, + -0.770825800320187, -0.805417726318159, -0.86001211390324, + -0.826469286552196, -0.839388724695052, -0.873359723071944, + -0.925826015413223, -0.892919064658232, -0.906659323815554, + -0.939958924559163, -0.990275444980779, -0.958050730197001, + -0.972538178588871, -1.00511743261858, -1.05327077482339, + -1.02177310990209, -1.03692902267076, -1.06874061272294, + -1.11472567116212, -1.08399822299276, -1.09973896053979, + -1.13073730835664, -1.15453489657223, -1.13463028386717, + -1.15147138528274, -1.17220546220884, -1.19264167732134, + -1.17358828694679, -1.19204076622579, -1.21187607024274, + -1.22897070303868, -1.21080619018001, -1.23077284268902, + -1.2496696151353, -1.26345069054038, -1.24621069678953, + -1.26759022342526, -1.28551083171522, -1.29601454530889, + -1.27973261792464, -1.30241985458898, -1.31932887746275, + -1.32659951348355, -1.31130702939622, -1.33519318522679, + -1.35105749299082, -1.35514732401834, -1.34087341875095, + -1.36584632256732, -1.38063515214383, -1.3816043206845, + -1.36837582235142, -1.394320176759, -1.40800520137417, -1.40592158361917, + -1.39376295215183, -1.42056059472748, -1.43311598808078, + -1.42805504014458, -1.41698831188188, -1.44451848284982, + -1.45592097761886, -1.4479655646069, -1.43801030237574, + -1.46614991816733, -1.4763788587158, -1.46561906700837, + -1.45679231580764, -1.48541624788517, -1.49445363705454, + -1.48098657023212, -1.47330281862024, -1.5022841769334, + -1.51011471681226, -1.4940442756847, -1.48751542295841, -1.516725843391, + -1.52333696996973, -1.50477361720752, -1.49940894644611, + -1.52871888160207, -1.5341007932344, -1.51316130313514, + -1.50896746017133, -1.53824647284127, -1.54239215244813, + -1.51919934640523, -1.51618032477018, -1.54529738341361, + -1.54820261437909, -0.0768466883969644, -0.0384233441984822, 0, 0, + -0.0390705617479924, -0.0781411234959847, -0.153568768537579, + -0.115207728467271, -0.117146166839225, -0.156151210182465, + -0.230041914443271, -0.191805341490425, -0.19502536513646, + -0.233899520090455, -0.30614236405158, -0.268092139247426, + -0.272577713175013, -0.311255906259571, -0.381747199577028, + -0.343944781814304, -0.349673507911162, -0.388091109562752, + -0.456734625959439, -0.419240912768233, -0.426184080541255, + -0.464277051519758, -0.53098424676893, -0.493859436364184, + -0.501982087977941, -0.539687124436124, -0.604377336942541, + -0.567680791855736, -0.576941801323216, -0.614196478210308, + -0.676797111734693, -0.640587224338617, -0.650939390684815, + -0.687682303159323, -0.748128991272197, -0.712463051503445, + -0.723853205690751, -0.760024108222179, -0.81826086011452, + -0.783194925693358, -0.79556405106653, -0.83110399391088, + -0.887083321231316, -0.852672090672918, -0.865955456650784, + -0.900806919390688, -0.95448994382189, -0.920786632526603, + -0.934913941237653, -0.969020963084617, -1.02037750441519, + -0.98743372411854, -1.00232926964821, -1.0356375762118, + -1.08464622070417, -1.05251186255968, -1.0680947024486, -1.1005518286854, + -1.14719997758481, -1.11592309914449, -1.13210723774918, + -1.16366264681297, -1.19037379025775, -1.16878688392128, + -1.18610238255982, -1.20854211830666, -1.23165227704925, + -1.2110130336535, -1.22998530108121, -1.25142848385577, + -1.27095159517831, -1.25130193611378, -1.27183102953854, + -1.29223357522132, -1.30819238531751, -1.28957199024791, + -1.31155375707057, -1.33087393891981, -1.34329995136743, + -1.32574616834247, -1.34907248209596, -1.3672710252721, + -1.37620442966731, -1.35975219051737, -1.38431119580795, + -1.4013513663438, -1.40684094725876, -1.39152268846304, + -1.41719905435875, -1.4330467423737, -1.43514976884383, -1.4209953580513, + -1.4476705393436, -1.46229433631349, -1.4610764321047, -1.44811310047426, + -1.47566560622105, -1.48903687612861, -1.48457187107832, + -1.47282415159151, -1.5011298203332, -1.51322276453778, + -1.50559252730663, -1.49508219919248, -1.52401448021762, + -1.53480619589747, -1.52410044851047, -1.51484648790855, + -1.54427672793193, -1.5537472599664, -1.54006337456367, + -1.53208191153707, -1.56187964614074, -1.57001203231508, + -1.55345481057265, -1.54675909256816, -1.57679234174532, + -1.58357265117557, -1.56425408689585, -1.55885444873425, + -1.58899001586643, -1.59440738055729, -1.57244640596712, + -1.56835024643148, -1.5984540200217, -1.60250065948611, + -1.57802287581699, -1.57523464089206, -1.60517189837051, + -1.6078431372549, -0.0794710225703207, -0.0397355112851604, 0, 0, + -0.0404004608223284, -0.0808009216446567, -0.158804403653239, + -0.11913771311178, -0.121129259384334, -0.161457597124012, + -0.237862813563589, -0.198333608608414, -0.201641852080367, + -0.241826107036723, -0.316509545514356, -0.277186179538973, + -0.281794645902932, -0.321763184769142, -0.39460882530151, + -0.355559185407933, -0.361444862904705, -0.401126541040269, + -0.47202611887625, -0.43331747208888, -0.440450863636506, + -0.479775186232743, -0.548628437107899, -0.510327277992075, + -0.518672468006208, -0.557569749779674, -0.624284637047054, + -0.586456537077476, -0.595971272831737, -0.634372795883799, + -0.698865719006545, -0.6615751780268, -0.672210965368784, + -0.710049134853768, -0.772245118787229, -0.735555418896887, + -0.747257632103024, -0.78446612935228, -0.844298994386593, + -0.808272056586911, -0.820980062107292, -0.857493994862305, + -0.914906506540728, -0.87960275046366, -0.893250044276536, + -0.929006093690768, -0.983950092464131, -0.949428299502429, + -0.963942657767206, -0.998879221843645, -1.05131573216722, + -1.01763291231568, -1.03293655498315, -1.06699388812265, + -1.1168932067483, -1.08410446945776, -1.10011423646693, -1.1332345848112, + -1.18057634807479, -1.14873477741155, -1.16536231707391, + -1.19749004933661, -1.22720820876787, -1.20389227842133, + -1.22168217428284, -1.24587429922908, -1.27174650454739, + -1.24947735665763, -1.26896941223404, -1.29206452523901, + -1.31409862321072, -1.29292256387905, -1.31401409821956, + -1.33596367120011, -1.35417690494956, -1.33413776408014, + -1.35672177108972, -1.37747987097932, -1.39189884092759, + -1.37303787293858, -1.3970032637812, -1.41652665658308, + -1.42718726018951, -1.40954305055855, -1.43477490530915, + -1.45302315403522, -1.45997050447808, -1.4435788823338, + -1.46995871030885, -1.48689426658247, -1.49018259056314, + -1.47507654752061, -1.50248255569763, -1.5180708448128, + -1.51776335971483, -1.50397297513899, -1.53228034405692, + -1.54648984330104, -1.54265861398243, -1.53021098684863, + -1.55929215336406, -1.57209446342709, -1.56482023897024, + -1.55373942647634, -1.58346437273505, -1.59483428204302, + -1.58420631283208, -1.57451327590116, -1.60474982387039, + -1.61466536569775, -1.60078120123776, -1.59249375703492, + -1.6231078679291, -1.63155037016045, -1.61451563809637, + -1.60764841966707, -1.63850449758881, -1.64545862501717, + -1.6253867918533, -1.61995121497483, -1.65091241408324, -1.6563662031493, + -1.63337831721111, -1.6293825545322, -1.6603110890427, -1.6642559749361, + -1.63848039215686, -1.63592935468398, -1.66668681099746, + -1.66911764705882, -0.0821662846943084, -0.0410831423471542, 0, 0, + -0.04176582387198, -0.08353164774396, -0.164181542420673, + -0.123173913557491, -0.125218567730647, -0.166905487717334, + -0.245895088335807, -0.20503831537824, -0.208434778676113, + -0.249964069634891, -0.327156921070721, -0.286526004703264, + -0.291257363503596, -0.3325506573723, -0.40781806253206, + -0.367487491801391, -0.373530120698076, -0.414509584023852, + -0.487730895385408, -0.447774478958734, -0.455098094280963, + -0.495686604538073, -0.56674949745603, -0.527240196420719, + -0.535807924835229, -0.575929245132386, -0.644729972289525, + -0.605739734872778, -0.615508196913818, -0.655087148695251, + -0.721530775123583, -0.683130373706554, -0.694049782044325, + -0.733012415393399, -0.797013033532398, -0.759271904327991, + -0.771286176552957, -0.809559937712516, -0.87104086201737, + -0.834026947774884, -0.847073833442475, -0.884587729172435, + -0.943481669831475, -0.907261265924423, -0.921272487572309, + -0.957957245972183, -1.01420646133995, -0.978844065585711, + -0.993745473404215, -1.02953370083625, -1.08309012823688, + -1.04864829478841, -1.06436003459368, -1.09918636835111, + -1.15001173295579, -1.11655093059633, -1.13298762472574, + -1.16678888110037, -1.21485478263207, -1.18243325779393, + -1.19950419851395, -1.23221951592754, -1.26503815210259, + -1.23994646736733, -1.25821076045182, -1.2842020049761, + -1.31292435981574, -1.28898125595916, -1.30899309968428, + -1.33378419439247, -1.35841178713589, -1.33566807347582, + -1.35732204873207, -1.38085990307167, -1.40140424943653, + -1.37990801828621, -1.40309426548271, -1.42532862789375, + -1.44181121398938, -1.42160773171296, -1.44621219964472, + -1.46709577139569, -1.47954800505015, -1.46067960951977, + -1.48658431373038, -1.50607285606508, -1.51453599567631, + -1.49704200036323, -1.52412529041761, -1.54217772477015, + -1.54670278584244, -1.53061939075937, -1.55875622582111, + -1.57533472687208, -1.57598236644955, -1.561342576146, -1.59040480823507, + -1.60547488959806, -1.60231526885693, -1.58914881765324, + -1.61900548194242, -1.63253607428677, -1.62564869959774, + -1.61398198422733, -1.64449959571961, -1.65646311715245, + -1.64593665997318, -1.63579267978546, -1.66683553570053, + -1.67720795424861, -1.6631400502544, -1.65453835511379, + -1.68596884229848, -1.69472973034835, -1.67722675825587, + -1.67018340425513, -1.70186231092146, -1.70899489149456, + -1.68817173207987, -1.68269924516787, -1.7144860762525, + -1.71997726101044, -1.69595703686709, -1.69206438447348, + -1.72381767990426, -1.72765809879808, -1.70057189542484, + -1.69826446614596, -1.72984212129447, -1.73202614379085, + -0.0849324747689273, -0.0424662373844636, 0, 0, -0.0431666508969473, + -0.0863333017938945, -0.169700184839882, -0.127316329804405, + -0.129414091878162, -0.17249488196243, -0.254138738759926, + -0.211919461799904, -0.215404144923695, -0.25831340788496, + -0.338084490720674, -0.2961116147403, -0.300965865977004, + -0.343618324069048, -0.421374911268677, -0.379729700994676, + -0.385929281291275, -0.428240238513502, -0.503848955486912, + -0.462611933377794, -0.470125772474626, -0.512011306435751, + -0.585347427813322, -0.544598191650117, -0.553388458465004, + -0.594765610494258, -0.665713342669957, -0.625530385241639, + -0.63555257356946, -0.676339536644663, -0.744792280085806, + -0.705252811377882, -0.716455840711439, -0.756572144778214, + -0.822432735507702, -0.783612507796754, -0.795938839040551, + -0.835305533302888, -0.898486463006852, -0.860459599257277, + -0.873845365072079, -0.912385196841269, -0.972808811103558, + -0.935647637055205, -0.950022786538101, -0.987660376234933, + -1.04525905044934, -1.00903393077645, -1.02432238814868, + -1.06098440006242, -1.11570069262416, -1.08047987153675, + -1.09659970847981, -1.1322150168972, -1.18400179932663, + -1.14985124597539, -1.16671486722505, -1.20121471755289, + -1.25003528125665, -1.21701854029164, -1.23453288206932, + -1.26785104658576, -1.3038636202619, -1.27694945075928, + -1.29568814106674, -1.32352523554771, -1.35518584285431, + -1.32952473155811, -1.35005636343193, -1.37658749131615, + -1.40389108695383, -1.37953846490407, -1.40175488107607, + -1.42692227083599, -1.44987441877842, -1.42688275286613, + -1.45067124024955, -1.4744202096631, -1.4930370705528, -1.47145574466561, + -1.49669928968651, -1.51897836970992, -1.53328666424922, + -1.51316186740101, -1.53973942107164, -1.56050047243337, + -1.57053742085343, -1.55191204255133, -1.57969879468504, + -1.59889711693672, -1.60471035468172, -1.58762388776757, + -1.61649154971403, -1.63408598249135, -1.63573345230888, + -1.6202219034953, -1.65003899875552, -1.66599201501969, + -1.66354183570181, -1.64963764400534, -1.68026980606826, + -1.69454759711684, -1.68807790918911, -1.67580987244546, + -1.7071201491713, -1.71969270122577, -1.7092914899338, -1.69868469956145, + -1.73053386342237, -1.74137502561898, -1.72713992161358, + -1.71821570577369, -1.75046256924889, -1.7595501128788, + -1.74158817105114, -1.73436404633236, -1.76686578174326, + -1.77418145060772, -1.75260890757556, -1.74709853931335, + -1.77971100237421, -1.78524055414069, -1.76018256493508, + -1.75639573625532, -1.78897379260638, -1.79270703107207, + -1.76429738562092, -1.762239975278, -1.79463782926152, -1.79656862745098, + -0.0877695927941774, -0.0438847963970887, 0, 0, -0.0446029418972301, + -0.0892058837944603, -0.175360330910866, -0.131564961852522, + -0.133715831826881, -0.178225779859301, -0.262593764835945, + -0.218977047873405, -0.222549950823116, -0.26687412178693, + -0.349292254464216, -0.305943009650081, -0.310920153323157, + -0.354966184859384, -0.435279371511361, -0.392285812987788, + -0.398642344684302, -0.44231850450922, -0.520380299180762, + -0.477829835346062, -0.485533898217497, -0.528749291925774, + -0.604422228179775, -0.562401263680269, -0.571414068895533, + -0.614078845865292, -0.687234748188349, -0.645828488184062, + -0.656104402798663, -0.698129959732034, -0.768650233893215, + -0.727942491040782, -0.739429141370125, -0.780728323008215, + -0.848504224713142, -0.808577229303179, -0.821215619565806, + -0.861702916123397, -0.926635797355039, -0.887570011034091, + -0.901294656996103, -0.940886397868809, -1.00288793035698, + -0.964761863856007, -0.979500941173914, -1.01811548447902, + -1.0771078597923, -1.03999789507464, -1.0556734020006, -1.09323131952217, + -1.14914742532906, -1.11312764256068, -1.12965557664155, + -1.16607983376092, -1.21886340586082, -1.18400541559494, + -1.20129596396484, -1.23651209416876, -1.28611784394852, + -1.25249062490467, -1.27044836774002, -1.30438464131129, + -1.34368461324582, -1.31490122859717, -1.3341143161276, + -1.36384399094392, -1.3985309536631, -1.37110778345446, + -1.39215920347699, -1.42047441601005, -1.45053652266454, + -1.42453373816382, -1.44731259525157, -1.47415077449309, + -1.49958741297523, -1.47506196781989, -1.49945269539023, + -1.52475461628737, -1.54557641061784, -1.52258191179654, + -1.54846453390657, -1.57217445152577, -1.58840323778674, + -1.56698982420229, -1.59424022733294, -1.6163060031401, + -1.62797478000946, -1.6081890088981, -1.63667922311115, + -1.65705244308219, -1.66420529708097, -1.64609003854521, + -1.6756885273764, -1.6943246116706, -1.6970166172928, -1.68061095718689, + -1.71118291561825, -1.72804121956591, -1.72633831451707, + -1.71167746590493, -1.7430851257416, -1.75812903191729, + -1.75210786774436, -1.73922309113071, -1.77132603309013, + -1.78452303426296, -1.77427080271391, -1.76318933522914, + -1.7958448070359, -1.80716657980884, -1.7927808153153, -1.78352580901461, + -1.81658904878032, -1.8260115177518, -1.80759987648219, + -1.80019034589875, -1.83351491005423, -1.84101830235666, + -1.81869831834038, -1.81314909741128, -1.84658719244836, + -1.85215608254006, -1.82605490141506, -1.82237660987772, + -1.85577942714906, -1.85940277175805, -1.8296568627451, + -1.82785588208008, -1.86107393489863, -1.86274509803922, + -0.0906776387700588, -0.0453388193850294, 0, 0, -0.0460746968728287, + -0.0921493937456573, -0.181161980633624, -0.135919809701841, + -0.138123787576802, -0.184098181407947, -0.271260166563865, + -0.226211073598745, -0.229872196374373, -0.2756462113408, + -0.360780212301346, -0.316020189432606, -0.321120225542054, + -0.366594239743308, -0.449531443260112, -0.405155827780729, + -0.411669310877156, -0.456744382011004, -0.537324926466959, + -0.493428184863535, -0.501322471509574, -0.545900561008144, + -0.62397389855539, -0.580649412511174, -0.589884756126815, + -0.633868951245487, -0.7092941888447, -0.666634043700045, + -0.677163684601426, -0.720458417957365, -0.793104636545808, + -0.751199412695254, -0.762969684020383, -0.805480950083401, + -0.875227501148719, -0.834166068847264, -0.847116518128721, + -0.888752086174041, -0.95548886506193, -0.915358183105325, + -0.929421709214547, -0.970091332255052, -1.03371902759173, + -0.99460394632683, -1.00970695147975, -1.04932257070444, + -1.10975288936884, -1.07173595848028, -1.08779851495997, + -1.1262744592155, -1.18343032635159, -1.14659160786021, + -1.16352763907888, -1.20078081894225, -1.25459655255837, + -1.21901343945498, -1.23673091494512, -1.27268101094799, + -1.3231024707077, -1.28884951163304, -1.30725065552605, + -1.34182030010411, -1.38450113105433, -1.35380180088101, + -1.37348928563442, -1.40515827116473, -1.44295969224212, + -1.41373041164822, -1.43530161981945, -1.46544496847418, + -1.49834809426802, -1.47065389325507, -1.49399519125856, + -1.52254541404295, -1.55054323202696, -1.52444566314749, + -1.54943863090475, -1.57633184776656, -1.59942923418451, + -1.57498623310574, -1.60150793230491, -1.62668401684325, + -1.64489772566269, -1.6221634799236, -1.65008673251426, + -1.67348944818527, -1.68684807314438, -1.66587289940353, + -1.69506657569592, -1.71664370320657, -1.72518761304021, + -1.7060178430923, -1.7363471588082, -1.75605061440983, -1.75983186140132, + -1.74250973722076, -1.77383655882328, -1.79162250323673, + -1.79070470530271, -1.77526828335201, -1.80745144096243, + -1.82328037868812, -1.8177385752635, -1.8042216402831, -1.83711724747608, + -1.85095411626404, -1.84087459831353, -1.82930658678851, + -1.86276836654112, -1.87458261681821, -1.86006273135957, + -1.85046866483655, -1.88434828089277, -1.89411394496733, + -1.87526187454902, -1.86766230295429, -1.90180969585435, + -1.90950544674137, -1.88643996437431, -1.88085091946166, + -1.91511464647497, -1.92072384620856, -1.89357404630704, + -1.89000700534068, -1.92423458353229, -1.92774532085603, + -1.89665032679739, -1.89511218655221, -1.92915043820579, + -1.93055555555556, -0.0936566126965715, -0.0468283063482857, 0, 0, + -0.0475953950922155, -0.0951638316474856, -0.187105134008157, + -0.140380873352364, -0.142678366398466, -0.190112086608367, + -0.280137943943685, -0.233621538975921, -0.237438125314611, + -0.284629676546571, -0.372548364232065, -0.326343154087875, + -0.331660010508749, -0.378502488720821, -0.46413112651493, + -0.418339745373497, -0.425130579105954, -0.471517871018856, + -0.554682837345502, -0.509406981930216, -0.517638090205042, + -0.563465113682859, -0.644002438940166, -0.599342638142834, + -0.608972984539814, -0.654135926634844, -0.731891664639011, + -0.687947051789588, -0.698928359198198, -0.743324911320656, + -0.818155488043587, -0.775023576341299, -0.787300436323883, + -0.830830026003773, -0.902602564814431, -0.860379026429009, + -0.873889024738719, -0.916453043454821, -0.985045666127527, + -0.943824115470979, -0.958497973440114, -1, -1.06530210280782, + -1.02517388446767, -1.04093561594615, -1.0812816349112, + -1.14319413917895, -1.10424812099338, -1.12101520448179, + -1.1601138191424, -1.21854939569173, -1.18087176743534, + -1.19855533302269, -1.23631797244121, -1.29120123941928, + -1.25487531755551, -1.27338034823818, -1.30972146789057, + -1.36098916153417, -1.32609520047672, -1.34532074740251, + -1.38015802296422, -1.42631317368744, -1.3936511676108, -1.4142135623731, + -1.44746807621014, -1.48847205859135, -1.45739261613939, + -1.47990272876577, -1.51149914870852, -1.54732580176426, + -1.5178989301778, -1.54223943949078, -1.57210618948558, + -1.60274187593362, -1.57503383884894, -1.60108248184872, + -1.62915190410067, -1.65459554125281, -1.62866870859321, + -1.65629855742274, -1.68250706566236, -1.70277012787707, + -1.67868283456494, -1.7077625840423, -1.73205080756888, + -1.74715730025821, -1.72496371406764, -1.75535797913451, + -1.77767089730985, -1.78765730255943, -1.76740730140882, + -1.79897692382121, -1.81926399070904, -1.82417918463444, + -1.80591824359693, -1.83852060716333, -1.85673586603215, + -1.85664100805873, -1.84041009634658, -1.87389944999952, + -1.89000163742934, -1.88497003174652, -1.87080551990262, + -1.90503330787172, -1.91898594722899, -1.90910287673265, + -1.89703645423958, -1.93185165257814, -1.94362313664708, + -1.92898566974637, -1.91904427323951, -1.95429373194232, + -1.96385739452541, -1.94457416525162, -1.936779917499, -1.97230870743637, + -1.97964288376187, -1.95583384567736, -1.95020400546449, + -1.98585576934658, -1.99094384514617, -1.96273999961102, + -1.95928692264419, -1.99490422922051, -1.99773467836602, + -1.96527777777778, -1.9640088886944, -1.99943358938626, -2, + 0.047595395092215, 0.0468283063482852, 0.0951638316474846, + 0.0936566126965705, 0.0921493937456564, 0.0460746968728282, + 0.142678366398465, 0.140380873352363, 0.190112086608365, + 0.187105134008155, 0.184098181407945, 0.138123787576801, + 0.23743812531461, 0.23362153897592, 0.28462967654657, 0.280137943943685, + 0.2756462113408, 0.229872196374373, 0.331660010508748, 0.326343154087874, + 0.37850248872082, 0.372548364232064, 0.366594239743307, + 0.321120225542054, 0.425130579105953, 0.418339745373496, + 0.471517871018854, 0.464131126514929, 0.456744382011003, + 0.411669310877155, 0.517638090205041, 0.509406981930215, + 0.563465113682859, 0.554682837345501, 0.545900561008143, + 0.501322471509573, 0.608972984539814, 0.599342638142833, + 0.654135926634843, 0.644002438940165, 0.633868951245487, + 0.589884756126815, 0.698928359198197, 0.687947051789587, + 0.743324911320655, 0.73189166463901, 0.720458417957364, + 0.677163684601425, 0.787300436323883, 0.775023576341298, + 0.830830026003773, 0.818155488043587, 0.805480950083401, + 0.762969684020383, 0.873889024738719, 0.860379026429009, + 0.916453043454821, 0.90260256481443, 0.88875208617404, 0.847116518128721, + 0.958497973440114, 0.943824115470978, 1, 0.985045666127526, + 0.970091332255051, 0.929421709214546, 1.04093561594614, 1.02517388446767, + 1.08128163491119, 1.06530210280782, 1.04932257070444, 1.00970695147974, + 1.12101520448179, 1.10424812099338, 1.1601138191424, 1.14319413917895, + 1.1262744592155, 1.08779851495997, 1.19855533302269, 1.18087176743534, + 1.23631797244121, 1.21854939569173, 1.20078081894225, 1.16352763907888, + 1.27338034823818, 1.2548753175555, 1.30972146789057, 1.29120123941928, + 1.27268101094799, 1.23673091494512, 1.3453207474025, 1.32609520047672, + 1.38015802296422, 1.36098916153416, 1.34182030010411, 1.30725065552605, + 1.41421356237309, 1.3936511676108, 1.44746807621014, 1.42631317368744, + 1.40515827116473, 1.37348928563442, 1.47990272876577, 1.45739261613939, + 1.51149914870852, 1.48847205859135, 1.46544496847418, 1.43530161981945, + 1.54223943949078, 1.5178989301778, 1.57210618948557, 1.54732580176426, + 1.52254541404295, 1.49399519125856, 1.60108248184872, 1.57503383884894, + 1.62915190410067, 1.60274187593362, 1.57633184776656, 1.54943863090475, + 1.65629855742274, 1.62866870859321, 1.68250706566236, 1.65459554125281, + 1.62668401684325, 1.60150793230491, 1.7077625840423, 1.67868283456494, + 1.73205080756888, 1.70277012787707, 1.67348944818527, 1.65008673251426, + 1.75535797913451, 1.72496371406764, 1.77767089730985, 1.74715730025821, + 1.71664370320657, 1.69506657569592, 1.79897692382121, 1.76740730140882, + 1.81926399070904, 1.78765730255943, 1.75605061440983, 1.7363471588082, + 1.83852060716333, 1.80591824359693, 1.85673586603215, 1.82417918463444, + 1.79162250323673, 1.77383655882328, 1.87389944999952, 1.84041009634658, + 1.89000163742934, 1.85664100805873, 1.82328037868812, 1.80745144096243, + 1.90503330787172, 1.87080551990262, 1.91898594722899, 1.88497003174652, + 1.85095411626404, 1.83711724747608, 1.93185165257814, 1.89703645423958, + 1.94362313664708, 1.90910287673265, 1.87458261681821, 1.86276836654112, + 1.95429373194232, 1.91904427323951, 1.96385739452541, 1.92898566974637, + 1.89411394496733, 1.88434828089277, 1.97230870743637, 1.936779917499, + 1.97964288376187, 1.94457416525162, 1.90950544674137, 1.90180969585435, + 1.98585576934658, 1.95020400546449, 1.99094384514617, 1.95583384567736, + 1.92072384620856, 1.91511464647497, 1.99490422922051, 1.95928692264419, + 1.99773467836602, 1.96273999961102, 1.92774532085603, 1.92423458353229, + 1.99943358938626, 1.9640088886944, 2, 1.96527777777778, 1.93055555555556, + 1.92915043820579, 0.0453388193850289, 0.0906776387700579, + 0.0892058837944594, 0.0446029418972297, 0.13591980970184, + 0.181161980633623, 0.1782257798593, 0.13371583182688, 0.226211073598744, + 0.271260166563865, 0.26687412178693, 0.222549950823115, + 0.316020189432605, 0.360780212301345, 0.354966184859383, + 0.310920153323156, 0.405155827780728, 0.449531443260111, + 0.442318504509218, 0.398642344684301, 0.493428184863535, + 0.537324926466959, 0.528749291925774, 0.485533898217496, + 0.580649412511174, 0.623973898555389, 0.614078845865291, + 0.571414068895532, 0.666634043700044, 0.709294188844699, + 0.698129959732033, 0.656104402798662, 0.751199412695253, + 0.793104636545808, 0.780728323008215, 0.739429141370124, + 0.834166068847263, 0.875227501148718, 0.861702916123396, + 0.821215619565806, 0.915358183105324, 0.955488865061929, + 0.940886397868808, 0.901294656996102, 0.994603946326829, + 1.03371902759173, 1.01811548447902, 0.979500941173912, 1.07173595848028, + 1.10975288936884, 1.09323131952217, 1.0556734020006, 1.14659160786021, + 1.18343032635158, 1.16607983376092, 1.12965557664155, 1.21901343945498, + 1.25459655255837, 1.23651209416876, 1.20129596396484, 1.28884951163303, + 1.3231024707077, 1.30438464131129, 1.27044836774002, 1.35380180088101, + 1.38450113105433, 1.36384399094392, 1.3341143161276, 1.41373041164822, + 1.44295969224211, 1.42047441601005, 1.39215920347699, 1.47065389325507, + 1.49834809426802, 1.47415077449309, 1.44731259525157, 1.52444566314749, + 1.55054323202696, 1.52475461628737, 1.49945269539023, 1.57498623310574, + 1.59942923418451, 1.57217445152577, 1.54846453390657, 1.6221634799236, + 1.64489772566269, 1.6163060031401, 1.59424022733294, 1.66587289940353, + 1.68684807314438, 1.65705244308219, 1.63667922311115, 1.7060178430923, + 1.72518761304021, 1.6943246116706, 1.6756885273764, 1.74250973722076, + 1.75983186140132, 1.72804121956591, 1.71118291561825, 1.77526828335201, + 1.79070470530271, 1.75812903191729, 1.7430851257416, 1.8042216402831, + 1.8177385752635, 1.78452303426296, 1.77132603309013, 1.82930658678851, + 1.84087459831353, 1.80716657980884, 1.7958448070359, 1.85046866483655, + 1.86006273135957, 1.8260115177518, 1.81658904878032, 1.86766230295429, + 1.87526187454902, 1.84101830235666, 1.83351491005423, 1.88085091946166, + 1.88643996437431, 1.85215608254006, 1.84658719244836, 1.89000700534068, + 1.89357404630704, 1.85940277175805, 1.85577942714906, 1.89511218655221, + 1.89665032679739, 1.86274509803922, 1.86107393489863, 0.0438847963970883, + 0.0877695927941766, 0.0863333017938937, 0.0431666508969469, + 0.13156496185252, 0.175360330910864, 0.172494881962429, + 0.129414091878161, 0.218977047873405, 0.262593764835945, + 0.25831340788496, 0.215404144923695, 0.30594300965008, 0.349292254464215, + 0.343618324069047, 0.300965865977004, 0.392285812987787, + 0.43527937151136, 0.428240238513501, 0.385929281291274, + 0.477829835346061, 0.520380299180762, 0.51201130643575, + 0.470125772474626, 0.562401263680268, 0.604422228179774, + 0.594765610494257, 0.553388458465004, 0.645828488184061, + 0.687234748188348, 0.676339536644662, 0.63555257356946, + 0.727942491040781, 0.768650233893215, 0.756572144778214, + 0.716455840711438, 0.808577229303178, 0.848504224713142, + 0.835305533302888, 0.795938839040551, 0.88757001103409, + 0.926635797355038, 0.912385196841268, 0.873845365072078, + 0.964761863856006, 1.00288793035697, 0.987660376234932, 0.9500227865381, + 1.03999789507464, 1.0771078597923, 1.06098440006242, 1.02432238814868, + 1.11312764256068, 1.14914742532906, 1.1322150168972, 1.09659970847981, + 1.18400541559494, 1.21886340586082, 1.20121471755289, 1.16671486722505, + 1.25249062490467, 1.28611784394852, 1.26785104658576, 1.23453288206932, + 1.31490122859717, 1.34368461324582, 1.32352523554771, 1.29568814106674, + 1.37110778345446, 1.3985309536631, 1.37658749131615, 1.35005636343193, + 1.42453373816382, 1.45053652266454, 1.42692227083599, 1.40175488107607, + 1.47506196781989, 1.49958741297523, 1.4744202096631, 1.45067124024955, + 1.52258191179654, 1.54557641061784, 1.51897836970991, 1.49669928968651, + 1.56698982420229, 1.58840323778673, 1.56050047243337, 1.53973942107164, + 1.6081890088981, 1.62797478000946, 1.59889711693672, 1.57969879468504, + 1.64609003854521, 1.66420529708097, 1.63408598249135, 1.61649154971403, + 1.68061095718689, 1.6970166172928, 1.66599201501969, 1.65003899875552, + 1.71167746590493, 1.72633831451707, 1.69454759711684, 1.68026980606826, + 1.73922309113071, 1.75210786774436, 1.71969270122577, 1.7071201491713, + 1.76318933522914, 1.77427080271391, 1.74137502561898, 1.73053386342237, + 1.78352580901461, 1.7927808153153, 1.7595501128788, 1.75046256924889, + 1.80019034589875, 1.80759987648219, 1.77418145060772, 1.76686578174326, + 1.81314909741128, 1.81869831834038, 1.78524055414069, 1.77971100237421, + 1.82237660987772, 1.82605490141506, 1.79270703107207, 1.78897379260638, + 1.82785588208008, 1.8296568627451, 1.79656862745098, 1.79463782926152, + 0.0424662373844632, 0.0849324747689265, 0.0835316477439593, + 0.0417658238719796, 0.127316329804404, 0.169700184839881, + 0.166905487717333, 0.125218567730646, 0.211919461799903, + 0.254138738759926, 0.249964069634891, 0.208434778676112, 0.2961116147403, + 0.338084490720673, 0.3325506573723, 0.291257363503595, 0.379729700994675, + 0.421374911268676, 0.414509584023851, 0.373530120698075, + 0.462611933377794, 0.503848955486912, 0.495686604538073, + 0.455098094280962, 0.544598191650117, 0.585347427813321, + 0.575929245132385, 0.535807924835229, 0.625530385241639, + 0.665713342669956, 0.65508714869525, 0.615508196913818, + 0.705252811377881, 0.744792280085806, 0.733012415393399, + 0.694049782044325, 0.783612507796754, 0.822432735507701, + 0.809559937712515, 0.771286176552957, 0.860459599257276, + 0.898486463006851, 0.884587729172434, 0.847073833442475, + 0.935647637055204, 0.972808811103557, 0.957957245972181, + 0.921272487572308, 1.00903393077645, 1.04525905044934, 1.02953370083625, + 0.993745473404214, 1.08047987153675, 1.11570069262416, 1.09918636835111, + 1.06436003459368, 1.14985124597539, 1.18400179932663, 1.16678888110037, + 1.13298762472574, 1.21701854029164, 1.25003528125665, 1.23221951592754, + 1.19950419851395, 1.27694945075928, 1.3038636202619, 1.2842020049761, + 1.25821076045182, 1.32952473155811, 1.35518584285431, 1.33378419439247, + 1.30899309968428, 1.37953846490407, 1.40389108695383, 1.38085990307167, + 1.35732204873207, 1.42688275286613, 1.44987441877842, 1.42532862789375, + 1.40309426548271, 1.47145574466561, 1.4930370705528, 1.46709577139568, + 1.44621219964472, 1.51316186740101, 1.53328666424922, 1.50607285606508, + 1.48658431373038, 1.55191204255133, 1.57053742085343, 1.54217772477015, + 1.52412529041761, 1.58762388776757, 1.60471035468171, 1.57533472687208, + 1.55875622582111, 1.6202219034953, 1.63573345230888, 1.60547488959806, + 1.59040480823507, 1.64963764400534, 1.66354183570181, 1.63253607428677, + 1.61900548194242, 1.67580987244546, 1.68807790918911, 1.65646311715245, + 1.64449959571961, 1.69868469956145, 1.7092914899338, 1.67720795424861, + 1.66683553570053, 1.71821570577369, 1.72713992161358, 1.69472973034835, + 1.68596884229848, 1.73436404633236, 1.74158817105114, 1.70899489149456, + 1.70186231092146, 1.74709853931335, 1.75260890757556, 1.71997726101044, + 1.7144860762525, 1.75639573625532, 1.76018256493508, 1.72765809879808, + 1.72381767990426, 1.762239975278, 1.76429738562092, 1.73202614379085, + 1.72984212129447, 0.0410831423471538, 0.0821662846943076, + 0.080800921644656, 0.040400460822328, 0.12317391355749, + 0.164181542420672, 0.161457597124011, 0.121129259384334, + 0.205038315378239, 0.245895088335807, 0.241826107036723, + 0.201641852080367, 0.286526004703264, 0.32715692107072, + 0.321763184769141, 0.281794645902932, 0.36748749180139, + 0.407818062532059, 0.401126541040268, 0.361444862904704, + 0.447774478958733, 0.487730895385408, 0.479775186232742, + 0.440450863636505, 0.527240196420719, 0.566749497456029, + 0.557569749779674, 0.518672468006208, 0.605739734872777, + 0.644729972289525, 0.634372795883799, 0.595971272831736, + 0.683130373706554, 0.721530775123583, 0.710049134853768, + 0.672210965368783, 0.75927190432799, 0.797013033532397, + 0.784466129352279, 0.747257632103024, 0.834026947774883, + 0.871040862017369, 0.857493994862304, 0.820980062107292, + 0.907261265924422, 0.943481669831474, 0.929006093690767, + 0.893250044276536, 0.97884406558571, 1.01420646133995, 0.998879221843645, + 0.963942657767206, 1.04864829478841, 1.08309012823688, 1.06699388812265, + 1.03293655498315, 1.11655093059633, 1.15001173295579, 1.1332345848112, + 1.10011423646693, 1.18243325779393, 1.21485478263207, 1.19749004933661, + 1.1653623170739, 1.23994646736733, 1.26503815210259, 1.24587429922908, + 1.22168217428284, 1.28898125595916, 1.31292435981574, 1.29206452523901, + 1.26896941223404, 1.33566807347581, 1.35841178713589, 1.33596367120011, + 1.31401409821956, 1.37990801828621, 1.40140424943653, 1.37747987097932, + 1.35672177108971, 1.42160773171296, 1.44181121398938, 1.41652665658308, + 1.3970032637812, 1.46067960951976, 1.47954800505015, 1.45302315403522, + 1.43477490530915, 1.49704200036323, 1.51453599567631, 1.48689426658247, + 1.46995871030885, 1.53061939075937, 1.54670278584244, 1.5180708448128, + 1.50248255569763, 1.561342576146, 1.57598236644955, 1.54648984330104, + 1.53228034405692, 1.58914881765324, 1.60231526885693, 1.57209446342709, + 1.55929215336406, 1.61398198422733, 1.62564869959773, 1.59483428204302, + 1.58346437273505, 1.63579267978546, 1.64593665997318, 1.61466536569775, + 1.60474982387039, 1.65453835511379, 1.6631400502544, 1.63155037016045, + 1.6231078679291, 1.67018340425513, 1.67722675825587, 1.64545862501717, + 1.63850449758881, 1.68269924516787, 1.68817173207987, 1.6563662031493, + 1.65091241408324, 1.69206438447348, 1.69595703686709, 1.6642559749361, + 1.6603110890427, 1.69826446614596, 1.70057189542484, 1.66911764705882, + 1.66668681099746, 0.03973551128516, 0.0794710225703201, + 0.0781411234959841, 0.0390705617479921, 0.119137713111779, + 0.158804403653238, 0.156151210182464, 0.117146166839224, + 0.198333608608413, 0.237862813563589, 0.233899520090455, + 0.195025365136459, 0.277186179538972, 0.316509545514356, + 0.311255906259571, 0.272577713175013, 0.355559185407933, + 0.394608825301509, 0.388091109562751, 0.349673507911161, + 0.43331747208888, 0.47202611887625, 0.464277051519758, 0.426184080541255, + 0.510327277992074, 0.548628437107899, 0.539687124436124, + 0.501982087977941, 0.586456537077476, 0.624284637047053, + 0.614196478210307, 0.576941801323215, 0.661575178026799, + 0.698865719006545, 0.687682303159323, 0.650939390684815, + 0.735555418896887, 0.772245118787229, 0.760024108222179, + 0.723853205690751, 0.80827205658691, 0.844298994386592, + 0.831103993910879, 0.795564051066529, 0.879602750463659, + 0.914906506540727, 0.900806919390687, 0.865955456650783, + 0.949428299502429, 0.983950092464131, 0.969020963084617, + 0.934913941237652, 1.01763291231568, 1.05131573216722, 1.0356375762118, + 1.00232926964821, 1.08410446945776, 1.1168932067483, 1.1005518286854, + 1.0680947024486, 1.14873477741154, 1.18057634807479, 1.16366264681297, + 1.13210723774918, 1.20389227842133, 1.22720820876787, 1.20854211830666, + 1.18610238255982, 1.24947735665763, 1.27174650454739, 1.25142848385577, + 1.22998530108121, 1.29292256387905, 1.31409862321072, 1.29223357522132, + 1.27183102953854, 1.33413776408014, 1.35417690494956, 1.33087393891981, + 1.31155375707057, 1.37303787293858, 1.39189884092759, 1.3672710252721, + 1.34907248209595, 1.40954305055855, 1.42718726018951, 1.4013513663438, + 1.38431119580795, 1.4435788823338, 1.45997050447808, 1.4330467423737, + 1.41719905435875, 1.47507654752061, 1.49018259056314, 1.46229433631349, + 1.4476705393436, 1.50397297513898, 1.51776335971482, 1.48903687612861, + 1.47566560622105, 1.53021098684863, 1.54265861398243, 1.51322276453778, + 1.5011298203332, 1.55373942647634, 1.56482023897024, 1.53480619589747, + 1.52401448021762, 1.57451327590116, 1.58420631283208, 1.5537472599664, + 1.54427672793193, 1.59249375703492, 1.60078120123776, 1.57001203231508, + 1.56187964614074, 1.60764841966707, 1.61451563809637, 1.58357265117557, + 1.57679234174532, 1.61995121497483, 1.6253867918533, 1.59440738055729, + 1.58899001586643, 1.6293825545322, 1.63337831721111, 1.60250065948611, + 1.5984540200217, 1.63592935468398, 1.63848039215686, 1.6078431372549, + 1.60517189837051, 0.0384233441984819, 0.0768466883969638, + 0.0755522532979434, 0.0377761266489717, 0.115207728467271, + 0.153568768537578, 0.150986326892691, 0.113269290095317, + 0.191805341490424, 0.230041914443271, 0.226184308796087, + 0.188585317844389, 0.268092139247425, 0.30614236405158, + 0.301028821843589, 0.263606565319838, 0.343944781814303, + 0.381747199577027, 0.375403289591302, 0.338216055717446, + 0.419240912768233, 0.456734625959438, 0.449192200399119, + 0.412297744995211, 0.493859436364184, 0.530984246768929, + 0.522281369101735, 0.485736784750427, 0.567680791855735, + 0.604377336942541, 0.594558195674775, 0.558419782388255, + 0.640587224338617, 0.676797111734693, 0.665911920310063, + 0.630235057992419, 0.712463051503445, 0.748128991272197, + 0.736233874322214, 0.701072897316139, 0.783194925693358, + 0.818260860114519, 0.805417726318159, 0.770825800320187, + 0.852672090672917, 0.887083321231315, 0.873359723071944, + 0.839388724695051, 0.920786632526603, 0.95448994382189, + 0.939958924559163, 0.906659323815553, 0.98743372411854, 1.02037750441519, + 1.00511743261858, 0.972538178588871, 1.05251186255968, 1.08464622070417, + 1.06874061272294, 1.03692902267076, 1.11592309914449, 1.1471999775848, + 1.13073730835664, 1.09973896053979, 1.16878688392128, 1.19037379025775, + 1.17220546220884, 1.15147138528274, 1.2110130336535, 1.23165227704925, + 1.21187607024274, 1.19204076622579, 1.25130193611378, 1.27095159517831, + 1.2496696151353, 1.23077284268902, 1.28957199024791, 1.30819238531751, + 1.28551083171522, 1.26759022342526, 1.32574616834247, 1.34329995136743, + 1.31932887746275, 1.30241985458898, 1.35975219051737, 1.37620442966731, + 1.35105749299082, 1.33519318522679, 1.39152268846304, 1.40684094725876, + 1.38063515214383, 1.36584632256732, 1.4209953580513, 1.43514976884383, + 1.40800520137417, 1.394320176759, 1.44811310047426, 1.4610764321047, + 1.43311598808078, 1.42056059472748, 1.47282415159151, 1.48457187107832, + 1.45592097761886, 1.44451848284982, 1.49508219919248, 1.50559252730663, + 1.4763788587158, 1.46614991816733, 1.51484648790855, 1.52410044851047, + 1.49445363705454, 1.48541624788517, 1.53208191153707, 1.54006337456367, + 1.51011471681226, 1.5022841769334, 1.54675909256816, 1.55345481057265, + 1.52333696996973, 1.516725843391, 1.55885444873425, 1.56425408689585, + 1.5341007932344, 1.52871888160207, 1.56835024643148, 1.57244640596712, + 1.54239215244813, 1.53824647284127, 1.57523464089206, 1.57802287581699, + 1.54820261437909, 1.54529738341361, 0.0371466410871193, + 0.0742932821742387, 0.073034311050534, 0.036517155525267, + 0.111383959623966, 0.148474637073692, 0.145962947254693, + 0.109498629152614, 0.185453514024273, 0.222432390974853, + 0.21868047315362, 0.182321710204157, 0.259243883828623, + 0.296055376682392, 0.291081931521196, 0.254881202337408, + 0.332644281020502, 0.369233185358611, 0.363063081125921, + 0.327072506323558, 0.405544800996792, 0.441856416634973, + 0.434520632870827, 0.398791856998374, 0.477836671537047, + 0.513816926439122, 0.505352483776508, 0.469936558323668, + 0.549412499207555, 0.585008071975989, 0.575457948277202, + 0.540405216026855, 0.620166512642007, 0.655324953308025, + 0.644737986305988, 0.610097967291595, 0.689994802147663, 0.7246646509873, + 0.713095427652386, 0.678916706979187, 0.758795555094226, + 0.792926459201151, 0.780435192084143, 0.746765309868265, + 0.826469286552195, 0.860012113903239, 0.846664504734535, + 0.813549848409339, 0.892919064658231, 0.925826015413223, + 0.911693106267283, 0.879178805500909, 0.958050730197001, + 0.990275444980779, 0.975433457342979, 0.943563281805131, + 1.02177310990209, 1.05327077482339, 1.03780093692384, 1.00661719713341, + 1.08399822299275, 1.11472567116212, 1.0987140339676, 1.06825748544572, + 1.13463028386717, 1.15453489657223, 1.13686433093562, 1.11778918245161, + 1.17358828694678, 1.19264167732134, 1.17340728439994, 1.15513580766778, + 1.21080619018001, 1.22897070303868, 1.20827179094205, 1.19083953767099, + 1.24621069678953, 1.26345069054038, 1.24139054936555, 1.2248311701538, + 1.27973261792464, 1.29601454530889, 1.27270021315502, 1.25704538126029, + 1.31130702939622, 1.32659951348355, 1.30214153397628, 1.28742087356565, + 1.34087341875094, 1.35514732401834, 1.32965949589285, 1.31590051493457, + 1.36837582235142, 1.3816043206845, 1.35520343999483, 1.34243146794384, + 1.39376295215183, 1.40592158361917, 1.37872717915755, 1.36696530957619, + 1.41698831188188, 1.42805504014458, 1.40018910267031, 1.38945814091393, + 1.43801030237574, 1.4479655646069, 1.41955227049801, 1.40987068658416, + 1.45679231580764, 1.46561906700837, 1.43678449696219, 1.4281683837301, + 1.47330281862024, 1.48098657023212, 1.45185842365198, 1.44432146030709, + 1.48751542295841, 1.4940442756847, 1.46475158139968, 1.45830500252583, + 1.49940894644611, 1.50477361720752, 1.47544644118063, 1.47009901129015, + 1.50896746017133, 1.51316130313514, 1.48393045382214, 1.47968844750139, + 1.51618032477018, 1.51919934640523, 1.49019607843137, 1.48706326612676, + 0.0359054019510724, 0.0718108039021449, 0.0705872967537558, + 0.0352936483768779, 0.107666406581863, 0.143522009261582, + 0.14108107126847, 0.105834184011113, 0.179278126209959, + 0.215034243158336, 0.211388013163053, 0.176234542215762, + 0.250641413282565, 0.286248583406793, 0.281415235292391, + 0.246401624227722, 0.321657683026528, 0.357066782646263, + 0.351070484166606, 0.316242859729498, 0.392229136774559, + 0.427391490902854, 0.420262348934881, 0.385666416550744, + 0.462258983510665, 0.497126476118475, 0.488900468460442, + 0.454581408697662, 0.531651659132936, 0.566176842147396, + 0.55689573601759, 0.522898102239016, 0.60031304293697, 0.634449243726543, + 0.624160501147098, 0.590528118582344, 0.668150670829541, + 0.70185209793254, 0.690608768212694, 0.657384634679896, + 0.735073944789514, 0.768295791646487, 0.756156391208832, + 0.723382579710763, 0.800994338101493, 0.833692884556499, + 0.820721264378462, 0.788438827793647, 0.865825595897314, + 0.89795830723813, 0.884223508208977, 0.85247238629372, 0.92948393055106, + 0.96100955386399, 0.946585650385001, 0.915404579296989, + 0.991888211484981, 1.02276686910597, 1.0077328012881, 0.97715922583655, + 1.05296014895635, 1.08315342880673, 1.06759282364586, 1.03766281246698, + 1.10142247825902, 1.1196915277113, 1.10251872448699, 1.08505577406642, + 1.13720311653748, 1.15471470536365, 1.13602212632736, 1.11927042540717, + 1.17143532607773, 1.18815594679181, 1.16804010264156, 1.15203111448446, + 1.20405388370499, 1.21995182061817, 1.1985130918708, 1.18327659725618, + 1.23499722168507, 1.25004262275197, 1.22738503234893, 1.21294906210986, + 1.2642075671951, 1.27837251163823, 1.25460348930017, 1.24099426082455, + 1.29163107319752, 1.30488963475682, 1.28011977362078, 1.26736163146048, + 1.31721794042098, 1.32954624608515, 1.30388905217547, 1.29200441289813, + 1.34092253017169, 1.35229881425823, 1.32587044935892, 1.31487975076719, + 1.36270346771973, 1.37310812118123, 1.34602713969215, 1.33594879452553, + 1.38252373602614, 1.39193935087106, 1.3643264312441, 1.35517678546813, + 1.40035075959841, 1.40876216832577, 1.38073983968934, 1.37253313546672, + 1.41615647828444, 1.42355078824311, 1.39524315283425, 1.38799149626179, + 1.42991741083782, 1.43628403343253, 1.40781648546539, 1.40152981914982, + 1.44161470811042, 1.4469453827883, 1.41844432439598, 1.41313040493069, + 1.45123419575173, 1.45552300871515, 1.42711556360816, 1.42277994400207, + 1.45876640631836, 1.46200980392157, 1.43382352941176, 1.43046954650996, + 0.0346996267903412, 0.0693992535806823, 0.0682112104076088, + 0.0341056052038044, 0.104055069340964, 0.138710885101246, + 0.136340698934021, 0.102275954670815, 0.173279178047483, + 0.20784747099372, 0.204306928824387, 0.170323813879204, + 0.242284727609252, 0.276721984224783, 0.272028733157175, + 0.238167830990781, 0.310984987832382, 0.345247991439982, + 0.339425498713358, 0.305727115935266, 0.379293920101532, + 0.413339848763082, 0.406417348591282, 0.37292142365232, + 0.447126372285036, 0.48091289580699, 0.472925323153537, 0.43967133587241, + 0.514398271631877, 0.547883647456763, 0.538871558895937, + 0.505898441024737, 0.581026815223505, 0.614169982990246, + 0.604179464833394, 0.571525511864665, 0.646930657549081, + 0.679691332107916, 0.668773896003138, 0.636476680418266, + 0.712030094779222, 0.744368857450529, 0.732581323692225, + 0.700677609847681, 0.776247245320811, 0.808125633191093, + 0.795530002003725, 0.764055662847975, 0.839506226243852, + 0.870886819296611, 0.857550130384246, 0.826540066193985, + 0.901733325180718, 0.932579831064823, 0.918574011744646, + 0.888062071064446, 0.962857167308364, 0.993134503551905, + 0.978536205815711, 0.948555108780178, 1.02280887703527, 1.05248325051863, + 1.03737367739141, 1.00795494160356, 1.06916346709681, 1.08584368367498, + 1.06916864286296, 1.05327116012719, 1.10185752242558, 1.11787136117618, + 1.09972059602499, 1.08444461944398, 1.13318934380694, 1.1485073264377, + 1.12897455023384, 1.11434757312942, 1.16310155099429, 1.17769577555088, + 1.15687845923097, 1.14292650473241, 1.19153997962379, 1.20538418369669, + 1.18338333504445, 1.17013089713771, 1.21845380391401, 1.23152342413134, + 1.20844335896251, 1.19591334700348, 1.24379565180277, 1.2560678794742, + 1.23201598532761, 1.22022967214506, 1.26752171225999, 1.27897554504578, + 1.25406203791609, 1.24303901162185, 1.28959183453384, 1.3002081240219, + 1.27454579868488, 1.26430391830049, 1.30996961910508, 1.31973111418826, + 1.29343508868437, 1.28399044368463, 1.32862250014368, 1.33751388609909, + 1.31070134095408, 1.30206821481922, 1.34552181928088, 1.35352975246267, + 1.326319665236, 1.31851050309504, 1.36064289052966, 1.36775602859665, + 1.34026890435905, 1.33329428479753, 1.3739650562064, 1.38017408381614, + 1.35253168216689, 1.34640029326297, 1.38547173372718, 1.39076938363821, + 1.36309444288045, 1.35781306252367, 1.39515045317269, 1.39953152270716, + 1.37194748180617, 1.36752096234331, 1.40299288553659, 1.40645424836601, + 1.37908496732026, 1.37551622456322, 0.0335293156049255, + 0.067058631209851, 0.0659060520120932, 0.0329530260060466, + 0.100549947901268, 0.134041264592684, 0.131741830251347, + 0.0988239411317202, 0.167456669536844, 0.200872074481004, + 0.197437220137621, 0.164589525194484, 0.234173826808683, + 0.267475579136361, 0.262922425115547, 0.230179822626584, + 0.300626195438064, 0.333776811739768, 0.328128124766177, + 0.295525274940862, 0.366739150977711, 0.399701490215655, + 0.392985631840029, 0.360556878303103, 0.43243883786016, + 0.465176185504666, 0.457427047855794, 0.425206339847911, + 0.497652336704378, 0.530128487904091, 0.521385416912244, + 0.489406232384019, 0.562307829501612, 0.594487171099134, + 0.584794877364874, 0.553090147138559, 0.626334762306281, + 0.658182353513427, 0.647590811023717, 0.616192844194296, + 0.689664005063351, 0.721145656613275, 0.709709989534324, + 0.678650400279021, 0.752228008210149, 0.783310359807024, + 0.771090717610323, 0.740400353572323, 0.813960955697845, + 0.844611551588667, 0.831672972793088, 0.801381845201705, + 0.874798914085973, 0.90498627658328, 0.891398541421914, + 0.861535757107501, 0.934679977372237, 0.964373678161194, + 0.950211150506677, 0.920804845964295, 0.993544407229515, + 1.02271513629784, 1.00805659520426, 0.979133872855469, 1.03785325038054, + 1.05299136446325, 1.03681408606353, 1.0224353406339, 1.06755150461109, + 1.08211164475892, 1.06450269349285, 1.05065838977819, 1.09606824336764, + 1.11002484197637, 1.09107513371889, 1.07778891360587, 1.12335369865744, + 1.13668255533852, 1.11648665144606, 1.10378089258248, 1.14936089174077, + 1.16203922814303, 1.1406951212416, 1.12859088634383, 1.17404573955296, + 1.18605225096289, 1.16366114296328, 1.15217813210244, 1.19736715456668, + 1.20868205817048, 1.18534813101334, 1.17450463698831, 1.21928713786844, + 1.22989221756639, 1.2057223972167, 1.19553526411502, 1.23977086523828, + 1.24964951291016, 1.22475322713545, 1.21523781217607, 1.25878676603792, + 1.26792401916567, 1.24241294964697, 1.23358308839121, 1.27630659472834, + 1.284689170291, 1.25867699962793, 1.25054497463745, 1.29230549485504, + 1.29992181941908, 1.27352397360215, 1.26610048661504, 1.3067620553559, + 1.31360229129273, 1.28693567822641, 1.28022982591428, 1.31965835906413, + 1.32571442683553, 1.29889717150416, 1.29291642486528, 1.33098002329638, + 1.33624561975724, 1.30939679663404, 1.3041469840691, 1.34071623243421, + 1.34518684511118, 1.31842620841619, 1.31391150252511, 1.34885976242487, + 1.35253267973856, 1.32598039215686, 1.32220330028652, 0.0323944683948255, + 0.0647889367896509, 0.0636718215672087, 0.0318359107836044, + 0.0971510422627742, 0.129513147735898, 0.127284465220448, + 0.0954781433938282, 0.161810600678043, 0.194108053620189, + 0.190778887102756, 0.159031676161602, 0.226308710880858, + 0.258509368141528, 0.254096311167508, 0.222437599135132, + 0.290581305843574, 0.322653243545621, 0.317178362325064, + 0.285637336746286, 0.354564829403098, 0.386476415260575, + 0.379967198681121, 0.348572780503093, 0.418196380236039, + 0.449916345211503, 0.442405642567212, 0.411186420624167, + 0.48141385435044, 0.512911363489377, 0.504437310066511, + 0.473421476316861, 0.544156085771292, 0.575400808053207, + 0.56600673874154, 0.535222024404026, 0.606362985101141, + 0.637325162149075, 0.627059513274433, 0.596533126007987, 0.6679756756419, + 0.698626189134725, 0.687542388735127, 0.65730095100478, + 0.728936626769507, 0.759247064404289, 0.747403411198256, + 0.717472899966691, 0.789189784259293, 0.819132504114296, + 0.806592035435505, 0.77699772331688, 0.848680697266827, + 0.878228890419359, 0.865059239416804, 0.835825637426154, + 0.907356641676598, 0.936484392933837, 0.922757635360998, + 0.893908437388901, 0.965166739539086, 0.993849086144336, + 0.97964157708441, 0.951199606222704, 1.00749182811023, 1.02113457007612, + 1.0054550540887, 0.992548315586556, 1.034285063094, 1.04743555611189, + 1.03036841873093, 1.01791173640981, 1.06007202475984, 1.0727084934078, + 1.05434185309671, 1.04235513591382, 1.08481032669443, 1.09691215998107, + 1.07733766851607, 1.06583976080639, 1.10845995803603, 1.12000775609099, + 1.09932039094038, 1.08832902972823, 1.13098337411194, 1.14195899213288, + 1.12025684130249, 1.10978861612143, 1.15234558148927, 1.16273217084566, + 1.14011621067797, 1.13018652599023, 1.17251421724632, 1.18229626364699, + 1.15887013007728, 1.14949317037763, 1.19145962228501, 1.20062298092303, + 1.17649273471061, 1.16768143239394, 1.20915490851825, 1.21768683611347, + 1.19296072257996, 1.18472672864528, 1.22557601978013, 1.2334652034468, + 1.20825340726567, 1.20060706492281, 1.24070178632089, 1.24793836919498, + 1.22235276478781, 1.21530308602674, 1.25451397276317, 1.26108957633135, + 1.2352434744363, 1.22879811961206, 1.26699731941102, 1.27290506249069, + 1.24691295347721, 1.24107821395675, 1.27813957681804, 1.28337409114539, + 1.25735138565675, 1.25213216956698, 1.28793153353629, 1.29248897592719, + 1.2665517434382, 1.26195156454747, 1.2963670369832, 1.30024509803922, + 1.27450980392157, 1.27053077367988, 0.0312950851600411, + 0.0625901703200821, 0.0615085190729555, 0.0307542595364778, + 0.0938583524254837, 0.125126534530885, 0.122968603841323, + 0.0922385614571392, 0.15634097147108, 0.187555408411274, + 0.184331929719791, 0.153650266780557, 0.218689379825778, + 0.249823351240283, 0.245550391313058, 0.214941160516425, + 0.280850319048912, 0.311877286857541, 0.306576211390018, + 0.276063301351538, 0.342770955377691, 0.373664623897841, + 0.367362049114561, 0.336969130252289, 0.404398999412671, + 0.435133374927502, 0.427861107287792, 0.397611578201176, + 0.465682824570063, 0.496232274212624, 0.488027238358737, + 0.457944172823265, 0.526571584032545, 0.556910893852466, + 0.547815048963392, 0.517921143661064, 0.587015325933662, + 0.617119758014859, 0.607180002755285, 0.577497525859338, + 0.64696510651487, 0.67681045501488, 0.666078521294634, 0.63662926202496, + 0.706373100998885, 0.73593574698289, 0.724468082767525, 0.69527330203108, + 0.765192711928195, 0.7944496768735, 0.782307318311495, 0.75338770053951, + 0.82337867472328, 0.85230767257306, 0.839556105729316, 0.810931712020406, + 0.880887160221448, 0.909466647869836, 0.896175660378673, + 0.867865883053995, 0.937675873963984, 0.965885100058132, + 0.952128623031855, 0.924152141705264, 0.978079200285859, + 0.990273300513586, 0.975091546938469, 0.963610084985162, + 1.00205819787433, 1.01384309523507, 0.997317771739223, 0.986204659338846, + 1.02520068798354, 1.036558280732, 1.01877470836729, 1.00804624005326, + 1.04747143510527, 1.05838458947854, 1.039431510441, 1.02910310940415, + 1.06883717850956, 1.07928976754058, 1.05925914414079, 1.0493453272909, + 1.08926670759095, 1.09924364764131, 1.07823045398013, 1.06874479906046, + 1.10873093257052, 1.11821821749974, 1.0963202243215, 1.08727533915082, + 1.12720295039365, 1.13618768328756, 1.11350523649785, 1.10491273040968, + 1.14465810567403, 1.15312852806049, 1.12976432141037, 1.12163477895411, + 1.16107404654606, 1.16901956503164, 1.14507840748332, 1.13742136444684, + 1.17643077529906, 1.18384198556648, 1.15943056386729, 1.1522544856753, + 1.19071069367844, 1.1975794017904, 1.17280603879298, 1.16611830133013, + 1.20389864275146, 1.21021788371252, 1.18519229298874, 1.17899916589086, + 1.21598193724707, 1.22174599078162, 1.19657902808603, 1.19088566053739, + 1.22695039429214, 1.23215479780266, 1.20695820994858, 1.20176861901731, + 1.23679635647893, 1.2414379151552, 1.21632408687221, 1.21164114841039, + 1.24551470921159, 1.24959150326797, 1.22467320261438, 1.22049864474329, + 0.0302311659005723, 0.0604623318011446, 0.0594161445293336, + 0.0297080722646668, 0.0906718783893961, 0.120881424977648, + 0.118794246113972, 0.089105195321653, 0.151047781915953, + 0.181214138854259, 0.178096347988727, 0.14844529705135, + 0.211315833643443, 0.241417528432627, 0.237284665552196, + 0.207690506770462, 0.271433235054077, 0.301448941675528, + 0.296321671961038, 0.266803168756617, 0.331357528901491, + 0.361266116127453, 0.355170183140346, 0.325745927550692, + 0.391046695390058, 0.420827274652662, 0.413793442017532, + 0.384481812578939, 0.450459247363246, 0.480091220073831, + 0.472155201788924, 0.442974321903228, 0.50955432428537, 0.53901742849691, + 0.530219808030428, 0.501187504909676, 0.568291784803844, + 0.597566141110779, 0.587952279466273, 0.55908604374835, 0.62663229768226, + 0.65569845425374, 0.645318387212847, 0.61663533333956, 0.684537430898284, + 0.713376407542827, 0.702284732318129, 0.673801559765488, + 0.741969738704552, 0.770563069866277, 0.75881882142106, + 0.730551776869594, 0.798892846455331, 0.827222623044384, + 0.814889140359451, 0.786853980890255, 0.855271533006786, + 0.883320442969189, 0.870465225559704, 0.842677182959578, + 0.911071810504207, 0.938823178039226, 0.925517733046597, + 0.89799147930315, 0.949615366907439, 0.960407555775651, + 0.945723564612833, 0.935620648829715, 0.970870908952066, + 0.981334262128481, 0.965350752517739, 0.955537158565286, + 0.991454233038726, 1.00157420394897, 0.984373699530647, + 0.974862226024193, 1.01133702388995, 1.02109984383093, 1.00276817722086, + 0.993570938375752, 1.03049255316137, 1.0398852624918, 1.02051138084282, + 1.01163977903184, 1.04889573998999, 1.05790621748818, 1.03758198099622, + 1.02904668091952, 1.06652320781045, 1.07514019813272, 1.05396017194393, + 1.04577107647008, 1.08335333731042, 1.09156647648812, 1.06962771647839, + 1.06179394421116, 1.09936631540533, 1.10716615432255, 1.08456798723472, + 1.07709785185656, 1.11454418012137, 1.12192220592019, 1.09876600435707, + 1.0916669957959, 1.12887086128512, 1.13581951665004, 1.11220846943279, + 1.10548723689493, 1.14233221692767, 1.14884491720531, 1.12488379561764, + 1.11854613252522, 1.15491606532077, 1.16098721343623, 1.13678213388372, + 1.13083296475068, 1.16661221257228, 1.17223721170833, 1.14789539533064, + 1.14233876460718, 1.17741247571869, 1.18258773972905, 1.15821726950953, + 1.15305633242008, 1.18731070126213, 1.19203366279522, 1.16774323871822, + 1.16298025411388, 1.19630277911003, 1.20057189542484, 1.17647058823529, + 1.17210691347676, 0.0292027106164191, 0.0584054212328383, + 0.0573946979363429, 0.0286973489681715, 0.0875916201545114, + 0.116777819076185, 0.114761392038397, 0.0860780449873698, + 0.145931032012665, 0.175084244949145, 0.172072141909563, + 0.14341676697398, 0.204188072333852, 0.233291899718559, + 0.229299133884923, 0.200685637897243, 0.262330053859071, + 0.291368207999582, 0.286414744038126, 0.257856938961524, + 0.320324549974497, 0.349280891949412, 0.343391600758478, + 0.314903172398302, 0.378139468168198, 0.406998044386983, + 0.400202646756434, 0.371797123757456, 0.43574312272999, + 0.464488201072997, 0.45682120035707, 0.428511923556752, + 0.493104306529768, 0.521720411986539, 0.513221015942649, + 0.48502110814986, 0.550192361711687, 0.578664311436834, + 0.569376343407396, 0.541298679675023, 0.60697724914407, + 0.635290186851305, 0.625261986489763, 0.59731916494858, + 0.663429616467702, 0.691569046084099, 0.680853359850069, + 0.653057673169916, 0.719520864588364, 0.747472683092629, + 0.736126544764198, 0.708489952307134, 0.77522321246298, 0.80297374183333, + 0.791058343307209, 0.763592444035704, 0.830509760032613, + 0.858045778231897, 0.84562633090409, 0.818342337105649, + 0.885354549159757, 0.912663320087616, 0.899808907128636, + 0.872717619016363, 0.922100327974965, 0.931537335862314, + 0.917351107111795, 0.908580007120215, 0.94072319632721, + 0.949909056792107, 0.934467361066474, 0.925909234089135, + 0.958832659925407, 0.967756263058707, 0.951138826586767, + 0.942803093826621, 0.976407093048475, 0.985057923038242, + 0.967347668855629, 0.959243247721198, 0.993426081991444, + 1.00179424094465, 0.983077101046474, 0.975212384951051, 1.00987047130906, + 1.01794670167348, 0.99831142235074, 0.990694261698607, 1.02572240720904, + 1.0334981127446, 1.01303605354527, 1.005673737948, 1.04096537799663, + 1.04843264324866, 1.02723757001892, 1.0201368117821, 1.05558425147893, + 1.0627358597092, 1.04090373218368, 1.0340706511013, 1.06956530924417, + 1.07639475877913, 1.0540235132012, 1.04746362269244, 1.0828962777383, + 1.08939779669748, 1.06658712396217, 1.06030531858168, 1.0955663560686, + 1.10173491543973, 1.07858603526181, 1.07258657961199, 1.1075662404711, + 1.11339756550248, 1.09001299712124, 1.08429951619153, 1.11888814538665, + 1.12437872527082, 1.10086205521101, 1.09543752616613, 1.12952582109769, + 1.13467291692456, 1.1111285643396, 1.10599530977531, 1.1394745678859, + 1.14427621884723, 1.12080919897623, 1.11596888165792, 1.14873124667852, + 1.1531862745098, 1.12990196078431, 1.12535557988027, 0.0282097193075816, + 0.0564194386151632, 0.0554441792939835, 0.0277220896469917, + 0.0846175777208296, 0.112815716826496, 0.110870041614595, + 0.0831571104542894, 0.140990721761214, 0.169165726695932, + 0.1662593114823, 0.138564676548448, 0.197306095897006, 0.22544646509808, + 0.221593796311238, 0.193926553896769, 0.253540775463892, + 0.281635085829703, 0.276855427621281, 0.249224611966259, + 0.30967201859671, 0.337708951363717, 0.332026301968956, + 0.304440864795118, 0.365677317747091, 0.393645684130466, + 0.387088721504498, 0.359557511736727, 0.421534450670294, + 0.449423217210123, 0.442025234063176, 0.414556977783837, + 0.477221530765738, 0.505019844321353, 0.496818672700056, + 0.469421953381616, 0.53271705665719, 0.560414268993026, + 0.551452194578656, 0.524135433639356, 0.5879999609003, 0.615585652807574, + 0.605909319125385, 0.578680756852021, 0.64304965770714, + 0.670513662606706, 0.660173965363344, 0.633041642244364, + 0.69784608957963, 0.725178516552555, 0.714230488340911, + 0.687202226852127, 0.752369772746227, 0.779561028939899, + 0.768063714572589, 0.74114710145675, 0.80660184129893, 0.83364265365796, + 0.82165897641183, 0.79486134549221, 0.860524089930632, 0.887405526203304, + 0.875002145277972, 0.848330560844901, 0.895534083488439, + 0.903662640773575, 0.889974174435355, 0.882488159856663, + 0.911615059999764, 0.919567479225952, 0.90466759738543, + 0.897320885910392, 0.927335968643582, 0.935104458061211, + 0.919070089535655, 0.911868843460542, 0.942681642580843, + 0.950258827100475, 0.933169985345321, 0.926120037440488, + 0.957637764999795, 0.965016702899115, 0.946956304751757, + 0.940063145048539, 0.972190901548168, 0.97936510019722, 0.9604187780437, + 0.953687541397728, 0.986328530766302, 0.993291961335383, + 0.973547869125499, 0.9669833235846, 1.00003907245228, 1.00678618356918, + 0.986334797119435, 0.979941333122467, 1.01331191389482, 1.01983764422046, + 0.998771556257233, 0.992553176688334, 1.02613743391445, 1.03243722360845, + 1.0108509340157, 1.00481124513647, 1.03850702465862, 1.0445768257088, + 1.02256652745543, 1.01670873073557, 1.05041311110122, 1.05624939649365, + 1.03391275772548, 1.02823964259046, 1.06184916820246, 1.06744893991127, + 1.04488488270131, 1.03939882021339, 1.07280973569018, 1.07817053146909, + 1.05547900772717, 1.05018194521424, 1.08329043042914, 1.08841032938919, + 1.06569209443879, 1.06058555108298, 1.09328795635022, 1.09816558331124, + 1.07552196764625, 1.07060703104252, 1.10280011191706, 1.10743464052288, + 1.08496732026144, 1.08024464395384, 0.0272521919740597, + 0.0545043839481194, 0.0535645886022553, 0.0267822943011277, + 0.0817497510883508, 0.108995118228582, 0.107120194842569, + 0.0803423917224121, 0.1362268511616, 0.163458584094619, + 0.160657856706937, 0.133889025774753, 0.190669904332904, + 0.217881224571189, 0.214168652831141, 0.187413254769039, + 0.245065399868541, 0.272249575165892, 0.267643722710503, + 0.240906187770822, 0.29939993476813, 0.326550294370368, 0.32107428677178, + 0.294359004741141, 0.353660244126739, 0.38077019388311, + 0.374451666261723, 0.347762976516751, 0.407833231184159, + 0.434896268485209, 0.427767302907242, 0.401109484584482, + 0.46190599699328, 0.488915725501352, 0.481012778302648, + 0.454390040604945, 0.515865869640353, 0.542816013779354, + 0.534179832980052, 0.50759630564135, 0.569700432950951, + 0.596584852122548, 0.587260385119711, 0.560720109049882, + 0.623397554616599, 0.650210257110649, 0.640246548857955, + 0.613753466988833, 0.676945413678352, 0.703680570246055, + 0.693130652151198, 0.666688600504576, 0.730332527305073, + 0.756984484364091, 0.745905254155592, 0.719517953153395, + 0.783547776805734, 0.810111069247378, 0.798563162082926, + 0.772234208119259, 0.836580432816833, 0.863049796386288, + 0.851097447494605, 0.824830304788765, 0.869916633447861, + 0.876783470509433, 0.863592766583512, 0.857345107039058, + 0.883546499969726, 0.890309529430018, 0.875951461474605, + 0.869772114029059, 0.89696415919325, 0.903618788956483, + 0.888167488377311, 0.882059474925958, 0.910160672487055, + 0.916702556017628, 0.900235126689934, 0.894201307533623, + 0.923127602186419, 0.929552648355211, 0.912148991958666, 0.9061920593243, + 0.935857030707305, 0.942161413059399, 0.923904048075098, + 0.918026520016882, 0.948341578482233, 0.954521743905066, + 0.935495618684633, 0.929699833379866, 0.960574420677373, + 0.966627097449681, 0.946919397779927, 0.94120750823228, + 0.972549302652995, 0.978471507856308, 0.958171459455384, + 0.952545428617656, 0.984260554132229, 0.99004960040815, + 0.969248266800595, 0.96370986312799, 0.995703102046076, 1.001356603684, + 0.980146679912575, 0.974697473356585, 1.00687248202554, 1.01238836036707, + 0.990863963008656, 0.985505321460616, 1.01776484851484, 1.02314133666261, + 1.00139779062391, 0.996130876816286, 1.02837698348287, 1.03361263030313, + 1.01174625287909, 1.0065720217515, 1.03870630371304, 1.04379997712295, + 1.0219078598071, 1.0168270563431, 1.0487508666551, 1.05370175618725, + 1.03188154472826, 1.02689470226768, 1.05850937482565, 1.06331699346405, + 1.04166666666667, 1.03677410569746, 0.0263301286158534, + 0.0526602572317069, 0.0517559258611584, 0.0258779629305792, + 0.0789881402570748, 0.105316023282443, 0.103511851722317, + 0.0776338887917376, 0.131639420213825, 0.157962817145206, + 0.155267777583475, 0.129389814652896, 0.184279497641547, + 0.210596178137887, 0.207023703444634, 0.181145740514054, + 0.236903927073017, 0.263211676008147, 0.258779629305792, + 0.232901666375213, 0.289508298488756, 0.315804920969365, + 0.31053555516695, 0.284657592236371, 0.34208824730714, 0.368371573644916, + 0.362291481028109, 0.33641351809753, 0.394639464271585, + 0.420907354898254, 0.414047406889267, 0.388169443958688, + 0.447157705212396, 0.473408055526537, 0.465803332750425, + 0.439925369819846, 0.499638800661177, 0.525869545795818, + 0.517559258611584, 0.491681295681005, 0.552078665296022, + 0.578287784796227, 0.569315184472742, 0.543437221542163, + 0.604473307196077, 0.630658829595928, 0.621071110333901, + 0.595193147403321, 0.656818836884528, 0.682978844173129, + 0.672827036195059, 0.64694907326448, 0.709111476139517, + 0.735244108105905, 0.724582962056217, 0.698704999125638, + 0.761347566553028, 0.787451025000151, 0.776338887917376, + 0.750460924986797, 0.81352357781836, 0.839596130636569, + 0.828094813778534, 0.802216850847955, 0.845247977853229, + 0.85089982506989, 0.838206883556267, 0.833150848667401, + 0.856517516237096, 0.862135207404303, 0.848318953334001, + 0.843262918445134, 0.867717231574413, 0.873299255744522, + 0.858431023111734, 0.853374988222867, 0.878844182767112, + 0.884389109789701, 0.868543092889467, 0.863487058000601, + 0.889895593551317, 0.895402077312933, 0.878655162667201, + 0.873599127778334, 0.900868858786475, 0.906335640260016, + 0.888767232444934, 0.883711197556067, 0.911761550356833, + 0.91718746045365, 0.898879302222667, 0.8938232673338, 0.922571422671907, + 0.927955384890164, 0.9089913720004, 0.903935337111534, 0.933296417753461, + 0.938637450616759, 0.919103441778134, 0.914047406889267, + 0.943934669897495, 0.949231889178231, 0.929215511555867, 0.924159476667, + 0.954484509900659, 0.959737130623088, 0.9393275813336, 0.934271546444734, + 0.964944468841541, 0.970151807059995, 0.949439651111334, + 0.944383616222467, 0.975313281408243, 0.980474755756491, + 0.959551720889067, 0.9544956860002, 0.985589888764719, 0.990705021772947, + 0.9696637906668, 0.964607755777934, 0.995773440949382, 1.00084186012582, + 0.979775860444533, 0.974719825555667, 1.00586329880054, 1.01088473747526, + 0.989887930222267, 0.9848318953334, 1.0158590354043, 1.02083333333333, 1, + 0.994943965111133, 0.807114884646544, 0.812012918445134, + 0.785818953334001, 0.781078920625688, 0.816910952243724, + 0.821808986042313, 0.795299018750626, 0.790558986042313, + 0.826707019840903, 0.831605053639492, 0.804779084167251, + 0.800039051458938, 0.836503087438082, 0.841401121236671, + 0.814259149583876, 0.809519116875563, 0.846299155035261, + 0.85119718883385, 0.8237392150005, 0.818999182292188, 0.85609522263244, + 0.86099325643103, 0.833219280417125, 0.828479247708813, + 0.865891290229619, 0.870789324028209, 0.84269934583375, + 0.837959313125438, 0.875687357826798, 0.880585391625388, + 0.852179411250375, 0.847439378542063, 0.885483425423977, + 0.890381459222567, 0.861659476667, 0.856919443958688, 0.895279493021157, + 0.900177526819746, 0.871139542083626, 0.866399509375313, + 0.905075560618336, 0.909973594416925, 0.88061960750025, + 0.875879574791938, 0.914871628215515, 0.919769662014104, + 0.890099672916875, 0.885359640208563, 0.924667695812694, + 0.929565729611284, 0.8995797383335, 0.894839705625188, 0.934463763409873, + 0.939361797208463, 0.909059803750125, 0.904319771041813, + 0.944259831007052, 0.949157864805642, 0.91853986916675, + 0.913799836458438, 0.954055898604231, 0.958953932402821, + 0.928019934583375, 0.923279901875063, 0.96385196620141, 0.96875, 0.9375, + 0.932759967291688, 0.755042956604832, 0.759624988222867, + 0.733431023111734, 0.729006992583975, 0.764207019840903, + 0.768789051458938, 0.742279084167251, 0.737855053639492, + 0.773371083076974, 0.777953114695009, 0.751127145222767, + 0.746703114695009, 0.782535146313044, 0.78711717793108, + 0.759975206278284, 0.755551175750525, 0.791699209549115, + 0.79628124116715, 0.768823267333801, 0.764399236806042, + 0.800863272785186, 0.805445304403221, 0.777671328389317, + 0.773247297861559, 0.810027336021257, 0.814609367639292, + 0.786519389444834, 0.782095358917075, 0.819191399257327, + 0.823773430875363, 0.79536745050035, 0.790943419972592, + 0.828355462493398, 0.832937494111434, 0.804215511555867, + 0.799791481028108, 0.837519525729469, 0.842101557347505, + 0.813063572611384, 0.808639542083625, 0.84668358896554, + 0.851265620583575, 0.8219116336669, 0.817487603139142, 0.855847652201611, + 0.860429683819646, 0.830759694722417, 0.826335664194659, + 0.865011715437682, 0.869593747055717, 0.839607755777934, + 0.835183725250175, 0.874175778673752, 0.878757810291788, + 0.84845581683345, 0.844031786305692, 0.883339841909823, + 0.887921873527859, 0.857303877888967, 0.852879847361208, + 0.892503905145894, 0.897085936763929, 0.866151938944483, + 0.861727908416725, 0.901667968381965, 0.90625, 0.875, 0.870575969472242, + 0.702971028563119, 0.7072370580006, 0.681043092889467, 0.676935064542263, + 0.711503087438082, 0.715769116875563, 0.689259149583875, + 0.685151121236671, 0.720035146313044, 0.724301175750526, + 0.697475206278284, 0.69336717793108, 0.728567205188007, + 0.732833234625488, 0.705691262972692, 0.701583234625488, + 0.737099264062969, 0.74136529350045, 0.7139073196671, 0.709799291319896, + 0.745631322937932, 0.749897352375413, 0.722123376361509, + 0.718015348014305, 0.754163381812894, 0.758429411250375, + 0.730339433055917, 0.726231404708713, 0.762695440687857, + 0.766961470125338, 0.738555489750325, 0.734447461403121, + 0.771227499562819, 0.7754935290003, 0.746771546444734, 0.74266351809753, + 0.779759558437782, 0.784025587875263, 0.754987603139142, + 0.750879574791938, 0.788291617312744, 0.792557646750225, + 0.76320365983355, 0.759095631486346, 0.796823676187707, + 0.801089705625188, 0.771419716527959, 0.767311688180754, + 0.805355735062669, 0.80962176450015, 0.779635773222367, + 0.775527744875163, 0.813887793937631, 0.818153823375113, + 0.787851829916775, 0.783743801569571, 0.822419852812594, + 0.826685882250075, 0.796067886611183, 0.791959858263979, + 0.830951911687556, 0.835217941125038, 0.804283943305592, + 0.800175914958388, 0.839483970562519, 0.84375, 0.8125, 0.808391971652796, + 0.650899100521407, 0.654849127778334, 0.628655162667201, + 0.624863136500551, 0.658799155035261, 0.662749182292188, + 0.636239215000501, 0.632447188833851, 0.666699209549115, + 0.670649236806042, 0.6438232673338, 0.64003124116715, 0.674599264062969, + 0.678549291319896, 0.6514073196671, 0.64761529350045, 0.682499318576823, + 0.68644934583375, 0.6589913720004, 0.65519934583375, 0.690399373090677, + 0.694349400347605, 0.6665754243337, 0.66278339816705, 0.698299427604532, + 0.702249454861459, 0.674159476667, 0.67036745050035, 0.706199482118386, + 0.710149509375313, 0.6817435290003, 0.67795150283365, 0.71409953663224, + 0.718049563889167, 0.6893275813336, 0.68553555516695, 0.721999591146094, + 0.725949618403021, 0.6969116336669, 0.69311960750025, 0.729899645659948, + 0.733849672916875, 0.7044956860002, 0.70070365983355, 0.737799700173802, + 0.741749727430729, 0.7120797383335, 0.70828771216685, 0.745699754687656, + 0.749649781944583, 0.7196637906668, 0.71587176450015, 0.753599809201511, + 0.757549836458438, 0.7272478430001, 0.72345581683345, 0.761499863715365, + 0.765449890972292, 0.7348318953334, 0.73103986916675, 0.769399918229219, + 0.773349945486146, 0.7424159476667, 0.73862392150005, 0.777299972743073, + 0.78125, 0.75, 0.74620797383335, 0.598827172479694, 0.602461197556067, + 0.576267232444934, 0.572791208458838, 0.60609522263244, + 0.609729247708813, 0.583219280417125, 0.57974325643103, + 0.613363272785186, 0.616997297861559, 0.590171328389317, + 0.586695304403221, 0.620631322937932, 0.624265348014305, + 0.597123376361509, 0.593647352375413, 0.627899373090677, + 0.63153339816705, 0.6040754243337, 0.600599400347605, 0.635167423243423, + 0.638801448319796, 0.611027472305892, 0.607551448319796, + 0.642435473396169, 0.646069498472542, 0.617979520278084, + 0.614503496291988, 0.649703523548915, 0.653337548625288, + 0.624931568250275, 0.621455544264179, 0.656971573701661, + 0.660605598778033, 0.631883616222467, 0.628407592236371, + 0.664239623854406, 0.667873648930779, 0.638835664194658, + 0.635359640208563, 0.671507674007152, 0.675141699083525, + 0.64578771216685, 0.642311688180754, 0.678775724159898, + 0.682409749236271, 0.652739760139042, 0.649263736152946, + 0.686043774312644, 0.689677799389017, 0.659691808111233, + 0.656215784125138, 0.69331182446539, 0.696945849541763, + 0.666643856083425, 0.663167832097329, 0.700579874618136, + 0.704213899694508, 0.673595904055617, 0.670119880069521, + 0.707847924770881, 0.711481949847254, 0.680547952027808, + 0.677071928041713, 0.715115974923627, 0.71875, 0.6875, 0.684023976013904, + 0.546755244437982, 0.550073267333801, 0.523879302222667, + 0.520719280417126, 0.553391290229619, 0.556709313125438, + 0.53019934583375, 0.527039324028209, 0.560027336021257, + 0.563345358917076, 0.536519389444834, 0.533359367639292, + 0.566663381812894, 0.569981404708713, 0.542839433055917, + 0.539679411250375, 0.573299427604532, 0.57661745050035, 0.549159476667, + 0.545999454861459, 0.579935473396169, 0.583253496291988, + 0.555479520278084, 0.552319498472542, 0.586571519187807, + 0.589889542083625, 0.561799563889167, 0.558639542083625, + 0.593207564979444, 0.596525587875263, 0.56811960750025, + 0.564959585694709, 0.599843610771082, 0.6031616336669, 0.574439651111334, + 0.571279629305792, 0.606479656562719, 0.609797679458538, + 0.580759694722417, 0.577599672916875, 0.613115702354356, + 0.616433725250175, 0.5870797383335, 0.583919716527958, 0.619751748145994, + 0.623069771041813, 0.593399781944583, 0.590239760139042, + 0.626387793937631, 0.62970581683345, 0.599719825555667, + 0.596559803750125, 0.633023839729269, 0.636341862625088, + 0.60603986916675, 0.602879847361209, 0.639659885520906, + 0.642977908416725, 0.612359912777833, 0.609199890972292, + 0.646295931312544, 0.649613954208362, 0.618679956388917, + 0.615519934583375, 0.652931977104181, 0.65625, 0.625, 0.621839978194458, + 0.494683316396269, 0.497685337111534, 0.4714913720004, 0.468647352375413, + 0.500687357826798, 0.503689378542063, 0.477179411250375, + 0.474335391625388, 0.506691399257327, 0.509693419972592, + 0.48286745050035, 0.480023430875363, 0.512695440687857, + 0.515697461403121, 0.488555489750325, 0.485711470125338, + 0.518699482118386, 0.52170150283365, 0.4942435290003, 0.491399509375313, + 0.524703523548915, 0.527705544264179, 0.499931568250275, + 0.497087548625288, 0.530707564979444, 0.533709585694709, + 0.50561960750025, 0.502775587875263, 0.536711606409973, + 0.539713627125238, 0.511307646750225, 0.508463627125238, + 0.542715647840502, 0.545717668555767, 0.5169956860002, 0.514151666375213, + 0.548719689271031, 0.551721709986296, 0.522683725250175, + 0.519839705625188, 0.554723730701561, 0.557725751416825, + 0.52837176450015, 0.525527744875163, 0.56072777213209, 0.563729792847354, + 0.534059803750125, 0.531215784125138, 0.566731813562619, + 0.569733834277883, 0.5397478430001, 0.536903823375113, 0.572735854993148, + 0.575737875708413, 0.545435882250075, 0.542591862625088, + 0.578739896423677, 0.581741917138942, 0.55112392150005, + 0.548279901875063, 0.584743937854206, 0.587745958569471, + 0.556811960750025, 0.553967941125038, 0.590747979284735, 0.59375, 0.5625, + 0.559655980375013, 0.442611388354557, 0.445297406889267, + 0.419103441778134, 0.4165754243337, 0.447983425423977, 0.450669443958688, + 0.424159476667, 0.421631459222567, 0.453355462493398, 0.456041481028109, + 0.429215511555867, 0.426687494111434, 0.458727499562819, + 0.46141351809753, 0.434271546444734, 0.4317435290003, 0.46409953663224, + 0.46678555516695, 0.4393275813336, 0.436799563889167, 0.469471573701661, + 0.472157592236371, 0.444383616222467, 0.441855598778034, + 0.474843610771082, 0.477529629305792, 0.449439651111334, 0.4469116336669, + 0.480215647840502, 0.482901666375213, 0.4544956860002, 0.451967668555767, + 0.485587684909923, 0.488273703444633, 0.459551720889067, + 0.457023703444633, 0.490959721979344, 0.493645740514054, + 0.464607755777934, 0.4620797383335, 0.496331759048765, 0.499017777583475, + 0.4696637906668, 0.467135773222367, 0.501703796118186, 0.504389814652896, + 0.474719825555667, 0.472191808111234, 0.507075833187606, + 0.509761851722317, 0.479775860444533, 0.4772478430001, 0.512447870257027, + 0.515133888791738, 0.4848318953334, 0.482303877888967, 0.517819907326448, + 0.520505925861158, 0.489887930222267, 0.487359912777833, + 0.523191944395869, 0.525877962930579, 0.494943965111133, 0.4924159476667, + 0.52856398146529, 0.53125, 0.5, 0.497471982555567, 0.390539460312844, + 0.392909476667, 0.366715511555867, 0.364503496291988, 0.395279493021157, + 0.397649509375313, 0.371139542083625, 0.368927526819746, + 0.400019525729469, 0.402389542083625, 0.375563572611384, + 0.373351557347504, 0.404759558437782, 0.407129574791938, + 0.379987603139142, 0.377775587875263, 0.409499591146094, + 0.41186960750025, 0.3844116336669, 0.382199618403021, 0.414239623854406, + 0.416609640208563, 0.388835664194659, 0.386623648930779, + 0.418979656562719, 0.421349672916875, 0.393259694722417, + 0.391047679458538, 0.423719689271031, 0.426089705625188, + 0.397683725250175, 0.395471709986296, 0.428459721979344, 0.4308297383335, + 0.402107755777933, 0.399895740514054, 0.433199754687656, + 0.435569771041813, 0.406531786305692, 0.404319771041813, + 0.437939787395969, 0.440309803750125, 0.41095581683345, + 0.408743801569571, 0.442679820104281, 0.445049836458438, + 0.415379847361208, 0.413167832097329, 0.447419852812594, + 0.44978986916675, 0.419803877888967, 0.417591862625088, + 0.452159885520906, 0.454529901875063, 0.424227908416725, + 0.422015893152846, 0.456899918229219, 0.459269934583375, + 0.428651938944483, 0.426439923680604, 0.461639950937531, + 0.464009967291688, 0.433075969472242, 0.430863954208363, + 0.466379983645844, 0.46875, 0.4375, 0.435287984736121, 0.338467532271132, + 0.340521546444734, 0.3143275813336, 0.312431568250275, 0.342575560618336, + 0.344629574791938, 0.31811960750025, 0.316223594416925, 0.34668358896554, + 0.348737603139142, 0.3219116336669, 0.320015620583575, 0.350791617312744, + 0.352845631486346, 0.32570365983355, 0.323807646750225, + 0.354899645659948, 0.35695365983355, 0.3294956860002, 0.327599672916875, + 0.359007674007152, 0.361061688180754, 0.33328771216685, + 0.331391699083525, 0.363115702354356, 0.365169716527958, 0.3370797383335, + 0.335183725250175, 0.367223730701561, 0.369277744875163, + 0.34087176450015, 0.338975751416825, 0.371331759048765, + 0.373385773222367, 0.3446637906668, 0.342767777583475, 0.375439787395969, + 0.377493801569571, 0.34845581683345, 0.346559803750125, + 0.379547815743173, 0.381601829916775, 0.3522478430001, 0.350351829916775, + 0.383655844090377, 0.385709858263979, 0.35603986916675, + 0.354143856083425, 0.387763872437581, 0.389817886611183, 0.3598318953334, + 0.357935882250075, 0.391871900784786, 0.393925914958388, + 0.36362392150005, 0.361727908416725, 0.39597992913199, 0.398033943305592, + 0.3674159476667, 0.365519934583375, 0.400087957479194, 0.402141971652796, + 0.37120797383335, 0.369311960750025, 0.404195985826398, 0.40625, 0.375, + 0.373103986916675, 0.286395604229419, 0.288133616222467, + 0.261939651111334, 0.260359640208563, 0.289871628215515, + 0.291609640208563, 0.265099672916875, 0.263519662014104, + 0.293347652201611, 0.295085664194659, 0.268259694722417, + 0.266679683819646, 0.296823676187706, 0.298561688180754, + 0.271419716527958, 0.269839705625188, 0.300299700173802, + 0.30203771216685, 0.2745797383335, 0.272999727430729, 0.303775724159898, + 0.305513736152946, 0.277739760139042, 0.276159749236271, + 0.307251748145994, 0.308989760139042, 0.280899781944583, + 0.279319771041813, 0.31072777213209, 0.312465784125138, + 0.284059803750125, 0.282479792847354, 0.314203796118185, + 0.315941808111233, 0.287219825555667, 0.285639814652896, + 0.317679820104281, 0.319417832097329, 0.290379847361208, + 0.288799836458438, 0.321155844090377, 0.322893856083425, + 0.29353986916675, 0.291959858263979, 0.324631868076473, + 0.326369880069521, 0.296699890972292, 0.295119880069521, + 0.328107892062569, 0.329845904055617, 0.299859912777833, + 0.298279901875063, 0.331583916048665, 0.333321928041713, + 0.303019934583375, 0.301439923680604, 0.33505994003476, + 0.336797952027808, 0.306179956388917, 0.304599945486146, + 0.338535964020856, 0.340273976013904, 0.309339978194458, + 0.307759967291688, 0.342011988006952, 0.34375, 0.3125, 0.310919989097229, + 0.234323676187706, 0.2357456860002, 0.209551720889067, 0.20828771216685, + 0.237167695812694, 0.238589705625188, 0.2120797383335, 0.210815729611283, + 0.240011715437681, 0.241433725250175, 0.214607755777933, + 0.213343747055717, 0.242855735062669, 0.244277744875163, + 0.217135773222367, 0.21587176450015, 0.245699754687656, 0.24712176450015, + 0.2196637906668, 0.218399781944584, 0.248543774312644, 0.249965784125138, + 0.222191808111233, 0.220927799389017, 0.251387793937631, + 0.252809803750125, 0.224719825555667, 0.22345581683345, + 0.254231813562619, 0.255653823375113, 0.2272478430001, 0.225983834277883, + 0.257075833187606, 0.2584978430001, 0.229775860444533, 0.228511851722317, + 0.259919852812594, 0.261341862625088, 0.232303877888967, + 0.23103986916675, 0.262763872437581, 0.264185882250075, 0.2348318953334, + 0.233567886611183, 0.265607892062569, 0.267029901875063, + 0.237359912777833, 0.236095904055617, 0.268451911687556, + 0.26987392150005, 0.239887930222267, 0.23862392150005, 0.271295931312544, + 0.272717941125038, 0.2424159476667, 0.241151938944483, 0.274139950937531, + 0.275561960750025, 0.244943965111133, 0.243679956388917, + 0.276983970562519, 0.278405980375013, 0.247471982555567, + 0.24620797383335, 0.279827990187506, 0.28125, 0.25, 0.248735991277783, + 0.182251748145994, 0.183357755777934, 0.1571637906668, 0.156215784125138, + 0.184463763409873, 0.185569771041813, 0.159059803750125, + 0.158111797208463, 0.186675778673752, 0.187781786305692, + 0.16095581683345, 0.160007810291788, 0.188887793937631, + 0.189993801569571, 0.162851829916775, 0.161903823375113, + 0.191099809201511, 0.19220581683345, 0.1647478430001, 0.163799836458438, + 0.19331182446539, 0.194417832097329, 0.166643856083425, + 0.165695849541763, 0.195523839729269, 0.196629847361208, + 0.16853986916675, 0.167591862625088, 0.197735854993148, + 0.198841862625088, 0.170435882250075, 0.169487875708413, + 0.199947870257027, 0.201053877888967, 0.1723318953334, 0.171383888791738, + 0.202159885520906, 0.203265893152846, 0.174227908416725, + 0.173279901875063, 0.204371900784785, 0.205477908416725, + 0.17612392150005, 0.175175914958388, 0.206583916048665, + 0.207689923680604, 0.178019934583375, 0.177071928041713, + 0.208795931312544, 0.209901938944483, 0.1799159476667, 0.178967941125038, + 0.211007946576423, 0.212113954208363, 0.181811960750025, + 0.180863954208363, 0.213219961840302, 0.214325969472242, + 0.18370797383335, 0.182759967291688, 0.215431977104181, + 0.216537984736121, 0.185603986916675, 0.184655980375013, + 0.21764399236806, 0.21875, 0.1875, 0.186551993458338, 0.130179820104281, + 0.130969825555667, 0.104775860444533, 0.104143856083425, + 0.131759831007052, 0.132549836458438, 0.10603986916675, + 0.105407864805642, 0.133339841909823, 0.134129847361208, + 0.107303877888967, 0.106671873527858, 0.134919852812594, + 0.135709858263979, 0.108567886611183, 0.107935882250075, + 0.136499863715365, 0.13728986916675, 0.1098318953334, 0.109199890972292, + 0.138079874618135, 0.138869880069521, 0.111095904055617, + 0.110463899694508, 0.139659885520906, 0.140449890972292, + 0.112359912777833, 0.111727908416725, 0.141239896423677, + 0.142029901875063, 0.11362392150005, 0.112991917138942, + 0.142819907326448, 0.143609912777833, 0.114887930222267, + 0.114255925861158, 0.144399918229219, 0.145189923680604, + 0.116151938944483, 0.115519934583375, 0.14597992913199, + 0.146769934583375, 0.1174159476667, 0.116783943305592, 0.14755994003476, + 0.148349945486146, 0.118679956388917, 0.118047952027808, + 0.149139950937531, 0.149929956388917, 0.119943965111133, + 0.119311960750025, 0.150719961840302, 0.151509967291688, + 0.12120797383335, 0.120575969472242, 0.152299972743073, + 0.153089978194458, 0.122471982555567, 0.121839978194458, + 0.153879983645844, 0.154669989097229, 0.123735991277783, + 0.123103986916675, 0.155459994548615, 0.15625, 0.125, 0.124367995638892, + 0.0781078920625688, 0.0785818953334001, 0.0523879302222667, + 0.0520719280417126, 0.0790558986042313, 0.0795299018750626, + 0.053019934583375, 0.0527039324028209, 0.0800039051458938, + 0.080477908416725, 0.0536519389444834, 0.0533359367639292, + 0.0809519116875563, 0.0814259149583876, 0.0542839433055917, + 0.0539679411250375, 0.0818999182292188, 0.08237392150005, + 0.0549159476667, 0.0545999454861459, 0.0828479247708813, + 0.0833219280417126, 0.0555479520278084, 0.0552319498472542, + 0.0837959313125438, 0.084269934583375, 0.0561799563889167, + 0.0558639542083625, 0.0847439378542063, 0.0852179411250376, + 0.056811960750025, 0.0564959585694709, 0.0856919443958688, + 0.0861659476667, 0.0574439651111334, 0.0571279629305792, + 0.0866399509375313, 0.0871139542083625, 0.0580759694722417, + 0.0577599672916875, 0.0875879574791938, 0.088061960750025, + 0.05870797383335, 0.0583919716527959, 0.0885359640208563, + 0.0890099672916875, 0.0593399781944584, 0.0590239760139042, + 0.0894839705625188, 0.08995797383335, 0.0599719825555667, + 0.0596559803750125, 0.0904319771041813, 0.0909059803750125, + 0.060603986916675, 0.0602879847361208, 0.0913799836458438, + 0.091853986916675, 0.0612359912777833, 0.0609199890972292, + 0.0923279901875063, 0.0928019934583375, 0.0618679956388917, + 0.0615519934583375, 0.0932759967291688, 0.09375, 0.0625, + 0.0621839978194458, 0.0260359640208563, 0.0261939651111334, + 0.0263519662014104, 0.0265099672916875, 0.0266679683819646, + 0.0268259694722417, 0.0269839705625188, 0.0271419716527959, + 0.0272999727430729, 0.02745797383335, 0.0276159749236271, + 0.0277739760139042, 0.0279319771041813, 0.0280899781944583, + 0.0282479792847354, 0.0284059803750125, 0.0285639814652896, + 0.0287219825555667, 0.0288799836458438, 0.0290379847361208, + 0.0291959858263979, 0.029353986916675, 0.0295119880069521, + 0.0296699890972292, 0.0298279901875063, 0.0299859912777833, + 0.0301439923680604, 0.0303019934583375, 0.0304599945486146, + 0.0306179956388917, 0.0307759967291688, 0.0309339978194458, + 0.0310919989097229, 0.03125, 1.99943358938626, 1.9640088886944, + 1.99773467836602, 1.96273999961102, 1.92774532085603, 1.92915043820579, + 1.99490422922051, 1.95928692264419, 1.99094384514617, 1.95583384567736, + 1.92072384620856, 1.92423458353229, 1.98585576934658, 1.95020400546449, + 1.97964288376187, 1.94457416525162, 1.90950544674137, 1.91511464647497, + 1.97230870743637, 1.936779917499, 1.96385739452541, 1.92898566974637, + 1.89411394496733, 1.90180969585435, 1.95429373194232, 1.91904427323951, + 1.94362313664708, 1.90910287673265, 1.87458261681821, 1.88434828089277, + 1.93185165257814, 1.89703645423958, 1.91898594722899, 1.88497003174652, + 1.85095411626404, 1.86276836654112, 1.90503330787172, 1.87080551990262, + 1.89000163742934, 1.85664100805873, 1.82328037868812, 1.83711724747608, + 1.87389944999952, 1.84041009634658, 1.85673586603215, 1.82417918463444, + 1.79162250323673, 1.80745144096243, 1.83852060716333, 1.80591824359693, + 1.81926399070904, 1.78765730255943, 1.75605061440983, 1.77383655882328, + 1.79897692382121, 1.76740730140882, 1.77767089730985, 1.74715730025821, + 1.71664370320657, 1.7363471588082, 1.75535797913451, 1.72496371406764, + 1.73205080756888, 1.70277012787707, 1.67348944818527, 1.69506657569592, + 1.7077625840423, 1.67868283456494, 1.68250706566236, 1.65459554125281, + 1.62668401684325, 1.65008673251426, 1.65629855742274, 1.62866870859321, + 1.62915190410067, 1.60274187593362, 1.57633184776656, 1.60150793230491, + 1.60108248184872, 1.57503383884894, 1.57210618948558, 1.54732580176426, + 1.52254541404295, 1.54943863090475, 1.54223943949078, 1.5178989301778, + 1.51149914870852, 1.48847205859135, 1.46544496847418, 1.49399519125856, + 1.47990272876577, 1.45739261613939, 1.44746807621014, 1.42631317368744, + 1.40515827116473, 1.43530161981945, 1.4142135623731, 1.3936511676108, + 1.38015802296422, 1.36098916153416, 1.34182030010411, 1.37348928563442, + 1.34532074740251, 1.32609520047672, 1.30972146789057, 1.29120123941928, + 1.27268101094799, 1.30725065552605, 1.27338034823818, 1.25487531755551, + 1.23631797244121, 1.21854939569173, 1.20078081894225, 1.23673091494512, + 1.19855533302269, 1.18087176743534, 1.1601138191424, 1.14319413917895, + 1.1262744592155, 1.16352763907888, 1.12101520448179, 1.10424812099338, + 1.0812816349112, 1.06530210280782, 1.04932257070444, 1.08779851495997, + 1.04093561594614, 1.02517388446767, 1, 0.985045666127526, + 0.970091332255052, 1.00970695147975, 0.958497973440114, + 0.943824115470979, 0.916453043454821, 0.902602564814431, + 0.888752086174041, 0.929421709214546, 0.873889024738719, + 0.860379026429009, 0.830830026003773, 0.818155488043588, + 0.805480950083402, 0.847116518128721, 0.787300436323883, + 0.775023576341299, 0.743324911320655, 0.73189166463901, + 0.720458417957364, 0.762969684020383, 0.698928359198197, + 0.687947051789588, 0.654135926634844, 0.644002438940165, + 0.633868951245487, 0.677163684601426, 0.608972984539815, + 0.599342638142834, 0.56346511368286, 0.554682837345502, + 0.545900561008144, 0.589884756126816, 0.517638090205042, + 0.509406981930215, 0.471517871018855, 0.464131126514929, + 0.456744382011003, 0.501322471509574, 0.425130579105954, + 0.418339745373497, 0.378502488720821, 0.372548364232064, + 0.366594239743308, 0.411669310877156, 0.331660010508749, + 0.326343154087875, 0.28462967654657, 0.280137943943685, 0.2756462113408, + 0.321120225542054, 0.237438125314611, 0.23362153897592, + 0.190112086608366, 0.187105134008156, 0.184098181407946, + 0.229872196374373, 0.142678366398465, 0.140380873352363, + 0.0951638316474854, 0.0936566126965712, 0.0921493937456571, + 0.138123787576801, 0.0475953950922155, 0.0468283063482857, + 2.44929359829471e-16, 2.40677113999098e-16, 2.36424868168725e-16, + 0.0460746968728287, 1.89511218655221, 1.89357404630704, 1.85940277175805, + 1.86107393489863, 1.89000700534068, 1.88643996437431, 1.85215608254006, + 1.85577942714906, 1.88085091946166, 1.87526187454902, 1.84101830235666, + 1.84658719244836, 1.86766230295429, 1.86006273135957, 1.8260115177518, + 1.83351491005423, 1.85046866483655, 1.84087459831353, 1.80716657980884, + 1.81658904878032, 1.82930658678851, 1.8177385752635, 1.78452303426296, + 1.7958448070359, 1.8042216402831, 1.79070470530271, 1.75812903191729, + 1.77132603309013, 1.77526828335201, 1.75983186140132, 1.72804121956591, + 1.7430851257416, 1.74250973722076, 1.72518761304021, 1.6943246116706, + 1.71118291561825, 1.7060178430923, 1.68684807314438, 1.65705244308219, + 1.6756885273764, 1.66587289940353, 1.64489772566269, 1.6163060031401, + 1.63667922311115, 1.6221634799236, 1.59942923418451, 1.57217445152577, + 1.59424022733294, 1.57498623310574, 1.55054323202696, 1.52475461628737, + 1.54846453390657, 1.52444566314749, 1.49834809426802, 1.47415077449309, + 1.49945269539023, 1.47065389325507, 1.44295969224211, 1.42047441601005, + 1.44731259525157, 1.41373041164822, 1.38450113105433, 1.36384399094392, + 1.39215920347699, 1.35380180088101, 1.3231024707077, 1.30438464131129, + 1.3341143161276, 1.28884951163303, 1.25459655255837, 1.23651209416876, + 1.27044836774002, 1.21901343945498, 1.18343032635159, 1.16607983376092, + 1.20129596396484, 1.14659160786021, 1.10975288936884, 1.09323131952217, + 1.12965557664155, 1.07173595848028, 1.03371902759173, 1.01811548447902, + 1.0556734020006, 0.994603946326829, 0.95548886506193, 0.940886397868808, + 0.979500941173913, 0.915358183105324, 0.875227501148719, + 0.861702916123396, 0.901294656996102, 0.834166068847264, + 0.793104636545809, 0.780728323008216, 0.821215619565806, + 0.751199412695254, 0.709294188844699, 0.698129959732033, + 0.739429141370124, 0.666634043700044, 0.623973898555389, + 0.614078845865292, 0.656104402798662, 0.580649412511174, + 0.537324926466959, 0.528749291925774, 0.571414068895533, + 0.493428184863535, 0.449531443260111, 0.442318504509219, + 0.485533898217497, 0.405155827780728, 0.360780212301346, + 0.354966184859383, 0.398642344684301, 0.316020189432605, + 0.271260166563865, 0.26687412178693, 0.310920153323157, + 0.226211073598744, 0.181161980633623, 0.1782257798593, 0.222549950823115, + 0.135919809701841, 0.0906776387700586, 0.0892058837944601, + 0.13371583182688, 0.0453388193850294, 2.3227267518142e-16, + 2.28120482194115e-16, 0.0446029418972302, 1.82785588208008, + 1.82605490141506, 1.79270703107207, 1.79463782926152, 1.82237660987772, + 1.81869831834038, 1.78524055414069, 1.78897379260638, 1.81314909741128, + 1.80759987648219, 1.77418145060772, 1.77971100237421, 1.80019034589875, + 1.7927808153153, 1.7595501128788, 1.76686578174326, 1.78352580901461, + 1.77427080271391, 1.74137502561898, 1.75046256924889, 1.76318933522914, + 1.75210786774436, 1.71969270122577, 1.73053386342237, 1.73922309113071, + 1.72633831451707, 1.69454759711684, 1.7071201491713, 1.71167746590493, + 1.6970166172928, 1.66599201501969, 1.68026980606826, 1.68061095718689, + 1.66420529708097, 1.63408598249135, 1.65003899875552, 1.64609003854521, + 1.62797478000946, 1.59889711693672, 1.61649154971403, 1.6081890088981, + 1.58840323778674, 1.56050047243337, 1.57969879468504, 1.56698982420229, + 1.54557641061784, 1.51897836970992, 1.53973942107164, 1.52258191179654, + 1.49958741297523, 1.4744202096631, 1.49669928968651, 1.47506196781989, + 1.45053652266454, 1.42692227083599, 1.45067124024955, 1.42453373816382, + 1.3985309536631, 1.37658749131615, 1.40175488107607, 1.37110778345446, + 1.34368461324582, 1.32352523554771, 1.35005636343193, 1.31490122859717, + 1.28611784394852, 1.26785104658576, 1.29568814106674, 1.25249062490467, + 1.21886340586082, 1.20121471755289, 1.23453288206932, 1.18400541559494, + 1.14914742532906, 1.1322150168972, 1.16671486722505, 1.11312764256068, + 1.0771078597923, 1.06098440006242, 1.09659970847981, 1.03999789507464, + 1.00288793035697, 0.987660376234932, 1.02432238814868, 0.964761863856007, + 0.926635797355039, 0.912385196841269, 0.9500227865381, 0.88757001103409, + 0.848504224713142, 0.835305533302888, 0.873845365072079, + 0.808577229303179, 0.768650233893215, 0.756572144778215, + 0.795938839040552, 0.727942491040781, 0.687234748188348, + 0.676339536644662, 0.716455840711438, 0.645828488184061, + 0.604422228179775, 0.594765610494258, 0.63555257356946, + 0.562401263680269, 0.520380299180763, 0.512011306435751, + 0.553388458465004, 0.477829835346061, 0.43527937151136, + 0.428240238513501, 0.470125772474626, 0.392285812987788, + 0.349292254464215, 0.343618324069048, 0.385929281291274, + 0.30594300965008, 0.262593764835945, 0.25831340788496, 0.300965865977004, + 0.218977047873405, 0.175360330910865, 0.172494881962429, + 0.215404144923695, 0.131564961852521, 0.0877695927941772, + 0.0863333017938944, 0.129414091878162, 0.0438847963970887, + 2.24068342049877e-16, 2.2001620190564e-16, 0.0431666508969473, + 1.762239975278, 1.76018256493508, 1.72765809879808, 1.72984212129447, + 1.75639573625532, 1.75260890757556, 1.71997726101044, 1.72381767990426, + 1.74709853931335, 1.74158817105114, 1.70899489149456, 1.7144860762525, + 1.73436404633236, 1.72713992161358, 1.69472973034835, 1.70186231092146, + 1.71821570577369, 1.7092914899338, 1.67720795424861, 1.68596884229848, + 1.69868469956145, 1.68807790918911, 1.65646311715245, 1.66683553570053, + 1.67580987244546, 1.66354183570181, 1.63253607428677, 1.64449959571961, + 1.64963764400534, 1.63573345230888, 1.60547488959806, 1.61900548194242, + 1.6202219034953, 1.60471035468172, 1.57533472687208, 1.59040480823507, + 1.58762388776757, 1.57053742085343, 1.54217772477015, 1.55875622582111, + 1.55191204255133, 1.53328666424922, 1.50607285606508, 1.52412529041761, + 1.51316186740101, 1.4930370705528, 1.46709577139569, 1.48658431373038, + 1.47145574466561, 1.44987441877842, 1.42532862789375, 1.44621219964472, + 1.42688275286613, 1.40389108695383, 1.38085990307167, 1.40309426548271, + 1.37953846490407, 1.35518584285431, 1.33378419439247, 1.35732204873207, + 1.32952473155811, 1.3038636202619, 1.2842020049761, 1.30899309968428, + 1.27694945075928, 1.25003528125665, 1.23221951592754, 1.25821076045182, + 1.21701854029164, 1.18400179932663, 1.16678888110037, 1.19950419851395, + 1.14985124597539, 1.11570069262416, 1.09918636835111, 1.13298762472574, + 1.08047987153675, 1.04525905044934, 1.02953370083625, 1.06436003459368, + 1.00903393077645, 0.972808811103557, 0.957957245972182, + 0.993745473404215, 0.935647637055204, 0.898486463006852, + 0.884587729172435, 0.921272487572308, 0.860459599257277, + 0.822432735507702, 0.809559937712516, 0.847073833442475, + 0.783612507796754, 0.744792280085807, 0.733012415393399, + 0.771286176552957, 0.705252811377882, 0.665713342669956, + 0.65508714869525, 0.694049782044325, 0.625530385241639, + 0.585347427813321, 0.575929245132385, 0.615508196913818, + 0.544598191650117, 0.503848955486912, 0.495686604538074, + 0.53580792483523, 0.462611933377794, 0.421374911268676, + 0.414509584023851, 0.455098094280962, 0.379729700994675, + 0.338084490720674, 0.3325506573723, 0.373530120698076, 0.2961116147403, + 0.254138738759926, 0.249964069634891, 0.291257363503596, + 0.211919461799904, 0.169700184839881, 0.166905487717333, + 0.208434778676112, 0.127316329804404, 0.0849324747689271, + 0.0835316477439599, 0.125218567730646, 0.0424662373844637, + 2.1606411460447e-16, 2.121120273033e-16, 0.04176582387198, + 1.69826446614596, 1.69595703686709, 1.6642559749361, 1.66668681099746, + 1.69206438447348, 1.68817173207987, 1.6563662031493, 1.6603110890427, + 1.68269924516787, 1.67722675825587, 1.64545862501717, 1.65091241408324, + 1.67018340425513, 1.6631400502544, 1.63155037016045, 1.63850449758881, + 1.65453835511379, 1.64593665997318, 1.61466536569775, 1.6231078679291, + 1.63579267978546, 1.62564869959774, 1.59483428204302, 1.60474982387039, + 1.61398198422733, 1.60231526885693, 1.57209446342709, 1.58346437273505, + 1.58914881765324, 1.57598236644955, 1.54648984330104, 1.55929215336406, + 1.561342576146, 1.54670278584244, 1.5180708448128, 1.53228034405692, + 1.53061939075937, 1.51453599567631, 1.48689426658247, 1.50248255569763, + 1.49704200036323, 1.47954800505015, 1.45302315403522, 1.46995871030885, + 1.46067960951977, 1.44181121398938, 1.41652665658308, 1.43477490530915, + 1.42160773171296, 1.40140424943653, 1.37747987097932, 1.3970032637812, + 1.37990801828621, 1.35841178713589, 1.33596367120011, 1.35672177108972, + 1.33566807347582, 1.31292435981574, 1.29206452523901, 1.31401409821956, + 1.28898125595916, 1.26503815210259, 1.24587429922908, 1.26896941223404, + 1.23994646736733, 1.21485478263207, 1.19749004933661, 1.22168217428284, + 1.18243325779393, 1.15001173295579, 1.1332345848112, 1.1653623170739, + 1.11655093059633, 1.08309012823688, 1.06699388812265, 1.10011423646693, + 1.04864829478841, 1.01420646133995, 0.998879221843645, 1.03293655498315, + 0.97884406558571, 0.943481669831474, 0.929006093690767, + 0.963942657767206, 0.907261265924422, 0.87104086201737, + 0.857493994862305, 0.893250044276536, 0.834026947774884, + 0.797013033532397, 0.784466129352279, 0.820980062107292, + 0.759271904327991, 0.721530775123584, 0.710049134853769, + 0.747257632103024, 0.683130373706554, 0.644729972289525, + 0.634372795883799, 0.672210965368784, 0.605739734872777, + 0.56674949745603, 0.557569749779674, 0.595971272831736, + 0.527240196420719, 0.487730895385408, 0.479775186232743, + 0.518672468006208, 0.447774478958734, 0.407818062532059, + 0.401126541040268, 0.440450863636505, 0.36748749180139, + 0.327156921070721, 0.321763184769141, 0.361444862904705, + 0.286526004703264, 0.245895088335807, 0.241826107036723, + 0.281794645902932, 0.20503831537824, 0.164181542420672, + 0.161457597124011, 0.201641852080367, 0.12317391355749, + 0.0821662846943083, 0.0808009216446566, 0.121129259384334, + 0.0410831423471542, 2.08259992845197e-16, 2.04407958387095e-16, + 0.0404004608223284, 1.63592935468398, 1.63337831721111, 1.60250065948611, + 1.60517189837051, 1.6293825545322, 1.6253867918533, 1.59440738055729, + 1.5984540200217, 1.61995121497483, 1.61451563809637, 1.58357265117557, + 1.58899001586643, 1.60764841966707, 1.60078120123776, 1.57001203231508, + 1.57679234174532, 1.59249375703492, 1.58420631283208, 1.5537472599664, + 1.56187964614074, 1.57451327590116, 1.56482023897024, 1.53480619589747, + 1.54427672793193, 1.55373942647634, 1.54265861398243, 1.51322276453778, + 1.52401448021762, 1.53021098684863, 1.51776335971482, 1.48903687612861, + 1.5011298203332, 1.50397297513898, 1.49018259056314, 1.46229433631349, + 1.47566560622105, 1.47507654752061, 1.45997050447808, 1.4330467423737, + 1.4476705393436, 1.4435788823338, 1.42718726018951, 1.4013513663438, + 1.41719905435875, 1.40954305055855, 1.39189884092759, 1.3672710252721, + 1.38431119580795, 1.37303787293858, 1.35417690494956, 1.33087393891981, + 1.34907248209596, 1.33413776408014, 1.31409862321072, 1.29223357522132, + 1.31155375707057, 1.29292256387905, 1.27174650454739, 1.25142848385577, + 1.27183102953854, 1.24947735665763, 1.22720820876787, 1.20854211830666, + 1.22998530108121, 1.20389227842133, 1.18057634807479, 1.16366264681297, + 1.18610238255982, 1.14873477741154, 1.1168932067483, 1.1005518286854, + 1.13210723774918, 1.08410446945776, 1.05131573216722, 1.0356375762118, + 1.0680947024486, 1.01763291231568, 0.983950092464131, 0.969020963084617, + 1.00232926964821, 0.949428299502429, 0.914906506540727, + 0.900806919390688, 0.934913941237652, 0.87960275046366, + 0.844298994386592, 0.83110399391088, 0.865955456650784, + 0.808272056586911, 0.772245118787229, 0.760024108222179, + 0.795564051066529, 0.735555418896888, 0.698865719006546, + 0.687682303159323, 0.723853205690751, 0.661575178026799, + 0.624284637047053, 0.614196478210307, 0.650939390684815, + 0.586456537077476, 0.548628437107899, 0.539687124436124, + 0.576941801323215, 0.510327277992075, 0.472026118876251, + 0.464277051519758, 0.501982087977941, 0.43331747208888, 0.39460882530151, + 0.388091109562752, 0.426184080541255, 0.355559185407933, + 0.316509545514356, 0.311255906259571, 0.349673507911161, + 0.277186179538972, 0.237862813563589, 0.233899520090455, + 0.272577713175013, 0.198333608608413, 0.158804403653238, + 0.156151210182464, 0.195025365136459, 0.119137713111779, + 0.0794710225703206, 0.0781411234959846, 0.117146166839224, + 0.0397355112851604, 2.0065597677206e-16, 1.96903995157025e-16, + 0.0390705617479924, 1.57523464089206, 1.57244640596712, 1.54239215244813, + 1.54529738341361, 1.56835024643148, 1.56425408689585, 1.5341007932344, + 1.53824647284126, 1.55885444873425, 1.55345481057265, 1.52333696996973, + 1.52871888160207, 1.54675909256816, 1.54006337456367, 1.51011471681226, + 1.516725843391, 1.53208191153707, 1.52410044851047, 1.49445363705454, + 1.5022841769334, 1.51484648790855, 1.50559252730663, 1.4763788587158, + 1.48541624788517, 1.49508219919248, 1.48457187107832, 1.45592097761886, + 1.46614991816733, 1.47282415159151, 1.4610764321047, 1.43311598808078, + 1.44451848284982, 1.44811310047426, 1.43514976884383, 1.40800520137417, + 1.42056059472748, 1.4209953580513, 1.40684094725876, 1.38063515214383, + 1.394320176759, 1.39152268846304, 1.37620442966731, 1.35105749299082, + 1.36584632256732, 1.35975219051737, 1.34329995136743, 1.31932887746275, + 1.33519318522679, 1.32574616834247, 1.30819238531751, 1.28551083171522, + 1.30241985458898, 1.28957199024791, 1.27095159517831, 1.2496696151353, + 1.26759022342526, 1.25130193611378, 1.23165227704925, 1.21187607024274, + 1.23077284268902, 1.2110130336535, 1.19037379025775, 1.17220546220884, + 1.19204076622579, 1.16878688392128, 1.1471999775848, 1.13073730835664, + 1.15147138528274, 1.11592309914449, 1.08464622070417, 1.06874061272294, + 1.09973896053979, 1.05251186255968, 1.02037750441519, 1.00511743261858, + 1.03692902267076, 0.98743372411854, 0.95448994382189, 0.939958924559163, + 0.972538178588871, 0.920786632526603, 0.887083321231316, + 0.873359723071944, 0.906659323815553, 0.852672090672917, + 0.818260860114519, 0.805417726318159, 0.839388724695051, + 0.783194925693358, 0.748128991272197, 0.736233874322215, + 0.770825800320187, 0.712463051503445, 0.676797111734693, + 0.665911920310063, 0.701072897316139, 0.640587224338617, + 0.604377336942541, 0.594558195674775, 0.630235057992419, + 0.567680791855735, 0.53098424676893, 0.522281369101735, + 0.558419782388255, 0.493859436364184, 0.456734625959439, + 0.44919220039912, 0.485736784750428, 0.419240912768233, + 0.381747199577027, 0.375403289591303, 0.412297744995211, + 0.343944781814304, 0.30614236405158, 0.301028821843589, + 0.338216055717446, 0.268092139247425, 0.230041914443271, + 0.226184308796087, 0.263606565319838, 0.191805341490424, + 0.153568768537578, 0.150986326892692, 0.188585317844389, + 0.115207728467271, 0.0768466883969643, 0.0755522532979439, + 0.113269290095318, 0.0384233441984822, 1.93252066385058e-16, + 1.89600137613091e-16, 0.037776126648972, 1.51618032477018, + 1.51316130313514, 1.48393045382214, 1.48706326612676, 1.50896746017133, + 1.50477361720752, 1.47544644118063, 1.47968844750139, 1.49940894644611, + 1.4940442756847, 1.46475158139968, 1.47009901129015, 1.48751542295841, + 1.48098657023212, 1.45185842365198, 1.45830500252583, 1.47330281862024, + 1.46561906700837, 1.43678449696219, 1.44432146030709, 1.45679231580764, + 1.4479655646069, 1.41955227049801, 1.4281683837301, 1.43801030237574, + 1.42805504014458, 1.40018910267031, 1.40987068658416, 1.41698831188188, + 1.40592158361917, 1.37872717915755, 1.38945814091393, 1.39376295215183, + 1.3816043206845, 1.35520343999483, 1.36696530957619, 1.36837582235142, + 1.35514732401834, 1.32965949589285, 1.34243146794384, 1.34087341875094, + 1.32659951348355, 1.30214153397628, 1.31590051493457, 1.31130702939622, + 1.29601454530889, 1.27270021315503, 1.28742087356565, 1.27973261792464, + 1.26345069054038, 1.24139054936555, 1.25704538126029, 1.24621069678953, + 1.22897070303868, 1.20827179094205, 1.2248311701538, 1.21080619018001, + 1.19264167732134, 1.17340728439994, 1.19083953767099, 1.17358828694679, + 1.15453489657223, 1.13686433093562, 1.15513580766778, 1.13463028386717, + 1.11472567116212, 1.0987140339676, 1.11778918245161, 1.08399822299276, + 1.05327077482339, 1.03780093692384, 1.06825748544572, 1.02177310990209, + 0.990275444980779, 0.975433457342979, 1.00661719713341, + 0.958050730197001, 0.925826015413223, 0.911693106267283, + 0.943563281805131, 0.892919064658231, 0.86001211390324, + 0.846664504734535, 0.879178805500909, 0.826469286552195, + 0.792926459201151, 0.780435192084143, 0.813549848409339, + 0.758795555094226, 0.724664650987301, 0.713095427652386, + 0.746765309868265, 0.689994802147663, 0.655324953308026, + 0.644737986305988, 0.678916706979187, 0.620166512642007, + 0.585008071975989, 0.575457948277202, 0.610097967291595, + 0.549412499207555, 0.513816926439122, 0.505352483776508, + 0.540405216026855, 0.477836671537048, 0.441856416634974, + 0.434520632870828, 0.469936558323668, 0.405544800996793, + 0.369233185358612, 0.363063081125921, 0.398791856998374, + 0.332644281020502, 0.296055376682393, 0.291081931521196, + 0.327072506323558, 0.259243883828623, 0.222432390974853, + 0.21868047315362, 0.254881202337408, 0.185453514024273, + 0.148474637073693, 0.145962947254694, 0.182321710204157, + 0.111383959623966, 0.0742932821742392, 0.0730343110505344, + 0.109498629152614, 0.0371466410871197, 1.86048261684191e-16, + 1.82496385755292e-16, 0.0365171555252673, 1.45876640631836, + 1.45552300871515, 1.42711556360816, 1.43046954650996, 1.45123419575173, + 1.4469453827883, 1.41844432439598, 1.42277994400207, 1.44161470811042, + 1.43628403343254, 1.40781648546539, 1.41313040493069, 1.42991741083782, + 1.42355078824311, 1.39524315283425, 1.40152981914982, 1.41615647828444, + 1.40876216832577, 1.38073983968934, 1.38799149626179, 1.40035075959841, + 1.39193935087106, 1.3643264312441, 1.37253313546672, 1.38252373602614, + 1.37310812118123, 1.34602713969215, 1.35517678546813, 1.36270346771973, + 1.35229881425823, 1.32587044935892, 1.33594879452553, 1.34092253017169, + 1.32954624608515, 1.30388905217547, 1.31487975076719, 1.31721794042098, + 1.30488963475682, 1.28011977362078, 1.29200441289813, 1.29163107319752, + 1.27837251163823, 1.25460348930017, 1.26736163146048, 1.2642075671951, + 1.25004262275198, 1.22738503234893, 1.24099426082455, 1.23499722168507, + 1.21995182061817, 1.1985130918708, 1.21294906210986, 1.20405388370499, + 1.18815594679181, 1.16804010264156, 1.18327659725618, 1.17143532607773, + 1.15471470536365, 1.13602212632736, 1.15203111448446, 1.13720311653748, + 1.1196915277113, 1.10251872448699, 1.11927042540717, 1.10142247825902, + 1.08315342880673, 1.06759282364586, 1.08505577406642, 1.05296014895635, + 1.02276686910597, 1.0077328012881, 1.03766281246698, 0.991888211484981, + 0.96100955386399, 0.946585650385001, 0.977159225836551, 0.92948393055106, + 0.89795830723813, 0.884223508208978, 0.915404579296989, + 0.865825595897315, 0.833692884556499, 0.820721264378462, + 0.85247238629372, 0.800994338101493, 0.768295791646488, + 0.756156391208832, 0.788438827793647, 0.735073944789514, + 0.70185209793254, 0.690608768212694, 0.723382579710763, + 0.668150670829542, 0.634449243726543, 0.624160501147099, + 0.657384634679896, 0.60031304293697, 0.566176842147396, 0.55689573601759, + 0.590528118582344, 0.531651659132936, 0.497126476118475, + 0.488900468460442, 0.522898102239016, 0.462258983510665, + 0.427391490902855, 0.420262348934882, 0.454581408697662, + 0.392229136774559, 0.357066782646263, 0.351070484166606, + 0.385666416550744, 0.321657683026529, 0.286248583406794, + 0.281415235292391, 0.316242859729499, 0.250641413282565, + 0.215034243158337, 0.211388013163053, 0.246401624227722, + 0.179278126209959, 0.143522009261582, 0.14108107126847, + 0.176234542215762, 0.107666406581864, 0.0718108039021453, + 0.0705872967537562, 0.105834184011113, 0.0359054019510727, + 1.7904456266946e-16, 1.75592739583628e-16, 0.0352936483768782, + 1.40299288553659, 1.39953152270716, 1.37194748180617, 1.37551622456322, + 1.39515045317269, 1.39076938363821, 1.36309444288045, 1.36752096234331, + 1.38547173372718, 1.38017408381614, 1.35253168216689, 1.35781306252367, + 1.3739650562064, 1.36775602859665, 1.34026890435905, 1.34640029326297, + 1.36064289052966, 1.35352975246267, 1.326319665236, 1.33329428479753, + 1.34552181928088, 1.33751388609909, 1.31070134095408, 1.31851050309504, + 1.32862250014368, 1.31973111418826, 1.29343508868437, 1.30206821481922, + 1.30996961910508, 1.3002081240219, 1.27454579868488, 1.28399044368463, + 1.28959183453384, 1.27897554504578, 1.25406203791609, 1.26430391830049, + 1.26752171225999, 1.2560678794742, 1.23201598532761, 1.24303901162185, + 1.24379565180277, 1.23152342413134, 1.20844335896251, 1.22022967214506, + 1.21845380391401, 1.20538418369669, 1.18338333504445, 1.19591334700348, + 1.19153997962379, 1.17769577555088, 1.15687845923097, 1.17013089713771, + 1.16310155099429, 1.1485073264377, 1.12897455023384, 1.14292650473241, + 1.13318934380694, 1.11787136117618, 1.09972059602499, 1.11434757312942, + 1.10185752242558, 1.08584368367498, 1.06916864286296, 1.08444461944398, + 1.06916346709681, 1.05248325051863, 1.03737367739141, 1.05327116012719, + 1.02280887703527, 0.993134503551905, 0.978536205815711, 1.00795494160356, + 0.962857167308365, 0.932579831064824, 0.918574011744646, + 0.948555108780179, 0.901733325180718, 0.870886819296612, + 0.857550130384246, 0.888062071064446, 0.839506226243853, + 0.808125633191094, 0.795530002003725, 0.826540066193985, + 0.776247245320811, 0.744368857450529, 0.732581323692226, + 0.764055662847975, 0.712030094779222, 0.679691332107916, + 0.668773896003138, 0.700677609847682, 0.646930657549081, + 0.614169982990246, 0.604179464833394, 0.636476680418266, + 0.581026815223505, 0.547883647456763, 0.538871558895937, + 0.571525511864665, 0.514398271631877, 0.48091289580699, + 0.472925323153538, 0.505898441024737, 0.447126372285036, + 0.413339848763082, 0.406417348591282, 0.43967133587241, + 0.379293920101532, 0.345247991439982, 0.339425498713358, + 0.37292142365232, 0.310984987832383, 0.276721984224783, + 0.272028733157175, 0.305727115935267, 0.242284727609252, + 0.20784747099372, 0.204306928824387, 0.238167830990781, + 0.173279178047483, 0.138710885101246, 0.136340698934022, + 0.170323813879204, 0.104055069340964, 0.0693992535806827, + 0.0682112104076092, 0.102275954670815, 0.0346996267903414, + 1.72240969340863e-16, 1.68889199098099e-16, 0.0341056052038047, + 1.34885976242487, 1.34518684511118, 1.31842620841619, 1.32220330028652, + 1.34071623243421, 1.33624561975724, 1.30939679663404, 1.31391150252511, + 1.33098002329638, 1.32571442683553, 1.29889717150416, 1.3041469840691, + 1.31965835906413, 1.31360229129273, 1.28693567822641, 1.29291642486528, + 1.3067620553559, 1.29992181941908, 1.27352397360215, 1.28022982591428, + 1.29230549485504, 1.284689170291, 1.25867699962793, 1.26610048661504, + 1.27630659472834, 1.26792401916567, 1.24241294964697, 1.25054497463745, + 1.25878676603792, 1.24964951291016, 1.22475322713545, 1.23358308839121, + 1.23977086523828, 1.22989221756639, 1.2057223972167, 1.21523781217607, + 1.21928713786844, 1.20868205817048, 1.18534813101334, 1.19553526411502, + 1.19736715456668, 1.18605225096289, 1.16366114296328, 1.17450463698831, + 1.17404573955296, 1.16203922814303, 1.1406951212416, 1.15217813210244, + 1.14936089174077, 1.13668255533852, 1.11648665144606, 1.12859088634383, + 1.12335369865744, 1.11002484197637, 1.09107513371889, 1.10378089258248, + 1.09606824336765, 1.08211164475892, 1.06450269349285, 1.07778891360587, + 1.06755150461109, 1.05299136446325, 1.03681408606354, 1.05065838977819, + 1.03785325038054, 1.02271513629784, 1.00805659520426, 1.0224353406339, + 0.993544407229515, 0.964373678161194, 0.950211150506677, + 0.979133872855469, 0.934679977372237, 0.90498627658328, + 0.891398541421914, 0.920804845964295, 0.874798914085973, + 0.844611551588667, 0.831672972793088, 0.861535757107501, + 0.813960955697845, 0.783310359807024, 0.771090717610323, + 0.801381845201706, 0.752228008210149, 0.721145656613275, + 0.709709989534324, 0.740400353572323, 0.689664005063351, + 0.658182353513428, 0.647590811023718, 0.678650400279021, + 0.626334762306281, 0.594487171099134, 0.584794877364875, + 0.616192844194296, 0.562307829501612, 0.530128487904091, + 0.521385416912244, 0.553090147138559, 0.497652336704378, + 0.465176185504666, 0.457427047855794, 0.489406232384019, + 0.432438837860161, 0.399701490215655, 0.392985631840029, + 0.425206339847912, 0.366739150977712, 0.333776811739768, + 0.328128124766178, 0.360556878303103, 0.300626195438065, + 0.267475579136361, 0.262922425115548, 0.295525274940863, + 0.234173826808683, 0.200872074481004, 0.197437220137621, + 0.230179822626585, 0.167456669536844, 0.134041264592685, + 0.131741830251348, 0.164589525194484, 0.100549947901268, + 0.0670586312098514, 0.0659060520120935, 0.0988239411317205, + 0.0335293156049258, 1.65637481698402e-16, 1.62385764298705e-16, + 0.0329530260060468, 1.2963670369832, 1.29248897592719, 1.2665517434382, + 1.27053077367988, 1.28793153353629, 1.28337409114539, 1.25735138565675, + 1.26195156454747, 1.27813957681804, 1.27290506249069, 1.24691295347721, + 1.25213216956698, 1.26699731941102, 1.26108957633135, 1.2352434744363, + 1.24107821395675, 1.25451397276317, 1.24793836919498, 1.22235276478781, + 1.22879811961206, 1.24070178632089, 1.2334652034468, 1.20825340726567, + 1.21530308602674, 1.22557601978013, 1.21768683611347, 1.19296072257996, + 1.20060706492281, 1.20915490851825, 1.20062298092303, 1.17649273471061, + 1.18472672864528, 1.19145962228501, 1.18229626364699, 1.15887013007728, + 1.16768143239394, 1.17251421724632, 1.16273217084566, 1.14011621067797, + 1.14949317037763, 1.15234558148927, 1.14195899213288, 1.12025684130249, + 1.13018652599023, 1.13098337411194, 1.12000775609099, 1.09932039094038, + 1.10978861612143, 1.10845995803603, 1.09691215998107, 1.07733766851607, + 1.08832902972823, 1.08481032669443, 1.0727084934078, 1.05434185309671, + 1.06583976080639, 1.06007202475985, 1.04743555611189, 1.03036841873093, + 1.04235513591382, 1.034285063094, 1.02113457007612, 1.0054550540887, + 1.01791173640981, 1.00749182811023, 0.993849086144336, 0.97964157708441, + 0.992548315586556, 0.965166739539086, 0.936484392933837, + 0.922757635360998, 0.951199606222704, 0.907356641676598, + 0.878228890419359, 0.865059239416804, 0.893908437388901, + 0.848680697266828, 0.819132504114296, 0.806592035435505, + 0.835825637426154, 0.789189784259293, 0.759247064404289, + 0.747403411198256, 0.77699772331688, 0.728936626769507, + 0.698626189134725, 0.687542388735127, 0.717472899966691, 0.6679756756419, + 0.637325162149075, 0.627059513274433, 0.65730095100478, + 0.606362985101142, 0.575400808053208, 0.566006738741541, + 0.596533126007987, 0.544156085771293, 0.512911363489377, + 0.504437310066511, 0.535222024404026, 0.48141385435044, + 0.449916345211503, 0.442405642567212, 0.473421476316862, + 0.418196380236039, 0.386476415260575, 0.379967198681122, + 0.411186420624167, 0.354564829403098, 0.322653243545621, + 0.317178362325064, 0.348572780503093, 0.290581305843574, + 0.258509368141528, 0.254096311167509, 0.285637336746286, + 0.226308710880858, 0.194108053620189, 0.190778887102756, + 0.222437599135132, 0.161810600678043, 0.129513147735898, + 0.127284465220448, 0.159031676161602, 0.0971510422627745, + 0.0647889367896513, 0.063671821567209, 0.0954781433938285, + 0.0323944683948257, 1.59234099742076e-16, 1.56082435185447e-16, + 0.0318359107836046, 1.24551470921159, 1.2414379151552, 1.21632408687221, + 1.22049864474329, 1.23679635647893, 1.23215479780266, 1.20695820994858, + 1.21164114841039, 1.22695039429214, 1.22174599078162, 1.19657902808603, + 1.20176861901731, 1.21598193724707, 1.21021788371252, 1.18519229298874, + 1.19088566053739, 1.20389864275146, 1.1975794017904, 1.17280603879298, + 1.17899916589086, 1.19071069367844, 1.18384198556648, 1.15943056386729, + 1.16611830133013, 1.17643077529906, 1.16901956503164, 1.14507840748332, + 1.1522544856753, 1.16107404654606, 1.15312852806049, 1.12976432141037, + 1.13742136444684, 1.14465810567403, 1.13618768328756, 1.11350523649785, + 1.12163477895411, 1.12720295039365, 1.11821821749974, 1.0963202243215, + 1.10491273040968, 1.10873093257052, 1.09924364764131, 1.07823045398013, + 1.08727533915082, 1.08926670759095, 1.07928976754058, 1.05925914414079, + 1.06874479906046, 1.06883717850956, 1.05838458947854, 1.039431510441, + 1.0493453272909, 1.04747143510527, 1.036558280732, 1.01877470836729, + 1.02910310940415, 1.02520068798354, 1.01384309523507, 0.997317771739223, + 1.00804624005326, 1.00205819787433, 0.990273300513586, 0.975091546938469, + 0.986204659338846, 0.978079200285859, 0.965885100058132, + 0.952128623031855, 0.963610084985162, 0.937675873963984, + 0.909466647869836, 0.896175660378674, 0.924152141705264, + 0.880887160221448, 0.85230767257306, 0.839556105729316, + 0.867865883053995, 0.82337867472328, 0.7944496768735, 0.782307318311495, + 0.810931712020406, 0.765192711928195, 0.73593574698289, + 0.724468082767525, 0.75338770053951, 0.706373100998886, + 0.676810455014881, 0.666078521294634, 0.69527330203108, 0.64696510651487, + 0.617119758014859, 0.607180002755285, 0.63662926202496, + 0.587015325933663, 0.556910893852466, 0.547815048963392, + 0.577497525859338, 0.526571584032545, 0.496232274212624, + 0.488027238358738, 0.517921143661065, 0.465682824570063, + 0.435133374927502, 0.427861107287792, 0.457944172823265, + 0.404398999412672, 0.373664623897841, 0.367362049114561, + 0.397611578201176, 0.342770955377691, 0.311877286857541, + 0.306576211390018, 0.336969130252289, 0.280850319048912, + 0.249823351240283, 0.245550391313058, 0.276063301351538, + 0.218689379825779, 0.187555408411274, 0.184331929719792, + 0.214941160516425, 0.15634097147108, 0.125126534530885, + 0.122968603841323, 0.153650266780557, 0.0938583524254839, + 0.0625901703200824, 0.0615085190729558, 0.0922385614571394, + 0.0312950851600413, 1.53030823471885e-16, 1.49979211758324e-16, + 0.030754259536478, 1.19630277911003, 1.19203366279522, 1.16774323871822, + 1.17210691347676, 1.18731070126213, 1.18258773972905, 1.15821726950953, + 1.16298025411388, 1.17741247571869, 1.17223721170833, 1.14789539533064, + 1.15305633242008, 1.16661221257228, 1.16098721343623, 1.13678213388372, + 1.14233876460718, 1.15491606532077, 1.14884491720531, 1.12488379561764, + 1.13083296475068, 1.14233221692767, 1.13581951665004, 1.11220846943279, + 1.11854613252522, 1.12887086128512, 1.12192220592019, 1.09876600435707, + 1.10548723689493, 1.11454418012137, 1.10716615432255, 1.08456798723472, + 1.0916669957959, 1.09936631540533, 1.09156647648812, 1.0696277164784, + 1.07709785185656, 1.08335333731042, 1.07514019813272, 1.05396017194393, + 1.06179394421116, 1.06652320781045, 1.05790621748818, 1.03758198099622, + 1.04577107647008, 1.04889573998999, 1.0398852624918, 1.02051138084282, + 1.02904668091952, 1.03049255316137, 1.02109984383093, 1.00276817722086, + 1.01163977903184, 1.01133702388995, 1.00157420394897, 0.984373699530647, + 0.993570938375752, 0.991454233038726, 0.981334262128481, + 0.965350752517739, 0.974862226024193, 0.970870908952066, + 0.960407555775651, 0.945723564612833, 0.955537158565286, + 0.949615366907439, 0.938823178039226, 0.925517733046597, + 0.935620648829715, 0.911071810504207, 0.883320442969189, + 0.870465225559704, 0.897991479303151, 0.855271533006786, + 0.827222623044384, 0.814889140359451, 0.842677182959578, + 0.798892846455331, 0.770563069866278, 0.75881882142106, + 0.786853980890256, 0.741969738704552, 0.713376407542827, + 0.702284732318129, 0.730551776869594, 0.684537430898284, + 0.655698454253741, 0.645318387212847, 0.673801559765488, + 0.62663229768226, 0.597566141110779, 0.587952279466273, 0.61663533333956, + 0.568291784803844, 0.53901742849691, 0.530219808030428, 0.55908604374835, + 0.50955432428537, 0.480091220073831, 0.472155201788924, + 0.501187504909676, 0.450459247363246, 0.420827274652662, + 0.413793442017533, 0.442974321903228, 0.391046695390058, + 0.361266116127454, 0.355170183140346, 0.384481812578939, + 0.331357528901491, 0.301448941675528, 0.296321671961038, + 0.325745927550692, 0.271433235054078, 0.241417528432627, + 0.237284665552196, 0.266803168756617, 0.211315833643443, + 0.181214138854259, 0.178096347988727, 0.207690506770462, + 0.151047781915954, 0.120881424977648, 0.118794246113973, + 0.14844529705135, 0.0906718783893963, 0.0604623318011448, + 0.0594161445293338, 0.0891051953216532, 0.0302311659005725, + 1.4702765288783e-16, 1.44076094017336e-16, 0.029708072264667, + 1.14873124667852, 1.14427621884723, 1.12080919897623, 1.12535557988027, + 1.1394745678859, 1.13467291692456, 1.1111285643396, 1.11596888165792, + 1.12952582109769, 1.12437872527082, 1.10086205521101, 1.10599530977531, + 1.11888814538665, 1.11339756550248, 1.09001299712124, 1.09543752616613, + 1.1075662404711, 1.10173491543973, 1.07858603526181, 1.08429951619153, + 1.0955663560686, 1.08939779669748, 1.06658712396217, 1.07258657961199, + 1.0828962777383, 1.07639475877913, 1.0540235132012, 1.06030531858168, + 1.06956530924417, 1.0627358597092, 1.04090373218368, 1.04746362269244, + 1.05558425147893, 1.04843264324866, 1.02723757001892, 1.0340706511013, + 1.04096537799663, 1.0334981127446, 1.01303605354527, 1.0201368117821, + 1.02572240720904, 1.01794670167348, 0.99831142235074, 1.005673737948, + 1.00987047130906, 1.00179424094465, 0.983077101046474, 0.990694261698607, + 0.993426081991444, 0.985057923038242, 0.967347668855629, + 0.975212384951051, 0.976407093048475, 0.967756263058707, + 0.951138826586767, 0.959243247721198, 0.958832659925407, + 0.949909056792107, 0.934467361066475, 0.942803093826621, + 0.94072319632721, 0.931537335862314, 0.917351107111795, + 0.925909234089135, 0.922100327974965, 0.912663320087616, + 0.899808907128636, 0.908580007120215, 0.885354549159757, + 0.858045778231897, 0.84562633090409, 0.872717619016363, + 0.830509760032614, 0.80297374183333, 0.791058343307209, + 0.818342337105649, 0.77522321246298, 0.747472683092629, + 0.736126544764198, 0.763592444035704, 0.719520864588364, + 0.691569046084099, 0.680853359850069, 0.708489952307134, + 0.663429616467702, 0.635290186851305, 0.625261986489763, + 0.653057673169916, 0.60697724914407, 0.578664311436835, + 0.569376343407397, 0.59731916494858, 0.550192361711687, + 0.521720411986539, 0.51322101594265, 0.541298679675023, + 0.493104306529768, 0.464488201072997, 0.45682120035707, 0.48502110814986, + 0.43574312272999, 0.406998044386984, 0.400202646756435, + 0.428511923556752, 0.378139468168198, 0.349280891949412, + 0.343391600758478, 0.371797123757456, 0.320324549974497, + 0.291368207999582, 0.286414744038126, 0.314903172398302, + 0.262330053859071, 0.233291899718559, 0.229299133884923, + 0.257856938961524, 0.204188072333852, 0.175084244949145, + 0.172072141909564, 0.200685637897243, 0.145931032012665, + 0.116777819076185, 0.114761392038397, 0.14341676697398, + 0.0875916201545116, 0.0584054212328385, 0.0573946979363431, + 0.0860780449873699, 0.0292027106164193, 1.41224587989909e-16, + 1.38373081962483e-16, 0.0286973489681716, 1.10280011191706, + 1.09816558331124, 1.07552196764625, 1.08024464395384, 1.09328795635022, + 1.08841032938919, 1.06569209443879, 1.07060703104252, 1.08329043042914, + 1.07817053146909, 1.05547900772716, 1.06058555108298, 1.07280973569018, + 1.06744893991127, 1.04488488270131, 1.05018194521424, 1.06184916820246, + 1.05624939649365, 1.03391275772548, 1.03939882021339, 1.05041311110122, + 1.0445768257088, 1.02256652745543, 1.02823964259046, 1.03850702465862, + 1.03243722360845, 1.0108509340157, 1.01670873073557, 1.02613743391445, + 1.01983764422046, 0.998771556257233, 1.00481124513647, 1.01331191389482, + 1.00678618356918, 0.986334797119435, 0.992553176688334, 1.00003907245228, + 0.993291961335383, 0.973547869125499, 0.979941333122467, + 0.986328530766302, 0.97936510019722, 0.9604187780437, 0.9669833235846, + 0.972190901548168, 0.965016702899115, 0.946956304751757, + 0.953687541397728, 0.957637764999795, 0.950258827100475, + 0.933169985345321, 0.940063145048539, 0.942681642580843, + 0.935104458061211, 0.919070089535655, 0.926120037440488, + 0.927335968643582, 0.919567479225952, 0.90466759738543, + 0.911868843460543, 0.911615059999764, 0.903662640773575, + 0.889974174435355, 0.897320885910392, 0.895534083488439, + 0.887405526203304, 0.875002145277972, 0.882488159856663, + 0.860524089930632, 0.83364265365796, 0.82165897641183, 0.848330560844901, + 0.80660184129893, 0.779561028939899, 0.768063714572589, 0.79486134549221, + 0.752369772746227, 0.725178516552555, 0.714230488340911, + 0.74114710145675, 0.697846089579631, 0.670513662606706, + 0.660173965363344, 0.687202226852128, 0.64304965770714, + 0.615585652807574, 0.605909319125385, 0.633041642244365, 0.5879999609003, + 0.560414268993026, 0.551452194578656, 0.578680756852021, + 0.53271705665719, 0.505019844321353, 0.496818672700056, + 0.524135433639356, 0.477221530765738, 0.449423217210123, + 0.442025234063176, 0.469421953381616, 0.421534450670295, + 0.393645684130466, 0.387088721504498, 0.414556977783837, + 0.365677317747092, 0.337708951363717, 0.332026301968956, + 0.359557511736727, 0.30967201859671, 0.281635085829704, + 0.276855427621281, 0.304440864795118, 0.253540775463892, + 0.22544646509808, 0.221593796311238, 0.249224611966259, + 0.197306095897006, 0.169165726695932, 0.1662593114823, 0.193926553896769, + 0.140990721761214, 0.112815716826496, 0.110870041614596, + 0.138564676548448, 0.0846175777208298, 0.0564194386151634, + 0.0554441792939837, 0.0831571104542896, 0.0282097193075818, + 1.35621628778124e-16, 1.32870175593765e-16, 0.0277220896469919, + 1.05850937482565, 1.05370175618725, 1.03188154472826, 1.03677410569746, + 1.0487508666551, 1.04379997712295, 1.0219078598071, 1.02689470226768, + 1.03870630371304, 1.03361263030313, 1.01174625287909, 1.0168270563431, + 1.02837698348287, 1.02314133666261, 1.00139779062391, 1.0065720217515, + 1.01776484851484, 1.01238836036707, 0.990863963008656, 0.996130876816286, + 1.00687248202554, 1.001356603684, 0.980146679912575, 0.985505321460616, + 0.995703102046076, 0.99004960040815, 0.969248266800595, + 0.974697473356585, 0.984260554132229, 0.978471507856308, + 0.958171459455384, 0.96370986312799, 0.972549302652995, + 0.966627097449681, 0.946919397779927, 0.952545428617656, + 0.960574420677374, 0.954521743905066, 0.935495618684633, + 0.94120750823228, 0.948341578482233, 0.942161413059399, + 0.923904048075098, 0.929699833379866, 0.935857030707305, + 0.929552648355211, 0.912148991958666, 0.918026520016882, + 0.923127602186419, 0.916702556017628, 0.900235126689934, 0.9061920593243, + 0.910160672487055, 0.903618788956483, 0.888167488377311, + 0.894201307533623, 0.89696415919325, 0.890309529430018, + 0.875951461474606, 0.882059474925958, 0.883546499969726, + 0.876783470509433, 0.863592766583512, 0.869772114029059, + 0.869916633447861, 0.863049796386288, 0.851097447494605, + 0.857345107039058, 0.836580432816833, 0.810111069247378, + 0.798563162082926, 0.824830304788765, 0.783547776805734, + 0.756984484364091, 0.745905254155592, 0.772234208119259, + 0.730332527305073, 0.703680570246055, 0.693130652151198, + 0.719517953153395, 0.676945413678352, 0.650210257110649, + 0.640246548857955, 0.666688600504576, 0.623397554616599, + 0.596584852122548, 0.587260385119711, 0.613753466988833, + 0.569700432950951, 0.542816013779354, 0.534179832980052, + 0.560720109049882, 0.515865869640353, 0.488915725501352, + 0.481012778302648, 0.50759630564135, 0.46190599699328, 0.434896268485209, + 0.427767302907242, 0.454390040604945, 0.40783323118416, 0.38077019388311, + 0.374451666261723, 0.401109484584482, 0.353660244126739, + 0.326550294370368, 0.32107428677178, 0.347762976516751, 0.29939993476813, + 0.272249575165892, 0.267643722710503, 0.294359004741141, + 0.245065399868541, 0.21788122457119, 0.214168652831141, + 0.240906187770822, 0.190669904332904, 0.163458584094619, + 0.160657856706938, 0.18741325476904, 0.136226851161601, + 0.108995118228582, 0.107120194842569, 0.133889025774753, + 0.0817497510883509, 0.0545043839481196, 0.0535645886022555, + 0.0803423917224122, 0.0272521919740598, 1.30218775252474e-16, + 1.27567374911183e-16, 0.0267822943011278, 1.0158590354043, + 1.01088473747526, 0.989887930222267, 0.994943965111133, 1.00586329880054, + 1.00084186012582, 0.979775860444533, 0.9848318953334, 0.995773440949382, + 0.990705021772947, 0.9696637906668, 0.974719825555667, 0.985589888764719, + 0.980474755756491, 0.959551720889067, 0.964607755777933, + 0.975313281408243, 0.970151807059995, 0.949439651111333, 0.9544956860002, + 0.964944468841541, 0.959737130623088, 0.9393275813336, 0.944383616222467, + 0.954484509900659, 0.949231889178231, 0.929215511555867, + 0.934271546444734, 0.943934669897495, 0.938637450616759, + 0.919103441778134, 0.924159476667, 0.933296417753461, 0.927955384890164, + 0.9089913720004, 0.914047406889267, 0.922571422671907, 0.91718746045365, + 0.898879302222667, 0.903935337111534, 0.911761550356833, + 0.906335640260016, 0.888767232444934, 0.8938232673338, 0.900868858786475, + 0.895402077312933, 0.878655162667201, 0.883711197556067, + 0.889895593551317, 0.884389109789701, 0.868543092889467, + 0.873599127778334, 0.878844182767112, 0.873299255744522, + 0.858431023111734, 0.863487058000601, 0.867717231574413, + 0.862135207404303, 0.848318953334001, 0.853374988222867, + 0.856517516237096, 0.85089982506989, 0.838206883556267, + 0.843262918445134, 0.845247977853229, 0.839596130636569, + 0.828094813778534, 0.833150848667401, 0.81352357781836, + 0.787451025000151, 0.776338887917376, 0.802216850847955, + 0.761347566553028, 0.735244108105905, 0.724582962056217, + 0.750460924986797, 0.709111476139517, 0.682978844173129, + 0.672827036195059, 0.698704999125638, 0.656818836884528, + 0.630658829595928, 0.621071110333901, 0.64694907326448, + 0.604473307196077, 0.578287784796227, 0.569315184472742, + 0.595193147403321, 0.552078665296022, 0.525869545795818, + 0.517559258611584, 0.543437221542163, 0.499638800661177, + 0.473408055526537, 0.465803332750426, 0.491681295681005, + 0.447157705212396, 0.420907354898254, 0.414047406889267, + 0.439925369819846, 0.394639464271585, 0.368371573644916, + 0.362291481028109, 0.388169443958688, 0.34208824730714, + 0.315804920969365, 0.31053555516695, 0.33641351809753, 0.289508298488756, + 0.263211676008147, 0.258779629305792, 0.284657592236371, + 0.236903927073017, 0.210596178137888, 0.207023703444634, + 0.232901666375213, 0.184279497641547, 0.157962817145206, + 0.155267777583475, 0.181145740514054, 0.131639420213825, + 0.105316023282443, 0.103511851722317, 0.129389814652896, + 0.0789881402570749, 0.052660257231707, 0.0517559258611585, + 0.0776338887917377, 0.0263301286158535, 1.25016027412959e-16, + 1.22464679914735e-16, 0.0258779629305793, 0.807114884646544, + 0.781078920625688, 0.785818953334001, 0.812012918445134, + 0.755042956604832, 0.729006992583976, 0.733431023111734, + 0.759624988222867, 0.702971028563119, 0.676935064542263, + 0.681043092889467, 0.707237058000601, 0.650899100521407, + 0.624863136500551, 0.628655162667201, 0.654849127778334, + 0.598827172479694, 0.572791208458838, 0.576267232444934, + 0.602461197556067, 0.546755244437982, 0.520719280417125, + 0.523879302222667, 0.5500732673338, 0.494683316396269, 0.468647352375413, + 0.4714913720004, 0.497685337111534, 0.442611388354557, 0.4165754243337, + 0.419103441778134, 0.445297406889267, 0.390539460312844, + 0.364503496291988, 0.366715511555867, 0.392909476667, 0.338467532271132, + 0.312431568250275, 0.3143275813336, 0.340521546444734, 0.286395604229419, + 0.260359640208563, 0.261939651111334, 0.288133616222467, + 0.234323676187707, 0.20828771216685, 0.209551720889067, 0.2357456860002, + 0.182251748145994, 0.156215784125138, 0.1571637906668, 0.183357755777934, + 0.130179820104282, 0.104143856083425, 0.104775860444534, + 0.130969825555667, 0.0781078920625689, 0.0520719280417127, + 0.0523879302222668, 0.0785818953334002, 0.0260359640208564, + 1.18862777564302e-16, 1.15260875213869e-16, 0.0261939651111335, + 0.816910952243724, 0.790558986042313, 0.795299018750626, + 0.821808986042313, 0.764207019840903, 0.737855053639492, + 0.742279084167251, 0.768789051458938, 0.711503087438082, + 0.685151121236671, 0.689259149583876, 0.715769116875563, + 0.658799155035261, 0.632447188833851, 0.636239215000501, + 0.662749182292188, 0.60609522263244, 0.57974325643103, 0.583219280417126, + 0.609729247708813, 0.553391290229619, 0.527039324028209, + 0.530199345833751, 0.556709313125438, 0.500687357826798, + 0.474335391625388, 0.477179411250375, 0.503689378542063, + 0.447983425423977, 0.421631459222567, 0.424159476667, 0.450669443958688, + 0.395279493021157, 0.368927526819746, 0.371139542083625, + 0.397649509375313, 0.342575560618336, 0.316223594416925, + 0.31811960750025, 0.344629574791938, 0.289871628215515, + 0.263519662014104, 0.265099672916875, 0.291609640208563, + 0.237167695812694, 0.210815729611284, 0.2120797383335, 0.238589705625188, + 0.184463763409873, 0.158111797208463, 0.159059803750125, + 0.185569771041813, 0.131759831007052, 0.105407864805642, + 0.10603986916675, 0.132549836458438, 0.0790558986042314, + 0.052703932402821, 0.0530199345833751, 0.0795299018750626, + 0.0263519662014105, 1.11658972863435e-16, 1.08057070513002e-16, + 0.0265099672916876, 0.826707019840903, 0.800039051458938, + 0.804779084167251, 0.831605053639492, 0.773371083076974, + 0.746703114695009, 0.751127145222767, 0.777953114695009, + 0.720035146313044, 0.69336717793108, 0.697475206278284, + 0.724301175750526, 0.666699209549115, 0.64003124116715, 0.6438232673338, + 0.670649236806042, 0.613363272785186, 0.586695304403221, + 0.590171328389317, 0.616997297861559, 0.560027336021257, + 0.533359367639292, 0.536519389444834, 0.563345358917075, + 0.506691399257328, 0.480023430875363, 0.48286745050035, + 0.509693419972592, 0.453355462493398, 0.426687494111434, + 0.429215511555867, 0.456041481028109, 0.400019525729469, + 0.373351557347504, 0.375563572611384, 0.402389542083625, + 0.34668358896554, 0.320015620583575, 0.3219116336669, 0.348737603139142, + 0.293347652201611, 0.266679683819646, 0.268259694722417, + 0.295085664194659, 0.240011715437682, 0.213343747055717, + 0.214607755777934, 0.241433725250175, 0.186675778673752, + 0.160007810291788, 0.16095581683345, 0.187781786305692, + 0.133339841909823, 0.106671873527858, 0.107303877888967, + 0.134129847361209, 0.0800039051458939, 0.0533359367639293, + 0.0536519389444835, 0.0804779084167252, 0.0266679683819647, + 1.04455168162568e-16, 1.00853265812135e-16, 0.0268259694722418, + 0.836503087438082, 0.809519116875563, 0.814259149583876, + 0.841401121236671, 0.782535146313045, 0.755551175750526, + 0.759975206278284, 0.78711717793108, 0.728567205188007, + 0.701583234625488, 0.705691262972692, 0.732833234625488, + 0.674599264062969, 0.64761529350045, 0.6514073196671, 0.678549291319896, + 0.620631322937932, 0.593647352375413, 0.597123376361509, + 0.624265348014305, 0.566663381812894, 0.539679411250375, + 0.542839433055917, 0.569981404708713, 0.512695440687857, + 0.485711470125338, 0.488555489750325, 0.515697461403121, + 0.458727499562819, 0.4317435290003, 0.434271546444734, 0.46141351809753, + 0.404759558437782, 0.377775587875263, 0.379987603139142, + 0.407129574791938, 0.350791617312744, 0.323807646750225, + 0.32570365983355, 0.352845631486346, 0.296823676187707, + 0.269839705625188, 0.271419716527959, 0.298561688180755, + 0.242855735062669, 0.21587176450015, 0.217135773222367, + 0.244277744875163, 0.188887793937631, 0.161903823375113, + 0.162851829916775, 0.189993801569571, 0.134919852812594, + 0.107935882250075, 0.108567886611183, 0.135709858263979, + 0.0809519116875564, 0.0539679411250376, 0.0542839433055918, + 0.0814259149583876, 0.0269839705625189, 9.72513634617016e-17, + 9.36494611112682e-17, 0.0271419716527959, 0.846299155035261, + 0.818999182292188, 0.823739215000501, 0.851197188833851, + 0.791699209549115, 0.764399236806042, 0.768823267333801, + 0.796281241167151, 0.737099264062969, 0.709799291319896, 0.7139073196671, + 0.741365293500451, 0.682499318576823, 0.65519934583375, 0.6589913720004, + 0.68644934583375, 0.627899373090677, 0.600599400347605, 0.6040754243337, + 0.63153339816705, 0.573299427604532, 0.545999454861459, 0.549159476667, + 0.57661745050035, 0.518699482118386, 0.491399509375313, 0.4942435290003, + 0.52170150283365, 0.46409953663224, 0.436799563889167, 0.4393275813336, + 0.46678555516695, 0.409499591146094, 0.382199618403021, 0.3844116336669, + 0.41186960750025, 0.354899645659948, 0.327599672916875, 0.3294956860002, + 0.35695365983355, 0.300299700173802, 0.272999727430729, 0.2745797383335, + 0.30203771216685, 0.245699754687657, 0.218399781944584, 0.2196637906668, + 0.24712176450015, 0.191099809201511, 0.163799836458438, 0.1647478430001, + 0.19220581683345, 0.136499863715365, 0.109199890972292, 0.1098318953334, + 0.13728986916675, 0.0818999182292189, 0.054599945486146, + 0.0549159476667001, 0.0823739215000501, 0.027299972743073, + 9.00475587608348e-17, 8.64456564104014e-17, 0.0274579738333501, + 0.85609522263244, 0.828479247708813, 0.833219280417125, 0.86099325643103, + 0.800863272785186, 0.773247297861559, 0.777671328389317, + 0.805445304403221, 0.745631322937932, 0.718015348014305, + 0.722123376361509, 0.749897352375413, 0.690399373090677, + 0.66278339816705, 0.6665754243337, 0.694349400347605, 0.635167423243423, + 0.607551448319796, 0.611027472305892, 0.638801448319796, + 0.579935473396169, 0.552319498472542, 0.555479520278084, + 0.583253496291988, 0.524703523548915, 0.497087548625288, + 0.499931568250275, 0.527705544264179, 0.469471573701661, + 0.441855598778034, 0.444383616222467, 0.472157592236371, + 0.414239623854406, 0.386623648930779, 0.388835664194658, + 0.416609640208563, 0.359007674007152, 0.331391699083525, + 0.33328771216685, 0.361061688180754, 0.303775724159898, + 0.276159749236271, 0.277739760139042, 0.305513736152946, + 0.248543774312644, 0.220927799389017, 0.222191808111234, + 0.249965784125138, 0.19331182446539, 0.165695849541763, + 0.166643856083425, 0.194417832097329, 0.138079874618136, + 0.110463899694508, 0.111095904055617, 0.138869880069521, + 0.0828479247708814, 0.0552319498472543, 0.0555479520278084, + 0.0833219280417126, 0.0276159749236272, 8.2843754059968e-17, + 7.92418517095346e-17, 0.0277739760139043, 0.865891290229619, + 0.837959313125438, 0.84269934583375, 0.870789324028209, + 0.810027336021257, 0.782095358917075, 0.786519389444834, + 0.814609367639292, 0.754163381812894, 0.726231404708713, + 0.730339433055917, 0.758429411250375, 0.698299427604532, + 0.67036745050035, 0.674159476667, 0.702249454861459, 0.642435473396169, + 0.614503496291988, 0.617979520278084, 0.646069498472542, + 0.586571519187806, 0.558639542083625, 0.561799563889167, + 0.589889542083625, 0.530707564979444, 0.502775587875263, + 0.50561960750025, 0.533709585694709, 0.474843610771082, 0.4469116336669, + 0.449439651111334, 0.477529629305792, 0.418979656562719, + 0.391047679458538, 0.393259694722417, 0.421349672916875, + 0.363115702354356, 0.335183725250175, 0.3370797383335, 0.365169716527958, + 0.307251748145994, 0.279319771041813, 0.280899781944583, + 0.308989760139042, 0.251387793937631, 0.22345581683345, + 0.224719825555667, 0.252809803750125, 0.195523839729269, + 0.167591862625088, 0.16853986916675, 0.196629847361208, + 0.139659885520906, 0.111727908416725, 0.112359912777833, + 0.140449890972292, 0.0837959313125438, 0.0558639542083626, + 0.0561799563889168, 0.0842699345833751, 0.0279319771041813, + 7.56399493591012e-17, 7.20380470086678e-17, 0.0280899781944584, + 0.875687357826798, 0.847439378542063, 0.852179411250375, + 0.880585391625388, 0.819191399257327, 0.790943419972592, + 0.79536745050035, 0.823773430875363, 0.762695440687857, + 0.734447461403121, 0.738555489750325, 0.766961470125338, + 0.706199482118386, 0.67795150283365, 0.6817435290003, 0.710149509375313, + 0.649703523548915, 0.621455544264179, 0.624931568250275, + 0.653337548625288, 0.593207564979444, 0.564959585694708, + 0.56811960750025, 0.596525587875263, 0.536711606409973, + 0.508463627125238, 0.511307646750225, 0.539713627125238, + 0.480215647840502, 0.451967668555767, 0.4544956860002, 0.482901666375213, + 0.423719689271031, 0.395471709986296, 0.397683725250175, + 0.426089705625188, 0.367223730701561, 0.338975751416825, + 0.34087176450015, 0.369277744875163, 0.31072777213209, 0.282479792847354, + 0.284059803750125, 0.312465784125138, 0.254231813562619, + 0.225983834277883, 0.2272478430001, 0.255653823375113, 0.197735854993148, + 0.169487875708413, 0.170435882250075, 0.198841862625088, + 0.141239896423677, 0.112991917138942, 0.11362392150005, + 0.142029901875063, 0.0847439378542063, 0.0564959585694709, + 0.0568119607500251, 0.0852179411250376, 0.0282479792847355, + 6.84361446582344e-17, 6.4834242307801e-17, 0.0284059803750126, + 0.885483425423977, 0.856919443958688, 0.861659476667, 0.890381459222567, + 0.828355462493398, 0.799791481028109, 0.804215511555867, + 0.832937494111433, 0.771227499562819, 0.742663518097529, + 0.746771546444734, 0.7754935290003, 0.71409953663224, 0.68553555516695, + 0.6893275813336, 0.718049563889167, 0.656971573701661, 0.628407592236371, + 0.631883616222467, 0.660605598778034, 0.599843610771082, + 0.571279629305792, 0.574439651111334, 0.6031616336669, 0.542715647840502, + 0.514151666375213, 0.5169956860002, 0.545717668555767, 0.485587684909923, + 0.457023703444633, 0.459551720889067, 0.488273703444634, + 0.428459721979344, 0.399895740514054, 0.402107755777934, 0.4308297383335, + 0.371331759048765, 0.342767777583475, 0.3446637906668, 0.373385773222367, + 0.314203796118186, 0.285639814652896, 0.287219825555667, + 0.315941808111233, 0.257075833187606, 0.228511851722317, + 0.229775860444533, 0.2584978430001, 0.199947870257027, 0.171383888791738, + 0.1723318953334, 0.201053877888967, 0.142819907326448, 0.114255925861158, + 0.114887930222267, 0.143609912777833, 0.0856919443958688, + 0.0571279629305792, 0.0574439651111334, 0.0861659476667001, + 0.0285639814652896, 6.12323399573676e-17, 5.76304376069343e-17, + 0.0287219825555667, 0.895279493021157, 0.866399509375313, + 0.871139542083625, 0.900177526819746, 0.837519525729469, + 0.808639542083625, 0.813063572611384, 0.842101557347504, + 0.779759558437781, 0.750879574791938, 0.754987603139142, + 0.784025587875263, 0.721999591146094, 0.69311960750025, 0.6969116336669, + 0.725949618403021, 0.664239623854407, 0.635359640208563, + 0.638835664194659, 0.667873648930779, 0.606479656562719, + 0.577599672916875, 0.580759694722417, 0.609797679458538, + 0.548719689271032, 0.519839705625188, 0.522683725250175, + 0.551721709986296, 0.490959721979344, 0.4620797383335, 0.464607755777934, + 0.493645740514054, 0.433199754687656, 0.404319771041813, + 0.406531786305692, 0.435569771041813, 0.375439787395969, + 0.346559803750125, 0.34845581683345, 0.377493801569571, + 0.317679820104281, 0.288799836458438, 0.290379847361208, + 0.319417832097329, 0.259919852812594, 0.23103986916675, + 0.232303877888967, 0.261341862625088, 0.202159885520906, + 0.173279901875063, 0.174227908416725, 0.203265893152846, + 0.144399918229219, 0.115519934583375, 0.116151938944483, + 0.145189923680604, 0.0866399509375313, 0.0577599672916876, + 0.0580759694722417, 0.0871139542083626, 0.0288799836458438, + 5.40285352565009e-17, 5.04266329060675e-17, 0.0290379847361209, + 0.905075560618336, 0.875879574791938, 0.88061960750025, + 0.909973594416925, 0.84668358896554, 0.817487603139142, 0.8219116336669, + 0.851265620583575, 0.788291617312744, 0.759095631486346, + 0.76320365983355, 0.792557646750225, 0.729899645659948, 0.70070365983355, + 0.7044956860002, 0.733849672916875, 0.671507674007152, 0.642311688180754, + 0.64578771216685, 0.675141699083525, 0.613115702354356, + 0.583919716527958, 0.5870797383335, 0.616433725250175, 0.554723730701561, + 0.525527744875163, 0.52837176450015, 0.557725751416825, + 0.496331759048765, 0.467135773222367, 0.4696637906668, 0.499017777583475, + 0.437939787395969, 0.408743801569571, 0.41095581683345, + 0.440309803750125, 0.379547815743173, 0.350351829916775, 0.3522478430001, + 0.381601829916775, 0.321155844090377, 0.291959858263979, + 0.29353986916675, 0.322893856083425, 0.262763872437581, + 0.233567886611183, 0.2348318953334, 0.264185882250075, 0.204371900784786, + 0.175175914958388, 0.17612392150005, 0.205477908416725, 0.14597992913199, + 0.116783943305592, 0.1174159476667, 0.146769934583375, + 0.0875879574791938, 0.0583919716527959, 0.0587079738333501, + 0.0880619607500251, 0.029195985826398, 4.68247305556341e-17, + 4.32228282052007e-17, 0.0293539869166751, 0.914871628215515, + 0.885359640208563, 0.890099672916875, 0.919769662014104, + 0.855847652201611, 0.826335664194658, 0.830759694722417, + 0.860429683819646, 0.796823676187706, 0.767311688180754, + 0.771419716527958, 0.801089705625188, 0.737799700173802, + 0.70828771216685, 0.7120797383335, 0.741749727430729, 0.678775724159898, + 0.649263736152946, 0.652739760139042, 0.682409749236271, + 0.619751748145994, 0.590239760139042, 0.593399781944584, + 0.623069771041813, 0.56072777213209, 0.531215784125138, + 0.534059803750125, 0.563729792847355, 0.501703796118186, + 0.472191808111233, 0.474719825555667, 0.504389814652896, + 0.442679820104281, 0.413167832097329, 0.415379847361208, + 0.445049836458438, 0.383655844090377, 0.354143856083425, + 0.35603986916675, 0.385709858263979, 0.324631868076473, + 0.295119880069521, 0.296699890972292, 0.326369880069521, + 0.265607892062569, 0.236095904055617, 0.237359912777833, + 0.267029901875063, 0.206583916048665, 0.177071928041713, + 0.178019934583375, 0.207689923680604, 0.14755994003476, + 0.118047952027808, 0.118679956388917, 0.148349945486146, + 0.0885359640208563, 0.0590239760139042, 0.0593399781944584, + 0.0890099672916875, 0.0295119880069521, 3.96209258547673e-17, + 3.60190235043339e-17, 0.0296699890972292, 0.924667695812694, + 0.894839705625188, 0.8995797383335, 0.929565729611283, 0.865011715437681, + 0.835183725250175, 0.839607755777934, 0.869593747055717, + 0.805355735062669, 0.775527744875163, 0.779635773222367, + 0.80962176450015, 0.745699754687656, 0.71587176450015, 0.7196637906668, + 0.749649781944584, 0.686043774312644, 0.656215784125138, + 0.659691808111234, 0.689677799389017, 0.626387793937632, + 0.596559803750125, 0.599719825555667, 0.62970581683345, + 0.566731813562619, 0.536903823375113, 0.5397478430001, 0.569733834277883, + 0.507075833187606, 0.4772478430001, 0.479775860444534, 0.509761851722317, + 0.447419852812594, 0.417591862625088, 0.419803877888967, + 0.44978986916675, 0.387763872437581, 0.357935882250075, 0.3598318953334, + 0.389817886611183, 0.328107892062569, 0.298279901875063, + 0.299859912777833, 0.329845904055617, 0.268451911687556, + 0.23862392150005, 0.239887930222267, 0.26987392150005, 0.208795931312544, + 0.178967941125038, 0.1799159476667, 0.209901938944483, 0.149139950937531, + 0.119311960750025, 0.119943965111133, 0.149929956388917, + 0.0894839705625188, 0.0596559803750125, 0.0599719825555667, + 0.08995797383335, 0.0298279901875063, 3.24171211539005e-17, + 2.88152188034671e-17, 0.0299859912777834, 0.934463763409873, + 0.904319771041813, 0.909059803750125, 0.939361797208463, + 0.874175778673752, 0.844031786305692, 0.84845581683345, + 0.878757810291788, 0.813887793937631, 0.783743801569571, + 0.787851829916775, 0.818153823375113, 0.753599809201511, + 0.72345581683345, 0.7272478430001, 0.757549836458438, 0.69331182446539, + 0.663167832097329, 0.666643856083425, 0.696945849541763, + 0.633023839729269, 0.602879847361208, 0.60603986916675, + 0.636341862625088, 0.572735854993148, 0.542591862625088, + 0.545435882250075, 0.575737875708413, 0.512447870257027, + 0.482303877888967, 0.4848318953334, 0.515133888791738, 0.452159885520906, + 0.422015893152846, 0.424227908416725, 0.454529901875063, + 0.391871900784786, 0.361727908416725, 0.36362392150005, + 0.393925914958388, 0.331583916048665, 0.301439923680604, + 0.303019934583375, 0.333321928041713, 0.271295931312544, + 0.241151938944483, 0.2424159476667, 0.272717941125038, 0.211007946576423, + 0.180863954208363, 0.181811960750025, 0.212113954208363, + 0.150719961840302, 0.120575969472242, 0.12120797383335, + 0.151509967291688, 0.0904319771041813, 0.0602879847361208, + 0.060603986916675, 0.0909059803750125, 0.0301439923680604, + 2.52133164530337e-17, 2.16114141026003e-17, 0.0303019934583375, + 0.944259831007052, 0.913799836458438, 0.91853986916675, + 0.949157864805642, 0.883339841909823, 0.852879847361208, + 0.857303877888967, 0.887921873527858, 0.822419852812594, + 0.791959858263979, 0.796067886611183, 0.826685882250075, + 0.761499863715365, 0.73103986916675, 0.7348318953334, 0.765449890972292, + 0.700579874618136, 0.670119880069521, 0.673595904055617, + 0.704213899694508, 0.639659885520906, 0.609199890972292, + 0.612359912777833, 0.642977908416725, 0.578739896423677, + 0.548279901875063, 0.55112392150005, 0.581741917138942, + 0.517819907326448, 0.487359912777833, 0.489887930222267, + 0.520505925861158, 0.456899918229219, 0.426439923680604, + 0.428651938944483, 0.459269934583375, 0.39597992913199, + 0.365519934583375, 0.3674159476667, 0.398033943305592, 0.33505994003476, + 0.304599945486146, 0.306179956388917, 0.336797952027808, + 0.274139950937531, 0.243679956388917, 0.244943965111133, + 0.275561960750025, 0.213219961840302, 0.182759967291688, + 0.18370797383335, 0.214325969472242, 0.152299972743073, + 0.121839978194458, 0.122471982555567, 0.153089978194458, + 0.0913799836458438, 0.0609199890972292, 0.0612359912777833, + 0.091853986916675, 0.0304599945486146, 1.8009511752167e-17, + 1.44076094017336e-17, 0.0306179956388917, 0.954055898604231, + 0.923279901875063, 0.928019934583375, 0.958953932402821, + 0.892503905145894, 0.861727908416725, 0.866151938944484, + 0.897085936763929, 0.830951911687556, 0.800175914958388, + 0.804283943305592, 0.835217941125038, 0.769399918229219, + 0.73862392150005, 0.7424159476667, 0.773349945486146, 0.707847924770881, + 0.677071928041713, 0.680547952027808, 0.711481949847254, + 0.646295931312544, 0.615519934583375, 0.618679956388917, + 0.649613954208363, 0.584743937854206, 0.553967941125038, + 0.556811960750025, 0.587745958569471, 0.523191944395869, 0.4924159476667, + 0.494943965111133, 0.525877962930579, 0.461639950937531, + 0.430863954208363, 0.433075969472242, 0.464009967291688, + 0.400087957479194, 0.369311960750025, 0.37120797383335, + 0.402141971652796, 0.338535964020856, 0.307759967291688, + 0.309339978194458, 0.340273976013904, 0.276983970562519, + 0.24620797383335, 0.247471982555567, 0.278405980375013, + 0.215431977104181, 0.184655980375013, 0.185603986916675, + 0.216537984736121, 0.153879983645844, 0.123103986916675, + 0.123735991277783, 0.154669989097229, 0.0923279901875063, + 0.0615519934583375, 0.0618679956388917, 0.0928019934583375, + 0.0307759967291688, 1.08057070513002e-17, 7.20380470086678e-18, + 0.0309339978194458, 0.96385196620141, 0.932759967291688, + 0.901667968381965, 0.870575969472242, 0.839483970562519, + 0.808391971652796, 0.777299972743073, 0.74620797383335, + 0.715115974923627, 0.684023976013904, 0.652931977104181, + 0.621839978194458, 0.590747979284735, 0.559655980375013, + 0.52856398146529, 0.497471982555567, 0.466379983645844, + 0.435287984736121, 0.404195985826398, 0.373103986916675, + 0.342011988006952, 0.310919989097229, 0.279827990187506, + 0.248735991277783, 0.21764399236806, 0.186551993458338, + 0.155459994548615, 0.124367995638892, 0.0932759967291688, + 0.0621839978194458, 0.0310919989097229, 3.60190235043339e-18, + -0.0475953950922146, -0.0468283063482848, -0.095163831647484, + -0.0936566126965699, -0.0921493937456558, -0.0460746968728278, + -0.142678366398464, -0.140380873352363, -0.190112086608365, + -0.187105134008155, -0.184098181407945, -0.1381237875768, + -0.23743812531461, -0.23362153897592, -0.28462967654657, + -0.280137943943685, -0.275646211340799, -0.229872196374372, + -0.331660010508748, -0.326343154087874, -0.37850248872082, + -0.372548364232063, -0.366594239743307, -0.321120225542053, + -0.425130579105953, -0.418339745373496, -0.471517871018854, + -0.464131126514928, -0.456744382011003, -0.411669310877155, + -0.517638090205041, -0.509406981930215, -0.563465113682859, + -0.554682837345501, -0.545900561008143, -0.501322471509573, + -0.608972984539814, -0.599342638142833, -0.654135926634843, + -0.644002438940165, -0.633868951245487, -0.589884756126815, + -0.698928359198197, -0.687947051789587, -0.743324911320655, + -0.731891664639009, -0.720458417957364, -0.677163684601425, + -0.787300436323882, -0.775023576341298, -0.830830026003772, + -0.818155488043587, -0.805480950083401, -0.762969684020382, + -0.873889024738719, -0.860379026429009, -0.916453043454821, + -0.90260256481443, -0.88875208617404, -0.847116518128721, + -0.958497973440113, -0.943824115470978, -1, -0.985045666127525, + -0.970091332255051, -0.929421709214546, -1.04093561594614, + -1.02517388446767, -1.08128163491119, -1.06530210280782, + -1.04932257070444, -1.00970695147974, -1.12101520448179, + -1.10424812099338, -1.1601138191424, -1.14319413917895, -1.1262744592155, + -1.08779851495997, -1.19855533302269, -1.18087176743534, + -1.23631797244121, -1.21854939569173, -1.20078081894225, + -1.16352763907887, -1.27338034823818, -1.2548753175555, + -1.30972146789057, -1.29120123941928, -1.27268101094799, + -1.23673091494512, -1.3453207474025, -1.32609520047672, + -1.38015802296422, -1.36098916153416, -1.34182030010411, + -1.30725065552605, -1.41421356237309, -1.3936511676108, + -1.44746807621014, -1.42631317368744, -1.40515827116473, + -1.37348928563442, -1.47990272876577, -1.45739261613939, + -1.51149914870852, -1.48847205859135, -1.46544496847418, + -1.43530161981945, -1.54223943949077, -1.5178989301778, + -1.57210618948557, -1.54732580176426, -1.52254541404295, + -1.49399519125856, -1.60108248184872, -1.57503383884894, + -1.62915190410067, -1.60274187593362, -1.57633184776656, + -1.54943863090475, -1.65629855742274, -1.62866870859321, + -1.68250706566236, -1.65459554125281, -1.62668401684325, + -1.60150793230491, -1.7077625840423, -1.67868283456494, + -1.73205080756888, -1.70277012787707, -1.67348944818527, + -1.65008673251426, -1.75535797913451, -1.72496371406764, + -1.77767089730985, -1.74715730025821, -1.71664370320657, + -1.69506657569592, -1.79897692382121, -1.76740730140882, + -1.81926399070904, -1.78765730255943, -1.75605061440983, + -1.7363471588082, -1.83852060716333, -1.80591824359693, + -1.85673586603214, -1.82417918463444, -1.79162250323673, + -1.77383655882328, -1.87389944999952, -1.84041009634658, + -1.89000163742934, -1.85664100805873, -1.82328037868812, + -1.80745144096243, -1.90503330787172, -1.87080551990262, + -1.91898594722899, -1.88497003174652, -1.85095411626404, + -1.83711724747608, -1.93185165257814, -1.89703645423958, + -1.94362313664708, -1.90910287673265, -1.87458261681821, + -1.86276836654112, -1.95429373194232, -1.91904427323951, + -1.96385739452541, -1.92898566974637, -1.89411394496733, + -1.88434828089277, -1.97230870743637, -1.936779917499, -1.97964288376187, + -1.94457416525162, -1.90950544674137, -1.90180969585435, + -1.98585576934658, -1.95020400546449, -1.99094384514617, + -1.95583384567736, -1.92072384620856, -1.91511464647497, + -1.99490422922051, -1.95928692264419, -1.99773467836602, + -1.96273999961102, -1.92774532085603, -1.92423458353229, + -1.99943358938626, -1.9640088886944, -1.92915043820579, + -0.0453388193850286, -0.0906776387700574, -0.0892058837944589, + -0.0446029418972293, -0.13591980970184, -0.181161980633622, + -0.1782257798593, -0.133715831826879, -0.226211073598743, + -0.271260166563864, -0.266874121786929, -0.222549950823115, + -0.316020189432604, -0.360780212301344, -0.354966184859382, + -0.310920153323156, -0.405155827780727, -0.44953144326011, + -0.442318504509218, -0.3986423446843, -0.493428184863534, + -0.537324926466958, -0.528749291925773, -0.485533898217496, + -0.580649412511174, -0.623973898555389, -0.614078845865291, + -0.571414068895532, -0.666634043700044, -0.709294188844698, + -0.698129959732033, -0.656104402798662, -0.751199412695253, + -0.793104636545808, -0.780728323008215, -0.739429141370124, + -0.834166068847263, -0.875227501148718, -0.861702916123396, + -0.821215619565805, -0.915358183105324, -0.955488865061929, + -0.940886397868807, -0.901294656996102, -0.994603946326828, + -1.03371902759173, -1.01811548447902, -0.979500941173912, + -1.07173595848028, -1.10975288936884, -1.09323131952217, + -1.0556734020006, -1.14659160786021, -1.18343032635158, + -1.16607983376092, -1.12965557664155, -1.21901343945498, + -1.25459655255837, -1.23651209416876, -1.20129596396484, + -1.28884951163303, -1.3231024707077, -1.30438464131129, + -1.27044836774002, -1.35380180088101, -1.38450113105433, + -1.36384399094392, -1.3341143161276, -1.41373041164822, + -1.44295969224211, -1.42047441601005, -1.39215920347699, + -1.47065389325507, -1.49834809426802, -1.47415077449309, + -1.44731259525157, -1.52444566314749, -1.55054323202696, + -1.52475461628737, -1.49945269539023, -1.57498623310574, + -1.59942923418451, -1.57217445152577, -1.54846453390657, + -1.6221634799236, -1.64489772566268, -1.6163060031401, -1.59424022733294, + -1.66587289940353, -1.68684807314438, -1.65705244308219, + -1.63667922311115, -1.7060178430923, -1.72518761304021, -1.6943246116706, + -1.6756885273764, -1.74250973722076, -1.75983186140132, + -1.72804121956591, -1.71118291561825, -1.77526828335201, + -1.79070470530271, -1.75812903191729, -1.7430851257416, -1.8042216402831, + -1.8177385752635, -1.78452303426296, -1.77132603309013, + -1.82930658678851, -1.84087459831353, -1.80716657980884, + -1.7958448070359, -1.85046866483655, -1.86006273135957, -1.8260115177518, + -1.81658904878032, -1.86766230295429, -1.87526187454902, + -1.84101830235666, -1.83351491005423, -1.88085091946166, + -1.88643996437431, -1.85215608254006, -1.84658719244836, + -1.89000700534068, -1.89357404630704, -1.85940277175805, + -1.85577942714906, -1.89511218655221, -1.86107393489863, + -0.0438847963970879, -0.0877695927941761, -0.0863333017938932, + -0.0431666508969465, -0.13156496185252, -0.175360330910864, + -0.172494881962429, -0.129414091878161, -0.218977047873405, + -0.262593764835945, -0.25831340788496, -0.215404144923694, + -0.30594300965008, -0.349292254464214, -0.343618324069046, + -0.300965865977003, -0.392285812987787, -0.43527937151136, + -0.428240238513501, -0.385929281291274, -0.477829835346061, + -0.520380299180762, -0.51201130643575, -0.470125772474625, + -0.562401263680268, -0.604422228179774, -0.594765610494257, + -0.553388458465004, -0.645828488184061, -0.687234748188347, + -0.676339536644662, -0.635552573569459, -0.727942491040781, + -0.768650233893214, -0.756572144778214, -0.716455840711438, + -0.808577229303178, -0.848504224713142, -0.835305533302888, + -0.795938839040551, -0.88757001103409, -0.926635797355038, + -0.912385196841268, -0.873845365072078, -0.964761863856006, + -1.00288793035697, -0.987660376234931, -0.9500227865381, + -1.03999789507464, -1.0771078597923, -1.06098440006242, + -1.02432238814868, -1.11312764256068, -1.14914742532906, + -1.1322150168972, -1.09659970847981, -1.18400541559494, + -1.21886340586082, -1.20121471755289, -1.16671486722504, + -1.25249062490467, -1.28611784394852, -1.26785104658576, + -1.23453288206932, -1.31490122859717, -1.34368461324582, + -1.32352523554771, -1.29568814106674, -1.37110778345446, + -1.3985309536631, -1.37658749131615, -1.35005636343193, + -1.42453373816382, -1.45053652266454, -1.42692227083599, + -1.40175488107607, -1.47506196781989, -1.49958741297523, + -1.4744202096631, -1.45067124024955, -1.52258191179654, + -1.54557641061784, -1.51897836970991, -1.49669928968651, + -1.56698982420229, -1.58840323778673, -1.56050047243337, + -1.53973942107164, -1.6081890088981, -1.62797478000946, + -1.59889711693672, -1.57969879468504, -1.64609003854521, + -1.66420529708097, -1.63408598249135, -1.61649154971403, + -1.68061095718688, -1.6970166172928, -1.66599201501969, + -1.65003899875552, -1.71167746590493, -1.72633831451707, + -1.69454759711684, -1.68026980606826, -1.73922309113071, + -1.75210786774436, -1.71969270122577, -1.7071201491713, + -1.76318933522914, -1.77427080271391, -1.74137502561898, + -1.73053386342237, -1.78352580901461, -1.7927808153153, -1.7595501128788, + -1.75046256924889, -1.80019034589875, -1.80759987648219, + -1.77418145060772, -1.76686578174326, -1.81314909741128, + -1.81869831834038, -1.78524055414069, -1.77971100237421, + -1.82237660987772, -1.82605490141506, -1.79270703107207, + -1.78897379260638, -1.82785588208008, -1.79463782926152, + -0.0424662373844629, -0.084932474768926, -0.0835316477439588, + -0.0417658238719793, -0.127316329804403, -0.169700184839881, + -0.166905487717333, -0.125218567730646, -0.211919461799903, + -0.254138738759925, -0.249964069634891, -0.208434778676112, + -0.296111614740299, -0.338084490720673, -0.332550657372299, + -0.291257363503595, -0.379729700994674, -0.421374911268676, + -0.414509584023851, -0.373530120698075, -0.462611933377794, + -0.503848955486911, -0.495686604538073, -0.455098094280962, + -0.544598191650116, -0.585347427813321, -0.575929245132385, + -0.535807924835229, -0.625530385241639, -0.665713342669956, + -0.65508714869525, -0.615508196913818, -0.705252811377881, + -0.744792280085806, -0.733012415393398, -0.694049782044324, + -0.783612507796754, -0.822432735507701, -0.809559937712515, + -0.771286176552957, -0.860459599257276, -0.898486463006851, + -0.884587729172434, -0.847073833442475, -0.935647637055204, + -0.972808811103556, -0.957957245972181, -0.921272487572308, + -1.00903393077645, -1.04525905044934, -1.02953370083625, + -0.993745473404214, -1.08047987153675, -1.11570069262416, + -1.09918636835111, -1.06436003459368, -1.14985124597539, + -1.18400179932663, -1.16678888110037, -1.13298762472574, + -1.21701854029164, -1.25003528125665, -1.23221951592754, + -1.19950419851395, -1.27694945075928, -1.3038636202619, -1.2842020049761, + -1.25821076045182, -1.32952473155811, -1.35518584285431, + -1.33378419439247, -1.30899309968428, -1.37953846490407, + -1.40389108695383, -1.38085990307167, -1.35732204873207, + -1.42688275286613, -1.44987441877842, -1.42532862789375, + -1.40309426548271, -1.47145574466561, -1.4930370705528, + -1.46709577139568, -1.44621219964472, -1.51316186740101, + -1.53328666424922, -1.50607285606508, -1.48658431373038, + -1.55191204255133, -1.57053742085343, -1.54217772477014, + -1.52412529041761, -1.58762388776757, -1.60471035468172, + -1.57533472687208, -1.55875622582111, -1.6202219034953, + -1.63573345230887, -1.60547488959806, -1.59040480823507, + -1.64963764400534, -1.66354183570181, -1.63253607428677, + -1.61900548194242, -1.67580987244546, -1.68807790918911, + -1.65646311715245, -1.64449959571961, -1.69868469956145, + -1.7092914899338, -1.67720795424861, -1.66683553570053, + -1.71821570577369, -1.72713992161358, -1.69472973034835, + -1.68596884229848, -1.73436404633236, -1.74158817105114, + -1.70899489149456, -1.70186231092146, -1.74709853931335, + -1.75260890757556, -1.71997726101044, -1.7144860762525, + -1.75639573625532, -1.76018256493508, -1.72765809879808, + -1.72381767990426, -1.762239975278, -1.72984212129447, + -0.0410831423471535, -0.0821662846943072, -0.0808009216446556, + -0.0404004608223277, -0.12317391355749, -0.164181542420672, + -0.161457597124011, -0.121129259384333, -0.205038315378239, + -0.245895088335807, -0.241826107036722, -0.201641852080367, + -0.286526004703263, -0.32715692107072, -0.32176318476914, + -0.281794645902931, -0.367487491801389, -0.407818062532059, + -0.401126541040267, -0.361444862904704, -0.447774478958733, + -0.487730895385407, -0.479775186232742, -0.440450863636505, + -0.527240196420718, -0.566749497456029, -0.557569749779674, + -0.518672468006208, -0.605739734872777, -0.644729972289524, + -0.634372795883798, -0.595971272831736, -0.683130373706554, + -0.721530775123583, -0.710049134853768, -0.672210965368783, + -0.75927190432799, -0.797013033532397, -0.784466129352279, + -0.747257632103023, -0.834026947774883, -0.871040862017369, + -0.857493994862304, -0.820980062107292, -0.907261265924421, + -0.943481669831474, -0.929006093690766, -0.893250044276535, + -0.97884406558571, -1.01420646133995, -0.998879221843645, + -0.963942657767206, -1.04864829478841, -1.08309012823688, + -1.06699388812265, -1.03293655498315, -1.11655093059633, + -1.15001173295579, -1.1332345848112, -1.10011423646693, + -1.18243325779393, -1.21485478263207, -1.19749004933661, + -1.1653623170739, -1.23994646736733, -1.26503815210259, + -1.24587429922908, -1.22168217428284, -1.28898125595916, + -1.31292435981574, -1.29206452523901, -1.26896941223404, + -1.33566807347581, -1.35841178713589, -1.33596367120011, + -1.31401409821956, -1.37990801828621, -1.40140424943653, + -1.37747987097932, -1.35672177108971, -1.42160773171296, + -1.44181121398938, -1.41652665658308, -1.3970032637812, + -1.46067960951976, -1.47954800505015, -1.45302315403522, + -1.43477490530915, -1.49704200036323, -1.51453599567631, + -1.48689426658247, -1.46995871030885, -1.53061939075937, + -1.54670278584244, -1.5180708448128, -1.50248255569763, -1.561342576146, + -1.57598236644955, -1.54648984330104, -1.53228034405692, + -1.58914881765324, -1.60231526885693, -1.57209446342709, + -1.55929215336406, -1.61398198422733, -1.62564869959773, + -1.59483428204302, -1.58346437273505, -1.63579267978546, + -1.64593665997318, -1.61466536569775, -1.60474982387039, + -1.65453835511379, -1.6631400502544, -1.63155037016045, -1.6231078679291, + -1.67018340425513, -1.67722675825587, -1.64545862501717, + -1.63850449758881, -1.68269924516787, -1.68817173207987, + -1.6563662031493, -1.65091241408324, -1.69206438447348, + -1.69595703686709, -1.6642559749361, -1.6603110890427, -1.69826446614596, + -1.66668681099746, -0.0397355112851597, -0.0794710225703197, + -0.0781411234959837, -0.0390705617479918, -0.119137713111779, + -0.158804403653237, -0.156151210182464, -0.117146166839224, + -0.198333608608413, -0.237862813563588, -0.233899520090454, + -0.195025365136459, -0.277186179538972, -0.316509545514355, + -0.31125590625957, -0.272577713175012, -0.355559185407932, + -0.394608825301509, -0.388091109562751, -0.349673507911161, + -0.43331747208888, -0.47202611887625, -0.464277051519757, + -0.426184080541254, -0.510327277992074, -0.548628437107899, + -0.539687124436124, -0.501982087977941, -0.586456537077476, + -0.624284637047053, -0.614196478210307, -0.576941801323215, + -0.661575178026799, -0.698865719006545, -0.687682303159323, + -0.650939390684815, -0.735555418896887, -0.772245118787229, + -0.760024108222179, -0.723853205690751, -0.80827205658691, + -0.844298994386592, -0.831103993910879, -0.795564051066529, + -0.879602750463659, -0.914906506540727, -0.900806919390687, + -0.865955456650783, -0.949428299502429, -0.983950092464131, + -0.969020963084617, -0.934913941237652, -1.01763291231568, + -1.05131573216722, -1.0356375762118, -1.00232926964821, + -1.08410446945776, -1.1168932067483, -1.1005518286854, -1.0680947024486, + -1.14873477741154, -1.18057634807479, -1.16366264681297, + -1.13210723774918, -1.20389227842133, -1.22720820876787, + -1.20854211830666, -1.18610238255982, -1.24947735665763, + -1.27174650454739, -1.25142848385577, -1.22998530108121, + -1.29292256387905, -1.31409862321072, -1.29223357522132, + -1.27183102953854, -1.33413776408014, -1.35417690494956, + -1.33087393891981, -1.31155375707056, -1.37303787293858, + -1.39189884092759, -1.3672710252721, -1.34907248209595, + -1.40954305055855, -1.42718726018951, -1.4013513663438, + -1.38431119580795, -1.4435788823338, -1.45997050447808, -1.4330467423737, + -1.41719905435875, -1.47507654752061, -1.49018259056314, + -1.46229433631349, -1.4476705393436, -1.50397297513898, + -1.51776335971482, -1.48903687612861, -1.47566560622105, + -1.53021098684863, -1.54265861398243, -1.51322276453778, + -1.5011298203332, -1.55373942647634, -1.56482023897024, + -1.53480619589747, -1.52401448021762, -1.57451327590116, + -1.58420631283208, -1.5537472599664, -1.54427672793193, + -1.59249375703492, -1.60078120123776, -1.57001203231508, + -1.56187964614074, -1.60764841966707, -1.61451563809637, + -1.58357265117557, -1.57679234174532, -1.61995121497483, + -1.6253867918533, -1.59440738055729, -1.58899001586643, -1.6293825545322, + -1.63337831721111, -1.60250065948611, -1.5984540200217, + -1.63592935468398, -1.60517189837051, -0.0384233441984816, + -0.0768466883969634, -0.075552253297943, -0.0377761266489714, + -0.11520772846727, -0.153568768537578, -0.150986326892691, + -0.113269290095317, -0.191805341490424, -0.23004191444327, + -0.226184308796087, -0.188585317844389, -0.268092139247425, + -0.306142364051579, -0.301028821843588, -0.263606565319838, + -0.343944781814303, -0.381747199577027, -0.375403289591302, + -0.338216055717445, -0.419240912768232, -0.456734625959438, + -0.449192200399119, -0.412297744995211, -0.493859436364184, + -0.530984246768929, -0.522281369101735, -0.485736784750427, + -0.567680791855735, -0.60437733694254, -0.594558195674774, + -0.558419782388255, -0.640587224338616, -0.676797111734692, + -0.665911920310062, -0.630235057992418, -0.712463051503444, + -0.748128991272197, -0.736233874322214, -0.701072897316138, + -0.783194925693358, -0.818260860114519, -0.805417726318159, + -0.770825800320187, -0.852672090672917, -0.887083321231315, + -0.873359723071943, -0.839388724695051, -0.920786632526603, + -0.95448994382189, -0.939958924559163, -0.906659323815553, + -0.98743372411854, -1.02037750441519, -1.00511743261858, + -0.972538178588871, -1.05251186255968, -1.08464622070417, + -1.06874061272294, -1.03692902267076, -1.11592309914449, + -1.1471999775848, -1.13073730835664, -1.09973896053979, + -1.16878688392128, -1.19037379025775, -1.17220546220884, + -1.15147138528274, -1.2110130336535, -1.23165227704925, + -1.21187607024274, -1.19204076622579, -1.25130193611378, + -1.27095159517831, -1.2496696151353, -1.23077284268902, + -1.28957199024791, -1.30819238531751, -1.28551083171522, + -1.26759022342526, -1.32574616834247, -1.34329995136743, + -1.31932887746275, -1.30241985458898, -1.35975219051737, + -1.37620442966731, -1.35105749299082, -1.33519318522679, + -1.39152268846304, -1.40684094725876, -1.38063515214383, + -1.36584632256732, -1.4209953580513, -1.43514976884383, + -1.40800520137417, -1.394320176759, -1.44811310047426, -1.4610764321047, + -1.43311598808078, -1.42056059472748, -1.47282415159151, + -1.48457187107832, -1.45592097761886, -1.44451848284982, + -1.49508219919248, -1.50559252730663, -1.4763788587158, + -1.46614991816733, -1.51484648790855, -1.52410044851047, + -1.49445363705454, -1.48541624788517, -1.53208191153707, + -1.54006337456367, -1.51011471681226, -1.5022841769334, + -1.54675909256816, -1.55345481057265, -1.52333696996973, -1.516725843391, + -1.55885444873425, -1.56425408689585, -1.5341007932344, + -1.52871888160207, -1.56835024643148, -1.57244640596712, + -1.54239215244813, -1.53824647284127, -1.57523464089206, + -1.54529738341361, -0.0371466410871191, -0.0742932821742383, + -0.0730343110505336, -0.0365171555252667, -0.111383959623965, + -0.148474637073692, -0.145962947254693, -0.109498629152614, + -0.185453514024273, -0.222432390974853, -0.21868047315362, + -0.182321710204156, -0.259243883828623, -0.296055376682392, + -0.291081931521195, -0.254881202337407, -0.332644281020502, + -0.369233185358611, -0.36306308112592, -0.327072506323558, + -0.405544800996792, -0.441856416634973, -0.434520632870827, + -0.398791856998374, -0.477836671537047, -0.513816926439121, + -0.505352483776508, -0.469936558323667, -0.549412499207555, + -0.585008071975988, -0.575457948277202, -0.540405216026855, + -0.620166512642007, -0.655324953308025, -0.644737986305988, + -0.610097967291595, -0.689994802147663, -0.7246646509873, + -0.713095427652386, -0.678916706979187, -0.758795555094226, + -0.792926459201151, -0.780435192084143, -0.746765309868265, + -0.826469286552195, -0.860012113903239, -0.846664504734535, + -0.813549848409339, -0.892919064658231, -0.925826015413223, + -0.911693106267283, -0.879178805500909, -0.958050730197001, + -0.990275444980778, -0.975433457342978, -0.943563281805131, + -1.02177310990209, -1.05327077482339, -1.03780093692384, + -1.00661719713341, -1.08399822299275, -1.11472567116212, + -1.0987140339676, -1.06825748544572, -1.13463028386717, + -1.15453489657223, -1.13686433093562, -1.11778918245161, + -1.17358828694678, -1.19264167732134, -1.17340728439994, + -1.15513580766778, -1.21080619018001, -1.22897070303867, + -1.20827179094205, -1.19083953767099, -1.24621069678953, + -1.26345069054038, -1.24139054936555, -1.2248311701538, + -1.27973261792463, -1.29601454530889, -1.27270021315502, + -1.25704538126029, -1.31130702939622, -1.32659951348355, + -1.30214153397628, -1.28742087356565, -1.34087341875094, + -1.35514732401834, -1.32965949589285, -1.31590051493457, + -1.36837582235142, -1.3816043206845, -1.35520343999483, + -1.34243146794384, -1.39376295215183, -1.40592158361917, + -1.37872717915755, -1.36696530957619, -1.41698831188188, + -1.42805504014458, -1.40018910267031, -1.38945814091393, + -1.43801030237574, -1.4479655646069, -1.41955227049801, + -1.40987068658416, -1.45679231580764, -1.46561906700837, + -1.43678449696219, -1.4281683837301, -1.47330281862024, + -1.48098657023212, -1.45185842365198, -1.44432146030709, + -1.48751542295841, -1.4940442756847, -1.46475158139968, + -1.45830500252583, -1.49940894644611, -1.50477361720752, + -1.47544644118063, -1.47009901129015, -1.50896746017133, + -1.51316130313514, -1.48393045382214, -1.47968844750139, + -1.51618032477018, -1.48706326612676, -0.0359054019510722, + -0.0718108039021445, -0.0705872967537555, -0.0352936483768776, + -0.107666406581863, -0.143522009261582, -0.14108107126847, + -0.105834184011113, -0.179278126209959, -0.215034243158336, + -0.211388013163053, -0.176234542215762, -0.250641413282565, + -0.286248583406793, -0.281415235292391, -0.246401624227722, + -0.321657683026528, -0.357066782646263, -0.351070484166606, + -0.316242859729498, -0.392229136774559, -0.427391490902854, + -0.420262348934881, -0.385666416550743, -0.462258983510665, + -0.497126476118475, -0.488900468460442, -0.454581408697662, + -0.531651659132935, -0.566176842147396, -0.55689573601759, + -0.522898102239016, -0.600313042936969, -0.634449243726543, + -0.624160501147098, -0.590528118582344, -0.668150670829541, + -0.70185209793254, -0.690608768212694, -0.657384634679896, + -0.735073944789514, -0.768295791646487, -0.756156391208832, + -0.723382579710763, -0.800994338101493, -0.833692884556498, + -0.820721264378462, -0.788438827793647, -0.865825595897314, + -0.89795830723813, -0.884223508208977, -0.85247238629372, + -0.92948393055106, -0.96100955386399, -0.946585650385001, + -0.915404579296989, -0.991888211484981, -1.02276686910597, + -1.0077328012881, -0.97715922583655, -1.05296014895635, + -1.08315342880673, -1.06759282364586, -1.03766281246698, + -1.10142247825902, -1.1196915277113, -1.10251872448699, + -1.08505577406642, -1.13720311653748, -1.15471470536365, + -1.13602212632736, -1.11927042540717, -1.17143532607773, + -1.1881559467918, -1.16804010264156, -1.15203111448446, + -1.20405388370499, -1.21995182061817, -1.1985130918708, + -1.18327659725618, -1.23499722168507, -1.25004262275197, + -1.22738503234892, -1.21294906210986, -1.2642075671951, + -1.27837251163823, -1.25460348930017, -1.24099426082455, + -1.29163107319752, -1.30488963475682, -1.28011977362078, + -1.26736163146048, -1.31721794042098, -1.32954624608515, + -1.30388905217547, -1.29200441289813, -1.34092253017169, + -1.35229881425823, -1.32587044935892, -1.31487975076719, + -1.36270346771973, -1.37310812118123, -1.34602713969215, + -1.33594879452553, -1.38252373602614, -1.39193935087106, + -1.3643264312441, -1.35517678546813, -1.40035075959841, + -1.40876216832577, -1.38073983968934, -1.37253313546672, + -1.41615647828444, -1.42355078824311, -1.39524315283425, + -1.38799149626179, -1.42991741083782, -1.43628403343253, + -1.40781648546539, -1.40152981914982, -1.44161470811042, + -1.4469453827883, -1.41844432439598, -1.41313040493069, + -1.45123419575173, -1.45552300871515, -1.42711556360816, + -1.42277994400207, -1.45876640631836, -1.43046954650996, + -0.0346996267903409, -0.069399253580682, -0.0682112104076085, + -0.0341056052038042, -0.104055069340964, -0.138710885101246, + -0.136340698934021, -0.102275954670815, -0.173279178047483, + -0.20784747099372, -0.204306928824387, -0.170323813879204, + -0.242284727609251, -0.276721984224783, -0.272028733157175, + -0.238167830990781, -0.310984987832382, -0.345247991439982, + -0.339425498713358, -0.305727115935266, -0.379293920101532, + -0.413339848763081, -0.406417348591282, -0.37292142365232, + -0.447126372285036, -0.48091289580699, -0.472925323153537, + -0.439671335872409, -0.514398271631876, -0.547883647456763, + -0.538871558895937, -0.505898441024737, -0.581026815223504, + -0.614169982990246, -0.604179464833393, -0.571525511864665, + -0.646930657549081, -0.679691332107916, -0.668773896003138, + -0.636476680418266, -0.712030094779222, -0.744368857450529, + -0.732581323692225, -0.700677609847681, -0.776247245320811, + -0.808125633191093, -0.795530002003724, -0.764055662847975, + -0.839506226243852, -0.870886819296611, -0.857550130384246, + -0.826540066193985, -0.901733325180717, -0.932579831064823, + -0.918574011744646, -0.888062071064446, -0.962857167308364, + -0.993134503551905, -0.978536205815711, -0.948555108780178, + -1.02280887703527, -1.05248325051863, -1.03737367739141, + -1.00795494160356, -1.06916346709681, -1.08584368367498, + -1.06916864286296, -1.05327116012719, -1.10185752242558, + -1.11787136117618, -1.09972059602499, -1.08444461944398, + -1.13318934380694, -1.1485073264377, -1.12897455023384, + -1.11434757312942, -1.16310155099429, -1.17769577555088, + -1.15687845923097, -1.14292650473241, -1.19153997962379, + -1.20538418369669, -1.18338333504445, -1.17013089713771, + -1.21845380391401, -1.23152342413134, -1.20844335896251, + -1.19591334700348, -1.24379565180277, -1.2560678794742, + -1.23201598532761, -1.22022967214506, -1.26752171225999, + -1.27897554504578, -1.25406203791609, -1.24303901162185, + -1.28959183453384, -1.3002081240219, -1.27454579868488, + -1.26430391830049, -1.30996961910508, -1.31973111418826, + -1.29343508868437, -1.28399044368463, -1.32862250014368, + -1.33751388609909, -1.31070134095408, -1.30206821481922, + -1.34552181928088, -1.35352975246267, -1.326319665236, -1.31851050309504, + -1.36064289052966, -1.36775602859665, -1.34026890435905, + -1.33329428479753, -1.3739650562064, -1.38017408381614, + -1.35253168216689, -1.34640029326297, -1.38547173372718, + -1.39076938363821, -1.36309444288045, -1.35781306252367, + -1.39515045317269, -1.39953152270716, -1.37194748180617, + -1.36752096234331, -1.40299288553659, -1.37551622456322, + -0.0335293156049253, -0.0670586312098507, -0.0659060520120929, + -0.0329530260060464, -0.100549947901267, -0.134041264592684, + -0.131741830251347, -0.0988239411317201, -0.167456669536844, + -0.200872074481004, -0.197437220137621, -0.164589525194484, + -0.234173826808682, -0.267475579136361, -0.262922425115547, + -0.230179822626584, -0.300626195438064, -0.333776811739768, + -0.328128124766177, -0.295525274940862, -0.366739150977711, + -0.399701490215655, -0.392985631840028, -0.360556878303103, + -0.43243883786016, -0.465176185504666, -0.457427047855794, + -0.425206339847911, -0.497652336704378, -0.53012848790409, + -0.521385416912244, -0.489406232384019, -0.562307829501612, + -0.594487171099134, -0.584794877364874, -0.553090147138559, + -0.626334762306281, -0.658182353513427, -0.647590811023717, + -0.616192844194296, -0.689664005063351, -0.721145656613275, + -0.709709989534324, -0.678650400279021, -0.752228008210149, + -0.783310359807023, -0.771090717610323, -0.740400353572323, + -0.813960955697845, -0.844611551588667, -0.831672972793088, + -0.801381845201705, -0.874798914085973, -0.90498627658328, + -0.891398541421913, -0.861535757107501, -0.934679977372237, + -0.964373678161194, -0.950211150506677, -0.920804845964295, + -0.993544407229515, -1.02271513629784, -1.00805659520426, + -0.979133872855469, -1.03785325038054, -1.05299136446325, + -1.03681408606353, -1.0224353406339, -1.06755150461109, + -1.08211164475892, -1.06450269349285, -1.05065838977819, + -1.09606824336764, -1.11002484197637, -1.09107513371889, + -1.07778891360587, -1.12335369865744, -1.13668255533852, + -1.11648665144606, -1.10378089258248, -1.14936089174077, + -1.16203922814303, -1.1406951212416, -1.12859088634383, + -1.17404573955296, -1.18605225096289, -1.16366114296328, + -1.15217813210244, -1.19736715456668, -1.20868205817048, + -1.18534813101334, -1.17450463698831, -1.21928713786844, + -1.22989221756639, -1.2057223972167, -1.19553526411502, + -1.23977086523828, -1.24964951291016, -1.22475322713545, + -1.21523781217607, -1.25878676603792, -1.26792401916567, + -1.24241294964697, -1.23358308839121, -1.27630659472834, -1.284689170291, + -1.25867699962793, -1.25054497463745, -1.29230549485504, + -1.29992181941908, -1.27352397360215, -1.26610048661504, + -1.3067620553559, -1.31360229129273, -1.28693567822641, + -1.28022982591428, -1.31965835906413, -1.32571442683553, + -1.29889717150416, -1.29291642486528, -1.33098002329638, + -1.33624561975724, -1.30939679663404, -1.3041469840691, + -1.34071623243421, -1.34518684511118, -1.31842620841619, + -1.31391150252511, -1.34885976242487, -1.32220330028652, + -0.0323944683948253, -0.0647889367896507, -0.0636718215672085, + -0.0318359107836042, -0.0971510422627741, -0.129513147735897, + -0.127284465220448, -0.0954781433938281, -0.161810600678043, + -0.194108053620189, -0.190778887102756, -0.159031676161602, + -0.226308710880858, -0.258509368141528, -0.254096311167508, + -0.222437599135132, -0.290581305843574, -0.322653243545621, + -0.317178362325064, -0.285637336746286, -0.354564829403098, + -0.386476415260575, -0.379967198681121, -0.348572780503092, + -0.418196380236039, -0.449916345211503, -0.442405642567212, + -0.411186420624167, -0.48141385435044, -0.512911363489377, + -0.504437310066511, -0.473421476316861, -0.544156085771292, + -0.575400808053207, -0.56600673874154, -0.535222024404025, + -0.606362985101141, -0.637325162149075, -0.627059513274433, + -0.596533126007987, -0.6679756756419, -0.698626189134725, + -0.687542388735127, -0.65730095100478, -0.728936626769507, + -0.759247064404289, -0.747403411198256, -0.717472899966691, + -0.789189784259293, -0.819132504114296, -0.806592035435505, + -0.77699772331688, -0.848680697266827, -0.878228890419358, + -0.865059239416804, -0.835825637426154, -0.907356641676598, + -0.936484392933837, -0.922757635360998, -0.893908437388901, + -0.965166739539086, -0.993849086144336, -0.97964157708441, + -0.951199606222704, -1.00749182811023, -1.02113457007612, + -1.0054550540887, -0.992548315586556, -1.034285063094, -1.04743555611189, + -1.03036841873093, -1.01791173640981, -1.06007202475984, + -1.0727084934078, -1.05434185309671, -1.04235513591382, + -1.08481032669443, -1.09691215998107, -1.07733766851607, + -1.06583976080639, -1.10845995803603, -1.12000775609099, + -1.09932039094038, -1.08832902972823, -1.13098337411194, + -1.14195899213288, -1.12025684130249, -1.10978861612143, + -1.15234558148927, -1.16273217084566, -1.14011621067797, + -1.13018652599023, -1.17251421724632, -1.18229626364699, + -1.15887013007728, -1.14949317037763, -1.19145962228501, + -1.20062298092303, -1.17649273471061, -1.16768143239394, + -1.20915490851825, -1.21768683611347, -1.19296072257996, + -1.18472672864528, -1.22557601978013, -1.2334652034468, + -1.20825340726567, -1.20060706492281, -1.24070178632089, + -1.24793836919498, -1.22235276478781, -1.21530308602674, + -1.25451397276317, -1.26108957633135, -1.2352434744363, + -1.22879811961206, -1.26699731941102, -1.27290506249069, + -1.24691295347721, -1.24107821395675, -1.27813957681804, + -1.28337409114539, -1.25735138565675, -1.25213216956698, + -1.28793153353629, -1.29248897592719, -1.2665517434382, + -1.26195156454747, -1.2963670369832, -1.27053077367988, + -0.0312950851600409, -0.0625901703200819, -0.0615085190729553, + -0.0307542595364776, -0.0938583524254835, -0.125126534530885, + -0.122968603841323, -0.092238561457139, -0.156340971471079, + -0.187555408411274, -0.184331929719791, -0.153650266780557, + -0.218689379825778, -0.249823351240283, -0.245550391313058, + -0.214941160516424, -0.280850319048912, -0.311877286857541, + -0.306576211390017, -0.276063301351538, -0.342770955377691, + -0.373664623897841, -0.36736204911456, -0.336969130252289, + -0.404398999412671, -0.435133374927502, -0.427861107287792, + -0.397611578201176, -0.465682824570063, -0.496232274212624, + -0.488027238358737, -0.457944172823264, -0.526571584032545, + -0.556910893852466, -0.547815048963392, -0.517921143661064, + -0.587015325933662, -0.617119758014859, -0.607180002755285, + -0.577497525859338, -0.64696510651487, -0.67681045501488, + -0.666078521294634, -0.63662926202496, -0.706373100998885, + -0.73593574698289, -0.724468082767525, -0.69527330203108, + -0.765192711928195, -0.7944496768735, -0.782307318311495, + -0.75338770053951, -0.82337867472328, -0.85230767257306, + -0.839556105729316, -0.810931712020406, -0.880887160221448, + -0.909466647869836, -0.896175660378673, -0.867865883053995, + -0.937675873963984, -0.965885100058132, -0.952128623031855, + -0.924152141705264, -0.978079200285859, -0.990273300513586, + -0.975091546938469, -0.963610084985162, -1.00205819787433, + -1.01384309523507, -0.997317771739223, -0.986204659338846, + -1.02520068798354, -1.036558280732, -1.01877470836729, -1.00804624005326, + -1.04747143510527, -1.05838458947854, -1.039431510441, -1.02910310940415, + -1.06883717850956, -1.07928976754058, -1.05925914414079, + -1.0493453272909, -1.08926670759095, -1.09924364764131, + -1.07823045398013, -1.06874479906046, -1.10873093257052, + -1.11821821749974, -1.0963202243215, -1.08727533915082, + -1.12720295039365, -1.13618768328756, -1.11350523649785, + -1.10491273040968, -1.14465810567403, -1.15312852806049, + -1.12976432141037, -1.12163477895411, -1.16107404654606, + -1.16901956503164, -1.14507840748332, -1.13742136444684, + -1.17643077529906, -1.18384198556648, -1.15943056386729, + -1.1522544856753, -1.19071069367844, -1.1975794017904, -1.17280603879298, + -1.16611830133013, -1.20389864275146, -1.21021788371252, + -1.18519229298874, -1.17899916589086, -1.21598193724707, + -1.22174599078162, -1.19657902808603, -1.19088566053739, + -1.22695039429214, -1.23215479780266, -1.20695820994858, + -1.20176861901731, -1.23679635647893, -1.2414379151552, + -1.21632408687221, -1.21164114841039, -1.24551470921159, + -1.22049864474329, -0.0302311659005721, -0.0604623318011444, + -0.0594161445293334, -0.0297080722646666, -0.0906718783893959, + -0.120881424977647, -0.118794246113972, -0.0891051953216528, + -0.151047781915953, -0.181214138854259, -0.178096347988727, + -0.14844529705135, -0.211315833643443, -0.241417528432627, + -0.237284665552196, -0.207690506770461, -0.271433235054077, + -0.301448941675528, -0.296321671961038, -0.266803168756617, + -0.331357528901491, -0.361266116127453, -0.355170183140346, + -0.325745927550692, -0.391046695390058, -0.420827274652662, + -0.413793442017532, -0.384481812578939, -0.450459247363246, + -0.48009122007383, -0.472155201788924, -0.442974321903228, + -0.50955432428537, -0.53901742849691, -0.530219808030428, + -0.501187504909676, -0.568291784803844, -0.597566141110779, + -0.587952279466273, -0.55908604374835, -0.62663229768226, + -0.65569845425374, -0.645318387212847, -0.61663533333956, + -0.684537430898284, -0.713376407542827, -0.702284732318129, + -0.673801559765488, -0.741969738704552, -0.770563069866277, + -0.75881882142106, -0.730551776869594, -0.798892846455331, + -0.827222623044384, -0.814889140359451, -0.786853980890255, + -0.855271533006786, -0.883320442969189, -0.870465225559704, + -0.842677182959578, -0.911071810504207, -0.938823178039226, + -0.925517733046597, -0.89799147930315, -0.949615366907439, + -0.960407555775651, -0.945723564612833, -0.935620648829715, + -0.970870908952066, -0.981334262128481, -0.965350752517739, + -0.955537158565286, -0.991454233038726, -1.00157420394897, + -0.984373699530647, -0.974862226024193, -1.01133702388995, + -1.02109984383093, -1.00276817722086, -0.993570938375752, + -1.03049255316137, -1.0398852624918, -1.02051138084282, + -1.01163977903184, -1.04889573998999, -1.05790621748818, + -1.03758198099622, -1.02904668091952, -1.06652320781045, + -1.07514019813272, -1.05396017194393, -1.04577107647008, + -1.08335333731042, -1.09156647648812, -1.0696277164784, + -1.06179394421116, -1.09936631540533, -1.10716615432255, + -1.08456798723472, -1.07709785185656, -1.11454418012137, + -1.12192220592019, -1.09876600435707, -1.0916669957959, + -1.12887086128512, -1.13581951665004, -1.11220846943279, + -1.10548723689493, -1.14233221692767, -1.14884491720531, + -1.12488379561764, -1.11854613252522, -1.15491606532077, + -1.16098721343623, -1.13678213388372, -1.13083296475068, + -1.16661221257228, -1.17223721170833, -1.14789539533064, + -1.14233876460718, -1.17741247571869, -1.18258773972905, + -1.15821726950953, -1.15305633242008, -1.18731070126213, + -1.19203366279522, -1.16774323871822, -1.16298025411388, + -1.19630277911003, -1.17210691347676, -0.029202710616419, + -0.0584054212328381, -0.0573946979363427, -0.0286973489681713, + -0.0875916201545112, -0.116777819076184, -0.114761392038396, + -0.0860780449873696, -0.145931032012665, -0.175084244949145, + -0.172072141909563, -0.14341676697398, -0.204188072333852, + -0.233291899718559, -0.229299133884922, -0.200685637897243, + -0.262330053859071, -0.291368207999582, -0.286414744038126, + -0.257856938961524, -0.320324549974497, -0.349280891949412, + -0.343391600758478, -0.314903172398302, -0.378139468168198, + -0.406998044386983, -0.400202646756434, -0.371797123757456, + -0.43574312272999, -0.464488201072997, -0.45682120035707, + -0.428511923556752, -0.493104306529768, -0.521720411986539, + -0.513221015942649, -0.48502110814986, -0.550192361711687, + -0.578664311436834, -0.569376343407396, -0.541298679675023, + -0.60697724914407, -0.635290186851305, -0.625261986489763, + -0.59731916494858, -0.663429616467702, -0.691569046084099, + -0.680853359850069, -0.653057673169916, -0.719520864588364, + -0.747472683092629, -0.736126544764198, -0.708489952307134, + -0.77522321246298, -0.80297374183333, -0.791058343307209, + -0.763592444035704, -0.830509760032613, -0.858045778231897, + -0.84562633090409, -0.818342337105649, -0.885354549159757, + -0.912663320087616, -0.899808907128636, -0.872717619016363, + -0.922100327974965, -0.931537335862314, -0.917351107111795, + -0.908580007120215, -0.94072319632721, -0.949909056792107, + -0.934467361066474, -0.925909234089135, -0.958832659925407, + -0.967756263058707, -0.951138826586767, -0.942803093826621, + -0.976407093048475, -0.985057923038242, -0.967347668855629, + -0.959243247721198, -0.993426081991444, -1.00179424094465, + -0.983077101046474, -0.975212384951051, -1.00987047130906, + -1.01794670167348, -0.99831142235074, -0.990694261698607, + -1.02572240720904, -1.0334981127446, -1.01303605354527, -1.005673737948, + -1.04096537799663, -1.04843264324866, -1.02723757001892, + -1.0201368117821, -1.05558425147893, -1.0627358597092, -1.04090373218368, + -1.0340706511013, -1.06956530924417, -1.07639475877913, -1.0540235132012, + -1.04746362269244, -1.0828962777383, -1.08939779669748, + -1.06658712396217, -1.06030531858168, -1.0955663560686, + -1.10173491543973, -1.07858603526181, -1.07258657961199, + -1.1075662404711, -1.11339756550248, -1.09001299712124, + -1.08429951619153, -1.11888814538665, -1.12437872527082, + -1.10086205521101, -1.09543752616613, -1.12952582109769, + -1.13467291692456, -1.1111285643396, -1.10599530977531, -1.1394745678859, + -1.14427621884723, -1.12080919897623, -1.11596888165792, + -1.14873124667852, -1.12535557988027, -0.0282097193075814, + -0.056419438615163, -0.0554441792939833, -0.0277220896469916, + -0.0846175777208295, -0.112815716826496, -0.110870041614595, + -0.0831571104542893, -0.140990721761214, -0.169165726695932, + -0.1662593114823, -0.138564676548448, -0.197306095897006, + -0.22544646509808, -0.221593796311237, -0.193926553896769, + -0.253540775463892, -0.281635085829703, -0.276855427621281, + -0.249224611966259, -0.30967201859671, -0.337708951363717, + -0.332026301968956, -0.304440864795118, -0.365677317747091, + -0.393645684130466, -0.387088721504498, -0.359557511736727, + -0.421534450670294, -0.449423217210123, -0.442025234063176, + -0.414556977783837, -0.477221530765738, -0.505019844321353, + -0.496818672700056, -0.469421953381616, -0.532717056657189, + -0.560414268993026, -0.551452194578656, -0.524135433639356, + -0.5879999609003, -0.615585652807574, -0.605909319125385, + -0.578680756852021, -0.64304965770714, -0.670513662606706, + -0.660173965363344, -0.633041642244364, -0.69784608957963, + -0.725178516552555, -0.714230488340911, -0.687202226852127, + -0.752369772746227, -0.779561028939899, -0.768063714572589, + -0.74114710145675, -0.80660184129893, -0.83364265365796, + -0.82165897641183, -0.79486134549221, -0.860524089930632, + -0.887405526203304, -0.875002145277972, -0.848330560844901, + -0.895534083488439, -0.903662640773575, -0.889974174435355, + -0.882488159856663, -0.911615059999763, -0.919567479225952, + -0.90466759738543, -0.897320885910392, -0.927335968643582, + -0.935104458061211, -0.919070089535655, -0.911868843460542, + -0.942681642580843, -0.950258827100475, -0.933169985345321, + -0.926120037440488, -0.957637764999795, -0.965016702899115, + -0.946956304751757, -0.940063145048539, -0.972190901548168, + -0.97936510019722, -0.9604187780437, -0.953687541397728, + -0.986328530766301, -0.993291961335383, -0.973547869125499, + -0.9669833235846, -1.00003907245228, -1.00678618356918, + -0.986334797119435, -0.979941333122467, -1.01331191389482, + -1.01983764422046, -0.998771556257233, -0.992553176688334, + -1.02613743391445, -1.03243722360845, -1.0108509340157, + -1.00481124513647, -1.03850702465862, -1.0445768257088, + -1.02256652745543, -1.01670873073557, -1.05041311110122, + -1.05624939649365, -1.03391275772548, -1.02823964259046, + -1.06184916820246, -1.06744893991127, -1.04488488270131, + -1.03939882021339, -1.07280973569018, -1.07817053146909, + -1.05547900772717, -1.05018194521424, -1.08329043042914, + -1.08841032938919, -1.06569209443879, -1.06058555108298, + -1.09328795635022, -1.09816558331124, -1.07552196764625, + -1.07060703104252, -1.10280011191706, -1.08024464395384, + -0.0272521919740596, -0.0545043839481192, -0.0535645886022552, + -0.0267822943011275, -0.0817497510883506, -0.108995118228582, + -0.107120194842569, -0.0803423917224119, -0.1362268511616, + -0.163458584094619, -0.160657856706937, -0.133889025774753, + -0.190669904332904, -0.217881224571189, -0.214168652831141, + -0.187413254769039, -0.245065399868541, -0.272249575165892, + -0.267643722710503, -0.240906187770822, -0.29939993476813, + -0.326550294370368, -0.32107428677178, -0.294359004741141, + -0.353660244126739, -0.38077019388311, -0.374451666261723, + -0.347762976516751, -0.407833231184159, -0.434896268485209, + -0.427767302907242, -0.401109484584482, -0.46190599699328, + -0.488915725501352, -0.481012778302648, -0.454390040604945, + -0.515865869640353, -0.542816013779354, -0.534179832980052, + -0.50759630564135, -0.569700432950951, -0.596584852122548, + -0.587260385119711, -0.560720109049882, -0.623397554616599, + -0.650210257110649, -0.640246548857955, -0.613753466988833, + -0.676945413678352, -0.703680570246055, -0.693130652151198, + -0.666688600504576, -0.730332527305073, -0.756984484364091, + -0.745905254155592, -0.719517953153395, -0.783547776805734, + -0.810111069247378, -0.798563162082926, -0.772234208119259, + -0.836580432816833, -0.863049796386288, -0.851097447494605, + -0.824830304788765, -0.869916633447861, -0.876783470509433, + -0.863592766583512, -0.857345107039058, -0.883546499969726, + -0.890309529430018, -0.875951461474605, -0.869772114029059, + -0.89696415919325, -0.903618788956483, -0.888167488377311, + -0.882059474925958, -0.910160672487055, -0.916702556017628, + -0.900235126689934, -0.894201307533622, -0.923127602186419, + -0.929552648355211, -0.912148991958666, -0.9061920593243, + -0.935857030707305, -0.942161413059399, -0.923904048075098, + -0.918026520016882, -0.948341578482233, -0.954521743905066, + -0.935495618684633, -0.929699833379866, -0.960574420677373, + -0.966627097449681, -0.946919397779927, -0.94120750823228, + -0.972549302652995, -0.978471507856308, -0.958171459455384, + -0.952545428617656, -0.984260554132229, -0.99004960040815, + -0.969248266800595, -0.96370986312799, -0.995703102046076, + -1.001356603684, -0.980146679912575, -0.974697473356585, + -1.00687248202554, -1.01238836036707, -0.990863963008656, + -0.985505321460616, -1.01776484851484, -1.02314133666261, + -1.00139779062391, -0.996130876816286, -1.02837698348287, + -1.03361263030313, -1.01174625287909, -1.0065720217515, + -1.03870630371304, -1.04379997712295, -1.0219078598071, -1.0168270563431, + -1.0487508666551, -1.05370175618725, -1.03188154472826, + -1.02689470226768, -1.05850937482565, -1.03677410569746, + -0.0263301286158533, -0.0526602572317067, -0.0517559258611583, + -0.0258779629305791, -0.0789881402570747, -0.105316023282443, + -0.103511851722317, -0.0776338887917375, -0.131639420213824, + -0.157962817145206, -0.155267777583475, -0.129389814652896, + -0.184279497641547, -0.210596178137887, -0.207023703444633, + -0.181145740514054, -0.236903927073017, -0.263211676008147, + -0.258779629305792, -0.232901666375213, -0.289508298488756, + -0.315804920969365, -0.31053555516695, -0.284657592236371, + -0.34208824730714, -0.368371573644916, -0.362291481028109, + -0.336413518097529, -0.394639464271585, -0.420907354898254, + -0.414047406889267, -0.388169443958688, -0.447157705212396, + -0.473408055526537, -0.465803332750425, -0.439925369819846, + -0.499638800661177, -0.525869545795818, -0.517559258611584, + -0.491681295681005, -0.552078665296022, -0.578287784796227, + -0.569315184472742, -0.543437221542163, -0.604473307196077, + -0.630658829595928, -0.621071110333901, -0.595193147403321, + -0.656818836884528, -0.682978844173129, -0.672827036195059, + -0.64694907326448, -0.709111476139517, -0.735244108105905, + -0.724582962056217, -0.698704999125638, -0.761347566553028, + -0.787451025000151, -0.776338887917376, -0.750460924986797, + -0.81352357781836, -0.839596130636569, -0.828094813778534, + -0.802216850847955, -0.845247977853229, -0.85089982506989, + -0.838206883556267, -0.833150848667401, -0.856517516237096, + -0.862135207404303, -0.848318953334001, -0.843262918445134, + -0.867717231574413, -0.873299255744522, -0.858431023111734, + -0.853374988222867, -0.878844182767112, -0.884389109789701, + -0.868543092889467, -0.863487058000601, -0.889895593551317, + -0.895402077312933, -0.878655162667201, -0.873599127778334, + -0.900868858786475, -0.906335640260016, -0.888767232444934, + -0.883711197556067, -0.911761550356833, -0.91718746045365, + -0.898879302222667, -0.8938232673338, -0.922571422671907, + -0.927955384890164, -0.9089913720004, -0.903935337111534, + -0.933296417753461, -0.938637450616759, -0.919103441778134, + -0.914047406889267, -0.943934669897495, -0.949231889178231, + -0.929215511555867, -0.924159476667, -0.954484509900659, + -0.959737130623088, -0.9393275813336, -0.934271546444734, + -0.964944468841541, -0.970151807059995, -0.949439651111334, + -0.944383616222467, -0.975313281408243, -0.980474755756491, + -0.959551720889067, -0.9544956860002, -0.985589888764719, + -0.990705021772947, -0.9696637906668, -0.964607755777934, + -0.995773440949382, -1.00084186012582, -0.979775860444533, + -0.974719825555667, -1.00586329880054, -1.01088473747526, + -0.989887930222267, -0.9848318953334, -1.0158590354043, + -0.994943965111133, -0.807114884646544, -0.812012918445134, + -0.785818953334001, -0.781078920625688, -0.816910952243724, + -0.821808986042313, -0.795299018750626, -0.790558986042313, + -0.826707019840903, -0.831605053639492, -0.804779084167251, + -0.800039051458938, -0.836503087438082, -0.841401121236671, + -0.814259149583876, -0.809519116875563, -0.846299155035261, + -0.851197188833851, -0.823739215000501, -0.818999182292188, + -0.85609522263244, -0.86099325643103, -0.833219280417125, + -0.828479247708813, -0.865891290229619, -0.870789324028209, + -0.84269934583375, -0.837959313125438, -0.875687357826798, + -0.880585391625388, -0.852179411250375, -0.847439378542063, + -0.885483425423977, -0.890381459222567, -0.861659476667, + -0.856919443958688, -0.895279493021157, -0.900177526819746, + -0.871139542083626, -0.866399509375313, -0.905075560618336, + -0.909973594416925, -0.88061960750025, -0.875879574791938, + -0.914871628215515, -0.919769662014104, -0.890099672916875, + -0.885359640208563, -0.924667695812694, -0.929565729611284, + -0.8995797383335, -0.894839705625188, -0.934463763409873, + -0.939361797208463, -0.909059803750125, -0.904319771041813, + -0.944259831007052, -0.949157864805642, -0.91853986916675, + -0.913799836458438, -0.954055898604231, -0.958953932402821, + -0.928019934583375, -0.923279901875063, -0.96385196620141, + -0.932759967291688, -0.755042956604832, -0.759624988222867, + -0.733431023111734, -0.729006992583975, -0.764207019840903, + -0.768789051458938, -0.742279084167251, -0.737855053639492, + -0.773371083076974, -0.777953114695009, -0.751127145222767, + -0.746703114695009, -0.782535146313044, -0.78711717793108, + -0.759975206278284, -0.755551175750526, -0.791699209549115, + -0.79628124116715, -0.7688232673338, -0.764399236806042, + -0.800863272785186, -0.805445304403221, -0.777671328389317, + -0.773247297861559, -0.810027336021257, -0.814609367639292, + -0.786519389444834, -0.782095358917075, -0.819191399257327, + -0.823773430875363, -0.79536745050035, -0.790943419972592, + -0.828355462493398, -0.832937494111433, -0.804215511555867, + -0.799791481028108, -0.837519525729469, -0.842101557347505, + -0.813063572611384, -0.808639542083625, -0.84668358896554, + -0.851265620583575, -0.8219116336669, -0.817487603139142, + -0.855847652201611, -0.860429683819646, -0.830759694722417, + -0.826335664194659, -0.865011715437682, -0.869593747055717, + -0.839607755777934, -0.835183725250175, -0.874175778673752, + -0.878757810291788, -0.84845581683345, -0.844031786305692, + -0.883339841909823, -0.887921873527859, -0.857303877888967, + -0.852879847361208, -0.892503905145894, -0.897085936763929, + -0.866151938944483, -0.861727908416725, -0.901667968381965, + -0.870575969472242, -0.702971028563119, -0.7072370580006, + -0.681043092889467, -0.676935064542263, -0.711503087438082, + -0.715769116875563, -0.689259149583875, -0.685151121236671, + -0.720035146313044, -0.724301175750526, -0.697475206278284, + -0.69336717793108, -0.728567205188007, -0.732833234625488, + -0.705691262972692, -0.701583234625488, -0.737099264062969, + -0.741365293500451, -0.713907319667101, -0.709799291319896, + -0.745631322937932, -0.749897352375413, -0.722123376361509, + -0.718015348014305, -0.754163381812894, -0.758429411250375, + -0.730339433055917, -0.726231404708713, -0.762695440687856, + -0.766961470125338, -0.738555489750325, -0.734447461403121, + -0.771227499562819, -0.7754935290003, -0.746771546444734, + -0.742663518097529, -0.779759558437781, -0.784025587875263, + -0.754987603139142, -0.750879574791938, -0.788291617312744, + -0.792557646750225, -0.76320365983355, -0.759095631486346, + -0.796823676187707, -0.801089705625188, -0.771419716527959, + -0.767311688180754, -0.805355735062669, -0.80962176450015, + -0.779635773222367, -0.775527744875163, -0.813887793937631, + -0.818153823375113, -0.787851829916775, -0.783743801569571, + -0.822419852812594, -0.826685882250075, -0.796067886611183, + -0.791959858263979, -0.830951911687556, -0.835217941125038, + -0.804283943305592, -0.800175914958388, -0.839483970562519, + -0.808391971652796, -0.650899100521407, -0.654849127778334, + -0.628655162667201, -0.624863136500551, -0.658799155035261, + -0.662749182292188, -0.636239215000501, -0.632447188833851, + -0.666699209549115, -0.670649236806042, -0.6438232673338, + -0.64003124116715, -0.674599264062969, -0.678549291319896, + -0.651407319667101, -0.64761529350045, -0.682499318576824, + -0.686449345833751, -0.658991372000401, -0.655199345833751, + -0.690399373090678, -0.694349400347604, -0.6665754243337, + -0.66278339816705, -0.698299427604531, -0.702249454861459, + -0.674159476667, -0.67036745050035, -0.706199482118386, + -0.710149509375313, -0.6817435290003, -0.67795150283365, + -0.71409953663224, -0.718049563889167, -0.6893275813336, + -0.68553555516695, -0.721999591146094, -0.725949618403021, + -0.6969116336669, -0.69311960750025, -0.729899645659948, + -0.733849672916875, -0.7044956860002, -0.70070365983355, + -0.737799700173802, -0.741749727430729, -0.7120797383335, + -0.70828771216685, -0.745699754687656, -0.749649781944583, + -0.7196637906668, -0.71587176450015, -0.753599809201511, + -0.757549836458438, -0.7272478430001, -0.72345581683345, + -0.761499863715365, -0.765449890972292, -0.7348318953334, + -0.73103986916675, -0.769399918229219, -0.773349945486146, + -0.7424159476667, -0.73862392150005, -0.777299972743073, + -0.74620797383335, -0.598827172479694, -0.602461197556067, + -0.576267232444934, -0.572791208458838, -0.60609522263244, + -0.609729247708813, -0.583219280417126, -0.57974325643103, + -0.613363272785186, -0.616997297861559, -0.590171328389317, + -0.586695304403221, -0.620631322937932, -0.624265348014305, + -0.597123376361509, -0.593647352375413, -0.627899373090678, + -0.631533398167051, -0.6040754243337, -0.600599400347605, + -0.635167423243423, -0.638801448319796, -0.611027472305892, + -0.607551448319796, -0.642435473396169, -0.646069498472542, + -0.617979520278084, -0.614503496291988, -0.649703523548915, + -0.653337548625288, -0.624931568250275, -0.621455544264179, + -0.656971573701661, -0.660605598778034, -0.631883616222467, + -0.628407592236371, -0.664239623854407, -0.667873648930779, + -0.638835664194658, -0.635359640208563, -0.671507674007152, + -0.675141699083525, -0.64578771216685, -0.642311688180754, + -0.678775724159898, -0.682409749236271, -0.652739760139042, + -0.649263736152946, -0.686043774312644, -0.689677799389017, + -0.659691808111233, -0.656215784125138, -0.69331182446539, + -0.696945849541763, -0.666643856083425, -0.663167832097329, + -0.700579874618136, -0.704213899694508, -0.673595904055617, + -0.670119880069521, -0.707847924770881, -0.711481949847254, + -0.680547952027808, -0.677071928041713, -0.715115974923627, + -0.684023976013904, -0.546755244437982, -0.5500732673338, + -0.523879302222667, -0.520719280417125, -0.553391290229619, + -0.556709313125438, -0.530199345833751, -0.527039324028209, + -0.560027336021257, -0.563345358917075, -0.536519389444834, + -0.533359367639292, -0.566663381812894, -0.569981404708713, + -0.542839433055917, -0.539679411250375, -0.573299427604532, + -0.576617450500351, -0.549159476667, -0.545999454861459, + -0.579935473396169, -0.583253496291988, -0.555479520278084, + -0.552319498472542, -0.586571519187807, -0.589889542083625, + -0.561799563889167, -0.558639542083625, -0.593207564979444, + -0.596525587875263, -0.56811960750025, -0.564959585694709, + -0.599843610771082, -0.6031616336669, -0.574439651111334, + -0.571279629305792, -0.606479656562719, -0.609797679458538, + -0.580759694722417, -0.577599672916875, -0.613115702354356, + -0.616433725250175, -0.5870797383335, -0.583919716527958, + -0.619751748145994, -0.623069771041813, -0.593399781944583, + -0.590239760139042, -0.626387793937631, -0.62970581683345, + -0.599719825555667, -0.596559803750125, -0.633023839729269, + -0.636341862625088, -0.60603986916675, -0.602879847361209, + -0.639659885520906, -0.642977908416725, -0.612359912777833, + -0.609199890972292, -0.646295931312544, -0.649613954208362, + -0.618679956388917, -0.615519934583375, -0.652931977104181, + -0.621839978194458, -0.494683316396269, -0.497685337111534, + -0.4714913720004, -0.468647352375413, -0.500687357826798, + -0.503689378542063, -0.477179411250375, -0.474335391625388, + -0.506691399257327, -0.509693419972592, -0.48286745050035, + -0.480023430875363, -0.512695440687857, -0.515697461403121, + -0.488555489750325, -0.485711470125338, -0.518699482118386, + -0.52170150283365, -0.4942435290003, -0.491399509375313, + -0.524703523548915, -0.527705544264179, -0.499931568250275, + -0.497087548625288, -0.530707564979444, -0.533709585694709, + -0.50561960750025, -0.502775587875263, -0.536711606409973, + -0.539713627125238, -0.511307646750225, -0.508463627125238, + -0.542715647840502, -0.545717668555767, -0.5169956860002, + -0.514151666375213, -0.548719689271031, -0.551721709986296, + -0.522683725250175, -0.519839705625188, -0.554723730701561, + -0.557725751416825, -0.52837176450015, -0.525527744875163, + -0.56072777213209, -0.563729792847354, -0.534059803750125, + -0.531215784125138, -0.566731813562619, -0.569733834277883, + -0.5397478430001, -0.536903823375113, -0.572735854993148, + -0.575737875708413, -0.545435882250075, -0.542591862625088, + -0.578739896423677, -0.581741917138942, -0.55112392150005, + -0.548279901875063, -0.584743937854206, -0.587745958569471, + -0.556811960750025, -0.553967941125038, -0.590747979284735, + -0.559655980375013, -0.442611388354557, -0.445297406889267, + -0.419103441778134, -0.4165754243337, -0.447983425423977, + -0.450669443958688, -0.424159476667, -0.421631459222567, + -0.453355462493398, -0.456041481028109, -0.429215511555867, + -0.426687494111434, -0.458727499562819, -0.461413518097529, + -0.434271546444733, -0.4317435290003, -0.46409953663224, + -0.46678555516695, -0.4393275813336, -0.436799563889167, + -0.469471573701661, -0.472157592236371, -0.444383616222467, + -0.441855598778034, -0.474843610771082, -0.477529629305792, + -0.449439651111333, -0.4469116336669, -0.480215647840502, + -0.482901666375213, -0.4544956860002, -0.451967668555767, + -0.485587684909923, -0.488273703444634, -0.459551720889067, + -0.457023703444634, -0.490959721979344, -0.493645740514054, + -0.464607755777934, -0.4620797383335, -0.496331759048765, + -0.499017777583475, -0.4696637906668, -0.467135773222367, + -0.501703796118186, -0.504389814652896, -0.474719825555667, + -0.472191808111234, -0.507075833187606, -0.509761851722317, + -0.479775860444533, -0.4772478430001, -0.512447870257027, + -0.515133888791738, -0.4848318953334, -0.482303877888967, + -0.517819907326448, -0.520505925861158, -0.489887930222267, + -0.487359912777833, -0.523191944395869, -0.525877962930579, + -0.494943965111133, -0.4924159476667, -0.52856398146529, + -0.497471982555567, -0.390539460312844, -0.392909476667, + -0.366715511555867, -0.364503496291988, -0.395279493021157, + -0.397649509375313, -0.371139542083625, -0.368927526819746, + -0.400019525729469, -0.402389542083625, -0.375563572611384, + -0.373351557347504, -0.404759558437781, -0.407129574791938, + -0.379987603139142, -0.377775587875263, -0.409499591146094, + -0.41186960750025, -0.3844116336669, -0.382199618403021, + -0.414239623854406, -0.416609640208563, -0.388835664194658, + -0.386623648930779, -0.418979656562719, -0.421349672916875, + -0.393259694722417, -0.391047679458538, -0.423719689271031, + -0.426089705625188, -0.397683725250175, -0.395471709986296, + -0.428459721979344, -0.4308297383335, -0.402107755777933, + -0.399895740514054, -0.433199754687656, -0.435569771041813, + -0.406531786305692, -0.404319771041813, -0.437939787395969, + -0.440309803750125, -0.41095581683345, -0.408743801569571, + -0.442679820104281, -0.445049836458438, -0.415379847361208, + -0.413167832097329, -0.447419852812594, -0.44978986916675, + -0.419803877888967, -0.417591862625088, -0.452159885520906, + -0.454529901875063, -0.424227908416725, -0.422015893152846, + -0.456899918229219, -0.459269934583375, -0.428651938944483, + -0.426439923680604, -0.461639950937531, -0.464009967291688, + -0.433075969472242, -0.430863954208363, -0.466379983645844, + -0.435287984736121, -0.338467532271132, -0.340521546444734, + -0.3143275813336, -0.312431568250275, -0.342575560618336, + -0.344629574791938, -0.31811960750025, -0.316223594416925, + -0.34668358896554, -0.348737603139142, -0.3219116336669, + -0.320015620583575, -0.350791617312744, -0.352845631486346, + -0.32570365983355, -0.323807646750225, -0.354899645659948, + -0.35695365983355, -0.3294956860002, -0.327599672916875, + -0.359007674007152, -0.361061688180754, -0.33328771216685, + -0.331391699083525, -0.363115702354356, -0.365169716527958, + -0.3370797383335, -0.335183725250175, -0.36722373070156, + -0.369277744875163, -0.34087176450015, -0.338975751416825, + -0.371331759048765, -0.373385773222367, -0.3446637906668, + -0.342767777583475, -0.375439787395969, -0.377493801569571, + -0.34845581683345, -0.346559803750125, -0.379547815743173, + -0.381601829916775, -0.3522478430001, -0.350351829916775, + -0.383655844090377, -0.385709858263979, -0.35603986916675, + -0.354143856083425, -0.387763872437581, -0.389817886611183, + -0.3598318953334, -0.357935882250075, -0.391871900784786, + -0.393925914958388, -0.36362392150005, -0.361727908416725, + -0.39597992913199, -0.398033943305592, -0.3674159476667, + -0.365519934583375, -0.400087957479194, -0.402141971652796, + -0.37120797383335, -0.369311960750025, -0.404195985826398, + -0.373103986916675, -0.286395604229419, -0.288133616222467, + -0.261939651111334, -0.260359640208563, -0.289871628215515, + -0.291609640208563, -0.265099672916875, -0.263519662014104, + -0.293347652201611, -0.295085664194658, -0.268259694722417, + -0.266679683819646, -0.296823676187706, -0.298561688180754, + -0.271419716527958, -0.269839705625188, -0.300299700173802, + -0.30203771216685, -0.2745797383335, -0.272999727430729, + -0.303775724159898, -0.305513736152946, -0.277739760139042, + -0.276159749236271, -0.307251748145994, -0.308989760139042, + -0.280899781944583, -0.279319771041813, -0.31072777213209, + -0.312465784125138, -0.284059803750125, -0.282479792847354, + -0.314203796118185, -0.315941808111233, -0.287219825555667, + -0.285639814652896, -0.317679820104281, -0.319417832097329, + -0.290379847361208, -0.288799836458438, -0.321155844090377, + -0.322893856083425, -0.29353986916675, -0.291959858263979, + -0.324631868076473, -0.326369880069521, -0.296699890972292, + -0.295119880069521, -0.328107892062569, -0.329845904055617, + -0.299859912777833, -0.298279901875062, -0.331583916048665, + -0.333321928041713, -0.303019934583375, -0.301439923680604, + -0.33505994003476, -0.336797952027808, -0.306179956388917, + -0.304599945486146, -0.338535964020856, -0.340273976013904, + -0.309339978194458, -0.307759967291688, -0.342011988006952, + -0.310919989097229, -0.234323676187706, -0.2357456860002, + -0.209551720889067, -0.20828771216685, -0.237167695812694, + -0.238589705625188, -0.2120797383335, -0.210815729611283, + -0.240011715437681, -0.241433725250175, -0.214607755777933, + -0.213343747055717, -0.242855735062669, -0.244277744875163, + -0.217135773222367, -0.21587176450015, -0.245699754687656, + -0.24712176450015, -0.2196637906668, -0.218399781944583, + -0.248543774312644, -0.249965784125138, -0.222191808111233, + -0.220927799389017, -0.251387793937631, -0.252809803750125, + -0.224719825555667, -0.22345581683345, -0.254231813562619, + -0.255653823375113, -0.2272478430001, -0.225983834277883, + -0.257075833187606, -0.2584978430001, -0.229775860444533, + -0.228511851722317, -0.259919852812594, -0.261341862625088, + -0.232303877888967, -0.23103986916675, -0.262763872437581, + -0.264185882250075, -0.2348318953334, -0.233567886611183, + -0.265607892062569, -0.267029901875062, -0.237359912777833, + -0.236095904055617, -0.268451911687556, -0.26987392150005, + -0.239887930222267, -0.23862392150005, -0.271295931312544, + -0.272717941125038, -0.2424159476667, -0.241151938944483, + -0.274139950937531, -0.275561960750025, -0.244943965111133, + -0.243679956388917, -0.276983970562519, -0.278405980375013, + -0.247471982555567, -0.24620797383335, -0.279827990187506, + -0.248735991277783, -0.182251748145994, -0.183357755777933, + -0.1571637906668, -0.156215784125138, -0.184463763409873, + -0.185569771041813, -0.159059803750125, -0.158111797208463, + -0.186675778673752, -0.187781786305692, -0.16095581683345, + -0.160007810291788, -0.188887793937631, -0.189993801569571, + -0.162851829916775, -0.161903823375112, -0.19109980920151, + -0.19220581683345, -0.1647478430001, -0.163799836458438, + -0.19331182446539, -0.194417832097329, -0.166643856083425, + -0.165695849541763, -0.195523839729269, -0.196629847361208, + -0.16853986916675, -0.167591862625088, -0.197735854993148, + -0.198841862625088, -0.170435882250075, -0.169487875708413, + -0.199947870257027, -0.201053877888967, -0.1723318953334, + -0.171383888791737, -0.202159885520906, -0.203265893152846, + -0.174227908416725, -0.173279901875063, -0.204371900784786, + -0.205477908416725, -0.17612392150005, -0.175175914958388, + -0.206583916048665, -0.207689923680604, -0.178019934583375, + -0.177071928041713, -0.208795931312544, -0.209901938944483, + -0.1799159476667, -0.178967941125037, -0.211007946576423, + -0.212113954208362, -0.181811960750025, -0.180863954208362, + -0.213219961840302, -0.214325969472242, -0.18370797383335, + -0.182759967291688, -0.215431977104181, -0.216537984736121, + -0.185603986916675, -0.184655980375013, -0.21764399236806, + -0.186551993458338, -0.130179820104281, -0.130969825555667, + -0.104775860444533, -0.104143856083425, -0.131759831007052, + -0.132549836458438, -0.10603986916675, -0.105407864805642, + -0.133339841909823, -0.134129847361208, -0.107303877888967, + -0.106671873527858, -0.134919852812594, -0.135709858263979, + -0.108567886611183, -0.107935882250075, -0.136499863715365, + -0.13728986916675, -0.1098318953334, -0.109199890972292, + -0.138079874618135, -0.138869880069521, -0.111095904055617, + -0.110463899694508, -0.139659885520906, -0.140449890972292, + -0.112359912777833, -0.111727908416725, -0.141239896423677, + -0.142029901875062, -0.11362392150005, -0.112991917138942, + -0.142819907326448, -0.143609912777833, -0.114887930222267, + -0.114255925861158, -0.144399918229219, -0.145189923680604, + -0.116151938944483, -0.115519934583375, -0.14597992913199, + -0.146769934583375, -0.1174159476667, -0.116783943305592, + -0.14755994003476, -0.148349945486146, -0.118679956388917, + -0.118047952027808, -0.149139950937531, -0.149929956388917, + -0.119943965111133, -0.119311960750025, -0.150719961840302, + -0.151509967291688, -0.12120797383335, -0.120575969472242, + -0.152299972743073, -0.153089978194458, -0.122471982555567, + -0.121839978194458, -0.153879983645844, -0.154669989097229, + -0.123735991277783, -0.123103986916675, -0.155459994548615, + -0.124367995638892, -0.0781078920625687, -0.0785818953334, + -0.0523879302222666, -0.0520719280417124, -0.0790558986042312, + -0.0795299018750625, -0.0530199345833749, -0.0527039324028208, + -0.0800039051458937, -0.0804779084167249, -0.0536519389444833, + -0.0533359367639291, -0.0809519116875562, -0.0814259149583875, + -0.0542839433055916, -0.0539679411250374, -0.0818999182292187, + -0.08237392150005, -0.0549159476667, -0.0545999454861458, + -0.0828479247708812, -0.0833219280417125, -0.0555479520278083, + -0.0552319498472541, -0.0837959313125437, -0.084269934583375, + -0.0561799563889166, -0.0558639542083624, -0.0847439378542062, + -0.0852179411250375, -0.056811960750025, -0.0564959585694708, + -0.0856919443958687, -0.0861659476667, -0.0574439651111333, + -0.0571279629305791, -0.0866399509375312, -0.0871139542083625, + -0.0580759694722417, -0.0577599672916875, -0.0875879574791937, + -0.088061960750025, -0.05870797383335, -0.0583919716527958, + -0.0885359640208562, -0.0890099672916875, -0.0593399781944583, + -0.0590239760139041, -0.0894839705625187, -0.08995797383335, + -0.0599719825555666, -0.0596559803750125, -0.0904319771041812, + -0.0909059803750125, -0.060603986916675, -0.0602879847361208, + -0.0913799836458437, -0.091853986916675, -0.0612359912777833, + -0.0609199890972292, -0.0923279901875062, -0.0928019934583375, + -0.0618679956388917, -0.0615519934583375, -0.0932759967291688, + -0.0621839978194458, -0.0260359640208562, -0.0261939651111332, + -0.0263519662014103, -0.0265099672916874, -0.0266679683819645, + -0.0268259694722416, -0.0269839705625187, -0.0271419716527958, + -0.0272999727430728, -0.0274579738333499, -0.027615974923627, + -0.0277739760139041, -0.0279319771041812, -0.0280899781944583, + -0.0282479792847354, -0.0284059803750124, -0.0285639814652895, + -0.0287219825555666, -0.0288799836458437, -0.0290379847361208, + -0.0291959858263979, -0.029353986916675, -0.029511988006952, + -0.0296699890972291, -0.0298279901875062, -0.0299859912777833, + -0.0301439923680604, -0.0303019934583375, -0.0304599945486146, + -0.0306179956388917, -0.0307759967291687, -0.0309339978194458, + -0.0310919989097229, 0.118954789559355, 0.116575693768168, + 0.0582878468840839, 0.0594942438652683, 0, 0, 0, 0.0570982989884904, + 0.114196597976981, 0.111817502185794, 0.0559087510928969, 0, 0, + 0.0547192031973033, 0.109438406394607, 0.10705931060342, + 0.0535296553017098, 0, 0, 0.0523401074061163, 0.104680214812233, + 0.102301119021046, 0.0511505595105228, 0, 0, 0.0499610116149293, + 0.0999220232298586, 0.0975429274386716, 0.0487714637193358, 0, + 0.237640108260456, 0.232887306095247, 0.174731499931708, + 0.17834795799808, 0.171165550953509, 0.228134503930038, + 0.223381701764829, 0.167599601975311, 0.164033652997113, + 0.21862889959962, 0.213876097434411, 0.160467704018915, + 0.156901755040717, 0.209123295269202, 0.204370493103993, + 0.153335806062519, 0.149769857084321, 0.199617690938784, + 0.194864888773574, 0.146203908106123, 0.355787095683211, + 0.348671353769547, 0.290779329932397, 0.296797656643262, + 0.28484505789296, 0.341555611855883, 0.334439869942219, + 0.278910785853524, 0.272976513814087, 0.327324128028555, + 0.320208386114891, 0.267042241774651, 0.261107969735214, + 0.313092644201227, 0.305976902287562, 0.255173697695778, + 0.249239425656341, 0.298861160373898, 0.291745418460234, + 0.243305153616904, 0.473128110901024, 0.463665548683004, + 0.406168451226275, 0.414575013135934, 0.397879299160433, + 0.454202986464984, 0.444740424246963, 0.389590147094591, + 0.381300995028749, 0.435277862028943, 0.425815299810922, + 0.373011842962907, 0.364722690897064, 0.416352737592902, + 0.406890175374882, 0.356433538831222, 0.34814438676538, + 0.397427613156861, 0.387965050938841, 0.339855234699538, + 0.589397338773567, 0.577609391998096, 0.52063747034055, + 0.531413223882441, 0.510012215843804, 0.565821445222625, + 0.554033498447154, 0.499386961347058, 0.488761706850313, + 0.542245551671682, 0.530457604896211, 0.478136452353567, + 0.467511197856821, 0.51866965812074, 0.506881711345268, + 0.456885943360075, 0.446260688863329, 0.495093764569797, + 0.483305817794326, 0.435635434366583, 0.704331392103574, + 0.690244764261503, 0.633927078129799, 0.647047612756302, + 0.620989790821028, 0.676158136419431, 0.66207150857736, + 0.608052503512257, 0.595115216203485, 0.647984880735288, + 0.633898252893217, 0.582177928894714, 0.569240641585942, + 0.619811625051145, 0.605724997209074, 0.556303354277171, 0.5433660669684, + 0.591638369367002, 0.577551741524931, 0.530428779659628, + 0.817669908293555, 0.801316510127684, 0.745780637194593, + 0.761216230674768, 0.730560624190622, 0.784963111961812, + 0.768609713795941, 0.715340611186651, 0.700120598182679, + 0.75225631563007, 0.735902917464199, 0.684900585178708, + 0.669680572174737, 0.719549519298328, 0.703196121132457, + 0.654460559170765, 0.639240546166794, 0.686842722966586, + 0.670489324800714, 0.624020533162823, 0.929156139150818, + 0.910573016367802, 0.855944763247743, 0.873660448997746, + 0.838476502773299, 0.891989893584785, 0.873406770801769, + 0.821008242298855, 0.803539981824411, 0.854823648018753, + 0.836240525235736, 0.786071721349968, 0.768603460875524, + 0.81765740245272, 0.799074279669704, 0.75113520040108, 0.733666939926637, + 0.780491156886688, 0.761908034103671, 0.716198679452193, + 1.03853753250472, 1.01776678185462, 0.964169899111212, 0.984125545404853, + 0.944492962394656, 0.996996031204527, 0.976225280554433, + 0.924816025678101, 0.905139088961546, 0.955454529904338, + 0.934683779254244, 0.88546215224499, 0.865785215528435, 0.91391302860415, + 0.893142277954056, 0.84610827881188, 0.826431342095324, + 0.872371527303961, 0.851600776653867, 0.806754405378769, + 1.14556630431853, 1.12265497823216, 1.07021088004339, 1.0923612809234, + 1.04836984167516, 1.09974365214579, 1.07683232605941, 1.02652880330692, + 1.00468776493869, 1.05392099997304, 1.03100967388667, 0.982846726570459, + 0.961005688202226, 1.0080983478003, 0.985187021713932, 0.939164649833994, + 0.917323611465762, 0.962275695627562, 0.939364369541191, + 0.895482573097529, 1.25, 1.225, 1.17382748911608, 1.19812246680014, + 1.14987182607289, 1.2, 1.175, 1.12591616302971, 1.10196049998652, 1.15, + 1.125, 1.07800483694334, 1.05404917390015, 1.1, 1.075, 1.03009351085697, + 1.00613784781378, 1.05, 1.025, 0.982182184770595, 1.35160204363899, + 1.32457000276621, 1.27478500138311, 1.30116951993268, 1.24876898094672, + 1.29753796189343, 1.27050592102065, 1.22275296051033, 1.19673694007394, + 1.24347388014787, 1.21644183927509, 1.17072091963755, 1.14470489920116, + 1.18940979840231, 1.16237775752953, 1.11868887876477, 1.09267285832838, + 1.13534571665675, 1.10831367578397, 1.06665683789199, 1.450142273928, + 1.42113942844944, 1.37285471560782, 1.40126900560224, 1.34483727243215, + 1.39213658297088, 1.36313373749232, 1.31681982925648, 1.28880238608081, + 1.33413089201376, 1.3051280465352, 1.26078494290514, 1.23276749972948, + 1.27612520105664, 1.24712235557808, 1.20475005655381, 1.17673261337814, + 1.21811951009952, 1.18911666462096, 1.14871517020247, 1.54539746555151, + 1.51448951624048, 1.46781447234496, 1.49819416627837, 1.43785907495016, + 1.48358156692945, 1.45267361761842, 1.40790367755537, 1.37794828016057, + 1.42176566830739, 1.39085771899636, 1.34799288276578, 1.31803748537098, + 1.35994976968533, 1.3290418203743, 1.28808208797619, 1.25812669058139, + 1.29813387106327, 1.26722592175224, 1.2281712931866, 1.63715183486321, + 1.60440879816595, 1.55944915720321, 1.59172543529772, 1.52762366419907, + 1.57166576146868, 1.53892272477142, 1.49579817119492, 1.46397267819077, + 1.50617968807416, 1.47343665137689, 1.43214718518663, 1.40032169218248, + 1.44069361467963, 1.40795057798236, 1.36849619917833, 1.33667070617418, + 1.3752075412851, 1.34246450458783, 1.30484521317004, 1.72519752870528, + 1.69069357813117, 1.64755118814856, 1.68165093425313, 1.61392769451288, + 1.65618962755707, 1.62168567698296, 1.58030420087719, 1.54668070724151, + 1.58718172640886, 1.55267777583475, 1.51305721360582, 1.47943371997014, + 1.51817382526065, 1.48366987468654, 1.44581022633445, 1.41218673269877, + 1.44916592411244, 1.41466197353833, 1.37856323906308, 1.80933509526267, + 1.77314839335742, 1.7319209857443, 1.76776695296637, 1.69657565950462, + 1.73696169145217, 1.70077498954691, 1.66123033326494, 1.62588500702526, + 1.66458828764166, 1.62840158573641, 1.59053968078558, 1.5551943545459, + 1.59221488383115, 1.5560281819259, 1.51984902830622, 1.48450370206654, + 1.51984148002065, 1.48365477811539, 1.44915837582686, 1.88937393588565, + 1.85158645716793, 1.81236742526268, 1.84987841095721, 1.77538033495119, + 1.81379897845022, 1.77601149973251, 1.73839324463971, 1.70140615432823, + 1.73822402101479, 1.70043654229708, 1.66441906401674, 1.62743197370526, + 1.66264906357937, 1.62486158486166, 1.59044488339378, 1.55345779308229, + 1.58707410614394, 1.54928662742623, 1.51647070277081, 1.96513273685697, + 1.92583008211983, 1.88870826964388, 1.92779929936347, 1.85016320291645, + 1.88652742738269, 1.84722477264555, 1.81161813618903, 1.7730730694616, + 1.80792211790841, 1.76861946317127, 1.73452800273418, 1.69598293600675, + 1.72931680843413, 1.69001415369699, 1.65743786927932, 1.6188928025519, + 1.65071149895985, 1.61140884422271, 1.58034773582447, 2.03643988012584, + 1.99571108252332, 1.96077058232158, 2.0013531023109, 1.92075485615175, + 1.95498228492081, 1.91425348731829, 1.88073912998192, 1.84072340381209, + 1.87352468971577, 1.83279589211326, 1.80070767764226, 1.76069195147244, + 1.79206709451074, 1.75133829690822, 1.72067622530261, 1.68066049913278, + 1.7106094993057, 1.66988070170319, 1.64064477296295, 2.10313383207795, + 2.06107115543639, 2.02839111897986, 2.07037319677843, 1.98699538185782, + 2.01900847879484, 1.97694580215328, 1.94559964473578, 1.90420390761374, + 1.93488312551172, 1.89282044887016, 1.86280817049171, 1.82141243336967, + 1.8507577722286, 1.80869509558704, 1.78001669624763, 1.73862095912559, + 1.76663241894548, 1.72456974230392, 1.69722522200355, 2.1650635094611, + 2.12176223927187, 2.09141669735413, 2.13470323005287, 2.04873472393874, + 2.07846096908265, 2.03515969889343, 2.00605275052335, 1.96337077710796, + 1.99185842870421, 1.94855715851499, 1.92068880369257, 1.87800683027718, + 1.90525588832576, 1.86195461813654, 1.83532485686179, 1.7926428834464, + 1.81865334794732, 1.7753520777581, 1.74996091003101, 2.22208862163731, + 2.17764684920456, 2.14970454423822, 2.19419747391814, 2.10583302292723, + 2.13320507677182, 2.08876330433907, 2.06196150161625, 2.01808998030527, + 2.04432153190632, 1.99987975947358, 1.97421845899428, 1.9303469376833, + 1.95543798704083, 1.91099621460809, 1.88647541637231, 1.84260389506133, + 1.86655444217534, 1.82211266974259, 1.79873237375035, 2.2740799883863, + 2.22859838861857, 2.20312261891157, 2.24872115477651, 2.15816093281133, + 2.18311678885084, 2.13763518908312, 2.11319924671109, 2.06823756061086, + 2.09215358931539, 2.04667198954767, 2.02327587451062, 1.97831418841039, + 2.00119038977994, 1.95570879001221, 1.93335250231015, 1.88839081620991, + 1.91022719024449, 1.86474559047676, 1.84342913010968, 2.32091983254018, + 2.27450143588938, 2.25154991225397, 2.29815075895416, 2.20559991404471, + 2.22808303923857, 2.18166464258777, 2.15964991583544, 2.11369991762618, + 2.13524624593697, 2.08882784928616, 2.06774991941691, 2.02179992120765, + 2.04240945263536, 1.99599105598456, 1.97584992299839, 1.92989992478912, + 1.94957265933375, 1.90315426268295, 1.88394992657986, 2.36250204678667, + 2.31525200585094, 2.29487672087016, 2.3423743124994, 2.24804250207689, + 2.2680019649152, 2.22075192397947, 2.20120828328362, 2.15437406449035, + 2.17350188304374, 2.126251842108, 2.10753984569708, 2.06070562690382, + 2.07900180117227, 2.03175176023654, 2.01387140811055, 1.96703718931728, + 1.9845017193008, 1.93725167836507, 1.92020297052401, 2.39873243403624, + 2.35075778535552, 2.33300489560323, 2.38129163483965, 2.285392550795, + 2.30278313667479, 2.25480848799407, 2.23778020598677, 2.19016786117854, + 2.20683383931334, 2.15885919063262, 2.14255551637031, 2.09494317156208, + 2.11088454195189, 2.06290989327117, 2.04733082675385, 1.99971848194562, + 2.01493524459044, 1.96696059590972, 1.95210613713739, 2.42952892080885, + 2.38093834239268, 2.3658480638741, 2.41481456572267, 2.31756545032565, + 2.3323477639765, 2.28375718556032, 2.2692828367772, 2.22100022322874, + 2.23516660714415, 2.18657602872797, 2.17271760968029, 2.12443499613184, + 2.13798545031179, 2.08939487189561, 2.07615238258339, 2.02786976903494, + 2.04080429347944, 1.99221371506326, 1.97958715548649, 2.45482174315677, + 2.40572530829363, 2.39333182534315, 2.4428671649279, 2.3444883187035, + 2.3566288734305, 2.30753243856736, 2.29564481206384, 2.24680130542419, + 2.25843600370423, 2.20933956884109, 2.19795779878453, 2.14911429214487, + 2.16024313397795, 2.11114669911482, 2.10027078550522, 2.05142727886556, + 2.06205026425168, 2.01295382938855, 2.0025837722259, 2.47455360470233, + 2.42506253260829, 2.41539392045096, 2.46538588429547, 2.36610016697237, + 2.37557146051424, 2.32608038842019, 2.31680641349378, 2.26751266001519, + 2.27658931632615, 2.2270982442321, 2.21821890653659, 2.168925153058, + 2.17760717213805, 2.12811610004401, 2.11963139957941, 2.07033764610082, + 2.07862502794996, 2.02913395585591, 2.02104389262223, 2.48867980643271, + 2.43890621030406, 2.43198437145617, 2.48231971168322, 2.38235203734482, + 2.3891326141754, 2.33935901804675, 2.33271970323347, 2.28308736912212, + 2.28958542191809, 2.23981182578944, 2.23345503501077, 2.18382270089942, + 2.19003822966079, 2.14026463353213, 2.13419036678807, 2.08455803267672, + 2.09049103740348, 2.04071744127482, 2.03492569856537, 2.49716834795752, + 2.44722498099837, 2.44306559565121, 2.49363028652563, 2.39320711410731, + 2.39728161403922, 2.34733824708007, 2.34334863256341, 2.29349015101951, + 2.29739488012092, 2.24745151316177, 2.2436316694756, 2.1937731879317, + 2.19750814620262, 2.14756477924347, 2.1439147063878, 2.0940562248439, + 2.09762141228432, 2.04767804532517, 2.04419774329999, 2.5, 2.45, + 2.44861249049918, 2.49929198673282, 2.39864080701961, 2.4, 2.35, + 2.34866912354003, 2.29869744006046, 2.3, 2.25, 2.24872575658088, + 2.19875407310131, 2.2, 2.15, 2.14878238962173, 2.09881070614216, 2.1, + 2.05, 2.04883902266258, -0.0487714637193363, -0.0975429274386726, + -0.0999220232298596, -0.0499610116149298, -0.0511505595105233, + -0.102301119021047, -0.104680214812234, -0.0523401074061168, + -0.0535296553017103, -0.107059310603421, -0.109438406394608, + -0.0547192031973038, -0.0559087510928973, -0.111817502185795, + -0.114196597976982, -0.0570982989884909, -0.0582878468840844, + -0.116575693768169, -0.118954789559356, -0.0594942438652688, + -0.146203908106124, -0.194864888773576, -0.199617690938785, + -0.149769857084322, -0.15333580606252, -0.204370493103994, + -0.209123295269203, -0.156901755040718, -0.160467704018916, + -0.213876097434412, -0.218628899599621, -0.164033652997114, + -0.167599601975312, -0.22338170176483, -0.228134503930039, + -0.17116555095351, -0.174731499931708, -0.232887306095248, + -0.237640108260457, -0.178347957998081, -0.243305153616905, + -0.291745418460235, -0.298861160373899, -0.249239425656342, + -0.255173697695779, -0.305976902287563, -0.313092644201227, + -0.261107969735215, -0.267042241774652, -0.320208386114892, + -0.327324128028556, -0.272976513814088, -0.278910785853525, + -0.33443986994222, -0.341555611855884, -0.284845057892961, + -0.290779329932398, -0.348671353769549, -0.355787095683213, + -0.296797656643263, -0.339855234699538, -0.387965050938842, + -0.397427613156862, -0.348144386765381, -0.356433538831223, + -0.406890175374883, -0.416352737592903, -0.364722690897065, + -0.373011842962908, -0.425815299810923, -0.435277862028944, + -0.38130099502875, -0.389590147094592, -0.444740424246964, + -0.454202986464985, -0.397879299160434, -0.406168451226277, + -0.463665548683005, -0.473128110901025, -0.414575013135935, + -0.435635434366584, -0.483305817794327, -0.495093764569798, + -0.44626068886333, -0.456885943360076, -0.506881711345269, + -0.518669658120741, -0.467511197856822, -0.478136452353568, + -0.530457604896212, -0.542245551671683, -0.488761706850313, + -0.499386961347059, -0.554033498447154, -0.565821445222626, + -0.510012215843805, -0.520637470340551, -0.577609391998097, + -0.589397338773568, -0.531413223882442, -0.530428779659629, + -0.577551741524931, -0.591638369367002, -0.5433660669684, + -0.556303354277172, -0.605724997209074, -0.619811625051145, + -0.569240641585943, -0.582177928894714, -0.633898252893217, + -0.647984880735288, -0.595115216203486, -0.608052503512257, + -0.66207150857736, -0.676158136419431, -0.620989790821028, + -0.6339270781298, -0.690244764261503, -0.704331392103574, + -0.647047612756302, -0.624020533162823, -0.670489324800715, + -0.686842722966586, -0.639240546166794, -0.654460559170765, + -0.703196121132457, -0.719549519298328, -0.669680572174737, + -0.684900585178708, -0.735902917464199, -0.75225631563007, + -0.700120598182679, -0.71534061118665, -0.768609713795941, + -0.784963111961812, -0.730560624190622, -0.745780637194593, + -0.801316510127683, -0.817669908293554, -0.761216230674768, + -0.716198679452194, -0.761908034103672, -0.780491156886689, + -0.733666939926637, -0.751135200401081, -0.799074279669705, + -0.817657402452721, -0.768603460875525, -0.786071721349968, + -0.836240525235737, -0.854823648018754, -0.803539981824412, + -0.821008242298855, -0.87340677080177, -0.891989893584786, + -0.838476502773299, -0.855944763247743, -0.910573016367803, + -0.929156139150819, -0.873660448997746, -0.80675440537877, + -0.851600776653867, -0.872371527303961, -0.826431342095325, + -0.84610827881188, -0.893142277954056, -0.91391302860415, + -0.865785215528436, -0.885462152244991, -0.934683779254244, + -0.955454529904339, -0.905139088961546, -0.924816025678102, + -0.976225280554433, -0.996996031204528, -0.944492962394657, + -0.964169899111212, -1.01776678185462, -1.03853753250472, + -0.984125545404854, -0.895482573097529, -0.939364369541192, + -0.962275695627562, -0.917323611465762, -0.939164649833994, + -0.985187021713933, -1.0080983478003, -0.961005688202227, + -0.982846726570459, -1.03100967388667, -1.05392099997304, + -1.00468776493869, -1.02652880330692, -1.07683232605941, + -1.09974365214579, -1.04836984167516, -1.07021088004339, + -1.12265497823216, -1.14556630431853, -1.0923612809234, + -0.982182184770596, -1.025, -1.05, -1.00613784781378, -1.03009351085697, + -1.075, -1.1, -1.05404917390015, -1.07800483694334, -1.125, -1.15, + -1.10196049998652, -1.12591616302971, -1.175, -1.2, -1.14987182607289, + -1.17382748911608, -1.225, -1.25, -1.19812246680014, -1.06665683789199, + -1.10831367578398, -1.13534571665676, -1.09267285832838, + -1.11868887876477, -1.16237775752954, -1.18940979840232, + -1.14470489920116, -1.17072091963755, -1.21644183927509, + -1.24347388014787, -1.19673694007394, -1.22275296051033, + -1.27050592102065, -1.29753796189343, -1.24876898094672, + -1.27478500138311, -1.32457000276621, -1.35160204363899, + -1.30116951993268, -1.14871517020247, -1.18911666462096, + -1.21811951009952, -1.17673261337814, -1.20475005655381, + -1.24712235557808, -1.27612520105664, -1.23276749972948, + -1.26078494290515, -1.3051280465352, -1.33413089201376, + -1.28880238608082, -1.31681982925649, -1.36313373749232, + -1.39213658297088, -1.34483727243216, -1.37285471560782, + -1.42113942844944, -1.450142273928, -1.40126900560223, -1.2281712931866, + -1.26722592175224, -1.29813387106327, -1.25812669058139, + -1.28808208797619, -1.3290418203743, -1.35994976968533, + -1.31803748537098, -1.34799288276578, -1.39085771899636, + -1.42176566830739, -1.37794828016057, -1.40790367755537, + -1.45267361761842, -1.48358156692945, -1.43785907495016, + -1.46781447234496, -1.51448951624048, -1.54539746555151, + -1.49819416627837, -1.30484521317004, -1.34246450458784, + -1.3752075412851, -1.33667070617419, -1.36849619917833, + -1.40795057798236, -1.44069361467963, -1.40032169218248, + -1.43214718518663, -1.47343665137689, -1.50617968807416, + -1.46397267819077, -1.49579817119492, -1.53892272477142, + -1.57166576146868, -1.52762366419907, -1.55944915720322, + -1.60440879816595, -1.63715183486321, -1.59172543529772, + -1.37856323906308, -1.41466197353833, -1.44916592411244, + -1.41218673269877, -1.44581022633445, -1.48366987468654, + -1.51817382526065, -1.47943371997014, -1.51305721360582, + -1.55267777583475, -1.58718172640886, -1.54668070724151, + -1.58030420087719, -1.62168567698296, -1.65618962755707, + -1.61392769451288, -1.64755118814856, -1.69069357813117, + -1.72519752870528, -1.68165093425313, -1.44915837582686, + -1.48365477811539, -1.51984148002065, -1.48450370206654, + -1.51984902830622, -1.5560281819259, -1.59221488383115, -1.5551943545459, + -1.59053968078558, -1.62840158573641, -1.66458828764166, + -1.62588500702526, -1.66123033326494, -1.70077498954691, + -1.73696169145217, -1.69657565950462, -1.7319209857443, + -1.77314839335742, -1.80933509526268, -1.76776695296637, + -1.51647070277081, -1.54928662742623, -1.58707410614394, + -1.5534577930823, -1.59044488339378, -1.62486158486166, + -1.66264906357937, -1.62743197370526, -1.66441906401674, + -1.70043654229708, -1.73822402101479, -1.70140615432823, + -1.73839324463971, -1.77601149973251, -1.81379897845022, + -1.77538033495119, -1.81236742526268, -1.85158645716793, + -1.88937393588565, -1.84987841095721, -1.58034773582447, + -1.61140884422271, -1.65071149895985, -1.6188928025519, + -1.65743786927932, -1.69001415369699, -1.72931680843413, + -1.69598293600675, -1.73452800273418, -1.76861946317127, + -1.80792211790841, -1.7730730694616, -1.81161813618903, + -1.84722477264555, -1.88652742738269, -1.85016320291645, + -1.88870826964388, -1.92583008211983, -1.96513273685697, + -1.92779929936347, -1.64064477296295, -1.66988070170319, + -1.71060949930571, -1.68066049913278, -1.72067622530261, + -1.75133829690822, -1.79206709451074, -1.76069195147244, + -1.80070767764226, -1.83279589211326, -1.87352468971577, + -1.84072340381209, -1.88073912998192, -1.91425348731829, + -1.95498228492081, -1.92075485615175, -1.96077058232158, + -1.99571108252332, -2.03643988012584, -2.0013531023109, + -1.69722522200356, -1.72456974230392, -1.76663241894548, + -1.73862095912559, -1.78001669624763, -1.80869509558704, + -1.8507577722286, -1.82141243336967, -1.86280817049171, + -1.89282044887016, -1.93488312551172, -1.90420390761374, + -1.94559964473578, -1.97694580215328, -2.01900847879483, + -1.98699538185782, -2.02839111897986, -2.06107115543639, + -2.10313383207795, -2.07037319677843, -1.74996091003101, + -1.7753520777581, -1.81865334794732, -1.7926428834464, -1.83532485686179, + -1.86195461813654, -1.90525588832577, -1.87800683027718, + -1.92068880369257, -1.94855715851499, -1.99185842870421, + -1.96337077710796, -2.00605275052335, -2.03515969889343, + -2.07846096908265, -2.04873472393874, -2.09141669735413, + -2.12176223927187, -2.1650635094611, -2.13470323005287, + -1.79873237375035, -1.82211266974259, -1.86655444217534, + -1.84260389506133, -1.88647541637231, -1.91099621460809, + -1.95543798704083, -1.9303469376833, -1.97421845899428, + -1.99987975947358, -2.04432153190632, -2.01808998030527, + -2.06196150161625, -2.08876330433907, -2.13320507677182, + -2.10583302292723, -2.14970454423822, -2.17764684920456, + -2.22208862163731, -2.19419747391814, -1.84342913010968, + -1.86474559047676, -1.91022719024449, -1.88839081620991, + -1.93335250231015, -1.95570879001221, -2.00119038977994, + -1.97831418841039, -2.02327587451062, -2.04667198954767, + -2.09215358931539, -2.06823756061086, -2.11319924671109, + -2.13763518908312, -2.18311678885084, -2.15816093281133, + -2.20312261891157, -2.22859838861857, -2.2740799883863, + -2.24872115477651, -1.88394992657986, -1.90315426268295, + -1.94957265933375, -1.92989992478912, -1.97584992299839, + -1.99599105598456, -2.04240945263536, -2.02179992120765, + -2.06774991941692, -2.08882784928616, -2.13524624593697, + -2.11369991762618, -2.15964991583544, -2.18166464258777, + -2.22808303923857, -2.20559991404471, -2.25154991225397, + -2.27450143588938, -2.32091983254018, -2.29815075895416, + -1.92020297052401, -1.93725167836507, -1.9845017193008, + -1.96703718931728, -2.01387140811055, -2.03175176023654, + -2.07900180117227, -2.06070562690382, -2.10753984569708, -2.126251842108, + -2.17350188304374, -2.15437406449035, -2.20120828328362, + -2.22075192397947, -2.2680019649152, -2.24804250207689, + -2.29487672087016, -2.31525200585094, -2.36250204678667, + -2.3423743124994, -1.9521061371374, -1.96696059590972, -2.01493524459044, + -1.99971848194562, -2.04733082675385, -2.06290989327117, + -2.11088454195189, -2.09494317156208, -2.14255551637031, + -2.15885919063262, -2.20683383931334, -2.19016786117854, + -2.23778020598677, -2.25480848799407, -2.30278313667479, -2.285392550795, + -2.33300489560323, -2.35075778535552, -2.39873243403624, + -2.38129163483965, -1.97958715548649, -1.99221371506326, + -2.04080429347944, -2.02786976903494, -2.07615238258339, + -2.08939487189561, -2.13798545031179, -2.12443499613184, + -2.17271760968029, -2.18657602872797, -2.23516660714415, + -2.22100022322874, -2.2692828367772, -2.28375718556032, -2.3323477639765, + -2.31756545032565, -2.3658480638741, -2.38093834239268, + -2.42952892080885, -2.41481456572267, -2.0025837722259, + -2.01295382938855, -2.06205026425168, -2.05142727886556, + -2.10027078550522, -2.11114669911482, -2.16024313397795, + -2.14911429214487, -2.19795779878453, -2.20933956884109, + -2.25843600370423, -2.24680130542419, -2.29564481206384, + -2.30753243856736, -2.3566288734305, -2.3444883187035, -2.39333182534315, + -2.40572530829363, -2.45482174315677, -2.4428671649279, + -2.02104389262223, -2.02913395585591, -2.07862502794996, + -2.07033764610082, -2.11963139957941, -2.12811610004401, + -2.17760717213805, -2.168925153058, -2.21821890653659, -2.2270982442321, + -2.27658931632615, -2.26751266001519, -2.31680641349378, + -2.32608038842019, -2.37557146051424, -2.36610016697237, + -2.41539392045096, -2.42506253260829, -2.47455360470233, + -2.46538588429547, -2.03492569856537, -2.04071744127482, + -2.09049103740348, -2.08455803267672, -2.13419036678807, + -2.14026463353213, -2.19003822966079, -2.18382270089942, + -2.23345503501077, -2.23981182578944, -2.28958542191809, + -2.28308736912212, -2.33271970323347, -2.33935901804675, + -2.3891326141754, -2.38235203734482, -2.43198437145617, + -2.43890621030406, -2.48867980643271, -2.48231971168322, + -2.04419774329999, -2.04767804532517, -2.09762141228432, + -2.0940562248439, -2.1439147063878, -2.14756477924347, -2.19750814620262, + -2.1937731879317, -2.2436316694756, -2.24745151316177, -2.29739488012092, + -2.29349015101951, -2.34334863256341, -2.34733824708007, + -2.39728161403922, -2.39320711410731, -2.44306559565121, + -2.44722498099837, -2.49716834795752, -2.49363028652563, + -2.04883902266258, -2.05, -2.1, -2.09881070614216, -2.14878238962173, + -2.15, -2.2, -2.19875407310131, -2.24872575658088, -2.25, -2.3, + -2.29869744006046, -2.34866912354003, -2.35, -2.4, -2.39864080701961, + -2.44861249049918, -2.45, -2.5, -2.49929198673282, -2.04883902266258, + -2.04767804532517, -2.09762141228432, -2.09881070614216, + -2.14878238962173, -2.14756477924347, -2.19750814620262, + -2.19875407310131, -2.24872575658088, -2.24745151316177, + -2.29739488012092, -2.29869744006046, -2.34866912354003, + -2.34733824708007, -2.39728161403922, -2.39864080701961, + -2.44861249049918, -2.44722498099837, -2.49716834795752, + -2.49929198673282, -2.04419774329999, -2.04071744127482, + -2.09049103740348, -2.0940562248439, -2.1439147063878, -2.14026463353213, + -2.19003822966079, -2.1937731879317, -2.2436316694756, -2.23981182578944, + -2.28958542191809, -2.29349015101951, -2.34334863256341, + -2.33935901804675, -2.3891326141754, -2.39320711410731, + -2.44306559565121, -2.43890621030406, -2.48867980643271, + -2.49363028652563, -2.03492569856537, -2.02913395585591, + -2.07862502794996, -2.08455803267672, -2.13419036678807, + -2.12811610004401, -2.17760717213805, -2.18382270089942, + -2.23345503501077, -2.2270982442321, -2.27658931632615, + -2.28308736912212, -2.33271970323347, -2.32608038842019, + -2.37557146051424, -2.38235203734482, -2.43198437145617, + -2.42506253260829, -2.47455360470233, -2.48231971168322, + -2.02104389262223, -2.01295382938855, -2.06205026425168, + -2.07033764610082, -2.11963139957941, -2.11114669911482, + -2.16024313397795, -2.168925153058, -2.21821890653659, -2.20933956884109, + -2.25843600370423, -2.26751266001519, -2.31680641349378, + -2.30753243856736, -2.3566288734305, -2.36610016697237, + -2.41539392045096, -2.40572530829363, -2.45482174315677, + -2.46538588429547, -2.0025837722259, -1.99221371506326, + -2.04080429347944, -2.05142727886556, -2.10027078550522, + -2.08939487189561, -2.13798545031179, -2.14911429214487, + -2.19795779878453, -2.18657602872797, -2.23516660714415, + -2.24680130542419, -2.29564481206384, -2.28375718556032, + -2.3323477639765, -2.3444883187035, -2.39333182534315, -2.38093834239268, + -2.42952892080885, -2.4428671649279, -1.97958715548649, + -1.96696059590972, -2.01493524459044, -2.02786976903494, + -2.07615238258339, -2.06290989327117, -2.11088454195189, + -2.12443499613184, -2.17271760968029, -2.15885919063262, + -2.20683383931334, -2.22100022322874, -2.2692828367772, + -2.25480848799407, -2.30278313667479, -2.31756545032565, + -2.3658480638741, -2.35075778535552, -2.39873243403624, + -2.41481456572267, -1.95210613713739, -1.93725167836507, + -1.9845017193008, -1.99971848194562, -2.04733082675385, + -2.03175176023654, -2.07900180117227, -2.09494317156208, + -2.14255551637031, -2.126251842108, -2.17350188304374, -2.19016786117854, + -2.23778020598677, -2.22075192397947, -2.2680019649152, -2.285392550795, + -2.33300489560323, -2.31525200585094, -2.36250204678667, + -2.38129163483965, -1.92020297052401, -1.90315426268295, + -1.94957265933375, -1.96703718931728, -2.01387140811055, + -1.99599105598456, -2.04240945263536, -2.06070562690382, + -2.10753984569708, -2.08882784928616, -2.13524624593697, + -2.15437406449035, -2.20120828328362, -2.18166464258777, + -2.22808303923857, -2.24804250207689, -2.29487672087016, + -2.27450143588938, -2.32091983254018, -2.3423743124994, + -1.88394992657986, -1.86474559047676, -1.91022719024449, + -1.92989992478912, -1.97584992299839, -1.95570879001221, + -2.00119038977994, -2.02179992120765, -2.06774991941692, + -2.04667198954767, -2.09215358931539, -2.11369991762618, + -2.15964991583544, -2.13763518908312, -2.18311678885084, + -2.20559991404471, -2.25154991225397, -2.22859838861857, + -2.2740799883863, -2.29815075895416, -1.84342913010968, + -1.82211266974259, -1.86655444217534, -1.88839081620991, + -1.93335250231015, -1.91099621460808, -1.95543798704083, + -1.97831418841039, -2.02327587451062, -1.99987975947358, + -2.04432153190632, -2.06823756061086, -2.11319924671109, + -2.08876330433907, -2.13320507677182, -2.15816093281133, + -2.20312261891157, -2.17764684920456, -2.22208862163731, + -2.24872115477651, -1.79873237375035, -1.7753520777581, + -1.81865334794732, -1.84260389506133, -1.88647541637231, + -1.86195461813654, -1.90525588832576, -1.9303469376833, + -1.97421845899428, -1.94855715851499, -1.99185842870421, + -2.01808998030527, -2.06196150161625, -2.03515969889343, + -2.07846096908265, -2.10583302292723, -2.14970454423822, + -2.12176223927187, -2.1650635094611, -2.19419747391814, + -1.74996091003101, -1.72456974230392, -1.76663241894548, + -1.7926428834464, -1.83532485686179, -1.80869509558704, -1.8507577722286, + -1.87800683027718, -1.92068880369257, -1.89282044887016, + -1.93488312551172, -1.96337077710796, -2.00605275052335, + -1.97694580215328, -2.01900847879483, -2.04873472393874, + -2.09141669735413, -2.06107115543639, -2.10313383207795, + -2.13470323005287, -1.69722522200355, -1.66988070170319, + -1.7106094993057, -1.73862095912559, -1.78001669624763, + -1.75133829690822, -1.79206709451074, -1.82141243336967, + -1.86280817049171, -1.83279589211325, -1.87352468971577, + -1.90420390761374, -1.94559964473578, -1.91425348731829, + -1.95498228492081, -1.98699538185782, -2.02839111897986, + -1.99571108252332, -2.03643988012584, -2.07037319677843, + -1.64064477296295, -1.61140884422271, -1.65071149895985, + -1.68066049913278, -1.72067622530261, -1.69001415369699, + -1.72931680843413, -1.76069195147244, -1.80070767764226, + -1.76861946317127, -1.80792211790841, -1.84072340381209, + -1.88073912998192, -1.84722477264555, -1.88652742738269, + -1.92075485615175, -1.96077058232158, -1.92583008211983, + -1.96513273685697, -2.0013531023109, -1.58034773582447, + -1.54928662742623, -1.58707410614394, -1.6188928025519, + -1.65743786927932, -1.62486158486166, -1.66264906357937, + -1.69598293600675, -1.73452800273418, -1.70043654229708, + -1.73822402101479, -1.7730730694616, -1.81161813618903, + -1.77601149973251, -1.81379897845022, -1.85016320291645, + -1.88870826964388, -1.85158645716793, -1.88937393588565, + -1.92779929936347, -1.51647070277081, -1.48365477811539, + -1.51984148002065, -1.55345779308229, -1.59044488339378, + -1.5560281819259, -1.59221488383115, -1.62743197370526, + -1.66441906401674, -1.62840158573641, -1.66458828764166, + -1.70140615432823, -1.73839324463971, -1.70077498954692, + -1.73696169145217, -1.77538033495119, -1.81236742526268, + -1.77314839335742, -1.80933509526268, -1.84987841095721, + -1.44915837582686, -1.41466197353833, -1.44916592411244, + -1.48450370206654, -1.51984902830622, -1.48366987468654, + -1.51817382526065, -1.5551943545459, -1.59053968078558, + -1.55267777583475, -1.58718172640886, -1.62588500702526, + -1.66123033326494, -1.62168567698296, -1.65618962755707, + -1.69657565950462, -1.7319209857443, -1.69069357813117, + -1.72519752870528, -1.76776695296637, -1.37856323906308, + -1.34246450458783, -1.3752075412851, -1.41218673269877, + -1.44581022633445, -1.40795057798236, -1.44069361467963, + -1.47943371997014, -1.51305721360582, -1.47343665137689, + -1.50617968807416, -1.54668070724151, -1.58030420087719, + -1.53892272477142, -1.57166576146868, -1.61392769451288, + -1.64755118814856, -1.60440879816595, -1.63715183486321, + -1.68165093425313, -1.30484521317004, -1.26722592175224, + -1.29813387106327, -1.33667070617418, -1.36849619917833, + -1.3290418203743, -1.35994976968533, -1.40032169218248, + -1.43214718518663, -1.39085771899636, -1.42176566830739, + -1.46397267819077, -1.49579817119492, -1.45267361761842, + -1.48358156692945, -1.52762366419907, -1.55944915720321, + -1.51448951624048, -1.54539746555151, -1.59172543529772, + -1.2281712931866, -1.18911666462096, -1.21811951009952, + -1.25812669058139, -1.28808208797619, -1.24712235557808, + -1.27612520105664, -1.31803748537098, -1.34799288276578, + -1.3051280465352, -1.33413089201376, -1.37794828016057, + -1.40790367755537, -1.36313373749232, -1.39213658297088, + -1.43785907495016, -1.46781447234496, -1.42113942844944, -1.450142273928, + -1.49819416627837, -1.14871517020247, -1.10831367578397, + -1.13534571665675, -1.17673261337814, -1.2047500565538, + -1.16237775752953, -1.18940979840231, -1.23276749972947, + -1.26078494290514, -1.21644183927509, -1.24347388014787, + -1.28880238608081, -1.31681982925648, -1.27050592102065, + -1.29753796189343, -1.34483727243215, -1.37285471560782, + -1.32457000276621, -1.35160204363899, -1.40126900560223, + -1.06665683789199, -1.025, -1.05, -1.09267285832838, -1.11868887876477, + -1.075, -1.1, -1.14470489920116, -1.17072091963755, -1.125, -1.15, + -1.19673694007394, -1.22275296051033, -1.175, -1.2, -1.24876898094672, + -1.27478500138311, -1.225, -1.25, -1.30116951993268, -0.982182184770595, + -0.939364369541191, -0.962275695627562, -1.00613784781378, + -1.03009351085697, -0.985187021713932, -1.0080983478003, + -1.05404917390015, -1.07800483694334, -1.03100967388667, + -1.05392099997304, -1.10196049998652, -1.12591616302971, + -1.07683232605941, -1.09974365214579, -1.14987182607289, + -1.17382748911608, -1.12265497823216, -1.14556630431853, + -1.19812246680014, -0.895482573097529, -0.851600776653867, + -0.872371527303961, -0.917323611465761, -0.939164649833994, + -0.893142277954055, -0.913913028604149, -0.961005688202226, + -0.982846726570459, -0.934683779254244, -0.955454529904338, + -1.00468776493869, -1.02652880330692, -0.976225280554432, + -0.996996031204527, -1.04836984167516, -1.07021088004339, + -1.01776678185462, -1.03853753250472, -1.0923612809234, + -0.806754405378769, -0.761908034103671, -0.780491156886687, + -0.826431342095324, -0.846108278811879, -0.799074279669704, + -0.81765740245272, -0.865785215528435, -0.88546215224499, + -0.836240525235737, -0.854823648018753, -0.905139088961546, + -0.924816025678101, -0.873406770801769, -0.891989893584786, + -0.944492962394656, -0.964169899111212, -0.910573016367802, + -0.929156139150819, -0.984125545404853, -0.716198679452193, + -0.670489324800714, -0.686842722966585, -0.733666939926636, + -0.75113520040108, -0.703196121132456, -0.719549519298327, + -0.768603460875524, -0.786071721349968, -0.735902917464198, + -0.752256315630069, -0.803539981824411, -0.821008242298855, + -0.76860971379594, -0.784963111961811, -0.838476502773299, + -0.855944763247742, -0.801316510127682, -0.817669908293553, + -0.873660448997746, -0.624020533162822, -0.57755174152493, + -0.591638369367002, -0.639240546166794, -0.654460559170765, + -0.605724997209073, -0.619811625051145, -0.669680572174736, + -0.684900585178707, -0.633898252893216, -0.647984880735288, + -0.700120598182679, -0.71534061118665, -0.66207150857736, + -0.676158136419431, -0.730560624190621, -0.745780637194593, + -0.690244764261503, -0.704331392103574, -0.761216230674767, + -0.530428779659628, -0.483305817794326, -0.495093764569797, + -0.5433660669684, -0.556303354277171, -0.506881711345268, + -0.51866965812074, -0.569240641585942, -0.582177928894714, + -0.530457604896211, -0.542245551671683, -0.595115216203485, + -0.608052503512257, -0.554033498447154, -0.565821445222626, + -0.620989790821028, -0.6339270781298, -0.577609391998097, + -0.589397338773568, -0.647047612756302, -0.435635434366583, + -0.38796505093884, -0.397427613156861, -0.446260688863329, + -0.456885943360075, -0.406890175374881, -0.416352737592902, + -0.467511197856821, -0.478136452353567, -0.425815299810922, + -0.435277862028943, -0.488761706850313, -0.499386961347059, + -0.444740424246963, -0.454202986464984, -0.510012215843805, + -0.520637470340551, -0.463665548683004, -0.473128110901025, + -0.531413223882442, -0.339855234699537, -0.291745418460234, + -0.298861160373899, -0.34814438676538, -0.356433538831222, + -0.305976902287563, -0.313092644201227, -0.364722690897064, + -0.373011842962907, -0.320208386114891, -0.327324128028556, + -0.381300995028749, -0.389590147094592, -0.33443986994222, + -0.341555611855884, -0.397879299160434, -0.406168451226277, + -0.348671353769549, -0.355787095683213, -0.414575013135935, + -0.243305153616904, -0.194864888773574, -0.199617690938783, + -0.249239425656341, -0.255173697695778, -0.204370493103993, + -0.209123295269202, -0.261107969735214, -0.267042241774651, + -0.213876097434411, -0.21862889959962, -0.272976513814088, + -0.278910785853524, -0.223381701764829, -0.228134503930038, + -0.284845057892961, -0.290779329932398, -0.232887306095247, + -0.237640108260456, -0.296797656643263, -0.146203908106123, + -0.0975429274386712, -0.0999220232298583, -0.149769857084321, + -0.153335806062519, -0.102301119021045, -0.104680214812233, + -0.156901755040717, -0.160467704018915, -0.10705931060342, + -0.109438406394607, -0.164033652997113, -0.167599601975311, + -0.111817502185794, -0.114196597976981, -0.17116555095351, + -0.174731499931708, -0.116575693768168, -0.118954789559356, + -0.178347957998081, -0.0487714637193355, 1.8982025386784e-16, + 1.34711147906209e-16, -0.0499610116149291, -0.0511505595105227, + 7.96020419445779e-17, 2.4492935982947e-17, -0.0523401074061163, + -0.0535296553017099, -3.06161699786838e-17, -8.57252759403147e-17, + -0.0547192031973035, -0.0559087510928971, -1.40834381901946e-16, + -1.95943487863577e-16, -0.0570982989884907, -0.0582878468840844, + -2.51052593825207e-16, -3.06161699786838e-16, -0.0594942438652689, + 0.0487714637193363, 0.0975429274386724, 0.0999220232298595, + 0.0499610116149298, 0.0511505595105233, 0.102301119021047, + 0.104680214812234, 0.0523401074061168, 0.0535296553017104, + 0.107059310603421, 0.109438406394608, 0.0547192031973039, + 0.0559087510928974, 0.111817502185795, 0.114196597976982, + 0.0570982989884909, 0.0582878468840844, 0.116575693768169, + 0.118954789559356, 0.0594942438652688, 0.146203908106124, + 0.194864888773575, 0.199617690938784, 0.149769857084322, + 0.15333580606252, 0.204370493103993, 0.209123295269202, + 0.156901755040718, 0.160467704018916, 0.213876097434411, + 0.21862889959962, 0.164033652997114, 0.167599601975312, + 0.223381701764829, 0.228134503930038, 0.17116555095351, + 0.174731499931708, 0.232887306095246, 0.237640108260455, + 0.17834795799808, 0.243305153616905, 0.291745418460235, + 0.298861160373899, 0.249239425656341, 0.255173697695778, + 0.305976902287563, 0.313092644201227, 0.261107969735214, + 0.267042241774651, 0.320208386114891, 0.327324128028556, + 0.272976513814088, 0.278910785853524, 0.33443986994222, + 0.341555611855884, 0.284845057892961, 0.290779329932397, + 0.348671353769548, 0.355787095683212, 0.296797656643262, + 0.339855234699538, 0.387965050938841, 0.397427613156862, + 0.34814438676538, 0.356433538831223, 0.406890175374882, + 0.416352737592903, 0.364722690897065, 0.373011842962907, + 0.425815299810923, 0.435277862028944, 0.38130099502875, + 0.389590147094592, 0.444740424246964, 0.454202986464985, + 0.397879299160434, 0.406168451226277, 0.463665548683005, + 0.473128110901026, 0.414575013135935, 0.435635434366584, + 0.483305817794326, 0.495093764569797, 0.44626068886333, + 0.456885943360076, 0.506881711345269, 0.51866965812074, + 0.467511197856821, 0.478136452353567, 0.530457604896211, + 0.542245551671683, 0.488761706850313, 0.499386961347059, + 0.554033498447154, 0.565821445222625, 0.510012215843805, + 0.520637470340551, 0.577609391998096, 0.589397338773568, + 0.531413223882442, 0.530428779659629, 0.577551741524932, + 0.591638369367003, 0.5433660669684, 0.556303354277172, 0.605724997209074, + 0.619811625051146, 0.569240641585943, 0.582177928894714, + 0.633898252893217, 0.647984880735289, 0.595115216203486, + 0.608052503512257, 0.66207150857736, 0.676158136419432, + 0.620989790821028, 0.6339270781298, 0.690244764261503, 0.704331392103575, + 0.647047612756302, 0.624020533162823, 0.670489324800715, + 0.686842722966586, 0.639240546166794, 0.654460559170766, + 0.703196121132457, 0.719549519298328, 0.669680572174737, + 0.684900585178708, 0.735902917464199, 0.752256315630071, + 0.70012059818268, 0.715340611186651, 0.768609713795942, + 0.784963111961813, 0.730560624190622, 0.745780637194593, + 0.801316510127684, 0.817669908293555, 0.761216230674768, + 0.716198679452193, 0.761908034103671, 0.780491156886688, + 0.733666939926637, 0.751135200401081, 0.799074279669704, + 0.81765740245272, 0.768603460875524, 0.786071721349968, + 0.836240525235737, 0.854823648018753, 0.803539981824412, + 0.821008242298855, 0.873406770801769, 0.891989893584786, + 0.838476502773299, 0.855944763247743, 0.910573016367802, + 0.929156139150818, 0.873660448997746, 0.80675440537877, + 0.851600776653868, 0.872371527303962, 0.826431342095325, + 0.84610827881188, 0.893142277954056, 0.91391302860415, 0.865785215528435, + 0.885462152244991, 0.934683779254245, 0.955454529904339, + 0.905139088961546, 0.924816025678101, 0.976225280554433, + 0.996996031204528, 0.944492962394657, 0.964169899111212, + 1.01776678185462, 1.03853753250472, 0.984125545404853, 0.89548257309753, + 0.939364369541192, 0.962275695627562, 0.917323611465762, + 0.939164649833995, 0.985187021713933, 1.0080983478003, 0.961005688202227, + 0.982846726570459, 1.03100967388667, 1.05392099997304, 1.00468776493869, + 1.02652880330692, 1.07683232605942, 1.09974365214579, 1.04836984167516, + 1.07021088004339, 1.12265497823216, 1.14556630431853, 1.0923612809234, + 0.982182184770596, 1.025, 1.05, 1.00613784781378, 1.03009351085697, + 1.075, 1.1, 1.05404917390015, 1.07800483694334, 1.125, 1.15, + 1.10196049998652, 1.12591616302971, 1.175, 1.2, 1.14987182607289, + 1.17382748911608, 1.225, 1.25, 1.19812246680014, 1.06665683789199, + 1.10831367578398, 1.13534571665676, 1.09267285832838, 1.11868887876477, + 1.16237775752954, 1.18940979840232, 1.14470489920116, 1.17072091963755, + 1.2164418392751, 1.24347388014787, 1.19673694007394, 1.22275296051033, + 1.27050592102065, 1.29753796189344, 1.24876898094672, 1.27478500138311, + 1.32457000276621, 1.35160204363899, 1.30116951993268, 1.14871517020247, + 1.18911666462096, 1.21811951009952, 1.17673261337814, 1.20475005655381, + 1.24712235557808, 1.27612520105664, 1.23276749972948, 1.26078494290515, + 1.3051280465352, 1.33413089201376, 1.28880238608082, 1.31681982925649, + 1.36313373749232, 1.39213658297088, 1.34483727243216, 1.37285471560782, + 1.42113942844944, 1.45014227392799, 1.40126900560224, 1.2281712931866, + 1.26722592175224, 1.29813387106327, 1.25812669058139, 1.28808208797619, + 1.3290418203743, 1.35994976968533, 1.31803748537098, 1.34799288276578, + 1.39085771899636, 1.42176566830739, 1.37794828016057, 1.40790367755537, + 1.45267361761842, 1.48358156692945, 1.43785907495016, 1.46781447234496, + 1.51448951624048, 1.54539746555151, 1.49819416627837, 1.30484521317004, + 1.34246450458783, 1.3752075412851, 1.33667070617419, 1.36849619917833, + 1.40795057798236, 1.44069361467963, 1.40032169218248, 1.43214718518663, + 1.47343665137689, 1.50617968807416, 1.46397267819077, 1.49579817119492, + 1.53892272477142, 1.57166576146868, 1.52762366419907, 1.55944915720322, + 1.60440879816595, 1.63715183486321, 1.59172543529772, 1.37856323906308, + 1.41466197353833, 1.44916592411244, 1.41218673269877, 1.44581022633445, + 1.48366987468654, 1.51817382526065, 1.47943371997014, 1.51305721360582, + 1.55267777583475, 1.58718172640886, 1.54668070724151, 1.58030420087719, + 1.62168567698296, 1.65618962755707, 1.61392769451288, 1.64755118814856, + 1.69069357813117, 1.72519752870528, 1.68165093425313, 1.44915837582686, + 1.48365477811539, 1.51984148002065, 1.48450370206654, 1.51984902830622, + 1.5560281819259, 1.59221488383115, 1.5551943545459, 1.59053968078558, + 1.62840158573641, 1.66458828764166, 1.62588500702526, 1.66123033326494, + 1.70077498954691, 1.73696169145217, 1.69657565950462, 1.7319209857443, + 1.77314839335742, 1.80933509526268, 1.76776695296637, 1.51647070277081, + 1.54928662742623, 1.58707410614394, 1.5534577930823, 1.59044488339378, + 1.62486158486166, 1.66264906357937, 1.62743197370526, 1.66441906401674, + 1.70043654229708, 1.73822402101479, 1.70140615432823, 1.73839324463971, + 1.77601149973251, 1.81379897845022, 1.77538033495119, 1.81236742526268, + 1.85158645716793, 1.88937393588565, 1.84987841095721, 1.58034773582447, + 1.61140884422271, 1.65071149895985, 1.6188928025519, 1.65743786927932, + 1.69001415369699, 1.72931680843413, 1.69598293600675, 1.73452800273418, + 1.76861946317127, 1.80792211790841, 1.7730730694616, 1.81161813618903, + 1.84722477264555, 1.88652742738269, 1.85016320291645, 1.88870826964388, + 1.92583008211983, 1.96513273685697, 1.92779929936347, 1.64064477296295, + 1.66988070170319, 1.71060949930571, 1.68066049913278, 1.72067622530261, + 1.75133829690822, 1.79206709451074, 1.76069195147244, 1.80070767764226, + 1.83279589211325, 1.87352468971577, 1.84072340381209, 1.88073912998192, + 1.91425348731829, 1.95498228492081, 1.92075485615175, 1.96077058232158, + 1.99571108252332, 2.03643988012584, 2.0013531023109, 1.69722522200355, + 1.72456974230392, 1.76663241894548, 1.73862095912559, 1.78001669624763, + 1.80869509558704, 1.8507577722286, 1.82141243336967, 1.86280817049171, + 1.89282044887016, 1.93488312551172, 1.90420390761374, 1.94559964473578, + 1.97694580215328, 2.01900847879483, 1.98699538185782, 2.02839111897986, + 2.06107115543639, 2.10313383207795, 2.07037319677843, 1.74996091003101, + 1.7753520777581, 1.81865334794732, 1.7926428834464, 1.83532485686179, + 1.86195461813654, 1.90525588832577, 1.87800683027718, 1.92068880369257, + 1.94855715851499, 1.99185842870421, 1.96337077710796, 2.00605275052335, + 2.03515969889343, 2.07846096908265, 2.04873472393874, 2.09141669735413, + 2.12176223927188, 2.1650635094611, 2.13470323005287, 1.79873237375035, + 1.82211266974259, 1.86655444217534, 1.84260389506133, 1.88647541637231, + 1.91099621460809, 1.95543798704083, 1.9303469376833, 1.97421845899428, + 1.99987975947358, 2.04432153190632, 2.01808998030527, 2.06196150161625, + 2.08876330433907, 2.13320507677182, 2.10583302292723, 2.14970454423822, + 2.17764684920456, 2.22208862163731, 2.19419747391814, 1.84342913010968, + 1.86474559047676, 1.91022719024449, 1.88839081620991, 1.93335250231015, + 1.95570879001221, 2.00119038977994, 1.97831418841039, 2.02327587451062, + 2.04667198954767, 2.09215358931539, 2.06823756061086, 2.11319924671109, + 2.13763518908312, 2.18311678885084, 2.15816093281133, 2.20312261891157, + 2.22859838861857, 2.2740799883863, 2.24872115477651, 1.88394992657986, + 1.90315426268295, 1.94957265933375, 1.92989992478912, 1.97584992299839, + 1.99599105598456, 2.04240945263536, 2.02179992120765, 2.06774991941692, + 2.08882784928616, 2.13524624593697, 2.11369991762618, 2.15964991583544, + 2.18166464258777, 2.22808303923857, 2.20559991404471, 2.25154991225397, + 2.27450143588938, 2.32091983254018, 2.29815075895416, 1.92020297052401, + 1.93725167836507, 1.9845017193008, 1.96703718931728, 2.01387140811055, + 2.03175176023654, 2.07900180117227, 2.06070562690382, 2.10753984569708, + 2.126251842108, 2.17350188304374, 2.15437406449035, 2.20120828328362, + 2.22075192397947, 2.2680019649152, 2.24804250207689, 2.29487672087016, + 2.31525200585094, 2.36250204678667, 2.3423743124994, 1.9521061371374, + 1.96696059590972, 2.01493524459044, 1.99971848194562, 2.04733082675385, + 2.06290989327117, 2.11088454195189, 2.09494317156208, 2.14255551637031, + 2.15885919063262, 2.20683383931334, 2.19016786117854, 2.23778020598677, + 2.25480848799407, 2.30278313667479, 2.285392550795, 2.33300489560323, + 2.35075778535552, 2.39873243403624, 2.38129163483965, 1.97958715548649, + 1.99221371506326, 2.04080429347944, 2.02786976903494, 2.07615238258339, + 2.08939487189561, 2.13798545031179, 2.12443499613184, 2.17271760968029, + 2.18657602872797, 2.23516660714415, 2.22100022322874, 2.2692828367772, + 2.28375718556032, 2.3323477639765, 2.31756545032565, 2.3658480638741, + 2.38093834239268, 2.42952892080885, 2.41481456572267, 2.0025837722259, + 2.01295382938855, 2.06205026425168, 2.05142727886556, 2.10027078550522, + 2.11114669911482, 2.16024313397795, 2.14911429214487, 2.19795779878453, + 2.20933956884109, 2.25843600370423, 2.24680130542419, 2.29564481206384, + 2.30753243856736, 2.3566288734305, 2.3444883187035, 2.39333182534315, + 2.40572530829363, 2.45482174315677, 2.4428671649279, 2.02104389262223, + 2.02913395585591, 2.07862502794996, 2.07033764610082, 2.11963139957941, + 2.12811610004401, 2.17760717213805, 2.168925153058, 2.21821890653659, + 2.2270982442321, 2.27658931632615, 2.26751266001519, 2.31680641349378, + 2.32608038842019, 2.37557146051424, 2.36610016697237, 2.41539392045096, + 2.42506253260829, 2.47455360470233, 2.46538588429547, 2.03492569856537, + 2.04071744127482, 2.09049103740348, 2.08455803267672, 2.13419036678807, + 2.14026463353213, 2.19003822966079, 2.18382270089942, 2.23345503501077, + 2.23981182578944, 2.28958542191809, 2.28308736912212, 2.33271970323347, + 2.33935901804675, 2.3891326141754, 2.38235203734482, 2.43198437145617, + 2.43890621030406, 2.48867980643271, 2.48231971168322, 2.04419774329999, + 2.04767804532517, 2.09762141228432, 2.0940562248439, 2.1439147063878, + 2.14756477924347, 2.19750814620262, 2.1937731879317, 2.2436316694756, + 2.24745151316177, 2.29739488012092, 2.29349015101951, 2.34334863256341, + 2.34733824708007, 2.39728161403922, 2.39320711410731, 2.44306559565121, + 2.44722498099837, 2.49716834795752, 2.49363028652563, 2.04883902266258, + 2.09881070614216, 2.14878238962173, 2.19875407310131, 2.24872575658088, + 2.29869744006046, 2.34866912354003, 2.39864080701961, 2.44861249049918, + 2.49929198673282, 0.123712981141731, 0.121333885350543, + 0.0606669426752715, 0.0618740136198802, 0, 0, 0.247145712590875, + 0.242392910425666, 0.181863397888104, 0.185481876318005, + 0.370018579510542, 0.362902837596876, 0.302647874011271, + 0.308669562908994, 0.492053235337068, 0.482590673119046, + 0.422746755357961, 0.431158013661373, 0.612973232324513, + 0.60118528554904, 0.541887979334043, 0.552669752837741, + 0.732504647787717, 0.718418019945646, 0.659801652747343, + 0.672929517266555, 0.850376704625297, 0.834023306459426, + 0.776220663202536, 0.791664879901759, 0.966322384716851, + 0.947739261933834, 0.89088128419663, 0.908606866957656, 1.0800790338049, + 1.05930828315481, 1.00352377254432, 1.02349056722105, 1.19138895649127, + 1.1684776304049, 1.11389295677985, 1.13605573216034, 1.3, 1.275, + 1.22173881520245, 1.24604736547215, 1.40566612538455, 1.37863408451177, + 1.32681704225589, 1.35321630072999, 1.50814796488512, 1.47914511940656, + 1.42888960195916, 1.45731976582632, 1.60721336417357, 1.57630541486254, + 1.52772526713455, 1.5581219329295, 1.70263790825774, 1.66989487156048, + 1.62310014321151, 1.65539445270963, 1.79420542985349, 1.75970147927939, + 1.71479817541993, 1.74891697162326, 1.88170849907318, 1.84552179716793, + 1.80261163822366, 1.83847763108502, 1.96494889332107, 1.92716141460336, + 1.88634160588564, 1.9238735473955, 2.04373804633125, 2.00443539159411, + 1.96579840309873, 2.00491127133801, 2.11789747533087, 2.07716867772836, + 2.04080203466123, 2.08140722640334, 2.18725918536107, 2.14519650871951, + 2.11118259322393, 2.15318812464956, 2.25166604983954, 2.20836477965032, + 2.17678064418492, 2.22009135925498, 2.3109721665028, 2.26653039407005, + 2.23744758686019, 2.28196537287487, 2.36504318792175, 2.31956158815402, + 2.29304599111204, 2.33867000096757, 2.41375662584179, 2.36733822919099, + 2.3434499086725, 2.39007678931233, 2.45700212865814, 2.40975208772241, + 2.3885451584567, 2.43606928499938, 2.49468173139769, 2.44670708271697, + 2.42822958521969, 2.47654330023324, 2.52671007764121, 2.47811949922503, + 2.462413290971, 2.51140714835158, 2.55301461288304, 2.5039181780199, + 2.49101883862247, 2.54058185152502, 2.57353574889043, 2.52404467679638, + 2.51398142740814, 2.56400131966729, 2.58822699869002, 2.53845340256137, + 2.53124903967887, 2.58161250015055, 2.59705508187582, 2.54711171491667, + 2.54278255873902, 2.59337549798666, 2.6, 2.55, 2.54855585745833, + 2.59926366620214, -0.0606669426752714, -0.121333885350543, + -0.12371298114173, -0.0618740136198795, -0.181863397888104, + -0.242392910425666, -0.247145712590875, -0.185481876318004, + -0.302647874011271, -0.362902837596877, -0.370018579510541, + -0.308669562908994, -0.422746755357962, -0.482590673119046, + -0.492053235337067, -0.431158013661373, -0.541887979334043, + -0.601185285549039, -0.612973232324511, -0.552669752837739, + -0.659801652747342, -0.718418019945646, -0.732504647787717, + -0.672929517266554, -0.776220663202535, -0.834023306459425, + -0.850376704625296, -0.791664879901758, -0.89088128419663, + -0.947739261933835, -0.966322384716852, -0.908606866957656, + -1.00352377254432, -1.05930828315481, -1.0800790338049, + -1.02349056722105, -1.11389295677985, -1.1684776304049, + -1.19138895649127, -1.13605573216034, -1.22173881520245, -1.275, -1.3, + -1.24604736547215, -1.32681704225589, -1.37863408451177, + -1.40566612538455, -1.35321630072999, -1.42888960195916, + -1.47914511940656, -1.50814796488512, -1.45731976582632, + -1.52772526713455, -1.57630541486254, -1.60721336417357, + -1.5581219329295, -1.62310014321151, -1.66989487156048, + -1.70263790825774, -1.65539445270963, -1.71479817541993, + -1.75970147927939, -1.79420542985349, -1.74891697162326, + -1.80261163822366, -1.84552179716793, -1.88170849907318, + -1.83847763108502, -1.88634160588564, -1.92716141460336, + -1.96494889332107, -1.9238735473955, -1.96579840309873, + -2.00443539159411, -2.04373804633125, -2.00491127133801, + -2.04080203466123, -2.07716867772836, -2.11789747533087, + -2.08140722640334, -2.11118259322393, -2.14519650871951, + -2.18725918536107, -2.15318812464956, -2.17678064418492, + -2.20836477965032, -2.25166604983954, -2.22009135925498, + -2.23744758686019, -2.26653039407005, -2.3109721665028, + -2.28196537287486, -2.29304599111204, -2.31956158815402, + -2.36504318792175, -2.33867000096757, -2.3434499086725, + -2.36733822919099, -2.41375662584179, -2.39007678931233, + -2.3885451584567, -2.4097520877224, -2.45700212865814, -2.43606928499938, + -2.42822958521969, -2.44670708271697, -2.49468173139769, + -2.47654330023324, -2.462413290971, -2.47811949922503, -2.52671007764121, + -2.51140714835158, -2.49101883862247, -2.5039181780199, + -2.55301461288304, -2.54058185152501, -2.51398142740814, + -2.52404467679638, -2.57353574889042, -2.56400131966729, + -2.53124903967887, -2.53845340256137, -2.58822699869002, + -2.58161250015055, -2.54278255873902, -2.54711171491667, + -2.59705508187582, -2.59337549798666, -2.54855585745833, -2.55, -2.6, + -2.59926366620214, -2.54855585745833, -2.54711171491667, + -2.59705508187582, -2.59926366620214, -2.54278255873902, + -2.53845340256137, -2.58822699869002, -2.59337549798666, + -2.53124903967887, -2.52404467679638, -2.57353574889042, + -2.58161250015055, -2.51398142740814, -2.5039181780199, + -2.55301461288304, -2.56400131966729, -2.49101883862247, + -2.47811949922503, -2.52671007764121, -2.54058185152501, -2.462413290971, + -2.44670708271697, -2.49468173139769, -2.51140714835158, + -2.42822958521969, -2.4097520877224, -2.45700212865814, + -2.47654330023324, -2.38854515845669, -2.36733822919099, + -2.41375662584179, -2.43606928499938, -2.3434499086725, + -2.31956158815402, -2.36504318792175, -2.39007678931233, + -2.29304599111204, -2.26653039407005, -2.3109721665028, + -2.33867000096757, -2.23744758686019, -2.20836477965032, + -2.25166604983954, -2.28196537287486, -2.17678064418492, + -2.14519650871951, -2.18725918536107, -2.22009135925498, + -2.11118259322393, -2.07716867772836, -2.11789747533087, + -2.15318812464956, -2.04080203466123, -2.00443539159411, + -2.04373804633125, -2.08140722640334, -1.96579840309873, + -1.92716141460336, -1.96494889332107, -2.00491127133801, + -1.88634160588564, -1.84552179716793, -1.88170849907318, + -1.9238735473955, -1.80261163822366, -1.75970147927939, + -1.79420542985349, -1.83847763108502, -1.71479817541993, + -1.66989487156048, -1.70263790825774, -1.74891697162326, + -1.62310014321151, -1.57630541486254, -1.60721336417357, + -1.65539445270963, -1.52772526713455, -1.47914511940656, + -1.50814796488512, -1.5581219329295, -1.42888960195916, + -1.37863408451177, -1.40566612538455, -1.45731976582632, + -1.32681704225589, -1.275, -1.3, -1.35321630072999, -1.22173881520245, + -1.1684776304049, -1.19138895649127, -1.24604736547215, + -1.11389295677985, -1.05930828315481, -1.08007903380491, + -1.13605573216034, -1.00352377254432, -0.947739261933835, + -0.966322384716852, -1.02349056722105, -0.89088128419663, + -0.834023306459425, -0.850376704625297, -0.908606866957656, + -0.776220663202535, -0.718418019945646, -0.732504647787717, + -0.791664879901759, -0.659801652747343, -0.60118528554904, + -0.612973232324511, -0.672929517266554, -0.541887979334043, + -0.482590673119046, -0.492053235337066, -0.552669752837739, + -0.422746755357961, -0.362902837596877, -0.370018579510541, + -0.431158013661373, -0.302647874011271, -0.242392910425666, + -0.247145712590876, -0.308669562908994, -0.181863397888104, + -0.121333885350543, -0.12371298114173, -0.185481876318004, + -0.0606669426752715, -3.12284933782575e-16, -3.18408167778312e-16, + -0.0618740136198796, 0.0606669426752715, 0.121333885350543, + 0.12371298114173, 0.0618740136198796, 0.181863397888104, + 0.242392910425665, 0.247145712590874, 0.185481876318004, + 0.302647874011271, 0.362902837596877, 0.370018579510541, + 0.308669562908993, 0.422746755357961, 0.482590673119046, + 0.492053235337067, 0.431158013661373, 0.541887979334043, + 0.601185285549039, 0.612973232324511, 0.552669752837739, + 0.659801652747343, 0.718418019945646, 0.732504647787718, + 0.672929517266554, 0.776220663202536, 0.834023306459425, + 0.850376704625295, 0.791664879901758, 0.89088128419663, + 0.947739261933835, 0.966322384716851, 0.908606866957655, + 1.00352377254432, 1.05930828315481, 1.0800790338049, 1.02349056722105, + 1.11389295677985, 1.1684776304049, 1.19138895649127, 1.13605573216034, + 1.22173881520245, 1.275, 1.3, 1.24604736547215, 1.32681704225589, + 1.37863408451177, 1.40566612538455, 1.35321630072999, 1.42888960195916, + 1.47914511940656, 1.50814796488512, 1.45731976582632, 1.52772526713455, + 1.57630541486254, 1.60721336417357, 1.5581219329295, 1.62310014321151, + 1.66989487156048, 1.70263790825774, 1.65539445270963, 1.71479817541993, + 1.75970147927939, 1.79420542985349, 1.74891697162326, 1.80261163822366, + 1.84552179716793, 1.88170849907318, 1.83847763108502, 1.88634160588564, + 1.92716141460336, 1.96494889332107, 1.9238735473955, 1.96579840309873, + 2.00443539159411, 2.04373804633125, 2.00491127133801, 2.04080203466123, + 2.07716867772836, 2.11789747533087, 2.08140722640334, 2.11118259322393, + 2.14519650871951, 2.18725918536107, 2.15318812464956, 2.17678064418492, + 2.20836477965032, 2.25166604983954, 2.22009135925499, 2.23744758686019, + 2.26653039407005, 2.3109721665028, 2.28196537287487, 2.29304599111204, + 2.31956158815402, 2.36504318792175, 2.33867000096757, 2.3434499086725, + 2.36733822919099, 2.41375662584179, 2.39007678931233, 2.3885451584567, + 2.4097520877224, 2.45700212865814, 2.43606928499938, 2.42822958521969, + 2.44670708271697, 2.49468173139769, 2.47654330023324, 2.462413290971, + 2.47811949922503, 2.52671007764121, 2.51140714835158, 2.49101883862247, + 2.5039181780199, 2.55301461288304, 2.54058185152501, 2.51398142740814, + 2.52404467679638, 2.57353574889042, 2.56400131966729, 2.53124903967887, + 2.53845340256137, 2.58822699869002, 2.58161250015055, 2.54278255873902, + 2.54711171491667, 2.59705508187582, 2.59337549798666, 2.54855585745833, + 2.59926366620214, 0.151515151515151, 0.150935939632372, + 0.00128867688689303, 0, -0.151515151515151, -0.148358585858586, + -0.14520202020202, 0.00257735377378607, 0.150356727749592, + 0.149777515866813, 0.0038660306606791, -0.142045454545454, + -0.138888888888889, 0.00515470754757213, 0.149198303984033, + 0.148619092101253, 0.00644338443446517, -0.135732323232323, + -0.132575757575757, 0.0077320613213582, 0.148039880218474, + 0.147460668335694, 0.00902073820825124, -0.129419191919192, + -0.126262626262626, 0.0103094150951443, 0.146881456452915, + 0.146302244570135, 0.0115980919820373, -0.12310606060606, + -0.119949494949495, 0.0128867688689304, 0.145723032687356, + 0.145143820804576, 0.0141754457558234, -0.116792929292929, + -0.113636363636364, 0.0154641226427164, 0.144564608921796, + 0.143985397039017, 0.0167527995296094, -0.110479797979798, + -0.107323232323232, 0.0180414764165025, 0.143406185156237, + 0.142826973273458, 0.0193301533033955, -0.104166666666667, + -0.101010101010101, 0.0206188301902886, 0.142247761390678, + 0.141668549507898, 0.0219075070771816, -0.0978535353535353, + -0.0946969696969696, 0.0231961839640746, 0.141089337625119, + 0.140510125742339, 0.0244848608509676, -0.091540404040404, + -0.0883838383838383, 0.0257735377378607, 0.13993091385956, + 0.13935170197678, 0.0270622146247537, -0.0852272727272727, + -0.082070707070707, 0.0283508915116468, 0.138772490094001, + 0.138193278211221, 0.0296395683985398, -0.0789141414141413, + -0.0757575757575757, 0.0309282452854328, 0.137614066328441, + 0.137034854445662, 0.0322169221723259, -0.07260101010101, + -0.0694444444444444, 0.0335055990592189, 0.136455642562882, + 0.135876430680103, 0.0347942759461119, -0.0662878787878787, + -0.0631313131313131, 0.036082952833005, 0.135297218797323, + 0.134718006914543, 0.037371629719898, -0.0599747474747474, + -0.0568181818181818, 0.038660306606791, 0.134138795031764, + 0.133559583148984, 0.0399489834936841, -0.0536616161616161, + -0.0505050505050505, 0.0412376603805771, 0.132980371266205, + 0.132401159383425, 0.0425263372674701, -0.0473484848484848, + -0.0441919191919192, 0.0438150141543632, 0.131821947500645, + 0.131242735617866, 0.0451036910412562, -0.0410353535353535, + -0.0378787878787878, 0.0463923679281492, 0.130663523735086, + 0.130084311852307, 0.0476810448150423, -0.0347222222222222, + -0.0315656565656565, 0.0489697217019353, 0.129505099969527, + 0.128925888086748, 0.0502583985888283, -0.0284090909090909, + -0.0252525252525252, 0.0515470754757214, 0.128346676203968, + 0.127767464321188, 0.0528357523626144, -0.0220959595959596, + -0.0189393939393939, 0.0541244292495074, 0.127188252438409, + 0.126609040555629, 0.0554131061364005, -0.0157828282828283, + -0.0126262626262626, 0.0567017830232935, 0.12602982867285, + 0.12545061679007, 0.0579904599101865, -0.00946969696969696, + -0.00631313131313131, 0.0592791367970796, 0.12487140490729, + 0.124292193024511, 0.0605678136839726, -0.00315656565656565, + 0.454545454545455, 0.450224626588068, 0.30058028311022, + 0.303030303030303, 0.298130263190137, 0.445903798630681, + 0.441582970673294, 0.295680243270053, 0.29323022334997, + 0.437262142715907, 0.43294131475852, 0.290780203429886, + 0.288330183509803, 0.428620486801132, 0.424299658843745, + 0.28588016358972, 0.283430143669637, 0.419978830886358, + 0.415658002928971, 0.280980123749553, 0.27853010382947, + 0.411337174971584, 0.407016347014197, 0.276080083909386, + 0.273630063989303, 0.40269551905681, 0.398374691099423, 0.27118004406922, + 0.268730024149136, 0.394053863142036, 0.389733035184649, + 0.266280004229053, 0.26382998430897, 0.385412207227262, + 0.381091379269874, 0.261379964388886, 0.258929944468803, + 0.376770551312487, 0.3724497233551, 0.25647992454872, 0.254029904628636, + 0.368128895397713, 0.363808067440326, 0.251579884708553, + 0.24912986478847, 0.359487239482939, 0.355166411525552, + 0.246679844868386, 0.244229824948303, 0.350845583568165, + 0.346524755610778, 0.24177980502822, 0.239329785108136, + 0.342203927653391, 0.337883099696004, 0.236879765188053, + 0.23442974526797, 0.333562271738616, 0.329241443781229, + 0.231979725347886, 0.229529705427803, 0.324920615823842, + 0.320599787866455, 0.22707968550772, 0.224629665587636, + 0.316278959909068, 0.311958131951681, 0.222179645667553, + 0.21972962574747, 0.307637303994294, 0.303316476036907, + 0.217279605827386, 0.214829585907303, 0.29899564807952, + 0.294674820122133, 0.21237956598722, 0.209929546067136, + 0.290353992164746, 0.286033164207358, 0.207479526147053, + 0.20502950622697, 0.281712336249971, 0.277391508292584, + 0.202579486306886, 0.200129466386803, 0.273070680335197, + 0.26874985237781, 0.19767944646672, 0.195229426546636, 0.264429024420423, + 0.260108196463036, 0.192779406626553, 0.19032938670647, + 0.255787368505649, 0.251466540548262, 0.187879366786386, + 0.757575757575758, 0.749501649699399, 0.599863138143734, + 0.606060606060606, 0.593665670226861, 0.74142754182304, + 0.733353433946682, 0.587468202309988, 0.581270734393115, + 0.725279326070323, 0.717205218193964, 0.575073266476242, + 0.568875798559369, 0.709131110317606, 0.701057002441247, + 0.562678330642496, 0.556480862725623, 0.692982894564888, + 0.68490878668853, 0.550283394808751, 0.544085926891878, + 0.676834678812171, 0.668760570935812, 0.537888458975005, + 0.531690991058132, 0.660686463059454, 0.652612355183095, + 0.525493523141259, 0.519296055224386, 0.644538247306736, + 0.636464139430378, 0.513098587307513, 0.50690111939064, + 0.628390031554019, 0.620315923677661, 0.500703651473767, + 0.494506183556895, 0.612241815801302, 0.604167707924943, + 0.488308715640022, 0.482111247723149, 0.596093600048584, + 0.588019492172226, 0.475913779806276, 0.469716311889403, + 0.579945384295867, 0.571871276419508, 0.46351884397253, + 0.457321376055657, 0.56379716854315, 0.555723060666791, + 0.451123908138784, 0.444926440221912, 0.547648952790432, + 0.539574844914074, 0.438728972305039, 0.432531504388166, + 0.531500737037715, 0.523426629161356, 0.426334036471293, + 0.42013656855442, 0.515352521284998, 0.507278413408639, + 0.413939100637547, 0.407741632720674, 0.49920430553228, + 0.491130197655922, 0.401544164803801, 0.395346696886928, + 0.483056089779563, 0.474981981903204, 0.389149228970056, + 0.382951761053183, 0.466907874026846, 0.458833766150487, + 0.37675429313631, 0.370556825219437, 0.450759658274128, 0.44268555039777, + 0.364359357302564, 0.358161889385691, 0.434611442521411, + 0.426537334645052, 0.351964421468818, 0.345766953551945, + 0.418463226768694, 0.410389118892335, 0.339569485635073, 0.3333720177182, + 0.402315011015976, 0.394240903139618, 0.327174549801327, + 0.320977081884454, 0.386166795263259, 0.3780926873869, 0.314779613967581, + 1.06060606060606, 1.04876121007962, 0.899131429889511, 0.909090909090909, + 0.889171950688113, 1.03691635955319, 1.02507150902675, 0.879212471486715, + 0.869252992285317, 1.01322665850031, 1.00138180797387, 0.859293513083919, + 0.849334033882521, 0.989536957447436, 0.977692106920999, + 0.839374554681123, 0.829415075479725, 0.965847256394562, + 0.954002405868124, 0.819455596278327, 0.809496117076929, + 0.942157555341687, 0.93031270481525, 0.799536637875531, + 0.789577158674133, 0.918467854288812, 0.906623003762375, + 0.779617679472735, 0.769658200271337, 0.894778153235938, 0.8829333027095, + 0.759698721069939, 0.749739241868541, 0.871088452183063, + 0.859243601656626, 0.739779762667143, 0.729820283465745, + 0.847398751130188, 0.835553900603751, 0.719860804264347, + 0.709901325062949, 0.823709050077314, 0.811864199550876, + 0.699941845861551, 0.689982366660153, 0.800019349024439, + 0.788174498498001, 0.680022887458755, 0.670063408257357, + 0.776329647971564, 0.764484797445127, 0.660103929055959, + 0.650144449854561, 0.752639946918689, 0.740795096392252, + 0.640184970653163, 0.630225491451765, 0.728950245865815, + 0.717105395339377, 0.620266012250367, 0.610306533048969, + 0.70526054481294, 0.693415694286503, 0.600347053847571, + 0.590387574646173, 0.681570843760065, 0.669725993233628, + 0.580428095444775, 0.570468616243377, 0.657881142707191, + 0.646036292180753, 0.560509137041979, 0.550549657840581, + 0.634191441654316, 0.622346591127879, 0.540590178639183, + 0.530630699437785, 0.610501740601441, 0.598656890075004, + 0.520671220236387, 0.510711741034989, 0.586812039548567, + 0.574967189022129, 0.500752261833591, 0.490792782632193, + 0.563122338495692, 0.551277487969254, 0.480833303430795, + 0.470873824229397, 0.539432637442817, 0.52758778691638, + 0.460914345027999, 0.450954865826601, 0.515742936389942, + 0.503898085863505, 0.440995386625203, 1.36363636363636, 1.3479975484007, + 1.19837937924016, 1.21212121212121, 1.18463754635911, 1.33235873316504, + 1.31671991792937, 1.17089571347806, 1.15715388059701, 1.30108110269371, + 1.28544228745805, 1.14341204771596, 1.12967021483491, 1.26980347222238, + 1.25416465698672, 1.11592838195386, 1.10218654907281, 1.23852584175106, + 1.22288702651539, 1.08844471619176, 1.07470288331071, 1.20724821127973, + 1.19160939604406, 1.06096105042966, 1.04721921754861, 1.1759705808084, + 1.16033176557274, 1.03347738466756, 1.01973555178651, 1.14469295033707, + 1.12905413510141, 1.00599371890546, 0.992251886024405, 1.11341531986575, + 1.09777650463008, 0.978510053143354, 0.964768220262304, 1.08213768939442, + 1.06649887415876, 0.951026387381254, 0.937284554500203, 1.05086005892309, + 1.03522124368743, 0.923542721619153, 0.909800888738102, 1.01958242845177, + 1.0039436132161, 0.896059055857052, 0.882317222976001, 0.988304797980438, + 0.972665982744775, 0.868575390094951, 0.8548335572139, 0.957027167509111, + 0.941388352273448, 0.84109172433285, 0.827349891451799, + 0.925749537037784, 0.91011072180212, 0.813608058570749, + 0.799866225689698, 0.894471906566457, 0.878833091330793, + 0.786124392808648, 0.772382559927598, 0.86319427609513, + 0.847555460859466, 0.758640727046547, 0.744898894165497, + 0.831916645623803, 0.816277830388139, 0.731157061284446, + 0.717415228403396, 0.800639015152475, 0.785000199916812, + 0.703673395522345, 0.689931562641295, 0.769361384681148, + 0.753722569445485, 0.676189729760244, 0.662447896879194, + 0.738083754209821, 0.722444938974158, 0.648706063998143, + 0.634964231117093, 0.706806123738494, 0.69116730850283, + 0.621222398236042, 0.607480565354992, 0.675528493267167, + 0.659889678031503, 0.593738732473941, 0.579996899592891, + 0.64425086279584, 0.628612047560176, 0.566255066711841, 1.66666666666667, + 1.64720495794002, 1.49760125317036, 1.51515151515152, 1.48005099118921, + 1.62774324921338, 1.60828154048673, 1.46250072920805, 1.4449504672269, + 1.58881983176009, 1.56935812303344, 1.42740020524574, 1.40984994326459, + 1.5498964143068, 1.53043470558015, 1.39229968128344, 1.37474941930228, + 1.51097299685351, 1.49151128812686, 1.35719915732113, 1.33964889533997, + 1.47204957940022, 1.45258787067357, 1.32209863335882, 1.30454837137767, + 1.43312616194693, 1.41366445322028, 1.28699810939651, 1.26944784741536, + 1.39420274449364, 1.374741035767, 1.2518975854342, 1.23434732345305, + 1.35527932704035, 1.33581761831371, 1.21679706147189, 1.19924679949074, + 1.31635590958706, 1.29689420086042, 1.18169653750959, 1.16414627552843, + 1.27743249213377, 1.25797078340713, 1.14659601354728, 1.12904575156612, + 1.23850907468048, 1.21904736595384, 1.11149548958497, 1.09394522760382, + 1.19958565722719, 1.18012394850055, 1.07639496562266, 1.05884470364151, + 1.1606622397739, 1.14120053104726, 1.04129444166035, 1.0237441796792, + 1.12173882232061, 1.10227711359397, 1.00619391769804, 0.98864365571689, + 1.08281540486732, 1.06335369614068, 0.971093393735736, 0.953543131754582, + 1.04389198741403, 1.02443027868739, 0.935992869773427, 0.918442607792273, + 1.00496856996074, 0.985506861234099, 0.900892345811119, + 0.883342083829965, 0.966045152507455, 0.94658344378081, + 0.865791821848811, 0.848241559867657, 0.927121735054165, + 0.90766002632752, 0.830691297886503, 0.813141035905348, + 0.888198317600876, 0.868736608874231, 0.795590773924194, + 0.77804051194304, 0.849274900147586, 0.829813191420941, + 0.760490249961886, 0.742939987980732, 0.810351482694296, + 0.790889773967652, 0.725389725999578, 0.707839464018423, + 0.771428065241007, 0.751966356514362, 0.690289202037269, + 1.96969696969697, 1.94637779750798, 1.796791377724, 1.81818181818182, + 1.77540093726618, 1.92305862531898, 1.89973945312999, 1.75401049680836, + 1.73262005635054, 1.876420280941, 1.853101108752, 1.71122961589272, + 1.6898391754349, 1.82978193656301, 1.80646276437402, 1.66844873497709, + 1.64705829451927, 1.78314359218502, 1.75982441999603, 1.62566785406145, + 1.60427741360363, 1.73650524780704, 1.71318607561804, 1.58288697314581, + 1.56149653268799, 1.68986690342905, 1.66654773124006, 1.54010609223017, + 1.51871565177235, 1.64322855905107, 1.61990938686207, 1.49732521131453, + 1.47593477085671, 1.59659021467308, 1.57327104248409, 1.4545443303989, + 1.43315388994108, 1.54995187029509, 1.5266326981061, 1.41176344948326, + 1.39037300902544, 1.50331352591711, 1.47999435372811, 1.36898256856762, + 1.3475921281098, 1.45667518153912, 1.43335600935013, 1.32620168765198, + 1.30481124719416, 1.41003683716113, 1.38671766497214, 1.28342080673634, + 1.26203036627852, 1.36339849278315, 1.34007932059415, 1.24063992582071, + 1.21924948536289, 1.31676014840516, 1.29344097621617, 1.19785904490507, + 1.17646860444725, 1.27012180402717, 1.24680263183818, 1.15507816398943, + 1.13368772353161, 1.22348345964919, 1.20016428746019, 1.11229728307379, + 1.09090684261597, 1.1768451152712, 1.15352594308221, 1.06951640215815, + 1.04812596170034, 1.13020677089322, 1.10688759870422, 1.02673552124252, + 1.0053450807847, 1.08356842651523, 1.06024925432624, 0.983954640326878, + 0.962564199869059, 1.03693008213724, 1.01361090994825, 0.94117375941124, + 0.919783318953421, 0.990291737759256, 0.966972565570263, + 0.898392878495602, 0.877002438037783, 0.94365339338127, + 0.920334221192277, 0.855611997579964, 0.834221557122145, + 0.897015049003283, 0.87369587681429, 0.812831116664326, 2.27272727272727, + 2.24551050422706, 2.09594415086752, 2.12121212121212, 2.07067618052291, + 2.21829373572684, 2.19107696722662, 2.04540821017831, 2.0201402398337, + 2.1638601987264, 2.13664343022619, 1.9948722694891, 1.96960429914449, + 2.10942666172597, 2.08220989322575, 1.94433632879989, 1.91906835845528, + 2.05499312472554, 2.02777635622532, 1.89380038811068, 1.86853241776607, + 2.0005595877251, 1.97334281922488, 1.84326444742146, 1.81799647707686, + 1.94612605072467, 1.91890928222445, 1.79272850673225, 1.76746053638765, + 1.89169251372423, 1.86447574522402, 1.74219256604304, 1.71692459569844, + 1.8372589767238, 1.81004220822358, 1.69165662535383, 1.66638865500923, + 1.78282543972336, 1.75560867122315, 1.64112068466462, 1.61585271432002, + 1.72839190272293, 1.70117513422271, 1.59058474397541, 1.56531677363081, + 1.6739583657225, 1.64674159722228, 1.5400488032862, 1.5147808329416, + 1.61952482872206, 1.59230806022184, 1.48951286259699, 1.46424489225239, + 1.56509129172163, 1.53787452322141, 1.43897692190778, 1.41370895156318, + 1.51065775472119, 1.48344098622098, 1.38844098121857, 1.36317301087397, + 1.45622421772076, 1.42900744922054, 1.33790504052936, 1.31263707018476, + 1.40179068072033, 1.37457391222011, 1.28736909984015, 1.26210112949555, + 1.34735714371989, 1.32014037521967, 1.23683315915094, 1.21156518880634, + 1.29292360671946, 1.26570683821924, 1.18629721846173, 1.16102924811713, + 1.23849006971902, 1.21127330121881, 1.13576127777252, 1.11049330742792, + 1.18405653271859, 1.15683976421837, 1.08522533708331, 1.0599573667387, + 1.12962299571815, 1.10240622721794, 1.0346893963941, 1.00942142604949, + 1.07518945871772, 1.0479726902175, 0.984153455704889, 0.958885485360284, + 1.02075592171729, 0.993539153217068, 0.933617515015679, 2.57575757575758, + 2.54459760613356, 2.39505405518031, 2.42424242424242, 2.36586568611819, + 2.51343763650955, 2.48227766688553, 2.33667731705608, 2.30748894799396, + 2.45111769726152, 2.41995772763751, 2.27830057893185, 2.24911220986973, + 2.38879775801349, 2.35763778838948, 2.21992384080762, 2.1907354717455, + 2.32647781876546, 2.29531784914145, 2.16154710268338, 2.13235873362127, + 2.26415787951744, 2.23299790989342, 2.10317036455915, 2.07398199549704, + 2.20183794026941, 2.17067797064539, 2.04479362643492, 2.01560525737281, + 2.13951800102138, 2.10835803139737, 1.98641688831069, 1.95722851924858, + 2.07719806177335, 2.04603809214934, 1.92804015018646, 1.89885178112434, + 2.01487812252532, 1.98371815290131, 1.86966341206223, 1.84047504300011, + 1.9525581832773, 1.92139821365328, 1.811286673938, 1.78209830487588, + 1.89023824402927, 1.85907827440525, 1.75290993581377, 1.72372156675165, + 1.82791830478124, 1.79675833515723, 1.69453319768954, 1.66534482862742, + 1.76559836553321, 1.7344383959092, 1.6361564595653, 1.60696809050319, + 1.70327842628518, 1.67211845666117, 1.57777972144107, 1.54859135237896, + 1.64095848703716, 1.60979851741314, 1.51940298331684, 1.49021461425473, + 1.57863854778913, 1.54747857816511, 1.46102624519261, 1.4318378761305, + 1.5163186085411, 1.48515863891709, 1.40264950706838, 1.37346113800626, + 1.45399866929307, 1.42283869966906, 1.34427276894415, 1.31508439988203, + 1.39167873004504, 1.36051876042103, 1.28589603081992, 1.2567076617578, + 1.32935879079702, 1.298198821173, 1.22751929269569, 1.19833092363357, + 1.26703885154899, 1.23587888192497, 1.16914255457146, 1.13995418550934, + 1.20471891230096, 1.17355894267695, 1.11076581644722, 1.08157744738511, + 1.14239897305293, 1.11123900342892, 1.05238907832299, 2.87878787878788, + 2.84363373457337, 2.69411567035346, 2.72727272727273, 2.6609586134342, + 2.80847959035885, 2.77332544614434, 2.62780155651494, 2.59464449959567, + 2.73817130192983, 2.70301715771532, 2.56148744267641, 2.52833038575715, + 2.6678630135008, 2.63270886928629, 2.49517332883788, 2.46201627191862, + 2.59755472507178, 2.56240058085726, 2.42885921499936, 2.39570215808009, + 2.52724643664275, 2.49209229242824, 2.36254510116083, 2.32938804424157, + 2.45693814821373, 2.42178400399921, 2.2962309873223, 2.26307393040304, + 2.3866298597847, 2.35147571557019, 2.22991687348378, 2.19675981656451, + 2.31632157135568, 2.28116742714116, 2.16360275964525, 2.13044570272599, + 2.24601328292665, 2.21085913871214, 2.09728864580672, 2.06413158888746, + 2.17570499449762, 2.14055085028311, 2.0309745319682, 1.99781747504893, + 2.1053967060686, 2.07024256185409, 1.96466041812967, 1.93150336121041, + 2.03508841763957, 1.99993427342506, 1.89834630429114, 1.86518924737188, + 1.96478012921055, 1.92962598499604, 1.83203219045262, 1.79887513353335, + 1.89447184078152, 1.85931769656701, 1.76571807661409, 1.73256101969483, + 1.8241635523525, 1.78900940813798, 1.69940396277556, 1.6662469058563, + 1.75385526392347, 1.71870111970896, 1.63308984893704, 1.59993279201777, + 1.68354697549445, 1.64839283127993, 1.56677573509851, 1.53361867817925, + 1.61323868706542, 1.57808454285091, 1.50046162125998, 1.46730456434072, + 1.5429303986364, 1.50777625442188, 1.43414750742146, 1.40099045050219, + 1.47262211020737, 1.43746796599286, 1.36783339358293, 1.33467633666367, + 1.40231382177834, 1.36715967756383, 1.3015192797444, 1.26836222282514, + 1.33200553334932, 1.29685138913481, 1.23520516590588, 1.20204810898661, + 1.26169724492029, 1.22654310070578, 1.16889105206735, 3.18181818181818, + 3.14261363636364, 2.9931236854685, 3.03030303030303, 2.95594434063397, + 3.10340909090909, 3.06420454545455, 2.91876499579944, 2.88158565096491, + 3.025, 2.98579545454545, 2.84440630613038, 2.80722696129586, + 2.94659090909091, 2.90738636363636, 2.77004761646133, 2.7328682716268, + 2.86818181818182, 2.82897727272727, 2.69568892679227, 2.65850958195774, + 2.78977272727273, 2.75056818181818, 2.62133023712321, 2.58415089228868, + 2.71136363636364, 2.67215909090909, 2.54697154745415, 2.50979220261962, + 2.63295454545455, 2.59375, 2.47261285778509, 2.43543351295056, + 2.55454545454545, 2.51534090909091, 2.39825416811604, 2.36107482328151, + 2.47613636363636, 2.43693181818182, 2.32389547844698, 2.28671613361245, + 2.39772727272727, 2.35852272727273, 2.24953678877792, 2.21235744394339, + 2.31931818181818, 2.28011363636364, 2.17517809910886, 2.13799875427433, + 2.24090909090909, 2.20170454545454, 2.1008194094398, 2.06364006460527, + 2.1625, 2.12329545454545, 2.02646071977074, 1.98928137493622, + 2.08409090909091, 2.04488636363636, 1.95210203010169, 1.91492268526716, + 2.00568181818182, 1.96647727272727, 1.87774334043263, 1.8405639955981, + 1.92727272727273, 1.88806818181818, 1.80338465076357, 1.76620530592904, + 1.84886363636364, 1.80965909090909, 1.72902596109451, 1.69184661625998, + 1.77045454545454, 1.73125, 1.65466727142545, 1.61748792659092, + 1.69204545454545, 1.65284090909091, 1.5803085817564, 1.54312923692187, + 1.61363636363636, 1.57443181818182, 1.50594989208734, 1.46877054725281, + 1.53522727272727, 1.49602272727273, 1.43159120241828, 1.39441185758375, + 1.45681818181818, 1.41761363636364, 1.35723251274922, 1.32005316791469, + 1.37840909090909, 1.33920454545454, 1.28287382308016, 3.48484848484848, + 3.44153218569299, 3.29207291102831, 3.33333333333333, 3.25081248872329, + 3.39821588653749, 3.35489958738199, 3.20955206641827, 3.16829164411324, + 3.31158328822649, 3.26826698907099, 3.12703122180822, 3.0857707995032, + 3.22495068991549, 3.18163439075999, 3.04451037719818, 3.00324995489316, + 3.1383180916045, 3.095001792449, 2.96198953258813, 2.92072911028311, + 3.0516854932935, 3.008369194138, 2.87946868797809, 2.83820826567307, + 2.9650528949825, 2.921736595827, 2.79694784336805, 2.75568742106303, + 2.8784202966715, 2.83510399751601, 2.714426998758, 2.67316657645298, + 2.79178769836051, 2.74847139920501, 2.63190615414796, 2.59064573184294, + 2.70515510004951, 2.66183880089401, 2.54938530953791, 2.50812488723289, + 2.61852250173851, 2.57520620258301, 2.46686446492787, 2.42560404262285, + 2.53188990342752, 2.48857360427202, 2.38434362031783, 2.3430831980128, + 2.44525730511652, 2.40194100596102, 2.30182277570778, 2.26056235340276, + 2.35862470680552, 2.31530840765002, 2.21930193109774, 2.17804150879272, + 2.27199210849452, 2.22867580933903, 2.13678108648769, 2.09552066418267, + 2.18535951018353, 2.14204321102803, 2.05426024187765, 2.01299981957263, + 2.09872691187253, 2.05541061271703, 1.97173939726761, 1.93047897496258, + 2.01209431356153, 1.96877801440603, 1.88921855265756, 1.84795813035254, + 1.92546171525054, 1.88214541609504, 1.80669770804752, 1.7654372857425, + 1.83882911693954, 1.79551281778404, 1.72417686343747, 1.68291644113245, + 1.75219651862854, 1.70888021947304, 1.64165601882743, 1.60039559652241, + 1.66556392031754, 1.62224762116205, 1.55913517421739, 1.51787475191236, + 1.57893132200655, 1.53561502285105, 1.47661432960734, 1.43535390730232, + 1.49229872369555, 1.44898242454005, 1.3940934849973, 3.78787878787879, + 3.74038439573309, 3.59095829071304, 3.63636363636364, 3.54555294506244, + 3.69289000358739, 3.64539561144168, 3.50014759941184, 3.45474225376124, + 3.59790121929598, 3.55040682715028, 3.40933690811064, 3.36393156246004, + 3.50291243500458, 3.45541804285888, 3.31852621680944, 3.27312087115884, + 3.40792365071318, 3.36042925856747, 3.22771552550824, 3.18231017985764, + 3.31293486642177, 3.26544047427607, 3.13690483420704, 3.09149948855644, + 3.21794608213037, 3.17045168998467, 3.04609414290584, 3.00068879725524, + 3.12295729783897, 3.07546290569327, 2.95528345160464, 2.90987810595404, + 3.02796851354756, 2.98047412140186, 2.86447276030344, 2.81906741465284, + 2.93297972925616, 2.88548533711046, 2.77366206900224, 2.72825672335164, + 2.83799094496476, 2.79049655281906, 2.68285137770104, 2.63744603205044, + 2.74300216067336, 2.69550776852765, 2.59204068639984, 2.54663534074924, + 2.64801337638195, 2.60051898423625, 2.50122999509864, 2.45582464944804, + 2.55302459209055, 2.50553019994485, 2.41041930379744, 2.36501395814684, + 2.45803580779915, 2.41054141565344, 2.31960861249624, 2.27420326684564, + 2.36304702350774, 2.31555263136204, 2.22879792119504, 2.18339257554444, + 2.26805823921634, 2.22056384707064, 2.13798722989384, 2.09258188424324, + 2.17306945492494, 2.12557506277924, 2.04717653859263, 2.00177119294203, + 2.07808067063353, 2.03058627848783, 1.95636584729144, 1.91096050164083, + 1.98309188634213, 1.93559749419643, 1.86555515599024, 1.82014981033963, + 1.88810310205073, 1.84060870990503, 1.77474446468903, 1.72933911903843, + 1.79311431775932, 1.74561992561362, 1.68393377338783, 1.63852842773723, + 1.69812553346792, 1.65063114132222, 1.59312308208663, 1.54771773643603, + 1.60313674917652, 1.55564235703082, 1.50231239078543, 4.09090909090909, + 4.03916542993544, 3.88977491283426, 3.93939393939394, 3.84015588627458, + 3.98742176896178, 3.93567810798812, 3.7905368597149, 3.74091783315522, + 3.88393444701446, 3.83219078604081, 3.69129880659554, 3.64167978003587, + 3.78044712506715, 3.7287034640935, 3.59206075347619, 3.54244172691651, + 3.67695980311984, 3.62521614214618, 3.49282270035683, 3.44320367379715, + 3.57347248117253, 3.52172882019887, 3.39358464723747, 3.34396562067779, + 3.46998515922521, 3.41824149825156, 3.29434659411811, 3.24472756755843, + 3.3664978372779, 3.31475417630424, 3.19510854099875, 3.14548951443907, + 3.26301051533059, 3.21126685435693, 3.0958704878794, 3.04625146131972, + 3.15952319338327, 3.10777953240962, 2.99663243476004, 2.94701340820036, + 3.05603587143596, 3.0042922104623, 2.89739438164068, 2.847775355081, + 2.95254854948865, 2.90080488851499, 2.79815632852132, 2.74853730196164, + 2.84906122754133, 2.79731756656768, 2.69891827540196, 2.64929924884228, + 2.74557390559402, 2.69383024462036, 2.59968022228261, 2.55006119572293, + 2.64208658364671, 2.59034292267305, 2.50044216916325, 2.45082314260357, + 2.53859926169939, 2.48685560072574, 2.40120411604389, 2.35158508948421, + 2.43511193975208, 2.38336827877842, 2.30196606292453, 2.25234703636485, + 2.33162461780477, 2.27988095683111, 2.20272800980517, 2.15310898324549, + 2.22813729585745, 2.1763936348838, 2.10348995668581, 2.05387093012614, + 2.12464997391014, 2.07290631293648, 2.00425190356646, 1.95463287700678, + 2.02116265196283, 1.96941899098917, 1.9050138504471, 1.85539482388742, + 1.91767533001551, 1.86593166904186, 1.80577579732774, 1.75615677076806, + 1.8141880080682, 1.76244434709454, 1.70653774420838, 1.6569187176487, + 1.71070068612089, 1.65895702514723, 1.60729969108902, 4.39393939393939, + 4.33787061298769, 4.18851802146156, 4.24242424242424, 4.13461180049889, + 4.28180183203599, 4.22573305108429, 4.08070557953621, 4.02679935857353, + 4.16966427013259, 4.11359548918089, 3.97289313761085, 3.91898691664817, + 4.05752670822919, 4.00145792727749, 3.86508069568549, 3.81117447472281, + 3.94538914632579, 3.88932036537408, 3.75726825376013, 3.70336203279745, + 3.83325158442238, 3.77718280347068, 3.64945581183478, 3.5955495908721, + 3.72111402251898, 3.66504524156728, 3.54164336990942, 3.48773714894674, + 3.60897646061558, 3.55290767966388, 3.43383092798406, 3.37992470702138, + 3.49683889871218, 3.44077011776048, 3.3260184860587, 3.27211226509602, + 3.38470133680877, 3.32863255585707, 3.21820604413334, 3.16429982317067, + 3.27256377490537, 3.21649499395367, 3.11039360220799, 3.05648738124531, + 3.16042621300197, 3.10435743205027, 3.00258116028263, 2.94867493931995, + 3.04828865109857, 2.99221987014687, 2.89476871835727, 2.84086249739459, + 2.93615108919517, 2.88008230824346, 2.78695627643191, 2.73305005546923, + 2.82401352729176, 2.76794474634006, 2.67914383450656, 2.62523761354388, + 2.71187596538836, 2.65580718443666, 2.5713313925812, 2.51742517161852, + 2.59973840348496, 2.54366962253326, 2.46351895065584, 2.40961272969316, + 2.48760084158156, 2.43153206062986, 2.35570650873048, 2.3018002877678, + 2.37546327967816, 2.31939449872645, 2.24789406680513, 2.19398784584245, + 2.26332571777475, 2.20725693682305, 2.14008162487977, 2.08617540391709, + 2.15118815587135, 2.09511937491965, 2.03226918295441, 1.97836296199173, + 2.03905059396795, 1.98298181301625, 1.92445674102905, 1.87055052006637, + 1.92691303206455, 1.87084425111285, 1.81664429910369, 1.76273807814102, + 1.81477547016114, 1.75870668920944, 1.70883185717834, 4.6969696969697, + 4.63649544140478, 4.48718302719623, 4.54545454545455, 4.42891150893792, + 4.57602118583986, 4.51554693027493, 4.37063999067961, 4.3123684724213, + 4.45507267471001, 4.39459841914509, 4.25409695416299, 4.19582543590468, + 4.33412416358017, 4.27364990801525, 4.13755391764637, 4.07928239938806, + 4.21317565245033, 4.15270139688541, 4.02101088112975, 3.96273936287144, + 4.09222714132049, 4.03175288575557, 3.90446784461312, 3.84619632635481, + 3.97127863019065, 3.91080437462572, 3.7879248080965, 3.72965328983819, + 3.8503301190608, 3.78985586349588, 3.67138177157988, 3.61311025332157, + 3.72938160793096, 3.66890735236604, 3.55483873506326, 3.49656721680495, + 3.60843309680112, 3.5479588412362, 3.43829569854664, 3.38002418028833, + 3.48748458567128, 3.42701033010636, 3.32175266203001, 3.2634811437717, + 3.36653607454144, 3.30606181897652, 3.20520962551339, 3.14693810725508, + 3.24558756341159, 3.18511330784667, 3.08866658899677, 3.03039507073846, + 3.12463905228175, 3.06416479671683, 2.97212355248015, 2.91385203422184, + 3.00369054115191, 2.94321628558699, 2.85558051596353, 2.79730899770522, + 2.88274203002207, 2.82226777445715, 2.7390374794469, 2.68076596118859, + 2.76179351889223, 2.70131926332731, 2.62249444293028, 2.56422292467197, + 2.64084500776238, 2.58037075219746, 2.50595140641366, 2.44767988815535, + 2.51989649663254, 2.45942224106762, 2.38940836989704, 2.33113685163873, + 2.3989479855027, 2.33847372993778, 2.27286533338042, 2.2145938151221, + 2.27799947437286, 2.21752521880794, 2.15632229686379, 2.09805077860548, + 2.15705096324302, 2.0965767076781, 2.03977926034717, 1.98150774208886, + 2.03610245211317, 1.97562819654825, 1.92323622383055, 1.86496470557224, + 1.91515394098333, 1.85467968541841, 1.80669318731393, 5, + 4.93503559373069, 4.78576551756773, 4.84848484848485, 4.72304618665062, + 4.87007118746138, 4.80510678119207, 4.6603268557335, 4.59760752481639, + 4.74014237492277, 4.67517796865346, 4.53488819389927, 4.47216886298216, + 4.61021356238415, 4.54524915611484, 4.40944953206504, 4.34673020114793, + 4.48028474984553, 4.41532034357622, 4.28401087023082, 4.2212915393137, + 4.35035593730691, 4.2853915310376, 4.15857220839659, 4.09585287747947, + 4.2204271247683, 4.15546271849899, 4.03313354656236, 3.97041421564524, + 4.09049831222968, 4.02553390596037, 3.90769488472813, 3.84497555381101, + 3.96056949969106, 3.89560509342175, 3.7822562228939, 3.71953689197678, + 3.83064068715244, 3.76567628088313, 3.65681756105967, 3.59409823014255, + 3.70071187461383, 3.63574746834452, 3.53137889922544, 3.46865956830832, + 3.57078306207521, 3.5058186558059, 3.40594023739121, 3.34322090647409, + 3.44085424953659, 3.37588984326728, 3.28050157555698, 3.21778224463986, + 3.31092543699797, 3.24596103072867, 3.15506291372275, 3.09234358280563, + 3.18099662445936, 3.11603221819005, 3.02962425188852, 2.9669049209714, + 3.05106781192074, 2.98610340565143, 2.90418559005429, 2.84146625913717, + 2.92113899938212, 2.85617459311281, 2.77874692822006, 2.71602759730294, + 2.7912101868435, 2.7262457805742, 2.65330826638583, 2.59058893546872, + 2.66128137430489, 2.59631696803558, 2.5278696045516, 2.46515027363449, + 2.53135256176627, 2.46638815549696, 2.40243094271737, 2.33971161180026, + 2.40142374922765, 2.33645934295834, 2.27699228088314, 2.21427294996603, + 2.27149493668904, 2.20653053041973, 2.15155361904891, 2.0888342881318, + 2.14156612415042, 2.07660171788111, 2.02611495721468, 1.96339562629757, + 2.0116373116118, 1.94667290534249, 1.90067629538045, 5, 4.93676976861086, + 4.93590268117077, 5, 4.87180536234155, 4.87353953722171, + 4.81030930583257, 4.80770804351232, 4.74361072468309, 4.74707907444342, + 4.68384884305428, 4.67951340585387, 4.61541608702464, 4.62061861166513, + 4.55738838027599, 4.55131876819542, 4.48722144936619, 4.49415814888685, + 4.4309279174977, 4.42312413053696, 4.35902681170773, 4.36769768610856, + 4.30446745471941, 4.29492949287851, 4.23083217404928, 4.24123722333027, + 4.17800699194112, 4.16673485522006, 4.10263753639083, 4.11477676055198, + 4.05154652916283, 4.0385402175616, 3.97444289873238, 3.98831629777369, + 3.92508606638455, 3.91034557990315, 3.84624826107392, 3.8618558349954, + 3.79862560360626, 3.7821509422447, 3.71805362341547, 3.73539537221711, + 3.67216514082797, 3.65395630458624, 3.58985898575702, 3.60893490943882, + 3.54570467804968, 3.52576166692779, 3.46166434809856, 3.48247444666054, + 3.41924421527139, 3.39756702926934, 3.33346971044011, 3.35601398388225, + 3.2927837524931, 3.26937239161088, 3.20527507278166, 3.22955352110396, + 3.16632328971481, 3.14117775395243, 3.0770804351232, 3.10309305832567, + 3.03986282693653, 3.01298311629398, 2.94888579746475, 2.97663259554738, + 2.91340236415824, 2.88478847863553, 2.8206911598063, 2.85017213276909, + 2.78694190137995, 2.75659384097707, 2.69249652214785, 2.7237116699908, + 2.66048143860166, 2.62839920331862, 2.56430188448939, 2.59725120721252, + 2.53402097582337, 2.50020456566017, 2.43610724683094, 2.47079074443423, + 2.40756051304508, 2.37200992800171, 2.30791260917249, 2.34433028165594, + 2.28110005026679, 2.24381529034326, 2.17971797151403, 2.21786981887765, + 2.15463958748851, 2.11562065268481, 2.05152333385558, 2.09140935609936, + 2.02817912471022, 1.98742601502635, 5, 4.93841120929857, + 4.93759048895471, 5, 4.87518097790942, 4.87682241859714, 4.8152336278957, + 4.81277146686413, 4.75036195581885, 4.75364483719427, 4.69205604649284, + 4.68795244477356, 4.62554293372827, 4.63046725579141, 4.56887846508997, + 4.56313342268298, 4.50072391163769, 4.50728967438854, 4.44570088368711, + 4.4383144005924, 4.37590488954712, 4.38411209298568, 4.32252330228424, + 4.31349537850183, 4.25108586745654, 4.26093451158281, 4.19934572088138, + 4.18867635641125, 4.12626684536596, 4.13775693017995, 4.07616813947851, + 4.06385733432067, 4.00144782327539, 4.01457934877708, 3.95299055807565, + 3.9390383122301, 3.87662880118481, 3.89140176737422, 3.82981297667279, + 3.81421929013952, 3.75180977909423, 3.76822418597135, 3.70663539526992, + 3.68940026804895, 3.62699075700366, 3.64504660456849, 3.58345781386706, + 3.56458124595837, 3.50217173491308, 3.52186902316562, 3.46028023246419, + 3.43976222386779, 3.3773527128225, 3.39869144176276, 3.33710265106133, + 3.31494320177722, 3.25253369073193, 3.27551386035989, 3.21392506965846, + 3.19012417968664, 3.12771466864135, 3.15233627895703, 3.0907474882556, + 3.06530515759606, 3.00289564655077, 3.02915869755417, 2.96756990685273, + 2.94048613550548, 2.8780766244602, 2.9059811161513, 2.84439232544987, + 2.81566711341491, 2.75325760236962, 2.78280353474844, 2.721214744047, + 2.69084809132433, 2.62843858027904, 2.65962595334557, 2.59803716264414, + 2.56602906923376, 2.50361955818847, 2.53644837194271, 2.47485958124127, + 2.44121004714318, 2.37880053609789, 2.41327079053984, 2.35168199983841, + 2.3163910250526, 2.25398151400731, 2.29009320913698, 2.22850441843554, + 2.19157200296203, 2.12916249191674, 2.16691562773411, 2.10532683703268, + 2.06675298087145, 5, 4.93995619740273, 4.93918370335065, 5, + 4.87836740670129, 4.87991239480545, 4.81986859220818, 4.81755111005194, + 4.75673481340259, 4.75982478961091, 4.69978098701363, 4.69591851675324, + 4.63510222010388, 4.63973718441636, 4.57969338181909, 4.57428592345453, + 4.51346962680518, 4.51964957922181, 4.45960577662454, 4.45265333015582, + 4.39183703350647, 4.39956197402727, 4.33951817142999, 4.33102073685712, + 4.27020444020777, 4.27947436883272, 4.21943056623545, 4.20938814355841, + 4.14857184690906, 4.15938676363817, 4.0993429610409, 4.08775555025971, + 4.02693925361035, 4.03929915844362, 3.97925535584635, 3.966122956961, + 3.90530666031165, 3.91921155324908, 3.8591677506518, 3.84449036366229, + 3.78367406701294, 3.79912394805453, 3.73908014545726, 3.72285777036359, + 3.66204147371424, 3.67903634285998, 3.61899254026271, 3.60122517706488, + 3.54040888041553, 3.55894873766544, 3.49890493506816, 3.47959258376618, + 3.41877628711682, 3.43886113247089, 3.37881732987362, 3.35795999046747, + 3.29714369381812, 3.31877352727634, 3.25872972467907, 3.23632739716877, + 3.17551110051941, 3.1986859220818, 3.13864211948452, 3.11469480387006, + 3.05387850722071, 3.07859831688725, 3.01855451428998, 2.99306221057135, + 2.932245913922, 2.9585107116927, 2.89846690909543, 2.87142961727265, + 2.8106133206233, 2.83842310649815, 2.77837930390088, 2.74979702397394, + 2.68898072732459, 2.71833550130361, 2.65829169870633, 2.62816443067524, + 2.56734813402588, 2.59824789610906, 2.53820409351179, 2.50653183737653, + 2.44571554072718, 2.47816029091451, 2.41811648831724, 2.38489924407782, + 2.32408294742847, 2.35807268571997, 2.29802888312269, 2.26326665077912, + 2.20245035412977, 2.23798508052542, 2.17794127792815, 2.14163405748041, + 5, 4.94140123302836, 4.94067871521554, 5, 4.88135743043108, + 4.88280246605671, 4.82420369908507, 4.82203614564662, 4.76271486086216, + 4.76560493211342, 4.70700616514178, 4.70339357607771, 4.64407229129325, + 4.64840739817013, 4.58980863119849, 4.58475100650879, 4.52542972172433, + 4.53120986422685, 4.4726110972552, 4.46610843693987, 4.40678715215541, + 4.41401233028356, 4.35541356331191, 4.34746586737095, 4.28814458258649, + 4.29681479634027, 4.23821602936862, 4.22882329780203, 4.16950201301758, + 4.17961726239698, 4.12101849542533, 4.11018072823312, 4.05085944344866, + 4.06241972845369, 4.00382096148205, 3.9915381586642, 3.93221687387974, + 3.9452221945104, 3.88662342753876, 3.87289558909528, 3.81357430431082, + 3.82802466056711, 3.76942589359547, 3.75425301952636, 3.6949317347419, + 3.71082712662382, 3.65222835965218, 3.63561044995744, 3.57628916517299, + 3.59362959268054, 3.53503082570889, 3.51696788038853, 3.45764659560407, + 3.47643205873725, 3.4178332917656, 3.39832531081961, 3.33900402603515, + 3.35923452479396, 3.30063575782231, 3.27968274125069, 3.22036145646623, + 3.24203699085067, 3.18343822387902, 3.16104017168177, 3.10171888689731, + 3.12483945690738, 3.06624068993574, 3.04239760211286, 2.9830763173284, + 3.00764192296409, 2.94904315599245, 2.92375503254394, 2.86443374775948, + 2.8904443890208, 2.83184562204916, 2.80511246297502, 2.74579117819056, + 2.77324685507751, 2.71464808810587, 2.6864698934061, 2.62714860862164, + 2.65604932113423, 2.59745055416258, 2.56782732383718, 2.50850603905273, + 2.53885178719094, 2.48025302021929, 2.44918475426827, 2.38986346948381, + 2.42165425324765, 2.363055486276, 2.33054218469935, 2.27122089991489, + 2.30445671930436, 2.24585795233271, 2.21189961513043, 5, + 4.94274304270499, 4.94207213786667, 5, 4.88414427573335, + 4.88548608540998, 4.82822912811497, 4.82621641360002, 4.76828855146669, + 4.77097217081996, 4.71371521352495, 4.71036068933337, 4.65243282720004, + 4.65645825622994, 4.59920129893493, 4.59450496506671, 4.53657710293338, + 4.54194434163992, 4.48468738434491, 4.47864924080006, 4.42072137866673, + 4.4274304270499, 4.37017346975489, 4.3627935165334, 4.30486565440008, + 4.31291651245988, 4.25565955516488, 4.24693779226675, 4.18900993013342, + 4.19840259786987, 4.14114564057486, 4.1310820680001, 4.07315420586677, + 4.08388868327985, 4.02663172598484, 4.01522634373344, 3.95729848160011, + 3.96937476868983, 3.91211781139482, 3.89937061946679, 3.84144275733346, + 3.85486085409981, 3.7976038968048, 3.78351489520013, 3.72558703306681, + 3.74034693950979, 3.68308998221478, 3.66765917093348, 3.60973130880015, + 3.62583302491977, 3.56857606762476, 3.55180344666683, 3.4938755845335, + 3.51131911032975, 3.45406215303474, 3.43594772240017, 3.37801986026684, + 3.39680519573973, 3.33954823844472, 3.32009199813352, 3.26216413600019, + 3.28229128114971, 3.2250343238547, 3.20423627386686, 3.14630841173354, + 3.16777736655969, 3.11052040926468, 3.08838054960021, 3.03045268746688, + 3.05326345196967, 2.99600649467466, 2.97252482533356, 2.91459696320023, + 2.93874953737966, 2.88149258008465, 2.8566691010669, 2.79874123893357, + 2.82423562278964, 2.76697866549463, 2.74081337680025, 2.68288551466692, + 2.70972170819962, 2.65246475090461, 2.62495765253359, 2.56702979040027, + 2.5952077936096, 2.53795083631459, 2.50910192826694, 2.45117406613361, + 2.48069387901958, 2.42343692172457, 2.39324620400029, 2.33531834186696, + 2.36617996442956, 2.30892300713455, 2.27739047973363, 5, + 4.94397858680214, 4.94336081475357, 5, 4.88672162950713, + 4.88795717360428, 4.83193576040643, 4.8300824442607, 4.77344325901426, + 4.77591434720857, 4.71989293401071, 4.71680407376783, 4.6601648885214, + 4.66387152081285, 4.60785010761499, 4.60352570327496, 4.54688651802853, + 4.55182869441713, 4.49580728121928, 4.4902473327821, 4.43360814753566, + 4.43978586802142, 4.38376445482356, 4.37696896228923, 4.32032977704279, + 4.3277430416257, 4.27172162842784, 4.26369059179636, 4.20705140654993, + 4.21570021522998, 4.15967880203213, 4.15041222130349, 4.09377303605706, + 4.10365738883427, 4.04763597563641, 4.03713385081062, 3.98049466556419, + 3.99161456243855, 3.93559314924069, 3.92385548031775, 3.86721629507132, + 3.87957173604283, 3.82355032284498, 3.81057710982489, 3.75393792457845, + 3.76752890964712, 3.71150749644926, 3.69729873933202, 3.64065955408559, + 3.6554860832514, 3.59946467005354, 3.58402036883915, 3.52738118359272, + 3.54344325685568, 3.48742184365783, 3.47074199834628, 3.41410281309985, + 3.43140043045997, 3.37537901726211, 3.35746362785342, 3.30082444260698, + 3.31935760406425, 3.26333619086639, 3.24418525736055, 3.18754607211411, + 3.20731477766853, 3.15129336447068, 3.13090688686768, 3.07426770162125, + 3.09527195127282, 3.03925053807496, 3.01762851637481, 2.96098933112838, + 2.9832291248771, 2.92720771167924, 2.90435014588194, 2.84771096063551, + 2.87118629848138, 2.81516488528353, 2.79107177538908, 2.73443259014264, + 2.75914347208567, 2.70312205888781, 2.67779340489621, 2.62115421964977, + 2.64710064568995, 2.59107923249209, 2.56451503440334, 2.50787584915691, + 2.53505781929423, 2.47903640609638, 2.45123666391047, 2.39459747866404, + 2.42301499289852, 2.36699357970066, 2.3379582934176, 5, 4.94510506641504, + 4.94454182660859, 5, 4.88908365321718, 4.89021013283007, + 4.83531519924511, 4.83362547982577, 4.77816730643436, 4.78042026566015, + 4.72552533207518, 4.72270913304295, 4.66725095965153, 4.67063039849022, + 4.61573546490525, 4.61179278626012, 4.55633461286871, 4.56084053132029, + 4.50594559773533, 4.5008764394773, 4.44541826608589, 4.45105066415036, + 4.3961557305654, 4.38996009269448, 4.33450191930307, 4.34126079698044, + 4.28636586339547, 4.27904374591166, 4.22358557252025, 4.23147092981051, + 4.17657599622555, 4.16812739912884, 4.11266922573742, 4.12168106264058, + 4.06678612905562, 4.05721105234601, 4.0017528789546, 4.01189119547066, + 3.95699626188569, 3.94629470556319, 3.89083653217178, 3.90210132830073, + 3.84720639471576, 3.83537835878037, 3.77992018538896, 3.7923114611308, + 3.73741652754584, 3.72446201199755, 3.66900383860614, 3.68252159396087, + 3.62762666037591, 3.61354566521473, 3.55808749182332, 3.57273172679095, + 3.51783679320598, 3.5026293184319, 3.44717114504049, 3.46294185962102, + 3.40804692603606, 3.39171297164908, 3.33625479825767, 3.35315199245109, + 3.29825705886613, 3.28079662486626, 3.22533845147485, 3.24336212528117, + 3.1884671916962, 3.16988027808344, 3.11442210469203, 3.13357225811124, + 3.07867732452627, 3.05896393130062, 3.00350575790921, 3.02378239094131, + 2.96888745735635, 2.94804758451779, 2.89258941112638, 2.91399252377138, + 2.85909759018642, 2.83713123773497, 2.78167306434356, 2.80420265660146, + 2.74930772301649, 2.72621489095215, 2.67075671756074, 2.69441278943153, + 2.63951785584657, 2.61529854416933, 2.55984037077792, 2.5846229222616, + 2.52972798867664, 2.50438219738651, 2.4489240239951, 2.47483305509168, + 2.41993812150671, 2.39346585060369, 5, 4.94611992970504, + 4.94561249806004, 5, 4.89122499612007, 4.89223985941007, + 4.83835978911511, 4.83683749418011, 4.78244999224015, 4.78447971882015, + 4.73059964852519, 4.72806249030018, 4.67367498836022, 4.67671957823022, + 4.62283950793526, 4.61928748642026, 4.5648999844803, 4.5689594376403, + 4.51507936734534, 4.51051248254033, 4.45612498060037, 4.46119929705037, + 4.40731922675541, 4.40173747866041, 4.34734997672044, 4.35343915646045, + 4.29955908616548, 4.29296247478048, 4.23857497284052, 4.24567901587052, + 4.19179894557556, 4.18418747090055, 4.12979996896059, 4.1379188752806, + 4.08403880498563, 4.07541246702063, 4.02102496508066, 4.03015873469067, + 3.97627866439571, 3.9666374631407, 3.91224996120074, 3.92239859410075, + 3.86851852380578, 3.85786245926077, 3.80347495732081, 3.81463845351082, + 3.76075838321586, 3.74908745538085, 3.69469995344088, 3.70687831292089, + 3.65299824262593, 3.64031245150092, 3.58592494956096, 3.59911817233097, + 3.54523810203601, 3.531537447621, 3.47714994568103, 3.49135803174104, + 3.43747796144608, 3.42276244374107, 3.36837494180111, 3.38359789115112, + 3.32971782085616, 3.31398743986114, 3.25959993792118, 3.27583775056119, + 3.22195768026623, 3.20521243598122, 3.15082493404125, 3.16807760997127, + 3.1141975396763, 3.09643743210129, 3.04204993016133, 3.06031746938134, + 3.00643739908638, 2.98766242822136, 2.9332749262814, 2.95255732879142, + 2.89867725849645, 2.87888742434144, 2.82449992240147, 2.84479718820149, + 2.79091711790653, 2.77011242046151, 2.71572491852155, 2.73703704761157, + 2.6831569773166, 2.66133741658158, 2.60694991464162, 2.62927690702164, + 2.57539683672668, 2.55256241270166, 2.4981749107617, 2.52151676643172, + 2.46763669613675, 2.44378740882173, 5, 4.94702087768038, + 4.94657040369271, 5, 4.89314080738542, 4.89404175536076, + 4.84106263304113, 4.83971121107812, 4.78628161477083, 4.78808351072151, + 4.73510438840189, 4.73285201846354, 4.67942242215625, 4.68212526608227, + 4.62914614376264, 4.62599282584895, 4.57256322954166, 4.57616702144302, + 4.5231878991234, 4.51913363323437, 4.46570403692708, 4.47020877680378, + 4.41722965448416, 4.41227444061978, 4.35884484431249, 4.36425053216453, + 4.31127140984491, 4.3054152480052, 4.25198565169791, 4.25829228752529, + 4.20531316520567, 4.19855605539061, 4.14512645908332, 4.15233404288605, + 4.09935492056642, 4.09169686277603, 4.03826726646874, 4.0463757982468, + 3.99339667592718, 3.98483767016144, 3.93140807385415, 3.94041755360756, + 3.88743843128794, 3.87797847754686, 3.82454888123957, 3.83445930896831, + 3.78148018664869, 3.77111928493227, 3.71768968862498, 3.72850106432907, + 3.67552194200945, 3.66426009231769, 3.6108304960104, 3.62254281968983, + 3.5695636973702, 3.5574008997031, 3.50397130339581, 3.51658457505058, + 3.46360545273096, 3.45054170708852, 3.39711211078123, 3.41062633041134, + 3.35764720809171, 3.34368251447393, 3.29025291816664, 3.30466808577209, + 3.25168896345247, 3.23682332185935, 3.18339372555206, 3.19870984113285, + 3.14573071881323, 3.12996412924477, 3.07653453293747, 3.0927515964936, + 3.03977247417398, 3.02310493663018, 2.96967534032289, 2.98679335185436, + 2.93381422953474, 2.9162457440156, 2.8628161477083, 2.88083510721512, + 2.82785598489549, 2.80938655140101, 2.75595695509372, 2.77487686257587, + 2.72189774025625, 2.70252735878643, 2.64909776247913, 2.66891861793663, + 2.61593949561701, 2.59566816617184, 2.54223856986455, 2.56296037329738, + 2.50998125097776, 2.48880897355726, 5, 4.94780586940412, + 4.94741337354225, 5, 4.8948267470845, 4.89561173880824, 4.84341760821236, + 4.84224012062675, 4.78965349416899, 4.79122347761647, 4.73902934702059, + 4.73706686771124, 4.68448024125349, 4.68683521642471, 4.63464108582883, + 4.63189361479574, 4.57930698833799, 4.58244695523295, 4.53025282463707, + 4.52672036188023, 4.47413373542248, 4.47805869404119, 4.42586456344531, + 4.42154710896473, 4.36896048250698, 4.37367043284942, 4.32147630225354, + 4.31637385604923, 4.26378722959148, 4.26928217165766, 4.21708804106178, + 4.21120060313372, 4.15861397667597, 4.1648939104659, 4.11269977987002, + 4.10602735021822, 4.05344072376047, 4.06050564927413, 4.00831151867825, + 4.00085409730272, 3.94826747084497, 3.95611738808237, 3.90392325748649, + 3.89568084438721, 3.84309421792946, 3.85172912689061, 3.79953499629473, + 3.79050759147171, 3.73792096501396, 3.74734086569885, 3.69514673510297, + 3.68533433855621, 3.63274771209845, 3.64295260450708, 3.5907584739112, + 3.5801610856407, 3.52757445918295, 3.53856434331532, 3.48637021271944, + 3.4749878327252, 3.42240120626745, 3.43417608212356, 3.38198195152768, + 3.3698145798097, 3.31722795335194, 3.3297878209318, 3.27759369033591, + 3.26464132689419, 3.21205470043644, 3.22539955974003, 3.17320542914415, + 3.15946807397869, 3.10688144752094, 3.12101129854827, 3.06881716795239, + 3.05429482106319, 3.00170819460543, 3.01662303735651, 2.96442890676063, + 2.94912156814768, 2.89653494168993, 2.91223477616474, 2.86004064556886, + 2.84394831523218, 2.79136168877443, 2.80784651497298, 2.7556523843771, + 2.73877506231667, 2.68618843585892, 2.70345825378122, 2.65126412318534, + 2.63360180940117, 2.58101518294342, 2.59906999258946, 2.54687586199358, + 2.52842855648567, 5, 4.94847312661753, 4.94813949801082, 5, + 4.89627899602164, 4.89694625323505, 4.84541937985258, 4.84441849403247, + 4.79255799204329, 4.7938925064701, 4.74236563308763, 4.74069749005411, + 4.68883698806493, 4.69083875970515, 4.63931188632268, 4.63697648607575, + 4.58511598408658, 4.5877850129402, 4.53625813955773, 4.5332554820974, + 4.48139498010822, 4.48473126617525, 4.43320439279278, 4.42953447811904, + 4.37767397612986, 4.3816775194103, 4.33015064602783, 4.32581347414069, + 4.27395297215151, 4.27862377264535, 4.22709689926288, 4.22209247016233, + 4.17023196817315, 4.1755700258804, 4.12404315249793, 4.11837146618397, + 4.06651096419479, 4.07251627911545, 4.02098940573298, 4.01465046220562, + 3.96278996021644, 3.9694625323505, 3.91793565896803, 3.91092945822726, + 3.85906895623808, 3.86640878558555, 3.81488191220308, 3.8072084542489, + 3.75534795225973, 3.7633550388206, 3.71182816543813, 3.70348745027055, + 3.65162694828137, 3.66030129205565, 3.60877441867318, 3.59976644629219, + 3.54790594430301, 3.5572475452907, 3.50572067190823, 3.49604544231384, + 3.44418494032466, 3.45419379852576, 3.40266692514328, 3.39232443833548, + 3.3404639363463, 3.35114005176081, 3.29961317837833, 3.28860343435712, + 3.23674293236794, 3.24808630499586, 3.19655943161338, 3.18488243037877, + 3.13302192838959, 3.14503255823091, 3.09350568484843, 3.08116142640041, + 3.02930092441123, 3.04197881146596, 2.99045193808348, 2.97744042242205, + 2.92557992043288, 2.93892506470101, 2.88739819131853, 2.8737194184437, + 2.82185891645452, 2.83587131793606, 2.78434444455358, 2.76999841446534, + 2.71813791247616, 2.73281757117111, 2.68129069778863, 2.66627741048699, + 2.61441690849781, 2.62976382440616, 2.57823695102368, 2.56255640650863, + 5, 4.9490211377684, 4.94874713219296, 5, 4.89749426438592, + 4.89804227553679, 4.84706341330519, 4.84624139657888, 4.79498852877184, + 4.79608455107359, 4.74510568884198, 4.7437356609648, 4.69248279315777, + 4.69412682661038, 4.64314796437878, 4.64122992535073, 4.58997705754369, + 4.59216910214717, 4.54119023991557, 4.53872418973665, 4.48747132192961, + 4.49021137768397, 4.43923251545236, 4.43621845412257, 4.38496558631553, + 4.38825365322076, 4.33727479098916, 4.33371271850849, 4.28245985070145, + 4.28629592875755, 4.23531706652595, 4.23120698289441, 4.17995411508737, + 4.18433820429435, 4.13335934206274, 4.12870124728033, 4.0774483794733, + 4.08238047983114, 4.03140161759954, 4.02619551166626, 3.97494264385922, + 3.98042275536793, 3.92944389313633, 3.92368977605218, 3.87243690824514, + 3.87846503090473, 3.82748616867312, 3.8211840404381, 3.76993117263106, + 3.77650730644152, 3.72552844420992, 3.71867830482402, 3.66742543701698, + 3.67454958197831, 3.62357071974671, 3.61617256920994, 3.56491970140291, + 3.57259185751511, 3.5216129952835, 3.51366683359587, 3.46241396578883, + 3.4706341330519, 3.41965527082029, 3.41116109798179, 3.35990823017475, + 3.36867640858869, 3.31769754635709, 3.30865536236771, 3.25740249456067, + 3.26671868412548, 3.21573982189388, 3.20614962675363, 3.15489675894659, + 3.16476095966228, 3.11378209743067, 3.10364389113955, 3.05239102333251, + 3.06280323519907, 3.01182437296747, 3.00113815552547, 2.94988528771844, + 2.96084551073586, 2.90986664850426, 2.8986324199114, 2.84737955210436, + 2.85888778627266, 2.80790892404105, 2.79612668429732, 2.74487381649028, + 2.75693006180945, 2.70595119957785, 2.69362094868324, 2.6423680808762, + 2.65497233734624, 2.60399347511464, 2.59111521306916, 5, + 4.94944866143522, 4.94923489960181, 5, 4.89846979920361, + 4.89889732287043, 4.84834598430565, 4.84770469880542, 4.79693959840723, + 4.79779464574087, 4.74724330717609, 4.74617449800903, 4.69540939761084, + 4.6966919686113, 4.64614063004652, 4.64464429721265, 4.59387919681446, + 4.59558929148174, 4.54503795291695, 4.54311409641626, 4.49234899601807, + 4.49448661435217, 4.44393527578739, 4.44158389561988, 4.39081879522168, + 4.39338393722261, 4.34283259865782, 4.34005369482349, 4.2892885944253, + 4.29228126009304, 4.24172992152826, 4.2385234940271, 4.18775839362891, + 4.19117858296347, 4.14062724439869, 4.13699329323072, 4.08622819283252, + 4.09007590583391, 4.03952456726913, 4.03546309243433, 3.98469799203614, + 3.98897322870434, 3.93842189013956, 3.93393289163794, 3.88316779123975, + 3.88787055157478, 3.83731921301, 3.83240269084156, 3.78163759044337, + 3.78676787444521, 3.73621653588043, 3.73087249004517, 3.68010738964698, + 3.68566519731565, 3.63511385875086, 3.62934228924879, 3.57857718885059, + 3.58456252018608, 3.5340111816213, 3.5278120884524, 3.47704698805421, + 3.48345984305652, 3.43290850449173, 3.42628188765601, 3.37551678725782, + 3.38235716592695, 3.33180582736217, 3.32475168685963, 3.27398658646143, + 3.28125448879738, 3.2307031502326, 3.22322148606324, 3.17245638566505, + 3.18015181166782, 3.12960047310304, 3.12169128526686, 3.07092618486866, + 3.07904913453825, 3.02849779597347, 3.02016108447047, 2.96939598407228, + 2.97794645740869, 2.92739511884391, 2.91863088367408, 2.86786578327589, + 2.87684378027912, 2.82629244171434, 2.8171006828777, 2.7663355824795, + 2.77574110314956, 2.72518976458477, 2.71557048208131, 2.66480538168312, + 2.67463842601999, 2.62408708745521, 2.61404028128492, 5, + 4.94975472913938, 4.9496016952873, 5, 4.89920339057459, 4.89950945827875, + 4.84926418741813, 4.84880508586189, 4.79840678114918, 4.7990189165575, + 4.74877364569688, 4.74800847643648, 4.69761017172378, 4.69852837483625, + 4.64828310397563, 4.64721186701107, 4.59681356229837, 4.598037833115, + 4.54779256225438, 4.54641525758567, 4.49601695287296, 4.49754729139375, + 4.44730202053313, 4.44561864816026, 4.39522034344755, 4.3970567496725, + 4.34681147881188, 4.34482203873485, 4.29442373402215, 4.29656620795126, + 4.24632093709063, 4.24402542930945, 4.19362712459674, 4.19607566623001, + 4.14583039536938, 4.14322881988404, 4.09283051517133, 4.09558512450876, + 4.04533985364813, 4.04243221045863, 3.99203390574593, 3.99509458278751, + 3.94484931192688, 3.94163560103322, 3.89123729632052, 3.89460404106626, + 3.84435877020563, 3.84083899160782, 3.79044068689511, 3.79411349934501, + 3.74386822848439, 3.74004238218241, 3.6896440774697, 3.69362295762376, + 3.64337768676314, 3.639245772757, 3.5888474680443, 3.59313241590251, + 3.54288714504189, 3.53844916333159, 3.48805085861889, 3.49264187418126, + 3.44239660332064, 3.43765255390619, 3.38725424919348, 3.39215133246001, + 3.34190606159939, 3.33685594448078, 3.28645763976807, 3.29166079073876, + 3.24141551987814, 3.23605933505537, 3.18566103034267, 3.19117024901752, + 3.14092497815689, 3.13526272562996, 3.08486442091726, 3.09067970729627, + 3.04043443643564, 3.03446611620456, 2.98406781149185, 2.99018916557502, + 2.93994389471439, 2.93366950677915, 2.88327120206645, 2.88969862385377, + 2.83945335299314, 2.83287289735374, 2.78247459264104, 2.78920808213252, + 2.73896281127189, 2.73207628792833, 2.68167798321563, 2.68871754041127, + 2.63847226955065, 2.63127967850293, 5, 4.94993864753908, + 4.94984668833923, 5, 4.89969337667845, 4.89987729507816, + 4.84981594261724, 4.84954006501768, 4.79938675335691, 4.79975459015632, + 4.7496932376954, 4.74923344169614, 4.69908013003537, 4.69963188523448, + 4.64957053277356, 4.64892681837459, 4.59877350671382, 4.59950918031264, + 4.54944782785172, 4.54862019505305, 4.49846688339228, 4.4993864753908, + 4.44932512292988, 4.4483135717315, 4.39816026007073, 4.39926377046895, + 4.34920241800804, 4.34800694840996, 4.29785363674919, 4.29914106554711, + 4.24907971308619, 4.24770032508841, 4.19754701342764, 4.19901836062527, + 4.14895700816435, 4.14739370176687, 4.0972403901061, 4.09889565570343, + 4.04883430324251, 4.04708707844532, 3.99693376678455, 3.99877295078159, + 3.94871159832067, 3.94678045512378, 3.89662714346301, 3.89865024585975, + 3.84858889339883, 3.84647383180223, 3.79632052014146, 3.79852754093791, + 3.74846618847699, 3.74616720848069, 3.69601389681992, 3.69840483601607, + 3.64834348355515, 3.64586058515914, 3.59570727349837, 3.59828213109423, + 3.54822077863331, 3.5455539618376, 3.49540065017683, 3.49815942617239, + 3.44809807371147, 3.44524733851605, 3.39509402685528, 3.39803672125055, + 3.34797536878963, 3.34494071519451, 3.29478740353374, 3.29791401632871, + 3.24785266386779, 3.24463409187296, 3.19448078021219, 3.19779131140687, + 3.14772995894594, 3.14432746855142, 3.09417415689065, 3.09766860648502, + 3.0476072540241, 3.04402084522987, 2.9938675335691, 2.99754590156318, + 2.94748454910226, 2.94371422190833, 2.89356091024756, 2.89742319664134, + 2.84736184418042, 2.84340759858678, 2.79325428692601, 2.7973004917195, + 2.74723913925858, 2.74310097526524, 2.69294766360447, 2.69717778679766, + 2.64711643433674, 2.64279435194369, 5, 4.95, 4.94996932376954, 5, + 4.89993864753908, 4.9, 4.85, 4.84990797130862, 4.79987729507816, 4.8, + 4.75, 4.7498466188477, 4.69981594261724, 4.7, 4.65, 4.64978526638678, + 4.59975459015632, 4.6, 4.55, 4.54972391392586, 4.4996932376954, 4.5, + 4.45, 4.44966256146494, 4.39963188523448, 4.4, 4.35, 4.34960120900402, + 4.29957053277356, 4.3, 4.25, 4.2495398565431, 4.19950918031264, 4.2, + 4.15, 4.14947850408218, 4.09944782785172, 4.1, 4.05, 4.04941715162126, + 3.9993864753908, 4, 3.95, 3.94935579916034, 3.89932512292988, 3.9, 3.85, + 3.84929444669942, 3.79926377046896, 3.8, 3.75, 3.7492330942385, + 3.69920241800803, 3.7, 3.65, 3.64917174177757, 3.59914106554711, 3.6, + 3.55, 3.54911038931665, 3.49907971308619, 3.5, 3.45, 3.44904903685573, + 3.39901836062527, 3.4, 3.35, 3.34898768439481, 3.29895700816435, 3.3, + 3.25, 3.24892633193389, 3.19889565570343, 3.2, 3.15, 3.14886497947297, + 3.09883430324251, 3.1, 3.05, 3.04880362701205, 2.99877295078159, 3, 2.95, + 2.94874227455113, 2.89871159832067, 2.9, 2.85, 2.84868092209021, + 2.79865024585975, 2.8, 2.75, 2.74861956962929, 2.69858889339883, 2.7, + 2.65, 2.64855821716837, -0.0668809449971033, -0.130605324337641, + -0.137497667533552, -0.0719053994233416, -0.0769298538495798, + -0.144390010729463, -0.151282353925374, -0.0819543082758181, + -0.0869787627020564, -0.158174697121285, -0.165067040317195, + -0.0920032171282947, -0.097027671554533, -0.171959383513106, + -0.178851726709017, -0.102052125980771, -0.10707658040701, + -0.185744069904928, -0.192636413100839, -0.112101034833248, + -0.117125489259486, -0.19952875629675, -0.206421099492661, + -0.122149943685724, -0.127174398111963, -0.213313442688572, + -0.220205785884483, -0.132198852538201, -0.137223306964439, + -0.227098129080394, -0.233990472276305, -0.142247761390678, + -0.147272215816916, -0.240882815472216, -0.247775158668127, + -0.152296670243154, -0.157321124669392, -0.254667501864037, + -0.261559845059948, -0.162345579095631, -0.167370033521869, + -0.268452188255859, -0.27534453145177, -0.172394487948107, + -0.177418942374346, -0.282236874647681, -0.289129217843592, + -0.182443396800584, -0.187467851226822, -0.296021561039503, + -0.302913904235414, -0.19249230565306, -0.197516760079299, + -0.309806247431325, -0.316698590627236, -0.202541214505537, + -0.207565668931775, -0.323590933823147, -0.330483277019058, + -0.212590123358014, -0.217614577784252, -0.337375620214968, + -0.344267963410879, -0.22263903221049, -0.227663486636728, + -0.35116030660679, -0.358052649802701, -0.232687941062967, + -0.237712395489205, -0.364944992998612, -0.371837336194523, + -0.242736849915443, -0.247761304341682, -0.378729679390434, + -0.385622022586345, -0.25278575876792, -0.257810213194158, + -0.392514365782256, -0.399406708978167, -0.262834667620396, + -0.267859122046635, -0.406299052174078, -0.413191395369989, + -0.272883576472873, -0.277908030899111, -0.4200837385659, + -0.42697608176181, -0.28293248532535, -0.287956939751588, + -0.433868424957721, -0.440760768153632, -0.292981394177826, + -0.298005848604064, -0.447653111349543, -0.454545454545454, + -0.303030303030303, -0.194192498099517, -0.257779671861393, + -0.268413631131912, -0.202955649332732, -0.211718800565946, + -0.27904759040243, -0.289681549672948, -0.220481951799161, + -0.229245103032376, -0.300315508943467, -0.310949468213985, + -0.23800825426559, -0.246771405498805, -0.321583427484504, + -0.332217386755022, -0.25553455673202, -0.264297707965234, + -0.34285134602554, -0.353485305296059, -0.273060859198449, + -0.281824010431664, -0.364119264566577, -0.374753223837096, + -0.290587161664878, -0.299350312898093, -0.385387183107614, + -0.396021142378132, -0.308113464131308, -0.316876615364522, + -0.406655101648651, -0.417289060919169, -0.325639766597737, + -0.334402917830952, -0.427923020189688, -0.438556979460206, + -0.343166069064166, -0.351929220297381, -0.449190938730724, + -0.459824898001243, -0.360692371530596, -0.36945552276381, + -0.470458857271761, -0.48109281654228, -0.378218673997025, + -0.38698182523024, -0.491726775812798, -0.502360735083316, + -0.395744976463454, -0.404508127696669, -0.512994694353835, + -0.523628653624353, -0.413271278929883, -0.422034430163098, + -0.534262612894872, -0.54489657216539, -0.430797581396313, + -0.439560732629527, -0.555530531435908, -0.566164490706427, + -0.448323883862742, -0.457087035095957, -0.576798449976945, + -0.587432409247464, -0.465850186329171, -0.474613337562386, + -0.598066368517982, -0.6087003277885, -0.483376488795601, + -0.492139640028815, -0.619334287059019, -0.629968246329537, + -0.50090279126203, -0.509665942495245, -0.640602205600056, + -0.651236164870574, -0.518429093728459, -0.527192244961674, + -0.661870124141092, -0.672504083411611, -0.535955396194889, + -0.544718547428103, -0.683138042682129, -0.693772001952647, + -0.553481698661318, -0.562244849894533, -0.704405961223166, + -0.715039920493684, -0.571008001127747, -0.579771152360962, + -0.725673879764203, -0.736307839034721, -0.588534303594177, + -0.597297454827391, -0.746941798305239, -0.757575757575758, + -0.606060606060606, -0.321092745280712, -0.384405818700031, + -0.398793057889521, -0.333603344510716, -0.346113943740721, + -0.413180297079011, -0.427567536268501, -0.358624542970725, + -0.371135142200729, -0.441954775457991, -0.456342014647481, + -0.383645741430733, -0.396156340660737, -0.470729253836971, + -0.485116493026461, -0.408666939890742, -0.421177539120746, + -0.499503732215951, -0.513890971405441, -0.43368813835075, + -0.446198737580754, -0.528278210594931, -0.542665449784421, + -0.458709336810758, -0.471219936040763, -0.557052688973911, + -0.571439928163401, -0.483730535270767, -0.496241134500771, + -0.585827167352891, -0.600214406542381, -0.508751733730775, + -0.521262332960779, -0.614601645731871, -0.628988884921361, + -0.533772932190783, -0.546283531420788, -0.643376124110851, + -0.657763363300341, -0.558794130650792, -0.571304729880796, + -0.672150602489831, -0.686537841679321, -0.5838153291108, + -0.596325928340804, -0.700925080868811, -0.715312320058301, + -0.608836527570809, -0.621347126800813, -0.729699559247791, + -0.744086798437281, -0.633857726030817, -0.646368325260821, + -0.758474037626771, -0.772861276816261, -0.658878924490826, + -0.67138952372083, -0.787248516005751, -0.801635755195241, + -0.683900122950834, -0.696410722180838, -0.816022994384731, + -0.830410233574221, -0.708921321410842, -0.721431920640846, + -0.844797472763711, -0.859184711953201, -0.73394251987085, + -0.746453119100855, -0.873571951142691, -0.887959190332181, + -0.758963718330859, -0.771474317560863, -0.902346429521671, + -0.916733668711161, -0.783984916790867, -0.796495516020871, + -0.931120907900651, -0.945508147090141, -0.809006115250876, + -0.82151671448088, -0.959895386279631, -0.974282625469121, + -0.834027313710884, -0.846537912940888, -0.988669864658611, + -1.0030571038481, -0.859048512170892, -0.871559111400897, + -1.01744434303759, -1.03183158222708, -0.884069710630901, + -0.896580309860905, -1.04621882141657, -1.06060606060606, + -0.909090909090909, -0.447308517938333, -0.510211217176635, + -0.528369199016204, -0.463581128452863, -0.479853738967392, + -0.546527180855773, -0.564685162695341, -0.496126349481921, + -0.512398959996451, -0.58284314453491, -0.601001126374479, + -0.52867157051098, -0.544944181025509, -0.619159108214047, + -0.637317090053616, -0.561216791540039, -0.577489402054568, + -0.655475071893185, -0.673633053732753, -0.593762012569097, + -0.610034623083627, -0.691791035572322, -0.709949017411891, + -0.626307233598156, -0.642579844112685, -0.728106999251459, + -0.746264981091028, -0.658852454627215, -0.675125065141744, + -0.764422962930597, -0.782580944770165, -0.691397675656273, + -0.707670286170802, -0.800738926609734, -0.818896908449303, + -0.723942896685332, -0.740215507199861, -0.837054890288871, + -0.85521287212844, -0.756488117714391, -0.77276072822892, + -0.873370853968009, -0.891528835807577, -0.789033338743449, + -0.805305949257979, -0.909686817647146, -0.927844799486715, + -0.821578559772508, -0.837851170287037, -0.946002781326284, + -0.964160763165852, -0.854123780801566, -0.870396391316096, + -0.982318745005421, -1.00047672684499, -0.886669001830625, + -0.902941612345155, -1.01863470868456, -1.03679269052413, + -0.919214222859684, -0.935486833374213, -1.0549506723637, + -1.07310865420326, -0.951759443888743, -0.968032054403272, + -1.09126663604283, -1.1094246178824, -0.984304664917801, + -1.00057727543233, -1.12758259972197, -1.14574058156154, + -1.01684988594686, -1.03312249646139, -1.16389856340111, + -1.18205654524068, -1.04939510697592, -1.06566771749045, + -1.20021452708025, -1.21837250891981, -1.08194032800498, + -1.09821293851951, -1.23653049075938, -1.25468847259895, + -1.11448554903404, -1.13075815954857, -1.27284645443852, + -1.29100443627809, -1.14703077006309, -1.16330338057762, + -1.30916241811766, -1.32732039995723, -1.17957599109215, + -1.19584860160668, -1.34547838179679, -1.36363636363636, + -1.21212121212121, -0.57256819802497, -0.634925178873306, + -0.656877125422101, -0.592623162219152, -0.612678126413334, + -0.678829071970896, -0.70078101851969, -0.632733090607516, + -0.652788054801698, -0.722732965068485, -0.74468491161728, + -0.672843018995879, -0.692897983190061, -0.766636858166075, + -0.78858880471487, -0.712952947384243, -0.733007911578425, + -0.810540751263665, -0.83249269781246, -0.753062875772607, + -0.773117839966788, -0.854444644361255, -0.87639659091005, + -0.79317280416097, -0.813227768355152, -0.898348537458845, + -0.92030048400764, -0.833282732549334, -0.853337696743516, + -0.942252430556434, -0.964204377105229, -0.873392660937697, + -0.893447625131879, -0.986156323654024, -1.00810827020282, + -0.913502589326061, -0.933557553520243, -1.03006021675161, + -1.05201216330041, -0.953612517714425, -0.973667481908607, + -1.0739641098492, -1.095916056398, -0.993722446102788, -1.01377741029697, + -1.11786800294679, -1.13981994949559, -1.03383237449115, + -1.05388733868533, -1.16177189604438, -1.18372384259318, + -1.07394230287952, -1.0939972670737, -1.20567578914197, + -1.22762773569077, -1.11405223126788, -1.13410719546206, + -1.24957968223956, -1.27153162878836, -1.15416215965624, + -1.17421712385042, -1.29348357533715, -1.31543552188595, + -1.19427208804461, -1.21432705223879, -1.33738746843474, + -1.35933941498354, -1.23438201643297, -1.25443698062715, + -1.38129136153233, -1.40324330808113, -1.27449194482133, + -1.29454690901552, -1.42519525462992, -1.44714720117872, + -1.3146018732097, -1.33465683740388, -1.46909914772751, + -1.49105109427631, -1.35471180159806, -1.37476676579224, + -1.5130030408251, -1.5349549873739, -1.39482172998642, -1.41487669418061, + -1.55690693392269, -1.57885888047149, -1.43493165837479, + -1.45498662256897, -1.60081082702028, -1.62276277356908, + -1.47504158676315, -1.49509655095733, -1.64471472011787, + -1.66666666666667, -1.51515151515151, -0.696602333350399, + -0.758279487827493, -0.784054327867269, -0.720465726644685, + -0.74432911993897, -0.809829167907045, -0.835604007946821, + -0.768192513233256, -0.792055906527541, -0.861378847986598, + -0.887153688026374, -0.815919299821827, -0.839782693116113, + -0.91292852806615, -0.938703368105926, -0.863646086410398, + -0.887509479704684, -0.964478208145702, -0.990253048185478, + -0.911372872998969, -0.935236266293255, -1.01602788822525, + -1.04180272826503, -0.95909965958754, -0.982963052881825, + -1.06757756830481, -1.09335240834458, -1.00682644617611, + -1.0306898394704, -1.11912724838436, -1.14490208842413, + -1.05455323276468, -1.07841662605897, -1.17067692846391, + -1.19645176850369, -1.10228001935325, -1.12614341264754, + -1.22222660854346, -1.24800144858324, -1.15000680594182, + -1.17387019923611, -1.27377628862302, -1.29955112866279, + -1.1977335925304, -1.22159698582468, -1.32532596870257, + -1.35110080874234, -1.24546037911897, -1.26932377241325, + -1.37687564878212, -1.4026504888219, -1.29318716570754, + -1.31705055900182, -1.42842532886167, -1.45420016890145, + -1.34091395229611, -1.36477734559039, -1.47997500894122, -1.505749848981, + -1.38864073888468, -1.41250413217896, -1.53152468902078, + -1.55729952906055, -1.43636752547325, -1.46023091876754, + -1.58307436910033, -1.6088492091401, -1.48409431206182, + -1.50795770535611, -1.63462404917988, -1.66039888921966, + -1.53182109865039, -1.55568449194468, -1.68617372925943, + -1.71194856929921, -1.57954788523896, -1.60341127853325, + -1.73772340933898, -1.76349824937876, -1.62727467182753, + -1.65113806512182, -1.78927308941854, -1.81504792945831, + -1.67500145841611, -1.69886485171039, -1.84082276949809, + -1.86659760953787, -1.72272824500468, -1.74659163829896, + -1.89237244957764, -1.91814728961742, -1.77045503159325, + -1.79431842488753, -1.94392212965719, -1.96969696969697, + -1.81818181818182, -0.819144247977457, -0.880009008127421, + -0.909641311629545, -0.846847819748407, -0.874551391519358, + -0.93927361513167, -0.968905918633794, -0.902254963290308, + -0.929958535061258, -0.998538222135919, -1.02817052563804, + -0.957662106832208, -0.985365678603159, -1.05780282914017, + -1.08743513264229, -1.01306925037411, -1.04077282214506, + -1.11706743614442, -1.14669973964654, -1.06847639391601, + -1.09617996568696, -1.17633204314867, -1.20596434665079, + -1.12388353745791, -1.15158710922886, -1.23559665015291, + -1.26522895365504, -1.17929068099981, -1.20699425277076, + -1.29486125715716, -1.32449356065929, -1.23469782454171, + -1.26240139631266, -1.35412586416141, -1.38375816766354, + -1.29010496808361, -1.31780853985456, -1.41339047116566, + -1.44302277466779, -1.34551211162551, -1.37321568339646, + -1.47265507816991, -1.50228738167204, -1.40091925516741, + -1.42862282693836, -1.53191968517416, -1.56155198867628, + -1.45632639870931, -1.48402997048026, -1.59118429217841, + -1.62081659568053, -1.51173354225121, -1.53943711402216, + -1.65044889918266, -1.68008120268478, -1.56714068579311, + -1.59484425756407, -1.70971350618691, -1.73934580968903, + -1.62254782933502, -1.65025140110597, -1.76897811319116, + -1.79861041669328, -1.67795497287692, -1.70565854464787, + -1.82824272019541, -1.85787502369753, -1.73336211641882, + -1.76106568818977, -1.88750732719965, -1.91713963070178, + -1.78876925996072, -1.81647283173167, -1.9467719342039, + -1.97640423770603, -1.84417640350262, -1.87187997527357, + -2.00603654120815, -2.03566884471028, -1.89958354704452, + -1.92728711881547, -2.0653011482124, -2.09493345171453, + -1.95499069058642, -1.98269426235737, -2.12456575521665, + -2.15419805871877, -2.01039783412832, -2.03810140589927, + -2.1838303622209, -2.21346266572302, -2.06580497767022, + -2.09350854944117, -2.24309496922515, -2.27272727272727, + -2.12121212121212, -0.93993064632881, -0.9998522845302, + -1.03338218434355, -0.971511747986547, -1.00309284964428, + -1.0669120841569, -1.10044198397025, -1.03467395130202, + -1.06625505295976, -1.13397188378359, -1.16750178359694, + -1.09783615461749, -1.12941725627523, -1.20103168341029, + -1.23456158322364, -1.16099835793297, -1.1925794595907, + -1.26809148303699, -1.30162138285034, -1.22416056124844, + -1.25574166290618, -1.33515128266368, -1.36868118247703, + -1.28732276456391, -1.31890386622165, -1.40221108229038, + -1.43574098210373, -1.35048496787938, -1.38206606953712, + -1.46927088191708, -1.50280078173043, -1.41364717119486, + -1.44522827285259, -1.53633068154377, -1.56986058135712, + -1.47680937451033, -1.50839047616807, -1.60339048117047, + -1.63692038098382, -1.5399715778258, -1.57155267948354, + -1.67045028079717, -1.70398018061052, -1.60313378114128, + -1.63471488279901, -1.73751008042387, -1.77103998023721, + -1.66629598445675, -1.69787708611449, -1.80456988005056, + -1.83809977986391, -1.72945818777222, -1.76103928942996, + -1.87162967967726, -1.90515957949061, -1.79262039108769, + -1.82420149274543, -1.93868947930396, -1.9722193791173, + -1.85578259440317, -1.8873636960609, -2.00574927893065, -2.039279178744, + -1.91894479771864, -1.95052589937638, -2.07280907855735, + -2.1063389783707, -1.98210700103411, -2.01368810269185, + -2.13986887818405, -2.17339877799739, -2.04526920434959, + -2.07685030600732, -2.20692867781074, -2.24045857762409, + -2.10843140766506, -2.1400125093228, -2.27398847743744, + -2.30751837725079, -2.17159361098053, -2.20317471263827, + -2.34104827706414, -2.37457817687749, -2.23475581429601, + -2.26633691595374, -2.40810807669083, -2.44163797650418, + -2.29791801761148, -2.32949911926921, -2.47516787631753, + -2.50869777613088, -2.36108022092695, -2.39266132258469, + -2.54222767594423, -2.57575757575758, -2.42424242424242, + -1.05870220963613, -1.11755213474205, -1.1550252356792, + -1.09420371001137, -1.12970521038662, -1.19249833661634, + -1.22997143755349, -1.16520671076187, -1.20070821113711, + -1.26744453849063, -1.30491763942778, -1.23620971151236, + -1.27171121188761, -1.34239074036492, -1.37986384130207, + -1.30721271226285, -1.3427142126381, -1.41733694223921, + -1.45481004317636, -1.37821571301335, -1.41371721338859, + -1.4922831441135, -1.52975624505065, -1.44921871376384, + -1.48472021413909, -1.56722934598779, -1.60470244692494, + -1.52022171451433, -1.55572321488958, -1.64217554786208, + -1.67964864879923, -1.59122471526483, -1.62672621564007, + -1.71712174973637, -1.75459485067352, -1.66222771601532, + -1.69772921639057, -1.79206795161067, -1.82954105254781, + -1.73323071676582, -1.76873221714106, -1.86701415348496, + -1.9044872544221, -1.80423371751631, -1.83973521789156, + -1.94196035535925, -1.97943345629639, -1.8752367182668, + -1.91073821864205, -2.01690655723354, -2.05437965817068, + -1.9462397190173, -1.98174121939254, -2.09185275910783, + -2.12932586004497, -2.01724271976779, -2.05274422014304, + -2.16679896098212, -2.20427206191926, -2.08824572051828, + -2.12374722089353, -2.24174516285641, -2.27921826379355, + -2.15924872126878, -2.19475022164402, -2.3166913647307, + -2.35416446566784, -2.23025172201927, -2.26575322239452, + -2.39163756660499, -2.42911066754214, -2.30125472276977, + -2.33675622314501, -2.46658376847928, -2.50405686941643, + -2.37225772352026, -2.40775922389551, -2.54152997035357, + -2.57900307129072, -2.44326072427075, -2.478762224646, -2.61647617222786, + -2.65394927316501, -2.51426372502125, -2.54976522539649, + -2.69142237410215, -2.7288954750393, -2.58526672577174, + -2.62076822614699, -2.76636857597644, -2.80384167691359, + -2.65626972652223, -2.69177122689748, -2.84131477785073, + -2.87878787878788, -2.72727272727273, -1.17520418338048, + -1.23285623201891, -1.27432350754656, -1.21467437161288, + -1.25414455984527, -1.3157907830742, -1.35725805860184, + -1.29361474807766, -1.33308493631006, -1.39872533412949, + -1.44019260965713, -1.37255512454245, -1.41202531277485, + -1.48165988518478, -1.52312716071242, -1.45149550100724, + -1.49096568923964, -1.56459443624006, -1.60606171176771, + -1.53043587747203, -1.56990606570443, -1.64752898729535, -1.688996262823, + -1.60937625393682, -1.64884644216922, -1.73046353835064, + -1.77193081387828, -1.68831663040161, -1.72778681863401, + -1.81339808940593, -1.85486536493357, -1.7672570068664, -1.8067271950988, + -1.89633264046122, -1.93779991598886, -1.84619738333119, + -1.88566757156358, -1.9792671915165, -2.02073446704415, + -1.92513775979598, -1.96460794802837, -2.06220174257179, + -2.10366901809944, -2.00407813626077, -2.04354832449316, + -2.14513629362708, -2.18660356915472, -2.08301851272556, + -2.12248870095795, -2.22807084468237, -2.26953812021001, + -2.16195888919035, -2.20142907742274, -2.31100539573766, + -2.3524726712653, -2.24089926565514, -2.28036945388753, + -2.39393994679294, -2.43540722232059, -2.31983964211993, + -2.35930983035232, -2.47687449784823, -2.51834177337588, + -2.39878001858472, -2.43825020681711, -2.55980904890352, + -2.60127632443116, -2.4777203950495, -2.5171905832819, -2.64274359995881, + -2.68421087548645, -2.55666077151429, -2.59613095974669, + -2.7256781510141, -2.76714542654174, -2.63560114797908, + -2.67507133621148, -2.80861270206938, -2.85007997759703, + -2.71454152444387, -2.75401171267627, -2.89154725312467, + -2.93301452865232, -2.79348190090866, -2.83295208914106, + -2.97448180417996, -3.01594907970761, -2.87242227737345, + -2.91189246560585, -3.05741635523525, -3.09888363076289, + -2.95136265383824, -2.99083284207064, -3.14035090629054, + -3.18181818181818, -3.03030303030303, -1.28918695439329, + -1.34551767676768, -1.39103535353535, -1.33267943054095, + -1.37617190668861, -1.43655303030303, -1.48207070707071, + -1.41966438283628, -1.46315685898394, -1.52758838383838, + -1.57310606060606, -1.5066493351316, -1.55014181127926, + -1.61862373737374, -1.66414141414141, -1.59363428742692, + -1.63712676357458, -1.70965909090909, -1.75517676767677, + -1.68061923972224, -1.7241117158699, -1.80069444444444, + -1.84621212121212, -1.76760419201756, -1.81109666816522, + -1.8917297979798, -1.93724747474747, -1.85458914431288, + -1.89808162046054, -1.98276515151515, -2.02828282828283, + -1.9415740966082, -1.98506657275586, -2.0738005050505, -2.11931818181818, + -2.02855904890352, -2.07205152505118, -2.16483585858586, + -2.21035353535354, -2.11554400119884, -2.1590364773465, + -2.25587121212121, -2.30138888888889, -2.20252895349416, + -2.24602142964182, -2.34690656565657, -2.39242424242424, + -2.28951390578948, -2.33300638193714, -2.43794191919192, + -2.4834595959596, -2.3764988580848, -2.41999133423246, -2.52897727272727, + -2.57449494949495, -2.46348381038012, -2.50697628652779, + -2.62001262626263, -2.6655303030303, -2.55046876267545, + -2.59396123882311, -2.71104797979798, -2.75656565656566, + -2.63745371497077, -2.68094619111843, -2.80208333333333, + -2.84760101010101, -2.72443866726609, -2.76793114341375, + -2.89311868686869, -2.93863636363636, -2.81142361956141, + -2.85491609570907, -2.98415404040404, -3.02967171717172, + -2.89840857185673, -2.94190104800439, -3.07518939393939, + -3.12070707070707, -2.98539352415205, -3.02888600029971, + -3.16622474747475, -3.21174242424242, -3.07237847644737, + -3.11587095259503, -3.2572601010101, -3.30277777777778, + -3.15936342874269, -3.20285590489035, -3.34829545454545, + -3.39381313131313, -3.24634838103801, -3.28984085718567, + -3.43933080808081, -3.48484848484848, -3.33333333333333, + -1.40040661631043, -1.45529555585318, -1.50492498632181, + -1.44798016992858, -1.49555372354674, -1.55455441679044, + -1.60418384725907, -1.54312727716489, -1.59070083078304, + -1.6538132777277, -1.70344270819633, -1.6382743844012, -1.68584793801935, + -1.75307213866496, -1.80270156913359, -1.7334214916375, + -1.78099504525566, -1.85233099960222, -1.90196043007085, + -1.82856859887381, -1.87614215249196, -1.95158986053948, + -2.00121929100811, -1.92371570611012, -1.97128925972827, + -2.05084872147674, -2.10047815194537, -2.01886281334642, + -2.06643636696458, -2.150107582414, -2.19973701288263, -2.11400992058273, + -2.16158347420088, -2.24936644335126, -2.29899587381989, + -2.20915702781904, -2.25673058143719, -2.34862530428852, + -2.39825473475715, -2.30430413505534, -2.3518776886735, + -2.44788416522578, -2.49751359569441, -2.39945124229165, + -2.4470247959098, -2.54714302616304, -2.59677245663167, + -2.49459834952796, -2.54217190314611, -2.6464018871003, + -2.69603131756893, -2.58974545676426, -2.63731901038242, + -2.74566074803756, -2.79529017850619, -2.68489256400057, + -2.73246611761872, -2.84491960897482, -2.89454903944345, + -2.78003967123688, -2.82761322485503, -2.94417846991208, + -2.99380790038071, -2.87518677847318, -2.92276033209134, + -3.04343733084934, -3.09306676131797, -2.97033388570949, + -3.01790743932764, -3.1426961917866, -3.19232562225523, -3.0654809929458, + -3.11305454656395, -3.24195505272386, -3.29158448319249, + -3.1606281001821, -3.20820165380026, -3.34121391366112, + -3.39084334412975, -3.25577520741841, -3.30334876103656, + -3.44047277459838, -3.49010220506701, -3.35092231465472, + -3.39849586827287, -3.53973163553564, -3.58936106600427, + -3.44606942189102, -3.49364297550918, -3.6389904964729, + -3.68861992694153, -3.54121652912733, -3.58879008274548, + -3.73824935741016, -3.78787878787879, -3.63636363636364, + -1.50862552209857, -1.56195548834395, -1.61576301180278, + -1.5603439990623, -1.61206247602603, -1.66957053526161, + -1.72337805872045, -1.66378095298976, -1.71549942995349, + -1.77718558217928, -1.83099310563811, -1.76721790691722, + -1.81893638388095, -1.88480062909694, -1.93860815255578, + -1.87065486084469, -1.92237333780842, -1.99241567601461, + -2.04622319947344, -1.97409181477215, -2.02581029173588, + -2.10003072293228, -2.15383824639111, -2.07752876869961, + -2.12924724566334, -2.20764576984994, -2.26145329330877, + -2.18096572262707, -2.2326841995908, -2.31526081676761, + -2.36906834022644, -2.28440267655454, -2.33612115351827, + -2.42287586368527, -2.47668338714411, -2.387839630482, -2.43955810744573, + -2.53049091060294, -2.58429843406177, -2.49127658440946, + -2.54299506137319, -2.6381059575206, -2.69191348097944, + -2.59471353833692, -2.64643201530066, -2.74572100443827, + -2.7995285278971, -2.69815049226439, -2.74986896922812, + -2.85333605135594, -2.90714357481477, -2.80158744619185, + -2.85330592315558, -2.9609510982736, -3.01475862173243, + -2.90502440011931, -2.95674287708304, -3.06856614519127, + -3.1223736686501, -3.00846135404678, -3.06017983101051, + -3.17618119210893, -3.22998871556777, -3.11189830797424, + -3.16361678493797, -3.2837962390266, -3.33760376248543, -3.2153352619017, + -3.26705373886543, -3.39141128594426, -3.4452188094031, + -3.31877221582916, -3.37049069279289, -3.49902633286193, + -3.55283385632076, -3.42220916975663, -3.47392764672036, + -3.6066413797796, -3.66044890323843, -3.52564612368409, + -3.57736460064782, -3.71425642669726, -3.76806395015609, + -3.62908307761155, -3.68080155457528, -3.82187147361493, + -3.87567899707376, -3.73252003153901, -3.78423850850275, + -3.92948652053259, -3.98329404399143, -3.83595698546648, + -3.88767546243021, -4.03710156745026, -4.09090909090909, + -3.93939393939394, -1.61361282240215, -1.66527015646036, + -1.72332694874715, -1.66954498027497, -1.72547713814778, + -1.78138374103394, -1.83944053332073, -1.78140929602059, + -1.8373414538934, -1.89749732560751, -1.9555541178943, -1.89327361176621, + -1.94920576963902, -2.01361091018109, -2.07166770246788, + -2.00513792751183, -2.06107008538464, -2.12972449475466, + -2.18778128704145, -2.11700224325745, -2.17293440113026, + -2.24583807932824, -2.30389487161503, -2.22886655900307, + -2.28479871687588, -2.36195166390182, -2.4200084561886, + -2.34073087474869, -2.3966630326215, -2.47806524847539, + -2.53612204076218, -2.45259519049431, -2.50852734836712, + -2.59417883304897, -2.65223562533576, -2.56445950623993, + -2.62039166411274, -2.71029241762254, -2.76834920990933, + -2.67632382198555, -2.73225597985836, -2.82640600219612, + -2.88446279448291, -2.78818813773117, -2.84412029560398, + -2.9425195867697, -3.00057637905648, -2.90005245347679, -2.9559846113496, + -3.05863317134327, -3.11668996363006, -3.01191676922241, + -3.06784892709522, -3.17474675591685, -3.23280354820364, + -3.12378108496803, -3.17971324284085, -3.29086034049042, + -3.34891713277721, -3.23564540071366, -3.29157755858647, -3.406973925064, + -3.46503071735079, -3.34750971645928, -3.40344187433209, + -3.52308750963758, -3.58114430192436, -3.4593740322049, + -3.51530619007771, -3.63920109421115, -3.69725788649794, + -3.57123834795052, -3.62717050582333, -3.75531467878473, + -3.81337147107151, -3.68310266369614, -3.73903482156895, + -3.8714282633583, -3.92948505564509, -3.79496697944176, + -3.85089913731457, -3.98754184793188, -4.04559864021867, + -3.90683129518738, -3.96276345306019, -4.10365543250545, + -4.16171222479224, -4.018695610933, -4.07462776880581, -4.21976901707903, + -4.27782580936582, -4.13055992667862, -4.18649208455143, + -4.33588260165261, -4.39393939393939, -4.24242424242424, + -1.71514498849147, -1.76501982052257, -1.82740173278741, + -1.77536434076728, -1.83558369304309, -1.88978364505224, + -1.95216555731707, -1.8958030453189, -1.95602239759471, -2.0145474695819, + -2.07692938184674, -2.01624174987052, -2.07646110214633, + -2.13931129411157, -2.2016932063764, -2.13668045442214, + -2.19689980669795, -2.26407511864123, -2.32645703090606, + -2.25711915897376, -2.31733851124957, -2.3888389431709, + -2.45122085543573, -2.37755786352538, -2.43777721580119, + -2.51360276770056, -2.57598467996539, -2.497996568077, -2.55821592035281, + -2.63836659223023, -2.70074850449506, -2.61843527262862, + -2.67865462490443, -2.76313041675989, -2.82551232902472, + -2.73887397718024, -2.79909332945605, -2.88789424128956, + -2.95027615355439, -2.85931268173186, -2.91953203400767, + -3.01265806581922, -3.07503997808405, -2.97975138628348, + -3.03997073855929, -3.13742189034889, -3.19980380261372, + -3.1001900908351, -3.16040944311091, -3.26218571487855, + -3.32456762714338, -3.22062879538672, -3.28084814766253, + -3.38694953940822, -3.44933145167305, -3.34106749993834, + -3.40128685221415, -3.51171336393788, -3.57409527620271, + -3.46150620448996, -3.52172555676577, -3.63647718846755, + -3.69885910073238, -3.58194490904158, -3.64216426131739, + -3.76124101299721, -3.82362292526204, -3.7023836135932, + -3.76260296586901, -3.88600483752688, -3.94838674979171, + -3.82282231814482, -3.88304167042063, -4.01076866205654, + -4.07315057432137, -3.94326102269644, -4.00348037497225, + -4.13553248658621, -4.19791439885104, -4.06369972724806, + -4.12391907952387, -4.26029631111587, -4.3226782233807, + -4.18413843179968, -4.2443577840755, -4.38506013564553, + -4.44744204791037, -4.3045771363513, -4.36479648862711, -4.5098239601752, + -4.57220587244003, -4.42501584090293, -4.48523519317874, + -4.63458778470486, -4.6969696969697, -4.54545454545454, + -1.81300631862706, -1.86099281673154, -1.9277802036096, -1.8775909681985, + -1.94217561776994, -1.99456759048765, -2.0613549773657, + -2.00676026734139, -2.07134491691283, -2.12814236424375, + -2.1949297511218, -2.13592956648427, -2.20051421605571, + -2.26171713799986, -2.32850452487791, -2.26509886562715, + -2.3296835151986, -2.39529191175596, -2.46207929863401, + -2.39426816477004, -2.45885281434148, -2.52886668551207, + -2.59565407239012, -2.52343746391292, -2.58802211348437, + -2.66244145926817, -2.72922884614622, -2.65260676305581, + -2.71719141262725, -2.79601623302427, -2.86280361990233, + -2.78177606219869, -2.84636071177014, -2.92959100678038, + -2.99637839365843, -2.91094536134158, -2.97553001091302, + -3.06316578053648, -3.12995316741454, -3.04011466048446, + -3.1046993100559, -3.19674055429259, -3.26352794117064, + -3.16928395962735, -3.23386860919879, -3.33031532804869, + -3.39710271492675, -3.29845325877023, -3.36303790834167, + -3.4638901018048, -3.53067748868285, -3.42762255791312, + -3.49220720748456, -3.5974648755609, -3.66425226243895, -3.556791857056, + -3.62137650662744, -3.73103964931701, -3.79782703619506, + -3.68596115619889, -3.75054580577033, -3.86461442307311, + -3.93140180995116, -3.81513045534177, -3.87971510491321, + -3.99818919682922, -4.06497658370727, -3.94429975448466, + -4.0088844040561, -4.13176397058532, -4.19855135746337, + -4.07346905362754, -4.13805370319898, -4.26533874434142, + -4.33212613121948, -4.20263835277042, -4.26722300234187, + -4.39891351809753, -4.46570090497558, -4.33180765191331, + -4.39639230148475, -4.53248829185363, -4.59927567873169, + -4.46097695105619, -4.52556160062764, -4.66606306560974, + -4.73285045248779, -4.59014625019908, -4.65473089977052, + -4.79963783936584, -4.8664252262439, -4.71931554934196, + -4.78390019891341, -4.93321261312195, -5, -4.84848484848485, + -1.90383286103702, -1.94667290534249, -2.0116373116118, -1.9697087576107, + -2.03558465418438, -2.07660171788111, -2.14156612415042, + -2.10146055075806, -2.16733644733174, -2.20653053041973, + -2.27149493668903, -2.23321234390542, -2.2990882404791, + -2.33645934295834, -2.40142374922765, -2.36496413705278, + -2.43084003362646, -2.46638815549696, -2.53135256176627, + -2.49671593020014, -2.56259182677382, -2.59631696803558, + -2.66128137430489, -2.6284677233475, -2.69434361992118, -2.7262457805742, + -2.7912101868435, -2.76021951649486, -2.82609541306854, + -2.85617459311281, -2.92113899938212, -2.89197130964222, + -2.9578472062159, -2.98610340565143, -3.05106781192074, + -3.02372310278959, -3.08959899936327, -3.11603221819005, + -3.18099662445936, -3.15547489593695, -3.22135079251063, + -3.24596103072867, -3.31092543699797, -3.28722668908431, + -3.35310258565799, -3.37588984326728, -3.44085424953659, + -3.41897848223167, -3.48485437880535, -3.5058186558059, + -3.57078306207521, -3.55073027537903, -3.61660617195271, + -3.63574746834452, -3.70071187461383, -3.68248206852639, + -3.74835796510007, -3.76567628088313, -3.83064068715244, + -3.81423386167375, -3.88010975824743, -3.89560509342175, + -3.96056949969106, -3.94598565482111, -4.01186155139479, + -4.02553390596037, -4.09049831222968, -4.07773744796847, + -4.14361334454215, -4.15546271849899, -4.2204271247683, + -4.20948924111583, -4.27536513768951, -4.2853915310376, + -4.35035593730691, -4.3412410342632, -4.40711693083688, + -4.41532034357622, -4.48028474984553, -4.47299282741056, + -4.53886872398424, -4.54524915611484, -4.61021356238415, + -4.60474462055792, -4.6706205171316, -4.67517796865346, + -4.74014237492277, -4.73649641370528, -4.80237231027896, + -4.80510678119207, -4.87007118746138, -4.86824820685264, + -4.93412410342632, -4.93503559373069, -5, -5, -1.98742601502635, + -2.02817912471022, -2.09140935609936, -2.05152333385558, + -2.11562065268481, -2.1546395874885, -2.21786981887765, + -2.17971797151403, -2.24381529034326, -2.28110005026679, + -2.34433028165594, -2.30791260917249, -2.37200992800171, + -2.40756051304508, -2.47079074443423, -2.43610724683094, + -2.50020456566017, -2.53402097582337, -2.59725120721251, + -2.56430188448939, -2.62839920331862, -2.66048143860166, + -2.7237116699908, -2.69249652214785, -2.75659384097707, + -2.78694190137995, -2.85017213276909, -2.8206911598063, + -2.88478847863552, -2.91340236415824, -2.97663259554738, + -2.94888579746475, -3.01298311629398, -3.03986282693652, + -3.10309305832567, -3.0770804351232, -3.14117775395243, + -3.16632328971481, -3.22955352110396, -3.20527507278166, + -3.26937239161088, -3.2927837524931, -3.35601398388225, + -3.33346971044011, -3.39756702926934, -3.41924421527139, + -3.48247444666054, -3.46166434809856, -3.52576166692779, + -3.54570467804968, -3.60893490943882, -3.58985898575702, + -3.65395630458624, -3.67216514082797, -3.73539537221711, + -3.71805362341547, -3.7821509422447, -3.79862560360626, -3.8618558349954, + -3.84624826107392, -3.91034557990315, -3.92508606638455, + -3.98831629777369, -3.97444289873238, -4.0385402175616, + -4.05154652916283, -4.11477676055198, -4.10263753639083, + -4.16673485522006, -4.17800699194112, -4.24123722333027, + -4.23083217404928, -4.29492949287851, -4.30446745471941, + -4.36769768610856, -4.35902681170773, -4.42312413053696, + -4.4309279174977, -4.49415814888685, -4.48722144936619, + -4.55131876819542, -4.55738838027599, -4.62061861166513, + -4.61541608702464, -4.67951340585387, -4.68384884305428, + -4.74707907444342, -4.74361072468309, -4.80770804351232, + -4.81030930583257, -4.87353953722171, -4.87180536234155, + -4.93590268117077, -4.93676976861086, -5, -5, -2.06675298087145, + -2.10532683703268, -2.16691562773411, -2.12916249191674, + -2.19157200296202, -2.22850441843554, -2.29009320913698, + -2.25398151400731, -2.3163910250526, -2.35168199983841, + -2.41327079053984, -2.37880053609789, -2.44121004714318, + -2.47485958124127, -2.53644837194271, -2.50361955818847, + -2.56602906923375, -2.59803716264414, -2.65962595334557, + -2.62843858027904, -2.69084809132433, -2.721214744047, -2.78280353474844, + -2.75325760236962, -2.81566711341491, -2.84439232544987, + -2.9059811161513, -2.8780766244602, -2.94048613550548, -2.96756990685273, + -3.02915869755416, -3.00289564655077, -3.06530515759606, + -3.0907474882556, -3.15233627895703, -3.12771466864135, + -3.19012417968664, -3.21392506965846, -3.27551386035989, + -3.25253369073193, -3.31494320177721, -3.33710265106133, + -3.39869144176276, -3.3773527128225, -3.43976222386779, + -3.46028023246419, -3.52186902316562, -3.50217173491308, + -3.56458124595837, -3.58345781386706, -3.64504660456849, + -3.62699075700366, -3.68940026804894, -3.70663539526992, + -3.76822418597135, -3.75180977909423, -3.81421929013952, + -3.82981297667279, -3.89140176737422, -3.87662880118481, + -3.9390383122301, -3.95299055807565, -4.01457934877708, + -4.00144782327539, -4.06385733432067, -4.07616813947851, + -4.13775693017995, -4.12626684536596, -4.18867635641125, + -4.19934572088138, -4.26093451158281, -4.25108586745654, + -4.31349537850183, -4.32252330228424, -4.38411209298568, + -4.37590488954712, -4.4383144005924, -4.44570088368711, + -4.50728967438854, -4.50072391163769, -4.56313342268298, + -4.56887846508997, -4.63046725579141, -4.62554293372827, + -4.68795244477356, -4.69205604649284, -4.75364483719427, + -4.75036195581885, -4.81277146686413, -4.8152336278957, + -4.87682241859714, -4.87518097790942, -4.93759048895471, + -4.93841120929857, -5, -5, -2.14163405748041, -2.17794127792815, + -2.23798508052542, -2.20245035412977, -2.26326665077912, + -2.29802888312269, -2.35807268571997, -2.32408294742847, + -2.38489924407782, -2.41811648831724, -2.47816029091451, + -2.44571554072718, -2.50653183737653, -2.53820409351179, + -2.59824789610906, -2.56734813402588, -2.62816443067524, + -2.65829169870633, -2.71833550130361, -2.68898072732459, + -2.74979702397394, -2.77837930390088, -2.83842310649815, + -2.8106133206233, -2.87142961727265, -2.89846690909543, -2.9585107116927, + -2.932245913922, -2.99306221057135, -3.01855451428998, -3.07859831688725, + -3.05387850722071, -3.11469480387006, -3.13864211948452, + -3.1986859220818, -3.17551110051941, -3.23632739716877, + -3.25872972467907, -3.31877352727634, -3.29714369381812, + -3.35795999046747, -3.37881732987362, -3.43886113247089, + -3.41877628711682, -3.47959258376618, -3.49890493506816, + -3.55894873766544, -3.54040888041553, -3.60122517706488, + -3.61899254026271, -3.67903634285998, -3.66204147371424, + -3.72285777036359, -3.73908014545726, -3.79912394805453, + -3.78367406701294, -3.84449036366229, -3.8591677506518, + -3.91921155324908, -3.90530666031165, -3.966122956961, -3.97925535584635, + -4.03929915844362, -4.02693925361035, -4.08775555025971, + -4.0993429610409, -4.15938676363817, -4.14857184690906, + -4.20938814355841, -4.21943056623545, -4.27947436883272, + -4.27020444020777, -4.33102073685712, -4.33951817142999, + -4.39956197402727, -4.39183703350647, -4.45265333015582, + -4.45960577662454, -4.51964957922181, -4.51346962680518, + -4.57428592345453, -4.57969338181909, -4.63973718441636, + -4.63510222010388, -4.69591851675323, -4.69978098701363, + -4.75982478961091, -4.75673481340259, -4.81755111005194, + -4.81986859220818, -4.87991239480545, -4.87836740670129, + -4.93918370335065, -4.93995619740273, -5, -5, -2.21189961513043, + -2.24585795233271, -2.30445671930436, -2.27122089991489, + -2.33054218469935, -2.363055486276, -2.42165425324765, -2.38986346948381, + -2.44918475426827, -2.48025302021929, -2.53885178719094, + -2.50850603905273, -2.56782732383718, -2.59745055416258, + -2.65604932113423, -2.62714860862164, -2.6864698934061, + -2.71464808810587, -2.77324685507751, -2.74579117819056, + -2.80511246297502, -2.83184562204916, -2.8904443890208, + -2.86443374775948, -2.92375503254394, -2.94904315599245, + -3.00764192296409, -2.9830763173284, -3.04239760211286, + -3.06624068993574, -3.12483945690738, -3.10171888689731, + -3.16104017168177, -3.18343822387902, -3.24203699085067, + -3.22036145646623, -3.27968274125069, -3.30063575782231, + -3.35923452479396, -3.33900402603515, -3.39832531081961, + -3.4178332917656, -3.47643205873725, -3.45764659560407, + -3.51696788038853, -3.53503082570889, -3.59362959268054, + -3.57628916517299, -3.63561044995744, -3.65222835965218, + -3.71082712662382, -3.6949317347419, -3.75425301952636, + -3.76942589359547, -3.82802466056711, -3.81357430431082, + -3.87289558909528, -3.88662342753876, -3.9452221945104, + -3.93221687387974, -3.9915381586642, -4.00382096148205, + -4.06241972845369, -4.05085944344866, -4.11018072823312, + -4.12101849542533, -4.17961726239698, -4.16950201301758, + -4.22882329780203, -4.23821602936862, -4.29681479634027, + -4.28814458258649, -4.34746586737095, -4.35541356331191, + -4.41401233028356, -4.40678715215541, -4.46610843693987, + -4.4726110972552, -4.53120986422685, -4.52542972172433, + -4.58475100650879, -4.58980863119849, -4.64840739817013, + -4.64407229129325, -4.70339357607771, -4.70700616514178, + -4.76560493211342, -4.76271486086216, -4.82203614564662, + -4.82420369908507, -4.88280246605671, -4.88135743043108, + -4.94067871521554, -4.94140123302836, -5, -5, -2.27739047973363, + -2.30892300713455, -2.36617996442956, -2.33531834186696, + -2.39324620400029, -2.42343692172457, -2.48069387901958, + -2.45117406613361, -2.50910192826694, -2.53795083631459, + -2.5952077936096, -2.56702979040027, -2.62495765253359, + -2.65246475090461, -2.70972170819962, -2.68288551466692, + -2.74081337680025, -2.76697866549463, -2.82423562278964, + -2.79874123893357, -2.8566691010669, -2.88149258008465, + -2.93874953737966, -2.91459696320023, -2.97252482533356, + -2.99600649467466, -3.05326345196967, -3.03045268746688, + -3.08838054960021, -3.11052040926468, -3.16777736655969, + -3.14630841173354, -3.20423627386686, -3.2250343238547, + -3.28229128114971, -3.26216413600019, -3.32009199813352, + -3.33954823844472, -3.39680519573973, -3.37801986026684, + -3.43594772240017, -3.45406215303474, -3.51131911032975, + -3.4938755845335, -3.55180344666683, -3.56857606762476, + -3.62583302491977, -3.60973130880015, -3.66765917093348, + -3.68308998221478, -3.74034693950979, -3.72558703306681, + -3.78351489520013, -3.7976038968048, -3.85486085409981, + -3.84144275733346, -3.89937061946679, -3.91211781139482, + -3.96937476868983, -3.95729848160011, -4.01522634373344, + -4.02663172598484, -4.08388868327985, -4.07315420586677, + -4.1310820680001, -4.14114564057486, -4.19840259786987, + -4.18900993013342, -4.24693779226675, -4.25565955516488, + -4.31291651245988, -4.30486565440008, -4.3627935165334, + -4.37017346975489, -4.4274304270499, -4.42072137866673, + -4.47864924080006, -4.48468738434491, -4.54194434163992, + -4.53657710293338, -4.59450496506671, -4.59920129893493, + -4.65645825622994, -4.65243282720004, -4.71036068933337, + -4.71371521352495, -4.77097217081996, -4.76828855146669, + -4.82621641360002, -4.82822912811497, -4.88548608540998, + -4.88414427573335, -4.94207213786667, -4.94274304270499, -5, -5, + -2.3379582934176, -2.36699357970066, -2.42301499289852, + -2.39459747866404, -2.45123666391047, -2.47903640609638, + -2.53505781929423, -2.50787584915691, -2.56451503440334, + -2.59107923249209, -2.64710064568995, -2.62115421964977, + -2.67779340489621, -2.70312205888781, -2.75914347208567, + -2.73443259014264, -2.79107177538908, -2.81516488528353, + -2.87118629848138, -2.84771096063551, -2.90435014588194, + -2.92720771167924, -2.9832291248771, -2.96098933112838, + -3.01762851637481, -3.03925053807496, -3.09527195127282, + -3.07426770162125, -3.13090688686768, -3.15129336447068, + -3.20731477766853, -3.18754607211411, -3.24418525736055, + -3.26333619086639, -3.31935760406425, -3.30082444260698, + -3.35746362785342, -3.37537901726211, -3.43140043045997, + -3.41410281309985, -3.47074199834628, -3.48742184365783, + -3.54344325685568, -3.52738118359272, -3.58402036883915, + -3.59946467005354, -3.6554860832514, -3.64065955408559, + -3.69729873933202, -3.71150749644926, -3.76752890964712, + -3.75393792457845, -3.81057710982489, -3.82355032284498, + -3.87957173604283, -3.86721629507132, -3.92385548031775, + -3.93559314924069, -3.99161456243855, -3.98049466556419, + -4.03713385081062, -4.04763597563641, -4.10365738883427, + -4.09377303605706, -4.15041222130349, -4.15967880203213, + -4.21570021522998, -4.20705140654993, -4.26369059179636, + -4.27172162842784, -4.3277430416257, -4.32032977704279, + -4.37696896228923, -4.38376445482356, -4.43978586802142, + -4.43360814753566, -4.49024733278209, -4.49580728121928, + -4.55182869441713, -4.54688651802853, -4.60352570327496, + -4.60785010761499, -4.66387152081285, -4.6601648885214, + -4.71680407376783, -4.71989293401071, -4.77591434720857, + -4.77344325901426, -4.8300824442607, -4.83193576040643, + -4.88795717360428, -4.88672162950713, -4.94336081475357, + -4.94397858680214, -5, -5, -2.39346585060369, -2.41993812150671, + -2.47483305509168, -2.4489240239951, -2.50438219738651, + -2.52972798867664, -2.5846229222616, -2.55984037077792, + -2.61529854416933, -2.63951785584657, -2.69441278943153, + -2.67075671756074, -2.72621489095215, -2.74930772301649, + -2.80420265660146, -2.78167306434356, -2.83713123773497, + -2.85909759018642, -2.91399252377138, -2.89258941112638, + -2.94804758451779, -2.96888745735635, -3.02378239094131, + -3.00350575790921, -3.05896393130062, -3.07867732452627, + -3.13357225811124, -3.11442210469203, -3.16988027808344, + -3.1884671916962, -3.24336212528117, -3.22533845147485, + -3.28079662486626, -3.29825705886613, -3.35315199245109, + -3.33625479825767, -3.39171297164908, -3.40804692603606, + -3.46294185962102, -3.44717114504049, -3.5026293184319, + -3.51783679320598, -3.57273172679095, -3.55808749182332, + -3.61354566521473, -3.62762666037591, -3.68252159396087, + -3.66900383860614, -3.72446201199755, -3.73741652754584, + -3.7923114611308, -3.77992018538896, -3.83537835878037, + -3.84720639471576, -3.90210132830073, -3.89083653217178, + -3.94629470556319, -3.95699626188569, -4.01189119547066, + -4.0017528789546, -4.05721105234601, -4.06678612905562, + -4.12168106264058, -4.11266922573742, -4.16812739912884, + -4.17657599622555, -4.23147092981051, -4.22358557252025, + -4.27904374591166, -4.28636586339547, -4.34126079698044, + -4.33450191930307, -4.38996009269448, -4.3961557305654, + -4.45105066415036, -4.44541826608589, -4.5008764394773, + -4.50594559773533, -4.56084053132029, -4.55633461286871, + -4.61179278626012, -4.61573546490525, -4.67063039849022, + -4.66725095965153, -4.72270913304295, -4.72552533207518, + -4.78042026566015, -4.77816730643436, -4.83362547982577, + -4.83531519924511, -4.89021013283007, -4.88908365321718, + -4.94454182660859, -4.94510506641504, -5, -5, -2.44378740882173, + -2.46763669613675, -2.52151676643171, -2.4981749107617, + -2.55256241270166, -2.57539683672668, -2.62927690702164, + -2.60694991464162, -2.66133741658158, -2.6831569773166, + -2.73703704761157, -2.71572491852155, -2.77011242046151, + -2.79091711790653, -2.84479718820149, -2.82449992240147, + -2.87888742434144, -2.89867725849645, -2.95255732879142, + -2.9332749262814, -2.98766242822136, -3.00643739908638, + -3.06031746938134, -3.04204993016133, -3.09643743210129, + -3.1141975396763, -3.16807760997127, -3.15082493404125, + -3.20521243598122, -3.22195768026623, -3.27583775056119, + -3.25959993792118, -3.31398743986114, -3.32971782085616, + -3.38359789115112, -3.36837494180111, -3.42276244374107, + -3.43747796144608, -3.49135803174104, -3.47714994568103, + -3.53153744762099, -3.54523810203601, -3.59911817233097, + -3.58592494956096, -3.64031245150092, -3.65299824262593, + -3.70687831292089, -3.69469995344088, -3.74908745538085, + -3.76075838321586, -3.81463845351082, -3.80347495732081, + -3.85786245926077, -3.86851852380578, -3.92239859410075, + -3.91224996120074, -3.9666374631407, -3.97627866439571, + -4.03015873469067, -4.02102496508066, -4.07541246702063, + -4.08403880498563, -4.1379188752806, -4.12979996896059, + -4.18418747090055, -4.19179894557556, -4.24567901587052, + -4.23857497284052, -4.29296247478048, -4.29955908616548, + -4.35343915646045, -4.34734997672044, -4.40173747866041, + -4.40731922675541, -4.46119929705037, -4.45612498060037, + -4.51051248254033, -4.51507936734534, -4.5689594376403, -4.5648999844803, + -4.61928748642026, -4.62283950793526, -4.67671957823022, + -4.67367498836022, -4.72806249030018, -4.73059964852519, + -4.78447971882015, -4.78244999224015, -4.83683749418011, + -4.83835978911511, -4.89223985941007, -4.89122499612007, + -4.94561249806004, -4.94611992970504, -5, -5, -2.48880897355726, + -2.50998125097776, -2.56296037329738, -2.54223856986455, + -2.59566816617184, -2.615939495617, -2.66891861793663, -2.64909776247913, + -2.70252735878643, -2.72189774025625, -2.77487686257587, + -2.75595695509372, -2.80938655140101, -2.82785598489549, + -2.88083510721511, -2.8628161477083, -2.91624574401559, + -2.93381422953474, -2.98679335185436, -2.96967534032289, + -3.02310493663018, -3.03977247417398, -3.0927515964936, + -3.07653453293747, -3.12996412924476, -3.14573071881323, + -3.19870984113285, -3.18339372555206, -3.23682332185935, + -3.25168896345247, -3.30466808577209, -3.29025291816664, + -3.34368251447393, -3.35764720809171, -3.41062633041134, + -3.39711211078123, -3.45054170708852, -3.46360545273096, + -3.51658457505058, -3.50397130339581, -3.5574008997031, -3.5695636973702, + -3.62254281968982, -3.6108304960104, -3.66426009231769, + -3.67552194200945, -3.72850106432907, -3.71768968862498, + -3.77111928493227, -3.78148018664869, -3.83445930896831, + -3.82454888123957, -3.87797847754686, -3.88743843128794, + -3.94041755360756, -3.93140807385415, -3.98483767016144, + -3.99339667592718, -4.0463757982468, -4.03826726646874, + -4.09169686277603, -4.09935492056642, -4.15233404288605, + -4.14512645908332, -4.19855605539061, -4.20531316520567, + -4.25829228752529, -4.25198565169791, -4.3054152480052, + -4.31127140984491, -4.36425053216453, -4.35884484431249, + -4.41227444061978, -4.41722965448416, -4.47020877680378, + -4.46570403692708, -4.51913363323437, -4.5231878991234, + -4.57616702144302, -4.57256322954166, -4.62599282584895, + -4.62914614376264, -4.68212526608227, -4.67942242215625, + -4.73285201846354, -4.73510438840189, -4.78808351072151, + -4.78628161477083, -4.83971121107812, -4.84106263304113, + -4.89404175536076, -4.89314080738542, -4.94657040369271, + -4.94702087768038, -5, -5, -2.52842855648567, -2.54687586199357, + -2.59906999258946, -2.58101518294342, -2.63360180940117, + -2.65126412318534, -2.70345825378122, -2.68618843585892, + -2.73877506231667, -2.7556523843771, -2.80784651497298, + -2.79136168877443, -2.84394831523218, -2.86004064556886, + -2.91223477616474, -2.89653494168993, -2.94912156814768, + -2.96442890676063, -3.01662303735651, -3.00170819460543, + -3.05429482106318, -3.06881716795239, -3.12101129854827, + -3.10688144752094, -3.15946807397869, -3.17320542914415, + -3.22539955974003, -3.21205470043644, -3.26464132689419, + -3.27759369033591, -3.3297878209318, -3.31722795335194, -3.3698145798097, + -3.38198195152768, -3.43417608212356, -3.42240120626745, + -3.4749878327252, -3.48637021271944, -3.53856434331532, + -3.52757445918295, -3.5801610856407, -3.5907584739112, -3.64295260450708, + -3.63274771209845, -3.68533433855621, -3.69514673510296, + -3.74734086569885, -3.73792096501396, -3.79050759147171, + -3.79953499629473, -3.85172912689061, -3.84309421792946, + -3.89568084438721, -3.90392325748649, -3.95611738808237, + -3.94826747084497, -4.00085409730272, -4.00831151867825, + -4.06050564927413, -4.05344072376047, -4.10602735021822, + -4.11269977987002, -4.1648939104659, -4.15861397667597, + -4.21120060313372, -4.21708804106178, -4.26928217165766, + -4.26378722959148, -4.31637385604923, -4.32147630225354, + -4.37367043284942, -4.36896048250698, -4.42154710896473, + -4.42586456344531, -4.47805869404119, -4.47413373542248, + -4.52672036188023, -4.53025282463707, -4.58244695523295, + -4.57930698833799, -4.63189361479574, -4.63464108582883, + -4.68683521642471, -4.68448024125349, -4.73706686771124, + -4.73902934702059, -4.79122347761647, -4.78965349416899, + -4.84224012062675, -4.84341760821236, -4.89561173880824, + -4.8948267470845, -4.94741337354225, -4.94780586940412, -5, -5, + -2.56255640650863, -2.57823695102368, -2.62976382440616, + -2.61441690849781, -2.66627741048698, -2.68129069778863, + -2.73281757117111, -2.71813791247616, -2.76999841446534, + -2.78434444455358, -2.83587131793606, -2.82185891645452, + -2.8737194184437, -2.88739819131853, -2.93892506470101, + -2.92557992043288, -2.97744042242205, -2.99045193808348, + -3.04197881146596, -3.02930092441123, -3.08116142640041, + -3.09350568484843, -3.14503255823091, -3.13302192838959, + -3.18488243037877, -3.19655943161338, -3.24808630499586, + -3.23674293236794, -3.28860343435712, -3.29961317837833, + -3.35114005176081, -3.3404639363463, -3.39232443833548, + -3.40266692514328, -3.45419379852575, -3.44418494032466, + -3.49604544231383, -3.50572067190823, -3.5572475452907, + -3.54790594430301, -3.59976644629219, -3.60877441867318, + -3.66030129205565, -3.65162694828137, -3.70348745027055, + -3.71182816543813, -3.7633550388206, -3.75534795225973, -3.8072084542489, + -3.81488191220308, -3.86640878558555, -3.85906895623808, + -3.91092945822726, -3.91793565896803, -3.9694625323505, + -3.96278996021644, -4.01465046220562, -4.02098940573298, + -4.07251627911545, -4.06651096419479, -4.11837146618397, + -4.12404315249793, -4.1755700258804, -4.17023196817315, + -4.22209247016233, -4.22709689926288, -4.27862377264535, + -4.27395297215151, -4.32581347414069, -4.33015064602783, + -4.3816775194103, -4.37767397612986, -4.42953447811904, + -4.43320439279278, -4.48473126617525, -4.48139498010822, + -4.5332554820974, -4.53625813955773, -4.5877850129402, -4.58511598408658, + -4.63697648607575, -4.63931188632268, -4.69083875970515, + -4.68883698806493, -4.74069749005411, -4.74236563308763, + -4.7938925064701, -4.79255799204329, -4.84441849403247, + -4.84541937985258, -4.89694625323505, -4.89627899602164, + -4.94813949801082, -4.94847312661753, -5, -5, -2.59111521306916, + -2.60399347511464, -2.65497233734624, -2.6423680808762, + -2.69362094868324, -2.70595119957785, -2.75693006180945, + -2.74487381649028, -2.79612668429732, -2.80790892404105, + -2.85888778627266, -2.84737955210436, -2.8986324199114, + -2.90986664850426, -2.96084551073586, -2.94988528771844, + -3.00113815552547, -3.01182437296747, -3.06280323519907, + -3.05239102333251, -3.10364389113955, -3.11378209743067, + -3.16476095966228, -3.15489675894659, -3.20614962675363, + -3.21573982189388, -3.26671868412548, -3.25740249456067, + -3.30865536236771, -3.31769754635709, -3.36867640858869, + -3.35990823017475, -3.41116109798179, -3.41965527082029, + -3.4706341330519, -3.46241396578883, -3.51366683359587, -3.5216129952835, + -3.57259185751511, -3.5649197014029, -3.61617256920994, + -3.62357071974671, -3.67454958197831, -3.66742543701698, + -3.71867830482402, -3.72552844420992, -3.77650730644152, + -3.76993117263106, -3.8211840404381, -3.82748616867312, + -3.87846503090473, -3.87243690824514, -3.92368977605218, + -3.92944389313633, -3.98042275536793, -3.97494264385922, + -4.02619551166626, -4.03140161759954, -4.08238047983114, + -4.0774483794733, -4.12870124728033, -4.13335934206274, + -4.18433820429435, -4.17995411508737, -4.23120698289441, + -4.23531706652595, -4.28629592875755, -4.28245985070145, + -4.33371271850849, -4.33727479098916, -4.38825365322076, + -4.38496558631553, -4.43621845412257, -4.43923251545236, + -4.49021137768397, -4.48747132192961, -4.53872418973665, + -4.54119023991557, -4.59216910214717, -4.58997705754369, + -4.64122992535073, -4.64314796437878, -4.69412682661038, + -4.69248279315777, -4.7437356609648, -4.74510568884198, + -4.79608455107359, -4.79498852877184, -4.84624139657888, + -4.84706341330519, -4.89804227553679, -4.89749426438592, + -4.94874713219296, -4.9490211377684, -5, -5, -2.61404028128492, + -2.62408708745521, -2.67463842601999, -2.66480538168312, + -2.71557048208131, -2.72518976458477, -2.77574110314956, + -2.7663355824795, -2.8171006828777, -2.82629244171434, -2.87684378027912, + -2.86786578327589, -2.91863088367408, -2.9273951188439, + -2.97794645740869, -2.96939598407228, -3.02016108447047, + -3.02849779597347, -3.07904913453825, -3.07092618486866, + -3.12169128526686, -3.12960047310304, -3.18015181166782, + -3.17245638566505, -3.22322148606324, -3.2307031502326, + -3.28125448879738, -3.27398658646143, -3.32475168685963, + -3.33180582736217, -3.38235716592695, -3.37551678725782, + -3.42628188765601, -3.43290850449173, -3.48345984305652, + -3.47704698805421, -3.5278120884524, -3.5340111816213, -3.58456252018608, + -3.57857718885059, -3.62934228924879, -3.63511385875086, + -3.68566519731565, -3.68010738964698, -3.73087249004517, + -3.73621653588043, -3.78676787444521, -3.78163759044337, + -3.83240269084156, -3.83731921301, -3.88787055157478, -3.88316779123975, + -3.93393289163794, -3.93842189013956, -3.98897322870434, + -3.98469799203614, -4.03546309243433, -4.03952456726913, + -4.09007590583391, -4.08622819283252, -4.13699329323072, + -4.14062724439869, -4.19117858296347, -4.18775839362891, + -4.2385234940271, -4.24172992152826, -4.29228126009304, -4.2892885944253, + -4.34005369482349, -4.34283259865782, -4.39338393722261, + -4.39081879522168, -4.44158389561988, -4.44393527578739, + -4.49448661435217, -4.49234899601807, -4.54311409641626, + -4.54503795291695, -4.59558929148174, -4.59387919681446, + -4.64464429721265, -4.64614063004652, -4.6966919686113, + -4.69540939761084, -4.74617449800903, -4.74724330717609, + -4.79779464574087, -4.79693959840723, -4.84770469880542, + -4.84834598430565, -4.89889732287043, -4.89846979920361, + -4.94923489960181, -4.94944866143522, -5, -5, -2.63127967850293, + -2.63847226955065, -2.68871754041127, -2.68167798321563, + -2.73207628792833, -2.73896281127189, -2.78920808213252, + -2.78247459264104, -2.83287289735374, -2.83945335299314, + -2.88969862385377, -2.88327120206645, -2.93366950677915, + -2.93994389471439, -2.99018916557502, -2.98406781149185, + -3.03446611620456, -3.04043443643564, -3.09067970729627, + -3.08486442091726, -3.13526272562996, -3.14092497815689, + -3.19117024901752, -3.18566103034267, -3.23605933505537, + -3.24141551987814, -3.29166079073876, -3.28645763976807, + -3.33685594448078, -3.34190606159939, -3.39215133246001, + -3.38725424919348, -3.43765255390619, -3.44239660332064, + -3.49264187418126, -3.48805085861889, -3.53844916333159, + -3.54288714504189, -3.59313241590251, -3.5888474680443, -3.639245772757, + -3.64337768676314, -3.69362295762376, -3.6896440774697, + -3.74004238218241, -3.74386822848439, -3.79411349934501, + -3.79044068689511, -3.84083899160782, -3.84435877020563, + -3.89460404106626, -3.89123729632052, -3.94163560103322, + -3.94484931192688, -3.99509458278751, -3.99203390574593, + -4.04243221045863, -4.04533985364813, -4.09558512450876, + -4.09283051517133, -4.14322881988404, -4.14583039536938, + -4.19607566623001, -4.19362712459674, -4.24402542930944, + -4.24632093709063, -4.29656620795126, -4.29442373402215, + -4.34482203873485, -4.34681147881188, -4.3970567496725, + -4.39522034344755, -4.44561864816026, -4.44730202053313, + -4.49754729139375, -4.49601695287296, -4.54641525758567, + -4.54779256225438, -4.598037833115, -4.59681356229837, -4.64721186701107, + -4.64828310397563, -4.69852837483625, -4.69761017172378, + -4.74800847643648, -4.74877364569688, -4.7990189165575, + -4.79840678114918, -4.84880508586189, -4.84926418741813, + -4.89950945827875, -4.89920339057459, -4.9496016952873, + -4.94975472913938, -5, -5, -2.64279435194369, -2.64711643433674, + -2.69717778679766, -2.69294766360447, -2.74310097526524, + -2.74723913925858, -2.7973004917195, -2.79325428692601, + -2.84340759858678, -2.84736184418042, -2.89742319664134, + -2.89356091024756, -2.94371422190833, -2.94748454910226, + -2.99754590156318, -2.9938675335691, -3.04402084522987, -3.0476072540241, + -3.09766860648502, -3.09417415689065, -3.14432746855142, + -3.14772995894594, -3.19779131140687, -3.19448078021219, + -3.24463409187296, -3.24785266386779, -3.29791401632871, + -3.29478740353374, -3.34494071519451, -3.34797536878963, + -3.39803672125055, -3.39509402685528, -3.44524733851605, + -3.44809807371147, -3.49815942617239, -3.49540065017683, + -3.5455539618376, -3.54822077863331, -3.59828213109423, + -3.59570727349837, -3.64586058515914, -3.64834348355515, + -3.69840483601607, -3.69601389681992, -3.74616720848069, + -3.74846618847699, -3.79852754093791, -3.79632052014146, + -3.84647383180223, -3.84858889339883, -3.89865024585975, + -3.89662714346301, -3.94678045512378, -3.94871159832067, + -3.99877295078159, -3.99693376678455, -4.04708707844532, + -4.04883430324251, -4.09889565570343, -4.0972403901061, + -4.14739370176687, -4.14895700816435, -4.19901836062527, + -4.19754701342764, -4.24770032508841, -4.24907971308619, + -4.29914106554711, -4.29785363674919, -4.34800694840996, + -4.34920241800804, -4.39926377046895, -4.39816026007073, + -4.4483135717315, -4.44932512292988, -4.4993864753908, -4.49846688339228, + -4.54862019505305, -4.54944782785172, -4.59950918031264, + -4.59877350671382, -4.64892681837459, -4.64957053277356, + -4.69963188523448, -4.69908013003537, -4.74923344169614, + -4.7496932376954, -4.79975459015632, -4.79938675335691, + -4.84954006501768, -4.84981594261724, -4.89987729507816, + -4.89969337667845, -4.94984668833923, -4.94993864753908, -5, -5, + -2.64855821716837, -2.65, -2.7, -2.69858889339883, -2.74861956962929, + -2.75, -2.8, -2.79865024585975, -2.84868092209021, -2.85, -2.9, + -2.89871159832067, -2.94874227455113, -2.95, -3, -2.99877295078159, + -3.04880362701205, -3.05, -3.1, -3.09883430324251, -3.14886497947297, + -3.15, -3.2, -3.19889565570343, -3.24892633193389, -3.25, -3.3, + -3.29895700816435, -3.34898768439481, -3.35, -3.4, -3.39901836062527, + -3.44904903685573, -3.45, -3.5, -3.49907971308619, -3.54911038931665, + -3.55, -3.6, -3.59914106554711, -3.64917174177757, -3.65, -3.7, + -3.69920241800803, -3.7492330942385, -3.75, -3.8, -3.79926377046896, + -3.84929444669942, -3.85, -3.9, -3.89932512292988, -3.94935579916034, + -3.95, -4, -3.9993864753908, -4.04941715162126, -4.05, -4.1, + -4.09944782785172, -4.14947850408218, -4.15, -4.2, -4.19950918031264, + -4.2495398565431, -4.25, -4.3, -4.29957053277356, -4.34960120900402, + -4.35, -4.4, -4.39963188523448, -4.44966256146494, -4.45, -4.5, + -4.4996932376954, -4.54972391392586, -4.55, -4.6, -4.59975459015632, + -4.64978526638678, -4.65, -4.7, -4.69981594261724, -4.7498466188477, + -4.75, -4.8, -4.79987729507816, -4.84990797130862, -4.85, -4.9, + -4.89993864753908, -4.94996932376954, -4.95, -5, -5, -2.64855821716837, + -2.64711643433674, -2.69717778679766, -2.69858889339883, + -2.74861956962929, -2.74723913925858, -2.7973004917195, + -2.79865024585975, -2.84868092209021, -2.84736184418042, + -2.89742319664134, -2.89871159832067, -2.94874227455113, + -2.94748454910226, -2.99754590156318, -2.99877295078159, + -3.04880362701205, -3.0476072540241, -3.09766860648502, + -3.09883430324251, -3.14886497947297, -3.14772995894594, + -3.19779131140687, -3.19889565570343, -3.24892633193389, + -3.24785266386779, -3.29791401632871, -3.29895700816435, + -3.34898768439481, -3.34797536878963, -3.39803672125055, + -3.39901836062527, -3.44904903685573, -3.44809807371147, + -3.49815942617239, -3.49907971308619, -3.54911038931665, + -3.54822077863331, -3.59828213109423, -3.59914106554711, + -3.64917174177757, -3.64834348355515, -3.69840483601607, + -3.69920241800803, -3.7492330942385, -3.74846618847699, + -3.79852754093791, -3.79926377046896, -3.84929444669942, + -3.84858889339883, -3.89865024585975, -3.89932512292988, + -3.94935579916034, -3.94871159832067, -3.99877295078159, + -3.9993864753908, -4.04941715162126, -4.04883430324251, + -4.09889565570343, -4.09944782785172, -4.14947850408218, + -4.14895700816435, -4.19901836062527, -4.19950918031264, + -4.2495398565431, -4.24907971308619, -4.29914106554711, + -4.29957053277356, -4.34960120900402, -4.34920241800804, + -4.39926377046895, -4.39963188523448, -4.44966256146494, + -4.44932512292988, -4.4993864753908, -4.4996932376954, -4.54972391392586, + -4.54944782785172, -4.59950918031264, -4.59975459015632, + -4.64978526638678, -4.64957053277356, -4.69963188523448, + -4.69981594261724, -4.7498466188477, -4.7496932376954, -4.79975459015632, + -4.79987729507816, -4.84990797130862, -4.84981594261724, + -4.89987729507816, -4.89993864753908, -4.94996932376954, + -4.94993864753908, -5, -5, -2.64279435194369, -2.63847226955065, + -2.68871754041127, -2.69294766360447, -2.74310097526524, + -2.73896281127189, -2.78920808213252, -2.79325428692601, + -2.84340759858678, -2.83945335299314, -2.88969862385377, + -2.89356091024756, -2.94371422190833, -2.93994389471439, + -2.99018916557502, -2.9938675335691, -3.04402084522987, + -3.04043443643564, -3.09067970729627, -3.09417415689065, + -3.14432746855142, -3.14092497815689, -3.19117024901752, + -3.19448078021219, -3.24463409187296, -3.24141551987814, + -3.29166079073876, -3.29478740353374, -3.34494071519451, + -3.34190606159939, -3.39215133246001, -3.39509402685528, + -3.44524733851605, -3.44239660332064, -3.49264187418126, + -3.49540065017683, -3.5455539618376, -3.54288714504189, + -3.59313241590251, -3.59570727349837, -3.64586058515914, + -3.64337768676314, -3.69362295762376, -3.69601389681992, + -3.74616720848069, -3.74386822848439, -3.79411349934501, + -3.79632052014146, -3.84647383180223, -3.84435877020563, + -3.89460404106626, -3.89662714346301, -3.94678045512378, + -3.94484931192688, -3.99509458278751, -3.99693376678455, + -4.04708707844532, -4.04533985364813, -4.09558512450876, + -4.0972403901061, -4.14739370176687, -4.14583039536938, + -4.19607566623001, -4.19754701342764, -4.24770032508841, + -4.24632093709063, -4.29656620795126, -4.29785363674919, + -4.34800694840996, -4.34681147881188, -4.3970567496725, + -4.39816026007073, -4.4483135717315, -4.44730202053313, + -4.49754729139375, -4.49846688339228, -4.54862019505305, + -4.54779256225438, -4.598037833115, -4.59877350671382, -4.64892681837459, + -4.64828310397563, -4.69852837483625, -4.69908013003537, + -4.74923344169614, -4.74877364569688, -4.7990189165575, + -4.79938675335691, -4.84954006501768, -4.84926418741813, + -4.89950945827875, -4.89969337667845, -4.94984668833923, + -4.94975472913938, -5, -5, -2.63127967850293, -2.62408708745521, + -2.67463842601999, -2.68167798321563, -2.73207628792833, + -2.72518976458477, -2.77574110314956, -2.78247459264104, + -2.83287289735374, -2.82629244171434, -2.87684378027912, + -2.88327120206645, -2.93366950677915, -2.9273951188439, + -2.97794645740869, -2.98406781149185, -3.03446611620456, + -3.02849779597347, -3.07904913453825, -3.08486442091726, + -3.13526272562996, -3.12960047310304, -3.18015181166782, + -3.18566103034267, -3.23605933505537, -3.2307031502326, + -3.28125448879738, -3.28645763976807, -3.33685594448078, + -3.33180582736217, -3.38235716592695, -3.38725424919348, + -3.43765255390619, -3.43290850449173, -3.48345984305652, + -3.48805085861889, -3.53844916333159, -3.5340111816213, + -3.58456252018608, -3.5888474680443, -3.639245772757, -3.63511385875086, + -3.68566519731565, -3.6896440774697, -3.74004238218241, + -3.73621653588043, -3.78676787444521, -3.79044068689511, + -3.84083899160781, -3.83731921301, -3.88787055157478, -3.89123729632052, + -3.94163560103322, -3.93842189013956, -3.98897322870434, + -3.99203390574593, -4.04243221045863, -4.03952456726913, + -4.09007590583391, -4.09283051517133, -4.14322881988404, + -4.14062724439869, -4.19117858296347, -4.19362712459674, + -4.24402542930945, -4.24172992152826, -4.29228126009304, + -4.29442373402215, -4.34482203873485, -4.34283259865782, + -4.39338393722261, -4.39522034344755, -4.44561864816026, + -4.44393527578739, -4.49448661435217, -4.49601695287296, + -4.54641525758567, -4.54503795291695, -4.59558929148174, + -4.59681356229837, -4.64721186701107, -4.64614063004652, + -4.6966919686113, -4.69761017172378, -4.74800847643648, + -4.74724330717609, -4.79779464574087, -4.79840678114918, + -4.84880508586189, -4.84834598430565, -4.89889732287043, + -4.89920339057459, -4.9496016952873, -4.94944866143522, -5, -5, + -2.61404028128492, -2.60399347511464, -2.65497233734624, + -2.66480538168312, -2.71557048208131, -2.70595119957785, + -2.75693006180945, -2.7663355824795, -2.8171006828777, -2.80790892404105, + -2.85888778627266, -2.86786578327589, -2.91863088367408, + -2.90986664850426, -2.96084551073586, -2.96939598407228, + -3.02016108447047, -3.01182437296747, -3.06280323519907, + -3.07092618486866, -3.12169128526686, -3.11378209743067, + -3.16476095966228, -3.17245638566505, -3.22322148606324, + -3.21573982189388, -3.26671868412548, -3.27398658646143, + -3.32475168685963, -3.31769754635709, -3.36867640858869, + -3.37551678725782, -3.42628188765601, -3.41965527082029, + -3.4706341330519, -3.47704698805421, -3.5278120884524, -3.5216129952835, + -3.57259185751511, -3.57857718885059, -3.62934228924879, + -3.62357071974671, -3.67454958197831, -3.68010738964698, + -3.73087249004517, -3.72552844420992, -3.77650730644152, + -3.78163759044337, -3.83240269084156, -3.82748616867312, + -3.87846503090473, -3.88316779123975, -3.93393289163794, + -3.92944389313633, -3.98042275536793, -3.98469799203614, + -4.03546309243433, -4.03140161759954, -4.08238047983114, + -4.08622819283252, -4.13699329323072, -4.13335934206274, + -4.18433820429435, -4.18775839362891, -4.2385234940271, + -4.23531706652595, -4.28629592875755, -4.2892885944253, + -4.34005369482349, -4.33727479098916, -4.38825365322076, + -4.39081879522168, -4.44158389561988, -4.43923251545236, + -4.49021137768397, -4.49234899601807, -4.54311409641626, + -4.54119023991557, -4.59216910214717, -4.59387919681446, + -4.64464429721265, -4.64314796437878, -4.69412682661038, + -4.69540939761084, -4.74617449800903, -4.74510568884198, + -4.79608455107359, -4.79693959840723, -4.84770469880542, + -4.84706341330519, -4.89804227553679, -4.89846979920361, + -4.94923489960181, -4.9490211377684, -5, -5, -2.59111521306916, + -2.57823695102368, -2.62976382440616, -2.6423680808762, + -2.69362094868324, -2.68129069778863, -2.73281757117111, + -2.74487381649028, -2.79612668429732, -2.78434444455358, + -2.83587131793606, -2.84737955210436, -2.8986324199114, + -2.88739819131853, -2.93892506470101, -2.94988528771844, + -3.00113815552547, -2.99045193808348, -3.04197881146596, + -3.05239102333251, -3.10364389113955, -3.09350568484843, + -3.14503255823091, -3.15489675894659, -3.20614962675363, + -3.19655943161338, -3.24808630499586, -3.25740249456067, + -3.30865536236771, -3.29961317837833, -3.35114005176081, + -3.35990823017475, -3.41116109798179, -3.40266692514328, + -3.45419379852575, -3.46241396578883, -3.51366683359587, + -3.50572067190823, -3.5572475452907, -3.5649197014029, -3.61617256920994, + -3.60877441867318, -3.66030129205565, -3.66742543701698, + -3.71867830482402, -3.71182816543813, -3.7633550388206, + -3.76993117263106, -3.8211840404381, -3.81488191220308, + -3.86640878558555, -3.87243690824514, -3.92368977605218, + -3.91793565896803, -3.9694625323505, -3.97494264385922, + -4.02619551166626, -4.02098940573298, -4.07251627911545, + -4.0774483794733, -4.12870124728033, -4.12404315249793, -4.1755700258804, + -4.17995411508737, -4.23120698289441, -4.22709689926288, + -4.27862377264535, -4.28245985070145, -4.33371271850849, + -4.33015064602783, -4.3816775194103, -4.38496558631553, + -4.43621845412257, -4.43320439279278, -4.48473126617525, + -4.48747132192961, -4.53872418973665, -4.53625813955773, + -4.5877850129402, -4.58997705754369, -4.64122992535073, + -4.63931188632268, -4.69083875970515, -4.69248279315777, + -4.7437356609648, -4.74236563308763, -4.7938925064701, -4.79498852877184, + -4.84624139657888, -4.84541937985258, -4.89694625323505, + -4.89749426438592, -4.94874713219296, -4.94847312661753, -5, -5, + -2.56255640650863, -2.54687586199357, -2.59906999258946, + -2.61441690849781, -2.66627741048698, -2.65126412318534, + -2.70345825378122, -2.71813791247616, -2.76999841446534, + -2.7556523843771, -2.80784651497298, -2.82185891645452, -2.8737194184437, + -2.86004064556886, -2.91223477616474, -2.92557992043288, + -2.97744042242205, -2.96442890676063, -3.01662303735651, + -3.02930092441123, -3.08116142640041, -3.06881716795239, + -3.12101129854827, -3.13302192838959, -3.18488243037877, + -3.17320542914415, -3.22539955974003, -3.23674293236794, + -3.28860343435712, -3.27759369033591, -3.3297878209318, -3.3404639363463, + -3.39232443833548, -3.38198195152768, -3.43417608212356, + -3.44418494032466, -3.49604544231383, -3.48637021271944, + -3.53856434331532, -3.54790594430301, -3.59976644629219, + -3.5907584739112, -3.64295260450708, -3.65162694828137, + -3.70348745027055, -3.69514673510296, -3.74734086569885, + -3.75534795225973, -3.8072084542489, -3.79953499629473, + -3.85172912689061, -3.85906895623808, -3.91092945822726, + -3.90392325748649, -3.95611738808237, -3.96278996021644, + -4.01465046220562, -4.00831151867825, -4.06050564927413, + -4.06651096419479, -4.11837146618397, -4.11269977987002, + -4.1648939104659, -4.17023196817315, -4.22209247016233, + -4.21708804106178, -4.26928217165766, -4.27395297215151, + -4.32581347414069, -4.32147630225354, -4.37367043284942, + -4.37767397612986, -4.42953447811904, -4.42586456344531, + -4.47805869404119, -4.48139498010822, -4.5332554820974, + -4.53025282463707, -4.58244695523295, -4.58511598408658, + -4.63697648607575, -4.63464108582883, -4.68683521642471, + -4.68883698806493, -4.74069749005411, -4.73902934702059, + -4.79122347761647, -4.79255799204329, -4.84441849403247, + -4.84341760821236, -4.89561173880824, -4.89627899602164, + -4.94813949801082, -4.94780586940412, -5, -5, -2.52842855648567, + -2.50998125097776, -2.56296037329738, -2.58101518294342, + -2.63360180940117, -2.615939495617, -2.66891861793663, -2.68618843585892, + -2.73877506231667, -2.72189774025625, -2.77487686257587, + -2.79136168877443, -2.84394831523218, -2.82785598489549, + -2.88083510721511, -2.89653494168993, -2.94912156814768, + -2.93381422953474, -2.98679335185436, -3.00170819460543, + -3.05429482106318, -3.03977247417398, -3.0927515964936, + -3.10688144752094, -3.15946807397869, -3.14573071881323, + -3.19870984113285, -3.21205470043644, -3.26464132689419, + -3.25168896345247, -3.30466808577209, -3.31722795335194, + -3.3698145798097, -3.35764720809171, -3.41062633041134, + -3.42240120626745, -3.4749878327252, -3.46360545273096, + -3.51658457505058, -3.52757445918295, -3.5801610856407, -3.5695636973702, + -3.62254281968982, -3.63274771209845, -3.68533433855621, + -3.67552194200945, -3.72850106432907, -3.73792096501396, + -3.79050759147171, -3.78148018664869, -3.83445930896831, + -3.84309421792946, -3.89568084438721, -3.88743843128794, + -3.94041755360756, -3.94826747084497, -4.00085409730272, + -3.99339667592718, -4.0463757982468, -4.05344072376047, + -4.10602735021822, -4.09935492056642, -4.15233404288605, + -4.15861397667597, -4.21120060313372, -4.20531316520567, + -4.25829228752529, -4.26378722959148, -4.31637385604923, + -4.31127140984491, -4.36425053216453, -4.36896048250698, + -4.42154710896473, -4.41722965448416, -4.47020877680378, + -4.47413373542248, -4.52672036188023, -4.5231878991234, + -4.57616702144302, -4.57930698833799, -4.63189361479574, + -4.62914614376264, -4.68212526608227, -4.68448024125349, + -4.73706686771124, -4.73510438840189, -4.78808351072151, + -4.78965349416899, -4.84224012062675, -4.84106263304113, + -4.89404175536076, -4.8948267470845, -4.94741337354225, + -4.94702087768038, -5, -5, -2.48880897355726, -2.46763669613675, + -2.52151676643171, -2.54223856986455, -2.59566816617184, + -2.57539683672668, -2.62927690702164, -2.64909776247913, + -2.70252735878643, -2.6831569773166, -2.73703704761157, + -2.75595695509372, -2.80938655140101, -2.79091711790653, + -2.84479718820149, -2.8628161477083, -2.91624574401559, + -2.89867725849645, -2.95255732879142, -2.96967534032289, + -3.02310493663018, -3.00643739908638, -3.06031746938134, + -3.07653453293747, -3.12996412924476, -3.1141975396763, + -3.16807760997127, -3.18339372555206, -3.23682332185935, + -3.22195768026623, -3.27583775056119, -3.29025291816664, + -3.34368251447393, -3.32971782085616, -3.38359789115112, + -3.39711211078123, -3.45054170708852, -3.43747796144608, + -3.49135803174104, -3.50397130339581, -3.5574008997031, + -3.54523810203601, -3.59911817233097, -3.6108304960104, + -3.66426009231769, -3.65299824262593, -3.70687831292089, + -3.71768968862498, -3.77111928493227, -3.76075838321586, + -3.81463845351082, -3.82454888123957, -3.87797847754686, + -3.86851852380578, -3.92239859410075, -3.93140807385415, + -3.98483767016144, -3.97627866439571, -4.03015873469067, + -4.03826726646874, -4.09169686277603, -4.08403880498563, + -4.1379188752806, -4.14512645908332, -4.19855605539061, + -4.19179894557556, -4.24567901587052, -4.25198565169791, + -4.3054152480052, -4.29955908616548, -4.35343915646045, + -4.35884484431249, -4.41227444061978, -4.40731922675541, + -4.46119929705037, -4.46570403692708, -4.51913363323437, + -4.51507936734534, -4.5689594376403, -4.57256322954166, + -4.62599282584895, -4.62283950793526, -4.67671957823022, + -4.67942242215625, -4.73285201846354, -4.73059964852519, + -4.78447971882015, -4.78628161477083, -4.83971121107812, + -4.83835978911511, -4.89223985941007, -4.89314080738542, + -4.94657040369271, -4.94611992970504, -5, -5, -2.44378740882173, + -2.41993812150671, -2.47483305509168, -2.4981749107617, + -2.55256241270166, -2.52972798867664, -2.5846229222616, + -2.60694991464162, -2.66133741658158, -2.63951785584657, + -2.69441278943153, -2.71572491852155, -2.77011242046151, + -2.74930772301649, -2.80420265660146, -2.82449992240147, + -2.87888742434144, -2.85909759018642, -2.91399252377138, + -2.9332749262814, -2.98766242822136, -2.96888745735635, + -3.02378239094131, -3.04204993016133, -3.09643743210129, + -3.07867732452627, -3.13357225811124, -3.15082493404125, + -3.20521243598122, -3.1884671916962, -3.24336212528117, + -3.25959993792118, -3.31398743986114, -3.29825705886613, + -3.35315199245109, -3.36837494180111, -3.42276244374107, + -3.40804692603606, -3.46294185962102, -3.47714994568103, + -3.53153744762099, -3.51783679320598, -3.57273172679095, + -3.58592494956096, -3.64031245150092, -3.62762666037591, + -3.68252159396087, -3.69469995344088, -3.74908745538085, + -3.73741652754584, -3.7923114611308, -3.80347495732081, + -3.85786245926077, -3.84720639471576, -3.90210132830073, + -3.91224996120074, -3.9666374631407, -3.95699626188569, + -4.01189119547066, -4.02102496508066, -4.07541246702063, + -4.06678612905562, -4.12168106264058, -4.12979996896059, + -4.18418747090055, -4.17657599622555, -4.23147092981051, + -4.23857497284052, -4.29296247478048, -4.28636586339547, + -4.34126079698044, -4.34734997672044, -4.40173747866041, + -4.3961557305654, -4.45105066415036, -4.45612498060037, + -4.51051248254033, -4.50594559773533, -4.56084053132029, + -4.5648999844803, -4.61928748642026, -4.61573546490525, + -4.67063039849022, -4.67367498836022, -4.72806249030018, + -4.72552533207518, -4.78042026566015, -4.78244999224015, + -4.83683749418011, -4.83531519924511, -4.89021013283007, + -4.89122499612007, -4.94561249806004, -4.94510506641504, -5, -5, + -2.39346585060369, -2.36699357970066, -2.42301499289852, + -2.4489240239951, -2.50438219738651, -2.47903640609638, + -2.53505781929423, -2.55984037077792, -2.61529854416933, + -2.59107923249209, -2.64710064568995, -2.67075671756074, + -2.72621489095215, -2.70312205888781, -2.75914347208567, + -2.78167306434356, -2.83713123773497, -2.81516488528353, + -2.87118629848138, -2.89258941112638, -2.94804758451779, + -2.92720771167924, -2.9832291248771, -3.00350575790921, + -3.05896393130062, -3.03925053807496, -3.09527195127282, + -3.11442210469203, -3.16988027808344, -3.15129336447068, + -3.20731477766853, -3.22533845147485, -3.28079662486626, + -3.26333619086639, -3.31935760406425, -3.33625479825767, + -3.39171297164908, -3.37537901726211, -3.43140043045997, + -3.44717114504049, -3.5026293184319, -3.48742184365783, + -3.54344325685568, -3.55808749182332, -3.61354566521473, + -3.59946467005354, -3.6554860832514, -3.66900383860614, + -3.72446201199755, -3.71150749644926, -3.76752890964712, + -3.77992018538896, -3.83537835878037, -3.82355032284498, + -3.87957173604283, -3.89083653217178, -3.94629470556319, + -3.93559314924069, -3.99161456243855, -4.0017528789546, + -4.05721105234601, -4.04763597563641, -4.10365738883427, + -4.11266922573742, -4.16812739912884, -4.15967880203213, + -4.21570021522998, -4.22358557252025, -4.27904374591166, + -4.27172162842784, -4.3277430416257, -4.33450191930307, + -4.38996009269448, -4.38376445482356, -4.43978586802142, + -4.44541826608589, -4.5008764394773, -4.49580728121928, + -4.55182869441713, -4.55633461286871, -4.61179278626012, + -4.60785010761499, -4.66387152081285, -4.66725095965153, + -4.72270913304295, -4.71989293401071, -4.77591434720857, + -4.77816730643436, -4.83362547982577, -4.83193576040643, + -4.88795717360428, -4.88908365321718, -4.94454182660859, + -4.94397858680214, -5, -5, -2.3379582934176, -2.30892300713455, + -2.36617996442956, -2.39459747866404, -2.45123666391047, + -2.42343692172457, -2.48069387901958, -2.50787584915691, + -2.56451503440334, -2.53795083631459, -2.5952077936096, + -2.62115421964977, -2.67779340489621, -2.65246475090461, + -2.70972170819962, -2.73443259014264, -2.79107177538908, + -2.76697866549463, -2.82423562278964, -2.84771096063551, + -2.90435014588194, -2.88149258008465, -2.93874953737966, + -2.96098933112838, -3.01762851637481, -2.99600649467466, + -3.05326345196967, -3.07426770162125, -3.13090688686768, + -3.11052040926468, -3.16777736655969, -3.18754607211411, + -3.24418525736055, -3.2250343238547, -3.28229128114971, + -3.30082444260698, -3.35746362785342, -3.33954823844472, + -3.39680519573973, -3.41410281309985, -3.47074199834628, + -3.45406215303474, -3.51131911032975, -3.52738118359272, + -3.58402036883915, -3.56857606762476, -3.62583302491977, + -3.64065955408559, -3.69729873933202, -3.68308998221478, + -3.74034693950979, -3.75393792457845, -3.81057710982489, + -3.7976038968048, -3.85486085409981, -3.86721629507132, + -3.92385548031775, -3.91211781139482, -3.96937476868983, + -3.98049466556419, -4.03713385081062, -4.02663172598484, + -4.08388868327985, -4.09377303605706, -4.15041222130349, + -4.14114564057486, -4.19840259786987, -4.20705140654993, + -4.26369059179636, -4.25565955516488, -4.31291651245988, + -4.32032977704279, -4.37696896228923, -4.37017346975489, + -4.4274304270499, -4.43360814753566, -4.4902473327821, -4.48468738434491, + -4.54194434163992, -4.54688651802853, -4.60352570327496, + -4.59920129893493, -4.65645825622994, -4.6601648885214, + -4.71680407376783, -4.71371521352495, -4.77097217081996, + -4.77344325901426, -4.8300824442607, -4.82822912811497, + -4.88548608540998, -4.88672162950713, -4.94336081475357, + -4.94274304270499, -5, -5, -2.27739047973363, -2.24585795233272, + -2.30445671930436, -2.33531834186696, -2.39324620400029, -2.363055486276, + -2.42165425324765, -2.45117406613361, -2.50910192826694, + -2.48025302021929, -2.53885178719094, -2.56702979040027, + -2.62495765253359, -2.59745055416258, -2.65604932113423, + -2.68288551466692, -2.74081337680025, -2.71464808810587, + -2.77324685507751, -2.79874123893357, -2.8566691010669, + -2.83184562204916, -2.8904443890208, -2.91459696320023, + -2.97252482533356, -2.94904315599245, -3.00764192296409, + -3.03045268746688, -3.08838054960021, -3.06624068993574, + -3.12483945690738, -3.14630841173354, -3.20423627386686, + -3.18343822387903, -3.24203699085067, -3.26216413600019, + -3.32009199813352, -3.30063575782231, -3.35923452479396, + -3.37801986026684, -3.43594772240017, -3.4178332917656, + -3.47643205873725, -3.4938755845335, -3.55180344666683, + -3.53503082570889, -3.59362959268054, -3.60973130880015, + -3.66765917093348, -3.65222835965218, -3.71082712662382, + -3.72558703306681, -3.78351489520013, -3.76942589359547, + -3.82802466056711, -3.84144275733346, -3.89937061946679, + -3.88662342753876, -3.9452221945104, -3.95729848160011, + -4.01522634373344, -4.00382096148205, -4.06241972845369, + -4.07315420586677, -4.1310820680001, -4.12101849542533, + -4.17961726239698, -4.18900993013342, -4.24693779226675, + -4.23821602936862, -4.29681479634027, -4.30486565440008, + -4.3627935165334, -4.35541356331191, -4.41401233028356, + -4.42072137866673, -4.47864924080006, -4.4726110972552, + -4.53120986422685, -4.53657710293338, -4.59450496506671, + -4.58980863119849, -4.64840739817013, -4.65243282720004, + -4.71036068933337, -4.70700616514178, -4.76560493211342, + -4.76828855146669, -4.82621641360002, -4.82420369908507, + -4.88280246605671, -4.88414427573335, -4.94207213786667, + -4.94140123302836, -5, -5, -2.21189961513043, -2.17794127792815, + -2.23798508052542, -2.27122089991489, -2.33054218469935, + -2.29802888312269, -2.35807268571997, -2.38986346948381, + -2.44918475426827, -2.41811648831724, -2.47816029091451, + -2.50850603905273, -2.56782732383718, -2.53820409351179, + -2.59824789610906, -2.62714860862164, -2.6864698934061, + -2.65829169870633, -2.71833550130361, -2.74579117819056, + -2.80511246297502, -2.77837930390088, -2.83842310649815, + -2.86443374775948, -2.92375503254394, -2.89846690909543, + -2.9585107116927, -2.9830763173284, -3.04239760211286, -3.01855451428998, + -3.07859831688725, -3.10171888689731, -3.16104017168177, + -3.13864211948452, -3.1986859220818, -3.22036145646623, + -3.27968274125069, -3.25872972467907, -3.31877352727634, + -3.33900402603515, -3.39832531081961, -3.37881732987362, + -3.43886113247089, -3.45764659560407, -3.51696788038853, + -3.49890493506816, -3.55894873766544, -3.57628916517299, + -3.63561044995744, -3.61899254026271, -3.67903634285998, + -3.6949317347419, -3.75425301952636, -3.73908014545726, + -3.79912394805453, -3.81357430431082, -3.87289558909528, + -3.8591677506518, -3.91921155324908, -3.93221687387974, -3.9915381586642, + -3.97925535584635, -4.03929915844362, -4.05085944344866, + -4.11018072823312, -4.0993429610409, -4.15938676363817, + -4.16950201301758, -4.22882329780203, -4.21943056623545, + -4.27947436883272, -4.28814458258649, -4.34746586737095, + -4.33951817142999, -4.39956197402727, -4.40678715215541, + -4.46610843693987, -4.45960577662454, -4.51964957922181, + -4.52542972172433, -4.58475100650879, -4.57969338181909, + -4.63973718441636, -4.64407229129325, -4.70339357607771, + -4.69978098701363, -4.75982478961091, -4.76271486086216, + -4.82203614564662, -4.81986859220818, -4.87991239480545, + -4.88135743043108, -4.94067871521554, -4.93995619740273, -5, -5, + -2.14163405748041, -2.10532683703268, -2.16691562773411, + -2.20245035412977, -2.26326665077912, -2.22850441843554, + -2.29009320913698, -2.32408294742847, -2.38489924407783, + -2.35168199983841, -2.41327079053984, -2.44571554072718, + -2.50653183737653, -2.47485958124127, -2.53644837194271, + -2.56734813402588, -2.62816443067524, -2.59803716264414, + -2.65962595334557, -2.68898072732459, -2.74979702397394, -2.721214744047, + -2.78280353474844, -2.8106133206233, -2.87142961727265, + -2.84439232544987, -2.9059811161513, -2.932245913922, -2.99306221057135, + -2.96756990685273, -3.02915869755417, -3.05387850722071, + -3.11469480387006, -3.0907474882556, -3.15233627895703, + -3.17551110051941, -3.23632739716877, -3.21392506965846, + -3.27551386035989, -3.29714369381812, -3.35795999046747, + -3.33710265106133, -3.39869144176276, -3.41877628711682, + -3.47959258376618, -3.46028023246419, -3.52186902316562, + -3.54040888041553, -3.60122517706488, -3.58345781386706, + -3.64504660456849, -3.66204147371424, -3.72285777036359, + -3.70663539526992, -3.76822418597135, -3.78367406701294, + -3.84449036366229, -3.82981297667279, -3.89140176737422, + -3.90530666031165, -3.966122956961, -3.95299055807565, -4.01457934877708, + -4.02693925361035, -4.08775555025971, -4.07616813947851, + -4.13775693017995, -4.14857184690906, -4.20938814355841, + -4.19934572088138, -4.26093451158281, -4.27020444020777, + -4.33102073685712, -4.32252330228424, -4.38411209298568, + -4.39183703350647, -4.45265333015582, -4.44570088368711, + -4.50728967438854, -4.51346962680518, -4.57428592345453, + -4.56887846508997, -4.63046725579141, -4.63510222010388, + -4.69591851675324, -4.69205604649284, -4.75364483719427, + -4.75673481340259, -4.81755111005194, -4.8152336278957, + -4.87682241859714, -4.87836740670129, -4.93918370335065, + -4.93841120929857, -5, -5, -2.06675298087145, -2.02817912471022, + -2.09140935609936, -2.12916249191674, -2.19157200296202, + -2.1546395874885, -2.21786981887765, -2.25398151400731, -2.3163910250526, + -2.28110005026679, -2.34433028165594, -2.37880053609789, + -2.44121004714318, -2.40756051304508, -2.47079074443423, + -2.50361955818847, -2.56602906923376, -2.53402097582337, + -2.59725120721252, -2.62843858027904, -2.69084809132433, + -2.66048143860166, -2.7237116699908, -2.75325760236962, + -2.81566711341491, -2.78694190137995, -2.85017213276909, + -2.8780766244602, -2.94048613550548, -2.91340236415824, + -2.97663259554738, -3.00289564655077, -3.06530515759606, + -3.03986282693653, -3.10309305832567, -3.12771466864135, + -3.19012417968664, -3.16632328971481, -3.22955352110396, + -3.25253369073193, -3.31494320177721, -3.2927837524931, + -3.35601398388225, -3.3773527128225, -3.43976222386779, + -3.41924421527139, -3.48247444666054, -3.50217173491308, + -3.56458124595837, -3.54570467804968, -3.60893490943882, + -3.62699075700366, -3.68940026804895, -3.67216514082797, + -3.73539537221711, -3.75180977909423, -3.81421929013952, + -3.79862560360626, -3.8618558349954, -3.87662880118481, -3.9390383122301, + -3.92508606638455, -3.98831629777369, -4.00144782327539, + -4.06385733432067, -4.05154652916283, -4.11477676055198, + -4.12626684536596, -4.18867635641125, -4.17800699194112, + -4.24123722333027, -4.25108586745654, -4.31349537850183, + -4.30446745471941, -4.36769768610856, -4.37590488954712, + -4.4383144005924, -4.4309279174977, -4.49415814888685, -4.50072391163769, + -4.56313342268298, -4.55738838027599, -4.62061861166513, + -4.62554293372827, -4.68795244477356, -4.68384884305428, + -4.74707907444342, -4.75036195581885, -4.81277146686413, + -4.81030930583257, -4.87353953722171, -4.87518097790942, + -4.93759048895471, -4.93676976861086, -5, -5, -1.98742601502635, + -1.94667290534249, -2.0116373116118, -2.05152333385558, + -2.11562065268481, -2.07660171788111, -2.14156612415042, + -2.17971797151403, -2.24381529034326, -2.20653053041973, + -2.27149493668903, -2.30791260917249, -2.37200992800171, + -2.33645934295834, -2.40142374922765, -2.43610724683094, + -2.50020456566017, -2.46638815549696, -2.53135256176627, + -2.56430188448939, -2.62839920331862, -2.59631696803558, + -2.66128137430489, -2.69249652214785, -2.75659384097707, + -2.7262457805742, -2.7912101868435, -2.8206911598063, -2.88478847863552, + -2.85617459311281, -2.92113899938212, -2.94888579746475, + -3.01298311629398, -2.98610340565143, -3.05106781192074, + -3.0770804351232, -3.14117775395243, -3.11603221819005, + -3.18099662445936, -3.20527507278166, -3.26937239161088, + -3.24596103072867, -3.31092543699797, -3.33346971044011, + -3.39756702926934, -3.37588984326728, -3.44085424953659, + -3.46166434809856, -3.52576166692779, -3.5058186558059, + -3.57078306207521, -3.58985898575702, -3.65395630458624, + -3.63574746834452, -3.70071187461383, -3.71805362341547, + -3.7821509422447, -3.76567628088313, -3.83064068715244, + -3.84624826107392, -3.91034557990315, -3.89560509342175, + -3.96056949969106, -3.97444289873238, -4.0385402175616, + -4.02553390596037, -4.09049831222968, -4.10263753639083, + -4.16673485522005, -4.15546271849899, -4.2204271247683, + -4.23083217404928, -4.29492949287851, -4.2853915310376, + -4.35035593730691, -4.35902681170773, -4.42312413053696, + -4.41532034357622, -4.48028474984553, -4.48722144936619, + -4.55131876819542, -4.54524915611484, -4.61021356238415, + -4.61541608702464, -4.67951340585387, -4.67517796865346, + -4.74014237492277, -4.74361072468309, -4.80770804351232, + -4.80510678119207, -4.87007118746138, -4.87180536234155, + -4.93590268117077, -4.93503559373069, -5, -5, -1.90067629538045, + -1.85467968541841, -1.91515394098333, -1.96339562629757, + -2.02611495721468, -1.97562819654825, -2.03610245211317, + -2.0888342881318, -2.15155361904891, -2.0965767076781, -2.15705096324302, + -2.21427294996603, -2.27699228088314, -2.21752521880794, + -2.27799947437286, -2.33971161180026, -2.40243094271737, + -2.33847372993778, -2.3989479855027, -2.46515027363448, -2.5278696045516, + -2.45942224106762, -2.51989649663254, -2.59058893546871, + -2.65330826638583, -2.58037075219746, -2.64084500776238, + -2.71602759730294, -2.77874692822006, -2.70131926332731, + -2.76179351889223, -2.84146625913717, -2.90418559005429, + -2.82226777445715, -2.88274203002207, -2.9669049209714, + -3.02962425188852, -2.94321628558699, -3.00369054115191, + -3.09234358280563, -3.15506291372275, -3.06416479671683, + -3.12463905228175, -3.21778224463986, -3.28050157555698, + -3.18511330784667, -3.24558756341159, -3.34322090647409, + -3.40594023739121, -3.30606181897651, -3.36653607454144, + -3.46865956830832, -3.53137889922544, -3.42701033010636, + -3.48748458567128, -3.59409823014255, -3.65681756105967, + -3.5479588412362, -3.60843309680112, -3.71953689197678, -3.7822562228939, + -3.66890735236604, -3.72938160793096, -3.84497555381101, + -3.90769488472813, -3.78985586349588, -3.8503301190608, + -3.97041421564524, -4.03313354656236, -3.91080437462572, + -3.97127863019065, -4.09585287747947, -4.15857220839658, + -4.03175288575557, -4.09222714132049, -4.2212915393137, + -4.28401087023082, -4.15270139688541, -4.21317565245033, + -4.34673020114793, -4.40944953206504, -4.27364990801525, + -4.33412416358017, -4.47216886298216, -4.53488819389927, + -4.39459841914509, -4.45507267471001, -4.59760752481639, + -4.6603268557335, -4.51554693027493, -4.57602118583986, + -4.72304618665062, -4.78576551756773, -4.63649544140478, + -4.6969696969697, -4.84848484848485, -1.80669318731393, + -1.75870668920944, -1.81477547016114, -1.86496470557224, + -1.92323622383055, -1.87084425111285, -1.92691303206455, + -1.98150774208886, -2.03977926034717, -1.98298181301625, + -2.03905059396795, -2.09805077860548, -2.15632229686379, + -2.09511937491965, -2.15118815587135, -2.2145938151221, + -2.27286533338042, -2.20725693682305, -2.26332571777475, + -2.33113685163873, -2.38940836989704, -2.31939449872645, + -2.37546327967815, -2.44767988815535, -2.50595140641366, + -2.43153206062986, -2.48760084158156, -2.56422292467197, + -2.62249444293028, -2.54366962253326, -2.59973840348496, + -2.68076596118859, -2.7390374794469, -2.65580718443666, + -2.71187596538836, -2.79730899770521, -2.85558051596353, + -2.76794474634006, -2.82401352729176, -2.91385203422184, + -2.97212355248015, -2.88008230824346, -2.93615108919517, + -3.03039507073846, -3.08866658899677, -2.99221987014687, + -3.04828865109857, -3.14693810725508, -3.20520962551339, + -3.10435743205027, -3.16042621300197, -3.2634811437717, + -3.32175266203001, -3.21649499395367, -3.27256377490537, + -3.38002418028833, -3.43829569854664, -3.32863255585707, + -3.38470133680877, -3.49656721680495, -3.55483873506326, + -3.44077011776048, -3.49683889871218, -3.61311025332157, + -3.67138177157988, -3.55290767966388, -3.60897646061558, + -3.72965328983819, -3.7879248080965, -3.66504524156728, + -3.72111402251898, -3.84619632635481, -3.90446784461312, + -3.77718280347068, -3.83325158442238, -3.96273936287144, + -4.02101088112975, -3.88932036537408, -3.94538914632579, + -4.07928239938806, -4.13755391764637, -4.00145792727749, + -4.05752670822919, -4.19582543590468, -4.25409695416299, + -4.11359548918089, -4.16966427013259, -4.3123684724213, + -4.37063999067961, -4.22573305108429, -4.28180183203599, + -4.42891150893792, -4.48718302719623, -4.33787061298769, + -4.39393939393939, -4.54545454545455, -1.70883185717834, + -1.65895702514723, -1.71070068612089, -1.76273807814102, + -1.81664429910369, -1.76244434709454, -1.8141880080682, + -1.87055052006637, -1.92445674102905, -1.86593166904186, + -1.91767533001551, -1.97836296199173, -2.03226918295441, + -1.96941899098917, -2.02116265196283, -2.08617540391709, + -2.14008162487977, -2.07290631293648, -2.12464997391014, + -2.19398784584245, -2.24789406680513, -2.1763936348838, + -2.22813729585745, -2.3018002877678, -2.35570650873048, + -2.27988095683111, -2.33162461780477, -2.40961272969316, + -2.46351895065584, -2.38336827877842, -2.43511193975208, + -2.51742517161852, -2.5713313925812, -2.48685560072574, + -2.53859926169939, -2.62523761354388, -2.67914383450656, + -2.59034292267305, -2.64208658364671, -2.73305005546923, + -2.78695627643191, -2.69383024462036, -2.74557390559402, + -2.84086249739459, -2.89476871835727, -2.79731756656768, + -2.84906122754133, -2.94867493931995, -3.00258116028263, + -2.90080488851499, -2.95254854948865, -3.05648738124531, + -3.11039360220799, -3.0042922104623, -3.05603587143596, + -3.16429982317067, -3.21820604413334, -3.10777953240962, + -3.15952319338327, -3.27211226509602, -3.3260184860587, + -3.21126685435693, -3.26301051533059, -3.37992470702138, + -3.43383092798406, -3.31475417630424, -3.3664978372779, + -3.48773714894674, -3.54164336990942, -3.41824149825156, + -3.46998515922521, -3.5955495908721, -3.64945581183478, + -3.52172882019887, -3.57347248117253, -3.70336203279745, + -3.75726825376013, -3.62521614214618, -3.67695980311984, + -3.81117447472281, -3.86508069568549, -3.7287034640935, + -3.78044712506715, -3.91898691664817, -3.97289313761085, + -3.83219078604081, -3.88393444701446, -4.02679935857353, + -4.08070557953621, -3.93567810798812, -3.98742176896178, + -4.13461180049889, -4.18851802146156, -4.03916542993544, + -4.09090909090909, -4.24242424242424, -1.60729969108902, + -1.55564235703082, -1.60313674917652, -1.6569187176487, + -1.70653774420838, -1.65063114132222, -1.69812553346792, + -1.75615677076806, -1.80577579732774, -1.74561992561362, + -1.79311431775932, -1.85539482388742, -1.9050138504471, + -1.84060870990503, -1.88810310205073, -1.95463287700678, + -2.00425190356646, -1.93559749419643, -1.98309188634213, + -2.05387093012614, -2.10348995668581, -2.03058627848783, + -2.07808067063353, -2.15310898324549, -2.20272800980517, + -2.12557506277924, -2.17306945492494, -2.25234703636485, + -2.30196606292453, -2.22056384707064, -2.26805823921634, + -2.35158508948421, -2.40120411604389, -2.31555263136204, + -2.36304702350774, -2.45082314260357, -2.50044216916325, + -2.41054141565344, -2.45803580779915, -2.55006119572293, + -2.59968022228261, -2.50553019994485, -2.55302459209055, + -2.64929924884228, -2.69891827540196, -2.60051898423625, + -2.64801337638195, -2.74853730196164, -2.79815632852132, + -2.69550776852765, -2.74300216067336, -2.847775355081, -2.89739438164068, + -2.79049655281906, -2.83799094496476, -2.94701340820036, + -2.99663243476004, -2.88548533711046, -2.93297972925616, + -3.04625146131972, -3.0958704878794, -2.98047412140186, + -3.02796851354756, -3.14548951443907, -3.19510854099875, + -3.07546290569327, -3.12295729783897, -3.24472756755843, + -3.29434659411811, -3.17045168998467, -3.21794608213037, + -3.34396562067779, -3.39358464723747, -3.26544047427607, + -3.31293486642177, -3.44320367379715, -3.49282270035683, + -3.36042925856747, -3.40792365071318, -3.54244172691651, + -3.59206075347619, -3.45541804285888, -3.50291243500458, + -3.64167978003587, -3.69129880659554, -3.55040682715028, + -3.59790121929598, -3.74091783315522, -3.7905368597149, + -3.64539561144168, -3.69289000358739, -3.84015588627458, + -3.88977491283426, -3.74038439573309, -3.78787878787879, + -3.93939393939394, -1.50231239078543, -1.44898242454005, + -1.49229872369555, -1.54771773643603, -1.59312308208663, + -1.53561502285105, -1.57893132200655, -1.63852842773723, + -1.68393377338783, -1.62224762116205, -1.66556392031755, + -1.72933911903844, -1.77474446468904, -1.70888021947304, + -1.75219651862854, -1.82014981033964, -1.86555515599024, + -1.79551281778404, -1.83882911693954, -1.91096050164084, + -1.95636584729144, -1.88214541609504, -1.92546171525054, + -2.00177119294204, -2.04717653859264, -1.96877801440603, + -2.01209431356153, -2.09258188424324, -2.13798722989384, + -2.05541061271703, -2.09872691187253, -2.18339257554444, + -2.22879792119504, -2.14204321102803, -2.18535951018353, + -2.27420326684564, -2.31960861249624, -2.22867580933903, + -2.27199210849452, -2.36501395814684, -2.41041930379744, + -2.31530840765002, -2.35862470680552, -2.45582464944804, + -2.50122999509864, -2.40194100596102, -2.44525730511652, + -2.54663534074924, -2.59204068639984, -2.48857360427202, + -2.53188990342752, -2.63744603205044, -2.68285137770104, + -2.57520620258301, -2.61852250173851, -2.72825672335164, + -2.77366206900224, -2.66183880089401, -2.70515510004951, + -2.81906741465284, -2.86447276030344, -2.74847139920501, + -2.79178769836051, -2.90987810595404, -2.95528345160464, + -2.83510399751601, -2.8784202966715, -3.00068879725524, + -3.04609414290584, -2.921736595827, -2.9650528949825, -3.09149948855644, + -3.13690483420704, -3.008369194138, -3.0516854932935, -3.18231017985764, + -3.22771552550824, -3.095001792449, -3.1383180916045, -3.27312087115884, + -3.31852621680944, -3.18163439075999, -3.22495068991549, + -3.36393156246004, -3.40933690811064, -3.26826698907099, + -3.31158328822649, -3.45474225376124, -3.50014759941184, + -3.35489958738199, -3.39821588653749, -3.54555294506244, + -3.59095829071304, -3.44153218569299, -3.48484848484848, + -3.63636363636364, -1.3940934849973, -1.33920454545455, + -1.37840909090909, -1.43535390730232, -1.47661432960734, + -1.41761363636364, -1.45681818181818, -1.51787475191236, + -1.55913517421739, -1.49602272727273, -1.53522727272727, + -1.60039559652241, -1.64165601882743, -1.57443181818182, + -1.61363636363636, -1.68291644113245, -1.72417686343747, + -1.65284090909091, -1.69204545454545, -1.7654372857425, + -1.80669770804752, -1.73125, -1.77045454545455, -1.84795813035254, + -1.88921855265756, -1.80965909090909, -1.84886363636364, + -1.93047897496258, -1.97173939726761, -1.88806818181818, + -1.92727272727273, -2.01299981957263, -2.05426024187765, + -1.96647727272727, -2.00568181818182, -2.09552066418267, + -2.13678108648769, -2.04488636363636, -2.08409090909091, + -2.17804150879272, -2.21930193109774, -2.12329545454545, -2.1625, + -2.26056235340276, -2.30182277570778, -2.20170454545455, + -2.24090909090909, -2.34308319801281, -2.38434362031783, + -2.28011363636364, -2.31931818181818, -2.42560404262285, + -2.46686446492787, -2.35852272727273, -2.39772727272727, + -2.50812488723289, -2.54938530953792, -2.43693181818182, + -2.47613636363636, -2.59064573184294, -2.63190615414796, + -2.51534090909091, -2.55454545454545, -2.67316657645298, -2.714426998758, + -2.59375, -2.63295454545455, -2.75568742106303, -2.79694784336805, + -2.67215909090909, -2.71136363636364, -2.83820826567307, + -2.87946868797809, -2.75056818181818, -2.78977272727273, + -2.92072911028311, -2.96198953258814, -2.82897727272727, + -2.86818181818182, -3.00324995489316, -3.04451037719818, + -2.90738636363636, -2.94659090909091, -3.0857707995032, + -3.12703122180822, -2.98579545454545, -3.025, -3.16829164411324, + -3.20955206641827, -3.06420454545455, -3.10340909090909, + -3.25081248872329, -3.29207291102831, -3.14261363636364, + -3.18181818181818, -3.33333333333333, -1.28287382308016, + -1.22654310070578, -1.26169724492029, -1.32005316791469, + -1.35723251274922, -1.29685138913481, -1.33200553334932, + -1.39441185758375, -1.43159120241828, -1.36715967756383, + -1.40231382177834, -1.46877054725281, -1.50594989208734, + -1.43746796599286, -1.47262211020737, -1.54312923692187, + -1.5803085817564, -1.50777625442188, -1.54293039863639, + -1.61748792659092, -1.65466727142545, -1.57808454285091, + -1.61323868706542, -1.69184661625998, -1.72902596109451, + -1.64839283127993, -1.68354697549445, -1.76620530592904, + -1.80338465076357, -1.71870111970896, -1.75385526392347, + -1.8405639955981, -1.87774334043263, -1.78900940813798, -1.8241635523525, + -1.91492268526716, -1.95210203010169, -1.85931769656701, + -1.89447184078152, -1.98928137493622, -2.02646071977074, + -1.92962598499604, -1.96478012921055, -2.06364006460527, + -2.1008194094398, -1.99993427342506, -2.03508841763957, + -2.13799875427433, -2.17517809910886, -2.07024256185409, + -2.1053967060686, -2.21235744394339, -2.24953678877792, + -2.14055085028311, -2.17570499449762, -2.28671613361245, + -2.32389547844698, -2.21085913871214, -2.24601328292665, + -2.36107482328151, -2.39825416811604, -2.28116742714116, + -2.31632157135568, -2.43543351295056, -2.47261285778509, + -2.35147571557019, -2.3866298597847, -2.50979220261962, + -2.54697154745415, -2.42178400399921, -2.45693814821373, + -2.58415089228868, -2.62133023712321, -2.49209229242824, + -2.52724643664275, -2.65850958195774, -2.69568892679227, + -2.56240058085726, -2.59755472507178, -2.7328682716268, + -2.77004761646133, -2.63270886928629, -2.6678630135008, + -2.80722696129586, -2.84440630613038, -2.70301715771532, + -2.73817130192983, -2.88158565096491, -2.91876499579944, + -2.77332544614434, -2.80847959035885, -2.95594434063397, + -2.9931236854685, -2.84363373457337, -2.87878787878788, + -3.03030303030303, -1.16889105206735, -1.11123900342892, + -1.14239897305293, -1.20204810898661, -1.23520516590588, + -1.17355894267695, -1.20471891230096, -1.26836222282514, + -1.3015192797444, -1.23587888192498, -1.26703885154899, + -1.33467633666367, -1.36783339358293, -1.298198821173, -1.32935879079702, + -1.40099045050219, -1.43414750742146, -1.36051876042103, + -1.39167873004505, -1.46730456434072, -1.50046162125998, + -1.42283869966906, -1.45399866929307, -1.53361867817925, + -1.56677573509851, -1.48515863891709, -1.5163186085411, + -1.59993279201777, -1.63308984893704, -1.54747857816511, + -1.57863854778913, -1.6662469058563, -1.69940396277556, + -1.60979851741314, -1.64095848703716, -1.73256101969483, + -1.76571807661409, -1.67211845666117, -1.70327842628518, + -1.79887513353335, -1.83203219045262, -1.7344383959092, + -1.76559836553321, -1.86518924737188, -1.89834630429114, + -1.79675833515723, -1.82791830478124, -1.93150336121041, + -1.96466041812967, -1.85907827440525, -1.89023824402927, + -1.99781747504893, -2.0309745319682, -1.92139821365328, -1.9525581832773, + -2.06413158888746, -2.09728864580672, -1.98371815290131, + -2.01487812252532, -2.13044570272599, -2.16360275964525, + -2.04603809214934, -2.07719806177335, -2.19675981656451, + -2.22991687348378, -2.10835803139737, -2.13951800102138, + -2.26307393040304, -2.2962309873223, -2.17067797064539, + -2.20183794026941, -2.32938804424157, -2.36254510116083, + -2.23299790989342, -2.26415787951744, -2.39570215808009, + -2.42885921499936, -2.29531784914145, -2.32647781876546, + -2.46201627191862, -2.49517332883788, -2.35763778838948, + -2.38879775801349, -2.52833038575715, -2.56148744267641, + -2.41995772763751, -2.45111769726152, -2.59464449959567, + -2.62780155651494, -2.48227766688553, -2.51343763650955, + -2.6609586134342, -2.69411567035346, -2.54459760613356, + -2.57575757575758, -2.72727272727273, -1.05238907832299, + -0.993539153217069, -1.02075592171729, -1.08157744738511, + -1.11076581644723, -1.0479726902175, -1.07518945871772, + -1.13995418550934, -1.16914255457146, -1.10240622721794, + -1.12962299571815, -1.19833092363357, -1.22751929269569, + -1.15683976421837, -1.18405653271859, -1.2567076617578, + -1.28589603081992, -1.21127330121881, -1.23849006971902, + -1.31508439988203, -1.34427276894415, -1.26570683821924, + -1.29292360671946, -1.37346113800626, -1.40264950706838, + -1.32014037521967, -1.34735714371989, -1.4318378761305, + -1.46102624519261, -1.37457391222011, -1.40179068072033, + -1.49021461425473, -1.51940298331684, -1.42900744922054, + -1.45622421772076, -1.54859135237896, -1.57777972144107, + -1.48344098622098, -1.51065775472119, -1.60696809050319, + -1.63615645956531, -1.53787452322141, -1.56509129172163, + -1.66534482862742, -1.69453319768954, -1.59230806022185, + -1.61952482872206, -1.72372156675165, -1.75290993581377, + -1.64674159722228, -1.6739583657225, -1.78209830487588, -1.811286673938, + -1.70117513422271, -1.72839190272293, -1.84047504300011, + -1.86966341206223, -1.75560867122315, -1.78282543972337, + -1.89885178112434, -1.92804015018646, -1.81004220822358, + -1.8372589767238, -1.95722851924858, -1.98641688831069, + -1.86447574522402, -1.89169251372423, -2.01560525737281, + -2.04479362643492, -1.91890928222445, -1.94612605072467, + -2.07398199549704, -2.10317036455915, -1.97334281922489, + -2.0005595877251, -2.13235873362127, -2.16154710268339, + -2.02777635622532, -2.05499312472554, -2.1907354717455, + -2.21992384080762, -2.08220989322575, -2.10942666172597, + -2.24911220986973, -2.27830057893185, -2.13664343022619, + -2.1638601987264, -2.30748894799396, -2.33667731705608, + -2.19107696722662, -2.21829373572684, -2.36586568611819, + -2.39505405518031, -2.24551050422706, -2.27272727272727, + -2.42424242424242, -0.933617515015679, -0.87369587681429, + -0.897015049003283, -0.958885485360285, -0.98415345570489, + -0.920334221192276, -0.94365339338127, -1.00942142604949, + -1.0346893963941, -0.966972565570263, -0.990291737759256, + -1.0599573667387, -1.08522533708331, -1.01361090994825, + -1.03693008213724, -1.11049330742792, -1.13576127777252, + -1.06024925432624, -1.08356842651523, -1.16102924811713, + -1.18629721846173, -1.10688759870422, -1.13020677089322, + -1.21156518880634, -1.23683315915094, -1.15352594308221, + -1.1768451152712, -1.26210112949555, -1.28736909984015, + -1.20016428746019, -1.22348345964919, -1.31263707018476, + -1.33790504052936, -1.24680263183818, -1.27012180402717, + -1.36317301087397, -1.38844098121857, -1.29344097621617, + -1.31676014840516, -1.41370895156318, -1.43897692190778, + -1.34007932059415, -1.36339849278315, -1.46424489225239, + -1.48951286259699, -1.38671766497214, -1.41003683716113, + -1.5147808329416, -1.5400488032862, -1.43335600935013, -1.45667518153912, + -1.56531677363081, -1.59058474397541, -1.47999435372811, + -1.50331352591711, -1.61585271432002, -1.64112068466462, + -1.5266326981061, -1.54995187029509, -1.66638865500923, + -1.69165662535383, -1.57327104248409, -1.59659021467308, + -1.71692459569844, -1.74219256604304, -1.61990938686207, + -1.64322855905107, -1.76746053638765, -1.79272850673225, + -1.66654773124006, -1.68986690342905, -1.81799647707686, + -1.84326444742147, -1.71318607561804, -1.73650524780704, + -1.86853241776607, -1.89380038811068, -1.75982441999603, + -1.78314359218502, -1.91906835845528, -1.94433632879989, + -1.80646276437402, -1.82978193656301, -1.96960429914449, + -1.9948722694891, -1.853101108752, -1.876420280941, -2.0201402398337, + -2.04540821017831, -1.89973945312999, -1.92305862531898, + -2.07067618052291, -2.09594415086752, -1.94637779750798, + -1.96969696969697, -2.12121212121212, -0.812831116664326, + -0.751966356514362, -0.771428065241007, -0.834221557122145, + -0.855611997579964, -0.790889773967651, -0.810351482694296, + -0.877002438037783, -0.898392878495602, -0.829813191420941, + -0.849274900147586, -0.919783318953421, -0.94117375941124, + -0.868736608874231, -0.888198317600875, -0.962564199869059, + -0.983954640326878, -0.90766002632752, -0.927121735054165, + -1.0053450807847, -1.02673552124252, -0.94658344378081, + -0.966045152507454, -1.04812596170033, -1.06951640215815, + -0.985506861234099, -1.00496856996074, -1.09090684261597, + -1.11229728307379, -1.02443027868739, -1.04389198741403, + -1.13368772353161, -1.15507816398943, -1.06335369614068, + -1.08281540486732, -1.17646860444725, -1.19785904490507, + -1.10227711359397, -1.12173882232061, -1.21924948536289, + -1.24063992582071, -1.14120053104726, -1.1606622397739, + -1.26203036627852, -1.28342080673634, -1.18012394850055, + -1.19958565722719, -1.30481124719416, -1.32620168765198, + -1.21904736595384, -1.23850907468048, -1.3475921281098, + -1.36898256856762, -1.25797078340713, -1.27743249213377, + -1.39037300902544, -1.41176344948326, -1.29689420086042, + -1.31635590958706, -1.43315388994108, -1.4545443303989, + -1.33581761831371, -1.35527932704035, -1.47593477085671, + -1.49732521131453, -1.374741035767, -1.39420274449364, -1.51871565177235, + -1.54010609223017, -1.41366445322028, -1.43312616194693, + -1.56149653268799, -1.58288697314581, -1.45258787067357, + -1.47204957940022, -1.60427741360363, -1.62566785406145, + -1.49151128812686, -1.51097299685351, -1.64705829451927, + -1.66844873497709, -1.53043470558015, -1.5498964143068, -1.6898391754349, + -1.71122961589272, -1.56935812303344, -1.58881983176009, + -1.73262005635054, -1.75401049680836, -1.60828154048673, + -1.62774324921338, -1.77540093726618, -1.796791377724, -1.64720495794002, + -1.66666666666667, -1.81818181818182, -0.690289202037268, + -0.628612047560175, -0.644250862795838, -0.707839464018422, + -0.725389725999577, -0.659889678031502, -0.675528493267165, + -0.742939987980731, -0.760490249961885, -0.691167308502829, + -0.706806123738493, -0.778040511943039, -0.795590773924193, + -0.722444938974156, -0.73808375420982, -0.813141035905348, + -0.830691297886502, -0.753722569445484, -0.769361384681147, + -0.848241559867656, -0.86579182184881, -0.785000199916811, + -0.800639015152474, -0.883342083829964, -0.900892345811119, + -0.816277830388138, -0.831916645623802, -0.918442607792273, + -0.935992869773427, -0.847555460859465, -0.863194276095129, + -0.953543131754581, -0.971093393735735, -0.878833091330792, + -0.894471906566456, -0.98864365571689, -1.00619391769804, + -0.91011072180212, -0.925749537037783, -1.0237441796792, + -1.04129444166035, -0.941388352273447, -0.95702716750911, + -1.05884470364151, -1.07639496562266, -0.972665982744774, + -0.988304797980438, -1.09394522760381, -1.11149548958497, + -1.0039436132161, -1.01958242845176, -1.12904575156612, + -1.14659601354728, -1.03522124368743, -1.05086005892309, + -1.16414627552843, -1.18169653750959, -1.06649887415876, + -1.08213768939442, -1.19924679949074, -1.21679706147189, + -1.09777650463008, -1.11341531986575, -1.23434732345305, + -1.2518975854342, -1.12905413510141, -1.14469295033707, + -1.26944784741536, -1.28699810939651, -1.16033176557274, + -1.1759705808084, -1.30454837137767, -1.32209863335882, + -1.19160939604406, -1.20724821127973, -1.33964889533997, + -1.35719915732113, -1.22288702651539, -1.23852584175106, + -1.37474941930228, -1.39229968128344, -1.25416465698672, + -1.26980347222238, -1.40984994326459, -1.42740020524574, + -1.28544228745805, -1.30108110269371, -1.4449504672269, + -1.46250072920805, -1.31671991792937, -1.33235873316504, + -1.48005099118921, -1.49760125317036, -1.3479975484007, + -1.36363636363636, -1.51515151515152, -0.566255066711839, + -0.503898085863503, -0.515742936389941, -0.57999689959289, + -0.59373873247394, -0.527587786916378, -0.539432637442816, + -0.607480565354991, -0.621222398236041, -0.551277487969253, + -0.56312233849569, -0.634964231117092, -0.648706063998142, + -0.574967189022128, -0.586812039548565, -0.662447896879193, + -0.676189729760243, -0.598656890075003, -0.61050174060144, + -0.689931562641294, -0.703673395522344, -0.622346591127877, + -0.634191441654315, -0.717415228403395, -0.731157061284445, + -0.646036292180752, -0.657881142707189, -0.744898894165495, + -0.758640727046546, -0.669725993233627, -0.681570843760064, + -0.772382559927597, -0.786124392808647, -0.693415694286502, + -0.705260544812939, -0.799866225689697, -0.813608058570748, + -0.717105395339376, -0.728950245865814, -0.827349891451798, + -0.841091724332849, -0.740795096392251, -0.752639946918689, + -0.854833557213899, -0.86857539009495, -0.764484797445126, + -0.776329647971563, -0.882317222976, -0.896059055857051, + -0.788174498498001, -0.800019349024438, -0.909800888738101, + -0.923542721619152, -0.811864199550876, -0.823709050077313, + -0.937284554500202, -0.951026387381253, -0.83555390060375, + -0.847398751130188, -0.964768220262303, -0.978510053143354, + -0.859243601656625, -0.871088452183062, -0.992251886024404, + -1.00599371890545, -0.8829333027095, -0.894778153235937, + -1.01973555178651, -1.03347738466756, -0.906623003762375, + -0.918467854288812, -1.04721921754861, -1.06096105042966, + -0.930312704815249, -0.942157555341687, -1.07470288331071, + -1.08844471619176, -0.954002405868124, -0.965847256394561, + -1.10218654907281, -1.11592838195386, -0.977692106920999, + -0.989536957447436, -1.12967021483491, -1.14341204771596, + -1.00138180797387, -1.01322665850031, -1.15715388059701, + -1.17089571347806, -1.02507150902675, -1.03691635955319, + -1.18463754635911, -1.19837937924016, -1.04876121007962, + -1.06060606060606, -1.21212121212121, -0.440995386625202, + -0.3780926873869, -0.386166795263259, -0.4509548658266, + -0.460914345027998, -0.394240903139617, -0.402315011015976, + -0.470873824229396, -0.480833303430794, -0.410389118892335, + -0.418463226768694, -0.490792782632192, -0.50075226183359, + -0.426537334645052, -0.434611442521411, -0.510711741034988, + -0.520671220236386, -0.44268555039777, -0.450759658274128, + -0.530630699437784, -0.540590178639182, -0.458833766150487, + -0.466907874026846, -0.55054965784058, -0.560509137041978, + -0.474981981903204, -0.483056089779563, -0.570468616243376, + -0.580428095444774, -0.491130197655922, -0.49920430553228, + -0.590387574646172, -0.60034705384757, -0.507278413408639, + -0.515352521284998, -0.610306533048968, -0.620266012250366, + -0.523426629161356, -0.531500737037715, -0.630225491451764, + -0.640184970653162, -0.539574844914074, -0.547648952790432, + -0.65014444985456, -0.660103929055958, -0.555723060666791, + -0.56379716854315, -0.670063408257356, -0.680022887458754, + -0.571871276419508, -0.579945384295867, -0.689982366660153, + -0.699941845861551, -0.588019492172226, -0.596093600048584, + -0.709901325062949, -0.719860804264347, -0.604167707924943, + -0.612241815801302, -0.729820283465745, -0.739779762667143, + -0.62031592367766, -0.628390031554019, -0.749739241868541, + -0.759698721069939, -0.636464139430378, -0.644538247306736, + -0.769658200271337, -0.779617679472735, -0.652612355183095, + -0.660686463059454, -0.789577158674133, -0.799536637875531, + -0.668760570935812, -0.676834678812171, -0.809496117076929, + -0.819455596278327, -0.68490878668853, -0.692982894564888, + -0.829415075479725, -0.839374554681123, -0.701057002441247, + -0.709131110317606, -0.849334033882521, -0.859293513083919, + -0.717205218193964, -0.725279326070323, -0.869252992285317, + -0.879212471486715, -0.733353433946682, -0.74142754182304, + -0.889171950688113, -0.899131429889511, -0.749501649699399, + -0.757575757575758, -0.909090909090909, -0.314779613967581, + -0.251466540548263, -0.25578736850565, -0.320977081884454, + -0.327174549801327, -0.260108196463037, -0.264429024420424, + -0.3333720177182, -0.339569485635073, -0.268749852377811, + -0.273070680335198, -0.345766953551946, -0.351964421468819, + -0.277391508292585, -0.281712336249972, -0.358161889385691, + -0.364359357302564, -0.286033164207359, -0.290353992164746, + -0.370556825219437, -0.37675429313631, -0.294674820122133, + -0.29899564807952, -0.382951761053183, -0.389149228970056, + -0.303316476036907, -0.307637303994295, -0.395346696886929, + -0.401544164803802, -0.311958131951682, -0.316278959909069, + -0.407741632720674, -0.413939100637547, -0.320599787866456, + -0.324920615823843, -0.42013656855442, -0.426334036471293, + -0.32924144378123, -0.333562271738617, -0.432531504388166, + -0.438728972305039, -0.337883099696004, -0.342203927653391, + -0.444926440221912, -0.451123908138785, -0.346524755610778, + -0.350845583568165, -0.457321376055657, -0.46351884397253, + -0.355166411525552, -0.359487239482939, -0.469716311889403, + -0.475913779806276, -0.363808067440327, -0.368128895397714, + -0.482111247723149, -0.488308715640022, -0.372449723355101, + -0.376770551312488, -0.494506183556895, -0.500703651473768, + -0.381091379269875, -0.385412207227262, -0.50690111939064, + -0.513098587307513, -0.389733035184649, -0.394053863142036, + -0.519296055224386, -0.525493523141259, -0.398374691099423, + -0.40269551905681, -0.531690991058132, -0.537888458975005, + -0.407016347014197, -0.411337174971584, -0.544085926891878, + -0.55028339480875, -0.415658002928971, -0.419978830886358, + -0.556480862725623, -0.562678330642496, -0.424299658843746, + -0.428620486801133, -0.568875798559369, -0.575073266476242, + -0.43294131475852, -0.437262142715907, -0.581270734393115, + -0.587468202309988, -0.441582970673294, -0.445903798630681, + -0.593665670226861, -0.599863138143734, -0.450224626588068, + -0.454545454545455, -0.606060606060606, -0.187879366786386, + -0.124292193024509, -0.124871404907289, -0.190329386706469, + -0.192779406626553, -0.125450616790069, -0.126029828672848, + -0.195229426546636, -0.197679446466719, -0.126609040555628, + -0.127188252438408, -0.200129466386803, -0.202579486306886, + -0.127767464321187, -0.128346676203967, -0.205029506226969, + -0.207479526147053, -0.128925888086746, -0.129505099969526, + -0.209929546067136, -0.212379565987219, -0.130084311852306, + -0.130663523735085, -0.214829585907303, -0.217279605827386, + -0.131242735617865, -0.131821947500644, -0.21972962574747, + -0.222179645667553, -0.132401159383424, -0.132980371266204, + -0.224629665587636, -0.22707968550772, -0.133559583148983, + -0.134138795031763, -0.229529705427803, -0.231979725347886, + -0.134718006914543, -0.135297218797322, -0.23442974526797, + -0.236879765188053, -0.135876430680102, -0.136455642562881, + -0.239329785108136, -0.24177980502822, -0.137034854445661, + -0.137614066328441, -0.244229824948303, -0.246679844868386, + -0.13819327821122, -0.138772490094, -0.24912986478847, + -0.251579884708553, -0.139351701976779, -0.139930913859559, + -0.254029904628636, -0.25647992454872, -0.140510125742339, + -0.141089337625118, -0.258929944468803, -0.261379964388886, + -0.141668549507898, -0.142247761390678, -0.26382998430897, + -0.266280004229053, -0.142826973273457, -0.143406185156237, + -0.268730024149136, -0.27118004406922, -0.143985397039016, + -0.144564608921796, -0.273630063989303, -0.276080083909386, + -0.145143820804576, -0.145723032687355, -0.27853010382947, + -0.280980123749553, -0.146302244570135, -0.146881456452914, + -0.283430143669636, -0.28588016358972, -0.147460668335694, + -0.148039880218474, -0.288330183509803, -0.290780203429886, + -0.148619092101253, -0.149198303984033, -0.29323022334997, + -0.295680243270053, -0.149777515866813, -0.150356727749592, + -0.298130263190137, -0.30058028311022, -0.150935939632372, + -0.151515151515151, -0.303030303030303, -0.0605678136839721, + 0.00315656565656534, 0.006313131313131, -0.059279136797079, + -0.057990459910186, 0.00946969696969666, 0.0126262626262623, + -0.056701783023293, -0.0554131061364, 0.015782828282828, + 0.0189393939393936, -0.0541244292495069, -0.0528357523626139, + 0.0220959595959593, 0.025252525252525, -0.0515470754757209, + -0.0502583985888279, 0.0284090909090906, 0.0315656565656563, + -0.0489697217019349, -0.0476810448150418, 0.0347222222222219, + 0.0378787878787876, -0.0463923679281488, -0.0451036910412558, + 0.0410353535353533, 0.0441919191919189, -0.0438150141543628, + -0.0425263372674697, 0.0473484848484846, 0.0505050505050502, + -0.0412376603805767, -0.0399489834936837, 0.0536616161616159, + 0.0568181818181816, -0.0386603066067907, -0.0373716297198976, + 0.0599747474747472, 0.0631313131313129, -0.0360829528330046, + -0.0347942759461116, 0.0662878787878786, 0.0694444444444442, + -0.0335055990592186, -0.0322169221723256, 0.0726010101010099, + 0.0757575757575755, -0.0309282452854325, -0.0296395683985395, + 0.0789141414141412, 0.0820707070707068, -0.0283508915116465, + -0.0270622146247535, 0.0852272727272725, 0.0883838383838382, + -0.0257735377378605, -0.0244848608509674, 0.0915404040404038, + 0.0946969696969695, -0.0231961839640744, -0.0219075070771814, + 0.0978535353535351, 0.101010101010101, -0.0206188301902884, + -0.0193301533033953, 0.104166666666666, 0.107323232323232, + -0.0180414764165023, -0.0167527995296093, 0.110479797979798, + 0.113636363636363, -0.0154641226427163, -0.0141754457558232, + 0.116792929292929, 0.119949494949495, -0.0128867688689302, + -0.0115980919820372, 0.12310606060606, 0.126262626262626, + -0.0103094150951442, -0.00902073820825115, 0.129419191919192, + 0.132575757575757, -0.00773206132135813, -0.00644338443446511, + 0.135732323232323, 0.138888888888889, -0.00515470754757209, + -0.00386603066067907, 0.142045454545454, 0.14520202020202, + -0.00257735377378604, -0.00128867688689302, 0.148358585858586, + 0.151515151515151, 0, 0.0668809449971033, 0.130605324337641, + 0.137497667533552, 0.0719053994233416, 0.0769298538495799, + 0.144390010729463, 0.151282353925374, 0.0819543082758181, + 0.0869787627020564, 0.158174697121285, 0.165067040317196, + 0.0920032171282947, 0.097027671554533, 0.171959383513107, + 0.178851726709018, 0.102052125980771, 0.10707658040701, + 0.185744069904929, 0.192636413100839, 0.112101034833248, + 0.117125489259486, 0.19952875629675, 0.206421099492661, + 0.122149943685724, 0.127174398111963, 0.213313442688572, + 0.220205785884483, 0.132198852538201, 0.137223306964439, + 0.227098129080394, 0.233990472276305, 0.142247761390678, + 0.147272215816916, 0.240882815472216, 0.247775158668127, + 0.152296670243154, 0.157321124669392, 0.254667501864038, + 0.261559845059949, 0.162345579095631, 0.167370033521869, + 0.268452188255859, 0.27534453145177, 0.172394487948107, + 0.177418942374346, 0.282236874647681, 0.289129217843592, + 0.182443396800584, 0.187467851226822, 0.296021561039503, + 0.302913904235414, 0.19249230565306, 0.197516760079299, + 0.309806247431325, 0.316698590627236, 0.202541214505537, + 0.207565668931775, 0.323590933823147, 0.330483277019058, + 0.212590123358014, 0.217614577784252, 0.337375620214969, + 0.34426796341088, 0.22263903221049, 0.227663486636728, 0.35116030660679, + 0.358052649802701, 0.232687941062967, 0.237712395489205, + 0.364944992998612, 0.371837336194523, 0.242736849915443, + 0.247761304341682, 0.378729679390434, 0.385622022586345, + 0.25278575876792, 0.257810213194158, 0.392514365782256, + 0.399406708978167, 0.262834667620396, 0.267859122046635, + 0.406299052174078, 0.413191395369989, 0.272883576472873, + 0.277908030899111, 0.4200837385659, 0.426976081761811, 0.28293248532535, + 0.287956939751588, 0.433868424957721, 0.440760768153632, + 0.292981394177826, 0.298005848604064, 0.447653111349543, + 0.454545454545454, 0.303030303030303, 0.194192498099517, + 0.257779671861392, 0.268413631131911, 0.202955649332731, + 0.211718800565946, 0.279047590402429, 0.289681549672947, + 0.220481951799161, 0.229245103032375, 0.300315508943466, + 0.310949468213984, 0.23800825426559, 0.246771405498805, + 0.321583427484503, 0.332217386755021, 0.255534556732019, + 0.264297707965234, 0.342851346025539, 0.353485305296058, + 0.273060859198449, 0.281824010431663, 0.364119264566576, + 0.374753223837095, 0.290587161664878, 0.299350312898093, + 0.385387183107613, 0.396021142378132, 0.308113464131307, + 0.316876615364522, 0.40665510164865, 0.417289060919168, + 0.325639766597737, 0.334402917830951, 0.427923020189687, + 0.438556979460205, 0.343166069064166, 0.351929220297381, + 0.449190938730724, 0.459824898001242, 0.360692371530595, + 0.36945552276381, 0.470458857271761, 0.481092816542279, + 0.378218673997025, 0.386981825230239, 0.491726775812797, + 0.502360735083316, 0.395744976463454, 0.404508127696669, + 0.512994694353834, 0.523628653624353, 0.413271278929883, + 0.422034430163098, 0.534262612894871, 0.544896572165389, + 0.430797581396313, 0.439560732629527, 0.555530531435908, + 0.566164490706426, 0.448323883862742, 0.457087035095957, + 0.576798449976945, 0.587432409247463, 0.465850186329171, + 0.474613337562386, 0.598066368517981, 0.6087003277885, 0.483376488795601, + 0.492139640028815, 0.619334287059018, 0.629968246329537, + 0.50090279126203, 0.509665942495245, 0.640602205600055, + 0.651236164870574, 0.518429093728459, 0.527192244961674, + 0.661870124141092, 0.67250408341161, 0.535955396194889, + 0.544718547428103, 0.683138042682129, 0.693772001952647, + 0.553481698661318, 0.562244849894533, 0.704405961223166, + 0.715039920493684, 0.571008001127747, 0.579771152360962, + 0.725673879764203, 0.736307839034721, 0.588534303594177, + 0.597297454827391, 0.746941798305239, 0.757575757575758, + 0.606060606060606, 0.321092745280712, 0.384405818700031, + 0.398793057889521, 0.333603344510716, 0.34611394374072, + 0.413180297079011, 0.427567536268501, 0.358624542970724, + 0.371135142200728, 0.441954775457991, 0.456342014647481, + 0.383645741430733, 0.396156340660737, 0.470729253836971, + 0.485116493026461, 0.408666939890741, 0.421177539120745, + 0.499503732215951, 0.513890971405441, 0.433688138350749, + 0.446198737580754, 0.528278210594931, 0.542665449784421, + 0.458709336810758, 0.471219936040762, 0.557052688973911, + 0.571439928163401, 0.483730535270766, 0.49624113450077, + 0.585827167352891, 0.600214406542381, 0.508751733730775, + 0.521262332960779, 0.614601645731871, 0.628988884921361, + 0.533772932190783, 0.546283531420787, 0.643376124110851, + 0.657763363300341, 0.558794130650791, 0.571304729880796, + 0.672150602489831, 0.686537841679321, 0.5838153291108, 0.596325928340804, + 0.700925080868811, 0.715312320058301, 0.608836527570808, + 0.621347126800812, 0.729699559247791, 0.744086798437281, + 0.633857726030817, 0.646368325260821, 0.758474037626771, + 0.772861276816261, 0.658878924490825, 0.671389523720829, + 0.787248516005751, 0.801635755195241, 0.683900122950833, + 0.696410722180838, 0.816022994384731, 0.830410233574221, + 0.708921321410842, 0.721431920640846, 0.844797472763711, + 0.859184711953201, 0.73394251987085, 0.746453119100854, + 0.873571951142691, 0.887959190332181, 0.758963718330859, + 0.771474317560863, 0.902346429521671, 0.916733668711161, + 0.783984916790867, 0.796495516020871, 0.931120907900651, + 0.945508147090141, 0.809006115250876, 0.82151671448088, + 0.959895386279631, 0.974282625469121, 0.834027313710884, + 0.846537912940888, 0.988669864658611, 1.0030571038481, 0.859048512170892, + 0.871559111400896, 1.01744434303759, 1.03183158222708, 0.884069710630901, + 0.896580309860905, 1.04621882141657, 1.06060606060606, 0.909090909090909, + 0.447308517938333, 0.510211217176635, 0.528369199016204, + 0.463581128452862, 0.479853738967392, 0.546527180855773, + 0.564685162695341, 0.496126349481921, 0.51239895999645, 0.58284314453491, + 0.601001126374479, 0.52867157051098, 0.544944181025509, + 0.619159108214047, 0.637317090053616, 0.561216791540038, + 0.577489402054568, 0.655475071893185, 0.673633053732754, + 0.593762012569097, 0.610034623083626, 0.691791035572322, + 0.709949017411891, 0.626307233598156, 0.642579844112685, + 0.728106999251459, 0.746264981091028, 0.658852454627215, + 0.675125065141744, 0.764422962930597, 0.782580944770165, + 0.691397675656273, 0.707670286170803, 0.800738926609734, + 0.818896908449303, 0.723942896685332, 0.740215507199861, + 0.837054890288872, 0.85521287212844, 0.756488117714391, 0.77276072822892, + 0.873370853968009, 0.891528835807578, 0.789033338743449, + 0.805305949257978, 0.909686817647146, 0.927844799486715, + 0.821578559772508, 0.837851170287037, 0.946002781326284, + 0.964160763165852, 0.854123780801566, 0.870396391316096, + 0.982318745005421, 1.00047672684499, 0.886669001830625, + 0.902941612345155, 1.01863470868456, 1.03679269052413, 0.919214222859684, + 0.935486833374213, 1.0549506723637, 1.07310865420326, 0.951759443888742, + 0.968032054403272, 1.09126663604283, 1.1094246178824, 0.984304664917801, + 1.00057727543233, 1.12758259972197, 1.14574058156154, 1.01684988594686, + 1.03312249646139, 1.16389856340111, 1.18205654524068, 1.04939510697592, + 1.06566771749045, 1.20021452708025, 1.21837250891981, 1.08194032800498, + 1.09821293851951, 1.23653049075938, 1.25468847259895, 1.11448554903404, + 1.13075815954857, 1.27284645443852, 1.29100443627809, 1.14703077006309, + 1.16330338057762, 1.30916241811766, 1.32732039995723, 1.17957599109215, + 1.19584860160668, 1.34547838179679, 1.36363636363636, 1.21212121212121, + 0.57256819802497, 0.634925178873305, 0.6568771254221, 0.592623162219152, + 0.612678126413334, 0.678829071970895, 0.70078101851969, + 0.632733090607516, 0.652788054801698, 0.722732965068485, + 0.74468491161728, 0.672843018995879, 0.692897983190061, + 0.766636858166075, 0.78858880471487, 0.712952947384243, + 0.733007911578425, 0.810540751263665, 0.83249269781246, + 0.753062875772607, 0.773117839966788, 0.854444644361255, + 0.87639659091005, 0.79317280416097, 0.813227768355152, 0.898348537458844, + 0.920300484007639, 0.833282732549334, 0.853337696743516, + 0.942252430556434, 0.964204377105229, 0.873392660937697, + 0.893447625131879, 0.986156323654024, 1.00810827020282, + 0.913502589326061, 0.933557553520243, 1.03006021675161, 1.05201216330041, + 0.953612517714425, 0.973667481908606, 1.0739641098492, 1.095916056398, + 0.993722446102788, 1.01377741029697, 1.11786800294679, 1.13981994949559, + 1.03383237449115, 1.05388733868533, 1.16177189604438, 1.18372384259318, + 1.07394230287952, 1.0939972670737, 1.20567578914197, 1.22762773569077, + 1.11405223126788, 1.13410719546206, 1.24957968223956, 1.27153162878836, + 1.15416215965624, 1.17421712385042, 1.29348357533715, 1.31543552188595, + 1.19427208804461, 1.21432705223879, 1.33738746843474, 1.35933941498354, + 1.23438201643297, 1.25443698062715, 1.38129136153233, 1.40324330808113, + 1.27449194482133, 1.29454690901552, 1.42519525462992, 1.44714720117872, + 1.3146018732097, 1.33465683740388, 1.46909914772751, 1.49105109427631, + 1.35471180159806, 1.37476676579224, 1.5130030408251, 1.5349549873739, + 1.39482172998642, 1.41487669418061, 1.55690693392269, 1.57885888047149, + 1.43493165837479, 1.45498662256897, 1.60081082702028, 1.62276277356908, + 1.47504158676315, 1.49509655095733, 1.64471472011787, 1.66666666666667, + 1.51515151515151, 0.6966023333504, 0.758279487827494, 0.78405432786727, + 0.720465726644685, 0.744329119938971, 0.809829167907046, + 0.835604007946822, 0.768192513233256, 0.792055906527542, + 0.861378847986598, 0.887153688026374, 0.815919299821827, + 0.839782693116113, 0.91292852806615, 0.938703368105926, + 0.863646086410398, 0.887509479704684, 0.964478208145702, + 0.990253048185478, 0.911372872998969, 0.935236266293255, + 1.01602788822525, 1.04180272826503, 0.95909965958754, 0.982963052881826, + 1.06757756830481, 1.09335240834458, 1.00682644617611, 1.0306898394704, + 1.11912724838436, 1.14490208842413, 1.05455323276468, 1.07841662605897, + 1.17067692846391, 1.19645176850369, 1.10228001935325, 1.12614341264754, + 1.22222660854346, 1.24800144858324, 1.15000680594182, 1.17387019923611, + 1.27377628862302, 1.29955112866279, 1.1977335925304, 1.22159698582468, + 1.32532596870257, 1.35110080874234, 1.24546037911897, 1.26932377241325, + 1.37687564878212, 1.4026504888219, 1.29318716570754, 1.31705055900182, + 1.42842532886167, 1.45420016890145, 1.34091395229611, 1.36477734559039, + 1.47997500894122, 1.505749848981, 1.38864073888468, 1.41250413217896, + 1.53152468902078, 1.55729952906055, 1.43636752547325, 1.46023091876754, + 1.58307436910033, 1.6088492091401, 1.48409431206182, 1.50795770535611, + 1.63462404917988, 1.66039888921966, 1.53182109865039, 1.55568449194468, + 1.68617372925943, 1.71194856929921, 1.57954788523896, 1.60341127853325, + 1.73772340933898, 1.76349824937876, 1.62727467182753, 1.65113806512182, + 1.78927308941854, 1.81504792945831, 1.67500145841611, 1.69886485171039, + 1.84082276949809, 1.86659760953787, 1.72272824500468, 1.74659163829896, + 1.89237244957764, 1.91814728961742, 1.77045503159325, 1.79431842488753, + 1.94392212965719, 1.96969696969697, 1.81818181818182, 0.819144247977457, + 0.88000900812742, 0.909641311629544, 0.846847819748407, + 0.874551391519357, 0.939273615131669, 0.968905918633793, + 0.902254963290308, 0.929958535061258, 0.998538222135918, + 1.02817052563804, 0.957662106832208, 0.985365678603159, 1.05780282914017, + 1.08743513264229, 1.01306925037411, 1.04077282214506, 1.11706743614442, + 1.14669973964654, 1.06847639391601, 1.09617996568696, 1.17633204314867, + 1.20596434665079, 1.12388353745791, 1.15158710922886, 1.23559665015291, + 1.26522895365504, 1.17929068099981, 1.20699425277076, 1.29486125715716, + 1.32449356065929, 1.23469782454171, 1.26240139631266, 1.35412586416141, + 1.38375816766354, 1.29010496808361, 1.31780853985456, 1.41339047116566, + 1.44302277466779, 1.34551211162551, 1.37321568339646, 1.47265507816991, + 1.50228738167203, 1.40091925516741, 1.42862282693836, 1.53191968517416, + 1.56155198867628, 1.45632639870931, 1.48402997048026, 1.59118429217841, + 1.62081659568053, 1.51173354225121, 1.53943711402216, 1.65044889918266, + 1.68008120268478, 1.56714068579311, 1.59484425756407, 1.70971350618691, + 1.73934580968903, 1.62254782933502, 1.65025140110597, 1.76897811319116, + 1.79861041669328, 1.67795497287692, 1.70565854464787, 1.8282427201954, + 1.85787502369753, 1.73336211641882, 1.76106568818977, 1.88750732719965, + 1.91713963070178, 1.78876925996072, 1.81647283173167, 1.9467719342039, + 1.97640423770603, 1.84417640350262, 1.87187997527357, 2.00603654120815, + 2.03566884471028, 1.89958354704452, 1.92728711881547, 2.0653011482124, + 2.09493345171453, 1.95499069058642, 1.98269426235737, 2.12456575521665, + 2.15419805871877, 2.01039783412832, 2.03810140589927, 2.1838303622209, + 2.21346266572302, 2.06580497767022, 2.09350854944117, 2.24309496922515, + 2.27272727272727, 2.12121212121212, 0.93993064632881, 0.999852284530199, + 1.03338218434355, 0.971511747986546, 1.00309284964428, 1.0669120841569, + 1.10044198397024, 1.03467395130202, 1.06625505295976, 1.13397188378359, + 1.16750178359694, 1.09783615461749, 1.12941725627523, 1.20103168341029, + 1.23456158322364, 1.16099835793296, 1.1925794595907, 1.26809148303699, + 1.30162138285034, 1.22416056124844, 1.25574166290617, 1.33515128266368, + 1.36868118247703, 1.28732276456391, 1.31890386622165, 1.40221108229038, + 1.43574098210373, 1.35048496787938, 1.38206606953712, 1.46927088191708, + 1.50280078173043, 1.41364717119486, 1.44522827285259, 1.53633068154377, + 1.56986058135712, 1.47680937451033, 1.50839047616807, 1.60339048117047, + 1.63692038098382, 1.5399715778258, 1.57155267948354, 1.67045028079717, + 1.70398018061052, 1.60313378114128, 1.63471488279901, 1.73751008042386, + 1.77103998023721, 1.66629598445675, 1.69787708611448, 1.80456988005056, + 1.83809977986391, 1.72945818777222, 1.76103928942996, 1.87162967967726, + 1.90515957949061, 1.79262039108769, 1.82420149274543, 1.93868947930396, + 1.9722193791173, 1.85578259440317, 1.8873636960609, 2.00574927893065, + 2.039279178744, 1.91894479771864, 1.95052589937638, 2.07280907855735, + 2.1063389783707, 1.98210700103411, 2.01368810269185, 2.13986887818405, + 2.17339877799739, 2.04526920434959, 2.07685030600732, 2.20692867781074, + 2.24045857762409, 2.10843140766506, 2.1400125093228, 2.27398847743744, + 2.30751837725079, 2.17159361098053, 2.20317471263827, 2.34104827706414, + 2.37457817687749, 2.23475581429601, 2.26633691595374, 2.40810807669083, + 2.44163797650418, 2.29791801761148, 2.32949911926921, 2.47516787631753, + 2.50869777613088, 2.36108022092695, 2.39266132258469, 2.54222767594423, + 2.57575757575758, 2.42424242424242, 1.05870220963612, 1.11755213474205, + 1.1550252356792, 1.09420371001137, 1.12970521038662, 1.19249833661634, + 1.22997143755349, 1.16520671076187, 1.20070821113711, 1.26744453849063, + 1.30491763942778, 1.23620971151236, 1.27171121188761, 1.34239074036492, + 1.37986384130207, 1.30721271226285, 1.3427142126381, 1.41733694223921, + 1.45481004317636, 1.37821571301335, 1.41371721338859, 1.4922831441135, + 1.52975624505065, 1.44921871376384, 1.48472021413909, 1.56722934598779, + 1.60470244692494, 1.52022171451433, 1.55572321488958, 1.64217554786208, + 1.67964864879923, 1.59122471526483, 1.62672621564007, 1.71712174973637, + 1.75459485067352, 1.66222771601532, 1.69772921639057, 1.79206795161067, + 1.82954105254781, 1.73323071676581, 1.76873221714106, 1.86701415348496, + 1.9044872544221, 1.80423371751631, 1.83973521789156, 1.94196035535925, + 1.97943345629639, 1.8752367182668, 1.91073821864205, 2.01690655723354, + 2.05437965817068, 1.9462397190173, 1.98174121939254, 2.09185275910783, + 2.12932586004497, 2.01724271976779, 2.05274422014304, 2.16679896098212, + 2.20427206191926, 2.08824572051828, 2.12374722089353, 2.24174516285641, + 2.27921826379355, 2.15924872126878, 2.19475022164402, 2.3166913647307, + 2.35416446566784, 2.23025172201927, 2.26575322239452, 2.39163756660499, + 2.42911066754214, 2.30125472276977, 2.33675622314501, 2.46658376847928, + 2.50405686941643, 2.37225772352026, 2.40775922389551, 2.54152997035357, + 2.57900307129072, 2.44326072427075, 2.478762224646, 2.61647617222786, + 2.65394927316501, 2.51426372502125, 2.54976522539649, 2.69142237410215, + 2.7288954750393, 2.58526672577174, 2.62076822614699, 2.76636857597644, + 2.80384167691359, 2.65626972652223, 2.69177122689748, 2.84131477785073, + 2.87878787878788, 2.72727272727273, 1.17520418338048, 1.23285623201891, + 1.27432350754655, 1.21467437161288, 1.25414455984527, 1.3157907830742, + 1.35725805860184, 1.29361474807766, 1.33308493631006, 1.39872533412949, + 1.44019260965713, 1.37255512454245, 1.41202531277485, 1.48165988518478, + 1.52312716071242, 1.45149550100724, 1.49096568923964, 1.56459443624006, + 1.60606171176771, 1.53043587747203, 1.56990606570443, 1.64752898729535, + 1.688996262823, 1.60937625393682, 1.64884644216922, 1.73046353835064, + 1.77193081387828, 1.68831663040161, 1.72778681863401, 1.81339808940593, + 1.85486536493357, 1.7672570068664, 1.8067271950988, 1.89633264046122, + 1.93779991598886, 1.84619738333119, 1.88566757156358, 1.9792671915165, + 2.02073446704415, 1.92513775979598, 1.96460794802837, 2.06220174257179, + 2.10366901809944, 2.00407813626077, 2.04354832449316, 2.14513629362708, + 2.18660356915472, 2.08301851272556, 2.12248870095795, 2.22807084468237, + 2.26953812021001, 2.16195888919035, 2.20142907742274, 2.31100539573766, + 2.3524726712653, 2.24089926565514, 2.28036945388753, 2.39393994679294, + 2.43540722232059, 2.31983964211993, 2.35930983035232, 2.47687449784823, + 2.51834177337588, 2.39878001858472, 2.43825020681711, 2.55980904890352, + 2.60127632443116, 2.4777203950495, 2.5171905832819, 2.64274359995881, + 2.68421087548645, 2.55666077151429, 2.59613095974669, 2.7256781510141, + 2.76714542654174, 2.63560114797908, 2.67507133621148, 2.80861270206938, + 2.85007997759703, 2.71454152444387, 2.75401171267627, 2.89154725312467, + 2.93301452865232, 2.79348190090866, 2.83295208914106, 2.97448180417996, + 3.01594907970761, 2.87242227737345, 2.91189246560585, 3.05741635523525, + 3.09888363076289, 2.95136265383824, 2.99083284207064, 3.14035090629054, + 3.18181818181818, 3.03030303030303, 1.28918695439329, 1.34551767676768, + 1.39103535353535, 1.33267943054095, 1.37617190668861, 1.43655303030303, + 1.48207070707071, 1.41966438283628, 1.46315685898394, 1.52758838383838, + 1.57310606060606, 1.5066493351316, 1.55014181127926, 1.61862373737374, + 1.66414141414141, 1.59363428742692, 1.63712676357458, 1.70965909090909, + 1.75517676767677, 1.68061923972224, 1.7241117158699, 1.80069444444444, + 1.84621212121212, 1.76760419201756, 1.81109666816522, 1.8917297979798, + 1.93724747474747, 1.85458914431288, 1.89808162046054, 1.98276515151515, + 2.02828282828283, 1.9415740966082, 1.98506657275586, 2.0738005050505, + 2.11931818181818, 2.02855904890352, 2.07205152505118, 2.16483585858586, + 2.21035353535354, 2.11554400119884, 2.1590364773465, 2.25587121212121, + 2.30138888888889, 2.20252895349416, 2.24602142964182, 2.34690656565657, + 2.39242424242424, 2.28951390578948, 2.33300638193714, 2.43794191919192, + 2.4834595959596, 2.3764988580848, 2.41999133423246, 2.52897727272727, + 2.57449494949495, 2.46348381038012, 2.50697628652779, 2.62001262626263, + 2.6655303030303, 2.55046876267545, 2.59396123882311, 2.71104797979798, + 2.75656565656566, 2.63745371497077, 2.68094619111843, 2.80208333333333, + 2.84760101010101, 2.72443866726609, 2.76793114341375, 2.89311868686869, + 2.93863636363636, 2.81142361956141, 2.85491609570907, 2.98415404040404, + 3.02967171717172, 2.89840857185673, 2.94190104800439, 3.07518939393939, + 3.12070707070707, 2.98539352415205, 3.02888600029971, 3.16622474747475, + 3.21174242424242, 3.07237847644737, 3.11587095259503, 3.2572601010101, + 3.30277777777778, 3.15936342874269, 3.20285590489035, 3.34829545454545, + 3.39381313131313, 3.24634838103801, 3.28984085718567, 3.43933080808081, + 3.48484848484848, 3.33333333333333, 1.40040661631043, 1.45529555585318, + 1.50492498632181, 1.44798016992858, 1.49555372354674, 1.55455441679044, + 1.60418384725907, 1.54312727716489, 1.59070083078304, 1.6538132777277, + 1.70344270819633, 1.6382743844012, 1.68584793801935, 1.75307213866496, + 1.80270156913359, 1.7334214916375, 1.78099504525566, 1.85233099960222, + 1.90196043007085, 1.82856859887381, 1.87614215249196, 1.95158986053948, + 2.00121929100811, 1.92371570611012, 1.97128925972827, 2.05084872147674, + 2.10047815194537, 2.01886281334642, 2.06643636696458, 2.150107582414, + 2.19973701288263, 2.11400992058273, 2.16158347420088, 2.24936644335126, + 2.29899587381989, 2.20915702781904, 2.25673058143719, 2.34862530428852, + 2.39825473475715, 2.30430413505534, 2.3518776886735, 2.44788416522578, + 2.49751359569441, 2.39945124229165, 2.4470247959098, 2.54714302616304, + 2.59677245663167, 2.49459834952796, 2.54217190314611, 2.6464018871003, + 2.69603131756893, 2.58974545676426, 2.63731901038242, 2.74566074803756, + 2.79529017850619, 2.68489256400057, 2.73246611761872, 2.84491960897482, + 2.89454903944345, 2.78003967123688, 2.82761322485503, 2.94417846991208, + 2.99380790038071, 2.87518677847318, 2.92276033209134, 3.04343733084934, + 3.09306676131797, 2.97033388570949, 3.01790743932764, 3.1426961917866, + 3.19232562225523, 3.0654809929458, 3.11305454656395, 3.24195505272386, + 3.29158448319249, 3.1606281001821, 3.20820165380026, 3.34121391366112, + 3.39084334412975, 3.25577520741841, 3.30334876103656, 3.44047277459838, + 3.49010220506701, 3.35092231465472, 3.39849586827287, 3.53973163553564, + 3.58936106600427, 3.44606942189102, 3.49364297550918, 3.6389904964729, + 3.68861992694153, 3.54121652912733, 3.58879008274548, 3.73824935741016, + 3.78787878787879, 3.63636363636364, 1.50862552209857, 1.56195548834395, + 1.61576301180278, 1.5603439990623, 1.61206247602603, 1.66957053526161, + 1.72337805872045, 1.66378095298976, 1.71549942995349, 1.77718558217928, + 1.83099310563811, 1.76721790691722, 1.81893638388095, 1.88480062909694, + 1.93860815255578, 1.87065486084469, 1.92237333780842, 1.99241567601461, + 2.04622319947344, 1.97409181477215, 2.02581029173588, 2.10003072293228, + 2.15383824639111, 2.07752876869961, 2.12924724566334, 2.20764576984994, + 2.26145329330877, 2.18096572262707, 2.23268419959081, 2.31526081676761, + 2.36906834022644, 2.28440267655454, 2.33612115351827, 2.42287586368527, + 2.47668338714411, 2.387839630482, 2.43955810744573, 2.53049091060294, + 2.58429843406177, 2.49127658440946, 2.54299506137319, 2.6381059575206, + 2.69191348097944, 2.59471353833692, 2.64643201530066, 2.74572100443827, + 2.7995285278971, 2.69815049226439, 2.74986896922812, 2.85333605135594, + 2.90714357481477, 2.80158744619185, 2.85330592315558, 2.9609510982736, + 3.01475862173243, 2.90502440011931, 2.95674287708304, 3.06856614519127, + 3.1223736686501, 3.00846135404678, 3.06017983101051, 3.17618119210893, + 3.22998871556777, 3.11189830797424, 3.16361678493797, 3.2837962390266, + 3.33760376248543, 3.2153352619017, 3.26705373886543, 3.39141128594426, + 3.4452188094031, 3.31877221582916, 3.37049069279289, 3.49902633286193, + 3.55283385632076, 3.42220916975663, 3.47392764672036, 3.6066413797796, + 3.66044890323843, 3.52564612368409, 3.57736460064782, 3.71425642669726, + 3.76806395015609, 3.62908307761155, 3.68080155457528, 3.82187147361493, + 3.87567899707376, 3.73252003153901, 3.78423850850275, 3.92948652053259, + 3.98329404399143, 3.83595698546648, 3.88767546243021, 4.03710156745026, + 4.09090909090909, 3.93939393939394, 1.61361282240215, 1.66527015646036, + 1.72332694874715, 1.66954498027497, 1.72547713814778, 1.78138374103394, + 1.83944053332073, 1.78140929602059, 1.8373414538934, 1.89749732560751, + 1.9555541178943, 1.89327361176621, 1.94920576963902, 2.01361091018109, + 2.07166770246788, 2.00513792751183, 2.06107008538464, 2.12972449475466, + 2.18778128704145, 2.11700224325745, 2.17293440113026, 2.24583807932824, + 2.30389487161503, 2.22886655900307, 2.28479871687588, 2.36195166390182, + 2.4200084561886, 2.34073087474869, 2.3966630326215, 2.47806524847539, + 2.53612204076218, 2.45259519049431, 2.50852734836712, 2.59417883304897, + 2.65223562533576, 2.56445950623993, 2.62039166411274, 2.71029241762254, + 2.76834920990933, 2.67632382198555, 2.73225597985836, 2.82640600219612, + 2.88446279448291, 2.78818813773117, 2.84412029560398, 2.9425195867697, + 3.00057637905648, 2.90005245347679, 2.9559846113496, 3.05863317134327, + 3.11668996363006, 3.01191676922241, 3.06784892709522, 3.17474675591685, + 3.23280354820364, 3.12378108496803, 3.17971324284085, 3.29086034049042, + 3.34891713277721, 3.23564540071366, 3.29157755858647, 3.406973925064, + 3.46503071735079, 3.34750971645928, 3.40344187433209, 3.52308750963758, + 3.58114430192436, 3.4593740322049, 3.51530619007771, 3.63920109421115, + 3.69725788649794, 3.57123834795052, 3.62717050582333, 3.75531467878473, + 3.81337147107151, 3.68310266369614, 3.73903482156895, 3.8714282633583, + 3.92948505564509, 3.79496697944176, 3.85089913731457, 3.98754184793188, + 4.04559864021867, 3.90683129518738, 3.96276345306019, 4.10365543250545, + 4.16171222479224, 4.018695610933, 4.07462776880581, 4.21976901707903, + 4.27782580936582, 4.13055992667862, 4.18649208455143, 4.33588260165261, + 4.39393939393939, 4.24242424242424, 1.71514498849147, 1.76501982052257, + 1.8274017327874, 1.77536434076728, 1.83558369304309, 1.88978364505224, + 1.95216555731707, 1.8958030453189, 1.95602239759471, 2.0145474695819, + 2.07692938184673, 2.01624174987052, 2.07646110214633, 2.13931129411157, + 2.2016932063764, 2.13668045442214, 2.19689980669795, 2.26407511864123, + 2.32645703090606, 2.25711915897376, 2.31733851124957, 2.3888389431709, + 2.45122085543573, 2.37755786352538, 2.43777721580119, 2.51360276770056, + 2.57598467996539, 2.497996568077, 2.55821592035281, 2.63836659223023, + 2.70074850449506, 2.61843527262862, 2.67865462490443, 2.76313041675989, + 2.82551232902472, 2.73887397718024, 2.79909332945605, 2.88789424128956, + 2.95027615355439, 2.85931268173186, 2.91953203400767, 3.01265806581922, + 3.07503997808405, 2.97975138628348, 3.03997073855929, 3.13742189034889, + 3.19980380261372, 3.1001900908351, 3.16040944311091, 3.26218571487855, + 3.32456762714338, 3.22062879538672, 3.28084814766253, 3.38694953940822, + 3.44933145167305, 3.34106749993834, 3.40128685221415, 3.51171336393788, + 3.57409527620271, 3.46150620448996, 3.52172555676577, 3.63647718846755, + 3.69885910073238, 3.58194490904158, 3.64216426131739, 3.76124101299721, + 3.82362292526204, 3.7023836135932, 3.76260296586901, 3.88600483752688, + 3.94838674979171, 3.82282231814482, 3.88304167042063, 4.01076866205654, + 4.07315057432137, 3.94326102269644, 4.00348037497225, 4.13553248658621, + 4.19791439885104, 4.06369972724806, 4.12391907952387, 4.26029631111587, + 4.3226782233807, 4.18413843179968, 4.2443577840755, 4.38506013564553, + 4.44744204791037, 4.3045771363513, 4.36479648862711, 4.5098239601752, + 4.57220587244003, 4.42501584090292, 4.48523519317873, 4.63458778470486, + 4.6969696969697, 4.54545454545454, 1.81300631862706, 1.86099281673154, + 1.9277802036096, 1.8775909681985, 1.94217561776994, 1.99456759048765, + 2.0613549773657, 2.00676026734138, 2.07134491691283, 2.12814236424375, + 2.1949297511218, 2.13592956648427, 2.20051421605571, 2.26171713799986, + 2.32850452487791, 2.26509886562715, 2.3296835151986, 2.39529191175596, + 2.46207929863401, 2.39426816477004, 2.45885281434148, 2.52886668551207, + 2.59565407239012, 2.52343746391292, 2.58802211348437, 2.66244145926817, + 2.72922884614622, 2.65260676305581, 2.71719141262725, 2.79601623302427, + 2.86280361990233, 2.78177606219869, 2.84636071177014, 2.92959100678038, + 2.99637839365843, 2.91094536134158, 2.97553001091302, 3.06316578053648, + 3.12995316741454, 3.04011466048446, 3.1046993100559, 3.19674055429259, + 3.26352794117064, 3.16928395962735, 3.23386860919879, 3.33031532804869, + 3.39710271492675, 3.29845325877023, 3.36303790834167, 3.4638901018048, + 3.53067748868285, 3.42762255791312, 3.49220720748456, 3.5974648755609, + 3.66425226243895, 3.556791857056, 3.62137650662744, 3.73103964931701, + 3.79782703619506, 3.68596115619889, 3.75054580577033, 3.86461442307311, + 3.93140180995116, 3.81513045534177, 3.87971510491321, 3.99818919682922, + 4.06497658370727, 3.94429975448466, 4.0088844040561, 4.13176397058532, + 4.19855135746337, 4.07346905362754, 4.13805370319898, 4.26533874434142, + 4.33212613121948, 4.20263835277042, 4.26722300234187, 4.39891351809753, + 4.46570090497558, 4.33180765191331, 4.39639230148475, 4.53248829185363, + 4.59927567873169, 4.46097695105619, 4.52556160062764, 4.66606306560974, + 4.73285045248779, 4.59014625019908, 4.65473089977052, 4.79963783936584, + 4.8664252262439, 4.71931554934196, 4.78390019891341, 4.93321261312195, 5, + 4.84848484848485, 1.90383286103702, 1.94667290534249, 2.0116373116118, + 1.9697087576107, 2.03558465418438, 2.07660171788111, 2.14156612415042, + 2.10146055075806, 2.16733644733174, 2.20653053041973, 2.27149493668903, + 2.23321234390542, 2.2990882404791, 2.33645934295834, 2.40142374922765, + 2.36496413705278, 2.43084003362646, 2.46638815549696, 2.53135256176627, + 2.49671593020014, 2.56259182677382, 2.59631696803558, 2.66128137430489, + 2.6284677233475, 2.69434361992118, 2.7262457805742, 2.7912101868435, + 2.76021951649486, 2.82609541306854, 2.85617459311281, 2.92113899938212, + 2.89197130964222, 2.9578472062159, 2.98610340565143, 3.05106781192074, + 3.02372310278959, 3.08959899936327, 3.11603221819005, 3.18099662445936, + 3.15547489593695, 3.22135079251063, 3.24596103072867, 3.31092543699797, + 3.28722668908431, 3.35310258565799, 3.37588984326728, 3.44085424953659, + 3.41897848223167, 3.48485437880535, 3.5058186558059, 3.57078306207521, + 3.55073027537903, 3.61660617195271, 3.63574746834452, 3.70071187461383, + 3.68248206852639, 3.74835796510007, 3.76567628088313, 3.83064068715244, + 3.81423386167375, 3.88010975824743, 3.89560509342175, 3.96056949969106, + 3.94598565482111, 4.01186155139479, 4.02553390596037, 4.09049831222968, + 4.07773744796847, 4.14361334454215, 4.15546271849899, 4.2204271247683, + 4.20948924111583, 4.27536513768951, 4.2853915310376, 4.35035593730691, + 4.3412410342632, 4.40711693083688, 4.41532034357622, 4.48028474984553, + 4.47299282741056, 4.53886872398424, 4.54524915611484, 4.61021356238415, + 4.60474462055792, 4.6706205171316, 4.67517796865346, 4.74014237492277, + 4.73649641370528, 4.80237231027896, 4.80510678119207, 4.87007118746138, + 4.86824820685264, 4.93412410342632, 4.93503559373069, 5, 5, + 1.98742601502635, 2.02817912471022, 2.09140935609936, 2.05152333385558, + 2.11562065268481, 2.1546395874885, 2.21786981887765, 2.17971797151403, + 2.24381529034326, 2.28110005026679, 2.34433028165594, 2.30791260917249, + 2.37200992800171, 2.40756051304508, 2.47079074443423, 2.43610724683094, + 2.50020456566017, 2.53402097582337, 2.59725120721251, 2.56430188448939, + 2.62839920331862, 2.66048143860166, 2.7237116699908, 2.69249652214785, + 2.75659384097707, 2.78694190137995, 2.85017213276909, 2.8206911598063, + 2.88478847863552, 2.91340236415824, 2.97663259554738, 2.94888579746475, + 3.01298311629398, 3.03986282693652, 3.10309305832567, 3.0770804351232, + 3.14117775395243, 3.16632328971481, 3.22955352110396, 3.20527507278166, + 3.26937239161088, 3.2927837524931, 3.35601398388225, 3.33346971044011, + 3.39756702926934, 3.41924421527139, 3.48247444666054, 3.46166434809856, + 3.52576166692779, 3.54570467804968, 3.60893490943882, 3.58985898575702, + 3.65395630458624, 3.67216514082797, 3.73539537221711, 3.71805362341547, + 3.7821509422447, 3.79862560360626, 3.8618558349954, 3.84624826107392, + 3.91034557990315, 3.92508606638455, 3.98831629777369, 3.97444289873238, + 4.0385402175616, 4.05154652916283, 4.11477676055198, 4.10263753639083, + 4.16673485522006, 4.17800699194112, 4.24123722333027, 4.23083217404928, + 4.29492949287851, 4.30446745471941, 4.36769768610856, 4.35902681170773, + 4.42312413053696, 4.4309279174977, 4.49415814888685, 4.48722144936619, + 4.55131876819542, 4.55738838027599, 4.62061861166513, 4.61541608702464, + 4.67951340585387, 4.68384884305428, 4.74707907444342, 4.74361072468309, + 4.80770804351232, 4.81030930583257, 4.87353953722171, 4.87180536234155, + 4.93590268117077, 4.93676976861086, 5, 5, 2.06675298087145, + 2.10532683703268, 2.16691562773411, 2.12916249191674, 2.19157200296202, + 2.22850441843554, 2.29009320913698, 2.25398151400731, 2.3163910250526, + 2.35168199983841, 2.41327079053984, 2.37880053609789, 2.44121004714318, + 2.47485958124127, 2.53644837194271, 2.50361955818847, 2.56602906923375, + 2.59803716264414, 2.65962595334557, 2.62843858027904, 2.69084809132433, + 2.721214744047, 2.78280353474843, 2.75325760236962, 2.81566711341491, + 2.84439232544987, 2.9059811161513, 2.8780766244602, 2.94048613550548, + 2.96756990685273, 3.02915869755416, 3.00289564655077, 3.06530515759606, + 3.0907474882556, 3.15233627895703, 3.12771466864135, 3.19012417968664, + 3.21392506965846, 3.27551386035989, 3.25253369073193, 3.31494320177721, + 3.33710265106133, 3.39869144176276, 3.3773527128225, 3.43976222386779, + 3.46028023246419, 3.52186902316562, 3.50217173491308, 3.56458124595837, + 3.58345781386706, 3.64504660456849, 3.62699075700366, 3.68940026804894, + 3.70663539526992, 3.76822418597135, 3.75180977909423, 3.81421929013952, + 3.82981297667279, 3.89140176737422, 3.87662880118481, 3.9390383122301, + 3.95299055807565, 4.01457934877708, 4.00144782327539, 4.06385733432067, + 4.07616813947851, 4.13775693017995, 4.12626684536596, 4.18867635641125, + 4.19934572088138, 4.26093451158281, 4.25108586745654, 4.31349537850183, + 4.32252330228424, 4.38411209298568, 4.37590488954712, 4.4383144005924, + 4.44570088368711, 4.50728967438854, 4.50072391163769, 4.56313342268298, + 4.56887846508997, 4.63046725579141, 4.62554293372827, 4.68795244477356, + 4.69205604649284, 4.75364483719427, 4.75036195581885, 4.81277146686413, + 4.8152336278957, 4.87682241859714, 4.87518097790942, 4.93759048895471, + 4.93841120929857, 5, 5, 2.14163405748041, 2.17794127792815, + 2.23798508052542, 2.20245035412977, 2.26326665077912, 2.29802888312269, + 2.35807268571997, 2.32408294742847, 2.38489924407782, 2.41811648831724, + 2.47816029091451, 2.44571554072718, 2.50653183737653, 2.53820409351179, + 2.59824789610906, 2.56734813402588, 2.62816443067524, 2.65829169870633, + 2.71833550130361, 2.68898072732459, 2.74979702397394, 2.77837930390088, + 2.83842310649815, 2.81061332062329, 2.87142961727265, 2.89846690909543, + 2.9585107116927, 2.932245913922, 2.99306221057135, 3.01855451428998, + 3.07859831688725, 3.05387850722071, 3.11469480387006, 3.13864211948452, + 3.1986859220818, 3.17551110051941, 3.23632739716877, 3.25872972467907, + 3.31877352727634, 3.29714369381812, 3.35795999046747, 3.37881732987362, + 3.43886113247089, 3.41877628711682, 3.47959258376618, 3.49890493506816, + 3.55894873766544, 3.54040888041553, 3.60122517706488, 3.61899254026271, + 3.67903634285998, 3.66204147371424, 3.72285777036359, 3.73908014545726, + 3.79912394805453, 3.78367406701294, 3.84449036366229, 3.8591677506518, + 3.91921155324908, 3.90530666031165, 3.966122956961, 3.97925535584635, + 4.03929915844362, 4.02693925361035, 4.08775555025971, 4.0993429610409, + 4.15938676363817, 4.14857184690906, 4.20938814355841, 4.21943056623544, + 4.27947436883272, 4.27020444020777, 4.33102073685712, 4.33951817142999, + 4.39956197402726, 4.39183703350647, 4.45265333015582, 4.45960577662454, + 4.51964957922181, 4.51346962680518, 4.57428592345453, 4.57969338181909, + 4.63973718441636, 4.63510222010388, 4.69591851675323, 4.69978098701363, + 4.75982478961091, 4.75673481340259, 4.81755111005194, 4.81986859220818, + 4.87991239480545, 4.87836740670129, 4.93918370335065, 4.93995619740273, + 5, 5, 2.21189961513043, 2.24585795233272, 2.30445671930436, + 2.27122089991489, 2.33054218469935, 2.363055486276, 2.42165425324765, + 2.38986346948381, 2.44918475426827, 2.48025302021929, 2.53885178719094, + 2.50850603905273, 2.56782732383718, 2.59745055416258, 2.65604932113423, + 2.62714860862164, 2.6864698934061, 2.71464808810587, 2.77324685507751, + 2.74579117819056, 2.80511246297502, 2.83184562204916, 2.8904443890208, + 2.86443374775948, 2.92375503254394, 2.94904315599245, 3.00764192296409, + 2.9830763173284, 3.04239760211286, 3.06624068993574, 3.12483945690738, + 3.10171888689731, 3.16104017168177, 3.18343822387903, 3.24203699085067, + 3.22036145646623, 3.27968274125069, 3.30063575782231, 3.35923452479396, + 3.33900402603515, 3.39832531081961, 3.4178332917656, 3.47643205873725, + 3.45764659560407, 3.51696788038853, 3.53503082570889, 3.59362959268054, + 3.57628916517299, 3.63561044995744, 3.65222835965218, 3.71082712662382, + 3.6949317347419, 3.75425301952636, 3.76942589359547, 3.82802466056711, + 3.81357430431082, 3.87289558909528, 3.88662342753876, 3.9452221945104, + 3.93221687387974, 3.9915381586642, 4.00382096148205, 4.06241972845369, + 4.05085944344866, 4.11018072823312, 4.12101849542533, 4.17961726239698, + 4.16950201301758, 4.22882329780203, 4.23821602936862, 4.29681479634027, + 4.28814458258649, 4.34746586737095, 4.35541356331191, 4.41401233028356, + 4.40678715215541, 4.46610843693987, 4.4726110972552, 4.53120986422685, + 4.52542972172433, 4.58475100650879, 4.58980863119849, 4.64840739817013, + 4.64407229129325, 4.70339357607771, 4.70700616514178, 4.76560493211342, + 4.76271486086216, 4.82203614564662, 4.82420369908507, 4.88280246605671, + 4.88135743043108, 4.94067871521554, 4.94140123302836, 5, 5, + 2.27739047973363, 2.30892300713455, 2.36617996442956, 2.33531834186696, + 2.39324620400029, 2.42343692172457, 2.48069387901958, 2.45117406613361, + 2.50910192826694, 2.53795083631459, 2.5952077936096, 2.56702979040027, + 2.62495765253359, 2.65246475090461, 2.70972170819962, 2.68288551466692, + 2.74081337680025, 2.76697866549463, 2.82423562278964, 2.79874123893358, + 2.8566691010669, 2.88149258008465, 2.93874953737966, 2.91459696320023, + 2.97252482533356, 2.99600649467467, 3.05326345196967, 3.03045268746688, + 3.08838054960021, 3.11052040926468, 3.16777736655969, 3.14630841173354, + 3.20423627386686, 3.2250343238547, 3.28229128114971, 3.26216413600019, + 3.32009199813352, 3.33954823844472, 3.39680519573973, 3.37801986026685, + 3.43594772240017, 3.45406215303474, 3.51131911032975, 3.4938755845335, + 3.55180344666683, 3.56857606762476, 3.62583302491977, 3.60973130880015, + 3.66765917093348, 3.68308998221478, 3.74034693950979, 3.72558703306681, + 3.78351489520013, 3.7976038968048, 3.85486085409981, 3.84144275733346, + 3.89937061946679, 3.91211781139482, 3.96937476868983, 3.95729848160012, + 4.01522634373344, 4.02663172598484, 4.08388868327985, 4.07315420586677, + 4.1310820680001, 4.14114564057486, 4.19840259786987, 4.18900993013342, + 4.24693779226675, 4.25565955516488, 4.31291651245989, 4.30486565440008, + 4.3627935165334, 4.37017346975489, 4.4274304270499, 4.42072137866673, + 4.47864924080006, 4.48468738434491, 4.54194434163992, 4.53657710293338, + 4.59450496506671, 4.59920129893493, 4.65645825622994, 4.65243282720004, + 4.71036068933337, 4.71371521352495, 4.77097217081996, 4.76828855146669, + 4.82621641360002, 4.82822912811497, 4.88548608540998, 4.88414427573335, + 4.94207213786667, 4.94274304270499, 5, 5, 2.3379582934176, + 2.36699357970066, 2.42301499289852, 2.39459747866404, 2.45123666391047, + 2.47903640609638, 2.53505781929423, 2.50787584915691, 2.56451503440334, + 2.59107923249209, 2.64710064568995, 2.62115421964977, 2.67779340489621, + 2.70312205888781, 2.75914347208567, 2.73443259014264, 2.79107177538908, + 2.81516488528353, 2.87118629848138, 2.84771096063551, 2.90435014588194, + 2.92720771167924, 2.9832291248771, 2.96098933112838, 3.01762851637481, + 3.03925053807496, 3.09527195127282, 3.07426770162125, 3.13090688686768, + 3.15129336447068, 3.20731477766853, 3.18754607211411, 3.24418525736055, + 3.26333619086639, 3.31935760406425, 3.30082444260698, 3.35746362785342, + 3.37537901726211, 3.43140043045997, 3.41410281309985, 3.47074199834628, + 3.48742184365783, 3.54344325685568, 3.52738118359272, 3.58402036883915, + 3.59946467005354, 3.6554860832514, 3.64065955408559, 3.69729873933202, + 3.71150749644926, 3.76752890964712, 3.75393792457845, 3.81057710982489, + 3.82355032284498, 3.87957173604283, 3.86721629507132, 3.92385548031775, + 3.93559314924069, 3.99161456243855, 3.98049466556419, 4.03713385081062, + 4.04763597563641, 4.10365738883427, 4.09377303605706, 4.15041222130349, + 4.15967880203213, 4.21570021522998, 4.20705140654993, 4.26369059179636, + 4.27172162842784, 4.3277430416257, 4.32032977704279, 4.37696896228923, + 4.38376445482356, 4.43978586802142, 4.43360814753566, 4.49024733278209, + 4.49580728121927, 4.55182869441713, 4.54688651802853, 4.60352570327496, + 4.60785010761499, 4.66387152081285, 4.6601648885214, 4.71680407376783, + 4.71989293401071, 4.77591434720857, 4.77344325901426, 4.8300824442607, + 4.83193576040643, 4.88795717360428, 4.88672162950713, 4.94336081475357, + 4.94397858680214, 5, 5, 2.39346585060369, 2.41993812150671, + 2.47483305509168, 2.4489240239951, 2.50438219738651, 2.52972798867664, + 2.5846229222616, 2.55984037077792, 2.61529854416933, 2.63951785584657, + 2.69441278943153, 2.67075671756074, 2.72621489095215, 2.74930772301649, + 2.80420265660146, 2.78167306434356, 2.83713123773497, 2.85909759018642, + 2.91399252377138, 2.89258941112638, 2.94804758451779, 2.96888745735635, + 3.02378239094131, 3.00350575790921, 3.05896393130062, 3.07867732452627, + 3.13357225811124, 3.11442210469203, 3.16988027808344, 3.1884671916962, + 3.24336212528117, 3.22533845147485, 3.28079662486626, 3.29825705886613, + 3.35315199245109, 3.33625479825767, 3.39171297164908, 3.40804692603606, + 3.46294185962102, 3.44717114504049, 3.5026293184319, 3.51783679320598, + 3.57273172679095, 3.55808749182331, 3.61354566521473, 3.62762666037591, + 3.68252159396087, 3.66900383860614, 3.72446201199755, 3.73741652754584, + 3.7923114611308, 3.77992018538896, 3.83537835878037, 3.84720639471576, + 3.90210132830073, 3.89083653217178, 3.94629470556319, 3.95699626188569, + 4.01189119547066, 4.0017528789546, 4.05721105234601, 4.06678612905562, + 4.12168106264058, 4.11266922573742, 4.16812739912884, 4.17657599622555, + 4.23147092981051, 4.22358557252025, 4.27904374591166, 4.28636586339547, + 4.34126079698044, 4.33450191930307, 4.38996009269448, 4.3961557305654, + 4.45105066415036, 4.44541826608589, 4.5008764394773, 4.50594559773533, + 4.56084053132029, 4.55633461286871, 4.61179278626012, 4.61573546490525, + 4.67063039849022, 4.66725095965153, 4.72270913304295, 4.72552533207518, + 4.78042026566015, 4.77816730643436, 4.83362547982577, 4.83531519924511, + 4.89021013283007, 4.88908365321718, 4.94454182660859, 4.94510506641504, + 5, 5, 2.44378740882173, 2.46763669613675, 2.52151676643171, + 2.49817491076169, 2.55256241270166, 2.57539683672668, 2.62927690702164, + 2.60694991464162, 2.66133741658158, 2.6831569773166, 2.73703704761156, + 2.71572491852155, 2.77011242046151, 2.79091711790653, 2.84479718820149, + 2.82449992240147, 2.87888742434144, 2.89867725849645, 2.95255732879142, + 2.9332749262814, 2.98766242822136, 3.00643739908638, 3.06031746938134, + 3.04204993016133, 3.09643743210129, 3.1141975396763, 3.16807760997127, + 3.15082493404125, 3.20521243598122, 3.22195768026623, 3.27583775056119, + 3.25959993792118, 3.31398743986114, 3.32971782085615, 3.38359789115112, + 3.3683749418011, 3.42276244374107, 3.43747796144608, 3.49135803174104, + 3.47714994568103, 3.53153744762099, 3.54523810203601, 3.59911817233097, + 3.58592494956096, 3.64031245150092, 3.65299824262593, 3.70687831292089, + 3.69469995344088, 3.74908745538085, 3.76075838321586, 3.81463845351082, + 3.80347495732081, 3.85786245926077, 3.86851852380578, 3.92239859410074, + 3.91224996120074, 3.9666374631407, 3.97627866439571, 4.03015873469067, + 4.02102496508066, 4.07541246702063, 4.08403880498563, 4.1379188752806, + 4.12979996896059, 4.18418747090055, 4.19179894557556, 4.24567901587052, + 4.23857497284052, 4.29296247478048, 4.29955908616548, 4.35343915646045, + 4.34734997672044, 4.40173747866041, 4.40731922675541, 4.46119929705037, + 4.45612498060037, 4.51051248254033, 4.51507936734534, 4.5689594376403, + 4.5648999844803, 4.61928748642026, 4.62283950793526, 4.67671957823022, + 4.67367498836022, 4.72806249030018, 4.73059964852519, 4.78447971882015, + 4.78244999224015, 4.83683749418011, 4.83835978911511, 4.89223985941007, + 4.89122499612007, 4.94561249806004, 4.94611992970504, 5, 5, + 2.48880897355726, 2.50998125097776, 2.56296037329738, 2.54223856986455, + 2.59566816617184, 2.615939495617, 2.66891861793663, 2.64909776247913, + 2.70252735878643, 2.72189774025625, 2.77487686257587, 2.75595695509372, + 2.80938655140101, 2.82785598489549, 2.88083510721511, 2.8628161477083, + 2.91624574401559, 2.93381422953474, 2.98679335185436, 2.96967534032289, + 3.02310493663018, 3.03977247417398, 3.0927515964936, 3.07653453293747, + 3.12996412924476, 3.14573071881323, 3.19870984113285, 3.18339372555206, + 3.23682332185935, 3.25168896345247, 3.30466808577209, 3.29025291816664, + 3.34368251447393, 3.35764720809171, 3.41062633041134, 3.39711211078123, + 3.45054170708852, 3.46360545273096, 3.51658457505058, 3.50397130339581, + 3.5574008997031, 3.5695636973702, 3.62254281968982, 3.6108304960104, + 3.66426009231769, 3.67552194200945, 3.72850106432907, 3.71768968862498, + 3.77111928493227, 3.78148018664869, 3.83445930896831, 3.82454888123957, + 3.87797847754686, 3.88743843128794, 3.94041755360756, 3.93140807385415, + 3.98483767016144, 3.99339667592718, 4.0463757982468, 4.03826726646874, + 4.09169686277603, 4.09935492056642, 4.15233404288605, 4.14512645908332, + 4.19855605539061, 4.20531316520567, 4.25829228752529, 4.25198565169791, + 4.3054152480052, 4.31127140984491, 4.36425053216453, 4.35884484431249, + 4.41227444061978, 4.41722965448416, 4.47020877680378, 4.46570403692708, + 4.51913363323437, 4.5231878991234, 4.57616702144302, 4.57256322954166, + 4.62599282584895, 4.62914614376264, 4.68212526608227, 4.67942242215624, + 4.73285201846354, 4.73510438840189, 4.78808351072151, 4.78628161477083, + 4.83971121107812, 4.84106263304113, 4.89404175536076, 4.89314080738542, + 4.94657040369271, 4.94702087768038, 5, 5, 2.52842855648567, + 2.54687586199357, 2.59906999258946, 2.58101518294342, 2.63360180940117, + 2.65126412318534, 2.70345825378122, 2.68618843585892, 2.73877506231667, + 2.7556523843771, 2.80784651497298, 2.79136168877443, 2.84394831523218, + 2.86004064556886, 2.91223477616474, 2.89653494168993, 2.94912156814768, + 2.96442890676063, 3.01662303735651, 3.00170819460543, 3.05429482106318, + 3.06881716795239, 3.12101129854827, 3.10688144752094, 3.15946807397869, + 3.17320542914415, 3.22539955974003, 3.21205470043644, 3.26464132689419, + 3.27759369033591, 3.3297878209318, 3.31722795335194, 3.3698145798097, + 3.38198195152768, 3.43417608212356, 3.42240120626745, 3.4749878327252, + 3.48637021271944, 3.53856434331532, 3.52757445918295, 3.5801610856407, + 3.5907584739112, 3.64295260450708, 3.63274771209845, 3.68533433855621, + 3.69514673510296, 3.74734086569885, 3.73792096501396, 3.79050759147171, + 3.79953499629473, 3.85172912689061, 3.84309421792946, 3.89568084438721, + 3.90392325748649, 3.95611738808237, 3.94826747084497, 4.00085409730272, + 4.00831151867825, 4.06050564927413, 4.05344072376047, 4.10602735021822, + 4.11269977987002, 4.1648939104659, 4.15861397667597, 4.21120060313372, + 4.21708804106178, 4.26928217165766, 4.26378722959148, 4.31637385604923, + 4.32147630225354, 4.37367043284942, 4.36896048250698, 4.42154710896473, + 4.42586456344531, 4.47805869404119, 4.47413373542248, 4.52672036188023, + 4.53025282463707, 4.58244695523295, 4.57930698833799, 4.63189361479574, + 4.63464108582883, 4.68683521642471, 4.68448024125349, 4.73706686771124, + 4.73902934702059, 4.79122347761647, 4.78965349416899, 4.84224012062675, + 4.84341760821236, 4.89561173880824, 4.8948267470845, 4.94741337354225, + 4.94780586940412, 5, 5, 2.56255640650863, 2.57823695102368, + 2.62976382440616, 2.61441690849781, 2.66627741048698, 2.68129069778863, + 2.73281757117111, 2.71813791247616, 2.76999841446534, 2.78434444455358, + 2.83587131793606, 2.82185891645452, 2.8737194184437, 2.88739819131853, + 2.93892506470101, 2.92557992043288, 2.97744042242205, 2.99045193808348, + 3.04197881146596, 3.02930092441123, 3.08116142640041, 3.09350568484843, + 3.14503255823091, 3.13302192838959, 3.18488243037877, 3.19655943161338, + 3.24808630499586, 3.23674293236794, 3.28860343435712, 3.29961317837833, + 3.35114005176081, 3.3404639363463, 3.39232443833548, 3.40266692514328, + 3.45419379852575, 3.44418494032466, 3.49604544231383, 3.50572067190823, + 3.5572475452907, 3.54790594430301, 3.59976644629219, 3.60877441867318, + 3.66030129205565, 3.65162694828137, 3.70348745027055, 3.71182816543813, + 3.7633550388206, 3.75534795225973, 3.8072084542489, 3.81488191220308, + 3.86640878558555, 3.85906895623808, 3.91092945822726, 3.91793565896803, + 3.9694625323505, 3.96278996021644, 4.01465046220562, 4.02098940573298, + 4.07251627911545, 4.06651096419479, 4.11837146618397, 4.12404315249793, + 4.1755700258804, 4.17023196817315, 4.22209247016233, 4.22709689926288, + 4.27862377264535, 4.27395297215151, 4.32581347414069, 4.33015064602783, + 4.3816775194103, 4.37767397612986, 4.42953447811904, 4.43320439279278, + 4.48473126617525, 4.48139498010822, 4.5332554820974, 4.53625813955773, + 4.5877850129402, 4.58511598408658, 4.63697648607575, 4.63931188632268, + 4.69083875970515, 4.68883698806493, 4.74069749005411, 4.74236563308763, + 4.7938925064701, 4.79255799204329, 4.84441849403247, 4.84541937985258, + 4.89694625323505, 4.89627899602164, 4.94813949801082, 4.94847312661753, + 5, 5, 2.59111521306916, 2.60399347511464, 2.65497233734624, + 2.6423680808762, 2.69362094868324, 2.70595119957785, 2.75693006180945, + 2.74487381649028, 2.79612668429732, 2.80790892404105, 2.85888778627266, + 2.84737955210436, 2.8986324199114, 2.90986664850426, 2.96084551073586, + 2.94988528771844, 3.00113815552547, 3.01182437296747, 3.06280323519907, + 3.05239102333251, 3.10364389113955, 3.11378209743067, 3.16476095966228, + 3.15489675894659, 3.20614962675363, 3.21573982189388, 3.26671868412548, + 3.25740249456067, 3.30865536236771, 3.31769754635709, 3.36867640858869, + 3.35990823017475, 3.41116109798179, 3.41965527082029, 3.4706341330519, + 3.46241396578883, 3.51366683359587, 3.5216129952835, 3.57259185751511, + 3.5649197014029, 3.61617256920994, 3.62357071974671, 3.67454958197831, + 3.66742543701698, 3.71867830482402, 3.72552844420992, 3.77650730644152, + 3.76993117263106, 3.8211840404381, 3.82748616867312, 3.87846503090473, + 3.87243690824514, 3.92368977605218, 3.92944389313633, 3.98042275536793, + 3.97494264385922, 4.02619551166626, 4.03140161759954, 4.08238047983114, + 4.0774483794733, 4.12870124728033, 4.13335934206274, 4.18433820429435, + 4.17995411508737, 4.23120698289441, 4.23531706652595, 4.28629592875755, + 4.28245985070145, 4.33371271850849, 4.33727479098916, 4.38825365322076, + 4.38496558631553, 4.43621845412257, 4.43923251545236, 4.49021137768397, + 4.48747132192961, 4.53872418973665, 4.54119023991557, 4.59216910214717, + 4.58997705754369, 4.64122992535073, 4.64314796437878, 4.69412682661038, + 4.69248279315777, 4.7437356609648, 4.74510568884198, 4.79608455107359, + 4.79498852877184, 4.84624139657888, 4.84706341330519, 4.89804227553679, + 4.89749426438592, 4.94874713219296, 4.9490211377684, 5, 5, + 2.61404028128492, 2.62408708745521, 2.67463842601999, 2.66480538168312, + 2.71557048208131, 2.72518976458477, 2.77574110314956, 2.7663355824795, + 2.8171006828777, 2.82629244171434, 2.87684378027912, 2.86786578327589, + 2.91863088367408, 2.9273951188439, 2.97794645740869, 2.96939598407228, + 3.02016108447047, 3.02849779597347, 3.07904913453825, 3.07092618486866, + 3.12169128526686, 3.12960047310304, 3.18015181166782, 3.17245638566505, + 3.22322148606324, 3.2307031502326, 3.28125448879738, 3.27398658646143, + 3.32475168685963, 3.33180582736217, 3.38235716592695, 3.37551678725782, + 3.42628188765601, 3.43290850449173, 3.48345984305652, 3.47704698805421, + 3.5278120884524, 3.5340111816213, 3.58456252018608, 3.57857718885059, + 3.62934228924879, 3.63511385875086, 3.68566519731565, 3.68010738964698, + 3.73087249004517, 3.73621653588043, 3.78676787444521, 3.78163759044337, + 3.83240269084156, 3.83731921301, 3.88787055157478, 3.88316779123975, + 3.93393289163794, 3.93842189013956, 3.98897322870434, 3.98469799203614, + 4.03546309243433, 4.03952456726913, 4.09007590583391, 4.08622819283252, + 4.13699329323072, 4.14062724439869, 4.19117858296347, 4.18775839362891, + 4.2385234940271, 4.24172992152826, 4.29228126009304, 4.2892885944253, + 4.34005369482349, 4.34283259865782, 4.39338393722261, 4.39081879522168, + 4.44158389561988, 4.44393527578739, 4.49448661435217, 4.49234899601807, + 4.54311409641626, 4.54503795291695, 4.59558929148174, 4.59387919681446, + 4.64464429721265, 4.64614063004652, 4.6966919686113, 4.69540939761084, + 4.74617449800903, 4.74724330717609, 4.79779464574087, 4.79693959840723, + 4.84770469880542, 4.84834598430565, 4.89889732287043, 4.89846979920361, + 4.94923489960181, 4.94944866143522, 5, 5, 2.63127967850293, + 2.63847226955065, 2.68871754041127, 2.68167798321563, 2.73207628792833, + 2.73896281127189, 2.78920808213252, 2.78247459264104, 2.83287289735374, + 2.83945335299314, 2.88969862385377, 2.88327120206645, 2.93366950677915, + 2.93994389471439, 2.99018916557502, 2.98406781149185, 3.03446611620456, + 3.04043443643564, 3.09067970729627, 3.08486442091726, 3.13526272562996, + 3.14092497815689, 3.19117024901752, 3.18566103034267, 3.23605933505537, + 3.24141551987814, 3.29166079073876, 3.28645763976807, 3.33685594448078, + 3.34190606159939, 3.39215133246001, 3.38725424919348, 3.43765255390619, + 3.44239660332064, 3.49264187418126, 3.48805085861889, 3.53844916333159, + 3.54288714504189, 3.59313241590251, 3.5888474680443, 3.639245772757, + 3.64337768676314, 3.69362295762376, 3.6896440774697, 3.74004238218241, + 3.74386822848439, 3.79411349934501, 3.79044068689511, 3.84083899160782, + 3.84435877020563, 3.89460404106626, 3.89123729632052, 3.94163560103322, + 3.94484931192688, 3.99509458278751, 3.99203390574593, 4.04243221045863, + 4.04533985364813, 4.09558512450876, 4.09283051517133, 4.14322881988404, + 4.14583039536938, 4.19607566623001, 4.19362712459674, 4.24402542930944, + 4.24632093709063, 4.29656620795126, 4.29442373402215, 4.34482203873485, + 4.34681147881188, 4.3970567496725, 4.39522034344755, 4.44561864816026, + 4.44730202053313, 4.49754729139375, 4.49601695287296, 4.54641525758567, + 4.54779256225438, 4.598037833115, 4.59681356229837, 4.64721186701107, + 4.64828310397563, 4.69852837483625, 4.69761017172378, 4.74800847643648, + 4.74877364569688, 4.7990189165575, 4.79840678114918, 4.84880508586189, + 4.84926418741813, 4.89950945827875, 4.89920339057459, 4.9496016952873, + 4.94975472913938, 5, 5, 2.64279435194369, 2.64711643433674, + 2.69717778679766, 2.69294766360447, 2.74310097526524, 2.74723913925858, + 2.7973004917195, 2.79325428692601, 2.84340759858678, 2.84736184418042, + 2.89742319664134, 2.89356091024756, 2.94371422190833, 2.94748454910226, + 2.99754590156318, 2.9938675335691, 3.04402084522987, 3.0476072540241, + 3.09766860648502, 3.09417415689065, 3.14432746855142, 3.14772995894594, + 3.19779131140687, 3.19448078021219, 3.24463409187296, 3.24785266386779, + 3.29791401632871, 3.29478740353374, 3.34494071519451, 3.34797536878963, + 3.39803672125055, 3.39509402685528, 3.44524733851605, 3.44809807371147, + 3.49815942617239, 3.49540065017683, 3.5455539618376, 3.54822077863331, + 3.59828213109423, 3.59570727349837, 3.64586058515914, 3.64834348355515, + 3.69840483601607, 3.69601389681992, 3.74616720848069, 3.74846618847699, + 3.79852754093791, 3.79632052014146, 3.84647383180223, 3.84858889339883, + 3.89865024585975, 3.89662714346301, 3.94678045512378, 3.94871159832067, + 3.99877295078159, 3.99693376678455, 4.04708707844532, 4.04883430324251, + 4.09889565570343, 4.0972403901061, 4.14739370176687, 4.14895700816435, + 4.19901836062527, 4.19754701342764, 4.24770032508841, 4.24907971308619, + 4.29914106554711, 4.29785363674919, 4.34800694840996, 4.34920241800804, + 4.39926377046895, 4.39816026007073, 4.4483135717315, 4.44932512292988, + 4.4993864753908, 4.49846688339228, 4.54862019505305, 4.54944782785172, + 4.59950918031264, 4.59877350671382, 4.64892681837459, 4.64957053277356, + 4.69963188523448, 4.69908013003537, 4.74923344169614, 4.7496932376954, + 4.79975459015632, 4.79938675335691, 4.84954006501768, 4.84981594261724, + 4.89987729507816, 4.89969337667845, 4.94984668833923, 4.94993864753908, + 5, 5, 2.64855821716837, 2.69858889339883, 2.74861956962929, + 2.79865024585975, 2.84868092209021, 2.89871159832067, 2.94874227455113, + 2.99877295078159, 3.04880362701205, 3.09883430324251, 3.14886497947297, + 3.19889565570343, 3.24892633193389, 3.29895700816435, 3.34898768439481, + 3.39901836062527, 3.44904903685573, 3.49907971308619, 3.54911038931665, + 3.59914106554711, 3.64917174177757, 3.69920241800803, 3.7492330942385, + 3.79926377046896, 3.84929444669942, 3.89932512292988, 3.94935579916034, + 3.9993864753908, 4.04941715162126, 4.09944782785172, 4.14947850408218, + 4.19950918031264, 4.2495398565431, 4.29957053277356, 4.34960120900402, + 4.39963188523448, 4.44966256146494, 4.4996932376954, 4.54972391392586, + 4.59975459015632, 4.64978526638678, 4.69981594261724, 4.7498466188477, + 4.79987729507816, 4.84990797130862, 4.89993864753908, 4.94996932376954, 5 ; + + eb_names = + "" ; + + ss_names = + "" ; + + coor_names = + "x", + "y" ; + + connect1 = + 1, 2, 3, 4, + 5, 4, 3, 6, + 7, 6, 3, 8, + 9, 8, 3, 2, + 10, 11, 12, 13, + 1, 13, 12, 2, + 9, 2, 12, 14, + 15, 14, 12, 11, + 16, 17, 18, 19, + 10, 19, 18, 11, + 15, 11, 18, 20, + 21, 20, 18, 17, + 22, 23, 24, 25, + 16, 25, 24, 17, + 21, 17, 24, 26, + 27, 26, 24, 23, + 28, 29, 30, 31, + 22, 31, 30, 23, + 27, 23, 30, 32, + 33, 32, 30, 29, + 34, 35, 36, 37, + 28, 37, 36, 29, + 33, 29, 36, 38, + 39, 38, 36, 35, + 40, 41, 42, 43, + 34, 43, 42, 35, + 39, 35, 42, 44, + 45, 44, 42, 41, + 46, 47, 48, 49, + 40, 49, 48, 41, + 45, 41, 48, 50, + 51, 50, 48, 47, + 52, 53, 54, 55, + 46, 55, 54, 47, + 51, 47, 54, 56, + 57, 56, 54, 53, + 58, 59, 60, 61, + 52, 61, 60, 53, + 57, 53, 60, 62, + 63, 62, 60, 59, + 64, 65, 66, 67, + 58, 67, 66, 59, + 63, 59, 66, 68, + 69, 68, 66, 65, + 70, 71, 72, 73, + 64, 73, 72, 65, + 69, 65, 72, 74, + 75, 74, 72, 71, + 76, 77, 78, 79, + 70, 79, 78, 71, + 75, 71, 78, 80, + 81, 80, 78, 77, + 82, 83, 84, 85, + 76, 85, 84, 77, + 81, 77, 84, 86, + 87, 86, 84, 83, + 88, 89, 90, 91, + 82, 91, 90, 83, + 87, 83, 90, 92, + 93, 92, 90, 89, + 94, 95, 96, 97, + 88, 97, 96, 89, + 93, 89, 96, 98, + 99, 98, 96, 95, + 9, 100, 101, 8, + 7, 8, 101, 102, + 103, 102, 101, 104, + 105, 104, 101, 100, + 15, 106, 107, 14, + 9, 14, 107, 100, + 105, 100, 107, 108, + 109, 108, 107, 106, + 21, 110, 111, 20, + 15, 20, 111, 106, + 109, 106, 111, 112, + 113, 112, 111, 110, + 27, 114, 115, 26, + 21, 26, 115, 110, + 113, 110, 115, 116, + 117, 116, 115, 114, + 33, 118, 119, 32, + 27, 32, 119, 114, + 117, 114, 119, 120, + 121, 120, 119, 118, + 39, 122, 123, 38, + 33, 38, 123, 118, + 121, 118, 123, 124, + 125, 124, 123, 122, + 45, 126, 127, 44, + 39, 44, 127, 122, + 125, 122, 127, 128, + 129, 128, 127, 126, + 51, 130, 131, 50, + 45, 50, 131, 126, + 129, 126, 131, 132, + 133, 132, 131, 130, + 57, 134, 135, 56, + 51, 56, 135, 130, + 133, 130, 135, 136, + 137, 136, 135, 134, + 63, 138, 139, 62, + 57, 62, 139, 134, + 137, 134, 139, 140, + 141, 140, 139, 138, + 69, 142, 143, 68, + 63, 68, 143, 138, + 141, 138, 143, 144, + 145, 144, 143, 142, + 75, 146, 147, 74, + 69, 74, 147, 142, + 145, 142, 147, 148, + 149, 148, 147, 146, + 81, 150, 151, 80, + 75, 80, 151, 146, + 149, 146, 151, 152, + 153, 152, 151, 150, + 87, 154, 155, 86, + 81, 86, 155, 150, + 153, 150, 155, 156, + 157, 156, 155, 154, + 93, 158, 159, 92, + 87, 92, 159, 154, + 157, 154, 159, 160, + 161, 160, 159, 158, + 99, 162, 163, 98, + 93, 98, 163, 158, + 161, 158, 163, 164, + 165, 164, 163, 162, + 105, 166, 167, 104, + 103, 104, 167, 168, + 169, 168, 167, 170, + 171, 170, 167, 166, + 109, 172, 173, 108, + 105, 108, 173, 166, + 171, 166, 173, 174, + 175, 174, 173, 172, + 113, 176, 177, 112, + 109, 112, 177, 172, + 175, 172, 177, 178, + 179, 178, 177, 176, + 117, 180, 181, 116, + 113, 116, 181, 176, + 179, 176, 181, 182, + 183, 182, 181, 180, + 121, 184, 185, 120, + 117, 120, 185, 180, + 183, 180, 185, 186, + 187, 186, 185, 184, + 125, 188, 189, 124, + 121, 124, 189, 184, + 187, 184, 189, 190, + 191, 190, 189, 188, + 129, 192, 193, 128, + 125, 128, 193, 188, + 191, 188, 193, 194, + 195, 194, 193, 192, + 133, 196, 197, 132, + 129, 132, 197, 192, + 195, 192, 197, 198, + 199, 198, 197, 196, + 137, 200, 201, 136, + 133, 136, 201, 196, + 199, 196, 201, 202, + 203, 202, 201, 200, + 141, 204, 205, 140, + 137, 140, 205, 200, + 203, 200, 205, 206, + 207, 206, 205, 204, + 145, 208, 209, 144, + 141, 144, 209, 204, + 207, 204, 209, 210, + 211, 210, 209, 208, + 149, 212, 213, 148, + 145, 148, 213, 208, + 211, 208, 213, 214, + 215, 214, 213, 212, + 153, 216, 217, 152, + 149, 152, 217, 212, + 215, 212, 217, 218, + 219, 218, 217, 216, + 157, 220, 221, 156, + 153, 156, 221, 216, + 219, 216, 221, 222, + 223, 222, 221, 220, + 161, 224, 225, 160, + 157, 160, 225, 220, + 223, 220, 225, 226, + 227, 226, 225, 224, + 165, 228, 229, 164, + 161, 164, 229, 224, + 227, 224, 229, 230, + 231, 230, 229, 228, + 171, 232, 233, 170, + 169, 170, 233, 234, + 235, 234, 233, 236, + 237, 236, 233, 232, + 175, 238, 239, 174, + 171, 174, 239, 232, + 237, 232, 239, 240, + 241, 240, 239, 238, + 179, 242, 243, 178, + 175, 178, 243, 238, + 241, 238, 243, 244, + 245, 244, 243, 242, + 183, 246, 247, 182, + 179, 182, 247, 242, + 245, 242, 247, 248, + 249, 248, 247, 246, + 187, 250, 251, 186, + 183, 186, 251, 246, + 249, 246, 251, 252, + 253, 252, 251, 250, + 191, 254, 255, 190, + 187, 190, 255, 250, + 253, 250, 255, 256, + 257, 256, 255, 254, + 195, 258, 259, 194, + 191, 194, 259, 254, + 257, 254, 259, 260, + 261, 260, 259, 258, + 199, 262, 263, 198, + 195, 198, 263, 258, + 261, 258, 263, 264, + 265, 264, 263, 262, + 203, 266, 267, 202, + 199, 202, 267, 262, + 265, 262, 267, 268, + 269, 268, 267, 266, + 207, 270, 271, 206, + 203, 206, 271, 266, + 269, 266, 271, 272, + 273, 272, 271, 270, + 211, 274, 275, 210, + 207, 210, 275, 270, + 273, 270, 275, 276, + 277, 276, 275, 274, + 215, 278, 279, 214, + 211, 214, 279, 274, + 277, 274, 279, 280, + 281, 280, 279, 278, + 219, 282, 283, 218, + 215, 218, 283, 278, + 281, 278, 283, 284, + 285, 284, 283, 282, + 223, 286, 287, 222, + 219, 222, 287, 282, + 285, 282, 287, 288, + 289, 288, 287, 286, + 227, 290, 291, 226, + 223, 226, 291, 286, + 289, 286, 291, 292, + 293, 292, 291, 290, + 231, 294, 295, 230, + 227, 230, 295, 290, + 293, 290, 295, 296, + 297, 296, 295, 294, + 237, 298, 299, 236, + 235, 236, 299, 300, + 301, 300, 299, 302, + 303, 302, 299, 298, + 241, 304, 305, 240, + 237, 240, 305, 298, + 303, 298, 305, 306, + 307, 306, 305, 304, + 245, 308, 309, 244, + 241, 244, 309, 304, + 307, 304, 309, 310, + 311, 310, 309, 308, + 249, 312, 313, 248, + 245, 248, 313, 308, + 311, 308, 313, 314, + 315, 314, 313, 312, + 253, 316, 317, 252, + 249, 252, 317, 312, + 315, 312, 317, 318, + 319, 318, 317, 316, + 257, 320, 321, 256, + 253, 256, 321, 316, + 319, 316, 321, 322, + 323, 322, 321, 320, + 261, 324, 325, 260, + 257, 260, 325, 320, + 323, 320, 325, 326, + 327, 326, 325, 324, + 265, 328, 329, 264, + 261, 264, 329, 324, + 327, 324, 329, 330, + 331, 330, 329, 328, + 269, 332, 333, 268, + 265, 268, 333, 328, + 331, 328, 333, 334, + 335, 334, 333, 332, + 273, 336, 337, 272, + 269, 272, 337, 332, + 335, 332, 337, 338, + 339, 338, 337, 336, + 277, 340, 341, 276, + 273, 276, 341, 336, + 339, 336, 341, 342, + 343, 342, 341, 340, + 281, 344, 345, 280, + 277, 280, 345, 340, + 343, 340, 345, 346, + 347, 346, 345, 344, + 285, 348, 349, 284, + 281, 284, 349, 344, + 347, 344, 349, 350, + 351, 350, 349, 348, + 289, 352, 353, 288, + 285, 288, 353, 348, + 351, 348, 353, 354, + 355, 354, 353, 352, + 293, 356, 357, 292, + 289, 292, 357, 352, + 355, 352, 357, 358, + 359, 358, 357, 356, + 297, 360, 361, 296, + 293, 296, 361, 356, + 359, 356, 361, 362, + 363, 362, 361, 360, + 303, 364, 365, 302, + 301, 302, 365, 366, + 367, 366, 365, 368, + 369, 368, 365, 364, + 307, 370, 371, 306, + 303, 306, 371, 364, + 369, 364, 371, 372, + 373, 372, 371, 370, + 311, 374, 375, 310, + 307, 310, 375, 370, + 373, 370, 375, 376, + 377, 376, 375, 374, + 315, 378, 379, 314, + 311, 314, 379, 374, + 377, 374, 379, 380, + 381, 380, 379, 378, + 319, 382, 383, 318, + 315, 318, 383, 378, + 381, 378, 383, 384, + 385, 384, 383, 382, + 323, 386, 387, 322, + 319, 322, 387, 382, + 385, 382, 387, 388, + 389, 388, 387, 386, + 327, 390, 391, 326, + 323, 326, 391, 386, + 389, 386, 391, 392, + 393, 392, 391, 390, + 331, 394, 395, 330, + 327, 330, 395, 390, + 393, 390, 395, 396, + 397, 396, 395, 394, + 335, 398, 399, 334, + 331, 334, 399, 394, + 397, 394, 399, 400, + 401, 400, 399, 398, + 339, 402, 403, 338, + 335, 338, 403, 398, + 401, 398, 403, 404, + 405, 404, 403, 402, + 343, 406, 407, 342, + 339, 342, 407, 402, + 405, 402, 407, 408, + 409, 408, 407, 406, + 347, 410, 411, 346, + 343, 346, 411, 406, + 409, 406, 411, 412, + 413, 412, 411, 410, + 351, 414, 415, 350, + 347, 350, 415, 410, + 413, 410, 415, 416, + 417, 416, 415, 414, + 355, 418, 419, 354, + 351, 354, 419, 414, + 417, 414, 419, 420, + 421, 420, 419, 418, + 359, 422, 423, 358, + 355, 358, 423, 418, + 421, 418, 423, 424, + 425, 424, 423, 422, + 363, 426, 427, 362, + 359, 362, 427, 422, + 425, 422, 427, 428, + 429, 428, 427, 426, + 369, 430, 431, 368, + 367, 368, 431, 432, + 433, 432, 431, 434, + 435, 434, 431, 430, + 373, 436, 437, 372, + 369, 372, 437, 430, + 435, 430, 437, 438, + 439, 438, 437, 436, + 377, 440, 441, 376, + 373, 376, 441, 436, + 439, 436, 441, 442, + 443, 442, 441, 440, + 381, 444, 445, 380, + 377, 380, 445, 440, + 443, 440, 445, 446, + 447, 446, 445, 444, + 385, 448, 449, 384, + 381, 384, 449, 444, + 447, 444, 449, 450, + 451, 450, 449, 448, + 389, 452, 453, 388, + 385, 388, 453, 448, + 451, 448, 453, 454, + 455, 454, 453, 452, + 393, 456, 457, 392, + 389, 392, 457, 452, + 455, 452, 457, 458, + 459, 458, 457, 456, + 397, 460, 461, 396, + 393, 396, 461, 456, + 459, 456, 461, 462, + 463, 462, 461, 460, + 401, 464, 465, 400, + 397, 400, 465, 460, + 463, 460, 465, 466, + 467, 466, 465, 464, + 405, 468, 469, 404, + 401, 404, 469, 464, + 467, 464, 469, 470, + 471, 470, 469, 468, + 409, 472, 473, 408, + 405, 408, 473, 468, + 471, 468, 473, 474, + 475, 474, 473, 472, + 413, 476, 477, 412, + 409, 412, 477, 472, + 475, 472, 477, 478, + 479, 478, 477, 476, + 417, 480, 481, 416, + 413, 416, 481, 476, + 479, 476, 481, 482, + 483, 482, 481, 480, + 421, 484, 485, 420, + 417, 420, 485, 480, + 483, 480, 485, 486, + 487, 486, 485, 484, + 425, 488, 489, 424, + 421, 424, 489, 484, + 487, 484, 489, 490, + 491, 490, 489, 488, + 429, 492, 493, 428, + 425, 428, 493, 488, + 491, 488, 493, 494, + 495, 494, 493, 492, + 435, 496, 497, 434, + 433, 434, 497, 498, + 499, 498, 497, 500, + 501, 500, 497, 496, + 439, 502, 503, 438, + 435, 438, 503, 496, + 501, 496, 503, 504, + 505, 504, 503, 502, + 443, 506, 507, 442, + 439, 442, 507, 502, + 505, 502, 507, 508, + 509, 508, 507, 506, + 447, 510, 511, 446, + 443, 446, 511, 506, + 509, 506, 511, 512, + 513, 512, 511, 510, + 451, 514, 515, 450, + 447, 450, 515, 510, + 513, 510, 515, 516, + 517, 516, 515, 514, + 455, 518, 519, 454, + 451, 454, 519, 514, + 517, 514, 519, 520, + 521, 520, 519, 518, + 459, 522, 523, 458, + 455, 458, 523, 518, + 521, 518, 523, 524, + 525, 524, 523, 522, + 463, 526, 527, 462, + 459, 462, 527, 522, + 525, 522, 527, 528, + 529, 528, 527, 526, + 467, 530, 531, 466, + 463, 466, 531, 526, + 529, 526, 531, 532, + 533, 532, 531, 530, + 471, 534, 535, 470, + 467, 470, 535, 530, + 533, 530, 535, 536, + 537, 536, 535, 534, + 475, 538, 539, 474, + 471, 474, 539, 534, + 537, 534, 539, 540, + 541, 540, 539, 538, + 479, 542, 543, 478, + 475, 478, 543, 538, + 541, 538, 543, 544, + 545, 544, 543, 542, + 483, 546, 547, 482, + 479, 482, 547, 542, + 545, 542, 547, 548, + 549, 548, 547, 546, + 487, 550, 551, 486, + 483, 486, 551, 546, + 549, 546, 551, 552, + 553, 552, 551, 550, + 491, 554, 555, 490, + 487, 490, 555, 550, + 553, 550, 555, 556, + 557, 556, 555, 554, + 495, 558, 559, 494, + 491, 494, 559, 554, + 557, 554, 559, 560, + 561, 560, 559, 558, + 501, 562, 563, 500, + 499, 500, 563, 564, + 565, 564, 563, 566, + 567, 566, 563, 562, + 505, 568, 569, 504, + 501, 504, 569, 562, + 567, 562, 569, 570, + 571, 570, 569, 568, + 509, 572, 573, 508, + 505, 508, 573, 568, + 571, 568, 573, 574, + 575, 574, 573, 572, + 513, 576, 577, 512, + 509, 512, 577, 572, + 575, 572, 577, 578, + 579, 578, 577, 576, + 517, 580, 581, 516, + 513, 516, 581, 576, + 579, 576, 581, 582, + 583, 582, 581, 580, + 521, 584, 585, 520, + 517, 520, 585, 580, + 583, 580, 585, 586, + 587, 586, 585, 584, + 525, 588, 589, 524, + 521, 524, 589, 584, + 587, 584, 589, 590, + 591, 590, 589, 588, + 529, 592, 593, 528, + 525, 528, 593, 588, + 591, 588, 593, 594, + 595, 594, 593, 592, + 533, 596, 597, 532, + 529, 532, 597, 592, + 595, 592, 597, 598, + 599, 598, 597, 596, + 537, 600, 601, 536, + 533, 536, 601, 596, + 599, 596, 601, 602, + 603, 602, 601, 600, + 541, 604, 605, 540, + 537, 540, 605, 600, + 603, 600, 605, 606, + 607, 606, 605, 604, + 545, 608, 609, 544, + 541, 544, 609, 604, + 607, 604, 609, 610, + 611, 610, 609, 608, + 549, 612, 613, 548, + 545, 548, 613, 608, + 611, 608, 613, 614, + 615, 614, 613, 612, + 553, 616, 617, 552, + 549, 552, 617, 612, + 615, 612, 617, 618, + 619, 618, 617, 616, + 557, 620, 621, 556, + 553, 556, 621, 616, + 619, 616, 621, 622, + 623, 622, 621, 620, + 561, 624, 625, 560, + 557, 560, 625, 620, + 623, 620, 625, 626, + 627, 626, 625, 624, + 567, 628, 629, 566, + 565, 566, 629, 630, + 631, 630, 629, 632, + 633, 632, 629, 628, + 571, 634, 635, 570, + 567, 570, 635, 628, + 633, 628, 635, 636, + 637, 636, 635, 634, + 575, 638, 639, 574, + 571, 574, 639, 634, + 637, 634, 639, 640, + 641, 640, 639, 638, + 579, 642, 643, 578, + 575, 578, 643, 638, + 641, 638, 643, 644, + 645, 644, 643, 642, + 583, 646, 647, 582, + 579, 582, 647, 642, + 645, 642, 647, 648, + 649, 648, 647, 646, + 587, 650, 651, 586, + 583, 586, 651, 646, + 649, 646, 651, 652, + 653, 652, 651, 650, + 591, 654, 655, 590, + 587, 590, 655, 650, + 653, 650, 655, 656, + 657, 656, 655, 654, + 595, 658, 659, 594, + 591, 594, 659, 654, + 657, 654, 659, 660, + 661, 660, 659, 658, + 599, 662, 663, 598, + 595, 598, 663, 658, + 661, 658, 663, 664, + 665, 664, 663, 662, + 603, 666, 667, 602, + 599, 602, 667, 662, + 665, 662, 667, 668, + 669, 668, 667, 666, + 607, 670, 671, 606, + 603, 606, 671, 666, + 669, 666, 671, 672, + 673, 672, 671, 670, + 611, 674, 675, 610, + 607, 610, 675, 670, + 673, 670, 675, 676, + 677, 676, 675, 674, + 615, 678, 679, 614, + 611, 614, 679, 674, + 677, 674, 679, 680, + 681, 680, 679, 678, + 619, 682, 683, 618, + 615, 618, 683, 678, + 681, 678, 683, 684, + 685, 684, 683, 682, + 623, 686, 687, 622, + 619, 622, 687, 682, + 685, 682, 687, 688, + 689, 688, 687, 686, + 627, 690, 691, 626, + 623, 626, 691, 686, + 689, 686, 691, 692, + 693, 692, 691, 690, + 633, 694, 695, 632, + 631, 632, 695, 696, + 697, 696, 695, 698, + 699, 698, 695, 694, + 637, 700, 701, 636, + 633, 636, 701, 694, + 699, 694, 701, 702, + 703, 702, 701, 700, + 641, 704, 705, 640, + 637, 640, 705, 700, + 703, 700, 705, 706, + 707, 706, 705, 704, + 645, 708, 709, 644, + 641, 644, 709, 704, + 707, 704, 709, 710, + 711, 710, 709, 708, + 649, 712, 713, 648, + 645, 648, 713, 708, + 711, 708, 713, 714, + 715, 714, 713, 712, + 653, 716, 717, 652, + 649, 652, 717, 712, + 715, 712, 717, 718, + 719, 718, 717, 716, + 657, 720, 721, 656, + 653, 656, 721, 716, + 719, 716, 721, 722, + 723, 722, 721, 720, + 661, 724, 725, 660, + 657, 660, 725, 720, + 723, 720, 725, 726, + 727, 726, 725, 724, + 665, 728, 729, 664, + 661, 664, 729, 724, + 727, 724, 729, 730, + 731, 730, 729, 728, + 669, 732, 733, 668, + 665, 668, 733, 728, + 731, 728, 733, 734, + 735, 734, 733, 732, + 673, 736, 737, 672, + 669, 672, 737, 732, + 735, 732, 737, 738, + 739, 738, 737, 736, + 677, 740, 741, 676, + 673, 676, 741, 736, + 739, 736, 741, 742, + 743, 742, 741, 740, + 681, 744, 745, 680, + 677, 680, 745, 740, + 743, 740, 745, 746, + 747, 746, 745, 744, + 685, 748, 749, 684, + 681, 684, 749, 744, + 747, 744, 749, 750, + 751, 750, 749, 748, + 689, 752, 753, 688, + 685, 688, 753, 748, + 751, 748, 753, 754, + 755, 754, 753, 752, + 693, 756, 757, 692, + 689, 692, 757, 752, + 755, 752, 757, 758, + 759, 758, 757, 756, + 699, 760, 761, 698, + 697, 698, 761, 762, + 763, 762, 761, 764, + 765, 764, 761, 760, + 703, 766, 767, 702, + 699, 702, 767, 760, + 765, 760, 767, 768, + 769, 768, 767, 766, + 707, 770, 771, 706, + 703, 706, 771, 766, + 769, 766, 771, 772, + 773, 772, 771, 770, + 711, 774, 775, 710, + 707, 710, 775, 770, + 773, 770, 775, 776, + 777, 776, 775, 774, + 715, 778, 779, 714, + 711, 714, 779, 774, + 777, 774, 779, 780, + 781, 780, 779, 778, + 719, 782, 783, 718, + 715, 718, 783, 778, + 781, 778, 783, 784, + 785, 784, 783, 782, + 723, 786, 787, 722, + 719, 722, 787, 782, + 785, 782, 787, 788, + 789, 788, 787, 786, + 727, 790, 791, 726, + 723, 726, 791, 786, + 789, 786, 791, 792, + 793, 792, 791, 790, + 731, 794, 795, 730, + 727, 730, 795, 790, + 793, 790, 795, 796, + 797, 796, 795, 794, + 735, 798, 799, 734, + 731, 734, 799, 794, + 797, 794, 799, 800, + 801, 800, 799, 798, + 739, 802, 803, 738, + 735, 738, 803, 798, + 801, 798, 803, 804, + 805, 804, 803, 802, + 743, 806, 807, 742, + 739, 742, 807, 802, + 805, 802, 807, 808, + 809, 808, 807, 806, + 747, 810, 811, 746, + 743, 746, 811, 806, + 809, 806, 811, 812, + 813, 812, 811, 810, + 751, 814, 815, 750, + 747, 750, 815, 810, + 813, 810, 815, 816, + 817, 816, 815, 814, + 755, 818, 819, 754, + 751, 754, 819, 814, + 817, 814, 819, 820, + 821, 820, 819, 818, + 759, 822, 823, 758, + 755, 758, 823, 818, + 821, 818, 823, 824, + 825, 824, 823, 822, + 765, 826, 827, 764, + 763, 764, 827, 828, + 829, 828, 827, 830, + 831, 830, 827, 826, + 769, 832, 833, 768, + 765, 768, 833, 826, + 831, 826, 833, 834, + 835, 834, 833, 832, + 773, 836, 837, 772, + 769, 772, 837, 832, + 835, 832, 837, 838, + 839, 838, 837, 836, + 777, 840, 841, 776, + 773, 776, 841, 836, + 839, 836, 841, 842, + 843, 842, 841, 840, + 781, 844, 845, 780, + 777, 780, 845, 840, + 843, 840, 845, 846, + 847, 846, 845, 844, + 785, 848, 849, 784, + 781, 784, 849, 844, + 847, 844, 849, 850, + 851, 850, 849, 848, + 789, 852, 853, 788, + 785, 788, 853, 848, + 851, 848, 853, 854, + 855, 854, 853, 852, + 793, 856, 857, 792, + 789, 792, 857, 852, + 855, 852, 857, 858, + 859, 858, 857, 856, + 797, 860, 861, 796, + 793, 796, 861, 856, + 859, 856, 861, 862, + 863, 862, 861, 860, + 801, 864, 865, 800, + 797, 800, 865, 860, + 863, 860, 865, 866, + 867, 866, 865, 864, + 805, 868, 869, 804, + 801, 804, 869, 864, + 867, 864, 869, 870, + 871, 870, 869, 868, + 809, 872, 873, 808, + 805, 808, 873, 868, + 871, 868, 873, 874, + 875, 874, 873, 872, + 813, 876, 877, 812, + 809, 812, 877, 872, + 875, 872, 877, 878, + 879, 878, 877, 876, + 817, 880, 881, 816, + 813, 816, 881, 876, + 879, 876, 881, 882, + 883, 882, 881, 880, + 821, 884, 885, 820, + 817, 820, 885, 880, + 883, 880, 885, 886, + 887, 886, 885, 884, + 825, 888, 889, 824, + 821, 824, 889, 884, + 887, 884, 889, 890, + 891, 890, 889, 888, + 831, 892, 893, 830, + 829, 830, 893, 894, + 895, 894, 893, 896, + 897, 896, 893, 892, + 835, 898, 899, 834, + 831, 834, 899, 892, + 897, 892, 899, 900, + 901, 900, 899, 898, + 839, 902, 903, 838, + 835, 838, 903, 898, + 901, 898, 903, 904, + 905, 904, 903, 902, + 843, 906, 907, 842, + 839, 842, 907, 902, + 905, 902, 907, 908, + 909, 908, 907, 906, + 847, 910, 911, 846, + 843, 846, 911, 906, + 909, 906, 911, 912, + 913, 912, 911, 910, + 851, 914, 915, 850, + 847, 850, 915, 910, + 913, 910, 915, 916, + 917, 916, 915, 914, + 855, 918, 919, 854, + 851, 854, 919, 914, + 917, 914, 919, 920, + 921, 920, 919, 918, + 859, 922, 923, 858, + 855, 858, 923, 918, + 921, 918, 923, 924, + 925, 924, 923, 922, + 863, 926, 927, 862, + 859, 862, 927, 922, + 925, 922, 927, 928, + 929, 928, 927, 926, + 867, 930, 931, 866, + 863, 866, 931, 926, + 929, 926, 931, 932, + 933, 932, 931, 930, + 871, 934, 935, 870, + 867, 870, 935, 930, + 933, 930, 935, 936, + 937, 936, 935, 934, + 875, 938, 939, 874, + 871, 874, 939, 934, + 937, 934, 939, 940, + 941, 940, 939, 938, + 879, 942, 943, 878, + 875, 878, 943, 938, + 941, 938, 943, 944, + 945, 944, 943, 942, + 883, 946, 947, 882, + 879, 882, 947, 942, + 945, 942, 947, 948, + 949, 948, 947, 946, + 887, 950, 951, 886, + 883, 886, 951, 946, + 949, 946, 951, 952, + 953, 952, 951, 950, + 891, 954, 955, 890, + 887, 890, 955, 950, + 953, 950, 955, 956, + 957, 956, 955, 954, + 897, 958, 959, 896, + 895, 896, 959, 960, + 961, 960, 959, 962, + 963, 962, 959, 958, + 901, 964, 965, 900, + 897, 900, 965, 958, + 963, 958, 965, 966, + 967, 966, 965, 964, + 905, 968, 969, 904, + 901, 904, 969, 964, + 967, 964, 969, 970, + 971, 970, 969, 968, + 909, 972, 973, 908, + 905, 908, 973, 968, + 971, 968, 973, 974, + 975, 974, 973, 972, + 913, 976, 977, 912, + 909, 912, 977, 972, + 975, 972, 977, 978, + 979, 978, 977, 976, + 917, 980, 981, 916, + 913, 916, 981, 976, + 979, 976, 981, 982, + 983, 982, 981, 980, + 921, 984, 985, 920, + 917, 920, 985, 980, + 983, 980, 985, 986, + 987, 986, 985, 984, + 925, 988, 989, 924, + 921, 924, 989, 984, + 987, 984, 989, 990, + 991, 990, 989, 988, + 929, 992, 993, 928, + 925, 928, 993, 988, + 991, 988, 993, 994, + 995, 994, 993, 992, + 933, 996, 997, 932, + 929, 932, 997, 992, + 995, 992, 997, 998, + 999, 998, 997, 996, + 937, 1000, 1001, 936, + 933, 936, 1001, 996, + 999, 996, 1001, 1002, + 1003, 1002, 1001, 1000, + 941, 1004, 1005, 940, + 937, 940, 1005, 1000, + 1003, 1000, 1005, 1006, + 1007, 1006, 1005, 1004, + 945, 1008, 1009, 944, + 941, 944, 1009, 1004, + 1007, 1004, 1009, 1010, + 1011, 1010, 1009, 1008, + 949, 1012, 1013, 948, + 945, 948, 1013, 1008, + 1011, 1008, 1013, 1014, + 1015, 1014, 1013, 1012, + 953, 1016, 1017, 952, + 949, 952, 1017, 1012, + 1015, 1012, 1017, 1018, + 1019, 1018, 1017, 1016, + 957, 1020, 1021, 956, + 953, 956, 1021, 1016, + 1019, 1016, 1021, 1022, + 1023, 1022, 1021, 1020, + 963, 1024, 1025, 962, + 961, 962, 1025, 1026, + 1027, 1026, 1025, 1028, + 1029, 1028, 1025, 1024, + 967, 1030, 1031, 966, + 963, 966, 1031, 1024, + 1029, 1024, 1031, 1032, + 1033, 1032, 1031, 1030, + 971, 1034, 1035, 970, + 967, 970, 1035, 1030, + 1033, 1030, 1035, 1036, + 1037, 1036, 1035, 1034, + 975, 1038, 1039, 974, + 971, 974, 1039, 1034, + 1037, 1034, 1039, 1040, + 1041, 1040, 1039, 1038, + 979, 1042, 1043, 978, + 975, 978, 1043, 1038, + 1041, 1038, 1043, 1044, + 1045, 1044, 1043, 1042, + 983, 1046, 1047, 982, + 979, 982, 1047, 1042, + 1045, 1042, 1047, 1048, + 1049, 1048, 1047, 1046, + 987, 1050, 1051, 986, + 983, 986, 1051, 1046, + 1049, 1046, 1051, 1052, + 1053, 1052, 1051, 1050, + 991, 1054, 1055, 990, + 987, 990, 1055, 1050, + 1053, 1050, 1055, 1056, + 1057, 1056, 1055, 1054, + 995, 1058, 1059, 994, + 991, 994, 1059, 1054, + 1057, 1054, 1059, 1060, + 1061, 1060, 1059, 1058, + 999, 1062, 1063, 998, + 995, 998, 1063, 1058, + 1061, 1058, 1063, 1064, + 1065, 1064, 1063, 1062, + 1003, 1066, 1067, 1002, + 999, 1002, 1067, 1062, + 1065, 1062, 1067, 1068, + 1069, 1068, 1067, 1066, + 1007, 1070, 1071, 1006, + 1003, 1006, 1071, 1066, + 1069, 1066, 1071, 1072, + 1073, 1072, 1071, 1070, + 1011, 1074, 1075, 1010, + 1007, 1010, 1075, 1070, + 1073, 1070, 1075, 1076, + 1077, 1076, 1075, 1074, + 1015, 1078, 1079, 1014, + 1011, 1014, 1079, 1074, + 1077, 1074, 1079, 1080, + 1081, 1080, 1079, 1078, + 1019, 1082, 1083, 1018, + 1015, 1018, 1083, 1078, + 1081, 1078, 1083, 1084, + 1085, 1084, 1083, 1082, + 1023, 1086, 1087, 1022, + 1019, 1022, 1087, 1082, + 1085, 1082, 1087, 1088, + 1089, 1088, 1087, 1086, + 1029, 1090, 1091, 1028, + 1027, 1028, 1091, 1092, + 1093, 1092, 1091, 1094, + 1095, 1094, 1091, 1090, + 1033, 1096, 1097, 1032, + 1029, 1032, 1097, 1090, + 1095, 1090, 1097, 1098, + 1099, 1098, 1097, 1096, + 1037, 1100, 1101, 1036, + 1033, 1036, 1101, 1096, + 1099, 1096, 1101, 1102, + 1103, 1102, 1101, 1100, + 1041, 1104, 1105, 1040, + 1037, 1040, 1105, 1100, + 1103, 1100, 1105, 1106, + 1107, 1106, 1105, 1104, + 1045, 1108, 1109, 1044, + 1041, 1044, 1109, 1104, + 1107, 1104, 1109, 1110, + 1111, 1110, 1109, 1108, + 1049, 1112, 1113, 1048, + 1045, 1048, 1113, 1108, + 1111, 1108, 1113, 1114, + 1115, 1114, 1113, 1112, + 1053, 1116, 1117, 1052, + 1049, 1052, 1117, 1112, + 1115, 1112, 1117, 1118, + 1119, 1118, 1117, 1116, + 1057, 1120, 1121, 1056, + 1053, 1056, 1121, 1116, + 1119, 1116, 1121, 1122, + 1123, 1122, 1121, 1120, + 1061, 1124, 1125, 1060, + 1057, 1060, 1125, 1120, + 1123, 1120, 1125, 1126, + 1127, 1126, 1125, 1124, + 1065, 1128, 1129, 1064, + 1061, 1064, 1129, 1124, + 1127, 1124, 1129, 1130, + 1131, 1130, 1129, 1128, + 1069, 1132, 1133, 1068, + 1065, 1068, 1133, 1128, + 1131, 1128, 1133, 1134, + 1135, 1134, 1133, 1132, + 1073, 1136, 1137, 1072, + 1069, 1072, 1137, 1132, + 1135, 1132, 1137, 1138, + 1139, 1138, 1137, 1136, + 1077, 1140, 1141, 1076, + 1073, 1076, 1141, 1136, + 1139, 1136, 1141, 1142, + 1143, 1142, 1141, 1140, + 1081, 1144, 1145, 1080, + 1077, 1080, 1145, 1140, + 1143, 1140, 1145, 1146, + 1147, 1146, 1145, 1144, + 1085, 1148, 1149, 1084, + 1081, 1084, 1149, 1144, + 1147, 1144, 1149, 1150, + 1151, 1150, 1149, 1148, + 1089, 1152, 1153, 1088, + 1085, 1088, 1153, 1148, + 1151, 1148, 1153, 1154, + 1155, 1154, 1153, 1152, + 1095, 1156, 1157, 1094, + 1093, 1094, 1157, 1158, + 1159, 1158, 1157, 1160, + 1161, 1160, 1157, 1156, + 1099, 1162, 1163, 1098, + 1095, 1098, 1163, 1156, + 1161, 1156, 1163, 1164, + 1165, 1164, 1163, 1162, + 1103, 1166, 1167, 1102, + 1099, 1102, 1167, 1162, + 1165, 1162, 1167, 1168, + 1169, 1168, 1167, 1166, + 1107, 1170, 1171, 1106, + 1103, 1106, 1171, 1166, + 1169, 1166, 1171, 1172, + 1173, 1172, 1171, 1170, + 1111, 1174, 1175, 1110, + 1107, 1110, 1175, 1170, + 1173, 1170, 1175, 1176, + 1177, 1176, 1175, 1174, + 1115, 1178, 1179, 1114, + 1111, 1114, 1179, 1174, + 1177, 1174, 1179, 1180, + 1181, 1180, 1179, 1178, + 1119, 1182, 1183, 1118, + 1115, 1118, 1183, 1178, + 1181, 1178, 1183, 1184, + 1185, 1184, 1183, 1182, + 1123, 1186, 1187, 1122, + 1119, 1122, 1187, 1182, + 1185, 1182, 1187, 1188, + 1189, 1188, 1187, 1186, + 1127, 1190, 1191, 1126, + 1123, 1126, 1191, 1186, + 1189, 1186, 1191, 1192, + 1193, 1192, 1191, 1190, + 1131, 1194, 1195, 1130, + 1127, 1130, 1195, 1190, + 1193, 1190, 1195, 1196, + 1197, 1196, 1195, 1194, + 1135, 1198, 1199, 1134, + 1131, 1134, 1199, 1194, + 1197, 1194, 1199, 1200, + 1201, 1200, 1199, 1198, + 1139, 1202, 1203, 1138, + 1135, 1138, 1203, 1198, + 1201, 1198, 1203, 1204, + 1205, 1204, 1203, 1202, + 1143, 1206, 1207, 1142, + 1139, 1142, 1207, 1202, + 1205, 1202, 1207, 1208, + 1209, 1208, 1207, 1206, + 1147, 1210, 1211, 1146, + 1143, 1146, 1211, 1206, + 1209, 1206, 1211, 1212, + 1213, 1212, 1211, 1210, + 1151, 1214, 1215, 1150, + 1147, 1150, 1215, 1210, + 1213, 1210, 1215, 1216, + 1217, 1216, 1215, 1214, + 1155, 1218, 1219, 1154, + 1151, 1154, 1219, 1214, + 1217, 1214, 1219, 1220, + 1221, 1220, 1219, 1218, + 1089, 1222, 1223, 1152, + 1155, 1152, 1223, 1218, + 1221, 1218, 1223, 1224, + 1225, 1224, 1223, 1222, + 1023, 1226, 1227, 1086, + 1089, 1086, 1227, 1222, + 1225, 1222, 1227, 1228, + 1229, 1228, 1227, 1226, + 957, 1230, 1231, 1020, + 1023, 1020, 1231, 1226, + 1229, 1226, 1231, 1232, + 1233, 1232, 1231, 1230, + 891, 1234, 1235, 954, + 957, 954, 1235, 1230, + 1233, 1230, 1235, 1236, + 1237, 1236, 1235, 1234, + 825, 1238, 1239, 888, + 891, 888, 1239, 1234, + 1237, 1234, 1239, 1240, + 1241, 1240, 1239, 1238, + 759, 1242, 1243, 822, + 825, 822, 1243, 1238, + 1241, 1238, 1243, 1244, + 1245, 1244, 1243, 1242, + 693, 1246, 1247, 756, + 759, 756, 1247, 1242, + 1245, 1242, 1247, 1248, + 1249, 1248, 1247, 1246, + 627, 1250, 1251, 690, + 693, 690, 1251, 1246, + 1249, 1246, 1251, 1252, + 1253, 1252, 1251, 1250, + 561, 1254, 1255, 624, + 627, 624, 1255, 1250, + 1253, 1250, 1255, 1256, + 1257, 1256, 1255, 1254, + 495, 1258, 1259, 558, + 561, 558, 1259, 1254, + 1257, 1254, 1259, 1260, + 1261, 1260, 1259, 1258, + 429, 1262, 1263, 492, + 495, 492, 1263, 1258, + 1261, 1258, 1263, 1264, + 1265, 1264, 1263, 1262, + 363, 1266, 1267, 426, + 429, 426, 1267, 1262, + 1265, 1262, 1267, 1268, + 1269, 1268, 1267, 1266, + 297, 1270, 1271, 360, + 363, 360, 1271, 1266, + 1269, 1266, 1271, 1272, + 1273, 1272, 1271, 1270, + 231, 1274, 1275, 294, + 297, 294, 1275, 1270, + 1273, 1270, 1275, 1276, + 1277, 1276, 1275, 1274, + 165, 1278, 1279, 228, + 231, 228, 1279, 1274, + 1277, 1274, 1279, 1280, + 1281, 1280, 1279, 1278, + 99, 1282, 1283, 162, + 165, 162, 1283, 1278, + 1281, 1278, 1283, 1284, + 1285, 1284, 1283, 1282, + 94, 1286, 1287, 95, + 99, 95, 1287, 1282, + 1285, 1282, 1287, 1288, + 1289, 1288, 1287, 1286, + 1161, 1290, 1291, 1160, + 1159, 1160, 1291, 1292, + 1293, 1292, 1291, 1294, + 1295, 1294, 1291, 1290, + 1165, 1296, 1297, 1164, + 1161, 1164, 1297, 1290, + 1295, 1290, 1297, 1298, + 1299, 1298, 1297, 1296, + 1169, 1300, 1301, 1168, + 1165, 1168, 1301, 1296, + 1299, 1296, 1301, 1302, + 1303, 1302, 1301, 1300, + 1173, 1304, 1305, 1172, + 1169, 1172, 1305, 1300, + 1303, 1300, 1305, 1306, + 1307, 1306, 1305, 1304, + 1177, 1308, 1309, 1176, + 1173, 1176, 1309, 1304, + 1307, 1304, 1309, 1310, + 1311, 1310, 1309, 1308, + 1181, 1312, 1313, 1180, + 1177, 1180, 1313, 1308, + 1311, 1308, 1313, 1314, + 1315, 1314, 1313, 1312, + 1185, 1316, 1317, 1184, + 1181, 1184, 1317, 1312, + 1315, 1312, 1317, 1318, + 1319, 1318, 1317, 1316, + 1189, 1320, 1321, 1188, + 1185, 1188, 1321, 1316, + 1319, 1316, 1321, 1322, + 1323, 1322, 1321, 1320, + 1193, 1324, 1325, 1192, + 1189, 1192, 1325, 1320, + 1323, 1320, 1325, 1326, + 1327, 1326, 1325, 1324, + 1197, 1328, 1329, 1196, + 1193, 1196, 1329, 1324, + 1327, 1324, 1329, 1330, + 1331, 1330, 1329, 1328, + 1201, 1332, 1333, 1200, + 1197, 1200, 1333, 1328, + 1331, 1328, 1333, 1334, + 1335, 1334, 1333, 1332, + 1205, 1336, 1337, 1204, + 1201, 1204, 1337, 1332, + 1335, 1332, 1337, 1338, + 1339, 1338, 1337, 1336, + 1209, 1340, 1341, 1208, + 1205, 1208, 1341, 1336, + 1339, 1336, 1341, 1342, + 1343, 1342, 1341, 1340, + 1213, 1344, 1345, 1212, + 1209, 1212, 1345, 1340, + 1343, 1340, 1345, 1346, + 1347, 1346, 1345, 1344, + 1217, 1348, 1349, 1216, + 1213, 1216, 1349, 1344, + 1347, 1344, 1349, 1350, + 1351, 1350, 1349, 1348, + 1221, 1352, 1353, 1220, + 1217, 1220, 1353, 1348, + 1351, 1348, 1353, 1354, + 1355, 1354, 1353, 1352, + 1225, 1356, 1357, 1224, + 1221, 1224, 1357, 1352, + 1355, 1352, 1357, 1358, + 1359, 1358, 1357, 1356, + 1229, 1360, 1361, 1228, + 1225, 1228, 1361, 1356, + 1359, 1356, 1361, 1362, + 1363, 1362, 1361, 1360, + 1233, 1364, 1365, 1232, + 1229, 1232, 1365, 1360, + 1363, 1360, 1365, 1366, + 1367, 1366, 1365, 1364, + 1237, 1368, 1369, 1236, + 1233, 1236, 1369, 1364, + 1367, 1364, 1369, 1370, + 1371, 1370, 1369, 1368, + 1241, 1372, 1373, 1240, + 1237, 1240, 1373, 1368, + 1371, 1368, 1373, 1374, + 1375, 1374, 1373, 1372, + 1245, 1376, 1377, 1244, + 1241, 1244, 1377, 1372, + 1375, 1372, 1377, 1378, + 1379, 1378, 1377, 1376, + 1249, 1380, 1381, 1248, + 1245, 1248, 1381, 1376, + 1379, 1376, 1381, 1382, + 1383, 1382, 1381, 1380, + 1253, 1384, 1385, 1252, + 1249, 1252, 1385, 1380, + 1383, 1380, 1385, 1386, + 1387, 1386, 1385, 1384, + 1257, 1388, 1389, 1256, + 1253, 1256, 1389, 1384, + 1387, 1384, 1389, 1390, + 1391, 1390, 1389, 1388, + 1261, 1392, 1393, 1260, + 1257, 1260, 1393, 1388, + 1391, 1388, 1393, 1394, + 1395, 1394, 1393, 1392, + 1265, 1396, 1397, 1264, + 1261, 1264, 1397, 1392, + 1395, 1392, 1397, 1398, + 1399, 1398, 1397, 1396, + 1269, 1400, 1401, 1268, + 1265, 1268, 1401, 1396, + 1399, 1396, 1401, 1402, + 1403, 1402, 1401, 1400, + 1273, 1404, 1405, 1272, + 1269, 1272, 1405, 1400, + 1403, 1400, 1405, 1406, + 1407, 1406, 1405, 1404, + 1277, 1408, 1409, 1276, + 1273, 1276, 1409, 1404, + 1407, 1404, 1409, 1410, + 1411, 1410, 1409, 1408, + 1281, 1412, 1413, 1280, + 1277, 1280, 1413, 1408, + 1411, 1408, 1413, 1414, + 1415, 1414, 1413, 1412, + 1285, 1416, 1417, 1284, + 1281, 1284, 1417, 1412, + 1415, 1412, 1417, 1418, + 1419, 1418, 1417, 1416, + 1289, 1420, 1421, 1288, + 1285, 1288, 1421, 1416, + 1419, 1416, 1421, 1422, + 1423, 1422, 1421, 1420, + 1295, 1424, 1425, 1294, + 1293, 1294, 1425, 1426, + 1427, 1426, 1425, 1428, + 1429, 1428, 1425, 1424, + 1299, 1430, 1431, 1298, + 1295, 1298, 1431, 1424, + 1429, 1424, 1431, 1432, + 1433, 1432, 1431, 1430, + 1303, 1434, 1435, 1302, + 1299, 1302, 1435, 1430, + 1433, 1430, 1435, 1436, + 1437, 1436, 1435, 1434, + 1307, 1438, 1439, 1306, + 1303, 1306, 1439, 1434, + 1437, 1434, 1439, 1440, + 1441, 1440, 1439, 1438, + 1311, 1442, 1443, 1310, + 1307, 1310, 1443, 1438, + 1441, 1438, 1443, 1444, + 1445, 1444, 1443, 1442, + 1315, 1446, 1447, 1314, + 1311, 1314, 1447, 1442, + 1445, 1442, 1447, 1448, + 1449, 1448, 1447, 1446, + 1319, 1450, 1451, 1318, + 1315, 1318, 1451, 1446, + 1449, 1446, 1451, 1452, + 1453, 1452, 1451, 1450, + 1323, 1454, 1455, 1322, + 1319, 1322, 1455, 1450, + 1453, 1450, 1455, 1456, + 1457, 1456, 1455, 1454, + 1327, 1458, 1459, 1326, + 1323, 1326, 1459, 1454, + 1457, 1454, 1459, 1460, + 1461, 1460, 1459, 1458, + 1331, 1462, 1463, 1330, + 1327, 1330, 1463, 1458, + 1461, 1458, 1463, 1464, + 1465, 1464, 1463, 1462, + 1335, 1466, 1467, 1334, + 1331, 1334, 1467, 1462, + 1465, 1462, 1467, 1468, + 1469, 1468, 1467, 1466, + 1339, 1470, 1471, 1338, + 1335, 1338, 1471, 1466, + 1469, 1466, 1471, 1472, + 1473, 1472, 1471, 1470, + 1343, 1474, 1475, 1342, + 1339, 1342, 1475, 1470, + 1473, 1470, 1475, 1476, + 1477, 1476, 1475, 1474, + 1347, 1478, 1479, 1346, + 1343, 1346, 1479, 1474, + 1477, 1474, 1479, 1480, + 1481, 1480, 1479, 1478, + 1351, 1482, 1483, 1350, + 1347, 1350, 1483, 1478, + 1481, 1478, 1483, 1484, + 1485, 1484, 1483, 1482, + 1355, 1486, 1487, 1354, + 1351, 1354, 1487, 1482, + 1485, 1482, 1487, 1488, + 1489, 1488, 1487, 1486, + 1359, 1490, 1491, 1358, + 1355, 1358, 1491, 1486, + 1489, 1486, 1491, 1492, + 1493, 1492, 1491, 1490, + 1363, 1494, 1495, 1362, + 1359, 1362, 1495, 1490, + 1493, 1490, 1495, 1496, + 1497, 1496, 1495, 1494, + 1367, 1498, 1499, 1366, + 1363, 1366, 1499, 1494, + 1497, 1494, 1499, 1500, + 1501, 1500, 1499, 1498, + 1371, 1502, 1503, 1370, + 1367, 1370, 1503, 1498, + 1501, 1498, 1503, 1504, + 1505, 1504, 1503, 1502, + 1375, 1506, 1507, 1374, + 1371, 1374, 1507, 1502, + 1505, 1502, 1507, 1508, + 1509, 1508, 1507, 1506, + 1379, 1510, 1511, 1378, + 1375, 1378, 1511, 1506, + 1509, 1506, 1511, 1512, + 1513, 1512, 1511, 1510, + 1383, 1514, 1515, 1382, + 1379, 1382, 1515, 1510, + 1513, 1510, 1515, 1516, + 1517, 1516, 1515, 1514, + 1387, 1518, 1519, 1386, + 1383, 1386, 1519, 1514, + 1517, 1514, 1519, 1520, + 1521, 1520, 1519, 1518, + 1391, 1522, 1523, 1390, + 1387, 1390, 1523, 1518, + 1521, 1518, 1523, 1524, + 1525, 1524, 1523, 1522, + 1395, 1526, 1527, 1394, + 1391, 1394, 1527, 1522, + 1525, 1522, 1527, 1528, + 1529, 1528, 1527, 1526, + 1399, 1530, 1531, 1398, + 1395, 1398, 1531, 1526, + 1529, 1526, 1531, 1532, + 1533, 1532, 1531, 1530, + 1403, 1534, 1535, 1402, + 1399, 1402, 1535, 1530, + 1533, 1530, 1535, 1536, + 1537, 1536, 1535, 1534, + 1407, 1538, 1539, 1406, + 1403, 1406, 1539, 1534, + 1537, 1534, 1539, 1540, + 1541, 1540, 1539, 1538, + 1411, 1542, 1543, 1410, + 1407, 1410, 1543, 1538, + 1541, 1538, 1543, 1544, + 1545, 1544, 1543, 1542, + 1415, 1546, 1547, 1414, + 1411, 1414, 1547, 1542, + 1545, 1542, 1547, 1548, + 1549, 1548, 1547, 1546, + 1419, 1550, 1551, 1418, + 1415, 1418, 1551, 1546, + 1549, 1546, 1551, 1552, + 1553, 1552, 1551, 1550, + 1423, 1554, 1555, 1422, + 1419, 1422, 1555, 1550, + 1553, 1550, 1555, 1556, + 1557, 1556, 1555, 1554, + 1429, 1558, 1559, 1428, + 1427, 1428, 1559, 1560, + 1561, 1560, 1559, 1562, + 1563, 1562, 1559, 1558, + 1433, 1564, 1565, 1432, + 1429, 1432, 1565, 1558, + 1563, 1558, 1565, 1566, + 1567, 1566, 1565, 1564, + 1437, 1568, 1569, 1436, + 1433, 1436, 1569, 1564, + 1567, 1564, 1569, 1570, + 1571, 1570, 1569, 1568, + 1441, 1572, 1573, 1440, + 1437, 1440, 1573, 1568, + 1571, 1568, 1573, 1574, + 1575, 1574, 1573, 1572, + 1445, 1576, 1577, 1444, + 1441, 1444, 1577, 1572, + 1575, 1572, 1577, 1578, + 1579, 1578, 1577, 1576, + 1449, 1580, 1581, 1448, + 1445, 1448, 1581, 1576, + 1579, 1576, 1581, 1582, + 1583, 1582, 1581, 1580, + 1453, 1584, 1585, 1452, + 1449, 1452, 1585, 1580, + 1583, 1580, 1585, 1586, + 1587, 1586, 1585, 1584, + 1457, 1588, 1589, 1456, + 1453, 1456, 1589, 1584, + 1587, 1584, 1589, 1590, + 1591, 1590, 1589, 1588, + 1461, 1592, 1593, 1460, + 1457, 1460, 1593, 1588, + 1591, 1588, 1593, 1594, + 1595, 1594, 1593, 1592, + 1465, 1596, 1597, 1464, + 1461, 1464, 1597, 1592, + 1595, 1592, 1597, 1598, + 1599, 1598, 1597, 1596, + 1469, 1600, 1601, 1468, + 1465, 1468, 1601, 1596, + 1599, 1596, 1601, 1602, + 1603, 1602, 1601, 1600, + 1473, 1604, 1605, 1472, + 1469, 1472, 1605, 1600, + 1603, 1600, 1605, 1606, + 1607, 1606, 1605, 1604, + 1477, 1608, 1609, 1476, + 1473, 1476, 1609, 1604, + 1607, 1604, 1609, 1610, + 1611, 1610, 1609, 1608, + 1481, 1612, 1613, 1480, + 1477, 1480, 1613, 1608, + 1611, 1608, 1613, 1614, + 1615, 1614, 1613, 1612, + 1485, 1616, 1617, 1484, + 1481, 1484, 1617, 1612, + 1615, 1612, 1617, 1618, + 1619, 1618, 1617, 1616, + 1489, 1620, 1621, 1488, + 1485, 1488, 1621, 1616, + 1619, 1616, 1621, 1622, + 1623, 1622, 1621, 1620, + 1493, 1624, 1625, 1492, + 1489, 1492, 1625, 1620, + 1623, 1620, 1625, 1626, + 1627, 1626, 1625, 1624, + 1497, 1628, 1629, 1496, + 1493, 1496, 1629, 1624, + 1627, 1624, 1629, 1630, + 1631, 1630, 1629, 1628, + 1501, 1632, 1633, 1500, + 1497, 1500, 1633, 1628, + 1631, 1628, 1633, 1634, + 1635, 1634, 1633, 1632, + 1505, 1636, 1637, 1504, + 1501, 1504, 1637, 1632, + 1635, 1632, 1637, 1638, + 1639, 1638, 1637, 1636, + 1509, 1640, 1641, 1508, + 1505, 1508, 1641, 1636, + 1639, 1636, 1641, 1642, + 1643, 1642, 1641, 1640, + 1513, 1644, 1645, 1512, + 1509, 1512, 1645, 1640, + 1643, 1640, 1645, 1646, + 1647, 1646, 1645, 1644, + 1517, 1648, 1649, 1516, + 1513, 1516, 1649, 1644, + 1647, 1644, 1649, 1650, + 1651, 1650, 1649, 1648, + 1521, 1652, 1653, 1520, + 1517, 1520, 1653, 1648, + 1651, 1648, 1653, 1654, + 1655, 1654, 1653, 1652, + 1525, 1656, 1657, 1524, + 1521, 1524, 1657, 1652, + 1655, 1652, 1657, 1658, + 1659, 1658, 1657, 1656, + 1529, 1660, 1661, 1528, + 1525, 1528, 1661, 1656, + 1659, 1656, 1661, 1662, + 1663, 1662, 1661, 1660, + 1533, 1664, 1665, 1532, + 1529, 1532, 1665, 1660, + 1663, 1660, 1665, 1666, + 1667, 1666, 1665, 1664, + 1537, 1668, 1669, 1536, + 1533, 1536, 1669, 1664, + 1667, 1664, 1669, 1670, + 1671, 1670, 1669, 1668, + 1541, 1672, 1673, 1540, + 1537, 1540, 1673, 1668, + 1671, 1668, 1673, 1674, + 1675, 1674, 1673, 1672, + 1545, 1676, 1677, 1544, + 1541, 1544, 1677, 1672, + 1675, 1672, 1677, 1678, + 1679, 1678, 1677, 1676, + 1549, 1680, 1681, 1548, + 1545, 1548, 1681, 1676, + 1679, 1676, 1681, 1682, + 1683, 1682, 1681, 1680, + 1553, 1684, 1685, 1552, + 1549, 1552, 1685, 1680, + 1683, 1680, 1685, 1686, + 1687, 1686, 1685, 1684, + 1557, 1688, 1689, 1556, + 1553, 1556, 1689, 1684, + 1687, 1684, 1689, 1690, + 1691, 1690, 1689, 1688, + 1563, 1692, 1693, 1562, + 1561, 1562, 1693, 1694, + 1695, 1694, 1693, 1696, + 1697, 1696, 1693, 1692, + 1567, 1698, 1699, 1566, + 1563, 1566, 1699, 1692, + 1697, 1692, 1699, 1700, + 1701, 1700, 1699, 1698, + 1571, 1702, 1703, 1570, + 1567, 1570, 1703, 1698, + 1701, 1698, 1703, 1704, + 1705, 1704, 1703, 1702, + 1575, 1706, 1707, 1574, + 1571, 1574, 1707, 1702, + 1705, 1702, 1707, 1708, + 1709, 1708, 1707, 1706, + 1579, 1710, 1711, 1578, + 1575, 1578, 1711, 1706, + 1709, 1706, 1711, 1712, + 1713, 1712, 1711, 1710, + 1583, 1714, 1715, 1582, + 1579, 1582, 1715, 1710, + 1713, 1710, 1715, 1716, + 1717, 1716, 1715, 1714, + 1587, 1718, 1719, 1586, + 1583, 1586, 1719, 1714, + 1717, 1714, 1719, 1720, + 1721, 1720, 1719, 1718, + 1591, 1722, 1723, 1590, + 1587, 1590, 1723, 1718, + 1721, 1718, 1723, 1724, + 1725, 1724, 1723, 1722, + 1595, 1726, 1727, 1594, + 1591, 1594, 1727, 1722, + 1725, 1722, 1727, 1728, + 1729, 1728, 1727, 1726, + 1599, 1730, 1731, 1598, + 1595, 1598, 1731, 1726, + 1729, 1726, 1731, 1732, + 1733, 1732, 1731, 1730, + 1603, 1734, 1735, 1602, + 1599, 1602, 1735, 1730, + 1733, 1730, 1735, 1736, + 1737, 1736, 1735, 1734, + 1607, 1738, 1739, 1606, + 1603, 1606, 1739, 1734, + 1737, 1734, 1739, 1740, + 1741, 1740, 1739, 1738, + 1611, 1742, 1743, 1610, + 1607, 1610, 1743, 1738, + 1741, 1738, 1743, 1744, + 1745, 1744, 1743, 1742, + 1615, 1746, 1747, 1614, + 1611, 1614, 1747, 1742, + 1745, 1742, 1747, 1748, + 1749, 1748, 1747, 1746, + 1619, 1750, 1751, 1618, + 1615, 1618, 1751, 1746, + 1749, 1746, 1751, 1752, + 1753, 1752, 1751, 1750, + 1623, 1754, 1755, 1622, + 1619, 1622, 1755, 1750, + 1753, 1750, 1755, 1756, + 1757, 1756, 1755, 1754, + 1627, 1758, 1759, 1626, + 1623, 1626, 1759, 1754, + 1757, 1754, 1759, 1760, + 1761, 1760, 1759, 1758, + 1631, 1762, 1763, 1630, + 1627, 1630, 1763, 1758, + 1761, 1758, 1763, 1764, + 1765, 1764, 1763, 1762, + 1635, 1766, 1767, 1634, + 1631, 1634, 1767, 1762, + 1765, 1762, 1767, 1768, + 1769, 1768, 1767, 1766, + 1639, 1770, 1771, 1638, + 1635, 1638, 1771, 1766, + 1769, 1766, 1771, 1772, + 1773, 1772, 1771, 1770, + 1643, 1774, 1775, 1642, + 1639, 1642, 1775, 1770, + 1773, 1770, 1775, 1776, + 1777, 1776, 1775, 1774, + 1647, 1778, 1779, 1646, + 1643, 1646, 1779, 1774, + 1777, 1774, 1779, 1780, + 1781, 1780, 1779, 1778, + 1651, 1782, 1783, 1650, + 1647, 1650, 1783, 1778, + 1781, 1778, 1783, 1784, + 1785, 1784, 1783, 1782, + 1655, 1786, 1787, 1654, + 1651, 1654, 1787, 1782, + 1785, 1782, 1787, 1788, + 1789, 1788, 1787, 1786, + 1659, 1790, 1791, 1658, + 1655, 1658, 1791, 1786, + 1789, 1786, 1791, 1792, + 1793, 1792, 1791, 1790, + 1663, 1794, 1795, 1662, + 1659, 1662, 1795, 1790, + 1793, 1790, 1795, 1796, + 1797, 1796, 1795, 1794, + 1667, 1798, 1799, 1666, + 1663, 1666, 1799, 1794, + 1797, 1794, 1799, 1800, + 1801, 1800, 1799, 1798, + 1671, 1802, 1803, 1670, + 1667, 1670, 1803, 1798, + 1801, 1798, 1803, 1804, + 1805, 1804, 1803, 1802, + 1675, 1806, 1807, 1674, + 1671, 1674, 1807, 1802, + 1805, 1802, 1807, 1808, + 1809, 1808, 1807, 1806, + 1679, 1810, 1811, 1678, + 1675, 1678, 1811, 1806, + 1809, 1806, 1811, 1812, + 1813, 1812, 1811, 1810, + 1683, 1814, 1815, 1682, + 1679, 1682, 1815, 1810, + 1813, 1810, 1815, 1816, + 1817, 1816, 1815, 1814, + 1687, 1818, 1819, 1686, + 1683, 1686, 1819, 1814, + 1817, 1814, 1819, 1820, + 1821, 1820, 1819, 1818, + 1691, 1822, 1823, 1690, + 1687, 1690, 1823, 1818, + 1821, 1818, 1823, 1824, + 1825, 1824, 1823, 1822, + 1697, 1826, 1827, 1696, + 1695, 1696, 1827, 1828, + 1829, 1828, 1827, 1830, + 1831, 1830, 1827, 1826, + 1701, 1832, 1833, 1700, + 1697, 1700, 1833, 1826, + 1831, 1826, 1833, 1834, + 1835, 1834, 1833, 1832, + 1705, 1836, 1837, 1704, + 1701, 1704, 1837, 1832, + 1835, 1832, 1837, 1838, + 1839, 1838, 1837, 1836, + 1709, 1840, 1841, 1708, + 1705, 1708, 1841, 1836, + 1839, 1836, 1841, 1842, + 1843, 1842, 1841, 1840, + 1713, 1844, 1845, 1712, + 1709, 1712, 1845, 1840, + 1843, 1840, 1845, 1846, + 1847, 1846, 1845, 1844, + 1717, 1848, 1849, 1716, + 1713, 1716, 1849, 1844, + 1847, 1844, 1849, 1850, + 1851, 1850, 1849, 1848, + 1721, 1852, 1853, 1720, + 1717, 1720, 1853, 1848, + 1851, 1848, 1853, 1854, + 1855, 1854, 1853, 1852, + 1725, 1856, 1857, 1724, + 1721, 1724, 1857, 1852, + 1855, 1852, 1857, 1858, + 1859, 1858, 1857, 1856, + 1729, 1860, 1861, 1728, + 1725, 1728, 1861, 1856, + 1859, 1856, 1861, 1862, + 1863, 1862, 1861, 1860, + 1733, 1864, 1865, 1732, + 1729, 1732, 1865, 1860, + 1863, 1860, 1865, 1866, + 1867, 1866, 1865, 1864, + 1737, 1868, 1869, 1736, + 1733, 1736, 1869, 1864, + 1867, 1864, 1869, 1870, + 1871, 1870, 1869, 1868, + 1741, 1872, 1873, 1740, + 1737, 1740, 1873, 1868, + 1871, 1868, 1873, 1874, + 1875, 1874, 1873, 1872, + 1745, 1876, 1877, 1744, + 1741, 1744, 1877, 1872, + 1875, 1872, 1877, 1878, + 1879, 1878, 1877, 1876, + 1749, 1880, 1881, 1748, + 1745, 1748, 1881, 1876, + 1879, 1876, 1881, 1882, + 1883, 1882, 1881, 1880, + 1753, 1884, 1885, 1752, + 1749, 1752, 1885, 1880, + 1883, 1880, 1885, 1886, + 1887, 1886, 1885, 1884, + 1757, 1888, 1889, 1756, + 1753, 1756, 1889, 1884, + 1887, 1884, 1889, 1890, + 1891, 1890, 1889, 1888, + 1761, 1892, 1893, 1760, + 1757, 1760, 1893, 1888, + 1891, 1888, 1893, 1894, + 1895, 1894, 1893, 1892, + 1765, 1896, 1897, 1764, + 1761, 1764, 1897, 1892, + 1895, 1892, 1897, 1898, + 1899, 1898, 1897, 1896, + 1769, 1900, 1901, 1768, + 1765, 1768, 1901, 1896, + 1899, 1896, 1901, 1902, + 1903, 1902, 1901, 1900, + 1773, 1904, 1905, 1772, + 1769, 1772, 1905, 1900, + 1903, 1900, 1905, 1906, + 1907, 1906, 1905, 1904, + 1777, 1908, 1909, 1776, + 1773, 1776, 1909, 1904, + 1907, 1904, 1909, 1910, + 1911, 1910, 1909, 1908, + 1781, 1912, 1913, 1780, + 1777, 1780, 1913, 1908, + 1911, 1908, 1913, 1914, + 1915, 1914, 1913, 1912, + 1785, 1916, 1917, 1784, + 1781, 1784, 1917, 1912, + 1915, 1912, 1917, 1918, + 1919, 1918, 1917, 1916, + 1789, 1920, 1921, 1788, + 1785, 1788, 1921, 1916, + 1919, 1916, 1921, 1922, + 1923, 1922, 1921, 1920, + 1793, 1924, 1925, 1792, + 1789, 1792, 1925, 1920, + 1923, 1920, 1925, 1926, + 1927, 1926, 1925, 1924, + 1797, 1928, 1929, 1796, + 1793, 1796, 1929, 1924, + 1927, 1924, 1929, 1930, + 1931, 1930, 1929, 1928, + 1801, 1932, 1933, 1800, + 1797, 1800, 1933, 1928, + 1931, 1928, 1933, 1934, + 1935, 1934, 1933, 1932, + 1805, 1936, 1937, 1804, + 1801, 1804, 1937, 1932, + 1935, 1932, 1937, 1938, + 1939, 1938, 1937, 1936, + 1809, 1940, 1941, 1808, + 1805, 1808, 1941, 1936, + 1939, 1936, 1941, 1942, + 1943, 1942, 1941, 1940, + 1813, 1944, 1945, 1812, + 1809, 1812, 1945, 1940, + 1943, 1940, 1945, 1946, + 1947, 1946, 1945, 1944, + 1817, 1948, 1949, 1816, + 1813, 1816, 1949, 1944, + 1947, 1944, 1949, 1950, + 1951, 1950, 1949, 1948, + 1821, 1952, 1953, 1820, + 1817, 1820, 1953, 1948, + 1951, 1948, 1953, 1954, + 1955, 1954, 1953, 1952, + 1825, 1956, 1957, 1824, + 1821, 1824, 1957, 1952, + 1955, 1952, 1957, 1958, + 1959, 1958, 1957, 1956, + 1831, 1960, 1961, 1830, + 1829, 1830, 1961, 1962, + 1963, 1962, 1961, 1964, + 1965, 1964, 1961, 1960, + 1835, 1966, 1967, 1834, + 1831, 1834, 1967, 1960, + 1965, 1960, 1967, 1968, + 1969, 1968, 1967, 1966, + 1839, 1970, 1971, 1838, + 1835, 1838, 1971, 1966, + 1969, 1966, 1971, 1972, + 1973, 1972, 1971, 1970, + 1843, 1974, 1975, 1842, + 1839, 1842, 1975, 1970, + 1973, 1970, 1975, 1976, + 1977, 1976, 1975, 1974, + 1847, 1978, 1979, 1846, + 1843, 1846, 1979, 1974, + 1977, 1974, 1979, 1980, + 1981, 1980, 1979, 1978, + 1851, 1982, 1983, 1850, + 1847, 1850, 1983, 1978, + 1981, 1978, 1983, 1984, + 1985, 1984, 1983, 1982, + 1855, 1986, 1987, 1854, + 1851, 1854, 1987, 1982, + 1985, 1982, 1987, 1988, + 1989, 1988, 1987, 1986, + 1859, 1990, 1991, 1858, + 1855, 1858, 1991, 1986, + 1989, 1986, 1991, 1992, + 1993, 1992, 1991, 1990, + 1863, 1994, 1995, 1862, + 1859, 1862, 1995, 1990, + 1993, 1990, 1995, 1996, + 1997, 1996, 1995, 1994, + 1867, 1998, 1999, 1866, + 1863, 1866, 1999, 1994, + 1997, 1994, 1999, 2000, + 2001, 2000, 1999, 1998, + 1871, 2002, 2003, 1870, + 1867, 1870, 2003, 1998, + 2001, 1998, 2003, 2004, + 2005, 2004, 2003, 2002, + 1875, 2006, 2007, 1874, + 1871, 1874, 2007, 2002, + 2005, 2002, 2007, 2008, + 2009, 2008, 2007, 2006, + 1879, 2010, 2011, 1878, + 1875, 1878, 2011, 2006, + 2009, 2006, 2011, 2012, + 2013, 2012, 2011, 2010, + 1883, 2014, 2015, 1882, + 1879, 1882, 2015, 2010, + 2013, 2010, 2015, 2016, + 2017, 2016, 2015, 2014, + 1887, 2018, 2019, 1886, + 1883, 1886, 2019, 2014, + 2017, 2014, 2019, 2020, + 2021, 2020, 2019, 2018, + 1891, 2022, 2023, 1890, + 1887, 1890, 2023, 2018, + 2021, 2018, 2023, 2024, + 2025, 2024, 2023, 2022, + 1895, 2026, 2027, 1894, + 1891, 1894, 2027, 2022, + 2025, 2022, 2027, 2028, + 2029, 2028, 2027, 2026, + 1899, 2030, 2031, 1898, + 1895, 1898, 2031, 2026, + 2029, 2026, 2031, 2032, + 2033, 2032, 2031, 2030, + 1903, 2034, 2035, 1902, + 1899, 1902, 2035, 2030, + 2033, 2030, 2035, 2036, + 2037, 2036, 2035, 2034, + 1907, 2038, 2039, 1906, + 1903, 1906, 2039, 2034, + 2037, 2034, 2039, 2040, + 2041, 2040, 2039, 2038, + 1911, 2042, 2043, 1910, + 1907, 1910, 2043, 2038, + 2041, 2038, 2043, 2044, + 2045, 2044, 2043, 2042, + 1915, 2046, 2047, 1914, + 1911, 1914, 2047, 2042, + 2045, 2042, 2047, 2048, + 2049, 2048, 2047, 2046, + 1919, 2050, 2051, 1918, + 1915, 1918, 2051, 2046, + 2049, 2046, 2051, 2052, + 2053, 2052, 2051, 2050, + 1923, 2054, 2055, 1922, + 1919, 1922, 2055, 2050, + 2053, 2050, 2055, 2056, + 2057, 2056, 2055, 2054, + 1927, 2058, 2059, 1926, + 1923, 1926, 2059, 2054, + 2057, 2054, 2059, 2060, + 2061, 2060, 2059, 2058, + 1931, 2062, 2063, 1930, + 1927, 1930, 2063, 2058, + 2061, 2058, 2063, 2064, + 2065, 2064, 2063, 2062, + 1935, 2066, 2067, 1934, + 1931, 1934, 2067, 2062, + 2065, 2062, 2067, 2068, + 2069, 2068, 2067, 2066, + 1939, 2070, 2071, 1938, + 1935, 1938, 2071, 2066, + 2069, 2066, 2071, 2072, + 2073, 2072, 2071, 2070, + 1943, 2074, 2075, 1942, + 1939, 1942, 2075, 2070, + 2073, 2070, 2075, 2076, + 2077, 2076, 2075, 2074, + 1947, 2078, 2079, 1946, + 1943, 1946, 2079, 2074, + 2077, 2074, 2079, 2080, + 2081, 2080, 2079, 2078, + 1951, 2082, 2083, 1950, + 1947, 1950, 2083, 2078, + 2081, 2078, 2083, 2084, + 2085, 2084, 2083, 2082, + 1955, 2086, 2087, 1954, + 1951, 1954, 2087, 2082, + 2085, 2082, 2087, 2088, + 2089, 2088, 2087, 2086, + 1959, 2090, 2091, 1958, + 1955, 1958, 2091, 2086, + 2089, 2086, 2091, 2092, + 2093, 2092, 2091, 2090, + 1965, 2094, 2095, 1964, + 1963, 1964, 2095, 2096, + 2097, 2096, 2095, 2098, + 2099, 2098, 2095, 2094, + 1969, 2100, 2101, 1968, + 1965, 1968, 2101, 2094, + 2099, 2094, 2101, 2102, + 2103, 2102, 2101, 2100, + 1973, 2104, 2105, 1972, + 1969, 1972, 2105, 2100, + 2103, 2100, 2105, 2106, + 2107, 2106, 2105, 2104, + 1977, 2108, 2109, 1976, + 1973, 1976, 2109, 2104, + 2107, 2104, 2109, 2110, + 2111, 2110, 2109, 2108, + 1981, 2112, 2113, 1980, + 1977, 1980, 2113, 2108, + 2111, 2108, 2113, 2114, + 2115, 2114, 2113, 2112, + 1985, 2116, 2117, 1984, + 1981, 1984, 2117, 2112, + 2115, 2112, 2117, 2118, + 2119, 2118, 2117, 2116, + 1989, 2120, 2121, 1988, + 1985, 1988, 2121, 2116, + 2119, 2116, 2121, 2122, + 2123, 2122, 2121, 2120, + 1993, 2124, 2125, 1992, + 1989, 1992, 2125, 2120, + 2123, 2120, 2125, 2126, + 2127, 2126, 2125, 2124, + 1997, 2128, 2129, 1996, + 1993, 1996, 2129, 2124, + 2127, 2124, 2129, 2130, + 2131, 2130, 2129, 2128, + 2001, 2132, 2133, 2000, + 1997, 2000, 2133, 2128, + 2131, 2128, 2133, 2134, + 2135, 2134, 2133, 2132, + 2005, 2136, 2137, 2004, + 2001, 2004, 2137, 2132, + 2135, 2132, 2137, 2138, + 2139, 2138, 2137, 2136, + 2009, 2140, 2141, 2008, + 2005, 2008, 2141, 2136, + 2139, 2136, 2141, 2142, + 2143, 2142, 2141, 2140, + 2013, 2144, 2145, 2012, + 2009, 2012, 2145, 2140, + 2143, 2140, 2145, 2146, + 2147, 2146, 2145, 2144, + 2017, 2148, 2149, 2016, + 2013, 2016, 2149, 2144, + 2147, 2144, 2149, 2150, + 2151, 2150, 2149, 2148, + 2021, 2152, 2153, 2020, + 2017, 2020, 2153, 2148, + 2151, 2148, 2153, 2154, + 2155, 2154, 2153, 2152, + 2025, 2156, 2157, 2024, + 2021, 2024, 2157, 2152, + 2155, 2152, 2157, 2158, + 2159, 2158, 2157, 2156, + 2029, 2160, 2161, 2028, + 2025, 2028, 2161, 2156, + 2159, 2156, 2161, 2162, + 2163, 2162, 2161, 2160, + 2033, 2164, 2165, 2032, + 2029, 2032, 2165, 2160, + 2163, 2160, 2165, 2166, + 2167, 2166, 2165, 2164, + 2037, 2168, 2169, 2036, + 2033, 2036, 2169, 2164, + 2167, 2164, 2169, 2170, + 2171, 2170, 2169, 2168, + 2041, 2172, 2173, 2040, + 2037, 2040, 2173, 2168, + 2171, 2168, 2173, 2174, + 2175, 2174, 2173, 2172, + 2045, 2176, 2177, 2044, + 2041, 2044, 2177, 2172, + 2175, 2172, 2177, 2178, + 2179, 2178, 2177, 2176, + 2049, 2180, 2181, 2048, + 2045, 2048, 2181, 2176, + 2179, 2176, 2181, 2182, + 2183, 2182, 2181, 2180, + 2053, 2184, 2185, 2052, + 2049, 2052, 2185, 2180, + 2183, 2180, 2185, 2186, + 2187, 2186, 2185, 2184, + 2057, 2188, 2189, 2056, + 2053, 2056, 2189, 2184, + 2187, 2184, 2189, 2190, + 2191, 2190, 2189, 2188, + 2061, 2192, 2193, 2060, + 2057, 2060, 2193, 2188, + 2191, 2188, 2193, 2194, + 2195, 2194, 2193, 2192, + 2065, 2196, 2197, 2064, + 2061, 2064, 2197, 2192, + 2195, 2192, 2197, 2198, + 2199, 2198, 2197, 2196, + 2069, 2200, 2201, 2068, + 2065, 2068, 2201, 2196, + 2199, 2196, 2201, 2202, + 2203, 2202, 2201, 2200, + 2073, 2204, 2205, 2072, + 2069, 2072, 2205, 2200, + 2203, 2200, 2205, 2206, + 2207, 2206, 2205, 2204, + 2077, 2208, 2209, 2076, + 2073, 2076, 2209, 2204, + 2207, 2204, 2209, 2210, + 2211, 2210, 2209, 2208, + 2081, 2212, 2213, 2080, + 2077, 2080, 2213, 2208, + 2211, 2208, 2213, 2214, + 2215, 2214, 2213, 2212, + 2085, 2216, 2217, 2084, + 2081, 2084, 2217, 2212, + 2215, 2212, 2217, 2218, + 2219, 2218, 2217, 2216, + 2089, 2220, 2221, 2088, + 2085, 2088, 2221, 2216, + 2219, 2216, 2221, 2222, + 2223, 2222, 2221, 2220, + 2093, 2224, 2225, 2092, + 2089, 2092, 2225, 2220, + 2223, 2220, 2225, 2226, + 2227, 2226, 2225, 2224, + 2099, 2228, 2229, 2098, + 2097, 2098, 2229, 2230, + 2231, 2230, 2229, 2232, + 2233, 2232, 2229, 2228, + 2103, 2234, 2235, 2102, + 2099, 2102, 2235, 2228, + 2233, 2228, 2235, 2236, + 2237, 2236, 2235, 2234, + 2107, 2238, 2239, 2106, + 2103, 2106, 2239, 2234, + 2237, 2234, 2239, 2240, + 2241, 2240, 2239, 2238, + 2111, 2242, 2243, 2110, + 2107, 2110, 2243, 2238, + 2241, 2238, 2243, 2244, + 2245, 2244, 2243, 2242, + 2115, 2246, 2247, 2114, + 2111, 2114, 2247, 2242, + 2245, 2242, 2247, 2248, + 2249, 2248, 2247, 2246, + 2119, 2250, 2251, 2118, + 2115, 2118, 2251, 2246, + 2249, 2246, 2251, 2252, + 2253, 2252, 2251, 2250, + 2123, 2254, 2255, 2122, + 2119, 2122, 2255, 2250, + 2253, 2250, 2255, 2256, + 2257, 2256, 2255, 2254, + 2127, 2258, 2259, 2126, + 2123, 2126, 2259, 2254, + 2257, 2254, 2259, 2260, + 2261, 2260, 2259, 2258, + 2131, 2262, 2263, 2130, + 2127, 2130, 2263, 2258, + 2261, 2258, 2263, 2264, + 2265, 2264, 2263, 2262, + 2135, 2266, 2267, 2134, + 2131, 2134, 2267, 2262, + 2265, 2262, 2267, 2268, + 2269, 2268, 2267, 2266, + 2139, 2270, 2271, 2138, + 2135, 2138, 2271, 2266, + 2269, 2266, 2271, 2272, + 2273, 2272, 2271, 2270, + 2143, 2274, 2275, 2142, + 2139, 2142, 2275, 2270, + 2273, 2270, 2275, 2276, + 2277, 2276, 2275, 2274, + 2147, 2278, 2279, 2146, + 2143, 2146, 2279, 2274, + 2277, 2274, 2279, 2280, + 2281, 2280, 2279, 2278, + 2151, 2282, 2283, 2150, + 2147, 2150, 2283, 2278, + 2281, 2278, 2283, 2284, + 2285, 2284, 2283, 2282, + 2155, 2286, 2287, 2154, + 2151, 2154, 2287, 2282, + 2285, 2282, 2287, 2288, + 2289, 2288, 2287, 2286, + 2159, 2290, 2291, 2158, + 2155, 2158, 2291, 2286, + 2289, 2286, 2291, 2292, + 2293, 2292, 2291, 2290, + 2163, 2294, 2295, 2162, + 2159, 2162, 2295, 2290, + 2293, 2290, 2295, 2296, + 2297, 2296, 2295, 2294, + 2167, 2298, 2299, 2166, + 2163, 2166, 2299, 2294, + 2297, 2294, 2299, 2300, + 2301, 2300, 2299, 2298, + 2171, 2302, 2303, 2170, + 2167, 2170, 2303, 2298, + 2301, 2298, 2303, 2304, + 2305, 2304, 2303, 2302, + 2175, 2306, 2307, 2174, + 2171, 2174, 2307, 2302, + 2305, 2302, 2307, 2308, + 2309, 2308, 2307, 2306, + 2179, 2310, 2311, 2178, + 2175, 2178, 2311, 2306, + 2309, 2306, 2311, 2312, + 2313, 2312, 2311, 2310, + 2183, 2314, 2315, 2182, + 2179, 2182, 2315, 2310, + 2313, 2310, 2315, 2316, + 2317, 2316, 2315, 2314, + 2187, 2318, 2319, 2186, + 2183, 2186, 2319, 2314, + 2317, 2314, 2319, 2320, + 2321, 2320, 2319, 2318, + 2191, 2322, 2323, 2190, + 2187, 2190, 2323, 2318, + 2321, 2318, 2323, 2324, + 2325, 2324, 2323, 2322, + 2195, 2326, 2327, 2194, + 2191, 2194, 2327, 2322, + 2325, 2322, 2327, 2328, + 2329, 2328, 2327, 2326, + 2199, 2330, 2331, 2198, + 2195, 2198, 2331, 2326, + 2329, 2326, 2331, 2332, + 2333, 2332, 2331, 2330, + 2203, 2334, 2335, 2202, + 2199, 2202, 2335, 2330, + 2333, 2330, 2335, 2336, + 2337, 2336, 2335, 2334, + 2207, 2338, 2339, 2206, + 2203, 2206, 2339, 2334, + 2337, 2334, 2339, 2340, + 2341, 2340, 2339, 2338, + 2211, 2342, 2343, 2210, + 2207, 2210, 2343, 2338, + 2341, 2338, 2343, 2344, + 2345, 2344, 2343, 2342, + 2215, 2346, 2347, 2214, + 2211, 2214, 2347, 2342, + 2345, 2342, 2347, 2348, + 2349, 2348, 2347, 2346, + 2219, 2350, 2351, 2218, + 2215, 2218, 2351, 2346, + 2349, 2346, 2351, 2352, + 2353, 2352, 2351, 2350, + 2223, 2354, 2355, 2222, + 2219, 2222, 2355, 2350, + 2353, 2350, 2355, 2356, + 2357, 2356, 2355, 2354, + 2227, 2358, 2359, 2226, + 2223, 2226, 2359, 2354, + 2357, 2354, 2359, 2360, + 2361, 2360, 2359, 2358, + 2233, 2362, 2363, 2232, + 2231, 2232, 2363, 2364, + 2365, 2364, 2363, 2366, + 2367, 2366, 2363, 2362, + 2237, 2368, 2369, 2236, + 2233, 2236, 2369, 2362, + 2367, 2362, 2369, 2370, + 2371, 2370, 2369, 2368, + 2241, 2372, 2373, 2240, + 2237, 2240, 2373, 2368, + 2371, 2368, 2373, 2374, + 2375, 2374, 2373, 2372, + 2245, 2376, 2377, 2244, + 2241, 2244, 2377, 2372, + 2375, 2372, 2377, 2378, + 2379, 2378, 2377, 2376, + 2249, 2380, 2381, 2248, + 2245, 2248, 2381, 2376, + 2379, 2376, 2381, 2382, + 2383, 2382, 2381, 2380, + 2253, 2384, 2385, 2252, + 2249, 2252, 2385, 2380, + 2383, 2380, 2385, 2386, + 2387, 2386, 2385, 2384, + 2257, 2388, 2389, 2256, + 2253, 2256, 2389, 2384, + 2387, 2384, 2389, 2390, + 2391, 2390, 2389, 2388, + 2261, 2392, 2393, 2260, + 2257, 2260, 2393, 2388, + 2391, 2388, 2393, 2394, + 2395, 2394, 2393, 2392, + 2265, 2396, 2397, 2264, + 2261, 2264, 2397, 2392, + 2395, 2392, 2397, 2398, + 2399, 2398, 2397, 2396, + 2269, 2400, 2401, 2268, + 2265, 2268, 2401, 2396, + 2399, 2396, 2401, 2402, + 2403, 2402, 2401, 2400, + 2273, 2404, 2405, 2272, + 2269, 2272, 2405, 2400, + 2403, 2400, 2405, 2406, + 2407, 2406, 2405, 2404, + 2277, 2408, 2409, 2276, + 2273, 2276, 2409, 2404, + 2407, 2404, 2409, 2410, + 2411, 2410, 2409, 2408, + 2281, 2412, 2413, 2280, + 2277, 2280, 2413, 2408, + 2411, 2408, 2413, 2414, + 2415, 2414, 2413, 2412, + 2285, 2416, 2417, 2284, + 2281, 2284, 2417, 2412, + 2415, 2412, 2417, 2418, + 2419, 2418, 2417, 2416, + 2289, 2420, 2421, 2288, + 2285, 2288, 2421, 2416, + 2419, 2416, 2421, 2422, + 2423, 2422, 2421, 2420, + 2293, 2424, 2425, 2292, + 2289, 2292, 2425, 2420, + 2423, 2420, 2425, 2426, + 2427, 2426, 2425, 2424, + 2297, 2428, 2429, 2296, + 2293, 2296, 2429, 2424, + 2427, 2424, 2429, 2430, + 2431, 2430, 2429, 2428, + 2301, 2432, 2433, 2300, + 2297, 2300, 2433, 2428, + 2431, 2428, 2433, 2434, + 2435, 2434, 2433, 2432, + 2305, 2436, 2437, 2304, + 2301, 2304, 2437, 2432, + 2435, 2432, 2437, 2438, + 2439, 2438, 2437, 2436, + 2309, 2440, 2441, 2308, + 2305, 2308, 2441, 2436, + 2439, 2436, 2441, 2442, + 2443, 2442, 2441, 2440, + 2313, 2444, 2445, 2312, + 2309, 2312, 2445, 2440, + 2443, 2440, 2445, 2446, + 2447, 2446, 2445, 2444, + 2317, 2448, 2449, 2316, + 2313, 2316, 2449, 2444, + 2447, 2444, 2449, 2450, + 2451, 2450, 2449, 2448, + 2321, 2452, 2453, 2320, + 2317, 2320, 2453, 2448, + 2451, 2448, 2453, 2454, + 2455, 2454, 2453, 2452, + 2325, 2456, 2457, 2324, + 2321, 2324, 2457, 2452, + 2455, 2452, 2457, 2458, + 2459, 2458, 2457, 2456, + 2329, 2460, 2461, 2328, + 2325, 2328, 2461, 2456, + 2459, 2456, 2461, 2462, + 2463, 2462, 2461, 2460, + 2333, 2464, 2465, 2332, + 2329, 2332, 2465, 2460, + 2463, 2460, 2465, 2466, + 2467, 2466, 2465, 2464, + 2337, 2468, 2469, 2336, + 2333, 2336, 2469, 2464, + 2467, 2464, 2469, 2470, + 2471, 2470, 2469, 2468, + 2341, 2472, 2473, 2340, + 2337, 2340, 2473, 2468, + 2471, 2468, 2473, 2474, + 2475, 2474, 2473, 2472, + 2345, 2476, 2477, 2344, + 2341, 2344, 2477, 2472, + 2475, 2472, 2477, 2478, + 2479, 2478, 2477, 2476, + 2349, 2480, 2481, 2348, + 2345, 2348, 2481, 2476, + 2479, 2476, 2481, 2482, + 2483, 2482, 2481, 2480, + 2353, 2484, 2485, 2352, + 2349, 2352, 2485, 2480, + 2483, 2480, 2485, 2486, + 2487, 2486, 2485, 2484, + 2357, 2488, 2489, 2356, + 2353, 2356, 2489, 2484, + 2487, 2484, 2489, 2490, + 2491, 2490, 2489, 2488, + 2361, 2492, 2493, 2360, + 2357, 2360, 2493, 2488, + 2491, 2488, 2493, 2494, + 2495, 2494, 2493, 2492, + 2367, 2496, 2497, 2366, + 2365, 2366, 2497, 2498, + 2499, 2498, 2497, 2500, + 2501, 2500, 2497, 2496, + 2371, 2502, 2503, 2370, + 2367, 2370, 2503, 2496, + 2501, 2496, 2503, 2504, + 2505, 2504, 2503, 2502, + 2375, 2506, 2507, 2374, + 2371, 2374, 2507, 2502, + 2505, 2502, 2507, 2508, + 2509, 2508, 2507, 2506, + 2379, 2510, 2511, 2378, + 2375, 2378, 2511, 2506, + 2509, 2506, 2511, 2512, + 2513, 2512, 2511, 2510, + 2383, 2514, 2515, 2382, + 2379, 2382, 2515, 2510, + 2513, 2510, 2515, 2516, + 2517, 2516, 2515, 2514, + 2387, 2518, 2519, 2386, + 2383, 2386, 2519, 2514, + 2517, 2514, 2519, 2520, + 2521, 2520, 2519, 2518, + 2391, 2522, 2523, 2390, + 2387, 2390, 2523, 2518, + 2521, 2518, 2523, 2524, + 2525, 2524, 2523, 2522, + 2395, 2526, 2527, 2394, + 2391, 2394, 2527, 2522, + 2525, 2522, 2527, 2528, + 2529, 2528, 2527, 2526, + 2399, 2530, 2531, 2398, + 2395, 2398, 2531, 2526, + 2529, 2526, 2531, 2532, + 2533, 2532, 2531, 2530, + 2403, 2534, 2535, 2402, + 2399, 2402, 2535, 2530, + 2533, 2530, 2535, 2536, + 2537, 2536, 2535, 2534, + 2407, 2538, 2539, 2406, + 2403, 2406, 2539, 2534, + 2537, 2534, 2539, 2540, + 2541, 2540, 2539, 2538, + 2411, 2542, 2543, 2410, + 2407, 2410, 2543, 2538, + 2541, 2538, 2543, 2544, + 2545, 2544, 2543, 2542, + 2415, 2546, 2547, 2414, + 2411, 2414, 2547, 2542, + 2545, 2542, 2547, 2548, + 2549, 2548, 2547, 2546, + 2419, 2550, 2551, 2418, + 2415, 2418, 2551, 2546, + 2549, 2546, 2551, 2552, + 2553, 2552, 2551, 2550, + 2423, 2554, 2555, 2422, + 2419, 2422, 2555, 2550, + 2553, 2550, 2555, 2556, + 2557, 2556, 2555, 2554, + 2427, 2558, 2559, 2426, + 2423, 2426, 2559, 2554, + 2557, 2554, 2559, 2560, + 2561, 2560, 2559, 2558, + 2431, 2562, 2563, 2430, + 2427, 2430, 2563, 2558, + 2561, 2558, 2563, 2564, + 2565, 2564, 2563, 2562, + 2435, 2566, 2567, 2434, + 2431, 2434, 2567, 2562, + 2565, 2562, 2567, 2568, + 2569, 2568, 2567, 2566, + 2439, 2570, 2571, 2438, + 2435, 2438, 2571, 2566, + 2569, 2566, 2571, 2572, + 2573, 2572, 2571, 2570, + 2443, 2574, 2575, 2442, + 2439, 2442, 2575, 2570, + 2573, 2570, 2575, 2576, + 2577, 2576, 2575, 2574, + 2447, 2578, 2579, 2446, + 2443, 2446, 2579, 2574, + 2577, 2574, 2579, 2580, + 2581, 2580, 2579, 2578, + 2451, 2582, 2583, 2450, + 2447, 2450, 2583, 2578, + 2581, 2578, 2583, 2584, + 2585, 2584, 2583, 2582, + 2455, 2586, 2587, 2454, + 2451, 2454, 2587, 2582, + 2585, 2582, 2587, 2588, + 2589, 2588, 2587, 2586, + 2459, 2590, 2591, 2458, + 2455, 2458, 2591, 2586, + 2589, 2586, 2591, 2592, + 2593, 2592, 2591, 2590, + 2463, 2594, 2595, 2462, + 2459, 2462, 2595, 2590, + 2593, 2590, 2595, 2596, + 2597, 2596, 2595, 2594, + 2467, 2598, 2599, 2466, + 2463, 2466, 2599, 2594, + 2597, 2594, 2599, 2600, + 2601, 2600, 2599, 2598, + 2471, 2602, 2603, 2470, + 2467, 2470, 2603, 2598, + 2601, 2598, 2603, 2604, + 2605, 2604, 2603, 2602, + 2475, 2606, 2607, 2474, + 2471, 2474, 2607, 2602, + 2605, 2602, 2607, 2608, + 2609, 2608, 2607, 2606, + 2479, 2610, 2611, 2478, + 2475, 2478, 2611, 2606, + 2609, 2606, 2611, 2612, + 2613, 2612, 2611, 2610, + 2483, 2614, 2615, 2482, + 2479, 2482, 2615, 2610, + 2613, 2610, 2615, 2616, + 2617, 2616, 2615, 2614, + 2487, 2618, 2619, 2486, + 2483, 2486, 2619, 2614, + 2617, 2614, 2619, 2620, + 2621, 2620, 2619, 2618, + 2491, 2622, 2623, 2490, + 2487, 2490, 2623, 2618, + 2621, 2618, 2623, 2624, + 2625, 2624, 2623, 2622, + 2495, 2626, 2627, 2494, + 2491, 2494, 2627, 2622, + 2625, 2622, 2627, 2628, + 2629, 2628, 2627, 2626, + 2501, 2630, 2631, 2500, + 2499, 2500, 2631, 2632, + 2633, 2632, 2631, 2634, + 2635, 2634, 2631, 2630, + 2505, 2636, 2637, 2504, + 2501, 2504, 2637, 2630, + 2635, 2630, 2637, 2638, + 2639, 2638, 2637, 2636, + 2509, 2640, 2641, 2508, + 2505, 2508, 2641, 2636, + 2639, 2636, 2641, 2642, + 2643, 2642, 2641, 2640, + 2513, 2644, 2645, 2512, + 2509, 2512, 2645, 2640, + 2643, 2640, 2645, 2646, + 2647, 2646, 2645, 2644, + 2517, 2648, 2649, 2516, + 2513, 2516, 2649, 2644, + 2647, 2644, 2649, 2650, + 2651, 2650, 2649, 2648, + 2521, 2652, 2653, 2520, + 2517, 2520, 2653, 2648, + 2651, 2648, 2653, 2654, + 2655, 2654, 2653, 2652, + 2525, 2656, 2657, 2524, + 2521, 2524, 2657, 2652, + 2655, 2652, 2657, 2658, + 2659, 2658, 2657, 2656, + 2529, 2660, 2661, 2528, + 2525, 2528, 2661, 2656, + 2659, 2656, 2661, 2662, + 2663, 2662, 2661, 2660, + 2533, 2664, 2665, 2532, + 2529, 2532, 2665, 2660, + 2663, 2660, 2665, 2666, + 2667, 2666, 2665, 2664, + 2537, 2668, 2669, 2536, + 2533, 2536, 2669, 2664, + 2667, 2664, 2669, 2670, + 2671, 2670, 2669, 2668, + 2541, 2672, 2673, 2540, + 2537, 2540, 2673, 2668, + 2671, 2668, 2673, 2674, + 2675, 2674, 2673, 2672, + 2545, 2676, 2677, 2544, + 2541, 2544, 2677, 2672, + 2675, 2672, 2677, 2678, + 2679, 2678, 2677, 2676, + 2549, 2680, 2681, 2548, + 2545, 2548, 2681, 2676, + 2679, 2676, 2681, 2682, + 2683, 2682, 2681, 2680, + 2553, 2684, 2685, 2552, + 2549, 2552, 2685, 2680, + 2683, 2680, 2685, 2686, + 2687, 2686, 2685, 2684, + 2557, 2688, 2689, 2556, + 2553, 2556, 2689, 2684, + 2687, 2684, 2689, 2690, + 2691, 2690, 2689, 2688, + 2561, 2692, 2693, 2560, + 2557, 2560, 2693, 2688, + 2691, 2688, 2693, 2694, + 2695, 2694, 2693, 2692, + 2565, 2696, 2697, 2564, + 2561, 2564, 2697, 2692, + 2695, 2692, 2697, 2698, + 2699, 2698, 2697, 2696, + 2569, 2700, 2701, 2568, + 2565, 2568, 2701, 2696, + 2699, 2696, 2701, 2702, + 2703, 2702, 2701, 2700, + 2573, 2704, 2705, 2572, + 2569, 2572, 2705, 2700, + 2703, 2700, 2705, 2706, + 2707, 2706, 2705, 2704, + 2577, 2708, 2709, 2576, + 2573, 2576, 2709, 2704, + 2707, 2704, 2709, 2710, + 2711, 2710, 2709, 2708, + 2581, 2712, 2713, 2580, + 2577, 2580, 2713, 2708, + 2711, 2708, 2713, 2714, + 2715, 2714, 2713, 2712, + 2585, 2716, 2717, 2584, + 2581, 2584, 2717, 2712, + 2715, 2712, 2717, 2718, + 2719, 2718, 2717, 2716, + 2589, 2720, 2721, 2588, + 2585, 2588, 2721, 2716, + 2719, 2716, 2721, 2722, + 2723, 2722, 2721, 2720, + 2593, 2724, 2725, 2592, + 2589, 2592, 2725, 2720, + 2723, 2720, 2725, 2726, + 2727, 2726, 2725, 2724, + 2597, 2728, 2729, 2596, + 2593, 2596, 2729, 2724, + 2727, 2724, 2729, 2730, + 2731, 2730, 2729, 2728, + 2601, 2732, 2733, 2600, + 2597, 2600, 2733, 2728, + 2731, 2728, 2733, 2734, + 2735, 2734, 2733, 2732, + 2605, 2736, 2737, 2604, + 2601, 2604, 2737, 2732, + 2735, 2732, 2737, 2738, + 2739, 2738, 2737, 2736, + 2609, 2740, 2741, 2608, + 2605, 2608, 2741, 2736, + 2739, 2736, 2741, 2742, + 2743, 2742, 2741, 2740, + 2613, 2744, 2745, 2612, + 2609, 2612, 2745, 2740, + 2743, 2740, 2745, 2746, + 2747, 2746, 2745, 2744, + 2617, 2748, 2749, 2616, + 2613, 2616, 2749, 2744, + 2747, 2744, 2749, 2750, + 2751, 2750, 2749, 2748, + 2621, 2752, 2753, 2620, + 2617, 2620, 2753, 2748, + 2751, 2748, 2753, 2754, + 2755, 2754, 2753, 2752, + 2625, 2756, 2757, 2624, + 2621, 2624, 2757, 2752, + 2755, 2752, 2757, 2758, + 2759, 2758, 2757, 2756, + 2629, 2760, 2761, 2628, + 2625, 2628, 2761, 2756, + 2759, 2756, 2761, 2762, + 2763, 2762, 2761, 2760, + 2635, 2764, 2765, 2634, + 2633, 2634, 2765, 2766, + 2767, 2766, 2765, 2768, + 2769, 2768, 2765, 2764, + 2639, 2770, 2771, 2638, + 2635, 2638, 2771, 2764, + 2769, 2764, 2771, 2772, + 2773, 2772, 2771, 2770, + 2643, 2774, 2775, 2642, + 2639, 2642, 2775, 2770, + 2773, 2770, 2775, 2776, + 2777, 2776, 2775, 2774, + 2647, 2778, 2779, 2646, + 2643, 2646, 2779, 2774, + 2777, 2774, 2779, 2780, + 2781, 2780, 2779, 2778, + 2651, 2782, 2783, 2650, + 2647, 2650, 2783, 2778, + 2781, 2778, 2783, 2784, + 2785, 2784, 2783, 2782, + 2655, 2786, 2787, 2654, + 2651, 2654, 2787, 2782, + 2785, 2782, 2787, 2788, + 2789, 2788, 2787, 2786, + 2659, 2790, 2791, 2658, + 2655, 2658, 2791, 2786, + 2789, 2786, 2791, 2792, + 2793, 2792, 2791, 2790, + 2663, 2794, 2795, 2662, + 2659, 2662, 2795, 2790, + 2793, 2790, 2795, 2796, + 2797, 2796, 2795, 2794, + 2667, 2798, 2799, 2666, + 2663, 2666, 2799, 2794, + 2797, 2794, 2799, 2800, + 2801, 2800, 2799, 2798, + 2671, 2802, 2803, 2670, + 2667, 2670, 2803, 2798, + 2801, 2798, 2803, 2804, + 2805, 2804, 2803, 2802, + 2675, 2806, 2807, 2674, + 2671, 2674, 2807, 2802, + 2805, 2802, 2807, 2808, + 2809, 2808, 2807, 2806, + 2679, 2810, 2811, 2678, + 2675, 2678, 2811, 2806, + 2809, 2806, 2811, 2812, + 2813, 2812, 2811, 2810, + 2683, 2814, 2815, 2682, + 2679, 2682, 2815, 2810, + 2813, 2810, 2815, 2816, + 2817, 2816, 2815, 2814, + 2687, 2818, 2819, 2686, + 2683, 2686, 2819, 2814, + 2817, 2814, 2819, 2820, + 2821, 2820, 2819, 2818, + 2691, 2822, 2823, 2690, + 2687, 2690, 2823, 2818, + 2821, 2818, 2823, 2824, + 2825, 2824, 2823, 2822, + 2695, 2826, 2827, 2694, + 2691, 2694, 2827, 2822, + 2825, 2822, 2827, 2828, + 2829, 2828, 2827, 2826, + 2699, 2830, 2831, 2698, + 2695, 2698, 2831, 2826, + 2829, 2826, 2831, 2832, + 2833, 2832, 2831, 2830, + 2703, 2834, 2835, 2702, + 2699, 2702, 2835, 2830, + 2833, 2830, 2835, 2836, + 2837, 2836, 2835, 2834, + 2707, 2838, 2839, 2706, + 2703, 2706, 2839, 2834, + 2837, 2834, 2839, 2840, + 2841, 2840, 2839, 2838, + 2711, 2842, 2843, 2710, + 2707, 2710, 2843, 2838, + 2841, 2838, 2843, 2844, + 2845, 2844, 2843, 2842, + 2715, 2846, 2847, 2714, + 2711, 2714, 2847, 2842, + 2845, 2842, 2847, 2848, + 2849, 2848, 2847, 2846, + 2719, 2850, 2851, 2718, + 2715, 2718, 2851, 2846, + 2849, 2846, 2851, 2852, + 2853, 2852, 2851, 2850, + 2723, 2854, 2855, 2722, + 2719, 2722, 2855, 2850, + 2853, 2850, 2855, 2856, + 2857, 2856, 2855, 2854, + 2727, 2858, 2859, 2726, + 2723, 2726, 2859, 2854, + 2857, 2854, 2859, 2860, + 2861, 2860, 2859, 2858, + 2731, 2862, 2863, 2730, + 2727, 2730, 2863, 2858, + 2861, 2858, 2863, 2864, + 2865, 2864, 2863, 2862, + 2735, 2866, 2867, 2734, + 2731, 2734, 2867, 2862, + 2865, 2862, 2867, 2868, + 2869, 2868, 2867, 2866, + 2739, 2870, 2871, 2738, + 2735, 2738, 2871, 2866, + 2869, 2866, 2871, 2872, + 2873, 2872, 2871, 2870, + 2743, 2874, 2875, 2742, + 2739, 2742, 2875, 2870, + 2873, 2870, 2875, 2876, + 2877, 2876, 2875, 2874, + 2747, 2878, 2879, 2746, + 2743, 2746, 2879, 2874, + 2877, 2874, 2879, 2880, + 2881, 2880, 2879, 2878, + 2751, 2882, 2883, 2750, + 2747, 2750, 2883, 2878, + 2881, 2878, 2883, 2884, + 2885, 2884, 2883, 2882, + 2755, 2886, 2887, 2754, + 2751, 2754, 2887, 2882, + 2885, 2882, 2887, 2888, + 2889, 2888, 2887, 2886, + 2759, 2890, 2891, 2758, + 2755, 2758, 2891, 2886, + 2889, 2886, 2891, 2892, + 2893, 2892, 2891, 2890, + 2763, 2894, 2895, 2762, + 2759, 2762, 2895, 2890, + 2893, 2890, 2895, 2896, + 2897, 2896, 2895, 2894, + 2769, 2898, 2899, 2768, + 2767, 2768, 2899, 2900, + 2901, 2900, 2899, 2902, + 2903, 2902, 2899, 2898, + 2773, 2904, 2905, 2772, + 2769, 2772, 2905, 2898, + 2903, 2898, 2905, 2906, + 2907, 2906, 2905, 2904, + 2777, 2908, 2909, 2776, + 2773, 2776, 2909, 2904, + 2907, 2904, 2909, 2910, + 2911, 2910, 2909, 2908, + 2781, 2912, 2913, 2780, + 2777, 2780, 2913, 2908, + 2911, 2908, 2913, 2914, + 2915, 2914, 2913, 2912, + 2785, 2916, 2917, 2784, + 2781, 2784, 2917, 2912, + 2915, 2912, 2917, 2918, + 2919, 2918, 2917, 2916, + 2789, 2920, 2921, 2788, + 2785, 2788, 2921, 2916, + 2919, 2916, 2921, 2922, + 2923, 2922, 2921, 2920, + 2793, 2924, 2925, 2792, + 2789, 2792, 2925, 2920, + 2923, 2920, 2925, 2926, + 2927, 2926, 2925, 2924, + 2797, 2928, 2929, 2796, + 2793, 2796, 2929, 2924, + 2927, 2924, 2929, 2930, + 2931, 2930, 2929, 2928, + 2801, 2932, 2933, 2800, + 2797, 2800, 2933, 2928, + 2931, 2928, 2933, 2934, + 2935, 2934, 2933, 2932, + 2805, 2936, 2937, 2804, + 2801, 2804, 2937, 2932, + 2935, 2932, 2937, 2938, + 2939, 2938, 2937, 2936, + 2809, 2940, 2941, 2808, + 2805, 2808, 2941, 2936, + 2939, 2936, 2941, 2942, + 2943, 2942, 2941, 2940, + 2813, 2944, 2945, 2812, + 2809, 2812, 2945, 2940, + 2943, 2940, 2945, 2946, + 2947, 2946, 2945, 2944, + 2817, 2948, 2949, 2816, + 2813, 2816, 2949, 2944, + 2947, 2944, 2949, 2950, + 2951, 2950, 2949, 2948, + 2821, 2952, 2953, 2820, + 2817, 2820, 2953, 2948, + 2951, 2948, 2953, 2954, + 2955, 2954, 2953, 2952, + 2825, 2956, 2957, 2824, + 2821, 2824, 2957, 2952, + 2955, 2952, 2957, 2958, + 2959, 2958, 2957, 2956, + 2829, 2960, 2961, 2828, + 2825, 2828, 2961, 2956, + 2959, 2956, 2961, 2962, + 2963, 2962, 2961, 2960, + 2833, 2964, 2965, 2832, + 2829, 2832, 2965, 2960, + 2963, 2960, 2965, 2966, + 2967, 2966, 2965, 2964, + 2837, 2968, 2969, 2836, + 2833, 2836, 2969, 2964, + 2967, 2964, 2969, 2970, + 2971, 2970, 2969, 2968, + 2841, 2972, 2973, 2840, + 2837, 2840, 2973, 2968, + 2971, 2968, 2973, 2974, + 2975, 2974, 2973, 2972, + 2845, 2976, 2977, 2844, + 2841, 2844, 2977, 2972, + 2975, 2972, 2977, 2978, + 2979, 2978, 2977, 2976, + 2849, 2980, 2981, 2848, + 2845, 2848, 2981, 2976, + 2979, 2976, 2981, 2982, + 2983, 2982, 2981, 2980, + 2853, 2984, 2985, 2852, + 2849, 2852, 2985, 2980, + 2983, 2980, 2985, 2986, + 2987, 2986, 2985, 2984, + 2857, 2988, 2989, 2856, + 2853, 2856, 2989, 2984, + 2987, 2984, 2989, 2990, + 2991, 2990, 2989, 2988, + 2861, 2992, 2993, 2860, + 2857, 2860, 2993, 2988, + 2991, 2988, 2993, 2994, + 2995, 2994, 2993, 2992, + 2865, 2996, 2997, 2864, + 2861, 2864, 2997, 2992, + 2995, 2992, 2997, 2998, + 2999, 2998, 2997, 2996, + 2869, 3000, 3001, 2868, + 2865, 2868, 3001, 2996, + 2999, 2996, 3001, 3002, + 3003, 3002, 3001, 3000, + 2873, 3004, 3005, 2872, + 2869, 2872, 3005, 3000, + 3003, 3000, 3005, 3006, + 3007, 3006, 3005, 3004, + 2877, 3008, 3009, 2876, + 2873, 2876, 3009, 3004, + 3007, 3004, 3009, 3010, + 3011, 3010, 3009, 3008, + 2881, 3012, 3013, 2880, + 2877, 2880, 3013, 3008, + 3011, 3008, 3013, 3014, + 3015, 3014, 3013, 3012, + 2885, 3016, 3017, 2884, + 2881, 2884, 3017, 3012, + 3015, 3012, 3017, 3018, + 3019, 3018, 3017, 3016, + 2889, 3020, 3021, 2888, + 2885, 2888, 3021, 3016, + 3019, 3016, 3021, 3022, + 3023, 3022, 3021, 3020, + 2893, 3024, 3025, 2892, + 2889, 2892, 3025, 3020, + 3023, 3020, 3025, 3026, + 3027, 3026, 3025, 3024, + 2897, 3028, 3029, 2896, + 2893, 2896, 3029, 3024, + 3027, 3024, 3029, 3030, + 3031, 3030, 3029, 3028, + 2903, 3032, 3033, 2902, + 2901, 2902, 3033, 3034, + 3035, 3034, 3033, 3036, + 3037, 3036, 3033, 3032, + 2907, 3038, 3039, 2906, + 2903, 2906, 3039, 3032, + 3037, 3032, 3039, 3040, + 3041, 3040, 3039, 3038, + 2911, 3042, 3043, 2910, + 2907, 2910, 3043, 3038, + 3041, 3038, 3043, 3044, + 3045, 3044, 3043, 3042, + 2915, 3046, 3047, 2914, + 2911, 2914, 3047, 3042, + 3045, 3042, 3047, 3048, + 3049, 3048, 3047, 3046, + 2919, 3050, 3051, 2918, + 2915, 2918, 3051, 3046, + 3049, 3046, 3051, 3052, + 3053, 3052, 3051, 3050, + 2923, 3054, 3055, 2922, + 2919, 2922, 3055, 3050, + 3053, 3050, 3055, 3056, + 3057, 3056, 3055, 3054, + 2927, 3058, 3059, 2926, + 2923, 2926, 3059, 3054, + 3057, 3054, 3059, 3060, + 3061, 3060, 3059, 3058, + 2931, 3062, 3063, 2930, + 2927, 2930, 3063, 3058, + 3061, 3058, 3063, 3064, + 3065, 3064, 3063, 3062, + 2935, 3066, 3067, 2934, + 2931, 2934, 3067, 3062, + 3065, 3062, 3067, 3068, + 3069, 3068, 3067, 3066, + 2939, 3070, 3071, 2938, + 2935, 2938, 3071, 3066, + 3069, 3066, 3071, 3072, + 3073, 3072, 3071, 3070, + 2943, 3074, 3075, 2942, + 2939, 2942, 3075, 3070, + 3073, 3070, 3075, 3076, + 3077, 3076, 3075, 3074, + 2947, 3078, 3079, 2946, + 2943, 2946, 3079, 3074, + 3077, 3074, 3079, 3080, + 3081, 3080, 3079, 3078, + 2951, 3082, 3083, 2950, + 2947, 2950, 3083, 3078, + 3081, 3078, 3083, 3084, + 3085, 3084, 3083, 3082, + 2955, 3086, 3087, 2954, + 2951, 2954, 3087, 3082, + 3085, 3082, 3087, 3088, + 3089, 3088, 3087, 3086, + 2959, 3090, 3091, 2958, + 2955, 2958, 3091, 3086, + 3089, 3086, 3091, 3092, + 3093, 3092, 3091, 3090, + 2963, 3094, 3095, 2962, + 2959, 2962, 3095, 3090, + 3093, 3090, 3095, 3096, + 3097, 3096, 3095, 3094, + 2967, 3098, 3099, 2966, + 2963, 2966, 3099, 3094, + 3097, 3094, 3099, 3100, + 3101, 3100, 3099, 3098, + 2971, 3102, 3103, 2970, + 2967, 2970, 3103, 3098, + 3101, 3098, 3103, 3104, + 3105, 3104, 3103, 3102, + 2975, 3106, 3107, 2974, + 2971, 2974, 3107, 3102, + 3105, 3102, 3107, 3108, + 3109, 3108, 3107, 3106, + 2979, 3110, 3111, 2978, + 2975, 2978, 3111, 3106, + 3109, 3106, 3111, 3112, + 3113, 3112, 3111, 3110, + 2983, 3114, 3115, 2982, + 2979, 2982, 3115, 3110, + 3113, 3110, 3115, 3116, + 3117, 3116, 3115, 3114, + 2987, 3118, 3119, 2986, + 2983, 2986, 3119, 3114, + 3117, 3114, 3119, 3120, + 3121, 3120, 3119, 3118, + 2991, 3122, 3123, 2990, + 2987, 2990, 3123, 3118, + 3121, 3118, 3123, 3124, + 3125, 3124, 3123, 3122, + 2995, 3126, 3127, 2994, + 2991, 2994, 3127, 3122, + 3125, 3122, 3127, 3128, + 3129, 3128, 3127, 3126, + 2999, 3130, 3131, 2998, + 2995, 2998, 3131, 3126, + 3129, 3126, 3131, 3132, + 3133, 3132, 3131, 3130, + 3003, 3134, 3135, 3002, + 2999, 3002, 3135, 3130, + 3133, 3130, 3135, 3136, + 3137, 3136, 3135, 3134, + 3007, 3138, 3139, 3006, + 3003, 3006, 3139, 3134, + 3137, 3134, 3139, 3140, + 3141, 3140, 3139, 3138, + 3011, 3142, 3143, 3010, + 3007, 3010, 3143, 3138, + 3141, 3138, 3143, 3144, + 3145, 3144, 3143, 3142, + 3015, 3146, 3147, 3014, + 3011, 3014, 3147, 3142, + 3145, 3142, 3147, 3148, + 3149, 3148, 3147, 3146, + 3019, 3150, 3151, 3018, + 3015, 3018, 3151, 3146, + 3149, 3146, 3151, 3152, + 3153, 3152, 3151, 3150, + 3023, 3154, 3155, 3022, + 3019, 3022, 3155, 3150, + 3153, 3150, 3155, 3156, + 3157, 3156, 3155, 3154, + 3027, 3158, 3159, 3026, + 3023, 3026, 3159, 3154, + 3157, 3154, 3159, 3160, + 3161, 3160, 3159, 3158, + 3031, 3162, 3163, 3030, + 3027, 3030, 3163, 3158, + 3161, 3158, 3163, 3164, + 3165, 3164, 3163, 3162, + 3037, 3166, 3167, 3036, + 3035, 3036, 3167, 3168, + 3169, 3168, 3167, 3170, + 3171, 3170, 3167, 3166, + 3041, 3172, 3173, 3040, + 3037, 3040, 3173, 3166, + 3171, 3166, 3173, 3174, + 3175, 3174, 3173, 3172, + 3045, 3176, 3177, 3044, + 3041, 3044, 3177, 3172, + 3175, 3172, 3177, 3178, + 3179, 3178, 3177, 3176, + 3049, 3180, 3181, 3048, + 3045, 3048, 3181, 3176, + 3179, 3176, 3181, 3182, + 3183, 3182, 3181, 3180, + 3053, 3184, 3185, 3052, + 3049, 3052, 3185, 3180, + 3183, 3180, 3185, 3186, + 3187, 3186, 3185, 3184, + 3057, 3188, 3189, 3056, + 3053, 3056, 3189, 3184, + 3187, 3184, 3189, 3190, + 3191, 3190, 3189, 3188, + 3061, 3192, 3193, 3060, + 3057, 3060, 3193, 3188, + 3191, 3188, 3193, 3194, + 3195, 3194, 3193, 3192, + 3065, 3196, 3197, 3064, + 3061, 3064, 3197, 3192, + 3195, 3192, 3197, 3198, + 3199, 3198, 3197, 3196, + 3069, 3200, 3201, 3068, + 3065, 3068, 3201, 3196, + 3199, 3196, 3201, 3202, + 3203, 3202, 3201, 3200, + 3073, 3204, 3205, 3072, + 3069, 3072, 3205, 3200, + 3203, 3200, 3205, 3206, + 3207, 3206, 3205, 3204, + 3077, 3208, 3209, 3076, + 3073, 3076, 3209, 3204, + 3207, 3204, 3209, 3210, + 3211, 3210, 3209, 3208, + 3081, 3212, 3213, 3080, + 3077, 3080, 3213, 3208, + 3211, 3208, 3213, 3214, + 3215, 3214, 3213, 3212, + 3085, 3216, 3217, 3084, + 3081, 3084, 3217, 3212, + 3215, 3212, 3217, 3218, + 3219, 3218, 3217, 3216, + 3089, 3220, 3221, 3088, + 3085, 3088, 3221, 3216, + 3219, 3216, 3221, 3222, + 3223, 3222, 3221, 3220, + 3093, 3224, 3225, 3092, + 3089, 3092, 3225, 3220, + 3223, 3220, 3225, 3226, + 3227, 3226, 3225, 3224, + 3097, 3228, 3229, 3096, + 3093, 3096, 3229, 3224, + 3227, 3224, 3229, 3230, + 3231, 3230, 3229, 3228, + 3101, 3232, 3233, 3100, + 3097, 3100, 3233, 3228, + 3231, 3228, 3233, 3234, + 3235, 3234, 3233, 3232, + 3105, 3236, 3237, 3104, + 3101, 3104, 3237, 3232, + 3235, 3232, 3237, 3238, + 3239, 3238, 3237, 3236, + 3109, 3240, 3241, 3108, + 3105, 3108, 3241, 3236, + 3239, 3236, 3241, 3242, + 3243, 3242, 3241, 3240, + 3113, 3244, 3245, 3112, + 3109, 3112, 3245, 3240, + 3243, 3240, 3245, 3246, + 3247, 3246, 3245, 3244, + 3117, 3248, 3249, 3116, + 3113, 3116, 3249, 3244, + 3247, 3244, 3249, 3250, + 3251, 3250, 3249, 3248, + 3121, 3252, 3253, 3120, + 3117, 3120, 3253, 3248, + 3251, 3248, 3253, 3254, + 3255, 3254, 3253, 3252, + 3125, 3256, 3257, 3124, + 3121, 3124, 3257, 3252, + 3255, 3252, 3257, 3258, + 3259, 3258, 3257, 3256, + 3129, 3260, 3261, 3128, + 3125, 3128, 3261, 3256, + 3259, 3256, 3261, 3262, + 3263, 3262, 3261, 3260, + 3133, 3264, 3265, 3132, + 3129, 3132, 3265, 3260, + 3263, 3260, 3265, 3266, + 3267, 3266, 3265, 3264, + 3137, 3268, 3269, 3136, + 3133, 3136, 3269, 3264, + 3267, 3264, 3269, 3270, + 3271, 3270, 3269, 3268, + 3141, 3272, 3273, 3140, + 3137, 3140, 3273, 3268, + 3271, 3268, 3273, 3274, + 3275, 3274, 3273, 3272, + 3145, 3276, 3277, 3144, + 3141, 3144, 3277, 3272, + 3275, 3272, 3277, 3278, + 3279, 3278, 3277, 3276, + 3149, 3280, 3281, 3148, + 3145, 3148, 3281, 3276, + 3279, 3276, 3281, 3282, + 3283, 3282, 3281, 3280, + 3153, 3284, 3285, 3152, + 3149, 3152, 3285, 3280, + 3283, 3280, 3285, 3286, + 3287, 3286, 3285, 3284, + 3157, 3288, 3289, 3156, + 3153, 3156, 3289, 3284, + 3287, 3284, 3289, 3290, + 3291, 3290, 3289, 3288, + 3161, 3292, 3293, 3160, + 3157, 3160, 3293, 3288, + 3291, 3288, 3293, 3294, + 3295, 3294, 3293, 3292, + 3165, 3296, 3297, 3164, + 3161, 3164, 3297, 3292, + 3295, 3292, 3297, 3298, + 3299, 3298, 3297, 3296, + 3171, 3300, 3301, 3170, + 3169, 3170, 3301, 3302, + 3303, 3302, 3301, 3304, + 3305, 3304, 3301, 3300, + 3175, 3306, 3307, 3174, + 3171, 3174, 3307, 3300, + 3305, 3300, 3307, 3308, + 3309, 3308, 3307, 3306, + 3179, 3310, 3311, 3178, + 3175, 3178, 3311, 3306, + 3309, 3306, 3311, 3312, + 3313, 3312, 3311, 3310, + 3183, 3314, 3315, 3182, + 3179, 3182, 3315, 3310, + 3313, 3310, 3315, 3316, + 3317, 3316, 3315, 3314, + 3187, 3318, 3319, 3186, + 3183, 3186, 3319, 3314, + 3317, 3314, 3319, 3320, + 3321, 3320, 3319, 3318, + 3191, 3322, 3323, 3190, + 3187, 3190, 3323, 3318, + 3321, 3318, 3323, 3324, + 3325, 3324, 3323, 3322, + 3195, 3326, 3327, 3194, + 3191, 3194, 3327, 3322, + 3325, 3322, 3327, 3328, + 3329, 3328, 3327, 3326, + 3199, 3330, 3331, 3198, + 3195, 3198, 3331, 3326, + 3329, 3326, 3331, 3332, + 3333, 3332, 3331, 3330, + 3203, 3334, 3335, 3202, + 3199, 3202, 3335, 3330, + 3333, 3330, 3335, 3336, + 3337, 3336, 3335, 3334, + 3207, 3338, 3339, 3206, + 3203, 3206, 3339, 3334, + 3337, 3334, 3339, 3340, + 3341, 3340, 3339, 3338, + 3211, 3342, 3343, 3210, + 3207, 3210, 3343, 3338, + 3341, 3338, 3343, 3344, + 3345, 3344, 3343, 3342, + 3215, 3346, 3347, 3214, + 3211, 3214, 3347, 3342, + 3345, 3342, 3347, 3348, + 3349, 3348, 3347, 3346, + 3219, 3350, 3351, 3218, + 3215, 3218, 3351, 3346, + 3349, 3346, 3351, 3352, + 3353, 3352, 3351, 3350, + 3223, 3354, 3355, 3222, + 3219, 3222, 3355, 3350, + 3353, 3350, 3355, 3356, + 3357, 3356, 3355, 3354, + 3227, 3358, 3359, 3226, + 3223, 3226, 3359, 3354, + 3357, 3354, 3359, 3360, + 3361, 3360, 3359, 3358, + 3231, 3362, 3363, 3230, + 3227, 3230, 3363, 3358, + 3361, 3358, 3363, 3364, + 3365, 3364, 3363, 3362, + 3235, 3366, 3367, 3234, + 3231, 3234, 3367, 3362, + 3365, 3362, 3367, 3368, + 3369, 3368, 3367, 3366, + 3239, 3370, 3371, 3238, + 3235, 3238, 3371, 3366, + 3369, 3366, 3371, 3372, + 3373, 3372, 3371, 3370, + 3243, 3374, 3375, 3242, + 3239, 3242, 3375, 3370, + 3373, 3370, 3375, 3376, + 3377, 3376, 3375, 3374, + 3247, 3378, 3379, 3246, + 3243, 3246, 3379, 3374, + 3377, 3374, 3379, 3380, + 3381, 3380, 3379, 3378, + 3251, 3382, 3383, 3250, + 3247, 3250, 3383, 3378, + 3381, 3378, 3383, 3384, + 3385, 3384, 3383, 3382, + 3255, 3386, 3387, 3254, + 3251, 3254, 3387, 3382, + 3385, 3382, 3387, 3388, + 3389, 3388, 3387, 3386, + 3259, 3390, 3391, 3258, + 3255, 3258, 3391, 3386, + 3389, 3386, 3391, 3392, + 3393, 3392, 3391, 3390, + 3263, 3394, 3395, 3262, + 3259, 3262, 3395, 3390, + 3393, 3390, 3395, 3396, + 3397, 3396, 3395, 3394, + 3267, 3398, 3399, 3266, + 3263, 3266, 3399, 3394, + 3397, 3394, 3399, 3400, + 3401, 3400, 3399, 3398, + 3271, 3402, 3403, 3270, + 3267, 3270, 3403, 3398, + 3401, 3398, 3403, 3404, + 3405, 3404, 3403, 3402, + 3275, 3406, 3407, 3274, + 3271, 3274, 3407, 3402, + 3405, 3402, 3407, 3408, + 3409, 3408, 3407, 3406, + 3279, 3410, 3411, 3278, + 3275, 3278, 3411, 3406, + 3409, 3406, 3411, 3412, + 3413, 3412, 3411, 3410, + 3283, 3414, 3415, 3282, + 3279, 3282, 3415, 3410, + 3413, 3410, 3415, 3416, + 3417, 3416, 3415, 3414, + 3287, 3418, 3419, 3286, + 3283, 3286, 3419, 3414, + 3417, 3414, 3419, 3420, + 3421, 3420, 3419, 3418, + 3291, 3422, 3423, 3290, + 3287, 3290, 3423, 3418, + 3421, 3418, 3423, 3424, + 3425, 3424, 3423, 3422, + 3295, 3426, 3427, 3294, + 3291, 3294, 3427, 3422, + 3425, 3422, 3427, 3428, + 3429, 3428, 3427, 3426, + 3299, 3430, 3431, 3298, + 3295, 3298, 3431, 3426, + 3429, 3426, 3431, 3432, + 3433, 3432, 3431, 3430, + 3305, 3434, 3435, 3304, + 3303, 3304, 3435, 3436, + 3437, 3436, 3435, 3438, + 3439, 3438, 3435, 3434, + 3309, 3440, 3441, 3308, + 3305, 3308, 3441, 3434, + 3439, 3434, 3441, 3442, + 3443, 3442, 3441, 3440, + 3313, 3444, 3445, 3312, + 3309, 3312, 3445, 3440, + 3443, 3440, 3445, 3446, + 3447, 3446, 3445, 3444, + 3317, 3448, 3449, 3316, + 3313, 3316, 3449, 3444, + 3447, 3444, 3449, 3450, + 3451, 3450, 3449, 3448, + 3321, 3452, 3453, 3320, + 3317, 3320, 3453, 3448, + 3451, 3448, 3453, 3454, + 3455, 3454, 3453, 3452, + 3325, 3456, 3457, 3324, + 3321, 3324, 3457, 3452, + 3455, 3452, 3457, 3458, + 3459, 3458, 3457, 3456, + 3329, 3460, 3461, 3328, + 3325, 3328, 3461, 3456, + 3459, 3456, 3461, 3462, + 3463, 3462, 3461, 3460, + 3333, 3464, 3465, 3332, + 3329, 3332, 3465, 3460, + 3463, 3460, 3465, 3466, + 3467, 3466, 3465, 3464, + 3337, 3468, 3469, 3336, + 3333, 3336, 3469, 3464, + 3467, 3464, 3469, 3470, + 3471, 3470, 3469, 3468, + 3341, 3472, 3473, 3340, + 3337, 3340, 3473, 3468, + 3471, 3468, 3473, 3474, + 3475, 3474, 3473, 3472, + 3345, 3476, 3477, 3344, + 3341, 3344, 3477, 3472, + 3475, 3472, 3477, 3478, + 3479, 3478, 3477, 3476, + 3349, 3480, 3481, 3348, + 3345, 3348, 3481, 3476, + 3479, 3476, 3481, 3482, + 3483, 3482, 3481, 3480, + 3353, 3484, 3485, 3352, + 3349, 3352, 3485, 3480, + 3483, 3480, 3485, 3486, + 3487, 3486, 3485, 3484, + 3357, 3488, 3489, 3356, + 3353, 3356, 3489, 3484, + 3487, 3484, 3489, 3490, + 3491, 3490, 3489, 3488, + 3361, 3492, 3493, 3360, + 3357, 3360, 3493, 3488, + 3491, 3488, 3493, 3494, + 3495, 3494, 3493, 3492, + 3365, 3496, 3497, 3364, + 3361, 3364, 3497, 3492, + 3495, 3492, 3497, 3498, + 3499, 3498, 3497, 3496, + 3369, 3500, 3501, 3368, + 3365, 3368, 3501, 3496, + 3499, 3496, 3501, 3502, + 3503, 3502, 3501, 3500, + 3373, 3504, 3505, 3372, + 3369, 3372, 3505, 3500, + 3503, 3500, 3505, 3506, + 3507, 3506, 3505, 3504, + 3377, 3508, 3509, 3376, + 3373, 3376, 3509, 3504, + 3507, 3504, 3509, 3510, + 3511, 3510, 3509, 3508, + 3381, 3512, 3513, 3380, + 3377, 3380, 3513, 3508, + 3511, 3508, 3513, 3514, + 3515, 3514, 3513, 3512, + 3385, 3516, 3517, 3384, + 3381, 3384, 3517, 3512, + 3515, 3512, 3517, 3518, + 3519, 3518, 3517, 3516, + 3389, 3520, 3521, 3388, + 3385, 3388, 3521, 3516, + 3519, 3516, 3521, 3522, + 3523, 3522, 3521, 3520, + 3393, 3524, 3525, 3392, + 3389, 3392, 3525, 3520, + 3523, 3520, 3525, 3526, + 3527, 3526, 3525, 3524, + 3397, 3528, 3529, 3396, + 3393, 3396, 3529, 3524, + 3527, 3524, 3529, 3530, + 3531, 3530, 3529, 3528, + 3401, 3532, 3533, 3400, + 3397, 3400, 3533, 3528, + 3531, 3528, 3533, 3534, + 3535, 3534, 3533, 3532, + 3405, 3536, 3537, 3404, + 3401, 3404, 3537, 3532, + 3535, 3532, 3537, 3538, + 3539, 3538, 3537, 3536, + 3409, 3540, 3541, 3408, + 3405, 3408, 3541, 3536, + 3539, 3536, 3541, 3542, + 3543, 3542, 3541, 3540, + 3413, 3544, 3545, 3412, + 3409, 3412, 3545, 3540, + 3543, 3540, 3545, 3546, + 3547, 3546, 3545, 3544, + 3417, 3548, 3549, 3416, + 3413, 3416, 3549, 3544, + 3547, 3544, 3549, 3550, + 3551, 3550, 3549, 3548, + 3421, 3552, 3553, 3420, + 3417, 3420, 3553, 3548, + 3551, 3548, 3553, 3554, + 3555, 3554, 3553, 3552, + 3425, 3556, 3557, 3424, + 3421, 3424, 3557, 3552, + 3555, 3552, 3557, 3558, + 3559, 3558, 3557, 3556, + 3429, 3560, 3561, 3428, + 3425, 3428, 3561, 3556, + 3559, 3556, 3561, 3562, + 3563, 3562, 3561, 3560, + 3433, 3564, 3565, 3432, + 3429, 3432, 3565, 3560, + 3563, 3560, 3565, 3566, + 3567, 3566, 3565, 3564, + 3437, 3568, 3569, 3436, + 3570, 3571, 3569, 3568, + 3572, 3573, 3569, 3571, + 3303, 3436, 3569, 3573, + 3570, 3574, 3575, 3571, + 3576, 3577, 3575, 3574, + 3578, 3579, 3575, 3577, + 3572, 3571, 3575, 3579, + 3576, 3580, 3581, 3577, + 3582, 3583, 3581, 3580, + 3584, 3585, 3581, 3583, + 3578, 3577, 3581, 3585, + 3582, 3586, 3587, 3583, + 3588, 3589, 3587, 3586, + 3590, 3591, 3587, 3589, + 3584, 3583, 3587, 3591, + 3588, 3592, 3593, 3589, + 3594, 3595, 3593, 3592, + 3596, 3597, 3593, 3595, + 3590, 3589, 3593, 3597, + 3594, 3598, 3599, 3595, + 3600, 3601, 3599, 3598, + 3602, 3603, 3599, 3601, + 3596, 3595, 3599, 3603, + 3600, 3604, 3605, 3601, + 3606, 3607, 3605, 3604, + 3608, 3609, 3605, 3607, + 3602, 3601, 3605, 3609, + 3606, 3610, 3611, 3607, + 3612, 3613, 3611, 3610, + 3614, 3615, 3611, 3613, + 3608, 3607, 3611, 3615, + 3612, 3616, 3617, 3613, + 3618, 3619, 3617, 3616, + 3620, 3621, 3617, 3619, + 3614, 3613, 3617, 3621, + 3618, 3622, 3623, 3619, + 3624, 3625, 3623, 3622, + 3626, 3627, 3623, 3625, + 3620, 3619, 3623, 3627, + 3624, 3628, 3629, 3625, + 3630, 3631, 3629, 3628, + 3632, 3633, 3629, 3631, + 3626, 3625, 3629, 3633, + 3630, 3634, 3635, 3631, + 3636, 3637, 3635, 3634, + 3638, 3639, 3635, 3637, + 3632, 3631, 3635, 3639, + 3636, 3640, 3641, 3637, + 3642, 3643, 3641, 3640, + 3644, 3645, 3641, 3643, + 3638, 3637, 3641, 3645, + 3642, 3646, 3647, 3643, + 3648, 3649, 3647, 3646, + 3650, 3651, 3647, 3649, + 3644, 3643, 3647, 3651, + 3648, 3652, 3653, 3649, + 3654, 3655, 3653, 3652, + 3656, 3657, 3653, 3655, + 3650, 3649, 3653, 3657, + 3654, 3658, 3659, 3655, + 3660, 3661, 3659, 3658, + 3662, 3663, 3659, 3661, + 3656, 3655, 3659, 3663, + 3660, 3664, 3665, 3661, + 3666, 3667, 3665, 3664, + 3668, 3669, 3665, 3667, + 3662, 3661, 3665, 3669, + 3666, 3670, 3671, 3667, + 3672, 3673, 3671, 3670, + 3674, 3675, 3671, 3673, + 3668, 3667, 3671, 3675, + 3672, 3676, 3677, 3673, + 3678, 3679, 3677, 3676, + 3680, 3681, 3677, 3679, + 3674, 3673, 3677, 3681, + 3678, 3682, 3683, 3679, + 3684, 3685, 3683, 3682, + 3686, 3687, 3683, 3685, + 3680, 3679, 3683, 3687, + 3684, 3688, 3689, 3685, + 3690, 3691, 3689, 3688, + 3692, 3693, 3689, 3691, + 3686, 3685, 3689, 3693, + 3690, 3694, 3695, 3691, + 3696, 3697, 3695, 3694, + 3698, 3699, 3695, 3697, + 3692, 3691, 3695, 3699, + 3696, 3700, 3701, 3697, + 3702, 3703, 3701, 3700, + 3704, 3705, 3701, 3703, + 3698, 3697, 3701, 3705, + 3702, 3706, 3707, 3703, + 3708, 3709, 3707, 3706, + 3710, 3711, 3707, 3709, + 3704, 3703, 3707, 3711, + 3708, 3712, 3713, 3709, + 3714, 3715, 3713, 3712, + 3716, 3717, 3713, 3715, + 3710, 3709, 3713, 3717, + 3714, 3718, 3719, 3715, + 3720, 3721, 3719, 3718, + 3722, 3723, 3719, 3721, + 3716, 3715, 3719, 3723, + 3720, 3724, 3725, 3721, + 3726, 3727, 3725, 3724, + 3728, 3729, 3725, 3727, + 3722, 3721, 3725, 3729, + 3726, 3730, 3731, 3727, + 3732, 3733, 3731, 3730, + 3734, 3735, 3731, 3733, + 3728, 3727, 3731, 3735, + 3732, 3736, 3737, 3733, + 3738, 3739, 3737, 3736, + 3740, 3741, 3737, 3739, + 3734, 3733, 3737, 3741, + 3738, 3742, 3743, 3739, + 3744, 3745, 3743, 3742, + 3746, 3747, 3743, 3745, + 3740, 3739, 3743, 3747, + 3744, 3748, 3749, 3745, + 3750, 3751, 3749, 3748, + 3752, 3753, 3749, 3751, + 3746, 3745, 3749, 3753, + 3750, 3754, 3755, 3751, + 3756, 3757, 3755, 3754, + 3758, 3759, 3755, 3757, + 3752, 3751, 3755, 3759, + 3756, 3760, 3761, 3757, + 3762, 3763, 3761, 3760, + 3764, 3765, 3761, 3763, + 3758, 3757, 3761, 3765, + 3303, 3573, 3766, 3302, + 3572, 3767, 3766, 3573, + 3768, 3769, 3766, 3767, + 3169, 3302, 3766, 3769, + 3572, 3579, 3770, 3767, + 3578, 3771, 3770, 3579, + 3772, 3773, 3770, 3771, + 3768, 3767, 3770, 3773, + 3578, 3585, 3774, 3771, + 3584, 3775, 3774, 3585, + 3776, 3777, 3774, 3775, + 3772, 3771, 3774, 3777, + 3584, 3591, 3778, 3775, + 3590, 3779, 3778, 3591, + 3780, 3781, 3778, 3779, + 3776, 3775, 3778, 3781, + 3590, 3597, 3782, 3779, + 3596, 3783, 3782, 3597, + 3784, 3785, 3782, 3783, + 3780, 3779, 3782, 3785, + 3596, 3603, 3786, 3783, + 3602, 3787, 3786, 3603, + 3788, 3789, 3786, 3787, + 3784, 3783, 3786, 3789, + 3602, 3609, 3790, 3787, + 3608, 3791, 3790, 3609, + 3792, 3793, 3790, 3791, + 3788, 3787, 3790, 3793, + 3608, 3615, 3794, 3791, + 3614, 3795, 3794, 3615, + 3796, 3797, 3794, 3795, + 3792, 3791, 3794, 3797, + 3614, 3621, 3798, 3795, + 3620, 3799, 3798, 3621, + 3800, 3801, 3798, 3799, + 3796, 3795, 3798, 3801, + 3620, 3627, 3802, 3799, + 3626, 3803, 3802, 3627, + 3804, 3805, 3802, 3803, + 3800, 3799, 3802, 3805, + 3626, 3633, 3806, 3803, + 3632, 3807, 3806, 3633, + 3808, 3809, 3806, 3807, + 3804, 3803, 3806, 3809, + 3632, 3639, 3810, 3807, + 3638, 3811, 3810, 3639, + 3812, 3813, 3810, 3811, + 3808, 3807, 3810, 3813, + 3638, 3645, 3814, 3811, + 3644, 3815, 3814, 3645, + 3816, 3817, 3814, 3815, + 3812, 3811, 3814, 3817, + 3644, 3651, 3818, 3815, + 3650, 3819, 3818, 3651, + 3820, 3821, 3818, 3819, + 3816, 3815, 3818, 3821, + 3650, 3657, 3822, 3819, + 3656, 3823, 3822, 3657, + 3824, 3825, 3822, 3823, + 3820, 3819, 3822, 3825, + 3656, 3663, 3826, 3823, + 3662, 3827, 3826, 3663, + 3828, 3829, 3826, 3827, + 3824, 3823, 3826, 3829, + 3662, 3669, 3830, 3827, + 3668, 3831, 3830, 3669, + 3832, 3833, 3830, 3831, + 3828, 3827, 3830, 3833, + 3668, 3675, 3834, 3831, + 3674, 3835, 3834, 3675, + 3836, 3837, 3834, 3835, + 3832, 3831, 3834, 3837, + 3674, 3681, 3838, 3835, + 3680, 3839, 3838, 3681, + 3840, 3841, 3838, 3839, + 3836, 3835, 3838, 3841, + 3680, 3687, 3842, 3839, + 3686, 3843, 3842, 3687, + 3844, 3845, 3842, 3843, + 3840, 3839, 3842, 3845, + 3686, 3693, 3846, 3843, + 3692, 3847, 3846, 3693, + 3848, 3849, 3846, 3847, + 3844, 3843, 3846, 3849, + 3692, 3699, 3850, 3847, + 3698, 3851, 3850, 3699, + 3852, 3853, 3850, 3851, + 3848, 3847, 3850, 3853, + 3698, 3705, 3854, 3851, + 3704, 3855, 3854, 3705, + 3856, 3857, 3854, 3855, + 3852, 3851, 3854, 3857, + 3704, 3711, 3858, 3855, + 3710, 3859, 3858, 3711, + 3860, 3861, 3858, 3859, + 3856, 3855, 3858, 3861, + 3710, 3717, 3862, 3859, + 3716, 3863, 3862, 3717, + 3864, 3865, 3862, 3863, + 3860, 3859, 3862, 3865, + 3716, 3723, 3866, 3863, + 3722, 3867, 3866, 3723, + 3868, 3869, 3866, 3867, + 3864, 3863, 3866, 3869, + 3722, 3729, 3870, 3867, + 3728, 3871, 3870, 3729, + 3872, 3873, 3870, 3871, + 3868, 3867, 3870, 3873, + 3728, 3735, 3874, 3871, + 3734, 3875, 3874, 3735, + 3876, 3877, 3874, 3875, + 3872, 3871, 3874, 3877, + 3734, 3741, 3878, 3875, + 3740, 3879, 3878, 3741, + 3880, 3881, 3878, 3879, + 3876, 3875, 3878, 3881, + 3740, 3747, 3882, 3879, + 3746, 3883, 3882, 3747, + 3884, 3885, 3882, 3883, + 3880, 3879, 3882, 3885, + 3746, 3753, 3886, 3883, + 3752, 3887, 3886, 3753, + 3888, 3889, 3886, 3887, + 3884, 3883, 3886, 3889, + 3752, 3759, 3890, 3887, + 3758, 3891, 3890, 3759, + 3892, 3893, 3890, 3891, + 3888, 3887, 3890, 3893, + 3758, 3765, 3894, 3891, + 3764, 3895, 3894, 3765, + 3896, 3897, 3894, 3895, + 3892, 3891, 3894, 3897, + 3169, 3769, 3898, 3168, + 3768, 3899, 3898, 3769, + 3900, 3901, 3898, 3899, + 3035, 3168, 3898, 3901, + 3768, 3773, 3902, 3899, + 3772, 3903, 3902, 3773, + 3904, 3905, 3902, 3903, + 3900, 3899, 3902, 3905, + 3772, 3777, 3906, 3903, + 3776, 3907, 3906, 3777, + 3908, 3909, 3906, 3907, + 3904, 3903, 3906, 3909, + 3776, 3781, 3910, 3907, + 3780, 3911, 3910, 3781, + 3912, 3913, 3910, 3911, + 3908, 3907, 3910, 3913, + 3780, 3785, 3914, 3911, + 3784, 3915, 3914, 3785, + 3916, 3917, 3914, 3915, + 3912, 3911, 3914, 3917, + 3784, 3789, 3918, 3915, + 3788, 3919, 3918, 3789, + 3920, 3921, 3918, 3919, + 3916, 3915, 3918, 3921, + 3788, 3793, 3922, 3919, + 3792, 3923, 3922, 3793, + 3924, 3925, 3922, 3923, + 3920, 3919, 3922, 3925, + 3792, 3797, 3926, 3923, + 3796, 3927, 3926, 3797, + 3928, 3929, 3926, 3927, + 3924, 3923, 3926, 3929, + 3796, 3801, 3930, 3927, + 3800, 3931, 3930, 3801, + 3932, 3933, 3930, 3931, + 3928, 3927, 3930, 3933, + 3800, 3805, 3934, 3931, + 3804, 3935, 3934, 3805, + 3936, 3937, 3934, 3935, + 3932, 3931, 3934, 3937, + 3804, 3809, 3938, 3935, + 3808, 3939, 3938, 3809, + 3940, 3941, 3938, 3939, + 3936, 3935, 3938, 3941, + 3808, 3813, 3942, 3939, + 3812, 3943, 3942, 3813, + 3944, 3945, 3942, 3943, + 3940, 3939, 3942, 3945, + 3812, 3817, 3946, 3943, + 3816, 3947, 3946, 3817, + 3948, 3949, 3946, 3947, + 3944, 3943, 3946, 3949, + 3816, 3821, 3950, 3947, + 3820, 3951, 3950, 3821, + 3952, 3953, 3950, 3951, + 3948, 3947, 3950, 3953, + 3820, 3825, 3954, 3951, + 3824, 3955, 3954, 3825, + 3956, 3957, 3954, 3955, + 3952, 3951, 3954, 3957, + 3824, 3829, 3958, 3955, + 3828, 3959, 3958, 3829, + 3960, 3961, 3958, 3959, + 3956, 3955, 3958, 3961, + 3828, 3833, 3962, 3959, + 3832, 3963, 3962, 3833, + 3964, 3965, 3962, 3963, + 3960, 3959, 3962, 3965, + 3832, 3837, 3966, 3963, + 3836, 3967, 3966, 3837, + 3968, 3969, 3966, 3967, + 3964, 3963, 3966, 3969, + 3836, 3841, 3970, 3967, + 3840, 3971, 3970, 3841, + 3972, 3973, 3970, 3971, + 3968, 3967, 3970, 3973, + 3840, 3845, 3974, 3971, + 3844, 3975, 3974, 3845, + 3976, 3977, 3974, 3975, + 3972, 3971, 3974, 3977, + 3844, 3849, 3978, 3975, + 3848, 3979, 3978, 3849, + 3980, 3981, 3978, 3979, + 3976, 3975, 3978, 3981, + 3848, 3853, 3982, 3979, + 3852, 3983, 3982, 3853, + 3984, 3985, 3982, 3983, + 3980, 3979, 3982, 3985, + 3852, 3857, 3986, 3983, + 3856, 3987, 3986, 3857, + 3988, 3989, 3986, 3987, + 3984, 3983, 3986, 3989, + 3856, 3861, 3990, 3987, + 3860, 3991, 3990, 3861, + 3992, 3993, 3990, 3991, + 3988, 3987, 3990, 3993, + 3860, 3865, 3994, 3991, + 3864, 3995, 3994, 3865, + 3996, 3997, 3994, 3995, + 3992, 3991, 3994, 3997, + 3864, 3869, 3998, 3995, + 3868, 3999, 3998, 3869, + 4000, 4001, 3998, 3999, + 3996, 3995, 3998, 4001, + 3868, 3873, 4002, 3999, + 3872, 4003, 4002, 3873, + 4004, 4005, 4002, 4003, + 4000, 3999, 4002, 4005, + 3872, 3877, 4006, 4003, + 3876, 4007, 4006, 3877, + 4008, 4009, 4006, 4007, + 4004, 4003, 4006, 4009, + 3876, 3881, 4010, 4007, + 3880, 4011, 4010, 3881, + 4012, 4013, 4010, 4011, + 4008, 4007, 4010, 4013, + 3880, 3885, 4014, 4011, + 3884, 4015, 4014, 3885, + 4016, 4017, 4014, 4015, + 4012, 4011, 4014, 4017, + 3884, 3889, 4018, 4015, + 3888, 4019, 4018, 3889, + 4020, 4021, 4018, 4019, + 4016, 4015, 4018, 4021, + 3888, 3893, 4022, 4019, + 3892, 4023, 4022, 3893, + 4024, 4025, 4022, 4023, + 4020, 4019, 4022, 4025, + 3892, 3897, 4026, 4023, + 3896, 4027, 4026, 3897, + 4028, 4029, 4026, 4027, + 4024, 4023, 4026, 4029, + 3035, 3901, 4030, 3034, + 3900, 4031, 4030, 3901, + 4032, 4033, 4030, 4031, + 2901, 3034, 4030, 4033, + 3900, 3905, 4034, 4031, + 3904, 4035, 4034, 3905, + 4036, 4037, 4034, 4035, + 4032, 4031, 4034, 4037, + 3904, 3909, 4038, 4035, + 3908, 4039, 4038, 3909, + 4040, 4041, 4038, 4039, + 4036, 4035, 4038, 4041, + 3908, 3913, 4042, 4039, + 3912, 4043, 4042, 3913, + 4044, 4045, 4042, 4043, + 4040, 4039, 4042, 4045, + 3912, 3917, 4046, 4043, + 3916, 4047, 4046, 3917, + 4048, 4049, 4046, 4047, + 4044, 4043, 4046, 4049, + 3916, 3921, 4050, 4047, + 3920, 4051, 4050, 3921, + 4052, 4053, 4050, 4051, + 4048, 4047, 4050, 4053, + 3920, 3925, 4054, 4051, + 3924, 4055, 4054, 3925, + 4056, 4057, 4054, 4055, + 4052, 4051, 4054, 4057, + 3924, 3929, 4058, 4055, + 3928, 4059, 4058, 3929, + 4060, 4061, 4058, 4059, + 4056, 4055, 4058, 4061, + 3928, 3933, 4062, 4059, + 3932, 4063, 4062, 3933, + 4064, 4065, 4062, 4063, + 4060, 4059, 4062, 4065, + 3932, 3937, 4066, 4063, + 3936, 4067, 4066, 3937, + 4068, 4069, 4066, 4067, + 4064, 4063, 4066, 4069, + 3936, 3941, 4070, 4067, + 3940, 4071, 4070, 3941, + 4072, 4073, 4070, 4071, + 4068, 4067, 4070, 4073, + 3940, 3945, 4074, 4071, + 3944, 4075, 4074, 3945, + 4076, 4077, 4074, 4075, + 4072, 4071, 4074, 4077, + 3944, 3949, 4078, 4075, + 3948, 4079, 4078, 3949, + 4080, 4081, 4078, 4079, + 4076, 4075, 4078, 4081, + 3948, 3953, 4082, 4079, + 3952, 4083, 4082, 3953, + 4084, 4085, 4082, 4083, + 4080, 4079, 4082, 4085, + 3952, 3957, 4086, 4083, + 3956, 4087, 4086, 3957, + 4088, 4089, 4086, 4087, + 4084, 4083, 4086, 4089, + 3956, 3961, 4090, 4087, + 3960, 4091, 4090, 3961, + 4092, 4093, 4090, 4091, + 4088, 4087, 4090, 4093, + 3960, 3965, 4094, 4091, + 3964, 4095, 4094, 3965, + 4096, 4097, 4094, 4095, + 4092, 4091, 4094, 4097, + 3964, 3969, 4098, 4095, + 3968, 4099, 4098, 3969, + 4100, 4101, 4098, 4099, + 4096, 4095, 4098, 4101, + 3968, 3973, 4102, 4099, + 3972, 4103, 4102, 3973, + 4104, 4105, 4102, 4103, + 4100, 4099, 4102, 4105, + 3972, 3977, 4106, 4103, + 3976, 4107, 4106, 3977, + 4108, 4109, 4106, 4107, + 4104, 4103, 4106, 4109, + 3976, 3981, 4110, 4107, + 3980, 4111, 4110, 3981, + 4112, 4113, 4110, 4111, + 4108, 4107, 4110, 4113, + 3980, 3985, 4114, 4111, + 3984, 4115, 4114, 3985, + 4116, 4117, 4114, 4115, + 4112, 4111, 4114, 4117, + 3984, 3989, 4118, 4115, + 3988, 4119, 4118, 3989, + 4120, 4121, 4118, 4119, + 4116, 4115, 4118, 4121, + 3988, 3993, 4122, 4119, + 3992, 4123, 4122, 3993, + 4124, 4125, 4122, 4123, + 4120, 4119, 4122, 4125, + 3992, 3997, 4126, 4123, + 3996, 4127, 4126, 3997, + 4128, 4129, 4126, 4127, + 4124, 4123, 4126, 4129, + 3996, 4001, 4130, 4127, + 4000, 4131, 4130, 4001, + 4132, 4133, 4130, 4131, + 4128, 4127, 4130, 4133, + 4000, 4005, 4134, 4131, + 4004, 4135, 4134, 4005, + 4136, 4137, 4134, 4135, + 4132, 4131, 4134, 4137, + 4004, 4009, 4138, 4135, + 4008, 4139, 4138, 4009, + 4140, 4141, 4138, 4139, + 4136, 4135, 4138, 4141, + 4008, 4013, 4142, 4139, + 4012, 4143, 4142, 4013, + 4144, 4145, 4142, 4143, + 4140, 4139, 4142, 4145, + 4012, 4017, 4146, 4143, + 4016, 4147, 4146, 4017, + 4148, 4149, 4146, 4147, + 4144, 4143, 4146, 4149, + 4016, 4021, 4150, 4147, + 4020, 4151, 4150, 4021, + 4152, 4153, 4150, 4151, + 4148, 4147, 4150, 4153, + 4020, 4025, 4154, 4151, + 4024, 4155, 4154, 4025, + 4156, 4157, 4154, 4155, + 4152, 4151, 4154, 4157, + 4024, 4029, 4158, 4155, + 4028, 4159, 4158, 4029, + 4160, 4161, 4158, 4159, + 4156, 4155, 4158, 4161, + 2901, 4033, 4162, 2900, + 4032, 4163, 4162, 4033, + 4164, 4165, 4162, 4163, + 2767, 2900, 4162, 4165, + 4032, 4037, 4166, 4163, + 4036, 4167, 4166, 4037, + 4168, 4169, 4166, 4167, + 4164, 4163, 4166, 4169, + 4036, 4041, 4170, 4167, + 4040, 4171, 4170, 4041, + 4172, 4173, 4170, 4171, + 4168, 4167, 4170, 4173, + 4040, 4045, 4174, 4171, + 4044, 4175, 4174, 4045, + 4176, 4177, 4174, 4175, + 4172, 4171, 4174, 4177, + 4044, 4049, 4178, 4175, + 4048, 4179, 4178, 4049, + 4180, 4181, 4178, 4179, + 4176, 4175, 4178, 4181, + 4048, 4053, 4182, 4179, + 4052, 4183, 4182, 4053, + 4184, 4185, 4182, 4183, + 4180, 4179, 4182, 4185, + 4052, 4057, 4186, 4183, + 4056, 4187, 4186, 4057, + 4188, 4189, 4186, 4187, + 4184, 4183, 4186, 4189, + 4056, 4061, 4190, 4187, + 4060, 4191, 4190, 4061, + 4192, 4193, 4190, 4191, + 4188, 4187, 4190, 4193, + 4060, 4065, 4194, 4191, + 4064, 4195, 4194, 4065, + 4196, 4197, 4194, 4195, + 4192, 4191, 4194, 4197, + 4064, 4069, 4198, 4195, + 4068, 4199, 4198, 4069, + 4200, 4201, 4198, 4199, + 4196, 4195, 4198, 4201, + 4068, 4073, 4202, 4199, + 4072, 4203, 4202, 4073, + 4204, 4205, 4202, 4203, + 4200, 4199, 4202, 4205, + 4072, 4077, 4206, 4203, + 4076, 4207, 4206, 4077, + 4208, 4209, 4206, 4207, + 4204, 4203, 4206, 4209, + 4076, 4081, 4210, 4207, + 4080, 4211, 4210, 4081, + 4212, 4213, 4210, 4211, + 4208, 4207, 4210, 4213, + 4080, 4085, 4214, 4211, + 4084, 4215, 4214, 4085, + 4216, 4217, 4214, 4215, + 4212, 4211, 4214, 4217, + 4084, 4089, 4218, 4215, + 4088, 4219, 4218, 4089, + 4220, 4221, 4218, 4219, + 4216, 4215, 4218, 4221, + 4088, 4093, 4222, 4219, + 4092, 4223, 4222, 4093, + 4224, 4225, 4222, 4223, + 4220, 4219, 4222, 4225, + 4092, 4097, 4226, 4223, + 4096, 4227, 4226, 4097, + 4228, 4229, 4226, 4227, + 4224, 4223, 4226, 4229, + 4096, 4101, 4230, 4227, + 4100, 4231, 4230, 4101, + 4232, 4233, 4230, 4231, + 4228, 4227, 4230, 4233, + 4100, 4105, 4234, 4231, + 4104, 4235, 4234, 4105, + 4236, 4237, 4234, 4235, + 4232, 4231, 4234, 4237, + 4104, 4109, 4238, 4235, + 4108, 4239, 4238, 4109, + 4240, 4241, 4238, 4239, + 4236, 4235, 4238, 4241, + 4108, 4113, 4242, 4239, + 4112, 4243, 4242, 4113, + 4244, 4245, 4242, 4243, + 4240, 4239, 4242, 4245, + 4112, 4117, 4246, 4243, + 4116, 4247, 4246, 4117, + 4248, 4249, 4246, 4247, + 4244, 4243, 4246, 4249, + 4116, 4121, 4250, 4247, + 4120, 4251, 4250, 4121, + 4252, 4253, 4250, 4251, + 4248, 4247, 4250, 4253, + 4120, 4125, 4254, 4251, + 4124, 4255, 4254, 4125, + 4256, 4257, 4254, 4255, + 4252, 4251, 4254, 4257, + 4124, 4129, 4258, 4255, + 4128, 4259, 4258, 4129, + 4260, 4261, 4258, 4259, + 4256, 4255, 4258, 4261, + 4128, 4133, 4262, 4259, + 4132, 4263, 4262, 4133, + 4264, 4265, 4262, 4263, + 4260, 4259, 4262, 4265, + 4132, 4137, 4266, 4263, + 4136, 4267, 4266, 4137, + 4268, 4269, 4266, 4267, + 4264, 4263, 4266, 4269, + 4136, 4141, 4270, 4267, + 4140, 4271, 4270, 4141, + 4272, 4273, 4270, 4271, + 4268, 4267, 4270, 4273, + 4140, 4145, 4274, 4271, + 4144, 4275, 4274, 4145, + 4276, 4277, 4274, 4275, + 4272, 4271, 4274, 4277, + 4144, 4149, 4278, 4275, + 4148, 4279, 4278, 4149, + 4280, 4281, 4278, 4279, + 4276, 4275, 4278, 4281, + 4148, 4153, 4282, 4279, + 4152, 4283, 4282, 4153, + 4284, 4285, 4282, 4283, + 4280, 4279, 4282, 4285, + 4152, 4157, 4286, 4283, + 4156, 4287, 4286, 4157, + 4288, 4289, 4286, 4287, + 4284, 4283, 4286, 4289, + 4156, 4161, 4290, 4287, + 4160, 4291, 4290, 4161, + 4292, 4293, 4290, 4291, + 4288, 4287, 4290, 4293, + 2767, 4165, 4294, 2766, + 4164, 4295, 4294, 4165, + 4296, 4297, 4294, 4295, + 2633, 2766, 4294, 4297, + 4164, 4169, 4298, 4295, + 4168, 4299, 4298, 4169, + 4300, 4301, 4298, 4299, + 4296, 4295, 4298, 4301, + 4168, 4173, 4302, 4299, + 4172, 4303, 4302, 4173, + 4304, 4305, 4302, 4303, + 4300, 4299, 4302, 4305, + 4172, 4177, 4306, 4303, + 4176, 4307, 4306, 4177, + 4308, 4309, 4306, 4307, + 4304, 4303, 4306, 4309, + 4176, 4181, 4310, 4307, + 4180, 4311, 4310, 4181, + 4312, 4313, 4310, 4311, + 4308, 4307, 4310, 4313, + 4180, 4185, 4314, 4311, + 4184, 4315, 4314, 4185, + 4316, 4317, 4314, 4315, + 4312, 4311, 4314, 4317, + 4184, 4189, 4318, 4315, + 4188, 4319, 4318, 4189, + 4320, 4321, 4318, 4319, + 4316, 4315, 4318, 4321, + 4188, 4193, 4322, 4319, + 4192, 4323, 4322, 4193, + 4324, 4325, 4322, 4323, + 4320, 4319, 4322, 4325, + 4192, 4197, 4326, 4323, + 4196, 4327, 4326, 4197, + 4328, 4329, 4326, 4327, + 4324, 4323, 4326, 4329, + 4196, 4201, 4330, 4327, + 4200, 4331, 4330, 4201, + 4332, 4333, 4330, 4331, + 4328, 4327, 4330, 4333, + 4200, 4205, 4334, 4331, + 4204, 4335, 4334, 4205, + 4336, 4337, 4334, 4335, + 4332, 4331, 4334, 4337, + 4204, 4209, 4338, 4335, + 4208, 4339, 4338, 4209, + 4340, 4341, 4338, 4339, + 4336, 4335, 4338, 4341, + 4208, 4213, 4342, 4339, + 4212, 4343, 4342, 4213, + 4344, 4345, 4342, 4343, + 4340, 4339, 4342, 4345, + 4212, 4217, 4346, 4343, + 4216, 4347, 4346, 4217, + 4348, 4349, 4346, 4347, + 4344, 4343, 4346, 4349, + 4216, 4221, 4350, 4347, + 4220, 4351, 4350, 4221, + 4352, 4353, 4350, 4351, + 4348, 4347, 4350, 4353, + 4220, 4225, 4354, 4351, + 4224, 4355, 4354, 4225, + 4356, 4357, 4354, 4355, + 4352, 4351, 4354, 4357, + 4224, 4229, 4358, 4355, + 4228, 4359, 4358, 4229, + 4360, 4361, 4358, 4359, + 4356, 4355, 4358, 4361, + 4228, 4233, 4362, 4359, + 4232, 4363, 4362, 4233, + 4364, 4365, 4362, 4363, + 4360, 4359, 4362, 4365, + 4232, 4237, 4366, 4363, + 4236, 4367, 4366, 4237, + 4368, 4369, 4366, 4367, + 4364, 4363, 4366, 4369, + 4236, 4241, 4370, 4367, + 4240, 4371, 4370, 4241, + 4372, 4373, 4370, 4371, + 4368, 4367, 4370, 4373, + 4240, 4245, 4374, 4371, + 4244, 4375, 4374, 4245, + 4376, 4377, 4374, 4375, + 4372, 4371, 4374, 4377, + 4244, 4249, 4378, 4375, + 4248, 4379, 4378, 4249, + 4380, 4381, 4378, 4379, + 4376, 4375, 4378, 4381, + 4248, 4253, 4382, 4379, + 4252, 4383, 4382, 4253, + 4384, 4385, 4382, 4383, + 4380, 4379, 4382, 4385, + 4252, 4257, 4386, 4383, + 4256, 4387, 4386, 4257, + 4388, 4389, 4386, 4387, + 4384, 4383, 4386, 4389, + 4256, 4261, 4390, 4387, + 4260, 4391, 4390, 4261, + 4392, 4393, 4390, 4391, + 4388, 4387, 4390, 4393, + 4260, 4265, 4394, 4391, + 4264, 4395, 4394, 4265, + 4396, 4397, 4394, 4395, + 4392, 4391, 4394, 4397, + 4264, 4269, 4398, 4395, + 4268, 4399, 4398, 4269, + 4400, 4401, 4398, 4399, + 4396, 4395, 4398, 4401, + 4268, 4273, 4402, 4399, + 4272, 4403, 4402, 4273, + 4404, 4405, 4402, 4403, + 4400, 4399, 4402, 4405, + 4272, 4277, 4406, 4403, + 4276, 4407, 4406, 4277, + 4408, 4409, 4406, 4407, + 4404, 4403, 4406, 4409, + 4276, 4281, 4410, 4407, + 4280, 4411, 4410, 4281, + 4412, 4413, 4410, 4411, + 4408, 4407, 4410, 4413, + 4280, 4285, 4414, 4411, + 4284, 4415, 4414, 4285, + 4416, 4417, 4414, 4415, + 4412, 4411, 4414, 4417, + 4284, 4289, 4418, 4415, + 4288, 4419, 4418, 4289, + 4420, 4421, 4418, 4419, + 4416, 4415, 4418, 4421, + 4288, 4293, 4422, 4419, + 4292, 4423, 4422, 4293, + 4424, 4425, 4422, 4423, + 4420, 4419, 4422, 4425, + 2633, 4297, 4426, 2632, + 4296, 4427, 4426, 4297, + 4428, 4429, 4426, 4427, + 2499, 2632, 4426, 4429, + 4296, 4301, 4430, 4427, + 4300, 4431, 4430, 4301, + 4432, 4433, 4430, 4431, + 4428, 4427, 4430, 4433, + 4300, 4305, 4434, 4431, + 4304, 4435, 4434, 4305, + 4436, 4437, 4434, 4435, + 4432, 4431, 4434, 4437, + 4304, 4309, 4438, 4435, + 4308, 4439, 4438, 4309, + 4440, 4441, 4438, 4439, + 4436, 4435, 4438, 4441, + 4308, 4313, 4442, 4439, + 4312, 4443, 4442, 4313, + 4444, 4445, 4442, 4443, + 4440, 4439, 4442, 4445, + 4312, 4317, 4446, 4443, + 4316, 4447, 4446, 4317, + 4448, 4449, 4446, 4447, + 4444, 4443, 4446, 4449, + 4316, 4321, 4450, 4447, + 4320, 4451, 4450, 4321, + 4452, 4453, 4450, 4451, + 4448, 4447, 4450, 4453, + 4320, 4325, 4454, 4451, + 4324, 4455, 4454, 4325, + 4456, 4457, 4454, 4455, + 4452, 4451, 4454, 4457, + 4324, 4329, 4458, 4455, + 4328, 4459, 4458, 4329, + 4460, 4461, 4458, 4459, + 4456, 4455, 4458, 4461, + 4328, 4333, 4462, 4459, + 4332, 4463, 4462, 4333, + 4464, 4465, 4462, 4463, + 4460, 4459, 4462, 4465, + 4332, 4337, 4466, 4463, + 4336, 4467, 4466, 4337, + 4468, 4469, 4466, 4467, + 4464, 4463, 4466, 4469, + 4336, 4341, 4470, 4467, + 4340, 4471, 4470, 4341, + 4472, 4473, 4470, 4471, + 4468, 4467, 4470, 4473, + 4340, 4345, 4474, 4471, + 4344, 4475, 4474, 4345, + 4476, 4477, 4474, 4475, + 4472, 4471, 4474, 4477, + 4344, 4349, 4478, 4475, + 4348, 4479, 4478, 4349, + 4480, 4481, 4478, 4479, + 4476, 4475, 4478, 4481, + 4348, 4353, 4482, 4479, + 4352, 4483, 4482, 4353, + 4484, 4485, 4482, 4483, + 4480, 4479, 4482, 4485, + 4352, 4357, 4486, 4483, + 4356, 4487, 4486, 4357, + 4488, 4489, 4486, 4487, + 4484, 4483, 4486, 4489, + 4356, 4361, 4490, 4487, + 4360, 4491, 4490, 4361, + 4492, 4493, 4490, 4491, + 4488, 4487, 4490, 4493, + 4360, 4365, 4494, 4491, + 4364, 4495, 4494, 4365, + 4496, 4497, 4494, 4495, + 4492, 4491, 4494, 4497, + 4364, 4369, 4498, 4495, + 4368, 4499, 4498, 4369, + 4500, 4501, 4498, 4499, + 4496, 4495, 4498, 4501, + 4368, 4373, 4502, 4499, + 4372, 4503, 4502, 4373, + 4504, 4505, 4502, 4503, + 4500, 4499, 4502, 4505, + 4372, 4377, 4506, 4503, + 4376, 4507, 4506, 4377, + 4508, 4509, 4506, 4507, + 4504, 4503, 4506, 4509, + 4376, 4381, 4510, 4507, + 4380, 4511, 4510, 4381, + 4512, 4513, 4510, 4511, + 4508, 4507, 4510, 4513, + 4380, 4385, 4514, 4511, + 4384, 4515, 4514, 4385, + 4516, 4517, 4514, 4515, + 4512, 4511, 4514, 4517, + 4384, 4389, 4518, 4515, + 4388, 4519, 4518, 4389, + 4520, 4521, 4518, 4519, + 4516, 4515, 4518, 4521, + 4388, 4393, 4522, 4519, + 4392, 4523, 4522, 4393, + 4524, 4525, 4522, 4523, + 4520, 4519, 4522, 4525, + 4392, 4397, 4526, 4523, + 4396, 4527, 4526, 4397, + 4528, 4529, 4526, 4527, + 4524, 4523, 4526, 4529, + 4396, 4401, 4530, 4527, + 4400, 4531, 4530, 4401, + 4532, 4533, 4530, 4531, + 4528, 4527, 4530, 4533, + 4400, 4405, 4534, 4531, + 4404, 4535, 4534, 4405, + 4536, 4537, 4534, 4535, + 4532, 4531, 4534, 4537, + 4404, 4409, 4538, 4535, + 4408, 4539, 4538, 4409, + 4540, 4541, 4538, 4539, + 4536, 4535, 4538, 4541, + 4408, 4413, 4542, 4539, + 4412, 4543, 4542, 4413, + 4544, 4545, 4542, 4543, + 4540, 4539, 4542, 4545, + 4412, 4417, 4546, 4543, + 4416, 4547, 4546, 4417, + 4548, 4549, 4546, 4547, + 4544, 4543, 4546, 4549, + 4416, 4421, 4550, 4547, + 4420, 4551, 4550, 4421, + 4552, 4553, 4550, 4551, + 4548, 4547, 4550, 4553, + 4420, 4425, 4554, 4551, + 4424, 4555, 4554, 4425, + 4556, 4557, 4554, 4555, + 4552, 4551, 4554, 4557, + 2499, 4429, 4558, 2498, + 4428, 4559, 4558, 4429, + 4560, 4561, 4558, 4559, + 2365, 2498, 4558, 4561, + 4428, 4433, 4562, 4559, + 4432, 4563, 4562, 4433, + 4564, 4565, 4562, 4563, + 4560, 4559, 4562, 4565, + 4432, 4437, 4566, 4563, + 4436, 4567, 4566, 4437, + 4568, 4569, 4566, 4567, + 4564, 4563, 4566, 4569, + 4436, 4441, 4570, 4567, + 4440, 4571, 4570, 4441, + 4572, 4573, 4570, 4571, + 4568, 4567, 4570, 4573, + 4440, 4445, 4574, 4571, + 4444, 4575, 4574, 4445, + 4576, 4577, 4574, 4575, + 4572, 4571, 4574, 4577, + 4444, 4449, 4578, 4575, + 4448, 4579, 4578, 4449, + 4580, 4581, 4578, 4579, + 4576, 4575, 4578, 4581, + 4448, 4453, 4582, 4579, + 4452, 4583, 4582, 4453, + 4584, 4585, 4582, 4583, + 4580, 4579, 4582, 4585, + 4452, 4457, 4586, 4583, + 4456, 4587, 4586, 4457, + 4588, 4589, 4586, 4587, + 4584, 4583, 4586, 4589, + 4456, 4461, 4590, 4587, + 4460, 4591, 4590, 4461, + 4592, 4593, 4590, 4591, + 4588, 4587, 4590, 4593, + 4460, 4465, 4594, 4591, + 4464, 4595, 4594, 4465, + 4596, 4597, 4594, 4595, + 4592, 4591, 4594, 4597, + 4464, 4469, 4598, 4595, + 4468, 4599, 4598, 4469, + 4600, 4601, 4598, 4599, + 4596, 4595, 4598, 4601, + 4468, 4473, 4602, 4599, + 4472, 4603, 4602, 4473, + 4604, 4605, 4602, 4603, + 4600, 4599, 4602, 4605, + 4472, 4477, 4606, 4603, + 4476, 4607, 4606, 4477, + 4608, 4609, 4606, 4607, + 4604, 4603, 4606, 4609, + 4476, 4481, 4610, 4607, + 4480, 4611, 4610, 4481, + 4612, 4613, 4610, 4611, + 4608, 4607, 4610, 4613, + 4480, 4485, 4614, 4611, + 4484, 4615, 4614, 4485, + 4616, 4617, 4614, 4615, + 4612, 4611, 4614, 4617, + 4484, 4489, 4618, 4615, + 4488, 4619, 4618, 4489, + 4620, 4621, 4618, 4619, + 4616, 4615, 4618, 4621, + 4488, 4493, 4622, 4619, + 4492, 4623, 4622, 4493, + 4624, 4625, 4622, 4623, + 4620, 4619, 4622, 4625, + 4492, 4497, 4626, 4623, + 4496, 4627, 4626, 4497, + 4628, 4629, 4626, 4627, + 4624, 4623, 4626, 4629, + 4496, 4501, 4630, 4627, + 4500, 4631, 4630, 4501, + 4632, 4633, 4630, 4631, + 4628, 4627, 4630, 4633, + 4500, 4505, 4634, 4631, + 4504, 4635, 4634, 4505, + 4636, 4637, 4634, 4635, + 4632, 4631, 4634, 4637, + 4504, 4509, 4638, 4635, + 4508, 4639, 4638, 4509, + 4640, 4641, 4638, 4639, + 4636, 4635, 4638, 4641, + 4508, 4513, 4642, 4639, + 4512, 4643, 4642, 4513, + 4644, 4645, 4642, 4643, + 4640, 4639, 4642, 4645, + 4512, 4517, 4646, 4643, + 4516, 4647, 4646, 4517, + 4648, 4649, 4646, 4647, + 4644, 4643, 4646, 4649, + 4516, 4521, 4650, 4647, + 4520, 4651, 4650, 4521, + 4652, 4653, 4650, 4651, + 4648, 4647, 4650, 4653, + 4520, 4525, 4654, 4651, + 4524, 4655, 4654, 4525, + 4656, 4657, 4654, 4655, + 4652, 4651, 4654, 4657, + 4524, 4529, 4658, 4655, + 4528, 4659, 4658, 4529, + 4660, 4661, 4658, 4659, + 4656, 4655, 4658, 4661, + 4528, 4533, 4662, 4659, + 4532, 4663, 4662, 4533, + 4664, 4665, 4662, 4663, + 4660, 4659, 4662, 4665, + 4532, 4537, 4666, 4663, + 4536, 4667, 4666, 4537, + 4668, 4669, 4666, 4667, + 4664, 4663, 4666, 4669, + 4536, 4541, 4670, 4667, + 4540, 4671, 4670, 4541, + 4672, 4673, 4670, 4671, + 4668, 4667, 4670, 4673, + 4540, 4545, 4674, 4671, + 4544, 4675, 4674, 4545, + 4676, 4677, 4674, 4675, + 4672, 4671, 4674, 4677, + 4544, 4549, 4678, 4675, + 4548, 4679, 4678, 4549, + 4680, 4681, 4678, 4679, + 4676, 4675, 4678, 4681, + 4548, 4553, 4682, 4679, + 4552, 4683, 4682, 4553, + 4684, 4685, 4682, 4683, + 4680, 4679, 4682, 4685, + 4552, 4557, 4686, 4683, + 4556, 4687, 4686, 4557, + 4688, 4689, 4686, 4687, + 4684, 4683, 4686, 4689, + 2365, 4561, 4690, 2364, + 4560, 4691, 4690, 4561, + 4692, 4693, 4690, 4691, + 2231, 2364, 4690, 4693, + 4560, 4565, 4694, 4691, + 4564, 4695, 4694, 4565, + 4696, 4697, 4694, 4695, + 4692, 4691, 4694, 4697, + 4564, 4569, 4698, 4695, + 4568, 4699, 4698, 4569, + 4700, 4701, 4698, 4699, + 4696, 4695, 4698, 4701, + 4568, 4573, 4702, 4699, + 4572, 4703, 4702, 4573, + 4704, 4705, 4702, 4703, + 4700, 4699, 4702, 4705, + 4572, 4577, 4706, 4703, + 4576, 4707, 4706, 4577, + 4708, 4709, 4706, 4707, + 4704, 4703, 4706, 4709, + 4576, 4581, 4710, 4707, + 4580, 4711, 4710, 4581, + 4712, 4713, 4710, 4711, + 4708, 4707, 4710, 4713, + 4580, 4585, 4714, 4711, + 4584, 4715, 4714, 4585, + 4716, 4717, 4714, 4715, + 4712, 4711, 4714, 4717, + 4584, 4589, 4718, 4715, + 4588, 4719, 4718, 4589, + 4720, 4721, 4718, 4719, + 4716, 4715, 4718, 4721, + 4588, 4593, 4722, 4719, + 4592, 4723, 4722, 4593, + 4724, 4725, 4722, 4723, + 4720, 4719, 4722, 4725, + 4592, 4597, 4726, 4723, + 4596, 4727, 4726, 4597, + 4728, 4729, 4726, 4727, + 4724, 4723, 4726, 4729, + 4596, 4601, 4730, 4727, + 4600, 4731, 4730, 4601, + 4732, 4733, 4730, 4731, + 4728, 4727, 4730, 4733, + 4600, 4605, 4734, 4731, + 4604, 4735, 4734, 4605, + 4736, 4737, 4734, 4735, + 4732, 4731, 4734, 4737, + 4604, 4609, 4738, 4735, + 4608, 4739, 4738, 4609, + 4740, 4741, 4738, 4739, + 4736, 4735, 4738, 4741, + 4608, 4613, 4742, 4739, + 4612, 4743, 4742, 4613, + 4744, 4745, 4742, 4743, + 4740, 4739, 4742, 4745, + 4612, 4617, 4746, 4743, + 4616, 4747, 4746, 4617, + 4748, 4749, 4746, 4747, + 4744, 4743, 4746, 4749, + 4616, 4621, 4750, 4747, + 4620, 4751, 4750, 4621, + 4752, 4753, 4750, 4751, + 4748, 4747, 4750, 4753, + 4620, 4625, 4754, 4751, + 4624, 4755, 4754, 4625, + 4756, 4757, 4754, 4755, + 4752, 4751, 4754, 4757, + 4624, 4629, 4758, 4755, + 4628, 4759, 4758, 4629, + 4760, 4761, 4758, 4759, + 4756, 4755, 4758, 4761, + 4628, 4633, 4762, 4759, + 4632, 4763, 4762, 4633, + 4764, 4765, 4762, 4763, + 4760, 4759, 4762, 4765, + 4632, 4637, 4766, 4763, + 4636, 4767, 4766, 4637, + 4768, 4769, 4766, 4767, + 4764, 4763, 4766, 4769, + 4636, 4641, 4770, 4767, + 4640, 4771, 4770, 4641, + 4772, 4773, 4770, 4771, + 4768, 4767, 4770, 4773, + 4640, 4645, 4774, 4771, + 4644, 4775, 4774, 4645, + 4776, 4777, 4774, 4775, + 4772, 4771, 4774, 4777, + 4644, 4649, 4778, 4775, + 4648, 4779, 4778, 4649, + 4780, 4781, 4778, 4779, + 4776, 4775, 4778, 4781, + 4648, 4653, 4782, 4779, + 4652, 4783, 4782, 4653, + 4784, 4785, 4782, 4783, + 4780, 4779, 4782, 4785, + 4652, 4657, 4786, 4783, + 4656, 4787, 4786, 4657, + 4788, 4789, 4786, 4787, + 4784, 4783, 4786, 4789, + 4656, 4661, 4790, 4787, + 4660, 4791, 4790, 4661, + 4792, 4793, 4790, 4791, + 4788, 4787, 4790, 4793, + 4660, 4665, 4794, 4791, + 4664, 4795, 4794, 4665, + 4796, 4797, 4794, 4795, + 4792, 4791, 4794, 4797, + 4664, 4669, 4798, 4795, + 4668, 4799, 4798, 4669, + 4800, 4801, 4798, 4799, + 4796, 4795, 4798, 4801, + 4668, 4673, 4802, 4799, + 4672, 4803, 4802, 4673, + 4804, 4805, 4802, 4803, + 4800, 4799, 4802, 4805, + 4672, 4677, 4806, 4803, + 4676, 4807, 4806, 4677, + 4808, 4809, 4806, 4807, + 4804, 4803, 4806, 4809, + 4676, 4681, 4810, 4807, + 4680, 4811, 4810, 4681, + 4812, 4813, 4810, 4811, + 4808, 4807, 4810, 4813, + 4680, 4685, 4814, 4811, + 4684, 4815, 4814, 4685, + 4816, 4817, 4814, 4815, + 4812, 4811, 4814, 4817, + 4684, 4689, 4818, 4815, + 4688, 4819, 4818, 4689, + 4820, 4821, 4818, 4819, + 4816, 4815, 4818, 4821, + 2231, 4693, 4822, 2230, + 4692, 4823, 4822, 4693, + 4824, 4825, 4822, 4823, + 2097, 2230, 4822, 4825, + 4692, 4697, 4826, 4823, + 4696, 4827, 4826, 4697, + 4828, 4829, 4826, 4827, + 4824, 4823, 4826, 4829, + 4696, 4701, 4830, 4827, + 4700, 4831, 4830, 4701, + 4832, 4833, 4830, 4831, + 4828, 4827, 4830, 4833, + 4700, 4705, 4834, 4831, + 4704, 4835, 4834, 4705, + 4836, 4837, 4834, 4835, + 4832, 4831, 4834, 4837, + 4704, 4709, 4838, 4835, + 4708, 4839, 4838, 4709, + 4840, 4841, 4838, 4839, + 4836, 4835, 4838, 4841, + 4708, 4713, 4842, 4839, + 4712, 4843, 4842, 4713, + 4844, 4845, 4842, 4843, + 4840, 4839, 4842, 4845, + 4712, 4717, 4846, 4843, + 4716, 4847, 4846, 4717, + 4848, 4849, 4846, 4847, + 4844, 4843, 4846, 4849, + 4716, 4721, 4850, 4847, + 4720, 4851, 4850, 4721, + 4852, 4853, 4850, 4851, + 4848, 4847, 4850, 4853, + 4720, 4725, 4854, 4851, + 4724, 4855, 4854, 4725, + 4856, 4857, 4854, 4855, + 4852, 4851, 4854, 4857, + 4724, 4729, 4858, 4855, + 4728, 4859, 4858, 4729, + 4860, 4861, 4858, 4859, + 4856, 4855, 4858, 4861, + 4728, 4733, 4862, 4859, + 4732, 4863, 4862, 4733, + 4864, 4865, 4862, 4863, + 4860, 4859, 4862, 4865, + 4732, 4737, 4866, 4863, + 4736, 4867, 4866, 4737, + 4868, 4869, 4866, 4867, + 4864, 4863, 4866, 4869, + 4736, 4741, 4870, 4867, + 4740, 4871, 4870, 4741, + 4872, 4873, 4870, 4871, + 4868, 4867, 4870, 4873, + 4740, 4745, 4874, 4871, + 4744, 4875, 4874, 4745, + 4876, 4877, 4874, 4875, + 4872, 4871, 4874, 4877, + 4744, 4749, 4878, 4875, + 4748, 4879, 4878, 4749, + 4880, 4881, 4878, 4879, + 4876, 4875, 4878, 4881, + 4748, 4753, 4882, 4879, + 4752, 4883, 4882, 4753, + 4884, 4885, 4882, 4883, + 4880, 4879, 4882, 4885, + 4752, 4757, 4886, 4883, + 4756, 4887, 4886, 4757, + 4888, 4889, 4886, 4887, + 4884, 4883, 4886, 4889, + 4756, 4761, 4890, 4887, + 4760, 4891, 4890, 4761, + 4892, 4893, 4890, 4891, + 4888, 4887, 4890, 4893, + 4760, 4765, 4894, 4891, + 4764, 4895, 4894, 4765, + 4896, 4897, 4894, 4895, + 4892, 4891, 4894, 4897, + 4764, 4769, 4898, 4895, + 4768, 4899, 4898, 4769, + 4900, 4901, 4898, 4899, + 4896, 4895, 4898, 4901, + 4768, 4773, 4902, 4899, + 4772, 4903, 4902, 4773, + 4904, 4905, 4902, 4903, + 4900, 4899, 4902, 4905, + 4772, 4777, 4906, 4903, + 4776, 4907, 4906, 4777, + 4908, 4909, 4906, 4907, + 4904, 4903, 4906, 4909, + 4776, 4781, 4910, 4907, + 4780, 4911, 4910, 4781, + 4912, 4913, 4910, 4911, + 4908, 4907, 4910, 4913, + 4780, 4785, 4914, 4911, + 4784, 4915, 4914, 4785, + 4916, 4917, 4914, 4915, + 4912, 4911, 4914, 4917, + 4784, 4789, 4918, 4915, + 4788, 4919, 4918, 4789, + 4920, 4921, 4918, 4919, + 4916, 4915, 4918, 4921, + 4788, 4793, 4922, 4919, + 4792, 4923, 4922, 4793, + 4924, 4925, 4922, 4923, + 4920, 4919, 4922, 4925, + 4792, 4797, 4926, 4923, + 4796, 4927, 4926, 4797, + 4928, 4929, 4926, 4927, + 4924, 4923, 4926, 4929, + 4796, 4801, 4930, 4927, + 4800, 4931, 4930, 4801, + 4932, 4933, 4930, 4931, + 4928, 4927, 4930, 4933, + 4800, 4805, 4934, 4931, + 4804, 4935, 4934, 4805, + 4936, 4937, 4934, 4935, + 4932, 4931, 4934, 4937, + 4804, 4809, 4938, 4935, + 4808, 4939, 4938, 4809, + 4940, 4941, 4938, 4939, + 4936, 4935, 4938, 4941, + 4808, 4813, 4942, 4939, + 4812, 4943, 4942, 4813, + 4944, 4945, 4942, 4943, + 4940, 4939, 4942, 4945, + 4812, 4817, 4946, 4943, + 4816, 4947, 4946, 4817, + 4948, 4949, 4946, 4947, + 4944, 4943, 4946, 4949, + 4816, 4821, 4950, 4947, + 4820, 4951, 4950, 4821, + 4952, 4953, 4950, 4951, + 4948, 4947, 4950, 4953, + 2097, 4825, 4954, 2096, + 4824, 4955, 4954, 4825, + 4956, 4957, 4954, 4955, + 1963, 2096, 4954, 4957, + 4824, 4829, 4958, 4955, + 4828, 4959, 4958, 4829, + 4960, 4961, 4958, 4959, + 4956, 4955, 4958, 4961, + 4828, 4833, 4962, 4959, + 4832, 4963, 4962, 4833, + 4964, 4965, 4962, 4963, + 4960, 4959, 4962, 4965, + 4832, 4837, 4966, 4963, + 4836, 4967, 4966, 4837, + 4968, 4969, 4966, 4967, + 4964, 4963, 4966, 4969, + 4836, 4841, 4970, 4967, + 4840, 4971, 4970, 4841, + 4972, 4973, 4970, 4971, + 4968, 4967, 4970, 4973, + 4840, 4845, 4974, 4971, + 4844, 4975, 4974, 4845, + 4976, 4977, 4974, 4975, + 4972, 4971, 4974, 4977, + 4844, 4849, 4978, 4975, + 4848, 4979, 4978, 4849, + 4980, 4981, 4978, 4979, + 4976, 4975, 4978, 4981, + 4848, 4853, 4982, 4979, + 4852, 4983, 4982, 4853, + 4984, 4985, 4982, 4983, + 4980, 4979, 4982, 4985, + 4852, 4857, 4986, 4983, + 4856, 4987, 4986, 4857, + 4988, 4989, 4986, 4987, + 4984, 4983, 4986, 4989, + 4856, 4861, 4990, 4987, + 4860, 4991, 4990, 4861, + 4992, 4993, 4990, 4991, + 4988, 4987, 4990, 4993, + 4860, 4865, 4994, 4991, + 4864, 4995, 4994, 4865, + 4996, 4997, 4994, 4995, + 4992, 4991, 4994, 4997, + 4864, 4869, 4998, 4995, + 4868, 4999, 4998, 4869, + 5000, 5001, 4998, 4999, + 4996, 4995, 4998, 5001, + 4868, 4873, 5002, 4999, + 4872, 5003, 5002, 4873, + 5004, 5005, 5002, 5003, + 5000, 4999, 5002, 5005, + 4872, 4877, 5006, 5003, + 4876, 5007, 5006, 4877, + 5008, 5009, 5006, 5007, + 5004, 5003, 5006, 5009, + 4876, 4881, 5010, 5007, + 4880, 5011, 5010, 4881, + 5012, 5013, 5010, 5011, + 5008, 5007, 5010, 5013, + 4880, 4885, 5014, 5011, + 4884, 5015, 5014, 4885, + 5016, 5017, 5014, 5015, + 5012, 5011, 5014, 5017, + 4884, 4889, 5018, 5015, + 4888, 5019, 5018, 4889, + 5020, 5021, 5018, 5019, + 5016, 5015, 5018, 5021, + 4888, 4893, 5022, 5019, + 4892, 5023, 5022, 4893, + 5024, 5025, 5022, 5023, + 5020, 5019, 5022, 5025, + 4892, 4897, 5026, 5023, + 4896, 5027, 5026, 4897, + 5028, 5029, 5026, 5027, + 5024, 5023, 5026, 5029, + 4896, 4901, 5030, 5027, + 4900, 5031, 5030, 4901, + 5032, 5033, 5030, 5031, + 5028, 5027, 5030, 5033, + 4900, 4905, 5034, 5031, + 4904, 5035, 5034, 4905, + 5036, 5037, 5034, 5035, + 5032, 5031, 5034, 5037, + 4904, 4909, 5038, 5035, + 4908, 5039, 5038, 4909, + 5040, 5041, 5038, 5039, + 5036, 5035, 5038, 5041, + 4908, 4913, 5042, 5039, + 4912, 5043, 5042, 4913, + 5044, 5045, 5042, 5043, + 5040, 5039, 5042, 5045, + 4912, 4917, 5046, 5043, + 4916, 5047, 5046, 4917, + 5048, 5049, 5046, 5047, + 5044, 5043, 5046, 5049, + 4916, 4921, 5050, 5047, + 4920, 5051, 5050, 4921, + 5052, 5053, 5050, 5051, + 5048, 5047, 5050, 5053, + 4920, 4925, 5054, 5051, + 4924, 5055, 5054, 4925, + 5056, 5057, 5054, 5055, + 5052, 5051, 5054, 5057, + 4924, 4929, 5058, 5055, + 4928, 5059, 5058, 4929, + 5060, 5061, 5058, 5059, + 5056, 5055, 5058, 5061, + 4928, 4933, 5062, 5059, + 4932, 5063, 5062, 4933, + 5064, 5065, 5062, 5063, + 5060, 5059, 5062, 5065, + 4932, 4937, 5066, 5063, + 4936, 5067, 5066, 4937, + 5068, 5069, 5066, 5067, + 5064, 5063, 5066, 5069, + 4936, 4941, 5070, 5067, + 4940, 5071, 5070, 4941, + 5072, 5073, 5070, 5071, + 5068, 5067, 5070, 5073, + 4940, 4945, 5074, 5071, + 4944, 5075, 5074, 4945, + 5076, 5077, 5074, 5075, + 5072, 5071, 5074, 5077, + 4944, 4949, 5078, 5075, + 4948, 5079, 5078, 4949, + 5080, 5081, 5078, 5079, + 5076, 5075, 5078, 5081, + 4948, 4953, 5082, 5079, + 4952, 5083, 5082, 4953, + 5084, 5085, 5082, 5083, + 5080, 5079, 5082, 5085, + 1963, 4957, 5086, 1962, + 4956, 5087, 5086, 4957, + 5088, 5089, 5086, 5087, + 1829, 1962, 5086, 5089, + 4956, 4961, 5090, 5087, + 4960, 5091, 5090, 4961, + 5092, 5093, 5090, 5091, + 5088, 5087, 5090, 5093, + 4960, 4965, 5094, 5091, + 4964, 5095, 5094, 4965, + 5096, 5097, 5094, 5095, + 5092, 5091, 5094, 5097, + 4964, 4969, 5098, 5095, + 4968, 5099, 5098, 4969, + 5100, 5101, 5098, 5099, + 5096, 5095, 5098, 5101, + 4968, 4973, 5102, 5099, + 4972, 5103, 5102, 4973, + 5104, 5105, 5102, 5103, + 5100, 5099, 5102, 5105, + 4972, 4977, 5106, 5103, + 4976, 5107, 5106, 4977, + 5108, 5109, 5106, 5107, + 5104, 5103, 5106, 5109, + 4976, 4981, 5110, 5107, + 4980, 5111, 5110, 4981, + 5112, 5113, 5110, 5111, + 5108, 5107, 5110, 5113, + 4980, 4985, 5114, 5111, + 4984, 5115, 5114, 4985, + 5116, 5117, 5114, 5115, + 5112, 5111, 5114, 5117, + 4984, 4989, 5118, 5115, + 4988, 5119, 5118, 4989, + 5120, 5121, 5118, 5119, + 5116, 5115, 5118, 5121, + 4988, 4993, 5122, 5119, + 4992, 5123, 5122, 4993, + 5124, 5125, 5122, 5123, + 5120, 5119, 5122, 5125, + 4992, 4997, 5126, 5123, + 4996, 5127, 5126, 4997, + 5128, 5129, 5126, 5127, + 5124, 5123, 5126, 5129, + 4996, 5001, 5130, 5127, + 5000, 5131, 5130, 5001, + 5132, 5133, 5130, 5131, + 5128, 5127, 5130, 5133, + 5000, 5005, 5134, 5131, + 5004, 5135, 5134, 5005, + 5136, 5137, 5134, 5135, + 5132, 5131, 5134, 5137, + 5004, 5009, 5138, 5135, + 5008, 5139, 5138, 5009, + 5140, 5141, 5138, 5139, + 5136, 5135, 5138, 5141, + 5008, 5013, 5142, 5139, + 5012, 5143, 5142, 5013, + 5144, 5145, 5142, 5143, + 5140, 5139, 5142, 5145, + 5012, 5017, 5146, 5143, + 5016, 5147, 5146, 5017, + 5148, 5149, 5146, 5147, + 5144, 5143, 5146, 5149, + 5016, 5021, 5150, 5147, + 5020, 5151, 5150, 5021, + 5152, 5153, 5150, 5151, + 5148, 5147, 5150, 5153, + 5020, 5025, 5154, 5151, + 5024, 5155, 5154, 5025, + 5156, 5157, 5154, 5155, + 5152, 5151, 5154, 5157, + 5024, 5029, 5158, 5155, + 5028, 5159, 5158, 5029, + 5160, 5161, 5158, 5159, + 5156, 5155, 5158, 5161, + 5028, 5033, 5162, 5159, + 5032, 5163, 5162, 5033, + 5164, 5165, 5162, 5163, + 5160, 5159, 5162, 5165, + 5032, 5037, 5166, 5163, + 5036, 5167, 5166, 5037, + 5168, 5169, 5166, 5167, + 5164, 5163, 5166, 5169, + 5036, 5041, 5170, 5167, + 5040, 5171, 5170, 5041, + 5172, 5173, 5170, 5171, + 5168, 5167, 5170, 5173, + 5040, 5045, 5174, 5171, + 5044, 5175, 5174, 5045, + 5176, 5177, 5174, 5175, + 5172, 5171, 5174, 5177, + 5044, 5049, 5178, 5175, + 5048, 5179, 5178, 5049, + 5180, 5181, 5178, 5179, + 5176, 5175, 5178, 5181, + 5048, 5053, 5182, 5179, + 5052, 5183, 5182, 5053, + 5184, 5185, 5182, 5183, + 5180, 5179, 5182, 5185, + 5052, 5057, 5186, 5183, + 5056, 5187, 5186, 5057, + 5188, 5189, 5186, 5187, + 5184, 5183, 5186, 5189, + 5056, 5061, 5190, 5187, + 5060, 5191, 5190, 5061, + 5192, 5193, 5190, 5191, + 5188, 5187, 5190, 5193, + 5060, 5065, 5194, 5191, + 5064, 5195, 5194, 5065, + 5196, 5197, 5194, 5195, + 5192, 5191, 5194, 5197, + 5064, 5069, 5198, 5195, + 5068, 5199, 5198, 5069, + 5200, 5201, 5198, 5199, + 5196, 5195, 5198, 5201, + 5068, 5073, 5202, 5199, + 5072, 5203, 5202, 5073, + 5204, 5205, 5202, 5203, + 5200, 5199, 5202, 5205, + 5072, 5077, 5206, 5203, + 5076, 5207, 5206, 5077, + 5208, 5209, 5206, 5207, + 5204, 5203, 5206, 5209, + 5076, 5081, 5210, 5207, + 5080, 5211, 5210, 5081, + 5212, 5213, 5210, 5211, + 5208, 5207, 5210, 5213, + 5080, 5085, 5214, 5211, + 5084, 5215, 5214, 5085, + 5216, 5217, 5214, 5215, + 5212, 5211, 5214, 5217, + 1829, 5089, 5218, 1828, + 5088, 5219, 5218, 5089, + 5220, 5221, 5218, 5219, + 1695, 1828, 5218, 5221, + 5088, 5093, 5222, 5219, + 5092, 5223, 5222, 5093, + 5224, 5225, 5222, 5223, + 5220, 5219, 5222, 5225, + 5092, 5097, 5226, 5223, + 5096, 5227, 5226, 5097, + 5228, 5229, 5226, 5227, + 5224, 5223, 5226, 5229, + 5096, 5101, 5230, 5227, + 5100, 5231, 5230, 5101, + 5232, 5233, 5230, 5231, + 5228, 5227, 5230, 5233, + 5100, 5105, 5234, 5231, + 5104, 5235, 5234, 5105, + 5236, 5237, 5234, 5235, + 5232, 5231, 5234, 5237, + 5104, 5109, 5238, 5235, + 5108, 5239, 5238, 5109, + 5240, 5241, 5238, 5239, + 5236, 5235, 5238, 5241, + 5108, 5113, 5242, 5239, + 5112, 5243, 5242, 5113, + 5244, 5245, 5242, 5243, + 5240, 5239, 5242, 5245, + 5112, 5117, 5246, 5243, + 5116, 5247, 5246, 5117, + 5248, 5249, 5246, 5247, + 5244, 5243, 5246, 5249, + 5116, 5121, 5250, 5247, + 5120, 5251, 5250, 5121, + 5252, 5253, 5250, 5251, + 5248, 5247, 5250, 5253, + 5120, 5125, 5254, 5251, + 5124, 5255, 5254, 5125, + 5256, 5257, 5254, 5255, + 5252, 5251, 5254, 5257, + 5124, 5129, 5258, 5255, + 5128, 5259, 5258, 5129, + 5260, 5261, 5258, 5259, + 5256, 5255, 5258, 5261, + 5128, 5133, 5262, 5259, + 5132, 5263, 5262, 5133, + 5264, 5265, 5262, 5263, + 5260, 5259, 5262, 5265, + 5132, 5137, 5266, 5263, + 5136, 5267, 5266, 5137, + 5268, 5269, 5266, 5267, + 5264, 5263, 5266, 5269, + 5136, 5141, 5270, 5267, + 5140, 5271, 5270, 5141, + 5272, 5273, 5270, 5271, + 5268, 5267, 5270, 5273, + 5140, 5145, 5274, 5271, + 5144, 5275, 5274, 5145, + 5276, 5277, 5274, 5275, + 5272, 5271, 5274, 5277, + 5144, 5149, 5278, 5275, + 5148, 5279, 5278, 5149, + 5280, 5281, 5278, 5279, + 5276, 5275, 5278, 5281, + 5148, 5153, 5282, 5279, + 5152, 5283, 5282, 5153, + 5284, 5285, 5282, 5283, + 5280, 5279, 5282, 5285, + 5152, 5157, 5286, 5283, + 5156, 5287, 5286, 5157, + 5288, 5289, 5286, 5287, + 5284, 5283, 5286, 5289, + 5156, 5161, 5290, 5287, + 5160, 5291, 5290, 5161, + 5292, 5293, 5290, 5291, + 5288, 5287, 5290, 5293, + 5160, 5165, 5294, 5291, + 5164, 5295, 5294, 5165, + 5296, 5297, 5294, 5295, + 5292, 5291, 5294, 5297, + 5164, 5169, 5298, 5295, + 5168, 5299, 5298, 5169, + 5300, 5301, 5298, 5299, + 5296, 5295, 5298, 5301, + 5168, 5173, 5302, 5299, + 5172, 5303, 5302, 5173, + 5304, 5305, 5302, 5303, + 5300, 5299, 5302, 5305, + 5172, 5177, 5306, 5303, + 5176, 5307, 5306, 5177, + 5308, 5309, 5306, 5307, + 5304, 5303, 5306, 5309, + 5176, 5181, 5310, 5307, + 5180, 5311, 5310, 5181, + 5312, 5313, 5310, 5311, + 5308, 5307, 5310, 5313, + 5180, 5185, 5314, 5311, + 5184, 5315, 5314, 5185, + 5316, 5317, 5314, 5315, + 5312, 5311, 5314, 5317, + 5184, 5189, 5318, 5315, + 5188, 5319, 5318, 5189, + 5320, 5321, 5318, 5319, + 5316, 5315, 5318, 5321, + 5188, 5193, 5322, 5319, + 5192, 5323, 5322, 5193, + 5324, 5325, 5322, 5323, + 5320, 5319, 5322, 5325, + 5192, 5197, 5326, 5323, + 5196, 5327, 5326, 5197, + 5328, 5329, 5326, 5327, + 5324, 5323, 5326, 5329, + 5196, 5201, 5330, 5327, + 5200, 5331, 5330, 5201, + 5332, 5333, 5330, 5331, + 5328, 5327, 5330, 5333, + 5200, 5205, 5334, 5331, + 5204, 5335, 5334, 5205, + 5336, 5337, 5334, 5335, + 5332, 5331, 5334, 5337, + 5204, 5209, 5338, 5335, + 5208, 5339, 5338, 5209, + 5340, 5341, 5338, 5339, + 5336, 5335, 5338, 5341, + 5208, 5213, 5342, 5339, + 5212, 5343, 5342, 5213, + 5344, 5345, 5342, 5343, + 5340, 5339, 5342, 5345, + 5212, 5217, 5346, 5343, + 5216, 5347, 5346, 5217, + 5348, 5349, 5346, 5347, + 5344, 5343, 5346, 5349, + 1695, 5221, 5350, 1694, + 5220, 5351, 5350, 5221, + 5352, 5353, 5350, 5351, + 1561, 1694, 5350, 5353, + 5220, 5225, 5354, 5351, + 5224, 5355, 5354, 5225, + 5356, 5357, 5354, 5355, + 5352, 5351, 5354, 5357, + 5224, 5229, 5358, 5355, + 5228, 5359, 5358, 5229, + 5360, 5361, 5358, 5359, + 5356, 5355, 5358, 5361, + 5228, 5233, 5362, 5359, + 5232, 5363, 5362, 5233, + 5364, 5365, 5362, 5363, + 5360, 5359, 5362, 5365, + 5232, 5237, 5366, 5363, + 5236, 5367, 5366, 5237, + 5368, 5369, 5366, 5367, + 5364, 5363, 5366, 5369, + 5236, 5241, 5370, 5367, + 5240, 5371, 5370, 5241, + 5372, 5373, 5370, 5371, + 5368, 5367, 5370, 5373, + 5240, 5245, 5374, 5371, + 5244, 5375, 5374, 5245, + 5376, 5377, 5374, 5375, + 5372, 5371, 5374, 5377, + 5244, 5249, 5378, 5375, + 5248, 5379, 5378, 5249, + 5380, 5381, 5378, 5379, + 5376, 5375, 5378, 5381, + 5248, 5253, 5382, 5379, + 5252, 5383, 5382, 5253, + 5384, 5385, 5382, 5383, + 5380, 5379, 5382, 5385, + 5252, 5257, 5386, 5383, + 5256, 5387, 5386, 5257, + 5388, 5389, 5386, 5387, + 5384, 5383, 5386, 5389, + 5256, 5261, 5390, 5387, + 5260, 5391, 5390, 5261, + 5392, 5393, 5390, 5391, + 5388, 5387, 5390, 5393, + 5260, 5265, 5394, 5391, + 5264, 5395, 5394, 5265, + 5396, 5397, 5394, 5395, + 5392, 5391, 5394, 5397, + 5264, 5269, 5398, 5395, + 5268, 5399, 5398, 5269, + 5400, 5401, 5398, 5399, + 5396, 5395, 5398, 5401, + 5268, 5273, 5402, 5399, + 5272, 5403, 5402, 5273, + 5404, 5405, 5402, 5403, + 5400, 5399, 5402, 5405, + 5272, 5277, 5406, 5403, + 5276, 5407, 5406, 5277, + 5408, 5409, 5406, 5407, + 5404, 5403, 5406, 5409, + 5276, 5281, 5410, 5407, + 5280, 5411, 5410, 5281, + 5412, 5413, 5410, 5411, + 5408, 5407, 5410, 5413, + 5280, 5285, 5414, 5411, + 5284, 5415, 5414, 5285, + 5416, 5417, 5414, 5415, + 5412, 5411, 5414, 5417, + 5284, 5289, 5418, 5415, + 5288, 5419, 5418, 5289, + 5420, 5421, 5418, 5419, + 5416, 5415, 5418, 5421, + 5288, 5293, 5422, 5419, + 5292, 5423, 5422, 5293, + 5424, 5425, 5422, 5423, + 5420, 5419, 5422, 5425, + 5292, 5297, 5426, 5423, + 5296, 5427, 5426, 5297, + 5428, 5429, 5426, 5427, + 5424, 5423, 5426, 5429, + 5296, 5301, 5430, 5427, + 5300, 5431, 5430, 5301, + 5432, 5433, 5430, 5431, + 5428, 5427, 5430, 5433, + 5300, 5305, 5434, 5431, + 5304, 5435, 5434, 5305, + 5436, 5437, 5434, 5435, + 5432, 5431, 5434, 5437, + 5304, 5309, 5438, 5435, + 5308, 5439, 5438, 5309, + 5440, 5441, 5438, 5439, + 5436, 5435, 5438, 5441, + 5308, 5313, 5442, 5439, + 5312, 5443, 5442, 5313, + 5444, 5445, 5442, 5443, + 5440, 5439, 5442, 5445, + 5312, 5317, 5446, 5443, + 5316, 5447, 5446, 5317, + 5448, 5449, 5446, 5447, + 5444, 5443, 5446, 5449, + 5316, 5321, 5450, 5447, + 5320, 5451, 5450, 5321, + 5452, 5453, 5450, 5451, + 5448, 5447, 5450, 5453, + 5320, 5325, 5454, 5451, + 5324, 5455, 5454, 5325, + 5456, 5457, 5454, 5455, + 5452, 5451, 5454, 5457, + 5324, 5329, 5458, 5455, + 5328, 5459, 5458, 5329, + 5460, 5461, 5458, 5459, + 5456, 5455, 5458, 5461, + 5328, 5333, 5462, 5459, + 5332, 5463, 5462, 5333, + 5464, 5465, 5462, 5463, + 5460, 5459, 5462, 5465, + 5332, 5337, 5466, 5463, + 5336, 5467, 5466, 5337, + 5468, 5469, 5466, 5467, + 5464, 5463, 5466, 5469, + 5336, 5341, 5470, 5467, + 5340, 5471, 5470, 5341, + 5472, 5473, 5470, 5471, + 5468, 5467, 5470, 5473, + 5340, 5345, 5474, 5471, + 5344, 5475, 5474, 5345, + 5476, 5477, 5474, 5475, + 5472, 5471, 5474, 5477, + 5344, 5349, 5478, 5475, + 5348, 5479, 5478, 5349, + 5480, 5481, 5478, 5479, + 5476, 5475, 5478, 5481, + 1561, 5353, 5482, 1560, + 5352, 5483, 5482, 5353, + 5484, 5485, 5482, 5483, + 1427, 1560, 5482, 5485, + 5352, 5357, 5486, 5483, + 5356, 5487, 5486, 5357, + 5488, 5489, 5486, 5487, + 5484, 5483, 5486, 5489, + 5356, 5361, 5490, 5487, + 5360, 5491, 5490, 5361, + 5492, 5493, 5490, 5491, + 5488, 5487, 5490, 5493, + 5360, 5365, 5494, 5491, + 5364, 5495, 5494, 5365, + 5496, 5497, 5494, 5495, + 5492, 5491, 5494, 5497, + 5364, 5369, 5498, 5495, + 5368, 5499, 5498, 5369, + 5500, 5501, 5498, 5499, + 5496, 5495, 5498, 5501, + 5368, 5373, 5502, 5499, + 5372, 5503, 5502, 5373, + 5504, 5505, 5502, 5503, + 5500, 5499, 5502, 5505, + 5372, 5377, 5506, 5503, + 5376, 5507, 5506, 5377, + 5508, 5509, 5506, 5507, + 5504, 5503, 5506, 5509, + 5376, 5381, 5510, 5507, + 5380, 5511, 5510, 5381, + 5512, 5513, 5510, 5511, + 5508, 5507, 5510, 5513, + 5380, 5385, 5514, 5511, + 5384, 5515, 5514, 5385, + 5516, 5517, 5514, 5515, + 5512, 5511, 5514, 5517, + 5384, 5389, 5518, 5515, + 5388, 5519, 5518, 5389, + 5520, 5521, 5518, 5519, + 5516, 5515, 5518, 5521, + 5388, 5393, 5522, 5519, + 5392, 5523, 5522, 5393, + 5524, 5525, 5522, 5523, + 5520, 5519, 5522, 5525, + 5392, 5397, 5526, 5523, + 5396, 5527, 5526, 5397, + 5528, 5529, 5526, 5527, + 5524, 5523, 5526, 5529, + 5396, 5401, 5530, 5527, + 5400, 5531, 5530, 5401, + 5532, 5533, 5530, 5531, + 5528, 5527, 5530, 5533, + 5400, 5405, 5534, 5531, + 5404, 5535, 5534, 5405, + 5536, 5537, 5534, 5535, + 5532, 5531, 5534, 5537, + 5404, 5409, 5538, 5535, + 5408, 5539, 5538, 5409, + 5540, 5541, 5538, 5539, + 5536, 5535, 5538, 5541, + 5408, 5413, 5542, 5539, + 5412, 5543, 5542, 5413, + 5544, 5545, 5542, 5543, + 5540, 5539, 5542, 5545, + 5412, 5417, 5546, 5543, + 5416, 5547, 5546, 5417, + 5548, 5549, 5546, 5547, + 5544, 5543, 5546, 5549, + 5416, 5421, 5550, 5547, + 5420, 5551, 5550, 5421, + 5552, 5553, 5550, 5551, + 5548, 5547, 5550, 5553, + 5420, 5425, 5554, 5551, + 5424, 5555, 5554, 5425, + 5556, 5557, 5554, 5555, + 5552, 5551, 5554, 5557, + 5424, 5429, 5558, 5555, + 5428, 5559, 5558, 5429, + 5560, 5561, 5558, 5559, + 5556, 5555, 5558, 5561, + 5428, 5433, 5562, 5559, + 5432, 5563, 5562, 5433, + 5564, 5565, 5562, 5563, + 5560, 5559, 5562, 5565, + 5432, 5437, 5566, 5563, + 5436, 5567, 5566, 5437, + 5568, 5569, 5566, 5567, + 5564, 5563, 5566, 5569, + 5436, 5441, 5570, 5567, + 5440, 5571, 5570, 5441, + 5572, 5573, 5570, 5571, + 5568, 5567, 5570, 5573, + 5440, 5445, 5574, 5571, + 5444, 5575, 5574, 5445, + 5576, 5577, 5574, 5575, + 5572, 5571, 5574, 5577, + 5444, 5449, 5578, 5575, + 5448, 5579, 5578, 5449, + 5580, 5581, 5578, 5579, + 5576, 5575, 5578, 5581, + 5448, 5453, 5582, 5579, + 5452, 5583, 5582, 5453, + 5584, 5585, 5582, 5583, + 5580, 5579, 5582, 5585, + 5452, 5457, 5586, 5583, + 5456, 5587, 5586, 5457, + 5588, 5589, 5586, 5587, + 5584, 5583, 5586, 5589, + 5456, 5461, 5590, 5587, + 5460, 5591, 5590, 5461, + 5592, 5593, 5590, 5591, + 5588, 5587, 5590, 5593, + 5460, 5465, 5594, 5591, + 5464, 5595, 5594, 5465, + 5596, 5597, 5594, 5595, + 5592, 5591, 5594, 5597, + 5464, 5469, 5598, 5595, + 5468, 5599, 5598, 5469, + 5600, 5601, 5598, 5599, + 5596, 5595, 5598, 5601, + 5468, 5473, 5602, 5599, + 5472, 5603, 5602, 5473, + 5604, 5605, 5602, 5603, + 5600, 5599, 5602, 5605, + 5472, 5477, 5606, 5603, + 5476, 5607, 5606, 5477, + 5608, 5609, 5606, 5607, + 5604, 5603, 5606, 5609, + 5476, 5481, 5610, 5607, + 5480, 5611, 5610, 5481, + 5612, 5613, 5610, 5611, + 5608, 5607, 5610, 5613, + 1427, 5485, 5614, 1426, + 5484, 5615, 5614, 5485, + 5616, 5617, 5614, 5615, + 1293, 1426, 5614, 5617, + 5484, 5489, 5618, 5615, + 5488, 5619, 5618, 5489, + 5620, 5621, 5618, 5619, + 5616, 5615, 5618, 5621, + 5488, 5493, 5622, 5619, + 5492, 5623, 5622, 5493, + 5624, 5625, 5622, 5623, + 5620, 5619, 5622, 5625, + 5492, 5497, 5626, 5623, + 5496, 5627, 5626, 5497, + 5628, 5629, 5626, 5627, + 5624, 5623, 5626, 5629, + 5496, 5501, 5630, 5627, + 5500, 5631, 5630, 5501, + 5632, 5633, 5630, 5631, + 5628, 5627, 5630, 5633, + 5500, 5505, 5634, 5631, + 5504, 5635, 5634, 5505, + 5636, 5637, 5634, 5635, + 5632, 5631, 5634, 5637, + 5504, 5509, 5638, 5635, + 5508, 5639, 5638, 5509, + 5640, 5641, 5638, 5639, + 5636, 5635, 5638, 5641, + 5508, 5513, 5642, 5639, + 5512, 5643, 5642, 5513, + 5644, 5645, 5642, 5643, + 5640, 5639, 5642, 5645, + 5512, 5517, 5646, 5643, + 5516, 5647, 5646, 5517, + 5648, 5649, 5646, 5647, + 5644, 5643, 5646, 5649, + 5516, 5521, 5650, 5647, + 5520, 5651, 5650, 5521, + 5652, 5653, 5650, 5651, + 5648, 5647, 5650, 5653, + 5520, 5525, 5654, 5651, + 5524, 5655, 5654, 5525, + 5656, 5657, 5654, 5655, + 5652, 5651, 5654, 5657, + 5524, 5529, 5658, 5655, + 5528, 5659, 5658, 5529, + 5660, 5661, 5658, 5659, + 5656, 5655, 5658, 5661, + 5528, 5533, 5662, 5659, + 5532, 5663, 5662, 5533, + 5664, 5665, 5662, 5663, + 5660, 5659, 5662, 5665, + 5532, 5537, 5666, 5663, + 5536, 5667, 5666, 5537, + 5668, 5669, 5666, 5667, + 5664, 5663, 5666, 5669, + 5536, 5541, 5670, 5667, + 5540, 5671, 5670, 5541, + 5672, 5673, 5670, 5671, + 5668, 5667, 5670, 5673, + 5540, 5545, 5674, 5671, + 5544, 5675, 5674, 5545, + 5676, 5677, 5674, 5675, + 5672, 5671, 5674, 5677, + 5544, 5549, 5678, 5675, + 5548, 5679, 5678, 5549, + 5680, 5681, 5678, 5679, + 5676, 5675, 5678, 5681, + 5548, 5553, 5682, 5679, + 5552, 5683, 5682, 5553, + 5684, 5685, 5682, 5683, + 5680, 5679, 5682, 5685, + 5552, 5557, 5686, 5683, + 5556, 5687, 5686, 5557, + 5688, 5689, 5686, 5687, + 5684, 5683, 5686, 5689, + 5556, 5561, 5690, 5687, + 5560, 5691, 5690, 5561, + 5692, 5693, 5690, 5691, + 5688, 5687, 5690, 5693, + 5560, 5565, 5694, 5691, + 5564, 5695, 5694, 5565, + 5696, 5697, 5694, 5695, + 5692, 5691, 5694, 5697, + 5564, 5569, 5698, 5695, + 5568, 5699, 5698, 5569, + 5700, 5701, 5698, 5699, + 5696, 5695, 5698, 5701, + 5568, 5573, 5702, 5699, + 5572, 5703, 5702, 5573, + 5704, 5705, 5702, 5703, + 5700, 5699, 5702, 5705, + 5572, 5577, 5706, 5703, + 5576, 5707, 5706, 5577, + 5708, 5709, 5706, 5707, + 5704, 5703, 5706, 5709, + 5576, 5581, 5710, 5707, + 5580, 5711, 5710, 5581, + 5712, 5713, 5710, 5711, + 5708, 5707, 5710, 5713, + 5580, 5585, 5714, 5711, + 5584, 5715, 5714, 5585, + 5716, 5717, 5714, 5715, + 5712, 5711, 5714, 5717, + 5584, 5589, 5718, 5715, + 5588, 5719, 5718, 5589, + 5720, 5721, 5718, 5719, + 5716, 5715, 5718, 5721, + 5588, 5593, 5722, 5719, + 5592, 5723, 5722, 5593, + 5724, 5725, 5722, 5723, + 5720, 5719, 5722, 5725, + 5592, 5597, 5726, 5723, + 5596, 5727, 5726, 5597, + 5728, 5729, 5726, 5727, + 5724, 5723, 5726, 5729, + 5596, 5601, 5730, 5727, + 5600, 5731, 5730, 5601, + 5732, 5733, 5730, 5731, + 5728, 5727, 5730, 5733, + 5600, 5605, 5734, 5731, + 5604, 5735, 5734, 5605, + 5736, 5737, 5734, 5735, + 5732, 5731, 5734, 5737, + 5604, 5609, 5738, 5735, + 5608, 5739, 5738, 5609, + 5740, 5741, 5738, 5739, + 5736, 5735, 5738, 5741, + 5608, 5613, 5742, 5739, + 5612, 5743, 5742, 5613, + 5744, 5745, 5742, 5743, + 5740, 5739, 5742, 5745, + 1293, 5617, 5746, 1292, + 5616, 5747, 5746, 5617, + 5748, 5749, 5746, 5747, + 1159, 1292, 5746, 5749, + 5616, 5621, 5750, 5747, + 5620, 5751, 5750, 5621, + 5752, 5753, 5750, 5751, + 5748, 5747, 5750, 5753, + 5620, 5625, 5754, 5751, + 5624, 5755, 5754, 5625, + 5756, 5757, 5754, 5755, + 5752, 5751, 5754, 5757, + 5624, 5629, 5758, 5755, + 5628, 5759, 5758, 5629, + 5760, 5761, 5758, 5759, + 5756, 5755, 5758, 5761, + 5628, 5633, 5762, 5759, + 5632, 5763, 5762, 5633, + 5764, 5765, 5762, 5763, + 5760, 5759, 5762, 5765, + 5632, 5637, 5766, 5763, + 5636, 5767, 5766, 5637, + 5768, 5769, 5766, 5767, + 5764, 5763, 5766, 5769, + 5636, 5641, 5770, 5767, + 5640, 5771, 5770, 5641, + 5772, 5773, 5770, 5771, + 5768, 5767, 5770, 5773, + 5640, 5645, 5774, 5771, + 5644, 5775, 5774, 5645, + 5776, 5777, 5774, 5775, + 5772, 5771, 5774, 5777, + 5644, 5649, 5778, 5775, + 5648, 5779, 5778, 5649, + 5780, 5781, 5778, 5779, + 5776, 5775, 5778, 5781, + 5648, 5653, 5782, 5779, + 5652, 5783, 5782, 5653, + 5784, 5785, 5782, 5783, + 5780, 5779, 5782, 5785, + 5652, 5657, 5786, 5783, + 5656, 5787, 5786, 5657, + 5788, 5789, 5786, 5787, + 5784, 5783, 5786, 5789, + 5656, 5661, 5790, 5787, + 5660, 5791, 5790, 5661, + 5792, 5793, 5790, 5791, + 5788, 5787, 5790, 5793, + 5660, 5665, 5794, 5791, + 5664, 5795, 5794, 5665, + 5796, 5797, 5794, 5795, + 5792, 5791, 5794, 5797, + 5664, 5669, 5798, 5795, + 5668, 5799, 5798, 5669, + 5800, 5801, 5798, 5799, + 5796, 5795, 5798, 5801, + 5668, 5673, 5802, 5799, + 5672, 5803, 5802, 5673, + 5804, 5805, 5802, 5803, + 5800, 5799, 5802, 5805, + 5672, 5677, 5806, 5803, + 5676, 5807, 5806, 5677, + 5808, 5809, 5806, 5807, + 5804, 5803, 5806, 5809, + 5676, 5681, 5810, 5807, + 5680, 5811, 5810, 5681, + 5812, 5813, 5810, 5811, + 5808, 5807, 5810, 5813, + 5680, 5685, 5814, 5811, + 5684, 5815, 5814, 5685, + 5816, 5817, 5814, 5815, + 5812, 5811, 5814, 5817, + 5684, 5689, 5818, 5815, + 5688, 5819, 5818, 5689, + 5820, 5821, 5818, 5819, + 5816, 5815, 5818, 5821, + 5688, 5693, 5822, 5819, + 5692, 5823, 5822, 5693, + 5824, 5825, 5822, 5823, + 5820, 5819, 5822, 5825, + 5692, 5697, 5826, 5823, + 5696, 5827, 5826, 5697, + 5828, 5829, 5826, 5827, + 5824, 5823, 5826, 5829, + 5696, 5701, 5830, 5827, + 5700, 5831, 5830, 5701, + 5832, 5833, 5830, 5831, + 5828, 5827, 5830, 5833, + 5700, 5705, 5834, 5831, + 5704, 5835, 5834, 5705, + 5836, 5837, 5834, 5835, + 5832, 5831, 5834, 5837, + 5704, 5709, 5838, 5835, + 5708, 5839, 5838, 5709, + 5840, 5841, 5838, 5839, + 5836, 5835, 5838, 5841, + 5708, 5713, 5842, 5839, + 5712, 5843, 5842, 5713, + 5844, 5845, 5842, 5843, + 5840, 5839, 5842, 5845, + 5712, 5717, 5846, 5843, + 5716, 5847, 5846, 5717, + 5848, 5849, 5846, 5847, + 5844, 5843, 5846, 5849, + 5716, 5721, 5850, 5847, + 5720, 5851, 5850, 5721, + 5852, 5853, 5850, 5851, + 5848, 5847, 5850, 5853, + 5720, 5725, 5854, 5851, + 5724, 5855, 5854, 5725, + 5856, 5857, 5854, 5855, + 5852, 5851, 5854, 5857, + 5724, 5729, 5858, 5855, + 5728, 5859, 5858, 5729, + 5860, 5861, 5858, 5859, + 5856, 5855, 5858, 5861, + 5728, 5733, 5862, 5859, + 5732, 5863, 5862, 5733, + 5864, 5865, 5862, 5863, + 5860, 5859, 5862, 5865, + 5732, 5737, 5866, 5863, + 5736, 5867, 5866, 5737, + 5868, 5869, 5866, 5867, + 5864, 5863, 5866, 5869, + 5736, 5741, 5870, 5867, + 5740, 5871, 5870, 5741, + 5872, 5873, 5870, 5871, + 5868, 5867, 5870, 5873, + 5740, 5745, 5874, 5871, + 5744, 5875, 5874, 5745, + 5876, 5877, 5874, 5875, + 5872, 5871, 5874, 5877, + 1159, 5749, 5878, 1158, + 5748, 5879, 5878, 5749, + 5880, 5881, 5878, 5879, + 1093, 1158, 5878, 5881, + 5748, 5753, 5882, 5879, + 5752, 5883, 5882, 5753, + 5884, 5885, 5882, 5883, + 5880, 5879, 5882, 5885, + 5752, 5757, 5886, 5883, + 5756, 5887, 5886, 5757, + 5888, 5889, 5886, 5887, + 5884, 5883, 5886, 5889, + 5756, 5761, 5890, 5887, + 5760, 5891, 5890, 5761, + 5892, 5893, 5890, 5891, + 5888, 5887, 5890, 5893, + 5760, 5765, 5894, 5891, + 5764, 5895, 5894, 5765, + 5896, 5897, 5894, 5895, + 5892, 5891, 5894, 5897, + 5764, 5769, 5898, 5895, + 5768, 5899, 5898, 5769, + 5900, 5901, 5898, 5899, + 5896, 5895, 5898, 5901, + 5768, 5773, 5902, 5899, + 5772, 5903, 5902, 5773, + 5904, 5905, 5902, 5903, + 5900, 5899, 5902, 5905, + 5772, 5777, 5906, 5903, + 5776, 5907, 5906, 5777, + 5908, 5909, 5906, 5907, + 5904, 5903, 5906, 5909, + 5776, 5781, 5910, 5907, + 5780, 5911, 5910, 5781, + 5912, 5913, 5910, 5911, + 5908, 5907, 5910, 5913, + 5780, 5785, 5914, 5911, + 5784, 5915, 5914, 5785, + 5916, 5917, 5914, 5915, + 5912, 5911, 5914, 5917, + 5784, 5789, 5918, 5915, + 5788, 5919, 5918, 5789, + 5920, 5921, 5918, 5919, + 5916, 5915, 5918, 5921, + 5788, 5793, 5922, 5919, + 5792, 5923, 5922, 5793, + 5924, 5925, 5922, 5923, + 5920, 5919, 5922, 5925, + 5792, 5797, 5926, 5923, + 5796, 5927, 5926, 5797, + 5928, 5929, 5926, 5927, + 5924, 5923, 5926, 5929, + 5796, 5801, 5930, 5927, + 5800, 5931, 5930, 5801, + 5932, 5933, 5930, 5931, + 5928, 5927, 5930, 5933, + 5800, 5805, 5934, 5931, + 5804, 5935, 5934, 5805, + 5936, 5937, 5934, 5935, + 5932, 5931, 5934, 5937, + 5804, 5809, 5938, 5935, + 5808, 5939, 5938, 5809, + 5940, 5941, 5938, 5939, + 5936, 5935, 5938, 5941, + 5808, 5813, 5942, 5939, + 5812, 5943, 5942, 5813, + 5944, 5945, 5942, 5943, + 5940, 5939, 5942, 5945, + 5812, 5817, 5946, 5943, + 5816, 5947, 5946, 5817, + 5948, 5949, 5946, 5947, + 5944, 5943, 5946, 5949, + 5816, 5821, 5950, 5947, + 5820, 5951, 5950, 5821, + 5952, 5953, 5950, 5951, + 5948, 5947, 5950, 5953, + 5820, 5825, 5954, 5951, + 5824, 5955, 5954, 5825, + 5956, 5957, 5954, 5955, + 5952, 5951, 5954, 5957, + 5824, 5829, 5958, 5955, + 5828, 5959, 5958, 5829, + 5960, 5961, 5958, 5959, + 5956, 5955, 5958, 5961, + 5828, 5833, 5962, 5959, + 5832, 5963, 5962, 5833, + 5964, 5965, 5962, 5963, + 5960, 5959, 5962, 5965, + 5832, 5837, 5966, 5963, + 5836, 5967, 5966, 5837, + 5968, 5969, 5966, 5967, + 5964, 5963, 5966, 5969, + 5836, 5841, 5970, 5967, + 5840, 5971, 5970, 5841, + 5972, 5973, 5970, 5971, + 5968, 5967, 5970, 5973, + 5840, 5845, 5974, 5971, + 5844, 5975, 5974, 5845, + 5976, 5977, 5974, 5975, + 5972, 5971, 5974, 5977, + 5844, 5849, 5978, 5975, + 5848, 5979, 5978, 5849, + 5980, 5981, 5978, 5979, + 5976, 5975, 5978, 5981, + 5848, 5853, 5982, 5979, + 5852, 5983, 5982, 5853, + 5984, 5985, 5982, 5983, + 5980, 5979, 5982, 5985, + 5852, 5857, 5986, 5983, + 5856, 5987, 5986, 5857, + 5988, 5989, 5986, 5987, + 5984, 5983, 5986, 5989, + 5856, 5861, 5990, 5987, + 5860, 5991, 5990, 5861, + 5992, 5993, 5990, 5991, + 5988, 5987, 5990, 5993, + 5860, 5865, 5994, 5991, + 5864, 5995, 5994, 5865, + 5996, 5997, 5994, 5995, + 5992, 5991, 5994, 5997, + 5864, 5869, 5998, 5995, + 5868, 5999, 5998, 5869, + 6000, 6001, 5998, 5999, + 5996, 5995, 5998, 6001, + 5868, 5873, 6002, 5999, + 5872, 6003, 6002, 5873, + 6004, 6005, 6002, 6003, + 6000, 5999, 6002, 6005, + 5872, 5877, 6006, 6003, + 5876, 6007, 6006, 5877, + 6008, 6009, 6006, 6007, + 6004, 6003, 6006, 6009, + 5940, 5945, 6010, 5941, + 5944, 6011, 6010, 5945, + 6012, 6013, 6010, 6011, + 5936, 5941, 6010, 6013, + 5944, 5949, 6014, 6011, + 5948, 6015, 6014, 5949, + 6016, 6017, 6014, 6015, + 6012, 6011, 6014, 6017, + 5948, 5953, 6018, 6015, + 5952, 6019, 6018, 5953, + 6020, 6021, 6018, 6019, + 6016, 6015, 6018, 6021, + 5952, 5957, 6022, 6019, + 5956, 6023, 6022, 5957, + 6024, 6025, 6022, 6023, + 6020, 6019, 6022, 6025, + 5956, 5961, 6026, 6023, + 5960, 6027, 6026, 5961, + 6028, 6029, 6026, 6027, + 6024, 6023, 6026, 6029, + 5960, 5965, 6030, 6027, + 5964, 6031, 6030, 5965, + 6032, 6033, 6030, 6031, + 6028, 6027, 6030, 6033, + 5964, 5969, 6034, 6031, + 5968, 6035, 6034, 5969, + 6036, 6037, 6034, 6035, + 6032, 6031, 6034, 6037, + 5968, 5973, 6038, 6035, + 5972, 6039, 6038, 5973, + 6040, 6041, 6038, 6039, + 6036, 6035, 6038, 6041, + 5972, 5977, 6042, 6039, + 5976, 6043, 6042, 5977, + 6044, 6045, 6042, 6043, + 6040, 6039, 6042, 6045, + 5976, 5981, 6046, 6043, + 5980, 6047, 6046, 5981, + 6048, 6049, 6046, 6047, + 6044, 6043, 6046, 6049, + 5980, 5985, 6050, 6047, + 5984, 6051, 6050, 5985, + 6052, 6053, 6050, 6051, + 6048, 6047, 6050, 6053, + 5984, 5989, 6054, 6051, + 5988, 6055, 6054, 5989, + 6056, 6057, 6054, 6055, + 6052, 6051, 6054, 6057, + 5988, 5993, 6058, 6055, + 5992, 6059, 6058, 5993, + 6060, 6061, 6058, 6059, + 6056, 6055, 6058, 6061, + 5992, 5997, 6062, 6059, + 5996, 6063, 6062, 5997, + 6064, 6065, 6062, 6063, + 6060, 6059, 6062, 6065, + 5996, 6001, 6066, 6063, + 6000, 6067, 6066, 6001, + 6068, 6069, 6066, 6067, + 6064, 6063, 6066, 6069, + 6000, 6005, 6070, 6067, + 6004, 6071, 6070, 6005, + 6072, 6073, 6070, 6071, + 6068, 6067, 6070, 6073, + 6004, 6009, 6074, 6071, + 6008, 6075, 6074, 6009, + 6076, 6077, 6074, 6075, + 6072, 6071, 6074, 6077, + 5936, 6013, 6078, 5937, + 6012, 6079, 6078, 6013, + 6080, 6081, 6078, 6079, + 5932, 5937, 6078, 6081, + 6012, 6017, 6082, 6079, + 6016, 6083, 6082, 6017, + 6084, 6085, 6082, 6083, + 6080, 6079, 6082, 6085, + 6016, 6021, 6086, 6083, + 6020, 6087, 6086, 6021, + 6088, 6089, 6086, 6087, + 6084, 6083, 6086, 6089, + 6020, 6025, 6090, 6087, + 6024, 6091, 6090, 6025, + 6092, 6093, 6090, 6091, + 6088, 6087, 6090, 6093, + 6024, 6029, 6094, 6091, + 6028, 6095, 6094, 6029, + 6096, 6097, 6094, 6095, + 6092, 6091, 6094, 6097, + 6028, 6033, 6098, 6095, + 6032, 6099, 6098, 6033, + 6100, 6101, 6098, 6099, + 6096, 6095, 6098, 6101, + 6032, 6037, 6102, 6099, + 6036, 6103, 6102, 6037, + 6104, 6105, 6102, 6103, + 6100, 6099, 6102, 6105, + 6036, 6041, 6106, 6103, + 6040, 6107, 6106, 6041, + 6108, 6109, 6106, 6107, + 6104, 6103, 6106, 6109, + 6040, 6045, 6110, 6107, + 6044, 6111, 6110, 6045, + 6112, 6113, 6110, 6111, + 6108, 6107, 6110, 6113, + 6044, 6049, 6114, 6111, + 6048, 6115, 6114, 6049, + 6116, 6117, 6114, 6115, + 6112, 6111, 6114, 6117, + 6048, 6053, 6118, 6115, + 6052, 6119, 6118, 6053, + 6120, 6121, 6118, 6119, + 6116, 6115, 6118, 6121, + 6052, 6057, 6122, 6119, + 6056, 6123, 6122, 6057, + 6124, 6125, 6122, 6123, + 6120, 6119, 6122, 6125, + 6056, 6061, 6126, 6123, + 6060, 6127, 6126, 6061, + 6128, 6129, 6126, 6127, + 6124, 6123, 6126, 6129, + 6060, 6065, 6130, 6127, + 6064, 6131, 6130, 6065, + 6132, 6133, 6130, 6131, + 6128, 6127, 6130, 6133, + 6064, 6069, 6134, 6131, + 6068, 6135, 6134, 6069, + 6136, 6137, 6134, 6135, + 6132, 6131, 6134, 6137, + 6068, 6073, 6138, 6135, + 6072, 6139, 6138, 6073, + 6140, 6141, 6138, 6139, + 6136, 6135, 6138, 6141, + 6072, 6077, 6142, 6139, + 6076, 6143, 6142, 6077, + 6144, 6145, 6142, 6143, + 6140, 6139, 6142, 6145, + 5932, 6081, 6146, 5933, + 6080, 6147, 6146, 6081, + 6148, 6149, 6146, 6147, + 5928, 5933, 6146, 6149, + 6080, 6085, 6150, 6147, + 6084, 6151, 6150, 6085, + 6152, 6153, 6150, 6151, + 6148, 6147, 6150, 6153, + 6084, 6089, 6154, 6151, + 6088, 6155, 6154, 6089, + 6156, 6157, 6154, 6155, + 6152, 6151, 6154, 6157, + 6088, 6093, 6158, 6155, + 6092, 6159, 6158, 6093, + 6160, 6161, 6158, 6159, + 6156, 6155, 6158, 6161, + 6092, 6097, 6162, 6159, + 6096, 6163, 6162, 6097, + 6164, 6165, 6162, 6163, + 6160, 6159, 6162, 6165, + 6096, 6101, 6166, 6163, + 6100, 6167, 6166, 6101, + 6168, 6169, 6166, 6167, + 6164, 6163, 6166, 6169, + 6100, 6105, 6170, 6167, + 6104, 6171, 6170, 6105, + 6172, 6173, 6170, 6171, + 6168, 6167, 6170, 6173, + 6104, 6109, 6174, 6171, + 6108, 6175, 6174, 6109, + 6176, 6177, 6174, 6175, + 6172, 6171, 6174, 6177, + 6108, 6113, 6178, 6175, + 6112, 6179, 6178, 6113, + 6180, 6181, 6178, 6179, + 6176, 6175, 6178, 6181, + 6112, 6117, 6182, 6179, + 6116, 6183, 6182, 6117, + 6184, 6185, 6182, 6183, + 6180, 6179, 6182, 6185, + 6116, 6121, 6186, 6183, + 6120, 6187, 6186, 6121, + 6188, 6189, 6186, 6187, + 6184, 6183, 6186, 6189, + 6120, 6125, 6190, 6187, + 6124, 6191, 6190, 6125, + 6192, 6193, 6190, 6191, + 6188, 6187, 6190, 6193, + 6124, 6129, 6194, 6191, + 6128, 6195, 6194, 6129, + 6196, 6197, 6194, 6195, + 6192, 6191, 6194, 6197, + 6128, 6133, 6198, 6195, + 6132, 6199, 6198, 6133, + 6200, 6201, 6198, 6199, + 6196, 6195, 6198, 6201, + 6132, 6137, 6202, 6199, + 6136, 6203, 6202, 6137, + 6204, 6205, 6202, 6203, + 6200, 6199, 6202, 6205, + 6136, 6141, 6206, 6203, + 6140, 6207, 6206, 6141, + 6208, 6209, 6206, 6207, + 6204, 6203, 6206, 6209, + 6140, 6145, 6210, 6207, + 6144, 6211, 6210, 6145, + 6212, 6213, 6210, 6211, + 6208, 6207, 6210, 6213, + 5928, 6149, 6214, 5929, + 6148, 6215, 6214, 6149, + 6216, 6217, 6214, 6215, + 5924, 5929, 6214, 6217, + 6148, 6153, 6218, 6215, + 6152, 6219, 6218, 6153, + 6220, 6221, 6218, 6219, + 6216, 6215, 6218, 6221, + 6152, 6157, 6222, 6219, + 6156, 6223, 6222, 6157, + 6224, 6225, 6222, 6223, + 6220, 6219, 6222, 6225, + 6156, 6161, 6226, 6223, + 6160, 6227, 6226, 6161, + 6228, 6229, 6226, 6227, + 6224, 6223, 6226, 6229, + 6160, 6165, 6230, 6227, + 6164, 6231, 6230, 6165, + 6232, 6233, 6230, 6231, + 6228, 6227, 6230, 6233, + 6164, 6169, 6234, 6231, + 6168, 6235, 6234, 6169, + 6236, 6237, 6234, 6235, + 6232, 6231, 6234, 6237, + 6168, 6173, 6238, 6235, + 6172, 6239, 6238, 6173, + 6240, 6241, 6238, 6239, + 6236, 6235, 6238, 6241, + 6172, 6177, 6242, 6239, + 6176, 6243, 6242, 6177, + 6244, 6245, 6242, 6243, + 6240, 6239, 6242, 6245, + 6176, 6181, 6246, 6243, + 6180, 6247, 6246, 6181, + 6248, 6249, 6246, 6247, + 6244, 6243, 6246, 6249, + 6180, 6185, 6250, 6247, + 6184, 6251, 6250, 6185, + 6252, 6253, 6250, 6251, + 6248, 6247, 6250, 6253, + 6184, 6189, 6254, 6251, + 6188, 6255, 6254, 6189, + 6256, 6257, 6254, 6255, + 6252, 6251, 6254, 6257, + 6188, 6193, 6258, 6255, + 6192, 6259, 6258, 6193, + 6260, 6261, 6258, 6259, + 6256, 6255, 6258, 6261, + 6192, 6197, 6262, 6259, + 6196, 6263, 6262, 6197, + 6264, 6265, 6262, 6263, + 6260, 6259, 6262, 6265, + 6196, 6201, 6266, 6263, + 6200, 6267, 6266, 6201, + 6268, 6269, 6266, 6267, + 6264, 6263, 6266, 6269, + 6200, 6205, 6270, 6267, + 6204, 6271, 6270, 6205, + 6272, 6273, 6270, 6271, + 6268, 6267, 6270, 6273, + 6204, 6209, 6274, 6271, + 6208, 6275, 6274, 6209, + 6276, 6277, 6274, 6275, + 6272, 6271, 6274, 6277, + 6208, 6213, 6278, 6275, + 6212, 6279, 6278, 6213, + 6280, 6281, 6278, 6279, + 6276, 6275, 6278, 6281, + 5924, 6217, 6282, 5925, + 6216, 6283, 6282, 6217, + 6284, 6285, 6282, 6283, + 5920, 5925, 6282, 6285, + 6216, 6221, 6286, 6283, + 6220, 6287, 6286, 6221, + 6288, 6289, 6286, 6287, + 6284, 6283, 6286, 6289, + 6220, 6225, 6290, 6287, + 6224, 6291, 6290, 6225, + 6292, 6293, 6290, 6291, + 6288, 6287, 6290, 6293, + 6224, 6229, 6294, 6291, + 6228, 6295, 6294, 6229, + 6296, 6297, 6294, 6295, + 6292, 6291, 6294, 6297, + 6228, 6233, 6298, 6295, + 6232, 6299, 6298, 6233, + 6300, 6301, 6298, 6299, + 6296, 6295, 6298, 6301, + 6232, 6237, 6302, 6299, + 6236, 6303, 6302, 6237, + 6304, 6305, 6302, 6303, + 6300, 6299, 6302, 6305, + 6236, 6241, 6306, 6303, + 6240, 6307, 6306, 6241, + 6308, 6309, 6306, 6307, + 6304, 6303, 6306, 6309, + 6240, 6245, 6310, 6307, + 6244, 6311, 6310, 6245, + 6312, 6313, 6310, 6311, + 6308, 6307, 6310, 6313, + 6244, 6249, 6314, 6311, + 6248, 6315, 6314, 6249, + 6316, 6317, 6314, 6315, + 6312, 6311, 6314, 6317, + 6248, 6253, 6318, 6315, + 6252, 6319, 6318, 6253, + 6320, 6321, 6318, 6319, + 6316, 6315, 6318, 6321, + 6252, 6257, 6322, 6319, + 6256, 6323, 6322, 6257, + 6324, 6325, 6322, 6323, + 6320, 6319, 6322, 6325, + 6256, 6261, 6326, 6323, + 6260, 6327, 6326, 6261, + 6328, 6329, 6326, 6327, + 6324, 6323, 6326, 6329, + 6260, 6265, 6330, 6327, + 6264, 6331, 6330, 6265, + 6332, 6333, 6330, 6331, + 6328, 6327, 6330, 6333, + 6264, 6269, 6334, 6331, + 6268, 6335, 6334, 6269, + 6336, 6337, 6334, 6335, + 6332, 6331, 6334, 6337, + 6268, 6273, 6338, 6335, + 6272, 6339, 6338, 6273, + 6340, 6341, 6338, 6339, + 6336, 6335, 6338, 6341, + 6272, 6277, 6342, 6339, + 6276, 6343, 6342, 6277, + 6344, 6345, 6342, 6343, + 6340, 6339, 6342, 6345, + 6276, 6281, 6346, 6343, + 6280, 6347, 6346, 6281, + 6348, 6349, 6346, 6347, + 6344, 6343, 6346, 6349, + 5920, 6285, 6350, 5921, + 6284, 6351, 6350, 6285, + 6352, 6353, 6350, 6351, + 5916, 5921, 6350, 6353, + 6284, 6289, 6354, 6351, + 6288, 6355, 6354, 6289, + 6356, 6357, 6354, 6355, + 6352, 6351, 6354, 6357, + 6288, 6293, 6358, 6355, + 6292, 6359, 6358, 6293, + 6360, 6361, 6358, 6359, + 6356, 6355, 6358, 6361, + 6292, 6297, 6362, 6359, + 6296, 6363, 6362, 6297, + 6364, 6365, 6362, 6363, + 6360, 6359, 6362, 6365, + 6296, 6301, 6366, 6363, + 6300, 6367, 6366, 6301, + 6368, 6369, 6366, 6367, + 6364, 6363, 6366, 6369, + 6300, 6305, 6370, 6367, + 6304, 6371, 6370, 6305, + 6372, 6373, 6370, 6371, + 6368, 6367, 6370, 6373, + 6304, 6309, 6374, 6371, + 6308, 6375, 6374, 6309, + 6376, 6377, 6374, 6375, + 6372, 6371, 6374, 6377, + 6308, 6313, 6378, 6375, + 6312, 6379, 6378, 6313, + 6380, 6381, 6378, 6379, + 6376, 6375, 6378, 6381, + 6312, 6317, 6382, 6379, + 6316, 6383, 6382, 6317, + 6384, 6385, 6382, 6383, + 6380, 6379, 6382, 6385, + 6316, 6321, 6386, 6383, + 6320, 6387, 6386, 6321, + 6388, 6389, 6386, 6387, + 6384, 6383, 6386, 6389, + 6320, 6325, 6390, 6387, + 6324, 6391, 6390, 6325, + 6392, 6393, 6390, 6391, + 6388, 6387, 6390, 6393, + 6324, 6329, 6394, 6391, + 6328, 6395, 6394, 6329, + 6396, 6397, 6394, 6395, + 6392, 6391, 6394, 6397, + 6328, 6333, 6398, 6395, + 6332, 6399, 6398, 6333, + 6400, 6401, 6398, 6399, + 6396, 6395, 6398, 6401, + 6332, 6337, 6402, 6399, + 6336, 6403, 6402, 6337, + 6404, 6405, 6402, 6403, + 6400, 6399, 6402, 6405, + 6336, 6341, 6406, 6403, + 6340, 6407, 6406, 6341, + 6408, 6409, 6406, 6407, + 6404, 6403, 6406, 6409, + 6340, 6345, 6410, 6407, + 6344, 6411, 6410, 6345, + 6412, 6413, 6410, 6411, + 6408, 6407, 6410, 6413, + 6344, 6349, 6414, 6411, + 6348, 6415, 6414, 6349, + 6416, 6417, 6414, 6415, + 6412, 6411, 6414, 6417, + 5916, 6353, 6418, 5917, + 6352, 6419, 6418, 6353, + 6420, 6421, 6418, 6419, + 5912, 5917, 6418, 6421, + 6352, 6357, 6422, 6419, + 6356, 6423, 6422, 6357, + 6424, 6425, 6422, 6423, + 6420, 6419, 6422, 6425, + 6356, 6361, 6426, 6423, + 6360, 6427, 6426, 6361, + 6428, 6429, 6426, 6427, + 6424, 6423, 6426, 6429, + 6360, 6365, 6430, 6427, + 6364, 6431, 6430, 6365, + 6432, 6433, 6430, 6431, + 6428, 6427, 6430, 6433, + 6364, 6369, 6434, 6431, + 6368, 6435, 6434, 6369, + 6436, 6437, 6434, 6435, + 6432, 6431, 6434, 6437, + 6368, 6373, 6438, 6435, + 6372, 6439, 6438, 6373, + 6440, 6441, 6438, 6439, + 6436, 6435, 6438, 6441, + 6372, 6377, 6442, 6439, + 6376, 6443, 6442, 6377, + 6444, 6445, 6442, 6443, + 6440, 6439, 6442, 6445, + 6376, 6381, 6446, 6443, + 6380, 6447, 6446, 6381, + 6448, 6449, 6446, 6447, + 6444, 6443, 6446, 6449, + 6380, 6385, 6450, 6447, + 6384, 6451, 6450, 6385, + 6452, 6453, 6450, 6451, + 6448, 6447, 6450, 6453, + 6384, 6389, 6454, 6451, + 6388, 6455, 6454, 6389, + 6456, 6457, 6454, 6455, + 6452, 6451, 6454, 6457, + 6388, 6393, 6458, 6455, + 6392, 6459, 6458, 6393, + 6460, 6461, 6458, 6459, + 6456, 6455, 6458, 6461, + 6392, 6397, 6462, 6459, + 6396, 6463, 6462, 6397, + 6464, 6465, 6462, 6463, + 6460, 6459, 6462, 6465, + 6396, 6401, 6466, 6463, + 6400, 6467, 6466, 6401, + 6468, 6469, 6466, 6467, + 6464, 6463, 6466, 6469, + 6400, 6405, 6470, 6467, + 6404, 6471, 6470, 6405, + 6472, 6473, 6470, 6471, + 6468, 6467, 6470, 6473, + 6404, 6409, 6474, 6471, + 6408, 6475, 6474, 6409, + 6476, 6477, 6474, 6475, + 6472, 6471, 6474, 6477, + 6408, 6413, 6478, 6475, + 6412, 6479, 6478, 6413, + 6480, 6481, 6478, 6479, + 6476, 6475, 6478, 6481, + 6412, 6417, 6482, 6479, + 6416, 6483, 6482, 6417, + 6484, 6485, 6482, 6483, + 6480, 6479, 6482, 6485, + 5912, 6421, 6486, 5913, + 6420, 6487, 6486, 6421, + 6488, 6489, 6486, 6487, + 5908, 5913, 6486, 6489, + 6420, 6425, 6490, 6487, + 6424, 6491, 6490, 6425, + 6492, 6493, 6490, 6491, + 6488, 6487, 6490, 6493, + 6424, 6429, 6494, 6491, + 6428, 6495, 6494, 6429, + 6496, 6497, 6494, 6495, + 6492, 6491, 6494, 6497, + 6428, 6433, 6498, 6495, + 6432, 6499, 6498, 6433, + 6500, 6501, 6498, 6499, + 6496, 6495, 6498, 6501, + 6432, 6437, 6502, 6499, + 6436, 6503, 6502, 6437, + 6504, 6505, 6502, 6503, + 6500, 6499, 6502, 6505, + 6436, 6441, 6506, 6503, + 6440, 6507, 6506, 6441, + 6508, 6509, 6506, 6507, + 6504, 6503, 6506, 6509, + 6440, 6445, 6510, 6507, + 6444, 6511, 6510, 6445, + 6512, 6513, 6510, 6511, + 6508, 6507, 6510, 6513, + 6444, 6449, 6514, 6511, + 6448, 6515, 6514, 6449, + 6516, 6517, 6514, 6515, + 6512, 6511, 6514, 6517, + 6448, 6453, 6518, 6515, + 6452, 6519, 6518, 6453, + 6520, 6521, 6518, 6519, + 6516, 6515, 6518, 6521, + 6452, 6457, 6522, 6519, + 6456, 6523, 6522, 6457, + 6524, 6525, 6522, 6523, + 6520, 6519, 6522, 6525, + 6456, 6461, 6526, 6523, + 6460, 6527, 6526, 6461, + 6528, 6529, 6526, 6527, + 6524, 6523, 6526, 6529, + 6460, 6465, 6530, 6527, + 6464, 6531, 6530, 6465, + 6532, 6533, 6530, 6531, + 6528, 6527, 6530, 6533, + 6464, 6469, 6534, 6531, + 6468, 6535, 6534, 6469, + 6536, 6537, 6534, 6535, + 6532, 6531, 6534, 6537, + 6468, 6473, 6538, 6535, + 6472, 6539, 6538, 6473, + 6540, 6541, 6538, 6539, + 6536, 6535, 6538, 6541, + 6472, 6477, 6542, 6539, + 6476, 6543, 6542, 6477, + 6544, 6545, 6542, 6543, + 6540, 6539, 6542, 6545, + 6476, 6481, 6546, 6543, + 6480, 6547, 6546, 6481, + 6548, 6549, 6546, 6547, + 6544, 6543, 6546, 6549, + 6480, 6485, 6550, 6547, + 6484, 6551, 6550, 6485, + 6552, 6553, 6550, 6551, + 6548, 6547, 6550, 6553, + 5908, 6489, 6554, 5909, + 6488, 6555, 6554, 6489, + 6556, 6557, 6554, 6555, + 5904, 5909, 6554, 6557, + 6488, 6493, 6558, 6555, + 6492, 6559, 6558, 6493, + 6560, 6561, 6558, 6559, + 6556, 6555, 6558, 6561, + 6492, 6497, 6562, 6559, + 6496, 6563, 6562, 6497, + 6564, 6565, 6562, 6563, + 6560, 6559, 6562, 6565, + 6496, 6501, 6566, 6563, + 6500, 6567, 6566, 6501, + 6568, 6569, 6566, 6567, + 6564, 6563, 6566, 6569, + 6500, 6505, 6570, 6567, + 6504, 6571, 6570, 6505, + 6572, 6573, 6570, 6571, + 6568, 6567, 6570, 6573, + 6504, 6509, 6574, 6571, + 6508, 6575, 6574, 6509, + 6576, 6577, 6574, 6575, + 6572, 6571, 6574, 6577, + 6508, 6513, 6578, 6575, + 6512, 6579, 6578, 6513, + 6580, 6581, 6578, 6579, + 6576, 6575, 6578, 6581, + 6512, 6517, 6582, 6579, + 6516, 6583, 6582, 6517, + 6584, 6585, 6582, 6583, + 6580, 6579, 6582, 6585, + 6516, 6521, 6586, 6583, + 6520, 6587, 6586, 6521, + 6588, 6589, 6586, 6587, + 6584, 6583, 6586, 6589, + 6520, 6525, 6590, 6587, + 6524, 6591, 6590, 6525, + 6592, 6593, 6590, 6591, + 6588, 6587, 6590, 6593, + 6524, 6529, 6594, 6591, + 6528, 6595, 6594, 6529, + 6596, 6597, 6594, 6595, + 6592, 6591, 6594, 6597, + 6528, 6533, 6598, 6595, + 6532, 6599, 6598, 6533, + 6600, 6601, 6598, 6599, + 6596, 6595, 6598, 6601, + 6532, 6537, 6602, 6599, + 6536, 6603, 6602, 6537, + 6604, 6605, 6602, 6603, + 6600, 6599, 6602, 6605, + 6536, 6541, 6606, 6603, + 6540, 6607, 6606, 6541, + 6608, 6609, 6606, 6607, + 6604, 6603, 6606, 6609, + 6540, 6545, 6610, 6607, + 6544, 6611, 6610, 6545, + 6612, 6613, 6610, 6611, + 6608, 6607, 6610, 6613, + 6544, 6549, 6614, 6611, + 6548, 6615, 6614, 6549, + 6616, 6617, 6614, 6615, + 6612, 6611, 6614, 6617, + 6548, 6553, 6618, 6615, + 6552, 6619, 6618, 6553, + 6620, 6621, 6618, 6619, + 6616, 6615, 6618, 6621, + 5904, 6557, 6622, 5905, + 6556, 6623, 6622, 6557, + 6624, 6625, 6622, 6623, + 5900, 5905, 6622, 6625, + 6556, 6561, 6626, 6623, + 6560, 6627, 6626, 6561, + 6628, 6629, 6626, 6627, + 6624, 6623, 6626, 6629, + 6560, 6565, 6630, 6627, + 6564, 6631, 6630, 6565, + 6632, 6633, 6630, 6631, + 6628, 6627, 6630, 6633, + 6564, 6569, 6634, 6631, + 6568, 6635, 6634, 6569, + 6636, 6637, 6634, 6635, + 6632, 6631, 6634, 6637, + 6568, 6573, 6638, 6635, + 6572, 6639, 6638, 6573, + 6640, 6641, 6638, 6639, + 6636, 6635, 6638, 6641, + 6572, 6577, 6642, 6639, + 6576, 6643, 6642, 6577, + 6644, 6645, 6642, 6643, + 6640, 6639, 6642, 6645, + 6576, 6581, 6646, 6643, + 6580, 6647, 6646, 6581, + 6648, 6649, 6646, 6647, + 6644, 6643, 6646, 6649, + 6580, 6585, 6650, 6647, + 6584, 6651, 6650, 6585, + 6652, 6653, 6650, 6651, + 6648, 6647, 6650, 6653, + 6584, 6589, 6654, 6651, + 6588, 6655, 6654, 6589, + 6656, 6657, 6654, 6655, + 6652, 6651, 6654, 6657, + 6588, 6593, 6658, 6655, + 6592, 6659, 6658, 6593, + 6660, 6661, 6658, 6659, + 6656, 6655, 6658, 6661, + 6592, 6597, 6662, 6659, + 6596, 6663, 6662, 6597, + 6664, 6665, 6662, 6663, + 6660, 6659, 6662, 6665, + 6596, 6601, 6666, 6663, + 6600, 6667, 6666, 6601, + 6668, 6669, 6666, 6667, + 6664, 6663, 6666, 6669, + 6600, 6605, 6670, 6667, + 6604, 6671, 6670, 6605, + 6672, 6673, 6670, 6671, + 6668, 6667, 6670, 6673, + 6604, 6609, 6674, 6671, + 6608, 6675, 6674, 6609, + 6676, 6677, 6674, 6675, + 6672, 6671, 6674, 6677, + 6608, 6613, 6678, 6675, + 6612, 6679, 6678, 6613, + 6680, 6681, 6678, 6679, + 6676, 6675, 6678, 6681, + 6612, 6617, 6682, 6679, + 6616, 6683, 6682, 6617, + 6684, 6685, 6682, 6683, + 6680, 6679, 6682, 6685, + 6616, 6621, 6686, 6683, + 6620, 6687, 6686, 6621, + 6688, 6689, 6686, 6687, + 6684, 6683, 6686, 6689, + 5900, 6625, 6690, 5901, + 6624, 6691, 6690, 6625, + 6692, 6693, 6690, 6691, + 5896, 5901, 6690, 6693, + 6624, 6629, 6694, 6691, + 6628, 6695, 6694, 6629, + 6696, 6697, 6694, 6695, + 6692, 6691, 6694, 6697, + 6628, 6633, 6698, 6695, + 6632, 6699, 6698, 6633, + 6700, 6701, 6698, 6699, + 6696, 6695, 6698, 6701, + 6632, 6637, 6702, 6699, + 6636, 6703, 6702, 6637, + 6704, 6705, 6702, 6703, + 6700, 6699, 6702, 6705, + 6636, 6641, 6706, 6703, + 6640, 6707, 6706, 6641, + 6708, 6709, 6706, 6707, + 6704, 6703, 6706, 6709, + 6640, 6645, 6710, 6707, + 6644, 6711, 6710, 6645, + 6712, 6713, 6710, 6711, + 6708, 6707, 6710, 6713, + 6644, 6649, 6714, 6711, + 6648, 6715, 6714, 6649, + 6716, 6717, 6714, 6715, + 6712, 6711, 6714, 6717, + 6648, 6653, 6718, 6715, + 6652, 6719, 6718, 6653, + 6720, 6721, 6718, 6719, + 6716, 6715, 6718, 6721, + 6652, 6657, 6722, 6719, + 6656, 6723, 6722, 6657, + 6724, 6725, 6722, 6723, + 6720, 6719, 6722, 6725, + 6656, 6661, 6726, 6723, + 6660, 6727, 6726, 6661, + 6728, 6729, 6726, 6727, + 6724, 6723, 6726, 6729, + 6660, 6665, 6730, 6727, + 6664, 6731, 6730, 6665, + 6732, 6733, 6730, 6731, + 6728, 6727, 6730, 6733, + 6664, 6669, 6734, 6731, + 6668, 6735, 6734, 6669, + 6736, 6737, 6734, 6735, + 6732, 6731, 6734, 6737, + 6668, 6673, 6738, 6735, + 6672, 6739, 6738, 6673, + 6740, 6741, 6738, 6739, + 6736, 6735, 6738, 6741, + 6672, 6677, 6742, 6739, + 6676, 6743, 6742, 6677, + 6744, 6745, 6742, 6743, + 6740, 6739, 6742, 6745, + 6676, 6681, 6746, 6743, + 6680, 6747, 6746, 6681, + 6748, 6749, 6746, 6747, + 6744, 6743, 6746, 6749, + 6680, 6685, 6750, 6747, + 6684, 6751, 6750, 6685, + 6752, 6753, 6750, 6751, + 6748, 6747, 6750, 6753, + 6684, 6689, 6754, 6751, + 6688, 6755, 6754, 6689, + 6756, 6757, 6754, 6755, + 6752, 6751, 6754, 6757, + 5896, 6693, 6758, 5897, + 6692, 6759, 6758, 6693, + 6760, 6761, 6758, 6759, + 5892, 5897, 6758, 6761, + 6692, 6697, 6762, 6759, + 6696, 6763, 6762, 6697, + 6764, 6765, 6762, 6763, + 6760, 6759, 6762, 6765, + 6696, 6701, 6766, 6763, + 6700, 6767, 6766, 6701, + 6768, 6769, 6766, 6767, + 6764, 6763, 6766, 6769, + 6700, 6705, 6770, 6767, + 6704, 6771, 6770, 6705, + 6772, 6773, 6770, 6771, + 6768, 6767, 6770, 6773, + 6704, 6709, 6774, 6771, + 6708, 6775, 6774, 6709, + 6776, 6777, 6774, 6775, + 6772, 6771, 6774, 6777, + 6708, 6713, 6778, 6775, + 6712, 6779, 6778, 6713, + 6780, 6781, 6778, 6779, + 6776, 6775, 6778, 6781, + 6712, 6717, 6782, 6779, + 6716, 6783, 6782, 6717, + 6784, 6785, 6782, 6783, + 6780, 6779, 6782, 6785, + 6716, 6721, 6786, 6783, + 6720, 6787, 6786, 6721, + 6788, 6789, 6786, 6787, + 6784, 6783, 6786, 6789, + 6720, 6725, 6790, 6787, + 6724, 6791, 6790, 6725, + 6792, 6793, 6790, 6791, + 6788, 6787, 6790, 6793, + 6724, 6729, 6794, 6791, + 6728, 6795, 6794, 6729, + 6796, 6797, 6794, 6795, + 6792, 6791, 6794, 6797, + 6728, 6733, 6798, 6795, + 6732, 6799, 6798, 6733, + 6800, 6801, 6798, 6799, + 6796, 6795, 6798, 6801, + 6732, 6737, 6802, 6799, + 6736, 6803, 6802, 6737, + 6804, 6805, 6802, 6803, + 6800, 6799, 6802, 6805, + 6736, 6741, 6806, 6803, + 6740, 6807, 6806, 6741, + 6808, 6809, 6806, 6807, + 6804, 6803, 6806, 6809, + 6740, 6745, 6810, 6807, + 6744, 6811, 6810, 6745, + 6812, 6813, 6810, 6811, + 6808, 6807, 6810, 6813, + 6744, 6749, 6814, 6811, + 6748, 6815, 6814, 6749, + 6816, 6817, 6814, 6815, + 6812, 6811, 6814, 6817, + 6748, 6753, 6818, 6815, + 6752, 6819, 6818, 6753, + 6820, 6821, 6818, 6819, + 6816, 6815, 6818, 6821, + 6752, 6757, 6822, 6819, + 6756, 6823, 6822, 6757, + 6824, 6825, 6822, 6823, + 6820, 6819, 6822, 6825, + 5892, 6761, 6826, 5893, + 6760, 6827, 6826, 6761, + 6828, 6829, 6826, 6827, + 5888, 5893, 6826, 6829, + 6760, 6765, 6830, 6827, + 6764, 6831, 6830, 6765, + 6832, 6833, 6830, 6831, + 6828, 6827, 6830, 6833, + 6764, 6769, 6834, 6831, + 6768, 6835, 6834, 6769, + 6836, 6837, 6834, 6835, + 6832, 6831, 6834, 6837, + 6768, 6773, 6838, 6835, + 6772, 6839, 6838, 6773, + 6840, 6841, 6838, 6839, + 6836, 6835, 6838, 6841, + 6772, 6777, 6842, 6839, + 6776, 6843, 6842, 6777, + 6844, 6845, 6842, 6843, + 6840, 6839, 6842, 6845, + 6776, 6781, 6846, 6843, + 6780, 6847, 6846, 6781, + 6848, 6849, 6846, 6847, + 6844, 6843, 6846, 6849, + 6780, 6785, 6850, 6847, + 6784, 6851, 6850, 6785, + 6852, 6853, 6850, 6851, + 6848, 6847, 6850, 6853, + 6784, 6789, 6854, 6851, + 6788, 6855, 6854, 6789, + 6856, 6857, 6854, 6855, + 6852, 6851, 6854, 6857, + 6788, 6793, 6858, 6855, + 6792, 6859, 6858, 6793, + 6860, 6861, 6858, 6859, + 6856, 6855, 6858, 6861, + 6792, 6797, 6862, 6859, + 6796, 6863, 6862, 6797, + 6864, 6865, 6862, 6863, + 6860, 6859, 6862, 6865, + 6796, 6801, 6866, 6863, + 6800, 6867, 6866, 6801, + 6868, 6869, 6866, 6867, + 6864, 6863, 6866, 6869, + 6800, 6805, 6870, 6867, + 6804, 6871, 6870, 6805, + 6872, 6873, 6870, 6871, + 6868, 6867, 6870, 6873, + 6804, 6809, 6874, 6871, + 6808, 6875, 6874, 6809, + 6876, 6877, 6874, 6875, + 6872, 6871, 6874, 6877, + 6808, 6813, 6878, 6875, + 6812, 6879, 6878, 6813, + 6880, 6881, 6878, 6879, + 6876, 6875, 6878, 6881, + 6812, 6817, 6882, 6879, + 6816, 6883, 6882, 6817, + 6884, 6885, 6882, 6883, + 6880, 6879, 6882, 6885, + 6816, 6821, 6886, 6883, + 6820, 6887, 6886, 6821, + 6888, 6889, 6886, 6887, + 6884, 6883, 6886, 6889, + 6820, 6825, 6890, 6887, + 6824, 6891, 6890, 6825, + 6892, 6893, 6890, 6891, + 6888, 6887, 6890, 6893, + 5888, 6829, 6894, 5889, + 6828, 6895, 6894, 6829, + 6896, 6897, 6894, 6895, + 5884, 5889, 6894, 6897, + 6828, 6833, 6898, 6895, + 6832, 6899, 6898, 6833, + 6900, 6901, 6898, 6899, + 6896, 6895, 6898, 6901, + 6832, 6837, 6902, 6899, + 6836, 6903, 6902, 6837, + 6904, 6905, 6902, 6903, + 6900, 6899, 6902, 6905, + 6836, 6841, 6906, 6903, + 6840, 6907, 6906, 6841, + 6908, 6909, 6906, 6907, + 6904, 6903, 6906, 6909, + 6840, 6845, 6910, 6907, + 6844, 6911, 6910, 6845, + 6912, 6913, 6910, 6911, + 6908, 6907, 6910, 6913, + 6844, 6849, 6914, 6911, + 6848, 6915, 6914, 6849, + 6916, 6917, 6914, 6915, + 6912, 6911, 6914, 6917, + 6848, 6853, 6918, 6915, + 6852, 6919, 6918, 6853, + 6920, 6921, 6918, 6919, + 6916, 6915, 6918, 6921, + 6852, 6857, 6922, 6919, + 6856, 6923, 6922, 6857, + 6924, 6925, 6922, 6923, + 6920, 6919, 6922, 6925, + 6856, 6861, 6926, 6923, + 6860, 6927, 6926, 6861, + 6928, 6929, 6926, 6927, + 6924, 6923, 6926, 6929, + 6860, 6865, 6930, 6927, + 6864, 6931, 6930, 6865, + 6932, 6933, 6930, 6931, + 6928, 6927, 6930, 6933, + 6864, 6869, 6934, 6931, + 6868, 6935, 6934, 6869, + 6936, 6937, 6934, 6935, + 6932, 6931, 6934, 6937, + 6868, 6873, 6938, 6935, + 6872, 6939, 6938, 6873, + 6940, 6941, 6938, 6939, + 6936, 6935, 6938, 6941, + 6872, 6877, 6942, 6939, + 6876, 6943, 6942, 6877, + 6944, 6945, 6942, 6943, + 6940, 6939, 6942, 6945, + 6876, 6881, 6946, 6943, + 6880, 6947, 6946, 6881, + 6948, 6949, 6946, 6947, + 6944, 6943, 6946, 6949, + 6880, 6885, 6950, 6947, + 6884, 6951, 6950, 6885, + 6952, 6953, 6950, 6951, + 6948, 6947, 6950, 6953, + 6884, 6889, 6954, 6951, + 6888, 6955, 6954, 6889, + 6956, 6957, 6954, 6955, + 6952, 6951, 6954, 6957, + 6888, 6893, 6958, 6955, + 6892, 6959, 6958, 6893, + 6960, 6961, 6958, 6959, + 6956, 6955, 6958, 6961, + 5884, 6897, 6962, 5885, + 6896, 6963, 6962, 6897, + 6964, 6965, 6962, 6963, + 5880, 5885, 6962, 6965, + 6896, 6901, 6966, 6963, + 6900, 6967, 6966, 6901, + 6968, 6969, 6966, 6967, + 6964, 6963, 6966, 6969, + 6900, 6905, 6970, 6967, + 6904, 6971, 6970, 6905, + 6972, 6973, 6970, 6971, + 6968, 6967, 6970, 6973, + 6904, 6909, 6974, 6971, + 6908, 6975, 6974, 6909, + 6976, 6977, 6974, 6975, + 6972, 6971, 6974, 6977, + 6908, 6913, 6978, 6975, + 6912, 6979, 6978, 6913, + 6980, 6981, 6978, 6979, + 6976, 6975, 6978, 6981, + 6912, 6917, 6982, 6979, + 6916, 6983, 6982, 6917, + 6984, 6985, 6982, 6983, + 6980, 6979, 6982, 6985, + 6916, 6921, 6986, 6983, + 6920, 6987, 6986, 6921, + 6988, 6989, 6986, 6987, + 6984, 6983, 6986, 6989, + 6920, 6925, 6990, 6987, + 6924, 6991, 6990, 6925, + 6992, 6993, 6990, 6991, + 6988, 6987, 6990, 6993, + 6924, 6929, 6994, 6991, + 6928, 6995, 6994, 6929, + 6996, 6997, 6994, 6995, + 6992, 6991, 6994, 6997, + 6928, 6933, 6998, 6995, + 6932, 6999, 6998, 6933, + 7000, 7001, 6998, 6999, + 6996, 6995, 6998, 7001, + 6932, 6937, 7002, 6999, + 6936, 7003, 7002, 6937, + 7004, 7005, 7002, 7003, + 7000, 6999, 7002, 7005, + 6936, 6941, 7006, 7003, + 6940, 7007, 7006, 6941, + 7008, 7009, 7006, 7007, + 7004, 7003, 7006, 7009, + 6940, 6945, 7010, 7007, + 6944, 7011, 7010, 6945, + 7012, 7013, 7010, 7011, + 7008, 7007, 7010, 7013, + 6944, 6949, 7014, 7011, + 6948, 7015, 7014, 6949, + 7016, 7017, 7014, 7015, + 7012, 7011, 7014, 7017, + 6948, 6953, 7018, 7015, + 6952, 7019, 7018, 6953, + 7020, 7021, 7018, 7019, + 7016, 7015, 7018, 7021, + 6952, 6957, 7022, 7019, + 6956, 7023, 7022, 6957, + 7024, 7025, 7022, 7023, + 7020, 7019, 7022, 7025, + 6956, 6961, 7026, 7023, + 6960, 7027, 7026, 6961, + 7028, 7029, 7026, 7027, + 7024, 7023, 7026, 7029, + 5880, 6965, 7030, 5881, + 6964, 7031, 7030, 6965, + 1027, 1092, 7030, 7031, + 1093, 5881, 7030, 1092, + 6964, 6969, 7032, 7031, + 6968, 7033, 7032, 6969, + 961, 1026, 7032, 7033, + 1027, 7031, 7032, 1026, + 6968, 6973, 7034, 7033, + 6972, 7035, 7034, 6973, + 895, 960, 7034, 7035, + 961, 7033, 7034, 960, + 6972, 6977, 7036, 7035, + 6976, 7037, 7036, 6977, + 829, 894, 7036, 7037, + 895, 7035, 7036, 894, + 6976, 6981, 7038, 7037, + 6980, 7039, 7038, 6981, + 763, 828, 7038, 7039, + 829, 7037, 7038, 828, + 6980, 6985, 7040, 7039, + 6984, 7041, 7040, 6985, + 697, 762, 7040, 7041, + 763, 7039, 7040, 762, + 6984, 6989, 7042, 7041, + 6988, 7043, 7042, 6989, + 631, 696, 7042, 7043, + 697, 7041, 7042, 696, + 6988, 6993, 7044, 7043, + 6992, 7045, 7044, 6993, + 565, 630, 7044, 7045, + 631, 7043, 7044, 630, + 6992, 6997, 7046, 7045, + 6996, 7047, 7046, 6997, + 499, 564, 7046, 7047, + 565, 7045, 7046, 564, + 6996, 7001, 7048, 7047, + 7000, 7049, 7048, 7001, + 433, 498, 7048, 7049, + 499, 7047, 7048, 498, + 7000, 7005, 7050, 7049, + 7004, 7051, 7050, 7005, + 367, 432, 7050, 7051, + 433, 7049, 7050, 432, + 7004, 7009, 7052, 7051, + 7008, 7053, 7052, 7009, + 301, 366, 7052, 7053, + 367, 7051, 7052, 366, + 7008, 7013, 7054, 7053, + 7012, 7055, 7054, 7013, + 235, 300, 7054, 7055, + 301, 7053, 7054, 300, + 7012, 7017, 7056, 7055, + 7016, 7057, 7056, 7017, + 169, 234, 7056, 7057, + 235, 7055, 7056, 234, + 7016, 7021, 7058, 7057, + 7020, 7059, 7058, 7021, + 103, 168, 7058, 7059, + 169, 7057, 7058, 168, + 7020, 7025, 7060, 7059, + 7024, 7061, 7060, 7025, + 7, 102, 7060, 7061, + 103, 7059, 7060, 102, + 7024, 7029, 7062, 7061, + 7028, 7063, 7062, 7029, + 5, 6, 7062, 7063, + 7, 7061, 7062, 6, + 3762, 7064, 7065, 3763, + 7066, 7067, 7065, 7064, + 7068, 7069, 7065, 7067, + 3764, 3763, 7065, 7069, + 7066, 7070, 7071, 7067, + 7072, 7073, 7071, 7070, + 7074, 7075, 7071, 7073, + 7068, 7067, 7071, 7075, + 7072, 7076, 7077, 7073, + 7078, 7079, 7077, 7076, + 7080, 7081, 7077, 7079, + 7074, 7073, 7077, 7081, + 7078, 7082, 7083, 7079, + 7084, 7085, 7083, 7082, + 7086, 7087, 7083, 7085, + 7080, 7079, 7083, 7087, + 7084, 7088, 7089, 7085, + 7090, 7091, 7089, 7088, + 7092, 7093, 7089, 7091, + 7086, 7085, 7089, 7093, + 7090, 7094, 7095, 7091, + 7096, 7097, 7095, 7094, + 7098, 7099, 7095, 7097, + 7092, 7091, 7095, 7099, + 7096, 7100, 7101, 7097, + 7102, 7103, 7101, 7100, + 7104, 7105, 7101, 7103, + 7098, 7097, 7101, 7105, + 7102, 7106, 7107, 7103, + 7108, 7109, 7107, 7106, + 7110, 7111, 7107, 7109, + 7104, 7103, 7107, 7111, + 7108, 7112, 7113, 7109, + 7114, 7115, 7113, 7112, + 7116, 7117, 7113, 7115, + 7110, 7109, 7113, 7117, + 7114, 7118, 7119, 7115, + 7120, 7121, 7119, 7118, + 7122, 7123, 7119, 7121, + 7116, 7115, 7119, 7123, + 7120, 7124, 7125, 7121, + 7126, 7127, 7125, 7124, + 7128, 7129, 7125, 7127, + 7122, 7121, 7125, 7129, + 7126, 7130, 7131, 7127, + 7132, 7133, 7131, 7130, + 7134, 7135, 7131, 7133, + 7128, 7127, 7131, 7135, + 7132, 7136, 7137, 7133, + 7138, 7139, 7137, 7136, + 7140, 7141, 7137, 7139, + 7134, 7133, 7137, 7141, + 7138, 7142, 7143, 7139, + 7144, 7145, 7143, 7142, + 7146, 7147, 7143, 7145, + 7140, 7139, 7143, 7147, + 7144, 7148, 7149, 7145, + 7150, 7151, 7149, 7148, + 7152, 7153, 7149, 7151, + 7146, 7145, 7149, 7153, + 7150, 7154, 7155, 7151, + 7156, 7157, 7155, 7154, + 7158, 7159, 7155, 7157, + 7152, 7151, 7155, 7159, + 7156, 7160, 7161, 7157, + 7162, 7163, 7161, 7160, + 7164, 7165, 7161, 7163, + 7158, 7157, 7161, 7165, + 7162, 7166, 7167, 7163, + 7168, 7169, 7167, 7166, + 7170, 7171, 7167, 7169, + 7164, 7163, 7167, 7171, + 7168, 7172, 7173, 7169, + 7174, 7175, 7173, 7172, + 7176, 7177, 7173, 7175, + 7170, 7169, 7173, 7177, + 7174, 7178, 7179, 7175, + 7180, 7181, 7179, 7178, + 7182, 7183, 7179, 7181, + 7176, 7175, 7179, 7183, + 7180, 7184, 7185, 7181, + 7186, 7187, 7185, 7184, + 7188, 7189, 7185, 7187, + 7182, 7181, 7185, 7189, + 7186, 7190, 7191, 7187, + 7192, 7193, 7191, 7190, + 7194, 7195, 7191, 7193, + 7188, 7187, 7191, 7195, + 7192, 7196, 7197, 7193, + 7198, 7199, 7197, 7196, + 7200, 7201, 7197, 7199, + 7194, 7193, 7197, 7201, + 7198, 7202, 7203, 7199, + 7204, 7205, 7203, 7202, + 7206, 7207, 7203, 7205, + 7200, 7199, 7203, 7207, + 7204, 7208, 7209, 7205, + 7210, 7211, 7209, 7208, + 7212, 7213, 7209, 7211, + 7206, 7205, 7209, 7213, + 7210, 7214, 7215, 7211, + 7216, 7217, 7215, 7214, + 7218, 7219, 7215, 7217, + 7212, 7211, 7215, 7219, + 7216, 7220, 7221, 7217, + 7222, 7223, 7221, 7220, + 7224, 7225, 7221, 7223, + 7218, 7217, 7221, 7225, + 7222, 7226, 7227, 7223, + 7228, 7229, 7227, 7226, + 7230, 7231, 7227, 7229, + 7224, 7223, 7227, 7231, + 7228, 7232, 7233, 7229, + 7234, 7235, 7233, 7232, + 7236, 7237, 7233, 7235, + 7230, 7229, 7233, 7237, + 7234, 7238, 7239, 7235, + 7240, 7241, 7239, 7238, + 7242, 7243, 7239, 7241, + 7236, 7235, 7239, 7243, + 7240, 7244, 7245, 7241, + 7246, 7247, 7245, 7244, + 7248, 7249, 7245, 7247, + 7242, 7241, 7245, 7249, + 7246, 7250, 7251, 7247, + 7252, 7253, 7251, 7250, + 7254, 7255, 7251, 7253, + 7248, 7247, 7251, 7255, + 7252, 7256, 7257, 7253, + 7258, 7259, 7257, 7256, + 7260, 7261, 7257, 7259, + 7254, 7253, 7257, 7261, + 3764, 7069, 7262, 3895, + 7068, 7263, 7262, 7069, + 7264, 7265, 7262, 7263, + 3896, 3895, 7262, 7265, + 7068, 7075, 7266, 7263, + 7074, 7267, 7266, 7075, + 7268, 7269, 7266, 7267, + 7264, 7263, 7266, 7269, + 7074, 7081, 7270, 7267, + 7080, 7271, 7270, 7081, + 7272, 7273, 7270, 7271, + 7268, 7267, 7270, 7273, + 7080, 7087, 7274, 7271, + 7086, 7275, 7274, 7087, + 7276, 7277, 7274, 7275, + 7272, 7271, 7274, 7277, + 7086, 7093, 7278, 7275, + 7092, 7279, 7278, 7093, + 7280, 7281, 7278, 7279, + 7276, 7275, 7278, 7281, + 7092, 7099, 7282, 7279, + 7098, 7283, 7282, 7099, + 7284, 7285, 7282, 7283, + 7280, 7279, 7282, 7285, + 7098, 7105, 7286, 7283, + 7104, 7287, 7286, 7105, + 7288, 7289, 7286, 7287, + 7284, 7283, 7286, 7289, + 7104, 7111, 7290, 7287, + 7110, 7291, 7290, 7111, + 7292, 7293, 7290, 7291, + 7288, 7287, 7290, 7293, + 7110, 7117, 7294, 7291, + 7116, 7295, 7294, 7117, + 7296, 7297, 7294, 7295, + 7292, 7291, 7294, 7297, + 7116, 7123, 7298, 7295, + 7122, 7299, 7298, 7123, + 7300, 7301, 7298, 7299, + 7296, 7295, 7298, 7301, + 7122, 7129, 7302, 7299, + 7128, 7303, 7302, 7129, + 7304, 7305, 7302, 7303, + 7300, 7299, 7302, 7305, + 7128, 7135, 7306, 7303, + 7134, 7307, 7306, 7135, + 7308, 7309, 7306, 7307, + 7304, 7303, 7306, 7309, + 7134, 7141, 7310, 7307, + 7140, 7311, 7310, 7141, + 7312, 7313, 7310, 7311, + 7308, 7307, 7310, 7313, + 7140, 7147, 7314, 7311, + 7146, 7315, 7314, 7147, + 7316, 7317, 7314, 7315, + 7312, 7311, 7314, 7317, + 7146, 7153, 7318, 7315, + 7152, 7319, 7318, 7153, + 7320, 7321, 7318, 7319, + 7316, 7315, 7318, 7321, + 7152, 7159, 7322, 7319, + 7158, 7323, 7322, 7159, + 7324, 7325, 7322, 7323, + 7320, 7319, 7322, 7325, + 7158, 7165, 7326, 7323, + 7164, 7327, 7326, 7165, + 7328, 7329, 7326, 7327, + 7324, 7323, 7326, 7329, + 7164, 7171, 7330, 7327, + 7170, 7331, 7330, 7171, + 7332, 7333, 7330, 7331, + 7328, 7327, 7330, 7333, + 7170, 7177, 7334, 7331, + 7176, 7335, 7334, 7177, + 7336, 7337, 7334, 7335, + 7332, 7331, 7334, 7337, + 7176, 7183, 7338, 7335, + 7182, 7339, 7338, 7183, + 7340, 7341, 7338, 7339, + 7336, 7335, 7338, 7341, + 7182, 7189, 7342, 7339, + 7188, 7343, 7342, 7189, + 7344, 7345, 7342, 7343, + 7340, 7339, 7342, 7345, + 7188, 7195, 7346, 7343, + 7194, 7347, 7346, 7195, + 7348, 7349, 7346, 7347, + 7344, 7343, 7346, 7349, + 7194, 7201, 7350, 7347, + 7200, 7351, 7350, 7201, + 7352, 7353, 7350, 7351, + 7348, 7347, 7350, 7353, + 7200, 7207, 7354, 7351, + 7206, 7355, 7354, 7207, + 7356, 7357, 7354, 7355, + 7352, 7351, 7354, 7357, + 7206, 7213, 7358, 7355, + 7212, 7359, 7358, 7213, + 7360, 7361, 7358, 7359, + 7356, 7355, 7358, 7361, + 7212, 7219, 7362, 7359, + 7218, 7363, 7362, 7219, + 7364, 7365, 7362, 7363, + 7360, 7359, 7362, 7365, + 7218, 7225, 7366, 7363, + 7224, 7367, 7366, 7225, + 7368, 7369, 7366, 7367, + 7364, 7363, 7366, 7369, + 7224, 7231, 7370, 7367, + 7230, 7371, 7370, 7231, + 7372, 7373, 7370, 7371, + 7368, 7367, 7370, 7373, + 7230, 7237, 7374, 7371, + 7236, 7375, 7374, 7237, + 7376, 7377, 7374, 7375, + 7372, 7371, 7374, 7377, + 7236, 7243, 7378, 7375, + 7242, 7379, 7378, 7243, + 7380, 7381, 7378, 7379, + 7376, 7375, 7378, 7381, + 7242, 7249, 7382, 7379, + 7248, 7383, 7382, 7249, + 7384, 7385, 7382, 7383, + 7380, 7379, 7382, 7385, + 7248, 7255, 7386, 7383, + 7254, 7387, 7386, 7255, + 7388, 7389, 7386, 7387, + 7384, 7383, 7386, 7389, + 7254, 7261, 7390, 7387, + 7260, 7391, 7390, 7261, + 7392, 7393, 7390, 7391, + 7388, 7387, 7390, 7393, + 3896, 7265, 7394, 4027, + 7264, 7395, 7394, 7265, + 7396, 7397, 7394, 7395, + 4028, 4027, 7394, 7397, + 7264, 7269, 7398, 7395, + 7268, 7399, 7398, 7269, + 7400, 7401, 7398, 7399, + 7396, 7395, 7398, 7401, + 7268, 7273, 7402, 7399, + 7272, 7403, 7402, 7273, + 7404, 7405, 7402, 7403, + 7400, 7399, 7402, 7405, + 7272, 7277, 7406, 7403, + 7276, 7407, 7406, 7277, + 7408, 7409, 7406, 7407, + 7404, 7403, 7406, 7409, + 7276, 7281, 7410, 7407, + 7280, 7411, 7410, 7281, + 7412, 7413, 7410, 7411, + 7408, 7407, 7410, 7413, + 7280, 7285, 7414, 7411, + 7284, 7415, 7414, 7285, + 7416, 7417, 7414, 7415, + 7412, 7411, 7414, 7417, + 7284, 7289, 7418, 7415, + 7288, 7419, 7418, 7289, + 7420, 7421, 7418, 7419, + 7416, 7415, 7418, 7421, + 7288, 7293, 7422, 7419, + 7292, 7423, 7422, 7293, + 7424, 7425, 7422, 7423, + 7420, 7419, 7422, 7425, + 7292, 7297, 7426, 7423, + 7296, 7427, 7426, 7297, + 7428, 7429, 7426, 7427, + 7424, 7423, 7426, 7429, + 7296, 7301, 7430, 7427, + 7300, 7431, 7430, 7301, + 7432, 7433, 7430, 7431, + 7428, 7427, 7430, 7433, + 7300, 7305, 7434, 7431, + 7304, 7435, 7434, 7305, + 7436, 7437, 7434, 7435, + 7432, 7431, 7434, 7437, + 7304, 7309, 7438, 7435, + 7308, 7439, 7438, 7309, + 7440, 7441, 7438, 7439, + 7436, 7435, 7438, 7441, + 7308, 7313, 7442, 7439, + 7312, 7443, 7442, 7313, + 7444, 7445, 7442, 7443, + 7440, 7439, 7442, 7445, + 7312, 7317, 7446, 7443, + 7316, 7447, 7446, 7317, + 7448, 7449, 7446, 7447, + 7444, 7443, 7446, 7449, + 7316, 7321, 7450, 7447, + 7320, 7451, 7450, 7321, + 7452, 7453, 7450, 7451, + 7448, 7447, 7450, 7453, + 7320, 7325, 7454, 7451, + 7324, 7455, 7454, 7325, + 7456, 7457, 7454, 7455, + 7452, 7451, 7454, 7457, + 7324, 7329, 7458, 7455, + 7328, 7459, 7458, 7329, + 7460, 7461, 7458, 7459, + 7456, 7455, 7458, 7461, + 7328, 7333, 7462, 7459, + 7332, 7463, 7462, 7333, + 7464, 7465, 7462, 7463, + 7460, 7459, 7462, 7465, + 7332, 7337, 7466, 7463, + 7336, 7467, 7466, 7337, + 7468, 7469, 7466, 7467, + 7464, 7463, 7466, 7469, + 7336, 7341, 7470, 7467, + 7340, 7471, 7470, 7341, + 7472, 7473, 7470, 7471, + 7468, 7467, 7470, 7473, + 7340, 7345, 7474, 7471, + 7344, 7475, 7474, 7345, + 7476, 7477, 7474, 7475, + 7472, 7471, 7474, 7477, + 7344, 7349, 7478, 7475, + 7348, 7479, 7478, 7349, + 7480, 7481, 7478, 7479, + 7476, 7475, 7478, 7481, + 7348, 7353, 7482, 7479, + 7352, 7483, 7482, 7353, + 7484, 7485, 7482, 7483, + 7480, 7479, 7482, 7485, + 7352, 7357, 7486, 7483, + 7356, 7487, 7486, 7357, + 7488, 7489, 7486, 7487, + 7484, 7483, 7486, 7489, + 7356, 7361, 7490, 7487, + 7360, 7491, 7490, 7361, + 7492, 7493, 7490, 7491, + 7488, 7487, 7490, 7493, + 7360, 7365, 7494, 7491, + 7364, 7495, 7494, 7365, + 7496, 7497, 7494, 7495, + 7492, 7491, 7494, 7497, + 7364, 7369, 7498, 7495, + 7368, 7499, 7498, 7369, + 7500, 7501, 7498, 7499, + 7496, 7495, 7498, 7501, + 7368, 7373, 7502, 7499, + 7372, 7503, 7502, 7373, + 7504, 7505, 7502, 7503, + 7500, 7499, 7502, 7505, + 7372, 7377, 7506, 7503, + 7376, 7507, 7506, 7377, + 7508, 7509, 7506, 7507, + 7504, 7503, 7506, 7509, + 7376, 7381, 7510, 7507, + 7380, 7511, 7510, 7381, + 7512, 7513, 7510, 7511, + 7508, 7507, 7510, 7513, + 7380, 7385, 7514, 7511, + 7384, 7515, 7514, 7385, + 7516, 7517, 7514, 7515, + 7512, 7511, 7514, 7517, + 7384, 7389, 7518, 7515, + 7388, 7519, 7518, 7389, + 7520, 7521, 7518, 7519, + 7516, 7515, 7518, 7521, + 7388, 7393, 7522, 7519, + 7392, 7523, 7522, 7393, + 7524, 7525, 7522, 7523, + 7520, 7519, 7522, 7525, + 4028, 7397, 7526, 4159, + 7396, 7527, 7526, 7397, + 7528, 7529, 7526, 7527, + 4160, 4159, 7526, 7529, + 7396, 7401, 7530, 7527, + 7400, 7531, 7530, 7401, + 7532, 7533, 7530, 7531, + 7528, 7527, 7530, 7533, + 7400, 7405, 7534, 7531, + 7404, 7535, 7534, 7405, + 7536, 7537, 7534, 7535, + 7532, 7531, 7534, 7537, + 7404, 7409, 7538, 7535, + 7408, 7539, 7538, 7409, + 7540, 7541, 7538, 7539, + 7536, 7535, 7538, 7541, + 7408, 7413, 7542, 7539, + 7412, 7543, 7542, 7413, + 7544, 7545, 7542, 7543, + 7540, 7539, 7542, 7545, + 7412, 7417, 7546, 7543, + 7416, 7547, 7546, 7417, + 7548, 7549, 7546, 7547, + 7544, 7543, 7546, 7549, + 7416, 7421, 7550, 7547, + 7420, 7551, 7550, 7421, + 7552, 7553, 7550, 7551, + 7548, 7547, 7550, 7553, + 7420, 7425, 7554, 7551, + 7424, 7555, 7554, 7425, + 7556, 7557, 7554, 7555, + 7552, 7551, 7554, 7557, + 7424, 7429, 7558, 7555, + 7428, 7559, 7558, 7429, + 7560, 7561, 7558, 7559, + 7556, 7555, 7558, 7561, + 7428, 7433, 7562, 7559, + 7432, 7563, 7562, 7433, + 7564, 7565, 7562, 7563, + 7560, 7559, 7562, 7565, + 7432, 7437, 7566, 7563, + 7436, 7567, 7566, 7437, + 7568, 7569, 7566, 7567, + 7564, 7563, 7566, 7569, + 7436, 7441, 7570, 7567, + 7440, 7571, 7570, 7441, + 7572, 7573, 7570, 7571, + 7568, 7567, 7570, 7573, + 7440, 7445, 7574, 7571, + 7444, 7575, 7574, 7445, + 7576, 7577, 7574, 7575, + 7572, 7571, 7574, 7577, + 7444, 7449, 7578, 7575, + 7448, 7579, 7578, 7449, + 7580, 7581, 7578, 7579, + 7576, 7575, 7578, 7581, + 7448, 7453, 7582, 7579, + 7452, 7583, 7582, 7453, + 7584, 7585, 7582, 7583, + 7580, 7579, 7582, 7585, + 7452, 7457, 7586, 7583, + 7456, 7587, 7586, 7457, + 7588, 7589, 7586, 7587, + 7584, 7583, 7586, 7589, + 7456, 7461, 7590, 7587, + 7460, 7591, 7590, 7461, + 7592, 7593, 7590, 7591, + 7588, 7587, 7590, 7593, + 7460, 7465, 7594, 7591, + 7464, 7595, 7594, 7465, + 7596, 7597, 7594, 7595, + 7592, 7591, 7594, 7597, + 7464, 7469, 7598, 7595, + 7468, 7599, 7598, 7469, + 7600, 7601, 7598, 7599, + 7596, 7595, 7598, 7601, + 7468, 7473, 7602, 7599, + 7472, 7603, 7602, 7473, + 7604, 7605, 7602, 7603, + 7600, 7599, 7602, 7605, + 7472, 7477, 7606, 7603, + 7476, 7607, 7606, 7477, + 7608, 7609, 7606, 7607, + 7604, 7603, 7606, 7609, + 7476, 7481, 7610, 7607, + 7480, 7611, 7610, 7481, + 7612, 7613, 7610, 7611, + 7608, 7607, 7610, 7613, + 7480, 7485, 7614, 7611, + 7484, 7615, 7614, 7485, + 7616, 7617, 7614, 7615, + 7612, 7611, 7614, 7617, + 7484, 7489, 7618, 7615, + 7488, 7619, 7618, 7489, + 7620, 7621, 7618, 7619, + 7616, 7615, 7618, 7621, + 7488, 7493, 7622, 7619, + 7492, 7623, 7622, 7493, + 7624, 7625, 7622, 7623, + 7620, 7619, 7622, 7625, + 7492, 7497, 7626, 7623, + 7496, 7627, 7626, 7497, + 7628, 7629, 7626, 7627, + 7624, 7623, 7626, 7629, + 7496, 7501, 7630, 7627, + 7500, 7631, 7630, 7501, + 7632, 7633, 7630, 7631, + 7628, 7627, 7630, 7633, + 7500, 7505, 7634, 7631, + 7504, 7635, 7634, 7505, + 7636, 7637, 7634, 7635, + 7632, 7631, 7634, 7637, + 7504, 7509, 7638, 7635, + 7508, 7639, 7638, 7509, + 7640, 7641, 7638, 7639, + 7636, 7635, 7638, 7641, + 7508, 7513, 7642, 7639, + 7512, 7643, 7642, 7513, + 7644, 7645, 7642, 7643, + 7640, 7639, 7642, 7645, + 7512, 7517, 7646, 7643, + 7516, 7647, 7646, 7517, + 7648, 7649, 7646, 7647, + 7644, 7643, 7646, 7649, + 7516, 7521, 7650, 7647, + 7520, 7651, 7650, 7521, + 7652, 7653, 7650, 7651, + 7648, 7647, 7650, 7653, + 7520, 7525, 7654, 7651, + 7524, 7655, 7654, 7525, + 7656, 7657, 7654, 7655, + 7652, 7651, 7654, 7657, + 4160, 7529, 7658, 4291, + 7528, 7659, 7658, 7529, + 7660, 7661, 7658, 7659, + 4292, 4291, 7658, 7661, + 7528, 7533, 7662, 7659, + 7532, 7663, 7662, 7533, + 7664, 7665, 7662, 7663, + 7660, 7659, 7662, 7665, + 7532, 7537, 7666, 7663, + 7536, 7667, 7666, 7537, + 7668, 7669, 7666, 7667, + 7664, 7663, 7666, 7669, + 7536, 7541, 7670, 7667, + 7540, 7671, 7670, 7541, + 7672, 7673, 7670, 7671, + 7668, 7667, 7670, 7673, + 7540, 7545, 7674, 7671, + 7544, 7675, 7674, 7545, + 7676, 7677, 7674, 7675, + 7672, 7671, 7674, 7677, + 7544, 7549, 7678, 7675, + 7548, 7679, 7678, 7549, + 7680, 7681, 7678, 7679, + 7676, 7675, 7678, 7681, + 7548, 7553, 7682, 7679, + 7552, 7683, 7682, 7553, + 7684, 7685, 7682, 7683, + 7680, 7679, 7682, 7685, + 7552, 7557, 7686, 7683, + 7556, 7687, 7686, 7557, + 7688, 7689, 7686, 7687, + 7684, 7683, 7686, 7689, + 7556, 7561, 7690, 7687, + 7560, 7691, 7690, 7561, + 7692, 7693, 7690, 7691, + 7688, 7687, 7690, 7693, + 7560, 7565, 7694, 7691, + 7564, 7695, 7694, 7565, + 7696, 7697, 7694, 7695, + 7692, 7691, 7694, 7697, + 7564, 7569, 7698, 7695, + 7568, 7699, 7698, 7569, + 7700, 7701, 7698, 7699, + 7696, 7695, 7698, 7701, + 7568, 7573, 7702, 7699, + 7572, 7703, 7702, 7573, + 7704, 7705, 7702, 7703, + 7700, 7699, 7702, 7705, + 7572, 7577, 7706, 7703, + 7576, 7707, 7706, 7577, + 7708, 7709, 7706, 7707, + 7704, 7703, 7706, 7709, + 7576, 7581, 7710, 7707, + 7580, 7711, 7710, 7581, + 7712, 7713, 7710, 7711, + 7708, 7707, 7710, 7713, + 7580, 7585, 7714, 7711, + 7584, 7715, 7714, 7585, + 7716, 7717, 7714, 7715, + 7712, 7711, 7714, 7717, + 7584, 7589, 7718, 7715, + 7588, 7719, 7718, 7589, + 7720, 7721, 7718, 7719, + 7716, 7715, 7718, 7721, + 7588, 7593, 7722, 7719, + 7592, 7723, 7722, 7593, + 7724, 7725, 7722, 7723, + 7720, 7719, 7722, 7725, + 7592, 7597, 7726, 7723, + 7596, 7727, 7726, 7597, + 7728, 7729, 7726, 7727, + 7724, 7723, 7726, 7729, + 7596, 7601, 7730, 7727, + 7600, 7731, 7730, 7601, + 7732, 7733, 7730, 7731, + 7728, 7727, 7730, 7733, + 7600, 7605, 7734, 7731, + 7604, 7735, 7734, 7605, + 7736, 7737, 7734, 7735, + 7732, 7731, 7734, 7737, + 7604, 7609, 7738, 7735, + 7608, 7739, 7738, 7609, + 7740, 7741, 7738, 7739, + 7736, 7735, 7738, 7741, + 7608, 7613, 7742, 7739, + 7612, 7743, 7742, 7613, + 7744, 7745, 7742, 7743, + 7740, 7739, 7742, 7745, + 7612, 7617, 7746, 7743, + 7616, 7747, 7746, 7617, + 7748, 7749, 7746, 7747, + 7744, 7743, 7746, 7749, + 7616, 7621, 7750, 7747, + 7620, 7751, 7750, 7621, + 7752, 7753, 7750, 7751, + 7748, 7747, 7750, 7753, + 7620, 7625, 7754, 7751, + 7624, 7755, 7754, 7625, + 7756, 7757, 7754, 7755, + 7752, 7751, 7754, 7757, + 7624, 7629, 7758, 7755, + 7628, 7759, 7758, 7629, + 7760, 7761, 7758, 7759, + 7756, 7755, 7758, 7761, + 7628, 7633, 7762, 7759, + 7632, 7763, 7762, 7633, + 7764, 7765, 7762, 7763, + 7760, 7759, 7762, 7765, + 7632, 7637, 7766, 7763, + 7636, 7767, 7766, 7637, + 7768, 7769, 7766, 7767, + 7764, 7763, 7766, 7769, + 7636, 7641, 7770, 7767, + 7640, 7771, 7770, 7641, + 7772, 7773, 7770, 7771, + 7768, 7767, 7770, 7773, + 7640, 7645, 7774, 7771, + 7644, 7775, 7774, 7645, + 7776, 7777, 7774, 7775, + 7772, 7771, 7774, 7777, + 7644, 7649, 7778, 7775, + 7648, 7779, 7778, 7649, + 7780, 7781, 7778, 7779, + 7776, 7775, 7778, 7781, + 7648, 7653, 7782, 7779, + 7652, 7783, 7782, 7653, + 7784, 7785, 7782, 7783, + 7780, 7779, 7782, 7785, + 7652, 7657, 7786, 7783, + 7656, 7787, 7786, 7657, + 7788, 7789, 7786, 7787, + 7784, 7783, 7786, 7789, + 4292, 7661, 7790, 4423, + 7660, 7791, 7790, 7661, + 7792, 7793, 7790, 7791, + 4424, 4423, 7790, 7793, + 7660, 7665, 7794, 7791, + 7664, 7795, 7794, 7665, + 7796, 7797, 7794, 7795, + 7792, 7791, 7794, 7797, + 7664, 7669, 7798, 7795, + 7668, 7799, 7798, 7669, + 7800, 7801, 7798, 7799, + 7796, 7795, 7798, 7801, + 7668, 7673, 7802, 7799, + 7672, 7803, 7802, 7673, + 7804, 7805, 7802, 7803, + 7800, 7799, 7802, 7805, + 7672, 7677, 7806, 7803, + 7676, 7807, 7806, 7677, + 7808, 7809, 7806, 7807, + 7804, 7803, 7806, 7809, + 7676, 7681, 7810, 7807, + 7680, 7811, 7810, 7681, + 7812, 7813, 7810, 7811, + 7808, 7807, 7810, 7813, + 7680, 7685, 7814, 7811, + 7684, 7815, 7814, 7685, + 7816, 7817, 7814, 7815, + 7812, 7811, 7814, 7817, + 7684, 7689, 7818, 7815, + 7688, 7819, 7818, 7689, + 7820, 7821, 7818, 7819, + 7816, 7815, 7818, 7821, + 7688, 7693, 7822, 7819, + 7692, 7823, 7822, 7693, + 7824, 7825, 7822, 7823, + 7820, 7819, 7822, 7825, + 7692, 7697, 7826, 7823, + 7696, 7827, 7826, 7697, + 7828, 7829, 7826, 7827, + 7824, 7823, 7826, 7829, + 7696, 7701, 7830, 7827, + 7700, 7831, 7830, 7701, + 7832, 7833, 7830, 7831, + 7828, 7827, 7830, 7833, + 7700, 7705, 7834, 7831, + 7704, 7835, 7834, 7705, + 7836, 7837, 7834, 7835, + 7832, 7831, 7834, 7837, + 7704, 7709, 7838, 7835, + 7708, 7839, 7838, 7709, + 7840, 7841, 7838, 7839, + 7836, 7835, 7838, 7841, + 7708, 7713, 7842, 7839, + 7712, 7843, 7842, 7713, + 7844, 7845, 7842, 7843, + 7840, 7839, 7842, 7845, + 7712, 7717, 7846, 7843, + 7716, 7847, 7846, 7717, + 7848, 7849, 7846, 7847, + 7844, 7843, 7846, 7849, + 7716, 7721, 7850, 7847, + 7720, 7851, 7850, 7721, + 7852, 7853, 7850, 7851, + 7848, 7847, 7850, 7853, + 7720, 7725, 7854, 7851, + 7724, 7855, 7854, 7725, + 7856, 7857, 7854, 7855, + 7852, 7851, 7854, 7857, + 7724, 7729, 7858, 7855, + 7728, 7859, 7858, 7729, + 7860, 7861, 7858, 7859, + 7856, 7855, 7858, 7861, + 7728, 7733, 7862, 7859, + 7732, 7863, 7862, 7733, + 7864, 7865, 7862, 7863, + 7860, 7859, 7862, 7865, + 7732, 7737, 7866, 7863, + 7736, 7867, 7866, 7737, + 7868, 7869, 7866, 7867, + 7864, 7863, 7866, 7869, + 7736, 7741, 7870, 7867, + 7740, 7871, 7870, 7741, + 7872, 7873, 7870, 7871, + 7868, 7867, 7870, 7873, + 7740, 7745, 7874, 7871, + 7744, 7875, 7874, 7745, + 7876, 7877, 7874, 7875, + 7872, 7871, 7874, 7877, + 7744, 7749, 7878, 7875, + 7748, 7879, 7878, 7749, + 7880, 7881, 7878, 7879, + 7876, 7875, 7878, 7881, + 7748, 7753, 7882, 7879, + 7752, 7883, 7882, 7753, + 7884, 7885, 7882, 7883, + 7880, 7879, 7882, 7885, + 7752, 7757, 7886, 7883, + 7756, 7887, 7886, 7757, + 7888, 7889, 7886, 7887, + 7884, 7883, 7886, 7889, + 7756, 7761, 7890, 7887, + 7760, 7891, 7890, 7761, + 7892, 7893, 7890, 7891, + 7888, 7887, 7890, 7893, + 7760, 7765, 7894, 7891, + 7764, 7895, 7894, 7765, + 7896, 7897, 7894, 7895, + 7892, 7891, 7894, 7897, + 7764, 7769, 7898, 7895, + 7768, 7899, 7898, 7769, + 7900, 7901, 7898, 7899, + 7896, 7895, 7898, 7901, + 7768, 7773, 7902, 7899, + 7772, 7903, 7902, 7773, + 7904, 7905, 7902, 7903, + 7900, 7899, 7902, 7905, + 7772, 7777, 7906, 7903, + 7776, 7907, 7906, 7777, + 7908, 7909, 7906, 7907, + 7904, 7903, 7906, 7909, + 7776, 7781, 7910, 7907, + 7780, 7911, 7910, 7781, + 7912, 7913, 7910, 7911, + 7908, 7907, 7910, 7913, + 7780, 7785, 7914, 7911, + 7784, 7915, 7914, 7785, + 7916, 7917, 7914, 7915, + 7912, 7911, 7914, 7917, + 7784, 7789, 7918, 7915, + 7788, 7919, 7918, 7789, + 7920, 7921, 7918, 7919, + 7916, 7915, 7918, 7921, + 4424, 7793, 7922, 4555, + 7792, 7923, 7922, 7793, + 7924, 7925, 7922, 7923, + 4556, 4555, 7922, 7925, + 7792, 7797, 7926, 7923, + 7796, 7927, 7926, 7797, + 7928, 7929, 7926, 7927, + 7924, 7923, 7926, 7929, + 7796, 7801, 7930, 7927, + 7800, 7931, 7930, 7801, + 7932, 7933, 7930, 7931, + 7928, 7927, 7930, 7933, + 7800, 7805, 7934, 7931, + 7804, 7935, 7934, 7805, + 7936, 7937, 7934, 7935, + 7932, 7931, 7934, 7937, + 7804, 7809, 7938, 7935, + 7808, 7939, 7938, 7809, + 7940, 7941, 7938, 7939, + 7936, 7935, 7938, 7941, + 7808, 7813, 7942, 7939, + 7812, 7943, 7942, 7813, + 7944, 7945, 7942, 7943, + 7940, 7939, 7942, 7945, + 7812, 7817, 7946, 7943, + 7816, 7947, 7946, 7817, + 7948, 7949, 7946, 7947, + 7944, 7943, 7946, 7949, + 7816, 7821, 7950, 7947, + 7820, 7951, 7950, 7821, + 7952, 7953, 7950, 7951, + 7948, 7947, 7950, 7953, + 7820, 7825, 7954, 7951, + 7824, 7955, 7954, 7825, + 7956, 7957, 7954, 7955, + 7952, 7951, 7954, 7957, + 7824, 7829, 7958, 7955, + 7828, 7959, 7958, 7829, + 7960, 7961, 7958, 7959, + 7956, 7955, 7958, 7961, + 7828, 7833, 7962, 7959, + 7832, 7963, 7962, 7833, + 7964, 7965, 7962, 7963, + 7960, 7959, 7962, 7965, + 7832, 7837, 7966, 7963, + 7836, 7967, 7966, 7837, + 7968, 7969, 7966, 7967, + 7964, 7963, 7966, 7969, + 7836, 7841, 7970, 7967, + 7840, 7971, 7970, 7841, + 7972, 7973, 7970, 7971, + 7968, 7967, 7970, 7973, + 7840, 7845, 7974, 7971, + 7844, 7975, 7974, 7845, + 7976, 7977, 7974, 7975, + 7972, 7971, 7974, 7977, + 7844, 7849, 7978, 7975, + 7848, 7979, 7978, 7849, + 7980, 7981, 7978, 7979, + 7976, 7975, 7978, 7981, + 7848, 7853, 7982, 7979, + 7852, 7983, 7982, 7853, + 7984, 7985, 7982, 7983, + 7980, 7979, 7982, 7985, + 7852, 7857, 7986, 7983, + 7856, 7987, 7986, 7857, + 7988, 7989, 7986, 7987, + 7984, 7983, 7986, 7989, + 7856, 7861, 7990, 7987, + 7860, 7991, 7990, 7861, + 7992, 7993, 7990, 7991, + 7988, 7987, 7990, 7993, + 7860, 7865, 7994, 7991, + 7864, 7995, 7994, 7865, + 7996, 7997, 7994, 7995, + 7992, 7991, 7994, 7997, + 7864, 7869, 7998, 7995, + 7868, 7999, 7998, 7869, + 8000, 8001, 7998, 7999, + 7996, 7995, 7998, 8001, + 7868, 7873, 8002, 7999, + 7872, 8003, 8002, 7873, + 8004, 8005, 8002, 8003, + 8000, 7999, 8002, 8005, + 7872, 7877, 8006, 8003, + 7876, 8007, 8006, 7877, + 8008, 8009, 8006, 8007, + 8004, 8003, 8006, 8009, + 7876, 7881, 8010, 8007, + 7880, 8011, 8010, 7881, + 8012, 8013, 8010, 8011, + 8008, 8007, 8010, 8013, + 7880, 7885, 8014, 8011, + 7884, 8015, 8014, 7885, + 8016, 8017, 8014, 8015, + 8012, 8011, 8014, 8017, + 7884, 7889, 8018, 8015, + 7888, 8019, 8018, 7889, + 8020, 8021, 8018, 8019, + 8016, 8015, 8018, 8021, + 7888, 7893, 8022, 8019, + 7892, 8023, 8022, 7893, + 8024, 8025, 8022, 8023, + 8020, 8019, 8022, 8025, + 7892, 7897, 8026, 8023, + 7896, 8027, 8026, 7897, + 8028, 8029, 8026, 8027, + 8024, 8023, 8026, 8029, + 7896, 7901, 8030, 8027, + 7900, 8031, 8030, 7901, + 8032, 8033, 8030, 8031, + 8028, 8027, 8030, 8033, + 7900, 7905, 8034, 8031, + 7904, 8035, 8034, 7905, + 8036, 8037, 8034, 8035, + 8032, 8031, 8034, 8037, + 7904, 7909, 8038, 8035, + 7908, 8039, 8038, 7909, + 8040, 8041, 8038, 8039, + 8036, 8035, 8038, 8041, + 7908, 7913, 8042, 8039, + 7912, 8043, 8042, 7913, + 8044, 8045, 8042, 8043, + 8040, 8039, 8042, 8045, + 7912, 7917, 8046, 8043, + 7916, 8047, 8046, 7917, + 8048, 8049, 8046, 8047, + 8044, 8043, 8046, 8049, + 7916, 7921, 8050, 8047, + 7920, 8051, 8050, 7921, + 8052, 8053, 8050, 8051, + 8048, 8047, 8050, 8053, + 4556, 7925, 8054, 4687, + 7924, 8055, 8054, 7925, + 8056, 8057, 8054, 8055, + 4688, 4687, 8054, 8057, + 7924, 7929, 8058, 8055, + 7928, 8059, 8058, 7929, + 8060, 8061, 8058, 8059, + 8056, 8055, 8058, 8061, + 7928, 7933, 8062, 8059, + 7932, 8063, 8062, 7933, + 8064, 8065, 8062, 8063, + 8060, 8059, 8062, 8065, + 7932, 7937, 8066, 8063, + 7936, 8067, 8066, 7937, + 8068, 8069, 8066, 8067, + 8064, 8063, 8066, 8069, + 7936, 7941, 8070, 8067, + 7940, 8071, 8070, 7941, + 8072, 8073, 8070, 8071, + 8068, 8067, 8070, 8073, + 7940, 7945, 8074, 8071, + 7944, 8075, 8074, 7945, + 8076, 8077, 8074, 8075, + 8072, 8071, 8074, 8077, + 7944, 7949, 8078, 8075, + 7948, 8079, 8078, 7949, + 8080, 8081, 8078, 8079, + 8076, 8075, 8078, 8081, + 7948, 7953, 8082, 8079, + 7952, 8083, 8082, 7953, + 8084, 8085, 8082, 8083, + 8080, 8079, 8082, 8085, + 7952, 7957, 8086, 8083, + 7956, 8087, 8086, 7957, + 8088, 8089, 8086, 8087, + 8084, 8083, 8086, 8089, + 7956, 7961, 8090, 8087, + 7960, 8091, 8090, 7961, + 8092, 8093, 8090, 8091, + 8088, 8087, 8090, 8093, + 7960, 7965, 8094, 8091, + 7964, 8095, 8094, 7965, + 8096, 8097, 8094, 8095, + 8092, 8091, 8094, 8097, + 7964, 7969, 8098, 8095, + 7968, 8099, 8098, 7969, + 8100, 8101, 8098, 8099, + 8096, 8095, 8098, 8101, + 7968, 7973, 8102, 8099, + 7972, 8103, 8102, 7973, + 8104, 8105, 8102, 8103, + 8100, 8099, 8102, 8105, + 7972, 7977, 8106, 8103, + 7976, 8107, 8106, 7977, + 8108, 8109, 8106, 8107, + 8104, 8103, 8106, 8109, + 7976, 7981, 8110, 8107, + 7980, 8111, 8110, 7981, + 8112, 8113, 8110, 8111, + 8108, 8107, 8110, 8113, + 7980, 7985, 8114, 8111, + 7984, 8115, 8114, 7985, + 8116, 8117, 8114, 8115, + 8112, 8111, 8114, 8117, + 7984, 7989, 8118, 8115, + 7988, 8119, 8118, 7989, + 8120, 8121, 8118, 8119, + 8116, 8115, 8118, 8121, + 7988, 7993, 8122, 8119, + 7992, 8123, 8122, 7993, + 8124, 8125, 8122, 8123, + 8120, 8119, 8122, 8125, + 7992, 7997, 8126, 8123, + 7996, 8127, 8126, 7997, + 8128, 8129, 8126, 8127, + 8124, 8123, 8126, 8129, + 7996, 8001, 8130, 8127, + 8000, 8131, 8130, 8001, + 8132, 8133, 8130, 8131, + 8128, 8127, 8130, 8133, + 8000, 8005, 8134, 8131, + 8004, 8135, 8134, 8005, + 8136, 8137, 8134, 8135, + 8132, 8131, 8134, 8137, + 8004, 8009, 8138, 8135, + 8008, 8139, 8138, 8009, + 8140, 8141, 8138, 8139, + 8136, 8135, 8138, 8141, + 8008, 8013, 8142, 8139, + 8012, 8143, 8142, 8013, + 8144, 8145, 8142, 8143, + 8140, 8139, 8142, 8145, + 8012, 8017, 8146, 8143, + 8016, 8147, 8146, 8017, + 8148, 8149, 8146, 8147, + 8144, 8143, 8146, 8149, + 8016, 8021, 8150, 8147, + 8020, 8151, 8150, 8021, + 8152, 8153, 8150, 8151, + 8148, 8147, 8150, 8153, + 8020, 8025, 8154, 8151, + 8024, 8155, 8154, 8025, + 8156, 8157, 8154, 8155, + 8152, 8151, 8154, 8157, + 8024, 8029, 8158, 8155, + 8028, 8159, 8158, 8029, + 8160, 8161, 8158, 8159, + 8156, 8155, 8158, 8161, + 8028, 8033, 8162, 8159, + 8032, 8163, 8162, 8033, + 8164, 8165, 8162, 8163, + 8160, 8159, 8162, 8165, + 8032, 8037, 8166, 8163, + 8036, 8167, 8166, 8037, + 8168, 8169, 8166, 8167, + 8164, 8163, 8166, 8169, + 8036, 8041, 8170, 8167, + 8040, 8171, 8170, 8041, + 8172, 8173, 8170, 8171, + 8168, 8167, 8170, 8173, + 8040, 8045, 8174, 8171, + 8044, 8175, 8174, 8045, + 8176, 8177, 8174, 8175, + 8172, 8171, 8174, 8177, + 8044, 8049, 8178, 8175, + 8048, 8179, 8178, 8049, + 8180, 8181, 8178, 8179, + 8176, 8175, 8178, 8181, + 8048, 8053, 8182, 8179, + 8052, 8183, 8182, 8053, + 8184, 8185, 8182, 8183, + 8180, 8179, 8182, 8185, + 4688, 8057, 8186, 4819, + 8056, 8187, 8186, 8057, + 8188, 8189, 8186, 8187, + 4820, 4819, 8186, 8189, + 8056, 8061, 8190, 8187, + 8060, 8191, 8190, 8061, + 8192, 8193, 8190, 8191, + 8188, 8187, 8190, 8193, + 8060, 8065, 8194, 8191, + 8064, 8195, 8194, 8065, + 8196, 8197, 8194, 8195, + 8192, 8191, 8194, 8197, + 8064, 8069, 8198, 8195, + 8068, 8199, 8198, 8069, + 8200, 8201, 8198, 8199, + 8196, 8195, 8198, 8201, + 8068, 8073, 8202, 8199, + 8072, 8203, 8202, 8073, + 8204, 8205, 8202, 8203, + 8200, 8199, 8202, 8205, + 8072, 8077, 8206, 8203, + 8076, 8207, 8206, 8077, + 8208, 8209, 8206, 8207, + 8204, 8203, 8206, 8209, + 8076, 8081, 8210, 8207, + 8080, 8211, 8210, 8081, + 8212, 8213, 8210, 8211, + 8208, 8207, 8210, 8213, + 8080, 8085, 8214, 8211, + 8084, 8215, 8214, 8085, + 8216, 8217, 8214, 8215, + 8212, 8211, 8214, 8217, + 8084, 8089, 8218, 8215, + 8088, 8219, 8218, 8089, + 8220, 8221, 8218, 8219, + 8216, 8215, 8218, 8221, + 8088, 8093, 8222, 8219, + 8092, 8223, 8222, 8093, + 8224, 8225, 8222, 8223, + 8220, 8219, 8222, 8225, + 8092, 8097, 8226, 8223, + 8096, 8227, 8226, 8097, + 8228, 8229, 8226, 8227, + 8224, 8223, 8226, 8229, + 8096, 8101, 8230, 8227, + 8100, 8231, 8230, 8101, + 8232, 8233, 8230, 8231, + 8228, 8227, 8230, 8233, + 8100, 8105, 8234, 8231, + 8104, 8235, 8234, 8105, + 8236, 8237, 8234, 8235, + 8232, 8231, 8234, 8237, + 8104, 8109, 8238, 8235, + 8108, 8239, 8238, 8109, + 8240, 8241, 8238, 8239, + 8236, 8235, 8238, 8241, + 8108, 8113, 8242, 8239, + 8112, 8243, 8242, 8113, + 8244, 8245, 8242, 8243, + 8240, 8239, 8242, 8245, + 8112, 8117, 8246, 8243, + 8116, 8247, 8246, 8117, + 8248, 8249, 8246, 8247, + 8244, 8243, 8246, 8249, + 8116, 8121, 8250, 8247, + 8120, 8251, 8250, 8121, + 8252, 8253, 8250, 8251, + 8248, 8247, 8250, 8253, + 8120, 8125, 8254, 8251, + 8124, 8255, 8254, 8125, + 8256, 8257, 8254, 8255, + 8252, 8251, 8254, 8257, + 8124, 8129, 8258, 8255, + 8128, 8259, 8258, 8129, + 8260, 8261, 8258, 8259, + 8256, 8255, 8258, 8261, + 8128, 8133, 8262, 8259, + 8132, 8263, 8262, 8133, + 8264, 8265, 8262, 8263, + 8260, 8259, 8262, 8265, + 8132, 8137, 8266, 8263, + 8136, 8267, 8266, 8137, + 8268, 8269, 8266, 8267, + 8264, 8263, 8266, 8269, + 8136, 8141, 8270, 8267, + 8140, 8271, 8270, 8141, + 8272, 8273, 8270, 8271, + 8268, 8267, 8270, 8273, + 8140, 8145, 8274, 8271, + 8144, 8275, 8274, 8145, + 8276, 8277, 8274, 8275, + 8272, 8271, 8274, 8277, + 8144, 8149, 8278, 8275, + 8148, 8279, 8278, 8149, + 8280, 8281, 8278, 8279, + 8276, 8275, 8278, 8281, + 8148, 8153, 8282, 8279, + 8152, 8283, 8282, 8153, + 8284, 8285, 8282, 8283, + 8280, 8279, 8282, 8285, + 8152, 8157, 8286, 8283, + 8156, 8287, 8286, 8157, + 8288, 8289, 8286, 8287, + 8284, 8283, 8286, 8289, + 8156, 8161, 8290, 8287, + 8160, 8291, 8290, 8161, + 8292, 8293, 8290, 8291, + 8288, 8287, 8290, 8293, + 8160, 8165, 8294, 8291, + 8164, 8295, 8294, 8165, + 8296, 8297, 8294, 8295, + 8292, 8291, 8294, 8297, + 8164, 8169, 8298, 8295, + 8168, 8299, 8298, 8169, + 8300, 8301, 8298, 8299, + 8296, 8295, 8298, 8301, + 8168, 8173, 8302, 8299, + 8172, 8303, 8302, 8173, + 8304, 8305, 8302, 8303, + 8300, 8299, 8302, 8305, + 8172, 8177, 8306, 8303, + 8176, 8307, 8306, 8177, + 8308, 8309, 8306, 8307, + 8304, 8303, 8306, 8309, + 8176, 8181, 8310, 8307, + 8180, 8311, 8310, 8181, + 8312, 8313, 8310, 8311, + 8308, 8307, 8310, 8313, + 8180, 8185, 8314, 8311, + 8184, 8315, 8314, 8185, + 8316, 8317, 8314, 8315, + 8312, 8311, 8314, 8317, + 4820, 8189, 8318, 4951, + 8188, 8319, 8318, 8189, + 8320, 8321, 8318, 8319, + 4952, 4951, 8318, 8321, + 8188, 8193, 8322, 8319, + 8192, 8323, 8322, 8193, + 8324, 8325, 8322, 8323, + 8320, 8319, 8322, 8325, + 8192, 8197, 8326, 8323, + 8196, 8327, 8326, 8197, + 8328, 8329, 8326, 8327, + 8324, 8323, 8326, 8329, + 8196, 8201, 8330, 8327, + 8200, 8331, 8330, 8201, + 8332, 8333, 8330, 8331, + 8328, 8327, 8330, 8333, + 8200, 8205, 8334, 8331, + 8204, 8335, 8334, 8205, + 8336, 8337, 8334, 8335, + 8332, 8331, 8334, 8337, + 8204, 8209, 8338, 8335, + 8208, 8339, 8338, 8209, + 8340, 8341, 8338, 8339, + 8336, 8335, 8338, 8341, + 8208, 8213, 8342, 8339, + 8212, 8343, 8342, 8213, + 8344, 8345, 8342, 8343, + 8340, 8339, 8342, 8345, + 8212, 8217, 8346, 8343, + 8216, 8347, 8346, 8217, + 8348, 8349, 8346, 8347, + 8344, 8343, 8346, 8349, + 8216, 8221, 8350, 8347, + 8220, 8351, 8350, 8221, + 8352, 8353, 8350, 8351, + 8348, 8347, 8350, 8353, + 8220, 8225, 8354, 8351, + 8224, 8355, 8354, 8225, + 8356, 8357, 8354, 8355, + 8352, 8351, 8354, 8357, + 8224, 8229, 8358, 8355, + 8228, 8359, 8358, 8229, + 8360, 8361, 8358, 8359, + 8356, 8355, 8358, 8361, + 8228, 8233, 8362, 8359, + 8232, 8363, 8362, 8233, + 8364, 8365, 8362, 8363, + 8360, 8359, 8362, 8365, + 8232, 8237, 8366, 8363, + 8236, 8367, 8366, 8237, + 8368, 8369, 8366, 8367, + 8364, 8363, 8366, 8369, + 8236, 8241, 8370, 8367, + 8240, 8371, 8370, 8241, + 8372, 8373, 8370, 8371, + 8368, 8367, 8370, 8373, + 8240, 8245, 8374, 8371, + 8244, 8375, 8374, 8245, + 8376, 8377, 8374, 8375, + 8372, 8371, 8374, 8377, + 8244, 8249, 8378, 8375, + 8248, 8379, 8378, 8249, + 8380, 8381, 8378, 8379, + 8376, 8375, 8378, 8381, + 8248, 8253, 8382, 8379, + 8252, 8383, 8382, 8253, + 8384, 8385, 8382, 8383, + 8380, 8379, 8382, 8385, + 8252, 8257, 8386, 8383, + 8256, 8387, 8386, 8257, + 8388, 8389, 8386, 8387, + 8384, 8383, 8386, 8389, + 8256, 8261, 8390, 8387, + 8260, 8391, 8390, 8261, + 8392, 8393, 8390, 8391, + 8388, 8387, 8390, 8393, + 8260, 8265, 8394, 8391, + 8264, 8395, 8394, 8265, + 8396, 8397, 8394, 8395, + 8392, 8391, 8394, 8397, + 8264, 8269, 8398, 8395, + 8268, 8399, 8398, 8269, + 8400, 8401, 8398, 8399, + 8396, 8395, 8398, 8401, + 8268, 8273, 8402, 8399, + 8272, 8403, 8402, 8273, + 8404, 8405, 8402, 8403, + 8400, 8399, 8402, 8405, + 8272, 8277, 8406, 8403, + 8276, 8407, 8406, 8277, + 8408, 8409, 8406, 8407, + 8404, 8403, 8406, 8409, + 8276, 8281, 8410, 8407, + 8280, 8411, 8410, 8281, + 8412, 8413, 8410, 8411, + 8408, 8407, 8410, 8413, + 8280, 8285, 8414, 8411, + 8284, 8415, 8414, 8285, + 8416, 8417, 8414, 8415, + 8412, 8411, 8414, 8417, + 8284, 8289, 8418, 8415, + 8288, 8419, 8418, 8289, + 8420, 8421, 8418, 8419, + 8416, 8415, 8418, 8421, + 8288, 8293, 8422, 8419, + 8292, 8423, 8422, 8293, + 8424, 8425, 8422, 8423, + 8420, 8419, 8422, 8425, + 8292, 8297, 8426, 8423, + 8296, 8427, 8426, 8297, + 8428, 8429, 8426, 8427, + 8424, 8423, 8426, 8429, + 8296, 8301, 8430, 8427, + 8300, 8431, 8430, 8301, + 8432, 8433, 8430, 8431, + 8428, 8427, 8430, 8433, + 8300, 8305, 8434, 8431, + 8304, 8435, 8434, 8305, + 8436, 8437, 8434, 8435, + 8432, 8431, 8434, 8437, + 8304, 8309, 8438, 8435, + 8308, 8439, 8438, 8309, + 8440, 8441, 8438, 8439, + 8436, 8435, 8438, 8441, + 8308, 8313, 8442, 8439, + 8312, 8443, 8442, 8313, + 8444, 8445, 8442, 8443, + 8440, 8439, 8442, 8445, + 8312, 8317, 8446, 8443, + 8316, 8447, 8446, 8317, + 8448, 8449, 8446, 8447, + 8444, 8443, 8446, 8449, + 4952, 8321, 8450, 5083, + 8320, 8451, 8450, 8321, + 8452, 8453, 8450, 8451, + 5084, 5083, 8450, 8453, + 8320, 8325, 8454, 8451, + 8324, 8455, 8454, 8325, + 8456, 8457, 8454, 8455, + 8452, 8451, 8454, 8457, + 8324, 8329, 8458, 8455, + 8328, 8459, 8458, 8329, + 8460, 8461, 8458, 8459, + 8456, 8455, 8458, 8461, + 8328, 8333, 8462, 8459, + 8332, 8463, 8462, 8333, + 8464, 8465, 8462, 8463, + 8460, 8459, 8462, 8465, + 8332, 8337, 8466, 8463, + 8336, 8467, 8466, 8337, + 8468, 8469, 8466, 8467, + 8464, 8463, 8466, 8469, + 8336, 8341, 8470, 8467, + 8340, 8471, 8470, 8341, + 8472, 8473, 8470, 8471, + 8468, 8467, 8470, 8473, + 8340, 8345, 8474, 8471, + 8344, 8475, 8474, 8345, + 8476, 8477, 8474, 8475, + 8472, 8471, 8474, 8477, + 8344, 8349, 8478, 8475, + 8348, 8479, 8478, 8349, + 8480, 8481, 8478, 8479, + 8476, 8475, 8478, 8481, + 8348, 8353, 8482, 8479, + 8352, 8483, 8482, 8353, + 8484, 8485, 8482, 8483, + 8480, 8479, 8482, 8485, + 8352, 8357, 8486, 8483, + 8356, 8487, 8486, 8357, + 8488, 8489, 8486, 8487, + 8484, 8483, 8486, 8489, + 8356, 8361, 8490, 8487, + 8360, 8491, 8490, 8361, + 8492, 8493, 8490, 8491, + 8488, 8487, 8490, 8493, + 8360, 8365, 8494, 8491, + 8364, 8495, 8494, 8365, + 8496, 8497, 8494, 8495, + 8492, 8491, 8494, 8497, + 8364, 8369, 8498, 8495, + 8368, 8499, 8498, 8369, + 8500, 8501, 8498, 8499, + 8496, 8495, 8498, 8501, + 8368, 8373, 8502, 8499, + 8372, 8503, 8502, 8373, + 8504, 8505, 8502, 8503, + 8500, 8499, 8502, 8505, + 8372, 8377, 8506, 8503, + 8376, 8507, 8506, 8377, + 8508, 8509, 8506, 8507, + 8504, 8503, 8506, 8509, + 8376, 8381, 8510, 8507, + 8380, 8511, 8510, 8381, + 8512, 8513, 8510, 8511, + 8508, 8507, 8510, 8513, + 8380, 8385, 8514, 8511, + 8384, 8515, 8514, 8385, + 8516, 8517, 8514, 8515, + 8512, 8511, 8514, 8517, + 8384, 8389, 8518, 8515, + 8388, 8519, 8518, 8389, + 8520, 8521, 8518, 8519, + 8516, 8515, 8518, 8521, + 8388, 8393, 8522, 8519, + 8392, 8523, 8522, 8393, + 8524, 8525, 8522, 8523, + 8520, 8519, 8522, 8525, + 8392, 8397, 8526, 8523, + 8396, 8527, 8526, 8397, + 8528, 8529, 8526, 8527, + 8524, 8523, 8526, 8529, + 8396, 8401, 8530, 8527, + 8400, 8531, 8530, 8401, + 8532, 8533, 8530, 8531, + 8528, 8527, 8530, 8533, + 8400, 8405, 8534, 8531, + 8404, 8535, 8534, 8405, + 8536, 8537, 8534, 8535, + 8532, 8531, 8534, 8537, + 8404, 8409, 8538, 8535, + 8408, 8539, 8538, 8409, + 8540, 8541, 8538, 8539, + 8536, 8535, 8538, 8541, + 8408, 8413, 8542, 8539, + 8412, 8543, 8542, 8413, + 8544, 8545, 8542, 8543, + 8540, 8539, 8542, 8545, + 8412, 8417, 8546, 8543, + 8416, 8547, 8546, 8417, + 8548, 8549, 8546, 8547, + 8544, 8543, 8546, 8549, + 8416, 8421, 8550, 8547, + 8420, 8551, 8550, 8421, + 8552, 8553, 8550, 8551, + 8548, 8547, 8550, 8553, + 8420, 8425, 8554, 8551, + 8424, 8555, 8554, 8425, + 8556, 8557, 8554, 8555, + 8552, 8551, 8554, 8557, + 8424, 8429, 8558, 8555, + 8428, 8559, 8558, 8429, + 8560, 8561, 8558, 8559, + 8556, 8555, 8558, 8561, + 8428, 8433, 8562, 8559, + 8432, 8563, 8562, 8433, + 8564, 8565, 8562, 8563, + 8560, 8559, 8562, 8565, + 8432, 8437, 8566, 8563, + 8436, 8567, 8566, 8437, + 8568, 8569, 8566, 8567, + 8564, 8563, 8566, 8569, + 8436, 8441, 8570, 8567, + 8440, 8571, 8570, 8441, + 8572, 8573, 8570, 8571, + 8568, 8567, 8570, 8573, + 8440, 8445, 8574, 8571, + 8444, 8575, 8574, 8445, + 8576, 8577, 8574, 8575, + 8572, 8571, 8574, 8577, + 8444, 8449, 8578, 8575, + 8448, 8579, 8578, 8449, + 8580, 8581, 8578, 8579, + 8576, 8575, 8578, 8581, + 5084, 8453, 8582, 5215, + 8452, 8583, 8582, 8453, + 8584, 8585, 8582, 8583, + 5216, 5215, 8582, 8585, + 8452, 8457, 8586, 8583, + 8456, 8587, 8586, 8457, + 8588, 8589, 8586, 8587, + 8584, 8583, 8586, 8589, + 8456, 8461, 8590, 8587, + 8460, 8591, 8590, 8461, + 8592, 8593, 8590, 8591, + 8588, 8587, 8590, 8593, + 8460, 8465, 8594, 8591, + 8464, 8595, 8594, 8465, + 8596, 8597, 8594, 8595, + 8592, 8591, 8594, 8597, + 8464, 8469, 8598, 8595, + 8468, 8599, 8598, 8469, + 8600, 8601, 8598, 8599, + 8596, 8595, 8598, 8601, + 8468, 8473, 8602, 8599, + 8472, 8603, 8602, 8473, + 8604, 8605, 8602, 8603, + 8600, 8599, 8602, 8605, + 8472, 8477, 8606, 8603, + 8476, 8607, 8606, 8477, + 8608, 8609, 8606, 8607, + 8604, 8603, 8606, 8609, + 8476, 8481, 8610, 8607, + 8480, 8611, 8610, 8481, + 8612, 8613, 8610, 8611, + 8608, 8607, 8610, 8613, + 8480, 8485, 8614, 8611, + 8484, 8615, 8614, 8485, + 8616, 8617, 8614, 8615, + 8612, 8611, 8614, 8617, + 8484, 8489, 8618, 8615, + 8488, 8619, 8618, 8489, + 8620, 8621, 8618, 8619, + 8616, 8615, 8618, 8621, + 8488, 8493, 8622, 8619, + 8492, 8623, 8622, 8493, + 8624, 8625, 8622, 8623, + 8620, 8619, 8622, 8625, + 8492, 8497, 8626, 8623, + 8496, 8627, 8626, 8497, + 8628, 8629, 8626, 8627, + 8624, 8623, 8626, 8629, + 8496, 8501, 8630, 8627, + 8500, 8631, 8630, 8501, + 8632, 8633, 8630, 8631, + 8628, 8627, 8630, 8633, + 8500, 8505, 8634, 8631, + 8504, 8635, 8634, 8505, + 8636, 8637, 8634, 8635, + 8632, 8631, 8634, 8637, + 8504, 8509, 8638, 8635, + 8508, 8639, 8638, 8509, + 8640, 8641, 8638, 8639, + 8636, 8635, 8638, 8641, + 8508, 8513, 8642, 8639, + 8512, 8643, 8642, 8513, + 8644, 8645, 8642, 8643, + 8640, 8639, 8642, 8645, + 8512, 8517, 8646, 8643, + 8516, 8647, 8646, 8517, + 8648, 8649, 8646, 8647, + 8644, 8643, 8646, 8649, + 8516, 8521, 8650, 8647, + 8520, 8651, 8650, 8521, + 8652, 8653, 8650, 8651, + 8648, 8647, 8650, 8653, + 8520, 8525, 8654, 8651, + 8524, 8655, 8654, 8525, + 8656, 8657, 8654, 8655, + 8652, 8651, 8654, 8657, + 8524, 8529, 8658, 8655, + 8528, 8659, 8658, 8529, + 8660, 8661, 8658, 8659, + 8656, 8655, 8658, 8661, + 8528, 8533, 8662, 8659, + 8532, 8663, 8662, 8533, + 8664, 8665, 8662, 8663, + 8660, 8659, 8662, 8665, + 8532, 8537, 8666, 8663, + 8536, 8667, 8666, 8537, + 8668, 8669, 8666, 8667, + 8664, 8663, 8666, 8669, + 8536, 8541, 8670, 8667, + 8540, 8671, 8670, 8541, + 8672, 8673, 8670, 8671, + 8668, 8667, 8670, 8673, + 8540, 8545, 8674, 8671, + 8544, 8675, 8674, 8545, + 8676, 8677, 8674, 8675, + 8672, 8671, 8674, 8677, + 8544, 8549, 8678, 8675, + 8548, 8679, 8678, 8549, + 8680, 8681, 8678, 8679, + 8676, 8675, 8678, 8681, + 8548, 8553, 8682, 8679, + 8552, 8683, 8682, 8553, + 8684, 8685, 8682, 8683, + 8680, 8679, 8682, 8685, + 8552, 8557, 8686, 8683, + 8556, 8687, 8686, 8557, + 8688, 8689, 8686, 8687, + 8684, 8683, 8686, 8689, + 8556, 8561, 8690, 8687, + 8560, 8691, 8690, 8561, + 8692, 8693, 8690, 8691, + 8688, 8687, 8690, 8693, + 8560, 8565, 8694, 8691, + 8564, 8695, 8694, 8565, + 8696, 8697, 8694, 8695, + 8692, 8691, 8694, 8697, + 8564, 8569, 8698, 8695, + 8568, 8699, 8698, 8569, + 8700, 8701, 8698, 8699, + 8696, 8695, 8698, 8701, + 8568, 8573, 8702, 8699, + 8572, 8703, 8702, 8573, + 8704, 8705, 8702, 8703, + 8700, 8699, 8702, 8705, + 8572, 8577, 8706, 8703, + 8576, 8707, 8706, 8577, + 8708, 8709, 8706, 8707, + 8704, 8703, 8706, 8709, + 8576, 8581, 8710, 8707, + 8580, 8711, 8710, 8581, + 8712, 8713, 8710, 8711, + 8708, 8707, 8710, 8713, + 5216, 8585, 8714, 5347, + 8584, 8715, 8714, 8585, + 8716, 8717, 8714, 8715, + 5348, 5347, 8714, 8717, + 8584, 8589, 8718, 8715, + 8588, 8719, 8718, 8589, + 8720, 8721, 8718, 8719, + 8716, 8715, 8718, 8721, + 8588, 8593, 8722, 8719, + 8592, 8723, 8722, 8593, + 8724, 8725, 8722, 8723, + 8720, 8719, 8722, 8725, + 8592, 8597, 8726, 8723, + 8596, 8727, 8726, 8597, + 8728, 8729, 8726, 8727, + 8724, 8723, 8726, 8729, + 8596, 8601, 8730, 8727, + 8600, 8731, 8730, 8601, + 8732, 8733, 8730, 8731, + 8728, 8727, 8730, 8733, + 8600, 8605, 8734, 8731, + 8604, 8735, 8734, 8605, + 8736, 8737, 8734, 8735, + 8732, 8731, 8734, 8737, + 8604, 8609, 8738, 8735, + 8608, 8739, 8738, 8609, + 8740, 8741, 8738, 8739, + 8736, 8735, 8738, 8741, + 8608, 8613, 8742, 8739, + 8612, 8743, 8742, 8613, + 8744, 8745, 8742, 8743, + 8740, 8739, 8742, 8745, + 8612, 8617, 8746, 8743, + 8616, 8747, 8746, 8617, + 8748, 8749, 8746, 8747, + 8744, 8743, 8746, 8749, + 8616, 8621, 8750, 8747, + 8620, 8751, 8750, 8621, + 8752, 8753, 8750, 8751, + 8748, 8747, 8750, 8753, + 8620, 8625, 8754, 8751, + 8624, 8755, 8754, 8625, + 8756, 8757, 8754, 8755, + 8752, 8751, 8754, 8757, + 8624, 8629, 8758, 8755, + 8628, 8759, 8758, 8629, + 8760, 8761, 8758, 8759, + 8756, 8755, 8758, 8761, + 8628, 8633, 8762, 8759, + 8632, 8763, 8762, 8633, + 8764, 8765, 8762, 8763, + 8760, 8759, 8762, 8765, + 8632, 8637, 8766, 8763, + 8636, 8767, 8766, 8637, + 8768, 8769, 8766, 8767, + 8764, 8763, 8766, 8769, + 8636, 8641, 8770, 8767, + 8640, 8771, 8770, 8641, + 8772, 8773, 8770, 8771, + 8768, 8767, 8770, 8773, + 8640, 8645, 8774, 8771, + 8644, 8775, 8774, 8645, + 8776, 8777, 8774, 8775, + 8772, 8771, 8774, 8777, + 8644, 8649, 8778, 8775, + 8648, 8779, 8778, 8649, + 8780, 8781, 8778, 8779, + 8776, 8775, 8778, 8781, + 8648, 8653, 8782, 8779, + 8652, 8783, 8782, 8653, + 8784, 8785, 8782, 8783, + 8780, 8779, 8782, 8785, + 8652, 8657, 8786, 8783, + 8656, 8787, 8786, 8657, + 8788, 8789, 8786, 8787, + 8784, 8783, 8786, 8789, + 8656, 8661, 8790, 8787, + 8660, 8791, 8790, 8661, + 8792, 8793, 8790, 8791, + 8788, 8787, 8790, 8793, + 8660, 8665, 8794, 8791, + 8664, 8795, 8794, 8665, + 8796, 8797, 8794, 8795, + 8792, 8791, 8794, 8797, + 8664, 8669, 8798, 8795, + 8668, 8799, 8798, 8669, + 8800, 8801, 8798, 8799, + 8796, 8795, 8798, 8801, + 8668, 8673, 8802, 8799, + 8672, 8803, 8802, 8673, + 8804, 8805, 8802, 8803, + 8800, 8799, 8802, 8805, + 8672, 8677, 8806, 8803, + 8676, 8807, 8806, 8677, + 8808, 8809, 8806, 8807, + 8804, 8803, 8806, 8809, + 8676, 8681, 8810, 8807, + 8680, 8811, 8810, 8681, + 8812, 8813, 8810, 8811, + 8808, 8807, 8810, 8813, + 8680, 8685, 8814, 8811, + 8684, 8815, 8814, 8685, + 8816, 8817, 8814, 8815, + 8812, 8811, 8814, 8817, + 8684, 8689, 8818, 8815, + 8688, 8819, 8818, 8689, + 8820, 8821, 8818, 8819, + 8816, 8815, 8818, 8821, + 8688, 8693, 8822, 8819, + 8692, 8823, 8822, 8693, + 8824, 8825, 8822, 8823, + 8820, 8819, 8822, 8825, + 8692, 8697, 8826, 8823, + 8696, 8827, 8826, 8697, + 8828, 8829, 8826, 8827, + 8824, 8823, 8826, 8829, + 8696, 8701, 8830, 8827, + 8700, 8831, 8830, 8701, + 8832, 8833, 8830, 8831, + 8828, 8827, 8830, 8833, + 8700, 8705, 8834, 8831, + 8704, 8835, 8834, 8705, + 8836, 8837, 8834, 8835, + 8832, 8831, 8834, 8837, + 8704, 8709, 8838, 8835, + 8708, 8839, 8838, 8709, + 8840, 8841, 8838, 8839, + 8836, 8835, 8838, 8841, + 8708, 8713, 8842, 8839, + 8712, 8843, 8842, 8713, + 8844, 8845, 8842, 8843, + 8840, 8839, 8842, 8845, + 5348, 8717, 8846, 5479, + 8716, 8847, 8846, 8717, + 8848, 8849, 8846, 8847, + 5480, 5479, 8846, 8849, + 8716, 8721, 8850, 8847, + 8720, 8851, 8850, 8721, + 8852, 8853, 8850, 8851, + 8848, 8847, 8850, 8853, + 8720, 8725, 8854, 8851, + 8724, 8855, 8854, 8725, + 8856, 8857, 8854, 8855, + 8852, 8851, 8854, 8857, + 8724, 8729, 8858, 8855, + 8728, 8859, 8858, 8729, + 8860, 8861, 8858, 8859, + 8856, 8855, 8858, 8861, + 8728, 8733, 8862, 8859, + 8732, 8863, 8862, 8733, + 8864, 8865, 8862, 8863, + 8860, 8859, 8862, 8865, + 8732, 8737, 8866, 8863, + 8736, 8867, 8866, 8737, + 8868, 8869, 8866, 8867, + 8864, 8863, 8866, 8869, + 8736, 8741, 8870, 8867, + 8740, 8871, 8870, 8741, + 8872, 8873, 8870, 8871, + 8868, 8867, 8870, 8873, + 8740, 8745, 8874, 8871, + 8744, 8875, 8874, 8745, + 8876, 8877, 8874, 8875, + 8872, 8871, 8874, 8877, + 8744, 8749, 8878, 8875, + 8748, 8879, 8878, 8749, + 8880, 8881, 8878, 8879, + 8876, 8875, 8878, 8881, + 8748, 8753, 8882, 8879, + 8752, 8883, 8882, 8753, + 8884, 8885, 8882, 8883, + 8880, 8879, 8882, 8885, + 8752, 8757, 8886, 8883, + 8756, 8887, 8886, 8757, + 8888, 8889, 8886, 8887, + 8884, 8883, 8886, 8889, + 8756, 8761, 8890, 8887, + 8760, 8891, 8890, 8761, + 8892, 8893, 8890, 8891, + 8888, 8887, 8890, 8893, + 8760, 8765, 8894, 8891, + 8764, 8895, 8894, 8765, + 8896, 8897, 8894, 8895, + 8892, 8891, 8894, 8897, + 8764, 8769, 8898, 8895, + 8768, 8899, 8898, 8769, + 8900, 8901, 8898, 8899, + 8896, 8895, 8898, 8901, + 8768, 8773, 8902, 8899, + 8772, 8903, 8902, 8773, + 8904, 8905, 8902, 8903, + 8900, 8899, 8902, 8905, + 8772, 8777, 8906, 8903, + 8776, 8907, 8906, 8777, + 8908, 8909, 8906, 8907, + 8904, 8903, 8906, 8909, + 8776, 8781, 8910, 8907, + 8780, 8911, 8910, 8781, + 8912, 8913, 8910, 8911, + 8908, 8907, 8910, 8913, + 8780, 8785, 8914, 8911, + 8784, 8915, 8914, 8785, + 8916, 8917, 8914, 8915, + 8912, 8911, 8914, 8917, + 8784, 8789, 8918, 8915, + 8788, 8919, 8918, 8789, + 8920, 8921, 8918, 8919, + 8916, 8915, 8918, 8921, + 8788, 8793, 8922, 8919, + 8792, 8923, 8922, 8793, + 8924, 8925, 8922, 8923, + 8920, 8919, 8922, 8925, + 8792, 8797, 8926, 8923, + 8796, 8927, 8926, 8797, + 8928, 8929, 8926, 8927, + 8924, 8923, 8926, 8929, + 8796, 8801, 8930, 8927, + 8800, 8931, 8930, 8801, + 8932, 8933, 8930, 8931, + 8928, 8927, 8930, 8933, + 8800, 8805, 8934, 8931, + 8804, 8935, 8934, 8805, + 8936, 8937, 8934, 8935, + 8932, 8931, 8934, 8937, + 8804, 8809, 8938, 8935, + 8808, 8939, 8938, 8809, + 8940, 8941, 8938, 8939, + 8936, 8935, 8938, 8941, + 8808, 8813, 8942, 8939, + 8812, 8943, 8942, 8813, + 8944, 8945, 8942, 8943, + 8940, 8939, 8942, 8945, + 8812, 8817, 8946, 8943, + 8816, 8947, 8946, 8817, + 8948, 8949, 8946, 8947, + 8944, 8943, 8946, 8949, + 8816, 8821, 8950, 8947, + 8820, 8951, 8950, 8821, + 8952, 8953, 8950, 8951, + 8948, 8947, 8950, 8953, + 8820, 8825, 8954, 8951, + 8824, 8955, 8954, 8825, + 8956, 8957, 8954, 8955, + 8952, 8951, 8954, 8957, + 8824, 8829, 8958, 8955, + 8828, 8959, 8958, 8829, + 8960, 8961, 8958, 8959, + 8956, 8955, 8958, 8961, + 8828, 8833, 8962, 8959, + 8832, 8963, 8962, 8833, + 8964, 8965, 8962, 8963, + 8960, 8959, 8962, 8965, + 8832, 8837, 8966, 8963, + 8836, 8967, 8966, 8837, + 8968, 8969, 8966, 8967, + 8964, 8963, 8966, 8969, + 8836, 8841, 8970, 8967, + 8840, 8971, 8970, 8841, + 8972, 8973, 8970, 8971, + 8968, 8967, 8970, 8973, + 8840, 8845, 8974, 8971, + 8844, 8975, 8974, 8845, + 8976, 8977, 8974, 8975, + 8972, 8971, 8974, 8977, + 5480, 8849, 8978, 5611, + 8848, 8979, 8978, 8849, + 8980, 8981, 8978, 8979, + 5612, 5611, 8978, 8981, + 8848, 8853, 8982, 8979, + 8852, 8983, 8982, 8853, + 8984, 8985, 8982, 8983, + 8980, 8979, 8982, 8985, + 8852, 8857, 8986, 8983, + 8856, 8987, 8986, 8857, + 8988, 8989, 8986, 8987, + 8984, 8983, 8986, 8989, + 8856, 8861, 8990, 8987, + 8860, 8991, 8990, 8861, + 8992, 8993, 8990, 8991, + 8988, 8987, 8990, 8993, + 8860, 8865, 8994, 8991, + 8864, 8995, 8994, 8865, + 8996, 8997, 8994, 8995, + 8992, 8991, 8994, 8997, + 8864, 8869, 8998, 8995, + 8868, 8999, 8998, 8869, + 9000, 9001, 8998, 8999, + 8996, 8995, 8998, 9001, + 8868, 8873, 9002, 8999, + 8872, 9003, 9002, 8873, + 9004, 9005, 9002, 9003, + 9000, 8999, 9002, 9005, + 8872, 8877, 9006, 9003, + 8876, 9007, 9006, 8877, + 9008, 9009, 9006, 9007, + 9004, 9003, 9006, 9009, + 8876, 8881, 9010, 9007, + 8880, 9011, 9010, 8881, + 9012, 9013, 9010, 9011, + 9008, 9007, 9010, 9013, + 8880, 8885, 9014, 9011, + 8884, 9015, 9014, 8885, + 9016, 9017, 9014, 9015, + 9012, 9011, 9014, 9017, + 8884, 8889, 9018, 9015, + 8888, 9019, 9018, 8889, + 9020, 9021, 9018, 9019, + 9016, 9015, 9018, 9021, + 8888, 8893, 9022, 9019, + 8892, 9023, 9022, 8893, + 9024, 9025, 9022, 9023, + 9020, 9019, 9022, 9025, + 8892, 8897, 9026, 9023, + 8896, 9027, 9026, 8897, + 9028, 9029, 9026, 9027, + 9024, 9023, 9026, 9029, + 8896, 8901, 9030, 9027, + 8900, 9031, 9030, 8901, + 9032, 9033, 9030, 9031, + 9028, 9027, 9030, 9033, + 8900, 8905, 9034, 9031, + 8904, 9035, 9034, 8905, + 9036, 9037, 9034, 9035, + 9032, 9031, 9034, 9037, + 8904, 8909, 9038, 9035, + 8908, 9039, 9038, 8909, + 9040, 9041, 9038, 9039, + 9036, 9035, 9038, 9041, + 8908, 8913, 9042, 9039, + 8912, 9043, 9042, 8913, + 9044, 9045, 9042, 9043, + 9040, 9039, 9042, 9045, + 8912, 8917, 9046, 9043, + 8916, 9047, 9046, 8917, + 9048, 9049, 9046, 9047, + 9044, 9043, 9046, 9049, + 8916, 8921, 9050, 9047, + 8920, 9051, 9050, 8921, + 9052, 9053, 9050, 9051, + 9048, 9047, 9050, 9053, + 8920, 8925, 9054, 9051, + 8924, 9055, 9054, 8925, + 9056, 9057, 9054, 9055, + 9052, 9051, 9054, 9057, + 8924, 8929, 9058, 9055, + 8928, 9059, 9058, 8929, + 9060, 9061, 9058, 9059, + 9056, 9055, 9058, 9061, + 8928, 8933, 9062, 9059, + 8932, 9063, 9062, 8933, + 9064, 9065, 9062, 9063, + 9060, 9059, 9062, 9065, + 8932, 8937, 9066, 9063, + 8936, 9067, 9066, 8937, + 9068, 9069, 9066, 9067, + 9064, 9063, 9066, 9069, + 8936, 8941, 9070, 9067, + 8940, 9071, 9070, 8941, + 9072, 9073, 9070, 9071, + 9068, 9067, 9070, 9073, + 8940, 8945, 9074, 9071, + 8944, 9075, 9074, 8945, + 9076, 9077, 9074, 9075, + 9072, 9071, 9074, 9077, + 8944, 8949, 9078, 9075, + 8948, 9079, 9078, 8949, + 9080, 9081, 9078, 9079, + 9076, 9075, 9078, 9081, + 8948, 8953, 9082, 9079, + 8952, 9083, 9082, 8953, + 9084, 9085, 9082, 9083, + 9080, 9079, 9082, 9085, + 8952, 8957, 9086, 9083, + 8956, 9087, 9086, 8957, + 9088, 9089, 9086, 9087, + 9084, 9083, 9086, 9089, + 8956, 8961, 9090, 9087, + 8960, 9091, 9090, 8961, + 9092, 9093, 9090, 9091, + 9088, 9087, 9090, 9093, + 8960, 8965, 9094, 9091, + 8964, 9095, 9094, 8965, + 9096, 9097, 9094, 9095, + 9092, 9091, 9094, 9097, + 8964, 8969, 9098, 9095, + 8968, 9099, 9098, 8969, + 9100, 9101, 9098, 9099, + 9096, 9095, 9098, 9101, + 8968, 8973, 9102, 9099, + 8972, 9103, 9102, 8973, + 9104, 9105, 9102, 9103, + 9100, 9099, 9102, 9105, + 8972, 8977, 9106, 9103, + 8976, 9107, 9106, 8977, + 9108, 9109, 9106, 9107, + 9104, 9103, 9106, 9109, + 5612, 8981, 9110, 5743, + 8980, 9111, 9110, 8981, + 9112, 9113, 9110, 9111, + 5744, 5743, 9110, 9113, + 8980, 8985, 9114, 9111, + 8984, 9115, 9114, 8985, + 9116, 9117, 9114, 9115, + 9112, 9111, 9114, 9117, + 8984, 8989, 9118, 9115, + 8988, 9119, 9118, 8989, + 9120, 9121, 9118, 9119, + 9116, 9115, 9118, 9121, + 8988, 8993, 9122, 9119, + 8992, 9123, 9122, 8993, + 9124, 9125, 9122, 9123, + 9120, 9119, 9122, 9125, + 8992, 8997, 9126, 9123, + 8996, 9127, 9126, 8997, + 9128, 9129, 9126, 9127, + 9124, 9123, 9126, 9129, + 8996, 9001, 9130, 9127, + 9000, 9131, 9130, 9001, + 9132, 9133, 9130, 9131, + 9128, 9127, 9130, 9133, + 9000, 9005, 9134, 9131, + 9004, 9135, 9134, 9005, + 9136, 9137, 9134, 9135, + 9132, 9131, 9134, 9137, + 9004, 9009, 9138, 9135, + 9008, 9139, 9138, 9009, + 9140, 9141, 9138, 9139, + 9136, 9135, 9138, 9141, + 9008, 9013, 9142, 9139, + 9012, 9143, 9142, 9013, + 9144, 9145, 9142, 9143, + 9140, 9139, 9142, 9145, + 9012, 9017, 9146, 9143, + 9016, 9147, 9146, 9017, + 9148, 9149, 9146, 9147, + 9144, 9143, 9146, 9149, + 9016, 9021, 9150, 9147, + 9020, 9151, 9150, 9021, + 9152, 9153, 9150, 9151, + 9148, 9147, 9150, 9153, + 9020, 9025, 9154, 9151, + 9024, 9155, 9154, 9025, + 9156, 9157, 9154, 9155, + 9152, 9151, 9154, 9157, + 9024, 9029, 9158, 9155, + 9028, 9159, 9158, 9029, + 9160, 9161, 9158, 9159, + 9156, 9155, 9158, 9161, + 9028, 9033, 9162, 9159, + 9032, 9163, 9162, 9033, + 9164, 9165, 9162, 9163, + 9160, 9159, 9162, 9165, + 9032, 9037, 9166, 9163, + 9036, 9167, 9166, 9037, + 9168, 9169, 9166, 9167, + 9164, 9163, 9166, 9169, + 9036, 9041, 9170, 9167, + 9040, 9171, 9170, 9041, + 9172, 9173, 9170, 9171, + 9168, 9167, 9170, 9173, + 9040, 9045, 9174, 9171, + 9044, 9175, 9174, 9045, + 9176, 9177, 9174, 9175, + 9172, 9171, 9174, 9177, + 9044, 9049, 9178, 9175, + 9048, 9179, 9178, 9049, + 9180, 9181, 9178, 9179, + 9176, 9175, 9178, 9181, + 9048, 9053, 9182, 9179, + 9052, 9183, 9182, 9053, + 9184, 9185, 9182, 9183, + 9180, 9179, 9182, 9185, + 9052, 9057, 9186, 9183, + 9056, 9187, 9186, 9057, + 9188, 9189, 9186, 9187, + 9184, 9183, 9186, 9189, + 9056, 9061, 9190, 9187, + 9060, 9191, 9190, 9061, + 9192, 9193, 9190, 9191, + 9188, 9187, 9190, 9193, + 9060, 9065, 9194, 9191, + 9064, 9195, 9194, 9065, + 9196, 9197, 9194, 9195, + 9192, 9191, 9194, 9197, + 9064, 9069, 9198, 9195, + 9068, 9199, 9198, 9069, + 9200, 9201, 9198, 9199, + 9196, 9195, 9198, 9201, + 9068, 9073, 9202, 9199, + 9072, 9203, 9202, 9073, + 9204, 9205, 9202, 9203, + 9200, 9199, 9202, 9205, + 9072, 9077, 9206, 9203, + 9076, 9207, 9206, 9077, + 9208, 9209, 9206, 9207, + 9204, 9203, 9206, 9209, + 9076, 9081, 9210, 9207, + 9080, 9211, 9210, 9081, + 9212, 9213, 9210, 9211, + 9208, 9207, 9210, 9213, + 9080, 9085, 9214, 9211, + 9084, 9215, 9214, 9085, + 9216, 9217, 9214, 9215, + 9212, 9211, 9214, 9217, + 9084, 9089, 9218, 9215, + 9088, 9219, 9218, 9089, + 9220, 9221, 9218, 9219, + 9216, 9215, 9218, 9221, + 9088, 9093, 9222, 9219, + 9092, 9223, 9222, 9093, + 9224, 9225, 9222, 9223, + 9220, 9219, 9222, 9225, + 9092, 9097, 9226, 9223, + 9096, 9227, 9226, 9097, + 9228, 9229, 9226, 9227, + 9224, 9223, 9226, 9229, + 9096, 9101, 9230, 9227, + 9100, 9231, 9230, 9101, + 9232, 9233, 9230, 9231, + 9228, 9227, 9230, 9233, + 9100, 9105, 9234, 9231, + 9104, 9235, 9234, 9105, + 9236, 9237, 9234, 9235, + 9232, 9231, 9234, 9237, + 9104, 9109, 9238, 9235, + 9108, 9239, 9238, 9109, + 9240, 9241, 9238, 9239, + 9236, 9235, 9238, 9241, + 5744, 9113, 9242, 5875, + 9112, 9243, 9242, 9113, + 9244, 9245, 9242, 9243, + 5876, 5875, 9242, 9245, + 9112, 9117, 9246, 9243, + 9116, 9247, 9246, 9117, + 9248, 9249, 9246, 9247, + 9244, 9243, 9246, 9249, + 9116, 9121, 9250, 9247, + 9120, 9251, 9250, 9121, + 9252, 9253, 9250, 9251, + 9248, 9247, 9250, 9253, + 9120, 9125, 9254, 9251, + 9124, 9255, 9254, 9125, + 9256, 9257, 9254, 9255, + 9252, 9251, 9254, 9257, + 9124, 9129, 9258, 9255, + 9128, 9259, 9258, 9129, + 9260, 9261, 9258, 9259, + 9256, 9255, 9258, 9261, + 9128, 9133, 9262, 9259, + 9132, 9263, 9262, 9133, + 9264, 9265, 9262, 9263, + 9260, 9259, 9262, 9265, + 9132, 9137, 9266, 9263, + 9136, 9267, 9266, 9137, + 9268, 9269, 9266, 9267, + 9264, 9263, 9266, 9269, + 9136, 9141, 9270, 9267, + 9140, 9271, 9270, 9141, + 9272, 9273, 9270, 9271, + 9268, 9267, 9270, 9273, + 9140, 9145, 9274, 9271, + 9144, 9275, 9274, 9145, + 9276, 9277, 9274, 9275, + 9272, 9271, 9274, 9277, + 9144, 9149, 9278, 9275, + 9148, 9279, 9278, 9149, + 9280, 9281, 9278, 9279, + 9276, 9275, 9278, 9281, + 9148, 9153, 9282, 9279, + 9152, 9283, 9282, 9153, + 9284, 9285, 9282, 9283, + 9280, 9279, 9282, 9285, + 9152, 9157, 9286, 9283, + 9156, 9287, 9286, 9157, + 9288, 9289, 9286, 9287, + 9284, 9283, 9286, 9289, + 9156, 9161, 9290, 9287, + 9160, 9291, 9290, 9161, + 9292, 9293, 9290, 9291, + 9288, 9287, 9290, 9293, + 9160, 9165, 9294, 9291, + 9164, 9295, 9294, 9165, + 9296, 9297, 9294, 9295, + 9292, 9291, 9294, 9297, + 9164, 9169, 9298, 9295, + 9168, 9299, 9298, 9169, + 9300, 9301, 9298, 9299, + 9296, 9295, 9298, 9301, + 9168, 9173, 9302, 9299, + 9172, 9303, 9302, 9173, + 9304, 9305, 9302, 9303, + 9300, 9299, 9302, 9305, + 9172, 9177, 9306, 9303, + 9176, 9307, 9306, 9177, + 9308, 9309, 9306, 9307, + 9304, 9303, 9306, 9309, + 9176, 9181, 9310, 9307, + 9180, 9311, 9310, 9181, + 9312, 9313, 9310, 9311, + 9308, 9307, 9310, 9313, + 9180, 9185, 9314, 9311, + 9184, 9315, 9314, 9185, + 9316, 9317, 9314, 9315, + 9312, 9311, 9314, 9317, + 9184, 9189, 9318, 9315, + 9188, 9319, 9318, 9189, + 9320, 9321, 9318, 9319, + 9316, 9315, 9318, 9321, + 9188, 9193, 9322, 9319, + 9192, 9323, 9322, 9193, + 9324, 9325, 9322, 9323, + 9320, 9319, 9322, 9325, + 9192, 9197, 9326, 9323, + 9196, 9327, 9326, 9197, + 9328, 9329, 9326, 9327, + 9324, 9323, 9326, 9329, + 9196, 9201, 9330, 9327, + 9200, 9331, 9330, 9201, + 9332, 9333, 9330, 9331, + 9328, 9327, 9330, 9333, + 9200, 9205, 9334, 9331, + 9204, 9335, 9334, 9205, + 9336, 9337, 9334, 9335, + 9332, 9331, 9334, 9337, + 9204, 9209, 9338, 9335, + 9208, 9339, 9338, 9209, + 9340, 9341, 9338, 9339, + 9336, 9335, 9338, 9341, + 9208, 9213, 9342, 9339, + 9212, 9343, 9342, 9213, + 9344, 9345, 9342, 9343, + 9340, 9339, 9342, 9345, + 9212, 9217, 9346, 9343, + 9216, 9347, 9346, 9217, + 9348, 9349, 9346, 9347, + 9344, 9343, 9346, 9349, + 9216, 9221, 9350, 9347, + 9220, 9351, 9350, 9221, + 9352, 9353, 9350, 9351, + 9348, 9347, 9350, 9353, + 9220, 9225, 9354, 9351, + 9224, 9355, 9354, 9225, + 9356, 9357, 9354, 9355, + 9352, 9351, 9354, 9357, + 9224, 9229, 9358, 9355, + 9228, 9359, 9358, 9229, + 9360, 9361, 9358, 9359, + 9356, 9355, 9358, 9361, + 9228, 9233, 9362, 9359, + 9232, 9363, 9362, 9233, + 9364, 9365, 9362, 9363, + 9360, 9359, 9362, 9365, + 9232, 9237, 9366, 9363, + 9236, 9367, 9366, 9237, + 9368, 9369, 9366, 9367, + 9364, 9363, 9366, 9369, + 9236, 9241, 9370, 9367, + 9240, 9371, 9370, 9241, + 9372, 9373, 9370, 9371, + 9368, 9367, 9370, 9373, + 5876, 9245, 9374, 6007, + 9244, 9375, 9374, 9245, + 9376, 9377, 9374, 9375, + 6008, 6007, 9374, 9377, + 9244, 9249, 9378, 9375, + 9248, 9379, 9378, 9249, + 9380, 9381, 9378, 9379, + 9376, 9375, 9378, 9381, + 9248, 9253, 9382, 9379, + 9252, 9383, 9382, 9253, + 9384, 9385, 9382, 9383, + 9380, 9379, 9382, 9385, + 9252, 9257, 9386, 9383, + 9256, 9387, 9386, 9257, + 9388, 9389, 9386, 9387, + 9384, 9383, 9386, 9389, + 9256, 9261, 9390, 9387, + 9260, 9391, 9390, 9261, + 9392, 9393, 9390, 9391, + 9388, 9387, 9390, 9393, + 9260, 9265, 9394, 9391, + 9264, 9395, 9394, 9265, + 9396, 9397, 9394, 9395, + 9392, 9391, 9394, 9397, + 9264, 9269, 9398, 9395, + 9268, 9399, 9398, 9269, + 9400, 9401, 9398, 9399, + 9396, 9395, 9398, 9401, + 9268, 9273, 9402, 9399, + 9272, 9403, 9402, 9273, + 9404, 9405, 9402, 9403, + 9400, 9399, 9402, 9405, + 9272, 9277, 9406, 9403, + 9276, 9407, 9406, 9277, + 9408, 9409, 9406, 9407, + 9404, 9403, 9406, 9409, + 9276, 9281, 9410, 9407, + 9280, 9411, 9410, 9281, + 9412, 9413, 9410, 9411, + 9408, 9407, 9410, 9413, + 9280, 9285, 9414, 9411, + 9284, 9415, 9414, 9285, + 9416, 9417, 9414, 9415, + 9412, 9411, 9414, 9417, + 9284, 9289, 9418, 9415, + 9288, 9419, 9418, 9289, + 9420, 9421, 9418, 9419, + 9416, 9415, 9418, 9421, + 9288, 9293, 9422, 9419, + 9292, 9423, 9422, 9293, + 9424, 9425, 9422, 9423, + 9420, 9419, 9422, 9425, + 9292, 9297, 9426, 9423, + 9296, 9427, 9426, 9297, + 9428, 9429, 9426, 9427, + 9424, 9423, 9426, 9429, + 9296, 9301, 9430, 9427, + 9300, 9431, 9430, 9301, + 9432, 9433, 9430, 9431, + 9428, 9427, 9430, 9433, + 9300, 9305, 9434, 9431, + 9304, 9435, 9434, 9305, + 9436, 9437, 9434, 9435, + 9432, 9431, 9434, 9437, + 9304, 9309, 9438, 9435, + 9308, 9439, 9438, 9309, + 9440, 9441, 9438, 9439, + 9436, 9435, 9438, 9441, + 9308, 9313, 9442, 9439, + 9312, 9443, 9442, 9313, + 9444, 9445, 9442, 9443, + 9440, 9439, 9442, 9445, + 9312, 9317, 9446, 9443, + 9316, 9447, 9446, 9317, + 9448, 9449, 9446, 9447, + 9444, 9443, 9446, 9449, + 9316, 9321, 9450, 9447, + 9320, 9451, 9450, 9321, + 9452, 9453, 9450, 9451, + 9448, 9447, 9450, 9453, + 9320, 9325, 9454, 9451, + 9324, 9455, 9454, 9325, + 9456, 9457, 9454, 9455, + 9452, 9451, 9454, 9457, + 9324, 9329, 9458, 9455, + 9328, 9459, 9458, 9329, + 9460, 9461, 9458, 9459, + 9456, 9455, 9458, 9461, + 9328, 9333, 9462, 9459, + 9332, 9463, 9462, 9333, + 9464, 9465, 9462, 9463, + 9460, 9459, 9462, 9465, + 9332, 9337, 9466, 9463, + 9336, 9467, 9466, 9337, + 9468, 9469, 9466, 9467, + 9464, 9463, 9466, 9469, + 9336, 9341, 9470, 9467, + 9340, 9471, 9470, 9341, + 9472, 9473, 9470, 9471, + 9468, 9467, 9470, 9473, + 9340, 9345, 9474, 9471, + 9344, 9475, 9474, 9345, + 9476, 9477, 9474, 9475, + 9472, 9471, 9474, 9477, + 9344, 9349, 9478, 9475, + 9348, 9479, 9478, 9349, + 9480, 9481, 9478, 9479, + 9476, 9475, 9478, 9481, + 9348, 9353, 9482, 9479, + 9352, 9483, 9482, 9353, + 9484, 9485, 9482, 9483, + 9480, 9479, 9482, 9485, + 9352, 9357, 9486, 9483, + 9356, 9487, 9486, 9357, + 9488, 9489, 9486, 9487, + 9484, 9483, 9486, 9489, + 9356, 9361, 9490, 9487, + 9360, 9491, 9490, 9361, + 9492, 9493, 9490, 9491, + 9488, 9487, 9490, 9493, + 9360, 9365, 9494, 9491, + 9364, 9495, 9494, 9365, + 9496, 9497, 9494, 9495, + 9492, 9491, 9494, 9497, + 9364, 9369, 9498, 9495, + 9368, 9499, 9498, 9369, + 9500, 9501, 9498, 9499, + 9496, 9495, 9498, 9501, + 9368, 9373, 9502, 9499, + 9372, 9503, 9502, 9373, + 9504, 9505, 9502, 9503, + 9500, 9499, 9502, 9505, + 9440, 9445, 9506, 9441, + 9444, 9507, 9506, 9445, + 9508, 9509, 9506, 9507, + 9436, 9441, 9506, 9509, + 9444, 9449, 9510, 9507, + 9448, 9511, 9510, 9449, + 9512, 9513, 9510, 9511, + 9508, 9507, 9510, 9513, + 9448, 9453, 9514, 9511, + 9452, 9515, 9514, 9453, + 9516, 9517, 9514, 9515, + 9512, 9511, 9514, 9517, + 9452, 9457, 9518, 9515, + 9456, 9519, 9518, 9457, + 9520, 9521, 9518, 9519, + 9516, 9515, 9518, 9521, + 9456, 9461, 9522, 9519, + 9460, 9523, 9522, 9461, + 9524, 9525, 9522, 9523, + 9520, 9519, 9522, 9525, + 9460, 9465, 9526, 9523, + 9464, 9527, 9526, 9465, + 9528, 9529, 9526, 9527, + 9524, 9523, 9526, 9529, + 9464, 9469, 9530, 9527, + 9468, 9531, 9530, 9469, + 9532, 9533, 9530, 9531, + 9528, 9527, 9530, 9533, + 9468, 9473, 9534, 9531, + 9472, 9535, 9534, 9473, + 9536, 9537, 9534, 9535, + 9532, 9531, 9534, 9537, + 9472, 9477, 9538, 9535, + 9476, 9539, 9538, 9477, + 9540, 9541, 9538, 9539, + 9536, 9535, 9538, 9541, + 9476, 9481, 9542, 9539, + 9480, 9543, 9542, 9481, + 9544, 9545, 9542, 9543, + 9540, 9539, 9542, 9545, + 9480, 9485, 9546, 9543, + 9484, 9547, 9546, 9485, + 9548, 9549, 9546, 9547, + 9544, 9543, 9546, 9549, + 9484, 9489, 9550, 9547, + 9488, 9551, 9550, 9489, + 9552, 9553, 9550, 9551, + 9548, 9547, 9550, 9553, + 9488, 9493, 9554, 9551, + 9492, 9555, 9554, 9493, + 9556, 9557, 9554, 9555, + 9552, 9551, 9554, 9557, + 9492, 9497, 9558, 9555, + 9496, 9559, 9558, 9497, + 9560, 9561, 9558, 9559, + 9556, 9555, 9558, 9561, + 9496, 9501, 9562, 9559, + 9500, 9563, 9562, 9501, + 9564, 9565, 9562, 9563, + 9560, 9559, 9562, 9565, + 9500, 9505, 9566, 9563, + 9504, 9567, 9566, 9505, + 9568, 9569, 9566, 9567, + 9564, 9563, 9566, 9569, + 9436, 9509, 9570, 9437, + 9508, 9571, 9570, 9509, + 9572, 9573, 9570, 9571, + 9432, 9437, 9570, 9573, + 9508, 9513, 9574, 9571, + 9512, 9575, 9574, 9513, + 9576, 9577, 9574, 9575, + 9572, 9571, 9574, 9577, + 9512, 9517, 9578, 9575, + 9516, 9579, 9578, 9517, + 9580, 9581, 9578, 9579, + 9576, 9575, 9578, 9581, + 9516, 9521, 9582, 9579, + 9520, 9583, 9582, 9521, + 9584, 9585, 9582, 9583, + 9580, 9579, 9582, 9585, + 9520, 9525, 9586, 9583, + 9524, 9587, 9586, 9525, + 9588, 9589, 9586, 9587, + 9584, 9583, 9586, 9589, + 9524, 9529, 9590, 9587, + 9528, 9591, 9590, 9529, + 9592, 9593, 9590, 9591, + 9588, 9587, 9590, 9593, + 9528, 9533, 9594, 9591, + 9532, 9595, 9594, 9533, + 9596, 9597, 9594, 9595, + 9592, 9591, 9594, 9597, + 9532, 9537, 9598, 9595, + 9536, 9599, 9598, 9537, + 9600, 9601, 9598, 9599, + 9596, 9595, 9598, 9601, + 9536, 9541, 9602, 9599, + 9540, 9603, 9602, 9541, + 9604, 9605, 9602, 9603, + 9600, 9599, 9602, 9605, + 9540, 9545, 9606, 9603, + 9544, 9607, 9606, 9545, + 9608, 9609, 9606, 9607, + 9604, 9603, 9606, 9609, + 9544, 9549, 9610, 9607, + 9548, 9611, 9610, 9549, + 9612, 9613, 9610, 9611, + 9608, 9607, 9610, 9613, + 9548, 9553, 9614, 9611, + 9552, 9615, 9614, 9553, + 9616, 9617, 9614, 9615, + 9612, 9611, 9614, 9617, + 9552, 9557, 9618, 9615, + 9556, 9619, 9618, 9557, + 9620, 9621, 9618, 9619, + 9616, 9615, 9618, 9621, + 9556, 9561, 9622, 9619, + 9560, 9623, 9622, 9561, + 9624, 9625, 9622, 9623, + 9620, 9619, 9622, 9625, + 9560, 9565, 9626, 9623, + 9564, 9627, 9626, 9565, + 9628, 9629, 9626, 9627, + 9624, 9623, 9626, 9629, + 9564, 9569, 9630, 9627, + 9568, 9631, 9630, 9569, + 9632, 9633, 9630, 9631, + 9628, 9627, 9630, 9633, + 9432, 9573, 9634, 9433, + 9572, 9635, 9634, 9573, + 9636, 9637, 9634, 9635, + 9428, 9433, 9634, 9637, + 9572, 9577, 9638, 9635, + 9576, 9639, 9638, 9577, + 9640, 9641, 9638, 9639, + 9636, 9635, 9638, 9641, + 9576, 9581, 9642, 9639, + 9580, 9643, 9642, 9581, + 9644, 9645, 9642, 9643, + 9640, 9639, 9642, 9645, + 9580, 9585, 9646, 9643, + 9584, 9647, 9646, 9585, + 9648, 9649, 9646, 9647, + 9644, 9643, 9646, 9649, + 9584, 9589, 9650, 9647, + 9588, 9651, 9650, 9589, + 9652, 9653, 9650, 9651, + 9648, 9647, 9650, 9653, + 9588, 9593, 9654, 9651, + 9592, 9655, 9654, 9593, + 9656, 9657, 9654, 9655, + 9652, 9651, 9654, 9657, + 9592, 9597, 9658, 9655, + 9596, 9659, 9658, 9597, + 9660, 9661, 9658, 9659, + 9656, 9655, 9658, 9661, + 9596, 9601, 9662, 9659, + 9600, 9663, 9662, 9601, + 9664, 9665, 9662, 9663, + 9660, 9659, 9662, 9665, + 9600, 9605, 9666, 9663, + 9604, 9667, 9666, 9605, + 9668, 9669, 9666, 9667, + 9664, 9663, 9666, 9669, + 9604, 9609, 9670, 9667, + 9608, 9671, 9670, 9609, + 9672, 9673, 9670, 9671, + 9668, 9667, 9670, 9673, + 9608, 9613, 9674, 9671, + 9612, 9675, 9674, 9613, + 9676, 9677, 9674, 9675, + 9672, 9671, 9674, 9677, + 9612, 9617, 9678, 9675, + 9616, 9679, 9678, 9617, + 9680, 9681, 9678, 9679, + 9676, 9675, 9678, 9681, + 9616, 9621, 9682, 9679, + 9620, 9683, 9682, 9621, + 9684, 9685, 9682, 9683, + 9680, 9679, 9682, 9685, + 9620, 9625, 9686, 9683, + 9624, 9687, 9686, 9625, + 9688, 9689, 9686, 9687, + 9684, 9683, 9686, 9689, + 9624, 9629, 9690, 9687, + 9628, 9691, 9690, 9629, + 9692, 9693, 9690, 9691, + 9688, 9687, 9690, 9693, + 9628, 9633, 9694, 9691, + 9632, 9695, 9694, 9633, + 9696, 9697, 9694, 9695, + 9692, 9691, 9694, 9697, + 9428, 9637, 9698, 9429, + 9636, 9699, 9698, 9637, + 9700, 9701, 9698, 9699, + 9424, 9429, 9698, 9701, + 9636, 9641, 9702, 9699, + 9640, 9703, 9702, 9641, + 9704, 9705, 9702, 9703, + 9700, 9699, 9702, 9705, + 9640, 9645, 9706, 9703, + 9644, 9707, 9706, 9645, + 9708, 9709, 9706, 9707, + 9704, 9703, 9706, 9709, + 9644, 9649, 9710, 9707, + 9648, 9711, 9710, 9649, + 9712, 9713, 9710, 9711, + 9708, 9707, 9710, 9713, + 9648, 9653, 9714, 9711, + 9652, 9715, 9714, 9653, + 9716, 9717, 9714, 9715, + 9712, 9711, 9714, 9717, + 9652, 9657, 9718, 9715, + 9656, 9719, 9718, 9657, + 9720, 9721, 9718, 9719, + 9716, 9715, 9718, 9721, + 9656, 9661, 9722, 9719, + 9660, 9723, 9722, 9661, + 9724, 9725, 9722, 9723, + 9720, 9719, 9722, 9725, + 9660, 9665, 9726, 9723, + 9664, 9727, 9726, 9665, + 9728, 9729, 9726, 9727, + 9724, 9723, 9726, 9729, + 9664, 9669, 9730, 9727, + 9668, 9731, 9730, 9669, + 9732, 9733, 9730, 9731, + 9728, 9727, 9730, 9733, + 9668, 9673, 9734, 9731, + 9672, 9735, 9734, 9673, + 9736, 9737, 9734, 9735, + 9732, 9731, 9734, 9737, + 9672, 9677, 9738, 9735, + 9676, 9739, 9738, 9677, + 9740, 9741, 9738, 9739, + 9736, 9735, 9738, 9741, + 9676, 9681, 9742, 9739, + 9680, 9743, 9742, 9681, + 9744, 9745, 9742, 9743, + 9740, 9739, 9742, 9745, + 9680, 9685, 9746, 9743, + 9684, 9747, 9746, 9685, + 9748, 9749, 9746, 9747, + 9744, 9743, 9746, 9749, + 9684, 9689, 9750, 9747, + 9688, 9751, 9750, 9689, + 9752, 9753, 9750, 9751, + 9748, 9747, 9750, 9753, + 9688, 9693, 9754, 9751, + 9692, 9755, 9754, 9693, + 9756, 9757, 9754, 9755, + 9752, 9751, 9754, 9757, + 9692, 9697, 9758, 9755, + 9696, 9759, 9758, 9697, + 9760, 9761, 9758, 9759, + 9756, 9755, 9758, 9761, + 9424, 9701, 9762, 9425, + 9700, 9763, 9762, 9701, + 9764, 9765, 9762, 9763, + 9420, 9425, 9762, 9765, + 9700, 9705, 9766, 9763, + 9704, 9767, 9766, 9705, + 9768, 9769, 9766, 9767, + 9764, 9763, 9766, 9769, + 9704, 9709, 9770, 9767, + 9708, 9771, 9770, 9709, + 9772, 9773, 9770, 9771, + 9768, 9767, 9770, 9773, + 9708, 9713, 9774, 9771, + 9712, 9775, 9774, 9713, + 9776, 9777, 9774, 9775, + 9772, 9771, 9774, 9777, + 9712, 9717, 9778, 9775, + 9716, 9779, 9778, 9717, + 9780, 9781, 9778, 9779, + 9776, 9775, 9778, 9781, + 9716, 9721, 9782, 9779, + 9720, 9783, 9782, 9721, + 9784, 9785, 9782, 9783, + 9780, 9779, 9782, 9785, + 9720, 9725, 9786, 9783, + 9724, 9787, 9786, 9725, + 9788, 9789, 9786, 9787, + 9784, 9783, 9786, 9789, + 9724, 9729, 9790, 9787, + 9728, 9791, 9790, 9729, + 9792, 9793, 9790, 9791, + 9788, 9787, 9790, 9793, + 9728, 9733, 9794, 9791, + 9732, 9795, 9794, 9733, + 9796, 9797, 9794, 9795, + 9792, 9791, 9794, 9797, + 9732, 9737, 9798, 9795, + 9736, 9799, 9798, 9737, + 9800, 9801, 9798, 9799, + 9796, 9795, 9798, 9801, + 9736, 9741, 9802, 9799, + 9740, 9803, 9802, 9741, + 9804, 9805, 9802, 9803, + 9800, 9799, 9802, 9805, + 9740, 9745, 9806, 9803, + 9744, 9807, 9806, 9745, + 9808, 9809, 9806, 9807, + 9804, 9803, 9806, 9809, + 9744, 9749, 9810, 9807, + 9748, 9811, 9810, 9749, + 9812, 9813, 9810, 9811, + 9808, 9807, 9810, 9813, + 9748, 9753, 9814, 9811, + 9752, 9815, 9814, 9753, + 9816, 9817, 9814, 9815, + 9812, 9811, 9814, 9817, + 9752, 9757, 9818, 9815, + 9756, 9819, 9818, 9757, + 9820, 9821, 9818, 9819, + 9816, 9815, 9818, 9821, + 9756, 9761, 9822, 9819, + 9760, 9823, 9822, 9761, + 9824, 9825, 9822, 9823, + 9820, 9819, 9822, 9825, + 9420, 9765, 9826, 9421, + 9764, 9827, 9826, 9765, + 9828, 9829, 9826, 9827, + 9416, 9421, 9826, 9829, + 9764, 9769, 9830, 9827, + 9768, 9831, 9830, 9769, + 9832, 9833, 9830, 9831, + 9828, 9827, 9830, 9833, + 9768, 9773, 9834, 9831, + 9772, 9835, 9834, 9773, + 9836, 9837, 9834, 9835, + 9832, 9831, 9834, 9837, + 9772, 9777, 9838, 9835, + 9776, 9839, 9838, 9777, + 9840, 9841, 9838, 9839, + 9836, 9835, 9838, 9841, + 9776, 9781, 9842, 9839, + 9780, 9843, 9842, 9781, + 9844, 9845, 9842, 9843, + 9840, 9839, 9842, 9845, + 9780, 9785, 9846, 9843, + 9784, 9847, 9846, 9785, + 9848, 9849, 9846, 9847, + 9844, 9843, 9846, 9849, + 9784, 9789, 9850, 9847, + 9788, 9851, 9850, 9789, + 9852, 9853, 9850, 9851, + 9848, 9847, 9850, 9853, + 9788, 9793, 9854, 9851, + 9792, 9855, 9854, 9793, + 9856, 9857, 9854, 9855, + 9852, 9851, 9854, 9857, + 9792, 9797, 9858, 9855, + 9796, 9859, 9858, 9797, + 9860, 9861, 9858, 9859, + 9856, 9855, 9858, 9861, + 9796, 9801, 9862, 9859, + 9800, 9863, 9862, 9801, + 9864, 9865, 9862, 9863, + 9860, 9859, 9862, 9865, + 9800, 9805, 9866, 9863, + 9804, 9867, 9866, 9805, + 9868, 9869, 9866, 9867, + 9864, 9863, 9866, 9869, + 9804, 9809, 9870, 9867, + 9808, 9871, 9870, 9809, + 9872, 9873, 9870, 9871, + 9868, 9867, 9870, 9873, + 9808, 9813, 9874, 9871, + 9812, 9875, 9874, 9813, + 9876, 9877, 9874, 9875, + 9872, 9871, 9874, 9877, + 9812, 9817, 9878, 9875, + 9816, 9879, 9878, 9817, + 9880, 9881, 9878, 9879, + 9876, 9875, 9878, 9881, + 9816, 9821, 9882, 9879, + 9820, 9883, 9882, 9821, + 9884, 9885, 9882, 9883, + 9880, 9879, 9882, 9885, + 9820, 9825, 9886, 9883, + 9824, 9887, 9886, 9825, + 9888, 9889, 9886, 9887, + 9884, 9883, 9886, 9889, + 9416, 9829, 9890, 9417, + 9828, 9891, 9890, 9829, + 9892, 9893, 9890, 9891, + 9412, 9417, 9890, 9893, + 9828, 9833, 9894, 9891, + 9832, 9895, 9894, 9833, + 9896, 9897, 9894, 9895, + 9892, 9891, 9894, 9897, + 9832, 9837, 9898, 9895, + 9836, 9899, 9898, 9837, + 9900, 9901, 9898, 9899, + 9896, 9895, 9898, 9901, + 9836, 9841, 9902, 9899, + 9840, 9903, 9902, 9841, + 9904, 9905, 9902, 9903, + 9900, 9899, 9902, 9905, + 9840, 9845, 9906, 9903, + 9844, 9907, 9906, 9845, + 9908, 9909, 9906, 9907, + 9904, 9903, 9906, 9909, + 9844, 9849, 9910, 9907, + 9848, 9911, 9910, 9849, + 9912, 9913, 9910, 9911, + 9908, 9907, 9910, 9913, + 9848, 9853, 9914, 9911, + 9852, 9915, 9914, 9853, + 9916, 9917, 9914, 9915, + 9912, 9911, 9914, 9917, + 9852, 9857, 9918, 9915, + 9856, 9919, 9918, 9857, + 9920, 9921, 9918, 9919, + 9916, 9915, 9918, 9921, + 9856, 9861, 9922, 9919, + 9860, 9923, 9922, 9861, + 9924, 9925, 9922, 9923, + 9920, 9919, 9922, 9925, + 9860, 9865, 9926, 9923, + 9864, 9927, 9926, 9865, + 9928, 9929, 9926, 9927, + 9924, 9923, 9926, 9929, + 9864, 9869, 9930, 9927, + 9868, 9931, 9930, 9869, + 9932, 9933, 9930, 9931, + 9928, 9927, 9930, 9933, + 9868, 9873, 9934, 9931, + 9872, 9935, 9934, 9873, + 9936, 9937, 9934, 9935, + 9932, 9931, 9934, 9937, + 9872, 9877, 9938, 9935, + 9876, 9939, 9938, 9877, + 9940, 9941, 9938, 9939, + 9936, 9935, 9938, 9941, + 9876, 9881, 9942, 9939, + 9880, 9943, 9942, 9881, + 9944, 9945, 9942, 9943, + 9940, 9939, 9942, 9945, + 9880, 9885, 9946, 9943, + 9884, 9947, 9946, 9885, + 9948, 9949, 9946, 9947, + 9944, 9943, 9946, 9949, + 9884, 9889, 9950, 9947, + 9888, 9951, 9950, 9889, + 9952, 9953, 9950, 9951, + 9948, 9947, 9950, 9953, + 9412, 9893, 9954, 9413, + 9892, 9955, 9954, 9893, + 9956, 9957, 9954, 9955, + 9408, 9413, 9954, 9957, + 9892, 9897, 9958, 9955, + 9896, 9959, 9958, 9897, + 9960, 9961, 9958, 9959, + 9956, 9955, 9958, 9961, + 9896, 9901, 9962, 9959, + 9900, 9963, 9962, 9901, + 9964, 9965, 9962, 9963, + 9960, 9959, 9962, 9965, + 9900, 9905, 9966, 9963, + 9904, 9967, 9966, 9905, + 9968, 9969, 9966, 9967, + 9964, 9963, 9966, 9969, + 9904, 9909, 9970, 9967, + 9908, 9971, 9970, 9909, + 9972, 9973, 9970, 9971, + 9968, 9967, 9970, 9973, + 9908, 9913, 9974, 9971, + 9912, 9975, 9974, 9913, + 9976, 9977, 9974, 9975, + 9972, 9971, 9974, 9977, + 9912, 9917, 9978, 9975, + 9916, 9979, 9978, 9917, + 9980, 9981, 9978, 9979, + 9976, 9975, 9978, 9981, + 9916, 9921, 9982, 9979, + 9920, 9983, 9982, 9921, + 9984, 9985, 9982, 9983, + 9980, 9979, 9982, 9985, + 9920, 9925, 9986, 9983, + 9924, 9987, 9986, 9925, + 9988, 9989, 9986, 9987, + 9984, 9983, 9986, 9989, + 9924, 9929, 9990, 9987, + 9928, 9991, 9990, 9929, + 9992, 9993, 9990, 9991, + 9988, 9987, 9990, 9993, + 9928, 9933, 9994, 9991, + 9932, 9995, 9994, 9933, + 9996, 9997, 9994, 9995, + 9992, 9991, 9994, 9997, + 9932, 9937, 9998, 9995, + 9936, 9999, 9998, 9937, + 10000, 10001, 9998, 9999, + 9996, 9995, 9998, 10001, + 9936, 9941, 10002, 9999, + 9940, 10003, 10002, 9941, + 10004, 10005, 10002, 10003, + 10000, 9999, 10002, 10005, + 9940, 9945, 10006, 10003, + 9944, 10007, 10006, 9945, + 10008, 10009, 10006, 10007, + 10004, 10003, 10006, 10009, + 9944, 9949, 10010, 10007, + 9948, 10011, 10010, 9949, + 10012, 10013, 10010, 10011, + 10008, 10007, 10010, 10013, + 9948, 9953, 10014, 10011, + 9952, 10015, 10014, 9953, + 10016, 10017, 10014, 10015, + 10012, 10011, 10014, 10017, + 9408, 9957, 10018, 9409, + 9956, 10019, 10018, 9957, + 10020, 10021, 10018, 10019, + 9404, 9409, 10018, 10021, + 9956, 9961, 10022, 10019, + 9960, 10023, 10022, 9961, + 10024, 10025, 10022, 10023, + 10020, 10019, 10022, 10025, + 9960, 9965, 10026, 10023, + 9964, 10027, 10026, 9965, + 10028, 10029, 10026, 10027, + 10024, 10023, 10026, 10029, + 9964, 9969, 10030, 10027, + 9968, 10031, 10030, 9969, + 10032, 10033, 10030, 10031, + 10028, 10027, 10030, 10033, + 9968, 9973, 10034, 10031, + 9972, 10035, 10034, 9973, + 10036, 10037, 10034, 10035, + 10032, 10031, 10034, 10037, + 9972, 9977, 10038, 10035, + 9976, 10039, 10038, 9977, + 10040, 10041, 10038, 10039, + 10036, 10035, 10038, 10041, + 9976, 9981, 10042, 10039, + 9980, 10043, 10042, 9981, + 10044, 10045, 10042, 10043, + 10040, 10039, 10042, 10045, + 9980, 9985, 10046, 10043, + 9984, 10047, 10046, 9985, + 10048, 10049, 10046, 10047, + 10044, 10043, 10046, 10049, + 9984, 9989, 10050, 10047, + 9988, 10051, 10050, 9989, + 10052, 10053, 10050, 10051, + 10048, 10047, 10050, 10053, + 9988, 9993, 10054, 10051, + 9992, 10055, 10054, 9993, + 10056, 10057, 10054, 10055, + 10052, 10051, 10054, 10057, + 9992, 9997, 10058, 10055, + 9996, 10059, 10058, 9997, + 10060, 10061, 10058, 10059, + 10056, 10055, 10058, 10061, + 9996, 10001, 10062, 10059, + 10000, 10063, 10062, 10001, + 10064, 10065, 10062, 10063, + 10060, 10059, 10062, 10065, + 10000, 10005, 10066, 10063, + 10004, 10067, 10066, 10005, + 10068, 10069, 10066, 10067, + 10064, 10063, 10066, 10069, + 10004, 10009, 10070, 10067, + 10008, 10071, 10070, 10009, + 10072, 10073, 10070, 10071, + 10068, 10067, 10070, 10073, + 10008, 10013, 10074, 10071, + 10012, 10075, 10074, 10013, + 10076, 10077, 10074, 10075, + 10072, 10071, 10074, 10077, + 10012, 10017, 10078, 10075, + 10016, 10079, 10078, 10017, + 10080, 10081, 10078, 10079, + 10076, 10075, 10078, 10081, + 9404, 10021, 10082, 9405, + 10020, 10083, 10082, 10021, + 10084, 10085, 10082, 10083, + 9400, 9405, 10082, 10085, + 10020, 10025, 10086, 10083, + 10024, 10087, 10086, 10025, + 10088, 10089, 10086, 10087, + 10084, 10083, 10086, 10089, + 10024, 10029, 10090, 10087, + 10028, 10091, 10090, 10029, + 10092, 10093, 10090, 10091, + 10088, 10087, 10090, 10093, + 10028, 10033, 10094, 10091, + 10032, 10095, 10094, 10033, + 10096, 10097, 10094, 10095, + 10092, 10091, 10094, 10097, + 10032, 10037, 10098, 10095, + 10036, 10099, 10098, 10037, + 10100, 10101, 10098, 10099, + 10096, 10095, 10098, 10101, + 10036, 10041, 10102, 10099, + 10040, 10103, 10102, 10041, + 10104, 10105, 10102, 10103, + 10100, 10099, 10102, 10105, + 10040, 10045, 10106, 10103, + 10044, 10107, 10106, 10045, + 10108, 10109, 10106, 10107, + 10104, 10103, 10106, 10109, + 10044, 10049, 10110, 10107, + 10048, 10111, 10110, 10049, + 10112, 10113, 10110, 10111, + 10108, 10107, 10110, 10113, + 10048, 10053, 10114, 10111, + 10052, 10115, 10114, 10053, + 10116, 10117, 10114, 10115, + 10112, 10111, 10114, 10117, + 10052, 10057, 10118, 10115, + 10056, 10119, 10118, 10057, + 10120, 10121, 10118, 10119, + 10116, 10115, 10118, 10121, + 10056, 10061, 10122, 10119, + 10060, 10123, 10122, 10061, + 10124, 10125, 10122, 10123, + 10120, 10119, 10122, 10125, + 10060, 10065, 10126, 10123, + 10064, 10127, 10126, 10065, + 10128, 10129, 10126, 10127, + 10124, 10123, 10126, 10129, + 10064, 10069, 10130, 10127, + 10068, 10131, 10130, 10069, + 10132, 10133, 10130, 10131, + 10128, 10127, 10130, 10133, + 10068, 10073, 10134, 10131, + 10072, 10135, 10134, 10073, + 10136, 10137, 10134, 10135, + 10132, 10131, 10134, 10137, + 10072, 10077, 10138, 10135, + 10076, 10139, 10138, 10077, + 10140, 10141, 10138, 10139, + 10136, 10135, 10138, 10141, + 10076, 10081, 10142, 10139, + 10080, 10143, 10142, 10081, + 10144, 10145, 10142, 10143, + 10140, 10139, 10142, 10145, + 9400, 10085, 10146, 9401, + 10084, 10147, 10146, 10085, + 10148, 10149, 10146, 10147, + 9396, 9401, 10146, 10149, + 10084, 10089, 10150, 10147, + 10088, 10151, 10150, 10089, + 10152, 10153, 10150, 10151, + 10148, 10147, 10150, 10153, + 10088, 10093, 10154, 10151, + 10092, 10155, 10154, 10093, + 10156, 10157, 10154, 10155, + 10152, 10151, 10154, 10157, + 10092, 10097, 10158, 10155, + 10096, 10159, 10158, 10097, + 10160, 10161, 10158, 10159, + 10156, 10155, 10158, 10161, + 10096, 10101, 10162, 10159, + 10100, 10163, 10162, 10101, + 10164, 10165, 10162, 10163, + 10160, 10159, 10162, 10165, + 10100, 10105, 10166, 10163, + 10104, 10167, 10166, 10105, + 10168, 10169, 10166, 10167, + 10164, 10163, 10166, 10169, + 10104, 10109, 10170, 10167, + 10108, 10171, 10170, 10109, + 10172, 10173, 10170, 10171, + 10168, 10167, 10170, 10173, + 10108, 10113, 10174, 10171, + 10112, 10175, 10174, 10113, + 10176, 10177, 10174, 10175, + 10172, 10171, 10174, 10177, + 10112, 10117, 10178, 10175, + 10116, 10179, 10178, 10117, + 10180, 10181, 10178, 10179, + 10176, 10175, 10178, 10181, + 10116, 10121, 10182, 10179, + 10120, 10183, 10182, 10121, + 10184, 10185, 10182, 10183, + 10180, 10179, 10182, 10185, + 10120, 10125, 10186, 10183, + 10124, 10187, 10186, 10125, + 10188, 10189, 10186, 10187, + 10184, 10183, 10186, 10189, + 10124, 10129, 10190, 10187, + 10128, 10191, 10190, 10129, + 10192, 10193, 10190, 10191, + 10188, 10187, 10190, 10193, + 10128, 10133, 10194, 10191, + 10132, 10195, 10194, 10133, + 10196, 10197, 10194, 10195, + 10192, 10191, 10194, 10197, + 10132, 10137, 10198, 10195, + 10136, 10199, 10198, 10137, + 10200, 10201, 10198, 10199, + 10196, 10195, 10198, 10201, + 10136, 10141, 10202, 10199, + 10140, 10203, 10202, 10141, + 10204, 10205, 10202, 10203, + 10200, 10199, 10202, 10205, + 10140, 10145, 10206, 10203, + 10144, 10207, 10206, 10145, + 10208, 10209, 10206, 10207, + 10204, 10203, 10206, 10209, + 9396, 10149, 10210, 9397, + 10148, 10211, 10210, 10149, + 10212, 10213, 10210, 10211, + 9392, 9397, 10210, 10213, + 10148, 10153, 10214, 10211, + 10152, 10215, 10214, 10153, + 10216, 10217, 10214, 10215, + 10212, 10211, 10214, 10217, + 10152, 10157, 10218, 10215, + 10156, 10219, 10218, 10157, + 10220, 10221, 10218, 10219, + 10216, 10215, 10218, 10221, + 10156, 10161, 10222, 10219, + 10160, 10223, 10222, 10161, + 10224, 10225, 10222, 10223, + 10220, 10219, 10222, 10225, + 10160, 10165, 10226, 10223, + 10164, 10227, 10226, 10165, + 10228, 10229, 10226, 10227, + 10224, 10223, 10226, 10229, + 10164, 10169, 10230, 10227, + 10168, 10231, 10230, 10169, + 10232, 10233, 10230, 10231, + 10228, 10227, 10230, 10233, + 10168, 10173, 10234, 10231, + 10172, 10235, 10234, 10173, + 10236, 10237, 10234, 10235, + 10232, 10231, 10234, 10237, + 10172, 10177, 10238, 10235, + 10176, 10239, 10238, 10177, + 10240, 10241, 10238, 10239, + 10236, 10235, 10238, 10241, + 10176, 10181, 10242, 10239, + 10180, 10243, 10242, 10181, + 10244, 10245, 10242, 10243, + 10240, 10239, 10242, 10245, + 10180, 10185, 10246, 10243, + 10184, 10247, 10246, 10185, + 10248, 10249, 10246, 10247, + 10244, 10243, 10246, 10249, + 10184, 10189, 10250, 10247, + 10188, 10251, 10250, 10189, + 10252, 10253, 10250, 10251, + 10248, 10247, 10250, 10253, + 10188, 10193, 10254, 10251, + 10192, 10255, 10254, 10193, + 10256, 10257, 10254, 10255, + 10252, 10251, 10254, 10257, + 10192, 10197, 10258, 10255, + 10196, 10259, 10258, 10197, + 10260, 10261, 10258, 10259, + 10256, 10255, 10258, 10261, + 10196, 10201, 10262, 10259, + 10200, 10263, 10262, 10201, + 10264, 10265, 10262, 10263, + 10260, 10259, 10262, 10265, + 10200, 10205, 10266, 10263, + 10204, 10267, 10266, 10205, + 10268, 10269, 10266, 10267, + 10264, 10263, 10266, 10269, + 10204, 10209, 10270, 10267, + 10208, 10271, 10270, 10209, + 10272, 10273, 10270, 10271, + 10268, 10267, 10270, 10273, + 9392, 10213, 10274, 9393, + 10212, 10275, 10274, 10213, + 10276, 10277, 10274, 10275, + 9388, 9393, 10274, 10277, + 10212, 10217, 10278, 10275, + 10216, 10279, 10278, 10217, + 10280, 10281, 10278, 10279, + 10276, 10275, 10278, 10281, + 10216, 10221, 10282, 10279, + 10220, 10283, 10282, 10221, + 10284, 10285, 10282, 10283, + 10280, 10279, 10282, 10285, + 10220, 10225, 10286, 10283, + 10224, 10287, 10286, 10225, + 10288, 10289, 10286, 10287, + 10284, 10283, 10286, 10289, + 10224, 10229, 10290, 10287, + 10228, 10291, 10290, 10229, + 10292, 10293, 10290, 10291, + 10288, 10287, 10290, 10293, + 10228, 10233, 10294, 10291, + 10232, 10295, 10294, 10233, + 10296, 10297, 10294, 10295, + 10292, 10291, 10294, 10297, + 10232, 10237, 10298, 10295, + 10236, 10299, 10298, 10237, + 10300, 10301, 10298, 10299, + 10296, 10295, 10298, 10301, + 10236, 10241, 10302, 10299, + 10240, 10303, 10302, 10241, + 10304, 10305, 10302, 10303, + 10300, 10299, 10302, 10305, + 10240, 10245, 10306, 10303, + 10244, 10307, 10306, 10245, + 10308, 10309, 10306, 10307, + 10304, 10303, 10306, 10309, + 10244, 10249, 10310, 10307, + 10248, 10311, 10310, 10249, + 10312, 10313, 10310, 10311, + 10308, 10307, 10310, 10313, + 10248, 10253, 10314, 10311, + 10252, 10315, 10314, 10253, + 10316, 10317, 10314, 10315, + 10312, 10311, 10314, 10317, + 10252, 10257, 10318, 10315, + 10256, 10319, 10318, 10257, + 10320, 10321, 10318, 10319, + 10316, 10315, 10318, 10321, + 10256, 10261, 10322, 10319, + 10260, 10323, 10322, 10261, + 10324, 10325, 10322, 10323, + 10320, 10319, 10322, 10325, + 10260, 10265, 10326, 10323, + 10264, 10327, 10326, 10265, + 10328, 10329, 10326, 10327, + 10324, 10323, 10326, 10329, + 10264, 10269, 10330, 10327, + 10268, 10331, 10330, 10269, + 10332, 10333, 10330, 10331, + 10328, 10327, 10330, 10333, + 10268, 10273, 10334, 10331, + 10272, 10335, 10334, 10273, + 10336, 10337, 10334, 10335, + 10332, 10331, 10334, 10337, + 9388, 10277, 10338, 9389, + 10276, 10339, 10338, 10277, + 10340, 10341, 10338, 10339, + 9384, 9389, 10338, 10341, + 10276, 10281, 10342, 10339, + 10280, 10343, 10342, 10281, + 10344, 10345, 10342, 10343, + 10340, 10339, 10342, 10345, + 10280, 10285, 10346, 10343, + 10284, 10347, 10346, 10285, + 10348, 10349, 10346, 10347, + 10344, 10343, 10346, 10349, + 10284, 10289, 10350, 10347, + 10288, 10351, 10350, 10289, + 10352, 10353, 10350, 10351, + 10348, 10347, 10350, 10353, + 10288, 10293, 10354, 10351, + 10292, 10355, 10354, 10293, + 10356, 10357, 10354, 10355, + 10352, 10351, 10354, 10357, + 10292, 10297, 10358, 10355, + 10296, 10359, 10358, 10297, + 10360, 10361, 10358, 10359, + 10356, 10355, 10358, 10361, + 10296, 10301, 10362, 10359, + 10300, 10363, 10362, 10301, + 10364, 10365, 10362, 10363, + 10360, 10359, 10362, 10365, + 10300, 10305, 10366, 10363, + 10304, 10367, 10366, 10305, + 10368, 10369, 10366, 10367, + 10364, 10363, 10366, 10369, + 10304, 10309, 10370, 10367, + 10308, 10371, 10370, 10309, + 10372, 10373, 10370, 10371, + 10368, 10367, 10370, 10373, + 10308, 10313, 10374, 10371, + 10312, 10375, 10374, 10313, + 10376, 10377, 10374, 10375, + 10372, 10371, 10374, 10377, + 10312, 10317, 10378, 10375, + 10316, 10379, 10378, 10317, + 10380, 10381, 10378, 10379, + 10376, 10375, 10378, 10381, + 10316, 10321, 10382, 10379, + 10320, 10383, 10382, 10321, + 10384, 10385, 10382, 10383, + 10380, 10379, 10382, 10385, + 10320, 10325, 10386, 10383, + 10324, 10387, 10386, 10325, + 10388, 10389, 10386, 10387, + 10384, 10383, 10386, 10389, + 10324, 10329, 10390, 10387, + 10328, 10391, 10390, 10329, + 10392, 10393, 10390, 10391, + 10388, 10387, 10390, 10393, + 10328, 10333, 10394, 10391, + 10332, 10395, 10394, 10333, + 10396, 10397, 10394, 10395, + 10392, 10391, 10394, 10397, + 10332, 10337, 10398, 10395, + 10336, 10399, 10398, 10337, + 10400, 10401, 10398, 10399, + 10396, 10395, 10398, 10401, + 9384, 10341, 10402, 9385, + 10340, 10403, 10402, 10341, + 10404, 10405, 10402, 10403, + 9380, 9385, 10402, 10405, + 10340, 10345, 10406, 10403, + 10344, 10407, 10406, 10345, + 10408, 10409, 10406, 10407, + 10404, 10403, 10406, 10409, + 10344, 10349, 10410, 10407, + 10348, 10411, 10410, 10349, + 10412, 10413, 10410, 10411, + 10408, 10407, 10410, 10413, + 10348, 10353, 10414, 10411, + 10352, 10415, 10414, 10353, + 10416, 10417, 10414, 10415, + 10412, 10411, 10414, 10417, + 10352, 10357, 10418, 10415, + 10356, 10419, 10418, 10357, + 10420, 10421, 10418, 10419, + 10416, 10415, 10418, 10421, + 10356, 10361, 10422, 10419, + 10360, 10423, 10422, 10361, + 10424, 10425, 10422, 10423, + 10420, 10419, 10422, 10425, + 10360, 10365, 10426, 10423, + 10364, 10427, 10426, 10365, + 10428, 10429, 10426, 10427, + 10424, 10423, 10426, 10429, + 10364, 10369, 10430, 10427, + 10368, 10431, 10430, 10369, + 10432, 10433, 10430, 10431, + 10428, 10427, 10430, 10433, + 10368, 10373, 10434, 10431, + 10372, 10435, 10434, 10373, + 10436, 10437, 10434, 10435, + 10432, 10431, 10434, 10437, + 10372, 10377, 10438, 10435, + 10376, 10439, 10438, 10377, + 10440, 10441, 10438, 10439, + 10436, 10435, 10438, 10441, + 10376, 10381, 10442, 10439, + 10380, 10443, 10442, 10381, + 10444, 10445, 10442, 10443, + 10440, 10439, 10442, 10445, + 10380, 10385, 10446, 10443, + 10384, 10447, 10446, 10385, + 10448, 10449, 10446, 10447, + 10444, 10443, 10446, 10449, + 10384, 10389, 10450, 10447, + 10388, 10451, 10450, 10389, + 10452, 10453, 10450, 10451, + 10448, 10447, 10450, 10453, + 10388, 10393, 10454, 10451, + 10392, 10455, 10454, 10393, + 10456, 10457, 10454, 10455, + 10452, 10451, 10454, 10457, + 10392, 10397, 10458, 10455, + 10396, 10459, 10458, 10397, + 10460, 10461, 10458, 10459, + 10456, 10455, 10458, 10461, + 10396, 10401, 10462, 10459, + 10400, 10463, 10462, 10401, + 10464, 10465, 10462, 10463, + 10460, 10459, 10462, 10465, + 9380, 10405, 10466, 9381, + 10404, 10467, 10466, 10405, + 10468, 10469, 10466, 10467, + 9376, 9381, 10466, 10469, + 10404, 10409, 10470, 10467, + 10408, 10471, 10470, 10409, + 10472, 10473, 10470, 10471, + 10468, 10467, 10470, 10473, + 10408, 10413, 10474, 10471, + 10412, 10475, 10474, 10413, + 10476, 10477, 10474, 10475, + 10472, 10471, 10474, 10477, + 10412, 10417, 10478, 10475, + 10416, 10479, 10478, 10417, + 10480, 10481, 10478, 10479, + 10476, 10475, 10478, 10481, + 10416, 10421, 10482, 10479, + 10420, 10483, 10482, 10421, + 10484, 10485, 10482, 10483, + 10480, 10479, 10482, 10485, + 10420, 10425, 10486, 10483, + 10424, 10487, 10486, 10425, + 10488, 10489, 10486, 10487, + 10484, 10483, 10486, 10489, + 10424, 10429, 10490, 10487, + 10428, 10491, 10490, 10429, + 10492, 10493, 10490, 10491, + 10488, 10487, 10490, 10493, + 10428, 10433, 10494, 10491, + 10432, 10495, 10494, 10433, + 10496, 10497, 10494, 10495, + 10492, 10491, 10494, 10497, + 10432, 10437, 10498, 10495, + 10436, 10499, 10498, 10437, + 10500, 10501, 10498, 10499, + 10496, 10495, 10498, 10501, + 10436, 10441, 10502, 10499, + 10440, 10503, 10502, 10441, + 10504, 10505, 10502, 10503, + 10500, 10499, 10502, 10505, + 10440, 10445, 10506, 10503, + 10444, 10507, 10506, 10445, + 10508, 10509, 10506, 10507, + 10504, 10503, 10506, 10509, + 10444, 10449, 10510, 10507, + 10448, 10511, 10510, 10449, + 10512, 10513, 10510, 10511, + 10508, 10507, 10510, 10513, + 10448, 10453, 10514, 10511, + 10452, 10515, 10514, 10453, + 10516, 10517, 10514, 10515, + 10512, 10511, 10514, 10517, + 10452, 10457, 10518, 10515, + 10456, 10519, 10518, 10457, + 10520, 10521, 10518, 10519, + 10516, 10515, 10518, 10521, + 10456, 10461, 10522, 10519, + 10460, 10523, 10522, 10461, + 10524, 10525, 10522, 10523, + 10520, 10519, 10522, 10525, + 10460, 10465, 10526, 10523, + 10464, 10527, 10526, 10465, + 10528, 10529, 10526, 10527, + 10524, 10523, 10526, 10529, + 9376, 10469, 10530, 9377, + 10468, 10531, 10530, 10469, + 6076, 6075, 10530, 10531, + 6008, 9377, 10530, 6075, + 10468, 10473, 10532, 10531, + 10472, 10533, 10532, 10473, + 6144, 6143, 10532, 10533, + 6076, 10531, 10532, 6143, + 10472, 10477, 10534, 10533, + 10476, 10535, 10534, 10477, + 6212, 6211, 10534, 10535, + 6144, 10533, 10534, 6211, + 10476, 10481, 10536, 10535, + 10480, 10537, 10536, 10481, + 6280, 6279, 10536, 10537, + 6212, 10535, 10536, 6279, + 10480, 10485, 10538, 10537, + 10484, 10539, 10538, 10485, + 6348, 6347, 10538, 10539, + 6280, 10537, 10538, 6347, + 10484, 10489, 10540, 10539, + 10488, 10541, 10540, 10489, + 6416, 6415, 10540, 10541, + 6348, 10539, 10540, 6415, + 10488, 10493, 10542, 10541, + 10492, 10543, 10542, 10493, + 6484, 6483, 10542, 10543, + 6416, 10541, 10542, 6483, + 10492, 10497, 10544, 10543, + 10496, 10545, 10544, 10497, + 6552, 6551, 10544, 10545, + 6484, 10543, 10544, 6551, + 10496, 10501, 10546, 10545, + 10500, 10547, 10546, 10501, + 6620, 6619, 10546, 10547, + 6552, 10545, 10546, 6619, + 10500, 10505, 10548, 10547, + 10504, 10549, 10548, 10505, + 6688, 6687, 10548, 10549, + 6620, 10547, 10548, 6687, + 10504, 10509, 10550, 10549, + 10508, 10551, 10550, 10509, + 6756, 6755, 10550, 10551, + 6688, 10549, 10550, 6755, + 10508, 10513, 10552, 10551, + 10512, 10553, 10552, 10513, + 6824, 6823, 10552, 10553, + 6756, 10551, 10552, 6823, + 10512, 10517, 10554, 10553, + 10516, 10555, 10554, 10517, + 6892, 6891, 10554, 10555, + 6824, 10553, 10554, 6891, + 10516, 10521, 10556, 10555, + 10520, 10557, 10556, 10521, + 6960, 6959, 10556, 10557, + 6892, 10555, 10556, 6959, + 10520, 10525, 10558, 10557, + 10524, 10559, 10558, 10525, + 7028, 7027, 10558, 10559, + 6960, 10557, 10558, 7027, + 10524, 10529, 10560, 10559, + 10528, 10561, 10560, 10529, + 5, 7063, 10560, 10561, + 7028, 10559, 10560, 7063, + 7258, 10562, 10563, 7259, + 10564, 10565, 10563, 10562, + 10566, 10567, 10563, 10565, + 7260, 7259, 10563, 10567, + 10564, 10568, 10569, 10565, + 10570, 10571, 10569, 10568, + 10572, 10573, 10569, 10571, + 10566, 10565, 10569, 10573, + 10570, 10574, 10575, 10571, + 10576, 10577, 10575, 10574, + 10578, 10579, 10575, 10577, + 10572, 10571, 10575, 10579, + 10576, 10580, 10581, 10577, + 10582, 10583, 10581, 10580, + 10584, 10585, 10581, 10583, + 10578, 10577, 10581, 10585, + 10582, 10586, 10587, 10583, + 10588, 10589, 10587, 10586, + 10590, 10591, 10587, 10589, + 10584, 10583, 10587, 10591, + 10588, 10592, 10593, 10589, + 10594, 10595, 10593, 10592, + 10596, 10597, 10593, 10595, + 10590, 10589, 10593, 10597, + 10594, 10598, 10599, 10595, + 10600, 10601, 10599, 10598, + 10602, 10603, 10599, 10601, + 10596, 10595, 10599, 10603, + 10600, 10604, 10605, 10601, + 10606, 10607, 10605, 10604, + 10608, 10609, 10605, 10607, + 10602, 10601, 10605, 10609, + 10606, 10610, 10611, 10607, + 10612, 10613, 10611, 10610, + 10614, 10615, 10611, 10613, + 10608, 10607, 10611, 10615, + 10612, 10616, 10617, 10613, + 10618, 10619, 10617, 10616, + 10620, 10621, 10617, 10619, + 10614, 10613, 10617, 10621, + 10618, 10622, 10623, 10619, + 10624, 10625, 10623, 10622, + 10626, 10627, 10623, 10625, + 10620, 10619, 10623, 10627, + 10624, 10628, 10629, 10625, + 10630, 10631, 10629, 10628, + 10632, 10633, 10629, 10631, + 10626, 10625, 10629, 10633, + 10630, 10634, 10635, 10631, + 10636, 10637, 10635, 10634, + 10638, 10639, 10635, 10637, + 10632, 10631, 10635, 10639, + 10636, 10640, 10641, 10637, + 10642, 10643, 10641, 10640, + 10644, 10645, 10641, 10643, + 10638, 10637, 10641, 10645, + 10642, 10646, 10647, 10643, + 10648, 10649, 10647, 10646, + 10650, 10651, 10647, 10649, + 10644, 10643, 10647, 10651, + 10648, 10652, 10653, 10649, + 10654, 10655, 10653, 10652, + 10656, 10657, 10653, 10655, + 10650, 10649, 10653, 10657, + 10654, 10658, 10659, 10655, + 10660, 10661, 10659, 10658, + 10662, 10663, 10659, 10661, + 10656, 10655, 10659, 10663, + 10660, 10664, 10665, 10661, + 10666, 10667, 10665, 10664, + 10668, 10669, 10665, 10667, + 10662, 10661, 10665, 10669, + 10666, 10670, 10671, 10667, + 10672, 10673, 10671, 10670, + 10674, 10675, 10671, 10673, + 10668, 10667, 10671, 10675, + 10672, 10676, 10677, 10673, + 10678, 10679, 10677, 10676, + 10680, 10681, 10677, 10679, + 10674, 10673, 10677, 10681, + 10678, 10682, 10683, 10679, + 10684, 10685, 10683, 10682, + 10686, 10687, 10683, 10685, + 10680, 10679, 10683, 10687, + 10684, 10688, 10689, 10685, + 10690, 10691, 10689, 10688, + 10692, 10693, 10689, 10691, + 10686, 10685, 10689, 10693, + 10690, 10694, 10695, 10691, + 10696, 10697, 10695, 10694, + 10698, 10699, 10695, 10697, + 10692, 10691, 10695, 10699, + 10696, 10700, 10701, 10697, + 10702, 10703, 10701, 10700, + 10704, 10705, 10701, 10703, + 10698, 10697, 10701, 10705, + 10702, 10706, 10707, 10703, + 10708, 10709, 10707, 10706, + 10710, 10711, 10707, 10709, + 10704, 10703, 10707, 10711, + 10708, 10712, 10713, 10709, + 10714, 10715, 10713, 10712, + 10716, 10717, 10713, 10715, + 10710, 10709, 10713, 10717, + 10714, 10718, 10719, 10715, + 10720, 10721, 10719, 10718, + 10722, 10723, 10719, 10721, + 10716, 10715, 10719, 10723, + 10720, 10724, 10725, 10721, + 10726, 10727, 10725, 10724, + 10728, 10729, 10725, 10727, + 10722, 10721, 10725, 10729, + 10726, 10730, 10731, 10727, + 10732, 10733, 10731, 10730, + 10734, 10735, 10731, 10733, + 10728, 10727, 10731, 10735, + 10732, 10736, 10737, 10733, + 10738, 10739, 10737, 10736, + 10740, 10741, 10737, 10739, + 10734, 10733, 10737, 10741, + 10738, 10742, 10743, 10739, + 10744, 10745, 10743, 10742, + 10746, 10747, 10743, 10745, + 10740, 10739, 10743, 10747, + 10744, 10748, 10749, 10745, + 10750, 10751, 10749, 10748, + 10752, 10753, 10749, 10751, + 10746, 10745, 10749, 10753, + 10750, 10754, 10755, 10751, + 3567, 3564, 10755, 10754, + 3433, 10756, 10755, 3564, + 10752, 10751, 10755, 10756, + 7260, 10567, 10757, 7391, + 10566, 10758, 10757, 10567, + 10759, 10760, 10757, 10758, + 7392, 7391, 10757, 10760, + 10566, 10573, 10761, 10758, + 10572, 10762, 10761, 10573, + 10763, 10764, 10761, 10762, + 10759, 10758, 10761, 10764, + 10572, 10579, 10765, 10762, + 10578, 10766, 10765, 10579, + 10767, 10768, 10765, 10766, + 10763, 10762, 10765, 10768, + 10578, 10585, 10769, 10766, + 10584, 10770, 10769, 10585, + 10771, 10772, 10769, 10770, + 10767, 10766, 10769, 10772, + 10584, 10591, 10773, 10770, + 10590, 10774, 10773, 10591, + 10775, 10776, 10773, 10774, + 10771, 10770, 10773, 10776, + 10590, 10597, 10777, 10774, + 10596, 10778, 10777, 10597, + 10779, 10780, 10777, 10778, + 10775, 10774, 10777, 10780, + 10596, 10603, 10781, 10778, + 10602, 10782, 10781, 10603, + 10783, 10784, 10781, 10782, + 10779, 10778, 10781, 10784, + 10602, 10609, 10785, 10782, + 10608, 10786, 10785, 10609, + 10787, 10788, 10785, 10786, + 10783, 10782, 10785, 10788, + 10608, 10615, 10789, 10786, + 10614, 10790, 10789, 10615, + 10791, 10792, 10789, 10790, + 10787, 10786, 10789, 10792, + 10614, 10621, 10793, 10790, + 10620, 10794, 10793, 10621, + 10795, 10796, 10793, 10794, + 10791, 10790, 10793, 10796, + 10620, 10627, 10797, 10794, + 10626, 10798, 10797, 10627, + 10799, 10800, 10797, 10798, + 10795, 10794, 10797, 10800, + 10626, 10633, 10801, 10798, + 10632, 10802, 10801, 10633, + 10803, 10804, 10801, 10802, + 10799, 10798, 10801, 10804, + 10632, 10639, 10805, 10802, + 10638, 10806, 10805, 10639, + 10807, 10808, 10805, 10806, + 10803, 10802, 10805, 10808, + 10638, 10645, 10809, 10806, + 10644, 10810, 10809, 10645, + 10811, 10812, 10809, 10810, + 10807, 10806, 10809, 10812, + 10644, 10651, 10813, 10810, + 10650, 10814, 10813, 10651, + 10815, 10816, 10813, 10814, + 10811, 10810, 10813, 10816, + 10650, 10657, 10817, 10814, + 10656, 10818, 10817, 10657, + 10819, 10820, 10817, 10818, + 10815, 10814, 10817, 10820, + 10656, 10663, 10821, 10818, + 10662, 10822, 10821, 10663, + 10823, 10824, 10821, 10822, + 10819, 10818, 10821, 10824, + 10662, 10669, 10825, 10822, + 10668, 10826, 10825, 10669, + 10827, 10828, 10825, 10826, + 10823, 10822, 10825, 10828, + 10668, 10675, 10829, 10826, + 10674, 10830, 10829, 10675, + 10831, 10832, 10829, 10830, + 10827, 10826, 10829, 10832, + 10674, 10681, 10833, 10830, + 10680, 10834, 10833, 10681, + 10835, 10836, 10833, 10834, + 10831, 10830, 10833, 10836, + 10680, 10687, 10837, 10834, + 10686, 10838, 10837, 10687, + 10839, 10840, 10837, 10838, + 10835, 10834, 10837, 10840, + 10686, 10693, 10841, 10838, + 10692, 10842, 10841, 10693, + 10843, 10844, 10841, 10842, + 10839, 10838, 10841, 10844, + 10692, 10699, 10845, 10842, + 10698, 10846, 10845, 10699, + 10847, 10848, 10845, 10846, + 10843, 10842, 10845, 10848, + 10698, 10705, 10849, 10846, + 10704, 10850, 10849, 10705, + 10851, 10852, 10849, 10850, + 10847, 10846, 10849, 10852, + 10704, 10711, 10853, 10850, + 10710, 10854, 10853, 10711, + 10855, 10856, 10853, 10854, + 10851, 10850, 10853, 10856, + 10710, 10717, 10857, 10854, + 10716, 10858, 10857, 10717, + 10859, 10860, 10857, 10858, + 10855, 10854, 10857, 10860, + 10716, 10723, 10861, 10858, + 10722, 10862, 10861, 10723, + 10863, 10864, 10861, 10862, + 10859, 10858, 10861, 10864, + 10722, 10729, 10865, 10862, + 10728, 10866, 10865, 10729, + 10867, 10868, 10865, 10866, + 10863, 10862, 10865, 10868, + 10728, 10735, 10869, 10866, + 10734, 10870, 10869, 10735, + 10871, 10872, 10869, 10870, + 10867, 10866, 10869, 10872, + 10734, 10741, 10873, 10870, + 10740, 10874, 10873, 10741, + 10875, 10876, 10873, 10874, + 10871, 10870, 10873, 10876, + 10740, 10747, 10877, 10874, + 10746, 10878, 10877, 10747, + 10879, 10880, 10877, 10878, + 10875, 10874, 10877, 10880, + 10746, 10753, 10881, 10878, + 10752, 10882, 10881, 10753, + 10883, 10884, 10881, 10882, + 10879, 10878, 10881, 10884, + 10752, 10756, 10885, 10882, + 3433, 3430, 10885, 10756, + 3299, 10886, 10885, 3430, + 10883, 10882, 10885, 10886, + 7392, 10760, 10887, 7523, + 10759, 10888, 10887, 10760, + 10889, 10890, 10887, 10888, + 7524, 7523, 10887, 10890, + 10759, 10764, 10891, 10888, + 10763, 10892, 10891, 10764, + 10893, 10894, 10891, 10892, + 10889, 10888, 10891, 10894, + 10763, 10768, 10895, 10892, + 10767, 10896, 10895, 10768, + 10897, 10898, 10895, 10896, + 10893, 10892, 10895, 10898, + 10767, 10772, 10899, 10896, + 10771, 10900, 10899, 10772, + 10901, 10902, 10899, 10900, + 10897, 10896, 10899, 10902, + 10771, 10776, 10903, 10900, + 10775, 10904, 10903, 10776, + 10905, 10906, 10903, 10904, + 10901, 10900, 10903, 10906, + 10775, 10780, 10907, 10904, + 10779, 10908, 10907, 10780, + 10909, 10910, 10907, 10908, + 10905, 10904, 10907, 10910, + 10779, 10784, 10911, 10908, + 10783, 10912, 10911, 10784, + 10913, 10914, 10911, 10912, + 10909, 10908, 10911, 10914, + 10783, 10788, 10915, 10912, + 10787, 10916, 10915, 10788, + 10917, 10918, 10915, 10916, + 10913, 10912, 10915, 10918, + 10787, 10792, 10919, 10916, + 10791, 10920, 10919, 10792, + 10921, 10922, 10919, 10920, + 10917, 10916, 10919, 10922, + 10791, 10796, 10923, 10920, + 10795, 10924, 10923, 10796, + 10925, 10926, 10923, 10924, + 10921, 10920, 10923, 10926, + 10795, 10800, 10927, 10924, + 10799, 10928, 10927, 10800, + 10929, 10930, 10927, 10928, + 10925, 10924, 10927, 10930, + 10799, 10804, 10931, 10928, + 10803, 10932, 10931, 10804, + 10933, 10934, 10931, 10932, + 10929, 10928, 10931, 10934, + 10803, 10808, 10935, 10932, + 10807, 10936, 10935, 10808, + 10937, 10938, 10935, 10936, + 10933, 10932, 10935, 10938, + 10807, 10812, 10939, 10936, + 10811, 10940, 10939, 10812, + 10941, 10942, 10939, 10940, + 10937, 10936, 10939, 10942, + 10811, 10816, 10943, 10940, + 10815, 10944, 10943, 10816, + 10945, 10946, 10943, 10944, + 10941, 10940, 10943, 10946, + 10815, 10820, 10947, 10944, + 10819, 10948, 10947, 10820, + 10949, 10950, 10947, 10948, + 10945, 10944, 10947, 10950, + 10819, 10824, 10951, 10948, + 10823, 10952, 10951, 10824, + 10953, 10954, 10951, 10952, + 10949, 10948, 10951, 10954, + 10823, 10828, 10955, 10952, + 10827, 10956, 10955, 10828, + 10957, 10958, 10955, 10956, + 10953, 10952, 10955, 10958, + 10827, 10832, 10959, 10956, + 10831, 10960, 10959, 10832, + 10961, 10962, 10959, 10960, + 10957, 10956, 10959, 10962, + 10831, 10836, 10963, 10960, + 10835, 10964, 10963, 10836, + 10965, 10966, 10963, 10964, + 10961, 10960, 10963, 10966, + 10835, 10840, 10967, 10964, + 10839, 10968, 10967, 10840, + 10969, 10970, 10967, 10968, + 10965, 10964, 10967, 10970, + 10839, 10844, 10971, 10968, + 10843, 10972, 10971, 10844, + 10973, 10974, 10971, 10972, + 10969, 10968, 10971, 10974, + 10843, 10848, 10975, 10972, + 10847, 10976, 10975, 10848, + 10977, 10978, 10975, 10976, + 10973, 10972, 10975, 10978, + 10847, 10852, 10979, 10976, + 10851, 10980, 10979, 10852, + 10981, 10982, 10979, 10980, + 10977, 10976, 10979, 10982, + 10851, 10856, 10983, 10980, + 10855, 10984, 10983, 10856, + 10985, 10986, 10983, 10984, + 10981, 10980, 10983, 10986, + 10855, 10860, 10987, 10984, + 10859, 10988, 10987, 10860, + 10989, 10990, 10987, 10988, + 10985, 10984, 10987, 10990, + 10859, 10864, 10991, 10988, + 10863, 10992, 10991, 10864, + 10993, 10994, 10991, 10992, + 10989, 10988, 10991, 10994, + 10863, 10868, 10995, 10992, + 10867, 10996, 10995, 10868, + 10997, 10998, 10995, 10996, + 10993, 10992, 10995, 10998, + 10867, 10872, 10999, 10996, + 10871, 11000, 10999, 10872, + 11001, 11002, 10999, 11000, + 10997, 10996, 10999, 11002, + 10871, 10876, 11003, 11000, + 10875, 11004, 11003, 10876, + 11005, 11006, 11003, 11004, + 11001, 11000, 11003, 11006, + 10875, 10880, 11007, 11004, + 10879, 11008, 11007, 10880, + 11009, 11010, 11007, 11008, + 11005, 11004, 11007, 11010, + 10879, 10884, 11011, 11008, + 10883, 11012, 11011, 10884, + 11013, 11014, 11011, 11012, + 11009, 11008, 11011, 11014, + 10883, 10886, 11015, 11012, + 3299, 3296, 11015, 10886, + 3165, 11016, 11015, 3296, + 11013, 11012, 11015, 11016, + 7524, 10890, 11017, 7655, + 10889, 11018, 11017, 10890, + 11019, 11020, 11017, 11018, + 7656, 7655, 11017, 11020, + 10889, 10894, 11021, 11018, + 10893, 11022, 11021, 10894, + 11023, 11024, 11021, 11022, + 11019, 11018, 11021, 11024, + 10893, 10898, 11025, 11022, + 10897, 11026, 11025, 10898, + 11027, 11028, 11025, 11026, + 11023, 11022, 11025, 11028, + 10897, 10902, 11029, 11026, + 10901, 11030, 11029, 10902, + 11031, 11032, 11029, 11030, + 11027, 11026, 11029, 11032, + 10901, 10906, 11033, 11030, + 10905, 11034, 11033, 10906, + 11035, 11036, 11033, 11034, + 11031, 11030, 11033, 11036, + 10905, 10910, 11037, 11034, + 10909, 11038, 11037, 10910, + 11039, 11040, 11037, 11038, + 11035, 11034, 11037, 11040, + 10909, 10914, 11041, 11038, + 10913, 11042, 11041, 10914, + 11043, 11044, 11041, 11042, + 11039, 11038, 11041, 11044, + 10913, 10918, 11045, 11042, + 10917, 11046, 11045, 10918, + 11047, 11048, 11045, 11046, + 11043, 11042, 11045, 11048, + 10917, 10922, 11049, 11046, + 10921, 11050, 11049, 10922, + 11051, 11052, 11049, 11050, + 11047, 11046, 11049, 11052, + 10921, 10926, 11053, 11050, + 10925, 11054, 11053, 10926, + 11055, 11056, 11053, 11054, + 11051, 11050, 11053, 11056, + 10925, 10930, 11057, 11054, + 10929, 11058, 11057, 10930, + 11059, 11060, 11057, 11058, + 11055, 11054, 11057, 11060, + 10929, 10934, 11061, 11058, + 10933, 11062, 11061, 10934, + 11063, 11064, 11061, 11062, + 11059, 11058, 11061, 11064, + 10933, 10938, 11065, 11062, + 10937, 11066, 11065, 10938, + 11067, 11068, 11065, 11066, + 11063, 11062, 11065, 11068, + 10937, 10942, 11069, 11066, + 10941, 11070, 11069, 10942, + 11071, 11072, 11069, 11070, + 11067, 11066, 11069, 11072, + 10941, 10946, 11073, 11070, + 10945, 11074, 11073, 10946, + 11075, 11076, 11073, 11074, + 11071, 11070, 11073, 11076, + 10945, 10950, 11077, 11074, + 10949, 11078, 11077, 10950, + 11079, 11080, 11077, 11078, + 11075, 11074, 11077, 11080, + 10949, 10954, 11081, 11078, + 10953, 11082, 11081, 10954, + 11083, 11084, 11081, 11082, + 11079, 11078, 11081, 11084, + 10953, 10958, 11085, 11082, + 10957, 11086, 11085, 10958, + 11087, 11088, 11085, 11086, + 11083, 11082, 11085, 11088, + 10957, 10962, 11089, 11086, + 10961, 11090, 11089, 10962, + 11091, 11092, 11089, 11090, + 11087, 11086, 11089, 11092, + 10961, 10966, 11093, 11090, + 10965, 11094, 11093, 10966, + 11095, 11096, 11093, 11094, + 11091, 11090, 11093, 11096, + 10965, 10970, 11097, 11094, + 10969, 11098, 11097, 10970, + 11099, 11100, 11097, 11098, + 11095, 11094, 11097, 11100, + 10969, 10974, 11101, 11098, + 10973, 11102, 11101, 10974, + 11103, 11104, 11101, 11102, + 11099, 11098, 11101, 11104, + 10973, 10978, 11105, 11102, + 10977, 11106, 11105, 10978, + 11107, 11108, 11105, 11106, + 11103, 11102, 11105, 11108, + 10977, 10982, 11109, 11106, + 10981, 11110, 11109, 10982, + 11111, 11112, 11109, 11110, + 11107, 11106, 11109, 11112, + 10981, 10986, 11113, 11110, + 10985, 11114, 11113, 10986, + 11115, 11116, 11113, 11114, + 11111, 11110, 11113, 11116, + 10985, 10990, 11117, 11114, + 10989, 11118, 11117, 10990, + 11119, 11120, 11117, 11118, + 11115, 11114, 11117, 11120, + 10989, 10994, 11121, 11118, + 10993, 11122, 11121, 10994, + 11123, 11124, 11121, 11122, + 11119, 11118, 11121, 11124, + 10993, 10998, 11125, 11122, + 10997, 11126, 11125, 10998, + 11127, 11128, 11125, 11126, + 11123, 11122, 11125, 11128, + 10997, 11002, 11129, 11126, + 11001, 11130, 11129, 11002, + 11131, 11132, 11129, 11130, + 11127, 11126, 11129, 11132, + 11001, 11006, 11133, 11130, + 11005, 11134, 11133, 11006, + 11135, 11136, 11133, 11134, + 11131, 11130, 11133, 11136, + 11005, 11010, 11137, 11134, + 11009, 11138, 11137, 11010, + 11139, 11140, 11137, 11138, + 11135, 11134, 11137, 11140, + 11009, 11014, 11141, 11138, + 11013, 11142, 11141, 11014, + 11143, 11144, 11141, 11142, + 11139, 11138, 11141, 11144, + 11013, 11016, 11145, 11142, + 3165, 3162, 11145, 11016, + 3031, 11146, 11145, 3162, + 11143, 11142, 11145, 11146, + 7656, 11020, 11147, 7787, + 11019, 11148, 11147, 11020, + 11149, 11150, 11147, 11148, + 7788, 7787, 11147, 11150, + 11019, 11024, 11151, 11148, + 11023, 11152, 11151, 11024, + 11153, 11154, 11151, 11152, + 11149, 11148, 11151, 11154, + 11023, 11028, 11155, 11152, + 11027, 11156, 11155, 11028, + 11157, 11158, 11155, 11156, + 11153, 11152, 11155, 11158, + 11027, 11032, 11159, 11156, + 11031, 11160, 11159, 11032, + 11161, 11162, 11159, 11160, + 11157, 11156, 11159, 11162, + 11031, 11036, 11163, 11160, + 11035, 11164, 11163, 11036, + 11165, 11166, 11163, 11164, + 11161, 11160, 11163, 11166, + 11035, 11040, 11167, 11164, + 11039, 11168, 11167, 11040, + 11169, 11170, 11167, 11168, + 11165, 11164, 11167, 11170, + 11039, 11044, 11171, 11168, + 11043, 11172, 11171, 11044, + 11173, 11174, 11171, 11172, + 11169, 11168, 11171, 11174, + 11043, 11048, 11175, 11172, + 11047, 11176, 11175, 11048, + 11177, 11178, 11175, 11176, + 11173, 11172, 11175, 11178, + 11047, 11052, 11179, 11176, + 11051, 11180, 11179, 11052, + 11181, 11182, 11179, 11180, + 11177, 11176, 11179, 11182, + 11051, 11056, 11183, 11180, + 11055, 11184, 11183, 11056, + 11185, 11186, 11183, 11184, + 11181, 11180, 11183, 11186, + 11055, 11060, 11187, 11184, + 11059, 11188, 11187, 11060, + 11189, 11190, 11187, 11188, + 11185, 11184, 11187, 11190, + 11059, 11064, 11191, 11188, + 11063, 11192, 11191, 11064, + 11193, 11194, 11191, 11192, + 11189, 11188, 11191, 11194, + 11063, 11068, 11195, 11192, + 11067, 11196, 11195, 11068, + 11197, 11198, 11195, 11196, + 11193, 11192, 11195, 11198, + 11067, 11072, 11199, 11196, + 11071, 11200, 11199, 11072, + 11201, 11202, 11199, 11200, + 11197, 11196, 11199, 11202, + 11071, 11076, 11203, 11200, + 11075, 11204, 11203, 11076, + 11205, 11206, 11203, 11204, + 11201, 11200, 11203, 11206, + 11075, 11080, 11207, 11204, + 11079, 11208, 11207, 11080, + 11209, 11210, 11207, 11208, + 11205, 11204, 11207, 11210, + 11079, 11084, 11211, 11208, + 11083, 11212, 11211, 11084, + 11213, 11214, 11211, 11212, + 11209, 11208, 11211, 11214, + 11083, 11088, 11215, 11212, + 11087, 11216, 11215, 11088, + 11217, 11218, 11215, 11216, + 11213, 11212, 11215, 11218, + 11087, 11092, 11219, 11216, + 11091, 11220, 11219, 11092, + 11221, 11222, 11219, 11220, + 11217, 11216, 11219, 11222, + 11091, 11096, 11223, 11220, + 11095, 11224, 11223, 11096, + 11225, 11226, 11223, 11224, + 11221, 11220, 11223, 11226, + 11095, 11100, 11227, 11224, + 11099, 11228, 11227, 11100, + 11229, 11230, 11227, 11228, + 11225, 11224, 11227, 11230, + 11099, 11104, 11231, 11228, + 11103, 11232, 11231, 11104, + 11233, 11234, 11231, 11232, + 11229, 11228, 11231, 11234, + 11103, 11108, 11235, 11232, + 11107, 11236, 11235, 11108, + 11237, 11238, 11235, 11236, + 11233, 11232, 11235, 11238, + 11107, 11112, 11239, 11236, + 11111, 11240, 11239, 11112, + 11241, 11242, 11239, 11240, + 11237, 11236, 11239, 11242, + 11111, 11116, 11243, 11240, + 11115, 11244, 11243, 11116, + 11245, 11246, 11243, 11244, + 11241, 11240, 11243, 11246, + 11115, 11120, 11247, 11244, + 11119, 11248, 11247, 11120, + 11249, 11250, 11247, 11248, + 11245, 11244, 11247, 11250, + 11119, 11124, 11251, 11248, + 11123, 11252, 11251, 11124, + 11253, 11254, 11251, 11252, + 11249, 11248, 11251, 11254, + 11123, 11128, 11255, 11252, + 11127, 11256, 11255, 11128, + 11257, 11258, 11255, 11256, + 11253, 11252, 11255, 11258, + 11127, 11132, 11259, 11256, + 11131, 11260, 11259, 11132, + 11261, 11262, 11259, 11260, + 11257, 11256, 11259, 11262, + 11131, 11136, 11263, 11260, + 11135, 11264, 11263, 11136, + 11265, 11266, 11263, 11264, + 11261, 11260, 11263, 11266, + 11135, 11140, 11267, 11264, + 11139, 11268, 11267, 11140, + 11269, 11270, 11267, 11268, + 11265, 11264, 11267, 11270, + 11139, 11144, 11271, 11268, + 11143, 11272, 11271, 11144, + 11273, 11274, 11271, 11272, + 11269, 11268, 11271, 11274, + 11143, 11146, 11275, 11272, + 3031, 3028, 11275, 11146, + 2897, 11276, 11275, 3028, + 11273, 11272, 11275, 11276, + 7788, 11150, 11277, 7919, + 11149, 11278, 11277, 11150, + 11279, 11280, 11277, 11278, + 7920, 7919, 11277, 11280, + 11149, 11154, 11281, 11278, + 11153, 11282, 11281, 11154, + 11283, 11284, 11281, 11282, + 11279, 11278, 11281, 11284, + 11153, 11158, 11285, 11282, + 11157, 11286, 11285, 11158, + 11287, 11288, 11285, 11286, + 11283, 11282, 11285, 11288, + 11157, 11162, 11289, 11286, + 11161, 11290, 11289, 11162, + 11291, 11292, 11289, 11290, + 11287, 11286, 11289, 11292, + 11161, 11166, 11293, 11290, + 11165, 11294, 11293, 11166, + 11295, 11296, 11293, 11294, + 11291, 11290, 11293, 11296, + 11165, 11170, 11297, 11294, + 11169, 11298, 11297, 11170, + 11299, 11300, 11297, 11298, + 11295, 11294, 11297, 11300, + 11169, 11174, 11301, 11298, + 11173, 11302, 11301, 11174, + 11303, 11304, 11301, 11302, + 11299, 11298, 11301, 11304, + 11173, 11178, 11305, 11302, + 11177, 11306, 11305, 11178, + 11307, 11308, 11305, 11306, + 11303, 11302, 11305, 11308, + 11177, 11182, 11309, 11306, + 11181, 11310, 11309, 11182, + 11311, 11312, 11309, 11310, + 11307, 11306, 11309, 11312, + 11181, 11186, 11313, 11310, + 11185, 11314, 11313, 11186, + 11315, 11316, 11313, 11314, + 11311, 11310, 11313, 11316, + 11185, 11190, 11317, 11314, + 11189, 11318, 11317, 11190, + 11319, 11320, 11317, 11318, + 11315, 11314, 11317, 11320, + 11189, 11194, 11321, 11318, + 11193, 11322, 11321, 11194, + 11323, 11324, 11321, 11322, + 11319, 11318, 11321, 11324, + 11193, 11198, 11325, 11322, + 11197, 11326, 11325, 11198, + 11327, 11328, 11325, 11326, + 11323, 11322, 11325, 11328, + 11197, 11202, 11329, 11326, + 11201, 11330, 11329, 11202, + 11331, 11332, 11329, 11330, + 11327, 11326, 11329, 11332, + 11201, 11206, 11333, 11330, + 11205, 11334, 11333, 11206, + 11335, 11336, 11333, 11334, + 11331, 11330, 11333, 11336, + 11205, 11210, 11337, 11334, + 11209, 11338, 11337, 11210, + 11339, 11340, 11337, 11338, + 11335, 11334, 11337, 11340, + 11209, 11214, 11341, 11338, + 11213, 11342, 11341, 11214, + 11343, 11344, 11341, 11342, + 11339, 11338, 11341, 11344, + 11213, 11218, 11345, 11342, + 11217, 11346, 11345, 11218, + 11347, 11348, 11345, 11346, + 11343, 11342, 11345, 11348, + 11217, 11222, 11349, 11346, + 11221, 11350, 11349, 11222, + 11351, 11352, 11349, 11350, + 11347, 11346, 11349, 11352, + 11221, 11226, 11353, 11350, + 11225, 11354, 11353, 11226, + 11355, 11356, 11353, 11354, + 11351, 11350, 11353, 11356, + 11225, 11230, 11357, 11354, + 11229, 11358, 11357, 11230, + 11359, 11360, 11357, 11358, + 11355, 11354, 11357, 11360, + 11229, 11234, 11361, 11358, + 11233, 11362, 11361, 11234, + 11363, 11364, 11361, 11362, + 11359, 11358, 11361, 11364, + 11233, 11238, 11365, 11362, + 11237, 11366, 11365, 11238, + 11367, 11368, 11365, 11366, + 11363, 11362, 11365, 11368, + 11237, 11242, 11369, 11366, + 11241, 11370, 11369, 11242, + 11371, 11372, 11369, 11370, + 11367, 11366, 11369, 11372, + 11241, 11246, 11373, 11370, + 11245, 11374, 11373, 11246, + 11375, 11376, 11373, 11374, + 11371, 11370, 11373, 11376, + 11245, 11250, 11377, 11374, + 11249, 11378, 11377, 11250, + 11379, 11380, 11377, 11378, + 11375, 11374, 11377, 11380, + 11249, 11254, 11381, 11378, + 11253, 11382, 11381, 11254, + 11383, 11384, 11381, 11382, + 11379, 11378, 11381, 11384, + 11253, 11258, 11385, 11382, + 11257, 11386, 11385, 11258, + 11387, 11388, 11385, 11386, + 11383, 11382, 11385, 11388, + 11257, 11262, 11389, 11386, + 11261, 11390, 11389, 11262, + 11391, 11392, 11389, 11390, + 11387, 11386, 11389, 11392, + 11261, 11266, 11393, 11390, + 11265, 11394, 11393, 11266, + 11395, 11396, 11393, 11394, + 11391, 11390, 11393, 11396, + 11265, 11270, 11397, 11394, + 11269, 11398, 11397, 11270, + 11399, 11400, 11397, 11398, + 11395, 11394, 11397, 11400, + 11269, 11274, 11401, 11398, + 11273, 11402, 11401, 11274, + 11403, 11404, 11401, 11402, + 11399, 11398, 11401, 11404, + 11273, 11276, 11405, 11402, + 2897, 2894, 11405, 11276, + 2763, 11406, 11405, 2894, + 11403, 11402, 11405, 11406, + 7920, 11280, 11407, 8051, + 11279, 11408, 11407, 11280, + 11409, 11410, 11407, 11408, + 8052, 8051, 11407, 11410, + 11279, 11284, 11411, 11408, + 11283, 11412, 11411, 11284, + 11413, 11414, 11411, 11412, + 11409, 11408, 11411, 11414, + 11283, 11288, 11415, 11412, + 11287, 11416, 11415, 11288, + 11417, 11418, 11415, 11416, + 11413, 11412, 11415, 11418, + 11287, 11292, 11419, 11416, + 11291, 11420, 11419, 11292, + 11421, 11422, 11419, 11420, + 11417, 11416, 11419, 11422, + 11291, 11296, 11423, 11420, + 11295, 11424, 11423, 11296, + 11425, 11426, 11423, 11424, + 11421, 11420, 11423, 11426, + 11295, 11300, 11427, 11424, + 11299, 11428, 11427, 11300, + 11429, 11430, 11427, 11428, + 11425, 11424, 11427, 11430, + 11299, 11304, 11431, 11428, + 11303, 11432, 11431, 11304, + 11433, 11434, 11431, 11432, + 11429, 11428, 11431, 11434, + 11303, 11308, 11435, 11432, + 11307, 11436, 11435, 11308, + 11437, 11438, 11435, 11436, + 11433, 11432, 11435, 11438, + 11307, 11312, 11439, 11436, + 11311, 11440, 11439, 11312, + 11441, 11442, 11439, 11440, + 11437, 11436, 11439, 11442, + 11311, 11316, 11443, 11440, + 11315, 11444, 11443, 11316, + 11445, 11446, 11443, 11444, + 11441, 11440, 11443, 11446, + 11315, 11320, 11447, 11444, + 11319, 11448, 11447, 11320, + 11449, 11450, 11447, 11448, + 11445, 11444, 11447, 11450, + 11319, 11324, 11451, 11448, + 11323, 11452, 11451, 11324, + 11453, 11454, 11451, 11452, + 11449, 11448, 11451, 11454, + 11323, 11328, 11455, 11452, + 11327, 11456, 11455, 11328, + 11457, 11458, 11455, 11456, + 11453, 11452, 11455, 11458, + 11327, 11332, 11459, 11456, + 11331, 11460, 11459, 11332, + 11461, 11462, 11459, 11460, + 11457, 11456, 11459, 11462, + 11331, 11336, 11463, 11460, + 11335, 11464, 11463, 11336, + 11465, 11466, 11463, 11464, + 11461, 11460, 11463, 11466, + 11335, 11340, 11467, 11464, + 11339, 11468, 11467, 11340, + 11469, 11470, 11467, 11468, + 11465, 11464, 11467, 11470, + 11339, 11344, 11471, 11468, + 11343, 11472, 11471, 11344, + 11473, 11474, 11471, 11472, + 11469, 11468, 11471, 11474, + 11343, 11348, 11475, 11472, + 11347, 11476, 11475, 11348, + 11477, 11478, 11475, 11476, + 11473, 11472, 11475, 11478, + 11347, 11352, 11479, 11476, + 11351, 11480, 11479, 11352, + 11481, 11482, 11479, 11480, + 11477, 11476, 11479, 11482, + 11351, 11356, 11483, 11480, + 11355, 11484, 11483, 11356, + 11485, 11486, 11483, 11484, + 11481, 11480, 11483, 11486, + 11355, 11360, 11487, 11484, + 11359, 11488, 11487, 11360, + 11489, 11490, 11487, 11488, + 11485, 11484, 11487, 11490, + 11359, 11364, 11491, 11488, + 11363, 11492, 11491, 11364, + 11493, 11494, 11491, 11492, + 11489, 11488, 11491, 11494, + 11363, 11368, 11495, 11492, + 11367, 11496, 11495, 11368, + 11497, 11498, 11495, 11496, + 11493, 11492, 11495, 11498, + 11367, 11372, 11499, 11496, + 11371, 11500, 11499, 11372, + 11501, 11502, 11499, 11500, + 11497, 11496, 11499, 11502, + 11371, 11376, 11503, 11500, + 11375, 11504, 11503, 11376, + 11505, 11506, 11503, 11504, + 11501, 11500, 11503, 11506, + 11375, 11380, 11507, 11504, + 11379, 11508, 11507, 11380, + 11509, 11510, 11507, 11508, + 11505, 11504, 11507, 11510, + 11379, 11384, 11511, 11508, + 11383, 11512, 11511, 11384, + 11513, 11514, 11511, 11512, + 11509, 11508, 11511, 11514, + 11383, 11388, 11515, 11512, + 11387, 11516, 11515, 11388, + 11517, 11518, 11515, 11516, + 11513, 11512, 11515, 11518, + 11387, 11392, 11519, 11516, + 11391, 11520, 11519, 11392, + 11521, 11522, 11519, 11520, + 11517, 11516, 11519, 11522, + 11391, 11396, 11523, 11520, + 11395, 11524, 11523, 11396, + 11525, 11526, 11523, 11524, + 11521, 11520, 11523, 11526, + 11395, 11400, 11527, 11524, + 11399, 11528, 11527, 11400, + 11529, 11530, 11527, 11528, + 11525, 11524, 11527, 11530, + 11399, 11404, 11531, 11528, + 11403, 11532, 11531, 11404, + 11533, 11534, 11531, 11532, + 11529, 11528, 11531, 11534, + 11403, 11406, 11535, 11532, + 2763, 2760, 11535, 11406, + 2629, 11536, 11535, 2760, + 11533, 11532, 11535, 11536, + 8052, 11410, 11537, 8183, + 11409, 11538, 11537, 11410, + 11539, 11540, 11537, 11538, + 8184, 8183, 11537, 11540, + 11409, 11414, 11541, 11538, + 11413, 11542, 11541, 11414, + 11543, 11544, 11541, 11542, + 11539, 11538, 11541, 11544, + 11413, 11418, 11545, 11542, + 11417, 11546, 11545, 11418, + 11547, 11548, 11545, 11546, + 11543, 11542, 11545, 11548, + 11417, 11422, 11549, 11546, + 11421, 11550, 11549, 11422, + 11551, 11552, 11549, 11550, + 11547, 11546, 11549, 11552, + 11421, 11426, 11553, 11550, + 11425, 11554, 11553, 11426, + 11555, 11556, 11553, 11554, + 11551, 11550, 11553, 11556, + 11425, 11430, 11557, 11554, + 11429, 11558, 11557, 11430, + 11559, 11560, 11557, 11558, + 11555, 11554, 11557, 11560, + 11429, 11434, 11561, 11558, + 11433, 11562, 11561, 11434, + 11563, 11564, 11561, 11562, + 11559, 11558, 11561, 11564, + 11433, 11438, 11565, 11562, + 11437, 11566, 11565, 11438, + 11567, 11568, 11565, 11566, + 11563, 11562, 11565, 11568, + 11437, 11442, 11569, 11566, + 11441, 11570, 11569, 11442, + 11571, 11572, 11569, 11570, + 11567, 11566, 11569, 11572, + 11441, 11446, 11573, 11570, + 11445, 11574, 11573, 11446, + 11575, 11576, 11573, 11574, + 11571, 11570, 11573, 11576, + 11445, 11450, 11577, 11574, + 11449, 11578, 11577, 11450, + 11579, 11580, 11577, 11578, + 11575, 11574, 11577, 11580, + 11449, 11454, 11581, 11578, + 11453, 11582, 11581, 11454, + 11583, 11584, 11581, 11582, + 11579, 11578, 11581, 11584, + 11453, 11458, 11585, 11582, + 11457, 11586, 11585, 11458, + 11587, 11588, 11585, 11586, + 11583, 11582, 11585, 11588, + 11457, 11462, 11589, 11586, + 11461, 11590, 11589, 11462, + 11591, 11592, 11589, 11590, + 11587, 11586, 11589, 11592, + 11461, 11466, 11593, 11590, + 11465, 11594, 11593, 11466, + 11595, 11596, 11593, 11594, + 11591, 11590, 11593, 11596, + 11465, 11470, 11597, 11594, + 11469, 11598, 11597, 11470, + 11599, 11600, 11597, 11598, + 11595, 11594, 11597, 11600, + 11469, 11474, 11601, 11598, + 11473, 11602, 11601, 11474, + 11603, 11604, 11601, 11602, + 11599, 11598, 11601, 11604, + 11473, 11478, 11605, 11602, + 11477, 11606, 11605, 11478, + 11607, 11608, 11605, 11606, + 11603, 11602, 11605, 11608, + 11477, 11482, 11609, 11606, + 11481, 11610, 11609, 11482, + 11611, 11612, 11609, 11610, + 11607, 11606, 11609, 11612, + 11481, 11486, 11613, 11610, + 11485, 11614, 11613, 11486, + 11615, 11616, 11613, 11614, + 11611, 11610, 11613, 11616, + 11485, 11490, 11617, 11614, + 11489, 11618, 11617, 11490, + 11619, 11620, 11617, 11618, + 11615, 11614, 11617, 11620, + 11489, 11494, 11621, 11618, + 11493, 11622, 11621, 11494, + 11623, 11624, 11621, 11622, + 11619, 11618, 11621, 11624, + 11493, 11498, 11625, 11622, + 11497, 11626, 11625, 11498, + 11627, 11628, 11625, 11626, + 11623, 11622, 11625, 11628, + 11497, 11502, 11629, 11626, + 11501, 11630, 11629, 11502, + 11631, 11632, 11629, 11630, + 11627, 11626, 11629, 11632, + 11501, 11506, 11633, 11630, + 11505, 11634, 11633, 11506, + 11635, 11636, 11633, 11634, + 11631, 11630, 11633, 11636, + 11505, 11510, 11637, 11634, + 11509, 11638, 11637, 11510, + 11639, 11640, 11637, 11638, + 11635, 11634, 11637, 11640, + 11509, 11514, 11641, 11638, + 11513, 11642, 11641, 11514, + 11643, 11644, 11641, 11642, + 11639, 11638, 11641, 11644, + 11513, 11518, 11645, 11642, + 11517, 11646, 11645, 11518, + 11647, 11648, 11645, 11646, + 11643, 11642, 11645, 11648, + 11517, 11522, 11649, 11646, + 11521, 11650, 11649, 11522, + 11651, 11652, 11649, 11650, + 11647, 11646, 11649, 11652, + 11521, 11526, 11653, 11650, + 11525, 11654, 11653, 11526, + 11655, 11656, 11653, 11654, + 11651, 11650, 11653, 11656, + 11525, 11530, 11657, 11654, + 11529, 11658, 11657, 11530, + 11659, 11660, 11657, 11658, + 11655, 11654, 11657, 11660, + 11529, 11534, 11661, 11658, + 11533, 11662, 11661, 11534, + 11663, 11664, 11661, 11662, + 11659, 11658, 11661, 11664, + 11533, 11536, 11665, 11662, + 2629, 2626, 11665, 11536, + 2495, 11666, 11665, 2626, + 11663, 11662, 11665, 11666, + 8184, 11540, 11667, 8315, + 11539, 11668, 11667, 11540, + 11669, 11670, 11667, 11668, + 8316, 8315, 11667, 11670, + 11539, 11544, 11671, 11668, + 11543, 11672, 11671, 11544, + 11673, 11674, 11671, 11672, + 11669, 11668, 11671, 11674, + 11543, 11548, 11675, 11672, + 11547, 11676, 11675, 11548, + 11677, 11678, 11675, 11676, + 11673, 11672, 11675, 11678, + 11547, 11552, 11679, 11676, + 11551, 11680, 11679, 11552, + 11681, 11682, 11679, 11680, + 11677, 11676, 11679, 11682, + 11551, 11556, 11683, 11680, + 11555, 11684, 11683, 11556, + 11685, 11686, 11683, 11684, + 11681, 11680, 11683, 11686, + 11555, 11560, 11687, 11684, + 11559, 11688, 11687, 11560, + 11689, 11690, 11687, 11688, + 11685, 11684, 11687, 11690, + 11559, 11564, 11691, 11688, + 11563, 11692, 11691, 11564, + 11693, 11694, 11691, 11692, + 11689, 11688, 11691, 11694, + 11563, 11568, 11695, 11692, + 11567, 11696, 11695, 11568, + 11697, 11698, 11695, 11696, + 11693, 11692, 11695, 11698, + 11567, 11572, 11699, 11696, + 11571, 11700, 11699, 11572, + 11701, 11702, 11699, 11700, + 11697, 11696, 11699, 11702, + 11571, 11576, 11703, 11700, + 11575, 11704, 11703, 11576, + 11705, 11706, 11703, 11704, + 11701, 11700, 11703, 11706, + 11575, 11580, 11707, 11704, + 11579, 11708, 11707, 11580, + 11709, 11710, 11707, 11708, + 11705, 11704, 11707, 11710, + 11579, 11584, 11711, 11708, + 11583, 11712, 11711, 11584, + 11713, 11714, 11711, 11712, + 11709, 11708, 11711, 11714, + 11583, 11588, 11715, 11712, + 11587, 11716, 11715, 11588, + 11717, 11718, 11715, 11716, + 11713, 11712, 11715, 11718, + 11587, 11592, 11719, 11716, + 11591, 11720, 11719, 11592, + 11721, 11722, 11719, 11720, + 11717, 11716, 11719, 11722, + 11591, 11596, 11723, 11720, + 11595, 11724, 11723, 11596, + 11725, 11726, 11723, 11724, + 11721, 11720, 11723, 11726, + 11595, 11600, 11727, 11724, + 11599, 11728, 11727, 11600, + 11729, 11730, 11727, 11728, + 11725, 11724, 11727, 11730, + 11599, 11604, 11731, 11728, + 11603, 11732, 11731, 11604, + 11733, 11734, 11731, 11732, + 11729, 11728, 11731, 11734, + 11603, 11608, 11735, 11732, + 11607, 11736, 11735, 11608, + 11737, 11738, 11735, 11736, + 11733, 11732, 11735, 11738, + 11607, 11612, 11739, 11736, + 11611, 11740, 11739, 11612, + 11741, 11742, 11739, 11740, + 11737, 11736, 11739, 11742, + 11611, 11616, 11743, 11740, + 11615, 11744, 11743, 11616, + 11745, 11746, 11743, 11744, + 11741, 11740, 11743, 11746, + 11615, 11620, 11747, 11744, + 11619, 11748, 11747, 11620, + 11749, 11750, 11747, 11748, + 11745, 11744, 11747, 11750, + 11619, 11624, 11751, 11748, + 11623, 11752, 11751, 11624, + 11753, 11754, 11751, 11752, + 11749, 11748, 11751, 11754, + 11623, 11628, 11755, 11752, + 11627, 11756, 11755, 11628, + 11757, 11758, 11755, 11756, + 11753, 11752, 11755, 11758, + 11627, 11632, 11759, 11756, + 11631, 11760, 11759, 11632, + 11761, 11762, 11759, 11760, + 11757, 11756, 11759, 11762, + 11631, 11636, 11763, 11760, + 11635, 11764, 11763, 11636, + 11765, 11766, 11763, 11764, + 11761, 11760, 11763, 11766, + 11635, 11640, 11767, 11764, + 11639, 11768, 11767, 11640, + 11769, 11770, 11767, 11768, + 11765, 11764, 11767, 11770, + 11639, 11644, 11771, 11768, + 11643, 11772, 11771, 11644, + 11773, 11774, 11771, 11772, + 11769, 11768, 11771, 11774, + 11643, 11648, 11775, 11772, + 11647, 11776, 11775, 11648, + 11777, 11778, 11775, 11776, + 11773, 11772, 11775, 11778, + 11647, 11652, 11779, 11776, + 11651, 11780, 11779, 11652, + 11781, 11782, 11779, 11780, + 11777, 11776, 11779, 11782, + 11651, 11656, 11783, 11780, + 11655, 11784, 11783, 11656, + 11785, 11786, 11783, 11784, + 11781, 11780, 11783, 11786, + 11655, 11660, 11787, 11784, + 11659, 11788, 11787, 11660, + 11789, 11790, 11787, 11788, + 11785, 11784, 11787, 11790, + 11659, 11664, 11791, 11788, + 11663, 11792, 11791, 11664, + 11793, 11794, 11791, 11792, + 11789, 11788, 11791, 11794, + 11663, 11666, 11795, 11792, + 2495, 2492, 11795, 11666, + 2361, 11796, 11795, 2492, + 11793, 11792, 11795, 11796, + 8316, 11670, 11797, 8447, + 11669, 11798, 11797, 11670, + 11799, 11800, 11797, 11798, + 8448, 8447, 11797, 11800, + 11669, 11674, 11801, 11798, + 11673, 11802, 11801, 11674, + 11803, 11804, 11801, 11802, + 11799, 11798, 11801, 11804, + 11673, 11678, 11805, 11802, + 11677, 11806, 11805, 11678, + 11807, 11808, 11805, 11806, + 11803, 11802, 11805, 11808, + 11677, 11682, 11809, 11806, + 11681, 11810, 11809, 11682, + 11811, 11812, 11809, 11810, + 11807, 11806, 11809, 11812, + 11681, 11686, 11813, 11810, + 11685, 11814, 11813, 11686, + 11815, 11816, 11813, 11814, + 11811, 11810, 11813, 11816, + 11685, 11690, 11817, 11814, + 11689, 11818, 11817, 11690, + 11819, 11820, 11817, 11818, + 11815, 11814, 11817, 11820, + 11689, 11694, 11821, 11818, + 11693, 11822, 11821, 11694, + 11823, 11824, 11821, 11822, + 11819, 11818, 11821, 11824, + 11693, 11698, 11825, 11822, + 11697, 11826, 11825, 11698, + 11827, 11828, 11825, 11826, + 11823, 11822, 11825, 11828, + 11697, 11702, 11829, 11826, + 11701, 11830, 11829, 11702, + 11831, 11832, 11829, 11830, + 11827, 11826, 11829, 11832, + 11701, 11706, 11833, 11830, + 11705, 11834, 11833, 11706, + 11835, 11836, 11833, 11834, + 11831, 11830, 11833, 11836, + 11705, 11710, 11837, 11834, + 11709, 11838, 11837, 11710, + 11839, 11840, 11837, 11838, + 11835, 11834, 11837, 11840, + 11709, 11714, 11841, 11838, + 11713, 11842, 11841, 11714, + 11843, 11844, 11841, 11842, + 11839, 11838, 11841, 11844, + 11713, 11718, 11845, 11842, + 11717, 11846, 11845, 11718, + 11847, 11848, 11845, 11846, + 11843, 11842, 11845, 11848, + 11717, 11722, 11849, 11846, + 11721, 11850, 11849, 11722, + 11851, 11852, 11849, 11850, + 11847, 11846, 11849, 11852, + 11721, 11726, 11853, 11850, + 11725, 11854, 11853, 11726, + 11855, 11856, 11853, 11854, + 11851, 11850, 11853, 11856, + 11725, 11730, 11857, 11854, + 11729, 11858, 11857, 11730, + 11859, 11860, 11857, 11858, + 11855, 11854, 11857, 11860, + 11729, 11734, 11861, 11858, + 11733, 11862, 11861, 11734, + 11863, 11864, 11861, 11862, + 11859, 11858, 11861, 11864, + 11733, 11738, 11865, 11862, + 11737, 11866, 11865, 11738, + 11867, 11868, 11865, 11866, + 11863, 11862, 11865, 11868, + 11737, 11742, 11869, 11866, + 11741, 11870, 11869, 11742, + 11871, 11872, 11869, 11870, + 11867, 11866, 11869, 11872, + 11741, 11746, 11873, 11870, + 11745, 11874, 11873, 11746, + 11875, 11876, 11873, 11874, + 11871, 11870, 11873, 11876, + 11745, 11750, 11877, 11874, + 11749, 11878, 11877, 11750, + 11879, 11880, 11877, 11878, + 11875, 11874, 11877, 11880, + 11749, 11754, 11881, 11878, + 11753, 11882, 11881, 11754, + 11883, 11884, 11881, 11882, + 11879, 11878, 11881, 11884, + 11753, 11758, 11885, 11882, + 11757, 11886, 11885, 11758, + 11887, 11888, 11885, 11886, + 11883, 11882, 11885, 11888, + 11757, 11762, 11889, 11886, + 11761, 11890, 11889, 11762, + 11891, 11892, 11889, 11890, + 11887, 11886, 11889, 11892, + 11761, 11766, 11893, 11890, + 11765, 11894, 11893, 11766, + 11895, 11896, 11893, 11894, + 11891, 11890, 11893, 11896, + 11765, 11770, 11897, 11894, + 11769, 11898, 11897, 11770, + 11899, 11900, 11897, 11898, + 11895, 11894, 11897, 11900, + 11769, 11774, 11901, 11898, + 11773, 11902, 11901, 11774, + 11903, 11904, 11901, 11902, + 11899, 11898, 11901, 11904, + 11773, 11778, 11905, 11902, + 11777, 11906, 11905, 11778, + 11907, 11908, 11905, 11906, + 11903, 11902, 11905, 11908, + 11777, 11782, 11909, 11906, + 11781, 11910, 11909, 11782, + 11911, 11912, 11909, 11910, + 11907, 11906, 11909, 11912, + 11781, 11786, 11913, 11910, + 11785, 11914, 11913, 11786, + 11915, 11916, 11913, 11914, + 11911, 11910, 11913, 11916, + 11785, 11790, 11917, 11914, + 11789, 11918, 11917, 11790, + 11919, 11920, 11917, 11918, + 11915, 11914, 11917, 11920, + 11789, 11794, 11921, 11918, + 11793, 11922, 11921, 11794, + 11923, 11924, 11921, 11922, + 11919, 11918, 11921, 11924, + 11793, 11796, 11925, 11922, + 2361, 2358, 11925, 11796, + 2227, 11926, 11925, 2358, + 11923, 11922, 11925, 11926, + 8448, 11800, 11927, 8579, + 11799, 11928, 11927, 11800, + 11929, 11930, 11927, 11928, + 8580, 8579, 11927, 11930, + 11799, 11804, 11931, 11928, + 11803, 11932, 11931, 11804, + 11933, 11934, 11931, 11932, + 11929, 11928, 11931, 11934, + 11803, 11808, 11935, 11932, + 11807, 11936, 11935, 11808, + 11937, 11938, 11935, 11936, + 11933, 11932, 11935, 11938, + 11807, 11812, 11939, 11936, + 11811, 11940, 11939, 11812, + 11941, 11942, 11939, 11940, + 11937, 11936, 11939, 11942, + 11811, 11816, 11943, 11940, + 11815, 11944, 11943, 11816, + 11945, 11946, 11943, 11944, + 11941, 11940, 11943, 11946, + 11815, 11820, 11947, 11944, + 11819, 11948, 11947, 11820, + 11949, 11950, 11947, 11948, + 11945, 11944, 11947, 11950, + 11819, 11824, 11951, 11948, + 11823, 11952, 11951, 11824, + 11953, 11954, 11951, 11952, + 11949, 11948, 11951, 11954, + 11823, 11828, 11955, 11952, + 11827, 11956, 11955, 11828, + 11957, 11958, 11955, 11956, + 11953, 11952, 11955, 11958, + 11827, 11832, 11959, 11956, + 11831, 11960, 11959, 11832, + 11961, 11962, 11959, 11960, + 11957, 11956, 11959, 11962, + 11831, 11836, 11963, 11960, + 11835, 11964, 11963, 11836, + 11965, 11966, 11963, 11964, + 11961, 11960, 11963, 11966, + 11835, 11840, 11967, 11964, + 11839, 11968, 11967, 11840, + 11969, 11970, 11967, 11968, + 11965, 11964, 11967, 11970, + 11839, 11844, 11971, 11968, + 11843, 11972, 11971, 11844, + 11973, 11974, 11971, 11972, + 11969, 11968, 11971, 11974, + 11843, 11848, 11975, 11972, + 11847, 11976, 11975, 11848, + 11977, 11978, 11975, 11976, + 11973, 11972, 11975, 11978, + 11847, 11852, 11979, 11976, + 11851, 11980, 11979, 11852, + 11981, 11982, 11979, 11980, + 11977, 11976, 11979, 11982, + 11851, 11856, 11983, 11980, + 11855, 11984, 11983, 11856, + 11985, 11986, 11983, 11984, + 11981, 11980, 11983, 11986, + 11855, 11860, 11987, 11984, + 11859, 11988, 11987, 11860, + 11989, 11990, 11987, 11988, + 11985, 11984, 11987, 11990, + 11859, 11864, 11991, 11988, + 11863, 11992, 11991, 11864, + 11993, 11994, 11991, 11992, + 11989, 11988, 11991, 11994, + 11863, 11868, 11995, 11992, + 11867, 11996, 11995, 11868, + 11997, 11998, 11995, 11996, + 11993, 11992, 11995, 11998, + 11867, 11872, 11999, 11996, + 11871, 12000, 11999, 11872, + 12001, 12002, 11999, 12000, + 11997, 11996, 11999, 12002, + 11871, 11876, 12003, 12000, + 11875, 12004, 12003, 11876, + 12005, 12006, 12003, 12004, + 12001, 12000, 12003, 12006, + 11875, 11880, 12007, 12004, + 11879, 12008, 12007, 11880, + 12009, 12010, 12007, 12008, + 12005, 12004, 12007, 12010, + 11879, 11884, 12011, 12008, + 11883, 12012, 12011, 11884, + 12013, 12014, 12011, 12012, + 12009, 12008, 12011, 12014, + 11883, 11888, 12015, 12012, + 11887, 12016, 12015, 11888, + 12017, 12018, 12015, 12016, + 12013, 12012, 12015, 12018, + 11887, 11892, 12019, 12016, + 11891, 12020, 12019, 11892, + 12021, 12022, 12019, 12020, + 12017, 12016, 12019, 12022, + 11891, 11896, 12023, 12020, + 11895, 12024, 12023, 11896, + 12025, 12026, 12023, 12024, + 12021, 12020, 12023, 12026, + 11895, 11900, 12027, 12024, + 11899, 12028, 12027, 11900, + 12029, 12030, 12027, 12028, + 12025, 12024, 12027, 12030, + 11899, 11904, 12031, 12028, + 11903, 12032, 12031, 11904, + 12033, 12034, 12031, 12032, + 12029, 12028, 12031, 12034, + 11903, 11908, 12035, 12032, + 11907, 12036, 12035, 11908, + 12037, 12038, 12035, 12036, + 12033, 12032, 12035, 12038, + 11907, 11912, 12039, 12036, + 11911, 12040, 12039, 11912, + 12041, 12042, 12039, 12040, + 12037, 12036, 12039, 12042, + 11911, 11916, 12043, 12040, + 11915, 12044, 12043, 11916, + 12045, 12046, 12043, 12044, + 12041, 12040, 12043, 12046, + 11915, 11920, 12047, 12044, + 11919, 12048, 12047, 11920, + 12049, 12050, 12047, 12048, + 12045, 12044, 12047, 12050, + 11919, 11924, 12051, 12048, + 11923, 12052, 12051, 11924, + 12053, 12054, 12051, 12052, + 12049, 12048, 12051, 12054, + 11923, 11926, 12055, 12052, + 2227, 2224, 12055, 11926, + 2093, 12056, 12055, 2224, + 12053, 12052, 12055, 12056, + 8580, 11930, 12057, 8711, + 11929, 12058, 12057, 11930, + 12059, 12060, 12057, 12058, + 8712, 8711, 12057, 12060, + 11929, 11934, 12061, 12058, + 11933, 12062, 12061, 11934, + 12063, 12064, 12061, 12062, + 12059, 12058, 12061, 12064, + 11933, 11938, 12065, 12062, + 11937, 12066, 12065, 11938, + 12067, 12068, 12065, 12066, + 12063, 12062, 12065, 12068, + 11937, 11942, 12069, 12066, + 11941, 12070, 12069, 11942, + 12071, 12072, 12069, 12070, + 12067, 12066, 12069, 12072, + 11941, 11946, 12073, 12070, + 11945, 12074, 12073, 11946, + 12075, 12076, 12073, 12074, + 12071, 12070, 12073, 12076, + 11945, 11950, 12077, 12074, + 11949, 12078, 12077, 11950, + 12079, 12080, 12077, 12078, + 12075, 12074, 12077, 12080, + 11949, 11954, 12081, 12078, + 11953, 12082, 12081, 11954, + 12083, 12084, 12081, 12082, + 12079, 12078, 12081, 12084, + 11953, 11958, 12085, 12082, + 11957, 12086, 12085, 11958, + 12087, 12088, 12085, 12086, + 12083, 12082, 12085, 12088, + 11957, 11962, 12089, 12086, + 11961, 12090, 12089, 11962, + 12091, 12092, 12089, 12090, + 12087, 12086, 12089, 12092, + 11961, 11966, 12093, 12090, + 11965, 12094, 12093, 11966, + 12095, 12096, 12093, 12094, + 12091, 12090, 12093, 12096, + 11965, 11970, 12097, 12094, + 11969, 12098, 12097, 11970, + 12099, 12100, 12097, 12098, + 12095, 12094, 12097, 12100, + 11969, 11974, 12101, 12098, + 11973, 12102, 12101, 11974, + 12103, 12104, 12101, 12102, + 12099, 12098, 12101, 12104, + 11973, 11978, 12105, 12102, + 11977, 12106, 12105, 11978, + 12107, 12108, 12105, 12106, + 12103, 12102, 12105, 12108, + 11977, 11982, 12109, 12106, + 11981, 12110, 12109, 11982, + 12111, 12112, 12109, 12110, + 12107, 12106, 12109, 12112, + 11981, 11986, 12113, 12110, + 11985, 12114, 12113, 11986, + 12115, 12116, 12113, 12114, + 12111, 12110, 12113, 12116, + 11985, 11990, 12117, 12114, + 11989, 12118, 12117, 11990, + 12119, 12120, 12117, 12118, + 12115, 12114, 12117, 12120, + 11989, 11994, 12121, 12118, + 11993, 12122, 12121, 11994, + 12123, 12124, 12121, 12122, + 12119, 12118, 12121, 12124, + 11993, 11998, 12125, 12122, + 11997, 12126, 12125, 11998, + 12127, 12128, 12125, 12126, + 12123, 12122, 12125, 12128, + 11997, 12002, 12129, 12126, + 12001, 12130, 12129, 12002, + 12131, 12132, 12129, 12130, + 12127, 12126, 12129, 12132, + 12001, 12006, 12133, 12130, + 12005, 12134, 12133, 12006, + 12135, 12136, 12133, 12134, + 12131, 12130, 12133, 12136, + 12005, 12010, 12137, 12134, + 12009, 12138, 12137, 12010, + 12139, 12140, 12137, 12138, + 12135, 12134, 12137, 12140, + 12009, 12014, 12141, 12138, + 12013, 12142, 12141, 12014, + 12143, 12144, 12141, 12142, + 12139, 12138, 12141, 12144, + 12013, 12018, 12145, 12142, + 12017, 12146, 12145, 12018, + 12147, 12148, 12145, 12146, + 12143, 12142, 12145, 12148, + 12017, 12022, 12149, 12146, + 12021, 12150, 12149, 12022, + 12151, 12152, 12149, 12150, + 12147, 12146, 12149, 12152, + 12021, 12026, 12153, 12150, + 12025, 12154, 12153, 12026, + 12155, 12156, 12153, 12154, + 12151, 12150, 12153, 12156, + 12025, 12030, 12157, 12154, + 12029, 12158, 12157, 12030, + 12159, 12160, 12157, 12158, + 12155, 12154, 12157, 12160, + 12029, 12034, 12161, 12158, + 12033, 12162, 12161, 12034, + 12163, 12164, 12161, 12162, + 12159, 12158, 12161, 12164, + 12033, 12038, 12165, 12162, + 12037, 12166, 12165, 12038, + 12167, 12168, 12165, 12166, + 12163, 12162, 12165, 12168, + 12037, 12042, 12169, 12166, + 12041, 12170, 12169, 12042, + 12171, 12172, 12169, 12170, + 12167, 12166, 12169, 12172, + 12041, 12046, 12173, 12170, + 12045, 12174, 12173, 12046, + 12175, 12176, 12173, 12174, + 12171, 12170, 12173, 12176, + 12045, 12050, 12177, 12174, + 12049, 12178, 12177, 12050, + 12179, 12180, 12177, 12178, + 12175, 12174, 12177, 12180, + 12049, 12054, 12181, 12178, + 12053, 12182, 12181, 12054, + 12183, 12184, 12181, 12182, + 12179, 12178, 12181, 12184, + 12053, 12056, 12185, 12182, + 2093, 2090, 12185, 12056, + 1959, 12186, 12185, 2090, + 12183, 12182, 12185, 12186, + 8712, 12060, 12187, 8843, + 12059, 12188, 12187, 12060, + 12189, 12190, 12187, 12188, + 8844, 8843, 12187, 12190, + 12059, 12064, 12191, 12188, + 12063, 12192, 12191, 12064, + 12193, 12194, 12191, 12192, + 12189, 12188, 12191, 12194, + 12063, 12068, 12195, 12192, + 12067, 12196, 12195, 12068, + 12197, 12198, 12195, 12196, + 12193, 12192, 12195, 12198, + 12067, 12072, 12199, 12196, + 12071, 12200, 12199, 12072, + 12201, 12202, 12199, 12200, + 12197, 12196, 12199, 12202, + 12071, 12076, 12203, 12200, + 12075, 12204, 12203, 12076, + 12205, 12206, 12203, 12204, + 12201, 12200, 12203, 12206, + 12075, 12080, 12207, 12204, + 12079, 12208, 12207, 12080, + 12209, 12210, 12207, 12208, + 12205, 12204, 12207, 12210, + 12079, 12084, 12211, 12208, + 12083, 12212, 12211, 12084, + 12213, 12214, 12211, 12212, + 12209, 12208, 12211, 12214, + 12083, 12088, 12215, 12212, + 12087, 12216, 12215, 12088, + 12217, 12218, 12215, 12216, + 12213, 12212, 12215, 12218, + 12087, 12092, 12219, 12216, + 12091, 12220, 12219, 12092, + 12221, 12222, 12219, 12220, + 12217, 12216, 12219, 12222, + 12091, 12096, 12223, 12220, + 12095, 12224, 12223, 12096, + 12225, 12226, 12223, 12224, + 12221, 12220, 12223, 12226, + 12095, 12100, 12227, 12224, + 12099, 12228, 12227, 12100, + 12229, 12230, 12227, 12228, + 12225, 12224, 12227, 12230, + 12099, 12104, 12231, 12228, + 12103, 12232, 12231, 12104, + 12233, 12234, 12231, 12232, + 12229, 12228, 12231, 12234, + 12103, 12108, 12235, 12232, + 12107, 12236, 12235, 12108, + 12237, 12238, 12235, 12236, + 12233, 12232, 12235, 12238, + 12107, 12112, 12239, 12236, + 12111, 12240, 12239, 12112, + 12241, 12242, 12239, 12240, + 12237, 12236, 12239, 12242, + 12111, 12116, 12243, 12240, + 12115, 12244, 12243, 12116, + 12245, 12246, 12243, 12244, + 12241, 12240, 12243, 12246, + 12115, 12120, 12247, 12244, + 12119, 12248, 12247, 12120, + 12249, 12250, 12247, 12248, + 12245, 12244, 12247, 12250, + 12119, 12124, 12251, 12248, + 12123, 12252, 12251, 12124, + 12253, 12254, 12251, 12252, + 12249, 12248, 12251, 12254, + 12123, 12128, 12255, 12252, + 12127, 12256, 12255, 12128, + 12257, 12258, 12255, 12256, + 12253, 12252, 12255, 12258, + 12127, 12132, 12259, 12256, + 12131, 12260, 12259, 12132, + 12261, 12262, 12259, 12260, + 12257, 12256, 12259, 12262, + 12131, 12136, 12263, 12260, + 12135, 12264, 12263, 12136, + 12265, 12266, 12263, 12264, + 12261, 12260, 12263, 12266, + 12135, 12140, 12267, 12264, + 12139, 12268, 12267, 12140, + 12269, 12270, 12267, 12268, + 12265, 12264, 12267, 12270, + 12139, 12144, 12271, 12268, + 12143, 12272, 12271, 12144, + 12273, 12274, 12271, 12272, + 12269, 12268, 12271, 12274, + 12143, 12148, 12275, 12272, + 12147, 12276, 12275, 12148, + 12277, 12278, 12275, 12276, + 12273, 12272, 12275, 12278, + 12147, 12152, 12279, 12276, + 12151, 12280, 12279, 12152, + 12281, 12282, 12279, 12280, + 12277, 12276, 12279, 12282, + 12151, 12156, 12283, 12280, + 12155, 12284, 12283, 12156, + 12285, 12286, 12283, 12284, + 12281, 12280, 12283, 12286, + 12155, 12160, 12287, 12284, + 12159, 12288, 12287, 12160, + 12289, 12290, 12287, 12288, + 12285, 12284, 12287, 12290, + 12159, 12164, 12291, 12288, + 12163, 12292, 12291, 12164, + 12293, 12294, 12291, 12292, + 12289, 12288, 12291, 12294, + 12163, 12168, 12295, 12292, + 12167, 12296, 12295, 12168, + 12297, 12298, 12295, 12296, + 12293, 12292, 12295, 12298, + 12167, 12172, 12299, 12296, + 12171, 12300, 12299, 12172, + 12301, 12302, 12299, 12300, + 12297, 12296, 12299, 12302, + 12171, 12176, 12303, 12300, + 12175, 12304, 12303, 12176, + 12305, 12306, 12303, 12304, + 12301, 12300, 12303, 12306, + 12175, 12180, 12307, 12304, + 12179, 12308, 12307, 12180, + 12309, 12310, 12307, 12308, + 12305, 12304, 12307, 12310, + 12179, 12184, 12311, 12308, + 12183, 12312, 12311, 12184, + 12313, 12314, 12311, 12312, + 12309, 12308, 12311, 12314, + 12183, 12186, 12315, 12312, + 1959, 1956, 12315, 12186, + 1825, 12316, 12315, 1956, + 12313, 12312, 12315, 12316, + 8844, 12190, 12317, 8975, + 12189, 12318, 12317, 12190, + 12319, 12320, 12317, 12318, + 8976, 8975, 12317, 12320, + 12189, 12194, 12321, 12318, + 12193, 12322, 12321, 12194, + 12323, 12324, 12321, 12322, + 12319, 12318, 12321, 12324, + 12193, 12198, 12325, 12322, + 12197, 12326, 12325, 12198, + 12327, 12328, 12325, 12326, + 12323, 12322, 12325, 12328, + 12197, 12202, 12329, 12326, + 12201, 12330, 12329, 12202, + 12331, 12332, 12329, 12330, + 12327, 12326, 12329, 12332, + 12201, 12206, 12333, 12330, + 12205, 12334, 12333, 12206, + 12335, 12336, 12333, 12334, + 12331, 12330, 12333, 12336, + 12205, 12210, 12337, 12334, + 12209, 12338, 12337, 12210, + 12339, 12340, 12337, 12338, + 12335, 12334, 12337, 12340, + 12209, 12214, 12341, 12338, + 12213, 12342, 12341, 12214, + 12343, 12344, 12341, 12342, + 12339, 12338, 12341, 12344, + 12213, 12218, 12345, 12342, + 12217, 12346, 12345, 12218, + 12347, 12348, 12345, 12346, + 12343, 12342, 12345, 12348, + 12217, 12222, 12349, 12346, + 12221, 12350, 12349, 12222, + 12351, 12352, 12349, 12350, + 12347, 12346, 12349, 12352, + 12221, 12226, 12353, 12350, + 12225, 12354, 12353, 12226, + 12355, 12356, 12353, 12354, + 12351, 12350, 12353, 12356, + 12225, 12230, 12357, 12354, + 12229, 12358, 12357, 12230, + 12359, 12360, 12357, 12358, + 12355, 12354, 12357, 12360, + 12229, 12234, 12361, 12358, + 12233, 12362, 12361, 12234, + 12363, 12364, 12361, 12362, + 12359, 12358, 12361, 12364, + 12233, 12238, 12365, 12362, + 12237, 12366, 12365, 12238, + 12367, 12368, 12365, 12366, + 12363, 12362, 12365, 12368, + 12237, 12242, 12369, 12366, + 12241, 12370, 12369, 12242, + 12371, 12372, 12369, 12370, + 12367, 12366, 12369, 12372, + 12241, 12246, 12373, 12370, + 12245, 12374, 12373, 12246, + 12375, 12376, 12373, 12374, + 12371, 12370, 12373, 12376, + 12245, 12250, 12377, 12374, + 12249, 12378, 12377, 12250, + 12379, 12380, 12377, 12378, + 12375, 12374, 12377, 12380, + 12249, 12254, 12381, 12378, + 12253, 12382, 12381, 12254, + 12383, 12384, 12381, 12382, + 12379, 12378, 12381, 12384, + 12253, 12258, 12385, 12382, + 12257, 12386, 12385, 12258, + 12387, 12388, 12385, 12386, + 12383, 12382, 12385, 12388, + 12257, 12262, 12389, 12386, + 12261, 12390, 12389, 12262, + 12391, 12392, 12389, 12390, + 12387, 12386, 12389, 12392, + 12261, 12266, 12393, 12390, + 12265, 12394, 12393, 12266, + 12395, 12396, 12393, 12394, + 12391, 12390, 12393, 12396, + 12265, 12270, 12397, 12394, + 12269, 12398, 12397, 12270, + 12399, 12400, 12397, 12398, + 12395, 12394, 12397, 12400, + 12269, 12274, 12401, 12398, + 12273, 12402, 12401, 12274, + 12403, 12404, 12401, 12402, + 12399, 12398, 12401, 12404, + 12273, 12278, 12405, 12402, + 12277, 12406, 12405, 12278, + 12407, 12408, 12405, 12406, + 12403, 12402, 12405, 12408, + 12277, 12282, 12409, 12406, + 12281, 12410, 12409, 12282, + 12411, 12412, 12409, 12410, + 12407, 12406, 12409, 12412, + 12281, 12286, 12413, 12410, + 12285, 12414, 12413, 12286, + 12415, 12416, 12413, 12414, + 12411, 12410, 12413, 12416, + 12285, 12290, 12417, 12414, + 12289, 12418, 12417, 12290, + 12419, 12420, 12417, 12418, + 12415, 12414, 12417, 12420, + 12289, 12294, 12421, 12418, + 12293, 12422, 12421, 12294, + 12423, 12424, 12421, 12422, + 12419, 12418, 12421, 12424, + 12293, 12298, 12425, 12422, + 12297, 12426, 12425, 12298, + 12427, 12428, 12425, 12426, + 12423, 12422, 12425, 12428, + 12297, 12302, 12429, 12426, + 12301, 12430, 12429, 12302, + 12431, 12432, 12429, 12430, + 12427, 12426, 12429, 12432, + 12301, 12306, 12433, 12430, + 12305, 12434, 12433, 12306, + 12435, 12436, 12433, 12434, + 12431, 12430, 12433, 12436, + 12305, 12310, 12437, 12434, + 12309, 12438, 12437, 12310, + 12439, 12440, 12437, 12438, + 12435, 12434, 12437, 12440, + 12309, 12314, 12441, 12438, + 12313, 12442, 12441, 12314, + 12443, 12444, 12441, 12442, + 12439, 12438, 12441, 12444, + 12313, 12316, 12445, 12442, + 1825, 1822, 12445, 12316, + 1691, 12446, 12445, 1822, + 12443, 12442, 12445, 12446, + 8976, 12320, 12447, 9107, + 12319, 12448, 12447, 12320, + 12449, 12450, 12447, 12448, + 9108, 9107, 12447, 12450, + 12319, 12324, 12451, 12448, + 12323, 12452, 12451, 12324, + 12453, 12454, 12451, 12452, + 12449, 12448, 12451, 12454, + 12323, 12328, 12455, 12452, + 12327, 12456, 12455, 12328, + 12457, 12458, 12455, 12456, + 12453, 12452, 12455, 12458, + 12327, 12332, 12459, 12456, + 12331, 12460, 12459, 12332, + 12461, 12462, 12459, 12460, + 12457, 12456, 12459, 12462, + 12331, 12336, 12463, 12460, + 12335, 12464, 12463, 12336, + 12465, 12466, 12463, 12464, + 12461, 12460, 12463, 12466, + 12335, 12340, 12467, 12464, + 12339, 12468, 12467, 12340, + 12469, 12470, 12467, 12468, + 12465, 12464, 12467, 12470, + 12339, 12344, 12471, 12468, + 12343, 12472, 12471, 12344, + 12473, 12474, 12471, 12472, + 12469, 12468, 12471, 12474, + 12343, 12348, 12475, 12472, + 12347, 12476, 12475, 12348, + 12477, 12478, 12475, 12476, + 12473, 12472, 12475, 12478, + 12347, 12352, 12479, 12476, + 12351, 12480, 12479, 12352, + 12481, 12482, 12479, 12480, + 12477, 12476, 12479, 12482, + 12351, 12356, 12483, 12480, + 12355, 12484, 12483, 12356, + 12485, 12486, 12483, 12484, + 12481, 12480, 12483, 12486, + 12355, 12360, 12487, 12484, + 12359, 12488, 12487, 12360, + 12489, 12490, 12487, 12488, + 12485, 12484, 12487, 12490, + 12359, 12364, 12491, 12488, + 12363, 12492, 12491, 12364, + 12493, 12494, 12491, 12492, + 12489, 12488, 12491, 12494, + 12363, 12368, 12495, 12492, + 12367, 12496, 12495, 12368, + 12497, 12498, 12495, 12496, + 12493, 12492, 12495, 12498, + 12367, 12372, 12499, 12496, + 12371, 12500, 12499, 12372, + 12501, 12502, 12499, 12500, + 12497, 12496, 12499, 12502, + 12371, 12376, 12503, 12500, + 12375, 12504, 12503, 12376, + 12505, 12506, 12503, 12504, + 12501, 12500, 12503, 12506, + 12375, 12380, 12507, 12504, + 12379, 12508, 12507, 12380, + 12509, 12510, 12507, 12508, + 12505, 12504, 12507, 12510, + 12379, 12384, 12511, 12508, + 12383, 12512, 12511, 12384, + 12513, 12514, 12511, 12512, + 12509, 12508, 12511, 12514, + 12383, 12388, 12515, 12512, + 12387, 12516, 12515, 12388, + 12517, 12518, 12515, 12516, + 12513, 12512, 12515, 12518, + 12387, 12392, 12519, 12516, + 12391, 12520, 12519, 12392, + 12521, 12522, 12519, 12520, + 12517, 12516, 12519, 12522, + 12391, 12396, 12523, 12520, + 12395, 12524, 12523, 12396, + 12525, 12526, 12523, 12524, + 12521, 12520, 12523, 12526, + 12395, 12400, 12527, 12524, + 12399, 12528, 12527, 12400, + 12529, 12530, 12527, 12528, + 12525, 12524, 12527, 12530, + 12399, 12404, 12531, 12528, + 12403, 12532, 12531, 12404, + 12533, 12534, 12531, 12532, + 12529, 12528, 12531, 12534, + 12403, 12408, 12535, 12532, + 12407, 12536, 12535, 12408, + 12537, 12538, 12535, 12536, + 12533, 12532, 12535, 12538, + 12407, 12412, 12539, 12536, + 12411, 12540, 12539, 12412, + 12541, 12542, 12539, 12540, + 12537, 12536, 12539, 12542, + 12411, 12416, 12543, 12540, + 12415, 12544, 12543, 12416, + 12545, 12546, 12543, 12544, + 12541, 12540, 12543, 12546, + 12415, 12420, 12547, 12544, + 12419, 12548, 12547, 12420, + 12549, 12550, 12547, 12548, + 12545, 12544, 12547, 12550, + 12419, 12424, 12551, 12548, + 12423, 12552, 12551, 12424, + 12553, 12554, 12551, 12552, + 12549, 12548, 12551, 12554, + 12423, 12428, 12555, 12552, + 12427, 12556, 12555, 12428, + 12557, 12558, 12555, 12556, + 12553, 12552, 12555, 12558, + 12427, 12432, 12559, 12556, + 12431, 12560, 12559, 12432, + 12561, 12562, 12559, 12560, + 12557, 12556, 12559, 12562, + 12431, 12436, 12563, 12560, + 12435, 12564, 12563, 12436, + 12565, 12566, 12563, 12564, + 12561, 12560, 12563, 12566, + 12435, 12440, 12567, 12564, + 12439, 12568, 12567, 12440, + 12569, 12570, 12567, 12568, + 12565, 12564, 12567, 12570, + 12439, 12444, 12571, 12568, + 12443, 12572, 12571, 12444, + 12573, 12574, 12571, 12572, + 12569, 12568, 12571, 12574, + 12443, 12446, 12575, 12572, + 1691, 1688, 12575, 12446, + 1557, 12576, 12575, 1688, + 12573, 12572, 12575, 12576, + 9108, 12450, 12577, 9239, + 12449, 12578, 12577, 12450, + 12579, 12580, 12577, 12578, + 9240, 9239, 12577, 12580, + 12449, 12454, 12581, 12578, + 12453, 12582, 12581, 12454, + 12583, 12584, 12581, 12582, + 12579, 12578, 12581, 12584, + 12453, 12458, 12585, 12582, + 12457, 12586, 12585, 12458, + 12587, 12588, 12585, 12586, + 12583, 12582, 12585, 12588, + 12457, 12462, 12589, 12586, + 12461, 12590, 12589, 12462, + 12591, 12592, 12589, 12590, + 12587, 12586, 12589, 12592, + 12461, 12466, 12593, 12590, + 12465, 12594, 12593, 12466, + 12595, 12596, 12593, 12594, + 12591, 12590, 12593, 12596, + 12465, 12470, 12597, 12594, + 12469, 12598, 12597, 12470, + 12599, 12600, 12597, 12598, + 12595, 12594, 12597, 12600, + 12469, 12474, 12601, 12598, + 12473, 12602, 12601, 12474, + 12603, 12604, 12601, 12602, + 12599, 12598, 12601, 12604, + 12473, 12478, 12605, 12602, + 12477, 12606, 12605, 12478, + 12607, 12608, 12605, 12606, + 12603, 12602, 12605, 12608, + 12477, 12482, 12609, 12606, + 12481, 12610, 12609, 12482, + 12611, 12612, 12609, 12610, + 12607, 12606, 12609, 12612, + 12481, 12486, 12613, 12610, + 12485, 12614, 12613, 12486, + 12615, 12616, 12613, 12614, + 12611, 12610, 12613, 12616, + 12485, 12490, 12617, 12614, + 12489, 12618, 12617, 12490, + 12619, 12620, 12617, 12618, + 12615, 12614, 12617, 12620, + 12489, 12494, 12621, 12618, + 12493, 12622, 12621, 12494, + 12623, 12624, 12621, 12622, + 12619, 12618, 12621, 12624, + 12493, 12498, 12625, 12622, + 12497, 12626, 12625, 12498, + 12627, 12628, 12625, 12626, + 12623, 12622, 12625, 12628, + 12497, 12502, 12629, 12626, + 12501, 12630, 12629, 12502, + 12631, 12632, 12629, 12630, + 12627, 12626, 12629, 12632, + 12501, 12506, 12633, 12630, + 12505, 12634, 12633, 12506, + 12635, 12636, 12633, 12634, + 12631, 12630, 12633, 12636, + 12505, 12510, 12637, 12634, + 12509, 12638, 12637, 12510, + 12639, 12640, 12637, 12638, + 12635, 12634, 12637, 12640, + 12509, 12514, 12641, 12638, + 12513, 12642, 12641, 12514, + 12643, 12644, 12641, 12642, + 12639, 12638, 12641, 12644, + 12513, 12518, 12645, 12642, + 12517, 12646, 12645, 12518, + 12647, 12648, 12645, 12646, + 12643, 12642, 12645, 12648, + 12517, 12522, 12649, 12646, + 12521, 12650, 12649, 12522, + 12651, 12652, 12649, 12650, + 12647, 12646, 12649, 12652, + 12521, 12526, 12653, 12650, + 12525, 12654, 12653, 12526, + 12655, 12656, 12653, 12654, + 12651, 12650, 12653, 12656, + 12525, 12530, 12657, 12654, + 12529, 12658, 12657, 12530, + 12659, 12660, 12657, 12658, + 12655, 12654, 12657, 12660, + 12529, 12534, 12661, 12658, + 12533, 12662, 12661, 12534, + 12663, 12664, 12661, 12662, + 12659, 12658, 12661, 12664, + 12533, 12538, 12665, 12662, + 12537, 12666, 12665, 12538, + 12667, 12668, 12665, 12666, + 12663, 12662, 12665, 12668, + 12537, 12542, 12669, 12666, + 12541, 12670, 12669, 12542, + 12671, 12672, 12669, 12670, + 12667, 12666, 12669, 12672, + 12541, 12546, 12673, 12670, + 12545, 12674, 12673, 12546, + 12675, 12676, 12673, 12674, + 12671, 12670, 12673, 12676, + 12545, 12550, 12677, 12674, + 12549, 12678, 12677, 12550, + 12679, 12680, 12677, 12678, + 12675, 12674, 12677, 12680, + 12549, 12554, 12681, 12678, + 12553, 12682, 12681, 12554, + 12683, 12684, 12681, 12682, + 12679, 12678, 12681, 12684, + 12553, 12558, 12685, 12682, + 12557, 12686, 12685, 12558, + 12687, 12688, 12685, 12686, + 12683, 12682, 12685, 12688, + 12557, 12562, 12689, 12686, + 12561, 12690, 12689, 12562, + 12691, 12692, 12689, 12690, + 12687, 12686, 12689, 12692, + 12561, 12566, 12693, 12690, + 12565, 12694, 12693, 12566, + 12695, 12696, 12693, 12694, + 12691, 12690, 12693, 12696, + 12565, 12570, 12697, 12694, + 12569, 12698, 12697, 12570, + 12699, 12700, 12697, 12698, + 12695, 12694, 12697, 12700, + 12569, 12574, 12701, 12698, + 12573, 12702, 12701, 12574, + 12703, 12704, 12701, 12702, + 12699, 12698, 12701, 12704, + 12573, 12576, 12705, 12702, + 1557, 1554, 12705, 12576, + 1423, 12706, 12705, 1554, + 12703, 12702, 12705, 12706, + 9240, 12580, 12707, 9371, + 12579, 12708, 12707, 12580, + 12709, 12710, 12707, 12708, + 9372, 9371, 12707, 12710, + 12579, 12584, 12711, 12708, + 12583, 12712, 12711, 12584, + 12713, 12714, 12711, 12712, + 12709, 12708, 12711, 12714, + 12583, 12588, 12715, 12712, + 12587, 12716, 12715, 12588, + 12717, 12718, 12715, 12716, + 12713, 12712, 12715, 12718, + 12587, 12592, 12719, 12716, + 12591, 12720, 12719, 12592, + 12721, 12722, 12719, 12720, + 12717, 12716, 12719, 12722, + 12591, 12596, 12723, 12720, + 12595, 12724, 12723, 12596, + 12725, 12726, 12723, 12724, + 12721, 12720, 12723, 12726, + 12595, 12600, 12727, 12724, + 12599, 12728, 12727, 12600, + 12729, 12730, 12727, 12728, + 12725, 12724, 12727, 12730, + 12599, 12604, 12731, 12728, + 12603, 12732, 12731, 12604, + 12733, 12734, 12731, 12732, + 12729, 12728, 12731, 12734, + 12603, 12608, 12735, 12732, + 12607, 12736, 12735, 12608, + 12737, 12738, 12735, 12736, + 12733, 12732, 12735, 12738, + 12607, 12612, 12739, 12736, + 12611, 12740, 12739, 12612, + 12741, 12742, 12739, 12740, + 12737, 12736, 12739, 12742, + 12611, 12616, 12743, 12740, + 12615, 12744, 12743, 12616, + 12745, 12746, 12743, 12744, + 12741, 12740, 12743, 12746, + 12615, 12620, 12747, 12744, + 12619, 12748, 12747, 12620, + 12749, 12750, 12747, 12748, + 12745, 12744, 12747, 12750, + 12619, 12624, 12751, 12748, + 12623, 12752, 12751, 12624, + 12753, 12754, 12751, 12752, + 12749, 12748, 12751, 12754, + 12623, 12628, 12755, 12752, + 12627, 12756, 12755, 12628, + 12757, 12758, 12755, 12756, + 12753, 12752, 12755, 12758, + 12627, 12632, 12759, 12756, + 12631, 12760, 12759, 12632, + 12761, 12762, 12759, 12760, + 12757, 12756, 12759, 12762, + 12631, 12636, 12763, 12760, + 12635, 12764, 12763, 12636, + 12765, 12766, 12763, 12764, + 12761, 12760, 12763, 12766, + 12635, 12640, 12767, 12764, + 12639, 12768, 12767, 12640, + 12769, 12770, 12767, 12768, + 12765, 12764, 12767, 12770, + 12639, 12644, 12771, 12768, + 12643, 12772, 12771, 12644, + 12773, 12774, 12771, 12772, + 12769, 12768, 12771, 12774, + 12643, 12648, 12775, 12772, + 12647, 12776, 12775, 12648, + 12777, 12778, 12775, 12776, + 12773, 12772, 12775, 12778, + 12647, 12652, 12779, 12776, + 12651, 12780, 12779, 12652, + 12781, 12782, 12779, 12780, + 12777, 12776, 12779, 12782, + 12651, 12656, 12783, 12780, + 12655, 12784, 12783, 12656, + 12785, 12786, 12783, 12784, + 12781, 12780, 12783, 12786, + 12655, 12660, 12787, 12784, + 12659, 12788, 12787, 12660, + 12789, 12790, 12787, 12788, + 12785, 12784, 12787, 12790, + 12659, 12664, 12791, 12788, + 12663, 12792, 12791, 12664, + 12793, 12794, 12791, 12792, + 12789, 12788, 12791, 12794, + 12663, 12668, 12795, 12792, + 12667, 12796, 12795, 12668, + 12797, 12798, 12795, 12796, + 12793, 12792, 12795, 12798, + 12667, 12672, 12799, 12796, + 12671, 12800, 12799, 12672, + 12801, 12802, 12799, 12800, + 12797, 12796, 12799, 12802, + 12671, 12676, 12803, 12800, + 12675, 12804, 12803, 12676, + 12805, 12806, 12803, 12804, + 12801, 12800, 12803, 12806, + 12675, 12680, 12807, 12804, + 12679, 12808, 12807, 12680, + 12809, 12810, 12807, 12808, + 12805, 12804, 12807, 12810, + 12679, 12684, 12811, 12808, + 12683, 12812, 12811, 12684, + 12813, 12814, 12811, 12812, + 12809, 12808, 12811, 12814, + 12683, 12688, 12815, 12812, + 12687, 12816, 12815, 12688, + 12817, 12818, 12815, 12816, + 12813, 12812, 12815, 12818, + 12687, 12692, 12819, 12816, + 12691, 12820, 12819, 12692, + 12821, 12822, 12819, 12820, + 12817, 12816, 12819, 12822, + 12691, 12696, 12823, 12820, + 12695, 12824, 12823, 12696, + 12825, 12826, 12823, 12824, + 12821, 12820, 12823, 12826, + 12695, 12700, 12827, 12824, + 12699, 12828, 12827, 12700, + 12829, 12830, 12827, 12828, + 12825, 12824, 12827, 12830, + 12699, 12704, 12831, 12828, + 12703, 12832, 12831, 12704, + 12833, 12834, 12831, 12832, + 12829, 12828, 12831, 12834, + 12703, 12706, 12835, 12832, + 1423, 1420, 12835, 12706, + 1289, 12836, 12835, 1420, + 12833, 12832, 12835, 12836, + 9372, 12710, 12837, 9503, + 12709, 12838, 12837, 12710, + 12839, 12840, 12837, 12838, + 9504, 9503, 12837, 12840, + 12709, 12714, 12841, 12838, + 12713, 12842, 12841, 12714, + 12843, 12844, 12841, 12842, + 12839, 12838, 12841, 12844, + 12713, 12718, 12845, 12842, + 12717, 12846, 12845, 12718, + 12847, 12848, 12845, 12846, + 12843, 12842, 12845, 12848, + 12717, 12722, 12849, 12846, + 12721, 12850, 12849, 12722, + 12851, 12852, 12849, 12850, + 12847, 12846, 12849, 12852, + 12721, 12726, 12853, 12850, + 12725, 12854, 12853, 12726, + 12855, 12856, 12853, 12854, + 12851, 12850, 12853, 12856, + 12725, 12730, 12857, 12854, + 12729, 12858, 12857, 12730, + 12859, 12860, 12857, 12858, + 12855, 12854, 12857, 12860, + 12729, 12734, 12861, 12858, + 12733, 12862, 12861, 12734, + 12863, 12864, 12861, 12862, + 12859, 12858, 12861, 12864, + 12733, 12738, 12865, 12862, + 12737, 12866, 12865, 12738, + 12867, 12868, 12865, 12866, + 12863, 12862, 12865, 12868, + 12737, 12742, 12869, 12866, + 12741, 12870, 12869, 12742, + 12871, 12872, 12869, 12870, + 12867, 12866, 12869, 12872, + 12741, 12746, 12873, 12870, + 12745, 12874, 12873, 12746, + 12875, 12876, 12873, 12874, + 12871, 12870, 12873, 12876, + 12745, 12750, 12877, 12874, + 12749, 12878, 12877, 12750, + 12879, 12880, 12877, 12878, + 12875, 12874, 12877, 12880, + 12749, 12754, 12881, 12878, + 12753, 12882, 12881, 12754, + 12883, 12884, 12881, 12882, + 12879, 12878, 12881, 12884, + 12753, 12758, 12885, 12882, + 12757, 12886, 12885, 12758, + 12887, 12888, 12885, 12886, + 12883, 12882, 12885, 12888, + 12757, 12762, 12889, 12886, + 12761, 12890, 12889, 12762, + 12891, 12892, 12889, 12890, + 12887, 12886, 12889, 12892, + 12761, 12766, 12893, 12890, + 12765, 12894, 12893, 12766, + 12895, 12896, 12893, 12894, + 12891, 12890, 12893, 12896, + 12765, 12770, 12897, 12894, + 12769, 12898, 12897, 12770, + 12899, 12900, 12897, 12898, + 12895, 12894, 12897, 12900, + 12769, 12774, 12901, 12898, + 12773, 12902, 12901, 12774, + 12903, 12904, 12901, 12902, + 12899, 12898, 12901, 12904, + 12773, 12778, 12905, 12902, + 12777, 12906, 12905, 12778, + 12907, 12908, 12905, 12906, + 12903, 12902, 12905, 12908, + 12777, 12782, 12909, 12906, + 12781, 12910, 12909, 12782, + 12911, 12912, 12909, 12910, + 12907, 12906, 12909, 12912, + 12781, 12786, 12913, 12910, + 12785, 12914, 12913, 12786, + 12915, 12916, 12913, 12914, + 12911, 12910, 12913, 12916, + 12785, 12790, 12917, 12914, + 12789, 12918, 12917, 12790, + 12919, 12920, 12917, 12918, + 12915, 12914, 12917, 12920, + 12789, 12794, 12921, 12918, + 12793, 12922, 12921, 12794, + 12923, 12924, 12921, 12922, + 12919, 12918, 12921, 12924, + 12793, 12798, 12925, 12922, + 12797, 12926, 12925, 12798, + 12927, 12928, 12925, 12926, + 12923, 12922, 12925, 12928, + 12797, 12802, 12929, 12926, + 12801, 12930, 12929, 12802, + 12931, 12932, 12929, 12930, + 12927, 12926, 12929, 12932, + 12801, 12806, 12933, 12930, + 12805, 12934, 12933, 12806, + 12935, 12936, 12933, 12934, + 12931, 12930, 12933, 12936, + 12805, 12810, 12937, 12934, + 12809, 12938, 12937, 12810, + 12939, 12940, 12937, 12938, + 12935, 12934, 12937, 12940, + 12809, 12814, 12941, 12938, + 12813, 12942, 12941, 12814, + 12943, 12944, 12941, 12942, + 12939, 12938, 12941, 12944, + 12813, 12818, 12945, 12942, + 12817, 12946, 12945, 12818, + 12947, 12948, 12945, 12946, + 12943, 12942, 12945, 12948, + 12817, 12822, 12949, 12946, + 12821, 12950, 12949, 12822, + 12951, 12952, 12949, 12950, + 12947, 12946, 12949, 12952, + 12821, 12826, 12953, 12950, + 12825, 12954, 12953, 12826, + 12955, 12956, 12953, 12954, + 12951, 12950, 12953, 12956, + 12825, 12830, 12957, 12954, + 12829, 12958, 12957, 12830, + 12959, 12960, 12957, 12958, + 12955, 12954, 12957, 12960, + 12829, 12834, 12961, 12958, + 12833, 12962, 12961, 12834, + 12963, 12964, 12961, 12962, + 12959, 12958, 12961, 12964, + 12833, 12836, 12965, 12962, + 1289, 1286, 12965, 12836, + 94, 12966, 12965, 1286, + 12963, 12962, 12965, 12966, + 12899, 12904, 12967, 12900, + 12903, 12968, 12967, 12904, + 12969, 12970, 12967, 12968, + 12895, 12900, 12967, 12970, + 12903, 12908, 12971, 12968, + 12907, 12972, 12971, 12908, + 12973, 12974, 12971, 12972, + 12969, 12968, 12971, 12974, + 12907, 12912, 12975, 12972, + 12911, 12976, 12975, 12912, + 12977, 12978, 12975, 12976, + 12973, 12972, 12975, 12978, + 12911, 12916, 12979, 12976, + 12915, 12980, 12979, 12916, + 12981, 12982, 12979, 12980, + 12977, 12976, 12979, 12982, + 12915, 12920, 12983, 12980, + 12919, 12984, 12983, 12920, + 12985, 12986, 12983, 12984, + 12981, 12980, 12983, 12986, + 12919, 12924, 12987, 12984, + 12923, 12988, 12987, 12924, + 12989, 12990, 12987, 12988, + 12985, 12984, 12987, 12990, + 12923, 12928, 12991, 12988, + 12927, 12992, 12991, 12928, + 12993, 12994, 12991, 12992, + 12989, 12988, 12991, 12994, + 12927, 12932, 12995, 12992, + 12931, 12996, 12995, 12932, + 12997, 12998, 12995, 12996, + 12993, 12992, 12995, 12998, + 12931, 12936, 12999, 12996, + 12935, 13000, 12999, 12936, + 13001, 13002, 12999, 13000, + 12997, 12996, 12999, 13002, + 12935, 12940, 13003, 13000, + 12939, 13004, 13003, 12940, + 13005, 13006, 13003, 13004, + 13001, 13000, 13003, 13006, + 12939, 12944, 13007, 13004, + 12943, 13008, 13007, 12944, + 13009, 13010, 13007, 13008, + 13005, 13004, 13007, 13010, + 12943, 12948, 13011, 13008, + 12947, 13012, 13011, 12948, + 13013, 13014, 13011, 13012, + 13009, 13008, 13011, 13014, + 12947, 12952, 13015, 13012, + 12951, 13016, 13015, 12952, + 13017, 13018, 13015, 13016, + 13013, 13012, 13015, 13018, + 12951, 12956, 13019, 13016, + 12955, 13020, 13019, 12956, + 13021, 13022, 13019, 13020, + 13017, 13016, 13019, 13022, + 12955, 12960, 13023, 13020, + 12959, 13024, 13023, 12960, + 13025, 13026, 13023, 13024, + 13021, 13020, 13023, 13026, + 12959, 12964, 13027, 13024, + 12963, 13028, 13027, 12964, + 13029, 13030, 13027, 13028, + 13025, 13024, 13027, 13030, + 12963, 12966, 13031, 13028, + 94, 97, 13031, 12966, + 88, 13032, 13031, 97, + 13029, 13028, 13031, 13032, + 12895, 12970, 13033, 12896, + 12969, 13034, 13033, 12970, + 13035, 13036, 13033, 13034, + 12891, 12896, 13033, 13036, + 12969, 12974, 13037, 13034, + 12973, 13038, 13037, 12974, + 13039, 13040, 13037, 13038, + 13035, 13034, 13037, 13040, + 12973, 12978, 13041, 13038, + 12977, 13042, 13041, 12978, + 13043, 13044, 13041, 13042, + 13039, 13038, 13041, 13044, + 12977, 12982, 13045, 13042, + 12981, 13046, 13045, 12982, + 13047, 13048, 13045, 13046, + 13043, 13042, 13045, 13048, + 12981, 12986, 13049, 13046, + 12985, 13050, 13049, 12986, + 13051, 13052, 13049, 13050, + 13047, 13046, 13049, 13052, + 12985, 12990, 13053, 13050, + 12989, 13054, 13053, 12990, + 13055, 13056, 13053, 13054, + 13051, 13050, 13053, 13056, + 12989, 12994, 13057, 13054, + 12993, 13058, 13057, 12994, + 13059, 13060, 13057, 13058, + 13055, 13054, 13057, 13060, + 12993, 12998, 13061, 13058, + 12997, 13062, 13061, 12998, + 13063, 13064, 13061, 13062, + 13059, 13058, 13061, 13064, + 12997, 13002, 13065, 13062, + 13001, 13066, 13065, 13002, + 13067, 13068, 13065, 13066, + 13063, 13062, 13065, 13068, + 13001, 13006, 13069, 13066, + 13005, 13070, 13069, 13006, + 13071, 13072, 13069, 13070, + 13067, 13066, 13069, 13072, + 13005, 13010, 13073, 13070, + 13009, 13074, 13073, 13010, + 13075, 13076, 13073, 13074, + 13071, 13070, 13073, 13076, + 13009, 13014, 13077, 13074, + 13013, 13078, 13077, 13014, + 13079, 13080, 13077, 13078, + 13075, 13074, 13077, 13080, + 13013, 13018, 13081, 13078, + 13017, 13082, 13081, 13018, + 13083, 13084, 13081, 13082, + 13079, 13078, 13081, 13084, + 13017, 13022, 13085, 13082, + 13021, 13086, 13085, 13022, + 13087, 13088, 13085, 13086, + 13083, 13082, 13085, 13088, + 13021, 13026, 13089, 13086, + 13025, 13090, 13089, 13026, + 13091, 13092, 13089, 13090, + 13087, 13086, 13089, 13092, + 13025, 13030, 13093, 13090, + 13029, 13094, 13093, 13030, + 13095, 13096, 13093, 13094, + 13091, 13090, 13093, 13096, + 13029, 13032, 13097, 13094, + 88, 91, 13097, 13032, + 82, 13098, 13097, 91, + 13095, 13094, 13097, 13098, + 12891, 13036, 13099, 12892, + 13035, 13100, 13099, 13036, + 13101, 13102, 13099, 13100, + 12887, 12892, 13099, 13102, + 13035, 13040, 13103, 13100, + 13039, 13104, 13103, 13040, + 13105, 13106, 13103, 13104, + 13101, 13100, 13103, 13106, + 13039, 13044, 13107, 13104, + 13043, 13108, 13107, 13044, + 13109, 13110, 13107, 13108, + 13105, 13104, 13107, 13110, + 13043, 13048, 13111, 13108, + 13047, 13112, 13111, 13048, + 13113, 13114, 13111, 13112, + 13109, 13108, 13111, 13114, + 13047, 13052, 13115, 13112, + 13051, 13116, 13115, 13052, + 13117, 13118, 13115, 13116, + 13113, 13112, 13115, 13118, + 13051, 13056, 13119, 13116, + 13055, 13120, 13119, 13056, + 13121, 13122, 13119, 13120, + 13117, 13116, 13119, 13122, + 13055, 13060, 13123, 13120, + 13059, 13124, 13123, 13060, + 13125, 13126, 13123, 13124, + 13121, 13120, 13123, 13126, + 13059, 13064, 13127, 13124, + 13063, 13128, 13127, 13064, + 13129, 13130, 13127, 13128, + 13125, 13124, 13127, 13130, + 13063, 13068, 13131, 13128, + 13067, 13132, 13131, 13068, + 13133, 13134, 13131, 13132, + 13129, 13128, 13131, 13134, + 13067, 13072, 13135, 13132, + 13071, 13136, 13135, 13072, + 13137, 13138, 13135, 13136, + 13133, 13132, 13135, 13138, + 13071, 13076, 13139, 13136, + 13075, 13140, 13139, 13076, + 13141, 13142, 13139, 13140, + 13137, 13136, 13139, 13142, + 13075, 13080, 13143, 13140, + 13079, 13144, 13143, 13080, + 13145, 13146, 13143, 13144, + 13141, 13140, 13143, 13146, + 13079, 13084, 13147, 13144, + 13083, 13148, 13147, 13084, + 13149, 13150, 13147, 13148, + 13145, 13144, 13147, 13150, + 13083, 13088, 13151, 13148, + 13087, 13152, 13151, 13088, + 13153, 13154, 13151, 13152, + 13149, 13148, 13151, 13154, + 13087, 13092, 13155, 13152, + 13091, 13156, 13155, 13092, + 13157, 13158, 13155, 13156, + 13153, 13152, 13155, 13158, + 13091, 13096, 13159, 13156, + 13095, 13160, 13159, 13096, + 13161, 13162, 13159, 13160, + 13157, 13156, 13159, 13162, + 13095, 13098, 13163, 13160, + 82, 85, 13163, 13098, + 76, 13164, 13163, 85, + 13161, 13160, 13163, 13164, + 12887, 13102, 13165, 12888, + 13101, 13166, 13165, 13102, + 13167, 13168, 13165, 13166, + 12883, 12888, 13165, 13168, + 13101, 13106, 13169, 13166, + 13105, 13170, 13169, 13106, + 13171, 13172, 13169, 13170, + 13167, 13166, 13169, 13172, + 13105, 13110, 13173, 13170, + 13109, 13174, 13173, 13110, + 13175, 13176, 13173, 13174, + 13171, 13170, 13173, 13176, + 13109, 13114, 13177, 13174, + 13113, 13178, 13177, 13114, + 13179, 13180, 13177, 13178, + 13175, 13174, 13177, 13180, + 13113, 13118, 13181, 13178, + 13117, 13182, 13181, 13118, + 13183, 13184, 13181, 13182, + 13179, 13178, 13181, 13184, + 13117, 13122, 13185, 13182, + 13121, 13186, 13185, 13122, + 13187, 13188, 13185, 13186, + 13183, 13182, 13185, 13188, + 13121, 13126, 13189, 13186, + 13125, 13190, 13189, 13126, + 13191, 13192, 13189, 13190, + 13187, 13186, 13189, 13192, + 13125, 13130, 13193, 13190, + 13129, 13194, 13193, 13130, + 13195, 13196, 13193, 13194, + 13191, 13190, 13193, 13196, + 13129, 13134, 13197, 13194, + 13133, 13198, 13197, 13134, + 13199, 13200, 13197, 13198, + 13195, 13194, 13197, 13200, + 13133, 13138, 13201, 13198, + 13137, 13202, 13201, 13138, + 13203, 13204, 13201, 13202, + 13199, 13198, 13201, 13204, + 13137, 13142, 13205, 13202, + 13141, 13206, 13205, 13142, + 13207, 13208, 13205, 13206, + 13203, 13202, 13205, 13208, + 13141, 13146, 13209, 13206, + 13145, 13210, 13209, 13146, + 13211, 13212, 13209, 13210, + 13207, 13206, 13209, 13212, + 13145, 13150, 13213, 13210, + 13149, 13214, 13213, 13150, + 13215, 13216, 13213, 13214, + 13211, 13210, 13213, 13216, + 13149, 13154, 13217, 13214, + 13153, 13218, 13217, 13154, + 13219, 13220, 13217, 13218, + 13215, 13214, 13217, 13220, + 13153, 13158, 13221, 13218, + 13157, 13222, 13221, 13158, + 13223, 13224, 13221, 13222, + 13219, 13218, 13221, 13224, + 13157, 13162, 13225, 13222, + 13161, 13226, 13225, 13162, + 13227, 13228, 13225, 13226, + 13223, 13222, 13225, 13228, + 13161, 13164, 13229, 13226, + 76, 79, 13229, 13164, + 70, 13230, 13229, 79, + 13227, 13226, 13229, 13230, + 12883, 13168, 13231, 12884, + 13167, 13232, 13231, 13168, + 13233, 13234, 13231, 13232, + 12879, 12884, 13231, 13234, + 13167, 13172, 13235, 13232, + 13171, 13236, 13235, 13172, + 13237, 13238, 13235, 13236, + 13233, 13232, 13235, 13238, + 13171, 13176, 13239, 13236, + 13175, 13240, 13239, 13176, + 13241, 13242, 13239, 13240, + 13237, 13236, 13239, 13242, + 13175, 13180, 13243, 13240, + 13179, 13244, 13243, 13180, + 13245, 13246, 13243, 13244, + 13241, 13240, 13243, 13246, + 13179, 13184, 13247, 13244, + 13183, 13248, 13247, 13184, + 13249, 13250, 13247, 13248, + 13245, 13244, 13247, 13250, + 13183, 13188, 13251, 13248, + 13187, 13252, 13251, 13188, + 13253, 13254, 13251, 13252, + 13249, 13248, 13251, 13254, + 13187, 13192, 13255, 13252, + 13191, 13256, 13255, 13192, + 13257, 13258, 13255, 13256, + 13253, 13252, 13255, 13258, + 13191, 13196, 13259, 13256, + 13195, 13260, 13259, 13196, + 13261, 13262, 13259, 13260, + 13257, 13256, 13259, 13262, + 13195, 13200, 13263, 13260, + 13199, 13264, 13263, 13200, + 13265, 13266, 13263, 13264, + 13261, 13260, 13263, 13266, + 13199, 13204, 13267, 13264, + 13203, 13268, 13267, 13204, + 13269, 13270, 13267, 13268, + 13265, 13264, 13267, 13270, + 13203, 13208, 13271, 13268, + 13207, 13272, 13271, 13208, + 13273, 13274, 13271, 13272, + 13269, 13268, 13271, 13274, + 13207, 13212, 13275, 13272, + 13211, 13276, 13275, 13212, + 13277, 13278, 13275, 13276, + 13273, 13272, 13275, 13278, + 13211, 13216, 13279, 13276, + 13215, 13280, 13279, 13216, + 13281, 13282, 13279, 13280, + 13277, 13276, 13279, 13282, + 13215, 13220, 13283, 13280, + 13219, 13284, 13283, 13220, + 13285, 13286, 13283, 13284, + 13281, 13280, 13283, 13286, + 13219, 13224, 13287, 13284, + 13223, 13288, 13287, 13224, + 13289, 13290, 13287, 13288, + 13285, 13284, 13287, 13290, + 13223, 13228, 13291, 13288, + 13227, 13292, 13291, 13228, + 13293, 13294, 13291, 13292, + 13289, 13288, 13291, 13294, + 13227, 13230, 13295, 13292, + 70, 73, 13295, 13230, + 64, 13296, 13295, 73, + 13293, 13292, 13295, 13296, + 12879, 13234, 13297, 12880, + 13233, 13298, 13297, 13234, + 13299, 13300, 13297, 13298, + 12875, 12880, 13297, 13300, + 13233, 13238, 13301, 13298, + 13237, 13302, 13301, 13238, + 13303, 13304, 13301, 13302, + 13299, 13298, 13301, 13304, + 13237, 13242, 13305, 13302, + 13241, 13306, 13305, 13242, + 13307, 13308, 13305, 13306, + 13303, 13302, 13305, 13308, + 13241, 13246, 13309, 13306, + 13245, 13310, 13309, 13246, + 13311, 13312, 13309, 13310, + 13307, 13306, 13309, 13312, + 13245, 13250, 13313, 13310, + 13249, 13314, 13313, 13250, + 13315, 13316, 13313, 13314, + 13311, 13310, 13313, 13316, + 13249, 13254, 13317, 13314, + 13253, 13318, 13317, 13254, + 13319, 13320, 13317, 13318, + 13315, 13314, 13317, 13320, + 13253, 13258, 13321, 13318, + 13257, 13322, 13321, 13258, + 13323, 13324, 13321, 13322, + 13319, 13318, 13321, 13324, + 13257, 13262, 13325, 13322, + 13261, 13326, 13325, 13262, + 13327, 13328, 13325, 13326, + 13323, 13322, 13325, 13328, + 13261, 13266, 13329, 13326, + 13265, 13330, 13329, 13266, + 13331, 13332, 13329, 13330, + 13327, 13326, 13329, 13332, + 13265, 13270, 13333, 13330, + 13269, 13334, 13333, 13270, + 13335, 13336, 13333, 13334, + 13331, 13330, 13333, 13336, + 13269, 13274, 13337, 13334, + 13273, 13338, 13337, 13274, + 13339, 13340, 13337, 13338, + 13335, 13334, 13337, 13340, + 13273, 13278, 13341, 13338, + 13277, 13342, 13341, 13278, + 13343, 13344, 13341, 13342, + 13339, 13338, 13341, 13344, + 13277, 13282, 13345, 13342, + 13281, 13346, 13345, 13282, + 13347, 13348, 13345, 13346, + 13343, 13342, 13345, 13348, + 13281, 13286, 13349, 13346, + 13285, 13350, 13349, 13286, + 13351, 13352, 13349, 13350, + 13347, 13346, 13349, 13352, + 13285, 13290, 13353, 13350, + 13289, 13354, 13353, 13290, + 13355, 13356, 13353, 13354, + 13351, 13350, 13353, 13356, + 13289, 13294, 13357, 13354, + 13293, 13358, 13357, 13294, + 13359, 13360, 13357, 13358, + 13355, 13354, 13357, 13360, + 13293, 13296, 13361, 13358, + 64, 67, 13361, 13296, + 58, 13362, 13361, 67, + 13359, 13358, 13361, 13362, + 12875, 13300, 13363, 12876, + 13299, 13364, 13363, 13300, + 13365, 13366, 13363, 13364, + 12871, 12876, 13363, 13366, + 13299, 13304, 13367, 13364, + 13303, 13368, 13367, 13304, + 13369, 13370, 13367, 13368, + 13365, 13364, 13367, 13370, + 13303, 13308, 13371, 13368, + 13307, 13372, 13371, 13308, + 13373, 13374, 13371, 13372, + 13369, 13368, 13371, 13374, + 13307, 13312, 13375, 13372, + 13311, 13376, 13375, 13312, + 13377, 13378, 13375, 13376, + 13373, 13372, 13375, 13378, + 13311, 13316, 13379, 13376, + 13315, 13380, 13379, 13316, + 13381, 13382, 13379, 13380, + 13377, 13376, 13379, 13382, + 13315, 13320, 13383, 13380, + 13319, 13384, 13383, 13320, + 13385, 13386, 13383, 13384, + 13381, 13380, 13383, 13386, + 13319, 13324, 13387, 13384, + 13323, 13388, 13387, 13324, + 13389, 13390, 13387, 13388, + 13385, 13384, 13387, 13390, + 13323, 13328, 13391, 13388, + 13327, 13392, 13391, 13328, + 13393, 13394, 13391, 13392, + 13389, 13388, 13391, 13394, + 13327, 13332, 13395, 13392, + 13331, 13396, 13395, 13332, + 13397, 13398, 13395, 13396, + 13393, 13392, 13395, 13398, + 13331, 13336, 13399, 13396, + 13335, 13400, 13399, 13336, + 13401, 13402, 13399, 13400, + 13397, 13396, 13399, 13402, + 13335, 13340, 13403, 13400, + 13339, 13404, 13403, 13340, + 13405, 13406, 13403, 13404, + 13401, 13400, 13403, 13406, + 13339, 13344, 13407, 13404, + 13343, 13408, 13407, 13344, + 13409, 13410, 13407, 13408, + 13405, 13404, 13407, 13410, + 13343, 13348, 13411, 13408, + 13347, 13412, 13411, 13348, + 13413, 13414, 13411, 13412, + 13409, 13408, 13411, 13414, + 13347, 13352, 13415, 13412, + 13351, 13416, 13415, 13352, + 13417, 13418, 13415, 13416, + 13413, 13412, 13415, 13418, + 13351, 13356, 13419, 13416, + 13355, 13420, 13419, 13356, + 13421, 13422, 13419, 13420, + 13417, 13416, 13419, 13422, + 13355, 13360, 13423, 13420, + 13359, 13424, 13423, 13360, + 13425, 13426, 13423, 13424, + 13421, 13420, 13423, 13426, + 13359, 13362, 13427, 13424, + 58, 61, 13427, 13362, + 52, 13428, 13427, 61, + 13425, 13424, 13427, 13428, + 12871, 13366, 13429, 12872, + 13365, 13430, 13429, 13366, + 13431, 13432, 13429, 13430, + 12867, 12872, 13429, 13432, + 13365, 13370, 13433, 13430, + 13369, 13434, 13433, 13370, + 13435, 13436, 13433, 13434, + 13431, 13430, 13433, 13436, + 13369, 13374, 13437, 13434, + 13373, 13438, 13437, 13374, + 13439, 13440, 13437, 13438, + 13435, 13434, 13437, 13440, + 13373, 13378, 13441, 13438, + 13377, 13442, 13441, 13378, + 13443, 13444, 13441, 13442, + 13439, 13438, 13441, 13444, + 13377, 13382, 13445, 13442, + 13381, 13446, 13445, 13382, + 13447, 13448, 13445, 13446, + 13443, 13442, 13445, 13448, + 13381, 13386, 13449, 13446, + 13385, 13450, 13449, 13386, + 13451, 13452, 13449, 13450, + 13447, 13446, 13449, 13452, + 13385, 13390, 13453, 13450, + 13389, 13454, 13453, 13390, + 13455, 13456, 13453, 13454, + 13451, 13450, 13453, 13456, + 13389, 13394, 13457, 13454, + 13393, 13458, 13457, 13394, + 13459, 13460, 13457, 13458, + 13455, 13454, 13457, 13460, + 13393, 13398, 13461, 13458, + 13397, 13462, 13461, 13398, + 13463, 13464, 13461, 13462, + 13459, 13458, 13461, 13464, + 13397, 13402, 13465, 13462, + 13401, 13466, 13465, 13402, + 13467, 13468, 13465, 13466, + 13463, 13462, 13465, 13468, + 13401, 13406, 13469, 13466, + 13405, 13470, 13469, 13406, + 13471, 13472, 13469, 13470, + 13467, 13466, 13469, 13472, + 13405, 13410, 13473, 13470, + 13409, 13474, 13473, 13410, + 13475, 13476, 13473, 13474, + 13471, 13470, 13473, 13476, + 13409, 13414, 13477, 13474, + 13413, 13478, 13477, 13414, + 13479, 13480, 13477, 13478, + 13475, 13474, 13477, 13480, + 13413, 13418, 13481, 13478, + 13417, 13482, 13481, 13418, + 13483, 13484, 13481, 13482, + 13479, 13478, 13481, 13484, + 13417, 13422, 13485, 13482, + 13421, 13486, 13485, 13422, + 13487, 13488, 13485, 13486, + 13483, 13482, 13485, 13488, + 13421, 13426, 13489, 13486, + 13425, 13490, 13489, 13426, + 13491, 13492, 13489, 13490, + 13487, 13486, 13489, 13492, + 13425, 13428, 13493, 13490, + 52, 55, 13493, 13428, + 46, 13494, 13493, 55, + 13491, 13490, 13493, 13494, + 12867, 13432, 13495, 12868, + 13431, 13496, 13495, 13432, + 13497, 13498, 13495, 13496, + 12863, 12868, 13495, 13498, + 13431, 13436, 13499, 13496, + 13435, 13500, 13499, 13436, + 13501, 13502, 13499, 13500, + 13497, 13496, 13499, 13502, + 13435, 13440, 13503, 13500, + 13439, 13504, 13503, 13440, + 13505, 13506, 13503, 13504, + 13501, 13500, 13503, 13506, + 13439, 13444, 13507, 13504, + 13443, 13508, 13507, 13444, + 13509, 13510, 13507, 13508, + 13505, 13504, 13507, 13510, + 13443, 13448, 13511, 13508, + 13447, 13512, 13511, 13448, + 13513, 13514, 13511, 13512, + 13509, 13508, 13511, 13514, + 13447, 13452, 13515, 13512, + 13451, 13516, 13515, 13452, + 13517, 13518, 13515, 13516, + 13513, 13512, 13515, 13518, + 13451, 13456, 13519, 13516, + 13455, 13520, 13519, 13456, + 13521, 13522, 13519, 13520, + 13517, 13516, 13519, 13522, + 13455, 13460, 13523, 13520, + 13459, 13524, 13523, 13460, + 13525, 13526, 13523, 13524, + 13521, 13520, 13523, 13526, + 13459, 13464, 13527, 13524, + 13463, 13528, 13527, 13464, + 13529, 13530, 13527, 13528, + 13525, 13524, 13527, 13530, + 13463, 13468, 13531, 13528, + 13467, 13532, 13531, 13468, + 13533, 13534, 13531, 13532, + 13529, 13528, 13531, 13534, + 13467, 13472, 13535, 13532, + 13471, 13536, 13535, 13472, + 13537, 13538, 13535, 13536, + 13533, 13532, 13535, 13538, + 13471, 13476, 13539, 13536, + 13475, 13540, 13539, 13476, + 13541, 13542, 13539, 13540, + 13537, 13536, 13539, 13542, + 13475, 13480, 13543, 13540, + 13479, 13544, 13543, 13480, + 13545, 13546, 13543, 13544, + 13541, 13540, 13543, 13546, + 13479, 13484, 13547, 13544, + 13483, 13548, 13547, 13484, + 13549, 13550, 13547, 13548, + 13545, 13544, 13547, 13550, + 13483, 13488, 13551, 13548, + 13487, 13552, 13551, 13488, + 13553, 13554, 13551, 13552, + 13549, 13548, 13551, 13554, + 13487, 13492, 13555, 13552, + 13491, 13556, 13555, 13492, + 13557, 13558, 13555, 13556, + 13553, 13552, 13555, 13558, + 13491, 13494, 13559, 13556, + 46, 49, 13559, 13494, + 40, 13560, 13559, 49, + 13557, 13556, 13559, 13560, + 12863, 13498, 13561, 12864, + 13497, 13562, 13561, 13498, + 13563, 13564, 13561, 13562, + 12859, 12864, 13561, 13564, + 13497, 13502, 13565, 13562, + 13501, 13566, 13565, 13502, + 13567, 13568, 13565, 13566, + 13563, 13562, 13565, 13568, + 13501, 13506, 13569, 13566, + 13505, 13570, 13569, 13506, + 13571, 13572, 13569, 13570, + 13567, 13566, 13569, 13572, + 13505, 13510, 13573, 13570, + 13509, 13574, 13573, 13510, + 13575, 13576, 13573, 13574, + 13571, 13570, 13573, 13576, + 13509, 13514, 13577, 13574, + 13513, 13578, 13577, 13514, + 13579, 13580, 13577, 13578, + 13575, 13574, 13577, 13580, + 13513, 13518, 13581, 13578, + 13517, 13582, 13581, 13518, + 13583, 13584, 13581, 13582, + 13579, 13578, 13581, 13584, + 13517, 13522, 13585, 13582, + 13521, 13586, 13585, 13522, + 13587, 13588, 13585, 13586, + 13583, 13582, 13585, 13588, + 13521, 13526, 13589, 13586, + 13525, 13590, 13589, 13526, + 13591, 13592, 13589, 13590, + 13587, 13586, 13589, 13592, + 13525, 13530, 13593, 13590, + 13529, 13594, 13593, 13530, + 13595, 13596, 13593, 13594, + 13591, 13590, 13593, 13596, + 13529, 13534, 13597, 13594, + 13533, 13598, 13597, 13534, + 13599, 13600, 13597, 13598, + 13595, 13594, 13597, 13600, + 13533, 13538, 13601, 13598, + 13537, 13602, 13601, 13538, + 13603, 13604, 13601, 13602, + 13599, 13598, 13601, 13604, + 13537, 13542, 13605, 13602, + 13541, 13606, 13605, 13542, + 13607, 13608, 13605, 13606, + 13603, 13602, 13605, 13608, + 13541, 13546, 13609, 13606, + 13545, 13610, 13609, 13546, + 13611, 13612, 13609, 13610, + 13607, 13606, 13609, 13612, + 13545, 13550, 13613, 13610, + 13549, 13614, 13613, 13550, + 13615, 13616, 13613, 13614, + 13611, 13610, 13613, 13616, + 13549, 13554, 13617, 13614, + 13553, 13618, 13617, 13554, + 13619, 13620, 13617, 13618, + 13615, 13614, 13617, 13620, + 13553, 13558, 13621, 13618, + 13557, 13622, 13621, 13558, + 13623, 13624, 13621, 13622, + 13619, 13618, 13621, 13624, + 13557, 13560, 13625, 13622, + 40, 43, 13625, 13560, + 34, 13626, 13625, 43, + 13623, 13622, 13625, 13626, + 12859, 13564, 13627, 12860, + 13563, 13628, 13627, 13564, + 13629, 13630, 13627, 13628, + 12855, 12860, 13627, 13630, + 13563, 13568, 13631, 13628, + 13567, 13632, 13631, 13568, + 13633, 13634, 13631, 13632, + 13629, 13628, 13631, 13634, + 13567, 13572, 13635, 13632, + 13571, 13636, 13635, 13572, + 13637, 13638, 13635, 13636, + 13633, 13632, 13635, 13638, + 13571, 13576, 13639, 13636, + 13575, 13640, 13639, 13576, + 13641, 13642, 13639, 13640, + 13637, 13636, 13639, 13642, + 13575, 13580, 13643, 13640, + 13579, 13644, 13643, 13580, + 13645, 13646, 13643, 13644, + 13641, 13640, 13643, 13646, + 13579, 13584, 13647, 13644, + 13583, 13648, 13647, 13584, + 13649, 13650, 13647, 13648, + 13645, 13644, 13647, 13650, + 13583, 13588, 13651, 13648, + 13587, 13652, 13651, 13588, + 13653, 13654, 13651, 13652, + 13649, 13648, 13651, 13654, + 13587, 13592, 13655, 13652, + 13591, 13656, 13655, 13592, + 13657, 13658, 13655, 13656, + 13653, 13652, 13655, 13658, + 13591, 13596, 13659, 13656, + 13595, 13660, 13659, 13596, + 13661, 13662, 13659, 13660, + 13657, 13656, 13659, 13662, + 13595, 13600, 13663, 13660, + 13599, 13664, 13663, 13600, + 13665, 13666, 13663, 13664, + 13661, 13660, 13663, 13666, + 13599, 13604, 13667, 13664, + 13603, 13668, 13667, 13604, + 13669, 13670, 13667, 13668, + 13665, 13664, 13667, 13670, + 13603, 13608, 13671, 13668, + 13607, 13672, 13671, 13608, + 13673, 13674, 13671, 13672, + 13669, 13668, 13671, 13674, + 13607, 13612, 13675, 13672, + 13611, 13676, 13675, 13612, + 13677, 13678, 13675, 13676, + 13673, 13672, 13675, 13678, + 13611, 13616, 13679, 13676, + 13615, 13680, 13679, 13616, + 13681, 13682, 13679, 13680, + 13677, 13676, 13679, 13682, + 13615, 13620, 13683, 13680, + 13619, 13684, 13683, 13620, + 13685, 13686, 13683, 13684, + 13681, 13680, 13683, 13686, + 13619, 13624, 13687, 13684, + 13623, 13688, 13687, 13624, + 13689, 13690, 13687, 13688, + 13685, 13684, 13687, 13690, + 13623, 13626, 13691, 13688, + 34, 37, 13691, 13626, + 28, 13692, 13691, 37, + 13689, 13688, 13691, 13692, + 12855, 13630, 13693, 12856, + 13629, 13694, 13693, 13630, + 13695, 13696, 13693, 13694, + 12851, 12856, 13693, 13696, + 13629, 13634, 13697, 13694, + 13633, 13698, 13697, 13634, + 13699, 13700, 13697, 13698, + 13695, 13694, 13697, 13700, + 13633, 13638, 13701, 13698, + 13637, 13702, 13701, 13638, + 13703, 13704, 13701, 13702, + 13699, 13698, 13701, 13704, + 13637, 13642, 13705, 13702, + 13641, 13706, 13705, 13642, + 13707, 13708, 13705, 13706, + 13703, 13702, 13705, 13708, + 13641, 13646, 13709, 13706, + 13645, 13710, 13709, 13646, + 13711, 13712, 13709, 13710, + 13707, 13706, 13709, 13712, + 13645, 13650, 13713, 13710, + 13649, 13714, 13713, 13650, + 13715, 13716, 13713, 13714, + 13711, 13710, 13713, 13716, + 13649, 13654, 13717, 13714, + 13653, 13718, 13717, 13654, + 13719, 13720, 13717, 13718, + 13715, 13714, 13717, 13720, + 13653, 13658, 13721, 13718, + 13657, 13722, 13721, 13658, + 13723, 13724, 13721, 13722, + 13719, 13718, 13721, 13724, + 13657, 13662, 13725, 13722, + 13661, 13726, 13725, 13662, + 13727, 13728, 13725, 13726, + 13723, 13722, 13725, 13728, + 13661, 13666, 13729, 13726, + 13665, 13730, 13729, 13666, + 13731, 13732, 13729, 13730, + 13727, 13726, 13729, 13732, + 13665, 13670, 13733, 13730, + 13669, 13734, 13733, 13670, + 13735, 13736, 13733, 13734, + 13731, 13730, 13733, 13736, + 13669, 13674, 13737, 13734, + 13673, 13738, 13737, 13674, + 13739, 13740, 13737, 13738, + 13735, 13734, 13737, 13740, + 13673, 13678, 13741, 13738, + 13677, 13742, 13741, 13678, + 13743, 13744, 13741, 13742, + 13739, 13738, 13741, 13744, + 13677, 13682, 13745, 13742, + 13681, 13746, 13745, 13682, + 13747, 13748, 13745, 13746, + 13743, 13742, 13745, 13748, + 13681, 13686, 13749, 13746, + 13685, 13750, 13749, 13686, + 13751, 13752, 13749, 13750, + 13747, 13746, 13749, 13752, + 13685, 13690, 13753, 13750, + 13689, 13754, 13753, 13690, + 13755, 13756, 13753, 13754, + 13751, 13750, 13753, 13756, + 13689, 13692, 13757, 13754, + 28, 31, 13757, 13692, + 22, 13758, 13757, 31, + 13755, 13754, 13757, 13758, + 12851, 13696, 13759, 12852, + 13695, 13760, 13759, 13696, + 13761, 13762, 13759, 13760, + 12847, 12852, 13759, 13762, + 13695, 13700, 13763, 13760, + 13699, 13764, 13763, 13700, + 13765, 13766, 13763, 13764, + 13761, 13760, 13763, 13766, + 13699, 13704, 13767, 13764, + 13703, 13768, 13767, 13704, + 13769, 13770, 13767, 13768, + 13765, 13764, 13767, 13770, + 13703, 13708, 13771, 13768, + 13707, 13772, 13771, 13708, + 13773, 13774, 13771, 13772, + 13769, 13768, 13771, 13774, + 13707, 13712, 13775, 13772, + 13711, 13776, 13775, 13712, + 13777, 13778, 13775, 13776, + 13773, 13772, 13775, 13778, + 13711, 13716, 13779, 13776, + 13715, 13780, 13779, 13716, + 13781, 13782, 13779, 13780, + 13777, 13776, 13779, 13782, + 13715, 13720, 13783, 13780, + 13719, 13784, 13783, 13720, + 13785, 13786, 13783, 13784, + 13781, 13780, 13783, 13786, + 13719, 13724, 13787, 13784, + 13723, 13788, 13787, 13724, + 13789, 13790, 13787, 13788, + 13785, 13784, 13787, 13790, + 13723, 13728, 13791, 13788, + 13727, 13792, 13791, 13728, + 13793, 13794, 13791, 13792, + 13789, 13788, 13791, 13794, + 13727, 13732, 13795, 13792, + 13731, 13796, 13795, 13732, + 13797, 13798, 13795, 13796, + 13793, 13792, 13795, 13798, + 13731, 13736, 13799, 13796, + 13735, 13800, 13799, 13736, + 13801, 13802, 13799, 13800, + 13797, 13796, 13799, 13802, + 13735, 13740, 13803, 13800, + 13739, 13804, 13803, 13740, + 13805, 13806, 13803, 13804, + 13801, 13800, 13803, 13806, + 13739, 13744, 13807, 13804, + 13743, 13808, 13807, 13744, + 13809, 13810, 13807, 13808, + 13805, 13804, 13807, 13810, + 13743, 13748, 13811, 13808, + 13747, 13812, 13811, 13748, + 13813, 13814, 13811, 13812, + 13809, 13808, 13811, 13814, + 13747, 13752, 13815, 13812, + 13751, 13816, 13815, 13752, + 13817, 13818, 13815, 13816, + 13813, 13812, 13815, 13818, + 13751, 13756, 13819, 13816, + 13755, 13820, 13819, 13756, + 13821, 13822, 13819, 13820, + 13817, 13816, 13819, 13822, + 13755, 13758, 13823, 13820, + 22, 25, 13823, 13758, + 16, 13824, 13823, 25, + 13821, 13820, 13823, 13824, + 12847, 13762, 13825, 12848, + 13761, 13826, 13825, 13762, + 13827, 13828, 13825, 13826, + 12843, 12848, 13825, 13828, + 13761, 13766, 13829, 13826, + 13765, 13830, 13829, 13766, + 13831, 13832, 13829, 13830, + 13827, 13826, 13829, 13832, + 13765, 13770, 13833, 13830, + 13769, 13834, 13833, 13770, + 13835, 13836, 13833, 13834, + 13831, 13830, 13833, 13836, + 13769, 13774, 13837, 13834, + 13773, 13838, 13837, 13774, + 13839, 13840, 13837, 13838, + 13835, 13834, 13837, 13840, + 13773, 13778, 13841, 13838, + 13777, 13842, 13841, 13778, + 13843, 13844, 13841, 13842, + 13839, 13838, 13841, 13844, + 13777, 13782, 13845, 13842, + 13781, 13846, 13845, 13782, + 13847, 13848, 13845, 13846, + 13843, 13842, 13845, 13848, + 13781, 13786, 13849, 13846, + 13785, 13850, 13849, 13786, + 13851, 13852, 13849, 13850, + 13847, 13846, 13849, 13852, + 13785, 13790, 13853, 13850, + 13789, 13854, 13853, 13790, + 13855, 13856, 13853, 13854, + 13851, 13850, 13853, 13856, + 13789, 13794, 13857, 13854, + 13793, 13858, 13857, 13794, + 13859, 13860, 13857, 13858, + 13855, 13854, 13857, 13860, + 13793, 13798, 13861, 13858, + 13797, 13862, 13861, 13798, + 13863, 13864, 13861, 13862, + 13859, 13858, 13861, 13864, + 13797, 13802, 13865, 13862, + 13801, 13866, 13865, 13802, + 13867, 13868, 13865, 13866, + 13863, 13862, 13865, 13868, + 13801, 13806, 13869, 13866, + 13805, 13870, 13869, 13806, + 13871, 13872, 13869, 13870, + 13867, 13866, 13869, 13872, + 13805, 13810, 13873, 13870, + 13809, 13874, 13873, 13810, + 13875, 13876, 13873, 13874, + 13871, 13870, 13873, 13876, + 13809, 13814, 13877, 13874, + 13813, 13878, 13877, 13814, + 13879, 13880, 13877, 13878, + 13875, 13874, 13877, 13880, + 13813, 13818, 13881, 13878, + 13817, 13882, 13881, 13818, + 13883, 13884, 13881, 13882, + 13879, 13878, 13881, 13884, + 13817, 13822, 13885, 13882, + 13821, 13886, 13885, 13822, + 13887, 13888, 13885, 13886, + 13883, 13882, 13885, 13888, + 13821, 13824, 13889, 13886, + 16, 19, 13889, 13824, + 10, 13890, 13889, 19, + 13887, 13886, 13889, 13890, + 12843, 13828, 13891, 12844, + 13827, 13892, 13891, 13828, + 13893, 13894, 13891, 13892, + 12839, 12844, 13891, 13894, + 13827, 13832, 13895, 13892, + 13831, 13896, 13895, 13832, + 13897, 13898, 13895, 13896, + 13893, 13892, 13895, 13898, + 13831, 13836, 13899, 13896, + 13835, 13900, 13899, 13836, + 13901, 13902, 13899, 13900, + 13897, 13896, 13899, 13902, + 13835, 13840, 13903, 13900, + 13839, 13904, 13903, 13840, + 13905, 13906, 13903, 13904, + 13901, 13900, 13903, 13906, + 13839, 13844, 13907, 13904, + 13843, 13908, 13907, 13844, + 13909, 13910, 13907, 13908, + 13905, 13904, 13907, 13910, + 13843, 13848, 13911, 13908, + 13847, 13912, 13911, 13848, + 13913, 13914, 13911, 13912, + 13909, 13908, 13911, 13914, + 13847, 13852, 13915, 13912, + 13851, 13916, 13915, 13852, + 13917, 13918, 13915, 13916, + 13913, 13912, 13915, 13918, + 13851, 13856, 13919, 13916, + 13855, 13920, 13919, 13856, + 13921, 13922, 13919, 13920, + 13917, 13916, 13919, 13922, + 13855, 13860, 13923, 13920, + 13859, 13924, 13923, 13860, + 13925, 13926, 13923, 13924, + 13921, 13920, 13923, 13926, + 13859, 13864, 13927, 13924, + 13863, 13928, 13927, 13864, + 13929, 13930, 13927, 13928, + 13925, 13924, 13927, 13930, + 13863, 13868, 13931, 13928, + 13867, 13932, 13931, 13868, + 13933, 13934, 13931, 13932, + 13929, 13928, 13931, 13934, + 13867, 13872, 13935, 13932, + 13871, 13936, 13935, 13872, + 13937, 13938, 13935, 13936, + 13933, 13932, 13935, 13938, + 13871, 13876, 13939, 13936, + 13875, 13940, 13939, 13876, + 13941, 13942, 13939, 13940, + 13937, 13936, 13939, 13942, + 13875, 13880, 13943, 13940, + 13879, 13944, 13943, 13880, + 13945, 13946, 13943, 13944, + 13941, 13940, 13943, 13946, + 13879, 13884, 13947, 13944, + 13883, 13948, 13947, 13884, + 13949, 13950, 13947, 13948, + 13945, 13944, 13947, 13950, + 13883, 13888, 13951, 13948, + 13887, 13952, 13951, 13888, + 13953, 13954, 13951, 13952, + 13949, 13948, 13951, 13954, + 13887, 13890, 13955, 13952, + 10, 13, 13955, 13890, + 1, 13956, 13955, 13, + 13953, 13952, 13955, 13956, + 12839, 13894, 13957, 12840, + 13893, 13958, 13957, 13894, + 9568, 9567, 13957, 13958, + 9504, 12840, 13957, 9567, + 13893, 13898, 13959, 13958, + 13897, 13960, 13959, 13898, + 9632, 9631, 13959, 13960, + 9568, 13958, 13959, 9631, + 13897, 13902, 13961, 13960, + 13901, 13962, 13961, 13902, + 9696, 9695, 13961, 13962, + 9632, 13960, 13961, 9695, + 13901, 13906, 13963, 13962, + 13905, 13964, 13963, 13906, + 9760, 9759, 13963, 13964, + 9696, 13962, 13963, 9759, + 13905, 13910, 13965, 13964, + 13909, 13966, 13965, 13910, + 9824, 9823, 13965, 13966, + 9760, 13964, 13965, 9823, + 13909, 13914, 13967, 13966, + 13913, 13968, 13967, 13914, + 9888, 9887, 13967, 13968, + 9824, 13966, 13967, 9887, + 13913, 13918, 13969, 13968, + 13917, 13970, 13969, 13918, + 9952, 9951, 13969, 13970, + 9888, 13968, 13969, 9951, + 13917, 13922, 13971, 13970, + 13921, 13972, 13971, 13922, + 10016, 10015, 13971, 13972, + 9952, 13970, 13971, 10015, + 13921, 13926, 13973, 13972, + 13925, 13974, 13973, 13926, + 10080, 10079, 13973, 13974, + 10016, 13972, 13973, 10079, + 13925, 13930, 13975, 13974, + 13929, 13976, 13975, 13930, + 10144, 10143, 13975, 13976, + 10080, 13974, 13975, 10143, + 13929, 13934, 13977, 13976, + 13933, 13978, 13977, 13934, + 10208, 10207, 13977, 13978, + 10144, 13976, 13977, 10207, + 13933, 13938, 13979, 13978, + 13937, 13980, 13979, 13938, + 10272, 10271, 13979, 13980, + 10208, 13978, 13979, 10271, + 13937, 13942, 13981, 13980, + 13941, 13982, 13981, 13942, + 10336, 10335, 13981, 13982, + 10272, 13980, 13981, 10335, + 13941, 13946, 13983, 13982, + 13945, 13984, 13983, 13946, + 10400, 10399, 13983, 13984, + 10336, 13982, 13983, 10399, + 13945, 13950, 13985, 13984, + 13949, 13986, 13985, 13950, + 10464, 10463, 13985, 13986, + 10400, 13984, 13985, 10463, + 13949, 13954, 13987, 13986, + 13953, 13988, 13987, 13954, + 10528, 10527, 13987, 13988, + 10464, 13986, 13987, 10527, + 13953, 13956, 13989, 13988, + 1, 4, 13989, 13956, + 5, 10561, 13989, 4, + 10528, 13988, 13989, 10561, + 13990, 13991, 13992, 13993, + 13994, 13993, 13992, 13995, + 13996, 13995, 13992, 13997, + 13998, 13997, 13992, 13991, + 13998, 13999, 14000, 13997, + 13996, 13997, 14000, 14001, + 14002, 14001, 14000, 14003, + 14004, 14003, 14000, 13999, + 14004, 14005, 14006, 14003, + 14002, 14003, 14006, 14007, + 14008, 14007, 14006, 14009, + 14010, 14009, 14006, 14005, + 14010, 14011, 14012, 14009, + 14008, 14009, 14012, 14013, + 14014, 14013, 14012, 14015, + 14016, 14015, 14012, 14011, + 14016, 14017, 14018, 14015, + 14014, 14015, 14018, 14019, + 3437, 14019, 14018, 3568, + 3570, 3568, 14018, 14017, + 14020, 14021, 14022, 14023, + 13990, 14023, 14022, 13991, + 13998, 13991, 14022, 14024, + 14025, 14024, 14022, 14021, + 14025, 14026, 14027, 14024, + 13998, 14024, 14027, 13999, + 14004, 13999, 14027, 14028, + 14029, 14028, 14027, 14026, + 14029, 14030, 14031, 14028, + 14004, 14028, 14031, 14005, + 14010, 14005, 14031, 14032, + 14033, 14032, 14031, 14030, + 14033, 14034, 14035, 14032, + 14010, 14032, 14035, 14011, + 14016, 14011, 14035, 14036, + 14037, 14036, 14035, 14034, + 14037, 14038, 14039, 14036, + 14016, 14036, 14039, 14017, + 3570, 14017, 14039, 3574, + 3576, 3574, 14039, 14038, + 14040, 14041, 14042, 14043, + 14020, 14043, 14042, 14021, + 14025, 14021, 14042, 14044, + 14045, 14044, 14042, 14041, + 14045, 14046, 14047, 14044, + 14025, 14044, 14047, 14026, + 14029, 14026, 14047, 14048, + 14049, 14048, 14047, 14046, + 14049, 14050, 14051, 14048, + 14029, 14048, 14051, 14030, + 14033, 14030, 14051, 14052, + 14053, 14052, 14051, 14050, + 14053, 14054, 14055, 14052, + 14033, 14052, 14055, 14034, + 14037, 14034, 14055, 14056, + 14057, 14056, 14055, 14054, + 14057, 14058, 14059, 14056, + 14037, 14056, 14059, 14038, + 3576, 14038, 14059, 3580, + 3582, 3580, 14059, 14058, + 14060, 14061, 14062, 14063, + 14040, 14063, 14062, 14041, + 14045, 14041, 14062, 14064, + 14065, 14064, 14062, 14061, + 14065, 14066, 14067, 14064, + 14045, 14064, 14067, 14046, + 14049, 14046, 14067, 14068, + 14069, 14068, 14067, 14066, + 14069, 14070, 14071, 14068, + 14049, 14068, 14071, 14050, + 14053, 14050, 14071, 14072, + 14073, 14072, 14071, 14070, + 14073, 14074, 14075, 14072, + 14053, 14072, 14075, 14054, + 14057, 14054, 14075, 14076, + 14077, 14076, 14075, 14074, + 14077, 14078, 14079, 14076, + 14057, 14076, 14079, 14058, + 3582, 14058, 14079, 3586, + 3588, 3586, 14079, 14078, + 14080, 14081, 14082, 14083, + 14060, 14083, 14082, 14061, + 14065, 14061, 14082, 14084, + 14085, 14084, 14082, 14081, + 14085, 14086, 14087, 14084, + 14065, 14084, 14087, 14066, + 14069, 14066, 14087, 14088, + 14089, 14088, 14087, 14086, + 14089, 14090, 14091, 14088, + 14069, 14088, 14091, 14070, + 14073, 14070, 14091, 14092, + 14093, 14092, 14091, 14090, + 14093, 14094, 14095, 14092, + 14073, 14092, 14095, 14074, + 14077, 14074, 14095, 14096, + 14097, 14096, 14095, 14094, + 14097, 14098, 14099, 14096, + 14077, 14096, 14099, 14078, + 3588, 14078, 14099, 3592, + 3594, 3592, 14099, 14098, + 14100, 14101, 14102, 14103, + 14080, 14103, 14102, 14081, + 14085, 14081, 14102, 14104, + 14105, 14104, 14102, 14101, + 14105, 14106, 14107, 14104, + 14085, 14104, 14107, 14086, + 14089, 14086, 14107, 14108, + 14109, 14108, 14107, 14106, + 14109, 14110, 14111, 14108, + 14089, 14108, 14111, 14090, + 14093, 14090, 14111, 14112, + 14113, 14112, 14111, 14110, + 14113, 14114, 14115, 14112, + 14093, 14112, 14115, 14094, + 14097, 14094, 14115, 14116, + 14117, 14116, 14115, 14114, + 14117, 14118, 14119, 14116, + 14097, 14116, 14119, 14098, + 3594, 14098, 14119, 3598, + 3600, 3598, 14119, 14118, + 14120, 14121, 14122, 14123, + 14100, 14123, 14122, 14101, + 14105, 14101, 14122, 14124, + 14125, 14124, 14122, 14121, + 14125, 14126, 14127, 14124, + 14105, 14124, 14127, 14106, + 14109, 14106, 14127, 14128, + 14129, 14128, 14127, 14126, + 14129, 14130, 14131, 14128, + 14109, 14128, 14131, 14110, + 14113, 14110, 14131, 14132, + 14133, 14132, 14131, 14130, + 14133, 14134, 14135, 14132, + 14113, 14132, 14135, 14114, + 14117, 14114, 14135, 14136, + 14137, 14136, 14135, 14134, + 14137, 14138, 14139, 14136, + 14117, 14136, 14139, 14118, + 3600, 14118, 14139, 3604, + 3606, 3604, 14139, 14138, + 14140, 14141, 14142, 14143, + 14120, 14143, 14142, 14121, + 14125, 14121, 14142, 14144, + 14145, 14144, 14142, 14141, + 14145, 14146, 14147, 14144, + 14125, 14144, 14147, 14126, + 14129, 14126, 14147, 14148, + 14149, 14148, 14147, 14146, + 14149, 14150, 14151, 14148, + 14129, 14148, 14151, 14130, + 14133, 14130, 14151, 14152, + 14153, 14152, 14151, 14150, + 14153, 14154, 14155, 14152, + 14133, 14152, 14155, 14134, + 14137, 14134, 14155, 14156, + 14157, 14156, 14155, 14154, + 14157, 14158, 14159, 14156, + 14137, 14156, 14159, 14138, + 3606, 14138, 14159, 3610, + 3612, 3610, 14159, 14158, + 14160, 14161, 14162, 14163, + 14140, 14163, 14162, 14141, + 14145, 14141, 14162, 14164, + 14165, 14164, 14162, 14161, + 14165, 14166, 14167, 14164, + 14145, 14164, 14167, 14146, + 14149, 14146, 14167, 14168, + 14169, 14168, 14167, 14166, + 14169, 14170, 14171, 14168, + 14149, 14168, 14171, 14150, + 14153, 14150, 14171, 14172, + 14173, 14172, 14171, 14170, + 14173, 14174, 14175, 14172, + 14153, 14172, 14175, 14154, + 14157, 14154, 14175, 14176, + 14177, 14176, 14175, 14174, + 14177, 14178, 14179, 14176, + 14157, 14176, 14179, 14158, + 3612, 14158, 14179, 3616, + 3618, 3616, 14179, 14178, + 14180, 14181, 14182, 14183, + 14160, 14183, 14182, 14161, + 14165, 14161, 14182, 14184, + 14185, 14184, 14182, 14181, + 14185, 14186, 14187, 14184, + 14165, 14184, 14187, 14166, + 14169, 14166, 14187, 14188, + 14189, 14188, 14187, 14186, + 14189, 14190, 14191, 14188, + 14169, 14188, 14191, 14170, + 14173, 14170, 14191, 14192, + 14193, 14192, 14191, 14190, + 14193, 14194, 14195, 14192, + 14173, 14192, 14195, 14174, + 14177, 14174, 14195, 14196, + 14197, 14196, 14195, 14194, + 14197, 14198, 14199, 14196, + 14177, 14196, 14199, 14178, + 3618, 14178, 14199, 3622, + 3624, 3622, 14199, 14198, + 14200, 14201, 14202, 14203, + 14180, 14203, 14202, 14181, + 14185, 14181, 14202, 14204, + 14205, 14204, 14202, 14201, + 14205, 14206, 14207, 14204, + 14185, 14204, 14207, 14186, + 14189, 14186, 14207, 14208, + 14209, 14208, 14207, 14206, + 14209, 14210, 14211, 14208, + 14189, 14208, 14211, 14190, + 14193, 14190, 14211, 14212, + 14213, 14212, 14211, 14210, + 14213, 14214, 14215, 14212, + 14193, 14212, 14215, 14194, + 14197, 14194, 14215, 14216, + 14217, 14216, 14215, 14214, + 14217, 14218, 14219, 14216, + 14197, 14216, 14219, 14198, + 3624, 14198, 14219, 3628, + 3630, 3628, 14219, 14218, + 14220, 14221, 14222, 14223, + 14200, 14223, 14222, 14201, + 14205, 14201, 14222, 14224, + 14225, 14224, 14222, 14221, + 14225, 14226, 14227, 14224, + 14205, 14224, 14227, 14206, + 14209, 14206, 14227, 14228, + 14229, 14228, 14227, 14226, + 14229, 14230, 14231, 14228, + 14209, 14228, 14231, 14210, + 14213, 14210, 14231, 14232, + 14233, 14232, 14231, 14230, + 14233, 14234, 14235, 14232, + 14213, 14232, 14235, 14214, + 14217, 14214, 14235, 14236, + 14237, 14236, 14235, 14234, + 14237, 14238, 14239, 14236, + 14217, 14236, 14239, 14218, + 3630, 14218, 14239, 3634, + 3636, 3634, 14239, 14238, + 14240, 14241, 14242, 14243, + 14220, 14243, 14242, 14221, + 14225, 14221, 14242, 14244, + 14245, 14244, 14242, 14241, + 14245, 14246, 14247, 14244, + 14225, 14244, 14247, 14226, + 14229, 14226, 14247, 14248, + 14249, 14248, 14247, 14246, + 14249, 14250, 14251, 14248, + 14229, 14248, 14251, 14230, + 14233, 14230, 14251, 14252, + 14253, 14252, 14251, 14250, + 14253, 14254, 14255, 14252, + 14233, 14252, 14255, 14234, + 14237, 14234, 14255, 14256, + 14257, 14256, 14255, 14254, + 14257, 14258, 14259, 14256, + 14237, 14256, 14259, 14238, + 3636, 14238, 14259, 3640, + 3642, 3640, 14259, 14258, + 14260, 14261, 14262, 14263, + 14240, 14263, 14262, 14241, + 14245, 14241, 14262, 14264, + 14265, 14264, 14262, 14261, + 14265, 14266, 14267, 14264, + 14245, 14264, 14267, 14246, + 14249, 14246, 14267, 14268, + 14269, 14268, 14267, 14266, + 14269, 14270, 14271, 14268, + 14249, 14268, 14271, 14250, + 14253, 14250, 14271, 14272, + 14273, 14272, 14271, 14270, + 14273, 14274, 14275, 14272, + 14253, 14272, 14275, 14254, + 14257, 14254, 14275, 14276, + 14277, 14276, 14275, 14274, + 14277, 14278, 14279, 14276, + 14257, 14276, 14279, 14258, + 3642, 14258, 14279, 3646, + 3648, 3646, 14279, 14278, + 14280, 14281, 14282, 14283, + 14260, 14283, 14282, 14261, + 14265, 14261, 14282, 14284, + 14285, 14284, 14282, 14281, + 14285, 14286, 14287, 14284, + 14265, 14284, 14287, 14266, + 14269, 14266, 14287, 14288, + 14289, 14288, 14287, 14286, + 14289, 14290, 14291, 14288, + 14269, 14288, 14291, 14270, + 14273, 14270, 14291, 14292, + 14293, 14292, 14291, 14290, + 14293, 14294, 14295, 14292, + 14273, 14292, 14295, 14274, + 14277, 14274, 14295, 14296, + 14297, 14296, 14295, 14294, + 14297, 14298, 14299, 14296, + 14277, 14296, 14299, 14278, + 3648, 14278, 14299, 3652, + 3654, 3652, 14299, 14298, + 14300, 14301, 14302, 14303, + 14280, 14303, 14302, 14281, + 14285, 14281, 14302, 14304, + 14305, 14304, 14302, 14301, + 14305, 14306, 14307, 14304, + 14285, 14304, 14307, 14286, + 14289, 14286, 14307, 14308, + 14309, 14308, 14307, 14306, + 14309, 14310, 14311, 14308, + 14289, 14308, 14311, 14290, + 14293, 14290, 14311, 14312, + 14313, 14312, 14311, 14310, + 14313, 14314, 14315, 14312, + 14293, 14312, 14315, 14294, + 14297, 14294, 14315, 14316, + 14317, 14316, 14315, 14314, + 14317, 14318, 14319, 14316, + 14297, 14316, 14319, 14298, + 3654, 14298, 14319, 3658, + 3660, 3658, 14319, 14318, + 14320, 14321, 14322, 14323, + 14300, 14323, 14322, 14301, + 14305, 14301, 14322, 14324, + 14325, 14324, 14322, 14321, + 14325, 14326, 14327, 14324, + 14305, 14324, 14327, 14306, + 14309, 14306, 14327, 14328, + 14329, 14328, 14327, 14326, + 14329, 14330, 14331, 14328, + 14309, 14328, 14331, 14310, + 14313, 14310, 14331, 14332, + 14333, 14332, 14331, 14330, + 14333, 14334, 14335, 14332, + 14313, 14332, 14335, 14314, + 14317, 14314, 14335, 14336, + 14337, 14336, 14335, 14334, + 14337, 14338, 14339, 14336, + 14317, 14336, 14339, 14318, + 3660, 14318, 14339, 3664, + 3666, 3664, 14339, 14338, + 14340, 14341, 14342, 14343, + 14320, 14343, 14342, 14321, + 14325, 14321, 14342, 14344, + 14345, 14344, 14342, 14341, + 14345, 14346, 14347, 14344, + 14325, 14344, 14347, 14326, + 14329, 14326, 14347, 14348, + 14349, 14348, 14347, 14346, + 14349, 14350, 14351, 14348, + 14329, 14348, 14351, 14330, + 14333, 14330, 14351, 14352, + 14353, 14352, 14351, 14350, + 14353, 14354, 14355, 14352, + 14333, 14352, 14355, 14334, + 14337, 14334, 14355, 14356, + 14357, 14356, 14355, 14354, + 14357, 14358, 14359, 14356, + 14337, 14356, 14359, 14338, + 3666, 14338, 14359, 3670, + 3672, 3670, 14359, 14358, + 14360, 14361, 14362, 14363, + 14340, 14363, 14362, 14341, + 14345, 14341, 14362, 14364, + 14365, 14364, 14362, 14361, + 14365, 14366, 14367, 14364, + 14345, 14364, 14367, 14346, + 14349, 14346, 14367, 14368, + 14369, 14368, 14367, 14366, + 14369, 14370, 14371, 14368, + 14349, 14368, 14371, 14350, + 14353, 14350, 14371, 14372, + 14373, 14372, 14371, 14370, + 14373, 14374, 14375, 14372, + 14353, 14372, 14375, 14354, + 14357, 14354, 14375, 14376, + 14377, 14376, 14375, 14374, + 14377, 14378, 14379, 14376, + 14357, 14376, 14379, 14358, + 3672, 14358, 14379, 3676, + 3678, 3676, 14379, 14378, + 14380, 14381, 14382, 14383, + 14360, 14383, 14382, 14361, + 14365, 14361, 14382, 14384, + 14385, 14384, 14382, 14381, + 14385, 14386, 14387, 14384, + 14365, 14384, 14387, 14366, + 14369, 14366, 14387, 14388, + 14389, 14388, 14387, 14386, + 14389, 14390, 14391, 14388, + 14369, 14388, 14391, 14370, + 14373, 14370, 14391, 14392, + 14393, 14392, 14391, 14390, + 14393, 14394, 14395, 14392, + 14373, 14392, 14395, 14374, + 14377, 14374, 14395, 14396, + 14397, 14396, 14395, 14394, + 14397, 14398, 14399, 14396, + 14377, 14396, 14399, 14378, + 3678, 14378, 14399, 3682, + 3684, 3682, 14399, 14398, + 14400, 14401, 14402, 14403, + 14380, 14403, 14402, 14381, + 14385, 14381, 14402, 14404, + 14405, 14404, 14402, 14401, + 14405, 14406, 14407, 14404, + 14385, 14404, 14407, 14386, + 14389, 14386, 14407, 14408, + 14409, 14408, 14407, 14406, + 14409, 14410, 14411, 14408, + 14389, 14408, 14411, 14390, + 14393, 14390, 14411, 14412, + 14413, 14412, 14411, 14410, + 14413, 14414, 14415, 14412, + 14393, 14412, 14415, 14394, + 14397, 14394, 14415, 14416, + 14417, 14416, 14415, 14414, + 14417, 14418, 14419, 14416, + 14397, 14416, 14419, 14398, + 3684, 14398, 14419, 3688, + 3690, 3688, 14419, 14418, + 14420, 14421, 14422, 14423, + 14400, 14423, 14422, 14401, + 14405, 14401, 14422, 14424, + 14425, 14424, 14422, 14421, + 14425, 14426, 14427, 14424, + 14405, 14424, 14427, 14406, + 14409, 14406, 14427, 14428, + 14429, 14428, 14427, 14426, + 14429, 14430, 14431, 14428, + 14409, 14428, 14431, 14410, + 14413, 14410, 14431, 14432, + 14433, 14432, 14431, 14430, + 14433, 14434, 14435, 14432, + 14413, 14432, 14435, 14414, + 14417, 14414, 14435, 14436, + 14437, 14436, 14435, 14434, + 14437, 14438, 14439, 14436, + 14417, 14436, 14439, 14418, + 3690, 14418, 14439, 3694, + 3696, 3694, 14439, 14438, + 14440, 14441, 14442, 14443, + 14420, 14443, 14442, 14421, + 14425, 14421, 14442, 14444, + 14445, 14444, 14442, 14441, + 14445, 14446, 14447, 14444, + 14425, 14444, 14447, 14426, + 14429, 14426, 14447, 14448, + 14449, 14448, 14447, 14446, + 14449, 14450, 14451, 14448, + 14429, 14448, 14451, 14430, + 14433, 14430, 14451, 14452, + 14453, 14452, 14451, 14450, + 14453, 14454, 14455, 14452, + 14433, 14452, 14455, 14434, + 14437, 14434, 14455, 14456, + 14457, 14456, 14455, 14454, + 14457, 14458, 14459, 14456, + 14437, 14456, 14459, 14438, + 3696, 14438, 14459, 3700, + 3702, 3700, 14459, 14458, + 14460, 14461, 14462, 14463, + 14440, 14463, 14462, 14441, + 14445, 14441, 14462, 14464, + 14465, 14464, 14462, 14461, + 14465, 14466, 14467, 14464, + 14445, 14464, 14467, 14446, + 14449, 14446, 14467, 14468, + 14469, 14468, 14467, 14466, + 14469, 14470, 14471, 14468, + 14449, 14468, 14471, 14450, + 14453, 14450, 14471, 14472, + 14473, 14472, 14471, 14470, + 14473, 14474, 14475, 14472, + 14453, 14472, 14475, 14454, + 14457, 14454, 14475, 14476, + 14477, 14476, 14475, 14474, + 14477, 14478, 14479, 14476, + 14457, 14476, 14479, 14458, + 3702, 14458, 14479, 3706, + 3708, 3706, 14479, 14478, + 14480, 14481, 14482, 14483, + 14460, 14483, 14482, 14461, + 14465, 14461, 14482, 14484, + 14485, 14484, 14482, 14481, + 14485, 14486, 14487, 14484, + 14465, 14484, 14487, 14466, + 14469, 14466, 14487, 14488, + 14489, 14488, 14487, 14486, + 14489, 14490, 14491, 14488, + 14469, 14488, 14491, 14470, + 14473, 14470, 14491, 14492, + 14493, 14492, 14491, 14490, + 14493, 14494, 14495, 14492, + 14473, 14492, 14495, 14474, + 14477, 14474, 14495, 14496, + 14497, 14496, 14495, 14494, + 14497, 14498, 14499, 14496, + 14477, 14496, 14499, 14478, + 3708, 14478, 14499, 3712, + 3714, 3712, 14499, 14498, + 14500, 14501, 14502, 14503, + 14480, 14503, 14502, 14481, + 14485, 14481, 14502, 14504, + 14505, 14504, 14502, 14501, + 14505, 14506, 14507, 14504, + 14485, 14504, 14507, 14486, + 14489, 14486, 14507, 14508, + 14509, 14508, 14507, 14506, + 14509, 14510, 14511, 14508, + 14489, 14508, 14511, 14490, + 14493, 14490, 14511, 14512, + 14513, 14512, 14511, 14510, + 14513, 14514, 14515, 14512, + 14493, 14512, 14515, 14494, + 14497, 14494, 14515, 14516, + 14517, 14516, 14515, 14514, + 14517, 14518, 14519, 14516, + 14497, 14516, 14519, 14498, + 3714, 14498, 14519, 3718, + 3720, 3718, 14519, 14518, + 14520, 14521, 14522, 14523, + 14500, 14523, 14522, 14501, + 14505, 14501, 14522, 14524, + 14525, 14524, 14522, 14521, + 14525, 14526, 14527, 14524, + 14505, 14524, 14527, 14506, + 14509, 14506, 14527, 14528, + 14529, 14528, 14527, 14526, + 14529, 14530, 14531, 14528, + 14509, 14528, 14531, 14510, + 14513, 14510, 14531, 14532, + 14533, 14532, 14531, 14530, + 14533, 14534, 14535, 14532, + 14513, 14532, 14535, 14514, + 14517, 14514, 14535, 14536, + 14537, 14536, 14535, 14534, + 14537, 14538, 14539, 14536, + 14517, 14536, 14539, 14518, + 3720, 14518, 14539, 3724, + 3726, 3724, 14539, 14538, + 14540, 14541, 14542, 14543, + 14520, 14543, 14542, 14521, + 14525, 14521, 14542, 14544, + 14545, 14544, 14542, 14541, + 14545, 14546, 14547, 14544, + 14525, 14544, 14547, 14526, + 14529, 14526, 14547, 14548, + 14549, 14548, 14547, 14546, + 14549, 14550, 14551, 14548, + 14529, 14548, 14551, 14530, + 14533, 14530, 14551, 14552, + 14553, 14552, 14551, 14550, + 14553, 14554, 14555, 14552, + 14533, 14552, 14555, 14534, + 14537, 14534, 14555, 14556, + 14557, 14556, 14555, 14554, + 14557, 14558, 14559, 14556, + 14537, 14556, 14559, 14538, + 3726, 14538, 14559, 3730, + 3732, 3730, 14559, 14558, + 14560, 14561, 14562, 14563, + 14540, 14563, 14562, 14541, + 14545, 14541, 14562, 14564, + 14565, 14564, 14562, 14561, + 14565, 14566, 14567, 14564, + 14545, 14564, 14567, 14546, + 14549, 14546, 14567, 14568, + 14569, 14568, 14567, 14566, + 14569, 14570, 14571, 14568, + 14549, 14568, 14571, 14550, + 14553, 14550, 14571, 14572, + 14573, 14572, 14571, 14570, + 14573, 14574, 14575, 14572, + 14553, 14572, 14575, 14554, + 14557, 14554, 14575, 14576, + 14577, 14576, 14575, 14574, + 14577, 14578, 14579, 14576, + 14557, 14576, 14579, 14558, + 3732, 14558, 14579, 3736, + 3738, 3736, 14579, 14578, + 14580, 14581, 14582, 14583, + 14560, 14583, 14582, 14561, + 14565, 14561, 14582, 14584, + 14585, 14584, 14582, 14581, + 14585, 14586, 14587, 14584, + 14565, 14584, 14587, 14566, + 14569, 14566, 14587, 14588, + 14589, 14588, 14587, 14586, + 14589, 14590, 14591, 14588, + 14569, 14588, 14591, 14570, + 14573, 14570, 14591, 14592, + 14593, 14592, 14591, 14590, + 14593, 14594, 14595, 14592, + 14573, 14592, 14595, 14574, + 14577, 14574, 14595, 14596, + 14597, 14596, 14595, 14594, + 14597, 14598, 14599, 14596, + 14577, 14596, 14599, 14578, + 3738, 14578, 14599, 3742, + 3744, 3742, 14599, 14598, + 14600, 14601, 14602, 14603, + 14580, 14603, 14602, 14581, + 14585, 14581, 14602, 14604, + 14605, 14604, 14602, 14601, + 14605, 14606, 14607, 14604, + 14585, 14604, 14607, 14586, + 14589, 14586, 14607, 14608, + 14609, 14608, 14607, 14606, + 14609, 14610, 14611, 14608, + 14589, 14608, 14611, 14590, + 14593, 14590, 14611, 14612, + 14613, 14612, 14611, 14610, + 14613, 14614, 14615, 14612, + 14593, 14612, 14615, 14594, + 14597, 14594, 14615, 14616, + 14617, 14616, 14615, 14614, + 14617, 14618, 14619, 14616, + 14597, 14616, 14619, 14598, + 3744, 14598, 14619, 3748, + 3750, 3748, 14619, 14618, + 14620, 14621, 14622, 14623, + 14600, 14623, 14622, 14601, + 14605, 14601, 14622, 14624, + 14625, 14624, 14622, 14621, + 14625, 14626, 14627, 14624, + 14605, 14624, 14627, 14606, + 14609, 14606, 14627, 14628, + 14629, 14628, 14627, 14626, + 14629, 14630, 14631, 14628, + 14609, 14628, 14631, 14610, + 14613, 14610, 14631, 14632, + 14633, 14632, 14631, 14630, + 14633, 14634, 14635, 14632, + 14613, 14632, 14635, 14614, + 14617, 14614, 14635, 14636, + 14637, 14636, 14635, 14634, + 14637, 14638, 14639, 14636, + 14617, 14636, 14639, 14618, + 3750, 14618, 14639, 3754, + 3756, 3754, 14639, 14638, + 14640, 14641, 14642, 14643, + 14620, 14643, 14642, 14621, + 14625, 14621, 14642, 14644, + 14645, 14644, 14642, 14641, + 14645, 14646, 14647, 14644, + 14625, 14644, 14647, 14626, + 14629, 14626, 14647, 14648, + 14649, 14648, 14647, 14646, + 14649, 14650, 14651, 14648, + 14629, 14648, 14651, 14630, + 14633, 14630, 14651, 14652, + 14653, 14652, 14651, 14650, + 14653, 14654, 14655, 14652, + 14633, 14652, 14655, 14634, + 14637, 14634, 14655, 14656, + 14657, 14656, 14655, 14654, + 14657, 14658, 14659, 14656, + 14637, 14656, 14659, 14638, + 3756, 14638, 14659, 3760, + 3762, 3760, 14659, 14658, + 3437, 3438, 14660, 14019, + 3439, 14661, 14660, 3438, + 14662, 14663, 14660, 14661, + 14014, 14019, 14660, 14663, + 14014, 14663, 14664, 14013, + 14662, 14665, 14664, 14663, + 14666, 14667, 14664, 14665, + 14008, 14013, 14664, 14667, + 14008, 14667, 14668, 14007, + 14666, 14669, 14668, 14667, + 14670, 14671, 14668, 14669, + 14002, 14007, 14668, 14671, + 14002, 14671, 14672, 14001, + 14670, 14673, 14672, 14671, + 14674, 14675, 14672, 14673, + 13996, 14001, 14672, 14675, + 13996, 14675, 14676, 13995, + 14674, 14677, 14676, 14675, + 14678, 14679, 14676, 14677, + 13994, 13995, 14676, 14679, + 3439, 3442, 14680, 14661, + 3443, 14681, 14680, 3442, + 14682, 14683, 14680, 14681, + 14662, 14661, 14680, 14683, + 14662, 14683, 14684, 14665, + 14682, 14685, 14684, 14683, + 14686, 14687, 14684, 14685, + 14666, 14665, 14684, 14687, + 14666, 14687, 14688, 14669, + 14686, 14689, 14688, 14687, + 14690, 14691, 14688, 14689, + 14670, 14669, 14688, 14691, + 14670, 14691, 14692, 14673, + 14690, 14693, 14692, 14691, + 14694, 14695, 14692, 14693, + 14674, 14673, 14692, 14695, + 14674, 14695, 14696, 14677, + 14694, 14697, 14696, 14695, + 14698, 14699, 14696, 14697, + 14678, 14677, 14696, 14699, + 3443, 3446, 14700, 14681, + 3447, 14701, 14700, 3446, + 14702, 14703, 14700, 14701, + 14682, 14681, 14700, 14703, + 14682, 14703, 14704, 14685, + 14702, 14705, 14704, 14703, + 14706, 14707, 14704, 14705, + 14686, 14685, 14704, 14707, + 14686, 14707, 14708, 14689, + 14706, 14709, 14708, 14707, + 14710, 14711, 14708, 14709, + 14690, 14689, 14708, 14711, + 14690, 14711, 14712, 14693, + 14710, 14713, 14712, 14711, + 14714, 14715, 14712, 14713, + 14694, 14693, 14712, 14715, + 14694, 14715, 14716, 14697, + 14714, 14717, 14716, 14715, + 14718, 14719, 14716, 14717, + 14698, 14697, 14716, 14719, + 3447, 3450, 14720, 14701, + 3451, 14721, 14720, 3450, + 14722, 14723, 14720, 14721, + 14702, 14701, 14720, 14723, + 14702, 14723, 14724, 14705, + 14722, 14725, 14724, 14723, + 14726, 14727, 14724, 14725, + 14706, 14705, 14724, 14727, + 14706, 14727, 14728, 14709, + 14726, 14729, 14728, 14727, + 14730, 14731, 14728, 14729, + 14710, 14709, 14728, 14731, + 14710, 14731, 14732, 14713, + 14730, 14733, 14732, 14731, + 14734, 14735, 14732, 14733, + 14714, 14713, 14732, 14735, + 14714, 14735, 14736, 14717, + 14734, 14737, 14736, 14735, + 14738, 14739, 14736, 14737, + 14718, 14717, 14736, 14739, + 3451, 3454, 14740, 14721, + 3455, 14741, 14740, 3454, + 14742, 14743, 14740, 14741, + 14722, 14721, 14740, 14743, + 14722, 14743, 14744, 14725, + 14742, 14745, 14744, 14743, + 14746, 14747, 14744, 14745, + 14726, 14725, 14744, 14747, + 14726, 14747, 14748, 14729, + 14746, 14749, 14748, 14747, + 14750, 14751, 14748, 14749, + 14730, 14729, 14748, 14751, + 14730, 14751, 14752, 14733, + 14750, 14753, 14752, 14751, + 14754, 14755, 14752, 14753, + 14734, 14733, 14752, 14755, + 14734, 14755, 14756, 14737, + 14754, 14757, 14756, 14755, + 14758, 14759, 14756, 14757, + 14738, 14737, 14756, 14759, + 3455, 3458, 14760, 14741, + 3459, 14761, 14760, 3458, + 14762, 14763, 14760, 14761, + 14742, 14741, 14760, 14763, + 14742, 14763, 14764, 14745, + 14762, 14765, 14764, 14763, + 14766, 14767, 14764, 14765, + 14746, 14745, 14764, 14767, + 14746, 14767, 14768, 14749, + 14766, 14769, 14768, 14767, + 14770, 14771, 14768, 14769, + 14750, 14749, 14768, 14771, + 14750, 14771, 14772, 14753, + 14770, 14773, 14772, 14771, + 14774, 14775, 14772, 14773, + 14754, 14753, 14772, 14775, + 14754, 14775, 14776, 14757, + 14774, 14777, 14776, 14775, + 14778, 14779, 14776, 14777, + 14758, 14757, 14776, 14779, + 3459, 3462, 14780, 14761, + 3463, 14781, 14780, 3462, + 14782, 14783, 14780, 14781, + 14762, 14761, 14780, 14783, + 14762, 14783, 14784, 14765, + 14782, 14785, 14784, 14783, + 14786, 14787, 14784, 14785, + 14766, 14765, 14784, 14787, + 14766, 14787, 14788, 14769, + 14786, 14789, 14788, 14787, + 14790, 14791, 14788, 14789, + 14770, 14769, 14788, 14791, + 14770, 14791, 14792, 14773, + 14790, 14793, 14792, 14791, + 14794, 14795, 14792, 14793, + 14774, 14773, 14792, 14795, + 14774, 14795, 14796, 14777, + 14794, 14797, 14796, 14795, + 14798, 14799, 14796, 14797, + 14778, 14777, 14796, 14799, + 3463, 3466, 14800, 14781, + 3467, 14801, 14800, 3466, + 14802, 14803, 14800, 14801, + 14782, 14781, 14800, 14803, + 14782, 14803, 14804, 14785, + 14802, 14805, 14804, 14803, + 14806, 14807, 14804, 14805, + 14786, 14785, 14804, 14807, + 14786, 14807, 14808, 14789, + 14806, 14809, 14808, 14807, + 14810, 14811, 14808, 14809, + 14790, 14789, 14808, 14811, + 14790, 14811, 14812, 14793, + 14810, 14813, 14812, 14811, + 14814, 14815, 14812, 14813, + 14794, 14793, 14812, 14815, + 14794, 14815, 14816, 14797, + 14814, 14817, 14816, 14815, + 14818, 14819, 14816, 14817, + 14798, 14797, 14816, 14819, + 3467, 3470, 14820, 14801, + 3471, 14821, 14820, 3470, + 14822, 14823, 14820, 14821, + 14802, 14801, 14820, 14823, + 14802, 14823, 14824, 14805, + 14822, 14825, 14824, 14823, + 14826, 14827, 14824, 14825, + 14806, 14805, 14824, 14827, + 14806, 14827, 14828, 14809, + 14826, 14829, 14828, 14827, + 14830, 14831, 14828, 14829, + 14810, 14809, 14828, 14831, + 14810, 14831, 14832, 14813, + 14830, 14833, 14832, 14831, + 14834, 14835, 14832, 14833, + 14814, 14813, 14832, 14835, + 14814, 14835, 14836, 14817, + 14834, 14837, 14836, 14835, + 14838, 14839, 14836, 14837, + 14818, 14817, 14836, 14839, + 3471, 3474, 14840, 14821, + 3475, 14841, 14840, 3474, + 14842, 14843, 14840, 14841, + 14822, 14821, 14840, 14843, + 14822, 14843, 14844, 14825, + 14842, 14845, 14844, 14843, + 14846, 14847, 14844, 14845, + 14826, 14825, 14844, 14847, + 14826, 14847, 14848, 14829, + 14846, 14849, 14848, 14847, + 14850, 14851, 14848, 14849, + 14830, 14829, 14848, 14851, + 14830, 14851, 14852, 14833, + 14850, 14853, 14852, 14851, + 14854, 14855, 14852, 14853, + 14834, 14833, 14852, 14855, + 14834, 14855, 14856, 14837, + 14854, 14857, 14856, 14855, + 14858, 14859, 14856, 14857, + 14838, 14837, 14856, 14859, + 3475, 3478, 14860, 14841, + 3479, 14861, 14860, 3478, + 14862, 14863, 14860, 14861, + 14842, 14841, 14860, 14863, + 14842, 14863, 14864, 14845, + 14862, 14865, 14864, 14863, + 14866, 14867, 14864, 14865, + 14846, 14845, 14864, 14867, + 14846, 14867, 14868, 14849, + 14866, 14869, 14868, 14867, + 14870, 14871, 14868, 14869, + 14850, 14849, 14868, 14871, + 14850, 14871, 14872, 14853, + 14870, 14873, 14872, 14871, + 14874, 14875, 14872, 14873, + 14854, 14853, 14872, 14875, + 14854, 14875, 14876, 14857, + 14874, 14877, 14876, 14875, + 14878, 14879, 14876, 14877, + 14858, 14857, 14876, 14879, + 3479, 3482, 14880, 14861, + 3483, 14881, 14880, 3482, + 14882, 14883, 14880, 14881, + 14862, 14861, 14880, 14883, + 14862, 14883, 14884, 14865, + 14882, 14885, 14884, 14883, + 14886, 14887, 14884, 14885, + 14866, 14865, 14884, 14887, + 14866, 14887, 14888, 14869, + 14886, 14889, 14888, 14887, + 14890, 14891, 14888, 14889, + 14870, 14869, 14888, 14891, + 14870, 14891, 14892, 14873, + 14890, 14893, 14892, 14891, + 14894, 14895, 14892, 14893, + 14874, 14873, 14892, 14895, + 14874, 14895, 14896, 14877, + 14894, 14897, 14896, 14895, + 14898, 14899, 14896, 14897, + 14878, 14877, 14896, 14899, + 3483, 3486, 14900, 14881, + 3487, 14901, 14900, 3486, + 14902, 14903, 14900, 14901, + 14882, 14881, 14900, 14903, + 14882, 14903, 14904, 14885, + 14902, 14905, 14904, 14903, + 14906, 14907, 14904, 14905, + 14886, 14885, 14904, 14907, + 14886, 14907, 14908, 14889, + 14906, 14909, 14908, 14907, + 14910, 14911, 14908, 14909, + 14890, 14889, 14908, 14911, + 14890, 14911, 14912, 14893, + 14910, 14913, 14912, 14911, + 14914, 14915, 14912, 14913, + 14894, 14893, 14912, 14915, + 14894, 14915, 14916, 14897, + 14914, 14917, 14916, 14915, + 14918, 14919, 14916, 14917, + 14898, 14897, 14916, 14919, + 3487, 3490, 14920, 14901, + 3491, 14921, 14920, 3490, + 14922, 14923, 14920, 14921, + 14902, 14901, 14920, 14923, + 14902, 14923, 14924, 14905, + 14922, 14925, 14924, 14923, + 14926, 14927, 14924, 14925, + 14906, 14905, 14924, 14927, + 14906, 14927, 14928, 14909, + 14926, 14929, 14928, 14927, + 14930, 14931, 14928, 14929, + 14910, 14909, 14928, 14931, + 14910, 14931, 14932, 14913, + 14930, 14933, 14932, 14931, + 14934, 14935, 14932, 14933, + 14914, 14913, 14932, 14935, + 14914, 14935, 14936, 14917, + 14934, 14937, 14936, 14935, + 14938, 14939, 14936, 14937, + 14918, 14917, 14936, 14939, + 3491, 3494, 14940, 14921, + 3495, 14941, 14940, 3494, + 14942, 14943, 14940, 14941, + 14922, 14921, 14940, 14943, + 14922, 14943, 14944, 14925, + 14942, 14945, 14944, 14943, + 14946, 14947, 14944, 14945, + 14926, 14925, 14944, 14947, + 14926, 14947, 14948, 14929, + 14946, 14949, 14948, 14947, + 14950, 14951, 14948, 14949, + 14930, 14929, 14948, 14951, + 14930, 14951, 14952, 14933, + 14950, 14953, 14952, 14951, + 14954, 14955, 14952, 14953, + 14934, 14933, 14952, 14955, + 14934, 14955, 14956, 14937, + 14954, 14957, 14956, 14955, + 14958, 14959, 14956, 14957, + 14938, 14937, 14956, 14959, + 3495, 3498, 14960, 14941, + 3499, 14961, 14960, 3498, + 14962, 14963, 14960, 14961, + 14942, 14941, 14960, 14963, + 14942, 14963, 14964, 14945, + 14962, 14965, 14964, 14963, + 14966, 14967, 14964, 14965, + 14946, 14945, 14964, 14967, + 14946, 14967, 14968, 14949, + 14966, 14969, 14968, 14967, + 14970, 14971, 14968, 14969, + 14950, 14949, 14968, 14971, + 14950, 14971, 14972, 14953, + 14970, 14973, 14972, 14971, + 14974, 14975, 14972, 14973, + 14954, 14953, 14972, 14975, + 14954, 14975, 14976, 14957, + 14974, 14977, 14976, 14975, + 14978, 14979, 14976, 14977, + 14958, 14957, 14976, 14979, + 3499, 3502, 14980, 14961, + 3503, 14981, 14980, 3502, + 14982, 14983, 14980, 14981, + 14962, 14961, 14980, 14983, + 14962, 14983, 14984, 14965, + 14982, 14985, 14984, 14983, + 14986, 14987, 14984, 14985, + 14966, 14965, 14984, 14987, + 14966, 14987, 14988, 14969, + 14986, 14989, 14988, 14987, + 14990, 14991, 14988, 14989, + 14970, 14969, 14988, 14991, + 14970, 14991, 14992, 14973, + 14990, 14993, 14992, 14991, + 14994, 14995, 14992, 14993, + 14974, 14973, 14992, 14995, + 14974, 14995, 14996, 14977, + 14994, 14997, 14996, 14995, + 14998, 14999, 14996, 14997, + 14978, 14977, 14996, 14999, + 3503, 3506, 15000, 14981, + 3507, 15001, 15000, 3506, + 15002, 15003, 15000, 15001, + 14982, 14981, 15000, 15003, + 14982, 15003, 15004, 14985, + 15002, 15005, 15004, 15003, + 15006, 15007, 15004, 15005, + 14986, 14985, 15004, 15007, + 14986, 15007, 15008, 14989, + 15006, 15009, 15008, 15007, + 15010, 15011, 15008, 15009, + 14990, 14989, 15008, 15011, + 14990, 15011, 15012, 14993, + 15010, 15013, 15012, 15011, + 15014, 15015, 15012, 15013, + 14994, 14993, 15012, 15015, + 14994, 15015, 15016, 14997, + 15014, 15017, 15016, 15015, + 15018, 15019, 15016, 15017, + 14998, 14997, 15016, 15019, + 3507, 3510, 15020, 15001, + 3511, 15021, 15020, 3510, + 15022, 15023, 15020, 15021, + 15002, 15001, 15020, 15023, + 15002, 15023, 15024, 15005, + 15022, 15025, 15024, 15023, + 15026, 15027, 15024, 15025, + 15006, 15005, 15024, 15027, + 15006, 15027, 15028, 15009, + 15026, 15029, 15028, 15027, + 15030, 15031, 15028, 15029, + 15010, 15009, 15028, 15031, + 15010, 15031, 15032, 15013, + 15030, 15033, 15032, 15031, + 15034, 15035, 15032, 15033, + 15014, 15013, 15032, 15035, + 15014, 15035, 15036, 15017, + 15034, 15037, 15036, 15035, + 15038, 15039, 15036, 15037, + 15018, 15017, 15036, 15039, + 3511, 3514, 15040, 15021, + 3515, 15041, 15040, 3514, + 15042, 15043, 15040, 15041, + 15022, 15021, 15040, 15043, + 15022, 15043, 15044, 15025, + 15042, 15045, 15044, 15043, + 15046, 15047, 15044, 15045, + 15026, 15025, 15044, 15047, + 15026, 15047, 15048, 15029, + 15046, 15049, 15048, 15047, + 15050, 15051, 15048, 15049, + 15030, 15029, 15048, 15051, + 15030, 15051, 15052, 15033, + 15050, 15053, 15052, 15051, + 15054, 15055, 15052, 15053, + 15034, 15033, 15052, 15055, + 15034, 15055, 15056, 15037, + 15054, 15057, 15056, 15055, + 15058, 15059, 15056, 15057, + 15038, 15037, 15056, 15059, + 3515, 3518, 15060, 15041, + 3519, 15061, 15060, 3518, + 15062, 15063, 15060, 15061, + 15042, 15041, 15060, 15063, + 15042, 15063, 15064, 15045, + 15062, 15065, 15064, 15063, + 15066, 15067, 15064, 15065, + 15046, 15045, 15064, 15067, + 15046, 15067, 15068, 15049, + 15066, 15069, 15068, 15067, + 15070, 15071, 15068, 15069, + 15050, 15049, 15068, 15071, + 15050, 15071, 15072, 15053, + 15070, 15073, 15072, 15071, + 15074, 15075, 15072, 15073, + 15054, 15053, 15072, 15075, + 15054, 15075, 15076, 15057, + 15074, 15077, 15076, 15075, + 15078, 15079, 15076, 15077, + 15058, 15057, 15076, 15079, + 3519, 3522, 15080, 15061, + 3523, 15081, 15080, 3522, + 15082, 15083, 15080, 15081, + 15062, 15061, 15080, 15083, + 15062, 15083, 15084, 15065, + 15082, 15085, 15084, 15083, + 15086, 15087, 15084, 15085, + 15066, 15065, 15084, 15087, + 15066, 15087, 15088, 15069, + 15086, 15089, 15088, 15087, + 15090, 15091, 15088, 15089, + 15070, 15069, 15088, 15091, + 15070, 15091, 15092, 15073, + 15090, 15093, 15092, 15091, + 15094, 15095, 15092, 15093, + 15074, 15073, 15092, 15095, + 15074, 15095, 15096, 15077, + 15094, 15097, 15096, 15095, + 15098, 15099, 15096, 15097, + 15078, 15077, 15096, 15099, + 3523, 3526, 15100, 15081, + 3527, 15101, 15100, 3526, + 15102, 15103, 15100, 15101, + 15082, 15081, 15100, 15103, + 15082, 15103, 15104, 15085, + 15102, 15105, 15104, 15103, + 15106, 15107, 15104, 15105, + 15086, 15085, 15104, 15107, + 15086, 15107, 15108, 15089, + 15106, 15109, 15108, 15107, + 15110, 15111, 15108, 15109, + 15090, 15089, 15108, 15111, + 15090, 15111, 15112, 15093, + 15110, 15113, 15112, 15111, + 15114, 15115, 15112, 15113, + 15094, 15093, 15112, 15115, + 15094, 15115, 15116, 15097, + 15114, 15117, 15116, 15115, + 15118, 15119, 15116, 15117, + 15098, 15097, 15116, 15119, + 3527, 3530, 15120, 15101, + 3531, 15121, 15120, 3530, + 15122, 15123, 15120, 15121, + 15102, 15101, 15120, 15123, + 15102, 15123, 15124, 15105, + 15122, 15125, 15124, 15123, + 15126, 15127, 15124, 15125, + 15106, 15105, 15124, 15127, + 15106, 15127, 15128, 15109, + 15126, 15129, 15128, 15127, + 15130, 15131, 15128, 15129, + 15110, 15109, 15128, 15131, + 15110, 15131, 15132, 15113, + 15130, 15133, 15132, 15131, + 15134, 15135, 15132, 15133, + 15114, 15113, 15132, 15135, + 15114, 15135, 15136, 15117, + 15134, 15137, 15136, 15135, + 15138, 15139, 15136, 15137, + 15118, 15117, 15136, 15139, + 3531, 3534, 15140, 15121, + 3535, 15141, 15140, 3534, + 15142, 15143, 15140, 15141, + 15122, 15121, 15140, 15143, + 15122, 15143, 15144, 15125, + 15142, 15145, 15144, 15143, + 15146, 15147, 15144, 15145, + 15126, 15125, 15144, 15147, + 15126, 15147, 15148, 15129, + 15146, 15149, 15148, 15147, + 15150, 15151, 15148, 15149, + 15130, 15129, 15148, 15151, + 15130, 15151, 15152, 15133, + 15150, 15153, 15152, 15151, + 15154, 15155, 15152, 15153, + 15134, 15133, 15152, 15155, + 15134, 15155, 15156, 15137, + 15154, 15157, 15156, 15155, + 15158, 15159, 15156, 15157, + 15138, 15137, 15156, 15159, + 3535, 3538, 15160, 15141, + 3539, 15161, 15160, 3538, + 15162, 15163, 15160, 15161, + 15142, 15141, 15160, 15163, + 15142, 15163, 15164, 15145, + 15162, 15165, 15164, 15163, + 15166, 15167, 15164, 15165, + 15146, 15145, 15164, 15167, + 15146, 15167, 15168, 15149, + 15166, 15169, 15168, 15167, + 15170, 15171, 15168, 15169, + 15150, 15149, 15168, 15171, + 15150, 15171, 15172, 15153, + 15170, 15173, 15172, 15171, + 15174, 15175, 15172, 15173, + 15154, 15153, 15172, 15175, + 15154, 15175, 15176, 15157, + 15174, 15177, 15176, 15175, + 15178, 15179, 15176, 15177, + 15158, 15157, 15176, 15179, + 3539, 3542, 15180, 15161, + 3543, 15181, 15180, 3542, + 15182, 15183, 15180, 15181, + 15162, 15161, 15180, 15183, + 15162, 15183, 15184, 15165, + 15182, 15185, 15184, 15183, + 15186, 15187, 15184, 15185, + 15166, 15165, 15184, 15187, + 15166, 15187, 15188, 15169, + 15186, 15189, 15188, 15187, + 15190, 15191, 15188, 15189, + 15170, 15169, 15188, 15191, + 15170, 15191, 15192, 15173, + 15190, 15193, 15192, 15191, + 15194, 15195, 15192, 15193, + 15174, 15173, 15192, 15195, + 15174, 15195, 15196, 15177, + 15194, 15197, 15196, 15195, + 15198, 15199, 15196, 15197, + 15178, 15177, 15196, 15199, + 3543, 3546, 15200, 15181, + 3547, 15201, 15200, 3546, + 15202, 15203, 15200, 15201, + 15182, 15181, 15200, 15203, + 15182, 15203, 15204, 15185, + 15202, 15205, 15204, 15203, + 15206, 15207, 15204, 15205, + 15186, 15185, 15204, 15207, + 15186, 15207, 15208, 15189, + 15206, 15209, 15208, 15207, + 15210, 15211, 15208, 15209, + 15190, 15189, 15208, 15211, + 15190, 15211, 15212, 15193, + 15210, 15213, 15212, 15211, + 15214, 15215, 15212, 15213, + 15194, 15193, 15212, 15215, + 15194, 15215, 15216, 15197, + 15214, 15217, 15216, 15215, + 15218, 15219, 15216, 15217, + 15198, 15197, 15216, 15219, + 3547, 3550, 15220, 15201, + 3551, 15221, 15220, 3550, + 15222, 15223, 15220, 15221, + 15202, 15201, 15220, 15223, + 15202, 15223, 15224, 15205, + 15222, 15225, 15224, 15223, + 15226, 15227, 15224, 15225, + 15206, 15205, 15224, 15227, + 15206, 15227, 15228, 15209, + 15226, 15229, 15228, 15227, + 15230, 15231, 15228, 15229, + 15210, 15209, 15228, 15231, + 15210, 15231, 15232, 15213, + 15230, 15233, 15232, 15231, + 15234, 15235, 15232, 15233, + 15214, 15213, 15232, 15235, + 15214, 15235, 15236, 15217, + 15234, 15237, 15236, 15235, + 15238, 15239, 15236, 15237, + 15218, 15217, 15236, 15239, + 3551, 3554, 15240, 15221, + 3555, 15241, 15240, 3554, + 15242, 15243, 15240, 15241, + 15222, 15221, 15240, 15243, + 15222, 15243, 15244, 15225, + 15242, 15245, 15244, 15243, + 15246, 15247, 15244, 15245, + 15226, 15225, 15244, 15247, + 15226, 15247, 15248, 15229, + 15246, 15249, 15248, 15247, + 15250, 15251, 15248, 15249, + 15230, 15229, 15248, 15251, + 15230, 15251, 15252, 15233, + 15250, 15253, 15252, 15251, + 15254, 15255, 15252, 15253, + 15234, 15233, 15252, 15255, + 15234, 15255, 15256, 15237, + 15254, 15257, 15256, 15255, + 15258, 15259, 15256, 15257, + 15238, 15237, 15256, 15259, + 3555, 3558, 15260, 15241, + 3559, 15261, 15260, 3558, + 15262, 15263, 15260, 15261, + 15242, 15241, 15260, 15263, + 15242, 15263, 15264, 15245, + 15262, 15265, 15264, 15263, + 15266, 15267, 15264, 15265, + 15246, 15245, 15264, 15267, + 15246, 15267, 15268, 15249, + 15266, 15269, 15268, 15267, + 15270, 15271, 15268, 15269, + 15250, 15249, 15268, 15271, + 15250, 15271, 15272, 15253, + 15270, 15273, 15272, 15271, + 15274, 15275, 15272, 15273, + 15254, 15253, 15272, 15275, + 15254, 15275, 15276, 15257, + 15274, 15277, 15276, 15275, + 15278, 15279, 15276, 15277, + 15258, 15257, 15276, 15279, + 3559, 3562, 15280, 15261, + 3563, 15281, 15280, 3562, + 15282, 15283, 15280, 15281, + 15262, 15261, 15280, 15283, + 15262, 15283, 15284, 15265, + 15282, 15285, 15284, 15283, + 15286, 15287, 15284, 15285, + 15266, 15265, 15284, 15287, + 15266, 15287, 15288, 15269, + 15286, 15289, 15288, 15287, + 15290, 15291, 15288, 15289, + 15270, 15269, 15288, 15291, + 15270, 15291, 15292, 15273, + 15290, 15293, 15292, 15291, + 15294, 15295, 15292, 15293, + 15274, 15273, 15292, 15295, + 15274, 15295, 15296, 15277, + 15294, 15297, 15296, 15295, + 15298, 15299, 15296, 15297, + 15278, 15277, 15296, 15299, + 3563, 3566, 15300, 15281, + 3567, 15301, 15300, 3566, + 15302, 15303, 15300, 15301, + 15282, 15281, 15300, 15303, + 15282, 15303, 15304, 15285, + 15302, 15305, 15304, 15303, + 15306, 15307, 15304, 15305, + 15286, 15285, 15304, 15307, + 15286, 15307, 15308, 15289, + 15306, 15309, 15308, 15307, + 15310, 15311, 15308, 15309, + 15290, 15289, 15308, 15311, + 15290, 15311, 15312, 15293, + 15310, 15313, 15312, 15311, + 15314, 15315, 15312, 15313, + 15294, 15293, 15312, 15315, + 15294, 15315, 15316, 15297, + 15314, 15317, 15316, 15315, + 15318, 15319, 15316, 15317, + 15298, 15297, 15316, 15319, + 3567, 10754, 15320, 15301, + 10750, 15321, 15320, 10754, + 15322, 15323, 15320, 15321, + 15302, 15301, 15320, 15323, + 15302, 15323, 15324, 15305, + 15322, 15325, 15324, 15323, + 15326, 15327, 15324, 15325, + 15306, 15305, 15324, 15327, + 15306, 15327, 15328, 15309, + 15326, 15329, 15328, 15327, + 15330, 15331, 15328, 15329, + 15310, 15309, 15328, 15331, + 15310, 15331, 15332, 15313, + 15330, 15333, 15332, 15331, + 15334, 15335, 15332, 15333, + 15314, 15313, 15332, 15335, + 15314, 15335, 15336, 15317, + 15334, 15337, 15336, 15335, + 15338, 15339, 15336, 15337, + 15318, 15317, 15336, 15339, + 10750, 10748, 15340, 15321, + 10744, 15341, 15340, 10748, + 15342, 15343, 15340, 15341, + 15322, 15321, 15340, 15343, + 15322, 15343, 15344, 15325, + 15342, 15345, 15344, 15343, + 15346, 15347, 15344, 15345, + 15326, 15325, 15344, 15347, + 15326, 15347, 15348, 15329, + 15346, 15349, 15348, 15347, + 15350, 15351, 15348, 15349, + 15330, 15329, 15348, 15351, + 15330, 15351, 15352, 15333, + 15350, 15353, 15352, 15351, + 15354, 15355, 15352, 15353, + 15334, 15333, 15352, 15355, + 15334, 15355, 15356, 15337, + 15354, 15357, 15356, 15355, + 15358, 15359, 15356, 15357, + 15338, 15337, 15356, 15359, + 10744, 10742, 15360, 15341, + 10738, 15361, 15360, 10742, + 15362, 15363, 15360, 15361, + 15342, 15341, 15360, 15363, + 15342, 15363, 15364, 15345, + 15362, 15365, 15364, 15363, + 15366, 15367, 15364, 15365, + 15346, 15345, 15364, 15367, + 15346, 15367, 15368, 15349, + 15366, 15369, 15368, 15367, + 15370, 15371, 15368, 15369, + 15350, 15349, 15368, 15371, + 15350, 15371, 15372, 15353, + 15370, 15373, 15372, 15371, + 15374, 15375, 15372, 15373, + 15354, 15353, 15372, 15375, + 15354, 15375, 15376, 15357, + 15374, 15377, 15376, 15375, + 15378, 15379, 15376, 15377, + 15358, 15357, 15376, 15379, + 10738, 10736, 15380, 15361, + 10732, 15381, 15380, 10736, + 15382, 15383, 15380, 15381, + 15362, 15361, 15380, 15383, + 15362, 15383, 15384, 15365, + 15382, 15385, 15384, 15383, + 15386, 15387, 15384, 15385, + 15366, 15365, 15384, 15387, + 15366, 15387, 15388, 15369, + 15386, 15389, 15388, 15387, + 15390, 15391, 15388, 15389, + 15370, 15369, 15388, 15391, + 15370, 15391, 15392, 15373, + 15390, 15393, 15392, 15391, + 15394, 15395, 15392, 15393, + 15374, 15373, 15392, 15395, + 15374, 15395, 15396, 15377, + 15394, 15397, 15396, 15395, + 15398, 15399, 15396, 15397, + 15378, 15377, 15396, 15399, + 10732, 10730, 15400, 15381, + 10726, 15401, 15400, 10730, + 15402, 15403, 15400, 15401, + 15382, 15381, 15400, 15403, + 15382, 15403, 15404, 15385, + 15402, 15405, 15404, 15403, + 15406, 15407, 15404, 15405, + 15386, 15385, 15404, 15407, + 15386, 15407, 15408, 15389, + 15406, 15409, 15408, 15407, + 15410, 15411, 15408, 15409, + 15390, 15389, 15408, 15411, + 15390, 15411, 15412, 15393, + 15410, 15413, 15412, 15411, + 15414, 15415, 15412, 15413, + 15394, 15393, 15412, 15415, + 15394, 15415, 15416, 15397, + 15414, 15417, 15416, 15415, + 15418, 15419, 15416, 15417, + 15398, 15397, 15416, 15419, + 10726, 10724, 15420, 15401, + 10720, 15421, 15420, 10724, + 15422, 15423, 15420, 15421, + 15402, 15401, 15420, 15423, + 15402, 15423, 15424, 15405, + 15422, 15425, 15424, 15423, + 15426, 15427, 15424, 15425, + 15406, 15405, 15424, 15427, + 15406, 15427, 15428, 15409, + 15426, 15429, 15428, 15427, + 15430, 15431, 15428, 15429, + 15410, 15409, 15428, 15431, + 15410, 15431, 15432, 15413, + 15430, 15433, 15432, 15431, + 15434, 15435, 15432, 15433, + 15414, 15413, 15432, 15435, + 15414, 15435, 15436, 15417, + 15434, 15437, 15436, 15435, + 15438, 15439, 15436, 15437, + 15418, 15417, 15436, 15439, + 10720, 10718, 15440, 15421, + 10714, 15441, 15440, 10718, + 15442, 15443, 15440, 15441, + 15422, 15421, 15440, 15443, + 15422, 15443, 15444, 15425, + 15442, 15445, 15444, 15443, + 15446, 15447, 15444, 15445, + 15426, 15425, 15444, 15447, + 15426, 15447, 15448, 15429, + 15446, 15449, 15448, 15447, + 15450, 15451, 15448, 15449, + 15430, 15429, 15448, 15451, + 15430, 15451, 15452, 15433, + 15450, 15453, 15452, 15451, + 15454, 15455, 15452, 15453, + 15434, 15433, 15452, 15455, + 15434, 15455, 15456, 15437, + 15454, 15457, 15456, 15455, + 15458, 15459, 15456, 15457, + 15438, 15437, 15456, 15459, + 10714, 10712, 15460, 15441, + 10708, 15461, 15460, 10712, + 15462, 15463, 15460, 15461, + 15442, 15441, 15460, 15463, + 15442, 15463, 15464, 15445, + 15462, 15465, 15464, 15463, + 15466, 15467, 15464, 15465, + 15446, 15445, 15464, 15467, + 15446, 15467, 15468, 15449, + 15466, 15469, 15468, 15467, + 15470, 15471, 15468, 15469, + 15450, 15449, 15468, 15471, + 15450, 15471, 15472, 15453, + 15470, 15473, 15472, 15471, + 15474, 15475, 15472, 15473, + 15454, 15453, 15472, 15475, + 15454, 15475, 15476, 15457, + 15474, 15477, 15476, 15475, + 15478, 15479, 15476, 15477, + 15458, 15457, 15476, 15479, + 10708, 10706, 15480, 15461, + 10702, 15481, 15480, 10706, + 15482, 15483, 15480, 15481, + 15462, 15461, 15480, 15483, + 15462, 15483, 15484, 15465, + 15482, 15485, 15484, 15483, + 15486, 15487, 15484, 15485, + 15466, 15465, 15484, 15487, + 15466, 15487, 15488, 15469, + 15486, 15489, 15488, 15487, + 15490, 15491, 15488, 15489, + 15470, 15469, 15488, 15491, + 15470, 15491, 15492, 15473, + 15490, 15493, 15492, 15491, + 15494, 15495, 15492, 15493, + 15474, 15473, 15492, 15495, + 15474, 15495, 15496, 15477, + 15494, 15497, 15496, 15495, + 15498, 15499, 15496, 15497, + 15478, 15477, 15496, 15499, + 10702, 10700, 15500, 15481, + 10696, 15501, 15500, 10700, + 15502, 15503, 15500, 15501, + 15482, 15481, 15500, 15503, + 15482, 15503, 15504, 15485, + 15502, 15505, 15504, 15503, + 15506, 15507, 15504, 15505, + 15486, 15485, 15504, 15507, + 15486, 15507, 15508, 15489, + 15506, 15509, 15508, 15507, + 15510, 15511, 15508, 15509, + 15490, 15489, 15508, 15511, + 15490, 15511, 15512, 15493, + 15510, 15513, 15512, 15511, + 15514, 15515, 15512, 15513, + 15494, 15493, 15512, 15515, + 15494, 15515, 15516, 15497, + 15514, 15517, 15516, 15515, + 15518, 15519, 15516, 15517, + 15498, 15497, 15516, 15519, + 10696, 10694, 15520, 15501, + 10690, 15521, 15520, 10694, + 15522, 15523, 15520, 15521, + 15502, 15501, 15520, 15523, + 15502, 15523, 15524, 15505, + 15522, 15525, 15524, 15523, + 15526, 15527, 15524, 15525, + 15506, 15505, 15524, 15527, + 15506, 15527, 15528, 15509, + 15526, 15529, 15528, 15527, + 15530, 15531, 15528, 15529, + 15510, 15509, 15528, 15531, + 15510, 15531, 15532, 15513, + 15530, 15533, 15532, 15531, + 15534, 15535, 15532, 15533, + 15514, 15513, 15532, 15535, + 15514, 15535, 15536, 15517, + 15534, 15537, 15536, 15535, + 15538, 15539, 15536, 15537, + 15518, 15517, 15536, 15539, + 10690, 10688, 15540, 15521, + 10684, 15541, 15540, 10688, + 15542, 15543, 15540, 15541, + 15522, 15521, 15540, 15543, + 15522, 15543, 15544, 15525, + 15542, 15545, 15544, 15543, + 15546, 15547, 15544, 15545, + 15526, 15525, 15544, 15547, + 15526, 15547, 15548, 15529, + 15546, 15549, 15548, 15547, + 15550, 15551, 15548, 15549, + 15530, 15529, 15548, 15551, + 15530, 15551, 15552, 15533, + 15550, 15553, 15552, 15551, + 15554, 15555, 15552, 15553, + 15534, 15533, 15552, 15555, + 15534, 15555, 15556, 15537, + 15554, 15557, 15556, 15555, + 15558, 15559, 15556, 15557, + 15538, 15537, 15556, 15559, + 10684, 10682, 15560, 15541, + 10678, 15561, 15560, 10682, + 15562, 15563, 15560, 15561, + 15542, 15541, 15560, 15563, + 15542, 15563, 15564, 15545, + 15562, 15565, 15564, 15563, + 15566, 15567, 15564, 15565, + 15546, 15545, 15564, 15567, + 15546, 15567, 15568, 15549, + 15566, 15569, 15568, 15567, + 15570, 15571, 15568, 15569, + 15550, 15549, 15568, 15571, + 15550, 15571, 15572, 15553, + 15570, 15573, 15572, 15571, + 15574, 15575, 15572, 15573, + 15554, 15553, 15572, 15575, + 15554, 15575, 15576, 15557, + 15574, 15577, 15576, 15575, + 15578, 15579, 15576, 15577, + 15558, 15557, 15576, 15579, + 10678, 10676, 15580, 15561, + 10672, 15581, 15580, 10676, + 15582, 15583, 15580, 15581, + 15562, 15561, 15580, 15583, + 15562, 15583, 15584, 15565, + 15582, 15585, 15584, 15583, + 15586, 15587, 15584, 15585, + 15566, 15565, 15584, 15587, + 15566, 15587, 15588, 15569, + 15586, 15589, 15588, 15587, + 15590, 15591, 15588, 15589, + 15570, 15569, 15588, 15591, + 15570, 15591, 15592, 15573, + 15590, 15593, 15592, 15591, + 15594, 15595, 15592, 15593, + 15574, 15573, 15592, 15595, + 15574, 15595, 15596, 15577, + 15594, 15597, 15596, 15595, + 15598, 15599, 15596, 15597, + 15578, 15577, 15596, 15599, + 10672, 10670, 15600, 15581, + 10666, 15601, 15600, 10670, + 15602, 15603, 15600, 15601, + 15582, 15581, 15600, 15603, + 15582, 15603, 15604, 15585, + 15602, 15605, 15604, 15603, + 15606, 15607, 15604, 15605, + 15586, 15585, 15604, 15607, + 15586, 15607, 15608, 15589, + 15606, 15609, 15608, 15607, + 15610, 15611, 15608, 15609, + 15590, 15589, 15608, 15611, + 15590, 15611, 15612, 15593, + 15610, 15613, 15612, 15611, + 15614, 15615, 15612, 15613, + 15594, 15593, 15612, 15615, + 15594, 15615, 15616, 15597, + 15614, 15617, 15616, 15615, + 15618, 15619, 15616, 15617, + 15598, 15597, 15616, 15619, + 10666, 10664, 15620, 15601, + 10660, 15621, 15620, 10664, + 15622, 15623, 15620, 15621, + 15602, 15601, 15620, 15623, + 15602, 15623, 15624, 15605, + 15622, 15625, 15624, 15623, + 15626, 15627, 15624, 15625, + 15606, 15605, 15624, 15627, + 15606, 15627, 15628, 15609, + 15626, 15629, 15628, 15627, + 15630, 15631, 15628, 15629, + 15610, 15609, 15628, 15631, + 15610, 15631, 15632, 15613, + 15630, 15633, 15632, 15631, + 15634, 15635, 15632, 15633, + 15614, 15613, 15632, 15635, + 15614, 15635, 15636, 15617, + 15634, 15637, 15636, 15635, + 15638, 15639, 15636, 15637, + 15618, 15617, 15636, 15639, + 10660, 10658, 15640, 15621, + 10654, 15641, 15640, 10658, + 15642, 15643, 15640, 15641, + 15622, 15621, 15640, 15643, + 15622, 15643, 15644, 15625, + 15642, 15645, 15644, 15643, + 15646, 15647, 15644, 15645, + 15626, 15625, 15644, 15647, + 15626, 15647, 15648, 15629, + 15646, 15649, 15648, 15647, + 15650, 15651, 15648, 15649, + 15630, 15629, 15648, 15651, + 15630, 15651, 15652, 15633, + 15650, 15653, 15652, 15651, + 15654, 15655, 15652, 15653, + 15634, 15633, 15652, 15655, + 15634, 15655, 15656, 15637, + 15654, 15657, 15656, 15655, + 15658, 15659, 15656, 15657, + 15638, 15637, 15656, 15659, + 10654, 10652, 15660, 15641, + 10648, 15661, 15660, 10652, + 15662, 15663, 15660, 15661, + 15642, 15641, 15660, 15663, + 15642, 15663, 15664, 15645, + 15662, 15665, 15664, 15663, + 15666, 15667, 15664, 15665, + 15646, 15645, 15664, 15667, + 15646, 15667, 15668, 15649, + 15666, 15669, 15668, 15667, + 15670, 15671, 15668, 15669, + 15650, 15649, 15668, 15671, + 15650, 15671, 15672, 15653, + 15670, 15673, 15672, 15671, + 15674, 15675, 15672, 15673, + 15654, 15653, 15672, 15675, + 15654, 15675, 15676, 15657, + 15674, 15677, 15676, 15675, + 15678, 15679, 15676, 15677, + 15658, 15657, 15676, 15679, + 10648, 10646, 15680, 15661, + 10642, 15681, 15680, 10646, + 15682, 15683, 15680, 15681, + 15662, 15661, 15680, 15683, + 15662, 15683, 15684, 15665, + 15682, 15685, 15684, 15683, + 15686, 15687, 15684, 15685, + 15666, 15665, 15684, 15687, + 15666, 15687, 15688, 15669, + 15686, 15689, 15688, 15687, + 15690, 15691, 15688, 15689, + 15670, 15669, 15688, 15691, + 15670, 15691, 15692, 15673, + 15690, 15693, 15692, 15691, + 15694, 15695, 15692, 15693, + 15674, 15673, 15692, 15695, + 15674, 15695, 15696, 15677, + 15694, 15697, 15696, 15695, + 15698, 15699, 15696, 15697, + 15678, 15677, 15696, 15699, + 10642, 10640, 15700, 15681, + 10636, 15701, 15700, 10640, + 15702, 15703, 15700, 15701, + 15682, 15681, 15700, 15703, + 15682, 15703, 15704, 15685, + 15702, 15705, 15704, 15703, + 15706, 15707, 15704, 15705, + 15686, 15685, 15704, 15707, + 15686, 15707, 15708, 15689, + 15706, 15709, 15708, 15707, + 15710, 15711, 15708, 15709, + 15690, 15689, 15708, 15711, + 15690, 15711, 15712, 15693, + 15710, 15713, 15712, 15711, + 15714, 15715, 15712, 15713, + 15694, 15693, 15712, 15715, + 15694, 15715, 15716, 15697, + 15714, 15717, 15716, 15715, + 15718, 15719, 15716, 15717, + 15698, 15697, 15716, 15719, + 10636, 10634, 15720, 15701, + 10630, 15721, 15720, 10634, + 15722, 15723, 15720, 15721, + 15702, 15701, 15720, 15723, + 15702, 15723, 15724, 15705, + 15722, 15725, 15724, 15723, + 15726, 15727, 15724, 15725, + 15706, 15705, 15724, 15727, + 15706, 15727, 15728, 15709, + 15726, 15729, 15728, 15727, + 15730, 15731, 15728, 15729, + 15710, 15709, 15728, 15731, + 15710, 15731, 15732, 15713, + 15730, 15733, 15732, 15731, + 15734, 15735, 15732, 15733, + 15714, 15713, 15732, 15735, + 15714, 15735, 15736, 15717, + 15734, 15737, 15736, 15735, + 15738, 15739, 15736, 15737, + 15718, 15717, 15736, 15739, + 10630, 10628, 15740, 15721, + 10624, 15741, 15740, 10628, + 15742, 15743, 15740, 15741, + 15722, 15721, 15740, 15743, + 15722, 15743, 15744, 15725, + 15742, 15745, 15744, 15743, + 15746, 15747, 15744, 15745, + 15726, 15725, 15744, 15747, + 15726, 15747, 15748, 15729, + 15746, 15749, 15748, 15747, + 15750, 15751, 15748, 15749, + 15730, 15729, 15748, 15751, + 15730, 15751, 15752, 15733, + 15750, 15753, 15752, 15751, + 15754, 15755, 15752, 15753, + 15734, 15733, 15752, 15755, + 15734, 15755, 15756, 15737, + 15754, 15757, 15756, 15755, + 15758, 15759, 15756, 15757, + 15738, 15737, 15756, 15759, + 10624, 10622, 15760, 15741, + 10618, 15761, 15760, 10622, + 15762, 15763, 15760, 15761, + 15742, 15741, 15760, 15763, + 15742, 15763, 15764, 15745, + 15762, 15765, 15764, 15763, + 15766, 15767, 15764, 15765, + 15746, 15745, 15764, 15767, + 15746, 15767, 15768, 15749, + 15766, 15769, 15768, 15767, + 15770, 15771, 15768, 15769, + 15750, 15749, 15768, 15771, + 15750, 15771, 15772, 15753, + 15770, 15773, 15772, 15771, + 15774, 15775, 15772, 15773, + 15754, 15753, 15772, 15775, + 15754, 15775, 15776, 15757, + 15774, 15777, 15776, 15775, + 15778, 15779, 15776, 15777, + 15758, 15757, 15776, 15779, + 10618, 10616, 15780, 15761, + 10612, 15781, 15780, 10616, + 15782, 15783, 15780, 15781, + 15762, 15761, 15780, 15783, + 15762, 15783, 15784, 15765, + 15782, 15785, 15784, 15783, + 15786, 15787, 15784, 15785, + 15766, 15765, 15784, 15787, + 15766, 15787, 15788, 15769, + 15786, 15789, 15788, 15787, + 15790, 15791, 15788, 15789, + 15770, 15769, 15788, 15791, + 15770, 15791, 15792, 15773, + 15790, 15793, 15792, 15791, + 15794, 15795, 15792, 15793, + 15774, 15773, 15792, 15795, + 15774, 15795, 15796, 15777, + 15794, 15797, 15796, 15795, + 15798, 15799, 15796, 15797, + 15778, 15777, 15796, 15799, + 10612, 10610, 15800, 15781, + 10606, 15801, 15800, 10610, + 15802, 15803, 15800, 15801, + 15782, 15781, 15800, 15803, + 15782, 15803, 15804, 15785, + 15802, 15805, 15804, 15803, + 15806, 15807, 15804, 15805, + 15786, 15785, 15804, 15807, + 15786, 15807, 15808, 15789, + 15806, 15809, 15808, 15807, + 15810, 15811, 15808, 15809, + 15790, 15789, 15808, 15811, + 15790, 15811, 15812, 15793, + 15810, 15813, 15812, 15811, + 15814, 15815, 15812, 15813, + 15794, 15793, 15812, 15815, + 15794, 15815, 15816, 15797, + 15814, 15817, 15816, 15815, + 15818, 15819, 15816, 15817, + 15798, 15797, 15816, 15819, + 10606, 10604, 15820, 15801, + 10600, 15821, 15820, 10604, + 15822, 15823, 15820, 15821, + 15802, 15801, 15820, 15823, + 15802, 15823, 15824, 15805, + 15822, 15825, 15824, 15823, + 15826, 15827, 15824, 15825, + 15806, 15805, 15824, 15827, + 15806, 15827, 15828, 15809, + 15826, 15829, 15828, 15827, + 15830, 15831, 15828, 15829, + 15810, 15809, 15828, 15831, + 15810, 15831, 15832, 15813, + 15830, 15833, 15832, 15831, + 15834, 15835, 15832, 15833, + 15814, 15813, 15832, 15835, + 15814, 15835, 15836, 15817, + 15834, 15837, 15836, 15835, + 15838, 15839, 15836, 15837, + 15818, 15817, 15836, 15839, + 10600, 10598, 15840, 15821, + 10594, 15841, 15840, 10598, + 15842, 15843, 15840, 15841, + 15822, 15821, 15840, 15843, + 15822, 15843, 15844, 15825, + 15842, 15845, 15844, 15843, + 15846, 15847, 15844, 15845, + 15826, 15825, 15844, 15847, + 15826, 15847, 15848, 15829, + 15846, 15849, 15848, 15847, + 15850, 15851, 15848, 15849, + 15830, 15829, 15848, 15851, + 15830, 15851, 15852, 15833, + 15850, 15853, 15852, 15851, + 15854, 15855, 15852, 15853, + 15834, 15833, 15852, 15855, + 15834, 15855, 15856, 15837, + 15854, 15857, 15856, 15855, + 15858, 15859, 15856, 15857, + 15838, 15837, 15856, 15859, + 10594, 10592, 15860, 15841, + 10588, 15861, 15860, 10592, + 15862, 15863, 15860, 15861, + 15842, 15841, 15860, 15863, + 15842, 15863, 15864, 15845, + 15862, 15865, 15864, 15863, + 15866, 15867, 15864, 15865, + 15846, 15845, 15864, 15867, + 15846, 15867, 15868, 15849, + 15866, 15869, 15868, 15867, + 15870, 15871, 15868, 15869, + 15850, 15849, 15868, 15871, + 15850, 15871, 15872, 15853, + 15870, 15873, 15872, 15871, + 15874, 15875, 15872, 15873, + 15854, 15853, 15872, 15875, + 15854, 15875, 15876, 15857, + 15874, 15877, 15876, 15875, + 15878, 15879, 15876, 15877, + 15858, 15857, 15876, 15879, + 10588, 10586, 15880, 15861, + 10582, 15881, 15880, 10586, + 15882, 15883, 15880, 15881, + 15862, 15861, 15880, 15883, + 15862, 15883, 15884, 15865, + 15882, 15885, 15884, 15883, + 15886, 15887, 15884, 15885, + 15866, 15865, 15884, 15887, + 15866, 15887, 15888, 15869, + 15886, 15889, 15888, 15887, + 15890, 15891, 15888, 15889, + 15870, 15869, 15888, 15891, + 15870, 15891, 15892, 15873, + 15890, 15893, 15892, 15891, + 15894, 15895, 15892, 15893, + 15874, 15873, 15892, 15895, + 15874, 15895, 15896, 15877, + 15894, 15897, 15896, 15895, + 15898, 15899, 15896, 15897, + 15878, 15877, 15896, 15899, + 10582, 10580, 15900, 15881, + 10576, 15901, 15900, 10580, + 15902, 15903, 15900, 15901, + 15882, 15881, 15900, 15903, + 15882, 15903, 15904, 15885, + 15902, 15905, 15904, 15903, + 15906, 15907, 15904, 15905, + 15886, 15885, 15904, 15907, + 15886, 15907, 15908, 15889, + 15906, 15909, 15908, 15907, + 15910, 15911, 15908, 15909, + 15890, 15889, 15908, 15911, + 15890, 15911, 15912, 15893, + 15910, 15913, 15912, 15911, + 15914, 15915, 15912, 15913, + 15894, 15893, 15912, 15915, + 15894, 15915, 15916, 15897, + 15914, 15917, 15916, 15915, + 15918, 15919, 15916, 15917, + 15898, 15897, 15916, 15919, + 10576, 10574, 15920, 15901, + 10570, 15921, 15920, 10574, + 15922, 15923, 15920, 15921, + 15902, 15901, 15920, 15923, + 15902, 15923, 15924, 15905, + 15922, 15925, 15924, 15923, + 15926, 15927, 15924, 15925, + 15906, 15905, 15924, 15927, + 15906, 15927, 15928, 15909, + 15926, 15929, 15928, 15927, + 15930, 15931, 15928, 15929, + 15910, 15909, 15928, 15931, + 15910, 15931, 15932, 15913, + 15930, 15933, 15932, 15931, + 15934, 15935, 15932, 15933, + 15914, 15913, 15932, 15935, + 15914, 15935, 15936, 15917, + 15934, 15937, 15936, 15935, + 15938, 15939, 15936, 15937, + 15918, 15917, 15936, 15939, + 10570, 10568, 15940, 15921, + 10564, 15941, 15940, 10568, + 15942, 15943, 15940, 15941, + 15922, 15921, 15940, 15943, + 15922, 15943, 15944, 15925, + 15942, 15945, 15944, 15943, + 15946, 15947, 15944, 15945, + 15926, 15925, 15944, 15947, + 15926, 15947, 15948, 15929, + 15946, 15949, 15948, 15947, + 15950, 15951, 15948, 15949, + 15930, 15929, 15948, 15951, + 15930, 15951, 15952, 15933, + 15950, 15953, 15952, 15951, + 15954, 15955, 15952, 15953, + 15934, 15933, 15952, 15955, + 15934, 15955, 15956, 15937, + 15954, 15957, 15956, 15955, + 15958, 15959, 15956, 15957, + 15938, 15937, 15956, 15959, + 10564, 10562, 15960, 15941, + 7258, 15961, 15960, 10562, + 15962, 15963, 15960, 15961, + 15942, 15941, 15960, 15963, + 15942, 15963, 15964, 15945, + 15962, 15965, 15964, 15963, + 15966, 15967, 15964, 15965, + 15946, 15945, 15964, 15967, + 15946, 15967, 15968, 15949, + 15966, 15969, 15968, 15967, + 15970, 15971, 15968, 15969, + 15950, 15949, 15968, 15971, + 15950, 15971, 15972, 15953, + 15970, 15973, 15972, 15971, + 15974, 15975, 15972, 15973, + 15954, 15953, 15972, 15975, + 15954, 15975, 15976, 15957, + 15974, 15977, 15976, 15975, + 15978, 15979, 15976, 15977, + 15958, 15957, 15976, 15979, + 7258, 7256, 15980, 15961, + 7252, 15981, 15980, 7256, + 15982, 15983, 15980, 15981, + 15962, 15961, 15980, 15983, + 15962, 15983, 15984, 15965, + 15982, 15985, 15984, 15983, + 15986, 15987, 15984, 15985, + 15966, 15965, 15984, 15987, + 15966, 15987, 15988, 15969, + 15986, 15989, 15988, 15987, + 15990, 15991, 15988, 15989, + 15970, 15969, 15988, 15991, + 15970, 15991, 15992, 15973, + 15990, 15993, 15992, 15991, + 15994, 15995, 15992, 15993, + 15974, 15973, 15992, 15995, + 15974, 15995, 15996, 15977, + 15994, 15997, 15996, 15995, + 15998, 15999, 15996, 15997, + 15978, 15977, 15996, 15999, + 7252, 7250, 16000, 15981, + 7246, 16001, 16000, 7250, + 16002, 16003, 16000, 16001, + 15982, 15981, 16000, 16003, + 15982, 16003, 16004, 15985, + 16002, 16005, 16004, 16003, + 16006, 16007, 16004, 16005, + 15986, 15985, 16004, 16007, + 15986, 16007, 16008, 15989, + 16006, 16009, 16008, 16007, + 16010, 16011, 16008, 16009, + 15990, 15989, 16008, 16011, + 15990, 16011, 16012, 15993, + 16010, 16013, 16012, 16011, + 16014, 16015, 16012, 16013, + 15994, 15993, 16012, 16015, + 15994, 16015, 16016, 15997, + 16014, 16017, 16016, 16015, + 16018, 16019, 16016, 16017, + 15998, 15997, 16016, 16019, + 7246, 7244, 16020, 16001, + 7240, 16021, 16020, 7244, + 16022, 16023, 16020, 16021, + 16002, 16001, 16020, 16023, + 16002, 16023, 16024, 16005, + 16022, 16025, 16024, 16023, + 16026, 16027, 16024, 16025, + 16006, 16005, 16024, 16027, + 16006, 16027, 16028, 16009, + 16026, 16029, 16028, 16027, + 16030, 16031, 16028, 16029, + 16010, 16009, 16028, 16031, + 16010, 16031, 16032, 16013, + 16030, 16033, 16032, 16031, + 16034, 16035, 16032, 16033, + 16014, 16013, 16032, 16035, + 16014, 16035, 16036, 16017, + 16034, 16037, 16036, 16035, + 16038, 16039, 16036, 16037, + 16018, 16017, 16036, 16039, + 7240, 7238, 16040, 16021, + 7234, 16041, 16040, 7238, + 16042, 16043, 16040, 16041, + 16022, 16021, 16040, 16043, + 16022, 16043, 16044, 16025, + 16042, 16045, 16044, 16043, + 16046, 16047, 16044, 16045, + 16026, 16025, 16044, 16047, + 16026, 16047, 16048, 16029, + 16046, 16049, 16048, 16047, + 16050, 16051, 16048, 16049, + 16030, 16029, 16048, 16051, + 16030, 16051, 16052, 16033, + 16050, 16053, 16052, 16051, + 16054, 16055, 16052, 16053, + 16034, 16033, 16052, 16055, + 16034, 16055, 16056, 16037, + 16054, 16057, 16056, 16055, + 16058, 16059, 16056, 16057, + 16038, 16037, 16056, 16059, + 7234, 7232, 16060, 16041, + 7228, 16061, 16060, 7232, + 16062, 16063, 16060, 16061, + 16042, 16041, 16060, 16063, + 16042, 16063, 16064, 16045, + 16062, 16065, 16064, 16063, + 16066, 16067, 16064, 16065, + 16046, 16045, 16064, 16067, + 16046, 16067, 16068, 16049, + 16066, 16069, 16068, 16067, + 16070, 16071, 16068, 16069, + 16050, 16049, 16068, 16071, + 16050, 16071, 16072, 16053, + 16070, 16073, 16072, 16071, + 16074, 16075, 16072, 16073, + 16054, 16053, 16072, 16075, + 16054, 16075, 16076, 16057, + 16074, 16077, 16076, 16075, + 16078, 16079, 16076, 16077, + 16058, 16057, 16076, 16079, + 7228, 7226, 16080, 16061, + 7222, 16081, 16080, 7226, + 16082, 16083, 16080, 16081, + 16062, 16061, 16080, 16083, + 16062, 16083, 16084, 16065, + 16082, 16085, 16084, 16083, + 16086, 16087, 16084, 16085, + 16066, 16065, 16084, 16087, + 16066, 16087, 16088, 16069, + 16086, 16089, 16088, 16087, + 16090, 16091, 16088, 16089, + 16070, 16069, 16088, 16091, + 16070, 16091, 16092, 16073, + 16090, 16093, 16092, 16091, + 16094, 16095, 16092, 16093, + 16074, 16073, 16092, 16095, + 16074, 16095, 16096, 16077, + 16094, 16097, 16096, 16095, + 16098, 16099, 16096, 16097, + 16078, 16077, 16096, 16099, + 7222, 7220, 16100, 16081, + 7216, 16101, 16100, 7220, + 16102, 16103, 16100, 16101, + 16082, 16081, 16100, 16103, + 16082, 16103, 16104, 16085, + 16102, 16105, 16104, 16103, + 16106, 16107, 16104, 16105, + 16086, 16085, 16104, 16107, + 16086, 16107, 16108, 16089, + 16106, 16109, 16108, 16107, + 16110, 16111, 16108, 16109, + 16090, 16089, 16108, 16111, + 16090, 16111, 16112, 16093, + 16110, 16113, 16112, 16111, + 16114, 16115, 16112, 16113, + 16094, 16093, 16112, 16115, + 16094, 16115, 16116, 16097, + 16114, 16117, 16116, 16115, + 16118, 16119, 16116, 16117, + 16098, 16097, 16116, 16119, + 7216, 7214, 16120, 16101, + 7210, 16121, 16120, 7214, + 16122, 16123, 16120, 16121, + 16102, 16101, 16120, 16123, + 16102, 16123, 16124, 16105, + 16122, 16125, 16124, 16123, + 16126, 16127, 16124, 16125, + 16106, 16105, 16124, 16127, + 16106, 16127, 16128, 16109, + 16126, 16129, 16128, 16127, + 16130, 16131, 16128, 16129, + 16110, 16109, 16128, 16131, + 16110, 16131, 16132, 16113, + 16130, 16133, 16132, 16131, + 16134, 16135, 16132, 16133, + 16114, 16113, 16132, 16135, + 16114, 16135, 16136, 16117, + 16134, 16137, 16136, 16135, + 16138, 16139, 16136, 16137, + 16118, 16117, 16136, 16139, + 7210, 7208, 16140, 16121, + 7204, 16141, 16140, 7208, + 16142, 16143, 16140, 16141, + 16122, 16121, 16140, 16143, + 16122, 16143, 16144, 16125, + 16142, 16145, 16144, 16143, + 16146, 16147, 16144, 16145, + 16126, 16125, 16144, 16147, + 16126, 16147, 16148, 16129, + 16146, 16149, 16148, 16147, + 16150, 16151, 16148, 16149, + 16130, 16129, 16148, 16151, + 16130, 16151, 16152, 16133, + 16150, 16153, 16152, 16151, + 16154, 16155, 16152, 16153, + 16134, 16133, 16152, 16155, + 16134, 16155, 16156, 16137, + 16154, 16157, 16156, 16155, + 16158, 16159, 16156, 16157, + 16138, 16137, 16156, 16159, + 7204, 7202, 16160, 16141, + 7198, 16161, 16160, 7202, + 16162, 16163, 16160, 16161, + 16142, 16141, 16160, 16163, + 16142, 16163, 16164, 16145, + 16162, 16165, 16164, 16163, + 16166, 16167, 16164, 16165, + 16146, 16145, 16164, 16167, + 16146, 16167, 16168, 16149, + 16166, 16169, 16168, 16167, + 16170, 16171, 16168, 16169, + 16150, 16149, 16168, 16171, + 16150, 16171, 16172, 16153, + 16170, 16173, 16172, 16171, + 16174, 16175, 16172, 16173, + 16154, 16153, 16172, 16175, + 16154, 16175, 16176, 16157, + 16174, 16177, 16176, 16175, + 16178, 16179, 16176, 16177, + 16158, 16157, 16176, 16179, + 7198, 7196, 16180, 16161, + 7192, 16181, 16180, 7196, + 16182, 16183, 16180, 16181, + 16162, 16161, 16180, 16183, + 16162, 16183, 16184, 16165, + 16182, 16185, 16184, 16183, + 16186, 16187, 16184, 16185, + 16166, 16165, 16184, 16187, + 16166, 16187, 16188, 16169, + 16186, 16189, 16188, 16187, + 16190, 16191, 16188, 16189, + 16170, 16169, 16188, 16191, + 16170, 16191, 16192, 16173, + 16190, 16193, 16192, 16191, + 16194, 16195, 16192, 16193, + 16174, 16173, 16192, 16195, + 16174, 16195, 16196, 16177, + 16194, 16197, 16196, 16195, + 16198, 16199, 16196, 16197, + 16178, 16177, 16196, 16199, + 7192, 7190, 16200, 16181, + 7186, 16201, 16200, 7190, + 16202, 16203, 16200, 16201, + 16182, 16181, 16200, 16203, + 16182, 16203, 16204, 16185, + 16202, 16205, 16204, 16203, + 16206, 16207, 16204, 16205, + 16186, 16185, 16204, 16207, + 16186, 16207, 16208, 16189, + 16206, 16209, 16208, 16207, + 16210, 16211, 16208, 16209, + 16190, 16189, 16208, 16211, + 16190, 16211, 16212, 16193, + 16210, 16213, 16212, 16211, + 16214, 16215, 16212, 16213, + 16194, 16193, 16212, 16215, + 16194, 16215, 16216, 16197, + 16214, 16217, 16216, 16215, + 16218, 16219, 16216, 16217, + 16198, 16197, 16216, 16219, + 7186, 7184, 16220, 16201, + 7180, 16221, 16220, 7184, + 16222, 16223, 16220, 16221, + 16202, 16201, 16220, 16223, + 16202, 16223, 16224, 16205, + 16222, 16225, 16224, 16223, + 16226, 16227, 16224, 16225, + 16206, 16205, 16224, 16227, + 16206, 16227, 16228, 16209, + 16226, 16229, 16228, 16227, + 16230, 16231, 16228, 16229, + 16210, 16209, 16228, 16231, + 16210, 16231, 16232, 16213, + 16230, 16233, 16232, 16231, + 16234, 16235, 16232, 16233, + 16214, 16213, 16232, 16235, + 16214, 16235, 16236, 16217, + 16234, 16237, 16236, 16235, + 16238, 16239, 16236, 16237, + 16218, 16217, 16236, 16239, + 7180, 7178, 16240, 16221, + 7174, 16241, 16240, 7178, + 16242, 16243, 16240, 16241, + 16222, 16221, 16240, 16243, + 16222, 16243, 16244, 16225, + 16242, 16245, 16244, 16243, + 16246, 16247, 16244, 16245, + 16226, 16225, 16244, 16247, + 16226, 16247, 16248, 16229, + 16246, 16249, 16248, 16247, + 16250, 16251, 16248, 16249, + 16230, 16229, 16248, 16251, + 16230, 16251, 16252, 16233, + 16250, 16253, 16252, 16251, + 16254, 16255, 16252, 16253, + 16234, 16233, 16252, 16255, + 16234, 16255, 16256, 16237, + 16254, 16257, 16256, 16255, + 16258, 16259, 16256, 16257, + 16238, 16237, 16256, 16259, + 7174, 7172, 16260, 16241, + 7168, 16261, 16260, 7172, + 16262, 16263, 16260, 16261, + 16242, 16241, 16260, 16263, + 16242, 16263, 16264, 16245, + 16262, 16265, 16264, 16263, + 16266, 16267, 16264, 16265, + 16246, 16245, 16264, 16267, + 16246, 16267, 16268, 16249, + 16266, 16269, 16268, 16267, + 16270, 16271, 16268, 16269, + 16250, 16249, 16268, 16271, + 16250, 16271, 16272, 16253, + 16270, 16273, 16272, 16271, + 16274, 16275, 16272, 16273, + 16254, 16253, 16272, 16275, + 16254, 16275, 16276, 16257, + 16274, 16277, 16276, 16275, + 16278, 16279, 16276, 16277, + 16258, 16257, 16276, 16279, + 7168, 7166, 16280, 16261, + 7162, 16281, 16280, 7166, + 16282, 16283, 16280, 16281, + 16262, 16261, 16280, 16283, + 16262, 16283, 16284, 16265, + 16282, 16285, 16284, 16283, + 16286, 16287, 16284, 16285, + 16266, 16265, 16284, 16287, + 16266, 16287, 16288, 16269, + 16286, 16289, 16288, 16287, + 16290, 16291, 16288, 16289, + 16270, 16269, 16288, 16291, + 16270, 16291, 16292, 16273, + 16290, 16293, 16292, 16291, + 16294, 16295, 16292, 16293, + 16274, 16273, 16292, 16295, + 16274, 16295, 16296, 16277, + 16294, 16297, 16296, 16295, + 16298, 16299, 16296, 16297, + 16278, 16277, 16296, 16299, + 7162, 7160, 16300, 16281, + 7156, 16301, 16300, 7160, + 16302, 16303, 16300, 16301, + 16282, 16281, 16300, 16303, + 16282, 16303, 16304, 16285, + 16302, 16305, 16304, 16303, + 16306, 16307, 16304, 16305, + 16286, 16285, 16304, 16307, + 16286, 16307, 16308, 16289, + 16306, 16309, 16308, 16307, + 16310, 16311, 16308, 16309, + 16290, 16289, 16308, 16311, + 16290, 16311, 16312, 16293, + 16310, 16313, 16312, 16311, + 16314, 16315, 16312, 16313, + 16294, 16293, 16312, 16315, + 16294, 16315, 16316, 16297, + 16314, 16317, 16316, 16315, + 16318, 16319, 16316, 16317, + 16298, 16297, 16316, 16319, + 7156, 7154, 16320, 16301, + 7150, 16321, 16320, 7154, + 16322, 16323, 16320, 16321, + 16302, 16301, 16320, 16323, + 16302, 16323, 16324, 16305, + 16322, 16325, 16324, 16323, + 16326, 16327, 16324, 16325, + 16306, 16305, 16324, 16327, + 16306, 16327, 16328, 16309, + 16326, 16329, 16328, 16327, + 16330, 16331, 16328, 16329, + 16310, 16309, 16328, 16331, + 16310, 16331, 16332, 16313, + 16330, 16333, 16332, 16331, + 16334, 16335, 16332, 16333, + 16314, 16313, 16332, 16335, + 16314, 16335, 16336, 16317, + 16334, 16337, 16336, 16335, + 16338, 16339, 16336, 16337, + 16318, 16317, 16336, 16339, + 7150, 7148, 16340, 16321, + 7144, 16341, 16340, 7148, + 16342, 16343, 16340, 16341, + 16322, 16321, 16340, 16343, + 16322, 16343, 16344, 16325, + 16342, 16345, 16344, 16343, + 16346, 16347, 16344, 16345, + 16326, 16325, 16344, 16347, + 16326, 16347, 16348, 16329, + 16346, 16349, 16348, 16347, + 16350, 16351, 16348, 16349, + 16330, 16329, 16348, 16351, + 16330, 16351, 16352, 16333, + 16350, 16353, 16352, 16351, + 16354, 16355, 16352, 16353, + 16334, 16333, 16352, 16355, + 16334, 16355, 16356, 16337, + 16354, 16357, 16356, 16355, + 16358, 16359, 16356, 16357, + 16338, 16337, 16356, 16359, + 7144, 7142, 16360, 16341, + 7138, 16361, 16360, 7142, + 16362, 16363, 16360, 16361, + 16342, 16341, 16360, 16363, + 16342, 16363, 16364, 16345, + 16362, 16365, 16364, 16363, + 16366, 16367, 16364, 16365, + 16346, 16345, 16364, 16367, + 16346, 16367, 16368, 16349, + 16366, 16369, 16368, 16367, + 16370, 16371, 16368, 16369, + 16350, 16349, 16368, 16371, + 16350, 16371, 16372, 16353, + 16370, 16373, 16372, 16371, + 16374, 16375, 16372, 16373, + 16354, 16353, 16372, 16375, + 16354, 16375, 16376, 16357, + 16374, 16377, 16376, 16375, + 16378, 16379, 16376, 16377, + 16358, 16357, 16376, 16379, + 7138, 7136, 16380, 16361, + 7132, 16381, 16380, 7136, + 16382, 16383, 16380, 16381, + 16362, 16361, 16380, 16383, + 16362, 16383, 16384, 16365, + 16382, 16385, 16384, 16383, + 16386, 16387, 16384, 16385, + 16366, 16365, 16384, 16387, + 16366, 16387, 16388, 16369, + 16386, 16389, 16388, 16387, + 16390, 16391, 16388, 16389, + 16370, 16369, 16388, 16391, + 16370, 16391, 16392, 16373, + 16390, 16393, 16392, 16391, + 16394, 16395, 16392, 16393, + 16374, 16373, 16392, 16395, + 16374, 16395, 16396, 16377, + 16394, 16397, 16396, 16395, + 16398, 16399, 16396, 16397, + 16378, 16377, 16396, 16399, + 7132, 7130, 16400, 16381, + 7126, 16401, 16400, 7130, + 16402, 16403, 16400, 16401, + 16382, 16381, 16400, 16403, + 16382, 16403, 16404, 16385, + 16402, 16405, 16404, 16403, + 16406, 16407, 16404, 16405, + 16386, 16385, 16404, 16407, + 16386, 16407, 16408, 16389, + 16406, 16409, 16408, 16407, + 16410, 16411, 16408, 16409, + 16390, 16389, 16408, 16411, + 16390, 16411, 16412, 16393, + 16410, 16413, 16412, 16411, + 16414, 16415, 16412, 16413, + 16394, 16393, 16412, 16415, + 16394, 16415, 16416, 16397, + 16414, 16417, 16416, 16415, + 16418, 16419, 16416, 16417, + 16398, 16397, 16416, 16419, + 7126, 7124, 16420, 16401, + 7120, 16421, 16420, 7124, + 16422, 16423, 16420, 16421, + 16402, 16401, 16420, 16423, + 16402, 16423, 16424, 16405, + 16422, 16425, 16424, 16423, + 16426, 16427, 16424, 16425, + 16406, 16405, 16424, 16427, + 16406, 16427, 16428, 16409, + 16426, 16429, 16428, 16427, + 16430, 16431, 16428, 16429, + 16410, 16409, 16428, 16431, + 16410, 16431, 16432, 16413, + 16430, 16433, 16432, 16431, + 16434, 16435, 16432, 16433, + 16414, 16413, 16432, 16435, + 16414, 16435, 16436, 16417, + 16434, 16437, 16436, 16435, + 16438, 16439, 16436, 16437, + 16418, 16417, 16436, 16439, + 7120, 7118, 16440, 16421, + 7114, 16441, 16440, 7118, + 16442, 16443, 16440, 16441, + 16422, 16421, 16440, 16443, + 16422, 16443, 16444, 16425, + 16442, 16445, 16444, 16443, + 16446, 16447, 16444, 16445, + 16426, 16425, 16444, 16447, + 16426, 16447, 16448, 16429, + 16446, 16449, 16448, 16447, + 16450, 16451, 16448, 16449, + 16430, 16429, 16448, 16451, + 16430, 16451, 16452, 16433, + 16450, 16453, 16452, 16451, + 16454, 16455, 16452, 16453, + 16434, 16433, 16452, 16455, + 16434, 16455, 16456, 16437, + 16454, 16457, 16456, 16455, + 16458, 16459, 16456, 16457, + 16438, 16437, 16456, 16459, + 7114, 7112, 16460, 16441, + 7108, 16461, 16460, 7112, + 16462, 16463, 16460, 16461, + 16442, 16441, 16460, 16463, + 16442, 16463, 16464, 16445, + 16462, 16465, 16464, 16463, + 16466, 16467, 16464, 16465, + 16446, 16445, 16464, 16467, + 16446, 16467, 16468, 16449, + 16466, 16469, 16468, 16467, + 16470, 16471, 16468, 16469, + 16450, 16449, 16468, 16471, + 16450, 16471, 16472, 16453, + 16470, 16473, 16472, 16471, + 16474, 16475, 16472, 16473, + 16454, 16453, 16472, 16475, + 16454, 16475, 16476, 16457, + 16474, 16477, 16476, 16475, + 16478, 16479, 16476, 16477, + 16458, 16457, 16476, 16479, + 7108, 7106, 16480, 16461, + 7102, 16481, 16480, 7106, + 16482, 16483, 16480, 16481, + 16462, 16461, 16480, 16483, + 16462, 16483, 16484, 16465, + 16482, 16485, 16484, 16483, + 16486, 16487, 16484, 16485, + 16466, 16465, 16484, 16487, + 16466, 16487, 16488, 16469, + 16486, 16489, 16488, 16487, + 16490, 16491, 16488, 16489, + 16470, 16469, 16488, 16491, + 16470, 16491, 16492, 16473, + 16490, 16493, 16492, 16491, + 16494, 16495, 16492, 16493, + 16474, 16473, 16492, 16495, + 16474, 16495, 16496, 16477, + 16494, 16497, 16496, 16495, + 16498, 16499, 16496, 16497, + 16478, 16477, 16496, 16499, + 7102, 7100, 16500, 16481, + 7096, 16501, 16500, 7100, + 16502, 16503, 16500, 16501, + 16482, 16481, 16500, 16503, + 16482, 16503, 16504, 16485, + 16502, 16505, 16504, 16503, + 16506, 16507, 16504, 16505, + 16486, 16485, 16504, 16507, + 16486, 16507, 16508, 16489, + 16506, 16509, 16508, 16507, + 16510, 16511, 16508, 16509, + 16490, 16489, 16508, 16511, + 16490, 16511, 16512, 16493, + 16510, 16513, 16512, 16511, + 16514, 16515, 16512, 16513, + 16494, 16493, 16512, 16515, + 16494, 16515, 16516, 16497, + 16514, 16517, 16516, 16515, + 16518, 16519, 16516, 16517, + 16498, 16497, 16516, 16519, + 7096, 7094, 16520, 16501, + 7090, 16521, 16520, 7094, + 16522, 16523, 16520, 16521, + 16502, 16501, 16520, 16523, + 16502, 16523, 16524, 16505, + 16522, 16525, 16524, 16523, + 16526, 16527, 16524, 16525, + 16506, 16505, 16524, 16527, + 16506, 16527, 16528, 16509, + 16526, 16529, 16528, 16527, + 16530, 16531, 16528, 16529, + 16510, 16509, 16528, 16531, + 16510, 16531, 16532, 16513, + 16530, 16533, 16532, 16531, + 16534, 16535, 16532, 16533, + 16514, 16513, 16532, 16535, + 16514, 16535, 16536, 16517, + 16534, 16537, 16536, 16535, + 16538, 16539, 16536, 16537, + 16518, 16517, 16536, 16539, + 7090, 7088, 16540, 16521, + 7084, 16541, 16540, 7088, + 16542, 16543, 16540, 16541, + 16522, 16521, 16540, 16543, + 16522, 16543, 16544, 16525, + 16542, 16545, 16544, 16543, + 16546, 16547, 16544, 16545, + 16526, 16525, 16544, 16547, + 16526, 16547, 16548, 16529, + 16546, 16549, 16548, 16547, + 16550, 16551, 16548, 16549, + 16530, 16529, 16548, 16551, + 16530, 16551, 16552, 16533, + 16550, 16553, 16552, 16551, + 16554, 16555, 16552, 16553, + 16534, 16533, 16552, 16555, + 16534, 16555, 16556, 16537, + 16554, 16557, 16556, 16555, + 16558, 16559, 16556, 16557, + 16538, 16537, 16556, 16559, + 7084, 7082, 16560, 16541, + 7078, 16561, 16560, 7082, + 16562, 16563, 16560, 16561, + 16542, 16541, 16560, 16563, + 16542, 16563, 16564, 16545, + 16562, 16565, 16564, 16563, + 16566, 16567, 16564, 16565, + 16546, 16545, 16564, 16567, + 16546, 16567, 16568, 16549, + 16566, 16569, 16568, 16567, + 16570, 16571, 16568, 16569, + 16550, 16549, 16568, 16571, + 16550, 16571, 16572, 16553, + 16570, 16573, 16572, 16571, + 16574, 16575, 16572, 16573, + 16554, 16553, 16572, 16575, + 16554, 16575, 16576, 16557, + 16574, 16577, 16576, 16575, + 16578, 16579, 16576, 16577, + 16558, 16557, 16576, 16579, + 7078, 7076, 16580, 16561, + 7072, 16581, 16580, 7076, + 16582, 16583, 16580, 16581, + 16562, 16561, 16580, 16583, + 16562, 16583, 16584, 16565, + 16582, 16585, 16584, 16583, + 16586, 16587, 16584, 16585, + 16566, 16565, 16584, 16587, + 16566, 16587, 16588, 16569, + 16586, 16589, 16588, 16587, + 16590, 16591, 16588, 16589, + 16570, 16569, 16588, 16591, + 16570, 16591, 16592, 16573, + 16590, 16593, 16592, 16591, + 16594, 16595, 16592, 16593, + 16574, 16573, 16592, 16595, + 16574, 16595, 16596, 16577, + 16594, 16597, 16596, 16595, + 16598, 16599, 16596, 16597, + 16578, 16577, 16596, 16599, + 7072, 7070, 16600, 16581, + 7066, 16601, 16600, 7070, + 16602, 16603, 16600, 16601, + 16582, 16581, 16600, 16603, + 16582, 16603, 16604, 16585, + 16602, 16605, 16604, 16603, + 16606, 16607, 16604, 16605, + 16586, 16585, 16604, 16607, + 16586, 16607, 16608, 16589, + 16606, 16609, 16608, 16607, + 16610, 16611, 16608, 16609, + 16590, 16589, 16608, 16611, + 16590, 16611, 16612, 16593, + 16610, 16613, 16612, 16611, + 16614, 16615, 16612, 16613, + 16594, 16593, 16612, 16615, + 16594, 16615, 16616, 16597, + 16614, 16617, 16616, 16615, + 16618, 16619, 16616, 16617, + 16598, 16597, 16616, 16619, + 7066, 7064, 16620, 16601, + 3762, 14658, 16620, 7064, + 14657, 16621, 16620, 14658, + 16602, 16601, 16620, 16621, + 16602, 16621, 16622, 16605, + 14657, 14654, 16622, 16621, + 14653, 16623, 16622, 14654, + 16606, 16605, 16622, 16623, + 16606, 16623, 16624, 16609, + 14653, 14650, 16624, 16623, + 14649, 16625, 16624, 14650, + 16610, 16609, 16624, 16625, + 16610, 16625, 16626, 16613, + 14649, 14646, 16626, 16625, + 14645, 16627, 16626, 14646, + 16614, 16613, 16626, 16627, + 16614, 16627, 16628, 16617, + 14645, 14641, 16628, 16627, + 14640, 16629, 16628, 14641, + 16618, 16617, 16628, 16629, + 16630, 16631, 16632, 16633, + 16634, 16633, 16632, 16635, + 13994, 16635, 16632, 13993, + 13990, 13993, 16632, 16631, + 16636, 16637, 16638, 16639, + 16630, 16639, 16638, 16631, + 13990, 16631, 16638, 14023, + 14020, 14023, 16638, 16637, + 16640, 16641, 16642, 16643, + 16636, 16643, 16642, 16637, + 14020, 16637, 16642, 14043, + 14040, 14043, 16642, 16641, + 16644, 16645, 16646, 16647, + 16640, 16647, 16646, 16641, + 14040, 16641, 16646, 14063, + 14060, 14063, 16646, 16645, + 16648, 16649, 16650, 16651, + 16644, 16651, 16650, 16645, + 14060, 16645, 16650, 14083, + 14080, 14083, 16650, 16649, + 16652, 16653, 16654, 16655, + 16648, 16655, 16654, 16649, + 14080, 16649, 16654, 14103, + 14100, 14103, 16654, 16653, + 16656, 16657, 16658, 16659, + 16652, 16659, 16658, 16653, + 14100, 16653, 16658, 14123, + 14120, 14123, 16658, 16657, + 16660, 16661, 16662, 16663, + 16656, 16663, 16662, 16657, + 14120, 16657, 16662, 14143, + 14140, 14143, 16662, 16661, + 16664, 16665, 16666, 16667, + 16660, 16667, 16666, 16661, + 14140, 16661, 16666, 14163, + 14160, 14163, 16666, 16665, + 16668, 16669, 16670, 16671, + 16664, 16671, 16670, 16665, + 14160, 16665, 16670, 14183, + 14180, 14183, 16670, 16669, + 16672, 16673, 16674, 16675, + 16668, 16675, 16674, 16669, + 14180, 16669, 16674, 14203, + 14200, 14203, 16674, 16673, + 16676, 16677, 16678, 16679, + 16672, 16679, 16678, 16673, + 14200, 16673, 16678, 14223, + 14220, 14223, 16678, 16677, + 16680, 16681, 16682, 16683, + 16676, 16683, 16682, 16677, + 14220, 16677, 16682, 14243, + 14240, 14243, 16682, 16681, + 16684, 16685, 16686, 16687, + 16680, 16687, 16686, 16681, + 14240, 16681, 16686, 14263, + 14260, 14263, 16686, 16685, + 16688, 16689, 16690, 16691, + 16684, 16691, 16690, 16685, + 14260, 16685, 16690, 14283, + 14280, 14283, 16690, 16689, + 16692, 16693, 16694, 16695, + 16688, 16695, 16694, 16689, + 14280, 16689, 16694, 14303, + 14300, 14303, 16694, 16693, + 16696, 16697, 16698, 16699, + 16692, 16699, 16698, 16693, + 14300, 16693, 16698, 14323, + 14320, 14323, 16698, 16697, + 16700, 16701, 16702, 16703, + 16696, 16703, 16702, 16697, + 14320, 16697, 16702, 14343, + 14340, 14343, 16702, 16701, + 16704, 16705, 16706, 16707, + 16700, 16707, 16706, 16701, + 14340, 16701, 16706, 14363, + 14360, 14363, 16706, 16705, + 16708, 16709, 16710, 16711, + 16704, 16711, 16710, 16705, + 14360, 16705, 16710, 14383, + 14380, 14383, 16710, 16709, + 16712, 16713, 16714, 16715, + 16708, 16715, 16714, 16709, + 14380, 16709, 16714, 14403, + 14400, 14403, 16714, 16713, + 16716, 16717, 16718, 16719, + 16712, 16719, 16718, 16713, + 14400, 16713, 16718, 14423, + 14420, 14423, 16718, 16717, + 16720, 16721, 16722, 16723, + 16716, 16723, 16722, 16717, + 14420, 16717, 16722, 14443, + 14440, 14443, 16722, 16721, + 16724, 16725, 16726, 16727, + 16720, 16727, 16726, 16721, + 14440, 16721, 16726, 14463, + 14460, 14463, 16726, 16725, + 16728, 16729, 16730, 16731, + 16724, 16731, 16730, 16725, + 14460, 16725, 16730, 14483, + 14480, 14483, 16730, 16729, + 16732, 16733, 16734, 16735, + 16728, 16735, 16734, 16729, + 14480, 16729, 16734, 14503, + 14500, 14503, 16734, 16733, + 16736, 16737, 16738, 16739, + 16732, 16739, 16738, 16733, + 14500, 16733, 16738, 14523, + 14520, 14523, 16738, 16737, + 16740, 16741, 16742, 16743, + 16736, 16743, 16742, 16737, + 14520, 16737, 16742, 14543, + 14540, 14543, 16742, 16741, + 16744, 16745, 16746, 16747, + 16740, 16747, 16746, 16741, + 14540, 16741, 16746, 14563, + 14560, 14563, 16746, 16745, + 16748, 16749, 16750, 16751, + 16744, 16751, 16750, 16745, + 14560, 16745, 16750, 14583, + 14580, 14583, 16750, 16749, + 16752, 16753, 16754, 16755, + 16748, 16755, 16754, 16749, + 14580, 16749, 16754, 14603, + 14600, 14603, 16754, 16753, + 16756, 16757, 16758, 16759, + 16752, 16759, 16758, 16753, + 14600, 16753, 16758, 14623, + 14620, 14623, 16758, 16757, + 16760, 16761, 16762, 16763, + 16756, 16763, 16762, 16757, + 14620, 16757, 16762, 14643, + 14640, 14643, 16762, 16761, + 13994, 14679, 16764, 16635, + 14678, 16765, 16764, 14679, + 16766, 16767, 16764, 16765, + 16634, 16635, 16764, 16767, + 14678, 14699, 16768, 16765, + 14698, 16769, 16768, 14699, + 16770, 16771, 16768, 16769, + 16766, 16765, 16768, 16771, + 14698, 14719, 16772, 16769, + 14718, 16773, 16772, 14719, + 16774, 16775, 16772, 16773, + 16770, 16769, 16772, 16775, + 14718, 14739, 16776, 16773, + 14738, 16777, 16776, 14739, + 16778, 16779, 16776, 16777, + 16774, 16773, 16776, 16779, + 14738, 14759, 16780, 16777, + 14758, 16781, 16780, 14759, + 16782, 16783, 16780, 16781, + 16778, 16777, 16780, 16783, + 14758, 14779, 16784, 16781, + 14778, 16785, 16784, 14779, + 16786, 16787, 16784, 16785, + 16782, 16781, 16784, 16787, + 14778, 14799, 16788, 16785, + 14798, 16789, 16788, 14799, + 16790, 16791, 16788, 16789, + 16786, 16785, 16788, 16791, + 14798, 14819, 16792, 16789, + 14818, 16793, 16792, 14819, + 16794, 16795, 16792, 16793, + 16790, 16789, 16792, 16795, + 14818, 14839, 16796, 16793, + 14838, 16797, 16796, 14839, + 16798, 16799, 16796, 16797, + 16794, 16793, 16796, 16799, + 14838, 14859, 16800, 16797, + 14858, 16801, 16800, 14859, + 16802, 16803, 16800, 16801, + 16798, 16797, 16800, 16803, + 14858, 14879, 16804, 16801, + 14878, 16805, 16804, 14879, + 16806, 16807, 16804, 16805, + 16802, 16801, 16804, 16807, + 14878, 14899, 16808, 16805, + 14898, 16809, 16808, 14899, + 16810, 16811, 16808, 16809, + 16806, 16805, 16808, 16811, + 14898, 14919, 16812, 16809, + 14918, 16813, 16812, 14919, + 16814, 16815, 16812, 16813, + 16810, 16809, 16812, 16815, + 14918, 14939, 16816, 16813, + 14938, 16817, 16816, 14939, + 16818, 16819, 16816, 16817, + 16814, 16813, 16816, 16819, + 14938, 14959, 16820, 16817, + 14958, 16821, 16820, 14959, + 16822, 16823, 16820, 16821, + 16818, 16817, 16820, 16823, + 14958, 14979, 16824, 16821, + 14978, 16825, 16824, 14979, + 16826, 16827, 16824, 16825, + 16822, 16821, 16824, 16827, + 14978, 14999, 16828, 16825, + 14998, 16829, 16828, 14999, + 16830, 16831, 16828, 16829, + 16826, 16825, 16828, 16831, + 14998, 15019, 16832, 16829, + 15018, 16833, 16832, 15019, + 16834, 16835, 16832, 16833, + 16830, 16829, 16832, 16835, + 15018, 15039, 16836, 16833, + 15038, 16837, 16836, 15039, + 16838, 16839, 16836, 16837, + 16834, 16833, 16836, 16839, + 15038, 15059, 16840, 16837, + 15058, 16841, 16840, 15059, + 16842, 16843, 16840, 16841, + 16838, 16837, 16840, 16843, + 15058, 15079, 16844, 16841, + 15078, 16845, 16844, 15079, + 16846, 16847, 16844, 16845, + 16842, 16841, 16844, 16847, + 15078, 15099, 16848, 16845, + 15098, 16849, 16848, 15099, + 16850, 16851, 16848, 16849, + 16846, 16845, 16848, 16851, + 15098, 15119, 16852, 16849, + 15118, 16853, 16852, 15119, + 16854, 16855, 16852, 16853, + 16850, 16849, 16852, 16855, + 15118, 15139, 16856, 16853, + 15138, 16857, 16856, 15139, + 16858, 16859, 16856, 16857, + 16854, 16853, 16856, 16859, + 15138, 15159, 16860, 16857, + 15158, 16861, 16860, 15159, + 16862, 16863, 16860, 16861, + 16858, 16857, 16860, 16863, + 15158, 15179, 16864, 16861, + 15178, 16865, 16864, 15179, + 16866, 16867, 16864, 16865, + 16862, 16861, 16864, 16867, + 15178, 15199, 16868, 16865, + 15198, 16869, 16868, 15199, + 16870, 16871, 16868, 16869, + 16866, 16865, 16868, 16871, + 15198, 15219, 16872, 16869, + 15218, 16873, 16872, 15219, + 16874, 16875, 16872, 16873, + 16870, 16869, 16872, 16875, + 15218, 15239, 16876, 16873, + 15238, 16877, 16876, 15239, + 16878, 16879, 16876, 16877, + 16874, 16873, 16876, 16879, + 15238, 15259, 16880, 16877, + 15258, 16881, 16880, 15259, + 16882, 16883, 16880, 16881, + 16878, 16877, 16880, 16883, + 15258, 15279, 16884, 16881, + 15278, 16885, 16884, 15279, + 16886, 16887, 16884, 16885, + 16882, 16881, 16884, 16887, + 15278, 15299, 16888, 16885, + 15298, 16889, 16888, 15299, + 16890, 16891, 16888, 16889, + 16886, 16885, 16888, 16891, + 15298, 15319, 16892, 16889, + 15318, 16893, 16892, 15319, + 16894, 16895, 16892, 16893, + 16890, 16889, 16892, 16895, + 15318, 15339, 16896, 16893, + 15338, 16897, 16896, 15339, + 16898, 16899, 16896, 16897, + 16894, 16893, 16896, 16899, + 15338, 15359, 16900, 16897, + 15358, 16901, 16900, 15359, + 16902, 16903, 16900, 16901, + 16898, 16897, 16900, 16903, + 15358, 15379, 16904, 16901, + 15378, 16905, 16904, 15379, + 16906, 16907, 16904, 16905, + 16902, 16901, 16904, 16907, + 15378, 15399, 16908, 16905, + 15398, 16909, 16908, 15399, + 16910, 16911, 16908, 16909, + 16906, 16905, 16908, 16911, + 15398, 15419, 16912, 16909, + 15418, 16913, 16912, 15419, + 16914, 16915, 16912, 16913, + 16910, 16909, 16912, 16915, + 15418, 15439, 16916, 16913, + 15438, 16917, 16916, 15439, + 16918, 16919, 16916, 16917, + 16914, 16913, 16916, 16919, + 15438, 15459, 16920, 16917, + 15458, 16921, 16920, 15459, + 16922, 16923, 16920, 16921, + 16918, 16917, 16920, 16923, + 15458, 15479, 16924, 16921, + 15478, 16925, 16924, 15479, + 16926, 16927, 16924, 16925, + 16922, 16921, 16924, 16927, + 15478, 15499, 16928, 16925, + 15498, 16929, 16928, 15499, + 16930, 16931, 16928, 16929, + 16926, 16925, 16928, 16931, + 15498, 15519, 16932, 16929, + 15518, 16933, 16932, 15519, + 16934, 16935, 16932, 16933, + 16930, 16929, 16932, 16935, + 15518, 15539, 16936, 16933, + 15538, 16937, 16936, 15539, + 16938, 16939, 16936, 16937, + 16934, 16933, 16936, 16939, + 15538, 15559, 16940, 16937, + 15558, 16941, 16940, 15559, + 16942, 16943, 16940, 16941, + 16938, 16937, 16940, 16943, + 15558, 15579, 16944, 16941, + 15578, 16945, 16944, 15579, + 16946, 16947, 16944, 16945, + 16942, 16941, 16944, 16947, + 15578, 15599, 16948, 16945, + 15598, 16949, 16948, 15599, + 16950, 16951, 16948, 16949, + 16946, 16945, 16948, 16951, + 15598, 15619, 16952, 16949, + 15618, 16953, 16952, 15619, + 16954, 16955, 16952, 16953, + 16950, 16949, 16952, 16955, + 15618, 15639, 16956, 16953, + 15638, 16957, 16956, 15639, + 16958, 16959, 16956, 16957, + 16954, 16953, 16956, 16959, + 15638, 15659, 16960, 16957, + 15658, 16961, 16960, 15659, + 16962, 16963, 16960, 16961, + 16958, 16957, 16960, 16963, + 15658, 15679, 16964, 16961, + 15678, 16965, 16964, 15679, + 16966, 16967, 16964, 16965, + 16962, 16961, 16964, 16967, + 15678, 15699, 16968, 16965, + 15698, 16969, 16968, 15699, + 16970, 16971, 16968, 16969, + 16966, 16965, 16968, 16971, + 15698, 15719, 16972, 16969, + 15718, 16973, 16972, 15719, + 16974, 16975, 16972, 16973, + 16970, 16969, 16972, 16975, + 15718, 15739, 16976, 16973, + 15738, 16977, 16976, 15739, + 16978, 16979, 16976, 16977, + 16974, 16973, 16976, 16979, + 15738, 15759, 16980, 16977, + 15758, 16981, 16980, 15759, + 16982, 16983, 16980, 16981, + 16978, 16977, 16980, 16983, + 15758, 15779, 16984, 16981, + 15778, 16985, 16984, 15779, + 16986, 16987, 16984, 16985, + 16982, 16981, 16984, 16987, + 15778, 15799, 16988, 16985, + 15798, 16989, 16988, 15799, + 16990, 16991, 16988, 16989, + 16986, 16985, 16988, 16991, + 15798, 15819, 16992, 16989, + 15818, 16993, 16992, 15819, + 16994, 16995, 16992, 16993, + 16990, 16989, 16992, 16995, + 15818, 15839, 16996, 16993, + 15838, 16997, 16996, 15839, + 16998, 16999, 16996, 16997, + 16994, 16993, 16996, 16999, + 15838, 15859, 17000, 16997, + 15858, 17001, 17000, 15859, + 17002, 17003, 17000, 17001, + 16998, 16997, 17000, 17003, + 15858, 15879, 17004, 17001, + 15878, 17005, 17004, 15879, + 17006, 17007, 17004, 17005, + 17002, 17001, 17004, 17007, + 15878, 15899, 17008, 17005, + 15898, 17009, 17008, 15899, + 17010, 17011, 17008, 17009, + 17006, 17005, 17008, 17011, + 15898, 15919, 17012, 17009, + 15918, 17013, 17012, 15919, + 17014, 17015, 17012, 17013, + 17010, 17009, 17012, 17015, + 15918, 15939, 17016, 17013, + 15938, 17017, 17016, 15939, + 17018, 17019, 17016, 17017, + 17014, 17013, 17016, 17019, + 15938, 15959, 17020, 17017, + 15958, 17021, 17020, 15959, + 17022, 17023, 17020, 17021, + 17018, 17017, 17020, 17023, + 15958, 15979, 17024, 17021, + 15978, 17025, 17024, 15979, + 17026, 17027, 17024, 17025, + 17022, 17021, 17024, 17027, + 15978, 15999, 17028, 17025, + 15998, 17029, 17028, 15999, + 17030, 17031, 17028, 17029, + 17026, 17025, 17028, 17031, + 15998, 16019, 17032, 17029, + 16018, 17033, 17032, 16019, + 17034, 17035, 17032, 17033, + 17030, 17029, 17032, 17035, + 16018, 16039, 17036, 17033, + 16038, 17037, 17036, 16039, + 17038, 17039, 17036, 17037, + 17034, 17033, 17036, 17039, + 16038, 16059, 17040, 17037, + 16058, 17041, 17040, 16059, + 17042, 17043, 17040, 17041, + 17038, 17037, 17040, 17043, + 16058, 16079, 17044, 17041, + 16078, 17045, 17044, 16079, + 17046, 17047, 17044, 17045, + 17042, 17041, 17044, 17047, + 16078, 16099, 17048, 17045, + 16098, 17049, 17048, 16099, + 17050, 17051, 17048, 17049, + 17046, 17045, 17048, 17051, + 16098, 16119, 17052, 17049, + 16118, 17053, 17052, 16119, + 17054, 17055, 17052, 17053, + 17050, 17049, 17052, 17055, + 16118, 16139, 17056, 17053, + 16138, 17057, 17056, 16139, + 17058, 17059, 17056, 17057, + 17054, 17053, 17056, 17059, + 16138, 16159, 17060, 17057, + 16158, 17061, 17060, 16159, + 17062, 17063, 17060, 17061, + 17058, 17057, 17060, 17063, + 16158, 16179, 17064, 17061, + 16178, 17065, 17064, 16179, + 17066, 17067, 17064, 17065, + 17062, 17061, 17064, 17067, + 16178, 16199, 17068, 17065, + 16198, 17069, 17068, 16199, + 17070, 17071, 17068, 17069, + 17066, 17065, 17068, 17071, + 16198, 16219, 17072, 17069, + 16218, 17073, 17072, 16219, + 17074, 17075, 17072, 17073, + 17070, 17069, 17072, 17075, + 16218, 16239, 17076, 17073, + 16238, 17077, 17076, 16239, + 17078, 17079, 17076, 17077, + 17074, 17073, 17076, 17079, + 16238, 16259, 17080, 17077, + 16258, 17081, 17080, 16259, + 17082, 17083, 17080, 17081, + 17078, 17077, 17080, 17083, + 16258, 16279, 17084, 17081, + 16278, 17085, 17084, 16279, + 17086, 17087, 17084, 17085, + 17082, 17081, 17084, 17087, + 16278, 16299, 17088, 17085, + 16298, 17089, 17088, 16299, + 17090, 17091, 17088, 17089, + 17086, 17085, 17088, 17091, + 16298, 16319, 17092, 17089, + 16318, 17093, 17092, 16319, + 17094, 17095, 17092, 17093, + 17090, 17089, 17092, 17095, + 16318, 16339, 17096, 17093, + 16338, 17097, 17096, 16339, + 17098, 17099, 17096, 17097, + 17094, 17093, 17096, 17099, + 16338, 16359, 17100, 17097, + 16358, 17101, 17100, 16359, + 17102, 17103, 17100, 17101, + 17098, 17097, 17100, 17103, + 16358, 16379, 17104, 17101, + 16378, 17105, 17104, 16379, + 17106, 17107, 17104, 17105, + 17102, 17101, 17104, 17107, + 16378, 16399, 17108, 17105, + 16398, 17109, 17108, 16399, + 17110, 17111, 17108, 17109, + 17106, 17105, 17108, 17111, + 16398, 16419, 17112, 17109, + 16418, 17113, 17112, 16419, + 17114, 17115, 17112, 17113, + 17110, 17109, 17112, 17115, + 16418, 16439, 17116, 17113, + 16438, 17117, 17116, 16439, + 17118, 17119, 17116, 17117, + 17114, 17113, 17116, 17119, + 16438, 16459, 17120, 17117, + 16458, 17121, 17120, 16459, + 17122, 17123, 17120, 17121, + 17118, 17117, 17120, 17123, + 16458, 16479, 17124, 17121, + 16478, 17125, 17124, 16479, + 17126, 17127, 17124, 17125, + 17122, 17121, 17124, 17127, + 16478, 16499, 17128, 17125, + 16498, 17129, 17128, 16499, + 17130, 17131, 17128, 17129, + 17126, 17125, 17128, 17131, + 16498, 16519, 17132, 17129, + 16518, 17133, 17132, 16519, + 17134, 17135, 17132, 17133, + 17130, 17129, 17132, 17135, + 16518, 16539, 17136, 17133, + 16538, 17137, 17136, 16539, + 17138, 17139, 17136, 17137, + 17134, 17133, 17136, 17139, + 16538, 16559, 17140, 17137, + 16558, 17141, 17140, 16559, + 17142, 17143, 17140, 17141, + 17138, 17137, 17140, 17143, + 16558, 16579, 17144, 17141, + 16578, 17145, 17144, 16579, + 17146, 17147, 17144, 17145, + 17142, 17141, 17144, 17147, + 16578, 16599, 17148, 17145, + 16598, 17149, 17148, 16599, + 17150, 17151, 17148, 17149, + 17146, 17145, 17148, 17151, + 16598, 16619, 17152, 17149, + 16618, 17153, 17152, 16619, + 17154, 17155, 17152, 17153, + 17150, 17149, 17152, 17155, + 16618, 16629, 17156, 17153, + 14640, 16761, 17156, 16629, + 16760, 17157, 17156, 16761, + 17154, 17153, 17156, 17157, + 17158, 17159, 17160, 17161, + 17162, 17161, 17160, 17163, + 17164, 17163, 17160, 17165, + 17166, 17165, 17160, 17159, + 17166, 17167, 17168, 17165, + 17164, 17165, 17168, 17169, + 17170, 17169, 17168, 17171, + 17172, 17171, 17168, 17167, + 17172, 17173, 17174, 17171, + 17170, 17171, 17174, 17175, + 17176, 17175, 17174, 17177, + 17178, 17177, 17174, 17173, + 17178, 17179, 17180, 17177, + 17176, 17177, 17180, 17181, + 17182, 17181, 17180, 17183, + 17184, 17183, 17180, 17179, + 17184, 17185, 17186, 17183, + 17182, 17183, 17186, 17187, + 17188, 17187, 17186, 17189, + 17190, 17189, 17186, 17185, + 17190, 17191, 17192, 17189, + 17188, 17189, 17192, 17193, + 17194, 17193, 17192, 17195, + 17196, 17195, 17192, 17191, + 17196, 17197, 17198, 17195, + 17194, 17195, 17198, 17199, + 17200, 17199, 17198, 17201, + 17202, 17201, 17198, 17197, + 17202, 17203, 17204, 17201, + 17200, 17201, 17204, 17205, + 17206, 17205, 17204, 17207, + 17208, 17207, 17204, 17203, + 17208, 17209, 17210, 17207, + 17206, 17207, 17210, 17211, + 17212, 17211, 17210, 17213, + 17214, 17213, 17210, 17209, + 17214, 17215, 17216, 17213, + 17212, 17213, 17216, 17217, + 17218, 17217, 17216, 17219, + 17220, 17219, 17216, 17215, + 17220, 17221, 17222, 17219, + 17218, 17219, 17222, 17223, + 17224, 17223, 17222, 17225, + 17226, 17225, 17222, 17221, + 17226, 17227, 17228, 17225, + 17224, 17225, 17228, 17229, + 17230, 17229, 17228, 17231, + 17232, 17231, 17228, 17227, + 17232, 17233, 17234, 17231, + 17230, 17231, 17234, 17235, + 17236, 17235, 17234, 17237, + 17238, 17237, 17234, 17233, + 17238, 17239, 17240, 17237, + 17236, 17237, 17240, 17241, + 17242, 17241, 17240, 17243, + 17244, 17243, 17240, 17239, + 17244, 17245, 17246, 17243, + 17242, 17243, 17246, 17247, + 17248, 17247, 17246, 17249, + 17250, 17249, 17246, 17245, + 17250, 17251, 17252, 17249, + 17248, 17249, 17252, 17253, + 17254, 17253, 17252, 17255, + 17256, 17255, 17252, 17251, + 17256, 17257, 17258, 17255, + 17254, 17255, 17258, 17259, + 17260, 17259, 17258, 17261, + 17262, 17261, 17258, 17257, + 17262, 17263, 17264, 17261, + 17260, 17261, 17264, 17265, + 17266, 17265, 17264, 17267, + 17268, 17267, 17264, 17263, + 17268, 17269, 17270, 17267, + 17266, 17267, 17270, 17271, + 17272, 17271, 17270, 17273, + 17274, 17273, 17270, 17269, + 17274, 17275, 17276, 17273, + 17272, 17273, 17276, 17277, + 17278, 17277, 17276, 17279, + 17280, 17279, 17276, 17275, + 17280, 17281, 17282, 17279, + 17278, 17279, 17282, 17283, + 17284, 17283, 17282, 17285, + 17286, 17285, 17282, 17281, + 17286, 17287, 17288, 17285, + 17284, 17285, 17288, 17289, + 17290, 17289, 17288, 17291, + 17292, 17291, 17288, 17287, + 17292, 17293, 17294, 17291, + 17290, 17291, 17294, 17295, + 17296, 17295, 17294, 17297, + 17298, 17297, 17294, 17293, + 17298, 17299, 17300, 17297, + 17296, 17297, 17300, 17301, + 16634, 17301, 17300, 16633, + 16630, 16633, 17300, 17299, + 17302, 17303, 17304, 17305, + 17158, 17305, 17304, 17159, + 17166, 17159, 17304, 17306, + 17307, 17306, 17304, 17303, + 17307, 17308, 17309, 17306, + 17166, 17306, 17309, 17167, + 17172, 17167, 17309, 17310, + 17311, 17310, 17309, 17308, + 17311, 17312, 17313, 17310, + 17172, 17310, 17313, 17173, + 17178, 17173, 17313, 17314, + 17315, 17314, 17313, 17312, + 17315, 17316, 17317, 17314, + 17178, 17314, 17317, 17179, + 17184, 17179, 17317, 17318, + 17319, 17318, 17317, 17316, + 17319, 17320, 17321, 17318, + 17184, 17318, 17321, 17185, + 17190, 17185, 17321, 17322, + 17323, 17322, 17321, 17320, + 17323, 17324, 17325, 17322, + 17190, 17322, 17325, 17191, + 17196, 17191, 17325, 17326, + 17327, 17326, 17325, 17324, + 17327, 17328, 17329, 17326, + 17196, 17326, 17329, 17197, + 17202, 17197, 17329, 17330, + 17331, 17330, 17329, 17328, + 17331, 17332, 17333, 17330, + 17202, 17330, 17333, 17203, + 17208, 17203, 17333, 17334, + 17335, 17334, 17333, 17332, + 17335, 17336, 17337, 17334, + 17208, 17334, 17337, 17209, + 17214, 17209, 17337, 17338, + 17339, 17338, 17337, 17336, + 17339, 17340, 17341, 17338, + 17214, 17338, 17341, 17215, + 17220, 17215, 17341, 17342, + 17343, 17342, 17341, 17340, + 17343, 17344, 17345, 17342, + 17220, 17342, 17345, 17221, + 17226, 17221, 17345, 17346, + 17347, 17346, 17345, 17344, + 17347, 17348, 17349, 17346, + 17226, 17346, 17349, 17227, + 17232, 17227, 17349, 17350, + 17351, 17350, 17349, 17348, + 17351, 17352, 17353, 17350, + 17232, 17350, 17353, 17233, + 17238, 17233, 17353, 17354, + 17355, 17354, 17353, 17352, + 17355, 17356, 17357, 17354, + 17238, 17354, 17357, 17239, + 17244, 17239, 17357, 17358, + 17359, 17358, 17357, 17356, + 17359, 17360, 17361, 17358, + 17244, 17358, 17361, 17245, + 17250, 17245, 17361, 17362, + 17363, 17362, 17361, 17360, + 17363, 17364, 17365, 17362, + 17250, 17362, 17365, 17251, + 17256, 17251, 17365, 17366, + 17367, 17366, 17365, 17364, + 17367, 17368, 17369, 17366, + 17256, 17366, 17369, 17257, + 17262, 17257, 17369, 17370, + 17371, 17370, 17369, 17368, + 17371, 17372, 17373, 17370, + 17262, 17370, 17373, 17263, + 17268, 17263, 17373, 17374, + 17375, 17374, 17373, 17372, + 17375, 17376, 17377, 17374, + 17268, 17374, 17377, 17269, + 17274, 17269, 17377, 17378, + 17379, 17378, 17377, 17376, + 17379, 17380, 17381, 17378, + 17274, 17378, 17381, 17275, + 17280, 17275, 17381, 17382, + 17383, 17382, 17381, 17380, + 17383, 17384, 17385, 17382, + 17280, 17382, 17385, 17281, + 17286, 17281, 17385, 17386, + 17387, 17386, 17385, 17384, + 17387, 17388, 17389, 17386, + 17286, 17386, 17389, 17287, + 17292, 17287, 17389, 17390, + 17391, 17390, 17389, 17388, + 17391, 17392, 17393, 17390, + 17292, 17390, 17393, 17293, + 17298, 17293, 17393, 17394, + 17395, 17394, 17393, 17392, + 17395, 17396, 17397, 17394, + 17298, 17394, 17397, 17299, + 16630, 17299, 17397, 16639, + 16636, 16639, 17397, 17396, + 17398, 17399, 17400, 17401, + 17302, 17401, 17400, 17303, + 17307, 17303, 17400, 17402, + 17403, 17402, 17400, 17399, + 17403, 17404, 17405, 17402, + 17307, 17402, 17405, 17308, + 17311, 17308, 17405, 17406, + 17407, 17406, 17405, 17404, + 17407, 17408, 17409, 17406, + 17311, 17406, 17409, 17312, + 17315, 17312, 17409, 17410, + 17411, 17410, 17409, 17408, + 17411, 17412, 17413, 17410, + 17315, 17410, 17413, 17316, + 17319, 17316, 17413, 17414, + 17415, 17414, 17413, 17412, + 17415, 17416, 17417, 17414, + 17319, 17414, 17417, 17320, + 17323, 17320, 17417, 17418, + 17419, 17418, 17417, 17416, + 17419, 17420, 17421, 17418, + 17323, 17418, 17421, 17324, + 17327, 17324, 17421, 17422, + 17423, 17422, 17421, 17420, + 17423, 17424, 17425, 17422, + 17327, 17422, 17425, 17328, + 17331, 17328, 17425, 17426, + 17427, 17426, 17425, 17424, + 17427, 17428, 17429, 17426, + 17331, 17426, 17429, 17332, + 17335, 17332, 17429, 17430, + 17431, 17430, 17429, 17428, + 17431, 17432, 17433, 17430, + 17335, 17430, 17433, 17336, + 17339, 17336, 17433, 17434, + 17435, 17434, 17433, 17432, + 17435, 17436, 17437, 17434, + 17339, 17434, 17437, 17340, + 17343, 17340, 17437, 17438, + 17439, 17438, 17437, 17436, + 17439, 17440, 17441, 17438, + 17343, 17438, 17441, 17344, + 17347, 17344, 17441, 17442, + 17443, 17442, 17441, 17440, + 17443, 17444, 17445, 17442, + 17347, 17442, 17445, 17348, + 17351, 17348, 17445, 17446, + 17447, 17446, 17445, 17444, + 17447, 17448, 17449, 17446, + 17351, 17446, 17449, 17352, + 17355, 17352, 17449, 17450, + 17451, 17450, 17449, 17448, + 17451, 17452, 17453, 17450, + 17355, 17450, 17453, 17356, + 17359, 17356, 17453, 17454, + 17455, 17454, 17453, 17452, + 17455, 17456, 17457, 17454, + 17359, 17454, 17457, 17360, + 17363, 17360, 17457, 17458, + 17459, 17458, 17457, 17456, + 17459, 17460, 17461, 17458, + 17363, 17458, 17461, 17364, + 17367, 17364, 17461, 17462, + 17463, 17462, 17461, 17460, + 17463, 17464, 17465, 17462, + 17367, 17462, 17465, 17368, + 17371, 17368, 17465, 17466, + 17467, 17466, 17465, 17464, + 17467, 17468, 17469, 17466, + 17371, 17466, 17469, 17372, + 17375, 17372, 17469, 17470, + 17471, 17470, 17469, 17468, + 17471, 17472, 17473, 17470, + 17375, 17470, 17473, 17376, + 17379, 17376, 17473, 17474, + 17475, 17474, 17473, 17472, + 17475, 17476, 17477, 17474, + 17379, 17474, 17477, 17380, + 17383, 17380, 17477, 17478, + 17479, 17478, 17477, 17476, + 17479, 17480, 17481, 17478, + 17383, 17478, 17481, 17384, + 17387, 17384, 17481, 17482, + 17483, 17482, 17481, 17480, + 17483, 17484, 17485, 17482, + 17387, 17482, 17485, 17388, + 17391, 17388, 17485, 17486, + 17487, 17486, 17485, 17484, + 17487, 17488, 17489, 17486, + 17391, 17486, 17489, 17392, + 17395, 17392, 17489, 17490, + 17491, 17490, 17489, 17488, + 17491, 17492, 17493, 17490, + 17395, 17490, 17493, 17396, + 16636, 17396, 17493, 16643, + 16640, 16643, 17493, 17492, + 17494, 17495, 17496, 17497, + 17398, 17497, 17496, 17399, + 17403, 17399, 17496, 17498, + 17499, 17498, 17496, 17495, + 17499, 17500, 17501, 17498, + 17403, 17498, 17501, 17404, + 17407, 17404, 17501, 17502, + 17503, 17502, 17501, 17500, + 17503, 17504, 17505, 17502, + 17407, 17502, 17505, 17408, + 17411, 17408, 17505, 17506, + 17507, 17506, 17505, 17504, + 17507, 17508, 17509, 17506, + 17411, 17506, 17509, 17412, + 17415, 17412, 17509, 17510, + 17511, 17510, 17509, 17508, + 17511, 17512, 17513, 17510, + 17415, 17510, 17513, 17416, + 17419, 17416, 17513, 17514, + 17515, 17514, 17513, 17512, + 17515, 17516, 17517, 17514, + 17419, 17514, 17517, 17420, + 17423, 17420, 17517, 17518, + 17519, 17518, 17517, 17516, + 17519, 17520, 17521, 17518, + 17423, 17518, 17521, 17424, + 17427, 17424, 17521, 17522, + 17523, 17522, 17521, 17520, + 17523, 17524, 17525, 17522, + 17427, 17522, 17525, 17428, + 17431, 17428, 17525, 17526, + 17527, 17526, 17525, 17524, + 17527, 17528, 17529, 17526, + 17431, 17526, 17529, 17432, + 17435, 17432, 17529, 17530, + 17531, 17530, 17529, 17528, + 17531, 17532, 17533, 17530, + 17435, 17530, 17533, 17436, + 17439, 17436, 17533, 17534, + 17535, 17534, 17533, 17532, + 17535, 17536, 17537, 17534, + 17439, 17534, 17537, 17440, + 17443, 17440, 17537, 17538, + 17539, 17538, 17537, 17536, + 17539, 17540, 17541, 17538, + 17443, 17538, 17541, 17444, + 17447, 17444, 17541, 17542, + 17543, 17542, 17541, 17540, + 17543, 17544, 17545, 17542, + 17447, 17542, 17545, 17448, + 17451, 17448, 17545, 17546, + 17547, 17546, 17545, 17544, + 17547, 17548, 17549, 17546, + 17451, 17546, 17549, 17452, + 17455, 17452, 17549, 17550, + 17551, 17550, 17549, 17548, + 17551, 17552, 17553, 17550, + 17455, 17550, 17553, 17456, + 17459, 17456, 17553, 17554, + 17555, 17554, 17553, 17552, + 17555, 17556, 17557, 17554, + 17459, 17554, 17557, 17460, + 17463, 17460, 17557, 17558, + 17559, 17558, 17557, 17556, + 17559, 17560, 17561, 17558, + 17463, 17558, 17561, 17464, + 17467, 17464, 17561, 17562, + 17563, 17562, 17561, 17560, + 17563, 17564, 17565, 17562, + 17467, 17562, 17565, 17468, + 17471, 17468, 17565, 17566, + 17567, 17566, 17565, 17564, + 17567, 17568, 17569, 17566, + 17471, 17566, 17569, 17472, + 17475, 17472, 17569, 17570, + 17571, 17570, 17569, 17568, + 17571, 17572, 17573, 17570, + 17475, 17570, 17573, 17476, + 17479, 17476, 17573, 17574, + 17575, 17574, 17573, 17572, + 17575, 17576, 17577, 17574, + 17479, 17574, 17577, 17480, + 17483, 17480, 17577, 17578, + 17579, 17578, 17577, 17576, + 17579, 17580, 17581, 17578, + 17483, 17578, 17581, 17484, + 17487, 17484, 17581, 17582, + 17583, 17582, 17581, 17580, + 17583, 17584, 17585, 17582, + 17487, 17582, 17585, 17488, + 17491, 17488, 17585, 17586, + 17587, 17586, 17585, 17584, + 17587, 17588, 17589, 17586, + 17491, 17586, 17589, 17492, + 16640, 17492, 17589, 16647, + 16644, 16647, 17589, 17588, + 17590, 17591, 17592, 17593, + 17494, 17593, 17592, 17495, + 17499, 17495, 17592, 17594, + 17595, 17594, 17592, 17591, + 17595, 17596, 17597, 17594, + 17499, 17594, 17597, 17500, + 17503, 17500, 17597, 17598, + 17599, 17598, 17597, 17596, + 17599, 17600, 17601, 17598, + 17503, 17598, 17601, 17504, + 17507, 17504, 17601, 17602, + 17603, 17602, 17601, 17600, + 17603, 17604, 17605, 17602, + 17507, 17602, 17605, 17508, + 17511, 17508, 17605, 17606, + 17607, 17606, 17605, 17604, + 17607, 17608, 17609, 17606, + 17511, 17606, 17609, 17512, + 17515, 17512, 17609, 17610, + 17611, 17610, 17609, 17608, + 17611, 17612, 17613, 17610, + 17515, 17610, 17613, 17516, + 17519, 17516, 17613, 17614, + 17615, 17614, 17613, 17612, + 17615, 17616, 17617, 17614, + 17519, 17614, 17617, 17520, + 17523, 17520, 17617, 17618, + 17619, 17618, 17617, 17616, + 17619, 17620, 17621, 17618, + 17523, 17618, 17621, 17524, + 17527, 17524, 17621, 17622, + 17623, 17622, 17621, 17620, + 17623, 17624, 17625, 17622, + 17527, 17622, 17625, 17528, + 17531, 17528, 17625, 17626, + 17627, 17626, 17625, 17624, + 17627, 17628, 17629, 17626, + 17531, 17626, 17629, 17532, + 17535, 17532, 17629, 17630, + 17631, 17630, 17629, 17628, + 17631, 17632, 17633, 17630, + 17535, 17630, 17633, 17536, + 17539, 17536, 17633, 17634, + 17635, 17634, 17633, 17632, + 17635, 17636, 17637, 17634, + 17539, 17634, 17637, 17540, + 17543, 17540, 17637, 17638, + 17639, 17638, 17637, 17636, + 17639, 17640, 17641, 17638, + 17543, 17638, 17641, 17544, + 17547, 17544, 17641, 17642, + 17643, 17642, 17641, 17640, + 17643, 17644, 17645, 17642, + 17547, 17642, 17645, 17548, + 17551, 17548, 17645, 17646, + 17647, 17646, 17645, 17644, + 17647, 17648, 17649, 17646, + 17551, 17646, 17649, 17552, + 17555, 17552, 17649, 17650, + 17651, 17650, 17649, 17648, + 17651, 17652, 17653, 17650, + 17555, 17650, 17653, 17556, + 17559, 17556, 17653, 17654, + 17655, 17654, 17653, 17652, + 17655, 17656, 17657, 17654, + 17559, 17654, 17657, 17560, + 17563, 17560, 17657, 17658, + 17659, 17658, 17657, 17656, + 17659, 17660, 17661, 17658, + 17563, 17658, 17661, 17564, + 17567, 17564, 17661, 17662, + 17663, 17662, 17661, 17660, + 17663, 17664, 17665, 17662, + 17567, 17662, 17665, 17568, + 17571, 17568, 17665, 17666, + 17667, 17666, 17665, 17664, + 17667, 17668, 17669, 17666, + 17571, 17666, 17669, 17572, + 17575, 17572, 17669, 17670, + 17671, 17670, 17669, 17668, + 17671, 17672, 17673, 17670, + 17575, 17670, 17673, 17576, + 17579, 17576, 17673, 17674, + 17675, 17674, 17673, 17672, + 17675, 17676, 17677, 17674, + 17579, 17674, 17677, 17580, + 17583, 17580, 17677, 17678, + 17679, 17678, 17677, 17676, + 17679, 17680, 17681, 17678, + 17583, 17678, 17681, 17584, + 17587, 17584, 17681, 17682, + 17683, 17682, 17681, 17680, + 17683, 17684, 17685, 17682, + 17587, 17682, 17685, 17588, + 16644, 17588, 17685, 16651, + 16648, 16651, 17685, 17684, + 17686, 17687, 17688, 17689, + 17590, 17689, 17688, 17591, + 17595, 17591, 17688, 17690, + 17691, 17690, 17688, 17687, + 17691, 17692, 17693, 17690, + 17595, 17690, 17693, 17596, + 17599, 17596, 17693, 17694, + 17695, 17694, 17693, 17692, + 17695, 17696, 17697, 17694, + 17599, 17694, 17697, 17600, + 17603, 17600, 17697, 17698, + 17699, 17698, 17697, 17696, + 17699, 17700, 17701, 17698, + 17603, 17698, 17701, 17604, + 17607, 17604, 17701, 17702, + 17703, 17702, 17701, 17700, + 17703, 17704, 17705, 17702, + 17607, 17702, 17705, 17608, + 17611, 17608, 17705, 17706, + 17707, 17706, 17705, 17704, + 17707, 17708, 17709, 17706, + 17611, 17706, 17709, 17612, + 17615, 17612, 17709, 17710, + 17711, 17710, 17709, 17708, + 17711, 17712, 17713, 17710, + 17615, 17710, 17713, 17616, + 17619, 17616, 17713, 17714, + 17715, 17714, 17713, 17712, + 17715, 17716, 17717, 17714, + 17619, 17714, 17717, 17620, + 17623, 17620, 17717, 17718, + 17719, 17718, 17717, 17716, + 17719, 17720, 17721, 17718, + 17623, 17718, 17721, 17624, + 17627, 17624, 17721, 17722, + 17723, 17722, 17721, 17720, + 17723, 17724, 17725, 17722, + 17627, 17722, 17725, 17628, + 17631, 17628, 17725, 17726, + 17727, 17726, 17725, 17724, + 17727, 17728, 17729, 17726, + 17631, 17726, 17729, 17632, + 17635, 17632, 17729, 17730, + 17731, 17730, 17729, 17728, + 17731, 17732, 17733, 17730, + 17635, 17730, 17733, 17636, + 17639, 17636, 17733, 17734, + 17735, 17734, 17733, 17732, + 17735, 17736, 17737, 17734, + 17639, 17734, 17737, 17640, + 17643, 17640, 17737, 17738, + 17739, 17738, 17737, 17736, + 17739, 17740, 17741, 17738, + 17643, 17738, 17741, 17644, + 17647, 17644, 17741, 17742, + 17743, 17742, 17741, 17740, + 17743, 17744, 17745, 17742, + 17647, 17742, 17745, 17648, + 17651, 17648, 17745, 17746, + 17747, 17746, 17745, 17744, + 17747, 17748, 17749, 17746, + 17651, 17746, 17749, 17652, + 17655, 17652, 17749, 17750, + 17751, 17750, 17749, 17748, + 17751, 17752, 17753, 17750, + 17655, 17750, 17753, 17656, + 17659, 17656, 17753, 17754, + 17755, 17754, 17753, 17752, + 17755, 17756, 17757, 17754, + 17659, 17754, 17757, 17660, + 17663, 17660, 17757, 17758, + 17759, 17758, 17757, 17756, + 17759, 17760, 17761, 17758, + 17663, 17758, 17761, 17664, + 17667, 17664, 17761, 17762, + 17763, 17762, 17761, 17760, + 17763, 17764, 17765, 17762, + 17667, 17762, 17765, 17668, + 17671, 17668, 17765, 17766, + 17767, 17766, 17765, 17764, + 17767, 17768, 17769, 17766, + 17671, 17766, 17769, 17672, + 17675, 17672, 17769, 17770, + 17771, 17770, 17769, 17768, + 17771, 17772, 17773, 17770, + 17675, 17770, 17773, 17676, + 17679, 17676, 17773, 17774, + 17775, 17774, 17773, 17772, + 17775, 17776, 17777, 17774, + 17679, 17774, 17777, 17680, + 17683, 17680, 17777, 17778, + 17779, 17778, 17777, 17776, + 17779, 17780, 17781, 17778, + 17683, 17778, 17781, 17684, + 16648, 17684, 17781, 16655, + 16652, 16655, 17781, 17780, + 17782, 17783, 17784, 17785, + 17686, 17785, 17784, 17687, + 17691, 17687, 17784, 17786, + 17787, 17786, 17784, 17783, + 17787, 17788, 17789, 17786, + 17691, 17786, 17789, 17692, + 17695, 17692, 17789, 17790, + 17791, 17790, 17789, 17788, + 17791, 17792, 17793, 17790, + 17695, 17790, 17793, 17696, + 17699, 17696, 17793, 17794, + 17795, 17794, 17793, 17792, + 17795, 17796, 17797, 17794, + 17699, 17794, 17797, 17700, + 17703, 17700, 17797, 17798, + 17799, 17798, 17797, 17796, + 17799, 17800, 17801, 17798, + 17703, 17798, 17801, 17704, + 17707, 17704, 17801, 17802, + 17803, 17802, 17801, 17800, + 17803, 17804, 17805, 17802, + 17707, 17802, 17805, 17708, + 17711, 17708, 17805, 17806, + 17807, 17806, 17805, 17804, + 17807, 17808, 17809, 17806, + 17711, 17806, 17809, 17712, + 17715, 17712, 17809, 17810, + 17811, 17810, 17809, 17808, + 17811, 17812, 17813, 17810, + 17715, 17810, 17813, 17716, + 17719, 17716, 17813, 17814, + 17815, 17814, 17813, 17812, + 17815, 17816, 17817, 17814, + 17719, 17814, 17817, 17720, + 17723, 17720, 17817, 17818, + 17819, 17818, 17817, 17816, + 17819, 17820, 17821, 17818, + 17723, 17818, 17821, 17724, + 17727, 17724, 17821, 17822, + 17823, 17822, 17821, 17820, + 17823, 17824, 17825, 17822, + 17727, 17822, 17825, 17728, + 17731, 17728, 17825, 17826, + 17827, 17826, 17825, 17824, + 17827, 17828, 17829, 17826, + 17731, 17826, 17829, 17732, + 17735, 17732, 17829, 17830, + 17831, 17830, 17829, 17828, + 17831, 17832, 17833, 17830, + 17735, 17830, 17833, 17736, + 17739, 17736, 17833, 17834, + 17835, 17834, 17833, 17832, + 17835, 17836, 17837, 17834, + 17739, 17834, 17837, 17740, + 17743, 17740, 17837, 17838, + 17839, 17838, 17837, 17836, + 17839, 17840, 17841, 17838, + 17743, 17838, 17841, 17744, + 17747, 17744, 17841, 17842, + 17843, 17842, 17841, 17840, + 17843, 17844, 17845, 17842, + 17747, 17842, 17845, 17748, + 17751, 17748, 17845, 17846, + 17847, 17846, 17845, 17844, + 17847, 17848, 17849, 17846, + 17751, 17846, 17849, 17752, + 17755, 17752, 17849, 17850, + 17851, 17850, 17849, 17848, + 17851, 17852, 17853, 17850, + 17755, 17850, 17853, 17756, + 17759, 17756, 17853, 17854, + 17855, 17854, 17853, 17852, + 17855, 17856, 17857, 17854, + 17759, 17854, 17857, 17760, + 17763, 17760, 17857, 17858, + 17859, 17858, 17857, 17856, + 17859, 17860, 17861, 17858, + 17763, 17858, 17861, 17764, + 17767, 17764, 17861, 17862, + 17863, 17862, 17861, 17860, + 17863, 17864, 17865, 17862, + 17767, 17862, 17865, 17768, + 17771, 17768, 17865, 17866, + 17867, 17866, 17865, 17864, + 17867, 17868, 17869, 17866, + 17771, 17866, 17869, 17772, + 17775, 17772, 17869, 17870, + 17871, 17870, 17869, 17868, + 17871, 17872, 17873, 17870, + 17775, 17870, 17873, 17776, + 17779, 17776, 17873, 17874, + 17875, 17874, 17873, 17872, + 17875, 17876, 17877, 17874, + 17779, 17874, 17877, 17780, + 16652, 17780, 17877, 16659, + 16656, 16659, 17877, 17876, + 17878, 17879, 17880, 17881, + 17782, 17881, 17880, 17783, + 17787, 17783, 17880, 17882, + 17883, 17882, 17880, 17879, + 17883, 17884, 17885, 17882, + 17787, 17882, 17885, 17788, + 17791, 17788, 17885, 17886, + 17887, 17886, 17885, 17884, + 17887, 17888, 17889, 17886, + 17791, 17886, 17889, 17792, + 17795, 17792, 17889, 17890, + 17891, 17890, 17889, 17888, + 17891, 17892, 17893, 17890, + 17795, 17890, 17893, 17796, + 17799, 17796, 17893, 17894, + 17895, 17894, 17893, 17892, + 17895, 17896, 17897, 17894, + 17799, 17894, 17897, 17800, + 17803, 17800, 17897, 17898, + 17899, 17898, 17897, 17896, + 17899, 17900, 17901, 17898, + 17803, 17898, 17901, 17804, + 17807, 17804, 17901, 17902, + 17903, 17902, 17901, 17900, + 17903, 17904, 17905, 17902, + 17807, 17902, 17905, 17808, + 17811, 17808, 17905, 17906, + 17907, 17906, 17905, 17904, + 17907, 17908, 17909, 17906, + 17811, 17906, 17909, 17812, + 17815, 17812, 17909, 17910, + 17911, 17910, 17909, 17908, + 17911, 17912, 17913, 17910, + 17815, 17910, 17913, 17816, + 17819, 17816, 17913, 17914, + 17915, 17914, 17913, 17912, + 17915, 17916, 17917, 17914, + 17819, 17914, 17917, 17820, + 17823, 17820, 17917, 17918, + 17919, 17918, 17917, 17916, + 17919, 17920, 17921, 17918, + 17823, 17918, 17921, 17824, + 17827, 17824, 17921, 17922, + 17923, 17922, 17921, 17920, + 17923, 17924, 17925, 17922, + 17827, 17922, 17925, 17828, + 17831, 17828, 17925, 17926, + 17927, 17926, 17925, 17924, + 17927, 17928, 17929, 17926, + 17831, 17926, 17929, 17832, + 17835, 17832, 17929, 17930, + 17931, 17930, 17929, 17928, + 17931, 17932, 17933, 17930, + 17835, 17930, 17933, 17836, + 17839, 17836, 17933, 17934, + 17935, 17934, 17933, 17932, + 17935, 17936, 17937, 17934, + 17839, 17934, 17937, 17840, + 17843, 17840, 17937, 17938, + 17939, 17938, 17937, 17936, + 17939, 17940, 17941, 17938, + 17843, 17938, 17941, 17844, + 17847, 17844, 17941, 17942, + 17943, 17942, 17941, 17940, + 17943, 17944, 17945, 17942, + 17847, 17942, 17945, 17848, + 17851, 17848, 17945, 17946, + 17947, 17946, 17945, 17944, + 17947, 17948, 17949, 17946, + 17851, 17946, 17949, 17852, + 17855, 17852, 17949, 17950, + 17951, 17950, 17949, 17948, + 17951, 17952, 17953, 17950, + 17855, 17950, 17953, 17856, + 17859, 17856, 17953, 17954, + 17955, 17954, 17953, 17952, + 17955, 17956, 17957, 17954, + 17859, 17954, 17957, 17860, + 17863, 17860, 17957, 17958, + 17959, 17958, 17957, 17956, + 17959, 17960, 17961, 17958, + 17863, 17958, 17961, 17864, + 17867, 17864, 17961, 17962, + 17963, 17962, 17961, 17960, + 17963, 17964, 17965, 17962, + 17867, 17962, 17965, 17868, + 17871, 17868, 17965, 17966, + 17967, 17966, 17965, 17964, + 17967, 17968, 17969, 17966, + 17871, 17966, 17969, 17872, + 17875, 17872, 17969, 17970, + 17971, 17970, 17969, 17968, + 17971, 17972, 17973, 17970, + 17875, 17970, 17973, 17876, + 16656, 17876, 17973, 16663, + 16660, 16663, 17973, 17972, + 17974, 17975, 17976, 17977, + 17878, 17977, 17976, 17879, + 17883, 17879, 17976, 17978, + 17979, 17978, 17976, 17975, + 17979, 17980, 17981, 17978, + 17883, 17978, 17981, 17884, + 17887, 17884, 17981, 17982, + 17983, 17982, 17981, 17980, + 17983, 17984, 17985, 17982, + 17887, 17982, 17985, 17888, + 17891, 17888, 17985, 17986, + 17987, 17986, 17985, 17984, + 17987, 17988, 17989, 17986, + 17891, 17986, 17989, 17892, + 17895, 17892, 17989, 17990, + 17991, 17990, 17989, 17988, + 17991, 17992, 17993, 17990, + 17895, 17990, 17993, 17896, + 17899, 17896, 17993, 17994, + 17995, 17994, 17993, 17992, + 17995, 17996, 17997, 17994, + 17899, 17994, 17997, 17900, + 17903, 17900, 17997, 17998, + 17999, 17998, 17997, 17996, + 17999, 18000, 18001, 17998, + 17903, 17998, 18001, 17904, + 17907, 17904, 18001, 18002, + 18003, 18002, 18001, 18000, + 18003, 18004, 18005, 18002, + 17907, 18002, 18005, 17908, + 17911, 17908, 18005, 18006, + 18007, 18006, 18005, 18004, + 18007, 18008, 18009, 18006, + 17911, 18006, 18009, 17912, + 17915, 17912, 18009, 18010, + 18011, 18010, 18009, 18008, + 18011, 18012, 18013, 18010, + 17915, 18010, 18013, 17916, + 17919, 17916, 18013, 18014, + 18015, 18014, 18013, 18012, + 18015, 18016, 18017, 18014, + 17919, 18014, 18017, 17920, + 17923, 17920, 18017, 18018, + 18019, 18018, 18017, 18016, + 18019, 18020, 18021, 18018, + 17923, 18018, 18021, 17924, + 17927, 17924, 18021, 18022, + 18023, 18022, 18021, 18020, + 18023, 18024, 18025, 18022, + 17927, 18022, 18025, 17928, + 17931, 17928, 18025, 18026, + 18027, 18026, 18025, 18024, + 18027, 18028, 18029, 18026, + 17931, 18026, 18029, 17932, + 17935, 17932, 18029, 18030, + 18031, 18030, 18029, 18028, + 18031, 18032, 18033, 18030, + 17935, 18030, 18033, 17936, + 17939, 17936, 18033, 18034, + 18035, 18034, 18033, 18032, + 18035, 18036, 18037, 18034, + 17939, 18034, 18037, 17940, + 17943, 17940, 18037, 18038, + 18039, 18038, 18037, 18036, + 18039, 18040, 18041, 18038, + 17943, 18038, 18041, 17944, + 17947, 17944, 18041, 18042, + 18043, 18042, 18041, 18040, + 18043, 18044, 18045, 18042, + 17947, 18042, 18045, 17948, + 17951, 17948, 18045, 18046, + 18047, 18046, 18045, 18044, + 18047, 18048, 18049, 18046, + 17951, 18046, 18049, 17952, + 17955, 17952, 18049, 18050, + 18051, 18050, 18049, 18048, + 18051, 18052, 18053, 18050, + 17955, 18050, 18053, 17956, + 17959, 17956, 18053, 18054, + 18055, 18054, 18053, 18052, + 18055, 18056, 18057, 18054, + 17959, 18054, 18057, 17960, + 17963, 17960, 18057, 18058, + 18059, 18058, 18057, 18056, + 18059, 18060, 18061, 18058, + 17963, 18058, 18061, 17964, + 17967, 17964, 18061, 18062, + 18063, 18062, 18061, 18060, + 18063, 18064, 18065, 18062, + 17967, 18062, 18065, 17968, + 17971, 17968, 18065, 18066, + 18067, 18066, 18065, 18064, + 18067, 18068, 18069, 18066, + 17971, 18066, 18069, 17972, + 16660, 17972, 18069, 16667, + 16664, 16667, 18069, 18068, + 18070, 18071, 18072, 18073, + 17974, 18073, 18072, 17975, + 17979, 17975, 18072, 18074, + 18075, 18074, 18072, 18071, + 18075, 18076, 18077, 18074, + 17979, 18074, 18077, 17980, + 17983, 17980, 18077, 18078, + 18079, 18078, 18077, 18076, + 18079, 18080, 18081, 18078, + 17983, 18078, 18081, 17984, + 17987, 17984, 18081, 18082, + 18083, 18082, 18081, 18080, + 18083, 18084, 18085, 18082, + 17987, 18082, 18085, 17988, + 17991, 17988, 18085, 18086, + 18087, 18086, 18085, 18084, + 18087, 18088, 18089, 18086, + 17991, 18086, 18089, 17992, + 17995, 17992, 18089, 18090, + 18091, 18090, 18089, 18088, + 18091, 18092, 18093, 18090, + 17995, 18090, 18093, 17996, + 17999, 17996, 18093, 18094, + 18095, 18094, 18093, 18092, + 18095, 18096, 18097, 18094, + 17999, 18094, 18097, 18000, + 18003, 18000, 18097, 18098, + 18099, 18098, 18097, 18096, + 18099, 18100, 18101, 18098, + 18003, 18098, 18101, 18004, + 18007, 18004, 18101, 18102, + 18103, 18102, 18101, 18100, + 18103, 18104, 18105, 18102, + 18007, 18102, 18105, 18008, + 18011, 18008, 18105, 18106, + 18107, 18106, 18105, 18104, + 18107, 18108, 18109, 18106, + 18011, 18106, 18109, 18012, + 18015, 18012, 18109, 18110, + 18111, 18110, 18109, 18108, + 18111, 18112, 18113, 18110, + 18015, 18110, 18113, 18016, + 18019, 18016, 18113, 18114, + 18115, 18114, 18113, 18112, + 18115, 18116, 18117, 18114, + 18019, 18114, 18117, 18020, + 18023, 18020, 18117, 18118, + 18119, 18118, 18117, 18116, + 18119, 18120, 18121, 18118, + 18023, 18118, 18121, 18024, + 18027, 18024, 18121, 18122, + 18123, 18122, 18121, 18120, + 18123, 18124, 18125, 18122, + 18027, 18122, 18125, 18028, + 18031, 18028, 18125, 18126, + 18127, 18126, 18125, 18124, + 18127, 18128, 18129, 18126, + 18031, 18126, 18129, 18032, + 18035, 18032, 18129, 18130, + 18131, 18130, 18129, 18128, + 18131, 18132, 18133, 18130, + 18035, 18130, 18133, 18036, + 18039, 18036, 18133, 18134, + 18135, 18134, 18133, 18132, + 18135, 18136, 18137, 18134, + 18039, 18134, 18137, 18040, + 18043, 18040, 18137, 18138, + 18139, 18138, 18137, 18136, + 18139, 18140, 18141, 18138, + 18043, 18138, 18141, 18044, + 18047, 18044, 18141, 18142, + 18143, 18142, 18141, 18140, + 18143, 18144, 18145, 18142, + 18047, 18142, 18145, 18048, + 18051, 18048, 18145, 18146, + 18147, 18146, 18145, 18144, + 18147, 18148, 18149, 18146, + 18051, 18146, 18149, 18052, + 18055, 18052, 18149, 18150, + 18151, 18150, 18149, 18148, + 18151, 18152, 18153, 18150, + 18055, 18150, 18153, 18056, + 18059, 18056, 18153, 18154, + 18155, 18154, 18153, 18152, + 18155, 18156, 18157, 18154, + 18059, 18154, 18157, 18060, + 18063, 18060, 18157, 18158, + 18159, 18158, 18157, 18156, + 18159, 18160, 18161, 18158, + 18063, 18158, 18161, 18064, + 18067, 18064, 18161, 18162, + 18163, 18162, 18161, 18160, + 18163, 18164, 18165, 18162, + 18067, 18162, 18165, 18068, + 16664, 18068, 18165, 16671, + 16668, 16671, 18165, 18164, + 18166, 18167, 18168, 18169, + 18070, 18169, 18168, 18071, + 18075, 18071, 18168, 18170, + 18171, 18170, 18168, 18167, + 18171, 18172, 18173, 18170, + 18075, 18170, 18173, 18076, + 18079, 18076, 18173, 18174, + 18175, 18174, 18173, 18172, + 18175, 18176, 18177, 18174, + 18079, 18174, 18177, 18080, + 18083, 18080, 18177, 18178, + 18179, 18178, 18177, 18176, + 18179, 18180, 18181, 18178, + 18083, 18178, 18181, 18084, + 18087, 18084, 18181, 18182, + 18183, 18182, 18181, 18180, + 18183, 18184, 18185, 18182, + 18087, 18182, 18185, 18088, + 18091, 18088, 18185, 18186, + 18187, 18186, 18185, 18184, + 18187, 18188, 18189, 18186, + 18091, 18186, 18189, 18092, + 18095, 18092, 18189, 18190, + 18191, 18190, 18189, 18188, + 18191, 18192, 18193, 18190, + 18095, 18190, 18193, 18096, + 18099, 18096, 18193, 18194, + 18195, 18194, 18193, 18192, + 18195, 18196, 18197, 18194, + 18099, 18194, 18197, 18100, + 18103, 18100, 18197, 18198, + 18199, 18198, 18197, 18196, + 18199, 18200, 18201, 18198, + 18103, 18198, 18201, 18104, + 18107, 18104, 18201, 18202, + 18203, 18202, 18201, 18200, + 18203, 18204, 18205, 18202, + 18107, 18202, 18205, 18108, + 18111, 18108, 18205, 18206, + 18207, 18206, 18205, 18204, + 18207, 18208, 18209, 18206, + 18111, 18206, 18209, 18112, + 18115, 18112, 18209, 18210, + 18211, 18210, 18209, 18208, + 18211, 18212, 18213, 18210, + 18115, 18210, 18213, 18116, + 18119, 18116, 18213, 18214, + 18215, 18214, 18213, 18212, + 18215, 18216, 18217, 18214, + 18119, 18214, 18217, 18120, + 18123, 18120, 18217, 18218, + 18219, 18218, 18217, 18216, + 18219, 18220, 18221, 18218, + 18123, 18218, 18221, 18124, + 18127, 18124, 18221, 18222, + 18223, 18222, 18221, 18220, + 18223, 18224, 18225, 18222, + 18127, 18222, 18225, 18128, + 18131, 18128, 18225, 18226, + 18227, 18226, 18225, 18224, + 18227, 18228, 18229, 18226, + 18131, 18226, 18229, 18132, + 18135, 18132, 18229, 18230, + 18231, 18230, 18229, 18228, + 18231, 18232, 18233, 18230, + 18135, 18230, 18233, 18136, + 18139, 18136, 18233, 18234, + 18235, 18234, 18233, 18232, + 18235, 18236, 18237, 18234, + 18139, 18234, 18237, 18140, + 18143, 18140, 18237, 18238, + 18239, 18238, 18237, 18236, + 18239, 18240, 18241, 18238, + 18143, 18238, 18241, 18144, + 18147, 18144, 18241, 18242, + 18243, 18242, 18241, 18240, + 18243, 18244, 18245, 18242, + 18147, 18242, 18245, 18148, + 18151, 18148, 18245, 18246, + 18247, 18246, 18245, 18244, + 18247, 18248, 18249, 18246, + 18151, 18246, 18249, 18152, + 18155, 18152, 18249, 18250, + 18251, 18250, 18249, 18248, + 18251, 18252, 18253, 18250, + 18155, 18250, 18253, 18156, + 18159, 18156, 18253, 18254, + 18255, 18254, 18253, 18252, + 18255, 18256, 18257, 18254, + 18159, 18254, 18257, 18160, + 18163, 18160, 18257, 18258, + 18259, 18258, 18257, 18256, + 18259, 18260, 18261, 18258, + 18163, 18258, 18261, 18164, + 16668, 18164, 18261, 16675, + 16672, 16675, 18261, 18260, + 18262, 18263, 18264, 18265, + 18166, 18265, 18264, 18167, + 18171, 18167, 18264, 18266, + 18267, 18266, 18264, 18263, + 18267, 18268, 18269, 18266, + 18171, 18266, 18269, 18172, + 18175, 18172, 18269, 18270, + 18271, 18270, 18269, 18268, + 18271, 18272, 18273, 18270, + 18175, 18270, 18273, 18176, + 18179, 18176, 18273, 18274, + 18275, 18274, 18273, 18272, + 18275, 18276, 18277, 18274, + 18179, 18274, 18277, 18180, + 18183, 18180, 18277, 18278, + 18279, 18278, 18277, 18276, + 18279, 18280, 18281, 18278, + 18183, 18278, 18281, 18184, + 18187, 18184, 18281, 18282, + 18283, 18282, 18281, 18280, + 18283, 18284, 18285, 18282, + 18187, 18282, 18285, 18188, + 18191, 18188, 18285, 18286, + 18287, 18286, 18285, 18284, + 18287, 18288, 18289, 18286, + 18191, 18286, 18289, 18192, + 18195, 18192, 18289, 18290, + 18291, 18290, 18289, 18288, + 18291, 18292, 18293, 18290, + 18195, 18290, 18293, 18196, + 18199, 18196, 18293, 18294, + 18295, 18294, 18293, 18292, + 18295, 18296, 18297, 18294, + 18199, 18294, 18297, 18200, + 18203, 18200, 18297, 18298, + 18299, 18298, 18297, 18296, + 18299, 18300, 18301, 18298, + 18203, 18298, 18301, 18204, + 18207, 18204, 18301, 18302, + 18303, 18302, 18301, 18300, + 18303, 18304, 18305, 18302, + 18207, 18302, 18305, 18208, + 18211, 18208, 18305, 18306, + 18307, 18306, 18305, 18304, + 18307, 18308, 18309, 18306, + 18211, 18306, 18309, 18212, + 18215, 18212, 18309, 18310, + 18311, 18310, 18309, 18308, + 18311, 18312, 18313, 18310, + 18215, 18310, 18313, 18216, + 18219, 18216, 18313, 18314, + 18315, 18314, 18313, 18312, + 18315, 18316, 18317, 18314, + 18219, 18314, 18317, 18220, + 18223, 18220, 18317, 18318, + 18319, 18318, 18317, 18316, + 18319, 18320, 18321, 18318, + 18223, 18318, 18321, 18224, + 18227, 18224, 18321, 18322, + 18323, 18322, 18321, 18320, + 18323, 18324, 18325, 18322, + 18227, 18322, 18325, 18228, + 18231, 18228, 18325, 18326, + 18327, 18326, 18325, 18324, + 18327, 18328, 18329, 18326, + 18231, 18326, 18329, 18232, + 18235, 18232, 18329, 18330, + 18331, 18330, 18329, 18328, + 18331, 18332, 18333, 18330, + 18235, 18330, 18333, 18236, + 18239, 18236, 18333, 18334, + 18335, 18334, 18333, 18332, + 18335, 18336, 18337, 18334, + 18239, 18334, 18337, 18240, + 18243, 18240, 18337, 18338, + 18339, 18338, 18337, 18336, + 18339, 18340, 18341, 18338, + 18243, 18338, 18341, 18244, + 18247, 18244, 18341, 18342, + 18343, 18342, 18341, 18340, + 18343, 18344, 18345, 18342, + 18247, 18342, 18345, 18248, + 18251, 18248, 18345, 18346, + 18347, 18346, 18345, 18344, + 18347, 18348, 18349, 18346, + 18251, 18346, 18349, 18252, + 18255, 18252, 18349, 18350, + 18351, 18350, 18349, 18348, + 18351, 18352, 18353, 18350, + 18255, 18350, 18353, 18256, + 18259, 18256, 18353, 18354, + 18355, 18354, 18353, 18352, + 18355, 18356, 18357, 18354, + 18259, 18354, 18357, 18260, + 16672, 18260, 18357, 16679, + 16676, 16679, 18357, 18356, + 18358, 18359, 18360, 18361, + 18262, 18361, 18360, 18263, + 18267, 18263, 18360, 18362, + 18363, 18362, 18360, 18359, + 18363, 18364, 18365, 18362, + 18267, 18362, 18365, 18268, + 18271, 18268, 18365, 18366, + 18367, 18366, 18365, 18364, + 18367, 18368, 18369, 18366, + 18271, 18366, 18369, 18272, + 18275, 18272, 18369, 18370, + 18371, 18370, 18369, 18368, + 18371, 18372, 18373, 18370, + 18275, 18370, 18373, 18276, + 18279, 18276, 18373, 18374, + 18375, 18374, 18373, 18372, + 18375, 18376, 18377, 18374, + 18279, 18374, 18377, 18280, + 18283, 18280, 18377, 18378, + 18379, 18378, 18377, 18376, + 18379, 18380, 18381, 18378, + 18283, 18378, 18381, 18284, + 18287, 18284, 18381, 18382, + 18383, 18382, 18381, 18380, + 18383, 18384, 18385, 18382, + 18287, 18382, 18385, 18288, + 18291, 18288, 18385, 18386, + 18387, 18386, 18385, 18384, + 18387, 18388, 18389, 18386, + 18291, 18386, 18389, 18292, + 18295, 18292, 18389, 18390, + 18391, 18390, 18389, 18388, + 18391, 18392, 18393, 18390, + 18295, 18390, 18393, 18296, + 18299, 18296, 18393, 18394, + 18395, 18394, 18393, 18392, + 18395, 18396, 18397, 18394, + 18299, 18394, 18397, 18300, + 18303, 18300, 18397, 18398, + 18399, 18398, 18397, 18396, + 18399, 18400, 18401, 18398, + 18303, 18398, 18401, 18304, + 18307, 18304, 18401, 18402, + 18403, 18402, 18401, 18400, + 18403, 18404, 18405, 18402, + 18307, 18402, 18405, 18308, + 18311, 18308, 18405, 18406, + 18407, 18406, 18405, 18404, + 18407, 18408, 18409, 18406, + 18311, 18406, 18409, 18312, + 18315, 18312, 18409, 18410, + 18411, 18410, 18409, 18408, + 18411, 18412, 18413, 18410, + 18315, 18410, 18413, 18316, + 18319, 18316, 18413, 18414, + 18415, 18414, 18413, 18412, + 18415, 18416, 18417, 18414, + 18319, 18414, 18417, 18320, + 18323, 18320, 18417, 18418, + 18419, 18418, 18417, 18416, + 18419, 18420, 18421, 18418, + 18323, 18418, 18421, 18324, + 18327, 18324, 18421, 18422, + 18423, 18422, 18421, 18420, + 18423, 18424, 18425, 18422, + 18327, 18422, 18425, 18328, + 18331, 18328, 18425, 18426, + 18427, 18426, 18425, 18424, + 18427, 18428, 18429, 18426, + 18331, 18426, 18429, 18332, + 18335, 18332, 18429, 18430, + 18431, 18430, 18429, 18428, + 18431, 18432, 18433, 18430, + 18335, 18430, 18433, 18336, + 18339, 18336, 18433, 18434, + 18435, 18434, 18433, 18432, + 18435, 18436, 18437, 18434, + 18339, 18434, 18437, 18340, + 18343, 18340, 18437, 18438, + 18439, 18438, 18437, 18436, + 18439, 18440, 18441, 18438, + 18343, 18438, 18441, 18344, + 18347, 18344, 18441, 18442, + 18443, 18442, 18441, 18440, + 18443, 18444, 18445, 18442, + 18347, 18442, 18445, 18348, + 18351, 18348, 18445, 18446, + 18447, 18446, 18445, 18444, + 18447, 18448, 18449, 18446, + 18351, 18446, 18449, 18352, + 18355, 18352, 18449, 18450, + 18451, 18450, 18449, 18448, + 18451, 18452, 18453, 18450, + 18355, 18450, 18453, 18356, + 16676, 18356, 18453, 16683, + 16680, 16683, 18453, 18452, + 18454, 18455, 18456, 18457, + 18358, 18457, 18456, 18359, + 18363, 18359, 18456, 18458, + 18459, 18458, 18456, 18455, + 18459, 18460, 18461, 18458, + 18363, 18458, 18461, 18364, + 18367, 18364, 18461, 18462, + 18463, 18462, 18461, 18460, + 18463, 18464, 18465, 18462, + 18367, 18462, 18465, 18368, + 18371, 18368, 18465, 18466, + 18467, 18466, 18465, 18464, + 18467, 18468, 18469, 18466, + 18371, 18466, 18469, 18372, + 18375, 18372, 18469, 18470, + 18471, 18470, 18469, 18468, + 18471, 18472, 18473, 18470, + 18375, 18470, 18473, 18376, + 18379, 18376, 18473, 18474, + 18475, 18474, 18473, 18472, + 18475, 18476, 18477, 18474, + 18379, 18474, 18477, 18380, + 18383, 18380, 18477, 18478, + 18479, 18478, 18477, 18476, + 18479, 18480, 18481, 18478, + 18383, 18478, 18481, 18384, + 18387, 18384, 18481, 18482, + 18483, 18482, 18481, 18480, + 18483, 18484, 18485, 18482, + 18387, 18482, 18485, 18388, + 18391, 18388, 18485, 18486, + 18487, 18486, 18485, 18484, + 18487, 18488, 18489, 18486, + 18391, 18486, 18489, 18392, + 18395, 18392, 18489, 18490, + 18491, 18490, 18489, 18488, + 18491, 18492, 18493, 18490, + 18395, 18490, 18493, 18396, + 18399, 18396, 18493, 18494, + 18495, 18494, 18493, 18492, + 18495, 18496, 18497, 18494, + 18399, 18494, 18497, 18400, + 18403, 18400, 18497, 18498, + 18499, 18498, 18497, 18496, + 18499, 18500, 18501, 18498, + 18403, 18498, 18501, 18404, + 18407, 18404, 18501, 18502, + 18503, 18502, 18501, 18500, + 18503, 18504, 18505, 18502, + 18407, 18502, 18505, 18408, + 18411, 18408, 18505, 18506, + 18507, 18506, 18505, 18504, + 18507, 18508, 18509, 18506, + 18411, 18506, 18509, 18412, + 18415, 18412, 18509, 18510, + 18511, 18510, 18509, 18508, + 18511, 18512, 18513, 18510, + 18415, 18510, 18513, 18416, + 18419, 18416, 18513, 18514, + 18515, 18514, 18513, 18512, + 18515, 18516, 18517, 18514, + 18419, 18514, 18517, 18420, + 18423, 18420, 18517, 18518, + 18519, 18518, 18517, 18516, + 18519, 18520, 18521, 18518, + 18423, 18518, 18521, 18424, + 18427, 18424, 18521, 18522, + 18523, 18522, 18521, 18520, + 18523, 18524, 18525, 18522, + 18427, 18522, 18525, 18428, + 18431, 18428, 18525, 18526, + 18527, 18526, 18525, 18524, + 18527, 18528, 18529, 18526, + 18431, 18526, 18529, 18432, + 18435, 18432, 18529, 18530, + 18531, 18530, 18529, 18528, + 18531, 18532, 18533, 18530, + 18435, 18530, 18533, 18436, + 18439, 18436, 18533, 18534, + 18535, 18534, 18533, 18532, + 18535, 18536, 18537, 18534, + 18439, 18534, 18537, 18440, + 18443, 18440, 18537, 18538, + 18539, 18538, 18537, 18536, + 18539, 18540, 18541, 18538, + 18443, 18538, 18541, 18444, + 18447, 18444, 18541, 18542, + 18543, 18542, 18541, 18540, + 18543, 18544, 18545, 18542, + 18447, 18542, 18545, 18448, + 18451, 18448, 18545, 18546, + 18547, 18546, 18545, 18544, + 18547, 18548, 18549, 18546, + 18451, 18546, 18549, 18452, + 16680, 18452, 18549, 16687, + 16684, 16687, 18549, 18548, + 18550, 18551, 18552, 18553, + 18454, 18553, 18552, 18455, + 18459, 18455, 18552, 18554, + 18555, 18554, 18552, 18551, + 18555, 18556, 18557, 18554, + 18459, 18554, 18557, 18460, + 18463, 18460, 18557, 18558, + 18559, 18558, 18557, 18556, + 18559, 18560, 18561, 18558, + 18463, 18558, 18561, 18464, + 18467, 18464, 18561, 18562, + 18563, 18562, 18561, 18560, + 18563, 18564, 18565, 18562, + 18467, 18562, 18565, 18468, + 18471, 18468, 18565, 18566, + 18567, 18566, 18565, 18564, + 18567, 18568, 18569, 18566, + 18471, 18566, 18569, 18472, + 18475, 18472, 18569, 18570, + 18571, 18570, 18569, 18568, + 18571, 18572, 18573, 18570, + 18475, 18570, 18573, 18476, + 18479, 18476, 18573, 18574, + 18575, 18574, 18573, 18572, + 18575, 18576, 18577, 18574, + 18479, 18574, 18577, 18480, + 18483, 18480, 18577, 18578, + 18579, 18578, 18577, 18576, + 18579, 18580, 18581, 18578, + 18483, 18578, 18581, 18484, + 18487, 18484, 18581, 18582, + 18583, 18582, 18581, 18580, + 18583, 18584, 18585, 18582, + 18487, 18582, 18585, 18488, + 18491, 18488, 18585, 18586, + 18587, 18586, 18585, 18584, + 18587, 18588, 18589, 18586, + 18491, 18586, 18589, 18492, + 18495, 18492, 18589, 18590, + 18591, 18590, 18589, 18588, + 18591, 18592, 18593, 18590, + 18495, 18590, 18593, 18496, + 18499, 18496, 18593, 18594, + 18595, 18594, 18593, 18592, + 18595, 18596, 18597, 18594, + 18499, 18594, 18597, 18500, + 18503, 18500, 18597, 18598, + 18599, 18598, 18597, 18596, + 18599, 18600, 18601, 18598, + 18503, 18598, 18601, 18504, + 18507, 18504, 18601, 18602, + 18603, 18602, 18601, 18600, + 18603, 18604, 18605, 18602, + 18507, 18602, 18605, 18508, + 18511, 18508, 18605, 18606, + 18607, 18606, 18605, 18604, + 18607, 18608, 18609, 18606, + 18511, 18606, 18609, 18512, + 18515, 18512, 18609, 18610, + 18611, 18610, 18609, 18608, + 18611, 18612, 18613, 18610, + 18515, 18610, 18613, 18516, + 18519, 18516, 18613, 18614, + 18615, 18614, 18613, 18612, + 18615, 18616, 18617, 18614, + 18519, 18614, 18617, 18520, + 18523, 18520, 18617, 18618, + 18619, 18618, 18617, 18616, + 18619, 18620, 18621, 18618, + 18523, 18618, 18621, 18524, + 18527, 18524, 18621, 18622, + 18623, 18622, 18621, 18620, + 18623, 18624, 18625, 18622, + 18527, 18622, 18625, 18528, + 18531, 18528, 18625, 18626, + 18627, 18626, 18625, 18624, + 18627, 18628, 18629, 18626, + 18531, 18626, 18629, 18532, + 18535, 18532, 18629, 18630, + 18631, 18630, 18629, 18628, + 18631, 18632, 18633, 18630, + 18535, 18630, 18633, 18536, + 18539, 18536, 18633, 18634, + 18635, 18634, 18633, 18632, + 18635, 18636, 18637, 18634, + 18539, 18634, 18637, 18540, + 18543, 18540, 18637, 18638, + 18639, 18638, 18637, 18636, + 18639, 18640, 18641, 18638, + 18543, 18638, 18641, 18544, + 18547, 18544, 18641, 18642, + 18643, 18642, 18641, 18640, + 18643, 18644, 18645, 18642, + 18547, 18642, 18645, 18548, + 16684, 18548, 18645, 16691, + 16688, 16691, 18645, 18644, + 18646, 18647, 18648, 18649, + 18550, 18649, 18648, 18551, + 18555, 18551, 18648, 18650, + 18651, 18650, 18648, 18647, + 18651, 18652, 18653, 18650, + 18555, 18650, 18653, 18556, + 18559, 18556, 18653, 18654, + 18655, 18654, 18653, 18652, + 18655, 18656, 18657, 18654, + 18559, 18654, 18657, 18560, + 18563, 18560, 18657, 18658, + 18659, 18658, 18657, 18656, + 18659, 18660, 18661, 18658, + 18563, 18658, 18661, 18564, + 18567, 18564, 18661, 18662, + 18663, 18662, 18661, 18660, + 18663, 18664, 18665, 18662, + 18567, 18662, 18665, 18568, + 18571, 18568, 18665, 18666, + 18667, 18666, 18665, 18664, + 18667, 18668, 18669, 18666, + 18571, 18666, 18669, 18572, + 18575, 18572, 18669, 18670, + 18671, 18670, 18669, 18668, + 18671, 18672, 18673, 18670, + 18575, 18670, 18673, 18576, + 18579, 18576, 18673, 18674, + 18675, 18674, 18673, 18672, + 18675, 18676, 18677, 18674, + 18579, 18674, 18677, 18580, + 18583, 18580, 18677, 18678, + 18679, 18678, 18677, 18676, + 18679, 18680, 18681, 18678, + 18583, 18678, 18681, 18584, + 18587, 18584, 18681, 18682, + 18683, 18682, 18681, 18680, + 18683, 18684, 18685, 18682, + 18587, 18682, 18685, 18588, + 18591, 18588, 18685, 18686, + 18687, 18686, 18685, 18684, + 18687, 18688, 18689, 18686, + 18591, 18686, 18689, 18592, + 18595, 18592, 18689, 18690, + 18691, 18690, 18689, 18688, + 18691, 18692, 18693, 18690, + 18595, 18690, 18693, 18596, + 18599, 18596, 18693, 18694, + 18695, 18694, 18693, 18692, + 18695, 18696, 18697, 18694, + 18599, 18694, 18697, 18600, + 18603, 18600, 18697, 18698, + 18699, 18698, 18697, 18696, + 18699, 18700, 18701, 18698, + 18603, 18698, 18701, 18604, + 18607, 18604, 18701, 18702, + 18703, 18702, 18701, 18700, + 18703, 18704, 18705, 18702, + 18607, 18702, 18705, 18608, + 18611, 18608, 18705, 18706, + 18707, 18706, 18705, 18704, + 18707, 18708, 18709, 18706, + 18611, 18706, 18709, 18612, + 18615, 18612, 18709, 18710, + 18711, 18710, 18709, 18708, + 18711, 18712, 18713, 18710, + 18615, 18710, 18713, 18616, + 18619, 18616, 18713, 18714, + 18715, 18714, 18713, 18712, + 18715, 18716, 18717, 18714, + 18619, 18714, 18717, 18620, + 18623, 18620, 18717, 18718, + 18719, 18718, 18717, 18716, + 18719, 18720, 18721, 18718, + 18623, 18718, 18721, 18624, + 18627, 18624, 18721, 18722, + 18723, 18722, 18721, 18720, + 18723, 18724, 18725, 18722, + 18627, 18722, 18725, 18628, + 18631, 18628, 18725, 18726, + 18727, 18726, 18725, 18724, + 18727, 18728, 18729, 18726, + 18631, 18726, 18729, 18632, + 18635, 18632, 18729, 18730, + 18731, 18730, 18729, 18728, + 18731, 18732, 18733, 18730, + 18635, 18730, 18733, 18636, + 18639, 18636, 18733, 18734, + 18735, 18734, 18733, 18732, + 18735, 18736, 18737, 18734, + 18639, 18734, 18737, 18640, + 18643, 18640, 18737, 18738, + 18739, 18738, 18737, 18736, + 18739, 18740, 18741, 18738, + 18643, 18738, 18741, 18644, + 16688, 18644, 18741, 16695, + 16692, 16695, 18741, 18740, + 18742, 18743, 18744, 18745, + 18646, 18745, 18744, 18647, + 18651, 18647, 18744, 18746, + 18747, 18746, 18744, 18743, + 18747, 18748, 18749, 18746, + 18651, 18746, 18749, 18652, + 18655, 18652, 18749, 18750, + 18751, 18750, 18749, 18748, + 18751, 18752, 18753, 18750, + 18655, 18750, 18753, 18656, + 18659, 18656, 18753, 18754, + 18755, 18754, 18753, 18752, + 18755, 18756, 18757, 18754, + 18659, 18754, 18757, 18660, + 18663, 18660, 18757, 18758, + 18759, 18758, 18757, 18756, + 18759, 18760, 18761, 18758, + 18663, 18758, 18761, 18664, + 18667, 18664, 18761, 18762, + 18763, 18762, 18761, 18760, + 18763, 18764, 18765, 18762, + 18667, 18762, 18765, 18668, + 18671, 18668, 18765, 18766, + 18767, 18766, 18765, 18764, + 18767, 18768, 18769, 18766, + 18671, 18766, 18769, 18672, + 18675, 18672, 18769, 18770, + 18771, 18770, 18769, 18768, + 18771, 18772, 18773, 18770, + 18675, 18770, 18773, 18676, + 18679, 18676, 18773, 18774, + 18775, 18774, 18773, 18772, + 18775, 18776, 18777, 18774, + 18679, 18774, 18777, 18680, + 18683, 18680, 18777, 18778, + 18779, 18778, 18777, 18776, + 18779, 18780, 18781, 18778, + 18683, 18778, 18781, 18684, + 18687, 18684, 18781, 18782, + 18783, 18782, 18781, 18780, + 18783, 18784, 18785, 18782, + 18687, 18782, 18785, 18688, + 18691, 18688, 18785, 18786, + 18787, 18786, 18785, 18784, + 18787, 18788, 18789, 18786, + 18691, 18786, 18789, 18692, + 18695, 18692, 18789, 18790, + 18791, 18790, 18789, 18788, + 18791, 18792, 18793, 18790, + 18695, 18790, 18793, 18696, + 18699, 18696, 18793, 18794, + 18795, 18794, 18793, 18792, + 18795, 18796, 18797, 18794, + 18699, 18794, 18797, 18700, + 18703, 18700, 18797, 18798, + 18799, 18798, 18797, 18796, + 18799, 18800, 18801, 18798, + 18703, 18798, 18801, 18704, + 18707, 18704, 18801, 18802, + 18803, 18802, 18801, 18800, + 18803, 18804, 18805, 18802, + 18707, 18802, 18805, 18708, + 18711, 18708, 18805, 18806, + 18807, 18806, 18805, 18804, + 18807, 18808, 18809, 18806, + 18711, 18806, 18809, 18712, + 18715, 18712, 18809, 18810, + 18811, 18810, 18809, 18808, + 18811, 18812, 18813, 18810, + 18715, 18810, 18813, 18716, + 18719, 18716, 18813, 18814, + 18815, 18814, 18813, 18812, + 18815, 18816, 18817, 18814, + 18719, 18814, 18817, 18720, + 18723, 18720, 18817, 18818, + 18819, 18818, 18817, 18816, + 18819, 18820, 18821, 18818, + 18723, 18818, 18821, 18724, + 18727, 18724, 18821, 18822, + 18823, 18822, 18821, 18820, + 18823, 18824, 18825, 18822, + 18727, 18822, 18825, 18728, + 18731, 18728, 18825, 18826, + 18827, 18826, 18825, 18824, + 18827, 18828, 18829, 18826, + 18731, 18826, 18829, 18732, + 18735, 18732, 18829, 18830, + 18831, 18830, 18829, 18828, + 18831, 18832, 18833, 18830, + 18735, 18830, 18833, 18736, + 18739, 18736, 18833, 18834, + 18835, 18834, 18833, 18832, + 18835, 18836, 18837, 18834, + 18739, 18834, 18837, 18740, + 16692, 18740, 18837, 16699, + 16696, 16699, 18837, 18836, + 18838, 18839, 18840, 18841, + 18742, 18841, 18840, 18743, + 18747, 18743, 18840, 18842, + 18843, 18842, 18840, 18839, + 18843, 18844, 18845, 18842, + 18747, 18842, 18845, 18748, + 18751, 18748, 18845, 18846, + 18847, 18846, 18845, 18844, + 18847, 18848, 18849, 18846, + 18751, 18846, 18849, 18752, + 18755, 18752, 18849, 18850, + 18851, 18850, 18849, 18848, + 18851, 18852, 18853, 18850, + 18755, 18850, 18853, 18756, + 18759, 18756, 18853, 18854, + 18855, 18854, 18853, 18852, + 18855, 18856, 18857, 18854, + 18759, 18854, 18857, 18760, + 18763, 18760, 18857, 18858, + 18859, 18858, 18857, 18856, + 18859, 18860, 18861, 18858, + 18763, 18858, 18861, 18764, + 18767, 18764, 18861, 18862, + 18863, 18862, 18861, 18860, + 18863, 18864, 18865, 18862, + 18767, 18862, 18865, 18768, + 18771, 18768, 18865, 18866, + 18867, 18866, 18865, 18864, + 18867, 18868, 18869, 18866, + 18771, 18866, 18869, 18772, + 18775, 18772, 18869, 18870, + 18871, 18870, 18869, 18868, + 18871, 18872, 18873, 18870, + 18775, 18870, 18873, 18776, + 18779, 18776, 18873, 18874, + 18875, 18874, 18873, 18872, + 18875, 18876, 18877, 18874, + 18779, 18874, 18877, 18780, + 18783, 18780, 18877, 18878, + 18879, 18878, 18877, 18876, + 18879, 18880, 18881, 18878, + 18783, 18878, 18881, 18784, + 18787, 18784, 18881, 18882, + 18883, 18882, 18881, 18880, + 18883, 18884, 18885, 18882, + 18787, 18882, 18885, 18788, + 18791, 18788, 18885, 18886, + 18887, 18886, 18885, 18884, + 18887, 18888, 18889, 18886, + 18791, 18886, 18889, 18792, + 18795, 18792, 18889, 18890, + 18891, 18890, 18889, 18888, + 18891, 18892, 18893, 18890, + 18795, 18890, 18893, 18796, + 18799, 18796, 18893, 18894, + 18895, 18894, 18893, 18892, + 18895, 18896, 18897, 18894, + 18799, 18894, 18897, 18800, + 18803, 18800, 18897, 18898, + 18899, 18898, 18897, 18896, + 18899, 18900, 18901, 18898, + 18803, 18898, 18901, 18804, + 18807, 18804, 18901, 18902, + 18903, 18902, 18901, 18900, + 18903, 18904, 18905, 18902, + 18807, 18902, 18905, 18808, + 18811, 18808, 18905, 18906, + 18907, 18906, 18905, 18904, + 18907, 18908, 18909, 18906, + 18811, 18906, 18909, 18812, + 18815, 18812, 18909, 18910, + 18911, 18910, 18909, 18908, + 18911, 18912, 18913, 18910, + 18815, 18910, 18913, 18816, + 18819, 18816, 18913, 18914, + 18915, 18914, 18913, 18912, + 18915, 18916, 18917, 18914, + 18819, 18914, 18917, 18820, + 18823, 18820, 18917, 18918, + 18919, 18918, 18917, 18916, + 18919, 18920, 18921, 18918, + 18823, 18918, 18921, 18824, + 18827, 18824, 18921, 18922, + 18923, 18922, 18921, 18920, + 18923, 18924, 18925, 18922, + 18827, 18922, 18925, 18828, + 18831, 18828, 18925, 18926, + 18927, 18926, 18925, 18924, + 18927, 18928, 18929, 18926, + 18831, 18926, 18929, 18832, + 18835, 18832, 18929, 18930, + 18931, 18930, 18929, 18928, + 18931, 18932, 18933, 18930, + 18835, 18930, 18933, 18836, + 16696, 18836, 18933, 16703, + 16700, 16703, 18933, 18932, + 18934, 18935, 18936, 18937, + 18838, 18937, 18936, 18839, + 18843, 18839, 18936, 18938, + 18939, 18938, 18936, 18935, + 18939, 18940, 18941, 18938, + 18843, 18938, 18941, 18844, + 18847, 18844, 18941, 18942, + 18943, 18942, 18941, 18940, + 18943, 18944, 18945, 18942, + 18847, 18942, 18945, 18848, + 18851, 18848, 18945, 18946, + 18947, 18946, 18945, 18944, + 18947, 18948, 18949, 18946, + 18851, 18946, 18949, 18852, + 18855, 18852, 18949, 18950, + 18951, 18950, 18949, 18948, + 18951, 18952, 18953, 18950, + 18855, 18950, 18953, 18856, + 18859, 18856, 18953, 18954, + 18955, 18954, 18953, 18952, + 18955, 18956, 18957, 18954, + 18859, 18954, 18957, 18860, + 18863, 18860, 18957, 18958, + 18959, 18958, 18957, 18956, + 18959, 18960, 18961, 18958, + 18863, 18958, 18961, 18864, + 18867, 18864, 18961, 18962, + 18963, 18962, 18961, 18960, + 18963, 18964, 18965, 18962, + 18867, 18962, 18965, 18868, + 18871, 18868, 18965, 18966, + 18967, 18966, 18965, 18964, + 18967, 18968, 18969, 18966, + 18871, 18966, 18969, 18872, + 18875, 18872, 18969, 18970, + 18971, 18970, 18969, 18968, + 18971, 18972, 18973, 18970, + 18875, 18970, 18973, 18876, + 18879, 18876, 18973, 18974, + 18975, 18974, 18973, 18972, + 18975, 18976, 18977, 18974, + 18879, 18974, 18977, 18880, + 18883, 18880, 18977, 18978, + 18979, 18978, 18977, 18976, + 18979, 18980, 18981, 18978, + 18883, 18978, 18981, 18884, + 18887, 18884, 18981, 18982, + 18983, 18982, 18981, 18980, + 18983, 18984, 18985, 18982, + 18887, 18982, 18985, 18888, + 18891, 18888, 18985, 18986, + 18987, 18986, 18985, 18984, + 18987, 18988, 18989, 18986, + 18891, 18986, 18989, 18892, + 18895, 18892, 18989, 18990, + 18991, 18990, 18989, 18988, + 18991, 18992, 18993, 18990, + 18895, 18990, 18993, 18896, + 18899, 18896, 18993, 18994, + 18995, 18994, 18993, 18992, + 18995, 18996, 18997, 18994, + 18899, 18994, 18997, 18900, + 18903, 18900, 18997, 18998, + 18999, 18998, 18997, 18996, + 18999, 19000, 19001, 18998, + 18903, 18998, 19001, 18904, + 18907, 18904, 19001, 19002, + 19003, 19002, 19001, 19000, + 19003, 19004, 19005, 19002, + 18907, 19002, 19005, 18908, + 18911, 18908, 19005, 19006, + 19007, 19006, 19005, 19004, + 19007, 19008, 19009, 19006, + 18911, 19006, 19009, 18912, + 18915, 18912, 19009, 19010, + 19011, 19010, 19009, 19008, + 19011, 19012, 19013, 19010, + 18915, 19010, 19013, 18916, + 18919, 18916, 19013, 19014, + 19015, 19014, 19013, 19012, + 19015, 19016, 19017, 19014, + 18919, 19014, 19017, 18920, + 18923, 18920, 19017, 19018, + 19019, 19018, 19017, 19016, + 19019, 19020, 19021, 19018, + 18923, 19018, 19021, 18924, + 18927, 18924, 19021, 19022, + 19023, 19022, 19021, 19020, + 19023, 19024, 19025, 19022, + 18927, 19022, 19025, 18928, + 18931, 18928, 19025, 19026, + 19027, 19026, 19025, 19024, + 19027, 19028, 19029, 19026, + 18931, 19026, 19029, 18932, + 16700, 18932, 19029, 16707, + 16704, 16707, 19029, 19028, + 19030, 19031, 19032, 19033, + 18934, 19033, 19032, 18935, + 18939, 18935, 19032, 19034, + 19035, 19034, 19032, 19031, + 19035, 19036, 19037, 19034, + 18939, 19034, 19037, 18940, + 18943, 18940, 19037, 19038, + 19039, 19038, 19037, 19036, + 19039, 19040, 19041, 19038, + 18943, 19038, 19041, 18944, + 18947, 18944, 19041, 19042, + 19043, 19042, 19041, 19040, + 19043, 19044, 19045, 19042, + 18947, 19042, 19045, 18948, + 18951, 18948, 19045, 19046, + 19047, 19046, 19045, 19044, + 19047, 19048, 19049, 19046, + 18951, 19046, 19049, 18952, + 18955, 18952, 19049, 19050, + 19051, 19050, 19049, 19048, + 19051, 19052, 19053, 19050, + 18955, 19050, 19053, 18956, + 18959, 18956, 19053, 19054, + 19055, 19054, 19053, 19052, + 19055, 19056, 19057, 19054, + 18959, 19054, 19057, 18960, + 18963, 18960, 19057, 19058, + 19059, 19058, 19057, 19056, + 19059, 19060, 19061, 19058, + 18963, 19058, 19061, 18964, + 18967, 18964, 19061, 19062, + 19063, 19062, 19061, 19060, + 19063, 19064, 19065, 19062, + 18967, 19062, 19065, 18968, + 18971, 18968, 19065, 19066, + 19067, 19066, 19065, 19064, + 19067, 19068, 19069, 19066, + 18971, 19066, 19069, 18972, + 18975, 18972, 19069, 19070, + 19071, 19070, 19069, 19068, + 19071, 19072, 19073, 19070, + 18975, 19070, 19073, 18976, + 18979, 18976, 19073, 19074, + 19075, 19074, 19073, 19072, + 19075, 19076, 19077, 19074, + 18979, 19074, 19077, 18980, + 18983, 18980, 19077, 19078, + 19079, 19078, 19077, 19076, + 19079, 19080, 19081, 19078, + 18983, 19078, 19081, 18984, + 18987, 18984, 19081, 19082, + 19083, 19082, 19081, 19080, + 19083, 19084, 19085, 19082, + 18987, 19082, 19085, 18988, + 18991, 18988, 19085, 19086, + 19087, 19086, 19085, 19084, + 19087, 19088, 19089, 19086, + 18991, 19086, 19089, 18992, + 18995, 18992, 19089, 19090, + 19091, 19090, 19089, 19088, + 19091, 19092, 19093, 19090, + 18995, 19090, 19093, 18996, + 18999, 18996, 19093, 19094, + 19095, 19094, 19093, 19092, + 19095, 19096, 19097, 19094, + 18999, 19094, 19097, 19000, + 19003, 19000, 19097, 19098, + 19099, 19098, 19097, 19096, + 19099, 19100, 19101, 19098, + 19003, 19098, 19101, 19004, + 19007, 19004, 19101, 19102, + 19103, 19102, 19101, 19100, + 19103, 19104, 19105, 19102, + 19007, 19102, 19105, 19008, + 19011, 19008, 19105, 19106, + 19107, 19106, 19105, 19104, + 19107, 19108, 19109, 19106, + 19011, 19106, 19109, 19012, + 19015, 19012, 19109, 19110, + 19111, 19110, 19109, 19108, + 19111, 19112, 19113, 19110, + 19015, 19110, 19113, 19016, + 19019, 19016, 19113, 19114, + 19115, 19114, 19113, 19112, + 19115, 19116, 19117, 19114, + 19019, 19114, 19117, 19020, + 19023, 19020, 19117, 19118, + 19119, 19118, 19117, 19116, + 19119, 19120, 19121, 19118, + 19023, 19118, 19121, 19024, + 19027, 19024, 19121, 19122, + 19123, 19122, 19121, 19120, + 19123, 19124, 19125, 19122, + 19027, 19122, 19125, 19028, + 16704, 19028, 19125, 16711, + 16708, 16711, 19125, 19124, + 19126, 19127, 19128, 19129, + 19030, 19129, 19128, 19031, + 19035, 19031, 19128, 19130, + 19131, 19130, 19128, 19127, + 19131, 19132, 19133, 19130, + 19035, 19130, 19133, 19036, + 19039, 19036, 19133, 19134, + 19135, 19134, 19133, 19132, + 19135, 19136, 19137, 19134, + 19039, 19134, 19137, 19040, + 19043, 19040, 19137, 19138, + 19139, 19138, 19137, 19136, + 19139, 19140, 19141, 19138, + 19043, 19138, 19141, 19044, + 19047, 19044, 19141, 19142, + 19143, 19142, 19141, 19140, + 19143, 19144, 19145, 19142, + 19047, 19142, 19145, 19048, + 19051, 19048, 19145, 19146, + 19147, 19146, 19145, 19144, + 19147, 19148, 19149, 19146, + 19051, 19146, 19149, 19052, + 19055, 19052, 19149, 19150, + 19151, 19150, 19149, 19148, + 19151, 19152, 19153, 19150, + 19055, 19150, 19153, 19056, + 19059, 19056, 19153, 19154, + 19155, 19154, 19153, 19152, + 19155, 19156, 19157, 19154, + 19059, 19154, 19157, 19060, + 19063, 19060, 19157, 19158, + 19159, 19158, 19157, 19156, + 19159, 19160, 19161, 19158, + 19063, 19158, 19161, 19064, + 19067, 19064, 19161, 19162, + 19163, 19162, 19161, 19160, + 19163, 19164, 19165, 19162, + 19067, 19162, 19165, 19068, + 19071, 19068, 19165, 19166, + 19167, 19166, 19165, 19164, + 19167, 19168, 19169, 19166, + 19071, 19166, 19169, 19072, + 19075, 19072, 19169, 19170, + 19171, 19170, 19169, 19168, + 19171, 19172, 19173, 19170, + 19075, 19170, 19173, 19076, + 19079, 19076, 19173, 19174, + 19175, 19174, 19173, 19172, + 19175, 19176, 19177, 19174, + 19079, 19174, 19177, 19080, + 19083, 19080, 19177, 19178, + 19179, 19178, 19177, 19176, + 19179, 19180, 19181, 19178, + 19083, 19178, 19181, 19084, + 19087, 19084, 19181, 19182, + 19183, 19182, 19181, 19180, + 19183, 19184, 19185, 19182, + 19087, 19182, 19185, 19088, + 19091, 19088, 19185, 19186, + 19187, 19186, 19185, 19184, + 19187, 19188, 19189, 19186, + 19091, 19186, 19189, 19092, + 19095, 19092, 19189, 19190, + 19191, 19190, 19189, 19188, + 19191, 19192, 19193, 19190, + 19095, 19190, 19193, 19096, + 19099, 19096, 19193, 19194, + 19195, 19194, 19193, 19192, + 19195, 19196, 19197, 19194, + 19099, 19194, 19197, 19100, + 19103, 19100, 19197, 19198, + 19199, 19198, 19197, 19196, + 19199, 19200, 19201, 19198, + 19103, 19198, 19201, 19104, + 19107, 19104, 19201, 19202, + 19203, 19202, 19201, 19200, + 19203, 19204, 19205, 19202, + 19107, 19202, 19205, 19108, + 19111, 19108, 19205, 19206, + 19207, 19206, 19205, 19204, + 19207, 19208, 19209, 19206, + 19111, 19206, 19209, 19112, + 19115, 19112, 19209, 19210, + 19211, 19210, 19209, 19208, + 19211, 19212, 19213, 19210, + 19115, 19210, 19213, 19116, + 19119, 19116, 19213, 19214, + 19215, 19214, 19213, 19212, + 19215, 19216, 19217, 19214, + 19119, 19214, 19217, 19120, + 19123, 19120, 19217, 19218, + 19219, 19218, 19217, 19216, + 19219, 19220, 19221, 19218, + 19123, 19218, 19221, 19124, + 16708, 19124, 19221, 16715, + 16712, 16715, 19221, 19220, + 19222, 19223, 19224, 19225, + 19126, 19225, 19224, 19127, + 19131, 19127, 19224, 19226, + 19227, 19226, 19224, 19223, + 19227, 19228, 19229, 19226, + 19131, 19226, 19229, 19132, + 19135, 19132, 19229, 19230, + 19231, 19230, 19229, 19228, + 19231, 19232, 19233, 19230, + 19135, 19230, 19233, 19136, + 19139, 19136, 19233, 19234, + 19235, 19234, 19233, 19232, + 19235, 19236, 19237, 19234, + 19139, 19234, 19237, 19140, + 19143, 19140, 19237, 19238, + 19239, 19238, 19237, 19236, + 19239, 19240, 19241, 19238, + 19143, 19238, 19241, 19144, + 19147, 19144, 19241, 19242, + 19243, 19242, 19241, 19240, + 19243, 19244, 19245, 19242, + 19147, 19242, 19245, 19148, + 19151, 19148, 19245, 19246, + 19247, 19246, 19245, 19244, + 19247, 19248, 19249, 19246, + 19151, 19246, 19249, 19152, + 19155, 19152, 19249, 19250, + 19251, 19250, 19249, 19248, + 19251, 19252, 19253, 19250, + 19155, 19250, 19253, 19156, + 19159, 19156, 19253, 19254, + 19255, 19254, 19253, 19252, + 19255, 19256, 19257, 19254, + 19159, 19254, 19257, 19160, + 19163, 19160, 19257, 19258, + 19259, 19258, 19257, 19256, + 19259, 19260, 19261, 19258, + 19163, 19258, 19261, 19164, + 19167, 19164, 19261, 19262, + 19263, 19262, 19261, 19260, + 19263, 19264, 19265, 19262, + 19167, 19262, 19265, 19168, + 19171, 19168, 19265, 19266, + 19267, 19266, 19265, 19264, + 19267, 19268, 19269, 19266, + 19171, 19266, 19269, 19172, + 19175, 19172, 19269, 19270, + 19271, 19270, 19269, 19268, + 19271, 19272, 19273, 19270, + 19175, 19270, 19273, 19176, + 19179, 19176, 19273, 19274, + 19275, 19274, 19273, 19272, + 19275, 19276, 19277, 19274, + 19179, 19274, 19277, 19180, + 19183, 19180, 19277, 19278, + 19279, 19278, 19277, 19276, + 19279, 19280, 19281, 19278, + 19183, 19278, 19281, 19184, + 19187, 19184, 19281, 19282, + 19283, 19282, 19281, 19280, + 19283, 19284, 19285, 19282, + 19187, 19282, 19285, 19188, + 19191, 19188, 19285, 19286, + 19287, 19286, 19285, 19284, + 19287, 19288, 19289, 19286, + 19191, 19286, 19289, 19192, + 19195, 19192, 19289, 19290, + 19291, 19290, 19289, 19288, + 19291, 19292, 19293, 19290, + 19195, 19290, 19293, 19196, + 19199, 19196, 19293, 19294, + 19295, 19294, 19293, 19292, + 19295, 19296, 19297, 19294, + 19199, 19294, 19297, 19200, + 19203, 19200, 19297, 19298, + 19299, 19298, 19297, 19296, + 19299, 19300, 19301, 19298, + 19203, 19298, 19301, 19204, + 19207, 19204, 19301, 19302, + 19303, 19302, 19301, 19300, + 19303, 19304, 19305, 19302, + 19207, 19302, 19305, 19208, + 19211, 19208, 19305, 19306, + 19307, 19306, 19305, 19304, + 19307, 19308, 19309, 19306, + 19211, 19306, 19309, 19212, + 19215, 19212, 19309, 19310, + 19311, 19310, 19309, 19308, + 19311, 19312, 19313, 19310, + 19215, 19310, 19313, 19216, + 19219, 19216, 19313, 19314, + 19315, 19314, 19313, 19312, + 19315, 19316, 19317, 19314, + 19219, 19314, 19317, 19220, + 16712, 19220, 19317, 16719, + 16716, 16719, 19317, 19316, + 19318, 19319, 19320, 19321, + 19222, 19321, 19320, 19223, + 19227, 19223, 19320, 19322, + 19323, 19322, 19320, 19319, + 19323, 19324, 19325, 19322, + 19227, 19322, 19325, 19228, + 19231, 19228, 19325, 19326, + 19327, 19326, 19325, 19324, + 19327, 19328, 19329, 19326, + 19231, 19326, 19329, 19232, + 19235, 19232, 19329, 19330, + 19331, 19330, 19329, 19328, + 19331, 19332, 19333, 19330, + 19235, 19330, 19333, 19236, + 19239, 19236, 19333, 19334, + 19335, 19334, 19333, 19332, + 19335, 19336, 19337, 19334, + 19239, 19334, 19337, 19240, + 19243, 19240, 19337, 19338, + 19339, 19338, 19337, 19336, + 19339, 19340, 19341, 19338, + 19243, 19338, 19341, 19244, + 19247, 19244, 19341, 19342, + 19343, 19342, 19341, 19340, + 19343, 19344, 19345, 19342, + 19247, 19342, 19345, 19248, + 19251, 19248, 19345, 19346, + 19347, 19346, 19345, 19344, + 19347, 19348, 19349, 19346, + 19251, 19346, 19349, 19252, + 19255, 19252, 19349, 19350, + 19351, 19350, 19349, 19348, + 19351, 19352, 19353, 19350, + 19255, 19350, 19353, 19256, + 19259, 19256, 19353, 19354, + 19355, 19354, 19353, 19352, + 19355, 19356, 19357, 19354, + 19259, 19354, 19357, 19260, + 19263, 19260, 19357, 19358, + 19359, 19358, 19357, 19356, + 19359, 19360, 19361, 19358, + 19263, 19358, 19361, 19264, + 19267, 19264, 19361, 19362, + 19363, 19362, 19361, 19360, + 19363, 19364, 19365, 19362, + 19267, 19362, 19365, 19268, + 19271, 19268, 19365, 19366, + 19367, 19366, 19365, 19364, + 19367, 19368, 19369, 19366, + 19271, 19366, 19369, 19272, + 19275, 19272, 19369, 19370, + 19371, 19370, 19369, 19368, + 19371, 19372, 19373, 19370, + 19275, 19370, 19373, 19276, + 19279, 19276, 19373, 19374, + 19375, 19374, 19373, 19372, + 19375, 19376, 19377, 19374, + 19279, 19374, 19377, 19280, + 19283, 19280, 19377, 19378, + 19379, 19378, 19377, 19376, + 19379, 19380, 19381, 19378, + 19283, 19378, 19381, 19284, + 19287, 19284, 19381, 19382, + 19383, 19382, 19381, 19380, + 19383, 19384, 19385, 19382, + 19287, 19382, 19385, 19288, + 19291, 19288, 19385, 19386, + 19387, 19386, 19385, 19384, + 19387, 19388, 19389, 19386, + 19291, 19386, 19389, 19292, + 19295, 19292, 19389, 19390, + 19391, 19390, 19389, 19388, + 19391, 19392, 19393, 19390, + 19295, 19390, 19393, 19296, + 19299, 19296, 19393, 19394, + 19395, 19394, 19393, 19392, + 19395, 19396, 19397, 19394, + 19299, 19394, 19397, 19300, + 19303, 19300, 19397, 19398, + 19399, 19398, 19397, 19396, + 19399, 19400, 19401, 19398, + 19303, 19398, 19401, 19304, + 19307, 19304, 19401, 19402, + 19403, 19402, 19401, 19400, + 19403, 19404, 19405, 19402, + 19307, 19402, 19405, 19308, + 19311, 19308, 19405, 19406, + 19407, 19406, 19405, 19404, + 19407, 19408, 19409, 19406, + 19311, 19406, 19409, 19312, + 19315, 19312, 19409, 19410, + 19411, 19410, 19409, 19408, + 19411, 19412, 19413, 19410, + 19315, 19410, 19413, 19316, + 16716, 19316, 19413, 16723, + 16720, 16723, 19413, 19412, + 19414, 19415, 19416, 19417, + 19318, 19417, 19416, 19319, + 19323, 19319, 19416, 19418, + 19419, 19418, 19416, 19415, + 19419, 19420, 19421, 19418, + 19323, 19418, 19421, 19324, + 19327, 19324, 19421, 19422, + 19423, 19422, 19421, 19420, + 19423, 19424, 19425, 19422, + 19327, 19422, 19425, 19328, + 19331, 19328, 19425, 19426, + 19427, 19426, 19425, 19424, + 19427, 19428, 19429, 19426, + 19331, 19426, 19429, 19332, + 19335, 19332, 19429, 19430, + 19431, 19430, 19429, 19428, + 19431, 19432, 19433, 19430, + 19335, 19430, 19433, 19336, + 19339, 19336, 19433, 19434, + 19435, 19434, 19433, 19432, + 19435, 19436, 19437, 19434, + 19339, 19434, 19437, 19340, + 19343, 19340, 19437, 19438, + 19439, 19438, 19437, 19436, + 19439, 19440, 19441, 19438, + 19343, 19438, 19441, 19344, + 19347, 19344, 19441, 19442, + 19443, 19442, 19441, 19440, + 19443, 19444, 19445, 19442, + 19347, 19442, 19445, 19348, + 19351, 19348, 19445, 19446, + 19447, 19446, 19445, 19444, + 19447, 19448, 19449, 19446, + 19351, 19446, 19449, 19352, + 19355, 19352, 19449, 19450, + 19451, 19450, 19449, 19448, + 19451, 19452, 19453, 19450, + 19355, 19450, 19453, 19356, + 19359, 19356, 19453, 19454, + 19455, 19454, 19453, 19452, + 19455, 19456, 19457, 19454, + 19359, 19454, 19457, 19360, + 19363, 19360, 19457, 19458, + 19459, 19458, 19457, 19456, + 19459, 19460, 19461, 19458, + 19363, 19458, 19461, 19364, + 19367, 19364, 19461, 19462, + 19463, 19462, 19461, 19460, + 19463, 19464, 19465, 19462, + 19367, 19462, 19465, 19368, + 19371, 19368, 19465, 19466, + 19467, 19466, 19465, 19464, + 19467, 19468, 19469, 19466, + 19371, 19466, 19469, 19372, + 19375, 19372, 19469, 19470, + 19471, 19470, 19469, 19468, + 19471, 19472, 19473, 19470, + 19375, 19470, 19473, 19376, + 19379, 19376, 19473, 19474, + 19475, 19474, 19473, 19472, + 19475, 19476, 19477, 19474, + 19379, 19474, 19477, 19380, + 19383, 19380, 19477, 19478, + 19479, 19478, 19477, 19476, + 19479, 19480, 19481, 19478, + 19383, 19478, 19481, 19384, + 19387, 19384, 19481, 19482, + 19483, 19482, 19481, 19480, + 19483, 19484, 19485, 19482, + 19387, 19482, 19485, 19388, + 19391, 19388, 19485, 19486, + 19487, 19486, 19485, 19484, + 19487, 19488, 19489, 19486, + 19391, 19486, 19489, 19392, + 19395, 19392, 19489, 19490, + 19491, 19490, 19489, 19488, + 19491, 19492, 19493, 19490, + 19395, 19490, 19493, 19396, + 19399, 19396, 19493, 19494, + 19495, 19494, 19493, 19492, + 19495, 19496, 19497, 19494, + 19399, 19494, 19497, 19400, + 19403, 19400, 19497, 19498, + 19499, 19498, 19497, 19496, + 19499, 19500, 19501, 19498, + 19403, 19498, 19501, 19404, + 19407, 19404, 19501, 19502, + 19503, 19502, 19501, 19500, + 19503, 19504, 19505, 19502, + 19407, 19502, 19505, 19408, + 19411, 19408, 19505, 19506, + 19507, 19506, 19505, 19504, + 19507, 19508, 19509, 19506, + 19411, 19506, 19509, 19412, + 16720, 19412, 19509, 16727, + 16724, 16727, 19509, 19508, + 19510, 19511, 19512, 19513, + 19414, 19513, 19512, 19415, + 19419, 19415, 19512, 19514, + 19515, 19514, 19512, 19511, + 19515, 19516, 19517, 19514, + 19419, 19514, 19517, 19420, + 19423, 19420, 19517, 19518, + 19519, 19518, 19517, 19516, + 19519, 19520, 19521, 19518, + 19423, 19518, 19521, 19424, + 19427, 19424, 19521, 19522, + 19523, 19522, 19521, 19520, + 19523, 19524, 19525, 19522, + 19427, 19522, 19525, 19428, + 19431, 19428, 19525, 19526, + 19527, 19526, 19525, 19524, + 19527, 19528, 19529, 19526, + 19431, 19526, 19529, 19432, + 19435, 19432, 19529, 19530, + 19531, 19530, 19529, 19528, + 19531, 19532, 19533, 19530, + 19435, 19530, 19533, 19436, + 19439, 19436, 19533, 19534, + 19535, 19534, 19533, 19532, + 19535, 19536, 19537, 19534, + 19439, 19534, 19537, 19440, + 19443, 19440, 19537, 19538, + 19539, 19538, 19537, 19536, + 19539, 19540, 19541, 19538, + 19443, 19538, 19541, 19444, + 19447, 19444, 19541, 19542, + 19543, 19542, 19541, 19540, + 19543, 19544, 19545, 19542, + 19447, 19542, 19545, 19448, + 19451, 19448, 19545, 19546, + 19547, 19546, 19545, 19544, + 19547, 19548, 19549, 19546, + 19451, 19546, 19549, 19452, + 19455, 19452, 19549, 19550, + 19551, 19550, 19549, 19548, + 19551, 19552, 19553, 19550, + 19455, 19550, 19553, 19456, + 19459, 19456, 19553, 19554, + 19555, 19554, 19553, 19552, + 19555, 19556, 19557, 19554, + 19459, 19554, 19557, 19460, + 19463, 19460, 19557, 19558, + 19559, 19558, 19557, 19556, + 19559, 19560, 19561, 19558, + 19463, 19558, 19561, 19464, + 19467, 19464, 19561, 19562, + 19563, 19562, 19561, 19560, + 19563, 19564, 19565, 19562, + 19467, 19562, 19565, 19468, + 19471, 19468, 19565, 19566, + 19567, 19566, 19565, 19564, + 19567, 19568, 19569, 19566, + 19471, 19566, 19569, 19472, + 19475, 19472, 19569, 19570, + 19571, 19570, 19569, 19568, + 19571, 19572, 19573, 19570, + 19475, 19570, 19573, 19476, + 19479, 19476, 19573, 19574, + 19575, 19574, 19573, 19572, + 19575, 19576, 19577, 19574, + 19479, 19574, 19577, 19480, + 19483, 19480, 19577, 19578, + 19579, 19578, 19577, 19576, + 19579, 19580, 19581, 19578, + 19483, 19578, 19581, 19484, + 19487, 19484, 19581, 19582, + 19583, 19582, 19581, 19580, + 19583, 19584, 19585, 19582, + 19487, 19582, 19585, 19488, + 19491, 19488, 19585, 19586, + 19587, 19586, 19585, 19584, + 19587, 19588, 19589, 19586, + 19491, 19586, 19589, 19492, + 19495, 19492, 19589, 19590, + 19591, 19590, 19589, 19588, + 19591, 19592, 19593, 19590, + 19495, 19590, 19593, 19496, + 19499, 19496, 19593, 19594, + 19595, 19594, 19593, 19592, + 19595, 19596, 19597, 19594, + 19499, 19594, 19597, 19500, + 19503, 19500, 19597, 19598, + 19599, 19598, 19597, 19596, + 19599, 19600, 19601, 19598, + 19503, 19598, 19601, 19504, + 19507, 19504, 19601, 19602, + 19603, 19602, 19601, 19600, + 19603, 19604, 19605, 19602, + 19507, 19602, 19605, 19508, + 16724, 19508, 19605, 16731, + 16728, 16731, 19605, 19604, + 19606, 19607, 19608, 19609, + 19510, 19609, 19608, 19511, + 19515, 19511, 19608, 19610, + 19611, 19610, 19608, 19607, + 19611, 19612, 19613, 19610, + 19515, 19610, 19613, 19516, + 19519, 19516, 19613, 19614, + 19615, 19614, 19613, 19612, + 19615, 19616, 19617, 19614, + 19519, 19614, 19617, 19520, + 19523, 19520, 19617, 19618, + 19619, 19618, 19617, 19616, + 19619, 19620, 19621, 19618, + 19523, 19618, 19621, 19524, + 19527, 19524, 19621, 19622, + 19623, 19622, 19621, 19620, + 19623, 19624, 19625, 19622, + 19527, 19622, 19625, 19528, + 19531, 19528, 19625, 19626, + 19627, 19626, 19625, 19624, + 19627, 19628, 19629, 19626, + 19531, 19626, 19629, 19532, + 19535, 19532, 19629, 19630, + 19631, 19630, 19629, 19628, + 19631, 19632, 19633, 19630, + 19535, 19630, 19633, 19536, + 19539, 19536, 19633, 19634, + 19635, 19634, 19633, 19632, + 19635, 19636, 19637, 19634, + 19539, 19634, 19637, 19540, + 19543, 19540, 19637, 19638, + 19639, 19638, 19637, 19636, + 19639, 19640, 19641, 19638, + 19543, 19638, 19641, 19544, + 19547, 19544, 19641, 19642, + 19643, 19642, 19641, 19640, + 19643, 19644, 19645, 19642, + 19547, 19642, 19645, 19548, + 19551, 19548, 19645, 19646, + 19647, 19646, 19645, 19644, + 19647, 19648, 19649, 19646, + 19551, 19646, 19649, 19552, + 19555, 19552, 19649, 19650, + 19651, 19650, 19649, 19648, + 19651, 19652, 19653, 19650, + 19555, 19650, 19653, 19556, + 19559, 19556, 19653, 19654, + 19655, 19654, 19653, 19652, + 19655, 19656, 19657, 19654, + 19559, 19654, 19657, 19560, + 19563, 19560, 19657, 19658, + 19659, 19658, 19657, 19656, + 19659, 19660, 19661, 19658, + 19563, 19658, 19661, 19564, + 19567, 19564, 19661, 19662, + 19663, 19662, 19661, 19660, + 19663, 19664, 19665, 19662, + 19567, 19662, 19665, 19568, + 19571, 19568, 19665, 19666, + 19667, 19666, 19665, 19664, + 19667, 19668, 19669, 19666, + 19571, 19666, 19669, 19572, + 19575, 19572, 19669, 19670, + 19671, 19670, 19669, 19668, + 19671, 19672, 19673, 19670, + 19575, 19670, 19673, 19576, + 19579, 19576, 19673, 19674, + 19675, 19674, 19673, 19672, + 19675, 19676, 19677, 19674, + 19579, 19674, 19677, 19580, + 19583, 19580, 19677, 19678, + 19679, 19678, 19677, 19676, + 19679, 19680, 19681, 19678, + 19583, 19678, 19681, 19584, + 19587, 19584, 19681, 19682, + 19683, 19682, 19681, 19680, + 19683, 19684, 19685, 19682, + 19587, 19682, 19685, 19588, + 19591, 19588, 19685, 19686, + 19687, 19686, 19685, 19684, + 19687, 19688, 19689, 19686, + 19591, 19686, 19689, 19592, + 19595, 19592, 19689, 19690, + 19691, 19690, 19689, 19688, + 19691, 19692, 19693, 19690, + 19595, 19690, 19693, 19596, + 19599, 19596, 19693, 19694, + 19695, 19694, 19693, 19692, + 19695, 19696, 19697, 19694, + 19599, 19694, 19697, 19600, + 19603, 19600, 19697, 19698, + 19699, 19698, 19697, 19696, + 19699, 19700, 19701, 19698, + 19603, 19698, 19701, 19604, + 16728, 19604, 19701, 16735, + 16732, 16735, 19701, 19700, + 19702, 19703, 19704, 19705, + 19606, 19705, 19704, 19607, + 19611, 19607, 19704, 19706, + 19707, 19706, 19704, 19703, + 19707, 19708, 19709, 19706, + 19611, 19706, 19709, 19612, + 19615, 19612, 19709, 19710, + 19711, 19710, 19709, 19708, + 19711, 19712, 19713, 19710, + 19615, 19710, 19713, 19616, + 19619, 19616, 19713, 19714, + 19715, 19714, 19713, 19712, + 19715, 19716, 19717, 19714, + 19619, 19714, 19717, 19620, + 19623, 19620, 19717, 19718, + 19719, 19718, 19717, 19716, + 19719, 19720, 19721, 19718, + 19623, 19718, 19721, 19624, + 19627, 19624, 19721, 19722, + 19723, 19722, 19721, 19720, + 19723, 19724, 19725, 19722, + 19627, 19722, 19725, 19628, + 19631, 19628, 19725, 19726, + 19727, 19726, 19725, 19724, + 19727, 19728, 19729, 19726, + 19631, 19726, 19729, 19632, + 19635, 19632, 19729, 19730, + 19731, 19730, 19729, 19728, + 19731, 19732, 19733, 19730, + 19635, 19730, 19733, 19636, + 19639, 19636, 19733, 19734, + 19735, 19734, 19733, 19732, + 19735, 19736, 19737, 19734, + 19639, 19734, 19737, 19640, + 19643, 19640, 19737, 19738, + 19739, 19738, 19737, 19736, + 19739, 19740, 19741, 19738, + 19643, 19738, 19741, 19644, + 19647, 19644, 19741, 19742, + 19743, 19742, 19741, 19740, + 19743, 19744, 19745, 19742, + 19647, 19742, 19745, 19648, + 19651, 19648, 19745, 19746, + 19747, 19746, 19745, 19744, + 19747, 19748, 19749, 19746, + 19651, 19746, 19749, 19652, + 19655, 19652, 19749, 19750, + 19751, 19750, 19749, 19748, + 19751, 19752, 19753, 19750, + 19655, 19750, 19753, 19656, + 19659, 19656, 19753, 19754, + 19755, 19754, 19753, 19752, + 19755, 19756, 19757, 19754, + 19659, 19754, 19757, 19660, + 19663, 19660, 19757, 19758, + 19759, 19758, 19757, 19756, + 19759, 19760, 19761, 19758, + 19663, 19758, 19761, 19664, + 19667, 19664, 19761, 19762, + 19763, 19762, 19761, 19760, + 19763, 19764, 19765, 19762, + 19667, 19762, 19765, 19668, + 19671, 19668, 19765, 19766, + 19767, 19766, 19765, 19764, + 19767, 19768, 19769, 19766, + 19671, 19766, 19769, 19672, + 19675, 19672, 19769, 19770, + 19771, 19770, 19769, 19768, + 19771, 19772, 19773, 19770, + 19675, 19770, 19773, 19676, + 19679, 19676, 19773, 19774, + 19775, 19774, 19773, 19772, + 19775, 19776, 19777, 19774, + 19679, 19774, 19777, 19680, + 19683, 19680, 19777, 19778, + 19779, 19778, 19777, 19776, + 19779, 19780, 19781, 19778, + 19683, 19778, 19781, 19684, + 19687, 19684, 19781, 19782, + 19783, 19782, 19781, 19780, + 19783, 19784, 19785, 19782, + 19687, 19782, 19785, 19688, + 19691, 19688, 19785, 19786, + 19787, 19786, 19785, 19784, + 19787, 19788, 19789, 19786, + 19691, 19786, 19789, 19692, + 19695, 19692, 19789, 19790, + 19791, 19790, 19789, 19788, + 19791, 19792, 19793, 19790, + 19695, 19790, 19793, 19696, + 19699, 19696, 19793, 19794, + 19795, 19794, 19793, 19792, + 19795, 19796, 19797, 19794, + 19699, 19794, 19797, 19700, + 16732, 19700, 19797, 16739, + 16736, 16739, 19797, 19796, + 19798, 19799, 19800, 19801, + 19702, 19801, 19800, 19703, + 19707, 19703, 19800, 19802, + 19803, 19802, 19800, 19799, + 19803, 19804, 19805, 19802, + 19707, 19802, 19805, 19708, + 19711, 19708, 19805, 19806, + 19807, 19806, 19805, 19804, + 19807, 19808, 19809, 19806, + 19711, 19806, 19809, 19712, + 19715, 19712, 19809, 19810, + 19811, 19810, 19809, 19808, + 19811, 19812, 19813, 19810, + 19715, 19810, 19813, 19716, + 19719, 19716, 19813, 19814, + 19815, 19814, 19813, 19812, + 19815, 19816, 19817, 19814, + 19719, 19814, 19817, 19720, + 19723, 19720, 19817, 19818, + 19819, 19818, 19817, 19816, + 19819, 19820, 19821, 19818, + 19723, 19818, 19821, 19724, + 19727, 19724, 19821, 19822, + 19823, 19822, 19821, 19820, + 19823, 19824, 19825, 19822, + 19727, 19822, 19825, 19728, + 19731, 19728, 19825, 19826, + 19827, 19826, 19825, 19824, + 19827, 19828, 19829, 19826, + 19731, 19826, 19829, 19732, + 19735, 19732, 19829, 19830, + 19831, 19830, 19829, 19828, + 19831, 19832, 19833, 19830, + 19735, 19830, 19833, 19736, + 19739, 19736, 19833, 19834, + 19835, 19834, 19833, 19832, + 19835, 19836, 19837, 19834, + 19739, 19834, 19837, 19740, + 19743, 19740, 19837, 19838, + 19839, 19838, 19837, 19836, + 19839, 19840, 19841, 19838, + 19743, 19838, 19841, 19744, + 19747, 19744, 19841, 19842, + 19843, 19842, 19841, 19840, + 19843, 19844, 19845, 19842, + 19747, 19842, 19845, 19748, + 19751, 19748, 19845, 19846, + 19847, 19846, 19845, 19844, + 19847, 19848, 19849, 19846, + 19751, 19846, 19849, 19752, + 19755, 19752, 19849, 19850, + 19851, 19850, 19849, 19848, + 19851, 19852, 19853, 19850, + 19755, 19850, 19853, 19756, + 19759, 19756, 19853, 19854, + 19855, 19854, 19853, 19852, + 19855, 19856, 19857, 19854, + 19759, 19854, 19857, 19760, + 19763, 19760, 19857, 19858, + 19859, 19858, 19857, 19856, + 19859, 19860, 19861, 19858, + 19763, 19858, 19861, 19764, + 19767, 19764, 19861, 19862, + 19863, 19862, 19861, 19860, + 19863, 19864, 19865, 19862, + 19767, 19862, 19865, 19768, + 19771, 19768, 19865, 19866, + 19867, 19866, 19865, 19864, + 19867, 19868, 19869, 19866, + 19771, 19866, 19869, 19772, + 19775, 19772, 19869, 19870, + 19871, 19870, 19869, 19868, + 19871, 19872, 19873, 19870, + 19775, 19870, 19873, 19776, + 19779, 19776, 19873, 19874, + 19875, 19874, 19873, 19872, + 19875, 19876, 19877, 19874, + 19779, 19874, 19877, 19780, + 19783, 19780, 19877, 19878, + 19879, 19878, 19877, 19876, + 19879, 19880, 19881, 19878, + 19783, 19878, 19881, 19784, + 19787, 19784, 19881, 19882, + 19883, 19882, 19881, 19880, + 19883, 19884, 19885, 19882, + 19787, 19882, 19885, 19788, + 19791, 19788, 19885, 19886, + 19887, 19886, 19885, 19884, + 19887, 19888, 19889, 19886, + 19791, 19886, 19889, 19792, + 19795, 19792, 19889, 19890, + 19891, 19890, 19889, 19888, + 19891, 19892, 19893, 19890, + 19795, 19890, 19893, 19796, + 16736, 19796, 19893, 16743, + 16740, 16743, 19893, 19892, + 19894, 19895, 19896, 19897, + 19798, 19897, 19896, 19799, + 19803, 19799, 19896, 19898, + 19899, 19898, 19896, 19895, + 19899, 19900, 19901, 19898, + 19803, 19898, 19901, 19804, + 19807, 19804, 19901, 19902, + 19903, 19902, 19901, 19900, + 19903, 19904, 19905, 19902, + 19807, 19902, 19905, 19808, + 19811, 19808, 19905, 19906, + 19907, 19906, 19905, 19904, + 19907, 19908, 19909, 19906, + 19811, 19906, 19909, 19812, + 19815, 19812, 19909, 19910, + 19911, 19910, 19909, 19908, + 19911, 19912, 19913, 19910, + 19815, 19910, 19913, 19816, + 19819, 19816, 19913, 19914, + 19915, 19914, 19913, 19912, + 19915, 19916, 19917, 19914, + 19819, 19914, 19917, 19820, + 19823, 19820, 19917, 19918, + 19919, 19918, 19917, 19916, + 19919, 19920, 19921, 19918, + 19823, 19918, 19921, 19824, + 19827, 19824, 19921, 19922, + 19923, 19922, 19921, 19920, + 19923, 19924, 19925, 19922, + 19827, 19922, 19925, 19828, + 19831, 19828, 19925, 19926, + 19927, 19926, 19925, 19924, + 19927, 19928, 19929, 19926, + 19831, 19926, 19929, 19832, + 19835, 19832, 19929, 19930, + 19931, 19930, 19929, 19928, + 19931, 19932, 19933, 19930, + 19835, 19930, 19933, 19836, + 19839, 19836, 19933, 19934, + 19935, 19934, 19933, 19932, + 19935, 19936, 19937, 19934, + 19839, 19934, 19937, 19840, + 19843, 19840, 19937, 19938, + 19939, 19938, 19937, 19936, + 19939, 19940, 19941, 19938, + 19843, 19938, 19941, 19844, + 19847, 19844, 19941, 19942, + 19943, 19942, 19941, 19940, + 19943, 19944, 19945, 19942, + 19847, 19942, 19945, 19848, + 19851, 19848, 19945, 19946, + 19947, 19946, 19945, 19944, + 19947, 19948, 19949, 19946, + 19851, 19946, 19949, 19852, + 19855, 19852, 19949, 19950, + 19951, 19950, 19949, 19948, + 19951, 19952, 19953, 19950, + 19855, 19950, 19953, 19856, + 19859, 19856, 19953, 19954, + 19955, 19954, 19953, 19952, + 19955, 19956, 19957, 19954, + 19859, 19954, 19957, 19860, + 19863, 19860, 19957, 19958, + 19959, 19958, 19957, 19956, + 19959, 19960, 19961, 19958, + 19863, 19958, 19961, 19864, + 19867, 19864, 19961, 19962, + 19963, 19962, 19961, 19960, + 19963, 19964, 19965, 19962, + 19867, 19962, 19965, 19868, + 19871, 19868, 19965, 19966, + 19967, 19966, 19965, 19964, + 19967, 19968, 19969, 19966, + 19871, 19966, 19969, 19872, + 19875, 19872, 19969, 19970, + 19971, 19970, 19969, 19968, + 19971, 19972, 19973, 19970, + 19875, 19970, 19973, 19876, + 19879, 19876, 19973, 19974, + 19975, 19974, 19973, 19972, + 19975, 19976, 19977, 19974, + 19879, 19974, 19977, 19880, + 19883, 19880, 19977, 19978, + 19979, 19978, 19977, 19976, + 19979, 19980, 19981, 19978, + 19883, 19978, 19981, 19884, + 19887, 19884, 19981, 19982, + 19983, 19982, 19981, 19980, + 19983, 19984, 19985, 19982, + 19887, 19982, 19985, 19888, + 19891, 19888, 19985, 19986, + 19987, 19986, 19985, 19984, + 19987, 19988, 19989, 19986, + 19891, 19986, 19989, 19892, + 16740, 19892, 19989, 16747, + 16744, 16747, 19989, 19988, + 19990, 19991, 19992, 19993, + 19894, 19993, 19992, 19895, + 19899, 19895, 19992, 19994, + 19995, 19994, 19992, 19991, + 19995, 19996, 19997, 19994, + 19899, 19994, 19997, 19900, + 19903, 19900, 19997, 19998, + 19999, 19998, 19997, 19996, + 19999, 20000, 20001, 19998, + 19903, 19998, 20001, 19904, + 19907, 19904, 20001, 20002, + 20003, 20002, 20001, 20000, + 20003, 20004, 20005, 20002, + 19907, 20002, 20005, 19908, + 19911, 19908, 20005, 20006, + 20007, 20006, 20005, 20004, + 20007, 20008, 20009, 20006, + 19911, 20006, 20009, 19912, + 19915, 19912, 20009, 20010, + 20011, 20010, 20009, 20008, + 20011, 20012, 20013, 20010, + 19915, 20010, 20013, 19916, + 19919, 19916, 20013, 20014, + 20015, 20014, 20013, 20012, + 20015, 20016, 20017, 20014, + 19919, 20014, 20017, 19920, + 19923, 19920, 20017, 20018, + 20019, 20018, 20017, 20016, + 20019, 20020, 20021, 20018, + 19923, 20018, 20021, 19924, + 19927, 19924, 20021, 20022, + 20023, 20022, 20021, 20020, + 20023, 20024, 20025, 20022, + 19927, 20022, 20025, 19928, + 19931, 19928, 20025, 20026, + 20027, 20026, 20025, 20024, + 20027, 20028, 20029, 20026, + 19931, 20026, 20029, 19932, + 19935, 19932, 20029, 20030, + 20031, 20030, 20029, 20028, + 20031, 20032, 20033, 20030, + 19935, 20030, 20033, 19936, + 19939, 19936, 20033, 20034, + 20035, 20034, 20033, 20032, + 20035, 20036, 20037, 20034, + 19939, 20034, 20037, 19940, + 19943, 19940, 20037, 20038, + 20039, 20038, 20037, 20036, + 20039, 20040, 20041, 20038, + 19943, 20038, 20041, 19944, + 19947, 19944, 20041, 20042, + 20043, 20042, 20041, 20040, + 20043, 20044, 20045, 20042, + 19947, 20042, 20045, 19948, + 19951, 19948, 20045, 20046, + 20047, 20046, 20045, 20044, + 20047, 20048, 20049, 20046, + 19951, 20046, 20049, 19952, + 19955, 19952, 20049, 20050, + 20051, 20050, 20049, 20048, + 20051, 20052, 20053, 20050, + 19955, 20050, 20053, 19956, + 19959, 19956, 20053, 20054, + 20055, 20054, 20053, 20052, + 20055, 20056, 20057, 20054, + 19959, 20054, 20057, 19960, + 19963, 19960, 20057, 20058, + 20059, 20058, 20057, 20056, + 20059, 20060, 20061, 20058, + 19963, 20058, 20061, 19964, + 19967, 19964, 20061, 20062, + 20063, 20062, 20061, 20060, + 20063, 20064, 20065, 20062, + 19967, 20062, 20065, 19968, + 19971, 19968, 20065, 20066, + 20067, 20066, 20065, 20064, + 20067, 20068, 20069, 20066, + 19971, 20066, 20069, 19972, + 19975, 19972, 20069, 20070, + 20071, 20070, 20069, 20068, + 20071, 20072, 20073, 20070, + 19975, 20070, 20073, 19976, + 19979, 19976, 20073, 20074, + 20075, 20074, 20073, 20072, + 20075, 20076, 20077, 20074, + 19979, 20074, 20077, 19980, + 19983, 19980, 20077, 20078, + 20079, 20078, 20077, 20076, + 20079, 20080, 20081, 20078, + 19983, 20078, 20081, 19984, + 19987, 19984, 20081, 20082, + 20083, 20082, 20081, 20080, + 20083, 20084, 20085, 20082, + 19987, 20082, 20085, 19988, + 16744, 19988, 20085, 16751, + 16748, 16751, 20085, 20084, + 20086, 20087, 20088, 20089, + 19990, 20089, 20088, 19991, + 19995, 19991, 20088, 20090, + 20091, 20090, 20088, 20087, + 20091, 20092, 20093, 20090, + 19995, 20090, 20093, 19996, + 19999, 19996, 20093, 20094, + 20095, 20094, 20093, 20092, + 20095, 20096, 20097, 20094, + 19999, 20094, 20097, 20000, + 20003, 20000, 20097, 20098, + 20099, 20098, 20097, 20096, + 20099, 20100, 20101, 20098, + 20003, 20098, 20101, 20004, + 20007, 20004, 20101, 20102, + 20103, 20102, 20101, 20100, + 20103, 20104, 20105, 20102, + 20007, 20102, 20105, 20008, + 20011, 20008, 20105, 20106, + 20107, 20106, 20105, 20104, + 20107, 20108, 20109, 20106, + 20011, 20106, 20109, 20012, + 20015, 20012, 20109, 20110, + 20111, 20110, 20109, 20108, + 20111, 20112, 20113, 20110, + 20015, 20110, 20113, 20016, + 20019, 20016, 20113, 20114, + 20115, 20114, 20113, 20112, + 20115, 20116, 20117, 20114, + 20019, 20114, 20117, 20020, + 20023, 20020, 20117, 20118, + 20119, 20118, 20117, 20116, + 20119, 20120, 20121, 20118, + 20023, 20118, 20121, 20024, + 20027, 20024, 20121, 20122, + 20123, 20122, 20121, 20120, + 20123, 20124, 20125, 20122, + 20027, 20122, 20125, 20028, + 20031, 20028, 20125, 20126, + 20127, 20126, 20125, 20124, + 20127, 20128, 20129, 20126, + 20031, 20126, 20129, 20032, + 20035, 20032, 20129, 20130, + 20131, 20130, 20129, 20128, + 20131, 20132, 20133, 20130, + 20035, 20130, 20133, 20036, + 20039, 20036, 20133, 20134, + 20135, 20134, 20133, 20132, + 20135, 20136, 20137, 20134, + 20039, 20134, 20137, 20040, + 20043, 20040, 20137, 20138, + 20139, 20138, 20137, 20136, + 20139, 20140, 20141, 20138, + 20043, 20138, 20141, 20044, + 20047, 20044, 20141, 20142, + 20143, 20142, 20141, 20140, + 20143, 20144, 20145, 20142, + 20047, 20142, 20145, 20048, + 20051, 20048, 20145, 20146, + 20147, 20146, 20145, 20144, + 20147, 20148, 20149, 20146, + 20051, 20146, 20149, 20052, + 20055, 20052, 20149, 20150, + 20151, 20150, 20149, 20148, + 20151, 20152, 20153, 20150, + 20055, 20150, 20153, 20056, + 20059, 20056, 20153, 20154, + 20155, 20154, 20153, 20152, + 20155, 20156, 20157, 20154, + 20059, 20154, 20157, 20060, + 20063, 20060, 20157, 20158, + 20159, 20158, 20157, 20156, + 20159, 20160, 20161, 20158, + 20063, 20158, 20161, 20064, + 20067, 20064, 20161, 20162, + 20163, 20162, 20161, 20160, + 20163, 20164, 20165, 20162, + 20067, 20162, 20165, 20068, + 20071, 20068, 20165, 20166, + 20167, 20166, 20165, 20164, + 20167, 20168, 20169, 20166, + 20071, 20166, 20169, 20072, + 20075, 20072, 20169, 20170, + 20171, 20170, 20169, 20168, + 20171, 20172, 20173, 20170, + 20075, 20170, 20173, 20076, + 20079, 20076, 20173, 20174, + 20175, 20174, 20173, 20172, + 20175, 20176, 20177, 20174, + 20079, 20174, 20177, 20080, + 20083, 20080, 20177, 20178, + 20179, 20178, 20177, 20176, + 20179, 20180, 20181, 20178, + 20083, 20178, 20181, 20084, + 16748, 20084, 20181, 16755, + 16752, 16755, 20181, 20180, + 20182, 20183, 20184, 20185, + 20086, 20185, 20184, 20087, + 20091, 20087, 20184, 20186, + 20187, 20186, 20184, 20183, + 20187, 20188, 20189, 20186, + 20091, 20186, 20189, 20092, + 20095, 20092, 20189, 20190, + 20191, 20190, 20189, 20188, + 20191, 20192, 20193, 20190, + 20095, 20190, 20193, 20096, + 20099, 20096, 20193, 20194, + 20195, 20194, 20193, 20192, + 20195, 20196, 20197, 20194, + 20099, 20194, 20197, 20100, + 20103, 20100, 20197, 20198, + 20199, 20198, 20197, 20196, + 20199, 20200, 20201, 20198, + 20103, 20198, 20201, 20104, + 20107, 20104, 20201, 20202, + 20203, 20202, 20201, 20200, + 20203, 20204, 20205, 20202, + 20107, 20202, 20205, 20108, + 20111, 20108, 20205, 20206, + 20207, 20206, 20205, 20204, + 20207, 20208, 20209, 20206, + 20111, 20206, 20209, 20112, + 20115, 20112, 20209, 20210, + 20211, 20210, 20209, 20208, + 20211, 20212, 20213, 20210, + 20115, 20210, 20213, 20116, + 20119, 20116, 20213, 20214, + 20215, 20214, 20213, 20212, + 20215, 20216, 20217, 20214, + 20119, 20214, 20217, 20120, + 20123, 20120, 20217, 20218, + 20219, 20218, 20217, 20216, + 20219, 20220, 20221, 20218, + 20123, 20218, 20221, 20124, + 20127, 20124, 20221, 20222, + 20223, 20222, 20221, 20220, + 20223, 20224, 20225, 20222, + 20127, 20222, 20225, 20128, + 20131, 20128, 20225, 20226, + 20227, 20226, 20225, 20224, + 20227, 20228, 20229, 20226, + 20131, 20226, 20229, 20132, + 20135, 20132, 20229, 20230, + 20231, 20230, 20229, 20228, + 20231, 20232, 20233, 20230, + 20135, 20230, 20233, 20136, + 20139, 20136, 20233, 20234, + 20235, 20234, 20233, 20232, + 20235, 20236, 20237, 20234, + 20139, 20234, 20237, 20140, + 20143, 20140, 20237, 20238, + 20239, 20238, 20237, 20236, + 20239, 20240, 20241, 20238, + 20143, 20238, 20241, 20144, + 20147, 20144, 20241, 20242, + 20243, 20242, 20241, 20240, + 20243, 20244, 20245, 20242, + 20147, 20242, 20245, 20148, + 20151, 20148, 20245, 20246, + 20247, 20246, 20245, 20244, + 20247, 20248, 20249, 20246, + 20151, 20246, 20249, 20152, + 20155, 20152, 20249, 20250, + 20251, 20250, 20249, 20248, + 20251, 20252, 20253, 20250, + 20155, 20250, 20253, 20156, + 20159, 20156, 20253, 20254, + 20255, 20254, 20253, 20252, + 20255, 20256, 20257, 20254, + 20159, 20254, 20257, 20160, + 20163, 20160, 20257, 20258, + 20259, 20258, 20257, 20256, + 20259, 20260, 20261, 20258, + 20163, 20258, 20261, 20164, + 20167, 20164, 20261, 20262, + 20263, 20262, 20261, 20260, + 20263, 20264, 20265, 20262, + 20167, 20262, 20265, 20168, + 20171, 20168, 20265, 20266, + 20267, 20266, 20265, 20264, + 20267, 20268, 20269, 20266, + 20171, 20266, 20269, 20172, + 20175, 20172, 20269, 20270, + 20271, 20270, 20269, 20268, + 20271, 20272, 20273, 20270, + 20175, 20270, 20273, 20176, + 20179, 20176, 20273, 20274, + 20275, 20274, 20273, 20272, + 20275, 20276, 20277, 20274, + 20179, 20274, 20277, 20180, + 16752, 20180, 20277, 16759, + 16756, 16759, 20277, 20276, + 20278, 20279, 20280, 20281, + 20182, 20281, 20280, 20183, + 20187, 20183, 20280, 20282, + 20283, 20282, 20280, 20279, + 20283, 20284, 20285, 20282, + 20187, 20282, 20285, 20188, + 20191, 20188, 20285, 20286, + 20287, 20286, 20285, 20284, + 20287, 20288, 20289, 20286, + 20191, 20286, 20289, 20192, + 20195, 20192, 20289, 20290, + 20291, 20290, 20289, 20288, + 20291, 20292, 20293, 20290, + 20195, 20290, 20293, 20196, + 20199, 20196, 20293, 20294, + 20295, 20294, 20293, 20292, + 20295, 20296, 20297, 20294, + 20199, 20294, 20297, 20200, + 20203, 20200, 20297, 20298, + 20299, 20298, 20297, 20296, + 20299, 20300, 20301, 20298, + 20203, 20298, 20301, 20204, + 20207, 20204, 20301, 20302, + 20303, 20302, 20301, 20300, + 20303, 20304, 20305, 20302, + 20207, 20302, 20305, 20208, + 20211, 20208, 20305, 20306, + 20307, 20306, 20305, 20304, + 20307, 20308, 20309, 20306, + 20211, 20306, 20309, 20212, + 20215, 20212, 20309, 20310, + 20311, 20310, 20309, 20308, + 20311, 20312, 20313, 20310, + 20215, 20310, 20313, 20216, + 20219, 20216, 20313, 20314, + 20315, 20314, 20313, 20312, + 20315, 20316, 20317, 20314, + 20219, 20314, 20317, 20220, + 20223, 20220, 20317, 20318, + 20319, 20318, 20317, 20316, + 20319, 20320, 20321, 20318, + 20223, 20318, 20321, 20224, + 20227, 20224, 20321, 20322, + 20323, 20322, 20321, 20320, + 20323, 20324, 20325, 20322, + 20227, 20322, 20325, 20228, + 20231, 20228, 20325, 20326, + 20327, 20326, 20325, 20324, + 20327, 20328, 20329, 20326, + 20231, 20326, 20329, 20232, + 20235, 20232, 20329, 20330, + 20331, 20330, 20329, 20328, + 20331, 20332, 20333, 20330, + 20235, 20330, 20333, 20236, + 20239, 20236, 20333, 20334, + 20335, 20334, 20333, 20332, + 20335, 20336, 20337, 20334, + 20239, 20334, 20337, 20240, + 20243, 20240, 20337, 20338, + 20339, 20338, 20337, 20336, + 20339, 20340, 20341, 20338, + 20243, 20338, 20341, 20244, + 20247, 20244, 20341, 20342, + 20343, 20342, 20341, 20340, + 20343, 20344, 20345, 20342, + 20247, 20342, 20345, 20248, + 20251, 20248, 20345, 20346, + 20347, 20346, 20345, 20344, + 20347, 20348, 20349, 20346, + 20251, 20346, 20349, 20252, + 20255, 20252, 20349, 20350, + 20351, 20350, 20349, 20348, + 20351, 20352, 20353, 20350, + 20255, 20350, 20353, 20256, + 20259, 20256, 20353, 20354, + 20355, 20354, 20353, 20352, + 20355, 20356, 20357, 20354, + 20259, 20354, 20357, 20260, + 20263, 20260, 20357, 20358, + 20359, 20358, 20357, 20356, + 20359, 20360, 20361, 20358, + 20263, 20358, 20361, 20264, + 20267, 20264, 20361, 20362, + 20363, 20362, 20361, 20360, + 20363, 20364, 20365, 20362, + 20267, 20362, 20365, 20268, + 20271, 20268, 20365, 20366, + 20367, 20366, 20365, 20364, + 20367, 20368, 20369, 20366, + 20271, 20366, 20369, 20272, + 20275, 20272, 20369, 20370, + 20371, 20370, 20369, 20368, + 20371, 20372, 20373, 20370, + 20275, 20370, 20373, 20276, + 16756, 20276, 20373, 16763, + 16760, 16763, 20373, 20372, + 16634, 16767, 20374, 17301, + 16766, 20375, 20374, 16767, + 20376, 20377, 20374, 20375, + 17296, 17301, 20374, 20377, + 17296, 20377, 20378, 17295, + 20376, 20379, 20378, 20377, + 20380, 20381, 20378, 20379, + 17290, 17295, 20378, 20381, + 17290, 20381, 20382, 17289, + 20380, 20383, 20382, 20381, + 20384, 20385, 20382, 20383, + 17284, 17289, 20382, 20385, + 17284, 20385, 20386, 17283, + 20384, 20387, 20386, 20385, + 20388, 20389, 20386, 20387, + 17278, 17283, 20386, 20389, + 17278, 20389, 20390, 17277, + 20388, 20391, 20390, 20389, + 20392, 20393, 20390, 20391, + 17272, 17277, 20390, 20393, + 17272, 20393, 20394, 17271, + 20392, 20395, 20394, 20393, + 20396, 20397, 20394, 20395, + 17266, 17271, 20394, 20397, + 17266, 20397, 20398, 17265, + 20396, 20399, 20398, 20397, + 20400, 20401, 20398, 20399, + 17260, 17265, 20398, 20401, + 17260, 20401, 20402, 17259, + 20400, 20403, 20402, 20401, + 20404, 20405, 20402, 20403, + 17254, 17259, 20402, 20405, + 17254, 20405, 20406, 17253, + 20404, 20407, 20406, 20405, + 20408, 20409, 20406, 20407, + 17248, 17253, 20406, 20409, + 17248, 20409, 20410, 17247, + 20408, 20411, 20410, 20409, + 20412, 20413, 20410, 20411, + 17242, 17247, 20410, 20413, + 17242, 20413, 20414, 17241, + 20412, 20415, 20414, 20413, + 20416, 20417, 20414, 20415, + 17236, 17241, 20414, 20417, + 17236, 20417, 20418, 17235, + 20416, 20419, 20418, 20417, + 20420, 20421, 20418, 20419, + 17230, 17235, 20418, 20421, + 17230, 20421, 20422, 17229, + 20420, 20423, 20422, 20421, + 20424, 20425, 20422, 20423, + 17224, 17229, 20422, 20425, + 17224, 20425, 20426, 17223, + 20424, 20427, 20426, 20425, + 20428, 20429, 20426, 20427, + 17218, 17223, 20426, 20429, + 17218, 20429, 20430, 17217, + 20428, 20431, 20430, 20429, + 20432, 20433, 20430, 20431, + 17212, 17217, 20430, 20433, + 17212, 20433, 20434, 17211, + 20432, 20435, 20434, 20433, + 20436, 20437, 20434, 20435, + 17206, 17211, 20434, 20437, + 17206, 20437, 20438, 17205, + 20436, 20439, 20438, 20437, + 20440, 20441, 20438, 20439, + 17200, 17205, 20438, 20441, + 17200, 20441, 20442, 17199, + 20440, 20443, 20442, 20441, + 20444, 20445, 20442, 20443, + 17194, 17199, 20442, 20445, + 17194, 20445, 20446, 17193, + 20444, 20447, 20446, 20445, + 20448, 20449, 20446, 20447, + 17188, 17193, 20446, 20449, + 17188, 20449, 20450, 17187, + 20448, 20451, 20450, 20449, + 20452, 20453, 20450, 20451, + 17182, 17187, 20450, 20453, + 17182, 20453, 20454, 17181, + 20452, 20455, 20454, 20453, + 20456, 20457, 20454, 20455, + 17176, 17181, 20454, 20457, + 17176, 20457, 20458, 17175, + 20456, 20459, 20458, 20457, + 20460, 20461, 20458, 20459, + 17170, 17175, 20458, 20461, + 17170, 20461, 20462, 17169, + 20460, 20463, 20462, 20461, + 20464, 20465, 20462, 20463, + 17164, 17169, 20462, 20465, + 17164, 20465, 20466, 17163, + 20464, 20467, 20466, 20465, + 20468, 20469, 20466, 20467, + 17162, 17163, 20466, 20469, + 16766, 16771, 20470, 20375, + 16770, 20471, 20470, 16771, + 20472, 20473, 20470, 20471, + 20376, 20375, 20470, 20473, + 20376, 20473, 20474, 20379, + 20472, 20475, 20474, 20473, + 20476, 20477, 20474, 20475, + 20380, 20379, 20474, 20477, + 20380, 20477, 20478, 20383, + 20476, 20479, 20478, 20477, + 20480, 20481, 20478, 20479, + 20384, 20383, 20478, 20481, + 20384, 20481, 20482, 20387, + 20480, 20483, 20482, 20481, + 20484, 20485, 20482, 20483, + 20388, 20387, 20482, 20485, + 20388, 20485, 20486, 20391, + 20484, 20487, 20486, 20485, + 20488, 20489, 20486, 20487, + 20392, 20391, 20486, 20489, + 20392, 20489, 20490, 20395, + 20488, 20491, 20490, 20489, + 20492, 20493, 20490, 20491, + 20396, 20395, 20490, 20493, + 20396, 20493, 20494, 20399, + 20492, 20495, 20494, 20493, + 20496, 20497, 20494, 20495, + 20400, 20399, 20494, 20497, + 20400, 20497, 20498, 20403, + 20496, 20499, 20498, 20497, + 20500, 20501, 20498, 20499, + 20404, 20403, 20498, 20501, + 20404, 20501, 20502, 20407, + 20500, 20503, 20502, 20501, + 20504, 20505, 20502, 20503, + 20408, 20407, 20502, 20505, + 20408, 20505, 20506, 20411, + 20504, 20507, 20506, 20505, + 20508, 20509, 20506, 20507, + 20412, 20411, 20506, 20509, + 20412, 20509, 20510, 20415, + 20508, 20511, 20510, 20509, + 20512, 20513, 20510, 20511, + 20416, 20415, 20510, 20513, + 20416, 20513, 20514, 20419, + 20512, 20515, 20514, 20513, + 20516, 20517, 20514, 20515, + 20420, 20419, 20514, 20517, + 20420, 20517, 20518, 20423, + 20516, 20519, 20518, 20517, + 20520, 20521, 20518, 20519, + 20424, 20423, 20518, 20521, + 20424, 20521, 20522, 20427, + 20520, 20523, 20522, 20521, + 20524, 20525, 20522, 20523, + 20428, 20427, 20522, 20525, + 20428, 20525, 20526, 20431, + 20524, 20527, 20526, 20525, + 20528, 20529, 20526, 20527, + 20432, 20431, 20526, 20529, + 20432, 20529, 20530, 20435, + 20528, 20531, 20530, 20529, + 20532, 20533, 20530, 20531, + 20436, 20435, 20530, 20533, + 20436, 20533, 20534, 20439, + 20532, 20535, 20534, 20533, + 20536, 20537, 20534, 20535, + 20440, 20439, 20534, 20537, + 20440, 20537, 20538, 20443, + 20536, 20539, 20538, 20537, + 20540, 20541, 20538, 20539, + 20444, 20443, 20538, 20541, + 20444, 20541, 20542, 20447, + 20540, 20543, 20542, 20541, + 20544, 20545, 20542, 20543, + 20448, 20447, 20542, 20545, + 20448, 20545, 20546, 20451, + 20544, 20547, 20546, 20545, + 20548, 20549, 20546, 20547, + 20452, 20451, 20546, 20549, + 20452, 20549, 20550, 20455, + 20548, 20551, 20550, 20549, + 20552, 20553, 20550, 20551, + 20456, 20455, 20550, 20553, + 20456, 20553, 20554, 20459, + 20552, 20555, 20554, 20553, + 20556, 20557, 20554, 20555, + 20460, 20459, 20554, 20557, + 20460, 20557, 20558, 20463, + 20556, 20559, 20558, 20557, + 20560, 20561, 20558, 20559, + 20464, 20463, 20558, 20561, + 20464, 20561, 20562, 20467, + 20560, 20563, 20562, 20561, + 20564, 20565, 20562, 20563, + 20468, 20467, 20562, 20565, + 16770, 16775, 20566, 20471, + 16774, 20567, 20566, 16775, + 20568, 20569, 20566, 20567, + 20472, 20471, 20566, 20569, + 20472, 20569, 20570, 20475, + 20568, 20571, 20570, 20569, + 20572, 20573, 20570, 20571, + 20476, 20475, 20570, 20573, + 20476, 20573, 20574, 20479, + 20572, 20575, 20574, 20573, + 20576, 20577, 20574, 20575, + 20480, 20479, 20574, 20577, + 20480, 20577, 20578, 20483, + 20576, 20579, 20578, 20577, + 20580, 20581, 20578, 20579, + 20484, 20483, 20578, 20581, + 20484, 20581, 20582, 20487, + 20580, 20583, 20582, 20581, + 20584, 20585, 20582, 20583, + 20488, 20487, 20582, 20585, + 20488, 20585, 20586, 20491, + 20584, 20587, 20586, 20585, + 20588, 20589, 20586, 20587, + 20492, 20491, 20586, 20589, + 20492, 20589, 20590, 20495, + 20588, 20591, 20590, 20589, + 20592, 20593, 20590, 20591, + 20496, 20495, 20590, 20593, + 20496, 20593, 20594, 20499, + 20592, 20595, 20594, 20593, + 20596, 20597, 20594, 20595, + 20500, 20499, 20594, 20597, + 20500, 20597, 20598, 20503, + 20596, 20599, 20598, 20597, + 20600, 20601, 20598, 20599, + 20504, 20503, 20598, 20601, + 20504, 20601, 20602, 20507, + 20600, 20603, 20602, 20601, + 20604, 20605, 20602, 20603, + 20508, 20507, 20602, 20605, + 20508, 20605, 20606, 20511, + 20604, 20607, 20606, 20605, + 20608, 20609, 20606, 20607, + 20512, 20511, 20606, 20609, + 20512, 20609, 20610, 20515, + 20608, 20611, 20610, 20609, + 20612, 20613, 20610, 20611, + 20516, 20515, 20610, 20613, + 20516, 20613, 20614, 20519, + 20612, 20615, 20614, 20613, + 20616, 20617, 20614, 20615, + 20520, 20519, 20614, 20617, + 20520, 20617, 20618, 20523, + 20616, 20619, 20618, 20617, + 20620, 20621, 20618, 20619, + 20524, 20523, 20618, 20621, + 20524, 20621, 20622, 20527, + 20620, 20623, 20622, 20621, + 20624, 20625, 20622, 20623, + 20528, 20527, 20622, 20625, + 20528, 20625, 20626, 20531, + 20624, 20627, 20626, 20625, + 20628, 20629, 20626, 20627, + 20532, 20531, 20626, 20629, + 20532, 20629, 20630, 20535, + 20628, 20631, 20630, 20629, + 20632, 20633, 20630, 20631, + 20536, 20535, 20630, 20633, + 20536, 20633, 20634, 20539, + 20632, 20635, 20634, 20633, + 20636, 20637, 20634, 20635, + 20540, 20539, 20634, 20637, + 20540, 20637, 20638, 20543, + 20636, 20639, 20638, 20637, + 20640, 20641, 20638, 20639, + 20544, 20543, 20638, 20641, + 20544, 20641, 20642, 20547, + 20640, 20643, 20642, 20641, + 20644, 20645, 20642, 20643, + 20548, 20547, 20642, 20645, + 20548, 20645, 20646, 20551, + 20644, 20647, 20646, 20645, + 20648, 20649, 20646, 20647, + 20552, 20551, 20646, 20649, + 20552, 20649, 20650, 20555, + 20648, 20651, 20650, 20649, + 20652, 20653, 20650, 20651, + 20556, 20555, 20650, 20653, + 20556, 20653, 20654, 20559, + 20652, 20655, 20654, 20653, + 20656, 20657, 20654, 20655, + 20560, 20559, 20654, 20657, + 20560, 20657, 20658, 20563, + 20656, 20659, 20658, 20657, + 20660, 20661, 20658, 20659, + 20564, 20563, 20658, 20661, + 16774, 16779, 20662, 20567, + 16778, 20663, 20662, 16779, + 20664, 20665, 20662, 20663, + 20568, 20567, 20662, 20665, + 20568, 20665, 20666, 20571, + 20664, 20667, 20666, 20665, + 20668, 20669, 20666, 20667, + 20572, 20571, 20666, 20669, + 20572, 20669, 20670, 20575, + 20668, 20671, 20670, 20669, + 20672, 20673, 20670, 20671, + 20576, 20575, 20670, 20673, + 20576, 20673, 20674, 20579, + 20672, 20675, 20674, 20673, + 20676, 20677, 20674, 20675, + 20580, 20579, 20674, 20677, + 20580, 20677, 20678, 20583, + 20676, 20679, 20678, 20677, + 20680, 20681, 20678, 20679, + 20584, 20583, 20678, 20681, + 20584, 20681, 20682, 20587, + 20680, 20683, 20682, 20681, + 20684, 20685, 20682, 20683, + 20588, 20587, 20682, 20685, + 20588, 20685, 20686, 20591, + 20684, 20687, 20686, 20685, + 20688, 20689, 20686, 20687, + 20592, 20591, 20686, 20689, + 20592, 20689, 20690, 20595, + 20688, 20691, 20690, 20689, + 20692, 20693, 20690, 20691, + 20596, 20595, 20690, 20693, + 20596, 20693, 20694, 20599, + 20692, 20695, 20694, 20693, + 20696, 20697, 20694, 20695, + 20600, 20599, 20694, 20697, + 20600, 20697, 20698, 20603, + 20696, 20699, 20698, 20697, + 20700, 20701, 20698, 20699, + 20604, 20603, 20698, 20701, + 20604, 20701, 20702, 20607, + 20700, 20703, 20702, 20701, + 20704, 20705, 20702, 20703, + 20608, 20607, 20702, 20705, + 20608, 20705, 20706, 20611, + 20704, 20707, 20706, 20705, + 20708, 20709, 20706, 20707, + 20612, 20611, 20706, 20709, + 20612, 20709, 20710, 20615, + 20708, 20711, 20710, 20709, + 20712, 20713, 20710, 20711, + 20616, 20615, 20710, 20713, + 20616, 20713, 20714, 20619, + 20712, 20715, 20714, 20713, + 20716, 20717, 20714, 20715, + 20620, 20619, 20714, 20717, + 20620, 20717, 20718, 20623, + 20716, 20719, 20718, 20717, + 20720, 20721, 20718, 20719, + 20624, 20623, 20718, 20721, + 20624, 20721, 20722, 20627, + 20720, 20723, 20722, 20721, + 20724, 20725, 20722, 20723, + 20628, 20627, 20722, 20725, + 20628, 20725, 20726, 20631, + 20724, 20727, 20726, 20725, + 20728, 20729, 20726, 20727, + 20632, 20631, 20726, 20729, + 20632, 20729, 20730, 20635, + 20728, 20731, 20730, 20729, + 20732, 20733, 20730, 20731, + 20636, 20635, 20730, 20733, + 20636, 20733, 20734, 20639, + 20732, 20735, 20734, 20733, + 20736, 20737, 20734, 20735, + 20640, 20639, 20734, 20737, + 20640, 20737, 20738, 20643, + 20736, 20739, 20738, 20737, + 20740, 20741, 20738, 20739, + 20644, 20643, 20738, 20741, + 20644, 20741, 20742, 20647, + 20740, 20743, 20742, 20741, + 20744, 20745, 20742, 20743, + 20648, 20647, 20742, 20745, + 20648, 20745, 20746, 20651, + 20744, 20747, 20746, 20745, + 20748, 20749, 20746, 20747, + 20652, 20651, 20746, 20749, + 20652, 20749, 20750, 20655, + 20748, 20751, 20750, 20749, + 20752, 20753, 20750, 20751, + 20656, 20655, 20750, 20753, + 20656, 20753, 20754, 20659, + 20752, 20755, 20754, 20753, + 20756, 20757, 20754, 20755, + 20660, 20659, 20754, 20757, + 16778, 16783, 20758, 20663, + 16782, 20759, 20758, 16783, + 20760, 20761, 20758, 20759, + 20664, 20663, 20758, 20761, + 20664, 20761, 20762, 20667, + 20760, 20763, 20762, 20761, + 20764, 20765, 20762, 20763, + 20668, 20667, 20762, 20765, + 20668, 20765, 20766, 20671, + 20764, 20767, 20766, 20765, + 20768, 20769, 20766, 20767, + 20672, 20671, 20766, 20769, + 20672, 20769, 20770, 20675, + 20768, 20771, 20770, 20769, + 20772, 20773, 20770, 20771, + 20676, 20675, 20770, 20773, + 20676, 20773, 20774, 20679, + 20772, 20775, 20774, 20773, + 20776, 20777, 20774, 20775, + 20680, 20679, 20774, 20777, + 20680, 20777, 20778, 20683, + 20776, 20779, 20778, 20777, + 20780, 20781, 20778, 20779, + 20684, 20683, 20778, 20781, + 20684, 20781, 20782, 20687, + 20780, 20783, 20782, 20781, + 20784, 20785, 20782, 20783, + 20688, 20687, 20782, 20785, + 20688, 20785, 20786, 20691, + 20784, 20787, 20786, 20785, + 20788, 20789, 20786, 20787, + 20692, 20691, 20786, 20789, + 20692, 20789, 20790, 20695, + 20788, 20791, 20790, 20789, + 20792, 20793, 20790, 20791, + 20696, 20695, 20790, 20793, + 20696, 20793, 20794, 20699, + 20792, 20795, 20794, 20793, + 20796, 20797, 20794, 20795, + 20700, 20699, 20794, 20797, + 20700, 20797, 20798, 20703, + 20796, 20799, 20798, 20797, + 20800, 20801, 20798, 20799, + 20704, 20703, 20798, 20801, + 20704, 20801, 20802, 20707, + 20800, 20803, 20802, 20801, + 20804, 20805, 20802, 20803, + 20708, 20707, 20802, 20805, + 20708, 20805, 20806, 20711, + 20804, 20807, 20806, 20805, + 20808, 20809, 20806, 20807, + 20712, 20711, 20806, 20809, + 20712, 20809, 20810, 20715, + 20808, 20811, 20810, 20809, + 20812, 20813, 20810, 20811, + 20716, 20715, 20810, 20813, + 20716, 20813, 20814, 20719, + 20812, 20815, 20814, 20813, + 20816, 20817, 20814, 20815, + 20720, 20719, 20814, 20817, + 20720, 20817, 20818, 20723, + 20816, 20819, 20818, 20817, + 20820, 20821, 20818, 20819, + 20724, 20723, 20818, 20821, + 20724, 20821, 20822, 20727, + 20820, 20823, 20822, 20821, + 20824, 20825, 20822, 20823, + 20728, 20727, 20822, 20825, + 20728, 20825, 20826, 20731, + 20824, 20827, 20826, 20825, + 20828, 20829, 20826, 20827, + 20732, 20731, 20826, 20829, + 20732, 20829, 20830, 20735, + 20828, 20831, 20830, 20829, + 20832, 20833, 20830, 20831, + 20736, 20735, 20830, 20833, + 20736, 20833, 20834, 20739, + 20832, 20835, 20834, 20833, + 20836, 20837, 20834, 20835, + 20740, 20739, 20834, 20837, + 20740, 20837, 20838, 20743, + 20836, 20839, 20838, 20837, + 20840, 20841, 20838, 20839, + 20744, 20743, 20838, 20841, + 20744, 20841, 20842, 20747, + 20840, 20843, 20842, 20841, + 20844, 20845, 20842, 20843, + 20748, 20747, 20842, 20845, + 20748, 20845, 20846, 20751, + 20844, 20847, 20846, 20845, + 20848, 20849, 20846, 20847, + 20752, 20751, 20846, 20849, + 20752, 20849, 20850, 20755, + 20848, 20851, 20850, 20849, + 20852, 20853, 20850, 20851, + 20756, 20755, 20850, 20853, + 16782, 16787, 20854, 20759, + 16786, 20855, 20854, 16787, + 20856, 20857, 20854, 20855, + 20760, 20759, 20854, 20857, + 20760, 20857, 20858, 20763, + 20856, 20859, 20858, 20857, + 20860, 20861, 20858, 20859, + 20764, 20763, 20858, 20861, + 20764, 20861, 20862, 20767, + 20860, 20863, 20862, 20861, + 20864, 20865, 20862, 20863, + 20768, 20767, 20862, 20865, + 20768, 20865, 20866, 20771, + 20864, 20867, 20866, 20865, + 20868, 20869, 20866, 20867, + 20772, 20771, 20866, 20869, + 20772, 20869, 20870, 20775, + 20868, 20871, 20870, 20869, + 20872, 20873, 20870, 20871, + 20776, 20775, 20870, 20873, + 20776, 20873, 20874, 20779, + 20872, 20875, 20874, 20873, + 20876, 20877, 20874, 20875, + 20780, 20779, 20874, 20877, + 20780, 20877, 20878, 20783, + 20876, 20879, 20878, 20877, + 20880, 20881, 20878, 20879, + 20784, 20783, 20878, 20881, + 20784, 20881, 20882, 20787, + 20880, 20883, 20882, 20881, + 20884, 20885, 20882, 20883, + 20788, 20787, 20882, 20885, + 20788, 20885, 20886, 20791, + 20884, 20887, 20886, 20885, + 20888, 20889, 20886, 20887, + 20792, 20791, 20886, 20889, + 20792, 20889, 20890, 20795, + 20888, 20891, 20890, 20889, + 20892, 20893, 20890, 20891, + 20796, 20795, 20890, 20893, + 20796, 20893, 20894, 20799, + 20892, 20895, 20894, 20893, + 20896, 20897, 20894, 20895, + 20800, 20799, 20894, 20897, + 20800, 20897, 20898, 20803, + 20896, 20899, 20898, 20897, + 20900, 20901, 20898, 20899, + 20804, 20803, 20898, 20901, + 20804, 20901, 20902, 20807, + 20900, 20903, 20902, 20901, + 20904, 20905, 20902, 20903, + 20808, 20807, 20902, 20905, + 20808, 20905, 20906, 20811, + 20904, 20907, 20906, 20905, + 20908, 20909, 20906, 20907, + 20812, 20811, 20906, 20909, + 20812, 20909, 20910, 20815, + 20908, 20911, 20910, 20909, + 20912, 20913, 20910, 20911, + 20816, 20815, 20910, 20913, + 20816, 20913, 20914, 20819, + 20912, 20915, 20914, 20913, + 20916, 20917, 20914, 20915, + 20820, 20819, 20914, 20917, + 20820, 20917, 20918, 20823, + 20916, 20919, 20918, 20917, + 20920, 20921, 20918, 20919, + 20824, 20823, 20918, 20921, + 20824, 20921, 20922, 20827, + 20920, 20923, 20922, 20921, + 20924, 20925, 20922, 20923, + 20828, 20827, 20922, 20925, + 20828, 20925, 20926, 20831, + 20924, 20927, 20926, 20925, + 20928, 20929, 20926, 20927, + 20832, 20831, 20926, 20929, + 20832, 20929, 20930, 20835, + 20928, 20931, 20930, 20929, + 20932, 20933, 20930, 20931, + 20836, 20835, 20930, 20933, + 20836, 20933, 20934, 20839, + 20932, 20935, 20934, 20933, + 20936, 20937, 20934, 20935, + 20840, 20839, 20934, 20937, + 20840, 20937, 20938, 20843, + 20936, 20939, 20938, 20937, + 20940, 20941, 20938, 20939, + 20844, 20843, 20938, 20941, + 20844, 20941, 20942, 20847, + 20940, 20943, 20942, 20941, + 20944, 20945, 20942, 20943, + 20848, 20847, 20942, 20945, + 20848, 20945, 20946, 20851, + 20944, 20947, 20946, 20945, + 20948, 20949, 20946, 20947, + 20852, 20851, 20946, 20949, + 16786, 16791, 20950, 20855, + 16790, 20951, 20950, 16791, + 20952, 20953, 20950, 20951, + 20856, 20855, 20950, 20953, + 20856, 20953, 20954, 20859, + 20952, 20955, 20954, 20953, + 20956, 20957, 20954, 20955, + 20860, 20859, 20954, 20957, + 20860, 20957, 20958, 20863, + 20956, 20959, 20958, 20957, + 20960, 20961, 20958, 20959, + 20864, 20863, 20958, 20961, + 20864, 20961, 20962, 20867, + 20960, 20963, 20962, 20961, + 20964, 20965, 20962, 20963, + 20868, 20867, 20962, 20965, + 20868, 20965, 20966, 20871, + 20964, 20967, 20966, 20965, + 20968, 20969, 20966, 20967, + 20872, 20871, 20966, 20969, + 20872, 20969, 20970, 20875, + 20968, 20971, 20970, 20969, + 20972, 20973, 20970, 20971, + 20876, 20875, 20970, 20973, + 20876, 20973, 20974, 20879, + 20972, 20975, 20974, 20973, + 20976, 20977, 20974, 20975, + 20880, 20879, 20974, 20977, + 20880, 20977, 20978, 20883, + 20976, 20979, 20978, 20977, + 20980, 20981, 20978, 20979, + 20884, 20883, 20978, 20981, + 20884, 20981, 20982, 20887, + 20980, 20983, 20982, 20981, + 20984, 20985, 20982, 20983, + 20888, 20887, 20982, 20985, + 20888, 20985, 20986, 20891, + 20984, 20987, 20986, 20985, + 20988, 20989, 20986, 20987, + 20892, 20891, 20986, 20989, + 20892, 20989, 20990, 20895, + 20988, 20991, 20990, 20989, + 20992, 20993, 20990, 20991, + 20896, 20895, 20990, 20993, + 20896, 20993, 20994, 20899, + 20992, 20995, 20994, 20993, + 20996, 20997, 20994, 20995, + 20900, 20899, 20994, 20997, + 20900, 20997, 20998, 20903, + 20996, 20999, 20998, 20997, + 21000, 21001, 20998, 20999, + 20904, 20903, 20998, 21001, + 20904, 21001, 21002, 20907, + 21000, 21003, 21002, 21001, + 21004, 21005, 21002, 21003, + 20908, 20907, 21002, 21005, + 20908, 21005, 21006, 20911, + 21004, 21007, 21006, 21005, + 21008, 21009, 21006, 21007, + 20912, 20911, 21006, 21009, + 20912, 21009, 21010, 20915, + 21008, 21011, 21010, 21009, + 21012, 21013, 21010, 21011, + 20916, 20915, 21010, 21013, + 20916, 21013, 21014, 20919, + 21012, 21015, 21014, 21013, + 21016, 21017, 21014, 21015, + 20920, 20919, 21014, 21017, + 20920, 21017, 21018, 20923, + 21016, 21019, 21018, 21017, + 21020, 21021, 21018, 21019, + 20924, 20923, 21018, 21021, + 20924, 21021, 21022, 20927, + 21020, 21023, 21022, 21021, + 21024, 21025, 21022, 21023, + 20928, 20927, 21022, 21025, + 20928, 21025, 21026, 20931, + 21024, 21027, 21026, 21025, + 21028, 21029, 21026, 21027, + 20932, 20931, 21026, 21029, + 20932, 21029, 21030, 20935, + 21028, 21031, 21030, 21029, + 21032, 21033, 21030, 21031, + 20936, 20935, 21030, 21033, + 20936, 21033, 21034, 20939, + 21032, 21035, 21034, 21033, + 21036, 21037, 21034, 21035, + 20940, 20939, 21034, 21037, + 20940, 21037, 21038, 20943, + 21036, 21039, 21038, 21037, + 21040, 21041, 21038, 21039, + 20944, 20943, 21038, 21041, + 20944, 21041, 21042, 20947, + 21040, 21043, 21042, 21041, + 21044, 21045, 21042, 21043, + 20948, 20947, 21042, 21045, + 16790, 16795, 21046, 20951, + 16794, 21047, 21046, 16795, + 21048, 21049, 21046, 21047, + 20952, 20951, 21046, 21049, + 20952, 21049, 21050, 20955, + 21048, 21051, 21050, 21049, + 21052, 21053, 21050, 21051, + 20956, 20955, 21050, 21053, + 20956, 21053, 21054, 20959, + 21052, 21055, 21054, 21053, + 21056, 21057, 21054, 21055, + 20960, 20959, 21054, 21057, + 20960, 21057, 21058, 20963, + 21056, 21059, 21058, 21057, + 21060, 21061, 21058, 21059, + 20964, 20963, 21058, 21061, + 20964, 21061, 21062, 20967, + 21060, 21063, 21062, 21061, + 21064, 21065, 21062, 21063, + 20968, 20967, 21062, 21065, + 20968, 21065, 21066, 20971, + 21064, 21067, 21066, 21065, + 21068, 21069, 21066, 21067, + 20972, 20971, 21066, 21069, + 20972, 21069, 21070, 20975, + 21068, 21071, 21070, 21069, + 21072, 21073, 21070, 21071, + 20976, 20975, 21070, 21073, + 20976, 21073, 21074, 20979, + 21072, 21075, 21074, 21073, + 21076, 21077, 21074, 21075, + 20980, 20979, 21074, 21077, + 20980, 21077, 21078, 20983, + 21076, 21079, 21078, 21077, + 21080, 21081, 21078, 21079, + 20984, 20983, 21078, 21081, + 20984, 21081, 21082, 20987, + 21080, 21083, 21082, 21081, + 21084, 21085, 21082, 21083, + 20988, 20987, 21082, 21085, + 20988, 21085, 21086, 20991, + 21084, 21087, 21086, 21085, + 21088, 21089, 21086, 21087, + 20992, 20991, 21086, 21089, + 20992, 21089, 21090, 20995, + 21088, 21091, 21090, 21089, + 21092, 21093, 21090, 21091, + 20996, 20995, 21090, 21093, + 20996, 21093, 21094, 20999, + 21092, 21095, 21094, 21093, + 21096, 21097, 21094, 21095, + 21000, 20999, 21094, 21097, + 21000, 21097, 21098, 21003, + 21096, 21099, 21098, 21097, + 21100, 21101, 21098, 21099, + 21004, 21003, 21098, 21101, + 21004, 21101, 21102, 21007, + 21100, 21103, 21102, 21101, + 21104, 21105, 21102, 21103, + 21008, 21007, 21102, 21105, + 21008, 21105, 21106, 21011, + 21104, 21107, 21106, 21105, + 21108, 21109, 21106, 21107, + 21012, 21011, 21106, 21109, + 21012, 21109, 21110, 21015, + 21108, 21111, 21110, 21109, + 21112, 21113, 21110, 21111, + 21016, 21015, 21110, 21113, + 21016, 21113, 21114, 21019, + 21112, 21115, 21114, 21113, + 21116, 21117, 21114, 21115, + 21020, 21019, 21114, 21117, + 21020, 21117, 21118, 21023, + 21116, 21119, 21118, 21117, + 21120, 21121, 21118, 21119, + 21024, 21023, 21118, 21121, + 21024, 21121, 21122, 21027, + 21120, 21123, 21122, 21121, + 21124, 21125, 21122, 21123, + 21028, 21027, 21122, 21125, + 21028, 21125, 21126, 21031, + 21124, 21127, 21126, 21125, + 21128, 21129, 21126, 21127, + 21032, 21031, 21126, 21129, + 21032, 21129, 21130, 21035, + 21128, 21131, 21130, 21129, + 21132, 21133, 21130, 21131, + 21036, 21035, 21130, 21133, + 21036, 21133, 21134, 21039, + 21132, 21135, 21134, 21133, + 21136, 21137, 21134, 21135, + 21040, 21039, 21134, 21137, + 21040, 21137, 21138, 21043, + 21136, 21139, 21138, 21137, + 21140, 21141, 21138, 21139, + 21044, 21043, 21138, 21141, + 16794, 16799, 21142, 21047, + 16798, 21143, 21142, 16799, + 21144, 21145, 21142, 21143, + 21048, 21047, 21142, 21145, + 21048, 21145, 21146, 21051, + 21144, 21147, 21146, 21145, + 21148, 21149, 21146, 21147, + 21052, 21051, 21146, 21149, + 21052, 21149, 21150, 21055, + 21148, 21151, 21150, 21149, + 21152, 21153, 21150, 21151, + 21056, 21055, 21150, 21153, + 21056, 21153, 21154, 21059, + 21152, 21155, 21154, 21153, + 21156, 21157, 21154, 21155, + 21060, 21059, 21154, 21157, + 21060, 21157, 21158, 21063, + 21156, 21159, 21158, 21157, + 21160, 21161, 21158, 21159, + 21064, 21063, 21158, 21161, + 21064, 21161, 21162, 21067, + 21160, 21163, 21162, 21161, + 21164, 21165, 21162, 21163, + 21068, 21067, 21162, 21165, + 21068, 21165, 21166, 21071, + 21164, 21167, 21166, 21165, + 21168, 21169, 21166, 21167, + 21072, 21071, 21166, 21169, + 21072, 21169, 21170, 21075, + 21168, 21171, 21170, 21169, + 21172, 21173, 21170, 21171, + 21076, 21075, 21170, 21173, + 21076, 21173, 21174, 21079, + 21172, 21175, 21174, 21173, + 21176, 21177, 21174, 21175, + 21080, 21079, 21174, 21177, + 21080, 21177, 21178, 21083, + 21176, 21179, 21178, 21177, + 21180, 21181, 21178, 21179, + 21084, 21083, 21178, 21181, + 21084, 21181, 21182, 21087, + 21180, 21183, 21182, 21181, + 21184, 21185, 21182, 21183, + 21088, 21087, 21182, 21185, + 21088, 21185, 21186, 21091, + 21184, 21187, 21186, 21185, + 21188, 21189, 21186, 21187, + 21092, 21091, 21186, 21189, + 21092, 21189, 21190, 21095, + 21188, 21191, 21190, 21189, + 21192, 21193, 21190, 21191, + 21096, 21095, 21190, 21193, + 21096, 21193, 21194, 21099, + 21192, 21195, 21194, 21193, + 21196, 21197, 21194, 21195, + 21100, 21099, 21194, 21197, + 21100, 21197, 21198, 21103, + 21196, 21199, 21198, 21197, + 21200, 21201, 21198, 21199, + 21104, 21103, 21198, 21201, + 21104, 21201, 21202, 21107, + 21200, 21203, 21202, 21201, + 21204, 21205, 21202, 21203, + 21108, 21107, 21202, 21205, + 21108, 21205, 21206, 21111, + 21204, 21207, 21206, 21205, + 21208, 21209, 21206, 21207, + 21112, 21111, 21206, 21209, + 21112, 21209, 21210, 21115, + 21208, 21211, 21210, 21209, + 21212, 21213, 21210, 21211, + 21116, 21115, 21210, 21213, + 21116, 21213, 21214, 21119, + 21212, 21215, 21214, 21213, + 21216, 21217, 21214, 21215, + 21120, 21119, 21214, 21217, + 21120, 21217, 21218, 21123, + 21216, 21219, 21218, 21217, + 21220, 21221, 21218, 21219, + 21124, 21123, 21218, 21221, + 21124, 21221, 21222, 21127, + 21220, 21223, 21222, 21221, + 21224, 21225, 21222, 21223, + 21128, 21127, 21222, 21225, + 21128, 21225, 21226, 21131, + 21224, 21227, 21226, 21225, + 21228, 21229, 21226, 21227, + 21132, 21131, 21226, 21229, + 21132, 21229, 21230, 21135, + 21228, 21231, 21230, 21229, + 21232, 21233, 21230, 21231, + 21136, 21135, 21230, 21233, + 21136, 21233, 21234, 21139, + 21232, 21235, 21234, 21233, + 21236, 21237, 21234, 21235, + 21140, 21139, 21234, 21237, + 16798, 16803, 21238, 21143, + 16802, 21239, 21238, 16803, + 21240, 21241, 21238, 21239, + 21144, 21143, 21238, 21241, + 21144, 21241, 21242, 21147, + 21240, 21243, 21242, 21241, + 21244, 21245, 21242, 21243, + 21148, 21147, 21242, 21245, + 21148, 21245, 21246, 21151, + 21244, 21247, 21246, 21245, + 21248, 21249, 21246, 21247, + 21152, 21151, 21246, 21249, + 21152, 21249, 21250, 21155, + 21248, 21251, 21250, 21249, + 21252, 21253, 21250, 21251, + 21156, 21155, 21250, 21253, + 21156, 21253, 21254, 21159, + 21252, 21255, 21254, 21253, + 21256, 21257, 21254, 21255, + 21160, 21159, 21254, 21257, + 21160, 21257, 21258, 21163, + 21256, 21259, 21258, 21257, + 21260, 21261, 21258, 21259, + 21164, 21163, 21258, 21261, + 21164, 21261, 21262, 21167, + 21260, 21263, 21262, 21261, + 21264, 21265, 21262, 21263, + 21168, 21167, 21262, 21265, + 21168, 21265, 21266, 21171, + 21264, 21267, 21266, 21265, + 21268, 21269, 21266, 21267, + 21172, 21171, 21266, 21269, + 21172, 21269, 21270, 21175, + 21268, 21271, 21270, 21269, + 21272, 21273, 21270, 21271, + 21176, 21175, 21270, 21273, + 21176, 21273, 21274, 21179, + 21272, 21275, 21274, 21273, + 21276, 21277, 21274, 21275, + 21180, 21179, 21274, 21277, + 21180, 21277, 21278, 21183, + 21276, 21279, 21278, 21277, + 21280, 21281, 21278, 21279, + 21184, 21183, 21278, 21281, + 21184, 21281, 21282, 21187, + 21280, 21283, 21282, 21281, + 21284, 21285, 21282, 21283, + 21188, 21187, 21282, 21285, + 21188, 21285, 21286, 21191, + 21284, 21287, 21286, 21285, + 21288, 21289, 21286, 21287, + 21192, 21191, 21286, 21289, + 21192, 21289, 21290, 21195, + 21288, 21291, 21290, 21289, + 21292, 21293, 21290, 21291, + 21196, 21195, 21290, 21293, + 21196, 21293, 21294, 21199, + 21292, 21295, 21294, 21293, + 21296, 21297, 21294, 21295, + 21200, 21199, 21294, 21297, + 21200, 21297, 21298, 21203, + 21296, 21299, 21298, 21297, + 21300, 21301, 21298, 21299, + 21204, 21203, 21298, 21301, + 21204, 21301, 21302, 21207, + 21300, 21303, 21302, 21301, + 21304, 21305, 21302, 21303, + 21208, 21207, 21302, 21305, + 21208, 21305, 21306, 21211, + 21304, 21307, 21306, 21305, + 21308, 21309, 21306, 21307, + 21212, 21211, 21306, 21309, + 21212, 21309, 21310, 21215, + 21308, 21311, 21310, 21309, + 21312, 21313, 21310, 21311, + 21216, 21215, 21310, 21313, + 21216, 21313, 21314, 21219, + 21312, 21315, 21314, 21313, + 21316, 21317, 21314, 21315, + 21220, 21219, 21314, 21317, + 21220, 21317, 21318, 21223, + 21316, 21319, 21318, 21317, + 21320, 21321, 21318, 21319, + 21224, 21223, 21318, 21321, + 21224, 21321, 21322, 21227, + 21320, 21323, 21322, 21321, + 21324, 21325, 21322, 21323, + 21228, 21227, 21322, 21325, + 21228, 21325, 21326, 21231, + 21324, 21327, 21326, 21325, + 21328, 21329, 21326, 21327, + 21232, 21231, 21326, 21329, + 21232, 21329, 21330, 21235, + 21328, 21331, 21330, 21329, + 21332, 21333, 21330, 21331, + 21236, 21235, 21330, 21333, + 16802, 16807, 21334, 21239, + 16806, 21335, 21334, 16807, + 21336, 21337, 21334, 21335, + 21240, 21239, 21334, 21337, + 21240, 21337, 21338, 21243, + 21336, 21339, 21338, 21337, + 21340, 21341, 21338, 21339, + 21244, 21243, 21338, 21341, + 21244, 21341, 21342, 21247, + 21340, 21343, 21342, 21341, + 21344, 21345, 21342, 21343, + 21248, 21247, 21342, 21345, + 21248, 21345, 21346, 21251, + 21344, 21347, 21346, 21345, + 21348, 21349, 21346, 21347, + 21252, 21251, 21346, 21349, + 21252, 21349, 21350, 21255, + 21348, 21351, 21350, 21349, + 21352, 21353, 21350, 21351, + 21256, 21255, 21350, 21353, + 21256, 21353, 21354, 21259, + 21352, 21355, 21354, 21353, + 21356, 21357, 21354, 21355, + 21260, 21259, 21354, 21357, + 21260, 21357, 21358, 21263, + 21356, 21359, 21358, 21357, + 21360, 21361, 21358, 21359, + 21264, 21263, 21358, 21361, + 21264, 21361, 21362, 21267, + 21360, 21363, 21362, 21361, + 21364, 21365, 21362, 21363, + 21268, 21267, 21362, 21365, + 21268, 21365, 21366, 21271, + 21364, 21367, 21366, 21365, + 21368, 21369, 21366, 21367, + 21272, 21271, 21366, 21369, + 21272, 21369, 21370, 21275, + 21368, 21371, 21370, 21369, + 21372, 21373, 21370, 21371, + 21276, 21275, 21370, 21373, + 21276, 21373, 21374, 21279, + 21372, 21375, 21374, 21373, + 21376, 21377, 21374, 21375, + 21280, 21279, 21374, 21377, + 21280, 21377, 21378, 21283, + 21376, 21379, 21378, 21377, + 21380, 21381, 21378, 21379, + 21284, 21283, 21378, 21381, + 21284, 21381, 21382, 21287, + 21380, 21383, 21382, 21381, + 21384, 21385, 21382, 21383, + 21288, 21287, 21382, 21385, + 21288, 21385, 21386, 21291, + 21384, 21387, 21386, 21385, + 21388, 21389, 21386, 21387, + 21292, 21291, 21386, 21389, + 21292, 21389, 21390, 21295, + 21388, 21391, 21390, 21389, + 21392, 21393, 21390, 21391, + 21296, 21295, 21390, 21393, + 21296, 21393, 21394, 21299, + 21392, 21395, 21394, 21393, + 21396, 21397, 21394, 21395, + 21300, 21299, 21394, 21397, + 21300, 21397, 21398, 21303, + 21396, 21399, 21398, 21397, + 21400, 21401, 21398, 21399, + 21304, 21303, 21398, 21401, + 21304, 21401, 21402, 21307, + 21400, 21403, 21402, 21401, + 21404, 21405, 21402, 21403, + 21308, 21307, 21402, 21405, + 21308, 21405, 21406, 21311, + 21404, 21407, 21406, 21405, + 21408, 21409, 21406, 21407, + 21312, 21311, 21406, 21409, + 21312, 21409, 21410, 21315, + 21408, 21411, 21410, 21409, + 21412, 21413, 21410, 21411, + 21316, 21315, 21410, 21413, + 21316, 21413, 21414, 21319, + 21412, 21415, 21414, 21413, + 21416, 21417, 21414, 21415, + 21320, 21319, 21414, 21417, + 21320, 21417, 21418, 21323, + 21416, 21419, 21418, 21417, + 21420, 21421, 21418, 21419, + 21324, 21323, 21418, 21421, + 21324, 21421, 21422, 21327, + 21420, 21423, 21422, 21421, + 21424, 21425, 21422, 21423, + 21328, 21327, 21422, 21425, + 21328, 21425, 21426, 21331, + 21424, 21427, 21426, 21425, + 21428, 21429, 21426, 21427, + 21332, 21331, 21426, 21429, + 16806, 16811, 21430, 21335, + 16810, 21431, 21430, 16811, + 21432, 21433, 21430, 21431, + 21336, 21335, 21430, 21433, + 21336, 21433, 21434, 21339, + 21432, 21435, 21434, 21433, + 21436, 21437, 21434, 21435, + 21340, 21339, 21434, 21437, + 21340, 21437, 21438, 21343, + 21436, 21439, 21438, 21437, + 21440, 21441, 21438, 21439, + 21344, 21343, 21438, 21441, + 21344, 21441, 21442, 21347, + 21440, 21443, 21442, 21441, + 21444, 21445, 21442, 21443, + 21348, 21347, 21442, 21445, + 21348, 21445, 21446, 21351, + 21444, 21447, 21446, 21445, + 21448, 21449, 21446, 21447, + 21352, 21351, 21446, 21449, + 21352, 21449, 21450, 21355, + 21448, 21451, 21450, 21449, + 21452, 21453, 21450, 21451, + 21356, 21355, 21450, 21453, + 21356, 21453, 21454, 21359, + 21452, 21455, 21454, 21453, + 21456, 21457, 21454, 21455, + 21360, 21359, 21454, 21457, + 21360, 21457, 21458, 21363, + 21456, 21459, 21458, 21457, + 21460, 21461, 21458, 21459, + 21364, 21363, 21458, 21461, + 21364, 21461, 21462, 21367, + 21460, 21463, 21462, 21461, + 21464, 21465, 21462, 21463, + 21368, 21367, 21462, 21465, + 21368, 21465, 21466, 21371, + 21464, 21467, 21466, 21465, + 21468, 21469, 21466, 21467, + 21372, 21371, 21466, 21469, + 21372, 21469, 21470, 21375, + 21468, 21471, 21470, 21469, + 21472, 21473, 21470, 21471, + 21376, 21375, 21470, 21473, + 21376, 21473, 21474, 21379, + 21472, 21475, 21474, 21473, + 21476, 21477, 21474, 21475, + 21380, 21379, 21474, 21477, + 21380, 21477, 21478, 21383, + 21476, 21479, 21478, 21477, + 21480, 21481, 21478, 21479, + 21384, 21383, 21478, 21481, + 21384, 21481, 21482, 21387, + 21480, 21483, 21482, 21481, + 21484, 21485, 21482, 21483, + 21388, 21387, 21482, 21485, + 21388, 21485, 21486, 21391, + 21484, 21487, 21486, 21485, + 21488, 21489, 21486, 21487, + 21392, 21391, 21486, 21489, + 21392, 21489, 21490, 21395, + 21488, 21491, 21490, 21489, + 21492, 21493, 21490, 21491, + 21396, 21395, 21490, 21493, + 21396, 21493, 21494, 21399, + 21492, 21495, 21494, 21493, + 21496, 21497, 21494, 21495, + 21400, 21399, 21494, 21497, + 21400, 21497, 21498, 21403, + 21496, 21499, 21498, 21497, + 21500, 21501, 21498, 21499, + 21404, 21403, 21498, 21501, + 21404, 21501, 21502, 21407, + 21500, 21503, 21502, 21501, + 21504, 21505, 21502, 21503, + 21408, 21407, 21502, 21505, + 21408, 21505, 21506, 21411, + 21504, 21507, 21506, 21505, + 21508, 21509, 21506, 21507, + 21412, 21411, 21506, 21509, + 21412, 21509, 21510, 21415, + 21508, 21511, 21510, 21509, + 21512, 21513, 21510, 21511, + 21416, 21415, 21510, 21513, + 21416, 21513, 21514, 21419, + 21512, 21515, 21514, 21513, + 21516, 21517, 21514, 21515, + 21420, 21419, 21514, 21517, + 21420, 21517, 21518, 21423, + 21516, 21519, 21518, 21517, + 21520, 21521, 21518, 21519, + 21424, 21423, 21518, 21521, + 21424, 21521, 21522, 21427, + 21520, 21523, 21522, 21521, + 21524, 21525, 21522, 21523, + 21428, 21427, 21522, 21525, + 16810, 16815, 21526, 21431, + 16814, 21527, 21526, 16815, + 21528, 21529, 21526, 21527, + 21432, 21431, 21526, 21529, + 21432, 21529, 21530, 21435, + 21528, 21531, 21530, 21529, + 21532, 21533, 21530, 21531, + 21436, 21435, 21530, 21533, + 21436, 21533, 21534, 21439, + 21532, 21535, 21534, 21533, + 21536, 21537, 21534, 21535, + 21440, 21439, 21534, 21537, + 21440, 21537, 21538, 21443, + 21536, 21539, 21538, 21537, + 21540, 21541, 21538, 21539, + 21444, 21443, 21538, 21541, + 21444, 21541, 21542, 21447, + 21540, 21543, 21542, 21541, + 21544, 21545, 21542, 21543, + 21448, 21447, 21542, 21545, + 21448, 21545, 21546, 21451, + 21544, 21547, 21546, 21545, + 21548, 21549, 21546, 21547, + 21452, 21451, 21546, 21549, + 21452, 21549, 21550, 21455, + 21548, 21551, 21550, 21549, + 21552, 21553, 21550, 21551, + 21456, 21455, 21550, 21553, + 21456, 21553, 21554, 21459, + 21552, 21555, 21554, 21553, + 21556, 21557, 21554, 21555, + 21460, 21459, 21554, 21557, + 21460, 21557, 21558, 21463, + 21556, 21559, 21558, 21557, + 21560, 21561, 21558, 21559, + 21464, 21463, 21558, 21561, + 21464, 21561, 21562, 21467, + 21560, 21563, 21562, 21561, + 21564, 21565, 21562, 21563, + 21468, 21467, 21562, 21565, + 21468, 21565, 21566, 21471, + 21564, 21567, 21566, 21565, + 21568, 21569, 21566, 21567, + 21472, 21471, 21566, 21569, + 21472, 21569, 21570, 21475, + 21568, 21571, 21570, 21569, + 21572, 21573, 21570, 21571, + 21476, 21475, 21570, 21573, + 21476, 21573, 21574, 21479, + 21572, 21575, 21574, 21573, + 21576, 21577, 21574, 21575, + 21480, 21479, 21574, 21577, + 21480, 21577, 21578, 21483, + 21576, 21579, 21578, 21577, + 21580, 21581, 21578, 21579, + 21484, 21483, 21578, 21581, + 21484, 21581, 21582, 21487, + 21580, 21583, 21582, 21581, + 21584, 21585, 21582, 21583, + 21488, 21487, 21582, 21585, + 21488, 21585, 21586, 21491, + 21584, 21587, 21586, 21585, + 21588, 21589, 21586, 21587, + 21492, 21491, 21586, 21589, + 21492, 21589, 21590, 21495, + 21588, 21591, 21590, 21589, + 21592, 21593, 21590, 21591, + 21496, 21495, 21590, 21593, + 21496, 21593, 21594, 21499, + 21592, 21595, 21594, 21593, + 21596, 21597, 21594, 21595, + 21500, 21499, 21594, 21597, + 21500, 21597, 21598, 21503, + 21596, 21599, 21598, 21597, + 21600, 21601, 21598, 21599, + 21504, 21503, 21598, 21601, + 21504, 21601, 21602, 21507, + 21600, 21603, 21602, 21601, + 21604, 21605, 21602, 21603, + 21508, 21507, 21602, 21605, + 21508, 21605, 21606, 21511, + 21604, 21607, 21606, 21605, + 21608, 21609, 21606, 21607, + 21512, 21511, 21606, 21609, + 21512, 21609, 21610, 21515, + 21608, 21611, 21610, 21609, + 21612, 21613, 21610, 21611, + 21516, 21515, 21610, 21613, + 21516, 21613, 21614, 21519, + 21612, 21615, 21614, 21613, + 21616, 21617, 21614, 21615, + 21520, 21519, 21614, 21617, + 21520, 21617, 21618, 21523, + 21616, 21619, 21618, 21617, + 21620, 21621, 21618, 21619, + 21524, 21523, 21618, 21621, + 16814, 16819, 21622, 21527, + 16818, 21623, 21622, 16819, + 21624, 21625, 21622, 21623, + 21528, 21527, 21622, 21625, + 21528, 21625, 21626, 21531, + 21624, 21627, 21626, 21625, + 21628, 21629, 21626, 21627, + 21532, 21531, 21626, 21629, + 21532, 21629, 21630, 21535, + 21628, 21631, 21630, 21629, + 21632, 21633, 21630, 21631, + 21536, 21535, 21630, 21633, + 21536, 21633, 21634, 21539, + 21632, 21635, 21634, 21633, + 21636, 21637, 21634, 21635, + 21540, 21539, 21634, 21637, + 21540, 21637, 21638, 21543, + 21636, 21639, 21638, 21637, + 21640, 21641, 21638, 21639, + 21544, 21543, 21638, 21641, + 21544, 21641, 21642, 21547, + 21640, 21643, 21642, 21641, + 21644, 21645, 21642, 21643, + 21548, 21547, 21642, 21645, + 21548, 21645, 21646, 21551, + 21644, 21647, 21646, 21645, + 21648, 21649, 21646, 21647, + 21552, 21551, 21646, 21649, + 21552, 21649, 21650, 21555, + 21648, 21651, 21650, 21649, + 21652, 21653, 21650, 21651, + 21556, 21555, 21650, 21653, + 21556, 21653, 21654, 21559, + 21652, 21655, 21654, 21653, + 21656, 21657, 21654, 21655, + 21560, 21559, 21654, 21657, + 21560, 21657, 21658, 21563, + 21656, 21659, 21658, 21657, + 21660, 21661, 21658, 21659, + 21564, 21563, 21658, 21661, + 21564, 21661, 21662, 21567, + 21660, 21663, 21662, 21661, + 21664, 21665, 21662, 21663, + 21568, 21567, 21662, 21665, + 21568, 21665, 21666, 21571, + 21664, 21667, 21666, 21665, + 21668, 21669, 21666, 21667, + 21572, 21571, 21666, 21669, + 21572, 21669, 21670, 21575, + 21668, 21671, 21670, 21669, + 21672, 21673, 21670, 21671, + 21576, 21575, 21670, 21673, + 21576, 21673, 21674, 21579, + 21672, 21675, 21674, 21673, + 21676, 21677, 21674, 21675, + 21580, 21579, 21674, 21677, + 21580, 21677, 21678, 21583, + 21676, 21679, 21678, 21677, + 21680, 21681, 21678, 21679, + 21584, 21583, 21678, 21681, + 21584, 21681, 21682, 21587, + 21680, 21683, 21682, 21681, + 21684, 21685, 21682, 21683, + 21588, 21587, 21682, 21685, + 21588, 21685, 21686, 21591, + 21684, 21687, 21686, 21685, + 21688, 21689, 21686, 21687, + 21592, 21591, 21686, 21689, + 21592, 21689, 21690, 21595, + 21688, 21691, 21690, 21689, + 21692, 21693, 21690, 21691, + 21596, 21595, 21690, 21693, + 21596, 21693, 21694, 21599, + 21692, 21695, 21694, 21693, + 21696, 21697, 21694, 21695, + 21600, 21599, 21694, 21697, + 21600, 21697, 21698, 21603, + 21696, 21699, 21698, 21697, + 21700, 21701, 21698, 21699, + 21604, 21603, 21698, 21701, + 21604, 21701, 21702, 21607, + 21700, 21703, 21702, 21701, + 21704, 21705, 21702, 21703, + 21608, 21607, 21702, 21705, + 21608, 21705, 21706, 21611, + 21704, 21707, 21706, 21705, + 21708, 21709, 21706, 21707, + 21612, 21611, 21706, 21709, + 21612, 21709, 21710, 21615, + 21708, 21711, 21710, 21709, + 21712, 21713, 21710, 21711, + 21616, 21615, 21710, 21713, + 21616, 21713, 21714, 21619, + 21712, 21715, 21714, 21713, + 21716, 21717, 21714, 21715, + 21620, 21619, 21714, 21717, + 16818, 16823, 21718, 21623, + 16822, 21719, 21718, 16823, + 21720, 21721, 21718, 21719, + 21624, 21623, 21718, 21721, + 21624, 21721, 21722, 21627, + 21720, 21723, 21722, 21721, + 21724, 21725, 21722, 21723, + 21628, 21627, 21722, 21725, + 21628, 21725, 21726, 21631, + 21724, 21727, 21726, 21725, + 21728, 21729, 21726, 21727, + 21632, 21631, 21726, 21729, + 21632, 21729, 21730, 21635, + 21728, 21731, 21730, 21729, + 21732, 21733, 21730, 21731, + 21636, 21635, 21730, 21733, + 21636, 21733, 21734, 21639, + 21732, 21735, 21734, 21733, + 21736, 21737, 21734, 21735, + 21640, 21639, 21734, 21737, + 21640, 21737, 21738, 21643, + 21736, 21739, 21738, 21737, + 21740, 21741, 21738, 21739, + 21644, 21643, 21738, 21741, + 21644, 21741, 21742, 21647, + 21740, 21743, 21742, 21741, + 21744, 21745, 21742, 21743, + 21648, 21647, 21742, 21745, + 21648, 21745, 21746, 21651, + 21744, 21747, 21746, 21745, + 21748, 21749, 21746, 21747, + 21652, 21651, 21746, 21749, + 21652, 21749, 21750, 21655, + 21748, 21751, 21750, 21749, + 21752, 21753, 21750, 21751, + 21656, 21655, 21750, 21753, + 21656, 21753, 21754, 21659, + 21752, 21755, 21754, 21753, + 21756, 21757, 21754, 21755, + 21660, 21659, 21754, 21757, + 21660, 21757, 21758, 21663, + 21756, 21759, 21758, 21757, + 21760, 21761, 21758, 21759, + 21664, 21663, 21758, 21761, + 21664, 21761, 21762, 21667, + 21760, 21763, 21762, 21761, + 21764, 21765, 21762, 21763, + 21668, 21667, 21762, 21765, + 21668, 21765, 21766, 21671, + 21764, 21767, 21766, 21765, + 21768, 21769, 21766, 21767, + 21672, 21671, 21766, 21769, + 21672, 21769, 21770, 21675, + 21768, 21771, 21770, 21769, + 21772, 21773, 21770, 21771, + 21676, 21675, 21770, 21773, + 21676, 21773, 21774, 21679, + 21772, 21775, 21774, 21773, + 21776, 21777, 21774, 21775, + 21680, 21679, 21774, 21777, + 21680, 21777, 21778, 21683, + 21776, 21779, 21778, 21777, + 21780, 21781, 21778, 21779, + 21684, 21683, 21778, 21781, + 21684, 21781, 21782, 21687, + 21780, 21783, 21782, 21781, + 21784, 21785, 21782, 21783, + 21688, 21687, 21782, 21785, + 21688, 21785, 21786, 21691, + 21784, 21787, 21786, 21785, + 21788, 21789, 21786, 21787, + 21692, 21691, 21786, 21789, + 21692, 21789, 21790, 21695, + 21788, 21791, 21790, 21789, + 21792, 21793, 21790, 21791, + 21696, 21695, 21790, 21793, + 21696, 21793, 21794, 21699, + 21792, 21795, 21794, 21793, + 21796, 21797, 21794, 21795, + 21700, 21699, 21794, 21797, + 21700, 21797, 21798, 21703, + 21796, 21799, 21798, 21797, + 21800, 21801, 21798, 21799, + 21704, 21703, 21798, 21801, + 21704, 21801, 21802, 21707, + 21800, 21803, 21802, 21801, + 21804, 21805, 21802, 21803, + 21708, 21707, 21802, 21805, + 21708, 21805, 21806, 21711, + 21804, 21807, 21806, 21805, + 21808, 21809, 21806, 21807, + 21712, 21711, 21806, 21809, + 21712, 21809, 21810, 21715, + 21808, 21811, 21810, 21809, + 21812, 21813, 21810, 21811, + 21716, 21715, 21810, 21813, + 16822, 16827, 21814, 21719, + 16826, 21815, 21814, 16827, + 21816, 21817, 21814, 21815, + 21720, 21719, 21814, 21817, + 21720, 21817, 21818, 21723, + 21816, 21819, 21818, 21817, + 21820, 21821, 21818, 21819, + 21724, 21723, 21818, 21821, + 21724, 21821, 21822, 21727, + 21820, 21823, 21822, 21821, + 21824, 21825, 21822, 21823, + 21728, 21727, 21822, 21825, + 21728, 21825, 21826, 21731, + 21824, 21827, 21826, 21825, + 21828, 21829, 21826, 21827, + 21732, 21731, 21826, 21829, + 21732, 21829, 21830, 21735, + 21828, 21831, 21830, 21829, + 21832, 21833, 21830, 21831, + 21736, 21735, 21830, 21833, + 21736, 21833, 21834, 21739, + 21832, 21835, 21834, 21833, + 21836, 21837, 21834, 21835, + 21740, 21739, 21834, 21837, + 21740, 21837, 21838, 21743, + 21836, 21839, 21838, 21837, + 21840, 21841, 21838, 21839, + 21744, 21743, 21838, 21841, + 21744, 21841, 21842, 21747, + 21840, 21843, 21842, 21841, + 21844, 21845, 21842, 21843, + 21748, 21747, 21842, 21845, + 21748, 21845, 21846, 21751, + 21844, 21847, 21846, 21845, + 21848, 21849, 21846, 21847, + 21752, 21751, 21846, 21849, + 21752, 21849, 21850, 21755, + 21848, 21851, 21850, 21849, + 21852, 21853, 21850, 21851, + 21756, 21755, 21850, 21853, + 21756, 21853, 21854, 21759, + 21852, 21855, 21854, 21853, + 21856, 21857, 21854, 21855, + 21760, 21759, 21854, 21857, + 21760, 21857, 21858, 21763, + 21856, 21859, 21858, 21857, + 21860, 21861, 21858, 21859, + 21764, 21763, 21858, 21861, + 21764, 21861, 21862, 21767, + 21860, 21863, 21862, 21861, + 21864, 21865, 21862, 21863, + 21768, 21767, 21862, 21865, + 21768, 21865, 21866, 21771, + 21864, 21867, 21866, 21865, + 21868, 21869, 21866, 21867, + 21772, 21771, 21866, 21869, + 21772, 21869, 21870, 21775, + 21868, 21871, 21870, 21869, + 21872, 21873, 21870, 21871, + 21776, 21775, 21870, 21873, + 21776, 21873, 21874, 21779, + 21872, 21875, 21874, 21873, + 21876, 21877, 21874, 21875, + 21780, 21779, 21874, 21877, + 21780, 21877, 21878, 21783, + 21876, 21879, 21878, 21877, + 21880, 21881, 21878, 21879, + 21784, 21783, 21878, 21881, + 21784, 21881, 21882, 21787, + 21880, 21883, 21882, 21881, + 21884, 21885, 21882, 21883, + 21788, 21787, 21882, 21885, + 21788, 21885, 21886, 21791, + 21884, 21887, 21886, 21885, + 21888, 21889, 21886, 21887, + 21792, 21791, 21886, 21889, + 21792, 21889, 21890, 21795, + 21888, 21891, 21890, 21889, + 21892, 21893, 21890, 21891, + 21796, 21795, 21890, 21893, + 21796, 21893, 21894, 21799, + 21892, 21895, 21894, 21893, + 21896, 21897, 21894, 21895, + 21800, 21799, 21894, 21897, + 21800, 21897, 21898, 21803, + 21896, 21899, 21898, 21897, + 21900, 21901, 21898, 21899, + 21804, 21803, 21898, 21901, + 21804, 21901, 21902, 21807, + 21900, 21903, 21902, 21901, + 21904, 21905, 21902, 21903, + 21808, 21807, 21902, 21905, + 21808, 21905, 21906, 21811, + 21904, 21907, 21906, 21905, + 21908, 21909, 21906, 21907, + 21812, 21811, 21906, 21909, + 16826, 16831, 21910, 21815, + 16830, 21911, 21910, 16831, + 21912, 21913, 21910, 21911, + 21816, 21815, 21910, 21913, + 21816, 21913, 21914, 21819, + 21912, 21915, 21914, 21913, + 21916, 21917, 21914, 21915, + 21820, 21819, 21914, 21917, + 21820, 21917, 21918, 21823, + 21916, 21919, 21918, 21917, + 21920, 21921, 21918, 21919, + 21824, 21823, 21918, 21921, + 21824, 21921, 21922, 21827, + 21920, 21923, 21922, 21921, + 21924, 21925, 21922, 21923, + 21828, 21827, 21922, 21925, + 21828, 21925, 21926, 21831, + 21924, 21927, 21926, 21925, + 21928, 21929, 21926, 21927, + 21832, 21831, 21926, 21929, + 21832, 21929, 21930, 21835, + 21928, 21931, 21930, 21929, + 21932, 21933, 21930, 21931, + 21836, 21835, 21930, 21933, + 21836, 21933, 21934, 21839, + 21932, 21935, 21934, 21933, + 21936, 21937, 21934, 21935, + 21840, 21839, 21934, 21937, + 21840, 21937, 21938, 21843, + 21936, 21939, 21938, 21937, + 21940, 21941, 21938, 21939, + 21844, 21843, 21938, 21941, + 21844, 21941, 21942, 21847, + 21940, 21943, 21942, 21941, + 21944, 21945, 21942, 21943, + 21848, 21847, 21942, 21945, + 21848, 21945, 21946, 21851, + 21944, 21947, 21946, 21945, + 21948, 21949, 21946, 21947, + 21852, 21851, 21946, 21949, + 21852, 21949, 21950, 21855, + 21948, 21951, 21950, 21949, + 21952, 21953, 21950, 21951, + 21856, 21855, 21950, 21953, + 21856, 21953, 21954, 21859, + 21952, 21955, 21954, 21953, + 21956, 21957, 21954, 21955, + 21860, 21859, 21954, 21957, + 21860, 21957, 21958, 21863, + 21956, 21959, 21958, 21957, + 21960, 21961, 21958, 21959, + 21864, 21863, 21958, 21961, + 21864, 21961, 21962, 21867, + 21960, 21963, 21962, 21961, + 21964, 21965, 21962, 21963, + 21868, 21867, 21962, 21965, + 21868, 21965, 21966, 21871, + 21964, 21967, 21966, 21965, + 21968, 21969, 21966, 21967, + 21872, 21871, 21966, 21969, + 21872, 21969, 21970, 21875, + 21968, 21971, 21970, 21969, + 21972, 21973, 21970, 21971, + 21876, 21875, 21970, 21973, + 21876, 21973, 21974, 21879, + 21972, 21975, 21974, 21973, + 21976, 21977, 21974, 21975, + 21880, 21879, 21974, 21977, + 21880, 21977, 21978, 21883, + 21976, 21979, 21978, 21977, + 21980, 21981, 21978, 21979, + 21884, 21883, 21978, 21981, + 21884, 21981, 21982, 21887, + 21980, 21983, 21982, 21981, + 21984, 21985, 21982, 21983, + 21888, 21887, 21982, 21985, + 21888, 21985, 21986, 21891, + 21984, 21987, 21986, 21985, + 21988, 21989, 21986, 21987, + 21892, 21891, 21986, 21989, + 21892, 21989, 21990, 21895, + 21988, 21991, 21990, 21989, + 21992, 21993, 21990, 21991, + 21896, 21895, 21990, 21993, + 21896, 21993, 21994, 21899, + 21992, 21995, 21994, 21993, + 21996, 21997, 21994, 21995, + 21900, 21899, 21994, 21997, + 21900, 21997, 21998, 21903, + 21996, 21999, 21998, 21997, + 22000, 22001, 21998, 21999, + 21904, 21903, 21998, 22001, + 21904, 22001, 22002, 21907, + 22000, 22003, 22002, 22001, + 22004, 22005, 22002, 22003, + 21908, 21907, 22002, 22005, + 16830, 16835, 22006, 21911, + 16834, 22007, 22006, 16835, + 22008, 22009, 22006, 22007, + 21912, 21911, 22006, 22009, + 21912, 22009, 22010, 21915, + 22008, 22011, 22010, 22009, + 22012, 22013, 22010, 22011, + 21916, 21915, 22010, 22013, + 21916, 22013, 22014, 21919, + 22012, 22015, 22014, 22013, + 22016, 22017, 22014, 22015, + 21920, 21919, 22014, 22017, + 21920, 22017, 22018, 21923, + 22016, 22019, 22018, 22017, + 22020, 22021, 22018, 22019, + 21924, 21923, 22018, 22021, + 21924, 22021, 22022, 21927, + 22020, 22023, 22022, 22021, + 22024, 22025, 22022, 22023, + 21928, 21927, 22022, 22025, + 21928, 22025, 22026, 21931, + 22024, 22027, 22026, 22025, + 22028, 22029, 22026, 22027, + 21932, 21931, 22026, 22029, + 21932, 22029, 22030, 21935, + 22028, 22031, 22030, 22029, + 22032, 22033, 22030, 22031, + 21936, 21935, 22030, 22033, + 21936, 22033, 22034, 21939, + 22032, 22035, 22034, 22033, + 22036, 22037, 22034, 22035, + 21940, 21939, 22034, 22037, + 21940, 22037, 22038, 21943, + 22036, 22039, 22038, 22037, + 22040, 22041, 22038, 22039, + 21944, 21943, 22038, 22041, + 21944, 22041, 22042, 21947, + 22040, 22043, 22042, 22041, + 22044, 22045, 22042, 22043, + 21948, 21947, 22042, 22045, + 21948, 22045, 22046, 21951, + 22044, 22047, 22046, 22045, + 22048, 22049, 22046, 22047, + 21952, 21951, 22046, 22049, + 21952, 22049, 22050, 21955, + 22048, 22051, 22050, 22049, + 22052, 22053, 22050, 22051, + 21956, 21955, 22050, 22053, + 21956, 22053, 22054, 21959, + 22052, 22055, 22054, 22053, + 22056, 22057, 22054, 22055, + 21960, 21959, 22054, 22057, + 21960, 22057, 22058, 21963, + 22056, 22059, 22058, 22057, + 22060, 22061, 22058, 22059, + 21964, 21963, 22058, 22061, + 21964, 22061, 22062, 21967, + 22060, 22063, 22062, 22061, + 22064, 22065, 22062, 22063, + 21968, 21967, 22062, 22065, + 21968, 22065, 22066, 21971, + 22064, 22067, 22066, 22065, + 22068, 22069, 22066, 22067, + 21972, 21971, 22066, 22069, + 21972, 22069, 22070, 21975, + 22068, 22071, 22070, 22069, + 22072, 22073, 22070, 22071, + 21976, 21975, 22070, 22073, + 21976, 22073, 22074, 21979, + 22072, 22075, 22074, 22073, + 22076, 22077, 22074, 22075, + 21980, 21979, 22074, 22077, + 21980, 22077, 22078, 21983, + 22076, 22079, 22078, 22077, + 22080, 22081, 22078, 22079, + 21984, 21983, 22078, 22081, + 21984, 22081, 22082, 21987, + 22080, 22083, 22082, 22081, + 22084, 22085, 22082, 22083, + 21988, 21987, 22082, 22085, + 21988, 22085, 22086, 21991, + 22084, 22087, 22086, 22085, + 22088, 22089, 22086, 22087, + 21992, 21991, 22086, 22089, + 21992, 22089, 22090, 21995, + 22088, 22091, 22090, 22089, + 22092, 22093, 22090, 22091, + 21996, 21995, 22090, 22093, + 21996, 22093, 22094, 21999, + 22092, 22095, 22094, 22093, + 22096, 22097, 22094, 22095, + 22000, 21999, 22094, 22097, + 22000, 22097, 22098, 22003, + 22096, 22099, 22098, 22097, + 22100, 22101, 22098, 22099, + 22004, 22003, 22098, 22101, + 16834, 16839, 22102, 22007, + 16838, 22103, 22102, 16839, + 22104, 22105, 22102, 22103, + 22008, 22007, 22102, 22105, + 22008, 22105, 22106, 22011, + 22104, 22107, 22106, 22105, + 22108, 22109, 22106, 22107, + 22012, 22011, 22106, 22109, + 22012, 22109, 22110, 22015, + 22108, 22111, 22110, 22109, + 22112, 22113, 22110, 22111, + 22016, 22015, 22110, 22113, + 22016, 22113, 22114, 22019, + 22112, 22115, 22114, 22113, + 22116, 22117, 22114, 22115, + 22020, 22019, 22114, 22117, + 22020, 22117, 22118, 22023, + 22116, 22119, 22118, 22117, + 22120, 22121, 22118, 22119, + 22024, 22023, 22118, 22121, + 22024, 22121, 22122, 22027, + 22120, 22123, 22122, 22121, + 22124, 22125, 22122, 22123, + 22028, 22027, 22122, 22125, + 22028, 22125, 22126, 22031, + 22124, 22127, 22126, 22125, + 22128, 22129, 22126, 22127, + 22032, 22031, 22126, 22129, + 22032, 22129, 22130, 22035, + 22128, 22131, 22130, 22129, + 22132, 22133, 22130, 22131, + 22036, 22035, 22130, 22133, + 22036, 22133, 22134, 22039, + 22132, 22135, 22134, 22133, + 22136, 22137, 22134, 22135, + 22040, 22039, 22134, 22137, + 22040, 22137, 22138, 22043, + 22136, 22139, 22138, 22137, + 22140, 22141, 22138, 22139, + 22044, 22043, 22138, 22141, + 22044, 22141, 22142, 22047, + 22140, 22143, 22142, 22141, + 22144, 22145, 22142, 22143, + 22048, 22047, 22142, 22145, + 22048, 22145, 22146, 22051, + 22144, 22147, 22146, 22145, + 22148, 22149, 22146, 22147, + 22052, 22051, 22146, 22149, + 22052, 22149, 22150, 22055, + 22148, 22151, 22150, 22149, + 22152, 22153, 22150, 22151, + 22056, 22055, 22150, 22153, + 22056, 22153, 22154, 22059, + 22152, 22155, 22154, 22153, + 22156, 22157, 22154, 22155, + 22060, 22059, 22154, 22157, + 22060, 22157, 22158, 22063, + 22156, 22159, 22158, 22157, + 22160, 22161, 22158, 22159, + 22064, 22063, 22158, 22161, + 22064, 22161, 22162, 22067, + 22160, 22163, 22162, 22161, + 22164, 22165, 22162, 22163, + 22068, 22067, 22162, 22165, + 22068, 22165, 22166, 22071, + 22164, 22167, 22166, 22165, + 22168, 22169, 22166, 22167, + 22072, 22071, 22166, 22169, + 22072, 22169, 22170, 22075, + 22168, 22171, 22170, 22169, + 22172, 22173, 22170, 22171, + 22076, 22075, 22170, 22173, + 22076, 22173, 22174, 22079, + 22172, 22175, 22174, 22173, + 22176, 22177, 22174, 22175, + 22080, 22079, 22174, 22177, + 22080, 22177, 22178, 22083, + 22176, 22179, 22178, 22177, + 22180, 22181, 22178, 22179, + 22084, 22083, 22178, 22181, + 22084, 22181, 22182, 22087, + 22180, 22183, 22182, 22181, + 22184, 22185, 22182, 22183, + 22088, 22087, 22182, 22185, + 22088, 22185, 22186, 22091, + 22184, 22187, 22186, 22185, + 22188, 22189, 22186, 22187, + 22092, 22091, 22186, 22189, + 22092, 22189, 22190, 22095, + 22188, 22191, 22190, 22189, + 22192, 22193, 22190, 22191, + 22096, 22095, 22190, 22193, + 22096, 22193, 22194, 22099, + 22192, 22195, 22194, 22193, + 22196, 22197, 22194, 22195, + 22100, 22099, 22194, 22197, + 16838, 16843, 22198, 22103, + 16842, 22199, 22198, 16843, + 22200, 22201, 22198, 22199, + 22104, 22103, 22198, 22201, + 22104, 22201, 22202, 22107, + 22200, 22203, 22202, 22201, + 22204, 22205, 22202, 22203, + 22108, 22107, 22202, 22205, + 22108, 22205, 22206, 22111, + 22204, 22207, 22206, 22205, + 22208, 22209, 22206, 22207, + 22112, 22111, 22206, 22209, + 22112, 22209, 22210, 22115, + 22208, 22211, 22210, 22209, + 22212, 22213, 22210, 22211, + 22116, 22115, 22210, 22213, + 22116, 22213, 22214, 22119, + 22212, 22215, 22214, 22213, + 22216, 22217, 22214, 22215, + 22120, 22119, 22214, 22217, + 22120, 22217, 22218, 22123, + 22216, 22219, 22218, 22217, + 22220, 22221, 22218, 22219, + 22124, 22123, 22218, 22221, + 22124, 22221, 22222, 22127, + 22220, 22223, 22222, 22221, + 22224, 22225, 22222, 22223, + 22128, 22127, 22222, 22225, + 22128, 22225, 22226, 22131, + 22224, 22227, 22226, 22225, + 22228, 22229, 22226, 22227, + 22132, 22131, 22226, 22229, + 22132, 22229, 22230, 22135, + 22228, 22231, 22230, 22229, + 22232, 22233, 22230, 22231, + 22136, 22135, 22230, 22233, + 22136, 22233, 22234, 22139, + 22232, 22235, 22234, 22233, + 22236, 22237, 22234, 22235, + 22140, 22139, 22234, 22237, + 22140, 22237, 22238, 22143, + 22236, 22239, 22238, 22237, + 22240, 22241, 22238, 22239, + 22144, 22143, 22238, 22241, + 22144, 22241, 22242, 22147, + 22240, 22243, 22242, 22241, + 22244, 22245, 22242, 22243, + 22148, 22147, 22242, 22245, + 22148, 22245, 22246, 22151, + 22244, 22247, 22246, 22245, + 22248, 22249, 22246, 22247, + 22152, 22151, 22246, 22249, + 22152, 22249, 22250, 22155, + 22248, 22251, 22250, 22249, + 22252, 22253, 22250, 22251, + 22156, 22155, 22250, 22253, + 22156, 22253, 22254, 22159, + 22252, 22255, 22254, 22253, + 22256, 22257, 22254, 22255, + 22160, 22159, 22254, 22257, + 22160, 22257, 22258, 22163, + 22256, 22259, 22258, 22257, + 22260, 22261, 22258, 22259, + 22164, 22163, 22258, 22261, + 22164, 22261, 22262, 22167, + 22260, 22263, 22262, 22261, + 22264, 22265, 22262, 22263, + 22168, 22167, 22262, 22265, + 22168, 22265, 22266, 22171, + 22264, 22267, 22266, 22265, + 22268, 22269, 22266, 22267, + 22172, 22171, 22266, 22269, + 22172, 22269, 22270, 22175, + 22268, 22271, 22270, 22269, + 22272, 22273, 22270, 22271, + 22176, 22175, 22270, 22273, + 22176, 22273, 22274, 22179, + 22272, 22275, 22274, 22273, + 22276, 22277, 22274, 22275, + 22180, 22179, 22274, 22277, + 22180, 22277, 22278, 22183, + 22276, 22279, 22278, 22277, + 22280, 22281, 22278, 22279, + 22184, 22183, 22278, 22281, + 22184, 22281, 22282, 22187, + 22280, 22283, 22282, 22281, + 22284, 22285, 22282, 22283, + 22188, 22187, 22282, 22285, + 22188, 22285, 22286, 22191, + 22284, 22287, 22286, 22285, + 22288, 22289, 22286, 22287, + 22192, 22191, 22286, 22289, + 22192, 22289, 22290, 22195, + 22288, 22291, 22290, 22289, + 22292, 22293, 22290, 22291, + 22196, 22195, 22290, 22293, + 16842, 16847, 22294, 22199, + 16846, 22295, 22294, 16847, + 22296, 22297, 22294, 22295, + 22200, 22199, 22294, 22297, + 22200, 22297, 22298, 22203, + 22296, 22299, 22298, 22297, + 22300, 22301, 22298, 22299, + 22204, 22203, 22298, 22301, + 22204, 22301, 22302, 22207, + 22300, 22303, 22302, 22301, + 22304, 22305, 22302, 22303, + 22208, 22207, 22302, 22305, + 22208, 22305, 22306, 22211, + 22304, 22307, 22306, 22305, + 22308, 22309, 22306, 22307, + 22212, 22211, 22306, 22309, + 22212, 22309, 22310, 22215, + 22308, 22311, 22310, 22309, + 22312, 22313, 22310, 22311, + 22216, 22215, 22310, 22313, + 22216, 22313, 22314, 22219, + 22312, 22315, 22314, 22313, + 22316, 22317, 22314, 22315, + 22220, 22219, 22314, 22317, + 22220, 22317, 22318, 22223, + 22316, 22319, 22318, 22317, + 22320, 22321, 22318, 22319, + 22224, 22223, 22318, 22321, + 22224, 22321, 22322, 22227, + 22320, 22323, 22322, 22321, + 22324, 22325, 22322, 22323, + 22228, 22227, 22322, 22325, + 22228, 22325, 22326, 22231, + 22324, 22327, 22326, 22325, + 22328, 22329, 22326, 22327, + 22232, 22231, 22326, 22329, + 22232, 22329, 22330, 22235, + 22328, 22331, 22330, 22329, + 22332, 22333, 22330, 22331, + 22236, 22235, 22330, 22333, + 22236, 22333, 22334, 22239, + 22332, 22335, 22334, 22333, + 22336, 22337, 22334, 22335, + 22240, 22239, 22334, 22337, + 22240, 22337, 22338, 22243, + 22336, 22339, 22338, 22337, + 22340, 22341, 22338, 22339, + 22244, 22243, 22338, 22341, + 22244, 22341, 22342, 22247, + 22340, 22343, 22342, 22341, + 22344, 22345, 22342, 22343, + 22248, 22247, 22342, 22345, + 22248, 22345, 22346, 22251, + 22344, 22347, 22346, 22345, + 22348, 22349, 22346, 22347, + 22252, 22251, 22346, 22349, + 22252, 22349, 22350, 22255, + 22348, 22351, 22350, 22349, + 22352, 22353, 22350, 22351, + 22256, 22255, 22350, 22353, + 22256, 22353, 22354, 22259, + 22352, 22355, 22354, 22353, + 22356, 22357, 22354, 22355, + 22260, 22259, 22354, 22357, + 22260, 22357, 22358, 22263, + 22356, 22359, 22358, 22357, + 22360, 22361, 22358, 22359, + 22264, 22263, 22358, 22361, + 22264, 22361, 22362, 22267, + 22360, 22363, 22362, 22361, + 22364, 22365, 22362, 22363, + 22268, 22267, 22362, 22365, + 22268, 22365, 22366, 22271, + 22364, 22367, 22366, 22365, + 22368, 22369, 22366, 22367, + 22272, 22271, 22366, 22369, + 22272, 22369, 22370, 22275, + 22368, 22371, 22370, 22369, + 22372, 22373, 22370, 22371, + 22276, 22275, 22370, 22373, + 22276, 22373, 22374, 22279, + 22372, 22375, 22374, 22373, + 22376, 22377, 22374, 22375, + 22280, 22279, 22374, 22377, + 22280, 22377, 22378, 22283, + 22376, 22379, 22378, 22377, + 22380, 22381, 22378, 22379, + 22284, 22283, 22378, 22381, + 22284, 22381, 22382, 22287, + 22380, 22383, 22382, 22381, + 22384, 22385, 22382, 22383, + 22288, 22287, 22382, 22385, + 22288, 22385, 22386, 22291, + 22384, 22387, 22386, 22385, + 22388, 22389, 22386, 22387, + 22292, 22291, 22386, 22389, + 16846, 16851, 22390, 22295, + 16850, 22391, 22390, 16851, + 22392, 22393, 22390, 22391, + 22296, 22295, 22390, 22393, + 22296, 22393, 22394, 22299, + 22392, 22395, 22394, 22393, + 22396, 22397, 22394, 22395, + 22300, 22299, 22394, 22397, + 22300, 22397, 22398, 22303, + 22396, 22399, 22398, 22397, + 22400, 22401, 22398, 22399, + 22304, 22303, 22398, 22401, + 22304, 22401, 22402, 22307, + 22400, 22403, 22402, 22401, + 22404, 22405, 22402, 22403, + 22308, 22307, 22402, 22405, + 22308, 22405, 22406, 22311, + 22404, 22407, 22406, 22405, + 22408, 22409, 22406, 22407, + 22312, 22311, 22406, 22409, + 22312, 22409, 22410, 22315, + 22408, 22411, 22410, 22409, + 22412, 22413, 22410, 22411, + 22316, 22315, 22410, 22413, + 22316, 22413, 22414, 22319, + 22412, 22415, 22414, 22413, + 22416, 22417, 22414, 22415, + 22320, 22319, 22414, 22417, + 22320, 22417, 22418, 22323, + 22416, 22419, 22418, 22417, + 22420, 22421, 22418, 22419, + 22324, 22323, 22418, 22421, + 22324, 22421, 22422, 22327, + 22420, 22423, 22422, 22421, + 22424, 22425, 22422, 22423, + 22328, 22327, 22422, 22425, + 22328, 22425, 22426, 22331, + 22424, 22427, 22426, 22425, + 22428, 22429, 22426, 22427, + 22332, 22331, 22426, 22429, + 22332, 22429, 22430, 22335, + 22428, 22431, 22430, 22429, + 22432, 22433, 22430, 22431, + 22336, 22335, 22430, 22433, + 22336, 22433, 22434, 22339, + 22432, 22435, 22434, 22433, + 22436, 22437, 22434, 22435, + 22340, 22339, 22434, 22437, + 22340, 22437, 22438, 22343, + 22436, 22439, 22438, 22437, + 22440, 22441, 22438, 22439, + 22344, 22343, 22438, 22441, + 22344, 22441, 22442, 22347, + 22440, 22443, 22442, 22441, + 22444, 22445, 22442, 22443, + 22348, 22347, 22442, 22445, + 22348, 22445, 22446, 22351, + 22444, 22447, 22446, 22445, + 22448, 22449, 22446, 22447, + 22352, 22351, 22446, 22449, + 22352, 22449, 22450, 22355, + 22448, 22451, 22450, 22449, + 22452, 22453, 22450, 22451, + 22356, 22355, 22450, 22453, + 22356, 22453, 22454, 22359, + 22452, 22455, 22454, 22453, + 22456, 22457, 22454, 22455, + 22360, 22359, 22454, 22457, + 22360, 22457, 22458, 22363, + 22456, 22459, 22458, 22457, + 22460, 22461, 22458, 22459, + 22364, 22363, 22458, 22461, + 22364, 22461, 22462, 22367, + 22460, 22463, 22462, 22461, + 22464, 22465, 22462, 22463, + 22368, 22367, 22462, 22465, + 22368, 22465, 22466, 22371, + 22464, 22467, 22466, 22465, + 22468, 22469, 22466, 22467, + 22372, 22371, 22466, 22469, + 22372, 22469, 22470, 22375, + 22468, 22471, 22470, 22469, + 22472, 22473, 22470, 22471, + 22376, 22375, 22470, 22473, + 22376, 22473, 22474, 22379, + 22472, 22475, 22474, 22473, + 22476, 22477, 22474, 22475, + 22380, 22379, 22474, 22477, + 22380, 22477, 22478, 22383, + 22476, 22479, 22478, 22477, + 22480, 22481, 22478, 22479, + 22384, 22383, 22478, 22481, + 22384, 22481, 22482, 22387, + 22480, 22483, 22482, 22481, + 22484, 22485, 22482, 22483, + 22388, 22387, 22482, 22485, + 16850, 16855, 22486, 22391, + 16854, 22487, 22486, 16855, + 22488, 22489, 22486, 22487, + 22392, 22391, 22486, 22489, + 22392, 22489, 22490, 22395, + 22488, 22491, 22490, 22489, + 22492, 22493, 22490, 22491, + 22396, 22395, 22490, 22493, + 22396, 22493, 22494, 22399, + 22492, 22495, 22494, 22493, + 22496, 22497, 22494, 22495, + 22400, 22399, 22494, 22497, + 22400, 22497, 22498, 22403, + 22496, 22499, 22498, 22497, + 22500, 22501, 22498, 22499, + 22404, 22403, 22498, 22501, + 22404, 22501, 22502, 22407, + 22500, 22503, 22502, 22501, + 22504, 22505, 22502, 22503, + 22408, 22407, 22502, 22505, + 22408, 22505, 22506, 22411, + 22504, 22507, 22506, 22505, + 22508, 22509, 22506, 22507, + 22412, 22411, 22506, 22509, + 22412, 22509, 22510, 22415, + 22508, 22511, 22510, 22509, + 22512, 22513, 22510, 22511, + 22416, 22415, 22510, 22513, + 22416, 22513, 22514, 22419, + 22512, 22515, 22514, 22513, + 22516, 22517, 22514, 22515, + 22420, 22419, 22514, 22517, + 22420, 22517, 22518, 22423, + 22516, 22519, 22518, 22517, + 22520, 22521, 22518, 22519, + 22424, 22423, 22518, 22521, + 22424, 22521, 22522, 22427, + 22520, 22523, 22522, 22521, + 22524, 22525, 22522, 22523, + 22428, 22427, 22522, 22525, + 22428, 22525, 22526, 22431, + 22524, 22527, 22526, 22525, + 22528, 22529, 22526, 22527, + 22432, 22431, 22526, 22529, + 22432, 22529, 22530, 22435, + 22528, 22531, 22530, 22529, + 22532, 22533, 22530, 22531, + 22436, 22435, 22530, 22533, + 22436, 22533, 22534, 22439, + 22532, 22535, 22534, 22533, + 22536, 22537, 22534, 22535, + 22440, 22439, 22534, 22537, + 22440, 22537, 22538, 22443, + 22536, 22539, 22538, 22537, + 22540, 22541, 22538, 22539, + 22444, 22443, 22538, 22541, + 22444, 22541, 22542, 22447, + 22540, 22543, 22542, 22541, + 22544, 22545, 22542, 22543, + 22448, 22447, 22542, 22545, + 22448, 22545, 22546, 22451, + 22544, 22547, 22546, 22545, + 22548, 22549, 22546, 22547, + 22452, 22451, 22546, 22549, + 22452, 22549, 22550, 22455, + 22548, 22551, 22550, 22549, + 22552, 22553, 22550, 22551, + 22456, 22455, 22550, 22553, + 22456, 22553, 22554, 22459, + 22552, 22555, 22554, 22553, + 22556, 22557, 22554, 22555, + 22460, 22459, 22554, 22557, + 22460, 22557, 22558, 22463, + 22556, 22559, 22558, 22557, + 22560, 22561, 22558, 22559, + 22464, 22463, 22558, 22561, + 22464, 22561, 22562, 22467, + 22560, 22563, 22562, 22561, + 22564, 22565, 22562, 22563, + 22468, 22467, 22562, 22565, + 22468, 22565, 22566, 22471, + 22564, 22567, 22566, 22565, + 22568, 22569, 22566, 22567, + 22472, 22471, 22566, 22569, + 22472, 22569, 22570, 22475, + 22568, 22571, 22570, 22569, + 22572, 22573, 22570, 22571, + 22476, 22475, 22570, 22573, + 22476, 22573, 22574, 22479, + 22572, 22575, 22574, 22573, + 22576, 22577, 22574, 22575, + 22480, 22479, 22574, 22577, + 22480, 22577, 22578, 22483, + 22576, 22579, 22578, 22577, + 22580, 22581, 22578, 22579, + 22484, 22483, 22578, 22581, + 16854, 16859, 22582, 22487, + 16858, 22583, 22582, 16859, + 22584, 22585, 22582, 22583, + 22488, 22487, 22582, 22585, + 22488, 22585, 22586, 22491, + 22584, 22587, 22586, 22585, + 22588, 22589, 22586, 22587, + 22492, 22491, 22586, 22589, + 22492, 22589, 22590, 22495, + 22588, 22591, 22590, 22589, + 22592, 22593, 22590, 22591, + 22496, 22495, 22590, 22593, + 22496, 22593, 22594, 22499, + 22592, 22595, 22594, 22593, + 22596, 22597, 22594, 22595, + 22500, 22499, 22594, 22597, + 22500, 22597, 22598, 22503, + 22596, 22599, 22598, 22597, + 22600, 22601, 22598, 22599, + 22504, 22503, 22598, 22601, + 22504, 22601, 22602, 22507, + 22600, 22603, 22602, 22601, + 22604, 22605, 22602, 22603, + 22508, 22507, 22602, 22605, + 22508, 22605, 22606, 22511, + 22604, 22607, 22606, 22605, + 22608, 22609, 22606, 22607, + 22512, 22511, 22606, 22609, + 22512, 22609, 22610, 22515, + 22608, 22611, 22610, 22609, + 22612, 22613, 22610, 22611, + 22516, 22515, 22610, 22613, + 22516, 22613, 22614, 22519, + 22612, 22615, 22614, 22613, + 22616, 22617, 22614, 22615, + 22520, 22519, 22614, 22617, + 22520, 22617, 22618, 22523, + 22616, 22619, 22618, 22617, + 22620, 22621, 22618, 22619, + 22524, 22523, 22618, 22621, + 22524, 22621, 22622, 22527, + 22620, 22623, 22622, 22621, + 22624, 22625, 22622, 22623, + 22528, 22527, 22622, 22625, + 22528, 22625, 22626, 22531, + 22624, 22627, 22626, 22625, + 22628, 22629, 22626, 22627, + 22532, 22531, 22626, 22629, + 22532, 22629, 22630, 22535, + 22628, 22631, 22630, 22629, + 22632, 22633, 22630, 22631, + 22536, 22535, 22630, 22633, + 22536, 22633, 22634, 22539, + 22632, 22635, 22634, 22633, + 22636, 22637, 22634, 22635, + 22540, 22539, 22634, 22637, + 22540, 22637, 22638, 22543, + 22636, 22639, 22638, 22637, + 22640, 22641, 22638, 22639, + 22544, 22543, 22638, 22641, + 22544, 22641, 22642, 22547, + 22640, 22643, 22642, 22641, + 22644, 22645, 22642, 22643, + 22548, 22547, 22642, 22645, + 22548, 22645, 22646, 22551, + 22644, 22647, 22646, 22645, + 22648, 22649, 22646, 22647, + 22552, 22551, 22646, 22649, + 22552, 22649, 22650, 22555, + 22648, 22651, 22650, 22649, + 22652, 22653, 22650, 22651, + 22556, 22555, 22650, 22653, + 22556, 22653, 22654, 22559, + 22652, 22655, 22654, 22653, + 22656, 22657, 22654, 22655, + 22560, 22559, 22654, 22657, + 22560, 22657, 22658, 22563, + 22656, 22659, 22658, 22657, + 22660, 22661, 22658, 22659, + 22564, 22563, 22658, 22661, + 22564, 22661, 22662, 22567, + 22660, 22663, 22662, 22661, + 22664, 22665, 22662, 22663, + 22568, 22567, 22662, 22665, + 22568, 22665, 22666, 22571, + 22664, 22667, 22666, 22665, + 22668, 22669, 22666, 22667, + 22572, 22571, 22666, 22669, + 22572, 22669, 22670, 22575, + 22668, 22671, 22670, 22669, + 22672, 22673, 22670, 22671, + 22576, 22575, 22670, 22673, + 22576, 22673, 22674, 22579, + 22672, 22675, 22674, 22673, + 22676, 22677, 22674, 22675, + 22580, 22579, 22674, 22677, + 16858, 16863, 22678, 22583, + 16862, 22679, 22678, 16863, + 22680, 22681, 22678, 22679, + 22584, 22583, 22678, 22681, + 22584, 22681, 22682, 22587, + 22680, 22683, 22682, 22681, + 22684, 22685, 22682, 22683, + 22588, 22587, 22682, 22685, + 22588, 22685, 22686, 22591, + 22684, 22687, 22686, 22685, + 22688, 22689, 22686, 22687, + 22592, 22591, 22686, 22689, + 22592, 22689, 22690, 22595, + 22688, 22691, 22690, 22689, + 22692, 22693, 22690, 22691, + 22596, 22595, 22690, 22693, + 22596, 22693, 22694, 22599, + 22692, 22695, 22694, 22693, + 22696, 22697, 22694, 22695, + 22600, 22599, 22694, 22697, + 22600, 22697, 22698, 22603, + 22696, 22699, 22698, 22697, + 22700, 22701, 22698, 22699, + 22604, 22603, 22698, 22701, + 22604, 22701, 22702, 22607, + 22700, 22703, 22702, 22701, + 22704, 22705, 22702, 22703, + 22608, 22607, 22702, 22705, + 22608, 22705, 22706, 22611, + 22704, 22707, 22706, 22705, + 22708, 22709, 22706, 22707, + 22612, 22611, 22706, 22709, + 22612, 22709, 22710, 22615, + 22708, 22711, 22710, 22709, + 22712, 22713, 22710, 22711, + 22616, 22615, 22710, 22713, + 22616, 22713, 22714, 22619, + 22712, 22715, 22714, 22713, + 22716, 22717, 22714, 22715, + 22620, 22619, 22714, 22717, + 22620, 22717, 22718, 22623, + 22716, 22719, 22718, 22717, + 22720, 22721, 22718, 22719, + 22624, 22623, 22718, 22721, + 22624, 22721, 22722, 22627, + 22720, 22723, 22722, 22721, + 22724, 22725, 22722, 22723, + 22628, 22627, 22722, 22725, + 22628, 22725, 22726, 22631, + 22724, 22727, 22726, 22725, + 22728, 22729, 22726, 22727, + 22632, 22631, 22726, 22729, + 22632, 22729, 22730, 22635, + 22728, 22731, 22730, 22729, + 22732, 22733, 22730, 22731, + 22636, 22635, 22730, 22733, + 22636, 22733, 22734, 22639, + 22732, 22735, 22734, 22733, + 22736, 22737, 22734, 22735, + 22640, 22639, 22734, 22737, + 22640, 22737, 22738, 22643, + 22736, 22739, 22738, 22737, + 22740, 22741, 22738, 22739, + 22644, 22643, 22738, 22741, + 22644, 22741, 22742, 22647, + 22740, 22743, 22742, 22741, + 22744, 22745, 22742, 22743, + 22648, 22647, 22742, 22745, + 22648, 22745, 22746, 22651, + 22744, 22747, 22746, 22745, + 22748, 22749, 22746, 22747, + 22652, 22651, 22746, 22749, + 22652, 22749, 22750, 22655, + 22748, 22751, 22750, 22749, + 22752, 22753, 22750, 22751, + 22656, 22655, 22750, 22753, + 22656, 22753, 22754, 22659, + 22752, 22755, 22754, 22753, + 22756, 22757, 22754, 22755, + 22660, 22659, 22754, 22757, + 22660, 22757, 22758, 22663, + 22756, 22759, 22758, 22757, + 22760, 22761, 22758, 22759, + 22664, 22663, 22758, 22761, + 22664, 22761, 22762, 22667, + 22760, 22763, 22762, 22761, + 22764, 22765, 22762, 22763, + 22668, 22667, 22762, 22765, + 22668, 22765, 22766, 22671, + 22764, 22767, 22766, 22765, + 22768, 22769, 22766, 22767, + 22672, 22671, 22766, 22769, + 22672, 22769, 22770, 22675, + 22768, 22771, 22770, 22769, + 22772, 22773, 22770, 22771, + 22676, 22675, 22770, 22773, + 16862, 16867, 22774, 22679, + 16866, 22775, 22774, 16867, + 22776, 22777, 22774, 22775, + 22680, 22679, 22774, 22777, + 22680, 22777, 22778, 22683, + 22776, 22779, 22778, 22777, + 22780, 22781, 22778, 22779, + 22684, 22683, 22778, 22781, + 22684, 22781, 22782, 22687, + 22780, 22783, 22782, 22781, + 22784, 22785, 22782, 22783, + 22688, 22687, 22782, 22785, + 22688, 22785, 22786, 22691, + 22784, 22787, 22786, 22785, + 22788, 22789, 22786, 22787, + 22692, 22691, 22786, 22789, + 22692, 22789, 22790, 22695, + 22788, 22791, 22790, 22789, + 22792, 22793, 22790, 22791, + 22696, 22695, 22790, 22793, + 22696, 22793, 22794, 22699, + 22792, 22795, 22794, 22793, + 22796, 22797, 22794, 22795, + 22700, 22699, 22794, 22797, + 22700, 22797, 22798, 22703, + 22796, 22799, 22798, 22797, + 22800, 22801, 22798, 22799, + 22704, 22703, 22798, 22801, + 22704, 22801, 22802, 22707, + 22800, 22803, 22802, 22801, + 22804, 22805, 22802, 22803, + 22708, 22707, 22802, 22805, + 22708, 22805, 22806, 22711, + 22804, 22807, 22806, 22805, + 22808, 22809, 22806, 22807, + 22712, 22711, 22806, 22809, + 22712, 22809, 22810, 22715, + 22808, 22811, 22810, 22809, + 22812, 22813, 22810, 22811, + 22716, 22715, 22810, 22813, + 22716, 22813, 22814, 22719, + 22812, 22815, 22814, 22813, + 22816, 22817, 22814, 22815, + 22720, 22719, 22814, 22817, + 22720, 22817, 22818, 22723, + 22816, 22819, 22818, 22817, + 22820, 22821, 22818, 22819, + 22724, 22723, 22818, 22821, + 22724, 22821, 22822, 22727, + 22820, 22823, 22822, 22821, + 22824, 22825, 22822, 22823, + 22728, 22727, 22822, 22825, + 22728, 22825, 22826, 22731, + 22824, 22827, 22826, 22825, + 22828, 22829, 22826, 22827, + 22732, 22731, 22826, 22829, + 22732, 22829, 22830, 22735, + 22828, 22831, 22830, 22829, + 22832, 22833, 22830, 22831, + 22736, 22735, 22830, 22833, + 22736, 22833, 22834, 22739, + 22832, 22835, 22834, 22833, + 22836, 22837, 22834, 22835, + 22740, 22739, 22834, 22837, + 22740, 22837, 22838, 22743, + 22836, 22839, 22838, 22837, + 22840, 22841, 22838, 22839, + 22744, 22743, 22838, 22841, + 22744, 22841, 22842, 22747, + 22840, 22843, 22842, 22841, + 22844, 22845, 22842, 22843, + 22748, 22747, 22842, 22845, + 22748, 22845, 22846, 22751, + 22844, 22847, 22846, 22845, + 22848, 22849, 22846, 22847, + 22752, 22751, 22846, 22849, + 22752, 22849, 22850, 22755, + 22848, 22851, 22850, 22849, + 22852, 22853, 22850, 22851, + 22756, 22755, 22850, 22853, + 22756, 22853, 22854, 22759, + 22852, 22855, 22854, 22853, + 22856, 22857, 22854, 22855, + 22760, 22759, 22854, 22857, + 22760, 22857, 22858, 22763, + 22856, 22859, 22858, 22857, + 22860, 22861, 22858, 22859, + 22764, 22763, 22858, 22861, + 22764, 22861, 22862, 22767, + 22860, 22863, 22862, 22861, + 22864, 22865, 22862, 22863, + 22768, 22767, 22862, 22865, + 22768, 22865, 22866, 22771, + 22864, 22867, 22866, 22865, + 22868, 22869, 22866, 22867, + 22772, 22771, 22866, 22869, + 16866, 16871, 22870, 22775, + 16870, 22871, 22870, 16871, + 22872, 22873, 22870, 22871, + 22776, 22775, 22870, 22873, + 22776, 22873, 22874, 22779, + 22872, 22875, 22874, 22873, + 22876, 22877, 22874, 22875, + 22780, 22779, 22874, 22877, + 22780, 22877, 22878, 22783, + 22876, 22879, 22878, 22877, + 22880, 22881, 22878, 22879, + 22784, 22783, 22878, 22881, + 22784, 22881, 22882, 22787, + 22880, 22883, 22882, 22881, + 22884, 22885, 22882, 22883, + 22788, 22787, 22882, 22885, + 22788, 22885, 22886, 22791, + 22884, 22887, 22886, 22885, + 22888, 22889, 22886, 22887, + 22792, 22791, 22886, 22889, + 22792, 22889, 22890, 22795, + 22888, 22891, 22890, 22889, + 22892, 22893, 22890, 22891, + 22796, 22795, 22890, 22893, + 22796, 22893, 22894, 22799, + 22892, 22895, 22894, 22893, + 22896, 22897, 22894, 22895, + 22800, 22799, 22894, 22897, + 22800, 22897, 22898, 22803, + 22896, 22899, 22898, 22897, + 22900, 22901, 22898, 22899, + 22804, 22803, 22898, 22901, + 22804, 22901, 22902, 22807, + 22900, 22903, 22902, 22901, + 22904, 22905, 22902, 22903, + 22808, 22807, 22902, 22905, + 22808, 22905, 22906, 22811, + 22904, 22907, 22906, 22905, + 22908, 22909, 22906, 22907, + 22812, 22811, 22906, 22909, + 22812, 22909, 22910, 22815, + 22908, 22911, 22910, 22909, + 22912, 22913, 22910, 22911, + 22816, 22815, 22910, 22913, + 22816, 22913, 22914, 22819, + 22912, 22915, 22914, 22913, + 22916, 22917, 22914, 22915, + 22820, 22819, 22914, 22917, + 22820, 22917, 22918, 22823, + 22916, 22919, 22918, 22917, + 22920, 22921, 22918, 22919, + 22824, 22823, 22918, 22921, + 22824, 22921, 22922, 22827, + 22920, 22923, 22922, 22921, + 22924, 22925, 22922, 22923, + 22828, 22827, 22922, 22925, + 22828, 22925, 22926, 22831, + 22924, 22927, 22926, 22925, + 22928, 22929, 22926, 22927, + 22832, 22831, 22926, 22929, + 22832, 22929, 22930, 22835, + 22928, 22931, 22930, 22929, + 22932, 22933, 22930, 22931, + 22836, 22835, 22930, 22933, + 22836, 22933, 22934, 22839, + 22932, 22935, 22934, 22933, + 22936, 22937, 22934, 22935, + 22840, 22839, 22934, 22937, + 22840, 22937, 22938, 22843, + 22936, 22939, 22938, 22937, + 22940, 22941, 22938, 22939, + 22844, 22843, 22938, 22941, + 22844, 22941, 22942, 22847, + 22940, 22943, 22942, 22941, + 22944, 22945, 22942, 22943, + 22848, 22847, 22942, 22945, + 22848, 22945, 22946, 22851, + 22944, 22947, 22946, 22945, + 22948, 22949, 22946, 22947, + 22852, 22851, 22946, 22949, + 22852, 22949, 22950, 22855, + 22948, 22951, 22950, 22949, + 22952, 22953, 22950, 22951, + 22856, 22855, 22950, 22953, + 22856, 22953, 22954, 22859, + 22952, 22955, 22954, 22953, + 22956, 22957, 22954, 22955, + 22860, 22859, 22954, 22957, + 22860, 22957, 22958, 22863, + 22956, 22959, 22958, 22957, + 22960, 22961, 22958, 22959, + 22864, 22863, 22958, 22961, + 22864, 22961, 22962, 22867, + 22960, 22963, 22962, 22961, + 22964, 22965, 22962, 22963, + 22868, 22867, 22962, 22965, + 16870, 16875, 22966, 22871, + 16874, 22967, 22966, 16875, + 22968, 22969, 22966, 22967, + 22872, 22871, 22966, 22969, + 22872, 22969, 22970, 22875, + 22968, 22971, 22970, 22969, + 22972, 22973, 22970, 22971, + 22876, 22875, 22970, 22973, + 22876, 22973, 22974, 22879, + 22972, 22975, 22974, 22973, + 22976, 22977, 22974, 22975, + 22880, 22879, 22974, 22977, + 22880, 22977, 22978, 22883, + 22976, 22979, 22978, 22977, + 22980, 22981, 22978, 22979, + 22884, 22883, 22978, 22981, + 22884, 22981, 22982, 22887, + 22980, 22983, 22982, 22981, + 22984, 22985, 22982, 22983, + 22888, 22887, 22982, 22985, + 22888, 22985, 22986, 22891, + 22984, 22987, 22986, 22985, + 22988, 22989, 22986, 22987, + 22892, 22891, 22986, 22989, + 22892, 22989, 22990, 22895, + 22988, 22991, 22990, 22989, + 22992, 22993, 22990, 22991, + 22896, 22895, 22990, 22993, + 22896, 22993, 22994, 22899, + 22992, 22995, 22994, 22993, + 22996, 22997, 22994, 22995, + 22900, 22899, 22994, 22997, + 22900, 22997, 22998, 22903, + 22996, 22999, 22998, 22997, + 23000, 23001, 22998, 22999, + 22904, 22903, 22998, 23001, + 22904, 23001, 23002, 22907, + 23000, 23003, 23002, 23001, + 23004, 23005, 23002, 23003, + 22908, 22907, 23002, 23005, + 22908, 23005, 23006, 22911, + 23004, 23007, 23006, 23005, + 23008, 23009, 23006, 23007, + 22912, 22911, 23006, 23009, + 22912, 23009, 23010, 22915, + 23008, 23011, 23010, 23009, + 23012, 23013, 23010, 23011, + 22916, 22915, 23010, 23013, + 22916, 23013, 23014, 22919, + 23012, 23015, 23014, 23013, + 23016, 23017, 23014, 23015, + 22920, 22919, 23014, 23017, + 22920, 23017, 23018, 22923, + 23016, 23019, 23018, 23017, + 23020, 23021, 23018, 23019, + 22924, 22923, 23018, 23021, + 22924, 23021, 23022, 22927, + 23020, 23023, 23022, 23021, + 23024, 23025, 23022, 23023, + 22928, 22927, 23022, 23025, + 22928, 23025, 23026, 22931, + 23024, 23027, 23026, 23025, + 23028, 23029, 23026, 23027, + 22932, 22931, 23026, 23029, + 22932, 23029, 23030, 22935, + 23028, 23031, 23030, 23029, + 23032, 23033, 23030, 23031, + 22936, 22935, 23030, 23033, + 22936, 23033, 23034, 22939, + 23032, 23035, 23034, 23033, + 23036, 23037, 23034, 23035, + 22940, 22939, 23034, 23037, + 22940, 23037, 23038, 22943, + 23036, 23039, 23038, 23037, + 23040, 23041, 23038, 23039, + 22944, 22943, 23038, 23041, + 22944, 23041, 23042, 22947, + 23040, 23043, 23042, 23041, + 23044, 23045, 23042, 23043, + 22948, 22947, 23042, 23045, + 22948, 23045, 23046, 22951, + 23044, 23047, 23046, 23045, + 23048, 23049, 23046, 23047, + 22952, 22951, 23046, 23049, + 22952, 23049, 23050, 22955, + 23048, 23051, 23050, 23049, + 23052, 23053, 23050, 23051, + 22956, 22955, 23050, 23053, + 22956, 23053, 23054, 22959, + 23052, 23055, 23054, 23053, + 23056, 23057, 23054, 23055, + 22960, 22959, 23054, 23057, + 22960, 23057, 23058, 22963, + 23056, 23059, 23058, 23057, + 23060, 23061, 23058, 23059, + 22964, 22963, 23058, 23061, + 16874, 16879, 23062, 22967, + 16878, 23063, 23062, 16879, + 23064, 23065, 23062, 23063, + 22968, 22967, 23062, 23065, + 22968, 23065, 23066, 22971, + 23064, 23067, 23066, 23065, + 23068, 23069, 23066, 23067, + 22972, 22971, 23066, 23069, + 22972, 23069, 23070, 22975, + 23068, 23071, 23070, 23069, + 23072, 23073, 23070, 23071, + 22976, 22975, 23070, 23073, + 22976, 23073, 23074, 22979, + 23072, 23075, 23074, 23073, + 23076, 23077, 23074, 23075, + 22980, 22979, 23074, 23077, + 22980, 23077, 23078, 22983, + 23076, 23079, 23078, 23077, + 23080, 23081, 23078, 23079, + 22984, 22983, 23078, 23081, + 22984, 23081, 23082, 22987, + 23080, 23083, 23082, 23081, + 23084, 23085, 23082, 23083, + 22988, 22987, 23082, 23085, + 22988, 23085, 23086, 22991, + 23084, 23087, 23086, 23085, + 23088, 23089, 23086, 23087, + 22992, 22991, 23086, 23089, + 22992, 23089, 23090, 22995, + 23088, 23091, 23090, 23089, + 23092, 23093, 23090, 23091, + 22996, 22995, 23090, 23093, + 22996, 23093, 23094, 22999, + 23092, 23095, 23094, 23093, + 23096, 23097, 23094, 23095, + 23000, 22999, 23094, 23097, + 23000, 23097, 23098, 23003, + 23096, 23099, 23098, 23097, + 23100, 23101, 23098, 23099, + 23004, 23003, 23098, 23101, + 23004, 23101, 23102, 23007, + 23100, 23103, 23102, 23101, + 23104, 23105, 23102, 23103, + 23008, 23007, 23102, 23105, + 23008, 23105, 23106, 23011, + 23104, 23107, 23106, 23105, + 23108, 23109, 23106, 23107, + 23012, 23011, 23106, 23109, + 23012, 23109, 23110, 23015, + 23108, 23111, 23110, 23109, + 23112, 23113, 23110, 23111, + 23016, 23015, 23110, 23113, + 23016, 23113, 23114, 23019, + 23112, 23115, 23114, 23113, + 23116, 23117, 23114, 23115, + 23020, 23019, 23114, 23117, + 23020, 23117, 23118, 23023, + 23116, 23119, 23118, 23117, + 23120, 23121, 23118, 23119, + 23024, 23023, 23118, 23121, + 23024, 23121, 23122, 23027, + 23120, 23123, 23122, 23121, + 23124, 23125, 23122, 23123, + 23028, 23027, 23122, 23125, + 23028, 23125, 23126, 23031, + 23124, 23127, 23126, 23125, + 23128, 23129, 23126, 23127, + 23032, 23031, 23126, 23129, + 23032, 23129, 23130, 23035, + 23128, 23131, 23130, 23129, + 23132, 23133, 23130, 23131, + 23036, 23035, 23130, 23133, + 23036, 23133, 23134, 23039, + 23132, 23135, 23134, 23133, + 23136, 23137, 23134, 23135, + 23040, 23039, 23134, 23137, + 23040, 23137, 23138, 23043, + 23136, 23139, 23138, 23137, + 23140, 23141, 23138, 23139, + 23044, 23043, 23138, 23141, + 23044, 23141, 23142, 23047, + 23140, 23143, 23142, 23141, + 23144, 23145, 23142, 23143, + 23048, 23047, 23142, 23145, + 23048, 23145, 23146, 23051, + 23144, 23147, 23146, 23145, + 23148, 23149, 23146, 23147, + 23052, 23051, 23146, 23149, + 23052, 23149, 23150, 23055, + 23148, 23151, 23150, 23149, + 23152, 23153, 23150, 23151, + 23056, 23055, 23150, 23153, + 23056, 23153, 23154, 23059, + 23152, 23155, 23154, 23153, + 23156, 23157, 23154, 23155, + 23060, 23059, 23154, 23157, + 16878, 16883, 23158, 23063, + 16882, 23159, 23158, 16883, + 23160, 23161, 23158, 23159, + 23064, 23063, 23158, 23161, + 23064, 23161, 23162, 23067, + 23160, 23163, 23162, 23161, + 23164, 23165, 23162, 23163, + 23068, 23067, 23162, 23165, + 23068, 23165, 23166, 23071, + 23164, 23167, 23166, 23165, + 23168, 23169, 23166, 23167, + 23072, 23071, 23166, 23169, + 23072, 23169, 23170, 23075, + 23168, 23171, 23170, 23169, + 23172, 23173, 23170, 23171, + 23076, 23075, 23170, 23173, + 23076, 23173, 23174, 23079, + 23172, 23175, 23174, 23173, + 23176, 23177, 23174, 23175, + 23080, 23079, 23174, 23177, + 23080, 23177, 23178, 23083, + 23176, 23179, 23178, 23177, + 23180, 23181, 23178, 23179, + 23084, 23083, 23178, 23181, + 23084, 23181, 23182, 23087, + 23180, 23183, 23182, 23181, + 23184, 23185, 23182, 23183, + 23088, 23087, 23182, 23185, + 23088, 23185, 23186, 23091, + 23184, 23187, 23186, 23185, + 23188, 23189, 23186, 23187, + 23092, 23091, 23186, 23189, + 23092, 23189, 23190, 23095, + 23188, 23191, 23190, 23189, + 23192, 23193, 23190, 23191, + 23096, 23095, 23190, 23193, + 23096, 23193, 23194, 23099, + 23192, 23195, 23194, 23193, + 23196, 23197, 23194, 23195, + 23100, 23099, 23194, 23197, + 23100, 23197, 23198, 23103, + 23196, 23199, 23198, 23197, + 23200, 23201, 23198, 23199, + 23104, 23103, 23198, 23201, + 23104, 23201, 23202, 23107, + 23200, 23203, 23202, 23201, + 23204, 23205, 23202, 23203, + 23108, 23107, 23202, 23205, + 23108, 23205, 23206, 23111, + 23204, 23207, 23206, 23205, + 23208, 23209, 23206, 23207, + 23112, 23111, 23206, 23209, + 23112, 23209, 23210, 23115, + 23208, 23211, 23210, 23209, + 23212, 23213, 23210, 23211, + 23116, 23115, 23210, 23213, + 23116, 23213, 23214, 23119, + 23212, 23215, 23214, 23213, + 23216, 23217, 23214, 23215, + 23120, 23119, 23214, 23217, + 23120, 23217, 23218, 23123, + 23216, 23219, 23218, 23217, + 23220, 23221, 23218, 23219, + 23124, 23123, 23218, 23221, + 23124, 23221, 23222, 23127, + 23220, 23223, 23222, 23221, + 23224, 23225, 23222, 23223, + 23128, 23127, 23222, 23225, + 23128, 23225, 23226, 23131, + 23224, 23227, 23226, 23225, + 23228, 23229, 23226, 23227, + 23132, 23131, 23226, 23229, + 23132, 23229, 23230, 23135, + 23228, 23231, 23230, 23229, + 23232, 23233, 23230, 23231, + 23136, 23135, 23230, 23233, + 23136, 23233, 23234, 23139, + 23232, 23235, 23234, 23233, + 23236, 23237, 23234, 23235, + 23140, 23139, 23234, 23237, + 23140, 23237, 23238, 23143, + 23236, 23239, 23238, 23237, + 23240, 23241, 23238, 23239, + 23144, 23143, 23238, 23241, + 23144, 23241, 23242, 23147, + 23240, 23243, 23242, 23241, + 23244, 23245, 23242, 23243, + 23148, 23147, 23242, 23245, + 23148, 23245, 23246, 23151, + 23244, 23247, 23246, 23245, + 23248, 23249, 23246, 23247, + 23152, 23151, 23246, 23249, + 23152, 23249, 23250, 23155, + 23248, 23251, 23250, 23249, + 23252, 23253, 23250, 23251, + 23156, 23155, 23250, 23253, + 16882, 16887, 23254, 23159, + 16886, 23255, 23254, 16887, + 23256, 23257, 23254, 23255, + 23160, 23159, 23254, 23257, + 23160, 23257, 23258, 23163, + 23256, 23259, 23258, 23257, + 23260, 23261, 23258, 23259, + 23164, 23163, 23258, 23261, + 23164, 23261, 23262, 23167, + 23260, 23263, 23262, 23261, + 23264, 23265, 23262, 23263, + 23168, 23167, 23262, 23265, + 23168, 23265, 23266, 23171, + 23264, 23267, 23266, 23265, + 23268, 23269, 23266, 23267, + 23172, 23171, 23266, 23269, + 23172, 23269, 23270, 23175, + 23268, 23271, 23270, 23269, + 23272, 23273, 23270, 23271, + 23176, 23175, 23270, 23273, + 23176, 23273, 23274, 23179, + 23272, 23275, 23274, 23273, + 23276, 23277, 23274, 23275, + 23180, 23179, 23274, 23277, + 23180, 23277, 23278, 23183, + 23276, 23279, 23278, 23277, + 23280, 23281, 23278, 23279, + 23184, 23183, 23278, 23281, + 23184, 23281, 23282, 23187, + 23280, 23283, 23282, 23281, + 23284, 23285, 23282, 23283, + 23188, 23187, 23282, 23285, + 23188, 23285, 23286, 23191, + 23284, 23287, 23286, 23285, + 23288, 23289, 23286, 23287, + 23192, 23191, 23286, 23289, + 23192, 23289, 23290, 23195, + 23288, 23291, 23290, 23289, + 23292, 23293, 23290, 23291, + 23196, 23195, 23290, 23293, + 23196, 23293, 23294, 23199, + 23292, 23295, 23294, 23293, + 23296, 23297, 23294, 23295, + 23200, 23199, 23294, 23297, + 23200, 23297, 23298, 23203, + 23296, 23299, 23298, 23297, + 23300, 23301, 23298, 23299, + 23204, 23203, 23298, 23301, + 23204, 23301, 23302, 23207, + 23300, 23303, 23302, 23301, + 23304, 23305, 23302, 23303, + 23208, 23207, 23302, 23305, + 23208, 23305, 23306, 23211, + 23304, 23307, 23306, 23305, + 23308, 23309, 23306, 23307, + 23212, 23211, 23306, 23309, + 23212, 23309, 23310, 23215, + 23308, 23311, 23310, 23309, + 23312, 23313, 23310, 23311, + 23216, 23215, 23310, 23313, + 23216, 23313, 23314, 23219, + 23312, 23315, 23314, 23313, + 23316, 23317, 23314, 23315, + 23220, 23219, 23314, 23317, + 23220, 23317, 23318, 23223, + 23316, 23319, 23318, 23317, + 23320, 23321, 23318, 23319, + 23224, 23223, 23318, 23321, + 23224, 23321, 23322, 23227, + 23320, 23323, 23322, 23321, + 23324, 23325, 23322, 23323, + 23228, 23227, 23322, 23325, + 23228, 23325, 23326, 23231, + 23324, 23327, 23326, 23325, + 23328, 23329, 23326, 23327, + 23232, 23231, 23326, 23329, + 23232, 23329, 23330, 23235, + 23328, 23331, 23330, 23329, + 23332, 23333, 23330, 23331, + 23236, 23235, 23330, 23333, + 23236, 23333, 23334, 23239, + 23332, 23335, 23334, 23333, + 23336, 23337, 23334, 23335, + 23240, 23239, 23334, 23337, + 23240, 23337, 23338, 23243, + 23336, 23339, 23338, 23337, + 23340, 23341, 23338, 23339, + 23244, 23243, 23338, 23341, + 23244, 23341, 23342, 23247, + 23340, 23343, 23342, 23341, + 23344, 23345, 23342, 23343, + 23248, 23247, 23342, 23345, + 23248, 23345, 23346, 23251, + 23344, 23347, 23346, 23345, + 23348, 23349, 23346, 23347, + 23252, 23251, 23346, 23349, + 16886, 16891, 23350, 23255, + 16890, 23351, 23350, 16891, + 23352, 23353, 23350, 23351, + 23256, 23255, 23350, 23353, + 23256, 23353, 23354, 23259, + 23352, 23355, 23354, 23353, + 23356, 23357, 23354, 23355, + 23260, 23259, 23354, 23357, + 23260, 23357, 23358, 23263, + 23356, 23359, 23358, 23357, + 23360, 23361, 23358, 23359, + 23264, 23263, 23358, 23361, + 23264, 23361, 23362, 23267, + 23360, 23363, 23362, 23361, + 23364, 23365, 23362, 23363, + 23268, 23267, 23362, 23365, + 23268, 23365, 23366, 23271, + 23364, 23367, 23366, 23365, + 23368, 23369, 23366, 23367, + 23272, 23271, 23366, 23369, + 23272, 23369, 23370, 23275, + 23368, 23371, 23370, 23369, + 23372, 23373, 23370, 23371, + 23276, 23275, 23370, 23373, + 23276, 23373, 23374, 23279, + 23372, 23375, 23374, 23373, + 23376, 23377, 23374, 23375, + 23280, 23279, 23374, 23377, + 23280, 23377, 23378, 23283, + 23376, 23379, 23378, 23377, + 23380, 23381, 23378, 23379, + 23284, 23283, 23378, 23381, + 23284, 23381, 23382, 23287, + 23380, 23383, 23382, 23381, + 23384, 23385, 23382, 23383, + 23288, 23287, 23382, 23385, + 23288, 23385, 23386, 23291, + 23384, 23387, 23386, 23385, + 23388, 23389, 23386, 23387, + 23292, 23291, 23386, 23389, + 23292, 23389, 23390, 23295, + 23388, 23391, 23390, 23389, + 23392, 23393, 23390, 23391, + 23296, 23295, 23390, 23393, + 23296, 23393, 23394, 23299, + 23392, 23395, 23394, 23393, + 23396, 23397, 23394, 23395, + 23300, 23299, 23394, 23397, + 23300, 23397, 23398, 23303, + 23396, 23399, 23398, 23397, + 23400, 23401, 23398, 23399, + 23304, 23303, 23398, 23401, + 23304, 23401, 23402, 23307, + 23400, 23403, 23402, 23401, + 23404, 23405, 23402, 23403, + 23308, 23307, 23402, 23405, + 23308, 23405, 23406, 23311, + 23404, 23407, 23406, 23405, + 23408, 23409, 23406, 23407, + 23312, 23311, 23406, 23409, + 23312, 23409, 23410, 23315, + 23408, 23411, 23410, 23409, + 23412, 23413, 23410, 23411, + 23316, 23315, 23410, 23413, + 23316, 23413, 23414, 23319, + 23412, 23415, 23414, 23413, + 23416, 23417, 23414, 23415, + 23320, 23319, 23414, 23417, + 23320, 23417, 23418, 23323, + 23416, 23419, 23418, 23417, + 23420, 23421, 23418, 23419, + 23324, 23323, 23418, 23421, + 23324, 23421, 23422, 23327, + 23420, 23423, 23422, 23421, + 23424, 23425, 23422, 23423, + 23328, 23327, 23422, 23425, + 23328, 23425, 23426, 23331, + 23424, 23427, 23426, 23425, + 23428, 23429, 23426, 23427, + 23332, 23331, 23426, 23429, + 23332, 23429, 23430, 23335, + 23428, 23431, 23430, 23429, + 23432, 23433, 23430, 23431, + 23336, 23335, 23430, 23433, + 23336, 23433, 23434, 23339, + 23432, 23435, 23434, 23433, + 23436, 23437, 23434, 23435, + 23340, 23339, 23434, 23437, + 23340, 23437, 23438, 23343, + 23436, 23439, 23438, 23437, + 23440, 23441, 23438, 23439, + 23344, 23343, 23438, 23441, + 23344, 23441, 23442, 23347, + 23440, 23443, 23442, 23441, + 23444, 23445, 23442, 23443, + 23348, 23347, 23442, 23445, + 16890, 16895, 23446, 23351, + 16894, 23447, 23446, 16895, + 23448, 23449, 23446, 23447, + 23352, 23351, 23446, 23449, + 23352, 23449, 23450, 23355, + 23448, 23451, 23450, 23449, + 23452, 23453, 23450, 23451, + 23356, 23355, 23450, 23453, + 23356, 23453, 23454, 23359, + 23452, 23455, 23454, 23453, + 23456, 23457, 23454, 23455, + 23360, 23359, 23454, 23457, + 23360, 23457, 23458, 23363, + 23456, 23459, 23458, 23457, + 23460, 23461, 23458, 23459, + 23364, 23363, 23458, 23461, + 23364, 23461, 23462, 23367, + 23460, 23463, 23462, 23461, + 23464, 23465, 23462, 23463, + 23368, 23367, 23462, 23465, + 23368, 23465, 23466, 23371, + 23464, 23467, 23466, 23465, + 23468, 23469, 23466, 23467, + 23372, 23371, 23466, 23469, + 23372, 23469, 23470, 23375, + 23468, 23471, 23470, 23469, + 23472, 23473, 23470, 23471, + 23376, 23375, 23470, 23473, + 23376, 23473, 23474, 23379, + 23472, 23475, 23474, 23473, + 23476, 23477, 23474, 23475, + 23380, 23379, 23474, 23477, + 23380, 23477, 23478, 23383, + 23476, 23479, 23478, 23477, + 23480, 23481, 23478, 23479, + 23384, 23383, 23478, 23481, + 23384, 23481, 23482, 23387, + 23480, 23483, 23482, 23481, + 23484, 23485, 23482, 23483, + 23388, 23387, 23482, 23485, + 23388, 23485, 23486, 23391, + 23484, 23487, 23486, 23485, + 23488, 23489, 23486, 23487, + 23392, 23391, 23486, 23489, + 23392, 23489, 23490, 23395, + 23488, 23491, 23490, 23489, + 23492, 23493, 23490, 23491, + 23396, 23395, 23490, 23493, + 23396, 23493, 23494, 23399, + 23492, 23495, 23494, 23493, + 23496, 23497, 23494, 23495, + 23400, 23399, 23494, 23497, + 23400, 23497, 23498, 23403, + 23496, 23499, 23498, 23497, + 23500, 23501, 23498, 23499, + 23404, 23403, 23498, 23501, + 23404, 23501, 23502, 23407, + 23500, 23503, 23502, 23501, + 23504, 23505, 23502, 23503, + 23408, 23407, 23502, 23505, + 23408, 23505, 23506, 23411, + 23504, 23507, 23506, 23505, + 23508, 23509, 23506, 23507, + 23412, 23411, 23506, 23509, + 23412, 23509, 23510, 23415, + 23508, 23511, 23510, 23509, + 23512, 23513, 23510, 23511, + 23416, 23415, 23510, 23513, + 23416, 23513, 23514, 23419, + 23512, 23515, 23514, 23513, + 23516, 23517, 23514, 23515, + 23420, 23419, 23514, 23517, + 23420, 23517, 23518, 23423, + 23516, 23519, 23518, 23517, + 23520, 23521, 23518, 23519, + 23424, 23423, 23518, 23521, + 23424, 23521, 23522, 23427, + 23520, 23523, 23522, 23521, + 23524, 23525, 23522, 23523, + 23428, 23427, 23522, 23525, + 23428, 23525, 23526, 23431, + 23524, 23527, 23526, 23525, + 23528, 23529, 23526, 23527, + 23432, 23431, 23526, 23529, + 23432, 23529, 23530, 23435, + 23528, 23531, 23530, 23529, + 23532, 23533, 23530, 23531, + 23436, 23435, 23530, 23533, + 23436, 23533, 23534, 23439, + 23532, 23535, 23534, 23533, + 23536, 23537, 23534, 23535, + 23440, 23439, 23534, 23537, + 23440, 23537, 23538, 23443, + 23536, 23539, 23538, 23537, + 23540, 23541, 23538, 23539, + 23444, 23443, 23538, 23541, + 16894, 16899, 23542, 23447, + 16898, 23543, 23542, 16899, + 23544, 23545, 23542, 23543, + 23448, 23447, 23542, 23545, + 23448, 23545, 23546, 23451, + 23544, 23547, 23546, 23545, + 23548, 23549, 23546, 23547, + 23452, 23451, 23546, 23549, + 23452, 23549, 23550, 23455, + 23548, 23551, 23550, 23549, + 23552, 23553, 23550, 23551, + 23456, 23455, 23550, 23553, + 23456, 23553, 23554, 23459, + 23552, 23555, 23554, 23553, + 23556, 23557, 23554, 23555, + 23460, 23459, 23554, 23557, + 23460, 23557, 23558, 23463, + 23556, 23559, 23558, 23557, + 23560, 23561, 23558, 23559, + 23464, 23463, 23558, 23561, + 23464, 23561, 23562, 23467, + 23560, 23563, 23562, 23561, + 23564, 23565, 23562, 23563, + 23468, 23467, 23562, 23565, + 23468, 23565, 23566, 23471, + 23564, 23567, 23566, 23565, + 23568, 23569, 23566, 23567, + 23472, 23471, 23566, 23569, + 23472, 23569, 23570, 23475, + 23568, 23571, 23570, 23569, + 23572, 23573, 23570, 23571, + 23476, 23475, 23570, 23573, + 23476, 23573, 23574, 23479, + 23572, 23575, 23574, 23573, + 23576, 23577, 23574, 23575, + 23480, 23479, 23574, 23577, + 23480, 23577, 23578, 23483, + 23576, 23579, 23578, 23577, + 23580, 23581, 23578, 23579, + 23484, 23483, 23578, 23581, + 23484, 23581, 23582, 23487, + 23580, 23583, 23582, 23581, + 23584, 23585, 23582, 23583, + 23488, 23487, 23582, 23585, + 23488, 23585, 23586, 23491, + 23584, 23587, 23586, 23585, + 23588, 23589, 23586, 23587, + 23492, 23491, 23586, 23589, + 23492, 23589, 23590, 23495, + 23588, 23591, 23590, 23589, + 23592, 23593, 23590, 23591, + 23496, 23495, 23590, 23593, + 23496, 23593, 23594, 23499, + 23592, 23595, 23594, 23593, + 23596, 23597, 23594, 23595, + 23500, 23499, 23594, 23597, + 23500, 23597, 23598, 23503, + 23596, 23599, 23598, 23597, + 23600, 23601, 23598, 23599, + 23504, 23503, 23598, 23601, + 23504, 23601, 23602, 23507, + 23600, 23603, 23602, 23601, + 23604, 23605, 23602, 23603, + 23508, 23507, 23602, 23605, + 23508, 23605, 23606, 23511, + 23604, 23607, 23606, 23605, + 23608, 23609, 23606, 23607, + 23512, 23511, 23606, 23609, + 23512, 23609, 23610, 23515, + 23608, 23611, 23610, 23609, + 23612, 23613, 23610, 23611, + 23516, 23515, 23610, 23613, + 23516, 23613, 23614, 23519, + 23612, 23615, 23614, 23613, + 23616, 23617, 23614, 23615, + 23520, 23519, 23614, 23617, + 23520, 23617, 23618, 23523, + 23616, 23619, 23618, 23617, + 23620, 23621, 23618, 23619, + 23524, 23523, 23618, 23621, + 23524, 23621, 23622, 23527, + 23620, 23623, 23622, 23621, + 23624, 23625, 23622, 23623, + 23528, 23527, 23622, 23625, + 23528, 23625, 23626, 23531, + 23624, 23627, 23626, 23625, + 23628, 23629, 23626, 23627, + 23532, 23531, 23626, 23629, + 23532, 23629, 23630, 23535, + 23628, 23631, 23630, 23629, + 23632, 23633, 23630, 23631, + 23536, 23535, 23630, 23633, + 23536, 23633, 23634, 23539, + 23632, 23635, 23634, 23633, + 23636, 23637, 23634, 23635, + 23540, 23539, 23634, 23637, + 16898, 16903, 23638, 23543, + 16902, 23639, 23638, 16903, + 23640, 23641, 23638, 23639, + 23544, 23543, 23638, 23641, + 23544, 23641, 23642, 23547, + 23640, 23643, 23642, 23641, + 23644, 23645, 23642, 23643, + 23548, 23547, 23642, 23645, + 23548, 23645, 23646, 23551, + 23644, 23647, 23646, 23645, + 23648, 23649, 23646, 23647, + 23552, 23551, 23646, 23649, + 23552, 23649, 23650, 23555, + 23648, 23651, 23650, 23649, + 23652, 23653, 23650, 23651, + 23556, 23555, 23650, 23653, + 23556, 23653, 23654, 23559, + 23652, 23655, 23654, 23653, + 23656, 23657, 23654, 23655, + 23560, 23559, 23654, 23657, + 23560, 23657, 23658, 23563, + 23656, 23659, 23658, 23657, + 23660, 23661, 23658, 23659, + 23564, 23563, 23658, 23661, + 23564, 23661, 23662, 23567, + 23660, 23663, 23662, 23661, + 23664, 23665, 23662, 23663, + 23568, 23567, 23662, 23665, + 23568, 23665, 23666, 23571, + 23664, 23667, 23666, 23665, + 23668, 23669, 23666, 23667, + 23572, 23571, 23666, 23669, + 23572, 23669, 23670, 23575, + 23668, 23671, 23670, 23669, + 23672, 23673, 23670, 23671, + 23576, 23575, 23670, 23673, + 23576, 23673, 23674, 23579, + 23672, 23675, 23674, 23673, + 23676, 23677, 23674, 23675, + 23580, 23579, 23674, 23677, + 23580, 23677, 23678, 23583, + 23676, 23679, 23678, 23677, + 23680, 23681, 23678, 23679, + 23584, 23583, 23678, 23681, + 23584, 23681, 23682, 23587, + 23680, 23683, 23682, 23681, + 23684, 23685, 23682, 23683, + 23588, 23587, 23682, 23685, + 23588, 23685, 23686, 23591, + 23684, 23687, 23686, 23685, + 23688, 23689, 23686, 23687, + 23592, 23591, 23686, 23689, + 23592, 23689, 23690, 23595, + 23688, 23691, 23690, 23689, + 23692, 23693, 23690, 23691, + 23596, 23595, 23690, 23693, + 23596, 23693, 23694, 23599, + 23692, 23695, 23694, 23693, + 23696, 23697, 23694, 23695, + 23600, 23599, 23694, 23697, + 23600, 23697, 23698, 23603, + 23696, 23699, 23698, 23697, + 23700, 23701, 23698, 23699, + 23604, 23603, 23698, 23701, + 23604, 23701, 23702, 23607, + 23700, 23703, 23702, 23701, + 23704, 23705, 23702, 23703, + 23608, 23607, 23702, 23705, + 23608, 23705, 23706, 23611, + 23704, 23707, 23706, 23705, + 23708, 23709, 23706, 23707, + 23612, 23611, 23706, 23709, + 23612, 23709, 23710, 23615, + 23708, 23711, 23710, 23709, + 23712, 23713, 23710, 23711, + 23616, 23615, 23710, 23713, + 23616, 23713, 23714, 23619, + 23712, 23715, 23714, 23713, + 23716, 23717, 23714, 23715, + 23620, 23619, 23714, 23717, + 23620, 23717, 23718, 23623, + 23716, 23719, 23718, 23717, + 23720, 23721, 23718, 23719, + 23624, 23623, 23718, 23721, + 23624, 23721, 23722, 23627, + 23720, 23723, 23722, 23721, + 23724, 23725, 23722, 23723, + 23628, 23627, 23722, 23725, + 23628, 23725, 23726, 23631, + 23724, 23727, 23726, 23725, + 23728, 23729, 23726, 23727, + 23632, 23631, 23726, 23729, + 23632, 23729, 23730, 23635, + 23728, 23731, 23730, 23729, + 23732, 23733, 23730, 23731, + 23636, 23635, 23730, 23733, + 16902, 16907, 23734, 23639, + 16906, 23735, 23734, 16907, + 23736, 23737, 23734, 23735, + 23640, 23639, 23734, 23737, + 23640, 23737, 23738, 23643, + 23736, 23739, 23738, 23737, + 23740, 23741, 23738, 23739, + 23644, 23643, 23738, 23741, + 23644, 23741, 23742, 23647, + 23740, 23743, 23742, 23741, + 23744, 23745, 23742, 23743, + 23648, 23647, 23742, 23745, + 23648, 23745, 23746, 23651, + 23744, 23747, 23746, 23745, + 23748, 23749, 23746, 23747, + 23652, 23651, 23746, 23749, + 23652, 23749, 23750, 23655, + 23748, 23751, 23750, 23749, + 23752, 23753, 23750, 23751, + 23656, 23655, 23750, 23753, + 23656, 23753, 23754, 23659, + 23752, 23755, 23754, 23753, + 23756, 23757, 23754, 23755, + 23660, 23659, 23754, 23757, + 23660, 23757, 23758, 23663, + 23756, 23759, 23758, 23757, + 23760, 23761, 23758, 23759, + 23664, 23663, 23758, 23761, + 23664, 23761, 23762, 23667, + 23760, 23763, 23762, 23761, + 23764, 23765, 23762, 23763, + 23668, 23667, 23762, 23765, + 23668, 23765, 23766, 23671, + 23764, 23767, 23766, 23765, + 23768, 23769, 23766, 23767, + 23672, 23671, 23766, 23769, + 23672, 23769, 23770, 23675, + 23768, 23771, 23770, 23769, + 23772, 23773, 23770, 23771, + 23676, 23675, 23770, 23773, + 23676, 23773, 23774, 23679, + 23772, 23775, 23774, 23773, + 23776, 23777, 23774, 23775, + 23680, 23679, 23774, 23777, + 23680, 23777, 23778, 23683, + 23776, 23779, 23778, 23777, + 23780, 23781, 23778, 23779, + 23684, 23683, 23778, 23781, + 23684, 23781, 23782, 23687, + 23780, 23783, 23782, 23781, + 23784, 23785, 23782, 23783, + 23688, 23687, 23782, 23785, + 23688, 23785, 23786, 23691, + 23784, 23787, 23786, 23785, + 23788, 23789, 23786, 23787, + 23692, 23691, 23786, 23789, + 23692, 23789, 23790, 23695, + 23788, 23791, 23790, 23789, + 23792, 23793, 23790, 23791, + 23696, 23695, 23790, 23793, + 23696, 23793, 23794, 23699, + 23792, 23795, 23794, 23793, + 23796, 23797, 23794, 23795, + 23700, 23699, 23794, 23797, + 23700, 23797, 23798, 23703, + 23796, 23799, 23798, 23797, + 23800, 23801, 23798, 23799, + 23704, 23703, 23798, 23801, + 23704, 23801, 23802, 23707, + 23800, 23803, 23802, 23801, + 23804, 23805, 23802, 23803, + 23708, 23707, 23802, 23805, + 23708, 23805, 23806, 23711, + 23804, 23807, 23806, 23805, + 23808, 23809, 23806, 23807, + 23712, 23711, 23806, 23809, + 23712, 23809, 23810, 23715, + 23808, 23811, 23810, 23809, + 23812, 23813, 23810, 23811, + 23716, 23715, 23810, 23813, + 23716, 23813, 23814, 23719, + 23812, 23815, 23814, 23813, + 23816, 23817, 23814, 23815, + 23720, 23719, 23814, 23817, + 23720, 23817, 23818, 23723, + 23816, 23819, 23818, 23817, + 23820, 23821, 23818, 23819, + 23724, 23723, 23818, 23821, + 23724, 23821, 23822, 23727, + 23820, 23823, 23822, 23821, + 23824, 23825, 23822, 23823, + 23728, 23727, 23822, 23825, + 23728, 23825, 23826, 23731, + 23824, 23827, 23826, 23825, + 23828, 23829, 23826, 23827, + 23732, 23731, 23826, 23829, + 16906, 16911, 23830, 23735, + 16910, 23831, 23830, 16911, + 23832, 23833, 23830, 23831, + 23736, 23735, 23830, 23833, + 23736, 23833, 23834, 23739, + 23832, 23835, 23834, 23833, + 23836, 23837, 23834, 23835, + 23740, 23739, 23834, 23837, + 23740, 23837, 23838, 23743, + 23836, 23839, 23838, 23837, + 23840, 23841, 23838, 23839, + 23744, 23743, 23838, 23841, + 23744, 23841, 23842, 23747, + 23840, 23843, 23842, 23841, + 23844, 23845, 23842, 23843, + 23748, 23747, 23842, 23845, + 23748, 23845, 23846, 23751, + 23844, 23847, 23846, 23845, + 23848, 23849, 23846, 23847, + 23752, 23751, 23846, 23849, + 23752, 23849, 23850, 23755, + 23848, 23851, 23850, 23849, + 23852, 23853, 23850, 23851, + 23756, 23755, 23850, 23853, + 23756, 23853, 23854, 23759, + 23852, 23855, 23854, 23853, + 23856, 23857, 23854, 23855, + 23760, 23759, 23854, 23857, + 23760, 23857, 23858, 23763, + 23856, 23859, 23858, 23857, + 23860, 23861, 23858, 23859, + 23764, 23763, 23858, 23861, + 23764, 23861, 23862, 23767, + 23860, 23863, 23862, 23861, + 23864, 23865, 23862, 23863, + 23768, 23767, 23862, 23865, + 23768, 23865, 23866, 23771, + 23864, 23867, 23866, 23865, + 23868, 23869, 23866, 23867, + 23772, 23771, 23866, 23869, + 23772, 23869, 23870, 23775, + 23868, 23871, 23870, 23869, + 23872, 23873, 23870, 23871, + 23776, 23775, 23870, 23873, + 23776, 23873, 23874, 23779, + 23872, 23875, 23874, 23873, + 23876, 23877, 23874, 23875, + 23780, 23779, 23874, 23877, + 23780, 23877, 23878, 23783, + 23876, 23879, 23878, 23877, + 23880, 23881, 23878, 23879, + 23784, 23783, 23878, 23881, + 23784, 23881, 23882, 23787, + 23880, 23883, 23882, 23881, + 23884, 23885, 23882, 23883, + 23788, 23787, 23882, 23885, + 23788, 23885, 23886, 23791, + 23884, 23887, 23886, 23885, + 23888, 23889, 23886, 23887, + 23792, 23791, 23886, 23889, + 23792, 23889, 23890, 23795, + 23888, 23891, 23890, 23889, + 23892, 23893, 23890, 23891, + 23796, 23795, 23890, 23893, + 23796, 23893, 23894, 23799, + 23892, 23895, 23894, 23893, + 23896, 23897, 23894, 23895, + 23800, 23799, 23894, 23897, + 23800, 23897, 23898, 23803, + 23896, 23899, 23898, 23897, + 23900, 23901, 23898, 23899, + 23804, 23803, 23898, 23901, + 23804, 23901, 23902, 23807, + 23900, 23903, 23902, 23901, + 23904, 23905, 23902, 23903, + 23808, 23807, 23902, 23905, + 23808, 23905, 23906, 23811, + 23904, 23907, 23906, 23905, + 23908, 23909, 23906, 23907, + 23812, 23811, 23906, 23909, + 23812, 23909, 23910, 23815, + 23908, 23911, 23910, 23909, + 23912, 23913, 23910, 23911, + 23816, 23815, 23910, 23913, + 23816, 23913, 23914, 23819, + 23912, 23915, 23914, 23913, + 23916, 23917, 23914, 23915, + 23820, 23819, 23914, 23917, + 23820, 23917, 23918, 23823, + 23916, 23919, 23918, 23917, + 23920, 23921, 23918, 23919, + 23824, 23823, 23918, 23921, + 23824, 23921, 23922, 23827, + 23920, 23923, 23922, 23921, + 23924, 23925, 23922, 23923, + 23828, 23827, 23922, 23925, + 16910, 16915, 23926, 23831, + 16914, 23927, 23926, 16915, + 23928, 23929, 23926, 23927, + 23832, 23831, 23926, 23929, + 23832, 23929, 23930, 23835, + 23928, 23931, 23930, 23929, + 23932, 23933, 23930, 23931, + 23836, 23835, 23930, 23933, + 23836, 23933, 23934, 23839, + 23932, 23935, 23934, 23933, + 23936, 23937, 23934, 23935, + 23840, 23839, 23934, 23937, + 23840, 23937, 23938, 23843, + 23936, 23939, 23938, 23937, + 23940, 23941, 23938, 23939, + 23844, 23843, 23938, 23941, + 23844, 23941, 23942, 23847, + 23940, 23943, 23942, 23941, + 23944, 23945, 23942, 23943, + 23848, 23847, 23942, 23945, + 23848, 23945, 23946, 23851, + 23944, 23947, 23946, 23945, + 23948, 23949, 23946, 23947, + 23852, 23851, 23946, 23949, + 23852, 23949, 23950, 23855, + 23948, 23951, 23950, 23949, + 23952, 23953, 23950, 23951, + 23856, 23855, 23950, 23953, + 23856, 23953, 23954, 23859, + 23952, 23955, 23954, 23953, + 23956, 23957, 23954, 23955, + 23860, 23859, 23954, 23957, + 23860, 23957, 23958, 23863, + 23956, 23959, 23958, 23957, + 23960, 23961, 23958, 23959, + 23864, 23863, 23958, 23961, + 23864, 23961, 23962, 23867, + 23960, 23963, 23962, 23961, + 23964, 23965, 23962, 23963, + 23868, 23867, 23962, 23965, + 23868, 23965, 23966, 23871, + 23964, 23967, 23966, 23965, + 23968, 23969, 23966, 23967, + 23872, 23871, 23966, 23969, + 23872, 23969, 23970, 23875, + 23968, 23971, 23970, 23969, + 23972, 23973, 23970, 23971, + 23876, 23875, 23970, 23973, + 23876, 23973, 23974, 23879, + 23972, 23975, 23974, 23973, + 23976, 23977, 23974, 23975, + 23880, 23879, 23974, 23977, + 23880, 23977, 23978, 23883, + 23976, 23979, 23978, 23977, + 23980, 23981, 23978, 23979, + 23884, 23883, 23978, 23981, + 23884, 23981, 23982, 23887, + 23980, 23983, 23982, 23981, + 23984, 23985, 23982, 23983, + 23888, 23887, 23982, 23985, + 23888, 23985, 23986, 23891, + 23984, 23987, 23986, 23985, + 23988, 23989, 23986, 23987, + 23892, 23891, 23986, 23989, + 23892, 23989, 23990, 23895, + 23988, 23991, 23990, 23989, + 23992, 23993, 23990, 23991, + 23896, 23895, 23990, 23993, + 23896, 23993, 23994, 23899, + 23992, 23995, 23994, 23993, + 23996, 23997, 23994, 23995, + 23900, 23899, 23994, 23997, + 23900, 23997, 23998, 23903, + 23996, 23999, 23998, 23997, + 24000, 24001, 23998, 23999, + 23904, 23903, 23998, 24001, + 23904, 24001, 24002, 23907, + 24000, 24003, 24002, 24001, + 24004, 24005, 24002, 24003, + 23908, 23907, 24002, 24005, + 23908, 24005, 24006, 23911, + 24004, 24007, 24006, 24005, + 24008, 24009, 24006, 24007, + 23912, 23911, 24006, 24009, + 23912, 24009, 24010, 23915, + 24008, 24011, 24010, 24009, + 24012, 24013, 24010, 24011, + 23916, 23915, 24010, 24013, + 23916, 24013, 24014, 23919, + 24012, 24015, 24014, 24013, + 24016, 24017, 24014, 24015, + 23920, 23919, 24014, 24017, + 23920, 24017, 24018, 23923, + 24016, 24019, 24018, 24017, + 24020, 24021, 24018, 24019, + 23924, 23923, 24018, 24021, + 16914, 16919, 24022, 23927, + 16918, 24023, 24022, 16919, + 24024, 24025, 24022, 24023, + 23928, 23927, 24022, 24025, + 23928, 24025, 24026, 23931, + 24024, 24027, 24026, 24025, + 24028, 24029, 24026, 24027, + 23932, 23931, 24026, 24029, + 23932, 24029, 24030, 23935, + 24028, 24031, 24030, 24029, + 24032, 24033, 24030, 24031, + 23936, 23935, 24030, 24033, + 23936, 24033, 24034, 23939, + 24032, 24035, 24034, 24033, + 24036, 24037, 24034, 24035, + 23940, 23939, 24034, 24037, + 23940, 24037, 24038, 23943, + 24036, 24039, 24038, 24037, + 24040, 24041, 24038, 24039, + 23944, 23943, 24038, 24041, + 23944, 24041, 24042, 23947, + 24040, 24043, 24042, 24041, + 24044, 24045, 24042, 24043, + 23948, 23947, 24042, 24045, + 23948, 24045, 24046, 23951, + 24044, 24047, 24046, 24045, + 24048, 24049, 24046, 24047, + 23952, 23951, 24046, 24049, + 23952, 24049, 24050, 23955, + 24048, 24051, 24050, 24049, + 24052, 24053, 24050, 24051, + 23956, 23955, 24050, 24053, + 23956, 24053, 24054, 23959, + 24052, 24055, 24054, 24053, + 24056, 24057, 24054, 24055, + 23960, 23959, 24054, 24057, + 23960, 24057, 24058, 23963, + 24056, 24059, 24058, 24057, + 24060, 24061, 24058, 24059, + 23964, 23963, 24058, 24061, + 23964, 24061, 24062, 23967, + 24060, 24063, 24062, 24061, + 24064, 24065, 24062, 24063, + 23968, 23967, 24062, 24065, + 23968, 24065, 24066, 23971, + 24064, 24067, 24066, 24065, + 24068, 24069, 24066, 24067, + 23972, 23971, 24066, 24069, + 23972, 24069, 24070, 23975, + 24068, 24071, 24070, 24069, + 24072, 24073, 24070, 24071, + 23976, 23975, 24070, 24073, + 23976, 24073, 24074, 23979, + 24072, 24075, 24074, 24073, + 24076, 24077, 24074, 24075, + 23980, 23979, 24074, 24077, + 23980, 24077, 24078, 23983, + 24076, 24079, 24078, 24077, + 24080, 24081, 24078, 24079, + 23984, 23983, 24078, 24081, + 23984, 24081, 24082, 23987, + 24080, 24083, 24082, 24081, + 24084, 24085, 24082, 24083, + 23988, 23987, 24082, 24085, + 23988, 24085, 24086, 23991, + 24084, 24087, 24086, 24085, + 24088, 24089, 24086, 24087, + 23992, 23991, 24086, 24089, + 23992, 24089, 24090, 23995, + 24088, 24091, 24090, 24089, + 24092, 24093, 24090, 24091, + 23996, 23995, 24090, 24093, + 23996, 24093, 24094, 23999, + 24092, 24095, 24094, 24093, + 24096, 24097, 24094, 24095, + 24000, 23999, 24094, 24097, + 24000, 24097, 24098, 24003, + 24096, 24099, 24098, 24097, + 24100, 24101, 24098, 24099, + 24004, 24003, 24098, 24101, + 24004, 24101, 24102, 24007, + 24100, 24103, 24102, 24101, + 24104, 24105, 24102, 24103, + 24008, 24007, 24102, 24105, + 24008, 24105, 24106, 24011, + 24104, 24107, 24106, 24105, + 24108, 24109, 24106, 24107, + 24012, 24011, 24106, 24109, + 24012, 24109, 24110, 24015, + 24108, 24111, 24110, 24109, + 24112, 24113, 24110, 24111, + 24016, 24015, 24110, 24113, + 24016, 24113, 24114, 24019, + 24112, 24115, 24114, 24113, + 24116, 24117, 24114, 24115, + 24020, 24019, 24114, 24117, + 16918, 16923, 24118, 24023, + 16922, 24119, 24118, 16923, + 24120, 24121, 24118, 24119, + 24024, 24023, 24118, 24121, + 24024, 24121, 24122, 24027, + 24120, 24123, 24122, 24121, + 24124, 24125, 24122, 24123, + 24028, 24027, 24122, 24125, + 24028, 24125, 24126, 24031, + 24124, 24127, 24126, 24125, + 24128, 24129, 24126, 24127, + 24032, 24031, 24126, 24129, + 24032, 24129, 24130, 24035, + 24128, 24131, 24130, 24129, + 24132, 24133, 24130, 24131, + 24036, 24035, 24130, 24133, + 24036, 24133, 24134, 24039, + 24132, 24135, 24134, 24133, + 24136, 24137, 24134, 24135, + 24040, 24039, 24134, 24137, + 24040, 24137, 24138, 24043, + 24136, 24139, 24138, 24137, + 24140, 24141, 24138, 24139, + 24044, 24043, 24138, 24141, + 24044, 24141, 24142, 24047, + 24140, 24143, 24142, 24141, + 24144, 24145, 24142, 24143, + 24048, 24047, 24142, 24145, + 24048, 24145, 24146, 24051, + 24144, 24147, 24146, 24145, + 24148, 24149, 24146, 24147, + 24052, 24051, 24146, 24149, + 24052, 24149, 24150, 24055, + 24148, 24151, 24150, 24149, + 24152, 24153, 24150, 24151, + 24056, 24055, 24150, 24153, + 24056, 24153, 24154, 24059, + 24152, 24155, 24154, 24153, + 24156, 24157, 24154, 24155, + 24060, 24059, 24154, 24157, + 24060, 24157, 24158, 24063, + 24156, 24159, 24158, 24157, + 24160, 24161, 24158, 24159, + 24064, 24063, 24158, 24161, + 24064, 24161, 24162, 24067, + 24160, 24163, 24162, 24161, + 24164, 24165, 24162, 24163, + 24068, 24067, 24162, 24165, + 24068, 24165, 24166, 24071, + 24164, 24167, 24166, 24165, + 24168, 24169, 24166, 24167, + 24072, 24071, 24166, 24169, + 24072, 24169, 24170, 24075, + 24168, 24171, 24170, 24169, + 24172, 24173, 24170, 24171, + 24076, 24075, 24170, 24173, + 24076, 24173, 24174, 24079, + 24172, 24175, 24174, 24173, + 24176, 24177, 24174, 24175, + 24080, 24079, 24174, 24177, + 24080, 24177, 24178, 24083, + 24176, 24179, 24178, 24177, + 24180, 24181, 24178, 24179, + 24084, 24083, 24178, 24181, + 24084, 24181, 24182, 24087, + 24180, 24183, 24182, 24181, + 24184, 24185, 24182, 24183, + 24088, 24087, 24182, 24185, + 24088, 24185, 24186, 24091, + 24184, 24187, 24186, 24185, + 24188, 24189, 24186, 24187, + 24092, 24091, 24186, 24189, + 24092, 24189, 24190, 24095, + 24188, 24191, 24190, 24189, + 24192, 24193, 24190, 24191, + 24096, 24095, 24190, 24193, + 24096, 24193, 24194, 24099, + 24192, 24195, 24194, 24193, + 24196, 24197, 24194, 24195, + 24100, 24099, 24194, 24197, + 24100, 24197, 24198, 24103, + 24196, 24199, 24198, 24197, + 24200, 24201, 24198, 24199, + 24104, 24103, 24198, 24201, + 24104, 24201, 24202, 24107, + 24200, 24203, 24202, 24201, + 24204, 24205, 24202, 24203, + 24108, 24107, 24202, 24205, + 24108, 24205, 24206, 24111, + 24204, 24207, 24206, 24205, + 24208, 24209, 24206, 24207, + 24112, 24111, 24206, 24209, + 24112, 24209, 24210, 24115, + 24208, 24211, 24210, 24209, + 24212, 24213, 24210, 24211, + 24116, 24115, 24210, 24213, + 16922, 16927, 24214, 24119, + 16926, 24215, 24214, 16927, + 24216, 24217, 24214, 24215, + 24120, 24119, 24214, 24217, + 24120, 24217, 24218, 24123, + 24216, 24219, 24218, 24217, + 24220, 24221, 24218, 24219, + 24124, 24123, 24218, 24221, + 24124, 24221, 24222, 24127, + 24220, 24223, 24222, 24221, + 24224, 24225, 24222, 24223, + 24128, 24127, 24222, 24225, + 24128, 24225, 24226, 24131, + 24224, 24227, 24226, 24225, + 24228, 24229, 24226, 24227, + 24132, 24131, 24226, 24229, + 24132, 24229, 24230, 24135, + 24228, 24231, 24230, 24229, + 24232, 24233, 24230, 24231, + 24136, 24135, 24230, 24233, + 24136, 24233, 24234, 24139, + 24232, 24235, 24234, 24233, + 24236, 24237, 24234, 24235, + 24140, 24139, 24234, 24237, + 24140, 24237, 24238, 24143, + 24236, 24239, 24238, 24237, + 24240, 24241, 24238, 24239, + 24144, 24143, 24238, 24241, + 24144, 24241, 24242, 24147, + 24240, 24243, 24242, 24241, + 24244, 24245, 24242, 24243, + 24148, 24147, 24242, 24245, + 24148, 24245, 24246, 24151, + 24244, 24247, 24246, 24245, + 24248, 24249, 24246, 24247, + 24152, 24151, 24246, 24249, + 24152, 24249, 24250, 24155, + 24248, 24251, 24250, 24249, + 24252, 24253, 24250, 24251, + 24156, 24155, 24250, 24253, + 24156, 24253, 24254, 24159, + 24252, 24255, 24254, 24253, + 24256, 24257, 24254, 24255, + 24160, 24159, 24254, 24257, + 24160, 24257, 24258, 24163, + 24256, 24259, 24258, 24257, + 24260, 24261, 24258, 24259, + 24164, 24163, 24258, 24261, + 24164, 24261, 24262, 24167, + 24260, 24263, 24262, 24261, + 24264, 24265, 24262, 24263, + 24168, 24167, 24262, 24265, + 24168, 24265, 24266, 24171, + 24264, 24267, 24266, 24265, + 24268, 24269, 24266, 24267, + 24172, 24171, 24266, 24269, + 24172, 24269, 24270, 24175, + 24268, 24271, 24270, 24269, + 24272, 24273, 24270, 24271, + 24176, 24175, 24270, 24273, + 24176, 24273, 24274, 24179, + 24272, 24275, 24274, 24273, + 24276, 24277, 24274, 24275, + 24180, 24179, 24274, 24277, + 24180, 24277, 24278, 24183, + 24276, 24279, 24278, 24277, + 24280, 24281, 24278, 24279, + 24184, 24183, 24278, 24281, + 24184, 24281, 24282, 24187, + 24280, 24283, 24282, 24281, + 24284, 24285, 24282, 24283, + 24188, 24187, 24282, 24285, + 24188, 24285, 24286, 24191, + 24284, 24287, 24286, 24285, + 24288, 24289, 24286, 24287, + 24192, 24191, 24286, 24289, + 24192, 24289, 24290, 24195, + 24288, 24291, 24290, 24289, + 24292, 24293, 24290, 24291, + 24196, 24195, 24290, 24293, + 24196, 24293, 24294, 24199, + 24292, 24295, 24294, 24293, + 24296, 24297, 24294, 24295, + 24200, 24199, 24294, 24297, + 24200, 24297, 24298, 24203, + 24296, 24299, 24298, 24297, + 24300, 24301, 24298, 24299, + 24204, 24203, 24298, 24301, + 24204, 24301, 24302, 24207, + 24300, 24303, 24302, 24301, + 24304, 24305, 24302, 24303, + 24208, 24207, 24302, 24305, + 24208, 24305, 24306, 24211, + 24304, 24307, 24306, 24305, + 24308, 24309, 24306, 24307, + 24212, 24211, 24306, 24309, + 16926, 16931, 24310, 24215, + 16930, 24311, 24310, 16931, + 24312, 24313, 24310, 24311, + 24216, 24215, 24310, 24313, + 24216, 24313, 24314, 24219, + 24312, 24315, 24314, 24313, + 24316, 24317, 24314, 24315, + 24220, 24219, 24314, 24317, + 24220, 24317, 24318, 24223, + 24316, 24319, 24318, 24317, + 24320, 24321, 24318, 24319, + 24224, 24223, 24318, 24321, + 24224, 24321, 24322, 24227, + 24320, 24323, 24322, 24321, + 24324, 24325, 24322, 24323, + 24228, 24227, 24322, 24325, + 24228, 24325, 24326, 24231, + 24324, 24327, 24326, 24325, + 24328, 24329, 24326, 24327, + 24232, 24231, 24326, 24329, + 24232, 24329, 24330, 24235, + 24328, 24331, 24330, 24329, + 24332, 24333, 24330, 24331, + 24236, 24235, 24330, 24333, + 24236, 24333, 24334, 24239, + 24332, 24335, 24334, 24333, + 24336, 24337, 24334, 24335, + 24240, 24239, 24334, 24337, + 24240, 24337, 24338, 24243, + 24336, 24339, 24338, 24337, + 24340, 24341, 24338, 24339, + 24244, 24243, 24338, 24341, + 24244, 24341, 24342, 24247, + 24340, 24343, 24342, 24341, + 24344, 24345, 24342, 24343, + 24248, 24247, 24342, 24345, + 24248, 24345, 24346, 24251, + 24344, 24347, 24346, 24345, + 24348, 24349, 24346, 24347, + 24252, 24251, 24346, 24349, + 24252, 24349, 24350, 24255, + 24348, 24351, 24350, 24349, + 24352, 24353, 24350, 24351, + 24256, 24255, 24350, 24353, + 24256, 24353, 24354, 24259, + 24352, 24355, 24354, 24353, + 24356, 24357, 24354, 24355, + 24260, 24259, 24354, 24357, + 24260, 24357, 24358, 24263, + 24356, 24359, 24358, 24357, + 24360, 24361, 24358, 24359, + 24264, 24263, 24358, 24361, + 24264, 24361, 24362, 24267, + 24360, 24363, 24362, 24361, + 24364, 24365, 24362, 24363, + 24268, 24267, 24362, 24365, + 24268, 24365, 24366, 24271, + 24364, 24367, 24366, 24365, + 24368, 24369, 24366, 24367, + 24272, 24271, 24366, 24369, + 24272, 24369, 24370, 24275, + 24368, 24371, 24370, 24369, + 24372, 24373, 24370, 24371, + 24276, 24275, 24370, 24373, + 24276, 24373, 24374, 24279, + 24372, 24375, 24374, 24373, + 24376, 24377, 24374, 24375, + 24280, 24279, 24374, 24377, + 24280, 24377, 24378, 24283, + 24376, 24379, 24378, 24377, + 24380, 24381, 24378, 24379, + 24284, 24283, 24378, 24381, + 24284, 24381, 24382, 24287, + 24380, 24383, 24382, 24381, + 24384, 24385, 24382, 24383, + 24288, 24287, 24382, 24385, + 24288, 24385, 24386, 24291, + 24384, 24387, 24386, 24385, + 24388, 24389, 24386, 24387, + 24292, 24291, 24386, 24389, + 24292, 24389, 24390, 24295, + 24388, 24391, 24390, 24389, + 24392, 24393, 24390, 24391, + 24296, 24295, 24390, 24393, + 24296, 24393, 24394, 24299, + 24392, 24395, 24394, 24393, + 24396, 24397, 24394, 24395, + 24300, 24299, 24394, 24397, + 24300, 24397, 24398, 24303, + 24396, 24399, 24398, 24397, + 24400, 24401, 24398, 24399, + 24304, 24303, 24398, 24401, + 24304, 24401, 24402, 24307, + 24400, 24403, 24402, 24401, + 24404, 24405, 24402, 24403, + 24308, 24307, 24402, 24405, + 16930, 16935, 24406, 24311, + 16934, 24407, 24406, 16935, + 24408, 24409, 24406, 24407, + 24312, 24311, 24406, 24409, + 24312, 24409, 24410, 24315, + 24408, 24411, 24410, 24409, + 24412, 24413, 24410, 24411, + 24316, 24315, 24410, 24413, + 24316, 24413, 24414, 24319, + 24412, 24415, 24414, 24413, + 24416, 24417, 24414, 24415, + 24320, 24319, 24414, 24417, + 24320, 24417, 24418, 24323, + 24416, 24419, 24418, 24417, + 24420, 24421, 24418, 24419, + 24324, 24323, 24418, 24421, + 24324, 24421, 24422, 24327, + 24420, 24423, 24422, 24421, + 24424, 24425, 24422, 24423, + 24328, 24327, 24422, 24425, + 24328, 24425, 24426, 24331, + 24424, 24427, 24426, 24425, + 24428, 24429, 24426, 24427, + 24332, 24331, 24426, 24429, + 24332, 24429, 24430, 24335, + 24428, 24431, 24430, 24429, + 24432, 24433, 24430, 24431, + 24336, 24335, 24430, 24433, + 24336, 24433, 24434, 24339, + 24432, 24435, 24434, 24433, + 24436, 24437, 24434, 24435, + 24340, 24339, 24434, 24437, + 24340, 24437, 24438, 24343, + 24436, 24439, 24438, 24437, + 24440, 24441, 24438, 24439, + 24344, 24343, 24438, 24441, + 24344, 24441, 24442, 24347, + 24440, 24443, 24442, 24441, + 24444, 24445, 24442, 24443, + 24348, 24347, 24442, 24445, + 24348, 24445, 24446, 24351, + 24444, 24447, 24446, 24445, + 24448, 24449, 24446, 24447, + 24352, 24351, 24446, 24449, + 24352, 24449, 24450, 24355, + 24448, 24451, 24450, 24449, + 24452, 24453, 24450, 24451, + 24356, 24355, 24450, 24453, + 24356, 24453, 24454, 24359, + 24452, 24455, 24454, 24453, + 24456, 24457, 24454, 24455, + 24360, 24359, 24454, 24457, + 24360, 24457, 24458, 24363, + 24456, 24459, 24458, 24457, + 24460, 24461, 24458, 24459, + 24364, 24363, 24458, 24461, + 24364, 24461, 24462, 24367, + 24460, 24463, 24462, 24461, + 24464, 24465, 24462, 24463, + 24368, 24367, 24462, 24465, + 24368, 24465, 24466, 24371, + 24464, 24467, 24466, 24465, + 24468, 24469, 24466, 24467, + 24372, 24371, 24466, 24469, + 24372, 24469, 24470, 24375, + 24468, 24471, 24470, 24469, + 24472, 24473, 24470, 24471, + 24376, 24375, 24470, 24473, + 24376, 24473, 24474, 24379, + 24472, 24475, 24474, 24473, + 24476, 24477, 24474, 24475, + 24380, 24379, 24474, 24477, + 24380, 24477, 24478, 24383, + 24476, 24479, 24478, 24477, + 24480, 24481, 24478, 24479, + 24384, 24383, 24478, 24481, + 24384, 24481, 24482, 24387, + 24480, 24483, 24482, 24481, + 24484, 24485, 24482, 24483, + 24388, 24387, 24482, 24485, + 24388, 24485, 24486, 24391, + 24484, 24487, 24486, 24485, + 24488, 24489, 24486, 24487, + 24392, 24391, 24486, 24489, + 24392, 24489, 24490, 24395, + 24488, 24491, 24490, 24489, + 24492, 24493, 24490, 24491, + 24396, 24395, 24490, 24493, + 24396, 24493, 24494, 24399, + 24492, 24495, 24494, 24493, + 24496, 24497, 24494, 24495, + 24400, 24399, 24494, 24497, + 24400, 24497, 24498, 24403, + 24496, 24499, 24498, 24497, + 24500, 24501, 24498, 24499, + 24404, 24403, 24498, 24501, + 16934, 16939, 24502, 24407, + 16938, 24503, 24502, 16939, + 24504, 24505, 24502, 24503, + 24408, 24407, 24502, 24505, + 24408, 24505, 24506, 24411, + 24504, 24507, 24506, 24505, + 24508, 24509, 24506, 24507, + 24412, 24411, 24506, 24509, + 24412, 24509, 24510, 24415, + 24508, 24511, 24510, 24509, + 24512, 24513, 24510, 24511, + 24416, 24415, 24510, 24513, + 24416, 24513, 24514, 24419, + 24512, 24515, 24514, 24513, + 24516, 24517, 24514, 24515, + 24420, 24419, 24514, 24517, + 24420, 24517, 24518, 24423, + 24516, 24519, 24518, 24517, + 24520, 24521, 24518, 24519, + 24424, 24423, 24518, 24521, + 24424, 24521, 24522, 24427, + 24520, 24523, 24522, 24521, + 24524, 24525, 24522, 24523, + 24428, 24427, 24522, 24525, + 24428, 24525, 24526, 24431, + 24524, 24527, 24526, 24525, + 24528, 24529, 24526, 24527, + 24432, 24431, 24526, 24529, + 24432, 24529, 24530, 24435, + 24528, 24531, 24530, 24529, + 24532, 24533, 24530, 24531, + 24436, 24435, 24530, 24533, + 24436, 24533, 24534, 24439, + 24532, 24535, 24534, 24533, + 24536, 24537, 24534, 24535, + 24440, 24439, 24534, 24537, + 24440, 24537, 24538, 24443, + 24536, 24539, 24538, 24537, + 24540, 24541, 24538, 24539, + 24444, 24443, 24538, 24541, + 24444, 24541, 24542, 24447, + 24540, 24543, 24542, 24541, + 24544, 24545, 24542, 24543, + 24448, 24447, 24542, 24545, + 24448, 24545, 24546, 24451, + 24544, 24547, 24546, 24545, + 24548, 24549, 24546, 24547, + 24452, 24451, 24546, 24549, + 24452, 24549, 24550, 24455, + 24548, 24551, 24550, 24549, + 24552, 24553, 24550, 24551, + 24456, 24455, 24550, 24553, + 24456, 24553, 24554, 24459, + 24552, 24555, 24554, 24553, + 24556, 24557, 24554, 24555, + 24460, 24459, 24554, 24557, + 24460, 24557, 24558, 24463, + 24556, 24559, 24558, 24557, + 24560, 24561, 24558, 24559, + 24464, 24463, 24558, 24561, + 24464, 24561, 24562, 24467, + 24560, 24563, 24562, 24561, + 24564, 24565, 24562, 24563, + 24468, 24467, 24562, 24565, + 24468, 24565, 24566, 24471, + 24564, 24567, 24566, 24565, + 24568, 24569, 24566, 24567, + 24472, 24471, 24566, 24569, + 24472, 24569, 24570, 24475, + 24568, 24571, 24570, 24569, + 24572, 24573, 24570, 24571, + 24476, 24475, 24570, 24573, + 24476, 24573, 24574, 24479, + 24572, 24575, 24574, 24573, + 24576, 24577, 24574, 24575, + 24480, 24479, 24574, 24577, + 24480, 24577, 24578, 24483, + 24576, 24579, 24578, 24577, + 24580, 24581, 24578, 24579, + 24484, 24483, 24578, 24581, + 24484, 24581, 24582, 24487, + 24580, 24583, 24582, 24581, + 24584, 24585, 24582, 24583, + 24488, 24487, 24582, 24585, + 24488, 24585, 24586, 24491, + 24584, 24587, 24586, 24585, + 24588, 24589, 24586, 24587, + 24492, 24491, 24586, 24589, + 24492, 24589, 24590, 24495, + 24588, 24591, 24590, 24589, + 24592, 24593, 24590, 24591, + 24496, 24495, 24590, 24593, + 24496, 24593, 24594, 24499, + 24592, 24595, 24594, 24593, + 24596, 24597, 24594, 24595, + 24500, 24499, 24594, 24597, + 16938, 16943, 24598, 24503, + 16942, 24599, 24598, 16943, + 24600, 24601, 24598, 24599, + 24504, 24503, 24598, 24601, + 24504, 24601, 24602, 24507, + 24600, 24603, 24602, 24601, + 24604, 24605, 24602, 24603, + 24508, 24507, 24602, 24605, + 24508, 24605, 24606, 24511, + 24604, 24607, 24606, 24605, + 24608, 24609, 24606, 24607, + 24512, 24511, 24606, 24609, + 24512, 24609, 24610, 24515, + 24608, 24611, 24610, 24609, + 24612, 24613, 24610, 24611, + 24516, 24515, 24610, 24613, + 24516, 24613, 24614, 24519, + 24612, 24615, 24614, 24613, + 24616, 24617, 24614, 24615, + 24520, 24519, 24614, 24617, + 24520, 24617, 24618, 24523, + 24616, 24619, 24618, 24617, + 24620, 24621, 24618, 24619, + 24524, 24523, 24618, 24621, + 24524, 24621, 24622, 24527, + 24620, 24623, 24622, 24621, + 24624, 24625, 24622, 24623, + 24528, 24527, 24622, 24625, + 24528, 24625, 24626, 24531, + 24624, 24627, 24626, 24625, + 24628, 24629, 24626, 24627, + 24532, 24531, 24626, 24629, + 24532, 24629, 24630, 24535, + 24628, 24631, 24630, 24629, + 24632, 24633, 24630, 24631, + 24536, 24535, 24630, 24633, + 24536, 24633, 24634, 24539, + 24632, 24635, 24634, 24633, + 24636, 24637, 24634, 24635, + 24540, 24539, 24634, 24637, + 24540, 24637, 24638, 24543, + 24636, 24639, 24638, 24637, + 24640, 24641, 24638, 24639, + 24544, 24543, 24638, 24641, + 24544, 24641, 24642, 24547, + 24640, 24643, 24642, 24641, + 24644, 24645, 24642, 24643, + 24548, 24547, 24642, 24645, + 24548, 24645, 24646, 24551, + 24644, 24647, 24646, 24645, + 24648, 24649, 24646, 24647, + 24552, 24551, 24646, 24649, + 24552, 24649, 24650, 24555, + 24648, 24651, 24650, 24649, + 24652, 24653, 24650, 24651, + 24556, 24555, 24650, 24653, + 24556, 24653, 24654, 24559, + 24652, 24655, 24654, 24653, + 24656, 24657, 24654, 24655, + 24560, 24559, 24654, 24657, + 24560, 24657, 24658, 24563, + 24656, 24659, 24658, 24657, + 24660, 24661, 24658, 24659, + 24564, 24563, 24658, 24661, + 24564, 24661, 24662, 24567, + 24660, 24663, 24662, 24661, + 24664, 24665, 24662, 24663, + 24568, 24567, 24662, 24665, + 24568, 24665, 24666, 24571, + 24664, 24667, 24666, 24665, + 24668, 24669, 24666, 24667, + 24572, 24571, 24666, 24669, + 24572, 24669, 24670, 24575, + 24668, 24671, 24670, 24669, + 24672, 24673, 24670, 24671, + 24576, 24575, 24670, 24673, + 24576, 24673, 24674, 24579, + 24672, 24675, 24674, 24673, + 24676, 24677, 24674, 24675, + 24580, 24579, 24674, 24677, + 24580, 24677, 24678, 24583, + 24676, 24679, 24678, 24677, + 24680, 24681, 24678, 24679, + 24584, 24583, 24678, 24681, + 24584, 24681, 24682, 24587, + 24680, 24683, 24682, 24681, + 24684, 24685, 24682, 24683, + 24588, 24587, 24682, 24685, + 24588, 24685, 24686, 24591, + 24684, 24687, 24686, 24685, + 24688, 24689, 24686, 24687, + 24592, 24591, 24686, 24689, + 24592, 24689, 24690, 24595, + 24688, 24691, 24690, 24689, + 24692, 24693, 24690, 24691, + 24596, 24595, 24690, 24693, + 16942, 16947, 24694, 24599, + 16946, 24695, 24694, 16947, + 24696, 24697, 24694, 24695, + 24600, 24599, 24694, 24697, + 24600, 24697, 24698, 24603, + 24696, 24699, 24698, 24697, + 24700, 24701, 24698, 24699, + 24604, 24603, 24698, 24701, + 24604, 24701, 24702, 24607, + 24700, 24703, 24702, 24701, + 24704, 24705, 24702, 24703, + 24608, 24607, 24702, 24705, + 24608, 24705, 24706, 24611, + 24704, 24707, 24706, 24705, + 24708, 24709, 24706, 24707, + 24612, 24611, 24706, 24709, + 24612, 24709, 24710, 24615, + 24708, 24711, 24710, 24709, + 24712, 24713, 24710, 24711, + 24616, 24615, 24710, 24713, + 24616, 24713, 24714, 24619, + 24712, 24715, 24714, 24713, + 24716, 24717, 24714, 24715, + 24620, 24619, 24714, 24717, + 24620, 24717, 24718, 24623, + 24716, 24719, 24718, 24717, + 24720, 24721, 24718, 24719, + 24624, 24623, 24718, 24721, + 24624, 24721, 24722, 24627, + 24720, 24723, 24722, 24721, + 24724, 24725, 24722, 24723, + 24628, 24627, 24722, 24725, + 24628, 24725, 24726, 24631, + 24724, 24727, 24726, 24725, + 24728, 24729, 24726, 24727, + 24632, 24631, 24726, 24729, + 24632, 24729, 24730, 24635, + 24728, 24731, 24730, 24729, + 24732, 24733, 24730, 24731, + 24636, 24635, 24730, 24733, + 24636, 24733, 24734, 24639, + 24732, 24735, 24734, 24733, + 24736, 24737, 24734, 24735, + 24640, 24639, 24734, 24737, + 24640, 24737, 24738, 24643, + 24736, 24739, 24738, 24737, + 24740, 24741, 24738, 24739, + 24644, 24643, 24738, 24741, + 24644, 24741, 24742, 24647, + 24740, 24743, 24742, 24741, + 24744, 24745, 24742, 24743, + 24648, 24647, 24742, 24745, + 24648, 24745, 24746, 24651, + 24744, 24747, 24746, 24745, + 24748, 24749, 24746, 24747, + 24652, 24651, 24746, 24749, + 24652, 24749, 24750, 24655, + 24748, 24751, 24750, 24749, + 24752, 24753, 24750, 24751, + 24656, 24655, 24750, 24753, + 24656, 24753, 24754, 24659, + 24752, 24755, 24754, 24753, + 24756, 24757, 24754, 24755, + 24660, 24659, 24754, 24757, + 24660, 24757, 24758, 24663, + 24756, 24759, 24758, 24757, + 24760, 24761, 24758, 24759, + 24664, 24663, 24758, 24761, + 24664, 24761, 24762, 24667, + 24760, 24763, 24762, 24761, + 24764, 24765, 24762, 24763, + 24668, 24667, 24762, 24765, + 24668, 24765, 24766, 24671, + 24764, 24767, 24766, 24765, + 24768, 24769, 24766, 24767, + 24672, 24671, 24766, 24769, + 24672, 24769, 24770, 24675, + 24768, 24771, 24770, 24769, + 24772, 24773, 24770, 24771, + 24676, 24675, 24770, 24773, + 24676, 24773, 24774, 24679, + 24772, 24775, 24774, 24773, + 24776, 24777, 24774, 24775, + 24680, 24679, 24774, 24777, + 24680, 24777, 24778, 24683, + 24776, 24779, 24778, 24777, + 24780, 24781, 24778, 24779, + 24684, 24683, 24778, 24781, + 24684, 24781, 24782, 24687, + 24780, 24783, 24782, 24781, + 24784, 24785, 24782, 24783, + 24688, 24687, 24782, 24785, + 24688, 24785, 24786, 24691, + 24784, 24787, 24786, 24785, + 24788, 24789, 24786, 24787, + 24692, 24691, 24786, 24789, + 16946, 16951, 24790, 24695, + 16950, 24791, 24790, 16951, + 24792, 24793, 24790, 24791, + 24696, 24695, 24790, 24793, + 24696, 24793, 24794, 24699, + 24792, 24795, 24794, 24793, + 24796, 24797, 24794, 24795, + 24700, 24699, 24794, 24797, + 24700, 24797, 24798, 24703, + 24796, 24799, 24798, 24797, + 24800, 24801, 24798, 24799, + 24704, 24703, 24798, 24801, + 24704, 24801, 24802, 24707, + 24800, 24803, 24802, 24801, + 24804, 24805, 24802, 24803, + 24708, 24707, 24802, 24805, + 24708, 24805, 24806, 24711, + 24804, 24807, 24806, 24805, + 24808, 24809, 24806, 24807, + 24712, 24711, 24806, 24809, + 24712, 24809, 24810, 24715, + 24808, 24811, 24810, 24809, + 24812, 24813, 24810, 24811, + 24716, 24715, 24810, 24813, + 24716, 24813, 24814, 24719, + 24812, 24815, 24814, 24813, + 24816, 24817, 24814, 24815, + 24720, 24719, 24814, 24817, + 24720, 24817, 24818, 24723, + 24816, 24819, 24818, 24817, + 24820, 24821, 24818, 24819, + 24724, 24723, 24818, 24821, + 24724, 24821, 24822, 24727, + 24820, 24823, 24822, 24821, + 24824, 24825, 24822, 24823, + 24728, 24727, 24822, 24825, + 24728, 24825, 24826, 24731, + 24824, 24827, 24826, 24825, + 24828, 24829, 24826, 24827, + 24732, 24731, 24826, 24829, + 24732, 24829, 24830, 24735, + 24828, 24831, 24830, 24829, + 24832, 24833, 24830, 24831, + 24736, 24735, 24830, 24833, + 24736, 24833, 24834, 24739, + 24832, 24835, 24834, 24833, + 24836, 24837, 24834, 24835, + 24740, 24739, 24834, 24837, + 24740, 24837, 24838, 24743, + 24836, 24839, 24838, 24837, + 24840, 24841, 24838, 24839, + 24744, 24743, 24838, 24841, + 24744, 24841, 24842, 24747, + 24840, 24843, 24842, 24841, + 24844, 24845, 24842, 24843, + 24748, 24747, 24842, 24845, + 24748, 24845, 24846, 24751, + 24844, 24847, 24846, 24845, + 24848, 24849, 24846, 24847, + 24752, 24751, 24846, 24849, + 24752, 24849, 24850, 24755, + 24848, 24851, 24850, 24849, + 24852, 24853, 24850, 24851, + 24756, 24755, 24850, 24853, + 24756, 24853, 24854, 24759, + 24852, 24855, 24854, 24853, + 24856, 24857, 24854, 24855, + 24760, 24759, 24854, 24857, + 24760, 24857, 24858, 24763, + 24856, 24859, 24858, 24857, + 24860, 24861, 24858, 24859, + 24764, 24763, 24858, 24861, + 24764, 24861, 24862, 24767, + 24860, 24863, 24862, 24861, + 24864, 24865, 24862, 24863, + 24768, 24767, 24862, 24865, + 24768, 24865, 24866, 24771, + 24864, 24867, 24866, 24865, + 24868, 24869, 24866, 24867, + 24772, 24771, 24866, 24869, + 24772, 24869, 24870, 24775, + 24868, 24871, 24870, 24869, + 24872, 24873, 24870, 24871, + 24776, 24775, 24870, 24873, + 24776, 24873, 24874, 24779, + 24872, 24875, 24874, 24873, + 24876, 24877, 24874, 24875, + 24780, 24779, 24874, 24877, + 24780, 24877, 24878, 24783, + 24876, 24879, 24878, 24877, + 24880, 24881, 24878, 24879, + 24784, 24783, 24878, 24881, + 24784, 24881, 24882, 24787, + 24880, 24883, 24882, 24881, + 24884, 24885, 24882, 24883, + 24788, 24787, 24882, 24885, + 16950, 16955, 24886, 24791, + 16954, 24887, 24886, 16955, + 24888, 24889, 24886, 24887, + 24792, 24791, 24886, 24889, + 24792, 24889, 24890, 24795, + 24888, 24891, 24890, 24889, + 24892, 24893, 24890, 24891, + 24796, 24795, 24890, 24893, + 24796, 24893, 24894, 24799, + 24892, 24895, 24894, 24893, + 24896, 24897, 24894, 24895, + 24800, 24799, 24894, 24897, + 24800, 24897, 24898, 24803, + 24896, 24899, 24898, 24897, + 24900, 24901, 24898, 24899, + 24804, 24803, 24898, 24901, + 24804, 24901, 24902, 24807, + 24900, 24903, 24902, 24901, + 24904, 24905, 24902, 24903, + 24808, 24807, 24902, 24905, + 24808, 24905, 24906, 24811, + 24904, 24907, 24906, 24905, + 24908, 24909, 24906, 24907, + 24812, 24811, 24906, 24909, + 24812, 24909, 24910, 24815, + 24908, 24911, 24910, 24909, + 24912, 24913, 24910, 24911, + 24816, 24815, 24910, 24913, + 24816, 24913, 24914, 24819, + 24912, 24915, 24914, 24913, + 24916, 24917, 24914, 24915, + 24820, 24819, 24914, 24917, + 24820, 24917, 24918, 24823, + 24916, 24919, 24918, 24917, + 24920, 24921, 24918, 24919, + 24824, 24823, 24918, 24921, + 24824, 24921, 24922, 24827, + 24920, 24923, 24922, 24921, + 24924, 24925, 24922, 24923, + 24828, 24827, 24922, 24925, + 24828, 24925, 24926, 24831, + 24924, 24927, 24926, 24925, + 24928, 24929, 24926, 24927, + 24832, 24831, 24926, 24929, + 24832, 24929, 24930, 24835, + 24928, 24931, 24930, 24929, + 24932, 24933, 24930, 24931, + 24836, 24835, 24930, 24933, + 24836, 24933, 24934, 24839, + 24932, 24935, 24934, 24933, + 24936, 24937, 24934, 24935, + 24840, 24839, 24934, 24937, + 24840, 24937, 24938, 24843, + 24936, 24939, 24938, 24937, + 24940, 24941, 24938, 24939, + 24844, 24843, 24938, 24941, + 24844, 24941, 24942, 24847, + 24940, 24943, 24942, 24941, + 24944, 24945, 24942, 24943, + 24848, 24847, 24942, 24945, + 24848, 24945, 24946, 24851, + 24944, 24947, 24946, 24945, + 24948, 24949, 24946, 24947, + 24852, 24851, 24946, 24949, + 24852, 24949, 24950, 24855, + 24948, 24951, 24950, 24949, + 24952, 24953, 24950, 24951, + 24856, 24855, 24950, 24953, + 24856, 24953, 24954, 24859, + 24952, 24955, 24954, 24953, + 24956, 24957, 24954, 24955, + 24860, 24859, 24954, 24957, + 24860, 24957, 24958, 24863, + 24956, 24959, 24958, 24957, + 24960, 24961, 24958, 24959, + 24864, 24863, 24958, 24961, + 24864, 24961, 24962, 24867, + 24960, 24963, 24962, 24961, + 24964, 24965, 24962, 24963, + 24868, 24867, 24962, 24965, + 24868, 24965, 24966, 24871, + 24964, 24967, 24966, 24965, + 24968, 24969, 24966, 24967, + 24872, 24871, 24966, 24969, + 24872, 24969, 24970, 24875, + 24968, 24971, 24970, 24969, + 24972, 24973, 24970, 24971, + 24876, 24875, 24970, 24973, + 24876, 24973, 24974, 24879, + 24972, 24975, 24974, 24973, + 24976, 24977, 24974, 24975, + 24880, 24879, 24974, 24977, + 24880, 24977, 24978, 24883, + 24976, 24979, 24978, 24977, + 24980, 24981, 24978, 24979, + 24884, 24883, 24978, 24981, + 16954, 16959, 24982, 24887, + 16958, 24983, 24982, 16959, + 24984, 24985, 24982, 24983, + 24888, 24887, 24982, 24985, + 24888, 24985, 24986, 24891, + 24984, 24987, 24986, 24985, + 24988, 24989, 24986, 24987, + 24892, 24891, 24986, 24989, + 24892, 24989, 24990, 24895, + 24988, 24991, 24990, 24989, + 24992, 24993, 24990, 24991, + 24896, 24895, 24990, 24993, + 24896, 24993, 24994, 24899, + 24992, 24995, 24994, 24993, + 24996, 24997, 24994, 24995, + 24900, 24899, 24994, 24997, + 24900, 24997, 24998, 24903, + 24996, 24999, 24998, 24997, + 25000, 25001, 24998, 24999, + 24904, 24903, 24998, 25001, + 24904, 25001, 25002, 24907, + 25000, 25003, 25002, 25001, + 25004, 25005, 25002, 25003, + 24908, 24907, 25002, 25005, + 24908, 25005, 25006, 24911, + 25004, 25007, 25006, 25005, + 25008, 25009, 25006, 25007, + 24912, 24911, 25006, 25009, + 24912, 25009, 25010, 24915, + 25008, 25011, 25010, 25009, + 25012, 25013, 25010, 25011, + 24916, 24915, 25010, 25013, + 24916, 25013, 25014, 24919, + 25012, 25015, 25014, 25013, + 25016, 25017, 25014, 25015, + 24920, 24919, 25014, 25017, + 24920, 25017, 25018, 24923, + 25016, 25019, 25018, 25017, + 25020, 25021, 25018, 25019, + 24924, 24923, 25018, 25021, + 24924, 25021, 25022, 24927, + 25020, 25023, 25022, 25021, + 25024, 25025, 25022, 25023, + 24928, 24927, 25022, 25025, + 24928, 25025, 25026, 24931, + 25024, 25027, 25026, 25025, + 25028, 25029, 25026, 25027, + 24932, 24931, 25026, 25029, + 24932, 25029, 25030, 24935, + 25028, 25031, 25030, 25029, + 25032, 25033, 25030, 25031, + 24936, 24935, 25030, 25033, + 24936, 25033, 25034, 24939, + 25032, 25035, 25034, 25033, + 25036, 25037, 25034, 25035, + 24940, 24939, 25034, 25037, + 24940, 25037, 25038, 24943, + 25036, 25039, 25038, 25037, + 25040, 25041, 25038, 25039, + 24944, 24943, 25038, 25041, + 24944, 25041, 25042, 24947, + 25040, 25043, 25042, 25041, + 25044, 25045, 25042, 25043, + 24948, 24947, 25042, 25045, + 24948, 25045, 25046, 24951, + 25044, 25047, 25046, 25045, + 25048, 25049, 25046, 25047, + 24952, 24951, 25046, 25049, + 24952, 25049, 25050, 24955, + 25048, 25051, 25050, 25049, + 25052, 25053, 25050, 25051, + 24956, 24955, 25050, 25053, + 24956, 25053, 25054, 24959, + 25052, 25055, 25054, 25053, + 25056, 25057, 25054, 25055, + 24960, 24959, 25054, 25057, + 24960, 25057, 25058, 24963, + 25056, 25059, 25058, 25057, + 25060, 25061, 25058, 25059, + 24964, 24963, 25058, 25061, + 24964, 25061, 25062, 24967, + 25060, 25063, 25062, 25061, + 25064, 25065, 25062, 25063, + 24968, 24967, 25062, 25065, + 24968, 25065, 25066, 24971, + 25064, 25067, 25066, 25065, + 25068, 25069, 25066, 25067, + 24972, 24971, 25066, 25069, + 24972, 25069, 25070, 24975, + 25068, 25071, 25070, 25069, + 25072, 25073, 25070, 25071, + 24976, 24975, 25070, 25073, + 24976, 25073, 25074, 24979, + 25072, 25075, 25074, 25073, + 25076, 25077, 25074, 25075, + 24980, 24979, 25074, 25077, + 16958, 16963, 25078, 24983, + 16962, 25079, 25078, 16963, + 25080, 25081, 25078, 25079, + 24984, 24983, 25078, 25081, + 24984, 25081, 25082, 24987, + 25080, 25083, 25082, 25081, + 25084, 25085, 25082, 25083, + 24988, 24987, 25082, 25085, + 24988, 25085, 25086, 24991, + 25084, 25087, 25086, 25085, + 25088, 25089, 25086, 25087, + 24992, 24991, 25086, 25089, + 24992, 25089, 25090, 24995, + 25088, 25091, 25090, 25089, + 25092, 25093, 25090, 25091, + 24996, 24995, 25090, 25093, + 24996, 25093, 25094, 24999, + 25092, 25095, 25094, 25093, + 25096, 25097, 25094, 25095, + 25000, 24999, 25094, 25097, + 25000, 25097, 25098, 25003, + 25096, 25099, 25098, 25097, + 25100, 25101, 25098, 25099, + 25004, 25003, 25098, 25101, + 25004, 25101, 25102, 25007, + 25100, 25103, 25102, 25101, + 25104, 25105, 25102, 25103, + 25008, 25007, 25102, 25105, + 25008, 25105, 25106, 25011, + 25104, 25107, 25106, 25105, + 25108, 25109, 25106, 25107, + 25012, 25011, 25106, 25109, + 25012, 25109, 25110, 25015, + 25108, 25111, 25110, 25109, + 25112, 25113, 25110, 25111, + 25016, 25015, 25110, 25113, + 25016, 25113, 25114, 25019, + 25112, 25115, 25114, 25113, + 25116, 25117, 25114, 25115, + 25020, 25019, 25114, 25117, + 25020, 25117, 25118, 25023, + 25116, 25119, 25118, 25117, + 25120, 25121, 25118, 25119, + 25024, 25023, 25118, 25121, + 25024, 25121, 25122, 25027, + 25120, 25123, 25122, 25121, + 25124, 25125, 25122, 25123, + 25028, 25027, 25122, 25125, + 25028, 25125, 25126, 25031, + 25124, 25127, 25126, 25125, + 25128, 25129, 25126, 25127, + 25032, 25031, 25126, 25129, + 25032, 25129, 25130, 25035, + 25128, 25131, 25130, 25129, + 25132, 25133, 25130, 25131, + 25036, 25035, 25130, 25133, + 25036, 25133, 25134, 25039, + 25132, 25135, 25134, 25133, + 25136, 25137, 25134, 25135, + 25040, 25039, 25134, 25137, + 25040, 25137, 25138, 25043, + 25136, 25139, 25138, 25137, + 25140, 25141, 25138, 25139, + 25044, 25043, 25138, 25141, + 25044, 25141, 25142, 25047, + 25140, 25143, 25142, 25141, + 25144, 25145, 25142, 25143, + 25048, 25047, 25142, 25145, + 25048, 25145, 25146, 25051, + 25144, 25147, 25146, 25145, + 25148, 25149, 25146, 25147, + 25052, 25051, 25146, 25149, + 25052, 25149, 25150, 25055, + 25148, 25151, 25150, 25149, + 25152, 25153, 25150, 25151, + 25056, 25055, 25150, 25153, + 25056, 25153, 25154, 25059, + 25152, 25155, 25154, 25153, + 25156, 25157, 25154, 25155, + 25060, 25059, 25154, 25157, + 25060, 25157, 25158, 25063, + 25156, 25159, 25158, 25157, + 25160, 25161, 25158, 25159, + 25064, 25063, 25158, 25161, + 25064, 25161, 25162, 25067, + 25160, 25163, 25162, 25161, + 25164, 25165, 25162, 25163, + 25068, 25067, 25162, 25165, + 25068, 25165, 25166, 25071, + 25164, 25167, 25166, 25165, + 25168, 25169, 25166, 25167, + 25072, 25071, 25166, 25169, + 25072, 25169, 25170, 25075, + 25168, 25171, 25170, 25169, + 25172, 25173, 25170, 25171, + 25076, 25075, 25170, 25173, + 16962, 16967, 25174, 25079, + 16966, 25175, 25174, 16967, + 25176, 25177, 25174, 25175, + 25080, 25079, 25174, 25177, + 25080, 25177, 25178, 25083, + 25176, 25179, 25178, 25177, + 25180, 25181, 25178, 25179, + 25084, 25083, 25178, 25181, + 25084, 25181, 25182, 25087, + 25180, 25183, 25182, 25181, + 25184, 25185, 25182, 25183, + 25088, 25087, 25182, 25185, + 25088, 25185, 25186, 25091, + 25184, 25187, 25186, 25185, + 25188, 25189, 25186, 25187, + 25092, 25091, 25186, 25189, + 25092, 25189, 25190, 25095, + 25188, 25191, 25190, 25189, + 25192, 25193, 25190, 25191, + 25096, 25095, 25190, 25193, + 25096, 25193, 25194, 25099, + 25192, 25195, 25194, 25193, + 25196, 25197, 25194, 25195, + 25100, 25099, 25194, 25197, + 25100, 25197, 25198, 25103, + 25196, 25199, 25198, 25197, + 25200, 25201, 25198, 25199, + 25104, 25103, 25198, 25201, + 25104, 25201, 25202, 25107, + 25200, 25203, 25202, 25201, + 25204, 25205, 25202, 25203, + 25108, 25107, 25202, 25205, + 25108, 25205, 25206, 25111, + 25204, 25207, 25206, 25205, + 25208, 25209, 25206, 25207, + 25112, 25111, 25206, 25209, + 25112, 25209, 25210, 25115, + 25208, 25211, 25210, 25209, + 25212, 25213, 25210, 25211, + 25116, 25115, 25210, 25213, + 25116, 25213, 25214, 25119, + 25212, 25215, 25214, 25213, + 25216, 25217, 25214, 25215, + 25120, 25119, 25214, 25217, + 25120, 25217, 25218, 25123, + 25216, 25219, 25218, 25217, + 25220, 25221, 25218, 25219, + 25124, 25123, 25218, 25221, + 25124, 25221, 25222, 25127, + 25220, 25223, 25222, 25221, + 25224, 25225, 25222, 25223, + 25128, 25127, 25222, 25225, + 25128, 25225, 25226, 25131, + 25224, 25227, 25226, 25225, + 25228, 25229, 25226, 25227, + 25132, 25131, 25226, 25229, + 25132, 25229, 25230, 25135, + 25228, 25231, 25230, 25229, + 25232, 25233, 25230, 25231, + 25136, 25135, 25230, 25233, + 25136, 25233, 25234, 25139, + 25232, 25235, 25234, 25233, + 25236, 25237, 25234, 25235, + 25140, 25139, 25234, 25237, + 25140, 25237, 25238, 25143, + 25236, 25239, 25238, 25237, + 25240, 25241, 25238, 25239, + 25144, 25143, 25238, 25241, + 25144, 25241, 25242, 25147, + 25240, 25243, 25242, 25241, + 25244, 25245, 25242, 25243, + 25148, 25147, 25242, 25245, + 25148, 25245, 25246, 25151, + 25244, 25247, 25246, 25245, + 25248, 25249, 25246, 25247, + 25152, 25151, 25246, 25249, + 25152, 25249, 25250, 25155, + 25248, 25251, 25250, 25249, + 25252, 25253, 25250, 25251, + 25156, 25155, 25250, 25253, + 25156, 25253, 25254, 25159, + 25252, 25255, 25254, 25253, + 25256, 25257, 25254, 25255, + 25160, 25159, 25254, 25257, + 25160, 25257, 25258, 25163, + 25256, 25259, 25258, 25257, + 25260, 25261, 25258, 25259, + 25164, 25163, 25258, 25261, + 25164, 25261, 25262, 25167, + 25260, 25263, 25262, 25261, + 25264, 25265, 25262, 25263, + 25168, 25167, 25262, 25265, + 25168, 25265, 25266, 25171, + 25264, 25267, 25266, 25265, + 25268, 25269, 25266, 25267, + 25172, 25171, 25266, 25269, + 16966, 16971, 25270, 25175, + 16970, 25271, 25270, 16971, + 25272, 25273, 25270, 25271, + 25176, 25175, 25270, 25273, + 25176, 25273, 25274, 25179, + 25272, 25275, 25274, 25273, + 25276, 25277, 25274, 25275, + 25180, 25179, 25274, 25277, + 25180, 25277, 25278, 25183, + 25276, 25279, 25278, 25277, + 25280, 25281, 25278, 25279, + 25184, 25183, 25278, 25281, + 25184, 25281, 25282, 25187, + 25280, 25283, 25282, 25281, + 25284, 25285, 25282, 25283, + 25188, 25187, 25282, 25285, + 25188, 25285, 25286, 25191, + 25284, 25287, 25286, 25285, + 25288, 25289, 25286, 25287, + 25192, 25191, 25286, 25289, + 25192, 25289, 25290, 25195, + 25288, 25291, 25290, 25289, + 25292, 25293, 25290, 25291, + 25196, 25195, 25290, 25293, + 25196, 25293, 25294, 25199, + 25292, 25295, 25294, 25293, + 25296, 25297, 25294, 25295, + 25200, 25199, 25294, 25297, + 25200, 25297, 25298, 25203, + 25296, 25299, 25298, 25297, + 25300, 25301, 25298, 25299, + 25204, 25203, 25298, 25301, + 25204, 25301, 25302, 25207, + 25300, 25303, 25302, 25301, + 25304, 25305, 25302, 25303, + 25208, 25207, 25302, 25305, + 25208, 25305, 25306, 25211, + 25304, 25307, 25306, 25305, + 25308, 25309, 25306, 25307, + 25212, 25211, 25306, 25309, + 25212, 25309, 25310, 25215, + 25308, 25311, 25310, 25309, + 25312, 25313, 25310, 25311, + 25216, 25215, 25310, 25313, + 25216, 25313, 25314, 25219, + 25312, 25315, 25314, 25313, + 25316, 25317, 25314, 25315, + 25220, 25219, 25314, 25317, + 25220, 25317, 25318, 25223, + 25316, 25319, 25318, 25317, + 25320, 25321, 25318, 25319, + 25224, 25223, 25318, 25321, + 25224, 25321, 25322, 25227, + 25320, 25323, 25322, 25321, + 25324, 25325, 25322, 25323, + 25228, 25227, 25322, 25325, + 25228, 25325, 25326, 25231, + 25324, 25327, 25326, 25325, + 25328, 25329, 25326, 25327, + 25232, 25231, 25326, 25329, + 25232, 25329, 25330, 25235, + 25328, 25331, 25330, 25329, + 25332, 25333, 25330, 25331, + 25236, 25235, 25330, 25333, + 25236, 25333, 25334, 25239, + 25332, 25335, 25334, 25333, + 25336, 25337, 25334, 25335, + 25240, 25239, 25334, 25337, + 25240, 25337, 25338, 25243, + 25336, 25339, 25338, 25337, + 25340, 25341, 25338, 25339, + 25244, 25243, 25338, 25341, + 25244, 25341, 25342, 25247, + 25340, 25343, 25342, 25341, + 25344, 25345, 25342, 25343, + 25248, 25247, 25342, 25345, + 25248, 25345, 25346, 25251, + 25344, 25347, 25346, 25345, + 25348, 25349, 25346, 25347, + 25252, 25251, 25346, 25349, + 25252, 25349, 25350, 25255, + 25348, 25351, 25350, 25349, + 25352, 25353, 25350, 25351, + 25256, 25255, 25350, 25353, + 25256, 25353, 25354, 25259, + 25352, 25355, 25354, 25353, + 25356, 25357, 25354, 25355, + 25260, 25259, 25354, 25357, + 25260, 25357, 25358, 25263, + 25356, 25359, 25358, 25357, + 25360, 25361, 25358, 25359, + 25264, 25263, 25358, 25361, + 25264, 25361, 25362, 25267, + 25360, 25363, 25362, 25361, + 25364, 25365, 25362, 25363, + 25268, 25267, 25362, 25365, + 16970, 16975, 25366, 25271, + 16974, 25367, 25366, 16975, + 25368, 25369, 25366, 25367, + 25272, 25271, 25366, 25369, + 25272, 25369, 25370, 25275, + 25368, 25371, 25370, 25369, + 25372, 25373, 25370, 25371, + 25276, 25275, 25370, 25373, + 25276, 25373, 25374, 25279, + 25372, 25375, 25374, 25373, + 25376, 25377, 25374, 25375, + 25280, 25279, 25374, 25377, + 25280, 25377, 25378, 25283, + 25376, 25379, 25378, 25377, + 25380, 25381, 25378, 25379, + 25284, 25283, 25378, 25381, + 25284, 25381, 25382, 25287, + 25380, 25383, 25382, 25381, + 25384, 25385, 25382, 25383, + 25288, 25287, 25382, 25385, + 25288, 25385, 25386, 25291, + 25384, 25387, 25386, 25385, + 25388, 25389, 25386, 25387, + 25292, 25291, 25386, 25389, + 25292, 25389, 25390, 25295, + 25388, 25391, 25390, 25389, + 25392, 25393, 25390, 25391, + 25296, 25295, 25390, 25393, + 25296, 25393, 25394, 25299, + 25392, 25395, 25394, 25393, + 25396, 25397, 25394, 25395, + 25300, 25299, 25394, 25397, + 25300, 25397, 25398, 25303, + 25396, 25399, 25398, 25397, + 25400, 25401, 25398, 25399, + 25304, 25303, 25398, 25401, + 25304, 25401, 25402, 25307, + 25400, 25403, 25402, 25401, + 25404, 25405, 25402, 25403, + 25308, 25307, 25402, 25405, + 25308, 25405, 25406, 25311, + 25404, 25407, 25406, 25405, + 25408, 25409, 25406, 25407, + 25312, 25311, 25406, 25409, + 25312, 25409, 25410, 25315, + 25408, 25411, 25410, 25409, + 25412, 25413, 25410, 25411, + 25316, 25315, 25410, 25413, + 25316, 25413, 25414, 25319, + 25412, 25415, 25414, 25413, + 25416, 25417, 25414, 25415, + 25320, 25319, 25414, 25417, + 25320, 25417, 25418, 25323, + 25416, 25419, 25418, 25417, + 25420, 25421, 25418, 25419, + 25324, 25323, 25418, 25421, + 25324, 25421, 25422, 25327, + 25420, 25423, 25422, 25421, + 25424, 25425, 25422, 25423, + 25328, 25327, 25422, 25425, + 25328, 25425, 25426, 25331, + 25424, 25427, 25426, 25425, + 25428, 25429, 25426, 25427, + 25332, 25331, 25426, 25429, + 25332, 25429, 25430, 25335, + 25428, 25431, 25430, 25429, + 25432, 25433, 25430, 25431, + 25336, 25335, 25430, 25433, + 25336, 25433, 25434, 25339, + 25432, 25435, 25434, 25433, + 25436, 25437, 25434, 25435, + 25340, 25339, 25434, 25437, + 25340, 25437, 25438, 25343, + 25436, 25439, 25438, 25437, + 25440, 25441, 25438, 25439, + 25344, 25343, 25438, 25441, + 25344, 25441, 25442, 25347, + 25440, 25443, 25442, 25441, + 25444, 25445, 25442, 25443, + 25348, 25347, 25442, 25445, + 25348, 25445, 25446, 25351, + 25444, 25447, 25446, 25445, + 25448, 25449, 25446, 25447, + 25352, 25351, 25446, 25449, + 25352, 25449, 25450, 25355, + 25448, 25451, 25450, 25449, + 25452, 25453, 25450, 25451, + 25356, 25355, 25450, 25453, + 25356, 25453, 25454, 25359, + 25452, 25455, 25454, 25453, + 25456, 25457, 25454, 25455, + 25360, 25359, 25454, 25457, + 25360, 25457, 25458, 25363, + 25456, 25459, 25458, 25457, + 25460, 25461, 25458, 25459, + 25364, 25363, 25458, 25461, + 16974, 16979, 25462, 25367, + 16978, 25463, 25462, 16979, + 25464, 25465, 25462, 25463, + 25368, 25367, 25462, 25465, + 25368, 25465, 25466, 25371, + 25464, 25467, 25466, 25465, + 25468, 25469, 25466, 25467, + 25372, 25371, 25466, 25469, + 25372, 25469, 25470, 25375, + 25468, 25471, 25470, 25469, + 25472, 25473, 25470, 25471, + 25376, 25375, 25470, 25473, + 25376, 25473, 25474, 25379, + 25472, 25475, 25474, 25473, + 25476, 25477, 25474, 25475, + 25380, 25379, 25474, 25477, + 25380, 25477, 25478, 25383, + 25476, 25479, 25478, 25477, + 25480, 25481, 25478, 25479, + 25384, 25383, 25478, 25481, + 25384, 25481, 25482, 25387, + 25480, 25483, 25482, 25481, + 25484, 25485, 25482, 25483, + 25388, 25387, 25482, 25485, + 25388, 25485, 25486, 25391, + 25484, 25487, 25486, 25485, + 25488, 25489, 25486, 25487, + 25392, 25391, 25486, 25489, + 25392, 25489, 25490, 25395, + 25488, 25491, 25490, 25489, + 25492, 25493, 25490, 25491, + 25396, 25395, 25490, 25493, + 25396, 25493, 25494, 25399, + 25492, 25495, 25494, 25493, + 25496, 25497, 25494, 25495, + 25400, 25399, 25494, 25497, + 25400, 25497, 25498, 25403, + 25496, 25499, 25498, 25497, + 25500, 25501, 25498, 25499, + 25404, 25403, 25498, 25501, + 25404, 25501, 25502, 25407, + 25500, 25503, 25502, 25501, + 25504, 25505, 25502, 25503, + 25408, 25407, 25502, 25505, + 25408, 25505, 25506, 25411, + 25504, 25507, 25506, 25505, + 25508, 25509, 25506, 25507, + 25412, 25411, 25506, 25509, + 25412, 25509, 25510, 25415, + 25508, 25511, 25510, 25509, + 25512, 25513, 25510, 25511, + 25416, 25415, 25510, 25513, + 25416, 25513, 25514, 25419, + 25512, 25515, 25514, 25513, + 25516, 25517, 25514, 25515, + 25420, 25419, 25514, 25517, + 25420, 25517, 25518, 25423, + 25516, 25519, 25518, 25517, + 25520, 25521, 25518, 25519, + 25424, 25423, 25518, 25521, + 25424, 25521, 25522, 25427, + 25520, 25523, 25522, 25521, + 25524, 25525, 25522, 25523, + 25428, 25427, 25522, 25525, + 25428, 25525, 25526, 25431, + 25524, 25527, 25526, 25525, + 25528, 25529, 25526, 25527, + 25432, 25431, 25526, 25529, + 25432, 25529, 25530, 25435, + 25528, 25531, 25530, 25529, + 25532, 25533, 25530, 25531, + 25436, 25435, 25530, 25533, + 25436, 25533, 25534, 25439, + 25532, 25535, 25534, 25533, + 25536, 25537, 25534, 25535, + 25440, 25439, 25534, 25537, + 25440, 25537, 25538, 25443, + 25536, 25539, 25538, 25537, + 25540, 25541, 25538, 25539, + 25444, 25443, 25538, 25541, + 25444, 25541, 25542, 25447, + 25540, 25543, 25542, 25541, + 25544, 25545, 25542, 25543, + 25448, 25447, 25542, 25545, + 25448, 25545, 25546, 25451, + 25544, 25547, 25546, 25545, + 25548, 25549, 25546, 25547, + 25452, 25451, 25546, 25549, + 25452, 25549, 25550, 25455, + 25548, 25551, 25550, 25549, + 25552, 25553, 25550, 25551, + 25456, 25455, 25550, 25553, + 25456, 25553, 25554, 25459, + 25552, 25555, 25554, 25553, + 25556, 25557, 25554, 25555, + 25460, 25459, 25554, 25557, + 16978, 16983, 25558, 25463, + 16982, 25559, 25558, 16983, + 25560, 25561, 25558, 25559, + 25464, 25463, 25558, 25561, + 25464, 25561, 25562, 25467, + 25560, 25563, 25562, 25561, + 25564, 25565, 25562, 25563, + 25468, 25467, 25562, 25565, + 25468, 25565, 25566, 25471, + 25564, 25567, 25566, 25565, + 25568, 25569, 25566, 25567, + 25472, 25471, 25566, 25569, + 25472, 25569, 25570, 25475, + 25568, 25571, 25570, 25569, + 25572, 25573, 25570, 25571, + 25476, 25475, 25570, 25573, + 25476, 25573, 25574, 25479, + 25572, 25575, 25574, 25573, + 25576, 25577, 25574, 25575, + 25480, 25479, 25574, 25577, + 25480, 25577, 25578, 25483, + 25576, 25579, 25578, 25577, + 25580, 25581, 25578, 25579, + 25484, 25483, 25578, 25581, + 25484, 25581, 25582, 25487, + 25580, 25583, 25582, 25581, + 25584, 25585, 25582, 25583, + 25488, 25487, 25582, 25585, + 25488, 25585, 25586, 25491, + 25584, 25587, 25586, 25585, + 25588, 25589, 25586, 25587, + 25492, 25491, 25586, 25589, + 25492, 25589, 25590, 25495, + 25588, 25591, 25590, 25589, + 25592, 25593, 25590, 25591, + 25496, 25495, 25590, 25593, + 25496, 25593, 25594, 25499, + 25592, 25595, 25594, 25593, + 25596, 25597, 25594, 25595, + 25500, 25499, 25594, 25597, + 25500, 25597, 25598, 25503, + 25596, 25599, 25598, 25597, + 25600, 25601, 25598, 25599, + 25504, 25503, 25598, 25601, + 25504, 25601, 25602, 25507, + 25600, 25603, 25602, 25601, + 25604, 25605, 25602, 25603, + 25508, 25507, 25602, 25605, + 25508, 25605, 25606, 25511, + 25604, 25607, 25606, 25605, + 25608, 25609, 25606, 25607, + 25512, 25511, 25606, 25609, + 25512, 25609, 25610, 25515, + 25608, 25611, 25610, 25609, + 25612, 25613, 25610, 25611, + 25516, 25515, 25610, 25613, + 25516, 25613, 25614, 25519, + 25612, 25615, 25614, 25613, + 25616, 25617, 25614, 25615, + 25520, 25519, 25614, 25617, + 25520, 25617, 25618, 25523, + 25616, 25619, 25618, 25617, + 25620, 25621, 25618, 25619, + 25524, 25523, 25618, 25621, + 25524, 25621, 25622, 25527, + 25620, 25623, 25622, 25621, + 25624, 25625, 25622, 25623, + 25528, 25527, 25622, 25625, + 25528, 25625, 25626, 25531, + 25624, 25627, 25626, 25625, + 25628, 25629, 25626, 25627, + 25532, 25531, 25626, 25629, + 25532, 25629, 25630, 25535, + 25628, 25631, 25630, 25629, + 25632, 25633, 25630, 25631, + 25536, 25535, 25630, 25633, + 25536, 25633, 25634, 25539, + 25632, 25635, 25634, 25633, + 25636, 25637, 25634, 25635, + 25540, 25539, 25634, 25637, + 25540, 25637, 25638, 25543, + 25636, 25639, 25638, 25637, + 25640, 25641, 25638, 25639, + 25544, 25543, 25638, 25641, + 25544, 25641, 25642, 25547, + 25640, 25643, 25642, 25641, + 25644, 25645, 25642, 25643, + 25548, 25547, 25642, 25645, + 25548, 25645, 25646, 25551, + 25644, 25647, 25646, 25645, + 25648, 25649, 25646, 25647, + 25552, 25551, 25646, 25649, + 25552, 25649, 25650, 25555, + 25648, 25651, 25650, 25649, + 25652, 25653, 25650, 25651, + 25556, 25555, 25650, 25653, + 16982, 16987, 25654, 25559, + 16986, 25655, 25654, 16987, + 25656, 25657, 25654, 25655, + 25560, 25559, 25654, 25657, + 25560, 25657, 25658, 25563, + 25656, 25659, 25658, 25657, + 25660, 25661, 25658, 25659, + 25564, 25563, 25658, 25661, + 25564, 25661, 25662, 25567, + 25660, 25663, 25662, 25661, + 25664, 25665, 25662, 25663, + 25568, 25567, 25662, 25665, + 25568, 25665, 25666, 25571, + 25664, 25667, 25666, 25665, + 25668, 25669, 25666, 25667, + 25572, 25571, 25666, 25669, + 25572, 25669, 25670, 25575, + 25668, 25671, 25670, 25669, + 25672, 25673, 25670, 25671, + 25576, 25575, 25670, 25673, + 25576, 25673, 25674, 25579, + 25672, 25675, 25674, 25673, + 25676, 25677, 25674, 25675, + 25580, 25579, 25674, 25677, + 25580, 25677, 25678, 25583, + 25676, 25679, 25678, 25677, + 25680, 25681, 25678, 25679, + 25584, 25583, 25678, 25681, + 25584, 25681, 25682, 25587, + 25680, 25683, 25682, 25681, + 25684, 25685, 25682, 25683, + 25588, 25587, 25682, 25685, + 25588, 25685, 25686, 25591, + 25684, 25687, 25686, 25685, + 25688, 25689, 25686, 25687, + 25592, 25591, 25686, 25689, + 25592, 25689, 25690, 25595, + 25688, 25691, 25690, 25689, + 25692, 25693, 25690, 25691, + 25596, 25595, 25690, 25693, + 25596, 25693, 25694, 25599, + 25692, 25695, 25694, 25693, + 25696, 25697, 25694, 25695, + 25600, 25599, 25694, 25697, + 25600, 25697, 25698, 25603, + 25696, 25699, 25698, 25697, + 25700, 25701, 25698, 25699, + 25604, 25603, 25698, 25701, + 25604, 25701, 25702, 25607, + 25700, 25703, 25702, 25701, + 25704, 25705, 25702, 25703, + 25608, 25607, 25702, 25705, + 25608, 25705, 25706, 25611, + 25704, 25707, 25706, 25705, + 25708, 25709, 25706, 25707, + 25612, 25611, 25706, 25709, + 25612, 25709, 25710, 25615, + 25708, 25711, 25710, 25709, + 25712, 25713, 25710, 25711, + 25616, 25615, 25710, 25713, + 25616, 25713, 25714, 25619, + 25712, 25715, 25714, 25713, + 25716, 25717, 25714, 25715, + 25620, 25619, 25714, 25717, + 25620, 25717, 25718, 25623, + 25716, 25719, 25718, 25717, + 25720, 25721, 25718, 25719, + 25624, 25623, 25718, 25721, + 25624, 25721, 25722, 25627, + 25720, 25723, 25722, 25721, + 25724, 25725, 25722, 25723, + 25628, 25627, 25722, 25725, + 25628, 25725, 25726, 25631, + 25724, 25727, 25726, 25725, + 25728, 25729, 25726, 25727, + 25632, 25631, 25726, 25729, + 25632, 25729, 25730, 25635, + 25728, 25731, 25730, 25729, + 25732, 25733, 25730, 25731, + 25636, 25635, 25730, 25733, + 25636, 25733, 25734, 25639, + 25732, 25735, 25734, 25733, + 25736, 25737, 25734, 25735, + 25640, 25639, 25734, 25737, + 25640, 25737, 25738, 25643, + 25736, 25739, 25738, 25737, + 25740, 25741, 25738, 25739, + 25644, 25643, 25738, 25741, + 25644, 25741, 25742, 25647, + 25740, 25743, 25742, 25741, + 25744, 25745, 25742, 25743, + 25648, 25647, 25742, 25745, + 25648, 25745, 25746, 25651, + 25744, 25747, 25746, 25745, + 25748, 25749, 25746, 25747, + 25652, 25651, 25746, 25749, + 16986, 16991, 25750, 25655, + 16990, 25751, 25750, 16991, + 25752, 25753, 25750, 25751, + 25656, 25655, 25750, 25753, + 25656, 25753, 25754, 25659, + 25752, 25755, 25754, 25753, + 25756, 25757, 25754, 25755, + 25660, 25659, 25754, 25757, + 25660, 25757, 25758, 25663, + 25756, 25759, 25758, 25757, + 25760, 25761, 25758, 25759, + 25664, 25663, 25758, 25761, + 25664, 25761, 25762, 25667, + 25760, 25763, 25762, 25761, + 25764, 25765, 25762, 25763, + 25668, 25667, 25762, 25765, + 25668, 25765, 25766, 25671, + 25764, 25767, 25766, 25765, + 25768, 25769, 25766, 25767, + 25672, 25671, 25766, 25769, + 25672, 25769, 25770, 25675, + 25768, 25771, 25770, 25769, + 25772, 25773, 25770, 25771, + 25676, 25675, 25770, 25773, + 25676, 25773, 25774, 25679, + 25772, 25775, 25774, 25773, + 25776, 25777, 25774, 25775, + 25680, 25679, 25774, 25777, + 25680, 25777, 25778, 25683, + 25776, 25779, 25778, 25777, + 25780, 25781, 25778, 25779, + 25684, 25683, 25778, 25781, + 25684, 25781, 25782, 25687, + 25780, 25783, 25782, 25781, + 25784, 25785, 25782, 25783, + 25688, 25687, 25782, 25785, + 25688, 25785, 25786, 25691, + 25784, 25787, 25786, 25785, + 25788, 25789, 25786, 25787, + 25692, 25691, 25786, 25789, + 25692, 25789, 25790, 25695, + 25788, 25791, 25790, 25789, + 25792, 25793, 25790, 25791, + 25696, 25695, 25790, 25793, + 25696, 25793, 25794, 25699, + 25792, 25795, 25794, 25793, + 25796, 25797, 25794, 25795, + 25700, 25699, 25794, 25797, + 25700, 25797, 25798, 25703, + 25796, 25799, 25798, 25797, + 25800, 25801, 25798, 25799, + 25704, 25703, 25798, 25801, + 25704, 25801, 25802, 25707, + 25800, 25803, 25802, 25801, + 25804, 25805, 25802, 25803, + 25708, 25707, 25802, 25805, + 25708, 25805, 25806, 25711, + 25804, 25807, 25806, 25805, + 25808, 25809, 25806, 25807, + 25712, 25711, 25806, 25809, + 25712, 25809, 25810, 25715, + 25808, 25811, 25810, 25809, + 25812, 25813, 25810, 25811, + 25716, 25715, 25810, 25813, + 25716, 25813, 25814, 25719, + 25812, 25815, 25814, 25813, + 25816, 25817, 25814, 25815, + 25720, 25719, 25814, 25817, + 25720, 25817, 25818, 25723, + 25816, 25819, 25818, 25817, + 25820, 25821, 25818, 25819, + 25724, 25723, 25818, 25821, + 25724, 25821, 25822, 25727, + 25820, 25823, 25822, 25821, + 25824, 25825, 25822, 25823, + 25728, 25727, 25822, 25825, + 25728, 25825, 25826, 25731, + 25824, 25827, 25826, 25825, + 25828, 25829, 25826, 25827, + 25732, 25731, 25826, 25829, + 25732, 25829, 25830, 25735, + 25828, 25831, 25830, 25829, + 25832, 25833, 25830, 25831, + 25736, 25735, 25830, 25833, + 25736, 25833, 25834, 25739, + 25832, 25835, 25834, 25833, + 25836, 25837, 25834, 25835, + 25740, 25739, 25834, 25837, + 25740, 25837, 25838, 25743, + 25836, 25839, 25838, 25837, + 25840, 25841, 25838, 25839, + 25744, 25743, 25838, 25841, + 25744, 25841, 25842, 25747, + 25840, 25843, 25842, 25841, + 25844, 25845, 25842, 25843, + 25748, 25747, 25842, 25845, + 16990, 16995, 25846, 25751, + 16994, 25847, 25846, 16995, + 25848, 25849, 25846, 25847, + 25752, 25751, 25846, 25849, + 25752, 25849, 25850, 25755, + 25848, 25851, 25850, 25849, + 25852, 25853, 25850, 25851, + 25756, 25755, 25850, 25853, + 25756, 25853, 25854, 25759, + 25852, 25855, 25854, 25853, + 25856, 25857, 25854, 25855, + 25760, 25759, 25854, 25857, + 25760, 25857, 25858, 25763, + 25856, 25859, 25858, 25857, + 25860, 25861, 25858, 25859, + 25764, 25763, 25858, 25861, + 25764, 25861, 25862, 25767, + 25860, 25863, 25862, 25861, + 25864, 25865, 25862, 25863, + 25768, 25767, 25862, 25865, + 25768, 25865, 25866, 25771, + 25864, 25867, 25866, 25865, + 25868, 25869, 25866, 25867, + 25772, 25771, 25866, 25869, + 25772, 25869, 25870, 25775, + 25868, 25871, 25870, 25869, + 25872, 25873, 25870, 25871, + 25776, 25775, 25870, 25873, + 25776, 25873, 25874, 25779, + 25872, 25875, 25874, 25873, + 25876, 25877, 25874, 25875, + 25780, 25779, 25874, 25877, + 25780, 25877, 25878, 25783, + 25876, 25879, 25878, 25877, + 25880, 25881, 25878, 25879, + 25784, 25783, 25878, 25881, + 25784, 25881, 25882, 25787, + 25880, 25883, 25882, 25881, + 25884, 25885, 25882, 25883, + 25788, 25787, 25882, 25885, + 25788, 25885, 25886, 25791, + 25884, 25887, 25886, 25885, + 25888, 25889, 25886, 25887, + 25792, 25791, 25886, 25889, + 25792, 25889, 25890, 25795, + 25888, 25891, 25890, 25889, + 25892, 25893, 25890, 25891, + 25796, 25795, 25890, 25893, + 25796, 25893, 25894, 25799, + 25892, 25895, 25894, 25893, + 25896, 25897, 25894, 25895, + 25800, 25799, 25894, 25897, + 25800, 25897, 25898, 25803, + 25896, 25899, 25898, 25897, + 25900, 25901, 25898, 25899, + 25804, 25803, 25898, 25901, + 25804, 25901, 25902, 25807, + 25900, 25903, 25902, 25901, + 25904, 25905, 25902, 25903, + 25808, 25807, 25902, 25905, + 25808, 25905, 25906, 25811, + 25904, 25907, 25906, 25905, + 25908, 25909, 25906, 25907, + 25812, 25811, 25906, 25909, + 25812, 25909, 25910, 25815, + 25908, 25911, 25910, 25909, + 25912, 25913, 25910, 25911, + 25816, 25815, 25910, 25913, + 25816, 25913, 25914, 25819, + 25912, 25915, 25914, 25913, + 25916, 25917, 25914, 25915, + 25820, 25819, 25914, 25917, + 25820, 25917, 25918, 25823, + 25916, 25919, 25918, 25917, + 25920, 25921, 25918, 25919, + 25824, 25823, 25918, 25921, + 25824, 25921, 25922, 25827, + 25920, 25923, 25922, 25921, + 25924, 25925, 25922, 25923, + 25828, 25827, 25922, 25925, + 25828, 25925, 25926, 25831, + 25924, 25927, 25926, 25925, + 25928, 25929, 25926, 25927, + 25832, 25831, 25926, 25929, + 25832, 25929, 25930, 25835, + 25928, 25931, 25930, 25929, + 25932, 25933, 25930, 25931, + 25836, 25835, 25930, 25933, + 25836, 25933, 25934, 25839, + 25932, 25935, 25934, 25933, + 25936, 25937, 25934, 25935, + 25840, 25839, 25934, 25937, + 25840, 25937, 25938, 25843, + 25936, 25939, 25938, 25937, + 25940, 25941, 25938, 25939, + 25844, 25843, 25938, 25941, + 16994, 16999, 25942, 25847, + 16998, 25943, 25942, 16999, + 25944, 25945, 25942, 25943, + 25848, 25847, 25942, 25945, + 25848, 25945, 25946, 25851, + 25944, 25947, 25946, 25945, + 25948, 25949, 25946, 25947, + 25852, 25851, 25946, 25949, + 25852, 25949, 25950, 25855, + 25948, 25951, 25950, 25949, + 25952, 25953, 25950, 25951, + 25856, 25855, 25950, 25953, + 25856, 25953, 25954, 25859, + 25952, 25955, 25954, 25953, + 25956, 25957, 25954, 25955, + 25860, 25859, 25954, 25957, + 25860, 25957, 25958, 25863, + 25956, 25959, 25958, 25957, + 25960, 25961, 25958, 25959, + 25864, 25863, 25958, 25961, + 25864, 25961, 25962, 25867, + 25960, 25963, 25962, 25961, + 25964, 25965, 25962, 25963, + 25868, 25867, 25962, 25965, + 25868, 25965, 25966, 25871, + 25964, 25967, 25966, 25965, + 25968, 25969, 25966, 25967, + 25872, 25871, 25966, 25969, + 25872, 25969, 25970, 25875, + 25968, 25971, 25970, 25969, + 25972, 25973, 25970, 25971, + 25876, 25875, 25970, 25973, + 25876, 25973, 25974, 25879, + 25972, 25975, 25974, 25973, + 25976, 25977, 25974, 25975, + 25880, 25879, 25974, 25977, + 25880, 25977, 25978, 25883, + 25976, 25979, 25978, 25977, + 25980, 25981, 25978, 25979, + 25884, 25883, 25978, 25981, + 25884, 25981, 25982, 25887, + 25980, 25983, 25982, 25981, + 25984, 25985, 25982, 25983, + 25888, 25887, 25982, 25985, + 25888, 25985, 25986, 25891, + 25984, 25987, 25986, 25985, + 25988, 25989, 25986, 25987, + 25892, 25891, 25986, 25989, + 25892, 25989, 25990, 25895, + 25988, 25991, 25990, 25989, + 25992, 25993, 25990, 25991, + 25896, 25895, 25990, 25993, + 25896, 25993, 25994, 25899, + 25992, 25995, 25994, 25993, + 25996, 25997, 25994, 25995, + 25900, 25899, 25994, 25997, + 25900, 25997, 25998, 25903, + 25996, 25999, 25998, 25997, + 26000, 26001, 25998, 25999, + 25904, 25903, 25998, 26001, + 25904, 26001, 26002, 25907, + 26000, 26003, 26002, 26001, + 26004, 26005, 26002, 26003, + 25908, 25907, 26002, 26005, + 25908, 26005, 26006, 25911, + 26004, 26007, 26006, 26005, + 26008, 26009, 26006, 26007, + 25912, 25911, 26006, 26009, + 25912, 26009, 26010, 25915, + 26008, 26011, 26010, 26009, + 26012, 26013, 26010, 26011, + 25916, 25915, 26010, 26013, + 25916, 26013, 26014, 25919, + 26012, 26015, 26014, 26013, + 26016, 26017, 26014, 26015, + 25920, 25919, 26014, 26017, + 25920, 26017, 26018, 25923, + 26016, 26019, 26018, 26017, + 26020, 26021, 26018, 26019, + 25924, 25923, 26018, 26021, + 25924, 26021, 26022, 25927, + 26020, 26023, 26022, 26021, + 26024, 26025, 26022, 26023, + 25928, 25927, 26022, 26025, + 25928, 26025, 26026, 25931, + 26024, 26027, 26026, 26025, + 26028, 26029, 26026, 26027, + 25932, 25931, 26026, 26029, + 25932, 26029, 26030, 25935, + 26028, 26031, 26030, 26029, + 26032, 26033, 26030, 26031, + 25936, 25935, 26030, 26033, + 25936, 26033, 26034, 25939, + 26032, 26035, 26034, 26033, + 26036, 26037, 26034, 26035, + 25940, 25939, 26034, 26037, + 16998, 17003, 26038, 25943, + 17002, 26039, 26038, 17003, + 26040, 26041, 26038, 26039, + 25944, 25943, 26038, 26041, + 25944, 26041, 26042, 25947, + 26040, 26043, 26042, 26041, + 26044, 26045, 26042, 26043, + 25948, 25947, 26042, 26045, + 25948, 26045, 26046, 25951, + 26044, 26047, 26046, 26045, + 26048, 26049, 26046, 26047, + 25952, 25951, 26046, 26049, + 25952, 26049, 26050, 25955, + 26048, 26051, 26050, 26049, + 26052, 26053, 26050, 26051, + 25956, 25955, 26050, 26053, + 25956, 26053, 26054, 25959, + 26052, 26055, 26054, 26053, + 26056, 26057, 26054, 26055, + 25960, 25959, 26054, 26057, + 25960, 26057, 26058, 25963, + 26056, 26059, 26058, 26057, + 26060, 26061, 26058, 26059, + 25964, 25963, 26058, 26061, + 25964, 26061, 26062, 25967, + 26060, 26063, 26062, 26061, + 26064, 26065, 26062, 26063, + 25968, 25967, 26062, 26065, + 25968, 26065, 26066, 25971, + 26064, 26067, 26066, 26065, + 26068, 26069, 26066, 26067, + 25972, 25971, 26066, 26069, + 25972, 26069, 26070, 25975, + 26068, 26071, 26070, 26069, + 26072, 26073, 26070, 26071, + 25976, 25975, 26070, 26073, + 25976, 26073, 26074, 25979, + 26072, 26075, 26074, 26073, + 26076, 26077, 26074, 26075, + 25980, 25979, 26074, 26077, + 25980, 26077, 26078, 25983, + 26076, 26079, 26078, 26077, + 26080, 26081, 26078, 26079, + 25984, 25983, 26078, 26081, + 25984, 26081, 26082, 25987, + 26080, 26083, 26082, 26081, + 26084, 26085, 26082, 26083, + 25988, 25987, 26082, 26085, + 25988, 26085, 26086, 25991, + 26084, 26087, 26086, 26085, + 26088, 26089, 26086, 26087, + 25992, 25991, 26086, 26089, + 25992, 26089, 26090, 25995, + 26088, 26091, 26090, 26089, + 26092, 26093, 26090, 26091, + 25996, 25995, 26090, 26093, + 25996, 26093, 26094, 25999, + 26092, 26095, 26094, 26093, + 26096, 26097, 26094, 26095, + 26000, 25999, 26094, 26097, + 26000, 26097, 26098, 26003, + 26096, 26099, 26098, 26097, + 26100, 26101, 26098, 26099, + 26004, 26003, 26098, 26101, + 26004, 26101, 26102, 26007, + 26100, 26103, 26102, 26101, + 26104, 26105, 26102, 26103, + 26008, 26007, 26102, 26105, + 26008, 26105, 26106, 26011, + 26104, 26107, 26106, 26105, + 26108, 26109, 26106, 26107, + 26012, 26011, 26106, 26109, + 26012, 26109, 26110, 26015, + 26108, 26111, 26110, 26109, + 26112, 26113, 26110, 26111, + 26016, 26015, 26110, 26113, + 26016, 26113, 26114, 26019, + 26112, 26115, 26114, 26113, + 26116, 26117, 26114, 26115, + 26020, 26019, 26114, 26117, + 26020, 26117, 26118, 26023, + 26116, 26119, 26118, 26117, + 26120, 26121, 26118, 26119, + 26024, 26023, 26118, 26121, + 26024, 26121, 26122, 26027, + 26120, 26123, 26122, 26121, + 26124, 26125, 26122, 26123, + 26028, 26027, 26122, 26125, + 26028, 26125, 26126, 26031, + 26124, 26127, 26126, 26125, + 26128, 26129, 26126, 26127, + 26032, 26031, 26126, 26129, + 26032, 26129, 26130, 26035, + 26128, 26131, 26130, 26129, + 26132, 26133, 26130, 26131, + 26036, 26035, 26130, 26133, + 17002, 17007, 26134, 26039, + 17006, 26135, 26134, 17007, + 26136, 26137, 26134, 26135, + 26040, 26039, 26134, 26137, + 26040, 26137, 26138, 26043, + 26136, 26139, 26138, 26137, + 26140, 26141, 26138, 26139, + 26044, 26043, 26138, 26141, + 26044, 26141, 26142, 26047, + 26140, 26143, 26142, 26141, + 26144, 26145, 26142, 26143, + 26048, 26047, 26142, 26145, + 26048, 26145, 26146, 26051, + 26144, 26147, 26146, 26145, + 26148, 26149, 26146, 26147, + 26052, 26051, 26146, 26149, + 26052, 26149, 26150, 26055, + 26148, 26151, 26150, 26149, + 26152, 26153, 26150, 26151, + 26056, 26055, 26150, 26153, + 26056, 26153, 26154, 26059, + 26152, 26155, 26154, 26153, + 26156, 26157, 26154, 26155, + 26060, 26059, 26154, 26157, + 26060, 26157, 26158, 26063, + 26156, 26159, 26158, 26157, + 26160, 26161, 26158, 26159, + 26064, 26063, 26158, 26161, + 26064, 26161, 26162, 26067, + 26160, 26163, 26162, 26161, + 26164, 26165, 26162, 26163, + 26068, 26067, 26162, 26165, + 26068, 26165, 26166, 26071, + 26164, 26167, 26166, 26165, + 26168, 26169, 26166, 26167, + 26072, 26071, 26166, 26169, + 26072, 26169, 26170, 26075, + 26168, 26171, 26170, 26169, + 26172, 26173, 26170, 26171, + 26076, 26075, 26170, 26173, + 26076, 26173, 26174, 26079, + 26172, 26175, 26174, 26173, + 26176, 26177, 26174, 26175, + 26080, 26079, 26174, 26177, + 26080, 26177, 26178, 26083, + 26176, 26179, 26178, 26177, + 26180, 26181, 26178, 26179, + 26084, 26083, 26178, 26181, + 26084, 26181, 26182, 26087, + 26180, 26183, 26182, 26181, + 26184, 26185, 26182, 26183, + 26088, 26087, 26182, 26185, + 26088, 26185, 26186, 26091, + 26184, 26187, 26186, 26185, + 26188, 26189, 26186, 26187, + 26092, 26091, 26186, 26189, + 26092, 26189, 26190, 26095, + 26188, 26191, 26190, 26189, + 26192, 26193, 26190, 26191, + 26096, 26095, 26190, 26193, + 26096, 26193, 26194, 26099, + 26192, 26195, 26194, 26193, + 26196, 26197, 26194, 26195, + 26100, 26099, 26194, 26197, + 26100, 26197, 26198, 26103, + 26196, 26199, 26198, 26197, + 26200, 26201, 26198, 26199, + 26104, 26103, 26198, 26201, + 26104, 26201, 26202, 26107, + 26200, 26203, 26202, 26201, + 26204, 26205, 26202, 26203, + 26108, 26107, 26202, 26205, + 26108, 26205, 26206, 26111, + 26204, 26207, 26206, 26205, + 26208, 26209, 26206, 26207, + 26112, 26111, 26206, 26209, + 26112, 26209, 26210, 26115, + 26208, 26211, 26210, 26209, + 26212, 26213, 26210, 26211, + 26116, 26115, 26210, 26213, + 26116, 26213, 26214, 26119, + 26212, 26215, 26214, 26213, + 26216, 26217, 26214, 26215, + 26120, 26119, 26214, 26217, + 26120, 26217, 26218, 26123, + 26216, 26219, 26218, 26217, + 26220, 26221, 26218, 26219, + 26124, 26123, 26218, 26221, + 26124, 26221, 26222, 26127, + 26220, 26223, 26222, 26221, + 26224, 26225, 26222, 26223, + 26128, 26127, 26222, 26225, + 26128, 26225, 26226, 26131, + 26224, 26227, 26226, 26225, + 26228, 26229, 26226, 26227, + 26132, 26131, 26226, 26229, + 17006, 17011, 26230, 26135, + 17010, 26231, 26230, 17011, + 26232, 26233, 26230, 26231, + 26136, 26135, 26230, 26233, + 26136, 26233, 26234, 26139, + 26232, 26235, 26234, 26233, + 26236, 26237, 26234, 26235, + 26140, 26139, 26234, 26237, + 26140, 26237, 26238, 26143, + 26236, 26239, 26238, 26237, + 26240, 26241, 26238, 26239, + 26144, 26143, 26238, 26241, + 26144, 26241, 26242, 26147, + 26240, 26243, 26242, 26241, + 26244, 26245, 26242, 26243, + 26148, 26147, 26242, 26245, + 26148, 26245, 26246, 26151, + 26244, 26247, 26246, 26245, + 26248, 26249, 26246, 26247, + 26152, 26151, 26246, 26249, + 26152, 26249, 26250, 26155, + 26248, 26251, 26250, 26249, + 26252, 26253, 26250, 26251, + 26156, 26155, 26250, 26253, + 26156, 26253, 26254, 26159, + 26252, 26255, 26254, 26253, + 26256, 26257, 26254, 26255, + 26160, 26159, 26254, 26257, + 26160, 26257, 26258, 26163, + 26256, 26259, 26258, 26257, + 26260, 26261, 26258, 26259, + 26164, 26163, 26258, 26261, + 26164, 26261, 26262, 26167, + 26260, 26263, 26262, 26261, + 26264, 26265, 26262, 26263, + 26168, 26167, 26262, 26265, + 26168, 26265, 26266, 26171, + 26264, 26267, 26266, 26265, + 26268, 26269, 26266, 26267, + 26172, 26171, 26266, 26269, + 26172, 26269, 26270, 26175, + 26268, 26271, 26270, 26269, + 26272, 26273, 26270, 26271, + 26176, 26175, 26270, 26273, + 26176, 26273, 26274, 26179, + 26272, 26275, 26274, 26273, + 26276, 26277, 26274, 26275, + 26180, 26179, 26274, 26277, + 26180, 26277, 26278, 26183, + 26276, 26279, 26278, 26277, + 26280, 26281, 26278, 26279, + 26184, 26183, 26278, 26281, + 26184, 26281, 26282, 26187, + 26280, 26283, 26282, 26281, + 26284, 26285, 26282, 26283, + 26188, 26187, 26282, 26285, + 26188, 26285, 26286, 26191, + 26284, 26287, 26286, 26285, + 26288, 26289, 26286, 26287, + 26192, 26191, 26286, 26289, + 26192, 26289, 26290, 26195, + 26288, 26291, 26290, 26289, + 26292, 26293, 26290, 26291, + 26196, 26195, 26290, 26293, + 26196, 26293, 26294, 26199, + 26292, 26295, 26294, 26293, + 26296, 26297, 26294, 26295, + 26200, 26199, 26294, 26297, + 26200, 26297, 26298, 26203, + 26296, 26299, 26298, 26297, + 26300, 26301, 26298, 26299, + 26204, 26203, 26298, 26301, + 26204, 26301, 26302, 26207, + 26300, 26303, 26302, 26301, + 26304, 26305, 26302, 26303, + 26208, 26207, 26302, 26305, + 26208, 26305, 26306, 26211, + 26304, 26307, 26306, 26305, + 26308, 26309, 26306, 26307, + 26212, 26211, 26306, 26309, + 26212, 26309, 26310, 26215, + 26308, 26311, 26310, 26309, + 26312, 26313, 26310, 26311, + 26216, 26215, 26310, 26313, + 26216, 26313, 26314, 26219, + 26312, 26315, 26314, 26313, + 26316, 26317, 26314, 26315, + 26220, 26219, 26314, 26317, + 26220, 26317, 26318, 26223, + 26316, 26319, 26318, 26317, + 26320, 26321, 26318, 26319, + 26224, 26223, 26318, 26321, + 26224, 26321, 26322, 26227, + 26320, 26323, 26322, 26321, + 26324, 26325, 26322, 26323, + 26228, 26227, 26322, 26325, + 17010, 17015, 26326, 26231, + 17014, 26327, 26326, 17015, + 26328, 26329, 26326, 26327, + 26232, 26231, 26326, 26329, + 26232, 26329, 26330, 26235, + 26328, 26331, 26330, 26329, + 26332, 26333, 26330, 26331, + 26236, 26235, 26330, 26333, + 26236, 26333, 26334, 26239, + 26332, 26335, 26334, 26333, + 26336, 26337, 26334, 26335, + 26240, 26239, 26334, 26337, + 26240, 26337, 26338, 26243, + 26336, 26339, 26338, 26337, + 26340, 26341, 26338, 26339, + 26244, 26243, 26338, 26341, + 26244, 26341, 26342, 26247, + 26340, 26343, 26342, 26341, + 26344, 26345, 26342, 26343, + 26248, 26247, 26342, 26345, + 26248, 26345, 26346, 26251, + 26344, 26347, 26346, 26345, + 26348, 26349, 26346, 26347, + 26252, 26251, 26346, 26349, + 26252, 26349, 26350, 26255, + 26348, 26351, 26350, 26349, + 26352, 26353, 26350, 26351, + 26256, 26255, 26350, 26353, + 26256, 26353, 26354, 26259, + 26352, 26355, 26354, 26353, + 26356, 26357, 26354, 26355, + 26260, 26259, 26354, 26357, + 26260, 26357, 26358, 26263, + 26356, 26359, 26358, 26357, + 26360, 26361, 26358, 26359, + 26264, 26263, 26358, 26361, + 26264, 26361, 26362, 26267, + 26360, 26363, 26362, 26361, + 26364, 26365, 26362, 26363, + 26268, 26267, 26362, 26365, + 26268, 26365, 26366, 26271, + 26364, 26367, 26366, 26365, + 26368, 26369, 26366, 26367, + 26272, 26271, 26366, 26369, + 26272, 26369, 26370, 26275, + 26368, 26371, 26370, 26369, + 26372, 26373, 26370, 26371, + 26276, 26275, 26370, 26373, + 26276, 26373, 26374, 26279, + 26372, 26375, 26374, 26373, + 26376, 26377, 26374, 26375, + 26280, 26279, 26374, 26377, + 26280, 26377, 26378, 26283, + 26376, 26379, 26378, 26377, + 26380, 26381, 26378, 26379, + 26284, 26283, 26378, 26381, + 26284, 26381, 26382, 26287, + 26380, 26383, 26382, 26381, + 26384, 26385, 26382, 26383, + 26288, 26287, 26382, 26385, + 26288, 26385, 26386, 26291, + 26384, 26387, 26386, 26385, + 26388, 26389, 26386, 26387, + 26292, 26291, 26386, 26389, + 26292, 26389, 26390, 26295, + 26388, 26391, 26390, 26389, + 26392, 26393, 26390, 26391, + 26296, 26295, 26390, 26393, + 26296, 26393, 26394, 26299, + 26392, 26395, 26394, 26393, + 26396, 26397, 26394, 26395, + 26300, 26299, 26394, 26397, + 26300, 26397, 26398, 26303, + 26396, 26399, 26398, 26397, + 26400, 26401, 26398, 26399, + 26304, 26303, 26398, 26401, + 26304, 26401, 26402, 26307, + 26400, 26403, 26402, 26401, + 26404, 26405, 26402, 26403, + 26308, 26307, 26402, 26405, + 26308, 26405, 26406, 26311, + 26404, 26407, 26406, 26405, + 26408, 26409, 26406, 26407, + 26312, 26311, 26406, 26409, + 26312, 26409, 26410, 26315, + 26408, 26411, 26410, 26409, + 26412, 26413, 26410, 26411, + 26316, 26315, 26410, 26413, + 26316, 26413, 26414, 26319, + 26412, 26415, 26414, 26413, + 26416, 26417, 26414, 26415, + 26320, 26319, 26414, 26417, + 26320, 26417, 26418, 26323, + 26416, 26419, 26418, 26417, + 26420, 26421, 26418, 26419, + 26324, 26323, 26418, 26421, + 17014, 17019, 26422, 26327, + 17018, 26423, 26422, 17019, + 26424, 26425, 26422, 26423, + 26328, 26327, 26422, 26425, + 26328, 26425, 26426, 26331, + 26424, 26427, 26426, 26425, + 26428, 26429, 26426, 26427, + 26332, 26331, 26426, 26429, + 26332, 26429, 26430, 26335, + 26428, 26431, 26430, 26429, + 26432, 26433, 26430, 26431, + 26336, 26335, 26430, 26433, + 26336, 26433, 26434, 26339, + 26432, 26435, 26434, 26433, + 26436, 26437, 26434, 26435, + 26340, 26339, 26434, 26437, + 26340, 26437, 26438, 26343, + 26436, 26439, 26438, 26437, + 26440, 26441, 26438, 26439, + 26344, 26343, 26438, 26441, + 26344, 26441, 26442, 26347, + 26440, 26443, 26442, 26441, + 26444, 26445, 26442, 26443, + 26348, 26347, 26442, 26445, + 26348, 26445, 26446, 26351, + 26444, 26447, 26446, 26445, + 26448, 26449, 26446, 26447, + 26352, 26351, 26446, 26449, + 26352, 26449, 26450, 26355, + 26448, 26451, 26450, 26449, + 26452, 26453, 26450, 26451, + 26356, 26355, 26450, 26453, + 26356, 26453, 26454, 26359, + 26452, 26455, 26454, 26453, + 26456, 26457, 26454, 26455, + 26360, 26359, 26454, 26457, + 26360, 26457, 26458, 26363, + 26456, 26459, 26458, 26457, + 26460, 26461, 26458, 26459, + 26364, 26363, 26458, 26461, + 26364, 26461, 26462, 26367, + 26460, 26463, 26462, 26461, + 26464, 26465, 26462, 26463, + 26368, 26367, 26462, 26465, + 26368, 26465, 26466, 26371, + 26464, 26467, 26466, 26465, + 26468, 26469, 26466, 26467, + 26372, 26371, 26466, 26469, + 26372, 26469, 26470, 26375, + 26468, 26471, 26470, 26469, + 26472, 26473, 26470, 26471, + 26376, 26375, 26470, 26473, + 26376, 26473, 26474, 26379, + 26472, 26475, 26474, 26473, + 26476, 26477, 26474, 26475, + 26380, 26379, 26474, 26477, + 26380, 26477, 26478, 26383, + 26476, 26479, 26478, 26477, + 26480, 26481, 26478, 26479, + 26384, 26383, 26478, 26481, + 26384, 26481, 26482, 26387, + 26480, 26483, 26482, 26481, + 26484, 26485, 26482, 26483, + 26388, 26387, 26482, 26485, + 26388, 26485, 26486, 26391, + 26484, 26487, 26486, 26485, + 26488, 26489, 26486, 26487, + 26392, 26391, 26486, 26489, + 26392, 26489, 26490, 26395, + 26488, 26491, 26490, 26489, + 26492, 26493, 26490, 26491, + 26396, 26395, 26490, 26493, + 26396, 26493, 26494, 26399, + 26492, 26495, 26494, 26493, + 26496, 26497, 26494, 26495, + 26400, 26399, 26494, 26497, + 26400, 26497, 26498, 26403, + 26496, 26499, 26498, 26497, + 26500, 26501, 26498, 26499, + 26404, 26403, 26498, 26501, + 26404, 26501, 26502, 26407, + 26500, 26503, 26502, 26501, + 26504, 26505, 26502, 26503, + 26408, 26407, 26502, 26505, + 26408, 26505, 26506, 26411, + 26504, 26507, 26506, 26505, + 26508, 26509, 26506, 26507, + 26412, 26411, 26506, 26509, + 26412, 26509, 26510, 26415, + 26508, 26511, 26510, 26509, + 26512, 26513, 26510, 26511, + 26416, 26415, 26510, 26513, + 26416, 26513, 26514, 26419, + 26512, 26515, 26514, 26513, + 26516, 26517, 26514, 26515, + 26420, 26419, 26514, 26517, + 17018, 17023, 26518, 26423, + 17022, 26519, 26518, 17023, + 26520, 26521, 26518, 26519, + 26424, 26423, 26518, 26521, + 26424, 26521, 26522, 26427, + 26520, 26523, 26522, 26521, + 26524, 26525, 26522, 26523, + 26428, 26427, 26522, 26525, + 26428, 26525, 26526, 26431, + 26524, 26527, 26526, 26525, + 26528, 26529, 26526, 26527, + 26432, 26431, 26526, 26529, + 26432, 26529, 26530, 26435, + 26528, 26531, 26530, 26529, + 26532, 26533, 26530, 26531, + 26436, 26435, 26530, 26533, + 26436, 26533, 26534, 26439, + 26532, 26535, 26534, 26533, + 26536, 26537, 26534, 26535, + 26440, 26439, 26534, 26537, + 26440, 26537, 26538, 26443, + 26536, 26539, 26538, 26537, + 26540, 26541, 26538, 26539, + 26444, 26443, 26538, 26541, + 26444, 26541, 26542, 26447, + 26540, 26543, 26542, 26541, + 26544, 26545, 26542, 26543, + 26448, 26447, 26542, 26545, + 26448, 26545, 26546, 26451, + 26544, 26547, 26546, 26545, + 26548, 26549, 26546, 26547, + 26452, 26451, 26546, 26549, + 26452, 26549, 26550, 26455, + 26548, 26551, 26550, 26549, + 26552, 26553, 26550, 26551, + 26456, 26455, 26550, 26553, + 26456, 26553, 26554, 26459, + 26552, 26555, 26554, 26553, + 26556, 26557, 26554, 26555, + 26460, 26459, 26554, 26557, + 26460, 26557, 26558, 26463, + 26556, 26559, 26558, 26557, + 26560, 26561, 26558, 26559, + 26464, 26463, 26558, 26561, + 26464, 26561, 26562, 26467, + 26560, 26563, 26562, 26561, + 26564, 26565, 26562, 26563, + 26468, 26467, 26562, 26565, + 26468, 26565, 26566, 26471, + 26564, 26567, 26566, 26565, + 26568, 26569, 26566, 26567, + 26472, 26471, 26566, 26569, + 26472, 26569, 26570, 26475, + 26568, 26571, 26570, 26569, + 26572, 26573, 26570, 26571, + 26476, 26475, 26570, 26573, + 26476, 26573, 26574, 26479, + 26572, 26575, 26574, 26573, + 26576, 26577, 26574, 26575, + 26480, 26479, 26574, 26577, + 26480, 26577, 26578, 26483, + 26576, 26579, 26578, 26577, + 26580, 26581, 26578, 26579, + 26484, 26483, 26578, 26581, + 26484, 26581, 26582, 26487, + 26580, 26583, 26582, 26581, + 26584, 26585, 26582, 26583, + 26488, 26487, 26582, 26585, + 26488, 26585, 26586, 26491, + 26584, 26587, 26586, 26585, + 26588, 26589, 26586, 26587, + 26492, 26491, 26586, 26589, + 26492, 26589, 26590, 26495, + 26588, 26591, 26590, 26589, + 26592, 26593, 26590, 26591, + 26496, 26495, 26590, 26593, + 26496, 26593, 26594, 26499, + 26592, 26595, 26594, 26593, + 26596, 26597, 26594, 26595, + 26500, 26499, 26594, 26597, + 26500, 26597, 26598, 26503, + 26596, 26599, 26598, 26597, + 26600, 26601, 26598, 26599, + 26504, 26503, 26598, 26601, + 26504, 26601, 26602, 26507, + 26600, 26603, 26602, 26601, + 26604, 26605, 26602, 26603, + 26508, 26507, 26602, 26605, + 26508, 26605, 26606, 26511, + 26604, 26607, 26606, 26605, + 26608, 26609, 26606, 26607, + 26512, 26511, 26606, 26609, + 26512, 26609, 26610, 26515, + 26608, 26611, 26610, 26609, + 26612, 26613, 26610, 26611, + 26516, 26515, 26610, 26613, + 17022, 17027, 26614, 26519, + 17026, 26615, 26614, 17027, + 26616, 26617, 26614, 26615, + 26520, 26519, 26614, 26617, + 26520, 26617, 26618, 26523, + 26616, 26619, 26618, 26617, + 26620, 26621, 26618, 26619, + 26524, 26523, 26618, 26621, + 26524, 26621, 26622, 26527, + 26620, 26623, 26622, 26621, + 26624, 26625, 26622, 26623, + 26528, 26527, 26622, 26625, + 26528, 26625, 26626, 26531, + 26624, 26627, 26626, 26625, + 26628, 26629, 26626, 26627, + 26532, 26531, 26626, 26629, + 26532, 26629, 26630, 26535, + 26628, 26631, 26630, 26629, + 26632, 26633, 26630, 26631, + 26536, 26535, 26630, 26633, + 26536, 26633, 26634, 26539, + 26632, 26635, 26634, 26633, + 26636, 26637, 26634, 26635, + 26540, 26539, 26634, 26637, + 26540, 26637, 26638, 26543, + 26636, 26639, 26638, 26637, + 26640, 26641, 26638, 26639, + 26544, 26543, 26638, 26641, + 26544, 26641, 26642, 26547, + 26640, 26643, 26642, 26641, + 26644, 26645, 26642, 26643, + 26548, 26547, 26642, 26645, + 26548, 26645, 26646, 26551, + 26644, 26647, 26646, 26645, + 26648, 26649, 26646, 26647, + 26552, 26551, 26646, 26649, + 26552, 26649, 26650, 26555, + 26648, 26651, 26650, 26649, + 26652, 26653, 26650, 26651, + 26556, 26555, 26650, 26653, + 26556, 26653, 26654, 26559, + 26652, 26655, 26654, 26653, + 26656, 26657, 26654, 26655, + 26560, 26559, 26654, 26657, + 26560, 26657, 26658, 26563, + 26656, 26659, 26658, 26657, + 26660, 26661, 26658, 26659, + 26564, 26563, 26658, 26661, + 26564, 26661, 26662, 26567, + 26660, 26663, 26662, 26661, + 26664, 26665, 26662, 26663, + 26568, 26567, 26662, 26665, + 26568, 26665, 26666, 26571, + 26664, 26667, 26666, 26665, + 26668, 26669, 26666, 26667, + 26572, 26571, 26666, 26669, + 26572, 26669, 26670, 26575, + 26668, 26671, 26670, 26669, + 26672, 26673, 26670, 26671, + 26576, 26575, 26670, 26673, + 26576, 26673, 26674, 26579, + 26672, 26675, 26674, 26673, + 26676, 26677, 26674, 26675, + 26580, 26579, 26674, 26677, + 26580, 26677, 26678, 26583, + 26676, 26679, 26678, 26677, + 26680, 26681, 26678, 26679, + 26584, 26583, 26678, 26681, + 26584, 26681, 26682, 26587, + 26680, 26683, 26682, 26681, + 26684, 26685, 26682, 26683, + 26588, 26587, 26682, 26685, + 26588, 26685, 26686, 26591, + 26684, 26687, 26686, 26685, + 26688, 26689, 26686, 26687, + 26592, 26591, 26686, 26689, + 26592, 26689, 26690, 26595, + 26688, 26691, 26690, 26689, + 26692, 26693, 26690, 26691, + 26596, 26595, 26690, 26693, + 26596, 26693, 26694, 26599, + 26692, 26695, 26694, 26693, + 26696, 26697, 26694, 26695, + 26600, 26599, 26694, 26697, + 26600, 26697, 26698, 26603, + 26696, 26699, 26698, 26697, + 26700, 26701, 26698, 26699, + 26604, 26603, 26698, 26701, + 26604, 26701, 26702, 26607, + 26700, 26703, 26702, 26701, + 26704, 26705, 26702, 26703, + 26608, 26607, 26702, 26705, + 26608, 26705, 26706, 26611, + 26704, 26707, 26706, 26705, + 26708, 26709, 26706, 26707, + 26612, 26611, 26706, 26709, + 17026, 17031, 26710, 26615, + 17030, 26711, 26710, 17031, + 26712, 26713, 26710, 26711, + 26616, 26615, 26710, 26713, + 26616, 26713, 26714, 26619, + 26712, 26715, 26714, 26713, + 26716, 26717, 26714, 26715, + 26620, 26619, 26714, 26717, + 26620, 26717, 26718, 26623, + 26716, 26719, 26718, 26717, + 26720, 26721, 26718, 26719, + 26624, 26623, 26718, 26721, + 26624, 26721, 26722, 26627, + 26720, 26723, 26722, 26721, + 26724, 26725, 26722, 26723, + 26628, 26627, 26722, 26725, + 26628, 26725, 26726, 26631, + 26724, 26727, 26726, 26725, + 26728, 26729, 26726, 26727, + 26632, 26631, 26726, 26729, + 26632, 26729, 26730, 26635, + 26728, 26731, 26730, 26729, + 26732, 26733, 26730, 26731, + 26636, 26635, 26730, 26733, + 26636, 26733, 26734, 26639, + 26732, 26735, 26734, 26733, + 26736, 26737, 26734, 26735, + 26640, 26639, 26734, 26737, + 26640, 26737, 26738, 26643, + 26736, 26739, 26738, 26737, + 26740, 26741, 26738, 26739, + 26644, 26643, 26738, 26741, + 26644, 26741, 26742, 26647, + 26740, 26743, 26742, 26741, + 26744, 26745, 26742, 26743, + 26648, 26647, 26742, 26745, + 26648, 26745, 26746, 26651, + 26744, 26747, 26746, 26745, + 26748, 26749, 26746, 26747, + 26652, 26651, 26746, 26749, + 26652, 26749, 26750, 26655, + 26748, 26751, 26750, 26749, + 26752, 26753, 26750, 26751, + 26656, 26655, 26750, 26753, + 26656, 26753, 26754, 26659, + 26752, 26755, 26754, 26753, + 26756, 26757, 26754, 26755, + 26660, 26659, 26754, 26757, + 26660, 26757, 26758, 26663, + 26756, 26759, 26758, 26757, + 26760, 26761, 26758, 26759, + 26664, 26663, 26758, 26761, + 26664, 26761, 26762, 26667, + 26760, 26763, 26762, 26761, + 26764, 26765, 26762, 26763, + 26668, 26667, 26762, 26765, + 26668, 26765, 26766, 26671, + 26764, 26767, 26766, 26765, + 26768, 26769, 26766, 26767, + 26672, 26671, 26766, 26769, + 26672, 26769, 26770, 26675, + 26768, 26771, 26770, 26769, + 26772, 26773, 26770, 26771, + 26676, 26675, 26770, 26773, + 26676, 26773, 26774, 26679, + 26772, 26775, 26774, 26773, + 26776, 26777, 26774, 26775, + 26680, 26679, 26774, 26777, + 26680, 26777, 26778, 26683, + 26776, 26779, 26778, 26777, + 26780, 26781, 26778, 26779, + 26684, 26683, 26778, 26781, + 26684, 26781, 26782, 26687, + 26780, 26783, 26782, 26781, + 26784, 26785, 26782, 26783, + 26688, 26687, 26782, 26785, + 26688, 26785, 26786, 26691, + 26784, 26787, 26786, 26785, + 26788, 26789, 26786, 26787, + 26692, 26691, 26786, 26789, + 26692, 26789, 26790, 26695, + 26788, 26791, 26790, 26789, + 26792, 26793, 26790, 26791, + 26696, 26695, 26790, 26793, + 26696, 26793, 26794, 26699, + 26792, 26795, 26794, 26793, + 26796, 26797, 26794, 26795, + 26700, 26699, 26794, 26797, + 26700, 26797, 26798, 26703, + 26796, 26799, 26798, 26797, + 26800, 26801, 26798, 26799, + 26704, 26703, 26798, 26801, + 26704, 26801, 26802, 26707, + 26800, 26803, 26802, 26801, + 26804, 26805, 26802, 26803, + 26708, 26707, 26802, 26805, + 17030, 17035, 26806, 26711, + 17034, 26807, 26806, 17035, + 26808, 26809, 26806, 26807, + 26712, 26711, 26806, 26809, + 26712, 26809, 26810, 26715, + 26808, 26811, 26810, 26809, + 26812, 26813, 26810, 26811, + 26716, 26715, 26810, 26813, + 26716, 26813, 26814, 26719, + 26812, 26815, 26814, 26813, + 26816, 26817, 26814, 26815, + 26720, 26719, 26814, 26817, + 26720, 26817, 26818, 26723, + 26816, 26819, 26818, 26817, + 26820, 26821, 26818, 26819, + 26724, 26723, 26818, 26821, + 26724, 26821, 26822, 26727, + 26820, 26823, 26822, 26821, + 26824, 26825, 26822, 26823, + 26728, 26727, 26822, 26825, + 26728, 26825, 26826, 26731, + 26824, 26827, 26826, 26825, + 26828, 26829, 26826, 26827, + 26732, 26731, 26826, 26829, + 26732, 26829, 26830, 26735, + 26828, 26831, 26830, 26829, + 26832, 26833, 26830, 26831, + 26736, 26735, 26830, 26833, + 26736, 26833, 26834, 26739, + 26832, 26835, 26834, 26833, + 26836, 26837, 26834, 26835, + 26740, 26739, 26834, 26837, + 26740, 26837, 26838, 26743, + 26836, 26839, 26838, 26837, + 26840, 26841, 26838, 26839, + 26744, 26743, 26838, 26841, + 26744, 26841, 26842, 26747, + 26840, 26843, 26842, 26841, + 26844, 26845, 26842, 26843, + 26748, 26747, 26842, 26845, + 26748, 26845, 26846, 26751, + 26844, 26847, 26846, 26845, + 26848, 26849, 26846, 26847, + 26752, 26751, 26846, 26849, + 26752, 26849, 26850, 26755, + 26848, 26851, 26850, 26849, + 26852, 26853, 26850, 26851, + 26756, 26755, 26850, 26853, + 26756, 26853, 26854, 26759, + 26852, 26855, 26854, 26853, + 26856, 26857, 26854, 26855, + 26760, 26759, 26854, 26857, + 26760, 26857, 26858, 26763, + 26856, 26859, 26858, 26857, + 26860, 26861, 26858, 26859, + 26764, 26763, 26858, 26861, + 26764, 26861, 26862, 26767, + 26860, 26863, 26862, 26861, + 26864, 26865, 26862, 26863, + 26768, 26767, 26862, 26865, + 26768, 26865, 26866, 26771, + 26864, 26867, 26866, 26865, + 26868, 26869, 26866, 26867, + 26772, 26771, 26866, 26869, + 26772, 26869, 26870, 26775, + 26868, 26871, 26870, 26869, + 26872, 26873, 26870, 26871, + 26776, 26775, 26870, 26873, + 26776, 26873, 26874, 26779, + 26872, 26875, 26874, 26873, + 26876, 26877, 26874, 26875, + 26780, 26779, 26874, 26877, + 26780, 26877, 26878, 26783, + 26876, 26879, 26878, 26877, + 26880, 26881, 26878, 26879, + 26784, 26783, 26878, 26881, + 26784, 26881, 26882, 26787, + 26880, 26883, 26882, 26881, + 26884, 26885, 26882, 26883, + 26788, 26787, 26882, 26885, + 26788, 26885, 26886, 26791, + 26884, 26887, 26886, 26885, + 26888, 26889, 26886, 26887, + 26792, 26791, 26886, 26889, + 26792, 26889, 26890, 26795, + 26888, 26891, 26890, 26889, + 26892, 26893, 26890, 26891, + 26796, 26795, 26890, 26893, + 26796, 26893, 26894, 26799, + 26892, 26895, 26894, 26893, + 26896, 26897, 26894, 26895, + 26800, 26799, 26894, 26897, + 26800, 26897, 26898, 26803, + 26896, 26899, 26898, 26897, + 26900, 26901, 26898, 26899, + 26804, 26803, 26898, 26901, + 17034, 17039, 26902, 26807, + 17038, 26903, 26902, 17039, + 26904, 26905, 26902, 26903, + 26808, 26807, 26902, 26905, + 26808, 26905, 26906, 26811, + 26904, 26907, 26906, 26905, + 26908, 26909, 26906, 26907, + 26812, 26811, 26906, 26909, + 26812, 26909, 26910, 26815, + 26908, 26911, 26910, 26909, + 26912, 26913, 26910, 26911, + 26816, 26815, 26910, 26913, + 26816, 26913, 26914, 26819, + 26912, 26915, 26914, 26913, + 26916, 26917, 26914, 26915, + 26820, 26819, 26914, 26917, + 26820, 26917, 26918, 26823, + 26916, 26919, 26918, 26917, + 26920, 26921, 26918, 26919, + 26824, 26823, 26918, 26921, + 26824, 26921, 26922, 26827, + 26920, 26923, 26922, 26921, + 26924, 26925, 26922, 26923, + 26828, 26827, 26922, 26925, + 26828, 26925, 26926, 26831, + 26924, 26927, 26926, 26925, + 26928, 26929, 26926, 26927, + 26832, 26831, 26926, 26929, + 26832, 26929, 26930, 26835, + 26928, 26931, 26930, 26929, + 26932, 26933, 26930, 26931, + 26836, 26835, 26930, 26933, + 26836, 26933, 26934, 26839, + 26932, 26935, 26934, 26933, + 26936, 26937, 26934, 26935, + 26840, 26839, 26934, 26937, + 26840, 26937, 26938, 26843, + 26936, 26939, 26938, 26937, + 26940, 26941, 26938, 26939, + 26844, 26843, 26938, 26941, + 26844, 26941, 26942, 26847, + 26940, 26943, 26942, 26941, + 26944, 26945, 26942, 26943, + 26848, 26847, 26942, 26945, + 26848, 26945, 26946, 26851, + 26944, 26947, 26946, 26945, + 26948, 26949, 26946, 26947, + 26852, 26851, 26946, 26949, + 26852, 26949, 26950, 26855, + 26948, 26951, 26950, 26949, + 26952, 26953, 26950, 26951, + 26856, 26855, 26950, 26953, + 26856, 26953, 26954, 26859, + 26952, 26955, 26954, 26953, + 26956, 26957, 26954, 26955, + 26860, 26859, 26954, 26957, + 26860, 26957, 26958, 26863, + 26956, 26959, 26958, 26957, + 26960, 26961, 26958, 26959, + 26864, 26863, 26958, 26961, + 26864, 26961, 26962, 26867, + 26960, 26963, 26962, 26961, + 26964, 26965, 26962, 26963, + 26868, 26867, 26962, 26965, + 26868, 26965, 26966, 26871, + 26964, 26967, 26966, 26965, + 26968, 26969, 26966, 26967, + 26872, 26871, 26966, 26969, + 26872, 26969, 26970, 26875, + 26968, 26971, 26970, 26969, + 26972, 26973, 26970, 26971, + 26876, 26875, 26970, 26973, + 26876, 26973, 26974, 26879, + 26972, 26975, 26974, 26973, + 26976, 26977, 26974, 26975, + 26880, 26879, 26974, 26977, + 26880, 26977, 26978, 26883, + 26976, 26979, 26978, 26977, + 26980, 26981, 26978, 26979, + 26884, 26883, 26978, 26981, + 26884, 26981, 26982, 26887, + 26980, 26983, 26982, 26981, + 26984, 26985, 26982, 26983, + 26888, 26887, 26982, 26985, + 26888, 26985, 26986, 26891, + 26984, 26987, 26986, 26985, + 26988, 26989, 26986, 26987, + 26892, 26891, 26986, 26989, + 26892, 26989, 26990, 26895, + 26988, 26991, 26990, 26989, + 26992, 26993, 26990, 26991, + 26896, 26895, 26990, 26993, + 26896, 26993, 26994, 26899, + 26992, 26995, 26994, 26993, + 26996, 26997, 26994, 26995, + 26900, 26899, 26994, 26997, + 17038, 17043, 26998, 26903, + 17042, 26999, 26998, 17043, + 27000, 27001, 26998, 26999, + 26904, 26903, 26998, 27001, + 26904, 27001, 27002, 26907, + 27000, 27003, 27002, 27001, + 27004, 27005, 27002, 27003, + 26908, 26907, 27002, 27005, + 26908, 27005, 27006, 26911, + 27004, 27007, 27006, 27005, + 27008, 27009, 27006, 27007, + 26912, 26911, 27006, 27009, + 26912, 27009, 27010, 26915, + 27008, 27011, 27010, 27009, + 27012, 27013, 27010, 27011, + 26916, 26915, 27010, 27013, + 26916, 27013, 27014, 26919, + 27012, 27015, 27014, 27013, + 27016, 27017, 27014, 27015, + 26920, 26919, 27014, 27017, + 26920, 27017, 27018, 26923, + 27016, 27019, 27018, 27017, + 27020, 27021, 27018, 27019, + 26924, 26923, 27018, 27021, + 26924, 27021, 27022, 26927, + 27020, 27023, 27022, 27021, + 27024, 27025, 27022, 27023, + 26928, 26927, 27022, 27025, + 26928, 27025, 27026, 26931, + 27024, 27027, 27026, 27025, + 27028, 27029, 27026, 27027, + 26932, 26931, 27026, 27029, + 26932, 27029, 27030, 26935, + 27028, 27031, 27030, 27029, + 27032, 27033, 27030, 27031, + 26936, 26935, 27030, 27033, + 26936, 27033, 27034, 26939, + 27032, 27035, 27034, 27033, + 27036, 27037, 27034, 27035, + 26940, 26939, 27034, 27037, + 26940, 27037, 27038, 26943, + 27036, 27039, 27038, 27037, + 27040, 27041, 27038, 27039, + 26944, 26943, 27038, 27041, + 26944, 27041, 27042, 26947, + 27040, 27043, 27042, 27041, + 27044, 27045, 27042, 27043, + 26948, 26947, 27042, 27045, + 26948, 27045, 27046, 26951, + 27044, 27047, 27046, 27045, + 27048, 27049, 27046, 27047, + 26952, 26951, 27046, 27049, + 26952, 27049, 27050, 26955, + 27048, 27051, 27050, 27049, + 27052, 27053, 27050, 27051, + 26956, 26955, 27050, 27053, + 26956, 27053, 27054, 26959, + 27052, 27055, 27054, 27053, + 27056, 27057, 27054, 27055, + 26960, 26959, 27054, 27057, + 26960, 27057, 27058, 26963, + 27056, 27059, 27058, 27057, + 27060, 27061, 27058, 27059, + 26964, 26963, 27058, 27061, + 26964, 27061, 27062, 26967, + 27060, 27063, 27062, 27061, + 27064, 27065, 27062, 27063, + 26968, 26967, 27062, 27065, + 26968, 27065, 27066, 26971, + 27064, 27067, 27066, 27065, + 27068, 27069, 27066, 27067, + 26972, 26971, 27066, 27069, + 26972, 27069, 27070, 26975, + 27068, 27071, 27070, 27069, + 27072, 27073, 27070, 27071, + 26976, 26975, 27070, 27073, + 26976, 27073, 27074, 26979, + 27072, 27075, 27074, 27073, + 27076, 27077, 27074, 27075, + 26980, 26979, 27074, 27077, + 26980, 27077, 27078, 26983, + 27076, 27079, 27078, 27077, + 27080, 27081, 27078, 27079, + 26984, 26983, 27078, 27081, + 26984, 27081, 27082, 26987, + 27080, 27083, 27082, 27081, + 27084, 27085, 27082, 27083, + 26988, 26987, 27082, 27085, + 26988, 27085, 27086, 26991, + 27084, 27087, 27086, 27085, + 27088, 27089, 27086, 27087, + 26992, 26991, 27086, 27089, + 26992, 27089, 27090, 26995, + 27088, 27091, 27090, 27089, + 27092, 27093, 27090, 27091, + 26996, 26995, 27090, 27093, + 17042, 17047, 27094, 26999, + 17046, 27095, 27094, 17047, + 27096, 27097, 27094, 27095, + 27000, 26999, 27094, 27097, + 27000, 27097, 27098, 27003, + 27096, 27099, 27098, 27097, + 27100, 27101, 27098, 27099, + 27004, 27003, 27098, 27101, + 27004, 27101, 27102, 27007, + 27100, 27103, 27102, 27101, + 27104, 27105, 27102, 27103, + 27008, 27007, 27102, 27105, + 27008, 27105, 27106, 27011, + 27104, 27107, 27106, 27105, + 27108, 27109, 27106, 27107, + 27012, 27011, 27106, 27109, + 27012, 27109, 27110, 27015, + 27108, 27111, 27110, 27109, + 27112, 27113, 27110, 27111, + 27016, 27015, 27110, 27113, + 27016, 27113, 27114, 27019, + 27112, 27115, 27114, 27113, + 27116, 27117, 27114, 27115, + 27020, 27019, 27114, 27117, + 27020, 27117, 27118, 27023, + 27116, 27119, 27118, 27117, + 27120, 27121, 27118, 27119, + 27024, 27023, 27118, 27121, + 27024, 27121, 27122, 27027, + 27120, 27123, 27122, 27121, + 27124, 27125, 27122, 27123, + 27028, 27027, 27122, 27125, + 27028, 27125, 27126, 27031, + 27124, 27127, 27126, 27125, + 27128, 27129, 27126, 27127, + 27032, 27031, 27126, 27129, + 27032, 27129, 27130, 27035, + 27128, 27131, 27130, 27129, + 27132, 27133, 27130, 27131, + 27036, 27035, 27130, 27133, + 27036, 27133, 27134, 27039, + 27132, 27135, 27134, 27133, + 27136, 27137, 27134, 27135, + 27040, 27039, 27134, 27137, + 27040, 27137, 27138, 27043, + 27136, 27139, 27138, 27137, + 27140, 27141, 27138, 27139, + 27044, 27043, 27138, 27141, + 27044, 27141, 27142, 27047, + 27140, 27143, 27142, 27141, + 27144, 27145, 27142, 27143, + 27048, 27047, 27142, 27145, + 27048, 27145, 27146, 27051, + 27144, 27147, 27146, 27145, + 27148, 27149, 27146, 27147, + 27052, 27051, 27146, 27149, + 27052, 27149, 27150, 27055, + 27148, 27151, 27150, 27149, + 27152, 27153, 27150, 27151, + 27056, 27055, 27150, 27153, + 27056, 27153, 27154, 27059, + 27152, 27155, 27154, 27153, + 27156, 27157, 27154, 27155, + 27060, 27059, 27154, 27157, + 27060, 27157, 27158, 27063, + 27156, 27159, 27158, 27157, + 27160, 27161, 27158, 27159, + 27064, 27063, 27158, 27161, + 27064, 27161, 27162, 27067, + 27160, 27163, 27162, 27161, + 27164, 27165, 27162, 27163, + 27068, 27067, 27162, 27165, + 27068, 27165, 27166, 27071, + 27164, 27167, 27166, 27165, + 27168, 27169, 27166, 27167, + 27072, 27071, 27166, 27169, + 27072, 27169, 27170, 27075, + 27168, 27171, 27170, 27169, + 27172, 27173, 27170, 27171, + 27076, 27075, 27170, 27173, + 27076, 27173, 27174, 27079, + 27172, 27175, 27174, 27173, + 27176, 27177, 27174, 27175, + 27080, 27079, 27174, 27177, + 27080, 27177, 27178, 27083, + 27176, 27179, 27178, 27177, + 27180, 27181, 27178, 27179, + 27084, 27083, 27178, 27181, + 27084, 27181, 27182, 27087, + 27180, 27183, 27182, 27181, + 27184, 27185, 27182, 27183, + 27088, 27087, 27182, 27185, + 27088, 27185, 27186, 27091, + 27184, 27187, 27186, 27185, + 27188, 27189, 27186, 27187, + 27092, 27091, 27186, 27189, + 17046, 17051, 27190, 27095, + 17050, 27191, 27190, 17051, + 27192, 27193, 27190, 27191, + 27096, 27095, 27190, 27193, + 27096, 27193, 27194, 27099, + 27192, 27195, 27194, 27193, + 27196, 27197, 27194, 27195, + 27100, 27099, 27194, 27197, + 27100, 27197, 27198, 27103, + 27196, 27199, 27198, 27197, + 27200, 27201, 27198, 27199, + 27104, 27103, 27198, 27201, + 27104, 27201, 27202, 27107, + 27200, 27203, 27202, 27201, + 27204, 27205, 27202, 27203, + 27108, 27107, 27202, 27205, + 27108, 27205, 27206, 27111, + 27204, 27207, 27206, 27205, + 27208, 27209, 27206, 27207, + 27112, 27111, 27206, 27209, + 27112, 27209, 27210, 27115, + 27208, 27211, 27210, 27209, + 27212, 27213, 27210, 27211, + 27116, 27115, 27210, 27213, + 27116, 27213, 27214, 27119, + 27212, 27215, 27214, 27213, + 27216, 27217, 27214, 27215, + 27120, 27119, 27214, 27217, + 27120, 27217, 27218, 27123, + 27216, 27219, 27218, 27217, + 27220, 27221, 27218, 27219, + 27124, 27123, 27218, 27221, + 27124, 27221, 27222, 27127, + 27220, 27223, 27222, 27221, + 27224, 27225, 27222, 27223, + 27128, 27127, 27222, 27225, + 27128, 27225, 27226, 27131, + 27224, 27227, 27226, 27225, + 27228, 27229, 27226, 27227, + 27132, 27131, 27226, 27229, + 27132, 27229, 27230, 27135, + 27228, 27231, 27230, 27229, + 27232, 27233, 27230, 27231, + 27136, 27135, 27230, 27233, + 27136, 27233, 27234, 27139, + 27232, 27235, 27234, 27233, + 27236, 27237, 27234, 27235, + 27140, 27139, 27234, 27237, + 27140, 27237, 27238, 27143, + 27236, 27239, 27238, 27237, + 27240, 27241, 27238, 27239, + 27144, 27143, 27238, 27241, + 27144, 27241, 27242, 27147, + 27240, 27243, 27242, 27241, + 27244, 27245, 27242, 27243, + 27148, 27147, 27242, 27245, + 27148, 27245, 27246, 27151, + 27244, 27247, 27246, 27245, + 27248, 27249, 27246, 27247, + 27152, 27151, 27246, 27249, + 27152, 27249, 27250, 27155, + 27248, 27251, 27250, 27249, + 27252, 27253, 27250, 27251, + 27156, 27155, 27250, 27253, + 27156, 27253, 27254, 27159, + 27252, 27255, 27254, 27253, + 27256, 27257, 27254, 27255, + 27160, 27159, 27254, 27257, + 27160, 27257, 27258, 27163, + 27256, 27259, 27258, 27257, + 27260, 27261, 27258, 27259, + 27164, 27163, 27258, 27261, + 27164, 27261, 27262, 27167, + 27260, 27263, 27262, 27261, + 27264, 27265, 27262, 27263, + 27168, 27167, 27262, 27265, + 27168, 27265, 27266, 27171, + 27264, 27267, 27266, 27265, + 27268, 27269, 27266, 27267, + 27172, 27171, 27266, 27269, + 27172, 27269, 27270, 27175, + 27268, 27271, 27270, 27269, + 27272, 27273, 27270, 27271, + 27176, 27175, 27270, 27273, + 27176, 27273, 27274, 27179, + 27272, 27275, 27274, 27273, + 27276, 27277, 27274, 27275, + 27180, 27179, 27274, 27277, + 27180, 27277, 27278, 27183, + 27276, 27279, 27278, 27277, + 27280, 27281, 27278, 27279, + 27184, 27183, 27278, 27281, + 27184, 27281, 27282, 27187, + 27280, 27283, 27282, 27281, + 27284, 27285, 27282, 27283, + 27188, 27187, 27282, 27285, + 17050, 17055, 27286, 27191, + 17054, 27287, 27286, 17055, + 27288, 27289, 27286, 27287, + 27192, 27191, 27286, 27289, + 27192, 27289, 27290, 27195, + 27288, 27291, 27290, 27289, + 27292, 27293, 27290, 27291, + 27196, 27195, 27290, 27293, + 27196, 27293, 27294, 27199, + 27292, 27295, 27294, 27293, + 27296, 27297, 27294, 27295, + 27200, 27199, 27294, 27297, + 27200, 27297, 27298, 27203, + 27296, 27299, 27298, 27297, + 27300, 27301, 27298, 27299, + 27204, 27203, 27298, 27301, + 27204, 27301, 27302, 27207, + 27300, 27303, 27302, 27301, + 27304, 27305, 27302, 27303, + 27208, 27207, 27302, 27305, + 27208, 27305, 27306, 27211, + 27304, 27307, 27306, 27305, + 27308, 27309, 27306, 27307, + 27212, 27211, 27306, 27309, + 27212, 27309, 27310, 27215, + 27308, 27311, 27310, 27309, + 27312, 27313, 27310, 27311, + 27216, 27215, 27310, 27313, + 27216, 27313, 27314, 27219, + 27312, 27315, 27314, 27313, + 27316, 27317, 27314, 27315, + 27220, 27219, 27314, 27317, + 27220, 27317, 27318, 27223, + 27316, 27319, 27318, 27317, + 27320, 27321, 27318, 27319, + 27224, 27223, 27318, 27321, + 27224, 27321, 27322, 27227, + 27320, 27323, 27322, 27321, + 27324, 27325, 27322, 27323, + 27228, 27227, 27322, 27325, + 27228, 27325, 27326, 27231, + 27324, 27327, 27326, 27325, + 27328, 27329, 27326, 27327, + 27232, 27231, 27326, 27329, + 27232, 27329, 27330, 27235, + 27328, 27331, 27330, 27329, + 27332, 27333, 27330, 27331, + 27236, 27235, 27330, 27333, + 27236, 27333, 27334, 27239, + 27332, 27335, 27334, 27333, + 27336, 27337, 27334, 27335, + 27240, 27239, 27334, 27337, + 27240, 27337, 27338, 27243, + 27336, 27339, 27338, 27337, + 27340, 27341, 27338, 27339, + 27244, 27243, 27338, 27341, + 27244, 27341, 27342, 27247, + 27340, 27343, 27342, 27341, + 27344, 27345, 27342, 27343, + 27248, 27247, 27342, 27345, + 27248, 27345, 27346, 27251, + 27344, 27347, 27346, 27345, + 27348, 27349, 27346, 27347, + 27252, 27251, 27346, 27349, + 27252, 27349, 27350, 27255, + 27348, 27351, 27350, 27349, + 27352, 27353, 27350, 27351, + 27256, 27255, 27350, 27353, + 27256, 27353, 27354, 27259, + 27352, 27355, 27354, 27353, + 27356, 27357, 27354, 27355, + 27260, 27259, 27354, 27357, + 27260, 27357, 27358, 27263, + 27356, 27359, 27358, 27357, + 27360, 27361, 27358, 27359, + 27264, 27263, 27358, 27361, + 27264, 27361, 27362, 27267, + 27360, 27363, 27362, 27361, + 27364, 27365, 27362, 27363, + 27268, 27267, 27362, 27365, + 27268, 27365, 27366, 27271, + 27364, 27367, 27366, 27365, + 27368, 27369, 27366, 27367, + 27272, 27271, 27366, 27369, + 27272, 27369, 27370, 27275, + 27368, 27371, 27370, 27369, + 27372, 27373, 27370, 27371, + 27276, 27275, 27370, 27373, + 27276, 27373, 27374, 27279, + 27372, 27375, 27374, 27373, + 27376, 27377, 27374, 27375, + 27280, 27279, 27374, 27377, + 27280, 27377, 27378, 27283, + 27376, 27379, 27378, 27377, + 27380, 27381, 27378, 27379, + 27284, 27283, 27378, 27381, + 17054, 17059, 27382, 27287, + 17058, 27383, 27382, 17059, + 27384, 27385, 27382, 27383, + 27288, 27287, 27382, 27385, + 27288, 27385, 27386, 27291, + 27384, 27387, 27386, 27385, + 27388, 27389, 27386, 27387, + 27292, 27291, 27386, 27389, + 27292, 27389, 27390, 27295, + 27388, 27391, 27390, 27389, + 27392, 27393, 27390, 27391, + 27296, 27295, 27390, 27393, + 27296, 27393, 27394, 27299, + 27392, 27395, 27394, 27393, + 27396, 27397, 27394, 27395, + 27300, 27299, 27394, 27397, + 27300, 27397, 27398, 27303, + 27396, 27399, 27398, 27397, + 27400, 27401, 27398, 27399, + 27304, 27303, 27398, 27401, + 27304, 27401, 27402, 27307, + 27400, 27403, 27402, 27401, + 27404, 27405, 27402, 27403, + 27308, 27307, 27402, 27405, + 27308, 27405, 27406, 27311, + 27404, 27407, 27406, 27405, + 27408, 27409, 27406, 27407, + 27312, 27311, 27406, 27409, + 27312, 27409, 27410, 27315, + 27408, 27411, 27410, 27409, + 27412, 27413, 27410, 27411, + 27316, 27315, 27410, 27413, + 27316, 27413, 27414, 27319, + 27412, 27415, 27414, 27413, + 27416, 27417, 27414, 27415, + 27320, 27319, 27414, 27417, + 27320, 27417, 27418, 27323, + 27416, 27419, 27418, 27417, + 27420, 27421, 27418, 27419, + 27324, 27323, 27418, 27421, + 27324, 27421, 27422, 27327, + 27420, 27423, 27422, 27421, + 27424, 27425, 27422, 27423, + 27328, 27327, 27422, 27425, + 27328, 27425, 27426, 27331, + 27424, 27427, 27426, 27425, + 27428, 27429, 27426, 27427, + 27332, 27331, 27426, 27429, + 27332, 27429, 27430, 27335, + 27428, 27431, 27430, 27429, + 27432, 27433, 27430, 27431, + 27336, 27335, 27430, 27433, + 27336, 27433, 27434, 27339, + 27432, 27435, 27434, 27433, + 27436, 27437, 27434, 27435, + 27340, 27339, 27434, 27437, + 27340, 27437, 27438, 27343, + 27436, 27439, 27438, 27437, + 27440, 27441, 27438, 27439, + 27344, 27343, 27438, 27441, + 27344, 27441, 27442, 27347, + 27440, 27443, 27442, 27441, + 27444, 27445, 27442, 27443, + 27348, 27347, 27442, 27445, + 27348, 27445, 27446, 27351, + 27444, 27447, 27446, 27445, + 27448, 27449, 27446, 27447, + 27352, 27351, 27446, 27449, + 27352, 27449, 27450, 27355, + 27448, 27451, 27450, 27449, + 27452, 27453, 27450, 27451, + 27356, 27355, 27450, 27453, + 27356, 27453, 27454, 27359, + 27452, 27455, 27454, 27453, + 27456, 27457, 27454, 27455, + 27360, 27359, 27454, 27457, + 27360, 27457, 27458, 27363, + 27456, 27459, 27458, 27457, + 27460, 27461, 27458, 27459, + 27364, 27363, 27458, 27461, + 27364, 27461, 27462, 27367, + 27460, 27463, 27462, 27461, + 27464, 27465, 27462, 27463, + 27368, 27367, 27462, 27465, + 27368, 27465, 27466, 27371, + 27464, 27467, 27466, 27465, + 27468, 27469, 27466, 27467, + 27372, 27371, 27466, 27469, + 27372, 27469, 27470, 27375, + 27468, 27471, 27470, 27469, + 27472, 27473, 27470, 27471, + 27376, 27375, 27470, 27473, + 27376, 27473, 27474, 27379, + 27472, 27475, 27474, 27473, + 27476, 27477, 27474, 27475, + 27380, 27379, 27474, 27477, + 17058, 17063, 27478, 27383, + 17062, 27479, 27478, 17063, + 27480, 27481, 27478, 27479, + 27384, 27383, 27478, 27481, + 27384, 27481, 27482, 27387, + 27480, 27483, 27482, 27481, + 27484, 27485, 27482, 27483, + 27388, 27387, 27482, 27485, + 27388, 27485, 27486, 27391, + 27484, 27487, 27486, 27485, + 27488, 27489, 27486, 27487, + 27392, 27391, 27486, 27489, + 27392, 27489, 27490, 27395, + 27488, 27491, 27490, 27489, + 27492, 27493, 27490, 27491, + 27396, 27395, 27490, 27493, + 27396, 27493, 27494, 27399, + 27492, 27495, 27494, 27493, + 27496, 27497, 27494, 27495, + 27400, 27399, 27494, 27497, + 27400, 27497, 27498, 27403, + 27496, 27499, 27498, 27497, + 27500, 27501, 27498, 27499, + 27404, 27403, 27498, 27501, + 27404, 27501, 27502, 27407, + 27500, 27503, 27502, 27501, + 27504, 27505, 27502, 27503, + 27408, 27407, 27502, 27505, + 27408, 27505, 27506, 27411, + 27504, 27507, 27506, 27505, + 27508, 27509, 27506, 27507, + 27412, 27411, 27506, 27509, + 27412, 27509, 27510, 27415, + 27508, 27511, 27510, 27509, + 27512, 27513, 27510, 27511, + 27416, 27415, 27510, 27513, + 27416, 27513, 27514, 27419, + 27512, 27515, 27514, 27513, + 27516, 27517, 27514, 27515, + 27420, 27419, 27514, 27517, + 27420, 27517, 27518, 27423, + 27516, 27519, 27518, 27517, + 27520, 27521, 27518, 27519, + 27424, 27423, 27518, 27521, + 27424, 27521, 27522, 27427, + 27520, 27523, 27522, 27521, + 27524, 27525, 27522, 27523, + 27428, 27427, 27522, 27525, + 27428, 27525, 27526, 27431, + 27524, 27527, 27526, 27525, + 27528, 27529, 27526, 27527, + 27432, 27431, 27526, 27529, + 27432, 27529, 27530, 27435, + 27528, 27531, 27530, 27529, + 27532, 27533, 27530, 27531, + 27436, 27435, 27530, 27533, + 27436, 27533, 27534, 27439, + 27532, 27535, 27534, 27533, + 27536, 27537, 27534, 27535, + 27440, 27439, 27534, 27537, + 27440, 27537, 27538, 27443, + 27536, 27539, 27538, 27537, + 27540, 27541, 27538, 27539, + 27444, 27443, 27538, 27541, + 27444, 27541, 27542, 27447, + 27540, 27543, 27542, 27541, + 27544, 27545, 27542, 27543, + 27448, 27447, 27542, 27545, + 27448, 27545, 27546, 27451, + 27544, 27547, 27546, 27545, + 27548, 27549, 27546, 27547, + 27452, 27451, 27546, 27549, + 27452, 27549, 27550, 27455, + 27548, 27551, 27550, 27549, + 27552, 27553, 27550, 27551, + 27456, 27455, 27550, 27553, + 27456, 27553, 27554, 27459, + 27552, 27555, 27554, 27553, + 27556, 27557, 27554, 27555, + 27460, 27459, 27554, 27557, + 27460, 27557, 27558, 27463, + 27556, 27559, 27558, 27557, + 27560, 27561, 27558, 27559, + 27464, 27463, 27558, 27561, + 27464, 27561, 27562, 27467, + 27560, 27563, 27562, 27561, + 27564, 27565, 27562, 27563, + 27468, 27467, 27562, 27565, + 27468, 27565, 27566, 27471, + 27564, 27567, 27566, 27565, + 27568, 27569, 27566, 27567, + 27472, 27471, 27566, 27569, + 27472, 27569, 27570, 27475, + 27568, 27571, 27570, 27569, + 27572, 27573, 27570, 27571, + 27476, 27475, 27570, 27573, + 17062, 17067, 27574, 27479, + 17066, 27575, 27574, 17067, + 27576, 27577, 27574, 27575, + 27480, 27479, 27574, 27577, + 27480, 27577, 27578, 27483, + 27576, 27579, 27578, 27577, + 27580, 27581, 27578, 27579, + 27484, 27483, 27578, 27581, + 27484, 27581, 27582, 27487, + 27580, 27583, 27582, 27581, + 27584, 27585, 27582, 27583, + 27488, 27487, 27582, 27585, + 27488, 27585, 27586, 27491, + 27584, 27587, 27586, 27585, + 27588, 27589, 27586, 27587, + 27492, 27491, 27586, 27589, + 27492, 27589, 27590, 27495, + 27588, 27591, 27590, 27589, + 27592, 27593, 27590, 27591, + 27496, 27495, 27590, 27593, + 27496, 27593, 27594, 27499, + 27592, 27595, 27594, 27593, + 27596, 27597, 27594, 27595, + 27500, 27499, 27594, 27597, + 27500, 27597, 27598, 27503, + 27596, 27599, 27598, 27597, + 27600, 27601, 27598, 27599, + 27504, 27503, 27598, 27601, + 27504, 27601, 27602, 27507, + 27600, 27603, 27602, 27601, + 27604, 27605, 27602, 27603, + 27508, 27507, 27602, 27605, + 27508, 27605, 27606, 27511, + 27604, 27607, 27606, 27605, + 27608, 27609, 27606, 27607, + 27512, 27511, 27606, 27609, + 27512, 27609, 27610, 27515, + 27608, 27611, 27610, 27609, + 27612, 27613, 27610, 27611, + 27516, 27515, 27610, 27613, + 27516, 27613, 27614, 27519, + 27612, 27615, 27614, 27613, + 27616, 27617, 27614, 27615, + 27520, 27519, 27614, 27617, + 27520, 27617, 27618, 27523, + 27616, 27619, 27618, 27617, + 27620, 27621, 27618, 27619, + 27524, 27523, 27618, 27621, + 27524, 27621, 27622, 27527, + 27620, 27623, 27622, 27621, + 27624, 27625, 27622, 27623, + 27528, 27527, 27622, 27625, + 27528, 27625, 27626, 27531, + 27624, 27627, 27626, 27625, + 27628, 27629, 27626, 27627, + 27532, 27531, 27626, 27629, + 27532, 27629, 27630, 27535, + 27628, 27631, 27630, 27629, + 27632, 27633, 27630, 27631, + 27536, 27535, 27630, 27633, + 27536, 27633, 27634, 27539, + 27632, 27635, 27634, 27633, + 27636, 27637, 27634, 27635, + 27540, 27539, 27634, 27637, + 27540, 27637, 27638, 27543, + 27636, 27639, 27638, 27637, + 27640, 27641, 27638, 27639, + 27544, 27543, 27638, 27641, + 27544, 27641, 27642, 27547, + 27640, 27643, 27642, 27641, + 27644, 27645, 27642, 27643, + 27548, 27547, 27642, 27645, + 27548, 27645, 27646, 27551, + 27644, 27647, 27646, 27645, + 27648, 27649, 27646, 27647, + 27552, 27551, 27646, 27649, + 27552, 27649, 27650, 27555, + 27648, 27651, 27650, 27649, + 27652, 27653, 27650, 27651, + 27556, 27555, 27650, 27653, + 27556, 27653, 27654, 27559, + 27652, 27655, 27654, 27653, + 27656, 27657, 27654, 27655, + 27560, 27559, 27654, 27657, + 27560, 27657, 27658, 27563, + 27656, 27659, 27658, 27657, + 27660, 27661, 27658, 27659, + 27564, 27563, 27658, 27661, + 27564, 27661, 27662, 27567, + 27660, 27663, 27662, 27661, + 27664, 27665, 27662, 27663, + 27568, 27567, 27662, 27665, + 27568, 27665, 27666, 27571, + 27664, 27667, 27666, 27665, + 27668, 27669, 27666, 27667, + 27572, 27571, 27666, 27669, + 17066, 17071, 27670, 27575, + 17070, 27671, 27670, 17071, + 27672, 27673, 27670, 27671, + 27576, 27575, 27670, 27673, + 27576, 27673, 27674, 27579, + 27672, 27675, 27674, 27673, + 27676, 27677, 27674, 27675, + 27580, 27579, 27674, 27677, + 27580, 27677, 27678, 27583, + 27676, 27679, 27678, 27677, + 27680, 27681, 27678, 27679, + 27584, 27583, 27678, 27681, + 27584, 27681, 27682, 27587, + 27680, 27683, 27682, 27681, + 27684, 27685, 27682, 27683, + 27588, 27587, 27682, 27685, + 27588, 27685, 27686, 27591, + 27684, 27687, 27686, 27685, + 27688, 27689, 27686, 27687, + 27592, 27591, 27686, 27689, + 27592, 27689, 27690, 27595, + 27688, 27691, 27690, 27689, + 27692, 27693, 27690, 27691, + 27596, 27595, 27690, 27693, + 27596, 27693, 27694, 27599, + 27692, 27695, 27694, 27693, + 27696, 27697, 27694, 27695, + 27600, 27599, 27694, 27697, + 27600, 27697, 27698, 27603, + 27696, 27699, 27698, 27697, + 27700, 27701, 27698, 27699, + 27604, 27603, 27698, 27701, + 27604, 27701, 27702, 27607, + 27700, 27703, 27702, 27701, + 27704, 27705, 27702, 27703, + 27608, 27607, 27702, 27705, + 27608, 27705, 27706, 27611, + 27704, 27707, 27706, 27705, + 27708, 27709, 27706, 27707, + 27612, 27611, 27706, 27709, + 27612, 27709, 27710, 27615, + 27708, 27711, 27710, 27709, + 27712, 27713, 27710, 27711, + 27616, 27615, 27710, 27713, + 27616, 27713, 27714, 27619, + 27712, 27715, 27714, 27713, + 27716, 27717, 27714, 27715, + 27620, 27619, 27714, 27717, + 27620, 27717, 27718, 27623, + 27716, 27719, 27718, 27717, + 27720, 27721, 27718, 27719, + 27624, 27623, 27718, 27721, + 27624, 27721, 27722, 27627, + 27720, 27723, 27722, 27721, + 27724, 27725, 27722, 27723, + 27628, 27627, 27722, 27725, + 27628, 27725, 27726, 27631, + 27724, 27727, 27726, 27725, + 27728, 27729, 27726, 27727, + 27632, 27631, 27726, 27729, + 27632, 27729, 27730, 27635, + 27728, 27731, 27730, 27729, + 27732, 27733, 27730, 27731, + 27636, 27635, 27730, 27733, + 27636, 27733, 27734, 27639, + 27732, 27735, 27734, 27733, + 27736, 27737, 27734, 27735, + 27640, 27639, 27734, 27737, + 27640, 27737, 27738, 27643, + 27736, 27739, 27738, 27737, + 27740, 27741, 27738, 27739, + 27644, 27643, 27738, 27741, + 27644, 27741, 27742, 27647, + 27740, 27743, 27742, 27741, + 27744, 27745, 27742, 27743, + 27648, 27647, 27742, 27745, + 27648, 27745, 27746, 27651, + 27744, 27747, 27746, 27745, + 27748, 27749, 27746, 27747, + 27652, 27651, 27746, 27749, + 27652, 27749, 27750, 27655, + 27748, 27751, 27750, 27749, + 27752, 27753, 27750, 27751, + 27656, 27655, 27750, 27753, + 27656, 27753, 27754, 27659, + 27752, 27755, 27754, 27753, + 27756, 27757, 27754, 27755, + 27660, 27659, 27754, 27757, + 27660, 27757, 27758, 27663, + 27756, 27759, 27758, 27757, + 27760, 27761, 27758, 27759, + 27664, 27663, 27758, 27761, + 27664, 27761, 27762, 27667, + 27760, 27763, 27762, 27761, + 27764, 27765, 27762, 27763, + 27668, 27667, 27762, 27765, + 17070, 17075, 27766, 27671, + 17074, 27767, 27766, 17075, + 27768, 27769, 27766, 27767, + 27672, 27671, 27766, 27769, + 27672, 27769, 27770, 27675, + 27768, 27771, 27770, 27769, + 27772, 27773, 27770, 27771, + 27676, 27675, 27770, 27773, + 27676, 27773, 27774, 27679, + 27772, 27775, 27774, 27773, + 27776, 27777, 27774, 27775, + 27680, 27679, 27774, 27777, + 27680, 27777, 27778, 27683, + 27776, 27779, 27778, 27777, + 27780, 27781, 27778, 27779, + 27684, 27683, 27778, 27781, + 27684, 27781, 27782, 27687, + 27780, 27783, 27782, 27781, + 27784, 27785, 27782, 27783, + 27688, 27687, 27782, 27785, + 27688, 27785, 27786, 27691, + 27784, 27787, 27786, 27785, + 27788, 27789, 27786, 27787, + 27692, 27691, 27786, 27789, + 27692, 27789, 27790, 27695, + 27788, 27791, 27790, 27789, + 27792, 27793, 27790, 27791, + 27696, 27695, 27790, 27793, + 27696, 27793, 27794, 27699, + 27792, 27795, 27794, 27793, + 27796, 27797, 27794, 27795, + 27700, 27699, 27794, 27797, + 27700, 27797, 27798, 27703, + 27796, 27799, 27798, 27797, + 27800, 27801, 27798, 27799, + 27704, 27703, 27798, 27801, + 27704, 27801, 27802, 27707, + 27800, 27803, 27802, 27801, + 27804, 27805, 27802, 27803, + 27708, 27707, 27802, 27805, + 27708, 27805, 27806, 27711, + 27804, 27807, 27806, 27805, + 27808, 27809, 27806, 27807, + 27712, 27711, 27806, 27809, + 27712, 27809, 27810, 27715, + 27808, 27811, 27810, 27809, + 27812, 27813, 27810, 27811, + 27716, 27715, 27810, 27813, + 27716, 27813, 27814, 27719, + 27812, 27815, 27814, 27813, + 27816, 27817, 27814, 27815, + 27720, 27719, 27814, 27817, + 27720, 27817, 27818, 27723, + 27816, 27819, 27818, 27817, + 27820, 27821, 27818, 27819, + 27724, 27723, 27818, 27821, + 27724, 27821, 27822, 27727, + 27820, 27823, 27822, 27821, + 27824, 27825, 27822, 27823, + 27728, 27727, 27822, 27825, + 27728, 27825, 27826, 27731, + 27824, 27827, 27826, 27825, + 27828, 27829, 27826, 27827, + 27732, 27731, 27826, 27829, + 27732, 27829, 27830, 27735, + 27828, 27831, 27830, 27829, + 27832, 27833, 27830, 27831, + 27736, 27735, 27830, 27833, + 27736, 27833, 27834, 27739, + 27832, 27835, 27834, 27833, + 27836, 27837, 27834, 27835, + 27740, 27739, 27834, 27837, + 27740, 27837, 27838, 27743, + 27836, 27839, 27838, 27837, + 27840, 27841, 27838, 27839, + 27744, 27743, 27838, 27841, + 27744, 27841, 27842, 27747, + 27840, 27843, 27842, 27841, + 27844, 27845, 27842, 27843, + 27748, 27747, 27842, 27845, + 27748, 27845, 27846, 27751, + 27844, 27847, 27846, 27845, + 27848, 27849, 27846, 27847, + 27752, 27751, 27846, 27849, + 27752, 27849, 27850, 27755, + 27848, 27851, 27850, 27849, + 27852, 27853, 27850, 27851, + 27756, 27755, 27850, 27853, + 27756, 27853, 27854, 27759, + 27852, 27855, 27854, 27853, + 27856, 27857, 27854, 27855, + 27760, 27759, 27854, 27857, + 27760, 27857, 27858, 27763, + 27856, 27859, 27858, 27857, + 27860, 27861, 27858, 27859, + 27764, 27763, 27858, 27861, + 17074, 17079, 27862, 27767, + 17078, 27863, 27862, 17079, + 27864, 27865, 27862, 27863, + 27768, 27767, 27862, 27865, + 27768, 27865, 27866, 27771, + 27864, 27867, 27866, 27865, + 27868, 27869, 27866, 27867, + 27772, 27771, 27866, 27869, + 27772, 27869, 27870, 27775, + 27868, 27871, 27870, 27869, + 27872, 27873, 27870, 27871, + 27776, 27775, 27870, 27873, + 27776, 27873, 27874, 27779, + 27872, 27875, 27874, 27873, + 27876, 27877, 27874, 27875, + 27780, 27779, 27874, 27877, + 27780, 27877, 27878, 27783, + 27876, 27879, 27878, 27877, + 27880, 27881, 27878, 27879, + 27784, 27783, 27878, 27881, + 27784, 27881, 27882, 27787, + 27880, 27883, 27882, 27881, + 27884, 27885, 27882, 27883, + 27788, 27787, 27882, 27885, + 27788, 27885, 27886, 27791, + 27884, 27887, 27886, 27885, + 27888, 27889, 27886, 27887, + 27792, 27791, 27886, 27889, + 27792, 27889, 27890, 27795, + 27888, 27891, 27890, 27889, + 27892, 27893, 27890, 27891, + 27796, 27795, 27890, 27893, + 27796, 27893, 27894, 27799, + 27892, 27895, 27894, 27893, + 27896, 27897, 27894, 27895, + 27800, 27799, 27894, 27897, + 27800, 27897, 27898, 27803, + 27896, 27899, 27898, 27897, + 27900, 27901, 27898, 27899, + 27804, 27803, 27898, 27901, + 27804, 27901, 27902, 27807, + 27900, 27903, 27902, 27901, + 27904, 27905, 27902, 27903, + 27808, 27807, 27902, 27905, + 27808, 27905, 27906, 27811, + 27904, 27907, 27906, 27905, + 27908, 27909, 27906, 27907, + 27812, 27811, 27906, 27909, + 27812, 27909, 27910, 27815, + 27908, 27911, 27910, 27909, + 27912, 27913, 27910, 27911, + 27816, 27815, 27910, 27913, + 27816, 27913, 27914, 27819, + 27912, 27915, 27914, 27913, + 27916, 27917, 27914, 27915, + 27820, 27819, 27914, 27917, + 27820, 27917, 27918, 27823, + 27916, 27919, 27918, 27917, + 27920, 27921, 27918, 27919, + 27824, 27823, 27918, 27921, + 27824, 27921, 27922, 27827, + 27920, 27923, 27922, 27921, + 27924, 27925, 27922, 27923, + 27828, 27827, 27922, 27925, + 27828, 27925, 27926, 27831, + 27924, 27927, 27926, 27925, + 27928, 27929, 27926, 27927, + 27832, 27831, 27926, 27929, + 27832, 27929, 27930, 27835, + 27928, 27931, 27930, 27929, + 27932, 27933, 27930, 27931, + 27836, 27835, 27930, 27933, + 27836, 27933, 27934, 27839, + 27932, 27935, 27934, 27933, + 27936, 27937, 27934, 27935, + 27840, 27839, 27934, 27937, + 27840, 27937, 27938, 27843, + 27936, 27939, 27938, 27937, + 27940, 27941, 27938, 27939, + 27844, 27843, 27938, 27941, + 27844, 27941, 27942, 27847, + 27940, 27943, 27942, 27941, + 27944, 27945, 27942, 27943, + 27848, 27847, 27942, 27945, + 27848, 27945, 27946, 27851, + 27944, 27947, 27946, 27945, + 27948, 27949, 27946, 27947, + 27852, 27851, 27946, 27949, + 27852, 27949, 27950, 27855, + 27948, 27951, 27950, 27949, + 27952, 27953, 27950, 27951, + 27856, 27855, 27950, 27953, + 27856, 27953, 27954, 27859, + 27952, 27955, 27954, 27953, + 27956, 27957, 27954, 27955, + 27860, 27859, 27954, 27957, + 17078, 17083, 27958, 27863, + 17082, 27959, 27958, 17083, + 27960, 27961, 27958, 27959, + 27864, 27863, 27958, 27961, + 27864, 27961, 27962, 27867, + 27960, 27963, 27962, 27961, + 27964, 27965, 27962, 27963, + 27868, 27867, 27962, 27965, + 27868, 27965, 27966, 27871, + 27964, 27967, 27966, 27965, + 27968, 27969, 27966, 27967, + 27872, 27871, 27966, 27969, + 27872, 27969, 27970, 27875, + 27968, 27971, 27970, 27969, + 27972, 27973, 27970, 27971, + 27876, 27875, 27970, 27973, + 27876, 27973, 27974, 27879, + 27972, 27975, 27974, 27973, + 27976, 27977, 27974, 27975, + 27880, 27879, 27974, 27977, + 27880, 27977, 27978, 27883, + 27976, 27979, 27978, 27977, + 27980, 27981, 27978, 27979, + 27884, 27883, 27978, 27981, + 27884, 27981, 27982, 27887, + 27980, 27983, 27982, 27981, + 27984, 27985, 27982, 27983, + 27888, 27887, 27982, 27985, + 27888, 27985, 27986, 27891, + 27984, 27987, 27986, 27985, + 27988, 27989, 27986, 27987, + 27892, 27891, 27986, 27989, + 27892, 27989, 27990, 27895, + 27988, 27991, 27990, 27989, + 27992, 27993, 27990, 27991, + 27896, 27895, 27990, 27993, + 27896, 27993, 27994, 27899, + 27992, 27995, 27994, 27993, + 27996, 27997, 27994, 27995, + 27900, 27899, 27994, 27997, + 27900, 27997, 27998, 27903, + 27996, 27999, 27998, 27997, + 28000, 28001, 27998, 27999, + 27904, 27903, 27998, 28001, + 27904, 28001, 28002, 27907, + 28000, 28003, 28002, 28001, + 28004, 28005, 28002, 28003, + 27908, 27907, 28002, 28005, + 27908, 28005, 28006, 27911, + 28004, 28007, 28006, 28005, + 28008, 28009, 28006, 28007, + 27912, 27911, 28006, 28009, + 27912, 28009, 28010, 27915, + 28008, 28011, 28010, 28009, + 28012, 28013, 28010, 28011, + 27916, 27915, 28010, 28013, + 27916, 28013, 28014, 27919, + 28012, 28015, 28014, 28013, + 28016, 28017, 28014, 28015, + 27920, 27919, 28014, 28017, + 27920, 28017, 28018, 27923, + 28016, 28019, 28018, 28017, + 28020, 28021, 28018, 28019, + 27924, 27923, 28018, 28021, + 27924, 28021, 28022, 27927, + 28020, 28023, 28022, 28021, + 28024, 28025, 28022, 28023, + 27928, 27927, 28022, 28025, + 27928, 28025, 28026, 27931, + 28024, 28027, 28026, 28025, + 28028, 28029, 28026, 28027, + 27932, 27931, 28026, 28029, + 27932, 28029, 28030, 27935, + 28028, 28031, 28030, 28029, + 28032, 28033, 28030, 28031, + 27936, 27935, 28030, 28033, + 27936, 28033, 28034, 27939, + 28032, 28035, 28034, 28033, + 28036, 28037, 28034, 28035, + 27940, 27939, 28034, 28037, + 27940, 28037, 28038, 27943, + 28036, 28039, 28038, 28037, + 28040, 28041, 28038, 28039, + 27944, 27943, 28038, 28041, + 27944, 28041, 28042, 27947, + 28040, 28043, 28042, 28041, + 28044, 28045, 28042, 28043, + 27948, 27947, 28042, 28045, + 27948, 28045, 28046, 27951, + 28044, 28047, 28046, 28045, + 28048, 28049, 28046, 28047, + 27952, 27951, 28046, 28049, + 27952, 28049, 28050, 27955, + 28048, 28051, 28050, 28049, + 28052, 28053, 28050, 28051, + 27956, 27955, 28050, 28053, + 17082, 17087, 28054, 27959, + 17086, 28055, 28054, 17087, + 28056, 28057, 28054, 28055, + 27960, 27959, 28054, 28057, + 27960, 28057, 28058, 27963, + 28056, 28059, 28058, 28057, + 28060, 28061, 28058, 28059, + 27964, 27963, 28058, 28061, + 27964, 28061, 28062, 27967, + 28060, 28063, 28062, 28061, + 28064, 28065, 28062, 28063, + 27968, 27967, 28062, 28065, + 27968, 28065, 28066, 27971, + 28064, 28067, 28066, 28065, + 28068, 28069, 28066, 28067, + 27972, 27971, 28066, 28069, + 27972, 28069, 28070, 27975, + 28068, 28071, 28070, 28069, + 28072, 28073, 28070, 28071, + 27976, 27975, 28070, 28073, + 27976, 28073, 28074, 27979, + 28072, 28075, 28074, 28073, + 28076, 28077, 28074, 28075, + 27980, 27979, 28074, 28077, + 27980, 28077, 28078, 27983, + 28076, 28079, 28078, 28077, + 28080, 28081, 28078, 28079, + 27984, 27983, 28078, 28081, + 27984, 28081, 28082, 27987, + 28080, 28083, 28082, 28081, + 28084, 28085, 28082, 28083, + 27988, 27987, 28082, 28085, + 27988, 28085, 28086, 27991, + 28084, 28087, 28086, 28085, + 28088, 28089, 28086, 28087, + 27992, 27991, 28086, 28089, + 27992, 28089, 28090, 27995, + 28088, 28091, 28090, 28089, + 28092, 28093, 28090, 28091, + 27996, 27995, 28090, 28093, + 27996, 28093, 28094, 27999, + 28092, 28095, 28094, 28093, + 28096, 28097, 28094, 28095, + 28000, 27999, 28094, 28097, + 28000, 28097, 28098, 28003, + 28096, 28099, 28098, 28097, + 28100, 28101, 28098, 28099, + 28004, 28003, 28098, 28101, + 28004, 28101, 28102, 28007, + 28100, 28103, 28102, 28101, + 28104, 28105, 28102, 28103, + 28008, 28007, 28102, 28105, + 28008, 28105, 28106, 28011, + 28104, 28107, 28106, 28105, + 28108, 28109, 28106, 28107, + 28012, 28011, 28106, 28109, + 28012, 28109, 28110, 28015, + 28108, 28111, 28110, 28109, + 28112, 28113, 28110, 28111, + 28016, 28015, 28110, 28113, + 28016, 28113, 28114, 28019, + 28112, 28115, 28114, 28113, + 28116, 28117, 28114, 28115, + 28020, 28019, 28114, 28117, + 28020, 28117, 28118, 28023, + 28116, 28119, 28118, 28117, + 28120, 28121, 28118, 28119, + 28024, 28023, 28118, 28121, + 28024, 28121, 28122, 28027, + 28120, 28123, 28122, 28121, + 28124, 28125, 28122, 28123, + 28028, 28027, 28122, 28125, + 28028, 28125, 28126, 28031, + 28124, 28127, 28126, 28125, + 28128, 28129, 28126, 28127, + 28032, 28031, 28126, 28129, + 28032, 28129, 28130, 28035, + 28128, 28131, 28130, 28129, + 28132, 28133, 28130, 28131, + 28036, 28035, 28130, 28133, + 28036, 28133, 28134, 28039, + 28132, 28135, 28134, 28133, + 28136, 28137, 28134, 28135, + 28040, 28039, 28134, 28137, + 28040, 28137, 28138, 28043, + 28136, 28139, 28138, 28137, + 28140, 28141, 28138, 28139, + 28044, 28043, 28138, 28141, + 28044, 28141, 28142, 28047, + 28140, 28143, 28142, 28141, + 28144, 28145, 28142, 28143, + 28048, 28047, 28142, 28145, + 28048, 28145, 28146, 28051, + 28144, 28147, 28146, 28145, + 28148, 28149, 28146, 28147, + 28052, 28051, 28146, 28149, + 17086, 17091, 28150, 28055, + 17090, 28151, 28150, 17091, + 28152, 28153, 28150, 28151, + 28056, 28055, 28150, 28153, + 28056, 28153, 28154, 28059, + 28152, 28155, 28154, 28153, + 28156, 28157, 28154, 28155, + 28060, 28059, 28154, 28157, + 28060, 28157, 28158, 28063, + 28156, 28159, 28158, 28157, + 28160, 28161, 28158, 28159, + 28064, 28063, 28158, 28161, + 28064, 28161, 28162, 28067, + 28160, 28163, 28162, 28161, + 28164, 28165, 28162, 28163, + 28068, 28067, 28162, 28165, + 28068, 28165, 28166, 28071, + 28164, 28167, 28166, 28165, + 28168, 28169, 28166, 28167, + 28072, 28071, 28166, 28169, + 28072, 28169, 28170, 28075, + 28168, 28171, 28170, 28169, + 28172, 28173, 28170, 28171, + 28076, 28075, 28170, 28173, + 28076, 28173, 28174, 28079, + 28172, 28175, 28174, 28173, + 28176, 28177, 28174, 28175, + 28080, 28079, 28174, 28177, + 28080, 28177, 28178, 28083, + 28176, 28179, 28178, 28177, + 28180, 28181, 28178, 28179, + 28084, 28083, 28178, 28181, + 28084, 28181, 28182, 28087, + 28180, 28183, 28182, 28181, + 28184, 28185, 28182, 28183, + 28088, 28087, 28182, 28185, + 28088, 28185, 28186, 28091, + 28184, 28187, 28186, 28185, + 28188, 28189, 28186, 28187, + 28092, 28091, 28186, 28189, + 28092, 28189, 28190, 28095, + 28188, 28191, 28190, 28189, + 28192, 28193, 28190, 28191, + 28096, 28095, 28190, 28193, + 28096, 28193, 28194, 28099, + 28192, 28195, 28194, 28193, + 28196, 28197, 28194, 28195, + 28100, 28099, 28194, 28197, + 28100, 28197, 28198, 28103, + 28196, 28199, 28198, 28197, + 28200, 28201, 28198, 28199, + 28104, 28103, 28198, 28201, + 28104, 28201, 28202, 28107, + 28200, 28203, 28202, 28201, + 28204, 28205, 28202, 28203, + 28108, 28107, 28202, 28205, + 28108, 28205, 28206, 28111, + 28204, 28207, 28206, 28205, + 28208, 28209, 28206, 28207, + 28112, 28111, 28206, 28209, + 28112, 28209, 28210, 28115, + 28208, 28211, 28210, 28209, + 28212, 28213, 28210, 28211, + 28116, 28115, 28210, 28213, + 28116, 28213, 28214, 28119, + 28212, 28215, 28214, 28213, + 28216, 28217, 28214, 28215, + 28120, 28119, 28214, 28217, + 28120, 28217, 28218, 28123, + 28216, 28219, 28218, 28217, + 28220, 28221, 28218, 28219, + 28124, 28123, 28218, 28221, + 28124, 28221, 28222, 28127, + 28220, 28223, 28222, 28221, + 28224, 28225, 28222, 28223, + 28128, 28127, 28222, 28225, + 28128, 28225, 28226, 28131, + 28224, 28227, 28226, 28225, + 28228, 28229, 28226, 28227, + 28132, 28131, 28226, 28229, + 28132, 28229, 28230, 28135, + 28228, 28231, 28230, 28229, + 28232, 28233, 28230, 28231, + 28136, 28135, 28230, 28233, + 28136, 28233, 28234, 28139, + 28232, 28235, 28234, 28233, + 28236, 28237, 28234, 28235, + 28140, 28139, 28234, 28237, + 28140, 28237, 28238, 28143, + 28236, 28239, 28238, 28237, + 28240, 28241, 28238, 28239, + 28144, 28143, 28238, 28241, + 28144, 28241, 28242, 28147, + 28240, 28243, 28242, 28241, + 28244, 28245, 28242, 28243, + 28148, 28147, 28242, 28245, + 17090, 17095, 28246, 28151, + 17094, 28247, 28246, 17095, + 28248, 28249, 28246, 28247, + 28152, 28151, 28246, 28249, + 28152, 28249, 28250, 28155, + 28248, 28251, 28250, 28249, + 28252, 28253, 28250, 28251, + 28156, 28155, 28250, 28253, + 28156, 28253, 28254, 28159, + 28252, 28255, 28254, 28253, + 28256, 28257, 28254, 28255, + 28160, 28159, 28254, 28257, + 28160, 28257, 28258, 28163, + 28256, 28259, 28258, 28257, + 28260, 28261, 28258, 28259, + 28164, 28163, 28258, 28261, + 28164, 28261, 28262, 28167, + 28260, 28263, 28262, 28261, + 28264, 28265, 28262, 28263, + 28168, 28167, 28262, 28265, + 28168, 28265, 28266, 28171, + 28264, 28267, 28266, 28265, + 28268, 28269, 28266, 28267, + 28172, 28171, 28266, 28269, + 28172, 28269, 28270, 28175, + 28268, 28271, 28270, 28269, + 28272, 28273, 28270, 28271, + 28176, 28175, 28270, 28273, + 28176, 28273, 28274, 28179, + 28272, 28275, 28274, 28273, + 28276, 28277, 28274, 28275, + 28180, 28179, 28274, 28277, + 28180, 28277, 28278, 28183, + 28276, 28279, 28278, 28277, + 28280, 28281, 28278, 28279, + 28184, 28183, 28278, 28281, + 28184, 28281, 28282, 28187, + 28280, 28283, 28282, 28281, + 28284, 28285, 28282, 28283, + 28188, 28187, 28282, 28285, + 28188, 28285, 28286, 28191, + 28284, 28287, 28286, 28285, + 28288, 28289, 28286, 28287, + 28192, 28191, 28286, 28289, + 28192, 28289, 28290, 28195, + 28288, 28291, 28290, 28289, + 28292, 28293, 28290, 28291, + 28196, 28195, 28290, 28293, + 28196, 28293, 28294, 28199, + 28292, 28295, 28294, 28293, + 28296, 28297, 28294, 28295, + 28200, 28199, 28294, 28297, + 28200, 28297, 28298, 28203, + 28296, 28299, 28298, 28297, + 28300, 28301, 28298, 28299, + 28204, 28203, 28298, 28301, + 28204, 28301, 28302, 28207, + 28300, 28303, 28302, 28301, + 28304, 28305, 28302, 28303, + 28208, 28207, 28302, 28305, + 28208, 28305, 28306, 28211, + 28304, 28307, 28306, 28305, + 28308, 28309, 28306, 28307, + 28212, 28211, 28306, 28309, + 28212, 28309, 28310, 28215, + 28308, 28311, 28310, 28309, + 28312, 28313, 28310, 28311, + 28216, 28215, 28310, 28313, + 28216, 28313, 28314, 28219, + 28312, 28315, 28314, 28313, + 28316, 28317, 28314, 28315, + 28220, 28219, 28314, 28317, + 28220, 28317, 28318, 28223, + 28316, 28319, 28318, 28317, + 28320, 28321, 28318, 28319, + 28224, 28223, 28318, 28321, + 28224, 28321, 28322, 28227, + 28320, 28323, 28322, 28321, + 28324, 28325, 28322, 28323, + 28228, 28227, 28322, 28325, + 28228, 28325, 28326, 28231, + 28324, 28327, 28326, 28325, + 28328, 28329, 28326, 28327, + 28232, 28231, 28326, 28329, + 28232, 28329, 28330, 28235, + 28328, 28331, 28330, 28329, + 28332, 28333, 28330, 28331, + 28236, 28235, 28330, 28333, + 28236, 28333, 28334, 28239, + 28332, 28335, 28334, 28333, + 28336, 28337, 28334, 28335, + 28240, 28239, 28334, 28337, + 28240, 28337, 28338, 28243, + 28336, 28339, 28338, 28337, + 28340, 28341, 28338, 28339, + 28244, 28243, 28338, 28341, + 17094, 17099, 28342, 28247, + 17098, 28343, 28342, 17099, + 28344, 28345, 28342, 28343, + 28248, 28247, 28342, 28345, + 28248, 28345, 28346, 28251, + 28344, 28347, 28346, 28345, + 28348, 28349, 28346, 28347, + 28252, 28251, 28346, 28349, + 28252, 28349, 28350, 28255, + 28348, 28351, 28350, 28349, + 28352, 28353, 28350, 28351, + 28256, 28255, 28350, 28353, + 28256, 28353, 28354, 28259, + 28352, 28355, 28354, 28353, + 28356, 28357, 28354, 28355, + 28260, 28259, 28354, 28357, + 28260, 28357, 28358, 28263, + 28356, 28359, 28358, 28357, + 28360, 28361, 28358, 28359, + 28264, 28263, 28358, 28361, + 28264, 28361, 28362, 28267, + 28360, 28363, 28362, 28361, + 28364, 28365, 28362, 28363, + 28268, 28267, 28362, 28365, + 28268, 28365, 28366, 28271, + 28364, 28367, 28366, 28365, + 28368, 28369, 28366, 28367, + 28272, 28271, 28366, 28369, + 28272, 28369, 28370, 28275, + 28368, 28371, 28370, 28369, + 28372, 28373, 28370, 28371, + 28276, 28275, 28370, 28373, + 28276, 28373, 28374, 28279, + 28372, 28375, 28374, 28373, + 28376, 28377, 28374, 28375, + 28280, 28279, 28374, 28377, + 28280, 28377, 28378, 28283, + 28376, 28379, 28378, 28377, + 28380, 28381, 28378, 28379, + 28284, 28283, 28378, 28381, + 28284, 28381, 28382, 28287, + 28380, 28383, 28382, 28381, + 28384, 28385, 28382, 28383, + 28288, 28287, 28382, 28385, + 28288, 28385, 28386, 28291, + 28384, 28387, 28386, 28385, + 28388, 28389, 28386, 28387, + 28292, 28291, 28386, 28389, + 28292, 28389, 28390, 28295, + 28388, 28391, 28390, 28389, + 28392, 28393, 28390, 28391, + 28296, 28295, 28390, 28393, + 28296, 28393, 28394, 28299, + 28392, 28395, 28394, 28393, + 28396, 28397, 28394, 28395, + 28300, 28299, 28394, 28397, + 28300, 28397, 28398, 28303, + 28396, 28399, 28398, 28397, + 28400, 28401, 28398, 28399, + 28304, 28303, 28398, 28401, + 28304, 28401, 28402, 28307, + 28400, 28403, 28402, 28401, + 28404, 28405, 28402, 28403, + 28308, 28307, 28402, 28405, + 28308, 28405, 28406, 28311, + 28404, 28407, 28406, 28405, + 28408, 28409, 28406, 28407, + 28312, 28311, 28406, 28409, + 28312, 28409, 28410, 28315, + 28408, 28411, 28410, 28409, + 28412, 28413, 28410, 28411, + 28316, 28315, 28410, 28413, + 28316, 28413, 28414, 28319, + 28412, 28415, 28414, 28413, + 28416, 28417, 28414, 28415, + 28320, 28319, 28414, 28417, + 28320, 28417, 28418, 28323, + 28416, 28419, 28418, 28417, + 28420, 28421, 28418, 28419, + 28324, 28323, 28418, 28421, + 28324, 28421, 28422, 28327, + 28420, 28423, 28422, 28421, + 28424, 28425, 28422, 28423, + 28328, 28327, 28422, 28425, + 28328, 28425, 28426, 28331, + 28424, 28427, 28426, 28425, + 28428, 28429, 28426, 28427, + 28332, 28331, 28426, 28429, + 28332, 28429, 28430, 28335, + 28428, 28431, 28430, 28429, + 28432, 28433, 28430, 28431, + 28336, 28335, 28430, 28433, + 28336, 28433, 28434, 28339, + 28432, 28435, 28434, 28433, + 28436, 28437, 28434, 28435, + 28340, 28339, 28434, 28437, + 17098, 17103, 28438, 28343, + 17102, 28439, 28438, 17103, + 28440, 28441, 28438, 28439, + 28344, 28343, 28438, 28441, + 28344, 28441, 28442, 28347, + 28440, 28443, 28442, 28441, + 28444, 28445, 28442, 28443, + 28348, 28347, 28442, 28445, + 28348, 28445, 28446, 28351, + 28444, 28447, 28446, 28445, + 28448, 28449, 28446, 28447, + 28352, 28351, 28446, 28449, + 28352, 28449, 28450, 28355, + 28448, 28451, 28450, 28449, + 28452, 28453, 28450, 28451, + 28356, 28355, 28450, 28453, + 28356, 28453, 28454, 28359, + 28452, 28455, 28454, 28453, + 28456, 28457, 28454, 28455, + 28360, 28359, 28454, 28457, + 28360, 28457, 28458, 28363, + 28456, 28459, 28458, 28457, + 28460, 28461, 28458, 28459, + 28364, 28363, 28458, 28461, + 28364, 28461, 28462, 28367, + 28460, 28463, 28462, 28461, + 28464, 28465, 28462, 28463, + 28368, 28367, 28462, 28465, + 28368, 28465, 28466, 28371, + 28464, 28467, 28466, 28465, + 28468, 28469, 28466, 28467, + 28372, 28371, 28466, 28469, + 28372, 28469, 28470, 28375, + 28468, 28471, 28470, 28469, + 28472, 28473, 28470, 28471, + 28376, 28375, 28470, 28473, + 28376, 28473, 28474, 28379, + 28472, 28475, 28474, 28473, + 28476, 28477, 28474, 28475, + 28380, 28379, 28474, 28477, + 28380, 28477, 28478, 28383, + 28476, 28479, 28478, 28477, + 28480, 28481, 28478, 28479, + 28384, 28383, 28478, 28481, + 28384, 28481, 28482, 28387, + 28480, 28483, 28482, 28481, + 28484, 28485, 28482, 28483, + 28388, 28387, 28482, 28485, + 28388, 28485, 28486, 28391, + 28484, 28487, 28486, 28485, + 28488, 28489, 28486, 28487, + 28392, 28391, 28486, 28489, + 28392, 28489, 28490, 28395, + 28488, 28491, 28490, 28489, + 28492, 28493, 28490, 28491, + 28396, 28395, 28490, 28493, + 28396, 28493, 28494, 28399, + 28492, 28495, 28494, 28493, + 28496, 28497, 28494, 28495, + 28400, 28399, 28494, 28497, + 28400, 28497, 28498, 28403, + 28496, 28499, 28498, 28497, + 28500, 28501, 28498, 28499, + 28404, 28403, 28498, 28501, + 28404, 28501, 28502, 28407, + 28500, 28503, 28502, 28501, + 28504, 28505, 28502, 28503, + 28408, 28407, 28502, 28505, + 28408, 28505, 28506, 28411, + 28504, 28507, 28506, 28505, + 28508, 28509, 28506, 28507, + 28412, 28411, 28506, 28509, + 28412, 28509, 28510, 28415, + 28508, 28511, 28510, 28509, + 28512, 28513, 28510, 28511, + 28416, 28415, 28510, 28513, + 28416, 28513, 28514, 28419, + 28512, 28515, 28514, 28513, + 28516, 28517, 28514, 28515, + 28420, 28419, 28514, 28517, + 28420, 28517, 28518, 28423, + 28516, 28519, 28518, 28517, + 28520, 28521, 28518, 28519, + 28424, 28423, 28518, 28521, + 28424, 28521, 28522, 28427, + 28520, 28523, 28522, 28521, + 28524, 28525, 28522, 28523, + 28428, 28427, 28522, 28525, + 28428, 28525, 28526, 28431, + 28524, 28527, 28526, 28525, + 28528, 28529, 28526, 28527, + 28432, 28431, 28526, 28529, + 28432, 28529, 28530, 28435, + 28528, 28531, 28530, 28529, + 28532, 28533, 28530, 28531, + 28436, 28435, 28530, 28533, + 17102, 17107, 28534, 28439, + 17106, 28535, 28534, 17107, + 28536, 28537, 28534, 28535, + 28440, 28439, 28534, 28537, + 28440, 28537, 28538, 28443, + 28536, 28539, 28538, 28537, + 28540, 28541, 28538, 28539, + 28444, 28443, 28538, 28541, + 28444, 28541, 28542, 28447, + 28540, 28543, 28542, 28541, + 28544, 28545, 28542, 28543, + 28448, 28447, 28542, 28545, + 28448, 28545, 28546, 28451, + 28544, 28547, 28546, 28545, + 28548, 28549, 28546, 28547, + 28452, 28451, 28546, 28549, + 28452, 28549, 28550, 28455, + 28548, 28551, 28550, 28549, + 28552, 28553, 28550, 28551, + 28456, 28455, 28550, 28553, + 28456, 28553, 28554, 28459, + 28552, 28555, 28554, 28553, + 28556, 28557, 28554, 28555, + 28460, 28459, 28554, 28557, + 28460, 28557, 28558, 28463, + 28556, 28559, 28558, 28557, + 28560, 28561, 28558, 28559, + 28464, 28463, 28558, 28561, + 28464, 28561, 28562, 28467, + 28560, 28563, 28562, 28561, + 28564, 28565, 28562, 28563, + 28468, 28467, 28562, 28565, + 28468, 28565, 28566, 28471, + 28564, 28567, 28566, 28565, + 28568, 28569, 28566, 28567, + 28472, 28471, 28566, 28569, + 28472, 28569, 28570, 28475, + 28568, 28571, 28570, 28569, + 28572, 28573, 28570, 28571, + 28476, 28475, 28570, 28573, + 28476, 28573, 28574, 28479, + 28572, 28575, 28574, 28573, + 28576, 28577, 28574, 28575, + 28480, 28479, 28574, 28577, + 28480, 28577, 28578, 28483, + 28576, 28579, 28578, 28577, + 28580, 28581, 28578, 28579, + 28484, 28483, 28578, 28581, + 28484, 28581, 28582, 28487, + 28580, 28583, 28582, 28581, + 28584, 28585, 28582, 28583, + 28488, 28487, 28582, 28585, + 28488, 28585, 28586, 28491, + 28584, 28587, 28586, 28585, + 28588, 28589, 28586, 28587, + 28492, 28491, 28586, 28589, + 28492, 28589, 28590, 28495, + 28588, 28591, 28590, 28589, + 28592, 28593, 28590, 28591, + 28496, 28495, 28590, 28593, + 28496, 28593, 28594, 28499, + 28592, 28595, 28594, 28593, + 28596, 28597, 28594, 28595, + 28500, 28499, 28594, 28597, + 28500, 28597, 28598, 28503, + 28596, 28599, 28598, 28597, + 28600, 28601, 28598, 28599, + 28504, 28503, 28598, 28601, + 28504, 28601, 28602, 28507, + 28600, 28603, 28602, 28601, + 28604, 28605, 28602, 28603, + 28508, 28507, 28602, 28605, + 28508, 28605, 28606, 28511, + 28604, 28607, 28606, 28605, + 28608, 28609, 28606, 28607, + 28512, 28511, 28606, 28609, + 28512, 28609, 28610, 28515, + 28608, 28611, 28610, 28609, + 28612, 28613, 28610, 28611, + 28516, 28515, 28610, 28613, + 28516, 28613, 28614, 28519, + 28612, 28615, 28614, 28613, + 28616, 28617, 28614, 28615, + 28520, 28519, 28614, 28617, + 28520, 28617, 28618, 28523, + 28616, 28619, 28618, 28617, + 28620, 28621, 28618, 28619, + 28524, 28523, 28618, 28621, + 28524, 28621, 28622, 28527, + 28620, 28623, 28622, 28621, + 28624, 28625, 28622, 28623, + 28528, 28527, 28622, 28625, + 28528, 28625, 28626, 28531, + 28624, 28627, 28626, 28625, + 28628, 28629, 28626, 28627, + 28532, 28531, 28626, 28629, + 17106, 17111, 28630, 28535, + 17110, 28631, 28630, 17111, + 28632, 28633, 28630, 28631, + 28536, 28535, 28630, 28633, + 28536, 28633, 28634, 28539, + 28632, 28635, 28634, 28633, + 28636, 28637, 28634, 28635, + 28540, 28539, 28634, 28637, + 28540, 28637, 28638, 28543, + 28636, 28639, 28638, 28637, + 28640, 28641, 28638, 28639, + 28544, 28543, 28638, 28641, + 28544, 28641, 28642, 28547, + 28640, 28643, 28642, 28641, + 28644, 28645, 28642, 28643, + 28548, 28547, 28642, 28645, + 28548, 28645, 28646, 28551, + 28644, 28647, 28646, 28645, + 28648, 28649, 28646, 28647, + 28552, 28551, 28646, 28649, + 28552, 28649, 28650, 28555, + 28648, 28651, 28650, 28649, + 28652, 28653, 28650, 28651, + 28556, 28555, 28650, 28653, + 28556, 28653, 28654, 28559, + 28652, 28655, 28654, 28653, + 28656, 28657, 28654, 28655, + 28560, 28559, 28654, 28657, + 28560, 28657, 28658, 28563, + 28656, 28659, 28658, 28657, + 28660, 28661, 28658, 28659, + 28564, 28563, 28658, 28661, + 28564, 28661, 28662, 28567, + 28660, 28663, 28662, 28661, + 28664, 28665, 28662, 28663, + 28568, 28567, 28662, 28665, + 28568, 28665, 28666, 28571, + 28664, 28667, 28666, 28665, + 28668, 28669, 28666, 28667, + 28572, 28571, 28666, 28669, + 28572, 28669, 28670, 28575, + 28668, 28671, 28670, 28669, + 28672, 28673, 28670, 28671, + 28576, 28575, 28670, 28673, + 28576, 28673, 28674, 28579, + 28672, 28675, 28674, 28673, + 28676, 28677, 28674, 28675, + 28580, 28579, 28674, 28677, + 28580, 28677, 28678, 28583, + 28676, 28679, 28678, 28677, + 28680, 28681, 28678, 28679, + 28584, 28583, 28678, 28681, + 28584, 28681, 28682, 28587, + 28680, 28683, 28682, 28681, + 28684, 28685, 28682, 28683, + 28588, 28587, 28682, 28685, + 28588, 28685, 28686, 28591, + 28684, 28687, 28686, 28685, + 28688, 28689, 28686, 28687, + 28592, 28591, 28686, 28689, + 28592, 28689, 28690, 28595, + 28688, 28691, 28690, 28689, + 28692, 28693, 28690, 28691, + 28596, 28595, 28690, 28693, + 28596, 28693, 28694, 28599, + 28692, 28695, 28694, 28693, + 28696, 28697, 28694, 28695, + 28600, 28599, 28694, 28697, + 28600, 28697, 28698, 28603, + 28696, 28699, 28698, 28697, + 28700, 28701, 28698, 28699, + 28604, 28603, 28698, 28701, + 28604, 28701, 28702, 28607, + 28700, 28703, 28702, 28701, + 28704, 28705, 28702, 28703, + 28608, 28607, 28702, 28705, + 28608, 28705, 28706, 28611, + 28704, 28707, 28706, 28705, + 28708, 28709, 28706, 28707, + 28612, 28611, 28706, 28709, + 28612, 28709, 28710, 28615, + 28708, 28711, 28710, 28709, + 28712, 28713, 28710, 28711, + 28616, 28615, 28710, 28713, + 28616, 28713, 28714, 28619, + 28712, 28715, 28714, 28713, + 28716, 28717, 28714, 28715, + 28620, 28619, 28714, 28717, + 28620, 28717, 28718, 28623, + 28716, 28719, 28718, 28717, + 28720, 28721, 28718, 28719, + 28624, 28623, 28718, 28721, + 28624, 28721, 28722, 28627, + 28720, 28723, 28722, 28721, + 28724, 28725, 28722, 28723, + 28628, 28627, 28722, 28725, + 17110, 17115, 28726, 28631, + 17114, 28727, 28726, 17115, + 28728, 28729, 28726, 28727, + 28632, 28631, 28726, 28729, + 28632, 28729, 28730, 28635, + 28728, 28731, 28730, 28729, + 28732, 28733, 28730, 28731, + 28636, 28635, 28730, 28733, + 28636, 28733, 28734, 28639, + 28732, 28735, 28734, 28733, + 28736, 28737, 28734, 28735, + 28640, 28639, 28734, 28737, + 28640, 28737, 28738, 28643, + 28736, 28739, 28738, 28737, + 28740, 28741, 28738, 28739, + 28644, 28643, 28738, 28741, + 28644, 28741, 28742, 28647, + 28740, 28743, 28742, 28741, + 28744, 28745, 28742, 28743, + 28648, 28647, 28742, 28745, + 28648, 28745, 28746, 28651, + 28744, 28747, 28746, 28745, + 28748, 28749, 28746, 28747, + 28652, 28651, 28746, 28749, + 28652, 28749, 28750, 28655, + 28748, 28751, 28750, 28749, + 28752, 28753, 28750, 28751, + 28656, 28655, 28750, 28753, + 28656, 28753, 28754, 28659, + 28752, 28755, 28754, 28753, + 28756, 28757, 28754, 28755, + 28660, 28659, 28754, 28757, + 28660, 28757, 28758, 28663, + 28756, 28759, 28758, 28757, + 28760, 28761, 28758, 28759, + 28664, 28663, 28758, 28761, + 28664, 28761, 28762, 28667, + 28760, 28763, 28762, 28761, + 28764, 28765, 28762, 28763, + 28668, 28667, 28762, 28765, + 28668, 28765, 28766, 28671, + 28764, 28767, 28766, 28765, + 28768, 28769, 28766, 28767, + 28672, 28671, 28766, 28769, + 28672, 28769, 28770, 28675, + 28768, 28771, 28770, 28769, + 28772, 28773, 28770, 28771, + 28676, 28675, 28770, 28773, + 28676, 28773, 28774, 28679, + 28772, 28775, 28774, 28773, + 28776, 28777, 28774, 28775, + 28680, 28679, 28774, 28777, + 28680, 28777, 28778, 28683, + 28776, 28779, 28778, 28777, + 28780, 28781, 28778, 28779, + 28684, 28683, 28778, 28781, + 28684, 28781, 28782, 28687, + 28780, 28783, 28782, 28781, + 28784, 28785, 28782, 28783, + 28688, 28687, 28782, 28785, + 28688, 28785, 28786, 28691, + 28784, 28787, 28786, 28785, + 28788, 28789, 28786, 28787, + 28692, 28691, 28786, 28789, + 28692, 28789, 28790, 28695, + 28788, 28791, 28790, 28789, + 28792, 28793, 28790, 28791, + 28696, 28695, 28790, 28793, + 28696, 28793, 28794, 28699, + 28792, 28795, 28794, 28793, + 28796, 28797, 28794, 28795, + 28700, 28699, 28794, 28797, + 28700, 28797, 28798, 28703, + 28796, 28799, 28798, 28797, + 28800, 28801, 28798, 28799, + 28704, 28703, 28798, 28801, + 28704, 28801, 28802, 28707, + 28800, 28803, 28802, 28801, + 28804, 28805, 28802, 28803, + 28708, 28707, 28802, 28805, + 28708, 28805, 28806, 28711, + 28804, 28807, 28806, 28805, + 28808, 28809, 28806, 28807, + 28712, 28711, 28806, 28809, + 28712, 28809, 28810, 28715, + 28808, 28811, 28810, 28809, + 28812, 28813, 28810, 28811, + 28716, 28715, 28810, 28813, + 28716, 28813, 28814, 28719, + 28812, 28815, 28814, 28813, + 28816, 28817, 28814, 28815, + 28720, 28719, 28814, 28817, + 28720, 28817, 28818, 28723, + 28816, 28819, 28818, 28817, + 28820, 28821, 28818, 28819, + 28724, 28723, 28818, 28821, + 17114, 17119, 28822, 28727, + 17118, 28823, 28822, 17119, + 28824, 28825, 28822, 28823, + 28728, 28727, 28822, 28825, + 28728, 28825, 28826, 28731, + 28824, 28827, 28826, 28825, + 28828, 28829, 28826, 28827, + 28732, 28731, 28826, 28829, + 28732, 28829, 28830, 28735, + 28828, 28831, 28830, 28829, + 28832, 28833, 28830, 28831, + 28736, 28735, 28830, 28833, + 28736, 28833, 28834, 28739, + 28832, 28835, 28834, 28833, + 28836, 28837, 28834, 28835, + 28740, 28739, 28834, 28837, + 28740, 28837, 28838, 28743, + 28836, 28839, 28838, 28837, + 28840, 28841, 28838, 28839, + 28744, 28743, 28838, 28841, + 28744, 28841, 28842, 28747, + 28840, 28843, 28842, 28841, + 28844, 28845, 28842, 28843, + 28748, 28747, 28842, 28845, + 28748, 28845, 28846, 28751, + 28844, 28847, 28846, 28845, + 28848, 28849, 28846, 28847, + 28752, 28751, 28846, 28849, + 28752, 28849, 28850, 28755, + 28848, 28851, 28850, 28849, + 28852, 28853, 28850, 28851, + 28756, 28755, 28850, 28853, + 28756, 28853, 28854, 28759, + 28852, 28855, 28854, 28853, + 28856, 28857, 28854, 28855, + 28760, 28759, 28854, 28857, + 28760, 28857, 28858, 28763, + 28856, 28859, 28858, 28857, + 28860, 28861, 28858, 28859, + 28764, 28763, 28858, 28861, + 28764, 28861, 28862, 28767, + 28860, 28863, 28862, 28861, + 28864, 28865, 28862, 28863, + 28768, 28767, 28862, 28865, + 28768, 28865, 28866, 28771, + 28864, 28867, 28866, 28865, + 28868, 28869, 28866, 28867, + 28772, 28771, 28866, 28869, + 28772, 28869, 28870, 28775, + 28868, 28871, 28870, 28869, + 28872, 28873, 28870, 28871, + 28776, 28775, 28870, 28873, + 28776, 28873, 28874, 28779, + 28872, 28875, 28874, 28873, + 28876, 28877, 28874, 28875, + 28780, 28779, 28874, 28877, + 28780, 28877, 28878, 28783, + 28876, 28879, 28878, 28877, + 28880, 28881, 28878, 28879, + 28784, 28783, 28878, 28881, + 28784, 28881, 28882, 28787, + 28880, 28883, 28882, 28881, + 28884, 28885, 28882, 28883, + 28788, 28787, 28882, 28885, + 28788, 28885, 28886, 28791, + 28884, 28887, 28886, 28885, + 28888, 28889, 28886, 28887, + 28792, 28791, 28886, 28889, + 28792, 28889, 28890, 28795, + 28888, 28891, 28890, 28889, + 28892, 28893, 28890, 28891, + 28796, 28795, 28890, 28893, + 28796, 28893, 28894, 28799, + 28892, 28895, 28894, 28893, + 28896, 28897, 28894, 28895, + 28800, 28799, 28894, 28897, + 28800, 28897, 28898, 28803, + 28896, 28899, 28898, 28897, + 28900, 28901, 28898, 28899, + 28804, 28803, 28898, 28901, + 28804, 28901, 28902, 28807, + 28900, 28903, 28902, 28901, + 28904, 28905, 28902, 28903, + 28808, 28807, 28902, 28905, + 28808, 28905, 28906, 28811, + 28904, 28907, 28906, 28905, + 28908, 28909, 28906, 28907, + 28812, 28811, 28906, 28909, + 28812, 28909, 28910, 28815, + 28908, 28911, 28910, 28909, + 28912, 28913, 28910, 28911, + 28816, 28815, 28910, 28913, + 28816, 28913, 28914, 28819, + 28912, 28915, 28914, 28913, + 28916, 28917, 28914, 28915, + 28820, 28819, 28914, 28917, + 17118, 17123, 28918, 28823, + 17122, 28919, 28918, 17123, + 28920, 28921, 28918, 28919, + 28824, 28823, 28918, 28921, + 28824, 28921, 28922, 28827, + 28920, 28923, 28922, 28921, + 28924, 28925, 28922, 28923, + 28828, 28827, 28922, 28925, + 28828, 28925, 28926, 28831, + 28924, 28927, 28926, 28925, + 28928, 28929, 28926, 28927, + 28832, 28831, 28926, 28929, + 28832, 28929, 28930, 28835, + 28928, 28931, 28930, 28929, + 28932, 28933, 28930, 28931, + 28836, 28835, 28930, 28933, + 28836, 28933, 28934, 28839, + 28932, 28935, 28934, 28933, + 28936, 28937, 28934, 28935, + 28840, 28839, 28934, 28937, + 28840, 28937, 28938, 28843, + 28936, 28939, 28938, 28937, + 28940, 28941, 28938, 28939, + 28844, 28843, 28938, 28941, + 28844, 28941, 28942, 28847, + 28940, 28943, 28942, 28941, + 28944, 28945, 28942, 28943, + 28848, 28847, 28942, 28945, + 28848, 28945, 28946, 28851, + 28944, 28947, 28946, 28945, + 28948, 28949, 28946, 28947, + 28852, 28851, 28946, 28949, + 28852, 28949, 28950, 28855, + 28948, 28951, 28950, 28949, + 28952, 28953, 28950, 28951, + 28856, 28855, 28950, 28953, + 28856, 28953, 28954, 28859, + 28952, 28955, 28954, 28953, + 28956, 28957, 28954, 28955, + 28860, 28859, 28954, 28957, + 28860, 28957, 28958, 28863, + 28956, 28959, 28958, 28957, + 28960, 28961, 28958, 28959, + 28864, 28863, 28958, 28961, + 28864, 28961, 28962, 28867, + 28960, 28963, 28962, 28961, + 28964, 28965, 28962, 28963, + 28868, 28867, 28962, 28965, + 28868, 28965, 28966, 28871, + 28964, 28967, 28966, 28965, + 28968, 28969, 28966, 28967, + 28872, 28871, 28966, 28969, + 28872, 28969, 28970, 28875, + 28968, 28971, 28970, 28969, + 28972, 28973, 28970, 28971, + 28876, 28875, 28970, 28973, + 28876, 28973, 28974, 28879, + 28972, 28975, 28974, 28973, + 28976, 28977, 28974, 28975, + 28880, 28879, 28974, 28977, + 28880, 28977, 28978, 28883, + 28976, 28979, 28978, 28977, + 28980, 28981, 28978, 28979, + 28884, 28883, 28978, 28981, + 28884, 28981, 28982, 28887, + 28980, 28983, 28982, 28981, + 28984, 28985, 28982, 28983, + 28888, 28887, 28982, 28985, + 28888, 28985, 28986, 28891, + 28984, 28987, 28986, 28985, + 28988, 28989, 28986, 28987, + 28892, 28891, 28986, 28989, + 28892, 28989, 28990, 28895, + 28988, 28991, 28990, 28989, + 28992, 28993, 28990, 28991, + 28896, 28895, 28990, 28993, + 28896, 28993, 28994, 28899, + 28992, 28995, 28994, 28993, + 28996, 28997, 28994, 28995, + 28900, 28899, 28994, 28997, + 28900, 28997, 28998, 28903, + 28996, 28999, 28998, 28997, + 29000, 29001, 28998, 28999, + 28904, 28903, 28998, 29001, + 28904, 29001, 29002, 28907, + 29000, 29003, 29002, 29001, + 29004, 29005, 29002, 29003, + 28908, 28907, 29002, 29005, + 28908, 29005, 29006, 28911, + 29004, 29007, 29006, 29005, + 29008, 29009, 29006, 29007, + 28912, 28911, 29006, 29009, + 28912, 29009, 29010, 28915, + 29008, 29011, 29010, 29009, + 29012, 29013, 29010, 29011, + 28916, 28915, 29010, 29013, + 17122, 17127, 29014, 28919, + 17126, 29015, 29014, 17127, + 29016, 29017, 29014, 29015, + 28920, 28919, 29014, 29017, + 28920, 29017, 29018, 28923, + 29016, 29019, 29018, 29017, + 29020, 29021, 29018, 29019, + 28924, 28923, 29018, 29021, + 28924, 29021, 29022, 28927, + 29020, 29023, 29022, 29021, + 29024, 29025, 29022, 29023, + 28928, 28927, 29022, 29025, + 28928, 29025, 29026, 28931, + 29024, 29027, 29026, 29025, + 29028, 29029, 29026, 29027, + 28932, 28931, 29026, 29029, + 28932, 29029, 29030, 28935, + 29028, 29031, 29030, 29029, + 29032, 29033, 29030, 29031, + 28936, 28935, 29030, 29033, + 28936, 29033, 29034, 28939, + 29032, 29035, 29034, 29033, + 29036, 29037, 29034, 29035, + 28940, 28939, 29034, 29037, + 28940, 29037, 29038, 28943, + 29036, 29039, 29038, 29037, + 29040, 29041, 29038, 29039, + 28944, 28943, 29038, 29041, + 28944, 29041, 29042, 28947, + 29040, 29043, 29042, 29041, + 29044, 29045, 29042, 29043, + 28948, 28947, 29042, 29045, + 28948, 29045, 29046, 28951, + 29044, 29047, 29046, 29045, + 29048, 29049, 29046, 29047, + 28952, 28951, 29046, 29049, + 28952, 29049, 29050, 28955, + 29048, 29051, 29050, 29049, + 29052, 29053, 29050, 29051, + 28956, 28955, 29050, 29053, + 28956, 29053, 29054, 28959, + 29052, 29055, 29054, 29053, + 29056, 29057, 29054, 29055, + 28960, 28959, 29054, 29057, + 28960, 29057, 29058, 28963, + 29056, 29059, 29058, 29057, + 29060, 29061, 29058, 29059, + 28964, 28963, 29058, 29061, + 28964, 29061, 29062, 28967, + 29060, 29063, 29062, 29061, + 29064, 29065, 29062, 29063, + 28968, 28967, 29062, 29065, + 28968, 29065, 29066, 28971, + 29064, 29067, 29066, 29065, + 29068, 29069, 29066, 29067, + 28972, 28971, 29066, 29069, + 28972, 29069, 29070, 28975, + 29068, 29071, 29070, 29069, + 29072, 29073, 29070, 29071, + 28976, 28975, 29070, 29073, + 28976, 29073, 29074, 28979, + 29072, 29075, 29074, 29073, + 29076, 29077, 29074, 29075, + 28980, 28979, 29074, 29077, + 28980, 29077, 29078, 28983, + 29076, 29079, 29078, 29077, + 29080, 29081, 29078, 29079, + 28984, 28983, 29078, 29081, + 28984, 29081, 29082, 28987, + 29080, 29083, 29082, 29081, + 29084, 29085, 29082, 29083, + 28988, 28987, 29082, 29085, + 28988, 29085, 29086, 28991, + 29084, 29087, 29086, 29085, + 29088, 29089, 29086, 29087, + 28992, 28991, 29086, 29089, + 28992, 29089, 29090, 28995, + 29088, 29091, 29090, 29089, + 29092, 29093, 29090, 29091, + 28996, 28995, 29090, 29093, + 28996, 29093, 29094, 28999, + 29092, 29095, 29094, 29093, + 29096, 29097, 29094, 29095, + 29000, 28999, 29094, 29097, + 29000, 29097, 29098, 29003, + 29096, 29099, 29098, 29097, + 29100, 29101, 29098, 29099, + 29004, 29003, 29098, 29101, + 29004, 29101, 29102, 29007, + 29100, 29103, 29102, 29101, + 29104, 29105, 29102, 29103, + 29008, 29007, 29102, 29105, + 29008, 29105, 29106, 29011, + 29104, 29107, 29106, 29105, + 29108, 29109, 29106, 29107, + 29012, 29011, 29106, 29109, + 17126, 17131, 29110, 29015, + 17130, 29111, 29110, 17131, + 29112, 29113, 29110, 29111, + 29016, 29015, 29110, 29113, + 29016, 29113, 29114, 29019, + 29112, 29115, 29114, 29113, + 29116, 29117, 29114, 29115, + 29020, 29019, 29114, 29117, + 29020, 29117, 29118, 29023, + 29116, 29119, 29118, 29117, + 29120, 29121, 29118, 29119, + 29024, 29023, 29118, 29121, + 29024, 29121, 29122, 29027, + 29120, 29123, 29122, 29121, + 29124, 29125, 29122, 29123, + 29028, 29027, 29122, 29125, + 29028, 29125, 29126, 29031, + 29124, 29127, 29126, 29125, + 29128, 29129, 29126, 29127, + 29032, 29031, 29126, 29129, + 29032, 29129, 29130, 29035, + 29128, 29131, 29130, 29129, + 29132, 29133, 29130, 29131, + 29036, 29035, 29130, 29133, + 29036, 29133, 29134, 29039, + 29132, 29135, 29134, 29133, + 29136, 29137, 29134, 29135, + 29040, 29039, 29134, 29137, + 29040, 29137, 29138, 29043, + 29136, 29139, 29138, 29137, + 29140, 29141, 29138, 29139, + 29044, 29043, 29138, 29141, + 29044, 29141, 29142, 29047, + 29140, 29143, 29142, 29141, + 29144, 29145, 29142, 29143, + 29048, 29047, 29142, 29145, + 29048, 29145, 29146, 29051, + 29144, 29147, 29146, 29145, + 29148, 29149, 29146, 29147, + 29052, 29051, 29146, 29149, + 29052, 29149, 29150, 29055, + 29148, 29151, 29150, 29149, + 29152, 29153, 29150, 29151, + 29056, 29055, 29150, 29153, + 29056, 29153, 29154, 29059, + 29152, 29155, 29154, 29153, + 29156, 29157, 29154, 29155, + 29060, 29059, 29154, 29157, + 29060, 29157, 29158, 29063, + 29156, 29159, 29158, 29157, + 29160, 29161, 29158, 29159, + 29064, 29063, 29158, 29161, + 29064, 29161, 29162, 29067, + 29160, 29163, 29162, 29161, + 29164, 29165, 29162, 29163, + 29068, 29067, 29162, 29165, + 29068, 29165, 29166, 29071, + 29164, 29167, 29166, 29165, + 29168, 29169, 29166, 29167, + 29072, 29071, 29166, 29169, + 29072, 29169, 29170, 29075, + 29168, 29171, 29170, 29169, + 29172, 29173, 29170, 29171, + 29076, 29075, 29170, 29173, + 29076, 29173, 29174, 29079, + 29172, 29175, 29174, 29173, + 29176, 29177, 29174, 29175, + 29080, 29079, 29174, 29177, + 29080, 29177, 29178, 29083, + 29176, 29179, 29178, 29177, + 29180, 29181, 29178, 29179, + 29084, 29083, 29178, 29181, + 29084, 29181, 29182, 29087, + 29180, 29183, 29182, 29181, + 29184, 29185, 29182, 29183, + 29088, 29087, 29182, 29185, + 29088, 29185, 29186, 29091, + 29184, 29187, 29186, 29185, + 29188, 29189, 29186, 29187, + 29092, 29091, 29186, 29189, + 29092, 29189, 29190, 29095, + 29188, 29191, 29190, 29189, + 29192, 29193, 29190, 29191, + 29096, 29095, 29190, 29193, + 29096, 29193, 29194, 29099, + 29192, 29195, 29194, 29193, + 29196, 29197, 29194, 29195, + 29100, 29099, 29194, 29197, + 29100, 29197, 29198, 29103, + 29196, 29199, 29198, 29197, + 29200, 29201, 29198, 29199, + 29104, 29103, 29198, 29201, + 29104, 29201, 29202, 29107, + 29200, 29203, 29202, 29201, + 29204, 29205, 29202, 29203, + 29108, 29107, 29202, 29205, + 17130, 17135, 29206, 29111, + 17134, 29207, 29206, 17135, + 29208, 29209, 29206, 29207, + 29112, 29111, 29206, 29209, + 29112, 29209, 29210, 29115, + 29208, 29211, 29210, 29209, + 29212, 29213, 29210, 29211, + 29116, 29115, 29210, 29213, + 29116, 29213, 29214, 29119, + 29212, 29215, 29214, 29213, + 29216, 29217, 29214, 29215, + 29120, 29119, 29214, 29217, + 29120, 29217, 29218, 29123, + 29216, 29219, 29218, 29217, + 29220, 29221, 29218, 29219, + 29124, 29123, 29218, 29221, + 29124, 29221, 29222, 29127, + 29220, 29223, 29222, 29221, + 29224, 29225, 29222, 29223, + 29128, 29127, 29222, 29225, + 29128, 29225, 29226, 29131, + 29224, 29227, 29226, 29225, + 29228, 29229, 29226, 29227, + 29132, 29131, 29226, 29229, + 29132, 29229, 29230, 29135, + 29228, 29231, 29230, 29229, + 29232, 29233, 29230, 29231, + 29136, 29135, 29230, 29233, + 29136, 29233, 29234, 29139, + 29232, 29235, 29234, 29233, + 29236, 29237, 29234, 29235, + 29140, 29139, 29234, 29237, + 29140, 29237, 29238, 29143, + 29236, 29239, 29238, 29237, + 29240, 29241, 29238, 29239, + 29144, 29143, 29238, 29241, + 29144, 29241, 29242, 29147, + 29240, 29243, 29242, 29241, + 29244, 29245, 29242, 29243, + 29148, 29147, 29242, 29245, + 29148, 29245, 29246, 29151, + 29244, 29247, 29246, 29245, + 29248, 29249, 29246, 29247, + 29152, 29151, 29246, 29249, + 29152, 29249, 29250, 29155, + 29248, 29251, 29250, 29249, + 29252, 29253, 29250, 29251, + 29156, 29155, 29250, 29253, + 29156, 29253, 29254, 29159, + 29252, 29255, 29254, 29253, + 29256, 29257, 29254, 29255, + 29160, 29159, 29254, 29257, + 29160, 29257, 29258, 29163, + 29256, 29259, 29258, 29257, + 29260, 29261, 29258, 29259, + 29164, 29163, 29258, 29261, + 29164, 29261, 29262, 29167, + 29260, 29263, 29262, 29261, + 29264, 29265, 29262, 29263, + 29168, 29167, 29262, 29265, + 29168, 29265, 29266, 29171, + 29264, 29267, 29266, 29265, + 29268, 29269, 29266, 29267, + 29172, 29171, 29266, 29269, + 29172, 29269, 29270, 29175, + 29268, 29271, 29270, 29269, + 29272, 29273, 29270, 29271, + 29176, 29175, 29270, 29273, + 29176, 29273, 29274, 29179, + 29272, 29275, 29274, 29273, + 29276, 29277, 29274, 29275, + 29180, 29179, 29274, 29277, + 29180, 29277, 29278, 29183, + 29276, 29279, 29278, 29277, + 29280, 29281, 29278, 29279, + 29184, 29183, 29278, 29281, + 29184, 29281, 29282, 29187, + 29280, 29283, 29282, 29281, + 29284, 29285, 29282, 29283, + 29188, 29187, 29282, 29285, + 29188, 29285, 29286, 29191, + 29284, 29287, 29286, 29285, + 29288, 29289, 29286, 29287, + 29192, 29191, 29286, 29289, + 29192, 29289, 29290, 29195, + 29288, 29291, 29290, 29289, + 29292, 29293, 29290, 29291, + 29196, 29195, 29290, 29293, + 29196, 29293, 29294, 29199, + 29292, 29295, 29294, 29293, + 29296, 29297, 29294, 29295, + 29200, 29199, 29294, 29297, + 29200, 29297, 29298, 29203, + 29296, 29299, 29298, 29297, + 29300, 29301, 29298, 29299, + 29204, 29203, 29298, 29301, + 17134, 17139, 29302, 29207, + 17138, 29303, 29302, 17139, + 29304, 29305, 29302, 29303, + 29208, 29207, 29302, 29305, + 29208, 29305, 29306, 29211, + 29304, 29307, 29306, 29305, + 29308, 29309, 29306, 29307, + 29212, 29211, 29306, 29309, + 29212, 29309, 29310, 29215, + 29308, 29311, 29310, 29309, + 29312, 29313, 29310, 29311, + 29216, 29215, 29310, 29313, + 29216, 29313, 29314, 29219, + 29312, 29315, 29314, 29313, + 29316, 29317, 29314, 29315, + 29220, 29219, 29314, 29317, + 29220, 29317, 29318, 29223, + 29316, 29319, 29318, 29317, + 29320, 29321, 29318, 29319, + 29224, 29223, 29318, 29321, + 29224, 29321, 29322, 29227, + 29320, 29323, 29322, 29321, + 29324, 29325, 29322, 29323, + 29228, 29227, 29322, 29325, + 29228, 29325, 29326, 29231, + 29324, 29327, 29326, 29325, + 29328, 29329, 29326, 29327, + 29232, 29231, 29326, 29329, + 29232, 29329, 29330, 29235, + 29328, 29331, 29330, 29329, + 29332, 29333, 29330, 29331, + 29236, 29235, 29330, 29333, + 29236, 29333, 29334, 29239, + 29332, 29335, 29334, 29333, + 29336, 29337, 29334, 29335, + 29240, 29239, 29334, 29337, + 29240, 29337, 29338, 29243, + 29336, 29339, 29338, 29337, + 29340, 29341, 29338, 29339, + 29244, 29243, 29338, 29341, + 29244, 29341, 29342, 29247, + 29340, 29343, 29342, 29341, + 29344, 29345, 29342, 29343, + 29248, 29247, 29342, 29345, + 29248, 29345, 29346, 29251, + 29344, 29347, 29346, 29345, + 29348, 29349, 29346, 29347, + 29252, 29251, 29346, 29349, + 29252, 29349, 29350, 29255, + 29348, 29351, 29350, 29349, + 29352, 29353, 29350, 29351, + 29256, 29255, 29350, 29353, + 29256, 29353, 29354, 29259, + 29352, 29355, 29354, 29353, + 29356, 29357, 29354, 29355, + 29260, 29259, 29354, 29357, + 29260, 29357, 29358, 29263, + 29356, 29359, 29358, 29357, + 29360, 29361, 29358, 29359, + 29264, 29263, 29358, 29361, + 29264, 29361, 29362, 29267, + 29360, 29363, 29362, 29361, + 29364, 29365, 29362, 29363, + 29268, 29267, 29362, 29365, + 29268, 29365, 29366, 29271, + 29364, 29367, 29366, 29365, + 29368, 29369, 29366, 29367, + 29272, 29271, 29366, 29369, + 29272, 29369, 29370, 29275, + 29368, 29371, 29370, 29369, + 29372, 29373, 29370, 29371, + 29276, 29275, 29370, 29373, + 29276, 29373, 29374, 29279, + 29372, 29375, 29374, 29373, + 29376, 29377, 29374, 29375, + 29280, 29279, 29374, 29377, + 29280, 29377, 29378, 29283, + 29376, 29379, 29378, 29377, + 29380, 29381, 29378, 29379, + 29284, 29283, 29378, 29381, + 29284, 29381, 29382, 29287, + 29380, 29383, 29382, 29381, + 29384, 29385, 29382, 29383, + 29288, 29287, 29382, 29385, + 29288, 29385, 29386, 29291, + 29384, 29387, 29386, 29385, + 29388, 29389, 29386, 29387, + 29292, 29291, 29386, 29389, + 29292, 29389, 29390, 29295, + 29388, 29391, 29390, 29389, + 29392, 29393, 29390, 29391, + 29296, 29295, 29390, 29393, + 29296, 29393, 29394, 29299, + 29392, 29395, 29394, 29393, + 29396, 29397, 29394, 29395, + 29300, 29299, 29394, 29397, + 17138, 17143, 29398, 29303, + 17142, 29399, 29398, 17143, + 29400, 29401, 29398, 29399, + 29304, 29303, 29398, 29401, + 29304, 29401, 29402, 29307, + 29400, 29403, 29402, 29401, + 29404, 29405, 29402, 29403, + 29308, 29307, 29402, 29405, + 29308, 29405, 29406, 29311, + 29404, 29407, 29406, 29405, + 29408, 29409, 29406, 29407, + 29312, 29311, 29406, 29409, + 29312, 29409, 29410, 29315, + 29408, 29411, 29410, 29409, + 29412, 29413, 29410, 29411, + 29316, 29315, 29410, 29413, + 29316, 29413, 29414, 29319, + 29412, 29415, 29414, 29413, + 29416, 29417, 29414, 29415, + 29320, 29319, 29414, 29417, + 29320, 29417, 29418, 29323, + 29416, 29419, 29418, 29417, + 29420, 29421, 29418, 29419, + 29324, 29323, 29418, 29421, + 29324, 29421, 29422, 29327, + 29420, 29423, 29422, 29421, + 29424, 29425, 29422, 29423, + 29328, 29327, 29422, 29425, + 29328, 29425, 29426, 29331, + 29424, 29427, 29426, 29425, + 29428, 29429, 29426, 29427, + 29332, 29331, 29426, 29429, + 29332, 29429, 29430, 29335, + 29428, 29431, 29430, 29429, + 29432, 29433, 29430, 29431, + 29336, 29335, 29430, 29433, + 29336, 29433, 29434, 29339, + 29432, 29435, 29434, 29433, + 29436, 29437, 29434, 29435, + 29340, 29339, 29434, 29437, + 29340, 29437, 29438, 29343, + 29436, 29439, 29438, 29437, + 29440, 29441, 29438, 29439, + 29344, 29343, 29438, 29441, + 29344, 29441, 29442, 29347, + 29440, 29443, 29442, 29441, + 29444, 29445, 29442, 29443, + 29348, 29347, 29442, 29445, + 29348, 29445, 29446, 29351, + 29444, 29447, 29446, 29445, + 29448, 29449, 29446, 29447, + 29352, 29351, 29446, 29449, + 29352, 29449, 29450, 29355, + 29448, 29451, 29450, 29449, + 29452, 29453, 29450, 29451, + 29356, 29355, 29450, 29453, + 29356, 29453, 29454, 29359, + 29452, 29455, 29454, 29453, + 29456, 29457, 29454, 29455, + 29360, 29359, 29454, 29457, + 29360, 29457, 29458, 29363, + 29456, 29459, 29458, 29457, + 29460, 29461, 29458, 29459, + 29364, 29363, 29458, 29461, + 29364, 29461, 29462, 29367, + 29460, 29463, 29462, 29461, + 29464, 29465, 29462, 29463, + 29368, 29367, 29462, 29465, + 29368, 29465, 29466, 29371, + 29464, 29467, 29466, 29465, + 29468, 29469, 29466, 29467, + 29372, 29371, 29466, 29469, + 29372, 29469, 29470, 29375, + 29468, 29471, 29470, 29469, + 29472, 29473, 29470, 29471, + 29376, 29375, 29470, 29473, + 29376, 29473, 29474, 29379, + 29472, 29475, 29474, 29473, + 29476, 29477, 29474, 29475, + 29380, 29379, 29474, 29477, + 29380, 29477, 29478, 29383, + 29476, 29479, 29478, 29477, + 29480, 29481, 29478, 29479, + 29384, 29383, 29478, 29481, + 29384, 29481, 29482, 29387, + 29480, 29483, 29482, 29481, + 29484, 29485, 29482, 29483, + 29388, 29387, 29482, 29485, + 29388, 29485, 29486, 29391, + 29484, 29487, 29486, 29485, + 29488, 29489, 29486, 29487, + 29392, 29391, 29486, 29489, + 29392, 29489, 29490, 29395, + 29488, 29491, 29490, 29489, + 29492, 29493, 29490, 29491, + 29396, 29395, 29490, 29493, + 17142, 17147, 29494, 29399, + 17146, 29495, 29494, 17147, + 29496, 29497, 29494, 29495, + 29400, 29399, 29494, 29497, + 29400, 29497, 29498, 29403, + 29496, 29499, 29498, 29497, + 29500, 29501, 29498, 29499, + 29404, 29403, 29498, 29501, + 29404, 29501, 29502, 29407, + 29500, 29503, 29502, 29501, + 29504, 29505, 29502, 29503, + 29408, 29407, 29502, 29505, + 29408, 29505, 29506, 29411, + 29504, 29507, 29506, 29505, + 29508, 29509, 29506, 29507, + 29412, 29411, 29506, 29509, + 29412, 29509, 29510, 29415, + 29508, 29511, 29510, 29509, + 29512, 29513, 29510, 29511, + 29416, 29415, 29510, 29513, + 29416, 29513, 29514, 29419, + 29512, 29515, 29514, 29513, + 29516, 29517, 29514, 29515, + 29420, 29419, 29514, 29517, + 29420, 29517, 29518, 29423, + 29516, 29519, 29518, 29517, + 29520, 29521, 29518, 29519, + 29424, 29423, 29518, 29521, + 29424, 29521, 29522, 29427, + 29520, 29523, 29522, 29521, + 29524, 29525, 29522, 29523, + 29428, 29427, 29522, 29525, + 29428, 29525, 29526, 29431, + 29524, 29527, 29526, 29525, + 29528, 29529, 29526, 29527, + 29432, 29431, 29526, 29529, + 29432, 29529, 29530, 29435, + 29528, 29531, 29530, 29529, + 29532, 29533, 29530, 29531, + 29436, 29435, 29530, 29533, + 29436, 29533, 29534, 29439, + 29532, 29535, 29534, 29533, + 29536, 29537, 29534, 29535, + 29440, 29439, 29534, 29537, + 29440, 29537, 29538, 29443, + 29536, 29539, 29538, 29537, + 29540, 29541, 29538, 29539, + 29444, 29443, 29538, 29541, + 29444, 29541, 29542, 29447, + 29540, 29543, 29542, 29541, + 29544, 29545, 29542, 29543, + 29448, 29447, 29542, 29545, + 29448, 29545, 29546, 29451, + 29544, 29547, 29546, 29545, + 29548, 29549, 29546, 29547, + 29452, 29451, 29546, 29549, + 29452, 29549, 29550, 29455, + 29548, 29551, 29550, 29549, + 29552, 29553, 29550, 29551, + 29456, 29455, 29550, 29553, + 29456, 29553, 29554, 29459, + 29552, 29555, 29554, 29553, + 29556, 29557, 29554, 29555, + 29460, 29459, 29554, 29557, + 29460, 29557, 29558, 29463, + 29556, 29559, 29558, 29557, + 29560, 29561, 29558, 29559, + 29464, 29463, 29558, 29561, + 29464, 29561, 29562, 29467, + 29560, 29563, 29562, 29561, + 29564, 29565, 29562, 29563, + 29468, 29467, 29562, 29565, + 29468, 29565, 29566, 29471, + 29564, 29567, 29566, 29565, + 29568, 29569, 29566, 29567, + 29472, 29471, 29566, 29569, + 29472, 29569, 29570, 29475, + 29568, 29571, 29570, 29569, + 29572, 29573, 29570, 29571, + 29476, 29475, 29570, 29573, + 29476, 29573, 29574, 29479, + 29572, 29575, 29574, 29573, + 29576, 29577, 29574, 29575, + 29480, 29479, 29574, 29577, + 29480, 29577, 29578, 29483, + 29576, 29579, 29578, 29577, + 29580, 29581, 29578, 29579, + 29484, 29483, 29578, 29581, + 29484, 29581, 29582, 29487, + 29580, 29583, 29582, 29581, + 29584, 29585, 29582, 29583, + 29488, 29487, 29582, 29585, + 29488, 29585, 29586, 29491, + 29584, 29587, 29586, 29585, + 29588, 29589, 29586, 29587, + 29492, 29491, 29586, 29589, + 17146, 17151, 29590, 29495, + 17150, 29591, 29590, 17151, + 29592, 29593, 29590, 29591, + 29496, 29495, 29590, 29593, + 29496, 29593, 29594, 29499, + 29592, 29595, 29594, 29593, + 29596, 29597, 29594, 29595, + 29500, 29499, 29594, 29597, + 29500, 29597, 29598, 29503, + 29596, 29599, 29598, 29597, + 29600, 29601, 29598, 29599, + 29504, 29503, 29598, 29601, + 29504, 29601, 29602, 29507, + 29600, 29603, 29602, 29601, + 29604, 29605, 29602, 29603, + 29508, 29507, 29602, 29605, + 29508, 29605, 29606, 29511, + 29604, 29607, 29606, 29605, + 29608, 29609, 29606, 29607, + 29512, 29511, 29606, 29609, + 29512, 29609, 29610, 29515, + 29608, 29611, 29610, 29609, + 29612, 29613, 29610, 29611, + 29516, 29515, 29610, 29613, + 29516, 29613, 29614, 29519, + 29612, 29615, 29614, 29613, + 29616, 29617, 29614, 29615, + 29520, 29519, 29614, 29617, + 29520, 29617, 29618, 29523, + 29616, 29619, 29618, 29617, + 29620, 29621, 29618, 29619, + 29524, 29523, 29618, 29621, + 29524, 29621, 29622, 29527, + 29620, 29623, 29622, 29621, + 29624, 29625, 29622, 29623, + 29528, 29527, 29622, 29625, + 29528, 29625, 29626, 29531, + 29624, 29627, 29626, 29625, + 29628, 29629, 29626, 29627, + 29532, 29531, 29626, 29629, + 29532, 29629, 29630, 29535, + 29628, 29631, 29630, 29629, + 29632, 29633, 29630, 29631, + 29536, 29535, 29630, 29633, + 29536, 29633, 29634, 29539, + 29632, 29635, 29634, 29633, + 29636, 29637, 29634, 29635, + 29540, 29539, 29634, 29637, + 29540, 29637, 29638, 29543, + 29636, 29639, 29638, 29637, + 29640, 29641, 29638, 29639, + 29544, 29543, 29638, 29641, + 29544, 29641, 29642, 29547, + 29640, 29643, 29642, 29641, + 29644, 29645, 29642, 29643, + 29548, 29547, 29642, 29645, + 29548, 29645, 29646, 29551, + 29644, 29647, 29646, 29645, + 29648, 29649, 29646, 29647, + 29552, 29551, 29646, 29649, + 29552, 29649, 29650, 29555, + 29648, 29651, 29650, 29649, + 29652, 29653, 29650, 29651, + 29556, 29555, 29650, 29653, + 29556, 29653, 29654, 29559, + 29652, 29655, 29654, 29653, + 29656, 29657, 29654, 29655, + 29560, 29559, 29654, 29657, + 29560, 29657, 29658, 29563, + 29656, 29659, 29658, 29657, + 29660, 29661, 29658, 29659, + 29564, 29563, 29658, 29661, + 29564, 29661, 29662, 29567, + 29660, 29663, 29662, 29661, + 29664, 29665, 29662, 29663, + 29568, 29567, 29662, 29665, + 29568, 29665, 29666, 29571, + 29664, 29667, 29666, 29665, + 29668, 29669, 29666, 29667, + 29572, 29571, 29666, 29669, + 29572, 29669, 29670, 29575, + 29668, 29671, 29670, 29669, + 29672, 29673, 29670, 29671, + 29576, 29575, 29670, 29673, + 29576, 29673, 29674, 29579, + 29672, 29675, 29674, 29673, + 29676, 29677, 29674, 29675, + 29580, 29579, 29674, 29677, + 29580, 29677, 29678, 29583, + 29676, 29679, 29678, 29677, + 29680, 29681, 29678, 29679, + 29584, 29583, 29678, 29681, + 29584, 29681, 29682, 29587, + 29680, 29683, 29682, 29681, + 29684, 29685, 29682, 29683, + 29588, 29587, 29682, 29685, + 17150, 17155, 29686, 29591, + 17154, 29687, 29686, 17155, + 29688, 29689, 29686, 29687, + 29592, 29591, 29686, 29689, + 29592, 29689, 29690, 29595, + 29688, 29691, 29690, 29689, + 29692, 29693, 29690, 29691, + 29596, 29595, 29690, 29693, + 29596, 29693, 29694, 29599, + 29692, 29695, 29694, 29693, + 29696, 29697, 29694, 29695, + 29600, 29599, 29694, 29697, + 29600, 29697, 29698, 29603, + 29696, 29699, 29698, 29697, + 29700, 29701, 29698, 29699, + 29604, 29603, 29698, 29701, + 29604, 29701, 29702, 29607, + 29700, 29703, 29702, 29701, + 29704, 29705, 29702, 29703, + 29608, 29607, 29702, 29705, + 29608, 29705, 29706, 29611, + 29704, 29707, 29706, 29705, + 29708, 29709, 29706, 29707, + 29612, 29611, 29706, 29709, + 29612, 29709, 29710, 29615, + 29708, 29711, 29710, 29709, + 29712, 29713, 29710, 29711, + 29616, 29615, 29710, 29713, + 29616, 29713, 29714, 29619, + 29712, 29715, 29714, 29713, + 29716, 29717, 29714, 29715, + 29620, 29619, 29714, 29717, + 29620, 29717, 29718, 29623, + 29716, 29719, 29718, 29717, + 29720, 29721, 29718, 29719, + 29624, 29623, 29718, 29721, + 29624, 29721, 29722, 29627, + 29720, 29723, 29722, 29721, + 29724, 29725, 29722, 29723, + 29628, 29627, 29722, 29725, + 29628, 29725, 29726, 29631, + 29724, 29727, 29726, 29725, + 29728, 29729, 29726, 29727, + 29632, 29631, 29726, 29729, + 29632, 29729, 29730, 29635, + 29728, 29731, 29730, 29729, + 29732, 29733, 29730, 29731, + 29636, 29635, 29730, 29733, + 29636, 29733, 29734, 29639, + 29732, 29735, 29734, 29733, + 29736, 29737, 29734, 29735, + 29640, 29639, 29734, 29737, + 29640, 29737, 29738, 29643, + 29736, 29739, 29738, 29737, + 29740, 29741, 29738, 29739, + 29644, 29643, 29738, 29741, + 29644, 29741, 29742, 29647, + 29740, 29743, 29742, 29741, + 29744, 29745, 29742, 29743, + 29648, 29647, 29742, 29745, + 29648, 29745, 29746, 29651, + 29744, 29747, 29746, 29745, + 29748, 29749, 29746, 29747, + 29652, 29651, 29746, 29749, + 29652, 29749, 29750, 29655, + 29748, 29751, 29750, 29749, + 29752, 29753, 29750, 29751, + 29656, 29655, 29750, 29753, + 29656, 29753, 29754, 29659, + 29752, 29755, 29754, 29753, + 29756, 29757, 29754, 29755, + 29660, 29659, 29754, 29757, + 29660, 29757, 29758, 29663, + 29756, 29759, 29758, 29757, + 29760, 29761, 29758, 29759, + 29664, 29663, 29758, 29761, + 29664, 29761, 29762, 29667, + 29760, 29763, 29762, 29761, + 29764, 29765, 29762, 29763, + 29668, 29667, 29762, 29765, + 29668, 29765, 29766, 29671, + 29764, 29767, 29766, 29765, + 29768, 29769, 29766, 29767, + 29672, 29671, 29766, 29769, + 29672, 29769, 29770, 29675, + 29768, 29771, 29770, 29769, + 29772, 29773, 29770, 29771, + 29676, 29675, 29770, 29773, + 29676, 29773, 29774, 29679, + 29772, 29775, 29774, 29773, + 29776, 29777, 29774, 29775, + 29680, 29679, 29774, 29777, + 29680, 29777, 29778, 29683, + 29776, 29779, 29778, 29777, + 29780, 29781, 29778, 29779, + 29684, 29683, 29778, 29781, + 17154, 17157, 29782, 29687, + 16760, 20372, 29782, 17157, + 20371, 29783, 29782, 20372, + 29688, 29687, 29782, 29783, + 29688, 29783, 29784, 29691, + 20371, 20368, 29784, 29783, + 20367, 29785, 29784, 20368, + 29692, 29691, 29784, 29785, + 29692, 29785, 29786, 29695, + 20367, 20364, 29786, 29785, + 20363, 29787, 29786, 20364, + 29696, 29695, 29786, 29787, + 29696, 29787, 29788, 29699, + 20363, 20360, 29788, 29787, + 20359, 29789, 29788, 20360, + 29700, 29699, 29788, 29789, + 29700, 29789, 29790, 29703, + 20359, 20356, 29790, 29789, + 20355, 29791, 29790, 20356, + 29704, 29703, 29790, 29791, + 29704, 29791, 29792, 29707, + 20355, 20352, 29792, 29791, + 20351, 29793, 29792, 20352, + 29708, 29707, 29792, 29793, + 29708, 29793, 29794, 29711, + 20351, 20348, 29794, 29793, + 20347, 29795, 29794, 20348, + 29712, 29711, 29794, 29795, + 29712, 29795, 29796, 29715, + 20347, 20344, 29796, 29795, + 20343, 29797, 29796, 20344, + 29716, 29715, 29796, 29797, + 29716, 29797, 29798, 29719, + 20343, 20340, 29798, 29797, + 20339, 29799, 29798, 20340, + 29720, 29719, 29798, 29799, + 29720, 29799, 29800, 29723, + 20339, 20336, 29800, 29799, + 20335, 29801, 29800, 20336, + 29724, 29723, 29800, 29801, + 29724, 29801, 29802, 29727, + 20335, 20332, 29802, 29801, + 20331, 29803, 29802, 20332, + 29728, 29727, 29802, 29803, + 29728, 29803, 29804, 29731, + 20331, 20328, 29804, 29803, + 20327, 29805, 29804, 20328, + 29732, 29731, 29804, 29805, + 29732, 29805, 29806, 29735, + 20327, 20324, 29806, 29805, + 20323, 29807, 29806, 20324, + 29736, 29735, 29806, 29807, + 29736, 29807, 29808, 29739, + 20323, 20320, 29808, 29807, + 20319, 29809, 29808, 20320, + 29740, 29739, 29808, 29809, + 29740, 29809, 29810, 29743, + 20319, 20316, 29810, 29809, + 20315, 29811, 29810, 20316, + 29744, 29743, 29810, 29811, + 29744, 29811, 29812, 29747, + 20315, 20312, 29812, 29811, + 20311, 29813, 29812, 20312, + 29748, 29747, 29812, 29813, + 29748, 29813, 29814, 29751, + 20311, 20308, 29814, 29813, + 20307, 29815, 29814, 20308, + 29752, 29751, 29814, 29815, + 29752, 29815, 29816, 29755, + 20307, 20304, 29816, 29815, + 20303, 29817, 29816, 20304, + 29756, 29755, 29816, 29817, + 29756, 29817, 29818, 29759, + 20303, 20300, 29818, 29817, + 20299, 29819, 29818, 20300, + 29760, 29759, 29818, 29819, + 29760, 29819, 29820, 29763, + 20299, 20296, 29820, 29819, + 20295, 29821, 29820, 20296, + 29764, 29763, 29820, 29821, + 29764, 29821, 29822, 29767, + 20295, 20292, 29822, 29821, + 20291, 29823, 29822, 20292, + 29768, 29767, 29822, 29823, + 29768, 29823, 29824, 29771, + 20291, 20288, 29824, 29823, + 20287, 29825, 29824, 20288, + 29772, 29771, 29824, 29825, + 29772, 29825, 29826, 29775, + 20287, 20284, 29826, 29825, + 20283, 29827, 29826, 20284, + 29776, 29775, 29826, 29827, + 29776, 29827, 29828, 29779, + 20283, 20279, 29828, 29827, + 20278, 29829, 29828, 20279, + 29780, 29779, 29828, 29829 ; + + elem_ss1 = 18658, 18657, 18754, 18753, 18850, 18849, 18946, 18945, 19042, + 19041, 19138, 19137, 19234, 19233, 19330, 19329, 19426, 19425, 19522, + 19521, 19618, 19617, 19714, 19713, 19810, 19809, 19906, 19905, 20002, + 20001, 20098, 20097, 29695, 29696, 29599, 29600, 29503, 29504, 29407, + 29408, 29311, 29312, 29215, 29216, 29119, 29120, 29023, 29024, 28927, + 28928, 28831, 28832, 28735, 28736, 28639, 28640, 28543, 28544, 28447, + 28448, 28351, 28352, 28255, 28256, 28159, 28160, 28063, 28064, 27967, + 27968, 27871, 27872, 27775, 27776, 27679, 27680, 27583, 27584, 27487, + 27488, 27391, 27392, 27295, 27296, 27199, 27200, 27103, 27104, 27007, + 27008, 26911, 26912, 26815, 26816, 26719, 26720, 26623, 26624, 26527, + 26528, 26431, 26432, 26335, 26336, 26239, 26240, 26143, 26144, 26047, + 26048, 25951, 25952, 25855, 25856, 25759, 25760, 25663, 25664, 25567, + 25568, 25471, 25472, 25375, 25376, 25279, 25280, 25183, 25184, 25087, + 25088, 24991, 24992, 24895, 24896, 24799, 24800, 24703, 24704, 24607, + 24608, 24511, 24512, 24415, 24416, 24319, 24320, 24223, 24224, 24127, + 24128, 24031, 24032, 23935, 23936, 23839, 23840, 23743, 23744, 23647, + 23648, 23551, 23552, 23455, 23456, 23359, 23360, 23263, 23264, 23167, + 23168, 23071, 23072, 22975, 22976, 22879, 22880, 22783, 22784, 22687, + 22688, 22591, 22592, 22495, 22496, 22399, 22400, 22303, 22304, 22207, + 22208, 22111, 22112, 22015, 22016, 21919, 21920, 21823, 21824, 21727, + 21728, 21631, 21632, 21535, 21536, 21439, 21440, 21343, 21344, 21247, + 21248, 21151, 21152, 21055, 21056, 20959, 20960, 20863, 20864, 20767, + 20768, 20671, 20672, 20575, 20576, 20479, 20480, 20383, 20384, 20287, + 20288, 17026, 17025, 17122, 17121, 17218, 17217, 17314, 17313, 17410, + 17409, 17506, 17505, 17602, 17601, 17698, 17697, 17794, 17793, 17890, + 17889, 17986, 17985, 18082, 18081, 18178, 18177, 18274, 18273, 18370, + 18369, 18466, 18465, 18562, 18561 ; + + side_ss1 = 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, + 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, + 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, + 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, + 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, + 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, + 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, + 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, + 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, + 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, + 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, + 1, 4 ; + + dist_fact_ss1 = 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1 ; + + qa_records = + "CUBIT", + "15.2", + "11/06/2019", + "17:58:12" ; + + elem_map = 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, + 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, + 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, + 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, + 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, + 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, + 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, + 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, + 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, + 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, + 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, + 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, + 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, + 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, + 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, + 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, + 247, 248, 249, 250, 251, 252, 253, 254, 255, 256, 257, 258, 259, 260, + 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, + 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, + 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, + 303, 304, 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, 315, 316, + 317, 318, 319, 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, + 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, + 345, 346, 347, 348, 349, 350, 351, 352, 353, 354, 355, 356, 357, 358, + 359, 360, 361, 362, 363, 364, 365, 366, 367, 368, 369, 370, 371, 372, + 373, 374, 375, 376, 377, 378, 379, 380, 381, 382, 383, 384, 385, 386, + 387, 388, 389, 390, 391, 392, 393, 394, 395, 396, 397, 398, 399, 400, + 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, + 415, 416, 417, 418, 419, 420, 421, 422, 423, 424, 425, 426, 427, 428, + 429, 430, 431, 432, 433, 434, 435, 436, 437, 438, 439, 440, 441, 442, + 443, 444, 445, 446, 447, 448, 449, 450, 451, 452, 453, 454, 455, 456, + 457, 458, 459, 460, 461, 462, 463, 464, 465, 466, 467, 468, 469, 470, + 471, 472, 473, 474, 475, 476, 477, 478, 479, 480, 481, 482, 483, 484, + 485, 486, 487, 488, 489, 490, 491, 492, 493, 494, 495, 496, 497, 498, + 499, 500, 501, 502, 503, 504, 505, 506, 507, 508, 509, 510, 511, 512, + 513, 514, 515, 516, 517, 518, 519, 520, 521, 522, 523, 524, 525, 526, + 527, 528, 529, 530, 531, 532, 533, 534, 535, 536, 537, 538, 539, 540, + 541, 542, 543, 544, 545, 546, 547, 548, 549, 550, 551, 552, 553, 554, + 555, 556, 557, 558, 559, 560, 561, 562, 563, 564, 565, 566, 567, 568, + 569, 570, 571, 572, 573, 574, 575, 576, 577, 578, 579, 580, 581, 582, + 583, 584, 585, 586, 587, 588, 589, 590, 591, 592, 593, 594, 595, 596, + 597, 598, 599, 600, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, + 611, 612, 613, 614, 615, 616, 617, 618, 619, 620, 621, 622, 623, 624, + 625, 626, 627, 628, 629, 630, 631, 632, 633, 634, 635, 636, 637, 638, + 639, 640, 641, 642, 643, 644, 645, 646, 647, 648, 649, 650, 651, 652, + 653, 654, 655, 656, 657, 658, 659, 660, 661, 662, 663, 664, 665, 666, + 667, 668, 669, 670, 671, 672, 673, 674, 675, 676, 677, 678, 679, 680, + 681, 682, 683, 684, 685, 686, 687, 688, 689, 690, 691, 692, 693, 694, + 695, 696, 697, 698, 699, 700, 701, 702, 703, 704, 705, 706, 707, 708, + 709, 710, 711, 712, 713, 714, 715, 716, 717, 718, 719, 720, 721, 722, + 723, 724, 725, 726, 727, 728, 729, 730, 731, 732, 733, 734, 735, 736, + 737, 738, 739, 740, 741, 742, 743, 744, 745, 746, 747, 748, 749, 750, + 751, 752, 753, 754, 755, 756, 757, 758, 759, 760, 761, 762, 763, 764, + 765, 766, 767, 768, 769, 770, 771, 772, 773, 774, 775, 776, 777, 778, + 779, 780, 781, 782, 783, 784, 785, 786, 787, 788, 789, 790, 791, 792, + 793, 794, 795, 796, 797, 798, 799, 800, 801, 802, 803, 804, 805, 806, + 807, 808, 809, 810, 811, 812, 813, 814, 815, 816, 817, 818, 819, 820, + 821, 822, 823, 824, 825, 826, 827, 828, 829, 830, 831, 832, 833, 834, + 835, 836, 837, 838, 839, 840, 841, 842, 843, 844, 845, 846, 847, 848, + 849, 850, 851, 852, 853, 854, 855, 856, 857, 858, 859, 860, 861, 862, + 863, 864, 865, 866, 867, 868, 869, 870, 871, 872, 873, 874, 875, 876, + 877, 878, 879, 880, 881, 882, 883, 884, 885, 886, 887, 888, 889, 890, + 891, 892, 893, 894, 895, 896, 897, 898, 899, 900, 901, 902, 903, 904, + 905, 906, 907, 908, 909, 910, 911, 912, 913, 914, 915, 916, 917, 918, + 919, 920, 921, 922, 923, 924, 925, 926, 927, 928, 929, 930, 931, 932, + 933, 934, 935, 936, 937, 938, 939, 940, 941, 942, 943, 944, 945, 946, + 947, 948, 949, 950, 951, 952, 953, 954, 955, 956, 957, 958, 959, 960, + 961, 962, 963, 964, 965, 966, 967, 968, 969, 970, 971, 972, 973, 974, + 975, 976, 977, 978, 979, 980, 981, 982, 983, 984, 985, 986, 987, 988, + 989, 990, 991, 992, 993, 994, 995, 996, 997, 998, 999, 1000, 1001, 1002, + 1003, 1004, 1005, 1006, 1007, 1008, 1009, 1010, 1011, 1012, 1013, 1014, + 1015, 1016, 1017, 1018, 1019, 1020, 1021, 1022, 1023, 1024, 1025, 1026, + 1027, 1028, 1029, 1030, 1031, 1032, 1033, 1034, 1035, 1036, 1037, 1038, + 1039, 1040, 1041, 1042, 1043, 1044, 1045, 1046, 1047, 1048, 1049, 1050, + 1051, 1052, 1053, 1054, 1055, 1056, 1057, 1058, 1059, 1060, 1061, 1062, + 1063, 1064, 1065, 1066, 1067, 1068, 1069, 1070, 1071, 1072, 1073, 1074, + 1075, 1076, 1077, 1078, 1079, 1080, 1081, 1082, 1083, 1084, 1085, 1086, + 1087, 1088, 1089, 1090, 1091, 1092, 1093, 1094, 1095, 1096, 1097, 1098, + 1099, 1100, 1101, 1102, 1103, 1104, 1105, 1106, 1107, 1108, 1109, 1110, + 1111, 1112, 1113, 1114, 1115, 1116, 1117, 1118, 1119, 1120, 1121, 1122, + 1123, 1124, 1125, 1126, 1127, 1128, 1129, 1130, 1131, 1132, 1133, 1134, + 1135, 1136, 1137, 1138, 1139, 1140, 1141, 1142, 1143, 1144, 1145, 1146, + 1147, 1148, 1149, 1150, 1151, 1152, 1153, 1154, 1155, 1156, 1157, 1158, + 1159, 1160, 1161, 1162, 1163, 1164, 1165, 1166, 1167, 1168, 1169, 1170, + 1171, 1172, 1173, 1174, 1175, 1176, 1177, 1178, 1179, 1180, 1181, 1182, + 1183, 1184, 1185, 1186, 1187, 1188, 1189, 1190, 1191, 1192, 1193, 1194, + 1195, 1196, 1197, 1198, 1199, 1200, 1201, 1202, 1203, 1204, 1205, 1206, + 1207, 1208, 1209, 1210, 1211, 1212, 1213, 1214, 1215, 1216, 1217, 1218, + 1219, 1220, 1221, 1222, 1223, 1224, 1225, 1226, 1227, 1228, 1229, 1230, + 1231, 1232, 1233, 1234, 1235, 1236, 1237, 1238, 1239, 1240, 1241, 1242, + 1243, 1244, 1245, 1246, 1247, 1248, 1249, 1250, 1251, 1252, 1253, 1254, + 1255, 1256, 1257, 1258, 1259, 1260, 1261, 1262, 1263, 1264, 1265, 1266, + 1267, 1268, 1269, 1270, 1271, 1272, 1273, 1274, 1275, 1276, 1277, 1278, + 1279, 1280, 1281, 1282, 1283, 1284, 1285, 1286, 1287, 1288, 1289, 1290, + 1291, 1292, 1293, 1294, 1295, 1296, 1297, 1298, 1299, 1300, 1301, 1302, + 1303, 1304, 1305, 1306, 1307, 1308, 1309, 1310, 1311, 1312, 1313, 1314, + 1315, 1316, 1317, 1318, 1319, 1320, 1321, 1322, 1323, 1324, 1325, 1326, + 1327, 1328, 1329, 1330, 1331, 1332, 1333, 1334, 1335, 1336, 1337, 1338, + 1339, 1340, 1341, 1342, 1343, 1344, 1345, 1346, 1347, 1348, 1349, 1350, + 1351, 1352, 1353, 1354, 1355, 1356, 1357, 1358, 1359, 1360, 1361, 1362, + 1363, 1364, 1365, 1366, 1367, 1368, 1369, 1370, 1371, 1372, 1373, 1374, + 1375, 1376, 1377, 1378, 1379, 1380, 1381, 1382, 1383, 1384, 1385, 1386, + 1387, 1388, 1389, 1390, 1391, 1392, 1393, 1394, 1395, 1396, 1397, 1398, + 1399, 1400, 1401, 1402, 1403, 1404, 1405, 1406, 1407, 1408, 1409, 1410, + 1411, 1412, 1413, 1414, 1415, 1416, 1417, 1418, 1419, 1420, 1421, 1422, + 1423, 1424, 1425, 1426, 1427, 1428, 1429, 1430, 1431, 1432, 1433, 1434, + 1435, 1436, 1437, 1438, 1439, 1440, 1441, 1442, 1443, 1444, 1445, 1446, + 1447, 1448, 1449, 1450, 1451, 1452, 1453, 1454, 1455, 1456, 1457, 1458, + 1459, 1460, 1461, 1462, 1463, 1464, 1465, 1466, 1467, 1468, 1469, 1470, + 1471, 1472, 1473, 1474, 1475, 1476, 1477, 1478, 1479, 1480, 1481, 1482, + 1483, 1484, 1485, 1486, 1487, 1488, 1489, 1490, 1491, 1492, 1493, 1494, + 1495, 1496, 1497, 1498, 1499, 1500, 1501, 1502, 1503, 1504, 1505, 1506, + 1507, 1508, 1509, 1510, 1511, 1512, 1513, 1514, 1515, 1516, 1517, 1518, + 1519, 1520, 1521, 1522, 1523, 1524, 1525, 1526, 1527, 1528, 1529, 1530, + 1531, 1532, 1533, 1534, 1535, 1536, 1537, 1538, 1539, 1540, 1541, 1542, + 1543, 1544, 1545, 1546, 1547, 1548, 1549, 1550, 1551, 1552, 1553, 1554, + 1555, 1556, 1557, 1558, 1559, 1560, 1561, 1562, 1563, 1564, 1565, 1566, + 1567, 1568, 1569, 1570, 1571, 1572, 1573, 1574, 1575, 1576, 1577, 1578, + 1579, 1580, 1581, 1582, 1583, 1584, 1585, 1586, 1587, 1588, 1589, 1590, + 1591, 1592, 1593, 1594, 1595, 1596, 1597, 1598, 1599, 1600, 1601, 1602, + 1603, 1604, 1605, 1606, 1607, 1608, 1609, 1610, 1611, 1612, 1613, 1614, + 1615, 1616, 1617, 1618, 1619, 1620, 1621, 1622, 1623, 1624, 1625, 1626, + 1627, 1628, 1629, 1630, 1631, 1632, 1633, 1634, 1635, 1636, 1637, 1638, + 1639, 1640, 1641, 1642, 1643, 1644, 1645, 1646, 1647, 1648, 1649, 1650, + 1651, 1652, 1653, 1654, 1655, 1656, 1657, 1658, 1659, 1660, 1661, 1662, + 1663, 1664, 1665, 1666, 1667, 1668, 1669, 1670, 1671, 1672, 1673, 1674, + 1675, 1676, 1677, 1678, 1679, 1680, 1681, 1682, 1683, 1684, 1685, 1686, + 1687, 1688, 1689, 1690, 1691, 1692, 1693, 1694, 1695, 1696, 1697, 1698, + 1699, 1700, 1701, 1702, 1703, 1704, 1705, 1706, 1707, 1708, 1709, 1710, + 1711, 1712, 1713, 1714, 1715, 1716, 1717, 1718, 1719, 1720, 1721, 1722, + 1723, 1724, 1725, 1726, 1727, 1728, 1729, 1730, 1731, 1732, 1733, 1734, + 1735, 1736, 1737, 1738, 1739, 1740, 1741, 1742, 1743, 1744, 1745, 1746, + 1747, 1748, 1749, 1750, 1751, 1752, 1753, 1754, 1755, 1756, 1757, 1758, + 1759, 1760, 1761, 1762, 1763, 1764, 1765, 1766, 1767, 1768, 1769, 1770, + 1771, 1772, 1773, 1774, 1775, 1776, 1777, 1778, 1779, 1780, 1781, 1782, + 1783, 1784, 1785, 1786, 1787, 1788, 1789, 1790, 1791, 1792, 1793, 1794, + 1795, 1796, 1797, 1798, 1799, 1800, 1801, 1802, 1803, 1804, 1805, 1806, + 1807, 1808, 1809, 1810, 1811, 1812, 1813, 1814, 1815, 1816, 1817, 1818, + 1819, 1820, 1821, 1822, 1823, 1824, 1825, 1826, 1827, 1828, 1829, 1830, + 1831, 1832, 1833, 1834, 1835, 1836, 1837, 1838, 1839, 1840, 1841, 1842, + 1843, 1844, 1845, 1846, 1847, 1848, 1849, 1850, 1851, 1852, 1853, 1854, + 1855, 1856, 1857, 1858, 1859, 1860, 1861, 1862, 1863, 1864, 1865, 1866, + 1867, 1868, 1869, 1870, 1871, 1872, 1873, 1874, 1875, 1876, 1877, 1878, + 1879, 1880, 1881, 1882, 1883, 1884, 1885, 1886, 1887, 1888, 1889, 1890, + 1891, 1892, 1893, 1894, 1895, 1896, 1897, 1898, 1899, 1900, 1901, 1902, + 1903, 1904, 1905, 1906, 1907, 1908, 1909, 1910, 1911, 1912, 1913, 1914, + 1915, 1916, 1917, 1918, 1919, 1920, 1921, 1922, 1923, 1924, 1925, 1926, + 1927, 1928, 1929, 1930, 1931, 1932, 1933, 1934, 1935, 1936, 1937, 1938, + 1939, 1940, 1941, 1942, 1943, 1944, 1945, 1946, 1947, 1948, 1949, 1950, + 1951, 1952, 1953, 1954, 1955, 1956, 1957, 1958, 1959, 1960, 1961, 1962, + 1963, 1964, 1965, 1966, 1967, 1968, 1969, 1970, 1971, 1972, 1973, 1974, + 1975, 1976, 1977, 1978, 1979, 1980, 1981, 1982, 1983, 1984, 1985, 1986, + 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, + 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, + 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, + 2023, 2024, 2025, 2026, 2027, 2028, 2029, 2030, 2031, 2032, 2033, 2034, + 2035, 2036, 2037, 2038, 2039, 2040, 2041, 2042, 2043, 2044, 2045, 2046, + 2047, 2048, 2049, 2050, 2051, 2052, 2053, 2054, 2055, 2056, 2057, 2058, + 2059, 2060, 2061, 2062, 2063, 2064, 2065, 2066, 2067, 2068, 2069, 2070, + 2071, 2072, 2073, 2074, 2075, 2076, 2077, 2078, 2079, 2080, 2081, 2082, + 2083, 2084, 2085, 2086, 2087, 2088, 2089, 2090, 2091, 2092, 2093, 2094, + 2095, 2096, 2097, 2098, 2099, 2100, 2101, 2102, 2103, 2104, 2105, 2106, + 2107, 2108, 2109, 2110, 2111, 2112, 2113, 2114, 2115, 2116, 2117, 2118, + 2119, 2120, 2121, 2122, 2123, 2124, 2125, 2126, 2127, 2128, 2129, 2130, + 2131, 2132, 2133, 2134, 2135, 2136, 2137, 2138, 2139, 2140, 2141, 2142, + 2143, 2144, 2145, 2146, 2147, 2148, 2149, 2150, 2151, 2152, 2153, 2154, + 2155, 2156, 2157, 2158, 2159, 2160, 2161, 2162, 2163, 2164, 2165, 2166, + 2167, 2168, 2169, 2170, 2171, 2172, 2173, 2174, 2175, 2176, 2177, 2178, + 2179, 2180, 2181, 2182, 2183, 2184, 2185, 2186, 2187, 2188, 2189, 2190, + 2191, 2192, 2193, 2194, 2195, 2196, 2197, 2198, 2199, 2200, 2201, 2202, + 2203, 2204, 2205, 2206, 2207, 2208, 2209, 2210, 2211, 2212, 2213, 2214, + 2215, 2216, 2217, 2218, 2219, 2220, 2221, 2222, 2223, 2224, 2225, 2226, + 2227, 2228, 2229, 2230, 2231, 2232, 2233, 2234, 2235, 2236, 2237, 2238, + 2239, 2240, 2241, 2242, 2243, 2244, 2245, 2246, 2247, 2248, 2249, 2250, + 2251, 2252, 2253, 2254, 2255, 2256, 2257, 2258, 2259, 2260, 2261, 2262, + 2263, 2264, 2265, 2266, 2267, 2268, 2269, 2270, 2271, 2272, 2273, 2274, + 2275, 2276, 2277, 2278, 2279, 2280, 2281, 2282, 2283, 2284, 2285, 2286, + 2287, 2288, 2289, 2290, 2291, 2292, 2293, 2294, 2295, 2296, 2297, 2298, + 2299, 2300, 2301, 2302, 2303, 2304, 2305, 2306, 2307, 2308, 2309, 2310, + 2311, 2312, 2313, 2314, 2315, 2316, 2317, 2318, 2319, 2320, 2321, 2322, + 2323, 2324, 2325, 2326, 2327, 2328, 2329, 2330, 2331, 2332, 2333, 2334, + 2335, 2336, 2337, 2338, 2339, 2340, 2341, 2342, 2343, 2344, 2345, 2346, + 2347, 2348, 2349, 2350, 2351, 2352, 2353, 2354, 2355, 2356, 2357, 2358, + 2359, 2360, 2361, 2362, 2363, 2364, 2365, 2366, 2367, 2368, 2369, 2370, + 2371, 2372, 2373, 2374, 2375, 2376, 2377, 2378, 2379, 2380, 2381, 2382, + 2383, 2384, 2385, 2386, 2387, 2388, 2389, 2390, 2391, 2392, 2393, 2394, + 2395, 2396, 2397, 2398, 2399, 2400, 2401, 2402, 2403, 2404, 2405, 2406, + 2407, 2408, 2409, 2410, 2411, 2412, 2413, 2414, 2415, 2416, 2417, 2418, + 2419, 2420, 2421, 2422, 2423, 2424, 2425, 2426, 2427, 2428, 2429, 2430, + 2431, 2432, 2433, 2434, 2435, 2436, 2437, 2438, 2439, 2440, 2441, 2442, + 2443, 2444, 2445, 2446, 2447, 2448, 2449, 2450, 2451, 2452, 2453, 2454, + 2455, 2456, 2457, 2458, 2459, 2460, 2461, 2462, 2463, 2464, 2465, 2466, + 2467, 2468, 2469, 2470, 2471, 2472, 2473, 2474, 2475, 2476, 2477, 2478, + 2479, 2480, 2481, 2482, 2483, 2484, 2485, 2486, 2487, 2488, 2489, 2490, + 2491, 2492, 2493, 2494, 2495, 2496, 2497, 2498, 2499, 2500, 2501, 2502, + 2503, 2504, 2505, 2506, 2507, 2508, 2509, 2510, 2511, 2512, 2513, 2514, + 2515, 2516, 2517, 2518, 2519, 2520, 2521, 2522, 2523, 2524, 2525, 2526, + 2527, 2528, 2529, 2530, 2531, 2532, 2533, 2534, 2535, 2536, 2537, 2538, + 2539, 2540, 2541, 2542, 2543, 2544, 2545, 2546, 2547, 2548, 2549, 2550, + 2551, 2552, 2553, 2554, 2555, 2556, 2557, 2558, 2559, 2560, 2561, 2562, + 2563, 2564, 2565, 2566, 2567, 2568, 2569, 2570, 2571, 2572, 2573, 2574, + 2575, 2576, 2577, 2578, 2579, 2580, 2581, 2582, 2583, 2584, 2585, 2586, + 2587, 2588, 2589, 2590, 2591, 2592, 2593, 2594, 2595, 2596, 2597, 2598, + 2599, 2600, 2601, 2602, 2603, 2604, 2605, 2606, 2607, 2608, 2609, 2610, + 2611, 2612, 2613, 2614, 2615, 2616, 2617, 2618, 2619, 2620, 2621, 2622, + 2623, 2624, 2625, 2626, 2627, 2628, 2629, 2630, 2631, 2632, 2633, 2634, + 2635, 2636, 2637, 2638, 2639, 2640, 2641, 2642, 2643, 2644, 2645, 2646, + 2647, 2648, 2649, 2650, 2651, 2652, 2653, 2654, 2655, 2656, 2657, 2658, + 2659, 2660, 2661, 2662, 2663, 2664, 2665, 2666, 2667, 2668, 2669, 2670, + 2671, 2672, 2673, 2674, 2675, 2676, 2677, 2678, 2679, 2680, 2681, 2682, + 2683, 2684, 2685, 2686, 2687, 2688, 2689, 2690, 2691, 2692, 2693, 2694, + 2695, 2696, 2697, 2698, 2699, 2700, 2701, 2702, 2703, 2704, 2705, 2706, + 2707, 2708, 2709, 2710, 2711, 2712, 2713, 2714, 2715, 2716, 2717, 2718, + 2719, 2720, 2721, 2722, 2723, 2724, 2725, 2726, 2727, 2728, 2729, 2730, + 2731, 2732, 2733, 2734, 2735, 2736, 2737, 2738, 2739, 2740, 2741, 2742, + 2743, 2744, 2745, 2746, 2747, 2748, 2749, 2750, 2751, 2752, 2753, 2754, + 2755, 2756, 2757, 2758, 2759, 2760, 2761, 2762, 2763, 2764, 2765, 2766, + 2767, 2768, 2769, 2770, 2771, 2772, 2773, 2774, 2775, 2776, 2777, 2778, + 2779, 2780, 2781, 2782, 2783, 2784, 2785, 2786, 2787, 2788, 2789, 2790, + 2791, 2792, 2793, 2794, 2795, 2796, 2797, 2798, 2799, 2800, 2801, 2802, + 2803, 2804, 2805, 2806, 2807, 2808, 2809, 2810, 2811, 2812, 2813, 2814, + 2815, 2816, 2817, 2818, 2819, 2820, 2821, 2822, 2823, 2824, 2825, 2826, + 2827, 2828, 2829, 2830, 2831, 2832, 2833, 2834, 2835, 2836, 2837, 2838, + 2839, 2840, 2841, 2842, 2843, 2844, 2845, 2846, 2847, 2848, 2849, 2850, + 2851, 2852, 2853, 2854, 2855, 2856, 2857, 2858, 2859, 2860, 2861, 2862, + 2863, 2864, 2865, 2866, 2867, 2868, 2869, 2870, 2871, 2872, 2873, 2874, + 2875, 2876, 2877, 2878, 2879, 2880, 2881, 2882, 2883, 2884, 2885, 2886, + 2887, 2888, 2889, 2890, 2891, 2892, 2893, 2894, 2895, 2896, 2897, 2898, + 2899, 2900, 2901, 2902, 2903, 2904, 2905, 2906, 2907, 2908, 2909, 2910, + 2911, 2912, 2913, 2914, 2915, 2916, 2917, 2918, 2919, 2920, 2921, 2922, + 2923, 2924, 2925, 2926, 2927, 2928, 2929, 2930, 2931, 2932, 2933, 2934, + 2935, 2936, 2937, 2938, 2939, 2940, 2941, 2942, 2943, 2944, 2945, 2946, + 2947, 2948, 2949, 2950, 2951, 2952, 2953, 2954, 2955, 2956, 2957, 2958, + 2959, 2960, 2961, 2962, 2963, 2964, 2965, 2966, 2967, 2968, 2969, 2970, + 2971, 2972, 2973, 2974, 2975, 2976, 2977, 2978, 2979, 2980, 2981, 2982, + 2983, 2984, 2985, 2986, 2987, 2988, 2989, 2990, 2991, 2992, 2993, 2994, + 2995, 2996, 2997, 2998, 2999, 3000, 3001, 3002, 3003, 3004, 3005, 3006, + 3007, 3008, 3009, 3010, 3011, 3012, 3013, 3014, 3015, 3016, 3017, 3018, + 3019, 3020, 3021, 3022, 3023, 3024, 3025, 3026, 3027, 3028, 3029, 3030, + 3031, 3032, 3033, 3034, 3035, 3036, 3037, 3038, 3039, 3040, 3041, 3042, + 3043, 3044, 3045, 3046, 3047, 3048, 3049, 3050, 3051, 3052, 3053, 3054, + 3055, 3056, 3057, 3058, 3059, 3060, 3061, 3062, 3063, 3064, 3065, 3066, + 3067, 3068, 3069, 3070, 3071, 3072, 3073, 3074, 3075, 3076, 3077, 3078, + 3079, 3080, 3081, 3082, 3083, 3084, 3085, 3086, 3087, 3088, 3089, 3090, + 3091, 3092, 3093, 3094, 3095, 3096, 3097, 3098, 3099, 3100, 3101, 3102, + 3103, 3104, 3105, 3106, 3107, 3108, 3109, 3110, 3111, 3112, 3113, 3114, + 3115, 3116, 3117, 3118, 3119, 3120, 3121, 3122, 3123, 3124, 3125, 3126, + 3127, 3128, 3129, 3130, 3131, 3132, 3133, 3134, 3135, 3136, 3137, 3138, + 3139, 3140, 3141, 3142, 3143, 3144, 3145, 3146, 3147, 3148, 3149, 3150, + 3151, 3152, 3153, 3154, 3155, 3156, 3157, 3158, 3159, 3160, 3161, 3162, + 3163, 3164, 3165, 3166, 3167, 3168, 3169, 3170, 3171, 3172, 3173, 3174, + 3175, 3176, 3177, 3178, 3179, 3180, 3181, 3182, 3183, 3184, 3185, 3186, + 3187, 3188, 3189, 3190, 3191, 3192, 3193, 3194, 3195, 3196, 3197, 3198, + 3199, 3200, 3201, 3202, 3203, 3204, 3205, 3206, 3207, 3208, 3209, 3210, + 3211, 3212, 3213, 3214, 3215, 3216, 3217, 3218, 3219, 3220, 3221, 3222, + 3223, 3224, 3225, 3226, 3227, 3228, 3229, 3230, 3231, 3232, 3233, 3234, + 3235, 3236, 3237, 3238, 3239, 3240, 3241, 3242, 3243, 3244, 3245, 3246, + 3247, 3248, 3249, 3250, 3251, 3252, 3253, 3254, 3255, 3256, 3257, 3258, + 3259, 3260, 3261, 3262, 3263, 3264, 3265, 3266, 3267, 3268, 3269, 3270, + 3271, 3272, 3273, 3274, 3275, 3276, 3277, 3278, 3279, 3280, 3281, 3282, + 3283, 3284, 3285, 3286, 3287, 3288, 3289, 3290, 3291, 3292, 3293, 3294, + 3295, 3296, 3297, 3298, 3299, 3300, 3301, 3302, 3303, 3304, 3305, 3306, + 3307, 3308, 3309, 3310, 3311, 3312, 3313, 3314, 3315, 3316, 3317, 3318, + 3319, 3320, 3321, 3322, 3323, 3324, 3325, 3326, 3327, 3328, 3329, 3330, + 3331, 3332, 3333, 3334, 3335, 3336, 3337, 3338, 3339, 3340, 3341, 3342, + 3343, 3344, 3345, 3346, 3347, 3348, 3349, 3350, 3351, 3352, 3353, 3354, + 3355, 3356, 3357, 3358, 3359, 3360, 3361, 3362, 3363, 3364, 3365, 3366, + 3367, 3368, 3369, 3370, 3371, 3372, 3373, 3374, 3375, 3376, 3377, 3378, + 3379, 3380, 3381, 3382, 3383, 3384, 3385, 3386, 3387, 3388, 3389, 3390, + 3391, 3392, 3393, 3394, 3395, 3396, 3397, 3398, 3399, 3400, 3401, 3402, + 3403, 3404, 3405, 3406, 3407, 3408, 3409, 3410, 3411, 3412, 3413, 3414, + 3415, 3416, 3417, 3418, 3419, 3420, 3421, 3422, 3423, 3424, 3425, 3426, + 3427, 3428, 3429, 3430, 3431, 3432, 3433, 3434, 3435, 3436, 3437, 3438, + 3439, 3440, 3441, 3442, 3443, 3444, 3445, 3446, 3447, 3448, 3449, 3450, + 3451, 3452, 3453, 3454, 3455, 3456, 3457, 3458, 3459, 3460, 3461, 3462, + 3463, 3464, 3465, 3466, 3467, 3468, 3469, 3470, 3471, 3472, 3473, 3474, + 3475, 3476, 3477, 3478, 3479, 3480, 3481, 3482, 3483, 3484, 3485, 3486, + 3487, 3488, 3489, 3490, 3491, 3492, 3493, 3494, 3495, 3496, 3497, 3498, + 3499, 3500, 3501, 3502, 3503, 3504, 3505, 3506, 3507, 3508, 3509, 3510, + 3511, 3512, 3513, 3514, 3515, 3516, 3517, 3518, 3519, 3520, 3521, 3522, + 3523, 3524, 3525, 3526, 3527, 3528, 3529, 3530, 3531, 3532, 3533, 3534, + 3535, 3536, 3537, 3538, 3539, 3540, 3541, 3542, 3543, 3544, 3545, 3546, + 3547, 3548, 3549, 3550, 3551, 3552, 3553, 3554, 3555, 3556, 3557, 3558, + 3559, 3560, 3561, 3562, 3563, 3564, 3565, 3566, 3567, 3568, 3569, 3570, + 3571, 3572, 3573, 3574, 3575, 3576, 3577, 3578, 3579, 3580, 3581, 3582, + 3583, 3584, 3585, 3586, 3587, 3588, 3589, 3590, 3591, 3592, 3593, 3594, + 3595, 3596, 3597, 3598, 3599, 3600, 3601, 3602, 3603, 3604, 3605, 3606, + 3607, 3608, 3609, 3610, 3611, 3612, 3613, 3614, 3615, 3616, 3617, 3618, + 3619, 3620, 3621, 3622, 3623, 3624, 3625, 3626, 3627, 3628, 3629, 3630, + 3631, 3632, 3633, 3634, 3635, 3636, 3637, 3638, 3639, 3640, 3641, 3642, + 3643, 3644, 3645, 3646, 3647, 3648, 3649, 3650, 3651, 3652, 3653, 3654, + 3655, 3656, 3657, 3658, 3659, 3660, 3661, 3662, 3663, 3664, 3665, 3666, + 3667, 3668, 3669, 3670, 3671, 3672, 3673, 3674, 3675, 3676, 3677, 3678, + 3679, 3680, 3681, 3682, 3683, 3684, 3685, 3686, 3687, 3688, 3689, 3690, + 3691, 3692, 3693, 3694, 3695, 3696, 3697, 3698, 3699, 3700, 3701, 3702, + 3703, 3704, 3705, 3706, 3707, 3708, 3709, 3710, 3711, 3712, 3713, 3714, + 3715, 3716, 3717, 3718, 3719, 3720, 3721, 3722, 3723, 3724, 3725, 3726, + 3727, 3728, 3729, 3730, 3731, 3732, 3733, 3734, 3735, 3736, 3737, 3738, + 3739, 3740, 3741, 3742, 3743, 3744, 3745, 3746, 3747, 3748, 3749, 3750, + 3751, 3752, 3753, 3754, 3755, 3756, 3757, 3758, 3759, 3760, 3761, 3762, + 3763, 3764, 3765, 3766, 3767, 3768, 3769, 3770, 3771, 3772, 3773, 3774, + 3775, 3776, 3777, 3778, 3779, 3780, 3781, 3782, 3783, 3784, 3785, 3786, + 3787, 3788, 3789, 3790, 3791, 3792, 3793, 3794, 3795, 3796, 3797, 3798, + 3799, 3800, 3801, 3802, 3803, 3804, 3805, 3806, 3807, 3808, 3809, 3810, + 3811, 3812, 3813, 3814, 3815, 3816, 3817, 3818, 3819, 3820, 3821, 3822, + 3823, 3824, 3825, 3826, 3827, 3828, 3829, 3830, 3831, 3832, 3833, 3834, + 3835, 3836, 3837, 3838, 3839, 3840, 3841, 3842, 3843, 3844, 3845, 3846, + 3847, 3848, 3849, 3850, 3851, 3852, 3853, 3854, 3855, 3856, 3857, 3858, + 3859, 3860, 3861, 3862, 3863, 3864, 3865, 3866, 3867, 3868, 3869, 3870, + 3871, 3872, 3873, 3874, 3875, 3876, 3877, 3878, 3879, 3880, 3881, 3882, + 3883, 3884, 3885, 3886, 3887, 3888, 3889, 3890, 3891, 3892, 3893, 3894, + 3895, 3896, 3897, 3898, 3899, 3900, 3901, 3902, 3903, 3904, 3905, 3906, + 3907, 3908, 3909, 3910, 3911, 3912, 3913, 3914, 3915, 3916, 3917, 3918, + 3919, 3920, 3921, 3922, 3923, 3924, 3925, 3926, 3927, 3928, 3929, 3930, + 3931, 3932, 3933, 3934, 3935, 3936, 3937, 3938, 3939, 3940, 3941, 3942, + 3943, 3944, 3945, 3946, 3947, 3948, 3949, 3950, 3951, 3952, 3953, 3954, + 3955, 3956, 3957, 3958, 3959, 3960, 3961, 3962, 3963, 3964, 3965, 3966, + 3967, 3968, 3969, 3970, 3971, 3972, 3973, 3974, 3975, 3976, 3977, 3978, + 3979, 3980, 3981, 3982, 3983, 3984, 3985, 3986, 3987, 3988, 3989, 3990, + 3991, 3992, 3993, 3994, 3995, 3996, 3997, 3998, 3999, 4000, 4001, 4002, + 4003, 4004, 4005, 4006, 4007, 4008, 4009, 4010, 4011, 4012, 4013, 4014, + 4015, 4016, 4017, 4018, 4019, 4020, 4021, 4022, 4023, 4024, 4025, 4026, + 4027, 4028, 4029, 4030, 4031, 4032, 4033, 4034, 4035, 4036, 4037, 4038, + 4039, 4040, 4041, 4042, 4043, 4044, 4045, 4046, 4047, 4048, 4049, 4050, + 4051, 4052, 4053, 4054, 4055, 4056, 4057, 4058, 4059, 4060, 4061, 4062, + 4063, 4064, 4065, 4066, 4067, 4068, 4069, 4070, 4071, 4072, 4073, 4074, + 4075, 4076, 4077, 4078, 4079, 4080, 4081, 4082, 4083, 4084, 4085, 4086, + 4087, 4088, 4089, 4090, 4091, 4092, 4093, 4094, 4095, 4096, 4097, 4098, + 4099, 4100, 4101, 4102, 4103, 4104, 4105, 4106, 4107, 4108, 4109, 4110, + 4111, 4112, 4113, 4114, 4115, 4116, 4117, 4118, 4119, 4120, 4121, 4122, + 4123, 4124, 4125, 4126, 4127, 4128, 4129, 4130, 4131, 4132, 4133, 4134, + 4135, 4136, 4137, 4138, 4139, 4140, 4141, 4142, 4143, 4144, 4145, 4146, + 4147, 4148, 4149, 4150, 4151, 4152, 4153, 4154, 4155, 4156, 4157, 4158, + 4159, 4160, 4161, 4162, 4163, 4164, 4165, 4166, 4167, 4168, 4169, 4170, + 4171, 4172, 4173, 4174, 4175, 4176, 4177, 4178, 4179, 4180, 4181, 4182, + 4183, 4184, 4185, 4186, 4187, 4188, 4189, 4190, 4191, 4192, 4193, 4194, + 4195, 4196, 4197, 4198, 4199, 4200, 4201, 4202, 4203, 4204, 4205, 4206, + 4207, 4208, 4209, 4210, 4211, 4212, 4213, 4214, 4215, 4216, 4217, 4218, + 4219, 4220, 4221, 4222, 4223, 4224, 4225, 4226, 4227, 4228, 4229, 4230, + 4231, 4232, 4233, 4234, 4235, 4236, 4237, 4238, 4239, 4240, 4241, 4242, + 4243, 4244, 4245, 4246, 4247, 4248, 4249, 4250, 4251, 4252, 4253, 4254, + 4255, 4256, 4257, 4258, 4259, 4260, 4261, 4262, 4263, 4264, 4265, 4266, + 4267, 4268, 4269, 4270, 4271, 4272, 4273, 4274, 4275, 4276, 4277, 4278, + 4279, 4280, 4281, 4282, 4283, 4284, 4285, 4286, 4287, 4288, 4289, 4290, + 4291, 4292, 4293, 4294, 4295, 4296, 4297, 4298, 4299, 4300, 4301, 4302, + 4303, 4304, 4305, 4306, 4307, 4308, 4309, 4310, 4311, 4312, 4313, 4314, + 4315, 4316, 4317, 4318, 4319, 4320, 4321, 4322, 4323, 4324, 4325, 4326, + 4327, 4328, 4329, 4330, 4331, 4332, 4333, 4334, 4335, 4336, 4337, 4338, + 4339, 4340, 4341, 4342, 4343, 4344, 4345, 4346, 4347, 4348, 4349, 4350, + 4351, 4352, 4353, 4354, 4355, 4356, 4357, 4358, 4359, 4360, 4361, 4362, + 4363, 4364, 4365, 4366, 4367, 4368, 4369, 4370, 4371, 4372, 4373, 4374, + 4375, 4376, 4377, 4378, 4379, 4380, 4381, 4382, 4383, 4384, 4385, 4386, + 4387, 4388, 4389, 4390, 4391, 4392, 4393, 4394, 4395, 4396, 4397, 4398, + 4399, 4400, 4401, 4402, 4403, 4404, 4405, 4406, 4407, 4408, 4409, 4410, + 4411, 4412, 4413, 4414, 4415, 4416, 4417, 4418, 4419, 4420, 4421, 4422, + 4423, 4424, 4425, 4426, 4427, 4428, 4429, 4430, 4431, 4432, 4433, 4434, + 4435, 4436, 4437, 4438, 4439, 4440, 4441, 4442, 4443, 4444, 4445, 4446, + 4447, 4448, 4449, 4450, 4451, 4452, 4453, 4454, 4455, 4456, 4457, 4458, + 4459, 4460, 4461, 4462, 4463, 4464, 4465, 4466, 4467, 4468, 4469, 4470, + 4471, 4472, 4473, 4474, 4475, 4476, 4477, 4478, 4479, 4480, 4481, 4482, + 4483, 4484, 4485, 4486, 4487, 4488, 4489, 4490, 4491, 4492, 4493, 4494, + 4495, 4496, 4497, 4498, 4499, 4500, 4501, 4502, 4503, 4504, 4505, 4506, + 4507, 4508, 4509, 4510, 4511, 4512, 4513, 4514, 4515, 4516, 4517, 4518, + 4519, 4520, 4521, 4522, 4523, 4524, 4525, 4526, 4527, 4528, 4529, 4530, + 4531, 4532, 4533, 4534, 4535, 4536, 4537, 4538, 4539, 4540, 4541, 4542, + 4543, 4544, 4545, 4546, 4547, 4548, 4549, 4550, 4551, 4552, 4553, 4554, + 4555, 4556, 4557, 4558, 4559, 4560, 4561, 4562, 4563, 4564, 4565, 4566, + 4567, 4568, 4569, 4570, 4571, 4572, 4573, 4574, 4575, 4576, 4577, 4578, + 4579, 4580, 4581, 4582, 4583, 4584, 4585, 4586, 4587, 4588, 4589, 4590, + 4591, 4592, 4593, 4594, 4595, 4596, 4597, 4598, 4599, 4600, 4601, 4602, + 4603, 4604, 4605, 4606, 4607, 4608, 4609, 4610, 4611, 4612, 4613, 4614, + 4615, 4616, 4617, 4618, 4619, 4620, 4621, 4622, 4623, 4624, 4625, 4626, + 4627, 4628, 4629, 4630, 4631, 4632, 4633, 4634, 4635, 4636, 4637, 4638, + 4639, 4640, 4641, 4642, 4643, 4644, 4645, 4646, 4647, 4648, 4649, 4650, + 4651, 4652, 4653, 4654, 4655, 4656, 4657, 4658, 4659, 4660, 4661, 4662, + 4663, 4664, 4665, 4666, 4667, 4668, 4669, 4670, 4671, 4672, 4673, 4674, + 4675, 4676, 4677, 4678, 4679, 4680, 4681, 4682, 4683, 4684, 4685, 4686, + 4687, 4688, 4689, 4690, 4691, 4692, 4693, 4694, 4695, 4696, 4697, 4698, + 4699, 4700, 4701, 4702, 4703, 4704, 4705, 4706, 4707, 4708, 4709, 4710, + 4711, 4712, 4713, 4714, 4715, 4716, 4717, 4718, 4719, 4720, 4721, 4722, + 4723, 4724, 4725, 4726, 4727, 4728, 4729, 4730, 4731, 4732, 4733, 4734, + 4735, 4736, 4737, 4738, 4739, 4740, 4741, 4742, 4743, 4744, 4745, 4746, + 4747, 4748, 4749, 4750, 4751, 4752, 4753, 4754, 4755, 4756, 4757, 4758, + 4759, 4760, 4761, 4762, 4763, 4764, 4765, 4766, 4767, 4768, 4769, 4770, + 4771, 4772, 4773, 4774, 4775, 4776, 4777, 4778, 4779, 4780, 4781, 4782, + 4783, 4784, 4785, 4786, 4787, 4788, 4789, 4790, 4791, 4792, 4793, 4794, + 4795, 4796, 4797, 4798, 4799, 4800, 4801, 4802, 4803, 4804, 4805, 4806, + 4807, 4808, 4809, 4810, 4811, 4812, 4813, 4814, 4815, 4816, 4817, 4818, + 4819, 4820, 4821, 4822, 4823, 4824, 4825, 4826, 4827, 4828, 4829, 4830, + 4831, 4832, 4833, 4834, 4835, 4836, 4837, 4838, 4839, 4840, 4841, 4842, + 4843, 4844, 4845, 4846, 4847, 4848, 4849, 4850, 4851, 4852, 4853, 4854, + 4855, 4856, 4857, 4858, 4859, 4860, 4861, 4862, 4863, 4864, 4865, 4866, + 4867, 4868, 4869, 4870, 4871, 4872, 4873, 4874, 4875, 4876, 4877, 4878, + 4879, 4880, 4881, 4882, 4883, 4884, 4885, 4886, 4887, 4888, 4889, 4890, + 4891, 4892, 4893, 4894, 4895, 4896, 4897, 4898, 4899, 4900, 4901, 4902, + 4903, 4904, 4905, 4906, 4907, 4908, 4909, 4910, 4911, 4912, 4913, 4914, + 4915, 4916, 4917, 4918, 4919, 4920, 4921, 4922, 4923, 4924, 4925, 4926, + 4927, 4928, 4929, 4930, 4931, 4932, 4933, 4934, 4935, 4936, 4937, 4938, + 4939, 4940, 4941, 4942, 4943, 4944, 4945, 4946, 4947, 4948, 4949, 4950, + 4951, 4952, 4953, 4954, 4955, 4956, 4957, 4958, 4959, 4960, 4961, 4962, + 4963, 4964, 4965, 4966, 4967, 4968, 4969, 4970, 4971, 4972, 4973, 4974, + 4975, 4976, 4977, 4978, 4979, 4980, 4981, 4982, 4983, 4984, 4985, 4986, + 4987, 4988, 4989, 4990, 4991, 4992, 4993, 4994, 4995, 4996, 4997, 4998, + 4999, 5000, 5001, 5002, 5003, 5004, 5005, 5006, 5007, 5008, 5009, 5010, + 5011, 5012, 5013, 5014, 5015, 5016, 5017, 5018, 5019, 5020, 5021, 5022, + 5023, 5024, 5025, 5026, 5027, 5028, 5029, 5030, 5031, 5032, 5033, 5034, + 5035, 5036, 5037, 5038, 5039, 5040, 5041, 5042, 5043, 5044, 5045, 5046, + 5047, 5048, 5049, 5050, 5051, 5052, 5053, 5054, 5055, 5056, 5057, 5058, + 5059, 5060, 5061, 5062, 5063, 5064, 5065, 5066, 5067, 5068, 5069, 5070, + 5071, 5072, 5073, 5074, 5075, 5076, 5077, 5078, 5079, 5080, 5081, 5082, + 5083, 5084, 5085, 5086, 5087, 5088, 5089, 5090, 5091, 5092, 5093, 5094, + 5095, 5096, 5097, 5098, 5099, 5100, 5101, 5102, 5103, 5104, 5105, 5106, + 5107, 5108, 5109, 5110, 5111, 5112, 5113, 5114, 5115, 5116, 5117, 5118, + 5119, 5120, 5121, 5122, 5123, 5124, 5125, 5126, 5127, 5128, 5129, 5130, + 5131, 5132, 5133, 5134, 5135, 5136, 5137, 5138, 5139, 5140, 5141, 5142, + 5143, 5144, 5145, 5146, 5147, 5148, 5149, 5150, 5151, 5152, 5153, 5154, + 5155, 5156, 5157, 5158, 5159, 5160, 5161, 5162, 5163, 5164, 5165, 5166, + 5167, 5168, 5169, 5170, 5171, 5172, 5173, 5174, 5175, 5176, 5177, 5178, + 5179, 5180, 5181, 5182, 5183, 5184, 5185, 5186, 5187, 5188, 5189, 5190, + 5191, 5192, 5193, 5194, 5195, 5196, 5197, 5198, 5199, 5200, 5201, 5202, + 5203, 5204, 5205, 5206, 5207, 5208, 5209, 5210, 5211, 5212, 5213, 5214, + 5215, 5216, 5217, 5218, 5219, 5220, 5221, 5222, 5223, 5224, 5225, 5226, + 5227, 5228, 5229, 5230, 5231, 5232, 5233, 5234, 5235, 5236, 5237, 5238, + 5239, 5240, 5241, 5242, 5243, 5244, 5245, 5246, 5247, 5248, 5249, 5250, + 5251, 5252, 5253, 5254, 5255, 5256, 5257, 5258, 5259, 5260, 5261, 5262, + 5263, 5264, 5265, 5266, 5267, 5268, 5269, 5270, 5271, 5272, 5273, 5274, + 5275, 5276, 5277, 5278, 5279, 5280, 5281, 5282, 5283, 5284, 5285, 5286, + 5287, 5288, 5289, 5290, 5291, 5292, 5293, 5294, 5295, 5296, 5297, 5298, + 5299, 5300, 5301, 5302, 5303, 5304, 5305, 5306, 5307, 5308, 5309, 5310, + 5311, 5312, 5313, 5314, 5315, 5316, 5317, 5318, 5319, 5320, 5321, 5322, + 5323, 5324, 5325, 5326, 5327, 5328, 5329, 5330, 5331, 5332, 5333, 5334, + 5335, 5336, 5337, 5338, 5339, 5340, 5341, 5342, 5343, 5344, 5345, 5346, + 5347, 5348, 5349, 5350, 5351, 5352, 5353, 5354, 5355, 5356, 5357, 5358, + 5359, 5360, 5361, 5362, 5363, 5364, 5365, 5366, 5367, 5368, 5369, 5370, + 5371, 5372, 5373, 5374, 5375, 5376, 5377, 5378, 5379, 5380, 5381, 5382, + 5383, 5384, 5385, 5386, 5387, 5388, 5389, 5390, 5391, 5392, 5393, 5394, + 5395, 5396, 5397, 5398, 5399, 5400, 5401, 5402, 5403, 5404, 5405, 5406, + 5407, 5408, 5409, 5410, 5411, 5412, 5413, 5414, 5415, 5416, 5417, 5418, + 5419, 5420, 5421, 5422, 5423, 5424, 5425, 5426, 5427, 5428, 5429, 5430, + 5431, 5432, 5433, 5434, 5435, 5436, 5437, 5438, 5439, 5440, 5441, 5442, + 5443, 5444, 5445, 5446, 5447, 5448, 5449, 5450, 5451, 5452, 5453, 5454, + 5455, 5456, 5457, 5458, 5459, 5460, 5461, 5462, 5463, 5464, 5465, 5466, + 5467, 5468, 5469, 5470, 5471, 5472, 5473, 5474, 5475, 5476, 5477, 5478, + 5479, 5480, 5481, 5482, 5483, 5484, 5485, 5486, 5487, 5488, 5489, 5490, + 5491, 5492, 5493, 5494, 5495, 5496, 5497, 5498, 5499, 5500, 5501, 5502, + 5503, 5504, 5505, 5506, 5507, 5508, 5509, 5510, 5511, 5512, 5513, 5514, + 5515, 5516, 5517, 5518, 5519, 5520, 5521, 5522, 5523, 5524, 5525, 5526, + 5527, 5528, 5529, 5530, 5531, 5532, 5533, 5534, 5535, 5536, 5537, 5538, + 5539, 5540, 5541, 5542, 5543, 5544, 5545, 5546, 5547, 5548, 5549, 5550, + 5551, 5552, 5553, 5554, 5555, 5556, 5557, 5558, 5559, 5560, 5561, 5562, + 5563, 5564, 5565, 5566, 5567, 5568, 5569, 5570, 5571, 5572, 5573, 5574, + 5575, 5576, 5577, 5578, 5579, 5580, 5581, 5582, 5583, 5584, 5585, 5586, + 5587, 5588, 5589, 5590, 5591, 5592, 5593, 5594, 5595, 5596, 5597, 5598, + 5599, 5600, 5601, 5602, 5603, 5604, 5605, 5606, 5607, 5608, 5609, 5610, + 5611, 5612, 5613, 5614, 5615, 5616, 5617, 5618, 5619, 5620, 5621, 5622, + 5623, 5624, 5625, 5626, 5627, 5628, 5629, 5630, 5631, 5632, 5633, 5634, + 5635, 5636, 5637, 5638, 5639, 5640, 5641, 5642, 5643, 5644, 5645, 5646, + 5647, 5648, 5649, 5650, 5651, 5652, 5653, 5654, 5655, 5656, 5657, 5658, + 5659, 5660, 5661, 5662, 5663, 5664, 5665, 5666, 5667, 5668, 5669, 5670, + 5671, 5672, 5673, 5674, 5675, 5676, 5677, 5678, 5679, 5680, 5681, 5682, + 5683, 5684, 5685, 5686, 5687, 5688, 5689, 5690, 5691, 5692, 5693, 5694, + 5695, 5696, 5697, 5698, 5699, 5700, 5701, 5702, 5703, 5704, 5705, 5706, + 5707, 5708, 5709, 5710, 5711, 5712, 5713, 5714, 5715, 5716, 5717, 5718, + 5719, 5720, 5721, 5722, 5723, 5724, 5725, 5726, 5727, 5728, 5729, 5730, + 5731, 5732, 5733, 5734, 5735, 5736, 5737, 5738, 5739, 5740, 5741, 5742, + 5743, 5744, 5745, 5746, 5747, 5748, 5749, 5750, 5751, 5752, 5753, 5754, + 5755, 5756, 5757, 5758, 5759, 5760, 5761, 5762, 5763, 5764, 5765, 5766, + 5767, 5768, 5769, 5770, 5771, 5772, 5773, 5774, 5775, 5776, 5777, 5778, + 5779, 5780, 5781, 5782, 5783, 5784, 5785, 5786, 5787, 5788, 5789, 5790, + 5791, 5792, 5793, 5794, 5795, 5796, 5797, 5798, 5799, 5800, 5801, 5802, + 5803, 5804, 5805, 5806, 5807, 5808, 5809, 5810, 5811, 5812, 5813, 5814, + 5815, 5816, 5817, 5818, 5819, 5820, 5821, 5822, 5823, 5824, 5825, 5826, + 5827, 5828, 5829, 5830, 5831, 5832, 5833, 5834, 5835, 5836, 5837, 5838, + 5839, 5840, 5841, 5842, 5843, 5844, 5845, 5846, 5847, 5848, 5849, 5850, + 5851, 5852, 5853, 5854, 5855, 5856, 5857, 5858, 5859, 5860, 5861, 5862, + 5863, 5864, 5865, 5866, 5867, 5868, 5869, 5870, 5871, 5872, 5873, 5874, + 5875, 5876, 5877, 5878, 5879, 5880, 5881, 5882, 5883, 5884, 5885, 5886, + 5887, 5888, 5889, 5890, 5891, 5892, 5893, 5894, 5895, 5896, 5897, 5898, + 5899, 5900, 5901, 5902, 5903, 5904, 5905, 5906, 5907, 5908, 5909, 5910, + 5911, 5912, 5913, 5914, 5915, 5916, 5917, 5918, 5919, 5920, 5921, 5922, + 5923, 5924, 5925, 5926, 5927, 5928, 5929, 5930, 5931, 5932, 5933, 5934, + 5935, 5936, 5937, 5938, 5939, 5940, 5941, 5942, 5943, 5944, 5945, 5946, + 5947, 5948, 5949, 5950, 5951, 5952, 5953, 5954, 5955, 5956, 5957, 5958, + 5959, 5960, 5961, 5962, 5963, 5964, 5965, 5966, 5967, 5968, 5969, 5970, + 5971, 5972, 5973, 5974, 5975, 5976, 5977, 5978, 5979, 5980, 5981, 5982, + 5983, 5984, 5985, 5986, 5987, 5988, 5989, 5990, 5991, 5992, 5993, 5994, + 5995, 5996, 5997, 5998, 5999, 6000, 6001, 6002, 6003, 6004, 6005, 6006, + 6007, 6008, 6009, 6010, 6011, 6012, 6013, 6014, 6015, 6016, 6017, 6018, + 6019, 6020, 6021, 6022, 6023, 6024, 6025, 6026, 6027, 6028, 6029, 6030, + 6031, 6032, 6033, 6034, 6035, 6036, 6037, 6038, 6039, 6040, 6041, 6042, + 6043, 6044, 6045, 6046, 6047, 6048, 6049, 6050, 6051, 6052, 6053, 6054, + 6055, 6056, 6057, 6058, 6059, 6060, 6061, 6062, 6063, 6064, 6065, 6066, + 6067, 6068, 6069, 6070, 6071, 6072, 6073, 6074, 6075, 6076, 6077, 6078, + 6079, 6080, 6081, 6082, 6083, 6084, 6085, 6086, 6087, 6088, 6089, 6090, + 6091, 6092, 6093, 6094, 6095, 6096, 6097, 6098, 6099, 6100, 6101, 6102, + 6103, 6104, 6105, 6106, 6107, 6108, 6109, 6110, 6111, 6112, 6113, 6114, + 6115, 6116, 6117, 6118, 6119, 6120, 6121, 6122, 6123, 6124, 6125, 6126, + 6127, 6128, 6129, 6130, 6131, 6132, 6133, 6134, 6135, 6136, 6137, 6138, + 6139, 6140, 6141, 6142, 6143, 6144, 6145, 6146, 6147, 6148, 6149, 6150, + 6151, 6152, 6153, 6154, 6155, 6156, 6157, 6158, 6159, 6160, 6161, 6162, + 6163, 6164, 6165, 6166, 6167, 6168, 6169, 6170, 6171, 6172, 6173, 6174, + 6175, 6176, 6177, 6178, 6179, 6180, 6181, 6182, 6183, 6184, 6185, 6186, + 6187, 6188, 6189, 6190, 6191, 6192, 6193, 6194, 6195, 6196, 6197, 6198, + 6199, 6200, 6201, 6202, 6203, 6204, 6205, 6206, 6207, 6208, 6209, 6210, + 6211, 6212, 6213, 6214, 6215, 6216, 6217, 6218, 6219, 6220, 6221, 6222, + 6223, 6224, 6225, 6226, 6227, 6228, 6229, 6230, 6231, 6232, 6233, 6234, + 6235, 6236, 6237, 6238, 6239, 6240, 6241, 6242, 6243, 6244, 6245, 6246, + 6247, 6248, 6249, 6250, 6251, 6252, 6253, 6254, 6255, 6256, 6257, 6258, + 6259, 6260, 6261, 6262, 6263, 6264, 6265, 6266, 6267, 6268, 6269, 6270, + 6271, 6272, 6273, 6274, 6275, 6276, 6277, 6278, 6279, 6280, 6281, 6282, + 6283, 6284, 6285, 6286, 6287, 6288, 6289, 6290, 6291, 6292, 6293, 6294, + 6295, 6296, 6297, 6298, 6299, 6300, 6301, 6302, 6303, 6304, 6305, 6306, + 6307, 6308, 6309, 6310, 6311, 6312, 6313, 6314, 6315, 6316, 6317, 6318, + 6319, 6320, 6321, 6322, 6323, 6324, 6325, 6326, 6327, 6328, 6329, 6330, + 6331, 6332, 6333, 6334, 6335, 6336, 6337, 6338, 6339, 6340, 6341, 6342, + 6343, 6344, 6345, 6346, 6347, 6348, 6349, 6350, 6351, 6352, 6353, 6354, + 6355, 6356, 6357, 6358, 6359, 6360, 6361, 6362, 6363, 6364, 6365, 6366, + 6367, 6368, 6369, 6370, 6371, 6372, 6373, 6374, 6375, 6376, 6377, 6378, + 6379, 6380, 6381, 6382, 6383, 6384, 6385, 6386, 6387, 6388, 6389, 6390, + 6391, 6392, 6393, 6394, 6395, 6396, 6397, 6398, 6399, 6400, 6401, 6402, + 6403, 6404, 6405, 6406, 6407, 6408, 6409, 6410, 6411, 6412, 6413, 6414, + 6415, 6416, 6417, 6418, 6419, 6420, 6421, 6422, 6423, 6424, 6425, 6426, + 6427, 6428, 6429, 6430, 6431, 6432, 6433, 6434, 6435, 6436, 6437, 6438, + 6439, 6440, 6441, 6442, 6443, 6444, 6445, 6446, 6447, 6448, 6449, 6450, + 6451, 6452, 6453, 6454, 6455, 6456, 6457, 6458, 6459, 6460, 6461, 6462, + 6463, 6464, 6465, 6466, 6467, 6468, 6469, 6470, 6471, 6472, 6473, 6474, + 6475, 6476, 6477, 6478, 6479, 6480, 6481, 6482, 6483, 6484, 6485, 6486, + 6487, 6488, 6489, 6490, 6491, 6492, 6493, 6494, 6495, 6496, 6497, 6498, + 6499, 6500, 6501, 6502, 6503, 6504, 6505, 6506, 6507, 6508, 6509, 6510, + 6511, 6512, 6513, 6514, 6515, 6516, 6517, 6518, 6519, 6520, 6521, 6522, + 6523, 6524, 6525, 6526, 6527, 6528, 6529, 6530, 6531, 6532, 6533, 6534, + 6535, 6536, 6537, 6538, 6539, 6540, 6541, 6542, 6543, 6544, 6545, 6546, + 6547, 6548, 6549, 6550, 6551, 6552, 6553, 6554, 6555, 6556, 6557, 6558, + 6559, 6560, 6561, 6562, 6563, 6564, 6565, 6566, 6567, 6568, 6569, 6570, + 6571, 6572, 6573, 6574, 6575, 6576, 6577, 6578, 6579, 6580, 6581, 6582, + 6583, 6584, 6585, 6586, 6587, 6588, 6589, 6590, 6591, 6592, 6593, 6594, + 6595, 6596, 6597, 6598, 6599, 6600, 6601, 6602, 6603, 6604, 6605, 6606, + 6607, 6608, 6609, 6610, 6611, 6612, 6613, 6614, 6615, 6616, 6617, 6618, + 6619, 6620, 6621, 6622, 6623, 6624, 6625, 6626, 6627, 6628, 6629, 6630, + 6631, 6632, 6633, 6634, 6635, 6636, 6637, 6638, 6639, 6640, 6641, 6642, + 6643, 6644, 6645, 6646, 6647, 6648, 6649, 6650, 6651, 6652, 6653, 6654, + 6655, 6656, 6657, 6658, 6659, 6660, 6661, 6662, 6663, 6664, 6665, 6666, + 6667, 6668, 6669, 6670, 6671, 6672, 6673, 6674, 6675, 6676, 6677, 6678, + 6679, 6680, 6681, 6682, 6683, 6684, 6685, 6686, 6687, 6688, 6689, 6690, + 6691, 6692, 6693, 6694, 6695, 6696, 6697, 6698, 6699, 6700, 6701, 6702, + 6703, 6704, 6705, 6706, 6707, 6708, 6709, 6710, 6711, 6712, 6713, 6714, + 6715, 6716, 6717, 6718, 6719, 6720, 6721, 6722, 6723, 6724, 6725, 6726, + 6727, 6728, 6729, 6730, 6731, 6732, 6733, 6734, 6735, 6736, 6737, 6738, + 6739, 6740, 6741, 6742, 6743, 6744, 6745, 6746, 6747, 6748, 6749, 6750, + 6751, 6752, 6753, 6754, 6755, 6756, 6757, 6758, 6759, 6760, 6761, 6762, + 6763, 6764, 6765, 6766, 6767, 6768, 6769, 6770, 6771, 6772, 6773, 6774, + 6775, 6776, 6777, 6778, 6779, 6780, 6781, 6782, 6783, 6784, 6785, 6786, + 6787, 6788, 6789, 6790, 6791, 6792, 6793, 6794, 6795, 6796, 6797, 6798, + 6799, 6800, 6801, 6802, 6803, 6804, 6805, 6806, 6807, 6808, 6809, 6810, + 6811, 6812, 6813, 6814, 6815, 6816, 6817, 6818, 6819, 6820, 6821, 6822, + 6823, 6824, 6825, 6826, 6827, 6828, 6829, 6830, 6831, 6832, 6833, 6834, + 6835, 6836, 6837, 6838, 6839, 6840, 6841, 6842, 6843, 6844, 6845, 6846, + 6847, 6848, 6849, 6850, 6851, 6852, 6853, 6854, 6855, 6856, 6857, 6858, + 6859, 6860, 6861, 6862, 6863, 6864, 6865, 6866, 6867, 6868, 6869, 6870, + 6871, 6872, 6873, 6874, 6875, 6876, 6877, 6878, 6879, 6880, 6881, 6882, + 6883, 6884, 6885, 6886, 6887, 6888, 6889, 6890, 6891, 6892, 6893, 6894, + 6895, 6896, 6897, 6898, 6899, 6900, 6901, 6902, 6903, 6904, 6905, 6906, + 6907, 6908, 6909, 6910, 6911, 6912, 6913, 6914, 6915, 6916, 6917, 6918, + 6919, 6920, 6921, 6922, 6923, 6924, 6925, 6926, 6927, 6928, 6929, 6930, + 6931, 6932, 6933, 6934, 6935, 6936, 6937, 6938, 6939, 6940, 6941, 6942, + 6943, 6944, 6945, 6946, 6947, 6948, 6949, 6950, 6951, 6952, 6953, 6954, + 6955, 6956, 6957, 6958, 6959, 6960, 6961, 6962, 6963, 6964, 6965, 6966, + 6967, 6968, 6969, 6970, 6971, 6972, 6973, 6974, 6975, 6976, 6977, 6978, + 6979, 6980, 6981, 6982, 6983, 6984, 6985, 6986, 6987, 6988, 6989, 6990, + 6991, 6992, 6993, 6994, 6995, 6996, 6997, 6998, 6999, 7000, 7001, 7002, + 7003, 7004, 7005, 7006, 7007, 7008, 7009, 7010, 7011, 7012, 7013, 7014, + 7015, 7016, 7017, 7018, 7019, 7020, 7021, 7022, 7023, 7024, 7025, 7026, + 7027, 7028, 7029, 7030, 7031, 7032, 7033, 7034, 7035, 7036, 7037, 7038, + 7039, 7040, 7041, 7042, 7043, 7044, 7045, 7046, 7047, 7048, 7049, 7050, + 7051, 7052, 7053, 7054, 7055, 7056, 7057, 7058, 7059, 7060, 7061, 7062, + 7063, 7064, 7065, 7066, 7067, 7068, 7069, 7070, 7071, 7072, 7073, 7074, + 7075, 7076, 7077, 7078, 7079, 7080, 7081, 7082, 7083, 7084, 7085, 7086, + 7087, 7088, 7089, 7090, 7091, 7092, 7093, 7094, 7095, 7096, 7097, 7098, + 7099, 7100, 7101, 7102, 7103, 7104, 7105, 7106, 7107, 7108, 7109, 7110, + 7111, 7112, 7113, 7114, 7115, 7116, 7117, 7118, 7119, 7120, 7121, 7122, + 7123, 7124, 7125, 7126, 7127, 7128, 7129, 7130, 7131, 7132, 7133, 7134, + 7135, 7136, 7137, 7138, 7139, 7140, 7141, 7142, 7143, 7144, 7145, 7146, + 7147, 7148, 7149, 7150, 7151, 7152, 7153, 7154, 7155, 7156, 7157, 7158, + 7159, 7160, 7161, 7162, 7163, 7164, 7165, 7166, 7167, 7168, 7169, 7170, + 7171, 7172, 7173, 7174, 7175, 7176, 7177, 7178, 7179, 7180, 7181, 7182, + 7183, 7184, 7185, 7186, 7187, 7188, 7189, 7190, 7191, 7192, 7193, 7194, + 7195, 7196, 7197, 7198, 7199, 7200, 7201, 7202, 7203, 7204, 7205, 7206, + 7207, 7208, 7209, 7210, 7211, 7212, 7213, 7214, 7215, 7216, 7217, 7218, + 7219, 7220, 7221, 7222, 7223, 7224, 7225, 7226, 7227, 7228, 7229, 7230, + 7231, 7232, 7233, 7234, 7235, 7236, 7237, 7238, 7239, 7240, 7241, 7242, + 7243, 7244, 7245, 7246, 7247, 7248, 7249, 7250, 7251, 7252, 7253, 7254, + 7255, 7256, 7257, 7258, 7259, 7260, 7261, 7262, 7263, 7264, 7265, 7266, + 7267, 7268, 7269, 7270, 7271, 7272, 7273, 7274, 7275, 7276, 7277, 7278, + 7279, 7280, 7281, 7282, 7283, 7284, 7285, 7286, 7287, 7288, 7289, 7290, + 7291, 7292, 7293, 7294, 7295, 7296, 7297, 7298, 7299, 7300, 7301, 7302, + 7303, 7304, 7305, 7306, 7307, 7308, 7309, 7310, 7311, 7312, 7313, 7314, + 7315, 7316, 7317, 7318, 7319, 7320, 7321, 7322, 7323, 7324, 7325, 7326, + 7327, 7328, 7329, 7330, 7331, 7332, 7333, 7334, 7335, 7336, 7337, 7338, + 7339, 7340, 7341, 7342, 7343, 7344, 7345, 7346, 7347, 7348, 7349, 7350, + 7351, 7352, 7353, 7354, 7355, 7356, 7357, 7358, 7359, 7360, 7361, 7362, + 7363, 7364, 7365, 7366, 7367, 7368, 7369, 7370, 7371, 7372, 7373, 7374, + 7375, 7376, 7377, 7378, 7379, 7380, 7381, 7382, 7383, 7384, 7385, 7386, + 7387, 7388, 7389, 7390, 7391, 7392, 7393, 7394, 7395, 7396, 7397, 7398, + 7399, 7400, 7401, 7402, 7403, 7404, 7405, 7406, 7407, 7408, 7409, 7410, + 7411, 7412, 7413, 7414, 7415, 7416, 7417, 7418, 7419, 7420, 7421, 7422, + 7423, 7424, 7425, 7426, 7427, 7428, 7429, 7430, 7431, 7432, 7433, 7434, + 7435, 7436, 7437, 7438, 7439, 7440, 7441, 7442, 7443, 7444, 7445, 7446, + 7447, 7448, 7449, 7450, 7451, 7452, 7453, 7454, 7455, 7456, 7457, 7458, + 7459, 7460, 7461, 7462, 7463, 7464, 7465, 7466, 7467, 7468, 7469, 7470, + 7471, 7472, 7473, 7474, 7475, 7476, 7477, 7478, 7479, 7480, 7481, 7482, + 7483, 7484, 7485, 7486, 7487, 7488, 7489, 7490, 7491, 7492, 7493, 7494, + 7495, 7496, 7497, 7498, 7499, 7500, 7501, 7502, 7503, 7504, 7505, 7506, + 7507, 7508, 7509, 7510, 7511, 7512, 7513, 7514, 7515, 7516, 7517, 7518, + 7519, 7520, 7521, 7522, 7523, 7524, 7525, 7526, 7527, 7528, 7529, 7530, + 7531, 7532, 7533, 7534, 7535, 7536, 7537, 7538, 7539, 7540, 7541, 7542, + 7543, 7544, 7545, 7546, 7547, 7548, 7549, 7550, 7551, 7552, 7553, 7554, + 7555, 7556, 7557, 7558, 7559, 7560, 7561, 7562, 7563, 7564, 7565, 7566, + 7567, 7568, 7569, 7570, 7571, 7572, 7573, 7574, 7575, 7576, 7577, 7578, + 7579, 7580, 7581, 7582, 7583, 7584, 7585, 7586, 7587, 7588, 7589, 7590, + 7591, 7592, 7593, 7594, 7595, 7596, 7597, 7598, 7599, 7600, 7601, 7602, + 7603, 7604, 7605, 7606, 7607, 7608, 7609, 7610, 7611, 7612, 7613, 7614, + 7615, 7616, 7617, 7618, 7619, 7620, 7621, 7622, 7623, 7624, 7625, 7626, + 7627, 7628, 7629, 7630, 7631, 7632, 7633, 7634, 7635, 7636, 7637, 7638, + 7639, 7640, 7641, 7642, 7643, 7644, 7645, 7646, 7647, 7648, 7649, 7650, + 7651, 7652, 7653, 7654, 7655, 7656, 7657, 7658, 7659, 7660, 7661, 7662, + 7663, 7664, 7665, 7666, 7667, 7668, 7669, 7670, 7671, 7672, 7673, 7674, + 7675, 7676, 7677, 7678, 7679, 7680, 7681, 7682, 7683, 7684, 7685, 7686, + 7687, 7688, 7689, 7690, 7691, 7692, 7693, 7694, 7695, 7696, 7697, 7698, + 7699, 7700, 7701, 7702, 7703, 7704, 7705, 7706, 7707, 7708, 7709, 7710, + 7711, 7712, 7713, 7714, 7715, 7716, 7717, 7718, 7719, 7720, 7721, 7722, + 7723, 7724, 7725, 7726, 7727, 7728, 7729, 7730, 7731, 7732, 7733, 7734, + 7735, 7736, 7737, 7738, 7739, 7740, 7741, 7742, 7743, 7744, 7745, 7746, + 7747, 7748, 7749, 7750, 7751, 7752, 7753, 7754, 7755, 7756, 7757, 7758, + 7759, 7760, 7761, 7762, 7763, 7764, 7765, 7766, 7767, 7768, 7769, 7770, + 7771, 7772, 7773, 7774, 7775, 7776, 7777, 7778, 7779, 7780, 7781, 7782, + 7783, 7784, 7785, 7786, 7787, 7788, 7789, 7790, 7791, 7792, 7793, 7794, + 7795, 7796, 7797, 7798, 7799, 7800, 7801, 7802, 7803, 7804, 7805, 7806, + 7807, 7808, 7809, 7810, 7811, 7812, 7813, 7814, 7815, 7816, 7817, 7818, + 7819, 7820, 7821, 7822, 7823, 7824, 7825, 7826, 7827, 7828, 7829, 7830, + 7831, 7832, 7833, 7834, 7835, 7836, 7837, 7838, 7839, 7840, 7841, 7842, + 7843, 7844, 7845, 7846, 7847, 7848, 7849, 7850, 7851, 7852, 7853, 7854, + 7855, 7856, 7857, 7858, 7859, 7860, 7861, 7862, 7863, 7864, 7865, 7866, + 7867, 7868, 7869, 7870, 7871, 7872, 7873, 7874, 7875, 7876, 7877, 7878, + 7879, 7880, 7881, 7882, 7883, 7884, 7885, 7886, 7887, 7888, 7889, 7890, + 7891, 7892, 7893, 7894, 7895, 7896, 7897, 7898, 7899, 7900, 7901, 7902, + 7903, 7904, 7905, 7906, 7907, 7908, 7909, 7910, 7911, 7912, 7913, 7914, + 7915, 7916, 7917, 7918, 7919, 7920, 7921, 7922, 7923, 7924, 7925, 7926, + 7927, 7928, 7929, 7930, 7931, 7932, 7933, 7934, 7935, 7936, 7937, 7938, + 7939, 7940, 7941, 7942, 7943, 7944, 7945, 7946, 7947, 7948, 7949, 7950, + 7951, 7952, 7953, 7954, 7955, 7956, 7957, 7958, 7959, 7960, 7961, 7962, + 7963, 7964, 7965, 7966, 7967, 7968, 7969, 7970, 7971, 7972, 7973, 7974, + 7975, 7976, 7977, 7978, 7979, 7980, 7981, 7982, 7983, 7984, 7985, 7986, + 7987, 7988, 7989, 7990, 7991, 7992, 7993, 7994, 7995, 7996, 7997, 7998, + 7999, 8000, 8001, 8002, 8003, 8004, 8005, 8006, 8007, 8008, 8009, 8010, + 8011, 8012, 8013, 8014, 8015, 8016, 8017, 8018, 8019, 8020, 8021, 8022, + 8023, 8024, 8025, 8026, 8027, 8028, 8029, 8030, 8031, 8032, 8033, 8034, + 8035, 8036, 8037, 8038, 8039, 8040, 8041, 8042, 8043, 8044, 8045, 8046, + 8047, 8048, 8049, 8050, 8051, 8052, 8053, 8054, 8055, 8056, 8057, 8058, + 8059, 8060, 8061, 8062, 8063, 8064, 8065, 8066, 8067, 8068, 8069, 8070, + 8071, 8072, 8073, 8074, 8075, 8076, 8077, 8078, 8079, 8080, 8081, 8082, + 8083, 8084, 8085, 8086, 8087, 8088, 8089, 8090, 8091, 8092, 8093, 8094, + 8095, 8096, 8097, 8098, 8099, 8100, 8101, 8102, 8103, 8104, 8105, 8106, + 8107, 8108, 8109, 8110, 8111, 8112, 8113, 8114, 8115, 8116, 8117, 8118, + 8119, 8120, 8121, 8122, 8123, 8124, 8125, 8126, 8127, 8128, 8129, 8130, + 8131, 8132, 8133, 8134, 8135, 8136, 8137, 8138, 8139, 8140, 8141, 8142, + 8143, 8144, 8145, 8146, 8147, 8148, 8149, 8150, 8151, 8152, 8153, 8154, + 8155, 8156, 8157, 8158, 8159, 8160, 8161, 8162, 8163, 8164, 8165, 8166, + 8167, 8168, 8169, 8170, 8171, 8172, 8173, 8174, 8175, 8176, 8177, 8178, + 8179, 8180, 8181, 8182, 8183, 8184, 8185, 8186, 8187, 8188, 8189, 8190, + 8191, 8192, 8193, 8194, 8195, 8196, 8197, 8198, 8199, 8200, 8201, 8202, + 8203, 8204, 8205, 8206, 8207, 8208, 8209, 8210, 8211, 8212, 8213, 8214, + 8215, 8216, 8217, 8218, 8219, 8220, 8221, 8222, 8223, 8224, 8225, 8226, + 8227, 8228, 8229, 8230, 8231, 8232, 8233, 8234, 8235, 8236, 8237, 8238, + 8239, 8240, 8241, 8242, 8243, 8244, 8245, 8246, 8247, 8248, 8249, 8250, + 8251, 8252, 8253, 8254, 8255, 8256, 8257, 8258, 8259, 8260, 8261, 8262, + 8263, 8264, 8265, 8266, 8267, 8268, 8269, 8270, 8271, 8272, 8273, 8274, + 8275, 8276, 8277, 8278, 8279, 8280, 8281, 8282, 8283, 8284, 8285, 8286, + 8287, 8288, 8289, 8290, 8291, 8292, 8293, 8294, 8295, 8296, 8297, 8298, + 8299, 8300, 8301, 8302, 8303, 8304, 8305, 8306, 8307, 8308, 8309, 8310, + 8311, 8312, 8313, 8314, 8315, 8316, 8317, 8318, 8319, 8320, 8321, 8322, + 8323, 8324, 8325, 8326, 8327, 8328, 8329, 8330, 8331, 8332, 8333, 8334, + 8335, 8336, 8337, 8338, 8339, 8340, 8341, 8342, 8343, 8344, 8345, 8346, + 8347, 8348, 8349, 8350, 8351, 8352, 8353, 8354, 8355, 8356, 8357, 8358, + 8359, 8360, 8361, 8362, 8363, 8364, 8365, 8366, 8367, 8368, 8369, 8370, + 8371, 8372, 8373, 8374, 8375, 8376, 8377, 8378, 8379, 8380, 8381, 8382, + 8383, 8384, 8385, 8386, 8387, 8388, 8389, 8390, 8391, 8392, 8393, 8394, + 8395, 8396, 8397, 8398, 8399, 8400, 8401, 8402, 8403, 8404, 8405, 8406, + 8407, 8408, 8409, 8410, 8411, 8412, 8413, 8414, 8415, 8416, 8417, 8418, + 8419, 8420, 8421, 8422, 8423, 8424, 8425, 8426, 8427, 8428, 8429, 8430, + 8431, 8432, 8433, 8434, 8435, 8436, 8437, 8438, 8439, 8440, 8441, 8442, + 8443, 8444, 8445, 8446, 8447, 8448, 8449, 8450, 8451, 8452, 8453, 8454, + 8455, 8456, 8457, 8458, 8459, 8460, 8461, 8462, 8463, 8464, 8465, 8466, + 8467, 8468, 8469, 8470, 8471, 8472, 8473, 8474, 8475, 8476, 8477, 8478, + 8479, 8480, 8481, 8482, 8483, 8484, 8485, 8486, 8487, 8488, 8489, 8490, + 8491, 8492, 8493, 8494, 8495, 8496, 8497, 8498, 8499, 8500, 8501, 8502, + 8503, 8504, 8505, 8506, 8507, 8508, 8509, 8510, 8511, 8512, 8513, 8514, + 8515, 8516, 8517, 8518, 8519, 8520, 8521, 8522, 8523, 8524, 8525, 8526, + 8527, 8528, 8529, 8530, 8531, 8532, 8533, 8534, 8535, 8536, 8537, 8538, + 8539, 8540, 8541, 8542, 8543, 8544, 8545, 8546, 8547, 8548, 8549, 8550, + 8551, 8552, 8553, 8554, 8555, 8556, 8557, 8558, 8559, 8560, 8561, 8562, + 8563, 8564, 8565, 8566, 8567, 8568, 8569, 8570, 8571, 8572, 8573, 8574, + 8575, 8576, 8577, 8578, 8579, 8580, 8581, 8582, 8583, 8584, 8585, 8586, + 8587, 8588, 8589, 8590, 8591, 8592, 8593, 8594, 8595, 8596, 8597, 8598, + 8599, 8600, 8601, 8602, 8603, 8604, 8605, 8606, 8607, 8608, 8609, 8610, + 8611, 8612, 8613, 8614, 8615, 8616, 8617, 8618, 8619, 8620, 8621, 8622, + 8623, 8624, 8625, 8626, 8627, 8628, 8629, 8630, 8631, 8632, 8633, 8634, + 8635, 8636, 8637, 8638, 8639, 8640, 8641, 8642, 8643, 8644, 8645, 8646, + 8647, 8648, 8649, 8650, 8651, 8652, 8653, 8654, 8655, 8656, 8657, 8658, + 8659, 8660, 8661, 8662, 8663, 8664, 8665, 8666, 8667, 8668, 8669, 8670, + 8671, 8672, 8673, 8674, 8675, 8676, 8677, 8678, 8679, 8680, 8681, 8682, + 8683, 8684, 8685, 8686, 8687, 8688, 8689, 8690, 8691, 8692, 8693, 8694, + 8695, 8696, 8697, 8698, 8699, 8700, 8701, 8702, 8703, 8704, 8705, 8706, + 8707, 8708, 8709, 8710, 8711, 8712, 8713, 8714, 8715, 8716, 8717, 8718, + 8719, 8720, 8721, 8722, 8723, 8724, 8725, 8726, 8727, 8728, 8729, 8730, + 8731, 8732, 8733, 8734, 8735, 8736, 8737, 8738, 8739, 8740, 8741, 8742, + 8743, 8744, 8745, 8746, 8747, 8748, 8749, 8750, 8751, 8752, 8753, 8754, + 8755, 8756, 8757, 8758, 8759, 8760, 8761, 8762, 8763, 8764, 8765, 8766, + 8767, 8768, 8769, 8770, 8771, 8772, 8773, 8774, 8775, 8776, 8777, 8778, + 8779, 8780, 8781, 8782, 8783, 8784, 8785, 8786, 8787, 8788, 8789, 8790, + 8791, 8792, 8793, 8794, 8795, 8796, 8797, 8798, 8799, 8800, 8801, 8802, + 8803, 8804, 8805, 8806, 8807, 8808, 8809, 8810, 8811, 8812, 8813, 8814, + 8815, 8816, 8817, 8818, 8819, 8820, 8821, 8822, 8823, 8824, 8825, 8826, + 8827, 8828, 8829, 8830, 8831, 8832, 8833, 8834, 8835, 8836, 8837, 8838, + 8839, 8840, 8841, 8842, 8843, 8844, 8845, 8846, 8847, 8848, 8849, 8850, + 8851, 8852, 8853, 8854, 8855, 8856, 8857, 8858, 8859, 8860, 8861, 8862, + 8863, 8864, 8865, 8866, 8867, 8868, 8869, 8870, 8871, 8872, 8873, 8874, + 8875, 8876, 8877, 8878, 8879, 8880, 8881, 8882, 8883, 8884, 8885, 8886, + 8887, 8888, 8889, 8890, 8891, 8892, 8893, 8894, 8895, 8896, 8897, 8898, + 8899, 8900, 8901, 8902, 8903, 8904, 8905, 8906, 8907, 8908, 8909, 8910, + 8911, 8912, 8913, 8914, 8915, 8916, 8917, 8918, 8919, 8920, 8921, 8922, + 8923, 8924, 8925, 8926, 8927, 8928, 8929, 8930, 8931, 8932, 8933, 8934, + 8935, 8936, 8937, 8938, 8939, 8940, 8941, 8942, 8943, 8944, 8945, 8946, + 8947, 8948, 8949, 8950, 8951, 8952, 8953, 8954, 8955, 8956, 8957, 8958, + 8959, 8960, 8961, 8962, 8963, 8964, 8965, 8966, 8967, 8968, 8969, 8970, + 8971, 8972, 8973, 8974, 8975, 8976, 8977, 8978, 8979, 8980, 8981, 8982, + 8983, 8984, 8985, 8986, 8987, 8988, 8989, 8990, 8991, 8992, 8993, 8994, + 8995, 8996, 8997, 8998, 8999, 9000, 9001, 9002, 9003, 9004, 9005, 9006, + 9007, 9008, 9009, 9010, 9011, 9012, 9013, 9014, 9015, 9016, 9017, 9018, + 9019, 9020, 9021, 9022, 9023, 9024, 9025, 9026, 9027, 9028, 9029, 9030, + 9031, 9032, 9033, 9034, 9035, 9036, 9037, 9038, 9039, 9040, 9041, 9042, + 9043, 9044, 9045, 9046, 9047, 9048, 9049, 9050, 9051, 9052, 9053, 9054, + 9055, 9056, 9057, 9058, 9059, 9060, 9061, 9062, 9063, 9064, 9065, 9066, + 9067, 9068, 9069, 9070, 9071, 9072, 9073, 9074, 9075, 9076, 9077, 9078, + 9079, 9080, 9081, 9082, 9083, 9084, 9085, 9086, 9087, 9088, 9089, 9090, + 9091, 9092, 9093, 9094, 9095, 9096, 9097, 9098, 9099, 9100, 9101, 9102, + 9103, 9104, 9105, 9106, 9107, 9108, 9109, 9110, 9111, 9112, 9113, 9114, + 9115, 9116, 9117, 9118, 9119, 9120, 9121, 9122, 9123, 9124, 9125, 9126, + 9127, 9128, 9129, 9130, 9131, 9132, 9133, 9134, 9135, 9136, 9137, 9138, + 9139, 9140, 9141, 9142, 9143, 9144, 9145, 9146, 9147, 9148, 9149, 9150, + 9151, 9152, 9153, 9154, 9155, 9156, 9157, 9158, 9159, 9160, 9161, 9162, + 9163, 9164, 9165, 9166, 9167, 9168, 9169, 9170, 9171, 9172, 9173, 9174, + 9175, 9176, 9177, 9178, 9179, 9180, 9181, 9182, 9183, 9184, 9185, 9186, + 9187, 9188, 9189, 9190, 9191, 9192, 9193, 9194, 9195, 9196, 9197, 9198, + 9199, 9200, 9201, 9202, 9203, 9204, 9205, 9206, 9207, 9208, 9209, 9210, + 9211, 9212, 9213, 9214, 9215, 9216, 9217, 9218, 9219, 9220, 9221, 9222, + 9223, 9224, 9225, 9226, 9227, 9228, 9229, 9230, 9231, 9232, 9233, 9234, + 9235, 9236, 9237, 9238, 9239, 9240, 9241, 9242, 9243, 9244, 9245, 9246, + 9247, 9248, 9249, 9250, 9251, 9252, 9253, 9254, 9255, 9256, 9257, 9258, + 9259, 9260, 9261, 9262, 9263, 9264, 9265, 9266, 9267, 9268, 9269, 9270, + 9271, 9272, 9273, 9274, 9275, 9276, 9277, 9278, 9279, 9280, 9281, 9282, + 9283, 9284, 9285, 9286, 9287, 9288, 9289, 9290, 9291, 9292, 9293, 9294, + 9295, 9296, 9297, 9298, 9299, 9300, 9301, 9302, 9303, 9304, 9305, 9306, + 9307, 9308, 9309, 9310, 9311, 9312, 9313, 9314, 9315, 9316, 9317, 9318, + 9319, 9320, 9321, 9322, 9323, 9324, 9325, 9326, 9327, 9328, 9329, 9330, + 9331, 9332, 9333, 9334, 9335, 9336, 9337, 9338, 9339, 9340, 9341, 9342, + 9343, 9344, 9345, 9346, 9347, 9348, 9349, 9350, 9351, 9352, 9353, 9354, + 9355, 9356, 9357, 9358, 9359, 9360, 9361, 9362, 9363, 9364, 9365, 9366, + 9367, 9368, 9369, 9370, 9371, 9372, 9373, 9374, 9375, 9376, 9377, 9378, + 9379, 9380, 9381, 9382, 9383, 9384, 9385, 9386, 9387, 9388, 9389, 9390, + 9391, 9392, 9393, 9394, 9395, 9396, 9397, 9398, 9399, 9400, 9401, 9402, + 9403, 9404, 9405, 9406, 9407, 9408, 9409, 9410, 9411, 9412, 9413, 9414, + 9415, 9416, 9417, 9418, 9419, 9420, 9421, 9422, 9423, 9424, 9425, 9426, + 9427, 9428, 9429, 9430, 9431, 9432, 9433, 9434, 9435, 9436, 9437, 9438, + 9439, 9440, 9441, 9442, 9443, 9444, 9445, 9446, 9447, 9448, 9449, 9450, + 9451, 9452, 9453, 9454, 9455, 9456, 9457, 9458, 9459, 9460, 9461, 9462, + 9463, 9464, 9465, 9466, 9467, 9468, 9469, 9470, 9471, 9472, 9473, 9474, + 9475, 9476, 9477, 9478, 9479, 9480, 9481, 9482, 9483, 9484, 9485, 9486, + 9487, 9488, 9489, 9490, 9491, 9492, 9493, 9494, 9495, 9496, 9497, 9498, + 9499, 9500, 9501, 9502, 9503, 9504, 9505, 9506, 9507, 9508, 9509, 9510, + 9511, 9512, 9513, 9514, 9515, 9516, 9517, 9518, 9519, 9520, 9521, 9522, + 9523, 9524, 9525, 9526, 9527, 9528, 9529, 9530, 9531, 9532, 9533, 9534, + 9535, 9536, 9537, 9538, 9539, 9540, 9541, 9542, 9543, 9544, 9545, 9546, + 9547, 9548, 9549, 9550, 9551, 9552, 9553, 9554, 9555, 9556, 9557, 9558, + 9559, 9560, 9561, 9562, 9563, 9564, 9565, 9566, 9567, 9568, 9569, 9570, + 9571, 9572, 9573, 9574, 9575, 9576, 9577, 9578, 9579, 9580, 9581, 9582, + 9583, 9584, 9585, 9586, 9587, 9588, 9589, 9590, 9591, 9592, 9593, 9594, + 9595, 9596, 9597, 9598, 9599, 9600, 9601, 9602, 9603, 9604, 9605, 9606, + 9607, 9608, 9609, 9610, 9611, 9612, 9613, 9614, 9615, 9616, 9617, 9618, + 9619, 9620, 9621, 9622, 9623, 9624, 9625, 9626, 9627, 9628, 9629, 9630, + 9631, 9632, 9633, 9634, 9635, 9636, 9637, 9638, 9639, 9640, 9641, 9642, + 9643, 9644, 9645, 9646, 9647, 9648, 9649, 9650, 9651, 9652, 9653, 9654, + 9655, 9656, 9657, 9658, 9659, 9660, 9661, 9662, 9663, 9664, 9665, 9666, + 9667, 9668, 9669, 9670, 9671, 9672, 9673, 9674, 9675, 9676, 9677, 9678, + 9679, 9680, 9681, 9682, 9683, 9684, 9685, 9686, 9687, 9688, 9689, 9690, + 9691, 9692, 9693, 9694, 9695, 9696, 9697, 9698, 9699, 9700, 9701, 9702, + 9703, 9704, 9705, 9706, 9707, 9708, 9709, 9710, 9711, 9712, 9713, 9714, + 9715, 9716, 9717, 9718, 9719, 9720, 9721, 9722, 9723, 9724, 9725, 9726, + 9727, 9728, 9729, 9730, 9731, 9732, 9733, 9734, 9735, 9736, 9737, 9738, + 9739, 9740, 9741, 9742, 9743, 9744, 9745, 9746, 9747, 9748, 9749, 9750, + 9751, 9752, 9753, 9754, 9755, 9756, 9757, 9758, 9759, 9760, 9761, 9762, + 9763, 9764, 9765, 9766, 9767, 9768, 9769, 9770, 9771, 9772, 9773, 9774, + 9775, 9776, 9777, 9778, 9779, 9780, 9781, 9782, 9783, 9784, 9785, 9786, + 9787, 9788, 9789, 9790, 9791, 9792, 9793, 9794, 9795, 9796, 9797, 9798, + 9799, 9800, 9801, 9802, 9803, 9804, 9805, 9806, 9807, 9808, 9809, 9810, + 9811, 9812, 9813, 9814, 9815, 9816, 9817, 9818, 9819, 9820, 9821, 9822, + 9823, 9824, 9825, 9826, 9827, 9828, 9829, 9830, 9831, 9832, 9833, 9834, + 9835, 9836, 9837, 9838, 9839, 9840, 9841, 9842, 9843, 9844, 9845, 9846, + 9847, 9848, 9849, 9850, 9851, 9852, 9853, 9854, 9855, 9856, 9857, 9858, + 9859, 9860, 9861, 9862, 9863, 9864, 9865, 9866, 9867, 9868, 9869, 9870, + 9871, 9872, 9873, 9874, 9875, 9876, 9877, 9878, 9879, 9880, 9881, 9882, + 9883, 9884, 9885, 9886, 9887, 9888, 9889, 9890, 9891, 9892, 9893, 9894, + 9895, 9896, 9897, 9898, 9899, 9900, 9901, 9902, 9903, 9904, 9905, 9906, + 9907, 9908, 9909, 9910, 9911, 9912, 9913, 9914, 9915, 9916, 9917, 9918, + 9919, 9920, 9921, 9922, 9923, 9924, 9925, 9926, 9927, 9928, 9929, 9930, + 9931, 9932, 9933, 9934, 9935, 9936, 9937, 9938, 9939, 9940, 9941, 9942, + 9943, 9944, 9945, 9946, 9947, 9948, 9949, 9950, 9951, 9952, 9953, 9954, + 9955, 9956, 9957, 9958, 9959, 9960, 9961, 9962, 9963, 9964, 9965, 9966, + 9967, 9968, 9969, 9970, 9971, 9972, 9973, 9974, 9975, 9976, 9977, 9978, + 9979, 9980, 9981, 9982, 9983, 9984, 9985, 9986, 9987, 9988, 9989, 9990, + 9991, 9992, 9993, 9994, 9995, 9996, 9997, 9998, 9999, 10000, 10001, + 10002, 10003, 10004, 10005, 10006, 10007, 10008, 10009, 10010, 10011, + 10012, 10013, 10014, 10015, 10016, 10017, 10018, 10019, 10020, 10021, + 10022, 10023, 10024, 10025, 10026, 10027, 10028, 10029, 10030, 10031, + 10032, 10033, 10034, 10035, 10036, 10037, 10038, 10039, 10040, 10041, + 10042, 10043, 10044, 10045, 10046, 10047, 10048, 10049, 10050, 10051, + 10052, 10053, 10054, 10055, 10056, 10057, 10058, 10059, 10060, 10061, + 10062, 10063, 10064, 10065, 10066, 10067, 10068, 10069, 10070, 10071, + 10072, 10073, 10074, 10075, 10076, 10077, 10078, 10079, 10080, 10081, + 10082, 10083, 10084, 10085, 10086, 10087, 10088, 10089, 10090, 10091, + 10092, 10093, 10094, 10095, 10096, 10097, 10098, 10099, 10100, 10101, + 10102, 10103, 10104, 10105, 10106, 10107, 10108, 10109, 10110, 10111, + 10112, 10113, 10114, 10115, 10116, 10117, 10118, 10119, 10120, 10121, + 10122, 10123, 10124, 10125, 10126, 10127, 10128, 10129, 10130, 10131, + 10132, 10133, 10134, 10135, 10136, 10137, 10138, 10139, 10140, 10141, + 10142, 10143, 10144, 10145, 10146, 10147, 10148, 10149, 10150, 10151, + 10152, 10153, 10154, 10155, 10156, 10157, 10158, 10159, 10160, 10161, + 10162, 10163, 10164, 10165, 10166, 10167, 10168, 10169, 10170, 10171, + 10172, 10173, 10174, 10175, 10176, 10177, 10178, 10179, 10180, 10181, + 10182, 10183, 10184, 10185, 10186, 10187, 10188, 10189, 10190, 10191, + 10192, 10193, 10194, 10195, 10196, 10197, 10198, 10199, 10200, 10201, + 10202, 10203, 10204, 10205, 10206, 10207, 10208, 10209, 10210, 10211, + 10212, 10213, 10214, 10215, 10216, 10217, 10218, 10219, 10220, 10221, + 10222, 10223, 10224, 10225, 10226, 10227, 10228, 10229, 10230, 10231, + 10232, 10233, 10234, 10235, 10236, 10237, 10238, 10239, 10240, 10241, + 10242, 10243, 10244, 10245, 10246, 10247, 10248, 10249, 10250, 10251, + 10252, 10253, 10254, 10255, 10256, 10257, 10258, 10259, 10260, 10261, + 10262, 10263, 10264, 10265, 10266, 10267, 10268, 10269, 10270, 10271, + 10272, 10273, 10274, 10275, 10276, 10277, 10278, 10279, 10280, 10281, + 10282, 10283, 10284, 10285, 10286, 10287, 10288, 10289, 10290, 10291, + 10292, 10293, 10294, 10295, 10296, 10297, 10298, 10299, 10300, 10301, + 10302, 10303, 10304, 10305, 10306, 10307, 10308, 10309, 10310, 10311, + 10312, 10313, 10314, 10315, 10316, 10317, 10318, 10319, 10320, 10321, + 10322, 10323, 10324, 10325, 10326, 10327, 10328, 10329, 10330, 10331, + 10332, 10333, 10334, 10335, 10336, 10337, 10338, 10339, 10340, 10341, + 10342, 10343, 10344, 10345, 10346, 10347, 10348, 10349, 10350, 10351, + 10352, 10353, 10354, 10355, 10356, 10357, 10358, 10359, 10360, 10361, + 10362, 10363, 10364, 10365, 10366, 10367, 10368, 10369, 10370, 10371, + 10372, 10373, 10374, 10375, 10376, 10377, 10378, 10379, 10380, 10381, + 10382, 10383, 10384, 10385, 10386, 10387, 10388, 10389, 10390, 10391, + 10392, 10393, 10394, 10395, 10396, 10397, 10398, 10399, 10400, 10401, + 10402, 10403, 10404, 10405, 10406, 10407, 10408, 10409, 10410, 10411, + 10412, 10413, 10414, 10415, 10416, 10417, 10418, 10419, 10420, 10421, + 10422, 10423, 10424, 10425, 10426, 10427, 10428, 10429, 10430, 10431, + 10432, 10433, 10434, 10435, 10436, 10437, 10438, 10439, 10440, 10441, + 10442, 10443, 10444, 10445, 10446, 10447, 10448, 10449, 10450, 10451, + 10452, 10453, 10454, 10455, 10456, 10457, 10458, 10459, 10460, 10461, + 10462, 10463, 10464, 10465, 10466, 10467, 10468, 10469, 10470, 10471, + 10472, 10473, 10474, 10475, 10476, 10477, 10478, 10479, 10480, 10481, + 10482, 10483, 10484, 10485, 10486, 10487, 10488, 10489, 10490, 10491, + 10492, 10493, 10494, 10495, 10496, 10497, 10498, 10499, 10500, 10501, + 10502, 10503, 10504, 10505, 10506, 10507, 10508, 10509, 10510, 10511, + 10512, 10513, 10514, 10515, 10516, 10517, 10518, 10519, 10520, 10521, + 10522, 10523, 10524, 10525, 10526, 10527, 10528, 10529, 10530, 10531, + 10532, 10533, 10534, 10535, 10536, 10537, 10538, 10539, 10540, 10541, + 10542, 10543, 10544, 10545, 10546, 10547, 10548, 10549, 10550, 10551, + 10552, 10553, 10554, 10555, 10556, 10557, 10558, 10559, 10560, 10561, + 10562, 10563, 10564, 10565, 10566, 10567, 10568, 10569, 10570, 10571, + 10572, 10573, 10574, 10575, 10576, 10577, 10578, 10579, 10580, 10581, + 10582, 10583, 10584, 10585, 10586, 10587, 10588, 10589, 10590, 10591, + 10592, 10593, 10594, 10595, 10596, 10597, 10598, 10599, 10600, 10601, + 10602, 10603, 10604, 10605, 10606, 10607, 10608, 10609, 10610, 10611, + 10612, 10613, 10614, 10615, 10616, 10617, 10618, 10619, 10620, 10621, + 10622, 10623, 10624, 10625, 10626, 10627, 10628, 10629, 10630, 10631, + 10632, 10633, 10634, 10635, 10636, 10637, 10638, 10639, 10640, 10641, + 10642, 10643, 10644, 10645, 10646, 10647, 10648, 10649, 10650, 10651, + 10652, 10653, 10654, 10655, 10656, 10657, 10658, 10659, 10660, 10661, + 10662, 10663, 10664, 10665, 10666, 10667, 10668, 10669, 10670, 10671, + 10672, 10673, 10674, 10675, 10676, 10677, 10678, 10679, 10680, 10681, + 10682, 10683, 10684, 10685, 10686, 10687, 10688, 10689, 10690, 10691, + 10692, 10693, 10694, 10695, 10696, 10697, 10698, 10699, 10700, 10701, + 10702, 10703, 10704, 10705, 10706, 10707, 10708, 10709, 10710, 10711, + 10712, 10713, 10714, 10715, 10716, 10717, 10718, 10719, 10720, 10721, + 10722, 10723, 10724, 10725, 10726, 10727, 10728, 10729, 10730, 10731, + 10732, 10733, 10734, 10735, 10736, 10737, 10738, 10739, 10740, 10741, + 10742, 10743, 10744, 10745, 10746, 10747, 10748, 10749, 10750, 10751, + 10752, 10753, 10754, 10755, 10756, 10757, 10758, 10759, 10760, 10761, + 10762, 10763, 10764, 10765, 10766, 10767, 10768, 10769, 10770, 10771, + 10772, 10773, 10774, 10775, 10776, 10777, 10778, 10779, 10780, 10781, + 10782, 10783, 10784, 10785, 10786, 10787, 10788, 10789, 10790, 10791, + 10792, 10793, 10794, 10795, 10796, 10797, 10798, 10799, 10800, 10801, + 10802, 10803, 10804, 10805, 10806, 10807, 10808, 10809, 10810, 10811, + 10812, 10813, 10814, 10815, 10816, 10817, 10818, 10819, 10820, 10821, + 10822, 10823, 10824, 10825, 10826, 10827, 10828, 10829, 10830, 10831, + 10832, 10833, 10834, 10835, 10836, 10837, 10838, 10839, 10840, 10841, + 10842, 10843, 10844, 10845, 10846, 10847, 10848, 10849, 10850, 10851, + 10852, 10853, 10854, 10855, 10856, 10857, 10858, 10859, 10860, 10861, + 10862, 10863, 10864, 10865, 10866, 10867, 10868, 10869, 10870, 10871, + 10872, 10873, 10874, 10875, 10876, 10877, 10878, 10879, 10880, 10881, + 10882, 10883, 10884, 10885, 10886, 10887, 10888, 10889, 10890, 10891, + 10892, 10893, 10894, 10895, 10896, 10897, 10898, 10899, 10900, 10901, + 10902, 10903, 10904, 10905, 10906, 10907, 10908, 10909, 10910, 10911, + 10912, 10913, 10914, 10915, 10916, 10917, 10918, 10919, 10920, 10921, + 10922, 10923, 10924, 10925, 10926, 10927, 10928, 10929, 10930, 10931, + 10932, 10933, 10934, 10935, 10936, 10937, 10938, 10939, 10940, 10941, + 10942, 10943, 10944, 10945, 10946, 10947, 10948, 10949, 10950, 10951, + 10952, 10953, 10954, 10955, 10956, 10957, 10958, 10959, 10960, 10961, + 10962, 10963, 10964, 10965, 10966, 10967, 10968, 10969, 10970, 10971, + 10972, 10973, 10974, 10975, 10976, 10977, 10978, 10979, 10980, 10981, + 10982, 10983, 10984, 10985, 10986, 10987, 10988, 10989, 10990, 10991, + 10992, 10993, 10994, 10995, 10996, 10997, 10998, 10999, 11000, 11001, + 11002, 11003, 11004, 11005, 11006, 11007, 11008, 11009, 11010, 11011, + 11012, 11013, 11014, 11015, 11016, 11017, 11018, 11019, 11020, 11021, + 11022, 11023, 11024, 11025, 11026, 11027, 11028, 11029, 11030, 11031, + 11032, 11033, 11034, 11035, 11036, 11037, 11038, 11039, 11040, 11041, + 11042, 11043, 11044, 11045, 11046, 11047, 11048, 11049, 11050, 11051, + 11052, 11053, 11054, 11055, 11056, 11057, 11058, 11059, 11060, 11061, + 11062, 11063, 11064, 11065, 11066, 11067, 11068, 11069, 11070, 11071, + 11072, 11073, 11074, 11075, 11076, 11077, 11078, 11079, 11080, 11081, + 11082, 11083, 11084, 11085, 11086, 11087, 11088, 11089, 11090, 11091, + 11092, 11093, 11094, 11095, 11096, 11097, 11098, 11099, 11100, 11101, + 11102, 11103, 11104, 11105, 11106, 11107, 11108, 11109, 11110, 11111, + 11112, 11113, 11114, 11115, 11116, 11117, 11118, 11119, 11120, 11121, + 11122, 11123, 11124, 11125, 11126, 11127, 11128, 11129, 11130, 11131, + 11132, 11133, 11134, 11135, 11136, 11137, 11138, 11139, 11140, 11141, + 11142, 11143, 11144, 11145, 11146, 11147, 11148, 11149, 11150, 11151, + 11152, 11153, 11154, 11155, 11156, 11157, 11158, 11159, 11160, 11161, + 11162, 11163, 11164, 11165, 11166, 11167, 11168, 11169, 11170, 11171, + 11172, 11173, 11174, 11175, 11176, 11177, 11178, 11179, 11180, 11181, + 11182, 11183, 11184, 11185, 11186, 11187, 11188, 11189, 11190, 11191, + 11192, 11193, 11194, 11195, 11196, 11197, 11198, 11199, 11200, 11201, + 11202, 11203, 11204, 11205, 11206, 11207, 11208, 11209, 11210, 11211, + 11212, 11213, 11214, 11215, 11216, 11217, 11218, 11219, 11220, 11221, + 11222, 11223, 11224, 11225, 11226, 11227, 11228, 11229, 11230, 11231, + 11232, 11233, 11234, 11235, 11236, 11237, 11238, 11239, 11240, 11241, + 11242, 11243, 11244, 11245, 11246, 11247, 11248, 11249, 11250, 11251, + 11252, 11253, 11254, 11255, 11256, 11257, 11258, 11259, 11260, 11261, + 11262, 11263, 11264, 11265, 11266, 11267, 11268, 11269, 11270, 11271, + 11272, 11273, 11274, 11275, 11276, 11277, 11278, 11279, 11280, 11281, + 11282, 11283, 11284, 11285, 11286, 11287, 11288, 11289, 11290, 11291, + 11292, 11293, 11294, 11295, 11296, 11297, 11298, 11299, 11300, 11301, + 11302, 11303, 11304, 11305, 11306, 11307, 11308, 11309, 11310, 11311, + 11312, 11313, 11314, 11315, 11316, 11317, 11318, 11319, 11320, 11321, + 11322, 11323, 11324, 11325, 11326, 11327, 11328, 11329, 11330, 11331, + 11332, 11333, 11334, 11335, 11336, 11337, 11338, 11339, 11340, 11341, + 11342, 11343, 11344, 11345, 11346, 11347, 11348, 11349, 11350, 11351, + 11352, 11353, 11354, 11355, 11356, 11357, 11358, 11359, 11360, 11361, + 11362, 11363, 11364, 11365, 11366, 11367, 11368, 11369, 11370, 11371, + 11372, 11373, 11374, 11375, 11376, 11377, 11378, 11379, 11380, 11381, + 11382, 11383, 11384, 11385, 11386, 11387, 11388, 11389, 11390, 11391, + 11392, 11393, 11394, 11395, 11396, 11397, 11398, 11399, 11400, 11401, + 11402, 11403, 11404, 11405, 11406, 11407, 11408, 11409, 11410, 11411, + 11412, 11413, 11414, 11415, 11416, 11417, 11418, 11419, 11420, 11421, + 11422, 11423, 11424, 11425, 11426, 11427, 11428, 11429, 11430, 11431, + 11432, 11433, 11434, 11435, 11436, 11437, 11438, 11439, 11440, 11441, + 11442, 11443, 11444, 11445, 11446, 11447, 11448, 11449, 11450, 11451, + 11452, 11453, 11454, 11455, 11456, 11457, 11458, 11459, 11460, 11461, + 11462, 11463, 11464, 11465, 11466, 11467, 11468, 11469, 11470, 11471, + 11472, 11473, 11474, 11475, 11476, 11477, 11478, 11479, 11480, 11481, + 11482, 11483, 11484, 11485, 11486, 11487, 11488, 11489, 11490, 11491, + 11492, 11493, 11494, 11495, 11496, 11497, 11498, 11499, 11500, 11501, + 11502, 11503, 11504, 11505, 11506, 11507, 11508, 11509, 11510, 11511, + 11512, 11513, 11514, 11515, 11516, 11517, 11518, 11519, 11520, 11521, + 11522, 11523, 11524, 11525, 11526, 11527, 11528, 11529, 11530, 11531, + 11532, 11533, 11534, 11535, 11536, 11537, 11538, 11539, 11540, 11541, + 11542, 11543, 11544, 11545, 11546, 11547, 11548, 11549, 11550, 11551, + 11552, 11553, 11554, 11555, 11556, 11557, 11558, 11559, 11560, 11561, + 11562, 11563, 11564, 11565, 11566, 11567, 11568, 11569, 11570, 11571, + 11572, 11573, 11574, 11575, 11576, 11577, 11578, 11579, 11580, 11581, + 11582, 11583, 11584, 11585, 11586, 11587, 11588, 11589, 11590, 11591, + 11592, 11593, 11594, 11595, 11596, 11597, 11598, 11599, 11600, 11601, + 11602, 11603, 11604, 11605, 11606, 11607, 11608, 11609, 11610, 11611, + 11612, 11613, 11614, 11615, 11616, 11617, 11618, 11619, 11620, 11621, + 11622, 11623, 11624, 11625, 11626, 11627, 11628, 11629, 11630, 11631, + 11632, 11633, 11634, 11635, 11636, 11637, 11638, 11639, 11640, 11641, + 11642, 11643, 11644, 11645, 11646, 11647, 11648, 11649, 11650, 11651, + 11652, 11653, 11654, 11655, 11656, 11657, 11658, 11659, 11660, 11661, + 11662, 11663, 11664, 11665, 11666, 11667, 11668, 11669, 11670, 11671, + 11672, 11673, 11674, 11675, 11676, 11677, 11678, 11679, 11680, 11681, + 11682, 11683, 11684, 11685, 11686, 11687, 11688, 11689, 11690, 11691, + 11692, 11693, 11694, 11695, 11696, 11697, 11698, 11699, 11700, 11701, + 11702, 11703, 11704, 11705, 11706, 11707, 11708, 11709, 11710, 11711, + 11712, 11713, 11714, 11715, 11716, 11717, 11718, 11719, 11720, 11721, + 11722, 11723, 11724, 11725, 11726, 11727, 11728, 11729, 11730, 11731, + 11732, 11733, 11734, 11735, 11736, 11737, 11738, 11739, 11740, 11741, + 11742, 11743, 11744, 11745, 11746, 11747, 11748, 11749, 11750, 11751, + 11752, 11753, 11754, 11755, 11756, 11757, 11758, 11759, 11760, 11761, + 11762, 11763, 11764, 11765, 11766, 11767, 11768, 11769, 11770, 11771, + 11772, 11773, 11774, 11775, 11776, 11777, 11778, 11779, 11780, 11781, + 11782, 11783, 11784, 11785, 11786, 11787, 11788, 11789, 11790, 11791, + 11792, 11793, 11794, 11795, 11796, 11797, 11798, 11799, 11800, 11801, + 11802, 11803, 11804, 11805, 11806, 11807, 11808, 11809, 11810, 11811, + 11812, 11813, 11814, 11815, 11816, 11817, 11818, 11819, 11820, 11821, + 11822, 11823, 11824, 11825, 11826, 11827, 11828, 11829, 11830, 11831, + 11832, 11833, 11834, 11835, 11836, 11837, 11838, 11839, 11840, 11841, + 11842, 11843, 11844, 11845, 11846, 11847, 11848, 11849, 11850, 11851, + 11852, 11853, 11854, 11855, 11856, 11857, 11858, 11859, 11860, 11861, + 11862, 11863, 11864, 11865, 11866, 11867, 11868, 11869, 11870, 11871, + 11872, 11873, 11874, 11875, 11876, 11877, 11878, 11879, 11880, 11881, + 11882, 11883, 11884, 11885, 11886, 11887, 11888, 11889, 11890, 11891, + 11892, 11893, 11894, 11895, 11896, 11897, 11898, 11899, 11900, 11901, + 11902, 11903, 11904, 11905, 11906, 11907, 11908, 11909, 11910, 11911, + 11912, 11913, 11914, 11915, 11916, 11917, 11918, 11919, 11920, 11921, + 11922, 11923, 11924, 11925, 11926, 11927, 11928, 11929, 11930, 11931, + 11932, 11933, 11934, 11935, 11936, 11937, 11938, 11939, 11940, 11941, + 11942, 11943, 11944, 11945, 11946, 11947, 11948, 11949, 11950, 11951, + 11952, 11953, 11954, 11955, 11956, 11957, 11958, 11959, 11960, 11961, + 11962, 11963, 11964, 11965, 11966, 11967, 11968, 11969, 11970, 11971, + 11972, 11973, 11974, 11975, 11976, 11977, 11978, 11979, 11980, 11981, + 11982, 11983, 11984, 11985, 11986, 11987, 11988, 11989, 11990, 11991, + 11992, 11993, 11994, 11995, 11996, 11997, 11998, 11999, 12000, 12001, + 12002, 12003, 12004, 12005, 12006, 12007, 12008, 12009, 12010, 12011, + 12012, 12013, 12014, 12015, 12016, 12017, 12018, 12019, 12020, 12021, + 12022, 12023, 12024, 12025, 12026, 12027, 12028, 12029, 12030, 12031, + 12032, 12033, 12034, 12035, 12036, 12037, 12038, 12039, 12040, 12041, + 12042, 12043, 12044, 12045, 12046, 12047, 12048, 12049, 12050, 12051, + 12052, 12053, 12054, 12055, 12056, 12057, 12058, 12059, 12060, 12061, + 12062, 12063, 12064, 12065, 12066, 12067, 12068, 12069, 12070, 12071, + 12072, 12073, 12074, 12075, 12076, 12077, 12078, 12079, 12080, 12081, + 12082, 12083, 12084, 12085, 12086, 12087, 12088, 12089, 12090, 12091, + 12092, 12093, 12094, 12095, 12096, 12097, 12098, 12099, 12100, 12101, + 12102, 12103, 12104, 12105, 12106, 12107, 12108, 12109, 12110, 12111, + 12112, 12113, 12114, 12115, 12116, 12117, 12118, 12119, 12120, 12121, + 12122, 12123, 12124, 12125, 12126, 12127, 12128, 12129, 12130, 12131, + 12132, 12133, 12134, 12135, 12136, 12137, 12138, 12139, 12140, 12141, + 12142, 12143, 12144, 12145, 12146, 12147, 12148, 12149, 12150, 12151, + 12152, 12153, 12154, 12155, 12156, 12157, 12158, 12159, 12160, 12161, + 12162, 12163, 12164, 12165, 12166, 12167, 12168, 12169, 12170, 12171, + 12172, 12173, 12174, 12175, 12176, 12177, 12178, 12179, 12180, 12181, + 12182, 12183, 12184, 12185, 12186, 12187, 12188, 12189, 12190, 12191, + 12192, 12193, 12194, 12195, 12196, 12197, 12198, 12199, 12200, 12201, + 12202, 12203, 12204, 12205, 12206, 12207, 12208, 12209, 12210, 12211, + 12212, 12213, 12214, 12215, 12216, 12217, 12218, 12219, 12220, 12221, + 12222, 12223, 12224, 12225, 12226, 12227, 12228, 12229, 12230, 12231, + 12232, 12233, 12234, 12235, 12236, 12237, 12238, 12239, 12240, 12241, + 12242, 12243, 12244, 12245, 12246, 12247, 12248, 12249, 12250, 12251, + 12252, 12253, 12254, 12255, 12256, 12257, 12258, 12259, 12260, 12261, + 12262, 12263, 12264, 12265, 12266, 12267, 12268, 12269, 12270, 12271, + 12272, 12273, 12274, 12275, 12276, 12277, 12278, 12279, 12280, 12281, + 12282, 12283, 12284, 12285, 12286, 12287, 12288, 12289, 12290, 12291, + 12292, 12293, 12294, 12295, 12296, 12297, 12298, 12299, 12300, 12301, + 12302, 12303, 12304, 12305, 12306, 12307, 12308, 12309, 12310, 12311, + 12312, 12313, 12314, 12315, 12316, 12317, 12318, 12319, 12320, 12321, + 12322, 12323, 12324, 12325, 12326, 12327, 12328, 12329, 12330, 12331, + 12332, 12333, 12334, 12335, 12336, 12337, 12338, 12339, 12340, 12341, + 12342, 12343, 12344, 12345, 12346, 12347, 12348, 12349, 12350, 12351, + 12352, 12353, 12354, 12355, 12356, 12357, 12358, 12359, 12360, 12361, + 12362, 12363, 12364, 12365, 12366, 12367, 12368, 12369, 12370, 12371, + 12372, 12373, 12374, 12375, 12376, 12377, 12378, 12379, 12380, 12381, + 12382, 12383, 12384, 12385, 12386, 12387, 12388, 12389, 12390, 12391, + 12392, 12393, 12394, 12395, 12396, 12397, 12398, 12399, 12400, 12401, + 12402, 12403, 12404, 12405, 12406, 12407, 12408, 12409, 12410, 12411, + 12412, 12413, 12414, 12415, 12416, 12417, 12418, 12419, 12420, 12421, + 12422, 12423, 12424, 12425, 12426, 12427, 12428, 12429, 12430, 12431, + 12432, 12433, 12434, 12435, 12436, 12437, 12438, 12439, 12440, 12441, + 12442, 12443, 12444, 12445, 12446, 12447, 12448, 12449, 12450, 12451, + 12452, 12453, 12454, 12455, 12456, 12457, 12458, 12459, 12460, 12461, + 12462, 12463, 12464, 12465, 12466, 12467, 12468, 12469, 12470, 12471, + 12472, 12473, 12474, 12475, 12476, 12477, 12478, 12479, 12480, 12481, + 12482, 12483, 12484, 12485, 12486, 12487, 12488, 12489, 12490, 12491, + 12492, 12493, 12494, 12495, 12496, 12497, 12498, 12499, 12500, 12501, + 12502, 12503, 12504, 12505, 12506, 12507, 12508, 12509, 12510, 12511, + 12512, 12513, 12514, 12515, 12516, 12517, 12518, 12519, 12520, 12521, + 12522, 12523, 12524, 12525, 12526, 12527, 12528, 12529, 12530, 12531, + 12532, 12533, 12534, 12535, 12536, 12537, 12538, 12539, 12540, 12541, + 12542, 12543, 12544, 12545, 12546, 12547, 12548, 12549, 12550, 12551, + 12552, 12553, 12554, 12555, 12556, 12557, 12558, 12559, 12560, 12561, + 12562, 12563, 12564, 12565, 12566, 12567, 12568, 12569, 12570, 12571, + 12572, 12573, 12574, 12575, 12576, 12577, 12578, 12579, 12580, 12581, + 12582, 12583, 12584, 12585, 12586, 12587, 12588, 12589, 12590, 12591, + 12592, 12593, 12594, 12595, 12596, 12597, 12598, 12599, 12600, 12601, + 12602, 12603, 12604, 12605, 12606, 12607, 12608, 12609, 12610, 12611, + 12612, 12613, 12614, 12615, 12616, 12617, 12618, 12619, 12620, 12621, + 12622, 12623, 12624, 12625, 12626, 12627, 12628, 12629, 12630, 12631, + 12632, 12633, 12634, 12635, 12636, 12637, 12638, 12639, 12640, 12641, + 12642, 12643, 12644, 12645, 12646, 12647, 12648, 12649, 12650, 12651, + 12652, 12653, 12654, 12655, 12656, 12657, 12658, 12659, 12660, 12661, + 12662, 12663, 12664, 12665, 12666, 12667, 12668, 12669, 12670, 12671, + 12672, 12673, 12674, 12675, 12676, 12677, 12678, 12679, 12680, 12681, + 12682, 12683, 12684, 12685, 12686, 12687, 12688, 12689, 12690, 12691, + 12692, 12693, 12694, 12695, 12696, 12697, 12698, 12699, 12700, 12701, + 12702, 12703, 12704, 12705, 12706, 12707, 12708, 12709, 12710, 12711, + 12712, 12713, 12714, 12715, 12716, 12717, 12718, 12719, 12720, 12721, + 12722, 12723, 12724, 12725, 12726, 12727, 12728, 12729, 12730, 12731, + 12732, 12733, 12734, 12735, 12736, 12737, 12738, 12739, 12740, 12741, + 12742, 12743, 12744, 12745, 12746, 12747, 12748, 12749, 12750, 12751, + 12752, 12753, 12754, 12755, 12756, 12757, 12758, 12759, 12760, 12761, + 12762, 12763, 12764, 12765, 12766, 12767, 12768, 12769, 12770, 12771, + 12772, 12773, 12774, 12775, 12776, 12777, 12778, 12779, 12780, 12781, + 12782, 12783, 12784, 12785, 12786, 12787, 12788, 12789, 12790, 12791, + 12792, 12793, 12794, 12795, 12796, 12797, 12798, 12799, 12800, 12801, + 12802, 12803, 12804, 12805, 12806, 12807, 12808, 12809, 12810, 12811, + 12812, 12813, 12814, 12815, 12816, 12817, 12818, 12819, 12820, 12821, + 12822, 12823, 12824, 12825, 12826, 12827, 12828, 12829, 12830, 12831, + 12832, 12833, 12834, 12835, 12836, 12837, 12838, 12839, 12840, 12841, + 12842, 12843, 12844, 12845, 12846, 12847, 12848, 12849, 12850, 12851, + 12852, 12853, 12854, 12855, 12856, 12857, 12858, 12859, 12860, 12861, + 12862, 12863, 12864, 12865, 12866, 12867, 12868, 12869, 12870, 12871, + 12872, 12873, 12874, 12875, 12876, 12877, 12878, 12879, 12880, 12881, + 12882, 12883, 12884, 12885, 12886, 12887, 12888, 12889, 12890, 12891, + 12892, 12893, 12894, 12895, 12896, 12897, 12898, 12899, 12900, 12901, + 12902, 12903, 12904, 12905, 12906, 12907, 12908, 12909, 12910, 12911, + 12912, 12913, 12914, 12915, 12916, 12917, 12918, 12919, 12920, 12921, + 12922, 12923, 12924, 12925, 12926, 12927, 12928, 12929, 12930, 12931, + 12932, 12933, 12934, 12935, 12936, 12937, 12938, 12939, 12940, 12941, + 12942, 12943, 12944, 12945, 12946, 12947, 12948, 12949, 12950, 12951, + 12952, 12953, 12954, 12955, 12956, 12957, 12958, 12959, 12960, 12961, + 12962, 12963, 12964, 12965, 12966, 12967, 12968, 12969, 12970, 12971, + 12972, 12973, 12974, 12975, 12976, 12977, 12978, 12979, 12980, 12981, + 12982, 12983, 12984, 12985, 12986, 12987, 12988, 12989, 12990, 12991, + 12992, 12993, 12994, 12995, 12996, 12997, 12998, 12999, 13000, 13001, + 13002, 13003, 13004, 13005, 13006, 13007, 13008, 13009, 13010, 13011, + 13012, 13013, 13014, 13015, 13016, 13017, 13018, 13019, 13020, 13021, + 13022, 13023, 13024, 13025, 13026, 13027, 13028, 13029, 13030, 13031, + 13032, 13033, 13034, 13035, 13036, 13037, 13038, 13039, 13040, 13041, + 13042, 13043, 13044, 13045, 13046, 13047, 13048, 13049, 13050, 13051, + 13052, 13053, 13054, 13055, 13056, 13057, 13058, 13059, 13060, 13061, + 13062, 13063, 13064, 13065, 13066, 13067, 13068, 13069, 13070, 13071, + 13072, 13073, 13074, 13075, 13076, 13077, 13078, 13079, 13080, 13081, + 13082, 13083, 13084, 13085, 13086, 13087, 13088, 13089, 13090, 13091, + 13092, 13093, 13094, 13095, 13096, 13097, 13098, 13099, 13100, 13101, + 13102, 13103, 13104, 13105, 13106, 13107, 13108, 13109, 13110, 13111, + 13112, 13113, 13114, 13115, 13116, 13117, 13118, 13119, 13120, 13121, + 13122, 13123, 13124, 13125, 13126, 13127, 13128, 13129, 13130, 13131, + 13132, 13133, 13134, 13135, 13136, 13137, 13138, 13139, 13140, 13141, + 13142, 13143, 13144, 13145, 13146, 13147, 13148, 13149, 13150, 13151, + 13152, 13153, 13154, 13155, 13156, 13157, 13158, 13159, 13160, 13161, + 13162, 13163, 13164, 13165, 13166, 13167, 13168, 13169, 13170, 13171, + 13172, 13173, 13174, 13175, 13176, 13177, 13178, 13179, 13180, 13181, + 13182, 13183, 13184, 13185, 13186, 13187, 13188, 13189, 13190, 13191, + 13192, 13193, 13194, 13195, 13196, 13197, 13198, 13199, 13200, 13201, + 13202, 13203, 13204, 13205, 13206, 13207, 13208, 13209, 13210, 13211, + 13212, 13213, 13214, 13215, 13216, 13217, 13218, 13219, 13220, 13221, + 13222, 13223, 13224, 13225, 13226, 13227, 13228, 13229, 13230, 13231, + 13232, 13233, 13234, 13235, 13236, 13237, 13238, 13239, 13240, 13241, + 13242, 13243, 13244, 13245, 13246, 13247, 13248, 13249, 13250, 13251, + 13252, 13253, 13254, 13255, 13256, 13257, 13258, 13259, 13260, 13261, + 13262, 13263, 13264, 13265, 13266, 13267, 13268, 13269, 13270, 13271, + 13272, 13273, 13274, 13275, 13276, 13277, 13278, 13279, 13280, 13281, + 13282, 13283, 13284, 13285, 13286, 13287, 13288, 13289, 13290, 13291, + 13292, 13293, 13294, 13295, 13296, 13297, 13298, 13299, 13300, 13301, + 13302, 13303, 13304, 13305, 13306, 13307, 13308, 13309, 13310, 13311, + 13312, 13313, 13314, 13315, 13316, 13317, 13318, 13319, 13320, 13321, + 13322, 13323, 13324, 13325, 13326, 13327, 13328, 13329, 13330, 13331, + 13332, 13333, 13334, 13335, 13336, 13337, 13338, 13339, 13340, 13341, + 13342, 13343, 13344, 13345, 13346, 13347, 13348, 13349, 13350, 13351, + 13352, 13353, 13354, 13355, 13356, 13357, 13358, 13359, 13360, 13361, + 13362, 13363, 13364, 13365, 13366, 13367, 13368, 13369, 13370, 13371, + 13372, 13373, 13374, 13375, 13376, 13377, 13378, 13379, 13380, 13381, + 13382, 13383, 13384, 13385, 13386, 13387, 13388, 13389, 13390, 13391, + 13392, 13393, 13394, 13395, 13396, 13397, 13398, 13399, 13400, 13401, + 13402, 13403, 13404, 13405, 13406, 13407, 13408, 13409, 13410, 13411, + 13412, 13413, 13414, 13415, 13416, 13417, 13418, 13419, 13420, 13421, + 13422, 13423, 13424, 13425, 13426, 13427, 13428, 13429, 13430, 13431, + 13432, 13433, 13434, 13435, 13436, 13437, 13438, 13439, 13440, 13441, + 13442, 13443, 13444, 13445, 13446, 13447, 13448, 13449, 13450, 13451, + 13452, 13453, 13454, 13455, 13456, 13457, 13458, 13459, 13460, 13461, + 13462, 13463, 13464, 13465, 13466, 13467, 13468, 13469, 13470, 13471, + 13472, 13473, 13474, 13475, 13476, 13477, 13478, 13479, 13480, 13481, + 13482, 13483, 13484, 13485, 13486, 13487, 13488, 13489, 13490, 13491, + 13492, 13493, 13494, 13495, 13496, 13497, 13498, 13499, 13500, 13501, + 13502, 13503, 13504, 13505, 13506, 13507, 13508, 13509, 13510, 13511, + 13512, 13513, 13514, 13515, 13516, 13517, 13518, 13519, 13520, 13521, + 13522, 13523, 13524, 13525, 13526, 13527, 13528, 13529, 13530, 13531, + 13532, 13533, 13534, 13535, 13536, 13537, 13538, 13539, 13540, 13541, + 13542, 13543, 13544, 13545, 13546, 13547, 13548, 13549, 13550, 13551, + 13552, 13553, 13554, 13555, 13556, 13557, 13558, 13559, 13560, 13561, + 13562, 13563, 13564, 13565, 13566, 13567, 13568, 13569, 13570, 13571, + 13572, 13573, 13574, 13575, 13576, 13577, 13578, 13579, 13580, 13581, + 13582, 13583, 13584, 13585, 13586, 13587, 13588, 13589, 13590, 13591, + 13592, 13593, 13594, 13595, 13596, 13597, 13598, 13599, 13600, 13601, + 13602, 13603, 13604, 13605, 13606, 13607, 13608, 13609, 13610, 13611, + 13612, 13613, 13614, 13615, 13616, 13617, 13618, 13619, 13620, 13621, + 13622, 13623, 13624, 13625, 13626, 13627, 13628, 13629, 13630, 13631, + 13632, 13633, 13634, 13635, 13636, 13637, 13638, 13639, 13640, 13641, + 13642, 13643, 13644, 13645, 13646, 13647, 13648, 13649, 13650, 13651, + 13652, 13653, 13654, 13655, 13656, 13657, 13658, 13659, 13660, 13661, + 13662, 13663, 13664, 13665, 13666, 13667, 13668, 13669, 13670, 13671, + 13672, 13673, 13674, 13675, 13676, 13677, 13678, 13679, 13680, 13681, + 13682, 13683, 13684, 13685, 13686, 13687, 13688, 13689, 13690, 13691, + 13692, 13693, 13694, 13695, 13696, 13697, 13698, 13699, 13700, 13701, + 13702, 13703, 13704, 13705, 13706, 13707, 13708, 13709, 13710, 13711, + 13712, 13713, 13714, 13715, 13716, 13717, 13718, 13719, 13720, 13721, + 13722, 13723, 13724, 13725, 13726, 13727, 13728, 13729, 13730, 13731, + 13732, 13733, 13734, 13735, 13736, 13737, 13738, 13739, 13740, 13741, + 13742, 13743, 13744, 13745, 13746, 13747, 13748, 13749, 13750, 13751, + 13752, 13753, 13754, 13755, 13756, 13757, 13758, 13759, 13760, 13761, + 13762, 13763, 13764, 13765, 13766, 13767, 13768, 13769, 13770, 13771, + 13772, 13773, 13774, 13775, 13776, 13777, 13778, 13779, 13780, 13781, + 13782, 13783, 13784, 13785, 13786, 13787, 13788, 13789, 13790, 13791, + 13792, 13793, 13794, 13795, 13796, 13797, 13798, 13799, 13800, 13801, + 13802, 13803, 13804, 13805, 13806, 13807, 13808, 13809, 13810, 13811, + 13812, 13813, 13814, 13815, 13816, 13817, 13818, 13819, 13820, 13821, + 13822, 13823, 13824, 13825, 13826, 13827, 13828, 13829, 13830, 13831, + 13832, 13833, 13834, 13835, 13836, 13837, 13838, 13839, 13840, 13841, + 13842, 13843, 13844, 13845, 13846, 13847, 13848, 13849, 13850, 13851, + 13852, 13853, 13854, 13855, 13856, 13857, 13858, 13859, 13860, 13861, + 13862, 13863, 13864, 13865, 13866, 13867, 13868, 13869, 13870, 13871, + 13872, 13873, 13874, 13875, 13876, 13877, 13878, 13879, 13880, 13881, + 13882, 13883, 13884, 13885, 13886, 13887, 13888, 13889, 13890, 13891, + 13892, 13893, 13894, 13895, 13896, 13897, 13898, 13899, 13900, 13901, + 13902, 13903, 13904, 13905, 13906, 13907, 13908, 13909, 13910, 13911, + 13912, 13913, 13914, 13915, 13916, 13917, 13918, 13919, 13920, 13921, + 13922, 13923, 13924, 13925, 13926, 13927, 13928, 13929, 13930, 13931, + 13932, 13933, 13934, 13935, 13936, 13937, 13938, 13939, 13940, 13941, + 13942, 13943, 13944, 13945, 13946, 13947, 13948, 13949, 13950, 13951, + 13952, 13953, 13954, 13955, 13956, 13957, 13958, 13959, 13960, 13961, + 13962, 13963, 13964, 13965, 13966, 13967, 13968, 13969, 13970, 13971, + 13972, 13973, 13974, 13975, 13976, 13977, 13978, 13979, 13980, 13981, + 13982, 13983, 13984, 13985, 13986, 13987, 13988, 13989, 13990, 13991, + 13992, 13993, 13994, 13995, 13996, 13997, 13998, 13999, 14000, 14001, + 14002, 14003, 14004, 14005, 14006, 14007, 14008, 14009, 14010, 14011, + 14012, 14013, 14014, 14015, 14016, 14017, 14018, 14019, 14020, 14021, + 14022, 14023, 14024, 14025, 14026, 14027, 14028, 14029, 14030, 14031, + 14032, 14033, 14034, 14035, 14036, 14037, 14038, 14039, 14040, 14041, + 14042, 14043, 14044, 14045, 14046, 14047, 14048, 14049, 14050, 14051, + 14052, 14053, 14054, 14055, 14056, 14057, 14058, 14059, 14060, 14061, + 14062, 14063, 14064, 14065, 14066, 14067, 14068, 14069, 14070, 14071, + 14072, 14073, 14074, 14075, 14076, 14077, 14078, 14079, 14080, 14081, + 14082, 14083, 14084, 14085, 14086, 14087, 14088, 14089, 14090, 14091, + 14092, 14093, 14094, 14095, 14096, 14097, 14098, 14099, 14100, 14101, + 14102, 14103, 14104, 14105, 14106, 14107, 14108, 14109, 14110, 14111, + 14112, 14113, 14114, 14115, 14116, 14117, 14118, 14119, 14120, 14121, + 14122, 14123, 14124, 14125, 14126, 14127, 14128, 14129, 14130, 14131, + 14132, 14133, 14134, 14135, 14136, 14137, 14138, 14139, 14140, 14141, + 14142, 14143, 14144, 14145, 14146, 14147, 14148, 14149, 14150, 14151, + 14152, 14153, 14154, 14155, 14156, 14157, 14158, 14159, 14160, 14161, + 14162, 14163, 14164, 14165, 14166, 14167, 14168, 14169, 14170, 14171, + 14172, 14173, 14174, 14175, 14176, 14177, 14178, 14179, 14180, 14181, + 14182, 14183, 14184, 14185, 14186, 14187, 14188, 14189, 14190, 14191, + 14192, 14193, 14194, 14195, 14196, 14197, 14198, 14199, 14200, 14201, + 14202, 14203, 14204, 14205, 14206, 14207, 14208, 14209, 14210, 14211, + 14212, 14213, 14214, 14215, 14216, 14217, 14218, 14219, 14220, 14221, + 14222, 14223, 14224, 14225, 14226, 14227, 14228, 14229, 14230, 14231, + 14232, 14233, 14234, 14235, 14236, 14237, 14238, 14239, 14240, 14241, + 14242, 14243, 14244, 14245, 14246, 14247, 14248, 14249, 14250, 14251, + 14252, 14253, 14254, 14255, 14256, 14257, 14258, 14259, 14260, 14261, + 14262, 14263, 14264, 14265, 14266, 14267, 14268, 14269, 14270, 14271, + 14272, 14273, 14274, 14275, 14276, 14277, 14278, 14279, 14280, 14281, + 14282, 14283, 14284, 14285, 14286, 14287, 14288, 14289, 14290, 14291, + 14292, 14293, 14294, 14295, 14296, 14297, 14298, 14299, 14300, 14301, + 14302, 14303, 14304, 14305, 14306, 14307, 14308, 14309, 14310, 14311, + 14312, 14313, 14314, 14315, 14316, 14317, 14318, 14319, 14320, 14321, + 14322, 14323, 14324, 14325, 14326, 14327, 14328, 14329, 14330, 14331, + 14332, 14333, 14334, 14335, 14336, 14337, 14338, 14339, 14340, 14341, + 14342, 14343, 14344, 14345, 14346, 14347, 14348, 14349, 14350, 14351, + 14352, 14353, 14354, 14355, 14356, 14357, 14358, 14359, 14360, 14361, + 14362, 14363, 14364, 14365, 14366, 14367, 14368, 14369, 14370, 14371, + 14372, 14373, 14374, 14375, 14376, 14377, 14378, 14379, 14380, 14381, + 14382, 14383, 14384, 14385, 14386, 14387, 14388, 14389, 14390, 14391, + 14392, 14393, 14394, 14395, 14396, 14397, 14398, 14399, 14400, 14401, + 14402, 14403, 14404, 14405, 14406, 14407, 14408, 14409, 14410, 14411, + 14412, 14413, 14414, 14415, 14416, 14417, 14418, 14419, 14420, 14421, + 14422, 14423, 14424, 14425, 14426, 14427, 14428, 14429, 14430, 14431, + 14432, 14433, 14434, 14435, 14436, 14437, 14438, 14439, 14440, 14441, + 14442, 14443, 14444, 14445, 14446, 14447, 14448, 14449, 14450, 14451, + 14452, 14453, 14454, 14455, 14456, 14457, 14458, 14459, 14460, 14461, + 14462, 14463, 14464, 14465, 14466, 14467, 14468, 14469, 14470, 14471, + 14472, 14473, 14474, 14475, 14476, 14477, 14478, 14479, 14480, 14481, + 14482, 14483, 14484, 14485, 14486, 14487, 14488, 14489, 14490, 14491, + 14492, 14493, 14494, 14495, 14496, 14497, 14498, 14499, 14500, 14501, + 14502, 14503, 14504, 14505, 14506, 14507, 14508, 14509, 14510, 14511, + 14512, 14513, 14514, 14515, 14516, 14517, 14518, 14519, 14520, 14521, + 14522, 14523, 14524, 14525, 14526, 14527, 14528, 14529, 14530, 14531, + 14532, 14533, 14534, 14535, 14536, 14537, 14538, 14539, 14540, 14541, + 14542, 14543, 14544, 14545, 14546, 14547, 14548, 14549, 14550, 14551, + 14552, 14553, 14554, 14555, 14556, 14557, 14558, 14559, 14560, 14561, + 14562, 14563, 14564, 14565, 14566, 14567, 14568, 14569, 14570, 14571, + 14572, 14573, 14574, 14575, 14576, 14577, 14578, 14579, 14580, 14581, + 14582, 14583, 14584, 14585, 14586, 14587, 14588, 14589, 14590, 14591, + 14592, 14593, 14594, 14595, 14596, 14597, 14598, 14599, 14600, 14601, + 14602, 14603, 14604, 14605, 14606, 14607, 14608, 14609, 14610, 14611, + 14612, 14613, 14614, 14615, 14616, 14617, 14618, 14619, 14620, 14621, + 14622, 14623, 14624, 14625, 14626, 14627, 14628, 14629, 14630, 14631, + 14632, 14633, 14634, 14635, 14636, 14637, 14638, 14639, 14640, 14641, + 14642, 14643, 14644, 14645, 14646, 14647, 14648, 14649, 14650, 14651, + 14652, 14653, 14654, 14655, 14656, 14657, 14658, 14659, 14660, 14661, + 14662, 14663, 14664, 14665, 14666, 14667, 14668, 14669, 14670, 14671, + 14672, 14673, 14674, 14675, 14676, 14677, 14678, 14679, 14680, 14681, + 14682, 14683, 14684, 14685, 14686, 14687, 14688, 14689, 14690, 14691, + 14692, 14693, 14694, 14695, 14696, 14697, 14698, 14699, 14700, 14701, + 14702, 14703, 14704, 14705, 14706, 14707, 14708, 14709, 14710, 14711, + 14712, 14713, 14714, 14715, 14716, 14717, 14718, 14719, 14720, 14721, + 14722, 14723, 14724, 14725, 14726, 14727, 14728, 14729, 14730, 14731, + 14732, 14733, 14734, 14735, 14736, 14737, 14738, 14739, 14740, 14741, + 14742, 14743, 14744, 14745, 14746, 14747, 14748, 14749, 14750, 14751, + 14752, 14753, 14754, 14755, 14756, 14757, 14758, 14759, 14760, 14761, + 14762, 14763, 14764, 14765, 14766, 14767, 14768, 14769, 14770, 14771, + 14772, 14773, 14774, 14775, 14776, 14777, 14778, 14779, 14780, 14781, + 14782, 14783, 14784, 14785, 14786, 14787, 14788, 14789, 14790, 14791, + 14792, 14793, 14794, 14795, 14796, 14797, 14798, 14799, 14800, 14801, + 14802, 14803, 14804, 14805, 14806, 14807, 14808, 14809, 14810, 14811, + 14812, 14813, 14814, 14815, 14816, 14817, 14818, 14819, 14820, 14821, + 14822, 14823, 14824, 14825, 14826, 14827, 14828, 14829, 14830, 14831, + 14832, 14833, 14834, 14835, 14836, 14837, 14838, 14839, 14840, 14841, + 14842, 14843, 14844, 14845, 14846, 14847, 14848, 14849, 14850, 14851, + 14852, 14853, 14854, 14855, 14856, 14857, 14858, 14859, 14860, 14861, + 14862, 14863, 14864, 14865, 14866, 14867, 14868, 14869, 14870, 14871, + 14872, 14873, 14874, 14875, 14876, 14877, 14878, 14879, 14880, 14881, + 14882, 14883, 14884, 14885, 14886, 14887, 14888, 14889, 14890, 14891, + 14892, 14893, 14894, 14895, 14896, 14897, 14898, 14899, 14900, 14901, + 14902, 14903, 14904, 14905, 14906, 14907, 14908, 14909, 14910, 14911, + 14912, 14913, 14914, 14915, 14916, 14917, 14918, 14919, 14920, 14921, + 14922, 14923, 14924, 14925, 14926, 14927, 14928, 14929, 14930, 14931, + 14932, 14933, 14934, 14935, 14936, 14937, 14938, 14939, 14940, 14941, + 14942, 14943, 14944, 14945, 14946, 14947, 14948, 14949, 14950, 14951, + 14952, 14953, 14954, 14955, 14956, 14957, 14958, 14959, 14960, 14961, + 14962, 14963, 14964, 14965, 14966, 14967, 14968, 14969, 14970, 14971, + 14972, 14973, 14974, 14975, 14976, 14977, 14978, 14979, 14980, 14981, + 14982, 14983, 14984, 14985, 14986, 14987, 14988, 14989, 14990, 14991, + 14992, 14993, 14994, 14995, 14996, 14997, 14998, 14999, 15000, 15001, + 15002, 15003, 15004, 15005, 15006, 15007, 15008, 15009, 15010, 15011, + 15012, 15013, 15014, 15015, 15016, 15017, 15018, 15019, 15020, 15021, + 15022, 15023, 15024, 15025, 15026, 15027, 15028, 15029, 15030, 15031, + 15032, 15033, 15034, 15035, 15036, 15037, 15038, 15039, 15040, 15041, + 15042, 15043, 15044, 15045, 15046, 15047, 15048, 15049, 15050, 15051, + 15052, 15053, 15054, 15055, 15056, 15057, 15058, 15059, 15060, 15061, + 15062, 15063, 15064, 15065, 15066, 15067, 15068, 15069, 15070, 15071, + 15072, 15073, 15074, 15075, 15076, 15077, 15078, 15079, 15080, 15081, + 15082, 15083, 15084, 15085, 15086, 15087, 15088, 15089, 15090, 15091, + 15092, 15093, 15094, 15095, 15096, 15097, 15098, 15099, 15100, 15101, + 15102, 15103, 15104, 15105, 15106, 15107, 15108, 15109, 15110, 15111, + 15112, 15113, 15114, 15115, 15116, 15117, 15118, 15119, 15120, 15121, + 15122, 15123, 15124, 15125, 15126, 15127, 15128, 15129, 15130, 15131, + 15132, 15133, 15134, 15135, 15136, 15137, 15138, 15139, 15140, 15141, + 15142, 15143, 15144, 15145, 15146, 15147, 15148, 15149, 15150, 15151, + 15152, 15153, 15154, 15155, 15156, 15157, 15158, 15159, 15160, 15161, + 15162, 15163, 15164, 15165, 15166, 15167, 15168, 15169, 15170, 15171, + 15172, 15173, 15174, 15175, 15176, 15177, 15178, 15179, 15180, 15181, + 15182, 15183, 15184, 15185, 15186, 15187, 15188, 15189, 15190, 15191, + 15192, 15193, 15194, 15195, 15196, 15197, 15198, 15199, 15200, 15201, + 15202, 15203, 15204, 15205, 15206, 15207, 15208, 15209, 15210, 15211, + 15212, 15213, 15214, 15215, 15216, 15217, 15218, 15219, 15220, 15221, + 15222, 15223, 15224, 15225, 15226, 15227, 15228, 15229, 15230, 15231, + 15232, 15233, 15234, 15235, 15236, 15237, 15238, 15239, 15240, 15241, + 15242, 15243, 15244, 15245, 15246, 15247, 15248, 15249, 15250, 15251, + 15252, 15253, 15254, 15255, 15256, 15257, 15258, 15259, 15260, 15261, + 15262, 15263, 15264, 15265, 15266, 15267, 15268, 15269, 15270, 15271, + 15272, 15273, 15274, 15275, 15276, 15277, 15278, 15279, 15280, 15281, + 15282, 15283, 15284, 15285, 15286, 15287, 15288, 15289, 15290, 15291, + 15292, 15293, 15294, 15295, 15296, 15297, 15298, 15299, 15300, 15301, + 15302, 15303, 15304, 15305, 15306, 15307, 15308, 15309, 15310, 15311, + 15312, 15313, 15314, 15315, 15316, 15317, 15318, 15319, 15320, 15321, + 15322, 15323, 15324, 15325, 15326, 15327, 15328, 15329, 15330, 15331, + 15332, 15333, 15334, 15335, 15336, 15337, 15338, 15339, 15340, 15341, + 15342, 15343, 15344, 15345, 15346, 15347, 15348, 15349, 15350, 15351, + 15352, 15353, 15354, 15355, 15356, 15357, 15358, 15359, 15360, 15361, + 15362, 15363, 15364, 15365, 15366, 15367, 15368, 15369, 15370, 15371, + 15372, 15373, 15374, 15375, 15376, 15377, 15378, 15379, 15380, 15381, + 15382, 15383, 15384, 15385, 15386, 15387, 15388, 15389, 15390, 15391, + 15392, 15393, 15394, 15395, 15396, 15397, 15398, 15399, 15400, 15401, + 15402, 15403, 15404, 15405, 15406, 15407, 15408, 15409, 15410, 15411, + 15412, 15413, 15414, 15415, 15416, 15417, 15418, 15419, 15420, 15421, + 15422, 15423, 15424, 15425, 15426, 15427, 15428, 15429, 15430, 15431, + 15432, 15433, 15434, 15435, 15436, 15437, 15438, 15439, 15440, 15441, + 15442, 15443, 15444, 15445, 15446, 15447, 15448, 15449, 15450, 15451, + 15452, 15453, 15454, 15455, 15456, 15457, 15458, 15459, 15460, 15461, + 15462, 15463, 15464, 15465, 15466, 15467, 15468, 15469, 15470, 15471, + 15472, 15473, 15474, 15475, 15476, 15477, 15478, 15479, 15480, 15481, + 15482, 15483, 15484, 15485, 15486, 15487, 15488, 15489, 15490, 15491, + 15492, 15493, 15494, 15495, 15496, 15497, 15498, 15499, 15500, 15501, + 15502, 15503, 15504, 15505, 15506, 15507, 15508, 15509, 15510, 15511, + 15512, 15513, 15514, 15515, 15516, 15517, 15518, 15519, 15520, 15521, + 15522, 15523, 15524, 15525, 15526, 15527, 15528, 15529, 15530, 15531, + 15532, 15533, 15534, 15535, 15536, 15537, 15538, 15539, 15540, 15541, + 15542, 15543, 15544, 15545, 15546, 15547, 15548, 15549, 15550, 15551, + 15552, 15553, 15554, 15555, 15556, 15557, 15558, 15559, 15560, 15561, + 15562, 15563, 15564, 15565, 15566, 15567, 15568, 15569, 15570, 15571, + 15572, 15573, 15574, 15575, 15576, 15577, 15578, 15579, 15580, 15581, + 15582, 15583, 15584, 15585, 15586, 15587, 15588, 15589, 15590, 15591, + 15592, 15593, 15594, 15595, 15596, 15597, 15598, 15599, 15600, 15601, + 15602, 15603, 15604, 15605, 15606, 15607, 15608, 15609, 15610, 15611, + 15612, 15613, 15614, 15615, 15616, 15617, 15618, 15619, 15620, 15621, + 15622, 15623, 15624, 15625, 15626, 15627, 15628, 15629, 15630, 15631, + 15632, 15633, 15634, 15635, 15636, 15637, 15638, 15639, 15640, 15641, + 15642, 15643, 15644, 15645, 15646, 15647, 15648, 15649, 15650, 15651, + 15652, 15653, 15654, 15655, 15656, 15657, 15658, 15659, 15660, 15661, + 15662, 15663, 15664, 15665, 15666, 15667, 15668, 15669, 15670, 15671, + 15672, 15673, 15674, 15675, 15676, 15677, 15678, 15679, 15680, 15681, + 15682, 15683, 15684, 15685, 15686, 15687, 15688, 15689, 15690, 15691, + 15692, 15693, 15694, 15695, 15696, 15697, 15698, 15699, 15700, 15701, + 15702, 15703, 15704, 15705, 15706, 15707, 15708, 15709, 15710, 15711, + 15712, 15713, 15714, 15715, 15716, 15717, 15718, 15719, 15720, 15721, + 15722, 15723, 15724, 15725, 15726, 15727, 15728, 15729, 15730, 15731, + 15732, 15733, 15734, 15735, 15736, 15737, 15738, 15739, 15740, 15741, + 15742, 15743, 15744, 15745, 15746, 15747, 15748, 15749, 15750, 15751, + 15752, 15753, 15754, 15755, 15756, 15757, 15758, 15759, 15760, 15761, + 15762, 15763, 15764, 15765, 15766, 15767, 15768, 15769, 15770, 15771, + 15772, 15773, 15774, 15775, 15776, 15777, 15778, 15779, 15780, 15781, + 15782, 15783, 15784, 15785, 15786, 15787, 15788, 15789, 15790, 15791, + 15792, 15793, 15794, 15795, 15796, 15797, 15798, 15799, 15800, 15801, + 15802, 15803, 15804, 15805, 15806, 15807, 15808, 15809, 15810, 15811, + 15812, 15813, 15814, 15815, 15816, 15817, 15818, 15819, 15820, 15821, + 15822, 15823, 15824, 15825, 15826, 15827, 15828, 15829, 15830, 15831, + 15832, 15833, 15834, 15835, 15836, 15837, 15838, 15839, 15840, 15841, + 15842, 15843, 15844, 15845, 15846, 15847, 15848, 15849, 15850, 15851, + 15852, 15853, 15854, 15855, 15856, 15857, 15858, 15859, 15860, 15861, + 15862, 15863, 15864, 15865, 15866, 15867, 15868, 15869, 15870, 15871, + 15872, 15873, 15874, 15875, 15876, 15877, 15878, 15879, 15880, 15881, + 15882, 15883, 15884, 15885, 15886, 15887, 15888, 15889, 15890, 15891, + 15892, 15893, 15894, 15895, 15896, 15897, 15898, 15899, 15900, 15901, + 15902, 15903, 15904, 15905, 15906, 15907, 15908, 15909, 15910, 15911, + 15912, 15913, 15914, 15915, 15916, 15917, 15918, 15919, 15920, 15921, + 15922, 15923, 15924, 15925, 15926, 15927, 15928, 15929, 15930, 15931, + 15932, 15933, 15934, 15935, 15936, 15937, 15938, 15939, 15940, 15941, + 15942, 15943, 15944, 15945, 15946, 15947, 15948, 15949, 15950, 15951, + 15952, 15953, 15954, 15955, 15956, 15957, 15958, 15959, 15960, 15961, + 15962, 15963, 15964, 15965, 15966, 15967, 15968, 15969, 15970, 15971, + 15972, 15973, 15974, 15975, 15976, 15977, 15978, 15979, 15980, 15981, + 15982, 15983, 15984, 15985, 15986, 15987, 15988, 15989, 15990, 15991, + 15992, 15993, 15994, 15995, 15996, 15997, 15998, 15999, 16000, 16001, + 16002, 16003, 16004, 16005, 16006, 16007, 16008, 16009, 16010, 16011, + 16012, 16013, 16014, 16015, 16016, 16017, 16018, 16019, 16020, 16021, + 16022, 16023, 16024, 16025, 16026, 16027, 16028, 16029, 16030, 16031, + 16032, 16033, 16034, 16035, 16036, 16037, 16038, 16039, 16040, 16041, + 16042, 16043, 16044, 16045, 16046, 16047, 16048, 16049, 16050, 16051, + 16052, 16053, 16054, 16055, 16056, 16057, 16058, 16059, 16060, 16061, + 16062, 16063, 16064, 16065, 16066, 16067, 16068, 16069, 16070, 16071, + 16072, 16073, 16074, 16075, 16076, 16077, 16078, 16079, 16080, 16081, + 16082, 16083, 16084, 16085, 16086, 16087, 16088, 16089, 16090, 16091, + 16092, 16093, 16094, 16095, 16096, 16097, 16098, 16099, 16100, 16101, + 16102, 16103, 16104, 16105, 16106, 16107, 16108, 16109, 16110, 16111, + 16112, 16113, 16114, 16115, 16116, 16117, 16118, 16119, 16120, 16121, + 16122, 16123, 16124, 16125, 16126, 16127, 16128, 16129, 16130, 16131, + 16132, 16133, 16134, 16135, 16136, 16137, 16138, 16139, 16140, 16141, + 16142, 16143, 16144, 16145, 16146, 16147, 16148, 16149, 16150, 16151, + 16152, 16153, 16154, 16155, 16156, 16157, 16158, 16159, 16160, 16161, + 16162, 16163, 16164, 16165, 16166, 16167, 16168, 16169, 16170, 16171, + 16172, 16173, 16174, 16175, 16176, 16177, 16178, 16179, 16180, 16181, + 16182, 16183, 16184, 16185, 16186, 16187, 16188, 16189, 16190, 16191, + 16192, 16193, 16194, 16195, 16196, 16197, 16198, 16199, 16200, 16201, + 16202, 16203, 16204, 16205, 16206, 16207, 16208, 16209, 16210, 16211, + 16212, 16213, 16214, 16215, 16216, 16217, 16218, 16219, 16220, 16221, + 16222, 16223, 16224, 16225, 16226, 16227, 16228, 16229, 16230, 16231, + 16232, 16233, 16234, 16235, 16236, 16237, 16238, 16239, 16240, 16241, + 16242, 16243, 16244, 16245, 16246, 16247, 16248, 16249, 16250, 16251, + 16252, 16253, 16254, 16255, 16256, 16257, 16258, 16259, 16260, 16261, + 16262, 16263, 16264, 16265, 16266, 16267, 16268, 16269, 16270, 16271, + 16272, 16273, 16274, 16275, 16276, 16277, 16278, 16279, 16280, 16281, + 16282, 16283, 16284, 16285, 16286, 16287, 16288, 16289, 16290, 16291, + 16292, 16293, 16294, 16295, 16296, 16297, 16298, 16299, 16300, 16301, + 16302, 16303, 16304, 16305, 16306, 16307, 16308, 16309, 16310, 16311, + 16312, 16313, 16314, 16315, 16316, 16317, 16318, 16319, 16320, 16321, + 16322, 16323, 16324, 16325, 16326, 16327, 16328, 16329, 16330, 16331, + 16332, 16333, 16334, 16335, 16336, 16337, 16338, 16339, 16340, 16341, + 16342, 16343, 16344, 16345, 16346, 16347, 16348, 16349, 16350, 16351, + 16352, 16353, 16354, 16355, 16356, 16357, 16358, 16359, 16360, 16361, + 16362, 16363, 16364, 16365, 16366, 16367, 16368, 16369, 16370, 16371, + 16372, 16373, 16374, 16375, 16376, 16377, 16378, 16379, 16380, 16381, + 16382, 16383, 16384, 16385, 16386, 16387, 16388, 16389, 16390, 16391, + 16392, 16393, 16394, 16395, 16396, 16397, 16398, 16399, 16400, 16401, + 16402, 16403, 16404, 16405, 16406, 16407, 16408, 16409, 16410, 16411, + 16412, 16413, 16414, 16415, 16416, 16417, 16418, 16419, 16420, 16421, + 16422, 16423, 16424, 16425, 16426, 16427, 16428, 16429, 16430, 16431, + 16432, 16433, 16434, 16435, 16436, 16437, 16438, 16439, 16440, 16441, + 16442, 16443, 16444, 16445, 16446, 16447, 16448, 16449, 16450, 16451, + 16452, 16453, 16454, 16455, 16456, 16457, 16458, 16459, 16460, 16461, + 16462, 16463, 16464, 16465, 16466, 16467, 16468, 16469, 16470, 16471, + 16472, 16473, 16474, 16475, 16476, 16477, 16478, 16479, 16480, 16481, + 16482, 16483, 16484, 16485, 16486, 16487, 16488, 16489, 16490, 16491, + 16492, 16493, 16494, 16495, 16496, 16497, 16498, 16499, 16500, 16501, + 16502, 16503, 16504, 16505, 16506, 16507, 16508, 16509, 16510, 16511, + 16512, 16513, 16514, 16515, 16516, 16517, 16518, 16519, 16520, 16521, + 16522, 16523, 16524, 16525, 16526, 16527, 16528, 16529, 16530, 16531, + 16532, 16533, 16534, 16535, 16536, 16537, 16538, 16539, 16540, 16541, + 16542, 16543, 16544, 16545, 16546, 16547, 16548, 16549, 16550, 16551, + 16552, 16553, 16554, 16555, 16556, 16557, 16558, 16559, 16560, 16561, + 16562, 16563, 16564, 16565, 16566, 16567, 16568, 16569, 16570, 16571, + 16572, 16573, 16574, 16575, 16576, 16577, 16578, 16579, 16580, 16581, + 16582, 16583, 16584, 16585, 16586, 16587, 16588, 16589, 16590, 16591, + 16592, 16593, 16594, 16595, 16596, 16597, 16598, 16599, 16600, 16601, + 16602, 16603, 16604, 16605, 16606, 16607, 16608, 16609, 16610, 16611, + 16612, 16613, 16614, 16615, 16616, 16617, 16618, 16619, 16620, 16621, + 16622, 16623, 16624, 16625, 16626, 16627, 16628, 16629, 16630, 16631, + 16632, 16633, 16634, 16635, 16636, 16637, 16638, 16639, 16640, 16641, + 16642, 16643, 16644, 16645, 16646, 16647, 16648, 16649, 16650, 16651, + 16652, 16653, 16654, 16655, 16656, 16657, 16658, 16659, 16660, 16661, + 16662, 16663, 16664, 16665, 16666, 16667, 16668, 16669, 16670, 16671, + 16672, 16673, 16674, 16675, 16676, 16677, 16678, 16679, 16680, 16681, + 16682, 16683, 16684, 16685, 16686, 16687, 16688, 16689, 16690, 16691, + 16692, 16693, 16694, 16695, 16696, 16697, 16698, 16699, 16700, 16701, + 16702, 16703, 16704, 16705, 16706, 16707, 16708, 16709, 16710, 16711, + 16712, 16713, 16714, 16715, 16716, 16717, 16718, 16719, 16720, 16721, + 16722, 16723, 16724, 16725, 16726, 16727, 16728, 16729, 16730, 16731, + 16732, 16733, 16734, 16735, 16736, 16737, 16738, 16739, 16740, 16741, + 16742, 16743, 16744, 16745, 16746, 16747, 16748, 16749, 16750, 16751, + 16752, 16753, 16754, 16755, 16756, 16757, 16758, 16759, 16760, 16761, + 16762, 16763, 16764, 16765, 16766, 16767, 16768, 16769, 16770, 16771, + 16772, 16773, 16774, 16775, 16776, 16777, 16778, 16779, 16780, 16781, + 16782, 16783, 16784, 16785, 16786, 16787, 16788, 16789, 16790, 16791, + 16792, 16793, 16794, 16795, 16796, 16797, 16798, 16799, 16800, 16801, + 16802, 16803, 16804, 16805, 16806, 16807, 16808, 16809, 16810, 16811, + 16812, 16813, 16814, 16815, 16816, 16817, 16818, 16819, 16820, 16821, + 16822, 16823, 16824, 16825, 16826, 16827, 16828, 16829, 16830, 16831, + 16832, 16833, 16834, 16835, 16836, 16837, 16838, 16839, 16840, 16841, + 16842, 16843, 16844, 16845, 16846, 16847, 16848, 16849, 16850, 16851, + 16852, 16853, 16854, 16855, 16856, 16857, 16858, 16859, 16860, 16861, + 16862, 16863, 16864, 16865, 16866, 16867, 16868, 16869, 16870, 16871, + 16872, 16873, 16874, 16875, 16876, 16877, 16878, 16879, 16880, 16881, + 16882, 16883, 16884, 16885, 16886, 16887, 16888, 16889, 16890, 16891, + 16892, 16893, 16894, 16895, 16896, 16897, 16898, 16899, 16900, 16901, + 16902, 16903, 16904, 16905, 16906, 16907, 16908, 16909, 16910, 16911, + 16912, 16913, 16914, 16915, 16916, 16917, 16918, 16919, 16920, 16921, + 16922, 16923, 16924, 16925, 16926, 16927, 16928, 16929, 16930, 16931, + 16932, 16933, 16934, 16935, 16936, 16937, 16938, 16939, 16940, 16941, + 16942, 16943, 16944, 16945, 16946, 16947, 16948, 16949, 16950, 16951, + 16952, 16953, 16954, 16955, 16956, 16957, 16958, 16959, 16960, 16961, + 16962, 16963, 16964, 16965, 16966, 16967, 16968, 16969, 16970, 16971, + 16972, 16973, 16974, 16975, 16976, 16977, 16978, 16979, 16980, 16981, + 16982, 16983, 16984, 16985, 16986, 16987, 16988, 16989, 16990, 16991, + 16992, 16993, 16994, 16995, 16996, 16997, 16998, 16999, 17000, 17001, + 17002, 17003, 17004, 17005, 17006, 17007, 17008, 17009, 17010, 17011, + 17012, 17013, 17014, 17015, 17016, 17017, 17018, 17019, 17020, 17021, + 17022, 17023, 17024, 17025, 17026, 17027, 17028, 17029, 17030, 17031, + 17032, 17033, 17034, 17035, 17036, 17037, 17038, 17039, 17040, 17041, + 17042, 17043, 17044, 17045, 17046, 17047, 17048, 17049, 17050, 17051, + 17052, 17053, 17054, 17055, 17056, 17057, 17058, 17059, 17060, 17061, + 17062, 17063, 17064, 17065, 17066, 17067, 17068, 17069, 17070, 17071, + 17072, 17073, 17074, 17075, 17076, 17077, 17078, 17079, 17080, 17081, + 17082, 17083, 17084, 17085, 17086, 17087, 17088, 17089, 17090, 17091, + 17092, 17093, 17094, 17095, 17096, 17097, 17098, 17099, 17100, 17101, + 17102, 17103, 17104, 17105, 17106, 17107, 17108, 17109, 17110, 17111, + 17112, 17113, 17114, 17115, 17116, 17117, 17118, 17119, 17120, 17121, + 17122, 17123, 17124, 17125, 17126, 17127, 17128, 17129, 17130, 17131, + 17132, 17133, 17134, 17135, 17136, 17137, 17138, 17139, 17140, 17141, + 17142, 17143, 17144, 17145, 17146, 17147, 17148, 17149, 17150, 17151, + 17152, 17153, 17154, 17155, 17156, 17157, 17158, 17159, 17160, 17161, + 17162, 17163, 17164, 17165, 17166, 17167, 17168, 17169, 17170, 17171, + 17172, 17173, 17174, 17175, 17176, 17177, 17178, 17179, 17180, 17181, + 17182, 17183, 17184, 17185, 17186, 17187, 17188, 17189, 17190, 17191, + 17192, 17193, 17194, 17195, 17196, 17197, 17198, 17199, 17200, 17201, + 17202, 17203, 17204, 17205, 17206, 17207, 17208, 17209, 17210, 17211, + 17212, 17213, 17214, 17215, 17216, 17217, 17218, 17219, 17220, 17221, + 17222, 17223, 17224, 17225, 17226, 17227, 17228, 17229, 17230, 17231, + 17232, 17233, 17234, 17235, 17236, 17237, 17238, 17239, 17240, 17241, + 17242, 17243, 17244, 17245, 17246, 17247, 17248, 17249, 17250, 17251, + 17252, 17253, 17254, 17255, 17256, 17257, 17258, 17259, 17260, 17261, + 17262, 17263, 17264, 17265, 17266, 17267, 17268, 17269, 17270, 17271, + 17272, 17273, 17274, 17275, 17276, 17277, 17278, 17279, 17280, 17281, + 17282, 17283, 17284, 17285, 17286, 17287, 17288, 17289, 17290, 17291, + 17292, 17293, 17294, 17295, 17296, 17297, 17298, 17299, 17300, 17301, + 17302, 17303, 17304, 17305, 17306, 17307, 17308, 17309, 17310, 17311, + 17312, 17313, 17314, 17315, 17316, 17317, 17318, 17319, 17320, 17321, + 17322, 17323, 17324, 17325, 17326, 17327, 17328, 17329, 17330, 17331, + 17332, 17333, 17334, 17335, 17336, 17337, 17338, 17339, 17340, 17341, + 17342, 17343, 17344, 17345, 17346, 17347, 17348, 17349, 17350, 17351, + 17352, 17353, 17354, 17355, 17356, 17357, 17358, 17359, 17360, 17361, + 17362, 17363, 17364, 17365, 17366, 17367, 17368, 17369, 17370, 17371, + 17372, 17373, 17374, 17375, 17376, 17377, 17378, 17379, 17380, 17381, + 17382, 17383, 17384, 17385, 17386, 17387, 17388, 17389, 17390, 17391, + 17392, 17393, 17394, 17395, 17396, 17397, 17398, 17399, 17400, 17401, + 17402, 17403, 17404, 17405, 17406, 17407, 17408, 17409, 17410, 17411, + 17412, 17413, 17414, 17415, 17416, 17417, 17418, 17419, 17420, 17421, + 17422, 17423, 17424, 17425, 17426, 17427, 17428, 17429, 17430, 17431, + 17432, 17433, 17434, 17435, 17436, 17437, 17438, 17439, 17440, 17441, + 17442, 17443, 17444, 17445, 17446, 17447, 17448, 17449, 17450, 17451, + 17452, 17453, 17454, 17455, 17456, 17457, 17458, 17459, 17460, 17461, + 17462, 17463, 17464, 17465, 17466, 17467, 17468, 17469, 17470, 17471, + 17472, 17473, 17474, 17475, 17476, 17477, 17478, 17479, 17480, 17481, + 17482, 17483, 17484, 17485, 17486, 17487, 17488, 17489, 17490, 17491, + 17492, 17493, 17494, 17495, 17496, 17497, 17498, 17499, 17500, 17501, + 17502, 17503, 17504, 17505, 17506, 17507, 17508, 17509, 17510, 17511, + 17512, 17513, 17514, 17515, 17516, 17517, 17518, 17519, 17520, 17521, + 17522, 17523, 17524, 17525, 17526, 17527, 17528, 17529, 17530, 17531, + 17532, 17533, 17534, 17535, 17536, 17537, 17538, 17539, 17540, 17541, + 17542, 17543, 17544, 17545, 17546, 17547, 17548, 17549, 17550, 17551, + 17552, 17553, 17554, 17555, 17556, 17557, 17558, 17559, 17560, 17561, + 17562, 17563, 17564, 17565, 17566, 17567, 17568, 17569, 17570, 17571, + 17572, 17573, 17574, 17575, 17576, 17577, 17578, 17579, 17580, 17581, + 17582, 17583, 17584, 17585, 17586, 17587, 17588, 17589, 17590, 17591, + 17592, 17593, 17594, 17595, 17596, 17597, 17598, 17599, 17600, 17601, + 17602, 17603, 17604, 17605, 17606, 17607, 17608, 17609, 17610, 17611, + 17612, 17613, 17614, 17615, 17616, 17617, 17618, 17619, 17620, 17621, + 17622, 17623, 17624, 17625, 17626, 17627, 17628, 17629, 17630, 17631, + 17632, 17633, 17634, 17635, 17636, 17637, 17638, 17639, 17640, 17641, + 17642, 17643, 17644, 17645, 17646, 17647, 17648, 17649, 17650, 17651, + 17652, 17653, 17654, 17655, 17656, 17657, 17658, 17659, 17660, 17661, + 17662, 17663, 17664, 17665, 17666, 17667, 17668, 17669, 17670, 17671, + 17672, 17673, 17674, 17675, 17676, 17677, 17678, 17679, 17680, 17681, + 17682, 17683, 17684, 17685, 17686, 17687, 17688, 17689, 17690, 17691, + 17692, 17693, 17694, 17695, 17696, 17697, 17698, 17699, 17700, 17701, + 17702, 17703, 17704, 17705, 17706, 17707, 17708, 17709, 17710, 17711, + 17712, 17713, 17714, 17715, 17716, 17717, 17718, 17719, 17720, 17721, + 17722, 17723, 17724, 17725, 17726, 17727, 17728, 17729, 17730, 17731, + 17732, 17733, 17734, 17735, 17736, 17737, 17738, 17739, 17740, 17741, + 17742, 17743, 17744, 17745, 17746, 17747, 17748, 17749, 17750, 17751, + 17752, 17753, 17754, 17755, 17756, 17757, 17758, 17759, 17760, 17761, + 17762, 17763, 17764, 17765, 17766, 17767, 17768, 17769, 17770, 17771, + 17772, 17773, 17774, 17775, 17776, 17777, 17778, 17779, 17780, 17781, + 17782, 17783, 17784, 17785, 17786, 17787, 17788, 17789, 17790, 17791, + 17792, 17793, 17794, 17795, 17796, 17797, 17798, 17799, 17800, 17801, + 17802, 17803, 17804, 17805, 17806, 17807, 17808, 17809, 17810, 17811, + 17812, 17813, 17814, 17815, 17816, 17817, 17818, 17819, 17820, 17821, + 17822, 17823, 17824, 17825, 17826, 17827, 17828, 17829, 17830, 17831, + 17832, 17833, 17834, 17835, 17836, 17837, 17838, 17839, 17840, 17841, + 17842, 17843, 17844, 17845, 17846, 17847, 17848, 17849, 17850, 17851, + 17852, 17853, 17854, 17855, 17856, 17857, 17858, 17859, 17860, 17861, + 17862, 17863, 17864, 17865, 17866, 17867, 17868, 17869, 17870, 17871, + 17872, 17873, 17874, 17875, 17876, 17877, 17878, 17879, 17880, 17881, + 17882, 17883, 17884, 17885, 17886, 17887, 17888, 17889, 17890, 17891, + 17892, 17893, 17894, 17895, 17896, 17897, 17898, 17899, 17900, 17901, + 17902, 17903, 17904, 17905, 17906, 17907, 17908, 17909, 17910, 17911, + 17912, 17913, 17914, 17915, 17916, 17917, 17918, 17919, 17920, 17921, + 17922, 17923, 17924, 17925, 17926, 17927, 17928, 17929, 17930, 17931, + 17932, 17933, 17934, 17935, 17936, 17937, 17938, 17939, 17940, 17941, + 17942, 17943, 17944, 17945, 17946, 17947, 17948, 17949, 17950, 17951, + 17952, 17953, 17954, 17955, 17956, 17957, 17958, 17959, 17960, 17961, + 17962, 17963, 17964, 17965, 17966, 17967, 17968, 17969, 17970, 17971, + 17972, 17973, 17974, 17975, 17976, 17977, 17978, 17979, 17980, 17981, + 17982, 17983, 17984, 17985, 17986, 17987, 17988, 17989, 17990, 17991, + 17992, 17993, 17994, 17995, 17996, 17997, 17998, 17999, 18000, 18001, + 18002, 18003, 18004, 18005, 18006, 18007, 18008, 18009, 18010, 18011, + 18012, 18013, 18014, 18015, 18016, 18017, 18018, 18019, 18020, 18021, + 18022, 18023, 18024, 18025, 18026, 18027, 18028, 18029, 18030, 18031, + 18032, 18033, 18034, 18035, 18036, 18037, 18038, 18039, 18040, 18041, + 18042, 18043, 18044, 18045, 18046, 18047, 18048, 18049, 18050, 18051, + 18052, 18053, 18054, 18055, 18056, 18057, 18058, 18059, 18060, 18061, + 18062, 18063, 18064, 18065, 18066, 18067, 18068, 18069, 18070, 18071, + 18072, 18073, 18074, 18075, 18076, 18077, 18078, 18079, 18080, 18081, + 18082, 18083, 18084, 18085, 18086, 18087, 18088, 18089, 18090, 18091, + 18092, 18093, 18094, 18095, 18096, 18097, 18098, 18099, 18100, 18101, + 18102, 18103, 18104, 18105, 18106, 18107, 18108, 18109, 18110, 18111, + 18112, 18113, 18114, 18115, 18116, 18117, 18118, 18119, 18120, 18121, + 18122, 18123, 18124, 18125, 18126, 18127, 18128, 18129, 18130, 18131, + 18132, 18133, 18134, 18135, 18136, 18137, 18138, 18139, 18140, 18141, + 18142, 18143, 18144, 18145, 18146, 18147, 18148, 18149, 18150, 18151, + 18152, 18153, 18154, 18155, 18156, 18157, 18158, 18159, 18160, 18161, + 18162, 18163, 18164, 18165, 18166, 18167, 18168, 18169, 18170, 18171, + 18172, 18173, 18174, 18175, 18176, 18177, 18178, 18179, 18180, 18181, + 18182, 18183, 18184, 18185, 18186, 18187, 18188, 18189, 18190, 18191, + 18192, 18193, 18194, 18195, 18196, 18197, 18198, 18199, 18200, 18201, + 18202, 18203, 18204, 18205, 18206, 18207, 18208, 18209, 18210, 18211, + 18212, 18213, 18214, 18215, 18216, 18217, 18218, 18219, 18220, 18221, + 18222, 18223, 18224, 18225, 18226, 18227, 18228, 18229, 18230, 18231, + 18232, 18233, 18234, 18235, 18236, 18237, 18238, 18239, 18240, 18241, + 18242, 18243, 18244, 18245, 18246, 18247, 18248, 18249, 18250, 18251, + 18252, 18253, 18254, 18255, 18256, 18257, 18258, 18259, 18260, 18261, + 18262, 18263, 18264, 18265, 18266, 18267, 18268, 18269, 18270, 18271, + 18272, 18273, 18274, 18275, 18276, 18277, 18278, 18279, 18280, 18281, + 18282, 18283, 18284, 18285, 18286, 18287, 18288, 18289, 18290, 18291, + 18292, 18293, 18294, 18295, 18296, 18297, 18298, 18299, 18300, 18301, + 18302, 18303, 18304, 18305, 18306, 18307, 18308, 18309, 18310, 18311, + 18312, 18313, 18314, 18315, 18316, 18317, 18318, 18319, 18320, 18321, + 18322, 18323, 18324, 18325, 18326, 18327, 18328, 18329, 18330, 18331, + 18332, 18333, 18334, 18335, 18336, 18337, 18338, 18339, 18340, 18341, + 18342, 18343, 18344, 18345, 18346, 18347, 18348, 18349, 18350, 18351, + 18352, 18353, 18354, 18355, 18356, 18357, 18358, 18359, 18360, 18361, + 18362, 18363, 18364, 18365, 18366, 18367, 18368, 18369, 18370, 18371, + 18372, 18373, 18374, 18375, 18376, 18377, 18378, 18379, 18380, 18381, + 18382, 18383, 18384, 18385, 18386, 18387, 18388, 18389, 18390, 18391, + 18392, 18393, 18394, 18395, 18396, 18397, 18398, 18399, 18400, 18401, + 18402, 18403, 18404, 18405, 18406, 18407, 18408, 18409, 18410, 18411, + 18412, 18413, 18414, 18415, 18416, 18417, 18418, 18419, 18420, 18421, + 18422, 18423, 18424, 18425, 18426, 18427, 18428, 18429, 18430, 18431, + 18432, 18433, 18434, 18435, 18436, 18437, 18438, 18439, 18440, 18441, + 18442, 18443, 18444, 18445, 18446, 18447, 18448, 18449, 18450, 18451, + 18452, 18453, 18454, 18455, 18456, 18457, 18458, 18459, 18460, 18461, + 18462, 18463, 18464, 18465, 18466, 18467, 18468, 18469, 18470, 18471, + 18472, 18473, 18474, 18475, 18476, 18477, 18478, 18479, 18480, 18481, + 18482, 18483, 18484, 18485, 18486, 18487, 18488, 18489, 18490, 18491, + 18492, 18493, 18494, 18495, 18496, 18497, 18498, 18499, 18500, 18501, + 18502, 18503, 18504, 18505, 18506, 18507, 18508, 18509, 18510, 18511, + 18512, 18513, 18514, 18515, 18516, 18517, 18518, 18519, 18520, 18521, + 18522, 18523, 18524, 18525, 18526, 18527, 18528, 18529, 18530, 18531, + 18532, 18533, 18534, 18535, 18536, 18537, 18538, 18539, 18540, 18541, + 18542, 18543, 18544, 18545, 18546, 18547, 18548, 18549, 18550, 18551, + 18552, 18553, 18554, 18555, 18556, 18557, 18558, 18559, 18560, 18561, + 18562, 18563, 18564, 18565, 18566, 18567, 18568, 18569, 18570, 18571, + 18572, 18573, 18574, 18575, 18576, 18577, 18578, 18579, 18580, 18581, + 18582, 18583, 18584, 18585, 18586, 18587, 18588, 18589, 18590, 18591, + 18592, 18593, 18594, 18595, 18596, 18597, 18598, 18599, 18600, 18601, + 18602, 18603, 18604, 18605, 18606, 18607, 18608, 18609, 18610, 18611, + 18612, 18613, 18614, 18615, 18616, 18617, 18618, 18619, 18620, 18621, + 18622, 18623, 18624, 18625, 18626, 18627, 18628, 18629, 18630, 18631, + 18632, 18633, 18634, 18635, 18636, 18637, 18638, 18639, 18640, 18641, + 18642, 18643, 18644, 18645, 18646, 18647, 18648, 18649, 18650, 18651, + 18652, 18653, 18654, 18655, 18656, 18657, 18658, 18659, 18660, 18661, + 18662, 18663, 18664, 18665, 18666, 18667, 18668, 18669, 18670, 18671, + 18672, 18673, 18674, 18675, 18676, 18677, 18678, 18679, 18680, 18681, + 18682, 18683, 18684, 18685, 18686, 18687, 18688, 18689, 18690, 18691, + 18692, 18693, 18694, 18695, 18696, 18697, 18698, 18699, 18700, 18701, + 18702, 18703, 18704, 18705, 18706, 18707, 18708, 18709, 18710, 18711, + 18712, 18713, 18714, 18715, 18716, 18717, 18718, 18719, 18720, 18721, + 18722, 18723, 18724, 18725, 18726, 18727, 18728, 18729, 18730, 18731, + 18732, 18733, 18734, 18735, 18736, 18737, 18738, 18739, 18740, 18741, + 18742, 18743, 18744, 18745, 18746, 18747, 18748, 18749, 18750, 18751, + 18752, 18753, 18754, 18755, 18756, 18757, 18758, 18759, 18760, 18761, + 18762, 18763, 18764, 18765, 18766, 18767, 18768, 18769, 18770, 18771, + 18772, 18773, 18774, 18775, 18776, 18777, 18778, 18779, 18780, 18781, + 18782, 18783, 18784, 18785, 18786, 18787, 18788, 18789, 18790, 18791, + 18792, 18793, 18794, 18795, 18796, 18797, 18798, 18799, 18800, 18801, + 18802, 18803, 18804, 18805, 18806, 18807, 18808, 18809, 18810, 18811, + 18812, 18813, 18814, 18815, 18816, 18817, 18818, 18819, 18820, 18821, + 18822, 18823, 18824, 18825, 18826, 18827, 18828, 18829, 18830, 18831, + 18832, 18833, 18834, 18835, 18836, 18837, 18838, 18839, 18840, 18841, + 18842, 18843, 18844, 18845, 18846, 18847, 18848, 18849, 18850, 18851, + 18852, 18853, 18854, 18855, 18856, 18857, 18858, 18859, 18860, 18861, + 18862, 18863, 18864, 18865, 18866, 18867, 18868, 18869, 18870, 18871, + 18872, 18873, 18874, 18875, 18876, 18877, 18878, 18879, 18880, 18881, + 18882, 18883, 18884, 18885, 18886, 18887, 18888, 18889, 18890, 18891, + 18892, 18893, 18894, 18895, 18896, 18897, 18898, 18899, 18900, 18901, + 18902, 18903, 18904, 18905, 18906, 18907, 18908, 18909, 18910, 18911, + 18912, 18913, 18914, 18915, 18916, 18917, 18918, 18919, 18920, 18921, + 18922, 18923, 18924, 18925, 18926, 18927, 18928, 18929, 18930, 18931, + 18932, 18933, 18934, 18935, 18936, 18937, 18938, 18939, 18940, 18941, + 18942, 18943, 18944, 18945, 18946, 18947, 18948, 18949, 18950, 18951, + 18952, 18953, 18954, 18955, 18956, 18957, 18958, 18959, 18960, 18961, + 18962, 18963, 18964, 18965, 18966, 18967, 18968, 18969, 18970, 18971, + 18972, 18973, 18974, 18975, 18976, 18977, 18978, 18979, 18980, 18981, + 18982, 18983, 18984, 18985, 18986, 18987, 18988, 18989, 18990, 18991, + 18992, 18993, 18994, 18995, 18996, 18997, 18998, 18999, 19000, 19001, + 19002, 19003, 19004, 19005, 19006, 19007, 19008, 19009, 19010, 19011, + 19012, 19013, 19014, 19015, 19016, 19017, 19018, 19019, 19020, 19021, + 19022, 19023, 19024, 19025, 19026, 19027, 19028, 19029, 19030, 19031, + 19032, 19033, 19034, 19035, 19036, 19037, 19038, 19039, 19040, 19041, + 19042, 19043, 19044, 19045, 19046, 19047, 19048, 19049, 19050, 19051, + 19052, 19053, 19054, 19055, 19056, 19057, 19058, 19059, 19060, 19061, + 19062, 19063, 19064, 19065, 19066, 19067, 19068, 19069, 19070, 19071, + 19072, 19073, 19074, 19075, 19076, 19077, 19078, 19079, 19080, 19081, + 19082, 19083, 19084, 19085, 19086, 19087, 19088, 19089, 19090, 19091, + 19092, 19093, 19094, 19095, 19096, 19097, 19098, 19099, 19100, 19101, + 19102, 19103, 19104, 19105, 19106, 19107, 19108, 19109, 19110, 19111, + 19112, 19113, 19114, 19115, 19116, 19117, 19118, 19119, 19120, 19121, + 19122, 19123, 19124, 19125, 19126, 19127, 19128, 19129, 19130, 19131, + 19132, 19133, 19134, 19135, 19136, 19137, 19138, 19139, 19140, 19141, + 19142, 19143, 19144, 19145, 19146, 19147, 19148, 19149, 19150, 19151, + 19152, 19153, 19154, 19155, 19156, 19157, 19158, 19159, 19160, 19161, + 19162, 19163, 19164, 19165, 19166, 19167, 19168, 19169, 19170, 19171, + 19172, 19173, 19174, 19175, 19176, 19177, 19178, 19179, 19180, 19181, + 19182, 19183, 19184, 19185, 19186, 19187, 19188, 19189, 19190, 19191, + 19192, 19193, 19194, 19195, 19196, 19197, 19198, 19199, 19200, 19201, + 19202, 19203, 19204, 19205, 19206, 19207, 19208, 19209, 19210, 19211, + 19212, 19213, 19214, 19215, 19216, 19217, 19218, 19219, 19220, 19221, + 19222, 19223, 19224, 19225, 19226, 19227, 19228, 19229, 19230, 19231, + 19232, 19233, 19234, 19235, 19236, 19237, 19238, 19239, 19240, 19241, + 19242, 19243, 19244, 19245, 19246, 19247, 19248, 19249, 19250, 19251, + 19252, 19253, 19254, 19255, 19256, 19257, 19258, 19259, 19260, 19261, + 19262, 19263, 19264, 19265, 19266, 19267, 19268, 19269, 19270, 19271, + 19272, 19273, 19274, 19275, 19276, 19277, 19278, 19279, 19280, 19281, + 19282, 19283, 19284, 19285, 19286, 19287, 19288, 19289, 19290, 19291, + 19292, 19293, 19294, 19295, 19296, 19297, 19298, 19299, 19300, 19301, + 19302, 19303, 19304, 19305, 19306, 19307, 19308, 19309, 19310, 19311, + 19312, 19313, 19314, 19315, 19316, 19317, 19318, 19319, 19320, 19321, + 19322, 19323, 19324, 19325, 19326, 19327, 19328, 19329, 19330, 19331, + 19332, 19333, 19334, 19335, 19336, 19337, 19338, 19339, 19340, 19341, + 19342, 19343, 19344, 19345, 19346, 19347, 19348, 19349, 19350, 19351, + 19352, 19353, 19354, 19355, 19356, 19357, 19358, 19359, 19360, 19361, + 19362, 19363, 19364, 19365, 19366, 19367, 19368, 19369, 19370, 19371, + 19372, 19373, 19374, 19375, 19376, 19377, 19378, 19379, 19380, 19381, + 19382, 19383, 19384, 19385, 19386, 19387, 19388, 19389, 19390, 19391, + 19392, 19393, 19394, 19395, 19396, 19397, 19398, 19399, 19400, 19401, + 19402, 19403, 19404, 19405, 19406, 19407, 19408, 19409, 19410, 19411, + 19412, 19413, 19414, 19415, 19416, 19417, 19418, 19419, 19420, 19421, + 19422, 19423, 19424, 19425, 19426, 19427, 19428, 19429, 19430, 19431, + 19432, 19433, 19434, 19435, 19436, 19437, 19438, 19439, 19440, 19441, + 19442, 19443, 19444, 19445, 19446, 19447, 19448, 19449, 19450, 19451, + 19452, 19453, 19454, 19455, 19456, 19457, 19458, 19459, 19460, 19461, + 19462, 19463, 19464, 19465, 19466, 19467, 19468, 19469, 19470, 19471, + 19472, 19473, 19474, 19475, 19476, 19477, 19478, 19479, 19480, 19481, + 19482, 19483, 19484, 19485, 19486, 19487, 19488, 19489, 19490, 19491, + 19492, 19493, 19494, 19495, 19496, 19497, 19498, 19499, 19500, 19501, + 19502, 19503, 19504, 19505, 19506, 19507, 19508, 19509, 19510, 19511, + 19512, 19513, 19514, 19515, 19516, 19517, 19518, 19519, 19520, 19521, + 19522, 19523, 19524, 19525, 19526, 19527, 19528, 19529, 19530, 19531, + 19532, 19533, 19534, 19535, 19536, 19537, 19538, 19539, 19540, 19541, + 19542, 19543, 19544, 19545, 19546, 19547, 19548, 19549, 19550, 19551, + 19552, 19553, 19554, 19555, 19556, 19557, 19558, 19559, 19560, 19561, + 19562, 19563, 19564, 19565, 19566, 19567, 19568, 19569, 19570, 19571, + 19572, 19573, 19574, 19575, 19576, 19577, 19578, 19579, 19580, 19581, + 19582, 19583, 19584, 19585, 19586, 19587, 19588, 19589, 19590, 19591, + 19592, 19593, 19594, 19595, 19596, 19597, 19598, 19599, 19600, 19601, + 19602, 19603, 19604, 19605, 19606, 19607, 19608, 19609, 19610, 19611, + 19612, 19613, 19614, 19615, 19616, 19617, 19618, 19619, 19620, 19621, + 19622, 19623, 19624, 19625, 19626, 19627, 19628, 19629, 19630, 19631, + 19632, 19633, 19634, 19635, 19636, 19637, 19638, 19639, 19640, 19641, + 19642, 19643, 19644, 19645, 19646, 19647, 19648, 19649, 19650, 19651, + 19652, 19653, 19654, 19655, 19656, 19657, 19658, 19659, 19660, 19661, + 19662, 19663, 19664, 19665, 19666, 19667, 19668, 19669, 19670, 19671, + 19672, 19673, 19674, 19675, 19676, 19677, 19678, 19679, 19680, 19681, + 19682, 19683, 19684, 19685, 19686, 19687, 19688, 19689, 19690, 19691, + 19692, 19693, 19694, 19695, 19696, 19697, 19698, 19699, 19700, 19701, + 19702, 19703, 19704, 19705, 19706, 19707, 19708, 19709, 19710, 19711, + 19712, 19713, 19714, 19715, 19716, 19717, 19718, 19719, 19720, 19721, + 19722, 19723, 19724, 19725, 19726, 19727, 19728, 19729, 19730, 19731, + 19732, 19733, 19734, 19735, 19736, 19737, 19738, 19739, 19740, 19741, + 19742, 19743, 19744, 19745, 19746, 19747, 19748, 19749, 19750, 19751, + 19752, 19753, 19754, 19755, 19756, 19757, 19758, 19759, 19760, 19761, + 19762, 19763, 19764, 19765, 19766, 19767, 19768, 19769, 19770, 19771, + 19772, 19773, 19774, 19775, 19776, 19777, 19778, 19779, 19780, 19781, + 19782, 19783, 19784, 19785, 19786, 19787, 19788, 19789, 19790, 19791, + 19792, 19793, 19794, 19795, 19796, 19797, 19798, 19799, 19800, 19801, + 19802, 19803, 19804, 19805, 19806, 19807, 19808, 19809, 19810, 19811, + 19812, 19813, 19814, 19815, 19816, 19817, 19818, 19819, 19820, 19821, + 19822, 19823, 19824, 19825, 19826, 19827, 19828, 19829, 19830, 19831, + 19832, 19833, 19834, 19835, 19836, 19837, 19838, 19839, 19840, 19841, + 19842, 19843, 19844, 19845, 19846, 19847, 19848, 19849, 19850, 19851, + 19852, 19853, 19854, 19855, 19856, 19857, 19858, 19859, 19860, 19861, + 19862, 19863, 19864, 19865, 19866, 19867, 19868, 19869, 19870, 19871, + 19872, 19873, 19874, 19875, 19876, 19877, 19878, 19879, 19880, 19881, + 19882, 19883, 19884, 19885, 19886, 19887, 19888, 19889, 19890, 19891, + 19892, 19893, 19894, 19895, 19896, 19897, 19898, 19899, 19900, 19901, + 19902, 19903, 19904, 19905, 19906, 19907, 19908, 19909, 19910, 19911, + 19912, 19913, 19914, 19915, 19916, 19917, 19918, 19919, 19920, 19921, + 19922, 19923, 19924, 19925, 19926, 19927, 19928, 19929, 19930, 19931, + 19932, 19933, 19934, 19935, 19936, 19937, 19938, 19939, 19940, 19941, + 19942, 19943, 19944, 19945, 19946, 19947, 19948, 19949, 19950, 19951, + 19952, 19953, 19954, 19955, 19956, 19957, 19958, 19959, 19960, 19961, + 19962, 19963, 19964, 19965, 19966, 19967, 19968, 19969, 19970, 19971, + 19972, 19973, 19974, 19975, 19976, 19977, 19978, 19979, 19980, 19981, + 19982, 19983, 19984, 19985, 19986, 19987, 19988, 19989, 19990, 19991, + 19992, 19993, 19994, 19995, 19996, 19997, 19998, 19999, 20000, 20001, + 20002, 20003, 20004, 20005, 20006, 20007, 20008, 20009, 20010, 20011, + 20012, 20013, 20014, 20015, 20016, 20017, 20018, 20019, 20020, 20021, + 20022, 20023, 20024, 20025, 20026, 20027, 20028, 20029, 20030, 20031, + 20032, 20033, 20034, 20035, 20036, 20037, 20038, 20039, 20040, 20041, + 20042, 20043, 20044, 20045, 20046, 20047, 20048, 20049, 20050, 20051, + 20052, 20053, 20054, 20055, 20056, 20057, 20058, 20059, 20060, 20061, + 20062, 20063, 20064, 20065, 20066, 20067, 20068, 20069, 20070, 20071, + 20072, 20073, 20074, 20075, 20076, 20077, 20078, 20079, 20080, 20081, + 20082, 20083, 20084, 20085, 20086, 20087, 20088, 20089, 20090, 20091, + 20092, 20093, 20094, 20095, 20096, 20097, 20098, 20099, 20100, 20101, + 20102, 20103, 20104, 20105, 20106, 20107, 20108, 20109, 20110, 20111, + 20112, 20113, 20114, 20115, 20116, 20117, 20118, 20119, 20120, 20121, + 20122, 20123, 20124, 20125, 20126, 20127, 20128, 20129, 20130, 20131, + 20132, 20133, 20134, 20135, 20136, 20137, 20138, 20139, 20140, 20141, + 20142, 20143, 20144, 20145, 20146, 20147, 20148, 20149, 20150, 20151, + 20152, 20153, 20154, 20155, 20156, 20157, 20158, 20159, 20160, 20161, + 20162, 20163, 20164, 20165, 20166, 20167, 20168, 20169, 20170, 20171, + 20172, 20173, 20174, 20175, 20176, 20177, 20178, 20179, 20180, 20181, + 20182, 20183, 20184, 20185, 20186, 20187, 20188, 20189, 20190, 20191, + 20192, 20193, 20194, 20195, 20196, 20197, 20198, 20199, 20200, 20201, + 20202, 20203, 20204, 20205, 20206, 20207, 20208, 20209, 20210, 20211, + 20212, 20213, 20214, 20215, 20216, 20217, 20218, 20219, 20220, 20221, + 20222, 20223, 20224, 20225, 20226, 20227, 20228, 20229, 20230, 20231, + 20232, 20233, 20234, 20235, 20236, 20237, 20238, 20239, 20240, 20241, + 20242, 20243, 20244, 20245, 20246, 20247, 20248, 20249, 20250, 20251, + 20252, 20253, 20254, 20255, 20256, 20257, 20258, 20259, 20260, 20261, + 20262, 20263, 20264, 20265, 20266, 20267, 20268, 20269, 20270, 20271, + 20272, 20273, 20274, 20275, 20276, 20277, 20278, 20279, 20280, 20281, + 20282, 20283, 20284, 20285, 20286, 20287, 20288, 20289, 20290, 20291, + 20292, 20293, 20294, 20295, 20296, 20297, 20298, 20299, 20300, 20301, + 20302, 20303, 20304, 20305, 20306, 20307, 20308, 20309, 20310, 20311, + 20312, 20313, 20314, 20315, 20316, 20317, 20318, 20319, 20320, 20321, + 20322, 20323, 20324, 20325, 20326, 20327, 20328, 20329, 20330, 20331, + 20332, 20333, 20334, 20335, 20336, 20337, 20338, 20339, 20340, 20341, + 20342, 20343, 20344, 20345, 20346, 20347, 20348, 20349, 20350, 20351, + 20352, 20353, 20354, 20355, 20356, 20357, 20358, 20359, 20360, 20361, + 20362, 20363, 20364, 20365, 20366, 20367, 20368, 20369, 20370, 20371, + 20372, 20373, 20374, 20375, 20376, 20377, 20378, 20379, 20380, 20381, + 20382, 20383, 20384, 20385, 20386, 20387, 20388, 20389, 20390, 20391, + 20392, 20393, 20394, 20395, 20396, 20397, 20398, 20399, 20400, 20401, + 20402, 20403, 20404, 20405, 20406, 20407, 20408, 20409, 20410, 20411, + 20412, 20413, 20414, 20415, 20416, 20417, 20418, 20419, 20420, 20421, + 20422, 20423, 20424, 20425, 20426, 20427, 20428, 20429, 20430, 20431, + 20432, 20433, 20434, 20435, 20436, 20437, 20438, 20439, 20440, 20441, + 20442, 20443, 20444, 20445, 20446, 20447, 20448, 20449, 20450, 20451, + 20452, 20453, 20454, 20455, 20456, 20457, 20458, 20459, 20460, 20461, + 20462, 20463, 20464, 20465, 20466, 20467, 20468, 20469, 20470, 20471, + 20472, 20473, 20474, 20475, 20476, 20477, 20478, 20479, 20480, 20481, + 20482, 20483, 20484, 20485, 20486, 20487, 20488, 20489, 20490, 20491, + 20492, 20493, 20494, 20495, 20496, 20497, 20498, 20499, 20500, 20501, + 20502, 20503, 20504, 20505, 20506, 20507, 20508, 20509, 20510, 20511, + 20512, 20513, 20514, 20515, 20516, 20517, 20518, 20519, 20520, 20521, + 20522, 20523, 20524, 20525, 20526, 20527, 20528, 20529, 20530, 20531, + 20532, 20533, 20534, 20535, 20536, 20537, 20538, 20539, 20540, 20541, + 20542, 20543, 20544, 20545, 20546, 20547, 20548, 20549, 20550, 20551, + 20552, 20553, 20554, 20555, 20556, 20557, 20558, 20559, 20560, 20561, + 20562, 20563, 20564, 20565, 20566, 20567, 20568, 20569, 20570, 20571, + 20572, 20573, 20574, 20575, 20576, 20577, 20578, 20579, 20580, 20581, + 20582, 20583, 20584, 20585, 20586, 20587, 20588, 20589, 20590, 20591, + 20592, 20593, 20594, 20595, 20596, 20597, 20598, 20599, 20600, 20601, + 20602, 20603, 20604, 20605, 20606, 20607, 20608, 20609, 20610, 20611, + 20612, 20613, 20614, 20615, 20616, 20617, 20618, 20619, 20620, 20621, + 20622, 20623, 20624, 20625, 20626, 20627, 20628, 20629, 20630, 20631, + 20632, 20633, 20634, 20635, 20636, 20637, 20638, 20639, 20640, 20641, + 20642, 20643, 20644, 20645, 20646, 20647, 20648, 20649, 20650, 20651, + 20652, 20653, 20654, 20655, 20656, 20657, 20658, 20659, 20660, 20661, + 20662, 20663, 20664, 20665, 20666, 20667, 20668, 20669, 20670, 20671, + 20672, 20673, 20674, 20675, 20676, 20677, 20678, 20679, 20680, 20681, + 20682, 20683, 20684, 20685, 20686, 20687, 20688, 20689, 20690, 20691, + 20692, 20693, 20694, 20695, 20696, 20697, 20698, 20699, 20700, 20701, + 20702, 20703, 20704, 20705, 20706, 20707, 20708, 20709, 20710, 20711, + 20712, 20713, 20714, 20715, 20716, 20717, 20718, 20719, 20720, 20721, + 20722, 20723, 20724, 20725, 20726, 20727, 20728, 20729, 20730, 20731, + 20732, 20733, 20734, 20735, 20736, 20737, 20738, 20739, 20740, 20741, + 20742, 20743, 20744, 20745, 20746, 20747, 20748, 20749, 20750, 20751, + 20752, 20753, 20754, 20755, 20756, 20757, 20758, 20759, 20760, 20761, + 20762, 20763, 20764, 20765, 20766, 20767, 20768, 20769, 20770, 20771, + 20772, 20773, 20774, 20775, 20776, 20777, 20778, 20779, 20780, 20781, + 20782, 20783, 20784, 20785, 20786, 20787, 20788, 20789, 20790, 20791, + 20792, 20793, 20794, 20795, 20796, 20797, 20798, 20799, 20800, 20801, + 20802, 20803, 20804, 20805, 20806, 20807, 20808, 20809, 20810, 20811, + 20812, 20813, 20814, 20815, 20816, 20817, 20818, 20819, 20820, 20821, + 20822, 20823, 20824, 20825, 20826, 20827, 20828, 20829, 20830, 20831, + 20832, 20833, 20834, 20835, 20836, 20837, 20838, 20839, 20840, 20841, + 20842, 20843, 20844, 20845, 20846, 20847, 20848, 20849, 20850, 20851, + 20852, 20853, 20854, 20855, 20856, 20857, 20858, 20859, 20860, 20861, + 20862, 20863, 20864, 20865, 20866, 20867, 20868, 20869, 20870, 20871, + 20872, 20873, 20874, 20875, 20876, 20877, 20878, 20879, 20880, 20881, + 20882, 20883, 20884, 20885, 20886, 20887, 20888, 20889, 20890, 20891, + 20892, 20893, 20894, 20895, 20896, 20897, 20898, 20899, 20900, 20901, + 20902, 20903, 20904, 20905, 20906, 20907, 20908, 20909, 20910, 20911, + 20912, 20913, 20914, 20915, 20916, 20917, 20918, 20919, 20920, 20921, + 20922, 20923, 20924, 20925, 20926, 20927, 20928, 20929, 20930, 20931, + 20932, 20933, 20934, 20935, 20936, 20937, 20938, 20939, 20940, 20941, + 20942, 20943, 20944, 20945, 20946, 20947, 20948, 20949, 20950, 20951, + 20952, 20953, 20954, 20955, 20956, 20957, 20958, 20959, 20960, 20961, + 20962, 20963, 20964, 20965, 20966, 20967, 20968, 20969, 20970, 20971, + 20972, 20973, 20974, 20975, 20976, 20977, 20978, 20979, 20980, 20981, + 20982, 20983, 20984, 20985, 20986, 20987, 20988, 20989, 20990, 20991, + 20992, 20993, 20994, 20995, 20996, 20997, 20998, 20999, 21000, 21001, + 21002, 21003, 21004, 21005, 21006, 21007, 21008, 21009, 21010, 21011, + 21012, 21013, 21014, 21015, 21016, 21017, 21018, 21019, 21020, 21021, + 21022, 21023, 21024, 21025, 21026, 21027, 21028, 21029, 21030, 21031, + 21032, 21033, 21034, 21035, 21036, 21037, 21038, 21039, 21040, 21041, + 21042, 21043, 21044, 21045, 21046, 21047, 21048, 21049, 21050, 21051, + 21052, 21053, 21054, 21055, 21056, 21057, 21058, 21059, 21060, 21061, + 21062, 21063, 21064, 21065, 21066, 21067, 21068, 21069, 21070, 21071, + 21072, 21073, 21074, 21075, 21076, 21077, 21078, 21079, 21080, 21081, + 21082, 21083, 21084, 21085, 21086, 21087, 21088, 21089, 21090, 21091, + 21092, 21093, 21094, 21095, 21096, 21097, 21098, 21099, 21100, 21101, + 21102, 21103, 21104, 21105, 21106, 21107, 21108, 21109, 21110, 21111, + 21112, 21113, 21114, 21115, 21116, 21117, 21118, 21119, 21120, 21121, + 21122, 21123, 21124, 21125, 21126, 21127, 21128, 21129, 21130, 21131, + 21132, 21133, 21134, 21135, 21136, 21137, 21138, 21139, 21140, 21141, + 21142, 21143, 21144, 21145, 21146, 21147, 21148, 21149, 21150, 21151, + 21152, 21153, 21154, 21155, 21156, 21157, 21158, 21159, 21160, 21161, + 21162, 21163, 21164, 21165, 21166, 21167, 21168, 21169, 21170, 21171, + 21172, 21173, 21174, 21175, 21176, 21177, 21178, 21179, 21180, 21181, + 21182, 21183, 21184, 21185, 21186, 21187, 21188, 21189, 21190, 21191, + 21192, 21193, 21194, 21195, 21196, 21197, 21198, 21199, 21200, 21201, + 21202, 21203, 21204, 21205, 21206, 21207, 21208, 21209, 21210, 21211, + 21212, 21213, 21214, 21215, 21216, 21217, 21218, 21219, 21220, 21221, + 21222, 21223, 21224, 21225, 21226, 21227, 21228, 21229, 21230, 21231, + 21232, 21233, 21234, 21235, 21236, 21237, 21238, 21239, 21240, 21241, + 21242, 21243, 21244, 21245, 21246, 21247, 21248, 21249, 21250, 21251, + 21252, 21253, 21254, 21255, 21256, 21257, 21258, 21259, 21260, 21261, + 21262, 21263, 21264, 21265, 21266, 21267, 21268, 21269, 21270, 21271, + 21272, 21273, 21274, 21275, 21276, 21277, 21278, 21279, 21280, 21281, + 21282, 21283, 21284, 21285, 21286, 21287, 21288, 21289, 21290, 21291, + 21292, 21293, 21294, 21295, 21296, 21297, 21298, 21299, 21300, 21301, + 21302, 21303, 21304, 21305, 21306, 21307, 21308, 21309, 21310, 21311, + 21312, 21313, 21314, 21315, 21316, 21317, 21318, 21319, 21320, 21321, + 21322, 21323, 21324, 21325, 21326, 21327, 21328, 21329, 21330, 21331, + 21332, 21333, 21334, 21335, 21336, 21337, 21338, 21339, 21340, 21341, + 21342, 21343, 21344, 21345, 21346, 21347, 21348, 21349, 21350, 21351, + 21352, 21353, 21354, 21355, 21356, 21357, 21358, 21359, 21360, 21361, + 21362, 21363, 21364, 21365, 21366, 21367, 21368, 21369, 21370, 21371, + 21372, 21373, 21374, 21375, 21376, 21377, 21378, 21379, 21380, 21381, + 21382, 21383, 21384, 21385, 21386, 21387, 21388, 21389, 21390, 21391, + 21392, 21393, 21394, 21395, 21396, 21397, 21398, 21399, 21400, 21401, + 21402, 21403, 21404, 21405, 21406, 21407, 21408, 21409, 21410, 21411, + 21412, 21413, 21414, 21415, 21416, 21417, 21418, 21419, 21420, 21421, + 21422, 21423, 21424, 21425, 21426, 21427, 21428, 21429, 21430, 21431, + 21432, 21433, 21434, 21435, 21436, 21437, 21438, 21439, 21440, 21441, + 21442, 21443, 21444, 21445, 21446, 21447, 21448, 21449, 21450, 21451, + 21452, 21453, 21454, 21455, 21456, 21457, 21458, 21459, 21460, 21461, + 21462, 21463, 21464, 21465, 21466, 21467, 21468, 21469, 21470, 21471, + 21472, 21473, 21474, 21475, 21476, 21477, 21478, 21479, 21480, 21481, + 21482, 21483, 21484, 21485, 21486, 21487, 21488, 21489, 21490, 21491, + 21492, 21493, 21494, 21495, 21496, 21497, 21498, 21499, 21500, 21501, + 21502, 21503, 21504, 21505, 21506, 21507, 21508, 21509, 21510, 21511, + 21512, 21513, 21514, 21515, 21516, 21517, 21518, 21519, 21520, 21521, + 21522, 21523, 21524, 21525, 21526, 21527, 21528, 21529, 21530, 21531, + 21532, 21533, 21534, 21535, 21536, 21537, 21538, 21539, 21540, 21541, + 21542, 21543, 21544, 21545, 21546, 21547, 21548, 21549, 21550, 21551, + 21552, 21553, 21554, 21555, 21556, 21557, 21558, 21559, 21560, 21561, + 21562, 21563, 21564, 21565, 21566, 21567, 21568, 21569, 21570, 21571, + 21572, 21573, 21574, 21575, 21576, 21577, 21578, 21579, 21580, 21581, + 21582, 21583, 21584, 21585, 21586, 21587, 21588, 21589, 21590, 21591, + 21592, 21593, 21594, 21595, 21596, 21597, 21598, 21599, 21600, 21601, + 21602, 21603, 21604, 21605, 21606, 21607, 21608, 21609, 21610, 21611, + 21612, 21613, 21614, 21615, 21616, 21617, 21618, 21619, 21620, 21621, + 21622, 21623, 21624, 21625, 21626, 21627, 21628, 21629, 21630, 21631, + 21632, 21633, 21634, 21635, 21636, 21637, 21638, 21639, 21640, 21641, + 21642, 21643, 21644, 21645, 21646, 21647, 21648, 21649, 21650, 21651, + 21652, 21653, 21654, 21655, 21656, 21657, 21658, 21659, 21660, 21661, + 21662, 21663, 21664, 21665, 21666, 21667, 21668, 21669, 21670, 21671, + 21672, 21673, 21674, 21675, 21676, 21677, 21678, 21679, 21680, 21681, + 21682, 21683, 21684, 21685, 21686, 21687, 21688, 21689, 21690, 21691, + 21692, 21693, 21694, 21695, 21696, 21697, 21698, 21699, 21700, 21701, + 21702, 21703, 21704, 21705, 21706, 21707, 21708, 21709, 21710, 21711, + 21712, 21713, 21714, 21715, 21716, 21717, 21718, 21719, 21720, 21721, + 21722, 21723, 21724, 21725, 21726, 21727, 21728, 21729, 21730, 21731, + 21732, 21733, 21734, 21735, 21736, 21737, 21738, 21739, 21740, 21741, + 21742, 21743, 21744, 21745, 21746, 21747, 21748, 21749, 21750, 21751, + 21752, 21753, 21754, 21755, 21756, 21757, 21758, 21759, 21760, 21761, + 21762, 21763, 21764, 21765, 21766, 21767, 21768, 21769, 21770, 21771, + 21772, 21773, 21774, 21775, 21776, 21777, 21778, 21779, 21780, 21781, + 21782, 21783, 21784, 21785, 21786, 21787, 21788, 21789, 21790, 21791, + 21792, 21793, 21794, 21795, 21796, 21797, 21798, 21799, 21800, 21801, + 21802, 21803, 21804, 21805, 21806, 21807, 21808, 21809, 21810, 21811, + 21812, 21813, 21814, 21815, 21816, 21817, 21818, 21819, 21820, 21821, + 21822, 21823, 21824, 21825, 21826, 21827, 21828, 21829, 21830, 21831, + 21832, 21833, 21834, 21835, 21836, 21837, 21838, 21839, 21840, 21841, + 21842, 21843, 21844, 21845, 21846, 21847, 21848, 21849, 21850, 21851, + 21852, 21853, 21854, 21855, 21856, 21857, 21858, 21859, 21860, 21861, + 21862, 21863, 21864, 21865, 21866, 21867, 21868, 21869, 21870, 21871, + 21872, 21873, 21874, 21875, 21876, 21877, 21878, 21879, 21880, 21881, + 21882, 21883, 21884, 21885, 21886, 21887, 21888, 21889, 21890, 21891, + 21892, 21893, 21894, 21895, 21896, 21897, 21898, 21899, 21900, 21901, + 21902, 21903, 21904, 21905, 21906, 21907, 21908, 21909, 21910, 21911, + 21912, 21913, 21914, 21915, 21916, 21917, 21918, 21919, 21920, 21921, + 21922, 21923, 21924, 21925, 21926, 21927, 21928, 21929, 21930, 21931, + 21932, 21933, 21934, 21935, 21936, 21937, 21938, 21939, 21940, 21941, + 21942, 21943, 21944, 21945, 21946, 21947, 21948, 21949, 21950, 21951, + 21952, 21953, 21954, 21955, 21956, 21957, 21958, 21959, 21960, 21961, + 21962, 21963, 21964, 21965, 21966, 21967, 21968, 21969, 21970, 21971, + 21972, 21973, 21974, 21975, 21976, 21977, 21978, 21979, 21980, 21981, + 21982, 21983, 21984, 21985, 21986, 21987, 21988, 21989, 21990, 21991, + 21992, 21993, 21994, 21995, 21996, 21997, 21998, 21999, 22000, 22001, + 22002, 22003, 22004, 22005, 22006, 22007, 22008, 22009, 22010, 22011, + 22012, 22013, 22014, 22015, 22016, 22017, 22018, 22019, 22020, 22021, + 22022, 22023, 22024, 22025, 22026, 22027, 22028, 22029, 22030, 22031, + 22032, 22033, 22034, 22035, 22036, 22037, 22038, 22039, 22040, 22041, + 22042, 22043, 22044, 22045, 22046, 22047, 22048, 22049, 22050, 22051, + 22052, 22053, 22054, 22055, 22056, 22057, 22058, 22059, 22060, 22061, + 22062, 22063, 22064, 22065, 22066, 22067, 22068, 22069, 22070, 22071, + 22072, 22073, 22074, 22075, 22076, 22077, 22078, 22079, 22080, 22081, + 22082, 22083, 22084, 22085, 22086, 22087, 22088, 22089, 22090, 22091, + 22092, 22093, 22094, 22095, 22096, 22097, 22098, 22099, 22100, 22101, + 22102, 22103, 22104, 22105, 22106, 22107, 22108, 22109, 22110, 22111, + 22112, 22113, 22114, 22115, 22116, 22117, 22118, 22119, 22120, 22121, + 22122, 22123, 22124, 22125, 22126, 22127, 22128, 22129, 22130, 22131, + 22132, 22133, 22134, 22135, 22136, 22137, 22138, 22139, 22140, 22141, + 22142, 22143, 22144, 22145, 22146, 22147, 22148, 22149, 22150, 22151, + 22152, 22153, 22154, 22155, 22156, 22157, 22158, 22159, 22160, 22161, + 22162, 22163, 22164, 22165, 22166, 22167, 22168, 22169, 22170, 22171, + 22172, 22173, 22174, 22175, 22176, 22177, 22178, 22179, 22180, 22181, + 22182, 22183, 22184, 22185, 22186, 22187, 22188, 22189, 22190, 22191, + 22192, 22193, 22194, 22195, 22196, 22197, 22198, 22199, 22200, 22201, + 22202, 22203, 22204, 22205, 22206, 22207, 22208, 22209, 22210, 22211, + 22212, 22213, 22214, 22215, 22216, 22217, 22218, 22219, 22220, 22221, + 22222, 22223, 22224, 22225, 22226, 22227, 22228, 22229, 22230, 22231, + 22232, 22233, 22234, 22235, 22236, 22237, 22238, 22239, 22240, 22241, + 22242, 22243, 22244, 22245, 22246, 22247, 22248, 22249, 22250, 22251, + 22252, 22253, 22254, 22255, 22256, 22257, 22258, 22259, 22260, 22261, + 22262, 22263, 22264, 22265, 22266, 22267, 22268, 22269, 22270, 22271, + 22272, 22273, 22274, 22275, 22276, 22277, 22278, 22279, 22280, 22281, + 22282, 22283, 22284, 22285, 22286, 22287, 22288, 22289, 22290, 22291, + 22292, 22293, 22294, 22295, 22296, 22297, 22298, 22299, 22300, 22301, + 22302, 22303, 22304, 22305, 22306, 22307, 22308, 22309, 22310, 22311, + 22312, 22313, 22314, 22315, 22316, 22317, 22318, 22319, 22320, 22321, + 22322, 22323, 22324, 22325, 22326, 22327, 22328, 22329, 22330, 22331, + 22332, 22333, 22334, 22335, 22336, 22337, 22338, 22339, 22340, 22341, + 22342, 22343, 22344, 22345, 22346, 22347, 22348, 22349, 22350, 22351, + 22352, 22353, 22354, 22355, 22356, 22357, 22358, 22359, 22360, 22361, + 22362, 22363, 22364, 22365, 22366, 22367, 22368, 22369, 22370, 22371, + 22372, 22373, 22374, 22375, 22376, 22377, 22378, 22379, 22380, 22381, + 22382, 22383, 22384, 22385, 22386, 22387, 22388, 22389, 22390, 22391, + 22392, 22393, 22394, 22395, 22396, 22397, 22398, 22399, 22400, 22401, + 22402, 22403, 22404, 22405, 22406, 22407, 22408, 22409, 22410, 22411, + 22412, 22413, 22414, 22415, 22416, 22417, 22418, 22419, 22420, 22421, + 22422, 22423, 22424, 22425, 22426, 22427, 22428, 22429, 22430, 22431, + 22432, 22433, 22434, 22435, 22436, 22437, 22438, 22439, 22440, 22441, + 22442, 22443, 22444, 22445, 22446, 22447, 22448, 22449, 22450, 22451, + 22452, 22453, 22454, 22455, 22456, 22457, 22458, 22459, 22460, 22461, + 22462, 22463, 22464, 22465, 22466, 22467, 22468, 22469, 22470, 22471, + 22472, 22473, 22474, 22475, 22476, 22477, 22478, 22479, 22480, 22481, + 22482, 22483, 22484, 22485, 22486, 22487, 22488, 22489, 22490, 22491, + 22492, 22493, 22494, 22495, 22496, 22497, 22498, 22499, 22500, 22501, + 22502, 22503, 22504, 22505, 22506, 22507, 22508, 22509, 22510, 22511, + 22512, 22513, 22514, 22515, 22516, 22517, 22518, 22519, 22520, 22521, + 22522, 22523, 22524, 22525, 22526, 22527, 22528, 22529, 22530, 22531, + 22532, 22533, 22534, 22535, 22536, 22537, 22538, 22539, 22540, 22541, + 22542, 22543, 22544, 22545, 22546, 22547, 22548, 22549, 22550, 22551, + 22552, 22553, 22554, 22555, 22556, 22557, 22558, 22559, 22560, 22561, + 22562, 22563, 22564, 22565, 22566, 22567, 22568, 22569, 22570, 22571, + 22572, 22573, 22574, 22575, 22576, 22577, 22578, 22579, 22580, 22581, + 22582, 22583, 22584, 22585, 22586, 22587, 22588, 22589, 22590, 22591, + 22592, 22593, 22594, 22595, 22596, 22597, 22598, 22599, 22600, 22601, + 22602, 22603, 22604, 22605, 22606, 22607, 22608, 22609, 22610, 22611, + 22612, 22613, 22614, 22615, 22616, 22617, 22618, 22619, 22620, 22621, + 22622, 22623, 22624, 22625, 22626, 22627, 22628, 22629, 22630, 22631, + 22632, 22633, 22634, 22635, 22636, 22637, 22638, 22639, 22640, 22641, + 22642, 22643, 22644, 22645, 22646, 22647, 22648, 22649, 22650, 22651, + 22652, 22653, 22654, 22655, 22656, 22657, 22658, 22659, 22660, 22661, + 22662, 22663, 22664, 22665, 22666, 22667, 22668, 22669, 22670, 22671, + 22672, 22673, 22674, 22675, 22676, 22677, 22678, 22679, 22680, 22681, + 22682, 22683, 22684, 22685, 22686, 22687, 22688, 22689, 22690, 22691, + 22692, 22693, 22694, 22695, 22696, 22697, 22698, 22699, 22700, 22701, + 22702, 22703, 22704, 22705, 22706, 22707, 22708, 22709, 22710, 22711, + 22712, 22713, 22714, 22715, 22716, 22717, 22718, 22719, 22720, 22721, + 22722, 22723, 22724, 22725, 22726, 22727, 22728, 22729, 22730, 22731, + 22732, 22733, 22734, 22735, 22736, 22737, 22738, 22739, 22740, 22741, + 22742, 22743, 22744, 22745, 22746, 22747, 22748, 22749, 22750, 22751, + 22752, 22753, 22754, 22755, 22756, 22757, 22758, 22759, 22760, 22761, + 22762, 22763, 22764, 22765, 22766, 22767, 22768, 22769, 22770, 22771, + 22772, 22773, 22774, 22775, 22776, 22777, 22778, 22779, 22780, 22781, + 22782, 22783, 22784, 22785, 22786, 22787, 22788, 22789, 22790, 22791, + 22792, 22793, 22794, 22795, 22796, 22797, 22798, 22799, 22800, 22801, + 22802, 22803, 22804, 22805, 22806, 22807, 22808, 22809, 22810, 22811, + 22812, 22813, 22814, 22815, 22816, 22817, 22818, 22819, 22820, 22821, + 22822, 22823, 22824, 22825, 22826, 22827, 22828, 22829, 22830, 22831, + 22832, 22833, 22834, 22835, 22836, 22837, 22838, 22839, 22840, 22841, + 22842, 22843, 22844, 22845, 22846, 22847, 22848, 22849, 22850, 22851, + 22852, 22853, 22854, 22855, 22856, 22857, 22858, 22859, 22860, 22861, + 22862, 22863, 22864, 22865, 22866, 22867, 22868, 22869, 22870, 22871, + 22872, 22873, 22874, 22875, 22876, 22877, 22878, 22879, 22880, 22881, + 22882, 22883, 22884, 22885, 22886, 22887, 22888, 22889, 22890, 22891, + 22892, 22893, 22894, 22895, 22896, 22897, 22898, 22899, 22900, 22901, + 22902, 22903, 22904, 22905, 22906, 22907, 22908, 22909, 22910, 22911, + 22912, 22913, 22914, 22915, 22916, 22917, 22918, 22919, 22920, 22921, + 22922, 22923, 22924, 22925, 22926, 22927, 22928, 22929, 22930, 22931, + 22932, 22933, 22934, 22935, 22936, 22937, 22938, 22939, 22940, 22941, + 22942, 22943, 22944, 22945, 22946, 22947, 22948, 22949, 22950, 22951, + 22952, 22953, 22954, 22955, 22956, 22957, 22958, 22959, 22960, 22961, + 22962, 22963, 22964, 22965, 22966, 22967, 22968, 22969, 22970, 22971, + 22972, 22973, 22974, 22975, 22976, 22977, 22978, 22979, 22980, 22981, + 22982, 22983, 22984, 22985, 22986, 22987, 22988, 22989, 22990, 22991, + 22992, 22993, 22994, 22995, 22996, 22997, 22998, 22999, 23000, 23001, + 23002, 23003, 23004, 23005, 23006, 23007, 23008, 23009, 23010, 23011, + 23012, 23013, 23014, 23015, 23016, 23017, 23018, 23019, 23020, 23021, + 23022, 23023, 23024, 23025, 23026, 23027, 23028, 23029, 23030, 23031, + 23032, 23033, 23034, 23035, 23036, 23037, 23038, 23039, 23040, 23041, + 23042, 23043, 23044, 23045, 23046, 23047, 23048, 23049, 23050, 23051, + 23052, 23053, 23054, 23055, 23056, 23057, 23058, 23059, 23060, 23061, + 23062, 23063, 23064, 23065, 23066, 23067, 23068, 23069, 23070, 23071, + 23072, 23073, 23074, 23075, 23076, 23077, 23078, 23079, 23080, 23081, + 23082, 23083, 23084, 23085, 23086, 23087, 23088, 23089, 23090, 23091, + 23092, 23093, 23094, 23095, 23096, 23097, 23098, 23099, 23100, 23101, + 23102, 23103, 23104, 23105, 23106, 23107, 23108, 23109, 23110, 23111, + 23112, 23113, 23114, 23115, 23116, 23117, 23118, 23119, 23120, 23121, + 23122, 23123, 23124, 23125, 23126, 23127, 23128, 23129, 23130, 23131, + 23132, 23133, 23134, 23135, 23136, 23137, 23138, 23139, 23140, 23141, + 23142, 23143, 23144, 23145, 23146, 23147, 23148, 23149, 23150, 23151, + 23152, 23153, 23154, 23155, 23156, 23157, 23158, 23159, 23160, 23161, + 23162, 23163, 23164, 23165, 23166, 23167, 23168, 23169, 23170, 23171, + 23172, 23173, 23174, 23175, 23176, 23177, 23178, 23179, 23180, 23181, + 23182, 23183, 23184, 23185, 23186, 23187, 23188, 23189, 23190, 23191, + 23192, 23193, 23194, 23195, 23196, 23197, 23198, 23199, 23200, 23201, + 23202, 23203, 23204, 23205, 23206, 23207, 23208, 23209, 23210, 23211, + 23212, 23213, 23214, 23215, 23216, 23217, 23218, 23219, 23220, 23221, + 23222, 23223, 23224, 23225, 23226, 23227, 23228, 23229, 23230, 23231, + 23232, 23233, 23234, 23235, 23236, 23237, 23238, 23239, 23240, 23241, + 23242, 23243, 23244, 23245, 23246, 23247, 23248, 23249, 23250, 23251, + 23252, 23253, 23254, 23255, 23256, 23257, 23258, 23259, 23260, 23261, + 23262, 23263, 23264, 23265, 23266, 23267, 23268, 23269, 23270, 23271, + 23272, 23273, 23274, 23275, 23276, 23277, 23278, 23279, 23280, 23281, + 23282, 23283, 23284, 23285, 23286, 23287, 23288, 23289, 23290, 23291, + 23292, 23293, 23294, 23295, 23296, 23297, 23298, 23299, 23300, 23301, + 23302, 23303, 23304, 23305, 23306, 23307, 23308, 23309, 23310, 23311, + 23312, 23313, 23314, 23315, 23316, 23317, 23318, 23319, 23320, 23321, + 23322, 23323, 23324, 23325, 23326, 23327, 23328, 23329, 23330, 23331, + 23332, 23333, 23334, 23335, 23336, 23337, 23338, 23339, 23340, 23341, + 23342, 23343, 23344, 23345, 23346, 23347, 23348, 23349, 23350, 23351, + 23352, 23353, 23354, 23355, 23356, 23357, 23358, 23359, 23360, 23361, + 23362, 23363, 23364, 23365, 23366, 23367, 23368, 23369, 23370, 23371, + 23372, 23373, 23374, 23375, 23376, 23377, 23378, 23379, 23380, 23381, + 23382, 23383, 23384, 23385, 23386, 23387, 23388, 23389, 23390, 23391, + 23392, 23393, 23394, 23395, 23396, 23397, 23398, 23399, 23400, 23401, + 23402, 23403, 23404, 23405, 23406, 23407, 23408, 23409, 23410, 23411, + 23412, 23413, 23414, 23415, 23416, 23417, 23418, 23419, 23420, 23421, + 23422, 23423, 23424, 23425, 23426, 23427, 23428, 23429, 23430, 23431, + 23432, 23433, 23434, 23435, 23436, 23437, 23438, 23439, 23440, 23441, + 23442, 23443, 23444, 23445, 23446, 23447, 23448, 23449, 23450, 23451, + 23452, 23453, 23454, 23455, 23456, 23457, 23458, 23459, 23460, 23461, + 23462, 23463, 23464, 23465, 23466, 23467, 23468, 23469, 23470, 23471, + 23472, 23473, 23474, 23475, 23476, 23477, 23478, 23479, 23480, 23481, + 23482, 23483, 23484, 23485, 23486, 23487, 23488, 23489, 23490, 23491, + 23492, 23493, 23494, 23495, 23496, 23497, 23498, 23499, 23500, 23501, + 23502, 23503, 23504, 23505, 23506, 23507, 23508, 23509, 23510, 23511, + 23512, 23513, 23514, 23515, 23516, 23517, 23518, 23519, 23520, 23521, + 23522, 23523, 23524, 23525, 23526, 23527, 23528, 23529, 23530, 23531, + 23532, 23533, 23534, 23535, 23536, 23537, 23538, 23539, 23540, 23541, + 23542, 23543, 23544, 23545, 23546, 23547, 23548, 23549, 23550, 23551, + 23552, 23553, 23554, 23555, 23556, 23557, 23558, 23559, 23560, 23561, + 23562, 23563, 23564, 23565, 23566, 23567, 23568, 23569, 23570, 23571, + 23572, 23573, 23574, 23575, 23576, 23577, 23578, 23579, 23580, 23581, + 23582, 23583, 23584, 23585, 23586, 23587, 23588, 23589, 23590, 23591, + 23592, 23593, 23594, 23595, 23596, 23597, 23598, 23599, 23600, 23601, + 23602, 23603, 23604, 23605, 23606, 23607, 23608, 23609, 23610, 23611, + 23612, 23613, 23614, 23615, 23616, 23617, 23618, 23619, 23620, 23621, + 23622, 23623, 23624, 23625, 23626, 23627, 23628, 23629, 23630, 23631, + 23632, 23633, 23634, 23635, 23636, 23637, 23638, 23639, 23640, 23641, + 23642, 23643, 23644, 23645, 23646, 23647, 23648, 23649, 23650, 23651, + 23652, 23653, 23654, 23655, 23656, 23657, 23658, 23659, 23660, 23661, + 23662, 23663, 23664, 23665, 23666, 23667, 23668, 23669, 23670, 23671, + 23672, 23673, 23674, 23675, 23676, 23677, 23678, 23679, 23680, 23681, + 23682, 23683, 23684, 23685, 23686, 23687, 23688, 23689, 23690, 23691, + 23692, 23693, 23694, 23695, 23696, 23697, 23698, 23699, 23700, 23701, + 23702, 23703, 23704, 23705, 23706, 23707, 23708, 23709, 23710, 23711, + 23712, 23713, 23714, 23715, 23716, 23717, 23718, 23719, 23720, 23721, + 23722, 23723, 23724, 23725, 23726, 23727, 23728, 23729, 23730, 23731, + 23732, 23733, 23734, 23735, 23736, 23737, 23738, 23739, 23740, 23741, + 23742, 23743, 23744, 23745, 23746, 23747, 23748, 23749, 23750, 23751, + 23752, 23753, 23754, 23755, 23756, 23757, 23758, 23759, 23760, 23761, + 23762, 23763, 23764, 23765, 23766, 23767, 23768, 23769, 23770, 23771, + 23772, 23773, 23774, 23775, 23776, 23777, 23778, 23779, 23780, 23781, + 23782, 23783, 23784, 23785, 23786, 23787, 23788, 23789, 23790, 23791, + 23792, 23793, 23794, 23795, 23796, 23797, 23798, 23799, 23800, 23801, + 23802, 23803, 23804, 23805, 23806, 23807, 23808, 23809, 23810, 23811, + 23812, 23813, 23814, 23815, 23816, 23817, 23818, 23819, 23820, 23821, + 23822, 23823, 23824, 23825, 23826, 23827, 23828, 23829, 23830, 23831, + 23832, 23833, 23834, 23835, 23836, 23837, 23838, 23839, 23840, 23841, + 23842, 23843, 23844, 23845, 23846, 23847, 23848, 23849, 23850, 23851, + 23852, 23853, 23854, 23855, 23856, 23857, 23858, 23859, 23860, 23861, + 23862, 23863, 23864, 23865, 23866, 23867, 23868, 23869, 23870, 23871, + 23872, 23873, 23874, 23875, 23876, 23877, 23878, 23879, 23880, 23881, + 23882, 23883, 23884, 23885, 23886, 23887, 23888, 23889, 23890, 23891, + 23892, 23893, 23894, 23895, 23896, 23897, 23898, 23899, 23900, 23901, + 23902, 23903, 23904, 23905, 23906, 23907, 23908, 23909, 23910, 23911, + 23912, 23913, 23914, 23915, 23916, 23917, 23918, 23919, 23920, 23921, + 23922, 23923, 23924, 23925, 23926, 23927, 23928, 23929, 23930, 23931, + 23932, 23933, 23934, 23935, 23936, 23937, 23938, 23939, 23940, 23941, + 23942, 23943, 23944, 23945, 23946, 23947, 23948, 23949, 23950, 23951, + 23952, 23953, 23954, 23955, 23956, 23957, 23958, 23959, 23960, 23961, + 23962, 23963, 23964, 23965, 23966, 23967, 23968, 23969, 23970, 23971, + 23972, 23973, 23974, 23975, 23976, 23977, 23978, 23979, 23980, 23981, + 23982, 23983, 23984, 23985, 23986, 23987, 23988, 23989, 23990, 23991, + 23992, 23993, 23994, 23995, 23996, 23997, 23998, 23999, 24000, 24001, + 24002, 24003, 24004, 24005, 24006, 24007, 24008, 24009, 24010, 24011, + 24012, 24013, 24014, 24015, 24016, 24017, 24018, 24019, 24020, 24021, + 24022, 24023, 24024, 24025, 24026, 24027, 24028, 24029, 24030, 24031, + 24032, 24033, 24034, 24035, 24036, 24037, 24038, 24039, 24040, 24041, + 24042, 24043, 24044, 24045, 24046, 24047, 24048, 24049, 24050, 24051, + 24052, 24053, 24054, 24055, 24056, 24057, 24058, 24059, 24060, 24061, + 24062, 24063, 24064, 24065, 24066, 24067, 24068, 24069, 24070, 24071, + 24072, 24073, 24074, 24075, 24076, 24077, 24078, 24079, 24080, 24081, + 24082, 24083, 24084, 24085, 24086, 24087, 24088, 24089, 24090, 24091, + 24092, 24093, 24094, 24095, 24096, 24097, 24098, 24099, 24100, 24101, + 24102, 24103, 24104, 24105, 24106, 24107, 24108, 24109, 24110, 24111, + 24112, 24113, 24114, 24115, 24116, 24117, 24118, 24119, 24120, 24121, + 24122, 24123, 24124, 24125, 24126, 24127, 24128, 24129, 24130, 24131, + 24132, 24133, 24134, 24135, 24136, 24137, 24138, 24139, 24140, 24141, + 24142, 24143, 24144, 24145, 24146, 24147, 24148, 24149, 24150, 24151, + 24152, 24153, 24154, 24155, 24156, 24157, 24158, 24159, 24160, 24161, + 24162, 24163, 24164, 24165, 24166, 24167, 24168, 24169, 24170, 24171, + 24172, 24173, 24174, 24175, 24176, 24177, 24178, 24179, 24180, 24181, + 24182, 24183, 24184, 24185, 24186, 24187, 24188, 24189, 24190, 24191, + 24192, 24193, 24194, 24195, 24196, 24197, 24198, 24199, 24200, 24201, + 24202, 24203, 24204, 24205, 24206, 24207, 24208, 24209, 24210, 24211, + 24212, 24213, 24214, 24215, 24216, 24217, 24218, 24219, 24220, 24221, + 24222, 24223, 24224, 24225, 24226, 24227, 24228, 24229, 24230, 24231, + 24232, 24233, 24234, 24235, 24236, 24237, 24238, 24239, 24240, 24241, + 24242, 24243, 24244, 24245, 24246, 24247, 24248, 24249, 24250, 24251, + 24252, 24253, 24254, 24255, 24256, 24257, 24258, 24259, 24260, 24261, + 24262, 24263, 24264, 24265, 24266, 24267, 24268, 24269, 24270, 24271, + 24272, 24273, 24274, 24275, 24276, 24277, 24278, 24279, 24280, 24281, + 24282, 24283, 24284, 24285, 24286, 24287, 24288, 24289, 24290, 24291, + 24292, 24293, 24294, 24295, 24296, 24297, 24298, 24299, 24300, 24301, + 24302, 24303, 24304, 24305, 24306, 24307, 24308, 24309, 24310, 24311, + 24312, 24313, 24314, 24315, 24316, 24317, 24318, 24319, 24320, 24321, + 24322, 24323, 24324, 24325, 24326, 24327, 24328, 24329, 24330, 24331, + 24332, 24333, 24334, 24335, 24336, 24337, 24338, 24339, 24340, 24341, + 24342, 24343, 24344, 24345, 24346, 24347, 24348, 24349, 24350, 24351, + 24352, 24353, 24354, 24355, 24356, 24357, 24358, 24359, 24360, 24361, + 24362, 24363, 24364, 24365, 24366, 24367, 24368, 24369, 24370, 24371, + 24372, 24373, 24374, 24375, 24376, 24377, 24378, 24379, 24380, 24381, + 24382, 24383, 24384, 24385, 24386, 24387, 24388, 24389, 24390, 24391, + 24392, 24393, 24394, 24395, 24396, 24397, 24398, 24399, 24400, 24401, + 24402, 24403, 24404, 24405, 24406, 24407, 24408, 24409, 24410, 24411, + 24412, 24413, 24414, 24415, 24416, 24417, 24418, 24419, 24420, 24421, + 24422, 24423, 24424, 24425, 24426, 24427, 24428, 24429, 24430, 24431, + 24432, 24433, 24434, 24435, 24436, 24437, 24438, 24439, 24440, 24441, + 24442, 24443, 24444, 24445, 24446, 24447, 24448, 24449, 24450, 24451, + 24452, 24453, 24454, 24455, 24456, 24457, 24458, 24459, 24460, 24461, + 24462, 24463, 24464, 24465, 24466, 24467, 24468, 24469, 24470, 24471, + 24472, 24473, 24474, 24475, 24476, 24477, 24478, 24479, 24480, 24481, + 24482, 24483, 24484, 24485, 24486, 24487, 24488, 24489, 24490, 24491, + 24492, 24493, 24494, 24495, 24496, 24497, 24498, 24499, 24500, 24501, + 24502, 24503, 24504, 24505, 24506, 24507, 24508, 24509, 24510, 24511, + 24512, 24513, 24514, 24515, 24516, 24517, 24518, 24519, 24520, 24521, + 24522, 24523, 24524, 24525, 24526, 24527, 24528, 24529, 24530, 24531, + 24532, 24533, 24534, 24535, 24536, 24537, 24538, 24539, 24540, 24541, + 24542, 24543, 24544, 24545, 24546, 24547, 24548, 24549, 24550, 24551, + 24552, 24553, 24554, 24555, 24556, 24557, 24558, 24559, 24560, 24561, + 24562, 24563, 24564, 24565, 24566, 24567, 24568, 24569, 24570, 24571, + 24572, 24573, 24574, 24575, 24576, 24577, 24578, 24579, 24580, 24581, + 24582, 24583, 24584, 24585, 24586, 24587, 24588, 24589, 24590, 24591, + 24592, 24593, 24594, 24595, 24596, 24597, 24598, 24599, 24600, 24601, + 24602, 24603, 24604, 24605, 24606, 24607, 24608, 24609, 24610, 24611, + 24612, 24613, 24614, 24615, 24616, 24617, 24618, 24619, 24620, 24621, + 24622, 24623, 24624, 24625, 24626, 24627, 24628, 24629, 24630, 24631, + 24632, 24633, 24634, 24635, 24636, 24637, 24638, 24639, 24640, 24641, + 24642, 24643, 24644, 24645, 24646, 24647, 24648, 24649, 24650, 24651, + 24652, 24653, 24654, 24655, 24656, 24657, 24658, 24659, 24660, 24661, + 24662, 24663, 24664, 24665, 24666, 24667, 24668, 24669, 24670, 24671, + 24672, 24673, 24674, 24675, 24676, 24677, 24678, 24679, 24680, 24681, + 24682, 24683, 24684, 24685, 24686, 24687, 24688, 24689, 24690, 24691, + 24692, 24693, 24694, 24695, 24696, 24697, 24698, 24699, 24700, 24701, + 24702, 24703, 24704, 24705, 24706, 24707, 24708, 24709, 24710, 24711, + 24712, 24713, 24714, 24715, 24716, 24717, 24718, 24719, 24720, 24721, + 24722, 24723, 24724, 24725, 24726, 24727, 24728, 24729, 24730, 24731, + 24732, 24733, 24734, 24735, 24736, 24737, 24738, 24739, 24740, 24741, + 24742, 24743, 24744, 24745, 24746, 24747, 24748, 24749, 24750, 24751, + 24752, 24753, 24754, 24755, 24756, 24757, 24758, 24759, 24760, 24761, + 24762, 24763, 24764, 24765, 24766, 24767, 24768, 24769, 24770, 24771, + 24772, 24773, 24774, 24775, 24776, 24777, 24778, 24779, 24780, 24781, + 24782, 24783, 24784, 24785, 24786, 24787, 24788, 24789, 24790, 24791, + 24792, 24793, 24794, 24795, 24796, 24797, 24798, 24799, 24800, 24801, + 24802, 24803, 24804, 24805, 24806, 24807, 24808, 24809, 24810, 24811, + 24812, 24813, 24814, 24815, 24816, 24817, 24818, 24819, 24820, 24821, + 24822, 24823, 24824, 24825, 24826, 24827, 24828, 24829, 24830, 24831, + 24832, 24833, 24834, 24835, 24836, 24837, 24838, 24839, 24840, 24841, + 24842, 24843, 24844, 24845, 24846, 24847, 24848, 24849, 24850, 24851, + 24852, 24853, 24854, 24855, 24856, 24857, 24858, 24859, 24860, 24861, + 24862, 24863, 24864, 24865, 24866, 24867, 24868, 24869, 24870, 24871, + 24872, 24873, 24874, 24875, 24876, 24877, 24878, 24879, 24880, 24881, + 24882, 24883, 24884, 24885, 24886, 24887, 24888, 24889, 24890, 24891, + 24892, 24893, 24894, 24895, 24896, 24897, 24898, 24899, 24900, 24901, + 24902, 24903, 24904, 24905, 24906, 24907, 24908, 24909, 24910, 24911, + 24912, 24913, 24914, 24915, 24916, 24917, 24918, 24919, 24920, 24921, + 24922, 24923, 24924, 24925, 24926, 24927, 24928, 24929, 24930, 24931, + 24932, 24933, 24934, 24935, 24936, 24937, 24938, 24939, 24940, 24941, + 24942, 24943, 24944, 24945, 24946, 24947, 24948, 24949, 24950, 24951, + 24952, 24953, 24954, 24955, 24956, 24957, 24958, 24959, 24960, 24961, + 24962, 24963, 24964, 24965, 24966, 24967, 24968, 24969, 24970, 24971, + 24972, 24973, 24974, 24975, 24976, 24977, 24978, 24979, 24980, 24981, + 24982, 24983, 24984, 24985, 24986, 24987, 24988, 24989, 24990, 24991, + 24992, 24993, 24994, 24995, 24996, 24997, 24998, 24999, 25000, 25001, + 25002, 25003, 25004, 25005, 25006, 25007, 25008, 25009, 25010, 25011, + 25012, 25013, 25014, 25015, 25016, 25017, 25018, 25019, 25020, 25021, + 25022, 25023, 25024, 25025, 25026, 25027, 25028, 25029, 25030, 25031, + 25032, 25033, 25034, 25035, 25036, 25037, 25038, 25039, 25040, 25041, + 25042, 25043, 25044, 25045, 25046, 25047, 25048, 25049, 25050, 25051, + 25052, 25053, 25054, 25055, 25056, 25057, 25058, 25059, 25060, 25061, + 25062, 25063, 25064, 25065, 25066, 25067, 25068, 25069, 25070, 25071, + 25072, 25073, 25074, 25075, 25076, 25077, 25078, 25079, 25080, 25081, + 25082, 25083, 25084, 25085, 25086, 25087, 25088, 25089, 25090, 25091, + 25092, 25093, 25094, 25095, 25096, 25097, 25098, 25099, 25100, 25101, + 25102, 25103, 25104, 25105, 25106, 25107, 25108, 25109, 25110, 25111, + 25112, 25113, 25114, 25115, 25116, 25117, 25118, 25119, 25120, 25121, + 25122, 25123, 25124, 25125, 25126, 25127, 25128, 25129, 25130, 25131, + 25132, 25133, 25134, 25135, 25136, 25137, 25138, 25139, 25140, 25141, + 25142, 25143, 25144, 25145, 25146, 25147, 25148, 25149, 25150, 25151, + 25152, 25153, 25154, 25155, 25156, 25157, 25158, 25159, 25160, 25161, + 25162, 25163, 25164, 25165, 25166, 25167, 25168, 25169, 25170, 25171, + 25172, 25173, 25174, 25175, 25176, 25177, 25178, 25179, 25180, 25181, + 25182, 25183, 25184, 25185, 25186, 25187, 25188, 25189, 25190, 25191, + 25192, 25193, 25194, 25195, 25196, 25197, 25198, 25199, 25200, 25201, + 25202, 25203, 25204, 25205, 25206, 25207, 25208, 25209, 25210, 25211, + 25212, 25213, 25214, 25215, 25216, 25217, 25218, 25219, 25220, 25221, + 25222, 25223, 25224, 25225, 25226, 25227, 25228, 25229, 25230, 25231, + 25232, 25233, 25234, 25235, 25236, 25237, 25238, 25239, 25240, 25241, + 25242, 25243, 25244, 25245, 25246, 25247, 25248, 25249, 25250, 25251, + 25252, 25253, 25254, 25255, 25256, 25257, 25258, 25259, 25260, 25261, + 25262, 25263, 25264, 25265, 25266, 25267, 25268, 25269, 25270, 25271, + 25272, 25273, 25274, 25275, 25276, 25277, 25278, 25279, 25280, 25281, + 25282, 25283, 25284, 25285, 25286, 25287, 25288, 25289, 25290, 25291, + 25292, 25293, 25294, 25295, 25296, 25297, 25298, 25299, 25300, 25301, + 25302, 25303, 25304, 25305, 25306, 25307, 25308, 25309, 25310, 25311, + 25312, 25313, 25314, 25315, 25316, 25317, 25318, 25319, 25320, 25321, + 25322, 25323, 25324, 25325, 25326, 25327, 25328, 25329, 25330, 25331, + 25332, 25333, 25334, 25335, 25336, 25337, 25338, 25339, 25340, 25341, + 25342, 25343, 25344, 25345, 25346, 25347, 25348, 25349, 25350, 25351, + 25352, 25353, 25354, 25355, 25356, 25357, 25358, 25359, 25360, 25361, + 25362, 25363, 25364, 25365, 25366, 25367, 25368, 25369, 25370, 25371, + 25372, 25373, 25374, 25375, 25376, 25377, 25378, 25379, 25380, 25381, + 25382, 25383, 25384, 25385, 25386, 25387, 25388, 25389, 25390, 25391, + 25392, 25393, 25394, 25395, 25396, 25397, 25398, 25399, 25400, 25401, + 25402, 25403, 25404, 25405, 25406, 25407, 25408, 25409, 25410, 25411, + 25412, 25413, 25414, 25415, 25416, 25417, 25418, 25419, 25420, 25421, + 25422, 25423, 25424, 25425, 25426, 25427, 25428, 25429, 25430, 25431, + 25432, 25433, 25434, 25435, 25436, 25437, 25438, 25439, 25440, 25441, + 25442, 25443, 25444, 25445, 25446, 25447, 25448, 25449, 25450, 25451, + 25452, 25453, 25454, 25455, 25456, 25457, 25458, 25459, 25460, 25461, + 25462, 25463, 25464, 25465, 25466, 25467, 25468, 25469, 25470, 25471, + 25472, 25473, 25474, 25475, 25476, 25477, 25478, 25479, 25480, 25481, + 25482, 25483, 25484, 25485, 25486, 25487, 25488, 25489, 25490, 25491, + 25492, 25493, 25494, 25495, 25496, 25497, 25498, 25499, 25500, 25501, + 25502, 25503, 25504, 25505, 25506, 25507, 25508, 25509, 25510, 25511, + 25512, 25513, 25514, 25515, 25516, 25517, 25518, 25519, 25520, 25521, + 25522, 25523, 25524, 25525, 25526, 25527, 25528, 25529, 25530, 25531, + 25532, 25533, 25534, 25535, 25536, 25537, 25538, 25539, 25540, 25541, + 25542, 25543, 25544, 25545, 25546, 25547, 25548, 25549, 25550, 25551, + 25552, 25553, 25554, 25555, 25556, 25557, 25558, 25559, 25560, 25561, + 25562, 25563, 25564, 25565, 25566, 25567, 25568, 25569, 25570, 25571, + 25572, 25573, 25574, 25575, 25576, 25577, 25578, 25579, 25580, 25581, + 25582, 25583, 25584, 25585, 25586, 25587, 25588, 25589, 25590, 25591, + 25592, 25593, 25594, 25595, 25596, 25597, 25598, 25599, 25600, 25601, + 25602, 25603, 25604, 25605, 25606, 25607, 25608, 25609, 25610, 25611, + 25612, 25613, 25614, 25615, 25616, 25617, 25618, 25619, 25620, 25621, + 25622, 25623, 25624, 25625, 25626, 25627, 25628, 25629, 25630, 25631, + 25632, 25633, 25634, 25635, 25636, 25637, 25638, 25639, 25640, 25641, + 25642, 25643, 25644, 25645, 25646, 25647, 25648, 25649, 25650, 25651, + 25652, 25653, 25654, 25655, 25656, 25657, 25658, 25659, 25660, 25661, + 25662, 25663, 25664, 25665, 25666, 25667, 25668, 25669, 25670, 25671, + 25672, 25673, 25674, 25675, 25676, 25677, 25678, 25679, 25680, 25681, + 25682, 25683, 25684, 25685, 25686, 25687, 25688, 25689, 25690, 25691, + 25692, 25693, 25694, 25695, 25696, 25697, 25698, 25699, 25700, 25701, + 25702, 25703, 25704, 25705, 25706, 25707, 25708, 25709, 25710, 25711, + 25712, 25713, 25714, 25715, 25716, 25717, 25718, 25719, 25720, 25721, + 25722, 25723, 25724, 25725, 25726, 25727, 25728, 25729, 25730, 25731, + 25732, 25733, 25734, 25735, 25736, 25737, 25738, 25739, 25740, 25741, + 25742, 25743, 25744, 25745, 25746, 25747, 25748, 25749, 25750, 25751, + 25752, 25753, 25754, 25755, 25756, 25757, 25758, 25759, 25760, 25761, + 25762, 25763, 25764, 25765, 25766, 25767, 25768, 25769, 25770, 25771, + 25772, 25773, 25774, 25775, 25776, 25777, 25778, 25779, 25780, 25781, + 25782, 25783, 25784, 25785, 25786, 25787, 25788, 25789, 25790, 25791, + 25792, 25793, 25794, 25795, 25796, 25797, 25798, 25799, 25800, 25801, + 25802, 25803, 25804, 25805, 25806, 25807, 25808, 25809, 25810, 25811, + 25812, 25813, 25814, 25815, 25816, 25817, 25818, 25819, 25820, 25821, + 25822, 25823, 25824, 25825, 25826, 25827, 25828, 25829, 25830, 25831, + 25832, 25833, 25834, 25835, 25836, 25837, 25838, 25839, 25840, 25841, + 25842, 25843, 25844, 25845, 25846, 25847, 25848, 25849, 25850, 25851, + 25852, 25853, 25854, 25855, 25856, 25857, 25858, 25859, 25860, 25861, + 25862, 25863, 25864, 25865, 25866, 25867, 25868, 25869, 25870, 25871, + 25872, 25873, 25874, 25875, 25876, 25877, 25878, 25879, 25880, 25881, + 25882, 25883, 25884, 25885, 25886, 25887, 25888, 25889, 25890, 25891, + 25892, 25893, 25894, 25895, 25896, 25897, 25898, 25899, 25900, 25901, + 25902, 25903, 25904, 25905, 25906, 25907, 25908, 25909, 25910, 25911, + 25912, 25913, 25914, 25915, 25916, 25917, 25918, 25919, 25920, 25921, + 25922, 25923, 25924, 25925, 25926, 25927, 25928, 25929, 25930, 25931, + 25932, 25933, 25934, 25935, 25936, 25937, 25938, 25939, 25940, 25941, + 25942, 25943, 25944, 25945, 25946, 25947, 25948, 25949, 25950, 25951, + 25952, 25953, 25954, 25955, 25956, 25957, 25958, 25959, 25960, 25961, + 25962, 25963, 25964, 25965, 25966, 25967, 25968, 25969, 25970, 25971, + 25972, 25973, 25974, 25975, 25976, 25977, 25978, 25979, 25980, 25981, + 25982, 25983, 25984, 25985, 25986, 25987, 25988, 25989, 25990, 25991, + 25992, 25993, 25994, 25995, 25996, 25997, 25998, 25999, 26000, 26001, + 26002, 26003, 26004, 26005, 26006, 26007, 26008, 26009, 26010, 26011, + 26012, 26013, 26014, 26015, 26016, 26017, 26018, 26019, 26020, 26021, + 26022, 26023, 26024, 26025, 26026, 26027, 26028, 26029, 26030, 26031, + 26032, 26033, 26034, 26035, 26036, 26037, 26038, 26039, 26040, 26041, + 26042, 26043, 26044, 26045, 26046, 26047, 26048, 26049, 26050, 26051, + 26052, 26053, 26054, 26055, 26056, 26057, 26058, 26059, 26060, 26061, + 26062, 26063, 26064, 26065, 26066, 26067, 26068, 26069, 26070, 26071, + 26072, 26073, 26074, 26075, 26076, 26077, 26078, 26079, 26080, 26081, + 26082, 26083, 26084, 26085, 26086, 26087, 26088, 26089, 26090, 26091, + 26092, 26093, 26094, 26095, 26096, 26097, 26098, 26099, 26100, 26101, + 26102, 26103, 26104, 26105, 26106, 26107, 26108, 26109, 26110, 26111, + 26112, 26113, 26114, 26115, 26116, 26117, 26118, 26119, 26120, 26121, + 26122, 26123, 26124, 26125, 26126, 26127, 26128, 26129, 26130, 26131, + 26132, 26133, 26134, 26135, 26136, 26137, 26138, 26139, 26140, 26141, + 26142, 26143, 26144, 26145, 26146, 26147, 26148, 26149, 26150, 26151, + 26152, 26153, 26154, 26155, 26156, 26157, 26158, 26159, 26160, 26161, + 26162, 26163, 26164, 26165, 26166, 26167, 26168, 26169, 26170, 26171, + 26172, 26173, 26174, 26175, 26176, 26177, 26178, 26179, 26180, 26181, + 26182, 26183, 26184, 26185, 26186, 26187, 26188, 26189, 26190, 26191, + 26192, 26193, 26194, 26195, 26196, 26197, 26198, 26199, 26200, 26201, + 26202, 26203, 26204, 26205, 26206, 26207, 26208, 26209, 26210, 26211, + 26212, 26213, 26214, 26215, 26216, 26217, 26218, 26219, 26220, 26221, + 26222, 26223, 26224, 26225, 26226, 26227, 26228, 26229, 26230, 26231, + 26232, 26233, 26234, 26235, 26236, 26237, 26238, 26239, 26240, 26241, + 26242, 26243, 26244, 26245, 26246, 26247, 26248, 26249, 26250, 26251, + 26252, 26253, 26254, 26255, 26256, 26257, 26258, 26259, 26260, 26261, + 26262, 26263, 26264, 26265, 26266, 26267, 26268, 26269, 26270, 26271, + 26272, 26273, 26274, 26275, 26276, 26277, 26278, 26279, 26280, 26281, + 26282, 26283, 26284, 26285, 26286, 26287, 26288, 26289, 26290, 26291, + 26292, 26293, 26294, 26295, 26296, 26297, 26298, 26299, 26300, 26301, + 26302, 26303, 26304, 26305, 26306, 26307, 26308, 26309, 26310, 26311, + 26312, 26313, 26314, 26315, 26316, 26317, 26318, 26319, 26320, 26321, + 26322, 26323, 26324, 26325, 26326, 26327, 26328, 26329, 26330, 26331, + 26332, 26333, 26334, 26335, 26336, 26337, 26338, 26339, 26340, 26341, + 26342, 26343, 26344, 26345, 26346, 26347, 26348, 26349, 26350, 26351, + 26352, 26353, 26354, 26355, 26356, 26357, 26358, 26359, 26360, 26361, + 26362, 26363, 26364, 26365, 26366, 26367, 26368, 26369, 26370, 26371, + 26372, 26373, 26374, 26375, 26376, 26377, 26378, 26379, 26380, 26381, + 26382, 26383, 26384, 26385, 26386, 26387, 26388, 26389, 26390, 26391, + 26392, 26393, 26394, 26395, 26396, 26397, 26398, 26399, 26400, 26401, + 26402, 26403, 26404, 26405, 26406, 26407, 26408, 26409, 26410, 26411, + 26412, 26413, 26414, 26415, 26416, 26417, 26418, 26419, 26420, 26421, + 26422, 26423, 26424, 26425, 26426, 26427, 26428, 26429, 26430, 26431, + 26432, 26433, 26434, 26435, 26436, 26437, 26438, 26439, 26440, 26441, + 26442, 26443, 26444, 26445, 26446, 26447, 26448, 26449, 26450, 26451, + 26452, 26453, 26454, 26455, 26456, 26457, 26458, 26459, 26460, 26461, + 26462, 26463, 26464, 26465, 26466, 26467, 26468, 26469, 26470, 26471, + 26472, 26473, 26474, 26475, 26476, 26477, 26478, 26479, 26480, 26481, + 26482, 26483, 26484, 26485, 26486, 26487, 26488, 26489, 26490, 26491, + 26492, 26493, 26494, 26495, 26496, 26497, 26498, 26499, 26500, 26501, + 26502, 26503, 26504, 26505, 26506, 26507, 26508, 26509, 26510, 26511, + 26512, 26513, 26514, 26515, 26516, 26517, 26518, 26519, 26520, 26521, + 26522, 26523, 26524, 26525, 26526, 26527, 26528, 26529, 26530, 26531, + 26532, 26533, 26534, 26535, 26536, 26537, 26538, 26539, 26540, 26541, + 26542, 26543, 26544, 26545, 26546, 26547, 26548, 26549, 26550, 26551, + 26552, 26553, 26554, 26555, 26556, 26557, 26558, 26559, 26560, 26561, + 26562, 26563, 26564, 26565, 26566, 26567, 26568, 26569, 26570, 26571, + 26572, 26573, 26574, 26575, 26576, 26577, 26578, 26579, 26580, 26581, + 26582, 26583, 26584, 26585, 26586, 26587, 26588, 26589, 26590, 26591, + 26592, 26593, 26594, 26595, 26596, 26597, 26598, 26599, 26600, 26601, + 26602, 26603, 26604, 26605, 26606, 26607, 26608, 26609, 26610, 26611, + 26612, 26613, 26614, 26615, 26616, 26617, 26618, 26619, 26620, 26621, + 26622, 26623, 26624, 26625, 26626, 26627, 26628, 26629, 26630, 26631, + 26632, 26633, 26634, 26635, 26636, 26637, 26638, 26639, 26640, 26641, + 26642, 26643, 26644, 26645, 26646, 26647, 26648, 26649, 26650, 26651, + 26652, 26653, 26654, 26655, 26656, 26657, 26658, 26659, 26660, 26661, + 26662, 26663, 26664, 26665, 26666, 26667, 26668, 26669, 26670, 26671, + 26672, 26673, 26674, 26675, 26676, 26677, 26678, 26679, 26680, 26681, + 26682, 26683, 26684, 26685, 26686, 26687, 26688, 26689, 26690, 26691, + 26692, 26693, 26694, 26695, 26696, 26697, 26698, 26699, 26700, 26701, + 26702, 26703, 26704, 26705, 26706, 26707, 26708, 26709, 26710, 26711, + 26712, 26713, 26714, 26715, 26716, 26717, 26718, 26719, 26720, 26721, + 26722, 26723, 26724, 26725, 26726, 26727, 26728, 26729, 26730, 26731, + 26732, 26733, 26734, 26735, 26736, 26737, 26738, 26739, 26740, 26741, + 26742, 26743, 26744, 26745, 26746, 26747, 26748, 26749, 26750, 26751, + 26752, 26753, 26754, 26755, 26756, 26757, 26758, 26759, 26760, 26761, + 26762, 26763, 26764, 26765, 26766, 26767, 26768, 26769, 26770, 26771, + 26772, 26773, 26774, 26775, 26776, 26777, 26778, 26779, 26780, 26781, + 26782, 26783, 26784, 26785, 26786, 26787, 26788, 26789, 26790, 26791, + 26792, 26793, 26794, 26795, 26796, 26797, 26798, 26799, 26800, 26801, + 26802, 26803, 26804, 26805, 26806, 26807, 26808, 26809, 26810, 26811, + 26812, 26813, 26814, 26815, 26816, 26817, 26818, 26819, 26820, 26821, + 26822, 26823, 26824, 26825, 26826, 26827, 26828, 26829, 26830, 26831, + 26832, 26833, 26834, 26835, 26836, 26837, 26838, 26839, 26840, 26841, + 26842, 26843, 26844, 26845, 26846, 26847, 26848, 26849, 26850, 26851, + 26852, 26853, 26854, 26855, 26856, 26857, 26858, 26859, 26860, 26861, + 26862, 26863, 26864, 26865, 26866, 26867, 26868, 26869, 26870, 26871, + 26872, 26873, 26874, 26875, 26876, 26877, 26878, 26879, 26880, 26881, + 26882, 26883, 26884, 26885, 26886, 26887, 26888, 26889, 26890, 26891, + 26892, 26893, 26894, 26895, 26896, 26897, 26898, 26899, 26900, 26901, + 26902, 26903, 26904, 26905, 26906, 26907, 26908, 26909, 26910, 26911, + 26912, 26913, 26914, 26915, 26916, 26917, 26918, 26919, 26920, 26921, + 26922, 26923, 26924, 26925, 26926, 26927, 26928, 26929, 26930, 26931, + 26932, 26933, 26934, 26935, 26936, 26937, 26938, 26939, 26940, 26941, + 26942, 26943, 26944, 26945, 26946, 26947, 26948, 26949, 26950, 26951, + 26952, 26953, 26954, 26955, 26956, 26957, 26958, 26959, 26960, 26961, + 26962, 26963, 26964, 26965, 26966, 26967, 26968, 26969, 26970, 26971, + 26972, 26973, 26974, 26975, 26976, 26977, 26978, 26979, 26980, 26981, + 26982, 26983, 26984, 26985, 26986, 26987, 26988, 26989, 26990, 26991, + 26992, 26993, 26994, 26995, 26996, 26997, 26998, 26999, 27000, 27001, + 27002, 27003, 27004, 27005, 27006, 27007, 27008, 27009, 27010, 27011, + 27012, 27013, 27014, 27015, 27016, 27017, 27018, 27019, 27020, 27021, + 27022, 27023, 27024, 27025, 27026, 27027, 27028, 27029, 27030, 27031, + 27032, 27033, 27034, 27035, 27036, 27037, 27038, 27039, 27040, 27041, + 27042, 27043, 27044, 27045, 27046, 27047, 27048, 27049, 27050, 27051, + 27052, 27053, 27054, 27055, 27056, 27057, 27058, 27059, 27060, 27061, + 27062, 27063, 27064, 27065, 27066, 27067, 27068, 27069, 27070, 27071, + 27072, 27073, 27074, 27075, 27076, 27077, 27078, 27079, 27080, 27081, + 27082, 27083, 27084, 27085, 27086, 27087, 27088, 27089, 27090, 27091, + 27092, 27093, 27094, 27095, 27096, 27097, 27098, 27099, 27100, 27101, + 27102, 27103, 27104, 27105, 27106, 27107, 27108, 27109, 27110, 27111, + 27112, 27113, 27114, 27115, 27116, 27117, 27118, 27119, 27120, 27121, + 27122, 27123, 27124, 27125, 27126, 27127, 27128, 27129, 27130, 27131, + 27132, 27133, 27134, 27135, 27136, 27137, 27138, 27139, 27140, 27141, + 27142, 27143, 27144, 27145, 27146, 27147, 27148, 27149, 27150, 27151, + 27152, 27153, 27154, 27155, 27156, 27157, 27158, 27159, 27160, 27161, + 27162, 27163, 27164, 27165, 27166, 27167, 27168, 27169, 27170, 27171, + 27172, 27173, 27174, 27175, 27176, 27177, 27178, 27179, 27180, 27181, + 27182, 27183, 27184, 27185, 27186, 27187, 27188, 27189, 27190, 27191, + 27192, 27193, 27194, 27195, 27196, 27197, 27198, 27199, 27200, 27201, + 27202, 27203, 27204, 27205, 27206, 27207, 27208, 27209, 27210, 27211, + 27212, 27213, 27214, 27215, 27216, 27217, 27218, 27219, 27220, 27221, + 27222, 27223, 27224, 27225, 27226, 27227, 27228, 27229, 27230, 27231, + 27232, 27233, 27234, 27235, 27236, 27237, 27238, 27239, 27240, 27241, + 27242, 27243, 27244, 27245, 27246, 27247, 27248, 27249, 27250, 27251, + 27252, 27253, 27254, 27255, 27256, 27257, 27258, 27259, 27260, 27261, + 27262, 27263, 27264, 27265, 27266, 27267, 27268, 27269, 27270, 27271, + 27272, 27273, 27274, 27275, 27276, 27277, 27278, 27279, 27280, 27281, + 27282, 27283, 27284, 27285, 27286, 27287, 27288, 27289, 27290, 27291, + 27292, 27293, 27294, 27295, 27296, 27297, 27298, 27299, 27300, 27301, + 27302, 27303, 27304, 27305, 27306, 27307, 27308, 27309, 27310, 27311, + 27312, 27313, 27314, 27315, 27316, 27317, 27318, 27319, 27320, 27321, + 27322, 27323, 27324, 27325, 27326, 27327, 27328, 27329, 27330, 27331, + 27332, 27333, 27334, 27335, 27336, 27337, 27338, 27339, 27340, 27341, + 27342, 27343, 27344, 27345, 27346, 27347, 27348, 27349, 27350, 27351, + 27352, 27353, 27354, 27355, 27356, 27357, 27358, 27359, 27360, 27361, + 27362, 27363, 27364, 27365, 27366, 27367, 27368, 27369, 27370, 27371, + 27372, 27373, 27374, 27375, 27376, 27377, 27378, 27379, 27380, 27381, + 27382, 27383, 27384, 27385, 27386, 27387, 27388, 27389, 27390, 27391, + 27392, 27393, 27394, 27395, 27396, 27397, 27398, 27399, 27400, 27401, + 27402, 27403, 27404, 27405, 27406, 27407, 27408, 27409, 27410, 27411, + 27412, 27413, 27414, 27415, 27416, 27417, 27418, 27419, 27420, 27421, + 27422, 27423, 27424, 27425, 27426, 27427, 27428, 27429, 27430, 27431, + 27432, 27433, 27434, 27435, 27436, 27437, 27438, 27439, 27440, 27441, + 27442, 27443, 27444, 27445, 27446, 27447, 27448, 27449, 27450, 27451, + 27452, 27453, 27454, 27455, 27456, 27457, 27458, 27459, 27460, 27461, + 27462, 27463, 27464, 27465, 27466, 27467, 27468, 27469, 27470, 27471, + 27472, 27473, 27474, 27475, 27476, 27477, 27478, 27479, 27480, 27481, + 27482, 27483, 27484, 27485, 27486, 27487, 27488, 27489, 27490, 27491, + 27492, 27493, 27494, 27495, 27496, 27497, 27498, 27499, 27500, 27501, + 27502, 27503, 27504, 27505, 27506, 27507, 27508, 27509, 27510, 27511, + 27512, 27513, 27514, 27515, 27516, 27517, 27518, 27519, 27520, 27521, + 27522, 27523, 27524, 27525, 27526, 27527, 27528, 27529, 27530, 27531, + 27532, 27533, 27534, 27535, 27536, 27537, 27538, 27539, 27540, 27541, + 27542, 27543, 27544, 27545, 27546, 27547, 27548, 27549, 27550, 27551, + 27552, 27553, 27554, 27555, 27556, 27557, 27558, 27559, 27560, 27561, + 27562, 27563, 27564, 27565, 27566, 27567, 27568, 27569, 27570, 27571, + 27572, 27573, 27574, 27575, 27576, 27577, 27578, 27579, 27580, 27581, + 27582, 27583, 27584, 27585, 27586, 27587, 27588, 27589, 27590, 27591, + 27592, 27593, 27594, 27595, 27596, 27597, 27598, 27599, 27600, 27601, + 27602, 27603, 27604, 27605, 27606, 27607, 27608, 27609, 27610, 27611, + 27612, 27613, 27614, 27615, 27616, 27617, 27618, 27619, 27620, 27621, + 27622, 27623, 27624, 27625, 27626, 27627, 27628, 27629, 27630, 27631, + 27632, 27633, 27634, 27635, 27636, 27637, 27638, 27639, 27640, 27641, + 27642, 27643, 27644, 27645, 27646, 27647, 27648, 27649, 27650, 27651, + 27652, 27653, 27654, 27655, 27656, 27657, 27658, 27659, 27660, 27661, + 27662, 27663, 27664, 27665, 27666, 27667, 27668, 27669, 27670, 27671, + 27672, 27673, 27674, 27675, 27676, 27677, 27678, 27679, 27680, 27681, + 27682, 27683, 27684, 27685, 27686, 27687, 27688, 27689, 27690, 27691, + 27692, 27693, 27694, 27695, 27696, 27697, 27698, 27699, 27700, 27701, + 27702, 27703, 27704, 27705, 27706, 27707, 27708, 27709, 27710, 27711, + 27712, 27713, 27714, 27715, 27716, 27717, 27718, 27719, 27720, 27721, + 27722, 27723, 27724, 27725, 27726, 27727, 27728, 27729, 27730, 27731, + 27732, 27733, 27734, 27735, 27736, 27737, 27738, 27739, 27740, 27741, + 27742, 27743, 27744, 27745, 27746, 27747, 27748, 27749, 27750, 27751, + 27752, 27753, 27754, 27755, 27756, 27757, 27758, 27759, 27760, 27761, + 27762, 27763, 27764, 27765, 27766, 27767, 27768, 27769, 27770, 27771, + 27772, 27773, 27774, 27775, 27776, 27777, 27778, 27779, 27780, 27781, + 27782, 27783, 27784, 27785, 27786, 27787, 27788, 27789, 27790, 27791, + 27792, 27793, 27794, 27795, 27796, 27797, 27798, 27799, 27800, 27801, + 27802, 27803, 27804, 27805, 27806, 27807, 27808, 27809, 27810, 27811, + 27812, 27813, 27814, 27815, 27816, 27817, 27818, 27819, 27820, 27821, + 27822, 27823, 27824, 27825, 27826, 27827, 27828, 27829, 27830, 27831, + 27832, 27833, 27834, 27835, 27836, 27837, 27838, 27839, 27840, 27841, + 27842, 27843, 27844, 27845, 27846, 27847, 27848, 27849, 27850, 27851, + 27852, 27853, 27854, 27855, 27856, 27857, 27858, 27859, 27860, 27861, + 27862, 27863, 27864, 27865, 27866, 27867, 27868, 27869, 27870, 27871, + 27872, 27873, 27874, 27875, 27876, 27877, 27878, 27879, 27880, 27881, + 27882, 27883, 27884, 27885, 27886, 27887, 27888, 27889, 27890, 27891, + 27892, 27893, 27894, 27895, 27896, 27897, 27898, 27899, 27900, 27901, + 27902, 27903, 27904, 27905, 27906, 27907, 27908, 27909, 27910, 27911, + 27912, 27913, 27914, 27915, 27916, 27917, 27918, 27919, 27920, 27921, + 27922, 27923, 27924, 27925, 27926, 27927, 27928, 27929, 27930, 27931, + 27932, 27933, 27934, 27935, 27936, 27937, 27938, 27939, 27940, 27941, + 27942, 27943, 27944, 27945, 27946, 27947, 27948, 27949, 27950, 27951, + 27952, 27953, 27954, 27955, 27956, 27957, 27958, 27959, 27960, 27961, + 27962, 27963, 27964, 27965, 27966, 27967, 27968, 27969, 27970, 27971, + 27972, 27973, 27974, 27975, 27976, 27977, 27978, 27979, 27980, 27981, + 27982, 27983, 27984, 27985, 27986, 27987, 27988, 27989, 27990, 27991, + 27992, 27993, 27994, 27995, 27996, 27997, 27998, 27999, 28000, 28001, + 28002, 28003, 28004, 28005, 28006, 28007, 28008, 28009, 28010, 28011, + 28012, 28013, 28014, 28015, 28016, 28017, 28018, 28019, 28020, 28021, + 28022, 28023, 28024, 28025, 28026, 28027, 28028, 28029, 28030, 28031, + 28032, 28033, 28034, 28035, 28036, 28037, 28038, 28039, 28040, 28041, + 28042, 28043, 28044, 28045, 28046, 28047, 28048, 28049, 28050, 28051, + 28052, 28053, 28054, 28055, 28056, 28057, 28058, 28059, 28060, 28061, + 28062, 28063, 28064, 28065, 28066, 28067, 28068, 28069, 28070, 28071, + 28072, 28073, 28074, 28075, 28076, 28077, 28078, 28079, 28080, 28081, + 28082, 28083, 28084, 28085, 28086, 28087, 28088, 28089, 28090, 28091, + 28092, 28093, 28094, 28095, 28096, 28097, 28098, 28099, 28100, 28101, + 28102, 28103, 28104, 28105, 28106, 28107, 28108, 28109, 28110, 28111, + 28112, 28113, 28114, 28115, 28116, 28117, 28118, 28119, 28120, 28121, + 28122, 28123, 28124, 28125, 28126, 28127, 28128, 28129, 28130, 28131, + 28132, 28133, 28134, 28135, 28136, 28137, 28138, 28139, 28140, 28141, + 28142, 28143, 28144, 28145, 28146, 28147, 28148, 28149, 28150, 28151, + 28152, 28153, 28154, 28155, 28156, 28157, 28158, 28159, 28160, 28161, + 28162, 28163, 28164, 28165, 28166, 28167, 28168, 28169, 28170, 28171, + 28172, 28173, 28174, 28175, 28176, 28177, 28178, 28179, 28180, 28181, + 28182, 28183, 28184, 28185, 28186, 28187, 28188, 28189, 28190, 28191, + 28192, 28193, 28194, 28195, 28196, 28197, 28198, 28199, 28200, 28201, + 28202, 28203, 28204, 28205, 28206, 28207, 28208, 28209, 28210, 28211, + 28212, 28213, 28214, 28215, 28216, 28217, 28218, 28219, 28220, 28221, + 28222, 28223, 28224, 28225, 28226, 28227, 28228, 28229, 28230, 28231, + 28232, 28233, 28234, 28235, 28236, 28237, 28238, 28239, 28240, 28241, + 28242, 28243, 28244, 28245, 28246, 28247, 28248, 28249, 28250, 28251, + 28252, 28253, 28254, 28255, 28256, 28257, 28258, 28259, 28260, 28261, + 28262, 28263, 28264, 28265, 28266, 28267, 28268, 28269, 28270, 28271, + 28272, 28273, 28274, 28275, 28276, 28277, 28278, 28279, 28280, 28281, + 28282, 28283, 28284, 28285, 28286, 28287, 28288, 28289, 28290, 28291, + 28292, 28293, 28294, 28295, 28296, 28297, 28298, 28299, 28300, 28301, + 28302, 28303, 28304, 28305, 28306, 28307, 28308, 28309, 28310, 28311, + 28312, 28313, 28314, 28315, 28316, 28317, 28318, 28319, 28320, 28321, + 28322, 28323, 28324, 28325, 28326, 28327, 28328, 28329, 28330, 28331, + 28332, 28333, 28334, 28335, 28336, 28337, 28338, 28339, 28340, 28341, + 28342, 28343, 28344, 28345, 28346, 28347, 28348, 28349, 28350, 28351, + 28352, 28353, 28354, 28355, 28356, 28357, 28358, 28359, 28360, 28361, + 28362, 28363, 28364, 28365, 28366, 28367, 28368, 28369, 28370, 28371, + 28372, 28373, 28374, 28375, 28376, 28377, 28378, 28379, 28380, 28381, + 28382, 28383, 28384, 28385, 28386, 28387, 28388, 28389, 28390, 28391, + 28392, 28393, 28394, 28395, 28396, 28397, 28398, 28399, 28400, 28401, + 28402, 28403, 28404, 28405, 28406, 28407, 28408, 28409, 28410, 28411, + 28412, 28413, 28414, 28415, 28416, 28417, 28418, 28419, 28420, 28421, + 28422, 28423, 28424, 28425, 28426, 28427, 28428, 28429, 28430, 28431, + 28432, 28433, 28434, 28435, 28436, 28437, 28438, 28439, 28440, 28441, + 28442, 28443, 28444, 28445, 28446, 28447, 28448, 28449, 28450, 28451, + 28452, 28453, 28454, 28455, 28456, 28457, 28458, 28459, 28460, 28461, + 28462, 28463, 28464, 28465, 28466, 28467, 28468, 28469, 28470, 28471, + 28472, 28473, 28474, 28475, 28476, 28477, 28478, 28479, 28480, 28481, + 28482, 28483, 28484, 28485, 28486, 28487, 28488, 28489, 28490, 28491, + 28492, 28493, 28494, 28495, 28496, 28497, 28498, 28499, 28500, 28501, + 28502, 28503, 28504, 28505, 28506, 28507, 28508, 28509, 28510, 28511, + 28512, 28513, 28514, 28515, 28516, 28517, 28518, 28519, 28520, 28521, + 28522, 28523, 28524, 28525, 28526, 28527, 28528, 28529, 28530, 28531, + 28532, 28533, 28534, 28535, 28536, 28537, 28538, 28539, 28540, 28541, + 28542, 28543, 28544, 28545, 28546, 28547, 28548, 28549, 28550, 28551, + 28552, 28553, 28554, 28555, 28556, 28557, 28558, 28559, 28560, 28561, + 28562, 28563, 28564, 28565, 28566, 28567, 28568, 28569, 28570, 28571, + 28572, 28573, 28574, 28575, 28576, 28577, 28578, 28579, 28580, 28581, + 28582, 28583, 28584, 28585, 28586, 28587, 28588, 28589, 28590, 28591, + 28592, 28593, 28594, 28595, 28596, 28597, 28598, 28599, 28600, 28601, + 28602, 28603, 28604, 28605, 28606, 28607, 28608, 28609, 28610, 28611, + 28612, 28613, 28614, 28615, 28616, 28617, 28618, 28619, 28620, 28621, + 28622, 28623, 28624, 28625, 28626, 28627, 28628, 28629, 28630, 28631, + 28632, 28633, 28634, 28635, 28636, 28637, 28638, 28639, 28640, 28641, + 28642, 28643, 28644, 28645, 28646, 28647, 28648, 28649, 28650, 28651, + 28652, 28653, 28654, 28655, 28656, 28657, 28658, 28659, 28660, 28661, + 28662, 28663, 28664, 28665, 28666, 28667, 28668, 28669, 28670, 28671, + 28672, 28673, 28674, 28675, 28676, 28677, 28678, 28679, 28680, 28681, + 28682, 28683, 28684, 28685, 28686, 28687, 28688, 28689, 28690, 28691, + 28692, 28693, 28694, 28695, 28696, 28697, 28698, 28699, 28700, 28701, + 28702, 28703, 28704, 28705, 28706, 28707, 28708, 28709, 28710, 28711, + 28712, 28713, 28714, 28715, 28716, 28717, 28718, 28719, 28720, 28721, + 28722, 28723, 28724, 28725, 28726, 28727, 28728, 28729, 28730, 28731, + 28732, 28733, 28734, 28735, 28736, 28737, 28738, 28739, 28740, 28741, + 28742, 28743, 28744, 28745, 28746, 28747, 28748, 28749, 28750, 28751, + 28752, 28753, 28754, 28755, 28756, 28757, 28758, 28759, 28760, 28761, + 28762, 28763, 28764, 28765, 28766, 28767, 28768, 28769, 28770, 28771, + 28772, 28773, 28774, 28775, 28776, 28777, 28778, 28779, 28780, 28781, + 28782, 28783, 28784, 28785, 28786, 28787, 28788, 28789, 28790, 28791, + 28792, 28793, 28794, 28795, 28796, 28797, 28798, 28799, 28800, 28801, + 28802, 28803, 28804, 28805, 28806, 28807, 28808, 28809, 28810, 28811, + 28812, 28813, 28814, 28815, 28816, 28817, 28818, 28819, 28820, 28821, + 28822, 28823, 28824, 28825, 28826, 28827, 28828, 28829, 28830, 28831, + 28832, 28833, 28834, 28835, 28836, 28837, 28838, 28839, 28840, 28841, + 28842, 28843, 28844, 28845, 28846, 28847, 28848, 28849, 28850, 28851, + 28852, 28853, 28854, 28855, 28856, 28857, 28858, 28859, 28860, 28861, + 28862, 28863, 28864, 28865, 28866, 28867, 28868, 28869, 28870, 28871, + 28872, 28873, 28874, 28875, 28876, 28877, 28878, 28879, 28880, 28881, + 28882, 28883, 28884, 28885, 28886, 28887, 28888, 28889, 28890, 28891, + 28892, 28893, 28894, 28895, 28896, 28897, 28898, 28899, 28900, 28901, + 28902, 28903, 28904, 28905, 28906, 28907, 28908, 28909, 28910, 28911, + 28912, 28913, 28914, 28915, 28916, 28917, 28918, 28919, 28920, 28921, + 28922, 28923, 28924, 28925, 28926, 28927, 28928, 28929, 28930, 28931, + 28932, 28933, 28934, 28935, 28936, 28937, 28938, 28939, 28940, 28941, + 28942, 28943, 28944, 28945, 28946, 28947, 28948, 28949, 28950, 28951, + 28952, 28953, 28954, 28955, 28956, 28957, 28958, 28959, 28960, 28961, + 28962, 28963, 28964, 28965, 28966, 28967, 28968, 28969, 28970, 28971, + 28972, 28973, 28974, 28975, 28976, 28977, 28978, 28979, 28980, 28981, + 28982, 28983, 28984, 28985, 28986, 28987, 28988, 28989, 28990, 28991, + 28992, 28993, 28994, 28995, 28996, 28997, 28998, 28999, 29000, 29001, + 29002, 29003, 29004, 29005, 29006, 29007, 29008, 29009, 29010, 29011, + 29012, 29013, 29014, 29015, 29016, 29017, 29018, 29019, 29020, 29021, + 29022, 29023, 29024, 29025, 29026, 29027, 29028, 29029, 29030, 29031, + 29032, 29033, 29034, 29035, 29036, 29037, 29038, 29039, 29040, 29041, + 29042, 29043, 29044, 29045, 29046, 29047, 29048, 29049, 29050, 29051, + 29052, 29053, 29054, 29055, 29056, 29057, 29058, 29059, 29060, 29061, + 29062, 29063, 29064, 29065, 29066, 29067, 29068, 29069, 29070, 29071, + 29072, 29073, 29074, 29075, 29076, 29077, 29078, 29079, 29080, 29081, + 29082, 29083, 29084, 29085, 29086, 29087, 29088, 29089, 29090, 29091, + 29092, 29093, 29094, 29095, 29096, 29097, 29098, 29099, 29100, 29101, + 29102, 29103, 29104, 29105, 29106, 29107, 29108, 29109, 29110, 29111, + 29112, 29113, 29114, 29115, 29116, 29117, 29118, 29119, 29120, 29121, + 29122, 29123, 29124, 29125, 29126, 29127, 29128, 29129, 29130, 29131, + 29132, 29133, 29134, 29135, 29136, 29137, 29138, 29139, 29140, 29141, + 29142, 29143, 29144, 29145, 29146, 29147, 29148, 29149, 29150, 29151, + 29152, 29153, 29154, 29155, 29156, 29157, 29158, 29159, 29160, 29161, + 29162, 29163, 29164, 29165, 29166, 29167, 29168, 29169, 29170, 29171, + 29172, 29173, 29174, 29175, 29176, 29177, 29178, 29179, 29180, 29181, + 29182, 29183, 29184, 29185, 29186, 29187, 29188, 29189, 29190, 29191, + 29192, 29193, 29194, 29195, 29196, 29197, 29198, 29199, 29200, 29201, + 29202, 29203, 29204, 29205, 29206, 29207, 29208, 29209, 29210, 29211, + 29212, 29213, 29214, 29215, 29216, 29217, 29218, 29219, 29220, 29221, + 29222, 29223, 29224, 29225, 29226, 29227, 29228, 29229, 29230, 29231, + 29232, 29233, 29234, 29235, 29236, 29237, 29238, 29239, 29240, 29241, + 29242, 29243, 29244, 29245, 29246, 29247, 29248, 29249, 29250, 29251, + 29252, 29253, 29254, 29255, 29256, 29257, 29258, 29259, 29260, 29261, + 29262, 29263, 29264, 29265, 29266, 29267, 29268, 29269, 29270, 29271, + 29272, 29273, 29274, 29275, 29276, 29277, 29278, 29279, 29280, 29281, + 29282, 29283, 29284, 29285, 29286, 29287, 29288, 29289, 29290, 29291, + 29292, 29293, 29294, 29295, 29296, 29297, 29298, 29299, 29300, 29301, + 29302, 29303, 29304, 29305, 29306, 29307, 29308, 29309, 29310, 29311, + 29312, 29313, 29314, 29315, 29316, 29317, 29318, 29319, 29320, 29321, + 29322, 29323, 29324, 29325, 29326, 29327, 29328, 29329, 29330, 29331, + 29332, 29333, 29334, 29335, 29336, 29337, 29338, 29339, 29340, 29341, + 29342, 29343, 29344, 29345, 29346, 29347, 29348, 29349, 29350, 29351, + 29352, 29353, 29354, 29355, 29356, 29357, 29358, 29359, 29360, 29361, + 29362, 29363, 29364, 29365, 29366, 29367, 29368, 29369, 29370, 29371, + 29372, 29373, 29374, 29375, 29376, 29377, 29378, 29379, 29380, 29381, + 29382, 29383, 29384, 29385, 29386, 29387, 29388, 29389, 29390, 29391, + 29392, 29393, 29394, 29395, 29396, 29397, 29398, 29399, 29400, 29401, + 29402, 29403, 29404, 29405, 29406, 29407, 29408, 29409, 29410, 29411, + 29412, 29413, 29414, 29415, 29416, 29417, 29418, 29419, 29420, 29421, + 29422, 29423, 29424, 29425, 29426, 29427, 29428, 29429, 29430, 29431, + 29432, 29433, 29434, 29435, 29436, 29437, 29438, 29439, 29440, 29441, + 29442, 29443, 29444, 29445, 29446, 29447, 29448, 29449, 29450, 29451, + 29452, 29453, 29454, 29455, 29456, 29457, 29458, 29459, 29460, 29461, + 29462, 29463, 29464, 29465, 29466, 29467, 29468, 29469, 29470, 29471, + 29472, 29473, 29474, 29475, 29476, 29477, 29478, 29479, 29480, 29481, + 29482, 29483, 29484, 29485, 29486, 29487, 29488, 29489, 29490, 29491, + 29492, 29493, 29494, 29495, 29496, 29497, 29498, 29499, 29500, 29501, + 29502, 29503, 29504, 29505, 29506, 29507, 29508, 29509, 29510, 29511, + 29512, 29513, 29514, 29515, 29516, 29517, 29518, 29519, 29520, 29521, + 29522, 29523, 29524, 29525, 29526, 29527, 29528, 29529, 29530, 29531, + 29532, 29533, 29534, 29535, 29536, 29537, 29538, 29539, 29540, 29541, + 29542, 29543, 29544, 29545, 29546, 29547, 29548, 29549, 29550, 29551, + 29552, 29553, 29554, 29555, 29556, 29557, 29558, 29559, 29560, 29561, + 29562, 29563, 29564, 29565, 29566, 29567, 29568, 29569, 29570, 29571, + 29572, 29573, 29574, 29575, 29576, 29577, 29578, 29579, 29580, 29581, + 29582, 29583, 29584, 29585, 29586, 29587, 29588, 29589, 29590, 29591, + 29592, 29593, 29594, 29595, 29596, 29597, 29598, 29599, 29600, 29601, + 29602, 29603, 29604, 29605, 29606, 29607, 29608, 29609, 29610, 29611, + 29612, 29613, 29614, 29615, 29616, 29617, 29618, 29619, 29620, 29621, + 29622, 29623, 29624, 29625, 29626, 29627, 29628, 29629, 29630, 29631, + 29632, 29633, 29634, 29635, 29636, 29637, 29638, 29639, 29640, 29641, + 29642, 29643, 29644, 29645, 29646, 29647, 29648, 29649, 29650, 29651, + 29652, 29653, 29654, 29655, 29656, 29657, 29658, 29659, 29660, 29661, + 29662, 29663, 29664, 29665, 29666, 29667, 29668, 29669, 29670, 29671, + 29672, 29673, 29674, 29675, 29676, 29677, 29678, 29679, 29680, 29681, + 29682, 29683, 29684, 29685, 29686, 29687, 29688, 29689, 29690, 29691, + 29692, 29693, 29694, 29695, 29696 ; + + elem_num_map = 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, + 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, + 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, + 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, + 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, + 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, + 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, + 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, + 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, + 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, + 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, + 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, + 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, + 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, + 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, + 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, + 246, 247, 248, 249, 250, 251, 252, 253, 254, 255, 256, 257, 258, 259, + 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, + 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, + 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, + 302, 303, 304, 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, 315, + 316, 317, 318, 319, 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, + 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, + 344, 345, 346, 347, 348, 349, 350, 351, 352, 353, 354, 355, 356, 357, + 358, 359, 360, 361, 362, 363, 364, 365, 366, 367, 368, 369, 370, 371, + 372, 373, 374, 375, 376, 377, 378, 379, 380, 381, 382, 383, 384, 385, + 386, 387, 388, 389, 390, 391, 392, 393, 394, 395, 396, 397, 398, 399, + 400, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, + 414, 415, 416, 417, 418, 419, 420, 421, 422, 423, 424, 425, 426, 427, + 428, 429, 430, 431, 432, 433, 434, 435, 436, 437, 438, 439, 440, 441, + 442, 443, 444, 445, 446, 447, 448, 449, 450, 451, 452, 453, 454, 455, + 456, 457, 458, 459, 460, 461, 462, 463, 464, 465, 466, 467, 468, 469, + 470, 471, 472, 473, 474, 475, 476, 477, 478, 479, 480, 481, 482, 483, + 484, 485, 486, 487, 488, 489, 490, 491, 492, 493, 494, 495, 496, 497, + 498, 499, 500, 501, 502, 503, 504, 505, 506, 507, 508, 509, 510, 511, + 512, 513, 514, 515, 516, 517, 518, 519, 520, 521, 522, 523, 524, 525, + 526, 527, 528, 529, 530, 531, 532, 533, 534, 535, 536, 537, 538, 539, + 540, 541, 542, 543, 544, 545, 546, 547, 548, 549, 550, 551, 552, 553, + 554, 555, 556, 557, 558, 559, 560, 561, 562, 563, 564, 565, 566, 567, + 568, 569, 570, 571, 572, 573, 574, 575, 576, 577, 578, 579, 580, 581, + 582, 583, 584, 585, 586, 587, 588, 589, 590, 591, 592, 593, 594, 595, + 596, 597, 598, 599, 600, 601, 602, 603, 604, 605, 606, 607, 608, 609, + 610, 611, 612, 613, 614, 615, 616, 617, 618, 619, 620, 621, 622, 623, + 624, 625, 626, 627, 628, 629, 630, 631, 632, 633, 634, 635, 636, 637, + 638, 639, 640, 641, 642, 643, 644, 645, 646, 647, 648, 649, 650, 651, + 652, 653, 654, 655, 656, 657, 658, 659, 660, 661, 662, 663, 664, 665, + 666, 667, 668, 669, 670, 671, 672, 673, 674, 675, 676, 677, 678, 679, + 680, 681, 682, 683, 684, 685, 686, 687, 688, 689, 690, 691, 692, 693, + 694, 695, 696, 697, 698, 699, 700, 701, 702, 703, 704, 705, 706, 707, + 708, 709, 710, 711, 712, 713, 714, 715, 716, 717, 718, 719, 720, 721, + 722, 723, 724, 725, 726, 727, 728, 729, 730, 731, 732, 733, 734, 735, + 736, 737, 738, 739, 740, 741, 742, 743, 744, 745, 746, 747, 748, 749, + 750, 751, 752, 753, 754, 755, 756, 757, 758, 759, 760, 761, 762, 763, + 764, 765, 766, 767, 768, 769, 770, 771, 772, 773, 774, 775, 776, 777, + 778, 779, 780, 781, 782, 783, 784, 785, 786, 787, 788, 789, 790, 791, + 792, 793, 794, 795, 796, 797, 798, 799, 800, 801, 802, 803, 804, 805, + 806, 807, 808, 809, 810, 811, 812, 813, 814, 815, 816, 817, 818, 819, + 820, 821, 822, 823, 824, 825, 826, 827, 828, 829, 830, 831, 832, 833, + 834, 835, 836, 837, 838, 839, 840, 841, 842, 843, 844, 845, 846, 847, + 848, 849, 850, 851, 852, 853, 854, 855, 856, 857, 858, 859, 860, 861, + 862, 863, 864, 865, 866, 867, 868, 869, 870, 871, 872, 873, 874, 875, + 876, 877, 878, 879, 880, 881, 882, 883, 884, 885, 886, 887, 888, 889, + 890, 891, 892, 893, 894, 895, 896, 897, 898, 899, 900, 901, 902, 903, + 904, 905, 906, 907, 908, 909, 910, 911, 912, 913, 914, 915, 916, 917, + 918, 919, 920, 921, 922, 923, 924, 925, 926, 927, 928, 929, 930, 931, + 932, 933, 934, 935, 936, 937, 938, 939, 940, 941, 942, 943, 944, 945, + 946, 947, 948, 949, 950, 951, 952, 953, 954, 955, 956, 957, 958, 959, + 960, 961, 962, 963, 964, 965, 966, 967, 968, 969, 970, 971, 972, 973, + 974, 975, 976, 977, 978, 979, 980, 981, 982, 983, 984, 985, 986, 987, + 988, 989, 990, 991, 992, 993, 994, 995, 996, 997, 998, 999, 1000, 1001, + 1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009, 1010, 1011, 1012, 1013, + 1014, 1015, 1016, 1017, 1018, 1019, 1020, 1021, 1022, 1023, 1024, 1025, + 1026, 1027, 1028, 1029, 1030, 1031, 1032, 1033, 1034, 1035, 1036, 1037, + 1038, 1039, 1040, 1041, 1042, 1043, 1044, 1045, 1046, 1047, 1048, 1049, + 1050, 1051, 1052, 1053, 1054, 1055, 1056, 1057, 1058, 1059, 1060, 1061, + 1062, 1063, 1064, 1065, 1066, 1067, 1068, 1069, 1070, 1071, 1072, 1073, + 1074, 1075, 1076, 1077, 1078, 1079, 1080, 1081, 1082, 1083, 1084, 1085, + 1086, 1087, 1088, 1089, 1090, 1091, 1092, 1093, 1094, 1095, 1096, 1097, + 1098, 1099, 1100, 1101, 1102, 1103, 1104, 1105, 1106, 1107, 1108, 1109, + 1110, 1111, 1112, 1113, 1114, 1115, 1116, 1117, 1118, 1119, 1120, 1121, + 1122, 1123, 1124, 1125, 1126, 1127, 1128, 1129, 1130, 1131, 1132, 1133, + 1134, 1135, 1136, 1137, 1138, 1139, 1140, 1141, 1142, 1143, 1144, 1145, + 1146, 1147, 1148, 1149, 1150, 1151, 1152, 1153, 1154, 1155, 1156, 1157, + 1158, 1159, 1160, 1161, 1162, 1163, 1164, 1165, 1166, 1167, 1168, 1169, + 1170, 1171, 1172, 1173, 1174, 1175, 1176, 1177, 1178, 1179, 1180, 1181, + 1182, 1183, 1184, 1185, 1186, 1187, 1188, 1189, 1190, 1191, 1192, 1193, + 1194, 1195, 1196, 1197, 1198, 1199, 1200, 1201, 1202, 1203, 1204, 1205, + 1206, 1207, 1208, 1209, 1210, 1211, 1212, 1213, 1214, 1215, 1216, 1217, + 1218, 1219, 1220, 1221, 1222, 1223, 1224, 1225, 1226, 1227, 1228, 1229, + 1230, 1231, 1232, 1233, 1234, 1235, 1236, 1237, 1238, 1239, 1240, 1241, + 1242, 1243, 1244, 1245, 1246, 1247, 1248, 1249, 1250, 1251, 1252, 1253, + 1254, 1255, 1256, 1257, 1258, 1259, 1260, 1261, 1262, 1263, 1264, 1265, + 1266, 1267, 1268, 1269, 1270, 1271, 1272, 1273, 1274, 1275, 1276, 1277, + 1278, 1279, 1280, 1281, 1282, 1283, 1284, 1285, 1286, 1287, 1288, 1289, + 1290, 1291, 1292, 1293, 1294, 1295, 1296, 1297, 1298, 1299, 1300, 1301, + 1302, 1303, 1304, 1305, 1306, 1307, 1308, 1309, 1310, 1311, 1312, 1313, + 1314, 1315, 1316, 1317, 1318, 1319, 1320, 1321, 1322, 1323, 1324, 1325, + 1326, 1327, 1328, 1329, 1330, 1331, 1332, 1333, 1334, 1335, 1336, 1337, + 1338, 1339, 1340, 1341, 1342, 1343, 1344, 1345, 1346, 1347, 1348, 1349, + 1350, 1351, 1352, 1353, 1354, 1355, 1356, 1357, 1358, 1359, 1360, 1361, + 1362, 1363, 1364, 1365, 1366, 1367, 1368, 1369, 1370, 1371, 1372, 1373, + 1374, 1375, 1376, 1377, 1378, 1379, 1380, 1381, 1382, 1383, 1384, 1385, + 1386, 1387, 1388, 1389, 1390, 1391, 1392, 1393, 1394, 1395, 1396, 1397, + 1398, 1399, 1400, 1401, 1402, 1403, 1404, 1405, 1406, 1407, 1408, 1409, + 1410, 1411, 1412, 1413, 1414, 1415, 1416, 1417, 1418, 1419, 1420, 1421, + 1422, 1423, 1424, 1425, 1426, 1427, 1428, 1429, 1430, 1431, 1432, 1433, + 1434, 1435, 1436, 1437, 1438, 1439, 1440, 1441, 1442, 1443, 1444, 1445, + 1446, 1447, 1448, 1449, 1450, 1451, 1452, 1453, 1454, 1455, 1456, 1457, + 1458, 1459, 1460, 1461, 1462, 1463, 1464, 1465, 1466, 1467, 1468, 1469, + 1470, 1471, 1472, 1473, 1474, 1475, 1476, 1477, 1478, 1479, 1480, 1481, + 1482, 1483, 1484, 1485, 1486, 1487, 1488, 1489, 1490, 1491, 1492, 1493, + 1494, 1495, 1496, 1497, 1498, 1499, 1500, 1501, 1502, 1503, 1504, 1505, + 1506, 1507, 1508, 1509, 1510, 1511, 1512, 1513, 1514, 1515, 1516, 1517, + 1518, 1519, 1520, 1521, 1522, 1523, 1524, 1525, 1526, 1527, 1528, 1529, + 1530, 1531, 1532, 1533, 1534, 1535, 1536, 1537, 1538, 1539, 1540, 1541, + 1542, 1543, 1544, 1545, 1546, 1547, 1548, 1549, 1550, 1551, 1552, 1553, + 1554, 1555, 1556, 1557, 1558, 1559, 1560, 1561, 1562, 1563, 1564, 1565, + 1566, 1567, 1568, 1569, 1570, 1571, 1572, 1573, 1574, 1575, 1576, 1577, + 1578, 1579, 1580, 1581, 1582, 1583, 1584, 1585, 1586, 1587, 1588, 1589, + 1590, 1591, 1592, 1593, 1594, 1595, 1596, 1597, 1598, 1599, 1600, 1601, + 1602, 1603, 1604, 1605, 1606, 1607, 1608, 1609, 1610, 1611, 1612, 1613, + 1614, 1615, 1616, 1617, 1618, 1619, 1620, 1621, 1622, 1623, 1624, 1625, + 1626, 1627, 1628, 1629, 1630, 1631, 1632, 1633, 1634, 1635, 1636, 1637, + 1638, 1639, 1640, 1641, 1642, 1643, 1644, 1645, 1646, 1647, 1648, 1649, + 1650, 1651, 1652, 1653, 1654, 1655, 1656, 1657, 1658, 1659, 1660, 1661, + 1662, 1663, 1664, 1665, 1666, 1667, 1668, 1669, 1670, 1671, 1672, 1673, + 1674, 1675, 1676, 1677, 1678, 1679, 1680, 1681, 1682, 1683, 1684, 1685, + 1686, 1687, 1688, 1689, 1690, 1691, 1692, 1693, 1694, 1695, 1696, 1697, + 1698, 1699, 1700, 1701, 1702, 1703, 1704, 1705, 1706, 1707, 1708, 1709, + 1710, 1711, 1712, 1713, 1714, 1715, 1716, 1717, 1718, 1719, 1720, 1721, + 1722, 1723, 1724, 1725, 1726, 1727, 1728, 1729, 1730, 1731, 1732, 1733, + 1734, 1735, 1736, 1737, 1738, 1739, 1740, 1741, 1742, 1743, 1744, 1745, + 1746, 1747, 1748, 1749, 1750, 1751, 1752, 1753, 1754, 1755, 1756, 1757, + 1758, 1759, 1760, 1761, 1762, 1763, 1764, 1765, 1766, 1767, 1768, 1769, + 1770, 1771, 1772, 1773, 1774, 1775, 1776, 1777, 1778, 1779, 1780, 1781, + 1782, 1783, 1784, 1785, 1786, 1787, 1788, 1789, 1790, 1791, 1792, 1793, + 1794, 1795, 1796, 1797, 1798, 1799, 1800, 1801, 1802, 1803, 1804, 1805, + 1806, 1807, 1808, 1809, 1810, 1811, 1812, 1813, 1814, 1815, 1816, 1817, + 1818, 1819, 1820, 1821, 1822, 1823, 1824, 1825, 1826, 1827, 1828, 1829, + 1830, 1831, 1832, 1833, 1834, 1835, 1836, 1837, 1838, 1839, 1840, 1841, + 1842, 1843, 1844, 1845, 1846, 1847, 1848, 1849, 1850, 1851, 1852, 1853, + 1854, 1855, 1856, 1857, 1858, 1859, 1860, 1861, 1862, 1863, 1864, 1865, + 1866, 1867, 1868, 1869, 1870, 1871, 1872, 1873, 1874, 1875, 1876, 1877, + 1878, 1879, 1880, 1881, 1882, 1883, 1884, 1885, 1886, 1887, 1888, 1889, + 1890, 1891, 1892, 1893, 1894, 1895, 1896, 1897, 1898, 1899, 1900, 1901, + 1902, 1903, 1904, 1905, 1906, 1907, 1908, 1909, 1910, 1911, 1912, 1913, + 1914, 1915, 1916, 1917, 1918, 1919, 1920, 1921, 1922, 1923, 1924, 1925, + 1926, 1927, 1928, 1929, 1930, 1931, 1932, 1933, 1934, 1935, 1936, 1937, + 1938, 1939, 1940, 1941, 1942, 1943, 1944, 1945, 1946, 1947, 1948, 1949, + 1950, 1951, 1952, 1953, 1954, 1955, 1956, 1957, 1958, 1959, 1960, 1961, + 1962, 1963, 1964, 1965, 1966, 1967, 1968, 1969, 1970, 1971, 1972, 1973, + 1974, 1975, 1976, 1977, 1978, 1979, 1980, 1981, 1982, 1983, 1984, 1985, + 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, + 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, + 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, + 2022, 2023, 2024, 2025, 2026, 2027, 2028, 2029, 2030, 2031, 2032, 2033, + 2034, 2035, 2036, 2037, 2038, 2039, 2040, 2041, 2042, 2043, 2044, 2045, + 2046, 2047, 2048, 2049, 2050, 2051, 2052, 2053, 2054, 2055, 2056, 2057, + 2058, 2059, 2060, 2061, 2062, 2063, 2064, 2065, 2066, 2067, 2068, 2069, + 2070, 2071, 2072, 2073, 2074, 2075, 2076, 2077, 2078, 2079, 2080, 2081, + 2082, 2083, 2084, 2085, 2086, 2087, 2088, 2089, 2090, 2091, 2092, 2093, + 2094, 2095, 2096, 2097, 2098, 2099, 2100, 2101, 2102, 2103, 2104, 2105, + 2106, 2107, 2108, 2109, 2110, 2111, 2112, 2113, 2114, 2115, 2116, 2117, + 2118, 2119, 2120, 2121, 2122, 2123, 2124, 2125, 2126, 2127, 2128, 2129, + 2130, 2131, 2132, 2133, 2134, 2135, 2136, 2137, 2138, 2139, 2140, 2141, + 2142, 2143, 2144, 2145, 2146, 2147, 2148, 2149, 2150, 2151, 2152, 2153, + 2154, 2155, 2156, 2157, 2158, 2159, 2160, 2161, 2162, 2163, 2164, 2165, + 2166, 2167, 2168, 2169, 2170, 2171, 2172, 2173, 2174, 2175, 2176, 2177, + 2178, 2179, 2180, 2181, 2182, 2183, 2184, 2185, 2186, 2187, 2188, 2189, + 2190, 2191, 2192, 2193, 2194, 2195, 2196, 2197, 2198, 2199, 2200, 2201, + 2202, 2203, 2204, 2205, 2206, 2207, 2208, 2209, 2210, 2211, 2212, 2213, + 2214, 2215, 2216, 2217, 2218, 2219, 2220, 2221, 2222, 2223, 2224, 2225, + 2226, 2227, 2228, 2229, 2230, 2231, 2232, 2233, 2234, 2235, 2236, 2237, + 2238, 2239, 2240, 2241, 2242, 2243, 2244, 2245, 2246, 2247, 2248, 2249, + 2250, 2251, 2252, 2253, 2254, 2255, 2256, 2257, 2258, 2259, 2260, 2261, + 2262, 2263, 2264, 2265, 2266, 2267, 2268, 2269, 2270, 2271, 2272, 2273, + 2274, 2275, 2276, 2277, 2278, 2279, 2280, 2281, 2282, 2283, 2284, 2285, + 2286, 2287, 2288, 2289, 2290, 2291, 2292, 2293, 2294, 2295, 2296, 2297, + 2298, 2299, 2300, 2301, 2302, 2303, 2304, 2305, 2306, 2307, 2308, 2309, + 2310, 2311, 2312, 2313, 2314, 2315, 2316, 2317, 2318, 2319, 2320, 2321, + 2322, 2323, 2324, 2325, 2326, 2327, 2328, 2329, 2330, 2331, 2332, 2333, + 2334, 2335, 2336, 2337, 2338, 2339, 2340, 2341, 2342, 2343, 2344, 2345, + 2346, 2347, 2348, 2349, 2350, 2351, 2352, 2353, 2354, 2355, 2356, 2357, + 2358, 2359, 2360, 2361, 2362, 2363, 2364, 2365, 2366, 2367, 2368, 2369, + 2370, 2371, 2372, 2373, 2374, 2375, 2376, 2377, 2378, 2379, 2380, 2381, + 2382, 2383, 2384, 2385, 2386, 2387, 2388, 2389, 2390, 2391, 2392, 2393, + 2394, 2395, 2396, 2397, 2398, 2399, 2400, 2401, 2402, 2403, 2404, 2405, + 2406, 2407, 2408, 2409, 2410, 2411, 2412, 2413, 2414, 2415, 2416, 2417, + 2418, 2419, 2420, 2421, 2422, 2423, 2424, 2425, 2426, 2427, 2428, 2429, + 2430, 2431, 2432, 2433, 2434, 2435, 2436, 2437, 2438, 2439, 2440, 2441, + 2442, 2443, 2444, 2445, 2446, 2447, 2448, 2449, 2450, 2451, 2452, 2453, + 2454, 2455, 2456, 2457, 2458, 2459, 2460, 2461, 2462, 2463, 2464, 2465, + 2466, 2467, 2468, 2469, 2470, 2471, 2472, 2473, 2474, 2475, 2476, 2477, + 2478, 2479, 2480, 2481, 2482, 2483, 2484, 2485, 2486, 2487, 2488, 2489, + 2490, 2491, 2492, 2493, 2494, 2495, 2496, 2497, 2498, 2499, 2500, 2501, + 2502, 2503, 2504, 2505, 2506, 2507, 2508, 2509, 2510, 2511, 2512, 2513, + 2514, 2515, 2516, 2517, 2518, 2519, 2520, 2521, 2522, 2523, 2524, 2525, + 2526, 2527, 2528, 2529, 2530, 2531, 2532, 2533, 2534, 2535, 2536, 2537, + 2538, 2539, 2540, 2541, 2542, 2543, 2544, 2545, 2546, 2547, 2548, 2549, + 2550, 2551, 2552, 2553, 2554, 2555, 2556, 2557, 2558, 2559, 2560, 2561, + 2562, 2563, 2564, 2565, 2566, 2567, 2568, 2569, 2570, 2571, 2572, 2573, + 2574, 2575, 2576, 2577, 2578, 2579, 2580, 2581, 2582, 2583, 2584, 2585, + 2586, 2587, 2588, 2589, 2590, 2591, 2592, 2593, 2594, 2595, 2596, 2597, + 2598, 2599, 2600, 2601, 2602, 2603, 2604, 2605, 2606, 2607, 2608, 2609, + 2610, 2611, 2612, 2613, 2614, 2615, 2616, 2617, 2618, 2619, 2620, 2621, + 2622, 2623, 2624, 2625, 2626, 2627, 2628, 2629, 2630, 2631, 2632, 2633, + 2634, 2635, 2636, 2637, 2638, 2639, 2640, 2641, 2642, 2643, 2644, 2645, + 2646, 2647, 2648, 2649, 2650, 2651, 2652, 2653, 2654, 2655, 2656, 2657, + 2658, 2659, 2660, 2661, 2662, 2663, 2664, 2665, 2666, 2667, 2668, 2669, + 2670, 2671, 2672, 2673, 2674, 2675, 2676, 2677, 2678, 2679, 2680, 2681, + 2682, 2683, 2684, 2685, 2686, 2687, 2688, 2689, 2690, 2691, 2692, 2693, + 2694, 2695, 2696, 2697, 2698, 2699, 2700, 2701, 2702, 2703, 2704, 2705, + 2706, 2707, 2708, 2709, 2710, 2711, 2712, 2713, 2714, 2715, 2716, 2717, + 2718, 2719, 2720, 2721, 2722, 2723, 2724, 2725, 2726, 2727, 2728, 2729, + 2730, 2731, 2732, 2733, 2734, 2735, 2736, 2737, 2738, 2739, 2740, 2741, + 2742, 2743, 2744, 2745, 2746, 2747, 2748, 2749, 2750, 2751, 2752, 2753, + 2754, 2755, 2756, 2757, 2758, 2759, 2760, 2761, 2762, 2763, 2764, 2765, + 2766, 2767, 2768, 2769, 2770, 2771, 2772, 2773, 2774, 2775, 2776, 2777, + 2778, 2779, 2780, 2781, 2782, 2783, 2784, 2785, 2786, 2787, 2788, 2789, + 2790, 2791, 2792, 2793, 2794, 2795, 2796, 2797, 2798, 2799, 2800, 2801, + 2802, 2803, 2804, 2805, 2806, 2807, 2808, 2809, 2810, 2811, 2812, 2813, + 2814, 2815, 2816, 2817, 2818, 2819, 2820, 2821, 2822, 2823, 2824, 2825, + 2826, 2827, 2828, 2829, 2830, 2831, 2832, 2833, 2834, 2835, 2836, 2837, + 2838, 2839, 2840, 2841, 2842, 2843, 2844, 2845, 2846, 2847, 2848, 2849, + 2850, 2851, 2852, 2853, 2854, 2855, 2856, 2857, 2858, 2859, 2860, 2861, + 2862, 2863, 2864, 2865, 2866, 2867, 2868, 2869, 2870, 2871, 2872, 2873, + 2874, 2875, 2876, 2877, 2878, 2879, 2880, 2881, 2882, 2883, 2884, 2885, + 2886, 2887, 2888, 2889, 2890, 2891, 2892, 2893, 2894, 2895, 2896, 2897, + 2898, 2899, 2900, 2901, 2902, 2903, 2904, 2905, 2906, 2907, 2908, 2909, + 2910, 2911, 2912, 2913, 2914, 2915, 2916, 2917, 2918, 2919, 2920, 2921, + 2922, 2923, 2924, 2925, 2926, 2927, 2928, 2929, 2930, 2931, 2932, 2933, + 2934, 2935, 2936, 2937, 2938, 2939, 2940, 2941, 2942, 2943, 2944, 2945, + 2946, 2947, 2948, 2949, 2950, 2951, 2952, 2953, 2954, 2955, 2956, 2957, + 2958, 2959, 2960, 2961, 2962, 2963, 2964, 2965, 2966, 2967, 2968, 2969, + 2970, 2971, 2972, 2973, 2974, 2975, 2976, 2977, 2978, 2979, 2980, 2981, + 2982, 2983, 2984, 2985, 2986, 2987, 2988, 2989, 2990, 2991, 2992, 2993, + 2994, 2995, 2996, 2997, 2998, 2999, 3000, 3001, 3002, 3003, 3004, 3005, + 3006, 3007, 3008, 3009, 3010, 3011, 3012, 3013, 3014, 3015, 3016, 3017, + 3018, 3019, 3020, 3021, 3022, 3023, 3024, 3025, 3026, 3027, 3028, 3029, + 3030, 3031, 3032, 3033, 3034, 3035, 3036, 3037, 3038, 3039, 3040, 3041, + 3042, 3043, 3044, 3045, 3046, 3047, 3048, 3049, 3050, 3051, 3052, 3053, + 3054, 3055, 3056, 3057, 3058, 3059, 3060, 3061, 3062, 3063, 3064, 3065, + 3066, 3067, 3068, 3069, 3070, 3071, 3072, 3073, 3074, 3075, 3076, 3077, + 3078, 3079, 3080, 3081, 3082, 3083, 3084, 3085, 3086, 3087, 3088, 3089, + 3090, 3091, 3092, 3093, 3094, 3095, 3096, 3097, 3098, 3099, 3100, 3101, + 3102, 3103, 3104, 3105, 3106, 3107, 3108, 3109, 3110, 3111, 3112, 3113, + 3114, 3115, 3116, 3117, 3118, 3119, 3120, 3121, 3122, 3123, 3124, 3125, + 3126, 3127, 3128, 3129, 3130, 3131, 3132, 3133, 3134, 3135, 3136, 3137, + 3138, 3139, 3140, 3141, 3142, 3143, 3144, 3145, 3146, 3147, 3148, 3149, + 3150, 3151, 3152, 3153, 3154, 3155, 3156, 3157, 3158, 3159, 3160, 3161, + 3162, 3163, 3164, 3165, 3166, 3167, 3168, 3169, 3170, 3171, 3172, 3173, + 3174, 3175, 3176, 3177, 3178, 3179, 3180, 3181, 3182, 3183, 3184, 3185, + 3186, 3187, 3188, 3189, 3190, 3191, 3192, 3193, 3194, 3195, 3196, 3197, + 3198, 3199, 3200, 3201, 3202, 3203, 3204, 3205, 3206, 3207, 3208, 3209, + 3210, 3211, 3212, 3213, 3214, 3215, 3216, 3217, 3218, 3219, 3220, 3221, + 3222, 3223, 3224, 3225, 3226, 3227, 3228, 3229, 3230, 3231, 3232, 3233, + 3234, 3235, 3236, 3237, 3238, 3239, 3240, 3241, 3242, 3243, 3244, 3245, + 3246, 3247, 3248, 3249, 3250, 3251, 3252, 3253, 3254, 3255, 3256, 3257, + 3258, 3259, 3260, 3261, 3262, 3263, 3264, 3265, 3266, 3267, 3268, 3269, + 3270, 3271, 3272, 3273, 3274, 3275, 3276, 3277, 3278, 3279, 3280, 3281, + 3282, 3283, 3284, 3285, 3286, 3287, 3288, 3289, 3290, 3291, 3292, 3293, + 3294, 3295, 3296, 3297, 3298, 3299, 3300, 3301, 3302, 3303, 3304, 3305, + 3306, 3307, 3308, 3309, 3310, 3311, 3312, 3313, 3314, 3315, 3316, 3317, + 3318, 3319, 3320, 3321, 3322, 3323, 3324, 3325, 3326, 3327, 3328, 3329, + 3330, 3331, 3332, 3333, 3334, 3335, 3336, 3337, 3338, 3339, 3340, 3341, + 3342, 3343, 3344, 3345, 3346, 3347, 3348, 3349, 3350, 3351, 3352, 3353, + 3354, 3355, 3356, 3357, 3358, 3359, 3360, 3361, 3362, 3363, 3364, 3365, + 3366, 3367, 3368, 3369, 3370, 3371, 3372, 3373, 3374, 3375, 3376, 3377, + 3378, 3379, 3380, 3381, 3382, 3383, 3384, 3385, 3386, 3387, 3388, 3389, + 3390, 3391, 3392, 3393, 3394, 3395, 3396, 3397, 3398, 3399, 3400, 3401, + 3402, 3403, 3404, 3405, 3406, 3407, 3408, 3409, 3410, 3411, 3412, 3413, + 3414, 3415, 3416, 3417, 3418, 3419, 3420, 3421, 3422, 3423, 3424, 3425, + 3426, 3427, 3428, 3429, 3430, 3431, 3432, 3433, 3434, 3435, 3436, 3437, + 3438, 3439, 3440, 3441, 3442, 3443, 3444, 3445, 3446, 3447, 3448, 3449, + 3450, 3451, 3452, 3453, 3454, 3455, 3456, 3457, 3458, 3459, 3460, 3461, + 3462, 3463, 3464, 3465, 3466, 3467, 3468, 3469, 3470, 3471, 3472, 3473, + 3474, 3475, 3476, 3477, 3478, 3479, 3480, 3481, 3482, 3483, 3484, 3485, + 3486, 3487, 3488, 3489, 3490, 3491, 3492, 3493, 3494, 3495, 3496, 3497, + 3498, 3499, 3500, 3501, 3502, 3503, 3504, 3505, 3506, 3507, 3508, 3509, + 3510, 3511, 3512, 3513, 3514, 3515, 3516, 3517, 3518, 3519, 3520, 3521, + 3522, 3523, 3524, 3525, 3526, 3527, 3528, 3529, 3530, 3531, 3532, 3533, + 3534, 3535, 3536, 3537, 3538, 3539, 3540, 3541, 3542, 3543, 3544, 3545, + 3546, 3547, 3548, 3549, 3550, 3551, 3552, 3553, 3554, 3555, 3556, 3557, + 3558, 3559, 3560, 3561, 3562, 3563, 3564, 3565, 3566, 3567, 3568, 3569, + 3570, 3571, 3572, 3573, 3574, 3575, 3576, 3577, 3578, 3579, 3580, 3581, + 3582, 3583, 3584, 3585, 3586, 3587, 3588, 3589, 3590, 3591, 3592, 3593, + 3594, 3595, 3596, 3597, 3598, 3599, 3600, 3601, 3602, 3603, 3604, 3605, + 3606, 3607, 3608, 3609, 3610, 3611, 3612, 3613, 3614, 3615, 3616, 3617, + 3618, 3619, 3620, 3621, 3622, 3623, 3624, 3625, 3626, 3627, 3628, 3629, + 3630, 3631, 3632, 3633, 3634, 3635, 3636, 3637, 3638, 3639, 3640, 3641, + 3642, 3643, 3644, 3645, 3646, 3647, 3648, 3649, 3650, 3651, 3652, 3653, + 3654, 3655, 3656, 3657, 3658, 3659, 3660, 3661, 3662, 3663, 3664, 3665, + 3666, 3667, 3668, 3669, 3670, 3671, 3672, 3673, 3674, 3675, 3676, 3677, + 3678, 3679, 3680, 3681, 3682, 3683, 3684, 3685, 3686, 3687, 3688, 3689, + 3690, 3691, 3692, 3693, 3694, 3695, 3696, 3697, 3698, 3699, 3700, 3701, + 3702, 3703, 3704, 3705, 3706, 3707, 3708, 3709, 3710, 3711, 3712, 3713, + 3714, 3715, 3716, 3717, 3718, 3719, 3720, 3721, 3722, 3723, 3724, 3725, + 3726, 3727, 3728, 3729, 3730, 3731, 3732, 3733, 3734, 3735, 3736, 3737, + 3738, 3739, 3740, 3741, 3742, 3743, 3744, 3745, 3746, 3747, 3748, 3749, + 3750, 3751, 3752, 3753, 3754, 3755, 3756, 3757, 3758, 3759, 3760, 3761, + 3762, 3763, 3764, 3765, 3766, 3767, 3768, 3769, 3770, 3771, 3772, 3773, + 3774, 3775, 3776, 3777, 3778, 3779, 3780, 3781, 3782, 3783, 3784, 3785, + 3786, 3787, 3788, 3789, 3790, 3791, 3792, 3793, 3794, 3795, 3796, 3797, + 3798, 3799, 3800, 3801, 3802, 3803, 3804, 3805, 3806, 3807, 3808, 3809, + 3810, 3811, 3812, 3813, 3814, 3815, 3816, 3817, 3818, 3819, 3820, 3821, + 3822, 3823, 3824, 3825, 3826, 3827, 3828, 3829, 3830, 3831, 3832, 3833, + 3834, 3835, 3836, 3837, 3838, 3839, 3840, 3841, 3842, 3843, 3844, 3845, + 3846, 3847, 3848, 3849, 3850, 3851, 3852, 3853, 3854, 3855, 3856, 3857, + 3858, 3859, 3860, 3861, 3862, 3863, 3864, 3865, 3866, 3867, 3868, 3869, + 3870, 3871, 3872, 3873, 3874, 3875, 3876, 3877, 3878, 3879, 3880, 3881, + 3882, 3883, 3884, 3885, 3886, 3887, 3888, 3889, 3890, 3891, 3892, 3893, + 3894, 3895, 3896, 3897, 3898, 3899, 3900, 3901, 3902, 3903, 3904, 3905, + 3906, 3907, 3908, 3909, 3910, 3911, 3912, 3913, 3914, 3915, 3916, 3917, + 3918, 3919, 3920, 3921, 3922, 3923, 3924, 3925, 3926, 3927, 3928, 3929, + 3930, 3931, 3932, 3933, 3934, 3935, 3936, 3937, 3938, 3939, 3940, 3941, + 3942, 3943, 3944, 3945, 3946, 3947, 3948, 3949, 3950, 3951, 3952, 3953, + 3954, 3955, 3956, 3957, 3958, 3959, 3960, 3961, 3962, 3963, 3964, 3965, + 3966, 3967, 3968, 3969, 3970, 3971, 3972, 3973, 3974, 3975, 3976, 3977, + 3978, 3979, 3980, 3981, 3982, 3983, 3984, 3985, 3986, 3987, 3988, 3989, + 3990, 3991, 3992, 3993, 3994, 3995, 3996, 3997, 3998, 3999, 4000, 4001, + 4002, 4003, 4004, 4005, 4006, 4007, 4008, 4009, 4010, 4011, 4012, 4013, + 4014, 4015, 4016, 4017, 4018, 4019, 4020, 4021, 4022, 4023, 4024, 4025, + 4026, 4027, 4028, 4029, 4030, 4031, 4032, 4033, 4034, 4035, 4036, 4037, + 4038, 4039, 4040, 4041, 4042, 4043, 4044, 4045, 4046, 4047, 4048, 4049, + 4050, 4051, 4052, 4053, 4054, 4055, 4056, 4057, 4058, 4059, 4060, 4061, + 4062, 4063, 4064, 4065, 4066, 4067, 4068, 4069, 4070, 4071, 4072, 4073, + 4074, 4075, 4076, 4077, 4078, 4079, 4080, 4081, 4082, 4083, 4084, 4085, + 4086, 4087, 4088, 4089, 4090, 4091, 4092, 4093, 4094, 4095, 4096, 4097, + 4098, 4099, 4100, 4101, 4102, 4103, 4104, 4105, 4106, 4107, 4108, 4109, + 4110, 4111, 4112, 4113, 4114, 4115, 4116, 4117, 4118, 4119, 4120, 4121, + 4122, 4123, 4124, 4125, 4126, 4127, 4128, 4129, 4130, 4131, 4132, 4133, + 4134, 4135, 4136, 4137, 4138, 4139, 4140, 4141, 4142, 4143, 4144, 4145, + 4146, 4147, 4148, 4149, 4150, 4151, 4152, 4153, 4154, 4155, 4156, 4157, + 4158, 4159, 4160, 4161, 4162, 4163, 4164, 4165, 4166, 4167, 4168, 4169, + 4170, 4171, 4172, 4173, 4174, 4175, 4176, 4177, 4178, 4179, 4180, 4181, + 4182, 4183, 4184, 4185, 4186, 4187, 4188, 4189, 4190, 4191, 4192, 4193, + 4194, 4195, 4196, 4197, 4198, 4199, 4200, 4201, 4202, 4203, 4204, 4205, + 4206, 4207, 4208, 4209, 4210, 4211, 4212, 4213, 4214, 4215, 4216, 4217, + 4218, 4219, 4220, 4221, 4222, 4223, 4224, 4225, 4226, 4227, 4228, 4229, + 4230, 4231, 4232, 4233, 4234, 4235, 4236, 4237, 4238, 4239, 4240, 4241, + 4242, 4243, 4244, 4245, 4246, 4247, 4248, 4249, 4250, 4251, 4252, 4253, + 4254, 4255, 4256, 4257, 4258, 4259, 4260, 4261, 4262, 4263, 4264, 4265, + 4266, 4267, 4268, 4269, 4270, 4271, 4272, 4273, 4274, 4275, 4276, 4277, + 4278, 4279, 4280, 4281, 4282, 4283, 4284, 4285, 4286, 4287, 4288, 4289, + 4290, 4291, 4292, 4293, 4294, 4295, 4296, 4297, 4298, 4299, 4300, 4301, + 4302, 4303, 4304, 4305, 4306, 4307, 4308, 4309, 4310, 4311, 4312, 4313, + 4314, 4315, 4316, 4317, 4318, 4319, 4320, 4321, 4322, 4323, 4324, 4325, + 4326, 4327, 4328, 4329, 4330, 4331, 4332, 4333, 4334, 4335, 4336, 4337, + 4338, 4339, 4340, 4341, 4342, 4343, 4344, 4345, 4346, 4347, 4348, 4349, + 4350, 4351, 4352, 4353, 4354, 4355, 4356, 4357, 4358, 4359, 4360, 4361, + 4362, 4363, 4364, 4365, 4366, 4367, 4368, 4369, 4370, 4371, 4372, 4373, + 4374, 4375, 4376, 4377, 4378, 4379, 4380, 4381, 4382, 4383, 4384, 4385, + 4386, 4387, 4388, 4389, 4390, 4391, 4392, 4393, 4394, 4395, 4396, 4397, + 4398, 4399, 4400, 4401, 4402, 4403, 4404, 4405, 4406, 4407, 4408, 4409, + 4410, 4411, 4412, 4413, 4414, 4415, 4416, 4417, 4418, 4419, 4420, 4421, + 4422, 4423, 4424, 4425, 4426, 4427, 4428, 4429, 4430, 4431, 4432, 4433, + 4434, 4435, 4436, 4437, 4438, 4439, 4440, 4441, 4442, 4443, 4444, 4445, + 4446, 4447, 4448, 4449, 4450, 4451, 4452, 4453, 4454, 4455, 4456, 4457, + 4458, 4459, 4460, 4461, 4462, 4463, 4464, 4465, 4466, 4467, 4468, 4469, + 4470, 4471, 4472, 4473, 4474, 4475, 4476, 4477, 4478, 4479, 4480, 4481, + 4482, 4483, 4484, 4485, 4486, 4487, 4488, 4489, 4490, 4491, 4492, 4493, + 4494, 4495, 4496, 4497, 4498, 4499, 4500, 4501, 4502, 4503, 4504, 4505, + 4506, 4507, 4508, 4509, 4510, 4511, 4512, 4513, 4514, 4515, 4516, 4517, + 4518, 4519, 4520, 4521, 4522, 4523, 4524, 4525, 4526, 4527, 4528, 4529, + 4530, 4531, 4532, 4533, 4534, 4535, 4536, 4537, 4538, 4539, 4540, 4541, + 4542, 4543, 4544, 4545, 4546, 4547, 4548, 4549, 4550, 4551, 4552, 4553, + 4554, 4555, 4556, 4557, 4558, 4559, 4560, 4561, 4562, 4563, 4564, 4565, + 4566, 4567, 4568, 4569, 4570, 4571, 4572, 4573, 4574, 4575, 4576, 4577, + 4578, 4579, 4580, 4581, 4582, 4583, 4584, 4585, 4586, 4587, 4588, 4589, + 4590, 4591, 4592, 4593, 4594, 4595, 4596, 4597, 4598, 4599, 4600, 4601, + 4602, 4603, 4604, 4605, 4606, 4607, 4608, 4609, 4610, 4611, 4612, 4613, + 4614, 4615, 4616, 4617, 4618, 4619, 4620, 4621, 4622, 4623, 4624, 4625, + 4626, 4627, 4628, 4629, 4630, 4631, 4632, 4633, 4634, 4635, 4636, 4637, + 4638, 4639, 4640, 4641, 4642, 4643, 4644, 4645, 4646, 4647, 4648, 4649, + 4650, 4651, 4652, 4653, 4654, 4655, 4656, 4657, 4658, 4659, 4660, 4661, + 4662, 4663, 4664, 4665, 4666, 4667, 4668, 4669, 4670, 4671, 4672, 4673, + 4674, 4675, 4676, 4677, 4678, 4679, 4680, 4681, 4682, 4683, 4684, 4685, + 4686, 4687, 4688, 4689, 4690, 4691, 4692, 4693, 4694, 4695, 4696, 4697, + 4698, 4699, 4700, 4701, 4702, 4703, 4704, 4705, 4706, 4707, 4708, 4709, + 4710, 4711, 4712, 4713, 4714, 4715, 4716, 4717, 4718, 4719, 4720, 4721, + 4722, 4723, 4724, 4725, 4726, 4727, 4728, 4729, 4730, 4731, 4732, 4733, + 4734, 4735, 4736, 4737, 4738, 4739, 4740, 4741, 4742, 4743, 4744, 4745, + 4746, 4747, 4748, 4749, 4750, 4751, 4752, 4753, 4754, 4755, 4756, 4757, + 4758, 4759, 4760, 4761, 4762, 4763, 4764, 4765, 4766, 4767, 4768, 4769, + 4770, 4771, 4772, 4773, 4774, 4775, 4776, 4777, 4778, 4779, 4780, 4781, + 4782, 4783, 4784, 4785, 4786, 4787, 4788, 4789, 4790, 4791, 4792, 4793, + 4794, 4795, 4796, 4797, 4798, 4799, 4800, 4801, 4802, 4803, 4804, 4805, + 4806, 4807, 4808, 4809, 4810, 4811, 4812, 4813, 4814, 4815, 4816, 4817, + 4818, 4819, 4820, 4821, 4822, 4823, 4824, 4825, 4826, 4827, 4828, 4829, + 4830, 4831, 4832, 4833, 4834, 4835, 4836, 4837, 4838, 4839, 4840, 4841, + 4842, 4843, 4844, 4845, 4846, 4847, 4848, 4849, 4850, 4851, 4852, 4853, + 4854, 4855, 4856, 4857, 4858, 4859, 4860, 4861, 4862, 4863, 4864, 4865, + 4866, 4867, 4868, 4869, 4870, 4871, 4872, 4873, 4874, 4875, 4876, 4877, + 4878, 4879, 4880, 4881, 4882, 4883, 4884, 4885, 4886, 4887, 4888, 4889, + 4890, 4891, 4892, 4893, 4894, 4895, 4896, 4897, 4898, 4899, 4900, 4901, + 4902, 4903, 4904, 4905, 4906, 4907, 4908, 4909, 4910, 4911, 4912, 4913, + 4914, 4915, 4916, 4917, 4918, 4919, 4920, 4921, 4922, 4923, 4924, 4925, + 4926, 4927, 4928, 4929, 4930, 4931, 4932, 4933, 4934, 4935, 4936, 4937, + 4938, 4939, 4940, 4941, 4942, 4943, 4944, 4945, 4946, 4947, 4948, 4949, + 4950, 4951, 4952, 4953, 4954, 4955, 4956, 4957, 4958, 4959, 4960, 4961, + 4962, 4963, 4964, 4965, 4966, 4967, 4968, 4969, 4970, 4971, 4972, 4973, + 4974, 4975, 4976, 4977, 4978, 4979, 4980, 4981, 4982, 4983, 4984, 4985, + 4986, 4987, 4988, 4989, 4990, 4991, 4992, 4993, 4994, 4995, 4996, 4997, + 4998, 4999, 5000, 5001, 5002, 5003, 5004, 5005, 5006, 5007, 5008, 5009, + 5010, 5011, 5012, 5013, 5014, 5015, 5016, 5017, 5018, 5019, 5020, 5021, + 5022, 5023, 5024, 5025, 5026, 5027, 5028, 5029, 5030, 5031, 5032, 5033, + 5034, 5035, 5036, 5037, 5038, 5039, 5040, 5041, 5042, 5043, 5044, 5045, + 5046, 5047, 5048, 5049, 5050, 5051, 5052, 5053, 5054, 5055, 5056, 5057, + 5058, 5059, 5060, 5061, 5062, 5063, 5064, 5065, 5066, 5067, 5068, 5069, + 5070, 5071, 5072, 5073, 5074, 5075, 5076, 5077, 5078, 5079, 5080, 5081, + 5082, 5083, 5084, 5085, 5086, 5087, 5088, 5089, 5090, 5091, 5092, 5093, + 5094, 5095, 5096, 5097, 5098, 5099, 5100, 5101, 5102, 5103, 5104, 5105, + 5106, 5107, 5108, 5109, 5110, 5111, 5112, 5113, 5114, 5115, 5116, 5117, + 5118, 5119, 5120, 5121, 5122, 5123, 5124, 5125, 5126, 5127, 5128, 5129, + 5130, 5131, 5132, 5133, 5134, 5135, 5136, 5137, 5138, 5139, 5140, 5141, + 5142, 5143, 5144, 5145, 5146, 5147, 5148, 5149, 5150, 5151, 5152, 5153, + 5154, 5155, 5156, 5157, 5158, 5159, 5160, 5161, 5162, 5163, 5164, 5165, + 5166, 5167, 5168, 5169, 5170, 5171, 5172, 5173, 5174, 5175, 5176, 5177, + 5178, 5179, 5180, 5181, 5182, 5183, 5184, 5185, 5186, 5187, 5188, 5189, + 5190, 5191, 5192, 5193, 5194, 5195, 5196, 5197, 5198, 5199, 5200, 5201, + 5202, 5203, 5204, 5205, 5206, 5207, 5208, 5209, 5210, 5211, 5212, 5213, + 5214, 5215, 5216, 5217, 5218, 5219, 5220, 5221, 5222, 5223, 5224, 5225, + 5226, 5227, 5228, 5229, 5230, 5231, 5232, 5233, 5234, 5235, 5236, 5237, + 5238, 5239, 5240, 5241, 5242, 5243, 5244, 5245, 5246, 5247, 5248, 5249, + 5250, 5251, 5252, 5253, 5254, 5255, 5256, 5257, 5258, 5259, 5260, 5261, + 5262, 5263, 5264, 5265, 5266, 5267, 5268, 5269, 5270, 5271, 5272, 5273, + 5274, 5275, 5276, 5277, 5278, 5279, 5280, 5281, 5282, 5283, 5284, 5285, + 5286, 5287, 5288, 5289, 5290, 5291, 5292, 5293, 5294, 5295, 5296, 5297, + 5298, 5299, 5300, 5301, 5302, 5303, 5304, 5305, 5306, 5307, 5308, 5309, + 5310, 5311, 5312, 5313, 5314, 5315, 5316, 5317, 5318, 5319, 5320, 5321, + 5322, 5323, 5324, 5325, 5326, 5327, 5328, 5329, 5330, 5331, 5332, 5333, + 5334, 5335, 5336, 5337, 5338, 5339, 5340, 5341, 5342, 5343, 5344, 5345, + 5346, 5347, 5348, 5349, 5350, 5351, 5352, 5353, 5354, 5355, 5356, 5357, + 5358, 5359, 5360, 5361, 5362, 5363, 5364, 5365, 5366, 5367, 5368, 5369, + 5370, 5371, 5372, 5373, 5374, 5375, 5376, 5377, 5378, 5379, 5380, 5381, + 5382, 5383, 5384, 5385, 5386, 5387, 5388, 5389, 5390, 5391, 5392, 5393, + 5394, 5395, 5396, 5397, 5398, 5399, 5400, 5401, 5402, 5403, 5404, 5405, + 5406, 5407, 5408, 5409, 5410, 5411, 5412, 5413, 5414, 5415, 5416, 5417, + 5418, 5419, 5420, 5421, 5422, 5423, 5424, 5425, 5426, 5427, 5428, 5429, + 5430, 5431, 5432, 5433, 5434, 5435, 5436, 5437, 5438, 5439, 5440, 5441, + 5442, 5443, 5444, 5445, 5446, 5447, 5448, 5449, 5450, 5451, 5452, 5453, + 5454, 5455, 5456, 5457, 5458, 5459, 5460, 5461, 5462, 5463, 5464, 5465, + 5466, 5467, 5468, 5469, 5470, 5471, 5472, 5473, 5474, 5475, 5476, 5477, + 5478, 5479, 5480, 5481, 5482, 5483, 5484, 5485, 5486, 5487, 5488, 5489, + 5490, 5491, 5492, 5493, 5494, 5495, 5496, 5497, 5498, 5499, 5500, 5501, + 5502, 5503, 5504, 5505, 5506, 5507, 5508, 5509, 5510, 5511, 5512, 5513, + 5514, 5515, 5516, 5517, 5518, 5519, 5520, 5521, 5522, 5523, 5524, 5525, + 5526, 5527, 5528, 5529, 5530, 5531, 5532, 5533, 5534, 5535, 5536, 5537, + 5538, 5539, 5540, 5541, 5542, 5543, 5544, 5545, 5546, 5547, 5548, 5549, + 5550, 5551, 5552, 5553, 5554, 5555, 5556, 5557, 5558, 5559, 5560, 5561, + 5562, 5563, 5564, 5565, 5566, 5567, 5568, 5569, 5570, 5571, 5572, 5573, + 5574, 5575, 5576, 5577, 5578, 5579, 5580, 5581, 5582, 5583, 5584, 5585, + 5586, 5587, 5588, 5589, 5590, 5591, 5592, 5593, 5594, 5595, 5596, 5597, + 5598, 5599, 5600, 5601, 5602, 5603, 5604, 5605, 5606, 5607, 5608, 5609, + 5610, 5611, 5612, 5613, 5614, 5615, 5616, 5617, 5618, 5619, 5620, 5621, + 5622, 5623, 5624, 5625, 5626, 5627, 5628, 5629, 5630, 5631, 5632, 5633, + 5634, 5635, 5636, 5637, 5638, 5639, 5640, 5641, 5642, 5643, 5644, 5645, + 5646, 5647, 5648, 5649, 5650, 5651, 5652, 5653, 5654, 5655, 5656, 5657, + 5658, 5659, 5660, 5661, 5662, 5663, 5664, 5665, 5666, 5667, 5668, 5669, + 5670, 5671, 5672, 5673, 5674, 5675, 5676, 5677, 5678, 5679, 5680, 5681, + 5682, 5683, 5684, 5685, 5686, 5687, 5688, 5689, 5690, 5691, 5692, 5693, + 5694, 5695, 5696, 5697, 5698, 5699, 5700, 5701, 5702, 5703, 5704, 5705, + 5706, 5707, 5708, 5709, 5710, 5711, 5712, 5713, 5714, 5715, 5716, 5717, + 5718, 5719, 5720, 5721, 5722, 5723, 5724, 5725, 5726, 5727, 5728, 5729, + 5730, 5731, 5732, 5733, 5734, 5735, 5736, 5737, 5738, 5739, 5740, 5741, + 5742, 5743, 5744, 5745, 5746, 5747, 5748, 5749, 5750, 5751, 5752, 5753, + 5754, 5755, 5756, 5757, 5758, 5759, 5760, 5761, 5762, 5763, 5764, 5765, + 5766, 5767, 5768, 5769, 5770, 5771, 5772, 5773, 5774, 5775, 5776, 5777, + 5778, 5779, 5780, 5781, 5782, 5783, 5784, 5785, 5786, 5787, 5788, 5789, + 5790, 5791, 5792, 5793, 5794, 5795, 5796, 5797, 5798, 5799, 5800, 5801, + 5802, 5803, 5804, 5805, 5806, 5807, 5808, 5809, 5810, 5811, 5812, 5813, + 5814, 5815, 5816, 5817, 5818, 5819, 5820, 5821, 5822, 5823, 5824, 5825, + 5826, 5827, 5828, 5829, 5830, 5831, 5832, 5833, 5834, 5835, 5836, 5837, + 5838, 5839, 5840, 5841, 5842, 5843, 5844, 5845, 5846, 5847, 5848, 5849, + 5850, 5851, 5852, 5853, 5854, 5855, 5856, 5857, 5858, 5859, 5860, 5861, + 5862, 5863, 5864, 5865, 5866, 5867, 5868, 5869, 5870, 5871, 5872, 5873, + 5874, 5875, 5876, 5877, 5878, 5879, 5880, 5881, 5882, 5883, 5884, 5885, + 5886, 5887, 5888, 5889, 5890, 5891, 5892, 5893, 5894, 5895, 5896, 5897, + 5898, 5899, 5900, 5901, 5902, 5903, 5904, 5905, 5906, 5907, 5908, 5909, + 5910, 5911, 5912, 5913, 5914, 5915, 5916, 5917, 5918, 5919, 5920, 5921, + 5922, 5923, 5924, 5925, 5926, 5927, 5928, 5929, 5930, 5931, 5932, 5933, + 5934, 5935, 5936, 5937, 5938, 5939, 5940, 5941, 5942, 5943, 5944, 5945, + 5946, 5947, 5948, 5949, 5950, 5951, 5952, 5953, 5954, 5955, 5956, 5957, + 5958, 5959, 5960, 5961, 5962, 5963, 5964, 5965, 5966, 5967, 5968, 5969, + 5970, 5971, 5972, 5973, 5974, 5975, 5976, 5977, 5978, 5979, 5980, 5981, + 5982, 5983, 5984, 5985, 5986, 5987, 5988, 5989, 5990, 5991, 5992, 5993, + 5994, 5995, 5996, 5997, 5998, 5999, 6000, 6001, 6002, 6003, 6004, 6005, + 6006, 6007, 6008, 6009, 6010, 6011, 6012, 6013, 6014, 6015, 6016, 6017, + 6018, 6019, 6020, 6021, 6022, 6023, 6024, 6025, 6026, 6027, 6028, 6029, + 6030, 6031, 6032, 6033, 6034, 6035, 6036, 6037, 6038, 6039, 6040, 6041, + 6042, 6043, 6044, 6045, 6046, 6047, 6048, 6049, 6050, 6051, 6052, 6053, + 6054, 6055, 6056, 6057, 6058, 6059, 6060, 6061, 6062, 6063, 6064, 6065, + 6066, 6067, 6068, 6069, 6070, 6071, 6072, 6073, 6074, 6075, 6076, 6077, + 6078, 6079, 6080, 6081, 6082, 6083, 6084, 6085, 6086, 6087, 6088, 6089, + 6090, 6091, 6092, 6093, 6094, 6095, 6096, 6097, 6098, 6099, 6100, 6101, + 6102, 6103, 6104, 6105, 6106, 6107, 6108, 6109, 6110, 6111, 6112, 6113, + 6114, 6115, 6116, 6117, 6118, 6119, 6120, 6121, 6122, 6123, 6124, 6125, + 6126, 6127, 6128, 6129, 6130, 6131, 6132, 6133, 6134, 6135, 6136, 6137, + 6138, 6139, 6140, 6141, 6142, 6143, 6144, 6145, 6146, 6147, 6148, 6149, + 6150, 6151, 6152, 6153, 6154, 6155, 6156, 6157, 6158, 6159, 6160, 6161, + 6162, 6163, 6164, 6165, 6166, 6167, 6168, 6169, 6170, 6171, 6172, 6173, + 6174, 6175, 6176, 6177, 6178, 6179, 6180, 6181, 6182, 6183, 6184, 6185, + 6186, 6187, 6188, 6189, 6190, 6191, 6192, 6193, 6194, 6195, 6196, 6197, + 6198, 6199, 6200, 6201, 6202, 6203, 6204, 6205, 6206, 6207, 6208, 6209, + 6210, 6211, 6212, 6213, 6214, 6215, 6216, 6217, 6218, 6219, 6220, 6221, + 6222, 6223, 6224, 6225, 6226, 6227, 6228, 6229, 6230, 6231, 6232, 6233, + 6234, 6235, 6236, 6237, 6238, 6239, 6240, 6241, 6242, 6243, 6244, 6245, + 6246, 6247, 6248, 6249, 6250, 6251, 6252, 6253, 6254, 6255, 6256, 6257, + 6258, 6259, 6260, 6261, 6262, 6263, 6264, 6265, 6266, 6267, 6268, 6269, + 6270, 6271, 6272, 6273, 6274, 6275, 6276, 6277, 6278, 6279, 6280, 6281, + 6282, 6283, 6284, 6285, 6286, 6287, 6288, 6289, 6290, 6291, 6292, 6293, + 6294, 6295, 6296, 6297, 6298, 6299, 6300, 6301, 6302, 6303, 6304, 6305, + 6306, 6307, 6308, 6309, 6310, 6311, 6312, 6313, 6314, 6315, 6316, 6317, + 6318, 6319, 6320, 6321, 6322, 6323, 6324, 6325, 6326, 6327, 6328, 6329, + 6330, 6331, 6332, 6333, 6334, 6335, 6336, 6337, 6338, 6339, 6340, 6341, + 6342, 6343, 6344, 6345, 6346, 6347, 6348, 6349, 6350, 6351, 6352, 6353, + 6354, 6355, 6356, 6357, 6358, 6359, 6360, 6361, 6362, 6363, 6364, 6365, + 6366, 6367, 6368, 6369, 6370, 6371, 6372, 6373, 6374, 6375, 6376, 6377, + 6378, 6379, 6380, 6381, 6382, 6383, 6384, 6385, 6386, 6387, 6388, 6389, + 6390, 6391, 6392, 6393, 6394, 6395, 6396, 6397, 6398, 6399, 6400, 6401, + 6402, 6403, 6404, 6405, 6406, 6407, 6408, 6409, 6410, 6411, 6412, 6413, + 6414, 6415, 6416, 6417, 6418, 6419, 6420, 6421, 6422, 6423, 6424, 6425, + 6426, 6427, 6428, 6429, 6430, 6431, 6432, 6433, 6434, 6435, 6436, 6437, + 6438, 6439, 6440, 6441, 6442, 6443, 6444, 6445, 6446, 6447, 6448, 6449, + 6450, 6451, 6452, 6453, 6454, 6455, 6456, 6457, 6458, 6459, 6460, 6461, + 6462, 6463, 6464, 6465, 6466, 6467, 6468, 6469, 6470, 6471, 6472, 6473, + 6474, 6475, 6476, 6477, 6478, 6479, 6480, 6481, 6482, 6483, 6484, 6485, + 6486, 6487, 6488, 6489, 6490, 6491, 6492, 6493, 6494, 6495, 6496, 6497, + 6498, 6499, 6500, 6501, 6502, 6503, 6504, 6505, 6506, 6507, 6508, 6509, + 6510, 6511, 6512, 6513, 6514, 6515, 6516, 6517, 6518, 6519, 6520, 6521, + 6522, 6523, 6524, 6525, 6526, 6527, 6528, 6529, 6530, 6531, 6532, 6533, + 6534, 6535, 6536, 6537, 6538, 6539, 6540, 6541, 6542, 6543, 6544, 6545, + 6546, 6547, 6548, 6549, 6550, 6551, 6552, 6553, 6554, 6555, 6556, 6557, + 6558, 6559, 6560, 6561, 6562, 6563, 6564, 6565, 6566, 6567, 6568, 6569, + 6570, 6571, 6572, 6573, 6574, 6575, 6576, 6577, 6578, 6579, 6580, 6581, + 6582, 6583, 6584, 6585, 6586, 6587, 6588, 6589, 6590, 6591, 6592, 6593, + 6594, 6595, 6596, 6597, 6598, 6599, 6600, 6601, 6602, 6603, 6604, 6605, + 6606, 6607, 6608, 6609, 6610, 6611, 6612, 6613, 6614, 6615, 6616, 6617, + 6618, 6619, 6620, 6621, 6622, 6623, 6624, 6625, 6626, 6627, 6628, 6629, + 6630, 6631, 6632, 6633, 6634, 6635, 6636, 6637, 6638, 6639, 6640, 6641, + 6642, 6643, 6644, 6645, 6646, 6647, 6648, 6649, 6650, 6651, 6652, 6653, + 6654, 6655, 6656, 6657, 6658, 6659, 6660, 6661, 6662, 6663, 6664, 6665, + 6666, 6667, 6668, 6669, 6670, 6671, 6672, 6673, 6674, 6675, 6676, 6677, + 6678, 6679, 6680, 6681, 6682, 6683, 6684, 6685, 6686, 6687, 6688, 6689, + 6690, 6691, 6692, 6693, 6694, 6695, 6696, 6697, 6698, 6699, 6700, 6701, + 6702, 6703, 6704, 6705, 6706, 6707, 6708, 6709, 6710, 6711, 6712, 6713, + 6714, 6715, 6716, 6717, 6718, 6719, 6720, 6721, 6722, 6723, 6724, 6725, + 6726, 6727, 6728, 6729, 6730, 6731, 6732, 6733, 6734, 6735, 6736, 6737, + 6738, 6739, 6740, 6741, 6742, 6743, 6744, 6745, 6746, 6747, 6748, 6749, + 6750, 6751, 6752, 6753, 6754, 6755, 6756, 6757, 6758, 6759, 6760, 6761, + 6762, 6763, 6764, 6765, 6766, 6767, 6768, 6769, 6770, 6771, 6772, 6773, + 6774, 6775, 6776, 6777, 6778, 6779, 6780, 6781, 6782, 6783, 6784, 6785, + 6786, 6787, 6788, 6789, 6790, 6791, 6792, 6793, 6794, 6795, 6796, 6797, + 6798, 6799, 6800, 6801, 6802, 6803, 6804, 6805, 6806, 6807, 6808, 6809, + 6810, 6811, 6812, 6813, 6814, 6815, 6816, 6817, 6818, 6819, 6820, 6821, + 6822, 6823, 6824, 6825, 6826, 6827, 6828, 6829, 6830, 6831, 6832, 6833, + 6834, 6835, 6836, 6837, 6838, 6839, 6840, 6841, 6842, 6843, 6844, 6845, + 6846, 6847, 6848, 6849, 6850, 6851, 6852, 6853, 6854, 6855, 6856, 6857, + 6858, 6859, 6860, 6861, 6862, 6863, 6864, 6865, 6866, 6867, 6868, 6869, + 6870, 6871, 6872, 6873, 6874, 6875, 6876, 6877, 6878, 6879, 6880, 6881, + 6882, 6883, 6884, 6885, 6886, 6887, 6888, 6889, 6890, 6891, 6892, 6893, + 6894, 6895, 6896, 6897, 6898, 6899, 6900, 6901, 6902, 6903, 6904, 6905, + 6906, 6907, 6908, 6909, 6910, 6911, 6912, 6913, 6914, 6915, 6916, 6917, + 6918, 6919, 6920, 6921, 6922, 6923, 6924, 6925, 6926, 6927, 6928, 6929, + 6930, 6931, 6932, 6933, 6934, 6935, 6936, 6937, 6938, 6939, 6940, 6941, + 6942, 6943, 6944, 6945, 6946, 6947, 6948, 6949, 6950, 6951, 6952, 6953, + 6954, 6955, 6956, 6957, 6958, 6959, 6960, 6961, 6962, 6963, 6964, 6965, + 6966, 6967, 6968, 6969, 6970, 6971, 6972, 6973, 6974, 6975, 6976, 6977, + 6978, 6979, 6980, 6981, 6982, 6983, 6984, 6985, 6986, 6987, 6988, 6989, + 6990, 6991, 6992, 6993, 6994, 6995, 6996, 6997, 6998, 6999, 7000, 7001, + 7002, 7003, 7004, 7005, 7006, 7007, 7008, 7009, 7010, 7011, 7012, 7013, + 7014, 7015, 7016, 7017, 7018, 7019, 7020, 7021, 7022, 7023, 7024, 7025, + 7026, 7027, 7028, 7029, 7030, 7031, 7032, 7033, 7034, 7035, 7036, 7037, + 7038, 7039, 7040, 7041, 7042, 7043, 7044, 7045, 7046, 7047, 7048, 7049, + 7050, 7051, 7052, 7053, 7054, 7055, 7056, 7057, 7058, 7059, 7060, 7061, + 7062, 7063, 7064, 7065, 7066, 7067, 7068, 7069, 7070, 7071, 7072, 7073, + 7074, 7075, 7076, 7077, 7078, 7079, 7080, 7081, 7082, 7083, 7084, 7085, + 7086, 7087, 7088, 7089, 7090, 7091, 7092, 7093, 7094, 7095, 7096, 7097, + 7098, 7099, 7100, 7101, 7102, 7103, 7104, 7105, 7106, 7107, 7108, 7109, + 7110, 7111, 7112, 7113, 7114, 7115, 7116, 7117, 7118, 7119, 7120, 7121, + 7122, 7123, 7124, 7125, 7126, 7127, 7128, 7129, 7130, 7131, 7132, 7133, + 7134, 7135, 7136, 7137, 7138, 7139, 7140, 7141, 7142, 7143, 7144, 7145, + 7146, 7147, 7148, 7149, 7150, 7151, 7152, 7153, 7154, 7155, 7156, 7157, + 7158, 7159, 7160, 7161, 7162, 7163, 7164, 7165, 7166, 7167, 7168, 7169, + 7170, 7171, 7172, 7173, 7174, 7175, 7176, 7177, 7178, 7179, 7180, 7181, + 7182, 7183, 7184, 7185, 7186, 7187, 7188, 7189, 7190, 7191, 7192, 7193, + 7194, 7195, 7196, 7197, 7198, 7199, 7200, 7201, 7202, 7203, 7204, 7205, + 7206, 7207, 7208, 7209, 7210, 7211, 7212, 7213, 7214, 7215, 7216, 7217, + 7218, 7219, 7220, 7221, 7222, 7223, 7224, 7225, 7226, 7227, 7228, 7229, + 7230, 7231, 7232, 7233, 7234, 7235, 7236, 7237, 7238, 7239, 7240, 7241, + 7242, 7243, 7244, 7245, 7246, 7247, 7248, 7249, 7250, 7251, 7252, 7253, + 7254, 7255, 7256, 7257, 7258, 7259, 7260, 7261, 7262, 7263, 7264, 7265, + 7266, 7267, 7268, 7269, 7270, 7271, 7272, 7273, 7274, 7275, 7276, 7277, + 7278, 7279, 7280, 7281, 7282, 7283, 7284, 7285, 7286, 7287, 7288, 7289, + 7290, 7291, 7292, 7293, 7294, 7295, 7296, 7297, 7298, 7299, 7300, 7301, + 7302, 7303, 7304, 7305, 7306, 7307, 7308, 7309, 7310, 7311, 7312, 7313, + 7314, 7315, 7316, 7317, 7318, 7319, 7320, 7321, 7322, 7323, 7324, 7325, + 7326, 7327, 7328, 7329, 7330, 7331, 7332, 7333, 7334, 7335, 7336, 7337, + 7338, 7339, 7340, 7341, 7342, 7343, 7344, 7345, 7346, 7347, 7348, 7349, + 7350, 7351, 7352, 7353, 7354, 7355, 7356, 7357, 7358, 7359, 7360, 7361, + 7362, 7363, 7364, 7365, 7366, 7367, 7368, 7369, 7370, 7371, 7372, 7373, + 7374, 7375, 7376, 7377, 7378, 7379, 7380, 7381, 7382, 7383, 7384, 7385, + 7386, 7387, 7388, 7389, 7390, 7391, 7392, 7393, 7394, 7395, 7396, 7397, + 7398, 7399, 7400, 7401, 7402, 7403, 7404, 7405, 7406, 7407, 7408, 7409, + 7410, 7411, 7412, 7413, 7414, 7415, 7416, 7417, 7418, 7419, 7420, 7421, + 7422, 7423, 7424, 7425, 7426, 7427, 7428, 7429, 7430, 7431, 7432, 7433, + 7434, 7435, 7436, 7437, 7438, 7439, 7440, 7441, 7442, 7443, 7444, 7445, + 7446, 7447, 7448, 7449, 7450, 7451, 7452, 7453, 7454, 7455, 7456, 7457, + 7458, 7459, 7460, 7461, 7462, 7463, 7464, 7465, 7466, 7467, 7468, 7469, + 7470, 7471, 7472, 7473, 7474, 7475, 7476, 7477, 7478, 7479, 7480, 7481, + 7482, 7483, 7484, 7485, 7486, 7487, 7488, 7489, 7490, 7491, 7492, 7493, + 7494, 7495, 7496, 7497, 7498, 7499, 7500, 7501, 7502, 7503, 7504, 7505, + 7506, 7507, 7508, 7509, 7510, 7511, 7512, 7513, 7514, 7515, 7516, 7517, + 7518, 7519, 7520, 7521, 7522, 7523, 7524, 7525, 7526, 7527, 7528, 7529, + 7530, 7531, 7532, 7533, 7534, 7535, 7536, 7537, 7538, 7539, 7540, 7541, + 7542, 7543, 7544, 7545, 7546, 7547, 7548, 7549, 7550, 7551, 7552, 7553, + 7554, 7555, 7556, 7557, 7558, 7559, 7560, 7561, 7562, 7563, 7564, 7565, + 7566, 7567, 7568, 7569, 7570, 7571, 7572, 7573, 7574, 7575, 7576, 7577, + 7578, 7579, 7580, 7581, 7582, 7583, 7584, 7585, 7586, 7587, 7588, 7589, + 7590, 7591, 7592, 7593, 7594, 7595, 7596, 7597, 7598, 7599, 7600, 7601, + 7602, 7603, 7604, 7605, 7606, 7607, 7608, 7609, 7610, 7611, 7612, 7613, + 7614, 7615, 7616, 7617, 7618, 7619, 7620, 7621, 7622, 7623, 7624, 7625, + 7626, 7627, 7628, 7629, 7630, 7631, 7632, 7633, 7634, 7635, 7636, 7637, + 7638, 7639, 7640, 7641, 7642, 7643, 7644, 7645, 7646, 7647, 7648, 7649, + 7650, 7651, 7652, 7653, 7654, 7655, 7656, 7657, 7658, 7659, 7660, 7661, + 7662, 7663, 7664, 7665, 7666, 7667, 7668, 7669, 7670, 7671, 7672, 7673, + 7674, 7675, 7676, 7677, 7678, 7679, 7680, 7681, 7682, 7683, 7684, 7685, + 7686, 7687, 7688, 7689, 7690, 7691, 7692, 7693, 7694, 7695, 7696, 7697, + 7698, 7699, 7700, 7701, 7702, 7703, 7704, 7705, 7706, 7707, 7708, 7709, + 7710, 7711, 7712, 7713, 7714, 7715, 7716, 7717, 7718, 7719, 7720, 7721, + 7722, 7723, 7724, 7725, 7726, 7727, 7728, 7729, 7730, 7731, 7732, 7733, + 7734, 7735, 7736, 7737, 7738, 7739, 7740, 7741, 7742, 7743, 7744, 7745, + 7746, 7747, 7748, 7749, 7750, 7751, 7752, 7753, 7754, 7755, 7756, 7757, + 7758, 7759, 7760, 7761, 7762, 7763, 7764, 7765, 7766, 7767, 7768, 7769, + 7770, 7771, 7772, 7773, 7774, 7775, 7776, 7777, 7778, 7779, 7780, 7781, + 7782, 7783, 7784, 7785, 7786, 7787, 7788, 7789, 7790, 7791, 7792, 7793, + 7794, 7795, 7796, 7797, 7798, 7799, 7800, 7801, 7802, 7803, 7804, 7805, + 7806, 7807, 7808, 7809, 7810, 7811, 7812, 7813, 7814, 7815, 7816, 7817, + 7818, 7819, 7820, 7821, 7822, 7823, 7824, 7825, 7826, 7827, 7828, 7829, + 7830, 7831, 7832, 7833, 7834, 7835, 7836, 7837, 7838, 7839, 7840, 7841, + 7842, 7843, 7844, 7845, 7846, 7847, 7848, 7849, 7850, 7851, 7852, 7853, + 7854, 7855, 7856, 7857, 7858, 7859, 7860, 7861, 7862, 7863, 7864, 7865, + 7866, 7867, 7868, 7869, 7870, 7871, 7872, 7873, 7874, 7875, 7876, 7877, + 7878, 7879, 7880, 7881, 7882, 7883, 7884, 7885, 7886, 7887, 7888, 7889, + 7890, 7891, 7892, 7893, 7894, 7895, 7896, 7897, 7898, 7899, 7900, 7901, + 7902, 7903, 7904, 7905, 7906, 7907, 7908, 7909, 7910, 7911, 7912, 7913, + 7914, 7915, 7916, 7917, 7918, 7919, 7920, 7921, 7922, 7923, 7924, 7925, + 7926, 7927, 7928, 7929, 7930, 7931, 7932, 7933, 7934, 7935, 7936, 7937, + 7938, 7939, 7940, 7941, 7942, 7943, 7944, 7945, 7946, 7947, 7948, 7949, + 7950, 7951, 7952, 7953, 7954, 7955, 7956, 7957, 7958, 7959, 7960, 7961, + 7962, 7963, 7964, 7965, 7966, 7967, 7968, 7969, 7970, 7971, 7972, 7973, + 7974, 7975, 7976, 7977, 7978, 7979, 7980, 7981, 7982, 7983, 7984, 7985, + 7986, 7987, 7988, 7989, 7990, 7991, 7992, 7993, 7994, 7995, 7996, 7997, + 7998, 7999, 8000, 8001, 8002, 8003, 8004, 8005, 8006, 8007, 8008, 8009, + 8010, 8011, 8012, 8013, 8014, 8015, 8016, 8017, 8018, 8019, 8020, 8021, + 8022, 8023, 8024, 8025, 8026, 8027, 8028, 8029, 8030, 8031, 8032, 8033, + 8034, 8035, 8036, 8037, 8038, 8039, 8040, 8041, 8042, 8043, 8044, 8045, + 8046, 8047, 8048, 8049, 8050, 8051, 8052, 8053, 8054, 8055, 8056, 8057, + 8058, 8059, 8060, 8061, 8062, 8063, 8064, 8065, 8066, 8067, 8068, 8069, + 8070, 8071, 8072, 8073, 8074, 8075, 8076, 8077, 8078, 8079, 8080, 8081, + 8082, 8083, 8084, 8085, 8086, 8087, 8088, 8089, 8090, 8091, 8092, 8093, + 8094, 8095, 8096, 8097, 8098, 8099, 8100, 8101, 8102, 8103, 8104, 8105, + 8106, 8107, 8108, 8109, 8110, 8111, 8112, 8113, 8114, 8115, 8116, 8117, + 8118, 8119, 8120, 8121, 8122, 8123, 8124, 8125, 8126, 8127, 8128, 8129, + 8130, 8131, 8132, 8133, 8134, 8135, 8136, 8137, 8138, 8139, 8140, 8141, + 8142, 8143, 8144, 8145, 8146, 8147, 8148, 8149, 8150, 8151, 8152, 8153, + 8154, 8155, 8156, 8157, 8158, 8159, 8160, 8161, 8162, 8163, 8164, 8165, + 8166, 8167, 8168, 8169, 8170, 8171, 8172, 8173, 8174, 8175, 8176, 8177, + 8178, 8179, 8180, 8181, 8182, 8183, 8184, 8185, 8186, 8187, 8188, 8189, + 8190, 8191, 8192, 8193, 8194, 8195, 8196, 8197, 8198, 8199, 8200, 8201, + 8202, 8203, 8204, 8205, 8206, 8207, 8208, 8209, 8210, 8211, 8212, 8213, + 8214, 8215, 8216, 8217, 8218, 8219, 8220, 8221, 8222, 8223, 8224, 8225, + 8226, 8227, 8228, 8229, 8230, 8231, 8232, 8233, 8234, 8235, 8236, 8237, + 8238, 8239, 8240, 8241, 8242, 8243, 8244, 8245, 8246, 8247, 8248, 8249, + 8250, 8251, 8252, 8253, 8254, 8255, 8256, 8257, 8258, 8259, 8260, 8261, + 8262, 8263, 8264, 8265, 8266, 8267, 8268, 8269, 8270, 8271, 8272, 8273, + 8274, 8275, 8276, 8277, 8278, 8279, 8280, 8281, 8282, 8283, 8284, 8285, + 8286, 8287, 8288, 8289, 8290, 8291, 8292, 8293, 8294, 8295, 8296, 8297, + 8298, 8299, 8300, 8301, 8302, 8303, 8304, 8305, 8306, 8307, 8308, 8309, + 8310, 8311, 8312, 8313, 8314, 8315, 8316, 8317, 8318, 8319, 8320, 8321, + 8322, 8323, 8324, 8325, 8326, 8327, 8328, 8329, 8330, 8331, 8332, 8333, + 8334, 8335, 8336, 8337, 8338, 8339, 8340, 8341, 8342, 8343, 8344, 8345, + 8346, 8347, 8348, 8349, 8350, 8351, 8352, 8353, 8354, 8355, 8356, 8357, + 8358, 8359, 8360, 8361, 8362, 8363, 8364, 8365, 8366, 8367, 8368, 8369, + 8370, 8371, 8372, 8373, 8374, 8375, 8376, 8377, 8378, 8379, 8380, 8381, + 8382, 8383, 8384, 8385, 8386, 8387, 8388, 8389, 8390, 8391, 8392, 8393, + 8394, 8395, 8396, 8397, 8398, 8399, 8400, 8401, 8402, 8403, 8404, 8405, + 8406, 8407, 8408, 8409, 8410, 8411, 8412, 8413, 8414, 8415, 8416, 8417, + 8418, 8419, 8420, 8421, 8422, 8423, 8424, 8425, 8426, 8427, 8428, 8429, + 8430, 8431, 8432, 8433, 8434, 8435, 8436, 8437, 8438, 8439, 8440, 8441, + 8442, 8443, 8444, 8445, 8446, 8447, 8448, 8449, 8450, 8451, 8452, 8453, + 8454, 8455, 8456, 8457, 8458, 8459, 8460, 8461, 8462, 8463, 8464, 8465, + 8466, 8467, 8468, 8469, 8470, 8471, 8472, 8473, 8474, 8475, 8476, 8477, + 8478, 8479, 8480, 8481, 8482, 8483, 8484, 8485, 8486, 8487, 8488, 8489, + 8490, 8491, 8492, 8493, 8494, 8495, 8496, 8497, 8498, 8499, 8500, 8501, + 8502, 8503, 8504, 8505, 8506, 8507, 8508, 8509, 8510, 8511, 8512, 8513, + 8514, 8515, 8516, 8517, 8518, 8519, 8520, 8521, 8522, 8523, 8524, 8525, + 8526, 8527, 8528, 8529, 8530, 8531, 8532, 8533, 8534, 8535, 8536, 8537, + 8538, 8539, 8540, 8541, 8542, 8543, 8544, 8545, 8546, 8547, 8548, 8549, + 8550, 8551, 8552, 8553, 8554, 8555, 8556, 8557, 8558, 8559, 8560, 8561, + 8562, 8563, 8564, 8565, 8566, 8567, 8568, 8569, 8570, 8571, 8572, 8573, + 8574, 8575, 8576, 8577, 8578, 8579, 8580, 8581, 8582, 8583, 8584, 8585, + 8586, 8587, 8588, 8589, 8590, 8591, 8592, 8593, 8594, 8595, 8596, 8597, + 8598, 8599, 8600, 8601, 8602, 8603, 8604, 8605, 8606, 8607, 8608, 8609, + 8610, 8611, 8612, 8613, 8614, 8615, 8616, 8617, 8618, 8619, 8620, 8621, + 8622, 8623, 8624, 8625, 8626, 8627, 8628, 8629, 8630, 8631, 8632, 8633, + 8634, 8635, 8636, 8637, 8638, 8639, 8640, 8641, 8642, 8643, 8644, 8645, + 8646, 8647, 8648, 8649, 8650, 8651, 8652, 8653, 8654, 8655, 8656, 8657, + 8658, 8659, 8660, 8661, 8662, 8663, 8664, 8665, 8666, 8667, 8668, 8669, + 8670, 8671, 8672, 8673, 8674, 8675, 8676, 8677, 8678, 8679, 8680, 8681, + 8682, 8683, 8684, 8685, 8686, 8687, 8688, 8689, 8690, 8691, 8692, 8693, + 8694, 8695, 8696, 8697, 8698, 8699, 8700, 8701, 8702, 8703, 8704, 8705, + 8706, 8707, 8708, 8709, 8710, 8711, 8712, 8713, 8714, 8715, 8716, 8717, + 8718, 8719, 8720, 8721, 8722, 8723, 8724, 8725, 8726, 8727, 8728, 8729, + 8730, 8731, 8732, 8733, 8734, 8735, 8736, 8737, 8738, 8739, 8740, 8741, + 8742, 8743, 8744, 8745, 8746, 8747, 8748, 8749, 8750, 8751, 8752, 8753, + 8754, 8755, 8756, 8757, 8758, 8759, 8760, 8761, 8762, 8763, 8764, 8765, + 8766, 8767, 8768, 8769, 8770, 8771, 8772, 8773, 8774, 8775, 8776, 8777, + 8778, 8779, 8780, 8781, 8782, 8783, 8784, 8785, 8786, 8787, 8788, 8789, + 8790, 8791, 8792, 8793, 8794, 8795, 8796, 8797, 8798, 8799, 8800, 8801, + 8802, 8803, 8804, 8805, 8806, 8807, 8808, 8809, 8810, 8811, 8812, 8813, + 8814, 8815, 8816, 8817, 8818, 8819, 8820, 8821, 8822, 8823, 8824, 8825, + 8826, 8827, 8828, 8829, 8830, 8831, 8832, 8833, 8834, 8835, 8836, 8837, + 8838, 8839, 8840, 8841, 8842, 8843, 8844, 8845, 8846, 8847, 8848, 8849, + 8850, 8851, 8852, 8853, 8854, 8855, 8856, 8857, 8858, 8859, 8860, 8861, + 8862, 8863, 8864, 8865, 8866, 8867, 8868, 8869, 8870, 8871, 8872, 8873, + 8874, 8875, 8876, 8877, 8878, 8879, 8880, 8881, 8882, 8883, 8884, 8885, + 8886, 8887, 8888, 8889, 8890, 8891, 8892, 8893, 8894, 8895, 8896, 8897, + 8898, 8899, 8900, 8901, 8902, 8903, 8904, 8905, 8906, 8907, 8908, 8909, + 8910, 8911, 8912, 8913, 8914, 8915, 8916, 8917, 8918, 8919, 8920, 8921, + 8922, 8923, 8924, 8925, 8926, 8927, 8928, 8929, 8930, 8931, 8932, 8933, + 8934, 8935, 8936, 8937, 8938, 8939, 8940, 8941, 8942, 8943, 8944, 8945, + 8946, 8947, 8948, 8949, 8950, 8951, 8952, 8953, 8954, 8955, 8956, 8957, + 8958, 8959, 8960, 8961, 8962, 8963, 8964, 8965, 8966, 8967, 8968, 8969, + 8970, 8971, 8972, 8973, 8974, 8975, 8976, 8977, 8978, 8979, 8980, 8981, + 8982, 8983, 8984, 8985, 8986, 8987, 8988, 8989, 8990, 8991, 8992, 8993, + 8994, 8995, 8996, 8997, 8998, 8999, 9000, 9001, 9002, 9003, 9004, 9005, + 9006, 9007, 9008, 9009, 9010, 9011, 9012, 9013, 9014, 9015, 9016, 9017, + 9018, 9019, 9020, 9021, 9022, 9023, 9024, 9025, 9026, 9027, 9028, 9029, + 9030, 9031, 9032, 9033, 9034, 9035, 9036, 9037, 9038, 9039, 9040, 9041, + 9042, 9043, 9044, 9045, 9046, 9047, 9048, 9049, 9050, 9051, 9052, 9053, + 9054, 9055, 9056, 9057, 9058, 9059, 9060, 9061, 9062, 9063, 9064, 9065, + 9066, 9067, 9068, 9069, 9070, 9071, 9072, 9073, 9074, 9075, 9076, 9077, + 9078, 9079, 9080, 9081, 9082, 9083, 9084, 9085, 9086, 9087, 9088, 9089, + 9090, 9091, 9092, 9093, 9094, 9095, 9096, 9097, 9098, 9099, 9100, 9101, + 9102, 9103, 9104, 9105, 9106, 9107, 9108, 9109, 9110, 9111, 9112, 9113, + 9114, 9115, 9116, 9117, 9118, 9119, 9120, 9121, 9122, 9123, 9124, 9125, + 9126, 9127, 9128, 9129, 9130, 9131, 9132, 9133, 9134, 9135, 9136, 9137, + 9138, 9139, 9140, 9141, 9142, 9143, 9144, 9145, 9146, 9147, 9148, 9149, + 9150, 9151, 9152, 9153, 9154, 9155, 9156, 9157, 9158, 9159, 9160, 9161, + 9162, 9163, 9164, 9165, 9166, 9167, 9168, 9169, 9170, 9171, 9172, 9173, + 9174, 9175, 9176, 9177, 9178, 9179, 9180, 9181, 9182, 9183, 9184, 9185, + 9186, 9187, 9188, 9189, 9190, 9191, 9192, 9193, 9194, 9195, 9196, 9197, + 9198, 9199, 9200, 9201, 9202, 9203, 9204, 9205, 9206, 9207, 9208, 9209, + 9210, 9211, 9212, 9213, 9214, 9215, 9216, 9217, 9218, 9219, 9220, 9221, + 9222, 9223, 9224, 9225, 9226, 9227, 9228, 9229, 9230, 9231, 9232, 9233, + 9234, 9235, 9236, 9237, 9238, 9239, 9240, 9241, 9242, 9243, 9244, 9245, + 9246, 9247, 9248, 9249, 9250, 9251, 9252, 9253, 9254, 9255, 9256, 9257, + 9258, 9259, 9260, 9261, 9262, 9263, 9264, 9265, 9266, 9267, 9268, 9269, + 9270, 9271, 9272, 9273, 9274, 9275, 9276, 9277, 9278, 9279, 9280, 9281, + 9282, 9283, 9284, 9285, 9286, 9287, 9288, 9289, 9290, 9291, 9292, 9293, + 9294, 9295, 9296, 9297, 9298, 9299, 9300, 9301, 9302, 9303, 9304, 9305, + 9306, 9307, 9308, 9309, 9310, 9311, 9312, 9313, 9314, 9315, 9316, 9317, + 9318, 9319, 9320, 9321, 9322, 9323, 9324, 9325, 9326, 9327, 9328, 9329, + 9330, 9331, 9332, 9333, 9334, 9335, 9336, 9337, 9338, 9339, 9340, 9341, + 9342, 9343, 9344, 9345, 9346, 9347, 9348, 9349, 9350, 9351, 9352, 9353, + 9354, 9355, 9356, 9357, 9358, 9359, 9360, 9361, 9362, 9363, 9364, 9365, + 9366, 9367, 9368, 9369, 9370, 9371, 9372, 9373, 9374, 9375, 9376, 9377, + 9378, 9379, 9380, 9381, 9382, 9383, 9384, 9385, 9386, 9387, 9388, 9389, + 9390, 9391, 9392, 9393, 9394, 9395, 9396, 9397, 9398, 9399, 9400, 9401, + 9402, 9403, 9404, 9405, 9406, 9407, 9408, 9409, 9410, 9411, 9412, 9413, + 9414, 9415, 9416, 9417, 9418, 9419, 9420, 9421, 9422, 9423, 9424, 9425, + 9426, 9427, 9428, 9429, 9430, 9431, 9432, 9433, 9434, 9435, 9436, 9437, + 9438, 9439, 9440, 9441, 9442, 9443, 9444, 9445, 9446, 9447, 9448, 9449, + 9450, 9451, 9452, 9453, 9454, 9455, 9456, 9457, 9458, 9459, 9460, 9461, + 9462, 9463, 9464, 9465, 9466, 9467, 9468, 9469, 9470, 9471, 9472, 9473, + 9474, 9475, 9476, 9477, 9478, 9479, 9480, 9481, 9482, 9483, 9484, 9485, + 9486, 9487, 9488, 9489, 9490, 9491, 9492, 9493, 9494, 9495, 9496, 9497, + 9498, 9499, 9500, 9501, 9502, 9503, 9504, 9505, 9506, 9507, 9508, 9509, + 9510, 9511, 9512, 9513, 9514, 9515, 9516, 9517, 9518, 9519, 9520, 9521, + 9522, 9523, 9524, 9525, 9526, 9527, 9528, 9529, 9530, 9531, 9532, 9533, + 9534, 9535, 9536, 9537, 9538, 9539, 9540, 9541, 9542, 9543, 9544, 9545, + 9546, 9547, 9548, 9549, 9550, 9551, 9552, 9553, 9554, 9555, 9556, 9557, + 9558, 9559, 9560, 9561, 9562, 9563, 9564, 9565, 9566, 9567, 9568, 9569, + 9570, 9571, 9572, 9573, 9574, 9575, 9576, 9577, 9578, 9579, 9580, 9581, + 9582, 9583, 9584, 9585, 9586, 9587, 9588, 9589, 9590, 9591, 9592, 9593, + 9594, 9595, 9596, 9597, 9598, 9599, 9600, 9601, 9602, 9603, 9604, 9605, + 9606, 9607, 9608, 9609, 9610, 9611, 9612, 9613, 9614, 9615, 9616, 9617, + 9618, 9619, 9620, 9621, 9622, 9623, 9624, 9625, 9626, 9627, 9628, 9629, + 9630, 9631, 9632, 9633, 9634, 9635, 9636, 9637, 9638, 9639, 9640, 9641, + 9642, 9643, 9644, 9645, 9646, 9647, 9648, 9649, 9650, 9651, 9652, 9653, + 9654, 9655, 9656, 9657, 9658, 9659, 9660, 9661, 9662, 9663, 9664, 9665, + 9666, 9667, 9668, 9669, 9670, 9671, 9672, 9673, 9674, 9675, 9676, 9677, + 9678, 9679, 9680, 9681, 9682, 9683, 9684, 9685, 9686, 9687, 9688, 9689, + 9690, 9691, 9692, 9693, 9694, 9695, 9696, 9697, 9698, 9699, 9700, 9701, + 9702, 9703, 9704, 9705, 9706, 9707, 9708, 9709, 9710, 9711, 9712, 9713, + 9714, 9715, 9716, 9717, 9718, 9719, 9720, 9721, 9722, 9723, 9724, 9725, + 9726, 9727, 9728, 9729, 9730, 9731, 9732, 9733, 9734, 9735, 9736, 9737, + 9738, 9739, 9740, 9741, 9742, 9743, 9744, 9745, 9746, 9747, 9748, 9749, + 9750, 9751, 9752, 9753, 9754, 9755, 9756, 9757, 9758, 9759, 9760, 9761, + 9762, 9763, 9764, 9765, 9766, 9767, 9768, 9769, 9770, 9771, 9772, 9773, + 9774, 9775, 9776, 9777, 9778, 9779, 9780, 9781, 9782, 9783, 9784, 9785, + 9786, 9787, 9788, 9789, 9790, 9791, 9792, 9793, 9794, 9795, 9796, 9797, + 9798, 9799, 9800, 9801, 9802, 9803, 9804, 9805, 9806, 9807, 9808, 9809, + 9810, 9811, 9812, 9813, 9814, 9815, 9816, 9817, 9818, 9819, 9820, 9821, + 9822, 9823, 9824, 9825, 9826, 9827, 9828, 9829, 9830, 9831, 9832, 9833, + 9834, 9835, 9836, 9837, 9838, 9839, 9840, 9841, 9842, 9843, 9844, 9845, + 9846, 9847, 9848, 9849, 9850, 9851, 9852, 9853, 9854, 9855, 9856, 9857, + 9858, 9859, 9860, 9861, 9862, 9863, 9864, 9865, 9866, 9867, 9868, 9869, + 9870, 9871, 9872, 9873, 9874, 9875, 9876, 9877, 9878, 9879, 9880, 9881, + 9882, 9883, 9884, 9885, 9886, 9887, 9888, 9889, 9890, 9891, 9892, 9893, + 9894, 9895, 9896, 9897, 9898, 9899, 9900, 9901, 9902, 9903, 9904, 9905, + 9906, 9907, 9908, 9909, 9910, 9911, 9912, 9913, 9914, 9915, 9916, 9917, + 9918, 9919, 9920, 9921, 9922, 9923, 9924, 9925, 9926, 9927, 9928, 9929, + 9930, 9931, 9932, 9933, 9934, 9935, 9936, 9937, 9938, 9939, 9940, 9941, + 9942, 9943, 9944, 9945, 9946, 9947, 9948, 9949, 9950, 9951, 9952, 9953, + 9954, 9955, 9956, 9957, 9958, 9959, 9960, 9961, 9962, 9963, 9964, 9965, + 9966, 9967, 9968, 9969, 9970, 9971, 9972, 9973, 9974, 9975, 9976, 9977, + 9978, 9979, 9980, 9981, 9982, 9983, 9984, 9985, 9986, 9987, 9988, 9989, + 9990, 9991, 9992, 9993, 9994, 9995, 9996, 9997, 9998, 9999, 10000, 10001, + 10002, 10003, 10004, 10005, 10006, 10007, 10008, 10009, 10010, 10011, + 10012, 10013, 10014, 10015, 10016, 10017, 10018, 10019, 10020, 10021, + 10022, 10023, 10024, 10025, 10026, 10027, 10028, 10029, 10030, 10031, + 10032, 10033, 10034, 10035, 10036, 10037, 10038, 10039, 10040, 10041, + 10042, 10043, 10044, 10045, 10046, 10047, 10048, 10049, 10050, 10051, + 10052, 10053, 10054, 10055, 10056, 10057, 10058, 10059, 10060, 10061, + 10062, 10063, 10064, 10065, 10066, 10067, 10068, 10069, 10070, 10071, + 10072, 10073, 10074, 10075, 10076, 10077, 10078, 10079, 10080, 10081, + 10082, 10083, 10084, 10085, 10086, 10087, 10088, 10089, 10090, 10091, + 10092, 10093, 10094, 10095, 10096, 10097, 10098, 10099, 10100, 10101, + 10102, 10103, 10104, 10105, 10106, 10107, 10108, 10109, 10110, 10111, + 10112, 10113, 10114, 10115, 10116, 10117, 10118, 10119, 10120, 10121, + 10122, 10123, 10124, 10125, 10126, 10127, 10128, 10129, 10130, 10131, + 10132, 10133, 10134, 10135, 10136, 10137, 10138, 10139, 10140, 10141, + 10142, 10143, 10144, 10145, 10146, 10147, 10148, 10149, 10150, 10151, + 10152, 10153, 10154, 10155, 10156, 10157, 10158, 10159, 10160, 10161, + 10162, 10163, 10164, 10165, 10166, 10167, 10168, 10169, 10170, 10171, + 10172, 10173, 10174, 10175, 10176, 10177, 10178, 10179, 10180, 10181, + 10182, 10183, 10184, 10185, 10186, 10187, 10188, 10189, 10190, 10191, + 10192, 10193, 10194, 10195, 10196, 10197, 10198, 10199, 10200, 10201, + 10202, 10203, 10204, 10205, 10206, 10207, 10208, 10209, 10210, 10211, + 10212, 10213, 10214, 10215, 10216, 10217, 10218, 10219, 10220, 10221, + 10222, 10223, 10224, 10225, 10226, 10227, 10228, 10229, 10230, 10231, + 10232, 10233, 10234, 10235, 10236, 10237, 10238, 10239, 10240, 10241, + 10242, 10243, 10244, 10245, 10246, 10247, 10248, 10249, 10250, 10251, + 10252, 10253, 10254, 10255, 10256, 10257, 10258, 10259, 10260, 10261, + 10262, 10263, 10264, 10265, 10266, 10267, 10268, 10269, 10270, 10271, + 10272, 10273, 10274, 10275, 10276, 10277, 10278, 10279, 10280, 10281, + 10282, 10283, 10284, 10285, 10286, 10287, 10288, 10289, 10290, 10291, + 10292, 10293, 10294, 10295, 10296, 10297, 10298, 10299, 10300, 10301, + 10302, 10303, 10304, 10305, 10306, 10307, 10308, 10309, 10310, 10311, + 10312, 10313, 10314, 10315, 10316, 10317, 10318, 10319, 10320, 10321, + 10322, 10323, 10324, 10325, 10326, 10327, 10328, 10329, 10330, 10331, + 10332, 10333, 10334, 10335, 10336, 10337, 10338, 10339, 10340, 10341, + 10342, 10343, 10344, 10345, 10346, 10347, 10348, 10349, 10350, 10351, + 10352, 10353, 10354, 10355, 10356, 10357, 10358, 10359, 10360, 10361, + 10362, 10363, 10364, 10365, 10366, 10367, 10368, 10369, 10370, 10371, + 10372, 10373, 10374, 10375, 10376, 10377, 10378, 10379, 10380, 10381, + 10382, 10383, 10384, 10385, 10386, 10387, 10388, 10389, 10390, 10391, + 10392, 10393, 10394, 10395, 10396, 10397, 10398, 10399, 10400, 10401, + 10402, 10403, 10404, 10405, 10406, 10407, 10408, 10409, 10410, 10411, + 10412, 10413, 10414, 10415, 10416, 10417, 10418, 10419, 10420, 10421, + 10422, 10423, 10424, 10425, 10426, 10427, 10428, 10429, 10430, 10431, + 10432, 10433, 10434, 10435, 10436, 10437, 10438, 10439, 10440, 10441, + 10442, 10443, 10444, 10445, 10446, 10447, 10448, 10449, 10450, 10451, + 10452, 10453, 10454, 10455, 10456, 10457, 10458, 10459, 10460, 10461, + 10462, 10463, 10464, 10465, 10466, 10467, 10468, 10469, 10470, 10471, + 10472, 10473, 10474, 10475, 10476, 10477, 10478, 10479, 10480, 10481, + 10482, 10483, 10484, 10485, 10486, 10487, 10488, 10489, 10490, 10491, + 10492, 10493, 10494, 10495, 10496, 10497, 10498, 10499, 10500, 10501, + 10502, 10503, 10504, 10505, 10506, 10507, 10508, 10509, 10510, 10511, + 10512, 10513, 10514, 10515, 10516, 10517, 10518, 10519, 10520, 10521, + 10522, 10523, 10524, 10525, 10526, 10527, 10528, 10529, 10530, 10531, + 10532, 10533, 10534, 10535, 10536, 10537, 10538, 10539, 10540, 10541, + 10542, 10543, 10544, 10545, 10546, 10547, 10548, 10549, 10550, 10551, + 10552, 10553, 10554, 10555, 10556, 10557, 10558, 10559, 10560, 10561, + 10562, 10563, 10564, 10565, 10566, 10567, 10568, 10569, 10570, 10571, + 10572, 10573, 10574, 10575, 10576, 10577, 10578, 10579, 10580, 10581, + 10582, 10583, 10584, 10585, 10586, 10587, 10588, 10589, 10590, 10591, + 10592, 10593, 10594, 10595, 10596, 10597, 10598, 10599, 10600, 10601, + 10602, 10603, 10604, 10605, 10606, 10607, 10608, 10609, 10610, 10611, + 10612, 10613, 10614, 10615, 10616, 10617, 10618, 10619, 10620, 10621, + 10622, 10623, 10624, 10625, 10626, 10627, 10628, 10629, 10630, 10631, + 10632, 10633, 10634, 10635, 10636, 10637, 10638, 10639, 10640, 10641, + 10642, 10643, 10644, 10645, 10646, 10647, 10648, 10649, 10650, 10651, + 10652, 10653, 10654, 10655, 10656, 10657, 10658, 10659, 10660, 10661, + 10662, 10663, 10664, 10665, 10666, 10667, 10668, 10669, 10670, 10671, + 10672, 10673, 10674, 10675, 10676, 10677, 10678, 10679, 10680, 10681, + 10682, 10683, 10684, 10685, 10686, 10687, 10688, 10689, 10690, 10691, + 10692, 10693, 10694, 10695, 10696, 10697, 10698, 10699, 10700, 10701, + 10702, 10703, 10704, 10705, 10706, 10707, 10708, 10709, 10710, 10711, + 10712, 10713, 10714, 10715, 10716, 10717, 10718, 10719, 10720, 10721, + 10722, 10723, 10724, 10725, 10726, 10727, 10728, 10729, 10730, 10731, + 10732, 10733, 10734, 10735, 10736, 10737, 10738, 10739, 10740, 10741, + 10742, 10743, 10744, 10745, 10746, 10747, 10748, 10749, 10750, 10751, + 10752, 10753, 10754, 10755, 10756, 10757, 10758, 10759, 10760, 10761, + 10762, 10763, 10764, 10765, 10766, 10767, 10768, 10769, 10770, 10771, + 10772, 10773, 10774, 10775, 10776, 10777, 10778, 10779, 10780, 10781, + 10782, 10783, 10784, 10785, 10786, 10787, 10788, 10789, 10790, 10791, + 10792, 10793, 10794, 10795, 10796, 10797, 10798, 10799, 10800, 10801, + 10802, 10803, 10804, 10805, 10806, 10807, 10808, 10809, 10810, 10811, + 10812, 10813, 10814, 10815, 10816, 10817, 10818, 10819, 10820, 10821, + 10822, 10823, 10824, 10825, 10826, 10827, 10828, 10829, 10830, 10831, + 10832, 10833, 10834, 10835, 10836, 10837, 10838, 10839, 10840, 10841, + 10842, 10843, 10844, 10845, 10846, 10847, 10848, 10849, 10850, 10851, + 10852, 10853, 10854, 10855, 10856, 10857, 10858, 10859, 10860, 10861, + 10862, 10863, 10864, 10865, 10866, 10867, 10868, 10869, 10870, 10871, + 10872, 10873, 10874, 10875, 10876, 10877, 10878, 10879, 10880, 10881, + 10882, 10883, 10884, 10885, 10886, 10887, 10888, 10889, 10890, 10891, + 10892, 10893, 10894, 10895, 10896, 10897, 10898, 10899, 10900, 10901, + 10902, 10903, 10904, 10905, 10906, 10907, 10908, 10909, 10910, 10911, + 10912, 10913, 10914, 10915, 10916, 10917, 10918, 10919, 10920, 10921, + 10922, 10923, 10924, 10925, 10926, 10927, 10928, 10929, 10930, 10931, + 10932, 10933, 10934, 10935, 10936, 10937, 10938, 10939, 10940, 10941, + 10942, 10943, 10944, 10945, 10946, 10947, 10948, 10949, 10950, 10951, + 10952, 10953, 10954, 10955, 10956, 10957, 10958, 10959, 10960, 10961, + 10962, 10963, 10964, 10965, 10966, 10967, 10968, 10969, 10970, 10971, + 10972, 10973, 10974, 10975, 10976, 10977, 10978, 10979, 10980, 10981, + 10982, 10983, 10984, 10985, 10986, 10987, 10988, 10989, 10990, 10991, + 10992, 10993, 10994, 10995, 10996, 10997, 10998, 10999, 11000, 11001, + 11002, 11003, 11004, 11005, 11006, 11007, 11008, 11009, 11010, 11011, + 11012, 11013, 11014, 11015, 11016, 11017, 11018, 11019, 11020, 11021, + 11022, 11023, 11024, 11025, 11026, 11027, 11028, 11029, 11030, 11031, + 11032, 11033, 11034, 11035, 11036, 11037, 11038, 11039, 11040, 11041, + 11042, 11043, 11044, 11045, 11046, 11047, 11048, 11049, 11050, 11051, + 11052, 11053, 11054, 11055, 11056, 11057, 11058, 11059, 11060, 11061, + 11062, 11063, 11064, 11065, 11066, 11067, 11068, 11069, 11070, 11071, + 11072, 11073, 11074, 11075, 11076, 11077, 11078, 11079, 11080, 11081, + 11082, 11083, 11084, 11085, 11086, 11087, 11088, 11089, 11090, 11091, + 11092, 11093, 11094, 11095, 11096, 11097, 11098, 11099, 11100, 11101, + 11102, 11103, 11104, 11105, 11106, 11107, 11108, 11109, 11110, 11111, + 11112, 11113, 11114, 11115, 11116, 11117, 11118, 11119, 11120, 11121, + 11122, 11123, 11124, 11125, 11126, 11127, 11128, 11129, 11130, 11131, + 11132, 11133, 11134, 11135, 11136, 11137, 11138, 11139, 11140, 11141, + 11142, 11143, 11144, 11145, 11146, 11147, 11148, 11149, 11150, 11151, + 11152, 11153, 11154, 11155, 11156, 11157, 11158, 11159, 11160, 11161, + 11162, 11163, 11164, 11165, 11166, 11167, 11168, 11169, 11170, 11171, + 11172, 11173, 11174, 11175, 11176, 11177, 11178, 11179, 11180, 11181, + 11182, 11183, 11184, 11185, 11186, 11187, 11188, 11189, 11190, 11191, + 11192, 11193, 11194, 11195, 11196, 11197, 11198, 11199, 11200, 11201, + 11202, 11203, 11204, 11205, 11206, 11207, 11208, 11209, 11210, 11211, + 11212, 11213, 11214, 11215, 11216, 11217, 11218, 11219, 11220, 11221, + 11222, 11223, 11224, 11225, 11226, 11227, 11228, 11229, 11230, 11231, + 11232, 11233, 11234, 11235, 11236, 11237, 11238, 11239, 11240, 11241, + 11242, 11243, 11244, 11245, 11246, 11247, 11248, 11249, 11250, 11251, + 11252, 11253, 11254, 11255, 11256, 11257, 11258, 11259, 11260, 11261, + 11262, 11263, 11264, 11265, 11266, 11267, 11268, 11269, 11270, 11271, + 11272, 11273, 11274, 11275, 11276, 11277, 11278, 11279, 11280, 11281, + 11282, 11283, 11284, 11285, 11286, 11287, 11288, 11289, 11290, 11291, + 11292, 11293, 11294, 11295, 11296, 11297, 11298, 11299, 11300, 11301, + 11302, 11303, 11304, 11305, 11306, 11307, 11308, 11309, 11310, 11311, + 11312, 11313, 11314, 11315, 11316, 11317, 11318, 11319, 11320, 11321, + 11322, 11323, 11324, 11325, 11326, 11327, 11328, 11329, 11330, 11331, + 11332, 11333, 11334, 11335, 11336, 11337, 11338, 11339, 11340, 11341, + 11342, 11343, 11344, 11345, 11346, 11347, 11348, 11349, 11350, 11351, + 11352, 11353, 11354, 11355, 11356, 11357, 11358, 11359, 11360, 11361, + 11362, 11363, 11364, 11365, 11366, 11367, 11368, 11369, 11370, 11371, + 11372, 11373, 11374, 11375, 11376, 11377, 11378, 11379, 11380, 11381, + 11382, 11383, 11384, 11385, 11386, 11387, 11388, 11389, 11390, 11391, + 11392, 11393, 11394, 11395, 11396, 11397, 11398, 11399, 11400, 11401, + 11402, 11403, 11404, 11405, 11406, 11407, 11408, 11409, 11410, 11411, + 11412, 11413, 11414, 11415, 11416, 11417, 11418, 11419, 11420, 11421, + 11422, 11423, 11424, 11425, 11426, 11427, 11428, 11429, 11430, 11431, + 11432, 11433, 11434, 11435, 11436, 11437, 11438, 11439, 11440, 11441, + 11442, 11443, 11444, 11445, 11446, 11447, 11448, 11449, 11450, 11451, + 11452, 11453, 11454, 11455, 11456, 11457, 11458, 11459, 11460, 11461, + 11462, 11463, 11464, 11465, 11466, 11467, 11468, 11469, 11470, 11471, + 11472, 11473, 11474, 11475, 11476, 11477, 11478, 11479, 11480, 11481, + 11482, 11483, 11484, 11485, 11486, 11487, 11488, 11489, 11490, 11491, + 11492, 11493, 11494, 11495, 11496, 11497, 11498, 11499, 11500, 11501, + 11502, 11503, 11504, 11505, 11506, 11507, 11508, 11509, 11510, 11511, + 11512, 11513, 11514, 11515, 11516, 11517, 11518, 11519, 11520, 11521, + 11522, 11523, 11524, 11525, 11526, 11527, 11528, 11529, 11530, 11531, + 11532, 11533, 11534, 11535, 11536, 11537, 11538, 11539, 11540, 11541, + 11542, 11543, 11544, 11545, 11546, 11547, 11548, 11549, 11550, 11551, + 11552, 11553, 11554, 11555, 11556, 11557, 11558, 11559, 11560, 11561, + 11562, 11563, 11564, 11565, 11566, 11567, 11568, 11569, 11570, 11571, + 11572, 11573, 11574, 11575, 11576, 11577, 11578, 11579, 11580, 11581, + 11582, 11583, 11584, 11585, 11586, 11587, 11588, 11589, 11590, 11591, + 11592, 11593, 11594, 11595, 11596, 11597, 11598, 11599, 11600, 11601, + 11602, 11603, 11604, 11605, 11606, 11607, 11608, 11609, 11610, 11611, + 11612, 11613, 11614, 11615, 11616, 11617, 11618, 11619, 11620, 11621, + 11622, 11623, 11624, 11625, 11626, 11627, 11628, 11629, 11630, 11631, + 11632, 11633, 11634, 11635, 11636, 11637, 11638, 11639, 11640, 11641, + 11642, 11643, 11644, 11645, 11646, 11647, 11648, 11649, 11650, 11651, + 11652, 11653, 11654, 11655, 11656, 11657, 11658, 11659, 11660, 11661, + 11662, 11663, 11664, 11665, 11666, 11667, 11668, 11669, 11670, 11671, + 11672, 11673, 11674, 11675, 11676, 11677, 11678, 11679, 11680, 11681, + 11682, 11683, 11684, 11685, 11686, 11687, 11688, 11689, 11690, 11691, + 11692, 11693, 11694, 11695, 11696, 11697, 11698, 11699, 11700, 11701, + 11702, 11703, 11704, 11705, 11706, 11707, 11708, 11709, 11710, 11711, + 11712, 11713, 11714, 11715, 11716, 11717, 11718, 11719, 11720, 11721, + 11722, 11723, 11724, 11725, 11726, 11727, 11728, 11729, 11730, 11731, + 11732, 11733, 11734, 11735, 11736, 11737, 11738, 11739, 11740, 11741, + 11742, 11743, 11744, 11745, 11746, 11747, 11748, 11749, 11750, 11751, + 11752, 11753, 11754, 11755, 11756, 11757, 11758, 11759, 11760, 11761, + 11762, 11763, 11764, 11765, 11766, 11767, 11768, 11769, 11770, 11771, + 11772, 11773, 11774, 11775, 11776, 11777, 11778, 11779, 11780, 11781, + 11782, 11783, 11784, 11785, 11786, 11787, 11788, 11789, 11790, 11791, + 11792, 11793, 11794, 11795, 11796, 11797, 11798, 11799, 11800, 11801, + 11802, 11803, 11804, 11805, 11806, 11807, 11808, 11809, 11810, 11811, + 11812, 11813, 11814, 11815, 11816, 11817, 11818, 11819, 11820, 11821, + 11822, 11823, 11824, 11825, 11826, 11827, 11828, 11829, 11830, 11831, + 11832, 11833, 11834, 11835, 11836, 11837, 11838, 11839, 11840, 11841, + 11842, 11843, 11844, 11845, 11846, 11847, 11848, 11849, 11850, 11851, + 11852, 11853, 11854, 11855, 11856, 11857, 11858, 11859, 11860, 11861, + 11862, 11863, 11864, 11865, 11866, 11867, 11868, 11869, 11870, 11871, + 11872, 11873, 11874, 11875, 11876, 11877, 11878, 11879, 11880, 11881, + 11882, 11883, 11884, 11885, 11886, 11887, 11888, 11889, 11890, 11891, + 11892, 11893, 11894, 11895, 11896, 11897, 11898, 11899, 11900, 11901, + 11902, 11903, 11904, 11905, 11906, 11907, 11908, 11909, 11910, 11911, + 11912, 11913, 11914, 11915, 11916, 11917, 11918, 11919, 11920, 11921, + 11922, 11923, 11924, 11925, 11926, 11927, 11928, 11929, 11930, 11931, + 11932, 11933, 11934, 11935, 11936, 11937, 11938, 11939, 11940, 11941, + 11942, 11943, 11944, 11945, 11946, 11947, 11948, 11949, 11950, 11951, + 11952, 11953, 11954, 11955, 11956, 11957, 11958, 11959, 11960, 11961, + 11962, 11963, 11964, 11965, 11966, 11967, 11968, 11969, 11970, 11971, + 11972, 11973, 11974, 11975, 11976, 11977, 11978, 11979, 11980, 11981, + 11982, 11983, 11984, 11985, 11986, 11987, 11988, 11989, 11990, 11991, + 11992, 11993, 11994, 11995, 11996, 11997, 11998, 11999, 12000, 12001, + 12002, 12003, 12004, 12005, 12006, 12007, 12008, 12009, 12010, 12011, + 12012, 12013, 12014, 12015, 12016, 12017, 12018, 12019, 12020, 12021, + 12022, 12023, 12024, 12025, 12026, 12027, 12028, 12029, 12030, 12031, + 12032, 12033, 12034, 12035, 12036, 12037, 12038, 12039, 12040, 12041, + 12042, 12043, 12044, 12045, 12046, 12047, 12048, 12049, 12050, 12051, + 12052, 12053, 12054, 12055, 12056, 12057, 12058, 12059, 12060, 12061, + 12062, 12063, 12064, 12065, 12066, 12067, 12068, 12069, 12070, 12071, + 12072, 12073, 12074, 12075, 12076, 12077, 12078, 12079, 12080, 12081, + 12082, 12083, 12084, 12085, 12086, 12087, 12088, 12089, 12090, 12091, + 12092, 12093, 12094, 12095, 12096, 12097, 12098, 12099, 12100, 12101, + 12102, 12103, 12104, 12105, 12106, 12107, 12108, 12109, 12110, 12111, + 12112, 12113, 12114, 12115, 12116, 12117, 12118, 12119, 12120, 12121, + 12122, 12123, 12124, 12125, 12126, 12127, 12128, 12129, 12130, 12131, + 12132, 12133, 12134, 12135, 12136, 12137, 12138, 12139, 12140, 12141, + 12142, 12143, 12144, 12145, 12146, 12147, 12148, 12149, 12150, 12151, + 12152, 12153, 12154, 12155, 12156, 12157, 12158, 12159, 12160, 12161, + 12162, 12163, 12164, 12165, 12166, 12167, 12168, 12169, 12170, 12171, + 12172, 12173, 12174, 12175, 12176, 12177, 12178, 12179, 12180, 12181, + 12182, 12183, 12184, 12185, 12186, 12187, 12188, 12189, 12190, 12191, + 12192, 12193, 12194, 12195, 12196, 12197, 12198, 12199, 12200, 12201, + 12202, 12203, 12204, 12205, 12206, 12207, 12208, 12209, 12210, 12211, + 12212, 12213, 12214, 12215, 12216, 12217, 12218, 12219, 12220, 12221, + 12222, 12223, 12224, 12225, 12226, 12227, 12228, 12229, 12230, 12231, + 12232, 12233, 12234, 12235, 12236, 12237, 12238, 12239, 12240, 12241, + 12242, 12243, 12244, 12245, 12246, 12247, 12248, 12249, 12250, 12251, + 12252, 12253, 12254, 12255, 12256, 12257, 12258, 12259, 12260, 12261, + 12262, 12263, 12264, 12265, 12266, 12267, 12268, 12269, 12270, 12271, + 12272, 12273, 12274, 12275, 12276, 12277, 12278, 12279, 12280, 12281, + 12282, 12283, 12284, 12285, 12286, 12287, 12288, 12289, 12290, 12291, + 12292, 12293, 12294, 12295, 12296, 12297, 12298, 12299, 12300, 12301, + 12302, 12303, 12304, 12305, 12306, 12307, 12308, 12309, 12310, 12311, + 12312, 12313, 12314, 12315, 12316, 12317, 12318, 12319, 12320, 12321, + 12322, 12323, 12324, 12325, 12326, 12327, 12328, 12329, 12330, 12331, + 12332, 12333, 12334, 12335, 12336, 12337, 12338, 12339, 12340, 12341, + 12342, 12343, 12344, 12345, 12346, 12347, 12348, 12349, 12350, 12351, + 12352, 12353, 12354, 12355, 12356, 12357, 12358, 12359, 12360, 12361, + 12362, 12363, 12364, 12365, 12366, 12367, 12368, 12369, 12370, 12371, + 12372, 12373, 12374, 12375, 12376, 12377, 12378, 12379, 12380, 12381, + 12382, 12383, 12384, 12385, 12386, 12387, 12388, 12389, 12390, 12391, + 12392, 12393, 12394, 12395, 12396, 12397, 12398, 12399, 12400, 12401, + 12402, 12403, 12404, 12405, 12406, 12407, 12408, 12409, 12410, 12411, + 12412, 12413, 12414, 12415, 12416, 12417, 12418, 12419, 12420, 12421, + 12422, 12423, 12424, 12425, 12426, 12427, 12428, 12429, 12430, 12431, + 12432, 12433, 12434, 12435, 12436, 12437, 12438, 12439, 12440, 12441, + 12442, 12443, 12444, 12445, 12446, 12447, 12448, 12449, 12450, 12451, + 12452, 12453, 12454, 12455, 12456, 12457, 12458, 12459, 12460, 12461, + 12462, 12463, 12464, 12465, 12466, 12467, 12468, 12469, 12470, 12471, + 12472, 12473, 12474, 12475, 12476, 12477, 12478, 12479, 12480, 12481, + 12482, 12483, 12484, 12485, 12486, 12487, 12488, 12489, 12490, 12491, + 12492, 12493, 12494, 12495, 12496, 12497, 12498, 12499, 12500, 12501, + 12502, 12503, 12504, 12505, 12506, 12507, 12508, 12509, 12510, 12511, + 12512, 12513, 12514, 12515, 12516, 12517, 12518, 12519, 12520, 12521, + 12522, 12523, 12524, 12525, 12526, 12527, 12528, 12529, 12530, 12531, + 12532, 12533, 12534, 12535, 12536, 12537, 12538, 12539, 12540, 12541, + 12542, 12543, 12544, 12545, 12546, 12547, 12548, 12549, 12550, 12551, + 12552, 12553, 12554, 12555, 12556, 12557, 12558, 12559, 12560, 12561, + 12562, 12563, 12564, 12565, 12566, 12567, 12568, 12569, 12570, 12571, + 12572, 12573, 12574, 12575, 12576, 12577, 12578, 12579, 12580, 12581, + 12582, 12583, 12584, 12585, 12586, 12587, 12588, 12589, 12590, 12591, + 12592, 12593, 12594, 12595, 12596, 12597, 12598, 12599, 12600, 12601, + 12602, 12603, 12604, 12605, 12606, 12607, 12608, 12609, 12610, 12611, + 12612, 12613, 12614, 12615, 12616, 12617, 12618, 12619, 12620, 12621, + 12622, 12623, 12624, 12625, 12626, 12627, 12628, 12629, 12630, 12631, + 12632, 12633, 12634, 12635, 12636, 12637, 12638, 12639, 12640, 12641, + 12642, 12643, 12644, 12645, 12646, 12647, 12648, 12649, 12650, 12651, + 12652, 12653, 12654, 12655, 12656, 12657, 12658, 12659, 12660, 12661, + 12662, 12663, 12664, 12665, 12666, 12667, 12668, 12669, 12670, 12671, + 12672, 12673, 12674, 12675, 12676, 12677, 12678, 12679, 12680, 12681, + 12682, 12683, 12684, 12685, 12686, 12687, 12688, 12689, 12690, 12691, + 12692, 12693, 12694, 12695, 12696, 12697, 12698, 12699, 12700, 12701, + 12702, 12703, 12704, 12705, 12706, 12707, 12708, 12709, 12710, 12711, + 12712, 12713, 12714, 12715, 12716, 12717, 12718, 12719, 12720, 12721, + 12722, 12723, 12724, 12725, 12726, 12727, 12728, 12729, 12730, 12731, + 12732, 12733, 12734, 12735, 12736, 12737, 12738, 12739, 12740, 12741, + 12742, 12743, 12744, 12745, 12746, 12747, 12748, 12749, 12750, 12751, + 12752, 12753, 12754, 12755, 12756, 12757, 12758, 12759, 12760, 12761, + 12762, 12763, 12764, 12765, 12766, 12767, 12768, 12769, 12770, 12771, + 12772, 12773, 12774, 12775, 12776, 12777, 12778, 12779, 12780, 12781, + 12782, 12783, 12784, 12785, 12786, 12787, 12788, 12789, 12790, 12791, + 12792, 12793, 12794, 12795, 12796, 12797, 12798, 12799, 12800, 12801, + 12802, 12803, 12804, 12805, 12806, 12807, 12808, 12809, 12810, 12811, + 12812, 12813, 12814, 12815, 12816, 12817, 12818, 12819, 12820, 12821, + 12822, 12823, 12824, 12825, 12826, 12827, 12828, 12829, 12830, 12831, + 12832, 12833, 12834, 12835, 12836, 12837, 12838, 12839, 12840, 12841, + 12842, 12843, 12844, 12845, 12846, 12847, 12848, 12849, 12850, 12851, + 12852, 12853, 12854, 12855, 12856, 12857, 12858, 12859, 12860, 12861, + 12862, 12863, 12864, 12865, 12866, 12867, 12868, 12869, 12870, 12871, + 12872, 12873, 12874, 12875, 12876, 12877, 12878, 12879, 12880, 12881, + 12882, 12883, 12884, 12885, 12886, 12887, 12888, 12889, 12890, 12891, + 12892, 12893, 12894, 12895, 12896, 12897, 12898, 12899, 12900, 12901, + 12902, 12903, 12904, 12905, 12906, 12907, 12908, 12909, 12910, 12911, + 12912, 12913, 12914, 12915, 12916, 12917, 12918, 12919, 12920, 12921, + 12922, 12923, 12924, 12925, 12926, 12927, 12928, 12929, 12930, 12931, + 12932, 12933, 12934, 12935, 12936, 12937, 12938, 12939, 12940, 12941, + 12942, 12943, 12944, 12945, 12946, 12947, 12948, 12949, 12950, 12951, + 12952, 12953, 12954, 12955, 12956, 12957, 12958, 12959, 12960, 12961, + 12962, 12963, 12964, 12965, 12966, 12967, 12968, 12969, 12970, 12971, + 12972, 12973, 12974, 12975, 12976, 12977, 12978, 12979, 12980, 12981, + 12982, 12983, 12984, 12985, 12986, 12987, 12988, 12989, 12990, 12991, + 12992, 12993, 12994, 12995, 12996, 12997, 12998, 12999, 13000, 13001, + 13002, 13003, 13004, 13005, 13006, 13007, 13008, 13009, 13010, 13011, + 13012, 13013, 13014, 13015, 13016, 13017, 13018, 13019, 13020, 13021, + 13022, 13023, 13024, 13025, 13026, 13027, 13028, 13029, 13030, 13031, + 13032, 13033, 13034, 13035, 13036, 13037, 13038, 13039, 13040, 13041, + 13042, 13043, 13044, 13045, 13046, 13047, 13048, 13049, 13050, 13051, + 13052, 13053, 13054, 13055, 13056, 13057, 13058, 13059, 13060, 13061, + 13062, 13063, 13064, 13065, 13066, 13067, 13068, 13069, 13070, 13071, + 13072, 13073, 13074, 13075, 13076, 13077, 13078, 13079, 13080, 13081, + 13082, 13083, 13084, 13085, 13086, 13087, 13088, 13089, 13090, 13091, + 13092, 13093, 13094, 13095, 13096, 13097, 13098, 13099, 13100, 13101, + 13102, 13103, 13104, 13105, 13106, 13107, 13108, 13109, 13110, 13111, + 13112, 13113, 13114, 13115, 13116, 13117, 13118, 13119, 13120, 13121, + 13122, 13123, 13124, 13125, 13126, 13127, 13128, 13129, 13130, 13131, + 13132, 13133, 13134, 13135, 13136, 13137, 13138, 13139, 13140, 13141, + 13142, 13143, 13144, 13145, 13146, 13147, 13148, 13149, 13150, 13151, + 13152, 13153, 13154, 13155, 13156, 13157, 13158, 13159, 13160, 13161, + 13162, 13163, 13164, 13165, 13166, 13167, 13168, 13169, 13170, 13171, + 13172, 13173, 13174, 13175, 13176, 13177, 13178, 13179, 13180, 13181, + 13182, 13183, 13184, 13185, 13186, 13187, 13188, 13189, 13190, 13191, + 13192, 13193, 13194, 13195, 13196, 13197, 13198, 13199, 13200, 13201, + 13202, 13203, 13204, 13205, 13206, 13207, 13208, 13209, 13210, 13211, + 13212, 13213, 13214, 13215, 13216, 13217, 13218, 13219, 13220, 13221, + 13222, 13223, 13224, 13225, 13226, 13227, 13228, 13229, 13230, 13231, + 13232, 13233, 13234, 13235, 13236, 13237, 13238, 13239, 13240, 13241, + 13242, 13243, 13244, 13245, 13246, 13247, 13248, 13249, 13250, 13251, + 13252, 13253, 13254, 13255, 13256, 13257, 13258, 13259, 13260, 13261, + 13262, 13263, 13264, 13265, 13266, 13267, 13268, 13269, 13270, 13271, + 13272, 13273, 13274, 13275, 13276, 13277, 13278, 13279, 13280, 13281, + 13282, 13283, 13284, 13285, 13286, 13287, 13288, 13289, 13290, 13291, + 13292, 13293, 13294, 13295, 13296, 13297, 13298, 13299, 13300, 13301, + 13302, 13303, 13304, 13305, 13306, 13307, 13308, 13309, 13310, 13311, + 13312, 13313, 13314, 13315, 13316, 13317, 13318, 13319, 13320, 13321, + 13322, 13323, 13324, 13325, 13326, 13327, 13328, 13329, 13330, 13331, + 13332, 13333, 13334, 13335, 13336, 13337, 13338, 13339, 13340, 13341, + 13342, 13343, 13344, 13345, 13346, 13347, 13348, 13349, 13350, 13351, + 13352, 13353, 13354, 13355, 13356, 13357, 13358, 13359, 13360, 13361, + 13362, 13363, 13364, 13365, 13366, 13367, 13368, 13369, 13370, 13371, + 13372, 13373, 13374, 13375, 13376, 13377, 13378, 13379, 13380, 13381, + 13382, 13383, 13384, 13385, 13386, 13387, 13388, 13389, 13390, 13391, + 13392, 13393, 13394, 13395, 13396, 13397, 13398, 13399, 13400, 13401, + 13402, 13403, 13404, 13405, 13406, 13407, 13408, 13409, 13410, 13411, + 13412, 13413, 13414, 13415, 13416, 13417, 13418, 13419, 13420, 13421, + 13422, 13423, 13424, 13425, 13426, 13427, 13428, 13429, 13430, 13431, + 13432, 13433, 13434, 13435, 13436, 13437, 13438, 13439, 13440, 13441, + 13442, 13443, 13444, 13445, 13446, 13447, 13448, 13449, 13450, 13451, + 13452, 13453, 13454, 13455, 13456, 13457, 13458, 13459, 13460, 13461, + 13462, 13463, 13464, 13465, 13466, 13467, 13468, 13469, 13470, 13471, + 13472, 13473, 13474, 13475, 13476, 13477, 13478, 13479, 13480, 13481, + 13482, 13483, 13484, 13485, 13486, 13487, 13488, 13489, 13490, 13491, + 13492, 13493, 13494, 13495, 13496, 13497, 13498, 13499, 13500, 13501, + 13502, 13503, 13504, 13505, 13506, 13507, 13508, 13509, 13510, 13511, + 13512, 13513, 13514, 13515, 13516, 13517, 13518, 13519, 13520, 13521, + 13522, 13523, 13524, 13525, 13526, 13527, 13528, 13529, 13530, 13531, + 13532, 13533, 13534, 13535, 13536, 13537, 13538, 13539, 13540, 13541, + 13542, 13543, 13544, 13545, 13546, 13547, 13548, 13549, 13550, 13551, + 13552, 13553, 13554, 13555, 13556, 13557, 13558, 13559, 13560, 13561, + 13562, 13563, 13564, 13565, 13566, 13567, 13568, 13569, 13570, 13571, + 13572, 13573, 13574, 13575, 13576, 13577, 13578, 13579, 13580, 13581, + 13582, 13583, 13584, 13585, 13586, 13587, 13588, 13589, 13590, 13591, + 13592, 13593, 13594, 13595, 13596, 13597, 13598, 13599, 13600, 13601, + 13602, 13603, 13604, 13605, 13606, 13607, 13608, 13609, 13610, 13611, + 13612, 13613, 13614, 13615, 13616, 13617, 13618, 13619, 13620, 13621, + 13622, 13623, 13624, 13625, 13626, 13627, 13628, 13629, 13630, 13631, + 13632, 13633, 13634, 13635, 13636, 13637, 13638, 13639, 13640, 13641, + 13642, 13643, 13644, 13645, 13646, 13647, 13648, 13649, 13650, 13651, + 13652, 13653, 13654, 13655, 13656, 13657, 13658, 13659, 13660, 13661, + 13662, 13663, 13664, 13665, 13666, 13667, 13668, 13669, 13670, 13671, + 13672, 13673, 13674, 13675, 13676, 13677, 13678, 13679, 13680, 13681, + 13682, 13683, 13684, 13685, 13686, 13687, 13688, 13689, 13690, 13691, + 13692, 13693, 13694, 13695, 13696, 13697, 13698, 13699, 13700, 13701, + 13702, 13703, 13704, 13705, 13706, 13707, 13708, 13709, 13710, 13711, + 13712, 13713, 13714, 13715, 13716, 13717, 13718, 13719, 13720, 13721, + 13722, 13723, 13724, 13725, 13726, 13727, 13728, 13729, 13730, 13731, + 13732, 13733, 13734, 13735, 13736, 13737, 13738, 13739, 13740, 13741, + 13742, 13743, 13744, 13745, 13746, 13747, 13748, 13749, 13750, 13751, + 13752, 13753, 13754, 13755, 13756, 13757, 13758, 13759, 13760, 13761, + 13762, 13763, 13764, 13765, 13766, 13767, 13768, 13769, 13770, 13771, + 13772, 13773, 13774, 13775, 13776, 13777, 13778, 13779, 13780, 13781, + 13782, 13783, 13784, 13785, 13786, 13787, 13788, 13789, 13790, 13791, + 13792, 13793, 13794, 13795, 13796, 13797, 13798, 13799, 13800, 13801, + 13802, 13803, 13804, 13805, 13806, 13807, 13808, 13809, 13810, 13811, + 13812, 13813, 13814, 13815, 13816, 13817, 13818, 13819, 13820, 13821, + 13822, 13823, 13824, 13825, 13826, 13827, 13828, 13829, 13830, 13831, + 13832, 13833, 13834, 13835, 13836, 13837, 13838, 13839, 13840, 13841, + 13842, 13843, 13844, 13845, 13846, 13847, 13848, 13849, 13850, 13851, + 13852, 13853, 13854, 13855, 13856, 13857, 13858, 13859, 13860, 13861, + 13862, 13863, 13864, 13865, 13866, 13867, 13868, 13869, 13870, 13871, + 13872, 13873, 13874, 13875, 13876, 13877, 13878, 13879, 13880, 13881, + 13882, 13883, 13884, 13885, 13886, 13887, 13888, 13889, 13890, 13891, + 13892, 13893, 13894, 13895, 13896, 13897, 13898, 13899, 13900, 13901, + 13902, 13903, 13904, 13905, 13906, 13907, 13908, 13909, 13910, 13911, + 13912, 13913, 13914, 13915, 13916, 13917, 13918, 13919, 13920, 13921, + 13922, 13923, 13924, 13925, 13926, 13927, 13928, 13929, 13930, 13931, + 13932, 13933, 13934, 13935, 13936, 13937, 13938, 13939, 13940, 13941, + 13942, 13943, 13944, 13945, 13946, 13947, 13948, 13949, 13950, 13951, + 13952, 13953, 13954, 13955, 13956, 13957, 13958, 13959, 13960, 13961, + 13962, 13963, 13964, 13965, 13966, 13967, 13968, 13969, 13970, 13971, + 13972, 13973, 13974, 13975, 13976, 13977, 13978, 13979, 13980, 13981, + 13982, 13983, 13984, 13985, 13986, 13987, 13988, 13989, 13990, 13991, + 13992, 13993, 13994, 13995, 13996, 13997, 13998, 13999, 14000, 14001, + 14002, 14003, 14004, 14005, 14006, 14007, 14008, 14009, 14010, 14011, + 14012, 14013, 14014, 14015, 14016, 14017, 14018, 14019, 14020, 14021, + 14022, 14023, 14024, 14025, 14026, 14027, 14028, 14029, 14030, 14031, + 14032, 14033, 14034, 14035, 14036, 14037, 14038, 14039, 14040, 14041, + 14042, 14043, 14044, 14045, 14046, 14047, 14048, 14049, 14050, 14051, + 14052, 14053, 14054, 14055, 14056, 14057, 14058, 14059, 14060, 14061, + 14062, 14063, 14064, 14065, 14066, 14067, 14068, 14069, 14070, 14071, + 14072, 14073, 14074, 14075, 14076, 14077, 14078, 14079, 14080, 14081, + 14082, 14083, 14084, 14085, 14086, 14087, 14088, 14089, 14090, 14091, + 14092, 14093, 14094, 14095, 14096, 14097, 14098, 14099, 14100, 14101, + 14102, 14103, 14104, 14105, 14106, 14107, 14108, 14109, 14110, 14111, + 14112, 14113, 14114, 14115, 14116, 14117, 14118, 14119, 14120, 14121, + 14122, 14123, 14124, 14125, 14126, 14127, 14128, 14129, 14130, 14131, + 14132, 14133, 14134, 14135, 14136, 14137, 14138, 14139, 14140, 14141, + 14142, 14143, 14144, 14145, 14146, 14147, 14148, 14149, 14150, 14151, + 14152, 14153, 14154, 14155, 14156, 14157, 14158, 14159, 14160, 14161, + 14162, 14163, 14164, 14165, 14166, 14167, 14168, 14169, 14170, 14171, + 14172, 14173, 14174, 14175, 14176, 14177, 14178, 14179, 14180, 14181, + 14182, 14183, 14184, 14185, 14186, 14187, 14188, 14189, 14190, 14191, + 14192, 14193, 14194, 14195, 14196, 14197, 14198, 14199, 14200, 14201, + 14202, 14203, 14204, 14205, 14206, 14207, 14208, 14209, 14210, 14211, + 14212, 14213, 14214, 14215, 14216, 14217, 14218, 14219, 14220, 14221, + 14222, 14223, 14224, 14225, 14226, 14227, 14228, 14229, 14230, 14231, + 14232, 14233, 14234, 14235, 14236, 14237, 14238, 14239, 14240, 14241, + 14242, 14243, 14244, 14245, 14246, 14247, 14248, 14249, 14250, 14251, + 14252, 14253, 14254, 14255, 14256, 14257, 14258, 14259, 14260, 14261, + 14262, 14263, 14264, 14265, 14266, 14267, 14268, 14269, 14270, 14271, + 14272, 14273, 14274, 14275, 14276, 14277, 14278, 14279, 14280, 14281, + 14282, 14283, 14284, 14285, 14286, 14287, 14288, 14289, 14290, 14291, + 14292, 14293, 14294, 14295, 14296, 14297, 14298, 14299, 14300, 14301, + 14302, 14303, 14304, 14305, 14306, 14307, 14308, 14309, 14310, 14311, + 14312, 14313, 14314, 14315, 14316, 14317, 14318, 14319, 14320, 14321, + 14322, 14323, 14324, 14325, 14326, 14327, 14328, 14329, 14330, 14331, + 14332, 14333, 14334, 14335, 14336, 14337, 14338, 14339, 14340, 14341, + 14342, 14343, 14344, 14345, 14346, 14347, 14348, 14349, 14350, 14351, + 14352, 14353, 14354, 14355, 14356, 14357, 14358, 14359, 14360, 14361, + 14362, 14363, 14364, 14365, 14366, 14367, 14368, 14369, 14370, 14371, + 14372, 14373, 14374, 14375, 14376, 14377, 14378, 14379, 14380, 14381, + 14382, 14383, 14384, 14385, 14386, 14387, 14388, 14389, 14390, 14391, + 14392, 14393, 14394, 14395, 14396, 14397, 14398, 14399, 14400, 14401, + 14402, 14403, 14404, 14405, 14406, 14407, 14408, 14409, 14410, 14411, + 14412, 14413, 14414, 14415, 14416, 14417, 14418, 14419, 14420, 14421, + 14422, 14423, 14424, 14425, 14426, 14427, 14428, 14429, 14430, 14431, + 14432, 14433, 14434, 14435, 14436, 14437, 14438, 14439, 14440, 14441, + 14442, 14443, 14444, 14445, 14446, 14447, 14448, 14449, 14450, 14451, + 14452, 14453, 14454, 14455, 14456, 14457, 14458, 14459, 14460, 14461, + 14462, 14463, 14464, 14465, 14466, 14467, 14468, 14469, 14470, 14471, + 14472, 14473, 14474, 14475, 14476, 14477, 14478, 14479, 14480, 14481, + 14482, 14483, 14484, 14485, 14486, 14487, 14488, 14489, 14490, 14491, + 14492, 14493, 14494, 14495, 14496, 14497, 14498, 14499, 14500, 14501, + 14502, 14503, 14504, 14505, 14506, 14507, 14508, 14509, 14510, 14511, + 14512, 14513, 14514, 14515, 14516, 14517, 14518, 14519, 14520, 14521, + 14522, 14523, 14524, 14525, 14526, 14527, 14528, 14529, 14530, 14531, + 14532, 14533, 14534, 14535, 14536, 14537, 14538, 14539, 14540, 14541, + 14542, 14543, 14544, 14545, 14546, 14547, 14548, 14549, 14550, 14551, + 14552, 14553, 14554, 14555, 14556, 14557, 14558, 14559, 14560, 14561, + 14562, 14563, 14564, 14565, 14566, 14567, 14568, 14569, 14570, 14571, + 14572, 14573, 14574, 14575, 14576, 14577, 14578, 14579, 14580, 14581, + 14582, 14583, 14584, 14585, 14586, 14587, 14588, 14589, 14590, 14591, + 14592, 14593, 14594, 14595, 14596, 14597, 14598, 14599, 14600, 14601, + 14602, 14603, 14604, 14605, 14606, 14607, 14608, 14609, 14610, 14611, + 14612, 14613, 14614, 14615, 14616, 14617, 14618, 14619, 14620, 14621, + 14622, 14623, 14624, 14625, 14626, 14627, 14628, 14629, 14630, 14631, + 14632, 14633, 14634, 14635, 14636, 14637, 14638, 14639, 14640, 14641, + 14642, 14643, 14644, 14645, 14646, 14647, 14648, 14649, 14650, 14651, + 14652, 14653, 14654, 14655, 14656, 14657, 14658, 14659, 14660, 14661, + 14662, 14663, 14664, 14665, 14666, 14667, 14668, 14669, 14670, 14671, + 14672, 14673, 14674, 14675, 14676, 14677, 14678, 14679, 14680, 14681, + 14682, 14683, 14684, 14685, 14686, 14687, 14688, 14689, 14690, 14691, + 14692, 14693, 14694, 14695, 14696, 14697, 14698, 14699, 14700, 14701, + 14702, 14703, 14704, 14705, 14706, 14707, 14708, 14709, 14710, 14711, + 14712, 14713, 14714, 14715, 14716, 14717, 14718, 14719, 14720, 14721, + 14722, 14723, 14724, 14725, 14726, 14727, 14728, 14729, 14730, 14731, + 14732, 14733, 14734, 14735, 14736, 14737, 14738, 14739, 14740, 14741, + 14742, 14743, 14744, 14745, 14746, 14747, 14748, 14749, 14750, 14751, + 14752, 14753, 14754, 14755, 14756, 14757, 14758, 14759, 14760, 14761, + 14762, 14763, 14764, 14765, 14766, 14767, 14768, 14769, 14770, 14771, + 14772, 14773, 14774, 14775, 14776, 14777, 14778, 14779, 14780, 14781, + 14782, 14783, 14784, 14785, 14786, 14787, 14788, 14789, 14790, 14791, + 14792, 14793, 14794, 14795, 14796, 14797, 14798, 14799, 14800, 14801, + 14802, 14803, 14804, 14805, 14806, 14807, 14808, 14809, 14810, 14811, + 14812, 14813, 14814, 14815, 14816, 14817, 14818, 14819, 14820, 14821, + 14822, 14823, 14824, 14825, 14826, 14827, 14828, 14829, 14830, 14831, + 14832, 14833, 14834, 14835, 14836, 14837, 14838, 14839, 14840, 14841, + 14842, 14843, 14844, 14845, 14846, 14847, 14848, 14849, 14850, 14851, + 14852, 14853, 14854, 14855, 14856, 14857, 14858, 14859, 14860, 14861, + 14862, 14863, 14864, 14865, 14866, 14867, 14868, 14869, 14870, 14871, + 14872, 14873, 14874, 14875, 14876, 14877, 14878, 14879, 14880, 14881, + 14882, 14883, 14884, 14885, 14886, 14887, 14888, 14889, 14890, 14891, + 14892, 14893, 14894, 14895, 14896, 14897, 14898, 14899, 14900, 14901, + 14902, 14903, 14904, 14905, 14906, 14907, 14908, 14909, 14910, 14911, + 14912, 14913, 14914, 14915, 14916, 14917, 14918, 14919, 14920, 14921, + 14922, 14923, 14924, 14925, 14926, 14927, 14928, 14929, 14930, 14931, + 14932, 14933, 14934, 14935, 14936, 14937, 14938, 14939, 14940, 14941, + 14942, 14943, 14944, 14945, 14946, 14947, 14948, 14949, 14950, 14951, + 14952, 14953, 14954, 14955, 14956, 14957, 14958, 14959, 14960, 14961, + 14962, 14963, 14964, 14965, 14966, 14967, 14968, 14969, 14970, 14971, + 14972, 14973, 14974, 14975, 14976, 14977, 14978, 14979, 14980, 14981, + 14982, 14983, 14984, 14985, 14986, 14987, 14988, 14989, 14990, 14991, + 14992, 14993, 14994, 14995, 14996, 14997, 14998, 14999, 15000, 15001, + 15002, 15003, 15004, 15005, 15006, 15007, 15008, 15009, 15010, 15011, + 15012, 15013, 15014, 15015, 15016, 15017, 15018, 15019, 15020, 15021, + 15022, 15023, 15024, 15025, 15026, 15027, 15028, 15029, 15030, 15031, + 15032, 15033, 15034, 15035, 15036, 15037, 15038, 15039, 15040, 15041, + 15042, 15043, 15044, 15045, 15046, 15047, 15048, 15049, 15050, 15051, + 15052, 15053, 15054, 15055, 15056, 15057, 15058, 15059, 15060, 15061, + 15062, 15063, 15064, 15065, 15066, 15067, 15068, 15069, 15070, 15071, + 15072, 15073, 15074, 15075, 15076, 15077, 15078, 15079, 15080, 15081, + 15082, 15083, 15084, 15085, 15086, 15087, 15088, 15089, 15090, 15091, + 15092, 15093, 15094, 15095, 15096, 15097, 15098, 15099, 15100, 15101, + 15102, 15103, 15104, 15105, 15106, 15107, 15108, 15109, 15110, 15111, + 15112, 15113, 15114, 15115, 15116, 15117, 15118, 15119, 15120, 15121, + 15122, 15123, 15124, 15125, 15126, 15127, 15128, 15129, 15130, 15131, + 15132, 15133, 15134, 15135, 15136, 15137, 15138, 15139, 15140, 15141, + 15142, 15143, 15144, 15145, 15146, 15147, 15148, 15149, 15150, 15151, + 15152, 15153, 15154, 15155, 15156, 15157, 15158, 15159, 15160, 15161, + 15162, 15163, 15164, 15165, 15166, 15167, 15168, 15169, 15170, 15171, + 15172, 15173, 15174, 15175, 15176, 15177, 15178, 15179, 15180, 15181, + 15182, 15183, 15184, 15185, 15186, 15187, 15188, 15189, 15190, 15191, + 15192, 15193, 15194, 15195, 15196, 15197, 15198, 15199, 15200, 15201, + 15202, 15203, 15204, 15205, 15206, 15207, 15208, 15209, 15210, 15211, + 15212, 15213, 15214, 15215, 15216, 15217, 15218, 15219, 15220, 15221, + 15222, 15223, 15224, 15225, 15226, 15227, 15228, 15229, 15230, 15231, + 15232, 15233, 15234, 15235, 15236, 15237, 15238, 15239, 15240, 15241, + 15242, 15243, 15244, 15245, 15246, 15247, 15248, 15249, 15250, 15251, + 15252, 15253, 15254, 15255, 15256, 15257, 15258, 15259, 15260, 15261, + 15262, 15263, 15264, 15265, 15266, 15267, 15268, 15269, 15270, 15271, + 15272, 15273, 15274, 15275, 15276, 15277, 15278, 15279, 15280, 15281, + 15282, 15283, 15284, 15285, 15286, 15287, 15288, 15289, 15290, 15291, + 15292, 15293, 15294, 15295, 15296, 15297, 15298, 15299, 15300, 15301, + 15302, 15303, 15304, 15305, 15306, 15307, 15308, 15309, 15310, 15311, + 15312, 15313, 15314, 15315, 15316, 15317, 15318, 15319, 15320, 15321, + 15322, 15323, 15324, 15325, 15326, 15327, 15328, 15329, 15330, 15331, + 15332, 15333, 15334, 15335, 15336, 15337, 15338, 15339, 15340, 15341, + 15342, 15343, 15344, 15345, 15346, 15347, 15348, 15349, 15350, 15351, + 15352, 15353, 15354, 15355, 15356, 15357, 15358, 15359, 15360, 15361, + 15362, 15363, 15364, 15365, 15366, 15367, 15368, 15369, 15370, 15371, + 15372, 15373, 15374, 15375, 15376, 15377, 15378, 15379, 15380, 15381, + 15382, 15383, 15384, 15385, 15386, 15387, 15388, 15389, 15390, 15391, + 15392, 15393, 15394, 15395, 15396, 15397, 15398, 15399, 15400, 15401, + 15402, 15403, 15404, 15405, 15406, 15407, 15408, 15409, 15410, 15411, + 15412, 15413, 15414, 15415, 15416, 15417, 15418, 15419, 15420, 15421, + 15422, 15423, 15424, 15425, 15426, 15427, 15428, 15429, 15430, 15431, + 15432, 15433, 15434, 15435, 15436, 15437, 15438, 15439, 15440, 15441, + 15442, 15443, 15444, 15445, 15446, 15447, 15448, 15449, 15450, 15451, + 15452, 15453, 15454, 15455, 15456, 15457, 15458, 15459, 15460, 15461, + 15462, 15463, 15464, 15465, 15466, 15467, 15468, 15469, 15470, 15471, + 15472, 15473, 15474, 15475, 15476, 15477, 15478, 15479, 15480, 15481, + 15482, 15483, 15484, 15485, 15486, 15487, 15488, 15489, 15490, 15491, + 15492, 15493, 15494, 15495, 15496, 15497, 15498, 15499, 15500, 15501, + 15502, 15503, 15504, 15505, 15506, 15507, 15508, 15509, 15510, 15511, + 15512, 15513, 15514, 15515, 15516, 15517, 15518, 15519, 15520, 15521, + 15522, 15523, 15524, 15525, 15526, 15527, 15528, 15529, 15530, 15531, + 15532, 15533, 15534, 15535, 15536, 15537, 15538, 15539, 15540, 15541, + 15542, 15543, 15544, 15545, 15546, 15547, 15548, 15549, 15550, 15551, + 15552, 15553, 15554, 15555, 15556, 15557, 15558, 15559, 15560, 15561, + 15562, 15563, 15564, 15565, 15566, 15567, 15568, 15569, 15570, 15571, + 15572, 15573, 15574, 15575, 15576, 15577, 15578, 15579, 15580, 15581, + 15582, 15583, 15584, 15585, 15586, 15587, 15588, 15589, 15590, 15591, + 15592, 15593, 15594, 15595, 15596, 15597, 15598, 15599, 15600, 15601, + 15602, 15603, 15604, 15605, 15606, 15607, 15608, 15609, 15610, 15611, + 15612, 15613, 15614, 15615, 15616, 15617, 15618, 15619, 15620, 15621, + 15622, 15623, 15624, 15625, 15626, 15627, 15628, 15629, 15630, 15631, + 15632, 15633, 15634, 15635, 15636, 15637, 15638, 15639, 15640, 15641, + 15642, 15643, 15644, 15645, 15646, 15647, 15648, 15649, 15650, 15651, + 15652, 15653, 15654, 15655, 15656, 15657, 15658, 15659, 15660, 15661, + 15662, 15663, 15664, 15665, 15666, 15667, 15668, 15669, 15670, 15671, + 15672, 15673, 15674, 15675, 15676, 15677, 15678, 15679, 15680, 15681, + 15682, 15683, 15684, 15685, 15686, 15687, 15688, 15689, 15690, 15691, + 15692, 15693, 15694, 15695, 15696, 15697, 15698, 15699, 15700, 15701, + 15702, 15703, 15704, 15705, 15706, 15707, 15708, 15709, 15710, 15711, + 15712, 15713, 15714, 15715, 15716, 15717, 15718, 15719, 15720, 15721, + 15722, 15723, 15724, 15725, 15726, 15727, 15728, 15729, 15730, 15731, + 15732, 15733, 15734, 15735, 15736, 15737, 15738, 15739, 15740, 15741, + 15742, 15743, 15744, 15745, 15746, 15747, 15748, 15749, 15750, 15751, + 15752, 15753, 15754, 15755, 15756, 15757, 15758, 15759, 15760, 15761, + 15762, 15763, 15764, 15765, 15766, 15767, 15768, 15769, 15770, 15771, + 15772, 15773, 15774, 15775, 15776, 15777, 15778, 15779, 15780, 15781, + 15782, 15783, 15784, 15785, 15786, 15787, 15788, 15789, 15790, 15791, + 15792, 15793, 15794, 15795, 15796, 15797, 15798, 15799, 15800, 15801, + 15802, 15803, 15804, 15805, 15806, 15807, 15808, 15809, 15810, 15811, + 15812, 15813, 15814, 15815, 15816, 15817, 15818, 15819, 15820, 15821, + 15822, 15823, 15824, 15825, 15826, 15827, 15828, 15829, 15830, 15831, + 15832, 15833, 15834, 15835, 15836, 15837, 15838, 15839, 15840, 15841, + 15842, 15843, 15844, 15845, 15846, 15847, 15848, 15849, 15850, 15851, + 15852, 15853, 15854, 15855, 15856, 15857, 15858, 15859, 15860, 15861, + 15862, 15863, 15864, 15865, 15866, 15867, 15868, 15869, 15870, 15871, + 15872, 15873, 15874, 15875, 15876, 15877, 15878, 15879, 15880, 15881, + 15882, 15883, 15884, 15885, 15886, 15887, 15888, 15889, 15890, 15891, + 15892, 15893, 15894, 15895, 15896, 15897, 15898, 15899, 15900, 15901, + 15902, 15903, 15904, 15905, 15906, 15907, 15908, 15909, 15910, 15911, + 15912, 15913, 15914, 15915, 15916, 15917, 15918, 15919, 15920, 15921, + 15922, 15923, 15924, 15925, 15926, 15927, 15928, 15929, 15930, 15931, + 15932, 15933, 15934, 15935, 15936, 15937, 15938, 15939, 15940, 15941, + 15942, 15943, 15944, 15945, 15946, 15947, 15948, 15949, 15950, 15951, + 15952, 15953, 15954, 15955, 15956, 15957, 15958, 15959, 15960, 15961, + 15962, 15963, 15964, 15965, 15966, 15967, 15968, 15969, 15970, 15971, + 15972, 15973, 15974, 15975, 15976, 15977, 15978, 15979, 15980, 15981, + 15982, 15983, 15984, 15985, 15986, 15987, 15988, 15989, 15990, 15991, + 15992, 15993, 15994, 15995, 15996, 15997, 15998, 15999, 16000, 16001, + 16002, 16003, 16004, 16005, 16006, 16007, 16008, 16009, 16010, 16011, + 16012, 16013, 16014, 16015, 16016, 16017, 16018, 16019, 16020, 16021, + 16022, 16023, 16024, 16025, 16026, 16027, 16028, 16029, 16030, 16031, + 16032, 16033, 16034, 16035, 16036, 16037, 16038, 16039, 16040, 16041, + 16042, 16043, 16044, 16045, 16046, 16047, 16048, 16049, 16050, 16051, + 16052, 16053, 16054, 16055, 16056, 16057, 16058, 16059, 16060, 16061, + 16062, 16063, 16064, 16065, 16066, 16067, 16068, 16069, 16070, 16071, + 16072, 16073, 16074, 16075, 16076, 16077, 16078, 16079, 16080, 16081, + 16082, 16083, 16084, 16085, 16086, 16087, 16088, 16089, 16090, 16091, + 16092, 16093, 16094, 16095, 16096, 16097, 16098, 16099, 16100, 16101, + 16102, 16103, 16104, 16105, 16106, 16107, 16108, 16109, 16110, 16111, + 16112, 16113, 16114, 16115, 16116, 16117, 16118, 16119, 16120, 16121, + 16122, 16123, 16124, 16125, 16126, 16127, 16128, 16129, 16130, 16131, + 16132, 16133, 16134, 16135, 16136, 16137, 16138, 16139, 16140, 16141, + 16142, 16143, 16144, 16145, 16146, 16147, 16148, 16149, 16150, 16151, + 16152, 16153, 16154, 16155, 16156, 16157, 16158, 16159, 16160, 16161, + 16162, 16163, 16164, 16165, 16166, 16167, 16168, 16169, 16170, 16171, + 16172, 16173, 16174, 16175, 16176, 16177, 16178, 16179, 16180, 16181, + 16182, 16183, 16184, 16185, 16186, 16187, 16188, 16189, 16190, 16191, + 16192, 16193, 16194, 16195, 16196, 16197, 16198, 16199, 16200, 16201, + 16202, 16203, 16204, 16205, 16206, 16207, 16208, 16209, 16210, 16211, + 16212, 16213, 16214, 16215, 16216, 16217, 16218, 16219, 16220, 16221, + 16222, 16223, 16224, 16225, 16226, 16227, 16228, 16229, 16230, 16231, + 16232, 16233, 16234, 16235, 16236, 16237, 16238, 16239, 16240, 16241, + 16242, 16243, 16244, 16245, 16246, 16247, 16248, 16249, 16250, 16251, + 16252, 16253, 16254, 16255, 16256, 16257, 16258, 16259, 16260, 16261, + 16262, 16263, 16264, 16265, 16266, 16267, 16268, 16269, 16270, 16271, + 16272, 16273, 16274, 16275, 16276, 16277, 16278, 16279, 16280, 16281, + 16282, 16283, 16284, 16285, 16286, 16287, 16288, 16289, 16290, 16291, + 16292, 16293, 16294, 16295, 16296, 16297, 16298, 16299, 16300, 16301, + 16302, 16303, 16304, 16305, 16306, 16307, 16308, 16309, 16310, 16311, + 16312, 16313, 16314, 16315, 16316, 16317, 16318, 16319, 16320, 16321, + 16322, 16323, 16324, 16325, 16326, 16327, 16328, 16329, 16330, 16331, + 16332, 16333, 16334, 16335, 16336, 16337, 16338, 16339, 16340, 16341, + 16342, 16343, 16344, 16345, 16346, 16347, 16348, 16349, 16350, 16351, + 16352, 16353, 16354, 16355, 16356, 16357, 16358, 16359, 16360, 16361, + 16362, 16363, 16364, 16365, 16366, 16367, 16368, 16369, 16370, 16371, + 16372, 16373, 16374, 16375, 16376, 16377, 16378, 16379, 16380, 16381, + 16382, 16383, 16384, 16385, 16386, 16387, 16388, 16389, 16390, 16391, + 16392, 16393, 16394, 16395, 16396, 16397, 16398, 16399, 16400, 16401, + 16402, 16403, 16404, 16405, 16406, 16407, 16408, 16409, 16410, 16411, + 16412, 16413, 16414, 16415, 16416, 16417, 16418, 16419, 16420, 16421, + 16422, 16423, 16424, 16425, 16426, 16427, 16428, 16429, 16430, 16431, + 16432, 16433, 16434, 16435, 16436, 16437, 16438, 16439, 16440, 16441, + 16442, 16443, 16444, 16445, 16446, 16447, 16448, 16449, 16450, 16451, + 16452, 16453, 16454, 16455, 16456, 16457, 16458, 16459, 16460, 16461, + 16462, 16463, 16464, 16465, 16466, 16467, 16468, 16469, 16470, 16471, + 16472, 16473, 16474, 16475, 16476, 16477, 16478, 16479, 16480, 16481, + 16482, 16483, 16484, 16485, 16486, 16487, 16488, 16489, 16490, 16491, + 16492, 16493, 16494, 16495, 16496, 16497, 16498, 16499, 16500, 16501, + 16502, 16503, 16504, 16505, 16506, 16507, 16508, 16509, 16510, 16511, + 16512, 16513, 16514, 16515, 16516, 16517, 16518, 16519, 16520, 16521, + 16522, 16523, 16524, 16525, 16526, 16527, 16528, 16529, 16530, 16531, + 16532, 16533, 16534, 16535, 16536, 16537, 16538, 16539, 16540, 16541, + 16542, 16543, 16544, 16545, 16546, 16547, 16548, 16549, 16550, 16551, + 16552, 16553, 16554, 16555, 16556, 16557, 16558, 16559, 16560, 16561, + 16562, 16563, 16564, 16565, 16566, 16567, 16568, 16569, 16570, 16571, + 16572, 16573, 16574, 16575, 16576, 16577, 16578, 16579, 16580, 16581, + 16582, 16583, 16584, 16585, 16586, 16587, 16588, 16589, 16590, 16591, + 16592, 16593, 16594, 16595, 16596, 16597, 16598, 16599, 16600, 16601, + 16602, 16603, 16604, 16605, 16606, 16607, 16608, 16609, 16610, 16611, + 16612, 16613, 16614, 16615, 16616, 16617, 16618, 16619, 16620, 16621, + 16622, 16623, 16624, 16625, 16626, 16627, 16628, 16629, 16630, 16631, + 16632, 16633, 16634, 16635, 16636, 16637, 16638, 16639, 16640, 16641, + 16642, 16643, 16644, 16645, 16646, 16647, 16648, 16649, 16650, 16651, + 16652, 16653, 16654, 16655, 16656, 16657, 16658, 16659, 16660, 16661, + 16662, 16663, 16664, 16665, 16666, 16667, 16668, 16669, 16670, 16671, + 16672, 16673, 16674, 16675, 16676, 16677, 16678, 16679, 16680, 16681, + 16682, 16683, 16684, 16685, 16686, 16687, 16688, 16689, 16690, 16691, + 16692, 16693, 16694, 16695, 16696, 16697, 16698, 16699, 16700, 16701, + 16702, 16703, 16704, 16705, 16706, 16707, 16708, 16709, 16710, 16711, + 16712, 16713, 16714, 16715, 16716, 16717, 16718, 16719, 16720, 16721, + 16722, 16723, 16724, 16725, 16726, 16727, 16728, 16729, 16730, 16731, + 16732, 16733, 16734, 16735, 16736, 16737, 16738, 16739, 16740, 16741, + 16742, 16743, 16744, 16745, 16746, 16747, 16748, 16749, 16750, 16751, + 16752, 16753, 16754, 16755, 16756, 16757, 16758, 16759, 16760, 16761, + 16762, 16763, 16764, 16765, 16766, 16767, 16768, 16769, 16770, 16771, + 16772, 16773, 16774, 16775, 16776, 16777, 16778, 16779, 16780, 16781, + 16782, 16783, 16784, 16785, 16786, 16787, 16788, 16789, 16790, 16791, + 16792, 16793, 16794, 16795, 16796, 16797, 16798, 16799, 16800, 16801, + 16802, 16803, 16804, 16805, 16806, 16807, 16808, 16809, 16810, 16811, + 16812, 16813, 16814, 16815, 16816, 16817, 16818, 16819, 16820, 16821, + 16822, 16823, 16824, 16825, 16826, 16827, 16828, 16829, 16830, 16831, + 16832, 16833, 16834, 16835, 16836, 16837, 16838, 16839, 16840, 16841, + 16842, 16843, 16844, 16845, 16846, 16847, 16848, 16849, 16850, 16851, + 16852, 16853, 16854, 16855, 16856, 16857, 16858, 16859, 16860, 16861, + 16862, 16863, 16864, 16865, 16866, 16867, 16868, 16869, 16870, 16871, + 16872, 16873, 16874, 16875, 16876, 16877, 16878, 16879, 16880, 16881, + 16882, 16883, 16884, 16885, 16886, 16887, 16888, 16889, 16890, 16891, + 16892, 16893, 16894, 16895, 16896, 16897, 16898, 16899, 16900, 16901, + 16902, 16903, 16904, 16905, 16906, 16907, 16908, 16909, 16910, 16911, + 16912, 16913, 16914, 16915, 16916, 16917, 16918, 16919, 16920, 16921, + 16922, 16923, 16924, 16925, 16926, 16927, 16928, 16929, 16930, 16931, + 16932, 16933, 16934, 16935, 16936, 16937, 16938, 16939, 16940, 16941, + 16942, 16943, 16944, 16945, 16946, 16947, 16948, 16949, 16950, 16951, + 16952, 16953, 16954, 16955, 16956, 16957, 16958, 16959, 16960, 16961, + 16962, 16963, 16964, 16965, 16966, 16967, 16968, 16969, 16970, 16971, + 16972, 16973, 16974, 16975, 16976, 16977, 16978, 16979, 16980, 16981, + 16982, 16983, 16984, 16985, 16986, 16987, 16988, 16989, 16990, 16991, + 16992, 16993, 16994, 16995, 16996, 16997, 16998, 16999, 17000, 17001, + 17002, 17003, 17004, 17005, 17006, 17007, 17008, 17009, 17010, 17011, + 17012, 17013, 17014, 17015, 17016, 17017, 17018, 17019, 17020, 17021, + 17022, 17023, 17024, 17025, 17026, 17027, 17028, 17029, 17030, 17031, + 17032, 17033, 17034, 17035, 17036, 17037, 17038, 17039, 17040, 17041, + 17042, 17043, 17044, 17045, 17046, 17047, 17048, 17049, 17050, 17051, + 17052, 17053, 17054, 17055, 17056, 17057, 17058, 17059, 17060, 17061, + 17062, 17063, 17064, 17065, 17066, 17067, 17068, 17069, 17070, 17071, + 17072, 17073, 17074, 17075, 17076, 17077, 17078, 17079, 17080, 17081, + 17082, 17083, 17084, 17085, 17086, 17087, 17088, 17089, 17090, 17091, + 17092, 17093, 17094, 17095, 17096, 17097, 17098, 17099, 17100, 17101, + 17102, 17103, 17104, 17105, 17106, 17107, 17108, 17109, 17110, 17111, + 17112, 17113, 17114, 17115, 17116, 17117, 17118, 17119, 17120, 17121, + 17122, 17123, 17124, 17125, 17126, 17127, 17128, 17129, 17130, 17131, + 17132, 17133, 17134, 17135, 17136, 17137, 17138, 17139, 17140, 17141, + 17142, 17143, 17144, 17145, 17146, 17147, 17148, 17149, 17150, 17151, + 17152, 17153, 17154, 17155, 17156, 17157, 17158, 17159, 17160, 17161, + 17162, 17163, 17164, 17165, 17166, 17167, 17168, 17169, 17170, 17171, + 17172, 17173, 17174, 17175, 17176, 17177, 17178, 17179, 17180, 17181, + 17182, 17183, 17184, 17185, 17186, 17187, 17188, 17189, 17190, 17191, + 17192, 17193, 17194, 17195, 17196, 17197, 17198, 17199, 17200, 17201, + 17202, 17203, 17204, 17205, 17206, 17207, 17208, 17209, 17210, 17211, + 17212, 17213, 17214, 17215, 17216, 17217, 17218, 17219, 17220, 17221, + 17222, 17223, 17224, 17225, 17226, 17227, 17228, 17229, 17230, 17231, + 17232, 17233, 17234, 17235, 17236, 17237, 17238, 17239, 17240, 17241, + 17242, 17243, 17244, 17245, 17246, 17247, 17248, 17249, 17250, 17251, + 17252, 17253, 17254, 17255, 17256, 17257, 17258, 17259, 17260, 17261, + 17262, 17263, 17264, 17265, 17266, 17267, 17268, 17269, 17270, 17271, + 17272, 17273, 17274, 17275, 17276, 17277, 17278, 17279, 17280, 17281, + 17282, 17283, 17284, 17285, 17286, 17287, 17288, 17289, 17290, 17291, + 17292, 17293, 17294, 17295, 17296, 17297, 17298, 17299, 17300, 17301, + 17302, 17303, 17304, 17305, 17306, 17307, 17308, 17309, 17310, 17311, + 17312, 17313, 17314, 17315, 17316, 17317, 17318, 17319, 17320, 17321, + 17322, 17323, 17324, 17325, 17326, 17327, 17328, 17329, 17330, 17331, + 17332, 17333, 17334, 17335, 17336, 17337, 17338, 17339, 17340, 17341, + 17342, 17343, 17344, 17345, 17346, 17347, 17348, 17349, 17350, 17351, + 17352, 17353, 17354, 17355, 17356, 17357, 17358, 17359, 17360, 17361, + 17362, 17363, 17364, 17365, 17366, 17367, 17368, 17369, 17370, 17371, + 17372, 17373, 17374, 17375, 17376, 17377, 17378, 17379, 17380, 17381, + 17382, 17383, 17384, 17385, 17386, 17387, 17388, 17389, 17390, 17391, + 17392, 17393, 17394, 17395, 17396, 17397, 17398, 17399, 17400, 17401, + 17402, 17403, 17404, 17405, 17406, 17407, 17408, 17409, 17410, 17411, + 17412, 17413, 17414, 17415, 17416, 17417, 17418, 17419, 17420, 17421, + 17422, 17423, 17424, 17425, 17426, 17427, 17428, 17429, 17430, 17431, + 17432, 17433, 17434, 17435, 17436, 17437, 17438, 17439, 17440, 17441, + 17442, 17443, 17444, 17445, 17446, 17447, 17448, 17449, 17450, 17451, + 17452, 17453, 17454, 17455, 17456, 17457, 17458, 17459, 17460, 17461, + 17462, 17463, 17464, 17465, 17466, 17467, 17468, 17469, 17470, 17471, + 17472, 17473, 17474, 17475, 17476, 17477, 17478, 17479, 17480, 17481, + 17482, 17483, 17484, 17485, 17486, 17487, 17488, 17489, 17490, 17491, + 17492, 17493, 17494, 17495, 17496, 17497, 17498, 17499, 17500, 17501, + 17502, 17503, 17504, 17505, 17506, 17507, 17508, 17509, 17510, 17511, + 17512, 17513, 17514, 17515, 17516, 17517, 17518, 17519, 17520, 17521, + 17522, 17523, 17524, 17525, 17526, 17527, 17528, 17529, 17530, 17531, + 17532, 17533, 17534, 17535, 17536, 17537, 17538, 17539, 17540, 17541, + 17542, 17543, 17544, 17545, 17546, 17547, 17548, 17549, 17550, 17551, + 17552, 17553, 17554, 17555, 17556, 17557, 17558, 17559, 17560, 17561, + 17562, 17563, 17564, 17565, 17566, 17567, 17568, 17569, 17570, 17571, + 17572, 17573, 17574, 17575, 17576, 17577, 17578, 17579, 17580, 17581, + 17582, 17583, 17584, 17585, 17586, 17587, 17588, 17589, 17590, 17591, + 17592, 17593, 17594, 17595, 17596, 17597, 17598, 17599, 17600, 17601, + 17602, 17603, 17604, 17605, 17606, 17607, 17608, 17609, 17610, 17611, + 17612, 17613, 17614, 17615, 17616, 17617, 17618, 17619, 17620, 17621, + 17622, 17623, 17624, 17625, 17626, 17627, 17628, 17629, 17630, 17631, + 17632, 17633, 17634, 17635, 17636, 17637, 17638, 17639, 17640, 17641, + 17642, 17643, 17644, 17645, 17646, 17647, 17648, 17649, 17650, 17651, + 17652, 17653, 17654, 17655, 17656, 17657, 17658, 17659, 17660, 17661, + 17662, 17663, 17664, 17665, 17666, 17667, 17668, 17669, 17670, 17671, + 17672, 17673, 17674, 17675, 17676, 17677, 17678, 17679, 17680, 17681, + 17682, 17683, 17684, 17685, 17686, 17687, 17688, 17689, 17690, 17691, + 17692, 17693, 17694, 17695, 17696, 17697, 17698, 17699, 17700, 17701, + 17702, 17703, 17704, 17705, 17706, 17707, 17708, 17709, 17710, 17711, + 17712, 17713, 17714, 17715, 17716, 17717, 17718, 17719, 17720, 17721, + 17722, 17723, 17724, 17725, 17726, 17727, 17728, 17729, 17730, 17731, + 17732, 17733, 17734, 17735, 17736, 17737, 17738, 17739, 17740, 17741, + 17742, 17743, 17744, 17745, 17746, 17747, 17748, 17749, 17750, 17751, + 17752, 17753, 17754, 17755, 17756, 17757, 17758, 17759, 17760, 17761, + 17762, 17763, 17764, 17765, 17766, 17767, 17768, 17769, 17770, 17771, + 17772, 17773, 17774, 17775, 17776, 17777, 17778, 17779, 17780, 17781, + 17782, 17783, 17784, 17785, 17786, 17787, 17788, 17789, 17790, 17791, + 17792, 17793, 17794, 17795, 17796, 17797, 17798, 17799, 17800, 17801, + 17802, 17803, 17804, 17805, 17806, 17807, 17808, 17809, 17810, 17811, + 17812, 17813, 17814, 17815, 17816, 17817, 17818, 17819, 17820, 17821, + 17822, 17823, 17824, 17825, 17826, 17827, 17828, 17829, 17830, 17831, + 17832, 17833, 17834, 17835, 17836, 17837, 17838, 17839, 17840, 17841, + 17842, 17843, 17844, 17845, 17846, 17847, 17848, 17849, 17850, 17851, + 17852, 17853, 17854, 17855, 17856, 17857, 17858, 17859, 17860, 17861, + 17862, 17863, 17864, 17865, 17866, 17867, 17868, 17869, 17870, 17871, + 17872, 17873, 17874, 17875, 17876, 17877, 17878, 17879, 17880, 17881, + 17882, 17883, 17884, 17885, 17886, 17887, 17888, 17889, 17890, 17891, + 17892, 17893, 17894, 17895, 17896, 17897, 17898, 17899, 17900, 17901, + 17902, 17903, 17904, 17905, 17906, 17907, 17908, 17909, 17910, 17911, + 17912, 17913, 17914, 17915, 17916, 17917, 17918, 17919, 17920, 17921, + 17922, 17923, 17924, 17925, 17926, 17927, 17928, 17929, 17930, 17931, + 17932, 17933, 17934, 17935, 17936, 17937, 17938, 17939, 17940, 17941, + 17942, 17943, 17944, 17945, 17946, 17947, 17948, 17949, 17950, 17951, + 17952, 17953, 17954, 17955, 17956, 17957, 17958, 17959, 17960, 17961, + 17962, 17963, 17964, 17965, 17966, 17967, 17968, 17969, 17970, 17971, + 17972, 17973, 17974, 17975, 17976, 17977, 17978, 17979, 17980, 17981, + 17982, 17983, 17984, 17985, 17986, 17987, 17988, 17989, 17990, 17991, + 17992, 17993, 17994, 17995, 17996, 17997, 17998, 17999, 18000, 18001, + 18002, 18003, 18004, 18005, 18006, 18007, 18008, 18009, 18010, 18011, + 18012, 18013, 18014, 18015, 18016, 18017, 18018, 18019, 18020, 18021, + 18022, 18023, 18024, 18025, 18026, 18027, 18028, 18029, 18030, 18031, + 18032, 18033, 18034, 18035, 18036, 18037, 18038, 18039, 18040, 18041, + 18042, 18043, 18044, 18045, 18046, 18047, 18048, 18049, 18050, 18051, + 18052, 18053, 18054, 18055, 18056, 18057, 18058, 18059, 18060, 18061, + 18062, 18063, 18064, 18065, 18066, 18067, 18068, 18069, 18070, 18071, + 18072, 18073, 18074, 18075, 18076, 18077, 18078, 18079, 18080, 18081, + 18082, 18083, 18084, 18085, 18086, 18087, 18088, 18089, 18090, 18091, + 18092, 18093, 18094, 18095, 18096, 18097, 18098, 18099, 18100, 18101, + 18102, 18103, 18104, 18105, 18106, 18107, 18108, 18109, 18110, 18111, + 18112, 18113, 18114, 18115, 18116, 18117, 18118, 18119, 18120, 18121, + 18122, 18123, 18124, 18125, 18126, 18127, 18128, 18129, 18130, 18131, + 18132, 18133, 18134, 18135, 18136, 18137, 18138, 18139, 18140, 18141, + 18142, 18143, 18144, 18145, 18146, 18147, 18148, 18149, 18150, 18151, + 18152, 18153, 18154, 18155, 18156, 18157, 18158, 18159, 18160, 18161, + 18162, 18163, 18164, 18165, 18166, 18167, 18168, 18169, 18170, 18171, + 18172, 18173, 18174, 18175, 18176, 18177, 18178, 18179, 18180, 18181, + 18182, 18183, 18184, 18185, 18186, 18187, 18188, 18189, 18190, 18191, + 18192, 18193, 18194, 18195, 18196, 18197, 18198, 18199, 18200, 18201, + 18202, 18203, 18204, 18205, 18206, 18207, 18208, 18209, 18210, 18211, + 18212, 18213, 18214, 18215, 18216, 18217, 18218, 18219, 18220, 18221, + 18222, 18223, 18224, 18225, 18226, 18227, 18228, 18229, 18230, 18231, + 18232, 18233, 18234, 18235, 18236, 18237, 18238, 18239, 18240, 18241, + 18242, 18243, 18244, 18245, 18246, 18247, 18248, 18249, 18250, 18251, + 18252, 18253, 18254, 18255, 18256, 18257, 18258, 18259, 18260, 18261, + 18262, 18263, 18264, 18265, 18266, 18267, 18268, 18269, 18270, 18271, + 18272, 18273, 18274, 18275, 18276, 18277, 18278, 18279, 18280, 18281, + 18282, 18283, 18284, 18285, 18286, 18287, 18288, 18289, 18290, 18291, + 18292, 18293, 18294, 18295, 18296, 18297, 18298, 18299, 18300, 18301, + 18302, 18303, 18304, 18305, 18306, 18307, 18308, 18309, 18310, 18311, + 18312, 18313, 18314, 18315, 18316, 18317, 18318, 18319, 18320, 18321, + 18322, 18323, 18324, 18325, 18326, 18327, 18328, 18329, 18330, 18331, + 18332, 18333, 18334, 18335, 18336, 18337, 18338, 18339, 18340, 18341, + 18342, 18343, 18344, 18345, 18346, 18347, 18348, 18349, 18350, 18351, + 18352, 18353, 18354, 18355, 18356, 18357, 18358, 18359, 18360, 18361, + 18362, 18363, 18364, 18365, 18366, 18367, 18368, 18369, 18370, 18371, + 18372, 18373, 18374, 18375, 18376, 18377, 18378, 18379, 18380, 18381, + 18382, 18383, 18384, 18385, 18386, 18387, 18388, 18389, 18390, 18391, + 18392, 18393, 18394, 18395, 18396, 18397, 18398, 18399, 18400, 18401, + 18402, 18403, 18404, 18405, 18406, 18407, 18408, 18409, 18410, 18411, + 18412, 18413, 18414, 18415, 18416, 18417, 18418, 18419, 18420, 18421, + 18422, 18423, 18424, 18425, 18426, 18427, 18428, 18429, 18430, 18431, + 18432, 18433, 18434, 18435, 18436, 18437, 18438, 18439, 18440, 18441, + 18442, 18443, 18444, 18445, 18446, 18447, 18448, 18449, 18450, 18451, + 18452, 18453, 18454, 18455, 18456, 18457, 18458, 18459, 18460, 18461, + 18462, 18463, 18464, 18465, 18466, 18467, 18468, 18469, 18470, 18471, + 18472, 18473, 18474, 18475, 18476, 18477, 18478, 18479, 18480, 18481, + 18482, 18483, 18484, 18485, 18486, 18487, 18488, 18489, 18490, 18491, + 18492, 18493, 18494, 18495, 18496, 18497, 18498, 18499, 18500, 18501, + 18502, 18503, 18504, 18505, 18506, 18507, 18508, 18509, 18510, 18511, + 18512, 18513, 18514, 18515, 18516, 18517, 18518, 18519, 18520, 18521, + 18522, 18523, 18524, 18525, 18526, 18527, 18528, 18529, 18530, 18531, + 18532, 18533, 18534, 18535, 18536, 18537, 18538, 18539, 18540, 18541, + 18542, 18543, 18544, 18545, 18546, 18547, 18548, 18549, 18550, 18551, + 18552, 18553, 18554, 18555, 18556, 18557, 18558, 18559, 18560, 18561, + 18562, 18563, 18564, 18565, 18566, 18567, 18568, 18569, 18570, 18571, + 18572, 18573, 18574, 18575, 18576, 18577, 18578, 18579, 18580, 18581, + 18582, 18583, 18584, 18585, 18586, 18587, 18588, 18589, 18590, 18591, + 18592, 18593, 18594, 18595, 18596, 18597, 18598, 18599, 18600, 18601, + 18602, 18603, 18604, 18605, 18606, 18607, 18608, 18609, 18610, 18611, + 18612, 18613, 18614, 18615, 18616, 18617, 18618, 18619, 18620, 18621, + 18622, 18623, 18624, 18625, 18626, 18627, 18628, 18629, 18630, 18631, + 18632, 18633, 18634, 18635, 18636, 18637, 18638, 18639, 18640, 18641, + 18642, 18643, 18644, 18645, 18646, 18647, 18648, 18649, 18650, 18651, + 18652, 18653, 18654, 18655, 18656, 18657, 18658, 18659, 18660, 18661, + 18662, 18663, 18664, 18665, 18666, 18667, 18668, 18669, 18670, 18671, + 18672, 18673, 18674, 18675, 18676, 18677, 18678, 18679, 18680, 18681, + 18682, 18683, 18684, 18685, 18686, 18687, 18688, 18689, 18690, 18691, + 18692, 18693, 18694, 18695, 18696, 18697, 18698, 18699, 18700, 18701, + 18702, 18703, 18704, 18705, 18706, 18707, 18708, 18709, 18710, 18711, + 18712, 18713, 18714, 18715, 18716, 18717, 18718, 18719, 18720, 18721, + 18722, 18723, 18724, 18725, 18726, 18727, 18728, 18729, 18730, 18731, + 18732, 18733, 18734, 18735, 18736, 18737, 18738, 18739, 18740, 18741, + 18742, 18743, 18744, 18745, 18746, 18747, 18748, 18749, 18750, 18751, + 18752, 18753, 18754, 18755, 18756, 18757, 18758, 18759, 18760, 18761, + 18762, 18763, 18764, 18765, 18766, 18767, 18768, 18769, 18770, 18771, + 18772, 18773, 18774, 18775, 18776, 18777, 18778, 18779, 18780, 18781, + 18782, 18783, 18784, 18785, 18786, 18787, 18788, 18789, 18790, 18791, + 18792, 18793, 18794, 18795, 18796, 18797, 18798, 18799, 18800, 18801, + 18802, 18803, 18804, 18805, 18806, 18807, 18808, 18809, 18810, 18811, + 18812, 18813, 18814, 18815, 18816, 18817, 18818, 18819, 18820, 18821, + 18822, 18823, 18824, 18825, 18826, 18827, 18828, 18829, 18830, 18831, + 18832, 18833, 18834, 18835, 18836, 18837, 18838, 18839, 18840, 18841, + 18842, 18843, 18844, 18845, 18846, 18847, 18848, 18849, 18850, 18851, + 18852, 18853, 18854, 18855, 18856, 18857, 18858, 18859, 18860, 18861, + 18862, 18863, 18864, 18865, 18866, 18867, 18868, 18869, 18870, 18871, + 18872, 18873, 18874, 18875, 18876, 18877, 18878, 18879, 18880, 18881, + 18882, 18883, 18884, 18885, 18886, 18887, 18888, 18889, 18890, 18891, + 18892, 18893, 18894, 18895, 18896, 18897, 18898, 18899, 18900, 18901, + 18902, 18903, 18904, 18905, 18906, 18907, 18908, 18909, 18910, 18911, + 18912, 18913, 18914, 18915, 18916, 18917, 18918, 18919, 18920, 18921, + 18922, 18923, 18924, 18925, 18926, 18927, 18928, 18929, 18930, 18931, + 18932, 18933, 18934, 18935, 18936, 18937, 18938, 18939, 18940, 18941, + 18942, 18943, 18944, 18945, 18946, 18947, 18948, 18949, 18950, 18951, + 18952, 18953, 18954, 18955, 18956, 18957, 18958, 18959, 18960, 18961, + 18962, 18963, 18964, 18965, 18966, 18967, 18968, 18969, 18970, 18971, + 18972, 18973, 18974, 18975, 18976, 18977, 18978, 18979, 18980, 18981, + 18982, 18983, 18984, 18985, 18986, 18987, 18988, 18989, 18990, 18991, + 18992, 18993, 18994, 18995, 18996, 18997, 18998, 18999, 19000, 19001, + 19002, 19003, 19004, 19005, 19006, 19007, 19008, 19009, 19010, 19011, + 19012, 19013, 19014, 19015, 19016, 19017, 19018, 19019, 19020, 19021, + 19022, 19023, 19024, 19025, 19026, 19027, 19028, 19029, 19030, 19031, + 19032, 19033, 19034, 19035, 19036, 19037, 19038, 19039, 19040, 19041, + 19042, 19043, 19044, 19045, 19046, 19047, 19048, 19049, 19050, 19051, + 19052, 19053, 19054, 19055, 19056, 19057, 19058, 19059, 19060, 19061, + 19062, 19063, 19064, 19065, 19066, 19067, 19068, 19069, 19070, 19071, + 19072, 19073, 19074, 19075, 19076, 19077, 19078, 19079, 19080, 19081, + 19082, 19083, 19084, 19085, 19086, 19087, 19088, 19089, 19090, 19091, + 19092, 19093, 19094, 19095, 19096, 19097, 19098, 19099, 19100, 19101, + 19102, 19103, 19104, 19105, 19106, 19107, 19108, 19109, 19110, 19111, + 19112, 19113, 19114, 19115, 19116, 19117, 19118, 19119, 19120, 19121, + 19122, 19123, 19124, 19125, 19126, 19127, 19128, 19129, 19130, 19131, + 19132, 19133, 19134, 19135, 19136, 19137, 19138, 19139, 19140, 19141, + 19142, 19143, 19144, 19145, 19146, 19147, 19148, 19149, 19150, 19151, + 19152, 19153, 19154, 19155, 19156, 19157, 19158, 19159, 19160, 19161, + 19162, 19163, 19164, 19165, 19166, 19167, 19168, 19169, 19170, 19171, + 19172, 19173, 19174, 19175, 19176, 19177, 19178, 19179, 19180, 19181, + 19182, 19183, 19184, 19185, 19186, 19187, 19188, 19189, 19190, 19191, + 19192, 19193, 19194, 19195, 19196, 19197, 19198, 19199, 19200, 19201, + 19202, 19203, 19204, 19205, 19206, 19207, 19208, 19209, 19210, 19211, + 19212, 19213, 19214, 19215, 19216, 19217, 19218, 19219, 19220, 19221, + 19222, 19223, 19224, 19225, 19226, 19227, 19228, 19229, 19230, 19231, + 19232, 19233, 19234, 19235, 19236, 19237, 19238, 19239, 19240, 19241, + 19242, 19243, 19244, 19245, 19246, 19247, 19248, 19249, 19250, 19251, + 19252, 19253, 19254, 19255, 19256, 19257, 19258, 19259, 19260, 19261, + 19262, 19263, 19264, 19265, 19266, 19267, 19268, 19269, 19270, 19271, + 19272, 19273, 19274, 19275, 19276, 19277, 19278, 19279, 19280, 19281, + 19282, 19283, 19284, 19285, 19286, 19287, 19288, 19289, 19290, 19291, + 19292, 19293, 19294, 19295, 19296, 19297, 19298, 19299, 19300, 19301, + 19302, 19303, 19304, 19305, 19306, 19307, 19308, 19309, 19310, 19311, + 19312, 19313, 19314, 19315, 19316, 19317, 19318, 19319, 19320, 19321, + 19322, 19323, 19324, 19325, 19326, 19327, 19328, 19329, 19330, 19331, + 19332, 19333, 19334, 19335, 19336, 19337, 19338, 19339, 19340, 19341, + 19342, 19343, 19344, 19345, 19346, 19347, 19348, 19349, 19350, 19351, + 19352, 19353, 19354, 19355, 19356, 19357, 19358, 19359, 19360, 19361, + 19362, 19363, 19364, 19365, 19366, 19367, 19368, 19369, 19370, 19371, + 19372, 19373, 19374, 19375, 19376, 19377, 19378, 19379, 19380, 19381, + 19382, 19383, 19384, 19385, 19386, 19387, 19388, 19389, 19390, 19391, + 19392, 19393, 19394, 19395, 19396, 19397, 19398, 19399, 19400, 19401, + 19402, 19403, 19404, 19405, 19406, 19407, 19408, 19409, 19410, 19411, + 19412, 19413, 19414, 19415, 19416, 19417, 19418, 19419, 19420, 19421, + 19422, 19423, 19424, 19425, 19426, 19427, 19428, 19429, 19430, 19431, + 19432, 19433, 19434, 19435, 19436, 19437, 19438, 19439, 19440, 19441, + 19442, 19443, 19444, 19445, 19446, 19447, 19448, 19449, 19450, 19451, + 19452, 19453, 19454, 19455, 19456, 19457, 19458, 19459, 19460, 19461, + 19462, 19463, 19464, 19465, 19466, 19467, 19468, 19469, 19470, 19471, + 19472, 19473, 19474, 19475, 19476, 19477, 19478, 19479, 19480, 19481, + 19482, 19483, 19484, 19485, 19486, 19487, 19488, 19489, 19490, 19491, + 19492, 19493, 19494, 19495, 19496, 19497, 19498, 19499, 19500, 19501, + 19502, 19503, 19504, 19505, 19506, 19507, 19508, 19509, 19510, 19511, + 19512, 19513, 19514, 19515, 19516, 19517, 19518, 19519, 19520, 19521, + 19522, 19523, 19524, 19525, 19526, 19527, 19528, 19529, 19530, 19531, + 19532, 19533, 19534, 19535, 19536, 19537, 19538, 19539, 19540, 19541, + 19542, 19543, 19544, 19545, 19546, 19547, 19548, 19549, 19550, 19551, + 19552, 19553, 19554, 19555, 19556, 19557, 19558, 19559, 19560, 19561, + 19562, 19563, 19564, 19565, 19566, 19567, 19568, 19569, 19570, 19571, + 19572, 19573, 19574, 19575, 19576, 19577, 19578, 19579, 19580, 19581, + 19582, 19583, 19584, 19585, 19586, 19587, 19588, 19589, 19590, 19591, + 19592, 19593, 19594, 19595, 19596, 19597, 19598, 19599, 19600, 19601, + 19602, 19603, 19604, 19605, 19606, 19607, 19608, 19609, 19610, 19611, + 19612, 19613, 19614, 19615, 19616, 19617, 19618, 19619, 19620, 19621, + 19622, 19623, 19624, 19625, 19626, 19627, 19628, 19629, 19630, 19631, + 19632, 19633, 19634, 19635, 19636, 19637, 19638, 19639, 19640, 19641, + 19642, 19643, 19644, 19645, 19646, 19647, 19648, 19649, 19650, 19651, + 19652, 19653, 19654, 19655, 19656, 19657, 19658, 19659, 19660, 19661, + 19662, 19663, 19664, 19665, 19666, 19667, 19668, 19669, 19670, 19671, + 19672, 19673, 19674, 19675, 19676, 19677, 19678, 19679, 19680, 19681, + 19682, 19683, 19684, 19685, 19686, 19687, 19688, 19689, 19690, 19691, + 19692, 19693, 19694, 19695, 19696, 19697, 19698, 19699, 19700, 19701, + 19702, 19703, 19704, 19705, 19706, 19707, 19708, 19709, 19710, 19711, + 19712, 19713, 19714, 19715, 19716, 19717, 19718, 19719, 19720, 19721, + 19722, 19723, 19724, 19725, 19726, 19727, 19728, 19729, 19730, 19731, + 19732, 19733, 19734, 19735, 19736, 19737, 19738, 19739, 19740, 19741, + 19742, 19743, 19744, 19745, 19746, 19747, 19748, 19749, 19750, 19751, + 19752, 19753, 19754, 19755, 19756, 19757, 19758, 19759, 19760, 19761, + 19762, 19763, 19764, 19765, 19766, 19767, 19768, 19769, 19770, 19771, + 19772, 19773, 19774, 19775, 19776, 19777, 19778, 19779, 19780, 19781, + 19782, 19783, 19784, 19785, 19786, 19787, 19788, 19789, 19790, 19791, + 19792, 19793, 19794, 19795, 19796, 19797, 19798, 19799, 19800, 19801, + 19802, 19803, 19804, 19805, 19806, 19807, 19808, 19809, 19810, 19811, + 19812, 19813, 19814, 19815, 19816, 19817, 19818, 19819, 19820, 19821, + 19822, 19823, 19824, 19825, 19826, 19827, 19828, 19829, 19830, 19831, + 19832, 19833, 19834, 19835, 19836, 19837, 19838, 19839, 19840, 19841, + 19842, 19843, 19844, 19845, 19846, 19847, 19848, 19849, 19850, 19851, + 19852, 19853, 19854, 19855, 19856, 19857, 19858, 19859, 19860, 19861, + 19862, 19863, 19864, 19865, 19866, 19867, 19868, 19869, 19870, 19871, + 19872, 19873, 19874, 19875, 19876, 19877, 19878, 19879, 19880, 19881, + 19882, 19883, 19884, 19885, 19886, 19887, 19888, 19889, 19890, 19891, + 19892, 19893, 19894, 19895, 19896, 19897, 19898, 19899, 19900, 19901, + 19902, 19903, 19904, 19905, 19906, 19907, 19908, 19909, 19910, 19911, + 19912, 19913, 19914, 19915, 19916, 19917, 19918, 19919, 19920, 19921, + 19922, 19923, 19924, 19925, 19926, 19927, 19928, 19929, 19930, 19931, + 19932, 19933, 19934, 19935, 19936, 19937, 19938, 19939, 19940, 19941, + 19942, 19943, 19944, 19945, 19946, 19947, 19948, 19949, 19950, 19951, + 19952, 19953, 19954, 19955, 19956, 19957, 19958, 19959, 19960, 19961, + 19962, 19963, 19964, 19965, 19966, 19967, 19968, 19969, 19970, 19971, + 19972, 19973, 19974, 19975, 19976, 19977, 19978, 19979, 19980, 19981, + 19982, 19983, 19984, 19985, 19986, 19987, 19988, 19989, 19990, 19991, + 19992, 19993, 19994, 19995, 19996, 19997, 19998, 19999, 20000, 20001, + 20002, 20003, 20004, 20005, 20006, 20007, 20008, 20009, 20010, 20011, + 20012, 20013, 20014, 20015, 20016, 20017, 20018, 20019, 20020, 20021, + 20022, 20023, 20024, 20025, 20026, 20027, 20028, 20029, 20030, 20031, + 20032, 20033, 20034, 20035, 20036, 20037, 20038, 20039, 20040, 20041, + 20042, 20043, 20044, 20045, 20046, 20047, 20048, 20049, 20050, 20051, + 20052, 20053, 20054, 20055, 20056, 20057, 20058, 20059, 20060, 20061, + 20062, 20063, 20064, 20065, 20066, 20067, 20068, 20069, 20070, 20071, + 20072, 20073, 20074, 20075, 20076, 20077, 20078, 20079, 20080, 20081, + 20082, 20083, 20084, 20085, 20086, 20087, 20088, 20089, 20090, 20091, + 20092, 20093, 20094, 20095, 20096, 20097, 20098, 20099, 20100, 20101, + 20102, 20103, 20104, 20105, 20106, 20107, 20108, 20109, 20110, 20111, + 20112, 20113, 20114, 20115, 20116, 20117, 20118, 20119, 20120, 20121, + 20122, 20123, 20124, 20125, 20126, 20127, 20128, 20129, 20130, 20131, + 20132, 20133, 20134, 20135, 20136, 20137, 20138, 20139, 20140, 20141, + 20142, 20143, 20144, 20145, 20146, 20147, 20148, 20149, 20150, 20151, + 20152, 20153, 20154, 20155, 20156, 20157, 20158, 20159, 20160, 20161, + 20162, 20163, 20164, 20165, 20166, 20167, 20168, 20169, 20170, 20171, + 20172, 20173, 20174, 20175, 20176, 20177, 20178, 20179, 20180, 20181, + 20182, 20183, 20184, 20185, 20186, 20187, 20188, 20189, 20190, 20191, + 20192, 20193, 20194, 20195, 20196, 20197, 20198, 20199, 20200, 20201, + 20202, 20203, 20204, 20205, 20206, 20207, 20208, 20209, 20210, 20211, + 20212, 20213, 20214, 20215, 20216, 20217, 20218, 20219, 20220, 20221, + 20222, 20223, 20224, 20225, 20226, 20227, 20228, 20229, 20230, 20231, + 20232, 20233, 20234, 20235, 20236, 20237, 20238, 20239, 20240, 20241, + 20242, 20243, 20244, 20245, 20246, 20247, 20248, 20249, 20250, 20251, + 20252, 20253, 20254, 20255, 20256, 20257, 20258, 20259, 20260, 20261, + 20262, 20263, 20264, 20265, 20266, 20267, 20268, 20269, 20270, 20271, + 20272, 20273, 20274, 20275, 20276, 20277, 20278, 20279, 20280, 20281, + 20282, 20283, 20284, 20285, 20286, 20287, 20288, 20289, 20290, 20291, + 20292, 20293, 20294, 20295, 20296, 20297, 20298, 20299, 20300, 20301, + 20302, 20303, 20304, 20305, 20306, 20307, 20308, 20309, 20310, 20311, + 20312, 20313, 20314, 20315, 20316, 20317, 20318, 20319, 20320, 20321, + 20322, 20323, 20324, 20325, 20326, 20327, 20328, 20329, 20330, 20331, + 20332, 20333, 20334, 20335, 20336, 20337, 20338, 20339, 20340, 20341, + 20342, 20343, 20344, 20345, 20346, 20347, 20348, 20349, 20350, 20351, + 20352, 20353, 20354, 20355, 20356, 20357, 20358, 20359, 20360, 20361, + 20362, 20363, 20364, 20365, 20366, 20367, 20368, 20369, 20370, 20371, + 20372, 20373, 20374, 20375, 20376, 20377, 20378, 20379, 20380, 20381, + 20382, 20383, 20384, 20385, 20386, 20387, 20388, 20389, 20390, 20391, + 20392, 20393, 20394, 20395, 20396, 20397, 20398, 20399, 20400, 20401, + 20402, 20403, 20404, 20405, 20406, 20407, 20408, 20409, 20410, 20411, + 20412, 20413, 20414, 20415, 20416, 20417, 20418, 20419, 20420, 20421, + 20422, 20423, 20424, 20425, 20426, 20427, 20428, 20429, 20430, 20431, + 20432, 20433, 20434, 20435, 20436, 20437, 20438, 20439, 20440, 20441, + 20442, 20443, 20444, 20445, 20446, 20447, 20448, 20449, 20450, 20451, + 20452, 20453, 20454, 20455, 20456, 20457, 20458, 20459, 20460, 20461, + 20462, 20463, 20464, 20465, 20466, 20467, 20468, 20469, 20470, 20471, + 20472, 20473, 20474, 20475, 20476, 20477, 20478, 20479, 20480, 20481, + 20482, 20483, 20484, 20485, 20486, 20487, 20488, 20489, 20490, 20491, + 20492, 20493, 20494, 20495, 20496, 20497, 20498, 20499, 20500, 20501, + 20502, 20503, 20504, 20505, 20506, 20507, 20508, 20509, 20510, 20511, + 20512, 20513, 20514, 20515, 20516, 20517, 20518, 20519, 20520, 20521, + 20522, 20523, 20524, 20525, 20526, 20527, 20528, 20529, 20530, 20531, + 20532, 20533, 20534, 20535, 20536, 20537, 20538, 20539, 20540, 20541, + 20542, 20543, 20544, 20545, 20546, 20547, 20548, 20549, 20550, 20551, + 20552, 20553, 20554, 20555, 20556, 20557, 20558, 20559, 20560, 20561, + 20562, 20563, 20564, 20565, 20566, 20567, 20568, 20569, 20570, 20571, + 20572, 20573, 20574, 20575, 20576, 20577, 20578, 20579, 20580, 20581, + 20582, 20583, 20584, 20585, 20586, 20587, 20588, 20589, 20590, 20591, + 20592, 20593, 20594, 20595, 20596, 20597, 20598, 20599, 20600, 20601, + 20602, 20603, 20604, 20605, 20606, 20607, 20608, 20609, 20610, 20611, + 20612, 20613, 20614, 20615, 20616, 20617, 20618, 20619, 20620, 20621, + 20622, 20623, 20624, 20625, 20626, 20627, 20628, 20629, 20630, 20631, + 20632, 20633, 20634, 20635, 20636, 20637, 20638, 20639, 20640, 20641, + 20642, 20643, 20644, 20645, 20646, 20647, 20648, 20649, 20650, 20651, + 20652, 20653, 20654, 20655, 20656, 20657, 20658, 20659, 20660, 20661, + 20662, 20663, 20664, 20665, 20666, 20667, 20668, 20669, 20670, 20671, + 20672, 20673, 20674, 20675, 20676, 20677, 20678, 20679, 20680, 20681, + 20682, 20683, 20684, 20685, 20686, 20687, 20688, 20689, 20690, 20691, + 20692, 20693, 20694, 20695, 20696, 20697, 20698, 20699, 20700, 20701, + 20702, 20703, 20704, 20705, 20706, 20707, 20708, 20709, 20710, 20711, + 20712, 20713, 20714, 20715, 20716, 20717, 20718, 20719, 20720, 20721, + 20722, 20723, 20724, 20725, 20726, 20727, 20728, 20729, 20730, 20731, + 20732, 20733, 20734, 20735, 20736, 20737, 20738, 20739, 20740, 20741, + 20742, 20743, 20744, 20745, 20746, 20747, 20748, 20749, 20750, 20751, + 20752, 20753, 20754, 20755, 20756, 20757, 20758, 20759, 20760, 20761, + 20762, 20763, 20764, 20765, 20766, 20767, 20768, 20769, 20770, 20771, + 20772, 20773, 20774, 20775, 20776, 20777, 20778, 20779, 20780, 20781, + 20782, 20783, 20784, 20785, 20786, 20787, 20788, 20789, 20790, 20791, + 20792, 20793, 20794, 20795, 20796, 20797, 20798, 20799, 20800, 20801, + 20802, 20803, 20804, 20805, 20806, 20807, 20808, 20809, 20810, 20811, + 20812, 20813, 20814, 20815, 20816, 20817, 20818, 20819, 20820, 20821, + 20822, 20823, 20824, 20825, 20826, 20827, 20828, 20829, 20830, 20831, + 20832, 20833, 20834, 20835, 20836, 20837, 20838, 20839, 20840, 20841, + 20842, 20843, 20844, 20845, 20846, 20847, 20848, 20849, 20850, 20851, + 20852, 20853, 20854, 20855, 20856, 20857, 20858, 20859, 20860, 20861, + 20862, 20863, 20864, 20865, 20866, 20867, 20868, 20869, 20870, 20871, + 20872, 20873, 20874, 20875, 20876, 20877, 20878, 20879, 20880, 20881, + 20882, 20883, 20884, 20885, 20886, 20887, 20888, 20889, 20890, 20891, + 20892, 20893, 20894, 20895, 20896, 20897, 20898, 20899, 20900, 20901, + 20902, 20903, 20904, 20905, 20906, 20907, 20908, 20909, 20910, 20911, + 20912, 20913, 20914, 20915, 20916, 20917, 20918, 20919, 20920, 20921, + 20922, 20923, 20924, 20925, 20926, 20927, 20928, 20929, 20930, 20931, + 20932, 20933, 20934, 20935, 20936, 20937, 20938, 20939, 20940, 20941, + 20942, 20943, 20944, 20945, 20946, 20947, 20948, 20949, 20950, 20951, + 20952, 20953, 20954, 20955, 20956, 20957, 20958, 20959, 20960, 20961, + 20962, 20963, 20964, 20965, 20966, 20967, 20968, 20969, 20970, 20971, + 20972, 20973, 20974, 20975, 20976, 20977, 20978, 20979, 20980, 20981, + 20982, 20983, 20984, 20985, 20986, 20987, 20988, 20989, 20990, 20991, + 20992, 20993, 20994, 20995, 20996, 20997, 20998, 20999, 21000, 21001, + 21002, 21003, 21004, 21005, 21006, 21007, 21008, 21009, 21010, 21011, + 21012, 21013, 21014, 21015, 21016, 21017, 21018, 21019, 21020, 21021, + 21022, 21023, 21024, 21025, 21026, 21027, 21028, 21029, 21030, 21031, + 21032, 21033, 21034, 21035, 21036, 21037, 21038, 21039, 21040, 21041, + 21042, 21043, 21044, 21045, 21046, 21047, 21048, 21049, 21050, 21051, + 21052, 21053, 21054, 21055, 21056, 21057, 21058, 21059, 21060, 21061, + 21062, 21063, 21064, 21065, 21066, 21067, 21068, 21069, 21070, 21071, + 21072, 21073, 21074, 21075, 21076, 21077, 21078, 21079, 21080, 21081, + 21082, 21083, 21084, 21085, 21086, 21087, 21088, 21089, 21090, 21091, + 21092, 21093, 21094, 21095, 21096, 21097, 21098, 21099, 21100, 21101, + 21102, 21103, 21104, 21105, 21106, 21107, 21108, 21109, 21110, 21111, + 21112, 21113, 21114, 21115, 21116, 21117, 21118, 21119, 21120, 21121, + 21122, 21123, 21124, 21125, 21126, 21127, 21128, 21129, 21130, 21131, + 21132, 21133, 21134, 21135, 21136, 21137, 21138, 21139, 21140, 21141, + 21142, 21143, 21144, 21145, 21146, 21147, 21148, 21149, 21150, 21151, + 21152, 21153, 21154, 21155, 21156, 21157, 21158, 21159, 21160, 21161, + 21162, 21163, 21164, 21165, 21166, 21167, 21168, 21169, 21170, 21171, + 21172, 21173, 21174, 21175, 21176, 21177, 21178, 21179, 21180, 21181, + 21182, 21183, 21184, 21185, 21186, 21187, 21188, 21189, 21190, 21191, + 21192, 21193, 21194, 21195, 21196, 21197, 21198, 21199, 21200, 21201, + 21202, 21203, 21204, 21205, 21206, 21207, 21208, 21209, 21210, 21211, + 21212, 21213, 21214, 21215, 21216, 21217, 21218, 21219, 21220, 21221, + 21222, 21223, 21224, 21225, 21226, 21227, 21228, 21229, 21230, 21231, + 21232, 21233, 21234, 21235, 21236, 21237, 21238, 21239, 21240, 21241, + 21242, 21243, 21244, 21245, 21246, 21247, 21248, 21249, 21250, 21251, + 21252, 21253, 21254, 21255, 21256, 21257, 21258, 21259, 21260, 21261, + 21262, 21263, 21264, 21265, 21266, 21267, 21268, 21269, 21270, 21271, + 21272, 21273, 21274, 21275, 21276, 21277, 21278, 21279, 21280, 21281, + 21282, 21283, 21284, 21285, 21286, 21287, 21288, 21289, 21290, 21291, + 21292, 21293, 21294, 21295, 21296, 21297, 21298, 21299, 21300, 21301, + 21302, 21303, 21304, 21305, 21306, 21307, 21308, 21309, 21310, 21311, + 21312, 21313, 21314, 21315, 21316, 21317, 21318, 21319, 21320, 21321, + 21322, 21323, 21324, 21325, 21326, 21327, 21328, 21329, 21330, 21331, + 21332, 21333, 21334, 21335, 21336, 21337, 21338, 21339, 21340, 21341, + 21342, 21343, 21344, 21345, 21346, 21347, 21348, 21349, 21350, 21351, + 21352, 21353, 21354, 21355, 21356, 21357, 21358, 21359, 21360, 21361, + 21362, 21363, 21364, 21365, 21366, 21367, 21368, 21369, 21370, 21371, + 21372, 21373, 21374, 21375, 21376, 21377, 21378, 21379, 21380, 21381, + 21382, 21383, 21384, 21385, 21386, 21387, 21388, 21389, 21390, 21391, + 21392, 21393, 21394, 21395, 21396, 21397, 21398, 21399, 21400, 21401, + 21402, 21403, 21404, 21405, 21406, 21407, 21408, 21409, 21410, 21411, + 21412, 21413, 21414, 21415, 21416, 21417, 21418, 21419, 21420, 21421, + 21422, 21423, 21424, 21425, 21426, 21427, 21428, 21429, 21430, 21431, + 21432, 21433, 21434, 21435, 21436, 21437, 21438, 21439, 21440, 21441, + 21442, 21443, 21444, 21445, 21446, 21447, 21448, 21449, 21450, 21451, + 21452, 21453, 21454, 21455, 21456, 21457, 21458, 21459, 21460, 21461, + 21462, 21463, 21464, 21465, 21466, 21467, 21468, 21469, 21470, 21471, + 21472, 21473, 21474, 21475, 21476, 21477, 21478, 21479, 21480, 21481, + 21482, 21483, 21484, 21485, 21486, 21487, 21488, 21489, 21490, 21491, + 21492, 21493, 21494, 21495, 21496, 21497, 21498, 21499, 21500, 21501, + 21502, 21503, 21504, 21505, 21506, 21507, 21508, 21509, 21510, 21511, + 21512, 21513, 21514, 21515, 21516, 21517, 21518, 21519, 21520, 21521, + 21522, 21523, 21524, 21525, 21526, 21527, 21528, 21529, 21530, 21531, + 21532, 21533, 21534, 21535, 21536, 21537, 21538, 21539, 21540, 21541, + 21542, 21543, 21544, 21545, 21546, 21547, 21548, 21549, 21550, 21551, + 21552, 21553, 21554, 21555, 21556, 21557, 21558, 21559, 21560, 21561, + 21562, 21563, 21564, 21565, 21566, 21567, 21568, 21569, 21570, 21571, + 21572, 21573, 21574, 21575, 21576, 21577, 21578, 21579, 21580, 21581, + 21582, 21583, 21584, 21585, 21586, 21587, 21588, 21589, 21590, 21591, + 21592, 21593, 21594, 21595, 21596, 21597, 21598, 21599, 21600, 21601, + 21602, 21603, 21604, 21605, 21606, 21607, 21608, 21609, 21610, 21611, + 21612, 21613, 21614, 21615, 21616, 21617, 21618, 21619, 21620, 21621, + 21622, 21623, 21624, 21625, 21626, 21627, 21628, 21629, 21630, 21631, + 21632, 21633, 21634, 21635, 21636, 21637, 21638, 21639, 21640, 21641, + 21642, 21643, 21644, 21645, 21646, 21647, 21648, 21649, 21650, 21651, + 21652, 21653, 21654, 21655, 21656, 21657, 21658, 21659, 21660, 21661, + 21662, 21663, 21664, 21665, 21666, 21667, 21668, 21669, 21670, 21671, + 21672, 21673, 21674, 21675, 21676, 21677, 21678, 21679, 21680, 21681, + 21682, 21683, 21684, 21685, 21686, 21687, 21688, 21689, 21690, 21691, + 21692, 21693, 21694, 21695, 21696, 21697, 21698, 21699, 21700, 21701, + 21702, 21703, 21704, 21705, 21706, 21707, 21708, 21709, 21710, 21711, + 21712, 21713, 21714, 21715, 21716, 21717, 21718, 21719, 21720, 21721, + 21722, 21723, 21724, 21725, 21726, 21727, 21728, 21729, 21730, 21731, + 21732, 21733, 21734, 21735, 21736, 21737, 21738, 21739, 21740, 21741, + 21742, 21743, 21744, 21745, 21746, 21747, 21748, 21749, 21750, 21751, + 21752, 21753, 21754, 21755, 21756, 21757, 21758, 21759, 21760, 21761, + 21762, 21763, 21764, 21765, 21766, 21767, 21768, 21769, 21770, 21771, + 21772, 21773, 21774, 21775, 21776, 21777, 21778, 21779, 21780, 21781, + 21782, 21783, 21784, 21785, 21786, 21787, 21788, 21789, 21790, 21791, + 21792, 21793, 21794, 21795, 21796, 21797, 21798, 21799, 21800, 21801, + 21802, 21803, 21804, 21805, 21806, 21807, 21808, 21809, 21810, 21811, + 21812, 21813, 21814, 21815, 21816, 21817, 21818, 21819, 21820, 21821, + 21822, 21823, 21824, 21825, 21826, 21827, 21828, 21829, 21830, 21831, + 21832, 21833, 21834, 21835, 21836, 21837, 21838, 21839, 21840, 21841, + 21842, 21843, 21844, 21845, 21846, 21847, 21848, 21849, 21850, 21851, + 21852, 21853, 21854, 21855, 21856, 21857, 21858, 21859, 21860, 21861, + 21862, 21863, 21864, 21865, 21866, 21867, 21868, 21869, 21870, 21871, + 21872, 21873, 21874, 21875, 21876, 21877, 21878, 21879, 21880, 21881, + 21882, 21883, 21884, 21885, 21886, 21887, 21888, 21889, 21890, 21891, + 21892, 21893, 21894, 21895, 21896, 21897, 21898, 21899, 21900, 21901, + 21902, 21903, 21904, 21905, 21906, 21907, 21908, 21909, 21910, 21911, + 21912, 21913, 21914, 21915, 21916, 21917, 21918, 21919, 21920, 21921, + 21922, 21923, 21924, 21925, 21926, 21927, 21928, 21929, 21930, 21931, + 21932, 21933, 21934, 21935, 21936, 21937, 21938, 21939, 21940, 21941, + 21942, 21943, 21944, 21945, 21946, 21947, 21948, 21949, 21950, 21951, + 21952, 21953, 21954, 21955, 21956, 21957, 21958, 21959, 21960, 21961, + 21962, 21963, 21964, 21965, 21966, 21967, 21968, 21969, 21970, 21971, + 21972, 21973, 21974, 21975, 21976, 21977, 21978, 21979, 21980, 21981, + 21982, 21983, 21984, 21985, 21986, 21987, 21988, 21989, 21990, 21991, + 21992, 21993, 21994, 21995, 21996, 21997, 21998, 21999, 22000, 22001, + 22002, 22003, 22004, 22005, 22006, 22007, 22008, 22009, 22010, 22011, + 22012, 22013, 22014, 22015, 22016, 22017, 22018, 22019, 22020, 22021, + 22022, 22023, 22024, 22025, 22026, 22027, 22028, 22029, 22030, 22031, + 22032, 22033, 22034, 22035, 22036, 22037, 22038, 22039, 22040, 22041, + 22042, 22043, 22044, 22045, 22046, 22047, 22048, 22049, 22050, 22051, + 22052, 22053, 22054, 22055, 22056, 22057, 22058, 22059, 22060, 22061, + 22062, 22063, 22064, 22065, 22066, 22067, 22068, 22069, 22070, 22071, + 22072, 22073, 22074, 22075, 22076, 22077, 22078, 22079, 22080, 22081, + 22082, 22083, 22084, 22085, 22086, 22087, 22088, 22089, 22090, 22091, + 22092, 22093, 22094, 22095, 22096, 22097, 22098, 22099, 22100, 22101, + 22102, 22103, 22104, 22105, 22106, 22107, 22108, 22109, 22110, 22111, + 22112, 22113, 22114, 22115, 22116, 22117, 22118, 22119, 22120, 22121, + 22122, 22123, 22124, 22125, 22126, 22127, 22128, 22129, 22130, 22131, + 22132, 22133, 22134, 22135, 22136, 22137, 22138, 22139, 22140, 22141, + 22142, 22143, 22144, 22145, 22146, 22147, 22148, 22149, 22150, 22151, + 22152, 22153, 22154, 22155, 22156, 22157, 22158, 22159, 22160, 22161, + 22162, 22163, 22164, 22165, 22166, 22167, 22168, 22169, 22170, 22171, + 22172, 22173, 22174, 22175, 22176, 22177, 22178, 22179, 22180, 22181, + 22182, 22183, 22184, 22185, 22186, 22187, 22188, 22189, 22190, 22191, + 22192, 22193, 22194, 22195, 22196, 22197, 22198, 22199, 22200, 22201, + 22202, 22203, 22204, 22205, 22206, 22207, 22208, 22209, 22210, 22211, + 22212, 22213, 22214, 22215, 22216, 22217, 22218, 22219, 22220, 22221, + 22222, 22223, 22224, 22225, 22226, 22227, 22228, 22229, 22230, 22231, + 22232, 22233, 22234, 22235, 22236, 22237, 22238, 22239, 22240, 22241, + 22242, 22243, 22244, 22245, 22246, 22247, 22248, 22249, 22250, 22251, + 22252, 22253, 22254, 22255, 22256, 22257, 22258, 22259, 22260, 22261, + 22262, 22263, 22264, 22265, 22266, 22267, 22268, 22269, 22270, 22271, + 22272, 22273, 22274, 22275, 22276, 22277, 22278, 22279, 22280, 22281, + 22282, 22283, 22284, 22285, 22286, 22287, 22288, 22289, 22290, 22291, + 22292, 22293, 22294, 22295, 22296, 22297, 22298, 22299, 22300, 22301, + 22302, 22303, 22304, 22305, 22306, 22307, 22308, 22309, 22310, 22311, + 22312, 22313, 22314, 22315, 22316, 22317, 22318, 22319, 22320, 22321, + 22322, 22323, 22324, 22325, 22326, 22327, 22328, 22329, 22330, 22331, + 22332, 22333, 22334, 22335, 22336, 22337, 22338, 22339, 22340, 22341, + 22342, 22343, 22344, 22345, 22346, 22347, 22348, 22349, 22350, 22351, + 22352, 22353, 22354, 22355, 22356, 22357, 22358, 22359, 22360, 22361, + 22362, 22363, 22364, 22365, 22366, 22367, 22368, 22369, 22370, 22371, + 22372, 22373, 22374, 22375, 22376, 22377, 22378, 22379, 22380, 22381, + 22382, 22383, 22384, 22385, 22386, 22387, 22388, 22389, 22390, 22391, + 22392, 22393, 22394, 22395, 22396, 22397, 22398, 22399, 22400, 22401, + 22402, 22403, 22404, 22405, 22406, 22407, 22408, 22409, 22410, 22411, + 22412, 22413, 22414, 22415, 22416, 22417, 22418, 22419, 22420, 22421, + 22422, 22423, 22424, 22425, 22426, 22427, 22428, 22429, 22430, 22431, + 22432, 22433, 22434, 22435, 22436, 22437, 22438, 22439, 22440, 22441, + 22442, 22443, 22444, 22445, 22446, 22447, 22448, 22449, 22450, 22451, + 22452, 22453, 22454, 22455, 22456, 22457, 22458, 22459, 22460, 22461, + 22462, 22463, 22464, 22465, 22466, 22467, 22468, 22469, 22470, 22471, + 22472, 22473, 22474, 22475, 22476, 22477, 22478, 22479, 22480, 22481, + 22482, 22483, 22484, 22485, 22486, 22487, 22488, 22489, 22490, 22491, + 22492, 22493, 22494, 22495, 22496, 22497, 22498, 22499, 22500, 22501, + 22502, 22503, 22504, 22505, 22506, 22507, 22508, 22509, 22510, 22511, + 22512, 22513, 22514, 22515, 22516, 22517, 22518, 22519, 22520, 22521, + 22522, 22523, 22524, 22525, 22526, 22527, 22528, 22529, 22530, 22531, + 22532, 22533, 22534, 22535, 22536, 22537, 22538, 22539, 22540, 22541, + 22542, 22543, 22544, 22545, 22546, 22547, 22548, 22549, 22550, 22551, + 22552, 22553, 22554, 22555, 22556, 22557, 22558, 22559, 22560, 22561, + 22562, 22563, 22564, 22565, 22566, 22567, 22568, 22569, 22570, 22571, + 22572, 22573, 22574, 22575, 22576, 22577, 22578, 22579, 22580, 22581, + 22582, 22583, 22584, 22585, 22586, 22587, 22588, 22589, 22590, 22591, + 22592, 22593, 22594, 22595, 22596, 22597, 22598, 22599, 22600, 22601, + 22602, 22603, 22604, 22605, 22606, 22607, 22608, 22609, 22610, 22611, + 22612, 22613, 22614, 22615, 22616, 22617, 22618, 22619, 22620, 22621, + 22622, 22623, 22624, 22625, 22626, 22627, 22628, 22629, 22630, 22631, + 22632, 22633, 22634, 22635, 22636, 22637, 22638, 22639, 22640, 22641, + 22642, 22643, 22644, 22645, 22646, 22647, 22648, 22649, 22650, 22651, + 22652, 22653, 22654, 22655, 22656, 22657, 22658, 22659, 22660, 22661, + 22662, 22663, 22664, 22665, 22666, 22667, 22668, 22669, 22670, 22671, + 22672, 22673, 22674, 22675, 22676, 22677, 22678, 22679, 22680, 22681, + 22682, 22683, 22684, 22685, 22686, 22687, 22688, 22689, 22690, 22691, + 22692, 22693, 22694, 22695, 22696, 22697, 22698, 22699, 22700, 22701, + 22702, 22703, 22704, 22705, 22706, 22707, 22708, 22709, 22710, 22711, + 22712, 22713, 22714, 22715, 22716, 22717, 22718, 22719, 22720, 22721, + 22722, 22723, 22724, 22725, 22726, 22727, 22728, 22729, 22730, 22731, + 22732, 22733, 22734, 22735, 22736, 22737, 22738, 22739, 22740, 22741, + 22742, 22743, 22744, 22745, 22746, 22747, 22748, 22749, 22750, 22751, + 22752, 22753, 22754, 22755, 22756, 22757, 22758, 22759, 22760, 22761, + 22762, 22763, 22764, 22765, 22766, 22767, 22768, 22769, 22770, 22771, + 22772, 22773, 22774, 22775, 22776, 22777, 22778, 22779, 22780, 22781, + 22782, 22783, 22784, 22785, 22786, 22787, 22788, 22789, 22790, 22791, + 22792, 22793, 22794, 22795, 22796, 22797, 22798, 22799, 22800, 22801, + 22802, 22803, 22804, 22805, 22806, 22807, 22808, 22809, 22810, 22811, + 22812, 22813, 22814, 22815, 22816, 22817, 22818, 22819, 22820, 22821, + 22822, 22823, 22824, 22825, 22826, 22827, 22828, 22829, 22830, 22831, + 22832, 22833, 22834, 22835, 22836, 22837, 22838, 22839, 22840, 22841, + 22842, 22843, 22844, 22845, 22846, 22847, 22848, 22849, 22850, 22851, + 22852, 22853, 22854, 22855, 22856, 22857, 22858, 22859, 22860, 22861, + 22862, 22863, 22864, 22865, 22866, 22867, 22868, 22869, 22870, 22871, + 22872, 22873, 22874, 22875, 22876, 22877, 22878, 22879, 22880, 22881, + 22882, 22883, 22884, 22885, 22886, 22887, 22888, 22889, 22890, 22891, + 22892, 22893, 22894, 22895, 22896, 22897, 22898, 22899, 22900, 22901, + 22902, 22903, 22904, 22905, 22906, 22907, 22908, 22909, 22910, 22911, + 22912, 22913, 22914, 22915, 22916, 22917, 22918, 22919, 22920, 22921, + 22922, 22923, 22924, 22925, 22926, 22927, 22928, 22929, 22930, 22931, + 22932, 22933, 22934, 22935, 22936, 22937, 22938, 22939, 22940, 22941, + 22942, 22943, 22944, 22945, 22946, 22947, 22948, 22949, 22950, 22951, + 22952, 22953, 22954, 22955, 22956, 22957, 22958, 22959, 22960, 22961, + 22962, 22963, 22964, 22965, 22966, 22967, 22968, 22969, 22970, 22971, + 22972, 22973, 22974, 22975, 22976, 22977, 22978, 22979, 22980, 22981, + 22982, 22983, 22984, 22985, 22986, 22987, 22988, 22989, 22990, 22991, + 22992, 22993, 22994, 22995, 22996, 22997, 22998, 22999, 23000, 23001, + 23002, 23003, 23004, 23005, 23006, 23007, 23008, 23009, 23010, 23011, + 23012, 23013, 23014, 23015, 23016, 23017, 23018, 23019, 23020, 23021, + 23022, 23023, 23024, 23025, 23026, 23027, 23028, 23029, 23030, 23031, + 23032, 23033, 23034, 23035, 23036, 23037, 23038, 23039, 23040, 23041, + 23042, 23043, 23044, 23045, 23046, 23047, 23048, 23049, 23050, 23051, + 23052, 23053, 23054, 23055, 23056, 23057, 23058, 23059, 23060, 23061, + 23062, 23063, 23064, 23065, 23066, 23067, 23068, 23069, 23070, 23071, + 23072, 23073, 23074, 23075, 23076, 23077, 23078, 23079, 23080, 23081, + 23082, 23083, 23084, 23085, 23086, 23087, 23088, 23089, 23090, 23091, + 23092, 23093, 23094, 23095, 23096, 23097, 23098, 23099, 23100, 23101, + 23102, 23103, 23104, 23105, 23106, 23107, 23108, 23109, 23110, 23111, + 23112, 23113, 23114, 23115, 23116, 23117, 23118, 23119, 23120, 23121, + 23122, 23123, 23124, 23125, 23126, 23127, 23128, 23129, 23130, 23131, + 23132, 23133, 23134, 23135, 23136, 23137, 23138, 23139, 23140, 23141, + 23142, 23143, 23144, 23145, 23146, 23147, 23148, 23149, 23150, 23151, + 23152, 23153, 23154, 23155, 23156, 23157, 23158, 23159, 23160, 23161, + 23162, 23163, 23164, 23165, 23166, 23167, 23168, 23169, 23170, 23171, + 23172, 23173, 23174, 23175, 23176, 23177, 23178, 23179, 23180, 23181, + 23182, 23183, 23184, 23185, 23186, 23187, 23188, 23189, 23190, 23191, + 23192, 23193, 23194, 23195, 23196, 23197, 23198, 23199, 23200, 23201, + 23202, 23203, 23204, 23205, 23206, 23207, 23208, 23209, 23210, 23211, + 23212, 23213, 23214, 23215, 23216, 23217, 23218, 23219, 23220, 23221, + 23222, 23223, 23224, 23225, 23226, 23227, 23228, 23229, 23230, 23231, + 23232, 23233, 23234, 23235, 23236, 23237, 23238, 23239, 23240, 23241, + 23242, 23243, 23244, 23245, 23246, 23247, 23248, 23249, 23250, 23251, + 23252, 23253, 23254, 23255, 23256, 23257, 23258, 23259, 23260, 23261, + 23262, 23263, 23264, 23265, 23266, 23267, 23268, 23269, 23270, 23271, + 23272, 23273, 23274, 23275, 23276, 23277, 23278, 23279, 23280, 23281, + 23282, 23283, 23284, 23285, 23286, 23287, 23288, 23289, 23290, 23291, + 23292, 23293, 23294, 23295, 23296, 23297, 23298, 23299, 23300, 23301, + 23302, 23303, 23304, 23305, 23306, 23307, 23308, 23309, 23310, 23311, + 23312, 23313, 23314, 23315, 23316, 23317, 23318, 23319, 23320, 23321, + 23322, 23323, 23324, 23325, 23326, 23327, 23328, 23329, 23330, 23331, + 23332, 23333, 23334, 23335, 23336, 23337, 23338, 23339, 23340, 23341, + 23342, 23343, 23344, 23345, 23346, 23347, 23348, 23349, 23350, 23351, + 23352, 23353, 23354, 23355, 23356, 23357, 23358, 23359, 23360, 23361, + 23362, 23363, 23364, 23365, 23366, 23367, 23368, 23369, 23370, 23371, + 23372, 23373, 23374, 23375, 23376, 23377, 23378, 23379, 23380, 23381, + 23382, 23383, 23384, 23385, 23386, 23387, 23388, 23389, 23390, 23391, + 23392, 23393, 23394, 23395, 23396, 23397, 23398, 23399, 23400, 23401, + 23402, 23403, 23404, 23405, 23406, 23407, 23408, 23409, 23410, 23411, + 23412, 23413, 23414, 23415, 23416, 23417, 23418, 23419, 23420, 23421, + 23422, 23423, 23424, 23425, 23426, 23427, 23428, 23429, 23430, 23431, + 23432, 23433, 23434, 23435, 23436, 23437, 23438, 23439, 23440, 23441, + 23442, 23443, 23444, 23445, 23446, 23447, 23448, 23449, 23450, 23451, + 23452, 23453, 23454, 23455, 23456, 23457, 23458, 23459, 23460, 23461, + 23462, 23463, 23464, 23465, 23466, 23467, 23468, 23469, 23470, 23471, + 23472, 23473, 23474, 23475, 23476, 23477, 23478, 23479, 23480, 23481, + 23482, 23483, 23484, 23485, 23486, 23487, 23488, 23489, 23490, 23491, + 23492, 23493, 23494, 23495, 23496, 23497, 23498, 23499, 23500, 23501, + 23502, 23503, 23504, 23505, 23506, 23507, 23508, 23509, 23510, 23511, + 23512, 23513, 23514, 23515, 23516, 23517, 23518, 23519, 23520, 23521, + 23522, 23523, 23524, 23525, 23526, 23527, 23528, 23529, 23530, 23531, + 23532, 23533, 23534, 23535, 23536, 23537, 23538, 23539, 23540, 23541, + 23542, 23543, 23544, 23545, 23546, 23547, 23548, 23549, 23550, 23551, + 23552, 23553, 23554, 23555, 23556, 23557, 23558, 23559, 23560, 23561, + 23562, 23563, 23564, 23565, 23566, 23567, 23568, 23569, 23570, 23571, + 23572, 23573, 23574, 23575, 23576, 23577, 23578, 23579, 23580, 23581, + 23582, 23583, 23584, 23585, 23586, 23587, 23588, 23589, 23590, 23591, + 23592, 23593, 23594, 23595, 23596, 23597, 23598, 23599, 23600, 23601, + 23602, 23603, 23604, 23605, 23606, 23607, 23608, 23609, 23610, 23611, + 23612, 23613, 23614, 23615, 23616, 23617, 23618, 23619, 23620, 23621, + 23622, 23623, 23624, 23625, 23626, 23627, 23628, 23629, 23630, 23631, + 23632, 23633, 23634, 23635, 23636, 23637, 23638, 23639, 23640, 23641, + 23642, 23643, 23644, 23645, 23646, 23647, 23648, 23649, 23650, 23651, + 23652, 23653, 23654, 23655, 23656, 23657, 23658, 23659, 23660, 23661, + 23662, 23663, 23664, 23665, 23666, 23667, 23668, 23669, 23670, 23671, + 23672, 23673, 23674, 23675, 23676, 23677, 23678, 23679, 23680, 23681, + 23682, 23683, 23684, 23685, 23686, 23687, 23688, 23689, 23690, 23691, + 23692, 23693, 23694, 23695, 23696, 23697, 23698, 23699, 23700, 23701, + 23702, 23703, 23704, 23705, 23706, 23707, 23708, 23709, 23710, 23711, + 23712, 23713, 23714, 23715, 23716, 23717, 23718, 23719, 23720, 23721, + 23722, 23723, 23724, 23725, 23726, 23727, 23728, 23729, 23730, 23731, + 23732, 23733, 23734, 23735, 23736, 23737, 23738, 23739, 23740, 23741, + 23742, 23743, 23744, 23745, 23746, 23747, 23748, 23749, 23750, 23751, + 23752, 23753, 23754, 23755, 23756, 23757, 23758, 23759, 23760, 23761, + 23762, 23763, 23764, 23765, 23766, 23767, 23768, 23769, 23770, 23771, + 23772, 23773, 23774, 23775, 23776, 23777, 23778, 23779, 23780, 23781, + 23782, 23783, 23784, 23785, 23786, 23787, 23788, 23789, 23790, 23791, + 23792, 23793, 23794, 23795, 23796, 23797, 23798, 23799, 23800, 23801, + 23802, 23803, 23804, 23805, 23806, 23807, 23808, 23809, 23810, 23811, + 23812, 23813, 23814, 23815, 23816, 23817, 23818, 23819, 23820, 23821, + 23822, 23823, 23824, 23825, 23826, 23827, 23828, 23829, 23830, 23831, + 23832, 23833, 23834, 23835, 23836, 23837, 23838, 23839, 23840, 23841, + 23842, 23843, 23844, 23845, 23846, 23847, 23848, 23849, 23850, 23851, + 23852, 23853, 23854, 23855, 23856, 23857, 23858, 23859, 23860, 23861, + 23862, 23863, 23864, 23865, 23866, 23867, 23868, 23869, 23870, 23871, + 23872, 23873, 23874, 23875, 23876, 23877, 23878, 23879, 23880, 23881, + 23882, 23883, 23884, 23885, 23886, 23887, 23888, 23889, 23890, 23891, + 23892, 23893, 23894, 23895, 23896, 23897, 23898, 23899, 23900, 23901, + 23902, 23903, 23904, 23905, 23906, 23907, 23908, 23909, 23910, 23911, + 23912, 23913, 23914, 23915, 23916, 23917, 23918, 23919, 23920, 23921, + 23922, 23923, 23924, 23925, 23926, 23927, 23928, 23929, 23930, 23931, + 23932, 23933, 23934, 23935, 23936, 23937, 23938, 23939, 23940, 23941, + 23942, 23943, 23944, 23945, 23946, 23947, 23948, 23949, 23950, 23951, + 23952, 23953, 23954, 23955, 23956, 23957, 23958, 23959, 23960, 23961, + 23962, 23963, 23964, 23965, 23966, 23967, 23968, 23969, 23970, 23971, + 23972, 23973, 23974, 23975, 23976, 23977, 23978, 23979, 23980, 23981, + 23982, 23983, 23984, 23985, 23986, 23987, 23988, 23989, 23990, 23991, + 23992, 23993, 23994, 23995, 23996, 23997, 23998, 23999, 24000, 24001, + 24002, 24003, 24004, 24005, 24006, 24007, 24008, 24009, 24010, 24011, + 24012, 24013, 24014, 24015, 24016, 24017, 24018, 24019, 24020, 24021, + 24022, 24023, 24024, 24025, 24026, 24027, 24028, 24029, 24030, 24031, + 24032, 24033, 24034, 24035, 24036, 24037, 24038, 24039, 24040, 24041, + 24042, 24043, 24044, 24045, 24046, 24047, 24048, 24049, 24050, 24051, + 24052, 24053, 24054, 24055, 24056, 24057, 24058, 24059, 24060, 24061, + 24062, 24063, 24064, 24065, 24066, 24067, 24068, 24069, 24070, 24071, + 24072, 24073, 24074, 24075, 24076, 24077, 24078, 24079, 24080, 24081, + 24082, 24083, 24084, 24085, 24086, 24087, 24088, 24089, 24090, 24091, + 24092, 24093, 24094, 24095, 24096, 24097, 24098, 24099, 24100, 24101, + 24102, 24103, 24104, 24105, 24106, 24107, 24108, 24109, 24110, 24111, + 24112, 24113, 24114, 24115, 24116, 24117, 24118, 24119, 24120, 24121, + 24122, 24123, 24124, 24125, 24126, 24127, 24128, 24129, 24130, 24131, + 24132, 24133, 24134, 24135, 24136, 24137, 24138, 24139, 24140, 24141, + 24142, 24143, 24144, 24145, 24146, 24147, 24148, 24149, 24150, 24151, + 24152, 24153, 24154, 24155, 24156, 24157, 24158, 24159, 24160, 24161, + 24162, 24163, 24164, 24165, 24166, 24167, 24168, 24169, 24170, 24171, + 24172, 24173, 24174, 24175, 24176, 24177, 24178, 24179, 24180, 24181, + 24182, 24183, 24184, 24185, 24186, 24187, 24188, 24189, 24190, 24191, + 24192, 24193, 24194, 24195, 24196, 24197, 24198, 24199, 24200, 24201, + 24202, 24203, 24204, 24205, 24206, 24207, 24208, 24209, 24210, 24211, + 24212, 24213, 24214, 24215, 24216, 24217, 24218, 24219, 24220, 24221, + 24222, 24223, 24224, 24225, 24226, 24227, 24228, 24229, 24230, 24231, + 24232, 24233, 24234, 24235, 24236, 24237, 24238, 24239, 24240, 24241, + 24242, 24243, 24244, 24245, 24246, 24247, 24248, 24249, 24250, 24251, + 24252, 24253, 24254, 24255, 24256, 24257, 24258, 24259, 24260, 24261, + 24262, 24263, 24264, 24265, 24266, 24267, 24268, 24269, 24270, 24271, + 24272, 24273, 24274, 24275, 24276, 24277, 24278, 24279, 24280, 24281, + 24282, 24283, 24284, 24285, 24286, 24287, 24288, 24289, 24290, 24291, + 24292, 24293, 24294, 24295, 24296, 24297, 24298, 24299, 24300, 24301, + 24302, 24303, 24304, 24305, 24306, 24307, 24308, 24309, 24310, 24311, + 24312, 24313, 24314, 24315, 24316, 24317, 24318, 24319, 24320, 24321, + 24322, 24323, 24324, 24325, 24326, 24327, 24328, 24329, 24330, 24331, + 24332, 24333, 24334, 24335, 24336, 24337, 24338, 24339, 24340, 24341, + 24342, 24343, 24344, 24345, 24346, 24347, 24348, 24349, 24350, 24351, + 24352, 24353, 24354, 24355, 24356, 24357, 24358, 24359, 24360, 24361, + 24362, 24363, 24364, 24365, 24366, 24367, 24368, 24369, 24370, 24371, + 24372, 24373, 24374, 24375, 24376, 24377, 24378, 24379, 24380, 24381, + 24382, 24383, 24384, 24385, 24386, 24387, 24388, 24389, 24390, 24391, + 24392, 24393, 24394, 24395, 24396, 24397, 24398, 24399, 24400, 24401, + 24402, 24403, 24404, 24405, 24406, 24407, 24408, 24409, 24410, 24411, + 24412, 24413, 24414, 24415, 24416, 24417, 24418, 24419, 24420, 24421, + 24422, 24423, 24424, 24425, 24426, 24427, 24428, 24429, 24430, 24431, + 24432, 24433, 24434, 24435, 24436, 24437, 24438, 24439, 24440, 24441, + 24442, 24443, 24444, 24445, 24446, 24447, 24448, 24449, 24450, 24451, + 24452, 24453, 24454, 24455, 24456, 24457, 24458, 24459, 24460, 24461, + 24462, 24463, 24464, 24465, 24466, 24467, 24468, 24469, 24470, 24471, + 24472, 24473, 24474, 24475, 24476, 24477, 24478, 24479, 24480, 24481, + 24482, 24483, 24484, 24485, 24486, 24487, 24488, 24489, 24490, 24491, + 24492, 24493, 24494, 24495, 24496, 24497, 24498, 24499, 24500, 24501, + 24502, 24503, 24504, 24505, 24506, 24507, 24508, 24509, 24510, 24511, + 24512, 24513, 24514, 24515, 24516, 24517, 24518, 24519, 24520, 24521, + 24522, 24523, 24524, 24525, 24526, 24527, 24528, 24529, 24530, 24531, + 24532, 24533, 24534, 24535, 24536, 24537, 24538, 24539, 24540, 24541, + 24542, 24543, 24544, 24545, 24546, 24547, 24548, 24549, 24550, 24551, + 24552, 24553, 24554, 24555, 24556, 24557, 24558, 24559, 24560, 24561, + 24562, 24563, 24564, 24565, 24566, 24567, 24568, 24569, 24570, 24571, + 24572, 24573, 24574, 24575, 24576, 24577, 24578, 24579, 24580, 24581, + 24582, 24583, 24584, 24585, 24586, 24587, 24588, 24589, 24590, 24591, + 24592, 24593, 24594, 24595, 24596, 24597, 24598, 24599, 24600, 24601, + 24602, 24603, 24604, 24605, 24606, 24607, 24608, 24609, 24610, 24611, + 24612, 24613, 24614, 24615, 24616, 24617, 24618, 24619, 24620, 24621, + 24622, 24623, 24624, 24625, 24626, 24627, 24628, 24629, 24630, 24631, + 24632, 24633, 24634, 24635, 24636, 24637, 24638, 24639, 24640, 24641, + 24642, 24643, 24644, 24645, 24646, 24647, 24648, 24649, 24650, 24651, + 24652, 24653, 24654, 24655, 24656, 24657, 24658, 24659, 24660, 24661, + 24662, 24663, 24664, 24665, 24666, 24667, 24668, 24669, 24670, 24671, + 24672, 24673, 24674, 24675, 24676, 24677, 24678, 24679, 24680, 24681, + 24682, 24683, 24684, 24685, 24686, 24687, 24688, 24689, 24690, 24691, + 24692, 24693, 24694, 24695, 24696, 24697, 24698, 24699, 24700, 24701, + 24702, 24703, 24704, 24705, 24706, 24707, 24708, 24709, 24710, 24711, + 24712, 24713, 24714, 24715, 24716, 24717, 24718, 24719, 24720, 24721, + 24722, 24723, 24724, 24725, 24726, 24727, 24728, 24729, 24730, 24731, + 24732, 24733, 24734, 24735, 24736, 24737, 24738, 24739, 24740, 24741, + 24742, 24743, 24744, 24745, 24746, 24747, 24748, 24749, 24750, 24751, + 24752, 24753, 24754, 24755, 24756, 24757, 24758, 24759, 24760, 24761, + 24762, 24763, 24764, 24765, 24766, 24767, 24768, 24769, 24770, 24771, + 24772, 24773, 24774, 24775, 24776, 24777, 24778, 24779, 24780, 24781, + 24782, 24783, 24784, 24785, 24786, 24787, 24788, 24789, 24790, 24791, + 24792, 24793, 24794, 24795, 24796, 24797, 24798, 24799, 24800, 24801, + 24802, 24803, 24804, 24805, 24806, 24807, 24808, 24809, 24810, 24811, + 24812, 24813, 24814, 24815, 24816, 24817, 24818, 24819, 24820, 24821, + 24822, 24823, 24824, 24825, 24826, 24827, 24828, 24829, 24830, 24831, + 24832, 24833, 24834, 24835, 24836, 24837, 24838, 24839, 24840, 24841, + 24842, 24843, 24844, 24845, 24846, 24847, 24848, 24849, 24850, 24851, + 24852, 24853, 24854, 24855, 24856, 24857, 24858, 24859, 24860, 24861, + 24862, 24863, 24864, 24865, 24866, 24867, 24868, 24869, 24870, 24871, + 24872, 24873, 24874, 24875, 24876, 24877, 24878, 24879, 24880, 24881, + 24882, 24883, 24884, 24885, 24886, 24887, 24888, 24889, 24890, 24891, + 24892, 24893, 24894, 24895, 24896, 24897, 24898, 24899, 24900, 24901, + 24902, 24903, 24904, 24905, 24906, 24907, 24908, 24909, 24910, 24911, + 24912, 24913, 24914, 24915, 24916, 24917, 24918, 24919, 24920, 24921, + 24922, 24923, 24924, 24925, 24926, 24927, 24928, 24929, 24930, 24931, + 24932, 24933, 24934, 24935, 24936, 24937, 24938, 24939, 24940, 24941, + 24942, 24943, 24944, 24945, 24946, 24947, 24948, 24949, 24950, 24951, + 24952, 24953, 24954, 24955, 24956, 24957, 24958, 24959, 24960, 24961, + 24962, 24963, 24964, 24965, 24966, 24967, 24968, 24969, 24970, 24971, + 24972, 24973, 24974, 24975, 24976, 24977, 24978, 24979, 24980, 24981, + 24982, 24983, 24984, 24985, 24986, 24987, 24988, 24989, 24990, 24991, + 24992, 24993, 24994, 24995, 24996, 24997, 24998, 24999, 25000, 25001, + 25002, 25003, 25004, 25005, 25006, 25007, 25008, 25009, 25010, 25011, + 25012, 25013, 25014, 25015, 25016, 25017, 25018, 25019, 25020, 25021, + 25022, 25023, 25024, 25025, 25026, 25027, 25028, 25029, 25030, 25031, + 25032, 25033, 25034, 25035, 25036, 25037, 25038, 25039, 25040, 25041, + 25042, 25043, 25044, 25045, 25046, 25047, 25048, 25049, 25050, 25051, + 25052, 25053, 25054, 25055, 25056, 25057, 25058, 25059, 25060, 25061, + 25062, 25063, 25064, 25065, 25066, 25067, 25068, 25069, 25070, 25071, + 25072, 25073, 25074, 25075, 25076, 25077, 25078, 25079, 25080, 25081, + 25082, 25083, 25084, 25085, 25086, 25087, 25088, 25089, 25090, 25091, + 25092, 25093, 25094, 25095, 25096, 25097, 25098, 25099, 25100, 25101, + 25102, 25103, 25104, 25105, 25106, 25107, 25108, 25109, 25110, 25111, + 25112, 25113, 25114, 25115, 25116, 25117, 25118, 25119, 25120, 25121, + 25122, 25123, 25124, 25125, 25126, 25127, 25128, 25129, 25130, 25131, + 25132, 25133, 25134, 25135, 25136, 25137, 25138, 25139, 25140, 25141, + 25142, 25143, 25144, 25145, 25146, 25147, 25148, 25149, 25150, 25151, + 25152, 25153, 25154, 25155, 25156, 25157, 25158, 25159, 25160, 25161, + 25162, 25163, 25164, 25165, 25166, 25167, 25168, 25169, 25170, 25171, + 25172, 25173, 25174, 25175, 25176, 25177, 25178, 25179, 25180, 25181, + 25182, 25183, 25184, 25185, 25186, 25187, 25188, 25189, 25190, 25191, + 25192, 25193, 25194, 25195, 25196, 25197, 25198, 25199, 25200, 25201, + 25202, 25203, 25204, 25205, 25206, 25207, 25208, 25209, 25210, 25211, + 25212, 25213, 25214, 25215, 25216, 25217, 25218, 25219, 25220, 25221, + 25222, 25223, 25224, 25225, 25226, 25227, 25228, 25229, 25230, 25231, + 25232, 25233, 25234, 25235, 25236, 25237, 25238, 25239, 25240, 25241, + 25242, 25243, 25244, 25245, 25246, 25247, 25248, 25249, 25250, 25251, + 25252, 25253, 25254, 25255, 25256, 25257, 25258, 25259, 25260, 25261, + 25262, 25263, 25264, 25265, 25266, 25267, 25268, 25269, 25270, 25271, + 25272, 25273, 25274, 25275, 25276, 25277, 25278, 25279, 25280, 25281, + 25282, 25283, 25284, 25285, 25286, 25287, 25288, 25289, 25290, 25291, + 25292, 25293, 25294, 25295, 25296, 25297, 25298, 25299, 25300, 25301, + 25302, 25303, 25304, 25305, 25306, 25307, 25308, 25309, 25310, 25311, + 25312, 25313, 25314, 25315, 25316, 25317, 25318, 25319, 25320, 25321, + 25322, 25323, 25324, 25325, 25326, 25327, 25328, 25329, 25330, 25331, + 25332, 25333, 25334, 25335, 25336, 25337, 25338, 25339, 25340, 25341, + 25342, 25343, 25344, 25345, 25346, 25347, 25348, 25349, 25350, 25351, + 25352, 25353, 25354, 25355, 25356, 25357, 25358, 25359, 25360, 25361, + 25362, 25363, 25364, 25365, 25366, 25367, 25368, 25369, 25370, 25371, + 25372, 25373, 25374, 25375, 25376, 25377, 25378, 25379, 25380, 25381, + 25382, 25383, 25384, 25385, 25386, 25387, 25388, 25389, 25390, 25391, + 25392, 25393, 25394, 25395, 25396, 25397, 25398, 25399, 25400, 25401, + 25402, 25403, 25404, 25405, 25406, 25407, 25408, 25409, 25410, 25411, + 25412, 25413, 25414, 25415, 25416, 25417, 25418, 25419, 25420, 25421, + 25422, 25423, 25424, 25425, 25426, 25427, 25428, 25429, 25430, 25431, + 25432, 25433, 25434, 25435, 25436, 25437, 25438, 25439, 25440, 25441, + 25442, 25443, 25444, 25445, 25446, 25447, 25448, 25449, 25450, 25451, + 25452, 25453, 25454, 25455, 25456, 25457, 25458, 25459, 25460, 25461, + 25462, 25463, 25464, 25465, 25466, 25467, 25468, 25469, 25470, 25471, + 25472, 25473, 25474, 25475, 25476, 25477, 25478, 25479, 25480, 25481, + 25482, 25483, 25484, 25485, 25486, 25487, 25488, 25489, 25490, 25491, + 25492, 25493, 25494, 25495, 25496, 25497, 25498, 25499, 25500, 25501, + 25502, 25503, 25504, 25505, 25506, 25507, 25508, 25509, 25510, 25511, + 25512, 25513, 25514, 25515, 25516, 25517, 25518, 25519, 25520, 25521, + 25522, 25523, 25524, 25525, 25526, 25527, 25528, 25529, 25530, 25531, + 25532, 25533, 25534, 25535, 25536, 25537, 25538, 25539, 25540, 25541, + 25542, 25543, 25544, 25545, 25546, 25547, 25548, 25549, 25550, 25551, + 25552, 25553, 25554, 25555, 25556, 25557, 25558, 25559, 25560, 25561, + 25562, 25563, 25564, 25565, 25566, 25567, 25568, 25569, 25570, 25571, + 25572, 25573, 25574, 25575, 25576, 25577, 25578, 25579, 25580, 25581, + 25582, 25583, 25584, 25585, 25586, 25587, 25588, 25589, 25590, 25591, + 25592, 25593, 25594, 25595, 25596, 25597, 25598, 25599, 25600, 25601, + 25602, 25603, 25604, 25605, 25606, 25607, 25608, 25609, 25610, 25611, + 25612, 25613, 25614, 25615, 25616, 25617, 25618, 25619, 25620, 25621, + 25622, 25623, 25624, 25625, 25626, 25627, 25628, 25629, 25630, 25631, + 25632, 25633, 25634, 25635, 25636, 25637, 25638, 25639, 25640, 25641, + 25642, 25643, 25644, 25645, 25646, 25647, 25648, 25649, 25650, 25651, + 25652, 25653, 25654, 25655, 25656, 25657, 25658, 25659, 25660, 25661, + 25662, 25663, 25664, 25665, 25666, 25667, 25668, 25669, 25670, 25671, + 25672, 25673, 25674, 25675, 25676, 25677, 25678, 25679, 25680, 25681, + 25682, 25683, 25684, 25685, 25686, 25687, 25688, 25689, 25690, 25691, + 25692, 25693, 25694, 25695, 25696, 25697, 25698, 25699, 25700, 25701, + 25702, 25703, 25704, 25705, 25706, 25707, 25708, 25709, 25710, 25711, + 25712, 25713, 25714, 25715, 25716, 25717, 25718, 25719, 25720, 25721, + 25722, 25723, 25724, 25725, 25726, 25727, 25728, 25729, 25730, 25731, + 25732, 25733, 25734, 25735, 25736, 25737, 25738, 25739, 25740, 25741, + 25742, 25743, 25744, 25745, 25746, 25747, 25748, 25749, 25750, 25751, + 25752, 25753, 25754, 25755, 25756, 25757, 25758, 25759, 25760, 25761, + 25762, 25763, 25764, 25765, 25766, 25767, 25768, 25769, 25770, 25771, + 25772, 25773, 25774, 25775, 25776, 25777, 25778, 25779, 25780, 25781, + 25782, 25783, 25784, 25785, 25786, 25787, 25788, 25789, 25790, 25791, + 25792, 25793, 25794, 25795, 25796, 25797, 25798, 25799, 25800, 25801, + 25802, 25803, 25804, 25805, 25806, 25807, 25808, 25809, 25810, 25811, + 25812, 25813, 25814, 25815, 25816, 25817, 25818, 25819, 25820, 25821, + 25822, 25823, 25824, 25825, 25826, 25827, 25828, 25829, 25830, 25831, + 25832, 25833, 25834, 25835, 25836, 25837, 25838, 25839, 25840, 25841, + 25842, 25843, 25844, 25845, 25846, 25847, 25848, 25849, 25850, 25851, + 25852, 25853, 25854, 25855, 25856, 25857, 25858, 25859, 25860, 25861, + 25862, 25863, 25864, 25865, 25866, 25867, 25868, 25869, 25870, 25871, + 25872, 25873, 25874, 25875, 25876, 25877, 25878, 25879, 25880, 25881, + 25882, 25883, 25884, 25885, 25886, 25887, 25888, 25889, 25890, 25891, + 25892, 25893, 25894, 25895, 25896, 25897, 25898, 25899, 25900, 25901, + 25902, 25903, 25904, 25905, 25906, 25907, 25908, 25909, 25910, 25911, + 25912, 25913, 25914, 25915, 25916, 25917, 25918, 25919, 25920, 25921, + 25922, 25923, 25924, 25925, 25926, 25927, 25928, 25929, 25930, 25931, + 25932, 25933, 25934, 25935, 25936, 25937, 25938, 25939, 25940, 25941, + 25942, 25943, 25944, 25945, 25946, 25947, 25948, 25949, 25950, 25951, + 25952, 25953, 25954, 25955, 25956, 25957, 25958, 25959, 25960, 25961, + 25962, 25963, 25964, 25965, 25966, 25967, 25968, 25969, 25970, 25971, + 25972, 25973, 25974, 25975, 25976, 25977, 25978, 25979, 25980, 25981, + 25982, 25983, 25984, 25985, 25986, 25987, 25988, 25989, 25990, 25991, + 25992, 25993, 25994, 25995, 25996, 25997, 25998, 25999, 26000, 26001, + 26002, 26003, 26004, 26005, 26006, 26007, 26008, 26009, 26010, 26011, + 26012, 26013, 26014, 26015, 26016, 26017, 26018, 26019, 26020, 26021, + 26022, 26023, 26024, 26025, 26026, 26027, 26028, 26029, 26030, 26031, + 26032, 26033, 26034, 26035, 26036, 26037, 26038, 26039, 26040, 26041, + 26042, 26043, 26044, 26045, 26046, 26047, 26048, 26049, 26050, 26051, + 26052, 26053, 26054, 26055, 26056, 26057, 26058, 26059, 26060, 26061, + 26062, 26063, 26064, 26065, 26066, 26067, 26068, 26069, 26070, 26071, + 26072, 26073, 26074, 26075, 26076, 26077, 26078, 26079, 26080, 26081, + 26082, 26083, 26084, 26085, 26086, 26087, 26088, 26089, 26090, 26091, + 26092, 26093, 26094, 26095, 26096, 26097, 26098, 26099, 26100, 26101, + 26102, 26103, 26104, 26105, 26106, 26107, 26108, 26109, 26110, 26111, + 26112, 26113, 26114, 26115, 26116, 26117, 26118, 26119, 26120, 26121, + 26122, 26123, 26124, 26125, 26126, 26127, 26128, 26129, 26130, 26131, + 26132, 26133, 26134, 26135, 26136, 26137, 26138, 26139, 26140, 26141, + 26142, 26143, 26144, 26145, 26146, 26147, 26148, 26149, 26150, 26151, + 26152, 26153, 26154, 26155, 26156, 26157, 26158, 26159, 26160, 26161, + 26162, 26163, 26164, 26165, 26166, 26167, 26168, 26169, 26170, 26171, + 26172, 26173, 26174, 26175, 26176, 26177, 26178, 26179, 26180, 26181, + 26182, 26183, 26184, 26185, 26186, 26187, 26188, 26189, 26190, 26191, + 26192, 26193, 26194, 26195, 26196, 26197, 26198, 26199, 26200, 26201, + 26202, 26203, 26204, 26205, 26206, 26207, 26208, 26209, 26210, 26211, + 26212, 26213, 26214, 26215, 26216, 26217, 26218, 26219, 26220, 26221, + 26222, 26223, 26224, 26225, 26226, 26227, 26228, 26229, 26230, 26231, + 26232, 26233, 26234, 26235, 26236, 26237, 26238, 26239, 26240, 26241, + 26242, 26243, 26244, 26245, 26246, 26247, 26248, 26249, 26250, 26251, + 26252, 26253, 26254, 26255, 26256, 26257, 26258, 26259, 26260, 26261, + 26262, 26263, 26264, 26265, 26266, 26267, 26268, 26269, 26270, 26271, + 26272, 26273, 26274, 26275, 26276, 26277, 26278, 26279, 26280, 26281, + 26282, 26283, 26284, 26285, 26286, 26287, 26288, 26289, 26290, 26291, + 26292, 26293, 26294, 26295, 26296, 26297, 26298, 26299, 26300, 26301, + 26302, 26303, 26304, 26305, 26306, 26307, 26308, 26309, 26310, 26311, + 26312, 26313, 26314, 26315, 26316, 26317, 26318, 26319, 26320, 26321, + 26322, 26323, 26324, 26325, 26326, 26327, 26328, 26329, 26330, 26331, + 26332, 26333, 26334, 26335, 26336, 26337, 26338, 26339, 26340, 26341, + 26342, 26343, 26344, 26345, 26346, 26347, 26348, 26349, 26350, 26351, + 26352, 26353, 26354, 26355, 26356, 26357, 26358, 26359, 26360, 26361, + 26362, 26363, 26364, 26365, 26366, 26367, 26368, 26369, 26370, 26371, + 26372, 26373, 26374, 26375, 26376, 26377, 26378, 26379, 26380, 26381, + 26382, 26383, 26384, 26385, 26386, 26387, 26388, 26389, 26390, 26391, + 26392, 26393, 26394, 26395, 26396, 26397, 26398, 26399, 26400, 26401, + 26402, 26403, 26404, 26405, 26406, 26407, 26408, 26409, 26410, 26411, + 26412, 26413, 26414, 26415, 26416, 26417, 26418, 26419, 26420, 26421, + 26422, 26423, 26424, 26425, 26426, 26427, 26428, 26429, 26430, 26431, + 26432, 26433, 26434, 26435, 26436, 26437, 26438, 26439, 26440, 26441, + 26442, 26443, 26444, 26445, 26446, 26447, 26448, 26449, 26450, 26451, + 26452, 26453, 26454, 26455, 26456, 26457, 26458, 26459, 26460, 26461, + 26462, 26463, 26464, 26465, 26466, 26467, 26468, 26469, 26470, 26471, + 26472, 26473, 26474, 26475, 26476, 26477, 26478, 26479, 26480, 26481, + 26482, 26483, 26484, 26485, 26486, 26487, 26488, 26489, 26490, 26491, + 26492, 26493, 26494, 26495, 26496, 26497, 26498, 26499, 26500, 26501, + 26502, 26503, 26504, 26505, 26506, 26507, 26508, 26509, 26510, 26511, + 26512, 26513, 26514, 26515, 26516, 26517, 26518, 26519, 26520, 26521, + 26522, 26523, 26524, 26525, 26526, 26527, 26528, 26529, 26530, 26531, + 26532, 26533, 26534, 26535, 26536, 26537, 26538, 26539, 26540, 26541, + 26542, 26543, 26544, 26545, 26546, 26547, 26548, 26549, 26550, 26551, + 26552, 26553, 26554, 26555, 26556, 26557, 26558, 26559, 26560, 26561, + 26562, 26563, 26564, 26565, 26566, 26567, 26568, 26569, 26570, 26571, + 26572, 26573, 26574, 26575, 26576, 26577, 26578, 26579, 26580, 26581, + 26582, 26583, 26584, 26585, 26586, 26587, 26588, 26589, 26590, 26591, + 26592, 26593, 26594, 26595, 26596, 26597, 26598, 26599, 26600, 26601, + 26602, 26603, 26604, 26605, 26606, 26607, 26608, 26609, 26610, 26611, + 26612, 26613, 26614, 26615, 26616, 26617, 26618, 26619, 26620, 26621, + 26622, 26623, 26624, 26625, 26626, 26627, 26628, 26629, 26630, 26631, + 26632, 26633, 26634, 26635, 26636, 26637, 26638, 26639, 26640, 26641, + 26642, 26643, 26644, 26645, 26646, 26647, 26648, 26649, 26650, 26651, + 26652, 26653, 26654, 26655, 26656, 26657, 26658, 26659, 26660, 26661, + 26662, 26663, 26664, 26665, 26666, 26667, 26668, 26669, 26670, 26671, + 26672, 26673, 26674, 26675, 26676, 26677, 26678, 26679, 26680, 26681, + 26682, 26683, 26684, 26685, 26686, 26687, 26688, 26689, 26690, 26691, + 26692, 26693, 26694, 26695, 26696, 26697, 26698, 26699, 26700, 26701, + 26702, 26703, 26704, 26705, 26706, 26707, 26708, 26709, 26710, 26711, + 26712, 26713, 26714, 26715, 26716, 26717, 26718, 26719, 26720, 26721, + 26722, 26723, 26724, 26725, 26726, 26727, 26728, 26729, 26730, 26731, + 26732, 26733, 26734, 26735, 26736, 26737, 26738, 26739, 26740, 26741, + 26742, 26743, 26744, 26745, 26746, 26747, 26748, 26749, 26750, 26751, + 26752, 26753, 26754, 26755, 26756, 26757, 26758, 26759, 26760, 26761, + 26762, 26763, 26764, 26765, 26766, 26767, 26768, 26769, 26770, 26771, + 26772, 26773, 26774, 26775, 26776, 26777, 26778, 26779, 26780, 26781, + 26782, 26783, 26784, 26785, 26786, 26787, 26788, 26789, 26790, 26791, + 26792, 26793, 26794, 26795, 26796, 26797, 26798, 26799, 26800, 26801, + 26802, 26803, 26804, 26805, 26806, 26807, 26808, 26809, 26810, 26811, + 26812, 26813, 26814, 26815, 26816, 26817, 26818, 26819, 26820, 26821, + 26822, 26823, 26824, 26825, 26826, 26827, 26828, 26829, 26830, 26831, + 26832, 26833, 26834, 26835, 26836, 26837, 26838, 26839, 26840, 26841, + 26842, 26843, 26844, 26845, 26846, 26847, 26848, 26849, 26850, 26851, + 26852, 26853, 26854, 26855, 26856, 26857, 26858, 26859, 26860, 26861, + 26862, 26863, 26864, 26865, 26866, 26867, 26868, 26869, 26870, 26871, + 26872, 26873, 26874, 26875, 26876, 26877, 26878, 26879, 26880, 26881, + 26882, 26883, 26884, 26885, 26886, 26887, 26888, 26889, 26890, 26891, + 26892, 26893, 26894, 26895, 26896, 26897, 26898, 26899, 26900, 26901, + 26902, 26903, 26904, 26905, 26906, 26907, 26908, 26909, 26910, 26911, + 26912, 26913, 26914, 26915, 26916, 26917, 26918, 26919, 26920, 26921, + 26922, 26923, 26924, 26925, 26926, 26927, 26928, 26929, 26930, 26931, + 26932, 26933, 26934, 26935, 26936, 26937, 26938, 26939, 26940, 26941, + 26942, 26943, 26944, 26945, 26946, 26947, 26948, 26949, 26950, 26951, + 26952, 26953, 26954, 26955, 26956, 26957, 26958, 26959, 26960, 26961, + 26962, 26963, 26964, 26965, 26966, 26967, 26968, 26969, 26970, 26971, + 26972, 26973, 26974, 26975, 26976, 26977, 26978, 26979, 26980, 26981, + 26982, 26983, 26984, 26985, 26986, 26987, 26988, 26989, 26990, 26991, + 26992, 26993, 26994, 26995, 26996, 26997, 26998, 26999, 27000, 27001, + 27002, 27003, 27004, 27005, 27006, 27007, 27008, 27009, 27010, 27011, + 27012, 27013, 27014, 27015, 27016, 27017, 27018, 27019, 27020, 27021, + 27022, 27023, 27024, 27025, 27026, 27027, 27028, 27029, 27030, 27031, + 27032, 27033, 27034, 27035, 27036, 27037, 27038, 27039, 27040, 27041, + 27042, 27043, 27044, 27045, 27046, 27047, 27048, 27049, 27050, 27051, + 27052, 27053, 27054, 27055, 27056, 27057, 27058, 27059, 27060, 27061, + 27062, 27063, 27064, 27065, 27066, 27067, 27068, 27069, 27070, 27071, + 27072, 27073, 27074, 27075, 27076, 27077, 27078, 27079, 27080, 27081, + 27082, 27083, 27084, 27085, 27086, 27087, 27088, 27089, 27090, 27091, + 27092, 27093, 27094, 27095, 27096, 27097, 27098, 27099, 27100, 27101, + 27102, 27103, 27104, 27105, 27106, 27107, 27108, 27109, 27110, 27111, + 27112, 27113, 27114, 27115, 27116, 27117, 27118, 27119, 27120, 27121, + 27122, 27123, 27124, 27125, 27126, 27127, 27128, 27129, 27130, 27131, + 27132, 27133, 27134, 27135, 27136, 27137, 27138, 27139, 27140, 27141, + 27142, 27143, 27144, 27145, 27146, 27147, 27148, 27149, 27150, 27151, + 27152, 27153, 27154, 27155, 27156, 27157, 27158, 27159, 27160, 27161, + 27162, 27163, 27164, 27165, 27166, 27167, 27168, 27169, 27170, 27171, + 27172, 27173, 27174, 27175, 27176, 27177, 27178, 27179, 27180, 27181, + 27182, 27183, 27184, 27185, 27186, 27187, 27188, 27189, 27190, 27191, + 27192, 27193, 27194, 27195, 27196, 27197, 27198, 27199, 27200, 27201, + 27202, 27203, 27204, 27205, 27206, 27207, 27208, 27209, 27210, 27211, + 27212, 27213, 27214, 27215, 27216, 27217, 27218, 27219, 27220, 27221, + 27222, 27223, 27224, 27225, 27226, 27227, 27228, 27229, 27230, 27231, + 27232, 27233, 27234, 27235, 27236, 27237, 27238, 27239, 27240, 27241, + 27242, 27243, 27244, 27245, 27246, 27247, 27248, 27249, 27250, 27251, + 27252, 27253, 27254, 27255, 27256, 27257, 27258, 27259, 27260, 27261, + 27262, 27263, 27264, 27265, 27266, 27267, 27268, 27269, 27270, 27271, + 27272, 27273, 27274, 27275, 27276, 27277, 27278, 27279, 27280, 27281, + 27282, 27283, 27284, 27285, 27286, 27287, 27288, 27289, 27290, 27291, + 27292, 27293, 27294, 27295, 27296, 27297, 27298, 27299, 27300, 27301, + 27302, 27303, 27304, 27305, 27306, 27307, 27308, 27309, 27310, 27311, + 27312, 27313, 27314, 27315, 27316, 27317, 27318, 27319, 27320, 27321, + 27322, 27323, 27324, 27325, 27326, 27327, 27328, 27329, 27330, 27331, + 27332, 27333, 27334, 27335, 27336, 27337, 27338, 27339, 27340, 27341, + 27342, 27343, 27344, 27345, 27346, 27347, 27348, 27349, 27350, 27351, + 27352, 27353, 27354, 27355, 27356, 27357, 27358, 27359, 27360, 27361, + 27362, 27363, 27364, 27365, 27366, 27367, 27368, 27369, 27370, 27371, + 27372, 27373, 27374, 27375, 27376, 27377, 27378, 27379, 27380, 27381, + 27382, 27383, 27384, 27385, 27386, 27387, 27388, 27389, 27390, 27391, + 27392, 27393, 27394, 27395, 27396, 27397, 27398, 27399, 27400, 27401, + 27402, 27403, 27404, 27405, 27406, 27407, 27408, 27409, 27410, 27411, + 27412, 27413, 27414, 27415, 27416, 27417, 27418, 27419, 27420, 27421, + 27422, 27423, 27424, 27425, 27426, 27427, 27428, 27429, 27430, 27431, + 27432, 27433, 27434, 27435, 27436, 27437, 27438, 27439, 27440, 27441, + 27442, 27443, 27444, 27445, 27446, 27447, 27448, 27449, 27450, 27451, + 27452, 27453, 27454, 27455, 27456, 27457, 27458, 27459, 27460, 27461, + 27462, 27463, 27464, 27465, 27466, 27467, 27468, 27469, 27470, 27471, + 27472, 27473, 27474, 27475, 27476, 27477, 27478, 27479, 27480, 27481, + 27482, 27483, 27484, 27485, 27486, 27487, 27488, 27489, 27490, 27491, + 27492, 27493, 27494, 27495, 27496, 27497, 27498, 27499, 27500, 27501, + 27502, 27503, 27504, 27505, 27506, 27507, 27508, 27509, 27510, 27511, + 27512, 27513, 27514, 27515, 27516, 27517, 27518, 27519, 27520, 27521, + 27522, 27523, 27524, 27525, 27526, 27527, 27528, 27529, 27530, 27531, + 27532, 27533, 27534, 27535, 27536, 27537, 27538, 27539, 27540, 27541, + 27542, 27543, 27544, 27545, 27546, 27547, 27548, 27549, 27550, 27551, + 27552, 27553, 27554, 27555, 27556, 27557, 27558, 27559, 27560, 27561, + 27562, 27563, 27564, 27565, 27566, 27567, 27568, 27569, 27570, 27571, + 27572, 27573, 27574, 27575, 27576, 27577, 27578, 27579, 27580, 27581, + 27582, 27583, 27584, 27585, 27586, 27587, 27588, 27589, 27590, 27591, + 27592, 27593, 27594, 27595, 27596, 27597, 27598, 27599, 27600, 27601, + 27602, 27603, 27604, 27605, 27606, 27607, 27608, 27609, 27610, 27611, + 27612, 27613, 27614, 27615, 27616, 27617, 27618, 27619, 27620, 27621, + 27622, 27623, 27624, 27625, 27626, 27627, 27628, 27629, 27630, 27631, + 27632, 27633, 27634, 27635, 27636, 27637, 27638, 27639, 27640, 27641, + 27642, 27643, 27644, 27645, 27646, 27647, 27648, 27649, 27650, 27651, + 27652, 27653, 27654, 27655, 27656, 27657, 27658, 27659, 27660, 27661, + 27662, 27663, 27664, 27665, 27666, 27667, 27668, 27669, 27670, 27671, + 27672, 27673, 27674, 27675, 27676, 27677, 27678, 27679, 27680, 27681, + 27682, 27683, 27684, 27685, 27686, 27687, 27688, 27689, 27690, 27691, + 27692, 27693, 27694, 27695, 27696, 27697, 27698, 27699, 27700, 27701, + 27702, 27703, 27704, 27705, 27706, 27707, 27708, 27709, 27710, 27711, + 27712, 27713, 27714, 27715, 27716, 27717, 27718, 27719, 27720, 27721, + 27722, 27723, 27724, 27725, 27726, 27727, 27728, 27729, 27730, 27731, + 27732, 27733, 27734, 27735, 27736, 27737, 27738, 27739, 27740, 27741, + 27742, 27743, 27744, 27745, 27746, 27747, 27748, 27749, 27750, 27751, + 27752, 27753, 27754, 27755, 27756, 27757, 27758, 27759, 27760, 27761, + 27762, 27763, 27764, 27765, 27766, 27767, 27768, 27769, 27770, 27771, + 27772, 27773, 27774, 27775, 27776, 27777, 27778, 27779, 27780, 27781, + 27782, 27783, 27784, 27785, 27786, 27787, 27788, 27789, 27790, 27791, + 27792, 27793, 27794, 27795, 27796, 27797, 27798, 27799, 27800, 27801, + 27802, 27803, 27804, 27805, 27806, 27807, 27808, 27809, 27810, 27811, + 27812, 27813, 27814, 27815, 27816, 27817, 27818, 27819, 27820, 27821, + 27822, 27823, 27824, 27825, 27826, 27827, 27828, 27829, 27830, 27831, + 27832, 27833, 27834, 27835, 27836, 27837, 27838, 27839, 27840, 27841, + 27842, 27843, 27844, 27845, 27846, 27847, 27848, 27849, 27850, 27851, + 27852, 27853, 27854, 27855, 27856, 27857, 27858, 27859, 27860, 27861, + 27862, 27863, 27864, 27865, 27866, 27867, 27868, 27869, 27870, 27871, + 27872, 27873, 27874, 27875, 27876, 27877, 27878, 27879, 27880, 27881, + 27882, 27883, 27884, 27885, 27886, 27887, 27888, 27889, 27890, 27891, + 27892, 27893, 27894, 27895, 27896, 27897, 27898, 27899, 27900, 27901, + 27902, 27903, 27904, 27905, 27906, 27907, 27908, 27909, 27910, 27911, + 27912, 27913, 27914, 27915, 27916, 27917, 27918, 27919, 27920, 27921, + 27922, 27923, 27924, 27925, 27926, 27927, 27928, 27929, 27930, 27931, + 27932, 27933, 27934, 27935, 27936, 27937, 27938, 27939, 27940, 27941, + 27942, 27943, 27944, 27945, 27946, 27947, 27948, 27949, 27950, 27951, + 27952, 27953, 27954, 27955, 27956, 27957, 27958, 27959, 27960, 27961, + 27962, 27963, 27964, 27965, 27966, 27967, 27968, 27969, 27970, 27971, + 27972, 27973, 27974, 27975, 27976, 27977, 27978, 27979, 27980, 27981, + 27982, 27983, 27984, 27985, 27986, 27987, 27988, 27989, 27990, 27991, + 27992, 27993, 27994, 27995, 27996, 27997, 27998, 27999, 28000, 28001, + 28002, 28003, 28004, 28005, 28006, 28007, 28008, 28009, 28010, 28011, + 28012, 28013, 28014, 28015, 28016, 28017, 28018, 28019, 28020, 28021, + 28022, 28023, 28024, 28025, 28026, 28027, 28028, 28029, 28030, 28031, + 28032, 28033, 28034, 28035, 28036, 28037, 28038, 28039, 28040, 28041, + 28042, 28043, 28044, 28045, 28046, 28047, 28048, 28049, 28050, 28051, + 28052, 28053, 28054, 28055, 28056, 28057, 28058, 28059, 28060, 28061, + 28062, 28063, 28064, 28065, 28066, 28067, 28068, 28069, 28070, 28071, + 28072, 28073, 28074, 28075, 28076, 28077, 28078, 28079, 28080, 28081, + 28082, 28083, 28084, 28085, 28086, 28087, 28088, 28089, 28090, 28091, + 28092, 28093, 28094, 28095, 28096, 28097, 28098, 28099, 28100, 28101, + 28102, 28103, 28104, 28105, 28106, 28107, 28108, 28109, 28110, 28111, + 28112, 28113, 28114, 28115, 28116, 28117, 28118, 28119, 28120, 28121, + 28122, 28123, 28124, 28125, 28126, 28127, 28128, 28129, 28130, 28131, + 28132, 28133, 28134, 28135, 28136, 28137, 28138, 28139, 28140, 28141, + 28142, 28143, 28144, 28145, 28146, 28147, 28148, 28149, 28150, 28151, + 28152, 28153, 28154, 28155, 28156, 28157, 28158, 28159, 28160, 28161, + 28162, 28163, 28164, 28165, 28166, 28167, 28168, 28169, 28170, 28171, + 28172, 28173, 28174, 28175, 28176, 28177, 28178, 28179, 28180, 28181, + 28182, 28183, 28184, 28185, 28186, 28187, 28188, 28189, 28190, 28191, + 28192, 28193, 28194, 28195, 28196, 28197, 28198, 28199, 28200, 28201, + 28202, 28203, 28204, 28205, 28206, 28207, 28208, 28209, 28210, 28211, + 28212, 28213, 28214, 28215, 28216, 28217, 28218, 28219, 28220, 28221, + 28222, 28223, 28224, 28225, 28226, 28227, 28228, 28229, 28230, 28231, + 28232, 28233, 28234, 28235, 28236, 28237, 28238, 28239, 28240, 28241, + 28242, 28243, 28244, 28245, 28246, 28247, 28248, 28249, 28250, 28251, + 28252, 28253, 28254, 28255, 28256, 28257, 28258, 28259, 28260, 28261, + 28262, 28263, 28264, 28265, 28266, 28267, 28268, 28269, 28270, 28271, + 28272, 28273, 28274, 28275, 28276, 28277, 28278, 28279, 28280, 28281, + 28282, 28283, 28284, 28285, 28286, 28287, 28288, 28289, 28290, 28291, + 28292, 28293, 28294, 28295, 28296, 28297, 28298, 28299, 28300, 28301, + 28302, 28303, 28304, 28305, 28306, 28307, 28308, 28309, 28310, 28311, + 28312, 28313, 28314, 28315, 28316, 28317, 28318, 28319, 28320, 28321, + 28322, 28323, 28324, 28325, 28326, 28327, 28328, 28329, 28330, 28331, + 28332, 28333, 28334, 28335, 28336, 28337, 28338, 28339, 28340, 28341, + 28342, 28343, 28344, 28345, 28346, 28347, 28348, 28349, 28350, 28351, + 28352, 28353, 28354, 28355, 28356, 28357, 28358, 28359, 28360, 28361, + 28362, 28363, 28364, 28365, 28366, 28367, 28368, 28369, 28370, 28371, + 28372, 28373, 28374, 28375, 28376, 28377, 28378, 28379, 28380, 28381, + 28382, 28383, 28384, 28385, 28386, 28387, 28388, 28389, 28390, 28391, + 28392, 28393, 28394, 28395, 28396, 28397, 28398, 28399, 28400, 28401, + 28402, 28403, 28404, 28405, 28406, 28407, 28408, 28409, 28410, 28411, + 28412, 28413, 28414, 28415, 28416, 28417, 28418, 28419, 28420, 28421, + 28422, 28423, 28424, 28425, 28426, 28427, 28428, 28429, 28430, 28431, + 28432, 28433, 28434, 28435, 28436, 28437, 28438, 28439, 28440, 28441, + 28442, 28443, 28444, 28445, 28446, 28447, 28448, 28449, 28450, 28451, + 28452, 28453, 28454, 28455, 28456, 28457, 28458, 28459, 28460, 28461, + 28462, 28463, 28464, 28465, 28466, 28467, 28468, 28469, 28470, 28471, + 28472, 28473, 28474, 28475, 28476, 28477, 28478, 28479, 28480, 28481, + 28482, 28483, 28484, 28485, 28486, 28487, 28488, 28489, 28490, 28491, + 28492, 28493, 28494, 28495, 28496, 28497, 28498, 28499, 28500, 28501, + 28502, 28503, 28504, 28505, 28506, 28507, 28508, 28509, 28510, 28511, + 28512, 28513, 28514, 28515, 28516, 28517, 28518, 28519, 28520, 28521, + 28522, 28523, 28524, 28525, 28526, 28527, 28528, 28529, 28530, 28531, + 28532, 28533, 28534, 28535, 28536, 28537, 28538, 28539, 28540, 28541, + 28542, 28543, 28544, 28545, 28546, 28547, 28548, 28549, 28550, 28551, + 28552, 28553, 28554, 28555, 28556, 28557, 28558, 28559, 28560, 28561, + 28562, 28563, 28564, 28565, 28566, 28567, 28568, 28569, 28570, 28571, + 28572, 28573, 28574, 28575, 28576, 28577, 28578, 28579, 28580, 28581, + 28582, 28583, 28584, 28585, 28586, 28587, 28588, 28589, 28590, 28591, + 28592, 28593, 28594, 28595, 28596, 28597, 28598, 28599, 28600, 28601, + 28602, 28603, 28604, 28605, 28606, 28607, 28608, 28609, 28610, 28611, + 28612, 28613, 28614, 28615, 28616, 28617, 28618, 28619, 28620, 28621, + 28622, 28623, 28624, 28625, 28626, 28627, 28628, 28629, 28630, 28631, + 28632, 28633, 28634, 28635, 28636, 28637, 28638, 28639, 28640, 28641, + 28642, 28643, 28644, 28645, 28646, 28647, 28648, 28649, 28650, 28651, + 28652, 28653, 28654, 28655, 28656, 28657, 28658, 28659, 28660, 28661, + 28662, 28663, 28664, 28665, 28666, 28667, 28668, 28669, 28670, 28671, + 28672, 28673, 28674, 28675, 28676, 28677, 28678, 28679, 28680, 28681, + 28682, 28683, 28684, 28685, 28686, 28687, 28688, 28689, 28690, 28691, + 28692, 28693, 28694, 28695, 28696, 28697, 28698, 28699, 28700, 28701, + 28702, 28703, 28704, 28705, 28706, 28707, 28708, 28709, 28710, 28711, + 28712, 28713, 28714, 28715, 28716, 28717, 28718, 28719, 28720, 28721, + 28722, 28723, 28724, 28725, 28726, 28727, 28728, 28729, 28730, 28731, + 28732, 28733, 28734, 28735, 28736, 28737, 28738, 28739, 28740, 28741, + 28742, 28743, 28744, 28745, 28746, 28747, 28748, 28749, 28750, 28751, + 28752, 28753, 28754, 28755, 28756, 28757, 28758, 28759, 28760, 28761, + 28762, 28763, 28764, 28765, 28766, 28767, 28768, 28769, 28770, 28771, + 28772, 28773, 28774, 28775, 28776, 28777, 28778, 28779, 28780, 28781, + 28782, 28783, 28784, 28785, 28786, 28787, 28788, 28789, 28790, 28791, + 28792, 28793, 28794, 28795, 28796, 28797, 28798, 28799, 28800, 28801, + 28802, 28803, 28804, 28805, 28806, 28807, 28808, 28809, 28810, 28811, + 28812, 28813, 28814, 28815, 28816, 28817, 28818, 28819, 28820, 28821, + 28822, 28823, 28824, 28825, 28826, 28827, 28828, 28829, 28830, 28831, + 28832, 28833, 28834, 28835, 28836, 28837, 28838, 28839, 28840, 28841, + 28842, 28843, 28844, 28845, 28846, 28847, 28848, 28849, 28850, 28851, + 28852, 28853, 28854, 28855, 28856, 28857, 28858, 28859, 28860, 28861, + 28862, 28863, 28864, 28865, 28866, 28867, 28868, 28869, 28870, 28871, + 28872, 28873, 28874, 28875, 28876, 28877, 28878, 28879, 28880, 28881, + 28882, 28883, 28884, 28885, 28886, 28887, 28888, 28889, 28890, 28891, + 28892, 28893, 28894, 28895, 28896, 28897, 28898, 28899, 28900, 28901, + 28902, 28903, 28904, 28905, 28906, 28907, 28908, 28909, 28910, 28911, + 28912, 28913, 28914, 28915, 28916, 28917, 28918, 28919, 28920, 28921, + 28922, 28923, 28924, 28925, 28926, 28927, 28928, 28929, 28930, 28931, + 28932, 28933, 28934, 28935, 28936, 28937, 28938, 28939, 28940, 28941, + 28942, 28943, 28944, 28945, 28946, 28947, 28948, 28949, 28950, 28951, + 28952, 28953, 28954, 28955, 28956, 28957, 28958, 28959, 28960, 28961, + 28962, 28963, 28964, 28965, 28966, 28967, 28968, 28969, 28970, 28971, + 28972, 28973, 28974, 28975, 28976, 28977, 28978, 28979, 28980, 28981, + 28982, 28983, 28984, 28985, 28986, 28987, 28988, 28989, 28990, 28991, + 28992, 28993, 28994, 28995, 28996, 28997, 28998, 28999, 29000, 29001, + 29002, 29003, 29004, 29005, 29006, 29007, 29008, 29009, 29010, 29011, + 29012, 29013, 29014, 29015, 29016, 29017, 29018, 29019, 29020, 29021, + 29022, 29023, 29024, 29025, 29026, 29027, 29028, 29029, 29030, 29031, + 29032, 29033, 29034, 29035, 29036, 29037, 29038, 29039, 29040, 29041, + 29042, 29043, 29044, 29045, 29046, 29047, 29048, 29049, 29050, 29051, + 29052, 29053, 29054, 29055, 29056, 29057, 29058, 29059, 29060, 29061, + 29062, 29063, 29064, 29065, 29066, 29067, 29068, 29069, 29070, 29071, + 29072, 29073, 29074, 29075, 29076, 29077, 29078, 29079, 29080, 29081, + 29082, 29083, 29084, 29085, 29086, 29087, 29088, 29089, 29090, 29091, + 29092, 29093, 29094, 29095, 29096, 29097, 29098, 29099, 29100, 29101, + 29102, 29103, 29104, 29105, 29106, 29107, 29108, 29109, 29110, 29111, + 29112, 29113, 29114, 29115, 29116, 29117, 29118, 29119, 29120, 29121, + 29122, 29123, 29124, 29125, 29126, 29127, 29128, 29129, 29130, 29131, + 29132, 29133, 29134, 29135, 29136, 29137, 29138, 29139, 29140, 29141, + 29142, 29143, 29144, 29145, 29146, 29147, 29148, 29149, 29150, 29151, + 29152, 29153, 29154, 29155, 29156, 29157, 29158, 29159, 29160, 29161, + 29162, 29163, 29164, 29165, 29166, 29167, 29168, 29169, 29170, 29171, + 29172, 29173, 29174, 29175, 29176, 29177, 29178, 29179, 29180, 29181, + 29182, 29183, 29184, 29185, 29186, 29187, 29188, 29189, 29190, 29191, + 29192, 29193, 29194, 29195, 29196, 29197, 29198, 29199, 29200, 29201, + 29202, 29203, 29204, 29205, 29206, 29207, 29208, 29209, 29210, 29211, + 29212, 29213, 29214, 29215, 29216, 29217, 29218, 29219, 29220, 29221, + 29222, 29223, 29224, 29225, 29226, 29227, 29228, 29229, 29230, 29231, + 29232, 29233, 29234, 29235, 29236, 29237, 29238, 29239, 29240, 29241, + 29242, 29243, 29244, 29245, 29246, 29247, 29248, 29249, 29250, 29251, + 29252, 29253, 29254, 29255, 29256, 29257, 29258, 29259, 29260, 29261, + 29262, 29263, 29264, 29265, 29266, 29267, 29268, 29269, 29270, 29271, + 29272, 29273, 29274, 29275, 29276, 29277, 29278, 29279, 29280, 29281, + 29282, 29283, 29284, 29285, 29286, 29287, 29288, 29289, 29290, 29291, + 29292, 29293, 29294, 29295, 29296, 29297, 29298, 29299, 29300, 29301, + 29302, 29303, 29304, 29305, 29306, 29307, 29308, 29309, 29310, 29311, + 29312, 29313, 29314, 29315, 29316, 29317, 29318, 29319, 29320, 29321, + 29322, 29323, 29324, 29325, 29326, 29327, 29328, 29329, 29330, 29331, + 29332, 29333, 29334, 29335, 29336, 29337, 29338, 29339, 29340, 29341, + 29342, 29343, 29344, 29345, 29346, 29347, 29348, 29349, 29350, 29351, + 29352, 29353, 29354, 29355, 29356, 29357, 29358, 29359, 29360, 29361, + 29362, 29363, 29364, 29365, 29366, 29367, 29368, 29369, 29370, 29371, + 29372, 29373, 29374, 29375, 29376, 29377, 29378, 29379, 29380, 29381, + 29382, 29383, 29384, 29385, 29386, 29387, 29388, 29389, 29390, 29391, + 29392, 29393, 29394, 29395, 29396, 29397, 29398, 29399, 29400, 29401, + 29402, 29403, 29404, 29405, 29406, 29407, 29408, 29409, 29410, 29411, + 29412, 29413, 29414, 29415, 29416, 29417, 29418, 29419, 29420, 29421, + 29422, 29423, 29424, 29425, 29426, 29427, 29428, 29429, 29430, 29431, + 29432, 29433, 29434, 29435, 29436, 29437, 29438, 29439, 29440, 29441, + 29442, 29443, 29444, 29445, 29446, 29447, 29448, 29449, 29450, 29451, + 29452, 29453, 29454, 29455, 29456, 29457, 29458, 29459, 29460, 29461, + 29462, 29463, 29464, 29465, 29466, 29467, 29468, 29469, 29470, 29471, + 29472, 29473, 29474, 29475, 29476, 29477, 29478, 29479, 29480, 29481, + 29482, 29483, 29484, 29485, 29486, 29487, 29488, 29489, 29490, 29491, + 29492, 29493, 29494, 29495, 29496, 29497, 29498, 29499, 29500, 29501, + 29502, 29503, 29504, 29505, 29506, 29507, 29508, 29509, 29510, 29511, + 29512, 29513, 29514, 29515, 29516, 29517, 29518, 29519, 29520, 29521, + 29522, 29523, 29524, 29525, 29526, 29527, 29528, 29529, 29530, 29531, + 29532, 29533, 29534, 29535, 29536, 29537, 29538, 29539, 29540, 29541, + 29542, 29543, 29544, 29545, 29546, 29547, 29548, 29549, 29550, 29551, + 29552, 29553, 29554, 29555, 29556, 29557, 29558, 29559, 29560, 29561, + 29562, 29563, 29564, 29565, 29566, 29567, 29568, 29569, 29570, 29571, + 29572, 29573, 29574, 29575, 29576, 29577, 29578, 29579, 29580, 29581, + 29582, 29583, 29584, 29585, 29586, 29587, 29588, 29589, 29590, 29591, + 29592, 29593, 29594, 29595, 29596, 29597, 29598, 29599, 29600, 29601, + 29602, 29603, 29604, 29605, 29606, 29607, 29608, 29609, 29610, 29611, + 29612, 29613, 29614, 29615, 29616, 29617, 29618, 29619, 29620, 29621, + 29622, 29623, 29624, 29625, 29626, 29627, 29628, 29629, 29630, 29631, + 29632, 29633, 29634, 29635, 29636, 29637, 29638, 29639, 29640, 29641, + 29642, 29643, 29644, 29645, 29646, 29647, 29648, 29649, 29650, 29651, + 29652, 29653, 29654, 29655, 29656, 29657, 29658, 29659, 29660, 29661, + 29662, 29663, 29664, 29665, 29666, 29667, 29668, 29669, 29670, 29671, + 29672, 29673, 29674, 29675, 29676, 29677, 29678, 29679, 29680, 29681, + 29682, 29683, 29684, 29685, 29686, 29687, 29688, 29689, 29690, 29691, + 29692, 29693, 29694, 29695, 29696 ; + + node_num_map = 1173, 20323, 20325, 17777, 925, 12614, 1126, 20293, 4323, + 1174, 20321, 20324, 17742, 20291, 4322, 1175, 20319, 20322, 17691, 20288, + 4321, 1176, 20317, 20320, 17640, 20285, 4320, 1177, 20315, 20318, 17589, + 20282, 4319, 1178, 20313, 20316, 17538, 20279, 4318, 1179, 20311, 20314, + 17487, 20276, 4317, 1180, 20309, 20312, 17436, 20273, 4316, 1181, 20307, + 20310, 17385, 20270, 4315, 1182, 20305, 20308, 17334, 20267, 4314, 1183, + 20303, 20306, 17283, 20264, 4313, 1184, 20301, 20304, 17232, 20261, 4312, + 1185, 20299, 20302, 17181, 20258, 4311, 1186, 20297, 20300, 17130, 20255, + 4310, 1187, 20295, 20298, 17079, 20252, 4309, 929, 19446, 20296, 17028, + 20249, 1094, 20290, 20294, 12611, 1127, 20246, 4308, 20287, 20292, 20244, + 4307, 20284, 20289, 20241, 4306, 20281, 20286, 20238, 4305, 20278, 20283, + 20235, 4304, 20275, 20280, 20232, 4303, 20272, 20277, 20229, 4302, 20269, + 20274, 20226, 4301, 20266, 20271, 20223, 4300, 20263, 20268, 20220, 4299, + 20260, 20265, 20217, 4298, 20257, 20262, 20214, 4297, 20254, 20259, + 20211, 4296, 20251, 20256, 20208, 4295, 20248, 20253, 20205, 4294, 19449, + 20250, 20202, 1095, 20243, 20247, 12608, 1128, 20199, 4293, 20240, 20245, + 20197, 4292, 20237, 20242, 20194, 4291, 20234, 20239, 20191, 4290, 20231, + 20236, 20188, 4289, 20228, 20233, 20185, 4288, 20225, 20230, 20182, 4287, + 20222, 20227, 20179, 4286, 20219, 20224, 20176, 4285, 20216, 20221, + 20173, 4284, 20213, 20218, 20170, 4283, 20210, 20215, 20167, 4282, 20207, + 20212, 20164, 4281, 20204, 20209, 20161, 4280, 20201, 20206, 20158, 4279, + 19452, 20203, 20155, 1096, 20196, 20200, 12605, 1129, 20152, 4278, 20193, + 20198, 20150, 4277, 20190, 20195, 20147, 4276, 20187, 20192, 20144, 4275, + 20184, 20189, 20141, 4274, 20181, 20186, 20138, 4273, 20178, 20183, + 20135, 4272, 20175, 20180, 20132, 4271, 20172, 20177, 20129, 4270, 20169, + 20174, 20126, 4269, 20166, 20171, 20123, 4268, 20163, 20168, 20120, 4267, + 20160, 20165, 20117, 4266, 20157, 20162, 20114, 4265, 20154, 20159, + 20111, 4264, 19455, 20156, 20108, 1097, 20149, 20153, 12602, 1130, 20105, + 4263, 20146, 20151, 20103, 4262, 20143, 20148, 20100, 4261, 20140, 20145, + 20097, 4260, 20137, 20142, 20094, 4259, 20134, 20139, 20091, 4258, 20131, + 20136, 20088, 4257, 20128, 20133, 20085, 4256, 20125, 20130, 20082, 4255, + 20122, 20127, 20079, 4254, 20119, 20124, 20076, 4253, 20116, 20121, + 20073, 4252, 20113, 20118, 20070, 4251, 20110, 20115, 20067, 4250, 20107, + 20112, 20064, 4249, 19458, 20109, 20061, 1098, 20102, 20106, 12599, 1131, + 20058, 4248, 20099, 20104, 20056, 4247, 20096, 20101, 20053, 4246, 20093, + 20098, 20050, 4245, 20090, 20095, 20047, 4244, 20087, 20092, 20044, 4243, + 20084, 20089, 20041, 4242, 20081, 20086, 20038, 4241, 20078, 20083, + 20035, 4240, 20075, 20080, 20032, 4239, 20072, 20077, 20029, 4238, 20069, + 20074, 20026, 4237, 20066, 20071, 20023, 4236, 20063, 20068, 20020, 4235, + 20060, 20065, 20017, 4234, 19461, 20062, 20014, 1099, 20055, 20059, + 12596, 1132, 20011, 4233, 20052, 20057, 20009, 4232, 20049, 20054, 20006, + 4231, 20046, 20051, 20003, 4230, 20043, 20048, 20000, 4229, 20040, 20045, + 19997, 4228, 20037, 20042, 19994, 4227, 20034, 20039, 19991, 4226, 20031, + 20036, 19988, 4225, 20028, 20033, 19985, 4224, 20025, 20030, 19982, 4223, + 20022, 20027, 19979, 4222, 20019, 20024, 19976, 4221, 20016, 20021, + 19973, 4220, 20013, 20018, 19970, 4219, 19464, 20015, 19967, 1100, 20008, + 20012, 12593, 1133, 19964, 4218, 20005, 20010, 19962, 4217, 20002, 20007, + 19959, 4216, 19999, 20004, 19956, 4215, 19996, 20001, 19953, 4214, 19993, + 19998, 19950, 4213, 19990, 19995, 19947, 4212, 19987, 19992, 19944, 4211, + 19984, 19989, 19941, 4210, 19981, 19986, 19938, 4209, 19978, 19983, + 19935, 4208, 19975, 19980, 19932, 4207, 19972, 19977, 19929, 4206, 19969, + 19974, 19926, 4205, 19966, 19971, 19923, 4204, 19467, 19968, 19920, 1101, + 19961, 19965, 12590, 1134, 19917, 4203, 19958, 19963, 19915, 4202, 19955, + 19960, 19912, 4201, 19952, 19957, 19909, 4200, 19949, 19954, 19906, 4199, + 19946, 19951, 19903, 4198, 19943, 19948, 19900, 4197, 19940, 19945, + 19897, 4196, 19937, 19942, 19894, 4195, 19934, 19939, 19891, 4194, 19931, + 19936, 19888, 4193, 19928, 19933, 19885, 4192, 19925, 19930, 19882, 4191, + 19922, 19927, 19879, 4190, 19919, 19924, 19876, 4189, 19470, 19921, + 19873, 1102, 19914, 19918, 12587, 1135, 19870, 4188, 19911, 19916, 19868, + 4187, 19908, 19913, 19865, 4186, 19905, 19910, 19862, 4185, 19902, 19907, + 19859, 4184, 19899, 19904, 19856, 4183, 19896, 19901, 19853, 4182, 19893, + 19898, 19850, 4181, 19890, 19895, 19847, 4180, 19887, 19892, 19844, 4179, + 19884, 19889, 19841, 4178, 19881, 19886, 19838, 4177, 19878, 19883, + 19835, 4176, 19875, 19880, 19832, 4175, 19872, 19877, 19829, 4174, 19473, + 19874, 19826, 1103, 19867, 19871, 12584, 1136, 19823, 4173, 19864, 19869, + 19821, 4172, 19861, 19866, 19818, 4171, 19858, 19863, 19815, 4170, 19855, + 19860, 19812, 4169, 19852, 19857, 19809, 4168, 19849, 19854, 19806, 4167, + 19846, 19851, 19803, 4166, 19843, 19848, 19800, 4165, 19840, 19845, + 19797, 4164, 19837, 19842, 19794, 4163, 19834, 19839, 19791, 4162, 19831, + 19836, 19788, 4161, 19828, 19833, 19785, 4160, 19825, 19830, 19782, 4159, + 19476, 19827, 19779, 1104, 19820, 19824, 12581, 1137, 19776, 4158, 19817, + 19822, 19774, 4157, 19814, 19819, 19771, 4156, 19811, 19816, 19768, 4155, + 19808, 19813, 19765, 4154, 19805, 19810, 19762, 4153, 19802, 19807, + 19759, 4152, 19799, 19804, 19756, 4151, 19796, 19801, 19753, 4150, 19793, + 19798, 19750, 4149, 19790, 19795, 19747, 4148, 19787, 19792, 19744, 4147, + 19784, 19789, 19741, 4146, 19781, 19786, 19738, 4145, 19778, 19783, + 19735, 4144, 19479, 19780, 19732, 1105, 19773, 19777, 12578, 1138, 19729, + 4143, 19770, 19775, 19727, 4142, 19767, 19772, 19724, 4141, 19764, 19769, + 19721, 4140, 19761, 19766, 19718, 4139, 19758, 19763, 19715, 4138, 19755, + 19760, 19712, 4137, 19752, 19757, 19709, 4136, 19749, 19754, 19706, 4135, + 19746, 19751, 19703, 4134, 19743, 19748, 19700, 4133, 19740, 19745, + 19697, 4132, 19737, 19742, 19694, 4131, 19734, 19739, 19691, 4130, 19731, + 19736, 19688, 4129, 19482, 19733, 19685, 1106, 19726, 19730, 12575, 1139, + 19682, 4128, 19723, 19728, 19680, 4127, 19720, 19725, 19677, 4126, 19717, + 19722, 19674, 4125, 19714, 19719, 19671, 4124, 19711, 19716, 19668, 4123, + 19708, 19713, 19665, 4122, 19705, 19710, 19662, 4121, 19702, 19707, + 19659, 4120, 19699, 19704, 19656, 4119, 19696, 19701, 19653, 4118, 19693, + 19698, 19650, 4117, 19690, 19695, 19647, 4116, 19687, 19692, 19644, 4115, + 19684, 19689, 19641, 4114, 19485, 19686, 19638, 1107, 19679, 19683, + 12572, 1140, 19635, 4113, 19676, 19681, 19633, 4112, 19673, 19678, 19630, + 4111, 19670, 19675, 19627, 4110, 19667, 19672, 19624, 4109, 19664, 19669, + 19621, 4108, 19661, 19666, 19618, 4107, 19658, 19663, 19615, 4106, 19655, + 19660, 19612, 4105, 19652, 19657, 19609, 4104, 19649, 19654, 19606, 4103, + 19646, 19651, 19603, 4102, 19643, 19648, 19600, 4101, 19640, 19645, + 19597, 4100, 19637, 19642, 19594, 4099, 19488, 19639, 19591, 1108, 19632, + 19636, 12569, 1141, 19588, 4098, 19629, 19634, 19586, 4097, 19626, 19631, + 19583, 4096, 19623, 19628, 19580, 4095, 19620, 19625, 19577, 4094, 19617, + 19622, 19574, 4093, 19614, 19619, 19571, 4092, 19611, 19616, 19568, 4091, + 19608, 19613, 19565, 4090, 19605, 19610, 19562, 4089, 19602, 19607, + 19559, 4088, 19599, 19604, 19556, 4087, 19596, 19601, 19553, 4086, 19593, + 19598, 19550, 4085, 19590, 19595, 19547, 4084, 19491, 19592, 19544, 1109, + 19585, 19589, 12566, 926, 19541, 1125, 19582, 19587, 19539, 1124, 19579, + 19584, 19536, 1123, 19576, 19581, 19533, 1122, 19573, 19578, 19530, 1121, + 19570, 19575, 19527, 1120, 19567, 19572, 19524, 1119, 19564, 19569, + 19521, 1118, 19561, 19566, 19518, 1117, 19558, 19563, 19515, 1116, 19555, + 19560, 19512, 1115, 19552, 19557, 19509, 1114, 19549, 19554, 19506, 1113, + 19546, 19551, 19503, 1112, 19543, 19548, 19500, 1111, 19494, 19545, + 19497, 1110, 19538, 19542, 11702, 930, 19443, 4083, 19535, 19540, 19441, + 4082, 19532, 19537, 19438, 4081, 19529, 19534, 19435, 4080, 19526, 19531, + 19432, 4079, 19523, 19528, 19429, 4078, 19520, 19525, 19426, 4077, 19517, + 19522, 19423, 4076, 19514, 19519, 19420, 4075, 19511, 19516, 19417, 4074, + 19508, 19513, 19414, 4073, 19505, 19510, 19411, 4072, 19502, 19507, + 19408, 4071, 19499, 19504, 19405, 4070, 19496, 19501, 19402, 4069, 19493, + 19498, 19399, 4068, 19490, 19495, 19396, 4067, 19487, 19492, 19393, 4066, + 19484, 19489, 19390, 4065, 19481, 19486, 19387, 4064, 19478, 19483, + 19384, 4063, 19475, 19480, 19381, 4062, 19472, 19477, 19378, 4061, 19469, + 19474, 19375, 4060, 19466, 19471, 19372, 4059, 19463, 19468, 19369, 4058, + 19460, 19465, 19366, 4057, 19457, 19462, 19363, 4056, 19454, 19459, + 19360, 4055, 19451, 19456, 19357, 4054, 19448, 19453, 19354, 4053, 19445, + 19450, 19351, 4052, 16977, 19447, 19348, 1077, 19440, 19444, 11602, 931, + 19345, 4051, 19437, 19442, 19343, 4050, 19434, 19439, 19340, 4049, 19431, + 19436, 19337, 4048, 19428, 19433, 19334, 4047, 19425, 19430, 19331, 4046, + 19422, 19427, 19328, 4045, 19419, 19424, 19325, 4044, 19416, 19421, + 19322, 4043, 19413, 19418, 19319, 4042, 19410, 19415, 19316, 4041, 19407, + 19412, 19313, 4040, 19404, 19409, 19310, 4039, 19401, 19406, 19307, 4038, + 19398, 19403, 19304, 4037, 19395, 19400, 19301, 4036, 19392, 19397, + 19298, 4035, 19389, 19394, 19295, 4034, 19386, 19391, 19292, 4033, 19383, + 19388, 19289, 4032, 19380, 19385, 19286, 4031, 19377, 19382, 19283, 4030, + 19374, 19379, 19280, 4029, 19371, 19376, 19277, 4028, 19368, 19373, + 19274, 4027, 19365, 19370, 19271, 4026, 19362, 19367, 19268, 4025, 19359, + 19364, 19265, 4024, 19356, 19361, 19262, 4023, 19353, 19358, 19259, 4022, + 19350, 19355, 19256, 4021, 19347, 19352, 19253, 4020, 16878, 19349, + 19250, 1078, 19342, 19346, 11502, 932, 19247, 4019, 19339, 19344, 19245, + 4018, 19336, 19341, 19242, 4017, 19333, 19338, 19239, 4016, 19330, 19335, + 19236, 4015, 19327, 19332, 19233, 4014, 19324, 19329, 19230, 4013, 19321, + 19326, 19227, 4012, 19318, 19323, 19224, 4011, 19315, 19320, 19221, 4010, + 19312, 19317, 19218, 4009, 19309, 19314, 19215, 4008, 19306, 19311, + 19212, 4007, 19303, 19308, 19209, 4006, 19300, 19305, 19206, 4005, 19297, + 19302, 19203, 4004, 19294, 19299, 19200, 4003, 19291, 19296, 19197, 4002, + 19288, 19293, 19194, 4001, 19285, 19290, 19191, 4000, 19282, 19287, + 19188, 3999, 19279, 19284, 19185, 3998, 19276, 19281, 19182, 3997, 19273, + 19278, 19179, 3996, 19270, 19275, 19176, 3995, 19267, 19272, 19173, 3994, + 19264, 19269, 19170, 3993, 19261, 19266, 19167, 3992, 19258, 19263, + 19164, 3991, 19255, 19260, 19161, 3990, 19252, 19257, 19158, 3989, 19249, + 19254, 19155, 3988, 16779, 19251, 19152, 1079, 19244, 19248, 11402, 933, + 19149, 3987, 19241, 19246, 19147, 3986, 19238, 19243, 19144, 3985, 19235, + 19240, 19141, 3984, 19232, 19237, 19138, 3983, 19229, 19234, 19135, 3982, + 19226, 19231, 19132, 3981, 19223, 19228, 19129, 3980, 19220, 19225, + 19126, 3979, 19217, 19222, 19123, 3978, 19214, 19219, 19120, 3977, 19211, + 19216, 19117, 3976, 19208, 19213, 19114, 3975, 19205, 19210, 19111, 3974, + 19202, 19207, 19108, 3973, 19199, 19204, 19105, 3972, 19196, 19201, + 19102, 3971, 19193, 19198, 19099, 3970, 19190, 19195, 19096, 3969, 19187, + 19192, 19093, 3968, 19184, 19189, 19090, 3967, 19181, 19186, 19087, 3966, + 19178, 19183, 19084, 3965, 19175, 19180, 19081, 3964, 19172, 19177, + 19078, 3963, 19169, 19174, 19075, 3962, 19166, 19171, 19072, 3961, 19163, + 19168, 19069, 3960, 19160, 19165, 19066, 3959, 19157, 19162, 19063, 3958, + 19154, 19159, 19060, 3957, 19151, 19156, 19057, 3956, 16680, 19153, + 19054, 1080, 19146, 19150, 11302, 934, 19051, 3955, 19143, 19148, 19049, + 3954, 19140, 19145, 19046, 3953, 19137, 19142, 19043, 3952, 19134, 19139, + 19040, 3951, 19131, 19136, 19037, 3950, 19128, 19133, 19034, 3949, 19125, + 19130, 19031, 3948, 19122, 19127, 19028, 3947, 19119, 19124, 19025, 3946, + 19116, 19121, 19022, 3945, 19113, 19118, 19019, 3944, 19110, 19115, + 19016, 3943, 19107, 19112, 19013, 3942, 19104, 19109, 19010, 3941, 19101, + 19106, 19007, 3940, 19098, 19103, 19004, 3939, 19095, 19100, 19001, 3938, + 19092, 19097, 18998, 3937, 19089, 19094, 18995, 3936, 19086, 19091, + 18992, 3935, 19083, 19088, 18989, 3934, 19080, 19085, 18986, 3933, 19077, + 19082, 18983, 3932, 19074, 19079, 18980, 3931, 19071, 19076, 18977, 3930, + 19068, 19073, 18974, 3929, 19065, 19070, 18971, 3928, 19062, 19067, + 18968, 3927, 19059, 19064, 18965, 3926, 19056, 19061, 18962, 3925, 19053, + 19058, 18959, 3924, 16581, 19055, 18956, 1081, 19048, 19052, 11202, 935, + 18953, 3923, 19045, 19050, 18951, 3922, 19042, 19047, 18948, 3921, 19039, + 19044, 18945, 3920, 19036, 19041, 18942, 3919, 19033, 19038, 18939, 3918, + 19030, 19035, 18936, 3917, 19027, 19032, 18933, 3916, 19024, 19029, + 18930, 3915, 19021, 19026, 18927, 3914, 19018, 19023, 18924, 3913, 19015, + 19020, 18921, 3912, 19012, 19017, 18918, 3911, 19009, 19014, 18915, 3910, + 19006, 19011, 18912, 3909, 19003, 19008, 18909, 3908, 19000, 19005, + 18906, 3907, 18997, 19002, 18903, 3906, 18994, 18999, 18900, 3905, 18991, + 18996, 18897, 3904, 18988, 18993, 18894, 3903, 18985, 18990, 18891, 3902, + 18982, 18987, 18888, 3901, 18979, 18984, 18885, 3900, 18976, 18981, + 18882, 3899, 18973, 18978, 18879, 3898, 18970, 18975, 18876, 3897, 18967, + 18972, 18873, 3896, 18964, 18969, 18870, 3895, 18961, 18966, 18867, 3894, + 18958, 18963, 18864, 3893, 18955, 18960, 18861, 3892, 16482, 18957, + 18858, 1082, 18950, 18954, 11102, 936, 18855, 3891, 18947, 18952, 18853, + 3890, 18944, 18949, 18850, 3889, 18941, 18946, 18847, 3888, 18938, 18943, + 18844, 3887, 18935, 18940, 18841, 3886, 18932, 18937, 18838, 3885, 18929, + 18934, 18835, 3884, 18926, 18931, 18832, 3883, 18923, 18928, 18829, 3882, + 18920, 18925, 18826, 3881, 18917, 18922, 18823, 3880, 18914, 18919, + 18820, 3879, 18911, 18916, 18817, 3878, 18908, 18913, 18814, 3877, 18905, + 18910, 18811, 3876, 18902, 18907, 18808, 3875, 18899, 18904, 18805, 3874, + 18896, 18901, 18802, 3873, 18893, 18898, 18799, 3872, 18890, 18895, + 18796, 3871, 18887, 18892, 18793, 3870, 18884, 18889, 18790, 3869, 18881, + 18886, 18787, 3868, 18878, 18883, 18784, 3867, 18875, 18880, 18781, 3866, + 18872, 18877, 18778, 3865, 18869, 18874, 18775, 3864, 18866, 18871, + 18772, 3863, 18863, 18868, 18769, 3862, 18860, 18865, 18766, 3861, 18857, + 18862, 18763, 3860, 16383, 18859, 18760, 1083, 18852, 18856, 11002, 937, + 18757, 3859, 18849, 18854, 18755, 3858, 18846, 18851, 18752, 3857, 18843, + 18848, 18749, 3856, 18840, 18845, 18746, 3855, 18837, 18842, 18743, 3854, + 18834, 18839, 18740, 3853, 18831, 18836, 18737, 3852, 18828, 18833, + 18734, 3851, 18825, 18830, 18731, 3850, 18822, 18827, 18728, 3849, 18819, + 18824, 18725, 3848, 18816, 18821, 18722, 3847, 18813, 18818, 18719, 3846, + 18810, 18815, 18716, 3845, 18807, 18812, 18713, 3844, 18804, 18809, + 18710, 3843, 18801, 18806, 18707, 3842, 18798, 18803, 18704, 3841, 18795, + 18800, 18701, 3840, 18792, 18797, 18698, 3839, 18789, 18794, 18695, 3838, + 18786, 18791, 18692, 3837, 18783, 18788, 18689, 3836, 18780, 18785, + 18686, 3835, 18777, 18782, 18683, 3834, 18774, 18779, 18680, 3833, 18771, + 18776, 18677, 3832, 18768, 18773, 18674, 3831, 18765, 18770, 18671, 3830, + 18762, 18767, 18668, 3829, 18759, 18764, 18665, 3828, 16284, 18761, + 18662, 1084, 18754, 18758, 10902, 938, 18659, 3827, 18751, 18756, 18657, + 3826, 18748, 18753, 18654, 3825, 18745, 18750, 18651, 3824, 18742, 18747, + 18648, 3823, 18739, 18744, 18645, 3822, 18736, 18741, 18642, 3821, 18733, + 18738, 18639, 3820, 18730, 18735, 18636, 3819, 18727, 18732, 18633, 3818, + 18724, 18729, 18630, 3817, 18721, 18726, 18627, 3816, 18718, 18723, + 18624, 3815, 18715, 18720, 18621, 3814, 18712, 18717, 18618, 3813, 18709, + 18714, 18615, 3812, 18706, 18711, 18612, 3811, 18703, 18708, 18609, 3810, + 18700, 18705, 18606, 3809, 18697, 18702, 18603, 3808, 18694, 18699, + 18600, 3807, 18691, 18696, 18597, 3806, 18688, 18693, 18594, 3805, 18685, + 18690, 18591, 3804, 18682, 18687, 18588, 3803, 18679, 18684, 18585, 3802, + 18676, 18681, 18582, 3801, 18673, 18678, 18579, 3800, 18670, 18675, + 18576, 3799, 18667, 18672, 18573, 3798, 18664, 18669, 18570, 3797, 18661, + 18666, 18567, 3796, 16185, 18663, 18564, 1085, 18656, 18660, 10802, 939, + 18561, 3795, 18653, 18658, 18559, 3794, 18650, 18655, 18556, 3793, 18647, + 18652, 18553, 3792, 18644, 18649, 18550, 3791, 18641, 18646, 18547, 3790, + 18638, 18643, 18544, 3789, 18635, 18640, 18541, 3788, 18632, 18637, + 18538, 3787, 18629, 18634, 18535, 3786, 18626, 18631, 18532, 3785, 18623, + 18628, 18529, 3784, 18620, 18625, 18526, 3783, 18617, 18622, 18523, 3782, + 18614, 18619, 18520, 3781, 18611, 18616, 18517, 3780, 18608, 18613, + 18514, 3779, 18605, 18610, 18511, 3778, 18602, 18607, 18508, 3777, 18599, + 18604, 18505, 3776, 18596, 18601, 18502, 3775, 18593, 18598, 18499, 3774, + 18590, 18595, 18496, 3773, 18587, 18592, 18493, 3772, 18584, 18589, + 18490, 3771, 18581, 18586, 18487, 3770, 18578, 18583, 18484, 3769, 18575, + 18580, 18481, 3768, 18572, 18577, 18478, 3767, 18569, 18574, 18475, 3766, + 18566, 18571, 18472, 3765, 18563, 18568, 18469, 3764, 16086, 18565, + 18466, 1086, 18558, 18562, 10702, 940, 18463, 3763, 18555, 18560, 18461, + 3762, 18552, 18557, 18458, 3761, 18549, 18554, 18455, 3760, 18546, 18551, + 18452, 3759, 18543, 18548, 18449, 3758, 18540, 18545, 18446, 3757, 18537, + 18542, 18443, 3756, 18534, 18539, 18440, 3755, 18531, 18536, 18437, 3754, + 18528, 18533, 18434, 3753, 18525, 18530, 18431, 3752, 18522, 18527, + 18428, 3751, 18519, 18524, 18425, 3750, 18516, 18521, 18422, 3749, 18513, + 18518, 18419, 3748, 18510, 18515, 18416, 3747, 18507, 18512, 18413, 3746, + 18504, 18509, 18410, 3745, 18501, 18506, 18407, 3744, 18498, 18503, + 18404, 3743, 18495, 18500, 18401, 3742, 18492, 18497, 18398, 3741, 18489, + 18494, 18395, 3740, 18486, 18491, 18392, 3739, 18483, 18488, 18389, 3738, + 18480, 18485, 18386, 3737, 18477, 18482, 18383, 3736, 18474, 18479, + 18380, 3735, 18471, 18476, 18377, 3734, 18468, 18473, 18374, 3733, 18465, + 18470, 18371, 3732, 15987, 18467, 18368, 1087, 18460, 18464, 10602, 941, + 18365, 3731, 18457, 18462, 18363, 3730, 18454, 18459, 18360, 3729, 18451, + 18456, 18357, 3728, 18448, 18453, 18354, 3727, 18445, 18450, 18351, 3726, + 18442, 18447, 18348, 3725, 18439, 18444, 18345, 3724, 18436, 18441, + 18342, 3723, 18433, 18438, 18339, 3722, 18430, 18435, 18336, 3721, 18427, + 18432, 18333, 3720, 18424, 18429, 18330, 3719, 18421, 18426, 18327, 3718, + 18418, 18423, 18324, 3717, 18415, 18420, 18321, 3716, 18412, 18417, + 18318, 3715, 18409, 18414, 18315, 3714, 18406, 18411, 18312, 3713, 18403, + 18408, 18309, 3712, 18400, 18405, 18306, 3711, 18397, 18402, 18303, 3710, + 18394, 18399, 18300, 3709, 18391, 18396, 18297, 3708, 18388, 18393, + 18294, 3707, 18385, 18390, 18291, 3706, 18382, 18387, 18288, 3705, 18379, + 18384, 18285, 3704, 18376, 18381, 18282, 3703, 18373, 18378, 18279, 3702, + 18370, 18375, 18276, 3701, 18367, 18372, 18273, 3700, 15888, 18369, + 18270, 1088, 18362, 18366, 10502, 942, 18267, 3699, 18359, 18364, 18265, + 3698, 18356, 18361, 18262, 3697, 18353, 18358, 18259, 3696, 18350, 18355, + 18256, 3695, 18347, 18352, 18253, 3694, 18344, 18349, 18250, 3693, 18341, + 18346, 18247, 3692, 18338, 18343, 18244, 3691, 18335, 18340, 18241, 3690, + 18332, 18337, 18238, 3689, 18329, 18334, 18235, 3688, 18326, 18331, + 18232, 3687, 18323, 18328, 18229, 3686, 18320, 18325, 18226, 3685, 18317, + 18322, 18223, 3684, 18314, 18319, 18220, 3683, 18311, 18316, 18217, 3682, + 18308, 18313, 18214, 3681, 18305, 18310, 18211, 3680, 18302, 18307, + 18208, 3679, 18299, 18304, 18205, 3678, 18296, 18301, 18202, 3677, 18293, + 18298, 18199, 3676, 18290, 18295, 18196, 3675, 18287, 18292, 18193, 3674, + 18284, 18289, 18190, 3673, 18281, 18286, 18187, 3672, 18278, 18283, + 18184, 3671, 18275, 18280, 18181, 3670, 18272, 18277, 18178, 3669, 18269, + 18274, 18175, 3668, 15789, 18271, 18172, 1089, 18264, 18268, 10402, 943, + 18169, 3667, 18261, 18266, 18167, 3666, 18258, 18263, 18164, 3665, 18255, + 18260, 18161, 3664, 18252, 18257, 18158, 3663, 18249, 18254, 18155, 3662, + 18246, 18251, 18152, 3661, 18243, 18248, 18149, 3660, 18240, 18245, + 18146, 3659, 18237, 18242, 18143, 3658, 18234, 18239, 18140, 3657, 18231, + 18236, 18137, 3656, 18228, 18233, 18134, 3655, 18225, 18230, 18131, 3654, + 18222, 18227, 18128, 3653, 18219, 18224, 18125, 3652, 18216, 18221, + 18122, 3651, 18213, 18218, 18119, 3650, 18210, 18215, 18116, 3649, 18207, + 18212, 18113, 3648, 18204, 18209, 18110, 3647, 18201, 18206, 18107, 3646, + 18198, 18203, 18104, 3645, 18195, 18200, 18101, 3644, 18192, 18197, + 18098, 3643, 18189, 18194, 18095, 3642, 18186, 18191, 18092, 3641, 18183, + 18188, 18089, 3640, 18180, 18185, 18086, 3639, 18177, 18182, 18083, 3638, + 18174, 18179, 18080, 3637, 18171, 18176, 18077, 3636, 15690, 18173, + 18074, 1090, 18166, 18170, 10302, 944, 18071, 3635, 18163, 18168, 18069, + 3634, 18160, 18165, 18066, 3633, 18157, 18162, 18063, 3632, 18154, 18159, + 18060, 3631, 18151, 18156, 18057, 3630, 18148, 18153, 18054, 3629, 18145, + 18150, 18051, 3628, 18142, 18147, 18048, 3627, 18139, 18144, 18045, 3626, + 18136, 18141, 18042, 3625, 18133, 18138, 18039, 3624, 18130, 18135, + 18036, 3623, 18127, 18132, 18033, 3622, 18124, 18129, 18030, 3621, 18121, + 18126, 18027, 3620, 18118, 18123, 18024, 3619, 18115, 18120, 18021, 3618, + 18112, 18117, 18018, 3617, 18109, 18114, 18015, 3616, 18106, 18111, + 18012, 3615, 18103, 18108, 18009, 3614, 18100, 18105, 18006, 3613, 18097, + 18102, 18003, 3612, 18094, 18099, 18000, 3611, 18091, 18096, 17997, 3610, + 18088, 18093, 17994, 3609, 18085, 18090, 17991, 3608, 18082, 18087, + 17988, 3607, 18079, 18084, 17985, 3606, 18076, 18081, 17982, 3605, 18073, + 18078, 17979, 3604, 15591, 18075, 17976, 1091, 18068, 18072, 10202, 945, + 17973, 3603, 18065, 18070, 17971, 3602, 18062, 18067, 17968, 3601, 18059, + 18064, 17965, 3600, 18056, 18061, 17962, 3599, 18053, 18058, 17959, 3598, + 18050, 18055, 17956, 3597, 18047, 18052, 17953, 3596, 18044, 18049, + 17950, 3595, 18041, 18046, 17947, 3594, 18038, 18043, 17944, 3593, 18035, + 18040, 17941, 3592, 18032, 18037, 17938, 3591, 18029, 18034, 17935, 3590, + 18026, 18031, 17932, 3589, 18023, 18028, 17929, 3588, 18020, 18025, + 17926, 3587, 18017, 18022, 17923, 3586, 18014, 18019, 17920, 3585, 18011, + 18016, 17917, 3584, 18008, 18013, 17914, 3583, 18005, 18010, 17911, 3582, + 18002, 18007, 17908, 3581, 17999, 18004, 17905, 3580, 17996, 18001, + 17902, 3579, 17993, 17998, 17899, 3578, 17990, 17995, 17896, 3577, 17987, + 17992, 17893, 3576, 17984, 17989, 17890, 3575, 17981, 17986, 17887, 3574, + 17978, 17983, 17884, 3573, 17975, 17980, 17881, 3572, 15492, 17977, + 17878, 1092, 17970, 17974, 10102, 946, 17875, 3571, 17967, 17972, 17873, + 3570, 17964, 17969, 17870, 3569, 17961, 17966, 17867, 3568, 17958, 17963, + 17864, 3567, 17955, 17960, 17861, 3566, 17952, 17957, 17858, 3565, 17949, + 17954, 17855, 3564, 17946, 17951, 17852, 3563, 17943, 17948, 17849, 3562, + 17940, 17945, 17846, 3561, 17937, 17942, 17843, 3560, 17934, 17939, + 17840, 3559, 17931, 17936, 17837, 3558, 17928, 17933, 17834, 3557, 17925, + 17930, 17831, 3556, 17922, 17927, 17828, 3555, 17919, 17924, 17825, 3554, + 17916, 17921, 17822, 3553, 17913, 17918, 17819, 3552, 17910, 17915, + 17816, 3551, 17907, 17912, 17813, 3550, 17904, 17909, 17810, 3549, 17901, + 17906, 17807, 3548, 17898, 17903, 17804, 3547, 17895, 17900, 17801, 3546, + 17892, 17897, 17798, 3545, 17889, 17894, 17795, 3544, 17886, 17891, + 17792, 3543, 17883, 17888, 17789, 3542, 17880, 17885, 17786, 3541, 17877, + 17882, 17783, 3540, 15393, 17879, 17780, 1093, 17872, 17876, 10002, 265, + 8020, 396, 17869, 17874, 8040, 395, 17866, 17871, 8055, 394, 17863, + 17868, 8070, 393, 17860, 17865, 8085, 392, 17857, 17862, 8100, 391, + 17854, 17859, 8115, 390, 17851, 17856, 8130, 389, 17848, 17853, 8145, + 388, 17845, 17850, 8160, 387, 17842, 17847, 8175, 386, 17839, 17844, + 8190, 385, 17836, 17841, 8205, 384, 17833, 17838, 8220, 383, 17830, + 17835, 8235, 382, 17827, 17832, 8250, 381, 17824, 17829, 8265, 380, + 17821, 17826, 8280, 379, 17818, 17823, 8295, 378, 17815, 17820, 8310, + 377, 17812, 17817, 8325, 376, 17809, 17814, 8340, 375, 17806, 17811, + 8355, 374, 17803, 17808, 8370, 373, 17800, 17805, 8385, 372, 17797, + 17802, 8400, 371, 17794, 17799, 8415, 370, 17791, 17796, 8430, 369, + 17788, 17793, 8445, 368, 17785, 17790, 8460, 367, 17782, 17787, 8475, + 366, 17779, 17784, 8490, 365, 15294, 17781, 8505, 364, 9990, 10003, 266, + 10000, 1188, 10001, 9975, 10006, 267, 10004, 1189, 10005, 9960, 10009, + 268, 10007, 1190, 10008, 9945, 10012, 269, 10010, 1191, 10011, 9930, + 10015, 270, 10013, 1192, 10014, 9915, 10018, 271, 10016, 1193, 10017, + 9900, 10021, 272, 10019, 1194, 10020, 9885, 10024, 273, 10022, 1195, + 10023, 9870, 10027, 274, 10025, 1196, 10026, 9855, 10030, 275, 10028, + 1197, 10029, 9840, 10033, 276, 10031, 1198, 10032, 9825, 10036, 277, + 10034, 1199, 10035, 9810, 10039, 278, 10037, 1200, 10038, 9795, 10042, + 279, 10040, 1201, 10041, 9780, 10045, 280, 10043, 1202, 10044, 9765, + 10048, 281, 10046, 1203, 10047, 9750, 10051, 282, 10049, 1204, 10050, + 9735, 10054, 283, 10052, 1205, 10053, 9720, 10057, 284, 10055, 1206, + 10056, 9705, 10060, 285, 10058, 1207, 10059, 9690, 10063, 286, 10061, + 1208, 10062, 9675, 10066, 287, 10064, 1209, 10065, 9660, 10069, 288, + 10067, 1210, 10068, 9645, 10072, 289, 10070, 1211, 10071, 9630, 10075, + 290, 10073, 1212, 10074, 9615, 10078, 291, 10076, 1213, 10077, 9600, + 10081, 292, 10079, 1214, 10080, 9585, 10084, 293, 10082, 1215, 10083, + 9570, 10087, 294, 10085, 1216, 10086, 9555, 10090, 295, 10088, 1217, + 10089, 9540, 10093, 296, 10091, 1218, 10092, 9525, 10096, 297, 10094, + 1219, 10095, 9510, 10099, 298, 10097, 995, 10098, 10103, 10100, 1220, + 10101, 10106, 10104, 1221, 10105, 10109, 10107, 1222, 10108, 10112, + 10110, 1223, 10111, 10115, 10113, 1224, 10114, 10118, 10116, 1225, 10117, + 10121, 10119, 1226, 10120, 10124, 10122, 1227, 10123, 10127, 10125, 1228, + 10126, 10130, 10128, 1229, 10129, 10133, 10131, 1230, 10132, 10136, + 10134, 1231, 10135, 10139, 10137, 1232, 10138, 10142, 10140, 1233, 10141, + 10145, 10143, 1234, 10144, 10148, 10146, 1235, 10147, 10151, 10149, 1236, + 10150, 10154, 10152, 1237, 10153, 10157, 10155, 1238, 10156, 10160, + 10158, 1239, 10159, 10163, 10161, 1240, 10162, 10166, 10164, 1241, 10165, + 10169, 10167, 1242, 10168, 10172, 10170, 1243, 10171, 10175, 10173, 1244, + 10174, 10178, 10176, 1245, 10177, 10181, 10179, 1246, 10180, 10184, + 10182, 1247, 10183, 10187, 10185, 1248, 10186, 10190, 10188, 1249, 10189, + 10193, 10191, 1250, 10192, 10196, 10194, 1251, 10195, 10199, 10197, 994, + 10198, 10203, 10200, 1252, 10201, 10206, 10204, 1253, 10205, 10209, + 10207, 1254, 10208, 10212, 10210, 1255, 10211, 10215, 10213, 1256, 10214, + 10218, 10216, 1257, 10217, 10221, 10219, 1258, 10220, 10224, 10222, 1259, + 10223, 10227, 10225, 1260, 10226, 10230, 10228, 1261, 10229, 10233, + 10231, 1262, 10232, 10236, 10234, 1263, 10235, 10239, 10237, 1264, 10238, + 10242, 10240, 1265, 10241, 10245, 10243, 1266, 10244, 10248, 10246, 1267, + 10247, 10251, 10249, 1268, 10250, 10254, 10252, 1269, 10253, 10257, + 10255, 1270, 10256, 10260, 10258, 1271, 10259, 10263, 10261, 1272, 10262, + 10266, 10264, 1273, 10265, 10269, 10267, 1274, 10268, 10272, 10270, 1275, + 10271, 10275, 10273, 1276, 10274, 10278, 10276, 1277, 10277, 10281, + 10279, 1278, 10280, 10284, 10282, 1279, 10283, 10287, 10285, 1280, 10286, + 10290, 10288, 1281, 10289, 10293, 10291, 1282, 10292, 10296, 10294, 1283, + 10295, 10299, 10297, 993, 10298, 10303, 10300, 1284, 10301, 10306, 10304, + 1285, 10305, 10309, 10307, 1286, 10308, 10312, 10310, 1287, 10311, 10315, + 10313, 1288, 10314, 10318, 10316, 1289, 10317, 10321, 10319, 1290, 10320, + 10324, 10322, 1291, 10323, 10327, 10325, 1292, 10326, 10330, 10328, 1293, + 10329, 10333, 10331, 1294, 10332, 10336, 10334, 1295, 10335, 10339, + 10337, 1296, 10338, 10342, 10340, 1297, 10341, 10345, 10343, 1298, 10344, + 10348, 10346, 1299, 10347, 10351, 10349, 1300, 10350, 10354, 10352, 1301, + 10353, 10357, 10355, 1302, 10356, 10360, 10358, 1303, 10359, 10363, + 10361, 1304, 10362, 10366, 10364, 1305, 10365, 10369, 10367, 1306, 10368, + 10372, 10370, 1307, 10371, 10375, 10373, 1308, 10374, 10378, 10376, 1309, + 10377, 10381, 10379, 1310, 10380, 10384, 10382, 1311, 10383, 10387, + 10385, 1312, 10386, 10390, 10388, 1313, 10389, 10393, 10391, 1314, 10392, + 10396, 10394, 1315, 10395, 10399, 10397, 992, 10398, 10403, 10400, 1316, + 10401, 10406, 10404, 1317, 10405, 10409, 10407, 1318, 10408, 10412, + 10410, 1319, 10411, 10415, 10413, 1320, 10414, 10418, 10416, 1321, 10417, + 10421, 10419, 1322, 10420, 10424, 10422, 1323, 10423, 10427, 10425, 1324, + 10426, 10430, 10428, 1325, 10429, 10433, 10431, 1326, 10432, 10436, + 10434, 1327, 10435, 10439, 10437, 1328, 10438, 10442, 10440, 1329, 10441, + 10445, 10443, 1330, 10444, 10448, 10446, 1331, 10447, 10451, 10449, 1332, + 10450, 10454, 10452, 1333, 10453, 10457, 10455, 1334, 10456, 10460, + 10458, 1335, 10459, 10463, 10461, 1336, 10462, 10466, 10464, 1337, 10465, + 10469, 10467, 1338, 10468, 10472, 10470, 1339, 10471, 10475, 10473, 1340, + 10474, 10478, 10476, 1341, 10477, 10481, 10479, 1342, 10480, 10484, + 10482, 1343, 10483, 10487, 10485, 1344, 10486, 10490, 10488, 1345, 10489, + 10493, 10491, 1346, 10492, 10496, 10494, 1347, 10495, 10499, 10497, 991, + 10498, 10503, 10500, 1348, 10501, 10506, 10504, 1349, 10505, 10509, + 10507, 1350, 10508, 10512, 10510, 1351, 10511, 10515, 10513, 1352, 10514, + 10518, 10516, 1353, 10517, 10521, 10519, 1354, 10520, 10524, 10522, 1355, + 10523, 10527, 10525, 1356, 10526, 10530, 10528, 1357, 10529, 10533, + 10531, 1358, 10532, 10536, 10534, 1359, 10535, 10539, 10537, 1360, 10538, + 10542, 10540, 1361, 10541, 10545, 10543, 1362, 10544, 10548, 10546, 1363, + 10547, 10551, 10549, 1364, 10550, 10554, 10552, 1365, 10553, 10557, + 10555, 1366, 10556, 10560, 10558, 1367, 10559, 10563, 10561, 1368, 10562, + 10566, 10564, 1369, 10565, 10569, 10567, 1370, 10568, 10572, 10570, 1371, + 10571, 10575, 10573, 1372, 10574, 10578, 10576, 1373, 10577, 10581, + 10579, 1374, 10580, 10584, 10582, 1375, 10583, 10587, 10585, 1376, 10586, + 10590, 10588, 1377, 10589, 10593, 10591, 1378, 10592, 10596, 10594, 1379, + 10595, 10599, 10597, 990, 10598, 10603, 10600, 1380, 10601, 10606, 10604, + 1381, 10605, 10609, 10607, 1382, 10608, 10612, 10610, 1383, 10611, 10615, + 10613, 1384, 10614, 10618, 10616, 1385, 10617, 10621, 10619, 1386, 10620, + 10624, 10622, 1387, 10623, 10627, 10625, 1388, 10626, 10630, 10628, 1389, + 10629, 10633, 10631, 1390, 10632, 10636, 10634, 1391, 10635, 10639, + 10637, 1392, 10638, 10642, 10640, 1393, 10641, 10645, 10643, 1394, 10644, + 10648, 10646, 1395, 10647, 10651, 10649, 1396, 10650, 10654, 10652, 1397, + 10653, 10657, 10655, 1398, 10656, 10660, 10658, 1399, 10659, 10663, + 10661, 1400, 10662, 10666, 10664, 1401, 10665, 10669, 10667, 1402, 10668, + 10672, 10670, 1403, 10671, 10675, 10673, 1404, 10674, 10678, 10676, 1405, + 10677, 10681, 10679, 1406, 10680, 10684, 10682, 1407, 10683, 10687, + 10685, 1408, 10686, 10690, 10688, 1409, 10689, 10693, 10691, 1410, 10692, + 10696, 10694, 1411, 10695, 10699, 10697, 989, 10698, 10703, 10700, 1412, + 10701, 10706, 10704, 1413, 10705, 10709, 10707, 1414, 10708, 10712, + 10710, 1415, 10711, 10715, 10713, 1416, 10714, 10718, 10716, 1417, 10717, + 10721, 10719, 1418, 10720, 10724, 10722, 1419, 10723, 10727, 10725, 1420, + 10726, 10730, 10728, 1421, 10729, 10733, 10731, 1422, 10732, 10736, + 10734, 1423, 10735, 10739, 10737, 1424, 10738, 10742, 10740, 1425, 10741, + 10745, 10743, 1426, 10744, 10748, 10746, 1427, 10747, 10751, 10749, 1428, + 10750, 10754, 10752, 1429, 10753, 10757, 10755, 1430, 10756, 10760, + 10758, 1431, 10759, 10763, 10761, 1432, 10762, 10766, 10764, 1433, 10765, + 10769, 10767, 1434, 10768, 10772, 10770, 1435, 10771, 10775, 10773, 1436, + 10774, 10778, 10776, 1437, 10777, 10781, 10779, 1438, 10780, 10784, + 10782, 1439, 10783, 10787, 10785, 1440, 10786, 10790, 10788, 1441, 10789, + 10793, 10791, 1442, 10792, 10796, 10794, 1443, 10795, 10799, 10797, 988, + 10798, 10803, 10800, 1444, 10801, 10806, 10804, 1445, 10805, 10809, + 10807, 1446, 10808, 10812, 10810, 1447, 10811, 10815, 10813, 1448, 10814, + 10818, 10816, 1449, 10817, 10821, 10819, 1450, 10820, 10824, 10822, 1451, + 10823, 10827, 10825, 1452, 10826, 10830, 10828, 1453, 10829, 10833, + 10831, 1454, 10832, 10836, 10834, 1455, 10835, 10839, 10837, 1456, 10838, + 10842, 10840, 1457, 10841, 10845, 10843, 1458, 10844, 10848, 10846, 1459, + 10847, 10851, 10849, 1460, 10850, 10854, 10852, 1461, 10853, 10857, + 10855, 1462, 10856, 10860, 10858, 1463, 10859, 10863, 10861, 1464, 10862, + 10866, 10864, 1465, 10865, 10869, 10867, 1466, 10868, 10872, 10870, 1467, + 10871, 10875, 10873, 1468, 10874, 10878, 10876, 1469, 10877, 10881, + 10879, 1470, 10880, 10884, 10882, 1471, 10883, 10887, 10885, 1472, 10886, + 10890, 10888, 1473, 10889, 10893, 10891, 1474, 10892, 10896, 10894, 1475, + 10895, 10899, 10897, 987, 10898, 10903, 10900, 1476, 10901, 10906, 10904, + 1477, 10905, 10909, 10907, 1478, 10908, 10912, 10910, 1479, 10911, 10915, + 10913, 1480, 10914, 10918, 10916, 1481, 10917, 10921, 10919, 1482, 10920, + 10924, 10922, 1483, 10923, 10927, 10925, 1484, 10926, 10930, 10928, 1485, + 10929, 10933, 10931, 1486, 10932, 10936, 10934, 1487, 10935, 10939, + 10937, 1488, 10938, 10942, 10940, 1489, 10941, 10945, 10943, 1490, 10944, + 10948, 10946, 1491, 10947, 10951, 10949, 1492, 10950, 10954, 10952, 1493, + 10953, 10957, 10955, 1494, 10956, 10960, 10958, 1495, 10959, 10963, + 10961, 1496, 10962, 10966, 10964, 1497, 10965, 10969, 10967, 1498, 10968, + 10972, 10970, 1499, 10971, 10975, 10973, 1500, 10974, 10978, 10976, 1501, + 10977, 10981, 10979, 1502, 10980, 10984, 10982, 1503, 10983, 10987, + 10985, 1504, 10986, 10990, 10988, 1505, 10989, 10993, 10991, 1506, 10992, + 10996, 10994, 1507, 10995, 10999, 10997, 986, 10998, 11003, 11000, 1508, + 11001, 11006, 11004, 1509, 11005, 11009, 11007, 1510, 11008, 11012, + 11010, 1511, 11011, 11015, 11013, 1512, 11014, 11018, 11016, 1513, 11017, + 11021, 11019, 1514, 11020, 11024, 11022, 1515, 11023, 11027, 11025, 1516, + 11026, 11030, 11028, 1517, 11029, 11033, 11031, 1518, 11032, 11036, + 11034, 1519, 11035, 11039, 11037, 1520, 11038, 11042, 11040, 1521, 11041, + 11045, 11043, 1522, 11044, 11048, 11046, 1523, 11047, 11051, 11049, 1524, + 11050, 11054, 11052, 1525, 11053, 11057, 11055, 1526, 11056, 11060, + 11058, 1527, 11059, 11063, 11061, 1528, 11062, 11066, 11064, 1529, 11065, + 11069, 11067, 1530, 11068, 11072, 11070, 1531, 11071, 11075, 11073, 1532, + 11074, 11078, 11076, 1533, 11077, 11081, 11079, 1534, 11080, 11084, + 11082, 1535, 11083, 11087, 11085, 1536, 11086, 11090, 11088, 1537, 11089, + 11093, 11091, 1538, 11092, 11096, 11094, 1539, 11095, 11099, 11097, 985, + 11098, 11103, 11100, 1540, 11101, 11106, 11104, 1541, 11105, 11109, + 11107, 1542, 11108, 11112, 11110, 1543, 11111, 11115, 11113, 1544, 11114, + 11118, 11116, 1545, 11117, 11121, 11119, 1546, 11120, 11124, 11122, 1547, + 11123, 11127, 11125, 1548, 11126, 11130, 11128, 1549, 11129, 11133, + 11131, 1550, 11132, 11136, 11134, 1551, 11135, 11139, 11137, 1552, 11138, + 11142, 11140, 1553, 11141, 11145, 11143, 1554, 11144, 11148, 11146, 1555, + 11147, 11151, 11149, 1556, 11150, 11154, 11152, 1557, 11153, 11157, + 11155, 1558, 11156, 11160, 11158, 1559, 11159, 11163, 11161, 1560, 11162, + 11166, 11164, 1561, 11165, 11169, 11167, 1562, 11168, 11172, 11170, 1563, + 11171, 11175, 11173, 1564, 11174, 11178, 11176, 1565, 11177, 11181, + 11179, 1566, 11180, 11184, 11182, 1567, 11183, 11187, 11185, 1568, 11186, + 11190, 11188, 1569, 11189, 11193, 11191, 1570, 11192, 11196, 11194, 1571, + 11195, 11199, 11197, 984, 11198, 11203, 11200, 1572, 11201, 11206, 11204, + 1573, 11205, 11209, 11207, 1574, 11208, 11212, 11210, 1575, 11211, 11215, + 11213, 1576, 11214, 11218, 11216, 1577, 11217, 11221, 11219, 1578, 11220, + 11224, 11222, 1579, 11223, 11227, 11225, 1580, 11226, 11230, 11228, 1581, + 11229, 11233, 11231, 1582, 11232, 11236, 11234, 1583, 11235, 11239, + 11237, 1584, 11238, 11242, 11240, 1585, 11241, 11245, 11243, 1586, 11244, + 11248, 11246, 1587, 11247, 11251, 11249, 1588, 11250, 11254, 11252, 1589, + 11253, 11257, 11255, 1590, 11256, 11260, 11258, 1591, 11259, 11263, + 11261, 1592, 11262, 11266, 11264, 1593, 11265, 11269, 11267, 1594, 11268, + 11272, 11270, 1595, 11271, 11275, 11273, 1596, 11274, 11278, 11276, 1597, + 11277, 11281, 11279, 1598, 11280, 11284, 11282, 1599, 11283, 11287, + 11285, 1600, 11286, 11290, 11288, 1601, 11289, 11293, 11291, 1602, 11292, + 11296, 11294, 1603, 11295, 11299, 11297, 983, 11298, 11303, 11300, 1604, + 11301, 11306, 11304, 1605, 11305, 11309, 11307, 1606, 11308, 11312, + 11310, 1607, 11311, 11315, 11313, 1608, 11314, 11318, 11316, 1609, 11317, + 11321, 11319, 1610, 11320, 11324, 11322, 1611, 11323, 11327, 11325, 1612, + 11326, 11330, 11328, 1613, 11329, 11333, 11331, 1614, 11332, 11336, + 11334, 1615, 11335, 11339, 11337, 1616, 11338, 11342, 11340, 1617, 11341, + 11345, 11343, 1618, 11344, 11348, 11346, 1619, 11347, 11351, 11349, 1620, + 11350, 11354, 11352, 1621, 11353, 11357, 11355, 1622, 11356, 11360, + 11358, 1623, 11359, 11363, 11361, 1624, 11362, 11366, 11364, 1625, 11365, + 11369, 11367, 1626, 11368, 11372, 11370, 1627, 11371, 11375, 11373, 1628, + 11374, 11378, 11376, 1629, 11377, 11381, 11379, 1630, 11380, 11384, + 11382, 1631, 11383, 11387, 11385, 1632, 11386, 11390, 11388, 1633, 11389, + 11393, 11391, 1634, 11392, 11396, 11394, 1635, 11395, 11399, 11397, 982, + 11398, 11403, 11400, 1636, 11401, 11406, 11404, 1637, 11405, 11409, + 11407, 1638, 11408, 11412, 11410, 1639, 11411, 11415, 11413, 1640, 11414, + 11418, 11416, 1641, 11417, 11421, 11419, 1642, 11420, 11424, 11422, 1643, + 11423, 11427, 11425, 1644, 11426, 11430, 11428, 1645, 11429, 11433, + 11431, 1646, 11432, 11436, 11434, 1647, 11435, 11439, 11437, 1648, 11438, + 11442, 11440, 1649, 11441, 11445, 11443, 1650, 11444, 11448, 11446, 1651, + 11447, 11451, 11449, 1652, 11450, 11454, 11452, 1653, 11453, 11457, + 11455, 1654, 11456, 11460, 11458, 1655, 11459, 11463, 11461, 1656, 11462, + 11466, 11464, 1657, 11465, 11469, 11467, 1658, 11468, 11472, 11470, 1659, + 11471, 11475, 11473, 1660, 11474, 11478, 11476, 1661, 11477, 11481, + 11479, 1662, 11480, 11484, 11482, 1663, 11483, 11487, 11485, 1664, 11486, + 11490, 11488, 1665, 11489, 11493, 11491, 1666, 11492, 11496, 11494, 1667, + 11495, 11499, 11497, 981, 11498, 11503, 11500, 1668, 11501, 11506, 11504, + 1669, 11505, 11509, 11507, 1670, 11508, 11512, 11510, 1671, 11511, 11515, + 11513, 1672, 11514, 11518, 11516, 1673, 11517, 11521, 11519, 1674, 11520, + 11524, 11522, 1675, 11523, 11527, 11525, 1676, 11526, 11530, 11528, 1677, + 11529, 11533, 11531, 1678, 11532, 11536, 11534, 1679, 11535, 11539, + 11537, 1680, 11538, 11542, 11540, 1681, 11541, 11545, 11543, 1682, 11544, + 11548, 11546, 1683, 11547, 11551, 11549, 1684, 11550, 11554, 11552, 1685, + 11553, 11557, 11555, 1686, 11556, 11560, 11558, 1687, 11559, 11563, + 11561, 1688, 11562, 11566, 11564, 1689, 11565, 11569, 11567, 1690, 11568, + 11572, 11570, 1691, 11571, 11575, 11573, 1692, 11574, 11578, 11576, 1693, + 11577, 11581, 11579, 1694, 11580, 11584, 11582, 1695, 11583, 11587, + 11585, 1696, 11586, 11590, 11588, 1697, 11589, 11593, 11591, 1698, 11592, + 11596, 11594, 1699, 11595, 11599, 11597, 980, 11598, 11603, 11600, 1700, + 11601, 11606, 11604, 1701, 11605, 11609, 11607, 1702, 11608, 11612, + 11610, 1703, 11611, 11615, 11613, 1704, 11614, 11618, 11616, 1705, 11617, + 11621, 11619, 1706, 11620, 11624, 11622, 1707, 11623, 11627, 11625, 1708, + 11626, 11630, 11628, 1709, 11629, 11633, 11631, 1710, 11632, 11636, + 11634, 1711, 11635, 11639, 11637, 1712, 11638, 11642, 11640, 1713, 11641, + 11645, 11643, 1714, 11644, 11648, 11646, 1715, 11647, 11651, 11649, 1716, + 11650, 11654, 11652, 1717, 11653, 11657, 11655, 1718, 11656, 11660, + 11658, 1719, 11659, 11663, 11661, 1720, 11662, 11666, 11664, 1721, 11665, + 11669, 11667, 1722, 11668, 11672, 11670, 1723, 11671, 11675, 11673, 1724, + 11674, 11678, 11676, 1725, 11677, 11681, 11679, 1726, 11680, 11684, + 11682, 1727, 11683, 11687, 11685, 1728, 11686, 11690, 11688, 1729, 11689, + 11693, 11691, 1730, 11692, 11696, 11694, 1731, 11695, 11699, 11697, 979, + 11698, 11703, 11700, 947, 11701, 11706, 11704, 948, 11705, 11709, 11707, + 949, 11708, 11712, 11710, 950, 11711, 11715, 11713, 951, 11714, 11718, + 11716, 952, 11717, 11721, 11719, 953, 11720, 11724, 11722, 954, 11723, + 11727, 11725, 955, 11726, 11730, 11728, 956, 11729, 11733, 11731, 957, + 11732, 11736, 11734, 958, 11735, 11739, 11737, 959, 11738, 11742, 11740, + 960, 11741, 11745, 11743, 961, 11744, 11748, 11746, 962, 11747, 11751, + 11749, 963, 11750, 11754, 11752, 964, 11753, 11757, 11755, 965, 11756, + 11760, 11758, 966, 11759, 11763, 11761, 967, 11762, 11766, 11764, 968, + 11765, 11769, 11767, 969, 11768, 11772, 11770, 970, 11771, 11775, 11773, + 971, 11774, 11778, 11776, 972, 11777, 11781, 11779, 973, 11780, 11784, + 11782, 974, 11783, 11787, 11785, 975, 11786, 11790, 11788, 976, 11789, + 11793, 11791, 977, 11792, 11796, 11794, 978, 11795, 11799, 11797, 927, + 11798, 11802, 11800, 1732, 11801, 11805, 11803, 1733, 11804, 11808, + 11806, 1734, 11807, 11811, 11809, 1735, 11810, 11814, 11812, 1736, 11813, + 11817, 11815, 1737, 11816, 11820, 11818, 1738, 11819, 11823, 11821, 1739, + 11822, 11826, 11824, 1740, 11825, 11829, 11827, 1741, 11828, 11832, + 11830, 1742, 11831, 11835, 11833, 1743, 11834, 11838, 11836, 1744, 11837, + 11841, 11839, 1745, 11840, 11844, 11842, 1746, 11843, 11847, 11845, 1747, + 11846, 11850, 11848, 1156, 11849, 11853, 11851, 1748, 11852, 11856, + 11854, 1749, 11855, 11859, 11857, 1750, 11858, 11862, 11860, 1751, 11861, + 11865, 11863, 1752, 11864, 11868, 11866, 1753, 11867, 11871, 11869, 1754, + 11870, 11874, 11872, 1755, 11873, 11877, 11875, 1756, 11876, 11880, + 11878, 1757, 11879, 11883, 11881, 1758, 11882, 11886, 11884, 1759, 11885, + 11889, 11887, 1760, 11888, 11892, 11890, 1761, 11891, 11895, 11893, 1762, + 11894, 11898, 11896, 1763, 11897, 11901, 11899, 1155, 11900, 11904, + 11902, 1764, 11903, 11907, 11905, 1765, 11906, 11910, 11908, 1766, 11909, + 11913, 11911, 1767, 11912, 11916, 11914, 1768, 11915, 11919, 11917, 1769, + 11918, 11922, 11920, 1770, 11921, 11925, 11923, 1771, 11924, 11928, + 11926, 1772, 11927, 11931, 11929, 1773, 11930, 11934, 11932, 1774, 11933, + 11937, 11935, 1775, 11936, 11940, 11938, 1776, 11939, 11943, 11941, 1777, + 11942, 11946, 11944, 1778, 11945, 11949, 11947, 1779, 11948, 11952, + 11950, 1154, 11951, 11955, 11953, 1780, 11954, 11958, 11956, 1781, 11957, + 11961, 11959, 1782, 11960, 11964, 11962, 1783, 11963, 11967, 11965, 1784, + 11966, 11970, 11968, 1785, 11969, 11973, 11971, 1786, 11972, 11976, + 11974, 1787, 11975, 11979, 11977, 1788, 11978, 11982, 11980, 1789, 11981, + 11985, 11983, 1790, 11984, 11988, 11986, 1791, 11987, 11991, 11989, 1792, + 11990, 11994, 11992, 1793, 11993, 11997, 11995, 1794, 11996, 12000, + 11998, 1795, 11999, 12003, 12001, 1153, 12002, 12006, 12004, 1796, 12005, + 12009, 12007, 1797, 12008, 12012, 12010, 1798, 12011, 12015, 12013, 1799, + 12014, 12018, 12016, 1800, 12017, 12021, 12019, 1801, 12020, 12024, + 12022, 1802, 12023, 12027, 12025, 1803, 12026, 12030, 12028, 1804, 12029, + 12033, 12031, 1805, 12032, 12036, 12034, 1806, 12035, 12039, 12037, 1807, + 12038, 12042, 12040, 1808, 12041, 12045, 12043, 1809, 12044, 12048, + 12046, 1810, 12047, 12051, 12049, 1811, 12050, 12054, 12052, 1152, 12053, + 12057, 12055, 1812, 12056, 12060, 12058, 1813, 12059, 12063, 12061, 1814, + 12062, 12066, 12064, 1815, 12065, 12069, 12067, 1816, 12068, 12072, + 12070, 1817, 12071, 12075, 12073, 1818, 12074, 12078, 12076, 1819, 12077, + 12081, 12079, 1820, 12080, 12084, 12082, 1821, 12083, 12087, 12085, 1822, + 12086, 12090, 12088, 1823, 12089, 12093, 12091, 1824, 12092, 12096, + 12094, 1825, 12095, 12099, 12097, 1826, 12098, 12102, 12100, 1827, 12101, + 12105, 12103, 1151, 12104, 12108, 12106, 1828, 12107, 12111, 12109, 1829, + 12110, 12114, 12112, 1830, 12113, 12117, 12115, 1831, 12116, 12120, + 12118, 1832, 12119, 12123, 12121, 1833, 12122, 12126, 12124, 1834, 12125, + 12129, 12127, 1835, 12128, 12132, 12130, 1836, 12131, 12135, 12133, 1837, + 12134, 12138, 12136, 1838, 12137, 12141, 12139, 1839, 12140, 12144, + 12142, 1840, 12143, 12147, 12145, 1841, 12146, 12150, 12148, 1842, 12149, + 12153, 12151, 1843, 12152, 12156, 12154, 1150, 12155, 12159, 12157, 1844, + 12158, 12162, 12160, 1845, 12161, 12165, 12163, 1846, 12164, 12168, + 12166, 1847, 12167, 12171, 12169, 1848, 12170, 12174, 12172, 1849, 12173, + 12177, 12175, 1850, 12176, 12180, 12178, 1851, 12179, 12183, 12181, 1852, + 12182, 12186, 12184, 1853, 12185, 12189, 12187, 1854, 12188, 12192, + 12190, 1855, 12191, 12195, 12193, 1856, 12194, 12198, 12196, 1857, 12197, + 12201, 12199, 1858, 12200, 12204, 12202, 1859, 12203, 12207, 12205, 1149, + 12206, 12210, 12208, 1860, 12209, 12213, 12211, 1861, 12212, 12216, + 12214, 1862, 12215, 12219, 12217, 1863, 12218, 12222, 12220, 1864, 12221, + 12225, 12223, 1865, 12224, 12228, 12226, 1866, 12227, 12231, 12229, 1867, + 12230, 12234, 12232, 1868, 12233, 12237, 12235, 1869, 12236, 12240, + 12238, 1870, 12239, 12243, 12241, 1871, 12242, 12246, 12244, 1872, 12245, + 12249, 12247, 1873, 12248, 12252, 12250, 1874, 12251, 12255, 12253, 1875, + 12254, 12258, 12256, 1148, 12257, 12261, 12259, 1876, 12260, 12264, + 12262, 1877, 12263, 12267, 12265, 1878, 12266, 12270, 12268, 1879, 12269, + 12273, 12271, 1880, 12272, 12276, 12274, 1881, 12275, 12279, 12277, 1882, + 12278, 12282, 12280, 1883, 12281, 12285, 12283, 1884, 12284, 12288, + 12286, 1885, 12287, 12291, 12289, 1886, 12290, 12294, 12292, 1887, 12293, + 12297, 12295, 1888, 12296, 12300, 12298, 1889, 12299, 12303, 12301, 1890, + 12302, 12306, 12304, 1891, 12305, 12309, 12307, 1147, 12308, 12312, + 12310, 1892, 12311, 12315, 12313, 1893, 12314, 12318, 12316, 1894, 12317, + 12321, 12319, 1895, 12320, 12324, 12322, 1896, 12323, 12327, 12325, 1897, + 12326, 12330, 12328, 1898, 12329, 12333, 12331, 1899, 12332, 12336, + 12334, 1900, 12335, 12339, 12337, 1901, 12338, 12342, 12340, 1902, 12341, + 12345, 12343, 1903, 12344, 12348, 12346, 1904, 12347, 12351, 12349, 1905, + 12350, 12354, 12352, 1906, 12353, 12357, 12355, 1907, 12356, 12360, + 12358, 1146, 12359, 12363, 12361, 1908, 12362, 12366, 12364, 1909, 12365, + 12369, 12367, 1910, 12368, 12372, 12370, 1911, 12371, 12375, 12373, 1912, + 12374, 12378, 12376, 1913, 12377, 12381, 12379, 1914, 12380, 12384, + 12382, 1915, 12383, 12387, 12385, 1916, 12386, 12390, 12388, 1917, 12389, + 12393, 12391, 1918, 12392, 12396, 12394, 1919, 12395, 12399, 12397, 1920, + 12398, 12402, 12400, 1921, 12401, 12405, 12403, 1922, 12404, 12408, + 12406, 1923, 12407, 12411, 12409, 1145, 12410, 12414, 12412, 1924, 12413, + 12417, 12415, 1925, 12416, 12420, 12418, 1926, 12419, 12423, 12421, 1927, + 12422, 12426, 12424, 1928, 12425, 12429, 12427, 1929, 12428, 12432, + 12430, 1930, 12431, 12435, 12433, 1931, 12434, 12438, 12436, 1932, 12437, + 12441, 12439, 1933, 12440, 12444, 12442, 1934, 12443, 12447, 12445, 1935, + 12446, 12450, 12448, 1936, 12449, 12453, 12451, 1937, 12452, 12456, + 12454, 1938, 12455, 12459, 12457, 1939, 12458, 12462, 12460, 1144, 12461, + 12465, 12463, 1940, 12464, 12468, 12466, 1941, 12467, 12471, 12469, 1942, + 12470, 12474, 12472, 1943, 12473, 12477, 12475, 1944, 12476, 12480, + 12478, 1945, 12479, 12483, 12481, 1946, 12482, 12486, 12484, 1947, 12485, + 12489, 12487, 1948, 12488, 12492, 12490, 1949, 12491, 12495, 12493, 1950, + 12494, 12498, 12496, 1951, 12497, 12501, 12499, 1952, 12500, 12504, + 12502, 1953, 12503, 12507, 12505, 1954, 12506, 12510, 12508, 1955, 12509, + 12513, 12511, 1143, 12512, 12516, 12514, 1956, 12515, 12519, 12517, 1957, + 12518, 12522, 12520, 1958, 12521, 12525, 12523, 1959, 12524, 12528, + 12526, 1960, 12527, 12531, 12529, 1961, 12530, 12534, 12532, 1962, 12533, + 12537, 12535, 1963, 12536, 12540, 12538, 1964, 12539, 12543, 12541, 1965, + 12542, 12546, 12544, 1966, 12545, 12549, 12547, 1967, 12548, 12552, + 12550, 1968, 12551, 12555, 12553, 1969, 12554, 12558, 12556, 1970, 12557, + 12561, 12559, 1971, 12560, 12564, 12562, 1142, 12563, 12567, 12565, + 12570, 12568, 12573, 12571, 12576, 12574, 12579, 12577, 12582, 12580, + 12585, 12583, 12588, 12586, 12591, 12589, 12594, 12592, 12597, 12595, + 12600, 12598, 12603, 12601, 12606, 12604, 12609, 12607, 12612, 12610, + 12615, 12613, 9495, 12618, 299, 12616, 1972, 12617, 9480, 12621, 300, + 12619, 1973, 12620, 9465, 12624, 301, 12622, 1974, 12623, 9450, 12627, + 302, 12625, 1975, 12626, 9435, 12630, 303, 12628, 1976, 12629, 9420, + 12633, 304, 12631, 1977, 12632, 9405, 12636, 305, 12634, 1978, 12635, + 9390, 12639, 306, 12637, 1979, 12638, 9375, 12642, 307, 12640, 1980, + 12641, 9360, 12645, 308, 12643, 1981, 12644, 9345, 12648, 309, 12646, + 1982, 12647, 9330, 12651, 310, 12649, 1983, 12650, 9315, 12654, 311, + 12652, 1984, 12653, 9300, 12657, 312, 12655, 1985, 12656, 9285, 12660, + 313, 12658, 1986, 12659, 9270, 12663, 314, 12661, 1987, 12662, 9255, + 12666, 315, 12664, 1988, 12665, 9240, 12669, 316, 12667, 1989, 12668, + 9225, 12672, 317, 12670, 1990, 12671, 9210, 12675, 318, 12673, 1991, + 12674, 9195, 12678, 319, 12676, 1992, 12677, 9180, 12681, 320, 12679, + 1993, 12680, 9165, 12684, 321, 12682, 1994, 12683, 9150, 12687, 322, + 12685, 1995, 12686, 9135, 12690, 323, 12688, 1996, 12689, 9120, 12693, + 324, 12691, 1997, 12692, 9105, 12696, 325, 12694, 1998, 12695, 9090, + 12699, 326, 12697, 1999, 12698, 9075, 12702, 327, 12700, 2000, 12701, + 9060, 12705, 328, 12703, 2001, 12704, 9045, 12708, 329, 12706, 2002, + 12707, 9030, 12711, 330, 12709, 2003, 12710, 9015, 12714, 331, 12712, + 1044, 12713, 12717, 12715, 2004, 12716, 12720, 12718, 2005, 12719, 12723, + 12721, 2006, 12722, 12726, 12724, 2007, 12725, 12729, 12727, 2008, 12728, + 12732, 12730, 2009, 12731, 12735, 12733, 2010, 12734, 12738, 12736, 2011, + 12737, 12741, 12739, 2012, 12740, 12744, 12742, 2013, 12743, 12747, + 12745, 2014, 12746, 12750, 12748, 2015, 12749, 12753, 12751, 2016, 12752, + 12756, 12754, 2017, 12755, 12759, 12757, 2018, 12758, 12762, 12760, 2019, + 12761, 12765, 12763, 2020, 12764, 12768, 12766, 2021, 12767, 12771, + 12769, 2022, 12770, 12774, 12772, 2023, 12773, 12777, 12775, 2024, 12776, + 12780, 12778, 2025, 12779, 12783, 12781, 2026, 12782, 12786, 12784, 2027, + 12785, 12789, 12787, 2028, 12788, 12792, 12790, 2029, 12791, 12795, + 12793, 2030, 12794, 12798, 12796, 2031, 12797, 12801, 12799, 2032, 12800, + 12804, 12802, 2033, 12803, 12807, 12805, 2034, 12806, 12810, 12808, 2035, + 12809, 12813, 12811, 1043, 12812, 12816, 12814, 2036, 12815, 12819, + 12817, 2037, 12818, 12822, 12820, 2038, 12821, 12825, 12823, 2039, 12824, + 12828, 12826, 2040, 12827, 12831, 12829, 2041, 12830, 12834, 12832, 2042, + 12833, 12837, 12835, 2043, 12836, 12840, 12838, 2044, 12839, 12843, + 12841, 2045, 12842, 12846, 12844, 2046, 12845, 12849, 12847, 2047, 12848, + 12852, 12850, 2048, 12851, 12855, 12853, 2049, 12854, 12858, 12856, 2050, + 12857, 12861, 12859, 2051, 12860, 12864, 12862, 2052, 12863, 12867, + 12865, 2053, 12866, 12870, 12868, 2054, 12869, 12873, 12871, 2055, 12872, + 12876, 12874, 2056, 12875, 12879, 12877, 2057, 12878, 12882, 12880, 2058, + 12881, 12885, 12883, 2059, 12884, 12888, 12886, 2060, 12887, 12891, + 12889, 2061, 12890, 12894, 12892, 2062, 12893, 12897, 12895, 2063, 12896, + 12900, 12898, 2064, 12899, 12903, 12901, 2065, 12902, 12906, 12904, 2066, + 12905, 12909, 12907, 2067, 12908, 12912, 12910, 1042, 12911, 12915, + 12913, 2068, 12914, 12918, 12916, 2069, 12917, 12921, 12919, 2070, 12920, + 12924, 12922, 2071, 12923, 12927, 12925, 2072, 12926, 12930, 12928, 2073, + 12929, 12933, 12931, 2074, 12932, 12936, 12934, 2075, 12935, 12939, + 12937, 2076, 12938, 12942, 12940, 2077, 12941, 12945, 12943, 2078, 12944, + 12948, 12946, 2079, 12947, 12951, 12949, 2080, 12950, 12954, 12952, 2081, + 12953, 12957, 12955, 2082, 12956, 12960, 12958, 2083, 12959, 12963, + 12961, 2084, 12962, 12966, 12964, 2085, 12965, 12969, 12967, 2086, 12968, + 12972, 12970, 2087, 12971, 12975, 12973, 2088, 12974, 12978, 12976, 2089, + 12977, 12981, 12979, 2090, 12980, 12984, 12982, 2091, 12983, 12987, + 12985, 2092, 12986, 12990, 12988, 2093, 12989, 12993, 12991, 2094, 12992, + 12996, 12994, 2095, 12995, 12999, 12997, 2096, 12998, 13002, 13000, 2097, + 13001, 13005, 13003, 2098, 13004, 13008, 13006, 2099, 13007, 13011, + 13009, 1041, 13010, 13014, 13012, 2100, 13013, 13017, 13015, 2101, 13016, + 13020, 13018, 2102, 13019, 13023, 13021, 2103, 13022, 13026, 13024, 2104, + 13025, 13029, 13027, 2105, 13028, 13032, 13030, 2106, 13031, 13035, + 13033, 2107, 13034, 13038, 13036, 2108, 13037, 13041, 13039, 2109, 13040, + 13044, 13042, 2110, 13043, 13047, 13045, 2111, 13046, 13050, 13048, 2112, + 13049, 13053, 13051, 2113, 13052, 13056, 13054, 2114, 13055, 13059, + 13057, 2115, 13058, 13062, 13060, 2116, 13061, 13065, 13063, 2117, 13064, + 13068, 13066, 2118, 13067, 13071, 13069, 2119, 13070, 13074, 13072, 2120, + 13073, 13077, 13075, 2121, 13076, 13080, 13078, 2122, 13079, 13083, + 13081, 2123, 13082, 13086, 13084, 2124, 13085, 13089, 13087, 2125, 13088, + 13092, 13090, 2126, 13091, 13095, 13093, 2127, 13094, 13098, 13096, 2128, + 13097, 13101, 13099, 2129, 13100, 13104, 13102, 2130, 13103, 13107, + 13105, 2131, 13106, 13110, 13108, 1040, 13109, 13113, 13111, 2132, 13112, + 13116, 13114, 2133, 13115, 13119, 13117, 2134, 13118, 13122, 13120, 2135, + 13121, 13125, 13123, 2136, 13124, 13128, 13126, 2137, 13127, 13131, + 13129, 2138, 13130, 13134, 13132, 2139, 13133, 13137, 13135, 2140, 13136, + 13140, 13138, 2141, 13139, 13143, 13141, 2142, 13142, 13146, 13144, 2143, + 13145, 13149, 13147, 2144, 13148, 13152, 13150, 2145, 13151, 13155, + 13153, 2146, 13154, 13158, 13156, 2147, 13157, 13161, 13159, 2148, 13160, + 13164, 13162, 2149, 13163, 13167, 13165, 2150, 13166, 13170, 13168, 2151, + 13169, 13173, 13171, 2152, 13172, 13176, 13174, 2153, 13175, 13179, + 13177, 2154, 13178, 13182, 13180, 2155, 13181, 13185, 13183, 2156, 13184, + 13188, 13186, 2157, 13187, 13191, 13189, 2158, 13190, 13194, 13192, 2159, + 13193, 13197, 13195, 2160, 13196, 13200, 13198, 2161, 13199, 13203, + 13201, 2162, 13202, 13206, 13204, 2163, 13205, 13209, 13207, 1039, 13208, + 13212, 13210, 2164, 13211, 13215, 13213, 2165, 13214, 13218, 13216, 2166, + 13217, 13221, 13219, 2167, 13220, 13224, 13222, 2168, 13223, 13227, + 13225, 2169, 13226, 13230, 13228, 2170, 13229, 13233, 13231, 2171, 13232, + 13236, 13234, 2172, 13235, 13239, 13237, 2173, 13238, 13242, 13240, 2174, + 13241, 13245, 13243, 2175, 13244, 13248, 13246, 2176, 13247, 13251, + 13249, 2177, 13250, 13254, 13252, 2178, 13253, 13257, 13255, 2179, 13256, + 13260, 13258, 2180, 13259, 13263, 13261, 2181, 13262, 13266, 13264, 2182, + 13265, 13269, 13267, 2183, 13268, 13272, 13270, 2184, 13271, 13275, + 13273, 2185, 13274, 13278, 13276, 2186, 13277, 13281, 13279, 2187, 13280, + 13284, 13282, 2188, 13283, 13287, 13285, 2189, 13286, 13290, 13288, 2190, + 13289, 13293, 13291, 2191, 13292, 13296, 13294, 2192, 13295, 13299, + 13297, 2193, 13298, 13302, 13300, 2194, 13301, 13305, 13303, 2195, 13304, + 13308, 13306, 1038, 13307, 13311, 13309, 2196, 13310, 13314, 13312, 2197, + 13313, 13317, 13315, 2198, 13316, 13320, 13318, 2199, 13319, 13323, + 13321, 2200, 13322, 13326, 13324, 2201, 13325, 13329, 13327, 2202, 13328, + 13332, 13330, 2203, 13331, 13335, 13333, 2204, 13334, 13338, 13336, 2205, + 13337, 13341, 13339, 2206, 13340, 13344, 13342, 2207, 13343, 13347, + 13345, 2208, 13346, 13350, 13348, 2209, 13349, 13353, 13351, 2210, 13352, + 13356, 13354, 2211, 13355, 13359, 13357, 2212, 13358, 13362, 13360, 2213, + 13361, 13365, 13363, 2214, 13364, 13368, 13366, 2215, 13367, 13371, + 13369, 2216, 13370, 13374, 13372, 2217, 13373, 13377, 13375, 2218, 13376, + 13380, 13378, 2219, 13379, 13383, 13381, 2220, 13382, 13386, 13384, 2221, + 13385, 13389, 13387, 2222, 13388, 13392, 13390, 2223, 13391, 13395, + 13393, 2224, 13394, 13398, 13396, 2225, 13397, 13401, 13399, 2226, 13400, + 13404, 13402, 2227, 13403, 13407, 13405, 1037, 13406, 13410, 13408, 2228, + 13409, 13413, 13411, 2229, 13412, 13416, 13414, 2230, 13415, 13419, + 13417, 2231, 13418, 13422, 13420, 2232, 13421, 13425, 13423, 2233, 13424, + 13428, 13426, 2234, 13427, 13431, 13429, 2235, 13430, 13434, 13432, 2236, + 13433, 13437, 13435, 2237, 13436, 13440, 13438, 2238, 13439, 13443, + 13441, 2239, 13442, 13446, 13444, 2240, 13445, 13449, 13447, 2241, 13448, + 13452, 13450, 2242, 13451, 13455, 13453, 2243, 13454, 13458, 13456, 2244, + 13457, 13461, 13459, 2245, 13460, 13464, 13462, 2246, 13463, 13467, + 13465, 2247, 13466, 13470, 13468, 2248, 13469, 13473, 13471, 2249, 13472, + 13476, 13474, 2250, 13475, 13479, 13477, 2251, 13478, 13482, 13480, 2252, + 13481, 13485, 13483, 2253, 13484, 13488, 13486, 2254, 13487, 13491, + 13489, 2255, 13490, 13494, 13492, 2256, 13493, 13497, 13495, 2257, 13496, + 13500, 13498, 2258, 13499, 13503, 13501, 2259, 13502, 13506, 13504, 1036, + 13505, 13509, 13507, 2260, 13508, 13512, 13510, 2261, 13511, 13515, + 13513, 2262, 13514, 13518, 13516, 2263, 13517, 13521, 13519, 2264, 13520, + 13524, 13522, 2265, 13523, 13527, 13525, 2266, 13526, 13530, 13528, 2267, + 13529, 13533, 13531, 2268, 13532, 13536, 13534, 2269, 13535, 13539, + 13537, 2270, 13538, 13542, 13540, 2271, 13541, 13545, 13543, 2272, 13544, + 13548, 13546, 2273, 13547, 13551, 13549, 2274, 13550, 13554, 13552, 2275, + 13553, 13557, 13555, 2276, 13556, 13560, 13558, 2277, 13559, 13563, + 13561, 2278, 13562, 13566, 13564, 2279, 13565, 13569, 13567, 2280, 13568, + 13572, 13570, 2281, 13571, 13575, 13573, 2282, 13574, 13578, 13576, 2283, + 13577, 13581, 13579, 2284, 13580, 13584, 13582, 2285, 13583, 13587, + 13585, 2286, 13586, 13590, 13588, 2287, 13589, 13593, 13591, 2288, 13592, + 13596, 13594, 2289, 13595, 13599, 13597, 2290, 13598, 13602, 13600, 2291, + 13601, 13605, 13603, 1035, 13604, 13608, 13606, 2292, 13607, 13611, + 13609, 2293, 13610, 13614, 13612, 2294, 13613, 13617, 13615, 2295, 13616, + 13620, 13618, 2296, 13619, 13623, 13621, 2297, 13622, 13626, 13624, 2298, + 13625, 13629, 13627, 2299, 13628, 13632, 13630, 2300, 13631, 13635, + 13633, 2301, 13634, 13638, 13636, 2302, 13637, 13641, 13639, 2303, 13640, + 13644, 13642, 2304, 13643, 13647, 13645, 2305, 13646, 13650, 13648, 2306, + 13649, 13653, 13651, 2307, 13652, 13656, 13654, 2308, 13655, 13659, + 13657, 2309, 13658, 13662, 13660, 2310, 13661, 13665, 13663, 2311, 13664, + 13668, 13666, 2312, 13667, 13671, 13669, 2313, 13670, 13674, 13672, 2314, + 13673, 13677, 13675, 2315, 13676, 13680, 13678, 2316, 13679, 13683, + 13681, 2317, 13682, 13686, 13684, 2318, 13685, 13689, 13687, 2319, 13688, + 13692, 13690, 2320, 13691, 13695, 13693, 2321, 13694, 13698, 13696, 2322, + 13697, 13701, 13699, 2323, 13700, 13704, 13702, 1034, 13703, 13707, + 13705, 2324, 13706, 13710, 13708, 2325, 13709, 13713, 13711, 2326, 13712, + 13716, 13714, 2327, 13715, 13719, 13717, 2328, 13718, 13722, 13720, 2329, + 13721, 13725, 13723, 2330, 13724, 13728, 13726, 2331, 13727, 13731, + 13729, 2332, 13730, 13734, 13732, 2333, 13733, 13737, 13735, 2334, 13736, + 13740, 13738, 2335, 13739, 13743, 13741, 2336, 13742, 13746, 13744, 2337, + 13745, 13749, 13747, 2338, 13748, 13752, 13750, 2339, 13751, 13755, + 13753, 2340, 13754, 13758, 13756, 2341, 13757, 13761, 13759, 2342, 13760, + 13764, 13762, 2343, 13763, 13767, 13765, 2344, 13766, 13770, 13768, 2345, + 13769, 13773, 13771, 2346, 13772, 13776, 13774, 2347, 13775, 13779, + 13777, 2348, 13778, 13782, 13780, 2349, 13781, 13785, 13783, 2350, 13784, + 13788, 13786, 2351, 13787, 13791, 13789, 2352, 13790, 13794, 13792, 2353, + 13793, 13797, 13795, 2354, 13796, 13800, 13798, 2355, 13799, 13803, + 13801, 1033, 13802, 13806, 13804, 2356, 13805, 13809, 13807, 2357, 13808, + 13812, 13810, 2358, 13811, 13815, 13813, 2359, 13814, 13818, 13816, 2360, + 13817, 13821, 13819, 2361, 13820, 13824, 13822, 2362, 13823, 13827, + 13825, 2363, 13826, 13830, 13828, 2364, 13829, 13833, 13831, 2365, 13832, + 13836, 13834, 2366, 13835, 13839, 13837, 2367, 13838, 13842, 13840, 2368, + 13841, 13845, 13843, 2369, 13844, 13848, 13846, 2370, 13847, 13851, + 13849, 2371, 13850, 13854, 13852, 2372, 13853, 13857, 13855, 2373, 13856, + 13860, 13858, 2374, 13859, 13863, 13861, 2375, 13862, 13866, 13864, 2376, + 13865, 13869, 13867, 2377, 13868, 13872, 13870, 2378, 13871, 13875, + 13873, 2379, 13874, 13878, 13876, 2380, 13877, 13881, 13879, 2381, 13880, + 13884, 13882, 2382, 13883, 13887, 13885, 2383, 13886, 13890, 13888, 2384, + 13889, 13893, 13891, 2385, 13892, 13896, 13894, 2386, 13895, 13899, + 13897, 2387, 13898, 13902, 13900, 1032, 13901, 13905, 13903, 2388, 13904, + 13908, 13906, 2389, 13907, 13911, 13909, 2390, 13910, 13914, 13912, 2391, + 13913, 13917, 13915, 2392, 13916, 13920, 13918, 2393, 13919, 13923, + 13921, 2394, 13922, 13926, 13924, 2395, 13925, 13929, 13927, 2396, 13928, + 13932, 13930, 2397, 13931, 13935, 13933, 2398, 13934, 13938, 13936, 2399, + 13937, 13941, 13939, 2400, 13940, 13944, 13942, 2401, 13943, 13947, + 13945, 2402, 13946, 13950, 13948, 2403, 13949, 13953, 13951, 2404, 13952, + 13956, 13954, 2405, 13955, 13959, 13957, 2406, 13958, 13962, 13960, 2407, + 13961, 13965, 13963, 2408, 13964, 13968, 13966, 2409, 13967, 13971, + 13969, 2410, 13970, 13974, 13972, 2411, 13973, 13977, 13975, 2412, 13976, + 13980, 13978, 2413, 13979, 13983, 13981, 2414, 13982, 13986, 13984, 2415, + 13985, 13989, 13987, 2416, 13988, 13992, 13990, 2417, 13991, 13995, + 13993, 2418, 13994, 13998, 13996, 2419, 13997, 14001, 13999, 1031, 14000, + 14004, 14002, 2420, 14003, 14007, 14005, 2421, 14006, 14010, 14008, 2422, + 14009, 14013, 14011, 2423, 14012, 14016, 14014, 2424, 14015, 14019, + 14017, 2425, 14018, 14022, 14020, 2426, 14021, 14025, 14023, 2427, 14024, + 14028, 14026, 2428, 14027, 14031, 14029, 2429, 14030, 14034, 14032, 2430, + 14033, 14037, 14035, 2431, 14036, 14040, 14038, 2432, 14039, 14043, + 14041, 2433, 14042, 14046, 14044, 2434, 14045, 14049, 14047, 2435, 14048, + 14052, 14050, 2436, 14051, 14055, 14053, 2437, 14054, 14058, 14056, 2438, + 14057, 14061, 14059, 2439, 14060, 14064, 14062, 2440, 14063, 14067, + 14065, 2441, 14066, 14070, 14068, 2442, 14069, 14073, 14071, 2443, 14072, + 14076, 14074, 2444, 14075, 14079, 14077, 2445, 14078, 14082, 14080, 2446, + 14081, 14085, 14083, 2447, 14084, 14088, 14086, 2448, 14087, 14091, + 14089, 2449, 14090, 14094, 14092, 2450, 14093, 14097, 14095, 2451, 14096, + 14100, 14098, 1030, 14099, 14103, 14101, 2452, 14102, 14106, 14104, 2453, + 14105, 14109, 14107, 2454, 14108, 14112, 14110, 2455, 14111, 14115, + 14113, 2456, 14114, 14118, 14116, 2457, 14117, 14121, 14119, 2458, 14120, + 14124, 14122, 2459, 14123, 14127, 14125, 2460, 14126, 14130, 14128, 2461, + 14129, 14133, 14131, 2462, 14132, 14136, 14134, 2463, 14135, 14139, + 14137, 2464, 14138, 14142, 14140, 2465, 14141, 14145, 14143, 2466, 14144, + 14148, 14146, 2467, 14147, 14151, 14149, 2468, 14150, 14154, 14152, 2469, + 14153, 14157, 14155, 2470, 14156, 14160, 14158, 2471, 14159, 14163, + 14161, 2472, 14162, 14166, 14164, 2473, 14165, 14169, 14167, 2474, 14168, + 14172, 14170, 2475, 14171, 14175, 14173, 2476, 14174, 14178, 14176, 2477, + 14177, 14181, 14179, 2478, 14180, 14184, 14182, 2479, 14183, 14187, + 14185, 2480, 14186, 14190, 14188, 2481, 14189, 14193, 14191, 2482, 14192, + 14196, 14194, 2483, 14195, 14199, 14197, 1029, 14198, 14202, 14200, 2484, + 14201, 14205, 14203, 2485, 14204, 14208, 14206, 2486, 14207, 14211, + 14209, 2487, 14210, 14214, 14212, 2488, 14213, 14217, 14215, 2489, 14216, + 14220, 14218, 2490, 14219, 14223, 14221, 2491, 14222, 14226, 14224, 2492, + 14225, 14229, 14227, 2493, 14228, 14232, 14230, 2494, 14231, 14235, + 14233, 2495, 14234, 14238, 14236, 2496, 14237, 14241, 14239, 2497, 14240, + 14244, 14242, 2498, 14243, 14247, 14245, 2499, 14246, 14250, 14248, 2500, + 14249, 14253, 14251, 2501, 14252, 14256, 14254, 2502, 14255, 14259, + 14257, 2503, 14258, 14262, 14260, 2504, 14261, 14265, 14263, 2505, 14264, + 14268, 14266, 2506, 14267, 14271, 14269, 2507, 14270, 14274, 14272, 2508, + 14273, 14277, 14275, 2509, 14276, 14280, 14278, 2510, 14279, 14283, + 14281, 2511, 14282, 14286, 14284, 2512, 14285, 14289, 14287, 2513, 14288, + 14292, 14290, 2514, 14291, 14295, 14293, 2515, 14294, 14298, 14296, 1028, + 14297, 14301, 14299, 996, 14300, 14304, 14302, 997, 14303, 14307, 14305, + 998, 14306, 14310, 14308, 999, 14309, 14313, 14311, 1000, 14312, 14316, + 14314, 1001, 14315, 14319, 14317, 1002, 14318, 14322, 14320, 1003, 14321, + 14325, 14323, 1004, 14324, 14328, 14326, 1005, 14327, 14331, 14329, 1006, + 14330, 14334, 14332, 1007, 14333, 14337, 14335, 1008, 14336, 14340, + 14338, 1009, 14339, 14343, 14341, 1010, 14342, 14346, 14344, 1011, 14345, + 14349, 14347, 1012, 14348, 14352, 14350, 1013, 14351, 14355, 14353, 1014, + 14354, 14358, 14356, 1015, 14357, 14361, 14359, 1016, 14360, 14364, + 14362, 1017, 14363, 14367, 14365, 1018, 14366, 14370, 14368, 1019, 14369, + 14373, 14371, 1020, 14372, 14376, 14374, 1021, 14375, 14379, 14377, 1022, + 14378, 14382, 14380, 1023, 14381, 14385, 14383, 1024, 14384, 14388, + 14386, 1025, 14387, 14391, 14389, 1026, 14390, 14394, 14392, 1027, 14393, + 14397, 14395, 928, 14396, 14400, 14398, 2516, 14399, 14403, 14401, 2517, + 14402, 14406, 14404, 2518, 14405, 14409, 14407, 2519, 14408, 14412, + 14410, 2520, 14411, 14415, 14413, 2521, 14414, 14418, 14416, 2522, 14417, + 14421, 14419, 2523, 14420, 14424, 14422, 2524, 14423, 14427, 14425, 2525, + 14426, 14430, 14428, 2526, 14429, 14433, 14431, 2527, 14432, 14436, + 14434, 2528, 14435, 14439, 14437, 2529, 14438, 14442, 14440, 2530, 14441, + 14445, 14443, 1172, 14444, 14448, 14446, 2531, 14447, 14451, 14449, 2532, + 14450, 14454, 14452, 2533, 14453, 14457, 14455, 2534, 14456, 14460, + 14458, 2535, 14459, 14463, 14461, 2536, 14462, 14466, 14464, 2537, 14465, + 14469, 14467, 2538, 14468, 14472, 14470, 2539, 14471, 14475, 14473, 2540, + 14474, 14478, 14476, 2541, 14477, 14481, 14479, 2542, 14480, 14484, + 14482, 2543, 14483, 14487, 14485, 2544, 14486, 14490, 14488, 2545, 14489, + 14493, 14491, 1171, 14492, 14496, 14494, 2546, 14495, 14499, 14497, 2547, + 14498, 14502, 14500, 2548, 14501, 14505, 14503, 2549, 14504, 14508, + 14506, 2550, 14507, 14511, 14509, 2551, 14510, 14514, 14512, 2552, 14513, + 14517, 14515, 2553, 14516, 14520, 14518, 2554, 14519, 14523, 14521, 2555, + 14522, 14526, 14524, 2556, 14525, 14529, 14527, 2557, 14528, 14532, + 14530, 2558, 14531, 14535, 14533, 2559, 14534, 14538, 14536, 2560, 14537, + 14541, 14539, 1170, 14540, 14544, 14542, 2561, 14543, 14547, 14545, 2562, + 14546, 14550, 14548, 2563, 14549, 14553, 14551, 2564, 14552, 14556, + 14554, 2565, 14555, 14559, 14557, 2566, 14558, 14562, 14560, 2567, 14561, + 14565, 14563, 2568, 14564, 14568, 14566, 2569, 14567, 14571, 14569, 2570, + 14570, 14574, 14572, 2571, 14573, 14577, 14575, 2572, 14576, 14580, + 14578, 2573, 14579, 14583, 14581, 2574, 14582, 14586, 14584, 2575, 14585, + 14589, 14587, 1169, 14588, 14592, 14590, 2576, 14591, 14595, 14593, 2577, + 14594, 14598, 14596, 2578, 14597, 14601, 14599, 2579, 14600, 14604, + 14602, 2580, 14603, 14607, 14605, 2581, 14606, 14610, 14608, 2582, 14609, + 14613, 14611, 2583, 14612, 14616, 14614, 2584, 14615, 14619, 14617, 2585, + 14618, 14622, 14620, 2586, 14621, 14625, 14623, 2587, 14624, 14628, + 14626, 2588, 14627, 14631, 14629, 2589, 14630, 14634, 14632, 2590, 14633, + 14637, 14635, 1168, 14636, 14640, 14638, 2591, 14639, 14643, 14641, 2592, + 14642, 14646, 14644, 2593, 14645, 14649, 14647, 2594, 14648, 14652, + 14650, 2595, 14651, 14655, 14653, 2596, 14654, 14658, 14656, 2597, 14657, + 14661, 14659, 2598, 14660, 14664, 14662, 2599, 14663, 14667, 14665, 2600, + 14666, 14670, 14668, 2601, 14669, 14673, 14671, 2602, 14672, 14676, + 14674, 2603, 14675, 14679, 14677, 2604, 14678, 14682, 14680, 2605, 14681, + 14685, 14683, 1167, 14684, 14688, 14686, 2606, 14687, 14691, 14689, 2607, + 14690, 14694, 14692, 2608, 14693, 14697, 14695, 2609, 14696, 14700, + 14698, 2610, 14699, 14703, 14701, 2611, 14702, 14706, 14704, 2612, 14705, + 14709, 14707, 2613, 14708, 14712, 14710, 2614, 14711, 14715, 14713, 2615, + 14714, 14718, 14716, 2616, 14717, 14721, 14719, 2617, 14720, 14724, + 14722, 2618, 14723, 14727, 14725, 2619, 14726, 14730, 14728, 2620, 14729, + 14733, 14731, 1166, 14732, 14736, 14734, 2621, 14735, 14739, 14737, 2622, + 14738, 14742, 14740, 2623, 14741, 14745, 14743, 2624, 14744, 14748, + 14746, 2625, 14747, 14751, 14749, 2626, 14750, 14754, 14752, 2627, 14753, + 14757, 14755, 2628, 14756, 14760, 14758, 2629, 14759, 14763, 14761, 2630, + 14762, 14766, 14764, 2631, 14765, 14769, 14767, 2632, 14768, 14772, + 14770, 2633, 14771, 14775, 14773, 2634, 14774, 14778, 14776, 2635, 14777, + 14781, 14779, 1165, 14780, 14784, 14782, 2636, 14783, 14787, 14785, 2637, + 14786, 14790, 14788, 2638, 14789, 14793, 14791, 2639, 14792, 14796, + 14794, 2640, 14795, 14799, 14797, 2641, 14798, 14802, 14800, 2642, 14801, + 14805, 14803, 2643, 14804, 14808, 14806, 2644, 14807, 14811, 14809, 2645, + 14810, 14814, 14812, 2646, 14813, 14817, 14815, 2647, 14816, 14820, + 14818, 2648, 14819, 14823, 14821, 2649, 14822, 14826, 14824, 2650, 14825, + 14829, 14827, 1164, 14828, 14832, 14830, 2651, 14831, 14835, 14833, 2652, + 14834, 14838, 14836, 2653, 14837, 14841, 14839, 2654, 14840, 14844, + 14842, 2655, 14843, 14847, 14845, 2656, 14846, 14850, 14848, 2657, 14849, + 14853, 14851, 2658, 14852, 14856, 14854, 2659, 14855, 14859, 14857, 2660, + 14858, 14862, 14860, 2661, 14861, 14865, 14863, 2662, 14864, 14868, + 14866, 2663, 14867, 14871, 14869, 2664, 14870, 14874, 14872, 2665, 14873, + 14877, 14875, 1163, 14876, 14880, 14878, 2666, 14879, 14883, 14881, 2667, + 14882, 14886, 14884, 2668, 14885, 14889, 14887, 2669, 14888, 14892, + 14890, 2670, 14891, 14895, 14893, 2671, 14894, 14898, 14896, 2672, 14897, + 14901, 14899, 2673, 14900, 14904, 14902, 2674, 14903, 14907, 14905, 2675, + 14906, 14910, 14908, 2676, 14909, 14913, 14911, 2677, 14912, 14916, + 14914, 2678, 14915, 14919, 14917, 2679, 14918, 14922, 14920, 2680, 14921, + 14925, 14923, 1162, 14924, 14928, 14926, 2681, 14927, 14931, 14929, 2682, + 14930, 14934, 14932, 2683, 14933, 14937, 14935, 2684, 14936, 14940, + 14938, 2685, 14939, 14943, 14941, 2686, 14942, 14946, 14944, 2687, 14945, + 14949, 14947, 2688, 14948, 14952, 14950, 2689, 14951, 14955, 14953, 2690, + 14954, 14958, 14956, 2691, 14957, 14961, 14959, 2692, 14960, 14964, + 14962, 2693, 14963, 14967, 14965, 2694, 14966, 14970, 14968, 2695, 14969, + 14973, 14971, 1161, 14972, 14976, 14974, 2696, 14975, 14979, 14977, 2697, + 14978, 14982, 14980, 2698, 14981, 14985, 14983, 2699, 14984, 14988, + 14986, 2700, 14987, 14991, 14989, 2701, 14990, 14994, 14992, 2702, 14993, + 14997, 14995, 2703, 14996, 15000, 14998, 2704, 14999, 15003, 15001, 2705, + 15002, 15006, 15004, 2706, 15005, 15009, 15007, 2707, 15008, 15012, + 15010, 2708, 15011, 15015, 15013, 2709, 15014, 15018, 15016, 2710, 15017, + 15021, 15019, 1160, 15020, 15024, 15022, 2711, 15023, 15027, 15025, 2712, + 15026, 15030, 15028, 2713, 15029, 15033, 15031, 2714, 15032, 15036, + 15034, 2715, 15035, 15039, 15037, 2716, 15038, 15042, 15040, 2717, 15041, + 15045, 15043, 2718, 15044, 15048, 15046, 2719, 15047, 15051, 15049, 2720, + 15050, 15054, 15052, 2721, 15053, 15057, 15055, 2722, 15056, 15060, + 15058, 2723, 15059, 15063, 15061, 2724, 15062, 15066, 15064, 2725, 15065, + 15069, 15067, 1159, 15068, 15072, 15070, 2726, 15071, 15075, 15073, 2727, + 15074, 15078, 15076, 2728, 15077, 15081, 15079, 2729, 15080, 15084, + 15082, 2730, 15083, 15087, 15085, 2731, 15086, 15090, 15088, 2732, 15089, + 15093, 15091, 2733, 15092, 15096, 15094, 2734, 15095, 15099, 15097, 2735, + 15098, 15102, 15100, 2736, 15101, 15105, 15103, 2737, 15104, 15108, + 15106, 2738, 15107, 15111, 15109, 2739, 15110, 15114, 15112, 2740, 15113, + 15117, 15115, 1158, 15116, 15120, 15118, 2741, 15119, 15123, 15121, 2742, + 15122, 15126, 15124, 2743, 15125, 15129, 15127, 2744, 15128, 15132, + 15130, 2745, 15131, 15135, 15133, 2746, 15134, 15138, 15136, 2747, 15137, + 15141, 15139, 2748, 15140, 15144, 15142, 2749, 15143, 15147, 15145, 2750, + 15146, 15150, 15148, 2751, 15149, 15153, 15151, 2752, 15152, 15156, + 15154, 2753, 15155, 15159, 15157, 2754, 15158, 15162, 15160, 2755, 15161, + 15165, 15163, 1157, 15164, 15167, 15166, 15169, 15168, 15171, 15170, + 15173, 15172, 15175, 15174, 15177, 15176, 15179, 15178, 15181, 15180, + 15183, 15182, 15185, 15184, 15187, 15186, 15189, 15188, 15191, 15190, + 15193, 15192, 15195, 15194, 15197, 15196, 9000, 15200, 332, 15198, 2756, + 15199, 8985, 15203, 333, 15201, 2757, 15202, 8970, 15206, 334, 15204, + 2758, 15205, 8955, 15209, 335, 15207, 2759, 15208, 8940, 15212, 336, + 15210, 2760, 15211, 8925, 15215, 337, 15213, 2761, 15214, 8910, 15218, + 338, 15216, 2762, 15217, 8895, 15221, 339, 15219, 2763, 15220, 8880, + 15224, 340, 15222, 2764, 15223, 8865, 15227, 341, 15225, 2765, 15226, + 8850, 15230, 342, 15228, 2766, 15229, 8835, 15233, 343, 15231, 2767, + 15232, 8820, 15236, 344, 15234, 2768, 15235, 8805, 15239, 345, 15237, + 2769, 15238, 8790, 15242, 346, 15240, 2770, 15241, 8775, 15245, 347, + 15243, 2771, 15244, 8760, 15248, 348, 15246, 2772, 15247, 8745, 15251, + 349, 15249, 2773, 15250, 8730, 15254, 350, 15252, 2774, 15253, 8715, + 15257, 351, 15255, 2775, 15256, 8700, 15260, 352, 15258, 2776, 15259, + 8685, 15263, 353, 15261, 2777, 15262, 8670, 15266, 354, 15264, 2778, + 15265, 8655, 15269, 355, 15267, 2779, 15268, 8640, 15272, 356, 15270, + 2780, 15271, 8625, 15275, 357, 15273, 2781, 15274, 8610, 15278, 358, + 15276, 2782, 15277, 8595, 15281, 359, 15279, 2783, 15280, 8580, 15284, + 360, 15282, 2784, 15283, 8565, 15287, 361, 15285, 2785, 15286, 8550, + 15290, 362, 15288, 2786, 15289, 8535, 15293, 363, 15291, 2787, 15292, + 8520, 15296, 15295, 15299, 15297, 2788, 15298, 15302, 15300, 2789, 15301, + 15305, 15303, 2790, 15304, 15308, 15306, 2791, 15307, 15311, 15309, 2792, + 15310, 15314, 15312, 2793, 15313, 15317, 15315, 2794, 15316, 15320, + 15318, 2795, 15319, 15323, 15321, 2796, 15322, 15326, 15324, 2797, 15325, + 15329, 15327, 2798, 15328, 15332, 15330, 2799, 15331, 15335, 15333, 2800, + 15334, 15338, 15336, 2801, 15337, 15341, 15339, 2802, 15340, 15344, + 15342, 2803, 15343, 15347, 15345, 2804, 15346, 15350, 15348, 2805, 15349, + 15353, 15351, 2806, 15352, 15356, 15354, 2807, 15355, 15359, 15357, 2808, + 15358, 15362, 15360, 2809, 15361, 15365, 15363, 2810, 15364, 15368, + 15366, 2811, 15367, 15371, 15369, 2812, 15370, 15374, 15372, 2813, 15373, + 15377, 15375, 2814, 15376, 15380, 15378, 2815, 15379, 15383, 15381, 2816, + 15382, 15386, 15384, 2817, 15385, 15389, 15387, 2818, 15388, 15392, + 15390, 2819, 15391, 15395, 15394, 15398, 15396, 2820, 15397, 15401, + 15399, 2821, 15400, 15404, 15402, 2822, 15403, 15407, 15405, 2823, 15406, + 15410, 15408, 2824, 15409, 15413, 15411, 2825, 15412, 15416, 15414, 2826, + 15415, 15419, 15417, 2827, 15418, 15422, 15420, 2828, 15421, 15425, + 15423, 2829, 15424, 15428, 15426, 2830, 15427, 15431, 15429, 2831, 15430, + 15434, 15432, 2832, 15433, 15437, 15435, 2833, 15436, 15440, 15438, 2834, + 15439, 15443, 15441, 2835, 15442, 15446, 15444, 2836, 15445, 15449, + 15447, 2837, 15448, 15452, 15450, 2838, 15451, 15455, 15453, 2839, 15454, + 15458, 15456, 2840, 15457, 15461, 15459, 2841, 15460, 15464, 15462, 2842, + 15463, 15467, 15465, 2843, 15466, 15470, 15468, 2844, 15469, 15473, + 15471, 2845, 15472, 15476, 15474, 2846, 15475, 15479, 15477, 2847, 15478, + 15482, 15480, 2848, 15481, 15485, 15483, 2849, 15484, 15488, 15486, 2850, + 15487, 15491, 15489, 2851, 15490, 15494, 15493, 15497, 15495, 2852, + 15496, 15500, 15498, 2853, 15499, 15503, 15501, 2854, 15502, 15506, + 15504, 2855, 15505, 15509, 15507, 2856, 15508, 15512, 15510, 2857, 15511, + 15515, 15513, 2858, 15514, 15518, 15516, 2859, 15517, 15521, 15519, 2860, + 15520, 15524, 15522, 2861, 15523, 15527, 15525, 2862, 15526, 15530, + 15528, 2863, 15529, 15533, 15531, 2864, 15532, 15536, 15534, 2865, 15535, + 15539, 15537, 2866, 15538, 15542, 15540, 2867, 15541, 15545, 15543, 2868, + 15544, 15548, 15546, 2869, 15547, 15551, 15549, 2870, 15550, 15554, + 15552, 2871, 15553, 15557, 15555, 2872, 15556, 15560, 15558, 2873, 15559, + 15563, 15561, 2874, 15562, 15566, 15564, 2875, 15565, 15569, 15567, 2876, + 15568, 15572, 15570, 2877, 15571, 15575, 15573, 2878, 15574, 15578, + 15576, 2879, 15577, 15581, 15579, 2880, 15580, 15584, 15582, 2881, 15583, + 15587, 15585, 2882, 15586, 15590, 15588, 2883, 15589, 15593, 15592, + 15596, 15594, 2884, 15595, 15599, 15597, 2885, 15598, 15602, 15600, 2886, + 15601, 15605, 15603, 2887, 15604, 15608, 15606, 2888, 15607, 15611, + 15609, 2889, 15610, 15614, 15612, 2890, 15613, 15617, 15615, 2891, 15616, + 15620, 15618, 2892, 15619, 15623, 15621, 2893, 15622, 15626, 15624, 2894, + 15625, 15629, 15627, 2895, 15628, 15632, 15630, 2896, 15631, 15635, + 15633, 2897, 15634, 15638, 15636, 2898, 15637, 15641, 15639, 2899, 15640, + 15644, 15642, 2900, 15643, 15647, 15645, 2901, 15646, 15650, 15648, 2902, + 15649, 15653, 15651, 2903, 15652, 15656, 15654, 2904, 15655, 15659, + 15657, 2905, 15658, 15662, 15660, 2906, 15661, 15665, 15663, 2907, 15664, + 15668, 15666, 2908, 15667, 15671, 15669, 2909, 15670, 15674, 15672, 2910, + 15673, 15677, 15675, 2911, 15676, 15680, 15678, 2912, 15679, 15683, + 15681, 2913, 15682, 15686, 15684, 2914, 15685, 15689, 15687, 2915, 15688, + 15692, 15691, 15695, 15693, 2916, 15694, 15698, 15696, 2917, 15697, + 15701, 15699, 2918, 15700, 15704, 15702, 2919, 15703, 15707, 15705, 2920, + 15706, 15710, 15708, 2921, 15709, 15713, 15711, 2922, 15712, 15716, + 15714, 2923, 15715, 15719, 15717, 2924, 15718, 15722, 15720, 2925, 15721, + 15725, 15723, 2926, 15724, 15728, 15726, 2927, 15727, 15731, 15729, 2928, + 15730, 15734, 15732, 2929, 15733, 15737, 15735, 2930, 15736, 15740, + 15738, 2931, 15739, 15743, 15741, 2932, 15742, 15746, 15744, 2933, 15745, + 15749, 15747, 2934, 15748, 15752, 15750, 2935, 15751, 15755, 15753, 2936, + 15754, 15758, 15756, 2937, 15757, 15761, 15759, 2938, 15760, 15764, + 15762, 2939, 15763, 15767, 15765, 2940, 15766, 15770, 15768, 2941, 15769, + 15773, 15771, 2942, 15772, 15776, 15774, 2943, 15775, 15779, 15777, 2944, + 15778, 15782, 15780, 2945, 15781, 15785, 15783, 2946, 15784, 15788, + 15786, 2947, 15787, 15791, 15790, 15794, 15792, 2948, 15793, 15797, + 15795, 2949, 15796, 15800, 15798, 2950, 15799, 15803, 15801, 2951, 15802, + 15806, 15804, 2952, 15805, 15809, 15807, 2953, 15808, 15812, 15810, 2954, + 15811, 15815, 15813, 2955, 15814, 15818, 15816, 2956, 15817, 15821, + 15819, 2957, 15820, 15824, 15822, 2958, 15823, 15827, 15825, 2959, 15826, + 15830, 15828, 2960, 15829, 15833, 15831, 2961, 15832, 15836, 15834, 2962, + 15835, 15839, 15837, 2963, 15838, 15842, 15840, 2964, 15841, 15845, + 15843, 2965, 15844, 15848, 15846, 2966, 15847, 15851, 15849, 2967, 15850, + 15854, 15852, 2968, 15853, 15857, 15855, 2969, 15856, 15860, 15858, 2970, + 15859, 15863, 15861, 2971, 15862, 15866, 15864, 2972, 15865, 15869, + 15867, 2973, 15868, 15872, 15870, 2974, 15871, 15875, 15873, 2975, 15874, + 15878, 15876, 2976, 15877, 15881, 15879, 2977, 15880, 15884, 15882, 2978, + 15883, 15887, 15885, 2979, 15886, 15890, 15889, 15893, 15891, 2980, + 15892, 15896, 15894, 2981, 15895, 15899, 15897, 2982, 15898, 15902, + 15900, 2983, 15901, 15905, 15903, 2984, 15904, 15908, 15906, 2985, 15907, + 15911, 15909, 2986, 15910, 15914, 15912, 2987, 15913, 15917, 15915, 2988, + 15916, 15920, 15918, 2989, 15919, 15923, 15921, 2990, 15922, 15926, + 15924, 2991, 15925, 15929, 15927, 2992, 15928, 15932, 15930, 2993, 15931, + 15935, 15933, 2994, 15934, 15938, 15936, 2995, 15937, 15941, 15939, 2996, + 15940, 15944, 15942, 2997, 15943, 15947, 15945, 2998, 15946, 15950, + 15948, 2999, 15949, 15953, 15951, 3000, 15952, 15956, 15954, 3001, 15955, + 15959, 15957, 3002, 15958, 15962, 15960, 3003, 15961, 15965, 15963, 3004, + 15964, 15968, 15966, 3005, 15967, 15971, 15969, 3006, 15970, 15974, + 15972, 3007, 15973, 15977, 15975, 3008, 15976, 15980, 15978, 3009, 15979, + 15983, 15981, 3010, 15982, 15986, 15984, 3011, 15985, 15989, 15988, + 15992, 15990, 3012, 15991, 15995, 15993, 3013, 15994, 15998, 15996, 3014, + 15997, 16001, 15999, 3015, 16000, 16004, 16002, 3016, 16003, 16007, + 16005, 3017, 16006, 16010, 16008, 3018, 16009, 16013, 16011, 3019, 16012, + 16016, 16014, 3020, 16015, 16019, 16017, 3021, 16018, 16022, 16020, 3022, + 16021, 16025, 16023, 3023, 16024, 16028, 16026, 3024, 16027, 16031, + 16029, 3025, 16030, 16034, 16032, 3026, 16033, 16037, 16035, 3027, 16036, + 16040, 16038, 3028, 16039, 16043, 16041, 3029, 16042, 16046, 16044, 3030, + 16045, 16049, 16047, 3031, 16048, 16052, 16050, 3032, 16051, 16055, + 16053, 3033, 16054, 16058, 16056, 3034, 16057, 16061, 16059, 3035, 16060, + 16064, 16062, 3036, 16063, 16067, 16065, 3037, 16066, 16070, 16068, 3038, + 16069, 16073, 16071, 3039, 16072, 16076, 16074, 3040, 16075, 16079, + 16077, 3041, 16078, 16082, 16080, 3042, 16081, 16085, 16083, 3043, 16084, + 16088, 16087, 16091, 16089, 3044, 16090, 16094, 16092, 3045, 16093, + 16097, 16095, 3046, 16096, 16100, 16098, 3047, 16099, 16103, 16101, 3048, + 16102, 16106, 16104, 3049, 16105, 16109, 16107, 3050, 16108, 16112, + 16110, 3051, 16111, 16115, 16113, 3052, 16114, 16118, 16116, 3053, 16117, + 16121, 16119, 3054, 16120, 16124, 16122, 3055, 16123, 16127, 16125, 3056, + 16126, 16130, 16128, 3057, 16129, 16133, 16131, 3058, 16132, 16136, + 16134, 3059, 16135, 16139, 16137, 3060, 16138, 16142, 16140, 3061, 16141, + 16145, 16143, 3062, 16144, 16148, 16146, 3063, 16147, 16151, 16149, 3064, + 16150, 16154, 16152, 3065, 16153, 16157, 16155, 3066, 16156, 16160, + 16158, 3067, 16159, 16163, 16161, 3068, 16162, 16166, 16164, 3069, 16165, + 16169, 16167, 3070, 16168, 16172, 16170, 3071, 16171, 16175, 16173, 3072, + 16174, 16178, 16176, 3073, 16177, 16181, 16179, 3074, 16180, 16184, + 16182, 3075, 16183, 16187, 16186, 16190, 16188, 3076, 16189, 16193, + 16191, 3077, 16192, 16196, 16194, 3078, 16195, 16199, 16197, 3079, 16198, + 16202, 16200, 3080, 16201, 16205, 16203, 3081, 16204, 16208, 16206, 3082, + 16207, 16211, 16209, 3083, 16210, 16214, 16212, 3084, 16213, 16217, + 16215, 3085, 16216, 16220, 16218, 3086, 16219, 16223, 16221, 3087, 16222, + 16226, 16224, 3088, 16225, 16229, 16227, 3089, 16228, 16232, 16230, 3090, + 16231, 16235, 16233, 3091, 16234, 16238, 16236, 3092, 16237, 16241, + 16239, 3093, 16240, 16244, 16242, 3094, 16243, 16247, 16245, 3095, 16246, + 16250, 16248, 3096, 16249, 16253, 16251, 3097, 16252, 16256, 16254, 3098, + 16255, 16259, 16257, 3099, 16258, 16262, 16260, 3100, 16261, 16265, + 16263, 3101, 16264, 16268, 16266, 3102, 16267, 16271, 16269, 3103, 16270, + 16274, 16272, 3104, 16273, 16277, 16275, 3105, 16276, 16280, 16278, 3106, + 16279, 16283, 16281, 3107, 16282, 16286, 16285, 16289, 16287, 3108, + 16288, 16292, 16290, 3109, 16291, 16295, 16293, 3110, 16294, 16298, + 16296, 3111, 16297, 16301, 16299, 3112, 16300, 16304, 16302, 3113, 16303, + 16307, 16305, 3114, 16306, 16310, 16308, 3115, 16309, 16313, 16311, 3116, + 16312, 16316, 16314, 3117, 16315, 16319, 16317, 3118, 16318, 16322, + 16320, 3119, 16321, 16325, 16323, 3120, 16324, 16328, 16326, 3121, 16327, + 16331, 16329, 3122, 16330, 16334, 16332, 3123, 16333, 16337, 16335, 3124, + 16336, 16340, 16338, 3125, 16339, 16343, 16341, 3126, 16342, 16346, + 16344, 3127, 16345, 16349, 16347, 3128, 16348, 16352, 16350, 3129, 16351, + 16355, 16353, 3130, 16354, 16358, 16356, 3131, 16357, 16361, 16359, 3132, + 16360, 16364, 16362, 3133, 16363, 16367, 16365, 3134, 16366, 16370, + 16368, 3135, 16369, 16373, 16371, 3136, 16372, 16376, 16374, 3137, 16375, + 16379, 16377, 3138, 16378, 16382, 16380, 3139, 16381, 16385, 16384, + 16388, 16386, 3140, 16387, 16391, 16389, 3141, 16390, 16394, 16392, 3142, + 16393, 16397, 16395, 3143, 16396, 16400, 16398, 3144, 16399, 16403, + 16401, 3145, 16402, 16406, 16404, 3146, 16405, 16409, 16407, 3147, 16408, + 16412, 16410, 3148, 16411, 16415, 16413, 3149, 16414, 16418, 16416, 3150, + 16417, 16421, 16419, 3151, 16420, 16424, 16422, 3152, 16423, 16427, + 16425, 3153, 16426, 16430, 16428, 3154, 16429, 16433, 16431, 3155, 16432, + 16436, 16434, 3156, 16435, 16439, 16437, 3157, 16438, 16442, 16440, 3158, + 16441, 16445, 16443, 3159, 16444, 16448, 16446, 3160, 16447, 16451, + 16449, 3161, 16450, 16454, 16452, 3162, 16453, 16457, 16455, 3163, 16456, + 16460, 16458, 3164, 16459, 16463, 16461, 3165, 16462, 16466, 16464, 3166, + 16465, 16469, 16467, 3167, 16468, 16472, 16470, 3168, 16471, 16475, + 16473, 3169, 16474, 16478, 16476, 3170, 16477, 16481, 16479, 3171, 16480, + 16484, 16483, 16487, 16485, 3172, 16486, 16490, 16488, 3173, 16489, + 16493, 16491, 3174, 16492, 16496, 16494, 3175, 16495, 16499, 16497, 3176, + 16498, 16502, 16500, 3177, 16501, 16505, 16503, 3178, 16504, 16508, + 16506, 3179, 16507, 16511, 16509, 3180, 16510, 16514, 16512, 3181, 16513, + 16517, 16515, 3182, 16516, 16520, 16518, 3183, 16519, 16523, 16521, 3184, + 16522, 16526, 16524, 3185, 16525, 16529, 16527, 3186, 16528, 16532, + 16530, 3187, 16531, 16535, 16533, 3188, 16534, 16538, 16536, 3189, 16537, + 16541, 16539, 3190, 16540, 16544, 16542, 3191, 16543, 16547, 16545, 3192, + 16546, 16550, 16548, 3193, 16549, 16553, 16551, 3194, 16552, 16556, + 16554, 3195, 16555, 16559, 16557, 3196, 16558, 16562, 16560, 3197, 16561, + 16565, 16563, 3198, 16564, 16568, 16566, 3199, 16567, 16571, 16569, 3200, + 16570, 16574, 16572, 3201, 16573, 16577, 16575, 3202, 16576, 16580, + 16578, 3203, 16579, 16583, 16582, 16586, 16584, 3204, 16585, 16589, + 16587, 3205, 16588, 16592, 16590, 3206, 16591, 16595, 16593, 3207, 16594, + 16598, 16596, 3208, 16597, 16601, 16599, 3209, 16600, 16604, 16602, 3210, + 16603, 16607, 16605, 3211, 16606, 16610, 16608, 3212, 16609, 16613, + 16611, 3213, 16612, 16616, 16614, 3214, 16615, 16619, 16617, 3215, 16618, + 16622, 16620, 3216, 16621, 16625, 16623, 3217, 16624, 16628, 16626, 3218, + 16627, 16631, 16629, 3219, 16630, 16634, 16632, 3220, 16633, 16637, + 16635, 3221, 16636, 16640, 16638, 3222, 16639, 16643, 16641, 3223, 16642, + 16646, 16644, 3224, 16645, 16649, 16647, 3225, 16648, 16652, 16650, 3226, + 16651, 16655, 16653, 3227, 16654, 16658, 16656, 3228, 16657, 16661, + 16659, 3229, 16660, 16664, 16662, 3230, 16663, 16667, 16665, 3231, 16666, + 16670, 16668, 3232, 16669, 16673, 16671, 3233, 16672, 16676, 16674, 3234, + 16675, 16679, 16677, 3235, 16678, 16682, 16681, 16685, 16683, 3236, + 16684, 16688, 16686, 3237, 16687, 16691, 16689, 3238, 16690, 16694, + 16692, 3239, 16693, 16697, 16695, 3240, 16696, 16700, 16698, 3241, 16699, + 16703, 16701, 3242, 16702, 16706, 16704, 3243, 16705, 16709, 16707, 3244, + 16708, 16712, 16710, 3245, 16711, 16715, 16713, 3246, 16714, 16718, + 16716, 3247, 16717, 16721, 16719, 3248, 16720, 16724, 16722, 3249, 16723, + 16727, 16725, 3250, 16726, 16730, 16728, 3251, 16729, 16733, 16731, 3252, + 16732, 16736, 16734, 3253, 16735, 16739, 16737, 3254, 16738, 16742, + 16740, 3255, 16741, 16745, 16743, 3256, 16744, 16748, 16746, 3257, 16747, + 16751, 16749, 3258, 16750, 16754, 16752, 3259, 16753, 16757, 16755, 3260, + 16756, 16760, 16758, 3261, 16759, 16763, 16761, 3262, 16762, 16766, + 16764, 3263, 16765, 16769, 16767, 3264, 16768, 16772, 16770, 3265, 16771, + 16775, 16773, 3266, 16774, 16778, 16776, 3267, 16777, 16781, 16780, + 16784, 16782, 3268, 16783, 16787, 16785, 3269, 16786, 16790, 16788, 3270, + 16789, 16793, 16791, 3271, 16792, 16796, 16794, 3272, 16795, 16799, + 16797, 3273, 16798, 16802, 16800, 3274, 16801, 16805, 16803, 3275, 16804, + 16808, 16806, 3276, 16807, 16811, 16809, 3277, 16810, 16814, 16812, 3278, + 16813, 16817, 16815, 3279, 16816, 16820, 16818, 3280, 16819, 16823, + 16821, 3281, 16822, 16826, 16824, 3282, 16825, 16829, 16827, 3283, 16828, + 16832, 16830, 3284, 16831, 16835, 16833, 3285, 16834, 16838, 16836, 3286, + 16837, 16841, 16839, 3287, 16840, 16844, 16842, 3288, 16843, 16847, + 16845, 3289, 16846, 16850, 16848, 3290, 16849, 16853, 16851, 3291, 16852, + 16856, 16854, 3292, 16855, 16859, 16857, 3293, 16858, 16862, 16860, 3294, + 16861, 16865, 16863, 3295, 16864, 16868, 16866, 3296, 16867, 16871, + 16869, 3297, 16870, 16874, 16872, 3298, 16873, 16877, 16875, 3299, 16876, + 16880, 16879, 16883, 16881, 1045, 16882, 16886, 16884, 1046, 16885, + 16889, 16887, 1047, 16888, 16892, 16890, 1048, 16891, 16895, 16893, 1049, + 16894, 16898, 16896, 1050, 16897, 16901, 16899, 1051, 16900, 16904, + 16902, 1052, 16903, 16907, 16905, 1053, 16906, 16910, 16908, 1054, 16909, + 16913, 16911, 1055, 16912, 16916, 16914, 1056, 16915, 16919, 16917, 1057, + 16918, 16922, 16920, 1058, 16921, 16925, 16923, 1059, 16924, 16928, + 16926, 1060, 16927, 16931, 16929, 1061, 16930, 16934, 16932, 1062, 16933, + 16937, 16935, 1063, 16936, 16940, 16938, 1064, 16939, 16943, 16941, 1065, + 16942, 16946, 16944, 1066, 16945, 16949, 16947, 1067, 16948, 16952, + 16950, 1068, 16951, 16955, 16953, 1069, 16954, 16958, 16956, 1070, 16957, + 16961, 16959, 1071, 16960, 16964, 16962, 1072, 16963, 16967, 16965, 1073, + 16966, 16970, 16968, 1074, 16969, 16973, 16971, 1075, 16972, 16976, + 16974, 1076, 16975, 16979, 16978, 16982, 16980, 3300, 16981, 16985, + 16983, 3301, 16984, 16988, 16986, 3302, 16987, 16991, 16989, 3303, 16990, + 16994, 16992, 3304, 16993, 16997, 16995, 3305, 16996, 17000, 16998, 3306, + 16999, 17003, 17001, 3307, 17002, 17006, 17004, 3308, 17005, 17009, + 17007, 3309, 17008, 17012, 17010, 3310, 17011, 17015, 17013, 3311, 17014, + 17018, 17016, 3312, 17017, 17021, 17019, 3313, 17020, 17024, 17022, 3314, + 17023, 17027, 17025, 3315, 17026, 17030, 17029, 17033, 17031, 3316, + 17032, 17036, 17034, 3317, 17035, 17039, 17037, 3318, 17038, 17042, + 17040, 3319, 17041, 17045, 17043, 3320, 17044, 17048, 17046, 3321, 17047, + 17051, 17049, 3322, 17050, 17054, 17052, 3323, 17053, 17057, 17055, 3324, + 17056, 17060, 17058, 3325, 17059, 17063, 17061, 3326, 17062, 17066, + 17064, 3327, 17065, 17069, 17067, 3328, 17068, 17072, 17070, 3329, 17071, + 17075, 17073, 3330, 17074, 17078, 17076, 3331, 17077, 17081, 17080, + 17084, 17082, 3332, 17083, 17087, 17085, 3333, 17086, 17090, 17088, 3334, + 17089, 17093, 17091, 3335, 17092, 17096, 17094, 3336, 17095, 17099, + 17097, 3337, 17098, 17102, 17100, 3338, 17101, 17105, 17103, 3339, 17104, + 17108, 17106, 3340, 17107, 17111, 17109, 3341, 17110, 17114, 17112, 3342, + 17113, 17117, 17115, 3343, 17116, 17120, 17118, 3344, 17119, 17123, + 17121, 3345, 17122, 17126, 17124, 3346, 17125, 17129, 17127, 3347, 17128, + 17132, 17131, 17135, 17133, 3348, 17134, 17138, 17136, 3349, 17137, + 17141, 17139, 3350, 17140, 17144, 17142, 3351, 17143, 17147, 17145, 3352, + 17146, 17150, 17148, 3353, 17149, 17153, 17151, 3354, 17152, 17156, + 17154, 3355, 17155, 17159, 17157, 3356, 17158, 17162, 17160, 3357, 17161, + 17165, 17163, 3358, 17164, 17168, 17166, 3359, 17167, 17171, 17169, 3360, + 17170, 17174, 17172, 3361, 17173, 17177, 17175, 3362, 17176, 17180, + 17178, 3363, 17179, 17183, 17182, 17186, 17184, 3364, 17185, 17189, + 17187, 3365, 17188, 17192, 17190, 3366, 17191, 17195, 17193, 3367, 17194, + 17198, 17196, 3368, 17197, 17201, 17199, 3369, 17200, 17204, 17202, 3370, + 17203, 17207, 17205, 3371, 17206, 17210, 17208, 3372, 17209, 17213, + 17211, 3373, 17212, 17216, 17214, 3374, 17215, 17219, 17217, 3375, 17218, + 17222, 17220, 3376, 17221, 17225, 17223, 3377, 17224, 17228, 17226, 3378, + 17227, 17231, 17229, 3379, 17230, 17234, 17233, 17237, 17235, 3380, + 17236, 17240, 17238, 3381, 17239, 17243, 17241, 3382, 17242, 17246, + 17244, 3383, 17245, 17249, 17247, 3384, 17248, 17252, 17250, 3385, 17251, + 17255, 17253, 3386, 17254, 17258, 17256, 3387, 17257, 17261, 17259, 3388, + 17260, 17264, 17262, 3389, 17263, 17267, 17265, 3390, 17266, 17270, + 17268, 3391, 17269, 17273, 17271, 3392, 17272, 17276, 17274, 3393, 17275, + 17279, 17277, 3394, 17278, 17282, 17280, 3395, 17281, 17285, 17284, + 17288, 17286, 3396, 17287, 17291, 17289, 3397, 17290, 17294, 17292, 3398, + 17293, 17297, 17295, 3399, 17296, 17300, 17298, 3400, 17299, 17303, + 17301, 3401, 17302, 17306, 17304, 3402, 17305, 17309, 17307, 3403, 17308, + 17312, 17310, 3404, 17311, 17315, 17313, 3405, 17314, 17318, 17316, 3406, + 17317, 17321, 17319, 3407, 17320, 17324, 17322, 3408, 17323, 17327, + 17325, 3409, 17326, 17330, 17328, 3410, 17329, 17333, 17331, 3411, 17332, + 17336, 17335, 17339, 17337, 3412, 17338, 17342, 17340, 3413, 17341, + 17345, 17343, 3414, 17344, 17348, 17346, 3415, 17347, 17351, 17349, 3416, + 17350, 17354, 17352, 3417, 17353, 17357, 17355, 3418, 17356, 17360, + 17358, 3419, 17359, 17363, 17361, 3420, 17362, 17366, 17364, 3421, 17365, + 17369, 17367, 3422, 17368, 17372, 17370, 3423, 17371, 17375, 17373, 3424, + 17374, 17378, 17376, 3425, 17377, 17381, 17379, 3426, 17380, 17384, + 17382, 3427, 17383, 17387, 17386, 17390, 17388, 3428, 17389, 17393, + 17391, 3429, 17392, 17396, 17394, 3430, 17395, 17399, 17397, 3431, 17398, + 17402, 17400, 3432, 17401, 17405, 17403, 3433, 17404, 17408, 17406, 3434, + 17407, 17411, 17409, 3435, 17410, 17414, 17412, 3436, 17413, 17417, + 17415, 3437, 17416, 17420, 17418, 3438, 17419, 17423, 17421, 3439, 17422, + 17426, 17424, 3440, 17425, 17429, 17427, 3441, 17428, 17432, 17430, 3442, + 17431, 17435, 17433, 3443, 17434, 17438, 17437, 17441, 17439, 3444, + 17440, 17444, 17442, 3445, 17443, 17447, 17445, 3446, 17446, 17450, + 17448, 3447, 17449, 17453, 17451, 3448, 17452, 17456, 17454, 3449, 17455, + 17459, 17457, 3450, 17458, 17462, 17460, 3451, 17461, 17465, 17463, 3452, + 17464, 17468, 17466, 3453, 17467, 17471, 17469, 3454, 17470, 17474, + 17472, 3455, 17473, 17477, 17475, 3456, 17476, 17480, 17478, 3457, 17479, + 17483, 17481, 3458, 17482, 17486, 17484, 3459, 17485, 17489, 17488, + 17492, 17490, 3460, 17491, 17495, 17493, 3461, 17494, 17498, 17496, 3462, + 17497, 17501, 17499, 3463, 17500, 17504, 17502, 3464, 17503, 17507, + 17505, 3465, 17506, 17510, 17508, 3466, 17509, 17513, 17511, 3467, 17512, + 17516, 17514, 3468, 17515, 17519, 17517, 3469, 17518, 17522, 17520, 3470, + 17521, 17525, 17523, 3471, 17524, 17528, 17526, 3472, 17527, 17531, + 17529, 3473, 17530, 17534, 17532, 3474, 17533, 17537, 17535, 3475, 17536, + 17540, 17539, 17543, 17541, 3476, 17542, 17546, 17544, 3477, 17545, + 17549, 17547, 3478, 17548, 17552, 17550, 3479, 17551, 17555, 17553, 3480, + 17554, 17558, 17556, 3481, 17557, 17561, 17559, 3482, 17560, 17564, + 17562, 3483, 17563, 17567, 17565, 3484, 17566, 17570, 17568, 3485, 17569, + 17573, 17571, 3486, 17572, 17576, 17574, 3487, 17575, 17579, 17577, 3488, + 17578, 17582, 17580, 3489, 17581, 17585, 17583, 3490, 17584, 17588, + 17586, 3491, 17587, 17591, 17590, 17594, 17592, 3492, 17593, 17597, + 17595, 3493, 17596, 17600, 17598, 3494, 17599, 17603, 17601, 3495, 17602, + 17606, 17604, 3496, 17605, 17609, 17607, 3497, 17608, 17612, 17610, 3498, + 17611, 17615, 17613, 3499, 17614, 17618, 17616, 3500, 17617, 17621, + 17619, 3501, 17620, 17624, 17622, 3502, 17623, 17627, 17625, 3503, 17626, + 17630, 17628, 3504, 17629, 17633, 17631, 3505, 17632, 17636, 17634, 3506, + 17635, 17639, 17637, 3507, 17638, 17642, 17641, 17645, 17643, 3508, + 17644, 17648, 17646, 3509, 17647, 17651, 17649, 3510, 17650, 17654, + 17652, 3511, 17653, 17657, 17655, 3512, 17656, 17660, 17658, 3513, 17659, + 17663, 17661, 3514, 17662, 17666, 17664, 3515, 17665, 17669, 17667, 3516, + 17668, 17672, 17670, 3517, 17671, 17675, 17673, 3518, 17674, 17678, + 17676, 3519, 17677, 17681, 17679, 3520, 17680, 17684, 17682, 3521, 17683, + 17687, 17685, 3522, 17686, 17690, 17688, 3523, 17689, 17693, 17692, + 17696, 17694, 3524, 17695, 17699, 17697, 3525, 17698, 17702, 17700, 3526, + 17701, 17705, 17703, 3527, 17704, 17708, 17706, 3528, 17707, 17711, + 17709, 3529, 17710, 17714, 17712, 3530, 17713, 17717, 17715, 3531, 17716, + 17720, 17718, 3532, 17719, 17723, 17721, 3533, 17722, 17726, 17724, 3534, + 17725, 17729, 17727, 3535, 17728, 17732, 17730, 3536, 17731, 17735, + 17733, 3537, 17734, 17738, 17736, 3538, 17737, 17741, 17739, 3539, 17740, + 17744, 17743, 17746, 17745, 17748, 17747, 17750, 17749, 17752, 17751, + 17754, 17753, 17756, 17755, 17758, 17757, 17760, 17759, 17762, 17761, + 17764, 17763, 17766, 17765, 17768, 17767, 17770, 17769, 17772, 17771, + 17774, 17773, 17776, 17775, 17778, 132, 9988, 9999, 8017, 1, 8038, 400, + 9997, 924, 9985, 9998, 8035, 399, 9995, 923, 9982, 9996, 8031, 398, 9993, + 922, 9979, 9994, 8027, 397, 9991, 921, 9976, 9992, 8023, 131, 9973, 9989, + 8013, 9986, 920, 9970, 9987, 9983, 919, 9967, 9984, 9980, 918, 9964, + 9981, 9977, 917, 9961, 9978, 130, 9958, 9974, 8009, 9971, 916, 9955, + 9972, 9968, 915, 9952, 9969, 9965, 914, 9949, 9966, 9962, 913, 9946, + 9963, 129, 9943, 9959, 8005, 9956, 912, 9940, 9957, 9953, 911, 9937, + 9954, 9950, 910, 9934, 9951, 9947, 909, 9931, 9948, 128, 9928, 9944, + 8001, 9941, 908, 9925, 9942, 9938, 907, 9922, 9939, 9935, 906, 9919, + 9936, 9932, 905, 9916, 9933, 127, 9913, 9929, 7997, 9926, 904, 9910, + 9927, 9923, 903, 9907, 9924, 9920, 902, 9904, 9921, 9917, 901, 9901, + 9918, 126, 9898, 9914, 7993, 9911, 900, 9895, 9912, 9908, 899, 9892, + 9909, 9905, 898, 9889, 9906, 9902, 897, 9886, 9903, 125, 9883, 9899, + 7989, 9896, 896, 9880, 9897, 9893, 895, 9877, 9894, 9890, 894, 9874, + 9891, 9887, 893, 9871, 9888, 124, 9868, 9884, 7985, 9881, 892, 9865, + 9882, 9878, 891, 9862, 9879, 9875, 890, 9859, 9876, 9872, 889, 9856, + 9873, 123, 9853, 9869, 7981, 9866, 888, 9850, 9867, 9863, 887, 9847, + 9864, 9860, 886, 9844, 9861, 9857, 885, 9841, 9858, 122, 9838, 9854, + 7977, 9851, 884, 9835, 9852, 9848, 883, 9832, 9849, 9845, 882, 9829, + 9846, 9842, 881, 9826, 9843, 121, 9823, 9839, 7973, 9836, 880, 9820, + 9837, 9833, 879, 9817, 9834, 9830, 878, 9814, 9831, 9827, 877, 9811, + 9828, 120, 9808, 9824, 7969, 9821, 876, 9805, 9822, 9818, 875, 9802, + 9819, 9815, 874, 9799, 9816, 9812, 873, 9796, 9813, 119, 9793, 9809, + 7965, 9806, 872, 9790, 9807, 9803, 871, 9787, 9804, 9800, 870, 9784, + 9801, 9797, 869, 9781, 9798, 118, 9778, 9794, 7961, 9791, 868, 9775, + 9792, 9788, 867, 9772, 9789, 9785, 866, 9769, 9786, 9782, 865, 9766, + 9783, 117, 9763, 9779, 7957, 9776, 864, 9760, 9777, 9773, 863, 9757, + 9774, 9770, 862, 9754, 9771, 9767, 861, 9751, 9768, 116, 9748, 9764, + 7953, 9761, 860, 9745, 9762, 9758, 859, 9742, 9759, 9755, 858, 9739, + 9756, 9752, 857, 9736, 9753, 115, 9733, 9749, 7949, 9746, 856, 9730, + 9747, 9743, 855, 9727, 9744, 9740, 854, 9724, 9741, 9737, 853, 9721, + 9738, 114, 9718, 9734, 7945, 9731, 852, 9715, 9732, 9728, 851, 9712, + 9729, 9725, 850, 9709, 9726, 9722, 849, 9706, 9723, 113, 9703, 9719, + 7941, 9716, 848, 9700, 9717, 9713, 847, 9697, 9714, 9710, 846, 9694, + 9711, 9707, 845, 9691, 9708, 112, 9688, 9704, 7937, 9701, 844, 9685, + 9702, 9698, 843, 9682, 9699, 9695, 842, 9679, 9696, 9692, 841, 9676, + 9693, 111, 9673, 9689, 7933, 9686, 840, 9670, 9687, 9683, 839, 9667, + 9684, 9680, 838, 9664, 9681, 9677, 837, 9661, 9678, 110, 9658, 9674, + 7929, 9671, 836, 9655, 9672, 9668, 835, 9652, 9669, 9665, 834, 9649, + 9666, 9662, 833, 9646, 9663, 109, 9643, 9659, 7925, 9656, 832, 9640, + 9657, 9653, 831, 9637, 9654, 9650, 830, 9634, 9651, 9647, 829, 9631, + 9648, 108, 9628, 9644, 7921, 9641, 828, 9625, 9642, 9638, 827, 9622, + 9639, 9635, 826, 9619, 9636, 9632, 825, 9616, 9633, 107, 9613, 9629, + 7917, 9626, 824, 9610, 9627, 9623, 823, 9607, 9624, 9620, 822, 9604, + 9621, 9617, 821, 9601, 9618, 106, 9598, 9614, 7913, 9611, 820, 9595, + 9612, 9608, 819, 9592, 9609, 9605, 818, 9589, 9606, 9602, 817, 9586, + 9603, 105, 9583, 9599, 7909, 9596, 816, 9580, 9597, 9593, 815, 9577, + 9594, 9590, 814, 9574, 9591, 9587, 813, 9571, 9588, 104, 9568, 9584, + 7905, 9581, 812, 9565, 9582, 9578, 811, 9562, 9579, 9575, 810, 9559, + 9576, 9572, 809, 9556, 9573, 103, 9553, 9569, 7901, 9566, 808, 9550, + 9567, 9563, 807, 9547, 9564, 9560, 806, 9544, 9561, 9557, 805, 9541, + 9558, 102, 9538, 9554, 7897, 9551, 804, 9535, 9552, 9548, 803, 9532, + 9549, 9545, 802, 9529, 9546, 9542, 801, 9526, 9543, 101, 9523, 9539, + 7893, 9536, 800, 9520, 9537, 9533, 799, 9517, 9534, 9530, 798, 9514, + 9531, 9527, 797, 9511, 9528, 100, 9508, 9524, 7889, 9521, 796, 9505, + 9522, 9518, 795, 9502, 9519, 9515, 794, 9499, 9516, 9512, 793, 9496, + 9513, 8024, 8021, 401, 8022, 8028, 8025, 402, 8026, 8032, 8029, 403, + 8030, 8036, 8033, 404, 8034, 8039, 8037, 2, 7492, 8043, 8041, 405, 8042, + 8046, 8044, 406, 8045, 8049, 8047, 407, 8048, 8052, 8050, 408, 8051, + 8054, 8053, 3, 7497, 8058, 8056, 409, 8057, 8061, 8059, 410, 8060, 8064, + 8062, 411, 8063, 8067, 8065, 412, 8066, 8069, 8068, 4, 7501, 8073, 8071, + 413, 8072, 8076, 8074, 414, 8075, 8079, 8077, 415, 8078, 8082, 8080, 416, + 8081, 8084, 8083, 5, 7505, 8088, 8086, 417, 8087, 8091, 8089, 418, 8090, + 8094, 8092, 419, 8093, 8097, 8095, 420, 8096, 8099, 8098, 6, 7509, 8103, + 8101, 421, 8102, 8106, 8104, 422, 8105, 8109, 8107, 423, 8108, 8112, + 8110, 424, 8111, 8114, 8113, 7, 7513, 8118, 8116, 425, 8117, 8121, 8119, + 426, 8120, 8124, 8122, 427, 8123, 8127, 8125, 428, 8126, 8129, 8128, 8, + 7517, 8133, 8131, 429, 8132, 8136, 8134, 430, 8135, 8139, 8137, 431, + 8138, 8142, 8140, 432, 8141, 8144, 8143, 9, 7521, 8148, 8146, 433, 8147, + 8151, 8149, 434, 8150, 8154, 8152, 435, 8153, 8157, 8155, 436, 8156, + 8159, 8158, 10, 7525, 8163, 8161, 437, 8162, 8166, 8164, 438, 8165, 8169, + 8167, 439, 8168, 8172, 8170, 440, 8171, 8174, 8173, 11, 7529, 8178, 8176, + 441, 8177, 8181, 8179, 442, 8180, 8184, 8182, 443, 8183, 8187, 8185, 444, + 8186, 8189, 8188, 12, 7533, 8193, 8191, 445, 8192, 8196, 8194, 446, 8195, + 8199, 8197, 447, 8198, 8202, 8200, 448, 8201, 8204, 8203, 13, 7537, 8208, + 8206, 449, 8207, 8211, 8209, 450, 8210, 8214, 8212, 451, 8213, 8217, + 8215, 452, 8216, 8219, 8218, 14, 7541, 8223, 8221, 453, 8222, 8226, 8224, + 454, 8225, 8229, 8227, 455, 8228, 8232, 8230, 456, 8231, 8234, 8233, 15, + 7545, 8238, 8236, 457, 8237, 8241, 8239, 458, 8240, 8244, 8242, 459, + 8243, 8247, 8245, 460, 8246, 8249, 8248, 16, 7549, 8253, 8251, 461, 8252, + 8256, 8254, 462, 8255, 8259, 8257, 463, 8258, 8262, 8260, 464, 8261, + 8264, 8263, 17, 7553, 8268, 8266, 465, 8267, 8271, 8269, 466, 8270, 8274, + 8272, 467, 8273, 8277, 8275, 468, 8276, 8279, 8278, 18, 7557, 8283, 8281, + 469, 8282, 8286, 8284, 470, 8285, 8289, 8287, 471, 8288, 8292, 8290, 472, + 8291, 8294, 8293, 19, 7561, 8298, 8296, 473, 8297, 8301, 8299, 474, 8300, + 8304, 8302, 475, 8303, 8307, 8305, 476, 8306, 8309, 8308, 20, 7565, 8313, + 8311, 477, 8312, 8316, 8314, 478, 8315, 8319, 8317, 479, 8318, 8322, + 8320, 480, 8321, 8324, 8323, 21, 7569, 8328, 8326, 481, 8327, 8331, 8329, + 482, 8330, 8334, 8332, 483, 8333, 8337, 8335, 484, 8336, 8339, 8338, 22, + 7573, 8343, 8341, 485, 8342, 8346, 8344, 486, 8345, 8349, 8347, 487, + 8348, 8352, 8350, 488, 8351, 8354, 8353, 23, 7577, 8358, 8356, 489, 8357, + 8361, 8359, 490, 8360, 8364, 8362, 491, 8363, 8367, 8365, 492, 8366, + 8369, 8368, 24, 7581, 8373, 8371, 493, 8372, 8376, 8374, 494, 8375, 8379, + 8377, 495, 8378, 8382, 8380, 496, 8381, 8384, 8383, 25, 7585, 8388, 8386, + 497, 8387, 8391, 8389, 498, 8390, 8394, 8392, 499, 8393, 8397, 8395, 500, + 8396, 8399, 8398, 26, 7589, 8403, 8401, 501, 8402, 8406, 8404, 502, 8405, + 8409, 8407, 503, 8408, 8412, 8410, 504, 8411, 8414, 8413, 27, 7593, 8418, + 8416, 505, 8417, 8421, 8419, 506, 8420, 8424, 8422, 507, 8423, 8427, + 8425, 508, 8426, 8429, 8428, 28, 7597, 8433, 8431, 509, 8432, 8436, 8434, + 510, 8435, 8439, 8437, 511, 8438, 8442, 8440, 512, 8441, 8444, 8443, 29, + 7601, 8448, 8446, 513, 8447, 8451, 8449, 514, 8450, 8454, 8452, 515, + 8453, 8457, 8455, 516, 8456, 8459, 8458, 30, 7605, 8463, 8461, 517, 8462, + 8466, 8464, 518, 8465, 8469, 8467, 519, 8468, 8472, 8470, 520, 8471, + 8474, 8473, 31, 7609, 8478, 8476, 521, 8477, 8481, 8479, 522, 8480, 8484, + 8482, 523, 8483, 8487, 8485, 524, 8486, 8489, 8488, 32, 7613, 8493, 8491, + 525, 8492, 8496, 8494, 526, 8495, 8499, 8497, 527, 8498, 8502, 8500, 528, + 8501, 8504, 8503, 33, 7617, 8508, 8506, 529, 8507, 8511, 8509, 530, 8510, + 8514, 8512, 531, 8513, 8517, 8515, 532, 8516, 8519, 8518, 34, 7621, 8523, + 8521, 533, 8522, 8526, 8524, 534, 8525, 8529, 8527, 535, 8528, 8532, + 8530, 536, 8531, 8534, 8533, 35, 7625, 8538, 8536, 537, 8537, 8541, 8539, + 538, 8540, 8544, 8542, 539, 8543, 8547, 8545, 540, 8546, 8549, 8548, 36, + 7629, 8553, 8551, 541, 8552, 8556, 8554, 542, 8555, 8559, 8557, 543, + 8558, 8562, 8560, 544, 8561, 8564, 8563, 37, 7633, 8568, 8566, 545, 8567, + 8571, 8569, 546, 8570, 8574, 8572, 547, 8573, 8577, 8575, 548, 8576, + 8579, 8578, 38, 7637, 8583, 8581, 549, 8582, 8586, 8584, 550, 8585, 8589, + 8587, 551, 8588, 8592, 8590, 552, 8591, 8594, 8593, 39, 7641, 8598, 8596, + 553, 8597, 8601, 8599, 554, 8600, 8604, 8602, 555, 8603, 8607, 8605, 556, + 8606, 8609, 8608, 40, 7645, 8613, 8611, 557, 8612, 8616, 8614, 558, 8615, + 8619, 8617, 559, 8618, 8622, 8620, 560, 8621, 8624, 8623, 41, 7649, 8628, + 8626, 561, 8627, 8631, 8629, 562, 8630, 8634, 8632, 563, 8633, 8637, + 8635, 564, 8636, 8639, 8638, 42, 7653, 8643, 8641, 565, 8642, 8646, 8644, + 566, 8645, 8649, 8647, 567, 8648, 8652, 8650, 568, 8651, 8654, 8653, 43, + 7657, 8658, 8656, 569, 8657, 8661, 8659, 570, 8660, 8664, 8662, 571, + 8663, 8667, 8665, 572, 8666, 8669, 8668, 44, 7661, 8673, 8671, 573, 8672, + 8676, 8674, 574, 8675, 8679, 8677, 575, 8678, 8682, 8680, 576, 8681, + 8684, 8683, 45, 7665, 8688, 8686, 577, 8687, 8691, 8689, 578, 8690, 8694, + 8692, 579, 8693, 8697, 8695, 580, 8696, 8699, 8698, 46, 7669, 8703, 8701, + 581, 8702, 8706, 8704, 582, 8705, 8709, 8707, 583, 8708, 8712, 8710, 584, + 8711, 8714, 8713, 47, 7673, 8718, 8716, 585, 8717, 8721, 8719, 586, 8720, + 8724, 8722, 587, 8723, 8727, 8725, 588, 8726, 8729, 8728, 48, 7677, 8733, + 8731, 589, 8732, 8736, 8734, 590, 8735, 8739, 8737, 591, 8738, 8742, + 8740, 592, 8741, 8744, 8743, 49, 7681, 8748, 8746, 593, 8747, 8751, 8749, + 594, 8750, 8754, 8752, 595, 8753, 8757, 8755, 596, 8756, 8759, 8758, 50, + 7685, 8763, 8761, 597, 8762, 8766, 8764, 598, 8765, 8769, 8767, 599, + 8768, 8772, 8770, 600, 8771, 8774, 8773, 51, 7689, 8778, 8776, 601, 8777, + 8781, 8779, 602, 8780, 8784, 8782, 603, 8783, 8787, 8785, 604, 8786, + 8789, 8788, 52, 7693, 8793, 8791, 605, 8792, 8796, 8794, 606, 8795, 8799, + 8797, 607, 8798, 8802, 8800, 608, 8801, 8804, 8803, 53, 7697, 8808, 8806, + 609, 8807, 8811, 8809, 610, 8810, 8814, 8812, 611, 8813, 8817, 8815, 612, + 8816, 8819, 8818, 54, 7701, 8823, 8821, 613, 8822, 8826, 8824, 614, 8825, + 8829, 8827, 615, 8828, 8832, 8830, 616, 8831, 8834, 8833, 55, 7705, 8838, + 8836, 617, 8837, 8841, 8839, 618, 8840, 8844, 8842, 619, 8843, 8847, + 8845, 620, 8846, 8849, 8848, 56, 7709, 8853, 8851, 621, 8852, 8856, 8854, + 622, 8855, 8859, 8857, 623, 8858, 8862, 8860, 624, 8861, 8864, 8863, 57, + 7713, 8868, 8866, 625, 8867, 8871, 8869, 626, 8870, 8874, 8872, 627, + 8873, 8877, 8875, 628, 8876, 8879, 8878, 58, 7717, 8883, 8881, 629, 8882, + 8886, 8884, 630, 8885, 8889, 8887, 631, 8888, 8892, 8890, 632, 8891, + 8894, 8893, 59, 7721, 8898, 8896, 633, 8897, 8901, 8899, 634, 8900, 8904, + 8902, 635, 8903, 8907, 8905, 636, 8906, 8909, 8908, 60, 7725, 8913, 8911, + 637, 8912, 8916, 8914, 638, 8915, 8919, 8917, 639, 8918, 8922, 8920, 640, + 8921, 8924, 8923, 61, 7729, 8928, 8926, 641, 8927, 8931, 8929, 642, 8930, + 8934, 8932, 643, 8933, 8937, 8935, 644, 8936, 8939, 8938, 62, 7733, 8943, + 8941, 645, 8942, 8946, 8944, 646, 8945, 8949, 8947, 647, 8948, 8952, + 8950, 648, 8951, 8954, 8953, 63, 7737, 8958, 8956, 649, 8957, 8961, 8959, + 650, 8960, 8964, 8962, 651, 8963, 8967, 8965, 652, 8966, 8969, 8968, 64, + 7741, 8973, 8971, 653, 8972, 8976, 8974, 654, 8975, 8979, 8977, 655, + 8978, 8982, 8980, 656, 8981, 8984, 8983, 65, 7745, 8988, 8986, 657, 8987, + 8991, 8989, 658, 8990, 8994, 8992, 659, 8993, 8997, 8995, 660, 8996, + 8999, 8998, 66, 7749, 9003, 9001, 661, 9002, 9006, 9004, 662, 9005, 9009, + 9007, 663, 9008, 9012, 9010, 664, 9011, 9014, 9013, 67, 7753, 9018, 9016, + 665, 9017, 9021, 9019, 666, 9020, 9024, 9022, 667, 9023, 9027, 9025, 668, + 9026, 9029, 9028, 68, 7757, 9033, 9031, 669, 9032, 9036, 9034, 670, 9035, + 9039, 9037, 671, 9038, 9042, 9040, 672, 9041, 9044, 9043, 69, 7761, 9048, + 9046, 673, 9047, 9051, 9049, 674, 9050, 9054, 9052, 675, 9053, 9057, + 9055, 676, 9056, 9059, 9058, 70, 7765, 9063, 9061, 677, 9062, 9066, 9064, + 678, 9065, 9069, 9067, 679, 9068, 9072, 9070, 680, 9071, 9074, 9073, 71, + 7769, 9078, 9076, 681, 9077, 9081, 9079, 682, 9080, 9084, 9082, 683, + 9083, 9087, 9085, 684, 9086, 9089, 9088, 72, 7773, 9093, 9091, 685, 9092, + 9096, 9094, 686, 9095, 9099, 9097, 687, 9098, 9102, 9100, 688, 9101, + 9104, 9103, 73, 7777, 9108, 9106, 689, 9107, 9111, 9109, 690, 9110, 9114, + 9112, 691, 9113, 9117, 9115, 692, 9116, 9119, 9118, 74, 7781, 9123, 9121, + 693, 9122, 9126, 9124, 694, 9125, 9129, 9127, 695, 9128, 9132, 9130, 696, + 9131, 9134, 9133, 75, 7785, 9138, 9136, 697, 9137, 9141, 9139, 698, 9140, + 9144, 9142, 699, 9143, 9147, 9145, 700, 9146, 9149, 9148, 76, 7789, 9153, + 9151, 701, 9152, 9156, 9154, 702, 9155, 9159, 9157, 703, 9158, 9162, + 9160, 704, 9161, 9164, 9163, 77, 7793, 9168, 9166, 705, 9167, 9171, 9169, + 706, 9170, 9174, 9172, 707, 9173, 9177, 9175, 708, 9176, 9179, 9178, 78, + 7797, 9183, 9181, 709, 9182, 9186, 9184, 710, 9185, 9189, 9187, 711, + 9188, 9192, 9190, 712, 9191, 9194, 9193, 79, 7801, 9198, 9196, 713, 9197, + 9201, 9199, 714, 9200, 9204, 9202, 715, 9203, 9207, 9205, 716, 9206, + 9209, 9208, 80, 7805, 9213, 9211, 717, 9212, 9216, 9214, 718, 9215, 9219, + 9217, 719, 9218, 9222, 9220, 720, 9221, 9224, 9223, 81, 7809, 9228, 9226, + 721, 9227, 9231, 9229, 722, 9230, 9234, 9232, 723, 9233, 9237, 9235, 724, + 9236, 9239, 9238, 82, 7813, 9243, 9241, 725, 9242, 9246, 9244, 726, 9245, + 9249, 9247, 727, 9248, 9252, 9250, 728, 9251, 9254, 9253, 83, 7817, 9258, + 9256, 729, 9257, 9261, 9259, 730, 9260, 9264, 9262, 731, 9263, 9267, + 9265, 732, 9266, 9269, 9268, 84, 7821, 9273, 9271, 733, 9272, 9276, 9274, + 734, 9275, 9279, 9277, 735, 9278, 9282, 9280, 736, 9281, 9284, 9283, 85, + 7825, 9288, 9286, 737, 9287, 9291, 9289, 738, 9290, 9294, 9292, 739, + 9293, 9297, 9295, 740, 9296, 9299, 9298, 86, 7829, 9303, 9301, 741, 9302, + 9306, 9304, 742, 9305, 9309, 9307, 743, 9308, 9312, 9310, 744, 9311, + 9314, 9313, 87, 7833, 9318, 9316, 745, 9317, 9321, 9319, 746, 9320, 9324, + 9322, 747, 9323, 9327, 9325, 748, 9326, 9329, 9328, 88, 7837, 9333, 9331, + 749, 9332, 9336, 9334, 750, 9335, 9339, 9337, 751, 9338, 9342, 9340, 752, + 9341, 9344, 9343, 89, 7841, 9348, 9346, 753, 9347, 9351, 9349, 754, 9350, + 9354, 9352, 755, 9353, 9357, 9355, 756, 9356, 9359, 9358, 90, 7845, 9363, + 9361, 757, 9362, 9366, 9364, 758, 9365, 9369, 9367, 759, 9368, 9372, + 9370, 760, 9371, 9374, 9373, 91, 7849, 9378, 9376, 761, 9377, 9381, 9379, + 762, 9380, 9384, 9382, 763, 9383, 9387, 9385, 764, 9386, 9389, 9388, 92, + 7853, 9393, 9391, 765, 9392, 9396, 9394, 766, 9395, 9399, 9397, 767, + 9398, 9402, 9400, 768, 9401, 9404, 9403, 93, 7857, 9408, 9406, 769, 9407, + 9411, 9409, 770, 9410, 9414, 9412, 771, 9413, 9417, 9415, 772, 9416, + 9419, 9418, 94, 7861, 9423, 9421, 773, 9422, 9426, 9424, 774, 9425, 9429, + 9427, 775, 9428, 9432, 9430, 776, 9431, 9434, 9433, 95, 7865, 9438, 9436, + 777, 9437, 9441, 9439, 778, 9440, 9444, 9442, 779, 9443, 9447, 9445, 780, + 9446, 9449, 9448, 96, 7869, 9453, 9451, 781, 9452, 9456, 9454, 782, 9455, + 9459, 9457, 783, 9458, 9462, 9460, 784, 9461, 9464, 9463, 97, 7873, 9468, + 9466, 785, 9467, 9471, 9469, 786, 9470, 9474, 9472, 787, 9473, 9477, + 9475, 788, 9476, 9479, 9478, 98, 7877, 9483, 9481, 789, 9482, 9486, 9484, + 790, 9485, 9489, 9487, 791, 9488, 9492, 9490, 792, 9491, 9494, 9493, 99, + 7881, 9498, 9497, 9501, 9500, 9504, 9503, 9507, 9506, 9509, 7885, 264, + 8014, 8019, 8018, 133, 7495, 263, 8010, 8016, 8015, 262, 8006, 8012, + 8011, 261, 8002, 8008, 8007, 260, 7998, 8004, 8003, 259, 7994, 8000, + 7999, 258, 7990, 7996, 7995, 257, 7986, 7992, 7991, 256, 7982, 7988, + 7987, 255, 7978, 7984, 7983, 254, 7974, 7980, 7979, 253, 7970, 7976, + 7975, 252, 7966, 7972, 7971, 251, 7962, 7968, 7967, 250, 7958, 7964, + 7963, 249, 7954, 7960, 7959, 248, 7950, 7956, 7955, 247, 7946, 7952, + 7951, 246, 7942, 7948, 7947, 245, 7938, 7944, 7943, 244, 7934, 7940, + 7939, 243, 7930, 7936, 7935, 242, 7926, 7932, 7931, 241, 7922, 7928, + 7927, 240, 7918, 7924, 7923, 239, 7914, 7920, 7919, 238, 7910, 7916, + 7915, 237, 7906, 7912, 7911, 236, 7902, 7908, 7907, 235, 7898, 7904, + 7903, 234, 7894, 7900, 7899, 233, 7890, 7896, 7895, 232, 7886, 7892, + 7891, 7496, 7493, 134, 7494, 7500, 7498, 135, 7499, 7504, 7502, 136, + 7503, 7508, 7506, 137, 7507, 7512, 7510, 138, 7511, 7516, 7514, 139, + 7515, 7520, 7518, 140, 7519, 7524, 7522, 141, 7523, 7528, 7526, 142, + 7527, 7532, 7530, 143, 7531, 7536, 7534, 144, 7535, 7540, 7538, 145, + 7539, 7544, 7542, 146, 7543, 7548, 7546, 147, 7547, 7552, 7550, 148, + 7551, 7556, 7554, 149, 7555, 7560, 7558, 150, 7559, 7564, 7562, 151, + 7563, 7568, 7566, 152, 7567, 7572, 7570, 153, 7571, 7576, 7574, 154, + 7575, 7580, 7578, 155, 7579, 7584, 7582, 156, 7583, 7588, 7586, 157, + 7587, 7592, 7590, 158, 7591, 7596, 7594, 159, 7595, 7600, 7598, 160, + 7599, 7604, 7602, 161, 7603, 7608, 7606, 162, 7607, 7612, 7610, 163, + 7611, 7616, 7614, 164, 7615, 7620, 7618, 165, 7619, 7624, 7622, 166, + 7623, 7628, 7626, 167, 7627, 7632, 7630, 168, 7631, 7636, 7634, 169, + 7635, 7640, 7638, 170, 7639, 7644, 7642, 171, 7643, 7648, 7646, 172, + 7647, 7652, 7650, 173, 7651, 7656, 7654, 174, 7655, 7660, 7658, 175, + 7659, 7664, 7662, 176, 7663, 7668, 7666, 177, 7667, 7672, 7670, 178, + 7671, 7676, 7674, 179, 7675, 7680, 7678, 180, 7679, 7684, 7682, 181, + 7683, 7688, 7686, 182, 7687, 7692, 7690, 183, 7691, 7696, 7694, 184, + 7695, 7700, 7698, 185, 7699, 7704, 7702, 186, 7703, 7708, 7706, 187, + 7707, 7712, 7710, 188, 7711, 7716, 7714, 189, 7715, 7720, 7718, 190, + 7719, 7724, 7722, 191, 7723, 7728, 7726, 192, 7727, 7732, 7730, 193, + 7731, 7736, 7734, 194, 7735, 7740, 7738, 195, 7739, 7744, 7742, 196, + 7743, 7748, 7746, 197, 7747, 7752, 7750, 198, 7751, 7756, 7754, 199, + 7755, 7760, 7758, 200, 7759, 7764, 7762, 201, 7763, 7768, 7766, 202, + 7767, 7772, 7770, 203, 7771, 7776, 7774, 204, 7775, 7780, 7778, 205, + 7779, 7784, 7782, 206, 7783, 7788, 7786, 207, 7787, 7792, 7790, 208, + 7791, 7796, 7794, 209, 7795, 7800, 7798, 210, 7799, 7804, 7802, 211, + 7803, 7808, 7806, 212, 7807, 7812, 7810, 213, 7811, 7816, 7814, 214, + 7815, 7820, 7818, 215, 7819, 7824, 7822, 216, 7823, 7828, 7826, 217, + 7827, 7832, 7830, 218, 7831, 7836, 7834, 219, 7835, 7840, 7838, 220, + 7839, 7844, 7842, 221, 7843, 7848, 7846, 222, 7847, 7852, 7850, 223, + 7851, 7856, 7854, 224, 7855, 7860, 7858, 225, 7859, 7864, 7862, 226, + 7863, 7868, 7866, 227, 7867, 7872, 7870, 228, 7871, 7876, 7874, 229, + 7875, 7880, 7878, 230, 7879, 7884, 7882, 231, 7883, 7888, 7887, 4440, + 29779, 29829, 29828, 4439, 20420, 4478, 29826, 7491, 29776, 29827, 20416, + 4477, 29824, 7490, 29773, 29825, 20412, 4476, 29822, 7489, 29770, 29823, + 20408, 4475, 29820, 7488, 29767, 29821, 20404, 4474, 29818, 7487, 29764, + 29819, 20400, 4473, 29816, 7486, 29761, 29817, 20396, 4472, 29814, 7485, + 29758, 29815, 20392, 4471, 29812, 7484, 29755, 29813, 20388, 4470, 29810, + 7483, 29752, 29811, 20384, 4469, 29808, 7482, 29749, 29809, 20380, 4468, + 29806, 7481, 29746, 29807, 20376, 4467, 29804, 7480, 29743, 29805, 20372, + 4466, 29802, 7479, 29740, 29803, 20368, 4465, 29800, 7478, 29737, 29801, + 20364, 4464, 29798, 7477, 29734, 29799, 20360, 4463, 29796, 7476, 29731, + 29797, 20356, 4462, 29794, 7475, 29728, 29795, 20352, 4461, 29792, 7474, + 29725, 29793, 20348, 4460, 29790, 7473, 29722, 29791, 20344, 4459, 29788, + 7472, 29719, 29789, 20340, 4458, 29786, 7471, 29716, 29787, 20336, 4457, + 29784, 7470, 29713, 29785, 20332, 4456, 29782, 7469, 29710, 29783, 20328, + 4441, 29707, 29781, 29780, 29777, 7468, 29704, 29778, 29774, 7467, 29701, + 29775, 29771, 7466, 29698, 29772, 29768, 7465, 29695, 29769, 29765, 7464, + 29692, 29766, 29762, 7463, 29689, 29763, 29759, 7462, 29686, 29760, + 29756, 7461, 29683, 29757, 29753, 7460, 29680, 29754, 29750, 7459, 29677, + 29751, 29747, 7458, 29674, 29748, 29744, 7457, 29671, 29745, 29741, 7456, + 29668, 29742, 29738, 7455, 29665, 29739, 29735, 7454, 29662, 29736, + 29732, 7453, 29659, 29733, 29729, 7452, 29656, 29730, 29726, 7451, 29653, + 29727, 29723, 7450, 29650, 29724, 29720, 7449, 29647, 29721, 29717, 7448, + 29644, 29718, 29714, 7447, 29641, 29715, 29711, 7446, 29638, 29712, 4442, + 29635, 29709, 29708, 29705, 7445, 29632, 29706, 29702, 7444, 29629, + 29703, 29699, 7443, 29626, 29700, 29696, 7442, 29623, 29697, 29693, 7441, + 29620, 29694, 29690, 7440, 29617, 29691, 29687, 7439, 29614, 29688, + 29684, 7438, 29611, 29685, 29681, 7437, 29608, 29682, 29678, 7436, 29605, + 29679, 29675, 7435, 29602, 29676, 29672, 7434, 29599, 29673, 29669, 7433, + 29596, 29670, 29666, 7432, 29593, 29667, 29663, 7431, 29590, 29664, + 29660, 7430, 29587, 29661, 29657, 7429, 29584, 29658, 29654, 7428, 29581, + 29655, 29651, 7427, 29578, 29652, 29648, 7426, 29575, 29649, 29645, 7425, + 29572, 29646, 29642, 7424, 29569, 29643, 29639, 7423, 29566, 29640, 4443, + 29563, 29637, 29636, 29633, 7422, 29560, 29634, 29630, 7421, 29557, + 29631, 29627, 7420, 29554, 29628, 29624, 7419, 29551, 29625, 29621, 7418, + 29548, 29622, 29618, 7417, 29545, 29619, 29615, 7416, 29542, 29616, + 29612, 7415, 29539, 29613, 29609, 7414, 29536, 29610, 29606, 7413, 29533, + 29607, 29603, 7412, 29530, 29604, 29600, 7411, 29527, 29601, 29597, 7410, + 29524, 29598, 29594, 7409, 29521, 29595, 29591, 7408, 29518, 29592, + 29588, 7407, 29515, 29589, 29585, 7406, 29512, 29586, 29582, 7405, 29509, + 29583, 29579, 7404, 29506, 29580, 29576, 7403, 29503, 29577, 29573, 7402, + 29500, 29574, 29570, 7401, 29497, 29571, 29567, 7400, 29494, 29568, 4444, + 29491, 29565, 29564, 29561, 7399, 29488, 29562, 29558, 7398, 29485, + 29559, 29555, 7397, 29482, 29556, 29552, 7396, 29479, 29553, 29549, 7395, + 29476, 29550, 29546, 7394, 29473, 29547, 29543, 7393, 29470, 29544, + 29540, 7392, 29467, 29541, 29537, 7391, 29464, 29538, 29534, 7390, 29461, + 29535, 29531, 7389, 29458, 29532, 29528, 7388, 29455, 29529, 29525, 7387, + 29452, 29526, 29522, 7386, 29449, 29523, 29519, 7385, 29446, 29520, + 29516, 7384, 29443, 29517, 29513, 7383, 29440, 29514, 29510, 7382, 29437, + 29511, 29507, 7381, 29434, 29508, 29504, 7380, 29431, 29505, 29501, 7379, + 29428, 29502, 29498, 7378, 29425, 29499, 29495, 7377, 29422, 29496, 4445, + 29419, 29493, 29492, 29489, 7376, 29416, 29490, 29486, 7375, 29413, + 29487, 29483, 7374, 29410, 29484, 29480, 7373, 29407, 29481, 29477, 7372, + 29404, 29478, 29474, 7371, 29401, 29475, 29471, 7370, 29398, 29472, + 29468, 7369, 29395, 29469, 29465, 7368, 29392, 29466, 29462, 7367, 29389, + 29463, 29459, 7366, 29386, 29460, 29456, 7365, 29383, 29457, 29453, 7364, + 29380, 29454, 29450, 7363, 29377, 29451, 29447, 7362, 29374, 29448, + 29444, 7361, 29371, 29445, 29441, 7360, 29368, 29442, 29438, 7359, 29365, + 29439, 29435, 7358, 29362, 29436, 29432, 7357, 29359, 29433, 29429, 7356, + 29356, 29430, 29426, 7355, 29353, 29427, 29423, 7354, 29350, 29424, 4446, + 29347, 29421, 29420, 29417, 7353, 29344, 29418, 29414, 7352, 29341, + 29415, 29411, 7351, 29338, 29412, 29408, 7350, 29335, 29409, 29405, 7349, + 29332, 29406, 29402, 7348, 29329, 29403, 29399, 7347, 29326, 29400, + 29396, 7346, 29323, 29397, 29393, 7345, 29320, 29394, 29390, 7344, 29317, + 29391, 29387, 7343, 29314, 29388, 29384, 7342, 29311, 29385, 29381, 7341, + 29308, 29382, 29378, 7340, 29305, 29379, 29375, 7339, 29302, 29376, + 29372, 7338, 29299, 29373, 29369, 7337, 29296, 29370, 29366, 7336, 29293, + 29367, 29363, 7335, 29290, 29364, 29360, 7334, 29287, 29361, 29357, 7333, + 29284, 29358, 29354, 7332, 29281, 29355, 29351, 7331, 29278, 29352, 4447, + 29275, 29349, 29348, 29345, 7330, 29272, 29346, 29342, 7329, 29269, + 29343, 29339, 7328, 29266, 29340, 29336, 7327, 29263, 29337, 29333, 7326, + 29260, 29334, 29330, 7325, 29257, 29331, 29327, 7324, 29254, 29328, + 29324, 7323, 29251, 29325, 29321, 7322, 29248, 29322, 29318, 7321, 29245, + 29319, 29315, 7320, 29242, 29316, 29312, 7319, 29239, 29313, 29309, 7318, + 29236, 29310, 29306, 7317, 29233, 29307, 29303, 7316, 29230, 29304, + 29300, 7315, 29227, 29301, 29297, 7314, 29224, 29298, 29294, 7313, 29221, + 29295, 29291, 7312, 29218, 29292, 29288, 7311, 29215, 29289, 29285, 7310, + 29212, 29286, 29282, 7309, 29209, 29283, 29279, 7308, 29206, 29280, 4448, + 29203, 29277, 29276, 29273, 7307, 29200, 29274, 29270, 7306, 29197, + 29271, 29267, 7305, 29194, 29268, 29264, 7304, 29191, 29265, 29261, 7303, + 29188, 29262, 29258, 7302, 29185, 29259, 29255, 7301, 29182, 29256, + 29252, 7300, 29179, 29253, 29249, 7299, 29176, 29250, 29246, 7298, 29173, + 29247, 29243, 7297, 29170, 29244, 29240, 7296, 29167, 29241, 29237, 7295, + 29164, 29238, 29234, 7294, 29161, 29235, 29231, 7293, 29158, 29232, + 29228, 7292, 29155, 29229, 29225, 7291, 29152, 29226, 29222, 7290, 29149, + 29223, 29219, 7289, 29146, 29220, 29216, 7288, 29143, 29217, 29213, 7287, + 29140, 29214, 29210, 7286, 29137, 29211, 29207, 7285, 29134, 29208, 4449, + 29131, 29205, 29204, 29201, 7284, 29128, 29202, 29198, 7283, 29125, + 29199, 29195, 7282, 29122, 29196, 29192, 7281, 29119, 29193, 29189, 7280, + 29116, 29190, 29186, 7279, 29113, 29187, 29183, 7278, 29110, 29184, + 29180, 7277, 29107, 29181, 29177, 7276, 29104, 29178, 29174, 7275, 29101, + 29175, 29171, 7274, 29098, 29172, 29168, 7273, 29095, 29169, 29165, 7272, + 29092, 29166, 29162, 7271, 29089, 29163, 29159, 7270, 29086, 29160, + 29156, 7269, 29083, 29157, 29153, 7268, 29080, 29154, 29150, 7267, 29077, + 29151, 29147, 7266, 29074, 29148, 29144, 7265, 29071, 29145, 29141, 7264, + 29068, 29142, 29138, 7263, 29065, 29139, 29135, 7262, 29062, 29136, 4450, + 29059, 29133, 29132, 29129, 7261, 29056, 29130, 29126, 7260, 29053, + 29127, 29123, 7259, 29050, 29124, 29120, 7258, 29047, 29121, 29117, 7257, + 29044, 29118, 29114, 7256, 29041, 29115, 29111, 7255, 29038, 29112, + 29108, 7254, 29035, 29109, 29105, 7253, 29032, 29106, 29102, 7252, 29029, + 29103, 29099, 7251, 29026, 29100, 29096, 7250, 29023, 29097, 29093, 7249, + 29020, 29094, 29090, 7248, 29017, 29091, 29087, 7247, 29014, 29088, + 29084, 7246, 29011, 29085, 29081, 7245, 29008, 29082, 29078, 7244, 29005, + 29079, 29075, 7243, 29002, 29076, 29072, 7242, 28999, 29073, 29069, 7241, + 28996, 29070, 29066, 7240, 28993, 29067, 29063, 7239, 28990, 29064, 4451, + 28987, 29061, 29060, 29057, 7238, 28984, 29058, 29054, 7237, 28981, + 29055, 29051, 7236, 28978, 29052, 29048, 7235, 28975, 29049, 29045, 7234, + 28972, 29046, 29042, 7233, 28969, 29043, 29039, 7232, 28966, 29040, + 29036, 7231, 28963, 29037, 29033, 7230, 28960, 29034, 29030, 7229, 28957, + 29031, 29027, 7228, 28954, 29028, 29024, 7227, 28951, 29025, 29021, 7226, + 28948, 29022, 29018, 7225, 28945, 29019, 29015, 7224, 28942, 29016, + 29012, 7223, 28939, 29013, 29009, 7222, 28936, 29010, 29006, 7221, 28933, + 29007, 29003, 7220, 28930, 29004, 29000, 7219, 28927, 29001, 28997, 7218, + 28924, 28998, 28994, 7217, 28921, 28995, 28991, 7216, 28918, 28992, 4452, + 28915, 28989, 28988, 28985, 7215, 28912, 28986, 28982, 7214, 28909, + 28983, 28979, 7213, 28906, 28980, 28976, 7212, 28903, 28977, 28973, 7211, + 28900, 28974, 28970, 7210, 28897, 28971, 28967, 7209, 28894, 28968, + 28964, 7208, 28891, 28965, 28961, 7207, 28888, 28962, 28958, 7206, 28885, + 28959, 28955, 7205, 28882, 28956, 28952, 7204, 28879, 28953, 28949, 7203, + 28876, 28950, 28946, 7202, 28873, 28947, 28943, 7201, 28870, 28944, + 28940, 7200, 28867, 28941, 28937, 7199, 28864, 28938, 28934, 7198, 28861, + 28935, 28931, 7197, 28858, 28932, 28928, 7196, 28855, 28929, 28925, 7195, + 28852, 28926, 28922, 7194, 28849, 28923, 28919, 7193, 28846, 28920, 4453, + 28843, 28917, 28916, 28913, 7192, 28840, 28914, 28910, 7191, 28837, + 28911, 28907, 7190, 28834, 28908, 28904, 7189, 28831, 28905, 28901, 7188, + 28828, 28902, 28898, 7187, 28825, 28899, 28895, 7186, 28822, 28896, + 28892, 7185, 28819, 28893, 28889, 7184, 28816, 28890, 28886, 7183, 28813, + 28887, 28883, 7182, 28810, 28884, 28880, 7181, 28807, 28881, 28877, 7180, + 28804, 28878, 28874, 7179, 28801, 28875, 28871, 7178, 28798, 28872, + 28868, 7177, 28795, 28869, 28865, 7176, 28792, 28866, 28862, 7175, 28789, + 28863, 28859, 7174, 28786, 28860, 28856, 7173, 28783, 28857, 28853, 7172, + 28780, 28854, 28850, 7171, 28777, 28851, 28847, 7170, 28774, 28848, 4454, + 28771, 28845, 28844, 28841, 7169, 28768, 28842, 28838, 7168, 28765, + 28839, 28835, 7167, 28762, 28836, 28832, 7166, 28759, 28833, 28829, 7165, + 28756, 28830, 28826, 7164, 28753, 28827, 28823, 7163, 28750, 28824, + 28820, 7162, 28747, 28821, 28817, 7161, 28744, 28818, 28814, 7160, 28741, + 28815, 28811, 7159, 28738, 28812, 28808, 7158, 28735, 28809, 28805, 7157, + 28732, 28806, 28802, 7156, 28729, 28803, 28799, 7155, 28726, 28800, + 28796, 7154, 28723, 28797, 28793, 7153, 28720, 28794, 28790, 7152, 28717, + 28791, 28787, 7151, 28714, 28788, 28784, 7150, 28711, 28785, 28781, 7149, + 28708, 28782, 28778, 7148, 28705, 28779, 28775, 7147, 28702, 28776, 4455, + 28699, 28773, 28772, 28769, 7146, 28696, 28770, 28766, 7145, 28693, + 28767, 28763, 7144, 28690, 28764, 28760, 7143, 28687, 28761, 28757, 7142, + 28684, 28758, 28754, 7141, 28681, 28755, 28751, 7140, 28678, 28752, + 28748, 7139, 28675, 28749, 28745, 7138, 28672, 28746, 28742, 7137, 28669, + 28743, 28739, 7136, 28666, 28740, 28736, 7135, 28663, 28737, 28733, 7134, + 28660, 28734, 28730, 7133, 28657, 28731, 28727, 7132, 28654, 28728, + 28724, 7131, 28651, 28725, 28721, 7130, 28648, 28722, 28718, 7129, 28645, + 28719, 28715, 7128, 28642, 28716, 28712, 7127, 28639, 28713, 28709, 7126, + 28636, 28710, 28706, 7125, 28633, 28707, 28703, 7124, 28630, 28704, 4324, + 28627, 28701, 28700, 28697, 7123, 28624, 28698, 28694, 7122, 28621, + 28695, 28691, 7121, 28618, 28692, 28688, 7120, 28615, 28689, 28685, 7119, + 28612, 28686, 28682, 7118, 28609, 28683, 28679, 7117, 28606, 28680, + 28676, 7116, 28603, 28677, 28673, 7115, 28600, 28674, 28670, 7114, 28597, + 28671, 28667, 7113, 28594, 28668, 28664, 7112, 28591, 28665, 28661, 7111, + 28588, 28662, 28658, 7110, 28585, 28659, 28655, 7109, 28582, 28656, + 28652, 7108, 28579, 28653, 28649, 7107, 28576, 28650, 28646, 7106, 28573, + 28647, 28643, 7105, 28570, 28644, 28640, 7104, 28567, 28641, 28637, 7103, + 28564, 28638, 28634, 7102, 28561, 28635, 28631, 7101, 28558, 28632, 4326, + 28555, 28629, 28628, 28625, 7100, 28552, 28626, 28622, 7099, 28549, + 28623, 28619, 7098, 28546, 28620, 28616, 7097, 28543, 28617, 28613, 7096, + 28540, 28614, 28610, 7095, 28537, 28611, 28607, 7094, 28534, 28608, + 28604, 7093, 28531, 28605, 28601, 7092, 28528, 28602, 28598, 7091, 28525, + 28599, 28595, 7090, 28522, 28596, 28592, 7089, 28519, 28593, 28589, 7088, + 28516, 28590, 28586, 7087, 28513, 28587, 28583, 7086, 28510, 28584, + 28580, 7085, 28507, 28581, 28577, 7084, 28504, 28578, 28574, 7083, 28501, + 28575, 28571, 7082, 28498, 28572, 28568, 7081, 28495, 28569, 28565, 7080, + 28492, 28566, 28562, 7079, 28489, 28563, 28559, 7078, 28486, 28560, 4327, + 28483, 28557, 28556, 28553, 7077, 28480, 28554, 28550, 7076, 28477, + 28551, 28547, 7075, 28474, 28548, 28544, 7074, 28471, 28545, 28541, 7073, + 28468, 28542, 28538, 7072, 28465, 28539, 28535, 7071, 28462, 28536, + 28532, 7070, 28459, 28533, 28529, 7069, 28456, 28530, 28526, 7068, 28453, + 28527, 28523, 7067, 28450, 28524, 28520, 7066, 28447, 28521, 28517, 7065, + 28444, 28518, 28514, 7064, 28441, 28515, 28511, 7063, 28438, 28512, + 28508, 7062, 28435, 28509, 28505, 7061, 28432, 28506, 28502, 7060, 28429, + 28503, 28499, 7059, 28426, 28500, 28496, 7058, 28423, 28497, 28493, 7057, + 28420, 28494, 28490, 7056, 28417, 28491, 28487, 7055, 28414, 28488, 4328, + 28411, 28485, 28484, 28481, 7054, 28408, 28482, 28478, 7053, 28405, + 28479, 28475, 7052, 28402, 28476, 28472, 7051, 28399, 28473, 28469, 7050, + 28396, 28470, 28466, 7049, 28393, 28467, 28463, 7048, 28390, 28464, + 28460, 7047, 28387, 28461, 28457, 7046, 28384, 28458, 28454, 7045, 28381, + 28455, 28451, 7044, 28378, 28452, 28448, 7043, 28375, 28449, 28445, 7042, + 28372, 28446, 28442, 7041, 28369, 28443, 28439, 7040, 28366, 28440, + 28436, 7039, 28363, 28437, 28433, 7038, 28360, 28434, 28430, 7037, 28357, + 28431, 28427, 7036, 28354, 28428, 28424, 7035, 28351, 28425, 28421, 7034, + 28348, 28422, 28418, 7033, 28345, 28419, 28415, 7032, 28342, 28416, 4329, + 28339, 28413, 28412, 28409, 7031, 28336, 28410, 28406, 7030, 28333, + 28407, 28403, 7029, 28330, 28404, 28400, 7028, 28327, 28401, 28397, 7027, + 28324, 28398, 28394, 7026, 28321, 28395, 28391, 7025, 28318, 28392, + 28388, 7024, 28315, 28389, 28385, 7023, 28312, 28386, 28382, 7022, 28309, + 28383, 28379, 7021, 28306, 28380, 28376, 7020, 28303, 28377, 28373, 7019, + 28300, 28374, 28370, 7018, 28297, 28371, 28367, 7017, 28294, 28368, + 28364, 7016, 28291, 28365, 28361, 7015, 28288, 28362, 28358, 7014, 28285, + 28359, 28355, 7013, 28282, 28356, 28352, 7012, 28279, 28353, 28349, 7011, + 28276, 28350, 28346, 7010, 28273, 28347, 28343, 7009, 28270, 28344, 4330, + 28267, 28341, 28340, 28337, 7008, 28264, 28338, 28334, 7007, 28261, + 28335, 28331, 7006, 28258, 28332, 28328, 7005, 28255, 28329, 28325, 7004, + 28252, 28326, 28322, 7003, 28249, 28323, 28319, 7002, 28246, 28320, + 28316, 7001, 28243, 28317, 28313, 7000, 28240, 28314, 28310, 6999, 28237, + 28311, 28307, 6998, 28234, 28308, 28304, 6997, 28231, 28305, 28301, 6996, + 28228, 28302, 28298, 6995, 28225, 28299, 28295, 6994, 28222, 28296, + 28292, 6993, 28219, 28293, 28289, 6992, 28216, 28290, 28286, 6991, 28213, + 28287, 28283, 6990, 28210, 28284, 28280, 6989, 28207, 28281, 28277, 6988, + 28204, 28278, 28274, 6987, 28201, 28275, 28271, 6986, 28198, 28272, 4331, + 28195, 28269, 28268, 28265, 6985, 28192, 28266, 28262, 6984, 28189, + 28263, 28259, 6983, 28186, 28260, 28256, 6982, 28183, 28257, 28253, 6981, + 28180, 28254, 28250, 6980, 28177, 28251, 28247, 6979, 28174, 28248, + 28244, 6978, 28171, 28245, 28241, 6977, 28168, 28242, 28238, 6976, 28165, + 28239, 28235, 6975, 28162, 28236, 28232, 6974, 28159, 28233, 28229, 6973, + 28156, 28230, 28226, 6972, 28153, 28227, 28223, 6971, 28150, 28224, + 28220, 6970, 28147, 28221, 28217, 6969, 28144, 28218, 28214, 6968, 28141, + 28215, 28211, 6967, 28138, 28212, 28208, 6966, 28135, 28209, 28205, 6965, + 28132, 28206, 28202, 6964, 28129, 28203, 28199, 6963, 28126, 28200, 4332, + 28123, 28197, 28196, 28193, 6962, 28120, 28194, 28190, 6961, 28117, + 28191, 28187, 6960, 28114, 28188, 28184, 6959, 28111, 28185, 28181, 6958, + 28108, 28182, 28178, 6957, 28105, 28179, 28175, 6956, 28102, 28176, + 28172, 6955, 28099, 28173, 28169, 6954, 28096, 28170, 28166, 6953, 28093, + 28167, 28163, 6952, 28090, 28164, 28160, 6951, 28087, 28161, 28157, 6950, + 28084, 28158, 28154, 6949, 28081, 28155, 28151, 6948, 28078, 28152, + 28148, 6947, 28075, 28149, 28145, 6946, 28072, 28146, 28142, 6945, 28069, + 28143, 28139, 6944, 28066, 28140, 28136, 6943, 28063, 28137, 28133, 6942, + 28060, 28134, 28130, 6941, 28057, 28131, 28127, 6940, 28054, 28128, 4333, + 28051, 28125, 28124, 28121, 6939, 28048, 28122, 28118, 6938, 28045, + 28119, 28115, 6937, 28042, 28116, 28112, 6936, 28039, 28113, 28109, 6935, + 28036, 28110, 28106, 6934, 28033, 28107, 28103, 6933, 28030, 28104, + 28100, 6932, 28027, 28101, 28097, 6931, 28024, 28098, 28094, 6930, 28021, + 28095, 28091, 6929, 28018, 28092, 28088, 6928, 28015, 28089, 28085, 6927, + 28012, 28086, 28082, 6926, 28009, 28083, 28079, 6925, 28006, 28080, + 28076, 6924, 28003, 28077, 28073, 6923, 28000, 28074, 28070, 6922, 27997, + 28071, 28067, 6921, 27994, 28068, 28064, 6920, 27991, 28065, 28061, 6919, + 27988, 28062, 28058, 6918, 27985, 28059, 28055, 6917, 27982, 28056, 4334, + 27979, 28053, 28052, 28049, 6916, 27976, 28050, 28046, 6915, 27973, + 28047, 28043, 6914, 27970, 28044, 28040, 6913, 27967, 28041, 28037, 6912, + 27964, 28038, 28034, 6911, 27961, 28035, 28031, 6910, 27958, 28032, + 28028, 6909, 27955, 28029, 28025, 6908, 27952, 28026, 28022, 6907, 27949, + 28023, 28019, 6906, 27946, 28020, 28016, 6905, 27943, 28017, 28013, 6904, + 27940, 28014, 28010, 6903, 27937, 28011, 28007, 6902, 27934, 28008, + 28004, 6901, 27931, 28005, 28001, 6900, 27928, 28002, 27998, 6899, 27925, + 27999, 27995, 6898, 27922, 27996, 27992, 6897, 27919, 27993, 27989, 6896, + 27916, 27990, 27986, 6895, 27913, 27987, 27983, 6894, 27910, 27984, 4335, + 27907, 27981, 27980, 27977, 6893, 27904, 27978, 27974, 6892, 27901, + 27975, 27971, 6891, 27898, 27972, 27968, 6890, 27895, 27969, 27965, 6889, + 27892, 27966, 27962, 6888, 27889, 27963, 27959, 6887, 27886, 27960, + 27956, 6886, 27883, 27957, 27953, 6885, 27880, 27954, 27950, 6884, 27877, + 27951, 27947, 6883, 27874, 27948, 27944, 6882, 27871, 27945, 27941, 6881, + 27868, 27942, 27938, 6880, 27865, 27939, 27935, 6879, 27862, 27936, + 27932, 6878, 27859, 27933, 27929, 6877, 27856, 27930, 27926, 6876, 27853, + 27927, 27923, 6875, 27850, 27924, 27920, 6874, 27847, 27921, 27917, 6873, + 27844, 27918, 27914, 6872, 27841, 27915, 27911, 6871, 27838, 27912, 4336, + 27835, 27909, 27908, 27905, 6870, 27832, 27906, 27902, 6869, 27829, + 27903, 27899, 6868, 27826, 27900, 27896, 6867, 27823, 27897, 27893, 6866, + 27820, 27894, 27890, 6865, 27817, 27891, 27887, 6864, 27814, 27888, + 27884, 6863, 27811, 27885, 27881, 6862, 27808, 27882, 27878, 6861, 27805, + 27879, 27875, 6860, 27802, 27876, 27872, 6859, 27799, 27873, 27869, 6858, + 27796, 27870, 27866, 6857, 27793, 27867, 27863, 6856, 27790, 27864, + 27860, 6855, 27787, 27861, 27857, 6854, 27784, 27858, 27854, 6853, 27781, + 27855, 27851, 6852, 27778, 27852, 27848, 6851, 27775, 27849, 27845, 6850, + 27772, 27846, 27842, 6849, 27769, 27843, 27839, 6848, 27766, 27840, 4337, + 27763, 27837, 27836, 27833, 6847, 27760, 27834, 27830, 6846, 27757, + 27831, 27827, 6845, 27754, 27828, 27824, 6844, 27751, 27825, 27821, 6843, + 27748, 27822, 27818, 6842, 27745, 27819, 27815, 6841, 27742, 27816, + 27812, 6840, 27739, 27813, 27809, 6839, 27736, 27810, 27806, 6838, 27733, + 27807, 27803, 6837, 27730, 27804, 27800, 6836, 27727, 27801, 27797, 6835, + 27724, 27798, 27794, 6834, 27721, 27795, 27791, 6833, 27718, 27792, + 27788, 6832, 27715, 27789, 27785, 6831, 27712, 27786, 27782, 6830, 27709, + 27783, 27779, 6829, 27706, 27780, 27776, 6828, 27703, 27777, 27773, 6827, + 27700, 27774, 27770, 6826, 27697, 27771, 27767, 6825, 27694, 27768, 4338, + 27691, 27765, 27764, 27761, 6824, 27688, 27762, 27758, 6823, 27685, + 27759, 27755, 6822, 27682, 27756, 27752, 6821, 27679, 27753, 27749, 6820, + 27676, 27750, 27746, 6819, 27673, 27747, 27743, 6818, 27670, 27744, + 27740, 6817, 27667, 27741, 27737, 6816, 27664, 27738, 27734, 6815, 27661, + 27735, 27731, 6814, 27658, 27732, 27728, 6813, 27655, 27729, 27725, 6812, + 27652, 27726, 27722, 6811, 27649, 27723, 27719, 6810, 27646, 27720, + 27716, 6809, 27643, 27717, 27713, 6808, 27640, 27714, 27710, 6807, 27637, + 27711, 27707, 6806, 27634, 27708, 27704, 6805, 27631, 27705, 27701, 6804, + 27628, 27702, 27698, 6803, 27625, 27699, 27695, 6802, 27622, 27696, 4339, + 27619, 27693, 27692, 27689, 6801, 27616, 27690, 27686, 6800, 27613, + 27687, 27683, 6799, 27610, 27684, 27680, 6798, 27607, 27681, 27677, 6797, + 27604, 27678, 27674, 6796, 27601, 27675, 27671, 6795, 27598, 27672, + 27668, 6794, 27595, 27669, 27665, 6793, 27592, 27666, 27662, 6792, 27589, + 27663, 27659, 6791, 27586, 27660, 27656, 6790, 27583, 27657, 27653, 6789, + 27580, 27654, 27650, 6788, 27577, 27651, 27647, 6787, 27574, 27648, + 27644, 6786, 27571, 27645, 27641, 6785, 27568, 27642, 27638, 6784, 27565, + 27639, 27635, 6783, 27562, 27636, 27632, 6782, 27559, 27633, 27629, 6781, + 27556, 27630, 27626, 6780, 27553, 27627, 27623, 6779, 27550, 27624, 4340, + 27547, 27621, 27620, 27617, 6778, 27544, 27618, 27614, 6777, 27541, + 27615, 27611, 6776, 27538, 27612, 27608, 6775, 27535, 27609, 27605, 6774, + 27532, 27606, 27602, 6773, 27529, 27603, 27599, 6772, 27526, 27600, + 27596, 6771, 27523, 27597, 27593, 6770, 27520, 27594, 27590, 6769, 27517, + 27591, 27587, 6768, 27514, 27588, 27584, 6767, 27511, 27585, 27581, 6766, + 27508, 27582, 27578, 6765, 27505, 27579, 27575, 6764, 27502, 27576, + 27572, 6763, 27499, 27573, 27569, 6762, 27496, 27570, 27566, 6761, 27493, + 27567, 27563, 6760, 27490, 27564, 27560, 6759, 27487, 27561, 27557, 6758, + 27484, 27558, 27554, 6757, 27481, 27555, 27551, 6756, 27478, 27552, 4341, + 27475, 27549, 27548, 27545, 6755, 27472, 27546, 27542, 6754, 27469, + 27543, 27539, 6753, 27466, 27540, 27536, 6752, 27463, 27537, 27533, 6751, + 27460, 27534, 27530, 6750, 27457, 27531, 27527, 6749, 27454, 27528, + 27524, 6748, 27451, 27525, 27521, 6747, 27448, 27522, 27518, 6746, 27445, + 27519, 27515, 6745, 27442, 27516, 27512, 6744, 27439, 27513, 27509, 6743, + 27436, 27510, 27506, 6742, 27433, 27507, 27503, 6741, 27430, 27504, + 27500, 6740, 27427, 27501, 27497, 6739, 27424, 27498, 27494, 6738, 27421, + 27495, 27491, 6737, 27418, 27492, 27488, 6736, 27415, 27489, 27485, 6735, + 27412, 27486, 27482, 6734, 27409, 27483, 27479, 6733, 27406, 27480, + 20329, 20326, 4479, 20327, 20333, 20330, 4480, 20331, 20337, 20334, 4481, + 20335, 20341, 20338, 4482, 20339, 20345, 20342, 4483, 20343, 20349, + 20346, 4484, 20347, 20353, 20350, 4485, 20351, 20357, 20354, 4486, 20355, + 20361, 20358, 4487, 20359, 20365, 20362, 4488, 20363, 20369, 20366, 4489, + 20367, 20373, 20370, 4490, 20371, 20377, 20374, 4491, 20375, 20381, + 20378, 4492, 20379, 20385, 20382, 4493, 20383, 20389, 20386, 4494, 20387, + 20393, 20390, 4495, 20391, 20397, 20394, 4496, 20395, 20401, 20398, 4497, + 20399, 20405, 20402, 4498, 20403, 20409, 20406, 4499, 20407, 20413, + 20410, 4500, 20411, 20417, 20414, 4501, 20415, 20421, 20418, 4438, 20419, + 20424, 20422, 4502, 20423, 20427, 20425, 4503, 20426, 20430, 20428, 4504, + 20429, 20433, 20431, 4505, 20432, 20436, 20434, 4506, 20435, 20439, + 20437, 4507, 20438, 20442, 20440, 4508, 20441, 20445, 20443, 4509, 20444, + 20448, 20446, 4510, 20447, 20451, 20449, 4511, 20450, 20454, 20452, 4512, + 20453, 20457, 20455, 4513, 20456, 20460, 20458, 4514, 20459, 20463, + 20461, 4515, 20462, 20466, 20464, 4516, 20465, 20469, 20467, 4517, 20468, + 20472, 20470, 4518, 20471, 20475, 20473, 4519, 20474, 20478, 20476, 4520, + 20477, 20481, 20479, 4521, 20480, 20484, 20482, 4522, 20483, 20487, + 20485, 4523, 20486, 20490, 20488, 4524, 20489, 20493, 20491, 4437, 20492, + 20496, 20494, 4525, 20495, 20499, 20497, 4526, 20498, 20502, 20500, 4527, + 20501, 20505, 20503, 4528, 20504, 20508, 20506, 4529, 20507, 20511, + 20509, 4530, 20510, 20514, 20512, 4531, 20513, 20517, 20515, 4532, 20516, + 20520, 20518, 4533, 20519, 20523, 20521, 4534, 20522, 20526, 20524, 4535, + 20525, 20529, 20527, 4536, 20528, 20532, 20530, 4537, 20531, 20535, + 20533, 4538, 20534, 20538, 20536, 4539, 20537, 20541, 20539, 4540, 20540, + 20544, 20542, 4541, 20543, 20547, 20545, 4542, 20546, 20550, 20548, 4543, + 20549, 20553, 20551, 4544, 20552, 20556, 20554, 4545, 20555, 20559, + 20557, 4546, 20558, 20562, 20560, 4547, 20561, 20565, 20563, 4436, 20564, + 20568, 20566, 4548, 20567, 20571, 20569, 4549, 20570, 20574, 20572, 4550, + 20573, 20577, 20575, 4551, 20576, 20580, 20578, 4552, 20579, 20583, + 20581, 4553, 20582, 20586, 20584, 4554, 20585, 20589, 20587, 4555, 20588, + 20592, 20590, 4556, 20591, 20595, 20593, 4557, 20594, 20598, 20596, 4558, + 20597, 20601, 20599, 4559, 20600, 20604, 20602, 4560, 20603, 20607, + 20605, 4561, 20606, 20610, 20608, 4562, 20609, 20613, 20611, 4563, 20612, + 20616, 20614, 4564, 20615, 20619, 20617, 4565, 20618, 20622, 20620, 4566, + 20621, 20625, 20623, 4567, 20624, 20628, 20626, 4568, 20627, 20631, + 20629, 4569, 20630, 20634, 20632, 4570, 20633, 20637, 20635, 4435, 20636, + 20640, 20638, 4571, 20639, 20643, 20641, 4572, 20642, 20646, 20644, 4573, + 20645, 20649, 20647, 4574, 20648, 20652, 20650, 4575, 20651, 20655, + 20653, 4576, 20654, 20658, 20656, 4577, 20657, 20661, 20659, 4578, 20660, + 20664, 20662, 4579, 20663, 20667, 20665, 4580, 20666, 20670, 20668, 4581, + 20669, 20673, 20671, 4582, 20672, 20676, 20674, 4583, 20675, 20679, + 20677, 4584, 20678, 20682, 20680, 4585, 20681, 20685, 20683, 4586, 20684, + 20688, 20686, 4587, 20687, 20691, 20689, 4588, 20690, 20694, 20692, 4589, + 20693, 20697, 20695, 4590, 20696, 20700, 20698, 4591, 20699, 20703, + 20701, 4592, 20702, 20706, 20704, 4593, 20705, 20709, 20707, 4434, 20708, + 20712, 20710, 4594, 20711, 20715, 20713, 4595, 20714, 20718, 20716, 4596, + 20717, 20721, 20719, 4597, 20720, 20724, 20722, 4598, 20723, 20727, + 20725, 4599, 20726, 20730, 20728, 4600, 20729, 20733, 20731, 4601, 20732, + 20736, 20734, 4602, 20735, 20739, 20737, 4603, 20738, 20742, 20740, 4604, + 20741, 20745, 20743, 4605, 20744, 20748, 20746, 4606, 20747, 20751, + 20749, 4607, 20750, 20754, 20752, 4608, 20753, 20757, 20755, 4609, 20756, + 20760, 20758, 4610, 20759, 20763, 20761, 4611, 20762, 20766, 20764, 4612, + 20765, 20769, 20767, 4613, 20768, 20772, 20770, 4614, 20771, 20775, + 20773, 4615, 20774, 20778, 20776, 4616, 20777, 20781, 20779, 4433, 20780, + 20784, 20782, 4617, 20783, 20787, 20785, 4618, 20786, 20790, 20788, 4619, + 20789, 20793, 20791, 4620, 20792, 20796, 20794, 4621, 20795, 20799, + 20797, 4622, 20798, 20802, 20800, 4623, 20801, 20805, 20803, 4624, 20804, + 20808, 20806, 4625, 20807, 20811, 20809, 4626, 20810, 20814, 20812, 4627, + 20813, 20817, 20815, 4628, 20816, 20820, 20818, 4629, 20819, 20823, + 20821, 4630, 20822, 20826, 20824, 4631, 20825, 20829, 20827, 4632, 20828, + 20832, 20830, 4633, 20831, 20835, 20833, 4634, 20834, 20838, 20836, 4635, + 20837, 20841, 20839, 4636, 20840, 20844, 20842, 4637, 20843, 20847, + 20845, 4638, 20846, 20850, 20848, 4639, 20849, 20853, 20851, 4432, 20852, + 20856, 20854, 4640, 20855, 20859, 20857, 4641, 20858, 20862, 20860, 4642, + 20861, 20865, 20863, 4643, 20864, 20868, 20866, 4644, 20867, 20871, + 20869, 4645, 20870, 20874, 20872, 4646, 20873, 20877, 20875, 4647, 20876, + 20880, 20878, 4648, 20879, 20883, 20881, 4649, 20882, 20886, 20884, 4650, + 20885, 20889, 20887, 4651, 20888, 20892, 20890, 4652, 20891, 20895, + 20893, 4653, 20894, 20898, 20896, 4654, 20897, 20901, 20899, 4655, 20900, + 20904, 20902, 4656, 20903, 20907, 20905, 4657, 20906, 20910, 20908, 4658, + 20909, 20913, 20911, 4659, 20912, 20916, 20914, 4660, 20915, 20919, + 20917, 4661, 20918, 20922, 20920, 4662, 20921, 20925, 20923, 4431, 20924, + 20928, 20926, 4663, 20927, 20931, 20929, 4664, 20930, 20934, 20932, 4665, + 20933, 20937, 20935, 4666, 20936, 20940, 20938, 4667, 20939, 20943, + 20941, 4668, 20942, 20946, 20944, 4669, 20945, 20949, 20947, 4670, 20948, + 20952, 20950, 4671, 20951, 20955, 20953, 4672, 20954, 20958, 20956, 4673, + 20957, 20961, 20959, 4674, 20960, 20964, 20962, 4675, 20963, 20967, + 20965, 4676, 20966, 20970, 20968, 4677, 20969, 20973, 20971, 4678, 20972, + 20976, 20974, 4679, 20975, 20979, 20977, 4680, 20978, 20982, 20980, 4681, + 20981, 20985, 20983, 4682, 20984, 20988, 20986, 4683, 20987, 20991, + 20989, 4684, 20990, 20994, 20992, 4685, 20993, 20997, 20995, 4430, 20996, + 21000, 20998, 4686, 20999, 21003, 21001, 4687, 21002, 21006, 21004, 4688, + 21005, 21009, 21007, 4689, 21008, 21012, 21010, 4690, 21011, 21015, + 21013, 4691, 21014, 21018, 21016, 4692, 21017, 21021, 21019, 4693, 21020, + 21024, 21022, 4694, 21023, 21027, 21025, 4695, 21026, 21030, 21028, 4696, + 21029, 21033, 21031, 4697, 21032, 21036, 21034, 4698, 21035, 21039, + 21037, 4699, 21038, 21042, 21040, 4700, 21041, 21045, 21043, 4701, 21044, + 21048, 21046, 4702, 21047, 21051, 21049, 4703, 21050, 21054, 21052, 4704, + 21053, 21057, 21055, 4705, 21056, 21060, 21058, 4706, 21059, 21063, + 21061, 4707, 21062, 21066, 21064, 4708, 21065, 21069, 21067, 4429, 21068, + 21072, 21070, 4709, 21071, 21075, 21073, 4710, 21074, 21078, 21076, 4711, + 21077, 21081, 21079, 4712, 21080, 21084, 21082, 4713, 21083, 21087, + 21085, 4714, 21086, 21090, 21088, 4715, 21089, 21093, 21091, 4716, 21092, + 21096, 21094, 4717, 21095, 21099, 21097, 4718, 21098, 21102, 21100, 4719, + 21101, 21105, 21103, 4720, 21104, 21108, 21106, 4721, 21107, 21111, + 21109, 4722, 21110, 21114, 21112, 4723, 21113, 21117, 21115, 4724, 21116, + 21120, 21118, 4725, 21119, 21123, 21121, 4726, 21122, 21126, 21124, 4727, + 21125, 21129, 21127, 4728, 21128, 21132, 21130, 4729, 21131, 21135, + 21133, 4730, 21134, 21138, 21136, 4731, 21137, 21141, 21139, 4428, 21140, + 21144, 21142, 4732, 21143, 21147, 21145, 4733, 21146, 21150, 21148, 4734, + 21149, 21153, 21151, 4735, 21152, 21156, 21154, 4736, 21155, 21159, + 21157, 4737, 21158, 21162, 21160, 4738, 21161, 21165, 21163, 4739, 21164, + 21168, 21166, 4740, 21167, 21171, 21169, 4741, 21170, 21174, 21172, 4742, + 21173, 21177, 21175, 4743, 21176, 21180, 21178, 4744, 21179, 21183, + 21181, 4745, 21182, 21186, 21184, 4746, 21185, 21189, 21187, 4747, 21188, + 21192, 21190, 4748, 21191, 21195, 21193, 4749, 21194, 21198, 21196, 4750, + 21197, 21201, 21199, 4751, 21200, 21204, 21202, 4752, 21203, 21207, + 21205, 4753, 21206, 21210, 21208, 4754, 21209, 21213, 21211, 4427, 21212, + 21216, 21214, 4755, 21215, 21219, 21217, 4756, 21218, 21222, 21220, 4757, + 21221, 21225, 21223, 4758, 21224, 21228, 21226, 4759, 21227, 21231, + 21229, 4760, 21230, 21234, 21232, 4761, 21233, 21237, 21235, 4762, 21236, + 21240, 21238, 4763, 21239, 21243, 21241, 4764, 21242, 21246, 21244, 4765, + 21245, 21249, 21247, 4766, 21248, 21252, 21250, 4767, 21251, 21255, + 21253, 4768, 21254, 21258, 21256, 4769, 21257, 21261, 21259, 4770, 21260, + 21264, 21262, 4771, 21263, 21267, 21265, 4772, 21266, 21270, 21268, 4773, + 21269, 21273, 21271, 4774, 21272, 21276, 21274, 4775, 21275, 21279, + 21277, 4776, 21278, 21282, 21280, 4777, 21281, 21285, 21283, 4426, 21284, + 21288, 21286, 4778, 21287, 21291, 21289, 4779, 21290, 21294, 21292, 4780, + 21293, 21297, 21295, 4781, 21296, 21300, 21298, 4782, 21299, 21303, + 21301, 4783, 21302, 21306, 21304, 4784, 21305, 21309, 21307, 4785, 21308, + 21312, 21310, 4786, 21311, 21315, 21313, 4787, 21314, 21318, 21316, 4788, + 21317, 21321, 21319, 4789, 21320, 21324, 21322, 4790, 21323, 21327, + 21325, 4791, 21326, 21330, 21328, 4792, 21329, 21333, 21331, 4793, 21332, + 21336, 21334, 4794, 21335, 21339, 21337, 4795, 21338, 21342, 21340, 4796, + 21341, 21345, 21343, 4797, 21344, 21348, 21346, 4798, 21347, 21351, + 21349, 4799, 21350, 21354, 21352, 4800, 21353, 21357, 21355, 4425, 21356, + 21360, 21358, 4801, 21359, 21363, 21361, 4802, 21362, 21366, 21364, 4803, + 21365, 21369, 21367, 4804, 21368, 21372, 21370, 4805, 21371, 21375, + 21373, 4806, 21374, 21378, 21376, 4807, 21377, 21381, 21379, 4808, 21380, + 21384, 21382, 4809, 21383, 21387, 21385, 4810, 21386, 21390, 21388, 4811, + 21389, 21393, 21391, 4812, 21392, 21396, 21394, 4813, 21395, 21399, + 21397, 4814, 21398, 21402, 21400, 4815, 21401, 21405, 21403, 4816, 21404, + 21408, 21406, 4817, 21407, 21411, 21409, 4818, 21410, 21414, 21412, 4819, + 21413, 21417, 21415, 4820, 21416, 21420, 21418, 4821, 21419, 21423, + 21421, 4822, 21422, 21426, 21424, 4823, 21425, 21429, 21427, 4424, 21428, + 21432, 21430, 4824, 21431, 21435, 21433, 4825, 21434, 21438, 21436, 4826, + 21437, 21441, 21439, 4827, 21440, 21444, 21442, 4828, 21443, 21447, + 21445, 4829, 21446, 21450, 21448, 4830, 21449, 21453, 21451, 4831, 21452, + 21456, 21454, 4832, 21455, 21459, 21457, 4833, 21458, 21462, 21460, 4834, + 21461, 21465, 21463, 4835, 21464, 21468, 21466, 4836, 21467, 21471, + 21469, 4837, 21470, 21474, 21472, 4838, 21473, 21477, 21475, 4839, 21476, + 21480, 21478, 4840, 21479, 21483, 21481, 4841, 21482, 21486, 21484, 4842, + 21485, 21489, 21487, 4843, 21488, 21492, 21490, 4844, 21491, 21495, + 21493, 4845, 21494, 21498, 21496, 4846, 21497, 21501, 21499, 4391, 21500, + 21504, 21502, 4847, 21503, 21507, 21505, 4848, 21506, 21510, 21508, 4849, + 21509, 21513, 21511, 4850, 21512, 21516, 21514, 4851, 21515, 21519, + 21517, 4852, 21518, 21522, 21520, 4853, 21521, 21525, 21523, 4854, 21524, + 21528, 21526, 4855, 21527, 21531, 21529, 4856, 21530, 21534, 21532, 4857, + 21533, 21537, 21535, 4858, 21536, 21540, 21538, 4859, 21539, 21543, + 21541, 4860, 21542, 21546, 21544, 4861, 21545, 21549, 21547, 4862, 21548, + 21552, 21550, 4863, 21551, 21555, 21553, 4864, 21554, 21558, 21556, 4865, + 21557, 21561, 21559, 4866, 21560, 21564, 21562, 4867, 21563, 21567, + 21565, 4868, 21566, 21570, 21568, 4869, 21569, 21573, 21571, 4423, 21572, + 21576, 21574, 4870, 21575, 21579, 21577, 4871, 21578, 21582, 21580, 4872, + 21581, 21585, 21583, 4873, 21584, 21588, 21586, 4874, 21587, 21591, + 21589, 4875, 21590, 21594, 21592, 4876, 21593, 21597, 21595, 4877, 21596, + 21600, 21598, 4878, 21599, 21603, 21601, 4879, 21602, 21606, 21604, 4880, + 21605, 21609, 21607, 4881, 21608, 21612, 21610, 4882, 21611, 21615, + 21613, 4883, 21614, 21618, 21616, 4884, 21617, 21621, 21619, 4885, 21620, + 21624, 21622, 4886, 21623, 21627, 21625, 4887, 21626, 21630, 21628, 4888, + 21629, 21633, 21631, 4889, 21632, 21636, 21634, 4890, 21635, 21639, + 21637, 4891, 21638, 21642, 21640, 4892, 21641, 21645, 21643, 4422, 21644, + 21648, 21646, 4893, 21647, 21651, 21649, 4894, 21650, 21654, 21652, 4895, + 21653, 21657, 21655, 4896, 21656, 21660, 21658, 4897, 21659, 21663, + 21661, 4898, 21662, 21666, 21664, 4899, 21665, 21669, 21667, 4900, 21668, + 21672, 21670, 4901, 21671, 21675, 21673, 4902, 21674, 21678, 21676, 4903, + 21677, 21681, 21679, 4904, 21680, 21684, 21682, 4905, 21683, 21687, + 21685, 4906, 21686, 21690, 21688, 4907, 21689, 21693, 21691, 4908, 21692, + 21696, 21694, 4909, 21695, 21699, 21697, 4910, 21698, 21702, 21700, 4911, + 21701, 21705, 21703, 4912, 21704, 21708, 21706, 4913, 21707, 21711, + 21709, 4914, 21710, 21714, 21712, 4915, 21713, 21717, 21715, 4421, 21716, + 21720, 21718, 4916, 21719, 21723, 21721, 4917, 21722, 21726, 21724, 4918, + 21725, 21729, 21727, 4919, 21728, 21732, 21730, 4920, 21731, 21735, + 21733, 4921, 21734, 21738, 21736, 4922, 21737, 21741, 21739, 4923, 21740, + 21744, 21742, 4924, 21743, 21747, 21745, 4925, 21746, 21750, 21748, 4926, + 21749, 21753, 21751, 4927, 21752, 21756, 21754, 4928, 21755, 21759, + 21757, 4929, 21758, 21762, 21760, 4930, 21761, 21765, 21763, 4931, 21764, + 21768, 21766, 4932, 21767, 21771, 21769, 4933, 21770, 21774, 21772, 4934, + 21773, 21777, 21775, 4935, 21776, 21780, 21778, 4936, 21779, 21783, + 21781, 4937, 21782, 21786, 21784, 4938, 21785, 21789, 21787, 4420, 21788, + 21792, 21790, 4939, 21791, 21795, 21793, 4940, 21794, 21798, 21796, 4941, + 21797, 21801, 21799, 4942, 21800, 21804, 21802, 4943, 21803, 21807, + 21805, 4944, 21806, 21810, 21808, 4945, 21809, 21813, 21811, 4946, 21812, + 21816, 21814, 4947, 21815, 21819, 21817, 4948, 21818, 21822, 21820, 4949, + 21821, 21825, 21823, 4950, 21824, 21828, 21826, 4951, 21827, 21831, + 21829, 4952, 21830, 21834, 21832, 4953, 21833, 21837, 21835, 4954, 21836, + 21840, 21838, 4955, 21839, 21843, 21841, 4956, 21842, 21846, 21844, 4957, + 21845, 21849, 21847, 4958, 21848, 21852, 21850, 4959, 21851, 21855, + 21853, 4960, 21854, 21858, 21856, 4961, 21857, 21861, 21859, 4419, 21860, + 21864, 21862, 4962, 21863, 21867, 21865, 4963, 21866, 21870, 21868, 4964, + 21869, 21873, 21871, 4965, 21872, 21876, 21874, 4966, 21875, 21879, + 21877, 4967, 21878, 21882, 21880, 4968, 21881, 21885, 21883, 4969, 21884, + 21888, 21886, 4970, 21887, 21891, 21889, 4971, 21890, 21894, 21892, 4972, + 21893, 21897, 21895, 4973, 21896, 21900, 21898, 4974, 21899, 21903, + 21901, 4975, 21902, 21906, 21904, 4976, 21905, 21909, 21907, 4977, 21908, + 21912, 21910, 4978, 21911, 21915, 21913, 4979, 21914, 21918, 21916, 4980, + 21917, 21921, 21919, 4981, 21920, 21924, 21922, 4982, 21923, 21927, + 21925, 4983, 21926, 21930, 21928, 4984, 21929, 21933, 21931, 4418, 21932, + 21936, 21934, 4985, 21935, 21939, 21937, 4986, 21938, 21942, 21940, 4987, + 21941, 21945, 21943, 4988, 21944, 21948, 21946, 4989, 21947, 21951, + 21949, 4990, 21950, 21954, 21952, 4991, 21953, 21957, 21955, 4992, 21956, + 21960, 21958, 4993, 21959, 21963, 21961, 4994, 21962, 21966, 21964, 4995, + 21965, 21969, 21967, 4996, 21968, 21972, 21970, 4997, 21971, 21975, + 21973, 4998, 21974, 21978, 21976, 4999, 21977, 21981, 21979, 5000, 21980, + 21984, 21982, 5001, 21983, 21987, 21985, 5002, 21986, 21990, 21988, 5003, + 21989, 21993, 21991, 5004, 21992, 21996, 21994, 5005, 21995, 21999, + 21997, 5006, 21998, 22002, 22000, 5007, 22001, 22005, 22003, 4417, 22004, + 22008, 22006, 5008, 22007, 22011, 22009, 5009, 22010, 22014, 22012, 5010, + 22013, 22017, 22015, 5011, 22016, 22020, 22018, 5012, 22019, 22023, + 22021, 5013, 22022, 22026, 22024, 5014, 22025, 22029, 22027, 5015, 22028, + 22032, 22030, 5016, 22031, 22035, 22033, 5017, 22034, 22038, 22036, 5018, + 22037, 22041, 22039, 5019, 22040, 22044, 22042, 5020, 22043, 22047, + 22045, 5021, 22046, 22050, 22048, 5022, 22049, 22053, 22051, 5023, 22052, + 22056, 22054, 5024, 22055, 22059, 22057, 5025, 22058, 22062, 22060, 5026, + 22061, 22065, 22063, 5027, 22064, 22068, 22066, 5028, 22067, 22071, + 22069, 5029, 22070, 22074, 22072, 5030, 22073, 22077, 22075, 4416, 22076, + 22080, 22078, 5031, 22079, 22083, 22081, 5032, 22082, 22086, 22084, 5033, + 22085, 22089, 22087, 5034, 22088, 22092, 22090, 5035, 22091, 22095, + 22093, 5036, 22094, 22098, 22096, 5037, 22097, 22101, 22099, 5038, 22100, + 22104, 22102, 5039, 22103, 22107, 22105, 5040, 22106, 22110, 22108, 5041, + 22109, 22113, 22111, 5042, 22112, 22116, 22114, 5043, 22115, 22119, + 22117, 5044, 22118, 22122, 22120, 5045, 22121, 22125, 22123, 5046, 22124, + 22128, 22126, 5047, 22127, 22131, 22129, 5048, 22130, 22134, 22132, 5049, + 22133, 22137, 22135, 5050, 22136, 22140, 22138, 5051, 22139, 22143, + 22141, 5052, 22142, 22146, 22144, 5053, 22145, 22149, 22147, 4415, 22148, + 22152, 22150, 5054, 22151, 22155, 22153, 5055, 22154, 22158, 22156, 5056, + 22157, 22161, 22159, 5057, 22160, 22164, 22162, 5058, 22163, 22167, + 22165, 5059, 22166, 22170, 22168, 5060, 22169, 22173, 22171, 5061, 22172, + 22176, 22174, 5062, 22175, 22179, 22177, 5063, 22178, 22182, 22180, 5064, + 22181, 22185, 22183, 5065, 22184, 22188, 22186, 5066, 22187, 22191, + 22189, 5067, 22190, 22194, 22192, 5068, 22193, 22197, 22195, 5069, 22196, + 22200, 22198, 5070, 22199, 22203, 22201, 5071, 22202, 22206, 22204, 5072, + 22205, 22209, 22207, 5073, 22208, 22212, 22210, 5074, 22211, 22215, + 22213, 5075, 22214, 22218, 22216, 5076, 22217, 22221, 22219, 4414, 22220, + 22224, 22222, 5077, 22223, 22227, 22225, 5078, 22226, 22230, 22228, 5079, + 22229, 22233, 22231, 5080, 22232, 22236, 22234, 5081, 22235, 22239, + 22237, 5082, 22238, 22242, 22240, 5083, 22241, 22245, 22243, 5084, 22244, + 22248, 22246, 5085, 22247, 22251, 22249, 5086, 22250, 22254, 22252, 5087, + 22253, 22257, 22255, 5088, 22256, 22260, 22258, 5089, 22259, 22263, + 22261, 5090, 22262, 22266, 22264, 5091, 22265, 22269, 22267, 5092, 22268, + 22272, 22270, 5093, 22271, 22275, 22273, 5094, 22274, 22278, 22276, 5095, + 22277, 22281, 22279, 5096, 22280, 22284, 22282, 5097, 22283, 22287, + 22285, 5098, 22286, 22290, 22288, 5099, 22289, 22293, 22291, 4413, 22292, + 22296, 22294, 5100, 22295, 22299, 22297, 5101, 22298, 22302, 22300, 5102, + 22301, 22305, 22303, 5103, 22304, 22308, 22306, 5104, 22307, 22311, + 22309, 5105, 22310, 22314, 22312, 5106, 22313, 22317, 22315, 5107, 22316, + 22320, 22318, 5108, 22319, 22323, 22321, 5109, 22322, 22326, 22324, 5110, + 22325, 22329, 22327, 5111, 22328, 22332, 22330, 5112, 22331, 22335, + 22333, 5113, 22334, 22338, 22336, 5114, 22337, 22341, 22339, 5115, 22340, + 22344, 22342, 5116, 22343, 22347, 22345, 5117, 22346, 22350, 22348, 5118, + 22349, 22353, 22351, 5119, 22352, 22356, 22354, 5120, 22355, 22359, + 22357, 5121, 22358, 22362, 22360, 5122, 22361, 22365, 22363, 4412, 22364, + 22368, 22366, 5123, 22367, 22371, 22369, 5124, 22370, 22374, 22372, 5125, + 22373, 22377, 22375, 5126, 22376, 22380, 22378, 5127, 22379, 22383, + 22381, 5128, 22382, 22386, 22384, 5129, 22385, 22389, 22387, 5130, 22388, + 22392, 22390, 5131, 22391, 22395, 22393, 5132, 22394, 22398, 22396, 5133, + 22397, 22401, 22399, 5134, 22400, 22404, 22402, 5135, 22403, 22407, + 22405, 5136, 22406, 22410, 22408, 5137, 22409, 22413, 22411, 5138, 22412, + 22416, 22414, 5139, 22415, 22419, 22417, 5140, 22418, 22422, 22420, 5141, + 22421, 22425, 22423, 5142, 22424, 22428, 22426, 5143, 22427, 22431, + 22429, 5144, 22430, 22434, 22432, 5145, 22433, 22437, 22435, 4411, 22436, + 22440, 22438, 5146, 22439, 22443, 22441, 5147, 22442, 22446, 22444, 5148, + 22445, 22449, 22447, 5149, 22448, 22452, 22450, 5150, 22451, 22455, + 22453, 5151, 22454, 22458, 22456, 5152, 22457, 22461, 22459, 5153, 22460, + 22464, 22462, 5154, 22463, 22467, 22465, 5155, 22466, 22470, 22468, 5156, + 22469, 22473, 22471, 5157, 22472, 22476, 22474, 5158, 22475, 22479, + 22477, 5159, 22478, 22482, 22480, 5160, 22481, 22485, 22483, 5161, 22484, + 22488, 22486, 5162, 22487, 22491, 22489, 5163, 22490, 22494, 22492, 5164, + 22493, 22497, 22495, 5165, 22496, 22500, 22498, 5166, 22499, 22503, + 22501, 5167, 22502, 22506, 22504, 5168, 22505, 22509, 22507, 4410, 22508, + 22512, 22510, 5169, 22511, 22515, 22513, 5170, 22514, 22518, 22516, 5171, + 22517, 22521, 22519, 5172, 22520, 22524, 22522, 5173, 22523, 22527, + 22525, 5174, 22526, 22530, 22528, 5175, 22529, 22533, 22531, 5176, 22532, + 22536, 22534, 5177, 22535, 22539, 22537, 5178, 22538, 22542, 22540, 5179, + 22541, 22545, 22543, 5180, 22544, 22548, 22546, 5181, 22547, 22551, + 22549, 5182, 22550, 22554, 22552, 5183, 22553, 22557, 22555, 5184, 22556, + 22560, 22558, 5185, 22559, 22563, 22561, 5186, 22562, 22566, 22564, 5187, + 22565, 22569, 22567, 5188, 22568, 22572, 22570, 5189, 22571, 22575, + 22573, 5190, 22574, 22578, 22576, 5191, 22577, 22581, 22579, 4409, 22580, + 22584, 22582, 5192, 22583, 22587, 22585, 5193, 22586, 22590, 22588, 5194, + 22589, 22593, 22591, 5195, 22592, 22596, 22594, 5196, 22595, 22599, + 22597, 5197, 22598, 22602, 22600, 5198, 22601, 22605, 22603, 5199, 22604, + 22608, 22606, 5200, 22607, 22611, 22609, 5201, 22610, 22614, 22612, 5202, + 22613, 22617, 22615, 5203, 22616, 22620, 22618, 5204, 22619, 22623, + 22621, 5205, 22622, 22626, 22624, 5206, 22625, 22629, 22627, 5207, 22628, + 22632, 22630, 5208, 22631, 22635, 22633, 5209, 22634, 22638, 22636, 5210, + 22637, 22641, 22639, 5211, 22640, 22644, 22642, 5212, 22643, 22647, + 22645, 5213, 22646, 22650, 22648, 5214, 22649, 22653, 22651, 4408, 22652, + 22656, 22654, 5215, 22655, 22659, 22657, 5216, 22658, 22662, 22660, 5217, + 22661, 22665, 22663, 5218, 22664, 22668, 22666, 5219, 22667, 22671, + 22669, 5220, 22670, 22674, 22672, 5221, 22673, 22677, 22675, 5222, 22676, + 22680, 22678, 5223, 22679, 22683, 22681, 5224, 22682, 22686, 22684, 5225, + 22685, 22689, 22687, 5226, 22688, 22692, 22690, 5227, 22691, 22695, + 22693, 5228, 22694, 22698, 22696, 5229, 22697, 22701, 22699, 5230, 22700, + 22704, 22702, 5231, 22703, 22707, 22705, 5232, 22706, 22710, 22708, 5233, + 22709, 22713, 22711, 5234, 22712, 22716, 22714, 5235, 22715, 22719, + 22717, 5236, 22718, 22722, 22720, 5237, 22721, 22725, 22723, 4407, 22724, + 22728, 22726, 5238, 22727, 22731, 22729, 5239, 22730, 22734, 22732, 5240, + 22733, 22737, 22735, 5241, 22736, 22740, 22738, 5242, 22739, 22743, + 22741, 5243, 22742, 22746, 22744, 5244, 22745, 22749, 22747, 5245, 22748, + 22752, 22750, 5246, 22751, 22755, 22753, 5247, 22754, 22758, 22756, 5248, + 22757, 22761, 22759, 5249, 22760, 22764, 22762, 5250, 22763, 22767, + 22765, 5251, 22766, 22770, 22768, 5252, 22769, 22773, 22771, 5253, 22772, + 22776, 22774, 5254, 22775, 22779, 22777, 5255, 22778, 22782, 22780, 5256, + 22781, 22785, 22783, 5257, 22784, 22788, 22786, 5258, 22787, 22791, + 22789, 5259, 22790, 22794, 22792, 5260, 22793, 22797, 22795, 4406, 22796, + 22800, 22798, 5261, 22799, 22803, 22801, 5262, 22802, 22806, 22804, 5263, + 22805, 22809, 22807, 5264, 22808, 22812, 22810, 5265, 22811, 22815, + 22813, 5266, 22814, 22818, 22816, 5267, 22817, 22821, 22819, 5268, 22820, + 22824, 22822, 5269, 22823, 22827, 22825, 5270, 22826, 22830, 22828, 5271, + 22829, 22833, 22831, 5272, 22832, 22836, 22834, 5273, 22835, 22839, + 22837, 5274, 22838, 22842, 22840, 5275, 22841, 22845, 22843, 5276, 22844, + 22848, 22846, 5277, 22847, 22851, 22849, 5278, 22850, 22854, 22852, 5279, + 22853, 22857, 22855, 5280, 22856, 22860, 22858, 5281, 22859, 22863, + 22861, 5282, 22862, 22866, 22864, 5283, 22865, 22869, 22867, 4405, 22868, + 22872, 22870, 5284, 22871, 22875, 22873, 5285, 22874, 22878, 22876, 5286, + 22877, 22881, 22879, 5287, 22880, 22884, 22882, 5288, 22883, 22887, + 22885, 5289, 22886, 22890, 22888, 5290, 22889, 22893, 22891, 5291, 22892, + 22896, 22894, 5292, 22895, 22899, 22897, 5293, 22898, 22902, 22900, 5294, + 22901, 22905, 22903, 5295, 22904, 22908, 22906, 5296, 22907, 22911, + 22909, 5297, 22910, 22914, 22912, 5298, 22913, 22917, 22915, 5299, 22916, + 22920, 22918, 5300, 22919, 22923, 22921, 5301, 22922, 22926, 22924, 5302, + 22925, 22929, 22927, 5303, 22928, 22932, 22930, 5304, 22931, 22935, + 22933, 5305, 22934, 22938, 22936, 5306, 22937, 22941, 22939, 4404, 22940, + 22944, 22942, 5307, 22943, 22947, 22945, 5308, 22946, 22950, 22948, 5309, + 22949, 22953, 22951, 5310, 22952, 22956, 22954, 5311, 22955, 22959, + 22957, 5312, 22958, 22962, 22960, 5313, 22961, 22965, 22963, 5314, 22964, + 22968, 22966, 5315, 22967, 22971, 22969, 5316, 22970, 22974, 22972, 5317, + 22973, 22977, 22975, 5318, 22976, 22980, 22978, 5319, 22979, 22983, + 22981, 5320, 22982, 22986, 22984, 5321, 22985, 22989, 22987, 5322, 22988, + 22992, 22990, 5323, 22991, 22995, 22993, 5324, 22994, 22998, 22996, 5325, + 22997, 23001, 22999, 5326, 23000, 23004, 23002, 5327, 23003, 23007, + 23005, 5328, 23006, 23010, 23008, 5329, 23009, 23013, 23011, 4403, 23012, + 23016, 23014, 5330, 23015, 23019, 23017, 5331, 23018, 23022, 23020, 5332, + 23021, 23025, 23023, 5333, 23024, 23028, 23026, 5334, 23027, 23031, + 23029, 5335, 23030, 23034, 23032, 5336, 23033, 23037, 23035, 5337, 23036, + 23040, 23038, 5338, 23039, 23043, 23041, 5339, 23042, 23046, 23044, 5340, + 23045, 23049, 23047, 5341, 23048, 23052, 23050, 5342, 23051, 23055, + 23053, 5343, 23054, 23058, 23056, 5344, 23057, 23061, 23059, 5345, 23060, + 23064, 23062, 5346, 23063, 23067, 23065, 5347, 23066, 23070, 23068, 5348, + 23069, 23073, 23071, 5349, 23072, 23076, 23074, 5350, 23075, 23079, + 23077, 5351, 23078, 23082, 23080, 5352, 23081, 23085, 23083, 4402, 23084, + 23088, 23086, 5353, 23087, 23091, 23089, 5354, 23090, 23094, 23092, 5355, + 23093, 23097, 23095, 5356, 23096, 23100, 23098, 5357, 23099, 23103, + 23101, 5358, 23102, 23106, 23104, 5359, 23105, 23109, 23107, 5360, 23108, + 23112, 23110, 5361, 23111, 23115, 23113, 5362, 23114, 23118, 23116, 5363, + 23117, 23121, 23119, 5364, 23120, 23124, 23122, 5365, 23123, 23127, + 23125, 5366, 23126, 23130, 23128, 5367, 23129, 23133, 23131, 5368, 23132, + 23136, 23134, 5369, 23135, 23139, 23137, 5370, 23138, 23142, 23140, 5371, + 23141, 23145, 23143, 5372, 23144, 23148, 23146, 5373, 23147, 23151, + 23149, 5374, 23150, 23154, 23152, 5375, 23153, 23157, 23155, 4401, 23156, + 23160, 23158, 5376, 23159, 23163, 23161, 5377, 23162, 23166, 23164, 5378, + 23165, 23169, 23167, 5379, 23168, 23172, 23170, 5380, 23171, 23175, + 23173, 5381, 23174, 23178, 23176, 5382, 23177, 23181, 23179, 5383, 23180, + 23184, 23182, 5384, 23183, 23187, 23185, 5385, 23186, 23190, 23188, 5386, + 23189, 23193, 23191, 5387, 23192, 23196, 23194, 5388, 23195, 23199, + 23197, 5389, 23198, 23202, 23200, 5390, 23201, 23205, 23203, 5391, 23204, + 23208, 23206, 5392, 23207, 23211, 23209, 5393, 23210, 23214, 23212, 5394, + 23213, 23217, 23215, 5395, 23216, 23220, 23218, 5396, 23219, 23223, + 23221, 5397, 23222, 23226, 23224, 5398, 23225, 23229, 23227, 4400, 23228, + 23232, 23230, 5399, 23231, 23235, 23233, 5400, 23234, 23238, 23236, 5401, + 23237, 23241, 23239, 5402, 23240, 23244, 23242, 5403, 23243, 23247, + 23245, 5404, 23246, 23250, 23248, 5405, 23249, 23253, 23251, 5406, 23252, + 23256, 23254, 5407, 23255, 23259, 23257, 5408, 23258, 23262, 23260, 5409, + 23261, 23265, 23263, 5410, 23264, 23268, 23266, 5411, 23267, 23271, + 23269, 5412, 23270, 23274, 23272, 5413, 23273, 23277, 23275, 5414, 23276, + 23280, 23278, 5415, 23279, 23283, 23281, 5416, 23282, 23286, 23284, 5417, + 23285, 23289, 23287, 5418, 23288, 23292, 23290, 5419, 23291, 23295, + 23293, 5420, 23294, 23298, 23296, 5421, 23297, 23301, 23299, 4399, 23300, + 23304, 23302, 5422, 23303, 23307, 23305, 5423, 23306, 23310, 23308, 5424, + 23309, 23313, 23311, 5425, 23312, 23316, 23314, 5426, 23315, 23319, + 23317, 5427, 23318, 23322, 23320, 5428, 23321, 23325, 23323, 5429, 23324, + 23328, 23326, 5430, 23327, 23331, 23329, 5431, 23330, 23334, 23332, 5432, + 23333, 23337, 23335, 5433, 23336, 23340, 23338, 5434, 23339, 23343, + 23341, 5435, 23342, 23346, 23344, 5436, 23345, 23349, 23347, 5437, 23348, + 23352, 23350, 5438, 23351, 23355, 23353, 5439, 23354, 23358, 23356, 5440, + 23357, 23361, 23359, 5441, 23360, 23364, 23362, 5442, 23363, 23367, + 23365, 5443, 23366, 23370, 23368, 5444, 23369, 23373, 23371, 4398, 23372, + 23376, 23374, 5445, 23375, 23379, 23377, 5446, 23378, 23382, 23380, 5447, + 23381, 23385, 23383, 5448, 23384, 23388, 23386, 5449, 23387, 23391, + 23389, 5450, 23390, 23394, 23392, 5451, 23393, 23397, 23395, 5452, 23396, + 23400, 23398, 5453, 23399, 23403, 23401, 5454, 23402, 23406, 23404, 5455, + 23405, 23409, 23407, 5456, 23408, 23412, 23410, 5457, 23411, 23415, + 23413, 5458, 23414, 23418, 23416, 5459, 23417, 23421, 23419, 5460, 23420, + 23424, 23422, 5461, 23423, 23427, 23425, 5462, 23426, 23430, 23428, 5463, + 23429, 23433, 23431, 5464, 23432, 23436, 23434, 5465, 23435, 23439, + 23437, 5466, 23438, 23442, 23440, 5467, 23441, 23445, 23443, 4397, 23444, + 23448, 23446, 5468, 23447, 23451, 23449, 5469, 23450, 23454, 23452, 5470, + 23453, 23457, 23455, 5471, 23456, 23460, 23458, 5472, 23459, 23463, + 23461, 5473, 23462, 23466, 23464, 5474, 23465, 23469, 23467, 5475, 23468, + 23472, 23470, 5476, 23471, 23475, 23473, 5477, 23474, 23478, 23476, 5478, + 23477, 23481, 23479, 5479, 23480, 23484, 23482, 5480, 23483, 23487, + 23485, 5481, 23486, 23490, 23488, 5482, 23489, 23493, 23491, 5483, 23492, + 23496, 23494, 5484, 23495, 23499, 23497, 5485, 23498, 23502, 23500, 5486, + 23501, 23505, 23503, 5487, 23504, 23508, 23506, 5488, 23507, 23511, + 23509, 5489, 23510, 23514, 23512, 5490, 23513, 23517, 23515, 4396, 23516, + 23520, 23518, 5491, 23519, 23523, 23521, 5492, 23522, 23526, 23524, 5493, + 23525, 23529, 23527, 5494, 23528, 23532, 23530, 5495, 23531, 23535, + 23533, 5496, 23534, 23538, 23536, 5497, 23537, 23541, 23539, 5498, 23540, + 23544, 23542, 5499, 23543, 23547, 23545, 5500, 23546, 23550, 23548, 5501, + 23549, 23553, 23551, 5502, 23552, 23556, 23554, 5503, 23555, 23559, + 23557, 5504, 23558, 23562, 23560, 5505, 23561, 23565, 23563, 5506, 23564, + 23568, 23566, 5507, 23567, 23571, 23569, 5508, 23570, 23574, 23572, 5509, + 23573, 23577, 23575, 5510, 23576, 23580, 23578, 5511, 23579, 23583, + 23581, 5512, 23582, 23586, 23584, 5513, 23585, 23589, 23587, 4395, 23588, + 23592, 23590, 5514, 23591, 23595, 23593, 5515, 23594, 23598, 23596, 5516, + 23597, 23601, 23599, 5517, 23600, 23604, 23602, 5518, 23603, 23607, + 23605, 5519, 23606, 23610, 23608, 5520, 23609, 23613, 23611, 5521, 23612, + 23616, 23614, 5522, 23615, 23619, 23617, 5523, 23618, 23622, 23620, 5524, + 23621, 23625, 23623, 5525, 23624, 23628, 23626, 5526, 23627, 23631, + 23629, 5527, 23630, 23634, 23632, 5528, 23633, 23637, 23635, 5529, 23636, + 23640, 23638, 5530, 23639, 23643, 23641, 5531, 23642, 23646, 23644, 5532, + 23645, 23649, 23647, 5533, 23648, 23652, 23650, 5534, 23651, 23655, + 23653, 5535, 23654, 23658, 23656, 5536, 23657, 23661, 23659, 4394, 23660, + 23664, 23662, 5537, 23663, 23667, 23665, 5538, 23666, 23670, 23668, 5539, + 23669, 23673, 23671, 5540, 23672, 23676, 23674, 5541, 23675, 23679, + 23677, 5542, 23678, 23682, 23680, 5543, 23681, 23685, 23683, 5544, 23684, + 23688, 23686, 5545, 23687, 23691, 23689, 5546, 23690, 23694, 23692, 5547, + 23693, 23697, 23695, 5548, 23696, 23700, 23698, 5549, 23699, 23703, + 23701, 5550, 23702, 23706, 23704, 5551, 23705, 23709, 23707, 5552, 23708, + 23712, 23710, 5553, 23711, 23715, 23713, 5554, 23714, 23718, 23716, 5555, + 23717, 23721, 23719, 5556, 23720, 23724, 23722, 5557, 23723, 23727, + 23725, 5558, 23726, 23730, 23728, 5559, 23729, 23733, 23731, 4393, 23732, + 23736, 23734, 5560, 23735, 23739, 23737, 5561, 23738, 23742, 23740, 5562, + 23741, 23745, 23743, 5563, 23744, 23748, 23746, 5564, 23747, 23751, + 23749, 5565, 23750, 23754, 23752, 5566, 23753, 23757, 23755, 5567, 23756, + 23760, 23758, 5568, 23759, 23763, 23761, 5569, 23762, 23766, 23764, 5570, + 23765, 23769, 23767, 5571, 23768, 23772, 23770, 5572, 23771, 23775, + 23773, 5573, 23774, 23778, 23776, 5574, 23777, 23781, 23779, 5575, 23780, + 23784, 23782, 5576, 23783, 23787, 23785, 5577, 23786, 23790, 23788, 5578, + 23789, 23793, 23791, 5579, 23792, 23796, 23794, 5580, 23795, 23799, + 23797, 5581, 23798, 23802, 23800, 5582, 23801, 23805, 23803, 4392, 23804, + 23808, 23806, 5583, 23807, 23811, 23809, 5584, 23810, 23814, 23812, 5585, + 23813, 23817, 23815, 5586, 23816, 23820, 23818, 5587, 23819, 23823, + 23821, 5588, 23822, 23826, 23824, 5589, 23825, 23829, 23827, 5590, 23828, + 23832, 23830, 5591, 23831, 23835, 23833, 5592, 23834, 23838, 23836, 5593, + 23837, 23841, 23839, 5594, 23840, 23844, 23842, 5595, 23843, 23847, + 23845, 5596, 23846, 23850, 23848, 5597, 23849, 23853, 23851, 5598, 23852, + 23856, 23854, 5599, 23855, 23859, 23857, 5600, 23858, 23862, 23860, 5601, + 23861, 23865, 23863, 5602, 23864, 23868, 23866, 5603, 23867, 23871, + 23869, 5604, 23870, 23874, 23872, 5605, 23873, 23877, 23875, 4358, 23876, + 23880, 23878, 5606, 23879, 23883, 23881, 5607, 23882, 23886, 23884, 5608, + 23885, 23889, 23887, 5609, 23888, 23892, 23890, 5610, 23891, 23895, + 23893, 5611, 23894, 23898, 23896, 5612, 23897, 23901, 23899, 5613, 23900, + 23904, 23902, 5614, 23903, 23907, 23905, 5615, 23906, 23910, 23908, 5616, + 23909, 23913, 23911, 5617, 23912, 23916, 23914, 5618, 23915, 23919, + 23917, 5619, 23918, 23922, 23920, 5620, 23921, 23925, 23923, 5621, 23924, + 23928, 23926, 5622, 23927, 23931, 23929, 5623, 23930, 23934, 23932, 5624, + 23933, 23937, 23935, 5625, 23936, 23940, 23938, 5626, 23939, 23943, + 23941, 5627, 23942, 23946, 23944, 5628, 23945, 23949, 23947, 4390, 23948, + 23952, 23950, 5629, 23951, 23955, 23953, 5630, 23954, 23958, 23956, 5631, + 23957, 23961, 23959, 5632, 23960, 23964, 23962, 5633, 23963, 23967, + 23965, 5634, 23966, 23970, 23968, 5635, 23969, 23973, 23971, 5636, 23972, + 23976, 23974, 5637, 23975, 23979, 23977, 5638, 23978, 23982, 23980, 5639, + 23981, 23985, 23983, 5640, 23984, 23988, 23986, 5641, 23987, 23991, + 23989, 5642, 23990, 23994, 23992, 5643, 23993, 23997, 23995, 5644, 23996, + 24000, 23998, 5645, 23999, 24003, 24001, 5646, 24002, 24006, 24004, 5647, + 24005, 24009, 24007, 5648, 24008, 24012, 24010, 5649, 24011, 24015, + 24013, 5650, 24014, 24018, 24016, 5651, 24017, 24021, 24019, 4389, 24020, + 24024, 24022, 5652, 24023, 24027, 24025, 5653, 24026, 24030, 24028, 5654, + 24029, 24033, 24031, 5655, 24032, 24036, 24034, 5656, 24035, 24039, + 24037, 5657, 24038, 24042, 24040, 5658, 24041, 24045, 24043, 5659, 24044, + 24048, 24046, 5660, 24047, 24051, 24049, 5661, 24050, 24054, 24052, 5662, + 24053, 24057, 24055, 5663, 24056, 24060, 24058, 5664, 24059, 24063, + 24061, 5665, 24062, 24066, 24064, 5666, 24065, 24069, 24067, 5667, 24068, + 24072, 24070, 5668, 24071, 24075, 24073, 5669, 24074, 24078, 24076, 5670, + 24077, 24081, 24079, 5671, 24080, 24084, 24082, 5672, 24083, 24087, + 24085, 5673, 24086, 24090, 24088, 5674, 24089, 24093, 24091, 4388, 24092, + 24096, 24094, 5675, 24095, 24099, 24097, 5676, 24098, 24102, 24100, 5677, + 24101, 24105, 24103, 5678, 24104, 24108, 24106, 5679, 24107, 24111, + 24109, 5680, 24110, 24114, 24112, 5681, 24113, 24117, 24115, 5682, 24116, + 24120, 24118, 5683, 24119, 24123, 24121, 5684, 24122, 24126, 24124, 5685, + 24125, 24129, 24127, 5686, 24128, 24132, 24130, 5687, 24131, 24135, + 24133, 5688, 24134, 24138, 24136, 5689, 24137, 24141, 24139, 5690, 24140, + 24144, 24142, 5691, 24143, 24147, 24145, 5692, 24146, 24150, 24148, 5693, + 24149, 24153, 24151, 5694, 24152, 24156, 24154, 5695, 24155, 24159, + 24157, 5696, 24158, 24162, 24160, 5697, 24161, 24165, 24163, 4387, 24164, + 24168, 24166, 5698, 24167, 24171, 24169, 5699, 24170, 24174, 24172, 5700, + 24173, 24177, 24175, 5701, 24176, 24180, 24178, 5702, 24179, 24183, + 24181, 5703, 24182, 24186, 24184, 5704, 24185, 24189, 24187, 5705, 24188, + 24192, 24190, 5706, 24191, 24195, 24193, 5707, 24194, 24198, 24196, 5708, + 24197, 24201, 24199, 5709, 24200, 24204, 24202, 5710, 24203, 24207, + 24205, 5711, 24206, 24210, 24208, 5712, 24209, 24213, 24211, 5713, 24212, + 24216, 24214, 5714, 24215, 24219, 24217, 5715, 24218, 24222, 24220, 5716, + 24221, 24225, 24223, 5717, 24224, 24228, 24226, 5718, 24227, 24231, + 24229, 5719, 24230, 24234, 24232, 5720, 24233, 24237, 24235, 4386, 24236, + 24240, 24238, 5721, 24239, 24243, 24241, 5722, 24242, 24246, 24244, 5723, + 24245, 24249, 24247, 5724, 24248, 24252, 24250, 5725, 24251, 24255, + 24253, 5726, 24254, 24258, 24256, 5727, 24257, 24261, 24259, 5728, 24260, + 24264, 24262, 5729, 24263, 24267, 24265, 5730, 24266, 24270, 24268, 5731, + 24269, 24273, 24271, 5732, 24272, 24276, 24274, 5733, 24275, 24279, + 24277, 5734, 24278, 24282, 24280, 5735, 24281, 24285, 24283, 5736, 24284, + 24288, 24286, 5737, 24287, 24291, 24289, 5738, 24290, 24294, 24292, 5739, + 24293, 24297, 24295, 5740, 24296, 24300, 24298, 5741, 24299, 24303, + 24301, 5742, 24302, 24306, 24304, 5743, 24305, 24309, 24307, 4385, 24308, + 24312, 24310, 5744, 24311, 24315, 24313, 5745, 24314, 24318, 24316, 5746, + 24317, 24321, 24319, 5747, 24320, 24324, 24322, 5748, 24323, 24327, + 24325, 5749, 24326, 24330, 24328, 5750, 24329, 24333, 24331, 5751, 24332, + 24336, 24334, 5752, 24335, 24339, 24337, 5753, 24338, 24342, 24340, 5754, + 24341, 24345, 24343, 5755, 24344, 24348, 24346, 5756, 24347, 24351, + 24349, 5757, 24350, 24354, 24352, 5758, 24353, 24357, 24355, 5759, 24356, + 24360, 24358, 5760, 24359, 24363, 24361, 5761, 24362, 24366, 24364, 5762, + 24365, 24369, 24367, 5763, 24368, 24372, 24370, 5764, 24371, 24375, + 24373, 5765, 24374, 24378, 24376, 5766, 24377, 24381, 24379, 4384, 24380, + 24384, 24382, 5767, 24383, 24387, 24385, 5768, 24386, 24390, 24388, 5769, + 24389, 24393, 24391, 5770, 24392, 24396, 24394, 5771, 24395, 24399, + 24397, 5772, 24398, 24402, 24400, 5773, 24401, 24405, 24403, 5774, 24404, + 24408, 24406, 5775, 24407, 24411, 24409, 5776, 24410, 24414, 24412, 5777, + 24413, 24417, 24415, 5778, 24416, 24420, 24418, 5779, 24419, 24423, + 24421, 5780, 24422, 24426, 24424, 5781, 24425, 24429, 24427, 5782, 24428, + 24432, 24430, 5783, 24431, 24435, 24433, 5784, 24434, 24438, 24436, 5785, + 24437, 24441, 24439, 5786, 24440, 24444, 24442, 5787, 24443, 24447, + 24445, 5788, 24446, 24450, 24448, 5789, 24449, 24453, 24451, 4383, 24452, + 24456, 24454, 5790, 24455, 24459, 24457, 5791, 24458, 24462, 24460, 5792, + 24461, 24465, 24463, 5793, 24464, 24468, 24466, 5794, 24467, 24471, + 24469, 5795, 24470, 24474, 24472, 5796, 24473, 24477, 24475, 5797, 24476, + 24480, 24478, 5798, 24479, 24483, 24481, 5799, 24482, 24486, 24484, 5800, + 24485, 24489, 24487, 5801, 24488, 24492, 24490, 5802, 24491, 24495, + 24493, 5803, 24494, 24498, 24496, 5804, 24497, 24501, 24499, 5805, 24500, + 24504, 24502, 5806, 24503, 24507, 24505, 5807, 24506, 24510, 24508, 5808, + 24509, 24513, 24511, 5809, 24512, 24516, 24514, 5810, 24515, 24519, + 24517, 5811, 24518, 24522, 24520, 5812, 24521, 24525, 24523, 4382, 24524, + 24528, 24526, 5813, 24527, 24531, 24529, 5814, 24530, 24534, 24532, 5815, + 24533, 24537, 24535, 5816, 24536, 24540, 24538, 5817, 24539, 24543, + 24541, 5818, 24542, 24546, 24544, 5819, 24545, 24549, 24547, 5820, 24548, + 24552, 24550, 5821, 24551, 24555, 24553, 5822, 24554, 24558, 24556, 5823, + 24557, 24561, 24559, 5824, 24560, 24564, 24562, 5825, 24563, 24567, + 24565, 5826, 24566, 24570, 24568, 5827, 24569, 24573, 24571, 5828, 24572, + 24576, 24574, 5829, 24575, 24579, 24577, 5830, 24578, 24582, 24580, 5831, + 24581, 24585, 24583, 5832, 24584, 24588, 24586, 5833, 24587, 24591, + 24589, 5834, 24590, 24594, 24592, 5835, 24593, 24597, 24595, 4381, 24596, + 24600, 24598, 5836, 24599, 24603, 24601, 5837, 24602, 24606, 24604, 5838, + 24605, 24609, 24607, 5839, 24608, 24612, 24610, 5840, 24611, 24615, + 24613, 5841, 24614, 24618, 24616, 5842, 24617, 24621, 24619, 5843, 24620, + 24624, 24622, 5844, 24623, 24627, 24625, 5845, 24626, 24630, 24628, 5846, + 24629, 24633, 24631, 5847, 24632, 24636, 24634, 5848, 24635, 24639, + 24637, 5849, 24638, 24642, 24640, 5850, 24641, 24645, 24643, 5851, 24644, + 24648, 24646, 5852, 24647, 24651, 24649, 5853, 24650, 24654, 24652, 5854, + 24653, 24657, 24655, 5855, 24656, 24660, 24658, 5856, 24659, 24663, + 24661, 5857, 24662, 24666, 24664, 5858, 24665, 24669, 24667, 4380, 24668, + 24672, 24670, 5859, 24671, 24675, 24673, 5860, 24674, 24678, 24676, 5861, + 24677, 24681, 24679, 5862, 24680, 24684, 24682, 5863, 24683, 24687, + 24685, 5864, 24686, 24690, 24688, 5865, 24689, 24693, 24691, 5866, 24692, + 24696, 24694, 5867, 24695, 24699, 24697, 5868, 24698, 24702, 24700, 5869, + 24701, 24705, 24703, 5870, 24704, 24708, 24706, 5871, 24707, 24711, + 24709, 5872, 24710, 24714, 24712, 5873, 24713, 24717, 24715, 5874, 24716, + 24720, 24718, 5875, 24719, 24723, 24721, 5876, 24722, 24726, 24724, 5877, + 24725, 24729, 24727, 5878, 24728, 24732, 24730, 5879, 24731, 24735, + 24733, 5880, 24734, 24738, 24736, 5881, 24737, 24741, 24739, 4379, 24740, + 24744, 24742, 5882, 24743, 24747, 24745, 5883, 24746, 24750, 24748, 5884, + 24749, 24753, 24751, 5885, 24752, 24756, 24754, 5886, 24755, 24759, + 24757, 5887, 24758, 24762, 24760, 5888, 24761, 24765, 24763, 5889, 24764, + 24768, 24766, 5890, 24767, 24771, 24769, 5891, 24770, 24774, 24772, 5892, + 24773, 24777, 24775, 5893, 24776, 24780, 24778, 5894, 24779, 24783, + 24781, 5895, 24782, 24786, 24784, 5896, 24785, 24789, 24787, 5897, 24788, + 24792, 24790, 5898, 24791, 24795, 24793, 5899, 24794, 24798, 24796, 5900, + 24797, 24801, 24799, 5901, 24800, 24804, 24802, 5902, 24803, 24807, + 24805, 5903, 24806, 24810, 24808, 5904, 24809, 24813, 24811, 4378, 24812, + 24816, 24814, 5905, 24815, 24819, 24817, 5906, 24818, 24822, 24820, 5907, + 24821, 24825, 24823, 5908, 24824, 24828, 24826, 5909, 24827, 24831, + 24829, 5910, 24830, 24834, 24832, 5911, 24833, 24837, 24835, 5912, 24836, + 24840, 24838, 5913, 24839, 24843, 24841, 5914, 24842, 24846, 24844, 5915, + 24845, 24849, 24847, 5916, 24848, 24852, 24850, 5917, 24851, 24855, + 24853, 5918, 24854, 24858, 24856, 5919, 24857, 24861, 24859, 5920, 24860, + 24864, 24862, 5921, 24863, 24867, 24865, 5922, 24866, 24870, 24868, 5923, + 24869, 24873, 24871, 5924, 24872, 24876, 24874, 5925, 24875, 24879, + 24877, 5926, 24878, 24882, 24880, 5927, 24881, 24885, 24883, 4377, 24884, + 24888, 24886, 5928, 24887, 24891, 24889, 5929, 24890, 24894, 24892, 5930, + 24893, 24897, 24895, 5931, 24896, 24900, 24898, 5932, 24899, 24903, + 24901, 5933, 24902, 24906, 24904, 5934, 24905, 24909, 24907, 5935, 24908, + 24912, 24910, 5936, 24911, 24915, 24913, 5937, 24914, 24918, 24916, 5938, + 24917, 24921, 24919, 5939, 24920, 24924, 24922, 5940, 24923, 24927, + 24925, 5941, 24926, 24930, 24928, 5942, 24929, 24933, 24931, 5943, 24932, + 24936, 24934, 5944, 24935, 24939, 24937, 5945, 24938, 24942, 24940, 5946, + 24941, 24945, 24943, 5947, 24944, 24948, 24946, 5948, 24947, 24951, + 24949, 5949, 24950, 24954, 24952, 5950, 24953, 24957, 24955, 4376, 24956, + 24960, 24958, 5951, 24959, 24963, 24961, 5952, 24962, 24966, 24964, 5953, + 24965, 24969, 24967, 5954, 24968, 24972, 24970, 5955, 24971, 24975, + 24973, 5956, 24974, 24978, 24976, 5957, 24977, 24981, 24979, 5958, 24980, + 24984, 24982, 5959, 24983, 24987, 24985, 5960, 24986, 24990, 24988, 5961, + 24989, 24993, 24991, 5962, 24992, 24996, 24994, 5963, 24995, 24999, + 24997, 5964, 24998, 25002, 25000, 5965, 25001, 25005, 25003, 5966, 25004, + 25008, 25006, 5967, 25007, 25011, 25009, 5968, 25010, 25014, 25012, 5969, + 25013, 25017, 25015, 5970, 25016, 25020, 25018, 5971, 25019, 25023, + 25021, 5972, 25022, 25026, 25024, 5973, 25025, 25029, 25027, 4375, 25028, + 25032, 25030, 5974, 25031, 25035, 25033, 5975, 25034, 25038, 25036, 5976, + 25037, 25041, 25039, 5977, 25040, 25044, 25042, 5978, 25043, 25047, + 25045, 5979, 25046, 25050, 25048, 5980, 25049, 25053, 25051, 5981, 25052, + 25056, 25054, 5982, 25055, 25059, 25057, 5983, 25058, 25062, 25060, 5984, + 25061, 25065, 25063, 5985, 25064, 25068, 25066, 5986, 25067, 25071, + 25069, 5987, 25070, 25074, 25072, 5988, 25073, 25077, 25075, 5989, 25076, + 25080, 25078, 5990, 25079, 25083, 25081, 5991, 25082, 25086, 25084, 5992, + 25085, 25089, 25087, 5993, 25088, 25092, 25090, 5994, 25091, 25095, + 25093, 5995, 25094, 25098, 25096, 5996, 25097, 25101, 25099, 4374, 25100, + 25104, 25102, 5997, 25103, 25107, 25105, 5998, 25106, 25110, 25108, 5999, + 25109, 25113, 25111, 6000, 25112, 25116, 25114, 6001, 25115, 25119, + 25117, 6002, 25118, 25122, 25120, 6003, 25121, 25125, 25123, 6004, 25124, + 25128, 25126, 6005, 25127, 25131, 25129, 6006, 25130, 25134, 25132, 6007, + 25133, 25137, 25135, 6008, 25136, 25140, 25138, 6009, 25139, 25143, + 25141, 6010, 25142, 25146, 25144, 6011, 25145, 25149, 25147, 6012, 25148, + 25152, 25150, 6013, 25151, 25155, 25153, 6014, 25154, 25158, 25156, 6015, + 25157, 25161, 25159, 6016, 25160, 25164, 25162, 6017, 25163, 25167, + 25165, 6018, 25166, 25170, 25168, 6019, 25169, 25173, 25171, 4373, 25172, + 25176, 25174, 6020, 25175, 25179, 25177, 6021, 25178, 25182, 25180, 6022, + 25181, 25185, 25183, 6023, 25184, 25188, 25186, 6024, 25187, 25191, + 25189, 6025, 25190, 25194, 25192, 6026, 25193, 25197, 25195, 6027, 25196, + 25200, 25198, 6028, 25199, 25203, 25201, 6029, 25202, 25206, 25204, 6030, + 25205, 25209, 25207, 6031, 25208, 25212, 25210, 6032, 25211, 25215, + 25213, 6033, 25214, 25218, 25216, 6034, 25217, 25221, 25219, 6035, 25220, + 25224, 25222, 6036, 25223, 25227, 25225, 6037, 25226, 25230, 25228, 6038, + 25229, 25233, 25231, 6039, 25232, 25236, 25234, 6040, 25235, 25239, + 25237, 6041, 25238, 25242, 25240, 6042, 25241, 25245, 25243, 4372, 25244, + 25248, 25246, 6043, 25247, 25251, 25249, 6044, 25250, 25254, 25252, 6045, + 25253, 25257, 25255, 6046, 25256, 25260, 25258, 6047, 25259, 25263, + 25261, 6048, 25262, 25266, 25264, 6049, 25265, 25269, 25267, 6050, 25268, + 25272, 25270, 6051, 25271, 25275, 25273, 6052, 25274, 25278, 25276, 6053, + 25277, 25281, 25279, 6054, 25280, 25284, 25282, 6055, 25283, 25287, + 25285, 6056, 25286, 25290, 25288, 6057, 25289, 25293, 25291, 6058, 25292, + 25296, 25294, 6059, 25295, 25299, 25297, 6060, 25298, 25302, 25300, 6061, + 25301, 25305, 25303, 6062, 25304, 25308, 25306, 6063, 25307, 25311, + 25309, 6064, 25310, 25314, 25312, 6065, 25313, 25317, 25315, 4371, 25316, + 25320, 25318, 6066, 25319, 25323, 25321, 6067, 25322, 25326, 25324, 6068, + 25325, 25329, 25327, 6069, 25328, 25332, 25330, 6070, 25331, 25335, + 25333, 6071, 25334, 25338, 25336, 6072, 25337, 25341, 25339, 6073, 25340, + 25344, 25342, 6074, 25343, 25347, 25345, 6075, 25346, 25350, 25348, 6076, + 25349, 25353, 25351, 6077, 25352, 25356, 25354, 6078, 25355, 25359, + 25357, 6079, 25358, 25362, 25360, 6080, 25361, 25365, 25363, 6081, 25364, + 25368, 25366, 6082, 25367, 25371, 25369, 6083, 25370, 25374, 25372, 6084, + 25373, 25377, 25375, 6085, 25376, 25380, 25378, 6086, 25379, 25383, + 25381, 6087, 25382, 25386, 25384, 6088, 25385, 25389, 25387, 4370, 25388, + 25392, 25390, 6089, 25391, 25395, 25393, 6090, 25394, 25398, 25396, 6091, + 25397, 25401, 25399, 6092, 25400, 25404, 25402, 6093, 25403, 25407, + 25405, 6094, 25406, 25410, 25408, 6095, 25409, 25413, 25411, 6096, 25412, + 25416, 25414, 6097, 25415, 25419, 25417, 6098, 25418, 25422, 25420, 6099, + 25421, 25425, 25423, 6100, 25424, 25428, 25426, 6101, 25427, 25431, + 25429, 6102, 25430, 25434, 25432, 6103, 25433, 25437, 25435, 6104, 25436, + 25440, 25438, 6105, 25439, 25443, 25441, 6106, 25442, 25446, 25444, 6107, + 25445, 25449, 25447, 6108, 25448, 25452, 25450, 6109, 25451, 25455, + 25453, 6110, 25454, 25458, 25456, 6111, 25457, 25461, 25459, 4369, 25460, + 25464, 25462, 6112, 25463, 25467, 25465, 6113, 25466, 25470, 25468, 6114, + 25469, 25473, 25471, 6115, 25472, 25476, 25474, 6116, 25475, 25479, + 25477, 6117, 25478, 25482, 25480, 6118, 25481, 25485, 25483, 6119, 25484, + 25488, 25486, 6120, 25487, 25491, 25489, 6121, 25490, 25494, 25492, 6122, + 25493, 25497, 25495, 6123, 25496, 25500, 25498, 6124, 25499, 25503, + 25501, 6125, 25502, 25506, 25504, 6126, 25505, 25509, 25507, 6127, 25508, + 25512, 25510, 6128, 25511, 25515, 25513, 6129, 25514, 25518, 25516, 6130, + 25517, 25521, 25519, 6131, 25520, 25524, 25522, 6132, 25523, 25527, + 25525, 6133, 25526, 25530, 25528, 6134, 25529, 25533, 25531, 4368, 25532, + 25536, 25534, 6135, 25535, 25539, 25537, 6136, 25538, 25542, 25540, 6137, + 25541, 25545, 25543, 6138, 25544, 25548, 25546, 6139, 25547, 25551, + 25549, 6140, 25550, 25554, 25552, 6141, 25553, 25557, 25555, 6142, 25556, + 25560, 25558, 6143, 25559, 25563, 25561, 6144, 25562, 25566, 25564, 6145, + 25565, 25569, 25567, 6146, 25568, 25572, 25570, 6147, 25571, 25575, + 25573, 6148, 25574, 25578, 25576, 6149, 25577, 25581, 25579, 6150, 25580, + 25584, 25582, 6151, 25583, 25587, 25585, 6152, 25586, 25590, 25588, 6153, + 25589, 25593, 25591, 6154, 25592, 25596, 25594, 6155, 25595, 25599, + 25597, 6156, 25598, 25602, 25600, 6157, 25601, 25605, 25603, 4367, 25604, + 25608, 25606, 6158, 25607, 25611, 25609, 6159, 25610, 25614, 25612, 6160, + 25613, 25617, 25615, 6161, 25616, 25620, 25618, 6162, 25619, 25623, + 25621, 6163, 25622, 25626, 25624, 6164, 25625, 25629, 25627, 6165, 25628, + 25632, 25630, 6166, 25631, 25635, 25633, 6167, 25634, 25638, 25636, 6168, + 25637, 25641, 25639, 6169, 25640, 25644, 25642, 6170, 25643, 25647, + 25645, 6171, 25646, 25650, 25648, 6172, 25649, 25653, 25651, 6173, 25652, + 25656, 25654, 6174, 25655, 25659, 25657, 6175, 25658, 25662, 25660, 6176, + 25661, 25665, 25663, 6177, 25664, 25668, 25666, 6178, 25667, 25671, + 25669, 6179, 25670, 25674, 25672, 6180, 25673, 25677, 25675, 4366, 25676, + 25680, 25678, 6181, 25679, 25683, 25681, 6182, 25682, 25686, 25684, 6183, + 25685, 25689, 25687, 6184, 25688, 25692, 25690, 6185, 25691, 25695, + 25693, 6186, 25694, 25698, 25696, 6187, 25697, 25701, 25699, 6188, 25700, + 25704, 25702, 6189, 25703, 25707, 25705, 6190, 25706, 25710, 25708, 6191, + 25709, 25713, 25711, 6192, 25712, 25716, 25714, 6193, 25715, 25719, + 25717, 6194, 25718, 25722, 25720, 6195, 25721, 25725, 25723, 6196, 25724, + 25728, 25726, 6197, 25727, 25731, 25729, 6198, 25730, 25734, 25732, 6199, + 25733, 25737, 25735, 6200, 25736, 25740, 25738, 6201, 25739, 25743, + 25741, 6202, 25742, 25746, 25744, 6203, 25745, 25749, 25747, 4365, 25748, + 25752, 25750, 6204, 25751, 25755, 25753, 6205, 25754, 25758, 25756, 6206, + 25757, 25761, 25759, 6207, 25760, 25764, 25762, 6208, 25763, 25767, + 25765, 6209, 25766, 25770, 25768, 6210, 25769, 25773, 25771, 6211, 25772, + 25776, 25774, 6212, 25775, 25779, 25777, 6213, 25778, 25782, 25780, 6214, + 25781, 25785, 25783, 6215, 25784, 25788, 25786, 6216, 25787, 25791, + 25789, 6217, 25790, 25794, 25792, 6218, 25793, 25797, 25795, 6219, 25796, + 25800, 25798, 6220, 25799, 25803, 25801, 6221, 25802, 25806, 25804, 6222, + 25805, 25809, 25807, 6223, 25808, 25812, 25810, 6224, 25811, 25815, + 25813, 6225, 25814, 25818, 25816, 6226, 25817, 25821, 25819, 4364, 25820, + 25824, 25822, 6227, 25823, 25827, 25825, 6228, 25826, 25830, 25828, 6229, + 25829, 25833, 25831, 6230, 25832, 25836, 25834, 6231, 25835, 25839, + 25837, 6232, 25838, 25842, 25840, 6233, 25841, 25845, 25843, 6234, 25844, + 25848, 25846, 6235, 25847, 25851, 25849, 6236, 25850, 25854, 25852, 6237, + 25853, 25857, 25855, 6238, 25856, 25860, 25858, 6239, 25859, 25863, + 25861, 6240, 25862, 25866, 25864, 6241, 25865, 25869, 25867, 6242, 25868, + 25872, 25870, 6243, 25871, 25875, 25873, 6244, 25874, 25878, 25876, 6245, + 25877, 25881, 25879, 6246, 25880, 25884, 25882, 6247, 25883, 25887, + 25885, 6248, 25886, 25890, 25888, 6249, 25889, 25893, 25891, 4363, 25892, + 25896, 25894, 6250, 25895, 25899, 25897, 6251, 25898, 25902, 25900, 6252, + 25901, 25905, 25903, 6253, 25904, 25908, 25906, 6254, 25907, 25911, + 25909, 6255, 25910, 25914, 25912, 6256, 25913, 25917, 25915, 6257, 25916, + 25920, 25918, 6258, 25919, 25923, 25921, 6259, 25922, 25926, 25924, 6260, + 25925, 25929, 25927, 6261, 25928, 25932, 25930, 6262, 25931, 25935, + 25933, 6263, 25934, 25938, 25936, 6264, 25937, 25941, 25939, 6265, 25940, + 25944, 25942, 6266, 25943, 25947, 25945, 6267, 25946, 25950, 25948, 6268, + 25949, 25953, 25951, 6269, 25952, 25956, 25954, 6270, 25955, 25959, + 25957, 6271, 25958, 25962, 25960, 6272, 25961, 25965, 25963, 4362, 25964, + 25968, 25966, 6273, 25967, 25971, 25969, 6274, 25970, 25974, 25972, 6275, + 25973, 25977, 25975, 6276, 25976, 25980, 25978, 6277, 25979, 25983, + 25981, 6278, 25982, 25986, 25984, 6279, 25985, 25989, 25987, 6280, 25988, + 25992, 25990, 6281, 25991, 25995, 25993, 6282, 25994, 25998, 25996, 6283, + 25997, 26001, 25999, 6284, 26000, 26004, 26002, 6285, 26003, 26007, + 26005, 6286, 26006, 26010, 26008, 6287, 26009, 26013, 26011, 6288, 26012, + 26016, 26014, 6289, 26015, 26019, 26017, 6290, 26018, 26022, 26020, 6291, + 26021, 26025, 26023, 6292, 26024, 26028, 26026, 6293, 26027, 26031, + 26029, 6294, 26030, 26034, 26032, 6295, 26033, 26037, 26035, 4361, 26036, + 26040, 26038, 6296, 26039, 26043, 26041, 6297, 26042, 26046, 26044, 6298, + 26045, 26049, 26047, 6299, 26048, 26052, 26050, 6300, 26051, 26055, + 26053, 6301, 26054, 26058, 26056, 6302, 26057, 26061, 26059, 6303, 26060, + 26064, 26062, 6304, 26063, 26067, 26065, 6305, 26066, 26070, 26068, 6306, + 26069, 26073, 26071, 6307, 26072, 26076, 26074, 6308, 26075, 26079, + 26077, 6309, 26078, 26082, 26080, 6310, 26081, 26085, 26083, 6311, 26084, + 26088, 26086, 6312, 26087, 26091, 26089, 6313, 26090, 26094, 26092, 6314, + 26093, 26097, 26095, 6315, 26096, 26100, 26098, 6316, 26099, 26103, + 26101, 6317, 26102, 26106, 26104, 6318, 26105, 26109, 26107, 4360, 26108, + 26112, 26110, 6319, 26111, 26115, 26113, 6320, 26114, 26118, 26116, 6321, + 26117, 26121, 26119, 6322, 26120, 26124, 26122, 6323, 26123, 26127, + 26125, 6324, 26126, 26130, 26128, 6325, 26129, 26133, 26131, 6326, 26132, + 26136, 26134, 6327, 26135, 26139, 26137, 6328, 26138, 26142, 26140, 6329, + 26141, 26145, 26143, 6330, 26144, 26148, 26146, 6331, 26147, 26151, + 26149, 6332, 26150, 26154, 26152, 6333, 26153, 26157, 26155, 6334, 26156, + 26160, 26158, 6335, 26159, 26163, 26161, 6336, 26162, 26166, 26164, 6337, + 26165, 26169, 26167, 6338, 26168, 26172, 26170, 6339, 26171, 26175, + 26173, 6340, 26174, 26178, 26176, 6341, 26177, 26181, 26179, 4359, 26180, + 26184, 26182, 6342, 26183, 26187, 26185, 6343, 26186, 26190, 26188, 6344, + 26189, 26193, 26191, 6345, 26192, 26196, 26194, 6346, 26195, 26199, + 26197, 6347, 26198, 26202, 26200, 6348, 26201, 26205, 26203, 6349, 26204, + 26208, 26206, 6350, 26207, 26211, 26209, 6351, 26210, 26214, 26212, 6352, + 26213, 26217, 26215, 6353, 26216, 26220, 26218, 6354, 26219, 26223, + 26221, 6355, 26222, 26226, 26224, 6356, 26225, 26229, 26227, 6357, 26228, + 26232, 26230, 6358, 26231, 26235, 26233, 6359, 26234, 26238, 26236, 6360, + 26237, 26241, 26239, 6361, 26240, 26244, 26242, 6362, 26243, 26247, + 26245, 6363, 26246, 26250, 26248, 6364, 26249, 26253, 26251, 4325, 26252, + 26256, 26254, 6365, 26255, 26259, 26257, 6366, 26258, 26262, 26260, 6367, + 26261, 26265, 26263, 6368, 26264, 26268, 26266, 6369, 26267, 26271, + 26269, 6370, 26270, 26274, 26272, 6371, 26273, 26277, 26275, 6372, 26276, + 26280, 26278, 6373, 26279, 26283, 26281, 6374, 26282, 26286, 26284, 6375, + 26285, 26289, 26287, 6376, 26288, 26292, 26290, 6377, 26291, 26295, + 26293, 6378, 26294, 26298, 26296, 6379, 26297, 26301, 26299, 6380, 26300, + 26304, 26302, 6381, 26303, 26307, 26305, 6382, 26306, 26310, 26308, 6383, + 26309, 26313, 26311, 6384, 26312, 26316, 26314, 6385, 26315, 26319, + 26317, 6386, 26318, 26322, 26320, 6387, 26321, 26325, 26323, 4357, 26324, + 26328, 26326, 6388, 26327, 26331, 26329, 6389, 26330, 26334, 26332, 6390, + 26333, 26337, 26335, 6391, 26336, 26340, 26338, 6392, 26339, 26343, + 26341, 6393, 26342, 26346, 26344, 6394, 26345, 26349, 26347, 6395, 26348, + 26352, 26350, 6396, 26351, 26355, 26353, 6397, 26354, 26358, 26356, 6398, + 26357, 26361, 26359, 6399, 26360, 26364, 26362, 6400, 26363, 26367, + 26365, 6401, 26366, 26370, 26368, 6402, 26369, 26373, 26371, 6403, 26372, + 26376, 26374, 6404, 26375, 26379, 26377, 6405, 26378, 26382, 26380, 6406, + 26381, 26385, 26383, 6407, 26384, 26388, 26386, 6408, 26387, 26391, + 26389, 6409, 26390, 26394, 26392, 6410, 26393, 26397, 26395, 4356, 26396, + 26400, 26398, 6411, 26399, 26403, 26401, 6412, 26402, 26406, 26404, 6413, + 26405, 26409, 26407, 6414, 26408, 26412, 26410, 6415, 26411, 26415, + 26413, 6416, 26414, 26418, 26416, 6417, 26417, 26421, 26419, 6418, 26420, + 26424, 26422, 6419, 26423, 26427, 26425, 6420, 26426, 26430, 26428, 6421, + 26429, 26433, 26431, 6422, 26432, 26436, 26434, 6423, 26435, 26439, + 26437, 6424, 26438, 26442, 26440, 6425, 26441, 26445, 26443, 6426, 26444, + 26448, 26446, 6427, 26447, 26451, 26449, 6428, 26450, 26454, 26452, 6429, + 26453, 26457, 26455, 6430, 26456, 26460, 26458, 6431, 26459, 26463, + 26461, 6432, 26462, 26466, 26464, 6433, 26465, 26469, 26467, 4355, 26468, + 26472, 26470, 6434, 26471, 26475, 26473, 6435, 26474, 26478, 26476, 6436, + 26477, 26481, 26479, 6437, 26480, 26484, 26482, 6438, 26483, 26487, + 26485, 6439, 26486, 26490, 26488, 6440, 26489, 26493, 26491, 6441, 26492, + 26496, 26494, 6442, 26495, 26499, 26497, 6443, 26498, 26502, 26500, 6444, + 26501, 26505, 26503, 6445, 26504, 26508, 26506, 6446, 26507, 26511, + 26509, 6447, 26510, 26514, 26512, 6448, 26513, 26517, 26515, 6449, 26516, + 26520, 26518, 6450, 26519, 26523, 26521, 6451, 26522, 26526, 26524, 6452, + 26525, 26529, 26527, 6453, 26528, 26532, 26530, 6454, 26531, 26535, + 26533, 6455, 26534, 26538, 26536, 6456, 26537, 26541, 26539, 4354, 26540, + 26544, 26542, 6457, 26543, 26547, 26545, 6458, 26546, 26550, 26548, 6459, + 26549, 26553, 26551, 6460, 26552, 26556, 26554, 6461, 26555, 26559, + 26557, 6462, 26558, 26562, 26560, 6463, 26561, 26565, 26563, 6464, 26564, + 26568, 26566, 6465, 26567, 26571, 26569, 6466, 26570, 26574, 26572, 6467, + 26573, 26577, 26575, 6468, 26576, 26580, 26578, 6469, 26579, 26583, + 26581, 6470, 26582, 26586, 26584, 6471, 26585, 26589, 26587, 6472, 26588, + 26592, 26590, 6473, 26591, 26595, 26593, 6474, 26594, 26598, 26596, 6475, + 26597, 26601, 26599, 6476, 26600, 26604, 26602, 6477, 26603, 26607, + 26605, 6478, 26606, 26610, 26608, 6479, 26609, 26613, 26611, 4353, 26612, + 26616, 26614, 6480, 26615, 26619, 26617, 6481, 26618, 26622, 26620, 6482, + 26621, 26625, 26623, 6483, 26624, 26628, 26626, 6484, 26627, 26631, + 26629, 6485, 26630, 26634, 26632, 6486, 26633, 26637, 26635, 6487, 26636, + 26640, 26638, 6488, 26639, 26643, 26641, 6489, 26642, 26646, 26644, 6490, + 26645, 26649, 26647, 6491, 26648, 26652, 26650, 6492, 26651, 26655, + 26653, 6493, 26654, 26658, 26656, 6494, 26657, 26661, 26659, 6495, 26660, + 26664, 26662, 6496, 26663, 26667, 26665, 6497, 26666, 26670, 26668, 6498, + 26669, 26673, 26671, 6499, 26672, 26676, 26674, 6500, 26675, 26679, + 26677, 6501, 26678, 26682, 26680, 6502, 26681, 26685, 26683, 4352, 26684, + 26688, 26686, 6503, 26687, 26691, 26689, 6504, 26690, 26694, 26692, 6505, + 26693, 26697, 26695, 6506, 26696, 26700, 26698, 6507, 26699, 26703, + 26701, 6508, 26702, 26706, 26704, 6509, 26705, 26709, 26707, 6510, 26708, + 26712, 26710, 6511, 26711, 26715, 26713, 6512, 26714, 26718, 26716, 6513, + 26717, 26721, 26719, 6514, 26720, 26724, 26722, 6515, 26723, 26727, + 26725, 6516, 26726, 26730, 26728, 6517, 26729, 26733, 26731, 6518, 26732, + 26736, 26734, 6519, 26735, 26739, 26737, 6520, 26738, 26742, 26740, 6521, + 26741, 26745, 26743, 6522, 26744, 26748, 26746, 6523, 26747, 26751, + 26749, 6524, 26750, 26754, 26752, 6525, 26753, 26757, 26755, 4351, 26756, + 26760, 26758, 6526, 26759, 26763, 26761, 6527, 26762, 26766, 26764, 6528, + 26765, 26769, 26767, 6529, 26768, 26772, 26770, 6530, 26771, 26775, + 26773, 6531, 26774, 26778, 26776, 6532, 26777, 26781, 26779, 6533, 26780, + 26784, 26782, 6534, 26783, 26787, 26785, 6535, 26786, 26790, 26788, 6536, + 26789, 26793, 26791, 6537, 26792, 26796, 26794, 6538, 26795, 26799, + 26797, 6539, 26798, 26802, 26800, 6540, 26801, 26805, 26803, 6541, 26804, + 26808, 26806, 6542, 26807, 26811, 26809, 6543, 26810, 26814, 26812, 6544, + 26813, 26817, 26815, 6545, 26816, 26820, 26818, 6546, 26819, 26823, + 26821, 6547, 26822, 26826, 26824, 6548, 26825, 26829, 26827, 4350, 26828, + 26832, 26830, 6549, 26831, 26835, 26833, 6550, 26834, 26838, 26836, 6551, + 26837, 26841, 26839, 6552, 26840, 26844, 26842, 6553, 26843, 26847, + 26845, 6554, 26846, 26850, 26848, 6555, 26849, 26853, 26851, 6556, 26852, + 26856, 26854, 6557, 26855, 26859, 26857, 6558, 26858, 26862, 26860, 6559, + 26861, 26865, 26863, 6560, 26864, 26868, 26866, 6561, 26867, 26871, + 26869, 6562, 26870, 26874, 26872, 6563, 26873, 26877, 26875, 6564, 26876, + 26880, 26878, 6565, 26879, 26883, 26881, 6566, 26882, 26886, 26884, 6567, + 26885, 26889, 26887, 6568, 26888, 26892, 26890, 6569, 26891, 26895, + 26893, 6570, 26894, 26898, 26896, 6571, 26897, 26901, 26899, 4349, 26900, + 26904, 26902, 6572, 26903, 26907, 26905, 6573, 26906, 26910, 26908, 6574, + 26909, 26913, 26911, 6575, 26912, 26916, 26914, 6576, 26915, 26919, + 26917, 6577, 26918, 26922, 26920, 6578, 26921, 26925, 26923, 6579, 26924, + 26928, 26926, 6580, 26927, 26931, 26929, 6581, 26930, 26934, 26932, 6582, + 26933, 26937, 26935, 6583, 26936, 26940, 26938, 6584, 26939, 26943, + 26941, 6585, 26942, 26946, 26944, 6586, 26945, 26949, 26947, 6587, 26948, + 26952, 26950, 6588, 26951, 26955, 26953, 6589, 26954, 26958, 26956, 6590, + 26957, 26961, 26959, 6591, 26960, 26964, 26962, 6592, 26963, 26967, + 26965, 6593, 26966, 26970, 26968, 6594, 26969, 26973, 26971, 4348, 26972, + 26976, 26974, 6595, 26975, 26979, 26977, 6596, 26978, 26982, 26980, 6597, + 26981, 26985, 26983, 6598, 26984, 26988, 26986, 6599, 26987, 26991, + 26989, 6600, 26990, 26994, 26992, 6601, 26993, 26997, 26995, 6602, 26996, + 27000, 26998, 6603, 26999, 27003, 27001, 6604, 27002, 27006, 27004, 6605, + 27005, 27009, 27007, 6606, 27008, 27012, 27010, 6607, 27011, 27015, + 27013, 6608, 27014, 27018, 27016, 6609, 27017, 27021, 27019, 6610, 27020, + 27024, 27022, 6611, 27023, 27027, 27025, 6612, 27026, 27030, 27028, 6613, + 27029, 27033, 27031, 6614, 27032, 27036, 27034, 6615, 27035, 27039, + 27037, 6616, 27038, 27042, 27040, 6617, 27041, 27045, 27043, 4347, 27044, + 27048, 27046, 6618, 27047, 27051, 27049, 6619, 27050, 27054, 27052, 6620, + 27053, 27057, 27055, 6621, 27056, 27060, 27058, 6622, 27059, 27063, + 27061, 6623, 27062, 27066, 27064, 6624, 27065, 27069, 27067, 6625, 27068, + 27072, 27070, 6626, 27071, 27075, 27073, 6627, 27074, 27078, 27076, 6628, + 27077, 27081, 27079, 6629, 27080, 27084, 27082, 6630, 27083, 27087, + 27085, 6631, 27086, 27090, 27088, 6632, 27089, 27093, 27091, 6633, 27092, + 27096, 27094, 6634, 27095, 27099, 27097, 6635, 27098, 27102, 27100, 6636, + 27101, 27105, 27103, 6637, 27104, 27108, 27106, 6638, 27107, 27111, + 27109, 6639, 27110, 27114, 27112, 6640, 27113, 27117, 27115, 4346, 27116, + 27120, 27118, 6641, 27119, 27123, 27121, 6642, 27122, 27126, 27124, 6643, + 27125, 27129, 27127, 6644, 27128, 27132, 27130, 6645, 27131, 27135, + 27133, 6646, 27134, 27138, 27136, 6647, 27137, 27141, 27139, 6648, 27140, + 27144, 27142, 6649, 27143, 27147, 27145, 6650, 27146, 27150, 27148, 6651, + 27149, 27153, 27151, 6652, 27152, 27156, 27154, 6653, 27155, 27159, + 27157, 6654, 27158, 27162, 27160, 6655, 27161, 27165, 27163, 6656, 27164, + 27168, 27166, 6657, 27167, 27171, 27169, 6658, 27170, 27174, 27172, 6659, + 27173, 27177, 27175, 6660, 27176, 27180, 27178, 6661, 27179, 27183, + 27181, 6662, 27182, 27186, 27184, 6663, 27185, 27189, 27187, 4345, 27188, + 27192, 27190, 6664, 27191, 27195, 27193, 6665, 27194, 27198, 27196, 6666, + 27197, 27201, 27199, 6667, 27200, 27204, 27202, 6668, 27203, 27207, + 27205, 6669, 27206, 27210, 27208, 6670, 27209, 27213, 27211, 6671, 27212, + 27216, 27214, 6672, 27215, 27219, 27217, 6673, 27218, 27222, 27220, 6674, + 27221, 27225, 27223, 6675, 27224, 27228, 27226, 6676, 27227, 27231, + 27229, 6677, 27230, 27234, 27232, 6678, 27233, 27237, 27235, 6679, 27236, + 27240, 27238, 6680, 27239, 27243, 27241, 6681, 27242, 27246, 27244, 6682, + 27245, 27249, 27247, 6683, 27248, 27252, 27250, 6684, 27251, 27255, + 27253, 6685, 27254, 27258, 27256, 6686, 27257, 27261, 27259, 4344, 27260, + 27264, 27262, 6687, 27263, 27267, 27265, 6688, 27266, 27270, 27268, 6689, + 27269, 27273, 27271, 6690, 27272, 27276, 27274, 6691, 27275, 27279, + 27277, 6692, 27278, 27282, 27280, 6693, 27281, 27285, 27283, 6694, 27284, + 27288, 27286, 6695, 27287, 27291, 27289, 6696, 27290, 27294, 27292, 6697, + 27293, 27297, 27295, 6698, 27296, 27300, 27298, 6699, 27299, 27303, + 27301, 6700, 27302, 27306, 27304, 6701, 27305, 27309, 27307, 6702, 27308, + 27312, 27310, 6703, 27311, 27315, 27313, 6704, 27314, 27318, 27316, 6705, + 27317, 27321, 27319, 6706, 27320, 27324, 27322, 6707, 27323, 27327, + 27325, 6708, 27326, 27330, 27328, 6709, 27329, 27333, 27331, 4343, 27332, + 27336, 27334, 6710, 27335, 27339, 27337, 6711, 27338, 27342, 27340, 6712, + 27341, 27345, 27343, 6713, 27344, 27348, 27346, 6714, 27347, 27351, + 27349, 6715, 27350, 27354, 27352, 6716, 27353, 27357, 27355, 6717, 27356, + 27360, 27358, 6718, 27359, 27363, 27361, 6719, 27362, 27366, 27364, 6720, + 27365, 27369, 27367, 6721, 27368, 27372, 27370, 6722, 27371, 27375, + 27373, 6723, 27374, 27378, 27376, 6724, 27377, 27381, 27379, 6725, 27380, + 27384, 27382, 6726, 27383, 27387, 27385, 6727, 27386, 27390, 27388, 6728, + 27389, 27393, 27391, 6729, 27392, 27396, 27394, 6730, 27395, 27399, + 27397, 6731, 27398, 27402, 27400, 6732, 27401, 27405, 27403, 4342, 27404, + 27408, 27407, 27411, 27410, 27414, 27413, 27417, 27416, 27420, 27419, + 27423, 27422, 27426, 27425, 27429, 27428, 27432, 27431, 27435, 27434, + 27438, 27437, 27441, 27440, 27444, 27443, 27447, 27446, 27450, 27449, + 27453, 27452, 27456, 27455, 27459, 27458, 27462, 27461, 27465, 27464, + 27468, 27467, 27471, 27470, 27474, 27473, 27477, 27476 ; +} diff --git a/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzal2019/mesh/helmholtz-mesh.jou b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/mesh/helmholtz-mesh.jou similarity index 100% rename from packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzal2019/mesh/helmholtz-mesh.jou rename to packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/mesh/helmholtz-mesh.jou diff --git a/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzal2019/obj_helmholtz.hpp b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/obj_helmholtz.hpp similarity index 100% rename from packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzal2019/obj_helmholtz.hpp rename to packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/obj_helmholtz.hpp diff --git a/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzal2019/pde_helmholtz_imag.hpp b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/pde_helmholtz_imag.hpp similarity index 99% rename from packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzal2019/pde_helmholtz_imag.hpp rename to packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/pde_helmholtz_imag.hpp index bb6f4d286038..8512bafb3d14 100644 --- a/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzal2019/pde_helmholtz_imag.hpp +++ b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/pde_helmholtz_imag.hpp @@ -131,7 +131,6 @@ class PDE_Helmholtz_Imag : public PDE { int c = fe_->gradN()->dimension(0); int f = fe_->gradN()->dimension(1); int p = fe_->gradN()->dimension(2); - int d = fe_->gradN()->dimension(3); // Initialize residuals. res = ROL::makePtr>(c,f); // Evaluate/interpolate finite element fields on cells. diff --git a/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzal2019/pde_helmholtz_real.hpp b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/pde_helmholtz_real.hpp similarity index 100% rename from packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzal2019/pde_helmholtz_real.hpp rename to packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/pde_helmholtz_real.hpp diff --git a/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/prdw.m b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/prdw.m new file mode 100644 index 000000000000..00820875ff92 --- /dev/null +++ b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/prdw.m @@ -0,0 +1,48 @@ +function [y] = prdw( x, usr_par) +% +% compute and/or apply a perturbed Rees-Dollar-Wathen KKT preconditioner +% + + global GLB_PROB; + + nu = GLB_PROB.nu; + nz = GLB_PROB.nz; + + beta = GLB_PROB.beta; + K = GLB_PROB.K; + M = GLB_PROB.M; + C = GLB_PROB.C; + R = GLB_PROB.R; + J = GLB_PROB.J; + A1 = K; + + A2 = ctranspose(A1); + + perturb = min(1e-4, beta); + + y = zeros(size(x)); + + if (GLB_PROB.reuse_factors) + if (~GLB_PROB.factors_computed) + fprintf(" Computing factors (to be reused) ...\n "); + tic + [GLB_PROB.LC, GLB_PROB.UC, GLB_PROB.PC, GLB_PROB.QC] = lu(C+perturb*M); + [GLB_PROB.LR, GLB_PROB.UR, GLB_PROB.PR, GLB_PROB.QR] = lu(R); + [GLB_PROB.LA1, GLB_PROB.UA1, GLB_PROB.PA1, GLB_PROB.QA1] = lu(A1); + %[GLB_PROB.LA2, GLB_PROB.UA2, GLB_PROB.PA2, GLB_PROB.QA2] = lu(A2); + toc + GLB_PROB.factors_computed = true; + end + y(1:nu) = GLB_PROB.QC * (GLB_PROB.UC \ (GLB_PROB.LC \ (GLB_PROB.PC * x(1:nu)))); + y(nu+1:nu+nz) = (1/beta) * ( GLB_PROB.QR * (GLB_PROB.UR \ (GLB_PROB.LR \ (GLB_PROB.PR * x(nu+1:nu+nz)))) ); + tmp = (C+perturb*M) * ( GLB_PROB.QA1 * (GLB_PROB.UA1 \ (GLB_PROB.LA1 \ (GLB_PROB.PA1 * x(nu+nz+1:end)))) ); + y(nu+nz+1:end) = GLB_PROB.PA1' * (GLB_PROB.LA1' \ (GLB_PROB.UA1' \ (GLB_PROB.QA1' * tmp))); + else + y(1:nu) = (C+perturb*M) \ x(1:nu); + y(nu+1:nu+nz) = (1/beta) * (R \ x(nu+1:nu+nz)); + y(nu+nz+1:end) = A2 \ ((C+perturb*M) * (A1 \ x(nu+nz+1:end))); + end + + GLB_PROB.ct = GLB_PROB.ct + 1; + +end % function prdw diff --git a/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/results/README.md b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/results/README.md new file mode 100644 index 000000000000..09e92f22c05b --- /dev/null +++ b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/results/README.md @@ -0,0 +1 @@ +The results are output in this directory. diff --git a/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/run.m b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/run.m new file mode 100644 index 000000000000..1602c69f3d14 --- /dev/null +++ b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/run.m @@ -0,0 +1,257 @@ +%% function [niter] = run(beta,wave,fullObs,fullCtrl,solver) +%% Inputs: beta - control penalty parameter +%% wave - wavenumber +%% fullObs - enable full observations, true/false +%% fullCtrl - enable full controls, true/false +%% solver - solver: +%% 'DIRECT' for direct KKT solve +%% 'PRDW' for (perturbed) Rees-Dollar-Wathen preconditioner with SYMMLQ +%% 'IMSHIFT' for imaginary shift preconditioner with SYMMLQ +%% Output: niter - number of solver iterations +function [niter,sol] = run(beta,wave,fullObs,fullCtrl,solver) + +% Global data structure. +global GLB_PROB; + +% Solver tolerance. +tol = min(1e-4, 0.1*beta*wave^2/(1+wave^2)); + +% Solver maximum number of iterations and Krylov subspace size. +maxit = 600; + +% Plot solution? +iplot = false; + +% Print output? +iprint = true; + +force_full_obs = fullObs; +force_full_ctrl = fullCtrl; +compute_reference = false; +GLB_PROB.reuse_factors = true; + +% +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%% Load matrices from files %%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +if iprint, fprintf('Reading problem matrices from file ...\n'), end; + +Adata = importdata('Amatrix.txt',' ',2); Adata = Adata.data; +Amat = sparse(Adata(:,1),Adata(:,2),Adata(:,3)); +[s1,s2] = size(Amat); +clear Adata; +if iprint, fprintf('A matrix is %d by %d.\n', s1, s2), end; +m = s1; + +Bdata = importdata('Bmatrix.txt',' ',2); Bdata = Bdata.data; +Bmat = sparse(Bdata(:,1),Bdata(:,2),Bdata(:,3)); +[s1,s2] = size(Bmat); +clear Bdata; +if iprint, fprintf('B matrix is %d by %d.\n', s1, s2), end; + +Ldata = importdata('Lmatrix.txt',' ',2); Ldata = Ldata.data; +Lmat = sparse(Ldata(:,1),Ldata(:,2),Ldata(:,3)); +nzcols = any(Lmat,1); +ctrlIdx = find(nzcols)'; +Lmat(:, ~any(Lmat,1)) = []; % remove zero columns +[s1,s2] = size(Lmat); +clear Ldata; +if iprint, fprintf('L matrix is %d by %d.\n', s1, s2), end; +n = s2; + +Cdata = importdata('Cmatrix.txt',' ',2); Cdata = Cdata.data; +Cmat = sparse(Cdata(:,1),Cdata(:,2),Cdata(:,3)); +[s1,s2] = size(Cmat); +clear Cdata; +if iprint, fprintf('C matrix is %d by %d.\n', s1, s2), end; + +Rdata = importdata('Rmatrix.txt',' ',2); Rdata = Rdata.data; +Rmat = sparse(Rdata(:,1),Rdata(:,2),Rdata(:,3)); +Jmat = Rmat; +Rmat(:, ~any(Rmat,1)) = []; % remove zero columns +Rmat(~any(Rmat,2), :) = []; % remove zero rows +[s1,s2] = size(Rmat); +clear Rdata; +if iprint, fprintf('R matrix is %d by %d.\n', s1, s2), end; + +Mdata = importdata('Mmatrix.txt',' ',2); Mdata = Mdata.data; +Mmat = sparse(Mdata(:,1),Mdata(:,2),Mdata(:,3)); +[s1,s2] = size(Mmat); +clear Mdata; +if iprint, fprintf('M matrix is %d by %d.\n', s1, s2), end; + +if (force_full_obs) + Cmat = Mmat; +end + +if (force_full_ctrl) + Rmat = Mmat; + Lmat = Mmat; + n = m; + ctrlIdx = [1:m]'; +end + +wrvec = importdata('WRvector.txt',' ',2); wrvec = wrvec.data; +wivec = importdata('WIvector.txt',' ',2); wivec = wivec.data; + +% +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%% Build optimality system %%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +Kmat = Amat - sqrt(-1)*Bmat; + +kkt = [ Cmat sparse(m,n) Kmat'; + sparse(n,m) beta*Rmat Lmat'; + Kmat Lmat sparse(m,m) ]; + +w = wrvec + sqrt(-1)*wivec; +rhs = [ w; + zeros(n,1); + zeros(m,1)]; + +GLB_PROB.ct = 0; +GLB_PROB.beta = beta; +GLB_PROB.nu = m; +GLB_PROB.nz = n; +GLB_PROB.K = Kmat; +GLB_PROB.C = Cmat; +GLB_PROB.R = Rmat; +GLB_PROB.J = Jmat; +GLB_PROB.M = Mmat; +GLB_PROB.L = Lmat; + +% +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%% Solve optimality system %%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +GLB_PROB.factors_computed = false; + +if compute_reference + fprintf("\nComputing reference solution using backslash...\n"); + tic + ref_sol = kkt \ rhs; + toc + ref_z = ref_sol(m+1:m+n, 1); +end + +if (strcmp(lower(solver),'direct')) + + fprintf("\nComputing direct solution using backslash...\n"); + tic + sol = kkt \ rhs; + toc + +elseif (strcmp(lower(solver),'imshift') || strcmp(lower(solver),'prdw')) + + fprintf("\nComputing solution using iterative solver ...\n"); + + % Set initial guess. + t0 = zeros(2*m+n,1); + + % Choose method. + if strcmp(lower(solver),'imshift') + prec = @imshift; + else + prec = @prdw; + end + + % MATLAB's SYMMLQ + myprec = prec; + tic + [sol, flag, relres, niter, resvec] ... + = symmlq(kkt, rhs, tol, maxit, myprec, [], t0, GLB_PROB); + fprintf("\n"); + toc + + if iplot + semilogy(resvec/resvec(1), 'LineWidth', 2) + end + % Compute final relative residual and control error, if enabled. + fprintf('Relative residual = %12.10e\n', norm(kkt*sol - rhs)/norm(rhs)); + if compute_reference + fprintf('Relative control error = %12.10e\n', norm(sol(m+1:m+n, 1) - ref_z)/norm(ref_z)); + end + +end + +% +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%% Plot optimal solution %%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +if (iplot) + + adj = load('cell_to_node_quad.txt') + 1; %% load node adjacency, increment by 1 for 1-based indexing + nodes = load('nodes.txt'); %% load node coordinates + map = importdata('map.txt'); + map = map.data(1:2:end)+1; + [tmp, perm] = sort(map); + sol_plot = NaN(3*m, 1)+sqrt(-1)*NaN(3*m, 1); + sol_plot(1:m, 1) = sol(1:m, 1); + sol_plot(m+ctrlIdx, 1) = sol(m+1:m+n, 1); + sol_plot(2*m+1:end, 1) = sol(m+n+1:end, 1); + u = sol_plot(1:m); + u = u(perm); + z = sol_plot(m+1:2*m); + z = z(perm); + + figure, trisurf(adj, nodes(:,1), nodes(:,2), real(u)); + shading interp; + view(0,90) + axis('equal','tight'); + xlabel('x'); + ylabel('y'); + title('State: Real Part'); + axis square + x = 0; y = 0; r = 2; + hold on + th = [0:pi/50:2*pi]'; + xunit = r * cos(th) + x; + yunit = r * sin(th) + y; + h = plot3(xunit, yunit, 2*ones(size(xunit)), 'k-', 'LineWidth', 2); + hold off + + figure, trisurf(adj, nodes(:,1), nodes(:,2), imag(u)); + shading interp; + view(0,90) + axis('equal','tight'); + xlabel('x'); + ylabel('y'); + title('State: Imaginary Part'); + axis square + hold on + h = plot3(xunit, yunit, 2*ones(size(xunit)), 'k-', 'LineWidth', 2); + hold off + + figure, trisurf(adj, nodes(:,1), nodes(:,2), real(z)); + shading interp; + view(0,90) + axis('equal','tight'); + xlabel('x'); + ylabel('y'); + title('Control: Real Part'); + axis square + hold on + h = plot3(xunit, yunit, 2*ones(size(xunit)), 'k-', 'LineWidth', 2); + hold off + + figure, trisurf(adj, nodes(:,1), nodes(:,2), imag(z)); + shading interp; + view(0,90) + axis('equal','tight'); + xlabel('x'); + ylabel('y'); + title('Control: Imaginary Part'); + axis square + hold on + h = plot3(xunit, yunit, 2*ones(size(xunit)), 'k-', 'LineWidth', 2); + hold off + +end diff --git a/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/study.m b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/study.m new file mode 100644 index 000000000000..18fe5e159d02 --- /dev/null +++ b/packages/rol/example/PDE-OPT/published/Helmholtz_KouriRidzalTuminaro2020/study.m @@ -0,0 +1,38 @@ +clear all; + +mesh = 0; wave = 5; damp = 0; impd = 1; fullObs = false; fullCtrl = false; solver = 'PRDW'; +%% mesh = 0, 1, 2, 3, 4 is mesh resolution from coarsest to finest +%% NOTE: Meshes are available only for the cases 0 and 1 in the repository. +%% For finer meshes, consult the /mesh/README.md file. +%% wave = 5, 10, 20, 40, 80 is wavenumber +%% NOTE: The minimum mesh resolutions that support these wavenumbers +%% are 0, 1, 2, 3, and 4, respectively. +%% damp = 0, 1 is to turn off/on damping +%% impd = 0, 1 is to select reflective/radiating boundary conditions +%% fullObs = false, true is to force full state observations, i.e., everywhere in the domain +%% fullCtrl = false, true is to force distributed controls, i.e., everywhere in the domain +%% solver = 'DIRECT' for direct KKT solve +%% 'PRDW' for (perturbed) Rees-Dollar-Wathen preconditioner with SYMMLQ +%% 'IMSHIFT' for imaginary shift preconditioner with SYMMLQ + +file = ['input_mesh' int2str(mesh) '_wave' int2str(wave) '_damp' int2str(damp) '_imp' int2str(impd) '.xml']; +command = ['cp inputs/' file ' input_ex01.xml']; +fprintf('Executing system command: $ %s\n', command); +system(command); + +fprintf("\nGenerating matrix files ...\n"); +tic +!./ROL_example_PDE-OPT_published_Helmholtz_KouriRidzalTuminaro2020_example_01.exe +toc + +outfile = ['results/Results_' file] +fileID = fopen(outfile, 'w'); + +% Run study. +for i=0:6 + beta = 10^(-i) + niter = run(beta, wave, fullObs, fullCtrl, solver) + fprintf(fileID, '%e %d\n', beta, niter); +end + +fclose(fileID); diff --git a/packages/rol/src/function/objective/ROL_Objective.hpp b/packages/rol/src/function/objective/ROL_Objective.hpp index 688d392e8dd8..f97f81147cfc 100644 --- a/packages/rol/src/function/objective/ROL_Objective.hpp +++ b/packages/rol/src/function/objective/ROL_Objective.hpp @@ -294,15 +294,15 @@ class Objective { At each step of the sequence, the finite difference step size is decreased. The output compares the error \f[ - \left\| \frac{\nabla f(x+td) - \nabla f(x)}{t} - \nabla^2 f(x)d\right\|_{\mathcal{X}^*}. + \left\| \frac{\nabla f(x+tv) - \nabla f(x)}{t} - \nabla^2 f(x)v\right\|_{\mathcal{X}^*}, \f] if the approximation is first order. More generally, difference approximation is \f[ - \frac{1}{t} \sum\limits_{i=1}^m w_i \nabla f(x+t c_i d) + \frac{1}{t} \sum\limits_{i=1}^m w_i \nabla f(x+t c_i v), \f] where m = order+1, \f$w_i\f$ are the difference weights and \f$c_i\f$ are the difference steps @param[in] x is an optimization variable. - @param[in] d is a direction vector. + @param[in] v is a direction vector. @param[in] printToStream is a flag that turns on/off output. @param[out] outStream is the output stream. @param[in] numSteps is a parameter which dictates the number of finite difference steps. @@ -325,16 +325,16 @@ class Objective { At each step of the sequence, the finite difference step size is decreased. The output compares the error \f[ - \left\| \frac{\nabla f(x+td) - \nabla f(x)}{t} - \nabla^2 f(x)d\right\|_{\mathcal{X}^*}. + \left\| \frac{\nabla f(x+tv) - \nabla f(x)}{t} - \nabla^2 f(x)v\right\|_{\mathcal{X}^*}, \f] if the approximation is first order. More generally, difference approximation is \f[ - \frac{1}{t} \sum\limits_{i=1}^m w_i \nabla f(x+t c_i d) + \frac{1}{t} \sum\limits_{i=1}^m w_i \nabla f(x+t c_i v), \f] where m = order+1, \f$w_i\f$ are the difference weights and \f$c_i\f$ are the difference steps @param[in] x is an optimization variable. @param[in] hv is used to create temporary gradient and Hessian-times-vector vectors. - @param[in] d is a direction vector. + @param[in] v is a direction vector. @param[in] printToStream is a flag that turns on/off output. @param[out] outStream is the output stream. @param[in] numSteps is a parameter which dictates the number of finite difference steps. @@ -355,15 +355,15 @@ class Objective { At each step of the sequence, the finite difference step size is decreased. The output compares the error \f[ - \left\| \frac{\nabla f(x+td) - \nabla f(x)}{t} - \nabla^2 f(x)d\right\|_{\mathcal{X}^*}. + \left\| \frac{\nabla f(x+tv) - \nabla f(x)}{t} - \nabla^2 f(x)v\right\|_{\mathcal{X}^*}, \f] if the approximation is first order. More generally, difference approximation is \f[ - \frac{1}{t} \sum\limits_{i=1}^m w_i \nabla f(x+t c_i d) + \frac{1}{t} \sum\limits_{i=1}^m w_i \nabla f(x+t c_i v), \f] where m = order+1, \f$w_i\f$ are the difference weights and \f$c_i\f$ are the difference steps @param[in] x is an optimization variable. - @param[in] d is a direction vector. + @param[in] v is a direction vector. @param[in] steps is vector of steps of user-specified size. @param[in] printToStream is a flag that turns on/off output. @param[out] outStream is the output stream. @@ -386,16 +386,16 @@ class Objective { At each step of the sequence, the finite difference step size is decreased. The output compares the error \f[ - \left\| \frac{\nabla f(x+td) - \nabla f(x)}{t} - \nabla^2 f(x)d\right\|_{\mathcal{X}^*}. + \left\| \frac{\nabla f(x+tv) - \nabla f(x)}{t} - \nabla^2 f(x)v\right\|_{\mathcal{X}^*}, \f] if the approximation is first order. More generally, difference approximation is \f[ - \frac{1}{t} \sum\limits_{i=1}^m w_i \nabla f(x+t c_i d) + \frac{1}{t} \sum\limits_{i=1}^m w_i \nabla f(x+t c_i v), \f] where m = order+1, \f$w_i\f$ are the difference weights and \f$c_i\f$ are the difference steps @param[in] x is an optimization variable. @param[in] hv is used to create temporary gradient and Hessian-times-vector vectors. - @param[in] d is a direction vector. + @param[in] v is a direction vector. @param[in] steps is vector of steps of user-specified size. @param[in] printToStream is a flag that turns on/off output. @param[out] outStream is the output stream. diff --git a/packages/seacas/.clang-format b/packages/seacas/.clang-format index f9f15a8f246d..ba0e6b3a46fc 100644 --- a/packages/seacas/.clang-format +++ b/packages/seacas/.clang-format @@ -20,7 +20,7 @@ AlwaysBreakBeforeMultilineStrings: false AlwaysBreakTemplateDeclarations: false BinPackArguments: true BinPackParameters: true -BraceWrapping: +BraceWrapping: AfterClass: true AfterControlStatement: false AfterEnum: false @@ -48,7 +48,7 @@ DerivePointerAlignment: false DisableFormat: false ExperimentalAutoDetectBinPacking: false ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH ] -IncludeCategories: +IncludeCategories: - Regex: '^"(llvm|llvm-c|clang|clang-c)/' Priority: 2 - Regex: '^(<|"(gtest|isl|json)/)' diff --git a/packages/seacas/IossProperties.md b/packages/seacas/IossProperties.md index c4105ec8d2f5..9063b5f13363 100644 --- a/packages/seacas/IossProperties.md +++ b/packages/seacas/IossProperties.md @@ -1,7 +1,7 @@ ## Copyright(C) 1999-2020 National Technology & Engineering Solutions ## of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with ## NTESS, the U.S. Government retains certain rights in this software. -## +## ## See packages/seacas/LICENSE for details ## General Properties diff --git a/packages/seacas/Jamfile b/packages/seacas/Jamfile index aac73c6fe405..13446c50b6c4 100644 --- a/packages/seacas/Jamfile +++ b/packages/seacas/Jamfile @@ -2,7 +2,7 @@ # Copyright(C) 1999-2020 National Technology & Engineering Solutions # of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with # NTESS, the U.S. Government retains certain rights in this software. -# +# # See packages/seacas/LICENSE for details #--------------------------------------------------------------- diff --git a/packages/seacas/MAPVAR.md b/packages/seacas/MAPVAR.md index da3902229ec7..87a284d380bd 100644 --- a/packages/seacas/MAPVAR.md +++ b/packages/seacas/MAPVAR.md @@ -3,9 +3,9 @@ variable interpolation *ever* worked in the past. It looks totally wrong and I can understand why it isn’t working now; I just can't understand how it ever worked correctly for multi-element block models. - + As I see it, it does the following for the interpolation: - + * For all blocks * For all time steps @@ -19,26 +19,26 @@ As I see it, it does the following for the interpolation: * For all element variables * Iterate all elements in this block; map from A->B * Write values for all elements in this block at this step for this variable - + This works for element variables since the exodus API can output elements a block and variable at a time. For nodes, it doesn't work and you will end up with the values at the last step for all nodes/variables except for nodes which are only in the last element block which seems to be what you are seeing. - + Fixing this would be a major undertaking and I'm not sure it would get prioritized (although you are welcome to try). - + This *should* work OK if you only do a single timestep or if you only have a single element block. With a single timestep and multiple element blocks, there is an issue of what happens if the node is shared between multiple element blocks -- it will only get the interpolated value from the last block. - + Now, what to do... * I think that the Percept code can do some mapping from mesh to mesh... * Klugy, but can do a timestep at a time and then rejoin all timesteps using `conjoin` * Klugy, but can subset down to one block / mesh and then run mapvar on each submesh and then join using `ejoin` - + Sorry for the bearer of bad news, but hopefully there is a path to get done what you need... diff --git a/packages/seacas/NetCDF-Mapping.md b/packages/seacas/NetCDF-Mapping.md index b953b7e872d0..08756f555619 100644 --- a/packages/seacas/NetCDF-Mapping.md +++ b/packages/seacas/NetCDF-Mapping.md @@ -1,7 +1,7 @@ # Copyright(C) 1999-2020 National Technology & Engineering Solutions # of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with # NTESS, the U.S. Government retains certain rights in this software. -# +# # See packages/seacas/LICENSE for details # Mapping of exodus entities onto NetCDF diff --git a/packages/seacas/README.md b/packages/seacas/README.md index b3b0f1f385cf..3bde8d877b96 100644 --- a/packages/seacas/README.md +++ b/packages/seacas/README.md @@ -1,7 +1,7 @@ # Copyright(C) 1999-2020 National Technology & Engineering Solutions # of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with # NTESS, the U.S. Government retains certain rights in this software. -# +# # See packages/seacas/LICENSE for details # SEACAS [[Documentation](http://gsjaardema.github.io/seacas/)] diff --git a/packages/seacas/applications/algebra/ag_addvar.f b/packages/seacas/applications/algebra/ag_addvar.f index 4e8c59b5a420..1d2d6d9f6fd9 100644 --- a/packages/seacas/applications/algebra/ag_addvar.f +++ b/packages/seacas/applications/algebra/ag_addvar.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE ADDVAR (NAMEQV, NVAR, TYPEQV, IDEQV, NINP, ILHS) diff --git a/packages/seacas/applications/algebra/ag_alias.blk b/packages/seacas/applications/algebra/ag_alias.blk index 5d222bd4724f..605051ae6272 100644 --- a/packages/seacas/applications/algebra/ag_alias.blk +++ b/packages/seacas/applications/algebra/ag_alias.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details PARAMETER (MAXALI=20, MAXALN=10) C --MAXALI - maximum number of aliases diff --git a/packages/seacas/applications/algebra/ag_alicmd.f b/packages/seacas/applications/algebra/ag_alicmd.f index 3f9a7e1e1478..48f3bee4f2a8 100644 --- a/packages/seacas/applications/algebra/ag_alicmd.f +++ b/packages/seacas/applications/algebra/ag_alicmd.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= @@ -26,7 +26,6 @@ SUBROUTINE ALICMD (INLINE, INTYP, CFIELD, IFIELD, NAMES, *) C -- Sets NUMALI, NAMALI, NIXALI, IXALI of /ALIAS../ C -- Uses NVARHI, NVARGL, NVARNP, NVAREL of /DBNUMS/ - include 'exodusII.inc' include 'ag_namlen.blk' diff --git a/packages/seacas/applications/algebra/ag_aparse.f b/packages/seacas/applications/algebra/ag_aparse.f index 39039eab7646..1ccd1e4c5c50 100644 --- a/packages/seacas/applications/algebra/ag_aparse.f +++ b/packages/seacas/applications/algebra/ag_aparse.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/algebra/ag_caltim.f b/packages/seacas/applications/algebra/ag_caltim.f index f8734358402c..a5a71900bdde 100644 --- a/packages/seacas/applications/algebra/ag_caltim.f +++ b/packages/seacas/applications/algebra/ag_caltim.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/algebra/ag_chkdis.f b/packages/seacas/applications/algebra/ag_chkdis.f index 0b91d5c736b0..497526ca9fce 100644 --- a/packages/seacas/applications/algebra/ag_chkdis.f +++ b/packages/seacas/applications/algebra/ag_chkdis.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE CHKDIS (NDIM, NAMECO, NVARNP, NAMENV, LN1, LN2) diff --git a/packages/seacas/applications/algebra/ag_chkerr.f b/packages/seacas/applications/algebra/ag_chkerr.f index 03706c010bb7..4f619d3f4814 100644 --- a/packages/seacas/applications/algebra/ag_chkerr.f +++ b/packages/seacas/applications/algebra/ag_chkerr.f @@ -1,19 +1,18 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= subroutine chkerr (routine, caller, ierr) C======================================================================= C Modified 9/13/95 for EXODUSIIV2 API calls -C + C This subroutine should be called after an EXODUSIIV2 subroutine has C been invoked. The arguments of this subroutine are as follows: C routine - IN - The exodusIIv2 subroutine C caller - IN - The subroutine invoking the exodusII call C ierr - IN - The error code returned from the exodusII call -C include 'exodusII.inc' diff --git a/packages/seacas/applications/algebra/ag_chkfnc.f b/packages/seacas/applications/algebra/ag_chkfnc.f index ac3022da6bfe..ee8dba44358b 100644 --- a/packages/seacas/applications/algebra/ag_chkfnc.f +++ b/packages/seacas/applications/algebra/ag_chkfnc.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/algebra/ag_chkpar.f b/packages/seacas/applications/algebra/ag_chkpar.f index e14eefc9610a..58eb63cf9f99 100644 --- a/packages/seacas/applications/algebra/ag_chkpar.f +++ b/packages/seacas/applications/algebra/ag_chkpar.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/algebra/ag_chksyn.f b/packages/seacas/applications/algebra/ag_chksyn.f index 81f3ca603771..cdf39b0faded 100644 --- a/packages/seacas/applications/algebra/ag_chksyn.f +++ b/packages/seacas/applications/algebra/ag_chksyn.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= @@ -98,37 +98,6 @@ SUBROUTINE CHKSYN (NINENT, IENTYP, CENTRY, RENTRY, NAMES, DATA OPSYM / ' +-*/^()=,' / C --Note first space to reserve index 1 for unary minus -C DATA (FNCNAM(I), FNCTYP(I), NPARM(I), FNCSTO(I), I = 1, 22) / -C 1 'AINT ',' ', 1,.FALSE., 'ANINT ',' ', 1,.FALSE., -C 2 'ABS ',' ', 1,.FALSE., 'MOD ',' ', 2,.FALSE., -C 3 'SIGN ',' ', 2,.FALSE., 'DIM ',' ', 2,.FALSE., -C 4 'MAX ',' ',-1,.FALSE., 'MIN ',' ',-1,.FALSE., -C 5 'SQRT ',' ', 1,.FALSE., 'EXP ',' ', 1,.FALSE., -C 6 'LOG ',' ', 1,.FALSE., 'LOG10 ',' ', 1,.FALSE., -C 7 'SIN ',' ', 1,.FALSE., 'COS ',' ', 1,.FALSE., -C 8 'TAN ',' ', 1,.FALSE., 'ASIN ',' ', 1,.FALSE., -C 9 'ACOS ',' ', 1,.FALSE., 'ATAN ',' ', 1,.FALSE., -C # 'ATAN2 ',' ', 2,.FALSE., 'SINH ',' ', 1,.FALSE., -C 1 'COSH ',' ', 1,.FALSE., 'TANH ',' ', 1,.FALSE. / -C DATA (FNCNAM(I), FNCTYP(I), NPARM(I), FNCSTO(I), I = 23, NUMFNC) / -C 1 'TMAG ',' ', 6,.FALSE., -C 2 'PMAX ',' ', 6,.FALSE., 'PMIN ',' ', 6,.FALSE., -C 3 'PMAX2 ',' ', 3,.FALSE., 'PMIN2 ',' ', 3,.FALSE., -C 4 'IFLZ ',' ', 3,.FALSE., 'IFEZ ',' ', 3,.FALSE., -C 5 'IFGZ ',' ', 3,.FALSE., -C 6 'SUM ','G', 1,.FALSE., -C 7 'SMAX ','G', 1,.TRUE., 'SMIN ','G', 1,.TRUE., -C 8 'ENVMAX ',' ', 1,.TRUE., 'ENVMIN ',' ', 1,.TRUE., -C 9 'UHIST ','H',-1,.FALSE., 'UGLOB ','G',-1,.FALSE., -C # 'UNODE ','N',-1,.FALSE., 'UELEM ','E',-1,.FALSE. / -C#????C Take out FNCOLD after the manual is prepared -C DATA (FNCOLD(I), FNCNEW(I), I = 1, 4) / -C 1 'ATN2 ','ATAN2 ', -C 2 'PMX2 ','PMAX2 ', 'PMN2 ','PMIN2 ', -C 3 ' ',' ' / -C Created new subroutine that fills the arrays with the above -C data. The should be compatible with both SGI and IBM - call infunc(nparm, fncold, fncnew) IF (FIRST) THEN @@ -596,7 +565,6 @@ SUBROUTINE CHKSYN (NINENT, IENTYP, CENTRY, RENTRY, NAMES, RETURN END - subroutine infunc(nparm, fncold, fncnew) C This subroutine was created in order to initialize parameters diff --git a/packages/seacas/applications/algebra/ag_cmdtim.f b/packages/seacas/applications/algebra/ag_cmdtim.f index ed240c0aeef3..21dc83208c2b 100644 --- a/packages/seacas/applications/algebra/ag_cmdtim.f +++ b/packages/seacas/applications/algebra/ag_cmdtim.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE CMDTIM (INLINE, VERB, IFLD, INTYP, CFIELD, IFIELD, diff --git a/packages/seacas/applications/algebra/ag_cnvnum.f b/packages/seacas/applications/algebra/ag_cnvnum.f index a885e1956cb8..1fee58898a38 100644 --- a/packages/seacas/applications/algebra/ag_cnvnum.f +++ b/packages/seacas/applications/algebra/ag_cnvnum.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/algebra/ag_comand.f b/packages/seacas/applications/algebra/ag_comand.f index 4337edd26da9..1e5e7c4b81da 100644 --- a/packages/seacas/applications/algebra/ag_comand.f +++ b/packages/seacas/applications/algebra/ag_comand.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE COMAND (A, INLINE, INTYP, CFIELD, IFIELD, RFIELD, diff --git a/packages/seacas/applications/algebra/ag_cpyvar.f b/packages/seacas/applications/algebra/ag_cpyvar.f index f91eafa59084..a7ac8a54eebb 100644 --- a/packages/seacas/applications/algebra/ag_cpyvar.f +++ b/packages/seacas/applications/algebra/ag_cpyvar.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/algebra/ag_dbase.blk b/packages/seacas/applications/algebra/ag_dbase.blk index 88618d9174b5..e838e0cac1c8 100644 --- a/packages/seacas/applications/algebra/ag_dbase.blk +++ b/packages/seacas/applications/algebra/ag_dbase.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /DBASE/ NDBIN, NDBOUT C --NDBIN - the input database diff --git a/packages/seacas/applications/algebra/ag_dbicon.f b/packages/seacas/applications/algebra/ag_dbicon.f index db43e217c14a..965111581e82 100644 --- a/packages/seacas/applications/algebra/ag_dbicon.f +++ b/packages/seacas/applications/algebra/ag_dbicon.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE DBICON (NDB, NDIM, NAMECO) diff --git a/packages/seacas/applications/algebra/ag_dbielb.f b/packages/seacas/applications/algebra/ag_dbielb.f index 0f53694a8e4a..492667154c31 100644 --- a/packages/seacas/applications/algebra/ag_dbielb.f +++ b/packages/seacas/applications/algebra/ag_dbielb.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE DBIELB (NDB, OPTION, NELBS, NELBE, IDELB, NUMELB, diff --git a/packages/seacas/applications/algebra/ag_dbinam.f b/packages/seacas/applications/algebra/ag_dbinam.f index ce095f8913fd..a8473240e406 100644 --- a/packages/seacas/applications/algebra/ag_dbinam.f +++ b/packages/seacas/applications/algebra/ag_dbinam.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE DBINAM (NDB, C, KNAMES, NVARGL, NVARNP, NVAREL, diff --git a/packages/seacas/applications/algebra/ag_dbiqa.f b/packages/seacas/applications/algebra/ag_dbiqa.f index 217a993910b8..51348199f889 100644 --- a/packages/seacas/applications/algebra/ag_dbiqa.f +++ b/packages/seacas/applications/algebra/ag_dbiqa.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE DBIQA (NDB, OPTION, NQAREC, QAREC, NINFO, INFO) diff --git a/packages/seacas/applications/algebra/ag_dbivtt.f b/packages/seacas/applications/algebra/ag_dbivtt.f index 7b3ca05d8ab7..f945fbf2ced0 100644 --- a/packages/seacas/applications/algebra/ag_dbivtt.f +++ b/packages/seacas/applications/algebra/ag_dbivtt.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE DBIVTT (NDB, ISEVOK, ITMP, NELBLK, NVAREL) diff --git a/packages/seacas/applications/algebra/ag_dblist.f b/packages/seacas/applications/algebra/ag_dblist.f index 02f4696bb8bc..4ae3d58c2a22 100644 --- a/packages/seacas/applications/algebra/ag_dblist.f +++ b/packages/seacas/applications/algebra/ag_dblist.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/algebra/ag_dbnumg.blk b/packages/seacas/applications/algebra/ag_dbnumg.blk index 188264e116c8..d19078e97f11 100644 --- a/packages/seacas/applications/algebra/ag_dbnumg.blk +++ b/packages/seacas/applications/algebra/ag_dbnumg.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /DBNUMG/ NUMNPS, LNPSNL, LNPSDF, NUMESS, LESSEL, LESSNL, * LESSDF diff --git a/packages/seacas/applications/algebra/ag_dbnumq.blk b/packages/seacas/applications/algebra/ag_dbnumq.blk index c1dd57a744b5..b7df9e011486 100644 --- a/packages/seacas/applications/algebra/ag_dbnumq.blk +++ b/packages/seacas/applications/algebra/ag_dbnumq.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /DBNUMQ/ EXODUS, NQAREC, NINFO LOGICAL EXODUS diff --git a/packages/seacas/applications/algebra/ag_dbnums.blk b/packages/seacas/applications/algebra/ag_dbnums.blk index b5926ef90086..5587bc6a0938 100644 --- a/packages/seacas/applications/algebra/ag_dbnums.blk +++ b/packages/seacas/applications/algebra/ag_dbnums.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /DBNUMS/ NDIM, NUMNP, NUMEL, NELBLK, & NVARHI, NVARGL, NVARNP, NVAREL, NSTEPS, diff --git a/packages/seacas/applications/algebra/ag_dboqa.f b/packages/seacas/applications/algebra/ag_dboqa.f index 49ad50618453..8ceb3b2c0fbb 100644 --- a/packages/seacas/applications/algebra/ag_dboqa.f +++ b/packages/seacas/applications/algebra/ag_dboqa.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE DBOQA (NDB, QAINFO, NQAREC, QAREC, NINFO, INFO) diff --git a/packages/seacas/applications/algebra/ag_dbout.blk b/packages/seacas/applications/algebra/ag_dbout.blk index 6623742c6573..ea32ea52d9d1 100644 --- a/packages/seacas/applications/algebra/ag_dbout.blk +++ b/packages/seacas/applications/algebra/ag_dbout.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /DBOUT/ NUMNPO, NUMELO, NELBO, & NNPSO, LNPSNO, NESSO, LESSEO, LESSNO, diff --git a/packages/seacas/applications/algebra/ag_dbpelb.f b/packages/seacas/applications/algebra/ag_dbpelb.f index 2f9272371ced..7614c78b9c3b 100644 --- a/packages/seacas/applications/algebra/ag_dbpelb.f +++ b/packages/seacas/applications/algebra/ag_dbpelb.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE DBPELB (OPTION, NELBLK, IDELB, NUMELB, NUMLNK, NUMATR, diff --git a/packages/seacas/applications/algebra/ag_dbpini.f b/packages/seacas/applications/algebra/ag_dbpini.f index 9819ec22f714..e290c4a9582d 100644 --- a/packages/seacas/applications/algebra/ag_dbpini.f +++ b/packages/seacas/applications/algebra/ag_dbpini.f @@ -1,10 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C$Id: dbpini.f,v 1.2 2001/06/26 17:38:54 gdsjaar Exp $ C======================================================================= SUBROUTINE DBPINI (OPTION, NDB, TITLE, NDIM, NUMNP, NUMEL, NELBLK, & NUMNPS, LNPSNL, LNPSDF, NUMESS, LESSEL, @@ -51,7 +50,6 @@ SUBROUTINE DBPINI (OPTION, NDB, TITLE, NDIM, NUMNP, NUMEL, NELBLK, LOGICAL ALL ALL = (OPTION .EQ. '*') - IF (ALL .OR. (INDEX (OPTION, 'I') .GT. 0)) THEN WRITE(*, 10000) ENDIF diff --git a/packages/seacas/applications/algebra/ag_dbpnam.f b/packages/seacas/applications/algebra/ag_dbpnam.f index d2a76ed7bbee..7de3432ec749 100644 --- a/packages/seacas/applications/algebra/ag_dbpnam.f +++ b/packages/seacas/applications/algebra/ag_dbpnam.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE DBPNAM (OPTION, NVARGL, NVARNP, NVAREL, diff --git a/packages/seacas/applications/algebra/ag_dbptim.f b/packages/seacas/applications/algebra/ag_dbptim.f index 32fa0ed634c7..2ec09cd0202a 100644 --- a/packages/seacas/applications/algebra/ag_dbptim.f +++ b/packages/seacas/applications/algebra/ag_dbptim.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE DBPTIM (OPTION, NSTEPS, TIMES) diff --git a/packages/seacas/applications/algebra/ag_dbtitl.blk b/packages/seacas/applications/algebra/ag_dbtitl.blk index 7d0bc7c88adf..5dcc0a45db46 100644 --- a/packages/seacas/applications/algebra/ag_dbtitl.blk +++ b/packages/seacas/applications/algebra/ag_dbtitl.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /DBTITL/ TITLE, TITLEO CHARACTER*80 TITLE, TITLEO diff --git a/packages/seacas/applications/algebra/ag_dbvini.f b/packages/seacas/applications/algebra/ag_dbvini.f index b1c78c430332..6deb3f88945b 100644 --- a/packages/seacas/applications/algebra/ag_dbvini.f +++ b/packages/seacas/applications/algebra/ag_dbvini.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE DBVINI (NVARGL, NVARNP, NVAREL) diff --git a/packages/seacas/applications/algebra/ag_dbws.blk b/packages/seacas/applications/algebra/ag_dbws.blk index ae46970dab96..dc1b117c66fa 100644 --- a/packages/seacas/applications/algebra/ag_dbws.blk +++ b/packages/seacas/applications/algebra/ag_dbws.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /DBWS/ CPUWS, IOWS INTEGER CPUWS, IOWS diff --git a/packages/seacas/applications/algebra/ag_dbxvar.blk b/packages/seacas/applications/algebra/ag_dbxvar.blk index 5996758e8327..9d209790cb47 100644 --- a/packages/seacas/applications/algebra/ag_dbxvar.blk +++ b/packages/seacas/applications/algebra/ag_dbxvar.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /DBXVAR/ ITIME, ICOBEG, ICOEND, & IGVBEG, IGVEND, INVBEG, INVEND, IEVBEG, IEVEND, diff --git a/packages/seacas/applications/algebra/ag_delcmd.f b/packages/seacas/applications/algebra/ag_delcmd.f index ecbecede4096..a33325a0d6a5 100644 --- a/packages/seacas/applications/algebra/ag_delcmd.f +++ b/packages/seacas/applications/algebra/ag_delcmd.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= @@ -63,7 +63,6 @@ SUBROUTINE DELCMD (INLINE, INTYP, CFIELD, *) END IF CALL FFADDC (NAME, INLINE) - 110 CONTINUE GOTO 100 END IF diff --git a/packages/seacas/applications/algebra/ag_dofnc1.f b/packages/seacas/applications/algebra/ag_dofnc1.f index e5b40352555b..f8ff09286dba 100644 --- a/packages/seacas/applications/algebra/ag_dofnc1.f +++ b/packages/seacas/applications/algebra/ag_dofnc1.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/algebra/ag_dofnc2.f b/packages/seacas/applications/algebra/ag_dofnc2.f index f489c5fedbbc..94e75fca1325 100644 --- a/packages/seacas/applications/algebra/ag_dofnc2.f +++ b/packages/seacas/applications/algebra/ag_dofnc2.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/algebra/ag_dofncg.f b/packages/seacas/applications/algebra/ag_dofncg.f index f91833d46c4c..d000c6c72bc5 100644 --- a/packages/seacas/applications/algebra/ag_dofncg.f +++ b/packages/seacas/applications/algebra/ag_dofncg.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/algebra/ag_doif.f b/packages/seacas/applications/algebra/ag_doif.f index b757777a2f64..a6193c32dd6b 100644 --- a/packages/seacas/applications/algebra/ag_doif.f +++ b/packages/seacas/applications/algebra/ag_doif.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/algebra/ag_dooper.f b/packages/seacas/applications/algebra/ag_dooper.f index 65d8152c5f10..1bed670cd461 100644 --- a/packages/seacas/applications/algebra/ag_dooper.f +++ b/packages/seacas/applications/algebra/ag_dooper.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/algebra/ag_ent.blk b/packages/seacas/applications/algebra/ag_ent.blk index 91642467fade..e6e121bf4e10 100644 --- a/packages/seacas/applications/algebra/ag_ent.blk +++ b/packages/seacas/applications/algebra/ag_ent.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /ENT/ NUMEQN, NUMENT(MAXEQN), INXENT(MAXENT,MAXEQN), & VALENT(MAXENT,MAXEQN), ITMENT(MAXENT,MAXEQN), diff --git a/packages/seacas/applications/algebra/ag_eqnlns.blk b/packages/seacas/applications/algebra/ag_eqnlns.blk index d322c6417f7a..5694f5c37fb0 100644 --- a/packages/seacas/applications/algebra/ag_eqnlns.blk +++ b/packages/seacas/applications/algebra/ag_eqnlns.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /EQNLNS/ EQNLIN(MAXEQN+1) CHARACTER*256 EQNLIN diff --git a/packages/seacas/applications/algebra/ag_eval.f b/packages/seacas/applications/algebra/ag_eval.f index f00324280ea4..840847781d2e 100644 --- a/packages/seacas/applications/algebra/ag_eval.f +++ b/packages/seacas/applications/algebra/ag_eval.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE EVAL (STEP1, WSTEP1, MAXNE, MAXSTK, @@ -76,7 +76,6 @@ SUBROUTINE EVAL (STEP1, WSTEP1, MAXNE, MAXSTK, CHARACTER*5 STRA INTEGER MERR - EXTERNAL MYSUM, MYMAX, MYMIN, MYSIGN, MYAMOD EXTERNAL myint, mynint, myabs, mydim, myexp, mylog, * mylog10, mysin, mycos, mytan, myasin, myacos, diff --git a/packages/seacas/applications/algebra/ag_filtel.f b/packages/seacas/applications/algebra/ag_filtel.f index 84a131b205ce..36316c239697 100644 --- a/packages/seacas/applications/algebra/ag_filtel.f +++ b/packages/seacas/applications/algebra/ag_filtel.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= @@ -167,7 +167,6 @@ SUBROUTINE FILTEL (IXELB, NUMLNK, LINK, VISELB, RETURN END - subroutine dolt(ibeg, iend, ixelem, values, valflt, numelo) integer ixelem(*) real values(*) diff --git a/packages/seacas/applications/algebra/ag_filter.blk b/packages/seacas/applications/algebra/ag_filter.blk index c892f1f3390c..1f6c42d71896 100644 --- a/packages/seacas/applications/algebra/ag_filter.blk +++ b/packages/seacas/applications/algebra/ag_filter.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /FILTER/ ISFILTER, IDXFLT, CMPFLT, VALFLT, TIMFLT LOGICAL ISFILTER diff --git a/packages/seacas/applications/algebra/ag_fixone.f b/packages/seacas/applications/algebra/ag_fixone.f index c2421a933082..df4b595035ed 100644 --- a/packages/seacas/applications/algebra/ag_fixone.f +++ b/packages/seacas/applications/algebra/ag_fixone.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE FIXONE (MAXNE, VARVAL) diff --git a/packages/seacas/applications/algebra/ag_fnctbc.blk b/packages/seacas/applications/algebra/ag_fnctbc.blk index da03e4a361c2..5e779440a543 100644 --- a/packages/seacas/applications/algebra/ag_fnctbc.blk +++ b/packages/seacas/applications/algebra/ag_fnctbc.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details PARAMETER (MAXFNC=50) PARAMETER (NUMFNC=39) diff --git a/packages/seacas/applications/algebra/ag_initim.f b/packages/seacas/applications/algebra/ag_initim.f index 475e93446a4d..4e25cd092750 100644 --- a/packages/seacas/applications/algebra/ag_initim.f +++ b/packages/seacas/applications/algebra/ag_initim.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/algebra/ag_isize.f b/packages/seacas/applications/algebra/ag_isize.f index b8585d008b26..2126687fa4d9 100644 --- a/packages/seacas/applications/algebra/ag_isize.f +++ b/packages/seacas/applications/algebra/ag_isize.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/algebra/ag_lnkfnc.f b/packages/seacas/applications/algebra/ag_lnkfnc.f index c385c4e74c9f..6db7c3098513 100644 --- a/packages/seacas/applications/algebra/ag_lnkfnc.f +++ b/packages/seacas/applications/algebra/ag_lnkfnc.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/algebra/ag_lnksto.f b/packages/seacas/applications/algebra/ag_lnksto.f index 94c10660c7b5..a252276cf9ea 100644 --- a/packages/seacas/applications/algebra/ag_lnksto.f +++ b/packages/seacas/applications/algebra/ag_lnksto.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/algebra/ag_lnkvar.f b/packages/seacas/applications/algebra/ag_lnkvar.f index 93b0bc297197..5e7d95a3d124 100644 --- a/packages/seacas/applications/algebra/ag_lnkvar.f +++ b/packages/seacas/applications/algebra/ag_lnkvar.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/algebra/ag_loceqv.f b/packages/seacas/applications/algebra/ag_loceqv.f index b927ad71617a..99293256ea14 100644 --- a/packages/seacas/applications/algebra/ag_loceqv.f +++ b/packages/seacas/applications/algebra/ag_loceqv.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/algebra/ag_locnam.f b/packages/seacas/applications/algebra/ag_locnam.f index 7f9f89ad59d4..2d55fa22076c 100644 --- a/packages/seacas/applications/algebra/ag_locnam.f +++ b/packages/seacas/applications/algebra/ag_locnam.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/algebra/ag_locrl.f b/packages/seacas/applications/algebra/ag_locrl.f index ef703a3b4088..9a66ab9e8f60 100644 --- a/packages/seacas/applications/algebra/ag_locrl.f +++ b/packages/seacas/applications/algebra/ag_locrl.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/algebra/ag_makevo.f b/packages/seacas/applications/algebra/ag_makevo.f index 28552074e5ab..58ee0381ab26 100644 --- a/packages/seacas/applications/algebra/ag_makevo.f +++ b/packages/seacas/applications/algebra/ag_makevo.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/algebra/ag_mlist.f b/packages/seacas/applications/algebra/ag_mlist.f index 8ee1a17d1214..d09f1f3fdcdf 100644 --- a/packages/seacas/applications/algebra/ag_mlist.f +++ b/packages/seacas/applications/algebra/ag_mlist.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details subroutine mlist() diff --git a/packages/seacas/applications/algebra/ag_myamod.f b/packages/seacas/applications/algebra/ag_myamod.f index 4b15dbeb3a04..9aa263368e56 100644 --- a/packages/seacas/applications/algebra/ag_myamod.f +++ b/packages/seacas/applications/algebra/ag_myamod.f @@ -1,13 +1,11 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -c $Id: myamod.f,v 1.3 2008/03/14 13:45:28 gdsjaar Exp $ C======================================================================= REAL FUNCTION MYAMOD (PARM1, PARM2) C======================================================================= -c C --*** MYAMOD *** (ALGEBRA) amod function C -- diff --git a/packages/seacas/applications/algebra/ag_mymax.f b/packages/seacas/applications/algebra/ag_mymax.f index 6bf849ee4d50..a884dbe06305 100644 --- a/packages/seacas/applications/algebra/ag_mymax.f +++ b/packages/seacas/applications/algebra/ag_mymax.f @@ -1,9 +1,8 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: mymax.f,v 1.5 2008/03/14 13:45:28 gdsjaar Exp $ C======================================================================= REAL FUNCTION MYMAX (PARM1, PARM2) C======================================================================= diff --git a/packages/seacas/applications/algebra/ag_mymin.f b/packages/seacas/applications/algebra/ag_mymin.f index c80c92cfd7f5..40d5ef2a7017 100644 --- a/packages/seacas/applications/algebra/ag_mymin.f +++ b/packages/seacas/applications/algebra/ag_mymin.f @@ -1,9 +1,8 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: mymin.f,v 1.5 2008/03/14 13:45:28 gdsjaar Exp $ C======================================================================= REAL FUNCTION MYMIN (PARM1, PARM2) C======================================================================= diff --git a/packages/seacas/applications/algebra/ag_mysign.f b/packages/seacas/applications/algebra/ag_mysign.f index 76d5dd61c2dc..042b6439d416 100644 --- a/packages/seacas/applications/algebra/ag_mysign.f +++ b/packages/seacas/applications/algebra/ag_mysign.f @@ -1,9 +1,8 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: mysign.f,v 1.4 2008/03/14 13:45:28 gdsjaar Exp $ C======================================================================= REAL FUNCTION MYSIGN (PARM1, PARM2) C======================================================================= diff --git a/packages/seacas/applications/algebra/ag_mysum.f b/packages/seacas/applications/algebra/ag_mysum.f index aee492773a34..cb4d594cdc64 100644 --- a/packages/seacas/applications/algebra/ag_mysum.f +++ b/packages/seacas/applications/algebra/ag_mysum.f @@ -1,9 +1,8 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: mysum.f,v 1.5 2008/03/14 13:45:28 gdsjaar Exp $ C======================================================================= REAL FUNCTION MYSUM (PARM1, PARM2) C======================================================================= diff --git a/packages/seacas/applications/algebra/ag_namlen.blk b/packages/seacas/applications/algebra/ag_namlen.blk index 3ad3d23d69f9..6eb8d3d0c5a8 100644 --- a/packages/seacas/applications/algebra/ag_namlen.blk +++ b/packages/seacas/applications/algebra/ag_namlen.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C -*- Mode: fortran -*- diff --git a/packages/seacas/applications/algebra/ag_numeqn.blk b/packages/seacas/applications/algebra/ag_numeqn.blk index 2a2ce84dd597..36f201565a7c 100644 --- a/packages/seacas/applications/algebra/ag_numeqn.blk +++ b/packages/seacas/applications/algebra/ag_numeqn.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details PARAMETER (MAXEQN=512, MAXENT=81) C --MAXEQN - maximum number of equations diff --git a/packages/seacas/applications/algebra/ag_nwhsel.f b/packages/seacas/applications/algebra/ag_nwhsel.f index 66a6856e8a30..56f5e8be6aad 100644 --- a/packages/seacas/applications/algebra/ag_nwhsel.f +++ b/packages/seacas/applications/algebra/ag_nwhsel.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/algebra/ag_nxttim.f b/packages/seacas/applications/algebra/ag_nxttim.f index 35bafc0f0a62..226d3e701f03 100644 --- a/packages/seacas/applications/algebra/ag_nxttim.f +++ b/packages/seacas/applications/algebra/ag_nxttim.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/algebra/ag_opnlog.f b/packages/seacas/applications/algebra/ag_opnlog.f index 63a412fc77e3..c2fb99146c5c 100644 --- a/packages/seacas/applications/algebra/ag_opnlog.f +++ b/packages/seacas/applications/algebra/ag_opnlog.f @@ -1,13 +1,12 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE OPNLOG (LOGU) C======================================================================= -C $Id: opnlog.f,v 1.8 2008/03/14 13:45:28 gdsjaar Exp $ C --*** OPNLOG *** (BLOT) Open log file and write header C -- Written by Amy Gilkey - revised 12/21/87 C -- diff --git a/packages/seacas/applications/algebra/ag_postfx.f b/packages/seacas/applications/algebra/ag_postfx.f index 91d8c243587f..aa81f021cfb9 100644 --- a/packages/seacas/applications/algebra/ag_postfx.f +++ b/packages/seacas/applications/algebra/ag_postfx.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/algebra/ag_princ3.f b/packages/seacas/applications/algebra/ag_princ3.f index 30f1058f497a..eec7a47b53e6 100644 --- a/packages/seacas/applications/algebra/ag_princ3.f +++ b/packages/seacas/applications/algebra/ag_princ3.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details SUBROUTINE PRINC3(SK1, SK2, SK3, SK4, SK5, SK6, EV, INFO) @@ -14,9 +14,9 @@ SUBROUTINE PRINC3(SK1, SK2, SK3, SK4, SK5, SK6, EV, INFO) SQRT3 = SQRT(3.0) INFO = 0 -C + C Find principal trial stresses and directions - -C + I1 = ( SK1 + SK2 + SK3 ) I2 = ( (SK1-SK2)**2 + (SK1-SK3)**2 + (SK2-SK3)**2 ) / 6.0 * + SK4**2 + SK5**2 + SK6**2 @@ -43,9 +43,9 @@ SUBROUTINE PRINC3(SK1, SK2, SK3, SK4, SK5, SK6, EV, INFO) COS3AL = SQRT3 * 1.5 * I3 / FI2 / SQRT(FI2) COS3AL = SIGN( MIN( 1.0, ABS(COS3AL) ),COS3AL ) -C + C ... TRIG FUNCTION USED -C + CALPHA = COS( ACOS(COS3AL) / 3.0) SALPHA = SQRT(1.0 - CALPHA**2) diff --git a/packages/seacas/applications/algebra/ag_progqa.blk b/packages/seacas/applications/algebra/ag_progqa.blk index 8558d59930ac..f181b7ee2790 100644 --- a/packages/seacas/applications/algebra/ag_progqa.blk +++ b/packages/seacas/applications/algebra/ag_progqa.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /PROGQA/ QAINFO(6) CHARACTER*(MXSTLN) QAINFO diff --git a/packages/seacas/applications/algebra/ag_prtdeb.f b/packages/seacas/applications/algebra/ag_prtdeb.f index f35c1d6e0ea3..eeb0f428e096 100644 --- a/packages/seacas/applications/algebra/ag_prtdeb.f +++ b/packages/seacas/applications/algebra/ag_prtdeb.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/algebra/ag_pxn.f b/packages/seacas/applications/algebra/ag_pxn.f index 5b9dc730cdaa..a05116122168 100644 --- a/packages/seacas/applications/algebra/ag_pxn.f +++ b/packages/seacas/applications/algebra/ag_pxn.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/algebra/ag_pxn2.f b/packages/seacas/applications/algebra/ag_pxn2.f index f51d817f0ad9..cb3d5f2e7322 100644 --- a/packages/seacas/applications/algebra/ag_pxn2.f +++ b/packages/seacas/applications/algebra/ag_pxn2.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/algebra/ag_qainfo.blk b/packages/seacas/applications/algebra/ag_qainfo.blk index 085ba2fde582..b4f916aedfd5 100644 --- a/packages/seacas/applications/algebra/ag_qainfo.blk +++ b/packages/seacas/applications/algebra/ag_qainfo.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C --QAINFO - the current program QA information: @@ -21,5 +21,4 @@ C -- (6) = time of current run QAINFO(2) = '2019/01/25 ' QAINFO(3) = ' 1.47 ' - c ------------------------.-. diff --git a/packages/seacas/applications/algebra/ag_rdeqns.f b/packages/seacas/applications/algebra/ag_rdeqns.f index 1e5b9c8fa88b..a119e85db474 100644 --- a/packages/seacas/applications/algebra/ag_rdeqns.f +++ b/packages/seacas/applications/algebra/ag_rdeqns.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE RDEQNS (A, C, NAMECO, BLKTYP, NAMES, QAREC, INFREC, @@ -123,7 +123,6 @@ SUBROUTINE RDEQNS (A, C, NAMECO, BLKTYP, NAMES, QAREC, INFREC, IDEFEV = 0 - CALL INILOG (NELBLK, .TRUE., SELELB) C --TIME is always an input variable @@ -398,7 +397,6 @@ SUBROUTINE RDEQNS (A, C, NAMECO, BLKTYP, NAMES, QAREC, INFREC, END IF END IF - C --Adjust the ISEVOK array length c CALL MDGET (NELBLK * MAXEV) CALL MDLONG ('ISEVOK', KIEVOK, NELBLK * MAXEV) diff --git a/packages/seacas/applications/algebra/ag_rdstep.f b/packages/seacas/applications/algebra/ag_rdstep.f index 5503f8d81c84..f075690c9647 100644 --- a/packages/seacas/applications/algebra/ag_rdstep.f +++ b/packages/seacas/applications/algebra/ag_rdstep.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE RDSTEP (ISTEP, TIME, NUMELB, IDELB, ISEVOK, diff --git a/packages/seacas/applications/algebra/ag_remel.f b/packages/seacas/applications/algebra/ag_remel.f index e64927ef842d..0dd3c46825d1 100644 --- a/packages/seacas/applications/algebra/ag_remel.f +++ b/packages/seacas/applications/algebra/ag_remel.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/algebra/ag_remove.blk b/packages/seacas/applications/algebra/ag_remove.blk index 4ef8e3211cfb..102f8a4ffe9f 100644 --- a/packages/seacas/applications/algebra/ag_remove.blk +++ b/packages/seacas/applications/algebra/ag_remove.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /REMOVE/ ISREMOVE, IDSGLOBAL, IDSREM, IRMCNT LOGICAL ISREMOVE, IDSGLOBAL diff --git a/packages/seacas/applications/algebra/ag_rweval.f b/packages/seacas/applications/algebra/ag_rweval.f index 51c5cc76b2ba..f762e5219edd 100644 --- a/packages/seacas/applications/algebra/ag_rweval.f +++ b/packages/seacas/applications/algebra/ag_rweval.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE RWEVAL (NDBIN, NDBOUT, A, ia, C, NPTIMS, NUMSTO, @@ -317,8 +317,8 @@ SUBROUTINE RWEVAL (NDBIN, NDBOUT, A, ia, C, NPTIMS, NUMSTO, RETURN END IF ELSE -C ... Even though there are no nodes in the node set, we have told the output -C database that there are (empty) node sets. We need to read and write +C ... Even though there are no nodes in the node set, we have told the output +C database that there are (empty) node sets. We need to read and write C the node set ids CALL EXGNSI (NDBIN, IA(KIDNS), IERR) END IF @@ -833,7 +833,6 @@ SUBROUTINE RWEVAL (NDBIN, NDBOUT, A, ia, C, NPTIMS, NUMSTO, * A(KIDELB), A(KIEVOK), A(KGVSCR), A(KVARSC), MERR) IF (MERR .EQ. 1) RETURN - C --Move the values for the current time step into locations for the C --last time step diff --git a/packages/seacas/applications/algebra/ag_rwmap.f b/packages/seacas/applications/algebra/ag_rwmap.f index 306e6fe7c4ef..7ec35932461f 100644 --- a/packages/seacas/applications/algebra/ag_rwmap.f +++ b/packages/seacas/applications/algebra/ag_rwmap.f @@ -1,14 +1,13 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE RWMAP (NDBIN, NDBOUT, NUMEL, NUMELO, IXELEM, & MAPEL, NEWIX) C======================================================================= -C $Id: rwmap.f,v 1.6 2009/04/24 22:26:53 gdsjaar Exp $ C --*** RWMAP *** (ALGEBRA) Read and write database element order map C -- Written by Amy Gilkey - revised 04/28/88 C -- Modified for EXODUSIIV2 format 8/29/95 diff --git a/packages/seacas/applications/algebra/ag_rwnmap.f b/packages/seacas/applications/algebra/ag_rwnmap.f index 486d2fa229d0..f4941955903a 100644 --- a/packages/seacas/applications/algebra/ag_rwnmap.f +++ b/packages/seacas/applications/algebra/ag_rwnmap.f @@ -1,14 +1,13 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE RWNMAP (NDBIN, NDBOUT, NUMNP, NUMNPO, IXNODE, & MAPND, NEWIX) C======================================================================= -C $Id: rwnmap.f,v 1.1 2009/04/24 22:28:49 gdsjaar Exp $ C --*** RWNMAP *** (ALGEBRA) Read and write database node number map C -- C -- diff --git a/packages/seacas/applications/algebra/ag_rwxyz.f b/packages/seacas/applications/algebra/ag_rwxyz.f index 3492d741e64b..757f89609825 100644 --- a/packages/seacas/applications/algebra/ag_rwxyz.f +++ b/packages/seacas/applications/algebra/ag_rwxyz.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE RWXYZ (NDBIN, NDBOUT, NDIM, NUMNP, NUMNPO, @@ -31,7 +31,6 @@ SUBROUTINE RWXYZ (NDBIN, NDBOUT, NDIM, NUMNP, NUMNPO, REAL CORD(NUMNP,NDIM) REAL CRDSCR(NUMNPO,NDIM) - if (ndim .eq. 2) then CALL EXGCOR(ndbin, cord(1,1), cord(1,2), rdum, ierr) else if (ndim .eq. 3) then diff --git a/packages/seacas/applications/algebra/ag_savcmd.f b/packages/seacas/applications/algebra/ag_savcmd.f index ce7f3f5a5de9..896f78d7a243 100644 --- a/packages/seacas/applications/algebra/ag_savcmd.f +++ b/packages/seacas/applications/algebra/ag_savcmd.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/algebra/ag_shotsp.f b/packages/seacas/applications/algebra/ag_shotsp.f index 66e7619fd71f..c89a92e9eaaa 100644 --- a/packages/seacas/applications/algebra/ag_shotsp.f +++ b/packages/seacas/applications/algebra/ag_shotsp.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/algebra/ag_show.f b/packages/seacas/applications/algebra/ag_show.f index 2943424daa8d..cba890460d20 100644 --- a/packages/seacas/applications/algebra/ag_show.f +++ b/packages/seacas/applications/algebra/ag_show.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE SHOW (TYPE, CMDTBL, NAMECO, BLKTYP, NAMES, TIMES, diff --git a/packages/seacas/applications/algebra/ag_shptim.f b/packages/seacas/applications/algebra/ag_shptim.f index cbd39e7fca09..b98aa7d982f3 100644 --- a/packages/seacas/applications/algebra/ag_shptim.f +++ b/packages/seacas/applications/algebra/ag_shptim.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE SHPTIM (NPTIMS, IPTIMS, TIMES) @@ -16,13 +16,12 @@ SUBROUTINE SHPTIM (NPTIMS, IPTIMS, TIMES) C -- NPTIMS - IN - the number of selected times C -- IPTIMS - IN - the selected time steps C -- TIMES - IN - the database times -C + C --Routines Called: C -- LENSTR - (STRLIB) Find string length C -- NUMSTR - (STRLIB) Convert numbers to engineering notation C -- SQZSTR - (STRLIB) Delete extra blanks from string - INTEGER NPTIMS INTEGER IPTIMS(*) REAL TIMES(*) diff --git a/packages/seacas/applications/algebra/ag_sordel.f b/packages/seacas/applications/algebra/ag_sordel.f index d100083fbc3c..20f299ff9188 100644 --- a/packages/seacas/applications/algebra/ag_sordel.f +++ b/packages/seacas/applications/algebra/ag_sordel.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/algebra/ag_sortid.f b/packages/seacas/applications/algebra/ag_sortid.f index 060ea32e2409..30c45b772ead 100644 --- a/packages/seacas/applications/algebra/ag_sortid.f +++ b/packages/seacas/applications/algebra/ag_sortid.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/algebra/ag_store.f b/packages/seacas/applications/algebra/ag_store.f index b33c4858f48d..7666df85dd8a 100644 --- a/packages/seacas/applications/algebra/ag_store.f +++ b/packages/seacas/applications/algebra/ag_store.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE STORE (ISTEP, TYP, IBEGIN, IEND, NWRDS, @@ -47,7 +47,6 @@ SUBROUTINE STORE (ISTEP, TYP, IBEGIN, IEND, NWRDS, INTEGER MERR MERR = 0 - C Read and store all global variables (if needed for the current step) IF (TYP .EQ. 'G') THEN IF (ISTVAR(ICURTM,IBEGIN) .NE. 0) THEN diff --git a/packages/seacas/applications/algebra/ag_svcord.f b/packages/seacas/applications/algebra/ag_svcord.f index a53fe766ca8c..0c815cda6451 100644 --- a/packages/seacas/applications/algebra/ag_svcord.f +++ b/packages/seacas/applications/algebra/ag_svcord.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/algebra/ag_times.blk b/packages/seacas/applications/algebra/ag_times.blk index 52769a7bc523..a99e2794c506 100644 --- a/packages/seacas/applications/algebra/ag_times.blk +++ b/packages/seacas/applications/algebra/ag_times.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /TIMES/ NPTIMS, TMIN, TMAX, DELT, NINTV, WHONLY LOGICAL WHONLY diff --git a/packages/seacas/applications/algebra/ag_tmag.f b/packages/seacas/applications/algebra/ag_tmag.f index 7b3998b5b561..bdc71671ba6d 100644 --- a/packages/seacas/applications/algebra/ag_tmag.f +++ b/packages/seacas/applications/algebra/ag_tmag.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/algebra/ag_uelem.f b/packages/seacas/applications/algebra/ag_uelem.f index d5927b6ade5c..ff7463c845e0 100644 --- a/packages/seacas/applications/algebra/ag_uelem.f +++ b/packages/seacas/applications/algebra/ag_uelem.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details SUBROUTINE UELEM (NPARM, MAXNE, STACK, NUMNP, NUMEL, *) diff --git a/packages/seacas/applications/algebra/ag_uglob.f b/packages/seacas/applications/algebra/ag_uglob.f index 1af8678eb300..ffdeb2af5bd9 100644 --- a/packages/seacas/applications/algebra/ag_uglob.f +++ b/packages/seacas/applications/algebra/ag_uglob.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details SUBROUTINE UGLOB (NPARM, MAXNE, STACK, NUMNP, NUMEL, *) diff --git a/packages/seacas/applications/algebra/ag_uhist.f b/packages/seacas/applications/algebra/ag_uhist.f index 56d0f9e8e892..3849b9bd865b 100644 --- a/packages/seacas/applications/algebra/ag_uhist.f +++ b/packages/seacas/applications/algebra/ag_uhist.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details SUBROUTINE UHIST (NPARM, MAXNE, STACK, NUMNP, NUMEL, *) diff --git a/packages/seacas/applications/algebra/ag_unode.f b/packages/seacas/applications/algebra/ag_unode.f index 5ce844011663..7c43ae459487 100644 --- a/packages/seacas/applications/algebra/ag_unode.f +++ b/packages/seacas/applications/algebra/ag_unode.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details SUBROUTINE UNODE (NPARM, MAXNE, STACK, NUMNP, NUMEL, *) diff --git a/packages/seacas/applications/algebra/ag_var.blk b/packages/seacas/applications/algebra/ag_var.blk index 72c1335ec903..e7222b026378 100644 --- a/packages/seacas/applications/algebra/ag_var.blk +++ b/packages/seacas/applications/algebra/ag_var.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details PARAMETER (MAXVAR=8192) C --MAXVAR - maximum number of all variables (input and LHS) diff --git a/packages/seacas/applications/algebra/ag_wconat.f b/packages/seacas/applications/algebra/ag_wconat.f index a3312bdfa08a..e16a4ab02dc6 100644 --- a/packages/seacas/applications/algebra/ag_wconat.f +++ b/packages/seacas/applications/algebra/ag_wconat.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= @@ -10,7 +10,6 @@ SUBROUTINE WCONAT (NDBOUT, NUMELB, NUMEBO, IEL, IXELEM, * BLKTYP, IDELB, NEWNOD, NODIX, LNSCR, ATRSCR) C======================================================================= -C C --*** WCONAT *** Write the element block connectivity and C -- attribute information to the output database file C -- WCONAT modified for EXODUSIIV2 8/29/95 diff --git a/packages/seacas/applications/algebra/ag_welb.f b/packages/seacas/applications/algebra/ag_welb.f index 926a95807f5b..a977c718b63f 100644 --- a/packages/seacas/applications/algebra/ag_welb.f +++ b/packages/seacas/applications/algebra/ag_welb.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE WELB (NDBOUT, NELBLK, VISELB, ALLELE, BLKTYP, @@ -152,7 +152,6 @@ SUBROUTINE WELB (NDBOUT, NELBLK, VISELB, ALLELE, BLKTYP, EBID = IDELB(IELB) NAEB = BLKTYP(IELB) - IF (ALLELE) THEN IXELB(IELB) = IXELB(IELB-1) + NELB IXELBO(IELB) = IXELBO(IELB-1) + NELB diff --git a/packages/seacas/applications/algebra/ag_wnam.f b/packages/seacas/applications/algebra/ag_wnam.f index 843ff9975fa5..b228b59e96c8 100644 --- a/packages/seacas/applications/algebra/ag_wnam.f +++ b/packages/seacas/applications/algebra/ag_wnam.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE WNAM (NDBOUT, NDIM, NELBLK, NELBO, VISELB, @@ -80,7 +80,6 @@ SUBROUTINE WNAM (NDBOUT, NDIM, NELBLK, NELBO, VISELB, end if END IF - IF ((NVAREO .GT. 0) .AND. (NELBLK .GT. 0)) THEN NO = 0 C Loop from 1 to number of element blocks diff --git a/packages/seacas/applications/algebra/ag_wrstep.f b/packages/seacas/applications/algebra/ag_wrstep.f index 9f7d933cc26a..fa9ab46409ba 100644 --- a/packages/seacas/applications/algebra/ag_wrstep.f +++ b/packages/seacas/applications/algebra/ag_wrstep.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE WRSTEP (NDBOUT, ISTEP, MAXNE, VARVAL, VISELB, @@ -54,7 +54,6 @@ SUBROUTINE WRSTEP (NDBOUT, ISTEP, MAXNE, VARVAL, VISELB, call exptim(ndbout, istep, VARVAL(IDVAR(ITIME), & ISTVAR(ICURTM,ITIME)), ierr) - C --Write global variables IF (JGVBEG .LE. JGVEND) THEN diff --git a/packages/seacas/applications/algebra/ag_zmess.f b/packages/seacas/applications/algebra/ag_zmess.f index 41272e9b44a0..536014e0c2d4 100644 --- a/packages/seacas/applications/algebra/ag_zmess.f +++ b/packages/seacas/applications/algebra/ag_zmess.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/algebra/ag_zmfixd.f b/packages/seacas/applications/algebra/ag_zmfixd.f index fdacb463b021..9a57ea078f06 100644 --- a/packages/seacas/applications/algebra/ag_zmfixd.f +++ b/packages/seacas/applications/algebra/ag_zmfixd.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/algebra/ag_zmnps.f b/packages/seacas/applications/algebra/ag_zmnps.f index c9a258ae5b10..4b5f347c5291 100644 --- a/packages/seacas/applications/algebra/ag_zmnps.f +++ b/packages/seacas/applications/algebra/ag_zmnps.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/algebra/ag_zoom.blk b/packages/seacas/applications/algebra/ag_zoom.blk index a51fff263f1f..214049029b50 100644 --- a/packages/seacas/applications/algebra/ag_zoom.blk +++ b/packages/seacas/applications/algebra/ag_zoom.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /ZOOM/ ISZOOM, ZOOMIN, ZMLIM(6) LOGICAL ISZOOM, ZOOMIN diff --git a/packages/seacas/applications/algebra/algebra.f b/packages/seacas/applications/algebra/algebra.f index 9f4e8de300d0..6bd610aba37d 100644 --- a/packages/seacas/applications/algebra/algebra.f +++ b/packages/seacas/applications/algebra/algebra.f @@ -1,12 +1,12 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= PROGRAM ALGEBRA2 C======================================================================= -C + C --This version of ALGEBRA will read and write EXODUSIIV2 database C --format files. Many changes have occurred since the first version C --of ALGEBRA. The original database files, genesis and exodusI @@ -15,7 +15,7 @@ PROGRAM ALGEBRA2 C --input database more than once in order to get the file pointer C --to the desired data. With random access files we are able to C --select what we want to read or write at anytime. -C + C *** ALGEBRA 2.02 *** C --*** ALGEBRA *** (ALGEBRA) Algebraic Database Manipulation Program C -- diff --git a/packages/seacas/applications/aprepro/CMakeLists.txt b/packages/seacas/applications/aprepro/CMakeLists.txt index 8f6aed9060f4..855a395bd8ec 100644 --- a/packages/seacas/applications/aprepro/CMakeLists.txt +++ b/packages/seacas/applications/aprepro/CMakeLists.txt @@ -1,7 +1,7 @@ # Copyright(C) 1999-2020 National Technology & Engineering Solutions # of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with # NTESS, the U.S. Government retains certain rights in this software. -# +# # See packages/seacas/LICENSE for details TRIBITS_SUBPACKAGE(Aprepro) diff --git a/packages/seacas/applications/aprepro/aprepro.C b/packages/seacas/applications/aprepro/aprepro.C index 6b6f07aa297e..c8c22a504135 100644 --- a/packages/seacas/applications/aprepro/aprepro.C +++ b/packages/seacas/applications/aprepro/aprepro.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include @@ -17,6 +17,8 @@ int main(int argc, char *argv[]) bool quiet = false; + int exit_status = EXIT_SUCCESS; + // Parse all options... for (int ai = 1; ai < argc; ++ai) { std::string arg = argv[ai]; @@ -66,6 +68,14 @@ int main(int argc, char *argv[]) aprepro.ap_options.interactive = true; try { aprepro.parse_stream(std::cin, "standard input"); + + if (aprepro.ap_options.errors_fatal && aprepro.get_error_count() > 0) { + exit_status = EXIT_FAILURE; + } + if ((aprepro.ap_options.errors_and_warnings_fatal) && + (aprepro.get_error_count() + aprepro.get_warning_count() > 0)) { + exit_status = EXIT_FAILURE; + } } catch (std::exception &e) { std::cerr << "Aprepro terminated due to exception: " << e.what() << '\n'; @@ -116,6 +126,7 @@ int main(int argc, char *argv[]) } } else { + exit_status = EXIT_FAILURE; std::cerr << "There were " << aprepro.get_error_count() << " errors and " << aprepro.get_warning_count() << " warnings." << "\n"; @@ -142,4 +153,5 @@ int main(int argc, char *argv[]) if (aprepro.ap_options.debugging || aprepro.ap_options.dumpvars) { aprepro.dumpsym("variable", false); } + return exit_status; } diff --git a/packages/seacas/applications/aprepro/rect.csv b/packages/seacas/applications/aprepro/rect.csv index da1b9017897f..164a2ef9fee6 100644 --- a/packages/seacas/applications/aprepro/rect.csv +++ b/packages/seacas/applications/aprepro/rect.csv @@ -1,27 +1,27 @@ - 0.0000000E+000, 1.0000000E+000, 1.0000000E+000, 1.0000000E+000, 1.0000000E+000, 1.0000000E+000, 1.0000000E+000, 1.0000000E+000, 1.0000000E+000, 1.0000000E+000, 1.0000000E+000, 0.0000000E+000, 0.0000000E+000, 0.0000000E+000, 0.0000000E+000, 0.0000000E+000, 0.0000000E+000, 0.0000000E+000, 0.0000000E+000, 0.0000000E+000, 0.0000000E+000, - 1.0000000E+000, 9.9987325E-001, 9.9983240E-001, 9.9990651E-001, 9.9989789E-001, 9.9992499E-001, 9.9984721E-001, 9.9994427E-001, 9.9994427E-001, 9.9983240E-001, 9.9996271E-001, -4.5274345E-003, 5.7027978E-003, -5.8559869E-003, 1.9343975E-003, -7.8065548E-004, -8.8399481E-003, 2.7661075E-004, 2.7661075E-004, -5.7027978E-003, -5.5178336E-005, - 2.0000000E+000, 9.9845402E-001, 9.9795569E-001, 9.9886038E-001, 9.9875437E-001, 9.9908526E-001, 9.9813713E-001, 9.9932017E-001, 9.9932017E-001, 9.9795569E-001, 9.9954507E-001, -1.5813503E-002, 1.9904266E-002, -2.0434428E-002, 6.7629179E-003, -2.7306099E-003, -3.0850279E-002, 9.6836870E-004, 9.6836870E-004, -1.9904266E-002, -1.9329815E-004, - 3.0000000E+000, 9.8850008E-001, 9.8478703E-001, 9.9155875E-001, 9.9071948E-001, 9.9319953E-001, 9.8617577E-001, 9.9493740E-001, 9.9493740E-001, 9.8478703E-001, 9.9660735E-001, -4.3172077E-002, 5.4060764E-002, -5.5412197E-002, 1.8587476E-002, -7.5305988E-003, -8.3722618E-002, 2.6867021E-003, 2.6867021E-003, -5.4060764E-002, -5.3878640E-004, - 4.0000000E+000, 9.3725124E-001, 9.1675084E-001, 9.5500497E-001, 9.4891136E-001, 9.6302090E-001, 9.2550860E-001, 9.7220689E-001, 9.7220689E-001, 9.1675084E-001, 9.8122817E-001, -1.0163823E-001, 1.2385676E-001, -1.2572195E-001, 4.5352196E-002, -1.8696437E-002, -1.9087532E-001, 6.8817499E-003, 6.8817499E-003, -1.2385676E-001, -1.4128781E-003, - 5.0000000E+000, 7.8303105E-001, 7.0605164E-001, 8.5835725E-001, 8.1694487E-001, 8.7447745E-001, 7.5307557E-001, 9.0174220E-001, 9.0174220E-001, 7.0605164E-001, 9.3150588E-001, -2.0138474E-001, 2.2491240E-001, -2.1632996E-001, 1.0157337E-001, -4.3924470E-002, -3.3720391E-001, 1.7841674E-002, 1.7841674E-002, -2.2491240E-001, -3.9246734E-003, - 6.0000000E+000, 5.8749345E-001, 3.8695099E-001, 7.9137664E-001, 6.1813726E-001, 7.7851770E-001, 5.6656449E-001, 8.0515035E-001, 8.0515035E-001, 3.8695099E-001, 8.5270233E-001, -3.5930230E-001, 3.6388926E-001, -2.8607711E-001, 2.2243683E-001, -9.9339161E-002, -4.8750546E-001, 4.6877710E-002, 4.6877710E-002, -3.6388926E-001, -1.1322374E-002, - 7.0000000E+000, 4.6344872E-001, 1.0229219E-001, 8.0829933E-001, 4.4029196E-001, 7.3698231E-001, 4.8475397E-001, 7.2838129E-001, 7.2838129E-001, 1.0229219E-001, 7.7315948E-001, -5.4237647E-001, 5.3764430E-001, -3.3117305E-001, 3.8892284E-001, -1.7303342E-001, -6.2736563E-001, 9.1142312E-002, 9.1142312E-002, -5.3764430E-001, -2.3508048E-002, - 8.0000000E+000, 3.3229323E-001, -1.6617592E-001, 8.1682480E-001, 2.3869311E-001, 6.7784736E-001, 3.9602058E-001, 6.1395585E-001, 6.1395585E-001, -1.6617592E-001, 6.4317238E-001, -6.9546982E-001, 6.5939491E-001, -3.7314835E-001, 5.4310201E-001, -2.4847898E-001, -7.4067666E-001, 1.4188296E-001, 1.4188296E-001, -6.5939491E-001, -3.8766269E-002, - 9.0000000E+000, 1.7891649E-001, -3.8710265E-001, 7.7759846E-001, 2.4504973E-002, 5.8619655E-001, 2.4753853E-001, 4.1731032E-001, 4.1731032E-001, -3.8710265E-001, 3.7160176E-001, -7.8821686E-001, 6.7346847E-001, -4.3138150E-001, 6.5352921E-001, -3.2160908E-001, -8.0977014E-001, 1.9927048E-001, 1.9927048E-001, -6.7346847E-001, -5.8633647E-002, - 1.0000000E+001, -1.3164902E-001, -3.4780142E-001, 4.3521191E-001, -1.6289891E-001, 3.7388776E-001, -1.8589330E-001, 1.4518026E-001, 1.4518026E-001, -3.4780142E-001, -5.6309359E-002, -4.9001652E-001, 1.6937775E-001, -4.6671727E-001, 4.5031630E-001, -3.1591122E-001, -4.9529438E-001, 2.1231109E-001, 2.1231109E-001, -1.6937775E-001, -7.0083742E-002, - 1.1000000E+001, -3.0354290E-001, -2.7338056E-001, 4.1332959E-001, -2.1787127E-001, 2.2159388E-001, -3.3819096E-001, 7.0249167E-002, 7.0249167E-002, -2.7338056E-001, -3.1344002E-002, -3.1706446E-001, -1.4814128E-001, -5.0188227E-001, 1.9065277E-001, -2.5176215E-001, -4.0779282E-001, 1.2496344E-001, 1.2496344E-001, 1.4814128E-001, -3.4715875E-002, - 1.2000000E+001, -4.4522164E-001, -1.7411905E-001, 3.9444488E-001, -2.5313100E-001, 3.9969083E-002, -4.6247794E-001, -2.6752493E-002, -2.6752493E-002, -1.7411905E-001, -1.0102207E-002, -1.3401686E-001, -4.1583551E-001, -5.3182392E-001, -9.0431610E-002, -1.6327360E-001, -3.1213863E-001, 1.3153708E-002, 1.3153708E-002, 4.1583551E-001, 1.0753390E-002, - 1.3000000E+001, -4.5323429E-001, -1.6423295E-001, 3.8739292E-001, -2.5626728E-001, 2.9752934E-002, -4.7057195E-001, -3.2971178E-002, -3.2971178E-002, -1.6423295E-001, -9.6751029E-003, -1.2079852E-001, -4.2910234E-001, -5.3396874E-001, -1.0716627E-001, -1.5985789E-001, -2.9942973E-001, 7.0692183E-003, 7.0692183E-003, 4.2910234E-001, 1.3542511E-002, - 1.4000000E+001, -4.5726698E-001, -1.5867506E-001, 3.8281814E-001, -2.5814655E-001, 2.4843886E-002, -4.7470613E-001, -3.6113640E-002, -3.6113640E-002, -1.5867506E-001, -9.5327622E-003, -1.1385876E-001, -4.3539545E-001, -5.3509827E-001, -1.1556516E-001, -1.5860438E-001, -2.9189408E-001, 4.1556594E-003, 4.1556594E-003, 4.3539545E-001, 1.4960681E-002, - 1.5000000E+001, -4.5911461E-001, -1.5590224E-001, 3.8036274E-001, -2.5909681E-001, 2.2634211E-002, -4.7661652E-001, -3.7572910E-002, -3.7572910E-002, -1.5590224E-001, -9.4830365E-003, -1.1053679E-001, -4.3817610E-001, -5.3561397E-001, -1.1945747E-001, -1.5815753E-001, -2.8802619E-001, 2.8475236E-003, 2.8475236E-003, 4.3817610E-001, 1.5623524E-002, - 1.6000000E+001, -4.6066116E-001, -1.5342130E-001, 3.7806694E-001, -2.5994574E-001, 2.0794998E-002, -4.7822516E-001, -3.8813403E-002, -3.8813403E-002, -1.5342130E-001, -9.4487263E-003, -1.0764499E-001, -4.4044676E-001, -5.3603753E-001, -1.2276455E-001, -1.5785521E-001, -2.8450448E-001, 1.7609882E-003, 1.7609882E-003, 4.4044676E-001, 1.6190051E-002, - 1.7000000E+001, -4.6131249E-001, -1.5232075E-001, 3.7701862E-001, -2.6032025E-001, 2.0020999E-002, -4.7890567E-001, -3.9343381E-002, -3.9343381E-002, -1.5232075E-001, -9.4362538E-003, -1.0638658E-001, -4.4138589E-001, -5.3621194E-001, -1.2417743E-001, -1.5774968E-001, -2.8292397E-001, 1.3045344E-003, 1.3045344E-003, 4.4138589E-001, 1.6433130E-002, - 1.8000000E+001, -4.6186461E-001, -1.5135669E-001, 3.7608528E-001, -2.6064663E-001, 1.9364133E-002, -4.7948413E-001, -3.9797192E-002, -3.9797192E-002, -1.5135669E-001, -9.4265965E-003, -1.0529653E-001, -4.4217335E-001, -5.3635716E-001, -1.2538742E-001, -1.5767126E-001, -2.8153034E-001, 9.1760240E-004, 9.1760240E-004, 4.4217335E-001, 1.6641840E-002, - 1.9000000E+001, -4.6209974E-001, -1.5093647E-001, 3.7567407E-001, -2.6078828E-001, 1.9083993E-002, -4.7973095E-001, -3.9991917E-002, -3.9991917E-002, -1.5093647E-001, -9.4227387E-003, -1.0482499E-001, -4.4250617E-001, -5.3641813E-001, -1.2590669E-001, -1.5764111E-001, -2.8092024E-001, 7.5272150E-004, 7.5272150E-004, 4.4250617E-001, 1.6731567E-002, - 2.0000000E+001, -4.6230071E-001, -1.5057238E-001, 3.7531563E-001, -2.6091069E-001, 1.8844288E-002, -4.7994216E-001, -4.0159119E-002, -4.0159119E-002, -1.5057238E-001, -9.4195623E-003, -1.0441818E-001, -4.4278939E-001, -5.3646977E-001, -1.2635262E-001, -1.5761694E-001, -2.8039033E-001, 6.1170959E-004, 6.1170959E-004, 4.4278939E-001, 1.6808699E-002, - 2.1000000E+001, -4.6247259E-001, -1.5025718E-001, 3.7500374E-001, -2.6101639E-001, 1.8639044E-002, -4.8012298E-001, -4.0302721E-002, -4.0302721E-002, -1.5025718E-001, -9.4169340E-003, -1.0406733E-001, -4.4303070E-001, -5.3651357E-001, -1.2673565E-001, -1.5759747E-001, -2.7993062E-001, 4.9102410E-004, 4.9102410E-004, 4.4303070E-001, 1.6875009E-002, - 2.2000000E+001, -4.6261969E-001, -1.4998454E-001, 3.7473275E-001, -2.6110761E-001, 1.8463203E-002, -4.8027787E-001, -4.0426076E-002, -4.0426076E-002, -1.4998454E-001, -9.4147496E-003, -1.0376482E-001, -4.4323651E-001, -5.3655077E-001, -1.2706471E-001, -1.5758171E-001, -2.7953225E-001, 3.8766956E-004, 3.8766956E-004, 4.4323651E-001, 1.6932021E-002, - 2.3000000E+001, -4.6274565E-001, -1.4974888E-001, 3.7449762E-001, -2.6118630E-001, 1.8312477E-002, -4.8041061E-001, -4.0532058E-002, -4.0532058E-002, -1.4974888E-001, -9.4129267E-003, -1.0350408E-001, -4.4341222E-001, -5.3658239E-001, -1.2734745E-001, -1.5756888E-001, -2.7918738E-001, 2.9910796E-004, 2.9910796E-004, 4.4341222E-001, 1.6981040E-002, - 2.4000000E+001, -4.6285356E-001, -1.4954531E-001, 3.7429385E-001, -2.6125414E-001, 1.8183220E-002, -4.8052440E-001, -4.0623125E-002, -4.0623125E-002, -1.4954531E-001, -9.4114000E-003, -1.0327940E-001, -4.4356236E-001, -5.3660931E-001, -1.2759042E-001, -1.5755840E-001, -2.7888908E-001, 2.2318514E-004, 2.2318514E-004, 4.4356236E-001, 1.7023190E-002, - 2.5000000E+001, -4.6294605E-001, -1.4936957E-001, 3.7411743E-001, -2.6131261E-001, 1.8072332E-002, -4.8062199E-001, -4.0701387E-002, -4.0701387E-002, -1.4936957E-001, -9.4101171E-003, -1.0308583E-001, -4.4369076E-001, -5.3663226E-001, -1.2779925E-001, -1.5754978E-001, -2.7863125E-001, 1.5806979E-004, 1.5806979E-004, 4.4369076E-001, 1.7059434E-002, + 0.0000000E+000, 1.0000000E+000, 1.0000000E+000, 1.0000000E+000, 1.0000000E+000, 1.0000000E+000, 1.0000000E+000, 1.0000000E+000, 1.0000000E+000, 1.0000000E+000, 1.0000000E+000, 0.0000000E+000, 0.0000000E+000, 0.0000000E+000, 0.0000000E+000, 0.0000000E+000, 0.0000000E+000, 0.0000000E+000, 0.0000000E+000, 0.0000000E+000, 0.0000000E+000, + 1.0000000E+000, 9.9987325E-001, 9.9983240E-001, 9.9990651E-001, 9.9989789E-001, 9.9992499E-001, 9.9984721E-001, 9.9994427E-001, 9.9994427E-001, 9.9983240E-001, 9.9996271E-001, -4.5274345E-003, 5.7027978E-003, -5.8559869E-003, 1.9343975E-003, -7.8065548E-004, -8.8399481E-003, 2.7661075E-004, 2.7661075E-004, -5.7027978E-003, -5.5178336E-005, + 2.0000000E+000, 9.9845402E-001, 9.9795569E-001, 9.9886038E-001, 9.9875437E-001, 9.9908526E-001, 9.9813713E-001, 9.9932017E-001, 9.9932017E-001, 9.9795569E-001, 9.9954507E-001, -1.5813503E-002, 1.9904266E-002, -2.0434428E-002, 6.7629179E-003, -2.7306099E-003, -3.0850279E-002, 9.6836870E-004, 9.6836870E-004, -1.9904266E-002, -1.9329815E-004, + 3.0000000E+000, 9.8850008E-001, 9.8478703E-001, 9.9155875E-001, 9.9071948E-001, 9.9319953E-001, 9.8617577E-001, 9.9493740E-001, 9.9493740E-001, 9.8478703E-001, 9.9660735E-001, -4.3172077E-002, 5.4060764E-002, -5.5412197E-002, 1.8587476E-002, -7.5305988E-003, -8.3722618E-002, 2.6867021E-003, 2.6867021E-003, -5.4060764E-002, -5.3878640E-004, + 4.0000000E+000, 9.3725124E-001, 9.1675084E-001, 9.5500497E-001, 9.4891136E-001, 9.6302090E-001, 9.2550860E-001, 9.7220689E-001, 9.7220689E-001, 9.1675084E-001, 9.8122817E-001, -1.0163823E-001, 1.2385676E-001, -1.2572195E-001, 4.5352196E-002, -1.8696437E-002, -1.9087532E-001, 6.8817499E-003, 6.8817499E-003, -1.2385676E-001, -1.4128781E-003, + 5.0000000E+000, 7.8303105E-001, 7.0605164E-001, 8.5835725E-001, 8.1694487E-001, 8.7447745E-001, 7.5307557E-001, 9.0174220E-001, 9.0174220E-001, 7.0605164E-001, 9.3150588E-001, -2.0138474E-001, 2.2491240E-001, -2.1632996E-001, 1.0157337E-001, -4.3924470E-002, -3.3720391E-001, 1.7841674E-002, 1.7841674E-002, -2.2491240E-001, -3.9246734E-003, + 6.0000000E+000, 5.8749345E-001, 3.8695099E-001, 7.9137664E-001, 6.1813726E-001, 7.7851770E-001, 5.6656449E-001, 8.0515035E-001, 8.0515035E-001, 3.8695099E-001, 8.5270233E-001, -3.5930230E-001, 3.6388926E-001, -2.8607711E-001, 2.2243683E-001, -9.9339161E-002, -4.8750546E-001, 4.6877710E-002, 4.6877710E-002, -3.6388926E-001, -1.1322374E-002, + 7.0000000E+000, 4.6344872E-001, 1.0229219E-001, 8.0829933E-001, 4.4029196E-001, 7.3698231E-001, 4.8475397E-001, 7.2838129E-001, 7.2838129E-001, 1.0229219E-001, 7.7315948E-001, -5.4237647E-001, 5.3764430E-001, -3.3117305E-001, 3.8892284E-001, -1.7303342E-001, -6.2736563E-001, 9.1142312E-002, 9.1142312E-002, -5.3764430E-001, -2.3508048E-002, + 8.0000000E+000, 3.3229323E-001, -1.6617592E-001, 8.1682480E-001, 2.3869311E-001, 6.7784736E-001, 3.9602058E-001, 6.1395585E-001, 6.1395585E-001, -1.6617592E-001, 6.4317238E-001, -6.9546982E-001, 6.5939491E-001, -3.7314835E-001, 5.4310201E-001, -2.4847898E-001, -7.4067666E-001, 1.4188296E-001, 1.4188296E-001, -6.5939491E-001, -3.8766269E-002, + 9.0000000E+000, 1.7891649E-001, -3.8710265E-001, 7.7759846E-001, 2.4504973E-002, 5.8619655E-001, 2.4753853E-001, 4.1731032E-001, 4.1731032E-001, -3.8710265E-001, 3.7160176E-001, -7.8821686E-001, 6.7346847E-001, -4.3138150E-001, 6.5352921E-001, -3.2160908E-001, -8.0977014E-001, 1.9927048E-001, 1.9927048E-001, -6.7346847E-001, -5.8633647E-002, + 1.0000000E+001, -1.3164902E-001, -3.4780142E-001, 4.3521191E-001, -1.6289891E-001, 3.7388776E-001, -1.8589330E-001, 1.4518026E-001, 1.4518026E-001, -3.4780142E-001, -5.6309359E-002, -4.9001652E-001, 1.6937775E-001, -4.6671727E-001, 4.5031630E-001, -3.1591122E-001, -4.9529438E-001, 2.1231109E-001, 2.1231109E-001, -1.6937775E-001, -7.0083742E-002, + 1.1000000E+001, -3.0354290E-001, -2.7338056E-001, 4.1332959E-001, -2.1787127E-001, 2.2159388E-001, -3.3819096E-001, 7.0249167E-002, 7.0249167E-002, -2.7338056E-001, -3.1344002E-002, -3.1706446E-001, -1.4814128E-001, -5.0188227E-001, 1.9065277E-001, -2.5176215E-001, -4.0779282E-001, 1.2496344E-001, 1.2496344E-001, 1.4814128E-001, -3.4715875E-002, + 1.2000000E+001, -4.4522164E-001, -1.7411905E-001, 3.9444488E-001, -2.5313100E-001, 3.9969083E-002, -4.6247794E-001, -2.6752493E-002, -2.6752493E-002, -1.7411905E-001, -1.0102207E-002, -1.3401686E-001, -4.1583551E-001, -5.3182392E-001, -9.0431610E-002, -1.6327360E-001, -3.1213863E-001, 1.3153708E-002, 1.3153708E-002, 4.1583551E-001, 1.0753390E-002, + 1.3000000E+001, -4.5323429E-001, -1.6423295E-001, 3.8739292E-001, -2.5626728E-001, 2.9752934E-002, -4.7057195E-001, -3.2971178E-002, -3.2971178E-002, -1.6423295E-001, -9.6751029E-003, -1.2079852E-001, -4.2910234E-001, -5.3396874E-001, -1.0716627E-001, -1.5985789E-001, -2.9942973E-001, 7.0692183E-003, 7.0692183E-003, 4.2910234E-001, 1.3542511E-002, + 1.4000000E+001, -4.5726698E-001, -1.5867506E-001, 3.8281814E-001, -2.5814655E-001, 2.4843886E-002, -4.7470613E-001, -3.6113640E-002, -3.6113640E-002, -1.5867506E-001, -9.5327622E-003, -1.1385876E-001, -4.3539545E-001, -5.3509827E-001, -1.1556516E-001, -1.5860438E-001, -2.9189408E-001, 4.1556594E-003, 4.1556594E-003, 4.3539545E-001, 1.4960681E-002, + 1.5000000E+001, -4.5911461E-001, -1.5590224E-001, 3.8036274E-001, -2.5909681E-001, 2.2634211E-002, -4.7661652E-001, -3.7572910E-002, -3.7572910E-002, -1.5590224E-001, -9.4830365E-003, -1.1053679E-001, -4.3817610E-001, -5.3561397E-001, -1.1945747E-001, -1.5815753E-001, -2.8802619E-001, 2.8475236E-003, 2.8475236E-003, 4.3817610E-001, 1.5623524E-002, + 1.6000000E+001, -4.6066116E-001, -1.5342130E-001, 3.7806694E-001, -2.5994574E-001, 2.0794998E-002, -4.7822516E-001, -3.8813403E-002, -3.8813403E-002, -1.5342130E-001, -9.4487263E-003, -1.0764499E-001, -4.4044676E-001, -5.3603753E-001, -1.2276455E-001, -1.5785521E-001, -2.8450448E-001, 1.7609882E-003, 1.7609882E-003, 4.4044676E-001, 1.6190051E-002, + 1.7000000E+001, -4.6131249E-001, -1.5232075E-001, 3.7701862E-001, -2.6032025E-001, 2.0020999E-002, -4.7890567E-001, -3.9343381E-002, -3.9343381E-002, -1.5232075E-001, -9.4362538E-003, -1.0638658E-001, -4.4138589E-001, -5.3621194E-001, -1.2417743E-001, -1.5774968E-001, -2.8292397E-001, 1.3045344E-003, 1.3045344E-003, 4.4138589E-001, 1.6433130E-002, + 1.8000000E+001, -4.6186461E-001, -1.5135669E-001, 3.7608528E-001, -2.6064663E-001, 1.9364133E-002, -4.7948413E-001, -3.9797192E-002, -3.9797192E-002, -1.5135669E-001, -9.4265965E-003, -1.0529653E-001, -4.4217335E-001, -5.3635716E-001, -1.2538742E-001, -1.5767126E-001, -2.8153034E-001, 9.1760240E-004, 9.1760240E-004, 4.4217335E-001, 1.6641840E-002, + 1.9000000E+001, -4.6209974E-001, -1.5093647E-001, 3.7567407E-001, -2.6078828E-001, 1.9083993E-002, -4.7973095E-001, -3.9991917E-002, -3.9991917E-002, -1.5093647E-001, -9.4227387E-003, -1.0482499E-001, -4.4250617E-001, -5.3641813E-001, -1.2590669E-001, -1.5764111E-001, -2.8092024E-001, 7.5272150E-004, 7.5272150E-004, 4.4250617E-001, 1.6731567E-002, + 2.0000000E+001, -4.6230071E-001, -1.5057238E-001, 3.7531563E-001, -2.6091069E-001, 1.8844288E-002, -4.7994216E-001, -4.0159119E-002, -4.0159119E-002, -1.5057238E-001, -9.4195623E-003, -1.0441818E-001, -4.4278939E-001, -5.3646977E-001, -1.2635262E-001, -1.5761694E-001, -2.8039033E-001, 6.1170959E-004, 6.1170959E-004, 4.4278939E-001, 1.6808699E-002, + 2.1000000E+001, -4.6247259E-001, -1.5025718E-001, 3.7500374E-001, -2.6101639E-001, 1.8639044E-002, -4.8012298E-001, -4.0302721E-002, -4.0302721E-002, -1.5025718E-001, -9.4169340E-003, -1.0406733E-001, -4.4303070E-001, -5.3651357E-001, -1.2673565E-001, -1.5759747E-001, -2.7993062E-001, 4.9102410E-004, 4.9102410E-004, 4.4303070E-001, 1.6875009E-002, + 2.2000000E+001, -4.6261969E-001, -1.4998454E-001, 3.7473275E-001, -2.6110761E-001, 1.8463203E-002, -4.8027787E-001, -4.0426076E-002, -4.0426076E-002, -1.4998454E-001, -9.4147496E-003, -1.0376482E-001, -4.4323651E-001, -5.3655077E-001, -1.2706471E-001, -1.5758171E-001, -2.7953225E-001, 3.8766956E-004, 3.8766956E-004, 4.4323651E-001, 1.6932021E-002, + 2.3000000E+001, -4.6274565E-001, -1.4974888E-001, 3.7449762E-001, -2.6118630E-001, 1.8312477E-002, -4.8041061E-001, -4.0532058E-002, -4.0532058E-002, -1.4974888E-001, -9.4129267E-003, -1.0350408E-001, -4.4341222E-001, -5.3658239E-001, -1.2734745E-001, -1.5756888E-001, -2.7918738E-001, 2.9910796E-004, 2.9910796E-004, 4.4341222E-001, 1.6981040E-002, + 2.4000000E+001, -4.6285356E-001, -1.4954531E-001, 3.7429385E-001, -2.6125414E-001, 1.8183220E-002, -4.8052440E-001, -4.0623125E-002, -4.0623125E-002, -1.4954531E-001, -9.4114000E-003, -1.0327940E-001, -4.4356236E-001, -5.3660931E-001, -1.2759042E-001, -1.5755840E-001, -2.7888908E-001, 2.2318514E-004, 2.2318514E-004, 4.4356236E-001, 1.7023190E-002, + 2.5000000E+001, -4.6294605E-001, -1.4936957E-001, 3.7411743E-001, -2.6131261E-001, 1.8072332E-002, -4.8062199E-001, -4.0701387E-002, -4.0701387E-002, -1.4936957E-001, -9.4101171E-003, -1.0308583E-001, -4.4369076E-001, -5.3663226E-001, -1.2779925E-001, -1.5754978E-001, -2.7863125E-001, 1.5806979E-004, 1.5806979E-004, 4.4369076E-001, 1.7059434E-002, 2.6000000E+001, -4.6310439E-001, -1.4906590E-001, 3.7381151E-001, -2.6141341E-001, 1.7882259E-002, -4.8078920E-001, -4.0835831E-002, -4.0835831E-002, -1.4906590E-001, -9.4079760E-003, -1.0275225E-001, -4.4390995E-001, -5.3667124E-001, -1.2815802E-001, -1.5753586E-001, -2.7818510E-001, 4.6495470E-005, 4.6495470E-005, 4.4390995E-001, 1.7121745E-002, diff --git a/packages/seacas/applications/aprepro/test.inp_app b/packages/seacas/applications/aprepro/test.inp_app index 947f8b1e859f..e0a89193e286 100644 --- a/packages/seacas/applications/aprepro/test.inp_app +++ b/packages/seacas/applications/aprepro/test.inp_app @@ -3,7 +3,7 @@ $ Test number representations {1} {10e-1} {10.e-1} {.1e+1} {.1e1} {1} {10E-1} {10.E-1} {.1E+1} {.1E1} - + Test assign statements: {_a = 5} {b=_a} $ Should print 5 5 {_a +=b} {_a} $ Should print 10 10 @@ -181,7 +181,7 @@ $ Test int and [] (shortcut for int) $ Test looping - print sin, cos from 0 to 90 by 5 {_angle = -5} {Loop(19)} -{_angle += 5} {_sa=sind(_angle)} {_ca=cosd(_angle)} {hypot(_sa, _ca)} +{_angle += 5} {_sa=sind(_angle)} {_ca=cosd(_angle)} {hypot(_sa, _ca)} {EndLoop} $$$$ Test formatting and string concatenation @@ -201,12 +201,12 @@ $$$$ Test string rescanning and executing Original String: {Test} Rescanned String: -{rescan(Test)} +{rescan(Test)} Original String: {Test2} Print Value of variable T = {T} Rescanned String: -{rescan(Test2)} +{rescan(Test2)} Print Value of variable T = {T} Original String: {t1 = "atan2(0,-1)"} diff --git a/packages/seacas/applications/blot/adjcon.f b/packages/seacas/applications/blot/adjcon.f index 1c7684040948..58c34b32e577 100644 --- a/packages/seacas/applications/blot/adjcon.f +++ b/packages/seacas/applications/blot/adjcon.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: adjcon.f,v $ -C Revision 1.2 2009/03/25 12:36:42 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 19:54:29 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:47:26 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE ADJCON (DELCOK) C======================================================================= diff --git a/packages/seacas/applications/blot/adjlim.f b/packages/seacas/applications/blot/adjlim.f index 0911de3f68fb..485c2828eb7c 100644 --- a/packages/seacas/applications/blot/adjlim.f +++ b/packages/seacas/applications/blot/adjlim.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: adjlim.f,v $ -C Revision 1.2 2009/03/25 12:36:42 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 19:54:32 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:47:28 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE ADJLIM (MSHDEF, & XISSYM, YISSYM, LFTSYM, BOTSYM, XAXSYM, YAXSYM, diff --git a/packages/seacas/applications/blot/allal2.f b/packages/seacas/applications/blot/allal2.f index a93a7f1c49e3..798e0237498e 100644 --- a/packages/seacas/applications/blot/allal2.f +++ b/packages/seacas/applications/blot/allal2.f @@ -1,29 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: allal2.f,v $ -C Revision 1.3 2009/03/25 12:36:42 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.2 2009/01/22 21:34:21 gdsjaar -C There were several inline dbnums common blocks. Replaced with the -C include so they all have the same size with the added variable types. -C -C Added minor support for nodeset and sideset variables. -C -C It can print the count and the names, but that is all -C at this time. -C -C Revision 1.1 1994/04/07 19:54:35 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:47:30 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE ALLAL2 (LENF, IF2EL, IE2ELB, NEWELB) C======================================================================= diff --git a/packages/seacas/applications/blot/allal3.f b/packages/seacas/applications/blot/allal3.f index 2ee1bcdd839b..1aa53c696a50 100644 --- a/packages/seacas/applications/blot/allal3.f +++ b/packages/seacas/applications/blot/allal3.f @@ -1,29 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: allal3.f,v $ -C Revision 1.3 2009/03/25 12:36:42 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.2 2009/01/22 21:34:21 gdsjaar -C There were several inline dbnums common blocks. Replaced with the -C include so they all have the same size with the added variable types. -C -C Added minor support for nodeset and sideset variables. -C -C It can print the count and the names, but that is all -C at this time. -C -C Revision 1.1 1994/04/07 19:54:37 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:47:32 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE ALLAL3 (LENF, IF2EL, IF2EL2, IE2ELB, NEWELB) C======================================================================= diff --git a/packages/seacas/applications/blot/allcut.f b/packages/seacas/applications/blot/allcut.f index ba2e14238643..08e9c4e8385a 100644 --- a/packages/seacas/applications/blot/allcut.f +++ b/packages/seacas/applications/blot/allcut.f @@ -1,29 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: allcut.f,v $ -C Revision 1.3 2009/03/25 12:36:42 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.2 2009/01/22 21:34:21 gdsjaar -C There were several inline dbnums common blocks. Replaced with the -C include so they all have the same size with the added variable types. -C -C Added minor support for nodeset and sideset variables. -C -C It can print the count and the names, but that is all -C at this time. -C -C Revision 1.1 1994/04/07 19:54:40 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:47:34 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE ALLCUT (IE2ELB, LENF, IF2EL, IF2EL2, NEWELB) C======================================================================= diff --git a/packages/seacas/applications/blot/axsplt.blk b/packages/seacas/applications/blot/axsplt.blk index 1b94aebf2159..dec05c00269f 100644 --- a/packages/seacas/applications/blot/axsplt.blk +++ b/packages/seacas/applications/blot/axsplt.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON / AXSPLT / AXONLY diff --git a/packages/seacas/applications/blot/bcolor.f b/packages/seacas/applications/blot/bcolor.f index f6de9eb74241..e6645191efe0 100644 --- a/packages/seacas/applications/blot/bcolor.f +++ b/packages/seacas/applications/blot/bcolor.f @@ -1,23 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: bcolor.f,v $ -C Revision 1.3 2009/03/25 12:36:42 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.2 1994/06/13 18:29:00 gdsjaar -C Fixed background and foreground color setting. (I think) -C -c Revision 1.1 1994/04/07 19:54:46 gdsjaar -c Initial checkin of ACCESS/graphics/blotII2 -c -c Revision 1.2 1990/12/14 08:47:36 gdsjaar -c Added RCS Id and Log to all files -c C============================================================================ SUBROUTINE BCOLOR (INIT, INLINE, IFLD, INTYP, IFIELD, & CFIELD, BLKCOL) diff --git a/packages/seacas/applications/blot/bcolr.blk b/packages/seacas/applications/blot/bcolr.blk index 361626686c68..ab2bb10b2e64 100644 --- a/packages/seacas/applications/blot/bcolr.blk +++ b/packages/seacas/applications/blot/bcolr.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /BCOLR/ BCOLCH diff --git a/packages/seacas/applications/blot/biomod.f b/packages/seacas/applications/blot/biomod.f index a7102a90e329..4bf969a34166 100644 --- a/packages/seacas/applications/blot/biomod.f +++ b/packages/seacas/applications/blot/biomod.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: biomod.f,v $ -C Revision 1.2 2009/03/25 12:36:42 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 19:54:54 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:47:40 gdsjaar -c Added RCS Id and Log to all files -c subroutine biomod (imode) write (*, 10000) imode diff --git a/packages/seacas/applications/blot/bl_rotate.f b/packages/seacas/applications/blot/bl_rotate.f index 1ecbedc3f3f2..e8af2cce11f9 100644 --- a/packages/seacas/applications/blot/bl_rotate.f +++ b/packages/seacas/applications/blot/bl_rotate.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/bl_version.f b/packages/seacas/applications/blot/bl_version.f index eac473c3c3b3..2fa65559a341 100644 --- a/packages/seacas/applications/blot/bl_version.f +++ b/packages/seacas/applications/blot/bl_version.f @@ -1,10 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details - SUBROUTINE VERSION(QAINFO) include 'params.blk' diff --git a/packages/seacas/applications/blot/blkdat.f b/packages/seacas/applications/blot/blkdat.f index 2b1357767ad3..3950efbf0b4b 100644 --- a/packages/seacas/applications/blot/blkdat.f +++ b/packages/seacas/applications/blot/blkdat.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= @@ -55,7 +55,7 @@ BLOCK DATA BLKDAT include 'sizes.blk' include 'linthc.blk' include 'sphele.blk' -C + C======================================================================= C D E T O U R @@ -81,7 +81,6 @@ BLOCK DATA BLKDAT C======================================================================= C T P L O T - include 'tpvars.blk' C======================================================================= C S P L O T diff --git a/packages/seacas/applications/blot/blot.f b/packages/seacas/applications/blot/blot.f index 276e7b02517e..822d98f11226 100644 --- a/packages/seacas/applications/blot/blot.f +++ b/packages/seacas/applications/blot/blot.f @@ -1,10 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C c======================================================================= PROGRAM BLOTII C======================================================================= @@ -422,7 +421,6 @@ PROGRAM BLOTII CALL INIINT(NELBLK, 0, IA(KNLNKE)) CALL INIINT(NELBLK, 0, IA(KNATR)) - CALL INISTR (NELBLK, ' ', C(KNMLB)) CALL EXGEBI (NDB, IA(KIDELB), IERR) @@ -749,7 +747,6 @@ PROGRAM BLOTII CALL MDSTAT (NERR, MEM) IF (NERR .GT. 0) GOTO 160 - IF (.NOT. IS3DIM) THEN CALL MAKSU2 (A(KLENL), A(KLNSET), MSHBOR, & .FALSE., IDUM, A(KNPSUR)) diff --git a/packages/seacas/applications/blot/caldis.f b/packages/seacas/applications/blot/caldis.f index 6a967e5e1e42..216b653d95d8 100644 --- a/packages/seacas/applications/blot/caldis.f +++ b/packages/seacas/applications/blot/caldis.f @@ -1,33 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: caldis.f,v $ -C Revision 1.4 2009/03/25 12:36:42 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.3 2009/01/22 21:34:21 gdsjaar -C There were several inline dbnums common blocks. Replaced with the -C include so they all have the same size with the added variable types. -C -C Added minor support for nodeset and sideset variables. -C -C It can print the count and the names, but that is all -C at this time. -C -C Revision 1.2 1996/06/21 16:06:58 caforsy -C Ran ftnchek and removed unused variables. Reformat output for list -C var, list global, and list name. -C -C Revision 1.1 1994/04/07 19:55:09 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:47:47 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE CALDIS (NNENUM, NENUM, XNE, YNE, ZNE, SDISTS) C======================================================================= diff --git a/packages/seacas/applications/blot/calmag.f b/packages/seacas/applications/blot/calmag.f index 50613da87731..25396a20a563 100644 --- a/packages/seacas/applications/blot/calmag.f +++ b/packages/seacas/applications/blot/calmag.f @@ -1,24 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: calmag.f,v $ -C Revision 1.3 2009/03/25 12:36:42 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.2 1996/06/21 16:06:58 caforsy -C Ran ftnchek and removed unused variables. Reformat output for list -C var, list global, and list name. -C -C Revision 1.1 1994/04/07 19:55:11 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:47:49 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE CALMAG (DEFOK, IS3DIM, DEFFAC) C======================================================================= diff --git a/packages/seacas/applications/blot/caltim.f b/packages/seacas/applications/blot/caltim.f index 212cab90789b..6f46ba75489c 100644 --- a/packages/seacas/applications/blot/caltim.f +++ b/packages/seacas/applications/blot/caltim.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: caltim.f,v $ -C Revision 1.2 2009/03/25 12:36:42 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 19:55:14 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:47:51 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE CALTIM (WHONLY, TMIN, TMAX, DELT, NINTV, & NSTEPS, TIMES, WHOTIM, NPTIMS, IPTIMS) diff --git a/packages/seacas/applications/blot/cenlab.f b/packages/seacas/applications/blot/cenlab.f index 3585c9a30ed8..78a67886a07e 100644 --- a/packages/seacas/applications/blot/cenlab.f +++ b/packages/seacas/applications/blot/cenlab.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: cenlab.f,v $ -C Revision 1.2 2009/03/25 12:36:42 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 19:55:17 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:47:53 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE CENLAB (LAB, NSNUM, SNUM, LMAX, RETLAB) C======================================================================= diff --git a/packages/seacas/applications/blot/cfmax.f b/packages/seacas/applications/blot/cfmax.f index f44bc8fe1afd..cbd158392497 100644 --- a/packages/seacas/applications/blot/cfmax.f +++ b/packages/seacas/applications/blot/cfmax.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: cfmax.f,v $ -C Revision 1.2 2009/03/25 12:36:42 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 19:55:20 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:47:55 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE CFMAX (VARNP, NLNKF, LINKF1, FEMIN, FEMAX) C======================================================================= diff --git a/packages/seacas/applications/blot/cfv2nv.f b/packages/seacas/applications/blot/cfv2nv.f index de0f5a21a42f..9d67042a93e6 100644 --- a/packages/seacas/applications/blot/cfv2nv.f +++ b/packages/seacas/applications/blot/cfv2nv.f @@ -1,29 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: cfv2nv.f,v $ -C Revision 1.3 2009/03/25 12:36:42 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.2 2009/01/22 21:34:21 gdsjaar -C There were several inline dbnums common blocks. Replaced with the -C include so they all have the same size with the added variable types. -C -C Added minor support for nodeset and sideset variables. -C -C It can print the count and the names, but that is all -C at this time. -C -C Revision 1.1 1994/04/07 19:55:23 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:47:57 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE CFV2NV (LENF, NLNKF, LINKF, IELBST, ISEVOK, VARFAC, & DOVN2B, IVN2B, IFVCNT, VARNP) diff --git a/packages/seacas/applications/blot/cfvmax.f b/packages/seacas/applications/blot/cfvmax.f index 5d4d6201662e..775a98a632c7 100644 --- a/packages/seacas/applications/blot/cfvmax.f +++ b/packages/seacas/applications/blot/cfvmax.f @@ -1,23 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: cfvmax.f,v $ -C Revision 1.3 2009/03/25 12:36:42 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.2 1997/03/20 21:23:52 caforsy -C Update Imakefile for Imake 6.1 -C -C Revision 1.1 1994/04/07 19:55:26 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:47:58 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE CFVMAX (NUMFAC, VARFAC, NMIN, NMAX, FMIN, FMAX) C======================================================================= diff --git a/packages/seacas/applications/blot/cgi/cgi_dummy.c b/packages/seacas/applications/blot/cgi/cgi_dummy.c index f31a127fbbe7..29250eb574fc 100644 --- a/packages/seacas/applications/blot/cgi/cgi_dummy.c +++ b/packages/seacas/applications/blot/cgi/cgi_dummy.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/applications/blot/cgi/vdicps.f b/packages/seacas/applications/blot/cgi/vdicps.f index 21ffc9037541..22bc93056576 100644 --- a/packages/seacas/applications/blot/cgi/vdicps.f +++ b/packages/seacas/applications/blot/cgi/vdicps.f @@ -1,15 +1,15 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details SUBROUTINE VIINIT(ASPECT,JUSTIF) -C + C VDI-PostScript driver - B&W and COLOR versions C Adapted for all systems by S.L.Thompson C Original code from D.Campbell and J.LONG -C + C vdi device numbers are C device number C black & white, batch, no poly fill 799.1 @@ -22,44 +22,44 @@ SUBROUTINE VIINIT(ASPECT,JUSTIF) C color, interactive, black-white interchange 799.8 C color, batch, black background 799.9 C color, interactive, black background 799.11 -C + C Note that there are several parameters to set depending on how C the package is to be used. Most are in routine pstsel routine C which is called at the first of this routine (viinit.) Two other c parameters (xinch,yinch) are set in this routine and vdiqd9. -C + C This code is for BOTH color and black & white systems. C Flag is set for mode in pstsel. -C + C Device can be set with escape call before call to vdinit. C Otherwise, code will interactively ask for device type. C There is also an escape flag for landscape or portrait format. -C + C This deck was generated from a qms driver and still has the C qms comments in places. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VIINIT -Initialize SVDI. postscript device -C + C D.L. CAMPBELL -1-DEC-1986 C J.P. LONG -9-NOV-1987 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C (postscript) -C + C ENTRY CONDITIONS -ASPECT = real ratio of X dimension to Y dimension. C Range >0.0. Default: 0. (device dependent). C JUSTIF = integer justification of NDC space on the C device. Range 0-9. Default: 0 (device dependent.) -C + C CALLS -VBERRH,VDSTCS,VDSTLW,VIMOVA -C + C EXIT CONDITIONS -XNDCMX,YNDCMX = real NDC maximum valid values(as C constrained by ASPECT). C VECTOR = real array of attribute values(all device C dependent except VECTOR(4)=0.0). -C + C NARRATIVE -This must be the first SVDI call made. All C attribute values, the color table, and current C position are set to appropriate defaults for the @@ -67,7 +67,7 @@ SUBROUTINE VIINIT(ASPECT,JUSTIF) C is done. The screen is cleared or paper advanced C if necessary to guarantee a blank view surface for C drawing on. -C + C ASPECT specifies the ratio of the X dimension to the C Y dimension . Maximum NDC values (at least one of C which will be 1.0) are computed to give the ASPECT @@ -78,7 +78,7 @@ SUBROUTINE VIINIT(ASPECT,JUSTIF) C aspect of 1.0. The NDC rectangle is scaled until C one dimension fills the corresponding dimension of C the device. -C + C JUSTIF determines where the rectangle is located on C the device as diagrammed below: C --------- @@ -88,22 +88,22 @@ SUBROUTINE VIINIT(ASPECT,JUSTIF) C --------- C For example, JUSTIF = 7 indicates NDC space will be C upper left justified on the device. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC -C + C Set parameters for type of usage. C Two settings are coded - one for square field of view C and one for full field of view. -C + C If VDIQDC is called before vdinit, full field of view is selected. C Otherwise, square is used. -C + C size of full view PARAMETER (XINCHO=10.0) PARAMETER (YINCHO=7.5) -C + C size of square view C PARAMETER (XINCHO=7.5) C PARAMETER (YINCHO=7.5) @@ -114,14 +114,14 @@ SUBROUTINE VIINIT(ASPECT,JUSTIF) C PARAMETER (YINCHO=7.4412525) *- COMMON /VCMODR/ XINCH, YINCH -C + CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC -C + REAL ASPECT INTEGER JUSTIF COMMON /VCVEC1/ IVECT INTEGER IVECT -C + C MAXIMUM VALID NDC VALUES. (DEVICE-INDEPENDENT) REAL XNDCMX,YNDCMX COMMON /VCNDCM/ XNDCMX,YNDCMX @@ -138,7 +138,7 @@ SUBROUTINE VIINIT(ASPECT,JUSTIF) C CURRENT POSITION. REAL XCP,YCP COMMON /VCCRPS/ XCP,YCP -C + C COMPUTER DEPENDENT COMMON VARIABLES AND CONSTANTS. include 'vcpstc.blk' C SCALE FACTORS FOR NDC TO DC MAPPING. (LXY,HC1) @@ -149,7 +149,7 @@ SUBROUTINE VIINIT(ASPECT,JUSTIF) COMMON /VCDDIM/ XPAD,YPAD,XDEVIC,YDEVIC C JOB ID INFORMATION. (HC1, DIC) include 'vcjob.blk' -C + COMMON /DEVCAP/ DEV(33) C ESCAPE FLAGS C PATNO AND BORDER USED BY VIPOLY FOR FILL PATTERN AND BORDER ON/OFF; @@ -157,7 +157,7 @@ SUBROUTINE VIINIT(ASPECT,JUSTIF) COMMON /VCESCP/ PGFORM,PATNO,BORDER INTEGER PGFORM,PATNO,BORDER CHARACTER COORD*20,XCOORD*4,YCOORD*4 -C + C pstmlw controls minimum line width C kpstbg controls background coloring C = 0, not colored (white ground from paper) @@ -166,20 +166,19 @@ SUBROUTINE VIINIT(ASPECT,JUSTIF) C = 0, no interchange C = 1, colors interchanged COMMON /VCPSTA/ PSTMLW, KPSTBG, KPSTCI -C + C mopoly controls polygon fill =0, on ; =1, off C mocolr controls color =0, on ; =1, off COMMON /VCPSTB/ MOPOLY, MOCOLR -C + DIMENSION COLDEF(3) -C + C vcpstd variables control what to do with empty frames with C command is received to dump data to output C kempty=0, frame is void - do not draw C >0, frame has data - draw it COMMON /VCPSTD/ KEMPTY -C -C + integer dummy(1) DEV(1) = 0.0 @@ -230,7 +229,7 @@ SUBROUTINE VIINIT(ASPECT,JUSTIF) C (5)=LINE WIDTH - ABOUT 1/72 INCHES C (6)=CHARACTER BOX Y - ABOUT 1/10 INCHES C (7)=CHARACTER BOX X - 5/7 OF BOX-Y -C + vector(1) = 0.0 vector(2) = 7.0 vector(3) = 1.0 @@ -238,7 +237,7 @@ SUBROUTINE VIINIT(ASPECT,JUSTIF) vector(5) = 0.06255 vector(6) = 0.01 vector(7) = 0.0 -C + C PROTECT INPUT PARAMETERS FROM BEING CHANGED. ASPEC1=ASPECT JUSTI1=JUSTIF @@ -249,21 +248,21 @@ SUBROUTINE VIINIT(ASPECT,JUSTIF) BORDER = 1 XCP = 0.0 YCP = 0.0 -C + C CHECK FOR VALID ASPECT. IF(ASPECT.LT.0.0) THEN CALL VBERRH(721,5), C AND USE DEFAULT ASPECT. IF(ASPECT.LT.0.0) THEN CALL VBERRH(721,5) ASPEC1=0.0 END IF -C + C CHECK FOR VALID JUSTIF. IF(JUSTIF.LT.0 .OR. JUSTIF.GT.9) THEN C CALL VBERRH(720,5), AND USE DEFAULT JUSTIF. IF(JUSTIF.LT.0.OR.JUSTIF.GT.9) THEN CALL VBERRH(720,5) JUSTI1=0 END IF -C + C SCALE NDC UNITS TO DEVICE UNITS. C FOR QMS, THE PHYSICAL PLOT SURFACE IS XINCH X YINCH (10.x7.5). C DEVICE COORDINATES ARE KEPT IN 1/723 INCH TO GAIN SIMPLICITY @@ -274,14 +273,14 @@ SUBROUTINE VIINIT(ASPECT,JUSTIF) C ADDRESSABILITY,USING AS MUCH OF THE SPACE AS POSSIBLE. XINCH=XINCHO YINCH=YINCHO -C + C test for rscors post or direct mode. Use 7.5x7.5 for direct C and 10.0x7.5 for post -C + C if VDIQDC has already been called, we are in post mode; C otherwise in direct mode CALL VDIQD9(XINCH,YINCH) -C + C CHECK PAGE FORMAT - IF PORTRAIT, C THEN SWITCH THINGS AROUND IF (PGFORM.EQ.1) THEN @@ -298,13 +297,13 @@ SUBROUTINE VIINIT(ASPECT,JUSTIF) XUNITS=XINCH*723. YUNITS=YINCH*723. DASPEC=XUNITS/YUNITS -C + C DEFAULT ASPECT = 1., DEFAULT JUSTIF = 1. IF(ASPEC1.EQ.0.) ASPEC1=DASPEC IF(JUSTI1.EQ.0) JUSTI1=1 -C + IF(ASPEC1.GE.DASPEC) THEN -C + C THEN X DIMENSION IS FILLED. XDEVIC=XUNITS YDEVIC=XUNITS/ASPEC1 @@ -318,7 +317,7 @@ SUBROUTINE VIINIT(ASPECT,JUSTIF) YPAD=YUNITS-YDEVIC END IF ELSE -C + C ELSE Y DIMENSION IS FILLED. XDEVIC=YUNITS*ASPEC1 YDEVIC=YUNITS @@ -332,7 +331,7 @@ SUBROUTINE VIINIT(ASPECT,JUSTIF) XPAD=0 END IF END IF -C + C FIGURE MAXIMUM NDC VALUES XNDCMX AND YNDCMX. IF(ASPEC1.GE.DASPEC) THEN XNDCMX=MIN(1.,ASPEC1) @@ -341,7 +340,7 @@ SUBROUTINE VIINIT(ASPECT,JUSTIF) XNDCMX=ASPEC1 YNDCMX=1. END IF -C + C SET SCALE FACTORS FOR NDC-TO-DEVICE MAPPING. XSCALE=DBLE(XDEVIC)/XNDCMX YSCALE=DBLE(YDEVIC)/YNDCMX @@ -352,21 +351,21 @@ SUBROUTINE VIINIT(ASPECT,JUSTIF) XPAD = XPAD+280. YPAD = YPAD-180. ENDIF -C + CALL PSTSEL(' ') -C + C SET UP MONITORING INFORMATION CALL VBDEV('V PST ') CALL VDMONI(0) IVECT=0 -C + C OPEN OUTPUT FILE CALL PSTOFS(KOUTFL) -C + C INITIALIZE the printer -C + CALL PSTINI -C + CALL PSTBUF(38, '%%Title: Graphics SVDI PostScript File') CALL PSTBUF(0,' ') CALL PSTBUF(40, '%%Creator: SNL SEACAS SVDI Driver -- cps') @@ -429,15 +428,15 @@ SUBROUTINE VIINIT(ASPECT,JUSTIF) CALL PSTBUF(17,'/o {newpath} def ') ENDIF CALL PSTBUF(35,'/p {showpage} def 1 setlinecap v o ') -C + C check for color or black & white mode -C + IF(MOCOLR.EQ.0) THEN -C + C color is on -C + C define some kind of color table -C + DO IC=0,7 COLDEF(1)=0. COLDEF(2)=0. @@ -475,17 +474,17 @@ SUBROUTINE VIINIT(ASPECT,JUSTIF) END IF VECTOR(1)=7. VECTOR(2)=0. -C + C define the postscript current position CALL VBVECT(0,XCP,YCP) -C + C shade background if appropriate -C + IF(KPSTBG.NE.0) THEN CALL PSTBBG KEMPTY=0 END IF -C + C INIT LINE WIDTH,CHARACTER SIZE CALL VDSTLW(VECTOR(5)) c CALL VDSTCS(VECTOR(6)) @@ -495,18 +494,18 @@ SUBROUTINE VIINIT(ASPECT,JUSTIF) END SUBROUTINE VDIQDC(INDEX,VALUE) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDIQDC -Inquire Device Capabilities. -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS -INDEX = integer capability number. Range 1-33. -C + C CALLS - -C + C EXIT CONDITIONS -VALUE = real value of the capability indicated by C INDEX. -C + C NARRATIVE -Return values of various device capabilities. INDEX C is the integer capability number (as given below), C and the real value is returned in VALUE. @@ -640,9 +639,9 @@ SUBROUTINE VDIQDC(INDEX,VALUE) C 33. Device pixel aspect - the ratio of the spacing of device C pixels in x divided by the spacing in y (1 for square C pixels) -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + SAVE INTEGER INDEX REAL VALUE @@ -651,11 +650,11 @@ SUBROUTINE VDIQDC(INDEX,VALUE) C DEFAULT COMPLETE FILL WITH BORDER. PLC. COMMON /VCESCP/ PGFORM,PATNO,BORDER INTEGER PGFORM,PATNO,BORDER -C + C mopoly controls polygon fill =0, on ; =1, off C mocolr controls color =0, on ; =1, off COMMON /VCPSTB/ MOPOLY, MOCOLR -C + *- INCLUDE PSTFULL C size of full view window C parameters set to get same size plot as imagen and qms b&w. @@ -666,33 +665,33 @@ SUBROUTINE VDIQDC(INDEX,VALUE) COMMON /DEVCAP/ DEV(33) DATA NOCALL /0/ -C + C If device is 0, call to reset -C + IF(NINT(DEV(23)).EQ.0) THEN CALL PSTSEL(' ') END IF -C + C CHECK FOR VALID INDEX. IF(INDEX.LT.1.OR.INDEX.GT.33) THEN CALL VBERRH(726,5) GOTO 999 END IF -C + C RETURN INDEXED VALUE. VALUE=DEV(INDEX) IF(INDEX.EQ.23) NOCALL=1 -C + 999 RETURN -C + C********************************************************************** ENTRY VDIQD9(XINCH,YINCH) -C + C This is an added entry for rscors version of pst driver to C tell if direct or post mode operation. If post mode, vdiqdc C is called before vdinit to get terminal type. In direct mode C it is never called to get type. -C + IF(NOCALL.NE.0) THEN C XINCH=10.0 C YINCH=7.5 @@ -703,23 +702,23 @@ SUBROUTINE VDIQDC(INDEX,VALUE) END SUBROUTINE VBERRH(ERRNUM,ERRSEV) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VBERRH -Error Handler. -C + C R.W.Simons -08APR81 C 30SEP81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -ERRNUM = integer error number. C ERRSEV = integer severity code. If > 12, error is C fatal. -C + C CALLS -VDLOGE. -C + C EXIT CONDITIONS - -C + C NARRATIVE -An error will normally cause an error message to C be printed on the error output device and possible C termination of the program, unless a routine VBERRH @@ -729,43 +728,43 @@ SUBROUTINE VBERRH(ERRNUM,ERRSEV) C returning. All versions of VBERRH, whether user- C supplied or default, must STOP on any error severity C greater than 12. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER ERRNUM,ERRSEV -C + C REPORT THE ERROR USING VDLOGE. CALL VDLOGE(ERRNUM,ERRSEV) -C + C CHECK FOR FATAL ERROR. IF(ERRSEV.GT.12) STOP -C + RETURN END SUBROUTINE VDGNAM(NAME) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDGNAM -Name the graphics output file -C + C P.L.Crotty -OCT88 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -NAME = character string; < 80 characters -C + C CALLS -C + C EXIT CONDITIONS -output graphics file is assigned the name NAME -C + C NARRATIVE -This subroutine associates a file name with C the graphics output file (KOUTFL). If this C routine is not called, a system dependent C default name is used. VDGNAM must be called C before VDINIT. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + SAVE CHARACTER*(*) NAME CHARACTER*2048 PSTNAM @@ -826,26 +825,26 @@ SUBROUTINE VDGNAM(NAME) END SUBROUTINE VDINIT(ASPECT,JUSTIF) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDINIT -Initialize SVDI. -C + C R.W.Simons -08APR81 C 30SEP81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -ASPECT = real ratio of X dimension to Y dimension. C Range >0.0. Default: 0.0 (device dependent). C JUSTIF = integer justification of NDC space on the C device. Range 0-9. Default: 0 (device dependent). -C + C CALLS -PSTJOB, VBERRH, VIINIT. -C + C EXIT CONDITIONS -XNDCMX,YNDCMX = real NDC maximum valid values. C VECTOR = real array of default attribute values (all C device-dependent except VECTOR(4)=0.0). -C + C NARRATIVE -This must be the first SVDI call made. All C attribute values, the color table, and current C position are set to appropriate defaults for the @@ -853,7 +852,7 @@ SUBROUTINE VDINIT(ASPECT,JUSTIF) C is done. The screen is cleared or paper advanced C if necessary to guarantee a blank view surface for C drawing. -C + C ASPECT specifies the ratio of the X dimension to the C Y dimension. Maximum NDC values (at least one of C which will be 1.0) are computed to give the ASPECT @@ -864,7 +863,7 @@ SUBROUTINE VDINIT(ASPECT,JUSTIF) C aspect of 1.0. The NDC rectangle is scaled until C one dimension fills the corresponding dimension of C the device. -C + C JUSTIF determines where the rectangle is located on C the device as diagrammed below: C --------- @@ -874,18 +873,18 @@ SUBROUTINE VDINIT(ASPECT,JUSTIF) C --------- C For example, JUSTIF = 7 indicates NDC space will be C upper left justified on the device. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL ASPECT INTEGER JUSTIF -C + C JOB ID INFORMATION. (HC1, DIC) include 'vcjob.blk' -C + C COMPUTER DEPENDENT COMMON VARIABLES AND CONSTANTS. include 'vcpstc.blk' -C + C set common variables KWRTFL=6 KRDFL=0 @@ -903,64 +902,64 @@ SUBROUTINE VDINIT(ASPECT,JUSTIF) C IF(KSECUR.NE.0) THEN C CALL VBERRH(957,13) C END IF -C + C THIS IS JUST A DUMMY ROUTINE WHICH DOES NOTHING BUT CALL VIINIT. C THIS ORGANIZATION FACILITATES ADDING SECURITY MARKINGS TO SVDI. CALL VIINIT(ASPECT,JUSTIF) -C + RETURN END SUBROUTINE VDIQND(XNDC,YNDC) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDIQND -Inquire NDC Space. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -XNDCMX,YNDCMX = real maximum valid NDC values. -C + C CALLS - -C + C EXIT CONDITIONS -XNDC,YNDC = real maximum valid NDC values (XNDCMX, C YNDCMX). -C + C NARRATIVE -Return the maximum NDC values as set to realize the C aspect defined by VDINIT. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL XNDC,YNDC -C + C MAXIMUM VALID NDC VALUES. (DEVICE-INDEPENDENT) REAL XNDCMX,YNDCMX COMMON /VCNDCM/ XNDCMX,YNDCMX -C + C RETURN THE MAXIMUM VALID NDC VALUES. XNDC=XNDCMX YNDC=YNDCMX -C + RETURN END SUBROUTINE VDIQOS(ATTARR) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDIQOS -Inquire Output Status (of Attributes). -C + C K.M. ERICKSON -14 NOV 80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -VECTOR = real array of current attribute values. -C + C CALLS - -C + C EXIT CONDITIONS -ATTARR = real array of current attribute value C (VECTOR). -C + C NARRATIVE -Return the current attribute values in ATTARR as C given below. C ATTARR(1)=Foreground Color @@ -970,11 +969,11 @@ SUBROUTINE VDIQOS(ATTARR) C (5)=Line Width C (6)=Character Box Y C (7)=Character Box X -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL ATTARR(7) -C + C CURRENT ATTRIBUTE VALUES. (DEVICE-INDEPENDENT) REAL VECTOR(7) COMMON /VCATTR/ VECTOR @@ -985,64 +984,64 @@ SUBROUTINE VDIQOS(ATTARR) C (5)=LINE WIDTH C (6)=CHARACTER BOX Y C (7)=CHARACTER BOX X -C + INTEGER I -C + DO I=1,7 ATTARR(I)=VECTOR(I) end do -C + RETURN END SUBROUTINE VDLINA(X,Y) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDLINA -Line Absolute. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -X,Y = real NDC position. -C + C CALLS -VILINA. -C + C EXIT CONDITIONS - -C + C NARRATIVE -Draw a line from current position to absolute NDC C position X,Y and update current position. C Attributes foreground color, intensity, line style, C and line width apply. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL X,Y -C + C THIS IS JUST A DUMMY ROUTINE WHICH DOES NOTHING BUT CALL VILINA. C THIS ORGANIZATION FACILITATES ADDING SECURITY MARKINGS TO SVDI. CALL VILINA(X,Y) -C + RETURN END SUBROUTINE VDLOGE(ERRNUM,ERRSEV) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDLOGE -Log Error. -C + C R.W.Simons -08APR81 C K.M.Erickson -8OCT84 - add buffer flush -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -ERRNUM = integer error number. C ERRSEV = integer error severity. -C + C CALLS -PSTTBK, VDBUFL -C + C EXIT CONDITIONS - -C + C NARRATIVE -Report error with message to user and possibly C terminate job depending on severity. Notice that C by judicious use of the error routines (see VBERRH) @@ -1051,44 +1050,42 @@ SUBROUTINE VDLOGE(ERRNUM,ERRSEV) C occurrences of a particular error, or terminate C if more than 10 errors of a particular severity C occur. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER ERRNUM,ERRSEV -C -C + C COMPUTER DEPENDENT COMMON VARIABLES AND CONSTANTS. include 'vcpstc.blk' -C + C flush buffer before we do a write CALL VDBUFL -C + C WRITE THE ERROR TO THE LISTING. WRITE(KWRTFL,10)ERRNUM,ERRSEV 10 FORMAT(' SVDI ERROR NUMBER ',I5,' SEVERITY CODE ',I5) -C + C TRACEBACK. csam CALL PSTTBK -C + RETURN END SUBROUTINE VDMONI(ISTATE) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDMONI -Logs Usage Information.. -C -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -ISTATE = 0 - initialization C 1 - new page C 2 - terminate -C + C CALLS -C + C EXIT CONDITIONS - -C + C NARRATIVE -For ISTATE=0, job information is initialized, and C timers are initialized called by VIINIT. C ISTATE=1 will increment a common block page @@ -1102,16 +1099,16 @@ SUBROUTINE VDMONI(ISTATE) C Entry point VBDEV has an 8 character parameter C which will set a common block variable specifying C the device being used. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C dummy routine -C + CHARACTER*(*) C1,C2 -C + RETURN C Usage Monitoring Information -C + ENTRY VBPKG (C1) RETURN ENTRY VBDEV (C2) @@ -1125,106 +1122,106 @@ SUBROUTINE VDMONI(ISTATE) END SUBROUTINE VDMOVA(X,Y) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDMOVA -Move Absolute. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -X,Y = real NDC position. -C + C CALLS -VIMOVA -C + C EXIT CONDITIONS - -C + C NARRATIVE -Set current position to absolute NDC position X,Y. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL X,Y -C + C THIS IS JUST A DUMMY ROUTINE WHICH DOES NOTHING BUT CALL VIMOVA. C THIS ORGANIZATION FACILITATES ADDING SECURITY MARKINGS TO SVDI. CALL VIMOVA(X,Y) -C + RETURN END SUBROUTINE VDNWPG C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDNWPG -New Page. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS - -C + C CALLS -VINWPG. -C + C EXIT CONDITIONS - -C + C NARRATIVE -Physically advance the medium or clear the screen, C whichever is appropriate. Also flood the screen C with the background color on devices that support C this function. The current position is not changed. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C THIS IS JUST A DUMMY ROUTINE WHICH DOES NOTHING BUT CALL VINWPG. C THIS ORGANIZATION FACILITATES ADDING SECURITY MARKINGS TO SVDI. CALL VINWPG -C + RETURN END SUBROUTINE VDPNTA(X,Y) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDPNTA -Point Absolute. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -X,Y = real NDC position. -C + C CALLS -VIPNTA. -C + C EXIT CONDITIONS - -C + C NARRATIVE -Set current position to absolute NDC position X,Y C and put a visible point there. Attributes C foreground color and intensity apply. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL X,Y -C + C THIS IS JUST A DUMMY ROUTINE WHICH DOES NOTHING BUT CALL VIPNTA. C THIS ORGANIZATION FACILITATES ADDING SECURITY MARKINGS TO SVDI. CALL VIPNTA(X,Y) -C + RETURN END SUBROUTINE VDPOLY(XARRAY,YARRAY,NPTS) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDPOLY -POLYGON FILL ROUTINE -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS -XARRAY-ARRAY OF X VALUES OF THE POLYGON C YARRAY-CORRESPONDING ARRAY OF Y VALUES C NPTS- NUMBER OF POINTS IN (XARRAY,YARRAY) -C + C CALLS -VIPOLY -C + C EXIT CONDITIONS - -C + C NARRATIVE -The polygon defined by XARRAY,YARRAY will be drawn C and filled (constrained by any limitations of the C physical device -- see below). No checking will be @@ -1233,11 +1230,11 @@ SUBROUTINE VDPOLY(XARRAY,YARRAY,NPTS) C boundary is drawn using the solid line style. C VDI will close the polygon (i.e. the last point C will be connected to the first). -C + C The level of support for this primitive is device- C dependent. The level of support is categorized C as follows: -C + C Level 0 -- no polygon fill. Only the polygon C boundary is drawn. C Level 1 -- the device fills convex polygons. @@ -1250,43 +1247,43 @@ SUBROUTINE VDPOLY(XARRAY,YARRAY,NPTS) C is drawn to that point from a point far outside C the polygon, that line intersects the polygon C boundary an odd number of times. -C + C Note that the level of support for a particular device C can be inquired using the function VDIQDC. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER NPTS REAL XARRAY(NPTS),YARRAY(NPTS) -C + C THIS IS JUST A DUMMY ROUTINE WHICH DOES NOTHING BUT CALL VIPOLY. C THIS ORGANIZATION FACILITATES ADDING SECURITY MARKINGS TO SVDI. C mopoly controls polygon fill =0, on ; =1, off C mocolr controls color =0, on ; =1, off COMMON /VCPSTB/ MOPOLY, MOCOLR -C + IF(MOPOLY.EQ.0) THEN CALL VIPOLY(XARRAY,YARRAY,NPTS) END IF -C + RETURN END SUBROUTINE VDSTOS(ATTARR) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDSTOS -Set Output Status (of Attributes). -C + C K.M. ERICKSON -14 NOV 80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -ATTARR = real array of attribute values. -C + C CALLS -VDSTBC,VDSTCS,VDSTFC,VDSTIN,VDSTLS,VDSTLW -C + C EXIT CONDITIONS -VECTOR = real updated attribute values (ATTARR). -C + C NARRATIVE -Set the attribute values from ATTARR as given below. C ATTARR(1)=Foreground Color C (2)=Background Color @@ -1294,11 +1291,11 @@ SUBROUTINE VDSTOS(ATTARR) C (4)=Line Style C (5)=Line Width C (6)=Character Box Y -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL ATTARR(6) -C + C CURRENT ATTRIBUTE VALUES. (DEVICE-INDEPENDENT) REAL VECTOR(7) COMMON /VCATTR/ VECTOR @@ -1309,7 +1306,7 @@ SUBROUTINE VDSTOS(ATTARR) C (5)=LINE WIDTH C (6)=CHARACTER BOX Y C (7)=CHARACTER BOX X -C + C CALL EACH OF THE INDIVIDUAL ATTRIBUTE SETTING ROUTINES. C CHECK FOR VALIDITY OF INPUT VALUES WILL BE DONE IN EACH INDIVIDUAL C ROUTINE. @@ -1319,56 +1316,56 @@ SUBROUTINE VDSTOS(ATTARR) CALL VDSTLS(NINT(ATTARR(4))) CALL VDSTLW(ATTARR(5)) c CALL VDSTCS(ATTARR(6)) -C + RETURN END SUBROUTINE VDTERM C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDTERM -Terminate SVDI. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS - -C + C CALLS -VITERM. -C + C EXIT CONDITIONS - -C + C NARRATIVE -Terminate the SVDI by flushing buffers, etc. This C should be the last SVDI call made. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C THIS IS JUST A DUMMY ROUTINE WHICH DOES NOTHING BUT CALL VITERM. C THIS ORGANIZATION FACILITATES ADDING SECURITY MARKINGS TO SVDI. CALL VITERM -C + RETURN END SUBROUTINE VDTEXT(LENGTH,CHARS) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDTEXT -Text from Array. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -LENGTH = integer number of characters in CHARS. C Range 1-136. C CHARS = integer array of ASCII characters, one C character per array element, right justified. C Range 8,10,32-126. -C + C CALLS -VITEXT. -C + C EXIT CONDITIONS - -C + C NARRATIVE -Draw LENGTH characters in CHARS, starting at C current position and update current position to C the point after the last character box where the @@ -1381,178 +1378,176 @@ SUBROUTINE VDTEXT(LENGTH,CHARS) C considered reasonable. Attributes foreground color, C background color, intensity, and character size C apply. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER LENGTH,CHARS(136) -C + C THIS IS JUST A DUMMY ROUTINE WHICH DOES NOTHING BUT CALL VITEXT. C THIS ORGANIZATION FACILITATES ADDING SECURITY NARKINGS TO SVDI. CALL VITEXT(LENGTH,CHARS) -C + RETURN END SUBROUTINE VDFRAM(ITYPE) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDFRAM - Draw header or trailer frame -C + C P. Watterberg - 27 Aug 81 -C + C ENVIRONMENT -Computer-independent, system-independent, FORTRAN 77 -C + C ENTRY CONDITIONS - ITYPE = 0 for header frame C = 1 for trailer frame -C + C CALLS - VIFRAM -C + C EXIT CONDITIONS - -C + C NARRATIVE - Calls vifram to get time and date from the C system via the computer-dependent routine PSTTOD(entry C point in PSTJOB) and writes it on an identification frame. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER ITYPE -C + CALL VIFRAM(ITYPE) RETURN END SUBROUTINE VIFRAM(ITYPE) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VIFRAM - Draw header or trailer frame -C + C P. Watterberg - 27 Aug 81 -C + C ENVIRONMENT -Computer-independent, system-independent, FORTRAN 77 -C + C ENTRY CONDITIONS - ITYPE = 0 for header frame C = 1 for trailer frame -C + C CALLS - -C + C EXIT CONDITIONS - -C + C NARRATIVE -NULL ROUTINE -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER ITYPE -C + RETURN END SUBROUTINE VDAABU(BTNNUM) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDAABU -Await Any Button. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Batch Devices. -C + C ENTRY CONDITIONS - -C + C CALLS - -C + C EXIT CONDITIONS -BTNNUM = integer number of the button pressed. C Range 1 to a device dependent maximum which must be C at least 8. -C + C NARRATIVE -When a button has been pressed, its integer button C number is returned in BTNNUM. This function flushes C the button buffer, if any. This function flushes C the output buffers before doing input. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER BTNNUM -C -C + C COMPUTER DEPENDENT COMMON VARIABLES AND CONSTANTS. include 'vcpstc.blk' -C + C BATCH DEVICES DON'T NEED TO FLUSH BUFFERS. -C + BTNNUM=32 -C + RETURN END SUBROUTINE VDABGL(BTNNUM,X,Y) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDABGL -Await Button, Get Locator. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Batch Devices. -C + C ENTRY CONDITIONS - -C + C CALLS - -C + C EXIT CONDITIONS -BTNNUM = integer number of the button pressed. C Range 1 to a device dependent maximum that must be C at least 8. C X,Y = real NDC position of the locator. -C + C NARRATIVE -Wait until a button is hit, then return the number C of the button in BTNNUM and the NDC value of the C locator in X,Y. This function flushes the output C buffers before doing input. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL X,Y INTEGER BTNNUM -C -C + C COMPUTER DEPENDENT COMMON VARIABLES AND CONSTANTS. include 'vcpstc.blk' -C + C BATCH DEVICES DON'T NEED TO FLUSH BUFFERS. -C + BTNNUM=32 X=0 Y=0 -C + RETURN END SUBROUTINE VDAKGL(CHAR,X,Y) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDAKGL -Await Keyboard, Get Locator. -C + C R.W.SIMONS -02DEC80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Batch Devices. -C + C ENTRY CONDITIONS - -C + C CALLS - -C + C EXIT CONDITIONS -CHAR = integer ASCII character input from the C keyboard, right-justified, zero fill. Range 32-126. C X,Y = real NDC position of the locator. -C + C NARRATIVE -Wait until a key is hit, then return the character C entered in CHAR and the NDC value of the locator C in X,Y. If the character entered does not fall in C the range 32-126, a blank(32) is returned in CHAR. C This function flushes the output buffers before C doing input. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL X,Y INTEGER CHAR -C + C dummy routine -C + CHAR=32 X=0. Y=0. @@ -1560,20 +1555,20 @@ SUBROUTINE VDAKGL(CHAR,X,Y) END SUBROUTINE VDALOC(X,Y) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDALOC -Await Locator. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Batch Devices. -C + C ENTRY CONDITIONS - -C + C CALLS - -C + C EXIT CONDITIONS -X,Y = real NDC position of the locator. -C + C NARRATIVE -Wait until the locator is positioned, then return C the NDC value of the locator in X,Y. The fact that C the locator is positioned can be signaled in a @@ -1584,150 +1579,149 @@ SUBROUTINE VDALOC(X,Y) C function, as only the locator position is returned. C This function flushes the output buffers before C doing input. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL X,Y -C -C + C COMPUTER DEPENDENT COMMON VARIABLES AND CONSTANTS. include 'vcpstc.blk' -C + C BATCH DEVICES DON'T NEED TO FLUSH BUFFERS. -C + X=0 Y=0 -C + RETURN END SUBROUTINE VDBELL C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDBELL -Ring Bell -C + C R.W.SIMONS -02DEC80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Batch Devices. -C + C ENTRY CONDITIONS - -C + C CALLS - -C + C EXIT CONDITIONS - -C + C NARRATIVE -Ring user's bell to get his attention. This C function is ignored by batch devices. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C THIS FUNCTION IS IGNORED BY BATCH DEVICES. -C + RETURN END SUBROUTINE VDBUFL C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDBUFL -Buffer Flush. -C + C R.W.Simons -19DEC80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Batch Devices. -C + C ENTRY CONDITIONS - -C + C CALLS - -C + C EXIT CONDITIONS - -C + C NARRATIVE -Assure that the picture is up-to-date by flushing C buffers if necessary. Also prepare the device to C operate in alphanumeric (as opposed to graphic) C mode. This is necessary on some devices so that C alphanumeric data from FORTRAN I/O won't be C misinterpreted as graphic data. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C THIS FUNCTION IS IGNORED BY BATCH DEVICES. -C + RETURN END SUBROUTINE VDSTLA(LOCX,LOCY) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDSTLA -Set Initial Locator Position. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Batch Devices. -C + C ENTRY CONDITIONS -LOCX,LOCY = real NDC position that the locator is C initilaized to. -C + C CALLS - -C + C EXIT CONDITIONS - -C + C NARRATIVE -Set the initial locator position (light pen tracking C cross, for example) each time this function is C called. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL LOCX,LOCY -C + C BATCH DEVICES IGNORE THIS FUNCTION. -C + RETURN END SUBROUTINE VDWAIT C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDWAIT -Wait for User. -C + C R.W.SIMONS -02DEC80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Batch Devices. -C + C ENTRY CONDITIONS - -C + C CALLS - -C + C EXIT CONDITIONS - -C + C NARRATIVE -Wait for the user to view the screen and signal he C is done, normally by hitting any key. This function C flushes the output buffers before doing input. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C BATCH DEVICES IGNORE THIS COMMAND. -C + RETURN END SUBROUTINE VDIQCO(NUM,INDEX,CLRARY,CLRMOD) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDIQCO -Inquire Color Table. -C + C R.W.Simons -08APR81 C H. S. LAUSON 29MAY86 - changed for current HLS interpretation -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Black and White Devices. (LXY, HC1, ALP) -C + C ENTRY CONDITIONS -NUM = integer number of color indexes to inquire. C Range 1-256. C INDEX = integer array of indexes to inquire. Range C 0-255. C CLRMOD = integer color model to be used. Range 0,1. -C + C CALLS -VBERRH -C + C EXIT CONDITIONS -CLRARY = real array of 3 by NUM elements returning C the values of the components of the indexes inquired. C Range for RGB: red 0.0-1.0 @@ -1736,7 +1730,7 @@ SUBROUTINE VDIQCO(NUM,INDEX,CLRARY,CLRMOD) C Range for HLS: hue 0.0-360.0 C lightness 0.0-1.0 C saturation 0.0-1.0 -C + C NARRATIVE -Inquire one or more color table entries. NUM and C INDEX specify how many and which indexes are being C inquired. CLRMOD specifies which color model @@ -1745,28 +1739,28 @@ SUBROUTINE VDIQCO(NUM,INDEX,CLRARY,CLRMOD) C support a color table index specified will C return -1.0 in the first element of the CLRARY value C for that index. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER NUM,INDEX(NUM),CLRMOD REAL CLRARY(3,NUM) -C + COMMON /PCOLST/ PCOLS(3,256) -C + C CHECK FOR VALID NUM. IF(NUM.LT.1.OR.NUM.GT.256) THEN CALL VBERRH(723,5) GOTO 999 END IF -C + C CHECK FOR VALID CLRMOD. IF(CLRMOD.NE.0.AND.CLRMOD.NE.1) THEN CALL VBERRH(725,5) GOTO 999 END IF -C + IF(CLRMOD.NE.0) STOP 'HLS COLORS NOT SUPPORTED' -C + C CHECK FOR VALID INDEXES. DO 100 I=1,NUM INDEXN=INDEX(I) @@ -1778,58 +1772,58 @@ SUBROUTINE VDIQCO(NUM,INDEX,CLRARY,CLRMOD) CLRARY(2,I)=PCOLS(2,INDEXN) CLRARY(3,I)=PCOLS(3,INDEXN) 100 CONTINUE -C + 999 RETURN END SUBROUTINE VDIQCP(X,Y) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDIQCP -Inquire Where Current Position Is. -C + C R.W.Simons -02DEC80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Devices that support a software CP. C (AP5,GER,H50,HC1,HCB,HPP,I10,I30,LXY,QCR,QMS,XYN) -C + C ENTRY CONDITIONS - -C + C CALLS - -C + C EXIT CONDITIONS -X,Y = real NDC position. -C + C NARRATIVE -Return the value of current position. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C CURRENT POSITION. REAL XCP,YCP COMMON /VCCRPS/ XCP,YCP -C + C ASSIGN THE CP TO X,Y. X=XCP Y=YCP -C + RETURN END SUBROUTINE VDSTBC(COLOR) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDSTBC -Set Background Color. -C + C R.W.Simons -05DEC80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Devices with a constant white background. (LXY, C HC1, ALP) -C + C ENTRY CONDITIONS -COLOR = integer color table index. Range 0-255. C Default: device dependent, in range 0-7. -C + C CALLS -VBERRH -C + C EXIT CONDITIONS -VECTOR(2) = real updated background color (COLOR). -C + C NARRATIVE -Set the background color for following VDNWPG or C TEXT primitives for devices supporting these C features. For example, many raster devices support @@ -1840,11 +1834,11 @@ SUBROUTINE VDSTBC(COLOR) C dependent value in the range 0-7. C If an unsupported value is specified, set to C default. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER COLOR -C + C CURRENT ATTRIBUTE VALUES. (DEVICE-INDEPENDENT) REAL VECTOR(7) COMMON /VCATTR/ VECTOR @@ -1855,29 +1849,29 @@ SUBROUTINE VDSTBC(COLOR) C (5)=LINE WIDTH C (6)=CHARACTER BOX Y C (7)=CHARACTER BOX X -C + C CHECK FOR VALID COLOR. IF(COLOR.LT.0.OR.COLOR.GT.255) THEN CALL VBERRH(724,5) GOTO 999 END IF -C + C ONLY THE SINGLE BACKGROUND COLOR 7 (WHITE) IS SUPPORTED, C SO NO ACTION IS NECESSARY. -C + vector(2) = color 999 RETURN END SUBROUTINE VDSTCO(NUM,INDEX,CLRARY,CLRMOD) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDSTCO -Set Color Table. -C + C R.W.SIMONS -02DEC80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Black and White Devices. (LXY, HC1, ALP) -C + C ENTRY CONDITIONS -NUM = integer number of color indexes to be set. C Range 1-256. C INDEX = integer array of indexes to be set. Range @@ -1903,11 +1897,11 @@ SUBROUTINE VDSTCO(NUM,INDEX,CLRARY,CLRMOD) C 7 white 1.,1.,1. C CLRMOD = integer color model being used. Range 0,1. C Default: 0 (RGB). -C + C CALLS -VBERRH -C + C EXIT CONDITIONS - -C + C NARRATIVE -Set one or more color table entries. This is a C dynamic setting, if the device will support it. C "Dynamic" neans that primitives which have already @@ -1930,36 +1924,36 @@ SUBROUTINE VDSTCO(NUM,INDEX,CLRARY,CLRMOD) C All devices must support at least a single device C dependent INDEX value in the range 0-7. If an C unsupported value is specified, it should be ignored. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER NUM,INDEX(NUM),CLRMOD REAL CLRARY(3,NUM) CHARACTER*6 KOLIND CHARACTER*20 KOLCOM COMMON /VCVEC1/ IVECT INTEGER IVECT -C + C ARRAY TO CONTAIN COMPLETE COLOR TABLE -C + COMMON /PCOLST/ PCOLS(3,256) -C + C mopoly controls polygon fill =0, on ; =1, off C mocolr controls color =0, on ; =1, off COMMON /VCPSTB/ MOPOLY, MOCOLR -C + C CHECK FOR VALID NUM. IF(NUM.LT.1.OR.NUM.GT.256) THEN CALL VBERRH(723,5) GOTO 999 END IF -C + C CHECK FOR VALID CLRMOD. IF(CLRMOD.NE.0.AND.CLRMOD.NE.1) THEN CALL VBERRH(725,5) GOTO 999 END IF -C + C CHECK FOR VALID INDEXES. DO 100 I=1,NUM INDEXN=INDEX(I) @@ -1978,19 +1972,19 @@ SUBROUTINE VDSTCO(NUM,INDEX,CLRARY,CLRMOD) CALL VBERRH(727,5) GOTO 100 END IF -C + C 256 INDEXES ARE SUPPORTED: PCOLS(1,INDEXN+1)=CLRARY(1,I) PCOLS(2,INDEXN+1)=CLRARY(2,I) PCOLS(3,INDEXN+1)=CLRARY(3,I) -C + C define symbol for color reference -C + IF(MOCOLR.NE.0) GO TO 390 -C + C if a set of vectors was in process, issue stroke command C to draw them - then start a new path. -C + IF(IVECT.NE.0) THEN CALL PSTBUF(2,'s ') IVECT=0 @@ -2024,32 +2018,32 @@ SUBROUTINE VDSTCO(NUM,INDEX,CLRARY,CLRMOD) CALL VBERRH(727,5) GOTO 100 END IF -C + C 256 INDEXES ARE SUPPORTED: STOP 'HLS COLORS NOT AVAILABLE' END IF 100 CONTINUE -C + 999 RETURN END SUBROUTINE VDSTFC(COLOR) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDSTFC -Set Foreground Color. -C + C R.W.Simons -05DEC80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Devices with a constant black foreground. (LXY, C HC1) -C + C ENTRY CONDITIONS -COLOR = integer color table index . Range 0-255. C Default is device dependent, in range 0-7. -C + C CALLS -VBERRH -C + C EXIT CONDITIONS -VECTOR(1) = real updated foreground color (COLOR). -C + C NARRATIVE -Set the foreground color index, i.e., the color C table index used for drawing future primitives. C Color is an integer from 0-255 which is used as an @@ -2058,16 +2052,16 @@ SUBROUTINE VDSTFC(COLOR) C dependent value in the range 0-7. C If an unsupported value is specified, set to C default. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER COLOR CHARACTER*5 KOLIND -C + C ARRAY TO CONTAIN COMPLETE COLOR TABLE -C + COMMON /PCOLST/ PCOLS(3,256) -C + C pstmlw controls minimum line width C kpstbg controls background coloring C = 0, not colored (white ground from paper) @@ -2076,11 +2070,11 @@ SUBROUTINE VDSTFC(COLOR) C = 0, no interchange C = 1, colors interchanged COMMON /VCPSTA/ PSTMLW, KPSTBG, KPSTCI -C + C mopoly controls polygon fill =0, on ; =1, off C mocolr controls color =0, on ; =1, off COMMON /VCPSTB/ MOPOLY, MOCOLR -C + COMMON /VCVEC1/ IVECT INTEGER IVECT C CURRENT ATTRIBUTE VALUES. (DEVICE-INDEPENDENT) @@ -2093,17 +2087,16 @@ SUBROUTINE VDSTFC(COLOR) C (5)=LINE WIDTH C (6)=CHARACTER BOX Y C (7)=CHARACTER BOX X -C C CHECK FOR VALID COLOR. IF(COLOR.LT.0.OR.COLOR.GT.255) THEN CALL VBERRH(724,5) GO TO 999 END IF -C + VECTOR(1)=COLOR IF(MOCOLR.EQ.0) THEN -C + C draw any vectors in stack before changing colors IF(IVECT.NE.0) THEN CALL PSTBUF(4,'s r ') @@ -2112,7 +2105,7 @@ SUBROUTINE VDSTFC(COLOR) CALL PSTBUF(0,' ') IVECT=0 END IF -C + C code using symbols KOLIND='c' IF(COLOR.LE.9) THEN @@ -2135,27 +2128,27 @@ SUBROUTINE VDSTFC(COLOR) NNN=5 END IF CALL PSTBUF(NNN,KOLIND(1:NNN)) -C + END IF 999 RETURN END SUBROUTINE VDSTIN(INTEN) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDSTIN -Set Intensity. -C + C R.W.Simons -05DEC80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Single Intensity Devices. (LXY, HC1) -C + C ENTRY CONDITIONS -INTEN = real intensity of the image of an output C primitive. Range 0.-1. Default: device dependent. -C + C CALLS - -C + C EXIT CONDITIONS -VECTOR(3) = real updated intensity (INTEN). -C + C NARRATIVE -Set the intensity value indicated for future C primitives. Intensity is a real value between 0 C (not visible) and 1 (maximum). Intensities are @@ -2163,11 +2156,11 @@ SUBROUTINE VDSTIN(INTEN) C All devices must support at least a single value: C 1.0. If an unsupported value is specified, set to C the closest supported intensity. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL INTEN -C + C CURRENT ATTRIBUTE VALUES. (DEVICE-INDEPENDENT) REAL VECTOR(7) COMMON /VCATTR/ VECTOR @@ -2178,39 +2171,38 @@ SUBROUTINE VDSTIN(INTEN) C (5)=LINE WIDTH C (6)=CHARACTER BOX Y C (7)=CHARACTER BOX X -C + C CHECK FOR VALID INTEN. IF(INTEN.LT.0.0.OR.INTEN.GT.1.0) THEN CALL VBERRH(401,5) GOTO 999 END IF -C + C ONLY THE SINGLE INTENSITY 1.0 (MAXIMUM) IS SUPPORTED, C SO NO ACTION IS NECESSARY. -C + 999 RETURN END SUBROUTINE VITERM C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VITERM -TERMINATE. -C + C D.L. CAMPBELL -1-DEC-1986 C J.P. LONG -9-NOV-1987 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS - -C + C CALLS - -C + C EXIT CONDITIONS - -C + C NARRATIVE -Terminate graphics device. Close output file. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C -C + C COMPUTER DEPENDENT COMMON VARIABLES AND CONSTANTS. include 'vcpstc.blk' COMMON /VCPAGE/ TOTPAG @@ -2219,7 +2211,7 @@ SUBROUTINE VITERM C mopoly controls polygon fill =0, on ; =1, off C mocolr controls color =0, on ; =1, off COMMON /VCPSTB/ MOPOLY, MOCOLR -C + C put out the last page and restore postscript environment so C nothing is left on the stack CALL VINWPG @@ -2245,78 +2237,77 @@ SUBROUTINE VITERM C CLOSE OUTPUT FILE CALL PSTCFS(KOUTFL,1) CALL VDMONI(2) -C + RETURN END SUBROUTINE VIMOVA(X,Y) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VIMOVA -Move Absolute. -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS -X,Y = real NDC position. -C + C CALLS - -C + C EXIT CONDITIONS -XCP,YCP = real updated current position. (X,Y) -C + C NARRATIVE -Set current position to absolute NDC position X,Y. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL X,Y -C -C + C move CALL VBVECT(0,X,Y) -C + RETURN END SUBROUTINE VIPNTA(X,Y) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VIPNTA -Point Absolute. -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS -X,Y = real NDC position. -C + C CALLS -VIMOVA,VILINA -C + C EXIT CONDITIONS - -C + C NARRATIVE -Set current position to absolute NDC position X,Y C and put a visible point there. Attributes C foreground color and intensity apply. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL X,Y -C + CALL VIMOVA(X,Y) CALL VILINA(X,Y) -C + RETURN END SUBROUTINE VIPOLY(XARRAY,YARRAY,NPTS) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VIPOLY -POLYGON FILL ROUTINE -C + C D.L. CAMPBELL -1-DEC-1986 C J.P. LONG -9-NOV-1987 -C + C ENVIRONMENT -Fortran77, QMS -C + C ENTRY CONDITIONS -XARRAY-ARRAY OF X VALUES OF THE POLYGON C YARRAY-CORRESPONDING ARRAY OF Y VALUES C NPTS- NUMBER OF POINTS IN (XARRAY,YARRAY) -C + C CALLS - -C + C EXIT CONDITIONS - -C + C NARRATIVE -The polygon defined by XARRAY,YARRAY will be drawn C and filled (constrained by any limitations of the C physical device -- see below). No checking will be @@ -2325,11 +2316,11 @@ SUBROUTINE VIPOLY(XARRAY,YARRAY,NPTS) C boundary is drawn using the solid line style. C VDI will close the polygon (i.e. the last point C will be connected to the first). -C + C The level of support for this primitive is device- C dependent. The level of support is categorized C as follows: -C + C Level 0 -- no polygon fill. Only the polygon C boundary is drawn. C Level 1 -- the device fills convex polygons. @@ -2342,18 +2333,18 @@ SUBROUTINE VIPOLY(XARRAY,YARRAY,NPTS) C is drawn to that point from a point far outside C the polygon, that line intersects the polygon C boundary an odd number of times. -C + C Note that the level of support for a particular device C can be inquired using the function VDIQDC. -C + ******************************************************************************** -C + C The level for this device is level 2. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL XARRAY(NPTS),YARRAY(NPTS) -C + C ESCAPE FLAGS C PATNO AND BORDER USED BY VIPOLY FOR PATTERN FILL AND BORDER ON/OFF. DEFAULT C COMPLETE FILL AND BORDER ON @@ -2373,25 +2364,25 @@ SUBROUTINE VIPOLY(XARRAY,YARRAY,NPTS) COMMON /VCVEC2/ COORD, LSTCRD CHARACTER COORD*20, LSTCRD*20 INTEGER IVECT -C + C mopoly controls polygon fill =0, on ; =1, off C mocolr controls color =0, on ; =1, off COMMON /VCPSTB/ MOPOLY, MOCOLR -C + C CHECK FOR VALID N IF (NPTS.LT.1 .OR. NPTS.GT.1490) THEN CALL VBERRH(802,5) GO TO 999 END IF -C + C IF A SET OF VECTORS WAS IN PROCESS, ISSUE STROKE COMMAND TO DRAW THEM C Start a new path. -C + IF(IVECT.NE.0) THEN CALL PSTBUF(2,'s ') IVECT=0 END IF -C + CALL PSTBUF(2,'r ') CALL PSTBUF(0,' ') CALL PSTBUF(4,'v o ') @@ -2402,20 +2393,20 @@ SUBROUTINE VIPOLY(XARRAY,YARRAY,NPTS) CALL VDSTFC(NINT(VECTOR(1))) END IF CALL PSTBUF(0,' ') -C + C DRAW POLYGON VECTORS -C + C MOVE TO FIRST POINT CALL VIMOVA(XARRAY(1),YARRAY(1)) -C + C CALL VDLINA TO DRAW POINTS FROM 1ST POINT TO NTH POINT DO I=2,NPTS CALL VILINA(XARRAY(I),YARRAY(I)) end do -C + C THEN DRAW A LINE TO THE FIRST POINT TO CLOSE THE POLYGON CALL VILINA(XARRAY(1),YARRAY(1)) -C + C CLOSE THE POLYGON, GRAPHICS SAVE, FILL IT, GRAPHICS RESTORE, STROKE C TO PROVIDE THE SAME FILLED AREA AS IF IT WERE FILLED WITH VECTORS C THEN RESTORE AND SAVE POSTSCRIPT ENVIRONMENT TO AVOID INPUT BUFFER OVERFLOW @@ -2431,48 +2422,48 @@ SUBROUTINE VIPOLY(XARRAY,YARRAY,NPTS) c CALL VDSTCS(VECTOR(6)) END IF CALL PSTBUF(0,' ') -C + C INIT THE CURRENT POSITION WITHIN POSTSCRIPT CALL VDMOVA(XARRAY(NPTS),YARRAY(NPTS)) IVECT=0 -C + 999 RETURN END SUBROUTINE VINWPG C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VINWPG -New Page. -C + C D.L. CAMPBELL -1-DEC-1986 C J.P. LONG -9-NOV-1987 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS - -C + C CALLS - -C + C EXIT CONDITIONS - -C + C NARRATIVE -Physically advance the medium or clear the screen, C whichever is appropriate. Also flood the screen C with the background color on devices that support C this. The current position is not changed. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + COMMON /VCVEC1/ IVECT COMMON /VCVEC2/ COORD,LSTCRD -C + C vcpstd variables control what to do with empty frames with C command is received to dump data to output C kempty=0, frame is void - do not draw C >0, frame has data - draw it COMMON /VCPSTD/ KEMPTY -C + CHARACTER COORD*20, LSTCRD*20 CHARACTER*10 KPAGE -C + C pstmlw controls minimum line width C kpstbg controls background coloring C = 0, not colored (white ground from paper) @@ -2492,52 +2483,52 @@ SUBROUTINE VINWPG C (5)=LINE WIDTH C (6)=CHARACTER BOX Y C (7)=CHARACTER BOX X -C + COMMON /VCPAGE/ TOTPAG INTEGER TOTPAG DATA NPAGE /0/ -C + C check for void page draw request C if nothing is on page, skip request -C + NPAGE=NPAGE+1 TOTPAG = NPAGE WRITE(KPAGE,'(I10)',ERR=345) NPAGE GO TO 349 345 KPAGE=' ???' 349 IF(KEMPTY.EQ.0) GO TO 350 -C + C stroke the path in case there are any vectors and show text CALL PSTBUF(2,'s ') IVECT=0 -C + C showpage and restore postscript environment to avoid buffer overflow C flush buffer because save and restore won't work back-to-back -C + CALL PSTBUF(4,'p r ') CALL PSTBUF(0,' ') -C + C comment frame number in output file -C + CALL PSTBUF(31,'%%Page: "'//KPAGE//'" '//KPAGE) CALL PSTBUF(0,' ') CALL PSTBUF(28, '%%PageOrientation: Landscape') CALL PSTBUF(0,' ') CALL PSTBUF(32, '%%PageBoundingBox: 36 30 574 750') CALL PSTBUF(0,' ') -C + CALL PSTBUF(4,'v o ') CALL VDMONI(1) -C + C shade background if appropriate -C + IF(KPSTBG.NE.0) THEN CALL PSTBBG END IF GO TO 370 -C + C void frame -- First Page -C + 350 CALL PSTBUF(2, 'r ') CALL PSTBUF(0,' ') CALL PSTBUF(31,'%%Page: "'//KPAGE//'" '//KPAGE) @@ -2547,43 +2538,42 @@ SUBROUTINE VINWPG CALL PSTBUF(32, '%%PageBoundingBox: 36 30 574 750') CALL PSTBUF(0,' ') CALL PSTBUF(4, 'v o ') -C + 370 CALL VDSTLW(VECTOR(5)) c CALL VDSTCS(VECTOR(6)) CALL VDSTFC(NINT(VECTOR(1))) CALL PSTBUF(0,' ') KEMPTY=0 -C + RETURN END SUBROUTINE VDESCP(ESCPCD,N,ARGS) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDESCP -Escape Code Routine. -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS -ESCPCD = integer escape function code. C N = integer number of arguments in ARG. RANGE >=0. C ARGS = real array of arguments for the escape C function specified. -C + C CALLS - -C + C EXIT CONDITIONS - -C + C NARRATIVE -Invoke the nonstandard, device-dependent function C ESCPCD. N is the number of arguments used by this C function and ARGS is a real array containing those C arguments. Unsupported values of ESCPCD are C ignored, not causing an error. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER ESCPCD,N REAL ARGS(*) -C C COMPUTER DEPENDENT COMMON VARIABLES AND CONSTANTS. include 'vcpstc.blk' C SCALE FACTORS FOR NDC TO DC MAPPING. (LXY,HC1) @@ -2592,18 +2582,18 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) C DC DIMENSIONS OF OFFSETS AND PICTURE. (LXY,HC1) INTEGER XPAD,YPAD,XDEVIC,YDEVIC COMMON /VCDDIM/ XPAD,YPAD,XDEVIC,YDEVIC -C + C USED BY VIPOLY FOR PATTERN FILL AND BORDER ON/OFF. DEFAULT COMPLETE FILL C AND BORDER ON. PLC. COMMON/VCESCP/PGFORM,PATNO,BORDER INTEGER PGFORM,PATNO,BORDER -C + C CHECK FOR VALID N. IF(N.LT.0) THEN CALL VBERRH(802,5) GOTO 999 END IF -C + C 2100 - PAGE FORMAT (0=LANDSCAPE,1=PORTRAIT) IF (ESCPCD.EQ.2100) THEN IF (ARGS(1).EQ.0) THEN @@ -2611,9 +2601,9 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) ELSE PGFORM=1 ENDIF -C + C set output format -C + ELSEIF (ESCPCD.EQ.2101) THEN CALL PSTSEL('1') ELSEIF (ESCPCD.EQ.2102) THEN @@ -2635,68 +2625,65 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) ELSEIF (ESCPCD.EQ.2110) THEN CALL PSTSEL('10') ENDIF -C + 999 RETURN END SUBROUTINE VILINA (X,Y) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VILINA -C + C D.L. CAMPBELL -1-DEC-1986 C J.P. LONG -9-NOV-1987 -C + C ENVIRONMENT -DEVICE DEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS -X,Y REAL NDC COORDINATES -C + C CALLS - -C + C EXIT CONDITIONS -CURRENT POSITION IS SET -C -C + C NARRATIVE C LINE-DRAW A LINE FROM CP TO ABSOLUTE NDC POSITION X,Y C AND UPDATE CP . ATTRIBUTES COLOR,INTEN,LINSTY AND C LINWTH APPLY. -C -C + C OTHER VARIABLES: C XCP,YCP-NDC COORDINATES C*************************************************************************** -C + REAL X,Y -C + C vcpstd variables control what to do with empty frames with C command is received to dump data to output C kempty=0, frame is void - do not draw C >0, frame has data - draw it COMMON /VCPSTD/ KEMPTY -C -C + C draw ENTRY VBLINA(X,Y) CALL VBVECT(1,X,Y) KEMPTY=1 -C + RETURN END SUBROUTINE VBVECT(IPEN,X,Y) C**************************************************** C vbvect - do move or draw to x,y (depending on ipen) -C + C ipen = 0 for move, 1 for draw C x,y = NDC coordinates to be moved/drawn to -C + C****************************************************** -C + REAL X,Y,XOFF,YOFF CHARACTER CTEMP*20,XCOORD*4,YCOORD*4 -C + C mopoly controls polygon fill =0, on ; =1, off C mocolr controls color =0, on ; =1, off COMMON /VCPSTB/ MOPOLY, MOCOLR -C + C SCALE FACTORS FOR NDC TO DC MAPPING. (LXY,HC1) REAL XSCALE,YSCALE COMMON /VCSCAL/ XSCALE,YSCALE @@ -2720,15 +2707,15 @@ SUBROUTINE VBVECT(IPEN,X,Y) COMMON /VCVEC2/ COORD, LSTCRD CHARACTER COORD*20, LSTCRD*20 INTEGER IVECT -C + C compute new point in dev. coord. C convert to floating offsets XOFF=XPAD YOFF=YPAD -C + IXDC=X*XSCALE+XOFF IYDC=Y*YSCALE+YOFF -C + C write(xcoord,'(i5)')ixdc C write(ycoord,'(i5)')iydc C ...include both x,y @@ -2736,7 +2723,7 @@ SUBROUTINE VBVECT(IPEN,X,Y) CALL PSTI2C(IYDC,4,YCOORD) COORD = XCOORD(1:3)//'.'//XCOORD(4:4)//' '// 1 YCOORD(1:3)//'.'//YCOORD(4:4) -C + C pack up move/draw command, send it down C if (lstcrd(1:11) .ne. coord(1:11)) then IF (IPEN.EQ.0) THEN @@ -2749,7 +2736,7 @@ SUBROUTINE VBVECT(IPEN,X,Y) IVECT=IVECT+1 C end if lstcrd(1:11) = coord(1:11) -C + C stroke the path if we are approaching the 1500-coord pair limit C also restore and save postscript environment to avoid C input buffer overflow (must have a c/r between restore @@ -2767,34 +2754,34 @@ SUBROUTINE VBVECT(IPEN,X,Y) C reinitted the current posn IVECT=1 ENDIF -C + C UPDATE CURRENT POSITION XCP=X YCP=Y -C + RETURN END SUBROUTINE VITEXT(LENGT1,CHARS) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VITEXT - Text from Array. -C + C P. Watterberg - 24 MAR 81 C J. P. LONG - 3 DEC 87 -C + C ENVIRONMENT - COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS - LENGT1 = integer number of characters in CHARS. C Range 1-136. C CHARS = integer array of ASCII characters, one C character per array element, right justified. C Range 8,10,32-126. -C + C CALLS - vbout -C + C EXIT CONDITIONS - XCP,YCP = integer updated current position (at the end C of the string). -C + C NARRATIVE - Draw LENGT1 characters in CHARS, starting at C current position and update current position to C the point after the last character box where the @@ -2807,11 +2794,11 @@ SUBROUTINE VITEXT(LENGT1,CHARS) C considered reasonable. Attributes foreground color, C background color, intensity, and character size C apply. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER LENGT1, CHARS(136), LENGTH -C + CHARACTER CTEMP*150,STR*3 C CURRENT POSITION. REAL XCP,YCP @@ -2833,15 +2820,15 @@ SUBROUTINE VITEXT(LENGT1,CHARS) C DC DIMENSIONS OF OFFSETS AND PICTURE. (LXY,HC1) INTEGER XPAD,YPAD,XDEVIC,YDEVIC COMMON /VCDDIM/ XPAD,YPAD,XDEVIC,YDEVIC -C + C vcpstd variables control what to do with empty frames with C command is received to dump data to output C kempty=0, frame is void - do not draw C >0, frame has data - draw it COMMON /VCPSTD/ KEMPTY -C + C check for valid length. -C + call vdstcs(vector(6)) KEMPTY=1 LENGTH = LENGT1 @@ -2849,31 +2836,31 @@ SUBROUTINE VITEXT(LENGT1,CHARS) CALL VBERRH(212,5) GO TO 999 END IF -C + C if(length.gt.136) then call vberrh(213,5), and use the C maximum length of 136. -C + IF(LENGTH.GT.136) THEN CALL VBERRH(213,5) LENGTH = 136 ENDIF -C + CTEMP='(' LENOUT=1 -C + C loop through length characters. -C + DO 100 I=1,LENGTH -C + C check for valid chars. -C + C ignore control characters, except for: C 8 is backspace C 10 is linefeed C 13 is carriage return -C + IF(CHARS(I).LT.32 .OR. CHARS(I).GT.126) THEN -C + IF(CHARS(I).EQ.8) THEN DX=-VECTOR(7) DY=0. @@ -2889,9 +2876,9 @@ SUBROUTINE VITEXT(LENGT1,CHARS) CALL VBERRH(208,5) GOTO 100 ENDIF -C + C finish the string, emulate the control char, and start a new one -C + C send the buffered chars to the printer if there are any IF(LENOUT.NE.1) THEN CTEMP(LENOUT+1:150)=') t ' @@ -2900,64 +2887,63 @@ SUBROUTINE VITEXT(LENGT1,CHARS) C reset the cp from the characters XCP=XCP+(LENOUT-5)*VECTOR(7) ENDIF -C + C calculate the new current position after the control char XCP=XCP+DX YCP=YCP+DY CALL VBVECT(0,XCP,YCP) -C + C start a new string CTEMP='(' LENOUT=1 -C + ELSE -C + C Char value is 32-126 inclusive. Put \ before these: C 92 is \ C 40 is ( C 41 is ) -C + IF(CHARS(I).EQ.40.OR.CHARS(I).EQ.41.OR.CHARS(I).EQ.92) THEN CTEMP(LENOUT+1:150)='\\' LENOUT=LENOUT+1 ENDIF -C + C now pack the chars into the buffer -C + CALL PSTA2C(CHARS(I),STR) CTEMP(LENOUT+1:150)=STR(1:1) LENOUT=LENOUT+1 ENDIF -C + 100 CONTINUE -C + C send the chars to the printer -C + CTEMP(LENOUT+1:150)=') t ' LENOUT=LENOUT+4 CALL PSTBUF(LENOUT,CTEMP) -C + C reset the cp from the characters -C + XCP=XCP+(LENOUT-5)*VECTOR(7) -C + 999 RETURN END SUBROUTINE VDSTLS(LINSTY) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDSTLS -Set Line Style. -C -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS -LINSTY = integer linestyle of line drawing output C primitives. Range 0-5. Default:0. -C + C CALLS - -C + C EXIT CONDITIONS -VECTOR(4) = real updated line style (LINSTY). -C + C NARRATIVE -Set the style of line as below. This applies only C to line drawing primitives. The line styles are: C 0 - solid @@ -2969,7 +2955,7 @@ SUBROUTINE VDSTLS(LINSTY) C All devices must support at least the values 0 and C 5. If an unsupported value is specified, set to 5. C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL LW INTEGER LINSTY,ILL,JLL COMMON /VCVEC1/ IVECT @@ -2977,7 +2963,7 @@ SUBROUTINE VDSTLS(LINSTY) CHARACTER COORD*20, LSTCRD*20 INTEGER IVECT CHARACTER CTEMP*30,STRL*3,STRS*3,STRG*3 -C + C CURRENT ATTRIBUTE VALUES. (DEVICE-INDEPENDENT) REAL VECTOR(7) COMMON /VCATTR/ VECTOR @@ -2997,7 +2983,7 @@ SUBROUTINE VDSTLS(LINSTY) C CURRENT ATTRIBUTE VALUES. (DEVICE-INDEPENDENT) C REAL VECTOR(7) C COMMON /VCATTR/ VECTOR -C + C VECTOR(1)=FOREGROUND COLOR C (2)=BACKGROUND COLOR C (3)=INTENSITY @@ -3005,17 +2991,16 @@ SUBROUTINE VDSTLS(LINSTY) C (5)=LINE WIDTH C (6)=CHARACTER BOX Y C (7)=CHARACTER BOX X -C -C + ENTRY VBSTLS(LINSTY) -C + C CHECK FOR VALID LINSTY. IF(LINSTY.LT.0.OR.LINSTY.GT.5) THEN CALL VBERRH(401,5) VECTOR(4) = 0 GOTO 999 END IF -C + IF(IVECT.NE.0) THEN CALL PSTBUF(2,'s ') IVECT=0 @@ -3024,19 +3009,19 @@ SUBROUTINE VDSTLS(LINSTY) IF(LINSTY.EQ.0) THEN CALL PSTBUF(7,'[] 0 h ') ENDIF -C + C calculate the linewidth -- it's needed below in every case -C + C actual xscale is xscale*.1; linewidth=1 => .01 in NDC LW=VECTOR(5) LW=XSCALE*VECTOR(5)*.001 C a linewidth of zero isn't good with postscript IF(LW.LT.1.) LW=1. -C + C from here on, set up patterns that depend on the linewidth and C the extra length added to the line segment C by the hemispherical end cap -C + IF(LINSTY.EQ.1) THEN ILL=NINT(0.5*LW) IGAP=NINT(3.*LW) @@ -3044,7 +3029,7 @@ SUBROUTINE VDSTLS(LINSTY) CALL PSTI2C(IGAP,3,STRG) CTEMP='['//STRL(1:3)//' '//STRG(1:3)//'] 0 h ' CALL PSTBUF(14,CTEMP) -C + ELSE IF(LINSTY.EQ.2) THEN ILL=NINT(18.*LW) JLL=NINT(1.5*LW) @@ -3056,7 +3041,7 @@ SUBROUTINE VDSTLS(LINSTY) * //' '//STRG(1:3)//'] 0 h ' CALL PSTBUF(22,CTEMP) C call pstbuf(14,'[2 2 6 2] 0 h ') -C + ELSE IF(LINSTY.EQ.3) THEN ILL=NINT(6.*LW) IGAP=NINT(7.*LW) @@ -3065,7 +3050,7 @@ SUBROUTINE VDSTLS(LINSTY) CTEMP='['//STRL(1:3)//' '//STRG(1:3)//'] 0 h ' CALL PSTBUF(14,CTEMP) C call pstbuf(8,'[4] 0 h ') -C + ELSE IF(LINSTY.EQ.4) THEN ILL=NINT(24.*LW) IGAP=NINT(18.*LW) @@ -3074,7 +3059,7 @@ SUBROUTINE VDSTLS(LINSTY) CTEMP='['//STRL(1:3)//' '//STRG(1:3)//'] 0 h ' CALL PSTBUF(14,CTEMP) C call pstbuf(8,'[8] 0 h ') -C + ELSE IF(LINSTY.EQ.5) THEN ILL=NINT(12.*LW) IGAP=NINT(10.*LW) @@ -3082,43 +3067,43 @@ SUBROUTINE VDSTLS(LINSTY) CALL PSTI2C(IGAP,3,STRG) CTEMP='['//STRL(1:3)//' '//STRG(1:3)//'] 0 h ' CALL PSTBUF(14,CTEMP) -C + ENDIF -C + C redefine the postscript current position -C + C the code below is equivalent to C call vbvect(0,xcp,ycp) C but can't do it because vbvect calls vdstlw which calls this routine -C + CTEMP=COORD(1:11)//' m ' CALL PSTBUF(14,CTEMP) -C + VECTOR(4)=LINSTY -C + 999 RETURN END SUBROUTINE VDSTCS(YSIZE) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDSTCS -Set Character Size. -C + C R.W.Simons -05DEC80 C J. P. LONG -03 DEC 87 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Devices that support only software characters. C (LXY, HC1) -C + C ENTRY CONDITIONS -YSIZE = real Y dimension of the character box in NDC C space. Range 0.-1. Default: device dependent, C typically the smallest hardware size. -C + C CALLS - -C + C EXIT CONDITIONS -VECTOR(6) = real updated character box Y (YSIZE). C VECTOR(7) = real updated character box X. -C + C NARRATIVE -Set the character size for text primitives. Size C is given by YSIZE as the Y dimension of the C character box. The SVDI will assign the X dimension @@ -3130,12 +3115,12 @@ SUBROUTINE VDSTCS(YSIZE) C unsupported value is specified, set to the largest C supported character size that does not exceed the C specified size. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL YSIZE CHARACTER STR*4,CTEMP*10 -C + C CURRENT ATTRIBUTE VALUES. (DEVICE-INDEPENDENT) REAL VECTOR(7) COMMON /VCATTR/ VECTOR @@ -3149,66 +3134,66 @@ SUBROUTINE VDSTCS(YSIZE) C SCALE FACTORS FOR NDC TO DC MAPPING. (LXY,HC1) REAL XSCALE,YSCALE COMMON /VCSCAL/ XSCALE,YSCALE -C + C CHECK FOR VALID YSIZE. IF(YSIZE.LT.0.0.OR.YSIZE.GT.1.0) THEN CALL VBERRH(401,5) GOTO 999 END IF -C + C PROTECT INPUT PARAMETER FROM BEING CHANGED. YSIZE1=YSIZE -C + C DON'T ALLOW VALUES BELOW THE MINIMUM "HARDWARE" SIZE. IF(YSIZE1.LT.0.01) YSIZE1=0.01 -C + C VALUES ESTABLISHED HERE ARE USED BY VBSIM IN SIMULATING CHARACTERS. C ALWAYS USE A CHARACTER ASPECT RATIO OF 5/7. VECTOR(6)=YSIZE1 VECTOR(7)=YSIZE1*5./7. -C + C convert the character size into device coords -C + IYSIZE=NINT(XSCALE*YSIZE1) -C + C output the postscript command -C + CALL PSTI2C(IYSIZE,4,STR) C iysize is in tenths of device units CTEMP='y '//STR(1:3)//' x ' CALL PSTBUF(8,CTEMP) -C + 999 RETURN END SUBROUTINE VDSTLW(LINWTH) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDSTLW -Set Line Width. -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS -LINWTH = real line width of line drawing output C primitives. Range 0.-1. Default: device dependent. -C + C CALLS - -C + C EXIT CONDITIONS -VECTOR(5) = real updated line width (LINWTH). -C + C NARRATIVE -Set the relative width of an output line. Values C are 0.-1. with 1. being .01 in NDC space. C All devices must support at least a single device C dependent value that is the default. If an C unsupported value is specified, set to the closest C supported line width. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL LINWTH,LW CHARACTER CTEMP*19,STR*5 -C + COMMON /VCVEC1/ IVECT INTEGER IVECT -C + C COMPUTER DEPENDENT COMMON VARIABLES AND CONSTANTS. include 'vcpstc.blk' C CURRENT ATTRIBUTE VALUES. (DEVICE-INDEPENDENT) @@ -3224,7 +3209,7 @@ SUBROUTINE VDSTLW(LINWTH) C SCALE FACTORS FOR NDC TO DC MAPPING. (LXY,HC1) REAL XSCALE,YSCALE COMMON /VCSCAL/ XSCALE,YSCALE -C + C pstmlw controls minimum line width C kpstbg controls background coloring C = 0, not colored (white ground from paper) @@ -3233,25 +3218,25 @@ SUBROUTINE VDSTLW(LINWTH) C = 0, no interchange C = 1, colors interchanged COMMON /VCPSTA/ PSTMLW, KPSTBG, KPSTCI -C + C CHECK FOR VALID LINWTH. IF(LINWTH.LT.0.0.OR.LINWTH.GT.1.) THEN CALL VBERRH(401,5) GOTO 999 END IF -C + C test user define minimum -C + WIDTH=MAX(PSTMLW,LINWTH) -C + C CONVERT LINE-WIDTH TO NDC LW=WIDTH*.005 -C + C CONVERT WIDTH TO DEVICE COORDINATES AND ADD A DIGIT; NEED IT TO HUNDREDTHS ILW=NINT(XSCALE*LW*10.) C A LINEWIDTH OF ZERO WORKS ONLY PART OF THE TIME IF(ILW.LT.10) ILW=10 -C + C SET LINE WIDTH CALL PSTI2C(ILW,5,STR) IF(IVECT.NE.0) THEN @@ -3262,35 +3247,35 @@ SUBROUTINE VDSTLW(LINWTH) CTEMP=STR(1:3)//'.'//STR(4:5)//' w ' CALL PSTBUF(9,CTEMP) END IF -C + VECTOR(5)=WIDTH -C + C since linestyle uses the linewidth in setting the pattern, call it -C + LINSTY=VECTOR(4) CALL VBSTLS(LINSTY) 999 RETURN END SUBROUTINE VDIQES(ESCPCD,SUPPORT) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDIQES -Inquire Escape. -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS -ESCPCD = integer escape function code. -C + C CALLS - -C + C EXIT CONDITIONS -SUPPRT = integer level of support for the escape C function specified. Range 0,1,2. -C + C NARRATIVE -An integer value indicating 2=hardware supported, C 1=software supported, 0=unsupported is returned in C SUPPORT for the escape function ESCPCD. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER ESCPCD,SUPPORT IF (ESCPCD.EQ.2100) THEN SUPPORT=2 @@ -3304,45 +3289,44 @@ SUBROUTINE VDIQES(ESCPCD,SUPPORT) END SUBROUTINE PSTBUF(NCHRS,OUT) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C PSTBUF -Output PostScript data -C + C C. D. Brown -DEC 1986 (Adapted from QMSBUF) -C + C ENVIRONMENT -COMPUTER/DEVICE DEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS -NCHRS = integer number of characters in OUT. C = 0 means flush the buffer. C OUT = character string of input data C KOUTFL = integer number of the graphics output file. -C + C CALLS - -C + C EXIT CONDITIONS - -C + C NARRATIVE -The data in OUT is buffered for output to KOUTFL. C The buffer is output when it is "full" or a buffer C flush is requested by specifying NCHRS<=0. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + SAVE INTEGER NCHRS CHARACTER OUT*(*) character*132 lstout integer lstchr -C -C + C COMPUTER DEPENDENT COMMON VARIABLES AND CONSTANTS. include 'vcpstc.blk' -C + C **NOTE: BUFFER SIZE (IN BITS) MUST BE AN EXACT MULTIPLE OF 8 (8-BIT DATA C MUST END EXACTLY AT WORD BOUNDARY) INTEGER CHARLN,ICNT,REMAIN CHARACTER CBUF*130 C CHARLN=BUFFER SIZE IN CHARS DATA ICNT/1/,CHARLN/130/,LSTCHR/-1/,LSTOUT/' '/ -C + C ...Check that last output string does not match current output GDS if (lstchr .eq. nchrs) then if (lstout(:lstchr) .eq. out(:nchrs)) return @@ -3352,7 +3336,7 @@ SUBROUTINE PSTBUF(NCHRS,OUT) C COMPUTE REMAINING AVAILABLE CHARACTERS IN BUFFER REMAIN=CHARLN-ICNT+1 -C + C CHECK FOR BUFFER FLUSH REQUEST OR NOT ENOUGH ROOM IN BUFFER. IF((NCHRS.LE.0).OR.(NCHRS.GT.REMAIN)) THEN C TEST IF THERE'S ANYTHING TO FLUSH. @@ -3367,65 +3351,65 @@ SUBROUTINE PSTBUF(NCHRS,OUT) ICNT=1 ENDIF ENDIF -C + C ADD TO BUFFER IF (NCHRS.GT.0) THEN CBUF(ICNT:ICNT+NCHRS-1)=OUT(1:NCHRS) ICNT=ICNT+NCHRS ENDIF -C + RETURN END SUBROUTINE PSTA2C(ASCI,CHARAC) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C PSTA2C - CONVERT FROM ASCII TO CHARACTER -C + C P. Watterberg - 19 Jan 1982 -C + C ENVIRONMENT - computer dependent, system dependent, fortran 77 -C + C ENTRY CONDITIONS - ASCI is an integer representing an ascii character -C + C CALLS - -C + C EXIT CONDITIONS - CHARAC is the character represented by ASCI -C + C NARRATIVE - -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + CHARACTER CHARAC*(*) INTEGER ASCI -C + CHARAC = CHAR(ASCI) -C + return end SUBROUTINE PSTI2C(INT,NDIGIT,ISTR) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C +C C PSTI2C - convert positive integer to decimal character C string equivalent -C +C C ENVIRONMENT - COMPUTER-INdependent -C +C C ENTRY CONDITIONS - int = positive integer to be converted C ndigit = number of digits to be produced in string C form (pad left with zeros) C istr = character string of at least ndigit characters -C +C C CALLS - -C +C C EXIT CONDITIONS - istr contains decimal-string equivalent of int C (ndigits left-justified in istr) -C +C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C INTEGER INT,NDIGIT CHARACTER ISTR*(*) CHARACTER*1 KA(10) DATA KA /'0','1','2','3','4','5','6','7','8','9'/ -C +C C check input parameters INT1=MAX(INT,0) LENGTH=LEN(ISTR) @@ -3442,14 +3426,14 @@ SUBROUTINE PSTI2C(INT,NDIGIT,ISTR) RETURN END SUBROUTINE PSTBBG -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C Color background black for white paper device. C Should only be called from vdnwpg and viinit. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C pstmlw controls minimum line width C kpstbg controls background coloring C = 0, not colored (white ground from paper) @@ -3458,11 +3442,11 @@ SUBROUTINE PSTBBG C = 0, no interchange C = 1, colors interchanged COMMON /VCPSTA/ PSTMLW, KPSTBG, KPSTCI -C + C mopoly controls polygon fill =0, on ; =1, off C mocolr controls color =0, on ; =1, off COMMON /VCPSTB/ MOPOLY, MOCOLR -C + C CURRENT ATTRIBUTE VALUES. (DEVICE-INDEPENDENT) REAL VECTOR(7) COMMON /VCATTR/ VECTOR @@ -3473,7 +3457,7 @@ SUBROUTINE PSTBBG C (5)=LINE WIDTH C (6)=CHARACTER BOX Y C (7)=CHARACTER BOX X -C + COMMON /VCVEC1/ IVECT INTEGER IVECT COMMON /VCESCP/ PGFORM,PATNO,BORDER @@ -3481,7 +3465,7 @@ SUBROUTINE PSTBBG DIMENSION X(4),Y(4) PARAMETER (ONEN=0.99999) PARAMETER (ASP=0.75) -C + IF(MOPOLY.EQ.0) THEN IF(PGFORM.EQ.0) THEN X(1)=0. @@ -3511,39 +3495,39 @@ SUBROUTINE PSTBBG END SUBROUTINE PSTJOB C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C PSTJOB - GET JOB ID AND ROUTING INFORMATION -C + C ENVIRONMENT - COMPUTER-DEPENDENT FOR CTSS -C + C ENTRY CONDITIONS - -C + C CALLS - -C + C EXIT CONDITIONS - KJTIME - TIME HOLLERITH STRING C KJDATE - DATE HOLLERITH STRING C KUSRID - USER IDENTIFICATION C KJROUT - ROUTING INFORMATION -C + C NARRATIVE - THIS ROUTINE INQUIRES THE SYSTEM TO FIND THE ABOVE C INFORMATION. THE INFO IS PACKED INTO THE ARRAYS AS C HOLLERITH (INTERNAL DISPLAY CODE) STRINGS. A TERMI C CHARACTER "\" IS APPENDED TO EACH STRING SO THE CAL C ROUTINE CAN FIND THE END IF FOR SOME REASON THE LEN C VARIABLES ARE NOT SUFFICIENT. -C + C None of functions are used in pst driver -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C JOB ID INFORMATION. (HC1, DIC) include 'vcjob.blk' -C + C FOR SECURITY MARKINGS, CTSS CODES NEED TO MAP TO THESE SILLY C OLD SCOPE SECURITY CODES -C + C SCOPE 3 CODE -C + C 0 UNCL C 1 UNDEFINED C 2 UNDEFINED @@ -3556,38 +3540,38 @@ SUBROUTINE PSTJOB C 9 SNSI C 10 SFRD C 11 SRD -C + C GET CLASSIFICATION LEVEL KSECUR = 0 -C + C GET USER ID KUSRSZ = 8 KUSRID(1)=0 KUSRID(2)=0 KUSRID(3)=0 KUSRID(4)=0 -C + C GET JOB ID AND USERS NAME KJOBID(1) = 0 KJOBID(2) = 0 KJOBID(3) = 0 KJOBID(4) = 0 KIDSIZ = 24 -C + C GET BOX NUMBER KSZROU = 777 -C + KJROUT(1) = 0 KJROUT(2) = 0 KJROUT(3) = 0 KJROUT(4) = 0 -C + C GET MACHINE ID MACHIN(1) = 0 MACHIN(2) = 0 MACHIN(3) = 0 MACLEN=1 -C + C GET THE TIME AND DATE KJTIME(1)=0 KJTIME(2)=0 @@ -3595,14 +3579,14 @@ SUBROUTINE PSTJOB KJDATE(1)=0 KJDATE(2)=0 KJDATE(3)=0 -C + END SUBROUTINE PSTSEL(KARG) -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C Select type of desired output. Four options are -C + C device number C 1. black & white, batch, no poly fill 799.1 C 2. black & white, interactive, no poly 799.2 @@ -3614,15 +3598,15 @@ SUBROUTINE PSTSEL(KARG) C 8. color, interactive, black-white interchange 799.8 C 9. color, batch, black background 799.9 C 10.color, interactive, black background 799.11 -C + C A second function of this routine is to set the minimum line C width. For most systems the minimum width line is too narrow. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + SAVE CHARACTER*(*) KARG -C + C pstmlw controls minimum line width C kpstbg controls background coloring C = 0, not colored (white ground from paper) @@ -3631,11 +3615,11 @@ SUBROUTINE PSTSEL(KARG) C = 0, no interchange C = 1, colors interchanged COMMON /VCPSTA/ PSTMLW, KPSTBG, KPSTCI -C + C mopoly controls polygon fill =0, on ; =1, off C mocolr controls color =0, on ; =1, off COMMON /VCPSTB/ MOPOLY, MOCOLR -C + COMMON /DEVCAP/ DEV(33) common /blotans/ BLTANS character*2 BLTANS @@ -3774,24 +3758,24 @@ SUBROUTINE PSTSEL(KARG) RETURN END SUBROUTINE PSTINI -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C Generate any system dependent records which must be at the first C of PostScript output file. For example, a SUN laser printer C requires the first record of the file to be %! for the file C recognized as a PostScript file. This routine writes these C initial records. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + SAVE DATA KWAY /0/ IF(KWAY.EQ.0) THEN KWAY=1 -C + C generate first records in output file -C + *- INCLUDE PSTHEAD C the following is for a SUN UNIX system C record is a comment except for sun lpr @@ -3800,6 +3784,6 @@ SUBROUTINE PSTINI CALL PSTBUF(0,' ') *- END IF -C + RETURN END diff --git a/packages/seacas/applications/blot/cgi/vdicps_dual.f b/packages/seacas/applications/blot/cgi/vdicps_dual.f index dc1afdc2c988..49e785c7570c 100644 --- a/packages/seacas/applications/blot/cgi/vdicps_dual.f +++ b/packages/seacas/applications/blot/cgi/vdicps_dual.f @@ -1,17 +1,15 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: vdicps_dual.f,v 1.3 2008/01/09 18:18:53 gdsjaar Exp $ - SUBROUTINE WCPSII(ASPECT,JUSTIF) -C + C VDI-PostScript driver - B&W and COLOR versions C Adapted for all systems by S.L.Thompson C Original code from D.Campbell and J.LONG -C + C vdi device numbers are C device number C black & white, batch, no poly fill 799.1 @@ -24,46 +22,46 @@ SUBROUTINE WCPSII(ASPECT,JUSTIF) C color, interactive, black-white interchange 799.8 C color, batch, black background 799.9 C color, interactive, black background 799.11 -C + C last mod 6/20/90 slt -C + C Note that there are several parameters to set depending on how C the package is to be used. Most are in routine pstsel routine C which is called at the first of this routine (viinit.) Two other c parameters (xinch,yinch) are set in this routine and vdiqd9. -C + C This code is for BOTH color and black & white systems. C Flag is set for mode in pstsel. -C + C Device can be set with escape call before call to vdinit. C Otherwise, code will interactively ask for device type. C There is also an escape flag for landscape or portrait format. -C + C This deck was generated from a qms driver and still has the C qms comments in places. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VIINIT -Initialize SVDI. postscript device -C + C D.L. CAMPBELL -1-DEC-1986 C J.P. LONG -9-NOV-1987 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C (postscript) -C + C ENTRY CONDITIONS -ASPECT = real ratio of X dimension to Y dimension. C Range >0.0. Default: 0. (device dependent). C JUSTIF = integer justification of NDC space on the C device. Range 0-9. Default: 0 (device dependent.) -C + C CALLS -VBERRH,VDSTCS,VDSTLW,VIMOVA -C + C EXIT CONDITIONS -XNDCMX,YNDCMX = real NDC maximum valid values(as C constrained by ASPECT). C VECTOR = real array of attribute values(all device C dependent except VECTOR(4)=0.0). -C + C NARRATIVE -This must be the first SVDI call made. All C attribute values, the color table, and current C position are set to appropriate defaults for the @@ -71,7 +69,7 @@ SUBROUTINE WCPSII(ASPECT,JUSTIF) C is done. The screen is cleared or paper advanced C if necessary to guarantee a blank view surface for C drawing on. -C + C ASPECT specifies the ratio of the X dimension to the C Y dimension . Maximum NDC values (at least one of C which will be 1.0) are computed to give the ASPECT @@ -82,7 +80,7 @@ SUBROUTINE WCPSII(ASPECT,JUSTIF) C aspect of 1.0. The NDC rectangle is scaled until C one dimension fills the corresponding dimension of C the device. -C + C JUSTIF determines where the rectangle is located on C the device as diagrammed below: C --------- @@ -92,22 +90,22 @@ SUBROUTINE WCPSII(ASPECT,JUSTIF) C --------- C For example, JUSTIF = 7 indicates NDC space will be C upper left justified on the device. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC -C + C Set parameters for type of usage. C Two settings are coded - one for square field of view C and one for full field of view. -C + C If VDIQDC is called before vdinit, full field of view is selected. C Otherwise, square is used. -C + C size of full view PARAMETER (XINCHO=10.0) PARAMETER (YINCHO=7.5) -C + C size of square view C PARAMETER (XINCHO=7.5) C PARAMETER (YINCHO=7.5) @@ -118,14 +116,14 @@ SUBROUTINE WCPSII(ASPECT,JUSTIF) C PARAMETER (YINCHO=7.4412525) *- COMMON /VCMODR/ XINCH, YINCH -C + CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC -C + REAL ASPECT INTEGER JUSTIF COMMON /VCVEC1/ IVECT INTEGER IVECT -C + C MAXIMUM VALID NDC VALUES. (DEVICE-INDEPENDENT) REAL XNDCMX,YNDCMX COMMON /VCNDCM/ XNDCMX,YNDCMX @@ -142,7 +140,7 @@ SUBROUTINE WCPSII(ASPECT,JUSTIF) C CURRENT POSITION. REAL XCP,YCP COMMON /VCCRPS/ XCP,YCP -C + C COMPUTER DEPENDENT COMMON VARIABLES AND CONSTANTS. include 'vcpstc.blk' C SCALE FACTORS FOR NDC TO DC MAPPING. (LXY,HC1) @@ -153,7 +151,7 @@ SUBROUTINE WCPSII(ASPECT,JUSTIF) COMMON /VCDDIM/ XPAD,YPAD,XDEVIC,YDEVIC C JOB ID INFORMATION. (HC1, DIC) include 'vcjob.blk' -C + COMMON /DEVCAP/ DEV(33) C ESCAPE FLAGS C PATNO AND BORDER USED BY VIPOLY FOR FILL PATTERN AND BORDER ON/OFF; @@ -161,7 +159,7 @@ SUBROUTINE WCPSII(ASPECT,JUSTIF) COMMON /VCESCP/ PGFORM,PATNO,BORDER INTEGER PGFORM,PATNO,BORDER CHARACTER COORD*20,XCOORD*4,YCOORD*4 -C + C pstmlw controls minimum line width C kpstbg controls background coloring C = 0, not colored (white ground from paper) @@ -170,19 +168,19 @@ SUBROUTINE WCPSII(ASPECT,JUSTIF) C = 0, no interchange C = 1, colors interchanged COMMON /VCPSTA/ PSTMLW, KPSTBG, KPSTCI -C + C mopoly controls polygon fill =0, on ; =1, off C mocolr controls color =0, on ; =1, off COMMON /VCPSTB/ MOPOLY, MOCOLR -C + DIMENSION COLDEF(3) -C + C vcpstd variables control what to do with empty frames with C command is received to dump data to output C kempty=0, frame is void - do not draw C >0, frame has data - draw it COMMON /VCPSTD/ KEMPTY -C + DEV(1) = 0.0 dev(2) = 1.0 dev(3) = 1.0 @@ -231,8 +229,7 @@ SUBROUTINE WCPSII(ASPECT,JUSTIF) C (5)=LINE WIDTH - ABOUT 1/72 INCHES C (6)=CHARACTER BOX Y - ABOUT 1/10 INCHES C (7)=CHARACTER BOX X - 5/7 OF BOX-Y -C -C + vector(1) = 0.0 vector(2) = 7.0 vector(3) = 1.0 @@ -251,21 +248,21 @@ SUBROUTINE WCPSII(ASPECT,JUSTIF) BORDER = 1 XCP = 0.0 YCP = 0.0 -C + C CHECK FOR VALID ASPECT. IF(ASPECT.LT.0.0) THEN CALL VBERRH(721,5), C AND USE DEFAULT ASPECT. IF(ASPECT.LT.0.0) THEN CALL VBERRH(721,5) ASPEC1=0.0 END IF -C + C CHECK FOR VALID JUSTIF. IF(JUSTIF.LT.0 .OR. JUSTIF.GT.9) THEN C CALL VBERRH(720,5), AND USE DEFAULT JUSTIF. IF(JUSTIF.LT.0.OR.JUSTIF.GT.9) THEN CALL VBERRH(720,5) JUSTI1=0 END IF -C + C SCALE NDC UNITS TO DEVICE UNITS. C FOR QMS, THE PHYSICAL PLOT SURFACE IS XINCH X YINCH (10.x7.5). C DEVICE COORDINATES ARE KEPT IN 1/723 INCH TO GAIN SIMPLICITY @@ -276,14 +273,14 @@ SUBROUTINE WCPSII(ASPECT,JUSTIF) C ADDRESSABILITY,USING AS MUCH OF THE SPACE AS POSSIBLE. XINCH=XINCHO YINCH=YINCHO -C + C test for rscors post or direct mode. Use 7.5x7.5 for direct C and 10.0x7.5 for post -C + C if VDIQDC has already been called, we are in post mode; C otherwise in direct mode CALL VDIQD9(XINCH,YINCH) -C + C CHECK PAGE FORMAT - IF PORTRAIT, C THEN SWITCH THINGS AROUND IF (PGFORM.EQ.1) THEN @@ -300,13 +297,13 @@ SUBROUTINE WCPSII(ASPECT,JUSTIF) XUNITS=XINCH*723. YUNITS=YINCH*723. DASPEC=XUNITS/YUNITS -C + C DEFAULT ASPECT = 1., DEFAULT JUSTIF = 1. IF(ASPEC1.EQ.0.) ASPEC1=DASPEC IF(JUSTI1.EQ.0) JUSTI1=1 -C + IF(ASPEC1.GE.DASPEC) THEN -C + C THEN X DIMENSION IS FILLED. XDEVIC=XUNITS YDEVIC=XUNITS/ASPEC1 @@ -320,7 +317,7 @@ SUBROUTINE WCPSII(ASPECT,JUSTIF) YPAD=YUNITS-YDEVIC END IF ELSE -C + C ELSE Y DIMENSION IS FILLED. XDEVIC=YUNITS*ASPEC1 YDEVIC=YUNITS @@ -334,7 +331,7 @@ SUBROUTINE WCPSII(ASPECT,JUSTIF) XPAD=0 END IF END IF -C + C FIGURE MAXIMUM NDC VALUES XNDCMX AND YNDCMX. IF(ASPEC1.GE.DASPEC) THEN XNDCMX=MIN(1.,ASPEC1) @@ -343,7 +340,7 @@ SUBROUTINE WCPSII(ASPECT,JUSTIF) XNDCMX=ASPEC1 YNDCMX=1. END IF -C + C SET SCALE FACTORS FOR NDC-TO-DEVICE MAPPING. XSCALE=DBLE(XDEVIC)/XNDCMX YSCALE=DBLE(YDEVIC)/YNDCMX @@ -354,21 +351,21 @@ SUBROUTINE WCPSII(ASPECT,JUSTIF) XPAD = XPAD+280. YPAD = YPAD-180. ENDIF -C + CALL PSTSEL(' ') -C + C SET UP MONITORING INFORMATION CALL VBDEV('V PST ') CALL WCPSMO(0) IVECT=0 -C + C OPEN OUTPUT FILE CALL PSTOFS(KOUTFL) -C + C INITIALIZE the printer -C + CALL PSTINI -C + CALL PSTBUF(38, '%%Title: Graphics SVDI PostScript File') CALL PSTBUF(0,' ') CALL PSTBUF(40, '%%Creator: SNL SEACAS SVDI Driver -- cps') @@ -431,15 +428,15 @@ SUBROUTINE WCPSII(ASPECT,JUSTIF) CALL PSTBUF(17,'/o {newpath} def ') ENDIF CALL PSTBUF(35,'/p {showpage} def 1 setlinecap v o ') -C + C check for color or black & white mode -C + IF(MOCOLR.EQ.0) THEN -C + C color is on -C + C define some kind of color table -C + DO 120 IC=0,7 COLDEF(1)=0. COLDEF(2)=0. @@ -476,17 +473,17 @@ SUBROUTINE WCPSII(ASPECT,JUSTIF) END IF VECTOR(1)=7. VECTOR(2)=0. -C + C define the postscript current position CALL VBVECT(0,XCP,YCP) -C + C shade background if appropriate -C + IF(KPSTBG.NE.0) THEN CALL PSTBBG KEMPTY=0 END IF -C + C INIT LINE WIDTH,CHARACTER SIZE CALL WCPSLW(VECTOR(5)) c CALL VDSTCS(VECTOR(6)) @@ -496,18 +493,18 @@ SUBROUTINE WCPSII(ASPECT,JUSTIF) END SUBROUTINE WCPSDC(INDEX,VALUE) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDIQDC -Inquire Device Capabilities. -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS -INDEX = integer capability number. Range 1-33. -C + C CALLS - -C + C EXIT CONDITIONS -VALUE = real value of the capability indicated by C INDEX. -C + C NARRATIVE -Return values of various device capabilities. INDEX C is the integer capability number (as given below), C and the real value is returned in VALUE. @@ -641,9 +638,9 @@ SUBROUTINE WCPSDC(INDEX,VALUE) C 33. Device pixel aspect - the ratio of the spacing of device C pixels in x divided by the spacing in y (1 for square C pixels) -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + SAVE INTEGER INDEX REAL VALUE @@ -652,11 +649,11 @@ SUBROUTINE WCPSDC(INDEX,VALUE) C DEFAULT COMPLETE FILL WITH BORDER. PLC. COMMON /VCESCP/ PGFORM,PATNO,BORDER INTEGER PGFORM,PATNO,BORDER -C + C mopoly controls polygon fill =0, on ; =1, off C mocolr controls color =0, on ; =1, off COMMON /VCPSTB/ MOPOLY, MOCOLR -C + *- INCLUDE PSTFULL C size of full view window C parameters set to get same size plot as imagen and qms b&w. @@ -666,33 +663,33 @@ SUBROUTINE WCPSDC(INDEX,VALUE) C INITIALIZE THE DEVICE CAPABILITIES VECTOR. COMMON /DEVCAP/ DEV(33) DATA NOCALL /0/ -C + C If device is 0, call to reset -C + IF(NINT(DEV(23)).EQ.0) THEN CALL PSTSEL(' ') END IF -C + C CHECK FOR VALID INDEX. IF(INDEX.LT.1.OR.INDEX.GT.33) THEN CALL VBERRH(726,5) GOTO 999 END IF -C + C RETURN INDEXED VALUE. VALUE=DEV(INDEX) IF(INDEX.EQ.23) NOCALL=1 -C + 999 RETURN -C + C********************************************************************** ENTRY VDIQD9(XINCH,YINCH) -C + C This is an added entry for rscors version of pst driver to C tell if direct or post mode operation. If post mode, vdiqdc C is called before vdinit to get terminal type. In direct mode C it is never called to get type. -C + IF(NOCALL.NE.0) THEN C XINCH=10.0 C YINCH=7.5 @@ -703,23 +700,23 @@ SUBROUTINE WCPSDC(INDEX,VALUE) END SUBROUTINE WCPSER(ERRNUM,ERRSEV) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VBERRH -Error Handler. -C + C R.W.Simons -08APR81 C 30SEP81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -ERRNUM = integer error number. C ERRSEV = integer severity code. If > 12, error is C fatal. -C + C CALLS -VDLOGE. -C + C EXIT CONDITIONS - -C + C NARRATIVE -An error will normally cause an error message to C be printed on the error output device and possible C termination of the program, unless a routine VBERRH @@ -729,43 +726,43 @@ SUBROUTINE WCPSER(ERRNUM,ERRSEV) C returning. All versions of VBERRH, whether user- C supplied or default, must STOP on any error severity C greater than 12. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER ERRNUM,ERRSEV -C + C REPORT THE ERROR USING VDLOGE. CALL WCPSLE(ERRNUM,ERRSEV) -C + C CHECK FOR FATAL ERROR. IF(ERRSEV.GT.12) STOP -C + RETURN END SUBROUTINE WCPSGN(NAME) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDGNAM -Name the graphics output file -C + C P.L.Crotty -OCT88 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -NAME = character string; < 80 characters -C + C CALLS -C + C EXIT CONDITIONS -output graphics file is assigned the name NAME -C + C NARRATIVE -This subroutine associates a file name with C the graphics output file (KOUTFL). If this C routine is not called, a system dependent C default name is used. VDGNAM must be called C before VDINIT. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + SAVE CHARACTER*(*) NAME CHARACTER*132 PSTNAM @@ -826,26 +823,26 @@ SUBROUTINE WCPSGN(NAME) END SUBROUTINE WCPSNT(ASPECT,JUSTIF) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDINIT -Initialize SVDI. -C + C R.W.Simons -08APR81 C 30SEP81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -ASPECT = real ratio of X dimension to Y dimension. C Range >0.0. Default: 0.0 (device dependent). C JUSTIF = integer justification of NDC space on the C device. Range 0-9. Default: 0 (device dependent). -C + C CALLS -PSTJOB, VBERRH, VIINIT. -C + C EXIT CONDITIONS -XNDCMX,YNDCMX = real NDC maximum valid values. C VECTOR = real array of default attribute values (all C device-dependent except VECTOR(4)=0.0). -C + C NARRATIVE -This must be the first SVDI call made. All C attribute values, the color table, and current C position are set to appropriate defaults for the @@ -853,7 +850,7 @@ SUBROUTINE WCPSNT(ASPECT,JUSTIF) C is done. The screen is cleared or paper advanced C if necessary to guarantee a blank view surface for C drawing. -C + C ASPECT specifies the ratio of the X dimension to the C Y dimension. Maximum NDC values (at least one of C which will be 1.0) are computed to give the ASPECT @@ -864,7 +861,7 @@ SUBROUTINE WCPSNT(ASPECT,JUSTIF) C aspect of 1.0. The NDC rectangle is scaled until C one dimension fills the corresponding dimension of C the device. -C + C JUSTIF determines where the rectangle is located on C the device as diagrammed below: C --------- @@ -874,18 +871,18 @@ SUBROUTINE WCPSNT(ASPECT,JUSTIF) C --------- C For example, JUSTIF = 7 indicates NDC space will be C upper left justified on the device. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL ASPECT INTEGER JUSTIF -C + C JOB ID INFORMATION. (HC1, DIC) include 'vcjob.blk' -C + C COMPUTER DEPENDENT COMMON VARIABLES AND CONSTANTS. include 'vcpstc.blk' -C + C set common variables KWRTFL=6 KRDFL=0 @@ -903,64 +900,64 @@ SUBROUTINE WCPSNT(ASPECT,JUSTIF) C IF(KSECUR.NE.0) THEN C CALL VBERRH(957,13) C END IF -C + C THIS IS JUST A DUMMY ROUTINE WHICH DOES NOTHING BUT CALL VIINIT. C THIS ORGANIZATION FACILITATES ADDING SECURITY MARKINGS TO SVDI. CALL WCPSII(ASPECT,JUSTIF) -C + RETURN END SUBROUTINE WCPSID(XNDC,YNDC) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDIQND -Inquire NDC Space. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -XNDCMX,YNDCMX = real maximum valid NDC values. -C + C CALLS - -C + C EXIT CONDITIONS -XNDC,YNDC = real maximum valid NDC values (XNDCMX, C YNDCMX). -C + C NARRATIVE -Return the maximum NDC values as set to realize the C aspect defined by VDINIT. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL XNDC,YNDC -C + C MAXIMUM VALID NDC VALUES. (DEVICE-INDEPENDENT) REAL XNDCMX,YNDCMX COMMON /VCNDCM/ XNDCMX,YNDCMX -C + C RETURN THE MAXIMUM VALID NDC VALUES. XNDC=XNDCMX YNDC=YNDCMX -C + RETURN END SUBROUTINE WCPSIO(ATTARR) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDIQOS -Inquire Output Status (of Attributes). -C + C K.M. ERICKSON -14 NOV 80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -VECTOR = real array of current attribute values. -C + C CALLS - -C + C EXIT CONDITIONS -ATTARR = real array of current attribute value C (VECTOR). -C + C NARRATIVE -Return the current attribute values in ATTARR as C given below. C ATTARR(1)=Foreground Color @@ -970,11 +967,11 @@ SUBROUTINE WCPSIO(ATTARR) C (5)=Line Width C (6)=Character Box Y C (7)=Character Box X -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL ATTARR(7) -C + C CURRENT ATTRIBUTE VALUES. (DEVICE-INDEPENDENT) REAL VECTOR(7) COMMON /VCATTR/ VECTOR @@ -985,64 +982,64 @@ SUBROUTINE WCPSIO(ATTARR) C (5)=LINE WIDTH C (6)=CHARACTER BOX Y C (7)=CHARACTER BOX X -C + INTEGER I -C + DO 100 I=1,7 ATTARR(I)=VECTOR(I) 100 CONTINUE -C + RETURN END SUBROUTINE WCPSLN(X,Y) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDLINA -Line Absolute. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -X,Y = real NDC position. -C + C CALLS -VILINA. -C + C EXIT CONDITIONS - -C + C NARRATIVE -Draw a line from current position to absolute NDC C position X,Y and update current position. C Attributes foreground color, intensity, line style, C and line width apply. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL X,Y -C + C THIS IS JUST A DUMMY ROUTINE WHICH DOES NOTHING BUT CALL VILINA. C THIS ORGANIZATION FACILITATES ADDING SECURITY MARKINGS TO SVDI. CALL WCPSIL(X,Y) -C + RETURN END SUBROUTINE WCPSLE(ERRNUM,ERRSEV) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDLOGE -Log Error. -C + C R.W.Simons -08APR81 C K.M.Erickson -8OCT84 - add buffer flush -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -ERRNUM = integer error number. C ERRSEV = integer error severity. -C + C CALLS -PSTTBK, VDBUFL -C + C EXIT CONDITIONS - -C + C NARRATIVE -Report error with message to user and possibly C terminate job depending on severity. Notice that C by judicious use of the error routines (see VBERRH) @@ -1051,44 +1048,42 @@ SUBROUTINE WCPSLE(ERRNUM,ERRSEV) C occurrences of a particular error, or terminate C if more than 10 errors of a particular severity C occur. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER ERRNUM,ERRSEV -C -C + C COMPUTER DEPENDENT COMMON VARIABLES AND CONSTANTS. include 'vcpstc.blk' -C + C flush buffer before we do a write CALL WCPSFL -C + C WRITE THE ERROR TO THE LISTING. WRITE(KWRTFL,10)ERRNUM,ERRSEV 10 FORMAT(' SVDI ERROR NUMBER ',I5,' SEVERITY CODE ',I5) -C + C TRACEBACK. csam CALL PSTTBK -C + RETURN END SUBROUTINE WCPSMO(ISTATE) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDMONI -Logs Usage Information.. -C -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -ISTATE = 0 - initialization C 1 - new page C 2 - terminate -C + C CALLS -C + C EXIT CONDITIONS - -C + C NARRATIVE -For ISTATE=0, job information is initialized, and C timers are initialized called by VIINIT. C ISTATE=1 will increment a common block page @@ -1102,16 +1097,16 @@ SUBROUTINE WCPSMO(ISTATE) C Entry point VBDEV has an 8 character parameter C which will set a common block variable specifying C the device being used. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C dummy routine -C + CHARACTER*(*) C1,C2 -C + RETURN C Usage Monitoring Information -C + ENTRY VBPKG (C1) RETURN ENTRY VBDEV (C2) @@ -1125,106 +1120,106 @@ SUBROUTINE WCPSMO(ISTATE) END SUBROUTINE WCPSMV(X,Y) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDMOVA -Move Absolute. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -X,Y = real NDC position. -C + C CALLS -VIMOVA -C + C EXIT CONDITIONS - -C + C NARRATIVE -Set current position to absolute NDC position X,Y. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL X,Y -C + C THIS IS JUST A DUMMY ROUTINE WHICH DOES NOTHING BUT CALL VIMOVA. C THIS ORGANIZATION FACILITATES ADDING SECURITY MARKINGS TO SVDI. CALL WCPSIM(X,Y) -C + RETURN END SUBROUTINE WCPSPG C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDNWPG -New Page. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS - -C + C CALLS -VINWPG. -C + C EXIT CONDITIONS - -C + C NARRATIVE -Physically advance the medium or clear the screen, C whichever is appropriate. Also flood the screen C with the background color on devices that support C this function. The current position is not changed. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C THIS IS JUST A DUMMY ROUTINE WHICH DOES NOTHING BUT CALL VINWPG. C THIS ORGANIZATION FACILITATES ADDING SECURITY MARKINGS TO SVDI. CALL WCPSIG -C + RETURN END SUBROUTINE WCPSPT(X,Y) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDPNTA -Point Absolute. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -X,Y = real NDC position. -C + C CALLS -VIPNTA. -C + C EXIT CONDITIONS - -C + C NARRATIVE -Set current position to absolute NDC position X,Y C and put a visible point there. Attributes C foreground color and intensity apply. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL X,Y -C + C THIS IS JUST A DUMMY ROUTINE WHICH DOES NOTHING BUT CALL VIPNTA. C THIS ORGANIZATION FACILITATES ADDING SECURITY MARKINGS TO SVDI. CALL WCPSIP(X,Y) -C + RETURN END SUBROUTINE WCPSPY(XARRAY,YARRAY,NPTS) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDPOLY -POLYGON FILL ROUTINE -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS -XARRAY-ARRAY OF X VALUES OF THE POLYGON C YARRAY-CORRESPONDING ARRAY OF Y VALUES C NPTS- NUMBER OF POINTS IN (XARRAY,YARRAY) -C + C CALLS -VIPOLY -C + C EXIT CONDITIONS - -C + C NARRATIVE -The polygon defined by XARRAY,YARRAY will be drawn C and filled (constrained by any limitations of the C physical device -- see below). No checking will be @@ -1233,11 +1228,11 @@ SUBROUTINE WCPSPY(XARRAY,YARRAY,NPTS) C boundary is drawn using the solid line style. C VDI will close the polygon (i.e. the last point C will be connected to the first). -C + C The level of support for this primitive is device- C dependent. The level of support is categorized C as follows: -C + C Level 0 -- no polygon fill. Only the polygon C boundary is drawn. C Level 1 -- the device fills convex polygons. @@ -1250,43 +1245,43 @@ SUBROUTINE WCPSPY(XARRAY,YARRAY,NPTS) C is drawn to that point from a point far outside C the polygon, that line intersects the polygon C boundary an odd number of times. -C + C Note that the level of support for a particular device C can be inquired using the function VDIQDC. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER NPTS REAL XARRAY(NPTS),YARRAY(NPTS) -C + C THIS IS JUST A DUMMY ROUTINE WHICH DOES NOTHING BUT CALL VIPOLY. C THIS ORGANIZATION FACILITATES ADDING SECURITY MARKINGS TO SVDI. C mopoly controls polygon fill =0, on ; =1, off C mocolr controls color =0, on ; =1, off COMMON /VCPSTB/ MOPOLY, MOCOLR -C + IF(MOPOLY.EQ.0) THEN CALL WCPS12(XARRAY,YARRAY,NPTS) END IF -C + RETURN END SUBROUTINE WCPSOS(ATTARR) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDSTOS -Set Output Status (of Attributes). -C + C K.M. ERICKSON -14 NOV 80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -ATTARR = real array of attribute values. -C + C CALLS -VDSTBC,VDSTCS,VDSTFC,VDSTIN,VDSTLS,VDSTLW -C + C EXIT CONDITIONS -VECTOR = real updated attribute values (ATTARR). -C + C NARRATIVE -Set the attribute values from ATTARR as given below. C ATTARR(1)=Foreground Color C (2)=Background Color @@ -1294,11 +1289,11 @@ SUBROUTINE WCPSOS(ATTARR) C (4)=Line Style C (5)=Line Width C (6)=Character Box Y -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL ATTARR(6) -C + C CURRENT ATTRIBUTE VALUES. (DEVICE-INDEPENDENT) REAL VECTOR(7) COMMON /VCATTR/ VECTOR @@ -1309,7 +1304,7 @@ SUBROUTINE WCPSOS(ATTARR) C (5)=LINE WIDTH C (6)=CHARACTER BOX Y C (7)=CHARACTER BOX X -C + C CALL EACH OF THE INDIVIDUAL ATTRIBUTE SETTING ROUTINES. C CHECK FOR VALIDITY OF INPUT VALUES WILL BE DONE IN EACH INDIVIDUAL C ROUTINE. @@ -1319,56 +1314,56 @@ SUBROUTINE WCPSOS(ATTARR) CALL WCPSLS(NINT(ATTARR(4))) CALL WCPSLW(ATTARR(5)) c CALL VDSTCS(ATTARR(6)) -C + RETURN END SUBROUTINE WCPSTR C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDTERM -Terminate SVDI. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS - -C + C CALLS -VITERM. -C + C EXIT CONDITIONS - -C + C NARRATIVE -Terminate the SVDI by flushing buffers, etc. This C should be the last SVDI call made. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C THIS IS JUST A DUMMY ROUTINE WHICH DOES NOTHING BUT CALL VITERM. C THIS ORGANIZATION FACILITATES ADDING SECURITY MARKINGS TO SVDI. CALL WCPSIT -C + RETURN END SUBROUTINE WCPSTX(LENGTH,CHARS) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDTEXT -Text from Array. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -LENGTH = integer number of characters in CHARS. C Range 1-136. C CHARS = integer array of ASCII characters, one C character per array element, right justified. C Range 8,10,32-126. -C + C CALLS -VITEXT. -C + C EXIT CONDITIONS - -C + C NARRATIVE -Draw LENGTH characters in CHARS, starting at C current position and update current position to C the point after the last character box where the @@ -1381,178 +1376,176 @@ SUBROUTINE WCPSTX(LENGTH,CHARS) C considered reasonable. Attributes foreground color, C background color, intensity, and character size C apply. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER LENGTH,CHARS(136) -C + C THIS IS JUST A DUMMY ROUTINE WHICH DOES NOTHING BUT CALL VITEXT. C THIS ORGANIZATION FACILITATES ADDING SECURITY NARKINGS TO SVDI. CALL WCPSIX(LENGTH,CHARS) -C + RETURN END SUBROUTINE WCPSFR(ITYPE) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDFRAM - Draw header or trailer frame -C + C P. Watterberg - 27 Aug 81 -C + C ENVIRONMENT -Computer-independent, system-independent, FORTRAN 77 -C + C ENTRY CONDITIONS - ITYPE = 0 for header frame C = 1 for trailer frame -C + C CALLS - VIFRAM -C + C EXIT CONDITIONS - -C + C NARRATIVE - Calls vifram to get time and date from the C system via the computer-dependent routine PSTTOD(entry C point in PSTJOB) and writes it on an identification frame. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER ITYPE -C + CALL WCPS02(ITYPE) RETURN END SUBROUTINE WCPS02(ITYPE) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VIFRAM - Draw header or trailer frame -C + C P. Watterberg - 27 Aug 81 -C + C ENVIRONMENT -Computer-independent, system-independent, FORTRAN 77 -C + C ENTRY CONDITIONS - ITYPE = 0 for header frame C = 1 for trailer frame -C + C CALLS - -C + C EXIT CONDITIONS - -C + C NARRATIVE -NULL ROUTINE -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER ITYPE -C + RETURN END SUBROUTINE WCPSBU(BTNNUM) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDAABU -Await Any Button. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Batch Devices. -C + C ENTRY CONDITIONS - -C + C CALLS - -C + C EXIT CONDITIONS -BTNNUM = integer number of the button pressed. C Range 1 to a device dependent maximum which must be C at least 8. -C + C NARRATIVE -When a button has been pressed, its integer button C number is returned in BTNNUM. This function flushes C the button buffer, if any. This function flushes C the output buffers before doing input. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER BTNNUM -C -C + C COMPUTER DEPENDENT COMMON VARIABLES AND CONSTANTS. include 'vcpstc.blk' -C + C BATCH DEVICES DON'T NEED TO FLUSH BUFFERS. -C + BTNNUM=32 -C + RETURN END SUBROUTINE WCPSBL(BTNNUM,X,Y) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDABGL -Await Button, Get Locator. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Batch Devices. -C + C ENTRY CONDITIONS - -C + C CALLS - -C + C EXIT CONDITIONS -BTNNUM = integer number of the button pressed. C Range 1 to a device dependent maximum that must be C at least 8. C X,Y = real NDC position of the locator. -C + C NARRATIVE -Wait until a button is hit, then return the number C of the button in BTNNUM and the NDC value of the C locator in X,Y. This function flushes the output C buffers before doing input. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL X,Y INTEGER BTNNUM -C -C + C COMPUTER DEPENDENT COMMON VARIABLES AND CONSTANTS. include 'vcpstc.blk' -C + C BATCH DEVICES DON'T NEED TO FLUSH BUFFERS. -C + BTNNUM=32 X=0 Y=0 -C + RETURN END SUBROUTINE WCPSKL(CHAR,X,Y) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDAKGL -Await Keyboard, Get Locator. -C + C R.W.SIMONS -02DEC80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Batch Devices. -C + C ENTRY CONDITIONS - -C + C CALLS - -C + C EXIT CONDITIONS -CHAR = integer ASCII character input from the C keyboard, right-justified, zero fill. Range 32-126. C X,Y = real NDC position of the locator. -C + C NARRATIVE -Wait until a key is hit, then return the character C entered in CHAR and the NDC value of the locator C in X,Y. If the character entered does not fall in C the range 32-126, a blank(32) is returned in CHAR. C This function flushes the output buffers before C doing input. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL X,Y INTEGER CHAR -C + C dummy routine -C + CHAR=32 X=0. Y=0. @@ -1560,20 +1553,20 @@ SUBROUTINE WCPSKL(CHAR,X,Y) END SUBROUTINE WCPSLO(X,Y) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDALOC -Await Locator. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Batch Devices. -C + C ENTRY CONDITIONS - -C + C CALLS - -C + C EXIT CONDITIONS -X,Y = real NDC position of the locator. -C + C NARRATIVE -Wait until the locator is positioned, then return C the NDC value of the locator in X,Y. The fact that C the locator is positioned can be signaled in a @@ -1584,150 +1577,149 @@ SUBROUTINE WCPSLO(X,Y) C function, as only the locator position is returned. C This function flushes the output buffers before C doing input. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL X,Y -C -C + C COMPUTER DEPENDENT COMMON VARIABLES AND CONSTANTS. include 'vcpstc.blk' -C + C BATCH DEVICES DON'T NEED TO FLUSH BUFFERS. -C + X=0 Y=0 -C + RETURN END SUBROUTINE WCPSBE C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDBELL -Ring Bell -C + C R.W.SIMONS -02DEC80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Batch Devices. -C + C ENTRY CONDITIONS - -C + C CALLS - -C + C EXIT CONDITIONS - -C + C NARRATIVE -Ring user's bell to get his attention. This C function is ignored by batch devices. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C THIS FUNCTION IS IGNORED BY BATCH DEVICES. -C + RETURN END SUBROUTINE WCPSFL C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDBUFL -Buffer Flush. -C + C R.W.Simons -19DEC80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Batch Devices. -C + C ENTRY CONDITIONS - -C + C CALLS - -C + C EXIT CONDITIONS - -C + C NARRATIVE -Assure that the picture is up-to-date by flushing C buffers if necessary. Also prepare the device to C operate in alphanumeric (as opposed to graphic) C mode. This is necessary on some devices so that C alphanumeric data from FORTRAN I/O won't be C misinterpreted as graphic data. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C THIS FUNCTION IS IGNORED BY BATCH DEVICES. -C + RETURN END SUBROUTINE WCPSLA(LOCX,LOCY) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDSTLA -Set Initial Locator Position. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Batch Devices. -C + C ENTRY CONDITIONS -LOCX,LOCY = real NDC position that the locator is C initilaized to. -C + C CALLS - -C + C EXIT CONDITIONS - -C + C NARRATIVE -Set the initial locator position (light pen tracking C cross, for example) each time this function is C called. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL LOCX,LOCY -C + C BATCH DEVICES IGNORE THIS FUNCTION. -C + RETURN END SUBROUTINE WCPSWT C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDWAIT -Wait for User. -C + C R.W.SIMONS -02DEC80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Batch Devices. -C + C ENTRY CONDITIONS - -C + C CALLS - -C + C EXIT CONDITIONS - -C + C NARRATIVE -Wait for the user to view the screen and signal he C is done, normally by hitting any key. This function C flushes the output buffers before doing input. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C BATCH DEVICES IGNORE THIS COMMAND. -C + RETURN END SUBROUTINE WCPSIC(NUM,INDEX,CLRARY,CLRMOD) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C +C C VDIQCO -Inquire Color Table. -C +C C R.W.Simons -08APR81 C H. S. LAUSON 29MAY86 - changed for current HLS interpretation -C +C C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Black and White Devices. (LXY, HC1, ALP) -C +C C ENTRY CONDITIONS -NUM = integer number of color indexes to inquire. C Range 1-256. C INDEX = integer array of indexes to inquire. Range C 0-255. C CLRMOD = integer color model to be used. Range 0,1. -C +C C CALLS -VBERRH -C +C C EXIT CONDITIONS -CLRARY = real array of 3 by NUM elements returning C the values of the components of the indexes inquired. C Range for RGB: red 0.0-1.0 @@ -1736,7 +1728,7 @@ SUBROUTINE WCPSIC(NUM,INDEX,CLRARY,CLRMOD) C Range for HLS: hue 0.0-360.0 C lightness 0.0-1.0 C saturation 0.0-1.0 -C +C C NARRATIVE -Inquire one or more color table entries. NUM and C INDEX specify how many and which indexes are being C inquired. CLRMOD specifies which color model @@ -1745,28 +1737,28 @@ SUBROUTINE WCPSIC(NUM,INDEX,CLRARY,CLRMOD) C support a color table index specified will C return -1.0 in the first element of the CLRARY value C for that index. -C +C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C +C INTEGER NUM,INDEX(NUM),CLRMOD REAL CLRARY(3,NUM) -C +C COMMON /PCOLST/ PCOLS(3,256) -C +C C CHECK FOR VALID NUM. IF(NUM.LT.1.OR.NUM.GT.256) THEN CALL VBERRH(723,5) GOTO 999 END IF -C +C C CHECK FOR VALID CLRMOD. IF(CLRMOD.NE.0.AND.CLRMOD.NE.1) THEN CALL VBERRH(725,5) GOTO 999 END IF -C +C IF(CLRMOD.NE.0) STOP 'HLS COLORS NOT SUPPORTED' -C +C C CHECK FOR VALID INDEXES. DO 100 I=1,NUM INDEXN=INDEX(I) @@ -1778,58 +1770,58 @@ SUBROUTINE WCPSIC(NUM,INDEX,CLRARY,CLRMOD) CLRARY(2,I)=PCOLS(2,INDEXN) CLRARY(3,I)=PCOLS(3,INDEXN) 100 CONTINUE -C +C 999 RETURN END SUBROUTINE WCPSCP(X,Y) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDIQCP -Inquire Where Current Position Is. -C + C R.W.Simons -02DEC80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Devices that support a software CP. C (AP5,GER,H50,HC1,HCB,HPP,I10,I30,LXY,QCR,QMS,XYN) -C + C ENTRY CONDITIONS - -C + C CALLS - -C + C EXIT CONDITIONS -X,Y = real NDC position. -C + C NARRATIVE -Return the value of current position. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C CURRENT POSITION. REAL XCP,YCP COMMON /VCCRPS/ XCP,YCP -C + C ASSIGN THE CP TO X,Y. X=XCP Y=YCP -C + RETURN END SUBROUTINE WCPSBC(COLOR) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDSTBC -Set Background Color. -C + C R.W.Simons -05DEC80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Devices with a constant white background. (LXY, C HC1, ALP) -C + C ENTRY CONDITIONS -COLOR = integer color table index. Range 0-255. C Default: device dependent, in range 0-7. -C + C CALLS -VBERRH -C + C EXIT CONDITIONS -VECTOR(2) = real updated background color (COLOR). -C + C NARRATIVE -Set the background color for following VDNWPG or C TEXT primitives for devices supporting these C features. For example, many raster devices support @@ -1840,11 +1832,11 @@ SUBROUTINE WCPSBC(COLOR) C dependent value in the range 0-7. C If an unsupported value is specified, set to C default. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER COLOR -C + C CURRENT ATTRIBUTE VALUES. (DEVICE-INDEPENDENT) REAL VECTOR(7) COMMON /VCATTR/ VECTOR @@ -1855,29 +1847,29 @@ SUBROUTINE WCPSBC(COLOR) C (5)=LINE WIDTH C (6)=CHARACTER BOX Y C (7)=CHARACTER BOX X -C + C CHECK FOR VALID COLOR. IF(COLOR.LT.0.OR.COLOR.GT.255) THEN CALL VBERRH(724,5) GOTO 999 END IF -C + C ONLY THE SINGLE BACKGROUND COLOR 7 (WHITE) IS SUPPORTED, C SO NO ACTION IS NECESSARY. -C + vector(2) = color 999 RETURN END SUBROUTINE WCPSCO(INDEX,CLRARY,CLRMOD) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C +C C VDSTCO -Set Color Table. -C +C C R.W.SIMONS -02DEC80 -C +C C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Black and White Devices. (LXY, HC1, ALP) -C +C C ENTRY CONDITIONS -NUM = integer number of color indexes to be set. C Range 1-256. C INDEX = integer array of indexes to be set. Range @@ -1903,11 +1895,11 @@ SUBROUTINE WCPSCO(INDEX,CLRARY,CLRMOD) C 7 white 1.,1.,1. C CLRMOD = integer color model being used. Range 0,1. C Default: 0 (RGB). -C +C C CALLS -VBERRH -C +C C EXIT CONDITIONS - -C +C C NARRATIVE -Set one or more color table entries. This is a C dynamic setting, if the device will support it. C "Dynamic" neans that primitives which have already @@ -1930,31 +1922,31 @@ SUBROUTINE WCPSCO(INDEX,CLRARY,CLRMOD) C All devices must support at least a single device C dependent INDEX value in the range 0-7. If an C unsupported value is specified, it should be ignored. -C +C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C +C INTEGER INDEX,CLRMOD REAL CLRARY(3) CHARACTER*6 KOLIND CHARACTER*20 KOLCOM COMMON /VCVEC1/ IVECT INTEGER IVECT -C +C C ARRAY TO CONTAIN COMPLETE COLOR TABLE -C +C COMMON /PCOLST/ PCOLS(3,256) -C +C C mopoly controls polygon fill =0, on ; =1, off C mocolr controls color =0, on ; =1, off COMMON /VCPSTB/ MOPOLY, MOCOLR -C -C +C +C C CHECK FOR VALID CLRMOD. IF(CLRMOD.NE.0.AND.CLRMOD.NE.1) THEN CALL VBERRH(725,5) GOTO 999 END IF -C +C C CHECK FOR VALID INDEXES. IF(INDEX.LT.0.OR.INDEX.GT.255) THEN CALL VBERRH(724,5) @@ -1971,19 +1963,19 @@ SUBROUTINE WCPSCO(INDEX,CLRARY,CLRMOD) CALL VBERRH(727,5) GOTO 100 END IF -C +C C 256 INDEXES ARE SUPPORTED: PCOLS(1,INDEX+1)=CLRARY(1) PCOLS(2,INDEX+1)=CLRARY(2) PCOLS(3,INDEX+1)=CLRARY(3) -C +C C define symbol for color reference -C +C IF(MOCOLR.NE.0) GO TO 390 -C +C C if a set of vectors was in process, issue stroke command C to draw them - then start a new path. -C +C IF(IVECT.NE.0) THEN CALL PSTBUF(2,'s ') IVECT=0 @@ -2017,32 +2009,32 @@ SUBROUTINE WCPSCO(INDEX,CLRARY,CLRMOD) CALL VBERRH(727,5) GOTO 100 END IF -C +C C 256 INDEXES ARE SUPPORTED: STOP 'HLS COLORS NOT AVAILABLE' END IF 100 CONTINUE -C +C 999 RETURN END SUBROUTINE WCPSFC(COLOR) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDSTFC -Set Foreground Color. -C + C R.W.Simons -05DEC80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Devices with a constant black foreground. (LXY, C HC1) -C + C ENTRY CONDITIONS -COLOR = integer color table index . Range 0-255. C Default is device dependent, in range 0-7. -C + C CALLS -VBERRH -C + C EXIT CONDITIONS -VECTOR(1) = real updated foreground color (COLOR). -C + C NARRATIVE -Set the foreground color index, i.e., the color C table index used for drawing future primitives. C Color is an integer from 0-255 which is used as an @@ -2051,16 +2043,16 @@ SUBROUTINE WCPSFC(COLOR) C dependent value in the range 0-7. C If an unsupported value is specified, set to C default. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER COLOR CHARACTER*5 KOLIND -C + C ARRAY TO CONTAIN COMPLETE COLOR TABLE -C + COMMON /PCOLST/ PCOLS(3,256) -C + C pstmlw controls minimum line width C kpstbg controls background coloring C = 0, not colored (white ground from paper) @@ -2069,11 +2061,11 @@ SUBROUTINE WCPSFC(COLOR) C = 0, no interchange C = 1, colors interchanged COMMON /VCPSTA/ PSTMLW, KPSTBG, KPSTCI -C + C mopoly controls polygon fill =0, on ; =1, off C mocolr controls color =0, on ; =1, off COMMON /VCPSTB/ MOPOLY, MOCOLR -C + COMMON /VCVEC1/ IVECT INTEGER IVECT C CURRENT ATTRIBUTE VALUES. (DEVICE-INDEPENDENT) @@ -2086,17 +2078,16 @@ SUBROUTINE WCPSFC(COLOR) C (5)=LINE WIDTH C (6)=CHARACTER BOX Y C (7)=CHARACTER BOX X -C C CHECK FOR VALID COLOR. IF(COLOR.LT.0.OR.COLOR.GT.255) THEN CALL VBERRH(724,5) GO TO 999 END IF -C + VECTOR(1)=COLOR IF(MOCOLR.EQ.0) THEN -C + C draw any vectors in stack before changing colors IF(IVECT.NE.0) THEN CALL PSTBUF(4,'s r ') @@ -2105,7 +2096,7 @@ SUBROUTINE WCPSFC(COLOR) CALL PSTBUF(0,' ') IVECT=0 END IF -C + C code using symbols KOLIND='c' IF(COLOR.LE.9) THEN @@ -2128,27 +2119,27 @@ SUBROUTINE WCPSFC(COLOR) NNN=5 END IF CALL PSTBUF(NNN,KOLIND(1:NNN)) -C + END IF 999 RETURN END SUBROUTINE WCPSIN(INTEN) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDSTIN -Set Intensity. -C + C R.W.Simons -05DEC80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Single Intensity Devices. (LXY, HC1) -C + C ENTRY CONDITIONS -INTEN = real intensity of the image of an output C primitive. Range 0.-1. Default: device dependent. -C + C CALLS - -C + C EXIT CONDITIONS -VECTOR(3) = real updated intensity (INTEN). -C + C NARRATIVE -Set the intensity value indicated for future C primitives. Intensity is a real value between 0 C (not visible) and 1 (maximum). Intensities are @@ -2156,11 +2147,11 @@ SUBROUTINE WCPSIN(INTEN) C All devices must support at least a single value: C 1.0. If an unsupported value is specified, set to C the closest supported intensity. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL INTEN -C + C CURRENT ATTRIBUTE VALUES. (DEVICE-INDEPENDENT) REAL VECTOR(7) COMMON /VCATTR/ VECTOR @@ -2171,39 +2162,38 @@ SUBROUTINE WCPSIN(INTEN) C (5)=LINE WIDTH C (6)=CHARACTER BOX Y C (7)=CHARACTER BOX X -C + C CHECK FOR VALID INTEN. IF(INTEN.LT.0.0.OR.INTEN.GT.1.0) THEN CALL VBERRH(401,5) GOTO 999 END IF -C + C ONLY THE SINGLE INTENSITY 1.0 (MAXIMUM) IS SUPPORTED, C SO NO ACTION IS NECESSARY. -C + 999 RETURN END SUBROUTINE WCPSIT C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VITERM -TERMINATE. -C + C D.L. CAMPBELL -1-DEC-1986 C J.P. LONG -9-NOV-1987 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS - -C + C CALLS - -C + C EXIT CONDITIONS - -C + C NARRATIVE -Terminate graphics device. Close output file. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C -C + C COMPUTER DEPENDENT COMMON VARIABLES AND CONSTANTS. include 'vcpstc.blk' COMMON /VCPAGE/ TOTPAG @@ -2212,7 +2202,7 @@ SUBROUTINE WCPSIT C mopoly controls polygon fill =0, on ; =1, off C mocolr controls color =0, on ; =1, off COMMON /VCPSTB/ MOPOLY, MOCOLR -C + C put out the last page and restore postscript environment so C nothing is left on the stack CALL WCPSIG @@ -2238,78 +2228,77 @@ SUBROUTINE WCPSIT C CLOSE OUTPUT FILE CALL PSTCFS(KOUTFL,1) CALL WCPSMO(2) -C + RETURN END SUBROUTINE WCPSIM(X,Y) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VIMOVA -Move Absolute. -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS -X,Y = real NDC position. -C + C CALLS - -C + C EXIT CONDITIONS -XCP,YCP = real updated current position. (X,Y) -C + C NARRATIVE -Set current position to absolute NDC position X,Y. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL X,Y -C -C + C move CALL VBVECT(0,X,Y) -C + RETURN END SUBROUTINE WCPSIP(X,Y) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VIPNTA -Point Absolute. -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS -X,Y = real NDC position. -C + C CALLS -VIMOVA,VILINA -C + C EXIT CONDITIONS - -C + C NARRATIVE -Set current position to absolute NDC position X,Y C and put a visible point there. Attributes C foreground color and intensity apply. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL X,Y -C + CALL WCPSIM(X,Y) CALL WCPSIL(X,Y) -C + RETURN END SUBROUTINE WCPS12(XARRAY,YARRAY,NPTS) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VIPOLY -POLYGON FILL ROUTINE -C + C D.L. CAMPBELL -1-DEC-1986 C J.P. LONG -9-NOV-1987 -C + C ENVIRONMENT -Fortran77, QMS -C + C ENTRY CONDITIONS -XARRAY-ARRAY OF X VALUES OF THE POLYGON C YARRAY-CORRESPONDING ARRAY OF Y VALUES C NPTS- NUMBER OF POINTS IN (XARRAY,YARRAY) -C + C CALLS - -C + C EXIT CONDITIONS - -C + C NARRATIVE -The polygon defined by XARRAY,YARRAY will be drawn C and filled (constrained by any limitations of the C physical device -- see below). No checking will be @@ -2318,11 +2307,11 @@ SUBROUTINE WCPS12(XARRAY,YARRAY,NPTS) C boundary is drawn using the solid line style. C VDI will close the polygon (i.e. the last point C will be connected to the first). -C + C The level of support for this primitive is device- C dependent. The level of support is categorized C as follows: -C + C Level 0 -- no polygon fill. Only the polygon C boundary is drawn. C Level 1 -- the device fills convex polygons. @@ -2335,18 +2324,18 @@ SUBROUTINE WCPS12(XARRAY,YARRAY,NPTS) C is drawn to that point from a point far outside C the polygon, that line intersects the polygon C boundary an odd number of times. -C + C Note that the level of support for a particular device C can be inquired using the function VDIQDC. -C + ******************************************************************************** -C + C The level for this device is level 2. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL XARRAY(NPTS),YARRAY(NPTS) -C + C ESCAPE FLAGS C PATNO AND BORDER USED BY VIPOLY FOR PATTERN FILL AND BORDER ON/OFF. DEFAULT C COMPLETE FILL AND BORDER ON @@ -2366,25 +2355,25 @@ SUBROUTINE WCPS12(XARRAY,YARRAY,NPTS) COMMON /VCVEC2/ COORD, LSTCRD CHARACTER COORD*20, LSTCRD*20 INTEGER IVECT -C + C mopoly controls polygon fill =0, on ; =1, off C mocolr controls color =0, on ; =1, off COMMON /VCPSTB/ MOPOLY, MOCOLR -C + C CHECK FOR VALID N IF (NPTS.LT.1 .OR. NPTS.GT.1490) THEN CALL VBERRH(802,5) GO TO 999 END IF -C + C IF A SET OF VECTORS WAS IN PROCESS, ISSUE STROKE COMMAND TO DRAW THEM C Start a new path. -C + IF(IVECT.NE.0) THEN CALL PSTBUF(2,'s ') IVECT=0 END IF -C + CALL PSTBUF(2,'r ') CALL PSTBUF(0,' ') CALL PSTBUF(4,'v o ') @@ -2395,20 +2384,20 @@ SUBROUTINE WCPS12(XARRAY,YARRAY,NPTS) CALL WCPSFC(NINT(VECTOR(1))) END IF CALL PSTBUF(0,' ') -C + C DRAW POLYGON VECTORS -C + C MOVE TO FIRST POINT CALL WCPSIM(XARRAY(1),YARRAY(1)) -C + C CALL VDLINA TO DRAW POINTS FROM 1ST POINT TO NTH POINT DO 100 I=2,NPTS CALL WCPSIL(XARRAY(I),YARRAY(I)) 100 CONTINUE -C + C THEN DRAW A LINE TO THE FIRST POINT TO CLOSE THE POLYGON CALL WCPSIL(XARRAY(1),YARRAY(1)) -C + C CLOSE THE POLYGON, GRAPHICS SAVE, FILL IT, GRAPHICS RESTORE, STROKE C TO PROVIDE THE SAME FILLED AREA AS IF IT WERE FILLED WITH VECTORS C THEN RESTORE AND SAVE POSTSCRIPT ENVIRONMENT TO AVOID INPUT BUFFER OVERFLOW @@ -2424,48 +2413,48 @@ SUBROUTINE WCPS12(XARRAY,YARRAY,NPTS) c CALL VDSTCS(VECTOR(6)) END IF CALL PSTBUF(0,' ') -C + C INIT THE CURRENT POSITION WITHIN POSTSCRIPT CALL WCPSMV(XARRAY(NPTS),YARRAY(NPTS)) IVECT=0 -C + 999 RETURN END SUBROUTINE WCPSIG C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VINWPG -New Page. -C + C D.L. CAMPBELL -1-DEC-1986 C J.P. LONG -9-NOV-1987 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS - -C + C CALLS - -C + C EXIT CONDITIONS - -C + C NARRATIVE -Physically advance the medium or clear the screen, C whichever is appropriate. Also flood the screen C with the background color on devices that support C this. The current position is not changed. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + COMMON /VCVEC1/ IVECT COMMON /VCVEC2/ COORD,LSTCRD -C + C vcpstd variables control what to do with empty frames with C command is received to dump data to output C kempty=0, frame is void - do not draw C >0, frame has data - draw it COMMON /VCPSTD/ KEMPTY -C + CHARACTER COORD*20, LSTCRD*20 CHARACTER*10 KPAGE -C + C pstmlw controls minimum line width C kpstbg controls background coloring C = 0, not colored (white ground from paper) @@ -2485,51 +2474,51 @@ SUBROUTINE WCPSIG C (5)=LINE WIDTH C (6)=CHARACTER BOX Y C (7)=CHARACTER BOX X -C + COMMON /VCPAGE/ TOTPAG INTEGER TOTPAG DATA NPAGE /0/ -C + C check for void page draw request C if nothing is on page, skip request -C + NPAGE=NPAGE+1 TOTPAG = NPAGE WRITE(KPAGE,'(I10)',ERR=345) NPAGE GO TO 349 345 KPAGE=' ???' 349 IF(KEMPTY.EQ.0) GO TO 350 -C + C stroke the path in case there are any vectors and show text CALL PSTBUF(2,'s ') IVECT=0 -C + C showpage and restore postscript environment to avoid buffer overflow C flush buffer because save and restore won't work back-to-back -C + CALL PSTBUF(4,'p r ') CALL PSTBUF(0,' ') -C + C comment frame number in output file -C + CALL PSTBUF(31,'%%Page: "'//KPAGE//'" '//KPAGE) CALL PSTBUF(0,' ') CALL PSTBUF(28, '%%PageOrientation: Landscape') CALL PSTBUF(0,' ') CALL PSTBUF(32, '%%PageBoundingBox: 36 30 574 750') CALL PSTBUF(0,' ') -C + CALL PSTBUF(4,'v o ') -C + C shade background if appropriate -C + IF(KPSTBG.NE.0) THEN CALL PSTBBG END IF GO TO 370 -C + C void frame -- First Page -C + 350 CALL PSTBUF(2, 'r ') CALL PSTBUF(0,' ') CALL PSTBUF(31,'%%Page: "'//KPAGE//'" '//KPAGE) @@ -2539,43 +2528,42 @@ SUBROUTINE WCPSIG CALL PSTBUF(32, '%%PageBoundingBox: 36 30 574 750') CALL PSTBUF(0,' ') CALL PSTBUF(4, 'v o ') -C + 370 CALL WCPSLW(VECTOR(5)) c CALL VDSTCS(VECTOR(6)) CALL WCPSFC(NINT(VECTOR(1))) CALL PSTBUF(0,' ') KEMPTY=0 -C + RETURN END SUBROUTINE WCPSES(ESCPCD,N,ARGS) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDESCP -Escape Code Routine. -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS -ESCPCD = integer escape function code. C N = integer number of arguments in ARG. RANGE >=0. C ARGS = real array of arguments for the escape C function specified. -C + C CALLS - -C + C EXIT CONDITIONS - -C + C NARRATIVE -Invoke the nonstandard, device-dependent function C ESCPCD. N is the number of arguments used by this C function and ARGS is a real array containing those C arguments. Unsupported values of ESCPCD are C ignored, not causing an error. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER ESCPCD,N REAL ARGS(*) -C C COMPUTER DEPENDENT COMMON VARIABLES AND CONSTANTS. include 'vcpstc.blk' C SCALE FACTORS FOR NDC TO DC MAPPING. (LXY,HC1) @@ -2584,18 +2572,18 @@ SUBROUTINE WCPSES(ESCPCD,N,ARGS) C DC DIMENSIONS OF OFFSETS AND PICTURE. (LXY,HC1) INTEGER XPAD,YPAD,XDEVIC,YDEVIC COMMON /VCDDIM/ XPAD,YPAD,XDEVIC,YDEVIC -C + C USED BY VIPOLY FOR PATTERN FILL AND BORDER ON/OFF. DEFAULT COMPLETE FILL C AND BORDER ON. PLC. COMMON/VCESCP/PGFORM,PATNO,BORDER INTEGER PGFORM,PATNO,BORDER -C + C CHECK FOR VALID N. IF(N.LT.0) THEN CALL VBERRH(802,5) GOTO 999 END IF -C + C 2100 - PAGE FORMAT (0=LANDSCAPE,1=PORTRAIT) IF (ESCPCD.EQ.2100) THEN IF (ARGS(1).EQ.0) THEN @@ -2603,9 +2591,9 @@ SUBROUTINE WCPSES(ESCPCD,N,ARGS) ELSE PGFORM=1 ENDIF -C + C set output format -C + ELSEIF (ESCPCD.EQ.2101) THEN CALL PSTSEL('1') ELSEIF (ESCPCD.EQ.2102) THEN @@ -2627,68 +2615,65 @@ SUBROUTINE WCPSES(ESCPCD,N,ARGS) ELSEIF (ESCPCD.EQ.2110) THEN CALL PSTSEL('10') ENDIF -C + 999 RETURN END SUBROUTINE WCPSIL (X,Y) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VILINA -C + C D.L. CAMPBELL -1-DEC-1986 C J.P. LONG -9-NOV-1987 -C + C ENVIRONMENT -DEVICE DEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS -X,Y REAL NDC COORDINATES -C + C CALLS - -C + C EXIT CONDITIONS -CURRENT POSITION IS SET -C -C + C NARRATIVE C LINE-DRAW A LINE FROM CP TO ABSOLUTE NDC POSITION X,Y C AND UPDATE CP . ATTRIBUTES COLOR,INTEN,LINSTY AND C LINWTH APPLY. -C -C + C OTHER VARIABLES: C XCP,YCP-NDC COORDINATES C*************************************************************************** -C + REAL X,Y -C + C vcpstd variables control what to do with empty frames with C command is received to dump data to output C kempty=0, frame is void - do not draw C >0, frame has data - draw it COMMON /VCPSTD/ KEMPTY -C -C + C draw ENTRY VBLINA(X,Y) CALL VBVECT(1,X,Y) KEMPTY=1 -C + RETURN END SUBROUTINE VBVECT(IPEN,X,Y) C**************************************************** C vbvect - do move or draw to x,y (depending on ipen) -C + C ipen = 0 for move, 1 for draw C x,y = NDC coordinates to be moved/drawn to -C + C****************************************************** -C + REAL X,Y,XOFF,YOFF CHARACTER CTEMP*20,XCOORD*4,YCOORD*4 -C + C mopoly controls polygon fill =0, on ; =1, off C mocolr controls color =0, on ; =1, off COMMON /VCPSTB/ MOPOLY, MOCOLR -C + C SCALE FACTORS FOR NDC TO DC MAPPING. (LXY,HC1) REAL XSCALE,YSCALE COMMON /VCSCAL/ XSCALE,YSCALE @@ -2712,15 +2697,15 @@ SUBROUTINE VBVECT(IPEN,X,Y) COMMON /VCVEC2/ COORD, LSTCRD CHARACTER COORD*20, LSTCRD*20 INTEGER IVECT -C + C compute new point in dev. coord. C convert to floating offsets XOFF=XPAD YOFF=YPAD -C + IXDC=X*XSCALE+XOFF IYDC=Y*YSCALE+YOFF -C + C write(xcoord,'(i5)')ixdc C write(ycoord,'(i5)')iydc C ...include both x,y @@ -2728,7 +2713,7 @@ SUBROUTINE VBVECT(IPEN,X,Y) CALL PSTI2C(IYDC,4,YCOORD) COORD = XCOORD(1:3)//'.'//XCOORD(4:4)//' '// 1 YCOORD(1:3)//'.'//YCOORD(4:4) -C + C pack up move/draw command, send it down C if (lstcrd(1:11) .ne. coord(1:11)) then IF (IPEN.EQ.0) THEN @@ -2741,7 +2726,7 @@ SUBROUTINE VBVECT(IPEN,X,Y) IVECT=IVECT+1 C end if lstcrd(1:11) = coord(1:11) -C + C stroke the path if we are approaching the 1500-coord pair limit C also restore and save postscript environment to avoid C input buffer overflow (must have a c/r between restore @@ -2759,34 +2744,34 @@ SUBROUTINE VBVECT(IPEN,X,Y) C reinitted the current posn IVECT=1 ENDIF -C + C UPDATE CURRENT POSITION XCP=X YCP=Y -C + RETURN END SUBROUTINE WCPSIX(LENGT1,CHARS) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VITEXT - Text from Array. -C + C P. Watterberg - 24 MAR 81 C J. P. LONG - 3 DEC 87 -C + C ENVIRONMENT - COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS - LENGT1 = integer number of characters in CHARS. C Range 1-136. C CHARS = integer array of ASCII characters, one C character per array element, right justified. C Range 8,10,32-126. -C + C CALLS - vbout -C + C EXIT CONDITIONS - XCP,YCP = integer updated current position (at the end C of the string). -C + C NARRATIVE - Draw LENGT1 characters in CHARS, starting at C current position and update current position to C the point after the last character box where the @@ -2799,11 +2784,11 @@ SUBROUTINE WCPSIX(LENGT1,CHARS) C considered reasonable. Attributes foreground color, C background color, intensity, and character size C apply. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER LENGT1, CHARS(136), LENGTH -C + CHARACTER CTEMP*150,STR*3 C CURRENT POSITION. REAL XCP,YCP @@ -2825,15 +2810,15 @@ SUBROUTINE WCPSIX(LENGT1,CHARS) C DC DIMENSIONS OF OFFSETS AND PICTURE. (LXY,HC1) INTEGER XPAD,YPAD,XDEVIC,YDEVIC COMMON /VCDDIM/ XPAD,YPAD,XDEVIC,YDEVIC -C + C vcpstd variables control what to do with empty frames with C command is received to dump data to output C kempty=0, frame is void - do not draw C >0, frame has data - draw it COMMON /VCPSTD/ KEMPTY -C + C check for valid length. -C + call WCPSCS(vector(6)) KEMPTY=1 LENGTH = LENGT1 @@ -2841,31 +2826,31 @@ SUBROUTINE WCPSIX(LENGT1,CHARS) CALL VBERRH(212,5) GO TO 999 END IF -C + C if(length.gt.136) then call vberrh(213,5), and use the C maximum length of 136. -C + IF(LENGTH.GT.136) THEN CALL VBERRH(213,5) LENGTH = 136 ENDIF -C + CTEMP='(' LENOUT=1 -C + C loop through length characters. -C + DO 100 I=1,LENGTH -C + C check for valid chars. -C + C ignore control characters, except for: C 8 is backspace C 10 is linefeed C 13 is carriage return -C + IF(CHARS(I).LT.32 .OR. CHARS(I).GT.126) THEN -C + IF(CHARS(I).EQ.8) THEN DX=-VECTOR(7) DY=0. @@ -2881,9 +2866,9 @@ SUBROUTINE WCPSIX(LENGT1,CHARS) CALL VBERRH(208,5) GOTO 100 ENDIF -C + C finish the string, emulate the control char, and start a new one -C + C send the buffered chars to the printer if there are any IF(LENOUT.NE.1) THEN CTEMP(LENOUT+1:150)=') t ' @@ -2892,64 +2877,63 @@ SUBROUTINE WCPSIX(LENGT1,CHARS) C reset the cp from the characters XCP=XCP+(LENOUT-5)*VECTOR(7) ENDIF -C + C calculate the new current position after the control char XCP=XCP+DX YCP=YCP+DY CALL VBVECT(0,XCP,YCP) -C + C start a new string CTEMP='(' LENOUT=1 -C + ELSE -C + C Char value is 32-126 inclusive. Put \ before these: C 92 is \ C 40 is ( C 41 is ) -C + IF(CHARS(I).EQ.40.OR.CHARS(I).EQ.41.OR.CHARS(I).EQ.92) THEN CTEMP(LENOUT+1:150)='\\' LENOUT=LENOUT+1 ENDIF -C + C now pack the chars into the buffer -C + CALL PSTA2C(CHARS(I),STR) CTEMP(LENOUT+1:150)=STR(1:1) LENOUT=LENOUT+1 ENDIF -C + 100 CONTINUE -C + C send the chars to the printer -C + CTEMP(LENOUT+1:150)=') t ' LENOUT=LENOUT+4 CALL PSTBUF(LENOUT,CTEMP) -C + C reset the cp from the characters -C + XCP=XCP+(LENOUT-5)*VECTOR(7) -C + 999 RETURN END SUBROUTINE WCPSLS(LINSTY) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDSTLS -Set Line Style. -C -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS -LINSTY = integer linestyle of line drawing output C primitives. Range 0-5. Default:0. -C + C CALLS - -C + C EXIT CONDITIONS -VECTOR(4) = real updated line style (LINSTY). -C + C NARRATIVE -Set the style of line as below. This applies only C to line drawing primitives. The line styles are: C 0 - solid @@ -2961,7 +2945,7 @@ SUBROUTINE WCPSLS(LINSTY) C All devices must support at least the values 0 and C 5. If an unsupported value is specified, set to 5. C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL LW INTEGER LINSTY,ILL,JLL COMMON /VCVEC1/ IVECT @@ -2969,7 +2953,7 @@ SUBROUTINE WCPSLS(LINSTY) CHARACTER COORD*20, LSTCRD*20 INTEGER IVECT CHARACTER CTEMP*30,STRL*3,STRS*3,STRG*3 -C + C CURRENT ATTRIBUTE VALUES. (DEVICE-INDEPENDENT) REAL VECTOR(7) COMMON /VCATTR/ VECTOR @@ -2989,7 +2973,7 @@ SUBROUTINE WCPSLS(LINSTY) C CURRENT ATTRIBUTE VALUES. (DEVICE-INDEPENDENT) C REAL VECTOR(7) C COMMON /VCATTR/ VECTOR -C + C VECTOR(1)=FOREGROUND COLOR C (2)=BACKGROUND COLOR C (3)=INTENSITY @@ -2997,17 +2981,16 @@ SUBROUTINE WCPSLS(LINSTY) C (5)=LINE WIDTH C (6)=CHARACTER BOX Y C (7)=CHARACTER BOX X -C -C + ENTRY VBSTLS(LINSTY) -C + C CHECK FOR VALID LINSTY. IF(LINSTY.LT.0.OR.LINSTY.GT.5) THEN CALL VBERRH(401,5) VECTOR(4) = 0 GOTO 999 END IF -C + IF(IVECT.NE.0) THEN CALL PSTBUF(2,'s ') IVECT=0 @@ -3016,19 +2999,19 @@ SUBROUTINE WCPSLS(LINSTY) IF(LINSTY.EQ.0) THEN CALL PSTBUF(7,'[] 0 h ') ENDIF -C + C calculate the linewidth -- it's needed below in every case -C + C actual xscale is xscale*.1; linewidth=1 => .01 in NDC LW=VECTOR(5) LW=XSCALE*VECTOR(5)*.001 C a linewidth of zero isn't good with postscript IF(LW.LT.1.) LW=1. -C + C from here on, set up patterns that depend on the linewidth and C the extra length added to the line segment C by the hemispherical end cap -C + IF(LINSTY.EQ.1) THEN ILL=NINT(0.5*LW) IGAP=NINT(3.*LW) @@ -3036,7 +3019,7 @@ SUBROUTINE WCPSLS(LINSTY) CALL PSTI2C(IGAP,3,STRG) CTEMP='['//STRL(1:3)//' '//STRG(1:3)//'] 0 h ' CALL PSTBUF(14,CTEMP) -C + ELSE IF(LINSTY.EQ.2) THEN ILL=NINT(18.*LW) JLL=NINT(1.5*LW) @@ -3048,7 +3031,7 @@ SUBROUTINE WCPSLS(LINSTY) * //' '//STRG(1:3)//'] 0 h ' CALL PSTBUF(22,CTEMP) C call pstbuf(14,'[2 2 6 2] 0 h ') -C + ELSE IF(LINSTY.EQ.3) THEN ILL=NINT(6.*LW) IGAP=NINT(7.*LW) @@ -3057,7 +3040,7 @@ SUBROUTINE WCPSLS(LINSTY) CTEMP='['//STRL(1:3)//' '//STRG(1:3)//'] 0 h ' CALL PSTBUF(14,CTEMP) C call pstbuf(8,'[4] 0 h ') -C + ELSE IF(LINSTY.EQ.4) THEN ILL=NINT(24.*LW) IGAP=NINT(18.*LW) @@ -3066,7 +3049,7 @@ SUBROUTINE WCPSLS(LINSTY) CTEMP='['//STRL(1:3)//' '//STRG(1:3)//'] 0 h ' CALL PSTBUF(14,CTEMP) C call pstbuf(8,'[8] 0 h ') -C + ELSE IF(LINSTY.EQ.5) THEN ILL=NINT(12.*LW) IGAP=NINT(10.*LW) @@ -3074,43 +3057,43 @@ SUBROUTINE WCPSLS(LINSTY) CALL PSTI2C(IGAP,3,STRG) CTEMP='['//STRL(1:3)//' '//STRG(1:3)//'] 0 h ' CALL PSTBUF(14,CTEMP) -C + ENDIF -C + C redefine the postscript current position -C + C the code below is equivalent to C call vbvect(0,xcp,ycp) C but can't do it because vbvect calls vdstlw which calls this routine -C + CTEMP=COORD(1:11)//' m ' CALL PSTBUF(14,CTEMP) -C + VECTOR(4)=LINSTY -C + 999 RETURN END SUBROUTINE WCPSCS(YSIZE) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDSTCS -Set Character Size. -C + C R.W.Simons -05DEC80 C J. P. LONG -03 DEC 87 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Devices that support only software characters. C (LXY, HC1) -C + C ENTRY CONDITIONS -YSIZE = real Y dimension of the character box in NDC C space. Range 0.-1. Default: device dependent, C typically the smallest hardware size. -C + C CALLS - -C + C EXIT CONDITIONS -VECTOR(6) = real updated character box Y (YSIZE). C VECTOR(7) = real updated character box X. -C + C NARRATIVE -Set the character size for text primitives. Size C is given by YSIZE as the Y dimension of the C character box. The SVDI will assign the X dimension @@ -3122,12 +3105,12 @@ SUBROUTINE WCPSCS(YSIZE) C unsupported value is specified, set to the largest C supported character size that does not exceed the C specified size. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL YSIZE CHARACTER STR*4,CTEMP*10 -C + C CURRENT ATTRIBUTE VALUES. (DEVICE-INDEPENDENT) REAL VECTOR(7) COMMON /VCATTR/ VECTOR @@ -3141,66 +3124,66 @@ SUBROUTINE WCPSCS(YSIZE) C SCALE FACTORS FOR NDC TO DC MAPPING. (LXY,HC1) REAL XSCALE,YSCALE COMMON /VCSCAL/ XSCALE,YSCALE -C + C CHECK FOR VALID YSIZE. IF(YSIZE.LT.0.0.OR.YSIZE.GT.1.0) THEN CALL VBERRH(401,5) GOTO 999 END IF -C + C PROTECT INPUT PARAMETER FROM BEING CHANGED. YSIZE1=YSIZE -C + C DON'T ALLOW VALUES BELOW THE MINIMUM "HARDWARE" SIZE. IF(YSIZE1.LT.0.01) YSIZE1=0.01 -C + C VALUES ESTABLISHED HERE ARE USED BY VBSIM IN SIMULATING CHARACTERS. C ALWAYS USE A CHARACTER ASPECT RATIO OF 5/7. VECTOR(6)=YSIZE1 VECTOR(7)=YSIZE1*5./7. -C + C convert the character size into device coords -C + IYSIZE=NINT(XSCALE*YSIZE1) -C + C output the postscript command -C + CALL PSTI2C(IYSIZE,4,STR) C iysize is in tenths of device units CTEMP='y '//STR(1:3)//' x ' CALL PSTBUF(8,CTEMP) -C + 999 RETURN END SUBROUTINE WCPSLW(LINWTH) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDSTLW -Set Line Width. -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS -LINWTH = real line width of line drawing output C primitives. Range 0.-1. Default: device dependent. -C + C CALLS - -C + C EXIT CONDITIONS -VECTOR(5) = real updated line width (LINWTH). -C + C NARRATIVE -Set the relative width of an output line. Values C are 0.-1. with 1. being .01 in NDC space. C All devices must support at least a single device C dependent value that is the default. If an C unsupported value is specified, set to the closest C supported line width. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL LINWTH,LW CHARACTER CTEMP*19,STR*5 -C + COMMON /VCVEC1/ IVECT INTEGER IVECT -C + C COMPUTER DEPENDENT COMMON VARIABLES AND CONSTANTS. include 'vcpstc.blk' C CURRENT ATTRIBUTE VALUES. (DEVICE-INDEPENDENT) @@ -3216,7 +3199,7 @@ SUBROUTINE WCPSLW(LINWTH) C SCALE FACTORS FOR NDC TO DC MAPPING. (LXY,HC1) REAL XSCALE,YSCALE COMMON /VCSCAL/ XSCALE,YSCALE -C + C pstmlw controls minimum line width C kpstbg controls background coloring C = 0, not colored (white ground from paper) @@ -3225,25 +3208,25 @@ SUBROUTINE WCPSLW(LINWTH) C = 0, no interchange C = 1, colors interchanged COMMON /VCPSTA/ PSTMLW, KPSTBG, KPSTCI -C + C CHECK FOR VALID LINWTH. IF(LINWTH.LT.0.0.OR.LINWTH.GT.1.) THEN CALL VBERRH(401,5) GOTO 999 END IF -C + C test user define minimum -C + WIDTH=MAX(PSTMLW,LINWTH) -C + C CONVERT LINE-WIDTH TO NDC LW=WIDTH*.005 -C + C CONVERT WIDTH TO DEVICE COORDINATES AND ADD A DIGIT; NEED IT TO HUNDREDTHS ILW=NINT(XSCALE*LW*10.) C A LINEWIDTH OF ZERO WORKS ONLY PART OF THE TIME IF(ILW.LT.10) ILW=10 -C + C SET LINE WIDTH CALL PSTI2C(ILW,5,STR) IF(IVECT.NE.0) THEN @@ -3254,35 +3237,35 @@ SUBROUTINE WCPSLW(LINWTH) CTEMP=STR(1:3)//'.'//STR(4:5)//' w ' CALL PSTBUF(9,CTEMP) END IF -C + VECTOR(5)=WIDTH -C + C since linestyle uses the linewidth in setting the pattern, call it -C + LINSTY=VECTOR(4) CALL VBSTLS(LINSTY) 999 RETURN END SUBROUTINE WCPSIE(ESCPCD,SUPPORT) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDIQES -Inquire Escape. -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS -ESCPCD = integer escape function code. -C + C CALLS - -C + C EXIT CONDITIONS -SUPPRT = integer level of support for the escape C function specified. Range 0,1,2. -C + C NARRATIVE -An integer value indicating 2=hardware supported, C 1=software supported, 0=unsupported is returned in C SUPPORT for the escape function ESCPCD. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER ESCPCD,SUPPORT IF (ESCPCD.EQ.2100) THEN SUPPORT=2 @@ -3296,45 +3279,44 @@ SUBROUTINE WCPSIE(ESCPCD,SUPPORT) END SUBROUTINE PSTBUF(NCHRS,OUT) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C PSTBUF -Output PostScript data -C + C C. D. Brown -DEC 1986 (Adapted from QMSBUF) -C + C ENVIRONMENT -COMPUTER/DEVICE DEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS -NCHRS = integer number of characters in OUT. C = 0 means flush the buffer. C OUT = character string of input data C KOUTFL = integer number of the graphics output file. -C + C CALLS - -C + C EXIT CONDITIONS - -C + C NARRATIVE -The data in OUT is buffered for output to KOUTFL. C The buffer is output when it is "full" or a buffer C flush is requested by specifying NCHRS<=0. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + SAVE INTEGER NCHRS CHARACTER OUT*(*) character*132 lstout integer lstchr -C -C + C COMPUTER DEPENDENT COMMON VARIABLES AND CONSTANTS. include 'vcpstc.blk' -C + C **NOTE: BUFFER SIZE (IN BITS) MUST BE AN EXACT MULTIPLE OF 8 (8-BIT DATA C MUST END EXACTLY AT WORD BOUNDARY) INTEGER CHARLN,ICNT,REMAIN CHARACTER CBUF*130 C CHARLN=BUFFER SIZE IN CHARS DATA ICNT/1/,CHARLN/130/,LSTCHR/-1/,LSTOUT/' '/ -C + C ...Check that last output string does not match current output GDS if (lstchr .eq. nchrs) then if (lstout(:lstchr) .eq. out(:nchrs)) return @@ -3344,7 +3326,7 @@ SUBROUTINE PSTBUF(NCHRS,OUT) C COMPUTE REMAINING AVAILABLE CHARACTERS IN BUFFER REMAIN=CHARLN-ICNT+1 -C + C CHECK FOR BUFFER FLUSH REQUEST OR NOT ENOUGH ROOM IN BUFFER. IF((NCHRS.LE.0).OR.(NCHRS.GT.REMAIN)) THEN C TEST IF THERE'S ANYTHING TO FLUSH. @@ -3359,67 +3341,67 @@ SUBROUTINE PSTBUF(NCHRS,OUT) ICNT=1 ENDIF ENDIF -C + C ADD TO BUFFER IF (NCHRS.GT.0) THEN CBUF(ICNT:ICNT+NCHRS-1)=OUT(1:NCHRS) ICNT=ICNT+NCHRS ENDIF -C + RETURN END SUBROUTINE PSTA2C(ASCI,CHARAC) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C PSTA2C - CONVERT FROM ASCII TO CHARACTER -C + C P. Watterberg - 19 Jan 1982 -C + C ENVIRONMENT - computer dependent, system dependent, fortran 77 -C + C ENTRY CONDITIONS - ASCI is an integer representing an ascii character -C + C CALLS - -C + C EXIT CONDITIONS - CHARAC is the character represented by ASCI -C + C NARRATIVE - -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + CHARACTER CHARAC*(*) INTEGER ASCI -C + CHARAC = CHAR(ASCI) -C + return end SUBROUTINE PSTI2C(INT,NDIGIT,ISTR) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C PSTI2C - convert positive integer to decimal character C string equivalent -C + C ENVIRONMENT - COMPUTER-INdependent -C + C ENTRY CONDITIONS - int = positive integer to be converted C ndigit = number of digits to be produced in string C form (pad left with zeros) C istr = character string of at least ndigit characters -C + C CALLS - -C + C EXIT CONDITIONS - istr contains decimal-string equivalent of int C (ndigits left-justified in istr) -C + C NARRATIVE - This routine modified 10/89 S.L.Thompson -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C INTEGER INT,NDIGIT CHARACTER ISTR*(*) CHARACTER*1 KA(10) DATA KA /'0','1','2','3','4','5','6','7','8','9'/ -C + C check input parameters INT1=MAX(INT,0) LENGTH=LEN(ISTR) @@ -3436,14 +3418,14 @@ SUBROUTINE PSTI2C(INT,NDIGIT,ISTR) RETURN END SUBROUTINE PSTBBG -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C Color background black for white paper device. C Should only be called from vdnwpg and viinit. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C pstmlw controls minimum line width C kpstbg controls background coloring C = 0, not colored (white ground from paper) @@ -3452,11 +3434,11 @@ SUBROUTINE PSTBBG C = 0, no interchange C = 1, colors interchanged COMMON /VCPSTA/ PSTMLW, KPSTBG, KPSTCI -C + C mopoly controls polygon fill =0, on ; =1, off C mocolr controls color =0, on ; =1, off COMMON /VCPSTB/ MOPOLY, MOCOLR -C + C CURRENT ATTRIBUTE VALUES. (DEVICE-INDEPENDENT) REAL VECTOR(7) COMMON /VCATTR/ VECTOR @@ -3467,7 +3449,7 @@ SUBROUTINE PSTBBG C (5)=LINE WIDTH C (6)=CHARACTER BOX Y C (7)=CHARACTER BOX X -C + COMMON /VCVEC1/ IVECT INTEGER IVECT COMMON /VCESCP/ PGFORM,PATNO,BORDER @@ -3475,7 +3457,7 @@ SUBROUTINE PSTBBG DIMENSION X(4),Y(4) PARAMETER (ONEN=0.99999) PARAMETER (ASP=0.75) -C + IF(MOPOLY.EQ.0) THEN IF(PGFORM.EQ.0) THEN X(1)=0. @@ -3505,39 +3487,39 @@ SUBROUTINE PSTBBG END SUBROUTINE PSTJOB C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C PSTJOB - GET JOB ID AND ROUTING INFORMATION -C + C ENVIRONMENT - COMPUTER-DEPENDENT FOR CTSS -C + C ENTRY CONDITIONS - -C + C CALLS - -C + C EXIT CONDITIONS - KJTIME - TIME HOLLERITH STRING C KJDATE - DATE HOLLERITH STRING C KUSRID - USER IDENTIFICATION C KJROUT - ROUTING INFORMATION -C + C NARRATIVE - THIS ROUTINE INQUIRES THE SYSTEM TO FIND THE ABOVE C INFORMATION. THE INFO IS PACKED INTO THE ARRAYS AS C HOLLERITH (INTERNAL DISPLAY CODE) STRINGS. A TERMI C CHARACTER "\" IS APPENDED TO EACH STRING SO THE CAL C ROUTINE CAN FIND THE END IF FOR SOME REASON THE LEN C VARIABLES ARE NOT SUFFICIENT. -C + C None of functions are used in pst driver -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C JOB ID INFORMATION. (HC1, DIC) include 'vcjob.blk' -C + C FOR SECURITY MARKINGS, CTSS CODES NEED TO MAP TO THESE SILLY C OLD SCOPE SECURITY CODES -C + C SCOPE 3 CODE -C + C 0 UNCL C 1 UNDEFINED C 2 UNDEFINED @@ -3550,38 +3532,38 @@ SUBROUTINE PSTJOB C 9 SNSI C 10 SFRD C 11 SRD -C + C GET CLASSIFICATION LEVEL KSECUR = 0 -C + C GET USER ID KUSRSZ = 8 KUSRID(1)=0 KUSRID(2)=0 KUSRID(3)=0 KUSRID(4)=0 -C + C GET JOB ID AND USERS NAME KJOBID(1) = 0 KJOBID(2) = 0 KJOBID(3) = 0 KJOBID(4) = 0 KIDSIZ = 24 -C + C GET BOX NUMBER KSZROU = 777 -C + KJROUT(1) = 0 KJROUT(2) = 0 KJROUT(3) = 0 KJROUT(4) = 0 -C + C GET MACHINE ID MACHIN(1) = 0 MACHIN(2) = 0 MACHIN(3) = 0 MACLEN=1 -C + C GET THE TIME AND DATE KJTIME(1)=0 KJTIME(2)=0 @@ -3589,14 +3571,14 @@ SUBROUTINE PSTJOB KJDATE(1)=0 KJDATE(2)=0 KJDATE(3)=0 -C + END SUBROUTINE PSTSEL(KARG) -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C Select type of desired output. Four options are -C + C device number C 1. black & white, batch, no poly fill 799.1 C 2. black & white, interactive, no poly 799.2 @@ -3608,15 +3590,15 @@ SUBROUTINE PSTSEL(KARG) C 8. color, interactive, black-white interchange 799.8 C 9. color, batch, black background 799.9 C 10.color, interactive, black background 799.11 -C + C A second function of this routine is to set the minimum line C width. For most systems the minimum width line is too narrow. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + SAVE CHARACTER*(*) KARG -C + C pstmlw controls minimum line width C kpstbg controls background coloring C = 0, not colored (white ground from paper) @@ -3625,11 +3607,11 @@ SUBROUTINE PSTSEL(KARG) C = 0, no interchange C = 1, colors interchanged COMMON /VCPSTA/ PSTMLW, KPSTBG, KPSTCI -C + C mopoly controls polygon fill =0, on ; =1, off C mocolr controls color =0, on ; =1, off COMMON /VCPSTB/ MOPOLY, MOCOLR -C + COMMON /DEVCAP/ DEV(33) common /blotans/ BLTANS character*2 BLTANS @@ -3768,24 +3750,24 @@ SUBROUTINE PSTSEL(KARG) RETURN END SUBROUTINE PSTINI -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C Generate any system dependent records which must be at the first C of PostScript output file. For example, a SUN laser printer C requires the first record of the file to be %! for the file C recognized as a PostScript file. This routine writes these C initial records. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + SAVE DATA KWAY /0/ IF(KWAY.EQ.0) THEN KWAY=1 -C + C generate first records in output file -C + *- INCLUDE PSTHEAD C the following is for a SUN UNIX system C record is a comment except for sun lpr @@ -3794,6 +3776,6 @@ SUBROUTINE PSTINI CALL PSTBUF(0,' ') *- END IF -C + RETURN END diff --git a/packages/seacas/applications/blot/cgi/vdx11cps.F b/packages/seacas/applications/blot/cgi/vdx11cps.F index 22edeb9690e3..0db1f94f68ff 100644 --- a/packages/seacas/applications/blot/cgi/vdx11cps.F +++ b/packages/seacas/applications/blot/cgi/vdx11cps.F @@ -1,11 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: vdx11cps.F,v 1.3 2007/01/26 16:58:24 gdsjaar Exp $ - C cps driver is the file device C x11 driver is the terminal device SUBROUTINE VDESCP(ESCPCD,N,ARGS) @@ -52,9 +50,9 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) #else #endif DATA TERMON,FILEON,TERMUP,FILEUP /2*.TRUE.,2*.TRUE./ -C + IF ( ESCPCD.GE.10000 .AND. ESCPCD.LE.10003 ) THEN -C + C Special Escape Codes for Dual Device Control: KSTAT = ESCPCD - 10000 TERMON = (KSTAT.EQ.1 .OR. KSTAT.EQ.3) .AND. TERMUP @@ -75,10 +73,10 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) IF (FILEON) CALL wcpses(ESCPCD,N,ARGS) END IF RETURN -C + C------------------------------------------------------------------------ ENTRY VDIQES(ESCPCD,SUPPORT) -C + C Special Escape Codes for Dual Device Control: IF ( ESCPCD.EQ.10000 ) THEN SUPPORT = 1 @@ -117,10 +115,10 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) END IF END IF RETURN -C + C----------------------------------------------------------------------- ENTRY VDINIT(ASPECT,JUSTIF) -C + C Check if terminal and hardcopy devices are null: #ifdef Build64 ESC4 = 10000 @@ -134,10 +132,10 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) CALL wcpsie( 10000,ISTAT ) FILEUP = ISTAT .EQ. 0 FILEON = FILEON .AND. FILEUP -C + C Stop program if both devices are null. IF (.NOT.(TERMUP.OR.FILEUP)) STOP 'No graphics device assigned.' -C + IF (TERMON) THEN #ifdef Build64 ASPECT4 = ASPECT @@ -149,7 +147,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) END IF IF (FILEON) CALL wcpsnt(ASPECT,JUSTIF) RETURN -C + C----------------------------------------------------------------------- ENTRY VDAABU(BTNNUM) IF (FILEON) CALL wcpsbu(BTNNUM) @@ -162,7 +160,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) #endif END IF RETURN -C + C----------------------------------------------------------------------- ENTRY VDABGL(BTNNUM,X,Y) IF (FILEON) CALL wcpsbl(BTNNUM,X,Y) @@ -175,7 +173,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) #endif END IF RETURN -C + C----------------------------------------------------------------------- ENTRY VDAKGL(CHAR,X,Y) IF (FILEON) CALL wcpskl(CHAR,X,Y) @@ -190,7 +188,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) #endif END IF RETURN -C + C----------------------------------------------------------------------- ENTRY VDALOC(X,Y) IF (FILEON) CALL wcpslo(X,Y) @@ -204,7 +202,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) #endif END IF RETURN -C + C----------------------------------------------------------------------- ENTRY VDBELL IF (TERMON) THEN @@ -212,7 +210,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) END IF IF (FILEON) CALL wcpsbe RETURN -C + C----------------------------------------------------------------------- ENTRY VDBUFL IF (TERMON) THEN @@ -220,7 +218,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) END IF IF (FILEON) CALL wcpsfl RETURN -C + C----------------------------------------------------------------------- ENTRY VDFRAM(ITYPE) IF (TERMON) THEN @@ -229,7 +227,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) END IF IF (FILEON) CALL wcpsfr(ITYPE) RETURN -C + C .... disable below C----------------------------------------------------------------------- ENTRY VDIQCO(NUM,INDEXA,CLRARY,CLRMOD) @@ -250,7 +248,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) #endif END IF RETURN -C + C----------------------------------------------------------------------- ENTRY VDIQCP(X,Y) IF (FILEON) CALL wcpscp(X,Y) @@ -264,7 +262,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) #endif END IF RETURN -C + C----------------------------------------------------------------------- ENTRY VDIQDC(INDEX,VALUE) IF (FILEON) CALL wcpsdc(INDEX,VALUE) @@ -278,7 +276,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) #endif END IF RETURN -C + C----------------------------------------------------------------------- ENTRY VDIQND(XNDC,YNDC) IF (FILEON) CALL wcpsid(XNDC,YNDC) @@ -292,7 +290,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) #endif END IF RETURN -C + C----------------------------------------------------------------------- ENTRY VDIQOS(ATTARR) IF (FILEON) CALL wcpsio(ATTARR) @@ -307,7 +305,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) #endif END IF RETURN -C + C----------------------------------------------------------------------- ENTRY VDLOGE(ERRNUM,ERRSEV) IF (TERMON) THEN @@ -316,7 +314,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) END IF IF (FILEON) CALL wcpsle(ERRNUM,ERRSEV) RETURN -C + C----------------------------------------------------------------------- ENTRY VDSTBC(COLOR) IF (TERMON) THEN @@ -329,7 +327,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) END IF IF (FILEON) CALL wcpsbc(COLOR) RETURN -C + C----------------------------------------------------------------------- ENTRY VDSTCO(NUM,INDEXA,CLRARY,CLRMOD) @@ -351,7 +349,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) END IF IF (FILEON) CALL wcpsco(INDEXA,CLRARY,CLRMOD) RETURN -C + C----------------------------------------------------------------------- ENTRY VDSTCS(YSIZE) IF (TERMON) THEN @@ -364,7 +362,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) END IF IF (FILEON) CALL wcpscs(YSIZE) RETURN -C + C----------------------------------------------------------------------- ENTRY VDSTFC(COLOR) IF (TERMON) THEN @@ -377,7 +375,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) END IF IF (FILEON) CALL wcpsfc(COLOR) RETURN -C + C----------------------------------------------------------------------- ENTRY VDSTIN(INTEN) IF (TERMON) THEN @@ -390,7 +388,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) END IF IF (FILEON) CALL wcpsin(INTEN) RETURN -C + C----------------------------------------------------------------------- ENTRY VDSTLA(LOCX,LOCY) IF (TERMON) THEN @@ -404,7 +402,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) END IF IF (FILEON) CALL wcpsla(LOCX,LOCY) RETURN -C + C....enabled below C----------------------------------------------------------------------- ENTRY VDSTLS(LINSTY) @@ -418,7 +416,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) END IF IF (FILEON) CALL wcpsls(LINSTY) RETURN -C + C----------------------------------------------------------------------- ENTRY VDSTLW(LINWTH) IF (TERMON) THEN @@ -431,7 +429,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) END IF IF (FILEON) CALL wcpslw(LINWTH) RETURN -C + C----------------------------------------------------------------------- ENTRY VDSTOS(ATTARR) IF (TERMON) THEN @@ -446,7 +444,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) END IF IF (FILEON) CALL wcpsos(ATTARR) RETURN -C + C----------------------------------------------------------------------- ENTRY VDWAIT IF (TERMON) THEN @@ -454,7 +452,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) END IF IF (FILEON) CALL wcpswt RETURN -C + C----------------------------------------------------------------------- ENTRY VDLINA(XX,YY) IF (TERMON) THEN @@ -468,7 +466,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) END IF IF (FILEON) CALL wcpsln(XX,YY) RETURN -C + C----------------------------------------------------------------------- ENTRY VDMOVA(X,Y) IF (TERMON) THEN @@ -482,7 +480,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) END IF IF (FILEON) CALL wcpsmv(X,Y) RETURN -C + C----------------------------------------------------------------------- ENTRY VDNWPG IF (TERMON) THEN @@ -490,7 +488,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) END IF IF (FILEON) CALL wcpspg RETURN -C + C----------------------------------------------------------------------- ENTRY VDPNTA(X,Y) IF (TERMON) THEN @@ -504,7 +502,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) END IF IF (FILEON) CALL wcpspt(X,Y) RETURN -C + C----------------------------------------------------------------------- ENTRY VDPOLY(XARRAY,YARRAY,NPTS) IF (TERMON) THEN @@ -522,7 +520,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) END IF IF (FILEON) CALL wcpspy(XARRAY,YARRAY,NPTS) RETURN -C + C----------------------------------------------------------------------- ENTRY VDTERM IF (TERMON) THEN @@ -530,7 +528,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) END IF IF (FILEON) CALL wcpstr RETURN -C + C----------------------------------------------------------------------- ENTRY VDTEXT(LENGTH,CHARS) IF (TERMON) THEN @@ -550,7 +548,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) END IF IF (FILEON) CALL wcpstx(LENGTH,CHARS) RETURN -C + END SUBROUTINE VBERRH() diff --git a/packages/seacas/applications/blot/cgi/x11_cgisx11.c b/packages/seacas/applications/blot/cgi/x11_cgisx11.c index fe74f57d267f..9f36276a913d 100644 --- a/packages/seacas/applications/blot/cgi/x11_cgisx11.c +++ b/packages/seacas/applications/blot/cgi/x11_cgisx11.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /* cgisx11.c - linker specifiable driver routine for driver diff --git a/packages/seacas/applications/blot/chkerr.f b/packages/seacas/applications/blot/chkerr.f index 89ef688cbe3f..1404fc166edb 100644 --- a/packages/seacas/applications/blot/chkerr.f +++ b/packages/seacas/applications/blot/chkerr.f @@ -1,51 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: chkerr.f,v $ -C Revision 1.3 2009/03/25 12:36:42 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.2 1997/11/11 14:55:53 gdsjaar -C Added 'external blkdat' to main program to ensure that the block data -C gets linked into the executable. Wasn't happening on dec alpha -C systems. -C -C Removed unreachable lines in several routines -C -C Fixed variable name spelling in contor.f -C -C Unsplit strings that were split across lines -C -C Removed old error variables left over from exodusIIv1 -C -C Upped version number -C -C Revision 1.1 1994/04/07 19:55:29 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.3 1993/07/28 15:58:32 gdsjaar -c Fixed junky looking output -c -c Revision 1.2 1993/07/27 20:27:18 gdsjaar -c Added error checking, set to non-verbose exodus II file opening, -c cleaned up dbiv0 routine, removed some unused variables. -c -c Revision 1.1 1993/07/27 19:35:17 gdsjaar -c Added file for error checking in exodus II calls. -c -c Revision 1.3 1993/06/24 15:27:20 gdsjaar -c Added more error flags and messages. -c -c Revision 1.2 1993/03/03 17:44:44 gdsjaar -c Fixed problem with assumed length strings. -c -c Revision 1.1 1992/06/08 22:23:07 gdsjaar -c New routine to check error status of exo2 library calls -c C======================================================================= subroutine chkerr (routine, caller, ierr) C======================================================================= diff --git a/packages/seacas/applications/blot/chkvar.f b/packages/seacas/applications/blot/chkvar.f index d94b161138fe..faa340582cca 100644 --- a/packages/seacas/applications/blot/chkvar.f +++ b/packages/seacas/applications/blot/chkvar.f @@ -1,29 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: chkvar.f,v $ -C Revision 1.3 2009/03/25 12:36:42 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.2 2009/01/22 21:34:21 gdsjaar -C There were several inline dbnums common blocks. Replaced with the -C include so they all have the same size with the added variable types. -C -C Added minor support for nodeset and sideset variables. -C -C It can print the count and the names, but that is all -C at this time. -C -C Revision 1.1 1994/04/07 19:55:38 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:48:04 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE CHKVAR (MODDET, MODTYP, IVIEW, IDTVAR, NVOLD, & NNDVAR, NEDVAR, OK) diff --git a/packages/seacas/applications/blot/ckcntr.f b/packages/seacas/applications/blot/ckcntr.f index 6386c46867cd..6b252b6e68e9 100644 --- a/packages/seacas/applications/blot/ckcntr.f +++ b/packages/seacas/applications/blot/ckcntr.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= @@ -25,7 +25,6 @@ SUBROUTINE CKCNTR (OK) C & CINTV(256), NOCMIN, NOCMAX, LABINC, MAXMIN, MAXMAX C LOGICAL CINTOK, LINCON, NOCMIN, NOCMAX - LOGICAL OK CHARACTER*80 ERRSTR diff --git a/packages/seacas/applications/blot/ckcros.f b/packages/seacas/applications/blot/ckcros.f index 073beb4d45cb..956273957f52 100644 --- a/packages/seacas/applications/blot/ckcros.f +++ b/packages/seacas/applications/blot/ckcros.f @@ -1,24 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: ckcros.f,v $ -C Revision 1.3 2009/03/25 12:36:42 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.2 1996/06/21 16:07:01 caforsy -C Ran ftnchek and removed unused variables. Reformat output for list -C var, list global, and list name. -C -C Revision 1.1 1994/04/07 19:55:44 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:48:08 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= LOGICAL FUNCTION CKCROS (IMID, IH, NLNKF, LINKF1, XN, YN, ZN) C======================================================================= diff --git a/packages/seacas/applications/blot/claspt.f b/packages/seacas/applications/blot/claspt.f index 64f684a75501..989cd70be964 100644 --- a/packages/seacas/applications/blot/claspt.f +++ b/packages/seacas/applications/blot/claspt.f @@ -1,24 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: claspt.f,v $ -C Revision 1.3 2009/03/25 12:36:42 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.2 1996/06/21 16:07:01 caforsy -C Ran ftnchek and removed unused variables. Reformat output for list -C var, list global, and list name. -C -C Revision 1.1 1994/04/07 19:55:47 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:48:10 gdsjaar -c Added RCS Id and Log to all files -c subroutine claspt( xpt, ypt, zpt, cutpt, cutnrm, status) real xpt, ypt, zpt @@ -28,10 +13,8 @@ subroutine claspt( xpt, ypt, zpt, cutpt, cutnrm, status) real vec(3) real tol parameter(REFTOL=1e-4) -c c check dot product of normal vector and (pt-cutpt) vector to find c if point is in front or behind plane -c vec(1) = xpt - cutpt(1) vec(2) = ypt - cutpt(2) vec(3) = zpt - cutpt(3) @@ -46,6 +29,5 @@ subroutine claspt( xpt, ypt, zpt, cutpt, cutnrm, status) else status = ISIN end if -c return end diff --git a/packages/seacas/applications/blot/clst.blk b/packages/seacas/applications/blot/clst.blk index f6e4655bed72..6cb603874377 100644 --- a/packages/seacas/applications/blot/clst.blk +++ b/packages/seacas/applications/blot/clst.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details PARAMETER (NCOLOR=9) diff --git a/packages/seacas/applications/blot/cmap-lst.blk b/packages/seacas/applications/blot/cmap-lst.blk index d35d4e94f1f6..06803803f93a 100644 --- a/packages/seacas/applications/blot/cmap-lst.blk +++ b/packages/seacas/applications/blot/cmap-lst.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details PARAMETER (NCOLOR=9) diff --git a/packages/seacas/applications/blot/cmdcon.f b/packages/seacas/applications/blot/cmdcon.f index 4dc9dbf6c031..16713608b2b1 100644 --- a/packages/seacas/applications/blot/cmdcon.f +++ b/packages/seacas/applications/blot/cmdcon.f @@ -1,24 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: cmdcon.f,v $ -C Revision 1.3 2009/03/25 12:36:42 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.2 1996/06/21 16:07:02 caforsy -C Ran ftnchek and removed unused variables. Reformat output for list -C var, list global, and list name. -C -C Revision 1.1 1994/04/07 19:55:54 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:48:12 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE CMDCON (VERB, INLINE, IFLD, INTYP, IFIELD, RFIELD, *) C======================================================================= diff --git a/packages/seacas/applications/blot/cmdcut.f b/packages/seacas/applications/blot/cmdcut.f index b37b3b907f89..7fa74f7ebc50 100644 --- a/packages/seacas/applications/blot/cmdcut.f +++ b/packages/seacas/applications/blot/cmdcut.f @@ -1,24 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: cmdcut.f,v $ -C Revision 1.3 2009/03/25 12:36:42 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.2 1996/06/21 16:07:03 caforsy -C Ran ftnchek and removed unused variables. Reformat output for list -C var, list global, and list name. -C -C Revision 1.1 1994/04/07 19:55:57 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:48:14 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE CMDCUT (VERB, INLINE, IFLD, INTYP, CFIELD, & RFIELD, A, *) @@ -65,41 +50,39 @@ SUBROUTINE CMDCUT (VERB, INLINE, IFLD, INTYP, CFIELD, LOGICAL FFMATC LOGICAL LDUM1, LDUM2 -C C PUT VERB IN OUTPUT STRING -C + CALL FFADDC (VERB, INLINE) -C + C CHECK THAT WE ARE ID 3D -C + IF (.NOT. IS3DIM) THEN CALL PRTERR ('CMDERR', 'Command allowed in 3D only') GOTO 100 END IF -C + C SET NEWCUT FLAG -C + IF (ISCUT) NEWCUT = .TRUE. ISCUT = .FALSE. -C + C "CUT OFF" COMMAND -C + IF (FFMATC (IFLD, INTYP, CFIELD, 'OFF', 3)) THEN CALL FFADDC ('OFF', INLINE) NEWCUT = .TRUE. ISCUT = .FALSE. -C + C ISSUE WARNING -C + ELSE IF (DFAC .NE. 0.0) THEN CALL PRTERR ('CMDWARN', & 'Cut is performed on undeformed mesh') END IF -C C "CUT SCREEN" COMMAND -C + IF (FFMATC (IFLD, INTYP, CFIELD, 'SCREEN', 1)) THEN ISON = .TRUE. C --Pick two points forming a line with a third point forming @@ -130,7 +113,7 @@ SUBROUTINE CMDCUT (VERB, INLINE, IFLD, INTYP, CFIELD, CALL UNROT (1, 1, PKRMAT, PKRCEN, & RNUM(5), RNUM(6), UNMESH(KNEA), & RNUM(1), RNUM(2), RNUM(3)) -C + C ENTER POINTS IN THE OUTPUT STRING CALL FFADDR (CUTPLA(1,1), INLINE) @@ -145,57 +128,56 @@ SUBROUTINE CMDCUT (VERB, INLINE, IFLD, INTYP, CFIELD, CALL FFADDR (RNUM(1), INLINE) CALL FFADDR (RNUM(2), INLINE) CALL FFADDR (RNUM(3), INLINE) -C + C GET CUT POINT AND NORMAL FROM THREE POINTS AND POINT IN MESH -C + CALL PTSNRM(CUTPLA, RNUM, CUTPT, CUTNRM, IERR) IF(IERR .NE. 0) GO TO 100 -C + C "CUT NORM" COMMAND -C + ELSE IF (FFMATC (IFLD, INTYP, CFIELD, 'NORM', 1)) THEN CALL FFADDC ('NORM', INLINE) ISON = FFMATC (IFLD, INTYP, CFIELD, 'CURSOR', 1) -C + C GET POINT ON CUT SURFACE -C + CALL QNPICK ('DISPLAYED', LDUM1, LDUM2, & A, KXN, KYN, KZN, KHIDEN, KNPSUR) CALL PICK3D ('point on cut surface', ISON, & NUMNPF, A(KXN), A(KYN), A(KZN), A(KHIDEN), & .TRUE., IFLD, INTYP, RFIELD, & CUTPT(1), CUTPT(2), CUTPT(3), *100) -C + C GET POINT FOR NORMAL -C + CALL PICK3D ('point for normal direction', ISON, & NUMNPF, A(KXN), A(KYN), A(KZN), A(KHIDEN), & .TRUE., IFLD, INTYP, RFIELD, & CUTNRM(1), CUTNRM(2), CUTNRM(3), *100) -C + C ENTER CUT POINT IN OUTPUT STRING -C + CALL FFADDR (CUTPT(1), INLINE) CALL FFADDR (CUTPT(2), INLINE) CALL FFADDR (CUTPT(3), INLINE) -C + C IF IN CURSOR MODE, THEN SUBTRACT NORMAL FROM CUT POINT TO GET THE C NORMAL DIRECTION -C + IF (ISON) THEN CUTNRM(1) = CUTNRM(1) - CUTPT(1) CUTNRM(2) = CUTNRM(2) - CUTPT(2) CUTNRM(3) = CUTNRM(3) - CUTPT(3) END IF -C + C ENTER NORMAL POINT IN OUTPUT STRING -C + CALL FFADDR (CUTNRM(1), INLINE) CALL FFADDR (CUTNRM(2), INLINE) CALL FFADDR (CUTNRM(3), INLINE) -C + C CALCULATE NORMAL AND NORMALIZE -C DIST = SQRT(CUTNRM(1)*CUTNRM(1) + CUTNRM(2)*CUTNRM(2) & + CUTNRM(3)*CUTNRM(3)) @@ -203,9 +185,9 @@ SUBROUTINE CMDCUT (VERB, INLINE, IFLD, INTYP, CFIELD, CUTNRM(1) = CUTNRM(1)/DIST CUTNRM(2) = CUTNRM(2)/DIST CUTNRM(3) = CUTNRM(3)/DIST -C + C "CUT" COMMANDS -C + ELSE ISON = FFMATC (IFLD, INTYP, CFIELD, 'CURSOR', 1) @@ -232,9 +214,9 @@ SUBROUTINE CMDCUT (VERB, INLINE, IFLD, INTYP, CFIELD, & NUMNPF, A(KXN), A(KYN), A(KZN), A(KHIDEN), & .FALSE., IFLD, INTYP, RFIELD, & RNUM(1), RNUM(2), RNUM(3), *100) -C + C ENTER POINTS IN OUTPUT STRING -C + CALL FFADDR (CUTPLA(1,1), INLINE) CALL FFADDR (CUTPLA(2,1), INLINE) CALL FFADDR (CUTPLA(3,1), INLINE) @@ -248,16 +230,15 @@ SUBROUTINE CMDCUT (VERB, INLINE, IFLD, INTYP, CFIELD, CALL FFADDR (RNUM(2), INLINE) CALL FFADDR (RNUM(3), INLINE) -C C GET CUT POINT AND NORMAL FROM THREE POINTS AND POINT IN MESH -C + CALL PTSNRM(CUTPLA, RNUM, CUTPT, CUTNRM, IERR) IF(IERR .NE. 0) GO TO 100 END IF -C + C SET CUTTING FLAGS -C + NEWCUT = .TRUE. ISCUT = .TRUE. END IF diff --git a/packages/seacas/applications/blot/cmddea.f b/packages/seacas/applications/blot/cmddea.f index 7245c11aafb8..e554a70b1e8e 100644 --- a/packages/seacas/applications/blot/cmddea.f +++ b/packages/seacas/applications/blot/cmddea.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/cmddev.f b/packages/seacas/applications/blot/cmddev.f index c293537c896c..197055e35fd7 100644 --- a/packages/seacas/applications/blot/cmddev.f +++ b/packages/seacas/applications/blot/cmddev.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/cmdelb.f b/packages/seacas/applications/blot/cmdelb.f index ee21a07f1685..d574cebc15f4 100644 --- a/packages/seacas/applications/blot/cmdelb.f +++ b/packages/seacas/applications/blot/cmdelb.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/cmdleg.f b/packages/seacas/applications/blot/cmdleg.f index f1f8da0d7724..a2284df05c8f 100644 --- a/packages/seacas/applications/blot/cmdleg.f +++ b/packages/seacas/applications/blot/cmdleg.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/cmdmod.f b/packages/seacas/applications/blot/cmdmod.f index 569b5b4cc9a9..c5e8b158e85e 100644 --- a/packages/seacas/applications/blot/cmdmod.f +++ b/packages/seacas/applications/blot/cmdmod.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/cmdmsh.f b/packages/seacas/applications/blot/cmdmsh.f index 9bf333df23b5..325e3df94e9f 100644 --- a/packages/seacas/applications/blot/cmdmsh.f +++ b/packages/seacas/applications/blot/cmdmsh.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/cmdmvw.f b/packages/seacas/applications/blot/cmdmvw.f index db544bbc067e..3d57558ee9c6 100644 --- a/packages/seacas/applications/blot/cmdmvw.f +++ b/packages/seacas/applications/blot/cmdmvw.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/cmdrot.f b/packages/seacas/applications/blot/cmdrot.f index d345f4d248ee..3d104fe7cd08 100644 --- a/packages/seacas/applications/blot/cmdrot.f +++ b/packages/seacas/applications/blot/cmdrot.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/cmdtim.f b/packages/seacas/applications/blot/cmdtim.f index 54283d23b376..01770d174776 100644 --- a/packages/seacas/applications/blot/cmdtim.f +++ b/packages/seacas/applications/blot/cmdtim.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: cmdtim.f,v $ -C Revision 1.2 2009/03/25 12:36:43 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 19:56:25 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:48:33 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE CMDTIM (INLINE, & VERB, IFLD, INTYP, CFIELD, IFIELD, RFIELD, diff --git a/packages/seacas/applications/blot/cmdvar.f b/packages/seacas/applications/blot/cmdvar.f index dbcfface2f83..b4a929e7840f 100644 --- a/packages/seacas/applications/blot/cmdvar.f +++ b/packages/seacas/applications/blot/cmdvar.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/cmdvwc.f b/packages/seacas/applications/blot/cmdvwc.f index c38255dbb283..fd870a1194f4 100644 --- a/packages/seacas/applications/blot/cmdvwc.f +++ b/packages/seacas/applications/blot/cmdvwc.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: cmdvwc.f,v $ -C Revision 1.2 2009/03/25 12:36:43 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 19:56:31 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:48:37 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE CMDVWC (VERB, INLINE, & IFLD, INTYP, CFIELD, IFIELD, RFIELD, diff --git a/packages/seacas/applications/blot/cmdwhe.f b/packages/seacas/applications/blot/cmdwhe.f index 1038bf964071..2aa0ee0993d8 100644 --- a/packages/seacas/applications/blot/cmdwhe.f +++ b/packages/seacas/applications/blot/cmdwhe.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/cmdzm.f b/packages/seacas/applications/blot/cmdzm.f index 3c0e05772453..c71d8763fd26 100644 --- a/packages/seacas/applications/blot/cmdzm.f +++ b/packages/seacas/applications/blot/cmdzm.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= @@ -222,9 +222,9 @@ SUBROUTINE CMDZM (VERB, INLINE, MSCTYP = 'ZOOM' CALL CPYREA (KTOP, RNUM, RDMESH) NZMON = .FALSE. -C + C ZOOM RADIUS COMMAND " ZOOM RADIUS XZM YZM (ZZM) RADZM " -C + ELSE IF (MATSTR (WORD, 'RADIUS', 1)) THEN CALL FFADDC (WORD, INLINE) C -- MAKE SURE THERE ARE VALUES IN THE INPUT @@ -254,9 +254,9 @@ SUBROUTINE CMDZM (VERB, INLINE, NODEZM = 0 NZMON = .TRUE. MSCTYP = 'ZOOM' -C + C ZOOM NODE COMMAND " ZOOM NODE NODEID RADIUS" or "ZOOM NODE CURSOR" -C + ELSE IF (MATSTR (WORD, 'NODE', 1)) THEN CALL FFADDC (WORD, INLINE) C -- SEE IF CURSOR OPTION IS SELECTED @@ -282,7 +282,6 @@ SUBROUTINE CMDZM (VERB, INLINE, CALL GETDST(NODEZM, NRAD, A(KXN), A(KYN), A(KZN), & RADZM) - ELSE C -- INPUT NODE ID AND RADIUS CALL FFNEED(IFLD, INTYP, 'I', 1, diff --git a/packages/seacas/applications/blot/cntelb.f b/packages/seacas/applications/blot/cntelb.f index 9d990437230a..087a7ba8403c 100644 --- a/packages/seacas/applications/blot/cntelb.f +++ b/packages/seacas/applications/blot/cntelb.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: cntelb.f,v $ -C Revision 1.2 2009/03/25 12:36:43 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 19:56:43 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:48:43 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE CNTELB (IELBST, NELBLK, NUMON, NUMSEL) C======================================================================= diff --git a/packages/seacas/applications/blot/cntlk3.f b/packages/seacas/applications/blot/cntlk3.f index 9dbf4f25a9b8..31083cf6e9ae 100644 --- a/packages/seacas/applications/blot/cntlk3.f +++ b/packages/seacas/applications/blot/cntlk3.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/cntlnk.f b/packages/seacas/applications/blot/cntlnk.f index de9eee3bbae6..25cb72358347 100644 --- a/packages/seacas/applications/blot/cntlnk.f +++ b/packages/seacas/applications/blot/cntlnk.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: cntlnk.f,v $ -C Revision 1.2 2009/03/25 12:36:43 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 19:56:49 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:48:47 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE CNTLNK (NELBLK, LENE, NLNKE, LENLNK, NELEMS) C======================================================================= diff --git a/packages/seacas/applications/blot/cntr.blk b/packages/seacas/applications/blot/cntr.blk index 752cdb7bd403..688290aa1f94 100644 --- a/packages/seacas/applications/blot/cntr.blk +++ b/packages/seacas/applications/blot/cntr.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C cntr.blk diff --git a/packages/seacas/applications/blot/cntri.f b/packages/seacas/applications/blot/cntri.f index 68b7db945c78..e0a7a8c3b3c1 100644 --- a/packages/seacas/applications/blot/cntri.f +++ b/packages/seacas/applications/blot/cntri.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: cntri.f,v $ -C Revision 1.2 2009/03/25 12:36:43 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 19:56:54 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:48:50 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= REAL FUNCTION CNTRI (ICNTR) C======================================================================= diff --git a/packages/seacas/applications/blot/cntvar.f b/packages/seacas/applications/blot/cntvar.f index ee53e55fa854..776d2437c26c 100644 --- a/packages/seacas/applications/blot/cntvar.f +++ b/packages/seacas/applications/blot/cntvar.f @@ -1,29 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: cntvar.f,v $ -C Revision 1.3 2009/03/25 12:36:43 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.2 2009/01/22 21:34:21 gdsjaar -C There were several inline dbnums common blocks. Replaced with the -C include so they all have the same size with the added variable types. -C -C Added minor support for nodeset and sideset variables. -C -C It can print the count and the names, but that is all -C at this time. -C -C Revision 1.1 1994/04/07 19:56:57 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:48:52 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE CNTVAR (MODDET, MODTYP, IDTVAR, NNDVAR, NEDVAR) C======================================================================= diff --git a/packages/seacas/applications/blot/cnvmax.f b/packages/seacas/applications/blot/cnvmax.f index 3b0e1074f91c..606cec1cb69c 100644 --- a/packages/seacas/applications/blot/cnvmax.f +++ b/packages/seacas/applications/blot/cnvmax.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: cnvmax.f,v $ -C Revision 1.2 2009/03/25 12:36:43 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 19:57:00 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:48:54 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE CNVMAX (NUMNPF, VARNP, IN2ELB, NMIN, NMAX, FMIN, FMAX) C======================================================================= diff --git a/packages/seacas/applications/blot/colormap.blk b/packages/seacas/applications/blot/colormap.blk index 5cd8075bcd64..86ebf415d629 100644 --- a/packages/seacas/applications/blot/colormap.blk +++ b/packages/seacas/applications/blot/colormap.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C color maps diff --git a/packages/seacas/applications/blot/comand.f b/packages/seacas/applications/blot/comand.f index 7222b42052e4..f9c65dd4e80a 100644 --- a/packages/seacas/applications/blot/comand.f +++ b/packages/seacas/applications/blot/comand.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/conlab.f b/packages/seacas/applications/blot/conlab.f index 2d5bc2edb2ff..b3bc2a8bff96 100644 --- a/packages/seacas/applications/blot/conlab.f +++ b/packages/seacas/applications/blot/conlab.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: conlab.f,v $ -C Revision 1.2 2009/03/25 12:36:43 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 19:57:10 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:48:58 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE CONLAB (ICNTR, CNTR, NHIT, LABINC, LINSET, & VARNP, XN, YN, ZN, IN2ELB, *) diff --git a/packages/seacas/applications/blot/conrng.f b/packages/seacas/applications/blot/conrng.f index e26032a2f8de..f11a53d1c89f 100644 --- a/packages/seacas/applications/blot/conrng.f +++ b/packages/seacas/applications/blot/conrng.f @@ -1,32 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: conrng.f,v $ -C Revision 1.3 2009/03/25 12:36:43 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.2 2003/10/02 17:01:51 gdsjaar -C Fixed the setting of an artificial range for a constant negative -C value. It was incorrectly making max < min and then iterating until -C overflow. Changed to subtract and add the absolute value of the -C constant value. -C -C Removed call to initialize random file since there is none with -C exodusII -C -C Removed saving of memory pointers in rndvar; instead just find them -C when reading an element variable. -C -C Revision 1.1 1994/04/07 19:57:13 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:49:00 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE CONRNG (ISLINE, FMINI, FMAXI, NCNTR, DELC, CMIN, CMAX) C======================================================================= diff --git a/packages/seacas/applications/blot/contf.f b/packages/seacas/applications/blot/contf.f index d0624dfd2882..577aac090e62 100644 --- a/packages/seacas/applications/blot/contf.f +++ b/packages/seacas/applications/blot/contf.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: contf.f,v $ -C Revision 1.2 2009/03/25 12:36:43 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 19:57:16 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:49:02 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE CONTF (CNTR, VARNP, NLNKF, LINKF1, & XN, YN, ZN, XF, YF, ZF) diff --git a/packages/seacas/applications/blot/contor.f b/packages/seacas/applications/blot/contor.f index 40a59deb1d6e..affb65e62652 100644 --- a/packages/seacas/applications/blot/contor.f +++ b/packages/seacas/applications/blot/contor.f @@ -1,44 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: contor.f,v $ -C Revision 1.4 2009/03/25 12:36:43 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.3 2009/01/22 21:34:21 gdsjaar -C There were several inline dbnums common blocks. Replaced with the -C include so they all have the same size with the added variable types. -C -C Added minor support for nodeset and sideset variables. -C -C It can print the count and the names, but that is all -C at this time. -C -C Revision 1.2 1997/11/11 14:55:54 gdsjaar -C Added 'external blkdat' to main program to ensure that the block data -C gets linked into the executable. Wasn't happening on dec alpha -C systems. -C -C Removed unreachable lines in several routines -C -C Fixed variable name spelling in contor.f -C -C Unsplit strings that were split across lines -C -C Removed old error variables left over from exodusIIv1 -C -C Upped version number -C -C Revision 1.1 1994/04/07 19:57:18 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:49:04 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE CONTOR (VARNP, LENF, NLNKF, LINKF, HIDEF, & XN, YN, ZN, XF, YF, ZF, LENL, LINSET, diff --git a/packages/seacas/applications/blot/cpymsh.f b/packages/seacas/applications/blot/cpymsh.f index 41d815aac763..fa32e08070fa 100644 --- a/packages/seacas/applications/blot/cpymsh.f +++ b/packages/seacas/applications/blot/cpymsh.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: cpymsh.f,v $ -C Revision 1.2 2009/03/25 12:36:43 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 19:57:21 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -CRevision 1.2 1990/12/14 08:49:06 gdsjaar -CAdded RCS Id and Log to all files -C C======================================================================= SUBROUTINE CPYMSH (INEW, IOLD, ISSNPS, ISSESS) C======================================================================= diff --git a/packages/seacas/applications/blot/crvlim.f b/packages/seacas/applications/blot/crvlim.f index d66bcf62289c..faec8d8731b5 100644 --- a/packages/seacas/applications/blot/crvlim.f +++ b/packages/seacas/applications/blot/crvlim.f @@ -1,26 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: crvlim.f,v $ -C Revision 1.3 2009/03/25 12:36:43 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.2 1997/11/11 21:44:42 gdsjaar -C Added check for NaN (not a number) in the curve limit determination. -C Prints a warning message and sets the min/max to be +/-1e30. -C -C Previous behavior was to hang... -C -C Revision 1.1 1994/04/07 19:57:25 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:49:08 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE CRVLIM (AXIS, TIMPLT, MAXPTS, NPTS, NSPVAR, NEPVAR, & PLTVAL) diff --git a/packages/seacas/applications/blot/csv.blk b/packages/seacas/applications/blot/csv.blk index 5bed226e9f7c..7582843bebae 100644 --- a/packages/seacas/applications/blot/csv.blk +++ b/packages/seacas/applications/blot/csv.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /CSVBLK/ NCSV, CSVOPN diff --git a/packages/seacas/applications/blot/cutopt.blk b/packages/seacas/applications/blot/cutopt.blk index 8fa265715c1b..48e3469d5f0e 100644 --- a/packages/seacas/applications/blot/cutopt.blk +++ b/packages/seacas/applications/blot/cutopt.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /CUTOPT/ NEWCUT, ISCUT, CUTPT(3), CUTNRM(3) diff --git a/packages/seacas/applications/blot/cutrot.f b/packages/seacas/applications/blot/cutrot.f index 13be3874c5dd..f1ea9f1bfaa2 100644 --- a/packages/seacas/applications/blot/cutrot.f +++ b/packages/seacas/applications/blot/cutrot.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: cutrot.f,v $ -C Revision 1.2 2009/03/25 12:36:43 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 19:57:41 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:49:09 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE CUTROT (CUTPLA, CUTMAT, *) C======================================================================= diff --git a/packages/seacas/applications/blot/d3nums.blk b/packages/seacas/applications/blot/d3nums.blk index 3ed6a9150307..f93cb39ee3da 100644 --- a/packages/seacas/applications/blot/d3nums.blk +++ b/packages/seacas/applications/blot/d3nums.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /D3NUMS/ IS3DIM, NNPSUR, NUMNPF, LLNSET diff --git a/packages/seacas/applications/blot/dbase.blk b/packages/seacas/applications/blot/dbase.blk index d156fa205def..d22daddcc4d1 100644 --- a/packages/seacas/applications/blot/dbase.blk +++ b/packages/seacas/applications/blot/dbase.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /DBASE/ NDB, NLOG diff --git a/packages/seacas/applications/blot/dbieb1.f b/packages/seacas/applications/blot/dbieb1.f index c63412584fe5..9ec8f850da1f 100644 --- a/packages/seacas/applications/blot/dbieb1.f +++ b/packages/seacas/applications/blot/dbieb1.f @@ -1,65 +1,13 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE DBIEBI (NDB, OPTION, IELB, NUMELB, NUMLNK, NUMATR, & LINK, ATRIB, NATRDM, NLNKDM, *) C======================================================================= -C$Log: dbieb1.f,v $ -CRevision 1.5 2009/03/25 12:36:43 gdsjaar -CAdd copyright and license notice to all files. -CPermission to assert copyright has been granted; blot is now open source, BSD -C -CRevision 1.4 1998/07/15 14:44:13 gdsjaar -CGeneral cleanup, remove compiler warnings -C -CRevision 1.3 1997/11/11 14:55:54 gdsjaar -CAdded 'external blkdat' to main program to ensure that the block data -Cgets linked into the executable. Wasn't happening on dec alpha -Csystems. -C -CRemoved unreachable lines in several routines -C -CFixed variable name spelling in contor.f -C -CUnsplit strings that were split across lines -C -CRemoved old error variables left over from exodusIIv1 -C -CUpped version number -C -CRevision 1.2 1996/06/21 16:07:06 caforsy -CRan ftnchek and removed unused variables. Reformat output for list -Cvar, list global, and list name. -C -CRevision 1.1 1994/04/07 19:57:50 gdsjaar -CInitial checkin of ACCESS/graphics/blotII2 -C -C Revision 1.4 1993/07/28 18:51:58 gdsjaar -C Rename dbieb1 to dbiebi to reduce linker confusion with suplib routines. -C -C Revision 1.3 1993/07/27 20:27:19 gdsjaar -C Added error checking, set to non-verbose exodus II file opening, -C cleaned up dbiv0 routine, removed some unused variables. -C -C Revision 1.2 1993/07/27 14:54:43 gdsjaar -C Cleaned out commented-out code, fixed element block name reading. -C -c Revision 1.1 1993/07/27 13:30:32 gdsjaar -c Initial checkin of ACCESS/graphics/blotII -c -c Revision 1.1.1.1 1990/08/14 16:12:34 gdsjaar -c Testing -c -c Revision 1.1 90/08/14 16:12:33 gdsjaar -c Initial revision -c -c Revision 1.1 90/08/09 13:39:08 gdsjaar -c Initial revision -c C --*** DBIEB1 *** (EXOLIB) Read database element block misc. C -- Written by Amy Gilkey - revised 10/14/87 diff --git a/packages/seacas/applications/blot/dbielb.f b/packages/seacas/applications/blot/dbielb.f index 4da140693cec..fddca765619b 100644 --- a/packages/seacas/applications/blot/dbielb.f +++ b/packages/seacas/applications/blot/dbielb.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= @@ -94,7 +94,6 @@ SUBROUTINE DBIELB (NDB, OPTION, NELBS, NELBE, IDELB, NUMELB, IF (NERR .GT. 0) GOTO 110 END IF - IELNK = IESAV IEATR = IASAV DO 100 NELB = NELBS, NELBE diff --git a/packages/seacas/applications/blot/dbinam.f b/packages/seacas/applications/blot/dbinam.f index 8bb0e002548d..760b1b75cbee 100644 --- a/packages/seacas/applications/blot/dbinam.f +++ b/packages/seacas/applications/blot/dbinam.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/dbinm1.f b/packages/seacas/applications/blot/dbinm1.f index f9657ad9fda9..4ff7860bcfa0 100644 --- a/packages/seacas/applications/blot/dbinm1.f +++ b/packages/seacas/applications/blot/dbinm1.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/dbitim.f b/packages/seacas/applications/blot/dbitim.f index 70d1290e349b..1d2a008f6458 100644 --- a/packages/seacas/applications/blot/dbitim.f +++ b/packages/seacas/applications/blot/dbitim.f @@ -1,10 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details - C======================================================================= SUBROUTINE DBITIM (NDB, OPTION, EXODUS, & NVARNP, NELBLK, NVAREL, ISEVOK, diff --git a/packages/seacas/applications/blot/dblist.f b/packages/seacas/applications/blot/dblist.f index 1f38843ad225..680b0df3e745 100644 --- a/packages/seacas/applications/blot/dblist.f +++ b/packages/seacas/applications/blot/dblist.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/dbname.blk b/packages/seacas/applications/blot/dbname.blk index 164135395c63..80eeba2b8aa8 100644 --- a/packages/seacas/applications/blot/dbname.blk +++ b/packages/seacas/applications/blot/dbname.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /NAMES/ DBNAME, BASENAM, DEVICE diff --git a/packages/seacas/applications/blot/dbnams.blk b/packages/seacas/applications/blot/dbnams.blk index 2d9af3e5b40b..33b887cf49f9 100644 --- a/packages/seacas/applications/blot/dbnams.blk +++ b/packages/seacas/applications/blot/dbnams.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /DBNAMS/ NAMECO(6) diff --git a/packages/seacas/applications/blot/dbnumgq.blk b/packages/seacas/applications/blot/dbnumgq.blk index 8a3cd1397813..804e2c588f12 100644 --- a/packages/seacas/applications/blot/dbnumgq.blk +++ b/packages/seacas/applications/blot/dbnumgq.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /DBNUMG/ NUMNPS, LNPSNL, NUMESS, LESSEL, LESSNL, LNPSDF diff --git a/packages/seacas/applications/blot/dbnums.blk b/packages/seacas/applications/blot/dbnums.blk index b51e9659100f..6e379f32458b 100644 --- a/packages/seacas/applications/blot/dbnums.blk +++ b/packages/seacas/applications/blot/dbnums.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /DBNUMS/ NDIM, NUMNP, NUMEL, NELBLK, diff --git a/packages/seacas/applications/blot/dbsbel.f b/packages/seacas/applications/blot/dbsbel.f index f141c5745653..ca72e0378249 100644 --- a/packages/seacas/applications/blot/dbsbel.f +++ b/packages/seacas/applications/blot/dbsbel.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: dbsbel.f,v $ -C Revision 1.2 2009/03/25 12:36:43 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 19:59:05 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:49:14 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE DBSBEL (NELBLK, NUMEL, LENE, INEL, NLISEL, LISEL) C======================================================================= diff --git a/packages/seacas/applications/blot/dbsel.f b/packages/seacas/applications/blot/dbsel.f index 38400e8df826..ec5ab87f5b09 100644 --- a/packages/seacas/applications/blot/dbsel.f +++ b/packages/seacas/applications/blot/dbsel.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= @@ -55,7 +55,7 @@ SUBROUTINE DBSEL (A, IA, INLINE, DIMENSION A(*) INTEGER IA(*) - + CHARACTER*(*) INLINE(*) CHARACTER*(*) SELTYP INTEGER INTYP(*) diff --git a/packages/seacas/applications/blot/dbselb.f b/packages/seacas/applications/blot/dbselb.f index 4705dd84c8bb..1390fe577e42 100644 --- a/packages/seacas/applications/blot/dbselb.f +++ b/packages/seacas/applications/blot/dbselb.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: dbselb.f,v $ -C Revision 1.2 2009/03/25 12:36:43 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 19:59:11 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:49:18 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE DBSELB (NELBLK, NUMEL, LENE, INELB, NLISEL, LISEL) C======================================================================= diff --git a/packages/seacas/applications/blot/dbtitl.blk b/packages/seacas/applications/blot/dbtitl.blk index feaabff1f1fc..c11929c056e7 100644 --- a/packages/seacas/applications/blot/dbtitl.blk +++ b/packages/seacas/applications/blot/dbtitl.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /DBTITL/ TITLE, CREATE(4), MODIFY(4), DRAW(4) diff --git a/packages/seacas/applications/blot/dbvini_bl.f b/packages/seacas/applications/blot/dbvini_bl.f index 73b1b0975620..66faabd0cb5e 100644 --- a/packages/seacas/applications/blot/dbvini_bl.f +++ b/packages/seacas/applications/blot/dbvini_bl.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/deadup.F b/packages/seacas/applications/blot/deadup.F index a9f12ba42fbf..9df8852cc3a7 100644 --- a/packages/seacas/applications/blot/deadup.F +++ b/packages/seacas/applications/blot/deadup.F @@ -1,35 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: deadup.F,v $ -C Revision 1.4 2009/03/25 12:36:43 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.3 2009/01/22 21:34:21 gdsjaar -C There were several inline dbnums common blocks. Replaced with the -C include so they all have the same size with the added variable types. -C -C Added minor support for nodeset and sideset variables. -C -C It can print the count and the names, but that is all -C at this time. -C -C Revision 1.2 1997/06/26 17:51:32 caforsy -C Substituted if NeedsDoubleEscape for ifdef sun. This define is needed on cougar, sun and ibm platforms -C -C Revision 1.1 1994/04/07 19:59:17 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -CRevision 1.3 1993/07/08 21:57:11 gdsjaar -CReplaced SUN with sun in all ifdef statements. -C -CRevision 1.2 1990/12/14 08:49:21 gdsjaar -CAdded RCS Id and Log to all files -C C======================================================================= SUBROUTINE DEADUP (HIDENP, XN, YN, ZN, IDN2B, *) C======================================================================= diff --git a/packages/seacas/applications/blot/debug.blk b/packages/seacas/applications/blot/debug.blk index 928f92164cb3..7d03b7c97084 100644 --- a/packages/seacas/applications/blot/debug.blk +++ b/packages/seacas/applications/blot/debug.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details common /debugc/ cdebug diff --git a/packages/seacas/applications/blot/deflim.f b/packages/seacas/applications/blot/deflim.f index 66c7afa7d73a..79f09d293994 100644 --- a/packages/seacas/applications/blot/deflim.f +++ b/packages/seacas/applications/blot/deflim.f @@ -1,33 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: deflim.f,v $ -C Revision 1.4 2009/03/25 12:36:43 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.3 2009/01/22 21:34:21 gdsjaar -C There were several inline dbnums common blocks. Replaced with the -C include so they all have the same size with the added variable types. -C -C Added minor support for nodeset and sideset variables. -C -C It can print the count and the names, but that is all -C at this time. -C -C Revision 1.2 1996/06/21 16:07:07 caforsy -C Ran ftnchek and removed unused variables. Reformat output for list -C var, list global, and list name. -C -C Revision 1.1 1994/04/07 19:59:22 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:49:23 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE DEFLIM (A, WHOTIM, XN, YN, ZN, NPSURF) C======================================================================= @@ -113,7 +89,6 @@ SUBROUTINE DEFLIM (A, WHOTIM, XN, YN, ZN, NPSURF) END IF END IF - 110 CONTINUE RETURN END diff --git a/packages/seacas/applications/blot/deform.blk b/packages/seacas/applications/blot/deform.blk index 6e1c084f7af7..948246296942 100644 --- a/packages/seacas/applications/blot/deform.blk +++ b/packages/seacas/applications/blot/deform.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /DEFORM/ DEFPRO, DEFOK, DEFFAC, DDFAC, DFAC, diff --git a/packages/seacas/applications/blot/defxyz.f b/packages/seacas/applications/blot/defxyz.f index 93533da5ceb5..84126917b1cd 100644 --- a/packages/seacas/applications/blot/defxyz.f +++ b/packages/seacas/applications/blot/defxyz.f @@ -1,29 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: defxyz.f,v $ -C Revision 1.3 2009/03/25 12:36:43 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.2 2009/01/22 21:34:21 gdsjaar -C There were several inline dbnums common blocks. Replaced with the -C include so they all have the same size with the added variable types. -C -C Added minor support for nodeset and sideset variables. -C -C It can print the count and the names, but that is all -C at this time. -C -C Revision 1.1 1994/04/07 19:59:27 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:49:24 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE DEFXYZ (A, ISTEP, FACTOR, SURONL, NPSURF, & XN, YN, ZN, DXN, DYN, DZN) diff --git a/packages/seacas/applications/blot/detopt.blk b/packages/seacas/applications/blot/detopt.blk index 65fe0c1b065b..5691a5a1c6eb 100644 --- a/packages/seacas/applications/blot/detopt.blk +++ b/packages/seacas/applications/blot/detopt.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /DETOPT/ IDTVAR(4), NNDVAR, NEDVAR diff --git a/packages/seacas/applications/blot/devdat.blk b/packages/seacas/applications/blot/devdat.blk index 5be8bc7f8c69..6a9644888f41 100644 --- a/packages/seacas/applications/blot/devdat.blk +++ b/packages/seacas/applications/blot/devdat.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /DEVDAT/ DTW, VWSCL diff --git a/packages/seacas/applications/blot/dispv.f b/packages/seacas/applications/blot/dispv.f index f7ec796a0445..40c4c6374005 100644 --- a/packages/seacas/applications/blot/dispv.f +++ b/packages/seacas/applications/blot/dispv.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C============================================================================ @@ -30,7 +30,7 @@ SUBROUTINE DISPV (INIT, INLINE, IFLD, INTYP, CFIELD, C -- LIDSP(i) identifies the ith variable in the list. C -- If LIDSP(i) < 0, -LIDSP(i) is the id of a global variable. C -- If LIDSP(i) = 0, TIME is to be displayed on the plot legend. -C + include 'params.blk' LOGICAL INIT CHARACTER*(*) INLINE(*) diff --git a/packages/seacas/applications/blot/dtchk.f b/packages/seacas/applications/blot/dtchk.f index e9effa2729e0..f08c25e48611 100644 --- a/packages/seacas/applications/blot/dtchk.f +++ b/packages/seacas/applications/blot/dtchk.f @@ -1,29 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: dtchk.f,v $ -C Revision 1.3 2009/03/25 12:36:43 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.2 2009/01/22 21:34:21 gdsjaar -C There were several inline dbnums common blocks. Replaced with the -C include so they all have the same size with the added variable types. -C -C Added minor support for nodeset and sideset variables. -C -C It can print the count and the names, but that is all -C at this time. -C -C Revision 1.1 1994/04/07 19:59:39 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:49:28 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE DTCHK (PRTOK, OKAY) C======================================================================= diff --git a/packages/seacas/applications/blot/dtcomd.f b/packages/seacas/applications/blot/dtcomd.f index 974e7928398a..200cb0a00654 100644 --- a/packages/seacas/applications/blot/dtcomd.f +++ b/packages/seacas/applications/blot/dtcomd.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/dtlab.F b/packages/seacas/applications/blot/dtlab.F index ae3b64ccbc49..6cf13bf64107 100644 --- a/packages/seacas/applications/blot/dtlab.F +++ b/packages/seacas/applications/blot/dtlab.F @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/dtmain.f b/packages/seacas/applications/blot/dtmain.f index 91822b3348f8..3a173c35edaf 100644 --- a/packages/seacas/applications/blot/dtmain.f +++ b/packages/seacas/applications/blot/dtmain.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= @@ -484,9 +484,9 @@ SUBROUTINE DTMAIN (A, NAMECO, NAMES, NPTIMS, IPTIMS, TIMES, KTYF = KYF KTZF = KZF END IF -C + C FOR "ZOOM NODE" MODE, RECALCULATE THE ZOOM WINDOW -C + IF(NZMON) THEN CALL ZOOMND(A(KTXN), A(KTYN), A(KTZN), RDMESH) CALL EXPLIM(2, RDMESH, RDMESH) diff --git a/packages/seacas/applications/blot/dtplt1.f b/packages/seacas/applications/blot/dtplt1.f index aa91eff60ad1..f5b96b91f841 100644 --- a/packages/seacas/applications/blot/dtplt1.f +++ b/packages/seacas/applications/blot/dtplt1.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= @@ -229,7 +229,7 @@ SUBROUTINE DTPLT1 (A, MSHNUM, MSHLIN, MLNTYP, MODDET, MODTYP, N = 3 END IF IF (MODTYP .EQ. 'NODE') THEN - CALL VECTORN (MODTYP, VARNP, NUMNPF, + CALL VECTORN (MODTYP, VARNP, NUMNPF, & HIDENP, XN, YN, ZN, IN2ELB, VECMAX, & BLKCOL, IDELB, *100) ELSE diff --git a/packages/seacas/applications/blot/dtread.f b/packages/seacas/applications/blot/dtread.f index 2e4efc810f7c..974eba65c95c 100644 --- a/packages/seacas/applications/blot/dtread.f +++ b/packages/seacas/applications/blot/dtread.f @@ -1,29 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: dtread.f,v $ -C Revision 1.3 2009/03/25 12:36:43 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.2 2009/01/22 21:34:21 gdsjaar -C There were several inline dbnums common blocks. Replaced with the -C include so they all have the same size with the added variable types. -C -C Added minor support for nodeset and sideset variables. -C -C It can print the count and the names, but that is all -C at this time. -C -C Revision 1.1 1994/04/07 19:59:57 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:49:39 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE DTREAD (A, ISTEP, IDTVAR, NNDVAR, NEDVAR, & LENF, IF2EL, IELBST, ISEVOK, VARNP, VARFAC, VAR, LVARF) diff --git a/packages/seacas/applications/blot/dtshow.f b/packages/seacas/applications/blot/dtshow.f index ae6a3d398a85..7e7a708b7557 100644 --- a/packages/seacas/applications/blot/dtshow.f +++ b/packages/seacas/applications/blot/dtshow.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= @@ -320,7 +320,6 @@ SUBROUTINE DTSHOW (SHOTYP, NAMES, LIDSP) GO TO 130 ENDIF - END IF RETURN diff --git a/packages/seacas/applications/blot/elecor.f b/packages/seacas/applications/blot/elecor.f index 16f3c89b7901..6cd1f1db3be6 100644 --- a/packages/seacas/applications/blot/elecor.f +++ b/packages/seacas/applications/blot/elecor.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: elecor.f,v $ -C Revision 1.2 2009/03/25 12:36:43 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 20:00:12 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:49:44 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE ELECOR (NDIM, NELBLK, LEN, NLNK, LINK, & XN, YN, ZN, XE, YE, ZE) diff --git a/packages/seacas/applications/blot/elesta.f b/packages/seacas/applications/blot/elesta.f index 371be2e03967..ea176743bf42 100644 --- a/packages/seacas/applications/blot/elesta.f +++ b/packages/seacas/applications/blot/elesta.f @@ -1,29 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: elesta.f,v $ -C Revision 1.3 2009/03/25 12:36:43 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.2 2009/01/22 21:34:21 gdsjaar -C There were several inline dbnums common blocks. Replaced with the -C include so they all have the same size with the added variable types. -C -C Added minor support for nodeset and sideset variables. -C -C It can print the count and the names, but that is all -C at this time. -C -C Revision 1.1 1994/04/07 20:00:16 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:49:46 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE ELESTA (ISYTYP, VARFAC, LENF, NLNKF, LINKF, HIDEF, & XN, YN, ZN, ISVOK, *) diff --git a/packages/seacas/applications/blot/elestf.f b/packages/seacas/applications/blot/elestf.f index 56e32d98a8f5..88fe263e1f87 100644 --- a/packages/seacas/applications/blot/elestf.f +++ b/packages/seacas/applications/blot/elestf.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: elestf.f,v $ -C Revision 1.2 2009/03/25 12:36:44 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 20:00:19 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:49:48 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE ELESTF (NLNKF, LINKF1, XN, YN, ZN) C======================================================================= diff --git a/packages/seacas/applications/blot/epaint.f b/packages/seacas/applications/blot/epaint.f index 7ff7901988e1..8286ed276a43 100644 --- a/packages/seacas/applications/blot/epaint.f +++ b/packages/seacas/applications/blot/epaint.f @@ -1,32 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: epaint.f,v $ -C Revision 1.4 2009/03/25 12:36:44 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.3 2009/01/22 21:34:21 gdsjaar -C There were several inline dbnums common blocks. Replaced with the -C include so they all have the same size with the added variable types. -C -C Added minor support for nodeset and sideset variables. -C -C It can print the count and the names, but that is all -C at this time. -C -C Revision 1.2 1998/08/25 18:00:49 gdsjaar -C Fixed handling of 9-node quads in epaint mode. -C -C Revision 1.1 1994/04/07 20:00:23 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:49:49 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE EPAINT (VARFAC, LENF, NLNKF, LINKF, NXFAC, IXFAC, & XN, YN, ZN, ISVOK, FMIN, FMAX, *) diff --git a/packages/seacas/applications/blot/etcopt.blk b/packages/seacas/applications/blot/etcopt.blk index e7f089fc21ad..18a51de01015 100644 --- a/packages/seacas/applications/blot/etcopt.blk +++ b/packages/seacas/applications/blot/etcopt.blk @@ -1,9 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /ETCOPT/ VECSCL C --VECSCL - the vector length / symbol scale factor -C + diff --git a/packages/seacas/applications/blot/evarok.f b/packages/seacas/applications/blot/evarok.f index 3f1d6f20ae9d..ef232b3108f3 100644 --- a/packages/seacas/applications/blot/evarok.f +++ b/packages/seacas/applications/blot/evarok.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: evarok.f,v $ -C Revision 1.2 2009/03/25 12:36:44 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 20:00:29 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:49:53 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE EVAROK (NVARS, NVAR, NELBLK, IELBST, ISEVOK, ISVOK) C======================================================================= diff --git a/packages/seacas/applications/blot/explim.f b/packages/seacas/applications/blot/explim.f index 90556bf820a4..2903081c0958 100644 --- a/packages/seacas/applications/blot/explim.f +++ b/packages/seacas/applications/blot/explim.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: explim.f,v $ -C Revision 1.2 2009/03/25 12:36:44 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 20:00:32 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:49:54 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE EXPLIM (NDIM, RDMESH, EXMESH) C======================================================================= diff --git a/packages/seacas/applications/blot/expmax.f b/packages/seacas/applications/blot/expmax.f index cae4fc32afb3..4cdbfc9bb28a 100644 --- a/packages/seacas/applications/blot/expmax.f +++ b/packages/seacas/applications/blot/expmax.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: expmax.f,v $ -C Revision 1.2 2009/03/25 12:36:44 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 20:00:35 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:49:56 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE EXPMAX (LABSID, VMIN, VMAX) C======================================================================= diff --git a/packages/seacas/applications/blot/face3d.f b/packages/seacas/applications/blot/face3d.f index 5d1bcf1d1ba0..b8aed5566d90 100644 --- a/packages/seacas/applications/blot/face3d.f +++ b/packages/seacas/applications/blot/face3d.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/facelb.f b/packages/seacas/applications/blot/facelb.f index 7f639781e468..2599ae8558a0 100644 --- a/packages/seacas/applications/blot/facelb.f +++ b/packages/seacas/applications/blot/facelb.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= @@ -32,8 +32,6 @@ SUBROUTINE FACELB (IELB, LENE, NLNKE, LINKE, C --Common Variables: C -- Uses NUMNP of /DBNUMS/ - - include 'params.blk' include 'dbnums.blk' include 'minmax.blk' diff --git a/packages/seacas/applications/blot/ffnrng.f b/packages/seacas/applications/blot/ffnrng.f index 9a214013337e..4c04a877ec9d 100644 --- a/packages/seacas/applications/blot/ffnrng.f +++ b/packages/seacas/applications/blot/ffnrng.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: ffnrng.f,v $ -C Revision 1.2 2009/03/25 12:36:44 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 20:00:44 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:50:21 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE FFNRNG (IFLD, INTYP, CFIELD, IFIELD, EXPECT, MAXVAL, & IRANGE, *, *) diff --git a/packages/seacas/applications/blot/filhnd.f b/packages/seacas/applications/blot/filhnd.f index 10b82386e1f5..085911cf833f 100644 --- a/packages/seacas/applications/blot/filhnd.f +++ b/packages/seacas/applications/blot/filhnd.f @@ -1,60 +1,31 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: filhnd.f,v $ -C Revision 1.4 2009/03/25 12:36:44 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.3 2002/11/27 16:19:09 gdsjaar -C Fix filhnd calls to not pass partially uninitialized character strings to upcase. -C -C Revision 1.2 1997/11/11 14:55:55 gdsjaar -C Added 'external blkdat' to main program to ensure that the block data -C gets linked into the executable. Wasn't happening on dec alpha -C systems. -C -C Removed unreachable lines in several routines -C -C Fixed variable name spelling in contor.f -C -C Unsplit strings that were split across lines -C -C Removed old error variables left over from exodusIIv1 -C -C Upped version number -C -C Revision 1.1 1994/04/07 20:00:47 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:50:32 gdsjaar -c Added RCS Id and Log to all files -c c ====================================================================== c ====================================================================== c ====================================================================== c ====================================================================== -c + c ROUTINE: filhnd -c + c DESCRIPTION: Opens and closes files. -c + c AUTHOR: John H. Glick c Sandia National Laboratories c Division 1511 -c + c DATE: December 20, 1988 -c + c TYPE OF SUBPROGRAM: subroutine -c + c USAGE: call filhnd (unit , fil1, ecodei, ecodeo, c type, fform, facces, frecl, *) -c + c PARAMETERS: -c + c integer unit -- (INPUT) c If > 0, specifies the logical unit to be c opened. @@ -62,41 +33,40 @@ c close. c If = 0, all open logical units are to be c closed. -c + c character type -- (INPUT) c 'I' if input file (status = 'old') c 'O' if output file (status = 'new') c 'U' if unknown file type (status = 'unknown') c 'S' if scratch file (status = 'scratch') -c + c character fform -- (INPUT) c 'F' if formatted file c 'U' if unformatted file -c + c CALLS: -c + c prterr (BLOT) -- Prints an error message if one occurred c during the execution of filhnd. c exname (SUPES) -- Gets the filename associated with a unit c number. c lenstr (strlib) -- Gets the length of a string (excluding c trailing blanks). -c + c GLOBAL VARIABLES REFERENCED: -c + c CALLING ROUTINE(S): getins (BLOT) -c + c SYSTEM DEPENDENCIES: none -c + c ====================================================================== c ====================================================================== -c + subroutine filhnd (unit, filn, ecodei, ecodeo, type, fform, & facces, frecl, *) -c -c + c parameters -c + integer unit c if > 0, the logical unit of the file to open. c if < 0, the logical unit of the file to close. @@ -130,12 +100,11 @@ subroutine filhnd (unit, filn, ecodei, ecodeo, type, fform, c Name of the file to open. If ! = ' ', then filhnd calls c the SUPES routine EXNAME to get the filename associated c with the specified unit number. -c + c if unit <= 0, then all other parameters are ignored. -c -c + c declarations -c + character*2048 filnam c filename associated with unit integer lname @@ -159,13 +128,12 @@ subroutine filhnd (unit, filn, ecodei, ecodeo, type, fform, character tform, ttype, tacces c Temporary variables for storing modified values of fform, c type, and facces -c + c ***************************************************************** c ***************************************************************** -c c static declarations -c + logical first save first @@ -195,12 +163,11 @@ subroutine filhnd (unit, filn, ecodei, ecodeo, type, fform, c & print *, 'list is ',(opnlst(i),i=1,numopn) if ( unit .gt. 0 ) then -c + c open file associated with unit -c c set open keywords -c + cparm = fform call upcase_bl ( cparm ) tform = cparm(1:1) @@ -232,8 +199,7 @@ subroutine filhnd (unit, filn, ecodei, ecodeo, type, fform, return 1 endif lstat = lenstr ( status ) -c -c + cparm = facces call upcase_bl ( cparm ) tacces = cparm(1:1) @@ -247,20 +213,19 @@ subroutine filhnd (unit, filn, ecodei, ecodeo, type, fform, return 1 endif lacces = lenstr ( access ) -c -c + c open file -c + if ( status .ne. 'scratch' ) then -c + c get file associated with unit -c + filnam = filn call pack ( filnam, lname ) if ( lname .eq. 0 ) then call exname ( unit, filnam, lname ) endif -c + if ( access .eq. 'direct' ) then open ( unit=unit, file=filnam(:lname), & form=form(:lform), @@ -300,7 +265,6 @@ subroutine filhnd (unit, filn, ecodei, ecodeo, type, fform, & status=status(:lstat), iostat=ios) endif - if ( ios .ne. 0 ) then if ( ecodei ) then call prterr ('FATAL', @@ -317,20 +281,15 @@ subroutine filhnd (unit, filn, ecodei, ecodeo, type, fform, endif -c -c c update list of open files -c + if ( ecodeo ) then numopn = numopn + 1 opnlst(numopn) = unit endif -c -c else if ( unit .lt. 0 ) then -c -c + c close file unit = -unit @@ -353,9 +312,9 @@ subroutine filhnd (unit, filn, ecodei, ecodeo, type, fform, else ecodeo = .TRUE. endif -c + c update list of open files -c + if ( ecodeo ) then i = 1 100 continue @@ -379,7 +338,7 @@ subroutine filhnd (unit, filn, ecodei, ecodeo, type, fform, else c close all open files -c + ecodeo = .TRUE. do 120 i = 1, numopn @@ -400,12 +359,10 @@ subroutine filhnd (unit, filn, ecodei, ecodeo, type, fform, endif - c print *, 'about to exit filhnd' c print *, 'numopen = ',numopn c if ( numopn .gt. 0 ) c & print *, 'list is ',(opnlst(i),i=1,numopn) - return end diff --git a/packages/seacas/applications/blot/filnpf.f b/packages/seacas/applications/blot/filnpf.f index 0d2eaa4045a9..0199a5d47437 100644 --- a/packages/seacas/applications/blot/filnpf.f +++ b/packages/seacas/applications/blot/filnpf.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/fixal2.f b/packages/seacas/applications/blot/fixal2.f index 9bf7355dbb56..6cd1d89807e8 100644 --- a/packages/seacas/applications/blot/fixal2.f +++ b/packages/seacas/applications/blot/fixal2.f @@ -1,29 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: fixal2.f,v $ -C Revision 1.3 2009/03/25 12:36:44 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.2 2009/01/22 21:34:21 gdsjaar -C There were several inline dbnums common blocks. Replaced with the -C include so they all have the same size with the added variable types. -C -C Added minor support for nodeset and sideset variables. -C -C It can print the count and the names, but that is all -C at this time. -C -C Revision 1.1 1994/04/07 20:00:53 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:50:36 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE FIXAL2 (ALIVE, LENF, IF2EL, IE2ELB, NEWELB) C======================================================================= diff --git a/packages/seacas/applications/blot/fixal3.f b/packages/seacas/applications/blot/fixal3.f index 929a156ce14b..6bd98482339a 100644 --- a/packages/seacas/applications/blot/fixal3.f +++ b/packages/seacas/applications/blot/fixal3.f @@ -1,29 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: fixal3.f,v $ -C Revision 1.3 2009/03/25 12:36:44 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.2 2009/01/22 21:34:21 gdsjaar -C There were several inline dbnums common blocks. Replaced with the -C include so they all have the same size with the added variable types. -C -C Added minor support for nodeset and sideset variables. -C -C It can print the count and the names, but that is all -C at this time. -C -C Revision 1.1 1994/04/07 20:00:56 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:50:38 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE FIXAL3 (ALIVE, LENF, IF2EL, IF2EL2, IE2ELB, NEWELB) C======================================================================= @@ -95,7 +75,6 @@ SUBROUTINE FIXAL3 (ALIVE, LENF, IF2EL, IF2EL2, IE2ELB, NEWELB) NEWELB(IFAC) = - IE2ELB(IF2EL2(IFAC)) END IF - ELSE IF (NALIVE .EQ. 2) THEN C --If both elements are alive, change to an INTERIOR face diff --git a/packages/seacas/applications/blot/fixcut.f b/packages/seacas/applications/blot/fixcut.f index 5b98948b86fe..3de89b87f294 100644 --- a/packages/seacas/applications/blot/fixcut.f +++ b/packages/seacas/applications/blot/fixcut.f @@ -1,29 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: fixcut.f,v $ -C Revision 1.3 2009/03/25 12:36:44 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.2 2009/01/22 21:34:21 gdsjaar -C There were several inline dbnums common blocks. Replaced with the -C include so they all have the same size with the added variable types. -C -C Added minor support for nodeset and sideset variables. -C -C It can print the count and the names, but that is all -C at this time. -C -C Revision 1.1 1994/04/07 20:00:59 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:50:40 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE FIXCUT (CUTPT, CUTNRM, X, Y, Z, & LENF, NLNKF, LINKF, IF2EL, IF2EL2, IE2ELB, @@ -86,14 +66,12 @@ SUBROUTINE FIXCUT (CUTPT, CUTNRM, X, Y, Z, C & + Z(INP)*CUTMAT(3,3) C 100 CONTINUE -C C CLASSIFY EACH POINT AS BEING ISIN, ISOUT, OR ISON -C + DO 100 I = 1, NUMNP CALL CLASPT( X(I), Y(I), Z(I), CUTPT, CUTNRM, CLASS(I)) 100 CONTINUE - C --Initialize the element flags CALL INIINT (NUMEL, -999, IELCUT) @@ -133,8 +111,6 @@ SUBROUTINE FIXCUT (CUTPT, CUTNRM, X, Y, Z, IFACUT(IFAC) = ISON END IF - - C ZMIN = ZC(LINKF(IXL0+1)) C ZMAX = ZC(LINKF(IXL0+1)) C DO 110 K = 2, NL diff --git a/packages/seacas/applications/blot/fixelb.f b/packages/seacas/applications/blot/fixelb.f index abb3e7640b84..e8c1d10c2909 100644 --- a/packages/seacas/applications/blot/fixelb.f +++ b/packages/seacas/applications/blot/fixelb.f @@ -1,29 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: fixelb.f,v $ -C Revision 1.3 2009/03/25 12:36:44 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.2 2009/01/22 21:34:21 gdsjaar -C There were several inline dbnums common blocks. Replaced with the -C include so they all have the same size with the added variable types. -C -C Added minor support for nodeset and sideset variables. -C -C It can print the count and the names, but that is all -C at this time. -C -C Revision 1.1 1994/04/07 20:01:02 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:50:42 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE FIXELB (IELBST, LENF, IF2EL, IF2EL2, IE2ELB, NEWELB) C======================================================================= diff --git a/packages/seacas/applications/blot/fnddis.f b/packages/seacas/applications/blot/fnddis.f index 398a8490ae35..03092808e767 100644 --- a/packages/seacas/applications/blot/fnddis.f +++ b/packages/seacas/applications/blot/fnddis.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/fnde2f.f b/packages/seacas/applications/blot/fnde2f.f index fcf0e3dd8eb3..a0a5278f21b1 100644 --- a/packages/seacas/applications/blot/fnde2f.f +++ b/packages/seacas/applications/blot/fnde2f.f @@ -1,29 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: fnde2f.f,v $ -C Revision 1.3 2009/03/25 12:36:44 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.2 2009/01/22 21:34:21 gdsjaar -C There were several inline dbnums common blocks. Replaced with the -C include so they all have the same size with the added variable types. -C -C Added minor support for nodeset and sideset variables. -C -C It can print the count and the names, but that is all -C at this time. -C -C Revision 1.1 1994/04/07 20:01:08 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:50:45 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE FNDE2F (IEL, LENF, IF2EL, NQARY, IFACES, IELB) C======================================================================= diff --git a/packages/seacas/applications/blot/fndpth.f b/packages/seacas/applications/blot/fndpth.f index 6b21d0d7801f..b2bc1482c00e 100644 --- a/packages/seacas/applications/blot/fndpth.f +++ b/packages/seacas/applications/blot/fndpth.f @@ -1,32 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: fndpth.f,v $ -C Revision 1.4 2009/03/25 12:36:44 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.3 2009/01/22 21:34:21 gdsjaar -C There were several inline dbnums common blocks. Replaced with the -C include so they all have the same size with the added variable types. -C -C Added minor support for nodeset and sideset variables. -C -C It can print the count and the names, but that is all -C at this time. -C -C Revision 1.2 1998/09/03 14:29:52 rwstotz -C fixed problem with the elements path command -C -C Revision 1.1 1994/04/07 20:01:11 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:50:47 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE FNDPTH (NODVAR, LENE, NLNKE, LINKE, XNE, YNE, ZNE, & NPINFO, MAXNE, NNENUM, NENUM) diff --git a/packages/seacas/applications/blot/fndsel.f b/packages/seacas/applications/blot/fndsel.f index b7781b80e66b..6097593fc67c 100644 --- a/packages/seacas/applications/blot/fndsel.f +++ b/packages/seacas/applications/blot/fndsel.f @@ -1,29 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: fndsel.f,v $ -C Revision 1.3 2009/03/25 12:36:44 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.2 2009/01/22 21:34:21 gdsjaar -C There were several inline dbnums common blocks. Replaced with the -C include so they all have the same size with the added variable types. -C -C Added minor support for nodeset and sideset variables. -C -C It can print the count and the names, but that is all -C at this time. -C -C Revision 1.1 1994/04/07 20:01:14 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:50:49 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE FNDSEL (NODVAR, NNENUM, NENUM, & LENF, NLNKF, LINKF, IF2EL, IX2NP, diff --git a/packages/seacas/applications/blot/fnodes.f b/packages/seacas/applications/blot/fnodes.f index 86ea259b0a91..6b0af9f0630b 100644 --- a/packages/seacas/applications/blot/fnodes.f +++ b/packages/seacas/applications/blot/fnodes.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/gauss.f b/packages/seacas/applications/blot/gauss.f index fdc6604af8b4..ee4d809a544b 100644 --- a/packages/seacas/applications/blot/gauss.f +++ b/packages/seacas/applications/blot/gauss.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/gaussf.f b/packages/seacas/applications/blot/gaussf.f index e8a6e421d869..3951ea3b3544 100644 --- a/packages/seacas/applications/blot/gaussf.f +++ b/packages/seacas/applications/blot/gaussf.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: gaussf.f,v $ -C Revision 1.2 2009/03/25 12:36:44 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 20:01:23 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:50:56 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE GAUSSF (IS3DIM, NLNKF, LINKF1, XN, YN, ZN, & XGAUSS, YGAUSS, ZGAUSS) diff --git a/packages/seacas/applications/blot/geom2d.f b/packages/seacas/applications/blot/geom2d.f index 7f7d9f06df7f..faf456c1a21c 100644 --- a/packages/seacas/applications/blot/geom2d.f +++ b/packages/seacas/applications/blot/geom2d.f @@ -1,29 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: geom2d.f,v $ -C Revision 1.3 2009/03/25 12:36:44 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.2 2009/01/22 21:34:21 gdsjaar -C There were several inline dbnums common blocks. Replaced with the -C include so they all have the same size with the added variable types. -C -C Added minor support for nodeset and sideset variables. -C -C It can print the count and the names, but that is all -C at this time. -C -C Revision 1.1 1994/04/07 20:01:25 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:50:58 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE GEOM2D (LENF, NLNKF, LINKF, IF2EL, & LENL, LINSET, IEBSET, LINDEF, NREF, LREF) diff --git a/packages/seacas/applications/blot/geom3d.f b/packages/seacas/applications/blot/geom3d.f index 3164c0164896..476d73cae779 100644 --- a/packages/seacas/applications/blot/geom3d.f +++ b/packages/seacas/applications/blot/geom3d.f @@ -1,34 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: geom3d.f,v $ -C Revision 1.4 2009/03/25 12:36:44 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.3 2009/01/22 21:34:21 gdsjaar -C There were several inline dbnums common blocks. Replaced with the -C include so they all have the same size with the added variable types. -C -C Added minor support for nodeset and sideset variables. -C -C It can print the count and the names, but that is all -C at this time. -C -C Revision 1.2 2004/10/18 16:30:00 gdsjaar -C Add capability to handle tet elements. -C -C There are still a few minor problems, but the display is substantially correct. -C -C Revision 1.1 1994/04/07 20:01:28 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:51:00 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE GEOM3D (LENF, NLNKF, LINKF, IF2EL, & LENL, LINSET, LINDEF, LREF) @@ -75,7 +50,6 @@ SUBROUTINE GEOM3D (LENF, NLNKF, LINKF, IF2EL, INTEGER LINDEF(0:5,*) INTEGER LREF(*) - CALL INIINT (NUMNPF, 0, LREF) C --Define line set for surface faces only @@ -236,6 +210,5 @@ SUBROUTINE GEOM3D (LENF, NLNKF, LINKF, IF2EL, linset(2,ix) = lindef(2,il) 210 CONTINUE - RETURN END diff --git a/packages/seacas/applications/blot/getalv.f b/packages/seacas/applications/blot/getalv.f index 4c05fbcc0db7..c66a5bbd6177 100644 --- a/packages/seacas/applications/blot/getalv.f +++ b/packages/seacas/applications/blot/getalv.f @@ -1,37 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: getalv.f,v $ -C Revision 1.4 2009/03/25 12:36:44 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.3 2009/01/22 21:34:21 gdsjaar -C There were several inline dbnums common blocks. Replaced with the -C include so they all have the same size with the added variable types. -C -C Added minor support for nodeset and sideset variables. -C -C It can print the count and the names, but that is all -C at this time. -C -C Revision 1.2 2007/11/14 20:14:53 gdsjaar -C Added optional 'alive value' to the death on variable command. The -C default value is 0.0, but you can now specify a different value to -C indicate aliveness (for example, the presto DEATH_DUMMY_VAR treats 1.0 -C as the alive value). -C -C Example: DEATH ON DEATH_DUMMY_VAR 1 -C -C Revision 1.1 1994/04/07 20:01:31 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -CRevision 1.2 1990/12/14 08:51:02 gdsjaar -CAdded RCS Id and Log to all files -C C======================================================================= SUBROUTINE GETALV (A, NALVAR, ALIVAL, ISTEP, LENE, ISEVOK, * ALIVE, VAR) diff --git a/packages/seacas/applications/blot/getdst.f b/packages/seacas/applications/blot/getdst.f index d16c8dbe0a0a..6411daa453af 100644 --- a/packages/seacas/applications/blot/getdst.f +++ b/packages/seacas/applications/blot/getdst.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: getdst.f,v $ -C Revision 1.2 2009/03/25 12:36:44 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 20:01:37 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:51:05 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE GETDST( NODE1, NODE2, XN, YN, ZN, DIST) C======================================================================= diff --git a/packages/seacas/applications/blot/getins.f b/packages/seacas/applications/blot/getins.f index da4f08b97946..e19c3cd4a444 100644 --- a/packages/seacas/applications/blot/getins.f +++ b/packages/seacas/applications/blot/getins.f @@ -1,35 +1,35 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details c ====================================================================== c ====================================================================== c ====================================================================== c ====================================================================== -c + c ROUTINE: getins -c + c DESCRIPTION: This routine is in charge of getting user c input and keeping track of where c it is coming from. -c + c AUTHOR: John H. Glick c Sandia National Laboratories c Division 1511 -c + c DATE: December 20, 1988 -c + c TYPE OF SUBPROGRAM: subroutine -c + c USAGE: call getins (id, maxfld, nfield, c kvalue, cvalue, ivalue, rvalue, c line, iostat, prompt, c lprom, *) -c + c PARAMETERS: -c + c character*(*) id -- (input) c = 'parse' if the input line should be read c and parsed by the free field reader. If so, @@ -85,27 +85,27 @@ c integer lprom -- (input) c Length of prompt string. c * -- Alternate return in case of fatal error. -c + c CALLS: prterr (etclib), filhnd (BLOT), c lenstr (strlib), c frefld (SUPES), exname (SUPES) -c + c GLOBAL VARIABLES REFERENCED: -c + c none -c + c CALLING ROUTINE(S): comand (BLOT) -c + c SYSTEM DEPENDENCIES: none -c + c ====================================================================== c ====================================================================== -c + subroutine getins (id, maxfld, nfield, kvalue, cvalue, & ivalue, rvalue, line, iostat, prompt, lprom, *) -c + c *********************************************************************** -c + c parameters character*(*) id @@ -118,9 +118,8 @@ subroutine getins (id, maxfld, nfield, kvalue, cvalue, character*(*) prompt integer lprom -c c *********************************************************************** -c + c local declarations integer maxstk @@ -192,17 +191,16 @@ subroutine getins (id, maxfld, nfield, kvalue, cvalue, logical batch c *********************************************************************** -c + c data statements -c + data recred / maxstk*0 / data first / .TRUE. / data cmdfile(1:7) / 'CMDFILE' / -c + c *********************************************************************** c *********************************************************************** -c -c + iostat = 0 if ( id .eq. 'parse' ) then parse = .TRUE. @@ -225,9 +223,9 @@ subroutine getins (id, maxfld, nfield, kvalue, cvalue, c an instruction file was specified call exname ( 7, name( 1 ), ln ) c get name of file -c + c open file -c + if ( batch() ) then call filhnd ( 7, name(1)(:ln), .TRUE., ecode, & 'o', 'f', 's', 0, *150) @@ -263,9 +261,9 @@ subroutine getins (id, maxfld, nfield, kvalue, cvalue, first = .FALSE. endif -c + c get an instruction -c + 100 continue gotins = .FALSE. @@ -274,9 +272,9 @@ subroutine getins (id, maxfld, nfield, kvalue, cvalue, if ( nin .eq. 7 ) & recred( stkpnt ) = recred( stkpnt ) + 1 -c + c read instruction -c + if ( parse ) then call frefld ( nin, 0, prompt(:lprom), maxfld, ios, & nfield, kvalue, cval2, ivalue, rvalue ) @@ -288,16 +286,16 @@ subroutine getins (id, maxfld, nfield, kvalue, cvalue, end if 10010 format ( a ) endif -c + c check for an error in reading instruction -c + if ( ios .gt. 0 ) then c error in reading instruction call prterr ('FATAL', & 'error reading an instruction in getins') return 1 else if ( ios .lt. 0 ) then -c + c end of file read from input stream. if ( nin .ne. 0 ) then @@ -338,26 +336,24 @@ subroutine getins (id, maxfld, nfield, kvalue, cvalue, endif - else gotins = .TRUE. endif if ( .not. gotins ) go to 110 -c c if id = 'line', just return the line of input -c + if ( .not. parse ) then try = .FALSE. quit = .TRUE. else -c + c check if command specifies that instructions c are to be read from a different source -c + ln = lenstr ( cval2(1) ) if ( cval2(1)(1:ln) .eq. cmdfile(1:ln) ) then @@ -431,9 +427,9 @@ subroutine getins (id, maxfld, nfield, kvalue, cvalue, &'Nesting of instruction files is greater than maximum allowed') return 1 endif -c + c open instruction file -c + C ... We have a problem on systems with case-sensitive file names. C FREFLD converts all strings to uppercase. Therefore, the filename C specified in 'file' will be all uppercase. Since the file is @@ -492,10 +488,9 @@ subroutine getins (id, maxfld, nfield, kvalue, cvalue, endif -c c return to the top of the routine to read c another instruction, if necessary -c + if ( .not. quit ) go to 100 return diff --git a/packages/seacas/applications/blot/getssn.f b/packages/seacas/applications/blot/getssn.f index 2ed3786f5869..aa719d9c78aa 100644 --- a/packages/seacas/applications/blot/getssn.f +++ b/packages/seacas/applications/blot/getssn.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details subroutine getssn(ia, ierr) diff --git a/packages/seacas/applications/blot/getvar.f b/packages/seacas/applications/blot/getvar.f index b3879925d461..67590a397284 100644 --- a/packages/seacas/applications/blot/getvar.f +++ b/packages/seacas/applications/blot/getvar.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: getvar.f,v $ -C Revision 1.2 2009/03/25 12:36:44 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 20:01:52 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:51:15 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE GETVAR (A, IVAR, IELBLK, INSTEP, LENVAR, VAR) C======================================================================= diff --git a/packages/seacas/applications/blot/grabrt.f b/packages/seacas/applications/blot/grabrt.f index 4a65b00b1740..2c97c9380a7d 100644 --- a/packages/seacas/applications/blot/grabrt.f +++ b/packages/seacas/applications/blot/grabrt.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: grabrt.f,v $ -C Revision 1.2 2009/03/25 12:36:44 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 20:01:55 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:51:17 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= LOGICAL FUNCTION GRABRT () C======================================================================= diff --git a/packages/seacas/applications/blot/graexp.f b/packages/seacas/applications/blot/graexp.f index 44dde7d3c376..db1011f5d712 100644 --- a/packages/seacas/applications/blot/graexp.f +++ b/packages/seacas/applications/blot/graexp.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: graexp.f,v $ -C Revision 1.2 2009/03/25 12:36:44 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 20:01:58 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:51:19 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE GRAEXP (AXTYP, NNUM, RNUM, ATIC) C======================================================================= diff --git a/packages/seacas/applications/blot/grapar.f b/packages/seacas/applications/blot/grapar.f index 558913448e3a..5ec7293bb1ef 100644 --- a/packages/seacas/applications/blot/grapar.f +++ b/packages/seacas/applications/blot/grapar.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: grapar.f,v $ -C Revision 1.2 2009/03/25 12:36:44 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 20:02:01 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:51:21 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE GRAPAR (XYSAME, WVIEW, DVIEW, & WXALAB, WYALAB, WXAEND, WYAEND, WXATIC, WYATIC) diff --git a/packages/seacas/applications/blot/graxes.f b/packages/seacas/applications/blot/graxes.f index 2a469ecdd4b0..6fa18d2fd2c5 100644 --- a/packages/seacas/applications/blot/graxes.f +++ b/packages/seacas/applications/blot/graxes.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: graxes.f,v $ -C Revision 1.2 2009/03/25 12:36:44 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 20:02:03 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:51:23 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE GRAXES (XYSAME, WVIEW, DVIEW, WXATIC, WYATIC, & TXLAB, TYLAB) diff --git a/packages/seacas/applications/blot/grbox.f b/packages/seacas/applications/blot/grbox.f index d84330dd945c..44e2182f2827 100644 --- a/packages/seacas/applications/blot/grbox.f +++ b/packages/seacas/applications/blot/grbox.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: grbox.f,v $ -C Revision 1.2 2009/03/25 12:36:44 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 20:02:06 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:51:26 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE GRBOX (LINSOL, XMIN, XMAX, YMIN, YMAX) C======================================================================= diff --git a/packages/seacas/applications/blot/grcaln.f b/packages/seacas/applications/blot/grcaln.f index f8f2e04c4c1a..f89015a3b2f2 100644 --- a/packages/seacas/applications/blot/grcaln.f +++ b/packages/seacas/applications/blot/grcaln.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: grcaln.f,v $ -C Revision 1.2 2009/03/25 12:36:44 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 20:02:09 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:51:28 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE GRCALN (STRING, LSTR) C======================================================================= diff --git a/packages/seacas/applications/blot/grcol.blk b/packages/seacas/applications/blot/grcol.blk index ffaaf3b49c0b..38b0dc694972 100644 --- a/packages/seacas/applications/blot/grcol.blk +++ b/packages/seacas/applications/blot/grcol.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /GRCOL/ LSTMAP, LSTDEV, LSTCOL, IBLACK, IWHITE diff --git a/packages/seacas/applications/blot/grcolr.f b/packages/seacas/applications/blot/grcolr.f index e1cfd4e72464..896c5b525f9a 100644 --- a/packages/seacas/applications/blot/grcolr.f +++ b/packages/seacas/applications/blot/grcolr.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/grcolt.f b/packages/seacas/applications/blot/grcolt.f index 6dfc0c4b89da..bb2b9061507a 100644 --- a/packages/seacas/applications/blot/grcolt.f +++ b/packages/seacas/applications/blot/grcolt.f @@ -1,58 +1,10 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C---5---10---15---20---25---30---35---40---45---50---55---60---65---70-- -C $Log: grcolt.f,v $ -C Revision 1.4 2009/03/25 12:36:44 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.3 1998/07/07 14:07:30 gdsjaar -C Added variable to SAVE -C -C Modified to pass in a variable instead of a computed value since the -C argument is changed in the routine. -C -C Initialize variable -C -C Revision 1.2 1998/06/12 15:53:12 gdsjaar -C 1. Problem with TIMES array. Blot accesses a dummy timestep even if -C there were no timesteps on the database. Array wasn't allocated, so -C writing off into never-never land. -C -C 2. Inconsistency among some common blocks. Some places weren't using -C the include but had the definition hardwired in. Removed those. -C -C 3. Added 'EXTERNAL BLKDAT' to all routines that used data values set -C in BLKDAT -C -C 4. Cleanup of some A vs. IA argument passing. -C -C Revision 1.1 1994/04/07 20:02:13 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.6 1993/08/24 16:45:35 gdsjaar -c Added entries to common block for additional user-specified colormap -c selection -c -c Revision 1.5 1993/08/16 21:23:05 gdsjaar -c Added inverse color map to default map, added other color map files to -c Imakefile, upped version number. -c -c Revision 1.4 1993/08/16 19:42:41 gdsjaar -c Added new spectrum options: gray, rainbow, hot, terrain, zebra -c -c Revision 1.3 1993/03/01 16:57:21 gdsjaar -c jwswegl - added rainbow spectrum (closer to visible spectrum) specify -c with RAINBOW ncol. Added CGLOBAL to toggle between global and local -c contour labelling. -c -c Revision 1.2 1990/12/14 08:51:31 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE GRCOLT C======================================================================= @@ -204,51 +156,51 @@ SUBROUTINE GRCOLT C Define colors 32-56 to be a linear variation from red to orange C Red = 255,0,0 (R,G,B) C Orange = 255,168,0 (R,G,B) -C + XIPCOL=168.0/24.0 DO 50 I=32,56 RRED(I)=1. RGREEN(I)=(I-32)*XIPCOL/255. RBLUE(I)=0. 50 CONTINUE -C + C Define colors 57-106 to be a linear variation from orange to yello C Orange = 255,168,0 (R,G,B) C Yellow = 255,255,0 (R,G,B) -C + XIPCOL=87.0/50.0 DO 60 I=57,106 RRED(I)=1. RGREEN(I)=(168.0+(I-56)*XIPCOL)/255. RBLUE(I)=0. 60 CONTINUE -C + C Define colors 107-166 to be a linear variation from yellow to gree C Yellow = 255,255,0 (R,G,B) C Green = 0,255,0 (R,G,B) -C + XIPCOL=255.0/60.0 DO 70 I=107,166 RRED(I)=(255.0-(I-106)*XIPCOL)/255. RGREEN(I)=1. RBLUE(I)=0. 70 CONTINUE -C + C Define colors 167-210 to be a linear variation from green to blue C Green = 0,255,0 (R,G,B) C Blue = 0,0,255 (R,G,B) -C + XIPCOL=255.0/44.0 DO 80 I=167,210 RRED(I)=0. RGREEN(I)=(255.0-(I-166)*XIPCOL)/255. RBLUE(I)=(I-166)*XIPCOL/255. 80 CONTINUE -C + C Define colors 211-255 to be a linear variation from blue to violet C Blue = 0,0,255 (R,G,B) C Purple = 180,0,180 (R,G,B) -C + XICOLB = 75.0/45.0 XICOLR = 180.0/45.0 DO 90 I=211,255 @@ -259,7 +211,6 @@ SUBROUTINE GRCOLT ENDIF - IF (NUMCOL(1,ICURDV) .EQ. 1) THEN CALL PLTCOL (8+0, 0.7059, 0.0, 0.7059) diff --git a/packages/seacas/applications/blot/grcolu.f b/packages/seacas/applications/blot/grcolu.f index a3bcc6be4d68..2ea1f5954991 100644 --- a/packages/seacas/applications/blot/grcolu.f +++ b/packages/seacas/applications/blot/grcolu.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: grcolu.f,v $ -C Revision 1.2 2009/03/25 12:36:44 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 20:02:16 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:51:33 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE GRCOLU (MAP) C======================================================================= diff --git a/packages/seacas/applications/blot/grexit.f b/packages/seacas/applications/blot/grexit.f index a7fd59c2bd65..120cb1b419a9 100644 --- a/packages/seacas/applications/blot/grexit.f +++ b/packages/seacas/applications/blot/grexit.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: grexit.f,v $ -C Revision 1.2 2009/03/25 12:36:44 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 20:02:18 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:51:35 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE GREXIT C======================================================================= diff --git a/packages/seacas/applications/blot/grfneu.f b/packages/seacas/applications/blot/grfneu.f index 8b8e3c3f5674..795b5270e837 100644 --- a/packages/seacas/applications/blot/grfneu.f +++ b/packages/seacas/applications/blot/grfneu.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/grfont.f b/packages/seacas/applications/blot/grfont.f index ad69e79b5956..5440c05aa352 100644 --- a/packages/seacas/applications/blot/grfont.f +++ b/packages/seacas/applications/blot/grfont.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: grfont.f,v $ -C Revision 1.2 2009/03/25 12:36:44 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 20:02:23 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:51:37 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE GRFONT (IFNT) C======================================================================= diff --git a/packages/seacas/applications/blot/grgpar.f b/packages/seacas/applications/blot/grgpar.f index 40a90ddb4eb5..96eaced6a1e4 100644 --- a/packages/seacas/applications/blot/grgpar.f +++ b/packages/seacas/applications/blot/grgpar.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: grgpar.f,v $ -C Revision 1.2 2009/03/25 12:36:44 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 20:02:26 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:51:39 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE GRGPAR (PARTYP, INDEV, IPARMS, IPSTR) C======================================================================= diff --git a/packages/seacas/applications/blot/grgpard.f b/packages/seacas/applications/blot/grgpard.f index ed295f216ced..2f1617d38ed6 100644 --- a/packages/seacas/applications/blot/grgpard.f +++ b/packages/seacas/applications/blot/grgpard.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= @@ -9,7 +9,7 @@ SUBROUTINE GRGPARD (PARTYP, INDEV, IPARMS, IPSTR) C======================================================================= C .. Same as GRGPAR, but only handles 'DEVICE' and 'SOFTCHAR'for PARTYP C .. this is to avoid issues with passing logical or integer for `iparms` - + COMMON /GRPCOC/ DEVNAM(2), DEVCOD(2) CHARACTER*3 DEVNAM CHARACTER*8 DEVCOD diff --git a/packages/seacas/applications/blot/grikey.f b/packages/seacas/applications/blot/grikey.f index 1fa150cf2ad2..653c324a1b1c 100644 --- a/packages/seacas/applications/blot/grikey.f +++ b/packages/seacas/applications/blot/grikey.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: grikey.f,v $ -C Revision 1.2 2009/03/25 12:36:44 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 20:02:28 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:51:41 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE GRIKEY (PROMPT, DX, DY, KEY, *) C======================================================================= diff --git a/packages/seacas/applications/blot/grinit.f b/packages/seacas/applications/blot/grinit.f index da24be5c70b5..0a20cd993aa2 100644 --- a/packages/seacas/applications/blot/grinit.f +++ b/packages/seacas/applications/blot/grinit.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/grlwid.f b/packages/seacas/applications/blot/grlwid.f index fb6fc00de9f5..df35d5b1770d 100644 --- a/packages/seacas/applications/blot/grlwid.f +++ b/packages/seacas/applications/blot/grlwid.f @@ -1,28 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: grlwid.f,v $ -C Revision 1.3 2009/03/25 12:36:44 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.2 1998/07/07 14:07:31 gdsjaar -C Added variable to SAVE -C -C Modified to pass in a variable instead of a computed value since the -C argument is changed in the routine. -C -C Initialize variable -C -C Revision 1.1 1994/04/07 20:02:33 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:51:45 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE GRLWID C======================================================================= diff --git a/packages/seacas/applications/blot/grncrv.f b/packages/seacas/applications/blot/grncrv.f index 944442608399..d0b0542c523c 100644 --- a/packages/seacas/applications/blot/grncrv.f +++ b/packages/seacas/applications/blot/grncrv.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: grncrv.f,v $ -C Revision 1.2 2009/03/25 12:36:44 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 20:02:36 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:51:47 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE GRNCRV (LABSID, ICURVE, NPTS, XPTS, YPTS, DRAWLN) C======================================================================= diff --git a/packages/seacas/applications/blot/grpbeg.f b/packages/seacas/applications/blot/grpbeg.f index f399220d51cd..d6521b395193 100644 --- a/packages/seacas/applications/blot/grpbeg.f +++ b/packages/seacas/applications/blot/grpbeg.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: grpbeg.f,v $ -C Revision 1.2 2009/03/25 12:36:44 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 20:02:39 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:51:48 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE GRPBEG C======================================================================= diff --git a/packages/seacas/applications/blot/grpcom.blk b/packages/seacas/applications/blot/grpcom.blk index 282f6c16a6a7..f8a2dd28cdfe 100644 --- a/packages/seacas/applications/blot/grpcom.blk +++ b/packages/seacas/applications/blot/grpcom.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /GRPCOC/ DEVNAM(2), DEVCOD(2) diff --git a/packages/seacas/applications/blot/grpend.f b/packages/seacas/applications/blot/grpend.f index 107a5a8c0d66..bd5578d89eb4 100644 --- a/packages/seacas/applications/blot/grpend.f +++ b/packages/seacas/applications/blot/grpend.f @@ -1,27 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: grpend.f,v $ -C Revision 1.3 2009/03/25 12:36:44 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.2 1997/09/10 13:48:41 gdsjaar -C Modified the prompting after completion of the plot. (The 'Enter "Q" -C to Quit, "T" for Text, ....). The 'Q' prompt now only occurs if there -C are multiple plots in the plot set. The 'T' prompt only occurs if -C there is a hardcopy device or if there are multiple plots in the plot -C set. -C -C Revision 1.1 1994/04/07 20:02:41 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -CRevision 1.2 1990/12/14 08:51:50 gdsjaar -CAdded RCS Id and Log to all files -C C======================================================================= SUBROUTINE GRPEND (MAYQUI, MAYTXT, NDONE, NTOTAL, GOBCK, *, *) C======================================================================= diff --git a/packages/seacas/applications/blot/grsdev.f b/packages/seacas/applications/blot/grsdev.f index ed179a62b6fc..c8033d11b4d1 100644 --- a/packages/seacas/applications/blot/grsdev.f +++ b/packages/seacas/applications/blot/grsdev.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: grsdev.f,v $ -C Revision 1.2 2009/03/25 12:36:44 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 20:02:44 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:51:52 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE GRSDEV (INDEV) C======================================================================= diff --git a/packages/seacas/applications/blot/grsnap.f b/packages/seacas/applications/blot/grsnap.f index 18d7b8aaa883..65612b828012 100644 --- a/packages/seacas/applications/blot/grsnap.f +++ b/packages/seacas/applications/blot/grsnap.f @@ -1,33 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: grsnap.f,v $ -C Revision 1.3 2009/03/25 12:36:44 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.2 1998/06/12 15:53:15 gdsjaar -C 1. Problem with TIMES array. Blot accesses a dummy timestep even if -C there were no timesteps on the database. Array wasn't allocated, so -C writing off into never-never land. -C -C 2. Inconsistency among some common blocks. Some places weren't using -C the include but had the definition hardwired in. Removed those. -C -C 3. Added 'EXTERNAL BLKDAT' to all routines that used data values set -C in BLKDAT -C -C 4. Cleanup of some A vs. IA argument passing. -C -C Revision 1.1 1994/04/07 20:02:46 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -CRevision 1.2 1990/12/14 08:51:54 gdsjaar -CAdded RCS Id and Log to all files -C C======================================================================= SUBROUTINE GRSNAP (CMD, INDEV) C======================================================================= diff --git a/packages/seacas/applications/blot/grspar.f b/packages/seacas/applications/blot/grspar.f index 9fa0dde6f36b..9e66fea22dea 100644 --- a/packages/seacas/applications/blot/grspar.f +++ b/packages/seacas/applications/blot/grspar.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: grspar.f,v $ -C Revision 1.2 2009/03/25 12:36:44 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 20:02:48 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:51:57 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE GRSPAR (PARTYP, INDEV, IPARM, ERRMSG) C======================================================================= diff --git a/packages/seacas/applications/blot/grsymb.f b/packages/seacas/applications/blot/grsymb.f index 01726c35c7e7..b9991fea183a 100644 --- a/packages/seacas/applications/blot/grsymb.f +++ b/packages/seacas/applications/blot/grsymb.f @@ -1,28 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: grsymb.f,v $ -C Revision 1.3 2009/03/25 12:36:45 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.2 2005/07/27 19:29:34 gdsjaar -C On the 64-bit compile using the portland compiler on reddish; the -C construct "call function(float(intarg))" was passing an invalid value; -C probably due to a 32-bit vs 64-bit confusion. -C -C I changed it to "call function(1.0*intarg)" which performs an implicit -C conversion to real which I guess uses the correct 32-bit vs 64-bit. -C -C Revision 1.1 1994/04/07 20:02:51 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:51:59 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE GRSYMB (LINTYP, ISYTYP, INDX) C======================================================================= diff --git a/packages/seacas/applications/blot/grtexc.f b/packages/seacas/applications/blot/grtexc.f index 10eed3a1b160..4ad498d98c7e 100644 --- a/packages/seacas/applications/blot/grtexc.f +++ b/packages/seacas/applications/blot/grtexc.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: grtexc.f,v $ -C Revision 1.2 2009/03/25 12:36:45 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 20:02:53 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:52:01 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE GRTEXC (DX, DY, STRING) C======================================================================= diff --git a/packages/seacas/applications/blot/grtext.f b/packages/seacas/applications/blot/grtext.f index f8bf179fcda8..611ca5a0a7f3 100644 --- a/packages/seacas/applications/blot/grtext.f +++ b/packages/seacas/applications/blot/grtext.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: grtext.f,v $ -C Revision 1.2 2009/03/25 12:36:45 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 20:02:56 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:52:03 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE GRTEXT (DX, DY, STRING) C======================================================================= diff --git a/packages/seacas/applications/blot/grview.f b/packages/seacas/applications/blot/grview.f index 658a227271b7..3749d9f4b290 100644 --- a/packages/seacas/applications/blot/grview.f +++ b/packages/seacas/applications/blot/grview.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: grview.f,v $ -C Revision 1.2 2009/03/25 12:36:45 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 20:02:58 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:52:05 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE GRVIEW (ASPECT, DVIEW0, DVIEW) C======================================================================= diff --git a/packages/seacas/applications/blot/grycen.f b/packages/seacas/applications/blot/grycen.f index b6b285b43b72..5d40dfa11518 100644 --- a/packages/seacas/applications/blot/grycen.f +++ b/packages/seacas/applications/blot/grycen.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: grycen.f,v $ -C Revision 1.2 2009/03/25 12:36:45 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 20:03:00 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:52:07 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE GRYCEN (CHLSIZ, TOPLIN, BOTLIN, NUMLIN, NUMOVR) C======================================================================= diff --git a/packages/seacas/applications/blot/gtmvar.f b/packages/seacas/applications/blot/gtmvar.f index 13260e700c30..76dfbc459853 100644 --- a/packages/seacas/applications/blot/gtmvar.f +++ b/packages/seacas/applications/blot/gtmvar.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/hidcor.f b/packages/seacas/applications/blot/hidcor.f index b191fdcd8d0c..2d11c74bd24c 100644 --- a/packages/seacas/applications/blot/hidcor.f +++ b/packages/seacas/applications/blot/hidcor.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/hidden.F b/packages/seacas/applications/blot/hidden.F index 6049b7a5d4b1..aa715364519a 100644 --- a/packages/seacas/applications/blot/hidden.F +++ b/packages/seacas/applications/blot/hidden.F @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= @@ -275,7 +275,6 @@ SUBROUTINE HIDDEN (A, IHIDOP, LENF, NLNKE, NLNKF, LINKF, CALL MDDEL ('NPX') CALL MDDEL ('NPY') -C#???? CALL MDLONG ('NPCR', KNPCR, LNPCR) CALL MDSTAT (NERR, MEM) IF (NERR .GT. 0) GOTO 360 diff --git a/packages/seacas/applications/blot/hidedg.f b/packages/seacas/applications/blot/hidedg.f index 2c8605fb422e..0e3a34d22c0a 100644 --- a/packages/seacas/applications/blot/hidedg.f +++ b/packages/seacas/applications/blot/hidedg.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/hidixf.f b/packages/seacas/applications/blot/hidixf.f index 72eca46689b6..7bf12ef3ce95 100644 --- a/packages/seacas/applications/blot/hidixf.f +++ b/packages/seacas/applications/blot/hidixf.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/hidmid.f b/packages/seacas/applications/blot/hidmid.f index 408c328f7282..d22c9457d469 100644 --- a/packages/seacas/applications/blot/hidmid.f +++ b/packages/seacas/applications/blot/hidmid.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= @@ -171,20 +171,11 @@ SUBROUTINE HIDMID (NLNKF, LINKF1, XN, YN, ZN, LINSET, END IF C --Check if the node's Z is behind the face's Z at that point - -C#????d z0c = xnorm(iside)*(x0-xcen) + ynorm(iside)*(y0-ycen) !#VAX -C#????d & + znorm(iside)*(zp(ip)-zcen) !#VAX -C#????d write (99, 9001, iostat=idum) inp, LINKF1, !#VAX -C#????d & a12, a23, a34, a41, eps, z0c, (z0c.ge.-eps) !#VAX -C#????d9001 format (5i5, 5f8.4, 1x, f8.4, (2x, l1)) !#VAX - IF ((XNORM(ISIDE)*(X0-XCEN) + YNORM(ISIDE)*(Y0-YCEN) & + ZNORM(ISIDE)*(ZP(IP)-ZCEN)) .GE. -EPS) GOTO 120 END IF C --Hide the entire line (as is), and move the line to hidden section - -C#????d write (99, *) 'invisible line', (linset(i,ipset(ip)), i=1,3) !#VAX I = IPSET(IP) IPSET(IP) = IPSET(NPART) IPSET(NPART) = I diff --git a/packages/seacas/applications/blot/hidnod.f b/packages/seacas/applications/blot/hidnod.f index c15538caf228..2f4bb97d773e 100644 --- a/packages/seacas/applications/blot/hidnod.f +++ b/packages/seacas/applications/blot/hidnod.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/hidpar.f b/packages/seacas/applications/blot/hidpar.f index 00d0f5412468..99e8df9942b0 100644 --- a/packages/seacas/applications/blot/hidpar.f +++ b/packages/seacas/applications/blot/hidpar.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= @@ -274,7 +274,6 @@ SUBROUTINE HIDPAR (LINSET, IPSET, NPART, IEDSET, NEDGES, if ((cdebug .eq. 'HIDDEN') .and. (idebug .ge. 1)) & write (*, '(1x,a,i5)') 'invisible lines =', NNPART-npart - C --Delete the edges which are totally hidden lines nhid = 0 diff --git a/packages/seacas/applications/blot/hidset.f b/packages/seacas/applications/blot/hidset.f index aac0b3b201bd..4424178d929e 100644 --- a/packages/seacas/applications/blot/hidset.f +++ b/packages/seacas/applications/blot/hidset.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/hidzm.f b/packages/seacas/applications/blot/hidzm.f index 34139f1a8c68..5979f6ff92a3 100644 --- a/packages/seacas/applications/blot/hidzm.f +++ b/packages/seacas/applications/blot/hidzm.f @@ -1,29 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: hidzm.f,v $ -C Revision 1.3 2009/03/25 12:36:45 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.2 2009/01/22 21:34:21 gdsjaar -C There were several inline dbnums common blocks. Replaced with the -C include so they all have the same size with the added variable types. -C -C Added minor support for nodeset and sideset variables. -C -C It can print the count and the names, but that is all -C at this time. -C -C Revision 1.1 1994/04/07 20:03:26 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:52:27 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE HIDZM (ZOOM, XZMMIN, XZMMAX, YZMMIN, YZMMAX, & XINMIN, XINMAX, YINMIN, YINMAX, LENF, NLNKF, LINKF, diff --git a/packages/seacas/applications/blot/icexct.blk b/packages/seacas/applications/blot/icexct.blk index e766c91228a3..7fee1b5f41f7 100644 --- a/packages/seacas/applications/blot/icexct.blk +++ b/packages/seacas/applications/blot/icexct.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /ICEXCT/ IEXCON diff --git a/packages/seacas/applications/blot/icrnbw.blk b/packages/seacas/applications/blot/icrnbw.blk index 40806fd5e9d2..e596b537ca7f 100644 --- a/packages/seacas/applications/blot/icrnbw.blk +++ b/packages/seacas/applications/blot/icrnbw.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C Flag for rainbow spectrum diff --git a/packages/seacas/applications/blot/idedge.f b/packages/seacas/applications/blot/idedge.f index 7152de5fe18d..e0720a26dbee 100644 --- a/packages/seacas/applications/blot/idedge.f +++ b/packages/seacas/applications/blot/idedge.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= @@ -73,7 +73,6 @@ SUBROUTINE IDEDGE (IEDSET, NEDGES, HIDENP, LINSET, LENL, IXLIN, LREF(LINSET(2,IL)) = IX END DO - DO 130 IEDG = 1, NEDGES IF (IEDSET(0,IEDG) .EQ. 0) GOTO 130 diff --git a/packages/seacas/applications/blot/ininpf.f b/packages/seacas/applications/blot/ininpf.f index 801fbe153af5..361b25fdf280 100644 --- a/packages/seacas/applications/blot/ininpf.f +++ b/packages/seacas/applications/blot/ininpf.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/initim.f b/packages/seacas/applications/blot/initim.f index dfa44cb9c0a8..2bc7884c36c2 100644 --- a/packages/seacas/applications/blot/initim.f +++ b/packages/seacas/applications/blot/initim.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: initim.f,v $ -C Revision 1.2 2009/03/25 12:36:45 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 20:03:44 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:52:35 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE INITIM (MAXTIM, WHONLY, NSTEPS, TIMES, WHOTIM, & TMIN, TMAX, DELT, NINTV, NPTIMS, IPTIMS) diff --git a/packages/seacas/applications/blot/inpcr.f b/packages/seacas/applications/blot/inpcr.f index bc6a1a6c2c9d..c2ca70418f87 100644 --- a/packages/seacas/applications/blot/inpcr.f +++ b/packages/seacas/applications/blot/inpcr.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: inpcr.f,v $ -C Revision 1.2 2009/03/25 12:36:45 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 20:03:48 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:52:39 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE INPCR (NUMNPF, HIDENP, XN, YN, ZN, & COLMIN, ROWMIN, CRDELT, NUMCOL, NUMROW, diff --git a/packages/seacas/applications/blot/inpick.f b/packages/seacas/applications/blot/inpick.f index 6c26fe08bf17..6b8592f2d8fc 100644 --- a/packages/seacas/applications/blot/inpick.f +++ b/packages/seacas/applications/blot/inpick.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/instr.f b/packages/seacas/applications/blot/instr.f index 61684132ff1e..790635a07354 100644 --- a/packages/seacas/applications/blot/instr.f +++ b/packages/seacas/applications/blot/instr.f @@ -1,64 +1,52 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: instr.f,v $ -C Revision 1.2 2009/03/25 12:36:45 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 20:03:53 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:52:43 gdsjaar -c Added RCS Id and Log to all files -c c ====================================================================== c ====================================================================== c ====================================================================== c ====================================================================== -c + c ROUTINE: instr -c + c DESCRIPTION: Returns .TRUE. if a command file was specified c on the BLOT command line, indicating c that instructions are to be read from that file. c Returns .FALSE. if no file was specified on the c BLOT command line, indicating c that instructions are to be read interactively. -c + c AUTHOR: John H. Glick c Sandia National Laboratories c Division 1511 -c + c DATE: December 20, 1988 -c + c TYPE OF SUBPROGRAM: logical function -c + c USAGE: instr() -c + c PARAMETERS: none -c + c CALLS: exname ( SUPES ) -c + c GLOBAL VARIABLES REFERENCED: none -c + c CALLING ROUTINE(S): getins (BLOT) -c + c SYSTEM DEPENDENCIES: none -c + c ====================================================================== c ====================================================================== -c + logical function instr() -c c ********************************************************************** -c + c declarations -c + integer symnum c the number of the system command symbol defining if a c command file was specified. @@ -73,26 +61,23 @@ logical function instr() c = "NO" otherwise. integer ln c length of the string stored in name -c + c ********************************************************************** -c + c data statements -c + data symnum / 4 / c ********************************************************************** c ********************************************************************** -c -c c get symbol from operating system -c + call exname ( -symnum, name, ln ) -c c print symbol for debugging purposes -c + c print *, 'name = ',name,' ln = ',ln -c + if ( name(1:ln) .eq. 'YES' ) then instr = .TRUE. else diff --git a/packages/seacas/applications/blot/interp.f b/packages/seacas/applications/blot/interp.f index e564c7b108e9..5a7cc61fb532 100644 --- a/packages/seacas/applications/blot/interp.f +++ b/packages/seacas/applications/blot/interp.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: interp.f,v $ -C Revision 1.2 2009/03/25 12:36:45 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 20:03:56 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:52:45 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= LOGICAL FUNCTION INTERP_BL (CNTR, F1, F2, PSI) C======================================================================= diff --git a/packages/seacas/applications/blot/ixvw.f b/packages/seacas/applications/blot/ixvw.f index 9e39ebe60200..92868df88588 100644 --- a/packages/seacas/applications/blot/ixvw.f +++ b/packages/seacas/applications/blot/ixvw.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/layoud.blk b/packages/seacas/applications/blot/layoud.blk index e3fc0c21b40d..15c084d44612 100644 --- a/packages/seacas/applications/blot/layoud.blk +++ b/packages/seacas/applications/blot/layoud.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /LAYOUD/ DVIEW(KTOP,4), WVIEW(KTOP,4) diff --git a/packages/seacas/applications/blot/layout.blk b/packages/seacas/applications/blot/layout.blk index ba184ba6ec3e..601cf8d2937a 100644 --- a/packages/seacas/applications/blot/layout.blk +++ b/packages/seacas/applications/blot/layout.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /LAYOUT/ CHLSIZ, DBORD0(KTOP), DVIEW0(KTOP) diff --git a/packages/seacas/applications/blot/legopc.blk b/packages/seacas/applications/blot/legopc.blk index ef1258149ff5..cddf95219ba6 100644 --- a/packages/seacas/applications/blot/legopc.blk +++ b/packages/seacas/applications/blot/legopc.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /LEGOPC/ CAPTN(3,2) diff --git a/packages/seacas/applications/blot/legopt.blk b/packages/seacas/applications/blot/legopt.blk index 1afcd017c596..e78aa259ecd8 100644 --- a/packages/seacas/applications/blot/legopt.blk +++ b/packages/seacas/applications/blot/legopt.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /LEGOPT/ DOQA(2), DOLEG(2), DOAXIS(2), DOBOX diff --git a/packages/seacas/applications/blot/light.blk b/packages/seacas/applications/blot/light.blk index a8d86c1a4d5a..540af482b1de 100644 --- a/packages/seacas/applications/blot/light.blk +++ b/packages/seacas/applications/blot/light.blk @@ -1,14 +1,14 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details PARAMETER (MAXLIT=10) COMMON /LIGHT/ LITE, NLIT, AMBIENT REAL LITE(8,MAXLIT) REAL AMBIENT -C + C ... LITE(1:3,*) = x, y, z vector components of light C LITE(4, *) = brightness of light C LITE(5:7,*) = normalized x, y, z vector components of light diff --git a/packages/seacas/applications/blot/linthc.blk b/packages/seacas/applications/blot/linthc.blk index 45683379f485..0e53deb870dd 100644 --- a/packages/seacas/applications/blot/linthc.blk +++ b/packages/seacas/applications/blot/linthc.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /LINTHC/ MSHBND, BLKBND, ELEBND, THKNSS diff --git a/packages/seacas/applications/blot/linthk.f b/packages/seacas/applications/blot/linthk.f index 1feda2816fd8..97ea08d9ee0a 100644 --- a/packages/seacas/applications/blot/linthk.f +++ b/packages/seacas/applications/blot/linthk.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: linthk.f,v $ -C Revision 1.2 2009/03/25 12:36:45 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 20:04:14 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:52:52 gdsjaar -c Added RCS Id and Log to all files -c C============================================================================ SUBROUTINE LINTHK (INLINE, IFLD, INTYP, IFIELD, RFIELD, CFIELD, & RESET) @@ -96,7 +85,7 @@ SUBROUTINE LINTHK (INLINE, IFLD, INTYP, IFIELD, RFIELD, CFIELD, & 'Rest of command not processed.') GO TO 120 ELSE -C + C Check for existence of another field IF (FFEXST (IFLD, INTYP)) THEN IF (INTYP(IFLD) .GE. 1) THEN diff --git a/packages/seacas/applications/blot/lnchk.f b/packages/seacas/applications/blot/lnchk.f index a8059e0cd51d..9aaa764880f4 100644 --- a/packages/seacas/applications/blot/lnchk.f +++ b/packages/seacas/applications/blot/lnchk.f @@ -1,29 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: lnchk.f,v $ -C Revision 1.3 2009/03/25 12:36:45 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.2 2009/01/22 21:34:21 gdsjaar -C There were several inline dbnums common blocks. Replaced with the -C include so they all have the same size with the added variable types. -C -C Added minor support for nodeset and sideset variables. -C -C It can print the count and the names, but that is all -C at this time. -C -C Revision 1.1 1994/04/07 20:04:16 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:52:54 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE LNCHK (PRTOK, OKAY) C======================================================================= diff --git a/packages/seacas/applications/blot/lncomd.f b/packages/seacas/applications/blot/lncomd.f index 980f58efe0a3..9dde5a12b198 100644 --- a/packages/seacas/applications/blot/lncomd.f +++ b/packages/seacas/applications/blot/lncomd.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/lnlab.f b/packages/seacas/applications/blot/lnlab.f index 45e6e3597356..7ae0673f6482 100644 --- a/packages/seacas/applications/blot/lnlab.f +++ b/packages/seacas/applications/blot/lnlab.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/lnmain.f b/packages/seacas/applications/blot/lnmain.f index 55e926e346e6..9223ee1aae66 100644 --- a/packages/seacas/applications/blot/lnmain.f +++ b/packages/seacas/applications/blot/lnmain.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/lnplot.f b/packages/seacas/applications/blot/lnplot.f index d3d408a1f1a8..f5e253a45c00 100644 --- a/packages/seacas/applications/blot/lnplot.f +++ b/packages/seacas/applications/blot/lnplot.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/lnread.f b/packages/seacas/applications/blot/lnread.f index a643bf6a2b75..c25552c10e51 100644 --- a/packages/seacas/applications/blot/lnread.f +++ b/packages/seacas/applications/blot/lnread.f @@ -1,36 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: lnread.f,v $ -C Revision 1.4 2009/03/25 12:36:45 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.3 1998/06/12 15:53:24 gdsjaar -C 1. Problem with TIMES array. Blot accesses a dummy timestep even if -C there were no timesteps on the database. Array wasn't allocated, so -C writing off into never-never land. -C -C 2. Inconsistency among some common blocks. Some places weren't using -C the include but had the definition hardwired in. Removed those. -C -C 3. Added 'EXTERNAL BLKDAT' to all routines that used data values set -C in BLKDAT -C -C 4. Cleanup of some A vs. IA argument passing. -C -C Revision 1.2 1994/04/08 13:25:56 gdsjaar -C Removed hash mark from comments. -C -c Revision 1.1 1994/04/07 20:04:30 gdsjaar -c Initial checkin of ACCESS/graphics/blotII2 -c -c Revision 1.2 1990/12/14 08:53:06 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE LNREAD (A, NPTIMS, NPTIMW, IPTIMS, TIMES, WHOTIM, & XLN, YLN, ZLN) diff --git a/packages/seacas/applications/blot/lnshow.f b/packages/seacas/applications/blot/lnshow.f index 536d1eb50fcb..ece3b5dc7582 100644 --- a/packages/seacas/applications/blot/lnshow.f +++ b/packages/seacas/applications/blot/lnshow.f @@ -1,33 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: lnshow.f,v $ -C Revision 1.3 2009/03/25 12:36:45 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.2 1998/06/12 15:53:25 gdsjaar -C 1. Problem with TIMES array. Blot accesses a dummy timestep even if -C there were no timesteps on the database. Array wasn't allocated, so -C writing off into never-never land. -C -C 2. Inconsistency among some common blocks. Some places weren't using -C the include but had the definition hardwired in. Removed those. -C -C 3. Added 'EXTERNAL BLKDAT' to all routines that used data values set -C in BLKDAT -C -C 4. Cleanup of some A vs. IA argument passing. -C -C Revision 1.1 1994/04/07 20:04:33 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:53:07 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE LNSHOW (SHOTYP, NAMES) C======================================================================= diff --git a/packages/seacas/applications/blot/lnstor.f b/packages/seacas/applications/blot/lnstor.f index 660bd1b8b4fe..7a0c005c5761 100644 --- a/packages/seacas/applications/blot/lnstor.f +++ b/packages/seacas/applications/blot/lnstor.f @@ -1,33 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: lnstor.f,v $ -C Revision 1.3 2009/03/25 12:36:45 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.2 1998/06/12 15:53:27 gdsjaar -C 1. Problem with TIMES array. Blot accesses a dummy timestep even if -C there were no timesteps on the database. Array wasn't allocated, so -C writing off into never-never land. -C -C 2. Inconsistency among some common blocks. Some places weren't using -C the include but had the definition hardwired in. Removed those. -C -C 3. Added 'EXTERNAL BLKDAT' to all routines that used data values set -C in BLKDAT -C -C 4. Cleanup of some A vs. IA argument passing. -C -C Revision 1.1 1994/04/07 20:04:35 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:53:09 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE LNSTOR (A, ISTEP, TYP, NWRDS, NVAR, NPT, NPTS, & XLN, YLN, ZLN, DATA) diff --git a/packages/seacas/applications/blot/lnvars.blk b/packages/seacas/applications/blot/lnvars.blk index f58c0c5bbe98..5ed753d6c58b 100644 --- a/packages/seacas/applications/blot/lnvars.blk +++ b/packages/seacas/applications/blot/lnvars.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details PARAMETER (MXLCRV = 50) diff --git a/packages/seacas/applications/blot/locrl.f b/packages/seacas/applications/blot/locrl.f index 602fe7b0a97f..6089da37aa80 100644 --- a/packages/seacas/applications/blot/locrl.f +++ b/packages/seacas/applications/blot/locrl.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/mainvw.f b/packages/seacas/applications/blot/mainvw.f index 008b94b1ece7..26345a9efe44 100644 --- a/packages/seacas/applications/blot/mainvw.f +++ b/packages/seacas/applications/blot/mainvw.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/makd2b.f b/packages/seacas/applications/blot/makd2b.f index 43d904885d5a..aab30b1f5837 100644 --- a/packages/seacas/applications/blot/makd2b.f +++ b/packages/seacas/applications/blot/makd2b.f @@ -1,29 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: makd2b.f,v $ -C Revision 1.3 2009/03/25 12:36:45 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.2 2009/01/22 21:34:21 gdsjaar -C There were several inline dbnums common blocks. Replaced with the -C include so they all have the same size with the added variable types. -C -C Added minor support for nodeset and sideset variables. -C -C It can print the count and the names, but that is all -C at this time. -C -C Revision 1.1 1994/04/07 20:04:46 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:53:15 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE MAKD2B (LENF, NLNKF, LINKF, IELBST, & IF2EL, IF2EL2, IE2ELB, IDN2B) diff --git a/packages/seacas/applications/blot/make2b.f b/packages/seacas/applications/blot/make2b.f index 3944c65d6ea8..fbbf39186b10 100644 --- a/packages/seacas/applications/blot/make2b.f +++ b/packages/seacas/applications/blot/make2b.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: make2b.f,v $ -C Revision 1.2 2009/03/25 12:36:45 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 20:04:48 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:53:17 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE MAKE2B (NELBLK, LENE, IE2ELB) C======================================================================= diff --git a/packages/seacas/applications/blot/makn2b.f b/packages/seacas/applications/blot/makn2b.f index c8fd16ea693c..349b2fe541cb 100644 --- a/packages/seacas/applications/blot/makn2b.f +++ b/packages/seacas/applications/blot/makn2b.f @@ -1,29 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: makn2b.f,v $ -C Revision 1.3 2009/03/25 12:36:45 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.2 2009/01/22 21:34:21 gdsjaar -C There were several inline dbnums common blocks. Replaced with the -C include so they all have the same size with the added variable types. -C -C Added minor support for nodeset and sideset variables. -C -C It can print the count and the names, but that is all -C at this time. -C -C Revision 1.1 1994/04/07 20:04:51 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:53:19 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE MAKN2B (LENF, NLNKF, LINKF, IELBST, IN2ELB) C======================================================================= diff --git a/packages/seacas/applications/blot/maksu2.f b/packages/seacas/applications/blot/maksu2.f index 29274fba699b..1e1d09a80312 100644 --- a/packages/seacas/applications/blot/maksu2.f +++ b/packages/seacas/applications/blot/maksu2.f @@ -1,29 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: maksu2.f,v $ -C Revision 1.3 2009/03/25 12:36:45 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.2 2009/01/22 21:34:21 gdsjaar -C There were several inline dbnums common blocks. Replaced with the -C include so they all have the same size with the added variable types. -C -C Added minor support for nodeset and sideset variables. -C -C It can print the count and the names, but that is all -C at this time. -C -C Revision 1.1 1994/04/07 20:04:54 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:53:21 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE MAKSU2 (LENL, LINSET, MAXMSH, DODEAD, IDN2B, NPSURF) C======================================================================= diff --git a/packages/seacas/applications/blot/maksur.f b/packages/seacas/applications/blot/maksur.f index 2abc3de3833b..9f173eda7a1d 100644 --- a/packages/seacas/applications/blot/maksur.f +++ b/packages/seacas/applications/blot/maksur.f @@ -1,29 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: maksur.f,v $ -C Revision 1.3 2009/03/25 12:36:45 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.2 2009/01/22 21:34:21 gdsjaar -C There were several inline dbnums common blocks. Replaced with the -C include so they all have the same size with the added variable types. -C -C Added minor support for nodeset and sideset variables. -C -C It can print the count and the names, but that is all -C at this time. -C -C Revision 1.1 1994/04/07 20:04:56 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:53:23 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE MAKSUR (LENF, NLNKF, LINKF, DODEAD, IDN2B, NPSURF) C======================================================================= diff --git a/packages/seacas/applications/blot/matedg.f b/packages/seacas/applications/blot/matedg.f index 12792a72e728..98fa4184414b 100644 --- a/packages/seacas/applications/blot/matedg.f +++ b/packages/seacas/applications/blot/matedg.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/matfac.f b/packages/seacas/applications/blot/matfac.f index 00dd7308dcbe..702e94d4bac7 100644 --- a/packages/seacas/applications/blot/matfac.f +++ b/packages/seacas/applications/blot/matfac.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/matfat.f b/packages/seacas/applications/blot/matfat.f index ed95e56d2f96..31c1a24ef886 100644 --- a/packages/seacas/applications/blot/matfat.f +++ b/packages/seacas/applications/blot/matfat.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/meshup.f b/packages/seacas/applications/blot/meshup.f index bd8b762b511a..d1a9b9442d37 100644 --- a/packages/seacas/applications/blot/meshup.f +++ b/packages/seacas/applications/blot/meshup.f @@ -1,34 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: meshup.f,v $ -C Revision 1.4 2009/03/25 12:36:45 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.3 2009/01/22 21:34:21 gdsjaar -C There were several inline dbnums common blocks. Replaced with the -C include so they all have the same size with the added variable types. -C -C Added minor support for nodeset and sideset variables. -C -C It can print the count and the names, but that is all -C at this time. -C -C Revision 1.2 2004/10/18 16:30:00 gdsjaar -C Add capability to handle tet elements. -C -C There are still a few minor problems, but the display is substantially correct. -C -C Revision 1.1 1994/04/07 20:05:04 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:53:29 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE MESHUP (WIDLIN, MSHLIN, MLNTYP, & IELBST, LENL, LINSET, BLKCOL, XN, YN, ZN, diff --git a/packages/seacas/applications/blot/minmax.blk b/packages/seacas/applications/blot/minmax.blk index c18e050fe48e..749a77f9e949 100644 --- a/packages/seacas/applications/blot/minmax.blk +++ b/packages/seacas/applications/blot/minmax.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details common /minmx/ minnod, maxnod diff --git a/packages/seacas/applications/blot/mrkess.F b/packages/seacas/applications/blot/mrkess.F index 1187bb4c456b..cb01fc5cb078 100644 --- a/packages/seacas/applications/blot/mrkess.F +++ b/packages/seacas/applications/blot/mrkess.F @@ -1,37 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: mrkess.F,v $ -C Revision 1.6 2009/03/25 12:36:45 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.5 2000/07/11 16:50:23 gdsjaar -C SGI had problems with logical statement function, inlined it -C -C Revision 1.4 1997/06/26 17:51:34 caforsy -C Substituted if NeedsDoubleEscape for ifdef sun. This define is needed on cougar, sun and ibm platforms -C -C Revision 1.3 1996/05/15 16:17:47 caforsy -C Changed Imakefile. The cray.cf file has now removed the static heap -C and the ifdef CrayArchitecture statement is no longer needed. -C Changed the size of the arrows that mark the side sets. -C -C Revision 1.2 1994/04/08 13:25:57 gdsjaar -C Removed hash mark from comments. -C -c Revision 1.1 1994/04/07 20:05:07 gdsjaar -c Initial checkin of ACCESS/graphics/blotII2 -c -CRevision 1.3 1993/07/08 21:57:13 gdsjaar -CReplaced SUN with sun in all ifdef statements. -C -CRevision 1.2 1990/12/14 08:53:32 gdsjaar -CAdded RCS Id and Log to all files -C C======================================================================= SUBROUTINE MRKESS (LENF, NLNKF, LINKF, & HIDENP, HIDEF, XN, YN, ZN, XF, YF, ZF, diff --git a/packages/seacas/applications/blot/mrkfac.F b/packages/seacas/applications/blot/mrkfac.F index 7b533822d1dd..18a83a1062d5 100644 --- a/packages/seacas/applications/blot/mrkfac.F +++ b/packages/seacas/applications/blot/mrkfac.F @@ -1,35 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: mrkfac.F,v $ -C Revision 1.4 2009/03/25 12:36:45 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.3 2009/01/22 21:34:21 gdsjaar -C There were several inline dbnums common blocks. Replaced with the -C include so they all have the same size with the added variable types. -C -C Added minor support for nodeset and sideset variables. -C -C It can print the count and the names, but that is all -C at this time. -C -C Revision 1.2 1997/06/26 17:51:35 caforsy -C Substituted if NeedsDoubleEscape for ifdef sun. This define is needed on cougar, sun and ibm platforms -C -C Revision 1.1 1994/04/07 20:05:09 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -CRevision 1.3 1993/07/08 21:57:14 gdsjaar -CReplaced SUN with sun in all ifdef statements. -C -CRevision 1.2 1990/12/14 08:53:34 gdsjaar -CAdded RCS Id and Log to all files -C C======================================================================= SUBROUTINE MRKFAC (NUMFAC, F, HIDEF, XF, YF, ZF, & NMIN, NMAX, FMIN, FMAX, BLKCOL, *) diff --git a/packages/seacas/applications/blot/mrknod.F b/packages/seacas/applications/blot/mrknod.F index db2c87b7e8b9..0556ff17513e 100644 --- a/packages/seacas/applications/blot/mrknod.F +++ b/packages/seacas/applications/blot/mrknod.F @@ -1,35 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: mrknod.F,v $ -C Revision 1.4 2009/03/25 12:36:45 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.3 2009/01/22 21:34:21 gdsjaar -C There were several inline dbnums common blocks. Replaced with the -C include so they all have the same size with the added variable types. -C -C Added minor support for nodeset and sideset variables. -C -C It can print the count and the names, but that is all -C at this time. -C -C Revision 1.2 1997/06/26 17:51:36 caforsy -C Substituted if NeedsDoubleEscape for ifdef sun. This define is needed on cougar, sun and ibm platforms -C -C Revision 1.1 1994/04/07 20:05:12 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -CRevision 1.3 1993/07/08 21:57:15 gdsjaar -CReplaced SUN with sun in all ifdef statements. -C -CRevision 1.2 1990/12/14 08:53:36 gdsjaar -CAdded RCS Id and Log to all files -C C======================================================================= SUBROUTINE MRKNOD (F, HIDENP, XN, YN, ZN, IN2ELB, & NMIN, NMAX, FMIN, FMAX, BLKCOL, *) diff --git a/packages/seacas/applications/blot/mrknps.F b/packages/seacas/applications/blot/mrknps.F index 9c849eed9d54..73958060b789 100644 --- a/packages/seacas/applications/blot/mrknps.F +++ b/packages/seacas/applications/blot/mrknps.F @@ -1,37 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: mrknps.F,v $ -C Revision 1.6 2009/03/25 12:36:45 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.5 2000/07/11 16:50:23 gdsjaar -C SGI had problems with logical statement function, inlined it -C -C Revision 1.4 1999/03/02 19:12:36 gdsjaar -C Fixed nodeset scaling interpolation equation -C -C Revision 1.3 1997/06/26 17:51:37 caforsy -C Substituted if NeedsDoubleEscape for ifdef sun. This define is needed on cougar, sun and ibm platforms -C -C Revision 1.2 1995/11/02 16:59:11 caforsy -C Changes compute and io word size defaults. Changed node set -C markings to "O"'s. Node set markings will scale depending upon the -C number of nodes. -C -C Revision 1.1 1994/04/07 20:05:14 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -CRevision 1.3 1993/07/08 21:57:16 gdsjaar -CReplaced SUN with sun in all ifdef statements. -C -CRevision 1.2 1990/12/14 08:53:37 gdsjaar -CAdded RCS Id and Log to all files -C C======================================================================= SUBROUTINE MRKNPS (HIDENP, & XN, YN, ZN, IX2NP, IN2ELB, DODEAD, IDN2B, diff --git a/packages/seacas/applications/blot/mschk.f b/packages/seacas/applications/blot/mschk.f index 22f1bd822594..e9ebb2423190 100644 --- a/packages/seacas/applications/blot/mschk.f +++ b/packages/seacas/applications/blot/mschk.f @@ -1,29 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: mschk.f,v $ -C Revision 1.3 2009/03/25 12:36:45 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.2 2009/01/22 21:34:21 gdsjaar -C There were several inline dbnums common blocks. Replaced with the -C include so they all have the same size with the added variable types. -C -C Added minor support for nodeset and sideset variables. -C -C It can print the count and the names, but that is all -C at this time. -C -C Revision 1.1 1994/04/07 20:05:16 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:53:39 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE MSCHK (PRTOK, OKAY) C======================================================================= diff --git a/packages/seacas/applications/blot/mscomd.f b/packages/seacas/applications/blot/mscomd.f index 78bde8ca5e49..9ed8a5e03002 100644 --- a/packages/seacas/applications/blot/mscomd.f +++ b/packages/seacas/applications/blot/mscomd.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= @@ -953,7 +953,6 @@ SUBROUTINE MSCOMD (A, CURPRO, MSHTYP, INLINE, INVERB, IFLD, ENDIF INVERB = ' ' - C *** Information *** ELSE IF (VERB .EQ. 'show') THEN diff --git a/packages/seacas/applications/blot/msdone.f b/packages/seacas/applications/blot/msdone.f index 1f58fd4a4301..3a34ca173c97 100644 --- a/packages/seacas/applications/blot/msdone.f +++ b/packages/seacas/applications/blot/msdone.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: msdone.f,v $ -C Revision 1.2 2009/03/25 12:36:46 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 20:05:23 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:53:44 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE MSDONE (ANYDEF, ANYUND, & DOIXF, DON2B, DOELED, DOELEU, DODEAD, DONPS, DOESS) diff --git a/packages/seacas/applications/blot/msflag.f b/packages/seacas/applications/blot/msflag.f index e1af82ebf5eb..9c3891a238de 100644 --- a/packages/seacas/applications/blot/msflag.f +++ b/packages/seacas/applications/blot/msflag.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/msgeom.f b/packages/seacas/applications/blot/msgeom.f index 9369c45183fb..85fd3e899fb5 100644 --- a/packages/seacas/applications/blot/msgeom.f +++ b/packages/seacas/applications/blot/msgeom.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/mshcol.f b/packages/seacas/applications/blot/mshcol.f index 6a7a40bfa4a4..b020a53cbc51 100644 --- a/packages/seacas/applications/blot/mshcol.f +++ b/packages/seacas/applications/blot/mshcol.f @@ -1,41 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: mshcol.f,v $ -C Revision 1.4 2009/03/25 12:36:46 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.3 2009/01/22 21:34:21 gdsjaar -C There were several inline dbnums common blocks. Replaced with the -C include so they all have the same size with the added variable types. -C -C Added minor support for nodeset and sideset variables. -C -C It can print the count and the names, but that is all -C at this time. -C -C Revision 1.2 2005/07/27 19:29:34 gdsjaar -C On the 64-bit compile using the portland compiler on reddish; the -C construct "call function(float(intarg))" was passing an invalid value; -C probably due to a 32-bit vs 64-bit confusion. -C -C I changed it to "call function(1.0*intarg)" which performs an implicit -C conversion to real which I guess uses the correct 32-bit vs 64-bit. -C -C Revision 1.1 1994/04/07 20:05:31 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.3 1991/06/25 16:09:48 gdsjaar -c Fixed? problem with calls to ugrcol -- changed -c call ugrcol(idelb(ielb),...) to call ugrcol(ielb,...) -c -c Revision 1.2 1990/12/14 08:53:50 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE MSHCOL (FNCT, IELB, MLNTYP, WIDLIN, BLKCOL, & IDELB) diff --git a/packages/seacas/applications/blot/mshlim.blk b/packages/seacas/applications/blot/mshlim.blk index f42881111f12..68b5eb26c6ba 100644 --- a/packages/seacas/applications/blot/mshlim.blk +++ b/packages/seacas/applications/blot/mshlim.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C mshlim.blk diff --git a/packages/seacas/applications/blot/mshopt.blk b/packages/seacas/applications/blot/mshopt.blk index 22c315f807b8..27cbedb85cf9 100644 --- a/packages/seacas/applications/blot/mshopt.blk +++ b/packages/seacas/applications/blot/mshopt.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /MSHOPT/ MSHLIN(4), MLNTYP(-1:1,4), NNPSET(4), NESSET(4), diff --git a/packages/seacas/applications/blot/mslab.F b/packages/seacas/applications/blot/mslab.F index fc61ffe34600..48a7ebc0c8d1 100644 --- a/packages/seacas/applications/blot/mslab.F +++ b/packages/seacas/applications/blot/mslab.F @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= @@ -371,7 +371,6 @@ SUBROUTINE MSLAB (A, NEWSET, NVWTIM, IPTIMS, TIMES, C Determine the number of variables whose value will be C displayed in the plot legend. - NUMDSP = LIDSP(0) IF (NVWTIM .EQ. 4) THEN NUMDSP = MIN (NUMDSP, 1) diff --git a/packages/seacas/applications/blot/mslins.f b/packages/seacas/applications/blot/mslins.f index 28ad5229f623..fc75df8203a7 100644 --- a/packages/seacas/applications/blot/mslins.f +++ b/packages/seacas/applications/blot/mslins.f @@ -1,29 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: mslins.f,v $ -C Revision 1.3 2009/03/25 12:36:46 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.2 2009/01/22 21:34:21 gdsjaar -C There were several inline dbnums common blocks. Replaced with the -C include so they all have the same size with the added variable types. -C -C Added minor support for nodeset and sideset variables. -C -C It can print the count and the names, but that is all -C at this time. -C -C Revision 1.1 1994/04/07 20:05:43 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:53:54 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE MSLINS (A, LENF, NLNKF, LINKF, IF2EL, LENL, KLNSET) C======================================================================= diff --git a/packages/seacas/applications/blot/msmain.f b/packages/seacas/applications/blot/msmain.f index 781854abafd3..d21c950ce6f3 100644 --- a/packages/seacas/applications/blot/msmain.f +++ b/packages/seacas/applications/blot/msmain.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/msmemy.f b/packages/seacas/applications/blot/msmemy.f index e024a3a1ba47..6f26fbd0831c 100644 --- a/packages/seacas/applications/blot/msmemy.f +++ b/packages/seacas/applications/blot/msmemy.f @@ -1,23 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: msmemy.f,v $ -C Revision 1.3 2009/03/25 12:36:46 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.2 2005/09/27 13:34:53 gdsjaar -C Fixed some issues with memory access out of bounds -C -C Revision 1.1 1994/04/07 20:05:48 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:53:58 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE MSMEMY (A, ANYDEF, ANYUND, & DOIXF, DON2B, DOELED, DOELEU, DODEAD, DONPS, DOESS, diff --git a/packages/seacas/applications/blot/msplt1.f b/packages/seacas/applications/blot/msplt1.f index 26b1938085de..fc7c195f566c 100644 --- a/packages/seacas/applications/blot/msplt1.f +++ b/packages/seacas/applications/blot/msplt1.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= @@ -196,9 +196,9 @@ SUBROUTINE MSPLT1 (A, WIDLIN, MSHNUM, MSHLIN, MLNTYP, & NESSET, ISSESS, A(KIDSS), A(KNESS), A(KNNSS), & A(KIXESS), A(KIXNSS), A(KLTESS), A(KLTNSS), *100) END IF -C + C Draw elements as spheres, if requested -C + IF (SPHPLT .NE. 0) THEN CALL MDFIND( 'LENE', KLENE, LDUM) CALL MDFIND( 'LINK', KLINK, LDUM) diff --git a/packages/seacas/applications/blot/msscal.f b/packages/seacas/applications/blot/msscal.f index 02ecfa3e065f..ee7dfe555ba3 100644 --- a/packages/seacas/applications/blot/msscal.f +++ b/packages/seacas/applications/blot/msscal.f @@ -1,34 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: msscal.f,v $ -C Revision 1.5 2009/03/25 12:36:46 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.4 2007/11/14 20:14:53 gdsjaar -C Added optional 'alive value' to the death on variable command. The -C default value is 0.0, but you can now specify a different value to -C indicate aliveness (for example, the presto DEATH_DUMMY_VAR treats 1.0 -C as the alive value). -C -C Example: DEATH ON DEATH_DUMMY_VAR 1 -C -C Revision 1.3 1997/10/23 12:59:33 gdsjaar -C Fixed initialization order problem that was affecting zooms. -C -C Revision 1.2 1997/09/02 14:52:46 caforsy -C Changed name from HEX_SHELL to HEXSHELL. Fixed hexshell bugs -C -C Revision 1.1 1994/04/07 20:05:53 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:54:04 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE MSSCAL (DOSCAL, NNPSEL, NPSEL, XN, YN, ZN) C======================================================================= diff --git a/packages/seacas/applications/blot/msshow.f b/packages/seacas/applications/blot/msshow.f index 76f8fc24e3e2..c247112699fb 100644 --- a/packages/seacas/applications/blot/msshow.f +++ b/packages/seacas/applications/blot/msshow.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/msstep.f b/packages/seacas/applications/blot/msstep.f index 363dea993941..cd2d64709df4 100644 --- a/packages/seacas/applications/blot/msstep.f +++ b/packages/seacas/applications/blot/msstep.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/mssurf.f b/packages/seacas/applications/blot/mssurf.f index 9b1daa988ecd..f6eb832a7846 100644 --- a/packages/seacas/applications/blot/mssurf.f +++ b/packages/seacas/applications/blot/mssurf.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/mxepn.f b/packages/seacas/applications/blot/mxepn.f index 1ed87e93d9bc..3d51ccbfb18d 100644 --- a/packages/seacas/applications/blot/mxepn.f +++ b/packages/seacas/applications/blot/mxepn.f @@ -1,35 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: mxepn.f,v $ -C Revision 1.4 2009/03/25 12:36:46 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.3 2009/01/22 21:34:21 gdsjaar -C There were several inline dbnums common blocks. Replaced with the -C include so they all have the same size with the added variable types. -C -C Added minor support for nodeset and sideset variables. -C -C It can print the count and the names, but that is all -C at this time. -C -C Revision 1.2 1999/03/09 22:02:50 gdsjaar -C Fixed problem with incorrect 'mesh contiguity' errors. Max number of -C faces connected to a node was being based on block-by-block counting -C of elements connected to a node which didn't work well for meshes -C containing lots of blocks. Changed to do count based on all element blocks. -C -C Revision 1.1 1994/04/07 20:06:04 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:54:12 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE MXEPN (NUME, NLNKE, LINKE, NFPN) C======================================================================= diff --git a/packages/seacas/applications/blot/ndefvw.f b/packages/seacas/applications/blot/ndefvw.f index 906f48bd4a3d..c94464e15831 100644 --- a/packages/seacas/applications/blot/ndefvw.f +++ b/packages/seacas/applications/blot/ndefvw.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/neutr.blk b/packages/seacas/applications/blot/neutr.blk index acad74b43408..252594561f7b 100644 --- a/packages/seacas/applications/blot/neutr.blk +++ b/packages/seacas/applications/blot/neutr.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /NEUTR/ NEU, NEUOPN, NUMCRV, INCCRV, NEUGRF, GRFOPN diff --git a/packages/seacas/applications/blot/neutral.blk b/packages/seacas/applications/blot/neutral.blk index 738bc30f08dd..87c31513cc92 100644 --- a/packages/seacas/applications/blot/neutral.blk +++ b/packages/seacas/applications/blot/neutral.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details INTEGER NONE, XMGR, GRAF, CSV, RAW, XML diff --git a/packages/seacas/applications/blot/nodzom.blk b/packages/seacas/applications/blot/nodzom.blk index 9d5de221fd22..f11a921e01ef 100644 --- a/packages/seacas/applications/blot/nodzom.blk +++ b/packages/seacas/applications/blot/nodzom.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON / NODZOM / NZMON, XZM, YZM, ZZM, RADZM, NODEZM diff --git a/packages/seacas/applications/blot/number.f b/packages/seacas/applications/blot/number.f index b278e6969cbc..c4101e02397b 100644 --- a/packages/seacas/applications/blot/number.f +++ b/packages/seacas/applications/blot/number.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/nummod.f b/packages/seacas/applications/blot/nummod.f index 38c84b4c022c..06343e833957 100644 --- a/packages/seacas/applications/blot/nummod.f +++ b/packages/seacas/applications/blot/nummod.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: nummod.f,v $ -C Revision 1.2 2009/03/25 12:36:46 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 20:06:16 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:54:18 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= INTEGER FUNCTION NUMMOD (MODE, MODSUB, MATMOD, MATSUB) C======================================================================= diff --git a/packages/seacas/applications/blot/nwhsel.f b/packages/seacas/applications/blot/nwhsel.f index 988d362c0e79..2271df58c93c 100644 --- a/packages/seacas/applications/blot/nwhsel.f +++ b/packages/seacas/applications/blot/nwhsel.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: nwhsel.f,v $ -C Revision 1.2 2009/03/25 12:36:46 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 20:06:19 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:54:20 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= INTEGER FUNCTION NWHSEL (NPTIMS, IPTIMS, WHOTIM) C======================================================================= diff --git a/packages/seacas/applications/blot/nzaway.f b/packages/seacas/applications/blot/nzaway.f index e94e70bd0eaf..a710f7125dd1 100644 --- a/packages/seacas/applications/blot/nzaway.f +++ b/packages/seacas/applications/blot/nzaway.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: nzaway.f,v $ -C Revision 1.2 2009/03/25 12:36:46 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 20:06:22 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:54:22 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= INTEGER FUNCTION NZAWAY (NLNKF, LINKF1, XN, YN, ZN, HIDENP) C======================================================================= diff --git a/packages/seacas/applications/blot/opnlog.f b/packages/seacas/applications/blot/opnlog.f index 4c2f661a9957..45caf2db36f9 100644 --- a/packages/seacas/applications/blot/opnlog.f +++ b/packages/seacas/applications/blot/opnlog.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/ord8np.f b/packages/seacas/applications/blot/ord8np.f index 53ded3c3c44b..9a2de0fa1b7f 100644 --- a/packages/seacas/applications/blot/ord8np.f +++ b/packages/seacas/applications/blot/ord8np.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: ord8np.f,v $ -C Revision 1.2 2009/03/25 12:36:46 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 20:06:27 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:54:25 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE ORD8NP (NELBLK, LENE, NLNKE, LINKE) C======================================================================= diff --git a/packages/seacas/applications/blot/outfil.blk b/packages/seacas/applications/blot/outfil.blk index 1c6a79b21ee1..2c29b239e82f 100644 --- a/packages/seacas/applications/blot/outfil.blk +++ b/packages/seacas/applications/blot/outfil.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /OUTFIL/ NOUT, NCRT, NPRT, ANYPRT diff --git a/packages/seacas/applications/blot/outlin.f b/packages/seacas/applications/blot/outlin.f index f00f782b29f9..6267458710c2 100644 --- a/packages/seacas/applications/blot/outlin.f +++ b/packages/seacas/applications/blot/outlin.f @@ -1,32 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: outlin.f,v $ -C Revision 1.3 2009/03/25 12:36:46 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.2 2009/01/22 21:34:22 gdsjaar -C There were several inline dbnums common blocks. Replaced with the -C include so they all have the same size with the added variable types. -C -C Added minor support for nodeset and sideset variables. -C -C It can print the count and the names, but that is all -C at this time. -C -C Revision 1.1 1994/04/07 20:06:34 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.3 1993/09/24 17:32:40 gdsjaar -c Added an outline off/on command to toggle drawing of the view window outline -c -c Revision 1.2 1990/12/14 08:54:27 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE OUTLIN (BLKCOL, *) C======================================================================= diff --git a/packages/seacas/applications/blot/pack.f b/packages/seacas/applications/blot/pack.f index b62fbb11b37a..c0c76a9ce020 100644 --- a/packages/seacas/applications/blot/pack.f +++ b/packages/seacas/applications/blot/pack.f @@ -1,78 +1,63 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: pack.f,v $ -C Revision 1.2 2009/03/25 12:36:46 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 20:06:37 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:54:29 gdsjaar -c Added RCS Id and Log to all files -c c ====================================================================== c ====================================================================== c ====================================================================== c ====================================================================== -c + c ROUTINE: pack -c + c DESCRIPTION: Removes all spaces from an ASCII character c string and counts the number of remaining c non-space characters. -c + c AUTHOR: John H. Glick c Sandia National Laboratories c Division 1511 -c + c DATE: December 20, 1988 -c + c TYPE OF SUBPROGRAM: subroutine -c + c USAGE: call pack ( string, lstr ) -c + c PARAMETERS: c character * (*) string ( INPUT/OUTPUT ) c string to be stripped of spaces. c integer lstr ( OUTPUT ) c number of non-space characters c remaining. -c + c CALLS: none -c + c GLOBAL VARIABLES REFERENCED: none -c + c CALLING ROUTINE(S): getins (BLOT) c filhnd (BLOT) -c + c SYSTEM DEPENDENCIES: none -c + c ====================================================================== c ====================================================================== subroutine pack ( string, lstr ) -c c parameters -c + character * (*) string integer lstr -c c declarations -c + integer length, pt1, pt2 -c c ************************************************************* c ************************************************************* -c -c + length = len(string) pt1 = 0 @@ -86,9 +71,7 @@ subroutine pack ( string, lstr ) if ( pt2 .le. length ) go to 100 lstr = pt1 -c c fill remainder of string with spaces -c do 110 i = lstr + 1, length string(i:i) = ' ' diff --git a/packages/seacas/applications/blot/paint.f b/packages/seacas/applications/blot/paint.f index d3d4d3cc48a2..3dcb83006539 100644 --- a/packages/seacas/applications/blot/paint.f +++ b/packages/seacas/applications/blot/paint.f @@ -1,32 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: paint.f,v $ -C Revision 1.3 2009/03/25 12:36:46 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.2 2009/01/22 21:34:22 gdsjaar -C There were several inline dbnums common blocks. Replaced with the -C include so they all have the same size with the added variable types. -C -C Added minor support for nodeset and sideset variables. -C -C It can print the count and the names, but that is all -C at this time. -C -C Revision 1.1 1994/04/07 20:06:40 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.3 1993/08/04 15:58:41 gdsjaar -c Performed some optimization to speed up blot - Inlined the locrea function -c -c Revision 1.2 1990/12/14 08:54:31 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE PAINT (VARNP, LENF, NLNKF, LINKF, NXFAC, IXFAC, & XN, YN, ZN, XF, YF, ZF, ISVOK, FMIN, FMAX, *) diff --git a/packages/seacas/applications/blot/paintf.f b/packages/seacas/applications/blot/paintf.f index 6f0da4b2b022..21336b810e8f 100644 --- a/packages/seacas/applications/blot/paintf.f +++ b/packages/seacas/applications/blot/paintf.f @@ -1,33 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: paintf.f,v $ -C Revision 1.3 2009/03/25 12:36:46 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.2 1998/03/24 20:52:25 gdsjaar -C Fixed problem in finding average value of variable on 8-node quad -C face. -C Updated error message to send problem to SEACAS@sandia.gov instead of -C 'code sponsor' -C -C Revision 1.1 1994/04/07 20:06:43 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.4 1993/08/04 15:59:06 gdsjaar -c Performed some optimization to speed up blot - special-cased the most -c common situation. -c -c Revision 1.3 1993/04/29 17:27:34 gdsjaar -c Removed amy gilkeys name from error message. -c -c Revision 1.2 1990/12/14 08:54:34 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE PAINTF (CNTR0, CNTR1, VARNP, NLNKF, LINKF1, & XN, YN, ZN, XF, YF, ZF) diff --git a/packages/seacas/applications/blot/params.blk b/packages/seacas/applications/blot/params.blk index 6e8d5fe36aca..17d5cd6e578a 100644 --- a/packages/seacas/applications/blot/params.blk +++ b/packages/seacas/applications/blot/params.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details PARAMETER (MXQARC=32) diff --git a/packages/seacas/applications/blot/pick.blk b/packages/seacas/applications/blot/pick.blk index 5449f3e257fa..3747e26c9b4f 100644 --- a/packages/seacas/applications/blot/pick.blk +++ b/packages/seacas/applications/blot/pick.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /PICK/ INITP, PKDEF, diff --git a/packages/seacas/applications/blot/pick2d.f b/packages/seacas/applications/blot/pick2d.f index 6665df5db49e..a8e382209669 100644 --- a/packages/seacas/applications/blot/pick2d.f +++ b/packages/seacas/applications/blot/pick2d.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: pick2d.f,v $ -C Revision 1.2 2009/03/25 12:36:46 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 20:06:50 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:54:36 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE PICK2D (PROMPT, CURSOR, MIDDEF, IFLD, INTYP, RFIELD, & XRES, YRES, *) diff --git a/packages/seacas/applications/blot/pick3d.f b/packages/seacas/applications/blot/pick3d.f index f1a9502e84ca..c4bdcafa388e 100644 --- a/packages/seacas/applications/blot/pick3d.f +++ b/packages/seacas/applications/blot/pick3d.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: pick3d.f,v $ -C Revision 1.2 2009/03/25 12:36:46 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 20:06:53 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:54:38 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE PICK3D (PROMPT, CURSOR, & NUMNPF, XN, YN, ZN, HIDENP, MIDDEF, IFLD, INTYP, RFIELD, diff --git a/packages/seacas/applications/blot/pickn2.f b/packages/seacas/applications/blot/pickn2.f index 2131c9653b6f..bcc8382f5ba6 100644 --- a/packages/seacas/applications/blot/pickn2.f +++ b/packages/seacas/applications/blot/pickn2.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: pickn2.f,v $ -C Revision 1.2 2009/03/25 12:36:46 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 20:06:56 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:54:40 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE PICKN2 (PROMPT, NUMNPF, XN, YN, MIDDEF, NDRES, *) C======================================================================= diff --git a/packages/seacas/applications/blot/pickn3.f b/packages/seacas/applications/blot/pickn3.f index 74ad59aa6a0c..2ce5f5e72c74 100644 --- a/packages/seacas/applications/blot/pickn3.f +++ b/packages/seacas/applications/blot/pickn3.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: pickn3.f,v $ -C Revision 1.2 2009/03/25 12:36:46 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 20:06:59 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:54:42 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE PICKN3 (PROMPT, NUMNPF, XN, YN, ZN, HIDENP, & MIDDEF, NODRES , *) diff --git a/packages/seacas/applications/blot/picknp.f b/packages/seacas/applications/blot/picknp.f index 4906c2112842..619d88c01fd2 100644 --- a/packages/seacas/applications/blot/picknp.f +++ b/packages/seacas/applications/blot/picknp.f @@ -1,28 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: picknp.f,v $ -C Revision 1.3 2009/03/25 12:36:46 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.2 2000/05/31 22:22:02 gdsjaar -C Fixed handling of the what and what3 commands. It was accessing the -C hidenp array when it shouldn't have and passed in numnp instead of -C numel in one place. -C -C Revision 1.1 1994/04/07 20:07:02 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.3 1993/08/19 19:10:23 gdsjaar -c Nodes are not hidden in 2d, test was wrong. -c -c Revision 1.2 1990/12/14 08:54:46 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE PICKNP (PROMPT, CURSOR, WINDOW, & NDIM, NUMNPF, XN, YN, ZN, HIDENP, MIDDEF, diff --git a/packages/seacas/applications/blot/plcol2.blk b/packages/seacas/applications/blot/plcol2.blk index 2ec340cafe22..b18f6e8aa957 100644 --- a/packages/seacas/applications/blot/plcol2.blk +++ b/packages/seacas/applications/blot/plcol2.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /PLCOL2/ IDFOR, IDFORT, IDBCK, IDBCKT, COLFOR diff --git a/packages/seacas/applications/blot/plcolr.blk b/packages/seacas/applications/blot/plcolr.blk index 0f7b65de1975..7477739269b2 100644 --- a/packages/seacas/applications/blot/plcolr.blk +++ b/packages/seacas/applications/blot/plcolr.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /PLCOLR/ BCKGND, FORGND diff --git a/packages/seacas/applications/blot/plcomd.f b/packages/seacas/applications/blot/plcomd.f index 82d868f5da56..58313b4d6613 100644 --- a/packages/seacas/applications/blot/plcomd.f +++ b/packages/seacas/applications/blot/plcomd.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/ploter.f b/packages/seacas/applications/blot/ploter.f index 1f36ac46baa4..87d448d352ab 100644 --- a/packages/seacas/applications/blot/ploter.f +++ b/packages/seacas/applications/blot/ploter.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/plshow.f b/packages/seacas/applications/blot/plshow.f index 183dfd3632b7..b66f63fb4b17 100644 --- a/packages/seacas/applications/blot/plshow.f +++ b/packages/seacas/applications/blot/plshow.f @@ -1,30 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: plshow.f,v $ -C Revision 1.4 2009/03/25 12:36:46 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.3 1994/06/13 18:29:05 gdsjaar -C Fixed background and foreground color setting. (I think) -C -C Revision 1.2 1994/06/13 17:11:35 gdsjaar -C Fixed background, foreground, and softcharacters to check for full -C string rather than truncated at 8 characters. -C -c Revision 1.1 1994/04/07 20:07:16 gdsjaar -c Initial checkin of ACCESS/graphics/blotII2 -c -c Revision 1.3 1993/09/24 17:32:42 gdsjaar -c Added an outline off/on command to toggle drawing of the view window outline -c -c Revision 1.2 1990/12/14 08:54:52 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE PLSHOW (SHOTYP, XYTYPE, MESHOK, TIMES, WHOTIM, IPTIMS) C======================================================================= diff --git a/packages/seacas/applications/blot/preb1.f b/packages/seacas/applications/blot/preb1.f index 0e997fec78fa..a7ad8cb7c842 100644 --- a/packages/seacas/applications/blot/preb1.f +++ b/packages/seacas/applications/blot/preb1.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE PREB1 (OPTION, NOUT, IEL0, NLISEL, LISEL, diff --git a/packages/seacas/applications/blot/prelb.f b/packages/seacas/applications/blot/prelb.f index 8c7d4232b698..b26651ebe5a8 100644 --- a/packages/seacas/applications/blot/prelb.f +++ b/packages/seacas/applications/blot/prelb.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/prelem.f b/packages/seacas/applications/blot/prelem.f index cbce05184cce..0593480484c9 100644 --- a/packages/seacas/applications/blot/prelem.f +++ b/packages/seacas/applications/blot/prelem.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/preset.f b/packages/seacas/applications/blot/preset.f index e4ec8086d7c5..9a3b3b4ce0b5 100644 --- a/packages/seacas/applications/blot/preset.f +++ b/packages/seacas/applications/blot/preset.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: preset.f,v $ -C Revision 1.2 2009/03/25 12:36:46 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 20:07:29 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:55:00 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE PRESET (LINPLT, QAPLT, DBORD0, DVIEW0) C======================================================================= diff --git a/packages/seacas/applications/blot/press.f b/packages/seacas/applications/blot/press.f index 55ab9c526566..4f196dcba8b6 100644 --- a/packages/seacas/applications/blot/press.f +++ b/packages/seacas/applications/blot/press.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/prglob.f b/packages/seacas/applications/blot/prglob.f index 896b601dab35..8033bf86b9ac 100644 --- a/packages/seacas/applications/blot/prglob.f +++ b/packages/seacas/applications/blot/prglob.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE PRGLOB (OPTION, NOUT, NVARGL, LISGV, NAMEGV, VARGL) diff --git a/packages/seacas/applications/blot/prhist.f b/packages/seacas/applications/blot/prhist.f index c953d0137905..c54de1f082f8 100644 --- a/packages/seacas/applications/blot/prhist.f +++ b/packages/seacas/applications/blot/prhist.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: prhist.f,v $ -C Revision 1.2 2009/03/25 12:36:46 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 20:07:38 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:55:07 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE PRHIST (OPTION, NOUT, NVARHI, LISHV, NAMEHV, VARHI) C======================================================================= diff --git a/packages/seacas/applications/blot/prinit.f b/packages/seacas/applications/blot/prinit.f index 18d730b139e7..c69fd73f5a6d 100644 --- a/packages/seacas/applications/blot/prinit.f +++ b/packages/seacas/applications/blot/prinit.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/prmap.f b/packages/seacas/applications/blot/prmap.f index 22cf927a8a0b..1fce31fa1c48 100644 --- a/packages/seacas/applications/blot/prmap.f +++ b/packages/seacas/applications/blot/prmap.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/prname.f b/packages/seacas/applications/blot/prname.f index d2ccedc24380..d2aac6773dd2 100644 --- a/packages/seacas/applications/blot/prname.f +++ b/packages/seacas/applications/blot/prname.f @@ -1,10 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -c C======================================================================= SUBROUTINE PRNAME (NOUT, NAMLEN, * NVARGL, NVARNP, NVAREL, NVARNS, NVARSS, diff --git a/packages/seacas/applications/blot/prnode.f b/packages/seacas/applications/blot/prnode.f index 0e55ce84b0c5..6a227aa51e92 100644 --- a/packages/seacas/applications/blot/prnode.f +++ b/packages/seacas/applications/blot/prnode.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/prnps.f b/packages/seacas/applications/blot/prnps.f index 6ca49adac868..ee214a303cba 100644 --- a/packages/seacas/applications/blot/prnps.f +++ b/packages/seacas/applications/blot/prnps.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/prnsel.f b/packages/seacas/applications/blot/prnsel.f index deac754b9a03..306273b292e4 100644 --- a/packages/seacas/applications/blot/prnsel.f +++ b/packages/seacas/applications/blot/prnsel.f @@ -1,23 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: prnsel.f,v $ -C Revision 1.2 2009/03/25 12:36:46 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 20:07:54 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.3 1992/05/22 22:37:29 gdsjaar -c Modified to handle more than 100,000 nodes/elements in printouts -c -c Revision 1.2 1990/12/14 08:55:18 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE PRNSEL (NSEL, NTOT, VALNAM) C======================================================================= diff --git a/packages/seacas/applications/blot/prnshd.f b/packages/seacas/applications/blot/prnshd.f index 0acaf7b60976..44526306b05e 100644 --- a/packages/seacas/applications/blot/prnshd.f +++ b/packages/seacas/applications/blot/prnshd.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C----------------------------------------------------------------------- @@ -50,4 +50,3 @@ subroutine prnshd (nelblk, idelb, ishdcl, shdcol, ielbst) RETURN end - diff --git a/packages/seacas/applications/blot/prochs.f b/packages/seacas/applications/blot/prochs.f index 45d57f5caa3a..8950f8948054 100644 --- a/packages/seacas/applications/blot/prochs.f +++ b/packages/seacas/applications/blot/prochs.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= @@ -29,7 +29,6 @@ SUBROUTINE PROCHS (A, IA, NELBLK, IDELB, IDSCR, NELB, NLNK, NATR, C -- ISHEX - IN - number of element blocks with hex shells C -- KHEXID - IN - array storing HEXSHELL element block ids - DIMENSION A(*),IA(*) INTEGER NELBLK CHARACTER*(*) NAMELB(*) diff --git a/packages/seacas/applications/blot/progqa.blk b/packages/seacas/applications/blot/progqa.blk index 9e480375d98a..ae237f0417e5 100644 --- a/packages/seacas/applications/blot/progqa.blk +++ b/packages/seacas/applications/blot/progqa.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /PROGQA/ QAINFO(6) diff --git a/packages/seacas/applications/blot/prqa.f b/packages/seacas/applications/blot/prqa.f index 8198b6171a5f..3d3c9324a939 100644 --- a/packages/seacas/applications/blot/prqa.f +++ b/packages/seacas/applications/blot/prqa.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: prqa.f,v $ -C Revision 1.2 2009/03/25 12:36:46 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 20:08:02 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:55:20 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE PRQA (OPTION, NOUT, NQAREC, QAREC, NINFO, INFO) C======================================================================= diff --git a/packages/seacas/applications/blot/prstep.f b/packages/seacas/applications/blot/prstep.f index de0fc36d0558..933a4edd8d37 100644 --- a/packages/seacas/applications/blot/prstep.f +++ b/packages/seacas/applications/blot/prstep.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: prstep.f,v $ -C Revision 1.2 2009/03/25 12:36:46 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 20:08:05 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:55:22 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE PRSTEP (OPTION, NOUT, TIME, WHOTIM, NCSTEP, NSTEPS) C======================================================================= diff --git a/packages/seacas/applications/blot/prtdev.f b/packages/seacas/applications/blot/prtdev.f index 0b272b1b6de7..36477a850f4c 100644 --- a/packages/seacas/applications/blot/prtdev.f +++ b/packages/seacas/applications/blot/prtdev.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: prtdev.f,v $ -C Revision 1.2 2009/03/25 12:36:46 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 20:08:07 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:55:24 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE PRTDEV (STRING, DEVNAM, INCDEV) C======================================================================= diff --git a/packages/seacas/applications/blot/prtims.f b/packages/seacas/applications/blot/prtims.f index 07c53cf4d349..8a225a2d55f3 100644 --- a/packages/seacas/applications/blot/prtims.f +++ b/packages/seacas/applications/blot/prtims.f @@ -1,10 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -c C======================================================================= SUBROUTINE PRTIMS (OPTION, NOUT, ALLPRT, ALLTIM, & NSTEPS, TIMES, WHOTIM) diff --git a/packages/seacas/applications/blot/prxyz.f b/packages/seacas/applications/blot/prxyz.f index 2663d97bdf12..2de5a0afbe30 100644 --- a/packages/seacas/applications/blot/prxyz.f +++ b/packages/seacas/applications/blot/prxyz.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/ptsnrm.f b/packages/seacas/applications/blot/ptsnrm.f index 16aacb1167b8..28f437904d32 100644 --- a/packages/seacas/applications/blot/ptsnrm.f +++ b/packages/seacas/applications/blot/ptsnrm.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: ptsnrm.f,v $ -C Revision 1.2 2009/03/25 12:36:46 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 20:08:16 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:55:30 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE PTSNRM( PLAPTS, INPT, CUTPT, CUTNRM , IERR) C======================================================================= @@ -41,23 +30,23 @@ SUBROUTINE PTSNRM( PLAPTS, INPT, CUTPT, CUTNRM , IERR) INTEGER IERR REAL VEC1(3), VEC2(3) REAL TOL, DOT -C + C DEFINE TWO VECTORS IN THE PLANE : VEC1 = P1-P2, VEC2 = P3-P2 -C + VEC1(1) = PLAPTS(1,1) - PLAPTS(1,2) VEC1(2) = PLAPTS(2,1) - PLAPTS(2,2) VEC1(3) = PLAPTS(3,1) - PLAPTS(3,2) VEC2(1) = PLAPTS(1,3) - PLAPTS(1,2) VEC2(2) = PLAPTS(2,3) - PLAPTS(2,2) VEC2(3) = PLAPTS(3,3) - PLAPTS(3,2) -C + C DEFINE A TOLERANCE BASED ON THE LENGTH OF VEC1 -C + TOL = 1E-06 * AMAX1 ( VEC1(1), VEC1(2), VEC1(3) ) -C + C TAKE THE CROSS PRODUCT OF VEC1 AND VEC2 AS THE NORMAL OF THE PLANE AND C NORMALIZE -C + CUTNRM(1) = VEC1(2)*VEC2(3) - VEC1(3)*VEC2(2) CUTNRM(2) = VEC1(3)*VEC2(1) - VEC1(1)*VEC2(3) CUTNRM(3) = VEC1(1)*VEC2(2) - VEC1(2)*VEC2(1) @@ -68,24 +57,23 @@ SUBROUTINE PTSNRM( PLAPTS, INPT, CUTPT, CUTNRM , IERR) CUTNRM(2) = CUTNRM(2)/DIST CUTNRM(3) = CUTNRM(3)/DIST -C C IF THE NORMAL IS (0,0,0), THE ORIGINAL POINTS WERE COLINEAR -C + IF( ABS(CUTNRM(1)) .LT. TOL .AND. ABS(CUTNRM(2)) .LT. TOL $ .AND. ABS(CUTNRM(3)) .LT. TOL) THEN CALL PRTERR ('CMDERR', 'Points do not define a plane') IERR = 1 ELSE IERR = 0 -C + C USE THE SECOND INPUT POINT AS THE CHOSEN CUTPT -C + CUTPT(1) = PLAPTS(1,2) CUTPT(2) = PLAPTS(2,2) CUTPT(3) = PLAPTS(3,2) -C + C CHECK THE INPT TO SEE IF THE NORMAL IS THE CORRECT SENSE -C + VEC1(1) = INPT(1) - CUTPT(1) VEC1(2) = INPT(2) - CUTPT(2) VEC1(3) = INPT(3) - CUTPT(3) diff --git a/packages/seacas/applications/blot/qalab.f b/packages/seacas/applications/blot/qalab.f index 66221abc821b..b93522f284dd 100644 --- a/packages/seacas/applications/blot/qalab.f +++ b/packages/seacas/applications/blot/qalab.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/qepain.f b/packages/seacas/applications/blot/qepain.f index c88abdf83ff7..d24ea0d99571 100644 --- a/packages/seacas/applications/blot/qepain.f +++ b/packages/seacas/applications/blot/qepain.f @@ -1,32 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: qepain.f,v $ -C Revision 1.4 2009/03/25 12:36:47 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.3 2009/01/22 21:34:22 gdsjaar -C There were several inline dbnums common blocks. Replaced with the -C include so they all have the same size with the added variable types. -C -C Added minor support for nodeset and sideset variables. -C -C It can print the count and the names, but that is all -C at this time. -C -C Revision 1.2 1998/08/25 18:00:50 gdsjaar -C Fixed handling of 9-node quads in epaint mode. -C -C Revision 1.1 1994/04/07 20:08:44 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:55:42 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE QEPAIN (VARFAC, LENF, NLNKF, LINKF, HIDEF, & XN, YN, ZN, ISVOK, FMIN, FMAX, *) diff --git a/packages/seacas/applications/blot/qnpick.f b/packages/seacas/applications/blot/qnpick.f index 7cc938fbb424..2d9fc5e57a89 100644 --- a/packages/seacas/applications/blot/qnpick.f +++ b/packages/seacas/applications/blot/qnpick.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: qnpick.f,v $ -C Revision 1.2 2009/03/25 12:36:47 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 20:08:46 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:55:44 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE QNPICK (TYPE, ISUP, ISDEF, & A, KXN, KYN, KZN, KHIDEN, KNPSUR) diff --git a/packages/seacas/applications/blot/qpaint.f b/packages/seacas/applications/blot/qpaint.f index bbb4ca7a591c..a4430ecce0b1 100644 --- a/packages/seacas/applications/blot/qpaint.f +++ b/packages/seacas/applications/blot/qpaint.f @@ -1,36 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: qpaint.f,v $ -C Revision 1.4 2009/03/25 12:36:47 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.3 2009/01/22 21:34:22 gdsjaar -C There were several inline dbnums common blocks. Replaced with the -C include so they all have the same size with the added variable types. -C -C Added minor support for nodeset and sideset variables. -C -C It can print the count and the names, but that is all -C at this time. -C -C Revision 1.2 1998/07/15 14:44:19 gdsjaar -C General cleanup, remove compiler warnings -C -C Revision 1.1 1994/04/07 20:08:49 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.3 1993/08/04 15:59:23 gdsjaar -c Performed some optimization to speed up blot - special-cased the most -c common situation. -c -c Revision 1.2 1990/12/14 08:55:46 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE QPAINT (VARNP, LENF, NLNKF, LINKF, HIDEF, & XN, YN, ZN, XF, YF, ZF, ISVOK, FMIN, FMAX, *) diff --git a/packages/seacas/applications/blot/qsolid.f b/packages/seacas/applications/blot/qsolid.f index 339fd6975c9c..b7beb4a2e11f 100644 --- a/packages/seacas/applications/blot/qsolid.f +++ b/packages/seacas/applications/blot/qsolid.f @@ -1,33 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: qsolid.f,v $ -C Revision 1.3 2009/03/25 12:36:47 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.2 2009/01/22 21:34:22 gdsjaar -C There were several inline dbnums common blocks. Replaced with the -C include so they all have the same size with the added variable types. -C -C Added minor support for nodeset and sideset variables. -C -C It can print the count and the names, but that is all -C at this time. -C -C Revision 1.1 1994/04/07 20:08:52 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.3 1991/06/25 16:09:52 gdsjaar -c Fixed? problem with calls to ugrcol -- changed -c call ugrcol(idelb(ielb),...) to call ugrcol(ielb,...) -c -c Revision 1.2 1990/12/14 08:55:48 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE QSOLID (LENF, NLNKF, LINKF, HIDEF, XN, YN, ZN, IELBST, & BLKCOL, IDELB, *) diff --git a/packages/seacas/applications/blot/rainbow.f b/packages/seacas/applications/blot/rainbow.f index 6638a3dfeaae..88d73b9a3ddf 100644 --- a/packages/seacas/applications/blot/rainbow.f +++ b/packages/seacas/applications/blot/rainbow.f @@ -8,7 +8,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C This routine computes colors suitable for use in color level plots. @@ -40,7 +40,6 @@ subroutine rainbow(h, s, v, r, g, b) C computed from the FMC-1 color difference formula C Barco monitor, max(r,g,b)=1, n=61 magenta, 2 Jan 1986 - H = 60.0 * MOD(H / 1.5, 1.) I = INT(H) H = huettab(i) + (huettab(i+1) - huettab(i)) * (h - i) diff --git a/packages/seacas/applications/blot/rixid.f b/packages/seacas/applications/blot/rixid.f index e7681a6abd72..d92e62473b81 100644 --- a/packages/seacas/applications/blot/rixid.f +++ b/packages/seacas/applications/blot/rixid.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: rixid.f,v $ -C Revision 1.2 2009/03/25 12:36:47 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 20:09:57 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:56:25 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE RIXID (INLINE, IFLD, INTYP, CFIELD, IFIELD, & SELMSG, MAXSEL, IDSEL, NUMSEL, IXSEL, *) diff --git a/packages/seacas/applications/blot/rixint.f b/packages/seacas/applications/blot/rixint.f index 6bc771c7d72e..b098fecffd1e 100644 --- a/packages/seacas/applications/blot/rixint.f +++ b/packages/seacas/applications/blot/rixint.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/rixwrd.f b/packages/seacas/applications/blot/rixwrd.f index 2d3420bb3666..ae5208bcd488 100644 --- a/packages/seacas/applications/blot/rixwrd.f +++ b/packages/seacas/applications/blot/rixwrd.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/rmixint.f b/packages/seacas/applications/blot/rmixint.f index 7c6243209d55..baa9c4570dbc 100644 --- a/packages/seacas/applications/blot/rmixint.f +++ b/packages/seacas/applications/blot/rmixint.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/rndvar.f b/packages/seacas/applications/blot/rndvar.f index 7ce939768890..c77bed7a0dd1 100644 --- a/packages/seacas/applications/blot/rndvar.f +++ b/packages/seacas/applications/blot/rndvar.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/roteye.f b/packages/seacas/applications/blot/roteye.f index b89b43bfb9bd..e0ac5eed8e28 100644 --- a/packages/seacas/applications/blot/roteye.f +++ b/packages/seacas/applications/blot/roteye.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: roteye.f,v $ -C Revision 1.2 2009/03/25 12:36:47 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 20:10:16 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:56:38 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE ROTEYE (EYE, ROTCEN, ROTMAT, *) C======================================================================= diff --git a/packages/seacas/applications/blot/rotopt.blk b/packages/seacas/applications/blot/rotopt.blk index 4f5f7618887c..8c2c5f779f2c 100644 --- a/packages/seacas/applications/blot/rotopt.blk +++ b/packages/seacas/applications/blot/rotopt.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /ROTOPT/ NEWROT, ROTMAT(3,3), ROTCEN(3), EYE(3) diff --git a/packages/seacas/applications/blot/rotxyz.f b/packages/seacas/applications/blot/rotxyz.f index 9dee6f8efd50..88f76d09d0d6 100644 --- a/packages/seacas/applications/blot/rotxyz.f +++ b/packages/seacas/applications/blot/rotxyz.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: rotxyz.f,v $ -C Revision 1.2 2009/03/25 12:36:47 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 20:10:22 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:56:40 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE ROTXYZ (XYZ, ANG, ROTMAT) C======================================================================= diff --git a/packages/seacas/applications/blot/rotzm.f b/packages/seacas/applications/blot/rotzm.f index 19c009ec1aeb..29043255e87d 100644 --- a/packages/seacas/applications/blot/rotzm.f +++ b/packages/seacas/applications/blot/rotzm.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: rotzm.f,v $ -C Revision 1.2 2009/03/25 12:36:47 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 20:10:24 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:56:42 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE ROTZM (RDMESH, NNPSUR, NPSURF, XN, YN, ZN, & ROTMSH, ROTMAT, ROTCEN, ZMMESH, ZMCEN, *) diff --git a/packages/seacas/applications/blot/rxinta.f b/packages/seacas/applications/blot/rxinta.f index e60d33444e98..93c6cc87e2b8 100644 --- a/packages/seacas/applications/blot/rxinta.f +++ b/packages/seacas/applications/blot/rxinta.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/scacal.f b/packages/seacas/applications/blot/scacal.f index 6217e0513d58..de95d266d458 100644 --- a/packages/seacas/applications/blot/scacal.f +++ b/packages/seacas/applications/blot/scacal.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/scaelb.f b/packages/seacas/applications/blot/scaelb.f index b26ab2eab638..c50981830340 100644 --- a/packages/seacas/applications/blot/scaelb.f +++ b/packages/seacas/applications/blot/scaelb.f @@ -1,29 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: scaelb.f,v $ -C Revision 1.3 2009/03/25 12:36:47 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.2 2009/01/22 21:34:22 gdsjaar -C There were several inline dbnums common blocks. Replaced with the -C include so they all have the same size with the added variable types. -C -C Added minor support for nodeset and sideset variables. -C -C It can print the count and the names, but that is all -C at this time. -C -C Revision 1.1 1994/04/07 20:10:33 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:56:48 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE SCAELB (A, USESEL, IELBST, & VALMN, NUMMN, XYZMN, ISTMN, VALMX, NUMMX, XYZMX, ISTMX, diff --git a/packages/seacas/applications/blot/scaele.f b/packages/seacas/applications/blot/scaele.f index eed4c72b5e3e..18f003de9717 100644 --- a/packages/seacas/applications/blot/scaele.f +++ b/packages/seacas/applications/blot/scaele.f @@ -1,29 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: scaele.f,v $ -C Revision 1.3 2009/03/25 12:36:47 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.2 2009/01/22 21:34:22 gdsjaar -C There were several inline dbnums common blocks. Replaced with the -C include so they all have the same size with the added variable types. -C -C Added minor support for nodeset and sideset variables. -C -C It can print the count and the names, but that is all -C at this time. -C -C Revision 1.1 1994/04/07 20:10:36 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -CRevision 1.2 1990/12/14 08:56:50 gdsjaar -CAdded RCS Id and Log to all files -C C======================================================================= SUBROUTINE SCAELE (A, IVAR, & LENE, ISEVOK, NALIVR, ALIVE, VAR, WHOTIM, XE, YE, ZE, diff --git a/packages/seacas/applications/blot/scaglo.f b/packages/seacas/applications/blot/scaglo.f index 7a9f3884e501..b84a7532b4ca 100644 --- a/packages/seacas/applications/blot/scaglo.f +++ b/packages/seacas/applications/blot/scaglo.f @@ -1,29 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: scaglo.f,v $ -C Revision 1.3 2009/03/25 12:36:47 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.2 2009/01/22 21:34:22 gdsjaar -C There were several inline dbnums common blocks. Replaced with the -C include so they all have the same size with the added variable types. -C -C Added minor support for nodeset and sideset variables. -C -C It can print the count and the names, but that is all -C at this time. -C -C Revision 1.1 1994/04/07 20:10:39 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:56:52 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE SCAGLO (A, VAR, WHOTIM, & VALMIN, ISTMIN, VALMAX, ISTMAX) diff --git a/packages/seacas/applications/blot/scahis.f b/packages/seacas/applications/blot/scahis.f index fd9f7b95cfd4..671b9150c7ea 100644 --- a/packages/seacas/applications/blot/scahis.f +++ b/packages/seacas/applications/blot/scahis.f @@ -1,29 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: scahis.f,v $ -C Revision 1.3 2009/03/25 12:36:47 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.2 2009/01/22 21:34:22 gdsjaar -C There were several inline dbnums common blocks. Replaced with the -C include so they all have the same size with the added variable types. -C -C Added minor support for nodeset and sideset variables. -C -C It can print the count and the names, but that is all -C at this time. -C -C Revision 1.1 1994/04/07 20:10:42 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:56:54 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE SCAHIS (A, VAR, WHOTIM, & VALMIN, ISTMIN, VALMAX, ISTMAX) diff --git a/packages/seacas/applications/blot/scaini.f b/packages/seacas/applications/blot/scaini.f index 06fd6234d8c7..80002fe20e50 100644 --- a/packages/seacas/applications/blot/scaini.f +++ b/packages/seacas/applications/blot/scaini.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: scaini.f,v $ -C Revision 1.2 2009/03/25 12:36:47 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 20:10:45 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:56:56 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE SCAINI (NELB, NVAR, ISTMN) C======================================================================= diff --git a/packages/seacas/applications/blot/scal3d.f b/packages/seacas/applications/blot/scal3d.f index 76297eb19bed..f4ea32cd20a4 100644 --- a/packages/seacas/applications/blot/scal3d.f +++ b/packages/seacas/applications/blot/scal3d.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: scal3d.f,v $ -C Revision 1.2 2009/03/25 12:36:47 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 20:10:50 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:56:57 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE SCAL3D (MSCTYP, ROTMAT, ROTCEN, ALMESH, D2MESH) C======================================================================= diff --git a/packages/seacas/applications/blot/scalax.f b/packages/seacas/applications/blot/scalax.f index 337bf90873cb..a2d45a0a0654 100644 --- a/packages/seacas/applications/blot/scalax.f +++ b/packages/seacas/applications/blot/scalax.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: scalax.f,v $ -C Revision 1.2 2009/03/25 12:36:47 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 20:10:54 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:56:59 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE SCALAX C======================================================================= diff --git a/packages/seacas/applications/blot/scaler.f b/packages/seacas/applications/blot/scaler.f index d52235f05f43..acde9bb9cb9a 100644 --- a/packages/seacas/applications/blot/scaler.f +++ b/packages/seacas/applications/blot/scaler.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C====================================================================== diff --git a/packages/seacas/applications/blot/scanod.f b/packages/seacas/applications/blot/scanod.f index f1d855118c7d..d54b6200a7e3 100644 --- a/packages/seacas/applications/blot/scanod.f +++ b/packages/seacas/applications/blot/scanod.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: scanod.f,v $ -C Revision 1.2 2009/03/25 12:36:47 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 20:11:07 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:57:03 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE SCANOD (A, IVAR, VAR, WHOTIM, XN, YN, ZN, & VALMIN, NUMMIN, XYZMIN, ISTMIN, VALMAX, NUMMAX, XYZMAX, ISTMAX) diff --git a/packages/seacas/applications/blot/scaprt.f b/packages/seacas/applications/blot/scaprt.f index 3a8a23cfabe5..faddcf539a69 100644 --- a/packages/seacas/applications/blot/scaprt.f +++ b/packages/seacas/applications/blot/scaprt.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/scolor.f b/packages/seacas/applications/blot/scolor.f index 05025b6d722d..136c8a7173f3 100644 --- a/packages/seacas/applications/blot/scolor.f +++ b/packages/seacas/applications/blot/scolor.f @@ -1,33 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: scolor.f,v $ -C Revision 1.3 2009/03/25 12:36:47 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.2 2009/01/22 21:34:22 gdsjaar -C There were several inline dbnums common blocks. Replaced with the -C include so they all have the same size with the added variable types. -C -C Added minor support for nodeset and sideset variables. -C -C It can print the count and the names, but that is all -C at this time. -C -C Revision 1.1 1994/04/07 20:11:17 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1993/10/04 19:20:04 gdsjaar -c Fixed up message formats -c -c Revision 1.1 1993/09/15 20:44:00 gdsjaar -c Added shading (hidden 5) option to blot. Simple illumination model. -c -c C============================================================================ SUBROUTINE SCOLOR (INIT, INLINE, IFLD, INTYP, RFIELD, IFIELD, & CFIELD, SHDCOL, ISHDCL, IDELB) diff --git a/packages/seacas/applications/blot/selne.blk b/packages/seacas/applications/blot/selne.blk index 3152bdbdcb55..b2ba6adaa619 100644 --- a/packages/seacas/applications/blot/selne.blk +++ b/packages/seacas/applications/blot/selne.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /SELNE/ SELOK, NODVAR, NNENUM diff --git a/packages/seacas/applications/blot/setbck.f b/packages/seacas/applications/blot/setbck.f index 39799717f832..982be945ea43 100644 --- a/packages/seacas/applications/blot/setbck.f +++ b/packages/seacas/applications/blot/setbck.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C============================================================================ diff --git a/packages/seacas/applications/blot/setcol.f b/packages/seacas/applications/blot/setcol.f index 1a081f5da9f1..65426fb66ea4 100644 --- a/packages/seacas/applications/blot/setcol.f +++ b/packages/seacas/applications/blot/setcol.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C----------------------------------------------------------------------- @@ -32,7 +32,6 @@ subroutine setcol(nelblk, shdcol, ishdcl, ielbst, blkcol, idelb) save first data first /.TRUE./ - if (FIRST) THEN FIRST = .FALSE. call grcolu('ALTERNATE') @@ -159,31 +158,3 @@ subroutine setcol(nelblk, shdcol, ishdcl, ielbst, blkcol, idelb) return end C----------------------------------------------------------------------- -C $Log: setcol.f,v $ -C Revision 1.4 2009/03/25 12:36:47 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.3 1998/08/21 14:57:59 gdsjaar -C Fixed array bounds problem -C -C Revision 1.2 1998/06/12 15:53:36 gdsjaar -C 1. Problem with TIMES array. Blot accesses a dummy timestep even if -C there were no timesteps on the database. Array wasn't allocated, so -C writing off into never-never land. -C -C 2. Inconsistency among some common blocks. Some places weren't using -C the include but had the definition hardwired in. Removed those. -C -C 3. Added 'EXTERNAL BLKDAT' to all routines that used data values set -C in BLKDAT -C -C 4. Cleanup of some A vs. IA argument passing. -C -C Revision 1.1 1994/04/07 20:11:29 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.1 1993/10/22 18:56:42 gdsjaar -c Moved block shading routine to separate subroutine. -c - diff --git a/packages/seacas/applications/blot/setfor.f b/packages/seacas/applications/blot/setfor.f index 3933ce08cc98..d0261631c564 100644 --- a/packages/seacas/applications/blot/setfor.f +++ b/packages/seacas/applications/blot/setfor.f @@ -1,36 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: setfor.f,v $ -C Revision 1.4 2009/03/25 12:36:47 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.3 1998/06/12 15:53:38 gdsjaar -C 1. Problem with TIMES array. Blot accesses a dummy timestep even if -C there were no timesteps on the database. Array wasn't allocated, so -C writing off into never-never land. -C -C 2. Inconsistency among some common blocks. Some places weren't using -C the include but had the definition hardwired in. Removed those. -C -C 3. Added 'EXTERNAL BLKDAT' to all routines that used data values set -C in BLKDAT -C -C 4. Cleanup of some A vs. IA argument passing. -C -C Revision 1.2 1994/04/26 16:37:58 gdsjaar -C Fixed problem with setting background and foreground colors -C -c Revision 1.1 1994/04/07 20:11:33 gdsjaar -c Initial checkin of ACCESS/graphics/blotII2 -c -c Revision 1.2 1990/12/14 08:57:10 gdsjaar -c Added RCS Id and Log to all files -c C============================================================================ SUBROUTINE SETFOR (IFUNC, INLINE, IFLD, INTYP, CFIELD, *) C============================================================================ diff --git a/packages/seacas/applications/blot/setmod.f b/packages/seacas/applications/blot/setmod.f index f80a6e839736..bd7d2f44efbd 100644 --- a/packages/seacas/applications/blot/setmod.f +++ b/packages/seacas/applications/blot/setmod.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/setmsh.f b/packages/seacas/applications/blot/setmsh.f index 0dddda9f4906..3eb1856e5b4f 100644 --- a/packages/seacas/applications/blot/setmsh.f +++ b/packages/seacas/applications/blot/setmsh.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: setmsh.f,v $ -C Revision 1.2 2009/03/25 12:36:47 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 20:11:41 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -CRevision 1.2 1990/12/14 08:57:14 gdsjaar -CAdded RCS Id and Log to all files -C C======================================================================= SUBROUTINE SETMSH (IVIEW, MDEF, MNUM, MLIN, LTYP, & NNPS, ISNPS, NESS, ISESS, MMOD, MTYP, diff --git a/packages/seacas/applications/blot/setup.f b/packages/seacas/applications/blot/setup.f index d05fadbefc2a..3d03441783a9 100644 --- a/packages/seacas/applications/blot/setup.f +++ b/packages/seacas/applications/blot/setup.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: setup.f,v $ -C Revision 1.2 2009/03/25 12:36:47 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 20:11:45 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:57:16 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE SETUP (MSHDEF, ZMMESH) C======================================================================= diff --git a/packages/seacas/applications/blot/setvw.f b/packages/seacas/applications/blot/setvw.f index a929d49fa805..937b7ba83dfe 100644 --- a/packages/seacas/applications/blot/setvw.f +++ b/packages/seacas/applications/blot/setvw.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: setvw.f,v $ -C Revision 1.2 2009/03/25 12:36:47 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 20:11:49 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:57:18 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE SETVW (IVIEW, *) C======================================================================= diff --git a/packages/seacas/applications/blot/shade.f b/packages/seacas/applications/blot/shade.f index 14d3f0e24e8d..9a2d49508f89 100644 --- a/packages/seacas/applications/blot/shade.f +++ b/packages/seacas/applications/blot/shade.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/shaden.f b/packages/seacas/applications/blot/shaden.f index 67b0cb13252d..bfcbc382e924 100644 --- a/packages/seacas/applications/blot/shaden.f +++ b/packages/seacas/applications/blot/shaden.f @@ -1,39 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: shaden.f,v $ -C Revision 1.2 2009/03/25 12:36:48 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 20:11:57 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.5 1993/10/20 21:40:47 gdsjaar -c Added code to speed up plotting of zoomed meshes by eliminating -c polygons and sphere outside zoomed range. Use correct window coords -c this time. -c -c Revision 1.4 1993/10/14 13:51:46 gdsjaar -c Changed so return early if polygon faces away from viewer. Up version number -c -c Revision 1.3 1993/09/16 21:13:51 gdsjaar -c Redid method of writing rayshade file. Now, hidden 6 only writes file, -c but does not do shaded plot. Also, new file written each time rather -c than appending on to end of first file. -c -c Revision 1.2 1993/09/15 23:00:04 gdsjaar -c Initialize shdcol to 0, fix logic -c -c Revision 1.1 1993/09/15 20:44:02 gdsjaar -c Added shading (hidden 5) option to blot. Simple illumination model. -c -c Revision 1.2 1990/12/14 08:58:03 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE SHADEN (NLNKF, LINKF1, XN, YN, ZN, NCOL, LITE, NLIT, * MINCOL, KDIFF, KSPEC, SPEXP, WXMIN, WYMIN, WXMAX, WYMAX) @@ -60,14 +30,14 @@ SUBROUTINE SHADEN (NLNKF, LINKF1, XN, YN, ZN, NCOL, LITE, NLIT, DATA LSTCOL /0/ C... Coordinate System: -C + C ^ Y C | C | C | C | X C Z---------> -C + XMAX = -1.0e30 YMAX = -1.0e30 XMIN = 1.0e30 diff --git a/packages/seacas/applications/blot/shades.blk b/packages/seacas/applications/blot/shades.blk index 00643ee38bbd..d3a7e61aca62 100644 --- a/packages/seacas/applications/blot/shades.blk +++ b/packages/seacas/applications/blot/shades.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details PARAMETER (NCLSHD=14) diff --git a/packages/seacas/applications/blot/shdsph.f b/packages/seacas/applications/blot/shdsph.f index 092a8b0d247d..bb982a2ccff7 100644 --- a/packages/seacas/applications/blot/shdsph.f +++ b/packages/seacas/applications/blot/shdsph.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= @@ -93,7 +93,7 @@ SUBROUTINE SHDSPH (LENE, LINK, NUMLNK, NUMATR, XN, YN, ZN, ATRIB, IF ( FIRST ) THEN FIRST = .FALSE. END IF -C + C ... Calculate surface normals C ... On a unit sphere, normals are simply x,y,z coords of point. do 30 ip=1, npoly @@ -184,7 +184,7 @@ SUBROUTINE SHDSPH (LENE, LINK, NUMLNK, NUMATR, XN, YN, ZN, ATRIB, 120 continue 130 continue call pltflu -C + CALL GRCOLU('STANDARD') RETURN diff --git a/packages/seacas/applications/blot/shodev.f b/packages/seacas/applications/blot/shodev.f index e0ffc53644da..36baa6132c25 100644 --- a/packages/seacas/applications/blot/shodev.f +++ b/packages/seacas/applications/blot/shodev.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: shodev.f,v $ -C Revision 1.2 2009/03/25 12:36:48 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 20:12:10 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:57:20 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE SHODEV (SHOTYP) C======================================================================= diff --git a/packages/seacas/applications/blot/sholeg.f b/packages/seacas/applications/blot/sholeg.f index 0e35b9a3a09c..ec5fe7351c4c 100644 --- a/packages/seacas/applications/blot/sholeg.f +++ b/packages/seacas/applications/blot/sholeg.f @@ -1,23 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: sholeg.f,v $ -C Revision 1.2 2009/03/25 12:36:48 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 20:12:16 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.3 1993/09/24 17:32:43 gdsjaar -c Added an outline off/on command to toggle drawing of the view window outline -c -c Revision 1.2 1990/12/14 08:57:22 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE SHOLEG (SHOTYP, XYTYPE, DOQA, DOLEG, DOAXIS, CAPTN, * DOBOX) diff --git a/packages/seacas/applications/blot/shotsp.f b/packages/seacas/applications/blot/shotsp.f index ea161253c97c..0184e2380299 100644 --- a/packages/seacas/applications/blot/shotsp.f +++ b/packages/seacas/applications/blot/shotsp.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: shotsp.f,v $ -C Revision 1.2 2009/03/25 12:36:48 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 20:12:21 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:57:24 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE SHOTSP (WHONLY, TMIN, TMAX, DELT, NINTV, NPTIMS) C======================================================================= diff --git a/packages/seacas/applications/blot/shptim.f b/packages/seacas/applications/blot/shptim.f index 315078d4e929..98a865956668 100644 --- a/packages/seacas/applications/blot/shptim.f +++ b/packages/seacas/applications/blot/shptim.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/sizes.blk b/packages/seacas/applications/blot/sizes.blk index 3d5af277ff8b..b1b1c68ee3c2 100644 --- a/packages/seacas/applications/blot/sizes.blk +++ b/packages/seacas/applications/blot/sizes.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /SIZES/ NPSIZ diff --git a/packages/seacas/applications/blot/solid.f b/packages/seacas/applications/blot/solid.f index 83816d4ca02e..f51f22944e72 100644 --- a/packages/seacas/applications/blot/solid.f +++ b/packages/seacas/applications/blot/solid.f @@ -1,32 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: solid.f,v $ -C Revision 1.3 2009/03/25 12:36:48 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.2 2009/01/22 21:34:22 gdsjaar -C There were several inline dbnums common blocks. Replaced with the -C include so they all have the same size with the added variable types. -C -C Added minor support for nodeset and sideset variables. -C -C It can print the count and the names, but that is all -C at this time. -C -C Revision 1.1 1994/04/07 20:13:40 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.3 1992/06/05 22:23:58 gdsjaar -c Fixed problem with ugrcol -- now uses iblk instead of idelb(iblk) -c -c Revision 1.2 1990/12/14 08:58:01 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE SOLID (LENF, NLNKF, LINKF, NXFAC, IXFAC, & XN, YN, ZN, IELBST, BLKCOL, IDELB, *) diff --git a/packages/seacas/applications/blot/solidf.f b/packages/seacas/applications/blot/solidf.f index 30ebee6abf27..25012d809852 100644 --- a/packages/seacas/applications/blot/solidf.f +++ b/packages/seacas/applications/blot/solidf.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: solidf.f,v $ -C Revision 1.2 2009/03/25 12:36:48 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 20:13:44 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:58:03 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE SOLIDF (NLNKF, LINKF1, XN, YN, ZN) C======================================================================= diff --git a/packages/seacas/applications/blot/sorlnk.f b/packages/seacas/applications/blot/sorlnk.f index e09faf3bf8f2..1d7f61f34f73 100644 --- a/packages/seacas/applications/blot/sorlnk.f +++ b/packages/seacas/applications/blot/sorlnk.f @@ -1,29 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: sorlnk.f,v $ -C Revision 1.3 2009/03/25 12:36:48 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.2 2009/01/22 21:34:22 gdsjaar -C There were several inline dbnums common blocks. Replaced with the -C include so they all have the same size with the added variable types. -C -C Added minor support for nodeset and sideset variables. -C -C It can print the count and the names, but that is all -C at this time. -C -C Revision 1.1 1994/04/07 20:13:50 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:58:05 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE SORLNK (A, NSETS, NEWELB, & LENF, NLNKF, LINKF, IF2EL, IF2EL2, IE2ELB) diff --git a/packages/seacas/applications/blot/sorlnx.f b/packages/seacas/applications/blot/sorlnx.f index 7c2d6120e5bf..91f3e94eb0ec 100644 --- a/packages/seacas/applications/blot/sorlnx.f +++ b/packages/seacas/applications/blot/sorlnx.f @@ -1,29 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: sorlnx.f,v $ -C Revision 1.3 2009/03/25 12:36:48 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.2 2009/01/22 21:34:22 gdsjaar -C There were several inline dbnums common blocks. Replaced with the -C include so they all have the same size with the added variable types. -C -C Added minor support for nodeset and sideset variables. -C -C It can print the count and the names, but that is all -C at this time. -C -C Revision 1.1 1994/04/07 20:13:53 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:58:07 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE SORLNX (NSETS, NEWELB, IE2ELB, & NLNKF, LENSC, LINKSC, IF2ESC, IF22SC, diff --git a/packages/seacas/applications/blot/spchk.f b/packages/seacas/applications/blot/spchk.f index 976a708d559e..90385f57d6ba 100644 --- a/packages/seacas/applications/blot/spchk.f +++ b/packages/seacas/applications/blot/spchk.f @@ -1,29 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: spchk.f,v $ -C Revision 1.3 2009/03/25 12:36:48 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.2 2009/01/22 21:34:22 gdsjaar -C There were several inline dbnums common blocks. Replaced with the -C include so they all have the same size with the added variable types. -C -C Added minor support for nodeset and sideset variables. -C -C It can print the count and the names, but that is all -C at this time. -C -C Revision 1.1 1994/04/07 20:13:58 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:58:08 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE SPCHK (PRTOK, OKAY) C======================================================================= diff --git a/packages/seacas/applications/blot/spcomd.f b/packages/seacas/applications/blot/spcomd.f index 89e2b280eab3..c3ec75d1d8fb 100644 --- a/packages/seacas/applications/blot/spcomd.f +++ b/packages/seacas/applications/blot/spcomd.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= @@ -212,7 +212,6 @@ SUBROUTINE SPCOMD (A, INLINE, & CFIELD, NAMES, LIDSP, NAMLEN) ENDIF - SELOK = .FALSE. NODVAR = .TRUE. NNENUM = 0 diff --git a/packages/seacas/applications/blot/spdseg.f b/packages/seacas/applications/blot/spdseg.f index 6ad124b072a3..74ef694f99a2 100644 --- a/packages/seacas/applications/blot/spdseg.f +++ b/packages/seacas/applications/blot/spdseg.f @@ -1,25 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: spdseg.f,v $ -C Revision 1.3 2009/03/25 12:36:48 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.2 1999/03/09 19:41:42 gdsjaar -C Fixed missing parameter definition of MSHBOR in blotII2.f -C -C Cleaned up parameters and common blocks in other routines. -C -C Revision 1.1 1994/04/07 20:14:06 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -CRevision 1.2 1990/12/14 08:58:13 gdsjaar -CAdded RCS Id and Log to all files -C C======================================================================= SUBROUTINE SPDSEG (A, NENUM, IE2ELB, ISEVOK, & NSEGV, IXSEGV, KSEGEL) diff --git a/packages/seacas/applications/blot/spdsg1.f b/packages/seacas/applications/blot/spdsg1.f index 1cfeb4b0841c..831d3398c4dd 100644 --- a/packages/seacas/applications/blot/spdsg1.f +++ b/packages/seacas/applications/blot/spdsg1.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: spdsg1.f,v $ -C Revision 1.2 2009/03/25 12:36:48 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 20:14:10 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:58:15 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE SPDSG1 (NNENUM, NENUM, IE2ELB, ISEVOK, NEL, ISEGEL) C======================================================================= diff --git a/packages/seacas/applications/blot/sphele.blk b/packages/seacas/applications/blot/sphele.blk index cab066183842..df6805f92a38 100644 --- a/packages/seacas/applications/blot/sphele.blk +++ b/packages/seacas/applications/blot/sphele.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C ... NPTSPX is maximum number of segments allowed for sphere approx. @@ -9,7 +9,6 @@ C ... NPTSPX is maximum number of segments allowed for sphere approx. COMMON /SPHELE/ SPHPLT, DEFRAD, * CS(0:NPTSPX),SN(0:NPTSPX),XS(0:NPTSPX),YS(0:NPTSPX) - INTEGER SPHPLT C > 0 if elements are to be plotted as spheres. C < 0 if elements are to be plotted as filled spheres. diff --git a/packages/seacas/applications/blot/sphere.blk b/packages/seacas/applications/blot/sphere.blk index 5819132f5606..b0d42c54e71e 100644 --- a/packages/seacas/applications/blot/sphere.blk +++ b/packages/seacas/applications/blot/sphere.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C ---- NPTS = 41, NPOLY = 32 diff --git a/packages/seacas/applications/blot/splab.F b/packages/seacas/applications/blot/splab.F index a0c32f0baa22..e128b9ba93f0 100644 --- a/packages/seacas/applications/blot/splab.F +++ b/packages/seacas/applications/blot/splab.F @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/splabn.f b/packages/seacas/applications/blot/splabn.f index 46ea148309ba..7fc58b462993 100644 --- a/packages/seacas/applications/blot/splabn.f +++ b/packages/seacas/applications/blot/splabn.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/spmain.f b/packages/seacas/applications/blot/spmain.f index 093831e6dfad..04117932ecb5 100644 --- a/packages/seacas/applications/blot/spmain.f +++ b/packages/seacas/applications/blot/spmain.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/spplot.f b/packages/seacas/applications/blot/spplot.f index 30acbfef6e7d..9e50a633f620 100644 --- a/packages/seacas/applications/blot/spplot.f +++ b/packages/seacas/applications/blot/spplot.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/spplt1.f b/packages/seacas/applications/blot/spplt1.f index e19a37e58a4d..ef660535e663 100644 --- a/packages/seacas/applications/blot/spplt1.f +++ b/packages/seacas/applications/blot/spplt1.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/spread.f b/packages/seacas/applications/blot/spread.f index 9a3410df7828..56abd54afd5b 100644 --- a/packages/seacas/applications/blot/spread.f +++ b/packages/seacas/applications/blot/spread.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/spsegm.f b/packages/seacas/applications/blot/spsegm.f index a7715290aa16..f937bd075250 100644 --- a/packages/seacas/applications/blot/spsegm.f +++ b/packages/seacas/applications/blot/spsegm.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: spsegm.f,v $ -C Revision 1.2 2009/03/25 12:36:48 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 20:14:55 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:58:29 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE SPSEGM (NNE, ISEGEL, ISTART, IEND) C======================================================================= diff --git a/packages/seacas/applications/blot/spshow.f b/packages/seacas/applications/blot/spshow.f index 2e5cb8b592f3..86b27300ef88 100644 --- a/packages/seacas/applications/blot/spshow.f +++ b/packages/seacas/applications/blot/spshow.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/spstor.f b/packages/seacas/applications/blot/spstor.f index 3811c975d4ce..7bab59e3533f 100644 --- a/packages/seacas/applications/blot/spstor.f +++ b/packages/seacas/applications/blot/spstor.f @@ -1,25 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: spstor.f,v $ -C Revision 1.3 2009/03/25 12:36:48 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.2 1999/03/09 19:41:43 gdsjaar -C Fixed missing parameter definition of MSHBOR in blotII2.f -C -C Cleaned up parameters and common blocks in other routines. -C -C Revision 1.1 1994/04/07 20:15:05 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:58:33 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE SPSTOR (A, ISTEP, TYP, NWRDS, NVAR, NENUM, & PLTVAL, DATA) diff --git a/packages/seacas/applications/blot/sptrnd.f b/packages/seacas/applications/blot/sptrnd.f index 848973aa1fd9..5351c7845951 100644 --- a/packages/seacas/applications/blot/sptrnd.f +++ b/packages/seacas/applications/blot/sptrnd.f @@ -1,25 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: sptrnd.f,v $ -C Revision 1.3 2009/03/25 12:36:48 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.2 1999/03/09 19:41:43 gdsjaar -C Fixed missing parameter definition of MSHBOR in blotII2.f -C -C Cleaned up parameters and common blocks in other routines. -C -C Revision 1.1 1994/04/07 20:15:10 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:58:35 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE SPTRND (A, MXSTEP, TYP, NWRDS, NVAR, DATA) C======================================================================= diff --git a/packages/seacas/applications/blot/spvars.blk b/packages/seacas/applications/blot/spvars.blk index 41cf8b0fe444..54aa8a45d684 100644 --- a/packages/seacas/applications/blot/spvars.blk +++ b/packages/seacas/applications/blot/spvars.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /SPVARS/ NSPVAR, ISVID(MXSVAR) diff --git a/packages/seacas/applications/blot/sqrlim.f b/packages/seacas/applications/blot/sqrlim.f index 5f9e5444b8c9..1c53b3376a3c 100644 --- a/packages/seacas/applications/blot/sqrlim.f +++ b/packages/seacas/applications/blot/sqrlim.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: sqrlim.f,v $ -C Revision 1.2 2009/03/25 12:36:48 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 20:15:17 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:58:37 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE SQRLIM (RDMESH, SQMESH) C======================================================================= diff --git a/packages/seacas/applications/blot/sqzixv.f b/packages/seacas/applications/blot/sqzixv.f index 6fc35457104f..9192ee18f235 100644 --- a/packages/seacas/applications/blot/sqzixv.f +++ b/packages/seacas/applications/blot/sqzixv.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: sqzixv.f,v $ -C Revision 1.2 2009/03/25 12:36:48 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 20:15:26 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:58:39 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE SQZIXV (NNE, ISEGEL, VALIN, VALOUT) C======================================================================= diff --git a/packages/seacas/applications/blot/sqzlgv.f b/packages/seacas/applications/blot/sqzlgv.f index 4684b1aa0cb7..153fb407419e 100644 --- a/packages/seacas/applications/blot/sqzlgv.f +++ b/packages/seacas/applications/blot/sqzlgv.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: sqzlgv.f,v $ -C Revision 1.2 2009/03/25 12:36:48 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 20:15:34 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:58:41 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE SQZLGV (NPTIMS, IPTIMS, WHOTIM, VALIN, NPTOUT, VALOUT) C======================================================================= diff --git a/packages/seacas/applications/blot/sqztpv.f b/packages/seacas/applications/blot/sqztpv.f index e900c2bf7afe..1b30468d1005 100644 --- a/packages/seacas/applications/blot/sqztpv.f +++ b/packages/seacas/applications/blot/sqztpv.f @@ -1,25 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: sqztpv.f,v $ -C Revision 1.3 2009/03/25 12:36:48 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.2 1999/03/09 19:41:43 gdsjaar -C Fixed missing parameter definition of MSHBOR in blotII2.f -C -C Cleaned up parameters and common blocks in other routines. -C -C Revision 1.1 1994/04/07 20:15:43 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -CRevision 1.2 1990/12/14 08:58:44 gdsjaar -CAdded RCS Id and Log to all files -C C======================================================================= SUBROUTINE SQZTPV (NPTIMS, IPTIMS, WHOTIM, NPTS, PLTVAL) C======================================================================= diff --git a/packages/seacas/applications/blot/ssmemy.f b/packages/seacas/applications/blot/ssmemy.f index 5c6d1d736764..77b47f4f180c 100644 --- a/packages/seacas/applications/blot/ssmemy.f +++ b/packages/seacas/applications/blot/ssmemy.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/stclst.f b/packages/seacas/applications/blot/stclst.f index fe993453b58d..782861750fef 100644 --- a/packages/seacas/applications/blot/stclst.f +++ b/packages/seacas/applications/blot/stclst.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C============================================================================ @@ -9,16 +9,16 @@ SUBROUTINE STCLST(MODULE) C============================================================================ C --*** STCLST *** (BLOT) set color list mapping -C + C --Parameters: -C + C -- MODULE - character name of the subroutine module setting the colors -C + C PURPOSE: SETS THE DESIRED MAPPING OF THE DEFAULT COLORS. THE ROUTINE C WAS WRITTEN TO ALLOW THE USER TO CHANGE THE MAPPING FOR C DIFFERENT PROGRAMS, SPECIFICALLY MAPPING ONE WAY FOR CONTOURS C AND PAINTING AND ANOTHER FOR PLOTTING. -C + CHARACTER*(*) MODULE include 'params.blk' include 'cmap-lst.blk' @@ -36,9 +36,8 @@ SUBROUTINE STCLST(MODULE) & 'MAGENTA ', 'CYAN ', 'GREEN ', & 'YELLOW ', 'RED ', ' ' / -C C SET COLLST TO EITHER LIST DEPENDING ON THE VALUE OF MODULE -C + IF(LSTMOD .NE. MODULE(1:1)) THEN LSTMOD = MODULE(1:1) @@ -61,6 +60,5 @@ SUBROUTINE STCLST(MODULE) 30 CONTINUE END IF - RETURN END diff --git a/packages/seacas/applications/blot/surf2d.f b/packages/seacas/applications/blot/surf2d.f index 01befd27caaa..936235a04390 100644 --- a/packages/seacas/applications/blot/surf2d.f +++ b/packages/seacas/applications/blot/surf2d.f @@ -1,29 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: surf2d.f,v $ -C Revision 1.3 2009/03/25 12:36:48 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.2 2009/01/22 21:34:22 gdsjaar -C There were several inline dbnums common blocks. Replaced with the -C include so they all have the same size with the added variable types. -C -C Added minor support for nodeset and sideset variables. -C -C It can print the count and the names, but that is all -C at this time. -C -C Revision 1.1 1994/04/07 20:15:58 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:58:50 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE SURF2D (LENE, NLNKE, LINKE, & LENF, NLNKF, LINKF, IF2EL, NFACES, LENLNK) diff --git a/packages/seacas/applications/blot/surf3d.f b/packages/seacas/applications/blot/surf3d.f index 2e1be73c9f03..34512209bd8d 100644 --- a/packages/seacas/applications/blot/surf3d.f +++ b/packages/seacas/applications/blot/surf3d.f @@ -1,29 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: surf3d.f,v $ -C Revision 1.3 2009/03/25 12:36:48 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.2 2009/01/22 21:34:22 gdsjaar -C There were several inline dbnums common blocks. Replaced with the -C include so they all have the same size with the added variable types. -C -C Added minor support for nodeset and sideset variables. -C -C It can print the count and the names, but that is all -C at this time. -C -C Revision 1.1 1994/04/07 20:16:04 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:58:52 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE SURF3D (LENSC, NLNKSC, LINKSC, IF2ESC, & LENF, NLNKF, LINKF, IF2EL, IF2EL2, NFACES, LENLNK) diff --git a/packages/seacas/applications/blot/symbol.f b/packages/seacas/applications/blot/symbol.f index c528c7b3e63d..1d9c691ca00e 100644 --- a/packages/seacas/applications/blot/symbol.f +++ b/packages/seacas/applications/blot/symbol.f @@ -1,10 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -c C======================================================================= SUBROUTINE SYMBOL_BL (ISYTYP, VARFAC, LENF, NLNKF, HIDEF, & XF, YF, ZF, ISVOK, BLKCOL, IDELB, *) diff --git a/packages/seacas/applications/blot/symsph.F b/packages/seacas/applications/blot/symsph.F index f42c6e56508f..72db2df0a431 100644 --- a/packages/seacas/applications/blot/symsph.F +++ b/packages/seacas/applications/blot/symsph.F @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= @@ -92,7 +92,7 @@ SUBROUTINE SYMSPH (LENE, LINK, NUMLNK, NUMATR, XN, YN, ZN, ATRIB, SN(N) = SIN(ANGLE) ANGLE = ANGLE + ANGINC 100 CONTINUE -C + iel = 0 IRAD = 1 ILNK = 1 @@ -132,13 +132,13 @@ SUBROUTINE SYMSPH (LENE, LINK, NUMLNK, NUMATR, XN, YN, ZN, ATRIB, if (is3dim) then call indexx (zn, ispsor, numsph, .FALSE.) end if -C + C CHECK TO SEE IF CONTOURING IS ON -C + CONTOR = (MODDET .EQ. 'CONTOUR') -C + C IF CONTOURING MODE, SET ALTERNATE COLORS -C + IF(CONTOR) THEN CALL GRCOLU('ALTERNATE') END IF @@ -191,9 +191,9 @@ SUBROUTINE SYMSPH (LENE, LINK, NUMLNK, NUMATR, XN, YN, ZN, ATRIB, END IF 130 continue call pltflu -C + C IF CONTOURING MODE, SET STANDARD COLORS -C + IF(CONTOR) THEN CALL GRCOLU('STANDARD') END IF diff --git a/packages/seacas/applications/blot/textur.f b/packages/seacas/applications/blot/textur.f index af2114e67188..7f7cf4a75f26 100644 --- a/packages/seacas/applications/blot/textur.f +++ b/packages/seacas/applications/blot/textur.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details SUBROUTINE textur(sat, ncolors, map, invert, rmult, gmult, bmult) diff --git a/packages/seacas/applications/blot/times.blk b/packages/seacas/applications/blot/times.blk index 7b0115fc70c9..784f41b0d2d4 100644 --- a/packages/seacas/applications/blot/times.blk +++ b/packages/seacas/applications/blot/times.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /TIMES/ NPTIMS, NPTIMW, TMIN, TMAX, DELT, NINTV, diff --git a/packages/seacas/applications/blot/tnodes.f b/packages/seacas/applications/blot/tnodes.f index 943bc80932f9..e9272f8c067c 100644 --- a/packages/seacas/applications/blot/tnodes.f +++ b/packages/seacas/applications/blot/tnodes.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/tpchk.f b/packages/seacas/applications/blot/tpchk.f index 02719621237f..d4336bdc3d45 100644 --- a/packages/seacas/applications/blot/tpchk.f +++ b/packages/seacas/applications/blot/tpchk.f @@ -1,29 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: tpchk.f,v $ -C Revision 1.3 2009/03/25 12:36:48 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.2 2009/01/22 21:34:22 gdsjaar -C There were several inline dbnums common blocks. Replaced with the -C include so they all have the same size with the added variable types. -C -C Added minor support for nodeset and sideset variables. -C -C It can print the count and the names, but that is all -C at this time. -C -C Revision 1.1 1994/04/07 20:16:27 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:58:58 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE TPCHK (PRTOK, OKAY) C======================================================================= diff --git a/packages/seacas/applications/blot/tpcomd.f b/packages/seacas/applications/blot/tpcomd.f index ad2170b89880..e8d89b791d19 100644 --- a/packages/seacas/applications/blot/tpcomd.f +++ b/packages/seacas/applications/blot/tpcomd.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= @@ -111,7 +111,6 @@ SUBROUTINE TPCOMD (A, INLINE, DATA LASTX /-1/ DATA LASTY /-1/ - C --Command table follows. Remember to change the dimensioned size when C --changing the table. DATA CMDTBL / diff --git a/packages/seacas/applications/blot/tplab.F b/packages/seacas/applications/blot/tplab.F index e3e13b973d72..642e21ff4fc3 100644 --- a/packages/seacas/applications/blot/tplab.F +++ b/packages/seacas/applications/blot/tplab.F @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/tplabn.f b/packages/seacas/applications/blot/tplabn.f index bce7649527c4..4704a749b791 100644 --- a/packages/seacas/applications/blot/tplabn.f +++ b/packages/seacas/applications/blot/tplabn.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/tplabv.f b/packages/seacas/applications/blot/tplabv.f index f6dc2d8bbe9f..39e57e616d30 100644 --- a/packages/seacas/applications/blot/tplabv.f +++ b/packages/seacas/applications/blot/tplabv.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/tpmain.f b/packages/seacas/applications/blot/tpmain.f index 9b954ec48ad0..4248e62166c1 100644 --- a/packages/seacas/applications/blot/tpmain.f +++ b/packages/seacas/applications/blot/tpmain.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/tpplot.f b/packages/seacas/applications/blot/tpplot.f index 26c50565c561..7a181811d9aa 100644 --- a/packages/seacas/applications/blot/tpplot.f +++ b/packages/seacas/applications/blot/tpplot.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= @@ -208,8 +208,6 @@ SUBROUTINE TPPLOT (NEUTRL, MAXPTS, NPTS, TIMLIM, PLTVAL, IF (GRABRT()) GOTO 130 CALL GRNCRV (LABSID, NP, NPTS(N), - - & PLTVAL(1,NX), PLTVAL(1,NY), (LINTYP .EQ. 0)) END IF diff --git a/packages/seacas/applications/blot/tpread.f b/packages/seacas/applications/blot/tpread.f index 347b1419fc62..d1dfc1680d63 100644 --- a/packages/seacas/applications/blot/tpread.f +++ b/packages/seacas/applications/blot/tpread.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/tpshow.f b/packages/seacas/applications/blot/tpshow.f index 1308dc3bd6c1..632d0c809c28 100644 --- a/packages/seacas/applications/blot/tpshow.f +++ b/packages/seacas/applications/blot/tpshow.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/tpvars.blk b/packages/seacas/applications/blot/tpvars.blk index 91446d94032d..10b54741d624 100644 --- a/packages/seacas/applications/blot/tpvars.blk +++ b/packages/seacas/applications/blot/tpvars.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /TPVARS/ NTPCRV, NTPVAR, TIMPLT, diff --git a/packages/seacas/applications/blot/ugrcol.f b/packages/seacas/applications/blot/ugrcol.f index 86756aeb6beb..1a7dc6a85068 100644 --- a/packages/seacas/applications/blot/ugrcol.f +++ b/packages/seacas/applications/blot/ugrcol.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= @@ -246,4 +246,3 @@ SUBROUTINE UGRCOL (INDX, BLKCOL) RETURN END - diff --git a/packages/seacas/applications/blot/unrot.f b/packages/seacas/applications/blot/unrot.f index d02625aa96c4..96eb3a05e0a2 100644 --- a/packages/seacas/applications/blot/unrot.f +++ b/packages/seacas/applications/blot/unrot.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: unrot.f,v $ -C Revision 1.2 2009/03/25 12:36:49 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 20:17:14 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:59:23 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE UNROT (NUM, NPROT, ROTMAT, ROTCEN, & HZ, VT, PD, XN, YN, ZN) diff --git a/packages/seacas/applications/blot/upcase.f b/packages/seacas/applications/blot/upcase.f index b5a3db8bce68..3785d19bc245 100644 --- a/packages/seacas/applications/blot/upcase.f +++ b/packages/seacas/applications/blot/upcase.f @@ -1,85 +1,73 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: upcase.f,v $ -C Revision 1.2 2009/03/25 12:36:49 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 20:17:19 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:59:25 gdsjaar -c Added RCS Id and Log to all files -c c ====================================================================== c ====================================================================== c ====================================================================== c ====================================================================== c ====================================================================== c ====================================================================== -c + c ROUTINE: Upcase -c + c DESCRIPTION: Changes ASCII text strings to upper case. -c + c AUTHOR: John H. Glick c Sandia National Laboratories c Division 1511 -c + c DATE: December 20, 1988 -c + c TYPE OF SUBPROGRAM: subroutine -c + c USAGE: call upcase ( string ) -c + c PARAMETERS: -c + c character*(*) string -- ( Input and Output ) c String that is to be converted to c upper case. -c + c CALLS: -c + c len (INTRINSIC) -- returns length of character string. c ichar (INTRINSIC) -- returns ASCII integer value c of passed character. c char (INTRINSIC) -- returns ASCII character assigned c to passed integer value. -c -c + c GLOBAL VARIABLES REFERENCED: none -c + c SYSTEM DEPENDENCIES: none -c + c CALLING ROUTINE(S): filhnd (BLOT) -c + c ====================================================================== c ====================================================================== -c + subroutine upcase_bl ( string ) -c + c ********************************************************************** -c + c parameter -c + character*(*) string -c + c ********************************************************************** -c + c declarations -c + integer length c length of character string integer ccode c integer id of an ASCII character -c + c*********************************************************************** c*********************************************************************** -c + length = len(string) do 100 i = 1,length ccode = ichar(string(i:i)) diff --git a/packages/seacas/applications/blot/usrsym.F b/packages/seacas/applications/blot/usrsym.F index 5c98bb003d16..df357cca1136 100644 --- a/packages/seacas/applications/blot/usrsym.F +++ b/packages/seacas/applications/blot/usrsym.F @@ -1,26 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: usrsym.F,v $ -C Revision 1.3 2009/03/25 12:36:49 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.2 1997/06/26 17:51:37 caforsy -C Substituted if NeedsDoubleEscape for ifdef sun. This define is needed on cougar, sun and ibm platforms -C -C Revision 1.1 1994/04/07 20:17:22 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -CRevision 1.3 1993/07/08 21:57:17 gdsjaar -CReplaced SUN with sun in all ifdef statements. -C -CRevision 1.2 1990/12/14 08:59:27 gdsjaar -CAdded RCS Id and Log to all files -C C======================================================================= SUBROUTINE USRSYM (ISYTYP, IS3DIM, X0, Y0, Z0, EVAR, SCALE) C======================================================================= diff --git a/packages/seacas/applications/blot/vec.f b/packages/seacas/applications/blot/vec.f index 8c75bcd5122a..eb907796da36 100644 --- a/packages/seacas/applications/blot/vec.f +++ b/packages/seacas/applications/blot/vec.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: vec.f,v $ -C Revision 1.2 2009/03/25 12:36:49 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 20:17:27 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:59:29 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE VEC (IS3DIM, X0, Y0, Z0, XVAR, YVAR, ZVAR, & VECSCL, VWSCL) diff --git a/packages/seacas/applications/blot/vector.f b/packages/seacas/applications/blot/vector.f index dc570e0dae50..823c0b46ae22 100644 --- a/packages/seacas/applications/blot/vector.f +++ b/packages/seacas/applications/blot/vector.f @@ -1,27 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: vector.f,v $ -C Revision 1.3 2009/03/25 12:36:49 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.2 1994/07/21 15:28:07 gdsjaar -C Moved more commons into includes. -C -c Revision 1.1 1994/04/07 20:17:31 gdsjaar -c Initial checkin of ACCESS/graphics/blotII2 -c -c Revision 1.3 1991/06/25 16:10:02 gdsjaar -c Fixed? problem with calls to ugrcol -- changed -c call ugrcol(idelb(ielb),...) to call ugrcol(ielb,...) -c -c Revision 1.2 1990/12/14 08:59:31 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE VECTOR (ISYTYP, VAR, NUM, LENF, NLNKF, HIDENE, & XNE, YNE, ZNE, IN2ELB, ISVOK, VECMAX, BLKCOL, IDELB, *) @@ -370,4 +352,4 @@ SUBROUTINE VECTORN (ISYTYP, VAR, NUM, HIDENE, RETURN END - + diff --git a/packages/seacas/applications/blot/views.blk b/packages/seacas/applications/blot/views.blk index 74345d979de8..14b1e8fb94ee 100644 --- a/packages/seacas/applications/blot/views.blk +++ b/packages/seacas/applications/blot/views.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /VIEWS/ MULTIM, diff --git a/packages/seacas/applications/blot/viridis.f b/packages/seacas/applications/blot/viridis.f index 9eb94caf2a33..159f45fd45bc 100644 --- a/packages/seacas/applications/blot/viridis.f +++ b/packages/seacas/applications/blot/viridis.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details subroutine viridis(icol, ncol, r, g, b) diff --git a/packages/seacas/applications/blot/wrtcsv.f b/packages/seacas/applications/blot/wrtcsv.f index d74eafcbcb8e..2304f4a5a8f2 100644 --- a/packages/seacas/applications/blot/wrtcsv.f +++ b/packages/seacas/applications/blot/wrtcsv.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= @@ -115,4 +115,3 @@ SUBROUTINE WRTCSV (NCRV, MAXPTS, NPTS, PTS, TXLAB, NAMES, DOLEGN, RETURN END - diff --git a/packages/seacas/applications/blot/wrtneu.f b/packages/seacas/applications/blot/wrtneu.f index 48e4bbbb6c1c..6ce3beffae2e 100644 --- a/packages/seacas/applications/blot/wrtneu.f +++ b/packages/seacas/applications/blot/wrtneu.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= @@ -138,4 +138,3 @@ SUBROUTINE WRTNEU (NPTS, XPTS, YPTS, PLTITL, TXLAB, TYLAB) RETURN END - diff --git a/packages/seacas/applications/blot/wrtray.f b/packages/seacas/applications/blot/wrtray.f index 14b510c7dc33..fca57a95bb1d 100644 --- a/packages/seacas/applications/blot/wrtray.f +++ b/packages/seacas/applications/blot/wrtray.f @@ -1,29 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: wrtray.f,v $ -C Revision 1.3 2009/03/25 12:36:49 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.2 1994/07/21 15:28:20 gdsjaar -C Moved more commons into includes. -C -c Revision 1.1 1994/04/07 20:17:45 gdsjaar -c Initial checkin of ACCESS/graphics/blotII2 -c -c Revision 1.3 1993/09/20 18:15:40 gdsjaar -c Changed to output block id instead of number, changed output format slightly -c -c Revision 1.2 1993/09/16 21:13:51 gdsjaar -c Redid method of writing rayshade file. Now, hidden 6 only writes file, -c but does not do shaded plot. Also, new file written each time rather -c than appending on to end of first file. -c -c C======================================================================= SUBROUTINE wrtray (LENF, NLNKF, LINKF, NXFAC, IXFAC, & XN, YN, ZN, IELBST, BLKCOL, IDELB, *) @@ -136,7 +116,6 @@ SUBROUTINE wrtray (LENF, NLNKF, LINKF, NXFAC, IXFAC, 100 CONTINUE - write (*,*) 'RAYSHADE polygon file written to ',filnam(:lnam) write (*,*) write (*,920) 'X', xmin, xmax, xmax-xmin, (xmin+xmax)/2 diff --git a/packages/seacas/applications/blot/xyaxis.f b/packages/seacas/applications/blot/xyaxis.f index 0cd2ba5f595b..f825e97cd85b 100644 --- a/packages/seacas/applications/blot/xyaxis.f +++ b/packages/seacas/applications/blot/xyaxis.f @@ -1,28 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: xyaxis.f,v $ -C Revision 1.3 2009/03/25 12:36:49 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.2 1999/03/09 19:41:44 gdsjaar -C Fixed missing parameter definition of MSHBOR in blotII2.f -C -C Cleaned up parameters and common blocks in other routines. -C -C Revision 1.1 1994/04/07 20:17:50 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.3 1993/09/24 17:32:45 gdsjaar -c Added an outline off/on command to toggle drawing of the view window outline -c -c Revision 1.2 1990/12/14 08:59:35 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE XYAXIS (IXCRV, DOGRID, XLAB, YLAB, BLKCOL, *) C======================================================================= diff --git a/packages/seacas/applications/blot/xycomd.f b/packages/seacas/applications/blot/xycomd.f index bd83da54eb53..05ad5158b5ad 100644 --- a/packages/seacas/applications/blot/xycomd.f +++ b/packages/seacas/applications/blot/xycomd.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/blot/xylab.blk b/packages/seacas/applications/blot/xylab.blk index 506f5dac1ab9..43de888e756e 100644 --- a/packages/seacas/applications/blot/xylab.blk +++ b/packages/seacas/applications/blot/xylab.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /XYLAB/ XLAB, YLAB diff --git a/packages/seacas/applications/blot/xylim.blk b/packages/seacas/applications/blot/xylim.blk index c7a919d879df..caab3ccab014 100644 --- a/packages/seacas/applications/blot/xylim.blk +++ b/packages/seacas/applications/blot/xylim.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /XYLIM/ ASPECT, XMIN, XMAX, YMIN, YMAX, XTICK, YTICK diff --git a/packages/seacas/applications/blot/xyopc.blk b/packages/seacas/applications/blot/xyopc.blk index 11c4e4c306bb..49c418f756a5 100644 --- a/packages/seacas/applications/blot/xyopc.blk +++ b/packages/seacas/applications/blot/xyopc.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /XYOPC/ LABSID, IAXSCA diff --git a/packages/seacas/applications/blot/xyopt.blk b/packages/seacas/applications/blot/xyopt.blk index 7804d2c5011d..2a529be74588 100644 --- a/packages/seacas/applications/blot/xyopt.blk +++ b/packages/seacas/applications/blot/xyopt.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /XYOPT/ DOGRID, LINTYP, ISYTYP, OVERLY, OVERTM diff --git a/packages/seacas/applications/blot/xyshow.f b/packages/seacas/applications/blot/xyshow.f index 08b0ef4117ce..591751830c38 100644 --- a/packages/seacas/applications/blot/xyshow.f +++ b/packages/seacas/applications/blot/xyshow.f @@ -1,23 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: xyshow.f,v $ -C Revision 1.2 2009/03/25 12:36:49 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 20:18:15 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.3 1994/01/14 19:47:47 gdsjaar -c Added capability to write both grafaid and xmgr neutral files. -c -c Revision 1.2 1990/12/14 08:59:39 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE XYSHOW (SHOTYP) C======================================================================= diff --git a/packages/seacas/applications/blot/zaway.f b/packages/seacas/applications/blot/zaway.f index f87dac07a97e..77291053959f 100644 --- a/packages/seacas/applications/blot/zaway.f +++ b/packages/seacas/applications/blot/zaway.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: zaway.f,v $ -C Revision 1.2 2009/03/25 12:36:49 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 20:18:19 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:59:41 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= LOGICAL FUNCTION ZAWAY (NLNKF, LINKF1, XN, YN, ZN, HIDENP) C======================================================================= diff --git a/packages/seacas/applications/blot/zmedge.f b/packages/seacas/applications/blot/zmedge.f index ccb977280d37..1cceedf3fb9f 100644 --- a/packages/seacas/applications/blot/zmedge.f +++ b/packages/seacas/applications/blot/zmedge.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: zmedge.f,v $ -C Revision 1.2 2009/03/25 12:36:49 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.1 1994/04/07 20:18:24 gdsjaar -C Initial checkin of ACCESS/graphics/blotII2 -C -c Revision 1.2 1990/12/14 08:59:43 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE ZMEDGE (XZMMIN, XZMMAX, YZMMIN, YZMMAX, XN, YN, & IEDSET, NEDGES) diff --git a/packages/seacas/applications/blot/zmset.f b/packages/seacas/applications/blot/zmset.f index 0ad7e1d28187..49911f52e49a 100644 --- a/packages/seacas/applications/blot/zmset.f +++ b/packages/seacas/applications/blot/zmset.f @@ -1,23 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: zmset.f,v $ -C Revision 1.3 2009/03/25 12:36:49 gdsjaar -C Add copyright and license notice to all files. -C Permission to assert copyright has been granted; blot is now open source, BSD -C -C Revision 1.2 1994/07/21 15:28:22 gdsjaar -C Moved more commons into includes. -C -c Revision 1.1 1994/04/07 20:18:28 gdsjaar -c Initial checkin of ACCESS/graphics/blotII2 -c -c Revision 1.2 1990/12/14 08:59:46 gdsjaar -c Added RCS Id and Log to all files -c C======================================================================= SUBROUTINE ZMSET (XZMMIN, XZMMAX, YZMMIN, YZMMAX, XN, YN, & LINSET, IPSET, NPART) diff --git a/packages/seacas/applications/blot/zoomnd.f b/packages/seacas/applications/blot/zoomnd.f index f98a5ba75fa1..c9c0cc12ba7f 100644 --- a/packages/seacas/applications/blot/zoomnd.f +++ b/packages/seacas/applications/blot/zoomnd.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= @@ -36,9 +36,9 @@ SUBROUTINE ZOOMND( XN, YN, ZN, ZMMESH) include 'nodzom.blk' include 'rotopt.blk' include 'd3nums.blk' -C + C FOR NODE TRACKING MODE, GET THE WINDOW CENTER COORDS FOR THE NODE -C + IF( NODEZM .NE. 0) THEN XCEN = XN(NODEZM) YCEN = YN(NODEZM) diff --git a/packages/seacas/applications/conjoin/CJ_CodeTypes.h b/packages/seacas/applications/conjoin/CJ_CodeTypes.h index 5cef643577c8..0f80d4ad2d8f 100644 --- a/packages/seacas/applications/conjoin/CJ_CodeTypes.h +++ b/packages/seacas/applications/conjoin/CJ_CodeTypes.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef SEACAS_CodeTypes_H #define SEACAS_CodeTypes_H diff --git a/packages/seacas/applications/conjoin/CJ_ExodusEntity.h b/packages/seacas/applications/conjoin/CJ_ExodusEntity.h index 585d4e9ffd88..8ec38596fbb1 100644 --- a/packages/seacas/applications/conjoin/CJ_ExodusEntity.h +++ b/packages/seacas/applications/conjoin/CJ_ExodusEntity.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef SEACAS_ExodusEntity_H #define SEACAS_ExodusEntity_H diff --git a/packages/seacas/applications/conjoin/CJ_ExodusFile.C b/packages/seacas/applications/conjoin/CJ_ExodusFile.C index 91730ab14832..caed98839100 100644 --- a/packages/seacas/applications/conjoin/CJ_ExodusFile.C +++ b/packages/seacas/applications/conjoin/CJ_ExodusFile.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "CJ_CodeTypes.h" // for StringIdVector, etc @@ -205,11 +205,7 @@ bool Excn::ExodusFile::create_output(const SystemInterface &si) return true; } -#if defined(__PUMAGON__) -#include -#else #include -#endif namespace { int get_free_descriptor_count() diff --git a/packages/seacas/applications/conjoin/CJ_ExodusFile.h b/packages/seacas/applications/conjoin/CJ_ExodusFile.h index a3840502f7df..2f3038094d9e 100644 --- a/packages/seacas/applications/conjoin/CJ_ExodusFile.h +++ b/packages/seacas/applications/conjoin/CJ_ExodusFile.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef SEACAS_ExodusFile_H #define SEACAS_ExodusFile_H diff --git a/packages/seacas/applications/conjoin/CJ_Internals.C b/packages/seacas/applications/conjoin/CJ_Internals.C index 32ee95e19890..e1ae0b188f09 100644 --- a/packages/seacas/applications/conjoin/CJ_Internals.C +++ b/packages/seacas/applications/conjoin/CJ_Internals.C @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/applications/conjoin/CJ_Internals.h b/packages/seacas/applications/conjoin/CJ_Internals.h index 5688b400ab9f..17c09376b62e 100644 --- a/packages/seacas/applications/conjoin/CJ_Internals.h +++ b/packages/seacas/applications/conjoin/CJ_Internals.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef SEACAS_Internals_h #define SEACAS_Internals_h diff --git a/packages/seacas/applications/conjoin/CJ_ObjectType.h b/packages/seacas/applications/conjoin/CJ_ObjectType.h index 2f2416917901..d9255fdb98f6 100644 --- a/packages/seacas/applications/conjoin/CJ_ObjectType.h +++ b/packages/seacas/applications/conjoin/CJ_ObjectType.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef ObjectType_H #define ObjectType_H diff --git a/packages/seacas/applications/conjoin/CJ_SystemInterface.C b/packages/seacas/applications/conjoin/CJ_SystemInterface.C index b23bcbf21840..94a3d997004b 100644 --- a/packages/seacas/applications/conjoin/CJ_SystemInterface.C +++ b/packages/seacas/applications/conjoin/CJ_SystemInterface.C @@ -1,10 +1,9 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details - #include "CJ_SystemInterface.h" #include "CJ_Version.h" // for qainfo #include "SL_tokenize.h" // for tokenize diff --git a/packages/seacas/applications/conjoin/CJ_SystemInterface.h b/packages/seacas/applications/conjoin/CJ_SystemInterface.h index 671d22bbe621..0b0362a6b670 100644 --- a/packages/seacas/applications/conjoin/CJ_SystemInterface.h +++ b/packages/seacas/applications/conjoin/CJ_SystemInterface.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef Sierra_SystemInterface_h #define Sierra_SystemInterface_h diff --git a/packages/seacas/applications/conjoin/CJ_Variables.h b/packages/seacas/applications/conjoin/CJ_Variables.h index e698bbdcf01e..129289ae6006 100644 --- a/packages/seacas/applications/conjoin/CJ_Variables.h +++ b/packages/seacas/applications/conjoin/CJ_Variables.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef SEACAS_Variables_H #define SEACAS_Variables_H diff --git a/packages/seacas/applications/conjoin/CJ_Version.h b/packages/seacas/applications/conjoin/CJ_Version.h index 25e2a6bb4634..54a465025757 100644 --- a/packages/seacas/applications/conjoin/CJ_Version.h +++ b/packages/seacas/applications/conjoin/CJ_Version.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef SEACAS_Version_h #define SEACAS_Version_h diff --git a/packages/seacas/applications/conjoin/Conjoin.C b/packages/seacas/applications/conjoin/Conjoin.C index 36e5c8a49e2f..86f32aee05cf 100644 --- a/packages/seacas/applications/conjoin/Conjoin.C +++ b/packages/seacas/applications/conjoin/Conjoin.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include #include @@ -334,9 +334,6 @@ namespace { unsigned int debug_level = 0; int main(int argc, char *argv[]) { -#if defined(__LIBCATAMOUNT__) - setlinebuf(stderr); -#endif try { time_t begin_time = time(nullptr); Excn::SystemInterface::show_version(); diff --git a/packages/seacas/applications/ejoin/EJ_CodeTypes.h b/packages/seacas/applications/ejoin/EJ_CodeTypes.h index 6a04be0b9dda..c602b940cfcb 100644 --- a/packages/seacas/applications/ejoin/EJ_CodeTypes.h +++ b/packages/seacas/applications/ejoin/EJ_CodeTypes.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef SEACAS_CodeTypes_H #define SEACAS_CodeTypes_H diff --git a/packages/seacas/applications/ejoin/EJ_SystemInterface.C b/packages/seacas/applications/ejoin/EJ_SystemInterface.C index b4320d6c1e4f..8a030fa0ef40 100644 --- a/packages/seacas/applications/ejoin/EJ_SystemInterface.C +++ b/packages/seacas/applications/ejoin/EJ_SystemInterface.C @@ -1,10 +1,9 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details - #include "EJ_SystemInterface.h" #include "EJ_Version.h" // for qainfo #include "EJ_vector3d.h" // for vector3d diff --git a/packages/seacas/applications/ejoin/EJ_SystemInterface.h b/packages/seacas/applications/ejoin/EJ_SystemInterface.h index ec9f0194ee74..661c0d393437 100644 --- a/packages/seacas/applications/ejoin/EJ_SystemInterface.h +++ b/packages/seacas/applications/ejoin/EJ_SystemInterface.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef Sierra_SystemInterface_h #define Sierra_SystemInterface_h diff --git a/packages/seacas/applications/ejoin/EJ_Version.h b/packages/seacas/applications/ejoin/EJ_Version.h index 9393cc1521be..5515e3a4ce80 100644 --- a/packages/seacas/applications/ejoin/EJ_Version.h +++ b/packages/seacas/applications/ejoin/EJ_Version.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef EJ_Version_h #define EJ_Version_h diff --git a/packages/seacas/applications/ejoin/EJ_index_sort.C b/packages/seacas/applications/ejoin/EJ_index_sort.C index 85c8f760b3a7..5c8d73237e34 100644 --- a/packages/seacas/applications/ejoin/EJ_index_sort.C +++ b/packages/seacas/applications/ejoin/EJ_index_sort.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details /*! * The following 'indexed qsort' routine is modified from Sedgewicks diff --git a/packages/seacas/applications/ejoin/EJ_index_sort.h b/packages/seacas/applications/ejoin/EJ_index_sort.h index bfc28048e2a6..ac86808c2bfe 100644 --- a/packages/seacas/applications/ejoin/EJ_index_sort.h +++ b/packages/seacas/applications/ejoin/EJ_index_sort.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef INDEX_SORT_H #define INDEX_SORT_H diff --git a/packages/seacas/applications/ejoin/EJ_mapping.C b/packages/seacas/applications/ejoin/EJ_mapping.C index 4e0a97a89d4e..4652574e1310 100644 --- a/packages/seacas/applications/ejoin/EJ_mapping.C +++ b/packages/seacas/applications/ejoin/EJ_mapping.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "EJ_mapping.h" diff --git a/packages/seacas/applications/ejoin/EJ_mapping.h b/packages/seacas/applications/ejoin/EJ_mapping.h index 5a729215ca02..e242a1684504 100644 --- a/packages/seacas/applications/ejoin/EJ_mapping.h +++ b/packages/seacas/applications/ejoin/EJ_mapping.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef EJOIN_MAPPING_H #define EJOIN_MAPPING_H diff --git a/packages/seacas/applications/ejoin/EJ_match_xyz.C b/packages/seacas/applications/ejoin/EJ_match_xyz.C index aa7905801704..36225fe96323 100644 --- a/packages/seacas/applications/ejoin/EJ_match_xyz.C +++ b/packages/seacas/applications/ejoin/EJ_match_xyz.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "EJ_CodeTypes.h" #include "EJ_index_sort.h" // for index_coord_sort diff --git a/packages/seacas/applications/ejoin/EJ_match_xyz.h b/packages/seacas/applications/ejoin/EJ_match_xyz.h index dbfbca453a1d..1e114a66955e 100644 --- a/packages/seacas/applications/ejoin/EJ_match_xyz.h +++ b/packages/seacas/applications/ejoin/EJ_match_xyz.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef MATCY_XYZ_H #define MATCY_XYZ_H diff --git a/packages/seacas/applications/ejoin/EJ_vector3d.C b/packages/seacas/applications/ejoin/EJ_vector3d.C index fb4e750ee76a..1a96a09b7eee 100644 --- a/packages/seacas/applications/ejoin/EJ_vector3d.C +++ b/packages/seacas/applications/ejoin/EJ_vector3d.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "EJ_vector3d.h" diff --git a/packages/seacas/applications/ejoin/EJ_vector3d.h b/packages/seacas/applications/ejoin/EJ_vector3d.h index 23d0d6f60621..352b4437dca2 100644 --- a/packages/seacas/applications/ejoin/EJ_vector3d.h +++ b/packages/seacas/applications/ejoin/EJ_vector3d.h @@ -4,7 +4,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details class vector3d diff --git a/packages/seacas/applications/ejoin/EJoin.C b/packages/seacas/applications/ejoin/EJoin.C index 25b6c6ff2679..add2a52837d6 100644 --- a/packages/seacas/applications/ejoin/EJoin.C +++ b/packages/seacas/applications/ejoin/EJoin.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include #include diff --git a/packages/seacas/applications/ejoin/TODO b/packages/seacas/applications/ejoin/TODO index d4dfc846d021..d3e63e6e2f43 100644 --- a/packages/seacas/applications/ejoin/TODO +++ b/packages/seacas/applications/ejoin/TODO @@ -10,7 +10,6 @@ * (?) Add subsetting (exclude specific grouping entities) - DONE: * nodeset ids are not propagated to output database... * need progress meter on output @@ -23,7 +22,7 @@ DONE: * implement variable subsetting (all, none, variable list). -* Handle duplicate grouping entity ids. +* Handle duplicate grouping entity ids. -- This is working for non-merging of grouping entities. - Each entities name is prefixed with p#_ where # is the part number 1..num_parts. - Duplicate ids are renumbered. @@ -36,6 +35,5 @@ DONE: -- Matching by proximity should be working now also at least for 2 parts; - Multiple (more than 2) part matching needs testing. - GJOIN DIFFERENCES: - Does not combine blocks/sets that have the same id/type. diff --git a/packages/seacas/applications/epu/CMakeLists.txt b/packages/seacas/applications/epu/CMakeLists.txt index 385049650b42..08265d525d92 100644 --- a/packages/seacas/applications/epu/CMakeLists.txt +++ b/packages/seacas/applications/epu/CMakeLists.txt @@ -2,8 +2,8 @@ # In a MPI-enabled build, it will build 'epu' which is a serial application and 'pepu' which is a parallel-enabled epu # In a serial, non-MPI-enabled build, it will only build 'epu'. # On some platforms, both applications may perform the same if run in serial; however, some platforms require -# parallel applications to be run on a compute-partition. We used to just build a parallel-enabled epu -# when MPI was enabled, but this caused issues for users on those platforms which would not allow a +# parallel applications to be run on a compute-partition. We used to just build a parallel-enabled epu +# when MPI was enabled, but this caused issues for users on those platforms which would not allow a # parallel application to be run on a non-compute partition, so now we build two versions... TRIBITS_SUBPACKAGE(Epu) diff --git a/packages/seacas/applications/epu/EP_ExodusEntity.h b/packages/seacas/applications/epu/EP_ExodusEntity.h index f6d6cb6e1c58..ca88a3daa867 100644 --- a/packages/seacas/applications/epu/EP_ExodusEntity.h +++ b/packages/seacas/applications/epu/EP_ExodusEntity.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #ifndef SEACAS_ExodusEntity_H diff --git a/packages/seacas/applications/epu/EP_ExodusFile.C b/packages/seacas/applications/epu/EP_ExodusFile.C index a51ba67ca6ae..b8f5466af773 100644 --- a/packages/seacas/applications/epu/EP_ExodusFile.C +++ b/packages/seacas/applications/epu/EP_ExodusFile.C @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ @@ -338,9 +338,7 @@ size_t Excn::ExodusFile::get_free_descriptor_count() { // Returns maximum number of files that one process can have open // at one time. (POSIX) -#if defined(__PUMAGON__) - int fdmax = FOPEN_MAX; -#elif defined(_WIN32) +#if defined(_WIN32) int fdmax = _getmaxstdio(); #else int fdmax = sysconf(_SC_OPEN_MAX); diff --git a/packages/seacas/applications/epu/EP_ExodusFile.h b/packages/seacas/applications/epu/EP_ExodusFile.h index bfef101ed4f9..3cf5038f749d 100644 --- a/packages/seacas/applications/epu/EP_ExodusFile.h +++ b/packages/seacas/applications/epu/EP_ExodusFile.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #ifndef SEACAS_ExodusFile_H diff --git a/packages/seacas/applications/epu/EP_Internals.C b/packages/seacas/applications/epu/EP_Internals.C index 851c35b8655a..5cfb2dde2489 100644 --- a/packages/seacas/applications/epu/EP_Internals.C +++ b/packages/seacas/applications/epu/EP_Internals.C @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/applications/epu/EP_Internals.h b/packages/seacas/applications/epu/EP_Internals.h index a619d1076206..59a7cf028061 100644 --- a/packages/seacas/applications/epu/EP_Internals.h +++ b/packages/seacas/applications/epu/EP_Internals.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #ifndef SEACAS_Internals_h diff --git a/packages/seacas/applications/epu/EP_ObjectType.h b/packages/seacas/applications/epu/EP_ObjectType.h index 1168d7b03ab2..46f36574ea9c 100644 --- a/packages/seacas/applications/epu/EP_ObjectType.h +++ b/packages/seacas/applications/epu/EP_ObjectType.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #ifndef ObjectType_H diff --git a/packages/seacas/applications/epu/EP_ParallelDisks.C b/packages/seacas/applications/epu/EP_ParallelDisks.C index 3b0d4eefc4d7..28bbdd1a9ac2 100644 --- a/packages/seacas/applications/epu/EP_ParallelDisks.C +++ b/packages/seacas/applications/epu/EP_ParallelDisks.C @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/applications/epu/EP_ParallelDisks.h b/packages/seacas/applications/epu/EP_ParallelDisks.h index 99022d6a4482..1143fe3cb4d2 100644 --- a/packages/seacas/applications/epu/EP_ParallelDisks.h +++ b/packages/seacas/applications/epu/EP_ParallelDisks.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/applications/epu/EP_SystemInterface.C b/packages/seacas/applications/epu/EP_SystemInterface.C index ad472b0b064e..bb9c9854eed3 100644 --- a/packages/seacas/applications/epu/EP_SystemInterface.C +++ b/packages/seacas/applications/epu/EP_SystemInterface.C @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #include "EP_SystemInterface.h" diff --git a/packages/seacas/applications/epu/EP_SystemInterface.h b/packages/seacas/applications/epu/EP_SystemInterface.h index 28e1b09adc19..e1fa6f672a28 100644 --- a/packages/seacas/applications/epu/EP_SystemInterface.h +++ b/packages/seacas/applications/epu/EP_SystemInterface.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #ifndef Sierra_SystemInterface_h diff --git a/packages/seacas/applications/epu/EP_Variables.h b/packages/seacas/applications/epu/EP_Variables.h index a977aff22396..c5f9553d2a73 100644 --- a/packages/seacas/applications/epu/EP_Variables.h +++ b/packages/seacas/applications/epu/EP_Variables.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #ifndef SEACAS_Variables_H diff --git a/packages/seacas/applications/epu/EP_Version.h b/packages/seacas/applications/epu/EP_Version.h index 5aaa320a0144..83da8531f8c6 100644 --- a/packages/seacas/applications/epu/EP_Version.h +++ b/packages/seacas/applications/epu/EP_Version.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #ifndef SEACAS_Version_h @@ -10,8 +10,8 @@ static char const *qainfo[] = { "epu -- E Pluribus Unum", - "2020/04/20", - "4.31", + "2020/06/17", + "4.32", }; #endif // SEACAS_Version_h diff --git a/packages/seacas/applications/epu/TODO b/packages/seacas/applications/epu/TODO index 3870944a5b17..a8a3cd22d801 100644 --- a/packages/seacas/applications/epu/TODO +++ b/packages/seacas/applications/epu/TODO @@ -1,4 +1,4 @@ -There is a problem with duplicate elements that needs to be handled. +There is a problem with duplicate elements that needs to be handled. They can arise if someone uses conjoin to join all files on each specific processor and then uses epu to join the resulting files into @@ -18,7 +18,7 @@ Need something like "-remove_duplicate_elements" This means to eliminate duplicate elements and use the element where has value as the "canonical" element at that time -step. +step. Probably throw an error if more than 1 of the duplicate elements has the value ... diff --git a/packages/seacas/applications/epu/epu.C b/packages/seacas/applications/epu/epu.C index 1b31f112b6ad..511f1c61157c 100644 --- a/packages/seacas/applications/epu/epu.C +++ b/packages/seacas/applications/epu/epu.C @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ // concatenates EXODUS/GENESIS output from parallel processors to a single file @@ -723,9 +723,13 @@ int epu(SystemInterface &interFace, int start_part, int part_count, int cycle, T // must check for zero length blocks get_element_blocks(part_count, local_mesh, global, blocks, glob_blocks); + bool map_element_ids = interFace.map_element_ids(); + if (interFace.subcycle() >= 0) { + map_element_ids = false; + } std::vector global_element_map(global.elementCount); build_reverse_element_map(local_element_to_global, local_mesh, blocks, glob_blocks, &global, - part_count, global_element_map, interFace.map_element_ids()); + part_count, global_element_map, map_element_ids); // // NOTE: Node set/side set information can be different for each processor @@ -1765,8 +1769,7 @@ namespace { for (int b = 0; b < global_num_blocks; b++) { if (debug_level & 4) { - fmt::print(stderr, - "\nOutput element block info for...\n" + fmt::print("\nOutput element block info for...\n" "Block {}, Id = {}, Name = '{}', Elements = {:12n}, Nodes/element = {}, " "Attributes = {}\n" "B{}:\t", @@ -1801,7 +1804,7 @@ namespace { if (blocks[p][b].entity_count() > 0) { // non-zero length block if (debug_level & 4) { - fmt::print(stderr, "#"); + fmt::print("#"); } size_t maximum_nodes = blocks[p][b].entity_count(); maximum_nodes *= blocks[p][b].nodesPerElement; @@ -1859,7 +1862,7 @@ namespace { } // end if blocks[p][b].entity_count() (non-zero length block) else if (debug_level & 4) { - fmt::print(stderr, "."); + fmt::print("."); } } // end for p=0..part_count-1 @@ -1883,7 +1886,7 @@ namespace { delete[] attributes[b]; } // end for b=0..global_num_blocks-1 if (debug_level & 4) { - fmt::print(stderr, "\n"); + fmt::print("\n"); } } fmt::print("\n"); diff --git a/packages/seacas/applications/epu/pepu.C b/packages/seacas/applications/epu/pepu.C index 964801616484..27edafa630e5 100644 --- a/packages/seacas/applications/epu/pepu.C +++ b/packages/seacas/applications/epu/pepu.C @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ @@ -20,4 +20,3 @@ #endif #include "epu.C" - diff --git a/packages/seacas/applications/ex1ex2v2/ex1_dbieb1.f b/packages/seacas/applications/ex1ex2v2/ex1_dbieb1.f index b5a6cfb4d5db..bc9d86609374 100644 --- a/packages/seacas/applications/ex1ex2v2/ex1_dbieb1.f +++ b/packages/seacas/applications/ex1ex2v2/ex1_dbieb1.f @@ -1,31 +1,13 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE DBIEB1 (NDB, OPTION, IELB, NUMELB, NUMLNK, NUMATR, & LINK, ATRIB, NATRDM, NLNKDM, *) C======================================================================= -C$Id: dbieb1.f,v 1.3 2009/03/25 12:46:01 gdsjaar Exp $ -C$Log: dbieb1.f,v $ -CRevision 1.3 2009/03/25 12:46:01 gdsjaar -CAdd copyright and license notice to all files. -C -CRevision 1.2 1997/03/20 19:40:11 caforsy -CUpdated Imakefile for Imake 6.1. Changed printing routines to handle -Clarger problems. -C -CRevision 1.1.1.1 1990/08/14 16:12:34 gdsjaar -CTesting -C -c Revision 1.1 90/08/14 16:12:33 gdsjaar -c Initial revision -c -c Revision 1.1 90/08/09 13:39:08 gdsjaar -c Initial revision -c C --*** DBIEB1 *** (EXOLIB) Read database element block misc. C -- Written by Amy Gilkey - revised 10/14/87 diff --git a/packages/seacas/applications/ex1ex2v2/ex1_dbielb.f b/packages/seacas/applications/ex1ex2v2/ex1_dbielb.f index 4da21f7cb8d4..7e7f85dfa959 100644 --- a/packages/seacas/applications/ex1ex2v2/ex1_dbielb.f +++ b/packages/seacas/applications/ex1ex2v2/ex1_dbielb.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= @@ -9,24 +9,6 @@ SUBROUTINE DBIELB (NDB, OPTION, NELBS, NELBE, & IDELB, NUMELB, NUMLNK, NUMATR, & A, KLINK, KATRIB, *) C======================================================================= -C$Id: dbielb.f,v 1.3 2009/03/25 12:46:01 gdsjaar Exp $ -C$Log: dbielb.f,v $ -CRevision 1.3 2009/03/25 12:46:01 gdsjaar -CAdd copyright and license notice to all files. -C -CRevision 1.2 1997/03/20 19:40:12 caforsy -CUpdated Imakefile for Imake 6.1. Changed printing routines to handle -Clarger problems. -C -CRevision 1.1.1.1 1990/08/14 16:12:37 gdsjaar -CTesting -C -c Revision 1.1 90/08/14 16:12:35 gdsjaar -c Initial revision -c -c Revision 1.1 90/08/09 13:39:08 gdsjaar -c Initial revision -c C --*** DBIELB *** (EXOLIB) Read database element blocks C -- Written by Amy Gilkey - revised 10/14/87 diff --git a/packages/seacas/applications/ex1ex2v2/ex1_dbiess.f b/packages/seacas/applications/ex1ex2v2/ex1_dbiess.f index 65867eda95f7..8831bd737f98 100644 --- a/packages/seacas/applications/ex1ex2v2/ex1_dbiess.f +++ b/packages/seacas/applications/ex1ex2v2/ex1_dbiess.f @@ -1,27 +1,13 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE DBIESS (NDB, OPTION, NUMESS, LESSEL, LESSNL, & IDESS, NEESS, NNESS, IXEESS, IXNESS, LTEESS, LTNESS, FACESS, *) C======================================================================= -C$Id: dbiess.f,v 1.2 2009/03/25 12:46:01 gdsjaar Exp $ -C$Log: dbiess.f,v $ -CRevision 1.2 2009/03/25 12:46:01 gdsjaar -CAdd copyright and license notice to all files. -C -CRevision 1.1.1.1 1990/08/14 16:12:40 gdsjaar -CTesting -C -c Revision 1.1 90/08/14 16:12:38 gdsjaar -c Initial revision -c -c Revision 1.1 90/08/09 13:39:09 gdsjaar -c Initial revision -c C --*** DBIESS *** (EXOLIB) Read database node sets C -- Written by Amy Gilkey - revised 10/14/87 diff --git a/packages/seacas/applications/ex1ex2v2/ex1_dbiini.f b/packages/seacas/applications/ex1ex2v2/ex1_dbiini.f index 12f5893a3d7d..439277e68323 100644 --- a/packages/seacas/applications/ex1ex2v2/ex1_dbiini.f +++ b/packages/seacas/applications/ex1ex2v2/ex1_dbiini.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= @@ -9,20 +9,6 @@ SUBROUTINE DBIINI (NDB, OPTION, NVERS, TITLE, & NDIM, NUMNP, NUMEL, NELBLK, & NUMNPS, LNPSNL, NUMESS, LESSEL, LESSNL, *) C======================================================================= -C$Id: dbiini.f,v 1.2 2009/03/25 12:46:01 gdsjaar Exp $ -C$Log: dbiini.f,v $ -CRevision 1.2 2009/03/25 12:46:01 gdsjaar -CAdd copyright and license notice to all files. -C -CRevision 1.1.1.1 1990/08/14 16:12:43 gdsjaar -CTesting -C -c Revision 1.1 90/08/14 16:12:42 gdsjaar -c Initial revision -c -c Revision 1.1 90/08/09 13:39:09 gdsjaar -c Initial revision -c C --*** DBIINI *** (EXOLIB) Read database title and initial variables C -- Written by Amy Gilkey - revised 05/24/88 diff --git a/packages/seacas/applications/ex1ex2v2/ex1_dbimap.f b/packages/seacas/applications/ex1ex2v2/ex1_dbimap.f index 7a51b3a1eb6e..4dd41b7f1a94 100644 --- a/packages/seacas/applications/ex1ex2v2/ex1_dbimap.f +++ b/packages/seacas/applications/ex1ex2v2/ex1_dbimap.f @@ -1,26 +1,12 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE DBIMAP (NDB, OPTION, NUMEL, MAPEL, *) C======================================================================= -C$Id: dbimap.f,v 1.2 2009/03/25 12:46:01 gdsjaar Exp $ -C$Log: dbimap.f,v $ -CRevision 1.2 2009/03/25 12:46:01 gdsjaar -CAdd copyright and license notice to all files. -C -CRevision 1.1.1.1 1990/08/14 16:12:46 gdsjaar -CTesting -C -c Revision 1.1 90/08/14 16:12:44 gdsjaar -c Initial revision -c -c Revision 1.1 90/08/09 13:39:10 gdsjaar -c Initial revision -c C --*** DBIMAP *** (EXOLIB) Read database element order map C -- Written by Amy Gilkey - revised 10/14/87 diff --git a/packages/seacas/applications/ex1ex2v2/ex1_dbinam.f b/packages/seacas/applications/ex1ex2v2/ex1_dbinam.f index 94e651097e96..3ef40c7fd53b 100644 --- a/packages/seacas/applications/ex1ex2v2/ex1_dbinam.f +++ b/packages/seacas/applications/ex1ex2v2/ex1_dbinam.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/ex1ex2v2/ex1_dbinm1.f b/packages/seacas/applications/ex1ex2v2/ex1_dbinm1.f index 1c9045afdb37..b40382f998ba 100644 --- a/packages/seacas/applications/ex1ex2v2/ex1_dbinm1.f +++ b/packages/seacas/applications/ex1ex2v2/ex1_dbinm1.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/ex1ex2v2/ex1_dbinps.f b/packages/seacas/applications/ex1ex2v2/ex1_dbinps.f index ea432c489b83..e2bd5d9be105 100644 --- a/packages/seacas/applications/ex1ex2v2/ex1_dbinps.f +++ b/packages/seacas/applications/ex1ex2v2/ex1_dbinps.f @@ -1,27 +1,13 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE DBINPS (NDB, OPTION, NUMNPS, LNPSNL, & IDNPS, NNNPS, IXNNPS, LTNNPS, FACNPS, *) C======================================================================= -C$Id: dbinps.f,v 1.2 2009/03/25 12:46:01 gdsjaar Exp $ -C$Log: dbinps.f,v $ -CRevision 1.2 2009/03/25 12:46:01 gdsjaar -CAdd copyright and license notice to all files. -C -CRevision 1.1.1.1 1990/08/14 16:12:54 gdsjaar -CTesting -C -c Revision 1.1 90/08/14 16:12:52 gdsjaar -c Initial revision -c -c Revision 1.1 90/08/09 13:39:11 gdsjaar -c Initial revision -c C --*** DBINPS *** (EXOLIB) Read database node sets C -- Written by Amy Gilkey - revised 10/14/87 diff --git a/packages/seacas/applications/ex1ex2v2/ex1_dbiqa.f b/packages/seacas/applications/ex1ex2v2/ex1_dbiqa.f index bf8f024fccf8..b3d012323558 100644 --- a/packages/seacas/applications/ex1ex2v2/ex1_dbiqa.f +++ b/packages/seacas/applications/ex1ex2v2/ex1_dbiqa.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= @@ -9,24 +9,6 @@ SUBROUTINE DBIQA (NDB, OPTION, & MAXQA, MAXINF, NQAREC, QAREC, NINFO, INFO, & EXODUS, *) C======================================================================= -C$Id: dbiqa.f,v 1.3 2009/03/25 12:46:01 gdsjaar Exp $ -C$Log: dbiqa.f,v $ -CRevision 1.3 2009/03/25 12:46:01 gdsjaar -CAdd copyright and license notice to all files. -C -CRevision 1.2 1992/07/16 22:37:16 gdsjaar -CChanged method of dealing with too many qa/info lines: if too many, -Cstore last lines instead of first -C -c Revision 1.1.1.1 1990/08/14 16:12:56 gdsjaar -c Testing -c -c Revision 1.1 90/08/14 16:12:55 gdsjaar -c Initial revision -c -c Revision 1.1 90/08/09 13:39:11 gdsjaar -c Initial revision -c C --*** DBIQA *** (EXOLIB) Read QA and information records C -- Written by Amy Gilkey - revised 02/08/88 diff --git a/packages/seacas/applications/ex1ex2v2/ex1_dbist1.f b/packages/seacas/applications/ex1ex2v2/ex1_dbist1.f index b7f4cf1485c8..7a757565440d 100644 --- a/packages/seacas/applications/ex1ex2v2/ex1_dbist1.f +++ b/packages/seacas/applications/ex1ex2v2/ex1_dbist1.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/ex1ex2v2/ex1_dbist2.f b/packages/seacas/applications/ex1ex2v2/ex1_dbist2.f index d16bfe491e47..50aad4b5ca9f 100644 --- a/packages/seacas/applications/ex1ex2v2/ex1_dbist2.f +++ b/packages/seacas/applications/ex1ex2v2/ex1_dbist2.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/ex1ex2v2/ex1_dbiste.f b/packages/seacas/applications/ex1ex2v2/ex1_dbiste.f index 8f90f133d702..899f00140a32 100644 --- a/packages/seacas/applications/ex1ex2v2/ex1_dbiste.f +++ b/packages/seacas/applications/ex1ex2v2/ex1_dbiste.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/ex1ex2v2/ex1_dbitim.f b/packages/seacas/applications/ex1ex2v2/ex1_dbitim.f index 54e8038e1458..a527668d70ad 100644 --- a/packages/seacas/applications/ex1ex2v2/ex1_dbitim.f +++ b/packages/seacas/applications/ex1ex2v2/ex1_dbitim.f @@ -1,32 +1,14 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details - C======================================================================= SUBROUTINE DBITIM (NDB, OPTION, EXODUS, & NVARNP, NELBLK, NVAREL, ISEVOK, & NSTEPS, NSTEPW, A, KTIMES, KWHOLE, *) C======================================================================= -C$Id: dbitim.f,v 1.3 2009/03/25 12:46:01 gdsjaar Exp $ -C$Log: dbitim.f,v $ -CRevision 1.3 2009/03/25 12:46:01 gdsjaar -CAdd copyright and license notice to all files. -C -CRevision 1.2 1990/10/11 16:46:39 gdsjaar -CFixed problem with singly/doubly dimensioned array -C -c Revision 1.1.1.1 90/08/14 16:13:07 gdsjaar -c Testing -c -c Revision 1.1 90/08/14 16:13:06 gdsjaar -c Initial revision -c -c Revision 1.1 90/08/09 13:39:13 gdsjaar -c Initial revision -c C --*** DBITIM *** (EXOLIB) Read database time step times C -- Written by Amy Gilkey - revised 11/11/87 diff --git a/packages/seacas/applications/ex1ex2v2/ex1_dbiv0.f b/packages/seacas/applications/ex1ex2v2/ex1_dbiv0.f index 07ebc5d9b633..4aa92f734d42 100644 --- a/packages/seacas/applications/ex1ex2v2/ex1_dbiv0.f +++ b/packages/seacas/applications/ex1ex2v2/ex1_dbiv0.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= @@ -76,29 +76,6 @@ SUBROUTINE DBIV0 (NQAREC, NINFO) C======================================================================= ENTRY DBIV1 (NELBLK, NVARHI, NVARGL, NVARNP, NVAREL, ISEVOK) C======================================================================= -C$Id: dbiv0.f,v 1.2 1994/02/11 22:52:28 vryarbe Exp $ -C$Log: dbiv0.f,v $ -CRevision 1.2 1994/02/11 22:52:28 vryarbe -Cfixed bug causing compiler error w/optimize flag -C -c Revision 1.1.1.1 1994/01/24 23:00:54 vryarbe -c Initial check-in using ExodusII V 2.00 -c -c Revision 1.3 1990/11/30 09:50:53 gdsjaar -c Modified to work on Unicos -c -c Revision 1.2 90/10/11 16:47:17 gdsjaar -c Fixed problem with singly/doubly dimensioned array -c -c Revision 1.1.1.1 90/08/14 16:13:11 gdsjaar -c Testing -c -c Revision 1.1 90/08/14 16:13:09 gdsjaar -c Initial revision -c -c Revision 1.1 90/08/09 13:39:13 gdsjaar -c Initial revision -c C --*** DBIV1 *** (EXOLIB) Initialize for DBIVAR C -- Written by Amy Gilkey - revised 11/04/87 @@ -162,29 +139,6 @@ SUBROUTINE DBIV0 (NQAREC, NINFO) C======================================================================= ENTRY DBIVIN (REWDB) C======================================================================= -C$Id: dbiv0.f,v 1.2 1994/02/11 22:52:28 vryarbe Exp $ -C$Log: dbiv0.f,v $ -CRevision 1.2 1994/02/11 22:52:28 vryarbe -Cfixed bug causing compiler error w/optimize flag -C -c Revision 1.1.1.1 1994/01/24 23:00:54 vryarbe -c Initial check-in using ExodusII V 2.00 -c -c Revision 1.3 1990/11/30 09:50:53 gdsjaar -c Modified to work on Unicos -c -c Revision 1.2 90/10/11 16:47:17 gdsjaar -c Fixed problem with singly/doubly dimensioned array -c -c Revision 1.1.1.1 90/08/14 16:13:11 gdsjaar -c Testing -c -c Revision 1.1 90/08/14 16:13:09 gdsjaar -c Initial revision -c -c Revision 1.1 90/08/09 13:39:13 gdsjaar -c Initial revision -c C --*** DBIVIN *** (EXOLIB) Initialize for DBIVAR C -- Written by Amy Gilkey - revised 11/04/87 @@ -211,29 +165,6 @@ SUBROUTINE DBIV0 (NQAREC, NINFO) ENTRY DBIVAR (NDB, NUMVAR, IVAR, ISTEP, LENVAR, IELBLK, & NELBLK, NUMELB, ISEVOK, VAR, *) C======================================================================= -C$Id: dbiv0.f,v 1.2 1994/02/11 22:52:28 vryarbe Exp $ -C$Log: dbiv0.f,v $ -CRevision 1.2 1994/02/11 22:52:28 vryarbe -Cfixed bug causing compiler error w/optimize flag -C -c Revision 1.1.1.1 1994/01/24 23:00:54 vryarbe -c Initial check-in using ExodusII V 2.00 -c -c Revision 1.3 1990/11/30 09:50:53 gdsjaar -c Modified to work on Unicos -c -c Revision 1.2 90/10/11 16:47:17 gdsjaar -c Fixed problem with singly/doubly dimensioned array -c -c Revision 1.1.1.1 90/08/14 16:13:11 gdsjaar -c Testing -c -c Revision 1.1 90/08/14 16:13:09 gdsjaar -c Initial revision -c -c Revision 1.1 90/08/09 13:39:13 gdsjaar -c Initial revision -c C --*** DBIVAR *** (EXOLIB) Read variable C -- Written by Amy Gilkey - revised 08/16/88 diff --git a/packages/seacas/applications/ex1ex2v2/ex1_dbixyz.f b/packages/seacas/applications/ex1ex2v2/ex1_dbixyz.f index 147e4822086b..1dea40d6ac02 100644 --- a/packages/seacas/applications/ex1ex2v2/ex1_dbixyz.f +++ b/packages/seacas/applications/ex1ex2v2/ex1_dbixyz.f @@ -1,26 +1,12 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE DBIXYZ (NDB, OPTION, NDIM, NUMNP, XN, YN, ZN, *) C======================================================================= -C$Id: dbixyz.f,v 1.2 2009/03/25 12:46:01 gdsjaar Exp $ -C$Log: dbixyz.f,v $ -CRevision 1.2 2009/03/25 12:46:01 gdsjaar -CAdd copyright and license notice to all files. -C -CRevision 1.1.1.1 1990/08/14 16:13:14 gdsjaar -CTesting -C -c Revision 1.1 90/08/14 16:13:12 gdsjaar -c Initial revision -c -c Revision 1.1 90/08/09 13:39:14 gdsjaar -c Initial revision -c C --*** DBIXYZ *** (EXOLIB) Read database coordinates C -- Written by Amy Gilkey - revised 10/14/87 diff --git a/packages/seacas/applications/ex1ex2v2/ex1_putev.f b/packages/seacas/applications/ex1ex2v2/ex1_putev.f index 21b015301d12..8ea1690f0f28 100644 --- a/packages/seacas/applications/ex1ex2v2/ex1_putev.f +++ b/packages/seacas/applications/ex1ex2v2/ex1_putev.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details subroutine putev (idexo, nwstep, nelblk, nvarel, numelb, diff --git a/packages/seacas/applications/ex1ex2v2/ex1ex2v2.f b/packages/seacas/applications/ex1ex2v2/ex1ex2v2.f index 9d38b1e2e39f..ac8f65b96c9e 100644 --- a/packages/seacas/applications/ex1ex2v2/ex1ex2v2.f +++ b/packages/seacas/applications/ex1ex2v2/ex1ex2v2.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= @@ -60,9 +60,8 @@ PROGRAM EX1EX2V2 NDB = 11 NET = 20 -c c make netCDF and exodus errors not show up -c + call exopts(0,ierr) C .. Get filename from command line. If not specified, emit error message @@ -104,18 +103,14 @@ PROGRAM EX1EX2V2 CALL DBIINI (NDB, '*', NVERS, TITLE, NDIM, NUMNP, NUMEL, NELBLK, & NUMNPS, LNPSNL, NUMESS, LESSEL, LESSNL, *150) -c c create the a netcdf file -c idexo = excre (netfil(1:lnam), EXCLOB, cpuws, wsout, ierr) if (ierr .lt. 0) then call exerr('ex1ex2v2','Error from excre', EXLMSG) go to 140 end if -c c write initial variables to netcdf file -c call expini (idexo, title, ndim, numnp, numel, nelblk, numnps, & numess, ierr) if (ierr .lt. 0) then @@ -123,7 +118,6 @@ PROGRAM EX1EX2V2 goto 150 end if - CALL DBPINI ('NTIS', NDB, TITLE, NDIM, NUMNP, NUMEL, NELBLK, & NUMNPS, LNPSNL, NUMESS, LESSEL, LESSNL, & IDUM, IDUM, IDUM, IDUM) @@ -142,9 +136,9 @@ PROGRAM EX1EX2V2 IF (NERR .GT. 0) GOTO 130 CALL DBIXYZ (NDB, '*', NDIM, NUMNP, A(KXN), A(KYN), A(KZN), *150) -c + c write the coordinates to the regular netcdf file -c + call expcor (idexo, a(kxn), a(kyn), a(kzn), ierr) if (ierr .lt. 0) then @@ -161,9 +155,9 @@ PROGRAM EX1EX2V2 IF (NERR .GT. 0) GOTO 130 CALL DBIMAP (NDB, '*', NUMEL, IA(KMAPEL), *150) -c + c write the element order map to the regular netcdf file -c + call expmap (idexo, ia(kmapel), ierr) if (ierr .lt. 0) then call exerr ('ex1ex2v2','Error from expmap', EXLMSG) @@ -200,7 +194,6 @@ PROGRAM EX1EX2V2 CALL DBINPS (NDB, '*', NUMNPS, LNPSNL, & IA(KIDNS), IA(KNNNS), IA(KIXNNS), IA(KLSTNS), A(KFACNS), *150) - C --Read the element side sets CALL MDRSRV ('IDESS', KIDSS, NUMESS) @@ -219,7 +212,6 @@ PROGRAM EX1EX2V2 & IA(KIDSS), IA(KNESS), IA(KNNSS), IA(KIXESS), IA(KIXNSS), & IA(KLTESS), IA(KLTNSS), A(KFACSS), *150) - C --Read the QA and info records C ... Exodus set to .FALSE. if end of file during this read CALL DBIQA (NDB, '*', MAXQA, MAXINF, NQAREC, QAREC, NINFO, INFO, @@ -286,18 +278,18 @@ PROGRAM EX1EX2V2 c********* ioff = 0 DO 100 IELB = 1, NELBLK -c + c write element block parameters to the netcdf file -c + call expelb (IDEXO, IA(KIDELB+IELB-1), namelb(IELB), 1 IA(KNELB+IELB-1), 2 IA(KNMLNK+IELB-1), IA(KNMATR+IELB-1), IERR) IF (IERR .lt. 0) THEN CALL exerr('ex1ex2v2','Error from expelb',EXLMSG) ENDIF -c + c write block attributes to the netcdf file -c + IF (IA(KNMATR+IELB-1) .GT. 0) THEN call expeat (IDEXO, IA(KIDELB+IELB-1), A(KATRIB+ioff), IERR) IF (IERR .lt. 0) THEN @@ -313,10 +305,10 @@ PROGRAM EX1EX2V2 iptr = klink do 101 ielb = 1, nelblk -c + c write the element block connectivity to the netcdf file c skipping null element blocks -c + if (IA(KNELB+IELB-1) .eq. 0) then write(*,*)'Null element block: ',ielb else @@ -331,9 +323,7 @@ PROGRAM EX1EX2V2 101 continue -c c write out the nodal point sets to the regular netcdf file -c c Note: For exodus I data, dist factors always exist. if (numnps .gt. 0) then @@ -346,7 +336,7 @@ PROGRAM EX1EX2V2 endif c write element side sets -c + c Note: Exodus II V2.0 represents a major change for side sets: c They are represented as side IDs - not node IDs and c must be translated. @@ -357,7 +347,7 @@ PROGRAM EX1EX2V2 call exerr ('ex1ex2v2','Error from excn2s', exlmsg) goto 150 end if -c + call expcss (idexo, ia(kidss), ia(kness), ia(knnss), ia(kixess), & ia(kixnss), ia(kltess), ia(kltsss), a(kfacss), ierr) if (ierr .lt. 0) then @@ -388,9 +378,9 @@ PROGRAM EX1EX2V2 CALL MDDEL ('SACESS') CALL MDSTAT (NERR, MEM) IF (NERR .GT. 0) GOTO 130 -c + c write the QA records -c + IF (NQAREC .GT. 0) then call expqa (idexo, NQAREC, QAREC, ierr) if (ierr .lt. 0) then @@ -398,9 +388,9 @@ PROGRAM EX1EX2V2 goto 150 end if end if -c + c write the info records -c + if (NINFO .gt. 0) then call expinf (idexo, ninfo, info, ierr) if (ierr .lt. 0) then @@ -410,73 +400,73 @@ PROGRAM EX1EX2V2 end if c********************************************************************** -c + c write coordinate names -c + call expcon (idexo, nameco, ierr) if (ierr .lt. 0) then call exerr ('ex1ex2v2','Error from expcon', exlmsg) goto 150 end if -c + if (.not. EXODUS) goto 150 -c + c write the number of global variables -c + if (nvargl .gt. 0) then call expvp (idexo, 'G', nvargl, ierr) if (ierr .lt. 0) then call exerr ('ex1ex2v2','Error from expvp', exlmsg) goto 140 end if -c + c write the global variable names -c + call expvan (idexo, 'G', nvargl, names(ixgv), ierr) if (ierr .lt. 0) then call exerr ('ex1ex2v2','Error from expvan', exlmsg) goto 140 end if end if -c + c write the number of nodal variables -c + if (nvarnp .gt. 0) then call expvp (idexo, 'N', nvarnp, ierr) if (ierr .lt. 0) then call exerr ('ex1ex2v2','Error from expvp', exlmsg) goto 140 end if -c + c write the nodal variable names -c + call expvan (idexo, 'N', nvarnp, names(ixnv), ierr) if (ierr .lt. 0) then call exerr ('ex1ex2v2','Error from expvan', exlmsg) goto 140 end if end if -c + c write the number of element variables -c + if (nvarel .gt. 0) then call expvp (idexo, 'E', nvarel, ierr) if (ierr .lt. 0) then call exerr ('ex1ex2v2','Error from expvp', exlmsg) goto 140 end if -c + c write the element variable names -c + call expvan (idexo, 'E', nvarel, names(ixev), ierr) if (ierr .lt. 0) then call exerr ('ex1ex2v2','Error from exvan', exlmsg) goto 140 end if end if -c + c write the element variable truth table -c + call mdrsrv ('ebids', kebids, nelblk) call exgebi (idexo, ia(kebids), ierr) if (ierr .lt. 0) then @@ -505,7 +495,6 @@ PROGRAM EX1EX2V2 CALL MDSTAT (NERR, MEM) IF (NERR .GT. 0) GOTO 130 - nwstep = 0 nhstep = 0 @@ -521,9 +510,9 @@ PROGRAM EX1EX2V2 if (whotim) then nwstep = nwstep+1 write (*,'(4x, "processing whole time step ", i4)') nwstep -c + c write global variables -c + if (nvargl .gt. 0) then call expgv (idexo, nwstep, nvargl, a(kvargl), ierr) if (ierr .lt. 0) then @@ -531,9 +520,9 @@ PROGRAM EX1EX2V2 goto 140 end if end if -c + c write nodal variable values -c + if (nvarnp .gt. 0) then do 111 i= 1,nvarnp call expnv (idexo, nwstep, i, numnp, @@ -544,9 +533,9 @@ PROGRAM EX1EX2V2 end if 111 continue end if -c + c write element variable values -c + if (nvarel .gt. 0) then call putev (idexo, nwstep, nelblk, nvarel, & ia(knelb), a(kvarel), ia(kidelb), ia(kievok), ierr) @@ -555,16 +544,15 @@ PROGRAM EX1EX2V2 goto 140 end if end if -c + c write whole time step -c + call exptim (idexo, nwstep, time, ierr) if (ierr .lt. 0) then call exerr ('ex1ex2v2','Error from exptim', exlmsg) goto 140 end if - end if GOTO 110 END IF diff --git a/packages/seacas/applications/ex2ex1v2/ex2_dboeb1.f b/packages/seacas/applications/ex2ex1v2/ex2_dboeb1.f index 28ed48b8828f..33a311fa995c 100644 --- a/packages/seacas/applications/ex2ex1v2/ex2_dboeb1.f +++ b/packages/seacas/applications/ex2ex1v2/ex2_dboeb1.f @@ -1,27 +1,13 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE DBOEB1 (NDB, IELB, NUMELB, NUMLNK, NUMATR, LINK, ATRIB, $ NLNKDM, NATRDM) C======================================================================= -C$Id: dboeb1.f,v 1.2 2009/03/25 12:46:01 gdsjaar Exp $ -C$Log: dboeb1.f,v $ -CRevision 1.2 2009/03/25 12:46:01 gdsjaar -CAdd copyright and license notice to all files. -C -CRevision 1.1.1.1 1990/08/14 16:13:16 gdsjaar -CTesting -C -c Revision 1.1 90/08/14 16:13:15 gdsjaar -c Initial revision -c -c Revision 1.1 90/08/09 13:39:14 gdsjaar -c Initial revision -c C --*** DBOEB1 *** (EXOLIB) Write database element block misc. C -- Written by Amy Gilkey - revised 10/12/87 diff --git a/packages/seacas/applications/ex2ex1v2/ex2_dboelb.f b/packages/seacas/applications/ex2ex1v2/ex2_dboelb.f index c080e37f28aa..00f65c5b5eb1 100644 --- a/packages/seacas/applications/ex2ex1v2/ex2_dboelb.f +++ b/packages/seacas/applications/ex2ex1v2/ex2_dboelb.f @@ -1,27 +1,13 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE DBOELB (NDB, NELBS, NELBE, & IDELB, NUMELB, NUMLNK, NUMATR, LINK, ATRIB) C======================================================================= -C$Id: dboelb.f,v 1.2 2009/03/25 12:46:01 gdsjaar Exp $ -C$Log: dboelb.f,v $ -CRevision 1.2 2009/03/25 12:46:01 gdsjaar -CAdd copyright and license notice to all files. -C -CRevision 1.1.1.1 1990/08/14 16:13:19 gdsjaar -CTesting -C -c Revision 1.1 90/08/14 16:13:17 gdsjaar -c Initial revision -c -c Revision 1.1 90/08/09 13:39:14 gdsjaar -c Initial revision -c C --*** DBOELB *** (EXOLIB) Write database element blocks C -- Written by Amy Gilkey - revised 10/12/87 diff --git a/packages/seacas/applications/ex2ex1v2/ex2_dboess.f b/packages/seacas/applications/ex2ex1v2/ex2_dboess.f index 402eff6f2d46..55188811eafb 100644 --- a/packages/seacas/applications/ex2ex1v2/ex2_dboess.f +++ b/packages/seacas/applications/ex2ex1v2/ex2_dboess.f @@ -1,27 +1,13 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE DBOESS (NDB, NUMESS, LESSEL, LESSNL, & IDESS, NEESS, NNESS, IXEESS, IXNESS, LTEESS, LTNESS, FACESS) C======================================================================= -C$Id: dboess.f,v 1.2 2009/03/25 12:46:01 gdsjaar Exp $ -C$Log: dboess.f,v $ -CRevision 1.2 2009/03/25 12:46:01 gdsjaar -CAdd copyright and license notice to all files. -C -CRevision 1.1.1.1 1990/08/14 16:13:21 gdsjaar -CTesting -C -c Revision 1.1 90/08/14 16:13:20 gdsjaar -c Initial revision -c -c Revision 1.1 90/08/09 13:39:15 gdsjaar -c Initial revision -c C --*** DBOESS *** (EXOLIB) Write database node sets C -- Written by Amy Gilkey - revised 02/27/86 diff --git a/packages/seacas/applications/ex2ex1v2/ex2_dboini.f b/packages/seacas/applications/ex2ex1v2/ex2_dboini.f index b35be189a7ea..196157f73cc3 100644 --- a/packages/seacas/applications/ex2ex1v2/ex2_dboini.f +++ b/packages/seacas/applications/ex2ex1v2/ex2_dboini.f @@ -1,27 +1,13 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE DBOINI (NDB, TITLE, NDIM, NUMNP, NUMEL, NELBLK, & NUMNPS, LNPSNL, NUMESS, LESSEL, LESSNL) C======================================================================= -C$Id: dboini.f,v 1.2 2009/03/25 12:46:01 gdsjaar Exp $ -C$Log: dboini.f,v $ -CRevision 1.2 2009/03/25 12:46:01 gdsjaar -CAdd copyright and license notice to all files. -C -CRevision 1.1.1.1 1990/08/14 16:13:24 gdsjaar -CTesting -C -c Revision 1.1 90/08/14 16:13:23 gdsjaar -c Initial revision -c -c Revision 1.1 90/08/09 13:39:15 gdsjaar -c Initial revision -c C --*** DBOINI *** (EXOLIB) Write database title and initial variables C -- Written by Amy Gilkey - revised 12/04/87 diff --git a/packages/seacas/applications/ex2ex1v2/ex2_dbomap.f b/packages/seacas/applications/ex2ex1v2/ex2_dbomap.f index ae907078bfa4..ebca45841323 100644 --- a/packages/seacas/applications/ex2ex1v2/ex2_dbomap.f +++ b/packages/seacas/applications/ex2ex1v2/ex2_dbomap.f @@ -1,26 +1,12 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE DBOMAP (NDB, NUMEL, MAPEL) C======================================================================= -C$Id: dbomap.f,v 1.2 2009/03/25 12:46:01 gdsjaar Exp $ -C$Log: dbomap.f,v $ -CRevision 1.2 2009/03/25 12:46:01 gdsjaar -CAdd copyright and license notice to all files. -C -CRevision 1.1.1.1 1990/08/14 16:13:27 gdsjaar -CTesting -C -c Revision 1.1 90/08/14 16:13:25 gdsjaar -c Initial revision -c -c Revision 1.1 90/08/09 13:39:15 gdsjaar -c Initial revision -c C --*** DBOMAP *** (EXOLIB) Write database element order map C -- Written by Amy Gilkey - revised 02/27/86 diff --git a/packages/seacas/applications/ex2ex1v2/ex2_dbonam.f b/packages/seacas/applications/ex2ex1v2/ex2_dbonam.f index 91ad5f90f45f..447c89805a24 100644 --- a/packages/seacas/applications/ex2ex1v2/ex2_dbonam.f +++ b/packages/seacas/applications/ex2ex1v2/ex2_dbonam.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/ex2ex1v2/ex2_dbonm1.f b/packages/seacas/applications/ex2ex1v2/ex2_dbonm1.f index d32c314b67ad..b2f34e7ad702 100644 --- a/packages/seacas/applications/ex2ex1v2/ex2_dbonm1.f +++ b/packages/seacas/applications/ex2ex1v2/ex2_dbonm1.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/ex2ex1v2/ex2_dbonps.f b/packages/seacas/applications/ex2ex1v2/ex2_dbonps.f index c3cf6be1f623..84723c78f55c 100644 --- a/packages/seacas/applications/ex2ex1v2/ex2_dbonps.f +++ b/packages/seacas/applications/ex2ex1v2/ex2_dbonps.f @@ -1,27 +1,13 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE DBONPS (NDB, NUMNPS, LNPSNL, & IDNPS, NNNPS, IXNNPS, LTNNPS, FACNPS) C======================================================================= -C$Id: dbonps.f,v 1.2 2009/03/25 12:46:01 gdsjaar Exp $ -C$Log: dbonps.f,v $ -CRevision 1.2 2009/03/25 12:46:01 gdsjaar -CAdd copyright and license notice to all files. -C -CRevision 1.1.1.1 1990/08/14 16:13:34 gdsjaar -CTesting -C -c Revision 1.1 90/08/14 16:13:33 gdsjaar -c Initial revision -c -c Revision 1.1 90/08/09 13:39:17 gdsjaar -c Initial revision -c C --*** DBONPS *** (EXOLIB) Write database node sets C -- Written by Amy Gilkey - revised 02/27/86 diff --git a/packages/seacas/applications/ex2ex1v2/ex2_dboqa.f b/packages/seacas/applications/ex2ex1v2/ex2_dboqa.f index ea02cc2c1f80..f171f7ab624b 100644 --- a/packages/seacas/applications/ex2ex1v2/ex2_dboqa.f +++ b/packages/seacas/applications/ex2ex1v2/ex2_dboqa.f @@ -1,26 +1,12 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE DBOQA (NDB, NQAREC, QAREC, NINFO, INFO) C======================================================================= -C$Id: dboqa.f,v 1.2 2009/03/25 12:46:01 gdsjaar Exp $ -C$Log: dboqa.f,v $ -CRevision 1.2 2009/03/25 12:46:01 gdsjaar -CAdd copyright and license notice to all files. -C -CRevision 1.1.1.1 1990/08/14 16:13:37 gdsjaar -CTesting -C -c Revision 1.1 90/08/14 16:13:36 gdsjaar -c Initial revision -c -c Revision 1.1 90/08/09 13:39:17 gdsjaar -c Initial revision -c C --*** DBOQA *** (EXOLIB) Write QA and information records C -- Written by Amy Gilkey - revised 02/08/88 diff --git a/packages/seacas/applications/ex2ex1v2/ex2_dboste.f b/packages/seacas/applications/ex2ex1v2/ex2_dboste.f index 89c448e31983..250c545b1f0d 100644 --- a/packages/seacas/applications/ex2ex1v2/ex2_dboste.f +++ b/packages/seacas/applications/ex2ex1v2/ex2_dboste.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/ex2ex1v2/ex2_dboxyz.f b/packages/seacas/applications/ex2ex1v2/ex2_dboxyz.f index 3584c907773f..8fb9228c288e 100644 --- a/packages/seacas/applications/ex2ex1v2/ex2_dboxyz.f +++ b/packages/seacas/applications/ex2ex1v2/ex2_dboxyz.f @@ -1,26 +1,12 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE DBOXYZ (NDB, NDIM, NUMNP, XN, YN, ZN) C======================================================================= -C$Id: dboxyz.f,v 1.2 2009/03/25 12:46:01 gdsjaar Exp $ -C$Log: dboxyz.f,v $ -CRevision 1.2 2009/03/25 12:46:01 gdsjaar -CAdd copyright and license notice to all files. -C -CRevision 1.1.1.1 1990/08/14 16:13:43 gdsjaar -CTesting -C -c Revision 1.1 90/08/14 16:13:42 gdsjaar -c Initial revision -c -c Revision 1.1 90/08/09 13:39:18 gdsjaar -c Initial revision -c C --*** DBOXYZ *** (EXOLIB) Write database coordinates C -- Written by Amy Gilkey - revised 02/27/86 diff --git a/packages/seacas/applications/ex2ex1v2/ex2ex1v2.f b/packages/seacas/applications/ex2ex1v2/ex2ex1v2.f index aba8346ac397..22d549fdb3d9 100644 --- a/packages/seacas/applications/ex2ex1v2/ex2ex1v2.f +++ b/packages/seacas/applications/ex2ex1v2/ex2ex1v2.f @@ -1,10 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details - PROGRAM EX2EX1V2 C======================================================================= @@ -69,9 +68,9 @@ PROGRAM EX2EX1V2 if (MDEBUG) then call mlist() end if -c + c make netCDF and exodus errors not show up -c + c call ncpopt (0) call exopts (0,ierr) @@ -89,9 +88,8 @@ PROGRAM EX2EX1V2 GOTO 140 end if -c c open the netcdf file -c + net = 11 CALL get_argument(1,netfil, lnam) @@ -120,18 +118,18 @@ PROGRAM EX2EX1V2 GOTO 140 END IF write(*,*) 'Output file name: ',ndbfil(1:lnam) -c + c get initialization parameters from regular netcdf file -c + CALL EXGINI (netid, title, ndim, numnp, numel, & nelblk, numnps, numess, nerr) if (nerr .lt. 0) then call exerr('ex2ex1v2', 'Error from exgini', exlmsg) goto 140 endif -c + c get the length of the node sets node list -c + if (numnps .gt. 0) then CALL EXINQ (netid, EXNSNL, lnpsnl, dummy, cdummy, nerr) if (nerr .lt. 0) then @@ -141,27 +139,27 @@ PROGRAM EX2EX1V2 else lnpsnl = 0 endif -c + if (numess .gt. 0) then -c + c get the length of the side sets node list -c + CALL EXINQ (netid, EXSSNL, lessnl, dummy, cdummy, nerr) if (nerr .lt. 0) then call exerr('ex2ex1v2', 'Error from exqini', exlmsg) goto 140 endif -c + c get the length of the side sets distribution factor list -c + CALL EXINQ (netid, EXSSDF, lessdl, dummy, cdummy, nerr) if (nerr .lt. 0) then call exerr('ex2ex1v2', 'Error from exqini', exlmsg) goto 140 endif -c + c get the length of the side sets element list -c + CALL EXINQ (netid, EXSSEL, lessel, dummy, cdummy, nerr) if (nerr .lt. 0) then call exerr('ex2ex1v2', 'Error from exqini', exlmsg) @@ -172,9 +170,9 @@ PROGRAM EX2EX1V2 lessel = 0 lessdl = 0 endif -c + c write the initialization information to the EXODUS 1.0 database -c + CALL DBOINI (NDB, TITLE, NDIM, NUMNP, NUMEL, NELBLK, & NUMNPS, LNPSNL, NUMESS, LESSEL, LESSNL) @@ -237,9 +235,9 @@ PROGRAM EX2EX1V2 CALL DBOMAP (NDB, NUMEL, A(KMAPEL)) CALL MDDEL ('MAPEL') -c + c Read in the element block ID array -c + call MDRSRV ('IDELB', kidelb, nelblk) call exgebi (netid, a(kidelb), nerr) if (nerr .lt. 0) then @@ -322,7 +320,6 @@ PROGRAM EX2EX1V2 CALL MDRSRV ('XFACNP', KXFACN, LNPSNL) ! Expanded df list array CALL MDSTAT (NERR, MEM) - if (numnps .gt. 0) then call exgcns (netid, a(kidns), a(knnns), a(kndns), a(kixnns), & a(kixdns), a(klstns), a(kfacns), nerr) @@ -331,11 +328,11 @@ PROGRAM EX2EX1V2 goto 140 endif endif -C + C Massage node sets distribution factors to include '1' for node sets C without Dfs by walking KNDNS array, checking for 0, and filling where C necessary. -C + do 64 i=0, numnps-1 if (ia(kndns+i) .eq. 0) then do 60 ii=0, ia(knnns+i)-1 @@ -434,11 +431,11 @@ PROGRAM EX2EX1V2 isoff=isoff+nsess 104 continue endif -C + C Massage side sets distribution factors to include '1' for side sets C without Dfs by walking KNDSS array, checking for 0, and filling where C necessary. -C + do 110 i=0, numess-1 if (ia(kndss+i) .eq. 0) then do 106 ii=0, ia(knnss+i)-1 @@ -513,7 +510,6 @@ PROGRAM EX2EX1V2 CALL DBOQA (NDB, NQAREC, c(kqarec), NINFO, c(kinfo)) END IF - C --Read in the number of element variable names call exgvp (netid, 'e', nvarel, nerr) @@ -521,17 +517,17 @@ PROGRAM EX2EX1V2 call exerr('ex2ex1v2', 'Error from exgvp', exlmsg) goto 140 endif -c + C --Read in the number of global variable names -c + call exgvp (netid, 'g', nvargl, nerr) if (nerr .lt. 0) then call exerr('ex2ex1v2', 'Error from exgvp', exlmsg) goto 140 endif -c + C --Read in the number of nodal variable names -c + call exgvp (netid, 'n', nvarnp, nerr) if (nerr .lt. 0) then call exerr('ex2ex1v2', 'Error from exgvp', exlmsg) @@ -543,9 +539,9 @@ PROGRAM EX2EX1V2 call mdrsrv ('ISEVOK', kievok, nvarel*nelblk) CALL MDSTAT (NERR, MEM) IF (NERR .GT. 0) GOTO 130 -c + c read in the element variable truth table -c + if (nvarel .gt. 0) then call exgvtt (netid, nelblk, nvarel, a(kievok), nerr) if (nerr .gt. 0) then @@ -559,9 +555,9 @@ PROGRAM EX2EX1V2 goto 140 endif end if -c + c read in the element variable names -c + ixev = 1 if (nvarel .gt. 0) then call exgvan (netid, 'e', nvarel,mames(ixev), nerr) @@ -570,9 +566,9 @@ PROGRAM EX2EX1V2 goto 140 endif end if -c + c read in the global variable names -c + ixgv = ixev + nvarel if (nvargl .gt. 0) then call exgvan (netid, 'g', nvargl,mames(ixgv), nerr) @@ -581,9 +577,9 @@ PROGRAM EX2EX1V2 goto 140 endif end if -c + c read in the nodal variable names -c + ixnv = ixgv + nvargl if (nvarnp .gt. 0) then call exgvan (netid, 'n', nvarnp, mames(ixnv), nerr) @@ -592,20 +588,19 @@ PROGRAM EX2EX1V2 goto 140 endif end if -c + c read in the history variable names -c + ixhv = ixnv + nvarnp -c + c read coordinate names -c + call exgcon (netid, mameco, nerr) if (nerr .lt. 0) then call exerr('ex2ex1v2', 'Error from exgcon', exlmsg) goto 140 endif - CALL DBPINI ('V', NTXT, TITLE, NDIM, NUMNP, NUMEL, NELBLK, & NUMNPS, LNPSNL, NUMESS, LESSEL, LESSNL, & NVARHI, NVARGL, NVARNP, NVAREL) @@ -622,8 +617,6 @@ PROGRAM EX2EX1V2 & names(ixhv), names(ixgv), names(ixnv), names(ixev), & A(KIEVOK)) - - CALL MDRSRV ('VARHI', KVARHI, NVARHI) CALL MDRSRV ('VARGL', KVARGL, NVARGL) CALL MDRSRV ('VARNP', KVARNP, NVARNP * NUMNP) @@ -631,10 +624,9 @@ PROGRAM EX2EX1V2 CALL MDSTAT (NERR, MEM) IF (NERR .GT. 0) GOTO 130 -c c read in the number of history time steps and the number of C whole time steps -c + call exinq (netid, EXTIMS, ntime, s, name, nerr) if (nerr .lt. 0) then call exerr('ex2ex1v2', 'Error from exqini', exlmsg) @@ -647,9 +639,7 @@ PROGRAM EX2EX1V2 endif numstp = ntime -c c read the time step information -c istep = 0 call exgtim(netid, istep+1, wtime, nerr) @@ -661,9 +651,9 @@ PROGRAM EX2EX1V2 do 300 ihstep=1,numstp write (*,'(4x,"processing time step ", i4)') ihstep -c + c get history information -c + whotim = .true. call exgtim(netid, ihstep, wtime, nerr) if (nerr .lt. 0) then @@ -671,18 +661,17 @@ PROGRAM EX2EX1V2 goto 140 endif htime = wtime -c + c If a whole time step, do global, nodal, and element c variables for the time step. -c + if ((whotim) .or. (wtime .eq. htime)) then whotim =.true. istep = istep + 1 -c c get the global variable values -c + if( nvargl .gt. 0) then call exggv (netid, istep, nvargl, a(kvargl), nerr) if (nerr .lt. 0) then @@ -690,9 +679,9 @@ PROGRAM EX2EX1V2 goto 140 endif end if -c + c get the nodal variable values -c + do 210 j=1, nvarnp call exgnv (netid, istep, j, numnp, & a(kvarnp+(j-1)*numnp), nerr) @@ -702,19 +691,18 @@ PROGRAM EX2EX1V2 endif 210 continue -c c get element variable values -c + if (nvarel .gt. 0) then ielo=0 do 250 k = 1,nelblk l=(k-1)*nvarel do 240 j=1, nvarel -c + c If truth table indicates element values are available c for the element variable, get the values for the c element variable. -c + if(a(kievok+l +j-1) .ne. 0) then call exgev (netid, istep, j, a(kidelb+k-1), & a(knelb+k-1), a(kvarel+ielo), nerr) @@ -736,8 +724,6 @@ PROGRAM EX2EX1V2 & HTIME, WHOTIM, A(KVARHI), A(KVARGL), A(KVARNP), & A(KVAREL)) - - 300 continue call MDDEL ('IDELB') @@ -759,9 +745,9 @@ PROGRAM EX2EX1V2 GOTO 140 140 CONTINUE -c + c close all files -c + CLOSE (NDB, IOSTAT=IDUM) if (netid .ge. 0 ) call exclos (netid, ierr) @@ -776,7 +762,6 @@ subroutine mlist() return end - subroutine rdqain (ndb, nqarec, qarec, ninfo, info) include 'exodusII.inc' integer ndb diff --git a/packages/seacas/applications/exo2mat/exo2mat.C b/packages/seacas/applications/exo2mat/exo2mat.C index e7121ef2d330..dc4fca7878da 100644 --- a/packages/seacas/applications/exo2mat/exo2mat.C +++ b/packages/seacas/applications/exo2mat/exo2mat.C @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /* exodus II to matlab m file, copy of diff --git a/packages/seacas/applications/exo_format/exo_format.c b/packages/seacas/applications/exo_format/exo_format.c index d28ab74d3058..40422536a3db 100644 --- a/packages/seacas/applications/exo_format/exo_format.c +++ b/packages/seacas/applications/exo_format/exo_format.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/applications/exodiff/ED_SystemInterface.C b/packages/seacas/applications/exodiff/ED_SystemInterface.C index 9b348c123f5c..e2878b28035d 100644 --- a/packages/seacas/applications/exodiff/ED_SystemInterface.C +++ b/packages/seacas/applications/exodiff/ED_SystemInterface.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "ED_SystemInterface.h" diff --git a/packages/seacas/applications/exodiff/ED_SystemInterface.h b/packages/seacas/applications/exodiff/ED_SystemInterface.h index 4c5f68ebba15..e73f9d26dcaa 100644 --- a/packages/seacas/applications/exodiff/ED_SystemInterface.h +++ b/packages/seacas/applications/exodiff/ED_SystemInterface.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef Sierra_SystemInterface_h #define Sierra_SystemInterface_h @@ -47,7 +47,7 @@ class SystemInterface std::pair explicit_steps; // Only compare these two steps (db1:db2) if nonzero. size_t max_number_of_names{DEFAULT_MAX_NUMBER_OF_NAMES}; - int max_warnings{100}; + int max_warnings{100}; std::vector glob_var_names; Tolerance glob_var_default{RELATIVE_, 1.0e-6, 0.0}; diff --git a/packages/seacas/applications/exodiff/ED_Version.h b/packages/seacas/applications/exodiff/ED_Version.h index 62706e062332..5a16530a9228 100644 --- a/packages/seacas/applications/exodiff/ED_Version.h +++ b/packages/seacas/applications/exodiff/ED_Version.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef ED_Version_h #define ED_Version_h diff --git a/packages/seacas/applications/exodiff/FileInfo.C b/packages/seacas/applications/exodiff/FileInfo.C index 54b8941c4349..513bbce160dd 100644 --- a/packages/seacas/applications/exodiff/FileInfo.C +++ b/packages/seacas/applications/exodiff/FileInfo.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include @@ -276,12 +276,6 @@ namespace { bool do_stat(const std::string &filename, struct stat *s) { -#if defined(__PUMAGON__) - // Portland pgCC compiler on janus has 'char*' instead of 'const char*' for - // first argument to stat function. - return (stat((char *)filename.c_str(), s) == 0); -#else return (stat(filename.c_str(), s) == 0); -#endif } } // namespace diff --git a/packages/seacas/applications/exodiff/FileInfo.h b/packages/seacas/applications/exodiff/FileInfo.h index 95f0ded3a0d2..0909c2f2c5f7 100644 --- a/packages/seacas/applications/exodiff/FileInfo.h +++ b/packages/seacas/applications/exodiff/FileInfo.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef FileInfo_h diff --git a/packages/seacas/applications/exodiff/MinMaxData.h b/packages/seacas/applications/exodiff/MinMaxData.h index 058edcf3f165..b700cc3ea9e3 100644 --- a/packages/seacas/applications/exodiff/MinMaxData.h +++ b/packages/seacas/applications/exodiff/MinMaxData.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include class DiffData diff --git a/packages/seacas/applications/exodiff/Norm.h b/packages/seacas/applications/exodiff/Norm.h index fdd41d739691..a8b5f0827c3b 100644 --- a/packages/seacas/applications/exodiff/Norm.h +++ b/packages/seacas/applications/exodiff/Norm.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef ED_NORM_H #define ED_NORM_H diff --git a/packages/seacas/applications/exodiff/Tolerance.C b/packages/seacas/applications/exodiff/Tolerance.C index ae0151db51bd..fc1fa75bc8a0 100644 --- a/packages/seacas/applications/exodiff/Tolerance.C +++ b/packages/seacas/applications/exodiff/Tolerance.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "Tolerance.h" #include // for abs diff --git a/packages/seacas/applications/exodiff/Tolerance.h b/packages/seacas/applications/exodiff/Tolerance.h index ffe87b59de44..4412d2ea1bbe 100644 --- a/packages/seacas/applications/exodiff/Tolerance.h +++ b/packages/seacas/applications/exodiff/Tolerance.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef TOLERANCE_H #define TOLERANCE_H diff --git a/packages/seacas/applications/exodiff/check.C b/packages/seacas/applications/exodiff/check.C index 96088de5f38d..af31da779909 100644 --- a/packages/seacas/applications/exodiff/check.C +++ b/packages/seacas/applications/exodiff/check.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include diff --git a/packages/seacas/applications/exodiff/create_file.C b/packages/seacas/applications/exodiff/create_file.C index 3f829e50c96c..b45fe43698ab 100644 --- a/packages/seacas/applications/exodiff/create_file.C +++ b/packages/seacas/applications/exodiff/create_file.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "ED_SystemInterface.h" // for SystemInterface, interFace diff --git a/packages/seacas/applications/exodiff/exoII_read.C b/packages/seacas/applications/exodiff/exoII_read.C index b1590cac72a9..381cc6e8d4ff 100644 --- a/packages/seacas/applications/exodiff/exoII_read.C +++ b/packages/seacas/applications/exodiff/exoII_read.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "ED_SystemInterface.h" // for SystemInterface, etc diff --git a/packages/seacas/applications/exodiff/exoII_read.h b/packages/seacas/applications/exodiff/exoII_read.h index 9a4eb53aa65b..bd6cb2e7ad31 100644 --- a/packages/seacas/applications/exodiff/exoII_read.h +++ b/packages/seacas/applications/exodiff/exoII_read.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef EXOII_READ_H @@ -190,7 +190,7 @@ template class ExoII_Read Side_Set * ssets{nullptr}; // Array. double *nodes{nullptr}; // Matrix; dimension by num_nodes (row major form). - // I.e., all x's then all y's, etc. + // I.e., all x's then all y's, etc. INT *node_map{nullptr}; // Array; num_nodes long when filled. INT *elmt_map{nullptr}; // Array; num_elmts long when filled. @@ -205,12 +205,12 @@ template class ExoII_Read std::vector ns_vars; std::vector ss_vars; - int num_times{0}; + int num_times{0}; double *times{nullptr}; - int cur_time{0}; // Current timestep number of the results (0 means none). + int cur_time{0}; // Current timestep number of the results (0 means none). double **results{nullptr}; // Array of pointers (to arrays of results data); - // length is number of nodal variables. + // length is number of nodal variables. double *global_vals{nullptr}; // Array of global variables for the current timestep. double *global_vals2{nullptr}; // Array of global variables used if interpolating. diff --git a/packages/seacas/applications/exodiff/exo_block.C b/packages/seacas/applications/exodiff/exo_block.C index 97c9b8e78604..3cdd4fd5a333 100644 --- a/packages/seacas/applications/exodiff/exo_block.C +++ b/packages/seacas/applications/exodiff/exo_block.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "ED_SystemInterface.h" // for SystemInterface, interFace diff --git a/packages/seacas/applications/exodiff/exo_block.h b/packages/seacas/applications/exodiff/exo_block.h index eaed0e0a5a63..ebe3b5711cbe 100644 --- a/packages/seacas/applications/exodiff/exo_block.h +++ b/packages/seacas/applications/exodiff/exo_block.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef EXO_BLOCK_H diff --git a/packages/seacas/applications/exodiff/exo_entity.C b/packages/seacas/applications/exodiff/exo_entity.C index 2b843af62723..6c910b30d8c2 100644 --- a/packages/seacas/applications/exodiff/exo_entity.C +++ b/packages/seacas/applications/exodiff/exo_entity.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "ED_SystemInterface.h" diff --git a/packages/seacas/applications/exodiff/exo_entity.h b/packages/seacas/applications/exodiff/exo_entity.h index 70cc592378ea..e34d1a848044 100644 --- a/packages/seacas/applications/exodiff/exo_entity.h +++ b/packages/seacas/applications/exodiff/exo_entity.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef EXO_ENTITY_H diff --git a/packages/seacas/applications/exodiff/exodiff.C b/packages/seacas/applications/exodiff/exodiff.C index 5f0c8ebf5eb5..2e63a7fe578c 100644 --- a/packages/seacas/applications/exodiff/exodiff.C +++ b/packages/seacas/applications/exodiff/exodiff.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include #include diff --git a/packages/seacas/applications/exodiff/exodiff.h b/packages/seacas/applications/exodiff/exodiff.h index 1d3b6ada0a87..46b14691c682 100644 --- a/packages/seacas/applications/exodiff/exodiff.h +++ b/packages/seacas/applications/exodiff/exodiff.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef exodiff_h diff --git a/packages/seacas/applications/exodiff/iqsort.C b/packages/seacas/applications/exodiff/iqsort.C index f4fafa9ef9c3..273815e155af 100644 --- a/packages/seacas/applications/exodiff/iqsort.C +++ b/packages/seacas/applications/exodiff/iqsort.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "iqsort.h" #include diff --git a/packages/seacas/applications/exodiff/iqsort.h b/packages/seacas/applications/exodiff/iqsort.h index 9bc8b5a9e116..963f1a15f62b 100644 --- a/packages/seacas/applications/exodiff/iqsort.h +++ b/packages/seacas/applications/exodiff/iqsort.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IQSORT_H #define IQSORT_H diff --git a/packages/seacas/applications/exodiff/map.C b/packages/seacas/applications/exodiff/map.C index 8fd3bd0264f0..0b7f5edbde74 100644 --- a/packages/seacas/applications/exodiff/map.C +++ b/packages/seacas/applications/exodiff/map.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include diff --git a/packages/seacas/applications/exodiff/map.h b/packages/seacas/applications/exodiff/map.h index 0c8417eb5950..96f9ee23335f 100644 --- a/packages/seacas/applications/exodiff/map.h +++ b/packages/seacas/applications/exodiff/map.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef EXODIFF_MAP_H #define EXODIFF_MAP_H diff --git a/packages/seacas/applications/exodiff/node_set.C b/packages/seacas/applications/exodiff/node_set.C index 73df7dfadd1d..43f746ddf754 100644 --- a/packages/seacas/applications/exodiff/node_set.C +++ b/packages/seacas/applications/exodiff/node_set.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "ED_SystemInterface.h" // for SystemInterface, etc diff --git a/packages/seacas/applications/exodiff/node_set.h b/packages/seacas/applications/exodiff/node_set.h index 5d7649ac8cd8..fa9f1958fc95 100644 --- a/packages/seacas/applications/exodiff/node_set.h +++ b/packages/seacas/applications/exodiff/node_set.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef NODE_SET_H diff --git a/packages/seacas/applications/exodiff/side_set.C b/packages/seacas/applications/exodiff/side_set.C index 5f34d74d2240..0b7030a80378 100644 --- a/packages/seacas/applications/exodiff/side_set.C +++ b/packages/seacas/applications/exodiff/side_set.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "ED_SystemInterface.h" // for SystemInterface, etc diff --git a/packages/seacas/applications/exodiff/side_set.h b/packages/seacas/applications/exodiff/side_set.h index 062450586cfc..3106de629095 100644 --- a/packages/seacas/applications/exodiff/side_set.h +++ b/packages/seacas/applications/exodiff/side_set.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef SIDE_SET_H diff --git a/packages/seacas/applications/exodiff/stringx.C b/packages/seacas/applications/exodiff/stringx.C index 889a3080a030..3f559a009db9 100644 --- a/packages/seacas/applications/exodiff/stringx.C +++ b/packages/seacas/applications/exodiff/stringx.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "smart_assert.h" // for SMART_ASSERT diff --git a/packages/seacas/applications/exodiff/stringx.h b/packages/seacas/applications/exodiff/stringx.h index 634f6f2f7ecb..0f7c37730b57 100644 --- a/packages/seacas/applications/exodiff/stringx.h +++ b/packages/seacas/applications/exodiff/stringx.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef STRINGX_H diff --git a/packages/seacas/applications/exodiff/util.C b/packages/seacas/applications/exodiff/util.C index a54cd109b921..97da9c972c4d 100644 --- a/packages/seacas/applications/exodiff/util.C +++ b/packages/seacas/applications/exodiff/util.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "fmt/color.h" diff --git a/packages/seacas/applications/exodiff/util.h b/packages/seacas/applications/exodiff/util.h index 182b1af1785f..48a42f3adfd8 100644 --- a/packages/seacas/applications/exodiff/util.h +++ b/packages/seacas/applications/exodiff/util.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #ifndef EXODIFF_UTIL_H diff --git a/packages/seacas/applications/exomatlab/EML_CodeTypes.h b/packages/seacas/applications/exomatlab/EML_CodeTypes.h index 407ec6d9f5ad..80e31f7493e1 100644 --- a/packages/seacas/applications/exomatlab/EML_CodeTypes.h +++ b/packages/seacas/applications/exomatlab/EML_CodeTypes.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef SEACAS_CodeTypes_H diff --git a/packages/seacas/applications/exomatlab/EML_SystemInterface.C b/packages/seacas/applications/exomatlab/EML_SystemInterface.C index 5aab2808022f..f99c2a0e1f18 100644 --- a/packages/seacas/applications/exomatlab/EML_SystemInterface.C +++ b/packages/seacas/applications/exomatlab/EML_SystemInterface.C @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/applications/exomatlab/EML_SystemInterface.h b/packages/seacas/applications/exomatlab/EML_SystemInterface.h index ffabf886905b..c8c739094a04 100644 --- a/packages/seacas/applications/exomatlab/EML_SystemInterface.h +++ b/packages/seacas/applications/exomatlab/EML_SystemInterface.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef _SystemInterface_h diff --git a/packages/seacas/applications/exomatlab/EML_Version.h b/packages/seacas/applications/exomatlab/EML_Version.h index b67da251a0c2..91c70b3cc106 100644 --- a/packages/seacas/applications/exomatlab/EML_Version.h +++ b/packages/seacas/applications/exomatlab/EML_Version.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef SEACAS_Version_h diff --git a/packages/seacas/applications/exomatlab/exomatlab.C b/packages/seacas/applications/exomatlab/exomatlab.C index fb57030a3414..c853a9f76758 100644 --- a/packages/seacas/applications/exomatlab/exomatlab.C +++ b/packages/seacas/applications/exomatlab/exomatlab.C @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/applications/exotec2/exotec2.c b/packages/seacas/applications/exotec2/exotec2.c index 06162c10c6f2..1e04992eb6e2 100644 --- a/packages/seacas/applications/exotec2/exotec2.c +++ b/packages/seacas/applications/exotec2/exotec2.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/applications/exotec2/tec.c b/packages/seacas/applications/exotec2/tec.c index 949a8299cf24..d6a5c586ab33 100644 --- a/packages/seacas/applications/exotec2/tec.c +++ b/packages/seacas/applications/exotec2/tec.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/applications/exotxt/et_dbielb.f b/packages/seacas/applications/exotxt/et_dbielb.f index 439fd3b21f55..a336b6883d41 100644 --- a/packages/seacas/applications/exotxt/et_dbielb.f +++ b/packages/seacas/applications/exotxt/et_dbielb.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/exotxt/et_dbign.f b/packages/seacas/applications/exotxt/et_dbign.f index a3048178bf8f..d3e93141354d 100644 --- a/packages/seacas/applications/exotxt/et_dbign.f +++ b/packages/seacas/applications/exotxt/et_dbign.f @@ -1,27 +1,13 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE DBIGN (NDB, NUMESS, IDESS, NNESS, IXNESS, & LTNESS, LTNNN, IOERR) C======================================================================= -C$Id: dbign.f,v 1.4 2007/10/17 18:46:09 gdsjaar Exp $ -C$Log: dbign.f,v $ -CRevision 1.4 2007/10/17 18:46:09 gdsjaar -CAdded copyright notice to all files. -C -Cexotxt2 is licensed under the BSD license -C -CRevision 1.3 1996/05/21 16:52:17 caforsy -CAdded read/write for property data. Cleaned up exodusII error checks -C -CRevision 1.2 1995/11/07 15:01:25 gdsjaar -CInitial checkin of ACCESS/translate/exotxt2 -C - C --*** DBIGN *** Get node from the side sets C -- Written 9/10/95 for ExodusIIv2 C -- diff --git a/packages/seacas/applications/exotxt/et_dbinam.f b/packages/seacas/applications/exotxt/et_dbinam.f index 763b9cf33694..a2a45bbb27b1 100644 --- a/packages/seacas/applications/exotxt/et_dbinam.f +++ b/packages/seacas/applications/exotxt/et_dbinam.f @@ -1,10 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: dbinam.f,v 1.7 2007/10/17 18:46:09 gdsjaar Exp $ C======================================================================= SUBROUTINE DBINAM (NDB, C, KNAMES, NVARGL, NVARNP, NVAREL, & IXGV, IXNV, IXEV, IOERR, NAMLEN) diff --git a/packages/seacas/applications/exotxt/et_dbiqa.f b/packages/seacas/applications/exotxt/et_dbiqa.f index 35f49eeebf78..ec0c01734abf 100644 --- a/packages/seacas/applications/exotxt/et_dbiqa.f +++ b/packages/seacas/applications/exotxt/et_dbiqa.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/exotxt/et_dbiste.f b/packages/seacas/applications/exotxt/et_dbiste.f index 58b6fa4a19b1..92f69088edd4 100644 --- a/packages/seacas/applications/exotxt/et_dbiste.f +++ b/packages/seacas/applications/exotxt/et_dbiste.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= @@ -10,20 +10,6 @@ SUBROUTINE DBISTE (NDB, OPTION, ISTEP, NELBLK, TIME, & IDELB, NUMELB, ISEVOK, & VARGL, VARNP, VAREL, IOERR) C======================================================================= -C$Id: dbiste.f,v 1.4 2007/10/17 18:46:09 gdsjaar Exp $ -C$Log: dbiste.f,v $ -CRevision 1.4 2007/10/17 18:46:09 gdsjaar -CAdded copyright notice to all files. -C -Cexotxt2 is licensed under the BSD license -C -CRevision 1.3 1996/05/21 16:52:20 caforsy -CAdded read/write for property data. Cleaned up exodusII error checks -C -CRevision 1.2 1995/11/07 15:01:39 gdsjaar -CInitial checkin of ACCESS/translate/exotxt2 -C - C --*** DBISTE *** (EXOLIB) Read database variables for one time step C -- Written by Amy Gilkey - revised 10/14/87 C -- Modified for ExodusIIv2 database format 10/16/95 @@ -54,7 +40,6 @@ SUBROUTINE DBISTE (NDB, OPTION, ISTEP, NELBLK, TIME, C -- VAREL - OUT - the element variables for the time step (if OPTION) C -- IOERR - OUT - I/O error flag - INTEGER NDB CHARACTER*(*) OPTION INTEGER ISTEP @@ -79,7 +64,6 @@ SUBROUTINE DBISTE (NDB, OPTION, ISTEP, NELBLK, TIME, CALL EXGGV (NDB, ISTEP, NVARGL, VARGL, IERR) END IF - C --Read nodal variables IF (NVARNP .GT. 0) THEN INP = 1 diff --git a/packages/seacas/applications/exotxt/et_dbivtt.f b/packages/seacas/applications/exotxt/et_dbivtt.f index 3a0a06550146..e89916fc7596 100644 --- a/packages/seacas/applications/exotxt/et_dbivtt.f +++ b/packages/seacas/applications/exotxt/et_dbivtt.f @@ -1,13 +1,13 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE DBIVTT (NDB, ISEVOK, ITMP, NELBLK, NVAREL) C======================================================================= -C + C --*** DBIVTT *** Read element variable truth table C -- Modified for ExodusII format 8/26/95 C -- diff --git a/packages/seacas/applications/exotxt/et_dbpini.f b/packages/seacas/applications/exotxt/et_dbpini.f index 9819ec22f714..e290c4a9582d 100644 --- a/packages/seacas/applications/exotxt/et_dbpini.f +++ b/packages/seacas/applications/exotxt/et_dbpini.f @@ -1,10 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C$Id: dbpini.f,v 1.2 2001/06/26 17:38:54 gdsjaar Exp $ C======================================================================= SUBROUTINE DBPINI (OPTION, NDB, TITLE, NDIM, NUMNP, NUMEL, NELBLK, & NUMNPS, LNPSNL, LNPSDF, NUMESS, LESSEL, @@ -51,7 +50,6 @@ SUBROUTINE DBPINI (OPTION, NDB, TITLE, NDIM, NUMNP, NUMEL, NELBLK, LOGICAL ALL ALL = (OPTION .EQ. '*') - IF (ALL .OR. (INDEX (OPTION, 'I') .GT. 0)) THEN WRITE(*, 10000) ENDIF diff --git a/packages/seacas/applications/exotxt/et_dbvini.f b/packages/seacas/applications/exotxt/et_dbvini.f index dd8eb764138a..e739dc976959 100644 --- a/packages/seacas/applications/exotxt/et_dbvini.f +++ b/packages/seacas/applications/exotxt/et_dbvini.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/exotxt/et_wrelb.f b/packages/seacas/applications/exotxt/et_wrelb.f index c52d91a2aea0..3fbdfaf60af3 100644 --- a/packages/seacas/applications/exotxt/et_wrelb.f +++ b/packages/seacas/applications/exotxt/et_wrelb.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= @@ -76,7 +76,7 @@ SUBROUTINE WRCONAT(NTXT, NUMELB, NUMLNK, NUMATR, LINK, ATRIB) C WRCONAT - Write the connectivity and attributes to a text file C Written for ExodusIIv2 database format 10/12/95 -C + C NTXT - IN - file id C NUMELB - IN - number of element in element block C NUMLNK - IN - number of nodes per element in element block diff --git a/packages/seacas/applications/exotxt/et_wress.f b/packages/seacas/applications/exotxt/et_wress.f index 18dad8c90fe2..1b505c0254e9 100644 --- a/packages/seacas/applications/exotxt/et_wress.f +++ b/packages/seacas/applications/exotxt/et_wress.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/exotxt/et_wrinit.f b/packages/seacas/applications/exotxt/et_wrinit.f index 7f276027fb68..c08512614fde 100644 --- a/packages/seacas/applications/exotxt/et_wrinit.f +++ b/packages/seacas/applications/exotxt/et_wrinit.f @@ -1,10 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details - C======================================================================= SUBROUTINE WRINIT (NTXT, VERS, TITLE, NDIM, NUMNP, NUMEL, NELBLK, & NUMNPS, LNPSNL, LNPSDF, NUMESS, LESSEL, LESSNL, diff --git a/packages/seacas/applications/exotxt/et_wrmap.f b/packages/seacas/applications/exotxt/et_wrmap.f index 3ec1e88c3073..7493940b9f12 100644 --- a/packages/seacas/applications/exotxt/et_wrmap.f +++ b/packages/seacas/applications/exotxt/et_wrmap.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/exotxt/et_wrname.f b/packages/seacas/applications/exotxt/et_wrname.f index 5d1cb6403871..16736d0b4717 100644 --- a/packages/seacas/applications/exotxt/et_wrname.f +++ b/packages/seacas/applications/exotxt/et_wrname.f @@ -1,10 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details - C======================================================================= SUBROUTINE WRNAME (NTXT, NDIM, NELBLK, NVARGL, NVARNP, & NVAREL, NAMEGV, NAMENV, NAMEEV, ISEVOK, NAMLEN) diff --git a/packages/seacas/applications/exotxt/et_wrnps.f b/packages/seacas/applications/exotxt/et_wrnps.f index cd34d3d24c4a..86f2591da311 100644 --- a/packages/seacas/applications/exotxt/et_wrnps.f +++ b/packages/seacas/applications/exotxt/et_wrnps.f @@ -1,10 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details - C======================================================================= SUBROUTINE WRNPS (NTXT, NUMNPS, LNPSNL, LNPSDF, IDNPS, NNNPS, & NDNPS, IXNNPS, IXDNPS, LTNNPS, FACNPS) diff --git a/packages/seacas/applications/exotxt/et_wrprop.f b/packages/seacas/applications/exotxt/et_wrprop.f index 74bca63d9bd4..2736581fe6ae 100644 --- a/packages/seacas/applications/exotxt/et_wrprop.f +++ b/packages/seacas/applications/exotxt/et_wrprop.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C************************************************************************ diff --git a/packages/seacas/applications/exotxt/et_wrqa.f b/packages/seacas/applications/exotxt/et_wrqa.f index cc485e823bce..d6de3d577f76 100644 --- a/packages/seacas/applications/exotxt/et_wrqa.f +++ b/packages/seacas/applications/exotxt/et_wrqa.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/exotxt/et_wrstep.f b/packages/seacas/applications/exotxt/et_wrstep.f index 56ce042a99d8..6eb2b1f6e4ad 100644 --- a/packages/seacas/applications/exotxt/et_wrstep.f +++ b/packages/seacas/applications/exotxt/et_wrstep.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/exotxt/et_wrxyz.f b/packages/seacas/applications/exotxt/et_wrxyz.f index 81af40230b76..c8ba9592c1ff 100644 --- a/packages/seacas/applications/exotxt/et_wrxyz.f +++ b/packages/seacas/applications/exotxt/et_wrxyz.f @@ -1,10 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details - C======================================================================= SUBROUTINE WRXYZ (NTXT, NDIM, NUMNP, XN, YN, ZN, nameco, namlen) C======================================================================= diff --git a/packages/seacas/applications/exotxt/exotxt.f b/packages/seacas/applications/exotxt/exotxt.f index d1d389026f01..58676f39feaf 100644 --- a/packages/seacas/applications/exotxt/exotxt.f +++ b/packages/seacas/applications/exotxt/exotxt.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= @@ -21,7 +21,6 @@ PROGRAM EXOTXT include 'exodusII.inc' INCLUDE 'argparse.inc' - C Input/Output File Arguments C CPUWS - The word size in bytes of the floating point variables C used in the application program @@ -48,7 +47,6 @@ PROGRAM EXOTXT DIMENSION A(1) CHARACTER*1 C(1) - C Program Information C. QAINFO(1) = 'exotxt ' @@ -298,7 +296,6 @@ PROGRAM EXOTXT END IF END IF - C --Read/write the element side sets IF (NUMESS .GT. 0) THEN @@ -348,7 +345,6 @@ PROGRAM EXOTXT & A(KIXNSS), A(KLTNSS), A(KLTNNN), IOERR) IF (IOERR .EQ. 1) GO TO 140 - CALL WRESS (NTXT, NUMESS, LESSEL, LESSNL, LESSDF, & A(KIDSS), A(KNESS), A(KNDSS), A(KIXESS), A(KIDESS), & A(KLTESS), A(KLTSSS), A(KFACSS), A(KNNSS), A(KIXNSS), @@ -448,7 +444,6 @@ PROGRAM EXOTXT ioerr = 1 end if - C --Read the QA records C QA and Information record number stored in dbnumq.blk C Request the number of QA records. Return the value @@ -478,7 +473,6 @@ PROGRAM EXOTXT GOTO 140 END IF - C --Read the database names C Read the number of global, node, and element variables @@ -595,7 +589,6 @@ PROGRAM EXOTXT END - C ... Written as wrapper to get string lengths correct on coordinate C name array which is dynamically allocated SUBROUTINE GETXYZ(NDB, NAMECO, X, Y, Z, ierr, namlen) @@ -605,4 +598,3 @@ SUBROUTINE GETXYZ(NDB, NAMECO, X, Y, Z, ierr, namlen) call exgcon(ndb, nameco, ierr) return end - diff --git a/packages/seacas/applications/explore/exp_check.f b/packages/seacas/applications/explore/exp_check.f index 7f7d51576462..4372ed9388d5 100644 --- a/packages/seacas/applications/explore/exp_check.f +++ b/packages/seacas/applications/explore/exp_check.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details subroutine check(a, ia, exodus, idelb, ebtype, * numelb, isevok, numlnk, diff --git a/packages/seacas/applications/explore/exp_chkcnt.f b/packages/seacas/applications/explore/exp_chkcnt.f index d61b0c01ccbb..f0f9fd6b3faf 100644 --- a/packages/seacas/applications/explore/exp_chkcnt.f +++ b/packages/seacas/applications/explore/exp_chkcnt.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE CHKCNT (ICHECK, LENCHK, NZERO, NMULT) diff --git a/packages/seacas/applications/explore/exp_chkrng.f b/packages/seacas/applications/explore/exp_chkrng.f index c16b9d51e04f..340f2170a4c4 100644 --- a/packages/seacas/applications/explore/exp_chkrng.f +++ b/packages/seacas/applications/explore/exp_chkrng.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE CHKRNG (IARRAY, NITEMS, MAXVAL, NZERO, NERR) diff --git a/packages/seacas/applications/explore/exp_ckeb1.f b/packages/seacas/applications/explore/exp_ckeb1.f index d35416c0c699..9f75156497b1 100644 --- a/packages/seacas/applications/explore/exp_ckeb1.f +++ b/packages/seacas/applications/explore/exp_ckeb1.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE CKEB1 (IEL0, IELB, IDELB, NUMELB, NUMLNK, NUMNP, LINK, @@ -66,7 +66,6 @@ SUBROUTINE CKEB1 (IEL0, IELB, IDELB, NUMELB, NUMLNK, NUMNP, LINK, CALL PRTERR ('CMDSPEC', STRA(:lstra)) end if - 110 CONTINUE RETURN diff --git a/packages/seacas/applications/explore/exp_ckelb.f b/packages/seacas/applications/explore/exp_ckelb.f index 3390919303db..bba6ba584d9f 100644 --- a/packages/seacas/applications/explore/exp_ckelb.f +++ b/packages/seacas/applications/explore/exp_ckelb.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE CKELB (NELBLK, NUMEL, NUMNP, EBTYPE, diff --git a/packages/seacas/applications/explore/exp_ckess.f b/packages/seacas/applications/explore/exp_ckess.f index 48b89614ff13..36bea8ca2edb 100644 --- a/packages/seacas/applications/explore/exp_ckess.f +++ b/packages/seacas/applications/explore/exp_ckess.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE CKESS (NUMESS, LESSEL, LESSNL, NUMEL, NUMNP, diff --git a/packages/seacas/applications/explore/exp_ckmap.f b/packages/seacas/applications/explore/exp_ckmap.f index fa55176c9bba..03da32b97044 100644 --- a/packages/seacas/applications/explore/exp_ckmap.f +++ b/packages/seacas/applications/explore/exp_ckmap.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE CKMAP (ICNT, MAP, INDX, TYPE) diff --git a/packages/seacas/applications/explore/exp_cknps.f b/packages/seacas/applications/explore/exp_cknps.f index d06e45dd9e7d..8860e6353e81 100644 --- a/packages/seacas/applications/explore/exp_cknps.f +++ b/packages/seacas/applications/explore/exp_cknps.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE CKNPS (NUMNPS, LNPSNL, NUMNP, diff --git a/packages/seacas/applications/explore/exp_comand.f b/packages/seacas/applications/explore/exp_comand.f index aaaba899b844..d244c8ecdb86 100644 --- a/packages/seacas/applications/explore/exp_comand.f +++ b/packages/seacas/applications/explore/exp_comand.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE COMAND (A, IA, EXODUS, DBNAME, QAREC, INFO, diff --git a/packages/seacas/applications/explore/exp_dbase.blk b/packages/seacas/applications/explore/exp_dbase.blk index 31a652846f48..3e6425d8bfed 100644 --- a/packages/seacas/applications/explore/exp_dbase.blk +++ b/packages/seacas/applications/explore/exp_dbase.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /DBASE/ NDB, NCSTEP, NSTEPNS, NSTEPSS C --NDB - the channel number of the database diff --git a/packages/seacas/applications/explore/exp_dbnums.blk b/packages/seacas/applications/explore/exp_dbnums.blk index 48d204de4325..1bfb4cac5d64 100644 --- a/packages/seacas/applications/explore/exp_dbnums.blk +++ b/packages/seacas/applications/explore/exp_dbnums.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /DBNUMS/ NDIM, NUMNP, NUMEL, NELBLK, & NUMNPS, LNPSNL, LNPSDF, NUMESS, LESSEL, LESSNL, LESSDF, diff --git a/packages/seacas/applications/explore/exp_dbsbel.f b/packages/seacas/applications/explore/exp_dbsbel.f index 7064743e0884..7e3c7cfdc285 100644 --- a/packages/seacas/applications/explore/exp_dbsbel.f +++ b/packages/seacas/applications/explore/exp_dbsbel.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE DBSBEL (NELBLK, NUMEL, LENE, INEL, NLISEL, LISEL) diff --git a/packages/seacas/applications/explore/exp_dbselb.f b/packages/seacas/applications/explore/exp_dbselb.f index e1283ce53033..c7876ba34bf9 100644 --- a/packages/seacas/applications/explore/exp_dbselb.f +++ b/packages/seacas/applications/explore/exp_dbselb.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE DBSELB (NELBLK, NUMEL, LENE, INELB, NLISEL, LISEL) diff --git a/packages/seacas/applications/explore/exp_dbtitl.blk b/packages/seacas/applications/explore/exp_dbtitl.blk index 7a8f36d9f9d0..931bce8808ec 100644 --- a/packages/seacas/applications/explore/exp_dbtitl.blk +++ b/packages/seacas/applications/explore/exp_dbtitl.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /DBTITL/ TITLE CHARACTER*(MXLNLN) TITLE diff --git a/packages/seacas/applications/explore/exp_errcnt.blk b/packages/seacas/applications/explore/exp_errcnt.blk index 283c72d81be1..d532a00188d0 100644 --- a/packages/seacas/applications/explore/exp_errcnt.blk +++ b/packages/seacas/applications/explore/exp_errcnt.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details common /errcnt/ maxerrs c ... -- maxerrs - the maximum number of errors to print in a check. diff --git a/packages/seacas/applications/explore/exp_getprc.f b/packages/seacas/applications/explore/exp_getprc.f index e4a333bd34ed..391e83e53083 100644 --- a/packages/seacas/applications/explore/exp_getprc.f +++ b/packages/seacas/applications/explore/exp_getprc.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details INTEGER FUNCTION GETPRC() C returns the precision for output. diff --git a/packages/seacas/applications/explore/exp_invcon.f b/packages/seacas/applications/explore/exp_invcon.f index 15f3d432c4fc..09125419edf4 100644 --- a/packages/seacas/applications/explore/exp_invcon.f +++ b/packages/seacas/applications/explore/exp_invcon.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE INVCON (ia, NELBLK, IDELB, NUMELB, NUMLNK, LINK, NUMNP, @@ -235,5 +235,3 @@ subroutine invcn2n(ielst, numelb, nnpe, link, return end - - diff --git a/packages/seacas/applications/explore/exp_limits.f b/packages/seacas/applications/explore/exp_limits.f index 5b2ab3cebe28..86a74dd81ddd 100644 --- a/packages/seacas/applications/explore/exp_limits.f +++ b/packages/seacas/applications/explore/exp_limits.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= subroutine limits(ndim, numnp, cord) diff --git a/packages/seacas/applications/explore/exp_numstr.f b/packages/seacas/applications/explore/exp_numstr.f index 4d19ed3bce27..4fbb6076bd39 100644 --- a/packages/seacas/applications/explore/exp_numstr.f +++ b/packages/seacas/applications/explore/exp_numstr.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE NUMSTR (NNUM, NSIG, RNUM, RSTR, LSTR) diff --git a/packages/seacas/applications/explore/exp_nxmmax.f b/packages/seacas/applications/explore/exp_nxmmax.f index 0d4b5db749e4..574172905bfb 100644 --- a/packages/seacas/applications/explore/exp_nxmmax.f +++ b/packages/seacas/applications/explore/exp_nxmmax.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE NXMMAX (ISTEP, MMNUM, IVAR, NVAR, NUM, VAR, diff --git a/packages/seacas/applications/explore/exp_outfil.blk b/packages/seacas/applications/explore/exp_outfil.blk index 4197acddd7bc..af5aff912ff7 100644 --- a/packages/seacas/applications/explore/exp_outfil.blk +++ b/packages/seacas/applications/explore/exp_outfil.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /OUTFIL/ NOUT, NCRT, NPRT, ANYPRT LOGICAL ANYPRT diff --git a/packages/seacas/applications/explore/exp_preb1.f b/packages/seacas/applications/explore/exp_preb1.f index f78985637b66..5ce52e4731e3 100644 --- a/packages/seacas/applications/explore/exp_preb1.f +++ b/packages/seacas/applications/explore/exp_preb1.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE PREB1 (OPTION, NOUT, IEL0, NLISEL, LISEL, diff --git a/packages/seacas/applications/explore/exp_prebn.f b/packages/seacas/applications/explore/exp_prebn.f index 9412cd738abf..8a93e7ab7444 100644 --- a/packages/seacas/applications/explore/exp_prebn.f +++ b/packages/seacas/applications/explore/exp_prebn.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE PREBN (OPTION, NOUT, IELB, NUME, IDELB, diff --git a/packages/seacas/applications/explore/exp_prelb.f b/packages/seacas/applications/explore/exp_prelb.f index b7723cec4fde..110dcd1d5ce5 100644 --- a/packages/seacas/applications/explore/exp_prelb.f +++ b/packages/seacas/applications/explore/exp_prelb.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE PRELB (OPTION, NOUT, NELBLK, NLISEL, LISEL, diff --git a/packages/seacas/applications/explore/exp_prelem.f b/packages/seacas/applications/explore/exp_prelem.f index 797e817ee0c8..d3d94abcad93 100644 --- a/packages/seacas/applications/explore/exp_prelem.f +++ b/packages/seacas/applications/explore/exp_prelem.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE PRELEM (OPTION, NOUT, @@ -46,7 +46,6 @@ SUBROUTINE PRELEM (OPTION, NOUT, CHARACTER*40 FMT20,FMT30, FMT40 INTEGER PRTLEN - PRTLEN = GETPRC() + 7 WRITE(FMT20,20) PRTLEN, PRTLEN-7 WRITE(FMT30,30) PRTLEN diff --git a/packages/seacas/applications/explore/exp_press.f b/packages/seacas/applications/explore/exp_press.f index 48a87218835c..ac730922f99a 100644 --- a/packages/seacas/applications/explore/exp_press.f +++ b/packages/seacas/applications/explore/exp_press.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE PRESS (OPTION, NOUT, NUMESS, LISESS, LESSEL, LESSNL, diff --git a/packages/seacas/applications/explore/exp_prfrm.f b/packages/seacas/applications/explore/exp_prfrm.f index 9a8596836fae..2f8e58cdc8a8 100644 --- a/packages/seacas/applications/explore/exp_prfrm.f +++ b/packages/seacas/applications/explore/exp_prfrm.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE PRFRM (NOUT) diff --git a/packages/seacas/applications/explore/exp_prglob.f b/packages/seacas/applications/explore/exp_prglob.f index be375cc669dc..bb17b7c5d672 100644 --- a/packages/seacas/applications/explore/exp_prglob.f +++ b/packages/seacas/applications/explore/exp_prglob.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE PRGLOB (OPTION, NOUT, NVARGL, LISGV, NAMEGV, VARGL) diff --git a/packages/seacas/applications/explore/exp_prinit.f b/packages/seacas/applications/explore/exp_prinit.f index eb3c25f4dbf2..7a3276faf12f 100644 --- a/packages/seacas/applications/explore/exp_prinit.f +++ b/packages/seacas/applications/explore/exp_prinit.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE PRINIT (OPTION, NOUT, DBNAME, TITLE, diff --git a/packages/seacas/applications/explore/exp_prmap.f b/packages/seacas/applications/explore/exp_prmap.f index 3d80edb3aa82..a8c8edddd603 100644 --- a/packages/seacas/applications/explore/exp_prmap.f +++ b/packages/seacas/applications/explore/exp_prmap.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE PRMAP (OPTION, NOUT, TYPE, NUMEL, MAPEL) diff --git a/packages/seacas/applications/explore/exp_prmmax.f b/packages/seacas/applications/explore/exp_prmmax.f index 03c3a8add84d..e8bac2c60461 100644 --- a/packages/seacas/applications/explore/exp_prmmax.f +++ b/packages/seacas/applications/explore/exp_prmmax.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE PRMMAX (NOUT, MMSTEP, MMNAME, MMTYP, MMVAR, MMNUM, diff --git a/packages/seacas/applications/explore/exp_prname.f b/packages/seacas/applications/explore/exp_prname.f index 2046db086913..beb92e117675 100644 --- a/packages/seacas/applications/explore/exp_prname.f +++ b/packages/seacas/applications/explore/exp_prname.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE PRNAME (OPTION, NOUT, diff --git a/packages/seacas/applications/explore/exp_prnode.f b/packages/seacas/applications/explore/exp_prnode.f index e4c40a7d713f..01241af7260d 100644 --- a/packages/seacas/applications/explore/exp_prnode.f +++ b/packages/seacas/applications/explore/exp_prnode.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE PRNODE (OPTION, NOUT, NUMNP, LISNP, @@ -58,7 +58,6 @@ SUBROUTINE PRNODE (OPTION, NOUT, NUMNP, LISNP, END IF 90 continue - DO 100 IX = 1, LISNP(0) INP = LISNP(IX) if (domap) then diff --git a/packages/seacas/applications/explore/exp_prnps.f b/packages/seacas/applications/explore/exp_prnps.f index 566121a6c597..3de4643ee39a 100644 --- a/packages/seacas/applications/explore/exp_prnps.f +++ b/packages/seacas/applications/explore/exp_prnps.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE PRNPS (OPTION, NOUT, NUMNPS, LISNPS, LNPSNL, diff --git a/packages/seacas/applications/explore/exp_prnsv.f b/packages/seacas/applications/explore/exp_prnsv.f index 94eda1b2b1cd..03b9ce0ef9f3 100644 --- a/packages/seacas/applications/explore/exp_prnsv.f +++ b/packages/seacas/applications/explore/exp_prnsv.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE PRNSV (NOUT, NSTEP, NUMNPS, LISNPS, LNPSNL, @@ -93,7 +93,6 @@ SUBROUTINE PRNSV (NOUT, NSTEP, NUMNPS, LISNPS, LNPSNL, END IF 90 continue - WRITE (STRA, 10001, IOSTAT=IDUM) NUMNPS 10001 FORMAT ('(#', I4, ')') CALL PCKSTR (1, STRA) diff --git a/packages/seacas/applications/explore/exp_progqa.blk b/packages/seacas/applications/explore/exp_progqa.blk index 4b464bc90ae2..897d8bc6d268 100644 --- a/packages/seacas/applications/explore/exp_progqa.blk +++ b/packages/seacas/applications/explore/exp_progqa.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /PROGQA/ QAINFO(6) CHARACTER*8 QAINFO diff --git a/packages/seacas/applications/explore/exp_prqa.f b/packages/seacas/applications/explore/exp_prqa.f index 406e2e018b1b..4ee736a82d72 100644 --- a/packages/seacas/applications/explore/exp_prqa.f +++ b/packages/seacas/applications/explore/exp_prqa.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE PRQA (OPTION, NOUT, NQAREC, QAREC, NINFO, INFO) diff --git a/packages/seacas/applications/explore/exp_prssv.f b/packages/seacas/applications/explore/exp_prssv.f index 747a9bd76e3d..1555312e8b00 100644 --- a/packages/seacas/applications/explore/exp_prssv.f +++ b/packages/seacas/applications/explore/exp_prssv.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE PRSSV (NOUT, NSTEP, NUMESS, LISESS, LESSEL, @@ -49,7 +49,6 @@ SUBROUTINE PRSSV (NOUT, NSTEP, NUMESS, LISESS, LESSEL, CHARACTER*20 STRA, STRB - C ... See if need to read the data if (nstep .ne. nstepss) then nstepss = nstep @@ -93,7 +92,6 @@ SUBROUTINE PRSSV (NOUT, NSTEP, NUMESS, LISESS, LESSEL, END IF 90 continue - WRITE (STRA, 10001, IOSTAT=IDUM) NUMESS 10001 FORMAT ('(#', I4, ')') CALL PCKSTR (1, STRA) diff --git a/packages/seacas/applications/explore/exp_prstep.f b/packages/seacas/applications/explore/exp_prstep.f index bcbe5d1072d5..1ea5989b38ee 100644 --- a/packages/seacas/applications/explore/exp_prstep.f +++ b/packages/seacas/applications/explore/exp_prstep.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE PRSTEP (OPTION, NOUT, TIME, NCSTEP, NSTEPS) diff --git a/packages/seacas/applications/explore/exp_prtims.f b/packages/seacas/applications/explore/exp_prtims.f index 49cb4070473f..3f0af3975584 100644 --- a/packages/seacas/applications/explore/exp_prtims.f +++ b/packages/seacas/applications/explore/exp_prtims.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE PRTIMS (OPTION, NOUT, NSTEPS, TIMES) diff --git a/packages/seacas/applications/explore/exp_prvers.f b/packages/seacas/applications/explore/exp_prvers.f index be44a9761385..b6b3416b5a74 100644 --- a/packages/seacas/applications/explore/exp_prvers.f +++ b/packages/seacas/applications/explore/exp_prvers.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE PRVERS (NDB, NOUT) diff --git a/packages/seacas/applications/explore/exp_prxyz.f b/packages/seacas/applications/explore/exp_prxyz.f index c6797b34af6f..12ea4b8bc42a 100644 --- a/packages/seacas/applications/explore/exp_prxyz.f +++ b/packages/seacas/applications/explore/exp_prxyz.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE PRXYZ (OPTION, NOUT, NDIM, NAMECO, NUMNP, LISNP, CORD, diff --git a/packages/seacas/applications/explore/exp_qainfo.blk b/packages/seacas/applications/explore/exp_qainfo.blk index 34abe840fe1a..7420a3086093 100644 --- a/packages/seacas/applications/explore/exp_qainfo.blk +++ b/packages/seacas/applications/explore/exp_qainfo.blk @@ -2,7 +2,7 @@ C -*- Mode: fortran -*- C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details QAINFO(1) = 'Explore ' QAINFO(2) = ' ' @@ -10,7 +10,7 @@ C See packages/seacas/LICENSE for details QAINFO(2)(:8) = '20200113' QAINFO(3)(:8) = ' 3.06' -C + c..Dynamic dimensioning of block names+other changes c..compress output of distribution factors c..Fix nodal variable read diff --git a/packages/seacas/applications/explore/exp_rdcord.f b/packages/seacas/applications/explore/exp_rdcord.f index d7830f0bee3c..1bda2dc3e4b0 100644 --- a/packages/seacas/applications/explore/exp_rdcord.f +++ b/packages/seacas/applications/explore/exp_rdcord.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE RDCORD (NDB, NDIM, NUMNP, CORD, NAMECO, ISEOF, NAMLEN) diff --git a/packages/seacas/applications/explore/exp_rdeb1.f b/packages/seacas/applications/explore/exp_rdeb1.f index 1b350925daa7..53c656543eef 100644 --- a/packages/seacas/applications/explore/exp_rdeb1.f +++ b/packages/seacas/applications/explore/exp_rdeb1.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE RDEB1 (NDB, IDELB, NUMELB, NUMLNK, NUMATR, diff --git a/packages/seacas/applications/explore/exp_rdelb.f b/packages/seacas/applications/explore/exp_rdelb.f index 59d675cfd3b0..8efddbf78737 100644 --- a/packages/seacas/applications/explore/exp_rdelb.f +++ b/packages/seacas/applications/explore/exp_rdelb.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE RDELB (NDB, NELBLK, IDELB, NUMELB, NUMLNK, NUMATR, diff --git a/packages/seacas/applications/explore/exp_rdess.f b/packages/seacas/applications/explore/exp_rdess.f index a33a5f60e767..bf0c0428566d 100644 --- a/packages/seacas/applications/explore/exp_rdess.f +++ b/packages/seacas/applications/explore/exp_rdess.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE RDESS (NDB, NUMESS, LESSEL, LESSNL, @@ -69,7 +69,6 @@ SUBROUTINE RDESS (NDB, NUMESS, LESSEL, LESSNL, end if 80 continue - ies = 1 ifs = 1 do 90 i = 1, numess diff --git a/packages/seacas/applications/explore/exp_rdmap.f b/packages/seacas/applications/explore/exp_rdmap.f index 67110794d8a0..34e105a84bf6 100644 --- a/packages/seacas/applications/explore/exp_rdmap.f +++ b/packages/seacas/applications/explore/exp_rdmap.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE RDMAP (NDB, NUMEL, MAPEL, ISEOF) diff --git a/packages/seacas/applications/explore/exp_rdmmax.f b/packages/seacas/applications/explore/exp_rdmmax.f index 1199bcb95255..6f58bb6de3d0 100644 --- a/packages/seacas/applications/explore/exp_rdmmax.f +++ b/packages/seacas/applications/explore/exp_rdmmax.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE RDMMAX (IFLD, INTYP, CFIELD, diff --git a/packages/seacas/applications/explore/exp_rdnam1.f b/packages/seacas/applications/explore/exp_rdnam1.f index aa0eee377b41..9febd6cd4982 100644 --- a/packages/seacas/applications/explore/exp_rdnam1.f +++ b/packages/seacas/applications/explore/exp_rdnam1.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE RDNAM1 (NDB, TYPE, NBLK, NVAR, ISEVOK) diff --git a/packages/seacas/applications/explore/exp_rdname.f b/packages/seacas/applications/explore/exp_rdname.f index 9eb9d3c852d3..50eb3bebbce4 100644 --- a/packages/seacas/applications/explore/exp_rdname.f +++ b/packages/seacas/applications/explore/exp_rdname.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE RDNAME (A, C, NDB, KVNAMI, KVNAMO, diff --git a/packages/seacas/applications/explore/exp_rdnmap.f b/packages/seacas/applications/explore/exp_rdnmap.f index c27a6e21f967..7d64e81679c3 100644 --- a/packages/seacas/applications/explore/exp_rdnmap.f +++ b/packages/seacas/applications/explore/exp_rdnmap.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE RDNMAP (NDB, NUMNP, MAPNO, ISEOF) diff --git a/packages/seacas/applications/explore/exp_rdnps.f b/packages/seacas/applications/explore/exp_rdnps.f index d02989bc9116..70e5934fd142 100644 --- a/packages/seacas/applications/explore/exp_rdnps.f +++ b/packages/seacas/applications/explore/exp_rdnps.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE RDNPS (NDB, NUMNPS, LNPSNL, IDNPS, NNNPS, NDNPS, diff --git a/packages/seacas/applications/explore/exp_rdqa.f b/packages/seacas/applications/explore/exp_rdqa.f index 3afec5b0552e..81ee1cf87a05 100644 --- a/packages/seacas/applications/explore/exp_rdqa.f +++ b/packages/seacas/applications/explore/exp_rdqa.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE RDQA (NDB, NQAREC, NINFO, KQAREC, KINFO, C) diff --git a/packages/seacas/applications/explore/exp_rdstep.f b/packages/seacas/applications/explore/exp_rdstep.f index 7142bee9f3e5..10ac9c95750e 100644 --- a/packages/seacas/applications/explore/exp_rdstep.f +++ b/packages/seacas/applications/explore/exp_rdstep.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE RDSTEP (NDB, NCSTEP, diff --git a/packages/seacas/applications/explore/exp_rdtims.f b/packages/seacas/applications/explore/exp_rdtims.f index c8178668f2d3..02cc99f93a6b 100644 --- a/packages/seacas/applications/explore/exp_rdtims.f +++ b/packages/seacas/applications/explore/exp_rdtims.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE RDTIMS (NDB, TIMES) diff --git a/packages/seacas/applications/explore/exp_rixid.f b/packages/seacas/applications/explore/exp_rixid.f index 0d6083bf9129..c58e7e59a88e 100644 --- a/packages/seacas/applications/explore/exp_rixid.f +++ b/packages/seacas/applications/explore/exp_rixid.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE RIXID (INLINE, IFLD, INTYP, CFIELD, IFIELD, diff --git a/packages/seacas/applications/explore/exp_rixint.f b/packages/seacas/applications/explore/exp_rixint.f index 1e27b4c9d832..6e1df5a182ef 100644 --- a/packages/seacas/applications/explore/exp_rixint.f +++ b/packages/seacas/applications/explore/exp_rixint.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE RIXINT (INLINE, IFLD, INTYP, CFIELD, IFIELD, diff --git a/packages/seacas/applications/explore/exp_rixwrd.f b/packages/seacas/applications/explore/exp_rixwrd.f index 2de39bad84c3..408ecb9ad79f 100644 --- a/packages/seacas/applications/explore/exp_rixwrd.f +++ b/packages/seacas/applications/explore/exp_rixwrd.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE RIXWRD (INLINE, IFLD, INTYP, CFIELD, diff --git a/packages/seacas/applications/explore/exp_rmixint.f b/packages/seacas/applications/explore/exp_rmixint.f index 7c6243209d55..baa9c4570dbc 100644 --- a/packages/seacas/applications/explore/exp_rmixint.f +++ b/packages/seacas/applications/explore/exp_rmixint.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/explore/exp_selblk.f b/packages/seacas/applications/explore/exp_selblk.f index 7c9d7a4eb974..05092e5ce11e 100644 --- a/packages/seacas/applications/explore/exp_selblk.f +++ b/packages/seacas/applications/explore/exp_selblk.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE SELBLK (NUMSEL, IXSEL, NELBLK, LISBLK, NUMELB, NUMLNK, @@ -44,7 +44,7 @@ SUBROUTINE SELBLK (NUMSEL, IXSEL, NELBLK, LISBLK, NUMELB, NUMLNK, end if ISLNK = ISLNK + numnod 100 CONTINUE -C + numsel = 0 do 120 i=1, numnp if (iscr(i) .gt. 0) then diff --git a/packages/seacas/applications/explore/exp_selmap.f b/packages/seacas/applications/explore/exp_selmap.f index 6b8575ee8f3d..7660738559db 100644 --- a/packages/seacas/applications/explore/exp_selmap.f +++ b/packages/seacas/applications/explore/exp_selmap.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE SELMAP (NOUT, TYPE, IDGLO, NUMEL, MAPEL) @@ -47,4 +47,3 @@ SUBROUTINE SELMAP (NOUT, TYPE, IDGLO, NUMEL, MAPEL) 10030 format (1x, 3x, 'Global ',A,I12,' is local ',A,I12) END - diff --git a/packages/seacas/applications/explore/exp_selset.f b/packages/seacas/applications/explore/exp_selset.f index 21c1862ec0fc..ab7cede431ae 100644 --- a/packages/seacas/applications/explore/exp_selset.f +++ b/packages/seacas/applications/explore/exp_selset.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE SELSET (NUMSEL, IXSEL, NUMSET, LISNPS, LNPSNL, @@ -36,5 +36,3 @@ SUBROUTINE SELSET (NUMSEL, IXSEL, NUMSET, LISNPS, LNPSNL, RETURN END - - diff --git a/packages/seacas/applications/explore/exp_setprc.f b/packages/seacas/applications/explore/exp_setprc.f index 0f0e29b6108c..d04e35c4834b 100644 --- a/packages/seacas/applications/explore/exp_setprc.f +++ b/packages/seacas/applications/explore/exp_setprc.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details SUBROUTINE SETPRC(I,MSG) C sets the precision for output. diff --git a/packages/seacas/applications/explore/exp_tostep.f b/packages/seacas/applications/explore/exp_tostep.f index 6675c1a61484..2d30cd8c2a9e 100644 --- a/packages/seacas/applications/explore/exp_tostep.f +++ b/packages/seacas/applications/explore/exp_tostep.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE TOSTEP (NSTEP, NUMELB, IDELB, ISEVOK, diff --git a/packages/seacas/applications/explore/exp_wdberr.f b/packages/seacas/applications/explore/exp_wdberr.f index ec36498e94ed..eff2c1f318b3 100644 --- a/packages/seacas/applications/explore/exp_wdberr.f +++ b/packages/seacas/applications/explore/exp_wdberr.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE WDBERR (IOSTAT, ERRMSG) diff --git a/packages/seacas/applications/explore/explore.f b/packages/seacas/applications/explore/explore.f index d1710ffc5301..7bd8603faf83 100644 --- a/packages/seacas/applications/explore/explore.f +++ b/packages/seacas/applications/explore/explore.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= PROGRAM EXPLORE diff --git a/packages/seacas/applications/fastq/add1cn.f b/packages/seacas/applications/fastq/add1cn.f index ba672f796491..5faf96b7fd43 100644 --- a/packages/seacas/applications/fastq/add1cn.f +++ b/packages/seacas/applications/fastq/add1cn.f @@ -1,26 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: add1cn.f,v 1.1 1990/11/30 11:02:38 gdsjaar Exp $ -C $Log: add1cn.f,v $ -C Revision 1.1 1990/11/30 11:02:38 gdsjaar -C Initial revision -C -C -CC* FILE: [.PAVING]ADD1CN.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/31/90 -CC* MODIFICATION: ADDED ARGUMENTS TO CALL TO ADD1CN TO PASS MINIMUM -CC** ELEMENT SIZE (SIZMIN) AND GETSIZ PARAMETERS OF -CC** EMIN AND EMAX -C SUBROUTINE ADD1CN (MXND, MLN, XN, YN, NUID, LXK, KXL, NXL, LXN, & ANGLE, BNSIZE, LNODES, NNN, KKK, LLL, NNNOLD, LLLOLD, NLOOP, & XNEW, YNEW, I1, IAVAIL, NAVAIL, GRAPH, VIDEO, SIZEIT, NOROOM, @@ -28,37 +11,32 @@ SUBROUTINE ADD1CN (MXND, MLN, XN, YN, NUID, LXK, KXL, NXL, LXN, & NPNOLD, NPEOLD, NNXK, REMESH, REXMIN, REXMAX, REYMIN, REYMAX, & IDIVIS, SIZMIN, EMAX, EMIN) C*********************************************************************** -C + C SUBROUTINE ADD1CN = ADDS ONE CENTER NODE IN THE MIDDLE OF 6 CLOSING -C + C*********************************************************************** -C + DIMENSION XN (MXND), YN (MXND), NUID (MXND) DIMENSION LXK (4, MXND), KXL (2, 3*MXND) DIMENSION NXL (2, 3*MXND), LXN (4, MXND) DIMENSION ANGLE (MXND), LNODES (MLN, MXND), BNSIZE (2, MXND) -C + DIMENSION XNOLD(NPNOLD), YNOLD(NPNOLD) DIMENSION NXKOLD(NNXK, NPEOLD) DIMENSION LINKEG(2, MLINK), LISTEG(4 * NPEOLD), BMESUR(NPNOLD) -C + LOGICAL GRAPH, VIDEO, ERR, AMBIG, SIZEIT, NOROOM -C + AMBIG = .FALSE. ERR = .FALSE. -C + I2 = LNODES (3, I1) I3 = LNODES (3, I2) I4 = LNODES (3, I3) I5 = LNODES (3, I4) I6 = LNODES (3, I5) ZERO = 0. -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/31/90 -CC* MODIFICATION: ADDED ARGUMENTS TO CALL TO ADDNOD TO PASS MINIMUM -CC** ELEMENT SIZE (SIZMIN) AND GETSIZ PARAMETERS OF -CC** EMIN AND EMAX -C + CALL ADDNOD (MXND, MLN, XN, YN, LXK, KXL, NXL, LXN, ANGLE, BNSIZE, & LNODES, XNEW, YNEW, ZERO, NNN, KKK, LLL, I6, I1, I2, & AMBIG, IDUM, SIZEIT, ERR, NOROOM, XNOLD, YNOLD, NXKOLD, @@ -79,9 +57,9 @@ SUBROUTINE ADD1CN (MXND, MLN, XN, YN, NUID, LXK, KXL, NXL, LXN, IF ((NOROOM) .OR. (ERR)) GOTO 100 CALL CLOSE4 (MXND, MLN, LXK, KXL, NXL, LXN, LNODES, & I7, I4, I5, I6, KKK, ERR) -C + 100 CONTINUE -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/add2cn.f b/packages/seacas/applications/fastq/add2cn.f index fcba708397c3..f9741f60b5d9 100644 --- a/packages/seacas/applications/fastq/add2cn.f +++ b/packages/seacas/applications/fastq/add2cn.f @@ -1,26 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: add2cn.f,v 1.1 1990/11/30 11:02:40 gdsjaar Exp $ -C $Log: add2cn.f,v $ -C Revision 1.1 1990/11/30 11:02:40 gdsjaar -C Initial revision -C -C -CC* FILE: [.PAVING]ADD2CN.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/31/90 -CC* MODIFICATION: ADDED ARGUMENTS TO CALL TO ADD2CN TO PASS MINIMUM -CC** ELEMENT SIZE (SIZMIN) AND GETSIZ PARAMETERS OF -CC** EMIN AND EMAX -C SUBROUTINE ADD2CN (MXND, MLN, XN, YN, NUID, LXK, KXL, NXL, LXN, & ANGLE, BNSIZE, LNODES, NNN, KKK, LLL, NNNOLD, LLLOLD, NLOOP, & I1, IAVAIL, NAVAIL, GRAPH, VIDEO, SIZEIT, NOROOM, ERR, XNOLD, @@ -28,53 +11,47 @@ SUBROUTINE ADD2CN (MXND, MLN, XN, YN, NUID, LXK, KXL, NXL, LXN, & NNXK, REMESH, REXMIN, REXMAX, REYMIN, REYMAX, IDIVIS, SIZMIN, & EMAX, EMIN) C*********************************************************************** -C + C SUBROUTINE ADD2CN = ADDS TWO CENTER NODES IN THE MIDDLE OF 6 CLOSING -C + C*********************************************************************** -C + DIMENSION XN (MXND), YN (MXND), NUID (MXND) DIMENSION LXK (4, MXND), KXL (2, 3*MXND) DIMENSION NXL (2, 3*MXND), LXN (4, MXND) DIMENSION ANGLE (MXND), LNODES (MLN, MXND), BNSIZE (2, MXND) -C + DIMENSION XNOLD(NPNOLD), YNOLD(NPNOLD) DIMENSION NXKOLD(NNXK, NPEOLD) DIMENSION LINKEG(2, MLINK), LISTEG(4 * NPEOLD), BMESUR(NPNOLD) -C + LOGICAL GRAPH, VIDEO, ERR, AMBIG, SIZEIT, NOROOM -C + ERR = .FALSE. AMBIG = .FALSE. -C + I2 = LNODES (3, I1) I3 = LNODES (3, I2) I4 = LNODES (3, I3) I5 = LNODES (3, I4) I6 = LNODES (3, I5) -C + C CALCULATE THE TWO NEW CENTER LOCATIONS -C + X16 = ( XN(I1) + XN(I6) ) * .5 X45 = ( XN(I4) + XN(I5) ) * .5 XMID = (X16 + X45) * .5 XNEW1 = (X16 + XMID) * .5 XNEW2 = (X45 + XMID) * .5 -C + Y16 = ( YN(I1) + YN(I6) ) * .5 Y45 = ( YN(I4) + YN(I5) ) * .5 YMID = (Y16 + Y45) * .5 YNEW1 = (Y16 + YMID) * .5 YNEW2 = (Y45 + YMID) * .5 -C + ZERO = 0. -C -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/31/90 -CC* MODIFICATION: ADDED ARGUMENTS TO CALL TO ADDNOD TO PASS MINIMUM -CC** ELEMENT SIZE (SIZMIN) AND GETSIZ PARAMETERS OF -CC** EMIN AND EMAX -C + CALL ADDNOD (MXND, MLN, XN, YN, LXK, KXL, NXL, LXN, ANGLE, BNSIZE, & LNODES, XNEW1, YNEW1, ZERO, NNN, KKK, LLL, I6, I1, I2, & AMBIG, IDUM, SIZEIT, ERR, NOROOM, XNOLD, YNOLD, NXKOLD, @@ -109,9 +86,9 @@ SUBROUTINE ADD2CN (MXND, MLN, XN, YN, NUID, LXK, KXL, NXL, LXN, IF ((NOROOM) .OR. (ERR)) GOTO 100 CALL CLOSE4 (MXND, MLN, LXK, KXL, NXL, LXN, LNODES, & INEW, JNEW, I5, I6, KKK, ERR) -C + 100 CONTINUE -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/add2el.f b/packages/seacas/applications/fastq/add2el.f index f2f6fbbf442f..be05d7a4cb53 100644 --- a/packages/seacas/applications/fastq/add2el.f +++ b/packages/seacas/applications/fastq/add2el.f @@ -1,52 +1,41 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: add2el.f,v 1.1 1990/11/30 11:02:44 gdsjaar Exp $ -C $Log: add2el.f,v $ -C Revision 1.1 1990/11/30 11:02:44 gdsjaar -C Initial revision -C -C -CC* FILE: [.PAVING]ADD2EL.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE ADD2EL (MXND, MLN, XN, YN, NUID, LXK, KXL, NXL, LXN, & ANGLE, LNODES, NNN, KKK, LLL, NNNOLD, LLLOLD, NLOOP, I1, I4, & IAVAIL, NAVAIL, GRAPH, VIDEO, NOROOM, ERR) C*********************************************************************** -C + C SUBROUTINE ADD2EL = CLOSES A SIX SIDED REGION BY FORMING 2 ELEMENTS -C + C*********************************************************************** -C + DIMENSION XN (MXND), YN (MXND), NUID (MXND) DIMENSION LXK (4, MXND), KXL (2, 3*MXND) DIMENSION NXL (2, 3*MXND), LXN (4, MXND) DIMENSION ANGLE (MXND), LNODES (MLN, MXND) -C + LOGICAL GRAPH, VIDEO, ERR, NOROOM -C + ERR = .FALSE. -C + I2 = LNODES (3, I1) I3 = LNODES (3, I2) I5 = LNODES (3, I4) I6 = LNODES (3, I5) -C + CALL CONNOD (MXND, MLN, XN, YN, NUID, LXK, KXL, NXL, LXN, ANGLE, & LNODES, NNN, KKK, LLL, NNNOLD, LLLOLD, I1, I2, I3, I4, IDUM, & NLOOP, IAVAIL, NAVAIL, GRAPH, VIDEO, NOROOM, ERR) IF ((NOROOM) .OR. (ERR)) GOTO 100 CALL CLOSE4 (MXND, MLN, LXK, KXL, NXL, LXN, LNODES, & I1, I4, I5, I6, KKK, ERR) -C + 100 CONTINUE -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/add2nd.f b/packages/seacas/applications/fastq/add2nd.f index 240c01a8ce9c..b6331a40023b 100644 --- a/packages/seacas/applications/fastq/add2nd.f +++ b/packages/seacas/applications/fastq/add2nd.f @@ -1,49 +1,32 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: add2nd.f,v 1.1 1990/11/30 11:02:46 gdsjaar Exp $ -C $Log: add2nd.f,v $ -C Revision 1.1 1990/11/30 11:02:46 gdsjaar -C Initial revision -C -C -CC* FILE: [.PAVING]ADD2ND.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/31/90 -CC* MODIFICATION: ADDED ARGUMENTS TO CALL TO ADD2ND TO PASS MINIMUM -CC** ELEMENT SIZE (SIZMIN) AND GETSIZ PARAMETERS OF -CC** EMIN AND EMAX -C SUBROUTINE ADD2ND (MXND, MLN, XN, YN, LXK, KXL, NXL, LXN, & BNSIZE, LNODES, X1, Y1, X2, Y2, DIST1, DIST2, NNN, LLL, KKK, & N1, N2, NLOOP, SIZEIT, ERR, NOROOM, XNOLD, YNOLD, NXKOLD, & LINKEG, LISTEG, BMESUR, MLINK, NPNOLD, NPEOLD, NNXK, REMESH, & REXMIN, REXMAX, REYMIN, REYMAX, IDIVIS, SIZMIN, EMAX, EMIN) C*********************************************************************** -C + C SUBROUTINE ADD2ND = ADDS A NEW ELEMENT JUTTING OUT FROM AN EXISTING C LINE -C + C*********************************************************************** -C + DIMENSION XN (MXND), YN (MXND) DIMENSION LXK (4, MXND), KXL (2, 3*MXND) DIMENSION NXL (2, 3*MXND), LXN (4, MXND) DIMENSION LNODES (MLN, MXND), BNSIZE (2, MXND) -C + DIMENSION XNOLD(NPNOLD), YNOLD(NPNOLD) DIMENSION NXKOLD(NNXK, NPEOLD) DIMENSION LINKEG(2, MLINK), LISTEG(4 * NPEOLD), BMESUR(NPNOLD) -C + LOGICAL SIZEIT, ERR, NOROOM -C + NNN = NNN+1 IF (NNN .GT. MXND) THEN NOROOM = .TRUE. @@ -60,26 +43,17 @@ SUBROUTINE ADD2ND (MXND, MLN, XN, YN, LXK, KXL, NXL, LXN, XN (NNN) = X2 YN (NNN) = Y2 NODE2 = NNN -C + C PUT THE BEGINNING BOUNDARY DISTANCE IN PLACE -C + IF (LXN (2, N1) .LT. 0) THEN BNSIZE (1, NODE1) = DIST1 BNSIZE (2, NODE1) = 1. ELSE IF (SIZEIT) THEN -C -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/21/90 -CC* MODIFICATION: CHANGED PROJECTION SIZE TO CHOOSE MINIMUM OF CURRENT + C** LOCATION SIZE AND PROJECTING FROM LOCATION SIZE. -C -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/31/90 -CC* MODIFICATION: ADDED ARGUMENTS TO CALL TO GETSIZ TO PASS MINIMUM -CC** ELEMENT SIZE (SIZMIN) AND GETSIZ PARAMETERS OF -CC** EMIN AND EMAX -C + CALL GETSIZ (XNOLD, YNOLD, NXKOLD, LINKEG, LISTEG, BMESUR, & MLINK, NPNOLD, NPEOLD, NNXK, REMESH, REXMIN, REXMAX, & REYMIN, REYMAX, IDIVIS, SIZMIN, EMAX, EMIN, X1, Y1, @@ -118,27 +92,27 @@ SUBROUTINE ADD2ND (MXND, MLN, XN, YN, LXK, KXL, NXL, LXN, BNSIZE (2, NODE2) = DIST2 / SIZNEW ENDIF ENDIF -C + C MAKE NXL ARRAY C ADD THE THREE NEW LINES -C + LLL = LLL+1 L1 = LLL NXL (1, L1) = N1 NXL (2, L1) = NODE1 -C + LLL = LLL+1 L2 = LLL NXL (1, L2) = NODE1 NXL (2, L2) = NODE2 -C + LLL = LLL+1 L3 = LLL NXL (1, L3) = NODE2 NXL (2, L3) = N2 -C + C MAKE THE NEW ELEMENT -C + KKK = KKK+1 LXK (1, KKK) = LNODES (5, N1) LXK (2, KKK) = L3 @@ -148,45 +122,45 @@ SUBROUTINE ADD2ND (MXND, MLN, XN, YN, LXK, KXL, NXL, LXN, CALL ADDKXL (MXND, KXL, KKK, L2) CALL ADDKXL (MXND, KXL, KKK, L3) CALL ADDKXL (MXND, KXL, KKK, LNODES (5, N1)) -C + C ZERO OUT THE LXN ARRAY -C + DO 100 I = 1, 4 LXN (I, NODE1) = 0 LXN (I, NODE2) = 0 100 CONTINUE -C + C REDO THE LNODES ARRAY -C + LNODES (1, NODE1) = 0 LNODES (1, NODE2) = 0 LNODES (1, N1) = 0 LNODES (1, N2) = 0 -C + LNODES (2, NODE1) = N1 LNODES (2, NODE2) = NODE1 LNODES (2, N2) = NODE2 -C + LNODES (3, N1) = NODE1 LNODES (3, NODE1) = NODE2 LNODES (3, NODE2) = N2 -C + LNODES (4, NODE1) = - 1 LNODES (4, NODE2) = - 1 -C + LNODES (5, N1) = L1 LNODES (5, NODE1) = L2 LNODES (5, NODE2) = L3 -C + LNODES (8, NODE1) = LNODES (8, N1) + 1 LNODES (8, NODE2) = LNODES (8, N2) + 1 -C + NLOOP = NLOOP + 2 -C + CALL MARKSM (MXND, MLN, LXK, KXL, NXL, LXN, LNODES, N1, ERR) CALL MARKSM (MXND, MLN, LXK, KXL, NXL, LXN, LNODES, N2, ERR) -C + 110 CONTINUE RETURN -C + END diff --git a/packages/seacas/applications/fastq/add3nd.f b/packages/seacas/applications/fastq/add3nd.f index bc703052621c..5a5ca5c36a96 100644 --- a/packages/seacas/applications/fastq/add3nd.f +++ b/packages/seacas/applications/fastq/add3nd.f @@ -1,50 +1,33 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: add3nd.f,v 1.1 1990/11/30 11:02:49 gdsjaar Exp $ -C $Log: add3nd.f,v $ -C Revision 1.1 1990/11/30 11:02:49 gdsjaar -C Initial revision -C -C -CC* FILE: [.PAVING]ADD3ND.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/31/90 -CC* MODIFICATION: ADDED ARGUMENTS TO CALL TO ADD3ND TO PASS MINIMUM -CC** ELEMENT SIZE (SIZMIN) AND GETSIZ PARAMETERS OF -CC** EMIN AND EMAX -C SUBROUTINE ADD3ND (MXND, MLN, XN, YN, LXK, KXL, NXL, LXN, & BNSIZE, LNODES, X, Y, DIST, NNN, LLL, KKK, N1, NLOOP, SIZEIT, & ERR, NOROOM, XNOLD, YNOLD, NXKOLD, LINKEG, LISTEG, BMESUR, & MLINK, NPNOLD, NPEOLD, NNXK, REMESH, REXMIN, REXMAX, REYMIN, & REYMAX, IDIVIS, SIZMIN, EMAX, EMIN) C*********************************************************************** -C + C SUBROUTINE ADD2ND = ADDS A NEW ELEMENT JUTTING OUT FROM AN EXISTING C LINE -C + C*********************************************************************** -C + DIMENSION XN (MXND), YN (MXND) DIMENSION LXK (4, MXND), KXL (2, 3*MXND) DIMENSION NXL (2, 3*MXND), LXN (4, MXND) DIMENSION LNODES (MLN, MXND), BNSIZE (2, MXND) DIMENSION X(3), Y(3) -C + DIMENSION XNOLD(NPNOLD), YNOLD(NPNOLD) DIMENSION NXKOLD(NNXK, NPEOLD) DIMENSION LINKEG(2, MLINK), LISTEG(4 * NPEOLD), BMESUR(NPNOLD) -C + LOGICAL SIZEIT, ERR, NOROOM -C + NNN = NNN+1 IF (NNN .GT. MXND) THEN NOROOM = .TRUE. @@ -69,9 +52,9 @@ SUBROUTINE ADD3ND (MXND, MLN, XN, YN, LXK, KXL, NXL, LXN, XN (NNN) = X(3) YN (NNN) = Y(3) NODE3 = NNN -C + C PUT THE BEGINNING BOUNDARY DISTANCE IN PLACE -C + IF (LXN (2, N1) .LT. 0) THEN BNSIZE (1, NODE1) = DIST BNSIZE (1, NODE2) = DIST @@ -81,18 +64,9 @@ SUBROUTINE ADD3ND (MXND, MLN, XN, YN, LXK, KXL, NXL, LXN, BNSIZE (2, NODE3) = 1. ELSE IF (SIZEIT) THEN -C -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/21/90 -CC* MODIFICATION: CHANGED PROJECTION SIZE TO CHOOSE MINIMUM OF CURRENT + C** LOCATION SIZE AND PROJECTING FROM LOCATION SIZE. -C -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/31/90 -CC* MODIFICATION: ADDED ARGUMENTS TO CALL TO GETSIZ TO PASS MINIMUM -CC** ELEMENT SIZE (SIZMIN) AND GETSIZ PARAMETERS OF -CC** EMIN AND EMAX -C + CALL GETSIZ (XNOLD, YNOLD, NXKOLD, LINKEG, LISTEG, BMESUR, & MLINK, NPNOLD, NPEOLD, NNXK, REMESH, REXMIN, REXMAX, & REYMIN, REYMAX, IDIVIS, SIZMIN, EMAX, EMIN, X(1), Y(1), @@ -118,32 +92,32 @@ SUBROUTINE ADD3ND (MXND, MLN, XN, YN, LXK, KXL, NXL, LXN, BNSIZE (2, NODE3) = DIST / SIZNEW ENDIF ENDIF -C + C MAKE NXL ARRAY C ADD THE FOUR NEW LINES -C + LLL = LLL+1 L1 = LLL NXL (1, L1) = N1 NXL (2, L1) = NODE1 -C + LLL = LLL+1 L2 = LLL NXL (1, L2) = NODE1 NXL (2, L2) = NODE2 -C + LLL = LLL+1 L3 = LLL NXL (1, L3) = NODE2 NXL (2, L3) = NODE3 -C + LLL = LLL+1 L4 = LLL NXL (1, L4) = NODE3 NXL (2, L4) = N1 -C + C MAKE THE NEW ELEMENT -C + KKK = KKK+1 LXK (1, KKK) = L4 LXK (2, KKK) = L3 @@ -153,49 +127,49 @@ SUBROUTINE ADD3ND (MXND, MLN, XN, YN, LXK, KXL, NXL, LXN, CALL ADDKXL (MXND, KXL, KKK, L2) CALL ADDKXL (MXND, KXL, KKK, L3) CALL ADDKXL (MXND, KXL, KKK, L4) -C + C ZERO OUT THE LXN ARRAY -C + DO 100 I = 1, 4 LXN (I, NODE1) = 0 LXN (I, NODE2) = 0 LXN (I, NODE3) = 0 100 CONTINUE -C + C REDO THE LNODES ARRAY -C + LNODES (1, NODE1) = 0 LNODES (1, NODE2) = 0 LNODES (1, NODE3) = 0 LNODES (1, N1) = 0 -C + LNODES (2, NODE1) = N1 LNODES (2, NODE2) = NODE1 LNODES (2, NODE3) = NODE2 -C + LNODES (3, N1) = NODE1 LNODES (3, NODE1) = NODE2 LNODES (3, NODE2) = NODE3 LNODES (3, NODE3) = N1 -C + LNODES (4, NODE1) = - 1 LNODES (4, NODE2) = - 1 LNODES (4, NODE3) = - 1 -C + LNODES (5, N1) = L1 LNODES (5, NODE1) = L2 LNODES (5, NODE2) = L3 LNODES (5, NODE3) = L4 -C + LNODES (8, NODE1) = LNODES (8, N1) + 1 LNODES (8, NODE2) = LNODES (8, N1) + 1 LNODES (8, NODE3) = LNODES (8, N1) + 1 -C + NLOOP = NLOOP + 4 -C + CALL MARKSM (MXND, MLN, LXK, KXL, NXL, LXN, LNODES, N1, ERR) -C + 110 CONTINUE RETURN -C + END diff --git a/packages/seacas/applications/fastq/addjut.f b/packages/seacas/applications/fastq/addjut.f index 5344201366e2..c5053717f56a 100644 --- a/packages/seacas/applications/fastq/addjut.f +++ b/packages/seacas/applications/fastq/addjut.f @@ -1,70 +1,59 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: addjut.f,v 1.1 1990/11/30 11:02:52 gdsjaar Exp $ -C $Log: addjut.f,v $ -C Revision 1.1 1990/11/30 11:02:52 gdsjaar -C Initial revision -C -C -CC* FILE: [.PAVING]ADDJUT.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE ADDJUT (MXND, XN, YN, LXK, KXL, NXL, LXN, + ANGLE, LNODES, XNEW, YNEW, NNN, LLL, NOLD, NLOOP, JUTTED) C*********************************************************************** -C + C SUBROUTINE ADDJUT = ADDS A NEW NODE JUTTING OUT FROM AN EXISTING C NODE -C + C*********************************************************************** -C + DIMENSION XN (MXND), YN (MXND) DIMENSION LXK (4, MXND), KXL (2, 3*MXND) DIMENSION NXL (2, 3*MXND), LXN (4, MXND) DIMENSION ANGLE (MXND), LNODES (7, MXND) -C + LOGICAL JUTTED -C + NNN = NNN+1 XN (NNN) = XNEW YN (NNN) = YNEW -C + C MAKE LXN AND NXL ARRAYS -C + C ADD THE NEW NODE'S LINES -C + LLL = LLL+1 NXL (1, LLL) = NNN NXL (2, LLL) = NOLD -C + DO 100 I = 1, 4 LXN (I, NNN) = 0 100 CONTINUE -C + KXL (1, LLL) = 0 KXL (2, LLL) = 0 -C + C REDO THE LNODES ARRAY -C + LNODES (1, NNN) = 0 LNODES (2, NNN) = NOLD LNODES (3, NNN) = NOLD LNODES (4, NNN) = - 1 LNODES (5, NNN) = LLL -C + LNODES (1, NOLD) = 0 LNODES (3, NOLD) = NNN LNODES (5, NOLD) = LLL -C + NLOOP = NLOOP + 2 JUTTED = .TRUE. -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/addkxl.f b/packages/seacas/applications/fastq/addkxl.f index c162d9ab67d5..4ad898b92ee6 100644 --- a/packages/seacas/applications/fastq/addkxl.f +++ b/packages/seacas/applications/fastq/addkxl.f @@ -1,34 +1,23 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: addkxl.f,v 1.1 1990/11/30 11:02:54 gdsjaar Exp $ -C $Log: addkxl.f,v $ -C Revision 1.1 1990/11/30 11:02:54 gdsjaar -C Initial revision -C -C -CC* FILE: [.PAVING]ADDKXL.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE ADDKXL (MXND, KXL, K, L) C*********************************************************************** -C + C SUBROUTINE ADDKXL = ADDS TO THE LIST OF ELEMENTS FOR THIS LINE -C + C*********************************************************************** -C + DIMENSION KXL (2, 3*MXND) -C + IF ( KXL(1, L) .EQ. 0) THEN KXL(1, L) = K ELSE KXL(2, L) = K ENDIF RETURN -C + END diff --git a/packages/seacas/applications/fastq/addlxn.f b/packages/seacas/applications/fastq/addlxn.f index 9756e9a942b0..b14c390d6c4d 100644 --- a/packages/seacas/applications/fastq/addlxn.f +++ b/packages/seacas/applications/fastq/addlxn.f @@ -1,44 +1,33 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: addlxn.f,v 1.1 1990/11/30 11:02:57 gdsjaar Exp $ -C $Log: addlxn.f,v $ -C Revision 1.1 1990/11/30 11:02:57 gdsjaar -C Initial revision -C -C -CC* FILE: [.QMESH]ADDLXN.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE ADDLXN (MXND, LXN, NUID, NAVAIL, IAVAIL, NODE, LINE, & NNN, ERR, NOROOM) C*********************************************************************** -C + C SUBROUTINE ADDLXN = ADDS LINE TO THE LIST OF LINES FOR THIS NODE -C + C*********************************************************************** -C + DIMENSION LXN (4, MXND), NUID (MXND) -C + LOGICAL ERR, NOROOM -C + ERR = .FALSE. NN = NODE 100 CONTINUE -C + C LINK TO CONTINUATION -C + IF (LXN (4, NN) .LT. 0) THEN NN = IABS (LXN (4, NN)) GOTO 100 -C + C THERE IS ROOM FOR THE NEW LINE WITHOUT CONTINUING -C + ELSEIF (LXN (4, NN) .EQ. 0) THEN DO 110 I = 1, 4 IF (LXN (I, NN) .EQ. 0) THEN @@ -46,22 +35,22 @@ SUBROUTINE ADDLXN (MXND, LXN, NUID, NAVAIL, IAVAIL, NODE, LINE, RETURN ENDIF 110 CONTINUE -C + C THIS CAN'T HAPPEN -C + CALL MESAGE ('ERROR IN ADDLXN') ERR = .TRUE. ELSE -C + C CREATE A CONTINUATION ENTRY -C + IF (NAVAIL .LT. 1) THEN WRITE ( * , 10000)NODE ERR = .TRUE. NOROOM = .TRUE. RETURN ENDIF -C + NEW = IAVAIL IF (NEW .GT. NNN)NNN = NEW IAVAIL = LXN (4, IAVAIL) @@ -75,7 +64,7 @@ SUBROUTINE ADDLXN (MXND, LXN, NUID, NAVAIL, IAVAIL, NODE, LINE, NUID (NEW) = 0 ENDIF RETURN -C + 10000 FORMAT (' NODE TABLE OVERFLOW IN ADDLXN AT NODE', I5) -C + END diff --git a/packages/seacas/applications/fastq/addnod.f b/packages/seacas/applications/fastq/addnod.f index 198a064e14f8..2fccd8c13236 100644 --- a/packages/seacas/applications/fastq/addnod.f +++ b/packages/seacas/applications/fastq/addnod.f @@ -1,26 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: addnod.f,v 1.1 1990/11/30 11:02:59 gdsjaar Exp $ -C $Log: addnod.f,v $ -C Revision 1.1 1990/11/30 11:02:59 gdsjaar -C Initial revision -C -C -CC* FILE: [.PAVING]ADDNOD.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/31/90 -CC* MODIFICATION: ADDED ARGUMENTS TO CALL TO ADDNOD TO PASS MINIMUM -CC** ELEMENT SIZE (SIZMIN) AND GETSIZ PARAMETERS OF -CC** EMIN AND EMAX -C SUBROUTINE ADDNOD (MXND, MLN, XN, YN, LXK, KXL, NXL, LXN, & ANGLE, BNSIZE, LNODES, XNEW, YNEW, DIST, NNN, KKK, LLL, & N0, N1, N2, AMBIG, LAMBIG, SIZEIT, ERR, NOROOM, XNOLD, @@ -28,22 +11,22 @@ SUBROUTINE ADDNOD (MXND, MLN, XN, YN, LXK, KXL, NXL, LXN, & NNXK, REMESH, REXMIN, REXMAX, REYMIN, REYMAX, IDIVIS, SIZMIN, & EMAX, EMIN) C*********************************************************************** -C + C SUBROUTINE ADDNOD = ADDS A NEW ELEMENT TO A NEW NODE -C + C*********************************************************************** -C + DIMENSION XN (MXND), YN (MXND) DIMENSION LXK (4, MXND), KXL (2, 3*MXND) DIMENSION NXL (2, 3*MXND), LXN (4, MXND) DIMENSION ANGLE (MXND), LNODES (MLN, MXND), BNSIZE (2, MXND) -C + DIMENSION XNOLD(NPNOLD), YNOLD(NPNOLD) DIMENSION NXKOLD(NNXK, NPEOLD) DIMENSION LINKEG(2, MLINK), LISTEG(4 * NPEOLD), BMESUR(NPNOLD) -C + LOGICAL AMBIG, SIZEIT, ERR, NOROOM -C + NNN = NNN+1 IF (NNN .GT. MXND) THEN NOROOM = .TRUE. @@ -51,26 +34,17 @@ SUBROUTINE ADDNOD (MXND, MLN, XN, YN, LXK, KXL, NXL, LXN, ENDIF XN (NNN) = XNEW YN (NNN) = YNEW -C + C PUT THE BEGINNING BOUNDARY DISTANCE IN PLACE -C + IF (LXN (2, N2) .LT. 0) THEN BNSIZE (1, NNN) = DIST BNSIZE (2, NNN) = 1. ELSE IF (SIZEIT) THEN -C -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/21/90 -CC* MODIFICATION: CHANGED PROJECTION SIZE TO CHOOSE MINIMUM OF CURRENT + C** LOCATION SIZE AND PROJECTING FROM LOCATION SIZE. -C -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/31/90 -CC* MODIFICATION: ADDED ARGUMENTS TO CALL TO GETSIZ TO PASS MINIMUM -CC** ELEMENT SIZE (SIZMIN) AND GETSIZ PARAMETERS OF -CC** EMIN AND EMAX -C + CALL GETSIZ (XNOLD, YNOLD, NXKOLD, LINKEG, LISTEG, BMESUR, & MLINK, NPNOLD, NPEOLD, NNXK, REMESH, REXMIN, REXMAX, & REYMIN, REYMAX, IDIVIS, SIZMIN, EMAX, EMIN, XNEW, YNEW, @@ -90,10 +64,10 @@ SUBROUTINE ADDNOD (MXND, MLN, XN, YN, LXK, KXL, NXL, LXN, BNSIZE (2, NNN) = DIST / SIZNEW ENDIF ENDIF -C + C MAKE LXN, NXL, KXL, AND LXK ARRAYS C FIRST, ADD THE NEW NODE'S LINES -C + LLL = LLL+1 NXL (1, LLL) = NNN NXL (2, LLL) = N0 @@ -103,9 +77,9 @@ SUBROUTINE ADDNOD (MXND, MLN, XN, YN, LXK, KXL, NXL, LXN, DO 100 I = 1, 4 LXN (I, NNN) = 0 100 CONTINUE -C + C MAKE THE NEW ELEMENT -C + KKK = KKK+1 LXK (1, KKK) = LNODES (5, N0) IF (AMBIG) THEN @@ -123,9 +97,9 @@ SUBROUTINE ADDNOD (MXND, MLN, XN, YN, LXK, KXL, NXL, LXN, ELSE CALL ADDKXL (MXND, KXL, KKK, LNODES (5, N1)) ENDIF -C + C REDO THE LNODES ARRAY -C + LNODES (2, N2) = NNN LNODES (3, N0) = NNN LNODES (1, N0) = 0 @@ -140,8 +114,8 @@ SUBROUTINE ADDNOD (MXND, MLN, XN, YN, LXK, KXL, NXL, LXN, IF (ERR) GOTO 110 IF (.NOT. AMBIG) LNODES (4, N1) = - 2 LNODES (8, NNN) = LNODES (8, N2) + 1 -C + 110 CONTINUE RETURN -C + END diff --git a/packages/seacas/applications/fastq/addrow.f b/packages/seacas/applications/fastq/addrow.f index f637b59a0e60..9d9416fdbcec 100644 --- a/packages/seacas/applications/fastq/addrow.f +++ b/packages/seacas/applications/fastq/addrow.f @@ -1,32 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: addrow.f,v 1.2 2004/01/21 05:18:39 gdsjaar Exp $ -C $Log: addrow.f,v $ -C Revision 1.2 2004/01/21 05:18:39 gdsjaar -C Initialized several variables identified by valgrind. -C -C Revision 1.1.1.1 1990/11/30 11:03:04 gdsjaar -C FASTQ Version 2.0X -C -c Revision 1.1 90/11/30 11:03:03 gdsjaar -c Initial revision -c -C -CC* FILE: [.PAVING]ADDROW.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/31/90 -CC* MODIFICATION: ADDED ARGUMENTS TO CALL TO ADDROW TO PASS MINIMUM -CC** ELEMENT SIZE (SIZMIN) AND GETSIZ PARAMETERS OF -CC** EMIN AND EMAX -C SUBROUTINE ADDROW (MXND, MXCORN, MXLOOP, MLN, MAXPRM, NUID, XN, & YN, ZN, LXK, KXL, NXL, LXN, ANGLE, BNSIZE, LNODES, NBEGIN, & NEND, NLOOP, NEXTN1, LINKPR, KPERIM, KKKOLD, LLLOLD, NNNOLD, @@ -36,13 +13,13 @@ SUBROUTINE ADDROW (MXND, MXCORN, MXLOOP, MLN, MAXPRM, NUID, XN, & LISTEG, BMESUR, MLINK, NPNOLD, NPEOLD, NNXK, REMESH, REXMIN, & REXMAX, REYMIN, REYMAX, IDIVIS, SIZMIN, EMAX, EMIN) C*********************************************************************** -C + C SUBROUTINE ADDROW = ADDS A ROW OF ELEMENTS BETWEEN TWO CORNERS -C + C*********************************************************************** -C + COMMON /TIMING/ TIMEA, TIMEP, TIMEC, TIMEPC, TIMEAJ, TIMES -C + DIMENSION XN (MXND), YN (MXND), ZN (MXND), NUID (MXND) DIMENSION LXK (4, MXND), KXL (2, 3*MXND) DIMENSION NXL (2, 3*MXND), LXN (4, MXND) @@ -51,15 +28,15 @@ SUBROUTINE ADDROW (MXND, MXCORN, MXLOOP, MLN, MAXPRM, NUID, XN, DIMENSION NLOOP (MXLOOP), NEXTN1 (MXLOOP) DIMENSION LINKPR (3, MAXPRM) DIMENSION X(5), Y(5) -C + DIMENSION XNOLD(NPNOLD), YNOLD(NPNOLD) DIMENSION NXKOLD(NNXK, NPEOLD) DIMENSION LINKEG(2, MLINK), LISTEG(4 * NPEOLD), BMESUR(NPNOLD) -C + LOGICAL ERR, GRAPH, AMBIG, DONE, VIDEO, SIZEIT, NOROOM -C + CHARACTER*3 DEV1 -C + nlold = 0 idum1 = 0 idum2 = 0 @@ -68,7 +45,7 @@ SUBROUTINE ADDROW (MXND, MXCORN, MXLOOP, MLN, MAXPRM, NUID, XN, AMBIG = .FALSE. NNNOLD = MIN (NNN, NNNOLD) NNN2 = NNNOLD -C + C IN THE LNODES ARRAY, C THE CORNER STATUS IS STORED IN LNODES (1, N1): C 0 = NOT DECIDED @@ -93,47 +70,42 @@ SUBROUTINE ADDROW (MXND, MXCORN, MXLOOP, MLN, MAXPRM, NUID, XN, C 7 = ROW REVERSAL ONLY C THE NUMBER OF NODES TO THE NEXT CORNER IS STORED IN (7, N1). C THE DEPTH OF THE ROW OF THIS NODE IS STORED IN (8, N1) -C + C START AT THE FIRST BEGINNING (CORNER) NODE C AND GO TO THE END (CORNER) NODE -C + N1 = NBEGIN N0 = LNODES (2, N1) NADJ1 = N0 N2 = LNODES (3, N1) N3 = LNODES (3, N2) -C + C SET UP FOR SMOOTHING AROUND THE BEGINNING AND ENDING OF THE ROW -C + LNODES (4, NBEGIN) = - IABS (LNODES (4, NBEGIN)) LNODES (4, NEND) = - IABS (LNODES (4, NEND)) CALL MARKSM (MXND, MLN, LXK, KXL, NXL, LXN, LNODES, NBEGIN, ERR) CALL MARKSM (MXND, MLN, LXK, KXL, NXL, LXN, LNODES, NEND, ERR) -C + C FIRST CHECK TO SEE IF THE ROW IS CIRCULAR - BEGINS AND ENDS AT N1 -C + IF (NEND .EQ. NBEGIN) THEN -C + C A CIRCLUAR ROW THAT ENDS AT A ROW END (TEAR DROP SHAPE) NEEDS STARTED -C + IF (LNODES (1, N1) .EQ. 1) THEN NEND = N0 NADJ1 = NNN + 1 -C + C A CIRCLUAR ROW THAT HAS NO END, CORNER, OR REVERSAL (CIRCLE SHAPE) C NEEDS STARTED -C + ELSEIF (LNODES (1, N1) .EQ. 3) THEN CALL EXTND1 (MXND, XN, YN, ANGLE, N0, N1, N2, X(1), Y(1), & DIST1) CALL EXTND1 (MXND, XN, YN, ANGLE, N1, N2, N3, X(2), Y(2), & DIST2) -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/31/90 -CC* MODIFICATION: ADDED ARGUMENTS TO CALL TO ADD2ND TO PASS MINIMUM -CC** ELEMENT SIZE (SIZMIN) AND GETSIZ PARAMETERS OF -CC** EMIN AND EMAX -C + CALL ADD2ND (MXND, MLN, XN, YN, LXK, KXL, NXL, LXN, & BNSIZE, LNODES, X(1), Y(1), X(2), Y(2), DIST1, DIST2, & NNN, LLL, KKK, N1, N2, NLOOP (1), SIZEIT, ERR, NOROOM, @@ -153,21 +125,15 @@ SUBROUTINE ADDROW (MXND, MXCORN, MXLOOP, MLN, MAXPRM, NUID, XN, ENDIF ENDIF N1 = N2 -C + C A CIRCLUAR ROW THAT ENDS AT A ROW CORNER NEEDS STARTED -C + ELSEIF (LNODES (1, N1) .EQ. 5) THEN AMBIG = .TRUE. LAMBIG = LNODES (5, N1) CALL EXTND3 (MXND, XN, YN, ANGLE (N1), N0, N1, N2, X, Y, & DIST) -C -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/31/90 -CC* MODIFICATION: ADDED ARGUMENTS TO CALL TO ADD3ND TO PASS MINIMUM -CC** ELEMENT SIZE (SIZMIN) AND GETSIZ PARAMETERS OF -CC** EMIN AND EMAX -C + CALL ADD3ND (MXND, MLN, XN, YN, LXK, KXL, NXL, LXN, & BNSIZE, LNODES, X, Y, DIST, NNN, LLL, KKK, N1, NLOOP (1), & SIZEIT, ERR, NOROOM, XNOLD, YNOLD, NXKOLD, LINKEG, @@ -175,7 +141,7 @@ SUBROUTINE ADDROW (MXND, MXCORN, MXLOOP, MLN, MAXPRM, NUID, XN, & REXMIN, REXMAX, REYMIN, REYMAX, IDIVIS, SIZMIN, EMAX, & EMIN) IF ((ERR) .OR. (NOROOM)) GOTO 120 -C + NADJ1 = NNN - 2 LNODES (1, N1) = 1 IF ((GRAPH) .OR. (VIDEO)) THEN @@ -191,9 +157,9 @@ SUBROUTINE ADDROW (MXND, MXCORN, MXLOOP, MLN, MAXPRM, NUID, XN, N0 = NNN N3 = LNODES (2, N2) GOTO 110 -C + C A CIRCLUAR ROW THAT ENDS AT A ROW REVERSAL NEEDS STARTED -C + ELSEIF (LNODES (1, N1) .EQ. 7) THEN CALL EXTND5 (MXND, XN, YN, ANGLE (N2), N1, N2, N3, X, Y, & DIST) @@ -214,7 +180,7 @@ SUBROUTINE ADDROW (MXND, MXCORN, MXLOOP, MLN, MAXPRM, NUID, XN, CALL SNAPIT (1) ENDIF ENDIF -C + N0 = NNN CALL ADD2ND (MXND, MLN, XN, YN, LXK, KXL, NXL, LXN, & BNSIZE, LNODES, X(4), Y(4), X(5), Y(5), DIST, DIST, NNN, @@ -233,7 +199,7 @@ SUBROUTINE ADDROW (MXND, MXCORN, MXLOOP, MLN, MAXPRM, NUID, XN, CALL SNAPIT (1) ENDIF ENDIF -C + ELSE CALL MESAGE ('PROBLEMS IN ADDROW - THE CIRCLUAR ROW') CALL MESAGE ('HAS NO END POINT CLASSIFICATION') @@ -241,30 +207,25 @@ SUBROUTINE ADDROW (MXND, MXCORN, MXLOOP, MLN, MAXPRM, NUID, XN, GOTO 120 ENDIF ENDIF -C + KOUNT = 0 100 CONTINUE -C + KOUNT = KOUNT + 1 N0 = LNODES (2, N1) N2 = LNODES (3, N1) N3 = LNODES (3, N2) 110 CONTINUE -C + C NOW ADD THE NEXT ELEMENT(S) TO THE ROW -C + IF (N2 .NE. NEND) THEN -C + C IF N2 IS A ROW SIDE NODE, THEN PROJECT AT THE MIDLINE ANGLE -C + IF (LNODES (1, N2) .EQ. 3) THEN CALL EXTND1 (MXND, XN, YN, ANGLE, N1, N2, N3, X, Y, DIST) -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/31/90 -CC* MODIFICATION: ADDED ARGUMENTS TO CALL TO ADDNOD TO PASS MINIMUM -CC** ELEMENT SIZE (SIZMIN) AND GETSIZ PARAMETERS OF -CC** EMIN AND EMAX -C + CALL ADDNOD (MXND, MLN, XN, YN, LXK, KXL, NXL, LXN, ANGLE, & BNSIZE, LNODES, X(1), Y(1), DIST, NNN, KKK, LLL, & N0, N1, N2, AMBIG, LAMBIG, SIZEIT, ERR, NOROOM, XNOLD, @@ -283,16 +244,16 @@ SUBROUTINE ADDROW (MXND, MXCORN, MXLOOP, MLN, MAXPRM, NUID, XN, ENDIF N1 = N2 GOTO 100 -C + C IF N2 IS A ROW CORNER NODE, C THEN PROJECT TWO NODES (1 & 3) AT AVERAGE ANGLES AND ANOTHER (2) C AS AN ISOPARAMETRIC TYPE -C + ELSEIF (LNODES (1, N2) .EQ. 5) THEN AHOLD = ANGLE (N2) IF (NADJ1 .EQ. N1) NADJ1 = N0 CALL EXTND3 (MXND, XN, YN, AHOLD, N1, N2, N3, X, Y, DIST) -C + CALL ADDNOD (MXND, MLN, XN, YN, LXK, KXL, NXL, LXN, ANGLE, & BNSIZE, LNODES, X(1), Y(1), DIST, NNN, KKK, LLL, & N0, N1, N2, AMBIG, LAMBIG, SIZEIT, ERR, NOROOM, XNOLD, @@ -310,10 +271,10 @@ SUBROUTINE ADDROW (MXND, MXCORN, MXLOOP, MLN, MAXPRM, NUID, XN, CALL SNAPIT (1) ENDIF ENDIF -C + C TRY A PINCH TO MAKE SURE THAT CONTINUING DOES NOT OVERLAY C AN ALREADY GOOD CLOSURE -C + CALL FIXLXN (MXND, LXN, NXL, NUID, NAVAIL, IAVAIL, NNN, LLL, & NNNOLD, LLLOLD, ERR, NOROOM) IF ((ERR) .OR. (NOROOM)) GOTO 120 @@ -325,13 +286,13 @@ SUBROUTINE ADDROW (MXND, MXCORN, MXLOOP, MLN, MAXPRM, NUID, XN, & LLL, NNN, NNN2, LNODES, BNSIZE, NLOOP (1), XMIN, XMAX, & YMIN, YMAX, ZMIN, ZMAX, DEV1, KREG) CALL GETIME (TIME1) -C + IF ((GRAPH) .OR. (VIDEO)) THEN CALL RPLOTL (MXND, XN, YN, ZN, NXL, XMIN, XMAX, YMIN, & YMAX, ZMIN, ZMAX, LLL, DEV1, KREG) IF (VIDEO) CALL SNAPIT (2) ENDIF -C + CALL LUPANG (MXND, MLN, XN, YN, ZN, LXK, KXL, NXL, LXN, & NLOOP (1), ANGLE, LNODES, NADJ1, LLL, XMIN, XMAX, YMIN, & YMAX, ZMIN, ZMAX, DEV1, KREG, ERR) @@ -347,10 +308,10 @@ SUBROUTINE ADDROW (MXND, MXCORN, MXLOOP, MLN, MAXPRM, NUID, XN, IF ((NOROOM) .OR. (ERR)) GOTO 120 IF (DONE) GOTO 120 CALL GETIME (TIME1) -C + C TRY A COLAPS TO MAKE SURE THAT CONTINUING DOES NOT COMPLICATE C AN ALREADY OVERLAPPED SIDE -C + IF (NLOOP (1) .GT. 6) THEN NLOLD = NLOOP (1) CALL GETIME (TIME2) @@ -365,9 +326,9 @@ SUBROUTINE ADDROW (MXND, MXCORN, MXLOOP, MLN, MAXPRM, NUID, XN, IF (DONE) GOTO 120 CALL GETIME (TIME1) ENDIF -C + C CHECK TO SEE IF ANY OF THE CONCURRENT PERIMETERS OVERLAP -C + IF (LINKPR (2, KPERIM) .NE. 0) THEN LINKPR (3, KPERIM) = NLOOP (1) CALL GETIME (TIME2) @@ -383,10 +344,10 @@ SUBROUTINE ADDROW (MXND, MXCORN, MXLOOP, MLN, MAXPRM, NUID, XN, IF ((NOROOM) .OR. (ERR)) GOTO 120 CALL GETIME (TIME1) ENDIF -C + C THE ROW CAN BE CONTINUED IF THE NEW NODE AND THE ENDING NODE C IS STILL ON THE BOUNDARY AFTER THE PINCH, COLAPS AND PCROSS -C + IF ( (NLOLD .EQ. NLOOP(1)) .AND. & (IABS (LNODES (4, NEW1)) .EQ. 1) .AND. & (IABS (LNODES (4, NEND)) .EQ. 1) .AND. @@ -412,7 +373,7 @@ SUBROUTINE ADDROW (MXND, MXCORN, MXLOOP, MLN, MAXPRM, NUID, XN, CALL SNAPIT (1) ENDIF ENDIF -C + N1 = N2 GOTO 100 ELSE @@ -421,15 +382,15 @@ SUBROUTINE ADDROW (MXND, MXCORN, MXLOOP, MLN, MAXPRM, NUID, XN, NADJ2 = 0 GOTO 120 ENDIF -C + C IF N2 IS A ROW REVERSAL NODE, C THEN PROJECT THREE NODES (1, 3, & 5) AT AVERAGE ANGLES AND C TWO OTHERS (2 & 4) AS AN ISOPARAMETRIC TYPE -C + ELSEIF (LNODES (1, N2) .EQ. 7) THEN AHOLD = ANGLE (N2) CALL EXTND5 (MXND, XN, YN, AHOLD, N1, N2, N3, X, Y, DIST) -C + CALL ADDNOD (MXND, MLN, XN, YN, LXK, KXL, NXL, LXN, ANGLE, & BNSIZE, LNODES, X(1), Y(1), DIST, NNN, KKK, LLL, & N0, N1, N2, AMBIG, LAMBIG, SIZEIT, ERR, NOROOM, XNOLD, @@ -447,10 +408,10 @@ SUBROUTINE ADDROW (MXND, MXCORN, MXLOOP, MLN, MAXPRM, NUID, XN, CALL SNAPIT (1) ENDIF ENDIF -C + C TRY A PINCH TO MAKE SURE THAT CONTINUING DOES NOT OVERLAY C AN ALREADY GOOD CLOSURE -C + CALL FIXLXN (MXND, LXN, NXL, NUID, NAVAIL, IAVAIL, NNN, LLL, & NNNOLD, LLLOLD, ERR, NOROOM) IF ((NOROOM) .OR. (ERR)) GOTO 120 @@ -465,14 +426,14 @@ SUBROUTINE ADDROW (MXND, MXCORN, MXLOOP, MLN, MAXPRM, NUID, XN, CALL FILSMO (MXND, MLN, XN, YN, ZN, LXK, KXL, NXL, LXN, & LLL, NNN, NNN2, LNODES, BNSIZE, NLOOP (1), XMIN, XMAX, & YMIN, YMAX, ZMIN, ZMAX, DEV1, KREG) -C + CALL GETIME (TIME1) IF ((GRAPH) .OR. (VIDEO)) THEN CALL RPLOTL (MXND, XN, YN, ZN, NXL, XMIN, XMAX, YMIN, & YMAX, ZMIN, ZMAX, LLL, DEV1, KREG) IF (VIDEO) CALL SNAPIT (2) ENDIF -C + CALL GETIME (TIME2) TIMEA = TIMEA + TIME2 - TIME1 CALL PINCH (MXND, MXCORN, MLN, NUID, XN, YN, ZN, LXK, KXL, @@ -484,10 +445,10 @@ SUBROUTINE ADDROW (MXND, MXCORN, MXLOOP, MLN, MAXPRM, NUID, XN, IF ((NOROOM) .OR. (ERR)) GOTO 120 IF (DONE) GOTO 120 CALL GETIME (TIME1) -C + C TRY A COLAPS TO MAKE SURE THAT CONTINUING DOES NOT COMPLICATE C AN ALREADY OVERLAPPED SIDE -C + IF (NLOOP (1) .GT. 6) THEN NLOLD = NLOOP (1) CALL GETIME (TIME2) @@ -502,9 +463,9 @@ SUBROUTINE ADDROW (MXND, MXCORN, MXLOOP, MLN, MAXPRM, NUID, XN, IF (DONE) GOTO 120 CALL GETIME (TIME1) ENDIF -C + C CHECK TO SEE IF ANY OF THE CONCURRENT PERIMETERS OVERLAP -C + IF (LINKPR (2, KPERIM) .NE. 0) THEN LINKPR (3, KPERIM) = NLOOP (1) CALL GETIME (TIME2) @@ -520,11 +481,11 @@ SUBROUTINE ADDROW (MXND, MXCORN, MXLOOP, MLN, MAXPRM, NUID, XN, IF ((NOROOM) .OR. (ERR)) GOTO 120 CALL GETIME (TIME1) ENDIF -C + C THE ROW CAN BE CONTINUED IF THE NEW NODE AND THE ENDING NODE C IS STILL ON THE BOUNDARY AFTER THE PINCH, COLAPS AND PCROSS C AND IF THE ANGLE AT THE NODE IS SOMEWHAT AS IT SHOULD BE -C + IF ( (NLOLD .EQ. NLOOP(1)) .AND. & (IABS (LNODES (4, NEW1)) .EQ. 1) .AND. & (LNODES (2, N2) .EQ. NEW1) .AND. @@ -556,10 +517,10 @@ SUBROUTINE ADDROW (MXND, MXCORN, MXLOOP, MLN, MAXPRM, NUID, XN, NADJ2 = 0 GOTO 120 ENDIF -C + C TRY A PINCH TO MAKE SURE THAT CONTINUING DOES NOT OVERLAY C AN ALREADY GOOD CLOSURE -C + CALL FIXLXN (MXND, LXN, NXL, NUID, NAVAIL, IAVAIL, NNN, LLL, & NNNOLD, LLLOLD, ERR, NOROOM) IF ((NOROOM) .OR. (ERR)) GOTO 120 @@ -574,14 +535,14 @@ SUBROUTINE ADDROW (MXND, MXCORN, MXLOOP, MLN, MAXPRM, NUID, XN, CALL FILSMO (MXND, MLN, XN, YN, ZN, LXK, KXL, NXL, LXN, & LLL, NNN, NNN2, LNODES, BNSIZE, NLOOP (1), XMIN, XMAX, & YMIN, YMAX, ZMIN, ZMAX, DEV1, KREG) -C + CALL GETIME (TIME1) IF ((GRAPH) .OR. (VIDEO)) THEN CALL RPLOTL (MXND, XN, YN, ZN, NXL, XMIN, XMAX, YMIN, & YMAX, ZMIN, ZMAX, LLL, DEV1, KREG) IF (VIDEO) CALL SNAPIT (2) ENDIF -C + CALL GETIME (TIME2) TIMEA = TIMEA + TIME2 - TIME1 CALL PINCH (MXND, MXCORN, MLN, NUID, XN, YN, ZN, LXK, KXL, @@ -593,10 +554,10 @@ SUBROUTINE ADDROW (MXND, MXCORN, MXLOOP, MLN, MAXPRM, NUID, XN, IF ((NOROOM) .OR. (ERR)) GOTO 120 IF (DONE) GOTO 120 CALL GETIME (TIME1) -C + C TRY A COLAPS TO MAKE SURE THAT CONTINUING DOES NOT COMPLICATE C AN ALREADY OVERLAPPED SIDE -C + IF (NLOOP (1) .GT. 6) THEN NLOLD = NLOOP (1) CALL GETIME (TIME2) @@ -611,9 +572,9 @@ SUBROUTINE ADDROW (MXND, MXCORN, MXLOOP, MLN, MAXPRM, NUID, XN, IF (DONE) GOTO 120 CALL GETIME (TIME1) ENDIF -C + C CHECK TO SEE IF ANY OF THE CONCURRENT PERIMETERS OVERLAP -C + IF (LINKPR (2, KPERIM) .NE. 0) THEN LINKPR (3, KPERIM) = NLOOP (1) CALL GETIME (TIME2) @@ -629,10 +590,10 @@ SUBROUTINE ADDROW (MXND, MXCORN, MXLOOP, MLN, MAXPRM, NUID, XN, IF ((NOROOM) .OR. (ERR)) GOTO 120 CALL GETIME (TIME1) ENDIF -C + C THE ROW CAN BE CONTINUED IF THE NEW NODE AND THE ENDING NODE C IS STILL ON THE BOUNDARY AFTER THE PINCH, COLAPS AND PCROSS -C + IF ( (NLOLD .EQ. NLOOP(1)) .AND. & (IABS (LNODES (4, NEW3)) .EQ. 1) .AND. & (LNODES (2, N2) .EQ. NEW3) .AND. @@ -663,25 +624,25 @@ SUBROUTINE ADDROW (MXND, MXCORN, MXLOOP, MLN, MAXPRM, NUID, XN, NADJ2 = 0 GOTO 120 ENDIF -C + N1 = N2 GOTO 100 -C + ELSE CALL MESAGE ('PROBLEMS IN ADDROW - THE NEXT NODE IN THE') CALL MESAGE ('ROW DOES NOT HAVE THE RIGHT CLASSIFICATION') ERR = .TRUE. GOTO 120 ENDIF -C + IF (KOUNT .GT. NLOOP (1)) THEN CALL MESAGE ('PROBLEMS IN ADDROW - THE ROW DOESN''T STOP') ERR = .TRUE. GOTO 120 ENDIF -C + C CLOSE OFF THE END OF THE ROW - THE END NODE IS THE CONNECTION -C + ELSE NADJ2 = LNODES (3, N2) CALL CONNOD (MXND, MLN, XN, YN, NUID, LXK, KXL, NXL, LXN, @@ -689,25 +650,25 @@ SUBROUTINE ADDROW (MXND, MXCORN, MXLOOP, MLN, MAXPRM, NUID, XN, & LNODES (3, N2), N1, NLOOP (1), IAVAIL, NAVAIL, GRAPH, & VIDEO, NOROOM, ERR) IF ((NOROOM) .OR. (ERR)) GOTO 120 -C + C NOW SMOOTH THE CURRENT ROW INTO THE MESH -C + CALL GETIME (TIME2) TIMEA = TIMEA + TIME2 - TIME1 CALL FILSMO (MXND, MLN, XN, YN, ZN, LXK, KXL, NXL, LXN, & LLL, NNN, NNN2, LNODES, BNSIZE, NLOOP (1), XMIN, XMAX, & YMIN, YMAX, ZMIN, ZMAX, DEV1, KREG) CALL GETIME (TIME1) -C + C CALCULATE NEW ANGLES -C + CALL LUPANG (MXND, MLN, XN, YN, ZN, LXK, KXL, NXL, LXN, & NLOOP (1), ANGLE, LNODES, N3, LLL, XMIN, XMAX, YMIN, YMAX, & ZMIN, ZMAX, DEV1, KREG, ERR) IF (ERR) GOTO 120 -C + C PLOT THE NEW MESH -C + IF (VIDEO) THEN CALL RPLOTL (MXND, XN, YN, ZN, NXL, XMIN, XMAX, YMIN, & YMAX, ZMIN, ZMAX, LLL, DEV1, KREG) @@ -715,11 +676,11 @@ SUBROUTINE ADDROW (MXND, MXCORN, MXLOOP, MLN, MAXPRM, NUID, XN, ENDIF ENDIF NBEGIN = N3 -C + 120 CONTINUE CALL GETIME (TIME2) TIMEA = TIMEA + TIME2 - TIME1 -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/addsnp.f b/packages/seacas/applications/fastq/addsnp.f index 3881350a654f..748f66a85d0f 100644 --- a/packages/seacas/applications/fastq/addsnp.f +++ b/packages/seacas/applications/fastq/addsnp.f @@ -1,27 +1,16 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: addsnp.f,v 1.1 1990/11/30 11:03:07 gdsjaar Exp $ -C $Log: addsnp.f,v $ -C Revision 1.1 1990/11/30 11:03:07 gdsjaar -C Initial revision -C -C -CC* FILE: [.MAIN]ADDSNP.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE ADDSNP(MSNAP,SNAPDX,NSNAP,INDEX,VALUE,ERR) C*********************************************************************** -C + C SUBROUTINE ADDSNP = ADDS SNAP GRID LINE DEFINITIONS -C + C*********************************************************************** -C + C VARIABLES USED: C MSNAP = DIMENSION OV SNAP ARRAYS C SNAPDX = THE SNAP GRID VALUES ARRAY (X AND Y) @@ -29,27 +18,27 @@ SUBROUTINE ADDSNP(MSNAP,SNAPDX,NSNAP,INDEX,VALUE,ERR) C INDEX = 1 FOR X VALUES, 2 FOR Y VALUES C VALUE = THE GRID VALUE TO BE ADDED C KOUNT = THE LOCATION OF THE SNAPDX VALUE JUST LESS THAN VALUE -C + C*********************************************************************** -C + DIMENSION SNAPDX(2,MSNAP),NSNAP(2) -C + LOGICAL ERR -C + C ADD THE SNAP GRID VALUE WHERE IT FITS IN NUMERICAL ORDER -C + ERR=.FALSE. -C + IF(NSNAP(INDEX).GT.0)THEN KOUNT=0 DO 100 I=1,NSNAP(INDEX) IF(VALUE.LT.SNAPDX(INDEX,I))GOTO 110 KOUNT=I -C + C IF THE VALUE IS ALREADY THERE, THEN DON'T ADD IT AGAIN - JUST RETURN -C + IF(VALUE.EQ.SNAPDX(INDEX,I))RETURN -C + 100 CONTINUE 110 CONTINUE IF(NSNAP(INDEX).EQ.MSNAP)THEN @@ -63,16 +52,16 @@ SUBROUTINE ADDSNP(MSNAP,SNAPDX,NSNAP,INDEX,VALUE,ERR) SNAPDX(INDEX,I)=SNAPDX(INDEX,I-1) 120 CONTINUE SNAPDX(INDEX,KOUNT+1)=VALUE -C + C JUST PUT THE FIRST VALUE WHERE IT BELONGS -C + ELSE NSNAP(INDEX)=1 SNAPDX(INDEX,1)=VALUE ENDIF -C + RETURN -C + 10000 FORMAT(' THE MAXIMUM NUMBER OF GRID LINES IS: ',I10) -C + END diff --git a/packages/seacas/applications/fastq/addtuk.f b/packages/seacas/applications/fastq/addtuk.f index 52b98443e9c1..d3334cd7b960 100644 --- a/packages/seacas/applications/fastq/addtuk.f +++ b/packages/seacas/applications/fastq/addtuk.f @@ -1,51 +1,40 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: addtuk.f,v 1.1 1990/11/30 11:03:10 gdsjaar Exp $ -C $Log: addtuk.f,v $ -C Revision 1.1 1990/11/30 11:03:10 gdsjaar -C Initial revision -C -C -CC* FILE: [.PAVING]ADDTUK.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE ADDTUK (MXND, MLN, NUID, XN, YN, ZN, LXK, KXL, NXL, & LXN, LNODES, ANGLE, NLOOP, IAVAIL, NAVAIL, LLL, KKK, NNN, TANG, & KANG, NSTART, NEND, NODE, XMIN, XMAX, YMIN, YMAX, ZMIN, ZMAX, & GRAPH, VIDEO, DEV1, NOROOM, ERR) C*********************************************************************** -C + C SUBROUTINE ADDTUK = ADDS TUCKS IN A ROW -C + C*********************************************************************** -C + C ADD TUCKS BASED ON THE TOTAL TURNED ANGLE: C FOR TURNING ANGLES LESS THAN 135 DEGREES - 1 TUCK C FOR TURNING ANGLES BETWEEN 135 AND 225 DEGREES - TRY 2 TUCKS C FOR TURNING ANGLES BETWEEN 225 AND 315 DEGREES - TRY 3 TUCKS C FOR TURNING ANGLES GREATER THAN 315 DEGREES - TRY 4 TUCKS -C + C*********************************************************************** -C + DIMENSION XN (MXND), YN (MXND), ZN (MXND), NUID (MXND) DIMENSION LXK (4, MXND), KXL (2, 3*MXND) DIMENSION NXL (2, 3*MXND), LXN (4, MXND) DIMENSION LNODES (MLN, MXND), ANGLE (MXND) DIMENSION INODE (4) -C + LOGICAL GRAPH, ERR, MAXSIZ, VIDEO, NOROOM -C + CHARACTER*3 DEV1 -C + ERR = .FALSE. MAXSIZ = .FALSE. -C + IF (TANG .LT. 2.3561945) THEN NWANT = 1 ELSEIF (TANG .LT. 3.9269908) THEN @@ -73,15 +62,15 @@ SUBROUTINE ADDTUK (MXND, MLN, NUID, XN, YN, ZN, LXK, KXL, NXL, NWANT = 1 ENDIF ENDIF -C + CALL NSPLIT (MXND, MLN, LNODES, ANGLE, NSTART, KANG, INODE, & NNODE, NWANT, MAXSIZ) -C + DO 100 I = 1, NNODE IF (LXN (1, I) .GT. 0) THEN -C + C MARK THE SMOOTHING -C + CALL MARKSM (MXND, MLN, LXK, KXL, NXL, LXN, LNODES, & LNODES (2, INODE(I)), ERR) IF (ERR) GOTO 110 @@ -97,10 +86,10 @@ SUBROUTINE ADDTUK (MXND, MLN, NUID, XN, YN, ZN, LXK, KXL, NXL, CALL MARKSM (MXND, MLN, LXK, KXL, NXL, LXN, LNODES, & LNODES (3, LNODES (3, LNODES (3, INODE(I)))), ERR) IF (ERR) GOTO 110 -C + C MAKE SURE THAT THE NSTART, NEND, AND NODE GET UPDATED IF THEY ARE TO C BE DELETED -C + IF ( (INODE(I) .EQ. NSTART) .OR. & (LNODES (3, INODE(I)) .EQ. NSTART)) THEN NSTART = LNODES (3, LNODES (3, INODE(I))) @@ -113,9 +102,9 @@ SUBROUTINE ADDTUK (MXND, MLN, NUID, XN, YN, ZN, LXK, KXL, NXL, & (LNODES (3, INODE(I)) .EQ. NODE) ) THEN NODE = LNODES (3, LNODES (3, INODE(I))) ENDIF -C + C TAKE THE TUCK -C + CALL TUCK (MXND, MLN, NUID, XN, YN, LXK, KXL, NXL, LXN, & LNODES, IAVAIL, NAVAIL, LLL, KKK, NNN, INODE (I), NLOOP, & GRAPH, NOROOM, ERR) @@ -127,9 +116,9 @@ SUBROUTINE ADDTUK (MXND, MLN, NUID, XN, YN, ZN, LXK, KXL, NXL, ENDIF ENDIF 100 CONTINUE -C + 110 CONTINUE -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/addwdg.f b/packages/seacas/applications/fastq/addwdg.f index a3d9107429c8..40e5d613f98c 100644 --- a/packages/seacas/applications/fastq/addwdg.f +++ b/packages/seacas/applications/fastq/addwdg.f @@ -1,52 +1,41 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: addwdg.f,v 1.1 1990/11/30 11:03:13 gdsjaar Exp $ -C $Log: addwdg.f,v $ -C Revision 1.1 1990/11/30 11:03:13 gdsjaar -C Initial revision -C -C -CC* FILE: [.PAVING]ADDWDG.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE ADDWDG (MXND, MLN, NUID, XN, YN, ZN, LXK, KXL, NXL, & LXN, LNODES, ANGLE, BNSIZE, NLOOP, IAVAIL, NAVAIL, LLL, KKK, & NNN, LLLOLD, NNNOLD, TANG, KANG, NSTART, NEND, XMIN, XMAX, & YMIN, YMAX, ZMIN, ZMAX, GRAPH, VIDEO, DEV1, KREG, NOROOM, ERR) C*********************************************************************** -C + C SUBROUTINE ADDWDG = ADDS WEDGES IN A ROW -C + C*********************************************************************** -C + C ADD WEDGES BASED ON THE TOTAL TURNED ANGLE: C FOR TURNING ANGLES LESS THAN 135 DEGREES - 1 WEDGE C FOR TURNING ANGLES BETWEEN 135 AND 225 DEGREES - TRY 2 WEDGES C FOR TURNING ANGLES BETWEEN 225 AND 315 DEGREES - TRY 3 WEDGES C FOR TURNING ANGLES GREATER THAN 315 DEGREES - TRY 4 WEDGES -C + C*********************************************************************** -C + DIMENSION XN (MXND), YN (MXND), ZN (MXND), NUID (MXND) DIMENSION LXK (4, MXND), KXL (2, 3*MXND) DIMENSION NXL (2, 3*MXND), LXN (4, MXND) DIMENSION LNODES (MLN, MXND), BNSIZE (2, MXND), ANGLE (MXND) DIMENSION INODE (4) -C + LOGICAL GRAPH, ERR, MAXSIZ, VIDEO, NOROOM, PWEDGE -C + CHARACTER*3 DEV1 -C + MAXSIZ = .TRUE. ERR = .FALSE. PWEDGE = .FALSE. -C + IF (TANG .LT. 2.3561945) THEN NWANT = 1 ELSEIF (TANG .LT. 3.9269908) THEN @@ -56,10 +45,10 @@ SUBROUTINE ADDWDG (MXND, MLN, NUID, XN, YN, ZN, LXK, KXL, NXL, ELSE NWANT = 4 ENDIF -C + CALL NSPLIT (MXND, MLN, LNODES, ANGLE, NSTART, KANG, INODE, & NNODE, NWANT, MAXSIZ) -C + DO 100 I = 1, NNODE CALL MARKSM (MXND, MLN, LXK, KXL, NXL, LXN, LNODES, & LNODES (2, INODE(I)), ERR) @@ -87,8 +76,8 @@ SUBROUTINE ADDWDG (MXND, MLN, NUID, XN, YN, ZN, LXK, KXL, NXL, CALL SNAPIT (2) ENDIF 100 CONTINUE -C + 110 CONTINUE RETURN -C + END diff --git a/packages/seacas/applications/fastq/addwt.f b/packages/seacas/applications/fastq/addwt.f index ecc666080e01..f51dd3f9720e 100644 --- a/packages/seacas/applications/fastq/addwt.f +++ b/packages/seacas/applications/fastq/addwt.f @@ -1,26 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: addwt.f,v 1.2 2007/04/04 22:00:37 gdsjaar Exp $ -C $Log: addwt.f,v $ -C Revision 1.2 2007/04/04 22:00:37 gdsjaar -C Fix some bugs. -C -C Revision 1.1.1.1 1990/11/30 11:03:19 gdsjaar -C FASTQ Version 2.0X -C -c Revision 1.1 90/11/30 11:03:17 gdsjaar -c Initial revision -c -C -CC* FILE: [.RENUM]ADDWT.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE ADDWT (NNUID, NNXK, MAXKXN, NPNODE, NPELEM, MXLPS, MP, & ML, MS, NPNBC, NPSBC, MXNFLG, MXSFLG, NPWTS, COOR, ILINE, & LTYPE, LCON, ISIDE, NLPS, IFLINE, ILLIST, LINKP, LINKL, LINKS, @@ -30,18 +13,18 @@ SUBROUTINE ADDWT (NNUID, NNXK, MAXKXN, NPNODE, NPELEM, MXLPS, MP, & NSFLG, NVPTR, NVLEN, NSIDEN, WTNODE, WTSIDE, WTHOLD, NBCNOD, & NNLIST, NBCSID, NSLIST, NVLIST, ILIST, XLIST) C*********************************************************************** -C + C SUBROUTINE ADDWT = ADDS THE WEIGHTING FACTORS TO ANY NODES WITH C FLAGS CONTAINING WEIGHTS -C + C*********************************************************************** -C + C SUBROUTINE CALLED BY: C RENUM = NUMBERS QMESH OUTPUT, AND RENUMBERS AS NEEDED FOR C OPTIMIZATION -C + C*********************************************************************** -C + DIMENSION COOR (2, MP), ILINE (ML), LTYPE (ML), LCON (3, ML) DIMENSION ISIDE (MS), NLPS (MS), IFLINE (MS), ILLIST (MS*3) DIMENSION LINKP (2, MP), LINKL (2, ML), LINKS (2, MS) @@ -52,23 +35,23 @@ SUBROUTINE ADDWT (NNUID, NNXK, MAXKXN, NPNODE, NPELEM, MXLPS, MP, DIMENSION ISBF (ML), NSPF (ML), IFSB (ML), LISTSB (2, ML), & IWTSBF (3, ML) DIMENSION LINKPB (2, MP), LINKLB (2, ML), LINKSB (2, ML) -C + DIMENSION NUID (NNUID), NXK (NNXK, NPELEM), KXN (NNXK, MAXKXN) DIMENSION XN (NPNODE), YN (NPNODE), ILIST (MXLPS), XLIST (MXLPS) -C + DIMENSION LSTNBC (NPNBC), NSIDEN (NPSBC), WTHOLD (NPWTS) DIMENSION NNFLG (MXNFLG), NNLEN (MXNFLG), NNPTR (MXNFLG), & WTNODE (NPNBC) DIMENSION NSFLG (MXSFLG), NVLEN (MXSFLG), NVPTR (MXSFLG), & WTSIDE (NPSBC) -C + LOGICAL ADDLNK, ERR, ISPNT -C + ADDLNK = .FALSE. IPNTR = 0 -C + C FIRST FLAG ALL WEIGHT ARRAYS TO -1.0 TO KNOW WHICH REMAIN DEFAULTED -C + DO 100 I = 1, NNLIST WTNODE (I) = -1.0 WTHOLD (I) = -1.0 @@ -76,10 +59,10 @@ SUBROUTINE ADDWT (NNUID, NNXK, MAXKXN, NPNODE, NPELEM, MXLPS, MP, DO 110 I = 1, NVLIST WTSIDE (I) = -1.0 110 CONTINUE -C + C NOW CHECK ALL POINT FLAGS FOR WEIGHTS AND APPLY THE POINT C Y VALUE AS THE WEIGHT FOR THE NODE AT THE BEGINNING POINT -C + ISPNT = .TRUE. DO 120 I = 1, NBCNOD CALL LTSORT (MP, LINKPB, NNFLG (I), IPNTR, ADDLNK) @@ -103,10 +86,10 @@ SUBROUTINE ADDWT (NNUID, NNXK, MAXKXN, NPNODE, NPELEM, MXLPS, MP, ENDIF 120 CONTINUE ISPNT = .FALSE. -C + C NOW CHECK ALL LINE FLAGS FOR WEIGHTS AND APPLY THE APPROPRIATE C WEIGHT ALL ALONG CONTINUOUS NODES ON THE BOUNDARY. -C + DO 160 I = 1, NBCNOD CALL LTSORT (ML, LINKLB, NNFLG (I), IPNTR, ADDLNK) IF (IPNTR .GT. 0) THEN @@ -120,10 +103,10 @@ SUBROUTINE ADDWT (NNUID, NNXK, MAXKXN, NPNODE, NPELEM, MXLPS, MP, & ILLIST, COOR, JPOINT, JSIDE, ILOC, JLOC, NIX, ILIST, & XLIST, ADDLNK, ISPNT, ERR) IF (.NOT.ERR) THEN -C + C LOOP UNTIL ALL THE NODES HAVE BEEN FOUND, C FIRST PUTTING THE ACCUMULATED LENGTH IN THE WTNODE ARRAY -C + NEWNOD = 0 ACCLEN = 0. NODE = LSTNBC (JLOC) @@ -150,10 +133,10 @@ SUBROUTINE ADDWT (NNUID, NNXK, MAXKXN, NPNODE, NPELEM, MXLPS, MP, NEWNOD = 0 GOTO 130 ENDIF -C + C NOW CHANGE THE ACCUMULATED LENGTH TO A PERCENTAGE LENGTH C AND GET THE WEIGHTING FUNCTION -C + DO 140 J = NNPTR (ILOC), NNPTR (ILOC)+NNLEN (ILOC)-1 IF ((WTNODE (J) .GE. 0.).AND. (ACCLEN .NE. 0.)) & THEN @@ -170,17 +153,17 @@ SUBROUTINE ADDWT (NNUID, NNXK, MAXKXN, NPNODE, NPELEM, MXLPS, MP, ENDIF 150 CONTINUE 160 CONTINUE -C + C NOW RESET NUIDS AND PUT ALL DEFAULTS TO 1.0 -C + DO 170 I = 1, NNLIST NUID (LSTNBC (I)) = ABS (NUID (LSTNBC (I))) IF (WTHOLD (I) .LT. 0.)WTNODE (I) = 1.0 170 CONTINUE -C + C NOW CHECK ALL SIDE FLAGS FOR WEIGHTS AND APPLY THE APPROPRIATE C WEIGHT ALL ALONG CONTINUOUS NODES ON THE BOUNDARY. -C + DO 260 I = 1, NBCSID CALL LTSORT (MP, LINKSB, NSFLG (I), IPNTR, ADDLNK) IF (IPNTR .GT. 0) THEN @@ -199,10 +182,10 @@ SUBROUTINE ADDWT (NNUID, NNXK, MAXKXN, NPNODE, NPELEM, MXLPS, MP, WTSIDE (J) = 1.0 180 CONTINUE ELSE -C + C LOOP UNTIL ALL THE NODES HAVE BEEN FOUND, C FIRST PUTTING THE ACCUMULATED LENGTH IN THE WTSIDE ARRAY -C + NEWNOD = 0 J1 = NVPTR (ILOC) J2 = NVPTR (ILOC)+NVLEN (ILOC)-1 @@ -214,9 +197,9 @@ SUBROUTINE ADDWT (NNUID, NNXK, MAXKXN, NPNODE, NPELEM, MXLPS, MP, LINE1 = LISTLB (1, IFSB (IPNTR)) ENDIF 190 CONTINUE -C + C PUT THIS ACCLEN FOR ALL OCCURRENCES OF NODE IN THE LIST -C + DO 200 J = J1, J2 IF (NSIDEN (J) .EQ. NODE)WTSIDE (J) = ACCLEN 200 CONTINUE @@ -240,10 +223,10 @@ SUBROUTINE ADDWT (NNUID, NNXK, MAXKXN, NPNODE, NPELEM, MXLPS, MP, NEWNOD = 0 GOTO 190 ENDIF -C + C NOW CHANGE THE ACCUMULATED LENGTH TO A PERCENTAGE LENGTH C AND GET THE WEIGHTING FUNCTION -C + DO 220 J = NVPTR (ILOC), NVPTR (ILOC)+NVLEN (ILOC)-1 IF ((WTSIDE (J) .GE. 0.).AND. (ACCLEN .NE. 0.)) & THEN @@ -256,13 +239,13 @@ SUBROUTINE ADDWT (NNUID, NNXK, MAXKXN, NPNODE, NPELEM, MXLPS, MP, WTSIDE (J) = 0. ENDIF 220 CONTINUE -C + C NOW RESET NUIDS FROM THIS SIDE SET -C + DO 230 JI = 1, NVLIST NUID (NSIDEN (JI)) = ABS (NUID (NSIDEN (JI))) 230 CONTINUE -C + ENDIF ELSE DO 240 J = NVPTR (I), NVPTR (I)+NVLEN (I)+1 @@ -272,18 +255,18 @@ SUBROUTINE ADDWT (NNUID, NNXK, MAXKXN, NPNODE, NPELEM, MXLPS, MP, ENDIF 250 CONTINUE 260 CONTINUE -C + C NOW RESET NUIDS -C + DO 270 I = 1, NVLIST NUID (NSIDEN (I)) = ABS (NUID (NSIDEN (I))) 270 CONTINUE -C + RETURN -C + 10000 FORMAT (/, ' WEIGHTING BEGUN FOR NODAL FLAG', I5) 10010 FORMAT (' NO WEIGHTING POSSIBLE FOR NODAL FLAG', I5) 10020 FORMAT (/, ' WEIGHTING BEGUN FOR ELEMENT FLAG', I5) 10030 FORMAT (' NO WEIGHTING POSSIBLE FOR ELEMENT FLAG', I5) -C + END diff --git a/packages/seacas/applications/fastq/adjmsh.f b/packages/seacas/applications/fastq/adjmsh.f index f6a9b394a0b3..1ba5472d9c4d 100644 --- a/packages/seacas/applications/fastq/adjmsh.f +++ b/packages/seacas/applications/fastq/adjmsh.f @@ -1,38 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: adjmsh.f,v 1.2 1999/06/21 22:43:40 gdsjaar Exp $ -C $Log: adjmsh.f,v $ -C Revision 1.2 1999/06/21 22:43:40 gdsjaar -C Fixed more uninitialized variables; one was causing core dump on g77 -C compiled executable. -C -C VERSN was not consistently defined -- now 10 characters everywhere -C -C Updated so full version string output -C -C Added capability to debug memory using unit specified in EXT99 -C variable. Similar to STRTUP in SUPLIB -C -C Cleaned up some other code -C -C Upped version -C -C Revision 1.1.1.1 1990/11/30 11:03:22 gdsjaar -C FASTQ Version 2.0X -C -c Revision 1.1 90/11/30 11:03:20 gdsjaar -c Initial revision -c -C -CC* FILE: [.MAIN]ADJMSH.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE ADJMSH (MS, MR, NPNODE, NPELEM, MXNFLG, MXSFLG, NPREGN, & NPNBC, NPSBC, MCOM, ICOM, JCOM, CIN, RIN, IIN, KIN, & NNN, KKK, NNXK, NODES, NELEMS, NNFLG, NNPTR, NNLEN, NSFLG, @@ -40,11 +11,11 @@ SUBROUTINE ADJMSH (MS, MR, NPNODE, NPELEM, MXNFLG, MXSFLG, NPREGN, & MAPGXD, MATMAP, WTNODE, WTSIDE, NBCNOD, NNLIST, NBCSID, NSLIST, & NVLIST, NUMMAT, LINKM, TITLE, ERR, EIGHT, NINE, VERSN) C*********************************************************************** -C + C SUBROUTINE ADJMSH = ADJUSTS A GENESIS DATABASE OUTPUT -C + C*********************************************************************** -C + DIMENSION XN (NPNODE), YN (NPNODE), NXK (NNXK, NPELEM) DIMENSION MAT (NPELEM) DIMENSION NODES (NPNBC), NELEMS (NPSBC), NSIDEN (NPSBC) @@ -55,12 +26,12 @@ SUBROUTINE ADJMSH (MS, MR, NPNODE, NPELEM, MXNFLG, MXSFLG, NPREGN, DIMENSION NVLEN (MXSFLG), NVPTR (MXSFLG), LINKM (2, (MS+MR)) DIMENSION MAPDXG (NPNODE), MAPGXD (NPNODE), MATMAP (3, NPREGN) DIMENSION KIN (MCOM), IIN (MCOM), RIN (MCOM) -C + LOGICAL FOUND, ERR -C + CHARACTER*72 TITLE, CIN (MCOM) CHARACTER*10 VERSN -C + CALL MESAGE (' ') CALL MESAGE & ('*********************************************************') @@ -71,9 +42,9 @@ SUBROUTINE ADJMSH (MS, MR, NPNODE, NPELEM, MXNFLG, MXSFLG, NPREGN, CALL MESAGE & ('*********************************************************') CALL MESAGE (' ') -C + C ADJUST SIDE BOUNDARY FLAGS BY MATERIALS -C + CALL MESAGE ('ENTER DATA IN THE FOLLOWING FORMAT:') CALL MESAGE ('[ MATERIAL NUMBER, FLAG ID ]') CALL MESAGE ('HIT RETURN TO END INPUT') @@ -98,10 +69,10 @@ SUBROUTINE ADJMSH (MS, MR, NPNODE, NPELEM, MXNFLG, MXSFLG, NPREGN, GOTO 100 ENDIF ENDIF -C + C NOW THAT THE MATERIAL (I1) AND THE FLAG ID (I2) ARE ENTERED C FIRST CHECK TO MAKE SURE THAT THAT MATERIAL IS PRESENT -C + DO 110 I = 1, NUMMAT IF (MATMAP (1, I) .EQ. I1) THEN J1 = MATMAP (2, I) @@ -111,11 +82,11 @@ SUBROUTINE ADJMSH (MS, MR, NPNODE, NPELEM, MXNFLG, MXSFLG, NPREGN, 110 CONTINUE CALL MESAGE('** THAT MATERIAL IS NOT PRESENT IN THE MESH **') GOTO 100 -C + 120 CONTINUE -C + C NOW FIND THE ELEMENT SIDE FLAG -C + DO 130 I = 1, NBCSID IF (NSFLG (I) .EQ. I2) THEN II = I @@ -125,44 +96,44 @@ SUBROUTINE ADJMSH (MS, MR, NPNODE, NPELEM, MXNFLG, MXSFLG, NPREGN, CALL MESAGE ('** THAT ELEMENT BOUNDARY FLAG IS NOT IN THE '// & 'MESH **') GOTO 100 -C + 140 CONTINUE -C + C NOW SEARCH THE LOOP FOR ELEMENTS ATTACHED TO THAT BOUNDARY FLAG C OF THE SPECIFIED MATERIAL -C + IBEGIN = NSPTR (II) IEND = NSPTR (II) + NSLEN (I) - 1 -C + FOUND = .FALSE. KOUNT = 0 -C + DO 180 I = IBEGIN, IEND IF ((NELEMS (I - KOUNT) .GE. J1) .AND. & (NELEMS (I - KOUNT) .LE. J2)) THEN -C + C AN ELEMENT SIDE FLAG HAS BEEN FOUND - NOW DELETE IT -C + FOUND = .TRUE. -C + DO 150 J = I - KOUNT, NSLIST - 1 NELEMS (J) = NELEMS (J + 1) 150 CONTINUE NSLIST = NSLIST - 1 -C + DO 160 J = (((I - KOUNT) * 2) -1), NVLIST - 2 NSIDEN (J) = NSIDEN (J + 2) WTSIDE (J) = WTSIDE (J + 2) 160 CONTINUE NVLIST = NVLIST - 2 -C + NSLEN (II) = NSLEN (II) - 1 NVLEN (II) = NVLEN (II) - 2 DO 170 J = II + 1, NBCSID NSPTR (J) = NSPTR (J) - 1 NVPTR (J) = NVPTR (J) - 2 170 CONTINUE -C + KOUNT = KOUNT + 1 ENDIF 180 CONTINUE @@ -171,8 +142,8 @@ SUBROUTINE ADJMSH (MS, MR, NPNODE, NPELEM, MXNFLG, MXSFLG, NPREGN, & 'FLAG AND MATERIAL **') ENDIF GOTO 100 -C + 190 CONTINUE RETURN -C + END diff --git a/packages/seacas/applications/fastq/adjrow.f b/packages/seacas/applications/fastq/adjrow.f index 23cfeca25ff8..8c442126bc0b 100644 --- a/packages/seacas/applications/fastq/adjrow.f +++ b/packages/seacas/applications/fastq/adjrow.f @@ -1,66 +1,40 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: adjrow.f,v 1.4 1998/07/14 18:18:16 gdsjaar Exp $ -C $Log: adjrow.f,v $ -C Revision 1.4 1998/07/14 18:18:16 gdsjaar -C Removed unused variables, cleaned up a little. -C -C Changed BLUE labels to GREEN to help visibility on black background -C (indirectly requested by a couple users) -C -C Revision 1.3 1998/03/23 05:17:50 gdsjaar -C Fixed data statement ordering -C -C Revision 1.2 1991/03/21 15:44:16 gdsjaar -C Changed all 3.14159... to atan2(0.0, -1.0) -C -c Revision 1.1.1.1 1990/11/30 11:03:25 gdsjaar -c FASTQ Version 2.0X -c -c Revision 1.1 90/11/30 11:03:23 gdsjaar -c Initial revision -c -C -CC* FILE: [.PAVING]ADJROW.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE ADJROW (MXND, MLN, NUID, XN, YN, ZN, LXK, KXL, NXL, & LXN, ANGLE, BNSIZE, LNODES, NLOOP, IAVAIL, NAVAIL, XMIN, XMAX, & YMIN, YMAX, ZMIN, ZMAX, DEV1, LLL, KKK, NNN, LLLOLD, NNNOLD, & NODE, NADJ1, NADJ2, NNN2, GRAPH, VIDEO, KREG, DEFSIZ, ADJTED, & NOROOM, ERR) C*********************************************************************** -C + C SUBROUTINE ADJROW = ADJUSTS A ROW OF ELEMENTS BETWEEN TWO CORNERS -C + C*********************************************************************** -C + COMMON /TIMING/ TIMEA, TIMEP, TIMEC, TIMEPC, TIMEAJ, TIMES -C + DIMENSION XN (MXND), YN (MXND), ZN (MXND), NUID (MXND) DIMENSION LXK (4, MXND), KXL (2, 3*MXND) DIMENSION NXL (2, 3*MXND), LXN (4, MXND) DIMENSION ANGLE (MXND), BNSIZE (2, MXND), LNODES (MLN, MXND) -C + LOGICAL ERR, GRAPH, ADJTED, VIDEO, NOROOM -C + CHARACTER*3 DEV1 -C + DATA TMIN1 /.80/, TMIN2 /.3/, WMIN1 /1.25/, WMIN2 /1.35/ -C + PI = ATAN2(0.0, -1.0) CALL GETIME (TIME1) ERR = .FALSE. EPS = .0523599 -C + C START BY SETTING UP THE LIMITS OF THE SEARCH -C + IF (NADJ1 .EQ. NADJ2) THEN N2 = LNODES (3, NADJ1) KOUNT = 0 @@ -89,22 +63,22 @@ SUBROUTINE ADJROW (MXND, MLN, NUID, XN, YN, ZN, LXK, KXL, NXL, GOTO 100 ENDIF ENDIF -C + 110 CONTINUE N1 = LNODES (3, NADJ1) ADJTED = .FALSE. -C + 120 CONTINUE IF (N1 .EQ. NADJ2) GOTO 150 -C + C CHECK A STRING OF CONCAVE (< PI) INTERIOR ANGLES FOR NEEDING A C TUCK INSERTED SOMEWHERE -C + IF ((ANGLE (N1) .LT. PI - EPS) .AND. (LNODES (8, N1) .GT. 1) .AND. & (LXN (4, N1) .EQ. 0) .AND. (LXN (3, N1) .GT. 0)) THEN -C + C ADDED UP THE TURNING ANGLE AND THE AVERAGE SIZE REDUCTION -C + TANG = 0. KANG = 0 RATIO = 0. @@ -132,18 +106,15 @@ SUBROUTINE ADJROW (MXND, MLN, NUID, XN, YN, ZN, LXK, KXL, NXL, & (LXN (4, N11) .EQ. 0) .AND. (LXN (3, N11) .GT. 0) .AND. & (LNODES (8, N11) .GT. 1)) GOTO 130 KANG = KANG -C + C NOW SEE IF THIS PORTION OF THE ROW NEEDS ADJUSTED WITH A TUCK(S) -C + IF (KANG .GE. 1) THEN RATIO = RATIO / DBLE(KANG) -C -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/19/90 -CC* MODIFICATION: ADDED THE TMIN2 CRITERIA FOR INSERTION OF A TUCK. + C** THIS CRITERIA SHOULD HELP ALLEVIATE THE LONG SKINNY C** ELEMENT FORMATIONS WHEN TRANSITIONING. -C + IF ( ((RATIO .LT. TMIN1) .AND. (TANG .GT. 1.2217)) .OR. & ((RATIO .LT. TMIN2) .AND. (TANG .GT. .9)) ) THEN IF ((GRAPH) .OR. (VIDEO)) THEN @@ -157,31 +128,31 @@ SUBROUTINE ADJROW (MXND, MLN, NUID, XN, YN, ZN, LXK, KXL, NXL, & NNN, TANG, KANG, N1, N11, NODE, XMIN, XMAX, YMIN, & YMAX, ZMIN, ZMAX, GRAPH, VIDEO, DEV1, NOROOM, ERR) IF ((NOROOM) .OR. (ERR)) GOTO 160 -C + C MAKE SURE THAT THE TUCK DOES NOT ELIMINATE THE END NODES FOR THE LOOP -C + IF (N11 .NE. N11OLD) THEN IF (NADJ2 .EQ. N11OLD) NADJ2 = N11 IF (NODE .EQ. N11OLD) NODE = N11 ENDIF -C + NNNOLD = NNN LLLOLD = LLL ADJTED = .TRUE. -C + ENDIF ENDIF N1 = N11 GOTO 120 -C + C CHECK A STRING OF CONVEX (> PI) INTERIOR ANGLES FOR NEEDING A C WEDGE INSERTED SOMEWHERE -C + ELSEIF ((ANGLE (N1) .GE. PI + EPS) .AND. (LXN (3, N1) .GT. 0) & .AND. (LXN (4, N1) .EQ. 0)) THEN -C + C ADD UP THE TURNING ANGLE AND THE AVERAGE SIZE REDUCTION -C + TANG = 0. KANG = 0 RATIO = 0. @@ -209,9 +180,9 @@ SUBROUTINE ADJROW (MXND, MLN, NUID, XN, YN, ZN, LXK, KXL, NXL, IDEPTH = MAX (IDEPTH, LNODES (8, N11)) IF ((N11 .NE. NADJ2) .AND. (ANGLE (N11) .GE. PI + EPS) .AND. & (LXN (4, N11) .EQ. 0) .AND. (LXN (3, N11) .GT. 0)) GOTO 140 -C + C NOW SEE IF THIS PORTION OF THE ROW NEEDS ADJUSTED WITH A WEDGE(S) -C + IF (KANG .GE. 1) THEN RATIO = RATIO / DBLE(KANG) IF ( ( ((RATIO .GT. WMIN1) .AND. (IDEPTH .GT. 1)) .OR. @@ -231,7 +202,7 @@ SUBROUTINE ADJROW (MXND, MLN, NUID, XN, YN, ZN, LXK, KXL, NXL, NNNOLD = NNN LLLOLD = LLL ADJTED = .TRUE. -C + ENDIF ENDIF N1 = N11 @@ -240,9 +211,9 @@ SUBROUTINE ADJROW (MXND, MLN, NUID, XN, YN, ZN, LXK, KXL, NXL, N1 = LNODES (3, N1) GOTO 120 ENDIF -C + C NOW SMOOTH, CALCULATE THE NEW ANGLES, AND PLOT IF NEEDED -C + 150 CONTINUE IF (ADJTED) THEN CALL GETIME (TIME2) @@ -261,11 +232,11 @@ SUBROUTINE ADJROW (MXND, MLN, NUID, XN, YN, ZN, LXK, KXL, NXL, IF (VIDEO) CALL SNAPIT (1) ENDIF ENDIF -C + 160 CONTINUE -C + CALL GETIME (TIME2) TIMEAJ = TIMEAJ + TIME2 - TIME1 RETURN -C + END diff --git a/packages/seacas/applications/fastq/adjtri.f b/packages/seacas/applications/fastq/adjtri.f index 2bef984d1a7d..4b9c85903d0a 100644 --- a/packages/seacas/applications/fastq/adjtri.f +++ b/packages/seacas/applications/fastq/adjtri.f @@ -1,44 +1,24 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: adjtri.f,v 1.2 1998/07/14 18:18:18 gdsjaar Exp $ -C $Log: adjtri.f,v $ -C Revision 1.2 1998/07/14 18:18:18 gdsjaar -C Removed unused variables, cleaned up a little. -C -C Changed BLUE labels to GREEN to help visibility on black background -C (indirectly requested by a couple users) -C -C Revision 1.1.1.1 1990/11/30 11:03:27 gdsjaar -C FASTQ Version 2.0X -C -c Revision 1.1 90/11/30 11:03:26 gdsjaar -c Initial revision -c -C -CC* FILE: [.PAVING]ADJTRI.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE ADJTRI (MXND, MLN, LNODES, XN, YN, ZN, NUID, LXK, KXL, & NXL, LXN, NNN, NAVAIL, IAVAIL, NODE, KELEM, ANG, TOLER1, & TOLER2, N1, N2, N3, KREG, XMIN, XMAX, YMIN, YMAX, ZMIN, ZMAX, & KKK, LLL, DEV1, DONE, CHECK, GRAPH, VIDEO, NOROOM, ERR, KKKADD) C*********************************************************************** -C + C SUBROUTINE ADJTRI = ADJUSTS A TRIANGULAR SHAPED ELEMENT WHERE C POSSIBLE -C + C*********************************************************************** -C + C SUBROUTINE CALLED BY TRIDEL -C + C*********************************************************************** -C + C THERE ARE THREE POSSIBILITIES FOR CHANGE: C 1) ANYTHING OVER TOLER1 GETS THE CORRESPONDING ELEMENT C DELETED @@ -46,19 +26,19 @@ SUBROUTINE ADJTRI (MXND, MLN, LNODES, XN, YN, ZN, NUID, LXK, KXL, C THE CORRESPONDING ELEMENT DELETED C 3) AN ELONGATED ELEMENT OVER 150 DEGREES GETS A 3 ELEMENT C REPLACEMENT FOR THE TWO ELEMENTS THERE -C + C*********************************************************************** -C + DIMENSION LXK(4, MXND), NXL(2, 3*MXND), KXL(2, 3*MXND) DIMENSION LXN(4, MXND), XN(MXND), YN(MXND), ZN(MXND), NUID(MXND) DIMENSION LNODES (MLN, MXND) -C + CHARACTER*3 DEV1 -C + LOGICAL NOROOM, ERR, DONE, GRAPH, CHECK, VIDEO -C + C CHECK FOR CASE 1 -C + IF (ANG .GT. TOLER1) THEN IF (GRAPH) THEN CALL RPLOTL (MXND, XN, YN, ZN, NXL, XMIN, XMAX, YMIN, @@ -88,9 +68,9 @@ SUBROUTINE ADJTRI (MXND, MLN, LNODES, XN, YN, ZN, NUID, LXK, KXL, CHECK = .TRUE. IF ((ERR) .OR. (DONE)) GOTO 120 ENDIF -C + C CHECK FOR CASE 2 -C + IF ( (ANG .GT. TOLER2) .AND. (LXN (4, N3) .EQ. 0) .AND. & (LXN (3, N3) .GT. 0) .AND. (LXN (2, N3) .GT. 0)) THEN IF (GRAPH) THEN @@ -121,15 +101,15 @@ SUBROUTINE ADJTRI (MXND, MLN, LNODES, XN, YN, ZN, NUID, LXK, KXL, CHECK = .TRUE. IF ((ERR) .OR. (DONE)) GOTO 120 ENDIF -C + C CHECK FOR CASE 3 -C + CALL LONGEL (MXND, MLN, LNODES, XN, YN, NUID, LXK, KXL, NXL, & LXN, NNN, NAVAIL, IAVAIL, NODE, KELEM, ANG, TOLER2, & N1, N2, KREG, XMIN, XMAX, YMIN, YMAX, KKK, LLL, DONE, GRAPH, & VIDEO, NOROOM, ERR, KKKADD) -C + 120 CONTINUE RETURN -C + END diff --git a/packages/seacas/applications/fastq/amxbm.f b/packages/seacas/applications/fastq/amxbm.f index 9f88114a636a..89d66406b2d9 100644 --- a/packages/seacas/applications/fastq/amxbm.f +++ b/packages/seacas/applications/fastq/amxbm.f @@ -1,47 +1,27 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: amxbm.f,v 1.2 1998/07/14 18:18:20 gdsjaar Exp $ -C $Log: amxbm.f,v $ -C Revision 1.2 1998/07/14 18:18:20 gdsjaar -C Removed unused variables, cleaned up a little. -C -C Changed BLUE labels to GREEN to help visibility on black background -C (indirectly requested by a couple users) -C -C Revision 1.1.1.1 1990/11/30 11:03:33 gdsjaar -C FASTQ Version 2.0X -C -c Revision 1.1 90/11/30 11:03:31 gdsjaar -c Initial revision -c -C -CC* FILE: [.MAIN]AMXBM.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE AMXBM (NPNODE, NPELEM, NXK, AMESUR, BMESUR, KNODE) C*********************************************************************** -C + C SUBROUTINE AMXBM = ROUTINE TO TRANSFER ELEMENT VARIABLES TO NODES -C + C*********************************************************************** -C + DIMENSION NXK (9, NPELEM) DIMENSION AMESUR (NPELEM), BMESUR (NPNODE) DIMENSION KNODE (NPNODE) -C + DO 100 I = 1, NPNODE BMESUR(I) = 0. KNODE (I) = 0 100 CONTINUE -C + C GATHER ALL THE VARIABLES TO THE NODES AND COUNT HOW MANY AT EACH NODE -C + DO 120 I = 1, NPELEM DO 110 J = 1, 4 NODE = NXK (J, I) @@ -49,13 +29,13 @@ SUBROUTINE AMXBM (NPNODE, NPELEM, NXK, AMESUR, BMESUR, KNODE) KNODE (NODE) = KNODE (NODE) + 1 110 CONTINUE 120 CONTINUE -C + C GET THE AVERAGE VALUE AT EACH NODE -C + DO 130 NODE = 1, NPNODE BMESUR (NODE) = BMESUR(NODE) / DBLE(KNODE (NODE)) 130 CONTINUE -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/apalib.f b/packages/seacas/applications/fastq/apalib.f index 32dafcb28602..6d1eecf3d8a8 100644 --- a/packages/seacas/applications/fastq/apalib.f +++ b/packages/seacas/applications/fastq/apalib.f @@ -1,43 +1,32 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: apalib.f,v 1.1 1990/11/30 11:03:34 gdsjaar Exp $ -C $Log: apalib.f,v $ -C Revision 1.1 1990/11/30 11:03:34 gdsjaar -C Initial revision -C -C -CC* FILE: [.QMESH]APALIB.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE APALIB (MXND, XN, YN, LXK, NXL, K, NODES, AREA, XCEN, & YCEN, KNUM, KLIB, NLIB, ALIB, XCLIB, YCLIB) C*********************************************************************** -C + C SUBROUTINE APALIB = LIBRARY OF ELEMENT DATA USED TO AVOID DUPLICATE C COMPUTATIONS -C + C*********************************************************************** -C + DIMENSION NODES (4), KLIB (8), NLIB (4, 8) DIMENSION ALIB (8), XCLIB (8), YCLIB (8) DIMENSION XN (MXND), YN (MXND), LXK (4, MXND), NXL (2, 3 * MXND) -C + LOGICAL CCW -C + C SEARCH LIBRARY -C + IF (KNUM .GT. 0) THEN DO 110 I = 1, KNUM IF (K - KLIB (I) .EQ. 0) THEN -C + C FETCH FROM LIBRARY -C + IK = I DO 100 J = 1, 4 NODES (J) = NLIB (J, IK) @@ -49,9 +38,9 @@ SUBROUTINE APALIB (MXND, XN, YN, LXK, NXL, K, NODES, AREA, XCEN, ENDIF 110 CONTINUE ENDIF -C + C COMPUTE NEW DATA -C + CCW = .TRUE. CALL GNXKA (MXND, XN, YN, K, NODES, AREA, LXK, NXL, CCW) N1 = NODES (1) @@ -61,9 +50,9 @@ SUBROUTINE APALIB (MXND, XN, YN, LXK, NXL, K, NODES, AREA, XCEN, XCEN = (XN (N1) + XN (N2) + XN (N3) + XN (N4)) * 0.25 YCEN = (YN (N1) + YN (N2) + YN (N3) + YN (N4)) * 0.25 IF (KNUM .GE. 8) RETURN -C + C FILE NEW DATA IN LIBRARY -C + KNUM = KNUM + 1 DO 120 I = 1, 4 NLIB (I, KNUM) = NODES (I) @@ -73,5 +62,5 @@ SUBROUTINE APALIB (MXND, XN, YN, LXK, NXL, K, NODES, AREA, XCEN, XCLIB (KNUM) = XCEN YCLIB (KNUM) = YCEN RETURN -C + END diff --git a/packages/seacas/applications/fastq/apalsm.f b/packages/seacas/applications/fastq/apalsm.f index ac3f0448d07e..1eab39d2972e 100644 --- a/packages/seacas/applications/fastq/apalsm.f +++ b/packages/seacas/applications/fastq/apalsm.f @@ -1,28 +1,17 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: apalsm.f,v 1.1 1990/11/30 11:03:37 gdsjaar Exp $ -C $Log: apalsm.f,v $ -C Revision 1.1 1990/11/30 11:03:37 gdsjaar -C Initial revision -C -C -CC* FILE: [.QMESH]APALSM.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE APALSM (MXND, XN, YN, LXK, KXL, NXL, LXN, NNN, NNNOLD, & NIT, TOL, RO, ALPHA, ERR) C*********************************************************************** -C + C SUBROUTINE APALSM = AREA PULL AND LAPLACIAN MESH SMOOTHER -C + C*********************************************************************** -C + C NOTE: C IN THIS SMOOTHER EACH NODE IS SUCCESSIVELY MOVED BY C AN AMOUNT GIVEN AS A WEIGHTED AVERAGE OF AN *AREA PULL* @@ -32,9 +21,9 @@ SUBROUTINE APALSM (MXND, XN, YN, LXK, KXL, NXL, LXN, NNN, NNNOLD, C PROPORTIONAL TO THE LENGTH OF THAT SIDE TIMES A FACTOR C INVOLVING THE AREAS OF THIS ELEMENT AND ITS NEIGHBOR SHARING C THAT SIDE. -C + C*********************************************************************** -C + C VARIABLES USED: C NIT = MAX ITERATIONS TO DO C TOL = PERCENT OF SMALLEST CONNECTING LINE TO USE AS NODE MOVEMENT @@ -42,66 +31,66 @@ SUBROUTINE APALSM (MXND, XN, YN, LXK, KXL, NXL, LXN, NNN, NNNOLD, C RO = UNDER OR OVER-RELAXATION FACTOR. C ALPHA = WEIGHT GIVEN TO AREA PULL VECTOR. USUALLY = 0.5. C WEIGHT GIVEN TO LAPLACIAN VECTOR = 1.-ALPHA. -C + C*********************************************************************** -C + DIMENSION LXK(4, MXND), KXL(2, 3*MXND), NXL(2, 3*MXND) DIMENSION LXN(4, MXND), XN(MXND), YN(MXND) DIMENSION LINES(20), NS1(4), NS2(4) DIMENSION KLIB(8), NLIB(4, 8), ALIB(8), XCLIB(8), YCLIB(8) -C + LOGICAL BIG, ERR -C + ERR = .FALSE. TOL2 = TOL**2 BETA = 1. - ALPHA -C + C ITERATION LOOP -C + DO 160 IT = 1, NIT BIG = .FALSE. -C + C NODE LOOP -C + NNT = 0 DO 150 NODE = NNNOLD + 1, NNN -C + C CHECK FOR CONTINUATIONS, BOUNDARY, OR RELAXED NODE -C + IF ((LXN(3, NODE) .GE. 0) .AND. (LXN(2, NODE) .GT. 0) & .AND. (LXN(1, NODE) .GT. 0)) THEN NNT = NNT + 1 -C + C INITIALIZE -C + KNUM = 0 XA = 0. YA = 0. XL = 0. YL = 0. -C + C PROCESS EACH LINE CONNECTED TO THIS NODE -C + CALL GETLXN (MXND, LXN, NODE, LINES, KOUNT, ERR) IF (ERR) RETURN DO 100 IL = 1, KOUNT L = LINES(IL) N1 = NXL(1, L) N2 = NXL(2, L) -C + C FETCH ELEMENT DATA -C + IF (KXL(1, L) .GT. 0) CALL APALIB (MXND, XN, YN, LXK, & NXL, KXL(1, L), NS1, AREA1, XCEN1, YCEN1, KNUM, & KLIB, NLIB, ALIB, XCLIB, YCLIB) IF (KXL(2, L) .GT. 0) CALL APALIB (MXND, XN, YN, LXK, & NXL, KXL(2, L), NS2, AREA2, XCEN2, YCEN2, KNUM, & KLIB, NLIB, ALIB, XCLIB, YCLIB) -C + C GET FORCE DIRECTION MODULO PI RADIANS. C CORRECT FOR WRONG DIRECTION BY ALIGNING WITH THE VECTOR C FROM (XCEN1, YCEN1) TO (XCEN2, YCEN2). -C + XF = -(YN(N2) - YN(N1)) YF = XN(N2) - XN(N1) DOT = XF*(XCEN2 - XCEN1) + YF*(YCEN2 - YCEN1) @@ -109,62 +98,62 @@ SUBROUTINE APALSM (MXND, XN, YN, LXK, KXL, NXL, LXN, NNN, NNNOLD, XF = -XF YF = -YF END IF -C + C TAKE CARE OF ZERO AREAS -C + IF ((AREA1 .LE. 0) .OR. (AREA2 .LE. 0)) THEN AREA1 = 1.0 AREA2 = 1.0 END IF -C + C UPDATE AREA PULL VECTOR SUM -C + WEIGHT = (AREA2 - AREA1)/(AREA2 + AREA1) XA = XA + WEIGHT*XF YA = YA + WEIGHT*YF -C + C UPDATE LAPLACIAN VECTOR SUM -C + NOE = N1 + N2 - NODE DX = XN(NOE) - XN(NODE) DY = YN(NOE) - YN(NODE) XL = XL + DX YL = YL + DY -C + C UPDATE LEAST LENGTH -C + DIST2 = DX*DX + DY*DY IF (IL .EQ. 1) DMIN2 = DIST2 DMIN2 = MIN(DMIN2, DIST2) 100 CONTINUE -C + C COMPUTE NET MOVEMENT VECTOR -C + RK = 1.0/DBLE(KOUNT) XNET = (ALPHA*XA + BETA*XL)*RK YNET = (ALPHA*YA + BETA*YL)*RK -C + C MOVE THE NODE -C + YN(NODE) = YN(NODE) + YNET * RO XN(NODE) = XN(NODE) + XNET * RO -C + C CHECK FOR SIGNIFICANT MOVEMENT -C + IF (XNET*XNET + YNET*YNET .GT. TOL2*DMIN2) THEN -C + C SIGNIFICANT MOVEMENT - REMOVE RELAXATION FLAGS -C + C FIRST FROM DIRECTLY CONNECTED NODES -C + DO 110 IL = 1, KOUNT L = LINES(IL) NOE = NXL(1, L) + NXL(2, L) - NODE LXN(3, NOE) = ABS(LXN(3, NOE)) 110 CONTINUE -C + C NEXT FROM DIAGONALLY OPPOSITE NODES (MAX 8) -C + DO 140 IK = 1, KNUM DO 120 I = 1, 4 IF (NLIB(I, IK) .EQ. NODE) THEN @@ -180,26 +169,26 @@ SUBROUTINE APALSM (MXND, XN, YN, LXK, KXL, NXL, LXN, NNN, NNNOLD, RETURN 130 CONTINUE 140 CONTINUE -C + C INSIGNIFICANT MOVEMENT C INSERT RELAXATION FLAG -C + ELSE LXN(3, NODE) = -ABS(LXN(3, NODE)) END IF -C + END IF 150 CONTINUE IF (.NOT.BIG) GO TO 170 160 CONTINUE IT = NIT -C + C REMOVE ALL FLAGS -C + 170 CONTINUE DO 180 NODE = NNNOLD + 1, NNN LXN(3, NODE) = ABS(LXN(3, NODE)) 180 CONTINUE -C + RETURN END diff --git a/packages/seacas/applications/fastq/arcpar.f b/packages/seacas/applications/fastq/arcpar.f index 6fb147e3aca2..90bd748c0559 100644 --- a/packages/seacas/applications/fastq/arcpar.f +++ b/packages/seacas/applications/fastq/arcpar.f @@ -1,35 +1,18 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: arcpar.f,v 1.2 1991/03/21 15:44:18 gdsjaar Exp $ -C $Log: arcpar.f,v $ -C Revision 1.2 1991/03/21 15:44:18 gdsjaar -C Changed all 3.14159... to atan2(0.0, -1.0) -C -c Revision 1.1.1.1 1990/11/30 11:03:41 gdsjaar -c FASTQ Version 2.0X -c -c Revision 1.1 90/11/30 11:03:40 gdsjaar -c Initial revision -c -C -CC* FILE: [.MAIN]ARCPAR.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE ARCPAR (MP, KT, KNUM, COOR, LINKP, IPNTR1, IPNTR2, & IPNTR3, IP3, XCEN, YCEN, THETA1, THETA2, TANG, R1, R2, ERR, & ICCW, ICW, XK, XA) C*********************************************************************** -C + C SUBROUTINE ARCPAR = THIS ROUTINE CALCULATES THE ARC PARAMETERS -C + C*********************************************************************** -C + C VARIABLES USED: C TANG = TOTAL ANGLE SCRIBED BY THE ARC C THETA1 = FIRST CCW ANGLE OF THE ARC @@ -38,26 +21,26 @@ SUBROUTINE ARCPAR (MP, KT, KNUM, COOR, LINKP, IPNTR1, IPNTR2, C IPNTR2 = POINTER TO SECOND COORDINATE VALUE C IPNTR3 = POINTER TO THIRD COORDINATE VALUE C IP3 = THE THIRD POINT NUMBER (CAN BE NEGATED) -C + C*********************************************************************** -C + DIMENSION COOR (2, MP), LINKP (2, MP) -C + LOGICAL ERR -C + PI = ATAN2(0.0, -1.0) TWOPI = PI + PI ERR = .FALSE. -C + C ARC WITH CENTER GIVEN C ARC GOES FROM 1ST POINT TO 2ND IN *COUNTER-CLOCKWISE* DIRECTION. -C + IF (KT .EQ. 3) THEN XCEN = COOR (1, IPNTR3) YCEN = COOR (2, IPNTR3) -C + C CIRCLE WITH THIRD POINT ON ARC -C + ELSEIF (KT .EQ. 4) THEN THETA1 = ATAN2 (COOR (2, IPNTR3) - COOR (2, IPNTR1), & COOR (1, IPNTR3) - COOR (1, IPNTR1)) + PI / 2.0 @@ -73,9 +56,9 @@ SUBROUTINE ARCPAR (MP, KT, KNUM, COOR, LINKP, IPNTR1, IPNTR2, & COS (THETA2) * (Y21 - Y11)) / DET XCEN = X11 + R * COS (THETA1) YCEN = Y11 + R * SIN (THETA1) -C + C CIRCLE WITH RADIUS GIVEN -C + ELSEIF (KT .EQ. 6) THEN DX = 0.5 * (COOR (1, IPNTR2) - COOR (1, IPNTR1)) DY = 0.5 * (COOR (2, IPNTR2) - COOR (2, IPNTR1)) @@ -95,9 +78,9 @@ SUBROUTINE ARCPAR (MP, KT, KNUM, COOR, LINKP, IPNTR1, IPNTR2, ENDIF ENDIF ENDIF -C + C CHECK TO MAKE SURE THAT THE BEGINNING AND ENDING RADIUS EXIST -C + IF ((( COOR (1, IPNTR1) .EQ. XCEN) .AND. & (COOR (2, IPNTR1) .EQ. YCEN)) .OR. & ((COOR (1, IPNTR2) .EQ. XCEN) .AND. @@ -113,9 +96,9 @@ SUBROUTINE ARCPAR (MP, KT, KNUM, COOR, LINKP, IPNTR1, IPNTR2, & YCEN) **2) THETA1 = ATAN2 (COOR (2, IPNTR1) - YCEN, COOR (1, IPNTR1) - XCEN) THETA2 = ATAN2 (COOR (2, IPNTR2) - YCEN, COOR (1, IPNTR2) - XCEN) -C + C ARC WITH THE CENTER GIVEN -C + IF (KT .EQ. 3) THEN IF (IPNTR1 .EQ. IPNTR2) THEN THETA2 = THETA1 + TWOPI @@ -132,9 +115,9 @@ SUBROUTINE ARCPAR (MP, KT, KNUM, COOR, LINKP, IPNTR1, IPNTR2, ICCW = IPNTR1 ICW = IPNTR2 ENDIF -C + C CIRCULAR ARC WITH 3RD POINT ON ARC - CLOCKWISE OR COUNTER-CLOCKWISE -C + ELSEIF (KT .EQ. 4) THEN THETA3 = ATAN2 (COOR (2, IPNTR3) - YCEN, COOR (1, IPNTR3) - & XCEN) @@ -149,9 +132,9 @@ SUBROUTINE ARCPAR (MP, KT, KNUM, COOR, LINKP, IPNTR1, IPNTR2, ICCW = IPNTR1 ICW = IPNTR2 ENDIF -C + C CIRRCULAR ARC WITH RADIUS GIVEN - CLOCKWISE OR COUNTER-CLOCKWISE -C + ELSEIF (KT .EQ. 6) THEN IF ( (IP3 .GE. 0) .AND. (THETA2 .LE. THETA1)) & THETA2 = THETA2 + TWOPI @@ -166,9 +149,9 @@ SUBROUTINE ARCPAR (MP, KT, KNUM, COOR, LINKP, IPNTR1, IPNTR2, ICW = IPNTR1 ENDIF ENDIF -C + C DEFINE THE SPIRAL PARAMETERS (R = XA * EXP (XK * THETA)) -C + XK = (LOG (R2 / R1)) / (THETA2 - THETA1) DIVID = EXP (XK * THETA2) IF (DIVID .GT. 0.) THEN @@ -178,13 +161,13 @@ SUBROUTINE ARCPAR (MP, KT, KNUM, COOR, LINKP, IPNTR1, IPNTR2, ERR = .TRUE. GOTO 100 ENDIF -C + 100 CONTINUE -C + RETURN -C + 10000 FORMAT (' CENTER POINT FOR LINE', I5, ' LIES ON ONE OF', & ' THE ENDPOINTS') 10010 FORMAT (' DEFINITION FOR ARC LINE', I5, ' IS INVLAID') -C + END diff --git a/packages/seacas/applications/fastq/arcy.f b/packages/seacas/applications/fastq/arcy.f index 88b987755585..97e7d86b2c42 100644 --- a/packages/seacas/applications/fastq/arcy.f +++ b/packages/seacas/applications/fastq/arcy.f @@ -1,42 +1,22 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: arcy.f,v 1.2 1998/07/14 18:18:21 gdsjaar Exp $ -C $Log: arcy.f,v $ -C Revision 1.2 1998/07/14 18:18:21 gdsjaar -C Removed unused variables, cleaned up a little. -C -C Changed BLUE labels to GREEN to help visibility on black background -C (indirectly requested by a couple users) -C -C Revision 1.1.1.1 1990/11/30 11:03:44 gdsjaar -C FASTQ Version 2.0X -C -c Revision 1.1 90/11/30 11:03:43 gdsjaar -c Initial revision -c -C -CC* FILE: [.MAIN]ARCY.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE ARCY (XCEN, YCEN, THETA1, THETA2, XK, XA, X, YTRY, ERR) C*********************************************************************** -C + C SUBROUTINE ARCY = ITERATIVELY SOLVES THE LOGARITHMIC SPIRAL PROBLEM C TO DETERMINE A Y VALUE GIVEN AN X THAT INTERSECTS C THE ARC -C + C*********************************************************************** -C + LOGICAL ERR -C + C START WITH 10 INCREMENTS, EACH PASS INCREMENTS DECREASE TEN FOLD -C + ANGINC = (THETA2 - THETA1) * .05 ANG = THETA1 F1 = SPIRAL (XA, XK, X, XCEN, YCEN, ANG) @@ -58,14 +38,14 @@ SUBROUTINE ARCY (XCEN, YCEN, THETA1, THETA2, XK, XA, X, YTRY, ERR) ERR = .TRUE. GO TO 120 END IF -C + 110 CONTINUE YTRY = (XA * EXP(XK * THETA)) * SIN(THETA) + YCEN -C + 120 CONTINUE -C + C FIND THE SECOND ROOT IF THE FIRST ONE HAS BEEN LOCATED -C + IF(.NOT.ERR)THEN ANG=THETA+ANGINC F1 = SPIRAL (XA, XK, X, XCEN, YCEN, ANG) @@ -80,10 +60,10 @@ SUBROUTINE ARCY (XCEN, YCEN, THETA1, THETA2, XK, XA, X, YTRY, ERR) GO TO 130 END IF END IF -C + YTRY2 = (XA * EXP(XK * THETA)) * SIN(THETA) + YCEN YTRY = MAX(YTRY,YTRY2) 130 CONTINUE RETURN -C + END diff --git a/packages/seacas/applications/fastq/arelax.f b/packages/seacas/applications/fastq/arelax.f index a9af0026b03a..80ac6feb7639 100644 --- a/packages/seacas/applications/fastq/arelax.f +++ b/packages/seacas/applications/fastq/arelax.f @@ -1,18 +1,17 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: arelax.f,v 1.2 1999/06/17 19:16:50 gdsjaar Exp $ SUBROUTINE ARELAX (MXND, XN, YN, LXK, KXL, NXL, LLL, ARFACT) C*********************************************************************** -C + C SUBROUTINE ARELAX = CALCULATES UNDER - RELAXATION FACTOR FOR AREA PULL C AND LAPLACIAN SMOOTHER -C + C*********************************************************************** -C + C NOTE: C THE AREA PULL AND LAPLACIAN SMOOTHER WILL OVER - CORRECT C AND BECOME UNSTABLE WHEN TYPICAL MESH ELEMENTS ARE MUCH @@ -26,23 +25,23 @@ SUBROUTINE ARELAX (MXND, XN, YN, LXK, KXL, NXL, LLL, ARFACT) C PULL) SHOULD BE USED. C THE FACTOR RETURNED BY THIS ROUTINE MAY BE LARGER THAN ONE, C WHICH MEANS THAT OVER - RELAXATION IS APPROPRIATE. -C + C*********************************************************************** -C + DIMENSION NODES (4), LXK (4, MXND), KXL (2, 3 * MXND) DIMENSION NXL (2, 3 * MXND) DIMENSION XN (MXND), YN (MXND) -C + LOGICAL CCW -C + ARFACT = 1.0 RATSUM = 0. NUM = 0 -C + DO 100 MYL = 1, LLL -C + C SKIP BOUNDARY LINES -C + IF (KXL(1, myL) .gt. 0 .and. KXL (2, myL) .GT. 0) THEN CCW = .TRUE. CALL GNXKA (MXND, XN, YN, KXL (1, MYL), NODES, AREA1, LXK, @@ -61,11 +60,11 @@ SUBROUTINE ARELAX (MXND, XN, YN, LXK, KXL, NXL, LLL, ARFACT) ENDIF ENDIF 100 CONTINUE -C + IF (NUM .LE. 0) RETURN ASPECT = RATSUM / DBLE(NUM) ARFACT = AMIN1 (2.0 / ASPECT, 1.5) -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/b4bad.f b/packages/seacas/applications/fastq/b4bad.f index eede4637b4a7..b56075449f17 100644 --- a/packages/seacas/applications/fastq/b4bad.f +++ b/packages/seacas/applications/fastq/b4bad.f @@ -1,50 +1,30 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: b4bad.f,v 1.2 1998/07/14 18:18:23 gdsjaar Exp $ -C $Log: b4bad.f,v $ -C Revision 1.2 1998/07/14 18:18:23 gdsjaar -C Removed unused variables, cleaned up a little. -C -C Changed BLUE labels to GREEN to help visibility on black background -C (indirectly requested by a couple users) -C -C Revision 1.1.1.1 1990/11/30 11:03:50 gdsjaar -C FASTQ Version 2.0X -C -c Revision 1.1 90/11/30 11:03:49 gdsjaar -c Initial revision -c -C -CC* FILE: [.PAVING]B4BAD.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE B4BAD (MXND, MLN, XN, YN, LXK, KXL, NXL, LXN, LNODES, & ANGLE, I1, I2, J1, J2, NLOOP, KOUNTL, BOK, ERR) C*********************************************************************** -C + C SUBROUTINE BCROSS = CHECKS TO MAKE SURE THAT A BOUNDARY IS NOT C BECOMING A PERMANENT CROSS -C + C*********************************************************************** -C + DIMENSION NXL (2, 3*MXND), LXN (4, MXND) DIMENSION LXK (4, MXND), KXL (2, 3*MXND) DIMENSION LNODES (MLN, MXND), ANGLE (MXND) DIMENSION NODE (4) -C + LOGICAL BOK, ERR -C + BOK = .TRUE. ERR = .FALSE. -C + C GET THE NODES THAT FORM THE REMAINING ELEMENT -C + IF (KOUNTL .EQ. 4) THEN NODE(1) = I2 NODE(2) = LNODES (3, NODE(1)) @@ -58,10 +38,10 @@ SUBROUTINE B4BAD (MXND, MLN, XN, YN, LXK, KXL, NXL, LXN, LNODES, ELSE GOTO 110 ENDIF -C + C NOW CHECK ALL THE NODES TO SEE IF THEY ARE ON THE BOUNDARY C AND CAN BE CLASSIFIED AS CORNERS -C + DO 100 I = 1, 4 IF ( (LXN (2, NODE (I)) .LT. 0) .AND. & (LNODES (6, NODE (I)) .GE. 3) ) THEN @@ -69,9 +49,9 @@ SUBROUTINE B4BAD (MXND, MLN, XN, YN, LXK, KXL, NXL, LXN, LNODES, GOTO 110 ENDIF 100 CONTINUE -C + 110 CONTINUE -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/bcross.f b/packages/seacas/applications/fastq/bcross.f index cc264bdadd86..7225afa1414b 100644 --- a/packages/seacas/applications/fastq/bcross.f +++ b/packages/seacas/applications/fastq/bcross.f @@ -1,73 +1,42 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: bcross.f,v 1.3 2004/01/26 17:28:18 gdsjaar Exp $ -C $Log: bcross.f,v $ -C Revision 1.3 2004/01/26 17:28:18 gdsjaar -C Removed several unused variables from getang subroutine. -C -C Initialized a variable -C -C Revision 1.2 2004/01/22 14:25:22 gdsjaar -C Attempt to fix strange problem on x86_64 AMD Opteron system using -C Portland Group 5.1-3 compilers. The getang function would work -C correctly if compiled with no optimization and in debug mode, but -C would crash if compiled optimized. The location of the crash was not -C in a place that made any sense that something was wrong. -C -C After much trial and error, it was found that adding a 'SAVE' -C statement at the beginning of the file fixed the problem. -C -C Also cleaned out some unused parameters being passed to the function. -C -C Revision 1.1.1.1 1990/11/30 11:03:55 gdsjaar -C FASTQ Version 2.0X -C -c Revision 1.1 90/11/30 11:03:52 gdsjaar -c Initial revision -c -C -CC* FILE: [.PAVING]BCROSS.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE BCROSS (MXND, MLN, XN, YN, ZN, LXK, KXL, NXL, LXN, & LNODES, I1, I2, J1, J2, NLOOP, BOK, LLL, XMIN, XMAX, YMIN, & YMAX, ZMIN, ZMAX, DEV1, KREG, ERR) C*********************************************************************** -C + C SUBROUTINE BCROSS = CHECKS TO MAKE SURE THAT A BOUNDARY IS NOT C BECOMING A PERMANENT CROSS -C + C*********************************************************************** -C + DIMENSION XN(MXND), YN(MXND), ZN(MXND) DIMENSION NXL(2, 3*MXND), LXN(4, MXND) DIMENSION LXK(4, MXND), KXL(2, 3*MXND) DIMENSION LNODES(MLN, MXND) -C + LOGICAL BOK, LCROSS, ERR -C + CHARACTER*3 DEV1 -C + BOK = .TRUE. ERR = .FALSE. -C + J0 = LNODES(2, J1) J3 = LNODES(3, J2) -C + C IF J0 TO I2, OR J3 TO I1 IS TO BECOME A BOUNDARY LINE, C THEN TEST THE CONNECTION TO SEE IF IT INTERSECTS ANY OTHER C BOUNDARY LINES -C + KOUNT = 0 -C + C FIRST TEST THE J0 TO I2 LINE -C + IF ((LXN(2, J0) .LT. 0) .AND. (LXN(2, I2) .LT. 0)) THEN NODE1 = I1 NODE2 = I2 @@ -84,7 +53,7 @@ SUBROUTINE BCROSS (MXND, MLN, XN, YN, ZN, LXK, KXL, NXL, LXN, ELSE GOTO 110 ENDIF -C + ELSE CALL INTSCT (XN(NODE1), YN(NODE1), XN(NODE2), YN(NODE2), & XN(J0), YN(J0), XN(I2), YN(I2), U, W, LCROSS) @@ -102,11 +71,11 @@ SUBROUTINE BCROSS (MXND, MLN, XN, YN, ZN, LXK, KXL, NXL, LXN, GOTO 130 ENDIF ENDIF -C + 110 CONTINUE -C + C NEXT TEST THE J3 TO I1 LINE -C + KOUNT = 0 IF ((LXN(2, J3) .LT. 0) .AND. (LXN(2, I1) .LT. 0)) THEN NODE1 = J3 @@ -124,7 +93,7 @@ SUBROUTINE BCROSS (MXND, MLN, XN, YN, ZN, LXK, KXL, NXL, LXN, ELSE GOTO 130 ENDIF -C + ELSE CALL INTSCT (XN(NODE1), YN(NODE1), XN(NODE2), YN(NODE2), & XN(J3), YN(J3), XN(I1), YN(I1), U, W, LCROSS) @@ -142,9 +111,9 @@ SUBROUTINE BCROSS (MXND, MLN, XN, YN, ZN, LXK, KXL, NXL, LXN, GOTO 130 ENDIF ENDIF -C + 130 CONTINUE -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/bfnode.f b/packages/seacas/applications/fastq/bfnode.f index f76e841989e3..46802ab0e221 100644 --- a/packages/seacas/applications/fastq/bfnode.f +++ b/packages/seacas/applications/fastq/bfnode.f @@ -1,47 +1,36 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: bfnode.f,v 1.1 1990/11/30 11:03:57 gdsjaar Exp $ -C $Log: bfnode.f,v $ -C Revision 1.1 1990/11/30 11:03:57 gdsjaar -C Initial revision -C -C -CC* FILE: [.RENUM]BFNODE.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE BFNODE (NLIST, NNXK, NPNODE, NPELEM, MAXKXN, NNUID, & NODE, NEWNOD, LIST, KXN, NXK, NUID, JLOC, LINE1, ERR) C*********************************************************************** -C + C SUBROUTINE BFNODE = FINDS ANY NODES IN A PORTION OF THE NODAL FLAG C LIST WHICH IS ATTACHED TO THE GIVEN NODE. -C + C*********************************************************************** -C + C SUBROUTINE CALLED BY: C ADDWT = ADDS THE WEIGHTING FACTORS TO ANY NODES WITH C FLAGS CONTAINING WEIGHTS -C + C*********************************************************************** -C + DIMENSION JLIST (20), NUID (NNUID) DIMENSION LIST (NLIST), NXK (NNXK, NPELEM), KXN (NNXK, MAXKXN) -C + LOGICAL ERR, FOUND, ALL, CLOSED, NOTIFY -C + ERR = .TRUE. FOUND = .FALSE. CLOSED = .FALSE. NOTIFY = .TRUE. NEWNOD = 0 JLOC = 0 -C + ALL = .FALSE. CALL GETNXN (NPNODE, NPELEM, MAXKXN, NNXK, KXN, NXK, NUID, NODE, & JLIST, IFOUND, ALL, ERR) @@ -49,10 +38,10 @@ SUBROUTINE BFNODE (NLIST, NNXK, NPNODE, NPELEM, MAXKXN, NNUID, WRITE ( * , 10000)NODE RETURN ENDIF -C + C SEE IF ANY OF THE FOUND NODES ARE IN THE FLAGGED NODE LIST C ONLY 1 SHOULD BE (REPEATS OF THE SAME NODE ARE OK FOR SIDEBC) -C + NEWNOD = 0 NODOLD = 0 DO 110 I = 1, IFOUND @@ -63,10 +52,10 @@ SUBROUTINE BFNODE (NLIST, NNXK, NPNODE, NPELEM, MAXKXN, NNUID, WRITE ( * , 10010)NODE RETURN ELSEIF (.NOT.CLOSED) THEN -C + C ASSUME IN A CLOSED LOOP THAT THE FIRST LINE IN THE SIDEBC DEFINITION C (LINE1) INDICATES THE APPROPRIATE DIRECTION -C + LINET1 = (NUID (LIST (J)) - 1000000000) / 100000 LINET2 = (NUID (NEWNOD) - 1000000000) / 100000 IF ( (LINET1 .EQ. LINET2) .AND. @@ -101,9 +90,9 @@ SUBROUTINE BFNODE (NLIST, NNXK, NPNODE, NPELEM, MAXKXN, NNUID, 100 CONTINUE 110 CONTINUE ERR = .FALSE. -C + RETURN -C + 10000 FORMAT (' ERROR GETTING NODES ATTACHED TO NODE:', I5) 10010 FORMAT (' ERROR - THREE NODES HAVE BEEN FOUND FOR SEQUENCE FROM', & ' NODE:', I5) @@ -116,5 +105,5 @@ SUBROUTINE BFNODE (NLIST, NNXK, NPNODE, NPELEM, MAXKXN, NNUID, & ' WEIGHTING, ', /, & 'POSSIBLE SECOND NODES DO NOT LIE ON THE FIRST LINE:', I5, /, & 'ATTACHED TO THE SIDEBC - DIRECTION IS THUS UNDETERMINABLE.') -C + END diff --git a/packages/seacas/applications/fastq/bmschm.f b/packages/seacas/applications/fastq/bmschm.f index 20ee401c3a01..df245364983b 100644 --- a/packages/seacas/applications/fastq/bmschm.f +++ b/packages/seacas/applications/fastq/bmschm.f @@ -1,31 +1,20 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: bmschm.f,v 1.1 1990/11/30 11:04:04 gdsjaar Exp $ -C $Log: bmschm.f,v $ -C Revision 1.1 1990/11/30 11:04:04 gdsjaar -C Initial revision -C -C -CC* FILE: [.QMESH]BMSCHM.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE BMSCHM (NPER, KKK, LLL, NNN, ML, MS, NSPR, ISLIST, & NINT, IFLINE, NLPS, ILLIST, LINKL, LINKS, MXNPER, MAXPRM, MAX3, & MXND, X, Y, NID, NNPS, ANGLE, XN, YN, NUID, LXK, KXL, NXL, LXN, & XSUB, YSUB, NIDSUB, INDX, IAVAIL, NAVAIL, CCW, HALFC, ERR) C*********************************************************************** -C + C BMSCHM - "B" MESH SCHEME; CALCULATE A "TRANSITION" MAPPED MESH C (2 TRIANGULAR SUBREGIONS WITH 3 RECTANGULAR SUBREGIONS/TRIANGLE) -C + C*********************************************************************** -C + DIMENSION ISLIST(NSPR), NINT(ML), IFLINE(MS), NLPS(MS) DIMENSION ILLIST(MS*3), LINKL(2, ML), LINKS(2, MS) DIMENSION X(MXNPER), Y(MXNPER), NID(MXNPER*MAXPRM), NNPS(MAX3) @@ -33,19 +22,19 @@ SUBROUTINE BMSCHM (NPER, KKK, LLL, NNN, ML, MS, NSPR, ISLIST, DIMENSION LXK(4, MXND), KXL(2, 3*MXND), NXL(2, 3*MXND) DIMENSION LXN(4, MXND) DIMENSION XSUB(MXNPER), YSUB(MXNPER), NIDSUB(MXNPER), INDX(MXND) -C + LOGICAL CCW, ERR, FINAL, HALFC -C + C SET UP THE TRIANGLE DIVISIONS, AND FIND THE CENTER POINT -C + CALL GETTRN (ML, MS, MAX3, NSPR, ISLIST, NINT, IFLINE, NLPS, & ILLIST, LINKL, LINKS, X, Y, NID, NNPS, ANGLE, NPER, I1, I2, & I3, I4, I5, I6, I7, I8, XCEN1, YCEN1, XCEN2, YCEN2, XMID1, & YMID1, XMID2, YMID2, CCW, HALFC, ERR) FINAL = .FALSE. -C + C SET UP THE FIRST SUBREGION, AND SEND IT OFF TO BE GENERATED -C + IF (.NOT.ERR) THEN CALL SUBTRN (NPER, NEWPER, 1, X, Y, NID, XSUB, YSUB, NIDSUB, & I1, I2, I3, I4, I5, I6, I7, I8, XCEN1, YCEN1, XCEN2, YCEN2, @@ -59,9 +48,9 @@ SUBROUTINE BMSCHM (NPER, KKK, LLL, NNN, ML, MS, NSPR, ISLIST, & LXK, KXL, NXL, LXN, M1, M2, KKK, KKKOLD, NNN, NNNOLD, LLL, & LLLOLD, IAVAIL, NAVAIL, ERR) END IF -C + C SET UP THE SECOND SUBREGION, AND SEND IT OFF TO BE GENERATED -C + IF (.NOT.ERR) THEN CALL SUBTRN (NPER, NEWPER, 2, X, Y, NID, XSUB, YSUB, NIDSUB, & I1, I2, I3, I4, I5, I6, I7, I8, XCEN1, YCEN1, XCEN2, YCEN2, @@ -77,9 +66,9 @@ SUBROUTINE BMSCHM (NPER, KKK, LLL, NNN, ML, MS, NSPR, ISLIST, CALL FIXSUB (MXND, NNNOLD, NNN, LLLOLD, LLL, KKKOLD, KKK, XN, & YN, NUID, LXK, KXL, NXL, LXN, INDX, IAVAIL, NAVAIL, FINAL) END IF -C + C SET UP THE THIRD SUBREGION, AND SEND IT OFF TO BE GENERATED -C + IF (.NOT.ERR) THEN CALL SUBTRN (NPER, NEWPER, 3, X, Y, NID, XSUB, YSUB, NIDSUB, & I1, I2, I3, I4, I5, I6, I7, I8, XCEN1, YCEN1, XCEN2, YCEN2, @@ -95,9 +84,9 @@ SUBROUTINE BMSCHM (NPER, KKK, LLL, NNN, ML, MS, NSPR, ISLIST, CALL FIXSUB (MXND, NNNOLD, NNN, LLLOLD, LLL, KKKOLD, KKK, XN, & YN, NUID, LXK, KXL, NXL, LXN, INDX, IAVAIL, NAVAIL, FINAL) END IF -C + C SET UP THE FOURTH SUBREGION, AND SEND IT OFF TO BE GENERATED -C + IF (.NOT.ERR) THEN CALL SUBTRN (NPER, NEWPER, 4, X, Y, NID, XSUB, YSUB, NIDSUB, & I1, I2, I3, I4, I5, I6, I7, I8, XCEN1, YCEN1, XCEN2, YCEN2, @@ -113,9 +102,9 @@ SUBROUTINE BMSCHM (NPER, KKK, LLL, NNN, ML, MS, NSPR, ISLIST, CALL FIXSUB (MXND, NNNOLD, NNN, LLLOLD, LLL, KKKOLD, KKK, XN, & YN, NUID, LXK, KXL, NXL, LXN, INDX, IAVAIL, NAVAIL, FINAL) END IF -C + C SET UP THE FIFTH SUBREGION, AND SEND IT OFF TO BE GENERATED -C + IF (.NOT.ERR) THEN CALL SUBTRN (NPER, NEWPER, 5, X, Y, NID, XSUB, YSUB, NIDSUB, & I1, I2, I3, I4, I5, I6, I7, I8, XCEN1, YCEN1, XCEN2, YCEN2, @@ -131,9 +120,9 @@ SUBROUTINE BMSCHM (NPER, KKK, LLL, NNN, ML, MS, NSPR, ISLIST, CALL FIXSUB (MXND, NNNOLD, NNN, LLLOLD, LLL, KKKOLD, KKK, XN, & YN, NUID, LXK, KXL, NXL, LXN, INDX, IAVAIL, NAVAIL, FINAL) END IF -C + C SET UP THE SIXTH SUBREGION, AND SEND IT OFF TO BE GENERATED -C + IF (.NOT.ERR) THEN CALL SUBTRN (NPER, NEWPER, 6, X, Y, NID, XSUB, YSUB, NIDSUB, & I1, I2, I3, I4, I5, I6, I7, I8, XCEN1, YCEN1, XCEN2, YCEN2, @@ -150,6 +139,6 @@ SUBROUTINE BMSCHM (NPER, KKK, LLL, NNN, ML, MS, NSPR, ISLIST, CALL FIXSUB (MXND, NNNOLD, NNN, LLLOLD, LLL, KKKOLD, KKK, XN, & YN, NUID, LXK, KXL, NXL, LXN, INDX, IAVAIL, NAVAIL, FINAL) END IF -C + RETURN END diff --git a/packages/seacas/applications/fastq/boxit.f b/packages/seacas/applications/fastq/boxit.f index c41892183d1e..76454e70d4cf 100644 --- a/packages/seacas/applications/fastq/boxit.f +++ b/packages/seacas/applications/fastq/boxit.f @@ -1,59 +1,31 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: boxit.f,v 1.4 2004/01/26 17:28:18 gdsjaar Exp $ -C $Log: boxit.f,v $ -C Revision 1.4 2004/01/26 17:28:18 gdsjaar -C Removed several unused variables from getang subroutine. -C -C Initialized a variable -C -C Revision 1.3 1998/07/14 18:18:25 gdsjaar -C Removed unused variables, cleaned up a little. -C -C Changed BLUE labels to GREEN to help visibility on black background -C (indirectly requested by a couple users) -C -C Revision 1.2 1991/03/21 15:44:19 gdsjaar -C Changed all 3.14159... to atan2(0.0, -1.0) -C -c Revision 1.1.1.1 1990/11/30 11:04:09 gdsjaar -c FASTQ Version 2.0X -c -c Revision 1.1 90/11/30 11:04:07 gdsjaar -c Initial revision -c -C -CC* FILE: [.MAIN]BOXIT.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE BOXIT (MP, ML, MS, MR, N, IPOINT, COOR, ILINE, LTYPE, & LCON, IREGN, IMAT, NSPR, IFSIDE, ISLIST, LINKP, LINKL, LINKR, & LINKM, NHOLDR, IHOLDR, NHOLDM, IHOLDM, IRGFLG, X, Y, Y1, Y2, & BOXED, MERGE, NOROOM) C*********************************************************************** -C + C SUBROUTINE BOXIT = BOXES IN A REGION SURROUNDING A POINT -C + C*********************************************************************** -C + C SUBROUTINE CALLED BY: C INPUT = INPUTS MESH DEFINITIONS FROM THE LIGHT TABLE -C + C*********************************************************************** -C + C SUBROUTINES CALLED: C DLPARA = DETERMINES LINE PARAMETERS FROM TWO POINTS -C + C*********************************************************************** -C + PARAMETER (MHOLD = 50) -C + DIMENSION IPOINT (MP) DIMENSION COOR (2, MP), ILINE (ML), LTYPE (ML), LCON (3, ML) DIMENSION IREGN (MR), IMAT (MR), NSPR (MR), IFSIDE (MR) @@ -62,9 +34,9 @@ SUBROUTINE BOXIT (MP, ML, MS, MR, N, IPOINT, COOR, ILINE, LTYPE, DIMENSION LINKM (2, (MS + MR)) DIMENSION IHOLDR (2, MR), IHOLDM (2, (MS + MR)) DIMENSION IHOLD (MHOLD, 2), JHOLD (MHOLD), IRGFLG (MR), N (29) -C + LOGICAL BOXED, NOROOM, ADDLNK, MERGE, ERR, CIRCLE -C + PI = ATAN2(0.0, -1.0) TWOPI = PI + PI BOXED = .FALSE. @@ -74,16 +46,16 @@ SUBROUTINE BOXIT (MP, ML, MS, MR, N, IPOINT, COOR, ILINE, LTYPE, IFIND = 0 SUMTH = 0. THETMX = 0.0 -C + C FIND THE CLOSEST LINE ABOVE THE POINT INPUT -C + CALL LABOVE (MP, ML, N, IPOINT, COOR, ILINE, LTYPE, LCON, LINKP, & LINKL, X, Y, Y1, Y2, IFIND, JFIND1, ISTART, NP) IF (IFIND .LE. 0) RETURN IFHOLD = IFIND -C + C SET UP REGION CHECKING CONNECTIVITY -C + DO 100 I = 1, MHOLD JHOLD (I) = 0 IHOLD (I, 1) = 0 @@ -91,15 +63,15 @@ SUBROUTINE BOXIT (MP, ML, MS, MR, N, IPOINT, COOR, ILINE, LTYPE, 100 CONTINUE IFOUND = 0 LASTP = ISTART -C + CALL LTSORT (ML, LINKL, IFIND, JFIND1, ADDLNK) JHOLD (1) = IFIND -C + DO 130 I = 1, N (2) + 2 JKOUNT = 0 -C + C GET ALL LINES CONTAINING THE NEW POINT "NP" -C + DO 110 J = 1, N (19) CALL LTSORT (ML, LINKL, J, JJ, ADDLNK) IF (JJ .GT. 0) THEN @@ -117,20 +89,20 @@ SUBROUTINE BOXIT (MP, ML, MS, MR, N, IPOINT, COOR, ILINE, LTYPE, ENDIF ENDIF 110 CONTINUE -C + C CHECK FOR A CLOSED CIRCLE WITH NO LINES ATTACHED -C + IF ( (JKOUNT .EQ. 0) .AND. (NP .EQ. LASTP) ) THEN IFOUND = 1 GOTO 140 -C + C CHECK FOR NO ADDITIONAL LINES ATTACHED -C + ELSEIF (JKOUNT .EQ. 0) THEN RETURN -C + C CHECK FOR A CLOSED CIRCLE ATTACHED TO NP -C + ELSEIF ( (JKOUNT .EQ. 1) .AND. & (LCON (1, IHOLD (1, 1)) .EQ. LCON (2, IHOLD (1, 1))) ) & THEN @@ -141,9 +113,9 @@ SUBROUTINE BOXIT (MP, ML, MS, MR, N, IPOINT, COOR, ILINE, LTYPE, IFIND = ILINE (JFIND1) JHOLD (I + 1) = ILINE (JFIND1) IFOUND = IFOUND + 1 -C + C CHECK FOR CLOSING OF THE REGION -C + IF ( IFIND .EQ. IFHOLD ) THEN IF ( (LASTP .EQ. ISTART) .AND. & (IFIND .EQ. IFHOLD) .AND. @@ -151,24 +123,24 @@ SUBROUTINE BOXIT (MP, ML, MS, MR, N, IPOINT, COOR, ILINE, LTYPE, GOTO 140 ENDIF ENDIF -C + C SET THE FLAG THAT WE ARE RETURNING FROM THIS CLOSED CIRCLE -C + CIRCLE = .TRUE. -C + C USING THE NP COORDINATES AS A NEW CENTER C CHECK TO SEE WHICH LINE HAS THE SMALLEST INTERIOR ANGLE C (ASSUMES WE ARE PROGRESSING IN CLOCKWISE ORDER) -C + ELSE CALL ENDTAN (MP, ML, N, IPOINT, COOR, LTYPE, LCON, LINKP, & LINKL, IFIND, JFIND1, NP, THETA1, ERR) -C + C SET THE SPECIAL CASE OF A CLOSED CIRCLE WITH ATTACHED LINES C AND NOT A RETURN FROM A CIRCLE AS HAVING A THETMX OF PI. C A CLOSED CIRCLE RETURN GETS THE ENDTANGENT FLIPPED TO GET THE C RIGHT INTERIOR ANGLE. -C + IF ( NP .EQ. LASTP ) THEN IF (CIRCLE) THEN THETA1 = THETA1 - PI @@ -184,15 +156,15 @@ SUBROUTINE BOXIT (MP, ML, MS, MR, N, IPOINT, COOR, ILINE, LTYPE, ELSE THETMX = TWOPI * 2. ENDIF -C + DO 120 J = 1, JKOUNT -C + C JJ = THE POINTER TO THE ATTACHED POINT OF THE LINE BEING TESTED -C + CALL ENDTAN (MP, ML, N, IPOINT, COOR, LTYPE, LCON, & LINKP, LINKL, ILINE (IHOLD (J, 1)), IHOLD (J, 1), NP, & THETA2, ERR) -C + TESTTH = THETA2 - THETA1 IF (TESTTH .LT. 0) THEN TESTTH = TESTTH + TWOPI @@ -207,27 +179,27 @@ SUBROUTINE BOXIT (MP, ML, MS, MR, N, IPOINT, COOR, ILINE, LTYPE, JFIND2 = IHOLD (J, 2) ENDIF 120 CONTINUE -C + C CHECK FOR CLOSING OF THE REGION -C + IF (IFIND .EQ. IFHOLD) THEN -C + C FIRST THE SINGLE LINE REGION WITH LINES ATTACHED OUTSIDE THE CIRCLE -C + IF ( (NP .EQ. LASTP) .AND. & ( IFIND .EQ. ILINE ( JFIND1 ) ) ) THEN IFOUND = 1 GOTO 140 -C + C SECOND TEST FOR THE NORMAL CLOSING -C + ELSEIF ( (LASTP .EQ. ISTART) .AND. & (IFIND .EQ. IFHOLD) .AND. & (I .NE. 1) ) THEN GOTO 140 ENDIF ENDIF -C + SUMTH = SUMTH + THETMX LASTP = NP NP = LCON (JFIND2, JFIND1) @@ -238,18 +210,18 @@ SUBROUTINE BOXIT (MP, ML, MS, MR, N, IPOINT, COOR, ILINE, LTYPE, ENDIF 130 CONTINUE RETURN -C + C CHECK TO MAKE SURE THE REGION CLOSED CORRECTLY -C + C AVETH = SUMTH / DBLE(IFOUND) C IF (AVETH .GT. 180.) THEN C CALL VDBELL C CALL VDBUFL C RETURN C ENDIF -C + C INPUT THE REGION -C + 140 CONTINUE JJ = N (22) + 1 IMTRL = 0 diff --git a/packages/seacas/applications/fastq/bpinch.f b/packages/seacas/applications/fastq/bpinch.f index f6811009690e..14e8fd5faf02 100644 --- a/packages/seacas/applications/fastq/bpinch.f +++ b/packages/seacas/applications/fastq/bpinch.f @@ -1,60 +1,43 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: bpinch.f,v 1.2 1991/03/21 15:44:21 gdsjaar Exp $ -C $Log: bpinch.f,v $ -C Revision 1.2 1991/03/21 15:44:21 gdsjaar -C Changed all 3.14159... to atan2(0.0, -1.0) -C -c Revision 1.1.1.1 1990/11/30 11:04:11 gdsjaar -c FASTQ Version 2.0X -c -c Revision 1.1 90/11/30 11:04:10 gdsjaar -c Initial revision -c -C -CC* FILE: [.PAVING]BPINCH.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE BPINCH (MXND, MLN, LNODES, XN, YN, LXN, NXL, ANGLE, & N0, N1, N2, NLOOP, TOLER1, TOLER2, BOK, ERR) C*********************************************************************** -C + C SUBROUTINE BPINCH = CHECKS THAT A PINCH IS ALLOWABLE AND THAT IT C DOESN'T FORCE A DEGENERATE BOUNDARY ELEMENT -C + C*********************************************************************** -C + DIMENSION XN (MXND), YN (MXND) DIMENSION NXL (2, 3*MXND), LXN (4, MXND) DIMENSION ANGLE (MXND), LNODES (MLN, MXND) DIMENSION L1LIST(20) -C + LOGICAL BOK, CORNP, PANGLE, ERR -C + TWOPI = 2.0 * ATAN2(0.0, -1.0) -C + C SEE IF THE ANGLE IS ELIGIBLE FOR PINCHING C FIRST CHECK A NONBOUNDARY NODE -C + IF (LXN (2, N1) .GT. 0) THEN -C + C CHECK A FOUR (OR LESS) LINE NODE -C + IF (LXN (4, N1) .GE. 0) THEN IF (ANGLE (N1) .LT. TOLER1) THEN PANGLE = .TRUE. ELSE PANGLE = .FALSE. ENDIF -C + C CHECK A FIVE (OR MORE) LINE NODE -C + ELSE IF (ANGLE (N1) .LT. TOLER2) THEN PANGLE = .TRUE. @@ -62,9 +45,9 @@ SUBROUTINE BPINCH (MXND, MLN, LNODES, XN, YN, LXN, NXL, ANGLE, PANGLE = .FALSE. ENDIF ENDIF -C + C CHECK A BOUNDARY NODE -C + ELSE IF ( (ANGLE (N1) .LT. TOLER1) .AND. & (LXN (2, N0) * LXN (2, N2) .LT. 0) ) THEN @@ -78,23 +61,23 @@ SUBROUTINE BPINCH (MXND, MLN, LNODES, XN, YN, LXN, NXL, ANGLE, ENDIF ENDIF IF (PANGLE) THEN -C + C ALL THREE ARE NOT ON THE BOUNDARY -C + IF ( (LXN (2, N1) .GT. 0) .AND. & (LXN (2, N0) .GT. 0) .AND. & (LXN (2, N2) .GT. 0) ) THEN BOK = .TRUE. -C + C N0 AND N2 ARE ON THE BOUNDARY -C + ELSEIF ( (LXN (2, N0) .LT. 0) .AND. & (LXN (2, N2) .LT. 0) ) THEN BOK = .FALSE. -C + C N1 AND N0 ARE ON THE BOUNDARY - FIND THE ANGLE THAT C THE BOUNDARY AT N1 MAKES -C + ELSEIF ( (LXN (2, N0) .LT. 0) .AND. & (LXN (2, N1) .LT. 0) ) THEN CALL GETLXN (MXND, LXN, N1, L1LIST, NL, ERR) @@ -128,9 +111,9 @@ SUBROUTINE BPINCH (MXND, MLN, LNODES, XN, YN, LXN, NXL, ANGLE, IF (ANG2 .LT. 0.) ANG2 = ANG2 + TWOPI ANG = ANG1 - ANG2 IF (ANG .LT. 0.) ANG = ANG + TWOPI -C + C NOW CHECK TO MAKE SURE THAT ANGLE IS NOT TOO LARGE -C + IF (ANG .LT. 2.3561945) THEN IF (LXN (3, N1) .EQ. 0) THEN BOK = .FALSE. @@ -144,9 +127,9 @@ SUBROUTINE BPINCH (MXND, MLN, LNODES, XN, YN, LXN, NXL, ANGLE, BOK = .TRUE. ENDIF ENDIF -C + C N1 AND N2 ARE ON THE BOUNDARY -C + ELSEIF ( (LXN (2, N1) .LT. 0) .AND. & (LXN (2, N2) .LT. 0) ) THEN CALL GETLXN (MXND, LXN, N1, L1LIST, NL, ERR) @@ -180,9 +163,9 @@ SUBROUTINE BPINCH (MXND, MLN, LNODES, XN, YN, LXN, NXL, ANGLE, IF (ANG2 .LT. 0.) ANG2 = ANG2 + TWOPI ANG = ANG2 - ANG1 IF (ANG .LT. 0.) ANG = ANG + TWOPI -C + C NOW CHECK THE ANGLE SIZE -C + IF (ANG .LT. 2.3561945) THEN IF (LXN (3, N1) .EQ. 0) THEN BOK = .FALSE. @@ -196,9 +179,9 @@ SUBROUTINE BPINCH (MXND, MLN, LNODES, XN, YN, LXN, NXL, ANGLE, BOK = .TRUE. ENDIF ENDIF -C + C ONLY N0 IS ON THE BOUNDARY -C + ELSEIF (LXN (2, N0) .LT. 0) THEN N0A = LNODES (2, N0) N0B = LNODES (2, N0A) @@ -210,14 +193,14 @@ SUBROUTINE BPINCH (MXND, MLN, LNODES, XN, YN, LXN, NXL, ANGLE, ELSE BOK = .TRUE. ENDIF -C + C ONLY N1 IS ON THE BOUNDARY -C + ELSEIF (LXN (2, N1) .LT. 0) THEN BOK = .TRUE. -C + C ONLY N2 IS ON THE BOUNDARY -C + ELSEIF (LXN (2, N2) .LT. 0) THEN N2A = LNODES (3, N2) N2B = LNODES (3, N2A) @@ -229,14 +212,14 @@ SUBROUTINE BPINCH (MXND, MLN, LNODES, XN, YN, LXN, NXL, ANGLE, ELSE BOK = .TRUE. ENDIF -C + ENDIF -C + ELSE BOK = .FALSE. ENDIF -C + 140 CONTINUE RETURN -C + END diff --git a/packages/seacas/applications/fastq/bubble.f b/packages/seacas/applications/fastq/bubble.f index e6be16a0f5e0..206963692815 100644 --- a/packages/seacas/applications/fastq/bubble.f +++ b/packages/seacas/applications/fastq/bubble.f @@ -1,31 +1,21 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: bubble.f,v 1.1 1990/11/30 11:04:13 gdsjaar Exp $ -C $Log: bubble.f,v $ -C Revision 1.1 1990/11/30 11:04:13 gdsjaar -C Initial revision -C -CC* FILE: [.QMESH]BUBBLE.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE BUBBLE (X, KARRY, NORD, N) C*********************************************************************** -C + C SUBROUTINE BUBBLE=SORTS ALL VALUES X(I), KARRY(I) INTO DECREASING C ORDER, ASSUMING THAT VALUES 1 TO NORD ARE SORTED -C + C*********************************************************************** -C + DIMENSION X (N), KARRY (N) -C + IF (N .LE. 1) RETURN -C + ISTART = MAX0 (NORD + 1, 2) IF (ISTART .GT. N) RETURN DO 120 J = ISTART, N @@ -43,7 +33,7 @@ SUBROUTINE BUBBLE (X, KARRY, NORD, N) X (I) = XVAL KARRY (I) = KVAL 120 CONTINUE -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/casmo.f b/packages/seacas/applications/fastq/casmo.f index 3b6ab33cdb0d..1e887ef02a8e 100644 --- a/packages/seacas/applications/fastq/casmo.f +++ b/packages/seacas/applications/fastq/casmo.f @@ -1,70 +1,59 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: casmo.f,v 1.1 1990/11/30 11:04:15 gdsjaar Exp $ -C $Log: casmo.f,v $ -C Revision 1.1 1990/11/30 11:04:15 gdsjaar -C Initial revision -C -C -CC* FILE: [.QMESH]CASMO.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE CASMO (MXND, XN, YN, LXK, KXL, NXL, LXN, NNN, NNNOLD, & NIT, EPS, RO) C*********************************************************************** -C + C SUBROUTIINE CASMO = CENTROID-AREA-PULL METHOD MESH SMOOTHING -C + C*********************************************************************** -C + C NOTE: C IN THIS METHOD EACH NODE IS PULLED TOWARD THE CENTROIDS OF C ADJACENT ELEMENTS BY FORCES PROPORTIONAL TO THE RESPECTIVE C ELEMENT AREAS. C IDEA BY STEVE PETTY AND RONDALL JONES -C + C*********************************************************************** -C + C VARIABLES USED: C NIT = MAX NUMBER OF ITERATIONS TO DO C EPS = NODE MOVEMENT TOLERANCE FOR CONVERGENCE C RO = UNDER OR OVER-RELAXATION FACTOR. -C + C*********************************************************************** -C + DIMENSION NODES(4) DIMENSION KLIST(20), AREA(20), XCEN(20), YCEN(20) DIMENSION LXK(4, MXND), KXL(2, 3*MXND), NXL(2, 3*MXND) DIMENSION LXN(4, MXND), XN(MXND), YN(MXND) -C + LOGICAL ERR, BIG, CCW -C + C ITERATION LOOP -C + DO 140 IT = 1, NIT BIG = .FALSE. -C + C NODE LOOP -C + DO 130 NODE = NNNOLD + 1, NNN -C + C SKIP CONTINUATIONS AND BOUNDARY NODES -C + IF((LXN(1, NODE).GT.0).AND.(LXN(2, NODE).GT.0))THEN -C + C GET ELEMENT LIST (IGNORE ERR IF CAUSED BY TOO MANY ELEMENTS) -C + CALL GKXN (MXND, KXL, LXN, NODE, NUMK, KLIST, ERR) IF((ERR).AND.(NUMK.LT.20))RETURN -C + C GET AREAS AND CENTROIDS -C + DO 110 IK = 1, NUMK KK = KLIST(IK) CCW = .TRUE. @@ -80,9 +69,9 @@ SUBROUTINE CASMO (MXND, XN, YN, LXK, KXL, NXL, LXN, NNN, NNNOLD, XCEN(IK) = 0.25*XSUM YCEN(IK) = 0.25*YSUM 110 CONTINUE -C + C COMPUTE AND SUM THE FORCE VECTORS -C + FX = 0. FY = 0. SUMW = 0. @@ -94,15 +83,15 @@ SUBROUTINE CASMO (MXND, XN, YN, LXK, KXL, NXL, LXN, NNN, NNNOLD, FX = FX + WEIGHT*DX FY = FY + WEIGHT*DY 120 CONTINUE -C + C NORMALIZE THE RESULTANT VECTOR -C + RSUMW = 1.0/SUMW FX = FX*RSUMW FY = FY*RSUMW -C + C MOVE THE NODE -C + DELX = RO*FX DELY = RO*FY XN(NODE) = XN(NODE) + DELX diff --git a/packages/seacas/applications/fastq/cclock.f b/packages/seacas/applications/fastq/cclock.f index 537dab3f586f..bfe0136546a7 100644 --- a/packages/seacas/applications/fastq/cclock.f +++ b/packages/seacas/applications/fastq/cclock.f @@ -1,61 +1,44 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: cclock.f,v 1.2 1991/03/21 15:44:23 gdsjaar Exp $ -C $Log: cclock.f,v $ -C Revision 1.2 1991/03/21 15:44:23 gdsjaar -C Changed all 3.14159... to atan2(0.0, -1.0) -C -c Revision 1.1.1.1 1990/11/30 11:04:21 gdsjaar -c FASTQ Version 2.0X -c -c Revision 1.1 90/11/30 11:04:19 gdsjaar -c Initial revision -c -C -CC* FILE: [.QMESH]CCLOCK.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE CCLOCK (X, Y, N, CCW, ERR, INDETR) C*********************************************************************** -C + C SUBROUTINE CCLOCK = DETERMINES IF THE PERIMETER OF A REGION IS STATED C IN COUNTER-CLOCKWISE FASHION -C + C*********************************************************************** -C + C SUBROUTINE CALLED BY: C PERIM = GENERATES THE PERIMETER OF A REGION -C + C*********************************************************************** -C + C VARIABLES USED: C CCW = .TRUE. IF THE PERIMETER IS IN COUNTER-CLOCKWISE ORDER C ERR = .TRUE. IF THE ORDER COULD NOT BE DETERMINED, OR IF AN C ERROR OCCURS CHECKING THE ORDER C N = THE NUMBER OF NODES IN THE PERIMETER (MUST BE AT LEAST 3) -C + C*********************************************************************** -C + DIMENSION X (N), Y (N) -C + LOGICAL CCW, ERR, INDETR -C + ERR = .TRUE. INDETR = .FALSE. PI = ATAN2(0.0, -1.0) TWOPI = PI+PI -C + IF (N .LT. 3) THEN CALL MESAGE ('PERIMETER MUST CONTAIN MORE THAN 3 NODES') GOTO 110 ENDIF -C + SPIRO = 0.0 IF ( (X (1) .EQ. X (N)) .AND. (Y (1) .EQ. Y (N)) ) THEN CALL MESAGE ('PERIMETER CONTAINS DUPLICATE NODE LOCATIONS') @@ -88,10 +71,10 @@ SUBROUTINE CCLOCK (X, Y, N, CCW, ERR, INDETR) ENDIF ERR = .FALSE. RETURN -C + C ERROR IN THE ROUTINE -C + 110 CONTINUE RETURN -C + END diff --git a/packages/seacas/applications/fastq/cgi/cgi_dummy.c b/packages/seacas/applications/fastq/cgi/cgi_dummy.c index f31a127fbbe7..29250eb574fc 100644 --- a/packages/seacas/applications/fastq/cgi/cgi_dummy.c +++ b/packages/seacas/applications/fastq/cgi/cgi_dummy.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/applications/fastq/cgi/vdicps.f b/packages/seacas/applications/fastq/cgi/vdicps.f index 4193566711dd..11ffcc61853a 100644 --- a/packages/seacas/applications/fastq/cgi/vdicps.f +++ b/packages/seacas/applications/fastq/cgi/vdicps.f @@ -1,15 +1,15 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details SUBROUTINE VIINIT(ASPECT,JUSTIF) -C + C VDI-PostScript driver - B&W and COLOR versions C Adapted for all systems by S.L.Thompson C Original code from D.Campbell and J.LONG -C + C vdi device numbers are C device number C black & white, batch, no poly fill 799.1 @@ -22,46 +22,46 @@ SUBROUTINE VIINIT(ASPECT,JUSTIF) C color, interactive, black-white interchange 799.8 C color, batch, black background 799.9 C color, interactive, black background 799.11 -C + C last mod 6/20/90 slt -C + C Note that there are several parameters to set depending on how C the package is to be used. Most are in routine pstsel routine C which is called at the first of this routine (viinit.) Two other c parameters (xinch,yinch) are set in this routine and vdiqd9. -C + C This code is for BOTH color and black & white systems. C Flag is set for mode in pstsel. -C + C Device can be set with escape call before call to vdinit. C Otherwise, code will interactively ask for device type. C There is also an escape flag for landscape or portrait format. -C + C This deck was generated from a qms driver and still has the C qms comments in places. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VIINIT -Initialize SVDI. postscript device -C + C D.L. CAMPBELL -1-DEC-1986 C J.P. LONG -9-NOV-1987 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C (postscript) -C + C ENTRY CONDITIONS -ASPECT = real ratio of X dimension to Y dimension. C Range >0.0. Default: 0. (device dependent). C JUSTIF = integer justification of NDC space on the C device. Range 0-9. Default: 0 (device dependent.) -C + C CALLS -VBERRH,VDSTCS,VDSTLW,VIMOVA -C + C EXIT CONDITIONS -XNDCMX,YNDCMX = real NDC maximum valid values(as C constrained by ASPECT). C VECTOR = real array of attribute values(all device C dependent except VECTOR(4)=0.0). -C + C NARRATIVE -This must be the first SVDI call made. All C attribute values, the color table, and current C position are set to appropriate defaults for the @@ -69,7 +69,7 @@ SUBROUTINE VIINIT(ASPECT,JUSTIF) C is done. The screen is cleared or paper advanced C if necessary to guarantee a blank view surface for C drawing on. -C + C ASPECT specifies the ratio of the X dimension to the C Y dimension . Maximum NDC values (at least one of C which will be 1.0) are computed to give the ASPECT @@ -80,7 +80,7 @@ SUBROUTINE VIINIT(ASPECT,JUSTIF) C aspect of 1.0. The NDC rectangle is scaled until C one dimension fills the corresponding dimension of C the device. -C + C JUSTIF determines where the rectangle is located on C the device as diagrammed below: C --------- @@ -90,22 +90,22 @@ SUBROUTINE VIINIT(ASPECT,JUSTIF) C --------- C For example, JUSTIF = 7 indicates NDC space will be C upper left justified on the device. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC -C + C Set parameters for type of usage. C Two settings are coded - one for square field of view C and one for full field of view. -C + C If VDIQDC is called before vdinit, full field of view is selected. C Otherwise, square is used. -C + C size of full view PARAMETER (XINCHO=10.0) PARAMETER (YINCHO=7.5) -C + C size of square view C PARAMETER (XINCHO=7.5) C PARAMETER (YINCHO=7.5) @@ -116,14 +116,14 @@ SUBROUTINE VIINIT(ASPECT,JUSTIF) C PARAMETER (YINCHO=7.4412525) *- COMMON /VCMODR/ XINCH, YINCH -C + CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC -C + REAL ASPECT INTEGER JUSTIF COMMON /VCVEC1/ IVECT INTEGER IVECT -C + C MAXIMUM VALID NDC VALUES. (DEVICE-INDEPENDENT) REAL XNDCMX,YNDCMX COMMON /VCNDCM/ XNDCMX,YNDCMX @@ -140,7 +140,7 @@ SUBROUTINE VIINIT(ASPECT,JUSTIF) C CURRENT POSITION. REAL XCP,YCP COMMON /VCCRPS/ XCP,YCP -C + C COMPUTER DEPENDENT COMMON VARIABLES AND CONSTANTS. include 'vcpstc.blk' C SCALE FACTORS FOR NDC TO DC MAPPING. (LXY,HC1) @@ -151,7 +151,7 @@ SUBROUTINE VIINIT(ASPECT,JUSTIF) COMMON /VCDDIM/ XPAD,YPAD,XDEVIC,YDEVIC C JOB ID INFORMATION. (HC1, DIC) include 'vcjob.blk' -C + COMMON /DEVCAP/ DEV(33) C ESCAPE FLAGS C PATNO AND BORDER USED BY VIPOLY FOR FILL PATTERN AND BORDER ON/OFF; @@ -159,7 +159,7 @@ SUBROUTINE VIINIT(ASPECT,JUSTIF) COMMON /VCESCP/ PGFORM,PATNO,BORDER INTEGER PGFORM,PATNO,BORDER CHARACTER COORD*20,XCOORD*4,YCOORD*4 -C + C pstmlw controls minimum line width C kpstbg controls background coloring C = 0, not colored (white ground from paper) @@ -168,20 +168,19 @@ SUBROUTINE VIINIT(ASPECT,JUSTIF) C = 0, no interchange C = 1, colors interchanged COMMON /VCPSTA/ PSTMLW, KPSTBG, KPSTCI -C + C mopoly controls polygon fill =0, on ; =1, off C mocolr controls color =0, on ; =1, off COMMON /VCPSTB/ MOPOLY, MOCOLR -C + DIMENSION COLDEF(3) -C + C vcpstd variables control what to do with empty frames with C command is received to dump data to output C kempty=0, frame is void - do not draw C >0, frame has data - draw it COMMON /VCPSTD/ KEMPTY -C -C + integer dummy(1) DEV(1) = 0.0 @@ -232,7 +231,7 @@ SUBROUTINE VIINIT(ASPECT,JUSTIF) C (5)=LINE WIDTH - ABOUT 1/72 INCHES C (6)=CHARACTER BOX Y - ABOUT 1/10 INCHES C (7)=CHARACTER BOX X - 5/7 OF BOX-Y -C + vector(1) = 0.0 vector(2) = 7.0 vector(3) = 1.0 @@ -240,7 +239,7 @@ SUBROUTINE VIINIT(ASPECT,JUSTIF) vector(5) = 0.06255 vector(6) = 0.01 vector(7) = 0.0 -C + C PROTECT INPUT PARAMETERS FROM BEING CHANGED. ASPEC1=ASPECT JUSTI1=JUSTIF @@ -251,21 +250,21 @@ SUBROUTINE VIINIT(ASPECT,JUSTIF) BORDER = 1 XCP = 0.0 YCP = 0.0 -C + C CHECK FOR VALID ASPECT. IF(ASPECT.LT.0.0) THEN CALL VBERRH(721,5), C AND USE DEFAULT ASPECT. IF(ASPECT.LT.0.0) THEN CALL VBERRH(721,5) ASPEC1=0.0 END IF -C + C CHECK FOR VALID JUSTIF. IF(JUSTIF.LT.0 .OR. JUSTIF.GT.9) THEN C CALL VBERRH(720,5), AND USE DEFAULT JUSTIF. IF(JUSTIF.LT.0.OR.JUSTIF.GT.9) THEN CALL VBERRH(720,5) JUSTI1=0 END IF -C + C SCALE NDC UNITS TO DEVICE UNITS. C FOR QMS, THE PHYSICAL PLOT SURFACE IS XINCH X YINCH (10.x7.5). C DEVICE COORDINATES ARE KEPT IN 1/723 INCH TO GAIN SIMPLICITY @@ -276,14 +275,14 @@ SUBROUTINE VIINIT(ASPECT,JUSTIF) C ADDRESSABILITY,USING AS MUCH OF THE SPACE AS POSSIBLE. XINCH=XINCHO YINCH=YINCHO -C + C test for rscors post or direct mode. Use 7.5x7.5 for direct C and 10.0x7.5 for post -C + C if VDIQDC has already been called, we are in post mode; C otherwise in direct mode CALL VDIQD9(XINCH,YINCH) -C + C CHECK PAGE FORMAT - IF PORTRAIT, C THEN SWITCH THINGS AROUND IF (PGFORM.EQ.1) THEN @@ -300,13 +299,13 @@ SUBROUTINE VIINIT(ASPECT,JUSTIF) XUNITS=XINCH*723. YUNITS=YINCH*723. DASPEC=XUNITS/YUNITS -C + C DEFAULT ASPECT = 1., DEFAULT JUSTIF = 1. IF(ASPEC1.EQ.0.) ASPEC1=DASPEC IF(JUSTI1.EQ.0) JUSTI1=1 -C + IF(ASPEC1.GE.DASPEC) THEN -C + C THEN X DIMENSION IS FILLED. XDEVIC=XUNITS YDEVIC=XUNITS/ASPEC1 @@ -320,7 +319,7 @@ SUBROUTINE VIINIT(ASPECT,JUSTIF) YPAD=YUNITS-YDEVIC END IF ELSE -C + C ELSE Y DIMENSION IS FILLED. XDEVIC=YUNITS*ASPEC1 YDEVIC=YUNITS @@ -334,7 +333,7 @@ SUBROUTINE VIINIT(ASPECT,JUSTIF) XPAD=0 END IF END IF -C + C FIGURE MAXIMUM NDC VALUES XNDCMX AND YNDCMX. IF(ASPEC1.GE.DASPEC) THEN XNDCMX=MIN(1.,ASPEC1) @@ -343,7 +342,7 @@ SUBROUTINE VIINIT(ASPECT,JUSTIF) XNDCMX=ASPEC1 YNDCMX=1. END IF -C + C SET SCALE FACTORS FOR NDC-TO-DEVICE MAPPING. XSCALE=DBLE(XDEVIC)/XNDCMX YSCALE=DBLE(YDEVIC)/YNDCMX @@ -354,21 +353,21 @@ SUBROUTINE VIINIT(ASPECT,JUSTIF) XPAD = XPAD+280. YPAD = YPAD-180. ENDIF -C + CALL PSTSEL(' ') -C + C SET UP MONITORING INFORMATION CALL VBDEV('V PST ') CALL VDMONI(0) IVECT=0 -C + C OPEN OUTPUT FILE CALL PSTOFS(KOUTFL) -C + C INITIALIZE the printer -C + CALL PSTINI -C + CALL PSTBUF(38, '%%Title: Graphics SVDI PostScript File') CALL PSTBUF(0,' ') CALL PSTBUF(40, '%%Creator: SNL SEACAS SVDI Driver -- cps') @@ -431,15 +430,15 @@ SUBROUTINE VIINIT(ASPECT,JUSTIF) CALL PSTBUF(17,'/o {newpath} def ') ENDIF CALL PSTBUF(35,'/p {showpage} def 1 setlinecap v o ') -C + C check for color or black & white mode -C + IF(MOCOLR.EQ.0) THEN -C + C color is on -C + C define some kind of color table -C + DO 120 IC=0,7 COLDEF(1)=0. COLDEF(2)=0. @@ -477,17 +476,17 @@ SUBROUTINE VIINIT(ASPECT,JUSTIF) END IF VECTOR(1)=7. VECTOR(2)=0. -C + C define the postscript current position CALL VBVECT(0,XCP,YCP) -C + C shade background if appropriate -C + IF(KPSTBG.NE.0) THEN CALL PSTBBG KEMPTY=0 END IF -C + C INIT LINE WIDTH,CHARACTER SIZE CALL VDSTLW(VECTOR(5)) c CALL VDSTCS(VECTOR(6)) @@ -497,18 +496,18 @@ SUBROUTINE VIINIT(ASPECT,JUSTIF) END SUBROUTINE VDIQDC(INDEX,VALUE) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDIQDC -Inquire Device Capabilities. -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS -INDEX = integer capability number. Range 1-33. -C + C CALLS - -C + C EXIT CONDITIONS -VALUE = real value of the capability indicated by C INDEX. -C + C NARRATIVE -Return values of various device capabilities. INDEX C is the integer capability number (as given below), C and the real value is returned in VALUE. @@ -642,9 +641,9 @@ SUBROUTINE VDIQDC(INDEX,VALUE) C 33. Device pixel aspect - the ratio of the spacing of device C pixels in x divided by the spacing in y (1 for square C pixels) -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + SAVE INTEGER INDEX REAL VALUE @@ -653,11 +652,11 @@ SUBROUTINE VDIQDC(INDEX,VALUE) C DEFAULT COMPLETE FILL WITH BORDER. PLC. COMMON /VCESCP/ PGFORM,PATNO,BORDER INTEGER PGFORM,PATNO,BORDER -C + C mopoly controls polygon fill =0, on ; =1, off C mocolr controls color =0, on ; =1, off COMMON /VCPSTB/ MOPOLY, MOCOLR -C + *- INCLUDE PSTFULL C size of full view window C parameters set to get same size plot as imagen and qms b&w. @@ -668,33 +667,33 @@ SUBROUTINE VDIQDC(INDEX,VALUE) COMMON /DEVCAP/ DEV(33) DATA NOCALL /0/ -C + C If device is 0, call to reset -C + IF(NINT(DEV(23)).EQ.0) THEN CALL PSTSEL(' ') END IF -C + C CHECK FOR VALID INDEX. IF(INDEX.LT.1.OR.INDEX.GT.33) THEN CALL VBERRH(726,5) GOTO 999 END IF -C + C RETURN INDEXED VALUE. VALUE=DEV(INDEX) IF(INDEX.EQ.23) NOCALL=1 -C + 999 RETURN -C + C********************************************************************** ENTRY VDIQD9(XINCH,YINCH) -C + C This is an added entry for rscors version of pst driver to C tell if direct or post mode operation. If post mode, vdiqdc C is called before vdinit to get terminal type. In direct mode C it is never called to get type. -C + IF(NOCALL.NE.0) THEN C XINCH=10.0 C YINCH=7.5 @@ -705,23 +704,23 @@ SUBROUTINE VDIQDC(INDEX,VALUE) END SUBROUTINE VBERRH(ERRNUM,ERRSEV) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VBERRH -Error Handler. -C + C R.W.Simons -08APR81 C 30SEP81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -ERRNUM = integer error number. C ERRSEV = integer severity code. If > 12, error is C fatal. -C + C CALLS -VDLOGE. -C + C EXIT CONDITIONS - -C + C NARRATIVE -An error will normally cause an error message to C be printed on the error output device and possible C termination of the program, unless a routine VBERRH @@ -731,43 +730,43 @@ SUBROUTINE VBERRH(ERRNUM,ERRSEV) C returning. All versions of VBERRH, whether user- C supplied or default, must STOP on any error severity C greater than 12. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER ERRNUM,ERRSEV -C + C REPORT THE ERROR USING VDLOGE. CALL VDLOGE(ERRNUM,ERRSEV) -C + C CHECK FOR FATAL ERROR. IF(ERRSEV.GT.12) STOP -C + RETURN END SUBROUTINE VDGNAM(NAME) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDGNAM -Name the graphics output file -C + C P.L.Crotty -OCT88 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -NAME = character string; < 80 characters -C + C CALLS -C + C EXIT CONDITIONS -output graphics file is assigned the name NAME -C + C NARRATIVE -This subroutine associates a file name with C the graphics output file (KOUTFL). If this C routine is not called, a system dependent C default name is used. VDGNAM must be called C before VDINIT. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + SAVE CHARACTER*(*) NAME CHARACTER*132 PSTNAM @@ -828,26 +827,26 @@ SUBROUTINE VDGNAM(NAME) END SUBROUTINE VDINIT(ASPECT,JUSTIF) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDINIT -Initialize SVDI. -C + C R.W.Simons -08APR81 C 30SEP81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -ASPECT = real ratio of X dimension to Y dimension. C Range >0.0. Default: 0.0 (device dependent). C JUSTIF = integer justification of NDC space on the C device. Range 0-9. Default: 0 (device dependent). -C + C CALLS -PSTJOB, VBERRH, VIINIT. -C + C EXIT CONDITIONS -XNDCMX,YNDCMX = real NDC maximum valid values. C VECTOR = real array of default attribute values (all C device-dependent except VECTOR(4)=0.0). -C + C NARRATIVE -This must be the first SVDI call made. All C attribute values, the color table, and current C position are set to appropriate defaults for the @@ -855,7 +854,7 @@ SUBROUTINE VDINIT(ASPECT,JUSTIF) C is done. The screen is cleared or paper advanced C if necessary to guarantee a blank view surface for C drawing. -C + C ASPECT specifies the ratio of the X dimension to the C Y dimension. Maximum NDC values (at least one of C which will be 1.0) are computed to give the ASPECT @@ -866,7 +865,7 @@ SUBROUTINE VDINIT(ASPECT,JUSTIF) C aspect of 1.0. The NDC rectangle is scaled until C one dimension fills the corresponding dimension of C the device. -C + C JUSTIF determines where the rectangle is located on C the device as diagrammed below: C --------- @@ -876,18 +875,18 @@ SUBROUTINE VDINIT(ASPECT,JUSTIF) C --------- C For example, JUSTIF = 7 indicates NDC space will be C upper left justified on the device. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL ASPECT INTEGER JUSTIF -C + C JOB ID INFORMATION. (HC1, DIC) include 'vcjob.blk' -C + C COMPUTER DEPENDENT COMMON VARIABLES AND CONSTANTS. include 'vcpstc.blk' -C + C set common variables KWRTFL=6 KRDFL=0 @@ -905,64 +904,64 @@ SUBROUTINE VDINIT(ASPECT,JUSTIF) C IF(KSECUR.NE.0) THEN C CALL VBERRH(957,13) C END IF -C + C THIS IS JUST A DUMMY ROUTINE WHICH DOES NOTHING BUT CALL VIINIT. C THIS ORGANIZATION FACILITATES ADDING SECURITY MARKINGS TO SVDI. CALL VIINIT(ASPECT,JUSTIF) -C + RETURN END SUBROUTINE VDIQND(XNDC,YNDC) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDIQND -Inquire NDC Space. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -XNDCMX,YNDCMX = real maximum valid NDC values. -C + C CALLS - -C + C EXIT CONDITIONS -XNDC,YNDC = real maximum valid NDC values (XNDCMX, C YNDCMX). -C + C NARRATIVE -Return the maximum NDC values as set to realize the C aspect defined by VDINIT. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL XNDC,YNDC -C + C MAXIMUM VALID NDC VALUES. (DEVICE-INDEPENDENT) REAL XNDCMX,YNDCMX COMMON /VCNDCM/ XNDCMX,YNDCMX -C + C RETURN THE MAXIMUM VALID NDC VALUES. XNDC=XNDCMX YNDC=YNDCMX -C + RETURN END SUBROUTINE VDIQOS(ATTARR) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDIQOS -Inquire Output Status (of Attributes). -C + C K.M. ERICKSON -14 NOV 80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -VECTOR = real array of current attribute values. -C + C CALLS - -C + C EXIT CONDITIONS -ATTARR = real array of current attribute value C (VECTOR). -C + C NARRATIVE -Return the current attribute values in ATTARR as C given below. C ATTARR(1)=Foreground Color @@ -972,11 +971,11 @@ SUBROUTINE VDIQOS(ATTARR) C (5)=Line Width C (6)=Character Box Y C (7)=Character Box X -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL ATTARR(7) -C + C CURRENT ATTRIBUTE VALUES. (DEVICE-INDEPENDENT) REAL VECTOR(7) COMMON /VCATTR/ VECTOR @@ -987,64 +986,64 @@ SUBROUTINE VDIQOS(ATTARR) C (5)=LINE WIDTH C (6)=CHARACTER BOX Y C (7)=CHARACTER BOX X -C + INTEGER I -C + DO 100 I=1,7 ATTARR(I)=VECTOR(I) 100 CONTINUE -C + RETURN END SUBROUTINE VDLINA(X,Y) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDLINA -Line Absolute. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -X,Y = real NDC position. -C + C CALLS -VILINA. -C + C EXIT CONDITIONS - -C + C NARRATIVE -Draw a line from current position to absolute NDC C position X,Y and update current position. C Attributes foreground color, intensity, line style, C and line width apply. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL X,Y -C + C THIS IS JUST A DUMMY ROUTINE WHICH DOES NOTHING BUT CALL VILINA. C THIS ORGANIZATION FACILITATES ADDING SECURITY MARKINGS TO SVDI. CALL VILINA(X,Y) -C + RETURN END SUBROUTINE VDLOGE(ERRNUM,ERRSEV) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDLOGE -Log Error. -C + C R.W.Simons -08APR81 C K.M.Erickson -8OCT84 - add buffer flush -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -ERRNUM = integer error number. C ERRSEV = integer error severity. -C + C CALLS -PSTTBK, VDBUFL -C + C EXIT CONDITIONS - -C + C NARRATIVE -Report error with message to user and possibly C terminate job depending on severity. Notice that C by judicious use of the error routines (see VBERRH) @@ -1053,44 +1052,42 @@ SUBROUTINE VDLOGE(ERRNUM,ERRSEV) C occurrences of a particular error, or terminate C if more than 10 errors of a particular severity C occur. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER ERRNUM,ERRSEV -C -C + C COMPUTER DEPENDENT COMMON VARIABLES AND CONSTANTS. include 'vcpstc.blk' -C + C flush buffer before we do a write CALL VDBUFL -C + C WRITE THE ERROR TO THE LISTING. WRITE(KWRTFL,10)ERRNUM,ERRSEV 10 FORMAT(' SVDI ERROR NUMBER ',I5,' SEVERITY CODE ',I5) -C + C TRACEBACK. csam CALL PSTTBK -C + RETURN END SUBROUTINE VDMONI(ISTATE) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDMONI -Logs Usage Information.. -C -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -ISTATE = 0 - initialization C 1 - new page C 2 - terminate -C + C CALLS -C + C EXIT CONDITIONS - -C + C NARRATIVE -For ISTATE=0, job information is initialized, and C timers are initialized called by VIINIT. C ISTATE=1 will increment a common block page @@ -1104,16 +1101,16 @@ SUBROUTINE VDMONI(ISTATE) C Entry point VBDEV has an 8 character parameter C which will set a common block variable specifying C the device being used. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C dummy routine -C + CHARACTER*(*) C1,C2 -C + RETURN C Usage Monitoring Information -C + ENTRY VBPKG (C1) RETURN ENTRY VBDEV (C2) @@ -1127,106 +1124,106 @@ SUBROUTINE VDMONI(ISTATE) END SUBROUTINE VDMOVA(X,Y) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDMOVA -Move Absolute. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -X,Y = real NDC position. -C + C CALLS -VIMOVA -C + C EXIT CONDITIONS - -C + C NARRATIVE -Set current position to absolute NDC position X,Y. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL X,Y -C + C THIS IS JUST A DUMMY ROUTINE WHICH DOES NOTHING BUT CALL VIMOVA. C THIS ORGANIZATION FACILITATES ADDING SECURITY MARKINGS TO SVDI. CALL VIMOVA(X,Y) -C + RETURN END SUBROUTINE VDNWPG C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDNWPG -New Page. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS - -C + C CALLS -VINWPG. -C + C EXIT CONDITIONS - -C + C NARRATIVE -Physically advance the medium or clear the screen, C whichever is appropriate. Also flood the screen C with the background color on devices that support C this function. The current position is not changed. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C THIS IS JUST A DUMMY ROUTINE WHICH DOES NOTHING BUT CALL VINWPG. C THIS ORGANIZATION FACILITATES ADDING SECURITY MARKINGS TO SVDI. CALL VINWPG -C + RETURN END SUBROUTINE VDPNTA(X,Y) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDPNTA -Point Absolute. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -X,Y = real NDC position. -C + C CALLS -VIPNTA. -C + C EXIT CONDITIONS - -C + C NARRATIVE -Set current position to absolute NDC position X,Y C and put a visible point there. Attributes C foreground color and intensity apply. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL X,Y -C + C THIS IS JUST A DUMMY ROUTINE WHICH DOES NOTHING BUT CALL VIPNTA. C THIS ORGANIZATION FACILITATES ADDING SECURITY MARKINGS TO SVDI. CALL VIPNTA(X,Y) -C + RETURN END SUBROUTINE VDPOLY(XARRAY,YARRAY,NPTS) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDPOLY -POLYGON FILL ROUTINE -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS -XARRAY-ARRAY OF X VALUES OF THE POLYGON C YARRAY-CORRESPONDING ARRAY OF Y VALUES C NPTS- NUMBER OF POINTS IN (XARRAY,YARRAY) -C + C CALLS -VIPOLY -C + C EXIT CONDITIONS - -C + C NARRATIVE -The polygon defined by XARRAY,YARRAY will be drawn C and filled (constrained by any limitations of the C physical device -- see below). No checking will be @@ -1235,11 +1232,11 @@ SUBROUTINE VDPOLY(XARRAY,YARRAY,NPTS) C boundary is drawn using the solid line style. C VDI will close the polygon (i.e. the last point C will be connected to the first). -C + C The level of support for this primitive is device- C dependent. The level of support is categorized C as follows: -C + C Level 0 -- no polygon fill. Only the polygon C boundary is drawn. C Level 1 -- the device fills convex polygons. @@ -1252,43 +1249,43 @@ SUBROUTINE VDPOLY(XARRAY,YARRAY,NPTS) C is drawn to that point from a point far outside C the polygon, that line intersects the polygon C boundary an odd number of times. -C + C Note that the level of support for a particular device C can be inquired using the function VDIQDC. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER NPTS REAL XARRAY(NPTS),YARRAY(NPTS) -C + C THIS IS JUST A DUMMY ROUTINE WHICH DOES NOTHING BUT CALL VIPOLY. C THIS ORGANIZATION FACILITATES ADDING SECURITY MARKINGS TO SVDI. C mopoly controls polygon fill =0, on ; =1, off C mocolr controls color =0, on ; =1, off COMMON /VCPSTB/ MOPOLY, MOCOLR -C + IF(MOPOLY.EQ.0) THEN CALL VIPOLY(XARRAY,YARRAY,NPTS) END IF -C + RETURN END SUBROUTINE VDSTOS(ATTARR) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDSTOS -Set Output Status (of Attributes). -C + C K.M. ERICKSON -14 NOV 80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -ATTARR = real array of attribute values. -C + C CALLS -VDSTBC,VDSTCS,VDSTFC,VDSTIN,VDSTLS,VDSTLW -C + C EXIT CONDITIONS -VECTOR = real updated attribute values (ATTARR). -C + C NARRATIVE -Set the attribute values from ATTARR as given below. C ATTARR(1)=Foreground Color C (2)=Background Color @@ -1296,11 +1293,11 @@ SUBROUTINE VDSTOS(ATTARR) C (4)=Line Style C (5)=Line Width C (6)=Character Box Y -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL ATTARR(6) -C + C CURRENT ATTRIBUTE VALUES. (DEVICE-INDEPENDENT) REAL VECTOR(7) COMMON /VCATTR/ VECTOR @@ -1311,7 +1308,7 @@ SUBROUTINE VDSTOS(ATTARR) C (5)=LINE WIDTH C (6)=CHARACTER BOX Y C (7)=CHARACTER BOX X -C + C CALL EACH OF THE INDIVIDUAL ATTRIBUTE SETTING ROUTINES. C CHECK FOR VALIDITY OF INPUT VALUES WILL BE DONE IN EACH INDIVIDUAL C ROUTINE. @@ -1321,56 +1318,56 @@ SUBROUTINE VDSTOS(ATTARR) CALL VDSTLS(NINT(ATTARR(4))) CALL VDSTLW(ATTARR(5)) c CALL VDSTCS(ATTARR(6)) -C + RETURN END SUBROUTINE VDTERM C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDTERM -Terminate SVDI. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS - -C + C CALLS -VITERM. -C + C EXIT CONDITIONS - -C + C NARRATIVE -Terminate the SVDI by flushing buffers, etc. This C should be the last SVDI call made. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C THIS IS JUST A DUMMY ROUTINE WHICH DOES NOTHING BUT CALL VITERM. C THIS ORGANIZATION FACILITATES ADDING SECURITY MARKINGS TO SVDI. CALL VITERM -C + RETURN END SUBROUTINE VDTEXT(LENGTH,CHARS) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDTEXT -Text from Array. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -LENGTH = integer number of characters in CHARS. C Range 1-136. C CHARS = integer array of ASCII characters, one C character per array element, right justified. C Range 8,10,32-126. -C + C CALLS -VITEXT. -C + C EXIT CONDITIONS - -C + C NARRATIVE -Draw LENGTH characters in CHARS, starting at C current position and update current position to C the point after the last character box where the @@ -1383,178 +1380,176 @@ SUBROUTINE VDTEXT(LENGTH,CHARS) C considered reasonable. Attributes foreground color, C background color, intensity, and character size C apply. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER LENGTH,CHARS(136) -C + C THIS IS JUST A DUMMY ROUTINE WHICH DOES NOTHING BUT CALL VITEXT. C THIS ORGANIZATION FACILITATES ADDING SECURITY NARKINGS TO SVDI. CALL VITEXT(LENGTH,CHARS) -C + RETURN END SUBROUTINE VDFRAM(ITYPE) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDFRAM - Draw header or trailer frame -C + C P. Watterberg - 27 Aug 81 -C + C ENVIRONMENT -Computer-independent, system-independent, FORTRAN 77 -C + C ENTRY CONDITIONS - ITYPE = 0 for header frame C = 1 for trailer frame -C + C CALLS - VIFRAM -C + C EXIT CONDITIONS - -C + C NARRATIVE - Calls vifram to get time and date from the C system via the computer-dependent routine PSTTOD(entry C point in PSTJOB) and writes it on an identification frame. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER ITYPE -C + CALL VIFRAM(ITYPE) RETURN END SUBROUTINE VIFRAM(ITYPE) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VIFRAM - Draw header or trailer frame -C + C P. Watterberg - 27 Aug 81 -C + C ENVIRONMENT -Computer-independent, system-independent, FORTRAN 77 -C + C ENTRY CONDITIONS - ITYPE = 0 for header frame C = 1 for trailer frame -C + C CALLS - -C + C EXIT CONDITIONS - -C + C NARRATIVE -NULL ROUTINE -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER ITYPE -C + RETURN END SUBROUTINE VDAABU(BTNNUM) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDAABU -Await Any Button. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Batch Devices. -C + C ENTRY CONDITIONS - -C + C CALLS - -C + C EXIT CONDITIONS -BTNNUM = integer number of the button pressed. C Range 1 to a device dependent maximum which must be C at least 8. -C + C NARRATIVE -When a button has been pressed, its integer button C number is returned in BTNNUM. This function flushes C the button buffer, if any. This function flushes C the output buffers before doing input. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER BTNNUM -C -C + C COMPUTER DEPENDENT COMMON VARIABLES AND CONSTANTS. include 'vcpstc.blk' -C + C BATCH DEVICES DON'T NEED TO FLUSH BUFFERS. -C + BTNNUM=32 -C + RETURN END SUBROUTINE VDABGL(BTNNUM,X,Y) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDABGL -Await Button, Get Locator. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Batch Devices. -C + C ENTRY CONDITIONS - -C + C CALLS - -C + C EXIT CONDITIONS -BTNNUM = integer number of the button pressed. C Range 1 to a device dependent maximum that must be C at least 8. C X,Y = real NDC position of the locator. -C + C NARRATIVE -Wait until a button is hit, then return the number C of the button in BTNNUM and the NDC value of the C locator in X,Y. This function flushes the output C buffers before doing input. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL X,Y INTEGER BTNNUM -C -C + C COMPUTER DEPENDENT COMMON VARIABLES AND CONSTANTS. include 'vcpstc.blk' -C + C BATCH DEVICES DON'T NEED TO FLUSH BUFFERS. -C + BTNNUM=32 X=0 Y=0 -C + RETURN END SUBROUTINE VDAKGL(CHAR,X,Y) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDAKGL -Await Keyboard, Get Locator. -C + C R.W.SIMONS -02DEC80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Batch Devices. -C + C ENTRY CONDITIONS - -C + C CALLS - -C + C EXIT CONDITIONS -CHAR = integer ASCII character input from the C keyboard, right-justified, zero fill. Range 32-126. C X,Y = real NDC position of the locator. -C + C NARRATIVE -Wait until a key is hit, then return the character C entered in CHAR and the NDC value of the locator C in X,Y. If the character entered does not fall in C the range 32-126, a blank(32) is returned in CHAR. C This function flushes the output buffers before C doing input. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL X,Y INTEGER CHAR -C + C dummy routine -C + CHAR=32 X=0. Y=0. @@ -1562,20 +1557,20 @@ SUBROUTINE VDAKGL(CHAR,X,Y) END SUBROUTINE VDALOC(X,Y) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDALOC -Await Locator. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Batch Devices. -C + C ENTRY CONDITIONS - -C + C CALLS - -C + C EXIT CONDITIONS -X,Y = real NDC position of the locator. -C + C NARRATIVE -Wait until the locator is positioned, then return C the NDC value of the locator in X,Y. The fact that C the locator is positioned can be signaled in a @@ -1586,150 +1581,149 @@ SUBROUTINE VDALOC(X,Y) C function, as only the locator position is returned. C This function flushes the output buffers before C doing input. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL X,Y -C -C + C COMPUTER DEPENDENT COMMON VARIABLES AND CONSTANTS. include 'vcpstc.blk' -C + C BATCH DEVICES DON'T NEED TO FLUSH BUFFERS. -C + X=0 Y=0 -C + RETURN END SUBROUTINE VDBELL C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDBELL -Ring Bell -C + C R.W.SIMONS -02DEC80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Batch Devices. -C + C ENTRY CONDITIONS - -C + C CALLS - -C + C EXIT CONDITIONS - -C + C NARRATIVE -Ring user's bell to get his attention. This C function is ignored by batch devices. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C THIS FUNCTION IS IGNORED BY BATCH DEVICES. -C + RETURN END SUBROUTINE VDBUFL C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDBUFL -Buffer Flush. -C + C R.W.Simons -19DEC80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Batch Devices. -C + C ENTRY CONDITIONS - -C + C CALLS - -C + C EXIT CONDITIONS - -C + C NARRATIVE -Assure that the picture is up-to-date by flushing C buffers if necessary. Also prepare the device to C operate in alphanumeric (as opposed to graphic) C mode. This is necessary on some devices so that C alphanumeric data from FORTRAN I/O won't be C misinterpreted as graphic data. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C THIS FUNCTION IS IGNORED BY BATCH DEVICES. -C + RETURN END SUBROUTINE VDSTLA(LOCX,LOCY) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDSTLA -Set Initial Locator Position. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Batch Devices. -C + C ENTRY CONDITIONS -LOCX,LOCY = real NDC position that the locator is C initilaized to. -C + C CALLS - -C + C EXIT CONDITIONS - -C + C NARRATIVE -Set the initial locator position (light pen tracking C cross, for example) each time this function is C called. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL LOCX,LOCY -C + C BATCH DEVICES IGNORE THIS FUNCTION. -C + RETURN END SUBROUTINE VDWAIT C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDWAIT -Wait for User. -C + C R.W.SIMONS -02DEC80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Batch Devices. -C + C ENTRY CONDITIONS - -C + C CALLS - -C + C EXIT CONDITIONS - -C + C NARRATIVE -Wait for the user to view the screen and signal he C is done, normally by hitting any key. This function C flushes the output buffers before doing input. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C BATCH DEVICES IGNORE THIS COMMAND. -C + RETURN END SUBROUTINE VDIQCO(NUM,INDEX,CLRARY,CLRMOD) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C +C C VDIQCO -Inquire Color Table. -C +C C R.W.Simons -08APR81 C H. S. LAUSON 29MAY86 - changed for current HLS interpretation -C +C C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Black and White Devices. (LXY, HC1, ALP) -C +C C ENTRY CONDITIONS -NUM = integer number of color indexes to inquire. C Range 1-256. C INDEX = integer array of indexes to inquire. Range C 0-255. C CLRMOD = integer color model to be used. Range 0,1. -C +C C CALLS -VBERRH -C +C C EXIT CONDITIONS -CLRARY = real array of 3 by NUM elements returning C the values of the components of the indexes inquired. C Range for RGB: red 0.0-1.0 @@ -1738,7 +1732,7 @@ SUBROUTINE VDIQCO(NUM,INDEX,CLRARY,CLRMOD) C Range for HLS: hue 0.0-360.0 C lightness 0.0-1.0 C saturation 0.0-1.0 -C +C C NARRATIVE -Inquire one or more color table entries. NUM and C INDEX specify how many and which indexes are being C inquired. CLRMOD specifies which color model @@ -1747,28 +1741,28 @@ SUBROUTINE VDIQCO(NUM,INDEX,CLRARY,CLRMOD) C support a color table index specified will C return -1.0 in the first element of the CLRARY value C for that index. -C +C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C +C INTEGER NUM,INDEX(NUM),CLRMOD REAL CLRARY(3,NUM) -C +C COMMON /PCOLST/ PCOLS(3,256) -C +C C CHECK FOR VALID NUM. IF(NUM.LT.1.OR.NUM.GT.256) THEN CALL VBERRH(723,5) GOTO 999 END IF -C +C C CHECK FOR VALID CLRMOD. IF(CLRMOD.NE.0.AND.CLRMOD.NE.1) THEN CALL VBERRH(725,5) GOTO 999 END IF -C +C IF(CLRMOD.NE.0) STOP 'HLS COLORS NOT SUPPORTED' -C +C C CHECK FOR VALID INDEXES. DO I=1,NUM INDEXN=INDEX(I) @@ -1781,58 +1775,58 @@ SUBROUTINE VDIQCO(NUM,INDEX,CLRARY,CLRMOD) CLRARY(3,I)=PCOLS(3,INDEXN) 100 continue end do -C +C 999 RETURN END SUBROUTINE VDIQCP(X,Y) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDIQCP -Inquire Where Current Position Is. -C + C R.W.Simons -02DEC80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Devices that support a software CP. C (AP5,GER,H50,HC1,HCB,HPP,I10,I30,LXY,QCR,QMS,XYN) -C + C ENTRY CONDITIONS - -C + C CALLS - -C + C EXIT CONDITIONS -X,Y = real NDC position. -C + C NARRATIVE -Return the value of current position. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C CURRENT POSITION. REAL XCP,YCP COMMON /VCCRPS/ XCP,YCP -C + C ASSIGN THE CP TO X,Y. X=XCP Y=YCP -C + RETURN END SUBROUTINE VDSTBC(COLOR) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDSTBC -Set Background Color. -C + C R.W.Simons -05DEC80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Devices with a constant white background. (LXY, C HC1, ALP) -C + C ENTRY CONDITIONS -COLOR = integer color table index. Range 0-255. C Default: device dependent, in range 0-7. -C + C CALLS -VBERRH -C + C EXIT CONDITIONS -VECTOR(2) = real updated background color (COLOR). -C + C NARRATIVE -Set the background color for following VDNWPG or C TEXT primitives for devices supporting these C features. For example, many raster devices support @@ -1843,11 +1837,11 @@ SUBROUTINE VDSTBC(COLOR) C dependent value in the range 0-7. C If an unsupported value is specified, set to C default. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER COLOR -C + C CURRENT ATTRIBUTE VALUES. (DEVICE-INDEPENDENT) REAL VECTOR(7) COMMON /VCATTR/ VECTOR @@ -1858,29 +1852,29 @@ SUBROUTINE VDSTBC(COLOR) C (5)=LINE WIDTH C (6)=CHARACTER BOX Y C (7)=CHARACTER BOX X -C + C CHECK FOR VALID COLOR. IF(COLOR.LT.0.OR.COLOR.GT.255) THEN CALL VBERRH(724,5) GOTO 999 END IF -C + C ONLY THE SINGLE BACKGROUND COLOR 7 (WHITE) IS SUPPORTED, C SO NO ACTION IS NECESSARY. -C + vector(2) = color 999 RETURN END SUBROUTINE VDSTCO(NUM,INDEX,CLRARY,CLRMOD) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDSTCO -Set Color Table. -C + C R.W.SIMONS -02DEC80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Black and White Devices. (LXY, HC1, ALP) -C + C ENTRY CONDITIONS -NUM = integer number of color indexes to be set. C Range 1-256. C INDEX = integer array of indexes to be set. Range @@ -1906,11 +1900,11 @@ SUBROUTINE VDSTCO(NUM,INDEX,CLRARY,CLRMOD) C 7 white 1.,1.,1. C CLRMOD = integer color model being used. Range 0,1. C Default: 0 (RGB). -C + C CALLS -VBERRH -C + C EXIT CONDITIONS - -C + C NARRATIVE -Set one or more color table entries. This is a C dynamic setting, if the device will support it. C "Dynamic" neans that primitives which have already @@ -1933,36 +1927,36 @@ SUBROUTINE VDSTCO(NUM,INDEX,CLRARY,CLRMOD) C All devices must support at least a single device C dependent INDEX value in the range 0-7. If an C unsupported value is specified, it should be ignored. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER NUM,INDEX(NUM),CLRMOD REAL CLRARY(3,NUM) CHARACTER*6 KOLIND CHARACTER*20 KOLCOM COMMON /VCVEC1/ IVECT INTEGER IVECT -C + C ARRAY TO CONTAIN COMPLETE COLOR TABLE -C + COMMON /PCOLST/ PCOLS(3,256) -C + C mopoly controls polygon fill =0, on ; =1, off C mocolr controls color =0, on ; =1, off COMMON /VCPSTB/ MOPOLY, MOCOLR -C + C CHECK FOR VALID NUM. IF(NUM.LT.1.OR.NUM.GT.256) THEN CALL VBERRH(723,5) GOTO 999 END IF -C + C CHECK FOR VALID CLRMOD. IF(CLRMOD.NE.0.AND.CLRMOD.NE.1) THEN CALL VBERRH(725,5) GOTO 999 END IF -C + C CHECK FOR VALID INDEXES. DO 100 I=1,NUM INDEXN=INDEX(I) @@ -1981,19 +1975,19 @@ SUBROUTINE VDSTCO(NUM,INDEX,CLRARY,CLRMOD) CALL VBERRH(727,5) GOTO 100 END IF -C + C 256 INDEXES ARE SUPPORTED: DO IC=1,3 PCOLS(IC,INDEXN+1)=CLRARY(IC,I) end do -C + C define symbol for color reference -C + IF(MOCOLR.NE.0) GO TO 390 -C + C if a set of vectors was in process, issue stroke command C to draw them - then start a new path. -C + IF(IVECT.NE.0) THEN CALL PSTBUF(2,'s ') IVECT=0 @@ -2027,32 +2021,32 @@ SUBROUTINE VDSTCO(NUM,INDEX,CLRARY,CLRMOD) CALL VBERRH(727,5) GOTO 100 END IF -C + C 256 INDEXES ARE SUPPORTED: STOP 'HLS COLORS NOT AVAILABLE' END IF 100 CONTINUE -C + 999 RETURN END SUBROUTINE VDSTFC(COLOR) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDSTFC -Set Foreground Color. -C + C R.W.Simons -05DEC80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Devices with a constant black foreground. (LXY, C HC1) -C + C ENTRY CONDITIONS -COLOR = integer color table index . Range 0-255. C Default is device dependent, in range 0-7. -C + C CALLS -VBERRH -C + C EXIT CONDITIONS -VECTOR(1) = real updated foreground color (COLOR). -C + C NARRATIVE -Set the foreground color index, i.e., the color C table index used for drawing future primitives. C Color is an integer from 0-255 which is used as an @@ -2061,16 +2055,16 @@ SUBROUTINE VDSTFC(COLOR) C dependent value in the range 0-7. C If an unsupported value is specified, set to C default. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER COLOR CHARACTER*5 KOLIND -C + C ARRAY TO CONTAIN COMPLETE COLOR TABLE -C + COMMON /PCOLST/ PCOLS(3,256) -C + C pstmlw controls minimum line width C kpstbg controls background coloring C = 0, not colored (white ground from paper) @@ -2079,11 +2073,11 @@ SUBROUTINE VDSTFC(COLOR) C = 0, no interchange C = 1, colors interchanged COMMON /VCPSTA/ PSTMLW, KPSTBG, KPSTCI -C + C mopoly controls polygon fill =0, on ; =1, off C mocolr controls color =0, on ; =1, off COMMON /VCPSTB/ MOPOLY, MOCOLR -C + COMMON /VCVEC1/ IVECT INTEGER IVECT C CURRENT ATTRIBUTE VALUES. (DEVICE-INDEPENDENT) @@ -2096,17 +2090,16 @@ SUBROUTINE VDSTFC(COLOR) C (5)=LINE WIDTH C (6)=CHARACTER BOX Y C (7)=CHARACTER BOX X -C C CHECK FOR VALID COLOR. IF(COLOR.LT.0.OR.COLOR.GT.255) THEN CALL VBERRH(724,5) GO TO 999 END IF -C + VECTOR(1)=COLOR IF(MOCOLR.EQ.0) THEN -C + C draw any vectors in stack before changing colors IF(IVECT.NE.0) THEN CALL PSTBUF(4,'s r ') @@ -2115,7 +2108,7 @@ SUBROUTINE VDSTFC(COLOR) CALL PSTBUF(0,' ') IVECT=0 END IF -C + C code using symbols KOLIND='c' IF(COLOR.LE.9) THEN @@ -2138,27 +2131,27 @@ SUBROUTINE VDSTFC(COLOR) NNN=5 END IF CALL PSTBUF(NNN,KOLIND(1:NNN)) -C + END IF 999 RETURN END SUBROUTINE VDSTIN(INTEN) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDSTIN -Set Intensity. -C + C R.W.Simons -05DEC80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Single Intensity Devices. (LXY, HC1) -C + C ENTRY CONDITIONS -INTEN = real intensity of the image of an output C primitive. Range 0.-1. Default: device dependent. -C + C CALLS - -C + C EXIT CONDITIONS -VECTOR(3) = real updated intensity (INTEN). -C + C NARRATIVE -Set the intensity value indicated for future C primitives. Intensity is a real value between 0 C (not visible) and 1 (maximum). Intensities are @@ -2166,11 +2159,11 @@ SUBROUTINE VDSTIN(INTEN) C All devices must support at least a single value: C 1.0. If an unsupported value is specified, set to C the closest supported intensity. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL INTEN -C + C CURRENT ATTRIBUTE VALUES. (DEVICE-INDEPENDENT) REAL VECTOR(7) COMMON /VCATTR/ VECTOR @@ -2181,39 +2174,38 @@ SUBROUTINE VDSTIN(INTEN) C (5)=LINE WIDTH C (6)=CHARACTER BOX Y C (7)=CHARACTER BOX X -C + C CHECK FOR VALID INTEN. IF(INTEN.LT.0.0.OR.INTEN.GT.1.0) THEN CALL VBERRH(401,5) GOTO 999 END IF -C + C ONLY THE SINGLE INTENSITY 1.0 (MAXIMUM) IS SUPPORTED, C SO NO ACTION IS NECESSARY. -C + 999 RETURN END SUBROUTINE VITERM C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VITERM -TERMINATE. -C + C D.L. CAMPBELL -1-DEC-1986 C J.P. LONG -9-NOV-1987 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS - -C + C CALLS - -C + C EXIT CONDITIONS - -C + C NARRATIVE -Terminate graphics device. Close output file. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C -C + C COMPUTER DEPENDENT COMMON VARIABLES AND CONSTANTS. include 'vcpstc.blk' COMMON /VCPAGE/ TOTPAG @@ -2222,7 +2214,7 @@ SUBROUTINE VITERM C mopoly controls polygon fill =0, on ; =1, off C mocolr controls color =0, on ; =1, off COMMON /VCPSTB/ MOPOLY, MOCOLR -C + C put out the last page and restore postscript environment so C nothing is left on the stack CALL VINWPG @@ -2248,78 +2240,77 @@ SUBROUTINE VITERM C CLOSE OUTPUT FILE CALL PSTCFS(KOUTFL,1) CALL VDMONI(2) -C + RETURN END SUBROUTINE VIMOVA(X,Y) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VIMOVA -Move Absolute. -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS -X,Y = real NDC position. -C + C CALLS - -C + C EXIT CONDITIONS -XCP,YCP = real updated current position. (X,Y) -C + C NARRATIVE -Set current position to absolute NDC position X,Y. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL X,Y -C -C + C move CALL VBVECT(0,X,Y) -C + RETURN END SUBROUTINE VIPNTA(X,Y) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VIPNTA -Point Absolute. -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS -X,Y = real NDC position. -C + C CALLS -VIMOVA,VILINA -C + C EXIT CONDITIONS - -C + C NARRATIVE -Set current position to absolute NDC position X,Y C and put a visible point there. Attributes C foreground color and intensity apply. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL X,Y -C + CALL VIMOVA(X,Y) CALL VILINA(X,Y) -C + RETURN END SUBROUTINE VIPOLY(XARRAY,YARRAY,NPTS) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VIPOLY -POLYGON FILL ROUTINE -C + C D.L. CAMPBELL -1-DEC-1986 C J.P. LONG -9-NOV-1987 -C + C ENVIRONMENT -Fortran77, QMS -C + C ENTRY CONDITIONS -XARRAY-ARRAY OF X VALUES OF THE POLYGON C YARRAY-CORRESPONDING ARRAY OF Y VALUES C NPTS- NUMBER OF POINTS IN (XARRAY,YARRAY) -C + C CALLS - -C + C EXIT CONDITIONS - -C + C NARRATIVE -The polygon defined by XARRAY,YARRAY will be drawn C and filled (constrained by any limitations of the C physical device -- see below). No checking will be @@ -2328,11 +2319,11 @@ SUBROUTINE VIPOLY(XARRAY,YARRAY,NPTS) C boundary is drawn using the solid line style. C VDI will close the polygon (i.e. the last point C will be connected to the first). -C + C The level of support for this primitive is device- C dependent. The level of support is categorized C as follows: -C + C Level 0 -- no polygon fill. Only the polygon C boundary is drawn. C Level 1 -- the device fills convex polygons. @@ -2345,18 +2336,18 @@ SUBROUTINE VIPOLY(XARRAY,YARRAY,NPTS) C is drawn to that point from a point far outside C the polygon, that line intersects the polygon C boundary an odd number of times. -C + C Note that the level of support for a particular device C can be inquired using the function VDIQDC. -C + ******************************************************************************** -C + C The level for this device is level 2. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL XARRAY(NPTS),YARRAY(NPTS) -C + C ESCAPE FLAGS C PATNO AND BORDER USED BY VIPOLY FOR PATTERN FILL AND BORDER ON/OFF. DEFAULT C COMPLETE FILL AND BORDER ON @@ -2376,25 +2367,25 @@ SUBROUTINE VIPOLY(XARRAY,YARRAY,NPTS) COMMON /VCVEC2/ COORD, LSTCRD CHARACTER COORD*20, LSTCRD*20 INTEGER IVECT -C + C mopoly controls polygon fill =0, on ; =1, off C mocolr controls color =0, on ; =1, off COMMON /VCPSTB/ MOPOLY, MOCOLR -C + C CHECK FOR VALID N IF (NPTS.LT.1 .OR. NPTS.GT.1490) THEN CALL VBERRH(802,5) GO TO 999 END IF -C + C IF A SET OF VECTORS WAS IN PROCESS, ISSUE STROKE COMMAND TO DRAW THEM C Start a new path. -C + IF(IVECT.NE.0) THEN CALL PSTBUF(2,'s ') IVECT=0 END IF -C + CALL PSTBUF(2,'r ') CALL PSTBUF(0,' ') CALL PSTBUF(4,'v o ') @@ -2405,20 +2396,20 @@ SUBROUTINE VIPOLY(XARRAY,YARRAY,NPTS) CALL VDSTFC(NINT(VECTOR(1))) END IF CALL PSTBUF(0,' ') -C + C DRAW POLYGON VECTORS -C + C MOVE TO FIRST POINT CALL VIMOVA(XARRAY(1),YARRAY(1)) -C + C CALL VDLINA TO DRAW POINTS FROM 1ST POINT TO NTH POINT DO 100 I=2,NPTS CALL VILINA(XARRAY(I),YARRAY(I)) 100 CONTINUE -C + C THEN DRAW A LINE TO THE FIRST POINT TO CLOSE THE POLYGON CALL VILINA(XARRAY(1),YARRAY(1)) -C + C CLOSE THE POLYGON, GRAPHICS SAVE, FILL IT, GRAPHICS RESTORE, STROKE C TO PROVIDE THE SAME FILLED AREA AS IF IT WERE FILLED WITH VECTORS C THEN RESTORE AND SAVE POSTSCRIPT ENVIRONMENT TO AVOID INPUT BUFFER OVERFLOW @@ -2434,48 +2425,48 @@ SUBROUTINE VIPOLY(XARRAY,YARRAY,NPTS) c CALL VDSTCS(VECTOR(6)) END IF CALL PSTBUF(0,' ') -C + C INIT THE CURRENT POSITION WITHIN POSTSCRIPT CALL VDMOVA(XARRAY(NPTS),YARRAY(NPTS)) IVECT=0 -C + 999 RETURN END SUBROUTINE VINWPG C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VINWPG -New Page. -C + C D.L. CAMPBELL -1-DEC-1986 C J.P. LONG -9-NOV-1987 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS - -C + C CALLS - -C + C EXIT CONDITIONS - -C + C NARRATIVE -Physically advance the medium or clear the screen, C whichever is appropriate. Also flood the screen C with the background color on devices that support C this. The current position is not changed. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + COMMON /VCVEC1/ IVECT COMMON /VCVEC2/ COORD,LSTCRD -C + C vcpstd variables control what to do with empty frames with C command is received to dump data to output C kempty=0, frame is void - do not draw C >0, frame has data - draw it COMMON /VCPSTD/ KEMPTY -C + CHARACTER COORD*20, LSTCRD*20 CHARACTER*10 KPAGE -C + C pstmlw controls minimum line width C kpstbg controls background coloring C = 0, not colored (white ground from paper) @@ -2495,52 +2486,52 @@ SUBROUTINE VINWPG C (5)=LINE WIDTH C (6)=CHARACTER BOX Y C (7)=CHARACTER BOX X -C + COMMON /VCPAGE/ TOTPAG INTEGER TOTPAG DATA NPAGE /0/ -C + C check for void page draw request C if nothing is on page, skip request -C + NPAGE=NPAGE+1 TOTPAG = NPAGE WRITE(KPAGE,'(I10)',ERR=345) NPAGE GO TO 349 345 KPAGE=' ???' 349 IF(KEMPTY.EQ.0) GO TO 350 -C + C stroke the path in case there are any vectors and show text CALL PSTBUF(2,'s ') IVECT=0 -C + C showpage and restore postscript environment to avoid buffer overflow C flush buffer because save and restore won't work back-to-back -C + CALL PSTBUF(4,'p r ') CALL PSTBUF(0,' ') -C + C comment frame number in output file -C + CALL PSTBUF(31,'%%Page: "'//KPAGE//'" '//KPAGE) CALL PSTBUF(0,' ') CALL PSTBUF(28, '%%PageOrientation: Landscape') CALL PSTBUF(0,' ') CALL PSTBUF(32, '%%PageBoundingBox: 36 30 574 750') CALL PSTBUF(0,' ') -C + CALL PSTBUF(4,'v o ') CALL VDMONI(1) -C + C shade background if appropriate -C + IF(KPSTBG.NE.0) THEN CALL PSTBBG END IF GO TO 370 -C + C void frame -- First Page -C + 350 CALL PSTBUF(2, 'r ') CALL PSTBUF(0,' ') CALL PSTBUF(31,'%%Page: "'//KPAGE//'" '//KPAGE) @@ -2550,43 +2541,42 @@ SUBROUTINE VINWPG CALL PSTBUF(32, '%%PageBoundingBox: 36 30 574 750') CALL PSTBUF(0,' ') CALL PSTBUF(4, 'v o ') -C + 370 CALL VDSTLW(VECTOR(5)) c CALL VDSTCS(VECTOR(6)) CALL VDSTFC(NINT(VECTOR(1))) CALL PSTBUF(0,' ') KEMPTY=0 -C + RETURN END SUBROUTINE VDESCP(ESCPCD,N,ARGS) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDESCP -Escape Code Routine. -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS -ESCPCD = integer escape function code. C N = integer number of arguments in ARG. RANGE >=0. C ARGS = real array of arguments for the escape C function specified. -C + C CALLS - -C + C EXIT CONDITIONS - -C + C NARRATIVE -Invoke the nonstandard, device-dependent function C ESCPCD. N is the number of arguments used by this C function and ARGS is a real array containing those C arguments. Unsupported values of ESCPCD are C ignored, not causing an error. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER ESCPCD,N REAL ARGS(*) -C C COMPUTER DEPENDENT COMMON VARIABLES AND CONSTANTS. include 'vcpstc.blk' C SCALE FACTORS FOR NDC TO DC MAPPING. (LXY,HC1) @@ -2595,18 +2585,18 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) C DC DIMENSIONS OF OFFSETS AND PICTURE. (LXY,HC1) INTEGER XPAD,YPAD,XDEVIC,YDEVIC COMMON /VCDDIM/ XPAD,YPAD,XDEVIC,YDEVIC -C + C USED BY VIPOLY FOR PATTERN FILL AND BORDER ON/OFF. DEFAULT COMPLETE FILL C AND BORDER ON. PLC. COMMON/VCESCP/PGFORM,PATNO,BORDER INTEGER PGFORM,PATNO,BORDER -C + C CHECK FOR VALID N. IF(N.LT.0) THEN CALL VBERRH(802,5) GOTO 999 END IF -C + C 2100 - PAGE FORMAT (0=LANDSCAPE,1=PORTRAIT) IF (ESCPCD.EQ.2100) THEN IF (ARGS(1).EQ.0) THEN @@ -2614,9 +2604,9 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) ELSE PGFORM=1 ENDIF -C + C set output format -C + ELSEIF (ESCPCD.EQ.2101) THEN CALL PSTSEL('1') ELSEIF (ESCPCD.EQ.2102) THEN @@ -2638,68 +2628,65 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) ELSEIF (ESCPCD.EQ.2110) THEN CALL PSTSEL('10') ENDIF -C + 999 RETURN END SUBROUTINE VILINA (X,Y) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VILINA -C + C D.L. CAMPBELL -1-DEC-1986 C J.P. LONG -9-NOV-1987 -C + C ENVIRONMENT -DEVICE DEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS -X,Y REAL NDC COORDINATES -C + C CALLS - -C + C EXIT CONDITIONS -CURRENT POSITION IS SET -C -C + C NARRATIVE C LINE-DRAW A LINE FROM CP TO ABSOLUTE NDC POSITION X,Y C AND UPDATE CP . ATTRIBUTES COLOR,INTEN,LINSTY AND C LINWTH APPLY. -C -C + C OTHER VARIABLES: C XCP,YCP-NDC COORDINATES C*************************************************************************** -C + REAL X,Y -C + C vcpstd variables control what to do with empty frames with C command is received to dump data to output C kempty=0, frame is void - do not draw C >0, frame has data - draw it COMMON /VCPSTD/ KEMPTY -C -C + C draw ENTRY VBLINA(X,Y) CALL VBVECT(1,X,Y) KEMPTY=1 -C + RETURN END SUBROUTINE VBVECT(IPEN,X,Y) C**************************************************** C vbvect - do move or draw to x,y (depending on ipen) -C + C ipen = 0 for move, 1 for draw C x,y = NDC coordinates to be moved/drawn to -C + C****************************************************** -C + REAL X,Y,XOFF,YOFF CHARACTER CTEMP*20,XCOORD*4,YCOORD*4 -C + C mopoly controls polygon fill =0, on ; =1, off C mocolr controls color =0, on ; =1, off COMMON /VCPSTB/ MOPOLY, MOCOLR -C + C SCALE FACTORS FOR NDC TO DC MAPPING. (LXY,HC1) REAL XSCALE,YSCALE COMMON /VCSCAL/ XSCALE,YSCALE @@ -2723,15 +2710,15 @@ SUBROUTINE VBVECT(IPEN,X,Y) COMMON /VCVEC2/ COORD, LSTCRD CHARACTER COORD*20, LSTCRD*20 INTEGER IVECT -C + C compute new point in dev. coord. C convert to floating offsets XOFF=XPAD YOFF=YPAD -C + IXDC=X*XSCALE+XOFF IYDC=Y*YSCALE+YOFF -C + C write(xcoord,'(i5)')ixdc C write(ycoord,'(i5)')iydc C ...include both x,y @@ -2739,7 +2726,7 @@ SUBROUTINE VBVECT(IPEN,X,Y) CALL PSTI2C(IYDC,4,YCOORD) COORD = XCOORD(1:3)//'.'//XCOORD(4:4)//' '// 1 YCOORD(1:3)//'.'//YCOORD(4:4) -C + C pack up move/draw command, send it down C if (lstcrd(1:11) .ne. coord(1:11)) then IF (IPEN.EQ.0) THEN @@ -2752,7 +2739,7 @@ SUBROUTINE VBVECT(IPEN,X,Y) IVECT=IVECT+1 C end if lstcrd(1:11) = coord(1:11) -C + C stroke the path if we are approaching the 1500-coord pair limit C also restore and save postscript environment to avoid C input buffer overflow (must have a c/r between restore @@ -2770,34 +2757,34 @@ SUBROUTINE VBVECT(IPEN,X,Y) C reinitted the current posn IVECT=1 ENDIF -C + C UPDATE CURRENT POSITION XCP=X YCP=Y -C + RETURN END SUBROUTINE VITEXT(LENGT1,CHARS) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VITEXT - Text from Array. -C + C P. Watterberg - 24 MAR 81 C J. P. LONG - 3 DEC 87 -C + C ENVIRONMENT - COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS - LENGT1 = integer number of characters in CHARS. C Range 1-136. C CHARS = integer array of ASCII characters, one C character per array element, right justified. C Range 8,10,32-126. -C + C CALLS - vbout -C + C EXIT CONDITIONS - XCP,YCP = integer updated current position (at the end C of the string). -C + C NARRATIVE - Draw LENGT1 characters in CHARS, starting at C current position and update current position to C the point after the last character box where the @@ -2810,11 +2797,11 @@ SUBROUTINE VITEXT(LENGT1,CHARS) C considered reasonable. Attributes foreground color, C background color, intensity, and character size C apply. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER LENGT1, CHARS(136), LENGTH -C + CHARACTER CTEMP*150,STR*3 C CURRENT POSITION. REAL XCP,YCP @@ -2836,15 +2823,15 @@ SUBROUTINE VITEXT(LENGT1,CHARS) C DC DIMENSIONS OF OFFSETS AND PICTURE. (LXY,HC1) INTEGER XPAD,YPAD,XDEVIC,YDEVIC COMMON /VCDDIM/ XPAD,YPAD,XDEVIC,YDEVIC -C + C vcpstd variables control what to do with empty frames with C command is received to dump data to output C kempty=0, frame is void - do not draw C >0, frame has data - draw it COMMON /VCPSTD/ KEMPTY -C + C check for valid length. -C + call vdstcs(vector(6)) KEMPTY=1 LENGTH = LENGT1 @@ -2852,31 +2839,31 @@ SUBROUTINE VITEXT(LENGT1,CHARS) CALL VBERRH(212,5) GO TO 999 END IF -C + C if(length.gt.136) then call vberrh(213,5), and use the C maximum length of 136. -C + IF(LENGTH.GT.136) THEN CALL VBERRH(213,5) LENGTH = 136 ENDIF -C + CTEMP='(' LENOUT=1 -C + C loop through length characters. -C + DO 100 I=1,LENGTH -C + C check for valid chars. -C + C ignore control characters, except for: C 8 is backspace C 10 is linefeed C 13 is carriage return -C + IF(CHARS(I).LT.32 .OR. CHARS(I).GT.126) THEN -C + IF(CHARS(I).EQ.8) THEN DX=-VECTOR(7) DY=0. @@ -2892,9 +2879,9 @@ SUBROUTINE VITEXT(LENGT1,CHARS) CALL VBERRH(208,5) GOTO 100 ENDIF -C + C finish the string, emulate the control char, and start a new one -C + C send the buffered chars to the printer if there are any IF(LENOUT.NE.1) THEN CTEMP(LENOUT+1:150)=') t ' @@ -2903,64 +2890,63 @@ SUBROUTINE VITEXT(LENGT1,CHARS) C reset the cp from the characters XCP=XCP+(LENOUT-5)*VECTOR(7) ENDIF -C + C calculate the new current position after the control char XCP=XCP+DX YCP=YCP+DY CALL VBVECT(0,XCP,YCP) -C + C start a new string CTEMP='(' LENOUT=1 -C + ELSE -C + C Char value is 32-126 inclusive. Put \ before these: C 92 is \ C 40 is ( C 41 is ) -C + IF(CHARS(I).EQ.40.OR.CHARS(I).EQ.41.OR.CHARS(I).EQ.92) THEN CTEMP(LENOUT+1:150)='\\' LENOUT=LENOUT+1 ENDIF -C + C now pack the chars into the buffer -C + CALL PSTA2C(CHARS(I),STR) CTEMP(LENOUT+1:150)=STR(1:1) LENOUT=LENOUT+1 ENDIF -C + 100 CONTINUE -C + C send the chars to the printer -C + CTEMP(LENOUT+1:150)=') t ' LENOUT=LENOUT+4 CALL PSTBUF(LENOUT,CTEMP) -C + C reset the cp from the characters -C + XCP=XCP+(LENOUT-5)*VECTOR(7) -C + 999 RETURN END SUBROUTINE VDSTLS(LINSTY) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDSTLS -Set Line Style. -C -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS -LINSTY = integer linestyle of line drawing output C primitives. Range 0-5. Default:0. -C + C CALLS - -C + C EXIT CONDITIONS -VECTOR(4) = real updated line style (LINSTY). -C + C NARRATIVE -Set the style of line as below. This applies only C to line drawing primitives. The line styles are: C 0 - solid @@ -2972,7 +2958,7 @@ SUBROUTINE VDSTLS(LINSTY) C All devices must support at least the values 0 and C 5. If an unsupported value is specified, set to 5. C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL LW INTEGER LINSTY,ILL,JLL COMMON /VCVEC1/ IVECT @@ -2980,7 +2966,7 @@ SUBROUTINE VDSTLS(LINSTY) CHARACTER COORD*20, LSTCRD*20 INTEGER IVECT CHARACTER CTEMP*30,STRL*3,STRS*3,STRG*3 -C + C CURRENT ATTRIBUTE VALUES. (DEVICE-INDEPENDENT) REAL VECTOR(7) COMMON /VCATTR/ VECTOR @@ -3000,7 +2986,7 @@ SUBROUTINE VDSTLS(LINSTY) C CURRENT ATTRIBUTE VALUES. (DEVICE-INDEPENDENT) C REAL VECTOR(7) C COMMON /VCATTR/ VECTOR -C + C VECTOR(1)=FOREGROUND COLOR C (2)=BACKGROUND COLOR C (3)=INTENSITY @@ -3008,17 +2994,16 @@ SUBROUTINE VDSTLS(LINSTY) C (5)=LINE WIDTH C (6)=CHARACTER BOX Y C (7)=CHARACTER BOX X -C -C + ENTRY VBSTLS(LINSTY) -C + C CHECK FOR VALID LINSTY. IF(LINSTY.LT.0.OR.LINSTY.GT.5) THEN CALL VBERRH(401,5) VECTOR(4) = 0 GOTO 999 END IF -C + IF(IVECT.NE.0) THEN CALL PSTBUF(2,'s ') IVECT=0 @@ -3027,19 +3012,19 @@ SUBROUTINE VDSTLS(LINSTY) IF(LINSTY.EQ.0) THEN CALL PSTBUF(7,'[] 0 h ') ENDIF -C + C calculate the linewidth -- it's needed below in every case -C + C actual xscale is xscale*.1; linewidth=1 => .01 in NDC LW=VECTOR(5) LW=XSCALE*VECTOR(5)*.001 C a linewidth of zero isn't good with postscript IF(LW.LT.1.) LW=1. -C + C from here on, set up patterns that depend on the linewidth and C the extra length added to the line segment C by the hemispherical end cap -C + IF(LINSTY.EQ.1) THEN ILL=NINT(0.5*LW) IGAP=NINT(3.*LW) @@ -3047,7 +3032,7 @@ SUBROUTINE VDSTLS(LINSTY) CALL PSTI2C(IGAP,3,STRG) CTEMP='['//STRL(1:3)//' '//STRG(1:3)//'] 0 h ' CALL PSTBUF(14,CTEMP) -C + ELSE IF(LINSTY.EQ.2) THEN ILL=NINT(18.*LW) JLL=NINT(1.5*LW) @@ -3059,7 +3044,7 @@ SUBROUTINE VDSTLS(LINSTY) * //' '//STRG(1:3)//'] 0 h ' CALL PSTBUF(22,CTEMP) C call pstbuf(14,'[2 2 6 2] 0 h ') -C + ELSE IF(LINSTY.EQ.3) THEN ILL=NINT(6.*LW) IGAP=NINT(7.*LW) @@ -3068,7 +3053,7 @@ SUBROUTINE VDSTLS(LINSTY) CTEMP='['//STRL(1:3)//' '//STRG(1:3)//'] 0 h ' CALL PSTBUF(14,CTEMP) C call pstbuf(8,'[4] 0 h ') -C + ELSE IF(LINSTY.EQ.4) THEN ILL=NINT(24.*LW) IGAP=NINT(18.*LW) @@ -3077,7 +3062,7 @@ SUBROUTINE VDSTLS(LINSTY) CTEMP='['//STRL(1:3)//' '//STRG(1:3)//'] 0 h ' CALL PSTBUF(14,CTEMP) C call pstbuf(8,'[8] 0 h ') -C + ELSE IF(LINSTY.EQ.5) THEN ILL=NINT(12.*LW) IGAP=NINT(10.*LW) @@ -3085,43 +3070,43 @@ SUBROUTINE VDSTLS(LINSTY) CALL PSTI2C(IGAP,3,STRG) CTEMP='['//STRL(1:3)//' '//STRG(1:3)//'] 0 h ' CALL PSTBUF(14,CTEMP) -C + ENDIF -C + C redefine the postscript current position -C + C the code below is equivalent to C call vbvect(0,xcp,ycp) C but can't do it because vbvect calls vdstlw which calls this routine -C + CTEMP=COORD(1:11)//' m ' CALL PSTBUF(14,CTEMP) -C + VECTOR(4)=LINSTY -C + 999 RETURN END SUBROUTINE VDSTCS(YSIZE) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDSTCS -Set Character Size. -C + C R.W.Simons -05DEC80 C J. P. LONG -03 DEC 87 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Devices that support only software characters. C (LXY, HC1) -C + C ENTRY CONDITIONS -YSIZE = real Y dimension of the character box in NDC C space. Range 0.-1. Default: device dependent, C typically the smallest hardware size. -C + C CALLS - -C + C EXIT CONDITIONS -VECTOR(6) = real updated character box Y (YSIZE). C VECTOR(7) = real updated character box X. -C + C NARRATIVE -Set the character size for text primitives. Size C is given by YSIZE as the Y dimension of the C character box. The SVDI will assign the X dimension @@ -3133,12 +3118,12 @@ SUBROUTINE VDSTCS(YSIZE) C unsupported value is specified, set to the largest C supported character size that does not exceed the C specified size. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL YSIZE CHARACTER STR*4,CTEMP*10 -C + C CURRENT ATTRIBUTE VALUES. (DEVICE-INDEPENDENT) REAL VECTOR(7) COMMON /VCATTR/ VECTOR @@ -3152,66 +3137,66 @@ SUBROUTINE VDSTCS(YSIZE) C SCALE FACTORS FOR NDC TO DC MAPPING. (LXY,HC1) REAL XSCALE,YSCALE COMMON /VCSCAL/ XSCALE,YSCALE -C + C CHECK FOR VALID YSIZE. IF(YSIZE.LT.0.0.OR.YSIZE.GT.1.0) THEN CALL VBERRH(401,5) GOTO 999 END IF -C + C PROTECT INPUT PARAMETER FROM BEING CHANGED. YSIZE1=YSIZE -C + C DON'T ALLOW VALUES BELOW THE MINIMUM "HARDWARE" SIZE. IF(YSIZE1.LT.0.01) YSIZE1=0.01 -C + C VALUES ESTABLISHED HERE ARE USED BY VBSIM IN SIMULATING CHARACTERS. C ALWAYS USE A CHARACTER ASPECT RATIO OF 5/7. VECTOR(6)=YSIZE1 VECTOR(7)=YSIZE1*5./7. -C + C convert the character size into device coords -C + IYSIZE=NINT(XSCALE*YSIZE1) -C + C output the postscript command -C + CALL PSTI2C(IYSIZE,4,STR) C iysize is in tenths of device units CTEMP='y '//STR(1:3)//' x ' CALL PSTBUF(8,CTEMP) -C + 999 RETURN END SUBROUTINE VDSTLW(LINWTH) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDSTLW -Set Line Width. -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS -LINWTH = real line width of line drawing output C primitives. Range 0.-1. Default: device dependent. -C + C CALLS - -C + C EXIT CONDITIONS -VECTOR(5) = real updated line width (LINWTH). -C + C NARRATIVE -Set the relative width of an output line. Values C are 0.-1. with 1. being .01 in NDC space. C All devices must support at least a single device C dependent value that is the default. If an C unsupported value is specified, set to the closest C supported line width. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL LINWTH,LW CHARACTER CTEMP*19,STR*5 -C + COMMON /VCVEC1/ IVECT INTEGER IVECT -C + C COMPUTER DEPENDENT COMMON VARIABLES AND CONSTANTS. include 'vcpstc.blk' C CURRENT ATTRIBUTE VALUES. (DEVICE-INDEPENDENT) @@ -3227,7 +3212,7 @@ SUBROUTINE VDSTLW(LINWTH) C SCALE FACTORS FOR NDC TO DC MAPPING. (LXY,HC1) REAL XSCALE,YSCALE COMMON /VCSCAL/ XSCALE,YSCALE -C + C pstmlw controls minimum line width C kpstbg controls background coloring C = 0, not colored (white ground from paper) @@ -3236,25 +3221,25 @@ SUBROUTINE VDSTLW(LINWTH) C = 0, no interchange C = 1, colors interchanged COMMON /VCPSTA/ PSTMLW, KPSTBG, KPSTCI -C + C CHECK FOR VALID LINWTH. IF(LINWTH.LT.0.0.OR.LINWTH.GT.1.) THEN CALL VBERRH(401,5) GOTO 999 END IF -C + C test user define minimum -C + WIDTH=MAX(PSTMLW,LINWTH) -C + C CONVERT LINE-WIDTH TO NDC LW=WIDTH*.005 -C + C CONVERT WIDTH TO DEVICE COORDINATES AND ADD A DIGIT; NEED IT TO HUNDREDTHS ILW=NINT(XSCALE*LW*10.) C A LINEWIDTH OF ZERO WORKS ONLY PART OF THE TIME IF(ILW.LT.10) ILW=10 -C + C SET LINE WIDTH CALL PSTI2C(ILW,5,STR) IF(IVECT.NE.0) THEN @@ -3265,35 +3250,35 @@ SUBROUTINE VDSTLW(LINWTH) CTEMP=STR(1:3)//'.'//STR(4:5)//' w ' CALL PSTBUF(9,CTEMP) END IF -C + VECTOR(5)=WIDTH -C + C since linestyle uses the linewidth in setting the pattern, call it -C + LINSTY=VECTOR(4) CALL VBSTLS(LINSTY) 999 RETURN END SUBROUTINE VDIQES(ESCPCD,SUPPORT) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDIQES -Inquire Escape. -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS -ESCPCD = integer escape function code. -C + C CALLS - -C + C EXIT CONDITIONS -SUPPRT = integer level of support for the escape C function specified. Range 0,1,2. -C + C NARRATIVE -An integer value indicating 2=hardware supported, C 1=software supported, 0=unsupported is returned in C SUPPORT for the escape function ESCPCD. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER ESCPCD,SUPPORT IF (ESCPCD.EQ.2100) THEN SUPPORT=2 @@ -3307,45 +3292,44 @@ SUBROUTINE VDIQES(ESCPCD,SUPPORT) END SUBROUTINE PSTBUF(NCHRS,OUT) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C PSTBUF -Output PostScript data -C + C C. D. Brown -DEC 1986 (Adapted from QMSBUF) -C + C ENVIRONMENT -COMPUTER/DEVICE DEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS -NCHRS = integer number of characters in OUT. C = 0 means flush the buffer. C OUT = character string of input data C KOUTFL = integer number of the graphics output file. -C + C CALLS - -C + C EXIT CONDITIONS - -C + C NARRATIVE -The data in OUT is buffered for output to KOUTFL. C The buffer is output when it is "full" or a buffer C flush is requested by specifying NCHRS<=0. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + SAVE INTEGER NCHRS CHARACTER OUT*(*) character*132 lstout integer lstchr -C -C + C COMPUTER DEPENDENT COMMON VARIABLES AND CONSTANTS. include 'vcpstc.blk' -C + C **NOTE: BUFFER SIZE (IN BITS) MUST BE AN EXACT MULTIPLE OF 8 (8-BIT DATA C MUST END EXACTLY AT WORD BOUNDARY) INTEGER CHARLN,ICNT,REMAIN CHARACTER CBUF*130 C CHARLN=BUFFER SIZE IN CHARS DATA ICNT/1/,CHARLN/130/,LSTCHR/-1/,LSTOUT/' '/ -C + C ...Check that last output string does not match current output GDS if (lstchr .eq. nchrs) then if (lstout(:lstchr) .eq. out(:nchrs)) return @@ -3355,7 +3339,7 @@ SUBROUTINE PSTBUF(NCHRS,OUT) C COMPUTE REMAINING AVAILABLE CHARACTERS IN BUFFER REMAIN=CHARLN-ICNT+1 -C + C CHECK FOR BUFFER FLUSH REQUEST OR NOT ENOUGH ROOM IN BUFFER. IF((NCHRS.LE.0).OR.(NCHRS.GT.REMAIN)) THEN C TEST IF THERE'S ANYTHING TO FLUSH. @@ -3370,67 +3354,67 @@ SUBROUTINE PSTBUF(NCHRS,OUT) ICNT=1 ENDIF ENDIF -C + C ADD TO BUFFER IF (NCHRS.GT.0) THEN CBUF(ICNT:ICNT+NCHRS-1)=OUT(1:NCHRS) ICNT=ICNT+NCHRS ENDIF -C + RETURN END SUBROUTINE PSTA2C(ASCI,CHARAC) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C PSTA2C - CONVERT FROM ASCII TO CHARACTER -C + C P. Watterberg - 19 Jan 1982 -C + C ENVIRONMENT - computer dependent, system dependent, fortran 77 -C + C ENTRY CONDITIONS - ASCI is an integer representing an ascii character -C + C CALLS - -C + C EXIT CONDITIONS - CHARAC is the character represented by ASCI -C + C NARRATIVE - -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + CHARACTER CHARAC*(*) INTEGER ASCI -C + CHARAC = CHAR(ASCI) -C + return end SUBROUTINE PSTI2C(INT,NDIGIT,ISTR) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C +C C PSTI2C - convert positive integer to decimal character C string equivalent -C +C C ENVIRONMENT - COMPUTER-INdependent -C +C C ENTRY CONDITIONS - int = positive integer to be converted C ndigit = number of digits to be produced in string C form (pad left with zeros) C istr = character string of at least ndigit characters -C +C C CALLS - -C +C C EXIT CONDITIONS - istr contains decimal-string equivalent of int C (ndigits left-justified in istr) -C +C C NARRATIVE - This routine modified 10/89 S.L.Thompson -C +C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C INTEGER INT,NDIGIT CHARACTER ISTR*(*) CHARACTER*1 KA(10) DATA KA /'0','1','2','3','4','5','6','7','8','9'/ -C +C C check input parameters INT1=MAX(INT,0) LENGTH=LEN(ISTR) @@ -3447,14 +3431,14 @@ SUBROUTINE PSTI2C(INT,NDIGIT,ISTR) RETURN END SUBROUTINE PSTBBG -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C Color background black for white paper device. C Should only be called from vdnwpg and viinit. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C pstmlw controls minimum line width C kpstbg controls background coloring C = 0, not colored (white ground from paper) @@ -3463,11 +3447,11 @@ SUBROUTINE PSTBBG C = 0, no interchange C = 1, colors interchanged COMMON /VCPSTA/ PSTMLW, KPSTBG, KPSTCI -C + C mopoly controls polygon fill =0, on ; =1, off C mocolr controls color =0, on ; =1, off COMMON /VCPSTB/ MOPOLY, MOCOLR -C + C CURRENT ATTRIBUTE VALUES. (DEVICE-INDEPENDENT) REAL VECTOR(7) COMMON /VCATTR/ VECTOR @@ -3478,7 +3462,7 @@ SUBROUTINE PSTBBG C (5)=LINE WIDTH C (6)=CHARACTER BOX Y C (7)=CHARACTER BOX X -C + COMMON /VCVEC1/ IVECT INTEGER IVECT COMMON /VCESCP/ PGFORM,PATNO,BORDER @@ -3486,7 +3470,7 @@ SUBROUTINE PSTBBG DIMENSION X(4),Y(4) PARAMETER (ONEN=0.99999) PARAMETER (ASP=0.75) -C + IF(MOPOLY.EQ.0) THEN IF(PGFORM.EQ.0) THEN X(1)=0. @@ -3516,39 +3500,39 @@ SUBROUTINE PSTBBG END SUBROUTINE PSTJOB C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C PSTJOB - GET JOB ID AND ROUTING INFORMATION -C + C ENVIRONMENT - COMPUTER-DEPENDENT FOR CTSS -C + C ENTRY CONDITIONS - -C + C CALLS - -C + C EXIT CONDITIONS - KJTIME - TIME HOLLERITH STRING C KJDATE - DATE HOLLERITH STRING C KUSRID - USER IDENTIFICATION C KJROUT - ROUTING INFORMATION -C + C NARRATIVE - THIS ROUTINE INQUIRES THE SYSTEM TO FIND THE ABOVE C INFORMATION. THE INFO IS PACKED INTO THE ARRAYS AS C HOLLERITH (INTERNAL DISPLAY CODE) STRINGS. A TERMI C CHARACTER "\" IS APPENDED TO EACH STRING SO THE CAL C ROUTINE CAN FIND THE END IF FOR SOME REASON THE LEN C VARIABLES ARE NOT SUFFICIENT. -C + C None of functions are used in pst driver -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C JOB ID INFORMATION. (HC1, DIC) include 'vcjob.blk' -C + C FOR SECURITY MARKINGS, CTSS CODES NEED TO MAP TO THESE SILLY C OLD SCOPE SECURITY CODES -C + C SCOPE 3 CODE -C + C 0 UNCL C 1 UNDEFINED C 2 UNDEFINED @@ -3561,38 +3545,38 @@ SUBROUTINE PSTJOB C 9 SNSI C 10 SFRD C 11 SRD -C + C GET CLASSIFICATION LEVEL KSECUR = 0 -C + C GET USER ID KUSRSZ = 8 KUSRID(1)=0 KUSRID(2)=0 KUSRID(3)=0 KUSRID(4)=0 -C + C GET JOB ID AND USERS NAME KJOBID(1) = 0 KJOBID(2) = 0 KJOBID(3) = 0 KJOBID(4) = 0 KIDSIZ = 24 -C + C GET BOX NUMBER KSZROU = 777 -C + KJROUT(1) = 0 KJROUT(2) = 0 KJROUT(3) = 0 KJROUT(4) = 0 -C + C GET MACHINE ID MACHIN(1) = 0 MACHIN(2) = 0 MACHIN(3) = 0 MACLEN=1 -C + C GET THE TIME AND DATE KJTIME(1)=0 KJTIME(2)=0 @@ -3600,14 +3584,14 @@ SUBROUTINE PSTJOB KJDATE(1)=0 KJDATE(2)=0 KJDATE(3)=0 -C + END SUBROUTINE PSTSEL(KARG) -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C Select type of desired output. Four options are -C + C device number C 1. black & white, batch, no poly fill 799.1 C 2. black & white, interactive, no poly 799.2 @@ -3619,15 +3603,15 @@ SUBROUTINE PSTSEL(KARG) C 8. color, interactive, black-white interchange 799.8 C 9. color, batch, black background 799.9 C 10.color, interactive, black background 799.11 -C + C A second function of this routine is to set the minimum line C width. For most systems the minimum width line is too narrow. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + SAVE CHARACTER*(*) KARG -C + C pstmlw controls minimum line width C kpstbg controls background coloring C = 0, not colored (white ground from paper) @@ -3636,11 +3620,11 @@ SUBROUTINE PSTSEL(KARG) C = 0, no interchange C = 1, colors interchanged COMMON /VCPSTA/ PSTMLW, KPSTBG, KPSTCI -C + C mopoly controls polygon fill =0, on ; =1, off C mocolr controls color =0, on ; =1, off COMMON /VCPSTB/ MOPOLY, MOCOLR -C + COMMON /DEVCAP/ DEV(33) common /blotans/ BLTANS character*2 BLTANS @@ -3779,24 +3763,24 @@ SUBROUTINE PSTSEL(KARG) RETURN END SUBROUTINE PSTINI -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C Generate any system dependent records which must be at the first C of PostScript output file. For example, a SUN laser printer C requires the first record of the file to be %! for the file C recognized as a PostScript file. This routine writes these C initial records. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + SAVE DATA KWAY /0/ IF(KWAY.EQ.0) THEN KWAY=1 -C + C generate first records in output file -C + *- INCLUDE PSTHEAD C the following is for a SUN UNIX system C record is a comment except for sun lpr @@ -3805,6 +3789,6 @@ SUBROUTINE PSTINI CALL PSTBUF(0,' ') *- END IF -C + RETURN END diff --git a/packages/seacas/applications/fastq/cgi/vdicps_dual.f b/packages/seacas/applications/fastq/cgi/vdicps_dual.f index 825a041367f2..34a90963daf7 100644 --- a/packages/seacas/applications/fastq/cgi/vdicps_dual.f +++ b/packages/seacas/applications/fastq/cgi/vdicps_dual.f @@ -1,17 +1,15 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: vdicps_dual.f,v 1.3 2008/01/09 18:18:53 gdsjaar Exp $ - SUBROUTINE WCPSII(ASPECT,JUSTIF) -C + C VDI-PostScript driver - B&W and COLOR versions C Adapted for all systems by S.L.Thompson C Original code from D.Campbell and J.LONG -C + C vdi device numbers are C device number C black & white, batch, no poly fill 799.1 @@ -24,46 +22,46 @@ SUBROUTINE WCPSII(ASPECT,JUSTIF) C color, interactive, black-white interchange 799.8 C color, batch, black background 799.9 C color, interactive, black background 799.11 -C + C last mod 6/20/90 slt -C + C Note that there are several parameters to set depending on how C the package is to be used. Most are in routine pstsel routine C which is called at the first of this routine (viinit.) Two other c parameters (xinch,yinch) are set in this routine and vdiqd9. -C + C This code is for BOTH color and black & white systems. C Flag is set for mode in pstsel. -C + C Device can be set with escape call before call to vdinit. C Otherwise, code will interactively ask for device type. C There is also an escape flag for landscape or portrait format. -C + C This deck was generated from a qms driver and still has the C qms comments in places. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VIINIT -Initialize SVDI. postscript device -C + C D.L. CAMPBELL -1-DEC-1986 C J.P. LONG -9-NOV-1987 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C (postscript) -C + C ENTRY CONDITIONS -ASPECT = real ratio of X dimension to Y dimension. C Range >0.0. Default: 0. (device dependent). C JUSTIF = integer justification of NDC space on the C device. Range 0-9. Default: 0 (device dependent.) -C + C CALLS -VBERRH,VDSTCS,VDSTLW,VIMOVA -C + C EXIT CONDITIONS -XNDCMX,YNDCMX = real NDC maximum valid values(as C constrained by ASPECT). C VECTOR = real array of attribute values(all device C dependent except VECTOR(4)=0.0). -C + C NARRATIVE -This must be the first SVDI call made. All C attribute values, the color table, and current C position are set to appropriate defaults for the @@ -71,7 +69,7 @@ SUBROUTINE WCPSII(ASPECT,JUSTIF) C is done. The screen is cleared or paper advanced C if necessary to guarantee a blank view surface for C drawing on. -C + C ASPECT specifies the ratio of the X dimension to the C Y dimension . Maximum NDC values (at least one of C which will be 1.0) are computed to give the ASPECT @@ -82,7 +80,7 @@ SUBROUTINE WCPSII(ASPECT,JUSTIF) C aspect of 1.0. The NDC rectangle is scaled until C one dimension fills the corresponding dimension of C the device. -C + C JUSTIF determines where the rectangle is located on C the device as diagrammed below: C --------- @@ -92,22 +90,22 @@ SUBROUTINE WCPSII(ASPECT,JUSTIF) C --------- C For example, JUSTIF = 7 indicates NDC space will be C upper left justified on the device. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC -C + C Set parameters for type of usage. C Two settings are coded - one for square field of view C and one for full field of view. -C + C If VDIQDC is called before vdinit, full field of view is selected. C Otherwise, square is used. -C + C size of full view PARAMETER (XINCHO=10.0) PARAMETER (YINCHO=7.5) -C + C size of square view C PARAMETER (XINCHO=7.5) C PARAMETER (YINCHO=7.5) @@ -118,14 +116,14 @@ SUBROUTINE WCPSII(ASPECT,JUSTIF) C PARAMETER (YINCHO=7.4412525) *- COMMON /VCMODR/ XINCH, YINCH -C + CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC -C + REAL ASPECT INTEGER JUSTIF COMMON /VCVEC1/ IVECT INTEGER IVECT -C + C MAXIMUM VALID NDC VALUES. (DEVICE-INDEPENDENT) REAL XNDCMX,YNDCMX COMMON /VCNDCM/ XNDCMX,YNDCMX @@ -142,7 +140,7 @@ SUBROUTINE WCPSII(ASPECT,JUSTIF) C CURRENT POSITION. REAL XCP,YCP COMMON /VCCRPS/ XCP,YCP -C + C COMPUTER DEPENDENT COMMON VARIABLES AND CONSTANTS. include 'vcpstc.blk' C SCALE FACTORS FOR NDC TO DC MAPPING. (LXY,HC1) @@ -153,7 +151,7 @@ SUBROUTINE WCPSII(ASPECT,JUSTIF) COMMON /VCDDIM/ XPAD,YPAD,XDEVIC,YDEVIC C JOB ID INFORMATION. (HC1, DIC) include 'vcjob.blk' -C + COMMON /DEVCAP/ DEV(33) C ESCAPE FLAGS C PATNO AND BORDER USED BY VIPOLY FOR FILL PATTERN AND BORDER ON/OFF; @@ -161,7 +159,7 @@ SUBROUTINE WCPSII(ASPECT,JUSTIF) COMMON /VCESCP/ PGFORM,PATNO,BORDER INTEGER PGFORM,PATNO,BORDER CHARACTER COORD*20,XCOORD*4,YCOORD*4 -C + C pstmlw controls minimum line width C kpstbg controls background coloring C = 0, not colored (white ground from paper) @@ -170,19 +168,19 @@ SUBROUTINE WCPSII(ASPECT,JUSTIF) C = 0, no interchange C = 1, colors interchanged COMMON /VCPSTA/ PSTMLW, KPSTBG, KPSTCI -C + C mopoly controls polygon fill =0, on ; =1, off C mocolr controls color =0, on ; =1, off COMMON /VCPSTB/ MOPOLY, MOCOLR -C + DIMENSION COLDEF(3) -C + C vcpstd variables control what to do with empty frames with C command is received to dump data to output C kempty=0, frame is void - do not draw C >0, frame has data - draw it COMMON /VCPSTD/ KEMPTY -C + DEV(1) = 0.0 dev(2) = 1.0 dev(3) = 1.0 @@ -231,8 +229,7 @@ SUBROUTINE WCPSII(ASPECT,JUSTIF) C (5)=LINE WIDTH - ABOUT 1/72 INCHES C (6)=CHARACTER BOX Y - ABOUT 1/10 INCHES C (7)=CHARACTER BOX X - 5/7 OF BOX-Y -C -C + vector(1) = 0.0 vector(2) = 7.0 vector(3) = 1.0 @@ -251,21 +248,21 @@ SUBROUTINE WCPSII(ASPECT,JUSTIF) BORDER = 1 XCP = 0.0 YCP = 0.0 -C + C CHECK FOR VALID ASPECT. IF(ASPECT.LT.0.0) THEN CALL VBERRH(721,5), C AND USE DEFAULT ASPECT. IF(ASPECT.LT.0.0) THEN CALL VBERRH(721,5) ASPEC1=0.0 END IF -C + C CHECK FOR VALID JUSTIF. IF(JUSTIF.LT.0 .OR. JUSTIF.GT.9) THEN C CALL VBERRH(720,5), AND USE DEFAULT JUSTIF. IF(JUSTIF.LT.0.OR.JUSTIF.GT.9) THEN CALL VBERRH(720,5) JUSTI1=0 END IF -C + C SCALE NDC UNITS TO DEVICE UNITS. C FOR QMS, THE PHYSICAL PLOT SURFACE IS XINCH X YINCH (10.x7.5). C DEVICE COORDINATES ARE KEPT IN 1/723 INCH TO GAIN SIMPLICITY @@ -276,14 +273,14 @@ SUBROUTINE WCPSII(ASPECT,JUSTIF) C ADDRESSABILITY,USING AS MUCH OF THE SPACE AS POSSIBLE. XINCH=XINCHO YINCH=YINCHO -C + C test for rscors post or direct mode. Use 7.5x7.5 for direct C and 10.0x7.5 for post -C + C if VDIQDC has already been called, we are in post mode; C otherwise in direct mode CALL VDIQD9(XINCH,YINCH) -C + C CHECK PAGE FORMAT - IF PORTRAIT, C THEN SWITCH THINGS AROUND IF (PGFORM.EQ.1) THEN @@ -300,13 +297,13 @@ SUBROUTINE WCPSII(ASPECT,JUSTIF) XUNITS=XINCH*723. YUNITS=YINCH*723. DASPEC=XUNITS/YUNITS -C + C DEFAULT ASPECT = 1., DEFAULT JUSTIF = 1. IF(ASPEC1.EQ.0.) ASPEC1=DASPEC IF(JUSTI1.EQ.0) JUSTI1=1 -C + IF(ASPEC1.GE.DASPEC) THEN -C + C THEN X DIMENSION IS FILLED. XDEVIC=XUNITS YDEVIC=XUNITS/ASPEC1 @@ -320,7 +317,7 @@ SUBROUTINE WCPSII(ASPECT,JUSTIF) YPAD=YUNITS-YDEVIC END IF ELSE -C + C ELSE Y DIMENSION IS FILLED. XDEVIC=YUNITS*ASPEC1 YDEVIC=YUNITS @@ -334,7 +331,7 @@ SUBROUTINE WCPSII(ASPECT,JUSTIF) XPAD=0 END IF END IF -C + C FIGURE MAXIMUM NDC VALUES XNDCMX AND YNDCMX. IF(ASPEC1.GE.DASPEC) THEN XNDCMX=MIN(1.,ASPEC1) @@ -343,7 +340,7 @@ SUBROUTINE WCPSII(ASPECT,JUSTIF) XNDCMX=ASPEC1 YNDCMX=1. END IF -C + C SET SCALE FACTORS FOR NDC-TO-DEVICE MAPPING. XSCALE=DBLE(XDEVIC)/XNDCMX YSCALE=DBLE(YDEVIC)/YNDCMX @@ -354,21 +351,21 @@ SUBROUTINE WCPSII(ASPECT,JUSTIF) XPAD = XPAD+280. YPAD = YPAD-180. ENDIF -C + CALL PSTSEL(' ') -C + C SET UP MONITORING INFORMATION CALL VBDEV('V PST ') CALL WCPSMO(0) IVECT=0 -C + C OPEN OUTPUT FILE CALL PSTOFS(KOUTFL) -C + C INITIALIZE the printer -C + CALL PSTINI -C + CALL PSTBUF(38, '%%Title: Graphics SVDI PostScript File') CALL PSTBUF(0,' ') CALL PSTBUF(40, '%%Creator: SNL SEACAS SVDI Driver -- cps') @@ -431,15 +428,15 @@ SUBROUTINE WCPSII(ASPECT,JUSTIF) CALL PSTBUF(17,'/o {newpath} def ') ENDIF CALL PSTBUF(35,'/p {showpage} def 1 setlinecap v o ') -C + C check for color or black & white mode -C + IF(MOCOLR.EQ.0) THEN -C + C color is on -C + C define some kind of color table -C + DO 120 IC=0,7 COLDEF(1)=0. COLDEF(2)=0. @@ -476,17 +473,17 @@ SUBROUTINE WCPSII(ASPECT,JUSTIF) END IF VECTOR(1)=7. VECTOR(2)=0. -C + C define the postscript current position CALL VBVECT(0,XCP,YCP) -C + C shade background if appropriate -C + IF(KPSTBG.NE.0) THEN CALL PSTBBG KEMPTY=0 END IF -C + C INIT LINE WIDTH,CHARACTER SIZE CALL WCPSLW(VECTOR(5)) c CALL VDSTCS(VECTOR(6)) @@ -496,18 +493,18 @@ SUBROUTINE WCPSII(ASPECT,JUSTIF) END SUBROUTINE WCPSDC(INDEX,VALUE) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDIQDC -Inquire Device Capabilities. -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS -INDEX = integer capability number. Range 1-33. -C + C CALLS - -C + C EXIT CONDITIONS -VALUE = real value of the capability indicated by C INDEX. -C + C NARRATIVE -Return values of various device capabilities. INDEX C is the integer capability number (as given below), C and the real value is returned in VALUE. @@ -641,9 +638,9 @@ SUBROUTINE WCPSDC(INDEX,VALUE) C 33. Device pixel aspect - the ratio of the spacing of device C pixels in x divided by the spacing in y (1 for square C pixels) -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + SAVE INTEGER INDEX REAL VALUE @@ -652,11 +649,11 @@ SUBROUTINE WCPSDC(INDEX,VALUE) C DEFAULT COMPLETE FILL WITH BORDER. PLC. COMMON /VCESCP/ PGFORM,PATNO,BORDER INTEGER PGFORM,PATNO,BORDER -C + C mopoly controls polygon fill =0, on ; =1, off C mocolr controls color =0, on ; =1, off COMMON /VCPSTB/ MOPOLY, MOCOLR -C + *- INCLUDE PSTFULL C size of full view window C parameters set to get same size plot as imagen and qms b&w. @@ -666,33 +663,33 @@ SUBROUTINE WCPSDC(INDEX,VALUE) C INITIALIZE THE DEVICE CAPABILITIES VECTOR. COMMON /DEVCAP/ DEV(33) DATA NOCALL /0/ -C + C If device is 0, call to reset -C + IF(NINT(DEV(23)).EQ.0) THEN CALL PSTSEL(' ') END IF -C + C CHECK FOR VALID INDEX. IF(INDEX.LT.1.OR.INDEX.GT.33) THEN CALL VBERRH(726,5) GOTO 999 END IF -C + C RETURN INDEXED VALUE. VALUE=DEV(INDEX) IF(INDEX.EQ.23) NOCALL=1 -C + 999 RETURN -C + C********************************************************************** ENTRY VDIQD9(XINCH,YINCH) -C + C This is an added entry for rscors version of pst driver to C tell if direct or post mode operation. If post mode, vdiqdc C is called before vdinit to get terminal type. In direct mode C it is never called to get type. -C + IF(NOCALL.NE.0) THEN C XINCH=10.0 C YINCH=7.5 @@ -703,23 +700,23 @@ SUBROUTINE WCPSDC(INDEX,VALUE) END SUBROUTINE WCPSER(ERRNUM,ERRSEV) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VBERRH -Error Handler. -C + C R.W.Simons -08APR81 C 30SEP81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -ERRNUM = integer error number. C ERRSEV = integer severity code. If > 12, error is C fatal. -C + C CALLS -VDLOGE. -C + C EXIT CONDITIONS - -C + C NARRATIVE -An error will normally cause an error message to C be printed on the error output device and possible C termination of the program, unless a routine VBERRH @@ -729,43 +726,43 @@ SUBROUTINE WCPSER(ERRNUM,ERRSEV) C returning. All versions of VBERRH, whether user- C supplied or default, must STOP on any error severity C greater than 12. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER ERRNUM,ERRSEV -C + C REPORT THE ERROR USING VDLOGE. CALL WCPSLE(ERRNUM,ERRSEV) -C + C CHECK FOR FATAL ERROR. IF(ERRSEV.GT.12) STOP -C + RETURN END SUBROUTINE WCPSGN(NAME) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDGNAM -Name the graphics output file -C + C P.L.Crotty -OCT88 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -NAME = character string; < 80 characters -C + C CALLS -C + C EXIT CONDITIONS -output graphics file is assigned the name NAME -C + C NARRATIVE -This subroutine associates a file name with C the graphics output file (KOUTFL). If this C routine is not called, a system dependent C default name is used. VDGNAM must be called C before VDINIT. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + SAVE CHARACTER*(*) NAME CHARACTER*132 PSTNAM @@ -826,26 +823,26 @@ SUBROUTINE WCPSGN(NAME) END SUBROUTINE WCPSNT(ASPECT,JUSTIF) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDINIT -Initialize SVDI. -C + C R.W.Simons -08APR81 C 30SEP81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -ASPECT = real ratio of X dimension to Y dimension. C Range >0.0. Default: 0.0 (device dependent). C JUSTIF = integer justification of NDC space on the C device. Range 0-9. Default: 0 (device dependent). -C + C CALLS -PSTJOB, VBERRH, VIINIT. -C + C EXIT CONDITIONS -XNDCMX,YNDCMX = real NDC maximum valid values. C VECTOR = real array of default attribute values (all C device-dependent except VECTOR(4)=0.0). -C + C NARRATIVE -This must be the first SVDI call made. All C attribute values, the color table, and current C position are set to appropriate defaults for the @@ -853,7 +850,7 @@ SUBROUTINE WCPSNT(ASPECT,JUSTIF) C is done. The screen is cleared or paper advanced C if necessary to guarantee a blank view surface for C drawing. -C + C ASPECT specifies the ratio of the X dimension to the C Y dimension. Maximum NDC values (at least one of C which will be 1.0) are computed to give the ASPECT @@ -864,7 +861,7 @@ SUBROUTINE WCPSNT(ASPECT,JUSTIF) C aspect of 1.0. The NDC rectangle is scaled until C one dimension fills the corresponding dimension of C the device. -C + C JUSTIF determines where the rectangle is located on C the device as diagrammed below: C --------- @@ -874,18 +871,18 @@ SUBROUTINE WCPSNT(ASPECT,JUSTIF) C --------- C For example, JUSTIF = 7 indicates NDC space will be C upper left justified on the device. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL ASPECT INTEGER JUSTIF -C + C JOB ID INFORMATION. (HC1, DIC) include 'vcjob.blk' -C + C COMPUTER DEPENDENT COMMON VARIABLES AND CONSTANTS. include 'vcpstc.blk' -C + C set common variables KWRTFL=6 KRDFL=0 @@ -903,64 +900,64 @@ SUBROUTINE WCPSNT(ASPECT,JUSTIF) C IF(KSECUR.NE.0) THEN C CALL VBERRH(957,13) C END IF -C + C THIS IS JUST A DUMMY ROUTINE WHICH DOES NOTHING BUT CALL VIINIT. C THIS ORGANIZATION FACILITATES ADDING SECURITY MARKINGS TO SVDI. CALL WCPSII(ASPECT,JUSTIF) -C + RETURN END SUBROUTINE WCPSID(XNDC,YNDC) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDIQND -Inquire NDC Space. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -XNDCMX,YNDCMX = real maximum valid NDC values. -C + C CALLS - -C + C EXIT CONDITIONS -XNDC,YNDC = real maximum valid NDC values (XNDCMX, C YNDCMX). -C + C NARRATIVE -Return the maximum NDC values as set to realize the C aspect defined by VDINIT. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL XNDC,YNDC -C + C MAXIMUM VALID NDC VALUES. (DEVICE-INDEPENDENT) REAL XNDCMX,YNDCMX COMMON /VCNDCM/ XNDCMX,YNDCMX -C + C RETURN THE MAXIMUM VALID NDC VALUES. XNDC=XNDCMX YNDC=YNDCMX -C + RETURN END SUBROUTINE WCPSIO(ATTARR) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDIQOS -Inquire Output Status (of Attributes). -C + C K.M. ERICKSON -14 NOV 80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -VECTOR = real array of current attribute values. -C + C CALLS - -C + C EXIT CONDITIONS -ATTARR = real array of current attribute value C (VECTOR). -C + C NARRATIVE -Return the current attribute values in ATTARR as C given below. C ATTARR(1)=Foreground Color @@ -970,11 +967,11 @@ SUBROUTINE WCPSIO(ATTARR) C (5)=Line Width C (6)=Character Box Y C (7)=Character Box X -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL ATTARR(7) -C + C CURRENT ATTRIBUTE VALUES. (DEVICE-INDEPENDENT) REAL VECTOR(7) COMMON /VCATTR/ VECTOR @@ -985,64 +982,64 @@ SUBROUTINE WCPSIO(ATTARR) C (5)=LINE WIDTH C (6)=CHARACTER BOX Y C (7)=CHARACTER BOX X -C + INTEGER I -C + DO 100 I=1,7 ATTARR(I)=VECTOR(I) 100 CONTINUE -C + RETURN END SUBROUTINE WCPSLN(X,Y) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDLINA -Line Absolute. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -X,Y = real NDC position. -C + C CALLS -VILINA. -C + C EXIT CONDITIONS - -C + C NARRATIVE -Draw a line from current position to absolute NDC C position X,Y and update current position. C Attributes foreground color, intensity, line style, C and line width apply. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL X,Y -C + C THIS IS JUST A DUMMY ROUTINE WHICH DOES NOTHING BUT CALL VILINA. C THIS ORGANIZATION FACILITATES ADDING SECURITY MARKINGS TO SVDI. CALL WCPSIL(X,Y) -C + RETURN END SUBROUTINE WCPSLE(ERRNUM,ERRSEV) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDLOGE -Log Error. -C + C R.W.Simons -08APR81 C K.M.Erickson -8OCT84 - add buffer flush -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -ERRNUM = integer error number. C ERRSEV = integer error severity. -C + C CALLS -PSTTBK, VDBUFL -C + C EXIT CONDITIONS - -C + C NARRATIVE -Report error with message to user and possibly C terminate job depending on severity. Notice that C by judicious use of the error routines (see VBERRH) @@ -1051,44 +1048,42 @@ SUBROUTINE WCPSLE(ERRNUM,ERRSEV) C occurrences of a particular error, or terminate C if more than 10 errors of a particular severity C occur. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER ERRNUM,ERRSEV -C -C + C COMPUTER DEPENDENT COMMON VARIABLES AND CONSTANTS. include 'vcpstc.blk' -C + C flush buffer before we do a write CALL WCPSFL -C + C WRITE THE ERROR TO THE LISTING. WRITE(KWRTFL,10)ERRNUM,ERRSEV 10 FORMAT(' SVDI ERROR NUMBER ',I5,' SEVERITY CODE ',I5) -C + C TRACEBACK. csam CALL PSTTBK -C + RETURN END SUBROUTINE WCPSMO(ISTATE) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDMONI -Logs Usage Information.. -C -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -ISTATE = 0 - initialization C 1 - new page C 2 - terminate -C + C CALLS -C + C EXIT CONDITIONS - -C + C NARRATIVE -For ISTATE=0, job information is initialized, and C timers are initialized called by VIINIT. C ISTATE=1 will increment a common block page @@ -1102,16 +1097,16 @@ SUBROUTINE WCPSMO(ISTATE) C Entry point VBDEV has an 8 character parameter C which will set a common block variable specifying C the device being used. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C dummy routine -C + CHARACTER*(*) C1,C2 -C + RETURN C Usage Monitoring Information -C + ENTRY VBPKG (C1) RETURN ENTRY VBDEV (C2) @@ -1125,106 +1120,106 @@ SUBROUTINE WCPSMO(ISTATE) END SUBROUTINE WCPSMV(X,Y) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDMOVA -Move Absolute. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -X,Y = real NDC position. -C + C CALLS -VIMOVA -C + C EXIT CONDITIONS - -C + C NARRATIVE -Set current position to absolute NDC position X,Y. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL X,Y -C + C THIS IS JUST A DUMMY ROUTINE WHICH DOES NOTHING BUT CALL VIMOVA. C THIS ORGANIZATION FACILITATES ADDING SECURITY MARKINGS TO SVDI. CALL WCPSIM(X,Y) -C + RETURN END SUBROUTINE WCPSPG C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDNWPG -New Page. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS - -C + C CALLS -VINWPG. -C + C EXIT CONDITIONS - -C + C NARRATIVE -Physically advance the medium or clear the screen, C whichever is appropriate. Also flood the screen C with the background color on devices that support C this function. The current position is not changed. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C THIS IS JUST A DUMMY ROUTINE WHICH DOES NOTHING BUT CALL VINWPG. C THIS ORGANIZATION FACILITATES ADDING SECURITY MARKINGS TO SVDI. CALL WCPSIG -C + RETURN END SUBROUTINE WCPSPT(X,Y) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDPNTA -Point Absolute. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -X,Y = real NDC position. -C + C CALLS -VIPNTA. -C + C EXIT CONDITIONS - -C + C NARRATIVE -Set current position to absolute NDC position X,Y C and put a visible point there. Attributes C foreground color and intensity apply. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL X,Y -C + C THIS IS JUST A DUMMY ROUTINE WHICH DOES NOTHING BUT CALL VIPNTA. C THIS ORGANIZATION FACILITATES ADDING SECURITY MARKINGS TO SVDI. CALL WCPSIP(X,Y) -C + RETURN END SUBROUTINE WCPSPY(XARRAY,YARRAY,NPTS) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDPOLY -POLYGON FILL ROUTINE -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS -XARRAY-ARRAY OF X VALUES OF THE POLYGON C YARRAY-CORRESPONDING ARRAY OF Y VALUES C NPTS- NUMBER OF POINTS IN (XARRAY,YARRAY) -C + C CALLS -VIPOLY -C + C EXIT CONDITIONS - -C + C NARRATIVE -The polygon defined by XARRAY,YARRAY will be drawn C and filled (constrained by any limitations of the C physical device -- see below). No checking will be @@ -1233,11 +1228,11 @@ SUBROUTINE WCPSPY(XARRAY,YARRAY,NPTS) C boundary is drawn using the solid line style. C VDI will close the polygon (i.e. the last point C will be connected to the first). -C + C The level of support for this primitive is device- C dependent. The level of support is categorized C as follows: -C + C Level 0 -- no polygon fill. Only the polygon C boundary is drawn. C Level 1 -- the device fills convex polygons. @@ -1250,43 +1245,43 @@ SUBROUTINE WCPSPY(XARRAY,YARRAY,NPTS) C is drawn to that point from a point far outside C the polygon, that line intersects the polygon C boundary an odd number of times. -C + C Note that the level of support for a particular device C can be inquired using the function VDIQDC. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER NPTS REAL XARRAY(NPTS),YARRAY(NPTS) -C + C THIS IS JUST A DUMMY ROUTINE WHICH DOES NOTHING BUT CALL VIPOLY. C THIS ORGANIZATION FACILITATES ADDING SECURITY MARKINGS TO SVDI. C mopoly controls polygon fill =0, on ; =1, off C mocolr controls color =0, on ; =1, off COMMON /VCPSTB/ MOPOLY, MOCOLR -C + IF(MOPOLY.EQ.0) THEN CALL WCPS12(XARRAY,YARRAY,NPTS) END IF -C + RETURN END SUBROUTINE WCPSOS(ATTARR) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDSTOS -Set Output Status (of Attributes). -C + C K.M. ERICKSON -14 NOV 80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -ATTARR = real array of attribute values. -C + C CALLS -VDSTBC,VDSTCS,VDSTFC,VDSTIN,VDSTLS,VDSTLW -C + C EXIT CONDITIONS -VECTOR = real updated attribute values (ATTARR). -C + C NARRATIVE -Set the attribute values from ATTARR as given below. C ATTARR(1)=Foreground Color C (2)=Background Color @@ -1294,11 +1289,11 @@ SUBROUTINE WCPSOS(ATTARR) C (4)=Line Style C (5)=Line Width C (6)=Character Box Y -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL ATTARR(6) -C + C CURRENT ATTRIBUTE VALUES. (DEVICE-INDEPENDENT) REAL VECTOR(7) COMMON /VCATTR/ VECTOR @@ -1309,7 +1304,7 @@ SUBROUTINE WCPSOS(ATTARR) C (5)=LINE WIDTH C (6)=CHARACTER BOX Y C (7)=CHARACTER BOX X -C + C CALL EACH OF THE INDIVIDUAL ATTRIBUTE SETTING ROUTINES. C CHECK FOR VALIDITY OF INPUT VALUES WILL BE DONE IN EACH INDIVIDUAL C ROUTINE. @@ -1319,56 +1314,56 @@ SUBROUTINE WCPSOS(ATTARR) CALL WCPSLS(NINT(ATTARR(4))) CALL WCPSLW(ATTARR(5)) c CALL VDSTCS(ATTARR(6)) -C + RETURN END SUBROUTINE WCPSTR C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDTERM -Terminate SVDI. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS - -C + C CALLS -VITERM. -C + C EXIT CONDITIONS - -C + C NARRATIVE -Terminate the SVDI by flushing buffers, etc. This C should be the last SVDI call made. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C THIS IS JUST A DUMMY ROUTINE WHICH DOES NOTHING BUT CALL VITERM. C THIS ORGANIZATION FACILITATES ADDING SECURITY MARKINGS TO SVDI. CALL WCPSIT -C + RETURN END SUBROUTINE WCPSTX(LENGTH,CHARS) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDTEXT -Text from Array. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -LENGTH = integer number of characters in CHARS. C Range 1-136. C CHARS = integer array of ASCII characters, one C character per array element, right justified. C Range 8,10,32-126. -C + C CALLS -VITEXT. -C + C EXIT CONDITIONS - -C + C NARRATIVE -Draw LENGTH characters in CHARS, starting at C current position and update current position to C the point after the last character box where the @@ -1381,178 +1376,176 @@ SUBROUTINE WCPSTX(LENGTH,CHARS) C considered reasonable. Attributes foreground color, C background color, intensity, and character size C apply. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER LENGTH,CHARS(136) -C + C THIS IS JUST A DUMMY ROUTINE WHICH DOES NOTHING BUT CALL VITEXT. C THIS ORGANIZATION FACILITATES ADDING SECURITY NARKINGS TO SVDI. CALL WCPSIX(LENGTH,CHARS) -C + RETURN END SUBROUTINE WCPSFR(ITYPE) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDFRAM - Draw header or trailer frame -C + C P. Watterberg - 27 Aug 81 -C + C ENVIRONMENT -Computer-independent, system-independent, FORTRAN 77 -C + C ENTRY CONDITIONS - ITYPE = 0 for header frame C = 1 for trailer frame -C + C CALLS - VIFRAM -C + C EXIT CONDITIONS - -C + C NARRATIVE - Calls vifram to get time and date from the C system via the computer-dependent routine PSTTOD(entry C point in PSTJOB) and writes it on an identification frame. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER ITYPE -C + CALL WCPS02(ITYPE) RETURN END SUBROUTINE WCPS02(ITYPE) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VIFRAM - Draw header or trailer frame -C + C P. Watterberg - 27 Aug 81 -C + C ENVIRONMENT -Computer-independent, system-independent, FORTRAN 77 -C + C ENTRY CONDITIONS - ITYPE = 0 for header frame C = 1 for trailer frame -C + C CALLS - -C + C EXIT CONDITIONS - -C + C NARRATIVE -NULL ROUTINE -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER ITYPE -C + RETURN END SUBROUTINE WCPSBU(BTNNUM) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDAABU -Await Any Button. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Batch Devices. -C + C ENTRY CONDITIONS - -C + C CALLS - -C + C EXIT CONDITIONS -BTNNUM = integer number of the button pressed. C Range 1 to a device dependent maximum which must be C at least 8. -C + C NARRATIVE -When a button has been pressed, its integer button C number is returned in BTNNUM. This function flushes C the button buffer, if any. This function flushes C the output buffers before doing input. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER BTNNUM -C -C + C COMPUTER DEPENDENT COMMON VARIABLES AND CONSTANTS. include 'vcpstc.blk' -C + C BATCH DEVICES DON'T NEED TO FLUSH BUFFERS. -C + BTNNUM=32 -C + RETURN END SUBROUTINE WCPSBL(BTNNUM,X,Y) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDABGL -Await Button, Get Locator. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Batch Devices. -C + C ENTRY CONDITIONS - -C + C CALLS - -C + C EXIT CONDITIONS -BTNNUM = integer number of the button pressed. C Range 1 to a device dependent maximum that must be C at least 8. C X,Y = real NDC position of the locator. -C + C NARRATIVE -Wait until a button is hit, then return the number C of the button in BTNNUM and the NDC value of the C locator in X,Y. This function flushes the output C buffers before doing input. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL X,Y INTEGER BTNNUM -C -C + C COMPUTER DEPENDENT COMMON VARIABLES AND CONSTANTS. include 'vcpstc.blk' -C + C BATCH DEVICES DON'T NEED TO FLUSH BUFFERS. -C + BTNNUM=32 X=0 Y=0 -C + RETURN END SUBROUTINE WCPSKL(CHAR,X,Y) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDAKGL -Await Keyboard, Get Locator. -C + C R.W.SIMONS -02DEC80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Batch Devices. -C + C ENTRY CONDITIONS - -C + C CALLS - -C + C EXIT CONDITIONS -CHAR = integer ASCII character input from the C keyboard, right-justified, zero fill. Range 32-126. C X,Y = real NDC position of the locator. -C + C NARRATIVE -Wait until a key is hit, then return the character C entered in CHAR and the NDC value of the locator C in X,Y. If the character entered does not fall in C the range 32-126, a blank(32) is returned in CHAR. C This function flushes the output buffers before C doing input. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL X,Y INTEGER CHAR -C + C dummy routine -C + CHAR=32 X=0. Y=0. @@ -1560,20 +1553,20 @@ SUBROUTINE WCPSKL(CHAR,X,Y) END SUBROUTINE WCPSLO(X,Y) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDALOC -Await Locator. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Batch Devices. -C + C ENTRY CONDITIONS - -C + C CALLS - -C + C EXIT CONDITIONS -X,Y = real NDC position of the locator. -C + C NARRATIVE -Wait until the locator is positioned, then return C the NDC value of the locator in X,Y. The fact that C the locator is positioned can be signaled in a @@ -1584,150 +1577,149 @@ SUBROUTINE WCPSLO(X,Y) C function, as only the locator position is returned. C This function flushes the output buffers before C doing input. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL X,Y -C -C + C COMPUTER DEPENDENT COMMON VARIABLES AND CONSTANTS. include 'vcpstc.blk' -C + C BATCH DEVICES DON'T NEED TO FLUSH BUFFERS. -C + X=0 Y=0 -C + RETURN END SUBROUTINE WCPSBE C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDBELL -Ring Bell -C + C R.W.SIMONS -02DEC80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Batch Devices. -C + C ENTRY CONDITIONS - -C + C CALLS - -C + C EXIT CONDITIONS - -C + C NARRATIVE -Ring user's bell to get his attention. This C function is ignored by batch devices. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C THIS FUNCTION IS IGNORED BY BATCH DEVICES. -C + RETURN END SUBROUTINE WCPSFL C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDBUFL -Buffer Flush. -C + C R.W.Simons -19DEC80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Batch Devices. -C + C ENTRY CONDITIONS - -C + C CALLS - -C + C EXIT CONDITIONS - -C + C NARRATIVE -Assure that the picture is up-to-date by flushing C buffers if necessary. Also prepare the device to C operate in alphanumeric (as opposed to graphic) C mode. This is necessary on some devices so that C alphanumeric data from FORTRAN I/O won't be C misinterpreted as graphic data. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C THIS FUNCTION IS IGNORED BY BATCH DEVICES. -C + RETURN END SUBROUTINE WCPSLA(LOCX,LOCY) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDSTLA -Set Initial Locator Position. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Batch Devices. -C + C ENTRY CONDITIONS -LOCX,LOCY = real NDC position that the locator is C initilaized to. -C + C CALLS - -C + C EXIT CONDITIONS - -C + C NARRATIVE -Set the initial locator position (light pen tracking C cross, for example) each time this function is C called. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL LOCX,LOCY -C + C BATCH DEVICES IGNORE THIS FUNCTION. -C + RETURN END SUBROUTINE WCPSWT C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDWAIT -Wait for User. -C + C R.W.SIMONS -02DEC80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Batch Devices. -C + C ENTRY CONDITIONS - -C + C CALLS - -C + C EXIT CONDITIONS - -C + C NARRATIVE -Wait for the user to view the screen and signal he C is done, normally by hitting any key. This function C flushes the output buffers before doing input. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C BATCH DEVICES IGNORE THIS COMMAND. -C + RETURN END SUBROUTINE WCPSIC(NUM,INDEX,CLRARY,CLRMOD) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C +C C VDIQCO -Inquire Color Table. -C +C C R.W.Simons -08APR81 C H. S. LAUSON 29MAY86 - changed for current HLS interpretation -C +C C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Black and White Devices. (LXY, HC1, ALP) -C +C C ENTRY CONDITIONS -NUM = integer number of color indexes to inquire. C Range 1-256. C INDEX = integer array of indexes to inquire. Range C 0-255. C CLRMOD = integer color model to be used. Range 0,1. -C +C C CALLS -VBERRH -C +C C EXIT CONDITIONS -CLRARY = real array of 3 by NUM elements returning C the values of the components of the indexes inquired. C Range for RGB: red 0.0-1.0 @@ -1736,7 +1728,7 @@ SUBROUTINE WCPSIC(NUM,INDEX,CLRARY,CLRMOD) C Range for HLS: hue 0.0-360.0 C lightness 0.0-1.0 C saturation 0.0-1.0 -C +C C NARRATIVE -Inquire one or more color table entries. NUM and C INDEX specify how many and which indexes are being C inquired. CLRMOD specifies which color model @@ -1745,28 +1737,28 @@ SUBROUTINE WCPSIC(NUM,INDEX,CLRARY,CLRMOD) C support a color table index specified will C return -1.0 in the first element of the CLRARY value C for that index. -C +C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C +C INTEGER NUM,INDEX(NUM),CLRMOD REAL CLRARY(3,NUM) -C +C COMMON /PCOLST/ PCOLS(3,256) -C +C C CHECK FOR VALID NUM. IF(NUM.LT.1.OR.NUM.GT.256) THEN CALL VBERRH(723,5) GOTO 999 END IF -C +C C CHECK FOR VALID CLRMOD. IF(CLRMOD.NE.0.AND.CLRMOD.NE.1) THEN CALL VBERRH(725,5) GOTO 999 END IF -C +C IF(CLRMOD.NE.0) STOP 'HLS COLORS NOT SUPPORTED' -C +C C CHECK FOR VALID INDEXES. DO 100 I=1,NUM INDEXN=INDEX(I) @@ -1778,58 +1770,58 @@ SUBROUTINE WCPSIC(NUM,INDEX,CLRARY,CLRMOD) CLRARY(IC,I)=PCOLS(IC,INDEXN) end do 100 CONTINUE -C +C 999 RETURN END SUBROUTINE WCPSCP(X,Y) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDIQCP -Inquire Where Current Position Is. -C + C R.W.Simons -02DEC80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Devices that support a software CP. C (AP5,GER,H50,HC1,HCB,HPP,I10,I30,LXY,QCR,QMS,XYN) -C + C ENTRY CONDITIONS - -C + C CALLS - -C + C EXIT CONDITIONS -X,Y = real NDC position. -C + C NARRATIVE -Return the value of current position. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C CURRENT POSITION. REAL XCP,YCP COMMON /VCCRPS/ XCP,YCP -C + C ASSIGN THE CP TO X,Y. X=XCP Y=YCP -C + RETURN END SUBROUTINE WCPSBC(COLOR) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDSTBC -Set Background Color. -C + C R.W.Simons -05DEC80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Devices with a constant white background. (LXY, C HC1, ALP) -C + C ENTRY CONDITIONS -COLOR = integer color table index. Range 0-255. C Default: device dependent, in range 0-7. -C + C CALLS -VBERRH -C + C EXIT CONDITIONS -VECTOR(2) = real updated background color (COLOR). -C + C NARRATIVE -Set the background color for following VDNWPG or C TEXT primitives for devices supporting these C features. For example, many raster devices support @@ -1840,11 +1832,11 @@ SUBROUTINE WCPSBC(COLOR) C dependent value in the range 0-7. C If an unsupported value is specified, set to C default. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER COLOR -C + C CURRENT ATTRIBUTE VALUES. (DEVICE-INDEPENDENT) REAL VECTOR(7) COMMON /VCATTR/ VECTOR @@ -1855,29 +1847,29 @@ SUBROUTINE WCPSBC(COLOR) C (5)=LINE WIDTH C (6)=CHARACTER BOX Y C (7)=CHARACTER BOX X -C + C CHECK FOR VALID COLOR. IF(COLOR.LT.0.OR.COLOR.GT.255) THEN CALL VBERRH(724,5) GOTO 999 END IF -C + C ONLY THE SINGLE BACKGROUND COLOR 7 (WHITE) IS SUPPORTED, C SO NO ACTION IS NECESSARY. -C + vector(2) = color 999 RETURN END SUBROUTINE WCPSCO(INDEX,CLRARY,CLRMOD) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDSTCO -Set Color Table. -C + C R.W.SIMONS -02DEC80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Black and White Devices. (LXY, HC1, ALP) -C + C ENTRY CONDITIONS -NUM = integer number of color indexes to be set. C Range 1-256. C INDEX = integer array of indexes to be set. Range @@ -1903,11 +1895,11 @@ SUBROUTINE WCPSCO(INDEX,CLRARY,CLRMOD) C 7 white 1.,1.,1. C CLRMOD = integer color model being used. Range 0,1. C Default: 0 (RGB). -C + C CALLS -VBERRH -C + C EXIT CONDITIONS - -C + C NARRATIVE -Set one or more color table entries. This is a C dynamic setting, if the device will support it. C "Dynamic" neans that primitives which have already @@ -1930,31 +1922,30 @@ SUBROUTINE WCPSCO(INDEX,CLRARY,CLRMOD) C All devices must support at least a single device C dependent INDEX value in the range 0-7. If an C unsupported value is specified, it should be ignored. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER INDEX,CLRMOD REAL CLRARY(3) CHARACTER*6 KOLIND CHARACTER*20 KOLCOM COMMON /VCVEC1/ IVECT INTEGER IVECT -C + C ARRAY TO CONTAIN COMPLETE COLOR TABLE -C + COMMON /PCOLST/ PCOLS(3,256) -C + C mopoly controls polygon fill =0, on ; =1, off C mocolr controls color =0, on ; =1, off COMMON /VCPSTB/ MOPOLY, MOCOLR -C -C + C CHECK FOR VALID CLRMOD. IF(CLRMOD.NE.0.AND.CLRMOD.NE.1) THEN CALL VBERRH(725,5) GOTO 999 END IF -C + C CHECK FOR VALID INDEXES. IF(INDEX.LT.0.OR.INDEX.GT.255) THEN CALL VBERRH(724,5) @@ -1971,19 +1962,19 @@ SUBROUTINE WCPSCO(INDEX,CLRARY,CLRMOD) CALL VBERRH(727,5) GOTO 100 END IF -C + C 256 INDEXES ARE SUPPORTED: PCOLS(1,INDEX+1)=CLRARY(1) PCOLS(2,INDEX+1)=CLRARY(2) PCOLS(3,INDEX+1)=CLRARY(3) -C + C define symbol for color reference -C + IF(MOCOLR.NE.0) GO TO 390 -C + C if a set of vectors was in process, issue stroke command C to draw them - then start a new path. -C + IF(IVECT.NE.0) THEN CALL PSTBUF(2,'s ') IVECT=0 @@ -2017,32 +2008,32 @@ SUBROUTINE WCPSCO(INDEX,CLRARY,CLRMOD) CALL VBERRH(727,5) GOTO 100 END IF -C + C 256 INDEXES ARE SUPPORTED: STOP 'HLS COLORS NOT AVAILABLE' END IF 100 CONTINUE -C + 999 RETURN END SUBROUTINE WCPSFC(COLOR) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDSTFC -Set Foreground Color. -C + C R.W.Simons -05DEC80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Devices with a constant black foreground. (LXY, C HC1) -C + C ENTRY CONDITIONS -COLOR = integer color table index . Range 0-255. C Default is device dependent, in range 0-7. -C + C CALLS -VBERRH -C + C EXIT CONDITIONS -VECTOR(1) = real updated foreground color (COLOR). -C + C NARRATIVE -Set the foreground color index, i.e., the color C table index used for drawing future primitives. C Color is an integer from 0-255 which is used as an @@ -2051,16 +2042,16 @@ SUBROUTINE WCPSFC(COLOR) C dependent value in the range 0-7. C If an unsupported value is specified, set to C default. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER COLOR CHARACTER*5 KOLIND -C + C ARRAY TO CONTAIN COMPLETE COLOR TABLE -C + COMMON /PCOLST/ PCOLS(3,256) -C + C pstmlw controls minimum line width C kpstbg controls background coloring C = 0, not colored (white ground from paper) @@ -2069,11 +2060,11 @@ SUBROUTINE WCPSFC(COLOR) C = 0, no interchange C = 1, colors interchanged COMMON /VCPSTA/ PSTMLW, KPSTBG, KPSTCI -C + C mopoly controls polygon fill =0, on ; =1, off C mocolr controls color =0, on ; =1, off COMMON /VCPSTB/ MOPOLY, MOCOLR -C + COMMON /VCVEC1/ IVECT INTEGER IVECT C CURRENT ATTRIBUTE VALUES. (DEVICE-INDEPENDENT) @@ -2086,17 +2077,16 @@ SUBROUTINE WCPSFC(COLOR) C (5)=LINE WIDTH C (6)=CHARACTER BOX Y C (7)=CHARACTER BOX X -C C CHECK FOR VALID COLOR. IF(COLOR.LT.0.OR.COLOR.GT.255) THEN CALL VBERRH(724,5) GO TO 999 END IF -C + VECTOR(1)=COLOR IF(MOCOLR.EQ.0) THEN -C + C draw any vectors in stack before changing colors IF(IVECT.NE.0) THEN CALL PSTBUF(4,'s r ') @@ -2105,7 +2095,7 @@ SUBROUTINE WCPSFC(COLOR) CALL PSTBUF(0,' ') IVECT=0 END IF -C + C code using symbols KOLIND='c' IF(COLOR.LE.9) THEN @@ -2128,27 +2118,27 @@ SUBROUTINE WCPSFC(COLOR) NNN=5 END IF CALL PSTBUF(NNN,KOLIND(1:NNN)) -C + END IF 999 RETURN END SUBROUTINE WCPSIN(INTEN) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDSTIN -Set Intensity. -C + C R.W.Simons -05DEC80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Single Intensity Devices. (LXY, HC1) -C + C ENTRY CONDITIONS -INTEN = real intensity of the image of an output C primitive. Range 0.-1. Default: device dependent. -C + C CALLS - -C + C EXIT CONDITIONS -VECTOR(3) = real updated intensity (INTEN). -C + C NARRATIVE -Set the intensity value indicated for future C primitives. Intensity is a real value between 0 C (not visible) and 1 (maximum). Intensities are @@ -2156,11 +2146,11 @@ SUBROUTINE WCPSIN(INTEN) C All devices must support at least a single value: C 1.0. If an unsupported value is specified, set to C the closest supported intensity. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL INTEN -C + C CURRENT ATTRIBUTE VALUES. (DEVICE-INDEPENDENT) REAL VECTOR(7) COMMON /VCATTR/ VECTOR @@ -2171,39 +2161,38 @@ SUBROUTINE WCPSIN(INTEN) C (5)=LINE WIDTH C (6)=CHARACTER BOX Y C (7)=CHARACTER BOX X -C + C CHECK FOR VALID INTEN. IF(INTEN.LT.0.0.OR.INTEN.GT.1.0) THEN CALL VBERRH(401,5) GOTO 999 END IF -C + C ONLY THE SINGLE INTENSITY 1.0 (MAXIMUM) IS SUPPORTED, C SO NO ACTION IS NECESSARY. -C + 999 RETURN END SUBROUTINE WCPSIT C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VITERM -TERMINATE. -C + C D.L. CAMPBELL -1-DEC-1986 C J.P. LONG -9-NOV-1987 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS - -C + C CALLS - -C + C EXIT CONDITIONS - -C + C NARRATIVE -Terminate graphics device. Close output file. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C -C + C COMPUTER DEPENDENT COMMON VARIABLES AND CONSTANTS. include 'vcpstc.blk' COMMON /VCPAGE/ TOTPAG @@ -2212,7 +2201,7 @@ SUBROUTINE WCPSIT C mopoly controls polygon fill =0, on ; =1, off C mocolr controls color =0, on ; =1, off COMMON /VCPSTB/ MOPOLY, MOCOLR -C + C put out the last page and restore postscript environment so C nothing is left on the stack CALL WCPSIG @@ -2238,78 +2227,77 @@ SUBROUTINE WCPSIT C CLOSE OUTPUT FILE CALL PSTCFS(KOUTFL,1) CALL WCPSMO(2) -C + RETURN END SUBROUTINE WCPSIM(X,Y) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VIMOVA -Move Absolute. -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS -X,Y = real NDC position. -C + C CALLS - -C + C EXIT CONDITIONS -XCP,YCP = real updated current position. (X,Y) -C + C NARRATIVE -Set current position to absolute NDC position X,Y. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL X,Y -C -C + C move CALL VBVECT(0,X,Y) -C + RETURN END SUBROUTINE WCPSIP(X,Y) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VIPNTA -Point Absolute. -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS -X,Y = real NDC position. -C + C CALLS -VIMOVA,VILINA -C + C EXIT CONDITIONS - -C + C NARRATIVE -Set current position to absolute NDC position X,Y C and put a visible point there. Attributes C foreground color and intensity apply. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL X,Y -C + CALL WCPSIM(X,Y) CALL WCPSIL(X,Y) -C + RETURN END SUBROUTINE WCPS12(XARRAY,YARRAY,NPTS) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VIPOLY -POLYGON FILL ROUTINE -C + C D.L. CAMPBELL -1-DEC-1986 C J.P. LONG -9-NOV-1987 -C + C ENVIRONMENT -Fortran77, QMS -C + C ENTRY CONDITIONS -XARRAY-ARRAY OF X VALUES OF THE POLYGON C YARRAY-CORRESPONDING ARRAY OF Y VALUES C NPTS- NUMBER OF POINTS IN (XARRAY,YARRAY) -C + C CALLS - -C + C EXIT CONDITIONS - -C + C NARRATIVE -The polygon defined by XARRAY,YARRAY will be drawn C and filled (constrained by any limitations of the C physical device -- see below). No checking will be @@ -2318,11 +2306,11 @@ SUBROUTINE WCPS12(XARRAY,YARRAY,NPTS) C boundary is drawn using the solid line style. C VDI will close the polygon (i.e. the last point C will be connected to the first). -C + C The level of support for this primitive is device- C dependent. The level of support is categorized C as follows: -C + C Level 0 -- no polygon fill. Only the polygon C boundary is drawn. C Level 1 -- the device fills convex polygons. @@ -2335,18 +2323,18 @@ SUBROUTINE WCPS12(XARRAY,YARRAY,NPTS) C is drawn to that point from a point far outside C the polygon, that line intersects the polygon C boundary an odd number of times. -C + C Note that the level of support for a particular device C can be inquired using the function VDIQDC. -C + ******************************************************************************** -C + C The level for this device is level 2. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL XARRAY(NPTS),YARRAY(NPTS) -C + C ESCAPE FLAGS C PATNO AND BORDER USED BY VIPOLY FOR PATTERN FILL AND BORDER ON/OFF. DEFAULT C COMPLETE FILL AND BORDER ON @@ -2366,25 +2354,25 @@ SUBROUTINE WCPS12(XARRAY,YARRAY,NPTS) COMMON /VCVEC2/ COORD, LSTCRD CHARACTER COORD*20, LSTCRD*20 INTEGER IVECT -C + C mopoly controls polygon fill =0, on ; =1, off C mocolr controls color =0, on ; =1, off COMMON /VCPSTB/ MOPOLY, MOCOLR -C + C CHECK FOR VALID N IF (NPTS.LT.1 .OR. NPTS.GT.1490) THEN CALL VBERRH(802,5) GO TO 999 END IF -C + C IF A SET OF VECTORS WAS IN PROCESS, ISSUE STROKE COMMAND TO DRAW THEM C Start a new path. -C + IF(IVECT.NE.0) THEN CALL PSTBUF(2,'s ') IVECT=0 END IF -C + CALL PSTBUF(2,'r ') CALL PSTBUF(0,' ') CALL PSTBUF(4,'v o ') @@ -2395,20 +2383,20 @@ SUBROUTINE WCPS12(XARRAY,YARRAY,NPTS) CALL WCPSFC(NINT(VECTOR(1))) END IF CALL PSTBUF(0,' ') -C + C DRAW POLYGON VECTORS -C + C MOVE TO FIRST POINT CALL WCPSIM(XARRAY(1),YARRAY(1)) -C + C CALL VDLINA TO DRAW POINTS FROM 1ST POINT TO NTH POINT DO 100 I=2,NPTS CALL WCPSIL(XARRAY(I),YARRAY(I)) 100 CONTINUE -C + C THEN DRAW A LINE TO THE FIRST POINT TO CLOSE THE POLYGON CALL WCPSIL(XARRAY(1),YARRAY(1)) -C + C CLOSE THE POLYGON, GRAPHICS SAVE, FILL IT, GRAPHICS RESTORE, STROKE C TO PROVIDE THE SAME FILLED AREA AS IF IT WERE FILLED WITH VECTORS C THEN RESTORE AND SAVE POSTSCRIPT ENVIRONMENT TO AVOID INPUT BUFFER OVERFLOW @@ -2424,48 +2412,48 @@ SUBROUTINE WCPS12(XARRAY,YARRAY,NPTS) c CALL VDSTCS(VECTOR(6)) END IF CALL PSTBUF(0,' ') -C + C INIT THE CURRENT POSITION WITHIN POSTSCRIPT CALL WCPSMV(XARRAY(NPTS),YARRAY(NPTS)) IVECT=0 -C + 999 RETURN END SUBROUTINE WCPSIG C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VINWPG -New Page. -C + C D.L. CAMPBELL -1-DEC-1986 C J.P. LONG -9-NOV-1987 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS - -C + C CALLS - -C + C EXIT CONDITIONS - -C + C NARRATIVE -Physically advance the medium or clear the screen, C whichever is appropriate. Also flood the screen C with the background color on devices that support C this. The current position is not changed. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + COMMON /VCVEC1/ IVECT COMMON /VCVEC2/ COORD,LSTCRD -C + C vcpstd variables control what to do with empty frames with C command is received to dump data to output C kempty=0, frame is void - do not draw C >0, frame has data - draw it COMMON /VCPSTD/ KEMPTY -C + CHARACTER COORD*20, LSTCRD*20 CHARACTER*10 KPAGE -C + C pstmlw controls minimum line width C kpstbg controls background coloring C = 0, not colored (white ground from paper) @@ -2485,51 +2473,51 @@ SUBROUTINE WCPSIG C (5)=LINE WIDTH C (6)=CHARACTER BOX Y C (7)=CHARACTER BOX X -C + COMMON /VCPAGE/ TOTPAG INTEGER TOTPAG DATA NPAGE /0/ -C + C check for void page draw request C if nothing is on page, skip request -C + NPAGE=NPAGE+1 TOTPAG = NPAGE WRITE(KPAGE,'(I10)',ERR=345) NPAGE GO TO 349 345 KPAGE=' ???' 349 IF(KEMPTY.EQ.0) GO TO 350 -C + C stroke the path in case there are any vectors and show text CALL PSTBUF(2,'s ') IVECT=0 -C + C showpage and restore postscript environment to avoid buffer overflow C flush buffer because save and restore won't work back-to-back -C + CALL PSTBUF(4,'p r ') CALL PSTBUF(0,' ') -C + C comment frame number in output file -C + CALL PSTBUF(31,'%%Page: "'//KPAGE//'" '//KPAGE) CALL PSTBUF(0,' ') CALL PSTBUF(28, '%%PageOrientation: Landscape') CALL PSTBUF(0,' ') CALL PSTBUF(32, '%%PageBoundingBox: 36 30 574 750') CALL PSTBUF(0,' ') -C + CALL PSTBUF(4,'v o ') -C + C shade background if appropriate -C + IF(KPSTBG.NE.0) THEN CALL PSTBBG END IF GO TO 370 -C + C void frame -- First Page -C + 350 CALL PSTBUF(2, 'r ') CALL PSTBUF(0,' ') CALL PSTBUF(31,'%%Page: "'//KPAGE//'" '//KPAGE) @@ -2539,43 +2527,42 @@ SUBROUTINE WCPSIG CALL PSTBUF(32, '%%PageBoundingBox: 36 30 574 750') CALL PSTBUF(0,' ') CALL PSTBUF(4, 'v o ') -C + 370 CALL WCPSLW(VECTOR(5)) c CALL VDSTCS(VECTOR(6)) CALL WCPSFC(NINT(VECTOR(1))) CALL PSTBUF(0,' ') KEMPTY=0 -C + RETURN END SUBROUTINE WCPSES(ESCPCD,N,ARGS) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDESCP -Escape Code Routine. -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS -ESCPCD = integer escape function code. C N = integer number of arguments in ARG. RANGE >=0. C ARGS = real array of arguments for the escape C function specified. -C + C CALLS - -C + C EXIT CONDITIONS - -C + C NARRATIVE -Invoke the nonstandard, device-dependent function C ESCPCD. N is the number of arguments used by this C function and ARGS is a real array containing those C arguments. Unsupported values of ESCPCD are C ignored, not causing an error. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER ESCPCD,N REAL ARGS(*) -C C COMPUTER DEPENDENT COMMON VARIABLES AND CONSTANTS. include 'vcpstc.blk' C SCALE FACTORS FOR NDC TO DC MAPPING. (LXY,HC1) @@ -2584,18 +2571,18 @@ SUBROUTINE WCPSES(ESCPCD,N,ARGS) C DC DIMENSIONS OF OFFSETS AND PICTURE. (LXY,HC1) INTEGER XPAD,YPAD,XDEVIC,YDEVIC COMMON /VCDDIM/ XPAD,YPAD,XDEVIC,YDEVIC -C + C USED BY VIPOLY FOR PATTERN FILL AND BORDER ON/OFF. DEFAULT COMPLETE FILL C AND BORDER ON. PLC. COMMON/VCESCP/PGFORM,PATNO,BORDER INTEGER PGFORM,PATNO,BORDER -C + C CHECK FOR VALID N. IF(N.LT.0) THEN CALL VBERRH(802,5) GOTO 999 END IF -C + C 2100 - PAGE FORMAT (0=LANDSCAPE,1=PORTRAIT) IF (ESCPCD.EQ.2100) THEN IF (ARGS(1).EQ.0) THEN @@ -2603,9 +2590,9 @@ SUBROUTINE WCPSES(ESCPCD,N,ARGS) ELSE PGFORM=1 ENDIF -C + C set output format -C + ELSEIF (ESCPCD.EQ.2101) THEN CALL PSTSEL('1') ELSEIF (ESCPCD.EQ.2102) THEN @@ -2627,68 +2614,65 @@ SUBROUTINE WCPSES(ESCPCD,N,ARGS) ELSEIF (ESCPCD.EQ.2110) THEN CALL PSTSEL('10') ENDIF -C + 999 RETURN END SUBROUTINE WCPSIL (X,Y) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VILINA -C + C D.L. CAMPBELL -1-DEC-1986 C J.P. LONG -9-NOV-1987 -C + C ENVIRONMENT -DEVICE DEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS -X,Y REAL NDC COORDINATES -C + C CALLS - -C + C EXIT CONDITIONS -CURRENT POSITION IS SET -C -C + C NARRATIVE C LINE-DRAW A LINE FROM CP TO ABSOLUTE NDC POSITION X,Y C AND UPDATE CP . ATTRIBUTES COLOR,INTEN,LINSTY AND C LINWTH APPLY. -C -C + C OTHER VARIABLES: C XCP,YCP-NDC COORDINATES C*************************************************************************** -C + REAL X,Y -C + C vcpstd variables control what to do with empty frames with C command is received to dump data to output C kempty=0, frame is void - do not draw C >0, frame has data - draw it COMMON /VCPSTD/ KEMPTY -C -C + C draw ENTRY VBLINA(X,Y) CALL VBVECT(1,X,Y) KEMPTY=1 -C + RETURN END SUBROUTINE VBVECT(IPEN,X,Y) C**************************************************** C vbvect - do move or draw to x,y (depending on ipen) -C + C ipen = 0 for move, 1 for draw C x,y = NDC coordinates to be moved/drawn to -C + C****************************************************** -C + REAL X,Y,XOFF,YOFF CHARACTER CTEMP*20,XCOORD*4,YCOORD*4 -C + C mopoly controls polygon fill =0, on ; =1, off C mocolr controls color =0, on ; =1, off COMMON /VCPSTB/ MOPOLY, MOCOLR -C + C SCALE FACTORS FOR NDC TO DC MAPPING. (LXY,HC1) REAL XSCALE,YSCALE COMMON /VCSCAL/ XSCALE,YSCALE @@ -2712,15 +2696,15 @@ SUBROUTINE VBVECT(IPEN,X,Y) COMMON /VCVEC2/ COORD, LSTCRD CHARACTER COORD*20, LSTCRD*20 INTEGER IVECT -C + C compute new point in dev. coord. C convert to floating offsets XOFF=XPAD YOFF=YPAD -C + IXDC=X*XSCALE+XOFF IYDC=Y*YSCALE+YOFF -C + C write(xcoord,'(i5)')ixdc C write(ycoord,'(i5)')iydc C ...include both x,y @@ -2728,7 +2712,7 @@ SUBROUTINE VBVECT(IPEN,X,Y) CALL PSTI2C(IYDC,4,YCOORD) COORD = XCOORD(1:3)//'.'//XCOORD(4:4)//' '// 1 YCOORD(1:3)//'.'//YCOORD(4:4) -C + C pack up move/draw command, send it down C if (lstcrd(1:11) .ne. coord(1:11)) then IF (IPEN.EQ.0) THEN @@ -2741,7 +2725,7 @@ SUBROUTINE VBVECT(IPEN,X,Y) IVECT=IVECT+1 C end if lstcrd(1:11) = coord(1:11) -C + C stroke the path if we are approaching the 1500-coord pair limit C also restore and save postscript environment to avoid C input buffer overflow (must have a c/r between restore @@ -2759,34 +2743,34 @@ SUBROUTINE VBVECT(IPEN,X,Y) C reinitted the current posn IVECT=1 ENDIF -C + C UPDATE CURRENT POSITION XCP=X YCP=Y -C + RETURN END SUBROUTINE WCPSIX(LENGT1,CHARS) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VITEXT - Text from Array. -C + C P. Watterberg - 24 MAR 81 C J. P. LONG - 3 DEC 87 -C + C ENVIRONMENT - COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS - LENGT1 = integer number of characters in CHARS. C Range 1-136. C CHARS = integer array of ASCII characters, one C character per array element, right justified. C Range 8,10,32-126. -C + C CALLS - vbout -C + C EXIT CONDITIONS - XCP,YCP = integer updated current position (at the end C of the string). -C + C NARRATIVE - Draw LENGT1 characters in CHARS, starting at C current position and update current position to C the point after the last character box where the @@ -2799,11 +2783,11 @@ SUBROUTINE WCPSIX(LENGT1,CHARS) C considered reasonable. Attributes foreground color, C background color, intensity, and character size C apply. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER LENGT1, CHARS(136), LENGTH -C + CHARACTER CTEMP*150,STR*3 C CURRENT POSITION. REAL XCP,YCP @@ -2825,15 +2809,15 @@ SUBROUTINE WCPSIX(LENGT1,CHARS) C DC DIMENSIONS OF OFFSETS AND PICTURE. (LXY,HC1) INTEGER XPAD,YPAD,XDEVIC,YDEVIC COMMON /VCDDIM/ XPAD,YPAD,XDEVIC,YDEVIC -C + C vcpstd variables control what to do with empty frames with C command is received to dump data to output C kempty=0, frame is void - do not draw C >0, frame has data - draw it COMMON /VCPSTD/ KEMPTY -C + C check for valid length. -C + call WCPSCS(vector(6)) KEMPTY=1 LENGTH = LENGT1 @@ -2841,31 +2825,31 @@ SUBROUTINE WCPSIX(LENGT1,CHARS) CALL VBERRH(212,5) GO TO 999 END IF -C + C if(length.gt.136) then call vberrh(213,5), and use the C maximum length of 136. -C + IF(LENGTH.GT.136) THEN CALL VBERRH(213,5) LENGTH = 136 ENDIF -C + CTEMP='(' LENOUT=1 -C + C loop through length characters. -C + DO 100 I=1,LENGTH -C + C check for valid chars. -C + C ignore control characters, except for: C 8 is backspace C 10 is linefeed C 13 is carriage return -C + IF(CHARS(I).LT.32 .OR. CHARS(I).GT.126) THEN -C + IF(CHARS(I).EQ.8) THEN DX=-VECTOR(7) DY=0. @@ -2881,9 +2865,9 @@ SUBROUTINE WCPSIX(LENGT1,CHARS) CALL VBERRH(208,5) GOTO 100 ENDIF -C + C finish the string, emulate the control char, and start a new one -C + C send the buffered chars to the printer if there are any IF(LENOUT.NE.1) THEN CTEMP(LENOUT+1:150)=') t ' @@ -2892,64 +2876,63 @@ SUBROUTINE WCPSIX(LENGT1,CHARS) C reset the cp from the characters XCP=XCP+(LENOUT-5)*VECTOR(7) ENDIF -C + C calculate the new current position after the control char XCP=XCP+DX YCP=YCP+DY CALL VBVECT(0,XCP,YCP) -C + C start a new string CTEMP='(' LENOUT=1 -C + ELSE -C + C Char value is 32-126 inclusive. Put \ before these: C 92 is \ C 40 is ( C 41 is ) -C + IF(CHARS(I).EQ.40.OR.CHARS(I).EQ.41.OR.CHARS(I).EQ.92) THEN CTEMP(LENOUT+1:150)='\\' LENOUT=LENOUT+1 ENDIF -C + C now pack the chars into the buffer -C + CALL PSTA2C(CHARS(I),STR) CTEMP(LENOUT+1:150)=STR(1:1) LENOUT=LENOUT+1 ENDIF -C + 100 CONTINUE -C + C send the chars to the printer -C + CTEMP(LENOUT+1:150)=') t ' LENOUT=LENOUT+4 CALL PSTBUF(LENOUT,CTEMP) -C + C reset the cp from the characters -C + XCP=XCP+(LENOUT-5)*VECTOR(7) -C + 999 RETURN END SUBROUTINE WCPSLS(LINSTY) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDSTLS -Set Line Style. -C -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS -LINSTY = integer linestyle of line drawing output C primitives. Range 0-5. Default:0. -C + C CALLS - -C + C EXIT CONDITIONS -VECTOR(4) = real updated line style (LINSTY). -C + C NARRATIVE -Set the style of line as below. This applies only C to line drawing primitives. The line styles are: C 0 - solid @@ -2961,7 +2944,7 @@ SUBROUTINE WCPSLS(LINSTY) C All devices must support at least the values 0 and C 5. If an unsupported value is specified, set to 5. C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL LW INTEGER LINSTY,ILL,JLL COMMON /VCVEC1/ IVECT @@ -2969,7 +2952,7 @@ SUBROUTINE WCPSLS(LINSTY) CHARACTER COORD*20, LSTCRD*20 INTEGER IVECT CHARACTER CTEMP*30,STRL*3,STRS*3,STRG*3 -C + C CURRENT ATTRIBUTE VALUES. (DEVICE-INDEPENDENT) REAL VECTOR(7) COMMON /VCATTR/ VECTOR @@ -2989,7 +2972,7 @@ SUBROUTINE WCPSLS(LINSTY) C CURRENT ATTRIBUTE VALUES. (DEVICE-INDEPENDENT) C REAL VECTOR(7) C COMMON /VCATTR/ VECTOR -C + C VECTOR(1)=FOREGROUND COLOR C (2)=BACKGROUND COLOR C (3)=INTENSITY @@ -2997,17 +2980,16 @@ SUBROUTINE WCPSLS(LINSTY) C (5)=LINE WIDTH C (6)=CHARACTER BOX Y C (7)=CHARACTER BOX X -C -C + ENTRY VBSTLS(LINSTY) -C + C CHECK FOR VALID LINSTY. IF(LINSTY.LT.0.OR.LINSTY.GT.5) THEN CALL VBERRH(401,5) VECTOR(4) = 0 GOTO 999 END IF -C + IF(IVECT.NE.0) THEN CALL PSTBUF(2,'s ') IVECT=0 @@ -3016,19 +2998,19 @@ SUBROUTINE WCPSLS(LINSTY) IF(LINSTY.EQ.0) THEN CALL PSTBUF(7,'[] 0 h ') ENDIF -C + C calculate the linewidth -- it's needed below in every case -C + C actual xscale is xscale*.1; linewidth=1 => .01 in NDC LW=VECTOR(5) LW=XSCALE*VECTOR(5)*.001 C a linewidth of zero isn't good with postscript IF(LW.LT.1.) LW=1. -C + C from here on, set up patterns that depend on the linewidth and C the extra length added to the line segment C by the hemispherical end cap -C + IF(LINSTY.EQ.1) THEN ILL=NINT(0.5*LW) IGAP=NINT(3.*LW) @@ -3036,7 +3018,7 @@ SUBROUTINE WCPSLS(LINSTY) CALL PSTI2C(IGAP,3,STRG) CTEMP='['//STRL(1:3)//' '//STRG(1:3)//'] 0 h ' CALL PSTBUF(14,CTEMP) -C + ELSE IF(LINSTY.EQ.2) THEN ILL=NINT(18.*LW) JLL=NINT(1.5*LW) @@ -3048,7 +3030,7 @@ SUBROUTINE WCPSLS(LINSTY) * //' '//STRG(1:3)//'] 0 h ' CALL PSTBUF(22,CTEMP) C call pstbuf(14,'[2 2 6 2] 0 h ') -C + ELSE IF(LINSTY.EQ.3) THEN ILL=NINT(6.*LW) IGAP=NINT(7.*LW) @@ -3057,7 +3039,7 @@ SUBROUTINE WCPSLS(LINSTY) CTEMP='['//STRL(1:3)//' '//STRG(1:3)//'] 0 h ' CALL PSTBUF(14,CTEMP) C call pstbuf(8,'[4] 0 h ') -C + ELSE IF(LINSTY.EQ.4) THEN ILL=NINT(24.*LW) IGAP=NINT(18.*LW) @@ -3066,7 +3048,7 @@ SUBROUTINE WCPSLS(LINSTY) CTEMP='['//STRL(1:3)//' '//STRG(1:3)//'] 0 h ' CALL PSTBUF(14,CTEMP) C call pstbuf(8,'[8] 0 h ') -C + ELSE IF(LINSTY.EQ.5) THEN ILL=NINT(12.*LW) IGAP=NINT(10.*LW) @@ -3074,43 +3056,43 @@ SUBROUTINE WCPSLS(LINSTY) CALL PSTI2C(IGAP,3,STRG) CTEMP='['//STRL(1:3)//' '//STRG(1:3)//'] 0 h ' CALL PSTBUF(14,CTEMP) -C + ENDIF -C + C redefine the postscript current position -C + C the code below is equivalent to C call vbvect(0,xcp,ycp) C but can't do it because vbvect calls vdstlw which calls this routine -C + CTEMP=COORD(1:11)//' m ' CALL PSTBUF(14,CTEMP) -C + VECTOR(4)=LINSTY -C + 999 RETURN END SUBROUTINE WCPSCS(YSIZE) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDSTCS -Set Character Size. -C + C R.W.Simons -05DEC80 C J. P. LONG -03 DEC 87 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Devices that support only software characters. C (LXY, HC1) -C + C ENTRY CONDITIONS -YSIZE = real Y dimension of the character box in NDC C space. Range 0.-1. Default: device dependent, C typically the smallest hardware size. -C + C CALLS - -C + C EXIT CONDITIONS -VECTOR(6) = real updated character box Y (YSIZE). C VECTOR(7) = real updated character box X. -C + C NARRATIVE -Set the character size for text primitives. Size C is given by YSIZE as the Y dimension of the C character box. The SVDI will assign the X dimension @@ -3122,12 +3104,12 @@ SUBROUTINE WCPSCS(YSIZE) C unsupported value is specified, set to the largest C supported character size that does not exceed the C specified size. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL YSIZE CHARACTER STR*4,CTEMP*10 -C + C CURRENT ATTRIBUTE VALUES. (DEVICE-INDEPENDENT) REAL VECTOR(7) COMMON /VCATTR/ VECTOR @@ -3141,66 +3123,66 @@ SUBROUTINE WCPSCS(YSIZE) C SCALE FACTORS FOR NDC TO DC MAPPING. (LXY,HC1) REAL XSCALE,YSCALE COMMON /VCSCAL/ XSCALE,YSCALE -C + C CHECK FOR VALID YSIZE. IF(YSIZE.LT.0.0.OR.YSIZE.GT.1.0) THEN CALL VBERRH(401,5) GOTO 999 END IF -C + C PROTECT INPUT PARAMETER FROM BEING CHANGED. YSIZE1=YSIZE -C + C DON'T ALLOW VALUES BELOW THE MINIMUM "HARDWARE" SIZE. IF(YSIZE1.LT.0.01) YSIZE1=0.01 -C + C VALUES ESTABLISHED HERE ARE USED BY VBSIM IN SIMULATING CHARACTERS. C ALWAYS USE A CHARACTER ASPECT RATIO OF 5/7. VECTOR(6)=YSIZE1 VECTOR(7)=YSIZE1*5./7. -C + C convert the character size into device coords -C + IYSIZE=NINT(XSCALE*YSIZE1) -C + C output the postscript command -C + CALL PSTI2C(IYSIZE,4,STR) C iysize is in tenths of device units CTEMP='y '//STR(1:3)//' x ' CALL PSTBUF(8,CTEMP) -C + 999 RETURN END SUBROUTINE WCPSLW(LINWTH) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDSTLW -Set Line Width. -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS -LINWTH = real line width of line drawing output C primitives. Range 0.-1. Default: device dependent. -C + C CALLS - -C + C EXIT CONDITIONS -VECTOR(5) = real updated line width (LINWTH). -C + C NARRATIVE -Set the relative width of an output line. Values C are 0.-1. with 1. being .01 in NDC space. C All devices must support at least a single device C dependent value that is the default. If an C unsupported value is specified, set to the closest C supported line width. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL LINWTH,LW CHARACTER CTEMP*19,STR*5 -C + COMMON /VCVEC1/ IVECT INTEGER IVECT -C + C COMPUTER DEPENDENT COMMON VARIABLES AND CONSTANTS. include 'vcpstc.blk' C CURRENT ATTRIBUTE VALUES. (DEVICE-INDEPENDENT) @@ -3216,7 +3198,7 @@ SUBROUTINE WCPSLW(LINWTH) C SCALE FACTORS FOR NDC TO DC MAPPING. (LXY,HC1) REAL XSCALE,YSCALE COMMON /VCSCAL/ XSCALE,YSCALE -C + C pstmlw controls minimum line width C kpstbg controls background coloring C = 0, not colored (white ground from paper) @@ -3225,25 +3207,25 @@ SUBROUTINE WCPSLW(LINWTH) C = 0, no interchange C = 1, colors interchanged COMMON /VCPSTA/ PSTMLW, KPSTBG, KPSTCI -C + C CHECK FOR VALID LINWTH. IF(LINWTH.LT.0.0.OR.LINWTH.GT.1.) THEN CALL VBERRH(401,5) GOTO 999 END IF -C + C test user define minimum -C + WIDTH=MAX(PSTMLW,LINWTH) -C + C CONVERT LINE-WIDTH TO NDC LW=WIDTH*.005 -C + C CONVERT WIDTH TO DEVICE COORDINATES AND ADD A DIGIT; NEED IT TO HUNDREDTHS ILW=NINT(XSCALE*LW*10.) C A LINEWIDTH OF ZERO WORKS ONLY PART OF THE TIME IF(ILW.LT.10) ILW=10 -C + C SET LINE WIDTH CALL PSTI2C(ILW,5,STR) IF(IVECT.NE.0) THEN @@ -3254,35 +3236,35 @@ SUBROUTINE WCPSLW(LINWTH) CTEMP=STR(1:3)//'.'//STR(4:5)//' w ' CALL PSTBUF(9,CTEMP) END IF -C + VECTOR(5)=WIDTH -C + C since linestyle uses the linewidth in setting the pattern, call it -C + LINSTY=VECTOR(4) CALL VBSTLS(LINSTY) 999 RETURN END SUBROUTINE WCPSIE(ESCPCD,SUPPORT) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDIQES -Inquire Escape. -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS -ESCPCD = integer escape function code. -C + C CALLS - -C + C EXIT CONDITIONS -SUPPRT = integer level of support for the escape C function specified. Range 0,1,2. -C + C NARRATIVE -An integer value indicating 2=hardware supported, C 1=software supported, 0=unsupported is returned in C SUPPORT for the escape function ESCPCD. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER ESCPCD,SUPPORT IF (ESCPCD.EQ.2100) THEN SUPPORT=2 @@ -3296,45 +3278,44 @@ SUBROUTINE WCPSIE(ESCPCD,SUPPORT) END SUBROUTINE PSTBUF(NCHRS,OUT) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C PSTBUF -Output PostScript data -C + C C. D. Brown -DEC 1986 (Adapted from QMSBUF) -C + C ENVIRONMENT -COMPUTER/DEVICE DEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS -NCHRS = integer number of characters in OUT. C = 0 means flush the buffer. C OUT = character string of input data C KOUTFL = integer number of the graphics output file. -C + C CALLS - -C + C EXIT CONDITIONS - -C + C NARRATIVE -The data in OUT is buffered for output to KOUTFL. C The buffer is output when it is "full" or a buffer C flush is requested by specifying NCHRS<=0. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + SAVE INTEGER NCHRS CHARACTER OUT*(*) character*132 lstout integer lstchr -C -C + C COMPUTER DEPENDENT COMMON VARIABLES AND CONSTANTS. include 'vcpstc.blk' -C + C **NOTE: BUFFER SIZE (IN BITS) MUST BE AN EXACT MULTIPLE OF 8 (8-BIT DATA C MUST END EXACTLY AT WORD BOUNDARY) INTEGER CHARLN,ICNT,REMAIN CHARACTER CBUF*130 C CHARLN=BUFFER SIZE IN CHARS DATA ICNT/1/,CHARLN/130/,LSTCHR/-1/,LSTOUT/' '/ -C + C ...Check that last output string does not match current output GDS if (lstchr .eq. nchrs) then if (lstout(:lstchr) .eq. out(:nchrs)) return @@ -3344,7 +3325,7 @@ SUBROUTINE PSTBUF(NCHRS,OUT) C COMPUTE REMAINING AVAILABLE CHARACTERS IN BUFFER REMAIN=CHARLN-ICNT+1 -C + C CHECK FOR BUFFER FLUSH REQUEST OR NOT ENOUGH ROOM IN BUFFER. IF((NCHRS.LE.0).OR.(NCHRS.GT.REMAIN)) THEN C TEST IF THERE'S ANYTHING TO FLUSH. @@ -3359,67 +3340,67 @@ SUBROUTINE PSTBUF(NCHRS,OUT) ICNT=1 ENDIF ENDIF -C + C ADD TO BUFFER IF (NCHRS.GT.0) THEN CBUF(ICNT:ICNT+NCHRS-1)=OUT(1:NCHRS) ICNT=ICNT+NCHRS ENDIF -C + RETURN END SUBROUTINE PSTA2C(ASCI,CHARAC) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C PSTA2C - CONVERT FROM ASCII TO CHARACTER -C + C P. Watterberg - 19 Jan 1982 -C + C ENVIRONMENT - computer dependent, system dependent, fortran 77 -C + C ENTRY CONDITIONS - ASCI is an integer representing an ascii character -C + C CALLS - -C + C EXIT CONDITIONS - CHARAC is the character represented by ASCI -C + C NARRATIVE - -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + CHARACTER CHARAC*(*) INTEGER ASCI -C + CHARAC = CHAR(ASCI) -C + return end SUBROUTINE PSTI2C(INT,NDIGIT,ISTR) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C +C C PSTI2C - convert positive integer to decimal character C string equivalent -C +C C ENVIRONMENT - COMPUTER-INdependent -C +C C ENTRY CONDITIONS - int = positive integer to be converted C ndigit = number of digits to be produced in string C form (pad left with zeros) C istr = character string of at least ndigit characters -C +C C CALLS - -C +C C EXIT CONDITIONS - istr contains decimal-string equivalent of int C (ndigits left-justified in istr) -C +C C NARRATIVE - This routine modified 10/89 S.L.Thompson -C +C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C INTEGER INT,NDIGIT CHARACTER ISTR*(*) CHARACTER*1 KA(10) DATA KA /'0','1','2','3','4','5','6','7','8','9'/ -C +C C check input parameters INT1=MAX(INT,0) LENGTH=LEN(ISTR) @@ -3436,14 +3417,14 @@ SUBROUTINE PSTI2C(INT,NDIGIT,ISTR) RETURN END SUBROUTINE PSTBBG -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C Color background black for white paper device. C Should only be called from vdnwpg and viinit. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C pstmlw controls minimum line width C kpstbg controls background coloring C = 0, not colored (white ground from paper) @@ -3452,11 +3433,11 @@ SUBROUTINE PSTBBG C = 0, no interchange C = 1, colors interchanged COMMON /VCPSTA/ PSTMLW, KPSTBG, KPSTCI -C + C mopoly controls polygon fill =0, on ; =1, off C mocolr controls color =0, on ; =1, off COMMON /VCPSTB/ MOPOLY, MOCOLR -C + C CURRENT ATTRIBUTE VALUES. (DEVICE-INDEPENDENT) REAL VECTOR(7) COMMON /VCATTR/ VECTOR @@ -3467,7 +3448,7 @@ SUBROUTINE PSTBBG C (5)=LINE WIDTH C (6)=CHARACTER BOX Y C (7)=CHARACTER BOX X -C + COMMON /VCVEC1/ IVECT INTEGER IVECT COMMON /VCESCP/ PGFORM,PATNO,BORDER @@ -3475,7 +3456,7 @@ SUBROUTINE PSTBBG DIMENSION X(4),Y(4) PARAMETER (ONEN=0.99999) PARAMETER (ASP=0.75) -C + IF(MOPOLY.EQ.0) THEN IF(PGFORM.EQ.0) THEN X(1)=0. @@ -3505,39 +3486,39 @@ SUBROUTINE PSTBBG END SUBROUTINE PSTJOB C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C PSTJOB - GET JOB ID AND ROUTING INFORMATION -C + C ENVIRONMENT - COMPUTER-DEPENDENT FOR CTSS -C + C ENTRY CONDITIONS - -C + C CALLS - -C + C EXIT CONDITIONS - KJTIME - TIME HOLLERITH STRING C KJDATE - DATE HOLLERITH STRING C KUSRID - USER IDENTIFICATION C KJROUT - ROUTING INFORMATION -C + C NARRATIVE - THIS ROUTINE INQUIRES THE SYSTEM TO FIND THE ABOVE C INFORMATION. THE INFO IS PACKED INTO THE ARRAYS AS C HOLLERITH (INTERNAL DISPLAY CODE) STRINGS. A TERMI C CHARACTER "\" IS APPENDED TO EACH STRING SO THE CAL C ROUTINE CAN FIND THE END IF FOR SOME REASON THE LEN C VARIABLES ARE NOT SUFFICIENT. -C + C None of functions are used in pst driver -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C JOB ID INFORMATION. (HC1, DIC) include 'vcjob.blk' -C + C FOR SECURITY MARKINGS, CTSS CODES NEED TO MAP TO THESE SILLY C OLD SCOPE SECURITY CODES -C + C SCOPE 3 CODE -C + C 0 UNCL C 1 UNDEFINED C 2 UNDEFINED @@ -3550,38 +3531,38 @@ SUBROUTINE PSTJOB C 9 SNSI C 10 SFRD C 11 SRD -C + C GET CLASSIFICATION LEVEL KSECUR = 0 -C + C GET USER ID KUSRSZ = 8 KUSRID(1)=0 KUSRID(2)=0 KUSRID(3)=0 KUSRID(4)=0 -C + C GET JOB ID AND USERS NAME KJOBID(1) = 0 KJOBID(2) = 0 KJOBID(3) = 0 KJOBID(4) = 0 KIDSIZ = 24 -C + C GET BOX NUMBER KSZROU = 777 -C + KJROUT(1) = 0 KJROUT(2) = 0 KJROUT(3) = 0 KJROUT(4) = 0 -C + C GET MACHINE ID MACHIN(1) = 0 MACHIN(2) = 0 MACHIN(3) = 0 MACLEN=1 -C + C GET THE TIME AND DATE KJTIME(1)=0 KJTIME(2)=0 @@ -3589,14 +3570,14 @@ SUBROUTINE PSTJOB KJDATE(1)=0 KJDATE(2)=0 KJDATE(3)=0 -C + END SUBROUTINE PSTSEL(KARG) -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C Select type of desired output. Four options are -C + C device number C 1. black & white, batch, no poly fill 799.1 C 2. black & white, interactive, no poly 799.2 @@ -3608,15 +3589,15 @@ SUBROUTINE PSTSEL(KARG) C 8. color, interactive, black-white interchange 799.8 C 9. color, batch, black background 799.9 C 10.color, interactive, black background 799.11 -C + C A second function of this routine is to set the minimum line C width. For most systems the minimum width line is too narrow. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + SAVE CHARACTER*(*) KARG -C + C pstmlw controls minimum line width C kpstbg controls background coloring C = 0, not colored (white ground from paper) @@ -3625,11 +3606,11 @@ SUBROUTINE PSTSEL(KARG) C = 0, no interchange C = 1, colors interchanged COMMON /VCPSTA/ PSTMLW, KPSTBG, KPSTCI -C + C mopoly controls polygon fill =0, on ; =1, off C mocolr controls color =0, on ; =1, off COMMON /VCPSTB/ MOPOLY, MOCOLR -C + COMMON /DEVCAP/ DEV(33) common /blotans/ BLTANS character*2 BLTANS @@ -3768,24 +3749,24 @@ SUBROUTINE PSTSEL(KARG) RETURN END SUBROUTINE PSTINI -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C Generate any system dependent records which must be at the first C of PostScript output file. For example, a SUN laser printer C requires the first record of the file to be %! for the file C recognized as a PostScript file. This routine writes these C initial records. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + SAVE DATA KWAY /0/ IF(KWAY.EQ.0) THEN KWAY=1 -C + C generate first records in output file -C + *- INCLUDE PSTHEAD C the following is for a SUN UNIX system C record is a comment except for sun lpr @@ -3794,6 +3775,6 @@ SUBROUTINE PSTINI CALL PSTBUF(0,' ') *- END IF -C + RETURN END diff --git a/packages/seacas/applications/fastq/cgi/vdx11cps.F b/packages/seacas/applications/fastq/cgi/vdx11cps.F index 22edeb9690e3..0db1f94f68ff 100644 --- a/packages/seacas/applications/fastq/cgi/vdx11cps.F +++ b/packages/seacas/applications/fastq/cgi/vdx11cps.F @@ -1,11 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: vdx11cps.F,v 1.3 2007/01/26 16:58:24 gdsjaar Exp $ - C cps driver is the file device C x11 driver is the terminal device SUBROUTINE VDESCP(ESCPCD,N,ARGS) @@ -52,9 +50,9 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) #else #endif DATA TERMON,FILEON,TERMUP,FILEUP /2*.TRUE.,2*.TRUE./ -C + IF ( ESCPCD.GE.10000 .AND. ESCPCD.LE.10003 ) THEN -C + C Special Escape Codes for Dual Device Control: KSTAT = ESCPCD - 10000 TERMON = (KSTAT.EQ.1 .OR. KSTAT.EQ.3) .AND. TERMUP @@ -75,10 +73,10 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) IF (FILEON) CALL wcpses(ESCPCD,N,ARGS) END IF RETURN -C + C------------------------------------------------------------------------ ENTRY VDIQES(ESCPCD,SUPPORT) -C + C Special Escape Codes for Dual Device Control: IF ( ESCPCD.EQ.10000 ) THEN SUPPORT = 1 @@ -117,10 +115,10 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) END IF END IF RETURN -C + C----------------------------------------------------------------------- ENTRY VDINIT(ASPECT,JUSTIF) -C + C Check if terminal and hardcopy devices are null: #ifdef Build64 ESC4 = 10000 @@ -134,10 +132,10 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) CALL wcpsie( 10000,ISTAT ) FILEUP = ISTAT .EQ. 0 FILEON = FILEON .AND. FILEUP -C + C Stop program if both devices are null. IF (.NOT.(TERMUP.OR.FILEUP)) STOP 'No graphics device assigned.' -C + IF (TERMON) THEN #ifdef Build64 ASPECT4 = ASPECT @@ -149,7 +147,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) END IF IF (FILEON) CALL wcpsnt(ASPECT,JUSTIF) RETURN -C + C----------------------------------------------------------------------- ENTRY VDAABU(BTNNUM) IF (FILEON) CALL wcpsbu(BTNNUM) @@ -162,7 +160,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) #endif END IF RETURN -C + C----------------------------------------------------------------------- ENTRY VDABGL(BTNNUM,X,Y) IF (FILEON) CALL wcpsbl(BTNNUM,X,Y) @@ -175,7 +173,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) #endif END IF RETURN -C + C----------------------------------------------------------------------- ENTRY VDAKGL(CHAR,X,Y) IF (FILEON) CALL wcpskl(CHAR,X,Y) @@ -190,7 +188,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) #endif END IF RETURN -C + C----------------------------------------------------------------------- ENTRY VDALOC(X,Y) IF (FILEON) CALL wcpslo(X,Y) @@ -204,7 +202,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) #endif END IF RETURN -C + C----------------------------------------------------------------------- ENTRY VDBELL IF (TERMON) THEN @@ -212,7 +210,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) END IF IF (FILEON) CALL wcpsbe RETURN -C + C----------------------------------------------------------------------- ENTRY VDBUFL IF (TERMON) THEN @@ -220,7 +218,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) END IF IF (FILEON) CALL wcpsfl RETURN -C + C----------------------------------------------------------------------- ENTRY VDFRAM(ITYPE) IF (TERMON) THEN @@ -229,7 +227,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) END IF IF (FILEON) CALL wcpsfr(ITYPE) RETURN -C + C .... disable below C----------------------------------------------------------------------- ENTRY VDIQCO(NUM,INDEXA,CLRARY,CLRMOD) @@ -250,7 +248,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) #endif END IF RETURN -C + C----------------------------------------------------------------------- ENTRY VDIQCP(X,Y) IF (FILEON) CALL wcpscp(X,Y) @@ -264,7 +262,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) #endif END IF RETURN -C + C----------------------------------------------------------------------- ENTRY VDIQDC(INDEX,VALUE) IF (FILEON) CALL wcpsdc(INDEX,VALUE) @@ -278,7 +276,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) #endif END IF RETURN -C + C----------------------------------------------------------------------- ENTRY VDIQND(XNDC,YNDC) IF (FILEON) CALL wcpsid(XNDC,YNDC) @@ -292,7 +290,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) #endif END IF RETURN -C + C----------------------------------------------------------------------- ENTRY VDIQOS(ATTARR) IF (FILEON) CALL wcpsio(ATTARR) @@ -307,7 +305,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) #endif END IF RETURN -C + C----------------------------------------------------------------------- ENTRY VDLOGE(ERRNUM,ERRSEV) IF (TERMON) THEN @@ -316,7 +314,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) END IF IF (FILEON) CALL wcpsle(ERRNUM,ERRSEV) RETURN -C + C----------------------------------------------------------------------- ENTRY VDSTBC(COLOR) IF (TERMON) THEN @@ -329,7 +327,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) END IF IF (FILEON) CALL wcpsbc(COLOR) RETURN -C + C----------------------------------------------------------------------- ENTRY VDSTCO(NUM,INDEXA,CLRARY,CLRMOD) @@ -351,7 +349,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) END IF IF (FILEON) CALL wcpsco(INDEXA,CLRARY,CLRMOD) RETURN -C + C----------------------------------------------------------------------- ENTRY VDSTCS(YSIZE) IF (TERMON) THEN @@ -364,7 +362,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) END IF IF (FILEON) CALL wcpscs(YSIZE) RETURN -C + C----------------------------------------------------------------------- ENTRY VDSTFC(COLOR) IF (TERMON) THEN @@ -377,7 +375,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) END IF IF (FILEON) CALL wcpsfc(COLOR) RETURN -C + C----------------------------------------------------------------------- ENTRY VDSTIN(INTEN) IF (TERMON) THEN @@ -390,7 +388,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) END IF IF (FILEON) CALL wcpsin(INTEN) RETURN -C + C----------------------------------------------------------------------- ENTRY VDSTLA(LOCX,LOCY) IF (TERMON) THEN @@ -404,7 +402,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) END IF IF (FILEON) CALL wcpsla(LOCX,LOCY) RETURN -C + C....enabled below C----------------------------------------------------------------------- ENTRY VDSTLS(LINSTY) @@ -418,7 +416,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) END IF IF (FILEON) CALL wcpsls(LINSTY) RETURN -C + C----------------------------------------------------------------------- ENTRY VDSTLW(LINWTH) IF (TERMON) THEN @@ -431,7 +429,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) END IF IF (FILEON) CALL wcpslw(LINWTH) RETURN -C + C----------------------------------------------------------------------- ENTRY VDSTOS(ATTARR) IF (TERMON) THEN @@ -446,7 +444,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) END IF IF (FILEON) CALL wcpsos(ATTARR) RETURN -C + C----------------------------------------------------------------------- ENTRY VDWAIT IF (TERMON) THEN @@ -454,7 +452,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) END IF IF (FILEON) CALL wcpswt RETURN -C + C----------------------------------------------------------------------- ENTRY VDLINA(XX,YY) IF (TERMON) THEN @@ -468,7 +466,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) END IF IF (FILEON) CALL wcpsln(XX,YY) RETURN -C + C----------------------------------------------------------------------- ENTRY VDMOVA(X,Y) IF (TERMON) THEN @@ -482,7 +480,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) END IF IF (FILEON) CALL wcpsmv(X,Y) RETURN -C + C----------------------------------------------------------------------- ENTRY VDNWPG IF (TERMON) THEN @@ -490,7 +488,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) END IF IF (FILEON) CALL wcpspg RETURN -C + C----------------------------------------------------------------------- ENTRY VDPNTA(X,Y) IF (TERMON) THEN @@ -504,7 +502,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) END IF IF (FILEON) CALL wcpspt(X,Y) RETURN -C + C----------------------------------------------------------------------- ENTRY VDPOLY(XARRAY,YARRAY,NPTS) IF (TERMON) THEN @@ -522,7 +520,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) END IF IF (FILEON) CALL wcpspy(XARRAY,YARRAY,NPTS) RETURN -C + C----------------------------------------------------------------------- ENTRY VDTERM IF (TERMON) THEN @@ -530,7 +528,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) END IF IF (FILEON) CALL wcpstr RETURN -C + C----------------------------------------------------------------------- ENTRY VDTEXT(LENGTH,CHARS) IF (TERMON) THEN @@ -550,7 +548,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) END IF IF (FILEON) CALL wcpstx(LENGTH,CHARS) RETURN -C + END SUBROUTINE VBERRH() diff --git a/packages/seacas/applications/fastq/cgi/x11_cgisx11.c b/packages/seacas/applications/fastq/cgi/x11_cgisx11.c index fe74f57d267f..9f36276a913d 100644 --- a/packages/seacas/applications/fastq/cgi/x11_cgisx11.c +++ b/packages/seacas/applications/fastq/cgi/x11_cgisx11.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /* cgisx11.c - linker specifiable driver routine for driver diff --git a/packages/seacas/applications/fastq/ch3to4.f b/packages/seacas/applications/fastq/ch3to4.f index bde5e773d2f7..80db714448e3 100644 --- a/packages/seacas/applications/fastq/ch3to4.f +++ b/packages/seacas/applications/fastq/ch3to4.f @@ -1,43 +1,31 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C -C See packages/seacas/LICENSE for details - -C $Id: ch3to4.f,v 1.1 1990/11/30 11:04:22 gdsjaar Exp $ -C $Log: ch3to4.f,v $ -C Revision 1.1 1990/11/30 11:04:22 gdsjaar -C Initial revision -C C +C See packages/seacas/LICENSE for details -CC* FILE: [.PAVING]CH3TO4.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE CH3TO4 (MXND, MXCORN, MLN, NCORN, LCORN, LNODES, ICOMB, & ANGLE, ITEST, LTEST, QUAL, POSBL4, ICHANG) C*********************************************************************** -C + C SUBROTINE CH3TO4 = CHECKS THE FEASIBILITY OF A C RECTANGLE FROM A TRIANGLE -C + C*********************************************************************** -C + DIMENSION LNODES (MLN, MXND), ANGLE (MXND), LCORN (MXCORN) DIMENSION ICOMB (MXCORN), ITEST (3), LTEST (3) -C + LOGICAL POSBL4 -C + C ASSUME PERFECT QUALITY -C + C QUAL = 0. POSBL4 = .TRUE. -C + C FIND THE POSSIBLE RECTANGLE (THIS ALREADY ASSUMES THAT THE C SUM OF THE SMALLER TWO IS EQUAL TO THE LARGEST ONE) -C + MMAX = MAX0 (LTEST(1), LTEST(2), LTEST(3)) IF (LTEST(1) .EQ. MMAX) THEN ICHANG = JUMPLP (MXND, MLN, LNODES, ITEST(1), LTEST(2)) @@ -46,10 +34,10 @@ SUBROUTINE CH3TO4 (MXND, MXCORN, MLN, NCORN, LCORN, LNODES, ICOMB, ELSE ICHANG = JUMPLP (MXND, MLN, LNODES, ITEST(3), LTEST(1)) ENDIF -C + C TEST THE POSSIBLE RECTANGLE FOR GOODNESS C ADD UP THE NICKS FOR BAD ANGLES AT THE GIVEN CORNERS -C + C DO 100 I = 1, NCORN C IF (ICOMB (I) .EQ. 1) THEN C QUAL = QUAL + (.8 * NICKC (ANGLE (LCORN (I)) )) @@ -57,11 +45,11 @@ SUBROUTINE CH3TO4 (MXND, MXCORN, MLN, NCORN, LCORN, LNODES, ICOMB, C QUAL = QUAL + (.8 * NICKS (ANGLE (LCORN (I)) )) C ENDIF C 100 CONTINUE -C + C ADD UP THE NICKS FOR THE NEW CORNER -C + C QUAL = QUAL + (.8 * NICKS (ANGLE (ICHANG)) ) -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/chcond.f b/packages/seacas/applications/fastq/chcond.f index 2c666c864904..20b66faedc9b 100644 --- a/packages/seacas/applications/fastq/chcond.f +++ b/packages/seacas/applications/fastq/chcond.f @@ -1,29 +1,18 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: chcond.f,v 1.1 1990/11/30 11:04:25 gdsjaar Exp $ -C $Log: chcond.f,v $ -C Revision 1.1 1990/11/30 11:04:25 gdsjaar -C Initial revision -C -C -CC* FILE: [.QMESH]CHCOND.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE CHCOND (NPER, NSA, SMANG, INDEX, IFIRST, N1, N2, N3, & N4, CHECK) C********************************************************************* -C + C SUBROUTINE CHCOND = THIS SUBROUTINE CHECKS IF THE "NSA" ANGLES C SATISFIES THE CONDITIONS. -C + C********************************************************************* -C + C VARIABLES IN: NPER .... NUMBER OF POINTS IN THE REGION C NSA ..... NUMBER OF SOUGHT SMALLEST ANGLES C SMANG ... ARRAY OF SMALLEST ANGLES @@ -31,21 +20,21 @@ SUBROUTINE CHCOND (NPER, NSA, SMANG, INDEX, IFIRST, N1, N2, N3, C OUT: IFIRST... POINTER TO THE FIRST VERTEX C Mi ...... INTERVALS FOR THE PENTAGON REGION C CHECK ... .EQ. TRUE IF IT SATISFIES THE CONDITIONS -C + C CALL BY: PICKM5.FOR -C + C WRITTEN BY: HORACIO RECALDE DATE:FEB 15, 1988 -C + C************************************************************************ -C + PARAMETER (NSANG = 10) DIMENSION SMANG(NSA + 1), NAUX(NSANG), INDEX(NSA + 1) LOGICAL CHECK -C + NSA2 = NSA/2 -C + C--- SORT THE INDEX ARRAY TO FIND THE 'NSA2' SMALLEST ANGLES -C + CALL SORTIA (NSA, INDEX, NSA2, NAUX) IFIRST = NAUX(1) N1 = NAUX(2) - NAUX(1) @@ -53,9 +42,9 @@ SUBROUTINE CHCOND (NPER, NSA, SMANG, INDEX, IFIRST, N1, N2, N3, N3 = NAUX(4) - NAUX(3) N4 = NAUX(5) - NAUX(4) N5 = NPER - N1 - N2 - N3 - N4 -C + C--- CHECK COMPATIBILITY EQUATIONS -C + IF ((N1 + N2 + N3 .LT. N4 + N5 + 2) .OR. & (N2 + N3 + N4 .LT. N5 + N1 + 2) .OR. & (N3 + N4 + N5 .LT. N1 + N2 + 2) .OR. @@ -65,6 +54,6 @@ SUBROUTINE CHCOND (NPER, NSA, SMANG, INDEX, IFIRST, N1, N2, N3, ELSE CHECK = .TRUE. ENDIF -C + RETURN END diff --git a/packages/seacas/applications/fastq/chkhol.f b/packages/seacas/applications/fastq/chkhol.f index 676b6389188d..791ef080ba64 100644 --- a/packages/seacas/applications/fastq/chkhol.f +++ b/packages/seacas/applications/fastq/chkhol.f @@ -1,49 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: chkhol.f,v 1.3 1999/06/21 22:43:40 gdsjaar Exp $ -C $Log: chkhol.f,v $ -C Revision 1.3 1999/06/21 22:43:40 gdsjaar -C Fixed more uninitialized variables; one was causing core dump on g77 -C compiled executable. -C -C VERSN was not consistently defined -- now 10 characters everywhere -C -C Updated so full version string output -C -C Added capability to debug memory using unit specified in EXT99 -C variable. Similar to STRTUP in SUPLIB -C -C Cleaned up some other code -C -C Upped version -C -C Revision 1.2 1998/07/14 18:18:27 gdsjaar -C Removed unused variables, cleaned up a little. -C -C Changed BLUE labels to GREEN to help visibility on black background -C (indirectly requested by a couple users) -C -C Revision 1.1.1.1 1990/11/30 11:04:31 gdsjaar -C FASTQ Version 2.0X -C -c Revision 1.1 90/11/30 11:04:30 gdsjaar -c Initial revision -c -CC* FILE: [.QMESH]CHKHOL.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/31/90 -CC* MODIFICATION: ADDED ARGUMENTS TO CALL TO CHKHOL TO PASS MINIMUM -CC** ELEMENT SIZE (SIZMIN) AND GETSIZ PARAMETERS OF -CC** EMIN AND EMAX -C SUBROUTINE CHKHOL (IA, L, MP, ML, MS, MR, MSC, IPOINT, COOR, & IPBOUN, ILINE, LTYPE, NINT, FACTOR, LCON, ILBOUN, ISBOUN, & ISIDE, NLPS, IFLINE, ILLIST, IREGN, NSPR, IFSIDE, ISLIST, @@ -56,11 +16,11 @@ SUBROUTINE CHKHOL (IA, L, MP, ML, MS, MR, MSC, IPOINT, COOR, & REXMIN, REXMAX, REYMIN, REYMAX, IDIVIS, SIZMIN, EMAX, EMIN, & NOROOM, ERRCHK, ERR) C*********************************************************************** -C + C CHKRGN - CHECK THAT A REGION MAY BE MESHED -C + C*********************************************************************** -C + DIMENSION IA(1) DIMENSION IPOINT(MP), COOR(2, MP), IPBOUN(MP) DIMENSION ILINE(ML), LTYPE(ML), NINT(ML), FACTOR(ML), LCON(3, ML) @@ -77,25 +37,25 @@ SUBROUTINE CHKHOL (IA, L, MP, ML, MS, MR, MSC, IPOINT, COOR, DIMENSION X(MAXNP), Y(MAXNP), NID(MAXNP) DIMENSION LISTL(MAXNL), MARKED(3, MAXNL) DIMENSION IFHOLE(MR), NHPR(MR), IHLIST(MR*2) -C + DIMENSION IDUMMY(1) -C + DIMENSION AMESUR(NPEOLD), XNOLD(NPNOLD), YNOLD(NPNOLD) DIMENSION NXKOLD(NNXK, NPEOLD), MMPOLD(3, NPROLD) DIMENSION LINKEG(2, MLINK), LISTEG(4 * NPEOLD), BMESUR(NPNOLD) -C + LOGICAL NOROOM, EVEN, ERR, CCW, REAL, ADDLNK, REMESH LOGICAL COUNT, ERRCHK -C + addlnk = .false. COUNT = .TRUE. EVEN = .FALSE. REAL = .FALSE. -C + C CHECK TO MAKE SURE CONNECTING DATA FOR THE REGION EXISTS C AND FILL IN ANY BLANK INTERVALS ACCORDING TO THE GIVEN SIZE C FOR THE REGION AND THE LINE'S LENGTH -C + IF (NHPR(L) .GT. 0) THEN DO 100 I = IFHOLE(L), IFHOLE(L) + NHPR(L) - 1 IPNTR1 = 0 @@ -111,18 +71,13 @@ SUBROUTINE CHKHOL (IA, L, MP, ML, MS, MR, MSC, IPOINT, COOR, IMINUS = -LL CALL LTSORT (MR, LINKR, IREGN(LL), IMINUS, ADDLNK) ADDLNK = .FALSE. -C + C CALCULATE THE PERIMETER OF THE REGION -C + ELSE KNBC = 0 KSBC = 0 -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/31/90 -CC* MODIFICATION: ADDED ARGUMENTS TO CALL TO PERIM TO PASS MINIMUM -CC** ELEMENT SIZE (SIZMIN) AND GETSIZ PARAMETERS OF -CC** EMIN AND EMAX -C + CALL PERIM (MP, ML, MS, NSPR(LL), MAXNL, MAXNP, 1, 1, & KNBC, KSBC, IREGN(LL), IPOINT, COOR, IPBOUN, ILINE, & LTYPE, NINT, FACTOR, LCON, ILBOUN, ISBOUN, ISIDE, @@ -138,27 +93,23 @@ SUBROUTINE CHKHOL (IA, L, MP, ML, MS, MR, MSC, IPOINT, COOR, IF ((NPER .LE. 0) .OR. (ERR)) THEN WRITE (*, 10010) IREGN(LL) ADDLNK = .TRUE. -C -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/23/90 -CC* MODIFICATION: PUT THE CORRECT POINTER INTO THE HOLE REGION LINK SLOT -C + IMINUS = -LL CALL LTSORT (MR, LINKR, IREGN(LL), IMINUS, ADDLNK) ADDLNK = .FALSE. ELSE -C + C WHEN CHECKING THE MAXIMUMS - ADD ENOUGH FOR ONE MORE INTERVAL C ON THE LINE AS THIS LINE MAY BE INCREMENTED BY ONE IF THE C PERIMETER IS ODD -C + MAXNBC = MAX(MAXNBC, KNBC + 3 + MXRNBC) MAXSBC = MAX(MAXSBC, KSBC + 3 + MXRSBC) MXNL = MAX(MXNL, NL) MXNPER = MAX(MXNPER, NPER + 2) -C + C MARK THE LINES AND POINTS IN THE REGION AS BEING USED -C + CALL MKUSED (MAXNL, MP, ML, LISTL, IPOINT, NINT, & LINKP, LINKL, LCON, NL) ENDIF @@ -169,9 +120,9 @@ SUBROUTINE CHKHOL (IA, L, MP, ML, MS, MR, MSC, IPOINT, COOR, ENDIF 100 CONTINUE END IF -C + RETURN -C + 10000 FORMAT (' ** ERROR - DATA PROBLEMS FOR HOLE REGION:', I5, ' **') 10010 FORMAT (' ** ERROR - PERIMETER GENERATION ERRORS FOR HOLE REGION:' & , I5, ' **') diff --git a/packages/seacas/applications/fastq/chkkxl.f b/packages/seacas/applications/fastq/chkkxl.f index dfc9e0bc9a5c..bf41aab14c16 100644 --- a/packages/seacas/applications/fastq/chkkxl.f +++ b/packages/seacas/applications/fastq/chkkxl.f @@ -1,34 +1,23 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: chkkxl.f,v 1.1 1990/11/30 11:04:34 gdsjaar Exp $ -C $Log: chkkxl.f,v $ -C Revision 1.1 1990/11/30 11:04:34 gdsjaar -C Initial revision -C -C -CC* FILE: [.QMESH]CHKKXL.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE CHKKXL (MXND, LXK, KXL, LLL, ERR) C*********************************************************************** -C + C SUBROUTINE CHKKXL = CHECKS TO SEE IF THE KXL COMPARES CORRECTLY TO C THE LXK ARRAY -C + C*********************************************************************** -C + DIMENSION LXK (4, MXND), KXL (2, 3 * MXND) -C + LOGICAL ERR -C + ERR = .TRUE. -C + DO 130 L = 1, LLL DO 120 IK = 1, 2 K = KXL (IK, L) @@ -43,10 +32,10 @@ SUBROUTINE CHKKXL (MXND, LXK, KXL, LLL, ERR) 120 CONTINUE 130 CONTINUE ERR = .FALSE. -C + RETURN -C + 10000 FORMAT ('KXL(', I4, ',', I4,') = ', I4, & ' IS NOT IN LXK ARRAY - CHKKXL') -C + END diff --git a/packages/seacas/applications/fastq/chkrgn.f b/packages/seacas/applications/fastq/chkrgn.f index b644d3d330f3..166e18efe309 100644 --- a/packages/seacas/applications/fastq/chkrgn.f +++ b/packages/seacas/applications/fastq/chkrgn.f @@ -1,38 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: chkrgn.f,v 1.4 2004/01/21 05:18:39 gdsjaar Exp $ -C $Log: chkrgn.f,v $ -C Revision 1.4 2004/01/21 05:18:39 gdsjaar -C Initialized several variables identified by valgrind. -C -C Revision 1.3 2001/11/05 13:26:51 gdsjaar -C Fixed array boundary problem in region check code. -C -C Revision 1.2 1990/11/30 11:25:08 gdsjaar -C Added initialization and MDSTAT calls -C -c Revision 1.1.1.1 90/11/30 11:04:38 gdsjaar -c FASTQ Version 2.0X -c -c Revision 1.1 90/11/30 11:04:37 gdsjaar -c Initial revision -c -C -CC* FILE: [.QMESH]CHKRGN -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/31/90 -CC* MODIFICATION: ADDED ARGUMENTS TO CALL TO CHKHOL TO PASS MINIMUM -CC** ELEMENT SIZE (SIZMIN) AND GETSIZ PARAMETERS OF -CC** EMIN AND EMAX -C SUBROUTINE CHKRGN (IA, L, MP, ML, MS, MR, MSC, N24, IPOINT, COOR, & IPBOUN, ILINE, LTYPE, NINT, FACTOR, LCON, ILBOUN, ISBOUN, & ISIDE, NLPS, IFLINE, ILLIST, IREGN, NSPR, IFSIDE, ISLIST, @@ -45,11 +16,11 @@ SUBROUTINE CHKRGN (IA, L, MP, ML, MS, MR, MSC, N24, IPOINT, COOR, & NPNOLD, NPEOLD, NNXK, REMESH, REXMIN, REXMAX, REYMIN, REYMAX, & IDIVIS, SIZMIN, EMAX, EMIN, NOROOM, ERRCHK, ERR) C*********************************************************************** -C + C SUBROUTINE CHKRGN - CHECK THAT A REGION MAY BE MESHED -C + C*********************************************************************** -C + DIMENSION IA(1) DIMENSION IPOINT(MP), COOR(2, MP), IPBOUN(MP) DIMENSION ILINE(ML), LTYPE(ML), NINT(ML), FACTOR(ML), LCON(3, ML) @@ -67,18 +38,18 @@ SUBROUTINE CHKRGN (IA, L, MP, ML, MS, MR, MSC, N24, IPOINT, COOR, DIMENSION LISTL(MAXNL), MARKED(3, MAXNL) DIMENSION NNPS(MAX3), ANGLE(MAXNP) DIMENSION IFHOLE(MR), NHPR(MR), IHLIST(MR*2) -C + DIMENSION IDUMMY(1) -C + DIMENSION AMESUR(NPEOLD), XNOLD(NPNOLD), YNOLD(NPNOLD) DIMENSION NXKOLD(NNXK, NPEOLD), MMPOLD(3, NPROLD) DIMENSION LINKEG(2, MLINK), LISTEG(4 * NPEOLD), BMESUR(NPNOLD) -C + CHARACTER*72 SCHEME, DEFSCH, SCHSTR -C + LOGICAL NOROOM, EVEN, ERR, NORM, CCW, REAL, ADDLNK, REMESH LOGICAL PENTAG, TRIANG, TRNSIT, HALFC, COUNT, ERRCHK -C + ipntr = 0 addlnk = .false. COUNT = .TRUE. @@ -88,11 +59,11 @@ SUBROUTINE CHKRGN (IA, L, MP, ML, MS, MR, MSC, N24, IPOINT, COOR, EVEN = .FALSE. ENDIF REAL = .FALSE. -C + C CHECK TO MAKE SURE CONNECTING DATA FOR THE REGION EXISTS C AND FILL IN ANY BLANK INTERVALS ACCORDING TO THE GIVEN SIZE C FOR THE REGION AND THE LINE'S LENGTH -C + CALL DATAOK (MP, ML, MS, MR, L, IREGN(L), COOR, ILINE, LTYPE, & NINT, LCON, NLPS, IFLINE, ILLIST, NSPR, IFSIDE, ISLIST, LINKP, & LINKL, LINKS, RSIZE(L), ERRCHK, ERR) @@ -102,18 +73,13 @@ SUBROUTINE CHKRGN (IA, L, MP, ML, MS, MR, MSC, N24, IPOINT, COOR, IMINUS = -L CALL LTSORT (MR, LINKR, IREGN(L), IMINUS, ADDLNK) ADDLNK = .FALSE. -C + C CALCULATE THE PERIMETER OF THE REGION -C + ELSE KNBC = 0 KSBC = 0 -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/31/90 -CC* MODIFICATION: ADDED ARGUMENTS TO CALL TO PERIM TO PASS MINIMUM -CC** ELEMENT SIZE (SIZMIN) AND GETSIZ PARAMETERS OF -CC** EMIN AND EMAX -C + CALL PERIM (MP, ML, MS, NSPR(L), MAXNL, MAXNP, 1, 1, KNBC, & KSBC, IREGN(L), IPOINT, COOR, IPBOUN, ILINE, LTYPE, NINT, & FACTOR, LCON, ILBOUN, ISBOUN, ISIDE, NLPS, IFLINE, ILLIST, @@ -132,27 +98,27 @@ SUBROUTINE CHKRGN (IA, L, MP, ML, MS, MR, MSC, N24, IPOINT, COOR, ADDLNK = .FALSE. GO TO 120 END IF -C + C WHEN CHECKING THE MAXIMUMS - ADD ENOUGH FOR ONE MORE INTERVAL C ON THE LINE AS THIS LINE MAY BE INCREMENTED BY ONE IF THE C PERIMETER IS ODD -C + MAXNBC = MAX(MAXNBC, KNBC + 3) MAXSBC = MAX(MAXSBC, KSBC + 3) MXNL = MAX(MXNL, NL) -C + C GET THE REGION SCHEME -C + CALL LTSORT (MR, LINKSC, ABS(IREGN(L)), IPNTR, ADDLNK) IF ((IREGN(L) .LE. N24) .AND. (IPNTR .GT. 0)) THEN SCHSTR = SCHEME(IPNTR) ELSE SCHSTR = DEFSCH END IF -C + C SEE IF A TRIANGULAR, PENTAGON, SEMICIRCLE, OR A TRANSITION C REGION HAS BEEN FLAGGED -C + PENTAG = .FALSE. TRNSIT = .FALSE. TRIANG = .FALSE. @@ -205,59 +171,59 @@ SUBROUTINE CHKRGN (IA, L, MP, ML, MS, MR, MSC, N24, IPOINT, COOR, END IF 100 CONTINUE 110 CONTINUE -C + C SET UP THE TRIANGLE DIVISIONS, AND FIND THE CENTER POINT -C + IF (TRIANG) THEN CALL GETM3 (ML, MS, MAX3, NSPR(L), ISLIST(IFSIDE(L)), NINT, & IFLINE, NLPS, ILLIST, LINKL, LINKS, X, Y, NID, NNPS, & ANGLE, NPER, M1A, M1B, M2A, M2B, M3A, M3B, XCEN, YCEN, & CCW, ERR) -C + C CHECK FOR MAXIMUM DIMENSIONS NEEDED FOR EACH REGION C ASSUMING THAT 10 NECKLACES WILL BE ADEQUATE -C + MXTEST = ((M1A + 1)*(M3B + 1)) + ((M1B + 1)*(M2A + 1)) & + ((M2B + 1)*(M3A + 1)) + (10*(NPER + 1)) + (NPER*2) MXND = MAX(MXTEST, MXND) MXNPER = MAX(MXNPER, (NPER + 2) * 2) -C + C SET UP THE TRANSITION DIVISIONS, AND FIND THE CENTER POINT -C + ELSE IF (TRNSIT) THEN CALL GETTRN (ML, MS, MAX3, NSPR(L), ISLIST(IFSIDE(L)), NINT, & IFLINE, NLPS, ILLIST, LINKL, LINKS, X, Y, NID, NNPS, & ANGLE, NPER, I1, I2, I3, I4, I5, I6, I7, I8, XCEN1, & YCEN1, XCEN2, YCEN2, XMID1, YMID1, XMID2, YMID2, CCW, & HALFC, ERR) -C + C CHECK FOR MAXIMUM DIMENSIONS NEEDED FOR EACH REGION C ASSUMING THAT 10 NECKLACES WILL BE ADEQUATE -C + MXTEST = ((I2 - I1)*(NPER - I8)) & + ((I3 - I2)*(NPER - I8)) + ((I3 - I2)*(I2 - I2)) & + ((I4 - I3)*(I7 - I6)) + ((I5 - I4)*(I6 - I5)) & + ((I5 - I4)*(I7 - I6)) + (10*(NPER + 1)) + (NPER*2) MXND = MAX(MXTEST, MXND) MXNPER = MAX(MXNPER, (NPER + 2) * 2) -C + C SET UP THE PENTAGON DIVISIONS, AND FIND THE CENTER POINT -C + ELSE IF (PENTAG) THEN CALL GETM5 (IA, ML, MS, MAX3, NSPR(L), ISLIST(IFSIDE(L)), & NINT, IFLINE, NLPS, ILLIST, LINKL, LINKS, X, Y, NID, & NNPS, ANGLE, NPER, M1A, M1B, M2, M3A, M3B, M4A, M4B, & M5, MC, XCEN, YCEN, CCW, ERR) -C + C CHECK FOR MAXIMUM DIMENSIONS NEEDED FOR THE REGION C ASSUMING THAT 10 NECKLACES WILL BE ADEQUATE -C + MXTEST = (M1B*M2) + (M4A*M3B) + (M4B*M5) + (10*(NPER + 1)) MXND = MAX(MXTEST, MXND) MXNPER = MAX(MXNPER, (NPER + 2) *2) -C + C CALCULATE THE BASE OF THE RECTANGLE FOR THE REGION -C + ELSE CALL GETM1 (ML, MS, MAX3, NSPR(L), ISLIST(IFSIDE(L)), NINT, & IFLINE, NLPS, ILLIST, LINKL, LINKS, X, Y, NID, NNPS, @@ -271,32 +237,26 @@ SUBROUTINE CHKRGN (IA, L, MP, ML, MS, MR, MSC, N24, IPOINT, COOR, GO TO 120 END IF M2 = NPER/2 - M1 -C + C CHECK FOR MAXIMUM DIMENSIONS NEEDED FOR EACH REGION C ASSUMING THAT 10 NECKLACES WILL BE ADEQUATE -C + MXTEST = ((M1 + 1)*(M2 + 1)) + (10*(M1 + M2 + 2)) MXND = MAX(MXTEST, MXND) MXNPER = MAX(MXNPER, NPER + 4) END IF -C + C FLAG THE REGION AS BEING PROCESSABLE -C + IREGN(L) = -IREGN(L) -C + C MARK THE LINES AND POINTS IN THE REGION AS BEING USED -C + CALL MKUSED (MAXNL, MP, ML, LISTL, IPOINT, NINT, LINKP, LINKL, & LCON, NL) -C + C CHECK ALL THE HOLES IN THE REGION -C -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/31/90 -CC* MODIFICATION: ADDED ARGUMENTS TO CALL TO CHKHOL TO PASS MINIMUM -CC** ELEMENT SIZE (SIZMIN) AND GETSIZ PARAMETERS OF -CC** EMIN AND EMAX -C + CALL CHKHOL (IA, L, MP, ML, MS, MR, MSC, IPOINT, COOR, & IPBOUN, ILINE, LTYPE, NINT, FACTOR, LCON, ILBOUN, ISBOUN, & ISIDE, NLPS, IFLINE, ILLIST, IREGN, NSPR, IFSIDE, ISLIST, @@ -310,10 +270,10 @@ SUBROUTINE CHKRGN (IA, L, MP, ML, MS, MR, MSC, N24, IPOINT, COOR, & EMAX, EMIN, NOROOM, ERRCHK, ERR) END IF -C + 120 CONTINUE RETURN -C + 10000 FORMAT (' ** ERROR - DATA PROBLEMS FOR REGION:', I5, ' **') 10010 FORMAT (' ** ERROR - PERIMETER GENERATION ERRORS FOR REGION:' & , I5, ' **') diff --git a/packages/seacas/applications/fastq/chkwt.f b/packages/seacas/applications/fastq/chkwt.f index 1b097629b54b..92f4032ff0e4 100644 --- a/packages/seacas/applications/fastq/chkwt.f +++ b/packages/seacas/applications/fastq/chkwt.f @@ -1,55 +1,43 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: chkwt.f,v 1.1 1990/11/30 11:04:40 gdsjaar Exp $ -C $Log: chkwt.f,v $ -C Revision 1.1 1990/11/30 11:04:40 gdsjaar -C Initial revision -C -C -CC* FILE: [.RENUM]CHKWT.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE CHKWT (MP, ML, MS, MLIST, MFLAG, NNUID, MXLPS, LINKP, & LINKL, LINKS, NUID, IFLG, ILEN, IPTR, NLIST, IFLAG, LTYPE, & LCON, NLPS, IFLINE, ILLIST, COOR, JPOINT, JSIDE, ILOC, JLOC, & NIX, ILIST, XLIST, ADDLNK, ISPNT, ERR) C*********************************************************************** -C + C SUBROUTINE CHKWT = CHECKS THE WEIGHTING COMBINATION FOR FLAGS TO C MAKE SURE THE DEFINITION IS VALID. IT RETURNS C THE LOCATION OF THE BEGINNING POINT IN THE C FLAG NODE LIST AS JLOC. THE ARRAY ILIST AND C XLIST ARE ALSO SET UP AS X VALUES OF THE SIDE C AS IT MOVES FORWARD. -C + C*********************************************************************** -C + C SUBROUTINE CALLED BY: C ADDWT = ADDS THE WEIGHTING FACTORS TO ANY NODES WITH C FLAGS CONTAINING WEIGHTS -C + C*********************************************************************** -C -C + DIMENSION IFLG (MFLAG), ILEN (MFLAG), IPTR (MFLAG), NLIST (MLIST) DIMENSION NUID (NNUID), LINKP (2, MP) DIMENSION LINKS (2, MS), LINKL (2, ML) DIMENSION COOR (2, MP), LTYPE (ML), LCON (3, ML) DIMENSION NLPS (MS), IFLINE (MS), ILLIST (MS*3) DIMENSION ILIST (MXLPS), XLIST (MXLPS) -C + LOGICAL ERR, ADDLNK, ISPNT -C + ERR = .TRUE. -C + C CHECK TO MAKE SURE THE FLAG HAS NODES GENERATED ALONG IT -C + DO 100 I = 1, MFLAG IF (IFLAG .EQ. IFLG (I)) THEN ILOC = I @@ -59,18 +47,18 @@ SUBROUTINE CHKWT (MP, ML, MS, MLIST, MFLAG, NNUID, MXLPS, LINKP, WRITE (*, 10000)IFLAG RETURN 110 CONTINUE -C + C CHECK TO MAKE SURE THE BEGINNING POINT IS DEFINED -C + CALL LTSORT (MP, LINKP, JPOINT, JPPNTR, ADDLNK) IF (JPPNTR .LE. 0) THEN WRITE (*, 10010)JPOINT, IFLAG RETURN ENDIF -C + C CHECK TO MAKE SURE THE NODE AT THE BEGINNING POINT IS IN THE LIST C OF NODES FOR THE FLAG - RETURN THIS LIST LOCATION IF IT IS THERE -C + JLOC = 0 J1 = IPTR (ILOC) J2 = IPTR (ILOC) + ILEN (ILOC) - 1 @@ -83,9 +71,9 @@ SUBROUTINE CHKWT (MP, ML, MS, MLIST, MFLAG, NNUID, MXLPS, LINKP, WRITE (*, 10020)JPOINT RETURN ENDIF -C + C CHECK TO MAKE SURE THE SIDE OR LINE OR POINT IS DEFINED -C + IF (ISPNT) THEN CALL LTSORT (MP, LINKP, JSIDE, IPNTR, ADDLNK) IF (IPNTR .LE. 0)WRITE (*, 10030)JSIDE, IFLAG @@ -103,10 +91,10 @@ SUBROUTINE CHKWT (MP, ML, MS, MLIST, MFLAG, NNUID, MXLPS, LINKP, RETURN ENDIF ENDIF -C + C CHECK TO MAKE SURE SIDE'S LINE DEFINITIONS ARE ALL THERE C AND ARE IN MONOTONICALLY INCREASING X ORDER -C + IF (JSIDE .GT. 0) THEN J1 = IFLINE (JSPNTR) J2 = IFLINE (JSPNTR) + NLPS (JSPNTR) - 1 @@ -128,9 +116,9 @@ SUBROUTINE CHKWT (MP, ML, MS, MLIST, MFLAG, NNUID, MXLPS, LINKP, IPNTR = JLPNTR ENDIF ILIST (J - J1 + 1) = IPNTR -C + C CHECK TO MAKE SURE LINE'S POINT DEFINITIONS ARE ALL THERE -C + IP1 = LCON (1, IPNTR) IP2 = LCON (2, IPNTR) IP3 = IABS (LCON (3, IPNTR)) @@ -141,7 +129,7 @@ SUBROUTINE CHKWT (MP, ML, MS, MLIST, MFLAG, NNUID, MXLPS, LINKP, ELSE IP3 = 0 ENDIF -C + IF ((IP1 .LE. 0) .OR. (IPNTR1 .LE. 0)) THEN IF (JSIDE .GT. 0) THEN WRITE (*, 10070)KK, JSIDE, IP1 @@ -166,9 +154,9 @@ SUBROUTINE CHKWT (MP, ML, MS, MLIST, MFLAG, NNUID, MXLPS, LINKP, RETURN ENDIF 130 CONTINUE -C + C GET THE XLIST VALUES SET UP FOR THIS SIDE -C + IF (NIX .EQ. 2) THEN CALL LTSORT (MP, LINKP, LCON (1, ILIST (1)), IP1, ADDLNK) CALL LTSORT (MP, LINKP, LCON (2, ILIST (1)), IP2, ADDLNK) @@ -183,9 +171,9 @@ SUBROUTINE CHKWT (MP, ML, MS, MLIST, MFLAG, NNUID, MXLPS, LINKP, RETURN ENDIF ELSE -C + C DEFINE VALUE OF KP, THE BEGINNING CONNECTIVITY POINT -C + K1 = LCON (1, ILIST (1)) K2 = LCON (2, ILIST (1)) L1 = LCON (1, ILIST (2)) @@ -203,9 +191,9 @@ SUBROUTINE CHKWT (MP, ML, MS, MLIST, MFLAG, NNUID, MXLPS, LINKP, WRITE (*, 10100)ILLIST (J1), JSIDE RETURN ENDIF -C + C NOWLOOP THROUGH THE REST OF THE LINES TO GET THE XLIST -C + DO 140 M = 2, NIX - 1 L1 = LCON (1, ILIST (M)) L2 = LCON (2, ILIST (M)) @@ -224,9 +212,9 @@ SUBROUTINE CHKWT (MP, ML, MS, MLIST, MFLAG, NNUID, MXLPS, LINKP, 140 CONTINUE CALL LTSORT (MP, LINKP, KP, KPP, ADDLNK) XLIST (NIX) = COOR (1, KPP) -C + C NOWCHECK TO MAKE SURE THE LINES ARE INCREASING MONOTONICALLY IN X -C + DO 150 M = 2, NIX IF (XLIST (M) .LT. XLIST (M - 1)) THEN WRITE (*, 10090)JSIDE @@ -236,7 +224,7 @@ SUBROUTINE CHKWT (MP, ML, MS, MLIST, MFLAG, NNUID, MXLPS, LINKP, ENDIF ERR = .FALSE. RETURN -C + 10000 FORMAT (' FLAG NUMBER:', I5, ' HAS NOT BEEN USED IN GENERATING', & /, ' THIS MESH - THUS NO WEIGHTING IS POSSIBLE') 10010 FORMAT (' THE BEGINNING POINT:', I5, ' FOR FLAG:', I5, @@ -265,5 +253,5 @@ SUBROUTINE CHKWT (MP, ML, MS, MLIST, MFLAG, NNUID, MXLPS, LINKP, & ' NO BOUNDARY FLAG WEIGHTING WITH THIS SIDE POSSIBLE') 10100 FORMAT (' LINE:', I5, ' DOES NOT CONNECT PROPERLY IN SIDE:', I5, & /, ' NO BOUNDARY FLAG WEIGHTING WITH THIS SIDE POSSIBLE') -C + END diff --git a/packages/seacas/applications/fastq/ciapal.f b/packages/seacas/applications/fastq/ciapal.f index 0f73537f49d4..9d50463c86bd 100644 --- a/packages/seacas/applications/fastq/ciapal.f +++ b/packages/seacas/applications/fastq/ciapal.f @@ -1,75 +1,65 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: ciapal.f,v 1.1 1990/11/30 11:04:43 gdsjaar Exp $ -C $Log: ciapal.f,v $ -C Revision 1.1 1990/11/30 11:04:43 gdsjaar -C Initial revision -C -CC* FILE: [.QMESH]CIAPAL.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE CIAPAL (MXND, XN, YN, LXK, KXL, NXL, LXN, NNN, NNNOLD, & NIT, EPS, RO, ALPHA) C*********************************************************************** -C + C SUBROUTINE CIAPAL = CENTROID INVERSE AREA PUSH AND LAPLACIAN SMOOTH -C + C*********************************************************************** -C + C NOTE: C IN THIS METHOD EACH CENTROID OF AN ELEMENT PUSHES OUT C ON THE SURROUNDING NODES WITH A FORCE INVERSELY PROPORTIONAL C TO THE AREA OF THE ELEMENT WHILE IT SIMULTANEOUSLY PULLS ON C EACH NODE WITH A FORCE PROPORTIONAL TO THE LENGTH OF THE LINE C CONNECTING THE CENTROID WITH EACH NODE. -C + C*********************************************************************** -C + C VARIABLES USED: C NIT = MAX NUMBER OF ITERATIONS TO DO C EPS = NODE MOVEMENT TOLERANCE FOR CONVERGENCE C RO = UNDER OR OVER-RELAXATION FACTOR. C ALPHA = WEIGHT GIVEN TO AREA-PUSH VECTOR. USUALLY=0.5. C WEIGHT GIVEN TO LAPLACIAN VECTOR = 1.-ALPHA. -C + C*********************************************************************** -C + DIMENSION NODES (4) DIMENSION KLIST (20), AREA (20), XCEN (20), YCEN (20) DIMENSION LXK (4, MXND), KXL (2, 3*MXND) DIMENSION NXL (2, 3*MXND), LXN (4, MXND) DIMENSION XN (MXND), YN (MXND) -C + LOGICAL BIG, CCW, ERR EPS2 = (EPS * RO) **2 BETA = 1.0 - ALPHA -C + C ITERATION LOOP -C + DO 140 IT = 1, NIT BIG = .FALSE. -C + C NODE LOOP -C + DO 130 NODE = NNNOLD + 1, NNN -C + C SKIP CONTINUATION LINES AND BOUNDARY LINES -C + IF ((LXN (1, NODE).GT.0) .AND. (LXN (2, NODE).GT.0)) THEN -C + C GET ELEMENT LIST (IGNORE ERR IF IT IS BECAUSE TOO MANY WERE FOUND) -C + CALL GKXN (MXND, KXL, LXN, NODE, NUMK, KLIST, ERR) IF ((ERR) .AND. (NUMK.LT.20))RETURN -C + C GET AREAS AND CENTROIDS -C + DO 110 IK = 1, NUMK KK = KLIST (IK) CCW = .TRUE. @@ -85,9 +75,9 @@ SUBROUTINE CIAPAL (MXND, XN, YN, LXK, KXL, NXL, LXN, NNN, NNNOLD, XCEN (IK) = 0.25 * XSUM YCEN (IK) = 0.25 * YSUM 110 CONTINUE -C + C COMPUTE AND SUM THE FORCE VECTORS -C + FX = 0. FY = 0. SUMW = 0. @@ -106,9 +96,9 @@ SUBROUTINE CIAPAL (MXND, XN, YN, LXK, KXL, NXL, LXN, NNN, NNNOLD, SDX = SDX + DX SDY = SDY + DY 120 CONTINUE -C + C MOVE THE NODE -C + RSUMW = 1.0/SUMW RNUMK = 1.0/DBLE(NUMK) FX = ALPHA * FX * RSUMW + BETA * SDX * RNUMK diff --git a/packages/seacas/applications/fastq/close2.f b/packages/seacas/applications/fastq/close2.f index 7cfe55f05ee9..71677a8bc206 100644 --- a/packages/seacas/applications/fastq/close2.f +++ b/packages/seacas/applications/fastq/close2.f @@ -1,65 +1,45 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: close2.f,v 1.2 1998/07/14 18:18:29 gdsjaar Exp $ -C $Log: close2.f,v $ -C Revision 1.2 1998/07/14 18:18:29 gdsjaar -C Removed unused variables, cleaned up a little. -C -C Changed BLUE labels to GREEN to help visibility on black background -C (indirectly requested by a couple users) -C -C Revision 1.1.1.1 1990/11/30 11:04:47 gdsjaar -C FASTQ Version 2.0X -C -c Revision 1.1 90/11/30 11:04:46 gdsjaar -c Initial revision -c -C -CC* FILE: [.PAVING]CLOSE2.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE CLOSE2 (MXND, MLN, NUID, XN, YN, ZN, LXK, KXL, NXL, & LXN, LNODES, IAVAIL, NAVAIL, NNN, LLL, N1, XMIN, XMAX, YMIN, & YMAX, ZMIN, ZMAX, PGRAPH, VIDEO, DEV1, KREG, NOROOM, ERR) C*********************************************************************** -C + C SUBROUTINE CLOSE2 = SEALS OFF THE LAST 2 OPEN LINES WHILE CHECKING C FOR FORMING A 2-LINE NODE ON THE INTERIOR C (A 2-LINE NODE GENERATES 2 DEGENERATE QUADS) -C + C*********************************************************************** -C + DIMENSION NUID (MXND), XN (MXND), YN (MXND), ZN (MXND) DIMENSION LXK (4, MXND), KXL (2, 3*MXND) DIMENSION NXL (2, 3*MXND), LXN (4, MXND) DIMENSION LNODES (MLN, MXND) -C + LOGICAL ERR, NOROOM, FOUND, PGRAPH, DONE, CHECK, VIDEO -C + CHARACTER*3 DEV1 -C + ERR = .FALSE. CHECK = .FALSE. -C + N0 = LNODES (2, N1) LINE1 = LNODES (5, N0) LINE2 = LNODES (5, N1) -C + C CHECK TO MAKE SURE THAT AT LEAST ONE OF THE LINES C IS NOT A BOUNDARY LINE AND GET THE NODE TO BE DELETED -C + 100 CONTINUE IF ((KXL (1, LINE1) .GT. 0) .OR. & (KXL (1, LINE2) .GT. 0)) THEN -C + FOUND = .TRUE. -C + IF (KXL (1, LINE1) .GT. 0) THEN LNEW = LINE2 LOLD = LINE1 @@ -69,9 +49,9 @@ SUBROUTINE CLOSE2 (MXND, MLN, NUID, XN, YN, ZN, LXK, KXL, NXL, ENDIF KOLD = KXL (1, LOLD) KNEW = KXL (1, LNEW) -C + C CHECK FOR ONE OF THE NODES BEING A TWO LINE NODE -C + IF (KOLD. EQ. KNEW) THEN IF (LXN (3, N0) .EQ. 0) THEN NGONE = N0 @@ -85,9 +65,9 @@ SUBROUTINE CLOSE2 (MXND, MLN, NUID, XN, YN, ZN, LXK, KXL, NXL, ERR = .TRUE. GOTO 150 ENDIF -C + C DELETE THE TWO-LINE NODE, THE TWO LINES, AND THE ELEMENT -C + KXL (1, LOLD) = 0 KXL (2, LOLD) = 0 NXL (1, LOLD) = 0 @@ -96,9 +76,9 @@ SUBROUTINE CLOSE2 (MXND, MLN, NUID, XN, YN, ZN, LXK, KXL, NXL, KXL (2, LNEW) = 0 NXL (1, LNEW) = 0 NXL (2, LNEW) = 0 -C + C UNHOOK BOTH LINES FROM NTHERE -C + CALL DELLXN (MXND, LXN, NUID, NAVAIL, IAVAIL, NTHERE, & LOLD, NNN, ERR, NOROOM) IF (ERR) THEN @@ -113,9 +93,9 @@ SUBROUTINE CLOSE2 (MXND, MLN, NUID, XN, YN, ZN, LXK, KXL, NXL, & ' FROM NTHERE **') GOTO 150 ENDIF -C + C NOW DELETE NGONE AND THE ELEMENT -C + DO 110 I = 1, 4 LXN (I, NGONE) = 0 IF ( (LXK (I, KOLD) .EQ. LNEW) .OR. @@ -137,18 +117,18 @@ SUBROUTINE CLOSE2 (MXND, MLN, NUID, XN, YN, ZN, LXK, KXL, NXL, KXL (2, LNEW) = 0 KXL (1, LOLD) = KXL (1, LOLD) + KXL (2, LOLD) - KOLD KXL (2, LOLD) = 0 -C + C NOW RESET THE NECESSARY VARIABLES -C + N1 = NXL (1, LNEW) N0 = NXL (2, LNEW) LINE1 = LOLD LINE2 = LNEW GOTO 100 ENDIF -C + C DELETE THE OLD LINE AND REDO LINK ARRAYS -C + IF (KNEW .EQ. 0) THEN KXL (1, LNEW) = KOLD KXL (2, LNEW) = 0 @@ -160,9 +140,9 @@ SUBROUTINE CLOSE2 (MXND, MLN, NUID, XN, YN, ZN, LXK, KXL, NXL, KXL (2, LOLD) = 0 NXL (1, LOLD) = 0 NXL (2, LOLD) = 0 -C + C FIX THE LINES PER ELEMENT ARRAY FOR THE ONE ELEMENT CHANGING -C + DO 130 II = 1, 4 IF (LXK (II, KOLD) .EQ. LOLD) THEN LXK (II, KOLD) = LNEW @@ -173,10 +153,10 @@ SUBROUTINE CLOSE2 (MXND, MLN, NUID, XN, YN, ZN, LXK, KXL, NXL, ERR = .TRUE. GOTO 150 140 CONTINUE -C + C FIX LXN ARRAY C UNHOOK LOLD FROM N0 AND FROM N1 -C + CALL DELLXN (MXND, LXN, NUID, NAVAIL, IAVAIL, N0, & LOLD, NNN, ERR, NOROOM) IF (ERR) THEN @@ -189,20 +169,20 @@ SUBROUTINE CLOSE2 (MXND, MLN, NUID, XN, YN, ZN, LXK, KXL, NXL, CALL MESAGE ('** PROBLEMS IN CLOSE2 DELETING N1 LINES **') GOTO 150 ENDIF -C + C NOW FIX THE LNODES ARRAY -C + LNODES (4, N1) = - 2 LNODES (4, N0) = - 2 -C + ELSE CALL MESAGE ('** PINCHED TOO FAR IN CLOSE2 **') GOTO 150 ENDIF -C + C NOW SEE IF THE CLOSURE HAS PRODUCED A 2-LINE NODE AND C THUS REQUIRES THAT ONE OF THE ELEMENTS MUST BE SQUASHED -C + IF ((LXN (3, N0) .EQ. 0) .AND. (LXN (2, N0) .GT. 0)) THEN CALL DELEM (MXND, XN, YN, NUID, LXK, KXL, NXL, LXN, & NNN, NAVAIL, IAVAIL, N0, KXL (1, LNEW), IDUM1, IDUM2, @@ -214,15 +194,15 @@ SUBROUTINE CLOSE2 (MXND, MLN, NUID, XN, YN, ZN, LXK, KXL, NXL, & DONE, CHECK, NOROOM, ERR) IF ((NOROOM) .OR. (ERR)) GOTO 150 ENDIF -C + IF ( (FOUND) .AND. ((PGRAPH) .OR. (VIDEO)) ) THEN CALL RPLOTL (MXND, XN, YN, ZN, NXL, XMIN, XMAX, YMIN, YMAX, & ZMIN, ZMAX, LLL, DEV1, KREG) IF (VIDEO) CALL SNAPIT (1) ENDIF -C + 150 CONTINUE -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/close4.f b/packages/seacas/applications/fastq/close4.f index f6659e5406a6..1cb4a3d7211a 100644 --- a/packages/seacas/applications/fastq/close4.f +++ b/packages/seacas/applications/fastq/close4.f @@ -1,35 +1,24 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: close4.f,v 1.1 1990/11/30 11:04:50 gdsjaar Exp $ -C $Log: close4.f,v $ -C Revision 1.1 1990/11/30 11:04:50 gdsjaar -C Initial revision -C -C -CC* FILE: [.PAVING]CLOSE4.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE CLOSE4 (MXND, MLN, LXK, KXL, NXL, LXN, LNODES, & N0, N1, N2, N3, KKK, ERR) C*********************************************************************** -C + C SUBROUTINE CLOSE4 = CLOSES THE AREA AROUND A FOUR NODE ELEMENT -C + C*********************************************************************** -C + DIMENSION LXK (4, MXND), KXL (2, 3*MXND), LNODES (MLN, MXND) DIMENSION NXL (2, 3*MXND), LXN (4, MXND) -C + LOGICAL ERR -C + C SET ALL THE LOOP NODES TO BE INTERIOR -C + LNODES (4, N0) = - 2 LNODES (4, N1) = - 2 LNODES (4, N2) = - 2 @@ -46,21 +35,21 @@ SUBROUTINE CLOSE4 (MXND, MLN, LXK, KXL, NXL, LXN, LNODES, CALL MARKSM (MXND, MLN, LXK, KXL, NXL, LXN, LNODES, & N3, ERR) IF (ERR) GOTO 100 -C + C MAKE THE LXK AND THE KXL ARRAY -C + KKK = KKK+1 LXK (1, KKK) = LNODES (5, N0) LXK (2, KKK) = LNODES (5, N1) LXK (3, KKK) = LNODES (5, N2) LXK (4, KKK) = LNODES (5, N3) -C + CALL ADDKXL (MXND, KXL, KKK, LNODES (5, N0)) CALL ADDKXL (MXND, KXL, KKK, LNODES (5, N1)) CALL ADDKXL (MXND, KXL, KKK, LNODES (5, N2)) CALL ADDKXL (MXND, KXL, KKK, LNODES (5, N3)) -C + 100 CONTINUE RETURN -C + END diff --git a/packages/seacas/applications/fastq/close6.f b/packages/seacas/applications/fastq/close6.f index b4b1a90da7a2..a40282c43ef4 100644 --- a/packages/seacas/applications/fastq/close6.f +++ b/packages/seacas/applications/fastq/close6.f @@ -1,35 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: close6.f,v 1.2 1998/07/14 18:18:31 gdsjaar Exp $ -C $Log: close6.f,v $ -C Revision 1.2 1998/07/14 18:18:31 gdsjaar -C Removed unused variables, cleaned up a little. -C -C Changed BLUE labels to GREEN to help visibility on black background -C (indirectly requested by a couple users) -C -C Revision 1.1.1.1 1990/11/30 11:04:54 gdsjaar -C FASTQ Version 2.0X -C -c Revision 1.1 90/11/30 11:04:53 gdsjaar -c Initial revision -c -C -CC* FILE: [.PAVING]CLOSE6.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/31/90 -CC* MODIFICATION: ADDED ARGUMENTS TO CALL TO CLOSE6 TO PASS MINIMUM -CC** ELEMENT SIZE (SIZMIN) AND GETSIZ PARAMETERS OF -CC** EMIN AND EMAX -C SUBROUTINE CLOSE6 (MXND, MXCORN, MLN, NUID, XN, YN, LXK, KXL, NXL, & LXN, ANGLE, BNSIZE, LNODES, NODE, NLOOP, KKKOLD, LLLOLD, & NNNOLD, NAVAIL, IAVAIL, DONE, XMIN, XMAX, YMIN, YMAX, DEV1, @@ -38,29 +12,29 @@ SUBROUTINE CLOSE6 (MXND, MXCORN, MLN, NUID, XN, YN, LXK, KXL, NXL, & NPNOLD, NPEOLD, NNXK, REMESH, REXMIN, REXMAX, REYMIN, REYMAX, & IDIVIS, SIZMIN, EMAX, EMIN) C*********************************************************************** -C + C SUBROUTINE CLOSE6 = FINISHES UP A LOOP WITH ONLY 6 LINES IN THE LOOP -C + C*********************************************************************** -C + DIMENSION XN (MXND), YN (MXND), NUID (MXND) DIMENSION LXK (4, MXND), KXL (2, 3*MXND) DIMENSION NXL (2, 3*MXND), LXN (4, MXND) DIMENSION ANGLE (MXND), LNODES (MLN, MXND), BNSIZE (2, MXND) DIMENSION LCORN (MXCORN) -C + DIMENSION XNOLD(NPNOLD), YNOLD(NPNOLD) DIMENSION NXKOLD(NNXK, NPEOLD) DIMENSION LINKEG(2, MLINK), LISTEG(4 * NPEOLD), BMESUR(NPNOLD) -C + LOGICAL GRAPH, VIDEO, ERR, SIZEIT, NOROOM -C + CHARACTER*3 DEV1 -C + ERR = .FALSE. -C + C SET ALL THE LOOP NODES TO BE INTERIOR -C + INODE = NODE IKOUNT = 0 100 CONTINUE @@ -70,41 +44,36 @@ SUBROUTINE CLOSE6 (MXND, MXCORN, MLN, NUID, XN, YN, LXK, KXL, NXL, ERR = .TRUE. GOTO 110 ENDIF -C + LNODES (4, INODE) = - 2 CALL MARKSM (MXND, MLN, LXK, KXL, NXL, LXN, LNODES, INODE, ERR) IF (ERR) GOTO 110 -C + INODE = LNODES (3, INODE) IF (INODE .NE. NODE) GOTO 100 -C + C NOW GET THE CORRECT INTERPRETATION OF THE SHAPE -C + CALL CNTCRN (MXND, MXCORN, MLN, LNODES, LCORN, NCORN, NLOOP, & NODE, ERR) IF (ERR) GOTO 110 -C + C PROCESS A TRIANGLE SHAPE WITH VARIOUS INTERVAL COMBINATIONS -C + IF (NCORN .EQ. 3) THEN I1 = LNODES (7, LCORN(1)) I2 = LNODES (7, LCORN(2)) I3 = LNODES (7, LCORN(3)) -C + C HANDLE A 4-1-1 TRIANGLE -C + IF (MAX0 (I1, I2, I3) .EQ. 4) THEN IF (I1 .EQ. 4) THEN XNEW = ( ( (XN (LCORN (1)) + XN (LCORN (2)) ) * .5) + & XN (LCORN (3)) ) * .5 YNEW = ( ( (YN (LCORN (1)) + YN (LCORN (2)) ) * .5) + & YN (LCORN (3)) ) * .5 -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/31/90 -CC* MODIFICATION: ADDED ARGUMENTS TO CALL TO ADD1CN TO PASS MINIMUM -CC** ELEMENT SIZE (SIZMIN) AND GETSIZ PARAMETERS OF -CC** EMIN AND EMAX -C + CALL ADD1CN (MXND, MLN, XN, YN, NUID, LXK, KXL, NXL, LXN, & ANGLE, BNSIZE, LNODES, NNN, KKK, LLL, NNNOLD, LLLOLD, & NLOOP, XNEW, YNEW, LCORN(1), IAVAIL, NAVAIL, @@ -140,9 +109,9 @@ SUBROUTINE CLOSE6 (MXND, MXCORN, MLN, NUID, XN, YN, LXK, KXL, NXL, & IDIVIS, SIZMIN, EMAX, EMIN) IF ((NOROOM) .OR. (ERR)) GOTO 110 ENDIF -C + C HANDLE A 3-2-1 TRIANGLE -C + ELSEIF (MAX0 (I1, I2, I3) .EQ. 3) THEN IF (I1 .EQ. 1) THEN CALL ADD2EL (MXND, MLN, XN, YN, NUID, LXK, KXL, NXL, LXN, @@ -166,9 +135,9 @@ SUBROUTINE CLOSE6 (MXND, MXCORN, MLN, NUID, XN, YN, LXK, KXL, NXL, & NOROOM, ERR) IF ((NOROOM) .OR. (ERR)) GOTO 110 ENDIF -C + C HANDLE A 2-2-2 TRIANGLE -C + ELSE XNEW1 = ( ( (XN (LCORN (1)) + XN (LCORN (2)) ) * .5) + & XN (LCORN (3)) ) * .5 @@ -176,14 +145,14 @@ SUBROUTINE CLOSE6 (MXND, MXCORN, MLN, NUID, XN, YN, LXK, KXL, NXL, & XN (LCORN (1)) ) * .5 XNEW3 = ( ( (XN (LCORN (3)) + XN (LCORN (1)) ) * .5) + & XN (LCORN (2)) ) * .5 -C + YNEW1 = ( ( (YN (LCORN (1)) + YN (LCORN (2)) ) * .5) + & YN (LCORN (3)) ) * .5 YNEW2 = ( ( (YN (LCORN (2)) + YN (LCORN (3)) ) * .5) + & YN (LCORN (1)) ) * .5 YNEW3 = ( ( (YN (LCORN (3)) + YN (LCORN (1)) ) * .5) + & YN (LCORN (2)) ) * .5 -C + XNEW = (XNEW1 + XNEW2 + XNEW3) / 3. YNEW = (YNEW1 + YNEW2 + YNEW3) / 3. CALL ADD1CN (MXND, MLN, XN, YN, NUID, LXK, KXL, NXL, LXN, @@ -195,25 +164,20 @@ SUBROUTINE CLOSE6 (MXND, MXCORN, MLN, NUID, XN, YN, LXK, KXL, NXL, & EMAX, EMIN) IF ((NOROOM) .OR. (ERR)) GOTO 110 ENDIF -C + C PROCESS A RECTANGLE SHAPE WITH VARIOUS INTERVAL COMBINATIONS -C + ELSEIF (NCORN .EQ. 4) THEN I1 = LNODES (7, LCORN(1)) I2 = LNODES (7, LCORN(2)) I3 = LNODES (7, LCORN(3)) I4 = LNODES (7, LCORN(4)) -C + C HANDLE A 3-1-1-1 RECTANGLE -C + IF (MAX0 (I1, I2, I3, I4) .EQ. 3) THEN IF (I1 .EQ. 3) THEN -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/31/90 -CC* MODIFICATION: ADDED ARGUMENTS TO CALL TO ADD2CN TO PASS MINIMUM -CC** ELEMENT SIZE (SIZMIN) AND GETSIZ PARAMETERS OF -CC** EMIN AND EMAX -C + CALL ADD2CN (MXND, MLN, XN, YN, NUID, LXK, KXL, NXL, LXN, & ANGLE, BNSIZE, LNODES, NNN, KKK, LLL, NNNOLD, LLLOLD, & NLOOP, LCORN(1), IAVAIL, NAVAIL, GRAPH, VIDEO, @@ -250,9 +214,9 @@ SUBROUTINE CLOSE6 (MXND, MXCORN, MLN, NUID, XN, YN, LXK, KXL, NXL, & EMIN) IF ((NOROOM) .OR. (ERR)) GOTO 110 ENDIF -C + C HANDLE A 2-2-1-1 RECTANGLE -C + ELSEIF (MAX0 ((I1+I2), (I2+I3), (I3+I4), (I4+I1)) .EQ. 4) THEN IF ( (I1+I2) .EQ. 4) THEN XNEW = ( XN (LNODES (3, LCORN(1))) + @@ -331,9 +295,9 @@ SUBROUTINE CLOSE6 (MXND, MXCORN, MLN, NUID, XN, YN, LXK, KXL, NXL, & IDIVIS, SIZMIN, EMAX, EMIN) IF ((NOROOM) .OR. (ERR)) GOTO 110 ENDIF -C + C HANDLE A 2-1-2-1 RECTANGLE -C + ELSE IF (I1 .EQ. 2) THEN CALL ADD2EL (MXND, MLN, XN, YN, NUID, LXK, KXL, NXL, LXN, @@ -351,15 +315,15 @@ SUBROUTINE CLOSE6 (MXND, MXCORN, MLN, NUID, XN, YN, LXK, KXL, NXL, IF ((NOROOM) .OR. (ERR)) GOTO 110 ENDIF ENDIF -C + C PROCESS A SEMICIRCLE SHAPE WITH VARIOUS INTERVAL COMBINATIONS -C + ELSEIF (NCORN .EQ. 2) THEN I1 = LNODES (7, LCORN(1)) I2 = LNODES (7, LCORN(2)) -C + C HANDLE A 5-1 SEMICIRCLE -C + IF (MAX0 (I1, I2) .EQ. 5) THEN IF (I1 .EQ. 1) THEN CALL ADD2EL (MXND, MLN, XN, YN, NUID, LXK, KXL, NXL, LXN, @@ -376,9 +340,9 @@ SUBROUTINE CLOSE6 (MXND, MXCORN, MLN, NUID, XN, YN, LXK, KXL, NXL, & GRAPH, VIDEO, NOROOM, ERR) IF ((NOROOM) .OR. (ERR)) GOTO 110 ENDIF -C + C HANDLE A 4-2 SEMICIRCLE -C + ELSEIF (MAX0 (I1, I2) .EQ. 4) THEN IF (I1 .EQ. 2) THEN CALL ADD2EL (MXND, MLN, XN, YN, NUID, LXK, KXL, NXL, LXN, @@ -395,9 +359,9 @@ SUBROUTINE CLOSE6 (MXND, MXCORN, MLN, NUID, XN, YN, LXK, KXL, NXL, & GRAPH, VIDEO, NOROOM, ERR) IF ((NOROOM) .OR. (ERR)) GOTO 110 ENDIF -C + C HANDLE A 3-3 SEMICIRCLE -C + ELSE CALL ADD2EL (MXND, MLN, XN, YN, NUID, LXK, KXL, NXL, LXN, & ANGLE, LNODES, NNN, KKK, LLL, NNNOLD, LLLOLD, @@ -413,9 +377,9 @@ SUBROUTINE CLOSE6 (MXND, MXCORN, MLN, NUID, XN, YN, LXK, KXL, NXL, C & REXMAX, REYMIN, REYMAX, IDIVIS, SIZMIN, EMAX, EMIN) C IF ((NOROOM) .OR. (ERR)) GOTO 110 ENDIF -C + C PROCESS A TEAR-DROP SHAPE (1 CORNER) -C + ELSEIF (NCORN .EQ. 1) THEN CALL ADD2EL (MXND, MLN, XN, YN, NUID, LXK, KXL, NXL, LXN, & ANGLE, LNODES, NNN, KKK, LLL, NNNOLD, LLLOLD, @@ -423,9 +387,9 @@ SUBROUTINE CLOSE6 (MXND, MXCORN, MLN, NUID, XN, YN, LXK, KXL, NXL, & LNODES (2, LNODES (2, LCORN(1))), IAVAIL, NAVAIL, & GRAPH, VIDEO, NOROOM, ERR) IF ((NOROOM) .OR. (ERR)) GOTO 110 -C + C PROCESS A TRUE CIRCLE (OR ANYTHING ELSE FOR THAT MATTER) -C + ELSE I1 = NODE I2 = LNODES (3, NODE) @@ -433,14 +397,14 @@ SUBROUTINE CLOSE6 (MXND, MXCORN, MLN, NUID, XN, YN, LXK, KXL, NXL, I4 = LNODES (3, LNODES (3, LNODES (3, NODE))) I5 = LNODES (2, LNODES (2, NODE)) I6 = LNODES (2, NODE) -C + DIST1 = SQRT ( ((XN (I1) - XN (I4)) ** 2) + & ((YN (I1) - YN (I4)) ** 2) ) DIST2 = SQRT ( ((XN (I2) - XN (I5)) ** 2) + & ((YN (I2) - YN (I5)) ** 2) ) DIST3 = SQRT ( ((XN (I3) - XN (I6)) ** 2) + & ((YN (I3) - YN (I6)) ** 2) ) -C + IF ( (DIST1 .LE. DIST2) .AND. (DIST1 .LE. DIST3) ) THEN CALL ADD2EL (MXND, MLN, XN, YN, NUID, LXK, KXL, NXL, LXN, & ANGLE, LNODES, NNN, KKK, LLL, NNNOLD, LLLOLD, @@ -461,9 +425,9 @@ SUBROUTINE CLOSE6 (MXND, MXCORN, MLN, NUID, XN, YN, LXK, KXL, NXL, IF ((NOROOM) .OR. (ERR)) GOTO 110 ENDIF ENDIF -C + 110 CONTINUE -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/closeg.f b/packages/seacas/applications/fastq/closeg.f index 2e20da26be86..40cb45027752 100644 --- a/packages/seacas/applications/fastq/closeg.f +++ b/packages/seacas/applications/fastq/closeg.f @@ -1,43 +1,32 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: closeg.f,v 1.1 1990/11/30 11:04:57 gdsjaar Exp $ -C $Log: closeg.f,v $ -C Revision 1.1 1990/11/30 11:04:57 gdsjaar -C Initial revision -C -C -CC* FILE: [.MAIN]CLOSEG.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE CLOSEG (MSNAP, SNAPDX, NSNAP, X, Y, II, INDEX, XBOT, & XTOP, YBOT, YTOP) C*********************************************************************** -C + C SUBROUTINE CLOSEG = SUBROUTINE TO RETURN CLOSEST GRID LINE -C + C*********************************************************************** -C + C SUBROUTINE CALLED BY: C DIGIT = A SUBROUTINE TO INPUT GEOMETRY -C + C*********************************************************************** -C + C VARIABLES USED: C X = THE X LOCATION IN USER COORDINATES C Y = THE Y LOCATION IN USER COORDINATES -C + C*********************************************************************** -C + DIMENSION SNAPDX(2, MSNAP), NSNAP(2) -C + C FIND CLOSEST GRID CROSSING IN X OR Y -C + XHOLD = X YHOLD = Y CALL SNAPPT (MSNAP, SNAPDX, NSNAP, XHOLD, YHOLD) @@ -47,9 +36,9 @@ SUBROUTINE CLOSEG (MSNAP, SNAPDX, NSNAP, X, Y, II, INDEX, XBOT, INDEX = 2 XHOLD = YHOLD END IF -C + C FIND INDEX TO GRID LINE -C + DO 100 I = 1, NSNAP(INDEX) IF (SNAPDX(INDEX, I) .GE. XHOLD) THEN II = I @@ -58,9 +47,9 @@ SUBROUTINE CLOSEG (MSNAP, SNAPDX, NSNAP, X, Y, II, INDEX, XBOT, 100 CONTINUE II = NSNAP(INDEX) 110 CONTINUE -C + C SET GRID LINE LIMITS -C + IF (INDEX .EQ. 1) THEN XBOT = SNAPDX(1, II) XTOP = XBOT @@ -72,7 +61,7 @@ SUBROUTINE CLOSEG (MSNAP, SNAPDX, NSNAP, X, Y, II, INDEX, XBOT, YBOT = SNAPDX(2, II) YTOP = YBOT END IF -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/closel.f b/packages/seacas/applications/fastq/closel.f index 0e87940bc8ca..e598cfedbafc 100644 --- a/packages/seacas/applications/fastq/closel.f +++ b/packages/seacas/applications/fastq/closel.f @@ -1,54 +1,37 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: closel.f,v 1.2 1991/03/21 15:44:25 gdsjaar Exp $ -C $Log: closel.f,v $ -C Revision 1.2 1991/03/21 15:44:25 gdsjaar -C Changed all 3.14159... to atan2(0.0, -1.0) -C -c Revision 1.1.1.1 1990/11/30 11:05:01 gdsjaar -c FASTQ Version 2.0X -c -c Revision 1.1 90/11/30 11:04:59 gdsjaar -c Initial revision -c -C -CC* FILE: [.MAIN]CLOSEL.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE CLOSEL (MP, ML, N, COOR, ILINE, LTYPE, LCON, LINKP, & LINKL, X, Y, BIFIND, IFIND, ADDCEN, XCHOLD, YCHOLD) C*********************************************************************** -C + C SUBROUTINE CLOSEL = FINDS CLOSEST PERPENDICULAR BISECTED LINE -C + C*********************************************************************** -C + C SUBROUTINE CALLED BY: C BISECT = -C + C*********************************************************************** -C + C SUBROUTINES CALLED: C DLPARA = DETERMINES LINE PARAMETERS FROM TWO POINTS -C + C*********************************************************************** -C + DIMENSION COOR(2, MP), ILINE(ML), LCON(3, ML), LTYPE(ML), N(29) DIMENSION LINKL(2, ML), LINKP(2, MP) -C + LOGICAL BIFIND, BAD, ADDLNK, ADDCEN, ERR -C + PI = ATAN2(0.0, -1.0) TWOPI = PI + PI -C + C FIND THE CLOSEST LINE ABOVE THE POINT INPUT -C + BIFIND = .FALSE. ADDLNK = .FALSE. IFIND = 0 @@ -61,28 +44,28 @@ SUBROUTINE CLOSEL (MP, ML, N, COOR, ILINE, LTYPE, LCON, LINKP, & J3) IF ((J1 .GT. 0) .AND. (J2 .GT. 0)) THEN IF (KT .EQ. 1) THEN -C + C GET THE PARAMETERS FOR THE LINE -C + CALL DLPARA (COOR(1, J1), COOR(2, J1), COOR(1, J2), & COOR(2, J2), XM1, B1, BAD) -C + C GET DISTANCE FOR VERTICAL LINE -C + IF (BAD) THEN DTRY = ABS(COOR(1, J1) - X) XTRY = COOR(1, J1) YTRY = Y -C + C GET DISTANCE FOR HORIZONTAL LINE -C + ELSE IF (ABS(XM1) .LT. .000001) THEN DTRY = ABS(COOR(2, J1) - Y) XTRY = X YTRY = COOR(2, J1) -C + C GET PERPENDICULAR DISTANCE TO ARBITRARY LINE -C + ELSE XM2 = -1./XM1 B2 = Y - (XM2*X) @@ -104,17 +87,17 @@ SUBROUTINE CLOSEL (MP, ML, N, COOR, ILINE, LTYPE, LCON, LINKP, BIFIND = .TRUE. END IF END IF -C + C CHECK DISTANCES TO CIRCULAR ARCS -C + ELSE IF ((KT .EQ. 3).OR.(KT .EQ. 4).OR.(KT .EQ. 6)) THEN -C + C FIRST GET THETA1, THETA2, THETAT, R1, R2, AND RTRY -C + CALL ARCPAR (MP, KT, ILINE(II), COOR, LINKP, J1, J2, & J3, I3, XCEN, YCEN, THETA1, THETA2, TANG, R1, R2, & ERR, ICCW, ICW, XK, XA) -C + IF ((Y .EQ. YCEN) .AND. (X .EQ. XCEN)) THEN RTRY = 0. THETAT = (THETA1 + THETA2)*.5 @@ -122,20 +105,20 @@ SUBROUTINE CLOSEL (MP, ML, N, COOR, ILINE, LTYPE, LCON, LINKP, THETAT = ATAN2(Y - YCEN, X - XCEN) RTRY = SQRT( ((X - XCEN)**2) + ((Y - YCEN)**2)) END IF -C + C SEE IF THE POINT ANGLE IS WITHIN THE BEGINNING AND ENDING ANGLES -C + IF ( ((THETAT .LE. THETA2) .AND. (THETAT .GE. THETA1)) & .OR. ((THETAT + TWOPI .LE. THETA2) .AND. & (THETAT + TWOPI .GE. THETA1)) ) THEN -C + C CALCULATE THE ARC RADIUS AT THAT ANGLE -C + RADIUS = XA*EXP(XK*THETAT) DTRY = ABS(RADIUS - RTRY) -C + C CHECK TO SEE IF THE ARC IS THE CLOSEST -C + IF (DTRY .LE. DIST) THEN DIST = DTRY XHOLD = XCEN + COS(THETAT)*RADIUS @@ -157,6 +140,6 @@ SUBROUTINE CLOSEL (MP, ML, N, COOR, ILINE, LTYPE, LCON, LINKP, 100 CONTINUE X = XHOLD Y = YHOLD -C + RETURN END diff --git a/packages/seacas/applications/fastq/closep.f b/packages/seacas/applications/fastq/closep.f index 0d9b2905a3b0..545eb3906301 100644 --- a/packages/seacas/applications/fastq/closep.f +++ b/packages/seacas/applications/fastq/closep.f @@ -1,32 +1,21 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: closep.f,v 1.1 1990/11/30 11:05:03 gdsjaar Exp $ -C $Log: closep.f,v $ -C Revision 1.1 1990/11/30 11:05:03 gdsjaar -C Initial revision -C -C -CC* FILE: [.MAIN]CLOSEP.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE CLOSEP (MP, N15, X, Y, IPOINT, COOR, LINKP, JJ) C*********************************************************************** -C + C SUBROUTINE CLOSE = FINDS THE CLOSEST EXISTING POINT TO THE MOUSE -C + C*********************************************************************** -C + C SUBROUTINE CALLED BY: C INPUT = INPUTS MESH DEFINITIONS FROM THE LIGHT TABLE -C + C*********************************************************************** -C + C VARIABLES USED: C X = THE X LOCATION IN USER COORDINATES C Y = THE Y LOCATION IN USER COORDINATES @@ -37,16 +26,16 @@ SUBROUTINE CLOSEP (MP, N15, X, Y, IPOINT, COOR, LINKP, JJ) C (I, 4) = THE BOUNDARY FLAG OF THE POINT C I = THE NUMBER OF THE CLOSEST POINT FOUND C K = THE NUMBER OF POINTS IN THE DATABASE -C + C*********************************************************************** -C + DIMENSION IPOINT (MP), COOR (2, MP), LINKP (2, MP) -C + LOGICAL ADDLNK -C + ADDLNK = .FALSE. DMIN = 100000. -C + DO 100 I = 1, N15 CALL LTSORT (MP, LINKP, I, IPNTR, ADDLNK) IF (IPNTR .GT. 0) THEN diff --git a/packages/seacas/applications/fastq/cntcrn.f b/packages/seacas/applications/fastq/cntcrn.f index e6d7585db06f..4cc0387d46ec 100644 --- a/packages/seacas/applications/fastq/cntcrn.f +++ b/packages/seacas/applications/fastq/cntcrn.f @@ -1,54 +1,25 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: cntcrn.f,v 1.2 1999/06/21 22:43:40 gdsjaar Exp $ -C $Log: cntcrn.f,v $ -C Revision 1.2 1999/06/21 22:43:40 gdsjaar -C Fixed more uninitialized variables; one was causing core dump on g77 -C compiled executable. -C -C VERSN was not consistently defined -- now 10 characters everywhere -C -C Updated so full version string output -C -C Added capability to debug memory using unit specified in EXT99 -C variable. Similar to STRTUP in SUPLIB -C -C Cleaned up some other code -C -C Upped version -C -C Revision 1.1.1.1 1990/11/30 11:05:07 gdsjaar -C FASTQ Version 2.0X -C -c Revision 1.1 90/11/30 11:05:06 gdsjaar -c Initial revision -c -C -CC* FILE: [.PAVING]CNTCRN.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE CNTCRN (MXND, MXCORN, MLN, LNODES, LCORN, NCORN, & NLOOP, N1, ERR) C*********************************************************************** -C + C SUBROUTINE CNTCRN = COUNTS THE CURRENT DESIGNATED CORNER LENGTHS -C + C*********************************************************************** -C + DIMENSION LNODES (MLN, MXND), LCORN (MXCORN) -C + LOGICAL ERR -C + ERR = .FALSE. -C + C COUNT THE CURRENT CORNERS STARTING AT THE I COUNTER -C + NODE = N1 NOLD = N1 KOUNT = 0 @@ -63,13 +34,13 @@ SUBROUTINE CNTCRN (MXND, MXCORN, MLN, LNODES, LCORN, NCORN, ERR = .TRUE. GOTO 110 ENDIF -C + C A NEW CORNER NODE HAS BEEN FOUND -C + IF (LNODES (1, NODE) .EQ. 1) THEN -C + C ADD UP THE NUMBER OF NODES FROM THE LAST "NON-SIDE" -C + NCORN = NCORN + 1 IF (NCORN .LE. MXCORN) LCORN(NCORN) = NODE IF (NCORN .GT. 1) THEN @@ -79,24 +50,24 @@ SUBROUTINE CNTCRN (MXND, MXCORN, MLN, LNODES, LCORN, NCORN, ENDIF LASTC = NODE KOUNTC = 0 -C + C THIS IS A SIDE - JUST CONTINUE -C + ELSE KOUNTC = KOUNTC + 1 ENDIF -C + C CHECK FOR COMPLETION OF THE LOOP -C + NODE = LNODES (3, NODE) IF (NODE .NE. NOLD) GOTO 100 -C + C GET THE FIRST CORNER'S DISTANCE FROM PREVIOUS CORNER CORRECT -C + LNODES (7, LASTC) = KKC + KOUNTC -C + 110 CONTINUE -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/colaps.f b/packages/seacas/applications/fastq/colaps.f index 58534350aff3..4130ae2f994f 100644 --- a/packages/seacas/applications/fastq/colaps.f +++ b/packages/seacas/applications/fastq/colaps.f @@ -1,62 +1,39 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: colaps.f,v 1.3 1998/07/14 18:18:33 gdsjaar Exp $ -C $Log: colaps.f,v $ -C Revision 1.3 1998/07/14 18:18:33 gdsjaar -C Removed unused variables, cleaned up a little. -C -C Changed BLUE labels to GREEN to help visibility on black background -C (indirectly requested by a couple users) -C -C Revision 1.2 1991/03/21 15:44:27 gdsjaar -C Changed all 3.14159... to atan2(0.0, -1.0) -C -c Revision 1.1.1.1 1990/11/30 11:05:10 gdsjaar -c FASTQ Version 2.0X -c -c Revision 1.1 90/11/30 11:05:08 gdsjaar -c Initial revision -c -C -CC* FILE: [.PAVING]COLAPS.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE COLAPS (MXND, MXCORN, MLN, MXLOOP, NUID, XN, YN, ZN, & LXK, KXL, NXL, LXN, ANGLE, LNODES, BNSIZE, NODE, KKKOLD, & LLLOLD, NNNOLD, IAVAIL, NAVAIL, DONE, XMIN, XMAX, YMIN, YMAX, & ZMIN, ZMAX, DEV1, LLL, KKK, NNN, LCORN, NCORN, NLOOP, NEXTN1, & KLOOP, GRAPH, VIDEO, KREG, NOROOM, ERR) C*********************************************************************** -C + C SUBROUTINE COLAPS = COLLAPSES A LOOP INTO TWO POSSIBLE LOOPS -C + C*********************************************************************** -C + COMMON /TIMING/ TIMEA, TIMEP, TIMEC, TIMEPC, TIMEAJ, TIMES -C + DIMENSION XN (MXND), YN (MXND), ZN (MXND), NUID (MXND) DIMENSION LXK (4, MXND), KXL (2, 3*MXND) DIMENSION NXL (2, 3*MXND), LXN (4, MXND) DIMENSION ANGLE (MXND), LNODES (MLN, MXND), BNSIZE (2, MXND) DIMENSION LCORN (MXCORN) DIMENSION NLOOP (MXLOOP), NEXTN1 (MXLOOP) -C + CHARACTER*3 DEV1 -C + LOGICAL DONE, ERR, NOROOM, DONE1, DONE2, DONEP LOGICAL GRAPH, BOK, LCROSS, LMATCH, VIDEO LOGICAL CGRAPH, CWEDGE, PMATCH PI = ATAN2(0.0, -1.0) -C + C FIND THE FIRST OVERLAPPING LINE STARTING AT THE CURRENT NODE -C + CALL GETIME (TIME1) CGRAPH = .FALSE. CWEDGE = .TRUE. @@ -68,20 +45,20 @@ SUBROUTINE COLAPS (MXND, MXCORN, MLN, MXLOOP, NUID, XN, YN, ZN, 100 CONTINUE N1 = NODE KOUNT1 = 0 -C + IF (CGRAPH) THEN CALL RPLOTL (MXND, XN, YN, ZN, NXL, XMIN, XMAX, & YMIN, YMAX, ZMIN, ZMAX, LLL, DEV1, KREG) ENDIF -C + 110 CONTINUE N0 = LNODES (2, N1) N2 = LNODES (3, N1) N3 = LNODES (3, N2) KOUNT1 = KOUNT1 + 1 -C + C CHECK FOR COMPLETION -C + IF (N2 .EQ. NODE) THEN GOTO 140 ELSEIF (KOUNT1 .GT. NLOOP (1) + 1) THEN @@ -89,16 +66,16 @@ SUBROUTINE COLAPS (MXND, MXCORN, MLN, MXLOOP, NUID, XN, YN, ZN, ERR = .TRUE. GOTO 140 ENDIF -C + C CHECK THIS LINE AGAINST ALL REMAINING LINES -C + KOUNT2 = 2 N1TEST = LNODES (3, N2) 120 CONTINUE N0TEST = LNODES (2, N1TEST) N2TEST = LNODES (3, N1TEST) N3TEST = LNODES (3, N2TEST) -C + IF (CGRAPH) THEN CALL LCOLOR ('YELOW') CALL D2NODE (MXND, XN, YN, N1, N2) @@ -106,7 +83,7 @@ SUBROUTINE COLAPS (MXND, MXCORN, MLN, MXLOOP, NUID, XN, YN, ZN, CALL LCOLOR ('WHITE') CALL SFLUSH ENDIF -C + CALL INTSCT (XN(N1), YN(N1), XN(N2), YN(N2), XN(N1TEST), & YN(N1TEST), XN(N2TEST), YN(N2TEST), U, W, LCROSS) IF (.NOT. LCROSS) THEN @@ -123,10 +100,10 @@ SUBROUTINE COLAPS (MXND, MXCORN, MLN, MXLOOP, NUID, XN, YN, ZN, ENDIF GOTO 120 ENDIF -C + C AN INTERSECTION HAS OCCURRED. C GET THE BEST SEAM FROM THIS INTERSECTION -C + IF ((GRAPH) .OR. (VIDEO)) THEN IF (.NOT. DONEP) THEN CALL RPLOTL (MXND, XN, YN, ZN, NXL, XMIN, XMAX, @@ -162,10 +139,10 @@ SUBROUTINE COLAPS (MXND, MXCORN, MLN, MXLOOP, NUID, XN, YN, ZN, ENDIF GOTO 120 ENDIF -C + C NOW CHECK TO SEE IF THE ATTACHMENT WOULD CAUSE C LINES ON THE BOUNDARY TO CROSS -C + CALL BCROSS (MXND, MLN, XN, YN, ZN, LXK, KXL, NXL, LXN, LNODES, & I1, I2, J1, J2, NLOOP(1), BOK, LLL, XMIN, XMAX, YMIN, YMAX, & ZMIN, ZMAX, DEV1, KREG, ERR) @@ -179,10 +156,10 @@ SUBROUTINE COLAPS (MXND, MXCORN, MLN, MXLOOP, NUID, XN, YN, ZN, ENDIF GOTO 120 ENDIF -C + C NOW CHECK TO SEE IF THE ATTACHMENT WOULD CAUSE C AN ILLFORMED 4 NODE ELEMENT -C + CALL B4BAD (MXND, MLN, XN, YN, LXK, KXL, NXL, LXN, LNODES, & ANGLE, I1, I2, J1, J2, NLOOP(1), KOUNTL, BOK, ERR) IF (ERR) GOTO 140 @@ -195,10 +172,10 @@ SUBROUTINE COLAPS (MXND, MXCORN, MLN, MXLOOP, NUID, XN, YN, ZN, ENDIF GOTO 120 ENDIF -C + C SEE IF THE COLLAPSE IS BETWEEN TWO ELEMENT SIDES OF DISPROPORTIONATE C SIZES - IF SO A WEDGE MUST BE ADDED -C + DISTI = SQRT ( ((XN (I1) - XN (I2)) **2) + & ((YN (I1) - YN (I2)) **2) ) DISTJ = SQRT ( ((XN (J1) - XN (J2)) **2) + @@ -269,16 +246,16 @@ SUBROUTINE COLAPS (MXND, MXCORN, MLN, MXLOOP, NUID, XN, YN, ZN, ANGLE (J2) = PI GOTO 100 ENDIF -C + C NOW THAT THE APPROPRIATE COLLAPSE HAS BEEN FOUND, THE TWO LINES C MUST BE JOINED. -C + CALL SEW2 (MXND, MLN, NUID, LXK, KXL, NXL, LXN, LNODES, & IAVAIL, NAVAIL, LLL, KKK, NNN, I1, I2, J1, J2, NOROOM, ERR) IF ((NOROOM) .OR. (ERR)) GOTO 140 -C + C NOW SMOOTH AND PLOT THE CURRENT MESH -C + NNN2 = 1 CALL GETIME (TIME2) TIMEC = TIMEC + TIME2 - TIME1 @@ -299,9 +276,9 @@ SUBROUTINE COLAPS (MXND, MXCORN, MLN, MXLOOP, NUID, XN, YN, ZN, ENDIF NLOOP1 = KOUNTL NLOOP2 = NLOOP (1) - KOUNTL - 2 -C + C NOW UPDATE THE DEFINITIONS OF NODE FOR BOTH LOOPS -C + IF (J1 .EQ. NODE) THEN NODE = I2 ELSEIF (J2 .EQ. NODE) THEN @@ -310,9 +287,9 @@ SUBROUTINE COLAPS (MXND, MXCORN, MLN, MXLOOP, NUID, XN, YN, ZN, CALL NODE12 (MXND, MLN, LNODES, I1, I2, NLOOP1, NLOOP2, & NODE1, NODE2, NODE, ERR) IF (ERR) GOTO 140 -C + C NOW TRY TO PINCH BOTH LOOPS -C + CALL LUPANG (MXND, MLN, XN, YN, ZN, LXK, KXL, NXL, LXN, NLOOP1, & ANGLE, LNODES, NODE2, LLL, XMIN, XMAX, YMIN, YMAX, ZMIN, ZMAX, & DEV1, KREG, ERR) @@ -341,9 +318,9 @@ SUBROUTINE COLAPS (MXND, MXCORN, MLN, MXLOOP, NUID, XN, YN, ZN, & VIDEO, KREG, NOROOM, ERR) IF ((NOROOM) .OR. (ERR)) GOTO 140 CALL GETIME (TIME1) -C + C NOW HANDLE THE PLACEMENT OF THOSE LOOPS -C + IF ((DONE1) .AND. (DONE2)) THEN DONE = .TRUE. GOTO 140 @@ -354,33 +331,33 @@ SUBROUTINE COLAPS (MXND, MXCORN, MLN, MXLOOP, NUID, XN, YN, ZN, NLOOP (1) = NLOOP1 NODE = NODE2 ELSE -C + C MOVE PREVIOUS LOOPS DOWN IN THE LIST -C + KLOOP = KLOOP + 1 DO 130 I = KLOOP, 3, -1 NLOOP (I) = NLOOP (I - 1) NEXTN1 (I) = NEXTN1 (I - 1) 130 CONTINUE NEXTN1 (KLOOP) = 0 -C + C INSERT THE TWO NEW LISTS AS THE TOP TWO - KEEPING NODE C THE SAME FOR ONE OF THE LOOPS -C + NLOOP (1) = NLOOP1 NLOOP (2) = NLOOP2 NEXTN1 (2) = NEXTN1 (1) NEXTN1 (1) = NODE1 NODE = NODE2 ENDIF -C + C NOW MAKE SURE THAT THE TOP LOOP DOES NOT NEED A COLAPS AGAIN -C + GOTO 100 -C + 140 CONTINUE CALL GETIME (TIME2) TIMEC = TIMEC + TIME2 - TIME1 RETURN -C + END diff --git a/packages/seacas/applications/fastq/comsrt.f b/packages/seacas/applications/fastq/comsrt.f index d71af4e2c89e..005508498277 100644 --- a/packages/seacas/applications/fastq/comsrt.f +++ b/packages/seacas/applications/fastq/comsrt.f @@ -1,30 +1,19 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: comsrt.f,v 1.1 1990/11/30 11:05:12 gdsjaar Exp $ -C $Log: comsrt.f,v $ -C Revision 1.1 1990/11/30 11:05:12 gdsjaar -C Initial revision -C -C -CC* FILE: [.PAVING]COMSRT.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE COMSRT (MXND, MXCORN, MXPICK, MLN, LNODES, LCORN, & NCORN, ICOMB, ITYPE, NPICK) C*********************************************************************** -C + C SUBROUTINE COMSRT = THIS SUBROUTINE GETS ALL THE COMBINATIONS C POSSIBLE OF CORNERS, SIDES, AND DISSECION C NODES -C + C*********************************************************************** -C + C VARIABLES USED: C ICOMB = THE DIFFERENT VALID PRIMITIVE COMBINATIONS C ICOMB (I, J) WHERE I IS THE COMBINATION NUMBER @@ -39,23 +28,22 @@ SUBROUTINE COMSRT (MXND, MXCORN, MXPICK, MLN, LNODES, LCORN, C = 3 FOR A TRIANGLE C = 4 FOR A RECTANGLE C = >4 OTHERWISE -C -C + C*********************************************************************** -C + DIMENSION LNODES (MLN, MXND), ICOMB (MXCORN, MXPICK) DIMENSION ITYPE (MXPICK), LCORN (MXCORN) -C + NPICK = 1 -C + DO 100 I = 1, MXPICK ITYPE (I) = 0 100 CONTINUE -C + DO 150 I = 1, NCORN -C + C PUT PURE CORNER AND CORNER/SIDE DESIGNATIONS IN ORDER -C + ITEST = LNODES (6, LCORN (I)) IF (ITEST .LE. 2) THEN DO 110 J = 1, NPICK @@ -72,17 +60,17 @@ SUBROUTINE COMSRT (MXND, MXCORN, MXPICK, MLN, LNODES, LCORN, 130 CONTINUE NPICK = NPICK * 2 ENDIF -C + C PUT PURE SIDE AND SIDE/DISSECTIONS DESIGNATIONS IN ORDER -C + ELSEIF (ITEST .LE. 4) THEN DO 140 J = 1, NPICK ICOMB (I, J) = 0 140 CONTINUE ENDIF -C + 150 CONTINUE -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/condno.f b/packages/seacas/applications/fastq/condno.f index 769fdbd78217..ba70042749a1 100644 --- a/packages/seacas/applications/fastq/condno.f +++ b/packages/seacas/applications/fastq/condno.f @@ -1,50 +1,30 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: condno.f,v 1.2 1998/07/14 18:18:34 gdsjaar Exp $ -C $Log: condno.f,v $ -C Revision 1.2 1998/07/14 18:18:34 gdsjaar -C Removed unused variables, cleaned up a little. -C -C Changed BLUE labels to GREEN to help visibility on black background -C (indirectly requested by a couple users) -C -C Revision 1.1.1.1 1990/11/30 11:05:16 gdsjaar -C FASTQ Version 2.0X -C -c Revision 1.1 90/11/30 11:05:14 gdsjaar -c Initial revision -c -C -CC* FILE: [.QMESH]CONDNO.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE CONDNO (MXND, NODES, QRAT, SRAT, COND, SIDES, XN, YN, & LSIDE) C*********************************************************************** -C + C SUBROUTINE CONDNO = COMPUTES EVALUATOR FUNCTIONS FOR RESTRUCTURING -C + C*********************************************************************** -C + C VARIABLES USED: C LSIDE = .TRUE. IF SIDES ARRAY IS TO BE FILLED C NODES = THE FOUR NODES OF THE ELEMENT C QRAT = THE RATIO OF SMALLEST TO LARGEST ANGLE C SRAT = THE RATIO OF SMALLEST TO LARGEST SIDE C COND = SRAT*QRAT -C + C*********************************************************************** -C + DIMENSION NODES (4), SIDES (4), XN (MXND), YN (MXND) -C + LOGICAL LSIDE -C + N1 = NODES (1) N2 = NODES (2) N3 = NODES (3) @@ -69,7 +49,7 @@ SUBROUTINE CONDNO (MXND, NODES, QRAT, SRAT, COND, SIDES, XN, YN, SIDES (3) = SQRT (SS3) SIDES (4) = SQRT (SS4) ENDIF -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/connod.f b/packages/seacas/applications/fastq/connod.f index c5f64346c09a..9036ab24537e 100644 --- a/packages/seacas/applications/fastq/connod.f +++ b/packages/seacas/applications/fastq/connod.f @@ -1,42 +1,31 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: connod.f,v 1.1 1990/11/30 11:05:18 gdsjaar Exp $ -C $Log: connod.f,v $ -C Revision 1.1 1990/11/30 11:05:18 gdsjaar -C Initial revision -C -C -CC* FILE: [.PAVING]CONNOD.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE CONNOD (MXND, MLN, XN, YN, NUID, LXK, KXL, NXL, LXN, & ANGLE, LNODES, NNN, KKK, LLL, NNNOLD, LLLOLD, N0, N1, N2, & NODE, I, NLOOP, IAVAIL, NAVAIL, GRAPH, VIDEO, NOROOM, ERR) C*********************************************************************** -C + C SUBROUTINE CONNOD = ADDS A NEW ELEMENT TO AN EXISTING NODE -C + C*********************************************************************** -C + DIMENSION XN (MXND), YN (MXND), NUID (MXND) DIMENSION LXK (4, MXND), KXL (2, 3*MXND) DIMENSION NXL (2, 3*MXND), LXN (4, MXND) DIMENSION ANGLE (MXND), LNODES (MLN, MXND) -C + LOGICAL GRAPH, VIDEO, ERR, NOROOM -C + ERR = .FALSE. -C + NLOOP = NLOOP-2 -C + C TAKE CARE OF A COUNTERCLOCKWISE CONNECTION -C + IF (LNODES (3, N2) .EQ. NODE) THEN LNODES (3, N0) = NODE LNODES (2, NODE) = N0 @@ -48,19 +37,19 @@ SUBROUTINE CONNOD (MXND, MLN, XN, YN, NUID, LXK, KXL, NXL, LXN, KKK = KKK+1 NXL (1, LLL) = NODE NXL (2, LLL) = N0 -C + C MAKE THE NEW ELEMENT -C + LXK (1, KKK) = LNODES (5, N0) LXK (2, KKK) = LNODES (5, N1) LXK (3, KKK) = LNODES (5, N2) LXK (4, KKK) = LLL -C + CALL ADDKXL (MXND, KXL, KKK, LLL) CALL ADDKXL (MXND, KXL, KKK, LNODES (5, N0)) CALL ADDKXL (MXND, KXL, KKK, LNODES (5, N1)) CALL ADDKXL (MXND, KXL, KKK, LNODES (5, N2)) -C + LNODES (5, N0) = LLL IF ((GRAPH) .OR. (VIDEO)) THEN CALL D2NODE (MXND, XN, YN, N0, NODE) @@ -68,9 +57,9 @@ SUBROUTINE CONNOD (MXND, MLN, XN, YN, NUID, LXK, KXL, NXL, LXN, IF (VIDEO) CALL SNAPIT (1) ENDIF I = NODE -C + C TAKE CARE OF A CLOCKWISE CONNECTION -C + ELSE IF (LNODES (2, N0) .EQ. NODE) THEN LNODES (3, NODE) = N2 LNODES (2, N2) = NODE @@ -82,28 +71,28 @@ SUBROUTINE CONNOD (MXND, MLN, XN, YN, NUID, LXK, KXL, NXL, LXN, KKK = KKK+1 NXL (1, LLL) = NODE NXL (2, LLL) = N2 -C + C MAKE THE NEW ELEMENT -C + LXK (1, KKK) = LNODES (5, NODE) LXK (2, KKK) = LNODES (5, N0) LXK (3, KKK) = LNODES (5, N1) LXK (4, KKK) = LLL -C + CALL ADDKXL (MXND, KXL, KKK, LNODES (5, NODE)) CALL ADDKXL (MXND, KXL, KKK, LNODES (5, N0)) CALL ADDKXL (MXND, KXL, KKK, LNODES (5, N1)) CALL ADDKXL (MXND, KXL, KKK, LLL) -C + LNODES (5, NODE) = LLL -C + IF ((GRAPH) .OR. (VIDEO)) THEN CALL D2NODE (MXND, XN, YN, NODE, N2) CALL SFLUSH IF (VIDEO) CALL SNAPIT (1) ENDIF I = N2 -C + ELSE CALL MESAGE ('PROBLEM HANDLING CONNECTION IN CONNOD') CALL MESAGE ('CONNECTION DOES NOT FORM A SIMPLE CORNER') @@ -116,15 +105,15 @@ SUBROUTINE CONNOD (MXND, MLN, XN, YN, NUID, LXK, KXL, NXL, LXN, IF (ERR) GOTO 100 CALL MARKSM (MXND, MLN, LXK, KXL, NXL, LXN, LNODES, NODE, ERR) IF (ERR) GOTO 100 -C + CALL FIXLXN (MXND, LXN, NXL, NUID, NAVAIL, IAVAIL, NNN, LLL, & NNNOLD, LLLOLD, ERR, NOROOM) IF (ERR) GOTO 100 LLLOLD = LLL NNNOLD = NNN -C + 100 CONTINUE -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/cornp.f b/packages/seacas/applications/fastq/cornp.f index dbcbbfa19cca..8796afc54e45 100644 --- a/packages/seacas/applications/fastq/cornp.f +++ b/packages/seacas/applications/fastq/cornp.f @@ -1,43 +1,26 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: cornp.f,v 1.2 1991/03/21 15:44:30 gdsjaar Exp $ -C $Log: cornp.f,v $ -C Revision 1.2 1991/03/21 15:44:30 gdsjaar -C Changed all 3.14159... to atan2(0.0, -1.0) -C -c Revision 1.1.1.1 1990/11/30 11:05:24 gdsjaar -c FASTQ Version 2.0X -c -c Revision 1.1 90/11/30 11:05:22 gdsjaar -c Initial revision -c -C -CC* FILE: [.PAVING]CORNP.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C LOGICAL FUNCTION CORNP (ANGLE) C*********************************************************************** -C + C FUNCTION CORNP = LOGICAL FUNCTION THAT RETURNS TRUE IF THE ANGLE IS C WITHIN THE CURRENT DEFINITION OF A CORNER -C + C*********************************************************************** -C + DATA EPS /.62/ -C + PI = ATAN2(0.0, -1.0) IF (ANGLE .LT. ( PI - EPS)) THEN CORNP=.TRUE. ELSE CORNP=.FALSE. ENDIF -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/cpubrk.f b/packages/seacas/applications/fastq/cpubrk.f index be230643c843..a4ca50e62956 100644 --- a/packages/seacas/applications/fastq/cpubrk.f +++ b/packages/seacas/applications/fastq/cpubrk.f @@ -1,24 +1,23 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C LOGICAL FUNCTION CPUBRK(INPUT) C*********************************************************************** -C + C FUNCTION CPUBRK = .TRUE. IF A CONTROL C HAS BEEN ENTERED AT TERMINAL -C + C*********************************************************************** LOGICAL CPUIFC, INPUT -C + IF (CPUIFC(INPUT)) THEN CPUBRK = .TRUE. ELSE CPUBRK = .FALSE. ENDIF -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/crcsiz.f b/packages/seacas/applications/fastq/crcsiz.f index 0279ad267f26..dd853a40c5ec 100644 --- a/packages/seacas/applications/fastq/crcsiz.f +++ b/packages/seacas/applications/fastq/crcsiz.f @@ -1,66 +1,37 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: crcsiz.f,v 1.3 1998/07/14 18:18:36 gdsjaar Exp $ -C $Log: crcsiz.f,v $ -C Revision 1.3 1998/07/14 18:18:36 gdsjaar -C Removed unused variables, cleaned up a little. -C -C Changed BLUE labels to GREEN to help visibility on black background -C (indirectly requested by a couple users) -C -C Revision 1.2 1991/03/22 19:56:45 gdsjaar -C Added MOVED to logical declaration -C -c Revision 1.1.1.1 1990/11/30 11:05:30 gdsjaar -c FASTQ Version 2.0X -c -c Revision 1.1 90/11/30 11:05:28 gdsjaar -c Initial revision -c -C -CC* FILE: [.QMESH]CRCSIZ.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/31/90 -CC* MODIFICATION: ADDED ARGUMENTS TO CALL TO CRCSIZ TO PASS MINIMUM -CC** ELEMENT SIZE (SIZMIN) AND GETSIZ PARAMETERS OF -CC** EMIN AND EMAX -C SUBROUTINE CRCSIZ (MAXNP, X, Y, NINT, N, XEND, YEND, XCEN, YCEN, & THETA1, THETA2, TANG, AA, BB, ERR, TEST, XNOLD, YNOLD, NXKOLD, & LINKEG, LISTEG, BMESUR, MLINK, NPNOLD, NPEOLD, NNXK, REMESH, & REXMIN, REXMAX, REYMIN, REYMAX, IDIVIS, SIZMIN, EMAX, EMIN, & GRAPH) C*********************************************************************** -C + C SUBROUTINE CRCSIZ = GETS INTERVALS ON AN ARC LINE BASED ON ERROR C SIZE -C + C*********************************************************************** -C + DIMENSION X (MAXNP), Y (MAXNP) -C + DIMENSION XNOLD(NPNOLD), YNOLD(NPNOLD), NXKOLD(NNXK, NPEOLD) DIMENSION LINKEG(2, MLINK), LISTEG(4 * NPEOLD), BMESUR(NPNOLD) -C + LOGICAL GRAPH, REMESH, TEST, ERR, SGRAPH, MOVED -C + IF (GRAPH) THEN SGRAPH = .TRUE. ELSE SGRAPH = .FALSE. ENDIF -C + ITERAT = 100 EPS = .01 -C + DELANG = 0. ANGNOW = 0. INTNOW = 0 @@ -76,12 +47,11 @@ SUBROUTINE CRCSIZ (MAXNP, X, Y, NINT, N, XEND, YEND, XCEN, YCEN, & (THETA1 + ANGNOW + (DELANG * 1.3) .LT. TANG)) & ) THEN -C C THE END OF THE LINE (OR CLOSE ENOUGH) HAS BEEN REACHED -C + C IF WE ARE TESTING OR THE INTERVALS MATCH, THEN SIMPLY FINISH THE C LINE. -C + IF ((TEST) .OR. (INTNOW .EQ. NINT)) THEN NINT = INTNOW N = NINT + 1 @@ -95,9 +65,9 @@ SUBROUTINE CRCSIZ (MAXNP, X, Y, NINT, N, XEND, YEND, XCEN, YCEN, CALL PLTFLU ENDIF ELSE -C + C OTHERWISE, MAKE SURE THE INTERVALS ARE ALRIGHT AND ADD THE EXTRA ONE -C + EPS = .001 IF (INTNOW + 1 .NE. NINT) THEN CALL MESAGE ('** PROBLEMS WITH INTNOW '// @@ -126,20 +96,9 @@ SUBROUTINE CRCSIZ (MAXNP, X, Y, NINT, N, XEND, YEND, XCEN, YCEN, ENDIF ENDIF ELSE -C + C NOT TO THE END YET -C -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/31/90 -CC* MODIFICATION: ADDED ARGUMENTS TO CALL TO GETSIZ TO PASS MINIMUM -CC** ELEMENT SIZE (SIZMIN) AND GETSIZ PARAMETERS OF -CC** EMIN AND EMAX -C -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 8/2/90 -CC* MODIFICATION: ADDED A SIZE ADJUSTMENT BASED ON THE REQUIRED VALUE -CC* AT THE END OF THE SEGMENT AND AT THE AVERAGE OF THE -CC* SEGMENTS - THE 2ND AND 3RD CALL TO GETSIZ. + CALL GETSIZ (XNOLD, YNOLD, NXKOLD, LINKEG, LISTEG, & BMESUR, MLINK, NPNOLD, NPEOLD, NNXK, REMESH, & REXMIN, REXMAX, REYMIN, REYMAX, IDIVIS, SIZMIN, EMAX, @@ -180,9 +139,9 @@ SUBROUTINE CRCSIZ (MAXNP, X, Y, NINT, N, XEND, YEND, XCEN, YCEN, ENDIF GOTO 100 ENDIF -C + C ERASE THE LINES FOR SMOOTHING IF NEEDED -C + IF ((.NOT. SGRAPH) .AND. (GRAPH)) THEN DO 110 J = 2, NINT CALL LCOLOR ('BLACK') @@ -193,9 +152,9 @@ SUBROUTINE CRCSIZ (MAXNP, X, Y, NINT, N, XEND, YEND, XCEN, YCEN, CALL PLTFLU 110 CONTINUE ENDIF -C + C NOW SMOOTH THE NODES ALONG THE LINE -C + DO 130 I = 1, ITERAT MOVED = .FALSE. ANGNOW = 0. @@ -265,9 +224,9 @@ SUBROUTINE CRCSIZ (MAXNP, X, Y, NINT, N, XEND, YEND, XCEN, YCEN, CALL PLTFLU 150 CONTINUE ENDIF -C + 160 CONTINUE -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/cross.f b/packages/seacas/applications/fastq/cross.f index 595b5b59740c..5d1d1921ac37 100644 --- a/packages/seacas/applications/fastq/cross.f +++ b/packages/seacas/applications/fastq/cross.f @@ -1,36 +1,31 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -CC* FILE: [.QMESH]CROSS.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE CCROSS (J1, J2, I1, I2, JXI, IXJ, ISTART, ICLEAR, & NOROOM, ERR) C*********************************************************************** -C + C SUBROUTINE CROSS = CREATE OR ADD TO THE CROSS - REFERENCE ARRAY FOR C JXI (J1, J2) IN IXJ (I1, I2) -C + C*********************************************************************** -C + C NOTE: C THE NEW ITEMS MUST BEGIN AT J1=1, J2=ISTART. C THE CROSS REFERENCE ARRAY WILL BE CLEARED FROM I1=1, I2=ICLEAR C TO THE END OF THE ARRAY. -C + C*********************************************************************** -C + DIMENSION JXI (J1, J2), IXJ (I1, I2) -C + LOGICAL ERR, NOROOM -C + C CLEAR -C + ERR = .TRUE. NOROOM = .FALSE. DO 110 J = ICLEAR, I2 @@ -38,9 +33,9 @@ SUBROUTINE CCROSS (J1, J2, I1, I2, JXI, IXJ, ISTART, ICLEAR, IXJ (I, J) = 0 100 CONTINUE 110 CONTINUE -C + C REFILE EACH ITEM -C + DO 150 J = ISTART, J2 DO 140 I = 1, J1 L = IABS (JXI (I, J)) @@ -49,9 +44,9 @@ SUBROUTINE CCROSS (J1, J2, I1, I2, JXI, IXJ, ISTART, ICLEAR, WRITE ( * , 10000)L, I2 RETURN ENDIF -C + C FIND EMPTY SPOT FOR THIS ITEM -C + DO 120 K = 1, I1 KK = K IF (IXJ (K, L) .EQ. 0)GO TO 130 @@ -60,16 +55,16 @@ SUBROUTINE CCROSS (J1, J2, I1, I2, JXI, IXJ, ISTART, ICLEAR, NOROOM = .TRUE. RETURN 130 CONTINUE -C + C FILE THIS ITEM -C + IXJ (KK, L) = J ENDIF 140 CONTINUE 150 CONTINUE ERR = .FALSE. RETURN -C + 10000 FORMAT (' OUT-OF-BOUNDS REFERENCE IN CROSS (INDEX = ', I5, & ', MAX = ', I5, ')') END diff --git a/packages/seacas/applications/fastq/csmang.f b/packages/seacas/applications/fastq/csmang.f index 20180de86943..2ab25ce1f566 100644 --- a/packages/seacas/applications/fastq/csmang.f +++ b/packages/seacas/applications/fastq/csmang.f @@ -1,66 +1,56 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: csmang.f,v 1.2 1991/03/21 15:44:31 gdsjaar Exp $ -C $Log: csmang.f,v $ -C Revision 1.2 1991/03/21 15:44:31 gdsjaar -C Changed all 3.14159... to atan2(0.0, -1.0) -C -c Revision 1.1.1.1 1990/11/30 11:05:35 gdsjaar -c FASTQ Version 2.0X -c -c Revision 1.1 90/11/30 11:05:34 gdsjaar -c Initial revision -c -C +c +C C C* FILE: [.QMESH]CSMANG.FOR C C* MODIFIED BY: TED BLACKER C C* MODIFICATION DATE: 7/6/90 C C* MODIFICATION: COMPLETED HEADER INFORMATION -C +C SUBROUTINE CSMANG (N, X, Y, ANGLE, NSANG, SMANG, INDEX) C*********************************************************************** -C +C C SUBROUTINE CSMANG = CALCULATES THE "NSANG" SMALLEST ANGLES C AND PLACES THEM IN THE SMANG ARRAY WITH C THE INDICES BEING PLACED IN THE INDEX ARRAY -C +C C*********************************************************************** -C +C C OBSERVATION: - IT DOES NOT MATTER THE ANGLE ORIENTATION. C - THE ANGLES ARE STORE IN THE ANGLE ARRAY AS THEY C APPEAR. C - THE SMALLEST ANGLES ARE IN ASCENDING ORDER. C - THE INDEX ARRAY RETURNS THE SMALLEST ANGLE POSITION C IN ASCENDING ORDER. -C -C +C +C C MODIFIED BY : HORACIO RECALDE DATE:JAN 1988 C*********************************************************************** -C +C DIMENSION X(N), Y(N), ANGLE(N) DIMENSION SMANG (NSANG + 1), INDEX (NSANG + 1) PI = ATAN2(0.0, -1.0) TWOPI = 2.0 * PI -C +C C FORM THE LIST OF SMALLEST ANGLES -C +C NSA = NSANG DO I = 1,NSA SMANG(I) = 10. INDEX(I) = 0 end do -C +C AGOLD = ATAN2 (Y (1) - Y(N), X (1) - X (N)) -C +C DO J = 1, N -C +C C GET THE ANGLE FORMED BY THIS SET OF POINTS -C +C NEXT = J + 1 IF (NEXT .GT. N) NEXT = 1 AGNEW = ATAN2 (Y (NEXT) - Y (J), X (NEXT) - X (J)) @@ -69,10 +59,10 @@ SUBROUTINE CSMANG (N, X, Y, ANGLE, NSANG, SMANG, INDEX) IF (DIFF .LT. -PI) DIFF = DIFF + TWOPI ANGLE (J) = PI - DIFF AGOLD = AGNEW -C +C C SORT THIS ANGLE AGAINST PREVIOUS ANGLES TO SEE IF IT IS ONE OF C THE SMALLEST -C +C SMANG (NSA + 1) = ANGLE (J) INDEX (NSA + 1) = J DO II = 1, NSA @@ -86,9 +76,9 @@ SUBROUTINE CSMANG (N, X, Y, ANGLE, NSANG, SMANG, INDEX) INDEX (I + 1) = ITEMP end do 120 CONTINUE -C +C end do -C +C RETURN -C +C END diff --git a/packages/seacas/applications/fastq/d2grid.f b/packages/seacas/applications/fastq/d2grid.f index eea055a5f296..f81fe66fecaa 100644 --- a/packages/seacas/applications/fastq/d2grid.f +++ b/packages/seacas/applications/fastq/d2grid.f @@ -1,34 +1,23 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: d2grid.f,v 1.1 1990/11/30 11:05:37 gdsjaar Exp $ -C $Log: d2grid.f,v $ -C Revision 1.1 1990/11/30 11:05:37 gdsjaar -C Initial revision -C -C -CC* FILE: [.MAIN]D2GRID.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE D2GRID (X1, Y1, X2, Y2) C*********************************************************************** -C + C SUBROUTINE D2GRID = DRAWS A LINE BETWEEN TWO GRIDS -C + C*********************************************************************** -C + DIMENSION X (2), Y (2) -C + X (1) = X1 X (2) = X2 Y (1) = Y1 Y (2) = Y2 CALL MPD2VC (1, X (1), Y (1), X (2), Y (2)) RETURN -C + END diff --git a/packages/seacas/applications/fastq/d2node.f b/packages/seacas/applications/fastq/d2node.f index f4fabbd7d9e4..f8006b6f8055 100644 --- a/packages/seacas/applications/fastq/d2node.f +++ b/packages/seacas/applications/fastq/d2node.f @@ -1,34 +1,23 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: d2node.f,v 1.1 1990/11/30 11:05:40 gdsjaar Exp $ -C $Log: d2node.f,v $ -C Revision 1.1 1990/11/30 11:05:40 gdsjaar -C Initial revision -C -C -CC* FILE: [.PAVING]D2NODE.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE D2NODE (MXND, XN, YN, NODE1, NODE2) C*********************************************************************** -C + C SUBROUTINE D2NODE = DRAWS A LINE BETWEEN TWO NODES -C + C*********************************************************************** -C + DIMENSION X (2), Y (2), XN (MXND), YN (MXND) -C + X (1) = XN (NODE1) X (2) = XN (NODE2) Y (1) = YN (NODE1) Y (2) = YN (NODE2) CALL MPD2VC (1, X (1), Y (1), X (2), Y (2)) RETURN -C + END diff --git a/packages/seacas/applications/fastq/dataok.f b/packages/seacas/applications/fastq/dataok.f index 61065c01054b..ed4aaca48e07 100644 --- a/packages/seacas/applications/fastq/dataok.f +++ b/packages/seacas/applications/fastq/dataok.f @@ -1,52 +1,34 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: dataok.f,v 1.2 1991/05/10 17:40:36 gdsjaar Exp $ -C $Log: dataok.f,v $ -C Revision 1.2 1991/05/10 17:40:36 gdsjaar -C Changed VMS JNINT to ANSI NINT, but then had -C to change variable NINT to KNINT -C -c Revision 1.1.1.1 1990/11/30 11:05:44 gdsjaar -c FASTQ Version 2.0X -c -c Revision 1.1 90/11/30 11:05:42 gdsjaar -c Initial revision -c -C -CC* FILE: [.QMESH]DATAOK.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE DATAOK (MP, ML, MS, MR, L, KNUM, COOR, ILINE, LTYPE, & KNINT, LCON, NLPS, IFLINE, ILLIST, NSPR, IFSIDE, ISLIST, LINKP, & LINKL, LINKS, SIZE, ERRCHK, ERR) C*********************************************************************** -C + C SUBROUTINE FILLOK = CHECKS TO MAKE SURE NONEXISTENT DATA IS NOT C BEING REFERENCED IN THE REGION DEFINITIONS -C + C*********************************************************************** -C + DIMENSION COOR (2, MP), LINKP (2, MP) DIMENSION ILINE (ML), LTYPE (ML), KNINT (ML), LCON (3, ML) DIMENSION LINKL (2, ML) DIMENSION NLPS (MS), IFLINE (MS), ILLIST (MS*3), LINKS (2, MS) DIMENSION NSPR (MR), IFSIDE (MR), ISLIST (MR*4) -C + LOGICAL ERR, ADDLNK, ERRCHK -C + ERR = .TRUE. ADDLNK = .FALSE. -C + DO 130 I = IFSIDE (L), IFSIDE (L) + NSPR (L)-1 -C + C CHECK TO MAKE SURE REGION'S SIDE DEFINITIONS ARE ALL THERE -C + IF (ISLIST (I).GT.0)THEN II = ISLIST (I) CALL LTSORT (MS, LINKS, II, IPNTR, ADDLNK) @@ -58,9 +40,9 @@ SUBROUTINE DATAOK (MP, ML, MS, MR, L, KNUM, COOR, ILINE, LTYPE, GOTO 120 ENDIF END IF -C + C CHECK TO MAKE SURE SIDE'S LINE DEFINITIONS ARE ALL THERE -C + CALL LTSORT (MS, LINKS, II, JJ, ADDLNK) DO 110 J = IFLINE (JJ), IFLINE (JJ) + NLPS (JJ)-1 KK = ILLIST (J) @@ -73,9 +55,9 @@ SUBROUTINE DATAOK (MP, ML, MS, MR, L, KNUM, COOR, ILINE, LTYPE, GOTO 100 ENDIF END IF -C + C CHECK TO MAKE SURE LINE'S POINT DEFINITIONS ARE ALL THERE -C + I1 = LCON (1, LL) I2 = LCON (2, LL) I3 = LCON (3, LL) @@ -86,7 +68,7 @@ SUBROUTINE DATAOK (MP, ML, MS, MR, L, KNUM, COOR, ILINE, LTYPE, ELSE J3 = 0 END IF -C + IF ((I1.LE.0) .OR. (J1.LE.0)) THEN IF (ERRCHK) THEN WRITE (*, 10030)KK, I1 @@ -110,9 +92,9 @@ SUBROUTINE DATAOK (MP, ML, MS, MR, L, KNUM, COOR, ILINE, LTYPE, GOTO 100 ENDIF END IF -C + C CHECK TO INSURE AN INTEGRAL ASSIGNMENT -C + IF (IABS (KNINT (LL)) .EQ. 0) THEN IF (I3 .LT. 0)J3 = -J3 CALL LINLEN (MP, COOR, LINKP, KNUM, ILINE(LL), @@ -134,9 +116,9 @@ SUBROUTINE DATAOK (MP, ML, MS, MR, L, KNUM, COOR, ILINE, LTYPE, END IF 100 CONTINUE 110 CONTINUE -C + C CHECK TO MAKE SURE REGION'S LINE DEFINITIONS ARE ALL THERE -C + ELSEIF (ISLIST (I) .LT. 0) THEN KK = IABS (ISLIST (I)) CALL LTSORT (ML, LINKL, KK, LL, ADDLNK) @@ -148,9 +130,9 @@ SUBROUTINE DATAOK (MP, ML, MS, MR, L, KNUM, COOR, ILINE, LTYPE, GOTO 120 ENDIF END IF -C + C CHECK TO MAKE SURE LINE'S POINT DEFINITIONS ARE ALL THERE -C + I1 = LCON (1, LL) I2 = LCON (2, LL) I3 = LCON (3, LL) @@ -161,7 +143,7 @@ SUBROUTINE DATAOK (MP, ML, MS, MR, L, KNUM, COOR, ILINE, LTYPE, ELSE J3 = 0 END IF -C + IF ((I1.LE.0) .OR. (J1.LE.0)) THEN IF (ERRCHK) THEN WRITE (*, 10030)KK, I1 @@ -185,11 +167,11 @@ SUBROUTINE DATAOK (MP, ML, MS, MR, L, KNUM, COOR, ILINE, LTYPE, GOTO 120 ENDIF END IF -C + C CHECK TO MAKE SURE INTERVAL ASSIGNMENT IS HANDLED -C + IF (IABS (KNINT (LL)) .EQ. 0) THEN -C + C**MBS/29-JUN-1989/ DO NOT NEGATE POINTER TO CENTER OF CLOCKWISE ARC C IF (I3 .LT. 0)J3 = -J3 CALL LINLEN (MP, COOR, LINKP, KNUM, ILINE(LL), @@ -209,9 +191,9 @@ SUBROUTINE DATAOK (MP, ML, MS, MR, L, KNUM, COOR, ILINE, LTYPE, END IF END IF END IF -C + C A ZERO SIDE NUMBER HAS BEEN FOUND -C + ELSE IF (ERRCHK) THEN WRITE (*, 10000)KNUM, ISLIST (I) @@ -221,15 +203,15 @@ SUBROUTINE DATAOK (MP, ML, MS, MR, L, KNUM, COOR, ILINE, LTYPE, END IF 120 CONTINUE 130 CONTINUE -C + C ALL DEFINITIONS ARE IN ORDER -C + ERR = .FALSE. RETURN -C + 10000 FORMAT (' FOR REGION:', I5, ' SIDE:', I5, ' DOES NOT EXIST') 10010 FORMAT (' FOR SIDE:', I5, ' LINE:', I5, ' DOES NOT EXIST') 10020 FORMAT (' FOR LINE:', I5, ' INTERVAL OF:', I5, ' IS NOT WORKING') 10030 FORMAT (' FOR LINE:', I5, ' POINT:', I5, ' DOES NOT EXIST') -C + END diff --git a/packages/seacas/applications/fastq/delem.f b/packages/seacas/applications/fastq/delem.f index e30f04512890..ce627a7de0f5 100644 --- a/packages/seacas/applications/fastq/delem.f +++ b/packages/seacas/applications/fastq/delem.f @@ -1,38 +1,27 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: delem.f,v 1.1 1990/11/30 11:05:46 gdsjaar Exp $ -C $Log: delem.f,v $ -C Revision 1.1 1990/11/30 11:05:46 gdsjaar -C Initial revision -C -C -CC* FILE: [.PAVING]DELEM.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE DELEM (MXND, XN, YN, NUID, LXK, KXL, NXL, LXN, & NNN, NAVAIL, IAVAIL, NODE1, K, N2, N4, DONE, CHECK, NOROOM, & ERR) C*********************************************************************** -C + C SUBROUTINE DELEM = DELETES AN ELEMENT BY COLAPSING NODE1 ONTO THE C OPPOSING DIAGONAL NODE -C + C*********************************************************************** -C + DIMENSION NODES(4), LINES(4), L1LIST(20) DIMENSION LXK(4, MXND), NXL(2, 3*MXND), KXL(2, 3*MXND) DIMENSION LXN(4, MXND), XN(MXND), YN(MXND), NUID(MXND) -C + LOGICAL ERR, DONE, CHECK, CCW, NOROOM -C + ERR = .FALSE. -C + CALL GNXKA (MXND, XN, YN, K, NODES, AREA, LXK, NXL, CCW) IF ( (NODE1 .NE. NODES(1)) .AND. (NODE1 .NE. NODES(2)) .AND. & (NODE1 .NE. NODES(3)) .AND. (NODE1 .NE. NODES(4)) ) THEN @@ -41,10 +30,10 @@ SUBROUTINE DELEM (MXND, XN, YN, NUID, LXK, KXL, NXL, LXN, ERR = .TRUE. GOTO 190 ENDIF -C + C ARRANGE NODES SO THE COLLAPSING DIAGONAL IS FROM 1ST TO 3RD NODES C AND INSURE THAT THE NODE TO BE DELETED IS NOT A BOUNDARY NODE -C + CALL NXKORD (NODES, NODE1) IF (LXN(2, NODES (1)) .LE. 0) CALL NXKORD (NODES, NODES (3)) IF (LXN(2, NODES (1)) .LE. 0) THEN @@ -53,9 +42,9 @@ SUBROUTINE DELEM (MXND, XN, YN, NUID, LXK, KXL, NXL, LXN, & 'IN DELEM **') GOTO 190 END IF -C + C PREPARE FOR THE SQUASH OF ELEMENT K -C + N1 = NODES(1) N2 = NODES(2) N3 = NODES(3) @@ -68,9 +57,9 @@ SUBROUTINE DELEM (MXND, XN, YN, NUID, LXK, KXL, NXL, LXN, GOTO 190 ENDIF ENDIF -C + C FIND THE LINES ASSOCIATED WITH THE ELEMENT TO BE DELETED -C + DO 100 I = 1, 4 J = I + 1 IF (J .GE. 5) J = 1 @@ -86,20 +75,20 @@ SUBROUTINE DELEM (MXND, XN, YN, NUID, LXK, KXL, NXL, LXN, GOTO 190 END IF 100 CONTINUE -C + C FIND ELEMENTS ON OTHER SIDES OF THE LINES C K2 AND K3 ARE NEVER NEEDED -C + L1 = LINES(1) L2 = LINES(2) L3 = LINES(3) L4 = LINES(4) K1 = KXL(1, L1) + KXL(2, L1) - K K4 = KXL(1, L4) + KXL(2, L4) - K -C + C FIX LXK ARRAY C DISCARD L1 FOR L2 IN K1 -C + DO 110 I = 1, 4 IF (LXK(I, K1) .EQ. L1) THEN LXK(I, K1) = L2 @@ -110,9 +99,9 @@ SUBROUTINE DELEM (MXND, XN, YN, NUID, LXK, KXL, NXL, LXN, ERR = .TRUE. GOTO 190 120 CONTINUE -C + C DISCARD L4 FOR L3 IN K4 -C + DO 130 I = 1, 4 IF (LXK(I, K4) .EQ. L4) THEN LXK(I, K4) = L3 @@ -123,47 +112,47 @@ SUBROUTINE DELEM (MXND, XN, YN, NUID, LXK, KXL, NXL, LXN, ERR = .TRUE. GOTO 190 140 CONTINUE -C + C DELETE ELEMENT K -C + DO 150 I = 1, 4 LXK(I, K) = 0 150 CONTINUE -C + C FIX KXL ARRAY C DISCARD K FOR K1 WITH L2 -C + IF (KXL(1, L2) .EQ. K) THEN KXL(1, L2) = K1 ELSE IF (KXL(2, L2) .EQ. K) THEN KXL(2, L2) = K1 END IF -C + C DISCARD K FOR K4 WITH L3 -C + IF (KXL(1, L3) .EQ. K) THEN KXL(1, L3) = K4 ELSE IF (KXL(2, L3) .EQ. K) THEN KXL(2, L3) = K4 END IF -C + C DELETE L1 AND L4 -C + KXL(1, L1) = 0 KXL(2, L1) = 0 KXL(1, L4) = 0 KXL(2, L4) = 0 -C + C FIX NXL ARRAY C DELETE L1 AND L4 -C + NXL(1, L1) = 0 NXL(2, L1) = 0 NXL(1, L4) = 0 NXL(2, L4) = 0 -C + C RECONNECT ALL LINES CONNECTING TO NODE 1 TO NODE 3 -C + CALL GETLXN (MXND, LXN, N1, L1LIST, NL, ERR) IF (ERR) RETURN DO 160 I = 1, NL @@ -174,19 +163,19 @@ SUBROUTINE DELEM (MXND, XN, YN, NUID, LXK, KXL, NXL, LXN, NXL(2, LL) = N3 END IF 160 CONTINUE -C + C FIX LXN ARRAY C UNHOOK L1 FROM N2 AND L4 FROM N4 -C + CALL DELLXN (MXND, LXN, NUID, NAVAIL, IAVAIL, N2, L1, NNN, ERR, & NOROOM) IF ((NOROOM) .OR. (ERR)) GOTO 190 CALL DELLXN (MXND, LXN, NUID, NAVAIL, IAVAIL, N4, L4, NNN, ERR, & NOROOM) IF ((NOROOM) .OR. (ERR)) GOTO 190 -C + C ADD ALL LINES HOOKED TO N3 TO THE LIST OF LINES FOR N3 -C + DO 170 I = 1, NL LL = L1LIST(I) IF ((LL .NE. L1) .AND. (LL .NE. L4)) THEN @@ -195,28 +184,28 @@ SUBROUTINE DELEM (MXND, XN, YN, NUID, LXK, KXL, NXL, LXN, IF ((NOROOM) .OR. (ERR)) GOTO 190 END IF 170 CONTINUE -C + C DELETE N1 (UNHOOK EVERYTHING FROM IT) -C + DO 180 I = 1, 3 LXN(I, N1) = 0 180 CONTINUE LXN(4, N1) = IAVAIL IAVAIL = N1 NAVAIL = NAVAIL + 1 -C + C FIX XN AND YN ARRAYS C DEFINE POSITION OF N3 -C + IF (LXN(2, N3) .GT. 0) THEN XN(N3) = 0.5*(XN(N1) + XN(N3)) YN(N3) = 0.5*(YN(N1) + YN(N3)) END IF NUID(N1) = 0 -C + DONE = .TRUE. 190 CONTINUE RETURN -C + 10000 FORMAT(' IN DELEM, ELEMENT', I5, ' DOES NOT CONTAIN LINE', I5) END diff --git a/packages/seacas/applications/fastq/delfsq.f b/packages/seacas/applications/fastq/delfsq.f index 5b0044869149..540d2210aa14 100644 --- a/packages/seacas/applications/fastq/delfsq.f +++ b/packages/seacas/applications/fastq/delfsq.f @@ -1,29 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: delfsq.f,v 1.2 1998/07/14 18:18:38 gdsjaar Exp $ -C $Log: delfsq.f,v $ -C Revision 1.2 1998/07/14 18:18:38 gdsjaar -C Removed unused variables, cleaned up a little. -C -C Changed BLUE labels to GREEN to help visibility on black background -C (indirectly requested by a couple users) -C -C Revision 1.1.1.1 1990/11/30 11:05:53 gdsjaar -C FASTQ Version 2.0X -C -c Revision 1.1 90/11/30 11:05:50 gdsjaar -c Initial revision -c -C -CC* FILE: [.MAIN]DELFSQ.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE DELFSQ (MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CIN, & RIN, IIN, KIN, N, IPBOUN, ILBOUN, ISBOUN, NLPS, IFLINE, ILLIST, & NSPR, IFSIDE, ISLIST, IRPB, IPBF, NPPF, IFPB, LISTPB, ILBF, @@ -32,23 +12,23 @@ SUBROUTINE DELFSQ (MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CIN, & IWTLBF, IWTSBF, IFHOLE, NHPR, IHLIST, IRGFLG, NUMBER, DEFSCH, & OPTIM, VAXVMS, WROTE, TIME1, BATCH, VERSN) C*********************************************************************** -C + C SUBROUTINE DELFSQ = DELETES POINTS, LINES, REGIONS, SCHEMES, AND C BOUNDARY DEFINITIONS -C + C*********************************************************************** -C + C SUBROUTINE CALLED BY: C FASTQ = A PROGRAM TO QUICKLY PREPARE QMESH INPUT -C + C*********************************************************************** -C + C VARIABLES USED: C IANS = LOGICAL RESPONSE FROM YES-NO QUESTION C ANS = CHARACTER RESPONSE FOR MENU CHOICE -C + C*********************************************************************** -C + DIMENSION IPBOUN(MP), ILBOUN(ML), ISBOUN(ML) DIMENSION NLPS(MS), IFLINE(MS), ILLIST(MS*3) DIMENSION NSPR(MR), IFSIDE(MR), ISLIST(4*MR), IRPB(MR) @@ -62,16 +42,16 @@ SUBROUTINE DELFSQ (MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CIN, DIMENSION IFHOLE(MR), NHPR(MR), IHLIST(MR*2), IRGFLG(MR) DIMENSION N(29) DIMENSION KIN(MCOM), CIN(MCOM), IIN(MCOM), RIN(MCOM) -C + CHARACTER*72 DEFSCH, CIN CHARACTER VERSN*9, NUMBER*80 -C + LOGICAL OPTIM, ADDLNK, VAXVMS, WROTE, SIDEOK, BATCH, NOROOM LOGICAL LGROUP -C + ADDLNK = .TRUE. IZ = 0 -C + 100 CONTINUE IF (ICOM .GT. JCOM) THEN CALL MESAGE (' ') @@ -79,7 +59,7 @@ SUBROUTINE DELFSQ (MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CIN, & JCOM, KIN, CIN, IIN, RIN) ICOM = 1 END IF -C + IF ((CIN(ICOM)(1:1) .EQ. 'P') .OR. (CIN(ICOM)(1:1) .EQ. 'p')) THEN ICOM = ICOM + 1 IF (N(1) .GT. 0) THEN @@ -107,7 +87,7 @@ SUBROUTINE DELFSQ (MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CIN, CALL MESAGE ('* NO POINTS IN THE CURRENT DATABASE *') CALL MESAGE ('*-----------------------------------*') END IF -C + ELSE IF ((CIN(ICOM)(1:1) .EQ. 'L') .OR. & (CIN(ICOM)(1:1) .EQ. 'l')) THEN ICOM = ICOM + 1 @@ -136,9 +116,9 @@ SUBROUTINE DELFSQ (MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CIN, CALL MESAGE ('* NO LINES IN THE CURRENT DATABASE *') CALL MESAGE ('*----------------------------------*') END IF -C + C DELETE BAR SET DEFINITIONS -C + ELSE IF ((CIN(ICOM)(1:2) .EQ. 'BA') .OR. & (CIN(ICOM)(1:2) .EQ. 'ba')) THEN ICOM = ICOM + 1 @@ -167,9 +147,9 @@ SUBROUTINE DELFSQ (MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CIN, CALL MESAGE ('* NO BAR SETS IN THE CURRENT DATABASE *') CALL MESAGE ('*-------------------------------------*') END IF -C + C DELETE THE RENUMBERING CARDS -C + ELSE IF ((CIN(ICOM)(1:3) .EQ. 'REN') .OR. & (CIN(ICOM)(1:3) .EQ. 'ren')) THEN ICOM = ICOM + 1 @@ -219,9 +199,9 @@ SUBROUTINE DELFSQ (MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CIN, CALL MESAGE (' ') OPTIM = .FALSE. END IF -C + C DELETE THE REGIONS -C + ELSE IF ((CIN(ICOM)(1:1) .EQ. 'R') .OR. & (CIN(ICOM)(1:1) .EQ. 'r')) THEN ICOM = ICOM + 1 @@ -251,9 +231,9 @@ SUBROUTINE DELFSQ (MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CIN, ADDLNK = .FALSE. CALL LTSORT (MR, LINKR, I, IPTR, ADDLNK) IF ((IPTR .GT. 0) .AND. (IRGFLG(IPTR) .LE. 0)) THEN -C + C DELETE REGION FROM BODY LIST -C + DO 250 J = 1, N(9) IF (IRPB(J) .EQ. I) THEN DO 240 K = J + 1, N(9) @@ -262,9 +242,9 @@ SUBROUTINE DELFSQ (MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CIN, N(9) = N(9) - 1 END IF 250 CONTINUE -C + C DELETE REGION FROM GROUPS -C + DO 280 J = 1, N(7) IF (IRGFLG(J) .GE. 1) THEN K1 = IFSIDE(IPTR) @@ -279,9 +259,9 @@ SUBROUTINE DELFSQ (MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CIN, 270 CONTINUE END IF 280 CONTINUE -C + C DELETE REGION FROM HOLES -C + DO 310 J = 1, N(7) IF (NHPR(J) .GE. 1) THEN K1 = IFHOLE(IPTR) @@ -296,9 +276,9 @@ SUBROUTINE DELFSQ (MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CIN, 300 CONTINUE END IF 310 CONTINUE -C + C DELETE LINK TO REGION -C + ADDLNK = .TRUE. CALL LTSORT (MR, LINKR, I, IZ, ADDLNK) END IF @@ -312,9 +292,9 @@ SUBROUTINE DELFSQ (MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CIN, CALL MESAGE ('* NO REGIONS IN THE CURRENT DATABASE *') CALL MESAGE ('*------------------------------------*') END IF -C + C DELETE THE GROUPS -C + ELSE IF ((CIN(ICOM)(1:1) .EQ. 'G') .OR. & (CIN(ICOM)(1:1) .EQ. 'g')) THEN ICOM = ICOM + 1 @@ -344,9 +324,9 @@ SUBROUTINE DELFSQ (MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CIN, ADDLNK = .FALSE. CALL LTSORT (MR, LINKR, I, IPTR, ADDLNK) IF ((IPTR .GT. 0) .AND. (IRGFLG(IPTR) .GE. 1)) THEN -C + C DELETE GROUP FROM BODY LIST -C + DO 370 J = 1, N(9) IF (IRPB(J) .EQ. I) THEN DO 360 K = J + 1, N(9) @@ -355,9 +335,9 @@ SUBROUTINE DELFSQ (MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CIN, N(9) = N(9) - 1 END IF 370 CONTINUE -C + C DELETE LINK TO GROUP -C + ADDLNK = .TRUE. CALL LTSORT (MR, LINKR, I, IZ, ADDLNK) END IF @@ -371,9 +351,9 @@ SUBROUTINE DELFSQ (MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CIN, CALL MESAGE ('* NO GROUPS IN THE CURRENT DATABASE *') CALL MESAGE ('*-----------------------------------*') END IF -C + C DELETE THE HOLES -C + ELSE IF ((CIN(ICOM)(1:2) .EQ. 'HO') .OR. & (CIN(ICOM)(1:2) .EQ. 'ho')) THEN ICOM = ICOM + 1 @@ -413,9 +393,9 @@ SUBROUTINE DELFSQ (MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CIN, CALL MESAGE ('* NO HOLES IN THE CURRENT DATABASE *') CALL MESAGE ('*----------------------------------*') END IF -C + C DELETE SCHEMES -C + ELSE IF ((CIN(ICOM)(1:2) .EQ. 'SC') .OR. & (CIN(ICOM)(1:2) .EQ. 'sc')) THEN ICOM = ICOM + 1 @@ -449,16 +429,16 @@ SUBROUTINE DELFSQ (MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CIN, WRITE(*, 10020) DEFSCH CALL MESAGE (' ') END IF -C + C SPAWN A PROCESS -C + ELSE IF ((CIN(ICOM)(1:2) .EQ. 'SP') .OR. & (CIN(ICOM)(1:2) .EQ. 'sp')) THEN ICOM = ICOM + 1 CALL SPAWN (VAXVMS) -C + C DELETE SIDE DEFINITIONS -C + ELSE IF ((CIN(ICOM)(1:1) .EQ. 'S') .OR. & (CIN(ICOM)(1:1) .EQ. 's')) THEN ICOM = ICOM + 1 @@ -487,9 +467,9 @@ SUBROUTINE DELFSQ (MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CIN, CALL MESAGE ('* NO SIDES IN THE CURRENT DATABASE *') CALL MESAGE ('*----------------------------------*') END IF -C + C DELETE BOUNDARY CONDITIONS -C + ELSE IF ((CIN(ICOM)(1:1) .EQ. 'B') .OR. & (CIN(ICOM)(1:1) .EQ. 'b')) THEN ICOM = ICOM + 1 @@ -565,9 +545,9 @@ SUBROUTINE DELFSQ (MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CIN, DO 480 I = I1, I2 CALL LTSORT (ML, LINKLB, I, IZ, ADDLNK) 480 CONTINUE -C + C RELINK UP THE LINES TO THEIR ASSOCIATED FLAGS -C + SIDEOK = .TRUE. CALL LINKBC (ML, MS, 1, N(13), N(2), N(26), N(13), & N(14), N(20), ILBF, IFLB, NLPF, LISTLB, NLPS, @@ -606,9 +586,9 @@ SUBROUTINE DELFSQ (MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CIN, DO 500 I = I1, I2 CALL LTSORT (ML, LINKSB, I, IZ, ADDLNK) 500 CONTINUE -C + C RELINK UP THE LINES TO THEIR ASSOCIATED FLAGS -C + SIDEOK = .TRUE. CALL LINKBC (ML, MS, 1, N(15), N(2), N(27), N(15), & N(16), N(20), ISBF, IFSB, NSPF, LISTSB, NLPS, @@ -627,9 +607,9 @@ SUBROUTINE DELFSQ (MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CIN, CALL MESAGE (' ') END IF END IF -C + C EXIT OPTION - EXITS FASTQ -C + ELSE IF ((CIN(ICOM)(1:2) .EQ. 'EX') .OR. & (CIN(ICOM)(1:2) .EQ. 'ex')) THEN ICOM = ICOM + 1 @@ -645,20 +625,20 @@ SUBROUTINE DELFSQ (MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CIN, ELSE IF (CIN(ICOM)(1:1) .EQ. ' ') THEN ICOM = ICOM + 1 RETURN -C + C PRINT HELP MESAGE -C + ELSE ICOM = ICOM + 1 CALL HELP_FQ(6) -C + END IF GO TO 100 -C + 10000 FORMAT (' NO HOLES DEFINED IN REGION:', I6) 10010 FORMAT (' UNDEFINED REGION:', I6) 10020 FORMAT (' DEFLT: ', A72) 10040 FORMAT (1X, I5, 2X, A72) 10050 FORMAT (8X, A8) -C + END diff --git a/packages/seacas/applications/fastq/delhol.f b/packages/seacas/applications/fastq/delhol.f index f281e20fe98f..30edaa72e8cf 100644 --- a/packages/seacas/applications/fastq/delhol.f +++ b/packages/seacas/applications/fastq/delhol.f @@ -1,40 +1,29 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: delhol.f,v 1.1 1990/11/30 11:05:55 gdsjaar Exp $ -C $Log: delhol.f,v $ -C Revision 1.1 1990/11/30 11:05:55 gdsjaar -C Initial revision -C -C -CC* FILE: [.QMESH]DELHOL.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE DELHOL (IPTR, MXND, LXK, KXL, NXL, LXN, NXH, NUID, NNN, & IAVAIL, NAVAIL, NOROOM, ERR) C*********************************************************************** -C + C SUBROUTINE DELNOD = DELETES ALL LINES, ELEMENTS, ETC. ATTACHED TO C A NODE -C + C*********************************************************************** -C + DIMENSION LXK(4, MXND), KXL(2, 3*MXND), NXL(2, 3*MXND) DIMENSION LXN(4, MXND), NXH(MXND), NUID(MXND) DIMENSION KLIST(20) -C + LOGICAL ERR, NOROOM -C + ERR = .FALSE. CALL GKXN (MXND, KXL, LXN, IPTR, KS, KLIST, ERR) IF (.NOT. ERR) THEN ERR = .TRUE. -C + C DELETE LINES PER ELEMENT; MARK ELEMENT NODES DO 110 J = 1, KS DO 100 K = 1, 4 @@ -50,12 +39,12 @@ SUBROUTINE DELHOL (IPTR, MXND, LXK, KXL, NXL, LXN, NXH, NUID, NNN, 100 CONTINUE 110 CONTINUE NXH(IPTR) = -1 -C + DO 120 J = 1, 3 IF (LXN(J, IPTR) .GT. 0) THEN -C + C DELETE LINE ATTACHED TO OPPOSITE END NODE -C + IF (NXL(1, LXN(J, IPTR)) .EQ. IPTR) THEN CALL DELLXN (MXND, LXN, NUID, NAVAIL, IAVAIL, & NXL(2, LXN(J, IPTR)), LXN(J, IPTR), NNN, ERR, @@ -66,9 +55,9 @@ SUBROUTINE DELHOL (IPTR, MXND, LXK, KXL, NXL, LXN, NXH, NUID, NNN, & NOROOM) END IF IF (NOROOM) RETURN -C + C DELETE NODES PER LINE; ELEMENTS PER LINE -C + NXL(1, LXN(J, IPTR)) = 0 NXL(2, LXN(J, IPTR)) = 0 KXL(1, LXN(J, IPTR)) = 0 @@ -76,9 +65,9 @@ SUBROUTINE DELHOL (IPTR, MXND, LXK, KXL, NXL, LXN, NXH, NUID, NNN, LXN(J, IPTR) = 0 END IF 120 CONTINUE -C + C FOR LAST LINE, SAVE LINK ON IAVAIL -C + IF (LXN(4, IPTR) .GT. 0) THEN IF (NXL(1, LXN(4, IPTR)) .EQ. IPTR) THEN CALL DELLXN (MXND, LXN, NUID, NAVAIL, IAVAIL, @@ -95,13 +84,13 @@ SUBROUTINE DELHOL (IPTR, MXND, LXK, KXL, NXL, LXN, NXH, NUID, NNN, KXL(1, LXN(4, IPTR)) = 0 KXL(2, LXN(4, IPTR)) = 0 END IF -C + LXN(4, IPTR) = IAVAIL IAVAIL = IPTR NAVAIL = NAVAIL + 1 -C + ERR = .FALSE. END IF -C + RETURN END diff --git a/packages/seacas/applications/fastq/dellxn.f b/packages/seacas/applications/fastq/dellxn.f index 67fcba34d656..599384fd5745 100644 --- a/packages/seacas/applications/fastq/dellxn.f +++ b/packages/seacas/applications/fastq/dellxn.f @@ -1,39 +1,28 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C -C See packages/seacas/LICENSE for details - -C $Id: dellxn.f,v 1.1 1990/11/30 11:05:58 gdsjaar Exp $ -C $Log: dellxn.f,v $ -C Revision 1.1 1990/11/30 11:05:58 gdsjaar -C Initial revision C +C See packages/seacas/LICENSE for details -CC* FILE: [.QMESH]DELLXN.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE DELLXN (MXND, LXN, NUID, NAVAIL, IAVAIL, NODE, LINE, & NNN, ERR, NOROOM) C*********************************************************************** -C + C SUBROUTINE DELLXN = DELETE LINE FROM THE LIST OF LINES FOR THIS NODE -C + C*********************************************************************** -C + DIMENSION LINES (20), LXN (4, MXND), NUID (MXND) -C + LOGICAL ERR, NOROOM -C + CALL GETLXN (MXND, LXN, NODE, LINES, NL, ERR) IF (NL.LT.1) THEN WRITE (*, 10000)NODE GOTO 110 ENDIF IF (ERR) GOTO 110 -C + K = 0 DO 100 I = 1, NL IF (LINES (I) .NE. LINE) THEN @@ -41,7 +30,7 @@ SUBROUTINE DELLXN (MXND, LXN, NUID, NAVAIL, IAVAIL, NODE, LINE, LINES (K) = LINES (I) ENDIF 100 CONTINUE -C + IF (K .NE. NL - 1) THEN WRITE (*, 10010) NODE, (LINES (I), I = 1, NL) ERR = .TRUE. @@ -50,11 +39,11 @@ SUBROUTINE DELLXN (MXND, LXN, NUID, NAVAIL, IAVAIL, NODE, LINE, NL = NL-1 CALL PUTLXN (MXND, NL, LXN, NUID, NODE, LINES, NAVAIL, IAVAIL, & NNN, ERR, NOROOM) -C + 110 CONTINUE RETURN -C + 10000 FORMAT (' ERROR IN DELLXN - NODE', I5, ' HAS NO LINES') 10010 FORMAT (' ERROR IN DELLXN - NODE:', I5, /, ' LINES:', 20I5) -C + END diff --git a/packages/seacas/applications/fastq/digit.F b/packages/seacas/applications/fastq/digit.F index 81fb2cda9a4a..c850606b3778 100644 --- a/packages/seacas/applications/fastq/digit.F +++ b/packages/seacas/applications/fastq/digit.F @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details SUBROUTINE DIGIT (MP, ML, MS, MR, MSNAP, MCOM, ICOM, JCOM, CIN, & RIN, IIN, KIN, IDUMP, N, IPOINT, COOR, IPBOUN, ILINE, LTYPE, @@ -15,24 +15,24 @@ SUBROUTINE DIGIT (MP, ML, MS, MR, MSNAP, MCOM, ICOM, JCOM, CIN, & YMIN1, YMAX1, XMIN2, XMAX2, YMIN2, YMAX2, X1OLD, X2OLD, Y1OLD, & Y2OLD, ALPHA, DEV1, SNAP, SNAPDX, NSNAP, DRWTAB, AXIST) C*********************************************************************** -C + C SUBROUTINE DIGIT = SUBROUTINE TO DIGITIZE THE GEOMETRY -C + C*********************************************************************** -C + C SUBROUTINE CALLED BY: C TABLET = A SUBROUTINE TO CONTROL THE GEOMETRY DIGITIZATION -C + C*********************************************************************** -C + C SUBROUTINES CALLED: C DREAD = SETS ALL PARAMETERS UP FOR READING FROM A DIGI-PAD C DPREAD = READS INPUT FROM A DIGI-PAD DIGITIZER C CLOSE = FINDS THE CLOSEST EXISTING POINT TO THE MOUSE C REFRSH = REFRESHES THE SCREEN AND DRAWS EXISTING GEOMETRY -C + C*********************************************************************** -C + C VARIABLES USED: C IANS = LOGICAL RESPONSE FROM YES-NO QUESTION C TITLE = MESH TITLE @@ -53,9 +53,9 @@ SUBROUTINE DIGIT (MP, ML, MS, MR, MSNAP, MCOM, ICOM, JCOM, CIN, C COORDINATES, BUT NEW NUMBERING (SLIDE LINE USE) (C BUTTON C HAS BEEN PUSHED) C NOROOM = .TRUE. IF THE AMOUNT OF DATA EXCEEDS DIMENSIONED LIMITS -C + C*********************************************************************** -C + DIMENSION IPOINT(MP), COOR(2, MP), IPBOUN(MP) DIMENSION ILINE(ML), LTYPE(ML), NINT(ML), FACTOR(ML), LCON(3, ML) DIMENSION ILBOUN(ML), ISBOUN(ML) @@ -73,17 +73,17 @@ SUBROUTINE DIGIT (MP, ML, MS, MR, MSNAP, MCOM, ICOM, JCOM, CIN, DIMENSION IHOLDS(2, MS), IRGFLG(MR) DIMENSION N(29), SNAPDX(2, MSNAP), NSNAP(2) DIMENSION KIN(MCOM), IIN(MCOM), RIN(MCOM) -C + CHARACTER*72 TITLE, CIN(MCOM) CHARACTER*1 BUTTON, HOLD CHARACTER DEV1*3 -C + LOGICAL CHANGE, SLIDE, NOROOM, BOXED, ADDOLD, NUMPLT LOGICAL DRWTAB, OLDCUR, MERGE, ALPHA, ADDLNK, BIFIND, TEST LOGICAL GETMAX, SNAP, SNAPDR, AXIST, ADDCEN -C + C INITIALIZE VARIABLES -C + XMIN2 = XMIN1 XMAX2 = XMAX1 YMIN2 = YMIN1 @@ -100,22 +100,22 @@ SUBROUTINE DIGIT (MP, ML, MS, MR, MSNAP, MCOM, ICOM, JCOM, CIN, NOLD7 = N(7) CALL PLTGTT (2, TALL) knum = 0 -C + IF (NOROOM) THEN CALL PLTBEL CALL PLTFLU NOROOM = .FALSE. END IF -C + C INITIALIZE THE PLOTTING SURFACE -C + IF ((DEV1 .EQ. 'LS5') .OR. (DEV1 .EQ. 'ls5')) THEN WRITE (*, 10000) CHAR(27)//'RA0' WRITE (*, 10000) CHAR(27)//'RR1' END IF -C + C REFRESH THE SCREEN AND DRAW EXISTING DATA WITH SNAP LINES -C + IF (DRWTAB) THEN CALL REFRSH(MP, ML, MS, MR, MSNAP, N, COOR, ILINE, LTYPE, & LCON, NLPS, IFLINE, ILLIST, NSPR, IFSIDE, ISLIST, LINKP, @@ -128,12 +128,12 @@ SUBROUTINE DIGIT (MP, ML, MS, MR, MSNAP, MCOM, ICOM, JCOM, CIN, & LINKL, LINKS, LINKR, TITLE, X1, X2, Y1, Y2, ALPHA, SNAP, & SNAPDX, NSNAP, SNAPDR, TALL, X11, X22, Y11, Y22, AXIST) ENDIF -C + C INITIALIZE VARIABLES FOR DIGITIZATION INPUT -C + LASTP = 0 OLDCUR = .FALSE. -C + 100 CONTINUE CHANGE = .FALSE. SLIDE = .FALSE. @@ -142,21 +142,21 @@ SUBROUTINE DIGIT (MP, ML, MS, MR, MSNAP, MCOM, ICOM, JCOM, CIN, CALL PLTSTD (1, 7.) CALL PLTFLU END IF -C + C INPUT THE DATA -C + C GET THE CURSOR LOCATION IN USER SYSTEM COORDINATES C AND THE BUTTON PUSHED -C + CALL DREAD (X, Y, BUTTON, X1, Y1, XX1, YY1, SCALE, CT, ST) -C + C SHOW CURRENT CURSOR LOCATION -C + IF ((.NOT.ALPHA) .AND. (BUTTON .EQ. '3')) THEN -C + C ERASE ANY BOXED IN POINTS THAT ARE NOT NEEDED FOR THE C CURRENT SEQUENCE -C + IF (ISQR .LT. 0) THEN ISQR = IABS (ISQR) CALL PLTSTT (2, TALL) @@ -173,9 +173,9 @@ SUBROUTINE DIGIT (MP, ML, MS, MR, MSNAP, MCOM, ICOM, JCOM, CIN, ENDIF CALL PUTCRS (X, Y, OLDCUR) GOTO 110 -C + C ERASE ANY BOXED IN POINTS ON THE SCREEN -C + ELSEIF (ISQR .NE. 0) THEN ISQR = IABS (ISQR) CALL PLTSTT (2, TALL) @@ -190,24 +190,24 @@ SUBROUTINE DIGIT (MP, ML, MS, MR, MSNAP, MCOM, ICOM, JCOM, CIN, CALL PLTFLU ISQR = 0 END IF -C + IF ((DEV1 .EQ. 'LS5') .OR. (DEV1 .EQ. 'ls5')) THEN WRITE (*, 10000) CHAR(27)//'[2J' WRITE (*, 10000) CHAR(27)//'RA0' END IF -C + C INPUT A POINT -C + IF (BUTTON .EQ. '1') THEN IF (.NOT.ALPHA) CALL ERASEC(OLDCUR) -C + C FIND THE CLOSEST POINT TO THE CURRENT POSITION -C + IF (CHANGE) THEN CALL CLOSEP (MP, N(18), X, Y, IPOINT, COOR, LINKP, I) -C + C INPUT A POINT AT THE CLOSEST LOCATION, BUT WITH A NEW POINT NUMBER -C + CALL LTSORT (MP, LINKP, I, II, ADDLNK) IF (SLIDE) THEN JJ = N(18) + 1 @@ -243,9 +243,9 @@ SUBROUTINE DIGIT (MP, ML, MS, MR, MSNAP, MCOM, ICOM, JCOM, CIN, CALL DMESS(DEV1,' CLOSEST POINT LOCATED AND STORED') END IF LASTP = I -C + C INPUT A COMPLETELY NEW POINT -C + ELSE IF (SNAP) CALL SNAPPT (MSNAP, SNAPDX, NSNAP, X, Y) JJ = N(18) + 1 @@ -266,21 +266,21 @@ SUBROUTINE DIGIT (MP, ML, MS, MR, MSNAP, MCOM, ICOM, JCOM, CIN, END IF CALL DMESS(DEV1,' A POINT HAS BEEN INPUT') END IF -C + C INPUT A STRAIGHT LINE -C + ELSE IF (BUTTON .EQ. '2') THEN IF (.NOT.ALPHA) CALL ERASEC (OLDCUR) -C + C CONNECT THIS LINE FROM THE LAST POINT TO THE CLOSEST POINT -C + IF (CHANGE) THEN CALL CLOSEP (MP, N(18), X, Y, IPOINT, COOR, LINKP, I) IF (I .EQ. LASTP) GO TO 100 -C + C RENUMBER THIS LINE BUT PUT IT ON TOP OF THE EXISTING LINE C THIS IS FOR SLIDE LINE USE -C + IF (SLIDE) THEN JJ = N(18) + 1 CALL LTSORT (MP, LINKP, I, II, ADDLNK) @@ -305,9 +305,9 @@ SUBROUTINE DIGIT (MP, ML, MS, MR, MSNAP, MCOM, ICOM, JCOM, CIN, CALL DMESS(DEV1,' A STRAIGHT LINE HAS BEEN INPUT '// & 'TO CLOSEST POINT') END IF -C + C INPUT A COMPLETELY NEW STRAIGHT LINE -C + ELSE JJ = N(18) + 1 IF (SNAP) CALL SNAPPT (MSNAP, SNAPDX, NSNAP, X, Y) @@ -348,15 +348,15 @@ SUBROUTINE DIGIT (MP, ML, MS, MR, MSNAP, MCOM, ICOM, JCOM, CIN, CALL PLTFLU END IF LASTP = I -C + C INPUT AN ARC ABOUT A CENTER POINT (NEED NOT BE TRULY CIRCULAR) -C + ELSE IF ((BUTTON .EQ. '5') .OR. (BUTTON .EQ. '6')) THEN IF (.NOT.ALPHA) CALL ERASEC (OLDCUR) HOLD = BUTTON -C + C GO FROM THE LAST POINT TO THE CLOSEST EXISTING POINT FOR THE ARC -C + IF (CHANGE) THEN CALL CLOSEP (MP, N(18), X, Y, IPOINT, COOR, LINKP, I) IF (.NOT. ALPHA) THEN @@ -373,10 +373,10 @@ SUBROUTINE DIGIT (MP, ML, MS, MR, MSNAP, MCOM, ICOM, JCOM, CIN, CALL PLTFLU ISQR = IPNTR ENDIF -C + C INPUT THE LINE AS NEW NUMBER IN THE SAME PLACE AS THE OLD ARC C THIS IS FOR SLIDE LINE USE -C + IF (SLIDE) THEN JJ = N(18) + 1 CALL LTSORT (MP, LINKP, I, II, ADDLNK) @@ -396,9 +396,9 @@ SUBROUTINE DIGIT (MP, ML, MS, MR, MSNAP, MCOM, ICOM, JCOM, CIN, CALL PLTFLU END IF END IF -C + C INPUT A COMPLETELY NEW ARC -C + ELSE JJ = N(18) + 1 IF (SNAP) CALL SNAPPT (MSNAP, SNAPDX, NSNAP, X, Y) @@ -422,24 +422,24 @@ SUBROUTINE DIGIT (MP, ML, MS, MR, MSNAP, MCOM, ICOM, JCOM, CIN, LASTP = I GO TO 100 END IF -C + C INPUT THE CENTER POINT OF THE ARC -C + 120 CONTINUE CALL DMESS (DEV1, ' INPUT A CENTER POINT TO FINISH THE ARC'// & ' DEFINITION') CALL MESAGE(' "PUCK-1" FOR NEW OR '// & '"PUCK-0 PUCK-1" FOR EXISTING CENTER POINT') CALL DREAD (X, Y, BUTTON, X1, Y1, XX1, YY1, SCALE, CT, ST) -C + C SHOW CURRENT CURSOR LOCATION AS AN AID IN LOCATION OF THE CENTER -C + IF ((.NOT.ALPHA) .AND. (BUTTON .EQ. '3')) THEN CALL PUTCRS (X, Y, OLDCUR) GO TO 120 -C + C USE THE CLOSEST POINT TO CURRENT LOCATION AS THE CENTER -C + ELSE IF (BUTTON .EQ. '0') THEN CALL DREAD (X, Y, BUTTON, X1, Y1, XX1, YY1, SCALE, CT, ST) WRITE(*,10000)' '//CHAR(27)//'[2J' @@ -472,9 +472,9 @@ SUBROUTINE DIGIT (MP, ML, MS, MR, MSNAP, MCOM, ICOM, JCOM, CIN, CALL PLTFLU ISQR = IPNTR ENDIF -C + C INPUT A NEW POINT FOR THE CENTER -C + ELSE IF (BUTTON .EQ. '1') THEN WRITE(*,10000)' '//CHAR(27)//'[2J' IF (.NOT.ALPHA) CALL ERASEC (OLDCUR) @@ -499,9 +499,9 @@ SUBROUTINE DIGIT (MP, ML, MS, MR, MSNAP, MCOM, ICOM, JCOM, CIN, WRITE(*,10000)' '//CHAR(27)//'[2J' GO TO 100 END IF -C + C IF THE ARC IS INPUT AS CW, SWITCH END POINTS TO RECORD IT AS CCW -C + IF (HOLD .EQ. '5') THEN IP1 = LASTP IP2 = I @@ -527,9 +527,9 @@ SUBROUTINE DIGIT (MP, ML, MS, MR, MSNAP, MCOM, ICOM, JCOM, CIN, & IP2, IP3, NUMPLT, DUM1, DUM2, TEST, GETMAX, DUM3, DUM4, & DUM5, DUM6) LASTP = I -C + C WRITE OUT THE APPROPRIATE MESSAGE -C + IF (HOLD .EQ. '5') THEN IF (CHANGE) THEN IF (SLIDE) THEN @@ -557,9 +557,9 @@ SUBROUTINE DIGIT (MP, ML, MS, MR, MSNAP, MCOM, ICOM, JCOM, CIN, & 'TO NEW POINT') ENDIF ENDIF -C + C BISECT THE CLOSEST LINE -C + ELSE IF (BUTTON .EQ. '4') THEN IF (.NOT.ALPHA) CALL ERASEC (OLDCUR) CALL BISECT (MP, ML, MS, MR, MSNAP, N, IPOINT, COOR, IPBOUN, @@ -572,9 +572,8 @@ SUBROUTINE DIGIT (MP, ML, MS, MR, MSNAP, MCOM, ICOM, JCOM, CIN, & Y, MERGE, LASTP, ALPHA, NOROOM, SNAP, SNAPDX, NSNAP) CALL DMESS(DEV1,' AN EXISTING LINE HAS BEEN BISECTED') -C C MOVE A POINT AND ALL ENTITIES ATTACHED TO THAT POINT -C + ELSE IF (BUTTON .EQ. '8') THEN CALL CLOSEP (MP, N(18), X, Y, IPOINT, COOR, LINKP, II) IF (.NOT.ALPHA) THEN @@ -593,19 +592,19 @@ SUBROUTINE DIGIT (MP, ML, MS, MR, MSNAP, MCOM, ICOM, JCOM, CIN, 130 CONTINUE CALL DMESS(DEV1,' ENTER "PUCK-8" TO MOVE BOXED POINT - '// & 'ANY OTHER KEY TO ABANDON') -C + C INPUT THE NEW POINT LOCATION -C + CALL DREAD (X, Y, BUTTON, X1, Y1, XX1, YY1, SCALE, CT, ST) -C + C SHOW CURRENT CURSOR LOCATION AS AN AID IN LOCATION OF THE POINT -C + IF ((.NOT.ALPHA) .AND. (BUTTON .EQ. '3')) THEN CALL PUTCRS (X, Y, OLDCUR) GO TO 130 -C + C INPUT A NEW X, Y FOR THE POINT -C + ELSE IF (BUTTON .EQ. '8') THEN WRITE(*,10000)' '//CHAR(27)//'[2J' IF (.NOT.ALPHA) CALL ERASEC (OLDCUR) @@ -639,9 +638,9 @@ SUBROUTINE DIGIT (MP, ML, MS, MR, MSNAP, MCOM, ICOM, JCOM, CIN, WRITE(*,10000)' '//CHAR(27)//'[2J' ISQR = 0 END IF -C + C REFRESH THE SCREEN AND DRAW EXISTING DATA WITH SNAP LINES -C + ELSE IF (BUTTON .EQ. '9') THEN IF (.NOT.ALPHA) CALL ERASEC (OLDCUR) IF (DRWTAB) THEN @@ -656,9 +655,9 @@ SUBROUTINE DIGIT (MP, ML, MS, MR, MSNAP, MCOM, ICOM, JCOM, CIN, & LINKL, LINKS, LINKR, TITLE, X1, X2, Y1, Y2, ALPHA, SNAP, & SNAPDX, NSNAP, SNAPDR, TALL, X11, X22, Y11, Y22, AXIST) ENDIF -C + C TOGGLE THE SNAPPING TO GRID LINES -C + ELSE IF (BUTTON .EQ. 'A') THEN IF (.NOT.ALPHA) CALL ERASEC (OLDCUR) IF (SNAP) THEN @@ -698,10 +697,10 @@ SUBROUTINE DIGIT (MP, ML, MS, MR, MSNAP, MCOM, ICOM, JCOM, CIN, END IF END IF END IF -C + C INPUT A REGION BY TRYING TO ENCLOSE THE CURRENT LOCATION AS C TIGHTLY AS POSSIBLE -C + ELSE IF (BUTTON .EQ. '7') THEN IF (.NOT.ALPHA) CALL ERASEC (OLDCUR) CALL BOXIT (MP, ML, MS, MR, N, IPOINT, COOR, ILINE, LTYPE, @@ -709,9 +708,9 @@ SUBROUTINE DIGIT (MP, ML, MS, MR, MSNAP, MCOM, ICOM, JCOM, CIN, & LINKR, LINKM, NHOLDR, IHOLDR, NHOLDM, IHOLDM, IRGFLG, X, Y, & Y1, Y2, BOXED, MERGE, NOROOM) IF (NOROOM) GO TO 170 -C + C CALCULATE A GOOD LOCATION FOR THE REGION MARKER -C + IF ((BOXED) .AND. (.NOT.ALPHA)) THEN CALL LTSORT (MR, LINKR, N(22), II, ADDLNK) CALL REGEXT (MP, ML, MS, MR, N, II, COOR, ILINE, LTYPE, @@ -733,17 +732,17 @@ SUBROUTINE DIGIT (MP, ML, MS, MR, MSNAP, MCOM, ICOM, JCOM, CIN, CALL PLTFLU CALL DMESS(DEV1,' NO LINES CLOSE ABOUT CURRENT POINT') END IF -C + C CHANGE THE ZOOM LIMITS WITH THE MOUSE -C + ELSE IF (BUTTON .EQ. 'B') THEN -C + C SWITCH THE LATEST ZOOM LIMITS -C + IF (CHANGE) THEN -C + C JUST CHANGE THE SCREEN IF A DRAWING IS ON THE TABLET -C + IF(DRWTAB)THEN X1HOLD = X1OLD Y1HOLD = Y1OLD @@ -762,9 +761,9 @@ SUBROUTINE DIGIT (MP, ML, MS, MR, MSNAP, MCOM, ICOM, JCOM, CIN, & ISLIST, LINKP, LINKL, LINKS, LINKR, TITLE, X1OLD, & X2OLD, Y1OLD, Y2OLD, ALPHA, SNAP, SNAPDX, NSNAP, & SNAPDR, TALL, X11, X22, Y11, Y22, AXIST) -C + C OTHERWISE CHANGE THE TABLET AND THE DRAWING -C + ELSE X1HOLD = X1 Y1HOLD = Y1 @@ -786,12 +785,12 @@ SUBROUTINE DIGIT (MP, ML, MS, MR, MSNAP, MCOM, ICOM, JCOM, CIN, & Y1, Y2, ALPHA, SNAP, SNAPDX, NSNAP, SNAPDR, TALL, & X11, X22, Y11, Y22, AXIST) ENDIF -C + CALL DMESS(DEV1, ' ZOOM HAS BEEN RESET TO THE'// & ' PREVIOUS ZOOM') -C + C DRAW THE LOWER LIMITS OF THE ZOOM -C + ELSE IF (.NOT.ALPHA) THEN CALL ERASEC (OLDCUR) @@ -803,27 +802,27 @@ SUBROUTINE DIGIT (MP, ML, MS, MR, MSNAP, MCOM, ICOM, JCOM, CIN, END IF XHOLD = X YHOLD = Y -C + CALL DMESS(DEV1,' ENTER "PUCK-B" AT UPPER RIGHT OF '// & 'ZOOM - ANY OTHER KEY TO ABANDON') -C + 140 CONTINUE CALL DREAD (X, Y, BUTTON, X1, Y1, XX1, YY1, SCALE, CT, ST) -C + C SHOW CURRENT CURSOR LOCATION AS AN AID IN LOCATION OF THE POINT -C + IF ((.NOT.ALPHA) .AND. (BUTTON .EQ. '3')) THEN CALL PUTCRS (X, Y, OLDCUR) GO TO 140 -C + C INPUT A NEW X, Y FOR THE OTHER EXTREME -C + ELSE IF (BUTTON .EQ. 'B') THEN IF (.NOT.ALPHA) CALL ERASEC (OLDCUR) IF ((X .GT. XHOLD) .AND. (Y .GT. YHOLD)) THEN -C + C RESET THE ZOOM LIMITS -C + IF (DRWTAB) THEN XMIN2 = X1OLD XMAX2 = X2OLD @@ -879,14 +878,14 @@ SUBROUTINE DIGIT (MP, ML, MS, MR, MSNAP, MCOM, ICOM, JCOM, CIN, WRITE(*,10000)' '//CHAR(27)//'[2J' END IF END IF -C + C DELETE OPTION -C + ELSE IF (BUTTON .EQ. 'D') THEN CALL DREAD (X, Y, BUTTON, X1, Y1, XX1, YY1, SCALE, CT, ST) -C + C DELETE A POINT AND ALL ENTITIES ASSOCIATED WITH THAT POINT -C + IF (BUTTON .EQ. '1') THEN IF (.NOT.ALPHA) CALL ERASEC (OLDCUR) CALL CLOSEP (MP, N(18), X, Y, IPOINT, COOR, LINKP, II) @@ -902,13 +901,13 @@ SUBROUTINE DIGIT (MP, ML, MS, MR, MSNAP, MCOM, ICOM, JCOM, CIN, CALL PLTSTT (2, TALL*.5) CALL PLTFLU ISQR = IPNTR -C + CALL DMESS (DEV1, ' PRESS "PUCK-1" TO CONFIRM DELETE') CALL DREAD (X, Y, BUTTON, X1, Y1, XX1, YY1, SCALE, CT, & ST) -C + C ERASE BOXED IN POINT ON THE SCREEN NO MATTER WHAT BUTTON IS ENTERED -C + CALL PLTSTT (2, TALL) CALL PLTSTD (1, 0.) #if NeedsDoubleEscape @@ -920,9 +919,9 @@ SUBROUTINE DIGIT (MP, ML, MS, MR, MSNAP, MCOM, ICOM, JCOM, CIN, CALL PLTSTT (2, TALL*.5) CALL PLTFLU ISQR = 0 -C + C CHECK THE BUTTON TO SEE IF THE POINT IS REALLY TO BE DELETED -C + IF (BUTTON .EQ. '1') THEN WRITE(*,10000)' '//CHAR(27)//'[2J' CALL PLTSTD (1, 0.) @@ -936,9 +935,9 @@ SUBROUTINE DIGIT (MP, ML, MS, MR, MSNAP, MCOM, ICOM, JCOM, CIN, CALL DMESS (DEV1, ' POINT DELETION ABORTED') END IF END IF -C + C DELETE A LINE AND ALL ENTIES ASSOCIATE WITH IT -C + ELSE IF (BUTTON .EQ. '2') THEN IF (.NOT.ALPHA) CALL ERASEC (OLDCUR) CALL CLOSEL (MP, ML, N, COOR, ILINE, LTYPE, LCON, LINKP, @@ -954,7 +953,7 @@ SUBROUTINE DIGIT (MP, ML, MS, MR, MSNAP, MCOM, ICOM, JCOM, CIN, & IP3, NUMPLT, DUM1, DUM2, TEST, GETMAX, DUM3, DUM4, & DUM5, DUM6) CALL PLTFLU -C + CALL DMESS (DEV1,'PRESS "PUCK-2" TO CONFIRM DELETE') CALL DREAD (X, Y, BUTTON, X1, Y1, XX1, YY1, SCALE, CT, & ST) @@ -977,9 +976,9 @@ SUBROUTINE DIGIT (MP, ML, MS, MR, MSNAP, MCOM, ICOM, JCOM, CIN, ELSE CALL DMESS (DEV1, ' LINE NOT FOUND, TRY AGAIN') END IF -C + C DELETE A GRID LINE -C + ELSE IF (BUTTON .EQ. 'A') THEN IF (.NOT.ALPHA) CALL ERASEC (OLDCUR) IF (SNAP .AND. (NSNAP(1) .GT. 0 .AND. NSNAP(2) .GT. 0)) @@ -990,7 +989,7 @@ SUBROUTINE DIGIT (MP, ML, MS, MR, MSNAP, MCOM, ICOM, JCOM, CIN, CALL PLTSTD (1, 3.) CALL D2GRID (XBOT, YBOT, XTOP, YTOP) CALL PLTFLU -C + CALL DMESS (DEV1, & 'PRESS "PUCK-A" TO CONFIRM DELETE') CALL DREAD (X, Y, BUTTON, X1, Y1, XX1, YY1, SCALE, @@ -1012,9 +1011,9 @@ SUBROUTINE DIGIT (MP, ML, MS, MR, MSNAP, MCOM, ICOM, JCOM, CIN, CALL DMESS(DEV1, ' GRID LINES NOT ENABLED') END IF END IF -C + C DELETE A ZOOM - GO BACK TO THE ORIGINAL DEFAULTS -C + ELSE IF (BUTTON .EQ. 'B')THEN IF (DRWTAB) THEN XMIN2 = X1OLD @@ -1047,12 +1046,12 @@ SUBROUTINE DIGIT (MP, ML, MS, MR, MSNAP, MCOM, ICOM, JCOM, CIN, & Y1, Y2, ALPHA, SNAP, SNAPDX, NSNAP, SNAPDR, TALL, & X11, X22, Y11, Y22, AXIST) ENDIF -C + CALL DMESS(DEV1,' ZOOM HAS BEEN RESET TO THE DEFAULT') END IF -C + C EXIT DIGITIZATION - INITIALIZATION OF DIGITIZING PAD IS SAVED -C + ELSE IF (BUTTON .EQ. 'E') THEN IF (.NOT.ALPHA) THEN CALL PLTSTT (2, TALL) @@ -1062,9 +1061,9 @@ SUBROUTINE DIGIT (MP, ML, MS, MR, MSNAP, MCOM, ICOM, JCOM, CIN, END IF CALL PLTFLU END IF -C + C ASSUME THE BODY IS TO CONTAIN ALL THE REGIONS ENTERED -C + ADDOLD = .TRUE. IFOUND = 1 DO 160 I = NOLD7 + 1, N(7) @@ -1076,28 +1075,28 @@ SUBROUTINE DIGIT (MP, ML, MS, MR, MSNAP, MCOM, ICOM, JCOM, CIN, END IF 160 CONTINUE RETURN -C + C INDICATE THAT THE CLOSEST POINT TO THE CURRENT LOCATION IS NEEDED -C + ELSE IF (BUTTON .EQ. '0') THEN CHANGE = .TRUE. GO TO 110 -C + C INDICATE THAT DATA IS TO BE INPUT AT THE CLOSEST LOCATION C WITH A NEW NUMBERING - FOR USE WITH SLIDE LINE INPUT -C + ELSE IF (BUTTON .EQ. 'C') THEN SLIDE = .TRUE. CHANGE = .TRUE. GO TO 110 END IF -C + C GO GET ANOTHER BUTTON AND LOCATION -C + GO TO 100 -C + C MORE ROOM IN DIMENSIONS NEEDED -C + 170 CONTINUE CALL PLTBEL CALL PLTFLU @@ -1115,6 +1114,6 @@ SUBROUTINE DIGIT (MP, ML, MS, MR, MSNAP, MCOM, ICOM, JCOM, CIN, CALL PLTBEL CALL PLTFLU RETURN -C + 10000 FORMAT (1X, A) END diff --git a/packages/seacas/applications/fastq/disclm.f b/packages/seacas/applications/fastq/disclm.f index ee29913dcf14..765896603152 100644 --- a/packages/seacas/applications/fastq/disclm.f +++ b/packages/seacas/applications/fastq/disclm.f @@ -1,37 +1,26 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: disclm.f,v 1.1 1990/11/30 11:06:05 gdsjaar Exp $ -C $Log: disclm.f,v $ -C Revision 1.1 1990/11/30 11:06:05 gdsjaar -C Initial revision -C -C -CC* FILE: [.MAIN]DISCLM.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE DISCLM (NCOLS) C*********************************************************************** -C + C SUBROUTINE DISCLM = PRINTS THE SANDIA DISCLAIMER -C + C*********************************************************************** -C + CHARACTER*29 BLANK -C + DATA BLANK/' '/ -C + NSHIFT = MAX ( (NCOLS-76)/2, 1) + 1 NSHIFT = MIN (NSHIFT, 29) WRITE (*, 10000) (BLANK (1:NSHIFT), I = 1, 9) WRITE (*, 10010) (BLANK (1:NSHIFT), I = 1, 5) RETURN -C + 10000 FORMAT (' ', A, & '**************************************', & '**************************************'//, A, @@ -62,5 +51,5 @@ SUBROUTINE DISCLM (NCOLS) & 'WNED RIGHTS.'//, A, & '**************************************', & '**************************************'/) -C + END diff --git a/packages/seacas/applications/fastq/disctp.f b/packages/seacas/applications/fastq/disctp.f index 0234a287e6d6..5652942ea124 100644 --- a/packages/seacas/applications/fastq/disctp.f +++ b/packages/seacas/applications/fastq/disctp.f @@ -1,35 +1,20 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: disctp.f,v 1.3 1991/03/22 16:07:18 gdsjaar Exp $ -C $Log: disctp.f,v $ -C Revision 1.3 1991/03/22 16:07:18 gdsjaar -C Fixed DATA statement screwed up in PI change -C -c Revision 1.2 1991/03/21 15:44:33 gdsjaar -c Changed all 3.14159... to atan2(0.0, -1.0) -c -c Revision 1.1.1.1 1990/11/30 11:06:09 gdsjaar -c FASTQ Version 2.0X -c -c Revision 1.1 90/11/30 11:06:07 gdsjaar -c Initial revision -c -C LOGICAL FUNCTION DISCTP (ANGLE) C*********************************************************************** -C + C FUNCTION DISCTP = LOGICAL FUNCTION THAT RETURNS TRUE IF THE ANGLE IS C WITHIN THE CURRENT DEFINITION OF A C DISSECTION VERTEX -C + C*********************************************************************** -C + DATA EPS /.31/ -C + PI = ATAN2(0.0, -1.0) IF (ANGLE .GT. (PI + EPS)) THEN DISCTP=.TRUE. diff --git a/packages/seacas/applications/fastq/dline.f b/packages/seacas/applications/fastq/dline.f index ff492d64a97e..044b380c0e9f 100644 --- a/packages/seacas/applications/fastq/dline.f +++ b/packages/seacas/applications/fastq/dline.f @@ -1,60 +1,38 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: dline.f,v 1.3 2000/11/13 15:39:04 gdsjaar Exp $ -C $Log: dline.f,v $ -C Revision 1.3 2000/11/13 15:39:04 gdsjaar -C Cleaned up unused variables and labels. -C -C Removed some real to int conversion warnings. -C -C Revision 1.2 1991/03/21 15:44:35 gdsjaar -C Changed all 3.14159... to atan2(0.0, -1.0) -C -c Revision 1.1.1.1 1990/11/30 11:06:11 gdsjaar -c FASTQ Version 2.0X -c -c Revision 1.1 90/11/30 11:06:10 gdsjaar -c Initial revision -c -C -CC* FILE: [.MAIN]DLINE.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE DLINE (MP, ML, COOR, LINKP, KNUM, KT, IP1, IP2, IP3, & NUMPLT, X1, Y1, TEST, GETMAX, XMIN, XMAX, YMIN, YMAX) C*********************************************************************** -C + C SUBROUTINE DLINE = DRAWS A LINE ACCORDING TO THE CURRENT DEFINITION C OR SIMPLY GETS THE MAX/MIN FOR LINES GETMAX=.TRUE. -C + C*********************************************************************** -C + C VARIABLES USED: C IP1 = POINTER FOR THE FIRST POINT C IP2 = POINTER FOR THE SECOND POINT C IP3 = POINTER FOR THE THIRD POINT -C + C*********************************************************************** -C + DIMENSION COOR (2, MP), LINKP (2, MP) -C + CHARACTER*72 DUMMY -C + LOGICAL NUMPLT, ADDLNK, TEST, GETMAX, ERR -C + PI = ATAN2(0.0, -1.0) -C + IF (TEST)WRITE (12, 10000)'SP', KNUM, ';' ADDLNK = .FALSE. -C + C DEFINE FIRST POINT EXACTLY AND BRANCH -C + CALL LTSORT (MP, LINKP, IP1, IPNTR1, ADDLNK) CALL LTSORT (MP, LINKP, IP2, IPNTR2, ADDLNK) IF ((IPNTR1 .LE. 0).OR. (IPNTR2 .LE. 0))GOTO 140 @@ -66,9 +44,9 @@ SUBROUTINE DLINE (MP, ML, COOR, LINKP, KNUM, KT, IP1, IP2, IP3, ENDIF X1 = COOR (1, IPNTR1) Y1 = COOR (2, IPNTR1) -C + C STRAIGHT LINE GENERATION -C + IF (KT .EQ. 1) THEN X2 = COOR (1, IPNTR2) Y2 = COOR (2, IPNTR2) @@ -81,9 +59,9 @@ SUBROUTINE DLINE (MP, ML, COOR, LINKP, KNUM, KT, IP1, IP2, IP3, ENDIF XMID = (X1 + X2) * .5 YMID = (Y1 + Y2) * .5 -C + C CORNER GENERATION -C + ELSEIF (KT .EQ. 2) THEN X2 = COOR (1, IPNTR3) Y2 = COOR (2, IPNTR3) @@ -105,17 +83,17 @@ SUBROUTINE DLINE (MP, ML, COOR, LINKP, KNUM, KT, IP1, IP2, IP3, Y1 = Y2 X2 = COOR (1, IPNTR2) Y2 = COOR (2, IPNTR2) -C + C CIRCULAR ARC GENERATION -C + ELSEIF ((KT .EQ. 3).OR. (KT .EQ. 4).OR. (KT .EQ. 6)) THEN CALL ARCPAR (MP, KT, KNUM, COOR, LINKP, IPNTR1, IPNTR2, & IPNTR3, IP3, XCEN, YCEN, THETA1, THETA2, TANG, R1, R2, ERR, & IDUM1, IDUM2, XK, XA) IF (ERR) GOTO 140 -C + C GENERATE THE CIRCLE -C + ANG = THETA1 DARC = .10 INC = INT (ABS (TANG) / DARC) + 1 @@ -154,17 +132,17 @@ SUBROUTINE DLINE (MP, ML, COOR, LINKP, KNUM, KT, IP1, IP2, IP3, YMID = Y1 ENDIF 100 CONTINUE -C + C ELIPSE GENERATION -C + ELSEIF (KT .EQ. 7) THEN CALL ELPSPR (MP, KT, KNUM, COOR, LINKP, IPNTR1, IPNTR2, IPNTR3, & IP3, XCEN, YCEN, THETA1, THETA2, TANG, IDUM1, IDUM2, AVALUE, & BVALUE, ERR) IF (ERR) GOTO 140 -C + C GENERATE THE ELIPSE -C + IF (GETMAX) THEN XMAX = AMAX1 (X1, XMAX) YMAX = AMAX1 (Y1, YMAX) @@ -202,16 +180,16 @@ SUBROUTINE DLINE (MP, ML, COOR, LINKP, KNUM, KT, IP1, IP2, IP3, YMID = Y1 ENDIF 110 CONTINUE -C + C PARABOLA -C + ELSEIF (KT .EQ. 5) THEN N = 50 FAC = 1. DFF = .02 -C + C CHECK LEGITIMACY OF DATA -C + XMID = (COOR (1, IPNTR1) + COOR (1, IPNTR2)) * 0.5 YMID = (COOR (2, IPNTR1) + COOR (2, IPNTR2)) * 0.5 DOT = (COOR (1, IPNTR2) - COOR (1, IPNTR1)) * @@ -232,9 +210,9 @@ SUBROUTINE DLINE (MP, ML, COOR, LINKP, KNUM, KT, IP1, IP2, IP3, XMIN = AMIN1 (X1, XMIN) YMIN = AMIN1 (Y1, YMIN) ENDIF -C + C GET ARC LENGTH -C + HALFW = SQRT ((COOR (1, IPNTR2) - COOR (1, IPNTR1)) **2 + & (COOR (2, IPNTR2) - COOR (2, IPNTR1)) **2) * 0.5 IF (HALFW .EQ. 0.) THEN @@ -246,9 +224,9 @@ SUBROUTINE DLINE (MP, ML, COOR, LINKP, KNUM, KT, IP1, IP2, IP3, & COOR (2, IPNTR3)) **2) COEF = HEIGHT / HALFW **2 TCOEF = 2.0 * COEF -C + C PARC IS A STATEMENT FUNCTION -C + PLEFT = PARC ( - TCOEF * HALFW, TCOEF) ARCTOT = 2.0 * PARC (TCOEF * HALFW, TCOEF) ARCDEL = DFF * ARCTOT @@ -256,18 +234,18 @@ SUBROUTINE DLINE (MP, ML, COOR, LINKP, KNUM, KT, IP1, IP2, IP3, ARCNOW = 0.0 THETA = ATAN2 (COOR (2, IPNTR2) - COOR (2, IPNTR1), & COOR (1, IPNTR2) - COOR (1, IPNTR1)) -C + C CORRECT FOR ORIENTATION -C + CROSS = (COOR (1, IPNTR3) - XMID) * (COOR (2, IPNTR2) - & COOR (2, IPNTR1)) - (COOR (2, IPNTR3) - YMID) * & (COOR (1, IPNTR2) - COOR (1, IPNTR1)) IF (CROSS .LT. 0.0)THETA = THETA + PI SINT = SIN (THETA) COST = COS (THETA) -C + C FIND POINTS APPROXIMATELY BY INTEGRATION -C + XL = - HALFW FL = SQRT (1.0 + (TCOEF * XL) **2) KOUNT = 1 @@ -279,28 +257,28 @@ SUBROUTINE DLINE (MP, ML, COOR, LINKP, KNUM, KT, IP1, IP2, IP3, ARCOLD = ARCNOW ARCNOW = ARCNOW + DELX * (FL + 4.0 * FM + FR) / 3.0 IF (ARCNOW .GE. ARCNXT) THEN -C + C COMPUTE POSITION IN LOCAL COORDINATE SYSTEM -C + FRAC = (ARCNXT - ARCOLD) / (ARCNOW - ARCOLD) XK = XL + FRAC * 2.0 * DELX YK = COEF * XK **2 -C + C CORRECT FOR ORIENTATION PROBLEM -C + IF (CROSS .LT. 0.0)XK = - XK -C + C ROTATE IN LINE WITH GLOBAL COORDINATE SYSTEM -C + ROTX = XK * COST - YK * SINT ROTY = YK * COST + XK * SINT -C + C RESTORE XK -C + IF (CROSS .LT. 0.0)XK = - XK -C + C TRANSLATE -C + KOUNT = KOUNT + 1 X2 = ROTX + COOR (1, IPNTR3) Y2 = ROTY + COOR (2, IPNTR3) @@ -318,20 +296,20 @@ SUBROUTINE DLINE (MP, ML, COOR, LINKP, KNUM, KT, IP1, IP2, IP3, ENDIF X1 = X2 Y1 = Y2 -C + C PREPARE FOR NEXT POINT -C + IF (KOUNT .GE. N - 1)GOTO 130 ARCDEL = ARCDEL * FAC ARCNXT = ARCNXT + ARCDEL -C + C RESTART INTEGRATION -C + XR = XK FR = SQRT (1.0 + (TCOEF * XR) **2) -C + C CORRECT FOR INTEGRATION ERROR -C + ARCNOW = PARC (TCOEF * XR, TCOEF) - PLEFT ENDIF XL = XR @@ -341,10 +319,10 @@ SUBROUTINE DLINE (MP, ML, COOR, LINKP, KNUM, KT, IP1, IP2, IP3, XMID = COOR (1, IPNTR3) YMID = COOR (2, IPNTR3) ENDIF -C + C NORMAL EXIT C DEFINE LAST POINT EXACTLY -C + X2 = COOR (1, IPNTR2) Y2 = COOR (2, IPNTR2) IF (GETMAX) THEN @@ -360,9 +338,9 @@ SUBROUTINE DLINE (MP, ML, COOR, LINKP, KNUM, KT, IP1, IP2, IP3, & INT (X2 * 1000.), ', ', INT (Y2 * 1000.), ';' CALL MPD2VC (1, X1, Y1, X2, Y2) CALL PLTFLU -C + C PLOT THE LINE NUMBER IF DESIRED -C + IF (KNUM .GT. 0) THEN CALL MP2PT (1, XMID, YMID, X1, Y1, MASK) IF ((MOD (MASK, 2) .NE. 0).AND. (NUMPLT)) THEN @@ -370,14 +348,14 @@ SUBROUTINE DLINE (MP, ML, COOR, LINKP, KNUM, KT, IP1, IP2, IP3, CALL PLTXTH (X1, Y1, DUMMY (1:LEN)) ENDIF ENDIF -C + 140 CONTINUE -C + RETURN -C + 10000 FORMAT (A2, I6, A1) 10010 FORMAT (A5, I10, A1, I10, A6, I10, A1, I10, A1) 10020 FORMAT (' ZERO LINE LENGTH ENCOUNTERED FOR LINE', I5) 10040 FORMAT (' POINTS GIVEN FOR LINE', I5, ' DO NOT DEFINE A PARABOLA') -C + END diff --git a/packages/seacas/applications/fastq/dlpara.f b/packages/seacas/applications/fastq/dlpara.f index 3ebb98e9f6fa..75388fc720f0 100644 --- a/packages/seacas/applications/fastq/dlpara.f +++ b/packages/seacas/applications/fastq/dlpara.f @@ -1,32 +1,21 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: dlpara.f,v 1.1 1990/11/30 11:06:13 gdsjaar Exp $ -C $Log: dlpara.f,v $ -C Revision 1.1 1990/11/30 11:06:13 gdsjaar -C Initial revision -C -C -CC* FILE: [.MAIN]DLPARA.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE DLPARA (X1, Y1, X2, Y2, XM, B, BAD) C*********************************************************************** -C + C SUBROUTINE DLPARA = DETERMINES LINE PARAMETERS FROM TWO POINTS -C + C*********************************************************************** -C + C SUBROUTINE CALLED BY: C INREGN = INPUTS REGION CONNECTIVITIES -C + C*********************************************************************** -C + C VARIABLES USED: C X1 = X VALUE OF POINT 1 C X2 = X VALUE OF POINT 2 @@ -34,11 +23,11 @@ SUBROUTINE DLPARA (X1, Y1, X2, Y2, XM, B, BAD) C Y2 = Y VALUE OF POINT 2 C XM = THE SLOPE OF A STRIGHT LINE BETWEEN POINT 1 AND 2 C B = THE Y INTERCEPT OF THE STRAIGHT LINE BETWEEN POINT 1 AND 2 -C + C*********************************************************************** -C + LOGICAL BAD -C + IF (ABS (X2 - X1) .LT. 0.000001) THEN BAD = .TRUE. B = X1 diff --git a/packages/seacas/applications/fastq/dmess.f b/packages/seacas/applications/fastq/dmess.f index 7549bc22d2b4..eb423a56ccea 100644 --- a/packages/seacas/applications/fastq/dmess.f +++ b/packages/seacas/applications/fastq/dmess.f @@ -1,39 +1,20 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: dmess.f,v 1.2 2007/07/24 13:10:18 gdsjaar Exp $ -C $Log: dmess.f,v $ -C Revision 1.2 2007/07/24 13:10:18 gdsjaar -C Fix problem with boundary condition memory overwrite. -C -C Remove old ls5 and r25 terminal tests -C -C Revision 1.1.1.1 1990/11/30 11:06:17 gdsjaar -C FASTQ Version 2.0X -C -c Revision 1.1 90/11/30 11:06:16 gdsjaar -c Initial revision -c -C -CC* FILE: [.MAIN]DMESS.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE DMESS (DEV1, TEXT) C*********************************************************************** -C + C SUBROUTINE DMESS = PRINTS A ONE LINE MESSAGE AT THE BOTTOM OF THE C SCREEN -C + C*********************************************************************** -C + CHARACTER*(*) TEXT, DEV1*3 -C + CALL MESAGE (TEXT) RETURN -C + END diff --git a/packages/seacas/applications/fastq/dpread.f b/packages/seacas/applications/fastq/dpread.f index e5a1cc5d0907..2124afedd999 100644 --- a/packages/seacas/applications/fastq/dpread.f +++ b/packages/seacas/applications/fastq/dpread.f @@ -1,43 +1,32 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: dpread.f,v 1.1 1990/11/30 11:06:19 gdsjaar Exp $ -C $Log: dpread.f,v $ -C Revision 1.1 1990/11/30 11:06:19 gdsjaar -C Initial revision -C -C -CC* FILE: [.MAIN]DPREAD.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE DPREAD (X, Y, BUTTON) C*********************************************************************** -C + C SUBROUTINE DPREAD = READS INPUT FROM A DIGIPAD DIGITIZING TABLET -C + C*********************************************************************** -C + CHARACTER*1 BUTTON, DUMMY*5 -C + C SWITCH THE TERMINAL TO PASSTHROUGH MODE [5i -C + DUMMY (1:1) = '+' DUMMY (2:2) = CHAR (27) DUMMY (3:5) = '[5i' WRITE (*, ' (A)')DUMMY -C + C INPUT THE BUTTON AND X, Y PAIR FROM THE PAD -C + BUTTON = ' ' READ (*, 10000, END = 100)BUTTON, IX, IY -C + C CONVERT THE BUTTON -C + IF (BUTTON .EQ. ':') THEN BUTTON = 'A' ELSEIF (BUTTON .EQ. ';') THEN @@ -53,19 +42,19 @@ SUBROUTINE DPREAD (X, Y, BUTTON) ELSEIF (BUTTON .EQ. ' ') THEN BUTTON = 'E' END IF -C + C CONVERT (X, Y) LOCATION -C + X = IX Y = IY -C + 100 CONTINUE -C + C SWITCH THE TERMINAL OUT OF PASSTHROUGH MODE [4i -C + WRITE (*, ' (A)')' '//CHAR (27)//'[4i' RETURN -C + 10000 FORMAT (A1, I5, 1X, I5) -C + END diff --git a/packages/seacas/applications/fastq/dread.f b/packages/seacas/applications/fastq/dread.f index 0e76448e26f8..373d3f092c8c 100644 --- a/packages/seacas/applications/fastq/dread.f +++ b/packages/seacas/applications/fastq/dread.f @@ -1,41 +1,21 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: dread.f,v 1.2 1998/07/14 18:18:42 gdsjaar Exp $ -C $Log: dread.f,v $ -C Revision 1.2 1998/07/14 18:18:42 gdsjaar -C Removed unused variables, cleaned up a little. -C -C Changed BLUE labels to GREEN to help visibility on black background -C (indirectly requested by a couple users) -C -C Revision 1.1.1.1 1990/11/30 11:06:24 gdsjaar -C FASTQ Version 2.0X -C -c Revision 1.1 90/11/30 11:06:21 gdsjaar -c Initial revision -c -C -CC* FILE: [.MAIN]DREAD.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE DREAD (X, Y, BUTTON, X1, Y1, XX1, YY1, SCALE, CT, ST) C*********************************************************************** -C + C SUBROUTINE DREAD = SETS ALL PARAMETERS UP FOR READING FROM A DIGI-PAD -C + C*********************************************************************** -C + C SUBROUTINES CALLED: C DPREAD = READS INPUT FROM A DIGI-PAD DIGITIZER -C + C*********************************************************************** -C + C VARIABLES USED: C X = THE X LOCATION IN USER COORDINATES C Y = THE Y LOCATION IN USER COORDINATES @@ -51,11 +31,11 @@ SUBROUTINE DREAD (X, Y, BUTTON, X1, Y1, XX1, YY1, SCALE, CT, ST) C YNEW = THE NEW DIGITIZED Y VALUE BEFORE TRANSFORMATIONS C NCB = THE NUMBER OF BUTTONS ON THE MOUSE (BIT-PAD-ONE) C DEL = THE DELTA DISTANCE BETWEEN ACCEPTABLE POINTS (TALOS) -C + C*********************************************************************** -C + CHARACTER*1 BUTTON -C + CALL DPREAD (XNEW, YNEW, BUTTON) XNEW = XNEW - XX1 YNEW = YNEW - YY1 diff --git a/packages/seacas/applications/fastq/dstort.f b/packages/seacas/applications/fastq/dstort.f index 0391177b1fb9..0f0e9f6e2006 100644 --- a/packages/seacas/applications/fastq/dstort.f +++ b/packages/seacas/applications/fastq/dstort.f @@ -1,45 +1,26 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: dstort.f,v 1.2 2000/11/13 15:39:04 gdsjaar Exp $ -C $Log: dstort.f,v $ -C Revision 1.2 2000/11/13 15:39:04 gdsjaar -C Cleaned up unused variables and labels. -C -C Removed some real to int conversion warnings. -C -C Revision 1.1.1.1 1990/11/30 11:06:27 gdsjaar -C FASTQ Version 2.0X -C -c Revision 1.1 90/11/30 11:06:25 gdsjaar -c Initial revision -c -C -CC* FILE: [.PAVING]DSTORT.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE DSTORT (X1, X2, X3, X4, Y1, Y2, Y3, Y4, VALUE) C*********************************************************************** -C + C SUBROUTINE DSTORT = CALCULATES A DISTORTION METRIC FOR AN ELEMENT C USING THE IDEAS IN THE PAPER BY ODDY, 1988. -C + C*********************************************************************** -C + C SETUP THE JACOBIAN MATRIX -C + XJ11 = (X1 * .125) + (X2 * .375) - (X3 * .375) - (X4 * .125) XJ12 = (Y1 * .125) + (Y2 * .375) - (Y3 * .375) - (Y4 * .125) XJ21 = - (X1 * .375) + (X2 * .375) + (X3 * .125) - (X4 * .125) XJ22 = - (Y1 * .375) + (Y2 * .375) + (Y3 * .125) - (Y4 * .125) -C + C NORMALIZE THE JACOBIAN WITH RESPECT TO THE ELEMENT SIZE -C + DETERM = (XJ11 * XJ22) - (XJ12 * XJ21) IF (DETERM .LE. 0.) THEN VALUE = 1.0E10 @@ -50,17 +31,17 @@ SUBROUTINE DSTORT (X1, X2, X3, X4, Y1, Y2, Y3, Y4, VALUE) XJ12 = XJ12 * FACTOR XJ21 = XJ21 * FACTOR XJ22 = XJ22 * FACTOR -C + C NOW USE THE SECOND INVARIANT OF GREEN'S STRAIN -C + C11 = XJ11*XJ11 + XJ21*XJ21 C12 = XJ11*XJ12 + XJ21*XJ22 C22 = XJ12*XJ12 + XJ22*XJ22 -C + VALUE = C11**2 + 2.*(C12**2) + C22**2 - & (.5 * (C11+C22)**2 ) VALUE = AMAX1 (VALUE, 0.) -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/elaray.f b/packages/seacas/applications/fastq/elaray.f index 2bf487b8d0fb..34ab4e9ef555 100644 --- a/packages/seacas/applications/fastq/elaray.f +++ b/packages/seacas/applications/fastq/elaray.f @@ -1,49 +1,27 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: elaray.f,v 1.3 2000/11/13 15:39:04 gdsjaar Exp $ -C $Log: elaray.f,v $ -C Revision 1.3 2000/11/13 15:39:04 gdsjaar -C Cleaned up unused variables and labels. -C -C Removed some real to int conversion warnings. -C -C Revision 1.2 1991/04/10 19:56:49 gdsjaar -C Fixed some logical variables -C -c Revision 1.1.1.1 1990/11/30 11:06:29 gdsjaar -c FASTQ Version 2.0X -c -c Revision 1.1 90/11/30 11:06:28 gdsjaar -c Initial revision -c -C -CC* FILE: [.MAIN]ELARAY.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE ELARAY (XNOLD, YNOLD, NXKOLD, MMPOLD, LINKEG, LISTEG, & MLINK, NPROLD, NPNOLD, NPEOLD, NNXK, XMIN, XMAX, YMIN, YMAX, & IDIVIS) C*********************************************************************** -C + C SUBROUTINE ELARAY = PUTS ELEMENTS INTO AN ARRAY BASED ON THEIR C PHYSICAL LOCATION -C + C*********************************************************************** -C + DIMENSION XNOLD(NPNOLD), YNOLD(NPNOLD) DIMENSION NXKOLD(NNXK, NPEOLD), MMPOLD(3, NPROLD) DIMENSION LINKEG(2, MLINK), LISTEG(4 * NPEOLD) -C + LOGICAL LCROSS, INSIDE -C + C FIND THE EXTREMES FOR THE MESH DATA -C + XMIN = XNOLD(1) XMAX = XNOLD(1) YMIN = YNOLD(1) @@ -54,11 +32,11 @@ SUBROUTINE ELARAY (XNOLD, YNOLD, NXKOLD, MMPOLD, LINKEG, LISTEG, YMIN = AMIN1 (YMIN, YNOLD(I)) YMAX = AMAX1 (YMAX, YNOLD(I)) 100 CONTINUE -C + C SET UP THE SIZE OF THE ARRAY BASED ON THE MLINK DIMENSION C IF MLINK = 55 THEN THERE ARE 5 COLUMNS AND 5 ROWS C = 66 THEN THERE ARE 6 COLUMNS AND 6 ROWS, ETC. -C + IF (MLINK .EQ. 22) THEN IDIVIS = 2 ELSE IF (MLINK .EQ. 33) THEN @@ -76,12 +54,12 @@ SUBROUTINE ELARAY (XNOLD, YNOLD, NXKOLD, MMPOLD, LINKEG, LISTEG, ELSE IF (MLINK .EQ. 99) THEN IDIVIS = 9 ENDIF -C + C NOW THE ELEMENTS MUST BE SORTED INTO ANY ARRAY SPACE THAT THE ELEMENT C CROSSES. THE ARRAY IS LOGICALLY A SQUARE, BUT PHYSICALLY CAN BE C RECTANGULAR SINCE THE X AND Y EXTREMES MAY FORM ANY SIZE RECTANGLE. C ROWS FIRST IN THE ARRAY AND THEN COLUMNS. -C + XDELTA = (XMAX - XMIN) / DBLE(IDIVIS) YDELTA = (YMAX - YMIN) / DBLE(IDIVIS) KOUNT = 0 @@ -110,16 +88,16 @@ SUBROUTINE ELARAY (XNOLD, YNOLD, NXKOLD, MMPOLD, LINKEG, LISTEG, INDEX = ((IDIVIS - J + 1) * 10) + I LINKEG (1, INDEX) = KOUNT + 1 LINKEG (2, INDEX) = 0 -C + C ONLY CHECK ELEMENTS OF THE SAME MATERIAL ID (BLOCK ID) -C + DO 140 KELEM = 1, NPEOLD DO 120 ICON = 1, 4 X1 = XNOLD (NXKOLD (ICON, KELEM)) Y1 = YNOLD (NXKOLD (ICON, KELEM)) -C + C TEST TO SEE IF THE NODE FITS IN THE GRID -C + IF ( ((X1 .LE. XU) .AND. (X1 .GE. XL)) .AND. & ((Y1 .LE. YU) .AND. (Y1 .GE. YL)) ) THEN KOUNT = KOUNT + 1 @@ -132,9 +110,9 @@ SUBROUTINE ELARAY (XNOLD, YNOLD, NXKOLD, MMPOLD, LINKEG, LISTEG, LISTEG (KOUNT) = KELEM GOTO 130 ENDIF -C + C TEST TO SEE IF THE EDGE OF THE ELEMENT CROSSES THE GRID -C + IF (ICON .EQ. 4) THEN JCON = 1 ELSE @@ -161,9 +139,9 @@ SUBROUTINE ELARAY (XNOLD, YNOLD, NXKOLD, MMPOLD, LINKEG, LISTEG, LISTEG (KOUNT) = KELEM GOTO 130 ENDIF -C + C OTHERWISE TEST TO SEE IF THE ELEMENT COMPLETELY ENCLOSES THE GRID -C + XEMIN = XNOLD (NXKOLD (1, KELEM)) XEMAX = XNOLD (NXKOLD (1, KELEM)) YEMIN = YNOLD (NXKOLD (1, KELEM)) @@ -192,17 +170,17 @@ SUBROUTINE ELARAY (XNOLD, YNOLD, NXKOLD, MMPOLD, LINKEG, LISTEG, LISTEG (KOUNT) = KELEM GOTO 130 ENDIF -C + 120 CONTINUE 130 CONTINUE -C + 140 CONTINUE -C + 150 CONTINUE 160 CONTINUE -C + 170 CONTINUE RETURN -C + END diff --git a/packages/seacas/applications/fastq/elipse.f b/packages/seacas/applications/fastq/elipse.f index c06f9cff8f52..97647ead1451 100644 --- a/packages/seacas/applications/fastq/elipse.f +++ b/packages/seacas/applications/fastq/elipse.f @@ -1,34 +1,17 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: elipse.f,v 1.2 1991/03/21 15:44:37 gdsjaar Exp $ -C $Log: elipse.f,v $ -C Revision 1.2 1991/03/21 15:44:37 gdsjaar -C Changed all 3.14159... to atan2(0.0, -1.0) -C -c Revision 1.1.1.1 1990/11/30 11:06:32 gdsjaar -c FASTQ Version 2.0X -c -c Revision 1.1 90/11/30 11:06:31 gdsjaar -c Initial revision -c -C -CC* FILE: [.MAIN]ELIPSE.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C REAL FUNCTION ELIPSE (A7, A8, A2, ANG) C*********************************************************************** -C + C FUNCTION ELIPSE = CALCULATES THE ANGULAR EQUATION ERROR WHEN FINDING C AN ELIPSE PATTERN -C + C*********************************************************************** -C + PI = ATAN2(0.0, -1.0) A4 = A8 - ANG A5 = A7 - ANG @@ -36,5 +19,5 @@ REAL FUNCTION ELIPSE (A7, A8, A2, ANG) A6 = PI - A5 - A2 ELIPSE = SIN(A4) * SIN(A6) - SIN(A5) * SIN (A3) RETURN -C + END diff --git a/packages/seacas/applications/fastq/elpspr.f b/packages/seacas/applications/fastq/elpspr.f index cf2958c8d3e5..0a324f0ec747 100644 --- a/packages/seacas/applications/fastq/elpspr.f +++ b/packages/seacas/applications/fastq/elpspr.f @@ -1,35 +1,18 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: elpspr.f,v 1.2 1991/03/21 15:44:38 gdsjaar Exp $ -C $Log: elpspr.f,v $ -C Revision 1.2 1991/03/21 15:44:38 gdsjaar -C Changed all 3.14159... to atan2(0.0, -1.0) -C -c Revision 1.1.1.1 1990/11/30 11:06:35 gdsjaar -c FASTQ Version 2.0X -c -c Revision 1.1 90/11/30 11:06:34 gdsjaar -c Initial revision -c -C -CC* FILE: [.MAIN]ELPSPR.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE ELPSPR (MP, KT, KNUM, COOR, LINKP, IPNTR1, IPNTR2, & IPNTR3, IP3, XCEN, YCEN, THETA1, THETA2, TANG, ICCW, ICW, & AVALUE, BVALUE, ERR) C*********************************************************************** -C + C SUBROUTINE ELPSPR = THIS ROUTINE CALCULATES THE ELIPSE PARAMETERS -C + C*********************************************************************** -C + C VARIABLES USED: C TANG = TOTAL ANGLE SCRIBED BY THE ARC C THETA1 = FIRST CCW ANGLE OF THE ARC @@ -38,25 +21,25 @@ SUBROUTINE ELPSPR (MP, KT, KNUM, COOR, LINKP, IPNTR1, IPNTR2, C IPNTR2 = POINTER TO SECOND COORDINATE VALUE C IPNTR3 = POINTER TO THIRD COORDINATE VALUE C IP3 = THE THIRD POINT NUMBER (CAN BE NEGATED) -C + C*********************************************************************** -C + DIMENSION COOR (2, MP), LINKP (2, MP) -C + LOGICAL ERR -C + PI = ATAN2(0.0, -1.0) -C + TWOPI = PI + PI ERR = .FALSE. -C + C ELIPSE GOES FROM 1ST POINT TO 2ND IN *COUNTER-CLOCKWISE* DIRECTION. -C + XCEN = COOR (1, IPNTR3) YCEN = COOR (2, IPNTR3) -C + C CHECK TO MAKE SURE THAT THE BEGINNING AND ENDING RADIUS EXIST -C + IF (( (COOR (1, IPNTR1) .EQ. XCEN).AND. & (COOR (2,IPNTR1) .EQ. YCEN)).OR. & ((COOR (1, IPNTR2) .EQ. XCEN).AND. @@ -68,16 +51,16 @@ SUBROUTINE ELPSPR (MP, KT, KNUM, COOR, LINKP, IPNTR1, IPNTR2, ENDIF THETA1 = ATAN2 (COOR (2, IPNTR1) - YCEN, COOR (1, IPNTR1) - XCEN) THETA2 = ATAN2 (COOR (2, IPNTR2) - YCEN, COOR (1, IPNTR2) - XCEN) -C + C NOW CALCULATE THE MAJOR AXIS (AVALUE) AND THE MINOR AXIS (BVALUE) -C + X1 = COOR (1, IPNTR1) - XCEN Y1 = COOR (2, IPNTR1) - YCEN X2 = COOR (1, IPNTR2) - XCEN Y2 = COOR (2, IPNTR2) - YCEN -C + C CHOOSE THE APPROPRIATE ELIPSE DEFINITION -C + IF (Y1 * Y1 .EQ. Y2 * Y2) THEN AVALUE = SQRT (X1 * X1 + Y1 * Y1) BVALUE = AVALUE @@ -127,22 +110,22 @@ SUBROUTINE ELPSPR (MP, KT, KNUM, COOR, LINKP, IPNTR1, IPNTR2, A2 = ABS (ATAN2 (Y2, X2)) THETA1 = ABS(ATAN2 (VY, 1.)) ENDIF -C + RADMAX = MAX(A7,A8) CALL ETHETA (A7, A8, A2, THETA1, RADMAX, THETA, ERR) IF (ERR) THEN WRITE (*, 10010) ABS (KNUM) GOTO 100 ENDIF -C + CVALUE = D0 * SIN (A8 - THETA) / SIN (A2 - A8 + THETA) BVALUE = SQRT (ABS (CVALUE **2 / (RATIO **2 - 1)) ) AVALUE = BVALUE * RATIO ENDIF ENDIF -C + C NOW GET THE ANGLES GOING THE RIGHT WAY -C + THETA1 = ATAN2 (COOR (2, IPNTR1) - YCEN, COOR (1, IPNTR1) - XCEN) THETA2 = ATAN2 (COOR (2, IPNTR2) - YCEN, COOR (1, IPNTR2) - XCEN) IF (IPNTR1 .EQ. IPNTR2) THEN @@ -160,13 +143,13 @@ SUBROUTINE ELPSPR (MP, KT, KNUM, COOR, LINKP, IPNTR1, IPNTR2, ICCW = IPNTR1 ICW = IPNTR2 ENDIF -C + 100 CONTINUE -C + RETURN -C + 10000 FORMAT (' CENTER POINT FOR LINE', I5, ' LIES ON ONE OF', & ' THE ENDPOINTS') 10010 FORMAT (' POINTS GIVEN FOR LINE', I5, ' DO NOT DEFINE AN ELIPSE') -C + END diff --git a/packages/seacas/applications/fastq/endtan.f b/packages/seacas/applications/fastq/endtan.f index 6c8b5d160e3b..5e21ab3a9187 100644 --- a/packages/seacas/applications/fastq/endtan.f +++ b/packages/seacas/applications/fastq/endtan.f @@ -1,35 +1,18 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: endtan.f,v 1.2 1991/03/21 15:44:40 gdsjaar Exp $ -C $Log: endtan.f,v $ -C Revision 1.2 1991/03/21 15:44:40 gdsjaar -C Changed all 3.14159... to atan2(0.0, -1.0) -C -c Revision 1.1.1.1 1990/11/30 11:06:38 gdsjaar -c FASTQ Version 2.0X -c -c Revision 1.1 90/11/30 11:06:37 gdsjaar -c Initial revision -c -C -CC* FILE: [.MAIN]ENDTAN.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE ENDTAN (MP, ML, N, IPOINT, COOR, LTYPE, LCON, LINKP, & LINKL, LNUM, LPNTR, NP, THETA, ERR) C*********************************************************************** -C + C SUBROUTINE ENDTAN = GETS THE ANGLE FOR THE TANGENT AT THE END OF C A LINE -C + C*********************************************************************** -C + C VARIABLES USED: LNUM = LINE NUMBER C LPNTR = LINE POINTER C VECTX = X VECTOR @@ -42,23 +25,23 @@ SUBROUTINE ENDTAN (MP, ML, N, IPOINT, COOR, LTYPE, LCON, LINKP, C J1 = THE FIRST POINT NUMBER INDEX C J2 = THE SECOND POINT NUMBER INDEX C J3 = THE THIRD POINT NUMBER INDEX -C + C*********************************************************************** -C + DIMENSION IPOINT (MP), COOR (2, MP), LTYPE (ML), LCON (3, ML) DIMENSION LINKP (2, MP), LINKL (2, ML) DIMENSION N (29) -C + LOGICAL ADDLNK, ERR -C + PI = ATAN2(0.0, -1.0) -C + TWOPI = PI + PI ADDLNK = .FALSE. ERR = .FALSE. -C + C GET THE POINTERS TO THE POINTS THAT DEFINE THE LINE -C + I1 = LCON (1, LPNTR) I2 = LCON (2, LPNTR) I3 = LCON (3, LPNTR) @@ -71,9 +54,9 @@ SUBROUTINE ENDTAN (MP, ML, N, IPOINT, COOR, LTYPE, LCON, LINKP, ELSE J3 = 0 ENDIF -C + C STRAIGHT LINE END TANGENT -C + IF (LTYPE (LPNTR) .EQ. 1) THEN IF (I1 .EQ. NP) THEN VECTX = COOR (1, J2) - COOR (1, J1) @@ -86,16 +69,16 @@ SUBROUTINE ENDTAN (MP, ML, N, IPOINT, COOR, LTYPE, LCON, LINKP, RETURN ENDIF THETA = ATAN2 (VECTY, VECTX) -C + C ARC LINE END TANGENT -C + ELSEIF (LTYPE (LPNTR) .NE. 5) THEN CALL ARCPAR (MP, LTYPE (LPNTR), LNUM, COOR, LINKP, & J1, J2, J3, I3, XCEN, YCEN, THETA1, THETA2, TANG, & R1, R2, ERR, ICCW, ICW, XK, XA) -C + C CHECK FOR THE A CLOSED ARC -C + IF (IPOINT (ICCW) .EQ. IPOINT (ICW)) THEN THETA = THETA2 + (PI * .5) ELSEIF (NP .EQ. IPOINT (ICCW)) THEN @@ -106,23 +89,23 @@ SUBROUTINE ENDTAN (MP, ML, N, IPOINT, COOR, LTYPE, LCON, LINKP, ERR = .TRUE. RETURN ENDIF -C + C NO OTHER LINES SUPPORTED -C + ELSE ERR = .TRUE. CALL MESAGE ('UNSUPPORTED LINE TYPE IN ENDTAN') RETURN ENDIF -C + C MAKE SURE THAT THETA IS BETWEEN 0 AND 2PI -C + IF (THETA .LT. 0) THEN THETA = THETA + TWOPI ELSEIF (THETA .GT. TWOPI) THEN THETA = THETA - TWOPI ENDIF -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/eqlang.f b/packages/seacas/applications/fastq/eqlang.f index 3124cc50122c..8a434a56abf8 100644 --- a/packages/seacas/applications/fastq/eqlang.f +++ b/packages/seacas/applications/fastq/eqlang.f @@ -1,46 +1,29 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: eqlang.f,v 1.2 1991/03/21 15:44:42 gdsjaar Exp $ -C $Log: eqlang.f,v $ -C Revision 1.2 1991/03/21 15:44:42 gdsjaar -C Changed all 3.14159... to atan2(0.0, -1.0) -C -c Revision 1.1.1.1 1990/11/30 11:06:41 gdsjaar -c FASTQ Version 2.0X -c -c Revision 1.1 90/11/30 11:06:39 gdsjaar -c Initial revision -c -C -CC* FILE: [.PAVING]EQLANG.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE EQLANG (MXND, XN, YN, LXN, NODE, N0, N2, NFROM, DIST, & VRO, XDEL, YDEL) C*********************************************************************** -C + C SUBROUTINE EQLANG = CALCULATES A VECTOR SUM THAT ATTEMPTS TO C MAINTAIN EQUAL ANGLES FOR A NODE -C + C*********************************************************************** -C + DIMENSION XN(MXND), YN(MXND), LXN(4, MXND) -C + LOGICAL EXPAND -C + PI = ATAN2(0.0, -1.0) TWOPI = 2.0 * PI IF (NFROM .GT. 0) THEN -C + C TEST FOR THE EXPANSION CASE -C + IF ( ( ((LXN (4, NFROM) .NE. 0) .AND. & (LXN (2, NFROM) .LT. 0)) .OR. & ((LXN (4, NFROM) .LT. 0) .AND. @@ -51,21 +34,21 @@ SUBROUTINE EQLANG (MXND, XN, YN, LXN, NODE, N0, N2, NFROM, DIST, ELSE EXPAND = .FALSE. ENDIF -C + ANG1 = ATAN2 ( YN (N2) - YN (NFROM), XN (N2) - XN (NFROM)) IF (ANG1 .LT. 0.) ANG1 = ANG1 + TWOPI ANG2 = ATAN2 ( YN (N0) - YN (NFROM), XN (N0) - XN (NFROM)) IF (ANG2 .LT. 0.) ANG2 = ANG2 + TWOPI ANG3 = ATAN2 ( YN (NODE) - YN (NFROM), XN (NODE) - XN (NFROM)) IF (ANG3 .LT. 0.) ANG3 = ANG3 + TWOPI -C + C GET THE APPROPRIATE ANGLE BETWEEN ANGLE 1 AND 2 -C + ANG12D = ANG2 - ANG1 IF (ANG12D .LT. 0.) ANG12D = ANG12D + TWOPI -C + C IF THIS IS AN EXPANSION, THEN ADJUST THE ANGLE ACCORDINGLY -C + IF (EXPAND) THEN IF (LXN (3, N2) .EQ. 0) THEN ANG12 = ANG1 + (ANG12D * .6) @@ -78,9 +61,9 @@ SUBROUTINE EQLANG (MXND, XN, YN, LXN, NODE, N0, N2, NFROM, DIST, ANG12 = ANG1 + (ANG12D * .5) ENDIF IF (ANG12 .GT. TWOPI) ANG12 = ANG12 - TWOPI -C + C GET THE AVERAGE ANGLE BETWEEN ANGLE 12 AND 3 -C + IF (ANG12 .GT. ANG3) THEN ANG3D = ANG12 - ANG3 IF (ANG3D .GT. PI) THEN @@ -96,9 +79,9 @@ SUBROUTINE EQLANG (MXND, XN, YN, LXN, NODE, N0, N2, NFROM, DIST, ANG = ANG3 - (ANG3D * .5) ENDIF ENDIF -C + C GET THE DISTANCE TO MAKE THE OUTSIDE FLAT AT THIS ANGLE -C + D1 = SQRT ( ((XN (NFROM) - XN (N0)) ** 2) + & ((YN (NFROM) - YN (N0)) ** 2) ) D2 = SQRT ( ((XN (N2) - XN (N0)) ** 2) + @@ -110,7 +93,7 @@ SUBROUTINE EQLANG (MXND, XN, YN, LXN, NODE, N0, N2, NFROM, DIST, IF (ARG .LT. -1.0) ARG = -1.0 BETA = ASIN (ARG) D0 = (D3 * SIN (BETA)) / SIN (PI - BETA - (ANG12D * .5)) -C + IF (D0 .GT. DIST) THEN IF (EXPAND) THEN DIST0 = D0 @@ -120,19 +103,19 @@ SUBROUTINE EQLANG (MXND, XN, YN, LXN, NODE, N0, N2, NFROM, DIST, ELSE DIST0 = DIST ENDIF -C + C CALCULATE THE NEW COORDINATES -C + X0 = XN (NFROM) + (COS (ANG) * DIST0) Y0 = YN (NFROM) + (SIN (ANG) * DIST0) XDEL = (X0 - XN (NODE)) * VRO YDEL = (Y0 - YN (NODE)) * VRO -C + ELSE XDEL = 0. YDEL = 0. ENDIF -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/erase.F b/packages/seacas/applications/fastq/erase.F index f04dfe8677e9..eaa57304821f 100644 --- a/packages/seacas/applications/fastq/erase.F +++ b/packages/seacas/applications/fastq/erase.F @@ -1,37 +1,19 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: erase.F,v 1.1 1998/04/10 04:30:12 gdsjaar Exp $ -C $Log: erase.F,v $ -C Revision 1.1 1998/04/10 04:30:12 gdsjaar -C Added the ifdef needsdoubleescape to the graphics symbol -C plotting. Required moving some .f to .F files and specifying in Imakefile -C -C Revision 1.1.1.1 1990/11/30 11:06:44 gdsjaar -C FASTQ Version 2.0X -C -c Revision 1.1 90/11/30 11:06:42 gdsjaar -c Initial revision -c -C -CC* FILE: [.MAIN]ERASE.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE ERASE (MP, ML, MS, MR, N, COOR, ILINE, LTYPE, LCON, & NLPS, IFLINE, ILLIST, NSPR, IFSIDE, ISLIST, LINKP, LINKL, & LINKS, LINKR, IBAD, ALPHA) C*********************************************************************** -C + C SUBROUTINE ERASE = ERASES A POINT, AND ALL DATA DEPENDENT ON THAT C POINT (I.E. LINES, SIDES, OR REGIONS) -C + C*********************************************************************** -C + DIMENSION COOR (2, MP), ILINE (ML), LTYPE (ML), LCON (3, ML) DIMENSION NLPS (MS) DIMENSION IFLINE (MS), ILLIST (MS * 3), NSPR (MR), IFSIDE (MR) @@ -39,17 +21,17 @@ SUBROUTINE ERASE (MP, ML, MS, MR, N, COOR, ILINE, LTYPE, LCON, DIMENSION LINKP (2, MP), LINKL (2, ML), LINKS (2, MS) DIMENSION LINKR (2, MR) DIMENSION N (29) -C + LOGICAL NUMPLT, ALPHA, ADDLNK, TEST, GETMAX -C + IZ = 0 KNUM = 0 ADDLNK = .FALSE. TEST = .FALSE. GETMAX = .FALSE. -C + C ERASE ANY REGIONS USING THAT POINT -C + DO 140 I = 1, N (22) CALL LTSORT (MR, LINKR, I, II, ADDLNK) IF (II .GT. 0) THEN @@ -110,9 +92,9 @@ SUBROUTINE ERASE (MP, ML, MS, MR, N, COOR, ILINE, LTYPE, LCON, ENDIF ENDIF 140 CONTINUE -C + C ERASE ANY SIDES USING THAT POINT -C + DO 180 I = 1, N (20) CALL LTSORT (MS, LINKS, I, II, ADDLNK) IF (II .GT. 0) THEN @@ -130,9 +112,9 @@ SUBROUTINE ERASE (MP, ML, MS, MR, N, COOR, ILINE, LTYPE, LCON, 170 CONTINUE ENDIF 180 CONTINUE -C + C ERASE ANY LINES USING THAT POINT -C + DO 210 I = 1, N (19) CALL LTSORT (ML, LINKL, I, II, ADDLNK) IF (II .GT. 0) THEN @@ -167,9 +149,9 @@ SUBROUTINE ERASE (MP, ML, MS, MR, N, COOR, ILINE, LTYPE, LCON, 200 CONTINUE ENDIF 210 CONTINUE -C + C DELETE THE POINT -C + ADDLNK = .FALSE. CALL LTSORT (MP, LINKP, IBAD, II, ADDLNK) ADDLNK = .TRUE. @@ -182,7 +164,7 @@ SUBROUTINE ERASE (MP, ML, MS, MR, N, COOR, ILINE, LTYPE, LCON, #endif CALL PLTFLU ENDIF -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/erasec.f b/packages/seacas/applications/fastq/erasec.f index 34522814f891..610276f78b96 100644 --- a/packages/seacas/applications/fastq/erasec.f +++ b/packages/seacas/applications/fastq/erasec.f @@ -1,33 +1,22 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: erasec.f,v 1.1 1990/11/30 11:06:45 gdsjaar Exp $ -C $Log: erasec.f,v $ -C Revision 1.1 1990/11/30 11:06:45 gdsjaar -C Initial revision -C -C -CC* FILE: [.MAIN]ERASEC.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE ERASEC (OLDCUR) C*********************************************************************** -C + C SUBROUTINE ERASEC = DEACTIVATES THE CROSSHAIRS -C + C*********************************************************************** -C + LOGICAL OLDCUR -C + IF (OLDCUR) THEN WRITE (*,*) CHAR(27)//'G0' OLDCUR = .FALSE. ENDIF RETURN -C + END diff --git a/packages/seacas/applications/fastq/erasel.F b/packages/seacas/applications/fastq/erasel.F index 8a3a39f048d6..48c0b20b54cf 100644 --- a/packages/seacas/applications/fastq/erasel.F +++ b/packages/seacas/applications/fastq/erasel.F @@ -1,52 +1,34 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: erasel.F,v 1.1 1998/04/10 04:30:15 gdsjaar Exp $ -C $Log: erasel.F,v $ -C Revision 1.1 1998/04/10 04:30:15 gdsjaar -C Added the ifdef needsdoubleescape to the graphics symbol -C plotting. Required moving some .f to .F files and specifying in Imakefile -C -C Revision 1.1.1.1 1990/11/30 11:06:49 gdsjaar -C FASTQ Version 2.0X -C -c Revision 1.1 90/11/30 11:06:48 gdsjaar -c Initial revision -c -C -CC* FILE: [.MAIN]ERASEL.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE ERASEL (MP, ML, MS, MR, N, COOR, ILINE, LTYPE, LCON, & NLPS, IFLINE, ILLIST, NSPR, IFSIDE, ISLIST, LINKP, LINKL, & LINKS, LINKR, IBAD, ALPHA) C*********************************************************************** -C + C SUBROUTINE ERASEL = ERASES A LINE, AND ALL DATA DEPENDENT ON THAT C LINE (I.E. SIDES OR REGIONS) -C + C*********************************************************************** -C + DIMENSION COOR(2, MP), ILINE(ML), LTYPE(ML), LCON(3, ML), NLPS(MS) DIMENSION NSPR(MR), IFLINE(MS), ILLIST(MS*3), IFSIDE(MR) DIMENSION ISLIST(MR*4), LINKP(2, MP), LINKL(2, ML), LINKS(2, MS) DIMENSION LINKR(2, MR), N(29) -C + LOGICAL NUMPLT, ALPHA, ADDLNK, TEST, GETMAX -C + IZ = 0 KNUM = 0 ADDLNK = .FALSE. TEST = .FALSE. GETMAX = .FALSE. -C + C ERASE ANY REGIONS USING THAT LINE -C + DO 120 I = 1, N(22) CALL LTSORT(MR, LINKR, I, II, ADDLNK) IF (II .GT. 0) THEN @@ -71,7 +53,7 @@ SUBROUTINE ERASEL (MP, ML, MS, MR, N, COOR, ILINE, LTYPE, LCON, END IF END IF 110 CONTINUE -C + CALL LTSORT(MR, LINKR, I, IPNTR, ADDLNK) IF ((.NOT.ALPHA) .AND. (IPNTR .LE. 0)) THEN CALL REGEXT (MP, ML, MS, MR, N, II, COOR, ILINE, @@ -89,9 +71,9 @@ SUBROUTINE ERASEL (MP, ML, MS, MR, N, COOR, ILINE, LTYPE, LCON, END IF END IF 120 CONTINUE -C + C ERASE ANY SIDES USING THAT LINE -C + DO 150 I = 1, N(20) CALL LTSORT(MS, LINKS, I, II, ADDLNK) IF (II .GT. 0) THEN @@ -107,9 +89,9 @@ SUBROUTINE ERASEL (MP, ML, MS, MR, N, COOR, ILINE, LTYPE, LCON, 140 CONTINUE END IF 150 CONTINUE -C + C DELETE THE LINE -C + CALL LTSORT(ML, LINKL, IBAD, II, ADDLNK) IF (II .GT. 0) THEN LT = LTYPE(II) @@ -136,7 +118,7 @@ SUBROUTINE ERASEL (MP, ML, MS, MR, N, COOR, ILINE, LTYPE, LCON, CALL LTSORT(ML, LINKL, IBAD, IZ, ADDLNK) ADDLNK = .FALSE. END IF -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/esolve.f b/packages/seacas/applications/fastq/esolve.f index c4dcda55437a..6d5ad5a1b157 100644 --- a/packages/seacas/applications/fastq/esolve.f +++ b/packages/seacas/applications/fastq/esolve.f @@ -1,30 +1,19 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: esolve.f,v 1.1 1990/11/30 11:06:51 gdsjaar Exp $ -C $Log: esolve.f,v $ -C Revision 1.1 1990/11/30 11:06:51 gdsjaar -C Initial revision -C -C -CC* FILE: [.MAIN]ESOLVE.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C REAL FUNCTION ESOLVE (A7, A8, A2, ANG1, ANG2) C*********************************************************************** -C + C FUNCTION ESOLVE = FINDS A SOLUTION TO THE ELIPSE EQUATION C GIVEN AN INTERVAL THAT CONTAINS THE SOLUTION -C + C*********************************************************************** -C + EPS = 1.E-6 -C + F1 = ELIPSE (A7, A8, A2, ANG1) IF (ABS(F1) .LT. EPS) THEN ESOLVE = ANG1 @@ -35,14 +24,14 @@ REAL FUNCTION ESOLVE (A7, A8, A2, ANG1, ANG2) ESOLVE = ANG2 GO TO 110 END IF -C + 100 CONTINUE IF (ABS(ANG1 - ANG2) .LT. EPS) THEN ESOLVE = (ANG1 + ANG2)/2.0 ELSE ANG3 = (ANG1 + ANG2)/2.0 F3 = ELIPSE (A7, A8, A2, ANG3) -C + IF (ABS(F3) .LT. EPS) THEN ESOLVE = ANG3 GO TO 110 @@ -55,9 +44,9 @@ REAL FUNCTION ESOLVE (A7, A8, A2, ANG1, ANG2) END IF GO TO 100 END IF -C + 110 CONTINUE -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/etheta.f b/packages/seacas/applications/fastq/etheta.f index 92b53404555c..db1cf10e6497 100644 --- a/packages/seacas/applications/fastq/etheta.f +++ b/packages/seacas/applications/fastq/etheta.f @@ -1,42 +1,22 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: etheta.f,v 1.2 1998/07/14 18:18:44 gdsjaar Exp $ -C $Log: etheta.f,v $ -C Revision 1.2 1998/07/14 18:18:44 gdsjaar -C Removed unused variables, cleaned up a little. -C -C Changed BLUE labels to GREEN to help visibility on black background -C (indirectly requested by a couple users) -C -C Revision 1.1.1.1 1990/11/30 11:06:56 gdsjaar -C FASTQ Version 2.0X -C -c Revision 1.1 90/11/30 11:06:53 gdsjaar -c Initial revision -c -C -CC* FILE: [.MAIN]ETHETA.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE ETHETA (A7, A8, A2, THETA1, THETA2, THETA, ERR) C*********************************************************************** -C + C SUBROUTINE ETHETA = ITERATIVELY SOLVES THE ELIPTICAL PROBLEM OF C FINDING AN "A" DISTANCE GIVEN TWO POINTS ON C THE ELIPSE AND A CENTER POINT -C + C*********************************************************************** -C + LOGICAL ERR -C + C START WITH 20 INCREMENTS, EACH PASS INCREMENTS DECREASE TEN FOLD -C + ANGINC = (THETA2 - THETA1) * .05 ANG = THETA1 F1 = ELIPSE (A7, A8, A2, ANG) @@ -58,13 +38,13 @@ SUBROUTINE ETHETA (A7, A8, A2, THETA1, THETA2, THETA, ERR) ERR = .TRUE. GO TO 120 END IF -C + 110 CONTINUE -C + 120 CONTINUE -C + C FIND THE SECOND ROOT IF THE FIRST ONE HAS BEEN LOCATED -C + IF(.NOT.ERR)THEN ANG=THETA+ANGINC F1 = ELIPSE (A7, A8, A2, ANG) @@ -79,8 +59,8 @@ SUBROUTINE ETHETA (A7, A8, A2, THETA1, THETA2, THETA, ERR) GO TO 130 END IF END IF -C + 130 CONTINUE RETURN -C + END diff --git a/packages/seacas/applications/fastq/excorn.f b/packages/seacas/applications/fastq/excorn.f index 67b42521c752..5f2039bfd465 100644 --- a/packages/seacas/applications/fastq/excorn.f +++ b/packages/seacas/applications/fastq/excorn.f @@ -1,44 +1,27 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: excorn.f,v 1.2 1991/03/21 15:44:44 gdsjaar Exp $ -C $Log: excorn.f,v $ -C Revision 1.2 1991/03/21 15:44:44 gdsjaar -C Changed all 3.14159... to atan2(0.0, -1.0) -C -c Revision 1.1.1.1 1990/11/30 11:06:58 gdsjaar -c FASTQ Version 2.0X -c -c Revision 1.1 90/11/30 11:06:57 gdsjaar -c Initial revision -c -C -CC* FILE: [.PAVING]EXCORN.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE EXCORN (MXND, XN, YN, LNODES, ANGLE, N0, N1, N2, XNEW, & YNEW) C*********************************************************************** -C + C SUBROUTINE EXCORN = CALCULATES A POSITION AN AVERAGE LENGTH AWAY C FROM A CORNER NODE -C + C*********************************************************************** -C + DIMENSION XN (MXND), YN (MXND), LNODES (7, MXND), ANGLE (MXND) -C + LOGICAL SIDEP -C + C XNEW = XN (N0) + XN (N2) - XN (N1) C YNEW = YN (N0) + YN (N2) - YN (N1) PID2 = 0.5 * ATAN2(0.0, -1.0) -C + C ANG2 = ATAN2 (YN (N1)-YN (N0), XN (N1)-XN (N0))+PID2 BANG1 = ATAN2 (YN (N1) - YN (N2), XN (N1) - XN (N2)) BANG2 = ATAN2 (YN (N1) - YN (N0), XN (N1) - XN (N0)) @@ -61,7 +44,7 @@ SUBROUTINE EXCORN (MXND, XN, YN, LNODES, ANGLE, N0, N1, N2, XNEW, & (DIST * SIN (ANG2) + YN (N0)) ) * .5 C XNEW = DIST * COS (ANG1) + XN (N2) C YNEW = DIST * SIN (ANG1) + YN (N2) -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/exdsct.f b/packages/seacas/applications/fastq/exdsct.f index 7ac860ddcb38..973998dca197 100644 --- a/packages/seacas/applications/fastq/exdsct.f +++ b/packages/seacas/applications/fastq/exdsct.f @@ -1,45 +1,22 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: exdsct.f,v 1.3 1998/07/14 18:18:46 gdsjaar Exp $ -C $Log: exdsct.f,v $ -C Revision 1.3 1998/07/14 18:18:46 gdsjaar -C Removed unused variables, cleaned up a little. -C -C Changed BLUE labels to GREEN to help visibility on black background -C (indirectly requested by a couple users) -C -C Revision 1.2 1991/03/21 15:44:46 gdsjaar -C Changed all 3.14159... to atan2(0.0, -1.0) -C -c Revision 1.1.1.1 1990/11/30 11:07:01 gdsjaar -c FASTQ Version 2.0X -c -c Revision 1.1 90/11/30 11:07:00 gdsjaar -c Initial revision -c -C -CC* FILE: [.PAVING]EXDSCT.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE EXDSCT (MXND, XN, YN, LNODES, ANGLE, N1, XNEW, YNEW) C*********************************************************************** -C + C SUBROUTINE EXCORN = CALCULATES A POSITION AN AVERAGE LENGTH AWAY C FROM A DISSECTION NODE -C + C*********************************************************************** -C + DIMENSION XN (MXND), YN (MXND), LNODES (7, MXND), ANGLE (MXND) -C + N0 = LNODES (2, N1) N2 = LNODES (3, N1) -C + C XNEW = XN (N0) + XN (N2) - XN (N1) C YNEW = YN (N0) + YN (N2) - YN (N1) @@ -53,7 +30,7 @@ SUBROUTINE EXDSCT (MXND, XN, YN, LNODES, ANGLE, N1, XNEW, YNEW) DIST = (DIST1 + DIST2) * .5 XNEW = DIST * COS (ANG) + XN (N1) YNEW = DIST * SIN (ANG) + YN (N1) -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/exisop.f b/packages/seacas/applications/fastq/exisop.f index 3a9a5085a9b2..b50b7beb7157 100644 --- a/packages/seacas/applications/fastq/exisop.f +++ b/packages/seacas/applications/fastq/exisop.f @@ -1,44 +1,24 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: exisop.f,v 1.2 1998/07/14 18:18:48 gdsjaar Exp $ -C $Log: exisop.f,v $ -C Revision 1.2 1998/07/14 18:18:48 gdsjaar -C Removed unused variables, cleaned up a little. -C -C Changed BLUE labels to GREEN to help visibility on black background -C (indirectly requested by a couple users) -C -C Revision 1.1.1.1 1990/11/30 11:07:04 gdsjaar -C FASTQ Version 2.0X -C -c Revision 1.1 90/11/30 11:07:03 gdsjaar -c Initial revision -c -C -CC* FILE: [.PAVING]EXISOP.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE EXISOP (MXND, XN, YN, LNODES, ANGLE, N1, XNEW, YNEW) C*********************************************************************** -C + C SUBROUTINE EXISOP = CALCULATES A POSITION TO MAKE A PARALLELPIPED -C + C*********************************************************************** -C + DIMENSION XN (MXND), YN (MXND), LNODES (7, MXND), ANGLE (MXND) -C + N0 = LNODES (2, N1) N2 = LNODES (3, N1) -C + XNEW = XN (N0) + XN (N2) - XN (N1) YNEW = YN (N0) + YN (N2) - YN (N1) -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/exside.f b/packages/seacas/applications/fastq/exside.f index 825fabec6f21..6d17858eb372 100644 --- a/packages/seacas/applications/fastq/exside.f +++ b/packages/seacas/applications/fastq/exside.f @@ -1,45 +1,34 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: exside.f,v 1.1 1990/11/30 11:07:05 gdsjaar Exp $ -C $Log: exside.f,v $ -C Revision 1.1 1990/11/30 11:07:05 gdsjaar -C Initial revision -C -C -CC* FILE: [.PAVING]EXSIDE.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE EXSIDE (MXND, XN, YN, LNODES, ANGLE, N1, XNEW, YNEW) C*********************************************************************** -C + C SUBROUTINE EXSIDE = CALCULATES A POSITION AN AVERAGE LENGTH AWAY C FROM A SIDE NODE -C + C*********************************************************************** -C + DIMENSION XN (MXND), YN (MXND), LNODES (7, MXND), ANGLE (MXND) -C + N0 = LNODES (2, N1) N2 = LNODES (3, N1) -C + ANG = ATAN2 (YN (N2) - YN (N1), XN (N2) - XN (N1)) + & (ANGLE (N1) * .5) -C + DIST1 = SQRT ( (YN (N2) - YN (N1) ) **2 + & ( XN (N2) - XN (N1) ) **2) DIST2 = SQRT ( (YN (N0) - YN (N1) ) **2 + & ( XN (N0) - XN (N1) ) **2) -C + DIST = (DIST1 + DIST2) * .5 XNEW = (DIST * COS (ANG) ) + XN (N1) YNEW = (DIST * SIN (ANG) ) + YN (N1) -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/extnd1.f b/packages/seacas/applications/fastq/extnd1.f index d0df53f344b2..3d410a76bf59 100644 --- a/packages/seacas/applications/fastq/extnd1.f +++ b/packages/seacas/applications/fastq/extnd1.f @@ -1,40 +1,20 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: extnd1.f,v 1.2 1998/07/14 18:18:50 gdsjaar Exp $ -C $Log: extnd1.f,v $ -C Revision 1.2 1998/07/14 18:18:50 gdsjaar -C Removed unused variables, cleaned up a little. -C -C Changed BLUE labels to GREEN to help visibility on black background -C (indirectly requested by a couple users) -C -C Revision 1.1.1.1 1990/11/30 11:07:09 gdsjaar -C FASTQ Version 2.0X -C -c Revision 1.1 90/11/30 11:07:08 gdsjaar -c Initial revision -c -C -CC* FILE: [.PAVING]EXTND1.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE EXTND1 (MXND, XN, YN, ANGLE, N1, N2, N3, X, Y, DIST) C*********************************************************************** -C + C SUBROUTINE EXCORN = CALCULATES A POSITION AN AVERAGE LENGTH AWAY C FROM A CORNER NODE -C + C*********************************************************************** -C + DIMENSION XN (MXND), YN (MXND), ANGLE (MXND) DIMENSION X(1), Y(1) -C + CANG = (ANGLE (N2) * .5) ANG = ATAN2 (YN (N1) - YN (N2), XN (N1) - XN (N2)) - CANG DIST1 = SQRT ((YN (N2) - YN (N1)) **2 + (XN (N2) - XN (N1)) **2) @@ -45,10 +25,10 @@ SUBROUTINE EXTND1 (MXND, XN, YN, ANGLE, N1, N2, N3, X, Y, DIST) ELSE ADIST = DIST / SIN (CANG) ENDIF -C + X(1) = ADIST * COS (ANG) + XN (N2) Y(1) = ADIST * SIN (ANG) + YN (N2) -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/extnd3.f b/packages/seacas/applications/fastq/extnd3.f index 350fdbb95c76..82160b460808 100644 --- a/packages/seacas/applications/fastq/extnd3.f +++ b/packages/seacas/applications/fastq/extnd3.f @@ -1,40 +1,20 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: extnd3.f,v 1.2 1998/07/14 18:18:51 gdsjaar Exp $ -C $Log: extnd3.f,v $ -C Revision 1.2 1998/07/14 18:18:51 gdsjaar -C Removed unused variables, cleaned up a little. -C -C Changed BLUE labels to GREEN to help visibility on black background -C (indirectly requested by a couple users) -C -C Revision 1.1.1.1 1990/11/30 11:07:12 gdsjaar -C FASTQ Version 2.0X -C -c Revision 1.1 90/11/30 11:07:11 gdsjaar -c Initial revision -c -C -CC* FILE: [.PAVING]EXTND3.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE EXTND3 (MXND, XN, YN, ANGLE, N1, N2, N3, X, Y, DIST) C*********************************************************************** -C + C SUBROUTINE EXTND3 = CALCULATES TWO POSITIONS AN AVERAGE LENGTH AWAY C FROM A CORNER NODE AND ONE AT 1/3 ANGLE INTERVALS -C + C*********************************************************************** -C + DIMENSION XN (MXND), YN (MXND) DIMENSION X(3), Y(3) -C + ANG = ATAN2 (YN (N1) - YN (N2), XN (N1) - XN (N2)) CANG = ANGLE / 3. ANG1 = ANG - CANG @@ -48,14 +28,14 @@ SUBROUTINE EXTND3 (MXND, XN, YN, ANGLE, N1, N2, N3, X, Y, DIST) ELSE ADIST = DIST / SIN (CANG) ENDIF -C + X(1) = ADIST * COS (ANG1) + XN (N2) Y(1) = ADIST * SIN (ANG1) + YN (N2) X(2) = 1.4142 * ADIST * COS (ANG2) + XN (N2) Y(2) = 1.4142 * ADIST * SIN (ANG2) + YN (N2) X(3) = ADIST * COS (ANG3) + XN (N2) Y(3) = ADIST * SIN (ANG3) + YN (N2) -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/extnd5.f b/packages/seacas/applications/fastq/extnd5.f index 9296438d8b44..ee2445ca3140 100644 --- a/packages/seacas/applications/fastq/extnd5.f +++ b/packages/seacas/applications/fastq/extnd5.f @@ -1,40 +1,20 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: extnd5.f,v 1.2 1998/07/14 18:18:53 gdsjaar Exp $ -C $Log: extnd5.f,v $ -C Revision 1.2 1998/07/14 18:18:53 gdsjaar -C Removed unused variables, cleaned up a little. -C -C Changed BLUE labels to GREEN to help visibility on black background -C (indirectly requested by a couple users) -C -C Revision 1.1.1.1 1990/11/30 11:07:14 gdsjaar -C FASTQ Version 2.0X -C -c Revision 1.1 90/11/30 11:07:13 gdsjaar -c Initial revision -c -C -CC* FILE: [.PAVING]EXTND5.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE EXTND5 (MXND, XN, YN, ANGLE, N1, N2, N3, X, Y, DIST) C*********************************************************************** -C + C SUBROUTINE EXTND5 = CALCULATES TWO POSITIONS AN AVERAGE LENGTH AWAY C FROM A CORNER NODE AND AT 1/3 ANGLE INTERVALS -C + C*********************************************************************** -C + DIMENSION XN (MXND), YN (MXND) DIMENSION X(5), Y(5) -C + ANG = ATAN2 (YN (N1) - YN (N2), XN (N1) - XN (N2)) CANG = ANGLE * .25 ANG1 = ANG - CANG @@ -50,7 +30,7 @@ SUBROUTINE EXTND5 (MXND, XN, YN, ANGLE, N1, N2, N3, X, Y, DIST) ELSE ADIST = DIST / SIN (CANG) ENDIF -C + X(1) = ADIST * COS (ANG1) + XN (N2) Y(1) = ADIST * SIN (ANG1) + YN (N2) X(2) = 1.4142 * ADIST * COS (ANG2) + XN (N2) @@ -61,7 +41,7 @@ SUBROUTINE EXTND5 (MXND, XN, YN, ANGLE, N1, N2, N3, X, Y, DIST) Y(4) = 1.4142 * ADIST * SIN (ANG4) + YN (N2) X(5) = ADIST * COS (ANG5) + XN (N2) Y(5) = ADIST * SIN (ANG5) + YN (N2) -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/fastq.f b/packages/seacas/applications/fastq/fastq.f index 6c31b164d38b..3c8038603da1 100644 --- a/packages/seacas/applications/fastq/fastq.f +++ b/packages/seacas/applications/fastq/fastq.f @@ -1,40 +1,39 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: fastq.f,v 1.38 2007/07/24 13:10:18 gdsjaar Exp $ PROGRAM FASTQ C*********************************************************************** -C + C FASTQ = A PROGRAM TO QUICKLY GENERATE QUADRALATERAL MESHES -C + C*********************************************************************** -C + C WRITTEN AND MAINTAINED BY C TED D. BLACKER C DIVISION 1523 C VERSION 1.4X -C + C*********************************************************************** -C + C USES WORK PREVIOUSLY C COMPLETED BY C RONDALL E. JONES C DIVISION 2644 C (QMESH, RENUM, AND QNUM CODES) -C + C*********************************************************************** -C + C NOTE: FASTQ CALLS SEVERAL GRAPHICS ROUTINES FROM THE PLT PLOT C PACKAGE, AS WELL AS A NUMBER OF UTILITY ROUTINES FROM C THE DEPARTMENT 1520 SUPES LIBRARY OF ROUTINES. OF PRIME C USE IS THE FREE FIELD READER ROUTINES AND THE DYNAMIC C MEMORY ALLOCATION ROUTINES. -C + C*********************************************************************** -C + C VARIABLES USED: C IANS = LOGICAL RESPONSE FROM YES-NO QUESTION C TITLE = MESH TITLE @@ -54,9 +53,9 @@ PROGRAM FASTQ C VAXVMS = .TRUE. IF THE INSTALLATION IS ON A VAX/VMS MACHINE C (IT IS ASSUMED THAT VAXVMS WILL HAVE MULTIPLE VIRTUAL C DEVICE DRIVERS AVAILABLE - MVDI) -C + C*********************************************************************** -C + LOGICAL IANS, DRWTAB, WROTE, OPTIM, MERGE, NOROOM, TBZOOM LOGICAL LABP, LABL, LABR, AXISD, LABMD, LABI, LABF, LABPB, LABLB, & LABSBD @@ -65,9 +64,9 @@ PROGRAM FASTQ LOGICAL BATCH, VAXVMS, START, ALPHA, HARDPL, SNAP LOGICAL THREE, EIGHT, NINE, REGWRT, BARWRT LOGICAL EXODUSII -C + PARAMETER (MSC = 60, MA = 4, MCOM = 50, MSNAP = 100) -C + C NOTE: IF DYNAMIC VARIABLE DIMENSIONING IS NOT BEING USED, THIS C PARAMETER STATEMENT SHOULD BE EXPANDED TO THE FORM: C PARAMETER (MP = 100, ML = 100, MS = 50, MR = 30, MSC = 30, MA = 4) @@ -75,22 +74,22 @@ PROGRAM FASTQ C BE INCREASED ACCORDINGLY. C ALSO, THE VARIABLE A SHOULD BE DIMENSIONED AS: C DIMENSION A(MP*17 + ML*31 + MS*10 + MR*15) -C + CHARACTER DEV1*3, DEV2*3, VERSN*10, NUMBER*80, DATATYPE*8 CHARACTER*8 HARD, SOFT, DATE, TIME CHARACTER*72 SCHEME, DEFSCH, TITLE, CIN(MCOM) CHARACTER*8 MEMDBG CHARACTER*2048 FNAME -C + DIMENSION K(67), N(29), ISCHM(MSC), SCHEME(MSC), NUMBER(MSC) DIMENSION IDEV(2), SNAPDX(2,MSNAP), NSNAP(2) DIMENSION KIN(MCOM), IIN(MCOM), RIN(MCOM) DIMENSION A(1), IA(1) -C + EQUIVALENCE (A, IA) -C + C INITIALIZE VARIABLES -C + C ... By default, write exodusII format. If the environment variable C EXT04 is set to 'EXODUSII', write exodusII format. If EXT04 C is set to 'GENESIS', write exodusI format @@ -123,16 +122,13 @@ PROGRAM FASTQ eight = .false. nine = .false. optim = .false. -C + C GET THE CURRENT SYSTEM PARAMETERS AND SET MODE FOR RUNNING -C + CALL EXPARM (HARD, SOFT, MODE, KCSU, KNSU, IDAU) -C -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/18/90 -CC* MODIFICATION: COMMENTED OUT THE BATCH MODE STUFF TO RUN IN A COMMAND + C** FILE MODE -C + call exname (-3, dev2, klen) if (dev2(:3) .eq. 'BAT') THEN BATCH = .TRUE. @@ -161,16 +157,16 @@ PROGRAM FASTQ ENDIF IF (HARD(1:4) .EQ. 'CRAY' .AND. SOFT(1:3) .NE. 'UNI') THEN -C + C WE MUST NOW INPUT THE DEVICE IN AN ADHOCK MANNER FROM THE CRAY -C + CALL EXNAME (75, FNAME, LEN) DEV1 = FNAME (1:3) CALL EXUPCS (DEV1) END IF -C + C*********************************************************************** -C + TITLE = ' ' DEFSCH = 'M' WROTE = .TRUE. @@ -179,9 +175,9 @@ PROGRAM FASTQ DO 110 I = 1, 29 N(I) = 0 110 CONTINUE -C + C SET UP THE DEFAULT LABELING FOR DATA PLOTTING -C + AREACG = .FALSE. AXIS = .FALSE. AXISD = .FALSE. @@ -205,9 +201,9 @@ PROGRAM FASTQ LABSB = .FALSE. LABM = .FALSE. LABW = .FALSE. -C + C PRINT GREETING AND TRACE -C + CALL MESAGE (' ') CALL MESAGE ('WELCOME TO FASTQ:') CALL EXDATE (DATE) @@ -233,11 +229,9 @@ PROGRAM FASTQ WRITE (*, *) * '+++ United States Government +++' -C C IF THE CODE IS BEING RUN ON THE VAX INTERACTIVELY, C GET WHICH DEVICE IS BEING USED C AND SET UP THE MULTIPLE DEVICE OUTPUT ROUTINES -C IF ((VAXVMS) .AND. (.NOT.BATCH)) THEN CALL EXNAME (-1, DEV1, LEN) @@ -258,28 +252,28 @@ PROGRAM FASTQ CALL VDESCP (10001, 0, 0) CALL PLTSTV (2, 160.) END IF -C + C SET UP THE DUMP LOCATION FOR THE LOG FILE -C + IDUMP = 0 -C + C----------------------------------------------------------------------- -C + C THE NEXT SERIES OF STATEMENTS MUST BE TAKEN OUT IF NOT USING C DYNAMIC VARIABLE DIMENSIONING -C + C SET UP THE INITIAL POINTER ARRAY SYSTEM -C + MP = 1000 ML = 1000 MS = 1000 MR = 1000 -C + C INITIALIZE THE DYNAMIC DIMENSIONING ROUTINES -C + CALL MDINIT (A) CALL MDFILL(0) -C + C ... See if supes memory debugging desired C If EXT99 Environment variable set, turn on supes memory debugging C The numeric value of the variable is used as the unit to write @@ -291,9 +285,8 @@ PROGRAM FASTQ END IF 20 CONTINUE -C C GET INITIAL SPACE IN ARRAY A -C + CALL MDRSRV ('IPOINT', K(1), MP) CALL MDRSRV ('COOR', K(2), MP*2) CALL MDRSRV ('IPBOUN', K(3), MP) @@ -366,8 +359,7 @@ PROGRAM FASTQ CALL MDEROR (6) STOP' ' END IF -C -C + C THIS ENDS THE SECTION THAT NEEDS TO BE REMOVED IF NOT USING C DYNAMIC VARIABLE DIMENSIONING. AS A REPLACEMENT, THE POINTERS C MUST BE HARD WIRED INTO THE PROGRAM. THIS WOULD BE HANDLED IN THE @@ -379,11 +371,11 @@ PROGRAM FASTQ C K(5) = K(4) + ML C .... C K(67) = K(66) + MR -C + C----------------------------------------------------------------------- -C + C ZERO THE LINK ARRAYS -C + CALL LTNEW (MP, IA(K(40))) CALL LTNEW (ML, IA(K(41))) CALL LTNEW (MS, IA(K(42))) @@ -394,9 +386,9 @@ PROGRAM FASTQ CALL LTNEW (MP, IA(K(47))) CALL LTNEW (ML, IA(K(48))) CALL LTNEW (ML, IA(K(49))) -C + C ENTER FASTQ MAIN OPTION -C + IZ = 0 120 CONTINUE IF ((.NOT.BATCH) .AND. (ICOM .GT. JCOM)) THEN @@ -405,9 +397,9 @@ PROGRAM FASTQ & KIN, CIN, IIN, RIN) ICOM = 1 END IF -C + C GRAPHICS OPTION - PLOTS FASTQ DATA -C + IF ((CIN(ICOM)(1:1) .EQ. 'G') .OR. & (CIN(ICOM)(1:1) .EQ. 'g')) THEN ICOM = ICOM + 1 @@ -422,9 +414,9 @@ PROGRAM FASTQ & TITLE, LABP, LABL, LABR, AXISD, LABMD, LABI, LABF, LABPB, & LABLB, LABSBD, LABSC, LABSZ, FULL, IDEV, ALPHA, DEV1, & VAXVMS, VERSN, WROTE, TIME1, HARDPL, BATCH) -C + C DELETE OPTION - DELETES FASTQ DATA -C + ELSE IF ((CIN(ICOM)(1:1) .EQ. 'D') .OR. & (CIN(ICOM)(1:1) .EQ. 'd')) THEN ICOM = ICOM + 1 @@ -439,9 +431,9 @@ PROGRAM FASTQ & IA(K(64)), IA(K(65)), IA(K(66)), IA(K(67)), NUMBER, DEFSCH, & OPTIM, VAXVMS, WROTE, TIME1, BATCH, VERSN) WROTE = .FALSE. -C + C FLUSH OPTION - ERASES ALL DATA -C + ELSE IF ((CIN(ICOM)(1:1) .EQ. 'F') .OR. & (CIN(ICOM)(1:1) .EQ. 'f')) THEN ICOM = ICOM + 1 @@ -470,9 +462,9 @@ PROGRAM FASTQ CALL LTNEW (ML, IA(K(48))) CALL LTNEW (ML, IA(K(49))) END IF -C + C MESH OPTION - BEGINS MESH PROCESSING -C + ELSE IF ((CIN(ICOM)(1:1) .EQ. 'M') .OR. & (CIN(ICOM)(1:1) .EQ. 'm')) THEN ICOM = ICOM + 1 @@ -492,24 +484,24 @@ PROGRAM FASTQ & TITLE, OPTIM, IDEV, ALPHA, DEV1, THREE, EIGHT, NINE, BATCH, & VAXVMS, VERSN, AXIS, AREACG, LABN, LABE, LABO, LABNB, & LABSB, LABM, LABW, WROTE, TIME1, HARDPL, EXODUSII) -C + C SPAWN A PROCESS -C + ELSE IF ((CIN(ICOM)(1:2) .EQ. 'SP') .OR. & (CIN(ICOM)(1:2) .EQ. 'sp')) THEN ICOM = ICOM + 1 CALL SPAWN (VAXVMS) -C + C STRAIGHTEN OPTION - STRAIGHTEN LINES IN THE X OR Y DIRECTION -C + ELSE IF ((CIN(ICOM)(1:1) .EQ. 'S') .OR. & (CIN(ICOM)(1:2) .EQ. 's')) THEN ICOM = ICOM + 1 CALL STRAIT (MP, ML, MCOM, ICOM, JCOM, CIN, RIN, IIN, KIN, & IDUMP, N, A(K(2)), IA(K(8)), IA(K(40)), IA(K(41))) -C + C TABLET DIGITIZE OPTION - DIGITIZE THE GEOMETRY -C + ELSE IF ((CIN(ICOM)(1:1) .EQ. 'T') .OR. & (CIN(ICOM)(1:1) .EQ. 't')) THEN ICOM = ICOM + 1 @@ -529,13 +521,13 @@ PROGRAM FASTQ & IA(K(62)), IA(K(67)), TITLE, NOROOM, DRWTAB, XX1, YY1, & SCALE, CT, ST, X1, X2, Y1, Y2, ALPHA, DEV1, SNAP, SNAPDX, & NSNAP, VAXVMS, TBZOOM, AXIST, WROTE, BATCH, VERSN, TIME1) -C + C EXTEND THE MEMORY AND CONTINUE IF USING DYNAMIC VARIABLE DIMENSIONING. C IN CONVERTING TO NORMAL VARIABLE DIMENSIONING, THE EXTEND MEMORY LINES C MUST BE TAKEN OUT, AND AN EXIT OF THE PROGRAM INPUT. THEN THE C PARAMETER STATEMENT CONTAINING MP, ML, MS, AND MR MUST BE INCREASED TO C INCREASE DIMESIONING. -C + IF (NOROOM) THEN MPOLD = MP MLOLD = ML @@ -617,9 +609,9 @@ PROGRAM FASTQ CALL MDEROR (6) STOP' ' END IF -C + C RESORT THE LINK ARRAYS -C + CALL LTNEW (ML, IA(K(51))) CALL LTADD (ML, MLOLD, N(1), IA(K(40)), IA(K(51))) CALL LTNEW (ML, IA(K(51))) @@ -653,9 +645,9 @@ PROGRAM FASTQ GO TO 150 END IF WROTE = .FALSE. -C + C KEY-IN OPTION - TYPE IN THE DATA FROM THE KEYBOARD -C + ELSE IF ((CIN(ICOM)(1:1) .EQ. 'K') .OR. & (CIN(ICOM)(1:1) .EQ. 'k')) THEN ICOM = ICOM + 1 @@ -760,9 +752,9 @@ PROGRAM FASTQ CALL MDEROR (6) STOP' ' END IF -C + C RESORT THE LINK ARRAYS -C + CALL LTNEW (ML, IA(K(51))) CALL LTADD (ML, MLOLD, N(1), IA(K(40)), IA(K(51))) CALL LTNEW (ML, IA(K(51))) @@ -795,9 +787,9 @@ PROGRAM FASTQ CALL MESAGE ('KEYIN OPTION CAN NOW BE CONTINUED') GO TO 160 END IF -C + C LIST OPTION - LISTS FASTQ DATA -C + ELSE IF ((CIN(ICOM)(1:1) .EQ. 'L') .OR. & (CIN(ICOM)(1:1) .EQ. 'l')) THEN ICOM = ICOM + 1 @@ -815,18 +807,18 @@ PROGRAM FASTQ & A(K(63)), IA(K(64)), IA(K(65)), IA(K(66)), IA(K(67)), ISCHM, & SCHEME, NUMBER, DEFSCH, DEFSIZ, TITLE, OPTIM, THREE, EIGHT, & NINE, VAXVMS, WROTE, TIME1, VERSN, BATCH) -C + C READ OPTION - READS FASTQ DATA -C + ELSE IF (((CIN(ICOM)(1:1) .EQ. 'R') .OR. & (CIN(ICOM)(1:1) .EQ. 'r')) .AND. & (CIN(ICOM)(2:2).NE.'P') .AND. (CIN(ICOM)(2:2).NE.'p') .AND. & (CIN(ICOM)(2:2).NE.'W') .AND. (CIN(ICOM)(2:2).NE.'w')) THEN ICOM = ICOM + 1 IF ((N(1) .GT. 0) .OR. (N(2) .GT. 0)) THEN -C + C CHECK TO SEE IF A FASTQ DATA MERGING IS DESIRED -C + CALL INTRUP ('MERGE FILE WITH EXISTING DATA', MERGE, MCOM, & ICOM, JCOM, CIN, IIN, RIN, KIN) IF (MERGE) THEN @@ -861,7 +853,7 @@ PROGRAM FASTQ CALL LTNEW (ML, IA(K(49))) END IF END IF -C + IUNIT = 1 ITRY = 0 180 CONTINUE @@ -1003,9 +995,9 @@ PROGRAM FASTQ CALL MDEROR (6) STOP' ' END IF -C + C RESORT THE LINK ARRAYS -C + CALL LTNEW (ML, IA(K(51))) CALL LTADD (ML, MLOLD, N(1), IA(K(40)), IA(K(51))) CALL LTNEW (ML, IA(K(51))) @@ -1042,9 +1034,9 @@ PROGRAM FASTQ REWIND IUNIT CLOSE (IUNIT) END IF -C + C EXIT OPTION - EXITS FASTQ -C + ELSE IF ((CIN(ICOM)(1:2) .EQ. 'EX') .OR. & (CIN(ICOM)(1:2) .EQ. 'ex')) THEN ICOM = ICOM + 1 @@ -1057,10 +1049,9 @@ PROGRAM FASTQ & TIME1, BATCH, VERSN) ENDIF GO TO 120 -C + C WRITE OPTION - WRITES A FASTQ DATA FILE -C -C + ELSE IF ((CIN(ICOM)(1:1) .EQ. 'W') .OR. & (CIN(ICOM)(1:1) .EQ. 'w') .OR. & (CIN(ICOM)(1:2) .EQ. 'BW') .OR. @@ -1106,14 +1097,14 @@ PROGRAM FASTQ & BARWRT) WROTE = .TRUE. CLOSE (IUNIT) -C + C GET THE APPROPRIATE HELP MESAGE -C + ELSE ICOM = ICOM + 1 CALL HELP_FQ (1) END IF GO TO 120 -C + 10000 FORMAT (' ', 'ERROR OPENING FILE: ', A) END diff --git a/packages/seacas/applications/fastq/fexit.f b/packages/seacas/applications/fastq/fexit.f index 1bb179373373..ae21136c1f7c 100644 --- a/packages/seacas/applications/fastq/fexit.f +++ b/packages/seacas/applications/fastq/fexit.f @@ -1,47 +1,23 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: fexit.f,v 1.3 1999/01/27 15:17:47 gdsjaar Exp $ -C $Log: fexit.f,v $ -C Revision 1.3 1999/01/27 15:17:47 gdsjaar -C Added typical summary of mesh data on output. -C -C Better filename handling -C -C Cleaned up some character string handling -C -C Revision 1.2 1993/07/21 18:11:37 gdsjaar -C Removed message after stop -C -c Revision 1.1.1.1 1990/11/30 11:07:22 gdsjaar -c FASTQ Version 2.0X -c -c Revision 1.1 90/11/30 11:07:21 gdsjaar -c Initial revision -c -C -CC* FILE: [.MAIN]FEXIT.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE FEXIT (WROTE, MCOM, ICOM, JCOM, CIN, IIN, RIN, KIN, & TIME1, BATCH, VERSN) C*********************************************************************** -C + C SUBROUTINE FEXIT = GRACEFUL FASTQ EXIT -C + C*********************************************************************** -C + CHARACTER*72 CIN (MCOM), VERSN*10, DATE*8, TIME*8 -C + LOGICAL IANS, WROTE, BATCH -C + DIMENSION KIN (MCOM), IIN (MCOM), RIN (MCOM) -C + IF (.NOT.WROTE)THEN CALL MESAGE (' ') CALL MESAGE ('***********************************************') diff --git a/packages/seacas/applications/fastq/filsmo.f b/packages/seacas/applications/fastq/filsmo.f index ec51edd95e51..fe665fa164ec 100644 --- a/packages/seacas/applications/fastq/filsmo.f +++ b/packages/seacas/applications/fastq/filsmo.f @@ -1,66 +1,46 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: filsmo.f,v 1.2 1998/07/14 18:18:57 gdsjaar Exp $ -C $Log: filsmo.f,v $ -C Revision 1.2 1998/07/14 18:18:57 gdsjaar -C Removed unused variables, cleaned up a little. -C -C Changed BLUE labels to GREEN to help visibility on black background -C (indirectly requested by a couple users) -C -C Revision 1.1.1.1 1990/11/30 11:07:25 gdsjaar -C FASTQ Version 2.0X -C -c Revision 1.1 90/11/30 11:07:23 gdsjaar -c Initial revision -c -C -CC* FILE: [.PAVING]FILSMO.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE FILSMO (MXND, MLN, XN, YN, ZN, LXK, KXL, NXL, LXN, & LLL, NNN, NNN2, LNODES, BNSIZE, NLOOP, XMIN, XMAX, YMIN, YMAX, & ZMIN, ZMAX, DEV1, KREG) C*********************************************************************** -C + C SUBROUTINE FILSMO = MESH SMOOTHING DONE BY ISOPARAMETRIC/EQUAL C ANGULAR SMOOTHING OF THE ADDED INTERIOR (FREE) C BOUNDARY ROW AND THEN A LENGTH-WEIGHTED/EQUAL C ANGULAR BOUNDARY LAPLACIAN OF THE INTERIOR NODES. C THE FREE BOUNDARY IS FINALLY SMOOTHED AGAIN. -C + C*********************************************************************** -C + C VARIABLES USED: C WFAC = WEIGHT (0. = LAPLACIAN, 1. = ISOPARAMETRIC) C NIT = THE MAX NUMBER OF ITERATIONS TO DO. C EPS = MINIMUM DISTANCE NODES MUST MOVE TO CONTINUE ITERATIONS C RO = AN UNDER- OR OVER-RELAXATION FACTOR (NORMALLY 1.0) -C + C*********************************************************************** -C + COMMON /TIMING/ TIMEA, TIMEP, TIMEC, TIMEPC, TIMEAJ, TIMES -C + DIMENSION XN(MXND), YN(MXND), ZN(MXND) DIMENSION LXN(4, MXND), NXL(2, 3*MXND) DIMENSION LXK(4, MXND), KXL(2, 3*MXND) DIMENSION LINES(20), LNODES (MLN, MXND), BNSIZE (2, MXND) -C + LOGICAL BIG, ERR, GRAPH, DONE -C + CHARACTER*3 DEV1 -C + CALL GETIME (TIME1) GRAPH = .FALSE. DONE = .FALSE. WT = 10. -C + NIT = MAX0 (5 * NLOOP, 40) TOL = .03 VRO = 1. @@ -71,24 +51,24 @@ SUBROUTINE FILSMO (MXND, MLN, XN, YN, ZN, LXK, KXL, NXL, LXN, EPS = TOL * STDLEN IF (RO .LT. 0.01) RO = 1. EPS2 = (EPS * RO)**2 -C + C FIRST SMOOTH THE ADDED ROW -C + IF (NLOOP .GT. 0) THEN CALL ROWSMO (MXND, MLN, XN, YN, ZN, LXK, KXL, NXL, LXN, NNN, & WFAC, WFAC2, NIT, EPS, RO, NNN2, LNODES, BNSIZE, LLL, & GRAPH, XMIN, XMAX, YMIN, YMAX, ZMIN, ZMAX, DEV1, KREG) ENDIF -C + C NOW SMOOTH THE INTERIOR NODES -C + C ITERATION LOOP -C + DO 140 IT = 1, NIT BIG = .FALSE. -C + C NODE LOOP -C + DO 130 NODE = 1, NNN IF ( (LXN (1, NODE) .GT. 0) .AND. & (LXN (2, NODE) .GT. 0) .AND. @@ -98,9 +78,9 @@ SUBROUTINE FILSMO (MXND, MLN, XN, YN, ZN, LXK, KXL, NXL, LXN, FY = 0. SL = 0. VL = 0. -C + C LOOP THROUGH ALL LINES CONNECTED TO NODE -C + CALL GETLXN (MXND, LXN, NODE, LINES, KOUNT, ERR) IF (ERR) GOTO 150 DO 100 IL = 1, KOUNT @@ -109,12 +89,12 @@ SUBROUTINE FILSMO (MXND, MLN, XN, YN, ZN, LXK, KXL, NXL, LXN, DX = XN (NEND) - XN (NODE) DY = YN (NEND) - YN (NODE) AL = SQRT (DX * DX + DY * DY) -C + C CHECK FOR A BOUNDARY NODE AT THE OTHER END C OF THE LINE - TRY TO AVERAGE ANGULAR ERRORS WITH THE BOUNDARY WHERE C POSSIBLE - THIS MEANS ADDING IN AN EXTRA VECTOR TO PULL THE NODE C BACK TO WHERE IT OUGHT TO BE TO BE AT EQUAL ANGLES -C + IF (LXN (2, NEND) .LT. 0) THEN CALL SETN02 (MXND, NXL, LXK, KXL, L, NEND, NODE, & N0, N2) @@ -129,14 +109,14 @@ SUBROUTINE FILSMO (MXND, MLN, XN, YN, ZN, LXK, KXL, NXL, LXN, FY = FY + DY * AL SL = SL + AL 100 CONTINUE -C + C MOVE THE NODE -C + DELX = RO * FX/SL DELY = RO * FY/SL -C + C ERASE THE NODE'S LINES IF GRAPH IS ON -C + IF (GRAPH) THEN CALL LCOLOR('BLACK') DO 110 II = 1, KOUNT @@ -147,12 +127,12 @@ SUBROUTINE FILSMO (MXND, MLN, XN, YN, ZN, LXK, KXL, NXL, LXN, 110 CONTINUE CALL LCOLOR ('WHITE') ENDIF -C + XN (NODE) = XN (NODE)+DELX YN (NODE) = YN (NODE)+DELY -C + C REPLOT THE NODE'S LINES IF GRAPH IS ON -C + IF (GRAPH) THEN DO 120 II = 1, KOUNT IDRAW = LINES(II) @@ -168,23 +148,23 @@ SUBROUTINE FILSMO (MXND, MLN, XN, YN, ZN, LXK, KXL, NXL, LXN, IF (.NOT.BIG) GOTO 150 140 CONTINUE 150 CONTINUE -C + C NOW RESMOOTH THE ADDED ROW IF THE MESH HAS CHANGED INTERNALLY -C + IF ((NLOOP .GT. 0) .AND. (DONE)) THEN CALL ROWSMO (MXND, MLN, XN, YN, ZN, LXK, KXL, NXL, LXN, NNN, & WFAC, WFAC2, NIT, EPS, RO, NNN2, LNODES, BNSIZE, LLL, & GRAPH, XMIN, XMAX, YMIN, YMAX, ZMIN, ZMAX, DEV1, KREG) ENDIF -C + C NOW RESET ALL THE NODES AS BEING SMOOTHED -C + DO 160 I = 1, NNN LNODES (4, I) = IABS (LNODES (4, I)) 160 CONTINUE -C + CALL GETIME (TIME2) TIMES = TIMES + TIME2 - TIME1 RETURN -C + END diff --git a/packages/seacas/applications/fastq/fixlxn.f b/packages/seacas/applications/fastq/fixlxn.f index b849626c883c..703429f39dc0 100644 --- a/packages/seacas/applications/fastq/fixlxn.f +++ b/packages/seacas/applications/fastq/fixlxn.f @@ -1,34 +1,23 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: fixlxn.f,v 1.1 1990/11/30 11:07:27 gdsjaar Exp $ -C $Log: fixlxn.f,v $ -C Revision 1.1 1990/11/30 11:07:27 gdsjaar -C Initial revision -C -C -CC* FILE: [.PAVING]FIXLXN.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE FIXLXN (MXND, LXN, NXL, NUID, NAVAIL, IAVAIL, NNN, LLL, & NNNOLD, LLLOLD, ERR, NOROOM) C*********************************************************************** -C + C SUBROUTINE FIXLXN = FIXES THE ADDITIONS TO LXN -C + C*********************************************************************** -C + DIMENSION NXL (2, 3*MXND), LXN (4, MXND), NUID (MXND) -C + LOGICAL ERR, NOROOM -C + C RE-SETUP AVAILABLE LXN-SPACE LINKS -C + IOLD = 0 NAVAIL = 0 DO 100 I = 1, NNNOLD @@ -57,9 +46,9 @@ SUBROUTINE FIXLXN (MXND, LXN, NXL, NUID, NAVAIL, IAVAIL, NNN, LLL, LXN (4, I) = I + 1 110 CONTINUE ENDIF -C + C COMPLETE LXN ARRAYS FOR ANY NEW LINES -C + DO 130 L = LLLOLD + 1, LLL DO 120 I = 1, 2 CALL ADDLXN (MXND, LXN, NUID, NAVAIL, IAVAIL, NXL (I, L), @@ -72,8 +61,8 @@ SUBROUTINE FIXLXN (MXND, LXN, NXL, NUID, NAVAIL, IAVAIL, NNN, LLL, ENDIF 120 CONTINUE 130 CONTINUE -C + 140 CONTINUE RETURN -C + END diff --git a/packages/seacas/applications/fastq/fixsub.f b/packages/seacas/applications/fastq/fixsub.f index 100e7fdc5e6b..467759cedad9 100644 --- a/packages/seacas/applications/fastq/fixsub.f +++ b/packages/seacas/applications/fastq/fixsub.f @@ -1,38 +1,27 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: fixsub.f,v 1.1 1990/11/30 11:07:30 gdsjaar Exp $ -C $Log: fixsub.f,v $ -C Revision 1.1 1990/11/30 11:07:30 gdsjaar -C Initial revision -C -C -CC* FILE: [.QMESH]FIXSUB.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE FIXSUB (MXND, NNNOLD, NNN, LLLOLD, LLL, KKKOLD, KKK, & XN, YN, NUID, LXK, KXL, NXL, LXN, INDX, IAVAIL, NAVAIL, FINAL) C*********************************************************************** -C + C SUBROUTINE FIXSUB = FIXES THE KXL, LXK, NXL, AND LXN ARRAYS FOR C SUBREGIONS - TAKES OUT DUPLICATE LINES AND NODES -C + C*********************************************************************** -C + DIMENSION XN(MXND), YN(MXND), NUID(MXND), INDX(MXND) DIMENSION LXK(4, MXND), KXL(2, 3*MXND), NXL(2, 3*MXND) DIMENSION LXN(4, MXND) DIMENSION LINES(20) -C + LOGICAL ERR, FINAL, FOUND, NOROOM -C + C GENERATE A LIST OF NODES ON THE PERIMETER IN SORTED ORDER -C + NPER = 0 DO 100 I = 1, NNNOLD IF (NUID(I) .NE. 0) THEN @@ -41,28 +30,28 @@ SUBROUTINE FIXSUB (MXND, NNNOLD, NNN, LLLOLD, LLL, KKKOLD, KKK, END IF 100 CONTINUE CALL INDEXI_FQ (NNNOLD, NUID, NPER, INDX) -C + C GO THROUGH ALL THE BOUNDARY NODES IN THE LIST CHECKING FOR DUPLICATES -C + I = NNNOLD + 1 110 CONTINUE IF (NUID(I) .NE. 0) THEN -C + C SEE IF ANOTHER NODE EXISTS WITH THE SAME NUID -C + CALL LOWFND (MXND, NUID, NPER, INDX, I, IOLD) -C + C IF ANOTHER NODE EXISTS, THEN START CHECKING LINES -C + IF (IOLD .GT. 0) THEN CALL GETLXN (MXND, LXN, IOLD, LINES, KEND, ERR) -C + C CHECK ALL THE LINES ATTACHED TO THE OLD NODE, TO SEE IF THEY ARE C THE SAME LINE ATTACHED TO THE NODE BEING CHECKED. -C + C IF THE SAME LINE EXISTS, DELETE THE LINE, AND MARK THE NODE FOR C LATER DELETION -C + DO 200 J = 1, 3 IF (LXN(J, I) .NE. 0) THEN L = ABS(LXN(J, I)) @@ -73,10 +62,10 @@ SUBROUTINE FIXSUB (MXND, NNNOLD, NNN, LLLOLD, LLL, KKKOLD, KKK, N2 = NXL(1, LOLD) + NXL(2, LOLD) - IOLD IF ((NUID(N2) .EQ. NUID(N1)) .AND. & (NUID(N2) .NE. 0)) THEN -C + C THE SAME LINE HAS BEEN FOUND - CHANGE REFERENCES TO THE LATEST C NODE TO REFERENCES TO THE OLD NODE -C + KXL(2, LOLD) = KXL(1, L) KELEM = KXL(1, L) DO 120 II = 1, 4 @@ -85,9 +74,9 @@ SUBROUTINE FIXSUB (MXND, NNNOLD, NNN, LLLOLD, LLL, KKKOLD, KKK, 120 CONTINUE CALL DELLXN (MXND, LXN, NUID, NAVAIL, IAVAIL, & N1, L, NNN, ERR, NOROOM) -C + C NOW RENUMBER THE REMAINING LINES IN THE KXL AND NXL ARRAYS -C + LLL = LLL - 1 DO 130 II = L, LLL KXL(1, II) = KXL(1, II + 1) @@ -99,10 +88,10 @@ SUBROUTINE FIXSUB (MXND, NNNOLD, NNN, LLLOLD, LLL, KKKOLD, KKK, KXL(2, LLL + 1) = 0 NXL(1, LLL + 1) = 0 NXL(2, LLL + 1) = 0 -C + C NOW RENUMBER ANY REFERENCES TO LINES ABOVE L IN THE LXK AND C THE LXN ARRAYS -C + DO 150 II = 1, NNN DO 140 JJ = 1, 3 IF (ABS(LXN(JJ, II)) .EQ. L) THEN @@ -130,11 +119,11 @@ SUBROUTINE FIXSUB (MXND, NNNOLD, NNN, LLLOLD, LLL, KKKOLD, KKK, GOTO 190 END IF 180 CONTINUE -C + C END OF CHECK FOR THE SAME LINE - JUST ADD THE LINE TO THE IOLD NODE C IF THERE IS A PLACE FOR THE LINE (I.E. THE MAXIMUM IS FOUR/NODE WITH C THIS SCHEME). -C + 190 CONTINUE IF (.NOT.FOUND) THEN CALL ADDLXN (MXND, LXN, NUID, NAVAIL, IAVAIL, @@ -147,15 +136,15 @@ SUBROUTINE FIXSUB (MXND, NNNOLD, NNN, LLLOLD, LLL, KKKOLD, KKK, END IF END IF 200 CONTINUE -C + C ALL THE OLD LINES HAVE BEEN GONE THROUGH - NOW DELETE THE NODE I -C + DO 210 J = 1, I - 1 IF (LXN(4, J) .LT. -I) THEN LXN(4, J) = LXN(4, J) + 1 END IF 210 CONTINUE -C + NNN = NNN - 1 DO 230 J = I, NNN DO 220 K = 1, 3 @@ -186,11 +175,11 @@ SUBROUTINE FIXSUB (MXND, NNNOLD, NNN, LLLOLD, LLL, KKKOLD, KKK, I = I + 1 END IF IF (I .LE. NNN) GO TO 110 -C + C IF THIS IS THE FINAL SUBREGION TO BE ADDED, THEN FLAG C THE LXN ARRAY FOR TRULY EXTERIOR NODES, AND CLEAR THE TEMPORARY C NUID'S OF THE SUBREGION ONLY BOUNDARY NODES -C + IF (FINAL) THEN DO 250 I = 1, NNN IF ((ABS(NUID(I)) .GT. 1000000000) .OR. @@ -202,9 +191,9 @@ SUBROUTINE FIXSUB (MXND, NNNOLD, NNN, LLLOLD, LLL, KKKOLD, KKK, LXN(2, I) = ABS(LXN(2, I)) END IF 250 CONTINUE -C + C LINK-UP AVAILABLE LXN SPACE -C + IAVAIL = NNN + 1 NAVAIL = MXND - NNN DO 260 I = IAVAIL, MXND @@ -215,5 +204,5 @@ SUBROUTINE FIXSUB (MXND, NNNOLD, NNN, LLLOLD, LLL, KKKOLD, KKK, 260 CONTINUE END IF RETURN -C + END diff --git a/packages/seacas/applications/fastq/flagd.f b/packages/seacas/applications/fastq/flagd.f index 097cdf7d1814..e183b22e2186 100644 --- a/packages/seacas/applications/fastq/flagd.f +++ b/packages/seacas/applications/fastq/flagd.f @@ -1,33 +1,22 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: flagd.f,v 1.1 1990/11/30 11:07:33 gdsjaar Exp $ -C $Log: flagd.f,v $ -C Revision 1.1 1990/11/30 11:07:33 gdsjaar -C Initial revision -C -C -CC* FILE: [.MAIN]FLAGD.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE FLAGD (MDIM, N, LINK, INUM, FLAG) C*********************************************************************** -C + C SUBROUTINE FLAGD = FLAGS THE DATA TO BE PLOTTED -C + C*********************************************************************** -C + DIMENSION LINK(2,MDIM), INUM(MDIM) -C + LOGICAL FLAG, ADDLNK -C + ADDLNK = .FALSE. -C + DO 100 I = 1, N CALL LTSORT (MDIM, LINK, I, II, ADDLNK) IF (II .GT. 0) THEN diff --git a/packages/seacas/applications/fastq/flagk.f b/packages/seacas/applications/fastq/flagk.f index 8eeaa393f56b..7d102f6a8064 100644 --- a/packages/seacas/applications/fastq/flagk.f +++ b/packages/seacas/applications/fastq/flagk.f @@ -1,27 +1,16 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: flagk.f,v 1.1 1990/11/30 11:07:35 gdsjaar Exp $ -C $Log: flagk.f,v $ -C Revision 1.1 1990/11/30 11:07:35 gdsjaar -C Initial revision -C -C -CC* FILE: [.MAIN]FLAGK.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE FLAGK (NPELEM, NNXK, NXK, MAPDXG, I1, I2, SETFLG, OLD) C************************************************************************ -C + C SUBROUTINE FLAGK = FLAGS ELEMENTS FOR PLOTTING OR NOT PLOTTING -C + C*********************************************************************** -C + C VARIABLES USED: C NPELEMS = NUMBER OF PROCESSED ELEMENTS C NXK = NODES PER ELEMENT ARRAY (CONNECTIVITY) @@ -29,19 +18,19 @@ SUBROUTINE FLAGK (NPELEM, NNXK, NXK, MAPDXG, I1, I2, SETFLG, OLD) C I2 = ENDING ELEMENT TO BE FLAGGED C SETFLG = .TRUE. IF THE ELEMENT IS TO BE FLAGGED FOR PLOTTING C OLD = .TRUE. IF THE OLD ELEMENT NUMBERS ARE TO BE USED -C + C*********************************************************************** -C + C NOTE: C THE ELEMENT IS FLAGGED FOR PLOTTING BY FORCING THE FIRST NODE TO C BE POSITIVE AND VICE VERSUS -C + C*********************************************************************** -C + DIMENSION NXK(NNXK,NPELEM), MAPDXG(NPELEM) -C + LOGICAL SETFLG, OLD -C + IF (OLD) THEN IF (SETFLG) THEN DO 100 I = I1, I2 @@ -66,5 +55,5 @@ SUBROUTINE FLAGK (NPELEM, NNXK, NXK, MAPDXG, I1, I2, SETFLG, OLD) ENDIF ENDIF RETURN -C + END diff --git a/packages/seacas/applications/fastq/flmnmx.f b/packages/seacas/applications/fastq/flmnmx.f index d939bc5516e3..a9bd428dcaab 100644 --- a/packages/seacas/applications/fastq/flmnmx.f +++ b/packages/seacas/applications/fastq/flmnmx.f @@ -1,52 +1,41 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: flmnmx.f,v 1.1 1990/11/30 11:07:38 gdsjaar Exp $ -C $Log: flmnmx.f,v $ -C Revision 1.1 1990/11/30 11:07:38 gdsjaar -C Initial revision -C -C -CC* FILE: [.PAVING]FLMNMX.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE FLMNMX (MXND, MLN, MAXPRM, LINKPR, KPERIM, LNODES, & XN, YN, NLOOP, NODE, XMIN, XMAX, YMIN, YMAX, ERR) C*********************************************************************** -C + C SUBROUTINE FLMNMX = SET MIN AND MAX FOR CURRENT FILL BOUNDARY -C + C*********************************************************************** -C + DIMENSION LNODES (MLN, MXND), XN (MXND), YN (MXND) DIMENSION LINKPR (3, MAXPRM) -C + LOGICAL ERR -C + KOUNT = 0 INOW = NODE XMIN = XN (NODE) XMAX = XN (NODE) YMIN = YN (NODE) YMAX = YN (NODE) -C + 100 CONTINUE -C + INOW = LNODES (3, INOW) IF (INOW .NE. NODE) THEN -C + XMIN = MIN (XMIN, XN (INOW)) YMIN = MIN (YMIN, YN (INOW)) XMAX = MAX (XMAX, XN (INOW)) YMAX = MAX (YMAX, YN (INOW)) -C + KOUNT = KOUNT + 1 -C + IF (KOUNT .GT. NLOOP) THEN CALL MESAGE('PROBLEMS IN FLMNMX WITH LOOP NOT CLOSING') ERR = .TRUE. @@ -54,18 +43,18 @@ SUBROUTINE FLMNMX (MXND, MLN, MAXPRM, LINKPR, KPERIM, LNODES, ENDIF GOTO 100 ENDIF -C + C LOOP THROUGH ALL THE REMAINING PERIMETERS CHECKING FOR CROSSINGS -C + IPERIM = KPERIM 110 CONTINUE IPERIM = LINKPR (2, IPERIM) IF ((IPERIM .EQ. 0) .OR. (IPERIM .EQ. KPERIM)) GOTO 130 -C + KMAX = LINKPR (3, IPERIM) INOW = LINKPR (1, IPERIM) KOUNT = 0 -C + 120 CONTINUE XMIN = MIN (XMIN, XN (INOW)) YMIN = MIN (YMIN, YN (INOW)) @@ -74,15 +63,15 @@ SUBROUTINE FLMNMX (MXND, MLN, MAXPRM, LINKPR, KPERIM, LNODES, KOUNT = KOUNT + 1 INOW = LNODES (3, INOW) IF (INOW .EQ. LINKPR (1, IPERIM)) GOTO 110 -C + IF (KOUNT. GT. KMAX + 1) THEN CALL MESAGE('PROBLEMS IN FLMNMX WITH LOOP NOT CLOSING') ERR = .TRUE. GOTO 130 ENDIF GOTO 120 -C + 130 CONTINUE RETURN -C + END diff --git a/packages/seacas/applications/fastq/fndlin.f b/packages/seacas/applications/fastq/fndlin.f index 5f0c006383d3..68c637f03e4c 100644 --- a/packages/seacas/applications/fastq/fndlin.f +++ b/packages/seacas/applications/fastq/fndlin.f @@ -1,31 +1,26 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -CC* FILE: [.QMESH]FNDLIN.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE FNDLIN_FQ (MXND, LXN, NODE1, NODE2, LINE, ERR) -C + C*********************************************************************** -C + C SUBROUTINE FNDLIN = FINDS THE LINE WITH ENDS NODE1 & NODE2 -C + C*********************************************************************** -C + DIMENSION LXN(4, MXND) DIMENSION LINES1(20), LINES2(20) LOGICAL ERR -C + ERR = .FALSE. -C + CALL GETLXN (MXND, LXN, NODE1, LINES1, NL1, ERR) CALL GETLXN (MXND, LXN, NODE2, LINES2, NL2, ERR) -C + IF (.NOT.ERR) THEN ERR = .TRUE. DO 110 I = 1, NL1 @@ -38,7 +33,7 @@ SUBROUTINE FNDLIN_FQ (MXND, LXN, NODE1, NODE2, LINE, ERR) 100 CONTINUE 110 CONTINUE END IF -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/fndlnk.f b/packages/seacas/applications/fastq/fndlnk.f index 9d464dae6649..870e8800fe68 100644 --- a/packages/seacas/applications/fastq/fndlnk.f +++ b/packages/seacas/applications/fastq/fndlnk.f @@ -1,31 +1,20 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: fndlnk.f,v 1.1 1990/11/30 11:07:43 gdsjaar Exp $ -C $Log: fndlnk.f,v $ -C Revision 1.1 1990/11/30 11:07:43 gdsjaar -C Initial revision -C -C -CC* FILE: [.QMESH]FNDLNK.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE FNDLNK (MXND, LXK, NXL, K, N1, N2, L, ERR) C*********************************************************************** -C + C SUBROUTINE FNDLNK = FIND THE LINE IN ELEMENT K WITH NODES N1 AND N2 -C + C*********************************************************************** -C + DIMENSION LXK (4, MXND), NXL (2, 3 * MXND) -C + LOGICAL ERR -C + ERR = .FALSE. DO 100 I = 1, 4 LL = LXK (I, K) diff --git a/packages/seacas/applications/fastq/fq_bisect.F b/packages/seacas/applications/fastq/fq_bisect.F index 630ba63c0ae7..e27320eb5910 100644 --- a/packages/seacas/applications/fastq/fq_bisect.F +++ b/packages/seacas/applications/fastq/fq_bisect.F @@ -1,27 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: bisect.F,v 1.1 1998/04/10 04:30:07 gdsjaar Exp $ -C $Log: bisect.F,v $ -C Revision 1.1 1998/04/10 04:30:07 gdsjaar -C Added the ifdef needsdoubleescape to the graphics symbol -C plotting. Required moving some .f to .F files and specifying in Imakefile -C -C Revision 1.1.1.1 1990/11/30 11:04:02 gdsjaar -C FASTQ Version 2.0X -C -c Revision 1.1 90/11/30 11:04:00 gdsjaar -c Initial revision -c -C -CC* FILE: [.MAIN]BISECT.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE BISECT (MP, ML, MS, MR, MSNAP, N, IPOINT, COOR, IPBOUN, & ILINE, LTYPE, NINT, FACTOR, LCON, ILBOUN, ISBOUN, ISIDE, NLPS, & IFLINE, ILLIST, IREGN, IMAT, NSPR, IFSIDE, ISLIST, IRPB, IPBF, @@ -31,21 +13,21 @@ SUBROUTINE BISECT (MP, ML, MS, MR, MSNAP, N, IPOINT, COOR, IPBOUN, & IWTPBF, IWTLBF, IWTSBF, IRGFLG, X, Y, MERGE, LASTP, ALPHA, & NOROOM, SNAP, SNAPDX, NSNAP) C*********************************************************************** -C + C SUBROUTINE BISECT = FINDS CLOSEST PERPENDICULAR BISECTED LINE -C + C*********************************************************************** -C + C SUBROUTINE CALLED BY: C INPUT = INPUTS MESH DEFINITIONS FROM THE LIGHT TABLE -C + C*********************************************************************** -C + C SUBROUTINES CALLED: C DLPARA = DETERMINES LINE PARAMETERS FROM TWO POINTS -C + C*********************************************************************** -C + DIMENSION IPOINT(MP), COOR(2, MP), IPBOUN(MP) DIMENSION ILINE(ML), LTYPE(ML), NINT(ML), FACTOR(ML), LCON(3, ML) DIMENSION ILBOUN(ML), ISBOUN(ML) @@ -63,23 +45,23 @@ SUBROUTINE BISECT (MP, ML, MS, MR, MSNAP, N, IPOINT, COOR, IPBOUN, DIMENSION IHOLDM(2, (MS + MR)), IHOLD3(2, ML), IHOLDS(2, MS) DIMENSION IRGFLG(MR) DIMENSION N(29), SNAPDX(2, MSNAP), NSNAP(2) -C + LOGICAL BIFIND, ADDLNK, NOROOM, ALPHA, TEST, MERGE, NUMPLT, NEWNUM LOGICAL ADDCEN, CHANGE, ADJUST, ADDOLD, SIDEOK, GETMAX, SNAP -C + NUMPLT = .FALSE. -C + C FIND THE CLOSEST LINE ABOVE THE POINT INPUT -C + ADDLNK = .FALSE. TEST = .FALSE. GETMAX = .FALSE. N3OLD = N(3) CALL CLOSEL (MP, ML, N, COOR, ILINE, LTYPE, LCON, LINKP, LINKL, & X, Y, BIFIND, IFIND, ADDCEN, XCHOLD, YCHOLD) -C + C INPUT THE NEW POINT -C + IF (BIFIND) THEN CALL LTSORT (ML, LINKL, IFIND, L1, ADDLNK) LT = LTYPE(L1) @@ -137,9 +119,9 @@ SUBROUTINE BISECT (MP, ML, MS, MR, MSNAP, N, IPOINT, COOR, IPBOUN, CALL PLTSTD (1, 7.) CALL PLTFLU END IF -C + C INPUT THE NEW CENTER IF NEEDED -C + IF (ADDCEN) THEN JJ = N(18) + 1 CALL INPOIN (MP, N(1), N(18), JJ, XCHOLD, YCHOLD, NHOLDP, @@ -158,9 +140,9 @@ SUBROUTINE BISECT (MP, ML, MS, MR, MSNAP, N, IPOINT, COOR, IPBOUN, END IF I3 = JJ END IF -C + C CALCULATE HOW TO DIVIDE UP THE ORIGINAL INERVALS -C + IF (NINT(L1) .EQ. 0) THEN NN1 = 0 NN2 = 0 @@ -173,9 +155,9 @@ SUBROUTINE BISECT (MP, ML, MS, MR, MSNAP, N, IPOINT, COOR, IPBOUN, NN1 = MAX0(1, NN1) NN2 = MAX0(1, NINT(L1) - NN1) END IF -C + C INPUT THE ORIGINAL LINE -C + FACT = FACTOR(L1) ILB = ILBOUN(L1) ISB = ISBOUN(L1) @@ -185,25 +167,25 @@ SUBROUTINE BISECT (MP, ML, MS, MR, MSNAP, N, IPOINT, COOR, IPBOUN, & FACT, NHOLDL, IHOLDL, ILINE, LTYPE, NINT, FACTOR, LCON, & ILBOUN, ISBOUN, LINKL, MERGE, NOROOM) IF (NOROOM)RETURN -C + C PLOT THE LINE -C + IF (.NOT.ALPHA) THEN CALL DLINE (MP, ML, COOR, LINKP, KNUM, LT, I1, LASTP, I3, & NUMPLT, DUM1, DUM2, TEST, GETMAX, DUM3, DUM4, DUM5, DUM6) CALL PLTFLU END IF -C + C INPUT THE NEW LINE -C + JJ = N(19) + 1 CALL INLINE (ML, N(2), N(19), JJ, LT, LASTP, I2, I3, NN2, FACT, & NHOLDL, IHOLDL, ILINE, LTYPE, NINT, FACTOR, LCON, ILBOUN, & ISBOUN, LINKL, MERGE, NOROOM) IF (NOROOM)RETURN -C + C INPUT THE NEW LINE'S FLAGS AND THEN LINK UP FLAGS FOR BOTH LINES -C + SIDEOK = .TRUE. NHOLD2 = 0 IF (ILB .NE. 0) THEN @@ -230,26 +212,26 @@ SUBROUTINE BISECT (MP, ML, MS, MR, MSNAP, N, IPOINT, COOR, IPBOUN, & ISBOUN, LINKSB, IWTSBF, LINKL, LINKS, SIDEOK, NOROOM) IF (NOROOM)RETURN END IF -C + C PLOT THE NEW LINE -C + IF (.NOT.ALPHA) THEN CALL DLINE (MP, ML, COOR, LINKP, KNUM, LT, LASTP, I2, I3, & NUMPLT, DUM1, DUM2, TEST, GETMAX, DUM3, DUM4, DUM5, DUM6) CALL PLTFLU END IF -C + C UPDATE ANY REGION OR SIDE DEFINITIONS TO INCLUDE THE NEW LINES -C + IEND = N(22) DO 120 I = 1, IEND CALL LTSORT (MR, LINKR, I, II, ADDLNK) IF (II .GT. 0) THEN ADJUST = .FALSE. KKOUNT = 0 -C + C GET THE MATCH POINTS FROM THE LAST LINE IN THE REGION -C + JBEGIN = IFSIDE(II) JEND = IFSIDE(II) + NSPR(II) - 1 CALL LTSORT (MS, LINKS, ISLIST(JEND), IPNTR, ADDLNK) @@ -290,27 +272,27 @@ SUBROUTINE BISECT (MP, ML, MS, MR, MSNAP, N, IPOINT, COOR, IPBOUN, J1END = 0 J2END = 0 END IF -C + C NOW LOOP THROUGH THE SIDES/LINES AND CHECK FOR REPLACEMENT -C + DO 110 J = JBEGIN, JEND KKOUNT = KKOUNT + 1 IHOLDL(KKOUNT) = ISLIST(J) CALL LTSORT (MS, LINKS, ISLIST(J), IPNTR, ADDLNK) IF ((ISLIST(J) .GT. 0) .AND. (IPNTR .GT. 0) .AND. & (ISIDE(IPNTR) .GT. 0)) THEN -C + C CHECK THE SIDE FOR LINE INCLUSION IF THE SIDE EXISTS, AND IT C HAS NOT ALREADY BEEN FIXED (ISIDE(IPNTR) .LT. 0) -C + JJ = ISLIST(J) KOUNT = 0 CHANGE = .FALSE. KBEGIN = IFLINE(IPNTR) KEND = IFLINE(IPNTR) + NLPS(IPNTR) - 1 -C + C GET THE BEGINNING OF THE SIDE FOR SWITCHING -C + CALL LTSORT (ML, LINKL, ILLIST(KBEGIN), KK, ADDLNK) IF (KK .GT. 0.) THEN J1END = LCON(1, KK) @@ -328,9 +310,9 @@ SUBROUTINE BISECT (MP, ML, MS, MR, MSNAP, N, IPOINT, COOR, IPBOUN, CHANGE = .TRUE. KOUNT = KOUNT + 1 IHOLDP(KOUNT) = N(19) -C + C CHECK TO MAKE SURE THE TWO LINES DON'T NEED SWITCHING -C + IF ((I2 .EQ. I1END) .OR. & (I2 .EQ. I2END)) THEN I1END = I1 @@ -349,24 +331,24 @@ SUBROUTINE BISECT (MP, ML, MS, MR, MSNAP, N, IPOINT, COOR, IPBOUN, I2END = 0 END IF 100 CONTINUE -C + C INCLUDE THE LINE IN THE SIDE LIST IF NEEDED -C + IF (CHANGE) THEN ID = JJ CALL INSIDE (MS, N(3), N(4), N(20), JJ, IHOLDP, & KOUNT, ISIDE, NLPS, IFLINE, ILLIST, LINKS, & NHOLDS, IHOLDS, MERGE, NOROOM) IF (NOROOM)RETURN -C + C FLAG THE SIDE DATA AS ALREADY FIXED -C + CALL LTSORT (MS, LINKS, ID, KK, ADDLNK) IF (KK .GT. 0)ISIDE(KK) = -IABS(ISIDE(KK)) END IF -C + C CHECK THE LINE FOR INCLUSION -C + ELSE IF (ISLIST(J) .LT. 0) THEN JJ = IABS(ISLIST(J)) CALL LTSORT (ML, LINKL, JJ, KK, ADDLNK) @@ -374,9 +356,9 @@ SUBROUTINE BISECT (MP, ML, MS, MR, MSNAP, N, IPOINT, COOR, IPBOUN, ADJUST = .TRUE. KKOUNT = KKOUNT + 1 IHOLDL(KKOUNT) = -N(19) -C + C CHECK TO MAKE SURE THE TWO LINES DON'T NEED SWITCHING -C + IF ((I2 .EQ. I1END) .OR. (I2 .EQ. I2END) .OR. & (I2 .EQ. J1END) .OR. (I2 .EQ. J2END)) THEN I1END = I1 @@ -409,9 +391,9 @@ SUBROUTINE BISECT (MP, ML, MS, MR, MSNAP, N, IPOINT, COOR, IPBOUN, END IF END IF 120 CONTINUE -C + C RESTORE ALL THE FLAGGED SIDE DATA -C + DO 130 I = N3OLD + 1, N(3) ISIDE(I) = IABS(ISIDE(I)) 130 CONTINUE diff --git a/packages/seacas/applications/fastq/fq_check.f b/packages/seacas/applications/fastq/fq_check.f index f9f8e06dabb6..4ee20316328f 100644 --- a/packages/seacas/applications/fastq/fq_check.f +++ b/packages/seacas/applications/fastq/fq_check.f @@ -1,41 +1,30 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: check.f,v 1.1 1990/11/30 11:04:27 gdsjaar Exp $ -C $Log: check.f,v $ -C Revision 1.1 1990/11/30 11:04:27 gdsjaar -C Initial revision -C -C -CC* FILE: [.MAIN]CHECK.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE CHECK (MIN, MAX, I) C*********************************************************************** -C + C SUBROUTINE CHECK = CHECKS 2 VALUES FOR BEING OUT OF PRESCRIBED BOUNDS -C + C*********************************************************************** -C + C SUBROUTINE CALLED BY: C LIST = LISTS POINTS, LINES, AND REGIONS USED IN MESH DEFINITION C ERASE = DELETES POINTS, LINES, AND REGIONS FROM THE MESH C DEFINITIONS -C + C*********************************************************************** -C + C VARIABLES USED: C MIN = MINIMUM VALUE TO BE TESTED C MAX = MAXIMUM VALUE TO BE TESTED C I = THE ABSOLUTE MAXIMUM VALUE ALLOWED (THE MINIMUM IS 1) -C + C************************************************************************ -C + IF (MIN .LT. 1)MIN = 1 IF (MAX .GT. I)MAX = I IF (MAX .LT. MIN)MAX = MIN diff --git a/packages/seacas/applications/fastq/fq_dbpini.f b/packages/seacas/applications/fastq/fq_dbpini.f index 026e66230ca0..52877865658c 100644 --- a/packages/seacas/applications/fastq/fq_dbpini.f +++ b/packages/seacas/applications/fastq/fq_dbpini.f @@ -1,10 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C$Id: dbpini.f,v 1.1 1999/01/27 15:17:47 gdsjaar Exp $ C======================================================================= SUBROUTINE FQDBPINI (OPTION, TITLE, NDIM, NUMNP, NUMEL, NELBLK, & NUMNPS, LNPSNL, LNPSDF, NUMESS, LESSEL, LESSNL, @@ -50,7 +49,6 @@ SUBROUTINE FQDBPINI (OPTION, TITLE, NDIM, NUMNP, NUMEL, NELBLK, LOGICAL ALL ALL = (OPTION .EQ. '*') - IF (ALL .OR. (INDEX (OPTION, 'I') .GT. 0)) THEN WRITE(*, 10000) ENDIF diff --git a/packages/seacas/applications/fastq/fq_help.f b/packages/seacas/applications/fastq/fq_help.f index 985b88b9764f..e831ddcac011 100644 --- a/packages/seacas/applications/fastq/fq_help.f +++ b/packages/seacas/applications/fastq/fq_help.f @@ -1,45 +1,25 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: help.f,v 1.2 1998/07/14 18:19:09 gdsjaar Exp $ -C $Log: help.f,v $ -C Revision 1.2 1998/07/14 18:19:09 gdsjaar -C Removed unused variables, cleaned up a little. -C -C Changed BLUE labels to GREEN to help visibility on black background -C (indirectly requested by a couple users) -C -C Revision 1.1.1.1 1990/11/30 11:09:12 gdsjaar -C FASTQ Version 2.0X -C -c Revision 1.1 90/11/30 11:09:10 gdsjaar -c Initial revision -c -C -CC* FILE: [.MAIN]HELP.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE HELP_FQ (I) C************************************************************************ -C + C SUBROUTINE HELP = WRITES HELP MESSAGES ONTO THE SCREEN -C + C************************************************************************ -C + C SUBROUTINE CALLED BY ANY ROUTINE NEEDED HELP MESSAGES -C + C************************************************************************ -C + C VARIABLES USED: C I = THE POINTER TO DESIGNATE WHICH MESSAGE IS NEEDED -C + C*********************************************************************** -C + IF (I .EQ. 1) THEN CALL MESAGE (' ') CALL MESAGE ('THE FOLLOWING MAIN OPTIONS ARE AVAILABLE:') @@ -63,7 +43,7 @@ SUBROUTINE HELP_FQ (I) CALL MESAGE (' F*LUSH = CLEARS ALL FASTQ DATA') CALL MESAGE (' EX*IT = EXITS FASTQ') CALL MESAGE (' SP*AWN = SPAWNS A SUBPROCESS') -C + ELSE IF (I .EQ. 2) THEN CALL MESAGE (' ') CALL MESAGE ( '|-----------------+-----------------+'// @@ -108,7 +88,7 @@ SUBROUTINE HELP_FQ (I) & ' | |') CALL MESAGE ( '+-----------------+-----------------+'// & '-----------------+-----------------+') -C + ELSE IF (I .EQ. 3) THEN CALL MESAGE (' ') CALL MESAGE ('THE FOLLOWING SCHEME AND STEP PROCESSING '// @@ -190,7 +170,7 @@ SUBROUTINE HELP_FQ (I) & 'HAS OCCURRED') CALL MESAGE (' SUCH AS A SMOOTH, DELETION, '// & 'RESTRUCTURE, ETC.)') -C + ELSE IF (I .EQ. 4) THEN CALL MESAGE (' ') CALL MESAGE ('THE FOLLOWING LIST OPTIONS ARE AVAILABLE:') @@ -214,7 +194,7 @@ SUBROUTINE HELP_FQ (I) CALL MESAGE (' EX*IT = EXITS FASTQ') CALL MESAGE (' (CARRIAGE RETURN TO EXIT '// & 'LISTING)') -C + ELSE IF (I .EQ. 5) THEN CALL MESAGE (' ') CALL MESAGE ('THE FOLLOWING GRAPHICS OPTIONS ARE AVAILABLE:') @@ -253,7 +233,7 @@ SUBROUTINE HELP_FQ (I) CALL MESAGE (' EX*IT = EXITS FASTQ') CALL MESAGE (' (CARRIAGE RETURN TO EXIT '// & 'GRAPHICS)') -C + ELSE IF (I .EQ. 6) THEN CALL MESAGE (' ') CALL MESAGE ('THE FOLLOWING DELETE OPTIONS ARE AVAILABLE:') @@ -269,7 +249,7 @@ SUBROUTINE HELP_FQ (I) CALL MESAGE (' EX*IT = EXITS FASTQ') CALL MESAGE (' (CARRIAGE RETURN TO EXIT '// & 'DELETE)') -C + ELSE IF (I .EQ. 7) THEN CALL MESAGE (' ') CALL MESAGE ('THE FOLLOWING DEVICES ARE AVAILABLE:') @@ -287,14 +267,14 @@ SUBROUTINE HELP_FQ (I) CALL MESAGE (' V40 = VT 240') CALL MESAGE (' R25 = RASTER TECH ONE-25') CALL MESAGE (' RET = RETROGRAPHICS') -C + ELSE IF (I .EQ. 8) THEN CALL MESAGE (' ') CALL MESAGE ('THE FOLLOWING CORRECTION OPTIONS ARE AVAILABLE') CALL MESAGE (' X = CONSTANT X VALUES ALONG LINE(S)') CALL MESAGE (' Y = CONSTANT Y VALUES ALONG LINE(S)') CALL MESAGE (' Z*ERO = ZERO X VALUES (CENTERLINES)') -C + ELSE IF (I .EQ. 9) THEN CALL MESAGE (' ') CALL MESAGE ('THE FOLLOWING KEYIN OPTIONS ARE AVAILABLE:') @@ -321,7 +301,7 @@ SUBROUTINE HELP_FQ (I) CALL MESAGE (' SP*AWN = SPAWNS A SUBPROCESS') CALL MESAGE (' EX*IT = EXITS FASTQ') CALL MESAGE (' (CARRIAGE RETURN TO EXIT KEYIN)') -C + ELSE IF (I .EQ. 10) THEN CALL MESAGE (' ') CALL MESAGE ('THE FOLLOWING NUMBERING OPTIONS ARE AVAILABLE:') @@ -331,7 +311,7 @@ SUBROUTINE HELP_FQ (I) & 'START FROM') CALL MESAGE (' N*ODE = ENTERS NODE NUID''S '// & 'LOCATION TO START FROM') -C + ELSE IF (I .EQ. 11) THEN CALL MESAGE (' ') CALL MESAGE ('THE FOLLOWING MESH GRAPHICS OPTIONS ARE '// @@ -369,7 +349,7 @@ SUBROUTINE HELP_FQ (I) CALL MESAGE (' EX*IT = EXITS FASTQ') CALL MESAGE (' (CARRIAGE RETURN TO EXIT '// & 'MESH GRAPHICS)') -C + ELSE IF (I .EQ. 12) THEN CALL MESAGE (' ') CALL MESAGE ('THE FOLLOWING MESH OPTIONS ARE AVAILABLE:') @@ -401,7 +381,7 @@ SUBROUTINE HELP_FQ (I) & 'INDEX') CALL MESAGE (' (CARRIAGE RETURN TO EXIT '// & 'MESH)') -C + ELSE IF (I .EQ. 13) THEN CALL MESAGE ('THE FOLLOWING INITIAL MESH GENERATION SCHEMES '// & 'ARE AVAILABLE:') @@ -416,7 +396,7 @@ SUBROUTINE HELP_FQ (I) CALL MESAGE (' NO SCHEME (CARRIAGE RETURN) '// & 'DEFAULTS TO A') CALL MESAGE (' FORCED RECTANGULAR SCHEME') -C + ELSE IF (I .EQ. 14) THEN CALL MESAGE ('THE FOLLOWING TABLET OPTIONS ARE '// & 'AVAILABLE: ') @@ -451,7 +431,7 @@ SUBROUTINE HELP_FQ (I) CALL MESAGE (' (CARRIAGE RETURN TO EXIT '// & 'TABLET)') END IF -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/fq_indexi.f b/packages/seacas/applications/fastq/fq_indexi.f index 4ca34349dea2..0ca5b70f8aa8 100644 --- a/packages/seacas/applications/fastq/fq_indexi.f +++ b/packages/seacas/applications/fastq/fq_indexi.f @@ -1,31 +1,20 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: indexi.f,v 1.1 1990/11/30 11:09:26 gdsjaar Exp $ -C $Log: indexi.f,v $ -C Revision 1.1 1990/11/30 11:09:26 gdsjaar -C Initial revision -C -C -CC* FILE: [.QMESH]INDEXI.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE INDEXI_FQ (NMAX, IARRAY, N, INDX) C*********************************************************************** -C + C INDEXI - SORT THE N ELEMENTS OF IARRAY WHOSE POSITION IS STORED C IN INDX. ONLY THE ORDER OF THE INDEX ARRAY, INDX, IS C MODIFIED -C + C*********************************************************************** -C + DIMENSION IARRAY(NMAX), INDX(N) -C + L = N/2 + 1 IR = N 100 CONTINUE @@ -43,7 +32,7 @@ SUBROUTINE INDEXI_FQ (NMAX, IARRAY, N, INDX) RETURN END IF END IF -C + I = L J = L + L 110 CONTINUE @@ -62,5 +51,5 @@ SUBROUTINE INDEXI_FQ (NMAX, IARRAY, N, INDX) END IF INDX(I) = INDXT GO TO 100 -C + END diff --git a/packages/seacas/applications/fastq/fq_minmax.f b/packages/seacas/applications/fastq/fq_minmax.f index d9ab15aa4110..2334b7de2fac 100644 --- a/packages/seacas/applications/fastq/fq_minmax.f +++ b/packages/seacas/applications/fastq/fq_minmax.f @@ -1,40 +1,29 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: minmax.f,v 1.1 1990/11/30 11:12:11 gdsjaar Exp $ -C $Log: minmax.f,v $ -C Revision 1.1 1990/11/30 11:12:11 gdsjaar -C Initial revision -C -C -CC* FILE: [.QMESH]MINMAX_FQ.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE MINMAX_FQ (NDIM, N, X, Y, XMIN, XMAX, YMIN, YMAX) C*********************************************************************** -C + C SUBROUTINE MINMAX_FQ = COMPARES AND RECORDS X AND Y EXTREMES -C + C*********************************************************************** -C + DIMENSION X (NDIM), Y (NDIM) XMIN = X (1) XMAX = X (1) YMIN = Y (1) YMAX = Y (1) -C + DO 100 I = 1, N XMIN = AMIN1 (X (I), XMIN) XMAX = AMAX1 (X (I), XMAX) YMIN = AMIN1 (Y (I), YMIN) YMAX = AMAX1 (Y (I), YMAX) 100 CONTINUE -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/fq_rotate.f b/packages/seacas/applications/fastq/fq_rotate.f index 05e9159b88b7..29874adb6456 100644 --- a/packages/seacas/applications/fastq/fq_rotate.f +++ b/packages/seacas/applications/fastq/fq_rotate.f @@ -1,33 +1,22 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: rotate.f,v 1.1 1990/11/30 11:15:08 gdsjaar Exp $ -C $Log: rotate.f,v $ -C Revision 1.1 1990/11/30 11:15:08 gdsjaar -C Initial revision -C -C -CC* FILE: [.QMESH]ROTATE.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE FQ_ROTATE (N, X, Y, NID, NEWF) C*********************************************************************** -C + C SUBROUTINE ROTATE = CIRCULARLY SHIFTS THE DATA IN X, Y, AND NID -C + C*********************************************************************** -C + DIMENSION X (N), Y (N), NID (N) -C + IF ((NEWF .LE. 1) .OR. (NEWF .GT. N)) RETURN -C + C BUBBLE UP THROUGH THE ARRAYS AS MANY TIMES AS NEEDED -C + DO 110 I = 1, NEWF - 1 XLAST = X (1) YLAST = Y (1) @@ -41,7 +30,7 @@ SUBROUTINE FQ_ROTATE (N, X, Y, NID, NEWF) Y(N) = YLAST NID(N) = NLAST 110 CONTINUE -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/fq_symbol.F b/packages/seacas/applications/fastq/fq_symbol.F index cd7f3395f19d..45ecc239a7fd 100644 --- a/packages/seacas/applications/fastq/fq_symbol.F +++ b/packages/seacas/applications/fastq/fq_symbol.F @@ -1,31 +1,18 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: symbol.F,v 1.1 1998/04/10 04:30:25 gdsjaar Exp $ -C $Log: symbol.F,v $ -C Revision 1.1 1998/04/10 04:30:25 gdsjaar -C Added the ifdef needsdoubleescape to the graphics symbol -C plotting. Required moving some .f to .F files and specifying in Imakefile -C -C Revision 1.1.1.1 1990/11/30 11:17:02 gdsjaar -C FASTQ Version 2.0X -C -c Revision 1.1 90/11/30 11:17:01 gdsjaar -c Initial revision -c -C SUBROUTINE SYMBOL (IDIM, X, Y, SYM) C*********************************************************************** -C + C SUBROUTINE SYMBOL = DRAWS SYMBOLS AT X,Y ARRAY LOCATIONS -C + C*********************************************************************** -C + CHARACTER*6 SYM -C + DIMENSION X(IDIM), Y(IDIM) #if NeedsDoubleEscape IF (SYM .EQ. 'DIAMND') THEN @@ -52,7 +39,7 @@ SUBROUTINE SYMBOL (IDIM, X, Y, SYM) CALL MPD2SY (IDIM, X, Y, '\CSQ') ENDIF #endif -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/fxnuid.f b/packages/seacas/applications/fastq/fxnuid.f index 14ca81d3c86f..cfa7c6cf9e14 100644 --- a/packages/seacas/applications/fastq/fxnuid.f +++ b/packages/seacas/applications/fastq/fxnuid.f @@ -1,44 +1,33 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: fxnuid.f,v 1.1 1990/11/30 11:07:46 gdsjaar Exp $ -C $Log: fxnuid.f,v $ -C Revision 1.1 1990/11/30 11:07:46 gdsjaar -C Initial revision -C -C -CC* FILE: [.QMESH]FXNUID.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE FXNUID (NREGN, IGROUP, MR, MS, ML, NSPR, ILINE, ISIDE, & NLPS, IFLINE, ILLIST, LCON, ISLIST, IFSIDE, LINKR, LINKS, & LINKL, NNN, MAXNL, MXND, LISTL, NUID, NXL, LXN, INDX, NOROOM, & ERR) C*********************************************************************** -C + C FXNUID - FIX NUID'S: RESETS NUID'S OF INTERIOR LINES IN GROUPS C TO ZERO -C + C*********************************************************************** -C + DIMENSION IGROUP(NREGN), NSPR(MR), ILINE(ML), ISIDE(MS), NLPS(MS) DIMENSION IFLINE(MS), ILLIST(MS*3), LCON(3, ML), ISLIST(MR*4) DIMENSION IFSIDE(MR), LINKR(2, MR), LINKS(2, MS), LINKL(2, ML) DIMENSION LISTL(MAXNL), NUID(MXND), NXL(2, 3*MXND), LXN(4, MXND) DIMENSION INDX(MXND), LINES(20) -C + LOGICAL ADDLNK, ERR, LDUP, NOROOM -C + C GET LIST OF LINES -C + NOROOM = .FALSE. ERR = .FALSE. -C + ADDLNK = .FALSE. N1 = 1 DO 100 I = 1, NREGN @@ -57,9 +46,9 @@ SUBROUTINE FXNUID (NREGN, IGROUP, MR, MS, ML, NSPR, ILINE, ISIDE, END IF 100 CONTINUE NUML = N1 - 1 -C + C SORT THE LINE LIST -C + IF (NUML .GT. 1) THEN DO 110 I = 1, NUML INDX(I) = I @@ -68,9 +57,9 @@ SUBROUTINE FXNUID (NREGN, IGROUP, MR, MS, ML, NSPR, ILINE, ISIDE, ELSE RETURN END IF -C + C IDENTIFY INTERIOR LINES -C + I1 = 1 120 CONTINUE LDUP = .FALSE. @@ -90,9 +79,9 @@ SUBROUTINE FXNUID (NREGN, IGROUP, MR, MS, ML, NSPR, ILINE, ISIDE, END IF END IF END IF -C + C FORM SORTED LINE LIST IN INDX THEN COPY IT BACK TO LISTL -C + N1 = 0 DO 140 I = 1, NUML IF (INDX(I) .GT. 0) THEN @@ -104,9 +93,9 @@ SUBROUTINE FXNUID (NREGN, IGROUP, MR, MS, ML, NSPR, ILINE, ISIDE, DO 150 I = 1, NUML LISTL(I) = INDX(I) 150 CONTINUE -C + C SORT NUID'S ON LINE'S FOR SPEEDY LOOKUP -C + N1 = 0 DO 160 I = 1, NNN IF (NUID(I) .GT. 1000000000) THEN @@ -116,23 +105,23 @@ SUBROUTINE FXNUID (NREGN, IGROUP, MR, MS, ML, NSPR, ILINE, ISIDE, 160 CONTINUE NUMN = N1 IF (NUMN .GT. 1) CALL INDEXI_FQ (NNN, NUID, NUMN, INDX) -C + C LOOP FOR INTERIOR LINES -C + DO 220 I = 1, NUML KEY = 1000000000 + LISTL(I)*100000 -C + C FIND LOW POINT -C + IBOT = 0 DO 170 J = 1, NUMN IBOT = J IF (NUID(INDX(J)) .GE. KEY) GO TO 180 170 CONTINUE 180 CONTINUE -C + C CHECK INDIVIDUAL POINTS BETWEEN LOW + 1 AND HIGH - 1 -C + KEY1 = KEY/100000 DO 190 J = IBOT, NUMN IF (NUID(INDX(J))/100000 .EQ. KEY1) THEN @@ -143,9 +132,9 @@ SUBROUTINE FXNUID (NREGN, IGROUP, MR, MS, ML, NSPR, ILINE, ISIDE, END IF 190 CONTINUE 200 CONTINUE -C + C COMPACT NUID'S INDEX LIST -C + N1 = 0 DO 210 J = 1, NUMN IF (INDX(J) .GT. 0) THEN @@ -154,11 +143,11 @@ SUBROUTINE FXNUID (NREGN, IGROUP, MR, MS, ML, NSPR, ILINE, ISIDE, END IF 210 CONTINUE NUMN = N1 -C + 220 CONTINUE -C + C CHECK ALL POINT NUID'S TO MAKE SURE THEY ARE ON BOUNDARY -C + DO 240 I = 1, NNN IF (NUID(I) .GT. 0 .AND. NUID(I) .LT. 100000) THEN NODE = I @@ -169,7 +158,7 @@ SUBROUTINE FXNUID (NREGN, IGROUP, MR, MS, ML, NSPR, ILINE, ISIDE, ERR = .TRUE. RETURN END IF -C + KOUNT = 0 DO 230 J = 1, NL I1 = NXL(1, LINES(J)) + NXL(2, LINES(J)) - I @@ -178,7 +167,7 @@ SUBROUTINE FXNUID (NREGN, IGROUP, MR, MS, ML, NSPR, ILINE, ISIDE, IF (KOUNT .LT. 2) LXN(2, I) = ABS(LXN(2, I)) END IF 240 CONTINUE -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/gdata.f b/packages/seacas/applications/fastq/gdata.f index ab5c518fca42..9ecf00d1bf05 100644 --- a/packages/seacas/applications/fastq/gdata.f +++ b/packages/seacas/applications/fastq/gdata.f @@ -1,32 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: gdata.f,v 1.3 1999/07/01 13:48:26 gdsjaar Exp $ -C $Log: gdata.f,v $ -C Revision 1.3 1999/07/01 13:48:26 gdsjaar -C Fixed another negative array index. -C -C Revision 1.2 1998/07/14 18:18:59 gdsjaar -C Removed unused variables, cleaned up a little. -C -C Changed BLUE labels to GREEN to help visibility on black background -C (indirectly requested by a couple users) -C -C Revision 1.1.1.1 1990/11/30 11:07:51 gdsjaar -C FASTQ Version 2.0X -C -c Revision 1.1 90/11/30 11:07:49 gdsjaar -c Initial revision -c -C -CC* FILE: [.MAIN]GDATA.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE GDATA (MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CIN, & RIN, IIN, KIN, IDUMP, N, IPOINT, COOR, IPBOUN, ILINE, LTYPE, & NINT, FACTOR, LCON, ILBOUN, ISBOUN, ISIDE, NLPS, IFLINE, @@ -37,16 +14,16 @@ SUBROUTINE GDATA (MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CIN, & LABSC, LABSZ, FULL, IDEV, ALPHA, DEV1, VAXVMS, VERSN, WROTE, & TIME1, HARDPL, BATCH) C*********************************************************************** -C + C GDATA = SUBROUTINE TO INPUT LIGHT TABLE POINTS -C + C*********************************************************************** -C + C SUBROUTINE CALLED BY: C FASTQ = A PROGRAM TO QUICKLY PREPARE QMESH INPUT -C + C*********************************************************************** -C + DIMENSION IPOINT (MP), COOR (2, MP), IPBOUN (MP) DIMENSION ILINE (ML), LTYPE (ML), NINT (ML) DIMENSION FACTOR (ML), LCON (3, ML) @@ -62,37 +39,37 @@ SUBROUTINE GDATA (MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CIN, DIMENSION REXTRM (4, MR), N (29) DIMENSION KIN (MCOM), IIN (MCOM), RIN (MCOM) DIMENSION IDEV (2), III (1) -C + CHARACTER*72 SCHEME, DEFSCH, TITLE, CIN (MCOM) CHARACTER*3 DEV1, VERSN*9 -C + LOGICAL DRAWN, FLAG, GOPLOT, ALPHA LOGICAL ADDLNK, VAXVMS, WROTE LOGICAL LABP, LABL, LABR, AXISD, LABMD LOGICAL LABI, LABF, LABPB, LABLB, LABSBD LOGICAL FULL, LABSC, LABSZ, GETMAX, TEST LOGICAL NUMPLT, HARDPL, BATCH, FOUND -C + IZ = 0 DRAWN = .FALSE. ADDLNK = .FALSE. GETMAX = .FALSE. TEST = .FALSE. NUMPLT = .FALSE. -C + C FLAG ALL THE DATA TO BE PLOTTED -C + FLAG = .TRUE. CALL FLAGD (MP, N (18), LINKP, IPOINT, FLAG) CALL FLAGD (ML, N (19), LINKL, ILINE, FLAG) CALL FLAGD (MR, N (22), LINKR, IREGN, FLAG) -C + C GET THE REGION AND BODY EXTREMES -C + CALL GETEXT (MP, ML, MS, MR, N, IPOINT, COOR, ILINE, LTYPE, & LCON, NLPS, IFLINE, ILLIST, NSPR, IFSIDE, ISLIST, LINKP, & LINKL, LINKS, LINKR, REXTRM, XMIN, XMAX, YMIN, YMAX) -C + XMIN1 = XMIN XMAX1 = XMAX YMIN1 = YMIN @@ -101,9 +78,9 @@ SUBROUTINE GDATA (MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CIN, HYMIN = YMIN HXMAX = XMAX HYMAX = YMAX -C + C ENTER GRAPHICS OPTION -C + 100 CONTINUE IF (ICOM .GT. JCOM) THEN CALL MESAGE (' ') @@ -111,9 +88,9 @@ SUBROUTINE GDATA (MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CIN, & IOSTAT, JCOM, KIN, CIN, IIN, RIN) ICOM = 1 ENDIF -C + C TOGGLE DRAWING OF THE AXIS -C + IF ( (CIN (ICOM) (1:1) .EQ. 'A') .OR. & (CIN (ICOM) (1:1) .EQ. 'a')) THEN ICOM = ICOM + 1 @@ -124,9 +101,9 @@ SUBROUTINE GDATA (MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CIN, AXISD = .TRUE. CALL MESAGE ('AXIS DRAWING - ON') ENDIF -C + C TOGGLE THE FACTOR NUMBERS -C + ELSEIF ( (CIN (ICOM) (1:2) .EQ. 'FA') .OR. & (CIN (ICOM) (1:2) .EQ. 'fa')) THEN ICOM = ICOM + 1 @@ -137,9 +114,9 @@ SUBROUTINE GDATA (MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CIN, LABF = .TRUE. CALL MESAGE ('FACTOR LABELS - ON') ENDIF -C + C TOGGLE THE FULL DISPLAY OF PROPERTIES -C + ELSEIF ( (CIN (ICOM) (1:1) .EQ. 'F') .OR. & (CIN (ICOM) (1:1) .EQ. 'f')) THEN ICOM = ICOM + 1 @@ -150,9 +127,9 @@ SUBROUTINE GDATA (MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CIN, FULL = .TRUE. CALL MESAGE ('FULL DISPLAY OF PROPERTIES - ON') ENDIF -C + C TOGGLE THE SCHEME DISPLAY -C + ELSEIF ( (CIN (ICOM) (1:2) .EQ. 'SC') .OR. & (CIN (ICOM) (1:2) .EQ. 'sc')) THEN ICOM = ICOM + 1 @@ -163,9 +140,9 @@ SUBROUTINE GDATA (MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CIN, LABSC = .TRUE. CALL MESAGE ('SCHEME LABELS - ON') ENDIF -C + C TOGGLE THE SCHEME DISPLAY -C + ELSEIF ( (CIN (ICOM) (1:2) .EQ. 'SI') .OR. & (CIN (ICOM) (1:2) .EQ. 'si')) THEN ICOM = ICOM + 1 @@ -176,9 +153,9 @@ SUBROUTINE GDATA (MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CIN, LABSZ = .TRUE. CALL MESAGE ('ELEMENT SIZE LABELS - ON') ENDIF -C + C TOGGLE THE MATERIAL NUMBERS -C + ELSEIF ( (CIN (ICOM) (1:1) .EQ. 'M') .OR. & (CIN (ICOM) (1:1) .EQ. 'm')) THEN ICOM = ICOM + 1 @@ -189,9 +166,9 @@ SUBROUTINE GDATA (MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CIN, LABMD = .TRUE. CALL MESAGE ('MATERIAL LABELS - ON') ENDIF -C + C ENTER LINE INTERVALS -C + ELSEIF ( (CIN (ICOM) (1:2) .EQ. 'II') .OR. & (CIN (ICOM) (1:2) .EQ. 'ii')) THEN ICOM = ICOM + 1 @@ -214,9 +191,9 @@ SUBROUTINE GDATA (MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CIN, & NLPS, IFLINE, ILLIST, LINKL, LINKS, ADDLNK) GOTO 110 ENDIF -C + C ENTER LINE FACTORS -C + ELSEIF ( (CIN (ICOM) (1:2) .EQ. 'IF') .OR. & (CIN (ICOM) (1:2) .EQ. 'if')) THEN ICOM = ICOM + 1 @@ -239,9 +216,9 @@ SUBROUTINE GDATA (MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CIN, & NLPS, IFLINE, ILLIST, LINKL, LINKS, ADDLNK) GOTO 120 ENDIF -C + C TOGGLE THE INTERVAL NUMBERS -C + ELSEIF ( (CIN (ICOM) (1:1) .EQ. 'I') .OR. & (CIN (ICOM) (1:1) .EQ. 'i')) THEN ICOM = ICOM + 1 @@ -252,9 +229,9 @@ SUBROUTINE GDATA (MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CIN, LABI = .TRUE. CALL MESAGE ('INTERVAL LABELS - ON') ENDIF -C + C TOGGLE THE NODE BOUNDARY NUMBERS -C + ELSEIF ( (CIN (ICOM) (1:1) .EQ. 'N') .OR. & (CIN (ICOM) (1:1) .EQ. 'n')) THEN ICOM = ICOM + 1 @@ -265,9 +242,9 @@ SUBROUTINE GDATA (MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CIN, LABLB = .TRUE. CALL MESAGE ('LINE BOUNDARY LABELS - ON') ENDIF -C + C FLAG LINES TO BE PROCESSED -C + ELSEIF ( (CIN (ICOM) (1:2) .EQ. 'LP') .OR. & (CIN (ICOM) (1:2) .EQ. 'lp')) THEN ICOM = ICOM + 1 @@ -294,14 +271,14 @@ SUBROUTINE GDATA (MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CIN, IF (IFOUND .GT. 0) THEN IF (I1 .GT. 0) THEN CALL CHECK (I1, I2, N (19)) -C + C FLAG ALL DATA ASSOCIATED WITH THE LINES -C + DO 150 I = I1, I2 CALL LTSORT (ML, LINKL, I, KK, ADDLNK) IF (KK .GT. 0) THEN GOPLOT = .TRUE. -C + DO 140 L = 1, 3 IF (LCON (L, KK) .GT. 0) THEN CALL LTSORT (MP, LINKP, LCON (L, KK), @@ -318,7 +295,7 @@ SUBROUTINE GDATA (MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CIN, ENDIF ENDIF 140 CONTINUE -C + CALL DLINE (MP, ML, COOR, LINKP, ILINE (KK), & LTYPE (KK), LCON (1, KK), LCON (2, KK), & LCON (3, KK), NUMPLT, X1, Y1, TEST, GETMAX, @@ -331,9 +308,9 @@ SUBROUTINE GDATA (MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CIN, ENDIF GETMAX = .FALSE. IF (GOPLOT) THEN -C + C PLOT THE LINE DATA THAT HAS BEEN FLAGGED -C + IF (ALPHA) THEN CALL MESAGE ('NO PLOTTING POSSIBLE ON ALPHANUMERIC '// & 'TERMINAL') @@ -357,9 +334,9 @@ SUBROUTINE GDATA (MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CIN, YMIN1 = YMIN XMAX1 = XMAX YMAX1 = YMAX -C + C TOGGLE THE LINE NUMBERS -C + ELSEIF ( (CIN (ICOM) (1:1) .EQ. 'L') .OR. & (CIN (ICOM) (1:1) .EQ. 'l')) THEN ICOM = ICOM + 1 @@ -370,9 +347,9 @@ SUBROUTINE GDATA (MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CIN, LABL = .TRUE. CALL MESAGE ('LINE LABELS - ON') ENDIF -C + C TOGGLE THE POINT BOUNDARY NUMBERS -C + ELSEIF ( (CIN (ICOM) (1:2) .EQ. 'PB') .OR. & (CIN (ICOM) (1:1) .EQ. 'pb')) THEN ICOM = ICOM + 1 @@ -383,9 +360,9 @@ SUBROUTINE GDATA (MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CIN, LABPB = .TRUE. CALL MESAGE ('POINT BOUNDARY LABELS - ON') ENDIF -C + C TOGGLE THE SIDE BOUNDARY NUMBERS -C + ELSEIF ( (CIN (ICOM) (1:2) .EQ. 'EB') .OR. & (CIN (ICOM) (1:2) .EQ. 'eb')) THEN ICOM = ICOM + 1 @@ -396,9 +373,9 @@ SUBROUTINE GDATA (MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CIN, LABSBD = .TRUE. CALL MESAGE ('ELEMENT BOUNDARY LABELS - ON') ENDIF -C + C TOGGLE THE POINT NUMBERS -C + ELSEIF ( (CIN (ICOM) (1:2) .EQ. 'PO') .OR. & (CIN (ICOM) (1:2) .EQ. 'po')) THEN ICOM = ICOM + 1 @@ -409,9 +386,9 @@ SUBROUTINE GDATA (MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CIN, LABP = .TRUE. CALL MESAGE ('POINT LABELS - ON') ENDIF -C + C TOGGLE THE REGION NUMBERS -C + ELSEIF ( (CIN (ICOM) (1:2) .EQ. 'RE') .OR. & (CIN (ICOM) (1:2) .EQ. 're')) THEN ICOM = ICOM + 1 @@ -422,16 +399,16 @@ SUBROUTINE GDATA (MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CIN, LABR = .TRUE. CALL MESAGE ('REGION LABELS - ON') ENDIF -C + C SPAWN A PROCESS -C + ELSEIF ( (CIN (ICOM) (1:3) .EQ. 'SPA') .OR. & (CIN (ICOM) (1:3) .EQ. 'spa')) THEN ICOM = ICOM + 1 CALL SPAWN (VAXVMS) -C + C FLAG SIDES TO BE PROCESSED -C + ELSEIF ( (CIN (ICOM) (1:2) .EQ. 'SP') .OR. & (CIN (ICOM) (1:2) .EQ. 'sp')) THEN ICOM = ICOM + 1 @@ -462,9 +439,9 @@ SUBROUTINE GDATA (MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CIN, IF (IFOUND .GT. 0) THEN IF (I1 .GT. 0) THEN CALL CHECK (I1, I2, N (20)) -C + C FLAG ALL DATA ASSOCIATED WITH THE SIDES -C + DO 190 I = I1, I2 CALL LTSORT (MS, LINKS, I, JJ, ADDLNK) IF (JJ .GT. 0) THEN @@ -502,9 +479,9 @@ SUBROUTINE GDATA (MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CIN, ENDIF GETMAX = .FALSE. IF (GOPLOT) THEN -C + C PLOT THE SIDE DATA THAT HAS BEEN FLAGGED -C + IF (ALPHA) THEN CALL MESAGE ('NO PLOTTING POSSIBLE ON ALPHANUMERIC ' // & 'TERMINAL') @@ -528,9 +505,9 @@ SUBROUTINE GDATA (MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CIN, YMIN1 = YMIN XMAX1 = XMAX YMAX1 = YMAX -C + C SHOW STATUS OF ALL TOGGLES -C + ELSEIF ( (CIN (ICOM) (1:1) .EQ. 'S') .OR. & (CIN (ICOM) (1:1) .EQ. 's')) THEN ICOM = ICOM + 1 @@ -609,9 +586,9 @@ SUBROUTINE GDATA (MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CIN, CALL MESAGE (' PLOTTING ORDER AT REGION CENTERS IS: ') CALL MESAGE (' REGION NO./BLOCK ID NO./SCHEME ') CALL MESAGE ('*-------------------- NOTE -------------------*') -C + C FLAG REGIONS TO BE PROCESSED -C + ELSEIF ( (CIN (ICOM) (1:1) .EQ. 'R') .OR. & (CIN (ICOM) (1:1) .EQ. 'r')) THEN ICOM = ICOM + 1 @@ -642,15 +619,15 @@ SUBROUTINE GDATA (MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CIN, IF (IFOUND .GT. 0) THEN IF (I1 .GT. 0) THEN CALL CHECK (I1, I2, N (22)) -C + C FLAG ALL DATA ASSOCIATED WITH THE REGIONS -C + DO 250 I = I1, I2 CALL LTSORT (MR, LINKR, I, II, ADDLNK) IF (II .GT. 0) THEN -C + C FIND THE MAXIMUM AND MINIMUM -C + XMIN = AMIN1 (XMIN, REXTRM (1, II)) XMAX = AMAX1 (XMAX, REXTRM (2, II)) YMIN = AMIN1 (YMIN, REXTRM (3, II)) @@ -658,9 +635,9 @@ SUBROUTINE GDATA (MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CIN, GOPLOT = .TRUE. IREGN (II) = -IABS (IREGN (II)) DO 240 J = IFSIDE (II), IFSIDE (II) + NSPR (II)-1 -C + C FLAG SIDE DATA -C + IF ( ISLIST (J) .GT. 0) then CALL LTSORT (MS, LINKS, ISLIST(J), JJ, ADDLNK) if (JJ .GT. 0) THEN @@ -683,9 +660,9 @@ SUBROUTINE GDATA (MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CIN, ENDIF 220 CONTINUE end if -C + C FLAG LINE DATA -C + ELSE JJ = IABS (ISLIST (J)) CALL LTSORT (ML, LINKL, JJ, KK, ADDLNK) @@ -709,9 +686,9 @@ SUBROUTINE GDATA (MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CIN, ENDIF ENDIF IF (GOPLOT) THEN -C + C PLOT THE REGION DATA THAT HAS BEEN FLAGGED -C + IF (ALPHA) THEN CALL MESAGE ('NO PLOTTING POSSIBLE ON ALPHA-NUMERIC'// & ' TERMINAL') @@ -735,9 +712,9 @@ SUBROUTINE GDATA (MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CIN, YMIN1 = YMIN XMAX1 = XMAX YMAX1 = YMAX -C + C FLAG BARSETS TO BE PLOTTED -C + ELSEIF ( (CIN (ICOM) (1:1) .EQ. 'B') .OR. & (CIN (ICOM) (1:1) .EQ. 'b')) THEN ICOM = ICOM + 1 @@ -767,9 +744,9 @@ SUBROUTINE GDATA (MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CIN, IF (IFOUND .GT. 0) THEN IF (I1 .GT. 0) THEN CALL CHECK (I1, I2, N (21)) -C + C FLAG ALL LINES ASSOCIATED WITH THE BARSETS -C + DO 290 I = I1, I2 CALL LTSORT (MS, LINKB, I, II, ADDLNK) IF (II .GT. 0) THEN @@ -801,9 +778,9 @@ SUBROUTINE GDATA (MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CIN, ENDIF ENDIF IF (GOPLOT) THEN -C + C PLOT THE BARSET DATA THAT HAS BEEN FLAGGED -C + IF (ALPHA) THEN CALL MESAGE ('NO PLOTTING POSSIBLE ON ALPHANUMERIC '// & 'TERMINAL') @@ -827,9 +804,9 @@ SUBROUTINE GDATA (MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CIN, YMIN1 = YMIN XMAX1 = XMAX YMAX1 = YMAX -C + C ENTER ZOOM LOCATION -C + ELSEIF ( (CIN (ICOM) (1:1) .EQ. 'Z') .OR. & (CIN (ICOM) (1:1) .EQ. 'z')) THEN ICOM = ICOM + 1 @@ -837,9 +814,9 @@ SUBROUTINE GDATA (MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CIN, & DRAWN, ALPHA, DEV1, X1, X2, Y1, Y2, XX1, XX2, YY1, YY2, & XMIN1, XMAX1, YMIN1, YMAX1, XMIN, XMAX, YMIN, YMAX) DRAWN = .FALSE. -C + C RETURN FROM DATA PLOTTING -C + ELSEIF (CIN (ICOM) (1:1) .EQ. ' ') THEN ICOM = ICOM + 1 FLAG = .FALSE. @@ -848,9 +825,9 @@ SUBROUTINE GDATA (MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CIN, CALL FLAGD (MS, N (21), LINKB, IBARST, FLAG) CALL FLAGD (MR, N (22), LINKR, IREGN, FLAG) RETURN -C + C GENERATE A HARDCOPY QMS PLOT -C + ELSEIF ( ( (CIN (ICOM) (1:1) .EQ. 'H') .OR. & (CIN (ICOM) (1:2) .EQ. 'h')) .AND. & (CIN (ICOM) (2:2).NE.'E') .AND. @@ -871,9 +848,9 @@ SUBROUTINE GDATA (MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CIN, ELSE CALL MESAGE ('HARDCOPY DEVICE NOT AVAILABLE') ENDIF -C + C PLOT THE CURRENT ACTIVE ITEMS -C + ELSEIF ( (CIN (ICOM) (1:1) .EQ. 'P') .OR. & (CIN (ICOM) (1:1) .EQ. 'p')) THEN ICOM = ICOM + 1 @@ -889,9 +866,9 @@ SUBROUTINE GDATA (MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CIN, & XMIN, XMAX, YMIN, YMAX, XX1, YY1, XX2, YY2, DEV1, VERSN) DRAWN = .TRUE. ENDIF -C + C EXIT OPTION - EXITS FASTQ -C + ELSEIF ( (CIN (ICOM) (1:2) .EQ. 'EX') .OR. & (CIN (ICOM) (1:2) .EQ. 'ex')) THEN ICOM = ICOM + 1 @@ -904,13 +881,13 @@ SUBROUTINE GDATA (MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CIN, & TIME1, BATCH, VERSN) ENDIF GOTO 100 -C + C WRITE OUT THE HELP MESSAGE -C + ELSE ICOM = ICOM + 1 CALL HELP_FQ (5) ENDIF GOTO 100 -C + END diff --git a/packages/seacas/applications/fastq/getang.f b/packages/seacas/applications/fastq/getang.f index c125444606d3..f004bf36aaeb 100644 --- a/packages/seacas/applications/fastq/getang.f +++ b/packages/seacas/applications/fastq/getang.f @@ -1,63 +1,25 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: getang.f,v 1.5 2004/01/26 17:28:18 gdsjaar Exp $ -C $Log: getang.f,v $ -C Revision 1.5 2004/01/26 17:28:18 gdsjaar -C Removed several unused variables from getang subroutine. -C -C Initialized a variable -C -C Revision 1.4 2004/01/23 21:05:26 gdsjaar -C Removed integer*8 statement incorrectly checked in from AMD port -C -C Revision 1.3 2004/01/22 14:25:22 gdsjaar -C Attempt to fix strange problem on x86_64 AMD Opteron system using -C Portland Group 5.1-3 compilers. The getang function would work -C correctly if compiled with no optimization and in debug mode, but -C would crash if compiled optimized. The location of the crash was not -C in a place that made any sense that something was wrong. -C -C After much trial and error, it was found that adding a 'SAVE' -C statement at the beginning of the file fixed the problem. -C -C Also cleaned out some unused parameters being passed to the function. -C -C Revision 1.2 1991/03/21 15:44:47 gdsjaar -C Changed all 3.14159... to atan2(0.0, -1.0) -C -c Revision 1.1.1.1 1990/11/30 11:07:54 gdsjaar -c FASTQ Version 2.0X -c -c Revision 1.1 90/11/30 11:07:53 gdsjaar -c Initial revision -c -C -CC* FILE: [.PAVING]GETANG.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE GETANG (MXND, MLN, XN, YN, LNODES, LXK, KXL, NXL, & LXN, I, J, K, ANGLE, ERR) C*********************************************************************** -C + C SUBROUTINE GETANG = RETURNS THE CCW ANGLE FROM A VECTOR DRAWN C FROM NODE J TO K TO A VECTOR DRAWN C FROM NODE J TO I -C + C*********************************************************************** -C + DIMENSION LNODES (MLN, *) DIMENSION XN (*), YN (*) DIMENSION LXN(4, *), NXL(2, *) DIMENSION LXK(4, *), KXL(2, *) -C + LOGICAL CORNP, SIDEP, DISCTP, ERR -C C ... The save statement was added during debugging on the AMD Opteron C system using the pgf77 5.1-3 compiler. Without the save, the @@ -72,37 +34,37 @@ SUBROUTINE GETANG (MXND, MLN, XN, YN, LNODES, LXK, KXL, NXL, KOPP = 0 I1 = 0 KK1 = 0 -C + C CHECK FOR NODES ON TOP OF EACH OTHER -C + IF (((XN (J) .EQ. XN (K)) .AND. (YN (J) .EQ. YN (K)) ) .OR. & ( (XN (I) .EQ. XN (J)) .AND. (YN (I) .EQ. YN (J)) ) .OR. & ( (XN (I) .EQ. XN (K)) .AND. (YN (I) .EQ. YN (K)) ) ) THEN ANGLE = 0. GOTO 220 ENDIF -C + V1 = ATAN2 (YN (K)-YN (J), XN (K)-XN (J)) IF (V1 .LT. 0.) V1 = V1 + TWOPI V2 = ATAN2 (YN (I)-YN (J), XN (I)-XN (J)) IF (V2 .LT. 0.) V2 = V2 + TWOPI ANGLE = V2 - V1 IF (ANGLE .LT. 0.) ANGLE = ANGLE + TWOPI -C + C NOW CHECK TO MAKE SURE THAT THE ANGLE HAS NOT CROSSED THE PREVIOUS C ELEMENTS SIDES -C + L1 = LNODES (5, I) L2 = LNODES (5, J) K1 = KXL (1, L1) K2 = KXL (1, L2) IF (K1 .EQ. K2) GOTO 210 -C + C SEE IF L2 CROSSES INTO K1 - FIRST GET THE NODE OPPOSITE I C AND THEN CHECK THE ANGLE FROM VECTOR J TO K AND VECTOR C J TO IOPP AGAINST THE INTERNAL ANGLE - SMALLER AND IT HAS C CROSSED OVER. -C + IF (K1 .NE. 0) THEN DO 100 II = 1, 4 LTEST = LXK (II, K1) @@ -118,15 +80,14 @@ SUBROUTINE GETANG (MXND, MLN, XN, YN, LNODES, LXK, KXL, NXL, ENDIF ENDIF 100 CONTINUE -C + CALL MESAGE ('** PROBLEMS IN GETANG GETTING IOPP **') ERR = .TRUE. GOTO 220 110 CONTINUE -C C NOW TEST FOR CROSS-OVER -C + V2OPP = ATAN2 (YN (IOPP) - YN (J), XN (IOPP) - XN (J)) IF (V2OPP .LT. 0.) V2OPP = V2OPP + TWOPI ANGLE1 = V2OPP - V2 @@ -138,12 +99,12 @@ SUBROUTINE GETANG (MXND, MLN, XN, YN, LNODES, LXK, KXL, NXL, GOTO 210 ENDIF END IF -C + C SEE IF L2 CROSSES INTO K1 - FIRST GET THE NODE OPPOSITE K C AND THEN CHECK THE ANGLE FROM VECTOR J TO K AND VECTOR C J TO IOPP AGAINST THE INTERNAL ANGLE - SMALLER AND IT HAS C CROSSED OVER. -C + 120 CONTINUE IF (K2 .EQ. 0) GOTO 210 DO 130 II = 1, 4 @@ -158,14 +119,14 @@ SUBROUTINE GETANG (MXND, MLN, XN, YN, LNODES, LXK, KXL, NXL, ENDIF ENDIF 130 CONTINUE -C + CALL MESAGE ('** PROBLEMS IN GETANG GETTING KOPP **') ERR = .TRUE. GOTO 220 140 CONTINUE -C + C NOW TEST FOR CROSS-OVER -C + V1OPP = ATAN2 (YN (KOPP) - YN (J), XN (KOPP) - XN (J)) IF (V1OPP .LT. 0.) V1OPP = V1OPP + TWOPI ANGLE1 = V1 - V1OPP @@ -176,19 +137,19 @@ SUBROUTINE GETANG (MXND, MLN, XN, YN, LNODES, LXK, KXL, NXL, ANGLE = ANGLE - TWOPI GOTO 210 ENDIF -C + C NOW CHECK TO MAKE SURE THAT THE ANGLE HAS NOT CROSSED OVER TWO C ELEMENT SIDES IF THE NODE IS ATTACHED TO 5 OR MORE LINES -C + IF (LXN (4, J) .LT. 0) THEN K3 = KXL (1, L3) + KXL (2, L3) - K1 IF (K3 .EQ. K2) GOTO 210 -C + C SEE IF L2 CROSSES INTO K3 - FIRST GET THE NODE OPPOSITE J C AND THEN CHECK THE ANGLE FROM VECTOR J TO K AND VECTOR C J TO IOPP AGAINST THE INTERNAL ANGLE - SMALLER AND IT HAS C CROSSED OVER. -C + IF (K3 .EQ. 0) GOTO 120 DO 150 II = 1, 4 LTEST = LXK (II, K3) @@ -202,15 +163,14 @@ SUBROUTINE GETANG (MXND, MLN, XN, YN, LNODES, LXK, KXL, NXL, ENDIF ENDIF 150 CONTINUE -C + CALL MESAGE ('** PROBLEMS IN GETANG GETTING IOPP3 **') ERR = .TRUE. GOTO 220 160 CONTINUE -C C NOW TEST FOR CROSS-OVER -C + V3OPP = ATAN2 (YN (IOPP3) - YN (J), XN (IOPP3) - XN (J)) IF (V3OPP .LT. 0.) V3OPP = V3OPP + TWOPI ANGLE1 = V3OPP - V2 @@ -222,10 +182,10 @@ SUBROUTINE GETANG (MXND, MLN, XN, YN, LNODES, LXK, KXL, NXL, GOTO 210 ENDIF ENDIF -C + C NOW CHECK FOR AN INVERTED THREE NODE ANGLE - VERY SPECIAL C CASE THAT FALLS THROUGH THE PREVIOUS CHECK -C + IF (KOPP .EQ. IOPP) THEN DO 170 II = 1, 4 LTEST = LXK (II, K1) @@ -239,7 +199,7 @@ SUBROUTINE GETANG (MXND, MLN, XN, YN, LNODES, LXK, KXL, NXL, GOTO 180 ENDIF 170 CONTINUE -C + CALL MESAGE ('** PROBLEMS IN GETANG GETTING I1 **') GOTO 220 180 CONTINUE @@ -255,14 +215,13 @@ SUBROUTINE GETANG (MXND, MLN, XN, YN, LNODES, LXK, KXL, NXL, GOTO 200 ENDIF 190 CONTINUE -C + CALL MESAGE ('** PROBLEMS IN GETANG KK1 **') GOTO 220 200 CONTINUE -C C NOW TEST FOR INVERSION -C + VVJ = ATAN2 (YN (J) - YN (KOPP), XN (J) - XN (KOPP)) IF (VVJ .LT. 0.) VVJ = VVJ + TWOPI VVI1 = ATAN2 (YN (I1) - YN (KOPP), XN (I1) - XN (KOPP)) @@ -277,9 +236,9 @@ SUBROUTINE GETANG (MXND, MLN, XN, YN, LNODES, LXK, KXL, NXL, ANGLE = ANGLE - TWOPI ENDIF ENDIF -C + C GET THE RIGHT CLASSIFICATION -C + 210 CONTINUE IF (CORNP (ANGLE)) THEN IF (SIDEP (ANGLE)) THEN @@ -296,8 +255,8 @@ SUBROUTINE GETANG (MXND, MLN, XN, YN, LNODES, LXK, KXL, NXL, ELSE LNODES (6, J) = 5 ENDIF -C + 220 CONTINUE RETURN -C + END diff --git a/packages/seacas/applications/fastq/getcrn.f b/packages/seacas/applications/fastq/getcrn.f index 801621733d62..607fe4417b06 100644 --- a/packages/seacas/applications/fastq/getcrn.f +++ b/packages/seacas/applications/fastq/getcrn.f @@ -1,38 +1,27 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: getcrn.f,v 1.1 1990/11/30 11:07:56 gdsjaar Exp $ -C $Log: getcrn.f,v $ -C Revision 1.1 1990/11/30 11:07:56 gdsjaar -C Initial revision -C -C -CC* FILE: [.PAVING]GETCRN.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE GETCRN (MXND, MXCORN, MLN, LNODES, NCORN, LCORN, & ANGLE, XN, YN, LXN, NLOOP, N1, ONLYC, PPOSBL, GRAPH, ERR) C*********************************************************************** -C + C SUBROUTINE GETCRN = SETS UP ALL THE POSSIBLE CORNER (OR NON-SIDE) C LOCATIONS IN THE MESH -C + C*********************************************************************** -C + DIMENSION LNODES (MLN, MXND), LCORN (MXCORN), ANGLE (MXND) DIMENSION XN (MXND), YN (MXND), LXN (4, MXND), X(1), Y(1) -C + LOGICAL ONLYC, GRAPH, PPOSBL, ERR -C + ERR = .FALSE. -C + C COUNT THE CURRENT "POSSIBLE NON-SIDES" STARTING AT THE I COUNTER -C + NODE = N1 NOLD = N1 KOUNTC = 0 @@ -46,17 +35,17 @@ SUBROUTINE GETCRN (MXND, MXCORN, MLN, LNODES, NCORN, LCORN, ERR = .TRUE. GOTO 120 ENDIF -C + C CHECK IF A PRIMITIVE IS EVEN POSSIBLE HERE -C + IF ( LNODES (6, NODE) .GT. 4) PPOSBL = .FALSE. -C + C CHECK FOR A POSSIBLE "NON - SIDE" NODE -C + IF (ONLYC) CALL NDSTAT (NODE, LXN (1, NODE), ANGLE (NODE), ISTAT) -C + C A NEW "POSSIBLE NON-SIDE" NODE HAS BEEN FOUND -C + IF ( ( (ONLYC) .AND. (ISTAT .EQ. 1) ) .OR. & ( (.NOT. ONLYC) .AND. (LNODES (6, NODE) .NE. 3) ) ) THEN IF (GRAPH) THEN @@ -78,9 +67,9 @@ SUBROUTINE GETCRN (MXND, MXCORN, MLN, LNODES, NCORN, LCORN, ENDIF CALL SFLUSH ENDIF -C + C TOO MANY "NON-SIDES" HAVE BEEN FOUND - JUST PICK ONE AND GO -C + IF (NCORN .EQ. MXCORN) THEN PPOSBL = .FALSE. DO 110 J = 1, NCORN @@ -94,38 +83,38 @@ SUBROUTINE GETCRN (MXND, MXCORN, MLN, LNODES, NCORN, LCORN, IF (GRAPH) CALL LCOLOR ('WHITE') GOTO 120 ENDIF -C + C INPUT THIS "NON-SIDE" -C + NCORN = NCORN + 1 LCORN (NCORN) = NODE -C + C ADD UP THE NUMBER OF NODES FROM THE LAST "NON-SIDE" -C + IF (NCORN .GT. 1) THEN LNODES (7, LCORN (NCORN - 1)) = KOUNTC + 1 ELSE KKC = KOUNTC + 1 ENDIF KOUNTC = 0 -C + C THIS IS A SIDE - JUST CONTINUE -C + ELSE KOUNTC = KOUNTC + 1 ENDIF -C + C CHECK FOR COMPLETION OF THE LOOP -C + NODE = LNODES (3, NODE) IF (NODE .NE. NOLD) GOTO 100 -C + C GET THE FIRST CORNER'S DISTANCE FROM PREVIOUS CORNER CORRECT -C + IF (NCORN .GE. 1) LNODES (7, LCORN (NCORN ) ) = KKC + KOUNTC -C + 120 CONTINUE -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/getdum.f b/packages/seacas/applications/fastq/getdum.f index 5dd8913c50c6..1261998551a9 100644 --- a/packages/seacas/applications/fastq/getdum.f +++ b/packages/seacas/applications/fastq/getdum.f @@ -1,29 +1,18 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: getdum.f,v 1.1 1990/11/30 11:08:00 gdsjaar Exp $ -C $Log: getdum.f,v $ -C Revision 1.1 1990/11/30 11:08:00 gdsjaar -C Initial revision -C -C -CC* FILE: [.MAIN]GETDUM.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE GETDUM (I, DUMMY, LEN) C*********************************************************************** -C + C SUBROUTINE GETDUM = GETS AN INTEGER INTO A DUMMY CHARACTER STRING -C + C*********************************************************************** -C + CHARACTER*72 DUMMY -C + DUMMY = ' ' IF (I .LT. -9999) THEN WRITE(DUMMY(1:6),10050)I @@ -57,12 +46,12 @@ SUBROUTINE GETDUM (I, DUMMY, LEN) LEN = 5 ENDIF RETURN -C + 10000 FORMAT (I1) 10010 FORMAT (I2) 10020 FORMAT (I3) 10030 FORMAT (I4) 10040 FORMAT (I5) 10050 FORMAT (I6) -C + END diff --git a/packages/seacas/applications/fastq/getext.f b/packages/seacas/applications/fastq/getext.f index c2bc2d39918b..0ed22f0778c1 100644 --- a/packages/seacas/applications/fastq/getext.f +++ b/packages/seacas/applications/fastq/getext.f @@ -1,38 +1,18 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: getext.f,v 1.2 1999/06/17 19:02:22 gdsjaar Exp $ -C $Log: getext.f,v $ -C Revision 1.2 1999/06/17 19:02:22 gdsjaar -C Fixed several problems related to holes. In several places, a -C nonpositive integer was being used to index into an array. This seems -C to fix all of those cases. I'm not sure if I fixed the true cause of -C these errors or just the symptom though... -C -C Revision 1.1.1.1 1990/11/30 11:08:04 gdsjaar -C FASTQ Version 2.0X -C -c Revision 1.1 90/11/30 11:08:02 gdsjaar -c Initial revision -c -C -CC* FILE: [.MAIN]GETEXT.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE GETEXT (MP, ML, MS, MR, N, IPOINT, COOR, ILINE, LTYPE, & LCON, NLPS, IFLINE, ILLIST, NSPR, IFSIDE, ISLIST, LINKP, & LINKL, LINKS, LINKR, REXTRM, BXMIN, BXMAX, BYMIN, BYMAX) C*********************************************************************** -C + C SUBROUTINE GETEXT = GETS THE REGION AND BODY EXTREMES -C + C*********************************************************************** -C + DIMENSION IPOINT (MP), COOR (2, MP) DIMENSION ILINE (ML), LTYPE (ML), LCON (3, ML) DIMENSION NLPS (MS), IFLINE (MS), ILLIST (MS * 3) @@ -40,12 +20,12 @@ SUBROUTINE GETEXT (MP, ML, MS, MR, N, IPOINT, COOR, ILINE, LTYPE, DIMENSION LINKP (2, MP), LINKL (2, ML), LINKS (2, MS) DIMENSION LINKR (2, MR) DIMENSION REXTRM (4, MR), N (29) -C + LOGICAL FOUND, GETMAX, ADDLNK LOGICAL NUMPLT, TEST -C + C GET THE POINTS EXTREMES -C + ADDLNK = .FALSE. GETMAX = .TRUE. FOUND = .FALSE. @@ -66,9 +46,9 @@ SUBROUTINE GETEXT (MP, ML, MS, MR, N, IPOINT, COOR, ILINE, LTYPE, ENDIF ENDIF 100 CONTINUE -C + C GET ALL THE LINES EXTREMES -C + IF (FOUND) THEN DO 110 I = 1, N (2) CALL LTSORT (ML, LINKL, IABS (ILINE (I)), II, ADDLNK) @@ -85,9 +65,9 @@ SUBROUTINE GETEXT (MP, ML, MS, MR, N, IPOINT, COOR, ILINE, LTYPE, BYMIN = 0. BYMAX = 15. ENDIF -C + C CALCULATE THE EXTREMES FOR EACH REGION -C + DO 120 I = 1, N (22) CALL LTSORT (MR, LINKR, I, II, ADDLNK) IF (II .GT. 0) THEN @@ -100,7 +80,7 @@ SUBROUTINE GETEXT (MP, ML, MS, MR, N, IPOINT, COOR, ILINE, LTYPE, REXTRM (4, II) = YMAX ENDIF 120 CONTINUE -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/getfrm.f b/packages/seacas/applications/fastq/getfrm.f index 1430427e9629..06a12acd2586 100644 --- a/packages/seacas/applications/fastq/getfrm.f +++ b/packages/seacas/applications/fastq/getfrm.f @@ -1,31 +1,20 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: getfrm.f,v 1.1 1990/11/30 11:08:05 gdsjaar Exp $ -C $Log: getfrm.f,v $ -C Revision 1.1 1990/11/30 11:08:05 gdsjaar -C Initial revision -C -C -CC* FILE: [.PAVING]GETFRM.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE GETFRM (MXND, LINES, NL, NXL, NODE, N0, N2, NFROM) C*********************************************************************** -C + C SUBROUTINE GETFRM = GETS THE NODES THAT THE CURRENT NODE CAME FROM -C + C*********************************************************************** -C + DIMENSION NXL(2, 3*MXND), LINES(NL) -C + NFROM = 0 -C + IF (NL .EQ. 3) THEN DO 100 IL = 1, NL ILL = LINES (IL) @@ -44,7 +33,7 @@ SUBROUTINE GETFRM (MXND, LINES, NL, NXL, NODE, N0, N2, NFROM) 100 CONTINUE ENDIF 110 CONTINUE -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/geti12.f b/packages/seacas/applications/fastq/geti12.f index 2443c8b78c3c..c1e44869f025 100644 --- a/packages/seacas/applications/fastq/geti12.f +++ b/packages/seacas/applications/fastq/geti12.f @@ -1,31 +1,20 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: geti12.f,v 1.1 1990/11/30 11:08:08 gdsjaar Exp $ -C $Log: geti12.f,v $ -C Revision 1.1 1990/11/30 11:08:08 gdsjaar -C Initial revision -C -C -CC* FILE: [.MAIN]GETI12.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE GETI12 (MCOM, ICOM, JCOM, CIN, IIN, KIN, I1, I2, & IFOUND) C*********************************************************************** -C + C SUBROUTINE GETI12 = GETS TWO INTEGERS -C + C*********************************************************************** -C + DIMENSION IIN (MCOM), KIN (MCOM) CHARACTER*72 CIN (MCOM) -C + IF ((ICOM .GT. JCOM) .OR. (CIN (ICOM) (1:1) .EQ. ' ')) THEN IFOUND = 0 ICOM = ICOM + 1 @@ -44,5 +33,5 @@ SUBROUTINE GETI12 (MCOM, ICOM, JCOM, CIN, IIN, KIN, I1, I2, ENDIF ENDIF RETURN -C + END diff --git a/packages/seacas/applications/fastq/geti1r.f b/packages/seacas/applications/fastq/geti1r.f index 6f77e1abaf76..40792fc2cc24 100644 --- a/packages/seacas/applications/fastq/geti1r.f +++ b/packages/seacas/applications/fastq/geti1r.f @@ -1,31 +1,20 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: geti1r.f,v 1.1 1990/11/30 11:08:11 gdsjaar Exp $ -C $Log: geti1r.f,v $ -C Revision 1.1 1990/11/30 11:08:11 gdsjaar -C Initial revision -C -C -CC* FILE: [.MAIN]GETI1R.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE GETI1R (MCOM, ICOM, JCOM, CIN, IIN, RIN, KIN, I1, R1, & IFOUND) C*********************************************************************** -C + C SUBROUTINE GETI1R = GETS AN INTEGER AND A REAL INPUT NUMBER -C + C*********************************************************************** -C + DIMENSION IIN(MCOM), RIN(MCOM), KIN(MCOM) CHARACTER*72 CIN(MCOM) -C + IF( (ICOM .GT. JCOM) .OR. (CIN(ICOM) (1:1) .EQ. ' ') ) THEN ICOM = ICOM+1 IFOUND = 0 @@ -42,5 +31,5 @@ SUBROUTINE GETI1R (MCOM, ICOM, JCOM, CIN, IIN, RIN, KIN, I1, R1, ENDIF ENDIF RETURN -C + END diff --git a/packages/seacas/applications/fastq/getime.f b/packages/seacas/applications/fastq/getime.f index 1bfcd69c1e78..b8ae9b286723 100644 --- a/packages/seacas/applications/fastq/getime.f +++ b/packages/seacas/applications/fastq/getime.f @@ -1,27 +1,16 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: getime.f,v 1.1 1990/11/30 11:08:13 gdsjaar Exp $ -C $Log: getime.f,v $ -C Revision 1.1 1990/11/30 11:08:13 gdsjaar -C Initial revision -C -C -CC* FILE: [.PAVING]FRSTRM.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE GETIME (TIME) C*********************************************************************** -C + C SUBROUTINE GETIME = GETS THE CPU TIME USED BY THE CURRENT PROCESS -C + C*********************************************************************** -C + CALL EXCPUS (TIME) RETURN END diff --git a/packages/seacas/applications/fastq/getkxn.f b/packages/seacas/applications/fastq/getkxn.f index 11de815225ac..0f66c4fe1b59 100644 --- a/packages/seacas/applications/fastq/getkxn.f +++ b/packages/seacas/applications/fastq/getkxn.f @@ -1,38 +1,27 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: getkxn.f,v 1.1 1990/11/30 11:08:16 gdsjaar Exp $ -C $Log: getkxn.f,v $ -C Revision 1.1 1990/11/30 11:08:16 gdsjaar -C Initial revision -C -C -CC* FILE: [.RENUM]GETKXN.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE GETKXN (NPNODE, MAXKXN, NNXK, KXN, NUID, NODE, KLIST, & NUMK, ERR) C*********************************************************************** -C + C SUBROUTINE GETKXN = GET THE LIST OF ELEMENTS RELATED TO THIS NODE -C + C*********************************************************************** -C + DIMENSION KLIST (20), NUID (NPNODE), KXN (NNXK, MAXKXN) -C + LOGICAL ERR -C + ERR = .FALSE. NUM = 0 NN = NODE -C + C ADD IN THE FIRST THREE NODES LISTED -C + 100 CONTINUE DO 110 I = 1, 3 IF (KXN (I, NN) .EQ. 0) THEN @@ -48,9 +37,9 @@ SUBROUTINE GETKXN (NPNODE, MAXKXN, NNXK, KXN, NUID, NODE, KLIST, NUM = NUM + 1 KLIST (NUM) = KXN (I, NN) 110 CONTINUE -C + C CHECK THE FOURTH NODE FOR CONTINUATION -C + IF (KXN (4, NN) .LT. 0) THEN NN = IABS (KXN (4, NN)) IF (NUM .LT. 18) THEN @@ -60,9 +49,9 @@ SUBROUTINE GETKXN (NPNODE, MAXKXN, NNXK, KXN, NUID, NODE, KLIST, ERR = .TRUE. RETURN ENDIF -C + C ADD IN THE LAST NODE IF IT IS NONZERO -C + ELSE IF (KXN (4, NN) .NE. 0) THEN NUM = NUM + 1 @@ -77,9 +66,9 @@ SUBROUTINE GETKXN (NPNODE, MAXKXN, NNXK, KXN, NUID, NODE, KLIST, RETURN ENDIF ENDIF -C + 10000 FORMAT (' NO ELEMENTS CONNECTED TO NODE', I5, ', NUID = ', I10) 10010 FORMAT (' TOO MANY ELEMENTS CONNECTED TO NODE', I5, ', NUID = ', & I10) -C + END diff --git a/packages/seacas/applications/fastq/getlxn.f b/packages/seacas/applications/fastq/getlxn.f index bd5e5175003b..695bdb5bae30 100644 --- a/packages/seacas/applications/fastq/getlxn.f +++ b/packages/seacas/applications/fastq/getlxn.f @@ -1,31 +1,20 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: getlxn.f,v 1.1 1990/11/30 11:08:19 gdsjaar Exp $ -C $Log: getlxn.f,v $ -C Revision 1.1 1990/11/30 11:08:19 gdsjaar -C Initial revision -C -C -CC* FILE: [.QMESH]GETLXN.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE GETLXN (MXND, LXN, NODE, LINES, NL, ERR) C*********************************************************************** -C + C SUBROUTINE GETLXN = GET THE FULL LIST OF LINES CONNECTED TO NODE -C + C*********************************************************************** -C + DIMENSION LINES (20), LXN (4, MXND) -C + LOGICAL ERR -C + ERR = .FALSE. NN = NODE NUM = 0 @@ -63,7 +52,7 @@ SUBROUTINE GETLXN (MXND, LXN, NODE, LINES, NL, ERR) NL = NUM RETURN ENDIF -C + 10000 FORMAT (' IN GETLXN, TOO MANY NODES CONNECTED TO NODE', I5) -C + END diff --git a/packages/seacas/applications/fastq/getm1.f b/packages/seacas/applications/fastq/getm1.f index 89786be81499..2d0f7ed4b77e 100644 --- a/packages/seacas/applications/fastq/getm1.f +++ b/packages/seacas/applications/fastq/getm1.f @@ -1,51 +1,40 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: getm1.f,v 1.1 1990/11/30 11:08:22 gdsjaar Exp $ -C $Log: getm1.f,v $ -C Revision 1.1 1990/11/30 11:08:22 gdsjaar -C Initial revision -C -C -CC* FILE: [.QMESH]GETM1.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE GETM1(ML, MS, MNNPS, NS, ISLIST, NINT, IFLINE, NLPS, & ILLIST, LINKL, LINKS, X, Y, NID, NNPS, ANGLE, NPER, SCHSTR, & M1, CCW, NORM, REAL, ERR) C*********************************************************************** -C + C SUBROUTINE GETM1 = GETS THE APPROPRIATE M1 VALUE -C + C*********************************************************************** -C + C SUBROUTINE CALLED BY: C QMESH = GENERATES QUAD ELEMENTS -C + C*********************************************************************** -C + C VARIABLES USED: C NNPS = ARRAY OF NUMBER OF NODES PER SIDE C CCW = .TRUE. IF THE SIDE IS ORIENTED CCW C NORM = .TRUE. IF THE FIRST SIDE IS TO BE TRIED AS THE BASE -C + C*********************************************************************** -C + DIMENSION NNPS(MNNPS), ISLIST(NS), LINKL(2, ML), LINKS(MS*2) DIMENSION NINT(ML), NLPS(MS), IFLINE(MS), ILLIST(MS*3) DIMENSION X(NPER), Y(NPER), NID(NPER), ANGLE(NPER) -C + LOGICAL CCW, ERR, NORM, REAL -C + CHARACTER*72 SCHSTR -C + C SEE IF LETTER M OCCURS IN THE SCHEME (NOT THE "NORMAL" CASE) -C + NORM = .TRUE. DO 100 J = 1, 72 IF ( (SCHSTR (J:J) .EQ. 'M') .OR. @@ -55,36 +44,36 @@ SUBROUTINE GETM1(ML, MS, MNNPS, NS, ISLIST, NINT, IFLINE, NLPS, ENDIF 100 CONTINUE 110 CONTINUE -C + C CALCULATE THE NUMBER OF NODES PER SIDE -C + CALL NPS (ML, MS, MNNPS, NS, ISLIST, NINT, IFLINE, NLPS, ILLIST, & LINKL, LINKS, NNPS, ERR) IF (ERR) RETURN -C + C NORMAL CASE - TRY THE FIRST SIDE IN THE SIDE LIST AS THE M1 BASE C IN CCW ORDER IF IT IS NOT RIDICULOUS -C + IF (NORM) THEN M1 = NNPS (1) - 1 IF (.NOT. CCW) M1 = NPER / 2 - M1 IF ( (M1 .GT. 0).AND. (M1 .LE. NPER/2) ) RETURN ENDIF IF (.NOT. CCW) CALL IREVER (NNPS, NS) -C + C IF THE BOUNDARY IS A LOGICAL RECTANGLE, USE IT -C + IF ( (NS .EQ. 4) .AND. (NNPS (1) .EQ. NNPS (3)) .AND. & (NNPS (2) .EQ. NNPS (4) ) ) THEN M1 = NNPS (1) - 1 -C + C OTHERWISE, FIND AN INITIAL M1 FOR A NON-LOGICAL RECTANGLE -C + ELSE CALL PICKM1 (NPER, X, Y, ANGLE, M1, IFIRST, REAL) IF (IFIRST .NE. 1) CALL FQ_ROTATE (NPER, X, Y, NID, IFIRST) ENDIF -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/getm3.f b/packages/seacas/applications/fastq/getm3.f index 742e795f3ec3..09fcb634c595 100644 --- a/packages/seacas/applications/fastq/getm3.f +++ b/packages/seacas/applications/fastq/getm3.f @@ -1,76 +1,51 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: getm3.f,v 1.3 2000/11/13 15:39:04 gdsjaar Exp $ -C $Log: getm3.f,v $ -C Revision 1.3 2000/11/13 15:39:04 gdsjaar -C Cleaned up unused variables and labels. -C -C Removed some real to int conversion warnings. -C -C Revision 1.2 1998/07/14 18:19:01 gdsjaar -C Removed unused variables, cleaned up a little. -C -C Changed BLUE labels to GREEN to help visibility on black background -C (indirectly requested by a couple users) -C -C Revision 1.1.1.1 1990/11/30 11:08:26 gdsjaar -C FASTQ Version 2.0X -C -c Revision 1.1 90/11/30 11:08:24 gdsjaar -c Initial revision -c -C -CC* FILE: [.QMESH]GETM3.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE GETM3 (ML, MS, MNNPS, NS, ISLIST, NINT, IFLINE, NLPS, & ILLIST, LINKL, LINKS, X, Y, NID, NNPS, ANGLE, NPER, M1A, M1B, & M2A, M2B, M3A, M3B, XCEN, YCEN, CCW, ERR) C*********************************************************************** -C + C SUBROUTINE GETM3 = GETS THE APPROPRIATE SIDE LENGTHS AND DIVISIONS C FOR A TRIANGULAR REGION -C + C*********************************************************************** -C + C SUBROUTINE CALLED BY: C QMESH = GENERATES QUAD ELEMENTS -C + C*********************************************************************** -C + C VARIABLES USED: C NNPS = ARRAY OF NUMBER OF NODES PER SIDE C CCW = .TRUE. IF THE SIDE IS ORIENTED CCW C NORM = .TRUE. IF THE FIRST SIDE IS TO BE TRIED AS THE BASE -C + C*********************************************************************** -C + DIMENSION NNPS (MNNPS), ISLIST (NS), LINKL (2, ML), LINKS (MS*2) DIMENSION NINT (ML), NLPS (MS), IFLINE (MS), ILLIST (MS*3) DIMENSION X (NPER), Y (NPER), NID (NPER), ANGLE (NPER) -C + LOGICAL CCW, ERR -C + C CALCULATE THE NUMBER OF NODES PER SIDE -C + CALL NPS (ML, MS, MNNPS, NS, ISLIST, NINT, IFLINE, NLPS, ILLIST, & LINKL, LINKS, NNPS, ERR) IF (ERR) RETURN IF (.NOT. CCW) CALL IREVER (NNPS, NS) -C + C FIND THE BEST CORNER NODES IN THE LIST -C + CALL PICKM3 (NPER, X, Y, ANGLE, M1, M2, IFIRST) IF (IFIRST .NE. 1) CALL FQ_ROTATE (NPER, X, Y, NID, IFIRST) -C + C NOW SORT THE LIST SO THE LONGEST SIDE IS FIRST -C + M3 = NPER - M1 - M2 MMAX = MAX0 (M1, M2, M3) IF (M1 .EQ. MMAX)THEN @@ -88,9 +63,9 @@ SUBROUTINE GETM3 (ML, MS, MNNPS, NS, ISLIST, NINT, IFLINE, NLPS, M3 = M2 M2 = MHOLD ENDIF -C + C SPLIT THE SIDES INTO LOGICAL DIVISIONS -C + C IF (M2 .EQ. M3)THEN C M1A = (.5 * DBLE(M1)) + .001 C M1B = M1A @@ -113,25 +88,25 @@ SUBROUTINE GETM3 (ML, MS, MNNPS, NS, ISLIST, NINT, IFLINE, NLPS, M2B = M1A M3A = M1B M3B = M3 - M3A -C + ERR = .TRUE. IF (M3B .NE. M2A) THEN CALL MESAGE ('ERROR GENERATING TRIANGLE DIVISION POINT') RETURN ENDIF -C + C DEFINE THE MIDDLE POINT AS THE AVERAGE OF PROPORIONAL DIVISIONS C OF SIDE DIVISION POINT TO OPPOSITE TRIANGLE CORNER LINES -C + I1 = 1 I2 = M1 + 1 I3 = M1 + M2 + 1 J1 = I1 + M1A J2 = I2 + M2A J3 = I3 + M3A -C + C FIND DISTANCES FROM CORNER TO CORNER, AND CORNERS TO SIDE DIVISIONS -C + D1 = SQRT ( (X (I2) - X (I1)) **2 + (Y (I2) - Y (I1)) **2) D2 = SQRT ( (X (I3) - X (I2)) **2 + (Y (I3) - Y (I2)) **2) D3 = SQRT ( (X (I1) - X (I3)) **2 + (Y (I1) - Y (I3)) **2) @@ -141,9 +116,9 @@ SUBROUTINE GETM3 (ML, MS, MNNPS, NS, ISLIST, NINT, IFLINE, NLPS, D2B = SQRT ( (X (I3) - X (J2)) **2 + (Y (I3) - Y (J2)) **2) D3A = SQRT ( (X (J3) - X (I3)) **2 + (Y (J3) - Y (I3)) **2) D3B = SQRT ( (X (I1) - X (J3)) **2 + (Y (I1) - Y (J3)) **2) -C + C GET MIDPOINT TRIALS 1, 2, AND 3 AS PROPORTIONS -C + PRO1 = .5 * ( (D3A / D3) + (D1B / D1)) X1 = X (J2) - (PRO1 * (X (J2) - X (I1))) Y1 = Y (J2) - (PRO1 * (Y (J2) - Y (I1))) @@ -153,13 +128,13 @@ SUBROUTINE GETM3 (ML, MS, MNNPS, NS, ISLIST, NINT, IFLINE, NLPS, PRO3 = .5 * ( (D2A / D2) + (D3B / D3)) X3 = X (J1) - (PRO3 * (X (J1) - X (I3))) Y3 = Y (J1) - (PRO3 * (Y (J1) - Y (I3))) -C + C AVERAGE POINTS TO GET THE CENTER -C + XCEN = (X1 + X2 + X3) / 3. YCEN = (Y1 + Y2 + Y3) / 3. -C + ERR = .FALSE. RETURN -C + END diff --git a/packages/seacas/applications/fastq/getm5.f b/packages/seacas/applications/fastq/getm5.f index 50933ad043fa..6626d6dbee06 100644 --- a/packages/seacas/applications/fastq/getm5.f +++ b/packages/seacas/applications/fastq/getm5.f @@ -1,78 +1,58 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: getm5.f,v 1.2 1998/07/14 18:19:03 gdsjaar Exp $ -C $Log: getm5.f,v $ -C Revision 1.2 1998/07/14 18:19:03 gdsjaar -C Removed unused variables, cleaned up a little. -C -C Changed BLUE labels to GREEN to help visibility on black background -C (indirectly requested by a couple users) -C -C Revision 1.1.1.1 1990/11/30 11:08:29 gdsjaar -C FASTQ Version 2.0X -C -c Revision 1.1 90/11/30 11:08:27 gdsjaar -c Initial revision -c -C -CC* FILE: [.QMESH]GETM5.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE GETM5 (IA, ML, MS, MNNPS, NS, ISLIST, NINT, IFLINE, & NLPS, ILLIST, LINKL, LINKS, X, Y, NID, NNPS, ANGLE, NPER, & M1A, M1B, M2, M3A, M3B, M4A, M4B, M5, MC, XCEN, YCEN, CCW, ERR) C*********************************************************************** -C + C SUBROUTINE GETM5 = GETS THE APPROPRIATE SIDE LENGTHS AND DIVISIONS C FOR A PENTAGON REGION -C + C WRITTEN BY: HORACIO RECALDE DATE: JAN 1988 -C + C*********************************************************************** -C + C SUBROUTINE CALLED BY: C QMESH = GENERATES QUAD ELEMENTS -C + C*********************************************************************** -C + C VARIABLES USED: C NNPS = ARRAY OF NUMBER OF NODES PER SIDE C CCW = .TRUE. IF THE SIDE IS ORIENTED CCW C NORM = .TRUE. IF THE FIRST SIDE IS TO BE TRIED AS THE BASE -C + C*********************************************************************** -C + DIMENSION IA(1) DIMENSION NNPS(MNNPS), ISLIST(NS), LINKL(2, ML), LINKS(MS*2) DIMENSION NLPS(MS), NINT(ML), IFLINE(MS), ILLIST(MS*3) DIMENSION X(NPER), Y(NPER), NID(NPER), ANGLE(NPER) DIMENSION XJ(3), YJ(3) -C + LOGICAL CCW, ERR -C + C CALCULATE THE NUMBER OF NODES PER SIDE -C + CALL NPS (ML, MS, MNNPS, NS, ISLIST, NINT, IFLINE, NLPS, ILLIST, & LINKL, LINKS, NNPS, ERR) IF (ERR)RETURN IF (.NOT.CCW) CALL IREVER (NNPS, NS) -C + C RESERVE MEMORY FOR THE STACKS -C + CALL MDRSRV ('IST2', IP2, NPER) CALL MDRSRV ('IST3', IP3, NPER) CALL MDRSRV ('IST4', IP4, NPER) CALL MDRSRV ('IST5', IP5, NPER) CALL MDRSRV ('INDST', INDP, NPER) -C + C FIND THE BEST CORNER NODES IN THE LIST -C + CALL PICKM5 (NPER, X, Y, ANGLE, IA(IP2), IA(IP3), IA(IP4), & IA(IP5), IA(INDP), IFIRST, M1, M2, M3, M4) IF (IFIRST .EQ. 0) THEN @@ -86,17 +66,17 @@ SUBROUTINE GETM5 (IA, ML, MS, MNNPS, NS, ISLIST, NINT, IFLINE, ELSE IF (IFIRST.NE.1) THEN CALL FQ_ROTATE (NPER, X, Y, NID, IFIRST) END IF -C + C DELETE THE STACKS -C + CALL MDDEL ('IST2') CALL MDDEL ('IST3') CALL MDDEL ('IST4') CALL MDDEL ('IST5') CALL MDDEL ('INDST') -C + C NOW SORT THE LIST SO THE LONGEST SIDE IS FIRST -C + M5 = NPER - M1 - M2 - M3 - M4 MMAX = MAX0(M1, M2, M3, M4, M5) IF (M1 .EQ. MMAX) THEN @@ -122,9 +102,9 @@ SUBROUTINE GETM5 (IA, ML, MS, MNNPS, NS, ISLIST, NINT, IFLINE, M4 = M5 M5 = MHOLD 100 CONTINUE -C + C SPLIT THE SIDES INTO LOGICAL DIVISIONS -C + M1A = (M1 + M4 + M5 - M2 - M3)/2 M1B = (M1 + M2 + M3 - M4 - M5)/2 M3A = M1B @@ -132,16 +112,16 @@ SUBROUTINE GETM5 (IA, ML, MS, MNNPS, NS, ISLIST, NINT, IFLINE, M4A = (M2 + M3 + M4 - M1 - M5)/2 M4B = M1A MC = (M1 + M2 + M5 - M3 - M4)/2 -C + C DEFINE THE MIDDLE POINT AS THE AVERAGE OF PROPORIONAL DIVISIONS C OF SIDE DIVISION POINT TO OPPOSITE TRIANGLE CORNER LINES -C + I1 = M1A + 1 I2 = I1 + M1B + M2 + M3A I3 = I2 + M3B + M4A -C + C FIND DISTANCES FROM CORNER TO CORNER, AND CORNERS TO SIDE DIVISIONS -C + D1 = SQRT((X(I2) - X(I1))**2 + (Y(I2) - Y(I1))**2) D2 = SQRT((X(I3) - X(I2))**2 + (Y(I3) - Y(I2))**2) D3 = SQRT((X(I1) - X(I3))**2 + (Y(I1) - Y(I3))**2) @@ -157,9 +137,9 @@ SUBROUTINE GETM5 (IA, ML, MS, MNNPS, NS, ISLIST, NINT, IFLINE, YJ(2) = Y(I2) + (Y(I3) - Y(I2))*D2A/D2 XJ(3) = X(I3) + (X(I1) - X(I3))*D3A/D3 YJ(3) = Y(I3) + (Y(I1) - Y(I3))*D3A/D3 -C + C GET MIDPOINT TRIALS 1, 2, AND 3 AS PROPORTIONS -C + PRO1 = .5*((D3A/D3) + (D1B/D1)) X1 = XJ(2) - (PRO1*(XJ(2) - X(I1))) Y1 = YJ(2) - (PRO1*(YJ(2) - Y(I1))) @@ -169,13 +149,13 @@ SUBROUTINE GETM5 (IA, ML, MS, MNNPS, NS, ISLIST, NINT, IFLINE, PRO3 = .5*((D2A/D2) + (D3B/D3)) X3 = XJ(1) - (PRO3*(XJ(1) - X(I3))) Y3 = YJ(1) - (PRO3*(YJ(1) - Y(I3))) -C + C AVERAGE POINTS TO GET THE CENTER -C + XCEN = (X1 + X2 + X3)/3. YCEN = (Y1 + Y2 + Y3)/3. -C + ERR = .FALSE. RETURN -C + END diff --git a/packages/seacas/applications/fastq/getnxn.f b/packages/seacas/applications/fastq/getnxn.f index 6a946df8a1aa..1a413d8e517b 100644 --- a/packages/seacas/applications/fastq/getnxn.f +++ b/packages/seacas/applications/fastq/getnxn.f @@ -1,41 +1,30 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: getnxn.f,v 1.1 1990/11/30 11:08:31 gdsjaar Exp $ -C $Log: getnxn.f,v $ -C Revision 1.1 1990/11/30 11:08:31 gdsjaar -C Initial revision -C -C -CC* FILE: [.RENUM]GETNXN.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE GETNXN (NPNODE, NPELEM, MAXKXN, NNXK, KXN, NXK, NUID, & NODE, NLIST, NUMN, ALL, ERR) C*********************************************************************** -C + C SUBROUTINE GETNXN = GETS THE LIST OF NODES CONNECTED TO NODE -C + C*********************************************************************** -C + C NOTE: C NODES FOR WHICH NUID (NODE) IS NEGATIVE WILL NOT BE INCLUDED. C IF ALL=.FALSE., ONLY DIRECTLY CONNECTED NODES WILL BE LISTED. C IF ALL=.TRUE., INDIRECTLY CONNECTED NODES WILL ALSO BE LISTED. -C + C*********************************************************************** -C + DIMENSION NLIST (20), KLIST (20), M (3) DIMENSION KXN (NNXK, MAXKXN), NUID (NPNODE) DIMENSION NXK (NNXK, NPELEM) -C + LOGICAL ALL, ERR -C + ERR = .FALSE. CALL GETKXN (NPNODE, MAXKXN, NNXK, KXN, NUID, NODE, KLIST, NUMK, & ERR) @@ -47,7 +36,7 @@ SUBROUTINE GETNXN (NPNODE, NPELEM, MAXKXN, NNXK, KXN, NXK, NUID, ENDIF NUM = 0 NOD = NODE -C + DO 130 IK = 1, NUMK K = KLIST (IK) IF (NXK (1, K) .EQ. NOD) THEN @@ -71,7 +60,7 @@ SUBROUTINE GETNXN (NPNODE, NPELEM, MAXKXN, NNXK, KXN, NXK, NUID, ERR = .TRUE. RETURN ENDIF -C + NLK = NUM DO 120 IDO = 1, NDO MIDO = M (IDO) @@ -91,16 +80,16 @@ SUBROUTINE GETNXN (NPNODE, NPELEM, MAXKXN, NNXK, KXN, NXK, NUID, 110 CONTINUE 120 CONTINUE 130 CONTINUE -C + NUMN = NUM IF (NUMN .GT. 20) THEN WRITE (*, 10000)NODE, NUID (NODE) ERR = .TRUE. ENDIF -C + RETURN -C + 10000 FORMAT (' TOO MANY NODES CONNECTED TO NODE', I5, & ', NUID = ', I10) -C + END diff --git a/packages/seacas/applications/fastq/getplp.f b/packages/seacas/applications/fastq/getplp.f index 5c598bb69808..2d8cb6db763b 100644 --- a/packages/seacas/applications/fastq/getplp.f +++ b/packages/seacas/applications/fastq/getplp.f @@ -1,47 +1,36 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: getplp.f,v 1.1 1990/11/30 11:08:34 gdsjaar Exp $ -C $Log: getplp.f,v $ -C Revision 1.1 1990/11/30 11:08:34 gdsjaar -C Initial revision -C -C -CC* FILE: [.RENUM]GETPLP.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE GETPLP (NPNODE, NPELEM, MAXKXN, NNXK, MXLIST, KXN, & NXK, NUID, IP1, LINE, IP2, LIST, NLIST, NNN, LASTN, NOROOM, & ERR) C*********************************************************************** -C + C SUBROUTINE GETPLP = PRODUCES THE LIST OF NODES FROM POINT IP1 C THROUGH LINE TO POINT IP2 -C + C*********************************************************************** -C + C NOTE: C THIS LIST WILL BE (LIST (I), I=1,NLIST) AND THESE WILL BE INDICES C INTO THE NODE TABLE -C + C*********************************************************************** -C + DIMENSION NXNLST (20) DIMENSION KXN (NNXK, MAXKXN), NXK (NNXK, NPELEM), NUID (NPNODE) DIMENSION LIST (MXLIST) -C + LOGICAL ERR, ALL, NOROOM -C + ERR = .FALSE. NOROOM = .FALSE. -C + C FIND FIRST POINT -C + IF (NLIST .EQ. 0) THEN N = INDX (NNN, NUID, IP1) IF (N .LE. 0) THEN @@ -59,9 +48,9 @@ SUBROUTINE GETPLP (NPNODE, NPELEM, MAXKXN, NNXK, MXLIST, KXN, NLIST = 0 N = LASTN ENDIF -C + C FOLLOW THE LINE -C + IF (LINE .LE. 0) RETURN NPREV = 0 100 CONTINUE @@ -86,9 +75,9 @@ SUBROUTINE GETPLP (NPNODE, NPELEM, MAXKXN, NNXK, MXLIST, KXN, ENDIF ENDIF 110 CONTINUE -C + C LINE FINISHED - FIND IP2 -C + IF (IP2 .LE. 0) RETURN DO 120 I = 1, NUMN NEW = NXNLST (I) @@ -103,13 +92,13 @@ SUBROUTINE GETPLP (NPNODE, NPELEM, MAXKXN, NNXK, MXLIST, KXN, RETURN ENDIF 120 CONTINUE -C + C LINE DID NOT MATCH UP RIGHT -C + WRITE ( * , 10010)IP1, LINE, IP2 ERR = .TRUE. RETURN -C + 10000 FORMAT (' POINT', I5, ' IS NOT IN THE MESH') 10010 FORMAT (' P-L-P SEQUENCE OF', I5, ' -', I5, ' -', I5, & 'IS AN ILLEGAL SEQUENCE') diff --git a/packages/seacas/applications/fastq/getr12.f b/packages/seacas/applications/fastq/getr12.f index 8de9d3e21306..bd606ddec828 100644 --- a/packages/seacas/applications/fastq/getr12.f +++ b/packages/seacas/applications/fastq/getr12.f @@ -1,31 +1,20 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: getr12.f,v 1.1 1990/11/30 11:08:37 gdsjaar Exp $ -C $Log: getr12.f,v $ -C Revision 1.1 1990/11/30 11:08:37 gdsjaar -C Initial revision -C -C -CC* FILE: [.MAIN]GETR12.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE GETR12 (MCOM, ICOM, JCOM, CIN, RIN, KIN, R1, R2, & IFOUND) C*********************************************************************** -C + C SUBROUTINE GETR12 = GETS TWO REAL NUMBERS -C + C*********************************************************************** -C + DIMENSION RIN(MCOM), KIN(MCOM) CHARACTER*72 CIN(MCOM) -C + IF ( (ICOM .GT. JCOM) .OR. (CIN(ICOM) (1:1) .EQ. ' ') ) THEN IFOUND = 0 ICOM = ICOM+1 @@ -44,5 +33,5 @@ SUBROUTINE GETR12 (MCOM, ICOM, JCOM, CIN, RIN, KIN, R1, R2, ENDIF ENDIF RETURN -C + END diff --git a/packages/seacas/applications/fastq/getrow.f b/packages/seacas/applications/fastq/getrow.f index 4e5091d97125..bd05ec8ad293 100644 --- a/packages/seacas/applications/fastq/getrow.f +++ b/packages/seacas/applications/fastq/getrow.f @@ -1,44 +1,20 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: getrow.f,v 1.3 1998/07/14 18:19:05 gdsjaar Exp $ -C $Log: getrow.f,v $ -C Revision 1.3 1998/07/14 18:19:05 gdsjaar -C Removed unused variables, cleaned up a little. -C -C Changed BLUE labels to GREEN to help visibility on black background -C (indirectly requested by a couple users) -C -C Revision 1.2 1995/06/28 19:21:18 gdsjaar -C Applied fixes found in memo dated May 13, 1991. The bug shows itself -C for rare cases of semicircular regions being paved. -C -c Revision 1.1.1.1 1990/11/30 11:08:41 gdsjaar -c FASTQ Version 2.0X -c -c Revision 1.1 90/11/30 11:08:39 gdsjaar -c Initial revision -c -C -CC* FILE: [.PAVING]GETROW.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE GETROW (MXND, MXCORN, MXPICK, MLN, NUID, LXK, KXL, & NXL, LXN, LNODES, NCORN, LCORN, BNSIZE, ANGLE, XN, YN, ZN, & ICOMB, ITYPE, NLOOP, NBEGIN, NEND, IAVAIL, NAVAIL, LLL, KKK, & NNN, GRAPH, VIDEO, XMIN, XMAX, YMIN, YMAX, ZMIN, ZMAX, DEV1, & KREG, SIZEIT, NEXTPR, NOROOM, ERR) C*********************************************************************** -C + C SUBROUTINE GETROW = GETS THE CURRENT ROW TO START ON -C + C*********************************************************************** -C + DIMENSION LNODES(MLN, MXND), LCORN(MXCORN), ANGLE(MXND) DIMENSION BNSIZE(2, MXND) DIMENSION NUID(MXND) @@ -48,72 +24,72 @@ SUBROUTINE GETROW (MXND, MXCORN, MXPICK, MLN, NUID, LXK, KXL, DIMENSION ITEST(5), LTEST(5) DIMENSION IPINCH(4), JPINCH(4) DIMENSION XN(MXND), YN(MXND), ZN(MXND), X(1), Y(1) -C + CHARACTER*3 DEV1 -C + LOGICAL POSBL2, POSBL3, POSBL4 LOGICAL FOUND2, FOUND3, FOUND4 LOGICAL GRAPH, ONLYC, CORNP, REDO2, REDO3, PPOSBL, VIDEO LOGICAL SIDPIN, ROWCHN, ERR, SIZEIT, NOROOM -C + ERR = .FALSE. ONLYC = .FALSE. NPIN2 = 0 -C + C RESET EVERYTHING TO BE FREE -C + 100 CONTINUE IF (GRAPH) CALL LCOLOR ('YELOW') CALL SETLOP (MXND, MLN, NLOOP, LNODES, NBEGIN, 0, ERR) IF (ERR) GOTO 270 -C + C GET THE CURRENT CORNERS -C + CALL GETCRN (MXND, MXCORN, MLN, LNODES, NCORN, LCORN, & ANGLE, XN, YN, LXN, NLOOP, NBEGIN, ONLYC, PPOSBL, GRAPH, ERR) IF (ERR) GOTO 270 -C + C GET ALL THE COMBINATIONS - NPICK IS THE NUMBER OF COMBINATIONS -C + IF (PPOSBL) THEN CALL COMSRT (MXND, MXCORN, MXPICK, MLN, LNODES, LCORN, NCORN, & ICOMB, ITYPE, NPICK) ELSE NPICK = 0 ENDIF -C + C NOW CHECK FOR THE STANDARD PRIMITIVE TYPES -C + FOUND4 = .FALSE. FOUND3 = .FALSE. FOUND2 = .FALSE. REDO2 = .TRUE. REDO3 = .TRUE. SIDPIN = .FALSE. -C + C SKIP THE PRIMITIVES IF SIZEIT IS IN EFFECT -C + IF ((SIZEIT) .OR. (NEXTPR .NE. 0)) GOTO 130 -C + C SET UP THE MINIMUM ACCEPTABLE QUALITIES -C + BEST2 = 3. BEST3 = 3. BEST4 = 4. -C + DO 120 I = 1, NPICK -C + C NOW GET THE BEST RECTANGLE COMBINATION -C + IF (ITYPE(I) .LT. 5) THEN IF (ITYPE(I) .EQ. 4) THEN CALL QUAL4 (MXND, MXCORN, MLN, NCORN, LCORN, LNODES, & ICOMB(1, I), ANGLE, LXN, ITEST, LTEST, QUAL, POSBL4, & ERR) IF (ERR) GOTO 270 -C + C GET THE RECTANGLE INTERPRETATION -C + IF (POSBL4) THEN IF (QUAL .LT. BEST4) THEN IS2C = 0 @@ -122,17 +98,17 @@ SUBROUTINE GETROW (MXND, MXCORN, MXPICK, MLN, NUID, LXK, KXL, FOUND4 = .TRUE. ENDIF ENDIF -C + C NOW GET THE BEST TRIANGLE COMBINATION -C + ELSEIF (ITYPE(I) .EQ. 3) THEN CALL QUAL3 (MXND, MXCORN, MLN, NCORN, LCORN, LNODES, & ICOMB(1, I), ANGLE, LXN, ITEST, LTEST, QUAL, POSBL3, & POSBL4, ERR) IF (ERR) GOTO 270 -C + C GET THE PURE TRIANGLE INTERPRETATION -C + IF (POSBL3) THEN IF (QUAL .LT. BEST3) THEN IBEST3 = I @@ -140,23 +116,23 @@ SUBROUTINE GETROW (MXND, MXCORN, MXPICK, MLN, NUID, LXK, KXL, FOUND3 = .TRUE. REDO3 = .TRUE. ENDIF -C + C TRY A CHANGE TO A RECTANGLE - OR RATHER SET THE RIGHT ROW FOR C THE PROPER CONCLUSION OF A TRIANGLE -C + ELSEIF (POSBL4) THEN -C + C MAKE SURE THAT THE RESULTING CORNER IS NOT ON A BAD SIDE -C + CALL CH3TO4 (MXND, MXCORN, MLN, NCORN, LCORN, LNODES, & ICOMB(1, I), ANGLE, ITEST, LTEST, QUAL, POSBL4, & ICHNG) IF ((LXN(2, ICHNG) .GT. 0) .OR. & ((LXN(2, ICHNG) .LT. 0) .AND. & (CORNP(ANGLE(ICHNG))))) THEN -C + C SEE IF WE SHOULD KEEP IT BASED ON QUALITY -C + IF (QUAL .LT. BEST3) THEN IBEST3 = I BEST3 = QUAL @@ -174,9 +150,9 @@ SUBROUTINE GETROW (MXND, MXCORN, MXPICK, MLN, NUID, LXK, KXL, C FOUND4 = .TRUE. C ENDIF ENDIF -C + C NOW GET THE BEST SEMICIRCLE COMBINATION -C + ELSEIF (ITYPE(I) .EQ. 2) THEN CALL QUAL2N (MXND, MXCORN, MLN, NCORN, LCORN, LNODES, & ICOMB(1, I), BNSIZE, ANGLE, LXN, ITEST, LTEST, QUAL, @@ -186,9 +162,9 @@ SUBROUTINE GETROW (MXND, MXCORN, MXPICK, MLN, NUID, LXK, KXL, C CALL QUAL2 (MXND, MXCORN, MLN, NCORN, LCORN, LNODES, C & ICOMB(1, I), BNSIZE, ANGLE, LXN, ITEST, LTEST, QUAL, C & POSBL2, POSBL3, ROWCHN, ISTART, IEND) -C + C GET THE SEMICIRCLE INTERPRETATION -C + IF (POSBL2) THEN IF (QUAL .LT. BEST2) THEN IS2C = 0 @@ -211,20 +187,20 @@ SUBROUTINE GETROW (MXND, MXCORN, MXPICK, MLN, NUID, LXK, KXL, ENDIF ENDIF ENDIF -C + C TRY A CHANGE TO A RECTANGLE - OR RATHER SET THE RIGHT ROW FOR C THE PROPER CONCLUSION OF A TRIANGLE -C + ELSEIF (POSBL3) THEN -C + C MAKE SURE THAT THE RESULTING CORNER IS NOT ON A BAD SIDE -C + IF ((LXN(2, IEND) .GT. 0) .OR. & ((LXN(2, IEND) .LT. 0) .AND. & (CORNP (ANGLE(IEND))))) THEN -C + C SEE IF WE SHOULD KEEP IT BASED ON QUALITY -C + IF (QUAL .LT. BEST3) THEN IBEST3 = I BEST3 = QUAL @@ -235,16 +211,16 @@ SUBROUTINE GETROW (MXND, MXCORN, MXPICK, MLN, NUID, LXK, KXL, ENDIF ENDIF ENDIF -C + ENDIF ENDIF 120 CONTINUE 130 CONTINUE -C + C FOR NOW, THE RECTANGLE WILL ALWAYS WIN, ETC. -C + C TAKE THE RECTANGLE -C + IF (FOUND4) THEN CALL SETLOP (MXND, MLN, NLOOP, LNODES, NBEGIN, 3, ERR) IF (ERR) GOTO 270 @@ -281,9 +257,9 @@ SUBROUTINE GETROW (MXND, MXCORN, MXPICK, MLN, NUID, LXK, KXL, NBEGIN = LCORN(1) 160 CONTINUE ENDIF -C + C TAKE THE TRIANGLE -C + ELSEIF (FOUND3) THEN CALL SETLOP (MXND, MLN, NLOOP, LNODES, NBEGIN, 3, ERR) IF (ERR) GOTO 270 @@ -317,20 +293,20 @@ SUBROUTINE GETROW (MXND, MXCORN, MXPICK, MLN, NUID, LXK, KXL, GOTO 260 ENDIF 190 CONTINUE -C + C OTHERWISE TAKE THE SEMICIRCLE -C + ELSEIF (FOUND2) THEN -C + C IF THE BEST SEMICIRCLE MUST BE TUCKED, THEN DO SO AND THEN C REDO THE WHOLE SORTING - A RECTANGLE SHOULD RESULT -C + IF (SIDPIN) THEN DO 200 I = 1, NPINCH NBEGIN = LNODES(2, IPINCH(I)) -C + C MAR K THE SMOOTHING -C + CALL MARKSM (MXND, MLN, LXK, KXL, NXL, LXN, LNODES, & LNODES (2, IPINCH(I)), ERR) IF (ERR) GOTO 270 @@ -346,7 +322,7 @@ SUBROUTINE GETROW (MXND, MXCORN, MXPICK, MLN, NUID, LXK, KXL, CALL MARKSM (MXND, MLN, LXK, KXL, NXL, LXN, LNODES, & LNODES (3, LNODES (3, LNODES (3, IPINCH(I)))), ERR) IF (ERR) GOTO 270 -C + CALL TUCK (MXND, MLN, NUID, XN, YN, LXK, KXL, NXL, LXN, & LNODES, IAVAIL, NAVAIL, LLL, KKK, NNN, IPINCH(I), & NLOOP, GRAPH, NOROOM, ERR) @@ -404,9 +380,9 @@ SUBROUTINE GETROW (MXND, MXCORN, MXPICK, MLN, NUID, LXK, KXL, ENDIF 230 CONTINUE ENDIF -C + C CHECK FOR A ONE SIDED SEMICIRCLE -C + ELSEIF ( (NCORN .EQ. 2) .AND. ((LNODES (7, LCORN(1)) .EQ. 1) .OR. & (LNODES (7, LCORN(2)) .EQ. 1)) ) THEN IF (LNODES (7, LCORN(1)) .EQ. 1) THEN @@ -417,9 +393,9 @@ SUBROUTINE GETROW (MXND, MXCORN, MXPICK, MLN, NUID, LXK, KXL, NEND = LCORN (1) ENDIF GOTO 260 -C + C OTHERWISE, THE DEFAULT IS TO JUST START AT THE NEXT CORNER -C + ELSEIF (NCORN .GT. 0) THEN CALL SETLOP (MXND, MLN, NLOOP, LNODES, NBEGIN, 3, ERR) IF (ERR) GOTO 270 @@ -429,46 +405,46 @@ SUBROUTINE GETROW (MXND, MXCORN, MXPICK, MLN, NUID, LXK, KXL, DO 240 I = 1, NLOOP + 1 CALL NDSTAT (INODE, LXN(1, INODE), ANGLE(INODE), ISTAT) LNODES(1, INODE) = ISTAT -C + C SAVE THE FIRST NATURAL CORNER AS THE START -C + IF ((II .EQ. 0) .AND. (ISTAT .EQ. 1)) THEN NBEGIN = INODE II = 1 -C + C A ROW END HAS BEEN FOUND -C + ELSEIF (ISTAT .EQ. 1) THEN NEND = INODE GOTO 260 ENDIF INODE = LNODES(3, INODE) 240 CONTINUE -C + C THE ROW IS A CLOSED LOOP BACK TO THE SAME CORNER -C + IF ((II .NE. 0) .AND. (NEND .EQ. 0)) THEN NEND = NBEGIN -C + C THE ROW DOESN'T CONTAIN ANY TRUE CORNERS - TREAT IT AS A CIRCLE -C + ELSE CALL SETCIR (MXND, MLN, NLOOP, LNODES, NBEGIN, ERR) NEND = NBEGIN ENDIF GOTO 260 -C + C NO CORNERS - JUST SET EVERYTHING TO BE A SIDE -C + ELSE CALL SETLOP (MXND, MLN, NLOOP, LNODES, NBEGIN, 3, ERR) IF (ERR) GOTO 270 NEND = NBEGIN GOTO 260 ENDIF -C + C FIND THE NEXT NATURAL CORNER -C + NEND = NBEGIN JJ = 0 DO 250 I = 1, NCORN @@ -482,9 +458,9 @@ SUBROUTINE GETROW (MXND, MXCORN, MXPICK, MLN, NUID, LXK, KXL, ENDIF ENDIF 250 CONTINUE -C + 260 CONTINUE -C + IF (GRAPH) THEN C 5 IS PINK; 4 IS BLUE; 3 IS YELLOW; 0 IS BLACK ; 7 IS WHITE; 1 IS RED CALL LCOLOR ('PINK ') @@ -497,9 +473,9 @@ SUBROUTINE GETROW (MXND, MXCORN, MXPICK, MLN, NUID, LXK, KXL, CALL SFLUSH CALL LCOLOR ('WHITE') ENDIF -C + 270 CONTINUE -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/getsbc.f b/packages/seacas/applications/fastq/getsbc.f index 0eb309cb8287..b5a0b0a488f2 100644 --- a/packages/seacas/applications/fastq/getsbc.f +++ b/packages/seacas/applications/fastq/getsbc.f @@ -1,64 +1,33 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: getsbc.f,v 1.3 2007/07/24 13:10:18 gdsjaar Exp $ -C $Log: getsbc.f,v $ -C Revision 1.3 2007/07/24 13:10:18 gdsjaar -C Fix problem with boundary condition memory overwrite. -C -C Remove old ls5 and r25 terminal tests -C -C Revision 1.2 1998/11/24 20:45:07 gdsjaar -C Added code to avoid array bound read errors and uninitialized -C variables. In some cases, the correct fix was difficult to determine, -C so added something that looked like it made sense... -C -C This fixes problems with very slow run times on g77-compiled code. It -C was taking an uninitialized variable to be INT_MAX instead of zero -C which resulted in lots of iterations through a loop. This variable was -C initialized to zero since that is what it was being set to on the sun -C and when compiled with fort77 (f2c-based). Gives the exact same mesh -C on linux and sun for several test cases. -C -C Revision 1.1.1.1 1990/11/30 11:08:44 gdsjaar -C FASTQ Version 2.0X -C -c Revision 1.1 90/11/30 11:08:42 gdsjaar -c Initial revision -c -C -CC* FILE: [.QMESH]GETSBC.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE GETSBC (MXND, MXNPER, NPER, NL, ML, MAXSBC, MAXPRM, & NPRM, NID, LISTL, XN, YN, NUID, LXK, KXL, NXL, LSTSBC, NPERIM, & KSBC, LCON, ISBOUN, LINKL, NSPF, IFSB, LISTSB, LINKSB, LLL, & BAR, ERR) C*********************************************************************** -C + C SUBROUTINE GETSBC = GETS THE SIDE BOUNDARY LIST -C + C*********************************************************************** -C + DIMENSION NID (MXNPER, MAXPRM), NPERIM (MAXPRM) DIMENSION LISTL (NL), XN (MXND), YN (MXND), NUID (MXND) DIMENSION LXK (4, MXND), KXL (2, MXND*3), NXL (2, MXND*3) DIMENSION LCON (3, ML), ISBOUN (ML), LINKL (2, ML) DIMENSION NSPF (ML), IFSB (ML), LISTSB (2, ML), LINKSB (2, ML) DIMENSION LSTSBC (MAXSBC), NODES (4) -C + LOGICAL EXTER, ERR, CCW, BAR, ADDLNK -C + ERR = .TRUE. CCW = .TRUE. ADDLNK = .FALSE. NPERIM (1) = NPER -C + DO 110 II = 1, NPRM DO 100 I = 1, NPERIM(II) IF (BAR) THEN @@ -68,9 +37,9 @@ SUBROUTINE GETSBC (MXND, MXNPER, NPER, NL, ML, MAXSBC, MAXPRM, ENDIF 100 CONTINUE 110 CONTINUE -C + C SORT THROUGH AND PICK OFF ELEMENTS WITH SIDE BOUNDARY CONDITIONS -C + DO 240 I = 1, LLL IF (BAR) THEN I1 = LXK (1, I) @@ -79,16 +48,16 @@ SUBROUTINE GETSBC (MXND, MXNPER, NPER, NL, ML, MAXSBC, MAXPRM, I1 = NXL (1, I) I2 = NXL (2, I) ENDIF -C + C SEE IF THE LINE IS CLEARLY INTERIOR -C + IF (I1 .GT. 0 .AND. I2 .GT. 0) THEN if ((NUID (I1) .NE. 0) .AND. (NUID (I2) .NE. 0)) THEN LTEST = 0 EXTER = .FALSE. -C + C CHECK AGAINST THE PERIMETER LIST TO SEE IF IT IS TRULY EXTERIOR -C + DO 130 JJ = 1, NPRM DO 120 J = 1, NPERIM (JJ) IF (ABS (NUID (I1)) .EQ. NID (J, JJ)) THEN @@ -111,9 +80,9 @@ SUBROUTINE GETSBC (MXND, MXNPER, NPER, NL, ML, MAXSBC, MAXPRM, 130 CONTINUE 140 CONTINUE IF (EXTER) THEN -C + C FIND THE LINE NUMBER IT BELONGS TO -C + IF (ABS (NUID (I1)) .GT. 1000000000) THEN LTEST = (ABS (NUID (I1)) - 1000000000) / 100000 ELSEIF (ABS (NUID (I2)) .GT. 1000000000) THEN @@ -134,9 +103,9 @@ SUBROUTINE GETSBC (MXND, MXNPER, NPER, NL, ML, MAXSBC, MAXPRM, 150 CONTINUE 160 CONTINUE ENDIF -C + C FIND THE ELEMENT BOUNDARY FLAG IF THERE IS ONE -C + IF (LTEST.LE.0) THEN CALL MESAGE (' ERROR IN SEARCHING NXL FOR '// & 'ELEMENT BCC') @@ -145,10 +114,10 @@ SUBROUTINE GETSBC (MXND, MXNPER, NPER, NL, ML, MAXSBC, MAXPRM, CALL LTSORT (ML, LINKL, LTEST, J, ADDLNK) IF (ISBOUN (J) .GT. 0) THEN IFLAG = ISBOUN (J) -C + C CHECK TO MAKE SURE LINE IS LINKED TO FLAG C AND GET THE NEXT LINK (NFLAG) -C + CALL LTSORT (ML, LINKSB, IFLAG, L, ADDLNK) DO 170 JJ = IFSB (L), IFSB (L) + NSPF (L) - 1 IF (LISTSB (1, JJ) .LT. 0) THEN @@ -175,9 +144,9 @@ SUBROUTINE GETSBC (MXND, MXNPER, NPER, NL, ML, MAXSBC, MAXPRM, KSBC = KSBC + 1 if (ksbc .gt. maxsbc) stop 'maxsbc error' LSTSBC (KSBC) = NELEM -C + C GET THE CORRECT ELEMENT SIDE -C + IF (BAR) THEN JSIDE = 1 ELSE @@ -204,15 +173,15 @@ SUBROUTINE GETSBC (MXND, MXNPER, NPER, NL, ML, MAXSBC, MAXPRM, ENDIF KSBC = KSBC + 1 LSTSBC (KSBC) = JSIDE -C + C SEE IF ANY MORE FLAGS ARE ATTACHED TO THIS SIDE -C + 210 CONTINUE IF (NFLAG .GT. 0) THEN -C + C CHECK TO MAKE SURE LINE IS LINKED TO FLAG C AND GET THE NEXT LINK (NFLAG) -C + IFLAG = NFLAG CALL LTSORT (ML, LINKSB, IFLAG, L, ADDLNK) DO 220 JJ = IFSB (L), IFSB (L) + NSPF (L) @@ -238,10 +207,10 @@ SUBROUTINE GETSBC (MXND, MXNPER, NPER, NL, ML, MAXSBC, MAXPRM, ENDIF END IF 240 CONTINUE -C + ERR = .FALSE. RETURN -C + 10000 FORMAT (' SIDE BOUNDARY FLAG', I5, ' IS NOT PROPERLY LINKED') 10010 FORMAT (' ERROR FINDING CORRECT BOUNDARY SIDE ON ELEMENT', I5) END diff --git a/packages/seacas/applications/fastq/getsiz.f b/packages/seacas/applications/fastq/getsiz.f index d42502af8d1d..9b47c2b7cecf 100644 --- a/packages/seacas/applications/fastq/getsiz.f +++ b/packages/seacas/applications/fastq/getsiz.f @@ -1,62 +1,33 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: getsiz.f,v 1.1 1990/11/30 11:08:45 gdsjaar Exp $ -C $Log: getsiz.f,v $ -C Revision 1.1 1990/11/30 11:08:45 gdsjaar -C Initial revision -C -C -CC* FILE: [.PAVING]GETSIZ.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE GETSIZ (XNOLD, YNOLD, NXKOLD, LINKEG, LISTEG, BMESUR, & MLINK, NPNOLD, NPEOLD, NNXK, REMESH, REXMIN, REXMAX, REYMIN, & REYMAX, IDIVIS, SIZMIN, EMAX, EMIN, X, Y, SIZE) C*********************************************************************** -C + C SUBROUTINE GETSIZ = GETS THE SIZE OF AN ELEMENT EDGE BASED ON THE C OLD MESH SIZE AT THE GIVEN X,Y LOCATION AND THE C RELATIVE MEASURE OF THE ERROR ESTIMATOR AT THAT C LOCATION -C + C*********************************************************************** -C + DIMENSION XNOLD(NPNOLD), YNOLD(NPNOLD) DIMENSION NXKOLD(NNXK, NPEOLD) DIMENSION LINKEG(2, MLINK), LISTEG(4 * NPEOLD), BMESUR(NPNOLD) -C + LOGICAL INSIDE, BAD -C + C ASSUME A LINEAR REDUCTION FACTOR FROM R0 TO R1 WHERE R0 IS THE C DESIRED REDUCTION A 0. NORMALIZED ERROR MEASURE AND R1 IS A DESIRED C REDUCTION AT 1.0 NORMALIZED ERROR MEASURE -C -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/12/90 -CC* MODIFICATION: CHANGED R0 TO BE 1.5 (WAS 1.2) -C -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/17/90 -CC* MODIFICATION: CHANGED R0 TO BE 1.2 (WAS 1.5) -C -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/17/90 -CC* MODIFICATION: CHANGED R1 TO BE 1/6 (WAS 1/7) -C -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/31/90 -CC* MODIFICATION: CHANGED CALl TO PASS IN R0 AND R1 AND RENAMED THEM -CC** TO BE EMAX AND EMIN RESPECTIVELY - THEY ARE NOW SET -CC** BY THE USER IN THE RDGENS ROUTINE -C + C FIND THE ELEMENT THAT THIS POINT FALLS INTO -C + DELX = (REXMAX - REXMIN) / DBLE(IDIVIS) DELY = (REYMAX - REYMIN) / DBLE(IDIVIS) IX = INT((X - REXMIN) / DELX) + 1 @@ -94,15 +65,10 @@ SUBROUTINE GETSIZ (XNOLD, YNOLD, NXKOLD, LINKEG, LISTEG, BMESUR, GOTO 170 ENDIF 110 CONTINUE -C -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 8/1/90 -CC* MODIFICATION: ADDED THE CHECK TO SEE IF A POINT BEING SIZED IS ACTUALLY -CC* OUTSIDE THE INITIAL MESH BUT INSIDE THE GEOMETRY. -C + C THERE IS A POSSIBILITY THAT THE POINT IS ON AN ARC WHICH IS NOT C INCLUDED IN THE ORIGINAL MESH - THIS MUST BE CHECKED. -C + DTEST = 1.E15 DO 130 I = IBEGIN, IEND KELEM = LISTEG(I) @@ -113,27 +79,27 @@ SUBROUTINE GETSIZ (XNOLD, YNOLD, NXKOLD, LINKEG, LISTEG, BMESUR, X2 = XNOLD (NXKOLD (JC, KELEM)) Y1 = YNOLD (NXKOLD (IC, KELEM)) Y2 = YNOLD (NXKOLD (JC, KELEM)) -C + C GET THE PARAMETERS FOR THE LINE -C + CALL DLPARA (X1, Y1, X2, Y2, XM1, B1, BAD) -C + C GET DISTANCE FOR VERTICAL LINE -C + IF (BAD) THEN DTRY = ABS(X1 - X) XTRY = X1 YTRY = Y -C + C GET DISTANCE FOR HORIZONTAL LINE -C + ELSE IF (ABS(XM1) .LT. .000001) THEN DTRY = ABS(Y1 - Y) XTRY = X YTRY = Y1 -C + C GET PERPENDICULAR DISTANCE TO ARBITRARY LINE -C + ELSE XM2 = -1./XM1 B2 = Y - (XM2*X) @@ -141,18 +107,18 @@ SUBROUTINE GETSIZ (XNOLD, YNOLD, NXKOLD, LINKEG, LISTEG, BMESUR, YTRY = (XM1*XTRY) + B1 DTRY = SQRT((X - XTRY)**2 + (Y - YTRY)**2) END IF -C + C CHECK THE INTERSECTION TO MAKE SURE THAT IT CUTS THE LINE SEGMENT C WE HAVE -C + IF ((XTRY .GE. AMIN1(X1, X2)) .AND. & (XTRY .LE. AMAX1(X1, X2)) .AND. & (YTRY .GE. AMIN1(Y1, Y2)) .AND. & (YTRY .LE. AMAX1(Y1, Y2)) ) THEN -C + C NOW GET THE SHORTEST INTERSECTION AND GET NEEDED SIZE VALUE BASED ON C THE XTRY AND YTRY LOCATION -C + IF (DTRY .LT. DTEST) THEN DTEST = DTRY INSIDE = .TRUE. @@ -179,11 +145,11 @@ SUBROUTINE GETSIZ (XNOLD, YNOLD, NXKOLD, LINKEG, LISTEG, BMESUR, ENDIF 120 CONTINUE 130 CONTINUE -C + C NOW CHECK THE ELEMENT THAT HAS BEEN FOUND AND MAKE SURE THAT IT IS C A ELEMENT ALONG THE SIDE OF THE MESH AND THAT THE EDGE CLOSEST IS C NOT SHARED BY ANY OTHER ELEMENT. -C + IF (INSIDE) THEN DO 150 I = 1, NPEOLD IF (I .NE. KIN) THEN @@ -201,10 +167,10 @@ SUBROUTINE GETSIZ (XNOLD, YNOLD, NXKOLD, LINKEG, LISTEG, BMESUR, 150 CONTINUE 160 CONTINUE ENDIF -C + C THE ELEMENT HAS BEEN FOUND - NOW INTERPOLATE THE STRESS VALUE FOR C THIS LEVEL -C + 170 CONTINUE IF (INSIDE) THEN N1 = NXKOLD (1, KIN) @@ -225,22 +191,17 @@ SUBROUTINE GETSIZ (XNOLD, YNOLD, NXKOLD, LINKEG, LISTEG, BMESUR, & ((YNOLD(N4) - YNOLD(N3)) ** 2) ) D4 = SQRT ( ((XNOLD(N1) - XNOLD(N4)) ** 2) + & ((YNOLD(N1) - YNOLD(N4)) ** 2) ) -C -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 8/6/90 -CC* MODIFICATION: CHANGED FROM A SIZE INTERPOLATION TO THE -CC** MINIMUM SIDE LENGTH AS THE EXISTING ELEMENT SIZE -C + REDUC = EMAX - (ERROR * EMAX) + (ERROR * EMIN) SIZE = AMAX1 ((AMIN1 (D1, D2, D3, D4) * REDUC), SIZMIN) ELSE -C + C ERROR HAS OCCURRED IN FINDING THE ELEMENT -C + CALL MESAGE ('** ERROR - ENCLOSING ELEMENT NOT FOUND IN '// & 'GETSIZ **') ENDIF -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/gettrn.f b/packages/seacas/applications/fastq/gettrn.f index 14a5ad5e3e0d..610eb344538c 100644 --- a/packages/seacas/applications/fastq/gettrn.f +++ b/packages/seacas/applications/fastq/gettrn.f @@ -1,67 +1,56 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: gettrn.f,v 1.1 1990/11/30 11:08:48 gdsjaar Exp $ -C $Log: gettrn.f,v $ -C Revision 1.1 1990/11/30 11:08:48 gdsjaar -C Initial revision -C -C -CC* FILE: [.QMESH]GETTRN.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE GETTRN (ML, MS, MNNPS, NS, ISLIST, NINT, IFLINE, NLPS, & ILLIST, LINKL, LINKS, X, Y, NID, NNPS, ANGLE, NPER, I1, I2, & I3, I4, I5, I6, I7, I8, XCEN1, YCEN1, XCEN2, YCEN2, XMID1, & YMID1, XMID2, YMID2, CCW, HALFC, ERR) C*********************************************************************** -C + C SUBROUTINE GETTRN = GETS THE APPROPRIATE SIDES, CORNERS, AND MIDPOINT C VALUES FOR A TRANSITION REGION -C + C*********************************************************************** -C + C SUBROUTINE CALLED BY: C QMESH = GENERATES QUAD ELEMENTS -C + C*********************************************************************** -C + C VARIABLES USED: C NNPS = ARRAY OF NUMBER OF NODES PER SIDE C CCW = .TRUE. IF THE SIDE IS ORIENTED CCW C NORM = .TRUE. IF THE FIRST SIDE IS TO BE TRIED AS THE BASE -C + C*********************************************************************** -C + DIMENSION NNPS(MNNPS), ISLIST(NS), LINKL(2, ML), LINKS(MS * 2) DIMENSION NINT (ML), NLPS (MS), IFLINE (MS), ILLIST (MS * 3) DIMENSION X (NPER), Y (NPER), NID (NPER), ANGLE (NPER) -C + LOGICAL CCW, ERR, HALFC -C + C CALCULATE THE NUMBER OF NODES PER SIDE -C + CALL NPS (ML, MS, MNNPS, NS, ISLIST, NINT, IFLINE, NLPS, ILLIST, & LINKL, LINKS, NNPS, ERR) IF (ERR) RETURN IF (.NOT.CCW)CALL IREVER (NNPS, NS) -C + C FIND THE BEST CORNER NODES IN THE LIST -C + CALL PICKTR (NPER, X, Y, NID, ANGLE, HALFC, I1, I2, I3, I4, I5, & I6, I7, I8) -C + C DEFINE THE MIDDLE POINT OF BOTH TRIANGLES AS THE AVERAGE C OF PROPORIONAL DIVISIONS OF SIDE DIVISION POINT TO OPPOSITE C TRIANGLE CORNER LINES C FOR THE FIRST TRIANGLE, C FIND DISTANCES FROM CORNER TO CORNER, AND CORNERS TO SIDE DIVISIONS -C + INT = I6 - I4 PROP = DBLE(I6 - I5) / DBLE(INT) XMID1 = X (I3) + (PROP * (X (I7) - X (I3))) @@ -75,9 +64,9 @@ SUBROUTINE GETTRN (ML, MS, MNNPS, NS, ISLIST, NINT, IFLINE, NLPS, D2B = SQRT ( (X (I7) - X (I6)) **2 + (Y (I7) - Y (I6)) **2) D3A = SQRT ( (XMID1 - X (I7)) **2 + (YMID1 - Y (I7)) **2) D3B = SQRT ( (X (I3) - XMID1) **2 + (Y (I3) - YMID1) **2) -C + C GET MIDPOINT TRIALS 1, 2, AND 3 AS PROPORTIONS -C + PRO1 = .5 * ( (D3A / D3) + (D1B / D1)) X1 = X (I6) - (PRO1 * (X (I6) - X (I3))) Y1 = Y (I6) - (PRO1 * (Y (I6) - Y (I3))) @@ -87,15 +76,15 @@ SUBROUTINE GETTRN (ML, MS, MNNPS, NS, ISLIST, NINT, IFLINE, NLPS, PRO3 = .5 * ( (D2A / D2) + (D3B / D3)) X3 = X (I4) - (PRO3 * (X (I4) - X (I7))) Y3 = Y (I4) - (PRO3 * (Y (I4) - Y (I7))) -C + C AVERAGE POINTS TO GET THE FIRST CENTER -C + XCEN1 = (X1 + X2 + X3) / 3. YCEN1 = (Y1 + Y2 + Y3) / 3. -C + C FOR THE SECOND TRIANGLE, C FIND DISTANCES FROM CORNER TO CORNER, AND CORNERS TO SIDE DIVISIONS -C + INT = I6 - I4 PROP = DBLE(NPER + 1 - I8) / DBLE(INT) XMID2 = X (I3) + (PROP * (X (I7) - X (I3))) @@ -109,9 +98,9 @@ SUBROUTINE GETTRN (ML, MS, MNNPS, NS, ISLIST, NINT, IFLINE, NLPS, D2B = SQRT ( (X (I7) - XMID2) **2 + (Y (I7) - YMID2) **2) D3A = SQRT ( (X (I8) - X (I7)) **2 + (Y (I8) - Y (I7)) **2) D3B = SQRT ( (X (I1) - X (I8)) **2 + (Y (I1) - Y (I8)) **2) -C + C GET MIDPOINT TRIALS 1, 2, AND 3 AS PROPORTIONS -C + PRO1 = .5 * ((D3A / D3) + (D1B / D1)) X1 = XMID2 - (PRO1 * (XMID2 - X (I1))) Y1 = YMID2 - (PRO1 * (YMID2 - Y (I1))) @@ -121,13 +110,13 @@ SUBROUTINE GETTRN (ML, MS, MNNPS, NS, ISLIST, NINT, IFLINE, NLPS, PRO3 = .5 * ((D2A / D2) + (D3B / D3)) X3 = X (I2) - (PRO3 * (X (I2) - X (I7))) Y3 = Y (I2) - (PRO3 * (Y (I2) - Y (I7))) -C + C AVERAGE POINTS TO GET THE CENTER -C + XCEN2 = (X1 + X2 + X3) / 3. YCEN2 = (Y1 + Y2 + Y3) / 3. -C + ERR = .FALSE. RETURN -C + END diff --git a/packages/seacas/applications/fastq/getwt.f b/packages/seacas/applications/fastq/getwt.f index b0274813a508..a1de8f1eda27 100644 --- a/packages/seacas/applications/fastq/getwt.f +++ b/packages/seacas/applications/fastq/getwt.f @@ -1,64 +1,47 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: getwt.f,v 1.2 1991/03/21 15:44:49 gdsjaar Exp $ -C $Log: getwt.f,v $ -C Revision 1.2 1991/03/21 15:44:49 gdsjaar -C Changed all 3.14159... to atan2(0.0, -1.0) -C -c Revision 1.1.1.1 1990/11/30 11:08:53 gdsjaar -c FASTQ Version 2.0X -c -c Revision 1.1 90/11/30 11:08:51 gdsjaar -c Initial revision -c -C -CC* FILE: [.RENUM]GETWT.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE GETWT (MP, ML, MXLPS, NIX, ILIST, XLIST, ILINE, LCON, & LTYPE, COOR, LINKP, FRACT, ADDLNK, ERR) C*********************************************************************** -C + C SUBROUTINE GETWT = GETS A WEIGHT BASED ON A PERCENTAGE DISTANCE ALONG C THE GIVEN SIDE LINE LIST. -C + C*********************************************************************** -C + C SUBROUTINE CALLED BY: C ADDWT = ADDS THE WEIGHTING FACTORS TO ANY NODES WITH C FLAGS CONTAINING WEIGHTS -C + C*********************************************************************** -C + C VARIABLES USED: C FRACT = THE FRACTION OF TOTAL DISTANCE ALONG THE X AXIS C (TAKES BACK THE WEIGHT OR Y VALUE AT THAT % DISTANCE) -C + C*********************************************************************** -C + DIMENSION ILIST (MXLPS), XLIST (MXLPS) DIMENSION ILINE (ML), LCON (3, ML), LTYPE (ML) DIMENSION COOR (2, MP), LINKP (2, MP) -C + LOGICAL ADDLNK, ERR -C + ADDLNK = .FALSE. ERR = .FALSE. PI = ATAN2(0.0, -1.0) TWOPI = 2.*PI -C + C GET THE X VALUE -C + X = FRACT* (XLIST (NIX)-XLIST (1))+XLIST (1) -C + C FIND THE LINE THIS BELONGS TO -C + DO 100 I = 1, NIX-1 IF ((X.LE.XLIST (I+1)).AND. (X.GE.XLIST (I))) THEN IL = ILIST (I) @@ -68,19 +51,19 @@ SUBROUTINE GETWT (MP, ML, MXLPS, NIX, ILIST, XLIST, ILINE, LCON, CALL MESAGE ('PROBLEMS IN GETWT - NO X SPAN FOUND') ERR = .TRUE. RETURN -C + 110 CONTINUE -C + C NOW GET THE Y VALUE FOR THE X AND THE LINE (AND TYPE OF LINE) GIVEN -C + KT = LTYPE (IL) CALL LTSORT (MP, LINKP, LCON (1, IL), IP1, ADDLNK) CALL LTSORT (MP, LINKP, LCON (2, IL), IP2, ADDLNK) CALL LTSORT (MP, LINKP, IABS (LCON (3, IL)), IP3, ADDLNK) IF (LCON (3, IL).LT.0)IP3 = -IP3 -C + C CHECK FOR EXACT LINE END PLACEMENT -C + EPS = ABS (XLIST (NIX)-XLIST (1))*.00001 IF (ABS (X-COOR (1, IP1)).LT.EPS) THEN FRACT = COOR (2, IP1) @@ -89,11 +72,11 @@ SUBROUTINE GETWT (MP, ML, MXLPS, NIX, ILIST, XLIST, ILINE, LCON, FRACT = COOR (2, IP2) RETURN ENDIF -C + C GET INTERMEDIATE Y VALUE BASED ON THE LINE TYPE -C + C FIRST - STRAIGHT LINES -C + IF (KT.EQ.1) THEN IF (COOR (1, IP1).GT.COOR (1, IP2)) THEN IHOLD = IP1 @@ -102,9 +85,9 @@ SUBROUTINE GETWT (MP, ML, MXLPS, NIX, ILIST, XLIST, ILINE, LCON, ENDIF XFRACT = (X-COOR (1, IP1))/ (COOR (1, IP2)-COOR (1, IP1)) FRACT = (XFRACT* (COOR (2, IP2)-COOR (2, IP1)))+COOR (2, IP1) -C + C NEXT - CORNER LINES -C + ELSEIF (KT.EQ.2) THEN IF (COOR (1, IP1).GT.COOR (1, IP2)) THEN IHOLD = IP1 @@ -124,20 +107,20 @@ SUBROUTINE GETWT (MP, ML, MXLPS, NIX, ILIST, XLIST, ILINE, LCON, ELSE FRACT = COOR (2, IP3) ENDIF -C + C NEXT - ARCS -C + ELSEIF ((KT.EQ.3).OR. (KT.EQ.4).OR. (KT.EQ.6)) THEN -C + C ARCWITH CENTER GIVEN C ARCGOES FROM 1ST POINT TO 2ND IN *COUNTER-CLOCKWISE* DIRECTION. -C + IF (KT.EQ.3) THEN XCEN = COOR (1, IABS (IP3)) YCEN = COOR (2, IABS (IP3)) -C + C CIRCLE WITH THIRD POINT ON ARC. -C + ELSEIF (KT.EQ.4) THEN THETA1 = ATAN2 (COOR (2, IP3)-COOR (2, IP1), COOR (1, IP3)- & COOR (1, IP1))+PI/2.0 @@ -151,9 +134,9 @@ SUBROUTINE GETWT (MP, ML, MXLPS, NIX, ILIST, XLIST, ILINE, LCON, R = (-SIN (THETA2) * (X2-X1)+COS (THETA2) * (Y2-Y1))/DET XCEN = X1 + R * COS (THETA1) YCEN = Y1 + R * SIN (THETA1) -C + C CIRCLE WITH RADIUS GIVEN -C + ELSEIF (KT.EQ.6) THEN DX = 0.5 * (COOR (1, IP2)-COOR (1, IP1)) DY = 0.5 * (COOR (2, IP2)-COOR (2, IP1)) @@ -182,33 +165,33 @@ SUBROUTINE GETWT (MP, ML, MXLPS, NIX, ILIST, XLIST, ILINE, LCON, ENDIF THETA1 = ATAN2 (COOR (2, IP1)-YCEN, COOR (1, IP1)-XCEN) THETA2 = ATAN2 (COOR (2, IP2)-YCEN, COOR (1, IP2)-XCEN) -C + C ARCWITH THE CENTER GIVEN -C + IF (KT.EQ.3) THEN IF ((IP3.GE.0).AND. (THETA2.LE.THETA1))THETA2 = THETA2+TWOPI IF ((IP3.LT.0).AND. (THETA1.LE.THETA2))THETA1 = THETA1+TWOPI TANG = THETA2-THETA1 -C + C CIRCULAR ARC WITH 3RD POINT ON ARC - CLOCKWISE OR COUNTER-CLOCKWISE -C + ELSEIF (KT.EQ.4) THEN THETA3 = ATAN2 (COOR (2, IP3)-YCEN, COOR (1, IP3)-XCEN) IF (THETA2.LE.THETA1)THETA2 = THETA2+TWOPI IF (THETA3.LE.THETA1)THETA3 = THETA3+TWOPI TANG = THETA2-THETA1 IF (THETA3.GT.THETA2)TANG = - (TWOPI-TANG) -C + C CIRCULAR ARC WITH RADIUS GIVEN - CLOCKWISE OR COUNTER-CLOCKWISE -C + ELSEIF (KT.EQ.6) THEN IF ((IP3.GE.0).AND. (THETA2.LE.THETA1))THETA2 = THETA2+TWOPI IF ((IP3.LT.0).AND. (THETA1.LE.THETA2))THETA1 = THETA1+TWOPI TANG = THETA2-THETA1 ENDIF -C + C NOW ITERATE UNTIL THE X VALUE IS WITHIN SOME EPSILON -C + AA = (LOG (R2/R1))/ (THETA2-THETA1) BB = R2/EXP (AA * THETA2) ANG = THETA1 @@ -240,13 +223,13 @@ SUBROUTINE GETWT (MP, ML, MXLPS, NIX, ILIST, XLIST, ILINE, LCON, WRITE (*, 10010)ILINE (IL) RETURN 150 CONTINUE -C + C FINALLY PARABOLAS -C + ELSEIF (KT.EQ.5) THEN -C + C CHECK LEGITIMACY OF DATA -C + IF (COOR (1, IP1).GT.COOR (1, IP2)) THEN IJK = IP1 IP1 = IP2 @@ -264,9 +247,9 @@ SUBROUTINE GETWT (MP, ML, MXLPS, NIX, ILIST, XLIST, ILINE, LCON, ERR = .TRUE. RETURN ENDIF -C + C GET TRANSFORMATION TO PARABOLA COORDINATE SYSTEM (Y = 4AX **2) -C + HALFW = SQRT ((COOR (1, IP2)-COOR (1, IP1)) **2 + & (COOR (2, IP2) - COOR (2, IP1)) **2) *0.5 HEIGHT = SQRT ((XMID-COOR (1, IP3)) **2 + @@ -288,14 +271,14 @@ SUBROUTINE GETWT (MP, ML, MXLPS, NIX, ILIST, XLIST, ILINE, LCON, RETURN ENDIF COTT = COST/SINT -C + C FIND THE EQUATION OF THE LINE FOR X = CONSTANT IN NEW COORDINATES -C + X0 = X-XTOP B = - (SINT * X0)- (COTT * COST * X0) -C + C IF THE LINE HAS A ZERO SLOPE, THEN FIND THE SIMPLE SOLUTION -C + IF (COTT.EQ.0.0) THEN YNEW = B ELSE @@ -316,15 +299,15 @@ SUBROUTINE GETWT (MP, ML, MXLPS, NIX, ILIST, XLIST, ILINE, LCON, WRITE (*, 10060)ILINE (IL) ENDIF ENDIF -C + C TRANSLATE THIS XNEW TO A Y VALUE -C + XNEW = A * YNEW * YNEW FRACT = (XNEW * SINT)+ (YNEW * COST)+YTOP ENDIF -C + RETURN -C + 10000 FORMAT (' POINTS GIVEN FOR LINE', I5, ' DO NOT DEFINE AN ARC') 10010 FORMAT (' NO X ON ARC LINE', I5, ' FOUND IN GETWT') 10020 FORMAT (' POINTS FOR LINE', I5, ' DOES NOT DEFINE A PARABOLA') @@ -333,5 +316,5 @@ SUBROUTINE GETWT (MP, ML, MXLPS, NIX, ILIST, XLIST, ILINE, LCON, 10050 FORMAT (' PARABOLA INTERSECTION PROBLEMS FOR LINE', I5, & ' IN GETWT') 10060 FORMAT (' PARABOLA SOLUTION PROBLEMS FOR LINE', I5, ' IN GETWT') -C + END diff --git a/packages/seacas/applications/fastq/gkxn.f b/packages/seacas/applications/fastq/gkxn.f index 7c0d7632aebe..5c3b65ae1ae5 100644 --- a/packages/seacas/applications/fastq/gkxn.f +++ b/packages/seacas/applications/fastq/gkxn.f @@ -1,47 +1,36 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: gkxn.f,v 1.1 1990/11/30 11:08:55 gdsjaar Exp $ -C $Log: gkxn.f,v $ -C Revision 1.1 1990/11/30 11:08:55 gdsjaar -C Initial revision -C -C -CC* FILE: [.QMESH]GKXN.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE GKXN (MXND, KXL, LXN, N, KS, KLIST, ERR) C*********************************************************************** -C + C SUBROUTINE GKXN = GENERATES THE LIST OF ELEMENTS ASSOCIATED WITH C NODE N -C + C*********************************************************************** -C + DIMENSION KLIST (1), KL (20), LINES (20) DIMENSION KXL (2, 3 * MXND), LXN (4, MXND) -C + LOGICAL ERR -C + ERR = .FALSE. KS = 0 IF (LXN (1, N) .LE. 0) RETURN CALL GETLXN (MXND, LXN, N, LINES, NL, ERR) IF (ERR) RETURN -C + C LOOP THROUGH ALL LINES CONNECTED TO THIS NODE -C + KOUNT = 0 DO 140 IL = 1, NL L = LINES (IL) -C + C LOOK AT ELEMENTS ON BOTH SIDES OF THIS LINE -C + DO 130 IK = 1, 2 K = KXL (IK, L) IF (K .GT. 0) THEN @@ -64,14 +53,14 @@ SUBROUTINE GKXN (MXND, KXL, LXN, N, KS, KLIST, ERR) 120 CONTINUE 130 CONTINUE 140 CONTINUE -C + C RETURN RESULTS -C + DO 150 I = 1, KOUNT KLIST (I) = KL (I) 150 CONTINUE KS = KOUNT -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/gmesh.f b/packages/seacas/applications/fastq/gmesh.f index 22d0a9f2936c..9237f56747c9 100644 --- a/packages/seacas/applications/fastq/gmesh.f +++ b/packages/seacas/applications/fastq/gmesh.f @@ -1,29 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: gmesh.f,v 1.2 1998/07/14 18:19:07 gdsjaar Exp $ -C $Log: gmesh.f,v $ -C Revision 1.2 1998/07/14 18:19:07 gdsjaar -C Removed unused variables, cleaned up a little. -C -C Changed BLUE labels to GREEN to help visibility on black background -C (indirectly requested by a couple users) -C -C Revision 1.1.1.1 1990/11/30 11:09:00 gdsjaar -C FASTQ Version 2.0X -C -c Revision 1.1 90/11/30 11:08:57 gdsjaar -c Initial revision -c -C -CC* FILE: [.MAIN]GMESH.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE GMESH (NPNODE, NPELEM, MXNFLG, MXSFLG, NPNBC, NPSBC, & MAXKXN, MR, NPREGN, MCOM, ICOM, JCOM, CIN, RIN, IIN, KIN, NNN, & KKK, NUMMAT, NNXK, IPART, NODES, NNFLG, NNPTR, NSFLG, NVPTR, @@ -33,16 +13,16 @@ SUBROUTINE GMESH (NPNODE, NPELEM, MXNFLG, MXSFLG, NPNBC, NPSBC, & LABW, IDEV, ALPHA, DEV1, EIGHT, NINE, VAXVMS, VERSN, WROTE, & TIME1, HARDPL, BATCH) C*********************************************************************** -C + C SUBROUTINE GMESH = SETS UP GRAPHICS FOR THE GENERATED MESH -C + C*********************************************************************** -C + C SUBROUTINE CALLED BY: C MESH = ALLOWS MESH GENERATION AND DISPLAY -C + C*********************************************************************** -C + C VARIABLES USED: C TITLE = MESH TITLE C LABE = .TRUE. IF ELEMENT NUMBERS ARE TO BE PLOTTED @@ -53,9 +33,9 @@ SUBROUTINE GMESH (NPNODE, NPELEM, MXNFLG, MXSFLG, NPNBC, NPSBC, C AXIS = .TRUE. IF THE AXIS IS TO BE DRAWN C AREACG = .TRUE. IF THE AREA AND C.G. ARE CALCULATED AND THE C.G. C IS DISPLAYED -C + C*********************************************************************** -C + DIMENSION IPART (3, NPREGN), CENTK (2, NPELEM) DIMENSION ILOOK (NNXK * MAXKXN) DIMENSION XN (NPNODE), YN (NPNODE), NXK (NNXK, NPELEM) @@ -68,20 +48,20 @@ SUBROUTINE GMESH (NPNODE, NPELEM, MXNFLG, MXSFLG, NPNBC, NPSBC, DIMENSION MAPDXG (NPNODE), MATMAP (3, NPREGN) DIMENSION KIN (MCOM), IIN (MCOM), RIN (MCOM) DIMENSION IDEV (2) -C + LOGICAL LABE, LABN, LABNB, LABSB, GOPLOT, SETFLG, DRAWN LOGICAL AXIS, LABM, AREACG LOGICAL LABW, ALPHA, EIGHT, NINE, OLD, LABO, VAXVMS, REGPLT LOGICAL WROTE, HARDPL LOGICAL BATCH -C + CHARACTER*72 TITLE, CIN (MCOM) CHARACTER*3 DEV1, VERSN*9 -C + IZ = 0 -C + C CALCULATE THE CENTER OF EACH ELEMENT FOR CLIPPING CONSIDERATIONS -C + DO 100 I = 1, KKK IF (NXK (3, I) .EQ. 0) THEN CENTK (1, I) = .5 * (XN (NXK (1, I)) + XN (NXK (2, I))) @@ -100,17 +80,17 @@ SUBROUTINE GMESH (NPNODE, NPELEM, MXNFLG, MXSFLG, NPNBC, NPSBC, END IF 100 CONTINUE DRAWN = .FALSE. -C + C FIND THE BODY MIN AND MAX -C + CALL MINMAX_FQ (NPNODE, NNN, XN, YN, XMIN, XMAX, YMIN, YMAX) XMIN1 = XMIN XMAX1 = XMAX YMIN1 = YMIN YMAX1 = YMAX -C + C ENTER GRAPHICS OPTION -C + 110 CONTINUE IF (ICOM .GT. JCOM) THEN CALL MESAGE (' ') @@ -118,9 +98,9 @@ SUBROUTINE GMESH (NPNODE, NPELEM, MXNFLG, MXSFLG, NPNBC, NPSBC, & IOSTAT, JCOM, KIN, CIN, IIN, RIN) ICOM = 1 END IF -C + C TOGGLE DRAWING OF THE AXIS -C + IF ((CIN (ICOM) (1:1) .EQ. 'A') & .OR. (CIN (ICOM) (1:1) .EQ. 'a')) THEN ICOM = ICOM + 1 @@ -131,9 +111,9 @@ SUBROUTINE GMESH (NPNODE, NPELEM, MXNFLG, MXSFLG, NPNBC, NPSBC, AXIS = .TRUE. CALL MESAGE ('AXIS DRAWING - ON') END IF -C + C TOGGLE CALCULATION OF AREA AND C.G. -C + ELSE IF ((CIN (ICOM) (1:1) .EQ. 'C') & .OR. (CIN (ICOM) (1:1) .EQ. 'c')) THEN ICOM = ICOM + 1 @@ -144,9 +124,9 @@ SUBROUTINE GMESH (NPNODE, NPELEM, MXNFLG, MXSFLG, NPNBC, NPSBC, AREACG = .TRUE. CALL MESAGE ('AREA AND C.G. REPORT - ON') END IF -C + C TOGGLE NODAL BOUNDARY DISPLAY -C + ELSE IF ((CIN (ICOM) (1:2) .EQ. 'NB') .OR. & (CIN (ICOM) (1:2) .EQ. 'nb')) THEN ICOM = ICOM + 1 @@ -157,9 +137,9 @@ SUBROUTINE GMESH (NPNODE, NPELEM, MXNFLG, MXSFLG, NPNBC, NPSBC, LABNB = .TRUE. CALL MESAGE ('NODAL BOUNDARY DISPLAY - ON') END IF -C + C TOGGLE ELEMENT SIDE BOUNDARY DISPLAY -C + ELSE IF ((CIN (ICOM) (1:2) .EQ. 'EB') .OR. & (CIN (ICOM) (1:2) .EQ. 'eb')) THEN ICOM = ICOM + 1 @@ -170,9 +150,9 @@ SUBROUTINE GMESH (NPNODE, NPELEM, MXNFLG, MXSFLG, NPNBC, NPSBC, LABSB = .TRUE. CALL MESAGE ('ELEMENT SIDE BOUNDARY DISPLAY - ON') END IF -C + C TOGGLE WEIGHTING FACTOR DISPLAY -C + ELSE IF ((CIN (ICOM) (1:1) .EQ. 'W') .OR. & (CIN (ICOM) (1:1) .EQ. 'w')) THEN ICOM = ICOM + 1 @@ -183,9 +163,9 @@ SUBROUTINE GMESH (NPNODE, NPELEM, MXNFLG, MXSFLG, NPNBC, NPSBC, LABW = .TRUE. CALL MESAGE ('BOUNDARY WEIGHTING DISPLAY - ON') END IF -C + C TOGGLE ELEMENT NUMBERING -C + ELSE IF ((CIN (ICOM) (1:2) .EQ. 'EN') .OR. & (CIN (ICOM) (1:2) .EQ. 'en')) THEN ICOM = ICOM + 1 @@ -197,9 +177,9 @@ SUBROUTINE GMESH (NPNODE, NPELEM, MXNFLG, MXSFLG, NPNBC, NPSBC, CALL MESAGE ('ELEMENT NUMBERS - ON') LABO = .FALSE. END IF -C + C TOGGLE NODE NUMBERING -C + ELSE IF ((CIN (ICOM) (1:1) .EQ. 'N') .OR. & (CIN (ICOM) (1:1) .EQ. 'n')) THEN ICOM = ICOM + 1 @@ -210,9 +190,9 @@ SUBROUTINE GMESH (NPNODE, NPELEM, MXNFLG, MXSFLG, NPNBC, NPSBC, LABN = .TRUE. CALL MESAGE ('NODE NUMBERS - ON') END IF -C + C TOGGLE MATERIAL NUMBER DISPLAY -C + ELSE IF ((CIN (ICOM) (1:2) .EQ. 'MN') .OR. & (CIN (ICOM) (1:2) .EQ. 'mn')) THEN ICOM = ICOM + 1 @@ -223,9 +203,9 @@ SUBROUTINE GMESH (NPNODE, NPELEM, MXNFLG, MXSFLG, NPNBC, NPSBC, LABM = .TRUE. CALL MESAGE ('MATERIAL NUMBERING - ON') END IF -C + C TOGGLE OPTIMIZED ORDER DISPLAY -C + ELSE IF ((CIN (ICOM) (1:1) .EQ. 'O') .OR. & (CIN (ICOM) (1:1) .EQ. 'o')) THEN ICOM = ICOM + 1 @@ -237,9 +217,9 @@ SUBROUTINE GMESH (NPNODE, NPELEM, MXNFLG, MXSFLG, NPNBC, NPSBC, CALL MESAGE ('OPTIMIZER ORDER NUMBERING - ON') LABE = .FALSE. END IF -C + C PLOT ALL ACTIVE ELEMENTS (ZOOM STILL APPLIES) -C + ELSE IF ((CIN (ICOM) (1:1) .EQ. 'P') .OR. & (CIN (ICOM) (1:1) .EQ. 'p')) THEN ICOM = ICOM + 1 @@ -256,9 +236,9 @@ SUBROUTINE GMESH (NPNODE, NPELEM, MXNFLG, MXSFLG, NPNBC, NPSBC, & EIGHT, NINE, VERSN, VAXVMS) DRAWN = .TRUE. END IF -C + C PLOT A LIMITED NUMBER OF ELEMENTS BY ELEMENT NUMBER -C + ELSE IF ((CIN (ICOM) (1:2) .EQ. 'EP') .OR. & (CIN (ICOM) (1:2) .EQ. 'ep')) THEN ICOM = ICOM + 1 @@ -307,9 +287,9 @@ SUBROUTINE GMESH (NPNODE, NPELEM, MXNFLG, MXSFLG, NPNBC, NPSBC, DRAWN = .TRUE. END IF END IF -C + C PLOT ELEMENTS BY REGION (S) OR BARSET (S) CHOSEN -C + ELSE IF ((CIN (ICOM) (1:1) .EQ. 'R') .OR. & (CIN (ICOM) (1:1) .EQ. 'r') .OR. & (CIN (ICOM) (1:1) .EQ. 'B') .OR. @@ -375,9 +355,9 @@ SUBROUTINE GMESH (NPNODE, NPELEM, MXNFLG, MXSFLG, NPNBC, NPSBC, YMAX1 = YMAX END IF END IF -C + C PLOT ELEMENTS BY MATERIAL NUMBER -C + ELSE IF ((CIN (ICOM) (1:1) .EQ. 'M') .OR. & (CIN (ICOM) (1:1) .EQ. 'm')) THEN ICOM = ICOM + 1 @@ -428,16 +408,16 @@ SUBROUTINE GMESH (NPNODE, NPELEM, MXNFLG, MXSFLG, NPNBC, NPSBC, DRAWN = .TRUE. END IF END IF -C + C SPAWN A PROCESS -C + ELSE IF ((CIN (ICOM) (1:2) .EQ. 'SP') .OR. & (CIN (ICOM) (1:2) .EQ. 'sp')) THEN ICOM = ICOM + 1 CALL SPAWN (VAXVMS) -C + C SHOW STATUS OF ALL TOGGLES -C + ELSE IF ((CIN (ICOM) (1:1) .EQ. 'S') .OR. & (CIN (ICOM) (1:1) .EQ. 's')) THEN ICOM = ICOM + 1 @@ -490,9 +470,9 @@ SUBROUTINE GMESH (NPNODE, NPELEM, MXNFLG, MXSFLG, NPNBC, NPSBC, CALL MESAGE (' PLOTTING ORDER AT ELEMENT CENTER IS: ') CALL MESAGE (' ELEMENT NO./BLOCK ID (MAT) NO. ') CALL MESAGE ('*----------------- NOTE -----------------*') -C + C GET A QMS PLOT FILE OF THE CURRENT SCREEN -C + ELSE IF (( (CIN (ICOM) (1:1) .EQ. 'H') .OR. & (CIN (ICOM) (1:2) .EQ. 'h')) .AND. & (CIN (ICOM) (2:2).NE.'E') .AND. @@ -517,9 +497,9 @@ SUBROUTINE GMESH (NPNODE, NPELEM, MXNFLG, MXSFLG, NPNBC, NPSBC, ELSE CALL MESAGE ('HARDCOPY DEVICE NOT AVAILABLE') END IF -C + C ENTER ZOOM LOCATION -C + ELSE IF ((CIN (ICOM) (1:1) .EQ. 'Z') .OR. & (CIN (ICOM) (1:1) .EQ. 'z')) THEN ICOM = ICOM + 1 @@ -527,9 +507,9 @@ SUBROUTINE GMESH (NPNODE, NPELEM, MXNFLG, MXSFLG, NPNBC, NPSBC, & DRAWN, ALPHA, DEV1, X1, X2, Y1, Y2, XX1, XX2, YY1, YY2, & XMIN1, XMAX1, YMIN1, YMAX1, XMIN, XMAX, YMIN, YMAX) DRAWN = .FALSE. -C + C EXIT OPTION - EXITS FASTQ -C + ELSE IF ((CIN (ICOM) (1:2) .EQ. 'EX') .OR. & (CIN (ICOM) (1:2) .EQ. 'ex')) THEN ICOM = ICOM + 1 @@ -542,22 +522,22 @@ SUBROUTINE GMESH (NPNODE, NPELEM, MXNFLG, MXSFLG, NPNBC, NPSBC, & TIME1, BATCH, VERSN) ENDIF GO TO 110 -C + C RETURN TO MESH ROUTINE -C + ELSE IF (CIN (ICOM) (1:1) .EQ. ' ') THEN ICOM = ICOM + 1 DO 180 I = 1, KKK NXK (1, I) = IABS (NXK (1, I)) 180 CONTINUE RETURN -C + C GET HELP MESSAGE -C + ELSE ICOM = ICOM + 1 CALL HELP_FQ (11) END IF GO TO 110 -C + END diff --git a/packages/seacas/applications/fastq/gnlist.f b/packages/seacas/applications/fastq/gnlist.f index 280b203b54bb..40c4677b6b7b 100644 --- a/packages/seacas/applications/fastq/gnlist.f +++ b/packages/seacas/applications/fastq/gnlist.f @@ -1,39 +1,28 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: gnlist.f,v 1.1 1990/11/30 11:09:02 gdsjaar Exp $ -C $Log: gnlist.f,v $ -C Revision 1.1 1990/11/30 11:09:02 gdsjaar -C Initial revision -C -C -CC* FILE: [.RENUM]GNLIST.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE GNLIST (MXLIST, NNUID, MSC, NPNODE, NPELEM, MAXKXN, & NNXK, KXN, NXK, NUID, XN, YN, LIST, NLIST, NUMBER, KCRD, NNN, & ERR, NOROOM) C*********************************************************************** -C + C SUBRUOTINE GNLIST = GETS INITIAL NODE LIST TO BEGIN CUTHILL - MCKEE C PROCESS -C + C*********************************************************************** -C + C NOTE: C AS MANY CARDS OF AS MANY TYPES AS DESIRED MAY BE USED IN C ANY ORDER. IF A NODE IS REFERENCED MORE THAN ONCE A WARNING C WILL BE PRINTED AND ONLY THE FIRST REFERENCE WILL BE USED. C (IT MAY BE NECESSARY TO MULTIPLY REFERENCE A NODE IN THE C CASE OF MORE THAN ONE P - L - P CARD.) -C + C*********************************************************************** -C + C EXAMPLE INPUT CARDS C COL.1 5 ETC. C X-Y 3.5 4.0 @@ -41,27 +30,27 @@ SUBROUTINE GNLIST (MXLIST, NNUID, MSC, NPNODE, NPELEM, MAXKXN, C NODE 7 100100002 100100003 100100004 8 C P-L-P 1 1 2 C P-L-P 1 77 3 66 5 -C + C*********************************************************************** -C + DIMENSION LIST (MXLIST), XN (NPNODE), YN (NPNODE) DIMENSION KXN (NNXK, MAXKXN), NXK (NNXK, NPELEM), NUID (NNUID) -C + CHARACTER*80 NUMBER (MSC) -C + LOGICAL ERR, NOROOM -C + C INITIALIZE -C + ERR=.FALSE. NLIST=0 -C + C NEXT DATA CARD -C + DO 150 K=1, KCRD -C + C X - Y -C + IF ( (NUMBER (K) (1:3) .EQ. 'X-Y') .OR. & (NUMBER (K) (1:3) .EQ. 'x-y')) THEN READ (NUMBER (K) (11:20), ' (E10.0)')XVAL @@ -82,9 +71,9 @@ SUBROUTINE GNLIST (MXLIST, NNUID, MSC, NPNODE, NPELEM, MAXKXN, NLIST=NLIST + 1 LIST (NLIST)=INEAR ENDIF -C + C NODE ID -C + ELSEIF ( (NUMBER (K) (1:3) .EQ. 'NOD') .OR. & (NUMBER (K) (1:3) .EQ. 'nod')) THEN DO 110 I=11, 71, 10 @@ -103,9 +92,9 @@ SUBROUTINE GNLIST (MXLIST, NNUID, MSC, NPNODE, NPELEM, MAXKXN, ENDIF ENDIF 110 CONTINUE -C + C P-L-P -C + ELSEIF ( (NUMBER (K) (1:3) .EQ. 'P-L') .OR. & (NUMBER (K) (1:3) .EQ. 'p-l')) THEN NUMNEW=0 @@ -144,11 +133,11 @@ SUBROUTINE GNLIST (MXLIST, NNUID, MSC, NPNODE, NPELEM, MAXKXN, 140 CONTINUE ENDIF 150 CONTINUE -C + RETURN -C + 10000 FORMAT (' NODE', I10, ' IS ALREADY IN THE LIST') 10010 FORMAT (' NODE', I10, & ' IS NOT AN IDENTIFIER OF A NODE IN THIS MESH') -C + END diff --git a/packages/seacas/applications/fastq/gnxka.f b/packages/seacas/applications/fastq/gnxka.f index 195d52948e00..eceb5093a30e 100644 --- a/packages/seacas/applications/fastq/gnxka.f +++ b/packages/seacas/applications/fastq/gnxka.f @@ -1,22 +1,21 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: gnxka.f,v 1.2 2000/11/13 15:41:35 gdsjaar Exp $ SUBROUTINE GNXKA (MXND, XN, YN, K, NODES, AREA, LXK, NXL, CCW) C*********************************************************************** C SUBROUTINE GNXKA = GENERATES A LIST OF THE FOUR NODES ASSOCIATED WITH C ELEMENT K -C + C*********************************************************************** C VARIABLES USED: C CCW = .TRUE. IF LIST IS TO BE IN CCW ORDER AND AREA DEFINED C (Changed to always put in order and calculate area) -C + C*********************************************************************** -C + REAL XN (MXND), YN (MXND) INTEGER NODES(4) INTEGER LXK(4, MXND), NXL(2, 3 * MXND) diff --git a/packages/seacas/applications/fastq/gtxdum.f b/packages/seacas/applications/fastq/gtxdum.f index f8f085cb594b..5e5c043d17a1 100644 --- a/packages/seacas/applications/fastq/gtxdum.f +++ b/packages/seacas/applications/fastq/gtxdum.f @@ -1,29 +1,18 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: gtxdum.f,v 1.1 1990/11/30 11:09:08 gdsjaar Exp $ -C $Log: gtxdum.f,v $ -C Revision 1.1 1990/11/30 11:09:08 gdsjaar -C Initial revision -C -C -CC* FILE: [.MAIN]GTXDUM.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE GTXDUM (X, DUMMY, LEN) C*********************************************************************** -C + C SUBROUTINE GTXDUM = GETS A REAL INTO A DUMMY CHARACTER STRING -C + C*********************************************************************** -C + CHARACTER*72 DUMMY -C + DUMMY = ' ' IF(X .LE. -10000.) THEN WRITE (DUMMY(1:10), 10000) X @@ -63,7 +52,7 @@ SUBROUTINE GTXDUM (X, DUMMY, LEN) LEN = 5 ENDIF RETURN -C + 10000 FORMAT (1PE10.3) 10010 FORMAT (F6.0) 10020 FORMAT (F6.1) @@ -76,5 +65,5 @@ SUBROUTINE GTXDUM (X, DUMMY, LEN) 10090 FORMAT (F5.2) 10100 FORMAT (F5.3) 10110 FORMAT (F5.4) -C + END diff --git a/packages/seacas/applications/fastq/inattr.f b/packages/seacas/applications/fastq/inattr.f index 54a53d2114ab..ff0eaceb14a4 100644 --- a/packages/seacas/applications/fastq/inattr.f +++ b/packages/seacas/applications/fastq/inattr.f @@ -1,41 +1,30 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: inattr.f,v 1.1 1990/11/30 11:09:14 gdsjaar Exp $ -C $Log: inattr.f,v $ -C Revision 1.1 1990/11/30 11:09:14 gdsjaar -C Initial revision -C -C -CC* FILE: [.MAIN]INATTR.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE INATTR (MS, MR, MA, N17, N23, JJ, RIN, IFOUND, ATTRIB, & LINKM, NOROOM) C*********************************************************************** -C + C SUBROUTINE INATTR = INPUTS MATERIAL ATTRIBUTES INTO THE DATABASE -C + C*********************************************************************** -C + DIMENSION ATTRIB (MA, MR+MS), LINKM (2, (MS+MR)) -C + LOGICAL NOROOM, ADDLNK -C + NOROOM = .TRUE. ADDLNK = .FALSE. -C + C UPDATE THE COUNTER IF NEEDED -C + IF (JJ.GT.N23)N23 = JJ -C + C ADD THE ATTRIBUTES INTO THE DATABASE -C + N17 = N17 + 1 J = N17 IF (J .GT. (MS + MR))RETURN @@ -58,14 +47,14 @@ SUBROUTINE INATTR (MS, MR, MA, N17, N23, JJ, RIN, IFOUND, ATTRIB, DO 100 I = 1, IEND ATTRIB (J, I) = RIN (I) 100 CONTINUE -C + NOROOM = .FALSE. -C + RETURN -C + 10000 FORMAT (' FOR MATERIAL NUMBER:', I5, & ' NUMBER OF ATTRIBUTES READ:', I5, /, & ' EXCEEDS MAX ALLOWED OF:', & I5) -C + END diff --git a/packages/seacas/applications/fastq/inbody.f b/packages/seacas/applications/fastq/inbody.f index 628d4c219f0e..dbea31c7a0bb 100644 --- a/packages/seacas/applications/fastq/inbody.f +++ b/packages/seacas/applications/fastq/inbody.f @@ -1,51 +1,40 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: inbody.f,v 1.1 1990/11/30 11:09:17 gdsjaar Exp $ -C $Log: inbody.f,v $ -C Revision 1.1 1990/11/30 11:09:17 gdsjaar -C Initial revision -C -C -CC* FILE: [.MAIN]INBODY.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE INBODY (MR, N9, IIN, IFOUND, IRPB, ADDOLD, NOROOM) C*********************************************************************** -C + C SUBROUTINE INBODY = INPUTS A BODY LIST INTO THE DATABASE -C + C*********************************************************************** -C + DIMENSION IIN (IFOUND), IRPB (MR) -C + LOGICAL NOROOM, ADDOLD -C + NOROOM = .TRUE. IF (.NOT.ADDOLD)N9 = 0 DO 120 I = 1, IFOUND JJ = IIN (I) IF (JJ .EQ. 0)GOTO 130 IF (N9 + 1 .GT. MR)RETURN -C + C SEE IF THE REGION IS ALREADY IN THE BODY LIST -C + DO 100 J = 1, N9 IF (IRPB (J) .EQ. JJ)GOTO 110 100 CONTINUE -C + N9 = N9 + 1 IRPB (N9) = JJ 110 CONTINUE 120 CONTINUE 130 CONTINUE -C + NOROOM = .FALSE. RETURN -C + END diff --git a/packages/seacas/applications/fastq/inboun.f b/packages/seacas/applications/fastq/inboun.f index 5375e50f298c..703d78f414e0 100644 --- a/packages/seacas/applications/fastq/inboun.f +++ b/packages/seacas/applications/fastq/inboun.f @@ -1,68 +1,45 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: inboun.f,v 1.3 2004/01/21 05:18:40 gdsjaar Exp $ -C $Log: inboun.f,v $ -C Revision 1.3 2004/01/21 05:18:40 gdsjaar -C Initialized several variables identified by valgrind. -C -C Revision 1.2 1998/07/14 18:19:11 gdsjaar -C Removed unused variables, cleaned up a little. -C -C Changed BLUE labels to GREEN to help visibility on black background -C (indirectly requested by a couple users) -C -C Revision 1.1.1.1 1990/11/30 11:09:21 gdsjaar -C FASTQ Version 2.0X -C -c Revision 1.1 90/11/30 11:09:19 gdsjaar -c Initial revision -c -C -CC* FILE: [.MAIN]INBOUN.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE INBOUN (MDIM, JJ, IFOUND, IIN, N1, N2, N3, N2OLD, & MERGE, NOROOM, NEWNUM, NHOLD, IHOLD, IFLAG, INUM, IFIRST, & LIST, LINK, IWT, JHOLD, ADDOLD) C*********************************************************************** -C + C SUBROUTINE INBOUN = INPUTS AND LINKS BOUNDARY FLAG INFORMATION -C + C*********************************************************************** -C + C SUBROUTINE CALLED BY: C READ = READS AND/OR MERGES QMESH CARD FILE(S) C LINKBC = LINKS BOUNDARY FLAGS TO ENTITIES -C + C*********************************************************************** -C + DIMENSION IHOLD(2, MDIM), IFLAG(MDIM) DIMENSION INUM(MDIM), IFIRST(MDIM) DIMENSION LIST(2, MDIM), LINK(2, MDIM) DIMENSION IIN(IFOUND), IWT(3, MDIM) -C + LOGICAL NOROOM, MERGE, NEWNUM, ADDOLD, ADDLNK -C + NEWNUM = .FALSE. NOROOM = .FALSE. IZ = 0 IOLD = 0 -C + IF ((JJ.LE.0) .OR. (JJ .GT. 10000)) THEN WRITE(*, 10000) JJ RETURN END IF -C + NOROOM = .TRUE. -C + C GET THE CORRECT FLAG ID -C + IF (JJ .GT. N1) THEN N1 = JJ ELSE IF (MERGE) THEN @@ -85,27 +62,27 @@ SUBROUTINE INBOUN (MDIM, JJ, IFOUND, IIN, N1, N2, N3, N2OLD, END IF END IF IF (N2 + 1 .GT. MDIM) RETURN -C + C GET THE OLD LOCATION OF THE FLAG IF IT IS THERE -C + ADDLNK = .FALSE. CALL LTSORT (MDIM, LINK, JJ, IOLD, ADDLNK) -C + C IF THE FLAG CURRENTLY EXISTS, SHIFT THE FLAG DATA TO THE END C OF THE CURRENT FLAG LIST, TO FACILITATE ADDING MORE ENTRIES C TO THE OLD FLAG -C + IF (IOLD .GT. 0) THEN -C + C SHIFT THE OLD DEFINITION TO THE END OF THE LIST -C + IFLAG(N2 + 1) = IFLAG(IOLD) INUM(N2 + 1) = INUM(IOLD) IWT(1, N2 + 1) = IWT(1, IOLD) IWT(2, N2 + 1) = IWT(2, IOLD) IWT(3, N2 + 1) = IWT(3, IOLD) IFIRST(N2 + 1) = N3 + 1 -C + IF (IOLD .LT. N2) THEN KOUNT = IFIRST(IOLD + 1) - IFIRST(IOLD) ELSE IF (IOLD .EQ. N2) THEN @@ -122,11 +99,11 @@ SUBROUTINE INBOUN (MDIM, JJ, IFOUND, IIN, N1, N2, N3, N2OLD, LIST(1, NPLACE) = LIST(1, I) LIST(2, NPLACE) = LIST(2, I) 100 CONTINUE -C + C SLIDE ALL TRAILING FLAGS OVER TO FILL THE GAP IN THE LIST C RESORT THE POINTER ARRAY AS THE LIST FILLS AND STEP N2OLD C DOWN A NOTCH SO THESE WILL BE RELINKED IF NECESSARY -C + IF (N2OLD .GT. 0) N2OLD = N2OLD - 1 ADDLNK = .TRUE. DO 110 I = IOLD, N2 @@ -138,7 +115,7 @@ SUBROUTINE INBOUN (MDIM, JJ, IFOUND, IIN, N1, N2, N3, N2OLD, IWT(3, I) = IWT(3, I + 1) CALL LTSORT (MDIM, LINK, IFLAG(I), I, ADDLNK) 110 CONTINUE -C + N3 = IFIRST(N2) + INUM(N2) - 1 DO 120 I = NLIST1, N3 IKOUNT = I + KOUNT @@ -146,9 +123,9 @@ SUBROUTINE INBOUN (MDIM, JJ, IFOUND, IIN, N1, N2, N3, N2OLD, LIST(2, I) = LIST(2, IKOUNT) 120 CONTINUE ELSE -C + C LINK UP THE FLAG IN THE NEXT OPEN SLOT -C + ADDLNK = .TRUE. N2 = N2 + 1 CALL LTSORT (MDIM, LINK, JJ, N2, ADDLNK) @@ -158,15 +135,15 @@ SUBROUTINE INBOUN (MDIM, JJ, IFOUND, IIN, N1, N2, N3, N2OLD, IWT(2, N2) = 0 IWT(3, N2) = 0 END IF -C + C READ IN THE NEW FLAG LIST -C + DO 150 I = 1, IFOUND JJ = IIN(I) IF (JJ .EQ. 0) GO TO 160 -C + C CHECK TO MAKE SURE THIS ENTITY IS NOT ALREADY IN THE LIST -C + DO 130 K = IFIRST(N2), N3 IF (LIST(1, K) .EQ. JJ) GO TO 140 130 CONTINUE @@ -177,11 +154,11 @@ SUBROUTINE INBOUN (MDIM, JJ, IFOUND, IIN, N1, N2, N3, N2OLD, 140 CONTINUE 150 CONTINUE 160 CONTINUE -C + INUM(N2) = N3 - IFIRST(N2) + 1 NOROOM = .FALSE. RETURN -C + 10000 FORMAT (' A FLAG NO. OF:', I7, ' IS NOT ALLOWED', /, & ' THIS FLAG WILL NOT BE INPUT INTO DATABASE') END diff --git a/packages/seacas/applications/fastq/inbrst.f b/packages/seacas/applications/fastq/inbrst.f index 50031d131378..d3f94f7ea342 100644 --- a/packages/seacas/applications/fastq/inbrst.f +++ b/packages/seacas/applications/fastq/inbrst.f @@ -1,69 +1,39 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: inbrst.f,v 1.2 1999/06/21 22:43:40 gdsjaar Exp $ -C $Log: inbrst.f,v $ -C Revision 1.2 1999/06/21 22:43:40 gdsjaar -C Fixed more uninitialized variables; one was causing core dump on g77 -C compiled executable. -C -C VERSN was not consistently defined -- now 10 characters everywhere -C -C Updated so full version string output -C -C Added capability to debug memory using unit specified in EXT99 -C variable. Similar to STRTUP in SUPLIB -C -C Cleaned up some other code -C -C Upped version -C -C Revision 1.1.1.1 1990/11/30 11:09:24 gdsjaar -C FASTQ Version 2.0X -C -c Revision 1.1 90/11/30 11:09:22 gdsjaar -c Initial revision -c -C -CC* FILE: [.MAIN]INBRST.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE INBRST (MS, MR, N5, N6, N21, N23, JJ, IMTRL, JC, IIN, & IFOUND, IBARST, JMAT, JCENT, NLPB, JFLINE, JLLIST, LINKB, & LINKM, NHOLDM, IHOLDM, NHOLDB, IHOLDB, MERGE, NOROOM) C*********************************************************************** -C + C SUBROUTINE INBRST = INPUTS A BAR SET INTO THE DATABASE -C + C*********************************************************************** -C + DIMENSION IBARST (MS), JMAT (MS), JCENT (MS), NLPB (MS) DIMENSION JFLINE (MS) DIMENSION JLLIST (3 * MS), LINKB (2, MS), LINKM (2, MS + MR) DIMENSION IHOLDM (2, (MS + MR)), IHOLDB (2, MS) DIMENSION IIN (IFOUND) -C + LOGICAL MERGE, NOROOM, ADDLNK -C + IZ = 0 NOROOM = .TRUE. N22 = 0 -C + C ZERO OUT THE LINK ARRAY IF NEEDED -C + IF (JJ .GT. N21) THEN N21 = JJ -C + C FIND THE CORRECT BAR SET NUMBER IF MERGING -C -C + C SET UP POINTERS FOR MERGING DATA -C + ELSEIF (MERGE) THEN JHOLD = JJ CALL LTSORT (MS, LINKB, JJ, IPNTR, ADDLNK) @@ -81,9 +51,9 @@ SUBROUTINE INBRST (MS, MR, N5, N6, N21, N23, JJ, IMTRL, JC, IIN, ENDIF ENDIF ENDIF -C + C INPUT THE BAR SET DATA INTO THE DATABASE -C + N5 = N5 + 1 J = N5 IF (J .GT. MS)RETURN @@ -106,18 +76,16 @@ SUBROUTINE INBRST (MS, MR, N5, N6, N21, N23, JJ, IMTRL, JC, IIN, CALL LTSORT (MS, LINKB, JJ, IZ, ADDLNK) ENDIF ADDLNK = .FALSE. -C -C + C LINK UP THE MATERIAL -C -C + C ZERO THE LINK ARRAY IF NEEDED -C + IF (IMTRL .GT. N23) THEN N23 = IMTRL -C + C SET UP POINTERS FOR MERGING DATA -C + ELSEIF (MERGE) THEN JHOLD = IMTRL CALL LTSORT (MS + MR, LINKM, IMTRL, IPNTR, ADDLNK) @@ -136,9 +104,9 @@ SUBROUTINE INBRST (MS, MR, N5, N6, N21, N23, JJ, IMTRL, JC, IIN, ENDIF ENDIF ENDIF -C + C ADD THE MATERIAL INTO THE DATABASE -C + NOROOM = .FALSE. ADDLNK = .FALSE. CALL LTSORT (MS + MR, LINKM, IMTRL, IPNTR, ADDLNK) @@ -153,9 +121,9 @@ SUBROUTINE INBRST (MS, MR, N5, N6, N21, N23, JJ, IMTRL, JC, IIN, CALL LTSORT (MS + MR, LINKM, IMTRL, IMINUS, ADDLNK) ENDIF JMAT (J) = IMTRL -C + RETURN -C + 10000 FORMAT (' OLD BAR SET NO:', I5, ' TO NEW BAR SET NO:', I5) 10010 FORMAT (' BAR SET:', I5, ' HAS LESS THAN ONE LINE', / , & ' THIS BAR SET WILL NOT BE INPUT INTO DATABASE') diff --git a/packages/seacas/applications/fastq/indx.f b/packages/seacas/applications/fastq/indx.f index a89911d3c56d..0073a9da81e2 100644 --- a/packages/seacas/applications/fastq/indx.f +++ b/packages/seacas/applications/fastq/indx.f @@ -1,37 +1,26 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: indx.f,v 1.1 1990/11/30 11:09:32 gdsjaar Exp $ -C $Log: indx.f,v $ -C Revision 1.1 1990/11/30 11:09:32 gdsjaar -C Initial revision -C -C -CC* FILE: [.RENUM]INDX.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C FUNCTION INDX (N, L, IVAL) C************************************************************************ -C + C FUNCTION INDX = FINDS THE INDEX IN L OF IVAL -C + C************************************************************************ -C + C NOTE: C L MUST BE IN INCREASING ORDER C IF IVAL IS NOT IN L, INDEX=0 IS RETURNED -C + C*********************************************************************** -C + DIMENSION L (N) -C + C BISECTION SEARCH -C + IF (N .LT. 1) THEN INDX=0 RETURN @@ -40,9 +29,9 @@ FUNCTION INDX (N, L, IVAL) IHI=N 100 CONTINUE IMID= (ILO + IHI) / 2 -C + C CONVERGENCE -C + IF (IMID .EQ. ILO) THEN IF (IVAL .EQ. L (IMID)) THEN INDX=IMID @@ -54,7 +43,7 @@ FUNCTION INDX (N, L, IVAL) INDX=IHI RETURN ENDIF -C + IF (IVAL .LT. L (IMID)) THEN IHI=IMID ELSEIF (IVAL .EQ. L (IMID)) THEN @@ -64,5 +53,5 @@ FUNCTION INDX (N, L, IVAL) ILO=IMID ENDIF GOTO 100 -C + END diff --git a/packages/seacas/applications/fastq/infact.f b/packages/seacas/applications/fastq/infact.f index 825dcf1d347b..c5bc1843f51a 100644 --- a/packages/seacas/applications/fastq/infact.f +++ b/packages/seacas/applications/fastq/infact.f @@ -1,40 +1,29 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: infact.f,v 1.1 1990/11/30 11:09:35 gdsjaar Exp $ -C $Log: infact.f,v $ -C Revision 1.1 1990/11/30 11:09:35 gdsjaar -C Initial revision -C -C -CC* FILE: [.MAIN]INFACT.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE INFACT (ML, MS, IFOUND, FACT, IIN, N19, N20, FACTOR, & NLPS, IFLINE, ILLIST, LINKL, LINKS, ADDLNK) C*********************************************************************** -C + C SUBROUTINE INFACT = ENTERS FACTORS INTO THE DATABASE -C + C*********************************************************************** -C + DIMENSION FACTOR (ML), IIN (IFOUND) DIMENSION NLPS (MS), IFLINE (MS), ILLIST (MS * 3) DIMENSION LINKL (2, ML), LINKS (2, MS) -C + LOGICAL ADDLNK -C + IF (FACT .LE. 0.)FACT = 1.0 DO 110 I = 1, IFOUND JJ = IIN (I) -C + C APPLY INTERVALS TO A SIDE -C + IF (JJ .LT. 0) THEN JJ = - JJ CALL LTSORT (MS, LINKS, JJ, IPNTR, ADDLNK) @@ -53,9 +42,9 @@ SUBROUTINE INFACT (ML, MS, IFOUND, FACT, IIN, N19, N20, FACTOR, 100 CONTINUE ENDIF ELSE -C + C INPUT A FACTOR FOR A LINE -C + CALL LTSORT (ML, LINKL, JJ, IPNTR, ADDLNK) IF ( (JJ .GT. N19) .OR. (IPNTR .LE. 0)) THEN WRITE ( * , 10010)JJ @@ -64,12 +53,12 @@ SUBROUTINE INFACT (ML, MS, IFOUND, FACT, IIN, N19, N20, FACTOR, ENDIF ENDIF 110 CONTINUE -C + RETURN -C + 10000 FORMAT (' SIDE NO:', I5, ' IS NOT IN THE DATABASE', / , & ' THUS NO INTERVALS CAN BE ENTERED') 10010 FORMAT (' LINE NO:', I5, ' IS NOT IN THE DATABASE', / , & ' THUS NO INTERVAL CAN BE ENTERED') -C + END diff --git a/packages/seacas/applications/fastq/ingrid.f b/packages/seacas/applications/fastq/ingrid.f index 44ce95f32317..90ff10bc2d37 100644 --- a/packages/seacas/applications/fastq/ingrid.f +++ b/packages/seacas/applications/fastq/ingrid.f @@ -1,44 +1,33 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: ingrid.f,v 1.1 1990/11/30 11:09:38 gdsjaar Exp $ -C $Log: ingrid.f,v $ -C Revision 1.1 1990/11/30 11:09:38 gdsjaar -C Initial revision -C -C -CC* FILE: [.MAIN]INGRID.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE INGRID (MSNAP, SNAPDX, NSNAP, II, RIN, IFOUND, ERR) C*********************************************************************** -C + C SUBROUTINE INGRID = INPUTS A X OR Y GRID CARD -C + C*********************************************************************** -C + DIMENSION SNAPDX(2, MSNAP), NSNAP(2), RIN(IFOUND) LOGICAL ERR -C + ERR = .FALSE. IF (II .LT. 1 .OR. II .GT. 2) THEN ERR = .TRUE. WRITE (*, 10000) II GO TO 110 END IF -C + DO 100 I = 1, IFOUND CALL ADDSNP (MSNAP, SNAPDX, NSNAP, II, RIN(I), ERR) IF (ERR) GO TO 110 100 CONTINUE -C + 110 CONTINUE RETURN -C + 10000 FORMAT (' GRID INDEX OUT-OF-RANGE [1,2] IN INGRID: ', I3) END diff --git a/packages/seacas/applications/fastq/ingrpn.f b/packages/seacas/applications/fastq/ingrpn.f index 9d36a439176d..0321588e473b 100644 --- a/packages/seacas/applications/fastq/ingrpn.f +++ b/packages/seacas/applications/fastq/ingrpn.f @@ -1,45 +1,34 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: ingrpn.f,v 1.1 1990/11/30 11:09:41 gdsjaar Exp $ -C $Log: ingrpn.f,v $ -C Revision 1.1 1990/11/30 11:09:41 gdsjaar -C Initial revision -C -C -CC* FILE: [.MAIN]INGRPN.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE INGRPN (MS, MR, N7, N8, N22, JJ, IIN, IFOUND, IREGN, & NSPR, IFSIDE, ISLIST, LINKR, NHOLDR, IHOLDR, IRGFLG, MERGE, & NOROOM) C*********************************************************************** -C + C SUBROUTINE INGRPN = INPUTS A REGION INTO THE DATABASE -C + C*********************************************************************** -C + DIMENSION IREGN(MR), NSPR(MR), IFSIDE(MR), ISLIST(MR*4) DIMENSION LINKR(2, MR), IHOLDR(2, MR), IRGFLG(MR), IIN(IFOUND) -C + LOGICAL NOROOM, MERGE, ADDLNK -C + IZ = 0 NOROOM = .TRUE. ADDLNK = .FALSE. -C + C ZERO THE LINK ARRAY IF NEEDED -C + IF (JJ .GT. N22) THEN N22 = JJ -C + C SET UP POINTERS FOR MERGING DATA -C + ELSE IF (MERGE) THEN JHOLD = JJ CALL LTSORT (MR, LINKR, JJ, IPNTR, ADDLNK) @@ -57,9 +46,9 @@ SUBROUTINE INGRPN (MS, MR, N7, N8, N22, JJ, IIN, IFOUND, IREGN, END IF END IF END IF -C + C ADD THE REGION INTO THE DATABASE -C + N7 = N7 + 1 J = N7 IF (J .GT. MR) RETURN @@ -81,10 +70,10 @@ SUBROUTINE INGRPN (MS, MR, N7, N8, N22, JJ, IIN, IFOUND, IREGN, WRITE(*, 10010) J CALL LTSORT (MR, LINKR, IREGN(J), IZ, ADDLNK) END IF -C + NOROOM = .FALSE. RETURN -C + 10000 FORMAT (' OLD GROUP NO:', I5, ' TO NEW GROUP NO:', I5) 10010 FORMAT (' GROUP:', I5, ' HAS LESS THAN ONE REGION', /, & ' THIS GROUP WILL NOT BE INPUT INTO DATABASE') diff --git a/packages/seacas/applications/fastq/inhole.f b/packages/seacas/applications/fastq/inhole.f index cc43379d7231..b9cfc22d690b 100644 --- a/packages/seacas/applications/fastq/inhole.f +++ b/packages/seacas/applications/fastq/inhole.f @@ -1,37 +1,26 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: inhole.f,v 1.1 1990/11/30 11:09:43 gdsjaar Exp $ -C $Log: inhole.f,v $ -C Revision 1.1 1990/11/30 11:09:43 gdsjaar -C Initial revision -C -C -CC* FILE: [.MAIN]INHOLE.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE INHOLE (MR, N7, N29, JPNTR, IIN, IFOUND, IFHOLE, NHPR, & IHLIST, MERGE, NOROOM) C*********************************************************************** -C + C SUBROUTINE INHOLE = INPUTS A REGION'S HOLES INTO THE DATABASE -C + C*********************************************************************** -C + DIMENSION IFHOLE(MR), NHPR(MR), IHLIST(MR*2) DIMENSION IIN(IFOUND) -C + LOGICAL NOROOM, MERGE -C + NOROOM = .TRUE. -C + C ADD THE REGION INTO THE DATABASE -C + J = JPNTR IFHOLE(J) = N29 + 1 DO 100 I = 1, IFOUND @@ -41,18 +30,18 @@ SUBROUTINE INHOLE (MR, N7, N29, JPNTR, IIN, IFOUND, IFHOLE, NHPR, IF (N29 .GT. MR*2) RETURN IHLIST(N29) = JJ 100 CONTINUE -C + 110 CONTINUE NHPR(J) = N29 - IFHOLE(J) + 1 IF (NHPR(J) .LT. 1) THEN WRITE(*, 10000) J N29 = IFHOLE(J) - 1 END IF -C + NOROOM = .FALSE. RETURN -C + 10000 FORMAT(' REGION:', I5, ' HAS LESS THAN ONE HOLE', /, & ' THE HOLES FOR THIS REGION WILL NOT BE INPUT INTO DATABASE') -C + END diff --git a/packages/seacas/applications/fastq/inintr.f b/packages/seacas/applications/fastq/inintr.f index 221841bce6cc..a2f000a203d6 100644 --- a/packages/seacas/applications/fastq/inintr.f +++ b/packages/seacas/applications/fastq/inintr.f @@ -1,39 +1,28 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: inintr.f,v 1.1 1990/11/30 11:09:46 gdsjaar Exp $ -C $Log: inintr.f,v $ -C Revision 1.1 1990/11/30 11:09:46 gdsjaar -C Initial revision -C -C -CC* FILE: [.MAIN]ININTR.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE ININTR (ML, MS, IFOUND, NEWINT, IIN, N19, N20, NINT, & NLPS, IFLINE, ILLIST, LINKL, LINKS, ADDLNK) C*********************************************************************** -C + C SUBROUTINE ININTR = ENTERS INTERVALS INTO THE DATABASE -C + C*********************************************************************** -C + DIMENSION NINT (ML), IIN (IFOUND) DIMENSION NLPS (MS), IFLINE (MS), ILLIST (MS*3) DIMENSION LINKL (2, ML), LINKS (2, MS) -C + LOGICAL ADDLNK -C + DO 110 I = 1, IFOUND JJ = IIN (I) -C + C APPLY INTERVALS TO A SIDE -C + IF (JJ.LT.0) THEN JJ = - JJ CALL LTSORT (MS, LINKS, JJ, IPNTR, ADDLNK) @@ -55,9 +44,9 @@ SUBROUTINE ININTR (ML, MS, IFOUND, NEWINT, IIN, N19, N20, NINT, 100 CONTINUE ENDIF ELSE -C + C INPUT INTERVALS ON A LINE -C + CALL LTSORT (ML, LINKL, JJ, IPNTR, ADDLNK) IF ( (JJ.GT.N19) .OR. (IPNTR.LE.0)) THEN WRITE (*, 10020) JJ @@ -68,9 +57,9 @@ SUBROUTINE ININTR (ML, MS, IFOUND, NEWINT, IIN, N19, N20, NINT, ENDIF ENDIF 110 CONTINUE -C + RETURN -C + 10000 FORMAT (' SIDE NO:', I5, ' IS NOT IN THE DATABASE', /, & ' THUS NO INTERVALS CAN BE ENTERED') 10010 FORMAT (' LINES IN SIDE NO:', I5, @@ -78,5 +67,5 @@ SUBROUTINE ININTR (ML, MS, IFOUND, NEWINT, IIN, N19, N20, NINT, 10020 FORMAT (' LINE NO:', I5, ' IS NOT IN THE DATABASE', /, & ' THUS NO INTERVAL CAN BE ENTERED') 10030 FORMAT (' LINE NO:', I5, ' CANNOT HAVE AN INTERVAL OF:', I8) -C + END diff --git a/packages/seacas/applications/fastq/initdg.f b/packages/seacas/applications/fastq/initdg.f index 1067cab8626f..9da4702645a6 100644 --- a/packages/seacas/applications/fastq/initdg.f +++ b/packages/seacas/applications/fastq/initdg.f @@ -1,38 +1,27 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: initdg.f,v 1.1 1990/11/30 11:09:49 gdsjaar Exp $ -C $Log: initdg.f,v $ -C Revision 1.1 1990/11/30 11:09:49 gdsjaar -C Initial revision -C -C -CC* FILE: [.MAIN]INITDG.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE INITDG (MCOM, ICOM, JCOM, CIN, RIN, IIN, KIN, IDUMP, & XX1, YY1, SCALE, CT, ST, X1, X2, Y1, Y2, DRWTAB, SNAP) C*********************************************************************** -C + C SUBROUTINE INITDG = INITIALIZES THE DIGITIZING TABLET -C + C*********************************************************************** -C + DIMENSION KIN (MCOM), IIN (MCOM), RIN (MCOM) -C + CHARACTER * 72 CIN (MCOM), BUTTON * 1 -C + LOGICAL DRWTAB, IANS, SNAP -C + IZ = 0 -C + C CHECK TO MAKE SURE THAT THE DRAWING IS NOT BEING TOGGLED -C + IF (DRWTAB) THEN CALL MESAGE ('DRAWING INITIALIZATION IS ALREADY ACTIVE') CALL INTRUP ('TOGGLE ALL DRAWING INITIALIZATION OFF', @@ -44,10 +33,9 @@ SUBROUTINE INITDG (MCOM, ICOM, JCOM, CIN, RIN, IIN, KIN, IDUMP, RETURN ENDIF ENDIF -C -C + C GET THE ZOOM LIMITS -C + CALL MESAGE (' ') IF (ICOM .GT. JCOM) THEN CALL FREFLD (IZ, IZ, 'ENTER DRAWING XMIN, XMAX, YMIN, YMAX:', @@ -68,9 +56,9 @@ SUBROUTINE INITDG (MCOM, ICOM, JCOM, CIN, RIN, IIN, KIN, IDUMP, CALL MESAGE (' ') RETURN ENDIF -C + C GET THE DIGITIZING POINTS -C + CALL MESAGE ('NOW DIGITIZE THOSE 2 POINTS') CALL MESAGE (' PUSH "PUCK - 1" FOR LOWER LEFT') CALL MESAGE (' PUSH "PUCK - 2" FOR UPPER RIGHT') @@ -104,7 +92,7 @@ SUBROUTINE INITDG (MCOM, ICOM, JCOM, CIN, RIN, IIN, KIN, IDUMP, & DRWTAB) CALL MESAGE ('INITIALIZATION COMPLETE') CALL MESAGE (' ') -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/inline.f b/packages/seacas/applications/fastq/inline.f index 9ddbe1db9220..67a36a179128 100644 --- a/packages/seacas/applications/fastq/inline.f +++ b/packages/seacas/applications/fastq/inline.f @@ -1,54 +1,34 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: inline.f,v 1.2 1998/12/08 14:26:04 gdsjaar Exp $ -C $Log: inline.f,v $ -C Revision 1.2 1998/12/08 14:26:04 gdsjaar -C Detect whether negative line intervals entered. Output warning message -C and fix (make positive). -C -C Upped version to 2.10 -C -C Revision 1.1.1.1 1990/11/30 11:09:53 gdsjaar -C FASTQ Version 2.0X -C -c Revision 1.1 90/11/30 11:09:51 gdsjaar -c Initial revision -c -C -CC* FILE: [.MAIN]INLINE.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE INLINE (ML, N2, N19, JJ, LTYP, IP1, IP2, IP3, NN, & FACT, NHOLDL, IHOLDL, ILINE, LTYPE, NINT, FACTOR, LCON, & ILBOUN, ISBOUN, LINKL, MERGE, NOROOM) C*********************************************************************** -C + C SUBROUTINE INLINE = INPUTS A LINE INTO THE DATABASE -C + C*********************************************************************** -C + DIMENSION ILINE (ML), LTYPE (ML), NINT (ML), FACTOR (ML) DIMENSION LCON (3, ML) DIMENSION ILBOUN (ML), ISBOUN (ML), LINKL (2, ML), IHOLDL (2, ML) -C + LOGICAL MERGE, NOROOM, ADDLNK -C + NOROOM = .TRUE. JHOLD = JJ -C + C ADJUST THE COUNTER IF NEEDED -C + IF (JJ .GT. N19) THEN N19 = JJ -C + C GET THE CORRECT LINE NUMBER IF MERGING -C + ELSEIF (MERGE) THEN ADDLNK = .FALSE. CALL LTSORT (ML, LINKL, JJ, IPNTR, ADDLNK) @@ -66,9 +46,9 @@ SUBROUTINE INLINE (ML, N2, N19, JJ, LTYP, IP1, IP2, IP3, NN, ENDIF ENDIF ENDIF -C + C INPUT THE LINE DATA -C + N2 = N2 + 1 J = N2 IF (J .GT. ML)RETURN @@ -91,7 +71,7 @@ SUBROUTINE INLINE (ML, N2, N19, JJ, LTYP, IP1, IP2, IP3, NN, ISBOUN (J) = 0 NOROOM = .FALSE. RETURN -C + 10000 FORMAT (' OLD LINE NO:', I5, ' TO NEW LINE NO:', I5) 10010 FORMAT ('WARNING: Intervals on line ', I5, ' are negative.', & ' Changed to positive.') diff --git a/packages/seacas/applications/fastq/innerh.f b/packages/seacas/applications/fastq/innerh.f index 4308472ae039..d4754c715e10 100644 --- a/packages/seacas/applications/fastq/innerh.f +++ b/packages/seacas/applications/fastq/innerh.f @@ -1,28 +1,23 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -CC* FILE: [.QMESH]INNERH.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE INNERH (MXND, NXH, NUID, LXK, KXL, NXL, LXN, KKK, LLL, & NNN, NNNOLD, NH, ISTART, IAVAIL, NAVAIL, NOROOM, ERR) C*********************************************************************** -C + C SUBROUTINE INNERH = INSERT A ROW OF ELEMENTS AROUND A HOLE -C + C*********************************************************************** -C + DIMENSION NUID(MXND), LXK(4, MXND) DIMENSION KXL(2, 3*MXND), NXL(2, 3*MXND), LXN(4, MXND) DIMENSION NXH(MXND) -C + LOGICAL ERR, NOROOM -C + ERR = .FALSE. IF ((KKK + NH .GT. MXND) .OR. (LLL + 2*NH .GT. 3*MXND) .OR. & (NNN + NH .GT. MXND)) THEN @@ -31,9 +26,9 @@ SUBROUTINE INNERH (MXND, NXH, NUID, LXK, KXL, NXL, LXN, KKK, LLL, ELSE NOROOM = .FALSE. END IF -C + C GENERATE LINES -C + LLLOLD = LLL I1 = ISTART DO 100 I = 1, NH @@ -46,7 +41,7 @@ SUBROUTINE INNERH (MXND, NXH, NUID, LXK, KXL, NXL, LXN, KKK, LLL, I1 = I1 + 1 IF (I1 .GT. NH) I1 = 1 100 CONTINUE -C + DO 110 I = 1, NH - 1 LLL = LLL + 1 NXL(1, LLL) = NNNOLD + I @@ -55,9 +50,9 @@ SUBROUTINE INNERH (MXND, NXH, NUID, LXK, KXL, NXL, LXN, KKK, LLL, LLL = LLL + 1 NXL(1, LLL) = NNN NXL(2, LLL) = NNNOLD + 1 -C + C MAKE SPACE IN LXN LIST FOR NEW NODES -C + IF (IAVAIL .LT. NNNOLD) THEN JJ = IAVAIL MAXLNK = 0 @@ -93,9 +88,9 @@ SUBROUTINE INNERH (MXND, NXH, NUID, LXK, KXL, NXL, LXN, KKK, LLL, IAVAIL = NNN + 1 NAVAIL = MXND - NNN END IF -C + C MARK NODES ON HOLE BOUNDARY -C + LXN(1, NNNOLD + 1) = LLLOLD + 1 LXN(2, NNNOLD + 1) = -(LLLOLD + 2*NH) LXN(3, NNNOLD + 1) = LLLOLD + NH + 1 @@ -108,15 +103,15 @@ SUBROUTINE INNERH (MXND, NXH, NUID, LXK, KXL, NXL, LXN, KKK, LLL, LXN(3, NNN) = LLLOLD + NH + I LXN(4, NNN) = 0 160 CONTINUE -C + C GENERATE ELEMENTS -C + DO 180 I = LLLOLD + 1, LLL DO 170 J = 1, 2 KXL(J, I) = 0 170 CONTINUE 180 CONTINUE -C + I1 = ISTART I2 = I1 + 1 IF (I2 .GT. NH) I2 = 1 @@ -132,7 +127,7 @@ SUBROUTINE INNERH (MXND, NXH, NUID, LXK, KXL, NXL, LXN, KKK, LLL, IF (I1 .GT. NH) I1 = 1 I2 = I1 + 1 IF (I2 .GT. NH) I2 = 1 -C + IF (KXL(1, LINE) .EQ. 0) THEN KXL(1, LINE) = KKK ELSE IF (KXL(2, LINE) .EQ. 0) THEN @@ -151,7 +146,7 @@ SUBROUTINE INNERH (MXND, NXH, NUID, LXK, KXL, NXL, LXN, KKK, LLL, LXK(2, KKK) = LLLOLD + NH LXK(3, KKK) = LLLOLD + 1 LXK(4, KKK) = LLLOLD + 2*NH -C + IF (KXL(1, LINE) .EQ. 0) THEN KXL(1, LINE) = KKK ELSE IF (KXL(2, LINE) .EQ. 0) THEN @@ -162,7 +157,7 @@ SUBROUTINE INNERH (MXND, NXH, NUID, LXK, KXL, NXL, LXN, KKK, LLL, KXL(2, LLLOLD + NH) = KKK KXL(1, LLLOLD + 1) = KKK KXL(1, LLLOLD + 2*NH) = KKK -C + 200 CONTINUE RETURN END diff --git a/packages/seacas/applications/fastq/inpoin.f b/packages/seacas/applications/fastq/inpoin.f index e2fa11df9e7c..42e7b25b7b58 100644 --- a/packages/seacas/applications/fastq/inpoin.f +++ b/packages/seacas/applications/fastq/inpoin.f @@ -1,43 +1,32 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: inpoin.f,v 1.1 1990/11/30 11:09:57 gdsjaar Exp $ -C $Log: inpoin.f,v $ -C Revision 1.1 1990/11/30 11:09:57 gdsjaar -C Initial revision -C -C -CC* FILE: [.MAIN]INPOIN.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE INPOIN (MP, N1, N18, JJ, X, Y, NHOLDP, IHOLDP, IPOINT, & COOR, IPBOUN, LINKP, MERGE, NOROOM) C*********************************************************************** -C + C SUBROUTINE INPOIN = ENTERS A POINT INTO THE DATABASE -C + C*********************************************************************** -C + DIMENSION IPOINT (MP), COOR (2, MP), IPBOUN (MP), LINKP (2, MP) DIMENSION IHOLDP (2, MP) -C + LOGICAL NOROOM, MERGE, ADDLNK -C + NOROOM = .TRUE. JHOLD = JJ -C + C ZERO OUT THE LINK ARRAY IF NEEDED -C + IF (JJ .GT. N18) THEN N18 = JJ -C + C GET THE CORRECT NODE NUMBER IF MERGING -C + ELSEIF (MERGE) THEN ADDLNK = .FALSE. CALL LTSORT (MP, LINKP, JJ, IPNTR, ADDLNK) @@ -55,9 +44,9 @@ SUBROUTINE INPOIN (MP, N1, N18, JJ, X, Y, NHOLDP, IHOLDP, IPOINT, ENDIF ENDIF ENDIF -C + C INPUT THE POINT DATA -C + N1 = N1 + 1 J = N1 IF (J .GT. MP)RETURN @@ -69,6 +58,6 @@ SUBROUTINE INPOIN (MP, N1, N18, JJ, X, Y, NHOLDP, IHOLDP, IPOINT, IPBOUN (J) = 0 NOROOM = .FALSE. RETURN -C + 10000 FORMAT (' OLD POINT NO:', I5, ' TO NEW POINT NO:', I5) END diff --git a/packages/seacas/applications/fastq/inqstr.f b/packages/seacas/applications/fastq/inqstr.f index 775798aa67bc..9ee103234e12 100644 --- a/packages/seacas/applications/fastq/inqstr.f +++ b/packages/seacas/applications/fastq/inqstr.f @@ -1,40 +1,18 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: inqstr.f,v 1.3 2000/11/13 15:39:04 gdsjaar Exp $ -C $Log: inqstr.f,v $ -C Revision 1.3 2000/11/13 15:39:04 gdsjaar -C Cleaned up unused variables and labels. -C -C Removed some real to int conversion warnings. -C -C Revision 1.2 1991/03/22 19:38:52 gdsjaar -C Fixed typo 0 was K0 -C -c Revision 1.1.1.1 1990/11/30 11:10:02 gdsjaar -c FASTQ Version 2.0X -c -c Revision 1.1 90/11/30 11:10:00 gdsjaar -c Initial revision -c -C -CC* FILE: [.MAIN]UTIL.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE INQSTR (PROMPT, IANS) C*********************************************************************** -C + C SUBROUTINE INQSTR = INPUTS CHARACTER STRINGS -C + C*********************************************************************** -C + CHARACTER* (*) PROMPT, IANS, HOLD*80 -C + IZ = 0 100 CONTINUE CALL GETINP (IZ, IZ, PROMPT, HOLD, IOSTAT) @@ -49,6 +27,6 @@ SUBROUTINE INQSTR (PROMPT, IANS) WRITE (*, 10010) GOTO 100 ENDIF -C + 10010 FORMAT (' BAD CHARACTER STRING - TRY AGAIN') END diff --git a/packages/seacas/applications/fastq/inqtru.f b/packages/seacas/applications/fastq/inqtru.f index 6aa43d5c4254..3c369c20af98 100644 --- a/packages/seacas/applications/fastq/inqtru.f +++ b/packages/seacas/applications/fastq/inqtru.f @@ -1,28 +1,22 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: inqtru.f,v 1.1 1990/11/30 11:10:04 gdsjaar Exp $ -C $Log: inqtru.f,v $ -C Revision 1.1 1990/11/30 11:10:04 gdsjaar -C Initial revision -C -C SUBROUTINE INQTRU (PROMPT, IANS) C*********************************************************************** -C + C SUBROUTINE INQTRU = INPUTS A YES OR NO ANSWER -C + C*********************************************************************** -C + CHARACTER* (*) PROMPT CHARACTER*1 RESULT, ANS LOGICAL IANS DIMENSION ANS (4) DATA ANS / 'Y', 'y', 'N', 'n' / -C + 100 CONTINUE WRITE (*, 10000)PROMPT READ (*, 10010, END = 110, ERR = 120)RESULT @@ -43,7 +37,7 @@ SUBROUTINE INQTRU (PROMPT, IANS) 120 CONTINUE WRITE (*, 10040) GOTO 100 -C + 10000 FORMAT (' ', A, '? ') 10010 FORMAT (A1) 10020 FORMAT (' RESPONSE MUST BE EITHER YES OR NO - TRY AGAIN') diff --git a/packages/seacas/applications/fastq/inregn.f b/packages/seacas/applications/fastq/inregn.f index 1f665d344804..6a4b20ecf999 100644 --- a/packages/seacas/applications/fastq/inregn.f +++ b/packages/seacas/applications/fastq/inregn.f @@ -1,55 +1,38 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: inregn.f,v 1.2 2004/01/21 05:18:40 gdsjaar Exp $ -C $Log: inregn.f,v $ -C Revision 1.2 2004/01/21 05:18:40 gdsjaar -C Initialized several variables identified by valgrind. -C -C Revision 1.1.1.1 1990/11/30 11:10:08 gdsjaar -C FASTQ Version 2.0X -C -c Revision 1.1 90/11/30 11:10:06 gdsjaar -c Initial revision -c -C -CC* FILE: [.MAIN]INREGN.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE INREGN (MS, MR, N7, N8, N22, N23, JJ, JMTRL, IIN, & IFOUND, IREGN, IMAT, NSPR, IFSIDE, ISLIST, LINKR, LINKM, & NHOLDR, IHOLDR, NHOLDM, IHOLDM, IRGFLG, MERGE, NOROOM) C*********************************************************************** -C + C SUBROUTINE INREGN = INPUTS A REGION INTO THE DATABASE -C + C*********************************************************************** -C + DIMENSION IREGN(MR), IMAT(MR), NSPR(MR), IFSIDE(MR), ISLIST(MR*4) DIMENSION LINKR(2, MR), LINKM(2, (MS + MR)) DIMENSION IHOLDR(2, MR), IHOLDM(2, (MS + MR)), IRGFLG(MR) DIMENSION IIN(IFOUND) -C + LOGICAL NOROOM, MERGE, ADDLNK -C + IPNTR = 0 IZ = 0 NOROOM = .TRUE. ADDLNK = .FALSE. IMTRL = ABS(JMTRL) -C + C ZERO THE LINK ARRAY IF NEEDED -C + IF (JJ .GT. N22) THEN N22 = JJ -C + C SET UP POINTERS FOR MERGING DATA -C + ELSE IF (MERGE) THEN JHOLD = JJ CALL LTSORT (MR, LINKR, JJ, IPNTR, ADDLNK) @@ -67,9 +50,9 @@ SUBROUTINE INREGN (MS, MR, N7, N8, N22, N23, JJ, JMTRL, IIN, END IF END IF END IF -C + C ADD THE REGION INTO THE DATABASE -C + N7 = N7 + 1 J = N7 IF (J .GT. MR) RETURN @@ -91,16 +74,16 @@ SUBROUTINE INREGN (MS, MR, N7, N8, N22, N23, JJ, JMTRL, IIN, WRITE(*, 10010) J CALL LTSORT (MR, LINKR, IREGN(J), IZ, ADDLNK) END IF -C + C LINK UP THE MATERIAL -C + C ZERO THE LINK ARRAY IF NEEDED -C + IF (IMTRL .GT. N23) THEN N23 = IMTRL -C + C SET UP POINTERS FOR MERGING DATA -C + ELSE IF (MERGE) THEN JHOLD = IMTRL ADDLNK = .FALSE. @@ -119,9 +102,9 @@ SUBROUTINE INREGN (MS, MR, N7, N8, N22, N23, JJ, JMTRL, IIN, END IF END IF END IF -C + C ADD THE MATERIAL INTO THE DATABASE -C + NOROOM = .FALSE. ADDLNK = .FALSE. CALL LTSORT (MS + MR, LINKM, IMTRL, IPNTR, ADDLNK) @@ -137,9 +120,9 @@ SUBROUTINE INREGN (MS, MR, N7, N8, N22, N23, JJ, JMTRL, IIN, CALL LTSORT (MS + MR, LINKM, IMTRL, IONE, ADDLNK) END IF IMAT(J) = JMTRL -C + RETURN -C + 10000 FORMAT(' OLD REGION NO:', I5, ' TO NEW REGION NO:', I5) 10010 FORMAT(' REGION:', I5, ' HAS LESS THAN ONE SIDE', /, & ' THIS REGION WILL NOT BE INPUT INTO DATABASE') diff --git a/packages/seacas/applications/fastq/inrenm.f b/packages/seacas/applications/fastq/inrenm.f index 0c39fd527ae4..a1649ed5d3c3 100644 --- a/packages/seacas/applications/fastq/inrenm.f +++ b/packages/seacas/applications/fastq/inrenm.f @@ -1,49 +1,32 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: inrenm.f,v 1.2 1992/01/10 23:14:40 gdsjaar Exp $ -C $Log: inrenm.f,v $ -C Revision 1.2 1992/01/10 23:14:40 gdsjaar -C Fixed problem with renumbering input -C -c Revision 1.1.1.1 1990/11/30 11:10:10 gdsjaar -c FASTQ Version 2.0X -c -c Revision 1.1 90/11/30 11:10:09 gdsjaar -c Initial revision -c -C -CC* FILE: [.MAIN]INRENM.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE INRENM (MSC, N23, CFLAG, RIN, IIN, IFOUND, NUMBER, & NOROOM) C*********************************************************************** -C + C SUBROUTINE INRENM = INPUTS A RENUMBERING CARD -C + C*********************************************************************** -C + DIMENSION NUMBER (MSC), RIN (IFOUND), IIN (IFOUND) -C + CHARACTER * 80 NUMBER, CFLAG * 72 -C + LOGICAL NOROOM -C + NOROOM = .TRUE. -C + N23 = N23 + 1 IF (N23 .GT. MSC)RETURN NUMBER (N23) = ' ' NUMBER (N23) (1:5) = CFLAG (1:5) -C + C INPUT A POINT - LINE - POINT CARD -C + IF (CFLAG (1:5) .EQ. 'P-L-P') THEN IFOUND = MIN0 (IFOUND, 15) DO 100 IJ = 1, IFOUND @@ -51,15 +34,15 @@ SUBROUTINE INRENM (MSC, N23, CFLAG, RIN, IIN, IFOUND, NUMBER, I1 = I2 - 4 WRITE (NUMBER (N23) (I1:I2), 10000)IIN (IJ) 100 CONTINUE -C + C INPUT AN X, Y LOCATION RENUMBERING CARD -C + ELSEIF (CFLAG (1:3) .EQ. 'X-Y') THEN WRITE (NUMBER (N23) (11:20), 10010) RIN (1) WRITE (NUMBER (N23) (21:30), 10010) RIN (2) -C + C INPUT A NODE UNIQUE ID RENUMBERING CARD -C + ELSEIF (CFLAG (1:4) .EQ. 'NODE') THEN IFOUND = MIN0 (IFOUND, 7) DO 110 IJ = 1, IFOUND @@ -67,17 +50,17 @@ SUBROUTINE INRENM (MSC, N23, CFLAG, RIN, IIN, IFOUND, NUMBER, I1 = I2 - 9 WRITE (NUMBER (N23) (I1:I2), 10020)IIN (IJ) 110 CONTINUE -C + C INDICATE ERROR IN RENUMBERING FLAG -C + ELSE N23 = N23 - 1 WRITE ( * , 10030) CFLAG (1:5) ENDIF -C + NOROOM = .FALSE. RETURN -C + 10000 FORMAT (I5) 10010 FORMAT (1PE10.3) 10020 FORMAT (I10) diff --git a/packages/seacas/applications/fastq/inschm.f b/packages/seacas/applications/fastq/inschm.f index cddef8ea7fa4..7b334eb770ba 100644 --- a/packages/seacas/applications/fastq/inschm.f +++ b/packages/seacas/applications/fastq/inschm.f @@ -1,44 +1,33 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: inschm.f,v 1.1 1990/11/30 11:10:12 gdsjaar Exp $ -C $Log: inschm.f,v $ -C Revision 1.1 1990/11/30 11:10:12 gdsjaar -C Initial revision -C -C -CC* FILE: [.MAIN]INSCHM.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE INSCHM (MR, MSC, N8, N19, JJ, DUMMY, ISCHM, SCHEME, & LINKSC, DEFSCH, NOROOM, DOLINK) C*********************************************************************** -C + C SUBROUTINE INSCHM = INPUTS A SCHEME INTO THE DATABASE -C + C*********************************************************************** -C + DIMENSION ISCHM (MSC), SCHEME (MSC), LINKSC (2, MR) -C + CHARACTER * 72 SCHEME, DEFSCH, DUMMY -C + LOGICAL NOROOM, DOLINK, ADDLNK -C + NOROOM = .TRUE. ADDLNK = .TRUE. -C + C ENTER THE DEFAULT SCHEME IF THE REGION NUMBER IS ZERO -C + IF (JJ .EQ. 0) THEN DEFSCH = DUMMY -C + C ENTER THE SCHEME -C + ELSE IF ( (DOLINK) .AND. (JJ .GT. N19))N19 = JJ N8 = N8 + 1 @@ -50,5 +39,5 @@ SUBROUTINE INSCHM (MR, MSC, N8, N19, JJ, DUMMY, ISCHM, SCHEME, ENDIF NOROOM = .FALSE. RETURN -C + END diff --git a/packages/seacas/applications/fastq/inside.f b/packages/seacas/applications/fastq/inside.f index a58d635f4b71..475ed24341e9 100644 --- a/packages/seacas/applications/fastq/inside.f +++ b/packages/seacas/applications/fastq/inside.f @@ -1,44 +1,33 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: inside.f,v 1.1 1990/11/30 11:10:14 gdsjaar Exp $ -C $Log: inside.f,v $ -C Revision 1.1 1990/11/30 11:10:14 gdsjaar -C Initial revision -C -C -CC* FILE: [.MAIN]INSIDE.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE INSIDE (MS, N3, N4, N20, JJ, IIN, IFOUND, ISIDE, NLPS, & IFLINE, ILLIST, LINKS, NHOLDS, IHOLDS, MERGE, NOROOM) C*********************************************************************** -C + C SUBROUTINE INSIDE = INPUTS A SIDE INTO THE DATABASE -C + C*********************************************************************** -C + DIMENSION ISIDE (MS), NLPS (MS), IFLINE (MS), ILLIST (3 * MS) DIMENSION LINKS (2, MS) DIMENSION IIN (IFOUND), IHOLDS (2, MS) -C + LOGICAL MERGE, NOROOM, ADDLNK -C + IZ = 0 NOROOM = .TRUE. -C + C ZERO OUT THE LINK ARRAY IF NEEDED -C + IF (JJ .GT. N20) THEN N20 = JJ -C + C FIND THE CORRECT LINE NUMBER IF MERGING -C + ELSEIF (MERGE) THEN ADDLNK = .FALSE. CALL LTSORT (MS, LINKS, JJ, IPNTR, ADDLNK) @@ -57,9 +46,9 @@ SUBROUTINE INSIDE (MS, N3, N4, N20, JJ, IIN, IFOUND, ISIDE, NLPS, ENDIF ENDIF ENDIF -C + C INPUT THE SIDE DATA INTO THE DATABASE -C + N3 = N3 + 1 J = N3 IF (J .GT. MS)RETURN @@ -80,10 +69,10 @@ SUBROUTINE INSIDE (MS, N3, N4, N20, JJ, IIN, IFOUND, ISIDE, NLPS, WRITE ( * , 10010)J CALL LTSORT (MS, LINKS, ISIDE (J), IZ, ADDLNK) ENDIF -C + NOROOM = .FALSE. RETURN -C + 10000 FORMAT (' OLD SIDE NO:', I5, ' TO NEW SIDE NO:', I5) 10010 FORMAT (' SIDE:', I5, ' HAS LESS THAN ONE LINE', / , & ' THIS SIDE WILL NOT BE INPUT INTO DATABASE') diff --git a/packages/seacas/applications/fastq/intrup.f b/packages/seacas/applications/fastq/intrup.f index a989dade7929..01cdaee4e15c 100644 --- a/packages/seacas/applications/fastq/intrup.f +++ b/packages/seacas/applications/fastq/intrup.f @@ -1,34 +1,28 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: intrup.f,v 1.1 1990/11/30 11:10:17 gdsjaar Exp $ -C $Log: intrup.f,v $ -C Revision 1.1 1990/11/30 11:10:17 gdsjaar -C Initial revision -C -C SUBROUTINE INTRUP (PROMPT, IANS, MCOM, ICOM, JCOM, CIN, IIN, RIN, & KIN) C*********************************************************************** -C + C SUBROUTINE INTRUP = INPUTS A YES OR NO PLUS MORE IF NEEDED -C + C*********************************************************************** -C + DIMENSION IIN (MCOM), RIN (MCOM), KIN (MCOM) CHARACTER* (*) PROMPT CHARACTER*72 CIN (MCOM), ANS (4)*1, NEWPMT LOGICAL IANS DATA ANS / 'Y', 'y', 'N', 'n' / -C + IZ = 0 CALL STRLNG (PROMPT, LEN) -C + C SEE IF A YES / NO ANSWER IS SITTING AS THE FIRST COMMAND IN THE LIST -C + IF ( (ICOM .LE. JCOM) .AND. ( (CIN (ICOM) (1:1) .EQ. ANS (1)) .OR. & (CIN (ICOM) (1:1) .EQ. ANS (2)))) THEN IANS = .TRUE. @@ -37,10 +31,10 @@ SUBROUTINE INTRUP (PROMPT, IANS, MCOM, ICOM, JCOM, CIN, IIN, RIN, & .OR. (CIN (ICOM) (1:1) .EQ. ANS (4)))) THEN IANS = .FALSE. ICOM = ICOM + 1 -C + C INPUT NEW COMMAND LISTS ONLY IF THE CURRENT ONES ARE USED UP C MAKE SURE THE FIRST ONE OF THESE COMMANDS IS EITHER YES OR NO -C + ELSEIF (ICOM .GT. JCOM) THEN IF (LEN .LE. 71) THEN NEWPMT = PROMPT (1:LEN) @@ -67,13 +61,13 @@ SUBROUTINE INTRUP (PROMPT, IANS, MCOM, ICOM, JCOM, CIN, IIN, RIN, WRITE (*, 10000) GOTO 100 ENDIF -C + C OTHERWISE, JUST GET A YES / NO RESPONSE AND RETURN -C + ELSE CALL INQTRU (PROMPT, IANS) ENDIF RETURN -C + 10000 FORMAT (' RESPONSE MUST BE EITHER YES OR NO - TRY AGAIN') END diff --git a/packages/seacas/applications/fastq/intsct.f b/packages/seacas/applications/fastq/intsct.f index 8b77443ba7eb..b863e02890f3 100644 --- a/packages/seacas/applications/fastq/intsct.f +++ b/packages/seacas/applications/fastq/intsct.f @@ -1,83 +1,66 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: intsct.f,v 1.2 1992/02/04 15:50:25 gdsjaar Exp $ -C $Log: intsct.f,v $ -C Revision 1.2 1992/02/04 15:50:25 gdsjaar -C Added bounding box check in intsct, reduce time 5 percent -C -c Revision 1.1.1.1 1990/11/30 11:10:21 gdsjaar -c FASTQ Version 2.0X -c -c Revision 1.1 90/11/30 11:10:20 gdsjaar -c Initial revision -c -C -CC* FILE: [.PAVING]INTSCT.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE INTSCT (X1, Y1, X2, Y2, X3, Y3, X4, Y4, U, W, LCROSS) C*********************************************************************** -C + C SUBROUTINE INTSCT = CHECKS TO SEE IF THE LINE FROM N1 TO N2 C INTERSECTS THE LINE FROM N3 TO N4 -C + C*********************************************************************** -C + C NOTE: THIS INTERSECTION ROUTINE IS BASED ON AN ALGORITHM GIVEN C IN THE BOOK "GEOMETRIC MODELING" BY MICHAEL E. MORTENSON ON C PAGES 319 - 320. -C + C*********************************************************************** -C + LOGICAL LCROSS -C + LCROSS = .FALSE. if (max(x1, x2) .lt. min(x3, x4)) return if (max(y1, y2) .lt. min(y3, y4)) return if (max(x3, x4) .lt. min(x1, x2)) return if (max(y3, y4) .lt. min(y1, y2)) return -C + C SET UP THE FIRST LINE'S VECTORS (A AND B) -C + XA = X1 YA = Y1 XB = X2 - X1 YB = Y2 - Y1 -C + C SET UP THE SECOND LINE'S VECTORS (C AND D) -C + XC = X3 YC = Y3 XD = X4 - X3 YD = Y4 - Y3 -C + C NOW USE THE VECTORS AND SOLVE FOR W. C W IS THE PROPORTION OF THE DISTANCE ALONG THE VECTOR D C WHERE THE INTERSECTION OCCURS. LIKEWISE U IS THE PROPORTIONAL C DISTANCE ALONG THE VECTOR B FOR THE INTERSECTION. IF THERE IS C AN INTERSECTION, BOTH U AND W MUST BE BETWEEN 0 AND 1. -C + DENOM = (YB * XD) - (XB * YD) -C + C CHECK FOR SPECIAL PARALLEL CASE - THE DENOMINATOR IS EQUAL TO ZERO. -C + IF (DENOM .NE. 0.) THEN -C + C CHECK FOR INTERSECTION -C + W = ( (YC * XB) - (XB * YA) - (XC * YB) + (YB * XA) ) / DENOM IF ( (W .LT. 1.) .AND. (W .GT. 0.) ) THEN -C + C W INDICATES AN INTERSECTION HAS OCCURRED. C GET THE U VALUE AND CONFIRM. -C + IF (XB .NE. 0.) THEN U = ( XC + (W * XD) - XA ) / XB ELSE @@ -88,7 +71,7 @@ SUBROUTINE INTSCT (X1, Y1, X2, Y2, X3, Y3, X4, Y4, U, W, LCROSS) ENDIF ENDIF ENDIF -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/invert.f b/packages/seacas/applications/fastq/invert.f index 1b1b231931ff..34d9c3f79821 100644 --- a/packages/seacas/applications/fastq/invert.f +++ b/packages/seacas/applications/fastq/invert.f @@ -1,72 +1,41 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: invert.f,v 1.3 2004/01/26 17:28:18 gdsjaar Exp $ -C $Log: invert.f,v $ -C Revision 1.3 2004/01/26 17:28:18 gdsjaar -C Removed several unused variables from getang subroutine. -C -C Initialized a variable -C -C Revision 1.2 2004/01/22 14:25:22 gdsjaar -C Attempt to fix strange problem on x86_64 AMD Opteron system using -C Portland Group 5.1-3 compilers. The getang function would work -C correctly if compiled with no optimization and in debug mode, but -C would crash if compiled optimized. The location of the crash was not -C in a place that made any sense that something was wrong. -C -C After much trial and error, it was found that adding a 'SAVE' -C statement at the beginning of the file fixed the problem. -C -C Also cleaned out some unused parameters being passed to the function. -C -C Revision 1.1.1.1 1990/11/30 11:10:24 gdsjaar -C FASTQ Version 2.0X -C -c Revision 1.1 90/11/30 11:10:23 gdsjaar -c Initial revision -c -C -CC* FILE: [.PAVING]INVERT.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE INVERT_FQ (MXND, MLN, XN, YN, ZN, LXK, KXL, NXL, LXN, * LLL, LNODES, XMIN, XMAX, YMIN, YMAX, ZMIN, ZMAX, DEV1, KREG, * NODE, XDEL, YDEL) C*********************************************************************** -C + C SUBROUTINE INVERT = CHECKS FOR AN INVERSION OR CROSSING OF A BOUNDARY C UPON ITSELF AND CORRECTS IT WHERE NECESSARY -C + C*********************************************************************** -C + DIMENSION XN(MXND), YN(MXND), ZN(MXND) DIMENSION LXN(4, MXND), NXL(2, 3*MXND) DIMENSION LXK(4, MXND), KXL(2, 3*MXND) DIMENSION LNODES (MLN, MXND) -C + LOGICAL ERR, VCROSS -C + CHARACTER*3 DEV1 -C + ERR = .FALSE. XOLD = XN (NODE) YOLD = YN (NODE) -C + N2 = NODE N3 = LNODES (3, N2) N4 = LNODES (3, N3) N1 = LNODES (2, N2) N0 = LNODES (2, N1) -C + C GET THE ANGLES BEFORE MOVEMENT -C + IF (LXN (4, N1) .EQ. 0) & CALL GETANG (MXND, MLN, XN, YN, LNODES, LXK, KXL, NXL, & LXN, N0, N1, N2, ANG1A, ERR) @@ -76,20 +45,20 @@ SUBROUTINE INVERT_FQ (MXND, MLN, XN, YN, ZN, LXK, KXL, NXL, LXN, IF (LXN (4, N3) .EQ. 0) & CALL GETANG (MXND, MLN, XN, YN, LNODES, LXK, KXL, NXL, & LXN, N2, N3, N4, ANG3A, ERR) -C + C NOW PLACE THE NODE TEMPORARILY AT THE NEW PROPOSED LOCATION -C + XN (NODE) = XN (NODE) + XDEL YN (NODE) = YN (NODE) + YDEL -C + C GET THE ANGLE BEING ADJUSTED AT THE NODE ITSELF -C + IF ((LXN (4, N2) .EQ. 0) .AND. (ANG2A .GT. 0.)) THEN CALL GETANG (MXND, MLN, XN, YN, LNODES, LXK, KXL, NXL, & LXN, N1, N2, N3, ANG2B, ERR) -C + C ADJUST THE NODE LOCATION IF NECESSARY -C + IF (ANG2B .LT. 0.) THEN CALL VINTER (MXND, XN, YN, N1, N3, N2, XOLD, YOLD, & XNEW, YNEW, VCROSS) @@ -99,15 +68,15 @@ SUBROUTINE INVERT_FQ (MXND, MLN, XN, YN, ZN, LXK, KXL, NXL, LXN, ENDIF ENDIF ENDIF -C + C GET THE ANGLE BEING ADJUSTED ON THE CCW SIDE OF THIS NODE -C + IF ((LXN (4, N1) .EQ. 0) .AND. (ANG1A .GT. 0.)) THEN CALL GETANG (MXND, MLN, XN, YN, LNODES, LXK, KXL, NXL, & LXN, N0, N1, N2, ANG1B, ERR) -C + C ADJUST THE NODE LOCATION IF NECESSARY -C + IF (ANG1B .LT. 0.) THEN CALL VINTER (MXND, XN, YN, N1, N0, N2, XOLD, YOLD, & XNEW, YNEW, VCROSS) @@ -117,15 +86,15 @@ SUBROUTINE INVERT_FQ (MXND, MLN, XN, YN, ZN, LXK, KXL, NXL, LXN, ENDIF ENDIF ENDIF -C + C GET THE ANGLE BEING ADJUSTED ON THE CW SIDE OF THIS NODE -C + IF ((LXN (4, N3) .EQ. 0) .AND. (ANG3A .GT. 0.)) THEN CALL GETANG (MXND, MLN, XN, YN, LNODES, LXK, KXL, NXL, & LXN, N2, N3, N4, ANG3B, ERR) -C + C ADJUST THE NODE LOCATION IF NECESSARY -C + IF (ANG3B .LT. 0.) THEN CALL VINTER (MXND, XN, YN, N3, N4, N2, XOLD, YOLD, & XNEW, YNEW, VCROSS) @@ -135,15 +104,15 @@ SUBROUTINE INVERT_FQ (MXND, MLN, XN, YN, ZN, LXK, KXL, NXL, LXN, ENDIF ENDIF ENDIF -C + C RESTORE THE OLD LOCATION AND THE XDEL AND YDEL TO THE CORRECTED C VALUES -C + XDEL = XN (NODE) - XOLD YDEL = YN (NODE) - YOLD XN (NODE) = XOLD YN (NODE) = YOLD -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/invmap.f b/packages/seacas/applications/fastq/invmap.f index d5b228992081..b82aba185d4e 100644 --- a/packages/seacas/applications/fastq/invmap.f +++ b/packages/seacas/applications/fastq/invmap.f @@ -1,39 +1,28 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: invmap.f,v 1.1 1990/11/30 11:10:26 gdsjaar Exp $ -C $Log: invmap.f,v $ -C Revision 1.1 1990/11/30 11:10:26 gdsjaar -C Initial revision -C -C -CC* FILE: [.PAVING]INVMAP.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE INVMAP (X0, Y0, X1, Y1, X2, Y2, X3, Y3, X4, Y4, SXI, & SETA, INSIDE) C*********************************************************************** -C + C THIS IS A TEST OF THE INVERTED MAPPING OF AN ELEMENT -C + C*********************************************************************** -C + DOUBLE PRECISION AX, BX, CX, DX, AY, BY, CY, DY DOUBLE PRECISION ALPHA, BETA, GAMMA, RAD DOUBLE PRECISION XI, ETA, XI1, ETA1, XI2, ETA2 -C + LOGICAL INSIDE -C + EPS = 1.E-3 EPS2 = 1.E-10 -C + C GET THE A, B, C, AND D VALUES FOR X AND Y. -C + AX = X1 - X0 BX = X2 - X1 CX = X1 - X2 + X3 -X4 @@ -42,15 +31,15 @@ SUBROUTINE INVMAP (X0, Y0, X1, Y1, X2, Y2, X3, Y3, X4, Y4, SXI, BY = Y2 - Y1 CY = Y1 - Y2 + Y3 -Y4 DY = Y4 - Y1 -C + C CALCULATE THE ALPHA, BETA, AND GAMMA VALUES. -C + ALPHA = (CY * DX) - (CX * DY) BETA = (AX * CY) - (AY * CX) + (BY * DX) - (BX * DY) GAMMA = (AX * BY) - (AY * BX) -C + C CALCULATE THE XI AND ETA VALUES. -C + IF (ALPHA .EQ. 0.) THEN ETA = -GAMMA / BETA IF ((ETA .EQ. 0) .AND. (BX .EQ. 0)) THEN @@ -65,14 +54,11 @@ SUBROUTINE INVMAP (X0, Y0, X1, Y1, X2, Y2, X3, Y3, X4, Y4, SXI, ELSE RAD = BETA**2 - (4. * ALPHA * GAMMA) IF (RAD .LT. 0.) THEN -C -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/19/90 -CC* MODIFICATION: COMMENTED OUT THE ERROR MESSAGE FOR THE + C** NEGATIVE RADICAL PROBLEM AS IT APPEARS THAT C** THIS MAY OCCUR - IT JUST MEANS THAT THE POINT C** TRULY IS NOT IN THE ELEMENT. -C + C CALL MESAGE ('** ERROR - NEGATIVE RADICAL IN INVMAP **') INSIDE = .FALSE. GOTO 100 @@ -80,7 +66,7 @@ SUBROUTINE INVMAP (X0, Y0, X1, Y1, X2, Y2, X3, Y3, X4, Y4, SXI, RAD = DSQRT (RAD) ETA1 = (- BETA + RAD) / (2. * ALPHA) ETA2 = (- BETA - RAD) / (2. * ALPHA) -C + IF ((ABS(ETA1) .LT. EPS2) .AND. (ABS(BX) .LT. EPS2)) THEN XI1 = (Y0 - Y1) / (Y2 - Y1) ELSE IF ((BX .EQ. -CX) .AND. (ETA1 .EQ. 1.)) THEN @@ -90,7 +76,7 @@ SUBROUTINE INVMAP (X0, Y0, X1, Y1, X2, Y2, X3, Y3, X4, Y4, SXI, ELSE XI1 = (- AX - (DX * ETA1)) / (BX + (CX * ETA1)) ENDIF -C + IF ((ABS(ETA2) .LT. EPS2) .AND. (ABS(BX) .LT. EPS2)) THEN XI2 = (Y0 - Y1) / (Y2 - Y1) ELSE IF ((BX .EQ. -CX) .AND. (ETA2 .EQ. 1.)) THEN @@ -100,7 +86,7 @@ SUBROUTINE INVMAP (X0, Y0, X1, Y1, X2, Y2, X3, Y3, X4, Y4, SXI, ELSE XI2 = (- AX - (DX * ETA2)) / (BX + (CX * ETA2)) ENDIF -C + D1 = DSQRT (ETA1*ETA1 + XI1*XI1) D2 = DSQRT (ETA2*ETA2 + XI2*XI2) IF (D1 .LT. D2) THEN @@ -111,9 +97,9 @@ SUBROUTINE INVMAP (X0, Y0, X1, Y1, X2, Y2, X3, Y3, X4, Y4, SXI, XI = XI2 ENDIF END IF -C + C CHECK TO SEE IF ETA AND XI ARE WITHIN THE ELEMENT -C + IF (.NOT. ((ETA .LE. 1.0 + EPS) .AND. & (ETA .GE. 0.0 - EPS)) ) THEN INSIDE = .FALSE. @@ -127,8 +113,8 @@ SUBROUTINE INVMAP (X0, Y0, X1, Y1, X2, Y2, X3, Y3, X4, Y4, SXI, ENDIF SXI = XI SETA = ETA -C + 100 CONTINUE RETURN -C + END diff --git a/packages/seacas/applications/fastq/ioccur.f b/packages/seacas/applications/fastq/ioccur.f index aaf01f359446..281431956648 100644 --- a/packages/seacas/applications/fastq/ioccur.f +++ b/packages/seacas/applications/fastq/ioccur.f @@ -1,39 +1,28 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: ioccur.f,v 1.1 1990/11/30 11:10:28 gdsjaar Exp $ -C $Log: ioccur.f,v $ -C Revision 1.1 1990/11/30 11:10:28 gdsjaar -C Initial revision -C -C -CC* FILE: [.RENUM]IOCCUR.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C FUNCTION IOCCUR (N, L, NEW) C*********************************************************************** -C + C FUNCTION IOCCUR = CHECKS TO SEE IF NEW OCCURS IN (L (I), I=1, N) -C + C*********************************************************************** -C + C RETURN 0 IF NEW DOES NOT OCCUR IN (L (I), I=1, N) C RETURN 1 IF IT DOES -C + C*********************************************************************** -C + DIMENSION L (N) -C + IF (N .LT. 1) THEN IOCCUR = 0 RETURN ENDIF -C + DO 100 I = 1, N IF (L (I) .EQ. NEW) THEN IOCCUR = 1 diff --git a/packages/seacas/applications/fastq/irever.f b/packages/seacas/applications/fastq/irever.f index 5a79b0f6a051..ef0524362f89 100644 --- a/packages/seacas/applications/fastq/irever.f +++ b/packages/seacas/applications/fastq/irever.f @@ -1,29 +1,18 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: irever.f,v 1.1 1990/11/30 11:10:31 gdsjaar Exp $ -C $Log: irever.f,v $ -C Revision 1.1 1990/11/30 11:10:31 gdsjaar -C Initial revision -C -C -CC* FILE: [.QMESH]IREVER.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE IREVER (L, N) C*********************************************************************** -C + C SUBROUTINE IREVER = REVERS THE INTEGER ARRAY L (I), I=1, N -C + C*********************************************************************** -C + DIMENSION L (N) -C + IF (N .LE. 1) RETURN NUP = N + 1 M = N / 2 @@ -33,7 +22,7 @@ SUBROUTINE IREVER (L, N) L (I) = L (NUP) L (NUP) = ITEMP 100 CONTINUE -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/isolap.f b/packages/seacas/applications/fastq/isolap.f index b80956b99ba5..335e93f58e92 100644 --- a/packages/seacas/applications/fastq/isolap.f +++ b/packages/seacas/applications/fastq/isolap.f @@ -1,63 +1,52 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: isolap.f,v 1.1 1990/11/30 11:10:35 gdsjaar Exp $ -C $Log: isolap.f,v $ -C Revision 1.1 1990/11/30 11:10:35 gdsjaar -C Initial revision -C -C -CC* FILE: [.QMESH]ISOLAP.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE ISOLAP (MXND, XN, YN, LXK, KXL, NXL, LXN, NNN, NNNOLD, & WFAC, NIT, EPS, RO) C*********************************************************************** -C + C SUBROUTINE ISOLAP = MESH SMOOTHING BY LAPLACE-S USING GAUSS-SEIDEL -C + C*********************************************************************** -C + C VARIABLES USED: C WFAC = WEIGHT (0. = LAPLACIAN, 1. = ISOPARAMETRIC) C NIT = THE MAX NUMBER OF ITERATIONS TO DO. C EPS = MINIMUM DISTANCE NODES MUST MOVE TO CONTINUE ITERATIONS C RO = AN UNDER- OR OVER-RELAXATION FACTOR (NORMALLY 1.0) -C + C*********************************************************************** -C + DIMENSION KLIST(20), NODES(4) DIMENSION XN(MXND), YN(MXND) DIMENSION LXN(4, MXND), NXL(2, 3*MXND) DIMENSION LXK(4, MXND), KXL(2, 3*MXND) -C + LOGICAL BIG, CCW, ERR -C + IF (RO .LT. 0.01) RO = 1. EPS2 = (EPS*RO)**2 -C + C ITERATION LOOP -C + DO 140 IT = 1, NIT BIG = .FALSE. -C + C NODE LOOP -C + DO 130 NODE = NNNOLD + 1, NNN -C + C SKIP CONTINUATION AND BOUNDARY LINES -C + IF ((LXN(1, NODE) .GT. 0) .AND. (LXN(2, NODE) .GT. 0)) THEN -C + C FIND ELEMENTS ATTACHED TO NODE -C + CALL GKXN (MXND, KXL, LXN, NODE, KS, KLIST, ERR) -C + SUMX = 0.0 SUMY = 0.0 DO 120 KL = 1, KS @@ -65,7 +54,7 @@ SUBROUTINE ISOLAP (MXND, XN, YN, LXK, KXL, NXL, LXN, NNN, NNNOLD, KK = KLIST(KL) CALL GNXKA (MXND, XN, YN, KK, NODES, AREA, LXK, NXL, & CCW) -C + DO 100 IN = 1, 4 IF (NODES(IN) .EQ. NODE) THEN J1 = IN + 1 @@ -78,30 +67,30 @@ SUBROUTINE ISOLAP (MXND, XN, YN, LXK, KXL, NXL, LXN, NNN, NNNOLD, IF (J2 .GT. 4) J2 = 1 J3 = J2 + 1 IF (J3 .GT. 4) J3 = 1 -C + SUMX = SUMX + XN(NODES(J1)) + XN(NODES(J3)) & - WFAC*XN(NODES(J2)) SUMY = SUMY + YN(NODES(J1)) + YN(NODES(J3)) & - WFAC*YN(NODES(J2)) 120 CONTINUE -C + C REDEFINE THIS NODE-S COORDINATES -C + SUMX = SUMX/(DBLE(KS)*(2.0 - WFAC)) SUMY = SUMY/(DBLE(KS)*(2.0 - WFAC)) XDEL = RO*(SUMX-XN(NODE)) YDEL = RO*(SUMY-YN(NODE)) XN(NODE) = XN(NODE) + XDEL YN(NODE) = YN(NODE) + YDEL -C + C CHECK FOR CONVERGENCE -C + IF ((XDEL*XDEL + YDEL*YDEL) .GT. EPS2) BIG = .TRUE. ENDIF 130 CONTINUE -C + C IF NO SIGNIFICANT MOVEMENTS OCCURRED, RETURN -C + IF (.NOT.BIG) RETURN 140 CONTINUE RETURN diff --git a/packages/seacas/applications/fastq/jumplp.f b/packages/seacas/applications/fastq/jumplp.f index 43df31a63a14..5bad2c3e2185 100644 --- a/packages/seacas/applications/fastq/jumplp.f +++ b/packages/seacas/applications/fastq/jumplp.f @@ -1,33 +1,22 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: jumplp.f,v 1.1 1990/11/30 11:10:38 gdsjaar Exp $ -C $Log: jumplp.f,v $ -C Revision 1.1 1990/11/30 11:10:38 gdsjaar -C Initial revision -C -C -CC* FILE: [.PAVING]JUMPLP.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C FUNCTION JUMPLP (MXND, MLN, LNODES, INOW, IJUMP) C*********************************************************************** -C + C FUNCTION JUMPLP = JUMPS IJUMP STEPS FORWARD AROUND THE CLOSED LOOP -C + C*********************************************************************** -C + DIMENSION LNODES (MLN, MXND) -C + JUMPLP = INOW DO 100 I = 1, IJUMP JUMPLP = LNODES (3, JUMPLP) 100 CONTINUE RETURN -C + END diff --git a/packages/seacas/applications/fastq/keep3.f b/packages/seacas/applications/fastq/keep3.f index 5db914758270..78cbe1c970db 100644 --- a/packages/seacas/applications/fastq/keep3.f +++ b/packages/seacas/applications/fastq/keep3.f @@ -1,32 +1,21 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: keep3.f,v 1.1 1990/11/30 11:10:41 gdsjaar Exp $ -C $Log: keep3.f,v $ -C Revision 1.1 1990/11/30 11:10:41 gdsjaar -C Initial revision -C -C -CC* FILE: [.PAVING]KEEP3.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE KEEP3 (ITEST, LTEST, NBEGIN, NEND) C*********************************************************************** -C + C SUBROTINE KEEP3 = GETS AN ACCEPTABLE SIDE FOR FILLING TO KEEP A C TRIANGLE VALID -C + C*********************************************************************** -C + DIMENSION ITEST (3), LTEST (3) -C + C MAKE SURE THAT THE NBEGIN STARTS AT ONE OF THE CORNERS -C + IF (NBEGIN .EQ. ITEST(1)) THEN NEND = ITEST(2) ELSEIF (NBEGIN .EQ. ITEST(2)) THEN @@ -37,10 +26,10 @@ SUBROUTINE KEEP3 (ITEST, LTEST, NBEGIN, NEND) NBEGIN = ITEST(1) NEND = ITEST(2) ENDIF -C + C FIND THE CORRECT ROW (THIS ALREADY ASSUMES THAT THE C SUM OF THE SMALLER TWO IS EQUAL TO THE LARGEST ONE) -C + MMAX = MAX0 (LTEST(1), LTEST(2), LTEST(3)) IF (LTEST(1) .EQ. MMAX) THEN IF (NBEGIN .EQ. ITEST(1)) THEN @@ -58,7 +47,7 @@ SUBROUTINE KEEP3 (ITEST, LTEST, NBEGIN, NEND) NEND = ITEST(2) ENDIF ENDIF -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/keep34.f b/packages/seacas/applications/fastq/keep34.f index 54bf83e2f8bf..8ecba589cd58 100644 --- a/packages/seacas/applications/fastq/keep34.f +++ b/packages/seacas/applications/fastq/keep34.f @@ -1,32 +1,21 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: keep34.f,v 1.1 1990/11/30 11:10:43 gdsjaar Exp $ -C $Log: keep34.f,v $ -C Revision 1.1 1990/11/30 11:10:43 gdsjaar -C Initial revision -C -C -CC* FILE: [.PAVING]KEEP34.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE KEEP34 (ITEST, LTEST, NBEGIN, NEND, ICHNG) C*********************************************************************** -C + C SUBROTINE KEEP34 = GETS AN ACCEPTABLE SIDE FOR FILLING TO KEEP A C TRIANGLE VALID OR CHANGING TO A RECTANGLE -C + C*********************************************************************** -C + DIMENSION ITEST (3), LTEST (3) -C + C MAKE SURE THAT THE NBEGIN STARTS AT ONE OF THE CORNERS -C + IF (NBEGIN .EQ. ITEST(1)) THEN NEND = ITEST(2) ELSEIF (NBEGIN .EQ. ITEST(2)) THEN @@ -37,10 +26,10 @@ SUBROUTINE KEEP34 (ITEST, LTEST, NBEGIN, NEND, ICHNG) NBEGIN = ITEST(1) NEND = ITEST(3) ENDIF -C + C FIND THE CORRECT ROW (THIS ALREADY ASSUMES THAT THE C SUM OF THE SMALLER TWO IS EQUAL TO THE LARGEST ONE) -C + MMAX = MAX0 (LTEST(1), LTEST(2), LTEST(3)) IF (LTEST(1) .EQ. MMAX) THEN IF (NBEGIN .EQ. ITEST(1)) THEN @@ -55,7 +44,7 @@ SUBROUTINE KEEP34 (ITEST, LTEST, NBEGIN, NEND, ICHNG) NEND = ICHNG ENDIF ENDIF -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/keyin.f b/packages/seacas/applications/fastq/keyin.f index 54e90831579f..50d1ead3aa3d 100644 --- a/packages/seacas/applications/fastq/keyin.f +++ b/packages/seacas/applications/fastq/keyin.f @@ -1,29 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: keyin.f,v 1.2 1998/07/14 18:19:15 gdsjaar Exp $ -C $Log: keyin.f,v $ -C Revision 1.2 1998/07/14 18:19:15 gdsjaar -C Removed unused variables, cleaned up a little. -C -C Changed BLUE labels to GREEN to help visibility on black background -C (indirectly requested by a couple users) -C -C Revision 1.1.1.1 1990/11/30 11:10:48 gdsjaar -C FASTQ Version 2.0X -C -c Revision 1.1 90/11/30 11:10:46 gdsjaar -c Initial revision -c -C -CC* FILE: [.MAIN]KEYIN.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE KEYIN (MP, ML, MS, MR, MSC, MA, MCOM, ICOM, JCOM, CIN, & RIN, IIN, KIN, IDUMP, N, IPOINT, COOR, IPBOUN, ILINE, LTYPE, & NINT, FACTOR, LCON, ILBOUN, ISBOUN, ISIDE, NLPS, IFLINE, @@ -36,18 +16,18 @@ SUBROUTINE KEYIN (MP, ML, MS, MR, MSC, MA, MCOM, ICOM, JCOM, CIN, & IRGFLG, ISCHM, SCHEME, NUMBER, DEFSCH, DEFSIZ, TITLE, OPTIM, & THREE, EIGHT, NINE, NOROOM, VAXVMS, WROTE, TIME1, VERSN, BATCH) C*********************************************************************** -C + C SUBROUTINE KEYIN = INPUTS MESH DEFINITIONS FROM THE KEYBOARD -C + C*********************************************************************** -C + C SUBROUTINE CALLED BY: C FASTQ = A PROGRAM TO QUICKLY GENERATE QUADRILATERAL MESHES -C + C*********************************************************************** -C + PARAMETER (NIN = 80) -C + DIMENSION IPOINT(MP), COOR(2, MP), IPBOUN(MP) DIMENSION ILINE(ML), LTYPE(ML), NINT(ML), FACTOR(ML), LCON(3, ML) DIMENSION ILBOUN(ML), ISBOUN(ML) @@ -70,23 +50,23 @@ SUBROUTINE KEYIN (MP, ML, MS, MR, MSC, MA, MCOM, ICOM, JCOM, CIN, DIMENSION NUMBER(MSC) DIMENSION N(29), NOLD(29), III(1) DIMENSION KIN(MCOM), IIN(MCOM), RIN(MCOM), JIN(NIN) -C + CHARACTER*72 SCHEME, DEFSCH, CIN(MCOM), VERSN*9 CHARACTER*72 TITLE, HOLD, NUMBER*80 -C + LOGICAL IANS, OPTIM, NOROOM, ADDOLD, MERGE, NEWNUM, DOLINK, ADDLNK LOGICAL THREE, EIGHT, NINE, VAXVMS, WROTE, SIDEOK, BATCH -C + IZ = 0 MERGE = .FALSE. DOLINK = .TRUE. NOROOM = .FALSE. ADDLNK = .FALSE. -C + DO 100 I = 1, 29 NOLD(I) = N(I) 100 CONTINUE -C + 110 CONTINUE IF (ICOM .GT. JCOM) THEN CALL MESAGE (' ') @@ -94,9 +74,9 @@ SUBROUTINE KEYIN (MP, ML, MS, MR, MSC, MA, MCOM, ICOM, JCOM, CIN, & JCOM, KIN, CIN, IIN, RIN) ICOM = 1 END IF -C + C INPUT A POINT INTO THE DATABASE -C + IF ((CIN(ICOM)(1:1) .EQ. 'P') .OR. (CIN(ICOM)(1:1) .EQ. 'p')) THEN ICOM = ICOM + 1 CALL MESAGE ('ENTER POINT DATA IN THE FOLLOWING FORMAT:') @@ -117,18 +97,18 @@ SUBROUTINE KEYIN (MP, ML, MS, MR, MSC, MA, MCOM, ICOM, JCOM, CIN, CALL INPOIN(MP, N(1), N(18), JJ, RIN(2), RIN(3), NHOLDP, & IHOLDP, IPOINT, COOR, IPBOUN, LINKP, MERGE, NOROOM) IF (NOROOM) GO TO 400 -C + C REPLACE THE FLAGS OF A REDEFINED POINT -C + IF (IPNTR .GT. 0) THEN CALL LTSORT(MP, LINKP, JJ, JPNTR, ADDLNK) IPBOUN(JPNTR) = IPBOUN(IPNTR) END IF GO TO 120 END IF -C + C ENTER A LINE INTO THE DATABASE -C + ELSE IF ((CIN(ICOM)(1:1) .EQ. 'L') .OR. & (CIN(ICOM)(1:1) .EQ. 'l')) THEN ICOM = ICOM + 1 @@ -256,9 +236,9 @@ SUBROUTINE KEYIN (MP, ML, MS, MR, MSC, MA, MCOM, ICOM, JCOM, CIN, & NOROOM) END IF IF (NOROOM) GO TO 400 -C + C LINK UP THE OLD FLAGS TO THE NEW LINE -C + IF (IPNTR .GT. 0) THEN ADDLNK = .FALSE. CALL LTSORT(ML, LINKL, JJ, JPNTR, ADDLNK) @@ -267,9 +247,9 @@ SUBROUTINE KEYIN (MP, ML, MS, MR, MSC, MA, MCOM, ICOM, JCOM, CIN, END IF GO TO 130 END IF -C + C ENTER A REGION INTERVAL SIZE INTO THE DATABASE -C + ELSE IF ((CIN(ICOM)(1:3) .EQ. 'SIZ') .OR. & (CIN(ICOM)(1:3) .EQ. 'siz')) THEN ICOM = ICOM + 1 @@ -298,9 +278,9 @@ SUBROUTINE KEYIN (MP, ML, MS, MR, MSC, MA, MCOM, ICOM, JCOM, CIN, END IF GO TO 140 END IF -C + C ENTER A SIDE INTO THE DATABASE -C + ELSE IF ((CIN(ICOM)(1:2) .EQ. 'SI') .OR. & (CIN(ICOM)(1:2) .EQ. 'si')) THEN ICOM = ICOM + 1 @@ -326,9 +306,9 @@ SUBROUTINE KEYIN (MP, ML, MS, MR, MSC, MA, MCOM, ICOM, JCOM, CIN, IF (NOROOM) GO TO 400 GO TO 160 END IF -C + C ENTER A HOLE INTO THE DATABASE -C + ELSE IF ((CIN(ICOM)(1:2) .EQ. 'HO') .OR. & (CIN(ICOM)(1:2) .EQ. 'ho')) THEN ICOM = ICOM + 1 @@ -356,9 +336,9 @@ SUBROUTINE KEYIN (MP, ML, MS, MR, MSC, MA, MCOM, ICOM, JCOM, CIN, IF (NOROOM) GO TO 400 GO TO 170 END IF -C + C ENTER A BARSET INTO THE DATABASE -C + ELSE IF ((CIN(ICOM)(1:2) .EQ. 'BA') .OR. & (CIN(ICOM)(1:2) .EQ. 'ba')) THEN ICOM = ICOM + 1 @@ -386,9 +366,9 @@ SUBROUTINE KEYIN (MP, ML, MS, MR, MSC, MA, MCOM, ICOM, JCOM, CIN, IF (NOROOM) GO TO 400 GO TO 180 END IF -C + C INPUT A BODY DEFINITION INTO THE DATABASE -C + ELSE IF ((CIN(ICOM)(1:3) .EQ. 'BOD') .OR. & (CIN(ICOM)(1:3) .EQ. 'bod')) THEN ICOM = ICOM + 1 @@ -427,16 +407,16 @@ SUBROUTINE KEYIN (MP, ML, MS, MR, MSC, MA, MCOM, ICOM, JCOM, CIN, & 'AGAIN') GO TO 190 END IF -C + C SPAWN A PROCESS -C + ELSE IF ((CIN(ICOM)(1:2) .EQ. 'SP') .OR. & (CIN(ICOM)(1:2) .EQ. 'sp')) THEN ICOM = ICOM + 1 CALL SPAWN(VAXVMS) -C + C INPUT A SCHEME INTO THE DATABASE -C + ELSE IF ((CIN(ICOM)(1:1) .EQ. 'S') .OR. & (CIN(ICOM)(1:1) .EQ. 's')) THEN ICOM = ICOM + 1 @@ -474,9 +454,9 @@ SUBROUTINE KEYIN (MP, ML, MS, MR, MSC, MA, MCOM, ICOM, JCOM, CIN, END IF GO TO 220 END IF -C + C INPUT A BOUNDARY INTO THE DATABASE -C + ELSE IF ((CIN(ICOM)(1:1) .EQ. 'B') .OR. & (CIN(ICOM)(1:1) .EQ. 'b')) THEN ICOM = ICOM + 1 @@ -493,9 +473,9 @@ SUBROUTINE KEYIN (MP, ML, MS, MR, MSC, MA, MCOM, ICOM, JCOM, CIN, & 'TO ENTER: ', MCOM, IOSTAT, JCOM, KIN, CIN, IIN, RIN) ICOM = 1 END IF -C + C INPUT A POINT BOUNDARY INTO THE DATABASE -C + IF ((CIN(ICOM)(1:1) .EQ. 'P') .OR. & (CIN(ICOM)(1:1) .EQ. 'p')) THEN ICOM = ICOM + 1 @@ -516,9 +496,9 @@ SUBROUTINE KEYIN (MP, ML, MS, MR, MSC, MA, MCOM, ICOM, JCOM, CIN, IF (NOROOM) GO TO 400 GO TO 230 END IF -C + C INPUT A NODE BOUNDARY INTO THE DATABASE -C + ELSE IF ((CIN(ICOM)(1:1) .EQ. 'N') .OR. & (CIN(ICOM)(1:1) .EQ. 'n')) THEN ICOM = ICOM + 1 @@ -540,9 +520,9 @@ SUBROUTINE KEYIN (MP, ML, MS, MR, MSC, MA, MCOM, ICOM, JCOM, CIN, IF (NOROOM) GO TO 400 GO TO 240 END IF -C + C INPUT AN ELEMENT BOUNDARY INTO THE DATABASE -C + ELSE IF ((CIN(ICOM)(1:1) .EQ. 'E') .OR. & (CIN(ICOM)(1:1) .EQ. 'e')) THEN ICOM = ICOM + 1 @@ -565,9 +545,9 @@ SUBROUTINE KEYIN (MP, ML, MS, MR, MSC, MA, MCOM, ICOM, JCOM, CIN, GO TO 250 END IF END IF -C + C INPUT A BOUNDARY FLAG WEIGHTING INTO THE DATABASE -C + ELSE IF ((CIN(ICOM)(1:1) .EQ. 'W') .OR. & (CIN(ICOM)(1:1) .EQ. 'w')) THEN ICOM = ICOM + 1 @@ -585,9 +565,9 @@ SUBROUTINE KEYIN (MP, ML, MS, MR, MSC, MA, MCOM, ICOM, JCOM, CIN, & 'TO WEIGHT: ', MCOM, IOSTAT, JCOM, KIN, CIN, IIN, RIN) ICOM = 1 END IF -C + C INPUT A POINT BOUNDARY FLAG WEIGHT INTO THE DATABASE -C + IF ((CIN(ICOM)(1:1) .EQ. 'P') .OR. & (CIN(ICOM)(1:1) .EQ. 'p')) THEN ICOM = ICOM + 1 @@ -611,9 +591,9 @@ SUBROUTINE KEYIN (MP, ML, MS, MR, MSC, MA, MCOM, ICOM, JCOM, CIN, END IF GO TO 260 END IF -C + C INPUT A NODE BOUNDARY WEIGHT INTO THE DATABASE -C + ELSE IF ((CIN(ICOM)(1:1) .EQ. 'N') .OR. & (CIN(ICOM)(1:1) .EQ. 'n')) THEN ICOM = ICOM + 1 @@ -638,9 +618,9 @@ SUBROUTINE KEYIN (MP, ML, MS, MR, MSC, MA, MCOM, ICOM, JCOM, CIN, END IF GO TO 270 END IF -C + C INPUT AN ELEMENT BOUNDARY WEIGHT INTO THE DATABASE -C + ELSE IF ((CIN(ICOM)(1:1) .EQ. 'E') .OR. & (CIN(ICOM)(1:1) .EQ. 'e')) THEN ICOM = ICOM + 1 @@ -666,9 +646,9 @@ SUBROUTINE KEYIN (MP, ML, MS, MR, MSC, MA, MCOM, ICOM, JCOM, CIN, GO TO 280 END IF END IF -C + C TOGGLE THE BANDWIDTH OPTIMIZATION FLAG -C + ELSE IF ((CIN(ICOM)(1:1) .EQ. 'O') .OR. & (CIN(ICOM)(1:1) .EQ. 'o')) THEN ICOM = ICOM + 1 @@ -679,9 +659,9 @@ SUBROUTINE KEYIN (MP, ML, MS, MR, MSC, MA, MCOM, ICOM, JCOM, CIN, OPTIM = .TRUE. CALL MESAGE ('BANDWIDTH OPTIMIZER ENABLED') END IF -C + C FLAG THE BANDWIDTH OPTIMIZATION ROUTINES ON, AND READ A RENUM CARD -C + ELSE IF ((CIN(ICOM)(1:3) .EQ. 'REN') .OR. & (CIN(ICOM)(1:3) .EQ. 'ren')) THEN ICOM = ICOM + 1 @@ -698,9 +678,9 @@ SUBROUTINE KEYIN (MP, ML, MS, MR, MSC, MA, MCOM, ICOM, JCOM, CIN, & RIN) ICOM = 1 END IF -C + C ENTER A POINT-LINE-POINT RENUM CARD -C + IF ((CIN(ICOM)(1:1) .EQ. 'P') .OR. & (CIN(ICOM)(1:1) .EQ. 'p')) THEN ICOM = ICOM + 1 @@ -719,9 +699,9 @@ SUBROUTINE KEYIN (MP, ML, MS, MR, MSC, MA, MCOM, ICOM, JCOM, CIN, IF (NOROOM) GO TO 400 GO TO 290 END IF -C + C ENTER A X, Y LOCATION RENUM CARD -C + ELSE IF ((CIN(ICOM)(1:1) .EQ. 'X') .OR. & (CIN(ICOM)(1:1) .EQ. 'x')) THEN ICOM = ICOM + 1 @@ -739,9 +719,9 @@ SUBROUTINE KEYIN (MP, ML, MS, MR, MSC, MA, MCOM, ICOM, JCOM, CIN, IF (NOROOM) GO TO 400 GO TO 300 END IF -C + C ENTER A NODE UNIQUE ID RENUM CARD -C + ELSE IF ((CIN(ICOM)(1:1) .EQ. 'N') .OR. & (CIN(ICOM)(1:1) .EQ. 'n')) THEN ICOM = ICOM + 1 @@ -762,9 +742,9 @@ SUBROUTINE KEYIN (MP, ML, MS, MR, MSC, MA, MCOM, ICOM, JCOM, CIN, GO TO 310 END IF END IF -C + C ENTER A REGION INTO THE DATABASE -C + ELSE IF ((CIN(ICOM)(1:1) .EQ. 'R') .OR. & (CIN(ICOM)(1:1) .EQ. 'r')) THEN ICOM = ICOM + 1 @@ -811,9 +791,9 @@ SUBROUTINE KEYIN (MP, ML, MS, MR, MSC, MA, MCOM, ICOM, JCOM, CIN, RSIZE(JJPNTR) = 0. GO TO 320 END IF -C + C ENTER A GROUP OF REGIONS INTO THE DATABASE -C + ELSE IF ((CIN(ICOM)(1:1) .EQ. 'G') .OR. & (CIN(ICOM)(1:1) .EQ. 'g')) THEN ICOM = ICOM + 1 @@ -841,18 +821,18 @@ SUBROUTINE KEYIN (MP, ML, MS, MR, MSC, MA, MCOM, ICOM, JCOM, CIN, IF (NOROOM) GO TO 400 GO TO 340 END IF -C + C ENTER A TITLE -C + ELSE IF ((CIN(ICOM)(1:1) .EQ. 'T') .OR. & (CIN(ICOM)(1:1) .EQ. 't')) THEN ICOM = ICOM + 1 IF (ICOM .GT. JCOM) THEN CALL GETINP(IUNIT, IDUMP, 'TITLE: ', TITLE, IOSTAT) END IF -C + C ENTER LINE INTERVALS -C + ELSE IF ((CIN(ICOM)(1:1) .EQ. 'I') .OR. & (CIN(ICOM)(1:1) .EQ. 'i')) THEN ICOM = ICOM + 1 @@ -875,9 +855,9 @@ SUBROUTINE KEYIN (MP, ML, MS, MR, MSC, MA, MCOM, ICOM, JCOM, CIN, & IFLINE, ILLIST, LINKL, LINKS, ADDLNK) GO TO 350 END IF -C + C ENTER LINE FACTORS -C + ELSE IF ((CIN(ICOM)(1:1) .EQ. 'F') .OR. & (CIN(ICOM)(1:1) .EQ. 'f')) THEN ICOM = ICOM + 1 @@ -900,9 +880,9 @@ SUBROUTINE KEYIN (MP, ML, MS, MR, MSC, MA, MCOM, ICOM, JCOM, CIN, & NLPS, IFLINE, ILLIST, LINKL, LINKS, ADDLNK) GO TO 360 END IF -C + C ENTER MATERIAL NUMBERS -C + ELSE IF ((CIN(ICOM)(1:1) .EQ. 'M') .OR. & (CIN(ICOM)(1:1) .EQ. 'm')) THEN ICOM = ICOM + 1 @@ -923,9 +903,9 @@ SUBROUTINE KEYIN (MP, ML, MS, MR, MSC, MA, MCOM, ICOM, JCOM, CIN, END IF GO TO 370 END IF -C + C FLAG THE THREE-NODE ELEMENT OPTION -C + ELSE IF ((CIN(ICOM)(1:2) .EQ. 'TH') .OR. & (CIN(ICOM)(1:1) .EQ. 'th')) THEN ICOM = ICOM + 1 @@ -936,9 +916,9 @@ SUBROUTINE KEYIN (MP, ML, MS, MR, MSC, MA, MCOM, ICOM, JCOM, CIN, THREE = .TRUE. CALL MESAGE ('THREE NODE ELEMENT GENERATION - ON') END IF -C + C FLAG THE EIGHT-NODE ELEMENT OPTION -C + ELSE IF ((CIN(ICOM)(1:2) .EQ. 'EI') .OR. & (CIN(ICOM)(1:1) .EQ. 'ei')) THEN ICOM = ICOM + 1 @@ -950,9 +930,9 @@ SUBROUTINE KEYIN (MP, ML, MS, MR, MSC, MA, MCOM, ICOM, JCOM, CIN, NINE = .FALSE. CALL MESAGE ('EIGHT NODE ELEMENT GENERATION - ON') END IF -C + C FLAG THE NINE-NODE ELEMENT OPTION -C + ELSE IF ((CIN(ICOM)(1:1) .EQ. 'N') .OR. & (CIN(ICOM)(1:1) .EQ. 'n')) THEN ICOM = ICOM + 1 @@ -964,9 +944,9 @@ SUBROUTINE KEYIN (MP, ML, MS, MR, MSC, MA, MCOM, ICOM, JCOM, CIN, EIGHT = .FALSE. CALL MESAGE ('NINE NODE ELEMENT GENERATION - ON') END IF -C + C EXIT OPTION - EXITS FASTQ -C + ELSE IF ((CIN(ICOM)(1:2) .EQ. 'EX') .OR. & (CIN(ICOM)(1:2) .EQ. 'ex')) THEN ICOM = ICOM + 1 @@ -979,14 +959,14 @@ SUBROUTINE KEYIN (MP, ML, MS, MR, MSC, MA, MCOM, ICOM, JCOM, CIN, & TIME1, BATCH, VERSN) ENDIF GO TO 110 -C + C LINK ALL NEW DATA AS NEEDED, AND RETURN FROM THE KEYIN OPTION -C + ELSE IF (CIN(ICOM)(1:1) .EQ. ' ') THEN ICOM = ICOM + 1 -C + C LINK UP THE POINTS AND LINES TO THEIR ASSOCIATED FLAGS -C + SIDEOK = .FALSE. CALL LINKBC(MP, MS, NOLD(11) + 1, N(11), N(1), N(25), N(11), & N(12), N(20), IPBF, IFPB, NPPF, LISTPB, NLPS, IFLINE, @@ -1004,10 +984,10 @@ SUBROUTINE KEYIN (MP, ML, MS, MR, MSC, MA, MCOM, ICOM, JCOM, CIN, & ILLIST, ISBOUN, LINKSB, IWTSBF, LINKL, LINKS, SIDEOK, & NOROOM) IF (NOROOM) GO TO 400 -C + C IF NO BODY CARDS HAVE BEEN READ, ASSUME THE BODY IS ALL THE C REGIONS AND ALL THE BAR SETS -C + IF (N(9) .EQ. NOLD(9)) THEN ADDOLD = .TRUE. IFOUND = 1 @@ -1030,15 +1010,15 @@ SUBROUTINE KEYIN (MP, ML, MS, MR, MSC, MA, MCOM, ICOM, JCOM, CIN, 390 CONTINUE END IF RETURN -C + ELSE ICOM = ICOM + 1 CALL HELP_FQ(9) END IF GO TO 110 -C + C MORE ROOM IN DIMENSIONS NEEDED -C + 400 CONTINUE CALL MESAGE (' ') CALL MESAGE ('DIMENSIONS MUST BE INCREASED - PLEASE WAIT') @@ -1047,7 +1027,7 @@ SUBROUTINE KEYIN (MP, ML, MS, MR, MSC, MA, MCOM, ICOM, JCOM, CIN, 410 CONTINUE NOROOM = .TRUE. RETURN -C + 10000 FORMAT(' A POINT NO. OF:', I7, ' IS NOT ALLOWED', /, & ' THIS POINT WILL NOT BE INPUT INTO DATABASE') 10010 FORMAT(' A LINE NO. OF:', I7, ' IS NOT ALLOWED', /, @@ -1086,5 +1066,5 @@ SUBROUTINE KEYIN (MP, ML, MS, MR, MSC, MA, MCOM, ICOM, JCOM, CIN, & /, ' THIS SCHEME WILL NOT BE INPUT INTO DATABASE') 10170 FORMAT(' REGION NO:', I5, ' IS NOT IN THE DATABASE', /, & ' THUS NO MATERIAL NUMBER CAN BE ENTERED') -C + END diff --git a/packages/seacas/applications/fastq/kxnadd.f b/packages/seacas/applications/fastq/kxnadd.f index ef8fdefeb342..2d5b0b20aeed 100644 --- a/packages/seacas/applications/fastq/kxnadd.f +++ b/packages/seacas/applications/fastq/kxnadd.f @@ -1,48 +1,37 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: kxnadd.f,v 1.1 1990/11/30 11:10:51 gdsjaar Exp $ -C $Log: kxnadd.f,v $ -C Revision 1.1 1990/11/30 11:10:51 gdsjaar -C Initial revision -C -C -CC* FILE: [.RENUM]KXNADD.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE KXNADD (MAXKXN, NNXK, KXN, NUMKXN, K, NODE, ERR) C************************************************************************ -C + C SUBROUTINE KXNADD = ADDS K AS AN ELEMENT OF NODE -C + C*********************************************************************** -C + C NOTE: C IT IS ASSUMED K IS NOT ALREADY AN ELEMENT OF NODE -C + C*********************************************************************** -C + DIMENSION KXN (NNXK, MAXKXN) -C + LOGICAL ERR -C + ERR = .FALSE. NN = NODE 100 CONTINUE -C + C LINE CONTINUES - FIND NEW CONTINUATION LINE -C + IF (KXN (4, NN) .LT. 0) THEN NN = IABS (KXN (4, NN)) GOTO 100 -C + C ADD THE ELEMENT TO NODE -C + ELSEIF (KXN (4, NN) .EQ. 0) THEN DO 110 I = 1, 4 IF (KXN (I, NN) .EQ. 0) THEN @@ -54,9 +43,9 @@ SUBROUTINE KXNADD (MAXKXN, NNXK, KXN, NUMKXN, K, NODE, ERR) WRITE ( * , 10000)K, NODE ERR = .TRUE. RETURN -C + C ADD A CONTINUATION LINE, AND ADD THE ELEMENT TO NODE -C + ELSE IF (NUMKXN .GE. MAXKXN) THEN CALL MESAGE ('NO ROOM FOR KXN TABLE IN KXNADD') @@ -71,7 +60,7 @@ SUBROUTINE KXNADD (MAXKXN, NNXK, KXN, NUMKXN, K, NODE, ERR) KXN (4, NN) = - NUMKXN RETURN ENDIF -C + 10000 FORMAT ('FOR ELEMENT', I5, ', AND NODE', I5) -C + END diff --git a/packages/seacas/applications/fastq/l2smo.f b/packages/seacas/applications/fastq/l2smo.f index 7bb21a3996d4..c3b580e9deba 100644 --- a/packages/seacas/applications/fastq/l2smo.f +++ b/packages/seacas/applications/fastq/l2smo.f @@ -1,64 +1,53 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: l2smo.f,v 1.1 1990/11/30 11:10:53 gdsjaar Exp $ -C $Log: l2smo.f,v $ -C Revision 1.1 1990/11/30 11:10:53 gdsjaar -C Initial revision -C -C -CC* FILE: [.QMESH]L2SMO.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE L2SMO (MXND, XN, YN, NXL, LXN, NNN, NNNOLD, NIT, EPS, & RO) C*********************************************************************** -C + C SUBROUTINE L2SMO = LAPLACIAN SQUARED METHOD OF MESH SMOOTHING -C + C*********************************************************************** -C + C NOTE: C THIS METHOD IS LIKE LAPLACIAN SMOOTHING EXCEPT EACH VECTOR C POINTING TO A NEIGHBOR NODE HAS A LENGTH OF C (DISTANCE TO THAT NODE)**2. -C + C*********************************************************************** -C + C VARIABLES USED: C NIT = MAX NUMBER OF ITERATIONS TO DO C EPS = NODE MOVEMENT TOLERANCE FOR CONVERGENCE C RO = UNDER OR OVER-RELAXATION FACTOR. -C + C*********************************************************************** -C + DIMENSION LINES (20) DIMENSION NXL (2, 3*MXND), LXN (4, MXND), XN (MXND), YN (MXND) -C + LOGICAL BIG, ERR -C + EPS2 = (EPS * RO) ** 2 -C + C ITERATION LOOP -C + DO 120 IT = 1, NIT BIG = .FALSE. -C + C NODE LOOP -C + DO 110 NODE = NNNOLD + 1, NNN IF ((LXN (1, NODE).GT.0) .AND. (LXN (2, NODE).GT.0))THEN FX = 0. FY = 0. SL = 0. -C + C LOOP THROUGH ALL LINES CONNECTED TO NODE -C + CALL GETLXN (MXND, LXN, NODE, LINES, KOUNT, ERR) IF (ERR) RETURN DO 100 IL = 1, KOUNT @@ -72,9 +61,9 @@ SUBROUTINE L2SMO (MXND, XN, YN, NXL, LXN, NNN, NNNOLD, NIT, EPS, FY = FY + DY * AL SL = SL + AL 100 CONTINUE -C + C MOVE THE NODE -C + DELX = RO * FX/SL DELY = RO * FY/SL XN (NODE) = XN (NODE) + DELX diff --git a/packages/seacas/applications/fastq/labove.f b/packages/seacas/applications/fastq/labove.f index 253cf6b2cf08..5cc597fcd450 100644 --- a/packages/seacas/applications/fastq/labove.f +++ b/packages/seacas/applications/fastq/labove.f @@ -1,53 +1,36 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: labove.f,v 1.2 1991/03/21 15:44:51 gdsjaar Exp $ -C $Log: labove.f,v $ -C Revision 1.2 1991/03/21 15:44:51 gdsjaar -C Changed all 3.14159... to atan2(0.0, -1.0) -C -c Revision 1.1.1.1 1990/11/30 11:10:57 gdsjaar -c FASTQ Version 2.0X -c -c Revision 1.1 90/11/30 11:10:56 gdsjaar -c Initial revision -c -C -CC* FILE: [.MAIN]LABOVE.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE LABOVE (MP,ML,N,IPOINT,COOR,ILINE,LTYPE,LCON, + LINKP,LINKL,X,Y,Y1,Y2,IFIND,INDEX,IFIRST,INEXT) C*********************************************************************** -C + C SUBROUTINE LABOVE = GETS THE CLOSEST LINE ABOVE A GIVEN X,Y -C + C*********************************************************************** -C + C VARIABLES USED: C IFIND = THE CLOSEST LINE FOUND ABOVE THE X,Y LOCATION C IFIRST = THE CCW END OF THE LINE (LEFT END) C INEXT = THE CW END OF THE LINE (RIGHT END) -C + C*********************************************************************** -C + DIMENSION IPOINT(MP),COOR(2,MP),ILINE(ML),LTYPE(ML),LCON(3,ML) DIMENSION LINKP(2,MP),LINKL(2,ML) DIMENSION N(29) -C + LOGICAL BAD,ADDLNK,ERR,UP -C + PI = ATAN2(0.0, -1.0) -C + TWOPI=PI+PI ADDLNK=.FALSE. DIST=Y2-Y1 -C + DO 100 I=1,N(19) CALL LTSORT(ML,LINKL,I,II,ADDLNK) IF(II.GT.0)THEN @@ -61,27 +44,27 @@ SUBROUTINE LABOVE (MP,ML,N,IPOINT,COOR,ILINE,LTYPE,LCON, ELSE J3=0 ENDIF -C + C SEE IF LINE EXISTS -C + IF((J1.GT.0).AND.(J2.GT.0))THEN -C + C CHECK A STRAIGHT LINE TO SEE IF IT SPANS THE POINT -C + IF((LTYPE(II).EQ.1).AND. + (((COOR(1,J1).LE.X).AND.(COOR(1,J2).GE.X)).OR. + ((COOR(1,J2).LE.X).AND.(COOR(1,J1).GE.X))))THEN -C + C SEE IF LINE IS ABOVE -C + CALL DLPARA(COOR(1,J1),COOR(2,J1),COOR(1,J2), + COOR(2,J2),XM1,B1,BAD) IF(.NOT.BAD)THEN YTRY=(XM1*X)+B1 IF(YTRY.GT.Y)THEN -C + C CHECK DISTANCE TO THE LINE - RECORD LINE NO. IF CLOSEST -C + DTRY=YTRY-Y IF((DTRY.LE.DIST).OR.(ABS(DIST-DTRY).LT. + .001*DIST))THEN @@ -98,19 +81,19 @@ SUBROUTINE LABOVE (MP,ML,N,IPOINT,COOR,ILINE,LTYPE,LCON, ENDIF ENDIF ENDIF -C + C CHECK AN ARC LINE -C + ELSEIF(((LTYPE(II).EQ.3).OR.(LTYPE(II).EQ.4).OR. + (LTYPE(II).EQ.6)).AND.(J3.GT.0))THEN CALL ARCPAR(MP,LTYPE(II),ILINE(II),COOR,LINKP,J1,J2, + J3,I3,XCEN,YCEN,THETA1,THETA2,TANG,R1,R2,ERR, + ICCW,ICW,XK,XA) IF(.NOT.ERR)THEN -C + C SET THE ARC AS EITHER AN UPWARD ARCH OR DOWNWARD ARCH C (A CLOSED CIRCLE IS ALWAYS AN UPWARD ARCH) -C + IF(J1.EQ.J2)THEN UP=.TRUE. ELSEIF(COOR(1,ICCW).GE.COOR(1,ICW))THEN @@ -118,9 +101,9 @@ SUBROUTINE LABOVE (MP,ML,N,IPOINT,COOR,ILINE,LTYPE,LCON, ELSE UP=.FALSE. ENDIF -C + C THE INPUT POINT IS RIGHT AT THE CENTER OF THE CIRCLE -C + IF((Y.EQ.YCEN).AND.(X.EQ.XCEN))THEN RP=0. THETAP=(THETA1+THETA2)*.5 @@ -128,9 +111,9 @@ SUBROUTINE LABOVE (MP,ML,N,IPOINT,COOR,ILINE,LTYPE,LCON, THETAP=ATAN2(Y-YCEN,X-XCEN) RP=SQRT( ((X-XCEN)**2) + ((Y-YCEN)**2) ) ENDIF -C + C SEE IF THE POINT ANGLE IS WITHIN THE BEGINNING AND ENDING ANGLES -C + IF( ( (THETAP.LE.THETA2) .AND. (THETAP.GE.THETA1) ) & .OR. & ( (THETAP+TWOPI.LE.THETA2) .AND. @@ -140,17 +123,17 @@ SUBROUTINE LABOVE (MP,ML,N,IPOINT,COOR,ILINE,LTYPE,LCON, & .OR. & ( (THETAP+TWOPI.LE.THETA1) .AND. & (THETAP+TWOPI.GE.THETA2) ) ) THEN -C + C SEE IF THE POINT TO CENTER DISTANCE IS LESS THAN THE C ARC RADIUS AT THAT ANGLE FOR AN UPWARD ARC OR GREATER FOR C A DOWNWARD ARC (BELOW THE ARC) -C + RTEST = XA * EXP ( XK * THETAP ) IF( ( (UP) .AND. (RTEST.GE.RP) ) .OR. + ( (.NOT.UP) .AND. (RTEST.LE.RP) ) )THEN -C + C CHECK Y DISTANCE TO THE LINE - RECORD LINE NO. IF CLOSEST -C + CALL ARCY(XCEN,YCEN,THETA1,THETA2,XK,XA, + X,YTRY,ERR) DTRY=YTRY-Y @@ -170,10 +153,10 @@ SUBROUTINE LABOVE (MP,ML,N,IPOINT,COOR,ILINE,LTYPE,LCON, ENDIF ENDIF ENDIF -C + C THE ONLY OTHER ARC POSSIBILITY IS IF THE X FALLS IN THE SPAN C BETWEEN THE TWO ENDPOINTS OR BETWEEN END POINTS AND CENTER POINT -C + ELSEIF ( ((X - COOR(1,J1) ) * + (X - COOR(1,J2) ) .LT.0) + .OR. @@ -182,9 +165,9 @@ SUBROUTINE LABOVE (MP,ML,N,IPOINT,COOR,ILINE,LTYPE,LCON, + .OR. + ((X - COOR(1,J2) ) * + (X - COOR(1,J3) ) .LT.0) ) THEN -C + C CHECK Y DISTANCE TO THE LINE - RECORD LINE NO. IF CLOSEST -C + CALL ARCY(XCEN,YCEN,THETA1,THETA2,XK,XA, + X,YTRY,ERR) DTRY=YTRY-Y @@ -195,10 +178,10 @@ SUBROUTINE LABOVE (MP,ML,N,IPOINT,COOR,ILINE,LTYPE,LCON, DIST=DTRY IFIND=I INDEX=II -C + C TREAT THE BETWEEN END POINTS DIFFERENTLY THAN BETWEEN C ENDPOINT AND CENTER POINT -C + IF( ((X - COOR(1,J1) ) * + (X - COOR(1,J2) )) .LT.0) THEN IF(UP)THEN @@ -225,7 +208,7 @@ SUBROUTINE LABOVE (MP,ML,N,IPOINT,COOR,ILINE,LTYPE,LCON, ENDIF ENDIF 100 CONTINUE -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/lcolor.f b/packages/seacas/applications/fastq/lcolor.f index 4d8a7af7e64b..c5ae675760e9 100644 --- a/packages/seacas/applications/fastq/lcolor.f +++ b/packages/seacas/applications/fastq/lcolor.f @@ -1,24 +1,18 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: lcolor.f,v 1.1 1990/11/30 11:10:59 gdsjaar Exp $ -C $Log: lcolor.f,v $ -C Revision 1.1 1990/11/30 11:10:59 gdsjaar -C Initial revision -C -C SUBROUTINE LCOLOR (COLOR) C*********************************************************************** -C + C SUBROUTINE LCOLOR = SETS THE LINE COLOR -C + C*********************************************************************** -C + CHARACTER*5 COLOR -C + IF (COLOR .EQ. 'WHITE') THEN CALL PLTSTD(1, 7.) ELSEIF (COLOR .EQ. 'BLACK') THEN @@ -33,5 +27,5 @@ SUBROUTINE LCOLOR (COLOR) CALL PLTSTD(1, 4.) ENDIF RETURN -C + END diff --git a/packages/seacas/applications/fastq/linepr.f b/packages/seacas/applications/fastq/linepr.f index 57f3fcd5ffd9..c7f65e2b0a6d 100644 --- a/packages/seacas/applications/fastq/linepr.f +++ b/packages/seacas/applications/fastq/linepr.f @@ -1,32 +1,21 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: linepr.f,v 1.1 1990/11/30 11:11:02 gdsjaar Exp $ -C $Log: linepr.f,v $ -C Revision 1.1 1990/11/30 11:11:02 gdsjaar -C Initial revision -C -C -CC* FILE: [.MAIN]LINEPR.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE LINEPR (ML, MP, LINKP, LCON, II, I1, I2, I3, J1, J2, & J3) C*********************************************************************** -C + C SUBROUTINE LINEPR = GETS THE LINE PARAMETERS C*********************************************************************** -C + DIMENSION LCON(3, ML) DIMENSION LINKP(2, MP) -C + LOGICAL ADDLNK -C + ADDLNK = .FALSE. I1 = LCON (1, II) I2 = LCON (2, II) @@ -38,7 +27,7 @@ SUBROUTINE LINEPR (ML, MP, LINKP, LCON, II, I1, I2, I3, J1, J2, ELSE J3 = 0 ENDIF -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/linkbc.f b/packages/seacas/applications/fastq/linkbc.f index d5788ee0cb7c..783e9066a033 100644 --- a/packages/seacas/applications/fastq/linkbc.f +++ b/packages/seacas/applications/fastq/linkbc.f @@ -1,34 +1,23 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: linkbc.f,v 1.1 1990/11/30 11:11:06 gdsjaar Exp $ -C $Log: linkbc.f,v $ -C Revision 1.1 1990/11/30 11:11:06 gdsjaar -C Initial revision -C -C -CC* FILE: [.MAIN]LINKBC.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE LINKBC (MDIM, MS, I1, I2, NBOUN, N1, N2, N3, N20, & IFLAG, IFLIST, NEPS, LIST, NLPS, IFLINE, ILLIST, IBOUN, & LINKF, IWT, LINKE, LINKS, SIDEOK, NOROOM) C*********************************************************************** -C + C SUBROUTINE LINKBC = LINKS UP ALL BOUNDARY FLAG LISTS -C + C*********************************************************************** -C + C SUBROUTINE CALLED BY: C READ = READS AND/OR MERGES FASTQ FILE(S) -C + C*********************************************************************** -C + C VARIABLES USED: C I1 = THE FIRST FLAG TO BE LINKED C I2 = THE LAST FLAG TO BE LINKED @@ -40,49 +29,49 @@ SUBROUTINE LINKBC (MDIM, MS, I1, I2, NBOUN, N1, N2, N3, N20, C IBOUN = THE LINK FROM THE ENTITY TO THE FLAGS C MDIM = THE DIMENSIONING PARAMETER FOR THE LIST C SIDEOK = .FALSE. IF IT IS NOT POSSIBLE TO EXPAND SIDES (POINBC'S) -C + C*********************************************************************** -C + DIMENSION IFLAG(MDIM), IFLIST(MDIM), NEPS(MDIM), LIST(2, MDIM) DIMENSION LINKF(2, MDIM), IBOUN(MDIM) DIMENSION LINKE(2, MDIM), LINKS(2, MS) DIMENSION NLPS(MS), IFLINE(MS), ILLIST(MS*3), IWT(3, MDIM) -C + LOGICAL ADDLNK, MERGE, ADDOLD, NOROOM, SIDEOK, NEWNUM -C + IZ = 0 ADDLNK = .FALSE. MERGE = .FALSE. NOROOM = .FALSE. -C + IF (SIDEOK) THEN -C + C EXPAND ALL THE SIDES (SETS) TO THEIR RESPECT LINES (ENTITIES) -C + DO 130 I = I1, I2 100 CONTINUE CALL LTSORT (MDIM, LINKF, IFLAG(I), II, ADDLNK) IF (II .GT. 0) THEN -C + C THE FLAG HAS BEEN FOUND -C + IFLAG1 = IFLAG(II) J1 = IFLIST(II) J2 = J1 + NEPS(II) - 1 DO 120 J = J1, J2 JJ = LIST(1, J) IF (JJ .LT. 0) THEN -C + C REMOVE THE SIDE FROM THE FLAG LIST -C + NEPS(II) = NEPS(II) - 1 DO 110 K = J, J2 - 1 LIST(1, K) = LIST(1, K + 1) LIST(2, K) = LIST(2, K + 1) 110 CONTINUE -C + C IF THE SIDE EXISTS, REPLACE IT WITH THE LINES IT REPRESENTS -C + JJ = -JJ CALL LTSORT (MS, LINKS, JJ, IPNTR, ADDLNK) IF ((JJ .GT. N20) .OR. (IPNTR .LE. 0)) THEN @@ -93,10 +82,10 @@ SUBROUTINE LINKBC (MDIM, MS, I1, I2, NBOUN, N1, N2, N3, N20, & MERGE, NOROOM, NEWNUM, IZ, LINKF, IFLAG, & NEPS, IFLIST, LIST, LINKF, IWT, IZ, ADDOLD) IF (NOROOM) RETURN -C + C NOW, SEE IF THERE ARE ANY SIDES IN THE NEW I'TH FLAG'S LIST C NOTE THAT THE ONE FIXED HAS NOW BEEN ROTATED TO THE END OF THE LIST. -C + GOTO 100 ENDIF ENDIF @@ -104,16 +93,16 @@ SUBROUTINE LINKBC (MDIM, MS, I1, I2, NBOUN, N1, N2, N3, N20, ENDIF 130 CONTINUE ENDIF -C + C ALL POSSIBLE SIDE EXPANSION HAS OCCURRED C NOW LINK UP ALL THE LINES -C + DO 160 I = I1, I2 CALL LTSORT (MDIM, LINKF, IFLAG(I), II, ADDLNK) IF (II .GT. 0) THEN -C + C THE FLAG HAS BEEN FOUND -C + IFLAG1 = IFLAG(II) J1 = IFLIST(II) J2 = J1 + NEPS(II) - 1 @@ -133,7 +122,7 @@ SUBROUTINE LINKBC (MDIM, MS, I1, I2, NBOUN, N1, N2, N3, N20, ENDIF 160 CONTINUE RETURN -C + 10000 FORMAT (' SIDE NO:', I5, ' IS NOT IN THE DATABASE', /, & ' THUS NO BOUNDARY FLAGS CAN BE ENTERED ALONG THIS SIDE') END diff --git a/packages/seacas/applications/fastq/linken.f b/packages/seacas/applications/fastq/linken.f index 7f11b9f3481a..c58a7784b7e3 100644 --- a/packages/seacas/applications/fastq/linken.f +++ b/packages/seacas/applications/fastq/linken.f @@ -1,41 +1,22 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: linken.f,v 1.2 2000/11/13 15:39:04 gdsjaar Exp $ -C $Log: linken.f,v $ -C Revision 1.2 2000/11/13 15:39:04 gdsjaar -C Cleaned up unused variables and labels. -C -C Removed some real to int conversion warnings. -C -C Revision 1.1.1.1 1990/11/30 11:11:10 gdsjaar -C FASTQ Version 2.0X -C -c Revision 1.1 90/11/30 11:11:09 gdsjaar -c Initial revision -c -C -CC* FILE: [.MAIN]LINKEN.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE LINKEN (MDIM, JJ, IFLAG1, IFLAG, IFLIST, NEPS, LIST, & LINKF, LINKE, IBOUN, ADDLNK) C*********************************************************************** -C + C SUBROUTINE LINKEN = LINKS ENTITIES IN BOUNDARY FLAG LISTS -C + C*********************************************************************** -C + C SUBROUTINE CALLED BY: C LINKBC = LINKS UP ALL BOUNDARY FLAG LISTS -C + C*********************************************************************** -C + C VARIABLES USED: C IFLAG = THE ARRAY OF FLAGS C IFLIST = THE FIRST ENTITY IN LIST TO BE ASSOCIATED WITH A FLAG @@ -44,14 +25,14 @@ SUBROUTINE LINKEN (MDIM, JJ, IFLAG1, IFLAG, IFLIST, NEPS, LIST, C LINK = THE LINK TO THE FLAG LIST C IBOUN = THE LINK FROM THE ENTITY TO THE FLAGS C MDIM = THE DIMENSIONING PARAMETER FOR THE LIST -C + C*********************************************************************** -C + DIMENSION IFLAG (MDIM), IFLIST (MDIM), NEPS (MDIM), LIST (2, MDIM) DIMENSION LINKF (2, MDIM), IBOUN (MDIM), LINKE (2, MDIM) -C + LOGICAL ADDLNK -C + CALL LTSORT (MDIM, LINKE, JJ, L, ADDLNK) IF (L .LE. 0) THEN CALL MESAGE ('BOUNDARY CONDITION LINK ATTEMPTED') @@ -84,7 +65,7 @@ SUBROUTINE LINKEN (MDIM, JJ, IFLAG1, IFLAG, IFLIST, NEPS, LIST, ENDIF 120 CONTINUE RETURN -C + 10000 FORMAT (' FLAG: ', I5, ' ENTITY ATTEMPTED:', I5) -C + END diff --git a/packages/seacas/applications/fastq/linlen.f b/packages/seacas/applications/fastq/linlen.f index 016a5188ec2f..e609764c7401 100644 --- a/packages/seacas/applications/fastq/linlen.f +++ b/packages/seacas/applications/fastq/linlen.f @@ -1,39 +1,17 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: linlen.f,v 1.3 2000/11/13 15:39:04 gdsjaar Exp $ -C $Log: linlen.f,v $ -C Revision 1.3 2000/11/13 15:39:04 gdsjaar -C Cleaned up unused variables and labels. -C -C Removed some real to int conversion warnings. -C -C Revision 1.2 1991/03/21 15:44:53 gdsjaar -C Changed all 3.14159... to atan2(0.0, -1.0) -C -c Revision 1.1.1.1 1990/11/30 11:11:13 gdsjaar -c FASTQ Version 2.0X -c -c Revision 1.1 90/11/30 11:11:11 gdsjaar -c Initial revision -c -C -CC* FILE: [.PAVING]LINLEN.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE LINLEN (MP, COOR, LINKP, KNUM, LNUM, KT, I3, J1, J2, & J3, DIST, ERR) C*********************************************************************** -C + C SUBROUTINE LINLEN = CALCULATES THE LENGTH OF A GIVEN LINE -C + C*********************************************************************** -C + C VARIABLES USED: C NID = AN ARRAY OF UNIQUE NODE IDENTIFIERS. C REAL = .TRUE. FOR AN ACTUAL GENERATION @@ -52,20 +30,20 @@ SUBROUTINE LINLEN (MP, COOR, LINKP, KNUM, LNUM, KT, I3, J1, J2, C = 4 FOR ARC WITH THIRD POINT ON THE ARC C = 5 FOR PARABOLA C = 6 FOR ARC WITH RADIUS GIVEN -C + C*********************************************************************** -C + DIMENSION COOR (2, MP), LINKP (2, MP) -C + LOGICAL ERR -C + PI = ATAN2(0.0, -1.0) -C + DIST = 0. ERR = .TRUE. -C + C STRAIGHT LINE GENERATION -C + IF (KT.EQ.1) THEN YDIFF = COOR (2, J2) -COOR (2, J1) XDIFF = COOR (1, J2) -COOR (1, J1) @@ -74,9 +52,9 @@ SUBROUTINE LINLEN (MP, COOR, LINKP, KNUM, LNUM, KT, I3, J1, J2, WRITE (*, 10000) KNUM RETURN ENDIF -C + C CORNER GENERATION -C + ELSEIF (KT.EQ.2) THEN XDA = COOR (1, J3) -COOR (1, J1) YDA = COOR (2, J3) -COOR (2, J1) @@ -89,18 +67,18 @@ SUBROUTINE LINLEN (MP, COOR, LINKP, KNUM, LNUM, KT, I3, J1, J2, RETURN ENDIF DIST = DA+DB -C + C CIRCULAR ARC -C + ELSEIF ((KT.EQ.3) .OR. (KT.EQ.4) .OR. (KT.EQ.6) )THEN XSTART = COOR (1, J1) YSTART = COOR (2, J1) CALL ARCPAR (MP, KT, KNUM, COOR, LINKP, J1, J2, J3, I3, & XCEN, YCEN, THETA1, THETA2, TANG, R1, R2, ERR, ICCW, ICW, & XK, XA) -C + C GENERATE THE CIRCLE -C + ANG = THETA1 DEL = TANG/30 DO 100 I = 2, 29 @@ -115,18 +93,18 @@ SUBROUTINE LINLEN (MP, COOR, LINKP, KNUM, LNUM, KT, I3, J1, J2, XEND = COOR (1, J2) YEND = COOR (2, J2) DIST = DIST+SQRT ((XEND-XSTART) ** 2 + (YEND-YSTART) ** 2) -C + C ELIPSE -C + ELSEIF (KT .EQ. 7) THEN XSTART = COOR (1, J1) YSTART = COOR (2, J1) CALL ELPSPR (MP, KT, KNUM, COOR, LINKP, J1, J2, J3, & I3, XCEN, YCEN, THETA1, THETA2, TANG, IDUM1, IDUM2, & AVALUE, BVALUE, ERR) -C + C GENERATE THE ELIPSE -C + ANG = THETA1 DEL = TANG/30 DO 110 I = 2, 29 @@ -143,13 +121,13 @@ SUBROUTINE LINLEN (MP, COOR, LINKP, KNUM, LNUM, KT, I3, J1, J2, XEND = COOR (1, J2) YEND = COOR (2, J2) DIST = DIST+SQRT ((XEND-XSTART) ** 2 + (YEND-YSTART) ** 2) -C + C PARABOLA -C + ELSEIF (KT.EQ.5) THEN -C + C CHECK LEGITIMACY OF DATA -C + XMID = (COOR (1, J1) +COOR (1, J2) ) * 0.5 YMID = (COOR (2, J1) +COOR (2, J2) ) * 0.5 DOT = (COOR (1, J2) -COOR (1, J1) ) * (COOR (1, J3) -XMID) @@ -162,9 +140,9 @@ SUBROUTINE LINLEN (MP, COOR, LINKP, KNUM, LNUM, KT, I3, J1, J2, WRITE (*, 10030) KNUM RETURN ENDIF -C + C GETARC LENGTH -C + HALFW = SQRT ((COOR (1, J2) -COOR (1, J1) ) ** 2 + & (COOR (2, J2) - COOR (2, J1) ) ** 2 ) * 0.5 IF (HALFW.EQ.0.) THEN @@ -175,9 +153,9 @@ SUBROUTINE LINLEN (MP, COOR, LINKP, KNUM, LNUM, KT, I3, J1, J2, & + (YMID-COOR (2, J3) ) ** 2) COEF = HEIGHT/HALFW ** 2 TCOEF = 2.0 * COEF -C + C PARC IS A STATEMENT FUNCTION -C + PLEFT = PARC (-TCOEF * HALFW, TCOEF) ARCTOT = 2.0 * PARC (TCOEF * HALFW, TCOEF) ARCDEL = ARCTOT/30 @@ -185,17 +163,17 @@ SUBROUTINE LINLEN (MP, COOR, LINKP, KNUM, LNUM, KT, I3, J1, J2, ARCNOW = 0.0 THETA = ATAN2 (COOR (2, J2) -COOR (2, J1) , COOR (1, J2) & - COOR (1, J1) ) -C + C CORRECT FOR ORIENTATION -C + CROSS = (COOR (1, J3) -XMID) * (COOR (2, J2) -COOR (2, J1) )- & (COOR (2, J3) -YMID) * (COOR (1, J2) -COOR (1, J1) ) IF (CROSS.LT.0.0) THETA = THETA+PI SINT = SIN (THETA) COST = COS (THETA) -C + C FIND POINTS APPROXIMATELY BY INTEGRATION -C + XL = -HALFW FL = SQRT (1.0+ (TCOEF * XL) ** 2) KOUNT = 1 @@ -209,47 +187,47 @@ SUBROUTINE LINLEN (MP, COOR, LINKP, KNUM, LNUM, KT, I3, J1, J2, ARCOLD = ARCNOW ARCNOW = ARCNOW+DELX * (FL+4.0 * FM+FR) / 3.0 IF (ARCNOW.GE.ARCNXT) THEN -C + C COMPUTE POSITION IN LOCAL COORDINATE SYSTEM -C + FRAC = (ARCNXT-ARCOLD) / (ARCNOW-ARCOLD) XK = XL+FRAC * 2.0 * DELX YK = COEF * XK ** 2 -C + C CORRECT FOR ORIENTATION PROBLEM -C + IF (CROSS.LT.0.0) XK = -XK -C + C ROTATE IN LINE WITH GLOBAL COORDINATE SYSTEM -C + ROTX = XK * COST - YK * SINT ROTY = YK * COST + XK * SINT -C + C RESTORE XK -C + IF (CROSS.LT.0.0) XK = -XK -C + C TRANSLATE -C + XEND = ROTX+COOR (1, J3) YEND = ROTY+COOR (2, J3) DIST = DIST+SQRT ((XEND-XSTART) ** 2 + (YEND-YSTART) **2) KOUNT = KOUNT+1 XSTART = XEND YSTART = YEND -C + C PREPARE FOR NEXT POINT -C + IF (KOUNT.GE.29) GOTO 130 ARCNXT = ARCNXT+ARCDEL -C + C RESTART INTEGRATION -C + XR = XK FR = SQRT (1.0+ (TCOEF * XR) ** 2) -C + C CORRECT FOR INTEGRATION ERROR -C + ARCNOW = PARC (TCOEF * XR, TCOEF) -PLEFT ENDIF XL = XR @@ -260,13 +238,13 @@ SUBROUTINE LINLEN (MP, COOR, LINKP, KNUM, LNUM, KT, I3, J1, J2, YEND = COOR (2, J2) DIST = DIST+SQRT ((XEND-XSTART) ** 2+ (YEND-YSTART) ** 2) ENDIF -C + C NORMAL EXIT -C + ERR = .FALSE. RETURN -C + 10000 FORMAT (' ZERO LINE LENGTH ENCOUNTERED FOR LINE', I5) 10030 FORMAT (' POINTS GIVEN FOR LINE', I5, ' DO NOT DEFINE A PARABOLA') -C + END diff --git a/packages/seacas/applications/fastq/list.f b/packages/seacas/applications/fastq/list.f index c20c1bdc64a4..ed815364b0bc 100644 --- a/packages/seacas/applications/fastq/list.f +++ b/packages/seacas/applications/fastq/list.f @@ -1,36 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: list.f,v 1.4 2000/11/13 15:39:04 gdsjaar Exp $ -C $Log: list.f,v $ -C Revision 1.4 2000/11/13 15:39:04 gdsjaar -C Cleaned up unused variables and labels. -C -C Removed some real to int conversion warnings. -C -C Revision 1.3 1998/07/14 18:19:18 gdsjaar -C Removed unused variables, cleaned up a little. -C -C Changed BLUE labels to GREEN to help visibility on black background -C (indirectly requested by a couple users) -C -C Revision 1.2 1998/07/13 16:49:34 gdsjaar -C Added missing commas to format statements -C -C Revision 1.1.1.1 1990/11/30 11:11:16 gdsjaar -C FASTQ Version 2.0X -C -c Revision 1.1 90/11/30 11:11:14 gdsjaar -c Initial revision -c -CC* FILE: [.MAIN]LIST.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE LIST (MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CIN, RIN, & IIN, KIN, N, IPOINT, COOR, IPBOUN, ILINE, LTYPE, NINT, FACTOR, & LCON, ILBOUN, ISBOUN, ISIDE, NLPS, IFLINE, ILLIST, IBARST, @@ -42,27 +15,27 @@ SUBROUTINE LIST (MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CIN, RIN, & DEFSCH, DEFSIZ, TITLE, OPTIM, THREE, EIGHT, NINE, VAXVMS, & WROTE, TIME1, VERSN, BATCH) C*********************************************************************** -C + C SUBROUTINE LIST = LISTS POINTS, LINES, REGIONS, SCHEMES, AND BOUNDARY C DEFINITIONS -C + C*********************************************************************** -C + C SUBROUTINE CALLED BY: C FASTQ = A PROGRAM TO QUICKLY PREPARE QMESH INPUT -C + C*********************************************************************** -C + C SUBROUTINES CALLED: C CHECK = CHECKS 2 VALUES FOR BEING OUT OF PRESCRIBED BOUNDS -C + C*********************************************************************** -C + C VARIABLES USED: C IANS = LOGICAL RESPONSE FROM YES-NO QUESTION -C + C*********************************************************************** -C + DIMENSION IPOINT(MP), COOR(2, MP), IPBOUN(MP) DIMENSION ILINE(ML), LTYPE(ML), NINT(ML), FACTOR(ML), LCON(3, ML) DIMENSION ILBOUN(ML), ISBOUN(ML) @@ -81,17 +54,17 @@ SUBROUTINE LIST (MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CIN, RIN, DIMENSION IFHOLE(MR), NHPR(MR), IHLIST(MR*2), IRGFLG(MR) DIMENSION NUMBER(MSC), N(29) DIMENSION KIN(MCOM), CIN(MCOM), IIN(MCOM), RIN(MCOM) -C + CHARACTER*72 SCHEME, DEFSCH, CIN, DUMMY*10, VERSN*9 CHARACTER*72 TITLE, NUMBER*80, CHOICE*7 -C + LOGICAL IANS, OPTIM, ADDLNK, EIGHT, NINE, VAXVMS, WROTE, BATCH LOGICAL LGROUP, THREE -C + IZ = 0 ADDLNK = .FALSE. BATCH = .FALSE. -C + 100 CONTINUE IF (ICOM .GT. JCOM) THEN CALL MESAGE (' ') @@ -99,9 +72,9 @@ SUBROUTINE LIST (MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CIN, RIN, & KIN, CIN, IIN, RIN) ICOM = 1 END IF -C + C LIST OUT THE POINTS -C + IF ((CIN(ICOM)(1:1) .EQ. 'P') .OR. (CIN(ICOM)(1:1) .EQ. 'p')) THEN ICOM = ICOM+1 IF (N(1) .GT. 0) THEN @@ -141,9 +114,9 @@ SUBROUTINE LIST (MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CIN, RIN, CALL MESAGE ('*-----------------------------------*') END IF 120 CONTINUE -C + C LIST OUT THE LINES -C + ELSE IF ((CIN(ICOM)(1:1) .EQ. 'L') .OR. & (CIN(ICOM)(1:1) .EQ. 'l')) THEN ICOM = ICOM+1 @@ -189,9 +162,9 @@ SUBROUTINE LIST (MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CIN, RIN, CALL MESAGE ('*----------------------------------*') END IF 140 CONTINUE -C + C LIST OUT THE SIDES -C + ELSE IF ((CIN(ICOM)(1:2) .EQ. 'SI') .OR. & (CIN(ICOM)(1:2) .EQ. 'si')) THEN ICOM = ICOM+1 @@ -242,16 +215,16 @@ SUBROUTINE LIST (MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CIN, RIN, CALL MESAGE ('*----------------------------------*') END IF 170 CONTINUE -C + C SPAWN A PROCESS -C + ELSE IF ((CIN(ICOM)(1:2) .EQ. 'SP') .OR. & (CIN(ICOM)(1:2) .EQ. 'sp')) THEN ICOM = ICOM+1 CALL SPAWN(VAXVMS) -C + C LIST OUT SCHEMES -C + ELSE IF ((CIN(ICOM)(1:1) .EQ. 'S') .OR. & (CIN(ICOM)(1:1) .EQ. 's')) THEN ICOM = ICOM+1 @@ -297,9 +270,9 @@ SUBROUTINE LIST (MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CIN, RIN, CALL MESAGE (' ') END IF 190 CONTINUE -C + C LIST OUT THE BAR SETS -C + ELSE IF ((CIN(ICOM)(1:2) .EQ. 'BA') .OR. & (CIN(ICOM)(1:2) .EQ. 'ba')) THEN ICOM = ICOM+1 @@ -352,9 +325,9 @@ SUBROUTINE LIST (MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CIN, RIN, CALL MESAGE ('*-------------------------------------*') END IF 220 CONTINUE -C + C LIST OUT THE RENUMBERING CARDS -C + ELSE IF ((CIN(ICOM)(1:3) .EQ. 'REN') .OR. & (CIN(ICOM)(1:3) .EQ. 'ren')) THEN ICOM = ICOM+1 @@ -386,9 +359,9 @@ SUBROUTINE LIST (MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CIN, RIN, & ('*-------------------------------------------*') CALL MESAGE (' ') END IF -C + C LIST OUT THE REGIONS -C + ELSE IF ((CIN(ICOM)(1:1) .EQ. 'R') .OR. & (CIN(ICOM)(1:1) .EQ. 'r')) THEN ICOM = ICOM+1 @@ -460,9 +433,9 @@ SUBROUTINE LIST (MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CIN, RIN, CALL MESAGE ('*------------------------------------*') END IF 280 CONTINUE -C + C LIST OUT THE GROUPS -C + ELSE IF ((CIN(ICOM)(1:1) .EQ. 'G') .OR. & (CIN(ICOM)(1:1) .EQ. 'g')) THEN ICOM = ICOM+1 @@ -522,9 +495,9 @@ SUBROUTINE LIST (MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CIN, RIN, CALL MESAGE ('*-----------------------------------*') END IF 330 CONTINUE -C + C LIST OUT THE HOLES -C + ELSE IF ((CIN(ICOM)(1:2) .EQ. 'HO') .OR. & (CIN(ICOM)(1:2) .EQ. 'ho')) THEN ICOM = ICOM+1 @@ -578,9 +551,9 @@ SUBROUTINE LIST (MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CIN, RIN, CALL MESAGE ('*----------------------------------*') END IF 360 CONTINUE -C + C LIST OUT THE REGIONS IN THE BODY -C + ELSE IF ((CIN(ICOM)(1:3) .EQ. 'BOD') .OR. & (CIN(ICOM)(1:3) .EQ. 'bod')) THEN ICOM = ICOM+1 @@ -598,9 +571,9 @@ SUBROUTINE LIST (MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CIN, RIN, ICOM = ICOM+1 CALL MESAGE (' ') RETURN -C + C LIST OUT BOUNDARY CONDITIONS -C + ELSE IF ((CIN(ICOM)(1:1) .EQ. 'B') .OR. & (CIN(ICOM)(1:1) .EQ. 'b')) THEN ICOM = ICOM+1 @@ -614,9 +587,9 @@ SUBROUTINE LIST (MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CIN, RIN, CHOICE = 'ELEMENT' CALL LISTBF(ML, N(27), CHOICE, LINKSB, ISBF, NSPF, IFSB, & LISTSB, IWTSBF) -C + C LIST OUT THE THREE NODE QUAD GENERATION FLAG -C + ELSE IF ((CIN(ICOM)(1:1) .EQ. 'T') .OR. & (CIN(ICOM)(1:1) .EQ. 't')) THEN ICOM = ICOM+1 @@ -633,9 +606,9 @@ SUBROUTINE LIST (MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CIN, RIN, CALL MESAGE ('*---------------------------------------*') CALL MESAGE (' ') END IF -C + C LIST OUT THE EIGHT NODE QUAD GENERATION FLAG -C + ELSE IF ((CIN(ICOM)(1:2) .EQ. 'EI') .OR. & (CIN(ICOM)(1:2) .EQ. 'ei')) THEN ICOM = ICOM+1 @@ -652,9 +625,9 @@ SUBROUTINE LIST (MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CIN, RIN, CALL MESAGE ('*---------------------------------------*') CALL MESAGE (' ') END IF -C + C LIST OUT THE NINE NODE QUAD GENERATION FLAG -C + ELSE IF ((CIN(ICOM)(1:1) .EQ. 'N') .OR. & (CIN(ICOM)(1:1) .EQ. 'n')) THEN ICOM = ICOM+1 @@ -671,9 +644,9 @@ SUBROUTINE LIST (MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CIN, RIN, CALL MESAGE ('*--------------------------------------*') CALL MESAGE (' ') END IF -C + C EXIT OPTION - EXITS FASTQ -C + ELSE IF ((CIN(ICOM)(1:2) .EQ. 'EX') .OR. & (CIN(ICOM)(1:2) .EQ. 'ex')) THEN ICOM = ICOM+1 @@ -686,16 +659,16 @@ SUBROUTINE LIST (MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CIN, RIN, & TIME1, BATCH, VERSN) ENDIF GO TO 100 -C + C PRINT HELP MESAGE -C + ELSE ICOM = ICOM+1 CALL HELP_FQ(4) -C + END IF GO TO 100 -C + 10000 FORMAT( & ' POINT X(R) Y(Z) BOUNDARY',/, & ' NO. COORDINATE COORDINATE FLAG',/, @@ -744,5 +717,5 @@ SUBROUTINE LIST (MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CIN, RIN, & ' ----- -------------------------------------------') 10230 FORMAT(1X, I5, 2X, A72) 10240 FORMAT(8X, A8) -C + END diff --git a/packages/seacas/applications/fastq/listbf.f b/packages/seacas/applications/fastq/listbf.f index e8f5ccacc23f..ef954f216648 100644 --- a/packages/seacas/applications/fastq/listbf.f +++ b/packages/seacas/applications/fastq/listbf.f @@ -1,58 +1,33 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: listbf.f,v 1.4 1998/07/14 18:19:20 gdsjaar Exp $ -C $Log: listbf.f,v $ -C Revision 1.4 1998/07/14 18:19:20 gdsjaar -C Removed unused variables, cleaned up a little. -C -C Changed BLUE labels to GREEN to help visibility on black background -C (indirectly requested by a couple users) -C -C Revision 1.3 1998/07/14 17:42:17 gdsjaar -C *** empty log message *** -C -C Revision 1.2 1998/04/16 05:06:44 gdsjaar -C Changed "X" to "1X" in format statement -C -C Revision 1.1.1.1 1990/11/30 11:11:20 gdsjaar -C FASTQ Version 2.0X -C -c Revision 1.1 90/11/30 11:11:19 gdsjaar -c Initial revision -c -CC* FILE: [.MAIN]LISTBF.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE LISTBF (MDIM, N, CHOICE, LINK, IFLAG, INUM, IFIRST, & LIST, IWT) C*********************************************************************** -C + C SUBROUTINE LISTBF = LISTS BOUNDARY CONDITIONS BY FLAG NUMBERS -C + C*********************************************************************** -C + C SUBROUTINE CALLED BY: C LIST = LISTS POINTS, LINES, REGIONS, SCHEMES, AND BOUNDARY C DEFINITIONS -C + C*********************************************************************** -C + DIMENSION LINK (2, MDIM), IFLAG (MDIM), INUM (MDIM), IFIRST (MDIM) DIMENSION LIST (2, MDIM), IWT (3, MDIM) -C + CHARACTER CHOICE*7 -C + LOGICAL ADDLNK, EXTRA, FOUND -C + ADDLNK = .FALSE. FOUND = .FALSE. -C + IF (CHOICE (1:5) .EQ. 'POINT') THEN WRITE (*, 10000) ENDIF @@ -119,7 +94,7 @@ SUBROUTINE LISTBF (MDIM, N, CHOICE, LINK, IFLAG, INUM, IFIRST, WRITE (*, 10050) CHOICE ENDIF RETURN -C + 10000 FORMAT (' FLAG BOUN. WEIGHT FIRST FIRST', /, & ' NUMBER TYPE SIDE WT PNT WT LIN POINT OR LINE '// & 'LISTING', /, ' ------ -------- ------ ------ ------ ', diff --git a/packages/seacas/applications/fastq/llist.f b/packages/seacas/applications/fastq/llist.f index e9b058b055f3..0329e3e37e52 100644 --- a/packages/seacas/applications/fastq/llist.f +++ b/packages/seacas/applications/fastq/llist.f @@ -1,55 +1,44 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: llist.f,v 1.1 1990/11/30 11:11:21 gdsjaar Exp $ -C $Log: llist.f,v $ -C Revision 1.1 1990/11/30 11:11:21 gdsjaar -C Initial revision -C -C -CC* FILE: [.QMESH]LLIST.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE LLIST (MS, ML, MAXNL, NS, NL, KNUM, LISTL, ILINE, & ISIDE, NLPS, IFLINE, ILLIST, LCON, ISLIST, LINKS, LINKL, ERR) C*********************************************************************** -C + C SUBROUTINE LLIST = PRODUCE LIST OF LINES FOR REGION -C + C*********************************************************************** -C + C SUBROUTINE CALLED BY: C PERIM = GENERATES PERIMETER OF THE REGION -C + C*********************************************************************** -C + C PRODUCE THE LIST OF (PHYSICAL INDICES OF) LINES FOR (PHYSICAL) C REGION KREG. THIS LIST IS (LISTL (I), I=1, NL). C *BACKWARDS* SIDES WILL BE REVERSED. C IT IS ASSUMED LINES ARE PROPERLY LISTED IN ORDER ON SIDE CARDS. C IF THEY ARE NOT, PERIM WILL DIAGNOSE IT. C ERR = .TRUE. IF ERRORS WERE ENCOUNTERED. -C + C*********************************************************************** -C + DIMENSION ILINE (ML), LCON (3, ML) DIMENSION ISIDE (MS), NLPS (MS), IFLINE (MS), ILLIST (MS * 3) DIMENSION ISLIST (NS), LISTL (MAXNL) DIMENSION LINKL (2, ML), LINKS (2, MS) -C + LOGICAL ERR, ADDLNK -C + ERR = .TRUE. ADDLNK = .FALSE. IS = ISLIST (1) -C + C FIRST SIDE -C + IF (IS .EQ. 0) THEN RETURN ELSEIF (IS .LT. 0) THEN @@ -74,9 +63,9 @@ SUBROUTINE LLIST (MS, ML, MAXNL, NS, NL, KNUM, LISTL, ILINE, ERR = .FALSE. RETURN ENDIF -C + C SECOND SIDE -C + IS2 = ISLIST (2) IF (IS2 .EQ. 0) THEN RETURN @@ -90,9 +79,9 @@ SUBROUTINE LLIST (MS, ML, MAXNL, NS, NL, KNUM, LISTL, ILINE, IFL2 = ILLIST (I1) ILL2 = ILLIST (I2) ENDIF -C + C DECIDE WHICH END OF SIDE ONE IS THE STARTING POINT -C + CALL LTSORT (ML, LINKL, IFL2, IPNTR, ADDLNK) K1 = LCON (1, IPNTR) K2 = LCON (2, IPNTR) @@ -105,23 +94,23 @@ SUBROUTINE LLIST (MS, ML, MAXNL, NS, NL, KNUM, LISTL, ILINE, CALL LTSORT (ML, LINKL, ILL1, IPNTR, ADDLNK) J3 = LCON (1, IPNTR) J4 = LCON (2, IPNTR) -C + C FIRST SIDE IN PROPER ORDER -C + IF ( (J3 .EQ. K1) .OR. (J3 .EQ. K2) .OR. (J3 .EQ. K3) & .OR. (J3 .EQ. K4) .OR. (J4 .EQ. K1) .OR. (J4 .EQ. K2) & .OR. (J4 .EQ. K3) .OR. (J4 .EQ. K4)) THEN CONTINUE -C + C FIRST SIDE NEEDS REVERSED -C + ELSEIF ( (J1 .EQ. K1) .OR. (J1 .EQ. K2) .OR. (J1 .EQ. K3) & .OR. (J1 .EQ. K4) .OR. (J2 .EQ. K1) .OR. (J2 .EQ. K2) & .OR. (J2 .EQ. K3) .OR. (J2 .EQ. K4)) THEN CALL IREVER (LISTL, NEW) -C + C CONNECTIVITY DOES NOT EXIST -C + ELSE IF (IS2 .GT. 0) THEN CALL LTSORT (MS, LINKS, IS2, IPNTR, ADDLNK) @@ -132,7 +121,7 @@ SUBROUTINE LLIST (MS, ML, MAXNL, NS, NL, KNUM, LISTL, ILINE, ENDIF RETURN ENDIF -C + NL = NEW DO 120 KS = 2, NS I = LISTL (NL) @@ -140,9 +129,9 @@ SUBROUTINE LLIST (MS, ML, MAXNL, NS, NL, KNUM, LISTL, ILINE, J1 = LCON (1, IPNTR) J2 = LCON (2, IPNTR) IS = ISLIST (KS) -C + C ADD NEW LINES TO LIST -C + IF (IS .EQ. 0) THEN RETURN ELSEIF (IS .LT. 0) THEN @@ -162,31 +151,31 @@ SUBROUTINE LLIST (MS, ML, MAXNL, NS, NL, KNUM, LISTL, ILINE, LISTL (NEW) = ILLIST (I) 110 CONTINUE ENDIF -C + C DETERMINE WHETHER THIS SIDE IS BACKWARDS -C + CALL LTSORT (ML, LINKL, IFL, IPNTR, ADDLNK) K1 = LCON (1, IPNTR) K2 = LCON (2, IPNTR) CALL LTSORT (ML, LINKL, ILL, IPNTR, ADDLNK) K3 = LCON (1, IPNTR) K4 = LCON (2, IPNTR) -C + C THIS SIDE IS IN PROPER ORDER -C + IF ( (J1 .EQ. K1) .OR. (J1 .EQ. K2) .OR. (J2 .EQ. K1) & .OR. (J2 .EQ. K2)) THEN CONTINUE -C + C THIS SIDE NEEDS REVERSING -C + ELSEIF ( (J1 .EQ. K3) .OR. (J1 .EQ. K4) .OR. (J2 .EQ. K3) & .OR. (J2 .EQ. K4)) THEN CALL LTSORT (MS, LINKS, IS, IPNTR, ADDLNK) CALL IREVER (LISTL (NL + 1), NLPS (IPNTR)) -C + C CONNECTIVITY DOES NOT EXIST -C + ELSE IF (IS .GT. 0) THEN CALL LTSORT (MS, LINKS, IS, IPNTR, ADDLNK) @@ -197,20 +186,20 @@ SUBROUTINE LLIST (MS, ML, MAXNL, NS, NL, KNUM, LISTL, ILINE, ENDIF RETURN ENDIF -C + NL = NEW -C + 120 CONTINUE -C + C SUCCESSFUL LINE LIST GENERATION -C + ERR = .FALSE. -C + RETURN -C + 10000 FORMAT (' IN REGION', I5, ', SIDE', I5, ' DOES NOT CONNECT TO', & /, ' THE PREVIOUS SECTION OF THE PERIMETER') 10010 FORMAT (' IN REGION', I5, ', LINE', I5, ' DOES NOT CONNECT TO', & /, ' THE PREVIOUS SECTION OF THE PERIMETER') -C + END diff --git a/packages/seacas/applications/fastq/longel.f b/packages/seacas/applications/fastq/longel.f index d61fb9ed1b1e..5b12fd986c90 100644 --- a/packages/seacas/applications/fastq/longel.f +++ b/packages/seacas/applications/fastq/longel.f @@ -1,51 +1,31 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: longel.f,v 1.2 1998/07/14 18:19:21 gdsjaar Exp $ -C $Log: longel.f,v $ -C Revision 1.2 1998/07/14 18:19:21 gdsjaar -C Removed unused variables, cleaned up a little. -C -C Changed BLUE labels to GREEN to help visibility on black background -C (indirectly requested by a couple users) -C -C Revision 1.1.1.1 1990/11/30 11:11:26 gdsjaar -C FASTQ Version 2.0X -C -c Revision 1.1 90/11/30 11:11:24 gdsjaar -c Initial revision -c -C -CC* FILE: [.PAVING]LONGEL.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE LONGEL (MXND, MLN, LNODES, XN, YN, NUID, LXK, KXL, NXL, & LXN, NNN, NAVAIL, IAVAIL, NODE, KELEM, ANG, TOLER, & N1, N2, KREG, XMIN, XMAX, YMIN, YMAX, KKK, LLL, DONE, GRAPH, & VIDEO, NOROOM, ERR, KKKADD) C*********************************************************************** -C + C SUBROUTINE LONGEL = AN ELONGATED ELEMENT OVER 150 DEGREES GETS A C 3 ELEMENT REPLACEMENT FOR THE TWO ELEMENTS THERE -C + C*********************************************************************** -C + DIMENSION LXK(4, MXND), NXL(2, 3*MXND), KXL(2, 3*MXND) DIMENSION LXN(4, MXND), XN(MXND), YN(MXND), NUID(MXND) DIMENSION LNODES (MLN, MXND) DIMENSION NODES(4) -C + LOGICAL NOROOM, ERR, DONE, GRAPH, CCW, VIDEO -C + CCW = .TRUE. -C + C SEE IF THE ANGLE IS WITHIN BOUNDS -C + IF (ANG .GT. TOLER) THEN CALL GNXKA (MXND, XN, YN, KELEM, NODES, AREA, LXK, NXL, CCW) NODE2 = NODES(1) + NODES(2) + NODES(3) + NODES(4) - NODE @@ -60,13 +40,13 @@ SUBROUTINE LONGEL (MXND, MLN, LNODES, XN, YN, NUID, LXK, KXL, NXL, & ((YN (NODE) - YN (N2)) ** 2) ) DMIN = ((DN1 + DN2) * .5) * 1.7 DMAX = (DN1 + DN2) * .5 -C + C SEE IF IT IS A LONG LEGGED BEAST -C + IF ((D12 .GT. DMIN) .OR. (D22 .GT. DMIN)) THEN -C + C FIND L1, L2, L3, AND L4 -C + DO 100 I = 1, 4 LTEST = LXK (I, KELEM) IF ( ((NXL (1, LTEST) .EQ. NODE) .AND. @@ -81,7 +61,7 @@ SUBROUTINE LONGEL (MXND, MLN, LNODES, XN, YN, NUID, LXK, KXL, NXL, ERR = .TRUE. GOTO 250 110 CONTINUE -C + DO 120 I = 1, 4 LTEST = LXK (I, KELEM) IF ( ((NXL (1, LTEST) .EQ. NODE) .AND. @@ -96,7 +76,7 @@ SUBROUTINE LONGEL (MXND, MLN, LNODES, XN, YN, NUID, LXK, KXL, NXL, ERR = .TRUE. GOTO 250 130 CONTINUE -C + DO 140 I = 1, 4 LTEST = LXK (I, KELEM) IF ( ((NXL (1, LTEST) .EQ. NODE2) .AND. @@ -115,7 +95,7 @@ SUBROUTINE LONGEL (MXND, MLN, LNODES, XN, YN, NUID, LXK, KXL, NXL, ERR = .TRUE. GOTO 250 150 CONTINUE -C + DO 160 I = 1, 4 LTEST = LXK (I, KELEM) IF ( ((NXL (1, LTEST) .EQ. NODE2) .AND. @@ -134,18 +114,18 @@ SUBROUTINE LONGEL (MXND, MLN, LNODES, XN, YN, NUID, LXK, KXL, NXL, ERR = .TRUE. GOTO 250 170 CONTINUE -C + C NOW FIND KELEM2 -C + KELEM2 = KXL (1, L4) + KXL (2, L4) - KELEM IF (KELEM2 .EQ. 0) GOTO 250 -C + C NOW FIND NODE3 - THE NODE THAT WILL BE PART OF THE NEWLY C FORMED ELEMENT -C + CALL GNXKA (MXND, XN, YN, KELEM2, NODES, AREA, & LXK, NXL, CCW) -C + IF (D12 .GT. D22) THEN DO 180 I = 1, 4 IF (NODES (I) .EQ. N1) THEN @@ -161,7 +141,7 @@ SUBROUTINE LONGEL (MXND, MLN, LNODES, XN, YN, NUID, LXK, KXL, NXL, ERR = .TRUE. GOTO 250 190 CONTINUE -C + ELSE DO 200 I = 1, 4 IF (NODES (I) .EQ. N2) THEN @@ -178,9 +158,9 @@ SUBROUTINE LONGEL (MXND, MLN, LNODES, XN, YN, NUID, LXK, KXL, NXL, GOTO 250 210 CONTINUE ENDIF -C + C NOW FIND L5 -C + DO 220 I = 1, 4 LTEST = LXK (I, KELEM2) IF (D12 .GT. D22) THEN @@ -205,10 +185,10 @@ SUBROUTINE LONGEL (MXND, MLN, LNODES, XN, YN, NUID, LXK, KXL, NXL, ERR = .TRUE. GOTO 250 230 CONTINUE -C + C NOW CHECK TO SEE IF IT MAKES SENSE TO ADD THE EXTRA ELEMENT TO C IMPROVE AN ELONGATED ONE -C + DL3 = SQRT ( ((XN (NXL (1, L3)) - XN (NXL (2, L3))) ** 2) + & ((YN (NXL (1, L3)) - YN (NXL (2, L3))) ** 2) ) DL4 = SQRT ( ((XN (NXL (1, L4)) - XN (NXL (2, L4))) ** 2) + @@ -216,9 +196,9 @@ SUBROUTINE LONGEL (MXND, MLN, LNODES, XN, YN, NUID, LXK, KXL, NXL, DL5 = SQRT ( ((XN (NXL (1, L5)) - XN (NXL (2, L5))) ** 2) + & ((YN (NXL (1, L5)) - YN (NXL (2, L5))) ** 2) ) IF ((DL3 .GT. DMAX) .OR. (DL5 .GT. DL4)) GOTO 250 -C + C ADD THE EXTRA ELEMENT -C + IF (GRAPH) THEN CALL LCOLOR ('PINK ') DO 240 IL = 1, 4 @@ -250,8 +230,8 @@ SUBROUTINE LONGEL (MXND, MLN, LNODES, XN, YN, NUID, LXK, KXL, NXL, KKKADD = KKK ENDIF ENDIF -C + 250 CONTINUE RETURN -C + END diff --git a/packages/seacas/applications/fastq/lowfnd.f b/packages/seacas/applications/fastq/lowfnd.f index d7816bfb3090..73df92d1b279 100644 --- a/packages/seacas/applications/fastq/lowfnd.f +++ b/packages/seacas/applications/fastq/lowfnd.f @@ -1,32 +1,21 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: lowfnd.f,v 1.1 1990/11/30 11:11:28 gdsjaar Exp $ -C $Log: lowfnd.f,v $ -C Revision 1.1 1990/11/30 11:11:28 gdsjaar -C Initial revision -C -C -CC* FILE: [.QMESH]LOWFND.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE LOWFND (MXND, NUID, N, INDX, I, IOLD) C*********************************************************************** -C + C SUBROUTINE LOWFND = LINEAR INDEXED SEARCH FOR MATCHING NUID VALUES -C + C*********************************************************************** -C + DIMENSION NUID(MXND), INDX(N) -C + IBOT = 1 ITOP = N -C + 100 CONTINUE II = (IBOT + ITOP)/2 IF (NUID(INDX(II)) .EQ. NUID(I)) THEN @@ -38,8 +27,8 @@ SUBROUTINE LOWFND (MXND, NUID, N, INDX, I, IOLD) IBOT = II + 1 ENDIF IF (IBOT .LE. ITOP) GO TO 100 -C + IOLD = 0 RETURN -C + END diff --git a/packages/seacas/applications/fastq/lpntin.f b/packages/seacas/applications/fastq/lpntin.f index 79c82c39d098..1fe798f5d676 100644 --- a/packages/seacas/applications/fastq/lpntin.f +++ b/packages/seacas/applications/fastq/lpntin.f @@ -1,30 +1,19 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: lpntin.f,v 1.1 1990/11/30 11:11:30 gdsjaar Exp $ -C $Log: lpntin.f,v $ -C Revision 1.1 1990/11/30 11:11:30 gdsjaar -C Initial revision -C -C -CC* FILE: [.QMESH]LPNTIN.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C LOGICAL FUNCTION LPNTIN (MAXNP, CX, CY, NPNT, X, Y) C*********************************************************************** -C + C FUNCTION LPNTIN = .TRUE. IF THE POINT IS WITHIN THE PERIMETER -C + C*********************************************************************** -C + LOGICAL IN REAL CX(MAXNP), CY(MAXNP), X, Y -C + I1 = 1 IN = .TRUE. 100 CONTINUE @@ -34,7 +23,7 @@ LOGICAL FUNCTION LPNTIN (MAXNP, CX, CY, NPNT, X, Y) ELSE I2 = I1 + 1 END IF -C + C CHECK FOR VERTICAL LINE IF (ABS(CX(I1) - CX(I2)) .LT. 1.0E-06) THEN IF (CY(I1) .LT. CY(I2)) THEN @@ -42,7 +31,7 @@ LOGICAL FUNCTION LPNTIN (MAXNP, CX, CY, NPNT, X, Y) ELSE IN = X .GT. CX(I2) END IF -C + C CHECK FOR HORIZONTAL LINE ELSE IF (ABS(CY(I1) - CY(I2)) .LT. 1.0E-06) THEN IF (CX(I1) .LT. CX(I2)) THEN @@ -50,7 +39,7 @@ LOGICAL FUNCTION LPNTIN (MAXNP, CX, CY, NPNT, X, Y) ELSE IN = Y .LT. CY(I2) END IF -C + C MUST BE INCLINED LINE ELSE U = (X - CX(I1))/(CX(I2) - CX(I1)) @@ -73,11 +62,11 @@ LOGICAL FUNCTION LPNTIN (MAXNP, CX, CY, NPNT, X, Y) END IF END IF END IF -C + I1 = I1 + 1 GO TO 100 END IF LPNTIN = IN -C + RETURN END diff --git a/packages/seacas/applications/fastq/lswap.f b/packages/seacas/applications/fastq/lswap.f index 095a6a570cec..a9c7abe28f80 100644 --- a/packages/seacas/applications/fastq/lswap.f +++ b/packages/seacas/applications/fastq/lswap.f @@ -1,58 +1,48 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: lswap.f,v 1.1 1990/11/30 11:11:33 gdsjaar Exp $ -C $Log: lswap.f,v $ -C Revision 1.1 1990/11/30 11:11:33 gdsjaar -C Initial revision -C -CC* FILE: [.QMESH]LSWAP.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE LSWAP (MXND, LXK, KXL, K1, L1, K2, L2, ERR) C*********************************************************************** -C + C SUBROUTINE LSWAP = EXCHANGE LINE L1 IN ELEMENT K1 WITH LINE L2 IN C ELEMENT K2 -C + C*********************************************************************** -C + DIMENSION LXK (4, MXND), KXL (2, 3*MXND) -C + LOGICAL ERR ERR = .TRUE. -C + C INSERT L2 FOR L1 -C + DO 130 I = 1, 4 IF (LXK (I, K1) .EQ. L1) THEN LXK (I, K1) = L2 -C + C INSERT L1 FOR L2 -C + DO 120 J = 1, 4 IF (LXK (J, K2) .EQ. L2) THEN LXK (J, K2) = L1 -C + C INSERT K2 FOR K1 -C + DO 110 K = 1, 2 IF (KXL (K, L1) .EQ. K1) THEN KXL (K, L1) = K2 -C + C INSERT K1 FOR K2 -C + DO 100 L = 1, 2 IF (KXL (L, L2) .EQ. K2) THEN KXL (L, L2) = K1 -C + C EVERYTHING INSERTED OK -C + ERR = .FALSE. RETURN ENDIF @@ -70,9 +60,9 @@ SUBROUTINE LSWAP (MXND, LXK, KXL, K1, L1, K2, L2, ERR) ENDIF 130 CONTINUE WRITE ( * , 10000)K1, L1, K2, L2 -C + RETURN -C + 10000 FORMAT (' ERROR IN LSWAP. K1, L1, K2, L2 :', 4I5) -C + END diff --git a/packages/seacas/applications/fastq/ltadd.f b/packages/seacas/applications/fastq/ltadd.f index a5257ad88fa7..82db6bb37255 100644 --- a/packages/seacas/applications/fastq/ltadd.f +++ b/packages/seacas/applications/fastq/ltadd.f @@ -1,59 +1,48 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: ltadd.f,v 1.1 1990/11/30 11:11:37 gdsjaar Exp $ -C $Log: ltadd.f,v $ -C Revision 1.1 1990/11/30 11:11:37 gdsjaar -C Initial revision -C -C -CC* FILE: [.MAIN]LTADD.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE LTADD (MDIM, MDIMO, N, LINK, IHOLD) C*********************************************************************** -C + C SUBROUTINE LTADD = LOOKUP TABLE REINSURTION FOR DATA POINTER ARRAYS -C + C*********************************************************************** -C + C VARIABLES USED: C MDIM = DIMENSION OF LINK ARRAY, AND BASE FOR LOOKUP START C LINK = LOOKUP TABLE ARRAY OF ID'S AND POINTERS C LINK(1,I) = ID VALUE STORED IN I'TH ROW (0 IF EMPTY) C LINK(2,I) = DATA POINTER ASSOCIATED W/THIS I'TH ID VALUE C IHOLD = TEMPORARY LINK ARRAY TO BE USED FOR REINSURRTION -C + C*********************************************************************** -C + DIMENSION LINK(2,MDIM), IHOLD(2,MDIM) -C + LOGICAL ADDLNK -C + ADDLNK=.TRUE. -C + C SORT THROUGH THE ORIGINAL LINK LIST AND LINK VALID ENTRIES IN THE C IHOLD LIST -C + DO 100 I = 1, MDIMO IF ( (LINK(1,I) .NE. 0) .AND. (LINK(2,I) .LE. N) ) & CALL LTSORT (MDIM, IHOLD, IABS(LINK(1,I)), LINK(2,I), & ADDLNK) 100 CONTINUE -C + C TRANSFER THE IHOLD LIST BACK TO THE LINK LIST -C + DO 120 I = 1, MDIM DO 110 J = 1, 2 LINK(J,I) = IHOLD (J, I) 110 CONTINUE 120 CONTINUE -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/ltnew.f b/packages/seacas/applications/fastq/ltnew.f index 105509070d5f..aaf7166d5a3c 100644 --- a/packages/seacas/applications/fastq/ltnew.f +++ b/packages/seacas/applications/fastq/ltnew.f @@ -1,43 +1,32 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: ltnew.f,v 1.1 1990/11/30 11:11:40 gdsjaar Exp $ -C $Log: ltnew.f,v $ -C Revision 1.1 1990/11/30 11:11:40 gdsjaar -C Initial revision -C -C -CC* FILE: [.MAIN]LTNEW.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE LTNEW (MDIM, LINK) C*********************************************************************** -C + C SUBROUTINE LTNEW = LOOKUP TABLE CLEARING FOR DATA POINTER ARRAYS -C + C*********************************************************************** -C + C VARIABLES USED: C MDIM = DIMENSION OF LINK ARRAY, AND BASE FOR LOOKUP START C LINK = LOOKUP TABLE ARRAY OF ID'S AND POINTERS C LINK(1,I) = ID VALUE STORED IN I'TH ROW (0 IF EMPTY) C LINK(2,I) = DATA POINTER ASSOCIATED W/THIS I'TH ID VALUE -C + C*********************************************************************** -C + DIMENSION LINK(2,MDIM) -C + C ZERO OUT THE ID ROW ONLY -C + DO 100 I = 1, MDIM LINK(1,I) = 0 100 CONTINUE -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/ltsort.f b/packages/seacas/applications/fastq/ltsort.f index e4a45a30e995..eed1c2888fe6 100644 --- a/packages/seacas/applications/fastq/ltsort.f +++ b/packages/seacas/applications/fastq/ltsort.f @@ -1,42 +1,16 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C -C See packages/seacas/LICENSE for details - -C $Id: ltsort.f,v 1.3 2000/11/13 15:39:05 gdsjaar Exp $ -C $Log: ltsort.f,v $ -C Revision 1.3 2000/11/13 15:39:05 gdsjaar -C Cleaned up unused variables and labels. -C -C Removed some real to int conversion warnings. -C -C Revision 1.2 1999/06/17 19:02:22 gdsjaar -C Fixed several problems related to holes. In several places, a -C nonpositive integer was being used to index into an array. This seems -C to fix all of those cases. I'm not sure if I fixed the true cause of -C these errors or just the symptom though... -C -C Revision 1.1.1.1 1990/11/30 11:11:44 gdsjaar -C FASTQ Version 2.0X -C -c Revision 1.1 90/11/30 11:11:42 gdsjaar -c Initial revision -c C +C See packages/seacas/LICENSE for details -CC* FILE: [.MAIN]LTSORT.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE LTSORT (MDIM, LINK, ID, IPNTR, ADDLNK) C*********************************************************************** -C + C SUBROUTINE LTSORT = LOOKUP TABLE SORT FOR DATA POINTER ARRAYS -C + C*********************************************************************** -C + C VARIABLES USED: C MDIM = DIMENSION OF LINK ARRAY, AND BASE FOR LOOKUP START C LINK = LOOKUP TABLE ARRAY OF ID'S AND POINTERS @@ -46,27 +20,27 @@ SUBROUTINE LTSORT (MDIM, LINK, ID, IPNTR, ADDLNK) C IPNTR = THE DATA POINTER ASSOCIATED WITH THE ID BEING USED C ADDLNK = .TRUE. IF DATA IS BEING PLACED IN THE LOOKUP TABLE C = .FALSE. IF DATA IS BEING FOUND ONLY -C + C*********************************************************************** -C + DIMENSION LINK (2, MDIM) -C + LOGICAL ADDLNK -C + C CALCULATE THE BEGINNING LOOKUP VALUE -C + if (id .lt. 0) stop 'LTSORT: Internal error' HOLD = DBLE(ID) * 3.1830989 LOOKUP = INT((HOLD - INT (HOLD)) * DBLE(MDIM) + 1) -C + C SET UP THE LOOP TO ONLY SEARCH THROUGH THE TABLE ONCE -C + DO 100 I = 1, MDIM -C + C IF LOOKUP SPOT IS EMPTY THEN FILL AND RETURN IF ADDING AND IPNTR .NE. 0 C OR FLAG IPNTR AS BEING EMPTY AND RETURN IF FINDING -C + IF (LINK (1, LOOKUP) .EQ. 0) THEN IF ( (ADDLNK) .AND. (IPNTR .NE. 0)) THEN LINK (1, LOOKUP) = ID @@ -75,12 +49,12 @@ SUBROUTINE LTSORT (MDIM, LINK, ID, IPNTR, ADDLNK) IPNTR = 0 ENDIF RETURN -C + C IF LOOKUP SLOT IS FULL, CHECK TO SEE IF IT MATCHES THE CURRENT ID C IF IT MATCHES AND IF ADDING, SET THE NEW POINTER (OVERWRITE) C IF IT MATCHES AND IF FINDING, RETURN THE CORRECT POINTER C IF NO MATCH, THEN INCREMENT LOOKUP AND TRY AGAIN IN THE TABLE -C + ELSE IF (ID .EQ. LINK (1, LOOKUP)) THEN IF (ADDLNK) THEN @@ -95,9 +69,9 @@ SUBROUTINE LTSORT (MDIM, LINK, ID, IPNTR, ADDLNK) ENDIF ENDIF 100 CONTINUE -C + C ACT ON THE EXHAUSTED SEARCH -C + IF (ADDLNK) THEN CALL MESAGE ('LOOKUP TABLE OVERFLOW') CALL MESAGE ('SERIOUS DATA PROBLEMS HAVE BEEN CAUSED') @@ -105,5 +79,5 @@ SUBROUTINE LTSORT (MDIM, LINK, ID, IPNTR, ADDLNK) IPNTR = 0 ENDIF RETURN -C + END diff --git a/packages/seacas/applications/fastq/lupang.f b/packages/seacas/applications/fastq/lupang.f index 6ed55560adf9..393e1f11742f 100644 --- a/packages/seacas/applications/fastq/lupang.f +++ b/packages/seacas/applications/fastq/lupang.f @@ -1,63 +1,32 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: lupang.f,v 1.3 2004/01/26 17:28:18 gdsjaar Exp $ -C $Log: lupang.f,v $ -C Revision 1.3 2004/01/26 17:28:18 gdsjaar -C Removed several unused variables from getang subroutine. -C -C Initialized a variable -C -C Revision 1.2 2004/01/22 14:25:22 gdsjaar -C Attempt to fix strange problem on x86_64 AMD Opteron system using -C Portland Group 5.1-3 compilers. The getang function would work -C correctly if compiled with no optimization and in debug mode, but -C would crash if compiled optimized. The location of the crash was not -C in a place that made any sense that something was wrong. -C -C After much trial and error, it was found that adding a 'SAVE' -C statement at the beginning of the file fixed the problem. -C -C Also cleaned out some unused parameters being passed to the function. -C -C Revision 1.1.1.1 1990/11/30 11:11:47 gdsjaar -C FASTQ Version 2.0X -C -c Revision 1.1 90/11/30 11:11:45 gdsjaar -c Initial revision -c -C -CC* FILE: [.PAVING]LUPANG.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE LUPANG (MXND, MLN, XN, YN, ZN, LXK, KXL, NXL, LXN, & NLOOP, ANGLE, LNODES, NSTART, LLL, XMIN, XMAX, YMIN, YMAX, & ZMIN, ZMAX, DEV1, KREG, ERR) C*********************************************************************** -C + C SUROUTINE LUPANG = CALCULATES THE NEW ANGLES FOR ALL NODES IN A LOOP -C + C*********************************************************************** -C + DIMENSION XN (MXND), YN (MXND), ZN(MXND) DIMENSION LXN(4, MXND), NXL(2, 3*MXND) DIMENSION LXK(4, MXND), KXL(2, 3*MXND) DIMENSION ANGLE (MXND), LNODES (MLN, MXND) -C + LOGICAL ERR -C + CHARACTER*3 DEV1 -C + ERR = .FALSE. -C + C LOOP AROUND THE INTERIOR PERIMETER CALCULATING THE NEW C ANGLES -C + N1 = NSTART KOUNT = 0 100 CONTINUE @@ -78,8 +47,8 @@ SUBROUTINE LUPANG (MXND, MLN, XN, YN, ZN, LXK, KXL, NXL, LXN, GOTO 110 ENDIF GOTO 100 -C + 110 CONTINUE RETURN -C + END diff --git a/packages/seacas/applications/fastq/mak2el.f b/packages/seacas/applications/fastq/mak2el.f index 31bce6e96cb6..c9fcc1ece369 100644 --- a/packages/seacas/applications/fastq/mak2el.f +++ b/packages/seacas/applications/fastq/mak2el.f @@ -1,33 +1,22 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: mak2el.f,v 1.1 1990/11/30 11:11:48 gdsjaar Exp $ -C $Log: mak2el.f,v $ -C Revision 1.1 1990/11/30 11:11:48 gdsjaar -C Initial revision -C -C -CC* FILE: [.QMESH]MAK2EL.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE MAK2EL (MP, MXNPER, MXND, NNN0, NNN, KKK, X, Y, NID, & XN, YN, NUID, LXK, COOR, IP3) C*********************************************************************** -C + C SUBROUTINE MAK2EL = GENERATES (ADDS) ELEMENT CONNECTIVITY FOR 2 NODES -C + C*********************************************************************** -C + DIMENSION COOR (2, MP), X (MXNPER), Y (MXNPER), NID (MXNPER) DIMENSION XN (MXND), YN (MXND), NUID (MXND), LXK (4, MXND) -C + C PUT NODES AND NUID'S INTO THE PROPER LOCATIONS -C + KOUNT = 0 DO 100 I = NNN0, NNN-1 KOUNT = KOUNT + 1 @@ -54,13 +43,13 @@ SUBROUTINE MAK2EL (MP, MXNPER, MXND, NNN0, NNN, KKK, X, Y, NID, & ((X2 * X2) + (Y2 * Y2)))) WRITE (*, 10000) KKK ENDIF 100 CONTINUE -C + XN (NNN) = X (KOUNT + 1) YN (NNN) = Y (KOUNT + 1) NUID (NNN) = NID (KOUNT + 1) -C + RETURN -C + 10000 FORMAT (' ** WARNING ** - COLINEAR REFERENCE NODE FOR ELEMENT:', & I5) END diff --git a/packages/seacas/applications/fastq/marksm.f b/packages/seacas/applications/fastq/marksm.f index e89bd60d6f21..8781f87a843f 100644 --- a/packages/seacas/applications/fastq/marksm.f +++ b/packages/seacas/applications/fastq/marksm.f @@ -1,43 +1,32 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: marksm.f,v 1.1 1990/11/30 11:11:51 gdsjaar Exp $ -C $Log: marksm.f,v $ -C Revision 1.1 1990/11/30 11:11:51 gdsjaar -C Initial revision -C -C -CC* FILE: [.PAVING]MARKSM.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE MARKSM (MXND, MLN, LXK, KXL, NXL, LXN, LNODES, NODE, & ERR) C*********************************************************************** -C + C SUBROUTINE MARKSM = MARKS NODES WITHIN 2 LINE CONNECTIONS FROM NODE C FOR SMOOTHING -C + C*********************************************************************** -C + DIMENSION LXK (4, MXND), KXL (2, 3*MXND) DIMENSION NXL (2, 3*MXND), LXN (4, MXND) DIMENSION LNODES (MLN, MXND) DIMENSION L1LIST(20), L2LIST(20) -C + LOGICAL ERR -C + IF (LXN (1, NODE) .LE. 0) GOTO 120 CALL GETLXN (MXND, LXN, NODE, L1LIST, NL1, ERR) IF (ERR) THEN CALL MESAGE ('** PROBLEMS IN MARKSM FINDING LXN **') GOTO 120 ENDIF -C + LNODES (4, NODE) = - IABS (LNODES (4, NODE)) DO 110 I = 1, NL1 NODE2 = NXL (1, L1LIST (I)) + NXL (2, L1LIST (I)) - NODE @@ -52,8 +41,8 @@ SUBROUTINE MARKSM (MXND, MLN, LXK, KXL, NXL, LXN, LNODES, NODE, LNODES (4, NODE1) = - IABS (LNODES (4, NODE1)) 100 CONTINUE 110 CONTINUE -C + 120 CONTINUE RETURN -C + END diff --git a/packages/seacas/applications/fastq/match2.f b/packages/seacas/applications/fastq/match2.f index 323f6fe8a0ff..af6956f3f807 100644 --- a/packages/seacas/applications/fastq/match2.f +++ b/packages/seacas/applications/fastq/match2.f @@ -1,44 +1,33 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: match2.f,v 1.1 1990/11/30 11:11:53 gdsjaar Exp $ -C $Log: match2.f,v $ -C Revision 1.1 1990/11/30 11:11:53 gdsjaar -C Initial revision -C -C -CC* FILE: [.PAVING]MATCH2.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE MATCH2 (MXND, MLN, XN, YN, NXL, LXN, LNODES, ANGLE, & N0, N1, N2, N3, N0TEST, N1TEST, N2TEST, N3TEST, I1, I2, & J1, J2, KOUNTL, LMATCH, KOUNT2, NODE, U, W, NLOOP, PMATCH, ERR) C*********************************************************************** -C + C SUBROUTINE MATCH2 = MATCHES UP THE BEST PAIR OF LINES FOR COLLAPSING -C + C*********************************************************************** -C + DIMENSION XN (MXND), YN (MXND), NXL (2, 3*MXND), LXN (4, MXND) DIMENSION ANGLE (MXND), LNODES (MLN, MXND) -C + LOGICAL LMATCH, CORNP, SIDEP, BWINS, FWINS, MATCHK, ERR, PMATCH -C + ERR = .FALSE. LMATCH = .TRUE. BWINS = .FALSE. FWINS = .FALSE. -C + C MAKE SURE THAT AN ODD NUMBER OR SMALL NUMBER IN A LOOP HAS NOT BEEN C CUT OFF, AND IF IT HAS ADJUST THE INTERSECTION ACCORDINGLY. -C + C FIRST CHECK A 2 NODE LOOP - A HIGHLY UNLIKELY CONDITION -C + IF (PMATCH) THEN I1 = N1 I2 = N2 @@ -70,13 +59,13 @@ SUBROUTINE MATCH2 (MXND, MLN, XN, YN, NXL, LXN, LNODES, ANGLE, LMATCH = .FALSE. GOTO 100 ENDIF -C + C NEXT CHECK A 3 NODE LOOP - THIS IS A MUCH MORE PLAUSIBLE CONDITION -C + ELSEIF (KOUNT2 .EQ. 3) THEN -C + C CHECK FOR A 3-1 SEMICIRCLE BEING FORMED EITHER WAY -C + IF ( ( CORNP (ANGLE (N2)) ) .AND. & ( LXN (4, N2) .NE. 0) .AND. & ( SIDEP (ANGLE (N3)) ) ) THEN @@ -93,9 +82,9 @@ SUBROUTINE MATCH2 (MXND, MLN, XN, YN, NXL, LXN, LNODES, ANGLE, J1 = N2TEST J2 = N3TEST KOUNTL = 2 -C + C JUST PUT IT AT TWO NODES LEFT -C + ELSE I1 = N1 I2 = N2 @@ -103,21 +92,21 @@ SUBROUTINE MATCH2 (MXND, MLN, XN, YN, NXL, LXN, LNODES, ANGLE, J2 = N2TEST KOUNTL = 2 ENDIF -C + C NODE LOOP FOR AN EVEN NUMBER OF SPLITS - THE MATCH IS C NOT FINE, SO A SHIFT ONE WAY OR THE OTHER IS NEEDED -C + ELSEIF (MOD (KOUNT2, 2) .EQ. 0) THEN I1 = N1 I2 = N2 -C + XI = XN (I2) - XN (I1) YI = YN (I2) - YN (I1) XJF = XN (N2TEST) - XN (N3TEST) YJF = YN (N2TEST) - YN (N3TEST) XJB = XN (N0TEST) - XN (N1TEST) YJB = YN (N0TEST) - YN (N1TEST) -C + FDOT = ( (XI * XJF) + (YI * YJF) ) / & ( SQRT ( (XI * XI) + (YI * YI) ) * & SQRT ( (XJF * XJF) + (YJF * YJF) ) ) @@ -126,7 +115,7 @@ SUBROUTINE MATCH2 (MXND, MLN, XN, YN, NXL, LXN, LNODES, ANGLE, D2F = SQRT ( (XN (N3TEST) - XN (I1)) ** 2 + & (YN (N3TEST) - YN (I1)) ** 2 ) DF = (D1F + D2F) * .5 -C + BDOT = ( (XI * XJB) + (YI * YJB) ) / & ( SQRT ( (XI * XI) + (YI * YI) ) * & SQRT ( (XJB * XJB) + (YJB * YJB) ) ) @@ -135,11 +124,11 @@ SUBROUTINE MATCH2 (MXND, MLN, XN, YN, NXL, LXN, LNODES, ANGLE, D2B = SQRT ( (XN (N1TEST) - XN (I1)) ** 2 + & (YN (N1TEST) - YN (I1)) ** 2 ) DB = (D1B + D2B) * .5 -C + C NOW COMPARE A FORWARD OR BACKWARD SHIFT AND PICK THE MOST C APPROPRIATE ONE BASED ON ANGLE COSINE AND END DISTANCES C IF ANY STICK OUT AS THE MOST APPROPRIATE -C + IF ((FDOT .GT. BDOT) .AND. (DF .LE. DB)) THEN J1 = N2TEST J2 = N3TEST @@ -160,10 +149,10 @@ SUBROUTINE MATCH2 (MXND, MLN, XN, YN, NXL, LXN, LNODES, ANGLE, J2 = N1TEST KOUNTL = KOUNT2 - 2 ENDIF -C + C NONE STICK OUT AS THE OVIOUS WINNER - TAKE ONE BASED ON C INTERSECTION PORTIONS -C + ELSE IF (U .LT. .5) THEN IF ((W .LT. .5) .AND. (KOUNT2 .GT. 4)) THEN @@ -187,9 +176,9 @@ SUBROUTINE MATCH2 (MXND, MLN, XN, YN, NXL, LXN, LNODES, ANGLE, ENDIF ENDIF ENDIF -C + C NODE LOOP FOR AN ODD NUMBER OF SPLITS - THE MATCH IS FINE -C + ELSE I1 = N1 I2 = N2 @@ -197,23 +186,23 @@ SUBROUTINE MATCH2 (MXND, MLN, XN, YN, NXL, LXN, LNODES, ANGLE, J2 = N2TEST KOUNTL = KOUNT2 - 1 ENDIF -C + C NOW THAT THE INITIAL MATCH IS MADE, CHECK MOVING BOTH SIDES C FORWARD OR BACKWARD ONE NOTCH AND SEE IF THAT MATCH MAKES MORE SENSE C THEN THE CURRENT MATCH -C + IFOR1 = I2 IFOR2 = LNODES (3, I2) IBAC1 = LNODES (2, I1) IBAC2 = I1 -C + JFOR1 = J1 JFOR2 = LNODES (2, J1) JBAC1 = LNODES (3, J2) JBAC2 = J2 -C + C NOW CALCULATE THE CROSS PRODUCT AND END DISTANCES -C + XIF = XN (IFOR2) - XN (IFOR1) YIF = YN (IFOR2) - YN (IFOR1) XJF = XN (JFOR2) - XN (JFOR1) @@ -226,7 +215,7 @@ SUBROUTINE MATCH2 (MXND, MLN, XN, YN, NXL, LXN, LNODES, ANGLE, D2F = SQRT ( (XN (IFOR2) - XN (JFOR2)) ** 2 + & (YN (IFOR2) - YN (JFOR2)) ** 2 ) DF = (D1F + D2F) * .5 -C + XIB = XN (IBAC2) - XN (IBAC1) YIB = YN (IBAC2) - YN (IBAC1) XJB = XN (JBAC2) - XN (JBAC1) @@ -239,7 +228,7 @@ SUBROUTINE MATCH2 (MXND, MLN, XN, YN, NXL, LXN, LNODES, ANGLE, D2B = SQRT ( (XN (IBAC2) - XN (JBAC2)) ** 2 + & (YN (IBAC2) - YN (JBAC2)) ** 2 ) DB = (D1B + D2B) * .5 -C + XI = XN (I2) - XN (I1) YI = YN (I2) - YN (I1) XJ = XN (J1) - XN (J2) @@ -252,9 +241,9 @@ SUBROUTINE MATCH2 (MXND, MLN, XN, YN, NXL, LXN, LNODES, ANGLE, D2 = SQRT ( (XN (I2) - XN (J1)) ** 2 + & (YN (I2) - YN (J1)) ** 2 ) D0 = (D1 + D2) * .5 -C + C NOW COMPARE TO SEE IF ANOTHER COMBINATION MAKES BETTER SENSE -C + IF ( ( ((FDOT .GT. DOT) .AND. (DF .LT. D0)) .OR. & ((.6 * FDOT .GT. DOT) .AND. (DF * .7 .LT. D0)) .OR. & ((.2 * FDOT .GT. DOT) .AND. (DF * .5 .LT. D0)) ) .AND. @@ -269,7 +258,7 @@ SUBROUTINE MATCH2 (MXND, MLN, XN, YN, NXL, LXN, LNODES, ANGLE, & (NLOOP - KOUNTL - 2 .GT. 4) ) THEN BWINS = .TRUE. ENDIF -C + IF (BWINS) THEN I1 = IBAC1 I2 = IBAC2 @@ -283,15 +272,15 @@ SUBROUTINE MATCH2 (MXND, MLN, XN, YN, NXL, LXN, LNODES, ANGLE, J2 = JFOR1 KOUNTL = KOUNTL - 2 ENDIF -C + C NOW CHECK THAT TWO BOUNDARY LINES OR LINES CONNECTED TO THE C BOUNDARY ARE NOT BEING JOINED INAPPROPRIATELY -C + IF (MATCHK (MXND, I1, I2, J1, J2, LXN)) THEN CONTINUE -C + C TRY THE CURRENT I'S AND J'2 REVERSED -C + ELSEIF (MATCHK (MXND, J1, J2, I1, I2, LXN)) THEN I1HOLD = I1 I2HOLD = I2 @@ -301,19 +290,19 @@ SUBROUTINE MATCH2 (MXND, MLN, XN, YN, NXL, LXN, LNODES, ANGLE, J2 = I2HOLD KOUNTL = NLOOP - KOUNTL - 2 ELSE -C + C TRY ONE STEP FORWARD AND BACKWARDS (NORMAL AND I'S AND J'S REVERSED) -C + IFOR1 = I2 IFOR2 = LNODES (3, I2) JFOR1 = J1 JFOR2 = LNODES (2, J1) -C + IBAC1 = LNODES (2, I1) IBAC2 = I1 JBAC1 = LNODES (3, J2) JBAC2 = J2 -C + IF (MATCHK (MXND, IFOR1, IFOR2, JFOR2, JFOR1, LXN)) THEN I1 = IFOR1 I2 = IFOR2 @@ -342,11 +331,11 @@ SUBROUTINE MATCH2 (MXND, MLN, XN, YN, NXL, LXN, LNODES, ANGLE, ERR = .TRUE. GOTO 100 ENDIF -C + ENDIF -C + 100 CONTINUE -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/matchk.f b/packages/seacas/applications/fastq/matchk.f index 3cd081c05c0f..163c23bdbf38 100644 --- a/packages/seacas/applications/fastq/matchk.f +++ b/packages/seacas/applications/fastq/matchk.f @@ -1,36 +1,25 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: matchk.f,v 1.1 1990/11/30 11:11:57 gdsjaar Exp $ -C $Log: matchk.f,v $ -C Revision 1.1 1990/11/30 11:11:57 gdsjaar -C Initial revision -C -C -CC* FILE: [.PAVING]MATCHK.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C LOGICAL FUNCTION MATCHK (MXND, I1, I2, J1, J2, LXN) C*********************************************************************** -C + C FUNCTION MATCHK = CHECKS THE CURRENT COLAPSED LINES TO SEE IF THEY C CAN BE JOINED WITHOUT AFFECTING THE BOUNDARY. C I1 & I2 MAY END UP SWITCHED WITH J1 & J2. -C + C*********************************************************************** -C + DIMENSION LXN (4, MXND) -C + IF ( (LXN (2, I1) .LT. 0) .OR. (LXN (2, I2) .LT. 0) .OR. & (LXN (2, J1) .LT. 0) .OR. (LXN (2, J2) .LT. 0) ) THEN -C + C FIRST CHECK FOR COMPLETELY HOOKED BOUNDARY LINES. -C + IF ((LXN (2, J1) .LT. 0) .AND. (LXN (2, J2) .LT. 0)) THEN MATCHK = .FALSE. ELSEIF ( ((LXN (2, I1) .LT. 0) .AND. (LXN (2, J2) .LT. 0)) .OR. @@ -43,7 +32,7 @@ LOGICAL FUNCTION MATCHK (MXND, I1, I2, J1, J2, LXN) ELSE MATCHK = .TRUE. ENDIF -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/mesage.f b/packages/seacas/applications/fastq/mesage.f index 4a164daa9165..9aa6f901f4f7 100644 --- a/packages/seacas/applications/fastq/mesage.f +++ b/packages/seacas/applications/fastq/mesage.f @@ -1,31 +1,25 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: mesage.f,v 1.1 1990/11/30 11:11:59 gdsjaar Exp $ -C $Log: mesage.f,v $ -C Revision 1.1 1990/11/30 11:11:59 gdsjaar -C Initial revision -C -C SUBROUTINE MESAGE (PROMPT) C*********************************************************************** -C + C SUBROUTINE MESAGE = PRINTS A MESSAGE ONTO THE SCREEN -C + C*********************************************************************** -C + CHARACTER * (*) PROMPT -C + IF (PROMPT .EQ. ' ') THEN WRITE (*, 10000) ELSE WRITE (*, 10010)PROMPT ENDIF RETURN -C + 10000 FORMAT ( / ) 10010 FORMAT (' ', A) END diff --git a/packages/seacas/applications/fastq/mesh.f b/packages/seacas/applications/fastq/mesh.f index 1b7476a4ad73..f3bd04610cfc 100644 --- a/packages/seacas/applications/fastq/mesh.f +++ b/packages/seacas/applications/fastq/mesh.f @@ -1,10 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: mesh.f,v 1.15 2005/06/23 20:18:44 gdsjaar Exp $ SUBROUTINE MESH (A, IA, MP, ML, MS, MR, MSC, MA, MCOM, ICOM, JCOM, & CIN, RIN, IIN, KIN, IDUMP, N, IPOINT, COOR, IPBOUN, ILINE, & LTYPE, NINT, FACTOR, LCON, ILBOUN, ISBOUN, ISIDE, NLPS, IFLINE, @@ -18,38 +17,38 @@ SUBROUTINE MESH (A, IA, MP, ML, MS, MR, MSC, MA, MCOM, ICOM, JCOM, & AREACG, LABN, LABE, LABO, LABNB, LABSB, LABM, LABW, WROTE, & TIME1, HARDPL, EXODUSII) C*********************************************************************** -C + C SUBROUTINE MESH = PROCESSES THE MESH AND THEN GRAPHICALLY DISPLAYS C THE MESH -C + C*********************************************************************** -C + C SUBROUTINE CALLED BY: C FASTQ = A PROGRAM TO QUICKLY PREPARE QMESH INPUT -C + C*********************************************************************** -C + C SUBROUTINES CALLED: C QMESH = GENERATES THE MESH C RENUM = ASSIGNS NODAL AND ELEMENT NUMBERS TO THE MESH -C + C*********************************************************************** -C + C VARIABLES USED: C IANS = LOGICAL RESPONSE FROM YES-NO QUESTION C TITLE = MESH TITLE C TALL = CHARACTER HEIGHT SETTING PARAMETER C STEP = .TRUE. IF GENERATION TO BE STEPPED THROUGH INTERACTIVELY C DONE = .TRUE. IF MESH HAS BEEN PROCESSED -C + C*********************************************************************** -C + PARAMETER (MAXNAM = 40, MLINK = 55) include 'exodusII.inc' -C + C DIMENSIONS FOR MESH DEFINING ENTITIES (I.E. POINTS, LINES, ETC.) -C + DIMENSION A(1), IA(1) DIMENSION IPOINT(MP), COOR(2, MP), IPBOUN(MP) DIMENSION ILINE(ML), LTYPE(ML), NINT(ML), FACTOR(ML) @@ -75,17 +74,17 @@ SUBROUTINE MESH (A, IA, MP, ML, MS, MR, MSC, MA, MCOM, ICOM, JCOM, DIMENSION NUMBER(MSC) DIMENSION N(29), K(41), IDEV(2), III(1) DIMENSION KIN(MCOM), IIN(MCOM), RIN(MCOM) -C + CHARACTER*72 SCHEME, DEFSCH, TITLE, DEV1*3, CIN(MCOM) CHARACTER*2048 FNAME CHARACTER*80 NUMBER, HOLD, VERSN*10 -C + LOGICAL OPTIM, STEP, ERR, ALPHA, THREE, EIGHT, NINE LOGICAL AXIS, AREACG, LABE, LABO, LABN, LABNB, LABSB, LABM, LABW LOGICAL ADDLNK, BATCH, VAXVMS, WROTE, HARDPL, LGROUP LOGICAL REMESH, LONG LOGICAL EXODUSII, ISBARS -C + CHARACTER*8 CDUMH, CDUMS INTEGER CMPSIZ @@ -93,9 +92,9 @@ SUBROUTINE MESH (A, IA, MP, ML, MS, MR, MSC, MA, MCOM, ICOM, JCOM, IZ = 0 ADDLNK = .FALSE. REMESH = .FALSE. -C + C ENTER THE MESH OPTION -C + 100 CONTINUE IF (ICOM.GT.JCOM) THEN CALL MESAGE (' ') @@ -103,9 +102,9 @@ SUBROUTINE MESH (A, IA, MP, ML, MS, MR, MSC, MA, MCOM, ICOM, JCOM, & KIN, CIN, IIN, RIN) ICOM = 1 END IF -C + C RETURN FROM MESHING AFTER DELETING THE MESH -C + IF (CIN(ICOM)(1:1) .EQ. ' ') THEN ICOM = ICOM + 1 IF (NPREGN.GT.0) THEN @@ -157,7 +156,7 @@ SUBROUTINE MESH (A, IA, MP, ML, MS, MR, MSC, MA, MCOM, ICOM, JCOM, KKK = 0 END IF RETURN -C + C SPECIFY ExodusI (X1) or ExodusII (X2) database format ELSE IF ((CIN(ICOM)(1:1) .EQ. 'X') .OR. & (CIN(ICOM)(1:1) .EQ. 'x')) THEN @@ -169,9 +168,9 @@ SUBROUTINE MESH (A, IA, MP, ML, MS, MR, MSC, MA, MCOM, ICOM, JCOM, call mesage ('Writing EXODUSI/GENESIS Format') end if ICOM = ICOM + 1 -C + C ENTER THE MESH GRAPHICS OPTION -C + ELSE IF ((CIN(ICOM)(1:1) .EQ. 'G') .OR. & (CIN(ICOM)(1:1) .EQ. 'g')) THEN ICOM = ICOM + 1 @@ -194,9 +193,9 @@ SUBROUTINE MESH (A, IA, MP, ML, MS, MR, MSC, MA, MCOM, ICOM, JCOM, & LABN, LABNB, LABSB, LABM, LABW, IDEV, ALPHA, DEV1, EIGHT, & NINE, VAXVMS, VERSN, WROTE, TIME1, HARDPL, BATCH) END IF -C + C TOGGLE OPTIMIZATION -C + ELSE IF ((CIN(ICOM)(1:1) .EQ. 'O') .OR. & (CIN(ICOM)(1:1) .EQ. 'o')) THEN ICOM = ICOM + 1 @@ -209,9 +208,9 @@ SUBROUTINE MESH (A, IA, MP, ML, MS, MR, MSC, MA, MCOM, ICOM, JCOM, CALL MESAGE (' ') CALL MESAGE ('BANDWIDTH OPTIMIZATION - ENABLED') END IF -C + C TOGGLE THREE NODE BAR ELEMENTS -C + ELSE IF ((CIN(ICOM)(1:1) .EQ. 'T') .OR. & (CIN(ICOM)(1:1) .EQ. 't')) THEN ICOM = ICOM + 1 @@ -225,9 +224,9 @@ SUBROUTINE MESH (A, IA, MP, ML, MS, MR, MSC, MA, MCOM, ICOM, JCOM, CALL MESAGE ('THREE NODE BAR GENERATION - ENABLED') END IF KKK = 0 -C + C TOGGLE EIGHT NODE ELEMENTS -C + ELSE IF ((CIN(ICOM)(1:2) .EQ. 'EI') .OR. & (CIN(ICOM)(1:2) .EQ. 'ei')) THEN ICOM = ICOM + 1 @@ -242,9 +241,9 @@ SUBROUTINE MESH (A, IA, MP, ML, MS, MR, MSC, MA, MCOM, ICOM, JCOM, CALL MESAGE ('EIGHT NODE QUAD GENERATION - ENABLED') END IF KKK = 0 -C + C TOGGLE NINE NODE ELEMENT GENERATION -C + ELSE IF ((CIN(ICOM)(1:2) .EQ. 'NI') .OR. & (CIN(ICOM)(1:2) .EQ. 'ni')) THEN ICOM = ICOM + 1 @@ -259,9 +258,9 @@ SUBROUTINE MESH (A, IA, MP, ML, MS, MR, MSC, MA, MCOM, ICOM, JCOM, CALL MESAGE ('NINE NODE QUAD GENERATION - ENABLED') END IF KKK = 0 -C + C EXIT OPTION - EXITS FASTQ -C + ELSE IF ((CIN(ICOM)(1:2) .EQ. 'EX') .OR. & (CIN(ICOM)(1:2) .EQ. 'ex')) THEN CALL STRLNG (CIN(ICOM), LEN) @@ -281,9 +280,9 @@ SUBROUTINE MESH (A, IA, MP, ML, MS, MR, MSC, MA, MCOM, ICOM, JCOM, & TIME1, BATCH, VERSN) ENDIF GOTO 100 -C + C ENTER LINE INTERVALS -C + ELSE IF ((CIN(ICOM)(1:1) .EQ. 'I') .OR. & (CIN(ICOM)(1:1) .EQ. 'i')) THEN ICOM = ICOM + 1 @@ -306,16 +305,16 @@ SUBROUTINE MESH (A, IA, MP, ML, MS, MR, MSC, MA, MCOM, ICOM, JCOM, & NLPS, IFLINE, ILLIST, LINKL, LINKS, ADDLNK) GOTO 110 END IF -C + C SPAWN A PROCESS -C + ELSE IF ((CIN(ICOM)(1:2) .EQ. 'SP') .OR. & (CIN(ICOM)(1:2) .EQ. 'sp')) THEN ICOM = ICOM + 1 CALL SPAWN (VAXVMS) -C + C ENTER A NEW SIZE FOR A REGION -C + ELSE IF ((CIN(ICOM)(1:2) .EQ. 'SI') .OR. & (CIN(ICOM)(1:2) .EQ. 'si')) THEN ICOM = ICOM + 1 @@ -344,9 +343,9 @@ SUBROUTINE MESH (A, IA, MP, ML, MS, MR, MSC, MA, MCOM, ICOM, JCOM, END IF GO TO 120 END IF -C + C GENERATE THE MESH -C + ELSE IF ((CIN(ICOM)(1:1) .EQ. 'P') .OR. & (CIN(ICOM)(1:1) .EQ. 'p') .OR. & (CIN(ICOM)(1:1) .EQ. 'S') .OR. @@ -374,16 +373,16 @@ SUBROUTINE MESH (A, IA, MP, ML, MS, MR, MSC, MA, MCOM, ICOM, JCOM, STEP = .FALSE. END IF ICOM = ICOM + 1 -C + C OPEN THE TEMPORARY FILE -C + IUNIT = 99 OPEN (UNIT = IUNIT, STATUS = 'scratch', FORM = 'unformatted', & ACCESS = 'sequential') REWIND IUNIT -C + C GENERATE THE MESH -C + IF (NPREGN.GT.0) THEN CALL MDDEL ('IPART') CALL MDDEL ('LSTNBC') @@ -433,9 +432,9 @@ SUBROUTINE MESH (A, IA, MP, ML, MS, MR, MSC, MA, MCOM, ICOM, JCOM, STOP ' ' END IF NPREGN = 0 -C + C SET UP THE ARRAYS FOR ADAPTIVE REMESHING -C + END IF IF (.NOT. REMESH) THEN CALL MDRSRV ('AMESUR', K(31), 1) @@ -458,7 +457,7 @@ SUBROUTINE MESH (A, IA, MP, ML, MS, MR, MSC, MA, MCOM, ICOM, JCOM, STOP ' ' END IF END IF -C + LGROUP = .FALSE. DO 150 I = 1, N(7) IF (IRGFLG(I) .GE. 1) THEN @@ -481,18 +480,12 @@ SUBROUTINE MESH (A, IA, MP, ML, MS, MR, MSC, MA, MCOM, ICOM, JCOM, & A(K(35)), A(K(36)), A(K(37)), A(K(38)), MLINK, NPROLD, & NPNOLD, NPEOLD, NNXK, REMESH, REXMIN, REXMAX, REYMIN, & REYMAX, IDIVIS, SIZMIN, EMAX, EMIN) -C -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/31/90 -CC* MODIFICATION: ADDED ARGUMENTS TO CALL TO QMESH TO PASS MINIMUM -CC** ELEMENT SIZE (SIZMIN) AND GETSIZ PARAMETERS OF -CC** EMIN AND EMAX -C + IF (REMESH) REMESH = .FALSE. IF (NPREGN.GT.0) THEN -C + C SET UP THE NECESSARY DIMENSIONING FOR NUMBERING -C + C A(K(1)) = IPART = ARRAY OF BEGINNING/ENDING ELEMENT NUMBERS/REGION C A(K(2)) = LSTNBC = LIST OF NODAL BOUNDARY CONDITIONS C (REORDERED TO NODES) @@ -544,7 +537,7 @@ SUBROUTINE MESH (A, IA, MP, ML, MS, MR, MSC, MA, MCOM, ICOM, JCOM, C A(K(38)) = BMESUR = AMESUR VALUES AVERAGED AT THE NODES C A(K(31)) = CMESUR = SECOND ADAPTIVE MESHING VARIABLE C A(K(40)) = DMESUR = CMESUR VALUES AVERAGED AT THE NODES -C + IF (EIGHT) THEN NPNBC = NPNBC*2 NPSBC = NPSBC*2 @@ -601,7 +594,7 @@ SUBROUTINE MESH (A, IA, MP, ML, MS, MR, MSC, MA, MCOM, ICOM, JCOM, CALL MDEROR (6) STOP ' ' END IF -C + if (n(5) .gt. 0) then isbars = .true. else @@ -624,10 +617,10 @@ SUBROUTINE MESH (A, IA, MP, ML, MS, MR, MSC, MA, MCOM, ICOM, JCOM, & LISTPB, IWTPBF, ILBF, NLPF, IFLB, LISTLB, IWTLBF, ISBF, & NSPF, IFSB, LISTSB, IWTSBF, LINKPB, LINKLB, LINKSB, & NUMBER, THREE, EIGHT, NINE, OPTIM, ISBARS) -C + C AN ERROR HAS OCCURRED AND THUS THE DUMMY REMESH ARRAYS MUST BE C DELETED IF NOT REMESHING -C + ELSEIF (.NOT. REMESH) THEN CALL MDDEL ('AMESUR') CALL MDDEL ('XNOLD') @@ -645,11 +638,11 @@ SUBROUTINE MESH (A, IA, MP, ML, MS, MR, MSC, MA, MCOM, ICOM, JCOM, STOP ' ' END IF END IF -C + CLOSE (IUNIT) -C + C ENTER LINE FACTORS -C + ELSE IF ((CIN(ICOM)(1:1) .EQ. 'F') .OR. & (CIN(ICOM)(1:1) .EQ. 'f')) THEN ICOM = ICOM + 1 @@ -672,9 +665,9 @@ SUBROUTINE MESH (A, IA, MP, ML, MS, MR, MSC, MA, MCOM, ICOM, JCOM, & NLPS, IFLINE, ILLIST, LINKL, LINKS, ADDLNK) GOTO 180 END IF -C + C CLEAR OUT ALL THE INTERVALS ASSIGNED TO LINES BY REGION -C + ELSE IF ((CIN(ICOM)(1:2) .EQ. 'CI') .OR. & (CIN(ICOM)(1:2) .EQ. 'ci')) THEN ICOM = ICOM + 1 @@ -687,20 +680,20 @@ SUBROUTINE MESH (A, IA, MP, ML, MS, MR, MSC, MA, MCOM, ICOM, JCOM, ICOM = 1 ENDIF CALL GETI12 (MCOM, ICOM, JCOM, CIN, IIN, KIN, I1, I2, IFOUND) -C + IF (IFOUND .GT. 0) THEN IF (I1 .GT. 0) THEN CALL CHECK (I1, I2, N (22)) -C + C REMOVE INTERVALS ON LINES ASSOCIATED WITH THE REGIONS -C + DO 230 I = I1, I2 CALL LTSORT (MR, LINKR, I, II, ADDLNK) IF (II .GT. 0) THEN DO 220 J = IFSIDE (II), IFSIDE (II) + NSPR (II)-1 -C + C FIRST REMOVE INTERVALS OF LINES ON SIDE DATA -C + CALL LTSORT (MS, LINKS, ISLIST (J), JJ, ADDLNK) IF ((ISLIST (J) .GT. 0) .AND. (JJ .GT. 0)) THEN DO 210 KKK = IFLINE (JJ), IFLINE (JJ) + @@ -709,9 +702,9 @@ SUBROUTINE MESH (A, IA, MP, ML, MS, MR, MSC, MA, MCOM, ICOM, JCOM, & ADDLNK) IF (KK .GT. 0) NINT (KK) = 0 210 CONTINUE -C + C NEXT REMOVE INTERVALS ON LINES ALONE -C + ELSE JJ = IABS (ISLIST (J)) CALL LTSORT (ML, LINKL, JJ, KK, ADDLNK) @@ -723,9 +716,9 @@ SUBROUTINE MESH (A, IA, MP, ML, MS, MR, MSC, MA, MCOM, ICOM, JCOM, GOTO 200 ENDIF ENDIF -C + C ADJUST THE MESH -C + ELSE IF ((CIN(ICOM)(1:2) .EQ. 'AD') .OR. & (CIN(ICOM)(1:2) .EQ. 'ad')) THEN ICOM = ICOM + 1 @@ -753,9 +746,9 @@ SUBROUTINE MESH (A, IA, MP, ML, MS, MR, MSC, MA, MCOM, ICOM, JCOM, CALL MESAGE ('******************************************') CALL MESAGE (' ') END IF -C + C CALCULATE A DISTORTION INDEX FOR THE REGIONS -C + ELSE IF (((CIN(ICOM)(1:1) .EQ. 'D') .OR. & (CIN(ICOM)(1:1) .EQ. 'd')) .AND. & (CIN(ICOM)(2:2) .NE. 'N') .AND. @@ -886,9 +879,9 @@ SUBROUTINE MESH (A, IA, MP, ML, MS, MR, MSC, MA, MCOM, ICOM, JCOM, CLOSE (UNIT = IUNIT, STATUS = 'KEEP') end if end if -C + C WRITE OUT THE MESH DATA INTO THE ERROR CODE DATA FORMAT -C + ELSE IF ((CIN (ICOM) (1:1) .EQ. 'J') .OR. & (CIN (ICOM) (1:1) .EQ. 'j')) THEN ICOM = ICOM + 1 @@ -923,9 +916,9 @@ SUBROUTINE MESH (A, IA, MP, ML, MS, MR, MSC, MA, MCOM, ICOM, JCOM, ELSE CLOSE (UNIT = IUNIT, STATUS = 'KEEP') END IF -C + C WRITE OUT THE MESH DATA INTO THE ABAQUS DATA FORMAT -C + ELSE IF ((CIN (ICOM) (1:1) .EQ. 'A') .OR. & (CIN (ICOM) (1:1) .EQ. 'a')) THEN ICOM = ICOM + 1 @@ -961,9 +954,9 @@ SUBROUTINE MESH (A, IA, MP, ML, MS, MR, MSC, MA, MCOM, ICOM, JCOM, ELSE CLOSE (UNIT = IUNIT, STATUS = 'KEEP') END IF -C + C WRITE OUT THE MESH DATA INTO THE NASTRAN DATA FORMAT -C + ELSE IF ((CIN(ICOM)(1:1) .EQ. 'N') .OR. & (CIN(ICOM)(1:1) .EQ. 'n') .OR. (CIN(ICOM)(1:2) .EQ. 'DN') .OR. & (CIN(ICOM)(1:1) .EQ. 'DN')) THEN @@ -1011,8 +1004,8 @@ SUBROUTINE MESH (A, IA, MP, ML, MS, MR, MSC, MA, MCOM, ICOM, JCOM, CALL HELP_FQ (12) END IF GOTO 100 -C + 10000 FORMAT (' REGION NO:', I5, ' IS NOT IN THE DATABASE', /, & ' THUS NO SIZE CAN BE ENTERED') -C + END diff --git a/packages/seacas/applications/fastq/midnod.f b/packages/seacas/applications/fastq/midnod.f index a9688d93b03b..03df18fc3746 100644 --- a/packages/seacas/applications/fastq/midnod.f +++ b/packages/seacas/applications/fastq/midnod.f @@ -1,68 +1,51 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: midnod.f,v 1.2 1991/03/21 15:44:55 gdsjaar Exp $ -C $Log: midnod.f,v $ -C Revision 1.2 1991/03/21 15:44:55 gdsjaar -C Changed all 3.14159... to atan2(0.0, -1.0) -C -c Revision 1.1.1.1 1990/11/30 11:12:10 gdsjaar -c FASTQ Version 2.0X -c -c Revision 1.1 90/11/30 11:12:08 gdsjaar -c Initial revision -c -C -CC* FILE: [.RENUM]MIDNOD.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE MIDNOD (NPNODE, NNUID, NPELEM, NNXK, MP, ML, KKK, NNN, & NALL, NL, NXK, NUID, XN, YN, LISTN, COOR, ILINE, LTYPE, LCON, & LINKP, LINKL, THREE, EIGHT, NINE) C*********************************************************************** -C + C SUBROUTINE MIDNOD = GENERATES THE MIDSIDE NODE FOR ELEMENTS -C + C*********************************************************************** -C + DIMENSION XN (NPNODE), YN (NPNODE) DIMENSION NUID (NNUID), NXK (NNXK, NPELEM) DIMENSION LISTN (NNUID) DIMENSION COOR (2, MP), ILINE (ML), LTYPE (ML), LCON (3, ML) DIMENSION LINKP (2, MP), LINKL (2, ML) -C + LOGICAL ADDLNK, THREE, EIGHT, NINE, ITSOK -C + PI = ATAN2(0.0, -1.0) TUPI = 2.0 * PI -C + ADDLNK = .FALSE. -C + NALL = NNN DO 130 J = 1, KKK DO 120 I = 1, 4 -C + C SKIP DUPLICATE DESCRIPTORS AND ELEMENTS THAT ARE NOT TO C HAVE MIDSIDE NODES -C + IF (NXK (I, J) .LT. 0) THEN -C + C THIS ELEMENT IS A BAR ELEMENT -C + IF (NXK (3, J) .EQ. 0) THEN IF (THREE) THEN ITSOK = .TRUE. ELSE ITSOK = .FALSE. ENDIF -C + C THIS ELEMENT IS A QUAD ELEMENT -C + ELSEIF ((EIGHT) .OR. (NINE)) THEN ITSOK = .TRUE. ELSE @@ -71,40 +54,40 @@ SUBROUTINE MIDNOD (NPNODE, NNUID, NPELEM, NNXK, MP, ML, KKK, NNN, ELSE ITSOK = .FALSE. ENDIF -C + C GENERATE THE MIDSIDE NODE IF APPROPRIATE -C + IF (ITSOK) THEN II = I + 1 IF (I .GE. 4)II = 1 NODEA = IABS (NXK (I, J)) NODEB = IABS (NXK (II, J)) -C + C CHECK TO SEE IF THE ELEMENT IS A BARSET -C + IF ((NODEA .GT. 0) .AND. (NODEB .GT. 0)) THEN NUIDA = NUID (NODEA) NUIDB = NUID (NODEB) -C + C IF ONE NODE OR THE OTHER IS INTERIOR, USE LINEAR INTERPOLATION -C + IF ( ((NUIDA .GT. 100000) .AND. & (NUIDA .LT. 1000000000)) .OR. & ((NUIDB .GT. 100000) .AND. & (NUIDB .LT. 1000000000)) ) THEN XINT = 0.5 * (XN (NODEA) + XN (NODEB)) YINT = 0.5 * (YN (NODEA) + YN (NODEB)) -C + C BOTH ARE POINT OR LINE NODES. C FIND THE LINE THAT THEY BELONG TO -C + ELSE LTEST = 0 -C + C SEE IF ONE IS NOT THE END POINT OF A LINE C THEN CHECK THE OTHER TO SEE IF IT IS ON THE SAME LINE C IF IT IS NOT ON THE SAME LINE, THEN USE LINEAR INTERPOLATION -C + IF (NUIDA .GT. 1000000000) THEN LTEST = (NUIDA - 1000000000) / 100000 CALL LTSORT (ML, LINKL, LTEST, LT, ADDLNK) @@ -126,9 +109,9 @@ SUBROUTINE MIDNOD (NPNODE, NNUID, NPELEM, NNXK, MP, ML, KKK, NNN, & (LCON (2, LT) .NE. NUIDA)) LTEST = 0 ENDIF ELSE -C + C BOTH ARE END POINTS OF LINES - SEE IF THEY ARE ON THE SAME LINE -C + NSUM = ABS (NUIDA) + ABS (NUIDB) DO 100 L = 1, NL CALL LTSORT (ML, LINKL, ILINE (L), K, ADDLNK) @@ -145,30 +128,30 @@ SUBROUTINE MIDNOD (NPNODE, NNUID, NPELEM, NNXK, MP, ML, KKK, NNN, 100 CONTINUE 110 CONTINUE ENDIF -C + C IF THEY ARE NOT ON THE SAME LINE, IT IS NOT IN ERROR C THEY SPAN A SINGLE WIDTH REGION C ASSUME LINEAR INTERPOLATION -C + IF (LTEST .EQ. 0) THEN KT = 0 ELSE CALL LTSORT (ML, LINKL, LTEST, LT, ADDLNK) KT = LTYPE (LT) ENDIF -C + C CALCULATE THE MID-SIDE NODE BY LINEAR INTERPOLATION C IF THE LINE TYPE IS STRAIGHT OR CORNER OR THE 2 END POINTS C SPAN A SINGLE WIDTH REGION -C + IF (KT .LT. 3) THEN XINT = 0.5 * (XN (NODEA) + XN (NODEB)) YINT = 0.5 * (YN (NODEA) + YN (NODEB)) -C + C IF THE LINE IS A CIRCLE OR PARABOLA, GENERATE THE MID-POINT BY USING C THE 2 NODES AS ARC ENDPOINTS AND AN INTERVAL OF 2 FOR THE LINE. C THE CENTER OF THE LINE MUST BE FOUND FROM THE LINE CARD ITSELF. -C + ELSE CALL LTSORT (MP, LINKP, LCON (1, LT), IP1, & ADDLNK) @@ -184,16 +167,16 @@ SUBROUTINE MIDNOD (NPNODE, NNUID, NPELEM, NNXK, MP, ML, KKK, NNN, ELSE IP3 = 0 ENDIF -C + C ARC WITH CENTER GIVEN C ARC GOES FROM 1ST POINT TO 2ND IN *COUNTER-CLOCKWISE* DIRECTION. -C + IF (KT .EQ. 3) THEN XCEN = COOR (1, IABS (IP3)) YCEN = COOR (2, IABS (IP3)) -C + C CIRCLE WITH THIRD POINT ON ARC. -C + ELSEIF (KT .EQ. 4) THEN THETA1 = ATAN2 (COOR (2, IP3) - & COOR (2, IP1), COOR (1, IP3) - @@ -211,15 +194,15 @@ SUBROUTINE MIDNOD (NPNODE, NNUID, NPELEM, NNXK, MP, ML, KKK, NNN, & COS (THETA2) * (Y2 - Y1)) / DET XCEN = X1 + R * COS (THETA1) YCEN = Y1 + R * SIN (THETA1) -C + C PARABOLA WITH CENTER GIVEN -C + ELSEIF (KT .EQ. 5) THEN XCEN = COOR (1, IABS (IP3)) YCEN = COOR (2, IABS (IP3)) -C + C CIRCLE WITH RADIUS GIVEN -C + ELSEIF (KT .EQ. 6) THEN DX = 0.5 * (COOR (1, IP2) - COOR (1, IP1)) DY = 0.5 * (COOR (2, IP2) - COOR (2, IP1)) @@ -245,9 +228,9 @@ SUBROUTINE MIDNOD (NPNODE, NNUID, NPELEM, NNXK, MP, ML, KKK, NNN, & ARM * DX / CHORD ENDIF ENDIF -C + C CALCULATE THE MIDPOINT ON THE ARC -C + R1 = SQRT ((XN (NODEA) - XCEN) **2 + & (YN (NODEA) - YCEN) **2) R2 = SQRT ((XN (NODEB) - XCEN) **2 + @@ -266,9 +249,9 @@ SUBROUTINE MIDNOD (NPNODE, NNUID, NPELEM, NNXK, MP, ML, KKK, NNN, YINT = SIN (THETAM) * RM + YCEN ENDIF ENDIF -C + C ADD THIS NEW NODE TO THE NODE LIST. -C + IF (NALL .GE. NPNODE) THEN WRITE (*, 10000)NPNODE GOTO 140 @@ -283,11 +266,11 @@ SUBROUTINE MIDNOD (NPNODE, NNUID, NPELEM, NNXK, MP, ML, KKK, NNN, ENDIF 120 CONTINUE 130 CONTINUE -C + 140 CONTINUE RETURN -C + 10000 FORMAT (' NODE ARRAY OVERFLOW IN MIDNOD', / & ' THERE ARE MORE THAN', I5, ' NODES IN THE MESH') -C + END diff --git a/packages/seacas/applications/fastq/mixvar.f b/packages/seacas/applications/fastq/mixvar.f index 0d29554c94cf..b73fa8ff44b0 100644 --- a/packages/seacas/applications/fastq/mixvar.f +++ b/packages/seacas/applications/fastq/mixvar.f @@ -1,55 +1,41 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: mixvar.f,v 1.1 1990/11/30 11:12:14 gdsjaar Exp $ -C $Log: mixvar.f,v $ -C Revision 1.1 1990/11/30 11:12:14 gdsjaar -C Initial revision -C -C -CC* FILE: [.MAIN]MIXVAR.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE MIXVAR (NPNODE, BMESUR, DMESUR, SECOND, TERROR, & EMIN, EMAX, EMINS, EMAXS, E1S) C** MODIFIED BY: TED BLACKER C** MODIFICATION DATE: 7/31/90 C** MODIFICATION: PASSED THE EMAX AND EMIN VARIABLES BACK OUT FOR USE -CC* IN THE GETSIZ ARRAY. THIS WAY THEY WILL ONLY NEED SET -CC* IN ONE PLACE. -C + C** MODIFIED BY: TED BLACKER C** MODIFICATION DATE: 8/2/90 C** MODIFICATION: PASSED THE EMAX AND EMIN VARIABLES IN NOW AS WELL -CC* THE EMINS, EMAXS AND E1S TARGET ERROR PARAMETERS -C + C*********************************************************************** -C + C SUBROUTINE MIXVAR = MIXES THE NODAL VARIABLES TO BE USED IN THE C REMESHING USING PAVING. -C + C*********************************************************************** -C + DIMENSION BMESUR(NPNODE), DMESUR(NPNODE) -C + LOGICAL SECOND, TRILIN, TERROR -C + TRILIN = .TRUE. -C + IF (SECOND) THEN -C + C NORMALIZE THE NODE VARIABLES -C + IF (TRILIN) THEN -C + C WEIGHT THE ERROR MEASURE (BMESUR) BY A C TRILINEAR STRESS MEASURE (DMESUR) FUNCTION -C + RMAX = 1.0 CALL NORMND (NPNODE, BMESUR, RMAX) CALL NORMND (NPNODE, DMESUR, RMAX) @@ -65,40 +51,30 @@ SUBROUTINE MIXVAR (NPNODE, BMESUR, DMESUR, SECOND, TERROR, & ((Y2 - Y1) * (DMESUR(I)- X1)) / (X2 - X1) ) + Y1) ENDIF 100 CONTINUE -C -C + C NOW (RE)NORMALIZE THE ERROR (BMESUR) VARIABLE -C + RMAX = .6 CALL NORMND (NPNODE, BMESUR, RMAX) -C + ELSE RMAX = .6 CALL NORMND (NPNODE, BMESUR, RMAX) CALL NORMND (NPNODE, DMESUR, RMAX) -C + DO 110 I = 1, NPNODE BMESUR(I) = AMAX1 (BMESUR(I), DMESUR(I)) 110 CONTINUE ENDIF -C -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/12/90 -CC* MODIFICATION: ADDED TARGET ERROR (TERROR & TERR) CONSTRAINTS -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/17/90 -CC* MODIFICATION: REWORKED TARGET ERROR CALCULATIONS TO CONSTRAIN + C** THE SIZE FACTOR TO BE 1.0 AT AN ERROR EQUAL TO C** THE TARGET ERROR. -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/20/90 -CC* MODIFICATION: CHANGED THE MAXIMUM REDUCTION FACTOR TO BE 1/6 C** INSTEAD OF 1/7. -C + C NOW NORMALIZE THE ERROR (BMESUR) VARIABLE -C + ELSEIF (TERROR) THEN -C + C** MODIFIED BY: TED BLACKER C** MODIFICATION DATE: 7/31/90 C** MODIFICATION: SET E1S TO BE .2 * TERR (WAS JUST TERR) AND SET @@ -106,9 +82,9 @@ SUBROUTINE MIXVAR (NPNODE, BMESUR, DMESUR, SECOND, TERROR, C** CONSISTENT WITH THE TEST RUNS DONE ON HOW AGGRESSIVE THE C** ERROR MEASURE NEEDED TO BE IN ORDER TO GET TO A TARGET C** ERROR. -C + EF1 = (EMAX - 1.0) / (EMAX - EMIN) -C + DO 120 I = 1, NPNODE IF (BMESUR(I) .LE. EMINS) THEN BMESUR(I) = 0.0 @@ -121,16 +97,15 @@ SUBROUTINE MIXVAR (NPNODE, BMESUR, DMESUR, SECOND, TERROR, BMESUR(I) = 1.0 ENDIF 120 CONTINUE -C -C + C NORMALIZE THE ERROR (BMESUR) VARIABLE -C + ELSE RMAX = .6 CALL NORMND (NPNODE, BMESUR, RMAX) -C + ENDIF -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/mkused.f b/packages/seacas/applications/fastq/mkused.f index 9e51db89c64e..a648cd8fdec9 100644 --- a/packages/seacas/applications/fastq/mkused.f +++ b/packages/seacas/applications/fastq/mkused.f @@ -1,43 +1,32 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: mkused.f,v 1.1 1990/11/30 11:12:17 gdsjaar Exp $ -C $Log: mkused.f,v $ -C Revision 1.1 1990/11/30 11:12:17 gdsjaar -C Initial revision -C -C -CC* FILE: [.QMESH]MKUSED.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE MKUSED (MXNL, MP, ML, LISTL, IPOINT, NINT, LINKP, & LINKL, LCON, NL) C*********************************************************************** -C + C SUBROUTINE MKUSED = MARKS ALL LINES AND POINTS USED IN THE PERIMETER -C + C*********************************************************************** -C + C NOTE: C THE MESH TABLES ARE EFFECTIVELY DESTROYED BY THIS ROUTINE -C + C*********************************************************************** -C + DIMENSION LISTL (MXNL), IPOINT (MP), NINT (ML) DIMENSION LINKP (2, MP), LINKL (2, ML) DIMENSION LCON (3, ML) -C + LOGICAL ADDLNK -C + ADDLNK = .FALSE. -C + C FLAG ALL LINES AND POINTS AS BEING USED -C + DO 100 I = 1, NL CALL LTSORT (ML, LINKL, LISTL (I), IL, ADDLNK) NINT (IL) = - IABS (NINT (IL)) @@ -46,7 +35,7 @@ SUBROUTINE MKUSED (MXNL, MP, ML, LISTL, IPOINT, NINT, LINKP, IPOINT (IP1) = - IABS (IPOINT (IP1)) IPOINT (IP2) = - IABS (IPOINT (IP2)) 100 CONTINUE -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/mmschm.f b/packages/seacas/applications/fastq/mmschm.f index 03ccb1b617e3..9193c2c8431b 100644 --- a/packages/seacas/applications/fastq/mmschm.f +++ b/packages/seacas/applications/fastq/mmschm.f @@ -1,52 +1,32 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: mmschm.f,v 1.2 1998/07/14 18:19:26 gdsjaar Exp $ -C $Log: mmschm.f,v $ -C Revision 1.2 1998/07/14 18:19:26 gdsjaar -C Removed unused variables, cleaned up a little. -C -C Changed BLUE labels to GREEN to help visibility on black background -C (indirectly requested by a couple users) -C -C Revision 1.1.1.1 1990/11/30 11:12:21 gdsjaar -C FASTQ Version 2.0X -C -c Revision 1.1 90/11/30 11:12:20 gdsjaar -c Initial revision -c -C -CC* FILE: [.QMESH]MMSCHM.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE MMSCHM (NPER, KKK, LLL, NNN, ML, MS, NSPR, ISLIST, & NINT, IFLINE, NLPS, ILLIST, LINKL, LINKS, MXNPER, MAXPRM, MAX3, & MXND, X, Y, NID, NNPS, ANGLE, XN, YN, NUID, LXK, KXL, NXL, LXN, & IAVAIL, NAVAIL, CCW, REAL, SCHSTR, M1, ERR) C*********************************************************************** -C + C MMSCHM - "M" MESH SCHEME; CALCULATE A REGULAR RECTANGULAR MESH -C + C*********************************************************************** -C + DIMENSION ISLIST(NSPR), NINT(ML), IFLINE(MS), NLPS(MS) DIMENSION ILLIST(MS*3), LINKL(2, ML), LINKS(2, MS) DIMENSION X(MXNPER), Y(MXNPER), NID(MXNPER*MAXPRM), NNPS(MAX3) DIMENSION ANGLE(MXNPER), XN(MXND), YN(MXND), NUID(MXND) DIMENSION LXK(4, MXND), KXL(2, 3*MXND), NXL(2, 3*MXND) DIMENSION LXN(4, MXND) -C + CHARACTER*72 SCHSTR -C + LOGICAL CCW, ERR, NORM, REAL -C + C CALCULATE THE BASE OF THE RECTANGLE FOR THE REGION -C + CALL GETM1 (ML, MS, MAX3, NSPR, ISLIST, NINT, IFLINE, NLPS, & ILLIST, LINKL, LINKS, X, Y, NID, NNPS, ANGLE, NPER, SCHSTR, M1, & CCW, NORM, REAL, ERR) @@ -56,15 +36,15 @@ SUBROUTINE MMSCHM (NPER, KKK, LLL, NNN, ML, MS, NSPR, ISLIST, CALL MESAGE ('GENERAL RECTANGLE PRIMITIVE PROCESSING USED') END IF M2 = NPER/2 - M1 -C + C CALCULATE A REGULAR MAPPED "RECTANGULAR" MESH -C + KKKOLD = KKK LLLOLD = LLL NNNOLD = NNN CALL RMESH (NPER, MXND, X, Y, NID, XN, YN, NUID, LXK, KXL, NXL, & LXN, M1, M2, KKK, KKKOLD, NNN, NNNOLD, LLL, LLLOLD, IAVAIL, & NAVAIL, ERR) -C + RETURN END diff --git a/packages/seacas/applications/fastq/mnmxk.f b/packages/seacas/applications/fastq/mnmxk.f index c33b0fa45a2f..00294ae128be 100644 --- a/packages/seacas/applications/fastq/mnmxk.f +++ b/packages/seacas/applications/fastq/mnmxk.f @@ -1,42 +1,31 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: mnmxk.f,v 1.1 1990/11/30 11:12:22 gdsjaar Exp $ -C $Log: mnmxk.f,v $ -C Revision 1.1 1990/11/30 11:12:22 gdsjaar -C Initial revision -C -C -CC* FILE: [.MAIN]MNMXK.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE MNMXK (NPELEM, NPNODE, NNXK, NXK, XN, YN, CENTK, KKK, & XMIN, XMAX, YMIN, YMAX) C*********************************************************************** -C + C SUBROUTINE MNMXK = FINDS MIN AND MAX DIMENSIONS FOR FLAGGED ELEMENTS -C + C********************************************************************** -C + DIMENSION NXK (NNXK, NPELEM), CENTK (2, NPELEM) DIMENSION XN (NPNODE), YN (NPNODE) -C + C FIND THE FIRST ELEMENT TO BE PLOTTED -C + DO 150 I = 1, KKK IF (NXK (1, I) .GT. 0) THEN JX1 = I JX2 = I JY1 = I JY2 = I -C + C COMPARE CENTERS TO GET MIN AND MAX ELEMENTS -C + DO 100 J = I + 1, KKK IF (NXK (1, J) .GT. 0) THEN IF (CENTK (1, J) .LT. CENTK (1, JX1))JX1 = J @@ -45,9 +34,9 @@ SUBROUTINE MNMXK (NPELEM, NPNODE, NNXK, NXK, XN, YN, CENTK, KKK, IF (CENTK (2, J) .GT. CENTK (2, JY2))JY2 = J ENDIF 100 CONTINUE -C + C FIND CORRECT MIN AND MAX FROM NODES OF MIN AND MAX ELEMENTS -C + XMIN = XN (NXK (1, JX1)) DO 110 K = 2, NNXK IF (NXK (K, JX1) .GT. 0) @@ -71,13 +60,13 @@ SUBROUTINE MNMXK (NPELEM, NPNODE, NNXK, NXK, XN, YN, CENTK, KKK, RETURN ENDIF 150 CONTINUE -C + C RETURN WITH DEFAULT MINS AND MAXS -C + XMIN = 0. XMAX = 1. YMIN = 0. YMAX = 1. RETURN -C + END diff --git a/packages/seacas/applications/fastq/mnorm.f b/packages/seacas/applications/fastq/mnorm.f index 7d01812146a3..1f1bf731204a 100644 --- a/packages/seacas/applications/fastq/mnorm.f +++ b/packages/seacas/applications/fastq/mnorm.f @@ -1,30 +1,19 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: mnorm.f,v 1.1 1990/11/30 11:12:25 gdsjaar Exp $ -C $Log: mnorm.f,v $ -C Revision 1.1 1990/11/30 11:12:25 gdsjaar -C Initial revision -C -C -CC* FILE: [.QMESH]MNORM.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE MNORM (MXND, XN, YN, NXL, LLL, STDLEN) C*********************************************************************** -C + C SUBROUTINE MNORM = FINDS THE AVERAGE LENGTH OF THOSE LINES NOT MUCH C LONGER THAN THE AVERAGE -C + C*********************************************************************** -C + DIMENSION NXL (2, 3 * MXND), XN (MXND), YN (MXND) -C + STDLEN = 0. NUML = 0 S = 0.0 @@ -37,7 +26,7 @@ SUBROUTINE MNORM (MXND, XN, YN, NXL, LLL, STDLEN) NUML = NUML + 1 ENDIF 100 CONTINUE -C + IF (NUML .LE. 0) RETURN TOL = 1.25 * S / DBLE(NUML) NUML = 0 @@ -54,7 +43,7 @@ SUBROUTINE MNORM (MXND, XN, YN, NXL, LLL, STDLEN) ENDIF 110 CONTINUE STDLEN = S / DBLE(NUML) -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/movep.F b/packages/seacas/applications/fastq/movep.F index 009aeaaabb96..ce35cb1e0958 100644 --- a/packages/seacas/applications/fastq/movep.F +++ b/packages/seacas/applications/fastq/movep.F @@ -1,38 +1,19 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C -C See packages/seacas/LICENSE for details - -C $Id: movep.F,v 1.1 1998/04/10 04:30:18 gdsjaar Exp $ -C $Log: movep.F,v $ -C Revision 1.1 1998/04/10 04:30:18 gdsjaar -C Added the ifdef needsdoubleescape to the graphics symbol -C plotting. Required moving some .f to .F files and specifying in Imakefile -C -C Revision 1.1.1.1 1990/11/30 11:12:29 gdsjaar -C FASTQ Version 2.0X -C -c Revision 1.1 90/11/30 11:12:28 gdsjaar -c Initial revision -c C +C See packages/seacas/LICENSE for details -CC* FILE: [.MAIN]MOVEP.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE MOVEP (MP, ML, MS, MR, N, COOR, LTYPE, LCON, NLPS, & IFLINE, ILLIST, NSPR, IFSIDE, ISLIST, LINKP, LINKL, LINKS, & LINKR, IMOVE, ALPHA, X, Y) C*********************************************************************** -C + C SUBROUTINE MOVEP = MOVES A POINT, AND REDRAWS ALL LINES DEPENDENT ON C THAT POINT -C + C*********************************************************************** -C + DIMENSION COOR (2, MP), LTYPE (ML), LCON (3, ML) DIMENSION NLPS (MS), IFLINE (MS) DIMENSION ILLIST (MS * 3) @@ -40,17 +21,17 @@ SUBROUTINE MOVEP (MP, ML, MS, MR, N, COOR, LTYPE, LCON, NLPS, DIMENSION LINKP (2, MP), LINKL (2, ML), LINKS (2, MS) DIMENSION LINKR (2, MR) DIMENSION N (29) -C + LOGICAL NUMPLT, ALPHA, ADDLNK, TEST, GETMAX -C + KNUM = 0 ADDLNK = .FALSE. TEST = .FALSE. GETMAX = .FALSE. IF (.NOT.ALPHA)CALL PLTSTD (1, 0.) -C + C ERASE ANY LINES USING THAT POINT -C + DO 120 I = 1, N (19) CALL LTSORT (ML, LINKL, I, II, ADDLNK) IF (II .GT. 0) THEN @@ -82,9 +63,9 @@ SUBROUTINE MOVEP (MP, ML, MS, MR, N, COOR, LTYPE, LCON, NLPS, 110 CONTINUE ENDIF 120 CONTINUE -C + C ERASE THE POINT -C + ADDLNK = .FALSE. CALL LTSORT (MP, LINKP, IMOVE, II, ADDLNK) IF (.NOT.ALPHA) THEN @@ -96,16 +77,16 @@ SUBROUTINE MOVEP (MP, ML, MS, MR, N, COOR, LTYPE, LCON, NLPS, CALL MPD2SY (1, COOR (1, II), COOR (2, II), '\CSQ') #endif ENDIF -C + C REDEFINE THE POINT -C + COOR (1, II) = X COOR (2, II) = Y -C + IF (.NOT.ALPHA)CALL PLTSTD (1, 7.) -C + C REDRAW ANY LINES USING THAT POINT -C + DO 150 I = 1, N (19) CALL LTSORT (ML, LINKL, I, II, ADDLNK) IF (II .GT. 0) THEN @@ -137,11 +118,11 @@ SUBROUTINE MOVEP (MP, ML, MS, MR, N, COOR, LTYPE, LCON, NLPS, 140 CONTINUE ENDIF 150 CONTINUE -C + C REDRAW THE POINT -C + IF (.NOT.ALPHA)CALL PLTSTD (1, 3.) -C + ADDLNK = .FALSE. CALL LTSORT (MP, LINKP, IMOVE, II, ADDLNK) IF (.NOT.ALPHA) THEN @@ -153,7 +134,6 @@ SUBROUTINE MOVEP (MP, ML, MS, MR, N, COOR, LTYPE, LCON, NLPS, CALL PLTSTD (1, 7.) CALL PLTFLU ENDIF -C -C + RETURN END diff --git a/packages/seacas/applications/fastq/ncklce.f b/packages/seacas/applications/fastq/ncklce.f index ab93a802d923..670ffa2b197a 100644 --- a/packages/seacas/applications/fastq/ncklce.f +++ b/packages/seacas/applications/fastq/ncklce.f @@ -1,50 +1,39 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: ncklce.f,v 1.1 1990/11/30 11:12:31 gdsjaar Exp $ -C $Log: ncklce.f,v $ -C Revision 1.1 1990/11/30 11:12:31 gdsjaar -C Initial revision -C -C -CC* FILE: [.QMESH]NCKLCE.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE NCKLCE(MXND, XN, YN, NUID, LXK, KXL, NXL, LXN, KKK, & NNN, NNNOLD, LLL, NAVAIL, IAVAIL, EPS, NOROOM, ERR) C*********************************************************************** -C + C SUBROUTINE NCKLCE = INSERTS AN EXRTRA RING OF ELEMENTS JUST INSIDE C THE REGION BOUNDARY -C + C*********************************************************************** -C + C NOTE: C ONLY ARRAYS LXK, NXL, XN, AND YN ARE INPUT TO NCKLCE. C ARRAYS KXL AND LXN ARE RECREATED BY SUBROUTINE CROSS AFTER C LXK AND NXL ARE MODIFIED. -C + C*********************************************************************** -C + DIMENSION LINES(20) DIMENSION LXK(4, MXND), KXL(2, 3*MXND), NXL(2, 3*MXND) DIMENSION LXN(4, MXND), XN(MXND), YN(MXND), NUID(MXND) -C + LOGICAL ERR, NOROOM -C + NNNX = NNN LLLX = LLL KKKX = KKK ERR = .TRUE. NOROOM = .TRUE. -C + C COUNT BOUNDARY NODES TO CHECK FOR IMPENDING OVERFLOW -C + NUMB = 0 DO 100 I = NNNOLD + 1, NNN IF ((LXN(2, I) .LT. 0) .AND. (LXN(1, I) .GT. 0)) THEN @@ -62,9 +51,9 @@ SUBROUTINE NCKLCE(MXND, XN, YN, NUID, LXK, KXL, NXL, LXN, KKK, RETURN END IF NOROOM = .FALSE. -C + C FIND FIRST BOUNDARY NODE -C + DO 110 I = NNNOLD + 1, NNN IF (LXN(1, I) .GT. 0) THEN NBDY1 = I @@ -77,20 +66,20 @@ SUBROUTINE NCKLCE(MXND, XN, YN, NUID, LXK, KXL, NXL, LXN, KKK, 120 CONTINUE NOLD = -1 NODE = NBDY1 -C + C FIND NEXT NODE ON THE BOUNDARY C LOOK AT ALL NEIGHBORING NODES -C + 130 CONTINUE CALL GETLXN (MXND, LXN, NODE, LINES, NL, ERR) IF (ERR) RETURN -C + DO 140 IL = 1, NL L = LINES(IL) IM = NXL(1, L) + NXL(2, L) - NODE -C + C DISALLOW PREVIOUS NODE AND NON-BOUNDARY LINES -C + IF ((IM .NE. NOLD) .AND. (KXL(2, L) .LE. 0)) THEN NNXT = IM GO TO 150 @@ -100,9 +89,9 @@ SUBROUTINE NCKLCE(MXND, XN, YN, NUID, LXK, KXL, NXL, LXN, KKK, WRITE (*, 10000) NODE RETURN 150 CONTINUE -C + C CREATE A NEW NODE *ON-TOP-OF* OLD BOUNDARY NODE -C + NNN = NNN + 1 XN(NNN) = XN(NODE) YN(NNN) = YN(NODE) @@ -111,10 +100,10 @@ SUBROUTINE NCKLCE(MXND, XN, YN, NUID, LXK, KXL, NXL, LXN, KKK, DO 160 I = 1, 4 LXN(I, NNN) = 0 160 CONTINUE -C + C CREATE TWO NEW LINES -- ONE CONNECTING TO THIS NODE, AND C ONE ON *TOP* OF THE NEW ELEMENT -C + LLL = LLL + 1 NXL(1, LLL) = NODE NXL(2, LLL) = NNN @@ -126,26 +115,26 @@ SUBROUTINE NCKLCE(MXND, XN, YN, NUID, LXK, KXL, NXL, LXN, KKK, KXL(1, LLL) = 0 KXL(2, LLL) = 0 IF (NNXT .EQ. NBDY1)NXL(2, LLL) = NNNX + 1 -C + C CREATE A NEW ELEMENT -C + KKK = KKK + 1 LXK(1, KKK) = L LXK(2, KKK) = LLL - 1 LXK(3, KKK) = LLL LXK(4, KKK) = LLL + 1 IF (NNXT .EQ. NBDY1)LXK(4, KKK) = LLLX + 1 -C + C CHECK FOR COMPLETION OF LOOP AROUND BOUNDARY -C + IF (NNXT .NE. NBDY1) THEN NOLD = NODE NODE = NNXT GO TO 130 END IF -C + C RE-SETUP AVAILABLE LXN-SPACE LINKS -C + IOLD = 0 NAVAIL = 0 DO 170 I = 1, NNNX @@ -174,9 +163,9 @@ SUBROUTINE NCKLCE(MXND, XN, YN, NUID, LXK, KXL, NXL, LXN, KKK, LXN(4, I) = I + 1 180 CONTINUE END IF -C + C COMPLETE KXL AND LXN ARRAYS -C + CALL CCROSS(4, KKK, 2, LLL, LXK, KXL, KKKX + 1, LLLX + 1, NOROOM, & ERR) IF (NOROOM)RETURN @@ -184,7 +173,7 @@ SUBROUTINE NCKLCE(MXND, XN, YN, NUID, LXK, KXL, NXL, LXN, KKK, CALL MESAGE ('ERROR IN NCKLCE - LXK TABLE GENERATION') RETURN END IF -C + LLLX1 = LLLX + 1 DO 200 L = LLLX1, LLL DO 190 I = 1, 2 @@ -196,17 +185,17 @@ SUBROUTINE NCKLCE(MXND, XN, YN, NUID, LXK, KXL, NXL, LXN, KKK, END IF 190 CONTINUE 200 CONTINUE -C + C USE SMOGS TO REPOSITION THE OLD BOUNDARY NODES -C + DO 210 I = NNNOLD + 1, NNN LXN(2, I) = -LXN(2, I) 210 CONTINUE RONE = 1. CALL SMOGS(MXND, XN, YN, NXL, LXN, NNN, NNNOLD, 3, EPS, RONE) -C + C FLAG NEW BOUNDARY NODES (ONLY) -C + DO 220 I = NNNOLD + 1, NNN LXN(2, I) = IABS(LXN(2, I)) 220 CONTINUE @@ -215,7 +204,7 @@ SUBROUTINE NCKLCE(MXND, XN, YN, NUID, LXK, KXL, NXL, LXN, KKK, LXN(2, I) = -LXN(2, I) 230 CONTINUE RETURN -C + 10000 FORMAT(' IN NCKLCE, THE PERIMETER IS NOT CONTINUOUS AT NODE', I5) -C + END diff --git a/packages/seacas/applications/fastq/ndstat.f b/packages/seacas/applications/fastq/ndstat.f index 2fe994c81be5..7c69ba79f554 100644 --- a/packages/seacas/applications/fastq/ndstat.f +++ b/packages/seacas/applications/fastq/ndstat.f @@ -1,41 +1,30 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: ndstat.f,v 1.1 1990/11/30 11:12:34 gdsjaar Exp $ -C $Log: ndstat.f,v $ -C Revision 1.1 1990/11/30 11:12:34 gdsjaar -C Initial revision -C -C -CC* FILE: [.PAVING]NDSTAT.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE NDSTAT (NODE, LXN, ANGLE, JSTAT) C*********************************************************************** -C + C SUBROUTINE NDSTAT = DETERMINES THE MOST APPROPRIATE STATUS OF A C GIVEN NODE -C + C*********************************************************************** -C + DIMENSION LXN(4) -C + C AN UNDECIDED NODE HAS BEEN FOUND - TEST ANGLE AND CONNECTIVITY -C + C THE NODE IS ON THE BOUNDARY IF (LXN (2) .LT. 0) THEN -C + C IF THE NODE HAS LESS THAN FOUR LINES ATTACHED C CUTOFFS ARE: 0 TO 135 DEGREES = ROW END C 135 TO 225 DEGREES = ROW SIDE C 225 TO 290 DEGREES = ROW CORNER C OVER 290 DEGREES = ROW REVERSAL -C + IF (LXN (4) .LE. 0) THEN IF (ANGLE .LT. 2.3561945) THEN JSTAT = 1 @@ -46,12 +35,12 @@ SUBROUTINE NDSTAT (NODE, LXN, ANGLE, JSTAT) ELSE JSTAT = 7 ENDIF -C + C IF THE NODE HAS FOUR LINES ATTACHED C CUTOFFS ARE: 0 TO 110 DEGREES = ROW END C 110 TO 225 DEGREES = ROW SIDE C OVER 225 DEGREES = ROW CORNER (NEARLY IMPOSSIBLE) -C + ELSE IF (ANGLE .LT. 1.9198622) THEN JSTAT = 1 @@ -61,22 +50,22 @@ SUBROUTINE NDSTAT (NODE, LXN, ANGLE, JSTAT) JSTAT = 5 ENDIF ENDIF -C + C THE NODE IS NOT ON THE BOUNDARY - CUTOFFS ARE ADJUSTED BASED C ON THE CONNECTIVITY AND THE ANGLE -C + ELSE -C + C ONLY TWO LINES ARE ATTACHED - LEAN TOWARDS A ROW CORNER NODE C OR A ROW END NODE -C + IF (LXN(3) .EQ. 0) THEN -C + C CUTOFFS ARE: 0 TO 135 DEGREES = ROW END C 135 TO 210 DEGREES = ROW SIDE C 210 TO 320 DEGREES = ROW CORNER C OVER 320 DEGREES = ROW REVERSAL -C + IF (ANGLE .LT. 2.3561945) THEN JSTAT = 1 ELSE IF (ANGLE .LT. 3.6651914) THEN @@ -86,16 +75,16 @@ SUBROUTINE NDSTAT (NODE, LXN, ANGLE, JSTAT) ELSE JSTAT = 7 ENDIF -C + C THREE LINES ARE ATTACHED - LEAN TOWARDS A ROW SIDE -C + ELSEIF (LXN(4) .EQ. 0) THEN -C + C CUTOFFS ARE: 0 TO 110 DEGREES = ROW END C 110 TO 240 DEGREES = ROW SIDE C 240 TO 320 DEGREES = ROW CORNER C OVER 320 DEGREES = ROW REVERSAL (REALLY IMPOSSIBLE) -C + IF (ANGLE .LT. 1.9198622) THEN JSTAT = 1 ELSE IF (ANGLE .LT. 4.1887902) THEN @@ -105,15 +94,15 @@ SUBROUTINE NDSTAT (NODE, LXN, ANGLE, JSTAT) ELSE JSTAT = 7 ENDIF -C + C FOUR LINES ARE ATTACHED - LEAN TOWARDS A ROW END NODE -C + ELSE -C + C CUTOFFS ARE: 0 TO 145 DEGREES = ROW END C 145 TO 225 DEGREES = ROW SIDE C OVER 225 DEGREES = ROW CORNER (REALLY IMPOSSIBLE) -C + IF (ANGLE .LT. 2.5307274) THEN JSTAT = 1 ELSE IF (ANGLE .LT. 3.9269908) THEN @@ -123,7 +112,7 @@ SUBROUTINE NDSTAT (NODE, LXN, ANGLE, JSTAT) ENDIF ENDIF ENDIF -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/nickc.f b/packages/seacas/applications/fastq/nickc.f index 3d480899d573..a15250f4eef5 100644 --- a/packages/seacas/applications/fastq/nickc.f +++ b/packages/seacas/applications/fastq/nickc.f @@ -1,68 +1,47 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: nickc.f,v 1.3 1992/08/24 17:08:06 gdsjaar Exp $ -C $Log: nickc.f,v $ -C Revision 1.3 1992/08/24 17:08:06 gdsjaar -C Removed undefined messages -- code works fine, no need for message -C -c Revision 1.2 1991/03/22 16:05:54 gdsjaar -c Added default option, print warning message -c Blacker needs to fix -c -c Revision 1.1.1.1 1990/11/30 11:12:39 gdsjaar -c FASTQ Version 2.0X -c -c Revision 1.1 90/11/30 11:12:37 gdsjaar -c Initial revision -c -C -CC* FILE: [.PAVING]NICKC.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C REAL FUNCTION NICKC (ANGLE, LXN) C*********************************************************************** -C + C FUNCTION NICKC = RETURNS THE PENALTY FOR A BAD ANGLE AND A BAD C CONNECTIVITY ON A CORNER -C + C*********************************************************************** -C + DIMENSION LXN(4) -C + PID2 = 0.5 * ATAN2(0.0, -1.0) ADIFF = MAX (0., (ANGLE - PID2) ) -C + C IF THE ANGLE HAS 4 LINES ATTACHED C A REGULAR NODE WOULD BE FORMED - PENALIZE IT LIGHTLY C USE THIS SAME PENALTY FOR BOUNDARY NODES -C + IF ( (LXN (4) .GT. 0) .OR. (LXN (2) .LT. 0) ) THEN NICKC = ADIFF -C + C IF THE ANGLE HAS 3 LINES ATTACHED C THEN A THREE DEGREE IRREGULAR NODE WOULD BE FORMED C PENALIZE IT MORE STRINGENTLY -C + ELSEIF ( (LXN (3) .GT. 0) .AND. (LXN (4) .EQ. 0) ) THEN NICKC = ADIFF * 1.3 -C + C IF THE ANGLE HAS MORE THAN 4 LINES ATTACHED C THEN A FIVE+ DEGREE IRREGULAR NODE WOULD BE FORMED C PENALIZE IT LESS STRINGENTLY -C + ELSEIF (LXN (4) .GT. 0) THEN NICKC = ADIFF * 1.15 -C + C IF THE ANGLE HAS 2 LINES ATTACHED C THEN A TWO DEGREE IRREGULAR NODE WOULD BE FORMED (HIGHLY UNLIKELY) C PENALIZE IT SEVERELY -C + ELSEIF (LXN (3) .EQ. 0) THEN NICKC = ADIFF * 1.6 else @@ -70,7 +49,7 @@ REAL FUNCTION NICKC (ANGLE, LXN) c $ lxn(1), lxn(2), lxn(3), lxn(4) nickc = adiff * 2.0 ENDIF -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/nicks.f b/packages/seacas/applications/fastq/nicks.f index 31ce3b24675e..3d90a5d62c6f 100644 --- a/packages/seacas/applications/fastq/nicks.f +++ b/packages/seacas/applications/fastq/nicks.f @@ -1,80 +1,56 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: nicks.f,v 1.4 1992/08/24 17:08:07 gdsjaar Exp $ -C $Log: nicks.f,v $ -C Revision 1.4 1992/08/24 17:08:07 gdsjaar -C Removed undefined messages -- code works fine, no need for message -C -c Revision 1.3 1991/03/22 16:05:52 gdsjaar -c Added default option, print warning message -c Blacker needs to fix -c -c Revision 1.2 1991/03/21 15:44:57 gdsjaar -c Changed all 3.14159... to atan2(0.0, -1.0) -c -c Revision 1.1.1.1 1990/11/30 11:12:42 gdsjaar -c FASTQ Version 2.0X -c -c Revision 1.1 90/11/30 11:12:41 gdsjaar -c Initial revision -c -C -CC* FILE: [.PAVING]NICKS.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C REAL FUNCTION NICKS (ANGLE, LXN) C*********************************************************************** -C + C FUNCTION NICKS = RETURNS THE PENALTY FOR A BAD ANGLE AND A BAD C CONNECTIVITY ON A SIDE -C + C*********************************************************************** -C + DIMENSION LXN(4) -C + PI = ATAN2(0.0, -1.0) ADIFF = ANGLE - PI -C + C PENALIZE A LARGE ANGLE MORE THAN A SMALL ANGLE -C + IF (ADIFF .LT. 0.) THEN ADIFF = - ADIFF ELSE ADIFF = ADIFF * 1.2 ENDIF -C + C IF THE ANGLE HAS 3 LINES ATTACHED C A REGULAR NODE WOULD BE FORMED - PENALIZE IT LIGHTLY C USE THIS SAME PENALTY FOR BOUNDARY NODES -C + IF ( ( (LXN (4) .EQ. 0) .AND. (LXN (3) .NE. 0) ) .OR. & (LXN (2) .LT. 0) ) THEN NICKS = ADIFF -C + C IF THE ANGLE HAS 2 LINES ATTACHED C THEN A THREE DEGREE IRREGULAR NODE WOULD BE FORMED C PENALIZE IT MORE STRINGENTLY -C + ELSEIF (LXN (3) .EQ. 0) THEN NICKS = ADIFF * 1.3 -C + C IF THE ANGLE HAS 4 LINES ATTACHED C THEN A FIVE DEGREE IRREGULAR NODE WOULD BE FORMED C PENALIZE IT LESS STRINGENTLY -C + ELSEIF (LXN (4) .GT. 0) THEN NICKS = ADIFF * 1.15 -C + C IF THE ANGLE HAS MORE THAN 4 LINES ATTACHED C THEN A FIVE+ DEGREE IRREGULAR NODE WOULD BE FORMED (HIGHLY UNLIKELY) C PENALIZE IT SEVERELY -C + ELSEIF (LXN (3) .EQ. 0) THEN NICKS = ADIFF * 1.6 else @@ -82,7 +58,7 @@ REAL FUNCTION NICKS (ANGLE, LXN) c $ adiff, lxn(1), lxn(2), lxn(3), lxn(4) nicks = adiff * 2.0 ENDIF -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/node12.f b/packages/seacas/applications/fastq/node12.f index 36d3544e6331..788417132a71 100644 --- a/packages/seacas/applications/fastq/node12.f +++ b/packages/seacas/applications/fastq/node12.f @@ -1,35 +1,24 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: node12.f,v 1.1 1990/11/30 11:12:44 gdsjaar Exp $ -C $Log: node12.f,v $ -C Revision 1.1 1990/11/30 11:12:44 gdsjaar -C Initial revision -C -C -CC* FILE: [.PAVING]NODE12.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE NODE12 (MXND, MLN, LNODES, I1, I2, NLOOP1, NLOOP2, & NODE1, NODE2, NODE, ERR) C*********************************************************************** -C + C SUBROUTINE NODE12 = FINDS THE CURRENT NODE IN BOTH NEW LOOPS, AND C KEEPS IT A CONSTANT -C + C*********************************************************************** -C + DIMENSION LNODES (MLN, MXND) -C + LOGICAL ERR -C + ERR = .FALSE. -C + KOUNT = 0 NTEST = I1 100 CONTINUE @@ -42,9 +31,9 @@ SUBROUTINE NODE12 (MXND, MLN, LNODES, I1, I2, NLOOP1, NLOOP2, ENDIF NTEST = LNODES (3, NTEST) GOTO 100 -C + 110 CONTINUE -C + KOUNT = 0 NTEST = I2 120 CONTINUE @@ -61,9 +50,9 @@ SUBROUTINE NODE12 (MXND, MLN, LNODES, I1, I2, NLOOP1, NLOOP2, ENDIF NTEST = LNODES (3, NTEST) GOTO 120 -C + 130 CONTINUE -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/nodord.f b/packages/seacas/applications/fastq/nodord.f index afa9ad02e19e..e2f2e5b346cc 100644 --- a/packages/seacas/applications/fastq/nodord.f +++ b/packages/seacas/applications/fastq/nodord.f @@ -1,31 +1,20 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: nodord.f,v 1.1 1990/11/30 11:12:46 gdsjaar Exp $ -C $Log: nodord.f,v $ -C Revision 1.1 1990/11/30 11:12:46 gdsjaar -C Initial revision -C -C -CC* FILE: [.RENUM]NODORD.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE NODORD (NPNODE, XN, YN, LISTN, NUID, NNN) C*********************************************************************** -C + C SUBROUTINE NODORD = ORDER THE NODE TABLE INTO INCREASING VALUES OF C THE VARIABLE LISTN -C + C*********************************************************************** -C + DIMENSION LISTN (NPNODE) DIMENSION XN (NPNODE), YN (NPNODE), NUID (NPNODE) -C + NN = NNN M = NN 100 CONTINUE @@ -55,5 +44,5 @@ SUBROUTINE NODORD (NPNODE, XN, YN, LISTN, NUID, NNN) ENDIF 120 CONTINUE GOTO 100 -C + END diff --git a/packages/seacas/applications/fastq/normnd.f b/packages/seacas/applications/fastq/normnd.f index b6a236b23d07..884a2e8f5a84 100644 --- a/packages/seacas/applications/fastq/normnd.f +++ b/packages/seacas/applications/fastq/normnd.f @@ -1,43 +1,32 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: normnd.f,v 1.1 1990/11/30 11:12:49 gdsjaar Exp $ -C $Log: normnd.f,v $ -C Revision 1.1 1990/11/30 11:12:49 gdsjaar -C Initial revision -C -C -CC* FILE: [.MAIN]NORMND.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE NORMND (NPNODE, BMESUR, RMAX) C*********************************************************************** -C + C SUBROUTINE NORMND = NORMALIZES A NODE VARIABLE -C + C*********************************************************************** -C + DIMENSION BMESUR(NPNODE) -C + BMIN = BMESUR(1) BMAX = BMESUR(1) DO 100 NODE = 2, NPNODE BMAX = AMAX1 (BMESUR(NODE), BMAX) BMIN = AMIN1 (BMESUR(NODE), BMIN) 100 CONTINUE -C + BMAX = BMAX - BMIN DO 110 NODE = 1, NPNODE BMESUR(NODE) = BMESUR(NODE) - BMIN 110 CONTINUE -C + C RMAX = MAXIMUM RATIO FOR PLATEAU VALUES -C + DO 120 NODE = 1, NPNODE IF (BMESUR (NODE) .GE. (BMAX * RMAX)) THEN BMESUR(NODE) = 1.0 @@ -45,7 +34,7 @@ SUBROUTINE NORMND (NPNODE, BMESUR, RMAX) BMESUR (NODE) = BMESUR(NODE) / (BMAX * RMAX) ENDIF 120 CONTINUE -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/nps.f b/packages/seacas/applications/fastq/nps.f index 582758163ad4..c327433996ab 100644 --- a/packages/seacas/applications/fastq/nps.f +++ b/packages/seacas/applications/fastq/nps.f @@ -1,49 +1,38 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: nps.f,v 1.1 1990/11/30 11:12:52 gdsjaar Exp $ -C $Log: nps.f,v $ -C Revision 1.1 1990/11/30 11:12:52 gdsjaar -C Initial revision -C -C -CC* FILE: [.QMESH]NPS.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE NPS (ML, MS, MNNPS, NS, ISLIST, NINT, IFLINE, NLPS, & ILLIST, LINKL, LINKS, NNPS, ERR) C*********************************************************************** -C + C SUBROUTINE NPS = GIVES A LIST OF THE NUMBER OF PERIMETER NODES C ON EACH OF A REGION'S SIDES -C + C*********************************************************************** -C + C SUBROUTINE CALLED BY: C QMESH = GENERATES QUAD ELEMENTS -C + C*********************************************************************** -C + C VARIABLES USED: C NNPS = ARRAY OF NUMBER OF NODES PER SIDE C CCW = .TRUE. IF THE SIDE IS ORIENTED CCW C KS = COUNTER OF THE NUMBER OF SIDES -C + C*********************************************************************** -C + DIMENSION NNPS (MNNPS), ISLIST (NS), LINKL (2, ML), LINKS (2, MS) DIMENSION NLPS (MS), IFLINE (MS), ILLIST (MS * 3), NINT (ML) -C + LOGICAL ERR, ADDLNK -C + ERR = .TRUE. ADDLNK = .FALSE. -C + KS = 0 DO 110 I = 1, NS IF (ISLIST (I) .LT. 0) THEN @@ -68,7 +57,7 @@ SUBROUTINE NPS (ML, MS, MNNPS, NS, ISLIST, NINT, IFLINE, NLPS, ENDIF 110 CONTINUE ERR = .FALSE. -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/nsplit.f b/packages/seacas/applications/fastq/nsplit.f index f00da699b6b4..fd8ea372771a 100644 --- a/packages/seacas/applications/fastq/nsplit.f +++ b/packages/seacas/applications/fastq/nsplit.f @@ -1,43 +1,26 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: nsplit.f,v 1.2 1991/05/10 17:42:09 gdsjaar Exp $ -C $Log: nsplit.f,v $ -C Revision 1.2 1991/05/10 17:42:09 gdsjaar -C Changed VMS JNINT intrinsic to ANSI NINT -C -c Revision 1.1.1.1 1990/11/30 11:12:56 gdsjaar -c FASTQ Version 2.0X -c -c Revision 1.1 90/11/30 11:12:54 gdsjaar -c Initial revision -c -C -CC* FILE: [.PAVING]NSPLIT.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE NSPLIT (MXND, MLN, LNODES, ANGLE, NSTART, KANG, & INODE, NNODE, NWANT, MAXSIZ) C*********************************************************************** -C + C SUBROUTINE NSPLIT = SPLITS UP THE KANG CONSECUTIVE NODES STARTING C AT NSTART INTO NWANT INTERVALS (OR AS CLOSE C AS AN BE EXPECTED). THE MAXIMUM NWANT SHOULD C BE IS 4. -C + C*********************************************************************** -C + DIMENSION LNODES (MLN, MXND), ANGLE (MXND), INODE (4) -C + LOGICAL MAXSIZ -C + NNODE = 0 -C + IF (KANG .LE. NWANT) THEN NNOW = NSTART DO 100 I = 1, KANG @@ -45,7 +28,7 @@ SUBROUTINE NSPLIT (MXND, MLN, LNODES, ANGLE, NSTART, KANG, NNOW = LNODES (3, NNOW) 100 CONTINUE NNODE = KANG -C + ELSEIF (NWANT .EQ. 1) THEN NNODE = 1 IF (KANG .EQ. 2) THEN @@ -65,7 +48,7 @@ SUBROUTINE NSPLIT (MXND, MLN, LNODES, ANGLE, NSTART, KANG, ELSE INODE (1) = JUMPLP (MXND, MLN, LNODES, NSTART, KANG / 2) ENDIF -C + ELSEIF (NWANT .EQ. 2) THEN NNODE = 2 NJUMP = NINT (DBLE(KANG + 1) / 4.) @@ -73,7 +56,7 @@ SUBROUTINE NSPLIT (MXND, MLN, LNODES, ANGLE, NSTART, KANG, & NJUMP - 1) INODE (2) = JUMPLP (MXND, MLN, LNODES, NSTART, & KANG - NJUMP) -C + ELSEIF (NWANT .EQ. 3) THEN NNODE = 3 NJUMP1 = NINT (DBLE(KANG + 1) / 6.) @@ -84,7 +67,7 @@ SUBROUTINE NSPLIT (MXND, MLN, LNODES, ANGLE, NSTART, KANG, & NJUMP2 - 1) INODE (3) = JUMPLP (MXND, MLN, LNODES, NSTART, & KANG - NJUMP1) -C + ELSEIF (NWANT .EQ. 4) THEN NNODE = 4 XKANG = KANG + 1 @@ -100,7 +83,7 @@ SUBROUTINE NSPLIT (MXND, MLN, LNODES, ANGLE, NSTART, KANG, INODE (4) = JUMPLP (MXND, MLN, LNODES, NSTART, & KANG - NJUMP1 - 1) ENDIF -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/nxkbdy.f b/packages/seacas/applications/fastq/nxkbdy.f index 218297897c5a..28a4e85fe20b 100644 --- a/packages/seacas/applications/fastq/nxkbdy.f +++ b/packages/seacas/applications/fastq/nxkbdy.f @@ -1,50 +1,31 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: nxkbdy.f,v 1.2 2000/11/13 15:39:05 gdsjaar Exp $ -C $Log: nxkbdy.f,v $ -C Revision 1.2 2000/11/13 15:39:05 gdsjaar -C Cleaned up unused variables and labels. -C -C Removed some real to int conversion warnings. -C -C Revision 1.1.1.1 1990/11/30 11:12:58 gdsjaar -C FASTQ Version 2.0X -C -c Revision 1.1 90/11/30 11:12:57 gdsjaar -c Initial revision -c -C -CC* FILE: [.RENUM]NXKBDY.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE NXKBDY (MDIM, NNXK, NPELEM, NXK, KKK, LIST, THREE, & EIGHT, NINE) C*********************************************************************** -C + C SUBROUTINE NXKBDY = FLAGS ALL SIDES OF ELEMENTS ONLY ONCE BY USE OF C A HASH SCHEME -C + C*********************************************************************** -C + C NXK = THE NODES PER ELEMENT ARRAY (CONNECTIVITY) C (A NEGATIVE VALUE WILL INDICATE UNIQUENESS OF FOLLOWING C SIDE) C*********************************************************************** -C + LOGICAL THREE, EIGHT, NINE, ITSOK -C + DIMENSION NXK (NNXK, NPELEM), LIST (MDIM) -C + DO 100 I = 1, MDIM LIST (I) = 0 100 CONTINUE -C + DO 140 K = 1, KKK IF ((NXK (3, K) .EQ. 0) .AND. (THREE)) THEN ITSOK = .TRUE. @@ -57,9 +38,9 @@ SUBROUTINE NXKBDY (MDIM, NNXK, NPELEM, NXK, KKK, LIST, THREE, ENDIF IF (ITSOK) THEN DO 130 N = 1, NEND -C + C COMPUTE HASH CODE FOR LINE -C + N2 = N + 1 IF (N .GE. 4)N2 = 1 NODE1 = NXK (N, K) @@ -69,15 +50,15 @@ SUBROUTINE NXKBDY (MDIM, NNXK, NPELEM, NXK, KKK, LIST, THREE, ELSE LVAL = NODE2 * 100000 + NODE1 ENDIF -C + C CALCULATE THE BEGINNING HASH VALUE -C + HOLD = DBLE(NODE1 + NODE2) * 3.1830989 LHASH = INT((HOLD-INT (HOLD)) * DBLE(MDIM) + 1) LKEEP = LHASH -C + C FIRST-TIMERS CLAIM THE NODE -C + 110 CONTINUE IF (LIST (LHASH).NE.0) THEN IF (LIST (LHASH) .EQ. LVAL) GOTO 120 @@ -87,7 +68,7 @@ SUBROUTINE NXKBDY (MDIM, NNXK, NPELEM, NXK, KKK, LIST, THREE, CALL MESAGE ('HASH SCHEME OVERFLOW IN KXNBDY') STOP ENDIF -C + LIST (LHASH) = LVAL NXK (N, K) = ISIGN (NXK (N, K), -1) 120 CONTINUE diff --git a/packages/seacas/applications/fastq/nxkord.f b/packages/seacas/applications/fastq/nxkord.f index fe298af17f26..852af77d8554 100644 --- a/packages/seacas/applications/fastq/nxkord.f +++ b/packages/seacas/applications/fastq/nxkord.f @@ -1,30 +1,19 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: nxkord.f,v 1.1 1990/11/30 11:13:00 gdsjaar Exp $ -C $Log: nxkord.f,v $ -C Revision 1.1 1990/11/30 11:13:00 gdsjaar -C Initial revision -C -C -CC* FILE: [.QMESH]NXKORD.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE NXKORD (NODES, N1) C*********************************************************************** -C + C SUBROUTINE NXKORD = ROTATES THE LIST OF FOUR NODES SO N1 APPEARS C FIRST IF IT IS IN THE LIST -C + C*********************************************************************** -C + DIMENSION NODES (4) -C + DO 100 I = 1, 4 IF (NODES (I) .EQ. N1) THEN IF (I .EQ. 1) THEN @@ -52,7 +41,7 @@ SUBROUTINE NXKORD (NODES, N1) RETURN ENDIF 100 CONTINUE -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/parc.f b/packages/seacas/applications/fastq/parc.f index 01f53fd45677..86bbed0c4138 100644 --- a/packages/seacas/applications/fastq/parc.f +++ b/packages/seacas/applications/fastq/parc.f @@ -1,28 +1,17 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: parc.f,v 1.1 1990/11/30 11:13:03 gdsjaar Exp $ -C $Log: parc.f,v $ -C Revision 1.1 1990/11/30 11:13:03 gdsjaar -C Initial revision -C -C -CC* FILE: [.QMESH]PARC.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C FUNCTION PARC (AL, TCOEF) C*********************************************************************** -C + C SUBROUTINE PARC = CALCULATES PARABOLIC ARC LOCATIONS -C + C*********************************************************************** -C + PARC = 0.5 * (SQRT (1.0 + AL **2) * AL + & ALOG (SQRT (1.0 + AL **2) + AL)) / TCOEF -C + END diff --git a/packages/seacas/applications/fastq/paving.f b/packages/seacas/applications/fastq/paving.f index dbfa9c27b7dd..8cfdae310cf0 100644 --- a/packages/seacas/applications/fastq/paving.f +++ b/packages/seacas/applications/fastq/paving.f @@ -1,52 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: paving.f,v 1.4 2000/11/13 15:39:05 gdsjaar Exp $ -C $Log: paving.f,v $ -C Revision 1.4 2000/11/13 15:39:05 gdsjaar -C Cleaned up unused variables and labels. -C -C Removed some real to int conversion warnings. -C -C Revision 1.3 1998/11/24 20:45:08 gdsjaar -C Added code to avoid array bound read errors and uninitialized -C variables. In some cases, the correct fix was difficult to determine, -C so added something that looked like it made sense... -C -C This fixes problems with very slow run times on g77-compiled code. It -C was taking an uninitialized variable to be INT_MAX instead of zero -C which resulted in lots of iterations through a loop. This variable was -C initialized to zero since that is what it was being set to on the sun -C and when compiled with fort77 (f2c-based). Gives the exact same mesh -C on linux and sun for several test cases. -C -C Revision 1.2 1998/07/14 18:19:28 gdsjaar -C Removed unused variables, cleaned up a little. -C -C Changed BLUE labels to GREEN to help visibility on black background -C (indirectly requested by a couple users) -C -C Revision 1.1.1.1 1990/11/30 11:13:07 gdsjaar -C FASTQ Version 2.0X -C -c Revision 1.1 90/11/30 11:13:05 gdsjaar -c Initial revision -c -C -CC* FILE: [.PAVING]PAVING.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/31/90 -CC* MODIFICATION: ADDED ARGUMENTS TO CALL TO PAVING TO PASS MINIMUM -CC** ELEMENT SIZE (SIZMIN) AND GETSIZ PARAMETERS OF -CC** EMIN AND EMAX -C SUBROUTINE PAVING (NBNODE, NPRM, MLN, IPTPER, NUMPER, LPERIM, & XN, YN, ZN, IEXK, INXE, NNN, LLL, KKK, MXND, ANGLE, & BNSIZE, LNODES, LINKPR, NPERIM, LXK, KXL, NXL, LXN, NUID, @@ -56,14 +13,14 @@ SUBROUTINE PAVING (NBNODE, NPRM, MLN, IPTPER, NUMPER, LPERIM, & NNXK, REMESH, REXMIN, REXMAX, REYMIN, REYMAX, IDIVIS, SIZMIN, & EMAX, EMIN) C*********************************************************************** -C + C SUBROUTINE PAVING = A SUBROUTINE TO PAVE A REGION GIVEN THE INITIAL C BOUNDARY AS A LIST OF NODES. -C + C*********************************************************************** -C + C EXTERNAL VARIABLES: -C + C NBNODE = NUMBER OF NODES ON THE INITIAL BOUNDARY C NPRM = NUMBER OF SEPARATE PERIMETERS IN THE BOUNDARY C (THERE IS ONE OUTSIDE PERIMETER AND ONE PERIMETER FOR @@ -146,9 +103,9 @@ SUBROUTINE PAVING (NBNODE, NPRM, MLN, IPTPER, NUMPER, LPERIM, C REYMIN = MIN Y FOR THE OLD MESH C REYMAX = MAX Y FOR THE OLD MESH C IDIVIS = NUMBER OF DIVISIONS IN THE SEARCH GRID LINK -C + C*********************************************************************** -C + C INTERNAL VARIABLES: C ANGLE = ARRAY OF REALS FOR STORING BOUNDARY NODE ANGLES. C BNSIZE = ARRAY OF REALS FOR STORING ELEMENT SIZE PROPAGATION INFO. @@ -189,43 +146,42 @@ SUBROUTINE PAVING (NBNODE, NPRM, MLN, IPTPER, NUMPER, LPERIM, C A CONTINUATION ROW. C A NEGATIVE FLAG IN THE SECOND COLUMN OF THE LXN ARRAY MEANS C THAT THIS NODE IS AN EXTERIOR BOUNDARY NODE. -C + C*********************************************************************** -C -C + COMMON /TIMING/ TIMEA, TIMEP, TIMEC, TIMEPC, TIMEAJ, TIMES -C + PARAMETER (MXLOOP = 20) PARAMETER (MXCORN = 10) PARAMETER (MXPICK = 1024) -C + C MXPICK MUST BE SET AT (2 ** MXCORN) -C + DIMENSION ICOMB (MXCORN, MXPICK), ITYPE (MXPICK) -C + DIMENSION ANGLE (MXND), BNSIZE (2, MXND), LNODES (MLN, MXND) DIMENSION LINKPR (3, NPRM), NPERIM (NPRM) DIMENSION IPTPER (NPRM), NUMPER (NPRM), LPERIM(NBNODE) DIMENSION IEXK (4, MXND), INXE (2, 3*MXND) -C + DIMENSION LCORN (MXCORN) DIMENSION NLOOP (MXLOOP), NEXTN1 (MXLOOP) -C + DIMENSION XN(MXND), YN(MXND), ZN(MXND), NUID(MXND) DIMENSION LXK(4, MXND), KXL(2, 3*MXND) DIMENSION NXL(2, 3*MXND), LXN(4, MXND) -C + DIMENSION AMESUR(NPEOLD), XNOLD(NPNOLD), YNOLD(NPNOLD) DIMENSION NXKOLD(NNXK, NPEOLD), MMPOLD(3, NPROLD) DIMENSION LINKEG(2, MLINK), LISTEG(2 * NPEOLD), BMESUR(NPNOLD) -C + LOGICAL ERR, DONE, GRAPH, NOROOM, VIDEO, ADJTED LOGICAL SIZEIT, TIMER, CPUBRK, BATCH, REMESH -C + CHARACTER*3 DEV1 -C + IF (REMESH) SIZEIT = .TRUE. -C + TIMEA = 0. TIMEP = 0. TIMEC = 0. @@ -233,12 +189,12 @@ SUBROUTINE PAVING (NBNODE, NPRM, MLN, IPTPER, NUMPER, LPERIM, TIMEAJ = 0. TIMES = 0. CALL GETIME (TIME1) -C + ERR = .FALSE. DONE = .FALSE. -C + C ZERO ALL THE LINK ARRAYS -C + DO 110 I = 1, MXND DO 100 J = 1, 4 LXK (J, I) = 0 @@ -254,9 +210,9 @@ SUBROUTINE PAVING (NBNODE, NPRM, MLN, IPTPER, NUMPER, LPERIM, NXL (J, I) = 0 130 CONTINUE 140 CONTINUE -C + C ZERO THE LOOP COUNTING AND CONNECTING ARRAYS -C + DO 150 I = 1, MXLOOP NLOOP (I) = 0 NEXTN1 (I) = 0 @@ -266,9 +222,9 @@ SUBROUTINE PAVING (NBNODE, NPRM, MLN, IPTPER, NUMPER, LPERIM, LINKPR (2, I) = 0 LINKPR (3, I) = 0 160 CONTINUE -C + C FIND THE EXTREMES OF THE PERIMETERS -C + XMIN = XN (IPTPER (1)) XMAX = XN (IPTPER (1)) YMIN = YN (IPTPER (1)) @@ -287,9 +243,8 @@ SUBROUTINE PAVING (NBNODE, NPRM, MLN, IPTPER, NUMPER, LPERIM, 170 CONTINUE 180 CONTINUE -C C LINK ALL THE NODES IN THE ORIGINAL PERIMETERS TOGETHER -C + DO 190 I = 1, NPRM CALL PERIML (NBNODE, MXND, NUMPER(I), IPTPER (I), MLN, & XN, YN, ZN, LXK, KXL, NXL, LXN, ANGLE, BNSIZE, LNODES, @@ -307,9 +262,9 @@ SUBROUTINE PAVING (NBNODE, NPRM, MLN, IPTPER, NUMPER, LPERIM, NPERIM (1) = NUMPER (I) 190 CONTINUE ITNPER = NBNODE -C + C LINK UP THE REST OF THE LXN ARRAY -C + NNNOLD = NNN LLLOLD = LLL IAVAIL = NNN + 1 @@ -320,9 +275,9 @@ SUBROUTINE PAVING (NBNODE, NPRM, MLN, IPTPER, NUMPER, LPERIM, LXN (3, I) = 0 LXN (4, I) = I + 1 200 CONTINUE -C + C PLOT THE INITIAL BOUNDARIES -C + IF (GRAPH) THEN CALL RPLOTL (MXND, XN, YN, ZN, NXL, XMIN, XMAX, YMIN, YMAX, & ZMIN, ZMAX, LLL, DEV1, KREG) @@ -333,29 +288,29 @@ SUBROUTINE PAVING (NBNODE, NPRM, MLN, IPTPER, NUMPER, LPERIM, YMAX1 = YMAX ZMIN1 = ZMIN ZMAX1 = ZMAX -C + C CHECK INPUT FOR ODDNESS -C + IF (2* (ITNPER/2) .NE. ITNPER) THEN CALL MESAGE ('IN PAVING, NO. OF PERIMETER NODES IS ODD') ERR = .TRUE. GOTO 310 ENDIF -C + C NOW BEGIN TO LOOP THROUGH THE INTERIOR NODE LIST C FILLING ROWS WITH ELEMENTS -C + N1 = LINKPR (1, 1) N0 = LNODES (2, N1) KLOOP = 1 KPERIM = 1 NLOOP (1) = NUMPER (1) -C + 210 CONTINUE -C + C SEE IF IT IS TIME TO SWITCH TO THE NEXT PERIMETER C BY WHETHER THE CURRENT N0 IS INTERIOR OR NOT -C + IF (IABS (LNODES (4, N0)) .EQ. 2) THEN IF (LINKPR (2, KPERIM) .NE. 0) THEN LINKPR (3, KPERIM) = NLOOP (1) @@ -368,19 +323,19 @@ SUBROUTINE PAVING (NBNODE, NPRM, MLN, IPTPER, NUMPER, LPERIM, N0 = LNODES (2, N1) ENDIF ENDIF -C + C NOW GET THE BEST CORNERS FOR THE NEXT ROW -C + CALL GETROW (MXND, MXCORN, MXPICK, MLN, NUID, LXK, KXL, & NXL, LXN, LNODES, NCORN, LCORN, BNSIZE, ANGLE, XN, YN, ZN, & ICOMB, ITYPE, NLOOP (1), N1, NEND, IAVAIL, NAVAIL, LLL, KKK, & NNN, GRAPH, VIDEO, XMIN, XMAX, YMIN, YMAX, ZMIN, ZMAX, DEV1, & KREG, SIZEIT, LINKPR (2, KPERIM), NOROOM, ERR) IF ((NOROOM) .OR. (ERR)) GOTO 310 -C + C CHECK TO SEE IF WE ARE DONE WITH ONLY A QUAD LEFT C (AND THAT THE LOOP IS NOT AN INTERIOR HOLE) -C + IF ((NLOOP (1) .EQ. 4) .AND. (LINKPR (2, KPERIM) .EQ. 0)) THEN CALL CLOSE4 (MXND, MLN, LXK, KXL, NXL, LXN, LNODES, & LNODES (2, N1), N1, LNODES (3, N1), @@ -394,16 +349,11 @@ SUBROUTINE PAVING (NBNODE, NPRM, MLN, IPTPER, NUMPER, LPERIM, & ZMIN, ZMAX, LLL, DEV1, KREG) ENDIF GOTO 240 -C + C CHECK TO SEE IF WE ARE DONE WITH ONLY 6 NODES LEFT -C + ELSEIF ((NLOOP (1) .EQ. 6) .AND. (LINKPR (2, KPERIM) .EQ. 0)) THEN -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/31/90 -CC* MODIFICATION: ADDED ARGUMENTS TO CALL TO CLOSE6 TO PASS MINIMUM -CC** ELEMENT SIZE (SIZMIN) AND GETSIZ PARAMETERS OF -CC** EMIN AND EMAX -C + CALL CLOSE6 (MXND, MXCORN, MLN, NUID, XN, YN, LXK, KXL, NXL, & LXN, ANGLE, BNSIZE, LNODES, N1, NLOOP (1), KKKOLD, & LLLOLD, NNNOLD, NAVAIL, IAVAIL, DONE, XMIN, XMAX, YMIN, @@ -421,17 +371,11 @@ SUBROUTINE PAVING (NBNODE, NPRM, MLN, IPTPER, NUMPER, LPERIM, CALL SFLUSH ENDIF GOTO 240 -C + ENDIF -C + C GENERATE A NEW ROW OF ELEMENTS -C -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/31/90 -CC* MODIFICATION: ADDED ARGUMENTS TO CALL TO ADDROW TO PASS MINIMUM -CC** ELEMENT SIZE (SIZMIN) AND GETSIZ PARAMETERS OF -CC** EMIN AND EMAX -C + CALL ADDROW (MXND, MXCORN * MXPICK, MXLOOP, MLN, NPRM, NUID, XN, & YN, ZN, LXK, KXL, NXL, LXN, ANGLE, BNSIZE, LNODES, N1, NEND, & NLOOP, NEXTN1, LINKPR, KPERIM, KKKOLD, LLLOLD, NNNOLD, IAVAIL, @@ -442,11 +386,11 @@ SUBROUTINE PAVING (NBNODE, NPRM, MLN, IPTPER, NUMPER, LPERIM, & REXMAX, REYMIN, REYMAX, IDIVIS, SIZMIN, EMAX, EMIN) IF ((NOROOM) .OR. (ERR)) GOTO 310 IF (DONE) GOTO 240 -C + C TRY COLLAPSING CORNERS WITH SMALL ANGLES AFTER A ROW HAS BEEN C COMPLETED - NOTE THAT THE ICOMB ARRAY IS SENT TO PINCH IN PLACE C OF THE LCORN ARRAY FOR MORE CORNER PROCESSING CAPABILITIES -C + 220 CONTINUE CALL PINCH (MXND, MXCORN * MXPICK, MLN, NUID, XN, YN, ZN, LXK, & KXL, NXL, LXN, ANGLE, LNODES, BNSIZE, N1, NLOOP (1), KKKOLD, @@ -467,9 +411,9 @@ SUBROUTINE PAVING (NBNODE, NPRM, MLN, IPTPER, NUMPER, LPERIM, C IF ((NOROOM) .OR. (ERR)) GOTO 220 C IF (ISOELM) GOTO 180 C ENDIF -C + C ADJUST THE NEW ROW BY TAKING TUCKS OR INSERTING WEDGES AS NEEDED -C + IF ((NADJ1 .GT. 0) .AND. (NADJ2 .GT. 0) .AND. (NLOOP(1) .GT. 4)) & THEN CALL ADJROW (MXND, MLN, NUID, XN, YN, ZN, LXK, KXL, NXL, LXN, @@ -480,9 +424,9 @@ SUBROUTINE PAVING (NBNODE, NPRM, MLN, IPTPER, NUMPER, LPERIM, IF ((NOROOM) .OR. (ERR)) GOTO 310 IF (ADJTED) GOTO 220 ENDIF -C + C CHECK TO SEE IF ANY OF THE CONCURRENT PERIMETERS OVERLAP -C + IF (LINKPR (2, KPERIM) .NE. 0) THEN LINKPR (3, KPERIM) = NLOOP (1) CALL PCROSS (MXND, MXCORN * MXPICK, MLN, MXLOOP, NPRM, NUID, @@ -493,11 +437,11 @@ SUBROUTINE PAVING (NBNODE, NPRM, MLN, IPTPER, NUMPER, LPERIM, & GRAPH, VIDEO, KREG, NOROOM, ERR) IF ((NOROOM) .OR. (ERR)) GOTO 310 ENDIF -C + C TRY COLLAPSING OVERLAPPING SIDES TO FORM TWO LOOPS OUT OF THE C CURRENT SINGLE LOOP - NOTE THAT THE ICOMB ARRAY IS SENT AS C WHEN CALLING PINCH IN PLACE OF THE LCORN ARRAY -C + 230 CONTINUE IF (NLOOP (1) .GT. 6) THEN CALL COLAPS (MXND, MXCORN * MXPICK, MLN, MXLOOP, NUID, XN, @@ -509,9 +453,9 @@ SUBROUTINE PAVING (NBNODE, NPRM, MLN, IPTPER, NUMPER, LPERIM, IF ((NOROOM) .OR. (ERR)) GOTO 310 IF (DONE) GOTO 240 ENDIF -C + C ADJUST THE ZOOMS TO FIT THE NEW AREA -C + IF ((GRAPH) .OR. (CPUBRK (.TRUE.))) THEN LINKPR (3, KPERIM) = NLOOP (1) CALL FLMNMX (MXND, MLN, NPRM, LINKPR, KPERIM, LNODES, @@ -521,9 +465,9 @@ SUBROUTINE PAVING (NBNODE, NPRM, MLN, IPTPER, NUMPER, LPERIM, & YMIN, YMAX, ZMIN, ZMAX, LLL, DEV1, KREG) ENDIF GOTO 210 -C + C CHECK TO MAKE SURE THAT OTHER LOOPS ARE NOT REMAINING TO BE FILLED -C + 240 CONTINUE IF (KLOOP .GT. 1) THEN N1 = NEXTN1 (1) @@ -534,9 +478,9 @@ SUBROUTINE PAVING (NBNODE, NPRM, MLN, IPTPER, NUMPER, LPERIM, NLOOP (KLOOP) = 0 NEXTN1 (KLOOP) = 0 KLOOP = KLOOP - 1 -C + C ADJUST THE ZOOMS TO FIT THE NEW AREA -C + IF (GRAPH) THEN CALL FLMNMX (MXND, MLN, NPRM, LINKPR, KPERIM, LNODES, & XN, YN, NLOOP (1), N1, XMIN, XMAX, YMIN, YMAX, ERR) @@ -545,15 +489,15 @@ SUBROUTINE PAVING (NBNODE, NPRM, MLN, IPTPER, NUMPER, LPERIM, & YMIN, YMAX, ZMIN, ZMAX, LLL, DEV1, KREG) ENDIF DONE = .FALSE. -C + C ENTER THE FILL LOOP WHERE IT CAN CHECK TO SEE IF ANY CROSSINGS C ALREADY EXIST IN THIS LOOP -C + GOTO 230 ENDIF -C + C THE FILL HAS BEEN COMPLETED - NOW FIX UP ANY BAD SPOTS -C + DO 260 I = 1, NNN LNODES (4, I) = IABS (LNODES (4, I)) 260 CONTINUE @@ -571,9 +515,9 @@ SUBROUTINE PAVING (NBNODE, NPRM, MLN, IPTPER, NUMPER, LPERIM, CALL FILSMO (MXND, MLN, XN, YN, ZN, LXK, KXL, NXL, LXN, & LLL, NNN, NNN, LNODES, BNSIZE, NLOOP (1), XMIN, XMAX, YMIN, & YMAX, ZMIN, ZMAX, DEV1, KREG) -C + C SUCCESSFUL EXIT -C + IF (GRAPH) THEN CALL RPLOTL (MXND, XN, YN, ZN, NXL, XMIN1, XMAX1, YMIN1, & YMAX1, ZMIN1, ZMAX1, LLL, DEV1, KREG) @@ -594,7 +538,7 @@ SUBROUTINE PAVING (NBNODE, NPRM, MLN, IPTPER, NUMPER, LPERIM, 301 CONTINUE C EXIT WITH ERROR -C + 310 CONTINUE IF ((ERR) .AND. (.NOT. BATCH)) THEN CALL RPLOTL (MXND, XN, YN, ZN, NXL, XMIN1, XMAX1, YMIN1, YMAX1, @@ -602,7 +546,7 @@ SUBROUTINE PAVING (NBNODE, NPRM, MLN, IPTPER, NUMPER, LPERIM, CALL RINGBL CALL SFLUSH ENDIF -C + IF (TIMER) THEN CALL GETIME (TIME2) WRITE (*, ' (A, F10.5)')' CPU SECONDS USED: ', TIME2-TIME1 @@ -618,5 +562,5 @@ SUBROUTINE PAVING (NBNODE, NPRM, MLN, IPTPER, NUMPER, LPERIM, & TIMES * 100. / (TIME2 - TIME1) ENDIF RETURN -C + END diff --git a/packages/seacas/applications/fastq/pcross.f b/packages/seacas/applications/fastq/pcross.f index 17ddd43ed8bf..33175cbba1f3 100644 --- a/packages/seacas/applications/fastq/pcross.f +++ b/packages/seacas/applications/fastq/pcross.f @@ -1,40 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pcross.f,v 1.4 2000/11/13 15:39:05 gdsjaar Exp $ -C $Log: pcross.f,v $ -C Revision 1.4 2000/11/13 15:39:05 gdsjaar -C Cleaned up unused variables and labels. -C -C Removed some real to int conversion warnings. -C -C Revision 1.3 1999/06/17 19:02:22 gdsjaar -C Fixed several problems related to holes. In several places, a -C nonpositive integer was being used to index into an array. This seems -C to fix all of those cases. I'm not sure if I fixed the true cause of -C these errors or just the symptom though... -C -C Revision 1.2 1998/07/14 18:19:30 gdsjaar -C Removed unused variables, cleaned up a little. -C -C Changed BLUE labels to GREEN to help visibility on black background -C (indirectly requested by a couple users) -C -C Revision 1.1.1.1 1990/11/30 11:13:11 gdsjaar -C FASTQ Version 2.0X -C -c Revision 1.1 90/11/30 11:13:10 gdsjaar -c Initial revision -c -C -CC* FILE: [.PAVING]PCROSS.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE PCROSS (MXND, MXCORN, MLN, MXLOOP, MAXPRM, NUID, & XN, YN, ZN, LXK, KXL, NXL, LXN, ANGLE, LNODES, BNSIZE, LINKPR, & KPERIM, NODE, NODE1, NODE2, KKKOLD, LLLOLD, NNNOLD, IAVAIL, @@ -42,46 +11,46 @@ SUBROUTINE PCROSS (MXND, MXCORN, MLN, MXLOOP, MAXPRM, NUID, & KKK, NNN, LCORN, NCORN, NLOOP, NEXTN1, KLOOP, GRAPH, VIDEO, & KREG, NOROOM, ERR) C*********************************************************************** -C + C SUBROUTINE PCROSS = CHECKS TO SEE IF ANY PERIMETERS CROSS AND HOOKS C THEM TOGETHER IF THEY DO -C + C*********************************************************************** -C + COMMON /TIMING/ TIMEA, TIMEP, TIMEC, TIMEPC, TIMEAJ, TIMES -C + DIMENSION XN (MXND), YN (MXND), ZN (MXND), NUID (MXND) DIMENSION LXK (4, MXND), KXL (2, 3*MXND) DIMENSION NXL (2, 3*MXND), LXN (4, MXND) DIMENSION ANGLE (MXND), LNODES (MLN, MXND), BNSIZE (2, MXND) DIMENSION LCORN (MXCORN) DIMENSION NLOOP (MXLOOP), NEXTN1 (MXLOOP), LINKPR (3, MAXPRM) -C + CHARACTER*3 DEV1 -C + LOGICAL DONE, ERR, NOROOM, DONE1 LOGICAL GRAPH, BOK, LCROSS, LMATCH LOGICAL VIDEO, PMATCH -C + C FIND THE FIRST OVERLAPPING LINE STARTING AT THE CURRENT NODE -C + CALL GETIME (TIME1) ERR = .FALSE. PMATCH = .TRUE. -C + 100 CONTINUE if (node1 .eq. 0) return N1 = NODE1 KOUNT = 0 -C + 110 CONTINUE N0 = LNODES (2, N1) N2 = LNODES (3, N1) N3 = LNODES (3, N2) KOUNT = KOUNT + 1 -C + C CHECK FOR COMPLETION -C + IF ((N1 .EQ. NODE2) .AND. (KOUNT .GT. 1)) THEN GOTO 140 ELSEIF (KOUNT .GT. NLOOP (1) + 1) THEN @@ -89,25 +58,25 @@ SUBROUTINE PCROSS (MXND, MXCORN, MLN, MXLOOP, MAXPRM, NUID, ERR = .TRUE. GOTO 140 ENDIF -C + C LOOP THROUGH ALL THE REMAINING PERIMETERS CHECKING FOR CROSSINGS -C + IPERIM = LINKPR (2, KPERIM) 120 CONTINUE -C + IF (IPERIM .EQ. KPERIM) THEN N1 = N2 GOTO 110 ENDIF -C + KOUNT2 = 0 N1TEST = LINKPR (1, IPERIM) -C + 130 CONTINUE N0TEST = LNODES (2, N1TEST) N2TEST = LNODES (3, N1TEST) N3TEST = LNODES (3, N2TEST) -C + CALL INTSCT (XN(N1), YN(N1), XN(N2), YN(N2), XN(N1TEST), & YN(N1TEST), XN(N2TEST), YN(N2TEST), U, W, LCROSS) IF (.NOT. LCROSS) THEN @@ -124,10 +93,10 @@ SUBROUTINE PCROSS (MXND, MXCORN, MLN, MXLOOP, MAXPRM, NUID, ENDIF GOTO 130 ENDIF -C + C AN INTERSECTION HAS OCCURRED. C GET THE BEST SEAM FROM THIS INTERSECTION -C + IF ((GRAPH) .OR. (VIDEO)) THEN CALL RPLOTL (MXND, XN, YN, ZN, NXL, XMIN, XMAX, & YMIN, YMAX, ZMIN, ZMAX, LLL, DEV1, KREG) @@ -164,10 +133,10 @@ SUBROUTINE PCROSS (MXND, MXCORN, MLN, MXLOOP, MAXPRM, NUID, ENDIF GOTO 130 ENDIF -C + C NOW CHECK TO SEE IF THE ATTACHMENT WOULD CAUSE C LINES ON THE BOUNDARY TO CROSS -C + CALL BCROSS (MXND, MLN, XN, YN, ZN, LXK, KXL, NXL, LXN, LNODES, & I1, I2, J1, J2, NLOOP(1), BOK, LLL, XMIN, XMAX, YMIN, YMAX, & ZMIN, ZMAX, DEV1, KREG, ERR) @@ -186,16 +155,16 @@ SUBROUTINE PCROSS (MXND, MXCORN, MLN, MXLOOP, MAXPRM, NUID, ENDIF GOTO 130 ENDIF -C + C NOW THAT THE APPROPRIATE COLLAPSE HAS BEEN FOUND, THE TWO LINES C MUST BE JOINED AND THE PERIMETER LINKS RESTABLISHED -C + CALL SEW2 (MXND, MLN, NUID, LXK, KXL, NXL, LXN, LNODES, & IAVAIL, NAVAIL, LLL, KKK, NNN, I1, I2, J1, J2, NOROOM, ERR) IF ((NOROOM) .OR. (ERR)) GOTO 140 -C + C UPDATE THE CURRENT NODE -C + IF (J1 .EQ. NODE) THEN NDUM = NODE NODE = I2 @@ -207,7 +176,7 @@ SUBROUTINE PCROSS (MXND, MXCORN, MLN, MXLOOP, MAXPRM, NUID, IF (NODE1 .EQ. NDUM) NODE1 = I1 IF (NODE2 .EQ. NDUM) NODE2 = I1 ENDIF -C + NLOOP (1) = NLOOP (1) + LINKPR (3, IPERIM) - 2 LINKPR (3, KPERIM) = NLOOP (1) JPERIM = LINKPR (2, IPERIM) @@ -216,9 +185,9 @@ SUBROUTINE PCROSS (MXND, MXCORN, MLN, MXLOOP, MAXPRM, NUID, LINKPR (2, IPERIM) = LINKPR (2, JPERIM) LINKPR (3, IPERIM) = LINKPR (3, JPERIM) IF (LINKPR (2, KPERIM) .EQ. KPERIM) LINKPR (2, KPERIM) = 0 -C + C NOW SMOOTH AND PLOT THE CURRENT MESH -C + NNN2 = 1 CALL GETIME (TIME2) TIMEPC = TIMEPC + TIME2 - TIME1 @@ -237,9 +206,9 @@ SUBROUTINE PCROSS (MXND, MXCORN, MLN, MXLOOP, MAXPRM, NUID, CALL SFLUSH ENDIF ENDIF -C + C NOW TRY TO PINCH THE CONNECTION -C + CALL LUPANG (MXND, MLN, XN, YN, ZN, LXK, KXL, NXL, LXN, NLOOP (1), & ANGLE, LNODES, I2, LLL, XMIN, XMAX, YMIN, YMAX, ZMIN, ZMAX, & DEV1, KREG, ERR) @@ -255,10 +224,10 @@ SUBROUTINE PCROSS (MXND, MXCORN, MLN, MXLOOP, MAXPRM, NUID, IF ((NOROOM) .OR. (ERR)) GOTO 140 IF (LINKPR(2, KPERIM) .NE. 0) GO TO 100 CALL GETIME (TIME1) -C + 140 CONTINUE CALL GETIME (TIME2) TIMEPC = TIMEPC + TIME2 - TIME1 RETURN -C + END diff --git a/packages/seacas/applications/fastq/pdata.f b/packages/seacas/applications/fastq/pdata.f index 6ddfceb11fd6..777ea2291fb4 100644 --- a/packages/seacas/applications/fastq/pdata.f +++ b/packages/seacas/applications/fastq/pdata.f @@ -1,52 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pdata.f,v 1.5 2007/07/24 13:10:18 gdsjaar Exp $ -C $Log: pdata.f,v $ -C Revision 1.5 2007/07/24 13:10:18 gdsjaar -C Fix problem with boundary condition memory overwrite. -C -C Remove old ls5 and r25 terminal tests -C -C Revision 1.4 1999/06/21 22:43:40 gdsjaar -C Fixed more uninitialized variables; one was causing core dump on g77 -C compiled executable. -C -C VERSN was not consistently defined -- now 10 characters everywhere -C -C Updated so full version string output -C -C Added capability to debug memory using unit specified in EXT99 -C variable. Similar to STRTUP in SUPLIB -C -C Cleaned up some other code -C -C Upped version -C -C Revision 1.3 1998/07/14 18:19:31 gdsjaar -C Removed unused variables, cleaned up a little. -C -C Changed BLUE labels to GREEN to help visibility on black background -C (indirectly requested by a couple users) -C -C Revision 1.2 1992/12/08 22:13:54 gdsjaar -C Changed color of point label output from yellow to red -C -c Revision 1.1.1.1 1990/11/30 11:13:14 gdsjaar -c FASTQ Version 2.0X -c -c Revision 1.1 90/11/30 11:13:13 gdsjaar -c Initial revision -c -C -CC* FILE: [.MAIN]PDATA.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE PDATA (MP, ML, MR, MSC, IPOINT, COOR, IPBOUN, ILINE, & LTYPE, NINT, LCON, FACTOR, ILBOUN, ISBOUN, IREGN, IMAT, LINKP, & LINKL, LINKR, LINKSC, RSIZE, SCHEME, DEFSCH, DEFSIZ, REXTRM, @@ -54,11 +11,11 @@ SUBROUTINE PDATA (MP, ML, MR, MSC, IPOINT, COOR, IPBOUN, ILINE, & LABSBD, LABSC, LABSZ, AXISD, TITLE, XMIN, XMAX, YMIN, YMAX, & XX1, YY1, XX2, YY2, DEV1, VERSN) C*********************************************************************** -C + C SUBROUTINE PDATA = PLOTS FLAGGED POINTS, LINES, AND REGIONS -C + C*********************************************************************** -C + DIMENSION IPOINT (MP), COOR (2, MP), IPBOUN (MP) DIMENSION ILINE (ML), LTYPE (ML), NINT (ML), LCON (3, ML) DIMENSION FACTOR (ML) @@ -68,17 +25,17 @@ SUBROUTINE PDATA (MP, ML, MR, MSC, IPOINT, COOR, IPBOUN, ILINE, DIMENSION LINKP (2, MP), LINKL (2, ML), LINKR (2, MR) DIMENSION LINKSC (2, MR) DIMENSION N (29), XDUM (2), YDUM (2) -C + CHARACTER*72 DUMMY, SCHEME, DEFSCH, TITLE, DEV1*3 CHARACTER*8 DATE, TIME, VERSN*10 -C + LOGICAL LABP, LABL, LABR, AXISD, LABMD, LABI, LABF LOGICAL LABPB, LABLB, LABSBD LOGICAL ADDLNK, CPUIFC, TEST, FULL, LABSC LOGICAL GETMAX, ADD, LABSZ -C + C INITIALIZE THE PLOTTING SURFACE -C + TEST = .FALSE. GETMAX = .FALSE. IF (TEST)OPEN (UNIT = 12, FILE = 'HP7580.DAT', STATUS = 'NEW') @@ -107,9 +64,9 @@ SUBROUTINE PDATA (MP, ML, MR, MSC, IPOINT, COOR, IPBOUN, ILINE, XX1 = XMIN XX2 = XMAX ENDIF -C + C SET UP SCALING EXTREMES FOR AXIS -C + IF (TEST) THEN WRITE (12, 10000)'IN;SP6;;IP - 5710, -10060, 15710, 10060;' WRITE (12, 10010) @@ -125,18 +82,18 @@ SUBROUTINE PDATA (MP, ML, MR, MSC, IPOINT, COOR, IPBOUN, ILINE, ELSE SHRINK = .1 ENDIF -C + C SHRINK TO FIT A BORDER ON THE PLOT -C + XX1 = XX1 - (XDIMR*SHRINK) XX2 = XX2 + (XDIMR*SHRINK) YY1 = YY1 - (YDIMR*SHRINK) YY2 = YY2 + (YDIMR*SHRINK) CALL MPORT2 (XX1, XX2, YY1, YY2) CALL PLTFRM (0) -C + C PLOT THE TITLE AND THE TRACE -C + CALL STRLNG (TITLE, LEN) IF ( (LEN.GT.1) .OR. (TITLE (1:1).NE.' ')) THEN CALL PLTXHL (TITLE (1:LEN), XLEN) @@ -152,14 +109,14 @@ SUBROUTINE PDATA (MP, ML, MR, MSC, IPOINT, COOR, IPBOUN, ILINE, CALL EXTIME (TIME) DUMMY(33:40) = TIME CALL PLTXTH (0., 0., DUMMY(1:40)) -C + C DRAW THE AXIS IF REQUIRED, AND SET CLIPPING WITHIN AXIS -C + IF (AXISD)CALL SETAXS (XDUM, YDUM) IF (CPUIFC (.TRUE.))GOTO 130 -C + C PLOT THE POINTS FLAGGED -C + IF ( (LABP) .OR. (LABPB)) THEN DO 100 I = 1, N (18) IF (CPUIFC (.TRUE.))GOTO 130 @@ -170,18 +127,18 @@ SUBROUTINE PDATA (MP, ML, MR, MSC, IPOINT, COOR, IPBOUN, ILINE, CALL MP2PT (1, COOR (1, II), COOR (2, II), & X1, Y1, MASK) IF (MOD (MASK, 2).NE.0) THEN -C + C PLOT THE POINT LABELS -C + IF (LABP) THEN CALL PLTSTD (1, 1.) CALL GETDUM (INUM, DUMMY, LEN) CALL PLTXTH (X1, Y1, DUMMY (1:LEN)) CALL PLTXHE (X1, Y1) ENDIF -C + C PLOT THE POINBC FLAGS -C + IF ( ( (LABPB) .OR. ( (FULL) .AND. (LABP))) .AND. & (IPBOUN (II).GT.0)) THEN CALL PLTSTD (1, 5.) @@ -197,9 +154,9 @@ SUBROUTINE PDATA (MP, ML, MR, MSC, IPOINT, COOR, IPBOUN, ILINE, ENDIF 100 CONTINUE ENDIF -C + C PLOT ALL LINES THAT HAVE BEEN FLAGGED -C + DO 110 I = 1, N (19) IF (CPUIFC (.TRUE.))GOTO 130 CALL LTSORT (ML, LINKL, I, II, ADDLNK) @@ -233,9 +190,9 @@ SUBROUTINE PDATA (MP, ML, MR, MSC, IPOINT, COOR, IPBOUN, ILINE, CALL DLINE (MP, ML, COOR, LINKP, KNUM, LT, IP1, IP2, & IP3, LABL, X1, Y1, TEST, GETMAX, DUM1, DUM2, DUM3, & DUM4) -C + C PLOT INTERVAL NUMBERS -C + IF ( ( (FULL) .AND. (LABL)) .OR. (LABI)) THEN CALL PLTSTD (1, 5.) IF (ADD) THEN @@ -254,9 +211,9 @@ SUBROUTINE PDATA (MP, ML, MR, MSC, IPOINT, COOR, IPBOUN, ILINE, CALL PLTXTH (X1, Y1, DUMMY (1:LEN)) ADD = .TRUE. ENDIF -C + C PLOT THE LINE FACTOR -C + IF ( ( (FULL) .AND. (LABL)) .OR. (LABF)) THEN IF (ADD) THEN CALL PLTSTD (1, 1.) @@ -268,9 +225,9 @@ SUBROUTINE PDATA (MP, ML, MR, MSC, IPOINT, COOR, IPBOUN, ILINE, CALL PLTXTH (X1, Y1, DUMMY (1:LEN)) ADD = .TRUE. ENDIF -C + C PLOT THE LINEBC FLAGS -C + IF ( ( ( (FULL) .AND. (LABL)) .OR. (LABLB)) .AND. & (ILBOUN (II).GT.0)) THEN CALL PLTSTD (1, 2.) @@ -283,9 +240,9 @@ SUBROUTINE PDATA (MP, ML, MR, MSC, IPOINT, COOR, IPBOUN, ILINE, CALL PLTXTH (X1, Y1, DUMMY (1:LEN)) ADD = .TRUE. ENDIF -C + C PLOT THE SIDEBC FLAGS -C + IF ( ( ( (FULL) .AND. (LABL)) .OR. (LABSBD)) .AND. & (ISBOUN (II).GT.0)) THEN CALL PLTSTD (1, 3.) @@ -301,9 +258,9 @@ SUBROUTINE PDATA (MP, ML, MR, MSC, IPOINT, COOR, IPBOUN, ILINE, ENDIF ENDIF 110 CONTINUE -C + C PLOT ALL REGIONS FLAGGED -C + IF ( (LABR) .OR. (LABMD) .OR. (LABSC) .OR. (LABSZ)) THEN IF (CPUIFC (.TRUE.))GOTO 130 DO 120 I = 1, N (22) @@ -316,18 +273,18 @@ SUBROUTINE PDATA (MP, ML, MR, MSC, IPOINT, COOR, IPBOUN, ILINE, YMID = (REXTRM (3, II) + REXTRM (4, II))/2. CALL MP2PT (1, XMID, YMID, X1, Y1, MASK) IF ( (MOD (MASK, 2).NE.0)) THEN -C + C PLOT THE REGION NUMBER -C + IF (LABR) THEN CALL PLTSTD (1, 2.) CALL GETDUM (INUM, DUMMY, LEN) CALL PLTXTH (X1, Y1, DUMMY (1:LEN)) ADD = .TRUE. ENDIF -C + C PLOT OUT THE MATERIAL NUMBER -C + IF (((FULL) .AND. (LABR)) .OR. (LABMD)) THEN CALL PLTSTD (1, 1.) IF (ADD) THEN @@ -339,9 +296,9 @@ SUBROUTINE PDATA (MP, ML, MR, MSC, IPOINT, COOR, IPBOUN, ILINE, CALL GETDUM (IMAT (II), DUMMY, LEN) CALL PLTXTH (X1, Y1, DUMMY (1:LEN)) ENDIF -C + C PLOT OUT THE SIZE NUMBER FOR THE REGION -C + IF (((FULL) .AND. (LABR)) .OR. (LABSZ)) THEN CALL PLTSTD (1, 1.) IF (ADD) THEN @@ -353,9 +310,9 @@ SUBROUTINE PDATA (MP, ML, MR, MSC, IPOINT, COOR, IPBOUN, ILINE, CALL GTXDUM (RSIZE (II), DUMMY, LEN) CALL PLTXTH (X1, Y1, DUMMY (1:LEN)) ENDIF -C + C PLOT OUT THE SCHEME -C + IF (((FULL) .AND. (LABR)) .OR. (LABSC)) THEN CALL PLTSTD (1, 7.) IF (ADD) THEN @@ -393,11 +350,11 @@ SUBROUTINE PDATA (MP, ML, MR, MSC, IPOINT, COOR, IPBOUN, ILINE, CALL PLTSTD (1, 7.) CALL PLTBEL CALL PLTFLU -C + RETURN -C + 10000 FORMAT (A) 10010 FORMAT (A2, I10, A1, I10, A1, I10, A1, I10, A1) 10020 FORMAT (A5, I10, A1, I10, A3, A, A1) -C + END diff --git a/packages/seacas/applications/fastq/perim.f b/packages/seacas/applications/fastq/perim.f index 897271335dd5..28342967dee9 100644 --- a/packages/seacas/applications/fastq/perim.f +++ b/packages/seacas/applications/fastq/perim.f @@ -1,32 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: perim.f,v 1.2 2001/11/05 13:26:51 gdsjaar Exp $ -C $Log: perim.f,v $ -C Revision 1.2 2001/11/05 13:26:51 gdsjaar -C Fixed array boundary problem in region check code. -C -C Revision 1.1.1.1 1990/11/30 11:13:18 gdsjaar -C FASTQ Version 2.0X -C -c Revision 1.1 90/11/30 11:13:16 gdsjaar -c Initial revision -c -C -CC* FILE: [.QMESH]PERIM.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/31/90 -CC* MODIFICATION: ADDED ARGUMENTS TO CALL TO PERIM TO PASS MINIMUM -CC** ELEMENT SIZE (SIZMIN) AND GETSIZ PARAMETERS OF -CC** EMIN AND EMAX -C SUBROUTINE PERIM (MP, ML, MS, NS, MAXNL, MAXNP, MAXNBC, MAXSBC, & KNBC, KSBC, KNUM, IPOINT, COOR, IPBOUN, ILINE, LTYPE, NINT, & FACTOR, LCON, ILBOUN, ISBOUN, ISIDE, NLPS, IFLINE, ILLIST, @@ -37,16 +14,16 @@ SUBROUTINE PERIM (MP, ML, MS, NS, MAXNL, MAXNP, MAXNBC, MAXSBC, & BMESUR, MLINK, NPROLD, NPNOLD, NPEOLD, NNXK, REMESH, REXMIN, & REXMAX, REYMIN, REYMAX, IDIVIS, SIZMIN, EMAX, EMIN) C*********************************************************************** -C + C SUBROUTINE PERIM = GENERATES THE PERIMETER OF A REGION -C + C*********************************************************************** -C + C SUBROUTINE CALLED BY: C QMESH = GENERATES THE QUADRILATERAL MESH -C + C*********************************************************************** -C + C VARIABLES USED: C X = THE X VALUES OF THE PERIMETER LIST C Y = THE Y VALUES OF THE PERIMETER LIST @@ -55,9 +32,9 @@ SUBROUTINE PERIM (MP, ML, MS, NS, MAXNL, MAXNP, MAXNBC, MAXSBC, C IF 1XXXXYYYYY, XXXX IS AN INDEX INTO THE LINE TABLE. C N = THE NUMBER OF NODES ON THE PERIMETER C ERR = .TRUE. IF ERRORS WERE ENCOUNTERED -C + C*********************************************************************** -C + DIMENSION IPOINT (MP), COOR (2, MP), IPBOUN (MP) DIMENSION ILINE (ML), NINT (ML), LTYPE (ML) DIMENSION FACTOR (ML), LCON (3, ML) @@ -70,14 +47,14 @@ SUBROUTINE PERIM (MP, ML, MS, NS, MAXNL, MAXNP, MAXNBC, MAXSBC, DIMENSION LINKLB (2, ML), NLPF (ML), IFLB (ML), LISTLB (2, ML) DIMENSION LINKSB (2, ML), NSPF (ML), IFSB (ML), LISTSB (2, ML) DIMENSION LSTNBC (MAXNBC), MARKED (3, MAXNL) -C + DIMENSION AMESUR(NPEOLD), XNOLD(NPNOLD), YNOLD(NPNOLD) DIMENSION NXKOLD(NNXK, NPEOLD), MMPOLD(3, NPROLD) DIMENSION LINKEG(2, MLINK), LISTEG(4 * NPEOLD), BMESUR(NPNOLD) -C + LOGICAL ERR, REAL, EVEN, CCW, TEST, ADDLNK, ITRIED, INDETR, NOROOM LOGICAL COUNT, REMESH, GRAPH -C + N = 0 ADDLNK = .FALSE. GRAPH = .FALSE. @@ -113,16 +90,16 @@ SUBROUTINE PERIM (MP, ML, MS, NS, MAXNL, MAXNP, MAXNBC, MAXSBC, CALL MPORT2 (XX1, XX2, YY1, YY2) CALL PLTFRM (0) ENDIF -C + C GET LIST OF LINES -C + CALL LLIST (MS, ML, MAXNL, NS, NL, KNUM, LISTL, ILINE, ISIDE, & NLPS, IFLINE, ILLIST, LCON, ISLIST, LINKS, LINKL, ERR) IF (ERR)RETURN ERR = .TRUE. -C + C DEFINE VALUE OF KP, THE BEGINNING CONNECTIVITY POINT -C + IF (NL .LT. 2) THEN CALL LTSORT (ML, LINKL, LISTL (1), ILI, ADDLNK) KP = LCON (1, ILI) @@ -142,10 +119,10 @@ SUBROUTINE PERIM (MP, ML, MS, NS, MAXNL, MAXNP, MAXNBC, MAXSBC, RETURN ENDIF ENDIF -C + C IF PERIMETER HAS ODD NUMBER OF POINTS, C DO A TRIAL PERIMETER GENERATION TO SEE WHERE TO INSERT A NODE. -C + IF (EVEN) THEN NUMINT = 0 DO 100 IL = 1, NL @@ -157,10 +134,10 @@ SUBROUTINE PERIM (MP, ML, MS, NS, MAXNL, MAXNP, MAXNBC, MAXSBC, IX = 0 DO 140 IL = 1, NL CALL LTSORT (ML, LINKL, LISTL (IL), ILI, ADDLNK) -C + C SKIP PREVIOUSLY USED LINES C SKIP LINES USED TWICE IN THIS BOUNDARY (RECALL ANNULUS) -C + IF (NINT (ILI) .GT. 0) THEN DO 110 I = 1, NL CALL LTSORT (ML, LINKL, LISTL (I), IPNTR, ADDLNK) @@ -178,12 +155,7 @@ SUBROUTINE PERIM (MP, ML, MS, NS, MAXNL, MAXNP, MAXNBC, MAXSBC, IP3 = 0 ENDIF TEST = .TRUE. -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/31/90 -CC* MODIFICATION: ADDED ARGUMENTS TO CALL TO PLINE TO PASS MINIMUM -CC** ELEMENT SIZE (SIZMIN) AND GETSIZ PARAMETERS OF -CC** EMIN AND EMAX -C + CALL PLINE (MP, ML, MAXNP, MAXNBC, MAXSBC, IPOINT, & COOR, LINKP, ILINE (ILI), LTYPE (ILI), NINT (ILI), & FACTOR (ILI), IP1, IP2, IP3, X, Y, NID, @@ -224,9 +196,9 @@ SUBROUTINE PERIM (MP, ML, MS, NS, MAXNL, MAXNP, MAXNBC, MAXSBC, WRITE (*, 10010)KNUM RETURN ENDIF -C + C RECALCULATE THE NUMBER OF INTERVALS IF REMESHING -C + IF (REMESH) THEN NUMINT = 0 DO 150 IL = 1, NL @@ -243,9 +215,9 @@ SUBROUTINE PERIM (MP, ML, MS, NS, MAXNL, MAXNP, MAXNBC, MAXSBC, ENDIF ENDIF ENDIF -C + C NOW LOOP THROUGH THE LINES TO GENERATE THE PERIMETER -C + IF (GRAPH) THEN CALL PLTBGN CALL MPVIEW (0., XDIMD, 0., YDIMD) @@ -276,12 +248,7 @@ SUBROUTINE PERIM (MP, ML, MS, NS, MAXNL, MAXNP, MAXNBC, MAXSBC, ENDIF IMAXNP = MAXNP-N TEST = .FALSE. -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/31/90 -CC* MODIFICATION: ADDED ARGUMENTS TO CALL TO PLINE TO PASS MINIMUM -CC** ELEMENT SIZE (SIZMIN) AND GETSIZ PARAMETERS OF -CC** EMIN AND EMAX -C + if (imaxnp .lt. nint(ili)) then stop 'ERROR: Intervals larger than space' end if @@ -298,26 +265,26 @@ SUBROUTINE PERIM (MP, ML, MS, NS, MAXNL, MAXNP, MAXNBC, MAXSBC, & GRAPH, DXMAX) IF (ERR)RETURN ERR = .TRUE. -C + C REVERSE LINE IF NECESSARY -C + IF (K1.NE.KP) THEN CALL REVERS (X (N+1), IABS (NINT (ILI))+1) CALL REVERS (Y (N+1), IABS (NINT (ILI))+1) CALL IREVER (NID (N+1), IABS (NINT (ILI))+1) ENDIF IF (N .GT. 0)NID (N+1) = NIDSAV -C + C FINISH UP WITH THIS LINE C KP IS THE POINT ON THE FAR END OF THE LINE C DON'T INCLUDE THE LAST POINT ON THIS LINE IN THE LIST -C + KP = (K1+K2)-KP N = N+IABS (NINT (ILI)) -C + C MARK ALL THE LINES AS USED AND C REMEMBER WHICH HAVE JUST BEEN MARKED -C + IF (IPOINT (IP1) .GT. 0) THEN MARKED (1, IL) = IP1 IPOINT (IP1) = - IABS (IPOINT (IP1)) @@ -337,17 +304,17 @@ SUBROUTINE PERIM (MP, ML, MS, NS, MAXNL, MAXNP, MAXNBC, MAXSBC, MARKED (3, IL) = 0 ENDIF 170 CONTINUE -C + C LINES ARE EXHAUSTED - CHECK FOR CIRCULARITY -C + CALL LTSORT (ML, LINKL, LISTL (1), ILI, ADDLNK) IF (KP.NE.J1) THEN WRITE (*, 10000)ILINE (ILI) RETURN ENDIF -C + C RESET THE JUST MARKED LINES -C + DO 180 I = 1, NL IF (MARKED (1, I) .GT. 0) & IPOINT (MARKED (1, I)) = IABS (IPOINT (MARKED (1, I))) @@ -356,14 +323,14 @@ SUBROUTINE PERIM (MP, ML, MS, NS, MAXNL, MAXNP, MAXNBC, MAXSBC, IF (MARKED (3, I) .GT. 0) & NINT (MARKED (3, I)) = IABS (NINT (MARKED (3, I))) 180 CONTINUE -C + C PERIMETER COMPLETED C INSURE PROPER ORIENTATION (COUNTER-CLOCKWISE) -C + CALL CCLOCK (X, Y, N, CCW, ERR, INDETR) -C + C THE LINE ORIENTATION MAY BE BAD - TRY A SIMPLE FIX -C + IF ((INDETR).AND. (.NOT.ITRIED)) THEN DO 190 IL = 1, NL CALL LTSORT (ML, LINKL, LISTL (IL), ILI, ADDLNK) @@ -383,16 +350,16 @@ SUBROUTINE PERIM (MP, ML, MS, NS, MAXNL, MAXNP, MAXNBC, MAXSBC, CALL REVERS (Y (2), N-1) CALL IREVER (NID (2), N-1) ENDIF -C + C EXIT -C + ERR = .FALSE. RETURN -C + 10000 FORMAT (' LINE', I5, ' DOES NOT CONNECT TO THE', /, + ' PREVIOUS SECTION OF THE PERIMETER') 10010 FORMAT (' IN REGION', I5, ' NO LINE IS ALTERABLE TO ENFORCE', /, + ' AN EVEN NUMBER OF PERIMETER POINTS') 10020 FORMAT (' NO. OF INTERVALS ON LINE', I5, ' WAS INCREASED BY 1') -C + END diff --git a/packages/seacas/applications/fastq/periml.f b/packages/seacas/applications/fastq/periml.f index dd866fd2611f..49d320433e80 100644 --- a/packages/seacas/applications/fastq/periml.f +++ b/packages/seacas/applications/fastq/periml.f @@ -1,39 +1,19 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: periml.f,v 1.2 1998/07/14 18:19:33 gdsjaar Exp $ -C $Log: periml.f,v $ -C Revision 1.2 1998/07/14 18:19:33 gdsjaar -C Removed unused variables, cleaned up a little. -C -C Changed BLUE labels to GREEN to help visibility on black background -C (indirectly requested by a couple users) -C -C Revision 1.1.1.1 1990/11/30 11:13:21 gdsjaar -C FASTQ Version 2.0X -C -c Revision 1.1 90/11/30 11:13:19 gdsjaar -c Initial revision -c -C -CC* FILE: [.PAVING]PERIML.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE PERIML (NBNODE, MXND, NPER, ISTART, MLN, XN, YN, ZN, & LXK, KXL, NXL, LXN, ANGLE, BNSIZE, LNODES, LPERIM, LLL, LLLOLD, & XMIN, XMAX, YMIN, YMAX, ZMIN, ZMAX, DEV1, KREG, ERR) C*********************************************************************** -C + C SUBROUTINE PERIML = LINKS THE PERIMETER OF A REGION TOGETHER FOR C THE FILL ROUTINES -C + C*********************************************************************** -C + C VARIABLES USED: C NPER = NUMBER OF PERIMETER NODES C ERR = .TRUE. IF ERRORS WERE ENCOUNTERED @@ -51,23 +31,23 @@ SUBROUTINE PERIML (NBNODE, MXND, NPER, ISTART, MLN, XN, YN, ZN, C A CONTINUATION ROW. C A NEGATIVE FLAG IN THE SECOND COLUMN OF THE LXN ARRAY MEANS C THAT THIS NODE IS AN EXTERIOR BOUNDARY NODE. -C + C*********************************************************************** -C + DIMENSION XN (MXND), YN (MXND), ZN (MXND) DIMENSION LPERIM (NBNODE) DIMENSION LXK (4, MXND), KXL (2, 3*MXND) DIMENSION NXL (2, 3*MXND), LXN (4, MXND) DIMENSION ANGLE (MXND), BNSIZE (2, MXND), LNODES (MLN, MXND) -C + CHARACTER*3 DEV1 -C + LOGICAL ERR -C + ERR = .FALSE. LLLOLD = LLL IEND = NPER + ISTART - 1 -C + DO 100 I = ISTART, IEND NODE1 = LPERIM (I) IF (I .EQ. IEND) THEN @@ -81,14 +61,14 @@ SUBROUTINE PERIML (NBNODE, MXND, NPER, ISTART, MLN, XN, YN, ZN, NODE2 = LPERIM (I + 1) ENDIF LLL = LLL+1 -C + C FILL UP THE NODES PER LINE ARRAY -C + NXL (1, LLL) = NODE1 NXL (2, LLL) = NODE2 -C + C FILL UP THE LINES PER NODE ARRAY -C + LXN (1, NODE1) = LLL IF (I .EQ. ISTART) THEN LXN (2, NODE1) = - (IEND - ISTART + 1 + LLLOLD) @@ -97,9 +77,9 @@ SUBROUTINE PERIML (NBNODE, MXND, NPER, ISTART, MLN, XN, YN, ZN, ENDIF LXN (3, NODE1) = 0 LXN (4, NODE1) = 0 -C + C THE LNODES ARRAY IS DOCUMENTED IN THE ADDROW ROUTINE -C + LNODES (1, NODE1) = 0 LNODES (2, NODE1) = NODE0 LNODES (3, NODE1) = NODE2 @@ -109,16 +89,16 @@ SUBROUTINE PERIML (NBNODE, MXND, NPER, ISTART, MLN, XN, YN, ZN, LNODES (7, NODE1) = 0 LNODES (8, NODE1) = 0 100 CONTINUE -C + C SET ALL THE INTERIOR ANGLES -C + CALL LUPANG (MXND, MLN, XN, YN, ZN, LXK, KXL, NXL, LXN, NPER, & ANGLE, LNODES, LPERIM(ISTART), LLL, XMIN, XMAX, YMIN, YMAX, & ZMIN, ZMAX, DEV1, KREG, ERR) IF (ERR) GOTO 120 -C + C SET UP THE CORRECT SIZE ARRAY -C + N1S = LPERIM(ISTART) KOUNT = 0 110 CONTINUE @@ -132,16 +112,16 @@ SUBROUTINE PERIML (NBNODE, MXND, NPER, ISTART, MLN, XN, YN, ZN, ERR = .TRUE. GOTO 120 ENDIF -C + BNSIZE (1, N1S) = & ( SQRT ( (XN (N1S) - XN (N0)) **2 + (YN (N1S) - YN (N0)) **2) + & SQRT ( (XN (N1S) - XN (N2)) **2 + (YN (N1S) - YN (N2)) **2) ) & * .5 BNSIZE (2, N1S) = 1. GOTO 110 -C + 120 CONTINUE -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/pickm1.f b/packages/seacas/applications/fastq/pickm1.f index d77b9d61a200..812c5f39898a 100644 --- a/packages/seacas/applications/fastq/pickm1.f +++ b/packages/seacas/applications/fastq/pickm1.f @@ -1,55 +1,45 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pickm1.f,v 1.2 1991/03/21 15:44:59 gdsjaar Exp $ -C $Log: pickm1.f,v $ -C Revision 1.2 1991/03/21 15:44:59 gdsjaar -C Changed all 3.14159... to atan2(0.0, -1.0) -C -c Revision 1.1.1.1 1990/11/30 11:13:24 gdsjaar -c FASTQ Version 2.0X -c -c Revision 1.1 90/11/30 11:13:23 gdsjaar -c Initial revision -c -C +c +C C C* FILE: [.QMESH]PICKM1.FOR C C* MODIFIED BY: TED BLACKER C C* MODIFICATION DATE: 7/6/90 C C* MODIFICATION: COMPLETED HEADER INFORMATION -C +C SUBROUTINE PICKM1 (N, X, Y, ANGLE, M1, IFIRST, REAL) C*********************************************************************** -C +C C SUBROUTINE PICKM1 = DETERMINES A REASONABLE SHAPE FOR A LOGICAL C RECTANGLE WITH PERIMETER GIVEN IN X AND Y -C +C C*********************************************************************** -C +C DIMENSION X (N), Y (N), ANGLE (N) DIMENSION SMANG (7), INDEX (7) -C +C LOGICAL REAL -C +C C FORM THE LIST OF SMALLEST ANGLES -C +C NSA = 6 DO 100 I = 1, NSA SMANG (I) = 10. INDEX (I) = 0 100 CONTINUE -C +C PI = ATAN2(0.0, -1.0) TWOPI = PI + PI AGOLD = ATAN2 (Y (1) - Y (N), X (1) - X (N)) -C +C DO 130 J = 1, N -C +C C GET THE ANGLE FORMED BY THIS SET OF POINTS -C +C NEXT = J + 1 IF (NEXT .GT. N) NEXT = 1 AGNEW = ATAN2 (Y (NEXT) - Y (J) , X (NEXT) - X (J)) @@ -58,10 +48,10 @@ SUBROUTINE PICKM1 (N, X, Y, ANGLE, M1, IFIRST, REAL) IF (DIFF .LT. - PI)DIFF = DIFF + TWOPI ANGLE (J) = PI - DIFF AGOLD = AGNEW -C +C C SORT THIS ANGLE AGAINST PREVIOUS ANGLES TO SEE IF IT IS ONE OF C THE SMALLEST -C +C SMANG (NSA + 1) = ANGLE (J) INDEX (NSA + 1) = J DO II = 1, NSA @@ -75,11 +65,11 @@ SUBROUTINE PICKM1 (N, X, Y, ANGLE, M1, IFIRST, REAL) INDEX (I + 1) = ITEMP end do 120 CONTINUE -C +C 130 CONTINUE -C +C C DETERMINE OPTIMUM ORIGIN / SHAPE COMBINATION -C +C ATOL = PI * 150. / 180. IFIRST = 1 M1 = N / 4 @@ -89,7 +79,7 @@ SUBROUTINE PICKM1 (N, X, Y, ANGLE, M1, IFIRST, REAL) I4 = I3 + M1 GBEST = ANGLE (1) + ANGLE (I2) + ANGLE (I3) + ANGLE (I4) BADANG = AMAX1 (ANGLE (1), ANGLE (I2), ANGLE (I3), ANGLE (I4)) -C +C MMAX = N / 2 - 1 AMAXEL = DBLE(N / 4) * DBLE( (N + 2) / 4) DO 150 ISA = 1, NSA @@ -122,6 +112,6 @@ SUBROUTINE PICKM1 (N, X, Y, ANGLE, M1, IFIRST, REAL) CALL MESAGE (' ** LARGE ANGLES (> 150 DEGREES.) **') CALL MESAGE (' ** POORLY FORMED MESH MAY RESULT **') ENDIF -C +C RETURN END diff --git a/packages/seacas/applications/fastq/pickm3.f b/packages/seacas/applications/fastq/pickm3.f index 3ce867cd8f9e..2282e30df7d5 100644 --- a/packages/seacas/applications/fastq/pickm3.f +++ b/packages/seacas/applications/fastq/pickm3.f @@ -1,58 +1,38 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pickm3.f,v 1.3 1991/03/22 19:57:40 gdsjaar Exp $ -C $Log: pickm3.f,v $ -C Revision 1.3 1991/03/22 19:57:40 gdsjaar -C Guess: substitute MM1 for MM -C -c Revision 1.2 1991/03/21 15:45:01 gdsjaar -c Changed all 3.14159... to atan2(0.0, -1.0) -c -c Revision 1.1.1.1 1990/11/30 11:13:27 gdsjaar -c FASTQ Version 2.0X -c -c Revision 1.1 90/11/30 11:13:25 gdsjaar -c Initial revision -c -C -CC* FILE: [.QMESH]PICKM3.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE PICKM3 (N, X, Y, ANGLE, M1, M2, IFIRST) C*********************************************************************** -C + C SUBROUTINE PICKM3 = DETERMINES A REASONABLE SHAPE FOR A LOGICAL C TRIANGLE WITH PERIMETER GIVEN IN X AND Y -C + C*********************************************************************** -C + PARAMETER (RLARGE = 100000.) DIMENSION X (N), Y (N), ANGLE (N) DIMENSION SMANG (7), INDEX (7) DIMENSION ISORT (3) -C + C FORM THE LIST OF SMALLEST ANGLES -C + NSA = 6 DO 100 I = 1, NSA SMANG (I) = 10. INDEX (I) = 0 100 CONTINUE -C + PI = ATAN2(0.0, -1.0) TWOPI = PI + PI AGOLD = ATAN2 (Y (1) - Y (N), X (1) - X (N)) -C + DO 130 J = 1, N -C + C GET THE ANGLE FORMED BY THIS SET OF POINTS -C + NEXT = J + 1 IF (NEXT .GT. N) NEXT = 1 AGNEW = ATAN2 (Y (NEXT) - Y (J) , X (NEXT) - X (J)) @@ -61,10 +41,10 @@ SUBROUTINE PICKM3 (N, X, Y, ANGLE, M1, M2, IFIRST) IF (DIFF .LT. - PI)DIFF = DIFF + TWOPI ANGLE (J) = PI - DIFF AGOLD = AGNEW -C + C SORT THIS ANGLE AGAINST PREVIOUS ANGLES TO SEE IF IT IS ONE OF C THE SMALLEST -C + SMANG (NSA + 1) = ANGLE (J) INDEX (NSA + 1) = J DO II = 1, NSA @@ -78,15 +58,15 @@ SUBROUTINE PICKM3 (N, X, Y, ANGLE, M1, M2, IFIRST) INDEX (I + 1) = ITEMP end do 120 CONTINUE -C + 130 CONTINUE -C + C DETERMINE OPTIMUM ORIGIN / SHAPE COMBINATION FOR A TRIANGLE -C + ATOL = PI * 150. / 180. -C + C FIND SIDE DIVISION USING 5 SMALLEST ANGLES AND CHECK CONDITION -C + DO 140 I = 1, 3 ISORT (I) = INDEX (I) 140 CONTINUE @@ -109,9 +89,9 @@ SUBROUTINE PICKM3 (N, X, Y, ANGLE, M1, M2, IFIRST) MM3 = N - MM1 - MM2 MAX = MAX0 (MM1, MM2, MM3) IF (MAX .LE. N - MAX - 2) THEN -C + C ADD UP ASSIGNED ANGLES -C + IFIRST = I1 M1 = MM1 M2 = MM2 @@ -120,38 +100,38 @@ SUBROUTINE PICKM3 (N, X, Y, ANGLE, M1, M2, IFIRST) IFIRST = 1 GBEST = RLARGE END IF -C + C LIMIT THE SIZE OF ANY SIDE -C + MMAX = (N - 2) / 2 -C + C GO AROUND THE PERIMETER USING THE 10 SMALLEST ANGLES AS POSSIBLE C STARTING POINTS, AND THEN FIND THE BEST COMBINATION OF SIDE LENGTHS -C + DO 190 ISA = 1, NSA IF (SMANG (ISA) .LE. ATOL) THEN I1 = INDEX (ISA) SUM1 = ANGLE (I1) IF (SUM1 .GE. GBEST) GO TO 190 -C + C ASSIGN A TRIAL SECOND NODE -C + DO 180 N1 = 2, MMAX I2 = I1 + N1 IF (I2 .GT. N)I2 = I2 - N SUM2 = SUM1 + ANGLE (I2) IF (SUM2 .GE. GBEST) GO TO 180 -C + C ASSIGN A TRIAL THIRD NODE -C + DO 170 N2 = 2, N - N1 - 2 I3 = I2 + N2 IF (I3 .GT. N)I3 = I3 - N GVAL = SUM2 + ANGLE (I3) IF (GVAL .GE. GBEST) GO TO 170 -C + C FIND SIDE DIVISION AND CHECK CONDITION -C + MM1 = I2 - I1 IF (MM1 .LT. 0) MM1 = N + MM1 MM2 = I3 - I2 @@ -160,9 +140,9 @@ SUBROUTINE PICKM3 (N, X, Y, ANGLE, M1, M2, IFIRST) MM3 = N - MM1 - MM2 MAX = MAX0 (MM1, MM2, MM3) IF (MAX .LE. N - MAX - 2) THEN -C + C ADD UP ASSIGNED ANGLES AND COMPARE TO PREVIOUS TRIALS -C + IFIRST = I1 M1 = MM1 M2 = MM2 @@ -172,7 +152,7 @@ SUBROUTINE PICKM3 (N, X, Y, ANGLE, M1, M2, IFIRST) 180 CONTINUE ENDIF 190 CONTINUE -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/pickm5.f b/packages/seacas/applications/fastq/pickm5.f index 53387dc5d19b..f64f6a18161c 100644 --- a/packages/seacas/applications/fastq/pickm5.f +++ b/packages/seacas/applications/fastq/pickm5.f @@ -1,106 +1,88 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pickm5.f,v 1.2 1991/03/21 15:45:03 gdsjaar Exp $ -C $Log: pickm5.f,v $ -C Revision 1.2 1991/03/21 15:45:03 gdsjaar -C Changed all 3.14159... to atan2(0.0, -1.0) -C -c Revision 1.1.1.1 1990/11/30 11:13:30 gdsjaar -c FASTQ Version 2.0X -c -c Revision 1.1 90/11/30 11:13:28 gdsjaar -c Initial revision -c -C -CC* FILE: [.QMESH]PICKM5.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE PICKM5 (N, X, Y, ANGLE, IST2, IST3, IST4, IST5, INDST, & M1, N1, N2, N3, N4) C*********************************************************************** -C + C SUBROUTINE PICKM5 = DETERMINES A REASONABLE SHAPE FOR A LOGICAL C PENTAGON WITH PERIMETER GIVEN IN X AND Y -C + C*********************************************************************** -C + C VARIABLES IN: N....... NUMBER OF POINTS C X, Y.... ARRAY OF COORDINATES C ANGLE... ARRAY OF ANGLES C OUT: Ni...... POINTERS TO THE CHOSEN CORNERS -C -C + C WRITTEN BY: HORACIO RECALDE DATE: JAN, 1988 -C + C********************************************************************** -C + PARAMETER (NSA = 10, NSA2 = 12) PARAMETER (BIGNUM = 99999.0, MAXTRY = 10) -C + DIMENSION X(N), Y(N), ANGLE(N), IST1(NSA2), IST2(N), IST3(N) DIMENSION IST4(N), IST5(N), INDEX(NSA + 1), INDST(N) DIMENSION SMANG(NSA + 1) LOGICAL CHECK -C + C--- SET THE MAXIMUM SIDE AND TOLERANCE -C + PI = ATAN2(0.0, -1.0) MMAX = N/2 - 1 TOL = 150./180.*PI -C + C---GET THE 10 SMALLEST ANGLES -C + CALL CSMANG (N, X, Y, ANGLE, NSA, SMANG, INDEX) IF (ANGLE (INDEX (1)) .GT. TOL) THEN M1 = -1 RETURN END IF -C + C---CHECK CONDITIONS ON THE 5 SMALLEST ANGLES -C + CALL CHCOND (N, NSA, SMANG, INDEX, M1, N1, N2, N3, N4, CHECK) IF (CHECK) RETURN -C + SUMANG = BIGNUM -C + C---PUSH ANGLE INDEX ON FIRST STACK -C + CALL SKINIT (IST1, NSA2, NSA, IERROR) DO 100 I = NSA, 1, -1 CALL SKPUSH (IST1, NSA2, INDEX (I), IERROR) 100 CONTINUE -C + C---POP TOP OF FIRST STACK -C + 110 CONTINUE CALL SKPOP (IST1, NSA2, M1, IERROR) IF (IERROR .EQ. 2) GO TO 200 IF (ANGLE (M1) .GT. SUMANG) GO TO 200 SUM1 = ANGLE (M1) -C + C---SELECT SECOND TRIAL -C + MM1 = M1 + 2 IF (MM1 .GT. N) MM1 = MM1 - N NN1 = MIN (M1 + MMAX, M1 + N - 8) IF (NN1 .GT. N) NN1 = NN1 - N CALL SORTST (N, ANGLE, MM1, NN1, IRANGE, INDST) -C + C---PUSH ANGLE INDEX ON SECOND STACK IN DESCENDING ORDER -C + CALL SKINIT (IST2, N, N - 2, IERROR) DO 120 I = MIN (MAXTRY, IRANGE), 1, -1 CALL SKPUSH (IST2, N, INDST (I), IERROR) 120 CONTINUE -C + C---POP TOP OF SECOND STACK -C + 130 CONTINUE CALL SKPOP (IST2, N, M2, IERROR) IF (IERROR .EQ. 2) GO TO 110 @@ -108,24 +90,24 @@ SUBROUTINE PICKM5 (N, X, Y, ANGLE, IST2, IST3, IST4, IST5, INDST, SUM2 = SUM1 + ANGLE (M2) N1 = M2 - M1 IF (N1 .LT. 0) N1 = N + N1 -C + C---SELECT THIRD TRIAL NODE AND SORT IN ASCENDING ORDER -C + MM2 = M2 + 2 IF (MM2 .GT. N) MM2 = MM2 - N NN2 = MIN (M1 + N1 + MMAX, M1 + N - 6) IF (NN2 .GT. N) NN2 = NN2 - N CALL SORTST (N, ANGLE, MM2, NN2, IRANGE, INDST) -C + C---PUSH ANGLE INDEX ON THIRD STACK IN DESCENDING ORDER -C + CALL SKINIT (IST3, N, N - 2, IERROR) DO 140 I = MIN (MAXTRY, IRANGE), 1, -1 CALL SKPUSH (IST3, N, INDST (I), IERROR) 140 CONTINUE -C + C---POP TOP OF THIRD STACK -C + 150 CONTINUE CALL SKPOP (IST3, N, M3, IERROR) IF (IERROR .EQ. 2) GO TO 130 @@ -134,24 +116,24 @@ SUBROUTINE PICKM5 (N, X, Y, ANGLE, IST2, IST3, IST4, IST5, INDST, N2 = M3 - M2 IF (N2 .LT. 0) N2 = N + N2 IF (N1 + N2 .GT. N/2 -1) GO TO 150 -C + C---SELECT FOURTH TRIAL AND SORT IN ASCENDING ORDER -C + MM3 = M3 + 2 IF (MM3 .GT. N) MM3 = MM3 - N NN3 = MIN (M1 + N1 + N2 + MMAX, M1 + N - 4) IF (NN3 .GT. N) NN3 = NN3 - N CALL SORTST (N, ANGLE, MM3, NN3, IRANGE, INDST) -C + C---PUSH ANGLE INDEX ON FOURTH STACK IN DESCENDING ORDER -C + CALL SKINIT (IST4, N, N - 2, IERROR) DO 160 I = MIN (MAXTRY, IRANGE), 1, -1 CALL SKPUSH (IST4, N, INDST (I), IERROR) 160 CONTINUE -C + C---POP TOP OF FOURTH STACK -C + 170 CONTINUE CALL SKPOP (IST4, N, M4, IERROR) IF (IERROR .EQ. 2) GO TO 150 @@ -160,24 +142,24 @@ SUBROUTINE PICKM5 (N, X, Y, ANGLE, IST2, IST3, IST4, IST5, INDST, N3 = M4 - M3 IF (N3 .LT. 0) N3 = N + N3 IF (N2 + N3 .GT. N/2 -1) GO TO 170 -C + C---SELECT FIFTH TRIAL AND SORT IN ASCENDING ORDER -C + MM4 = M4 + 2 IF (MM4 .GT. N) MM4 = MM4 - N NN4 = MIN (M1 + N1 + N2 + N3 + MMAX, M1 + N - 2) IF (NN4 .GT. N) NN4 = NN4 - N CALL SORTST (N, ANGLE, MM4, NN4, IRANGE, INDST) -C + C---PUSH ANGLE INDEX ON FIFTH STACK IN DESCENDING ORDER -C + CALL SKINIT (IST5, N, N - 2, IERROR) DO 180 I = MIN (MAXTRY, IRANGE), 1, -1 CALL SKPUSH (IST5, N, INDST (I), IERROR) 180 CONTINUE -C + C---POP TOP OF FIFTH STACK -C + 190 CONTINUE CALL SKPOP (IST5, N, M5, IERROR) IF (IERROR .EQ. 2) GO TO 170 @@ -187,9 +169,9 @@ SUBROUTINE PICKM5 (N, X, Y, ANGLE, IST2, IST3, IST4, IST5, INDST, IF (N4 .LT. 0) N4 = N + N4 N5 = M1 - M5 IF (N5 .LT. 0) N5 = N + N5 -C + C--- CHECK COMPATIBILITY EQUATIONS -C + IF ( (N1 + N2 + N3 .LT. N4 + N5 + 2) .OR. & (N2 + N3 + N4 .LT. N5 + N1 + 2) .OR. & (N3 + N4 + N5 .LT. N1 + N2 + 2) .OR. @@ -204,7 +186,7 @@ SUBROUTINE PICKM5 (N, X, Y, ANGLE, IST2, IST3, IST4, IST5, INDST, N4HOLD = N4 END IF GO TO 190 -C + 200 CONTINUE IF (SUMANG .EQ. BIGNUM) THEN M1 = 0 @@ -215,6 +197,6 @@ SUBROUTINE PICKM5 (N, X, Y, ANGLE, IST2, IST3, IST4, IST5, INDST, N3 = N3HOLD N4 = N4HOLD END IF -C + RETURN END diff --git a/packages/seacas/applications/fastq/picktr.f b/packages/seacas/applications/fastq/picktr.f index 35471e91dcc8..1d245810906a 100644 --- a/packages/seacas/applications/fastq/picktr.f +++ b/packages/seacas/applications/fastq/picktr.f @@ -1,60 +1,43 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: picktr.f,v 1.2 1991/03/21 15:45:05 gdsjaar Exp $ -C $Log: picktr.f,v $ -C Revision 1.2 1991/03/21 15:45:05 gdsjaar -C Changed all 3.14159... to atan2(0.0, -1.0) -C -c Revision 1.1.1.1 1990/11/30 11:13:33 gdsjaar -c FASTQ Version 2.0X -c -c Revision 1.1 90/11/30 11:13:31 gdsjaar -c Initial revision -c -C -CC* FILE: [.QMESH]PICKTR.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE PICKTR (NPER, X, Y, NID, ANGLE, HALFC, I1, I2, I3, I4, & I5, I6, I7, I8) C*********************************************************************** -C + C SUBROUTINE PICKTR = DETERMINES A REASONABLE SHAPE FOR A BACK-TO-BACK C SET OF TRIANGLES (TRANSITION REGION) -C + C*********************************************************************** -C + PARAMETER (RLARGE = 1000000.) DIMENSION X(NPER), Y(NPER), NID(NPER), ANGLE(NPER) DIMENSION SMANG(7), INDEX(7) DIMENSION ISORT(4) -C + LOGICAL HALFC -C + PI = ATAN2(0.0, -1.0) PID2 = 0.5 * PI TWOPI = 2.0 * PI -C + C FORM THE LIST OF SMALLEST ANGLES -C + NSA = 6 DO 100 I = 1, NSA SMANG(I) = 10. INDEX(I) = 0 100 CONTINUE -C + AGOLD = ATAN2 (Y (1) - Y (NPER), X (1) - X (NPER)) -C + DO 130 J = 1, NPER -C + C GET THE ANGLE FORMED BY THIS SET OF POINTS -C + NEXT = J + 1 IF (NEXT .GT. NPER) NEXT = 1 AGNEW = ATAN2 (Y (NEXT) - Y (J), X (NEXT) - X (J)) @@ -63,10 +46,10 @@ SUBROUTINE PICKTR (NPER, X, Y, NID, ANGLE, HALFC, I1, I2, I3, I4, IF (DIFF .LT. - PI) DIFF = DIFF + TWOPI ANGLE (J) = PI - DIFF AGOLD = AGNEW -C + C SORT THIS ANGLE AGAINST PREVIOUS ANGLES TO SEE IF IT IS ONE OF C THE SMALLEST -C + SMANG (NSA + 1) = ANGLE (J) INDEX (NSA + 1) = J DO 110 II = 1, NSA @@ -80,15 +63,15 @@ SUBROUTINE PICKTR (NPER, X, Y, NID, ANGLE, HALFC, I1, I2, I3, I4, INDEX (I + 1) = ITEMP 110 CONTINUE 120 CONTINUE -C + 130 CONTINUE -C + C DETERMINE TWO/FOUR BEST CORNER POINTS FOR SEMICIRCLE/TRANSITION REGION -C + ATOL = PI * 150. / 180. -C + C FIND SIDE DIVISION USING 4 SMALLEST ANGLES AND CHECK CONDITION -C + DO 140 I = 1, 4 ISORT (I) = INDEX (I) 140 CONTINUE @@ -112,11 +95,11 @@ SUBROUTINE PICKTR (NPER, X, Y, NID, ANGLE, HALFC, I1, I2, I3, I4, M3 = I4 - I3 IF (M3 .LT. 0) M3 = NPER + M3 M4 = NPER - M1 - M2 - M3 -C + C USE THE LONGEST SIDE THAT DOES NOT HAVE OPPOSITE C MATCHES AS THE CHOICE FOR THE BASE (OF TRANSITIONS) C THE BASE MUST BE AT LEAST 4 INTERVALS LONG -C + IF ( (M1 .EQ. M3) .AND. (.NOT. HALFC)) THEN MMAX = MAX0 (M2, M4) IF (MMAX .GE. 4) THEN @@ -168,10 +151,10 @@ SUBROUTINE PICKTR (NPER, X, Y, NID, ANGLE, HALFC, I1, I2, I3, I4, IFIRST = 1 GBEST = RLARGE END IF -C + C GO AROUND THE PERIMETER USING THE 6 SMALLEST ANGLES AS POSSIBLE C STARTING POINTS, AND THEN FIND THE BEST COMBINATION OF SIDE LENGTHS -C + DO 200 ISA = 1, NSA IF (SMANG (ISA) .LE. ATOL) THEN I1 = INDEX (ISA) @@ -181,9 +164,9 @@ SUBROUTINE PICKTR (NPER, X, Y, NID, ANGLE, HALFC, I1, I2, I3, I4, ELSE IF (SUM1 .GE. GBEST) GO TO 200 ENDIF -C + C ASSIGN A TRIAL SECOND NODE -C + DO 190 N1 = 1, NPER - 4 I2 = I1 + N1 IF (I2 .GT. NPER) I2 = I2 - NPER @@ -193,9 +176,9 @@ SUBROUTINE PICKTR (NPER, X, Y, NID, ANGLE, HALFC, I1, I2, I3, I4, ELSE IF (SUM2 .GE. GBEST) GO TO 190 ENDIF -C + C ASSIGN A TRIAL THIRD NODE -C + DO 180 N2 = 1, NPER - N1 - 3 I3 = I2 + N2 IF (I3 .GT. NPER) I3 = I3 - NPER @@ -209,9 +192,9 @@ SUBROUTINE PICKTR (NPER, X, Y, NID, ANGLE, HALFC, I1, I2, I3, I4, ELSE IF (SUM3 .GE. GBEST) GO TO 180 ENDIF -C + C ASSIGN A TRIAL FOURTH NODE -C + DO 170 N3 = 1, NPER - N1 - N2 - 2 I4 = I3 + N3 IF (I4 .GT. NPER) I4 = I4 - NPER @@ -225,9 +208,9 @@ SUBROUTINE PICKTR (NPER, X, Y, NID, ANGLE, HALFC, I1, I2, I3, I4, ELSE IF (GVAL .GE. GBEST) GO TO 170 ENDIF -C + C FIND SIDE DIVISION AND CHECK CONDITION -C + M1 = I2 - I1 IF (M1 .LT. 0) M1 = NPER + M1 M2 = I3 - I2 @@ -235,11 +218,11 @@ SUBROUTINE PICKTR (NPER, X, Y, NID, ANGLE, HALFC, I1, I2, I3, I4, M3 = I4 - I3 IF (M3 .LT. 0) M3 = NPER + M3 M4 = NPER - M1 - M2 - M3 -C + C USE THE LONGEST SIDE THAT DOES NOT HAVE OPPOSITE C MATCHES AS THE CHOICE FOR THE BASE (OF TRANSITIONS) C THE BASE MUST BE AT LEAST 4 INTERVALS LONG -C + IF ( (M1 .EQ. M3) .AND. (.NOT. HALFC)) THEN MMAX = MAX0 (M2, M4) IF (MMAX .GE. 4) THEN @@ -286,9 +269,9 @@ SUBROUTINE PICKTR (NPER, X, Y, NID, ANGLE, HALFC, I1, I2, I3, I4, 190 CONTINUE ENDIF 200 CONTINUE -C + C ROTATE THE PERIMETER AND THE ANGLES SO THE BASE LEADS THE LIST -C + IF (IFIRST .NE. 1) CALL FQ_ROTATE (NPER, X, Y, NID, IFIRST) DO 220 I = 1, IFIRST - 1 AHOLD = ANGLE (1) @@ -297,25 +280,25 @@ SUBROUTINE PICKTR (NPER, X, Y, NID, ANGLE, HALFC, I1, I2, I3, I4, 210 CONTINUE ANGLE (NPER) = AHOLD 220 CONTINUE -C + C DECIDE THE TRIANGLE CORNERS -C + GBEST = RLARGE -C + C PICK AN ARBITRARY BASE CENTER (I3) -C + DO 250 I = 3, MBASE - 1 -C + C FOR THIS BASE CENTER, PICK AN ARBITRARY I2 LOCATION -C + DO 240 J = 2, I - 1 -C + C FOR THIS COMBINATION OF I3 AND I2, PICK AN ARBITRARY I4 LOCATION -C + DO 230 K = I + 1, MBASE -C + C CALCULATE I6 AND I8 AND ADD ANGLES TO FIND MINIMUM SUM -C + KN = MBASE + 1 - K KK = I - J KL = J - 1 @@ -323,38 +306,38 @@ SUBROUTINE PICKTR (NPER, X, Y, NID, ANGLE, HALFC, I1, I2, I3, I4, MLEFT = NPER - MBASE KO = (MLEFT - KN + KL - KK - KM) / 2 KP = KN + KO - KL -C + C PROTECT AGAINST THE IMPOSSIBLE LENGTH PROBLEMS C AND THE ODD NUMBER IN THE PERIMETER INPUT ERRORS -C + IF ( (KO .GT. 0) .AND. (KP .GT. 0)) THEN IF (KP + KL .EQ. KN + KO) THEN -C + C NOW GET THE END POINTS GIVEN THESE SIDE LENGTHS -C + J6 = MBASE + 1 + KO J7 = MBASE + 1 + KO + KM J8 = MBASE + 1 + KO + KM + KK -C + C GET THE BASE ANGLE OF THE DIVIDER LINE -C + THETA1 = ATAN2 (Y (I + 1) - Y (I), & X (I + 1) - X (I)) THETA2 = ATAN2 (Y (J7) - Y (I), X (J7) - X (I)) THETAB = ABS (THETA2 - THETA1) IF (THETAB .GT. PI) THETAB = THETAB - PI IF (THETAB .LT. PID2) THETAB = PI - THETAB -C + C GET THE TOP ANGLE OF THE DIVIDER LINE -C + THETA1 = ATAN2 (Y (J7 + 1) - Y (J7), & X (J7 + 1) - X (J7)) THETAT = ABS (THETA2 - THETA1) IF (THETAT .GT. PI) THETAT = THETAT - PI IF (THETAT .LT. PID2) THETAT = PI - THETAT -C + C ADD THESE TO GET THE VALUE OF GVAL -C + IF (HALFC) THEN GVAL = THETAB + THETAT + ABS (PI - ANGLE (J6)) & + ABS (PI - ANGLE (J8)) + diff --git a/packages/seacas/applications/fastq/pinch.f b/packages/seacas/applications/fastq/pinch.f index 1a3176a8f9be..d9450f20c45c 100644 --- a/packages/seacas/applications/fastq/pinch.f +++ b/packages/seacas/applications/fastq/pinch.f @@ -1,57 +1,34 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pinch.f,v 1.3 1998/07/14 18:19:35 gdsjaar Exp $ -C $Log: pinch.f,v $ -C Revision 1.3 1998/07/14 18:19:35 gdsjaar -C Removed unused variables, cleaned up a little. -C -C Changed BLUE labels to GREEN to help visibility on black background -C (indirectly requested by a couple users) -C -C Revision 1.2 1991/03/21 15:45:07 gdsjaar -C Changed all 3.14159... to atan2(0.0, -1.0) -C -c Revision 1.1.1.1 1990/11/30 11:13:37 gdsjaar -c FASTQ Version 2.0X -c -c Revision 1.1 90/11/30 11:13:35 gdsjaar -c Initial revision -c -C -CC* FILE: [.PAVING]PINCH.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE PINCH (MXND, MXCORN, MLN, NUID, XN, YN, ZN, LXK, KXL, & NXL, LXN, ANGLE, LNODES, BNSIZE, NODE, NLOOP, KKKOLD, LLLOLD, & NNNOLD, IAVAIL, NAVAIL, DONE, XMIN, XMAX, YMIN, YMAX, ZMIN, & ZMAX, DEV1, LLL, KKK, NNN, LCORN, NCORN, NADJ1, NADJ2, GRAPH, & VIDEO, KREG, NOROOM, ERR) C*********************************************************************** -C + C SUBROUTINE PINCH = COLLAPSES A CORNER WITH A SMALL ANGLE CLOSED -C + C*********************************************************************** -C + COMMON /TIMING/ TIMEA, TIMEP, TIMEC, TIMEPC, TIMEAJ, TIMES -C + DIMENSION XN (MXND), YN (MXND), ZN (MXND), NUID (MXND) DIMENSION LXK (4, MXND), KXL (2, 3*MXND) DIMENSION NXL (2, 3*MXND), LXN (4, MXND) DIMENSION ANGLE (MXND), LNODES (MLN, MXND), BNSIZE (2, MXND) DIMENSION LCORN (MXCORN) DIMENSION L1LIST(20) -C + LOGICAL DONE, NOROOM, ERR, FOUND, DDONE, PWEDGE, WEDGOK LOGICAL GRAPH, VIDEO, PGRAPH, ONLYC, BOK, PPOSBL, CHECK -C + CHARACTER*3 DEV1 -C + PI = ATAN2(0.0, -1.0) CALL GETIME (TIME1) @@ -62,9 +39,9 @@ SUBROUTINE PINCH (MXND, MXCORN, MLN, NUID, XN, YN, ZN, LXK, KXL, ONLYC = .TRUE. DONE = .FALSE. ERR = .FALSE. -C + C SEE IF ONLY 2 NODES ARE LEFT ON THE LOOP -C + IF (NLOOP .EQ. 2) THEN CALL MARKSM (MXND, MLN, LXK, KXL, NXL, LXN, LNODES, NODE, ERR) IF (ERR) GOTO 210 @@ -96,9 +73,9 @@ SUBROUTINE PINCH (MXND, MXCORN, MLN, NUID, XN, YN, ZN, LXK, KXL, CALL RPLOTL (MXND, XN, YN, ZN, NXL, XMIN, XMAX, YMIN, YMAX, & ZMIN, ZMAX, LLL, DEV1, KREG) ENDIF -C + C GET THE CORNERS THAT CAN BE ADJUSTED -C + N1OLD = 0 100 CONTINUE IF (GRAPH) CALL LCOLOR ('YELOW') @@ -115,15 +92,15 @@ SUBROUTINE PINCH (MXND, MXCORN, MLN, NUID, XN, YN, ZN, LXK, KXL, ENDIF IF (ERR) GOTO 210 IF (GRAPH) CALL LCOLOR ('WHITE') -C + C FOR NORMAL REGIONS, C TOLER1 IS SET AT 20 DEGREES. (A 3 DEGREE IRREGULAR NODE IS FORMED) C TOLER2 IS SET TO 50 DEGREES. (A 4+ DEGREE IRREGULAR NODE IS HELPED) -C + C THEY ARE SET FOR AN UNEQUAL SEMICIRCLE TO 30 AND 60 RESPECTIVELY C THEY ARE SET FOR AN EQUAL SEMICIRCLE TO 35 AND 70 RESPECTIVELY C THEY ARE SET FOR A 3-2-1 TRIANGLE TO 35 AND 70 RESPECTIVELY -C + IF (NCORN .EQ. 2) THEN IDIF = MIN0 (LNODES (7, LCORN(1)), LNODES (7, LCORN(2)) ) IF (LNODES (7, LCORN(1)) .EQ. LNODES (7, LCORN (2)) ) THEN @@ -141,9 +118,9 @@ SUBROUTINE PINCH (MXND, MXCORN, MLN, NUID, XN, YN, ZN, LXK, KXL, TOLER1 = .3490659 TOLER2 = .8726646 ENDIF -C + C NOW MAKE SURE THAT A WEDGE CAN BE ALLOWED -C + IF (NLOOP .LE. 4) THEN KNEG = 0 DO 110 I = 1, NCORN @@ -157,9 +134,9 @@ SUBROUTINE PINCH (MXND, MXCORN, MLN, NUID, XN, YN, ZN, LXK, KXL, ELSE WEDGOK = .TRUE. ENDIF -C + C NOW SORT THE CORNERS SO THE SMALLEST REMAINING ONE GOES FIRST -C + 120 CONTINUE J = 0 DO 130 I = 1, NCORN @@ -171,35 +148,35 @@ SUBROUTINE PINCH (MXND, MXCORN, MLN, NUID, XN, YN, ZN, LXK, KXL, ENDIF ENDIF 130 CONTINUE -C + IF (J .GT. 0) THEN N1 = LCORN (J) LCORN (J) = - LCORN (J) N0 = LNODES (2, N1) N2 = LNODES (3, N1) -C + C CHECK TO MAKE SURE THAT A 1-1-1-1 RECTANGLE ISN'T BEING CLOSED -C + IF ((NLOOP .LE. 4) .AND. (NCORN .GE. 4)) GOTO 200 -C + C CHECK TO MAKE SURE THAT A 4 - 1 - 1 TRIANGLE ISN'T BEING CLOSED -C + C ELSEIF ((NCORN .EQ. 3) .AND. (NLOOP .EQ. 6) .AND. C & (ILOW .EQ. 1) .AND. (IHIGH .EQ. 4) ) THEN C GOTO 200 C ENDIF -C + C CHECK TO MAKE SURE THAT THE ANGLE IS ELIGIBLE FOR PINCHING AND C THAT A CLOSURE DOESN'T FORM A DEGENERATE ELEMENT ALONG THE BOUNDARY -C + CALL BPINCH (MXND, MLN, LNODES, XN, YN, LXN, NXL, ANGLE, & N0, N1, N2, NLOOP, TOLER1, TOLER2, BOK, ERR) IF (ERR) GOTO 210 IF (BOK) THEN IF (NCORN .EQ. 2) IDIF = IDIF - 1 -C + C CHECK TO SEE IF A WEDGE NEEDS TO BE ADDED BEFORE THE THING IS PINCHED -C + DIST01 = SQRT ( ((XN (N1) - XN (N0)) **2) + & ((YN (N1) - YN (N0)) **2) ) DIST21 = SQRT ( ((XN (N1) - XN (N2)) **2) + @@ -232,9 +209,9 @@ SUBROUTINE PINCH (MXND, MXCORN, MLN, NUID, XN, YN, ZN, LXK, KXL, & LNODES, BNSIZE, IAVAIL, NAVAIL, LLL, KKK, NNN, LLLOLD, & NNNOLD, N1, N6, NLOOP, PWEDGE, GRAPH, VIDEO, NOROOM, & ERR) -C + C WATCH FOR THE REPEATING CASE -C + IF (N1 .EQ. N1OLD) THEN BNSIZE (2, N1) = BNSIZE (2, N1) * 3. BNSIZE (2, LNODES (3, N6)) = @@ -242,7 +219,7 @@ SUBROUTINE PINCH (MXND, MXCORN, MLN, NUID, XN, YN, ZN, LXK, KXL, BNSIZE (2, N6) = BNSIZE (2, N6) * 3. ENDIF N1OLD = N1 -C + IF ((NOROOM) .OR. (ERR)) GOTO 210 IF (VIDEO) CALL SNAPIT (2) IF (NODE .EQ. N1) NODE = LNODES (2, N2) @@ -253,7 +230,7 @@ SUBROUTINE PINCH (MXND, MXCORN, MLN, NUID, XN, YN, ZN, LXK, KXL, N0 = LNODES (2, N1) ANGLE (N1) = PI ANGLE (N0) = PI -C + ELSEIF ((WEDGOK) .AND. (DIST21 .GT. FACT * DIST01) .AND. & (LXN (3, N2) .NE. 0) .AND. & (KXL (1, LNODES (5, N1)) .GT. 0) ) THEN @@ -292,20 +269,20 @@ SUBROUTINE PINCH (MXND, MXCORN, MLN, NUID, XN, YN, ZN, LXK, KXL, ANGLE (LNODES (3, N2)) = PI ANGLE (LNODES (3, LNODES (3, N2))) = AHOLD ENDIF -C + C PROCEED WITH THE PINCH -C + LINE1 = LNODES (5, N0) LINE2 = LNODES (5, N1) -C + C CHECK TO MAKE SURE THAT AT LEAST ONE OF THE LINES C IS NOT A BOUNDARY LINE AND GET THE NODE TO BE DELETED -C + IF ((LXN (2, N0) .GT. 0) .OR. & (LXN (2, N2) .GT. 0)) THEN -C + FOUND = .TRUE. -C + IF (LXN (2, N0) .GT. 0) THEN NGONE = N0 NTHERE = N2 @@ -323,18 +300,18 @@ SUBROUTINE PINCH (MXND, MXCORN, MLN, NUID, XN, YN, ZN, LXK, KXL, LNODES (5, NTHERE) = LNODES (5, N2) ENDIF LNODES (4, N1) = - 2 -C + C SEE IF THE NODES BEING USED ARE IN THE CORNER LIST C IF THEY ARE THEN THOSE CORNERS ARE NEGATED -C + DO 140 NC = 1, NCORN IF ( (LCORN (NC) .EQ. NTHERE) .OR. & (LCORN (NC) .EQ. NGONE) ) & LCORN (NC) = - IABS (LCORN (NC)) 140 CONTINUE -C + C DELETE THE OLD LINE AND REDO LINK ARRAYS -C + KOLD = KXL (1, LOLD) KNEW = KXL (1, LNEW) KXL (1, LNEW) = KNEW @@ -354,9 +331,9 @@ SUBROUTINE PINCH (MXND, MXCORN, MLN, NUID, XN, YN, ZN, LXK, KXL, ENDIF NXL (1, LOLD) = 0 NXL (2, LOLD) = 0 -C + C FIX THE LINES PER ELEMENT ARRAY FOR THE ONE ELEMENT CHANGING -C + IF (KOLD .GT. 0) THEN DO 150 II = 1, 4 IF (LXK (II, KOLD) .EQ. LOLD) THEN @@ -370,9 +347,9 @@ SUBROUTINE PINCH (MXND, MXCORN, MLN, NUID, XN, YN, ZN, LXK, KXL, GOTO 210 160 CONTINUE ENDIF -C + C RECONNECT ALL LINES CONNECTING TO NGONE TO NTHERE -C + CALL GETLXN (MXND, LXN, NGONE, L1LIST, NL, ERR) IF (ERR) THEN CALL MESAGE ('** PROBLEMS IN PINCH GETTING NGONE'// @@ -413,10 +390,10 @@ SUBROUTINE PINCH (MXND, MXCORN, MLN, NUID, XN, YN, ZN, LXK, KXL, NXL (2, LL) = NTHERE ENDIF 170 CONTINUE -C + C FIX LXN ARRAY C UNHOOK LOLD FROM NGONE AND FROM N1 -C + CALL DELLXN (MXND, LXN, NUID, NAVAIL, IAVAIL, NGONE, & LOLD, NNN, ERR, NOROOM) IF ((NOROOM) .OR. (ERR)) THEN @@ -431,9 +408,9 @@ SUBROUTINE PINCH (MXND, MXCORN, MLN, NUID, XN, YN, ZN, LXK, KXL, & 'LOLD FROM N1 **') GOTO 210 ENDIF -C + C ADD ALL LINES STILL HOOKED TO NGONE TO THE LIST OF LINES FOR NTHERE -C + DO 180 II = 1, NL LL = L1LIST (II) IF (LL .NE. LOLD) THEN @@ -446,9 +423,9 @@ SUBROUTINE PINCH (MXND, MXCORN, MLN, NUID, XN, YN, ZN, LXK, KXL, ENDIF ENDIF 180 CONTINUE -C + C DELETE NGONE (UNHOOK EVERYTHING FROM IT) -C + DO 190 II = 1, 3 LXN (II, NGONE) = 0 190 CONTINUE @@ -457,17 +434,17 @@ SUBROUTINE PINCH (MXND, MXCORN, MLN, NUID, XN, YN, ZN, LXK, KXL, NAVAIL = NAVAIL+1 NUID (NGONE) = 0 NLOOP = NLOOP - 2 -C + C PLOT THE CLOSURE BEFORE SMOOTHING -C + IF (VIDEO) THEN CALL SFLUSH CALL SNAPIT (2) ENDIF -C + C NOW SEE IF THE CLOSURE HAS PRODUCED A 2-LINE NODE AND C THUS REQUIRES THAT ONE OF THE ELEMENTS MUST BE SQUASHED -C + IF ((LXN (3, N1) .EQ. 0) .AND. (LXN (2, N1) .GT. 0)) THEN CALL DELEM (MXND, XN, YN, NUID, LXK, KXL, NXL, LXN, & NNN, NAVAIL, IAVAIL, N1, KXL (1, LXN (1, N1)), @@ -479,9 +456,9 @@ SUBROUTINE PINCH (MXND, MXCORN, MLN, NUID, XN, YN, ZN, LXK, KXL, CALL SNAPIT (2) ENDIF ENDIF -C + C SEE IF ONLY 2 NODES ARE LEFT ON THE LOOP -C + IF (NLOOP .EQ. 2) THEN CALL CLOSE2 (MXND, MLN, NUID, XN, YN, ZN, LXK, KXL, & NXL, LXN, LNODES, IAVAIL, NAVAIL, NNN, LLL, NTHERE, @@ -494,9 +471,9 @@ SUBROUTINE PINCH (MXND, MXCORN, MLN, NUID, XN, YN, ZN, LXK, KXL, ELSE NNN2 = 1 ENDIF -C + C PERFORM THE SMOOTH ON THE MESH -C + CALL GETIME (TIME2) TIMEP = TIMEP + TIME2 - TIME1 CALL MARKSM (MXND, MLN, LXK, KXL, NXL, LXN, LNODES, @@ -532,15 +509,15 @@ SUBROUTINE PINCH (MXND, MXCORN, MLN, NUID, XN, YN, ZN, LXK, KXL, & YMAX, ZMIN, ZMAX, LLL, DEV1, KREG) IF (VIDEO) CALL SNAPIT (2) ENDIF -C + C CALCULATE NEW ANGLES -C + IF (NLOOP .GT. 0) & CALL LUPANG (MXND, MLN, XN, YN, ZN, LXK, KXL, NXL, & LXN, NLOOP, ANGLE, LNODES, NTHERE, LLL, XMIN, XMAX, & YMIN, YMAX, ZMIN, ZMAX, DEV1, KREG, ERR) IF (ERR) GOTO 210 -C + IF ((NODE .EQ. NGONE) .OR. (NODE .EQ. N1)) & NODE = NTHERE IF ((NADJ1 .EQ. NGONE) .OR. (NADJ1 .EQ. N1)) @@ -548,38 +525,38 @@ SUBROUTINE PINCH (MXND, MXCORN, MLN, NUID, XN, YN, ZN, LXK, KXL, IF ((NADJ2 .EQ. NGONE) .OR. (NADJ2 .EQ. N1)) & NADJ2 = NTHERE IF (DONE) GOTO 200 -C + ENDIF ENDIF GOTO 120 ENDIF -C + 200 CONTINUE -C + C NOW GO BACK AND GET THE NEW CORNERS AND TRY AGAIN IF THE FIRST C TIME WAS SUCCESSFUL -C + IF ((FOUND) .AND. (.NOT. DONE)) THEN FOUND = .FALSE. GOTO 100 ENDIF -C + C NOW PLOT THE NEW BOUNDARY IF A PINCH HAS OCCURRED -C + IF ((FOUND) .AND. (GRAPH) .AND. (.NOT. PGRAPH)) THEN CALL RPLOTL (MXND, XN, YN, ZN, NXL, XMIN, XMAX, YMIN, YMAX, & ZMIN, ZMAX, LLL, DEV1, KREG) ENDIF -C + C BE SURE THAT THE LXN ARRAY WILL GET FIXED (FIXLXN) LATER UP C TO THE CURRENT NNN -C + NNNOLD = NNN -C + 210 CONTINUE -C + CALL GETIME (TIME2) TIMEP = TIMEP + TIME2 - TIME1 RETURN -C + END diff --git a/packages/seacas/applications/fastq/pline.f b/packages/seacas/applications/fastq/pline.f index 4b79f403e0a9..6c18916375d4 100644 --- a/packages/seacas/applications/fastq/pline.f +++ b/packages/seacas/applications/fastq/pline.f @@ -1,41 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pline.f,v 1.4 2001/11/05 13:26:52 gdsjaar Exp $ -C $Log: pline.f,v $ -C Revision 1.4 2001/11/05 13:26:52 gdsjaar -C Fixed array boundary problem in region check code. -C -C Revision 1.3 1998/07/14 18:19:37 gdsjaar -C Removed unused variables, cleaned up a little. -C -C Changed BLUE labels to GREEN to help visibility on black background -C (indirectly requested by a couple users) -C -C Revision 1.2 1991/03/21 15:45:09 gdsjaar -C Changed all 3.14159... to atan2(0.0, -1.0) -C -c Revision 1.1.1.1 1990/11/30 11:13:41 gdsjaar -c FASTQ Version 2.0X -c -c Revision 1.1 90/11/30 11:13:39 gdsjaar -c Initial revision -c -C -CC* FILE: [.QMESH]PLINE.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/31/90 -CC* MODIFICATION: ADDED ARGUMENTS TO CALL TO PLINE TO PASS MINIMUM -CC** ELEMENT SIZE (SIZMIN) AND GETSIZ PARAMETERS OF -CC** EMIN AND EMAX -C SUBROUTINE PLINE (MP, ML, MAXNP, MAXNBC, MAXSBC, IPOINT, & COOR, LINKP, KNUM, KT, NINT, FAC, IP1, IP2, IP3, X, Y, NID, & IPBC1, IPBC2, ILBC, ISBC, LINKPB, NPPF, IFPB, LISTPB, LINKLB, @@ -45,12 +13,12 @@ SUBROUTINE PLINE (MP, ML, MAXNP, MAXNBC, MAXSBC, IPOINT, & NPEOLD, NNXK, REMESH, REXMIN, REXMAX, REYMIN, REYMAX, IDIVIS, & SIZMIN, EMAX, EMIN, GRAPH, DXMAX) C*********************************************************************** -C + C SUBROUTINE PLINE = PRODUCES A NODE STRING FOR THE K'TH LINE IN THE C LINE TABLE -C + C*********************************************************************** -C + C VARIABLES USED: C NID = AN ARRAY OF UNIQUE NODE IDENTIFIERS. C REAL = .TRUE. FOR AN ACTUAL GENERATION @@ -69,33 +37,33 @@ SUBROUTINE PLINE (MP, ML, MAXNP, MAXNBC, MAXSBC, IPOINT, C = 4 FOR ARC WITH THIRD POINT ON THE ARC C = 5 FOR PARABOLA C = 6 FOR ARC WITH RADIUS GIVEN -C + C*********************************************************************** -C + DIMENSION IPOINT (MP), COOR (2, MP), LINKP (2, MP) DIMENSION X (MAXNP), Y (MAXNP), NID (MAXNP) DIMENSION LINKPB (2, MP), NPPF (MP), IFPB (MP), LISTPB (2, MP) DIMENSION LINKLB (2, ML), NLPF (ML), IFLB (ML), LISTLB (2, ML) DIMENSION LINKSB (2, ML), NSPF (ML), IFSB (ML), LISTSB (2, ML) DIMENSION LSTNBC (MAXNBC) -C + DIMENSION AMESUR(NPEOLD), XNOLD(NPNOLD), YNOLD(NPNOLD) DIMENSION NXKOLD(NNXK, NPEOLD), MMPOLD(3, NPROLD) DIMENSION LINKEG(2, MLINK), LISTEG(4 * NPEOLD), BMESUR(NPNOLD) -C + LOGICAL ERR, REAL, TEST, ADDLNK, COUNT, NOROOM, REMESH LOGICAL GRAPH -C + PI = ATAN2(0.0, -1.0) -C + EPS = .01 ERR = .FALSE. ADDLNK = .FALSE. NOROOM = .FALSE. TWOPI = PI + PI -C + C COMPUTE FRACTION OF TOTAL LENGTH FOR FIRST INTERVAL -C + N = IABS (NINT) + 1 IF (N .LE. 1)THEN WRITE (*, 10000)KNUM @@ -110,15 +78,15 @@ SUBROUTINE PLINE (MP, ML, MAXNP, MAXNBC, MAXSBC, IPOINT, DFF = 1.0/DBLE(N - 1) IF (ABS (1.0 - FAC) .GT. 1.0E-6) & DFF = (FAC - 1.0)/ (FAC ** (N - 1) - 1.0) -C + C DEFINE FIRST POINT EXACTLY AND BRANCH -C + X (1) = COOR (1, IP1) Y (1) = COOR (2, IP1) IF (N .GT. 2)THEN -C + C STRAIGHT LINE GENERATION -C + IF (KT .EQ. 1)THEN YDIFF = COOR (2, IP2) - COOR (2, IP1) XDIFF = COOR (1, IP2) - COOR (1, IP1) @@ -129,12 +97,7 @@ SUBROUTINE PLINE (MP, ML, MAXNP, MAXNBC, MAXSBC, IPOINT, GOTO 340 ENDIF IF (REMESH) THEN -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/31/90 -CC* MODIFICATION: ADDED ARGUMENTS TO CALL TO STRSIZ TO PASS MINIMUM -CC** ELEMENT SIZE (SIZMIN) AND GETSIZ PARAMETERS OF -CC** EMIN AND EMAX -C + CALL STRSIZ (MAXNP, X, Y, NINT, N, COOR(1,IP2), & COOR(2,IP2), XDIFF, YDIFF, D, ERR, TEST, XNOLD, YNOLD, & NXKOLD, LINKEG, LISTEG, BMESUR, MLINK, NPNOLD, NPEOLD, @@ -151,9 +114,8 @@ SUBROUTINE PLINE (MP, ML, MAXNP, MAXNBC, MAXSBC, IPOINT, 100 CONTINUE ENDIF -C C CORNER GENERATION -C + ELSEIF (KT .EQ. 2)THEN XDA = COOR (1, IP3) - COOR (1, IP1) YDA = COOR (2, IP3) - COOR (2, IP1) @@ -169,18 +131,18 @@ SUBROUTINE PLINE (MP, ML, MAXNP, MAXNBC, MAXSBC, IPOINT, D = DA + DB DEL = D * DFF SUM = 0.0 -C + C BREAK N INTO TWO PARTS APPROPRIATELY -C + DO 110 I = 2, N - 1 KI = I SUM = SUM + DEL IF (SUM + 0.5 * DEL .GT. DA)GOTO 120 DEL = DEL * FAC 110 CONTINUE -C + C GENERATE FIRST SIDE OF CORNER -C + 120 CONTINUE NA = KI DFF = 1.0/DBLE(NA - 1) @@ -193,9 +155,9 @@ SUBROUTINE PLINE (MP, ML, MAXNP, MAXNBC, MAXSBC, IPOINT, Y (I) = Y (I - 1) + PART * YDA DEL = DEL * FAC 130 CONTINUE -C + C GENERATE SECOND SIDE OF CORNER -C + NB = N - KI + 1 DFF = 1.0/DBLE(NB - 1) IF (ABS (1.0 - FAC) .GT. 1.0E-6) @@ -208,20 +170,20 @@ SUBROUTINE PLINE (MP, ML, MAXNP, MAXNBC, MAXSBC, IPOINT, Y (I) = Y (I - 1) + PART * YDB DEL = DEL * FAC 140 CONTINUE -C + C CIRCULAR ARC GENERATION -C + ELSEIF ((KT .EQ. 3).OR. (KT .EQ. 4).OR. (KT .EQ. 6))THEN -C + C ARC WITH CENTER GIVEN C ARC GOES FROM 1ST POINT TO 2ND IN *COUNTER-CLOCKWISE* DIRECTION. -C + IF (KT .EQ. 3)THEN XCEN = COOR (1, IABS (IP3)) YCEN = COOR (2, IABS (IP3)) -C + C CIRCLE WITH THIRD POINT ON ARC. -C + ELSEIF (KT .EQ. 4)THEN THETA1 = ATAN2 (COOR (2, IP3) - COOR (2, IP1), & COOR (1, IP3) - COOR (1, IP1)) + PI/2.0 @@ -237,9 +199,9 @@ SUBROUTINE PLINE (MP, ML, MAXNP, MAXNBC, MAXSBC, IPOINT, & (Y2 - Y1))/DET XCEN = X1 + R * COS (THETA1) YCEN = Y1 + R * SIN (THETA1) -C + C CIRCLE WITH RADIUS GIVEN -C + ELSEIF (KT .EQ. 6)THEN DX = 0.5 * (COOR (1, IP2) - COOR (1, IP1)) DY = 0.5 * (COOR (2, IP2) - COOR (2, IP1)) @@ -270,18 +232,18 @@ SUBROUTINE PLINE (MP, ML, MAXNP, MAXNBC, MAXSBC, IPOINT, ENDIF THETA1 = ATAN2 (COOR (2, IP1) - YCEN, COOR (1, IP1) - XCEN) THETA2 = ATAN2 (COOR (2, IP2) - YCEN, COOR (1, IP2) - XCEN) -C + C ARC WITH THE CENTER GIVEN -C + IF (KT .EQ. 3)THEN IF ((IP3 .GE. 0).AND. (THETA2 .LE. THETA1)) & THETA2 = THETA2 + TWOPI IF ((IP3 .LT. 0).AND. (THETA1 .LE. THETA2)) & THETA1 = THETA1 + TWOPI TANG = THETA2 - THETA1 -C + C CIRCULAR ARC WITH 3RD POINT ON ARC - CLOCKWISE OR COUNTER-CLOCKWISE -C + ELSEIF (KT .EQ. 4)THEN THETA3 = ATAN2 (COOR (2, IP3) - YCEN, COOR (1, IP3) - & XCEN) @@ -289,9 +251,9 @@ SUBROUTINE PLINE (MP, ML, MAXNP, MAXNBC, MAXSBC, IPOINT, IF (THETA3 .LE. THETA1)THETA3 = THETA3 + TWOPI TANG = THETA2 - THETA1 IF (THETA3 .GT. THETA2)TANG = - (TWOPI - TANG) -C + C CIRRCULAR ARC WITH RADIUS GIVEN - CLOCKWISE OR COUNTER-CLOCKWISE -C + ELSEIF (KT .EQ. 6)THEN IF ((IP3 .GE. 0).AND. (THETA2 .LE. THETA1)) & THETA2 = THETA2 + TWOPI @@ -299,20 +261,15 @@ SUBROUTINE PLINE (MP, ML, MAXNP, MAXNBC, MAXSBC, IPOINT, & THETA1 = THETA1 + TWOPI TANG = THETA2 - THETA1 ENDIF -C + C GENERATE THE CIRCLE -C + ANG = THETA1 DEL = TANG * DFF AA = (LOG (R2/R1))/ (THETA2 - THETA1) BB = R2/EXP (AA * THETA2) IF (REMESH) THEN -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/31/90 -CC* MODIFICATION: ADDED ARGUMENTS TO CALL TO CRCSIZ TO PASS MINIMUM -CC** ELEMENT SIZE (SIZMIN) AND GETSIZ PARAMETERS OF -CC** EMIN AND EMAX -C + CALL CRCSIZ (MAXNP, X, Y, NINT, N, COOR(1,IP2), & COOR(2,IP2), XCEN, YCEN, THETA1, THETA2, TANG, AA, BB, & ERR, TEST, XNOLD, YNOLD, NXKOLD, LINKEG, LISTEG, @@ -329,20 +286,20 @@ SUBROUTINE PLINE (MP, ML, MAXNP, MAXNBC, MAXSBC, IPOINT, DEL = DEL * FAC 150 CONTINUE ENDIF -C + C ELIPSE -C + ELSEIF (KT .EQ. 7)THEN -C + C GET THE ELIPSE PARAMETERS -C + CALL ELPSPR (MP, KT, KNUM, COOR, LINKP, IP1, IP2, & IABS(IP3), IP3, XCEN, YCEN, THETA1, THETA2, TANG, ICCW, & ICW, AVALUE, BVALUE, ERR) IF (ERR) GOTO 340 -C + C GENERATE THE ELIPSE -C + ANG = THETA1 DEL = TANG * DFF DO 160 I = 2, N - 1 @@ -354,18 +311,18 @@ SUBROUTINE PLINE (MP, ML, MAXNP, MAXNBC, MAXSBC, IPOINT, Y (I) = YCEN + SIN (ANG) * RADIUS DEL = DEL * FAC 160 CONTINUE -C + C PARABOLA -C + ELSEIF (KT .EQ. 5)THEN IF (N .GT. 250)THEN WRITE (*, 10030)KNUM ERR = .TRUE. GOTO 340 ENDIF -C + C CHECK LEGITIMACY OF DATA -C + XMID = (COOR (1, IP1) + COOR (1, IP2)) * 0.5 YMID = (COOR (2, IP1) + COOR (2, IP2)) * 0.5 DOT = (COOR (1, IP2) - COOR (1, IP1)) * (COOR (1, IP3) - @@ -380,9 +337,8 @@ SUBROUTINE PLINE (MP, ML, MAXNP, MAXNBC, MAXSBC, IPOINT, ERR = .TRUE. GOTO 340 ENDIF -C + C GET ARC LENGTH -C HALFW = SQRT ((COOR (1, IP2) - COOR (1, IP1)) **2 + & (COOR (2, IP2) - COOR (2, IP1)) **2) * 0.5 @@ -395,9 +351,9 @@ SUBROUTINE PLINE (MP, ML, MAXNP, MAXNBC, MAXSBC, IPOINT, & (YMID - COOR (2, IP3)) **2) COEF = HEIGHT/HALFW **2 TCOEF = 2.0 * COEF -C + C PARC IS A STATEMENT FUNCTION -C + PLEFT = PARC ( - TCOEF * HALFW, TCOEF) ARCTOT = 2.0 * PARC (TCOEF * HALFW, TCOEF) ARCDEL = DFF * ARCTOT @@ -405,18 +361,18 @@ SUBROUTINE PLINE (MP, ML, MAXNP, MAXNBC, MAXSBC, IPOINT, ARCNOW = 0.0 THETA = ATAN2 (COOR (2, IP2) - COOR (2, IP1), & COOR (1, IP2) - COOR (1, IP1)) -C + C CORRECT FOR ORIENTATION -C + CROSS = (COOR (1, IP3) - XMID) * (COOR (2, IP2) - & COOR (2, IP1)) - (COOR (2, IP3) - YMID) * & (COOR (1, IP2) - COOR (1, IP1)) IF (CROSS .LT. 0.0)THETA = THETA + PI SINT = SIN (THETA) COST = COS (THETA) -C + C FIND POINTS APPROXIMATELY BY INTEGRATION -C + XL = - HALFW FL = SQRT (1.0 + (TCOEF * XL) **2) KOUNT = 1 @@ -428,45 +384,45 @@ SUBROUTINE PLINE (MP, ML, MAXNP, MAXNBC, MAXSBC, IPOINT, ARCOLD = ARCNOW ARCNOW = ARCNOW + DELX * (FL + 4.0 * FM + FR)/3.0 IF (ARCNOW .GE. ARCNXT)THEN -C + C COMPUTE POSITION IN LOCAL COORDINATE SYSTEM -C + FRAC = (ARCNXT - ARCOLD)/ (ARCNOW - ARCOLD) XK = XL + FRAC * 2.0 * DELX YK = COEF * XK **2 -C + C CORRECT FOR ORIENTATION PROBLEM -C + IF (CROSS .LT. 0.0)XK = - XK -C + C ROTATE IN LINE WITH GLOBAL COORDINATE SYSTEM -C + ROTX = XK * COST - YK * SINT ROTY = YK * COST + XK * SINT -C + C RESTORE XK -C + IF (CROSS .LT. 0.0)XK = - XK -C + C TRANSLATE -C + KOUNT = KOUNT + 1 X (KOUNT) = ROTX + COOR (1, IP3) Y (KOUNT) = ROTY + COOR (2, IP3) -C + C PREPARE FOR NEXT POINT -C + IF (KOUNT .GE. N - 1)GOTO 180 ARCDEL = ARCDEL * FAC ARCNXT = ARCNXT + ARCDEL -C + C RESTART INTEGRATION -C + XR = XK FR = SQRT (1.0 + (TCOEF * XR) **2) -C + C CORRECT FOR INTEGRATION ERROR -C + ARCNOW = PARC (TCOEF * XR, TCOEF) - PLEFT ENDIF XL = XR @@ -474,9 +430,9 @@ SUBROUTINE PLINE (MP, ML, MAXNP, MAXNBC, MAXSBC, IPOINT, 170 CONTINUE 180 CONTINUE ENDIF -C + C SEE IF THE 1 INTERVAL LINE HAS SOME LENGTH TO IT -C + ELSE IF ((COOR (1, IP1) .EQ. COOR (1, IP2)) .AND. (COOR (2, IP1) & .EQ. COOR (2, IP2)))THEN @@ -485,25 +441,25 @@ SUBROUTINE PLINE (MP, ML, MAXNP, MAXNBC, MAXSBC, IPOINT, GOTO 340 ENDIF ENDIF -C + C NORMAL EXIT C DEFINE LAST POINT EXACTLY -C + X (N) = COOR (1, IP2) Y (N) = COOR (2, IP2) IF (TEST) GOTO 340 -C + C DEFINE UNIQUE (IN THE WHOLE BODY) NODE NUMBERS -C + LPART = 1000000000 + KNUM * 100000 DO 190 I = 1, N NID (I) = LPART + I 190 CONTINUE NID (1) = IPOINT (IP1) NID (N) = IPOINT (IP2) -C + C FLAG PREVIOUSLY USED POINTS WITH NEGATIVES -C + IF (NINT .LT. 0)THEN DO 200 I = 1, N NID (I) = - NID (I) @@ -512,10 +468,10 @@ SUBROUTINE PLINE (MP, ML, MAXNP, MAXNBC, MAXSBC, IPOINT, IF (IPOINT (IP1) .LT. 0)NID (1) = - IABS (NID (1)) IF (IPOINT (IP2) .LT. 0)NID (N) = - IABS (NID (N)) IF (IP1 .EQ. IP2)NID (N) = - IABS (NID (N)) -C + C WRITE OUT NODAL BOUNDARY CONDITIONS FOR THE FIRST POINT C IF THE POINT HAS NOT BEEN USED BEFORE -C + IF (IPOINT (IP1) .GT. 0)THEN IF (IPBC1 .GT. 0)THEN CALL LTSORT (MP, LINKPB, IPBC1, K, ADDLNK) @@ -548,10 +504,10 @@ SUBROUTINE PLINE (MP, ML, MAXNP, MAXNBC, MAXSBC, IPOINT, ENDIF 230 CONTINUE ENDIF -C + C WRITE OUT NODAL BOUNDARY CONDITIONS FOR THE SECOND POINT C IF THE POINT HAS NOT BEEN USED BEFORE -C + IF (IPOINT (IP2) .GT. 0)THEN IF (IPBC2 .GT. 0)THEN CALL LTSORT (MP, LINKPB, IPBC2, K, ADDLNK) @@ -584,10 +540,10 @@ SUBROUTINE PLINE (MP, ML, MAXNP, MAXNBC, MAXSBC, IPOINT, ENDIF 260 CONTINUE ENDIF -C + C WRITE OUT NODAL BOUNDARY CONDITIONS FOR THE LINE C IF THE LINE HAS NOT BEEN USED BEFORE -C + IF (NINT .GT. 0)THEN IF (ILBC .GT. 0)THEN CALL LTSORT (ML, LINKLB, ILBC, K, ADDLNK) @@ -630,10 +586,10 @@ SUBROUTINE PLINE (MP, ML, MAXNP, MAXNBC, MAXSBC, IPOINT, ENDIF 300 CONTINUE ENDIF -C + C IF COUNT, THEN COUNT THE SIDE BOUNDARY CONDITIONS FOR THE LINE C NOTE: IT DOES NOT MATTER IF THE LINE HAS BEEN USED BEFORE -C + IF ((COUNT) .AND. (ISBC .GT. 0))THEN CALL LTSORT (ML, LINKSB, ISBC, K, ADDLNK) IFLAG = ISBC @@ -660,13 +616,13 @@ SUBROUTINE PLINE (MP, ML, MAXNP, MAXNBC, MAXSBC, IPOINT, GOTO 340 ENDIF 330 CONTINUE -C + C NORMAL COMPLETION -C + 340 CONTINUE -C + RETURN -C + 10000 FORMAT (' ZERO NUMBER OF INTERVALS FOR LINE', I5) 10010 FORMAT (' ZERO LINE LENGTH ENCOUNTERED FOR LINE', I5) 10020 FORMAT (' POINTS GIVEN FOR LINE', I5, ' DO NOT DEFINE AN ARC') @@ -676,5 +632,5 @@ SUBROUTINE PLINE (MP, ML, MAXNP, MAXNBC, MAXSBC, IPOINT, 10050 FORMAT (' LINE BOUNDARY FLAG', I5, ' IS NOT PROPERLY LINKED') 10060 FORMAT (' POINT BOUNDARY FLAG', I5, ' IS NOT PROPERLY LINKED') 10070 FORMAT (' SIDE BOUNDARY FLAG', I5, ' IS NOT PROPERLY LINKED') -C + END diff --git a/packages/seacas/applications/fastq/plotl.f b/packages/seacas/applications/fastq/plotl.f index e969fda449f6..c2580677e027 100644 --- a/packages/seacas/applications/fastq/plotl.f +++ b/packages/seacas/applications/fastq/plotl.f @@ -1,49 +1,24 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: plotl.f,v 1.3 2007/07/24 13:10:18 gdsjaar Exp $ -C $Log: plotl.f,v $ -C Revision 1.3 2007/07/24 13:10:18 gdsjaar -C Fix problem with boundary condition memory overwrite. -C -C Remove old ls5 and r25 terminal tests -C -C Revision 1.2 1998/07/14 18:19:39 gdsjaar -C Removed unused variables, cleaned up a little. -C -C Changed BLUE labels to GREEN to help visibility on black background -C (indirectly requested by a couple users) -C -C Revision 1.1.1.1 1990/11/30 11:13:44 gdsjaar -C FASTQ Version 2.0X -C -c Revision 1.1 90/11/30 11:13:43 gdsjaar -c Initial revision -c -C -CC* FILE: [.QMESH]PLOTL.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE PLOTL (MXND, XN, YN, NXL, KREG, XMIN, XMAX, YMIN, & YMAX, LLL, DEV1) C*********************************************************************** -C + C SUBROUTINE PLTNXL = PLOTS THE CURRENT MESH FROM THE NXL ARRAY -C + C*********************************************************************** -C + DIMENSION NXL (2, 3 * MXND), XN (MXND), YN (MXND) DIMENSION X (2), Y (2) -C + CHARACTER * 72 DUMMY, HOLD, DEV1 * 3 -C + C INITIALIZE THE PLOTTING SURFACE -C + CALL PLTBGN XDIMR = XMAX - XMIN YDIMR = YMAX - YMIN @@ -79,9 +54,9 @@ SUBROUTINE PLOTL (MXND, XN, YN, NXL, KREG, XMIN, XMAX, YMIN, DUMMY (1:7) = 'REGION ' LEN = LEN + 7 CALL PLTXTH (XDIMD * .05, YDIMD * .95, DUMMY (1:LEN)) -C + C PLOT THE LINES IN NXL ARRAY, SKIPPING DELETIONS -C + DO 100 I = 1, LLL IF (NXL (1, I) .GT. 0) THEN X (2) = XN (NXL (2, I)) @@ -91,9 +66,9 @@ SUBROUTINE PLOTL (MXND, XN, YN, NXL, KREG, XMIN, XMAX, YMIN, CALL MPD2VC (1, X (1), Y (1), X (2), Y (2)) ENDIF 100 CONTINUE -C + CALL PLTFLU -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/pmesh.F b/packages/seacas/applications/fastq/pmesh.F index 8708ada8807c..d25b2919cdc2 100644 --- a/packages/seacas/applications/fastq/pmesh.F +++ b/packages/seacas/applications/fastq/pmesh.F @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details SUBROUTINE PMESH (NPNODE, NPELEM, MXNFLG, MXSFLG, NPNBC, NPSBC, & MAXKXN, NNN, KKK, NNXK, NBCNOD, NBCSID, NNLIST, NVLIST, NODES, @@ -10,11 +10,11 @@ SUBROUTINE PMESH (NPNODE, NPELEM, MXNFLG, MXSFLG, NPNBC, NPSBC, & LABNB, LABSB, LABM, LABW, CENTK, ILOOK, XMIN, XMAX, YMIN, YMAX, & XX1, XX2, YY1, YY2, TITLE, DEV1, EIGHT, NINE, VERSN, VAXVMS) C*********************************************************************** -C + C SUBROUTINE PMESH = PLOTS ALL FLAGGED ELEMENTS IN THE MESH -C + C*********************************************************************** -C + C VARIABLES USED: C AREACG = .TRUE. IF AREA AND C.G. REPORT ARE TO BE CALCULATED AND C PLOTTED @@ -22,9 +22,9 @@ SUBROUTINE PMESH (NPNODE, NPELEM, MXNFLG, MXSFLG, NPNBC, NPSBC, C LABN = .TRUE. IF NODE NUMBERS ARE TO BE PLOTTED C LABNB = .TRUE. IF NODE BOUNDARY NUMBERS ARE TO BE PLOTTED C LABSB = .TRUE. IF SIDE BOUNDARY NUMBERS ARE TO BE PLOTTED -C + C*********************************************************************** -C + DIMENSION CENTK(2, NPELEM), ILOOK(NNXK*MAXKXN) DIMENSION MAPGXD(NPNODE), MAPDXG(NPNODE) DIMENSION XN(NPNODE), YN(NPNODE), NXK(NNXK, NPELEM), MAT(NPELEM) @@ -33,15 +33,15 @@ SUBROUTINE PMESH (NPNODE, NPELEM, MXNFLG, MXSFLG, NPNBC, NPSBC, DIMENSION NNFLG(MXNFLG), NNPTR(MXNFLG) DIMENSION NSFLG(MXSFLG), NVPTR(MXSFLG), NVLEN(MXSFLG) DIMENSION XDUM(2), YDUM(2) -C + LOGICAL LABE, LABN, LABNB, LABSB, LABO, ADD, AXIS, LABM, EIGHT LOGICAL NINE, NEW, LABW, CPUIFC, AREACG -C + CHARACTER*72 DUMMY, TITLE CHARACTER DEV1*3, CDUMMY*4, DATE*8, TIME*8, VERSN*9 -C + C INITIALIZE THE PLOTTING SURFACE -C + CALL PLTBGN CALL PLTSTV (2, 160.) XDIMR = XMAX - XMIN @@ -66,9 +66,9 @@ SUBROUTINE PMESH (NPNODE, NPELEM, MXNFLG, MXSFLG, NPNBC, NPSBC, XX1 = XMIN XX2 = XMAX END IF -C + C SET UP SCALING EXTREMES FOR AXIS -C + IF (AXIS) THEN XDUM(1) = XX1 - (XDIMR*.05) XDUM(2) = XX2 + (XDIMR*.05) @@ -78,18 +78,18 @@ SUBROUTINE PMESH (NPNODE, NPELEM, MXNFLG, MXSFLG, NPNBC, NPSBC, ELSE SHRINK = .1 END IF -C + C SHRINK TO FIT A BORDER ON THE PLOT -C + XX1 = XX1 - (XDIMR*SHRINK) XX2 = XX2 + (XDIMR*SHRINK) YY1 = YY1 - (YDIMR*SHRINK) YY2 = YY2 + (YDIMR*SHRINK) CALL MPORT2 (XX1, XX2, YY1, YY2) CALL PLTFRM (0) -C + C PLOT THE TITLE AND THE TRACE -C + CALL STRLNG (TITLE, LEN) IF ((LEN .GT. 1) .OR. (TITLE(1:1) .NE. ' ')) THEN CALL PLTXHL (TITLE(1:LEN), XLEN) @@ -108,18 +108,18 @@ SUBROUTINE PMESH (NPNODE, NPELEM, MXNFLG, MXSFLG, NPNBC, NPSBC, CALL EXTIME (TIME) DUMMY(32:39) = TIME CALL PLTXTH (0., 0., DUMMY(1:39)) -C + C DRAW THE AXIS IF REQUIRED AND SET CLIPPING WITHIN THE AXIS -C + IF (AXIS) CALL SETAXS (XDUM, YDUM) IF (CPUIFC(.TRUE.)) GO TO 340 -C + C FLAG NODES TO BE PLOTTED -C + DO 100 I = 1, NNN ILOOK(I) = 0 100 CONTINUE -C + DO 120 I = 1, KKK IF (NXK(1, I) .GT. 0) THEN DO 110 J = 1, NNXK @@ -127,9 +127,9 @@ SUBROUTINE PMESH (NPNODE, NPELEM, MXNFLG, MXSFLG, NPNBC, NPSBC, 110 CONTINUE END IF 120 CONTINUE -C + C PLOT THE NUMBERS ASSOCIATED WITH NODES -C + IF ((LABN) .OR. (LABNB) .OR. (LABSB) .OR. (LABW)) THEN DO 240 I = 1, NNN IF (CPUIFC(.TRUE.)) GO TO 340 @@ -138,9 +138,9 @@ SUBROUTINE PMESH (NPNODE, NPELEM, MXNFLG, MXSFLG, NPNBC, NPSBC, DUMMY = ' ' CALL MP2PT (1, XN(I), YN(I), X1, Y1, MASK) IF (MOD(MASK, 2) .NE. 0) THEN -C + C PLOT THE NODE NUMBERS -C + IF (LABN) THEN CALL PLTSTD (1, 3.) CALL GETDUM (I, DUMMY, LEN) @@ -148,9 +148,9 @@ SUBROUTINE PMESH (NPNODE, NPELEM, MXNFLG, MXSFLG, NPNBC, NPSBC, CALL PLTXHE (X1, Y1) ADD = .TRUE. END IF -C + C PLOT THE NODAL BOUNDARY CONDITION FLAGS -C + IF (LABNB) THEN CALL PLTSTD (1, 5.) J1 = 1 @@ -184,9 +184,9 @@ SUBROUTINE PMESH (NPNODE, NPELEM, MXNFLG, MXSFLG, NPNBC, NPSBC, END IF 160 CONTINUE END IF -C + C PLOT THE WEIGHTING FACTORS -C + IF (LABW) THEN CALL PLTSTD (1, 5.) DO 170 J = 1, NNLIST @@ -219,9 +219,9 @@ SUBROUTINE PMESH (NPNODE, NPELEM, MXNFLG, MXSFLG, NPNBC, NPSBC, 190 CONTINUE 200 CONTINUE END IF -C + C PLOT THE SIDE BOUNDARY CONDITION FLAGS -C + IF (LABSB) THEN J1 = 1 ADD = .FALSE. @@ -234,9 +234,9 @@ SUBROUTINE PMESH (NPNODE, NPELEM, MXNFLG, MXSFLG, NPNBC, NPSBC, DO 230 J = J1, NVLIST, 2 IF ((NSIDEN(J) .EQ. I) .AND. & (ILOOK(NSIDEN(J + 1)) .GT. 0)) THEN -C + C SEE IF THIS USE OF THE NODE IS THE SAME SIDE AS BEFORE -C + IF ((ADD) .AND. (NSIDEN(J + 1) .NE. JE) .AND. & (.NOT.NEW)) THEN J1HOLD = J @@ -271,9 +271,9 @@ SUBROUTINE PMESH (NPNODE, NPELEM, MXNFLG, MXSFLG, NPNBC, NPSBC, END IF END IF 230 CONTINUE -C + C GO BACK AND PICK UP OTHER SIDES USING THIS NODE -C + IF (J1HOLD .GT. 0) THEN J1 = J1HOLD J1HOLD = 0 @@ -282,14 +282,14 @@ SUBROUTINE PMESH (NPNODE, NPELEM, MXNFLG, MXSFLG, NPNBC, NPSBC, GO TO 210 END IF END IF -C + END IF END IF 240 CONTINUE END IF -C + C PLOT THE ELEMENT NUMBERS IF NEEDED -C + IF ((LABE) .OR. (LABO) .OR. (LABM)) THEN DO 250 IJK = 1, KKK IF (CPUIFC(.TRUE.)) GO TO 340 @@ -321,9 +321,9 @@ SUBROUTINE PMESH (NPNODE, NPELEM, MXNFLG, MXSFLG, NPNBC, NPSBC, END IF 250 CONTINUE END IF -C + C PLOT THE ELEMENTS -C + DO 260 I = 1, MAXKXN*NNXK ILOOK(I) = 0 260 CONTINUE @@ -358,16 +358,16 @@ SUBROUTINE PMESH (NPNODE, NPELEM, MXNFLG, MXSFLG, NPNBC, NPSBC, & ((K .EQ. 5) .AND. (.NOT.EIGHT) .AND. (.NOT.NINE))) & K = 1 INUM2 = NXK(K, I) -C + C CALCULATE AREA AND C.G. OF ELEMENT -C + IF (AREACG) THEN XBAR = XBAR + XN(INUM1) YBAR = YBAR + YN(INUM1) EAREA = EAREA + 0.5 * (XN(INUM1) - XN(INUM2)) & * (YN(INUM1) + YN(INUM2)) END IF -C + IF (INUM2 .GT. INUM1) THEN IHOLD = INUM1 INUM1 = INUM2 @@ -409,7 +409,7 @@ SUBROUTINE PMESH (NPNODE, NPELEM, MXNFLG, MXSFLG, NPNBC, NPSBC, GO TO 290 END IF 310 CONTINUE -C + IF (AREACG) THEN AREA = AREA + EAREA XCG = XCG + EAREA*XBAR/REAL(JEND) @@ -422,14 +422,14 @@ SUBROUTINE PMESH (NPNODE, NPELEM, MXNFLG, MXSFLG, NPNBC, NPSBC, YCG = YCG/AREA END IF 330 CONTINUE -C + C CONCLUDE THE PLOT SESSION -C + 340 CONTINUE CALL PLTSTD (1, 7.) -C + C PLOT SYMBOL AT C.G. AND REPORT AREA AND C.G. -C + IF (AREACG) THEN WRITE (DUMMY, 10040) 'AREA', AREA CALL STRLNG (DUMMY, LEN) @@ -461,8 +461,8 @@ SUBROUTINE PMESH (NPNODE, NPELEM, MXNFLG, MXSFLG, NPNBC, NPSBC, END IF CALL PLTBEL CALL PLTFLU -C + RETURN -C + 10040 FORMAT (A, ': ', G11.4) END diff --git a/packages/seacas/applications/fastq/pmschm.f b/packages/seacas/applications/fastq/pmschm.f index 75bd014400b8..79cde0a8b9d3 100644 --- a/packages/seacas/applications/fastq/pmschm.f +++ b/packages/seacas/applications/fastq/pmschm.f @@ -1,11 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pmschm.f,v 1.5 2004/01/21 05:18:40 gdsjaar Exp $ -C SUBROUTINE PMSCHM (NPER, NPRM, MXND, MLN, MP, ML, MS, MR, NL, & MAXNL, MAXNP, MAXPRM, MAXNB, MAXNBC, MAXSBC, KNBC, KSBC, KNUM, & IPOINT, COOR, IPBOUN, ILINE, LTYPE, NINT, FACTOR, LCON, ILBOUN, @@ -20,11 +18,11 @@ SUBROUTINE PMSCHM (NPER, NPRM, MXND, MLN, MP, ML, MS, MR, NL, & NPEOLD, NNXK, REMESH, REXMIN, REXMAX, REYMIN, REYMAX, IDIVIS, & SIZMIN, EMAX, EMIN) C*********************************************************************** -C + C SUBROUTINE FMSCHM = GENERATES AN INITIAL PAVED MESH -C + C*********************************************************************** -C + C VARIABLES USED: C X = X VALUES AROUND THE PERIMETER C Y = Y VALUES AROUND THE PERIMETER @@ -45,13 +43,13 @@ SUBROUTINE PMSCHM (NPER, NPRM, MXND, MLN, MP, ML, MS, MR, NL, C A CONTINUATION ROW. C A NEGATIVE FLAG IN THE SECOND COLUMN OF THE LXN ARRAY MEANS C THAT THIS NODE IS AN EXTERIOR BOUNDARY NODE. -C + C*********************************************************************** -C + DIMENSION ANGLE (MXND), BNSIZE (2, MXND), LNODES (MLN, MXND) DIMENSION LINKPR (3, MAXPRM) DIMENSION IPTPER (MAXPRM), NUMPER (MAXPRM), LPERIM(MAXNB) -C + DIMENSION IPOINT(MP), COOR(2, MP), IPBOUN(MP) DIMENSION ILINE(ML), NINT(ML), LTYPE(ML), FACTOR(ML), LCON(3, ML) DIMENSION ILBOUN(ML), ISBOUN(ML), LINKR(2, MR) @@ -68,17 +66,17 @@ SUBROUTINE PMSCHM (NPER, NPRM, MXND, MLN, MP, ML, MS, MR, NL, DIMENSION XN(MXND), YN(MXND), ZN(MXND), NUID(MXND) DIMENSION LXK(4, MXND), KXL(2, 3*MXND) DIMENSION NXL(2, 3*MXND), LXN(4, MXND) -C + DIMENSION AMESUR(NPEOLD), XNOLD(NPNOLD), YNOLD(NPNOLD) DIMENSION NXKOLD(NNXK, NPEOLD), MMPOLD(3, NPROLD) DIMENSION LINKEG(2, MLINK), LISTEG(4 * NPEOLD), BMESUR(NPNOLD) -C + LOGICAL ERR, GRAPH, ERRCHK, NOROOM, VIDEO LOGICAL ADDLNK, CCW, EVEN, LREAL, COUNT, SIZEIT, TIMER LOGICAL BATCH, REMESH -C + CHARACTER*3 DEV1 -C + ADDLNK = .FALSE. ERR = .FALSE. GRAPH = .FALSE. @@ -88,10 +86,10 @@ SUBROUTINE PMSCHM (NPER, NPRM, MXND, MLN, MP, ML, MS, MR, NL, DEFSIZ = RSIZE (IPNTRG) VIDEO = .FALSE. -C + C PUT ALL THE NODES IN THE ORIGINAL PERIMETER INTO THE GLOBAL C PERIMETER ARRAYS FOR THE PAVING ROUTINE -C + DO 100 I = 1, NPER XN(I) = X(I) YN(I) = Y(I) @@ -101,9 +99,9 @@ SUBROUTINE PMSCHM (NPER, NPRM, MXND, MLN, MP, ML, MS, MR, NL, IPTPER(1) = 1 NUMPER(1) = NPER NBNODE = NPER -C + C NOW GENERATE ALL THE HOLE PERIMETERS -C + CCW = .TRUE. COUNT = .TRUE. EVEN = .TRUE. @@ -119,12 +117,7 @@ SUBROUTINE PMSCHM (NPER, NPRM, MXND, MLN, MP, ML, MS, MR, NL, & ERRCHK, ERR) IF (ERR) GOTO 130 NLP1 = NL + 1 -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/31/90 -CC* MODIFICATION: ADDED ARGUMENTS TO CALL TO PERIM TO PASS MINIMUM -CC** ELEMENT SIZE (SIZMIN) AND GETSIZ PARAMETERS OF -CC** EMIN AND EMAX -C + CALL PERIM (MP, ML, MS, NSPR(JPNTR), MAXNL, MAXNP, MAXNBC, & MAXSBC, KNBC, KSBC, KNUM, IPOINT, COOR, IPBOUN, ILINE, & LTYPE, NINT, FACTOR, LCON, ILBOUN, ISBOUN, ISIDE, NLPS, @@ -146,17 +139,17 @@ SUBROUTINE PMSCHM (NPER, NPRM, MXND, MLN, MP, ML, MS, MR, NL, ERR = .TRUE. GO TO 130 END IF -C + C NOW LINK THIS HOLE'S PERIMETER NODES TOGETHER INTO THE GLOBAL C PERIMETER LIST -C + CALL REVERS (X (2), NPERIM(NPRM) - 1) CALL REVERS (Y (2), NPERIM(NPRM) - 1) CALL IREVER (NID (2, NPRM), NPERIM(NPRM) - 1) IPTPER (NPRM) = NBNODE + 1 NUMPER (NPRM) = NPERIM(NPRM) NBNODE = NBNODE + NPERIM(NPRM) -C + DO 110 J = 1, NPERIM(NPRM) NODE = J + IPTPER(NPRM) - 1 XN(NODE) = X(J) @@ -167,16 +160,11 @@ SUBROUTINE PMSCHM (NPER, NPRM, MXND, MLN, MP, ML, MS, MR, NL, 110 CONTINUE ENDIF 120 CONTINUE -C + C NOW MESH THE BOUNDARIES WITH PAVING -C + NNN = NBNODE -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/31/90 -CC* MODIFICATION: ADDED ARGUMENTS TO CALL TO PAVING TO PASS MINIMUM -CC** ELEMENT SIZE (SIZMIN) AND GETSIZ PARAMETERS OF -CC** EMIN AND EMAX -C + CALL PAVING (NBNODE, NPRM, MLN, IPTPER, NUMPER, LPERIM, XN, YN, & ZN, LXK, NXL, NNN, LLL, KKK, MXND, ANGLE, BNSIZE, LNODES, & LINKPR, NPERIM, LXK, KXL, NXL, LXN, NUID, IAVAIL, NAVAIL, @@ -186,10 +174,10 @@ SUBROUTINE PMSCHM (NPER, NPRM, MXND, MLN, MP, ML, MS, MR, NL, & REXMIN, REXMAX, REYMIN, REYMAX, IDIVIS, SIZMIN, EMAX, EMIN) ERR = .FALSE. RETURN -C + C ERROR DURING GENERATION -C + 130 CONTINUE RETURN -C + END diff --git a/packages/seacas/applications/fastq/pschem.f b/packages/seacas/applications/fastq/pschem.f index b3791d0e9e0e..c9bdef644e3e 100644 --- a/packages/seacas/applications/fastq/pschem.f +++ b/packages/seacas/applications/fastq/pschem.f @@ -1,63 +1,14 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pschem.f,v 1.4 1999/06/21 22:43:40 gdsjaar Exp $ -C $Log: pschem.f,v $ -C Revision 1.4 1999/06/21 22:43:40 gdsjaar -C Fixed more uninitialized variables; one was causing core dump on g77 -C compiled executable. -C -C VERSN was not consistently defined -- now 10 characters everywhere -C -C Updated so full version string output -C -C Added capability to debug memory using unit specified in EXT99 -C variable. Similar to STRTUP in SUPLIB -C -C Cleaned up some other code -C -C Upped version -C -C Revision 1.3 1999/06/17 19:02:22 gdsjaar -C Fixed several problems related to holes. In several places, a -C nonpositive integer was being used to index into an array. This seems -C to fix all of those cases. I'm not sure if I fixed the true cause of -C these errors or just the symptom though... -C -C Revision 1.2 1998/07/14 18:19:45 gdsjaar -C Removed unused variables, cleaned up a little. -C -C Changed BLUE labels to GREEN to help visibility on black background -C (indirectly requested by a couple users) -C -C Revision 1.1.1.1 1990/11/30 11:13:54 gdsjaar -C FASTQ Version 2.0X -C -c Revision 1.1 90/11/30 11:13:52 gdsjaar -c Initial revision -c -C -CC* FILE: [.QMESH]PSCHEM.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/13/90 -CC* MODIFICATION: CORRECTED BUG - MULTIPLE HOLES, EACH WITH AN ELEMENT C** SIDE BOUNDARY FLAG WOULD REDIMENSION FOREVER. C** THE KKSBC VARIABLE WAS CHANGED TO BE SET AT THE C** BEGINNING OF THE ROUTINE INSTEAD OF RIGHT BEFORE THE C** ZHOLE PROCESSING WAS STARTED. -C -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/31/90 -CC* MODIFICATION: ADDED ARGUMENTS TO CALL TO PSCHEM TO PASS MINIMUM -CC** ELEMENT SIZE (SIZMIN) AND GETSIZ PARAMETERS OF -CC** EMIN AND EMAX -C + SUBROUTINE PSCHEM (MP, ML, MS, MR, N, IPOINT, COOR, IPBOUN, ILINE, & LTYPE, NINT, FACTOR, LCON, ILBOUN, ISBOUN, ISIDE, NLPS, IFLINE, & ILLIST, IREGN, NSPR, IFSIDE, ISLIST, NPPF, IFPB, LISTPB, NLPF, @@ -73,11 +24,11 @@ SUBROUTINE PSCHEM (MP, ML, MS, MR, N, IPOINT, COOR, IPBOUN, ILINE, & MLINK, NPROLD, NPNOLD, NPEOLD, NNXK, REMESH, REXMIN, REXMAX, & REYMIN, REYMAX, IDIVIS, SIZMIN, EMAX, EMIN) C*********************************************************************** -C + C PSCHEM - PROCESS A COMPLETE SCHEME -C + C*********************************************************************** -C + DIMENSION IPOINT(MP), COOR(2, MP), IPBOUN(MP) DIMENSION ILINE(ML), LTYPE(ML), NINT(ML), FACTOR(ML), LCON(3, ML) DIMENSION ILBOUN(ML), ISBOUN(ML) @@ -97,22 +48,22 @@ SUBROUTINE PSCHEM (MP, ML, MS, MR, N, IPOINT, COOR, IPBOUN, ILINE, DIMENSION XN(MXND), YN(MXND), NUID(MXND), LXK(4, MXND) DIMENSION KXL(2, 3*MXND), NXL(2, 3*MXND), LXN(4, MXND) DIMENSION LSTNBC(MAXNBC), NXH(MXND), NPERIM(MAXPRM) -C + DIMENSION ILPC(10) -C + DIMENSION AMESUR(NPEOLD), XNOLD(NPNOLD), YNOLD(NPNOLD) DIMENSION NXKOLD(NNXK, NPEOLD), MMPOLD(3, NPROLD) DIMENSION LINKEG(2, MLINK), LISTEG(2 * NPEOLD), BMESUR(NPNOLD) -C + CHARACTER*72 ADDSTR, CIN, DEFSCH, SCHEME, SCHOLE, SCHSTR CHARACTER DEV1*3 -C + LOGICAL DOLINK, EIGHT, ERR, NINE, NOROOM, STEP LOGICAL ADDLNK, ACTIVE, IANS, DONE, DOSMOO, DOTILT, LACT(10) LOGICAL RECT, REMESH -C + DATA IEXIT, IOVER, IQUIT /1, 2, 3/ -C + ALPHA = 0.7 ASMALL = 45.0 RO = 1. @@ -129,21 +80,21 @@ SUBROUTINE PSCHEM (MP, ML, MS, MR, N, IPOINT, COOR, IPBOUN, ILINE, NOROOM = .FALSE. KKSBC = KSBC NLEFTP = 0 -C + NIT = 5 * NPER/2 CALL MNORM (MXND, XN, YN, NXL, LLL, STDLEN) EPS = 0.03 * STDLEN -C + CALL STRIPB (SCHSTR, I1, LENSCH) 100 CONTINUE -C + IISIGN = NEWSGN NEWSGN = 0 -C + C ACT ON NEXT COMMAND -C + C A - ALPHA CONTROL FOR APALSM -C + IF ((SCHSTR(J:J) .EQ. 'A') .OR. (SCHSTR(J:J) .EQ. 'a')) THEN IF (IISIGN .GE. 0) THEN ALPHA = MIN(ALPHA + 0.1, 1.0) @@ -152,21 +103,21 @@ SUBROUTINE PSCHEM (MP, ML, MS, MR, N, IPOINT, COOR, IPBOUN, ILINE, END IF IF (ISTYPE .LE. 2) DOSMOO = .TRUE. WRITE(*, 10010) ALPHA -C + C B - BLACKER TRANSITION REGION TEST -C + ELSE IF ((SCHSTR(J:J) .EQ. 'B') .OR. & (SCHSTR(J:J) .EQ. 'b')) THEN CONTINUE -C + C C - SEMI-CIRCLE REGION TEST -C + ELSE IF ((SCHSTR(J:J) .EQ. 'C') .OR. & (SCHSTR(J:J) .EQ. 'c')) THEN CONTINUE -C + C D - DELETE WORST RHOMBUS -C + ELSE IF ((SCHSTR(J:J) .EQ. 'D') .OR. & (SCHSTR(J:J) .EQ. 'd')) THEN LIMIT = 0 @@ -200,14 +151,14 @@ SUBROUTINE PSCHEM (MP, ML, MS, MR, N, IPOINT, COOR, IPBOUN, ILINE, ELSE CALL MESAGE ('NO ELEMENT(S) DELETED') END IF -C + C E - EXIT SAVING SCHEME AND REGION -C + ELSE IF ((SCHSTR(J:J) .EQ. 'E') .OR. & (SCHSTR(J:J) .EQ. 'e')) THEN -C + C SAVE THE SCHEME USED IF STEPPING THROUGH -C + IF (STEP) THEN DOLINK = .TRUE. NOLD10 = N(10) @@ -226,9 +177,9 @@ SUBROUTINE PSCHEM (MP, ML, MS, MR, N, IPOINT, COOR, IPBOUN, ILINE, END IF ICODE = IEXIT GO TO 140 -C + C F - CONTROL UNDER- OR OVER-RELAXATION -C + ELSE IF ((SCHSTR(J:J) .EQ. 'F') .OR. & (SCHSTR(J:J) .EQ. 'f')) THEN RODEL = .25 @@ -239,15 +190,15 @@ SUBROUTINE PSCHEM (MP, ML, MS, MR, N, IPOINT, COOR, IPBOUN, ILINE, END IF DOSMOO = .TRUE. WRITE(*, 10030) RO -C + C H - INDICATES A HELP MESSAGE RESPONSE IF STEPPING -C + ELSE IF ((SCHSTR(J:J) .EQ. 'H') .OR. & (SCHSTR(J:J) .EQ. 'h')) THEN IF (STEP) CALL HELP_FQ (3) -C + C I - CHANGE MAX SMOOTHING ITERATIONS -C + ELSE IF ((SCHSTR(J:J) .EQ. 'I') .OR. & (SCHSTR(J:J) .EQ. 'i')) THEN IF (IISIGN .GE. 0) THEN @@ -257,9 +208,9 @@ SUBROUTINE PSCHEM (MP, ML, MS, MR, N, IPOINT, COOR, IPBOUN, ILINE, END IF DOSMOO = .TRUE. WRITE(*, 10050) NIT -C + C J - CONTROL SMOOTHING TOLERANCE -C + ELSE IF ((SCHSTR(J:J) .EQ. 'J') .OR. & (SCHSTR(J:J) .EQ. 'j')) THEN IF (IISIGN .GE. 0) THEN @@ -271,21 +222,21 @@ SUBROUTINE PSCHEM (MP, ML, MS, MR, N, IPOINT, COOR, IPBOUN, ILINE, END IF DOSMOO = .TRUE. WRITE(*, 10060) TOL, EPS -C + C L - INSERT ROW OF ELEMENTS AROUND A HOLE (TOO LATE NOW) -C + ELSE IF ((SCHSTR(J:J) .EQ. 'L') .OR. & (SCHSTR(J:J) .EQ. 'l')) THEN CONTINUE -C + C M - LOGICAL MESH SIDES CHOSEN BY QMESH (TOO LATE NOW) -C + ELSE IF ((SCHSTR(J:J) .EQ. 'M') .OR. & (SCHSTR(J:J) .EQ. 'm')) THEN CONTINUE -C + C N - NECKLACE -C + ELSE IF ((SCHSTR(J:J) .EQ. 'N') .OR. & (SCHSTR(J:J) .EQ. 'n')) THEN CALL NCKLCE (MXND, XN, YN, NUID, LXK, KXL, NXL, LXN, KKK, NNN, @@ -300,18 +251,18 @@ SUBROUTINE PSCHEM (MP, ML, MS, MR, N, IPOINT, COOR, IPBOUN, ILINE, RECT = .FALSE. DOSMOO = .TRUE. CALL MESAGE ('NECKLACE INSTALLED') -C + C O - ORIGINATE THE MESH AGAIN. -C + ELSE IF ((SCHSTR(J:J) .EQ. 'O') .OR. & (SCHSTR(J:J) .EQ. 'o')) THEN CALL MESAGE ('PROCESSING RETURNED TO ORIGINAL') SCHSTR = ' ' ICODE = IOVER GO TO 140 -C + C P - PLOT -C + ELSE IF ((SCHSTR(J:J) .EQ. 'P') .OR. & (SCHSTR(J:J) .EQ. 'p')) THEN IF (STEP) THEN @@ -321,17 +272,17 @@ SUBROUTINE PSCHEM (MP, ML, MS, MR, N, IPOINT, COOR, IPBOUN, ILINE, CALL MESAGE ('PLOTTING AVAILABLE ONLY IN INTERACTIVE '// & 'STEP PROCESSING') END IF -C + C Q - QUIT STEP PROCESSING WITHOUT SAVING MESH -C + ELSE IF ((SCHSTR(J:J) .EQ. 'Q') .OR. & (SCHSTR(J:J) .EQ. 'q')) THEN CALL MESAGE ('REGION PROCESSING ABORTED WITH "QUIT"') ICODE = IQUIT GO TO 140 -C + C R - RESTRUCTURE -C + ELSE IF ((SCHSTR(J:J) .EQ. 'R') .OR. & (SCHSTR(J:J) .EQ. 'r')) THEN LIMIT = MXND @@ -351,9 +302,9 @@ SUBROUTINE PSCHEM (MP, ML, MS, MR, N, IPOINT, COOR, IPBOUN, ILINE, ACTIVE = .TRUE. CALL MESAGE ('RESTRUCTURE COMPLETED') END IF -C + C S - SMOOTH -C + ELSE IF ((SCHSTR(J:J) .EQ. 'S') .OR. & (SCHSTR(J:J) .EQ. 's')) THEN IF (DOSMOO) THEN @@ -429,21 +380,21 @@ SUBROUTINE PSCHEM (MP, ML, MS, MR, N, IPOINT, COOR, IPBOUN, ILINE, CALL MESAGE ('MESH AND/OR SMOOTHING PARAMETERS HAVE') CALL MESAGE ('NOT CHANGED - NO SMOOTHING ATTEMPTED') END IF -C + C T - TRIANGULAR REGION - QUAD MESH GENERATION -C + ELSE IF ((SCHSTR(J:J) .EQ. 'T') .OR. & (SCHSTR(J:J) .EQ. 't')) THEN CONTINUE -C + C U - PENTAGON REGION - QUAD MESH GENERATION -C + ELSE IF ((SCHSTR(J:J) .EQ. 'U') .OR. & (SCHSTR(J:J) .EQ. 'u')) THEN CONTINUE -C + C V - CHANGE ASMALL FOR SQUASH (D) -C + ELSE IF ((SCHSTR(J:J) .EQ. 'V') .OR. & (SCHSTR(J:J) .EQ. 'v')) THEN IF (IISIGN .GE. 0) THEN @@ -452,9 +403,9 @@ SUBROUTINE PSCHEM (MP, ML, MS, MR, N, IPOINT, COOR, IPBOUN, ILINE, ASMALL = MAX(ASMALL - 2.5, 10.0) END IF WRITE(*, 10070) ASMALL -C + C W - RESTRUCTURE WORST POSSIBLE ELEMENT ONLY -C + ELSE IF ((SCHSTR(J:J) .EQ. 'W') .OR. & (SCHSTR(J:J) .EQ. 'w')) THEN LIMIT = 1 @@ -474,15 +425,15 @@ SUBROUTINE PSCHEM (MP, ML, MS, MR, N, IPOINT, COOR, IPBOUN, ILINE, ACTIVE = .TRUE. CALL MESAGE ('WORST ELEMENT RESTRUCTURED') END IF -C + C X - PAVING REGION - QUAD MESH GENERATION -C + ELSE IF ((SCHSTR(J:J) .EQ. 'X') .OR. & (SCHSTR(J:J) .EQ. 'x')) THEN CONTINUE -C + C Y - CONTROL UNDER- OR OVER-RELAXATION -C + ELSE IF ((SCHSTR(J:J) .EQ. 'Y') .OR. & (SCHSTR(J:J) .EQ. 'y')) THEN WFDEL = .1 @@ -493,9 +444,9 @@ SUBROUTINE PSCHEM (MP, ML, MS, MR, N, IPOINT, COOR, IPBOUN, ILINE, END IF DOSMOO = .TRUE. WRITE(*, 10040) WF -C + C Z - PROCESS REGION WITH HOLES -C + ELSE IF ((SCHSTR(J:J) .EQ. 'Z') .OR. & (SCHSTR(J:J) .EQ. 'z')) THEN IF (NHPR(L) .EQ. 0) THEN @@ -513,9 +464,9 @@ SUBROUTINE PSCHEM (MP, ML, MS, MR, N, IPOINT, COOR, IPBOUN, ILINE, END IF ADDLNK = .FALSE. CALL LTSORT (MR, LINKR, IHLIST(JJHOLE), JHOLE, ADDLNK) -C + C JHOLE IS NEGATIVE FOR REGIONS ON BODY CARD WITH LESS THAN THREE INTERVALS -C + JHOLE = ABS(JHOLE) CALL LTSORT (MR, LINKSC, ABS(IREGN(JHOLE)), IPNTR, & ADDLNK) @@ -549,7 +500,7 @@ SUBROUTINE PSCHEM (MP, ML, MS, MR, N, IPOINT, COOR, IPBOUN, ILINE, END IF END IF END IF -C + CALL STRCUT (SCHOLE) CALL STRLNG (SCHOLE, LENHOL) INSIDE = 0 @@ -557,14 +508,9 @@ SUBROUTINE PSCHEM (MP, ML, MS, MR, N, IPOINT, COOR, IPBOUN, ILINE, IF ((SCHOLE(M:M) .EQ. 'L') .OR. & (SCHOLE(M:M) .EQ. 'l')) INSIDE = INSIDE + 1 120 CONTINUE -C + NPRM = NPRM + 1 -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/31/90 -CC* MODIFICATION: ADDED ARGUMENTS TO CALL TO ZHOLE TO PASS MINIMUM -CC** ELEMENT SIZE (SIZMIN) AND GETSIZ PARAMETERS OF -CC** EMIN AND EMAX -C + CALL ZHOLE (MP, ML, MS, MR, NSPR(JHOLE), MXNL, MXNPER, MAXPRM, & NPRM, MAXNBC, MAXSBC, KNBC, KSBC, IREGN(JHOLE), IPOINT, & COOR, IPBOUN, ILINE, LTYPE, NINT, FACTOR, LCON, ILBOUN, @@ -602,9 +548,9 @@ SUBROUTINE PSCHEM (MP, ML, MS, MR, N, IPOINT, COOR, IPBOUN, ILINE, CALL MESAGE ('HOLE PROCESSING COMPLETED') END IF 130 CONTINUE -C + C ( - START LOOP -C + ELSE IF (SCHSTR(J:J) .EQ. '(') THEN IF (NLEFTP .GE. 10) THEN CALL MESAGE ('TOO MANY NESTED LOOPS IN THE SCHEME') @@ -614,43 +560,43 @@ SUBROUTINE PSCHEM (MP, ML, MS, MR, N, IPOINT, COOR, IPBOUN, ILINE, LACT(NLEFTP) = ACTIVE ILPC(NLEFTP) = J ACTIVE = .FALSE. -C + C ) - END OF LOOP - CHECK FOR ACTIVITY -C + ELSE IF (SCHSTR(J:J) .EQ. ')') THEN IF (NLEFTP .LE. 0) THEN CALL MESAGE ('THERE IS NO LEFT PARENTHESIS TO') CALL MESAGE ('MATCH THE RIGHT PARENTHESIS') CALL MESAGE ('")" IS THUS IGNORED') ELSE -C + C LOOP BACK -C + IF (ACTIVE) THEN ACTIVE = .FALSE. J = ILPC(NLEFTP) LACT(NLEFTP) = .TRUE. -C + C LOOP IS COMPLETED -C + ELSE ACTIVE = LACT(NLEFTP) NLEFTP = NLEFTP - 1 END IF END IF -C + C + SIGN -C + ELSE IF (SCHSTR(J:J) .EQ. '+') THEN NEWSGN = +1 -C + C - SIGN -C + ELSE IF (SCHSTR(J:J) .EQ. '-') THEN NEWSGN = -1 -C + C 1, 2, ..., 6 SMOOTHING TYPE DECLARATION -C + ELSE IF (SCHSTR(J:J) .EQ. '1') THEN IF (ISTYPE .NE. 1) THEN ISTYPE = 1 @@ -695,20 +641,20 @@ SUBROUTINE PSCHEM (MP, ML, MS, MR, N, IPOINT, COOR, IPBOUN, ILINE, DOSMOO = .TRUE. END IF CALL MESAGE ('SMOOTHING TYPE SET TO "LAPLACIAN-ISOPARAMETRIC"') -C + C BLANK SCHEME FLAG -C + ELSE IF (SCHSTR(J:J) .EQ. ' ') THEN IF (J .NE. 1) CALL MESAGE ('BLANK SCHEME COMMAND IGNORED') -C + C ILLEGAL SCHEME FLAG -C + ELSE WRITE(*, 10080) SCHSTR(J:J) END IF -C + C GET NEXT SCHEME COMMAND -C + J = J + 1 IF (J .LE. LENSCH) THEN GO TO 100 @@ -735,9 +681,9 @@ SUBROUTINE PSCHEM (MP, ML, MS, MR, N, IPOINT, COOR, IPBOUN, ILINE, GO TO 100 END IF ICODE = IEXIT -C + C END OF THIS REGION -C + 140 CONTINUE RETURN 10000 FORMAT (' ', /, ' INITIAL MESH DEFINED USING THIS HOLE SCHEME:' /, diff --git a/packages/seacas/applications/fastq/putcrs.f b/packages/seacas/applications/fastq/putcrs.f index b3b8bd4bab39..65b7d467b164 100644 --- a/packages/seacas/applications/fastq/putcrs.f +++ b/packages/seacas/applications/fastq/putcrs.f @@ -1,50 +1,30 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: putcrs.f,v 1.2 2000/11/13 15:39:05 gdsjaar Exp $ -C $Log: putcrs.f,v $ -C Revision 1.2 2000/11/13 15:39:05 gdsjaar -C Cleaned up unused variables and labels. -C -C Removed some real to int conversion warnings. -C -C Revision 1.1.1.1 1990/11/30 11:13:57 gdsjaar -C FASTQ Version 2.0X -C -c Revision 1.1 90/11/30 11:13:56 gdsjaar -c Initial revision -c -C -CC* FILE: [.MAIN]PUTCRS.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE PUTCRS (X, Y, OLDCUR) C*********************************************************************** -C + C SUBROUTINE PUTCRS = PLACES THE CROSSHAIRS AT THE CURRENT LOCATION -C + C*********************************************************************** -C -C + DIMENSION IDUM(2) -C + LOGICAL OLDCUR -C + CHARACTER DUMMY*16 -C + C SELECT DECIMAL MODE -C + DUMMY = CHAR(27) DUMMY(2:4) = 'OR1' WRITE(*,*)DUMMY -C + C PLACE THE CROSSHAIRS AT THE RIGHT LOCATION -C + CALL MP2PT(1, X, Y, X1, Y1, IDUM) IX = INT(X1*4151.) IY = INT(Y1*4151.) @@ -55,24 +35,24 @@ SUBROUTINE PUTCRS (X, Y, OLDCUR) WRITE(DUMMY(10:15), '(I6)')IY DUMMY(16:16) = ',' WRITE(*,*)DUMMY -C + C DESELECT DECIMAL MODE -C + DUMMY = CHAR(27) DUMMY(2:4) = 'OR0' WRITE(*,*)DUMMY -C + IF(.NOT.OLDCUR)THEN -C + C ACTIVATE THE CROSSHAIRS -C + DUMMY = CHAR(27) DUMMY(2:3) = 'G1' WRITE(*,*)DUMMY OLDCUR = .TRUE. ENDIF -C + WRITE(*, '(A)')' '//CHAR(27)//'[2J' RETURN -C + END diff --git a/packages/seacas/applications/fastq/putlxn.f b/packages/seacas/applications/fastq/putlxn.f index 8e0150a59fa8..5f7e0cd0c92d 100644 --- a/packages/seacas/applications/fastq/putlxn.f +++ b/packages/seacas/applications/fastq/putlxn.f @@ -1,48 +1,37 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: putlxn.f,v 1.1 1990/11/30 11:13:59 gdsjaar Exp $ -C $Log: putlxn.f,v $ -C Revision 1.1 1990/11/30 11:13:59 gdsjaar -C Initial revision -C -C -CC* FILE: [.QMESH]PUTLXN.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE PUTLXN (MXND, NL, LXN, NUID, NODE, LINES, NAVAIL, & IAVAIL, NNN, ERR, NOROOM) C*********************************************************************** -C + C SUBROUTINE PUTLXN = DEFINE THE LINES FOR NODE AS (LINES (I), I=1, NL) -C + C*********************************************************************** -C + C NOTE: C SAME CONTINUATION ENTRIES ARE USED AS ALREADY IN USE C FOR THIS NODE. C THIS NODE WILL BE FLAGGED AS A BOUNDARY NODE IF C LXN (2, NODE) .LT. 0 (NOT IF LINES (2) .LT. 0) -C + C*********************************************************************** -C + DIMENSION LINES (NL), LXN (4, MXND), NUID (MXND) -C + LOGICAL ERR, BOUND, NOROOM -C + BOUND = .FALSE. -C + IF (LXN (2, NODE) .LT. 0)BOUND = .TRUE. NN = NODE NDONE = 0 -C + C FILL IN NEXT 3 (4 LAST TIME) NODES -C + 100 CONTINUE N4 = LXN (4, NN) NR = MIN0 (4, NL - NDONE) @@ -50,32 +39,32 @@ SUBROUTINE PUTLXN (MXND, NL, LXN, NUID, NODE, LINES, NAVAIL, J = NDONE + I LXN (I, NN) = LINES (J) 110 CONTINUE -C + C CLEAR REMAINING PORTION -C + IF (NR .LT. 4) THEN NZ = NR + 1 DO 120 I = NZ, 4 LXN (I, NN) = 0 120 CONTINUE ENDIF -C + C TAG BOUNDARY NODES -C + IF (BOUND)LXN (2, NN) = - LXN (2, NN) -C + C TAG CONTINUATIONS -C + IF (NDONE .GT. 1)LXN (1, NN) = - LXN (1, NN) IF (NDONE + 4 .GE. NL) THEN -C + C COLLECT GARBAGE -C + 130 CONTINUE IF (N4 .GE. 0) THEN -C + C UPDATE NNN -C + 140 CONTINUE IF (LXN (1, NNN) .NE. 0) THEN RETURN @@ -84,7 +73,7 @@ SUBROUTINE PUTLXN (MXND, NL, LXN, NUID, NODE, LINES, NAVAIL, GOTO 140 ENDIF ENDIF -C + NR = - N4 N4 = LXN (4, NR) LXN (1, NR) = 0 @@ -95,9 +84,9 @@ SUBROUTINE PUTLXN (MXND, NL, LXN, NUID, NODE, LINES, NAVAIL, NAVAIL = NAVAIL + 1 GOTO 130 ENDIF -C + C NEED ANOTHER LINE IN THE TABLE -C + NDONE = NDONE + 3 NEXTR = IABS (N4) IF (N4 .LT. 0) THEN @@ -105,9 +94,9 @@ SUBROUTINE PUTLXN (MXND, NL, LXN, NUID, NODE, LINES, NAVAIL, NN = NEXTR GOTO 100 ENDIF -C + C RESERVE A NEW LINE IN LXN TABLE -C + IF (NAVAIL .LT. 1) THEN WRITE ( * , 10000)NODE ERR = .TRUE. @@ -121,13 +110,13 @@ SUBROUTINE PUTLXN (MXND, NL, LXN, NUID, NODE, LINES, NAVAIL, LXN (4, NEW) = 0 NUID (NEW) = 0 NEXTR = NEW -C + C INSERT LINK TO NEXT LINE -C + LXN (4, NN) = - NEXTR NN = NEXTR GOTO 100 -C + 10000 FORMAT (' NODE TABLE OVERFLOW IN PUTLXN - NODE = ', I5) -C + END diff --git a/packages/seacas/applications/fastq/qaaval.f b/packages/seacas/applications/fastq/qaaval.f index 3ea8f3afc951..b16be07a7abf 100644 --- a/packages/seacas/applications/fastq/qaaval.f +++ b/packages/seacas/applications/fastq/qaaval.f @@ -1,50 +1,33 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: qaaval.f,v 1.2 1991/03/21 15:45:11 gdsjaar Exp $ -C $Log: qaaval.f,v $ -C Revision 1.2 1991/03/21 15:45:11 gdsjaar -C Changed all 3.14159... to atan2(0.0, -1.0) -C -c Revision 1.1.1.1 1990/11/30 11:14:03 gdsjaar -c FASTQ Version 2.0X -c -c Revision 1.1 90/11/30 11:14:02 gdsjaar -c Initial revision -c -C -CC* FILE: [.QMESH]QAAVAL.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE QAAVAL (MXND, NODES, ANGLES, QRAT, AREA, XN, YN, CAREA) C*********************************************************************** -C + C SUBROUTINE QAAVAL = CALCULATES THE INTERIOR ANGLES OF A QUAD AND C THE RATIO OF LARGEST TO SMALLEST ANGLE -C + C*********************************************************************** -C + C VARIABLES USED: C NODES = THE FOUR NODES OF THE ELEMENT IN CCW ORDER C ANGLES = THE FOUR INTERIOR ANGLES IN THE ORDER 4-1, 1-2, 2-3, 3-4 C QRAT = THE RATIO OF THE LARGEST TO THE SMALLEST ANGLE C CAREA = .TRUE. IF THE AREA IS TO BE CALCULATED C AREA = ELEMENT'S AREA -C + C*********************************************************************** -C + DIMENSION NODES (4), ANGLES (4), AG (4), XN (MXND), YN (MXND) -C + LOGICAL CAREA -C + PI = ATAN2(0.0, -1.0) TWOPI = PI + PI -C + IF (CAREA) THEN N1 = NODES (1) N2 = NODES (2) @@ -53,7 +36,7 @@ SUBROUTINE QAAVAL (MXND, NODES, ANGLES, QRAT, AREA, XN, YN, CAREA) AREA = 0.5 * ( (XN (N3) - XN (N1)) * (YN (N4) - YN (N2)) & - (YN (N3) - YN (N1)) * (XN (N4) - XN (N2))) ENDIF -C + DO 100 I = 1, 4 IF (I .EQ. 4) THEN J = 1 @@ -69,7 +52,7 @@ SUBROUTINE QAAVAL (MXND, NODES, ANGLES, QRAT, AREA, XN, YN, CAREA) AG (J) = ATAN2 (YN (N2) - YN (N1), XN (N2) - XN (N1)) ENDIF 100 CONTINUE -C + DO 110 J = 1, 4 IF (J .EQ. 1) THEN I = 4 @@ -84,7 +67,7 @@ SUBROUTINE QAAVAL (MXND, NODES, ANGLES, QRAT, AREA, XN, YN, CAREA) ENDIF ANGLES (J) = PI - DIFF 110 CONTINUE -C + QMIN = ANGLES (1) QMAX = ANGLES (1) DO 120 I = 2, 4 @@ -96,7 +79,7 @@ SUBROUTINE QAAVAL (MXND, NODES, ANGLES, QRAT, AREA, XN, YN, CAREA) ELSE QRAT = 1.0E10 ENDIF -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/qmesh.f b/packages/seacas/applications/fastq/qmesh.f index f424d8aa7acc..c55678252149 100644 --- a/packages/seacas/applications/fastq/qmesh.f +++ b/packages/seacas/applications/fastq/qmesh.f @@ -1,67 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: qmesh.f,v 1.8 2007/07/24 13:10:18 gdsjaar Exp $ -C $Log: qmesh.f,v $ -C Revision 1.8 2007/07/24 13:10:18 gdsjaar -C Fix problem with boundary condition memory overwrite. -C -C Remove old ls5 and r25 terminal tests -C -C Revision 1.7 2007/04/04 22:00:37 gdsjaar -C Fix some bugs. -C -C Revision 1.6 2004/01/21 05:18:40 gdsjaar -C Initialized several variables identified by valgrind. -C -C Revision 1.5 2000/11/13 15:39:05 gdsjaar -C Cleaned up unused variables and labels. -C -C Removed some real to int conversion warnings. -C -C Revision 1.4 1999/06/21 22:43:40 gdsjaar -C Fixed more uninitialized variables; one was causing core dump on g77 -C compiled executable. -C -C VERSN was not consistently defined -- now 10 characters everywhere -C -C Updated so full version string output -C -C Added capability to debug memory using unit specified in EXT99 -C variable. Similar to STRTUP in SUPLIB -C -C Cleaned up some other code -C -C Upped version -C -C Revision 1.3 1998/09/04 16:17:40 gdsjaar -C Fixed array bounds read error. -C -C Took easy route to fixing lots of uninitialized array memory reads by -C calling mdfill(0). It looks like Fastq assumes this in many -C locations. -C -C Revision 1.2 1998/07/14 18:19:47 gdsjaar -C Removed unused variables, cleaned up a little. -C -C Changed BLUE labels to GREEN to help visibility on black background -C (indirectly requested by a couple users) -C -C Revision 1.1.1.1 1990/11/30 11:14:07 gdsjaar -C FASTQ Version 2.0X -C -c Revision 1.1 90/11/30 11:14:04 gdsjaar -c Initial revision -c -C -CC* FILE: [.QMESH]QMESH.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE QMESH (A, IA, MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, & CIN, RIN, IIN, KIN, IUNIT, IDUMP, N, IPOINT, COOR, IPBOUN, & ILINE, LTYPE, NINT, FACTOR, LCON, ILBOUN, ISBOUN, ISIDE, NLPS, @@ -76,27 +18,20 @@ SUBROUTINE QMESH (A, IA, MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, & NPNOLD, NPEOLD, NNXK, REMESH, REXMIN, REXMAX, REYMIN, REYMAX, & IDIVIS, SIZMIN, EMAX, EMIN) -C -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/31/90 -CC* MODIFICATION: ADDED ARGUMENTS TO CALL TO QMESH TO PASS MINIMUM -CC** ELEMENT SIZE (SIZMIN) AND GETSIZ PARAMETERS OF -CC** EMIN AND EMAX -C C*********************************************************************** -C + C QMESH: A QUADRILATERAL MESH GENERATION PROGRAM -C + C*********************************************************************** -C + C ORIGINALLY WRITTEN BY: C RONDALL E JONES DIV 2642 SANDIA LABORATORIES ALBUQUERQUE C REWRITTEN AND UPDATED BY: C TEDDY D. BLACKER DIV 1522 SANDIA LABORATORIES ALBUQUERQUE C DECEMBER 1985 -C + C*********************************************************************** -C + DIMENSION A(1), IA(1) DIMENSION IPOINT(MP), COOR(2, MP), IPBOUN(MP) DIMENSION ILINE(ML), LTYPE(ML), NINT(ML), FACTOR(ML), LCON(3, ML) @@ -113,27 +48,27 @@ SUBROUTINE QMESH (A, IA, MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, DIMENSION LINKP(2, MP), LINKL(2, ML), LINKS(2, MS), LINKB(2, MS) DIMENSION LINKR(2, MR), LINKSC(2, MR), LINKPB(2, MP) DIMENSION LINKLB(2, ML), LINKSB(2, ML), IRGFLG(MR) -C + DIMENSION AMESUR(NPEOLD), XNOLD(NPNOLD), YNOLD(NPNOLD) DIMENSION NXKOLD(NNXK, NPEOLD), MMPOLD(3, NPROLD) DIMENSION LINKEG(2, MLINK), LISTEG(4 * NPEOLD), BMESUR(NPNOLD) -C + DIMENSION N(29), CIN(MCOM), IIN(MCOM), RIN(MCOM), KIN(MCOM) -C + DIMENSION K(30), IDUMMY(1) -C + CHARACTER*72 SCHEME, DEFSCH, SCHSTR, CIN CHARACTER DEV1*3 -C + LOGICAL NOROOM, EVEN, ERR, CCW, IANS, LGROUP LOGICAL RECT, REAL, STEP, TEST, REMESH LOGICAL BAR, ADDLNK, EIGHT, NINE, PENTAG, TRIANG, TRNSIT, FINAL LOGICAL HALFC, COUNT, FILL, ERRCHK, THREE, BATCH, GRAPH -C + DATA IEXIT, IOVER, IQUIT /1, 2, 3/ -C + C INITIALIZE -C + IZ = 0 IPNTR = 0 IPNTR1 = 0 @@ -164,16 +99,16 @@ SUBROUTINE QMESH (A, IA, MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, TRNSIT = .FALSE. FILL = .FALSE. GRAPH = .FALSE. -C + C HEADER -C + CALL MESAGE (' ') CALL MESAGE ('MESH PROCESSING BEGUN') CALL MESAGE (' ') -C + C FILL IN ANY MISSING INTERVALS ACCORDING TO SIZE AND CHECK THE C VALIDITY OF REGION DATA -C + ERRCHK = .FALSE. DO 130 I = 1, N(9) CALL LTSORT (MR, LINKR, ABS(IRPB(I)), IPNTR1, ADDLNK) @@ -253,10 +188,10 @@ SUBROUTINE QMESH (A, IA, MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, END IF 130 CONTINUE ERRCHK = .TRUE. -C + C FIND THE MAXIMUM NUMBER OF LINES/REGION, PERIMETER POINTS/REGION, C AND HOLES/REGION -C + DO 140 I = 1, N(2) MAX1 = MAX0(NINT(I), MAX1) 140 CONTINUE @@ -275,16 +210,16 @@ SUBROUTINE QMESH (A, IA, MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, MAXNP = (MAX1 * MAXNL) + 1 MAXPRM = 1 + MAX4 MAX3 = MAX3 + 1 -C + C GET INITIAL SPACE IN ARRAY A FOR PERIMETER GENERATION -C + C K(1) = X ARRAY OF THE PERIMETER C K(2) = Y ARRAY OF THE PERIMETER C K(3) = NID ARRAY OF THE PERIMETER C K(4) = LINE LIST C K(5) = NO OF NODES PER SIDE LIST C K(6) = WORK ARRAY FOR M1 GENERATION -C + CALL MDRSRV ('X', K(1), MAXNP) CALL MDRSRV ('Y', K(2), MAXNP) CALL MDRSRV ('NID', K(3), MAXNP) @@ -297,31 +232,25 @@ SUBROUTINE QMESH (A, IA, MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CALL MDEROR (6) STOP ' ' END IF -C + C LOOP THROUGH THE GROUPS/REGIONS AND BAR SETS IN THE BODY LIST C CHECK CONNECTIVITY AND CALCULATE THE DIMENSIONS NEEDED FOR MESHING C NO PERIMETER INFORMATION IS SAVED THIS TIME THROUGH -C + REAL = .FALSE. COUNT = .TRUE. DO 210 I = 1, N(9) CALL LTSORT (MR, LINKR, ABS(IRPB(I)), IPNTR1, ADDLNK) CALL LTSORT (MS, LINKB, ABS(IRPB(I)), IPNTR2, ADDLNK) -C + C CHECK A REGION OR GROUP -C + IF ((IRPB(I) .GT. 0) .AND. (IRPB(I) .LE. N(22)) .AND. & (IPNTR1 .GT. 0)) THEN IF (IRGFLG(IPNTR1) .LE. -1) THEN WRITE (*, 10000) IRPB(I) L = IPNTR1 -C -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/31/90 -CC* MODIFICATION: ADDED ARGUMENTS TO CALL TO CHKRGN TO PASS MINIMUM -CC** ELEMENT SIZE (SIZMIN) AND GETSIZ PARAMETERS OF -CC** EMIN AND EMAX -C + CALL CHKRGN (IA, L, MP, ML, MS, MR, MSC, N(24), IPOINT, & COOR, IPBOUN, ILINE, LTYPE, NINT, FACTOR, LCON, & ILBOUN, ISBOUN, ISIDE, NLPS, IFLINE, ILLIST, IREGN, @@ -347,13 +276,7 @@ SUBROUTINE QMESH (A, IA, MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, IF (IPNTR1 .GT. 0) THEN WRITE (*, 10020) ABS(ISLIST(J)) L = IPNTR1 -C -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/31/90 -CC* MODIFICATION: ADDED ARGUMENTS TO CALL TO CHKRGN TO PASS MINIMUM -CC** ELEMENT SIZE (SIZMIN) AND GETSIZ PARAMETERS OF -CC** EMIN AND EMAX -C + CALL CHKRGN (IA, L, MP, ML, MS, MR, MSC, N(24), & IPOINT, COOR, IPBOUN, ILINE, LTYPE, NINT, & FACTOR, LCON, ILBOUN, ISBOUN, ISIDE, NLPS, @@ -372,9 +295,9 @@ SUBROUTINE QMESH (A, IA, MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, END IF 180 CONTINUE END IF -C + C WRITE AN ERROR FOR THIS REGION IN THE BODY LIST -C + ELSE IF (IRPB(I) .GT. 0) THEN WRITE (*, 10030) IRPB(I) CALL LTSORT (MR, LINKR, ABS(IRPB(I)), IPNTR, ADDLNK) @@ -382,9 +305,9 @@ SUBROUTINE QMESH (A, IA, MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, IMINUS = -IPNTR CALL LTSORT (MR, LINKR, ABS(IRPB(I)), IMINUS, ADDLNK) ADDLNK = .FALSE. -C + C CHECK A BAR SET -C + ELSE IF ((IRPB(I) .LT. 0) .AND. (ABS(IRPB(I)) .LE. N(21)) & .AND. (IPNTR2 .GT. 0)) THEN L = IPNTR2 @@ -407,13 +330,7 @@ SUBROUTINE QMESH (A, IA, MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, ELSE IP3 = 0 END IF -C -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/31/90 -CC* MODIFICATION: ADDED ARGUMENTS TO CALL TO PLINE TO PASS MINIMUM -CC** ELEMENT SIZE (SIZMIN) AND GETSIZ PARAMETERS OF -CC** EMIN AND EMAX -C + CALL PLINE (MP, ML, MAXNP, 1, 1, IPOINT, COOR, LINKP, & ILINE(KK), LTYPE(KK), NINT(KK), FACTOR(KK), IP1, IP2, & IP3, A(K(1)), A(K(2)), IA(K(3)), IPBOUN(IP1), @@ -437,18 +354,18 @@ SUBROUTINE QMESH (A, IA, MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, NPER = NPER + NINT(KK) + 1 190 CONTINUE IBARST(L) = -IBARST(L) -C + C WHEN CHECKING THE MAXIMUMS - ADD ENOUGH FOR ONE MORE INTERVAL C ON THE LINE AS THIS LINE MAY BE INCREMENTED BY ONE IF THE C PERIMETER IS ODD -C + MAXNBC = MAX0(MAXNBC, KNBC + 3) MAXSBC = MAX0(MAXSBC, KSBC + 3) MXND = MAX0(MXND, NPER) MXNPER = MAX0(MXNPER, NPER + 2) -C + C WRITE AN ERROR FOR THIS BAR SET IN THE BODY LIST -C + ELSE WRITE (*, 10060) ABS(IRPB(I)) ADDLNK = .FALSE. @@ -460,19 +377,19 @@ SUBROUTINE QMESH (A, IA, MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, END IF 200 CONTINUE 210 CONTINUE -C + C RESET ALL USED POINTS AND LINES -C + DO 220 I = 1, N(1) IPOINT(I) = ABS(IPOINT(I)) 220 CONTINUE DO 230 I = 1, N(2) NINT(I) = ABS(NINT(I)) 230 CONTINUE -C + C RELEASE THE OLD ARRAYS, AND THEN C DIMENSION BASED ON THE MAXIMUMS CALCULATED -C + CALL MDDEL ('X') CALL MDDEL ('Y') CALL MDDEL ('NID') @@ -485,7 +402,7 @@ SUBROUTINE QMESH (A, IA, MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CALL MDEROR (6) STOP ' ' END IF -C + C K(1) = X ARRAY OF THE PERIMETER C K(2) = Y ARRAY OF THE PERIMETER C K(3) = NID ARRAY(S) OF THE PERIMETER(S) [HOLES CAUSE MULTIPLE PERIMS] @@ -512,9 +429,9 @@ SUBROUTINE QMESH (A, IA, MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, C K(24) = LNODES ARRAY FOR CONNECTIVITY OF THE INSIDE PERIMETER C NODES IN FILL ROUTINES C NOTE: LINES IN THIS CONTEXT REFERS TO CONNECTIONS OF ELEMENT NODES -C + C MAKE ROOM IN LINE LIST FOR HOLES -C + MXND = INT(MXND * MXRXG * 1.2) MXNL = MXNL + ( (MXRXG + MAX4) * MAX2 * MAX3) MLN = 8 @@ -554,9 +471,9 @@ SUBROUTINE QMESH (A, IA, MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CALL MDEROR (6) STOP ' ' END IF -C + C SET UP THE LOOP FOR PROCESSING GROUPS -C + IF (LGROUP) THEN 240 CONTINUE IF (STEP .AND. (N(22) .GT. 0)) THEN @@ -578,9 +495,9 @@ SUBROUTINE QMESH (A, IA, MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, I1 = 1 I2 = N(22) END IF -C + C BEGIN PROCESSING GROUPS -C + REAL = .TRUE. COUNT = .FALSE. DO 310 IGRP = I1, I2 @@ -605,20 +522,14 @@ SUBROUTINE QMESH (A, IA, MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, NOROOM = .FALSE. CALL MESAGE (' ') WRITE (*, 10080) ABS(IREGN(L)) -C + C CALCULATE THE PERIMETER OF THE REGION -C + 260 CONTINUE NPRM = 1 JJHOLE = 0 KNBC = 0 -C -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/31/90 -CC* MODIFICATION: ADDED ARGUMENTS TO CALL TO PERIM TO PASS MINIMUM -CC** ELEMENT SIZE (SIZMIN) AND GETSIZ PARAMETERS OF -CC** EMIN AND EMAX -C + CALL PERIM (MP, ML, MS, NSPR(L), MXNL, MXNPER, & MAXNBC, MAXSBC, KNBC, KSBC, ABS (IREGN(L)), & IPOINT, COOR, IPBOUN, ILINE, LTYPE, NINT, @@ -632,9 +543,9 @@ SUBROUTINE QMESH (A, IA, MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, & MMPOLD, LINKEG, LISTEG, BMESUR, MLINK, NPROLD, & NPNOLD, NPEOLD, NNXK, REMESH, REXMIN, REXMAX, & REYMIN, REYMAX, IDIVIS, SIZMIN, EMAX, EMIN) -C + C GET THE REGION SCHEME -C + CALL LTSORT (MR, LINKSC, ABS(IREGN(L)), IPNTR, & ADDLNK) CALL RGNSCH (MCOM, ICOM, JCOM, CIN, IIN, RIN, KIN, @@ -647,11 +558,11 @@ SUBROUTINE QMESH (A, IA, MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, GO TO 260 ELSE IF (ICODE .EQ. IQUIT) THEN GO TO 270 -C + C GENERATE INITIAL GRID -C + C CALCULATE A "TRANSITION" MAPPED MESH -C + ELSE IF (TRNSIT) THEN CALL BMSCHM (NPER, KKK, LLL, NNN, ML, MS, & NSPR(L), ISLIST(IFSIDE(L)), NINT, IFLINE, @@ -661,9 +572,9 @@ SUBROUTINE QMESH (A, IA, MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, & IA(K(9)), IA(K(10)), IA(K(11)), IA(K(12)), & IA(K(13)), A(K(16)), A(K(17)), IA(K(18)), & IA(K(21)), IAVAIL, NAVAIL, CCW, HALFC, ERR) -C + C CALCULATE A "TRIANGULAR" MAPPED MESH -C + ELSE IF (TRIANG) THEN CALL TMSCHM (NPER, KKK, LLL, NNN, ML, MS, & NSPR(L), ISLIST(IFSIDE(L)), NINT, IFLINE, @@ -673,9 +584,9 @@ SUBROUTINE QMESH (A, IA, MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, & IA(K(9)), IA(K(10)), IA(K(11)), IA(K(12)), & IA(K(13)), A(K(16)), A(K(17)), IA(K(18)), & IA(K(21)), IAVAIL, NAVAIL, CCW, ERR) -C + C CALCULATE A "PENTAGON" MAPPED MESH -C + ELSE IF (PENTAG) THEN CALL UMSCHM (IA, NPER, KKK, LLL, NNN, ML, MS, & NSPR(L), ISLIST(IFSIDE(L)), NINT, IFLINE, @@ -685,16 +596,11 @@ SUBROUTINE QMESH (A, IA, MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, & IA(K(9)), IA(K(10)), IA(K(11)), IA(K(12)), & IA(K(13)), A(K(16)), A(K(17)), IA(K(18)), & IA(K(21)), IAVAIL, NAVAIL, CCW, ERR) -C + C USE THE PAVING TECHNIQUE TO FILL THE INITIAL REGION -C + ELSE IF (FILL) THEN -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/31/90 -CC* MODIFICATION: ADDED ARGUMENTS TO CALL TO PMSCHM TO PASS MINIMUM -CC** ELEMENT SIZE (SIZMIN) AND GETSIZ PARAMETERS OF -CC** EMIN AND EMAX -C + CALL PMSCHM (NPER, NPRM, MXND, MLN, MP, ML, MS, & MR, NL, MXNL, MXNPER, MAXPRM, MAXNB, MAXNBC, & MAXSBC, KNBC, KSBC, KNUM, IPOINT, COOR, @@ -751,9 +657,9 @@ SUBROUTINE QMESH (A, IA, MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, END IF GO TO 260 END IF -C + C PROCESS A "NORMAL" REGION -C + ELSE CALL MMSCHM (NPER, KKK, LLL, NNN, ML, MS, & NSPR(L), ISLIST(IFSIDE(L)), NINT, IFLINE, @@ -764,9 +670,9 @@ SUBROUTINE QMESH (A, IA, MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, & IA(K(13)), IAVAIL, NAVAIL, CCW, REAL, SCHSTR, & M1, ERR) END IF -C + C FLAG THE REGION IF AN ERROR HAS OCCURRED -C + IF (ERR) THEN CALL MESAGE ('ERROR IN INITIAL GRID GENERATION') CALL MESAGE ('** REGION PROCESSING ABORTED **') @@ -783,19 +689,14 @@ SUBROUTINE QMESH (A, IA, MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, END IF GO TO 270 END IF -C + C BEGIN FULL SCHEME CONTROL FOR A GROUP SUB-REGION -C + RECT = .NOT.(PENTAG .OR. TRIANG .OR. & TRNSIT .OR. FILL) IF (STEP) CALL MINMAX_FQ (MXNPER, NPER, A(K(1)), & A(K(2)), XMIN, XMAX, YMIN, YMAX) -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/31/90 -CC* MODIFICATION: ADDED ARGUMENTS TO CALL TO PSCHEM TO PASS MINIMUM -CC** ELEMENT SIZE (SIZMIN) AND GETSIZ PARAMETERS OF -CC** EMIN AND EMAX -C + CALL PSCHEM (MP, ML, MS, MR, N, IPOINT, COOR, & IPBOUN, ILINE, LTYPE, NINT, FACTOR, LCON, & ILBOUN, ISBOUN, ISIDE, NLPS, IFLINE, ILLIST, @@ -901,9 +802,9 @@ SUBROUTINE QMESH (A, IA, MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, END IF END IF 270 CONTINUE -C + C BEGIN FULL SCHEME CONTROL FOR A GROUP REGION -C + NNNOLD = 0 KKKOLD = 0 RECT = .FALSE. @@ -915,7 +816,7 @@ SUBROUTINE QMESH (A, IA, MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, & IREGN(IGPNTR), IPNTR, N(24), MSC, SCHEME, DEFSCH, & SCHSTR, LENSCH, NPER, PENTAG, TRIANG, TRNSIT, HALFC, & FILL, ICODE, REMESH) -C + IF (ICODE .EQ. IEXIT) THEN CALL CHKKXL (MXND, IA(K(10)), IA(K(11)), LLL, ERR) IF (ERR) THEN @@ -978,10 +879,10 @@ SUBROUTINE QMESH (A, IA, MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, ELSE IF (ICODE .EQ. IQUIT) THEN GO TO 300 END IF -C + IF (STEP) CALL MINMAX_FQ (MXND, NNN, A(K(7)), A(K(8)), & XMIN, XMAX, YMIN, YMAX) -C + CALL PSCHEM (MP, ML, MS, MR, N, IPOINT, COOR, IPBOUN, & ILINE, LTYPE, NINT, FACTOR, LCON, ILBOUN, ISBOUN, & ISIDE, NLPS, IFLINE, ILLIST, IREGN, NSPR, IFSIDE, @@ -1105,20 +1006,20 @@ SUBROUTINE QMESH (A, IA, MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, END IF 300 CONTINUE 310 CONTINUE -C + C END OF THIS SET OF GROUPS C IF STEPPING THROUGH, SEE IF ANY MORE GROUPS C ARE TO BE PROCESSED -C + IF (STEP) THEN CALL INTRUP ('PROCESS ADDITIONAL GROUPS', IANS, MCOM, & ICOM, JCOM, CIN, IIN, RIN, KIN) IF (IANS) GO TO 240 END IF END IF -C + C SET UP THE LOOP FOR PROCESSING REGIONS -C + 320 CONTINUE IF (STEP .AND. (N(22) .GT. 0)) THEN CALL MESAGE (' ') @@ -1138,9 +1039,9 @@ SUBROUTINE QMESH (A, IA, MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, I1 = 1 I2 = N(22) END IF -C + C BEGIN PROCESSING REGIONS -C + REAL = .TRUE. COUNT = .FALSE. DO 350 I = I1, I2 @@ -1150,9 +1051,9 @@ SUBROUTINE QMESH (A, IA, MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, NOROOM = .FALSE. CALL MESAGE (' ') WRITE (*, 10090) ABS(IREGN(L)) -C + C CALCULATE THE PERIMETER OF THE REGION -C + 330 CONTINUE NNN = 0 KKK = 0 @@ -1171,9 +1072,9 @@ SUBROUTINE QMESH (A, IA, MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, & NXKOLD, MMPOLD, LINKEG, LISTEG, BMESUR, MLINK, NPROLD, & NPNOLD, NPEOLD, NNXK, REMESH, REXMIN, REXMAX, REYMIN, & REYMAX, IDIVIS, SIZMIN, EMAX, EMIN) -C + C GET THE REGION SCHEME -C + CALL LTSORT (MR, LINKSC, ABS(IREGN(L)), IPNTR, ADDLNK) CALL RGNSCH (MCOM, ICOM, JCOM, CIN, IIN, RIN, KIN, STEP, & IREGN(L), IPNTR, N(24), MSC, SCHEME, DEFSCH, SCHSTR, @@ -1185,11 +1086,11 @@ SUBROUTINE QMESH (A, IA, MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, GO TO 330 ELSE IF (ICODE .EQ. IQUIT) THEN GO TO 350 -C + C GENERATE INITIAL GRID -C + C CALCULATE A "TRANSITION" MAPPED MESH -C + ELSE IF (TRNSIT) THEN CALL BMSCHM (NPER, KKK, LLL, NNN, ML, MS, NSPR(L), & ISLIST(IFSIDE(L)), NINT, IFLINE, NLPS, ILLIST, LINKL, @@ -1198,9 +1099,9 @@ SUBROUTINE QMESH (A, IA, MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, & IA(K(9)), IA(K(10)), IA(K(11)), IA(K(12)), IA(K(13)), & A(K(16)), A(K(17)), IA(K(18)), IA(K(21)), IAVAIL, & NAVAIL, CCW, HALFC, ERR) -C + C CALCULATE A "TRIANGULAR" MAPPED MESH -C + ELSE IF (TRIANG) THEN CALL TMSCHM (NPER, KKK, LLL, NNN, ML, MS, NSPR(L), & ISLIST(IFSIDE(L)), NINT, IFLINE, NLPS, ILLIST, LINKL, @@ -1209,9 +1110,9 @@ SUBROUTINE QMESH (A, IA, MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, & IA(K(9)), IA(K(10)), IA(K(11)), IA(K(12)), IA(K(13)), & A(K(16)), A(K(17)), IA(K(18)), IA(K(21)), IAVAIL, & NAVAIL, CCW, ERR) -C + C CALCULATE A "PENTAGON" MAPPED MESH -C + ELSE IF (PENTAG) THEN CALL UMSCHM (IA, NPER, KKK, LLL, NNN, ML, MS, NSPR(L), & ISLIST(IFSIDE(L)), NINT, IFLINE, NLPS, ILLIST, LINKL, @@ -1220,9 +1121,9 @@ SUBROUTINE QMESH (A, IA, MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, & IA(K(9)), IA(K(10)), IA(K(11)), IA(K(12)), IA(K(13)), & A(K(16)), A(K(17)), IA(K(18)), IA(K(21)), IAVAIL, & NAVAIL, CCW, ERR) -C + C USE THE PAVING TECHNIQUE TO FILL THE INITIAL REGION -C + ELSE IF (FILL) THEN CALL PMSCHM (NPER, NPRM, MXND, MLN, MP, ML, MS, MR, NL, & MXNL, MXNPER, MAXPRM, MAXNB, MAXNBC, MAXSBC, KNBC, @@ -1277,9 +1178,9 @@ SUBROUTINE QMESH (A, IA, MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, END IF GO TO 330 END IF -C + C PROCESS A "NORMAL" REGION -C + ELSE CALL MMSCHM (NPER, KKK, LLL, NNN, ML, MS, NSPR(L), & ISLIST(IFSIDE(L)), NINT, IFLINE, NLPS, ILLIST, LINKL, @@ -1288,9 +1189,9 @@ SUBROUTINE QMESH (A, IA, MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, & IA(K(9)), IA(K(10)), IA(K(11)), IA(K(12)), IA(K(13)), & IAVAIL, NAVAIL, CCW, REAL, SCHSTR, M1, ERR) END IF -C + C FLAG THE REGION IF AN ERROR HAS OCCURRED -C + IF (ERR) THEN CALL MESAGE ('ERROR IN INITIAL GRID GENERATION') CALL MESAGE ('** REGION PROCESSING ABORTED **') @@ -1309,15 +1210,15 @@ SUBROUTINE QMESH (A, IA, MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, 340 CONTINUE GO TO 350 END IF -C + C BEGIN FULL SCHEME CONTROL -C + RECT = .NOT.(PENTAG .OR. TRIANG .OR. TRNSIT .OR. FILL) IF (STEP) CALL MINMAX_FQ (MXNPER, NPER, A(K(1)), A(K(2)), * XMIN, XMAX, YMIN, YMAX) NNNOLD = 0 KKKOLD = 0 -C + CALL PSCHEM (MP, ML, MS, MR, N, IPOINT, COOR, IPBOUN, ILINE, & LTYPE, NINT, FACTOR, LCON, ILBOUN, ISBOUN, ISIDE, NLPS, & IFLINE, ILLIST, IREGN, NSPR, IFSIDE, ISLIST, NPPF, IFPB, @@ -1434,20 +1335,20 @@ SUBROUTINE QMESH (A, IA, MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, END IF END IF 350 CONTINUE -C + C END OF THIS SET OF REGIONS C IF STEPPING THROUGH, SEE IF ANY MORE REGIONS C ARE TO BE PROCESSED -C + 360 CONTINUE IF (STEP) THEN CALL INTRUP ('PROCESS ADDITIONAL REGIONS', IANS, MCOM, & ICOM, JCOM, CIN, IIN, RIN, KIN) IF (IANS) GO TO 320 END IF -C + C SET UP THE LOOP FOR PROCESSING BAR SETS -C + 370 CONTINUE 380 CONTINUE IF (STEP .AND. (N(21) .GT. 0)) THEN @@ -1467,26 +1368,21 @@ SUBROUTINE QMESH (A, IA, MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, I1 = 1 I2 = N(21) END IF -C + C BEGIN PROCESSING BAR SETS -C + REAL = .TRUE. COUNT = .FALSE. DO 440 I = I1, I2 CALL LTSORT (MS, LINKB, I, IPNTR, ADDLNK) -C + C SEE IF THIS BAR SET IS FOR SPRINGS -C + IF ((IPNTR .GT. 0) .AND. (IBARST(IPNTR) .LT. 0) .AND. & (JMAT(IPNTR) .LT. 0)) THEN L = IPNTR WRITE (*, 10130) ABS(IBARST(L)) -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/31/90 -CC* MODIFICATION: ADDED ARGUMENTS TO CALL TO SPRING TO PASS MINIMUM -CC** ELEMENT SIZE (SIZMIN) AND GETSIZ PARAMETERS OF -CC** EMIN AND EMAX -C + CALL SPRING (MP, ML, MS, MXNPER, MXND, MAXNBC, MAXSBC, L, & IPOINT, COOR, IPBOUN, LINKP, ILINE, LTYPE, NINT, FACTOR, & LCON, ILBOUN, ISBOUN, LINKL, NLPB, JFLINE, JLLIST, @@ -1517,9 +1413,9 @@ SUBROUTINE QMESH (A, IA, MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, 390 CONTINUE GO TO 430 END IF -C + C PROCESS A REGULAR BARSET -C + ELSE IF ((IPNTR .GT. 0) .AND. (IBARST(IPNTR) .LT. 0)) THEN L = IPNTR WRITE (*, 10120) ABS(IBARST(L)) @@ -1530,9 +1426,9 @@ SUBROUTINE QMESH (A, IA, MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, KNBC = 0 KSBC = 0 LLL = 1 -C + C LOOP THROUGH ALL THE LINES IN THE BAR SETS -C + DO 410 J = JFLINE(L), JFLINE(L) + NLPB(L) - 1 CALL LTSORT (ML, LINKL, JLLIST(J), KK, ADDLNK) CALL LTSORT (MP, LINKP, LCON(1, KK), IP1, ADDLNK) @@ -1546,9 +1442,9 @@ SUBROUTINE QMESH (A, IA, MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, ELSE IP3 = 0 END IF -C + C CALCULATE NODES IN THE BAR SET LINE -C + CALL PLINE (MP, ML, MXNPER, MAXNBC, MAXSBC, IPOINT, & COOR, LINKP, ILINE(KK), LTYPE(KK), NINT(KK), & FACTOR(KK), IP1, IP2, IP3, A(K(1)), A(K(2)), IA(K(3)), @@ -1578,9 +1474,9 @@ SUBROUTINE QMESH (A, IA, MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, 400 CONTINUE GO TO 430 END IF -C + C ADD THESE NODES AND ELEMENTS TO THE CURRENT LIST -C + NNN0 = NNN + 1 NNN = NNN + ABS(NINT(KK)) + 1 IF (JCENT(L) .GT. 0) THEN @@ -1591,17 +1487,17 @@ SUBROUTINE QMESH (A, IA, MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CALL MAK2EL (MP, MXNPER, MXND, NNN0, NNN, KKK, A(K(1)), & A(K(2)), IA(K(3)), A(K(7)), A(K(8)), IA(K(9)), & IA(K(10)), COOR, IP3) -C + C MARK THESE POINTS AND THE LINE AS BEING USED -C + NINT(KK) = -ABS(NINT(KK)) IPOINT(IP1) = -ABS(IPOINT(IP1)) IPOINT(IP2) = -ABS(IPOINT(IP2)) 410 CONTINUE ENDIF -C + C WRITE OUT THE BAR SET ELEMENTS AND BOUNDARY CONDITIONS -C + IF ((IPNTR .GT. 0) .AND. (IBARST(IPNTR) .LT. 0)) THEN BAR = .TRUE. KSBC = 0 @@ -1642,15 +1538,15 @@ SUBROUTINE QMESH (A, IA, MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, IBARST(L) = ABS(IBARST(L)) WRITE (*, 10140) IBARST(L) END IF -C + C END OF THIS BAR SET -C + 430 CONTINUE 440 CONTINUE -C + C END OF THIS GROUP OF BAR SETS C IF STEPPING THROUGH, SEE IF ANY MORE BAR SETS ARE TO BE PROCESSED -C + IF (STEP .AND. (N(21) .GT. 0)) THEN IF ((ICOM .LE. JCOM) .AND. ((CIN(ICOM)(1:1) .EQ. 'Y') .OR. & (CIN(ICOM)(1:1) .EQ. 'y'))) THEN @@ -1677,9 +1573,9 @@ SUBROUTINE QMESH (A, IA, MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, END IF IF (IANS) GO TO 380 END IF -C + C RESTORE THE DATA BASE TO ITS INITIAL CONDITION -C + 450 CONTINUE DO 460 I = 1, N(1) IPOINT(I) = ABS(IPOINT(I)) @@ -1707,7 +1603,7 @@ SUBROUTINE QMESH (A, IA, MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, CALL LTSORT (MR, LINKR, IREGN(I), IPLUS, ADDLNK) ADDLNK = .FALSE. 510 CONTINUE -C + CALL MDDEL ('X') CALL MDDEL ('Y') CALL MDDEL ('NID') @@ -1744,7 +1640,7 @@ SUBROUTINE QMESH (A, IA, MP, ML, MS, MR, MSC, MCOM, ICOM, JCOM, STOP ' ' END IF RETURN -C + 10000 FORMAT (' INITIAL CHECK BEGUN FOR REGION:', I5) 10010 FORMAT (' INITIAL CHECK BEGUN FOR GROUP:', I5) 10020 FORMAT (' ...INITIAL CHECK BEGUN FOR REGION:', I5) diff --git a/packages/seacas/applications/fastq/qual2.f b/packages/seacas/applications/fastq/qual2.f index 903f947175a5..1c890d52925a 100644 --- a/packages/seacas/applications/fastq/qual2.f +++ b/packages/seacas/applications/fastq/qual2.f @@ -1,71 +1,52 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: qual2.f,v 1.2 2000/11/13 15:39:05 gdsjaar Exp $ -C $Log: qual2.f,v $ -C Revision 1.2 2000/11/13 15:39:05 gdsjaar -C Cleaned up unused variables and labels. -C -C Removed some real to int conversion warnings. -C -C Revision 1.1.1.1 1990/11/30 11:14:12 gdsjaar -C FASTQ Version 2.0X -C -c Revision 1.1 90/11/30 11:14:11 gdsjaar -c Initial revision -c -C -CC* FILE: [.PAVING]QUAL2.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE QUAL2 (MXND, MXCORN, MLN, NCORN, LCORN, LNODES, ICOMB, & BNSIZE, ANGLE, LXN, ITEST, LTEST, QUAL, POSBL2, POSBL3, ROWCHN, & ISTART, IEND) C*********************************************************************** -C + C SUBROTINE QUAL2 = CHECKS THE QUALITY OF A SEMICIRCLE INTERPRETATION -C + C*********************************************************************** -C + DIMENSION LNODES (MLN, MXND), ANGLE (MXND), LCORN (MXCORN) DIMENSION BNSIZE (2, MXND) DIMENSION ICOMB (MXCORN), ITEST (2), LTEST (2), LXN (4, MXND) -C + LOGICAL ERR, POSBL2, POSBL3, ROWCHN, SHRUNK -C + REAL NICKS, NICKC C ... See note below regarding bug... ISTEP = 0 -C + C ASSUME PERFECT QUALITY -C + QUAL = 0. POSBL2 = .FALSE. POSBL3 = .FALSE. ROWCHN = .FALSE. -C + C FIRST GET THE INTERVAL LENGTHS TO THE CHOSEN CORNERS -C + ILEN = 2 CALL SPACED (MXND, MXCORN, MLN, ILEN, NCORN, LCORN, LNODES, ICOMB, & ITEST, LTEST, ERR) IF (ERR) RETURN -C + C SEE IF A SEMICIRCLE INTERPRETATION IS POSSIBLE WITH C THESE INTERVALS -C + IF ( (LTEST(1) .GE. 2) .AND. (LTEST(2) .GE. 2) ) THEN POSBL2 = .TRUE. ENDIF -C + C NOT ADD UP THE NICKS FOR BAD ANGLES -C + DO 100 I =1, NCORN NODE = LCORN (I) IF (ICOMB (I) .EQ. 1) THEN @@ -74,9 +55,9 @@ SUBROUTINE QUAL2 (MXND, MXCORN, MLN, NCORN, LCORN, LNODES, ICOMB, QUAL = QUAL + NICKS (ANGLE (NODE), LXN (1, NODE)) ENDIF 100 CONTINUE -C + C NOW SEE IF A TRIANGLE INTERPRETATION IS WARRANTED -C + IF (LTEST (1) .GT. LTEST (2)) THEN I1 = ITEST (1) L1 = LTEST (1) @@ -90,10 +71,10 @@ SUBROUTINE QUAL2 (MXND, MXCORN, MLN, NCORN, LCORN, LNODES, ICOMB, ENDIF LDIF = (L1 - L2) / 2 IF (LDIF .GT. L1 / 2) LDIF = L1 - LDIF -C + C THIS TESTS THE FORCED TRIANGLE - THE NEW ROW MUST BE C ENDED AT A CURRENT SIDE NODE -C + IF (L1 .EQ. L2) THEN NCHG1 = JUMPLP (MXND, MLN, LNODES, I1, LDIF) NCHG2 = JUMPLP (MXND, MLN, LNODES, I2, LDIF) @@ -123,10 +104,10 @@ SUBROUTINE QUAL2 (MXND, MXCORN, MLN, NCORN, LCORN, LNODES, ICOMB, ELSE POSBL3 = .FALSE. ENDIF -C + C SEE IF THE ROW NEEDS ADJUSTED SO THAT A RECTANGLE REMAINS POSSIBLE C WITH A SIGNIFICANTLY REDUCED ELEMENT SIZE ON THE LONG SIDE -C + ELSE C ... There is a bug here since ISTEP is not defined C Since it has been 'kindof' working for several years, @@ -139,9 +120,9 @@ SUBROUTINE QUAL2 (MXND, MXCORN, MLN, NCORN, LCORN, LNODES, ICOMB, ROWCHN = .TRUE. ISTART = I2 IEND = I1 -C + C CHECK THE SIZE REDUCTIONS AND TRIANGLE INTERPRETATION -C + ELSE DO 110 ISTEP = LDIF + 1, L1 / 2 - 1 NCHG1 = JUMPLP (MXND, MLN, LNODES, I1, ISTEP) @@ -153,12 +134,12 @@ SUBROUTINE QUAL2 (MXND, MXCORN, MLN, NCORN, LCORN, LNODES, ICOMB, IEND = I1 GOTO 120 ENDIF -C + 110 CONTINUE 120 CONTINUE ENDIF ENDIF -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/qual2n.f b/packages/seacas/applications/fastq/qual2n.f index 9875922eaeb1..bec82ad1fa11 100644 --- a/packages/seacas/applications/fastq/qual2n.f +++ b/packages/seacas/applications/fastq/qual2n.f @@ -1,85 +1,55 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: qual2n.f,v 1.3 1998/11/24 20:45:08 gdsjaar Exp $ -C $Log: qual2n.f,v $ -C Revision 1.3 1998/11/24 20:45:08 gdsjaar -C Added code to avoid array bound read errors and uninitialized -C variables. In some cases, the correct fix was difficult to determine, -C so added something that looked like it made sense... -C -C This fixes problems with very slow run times on g77-compiled code. It -C was taking an uninitialized variable to be INT_MAX instead of zero -C which resulted in lots of iterations through a loop. This variable was -C initialized to zero since that is what it was being set to on the sun -C and when compiled with fort77 (f2c-based). Gives the exact same mesh -C on linux and sun for several test cases. -C -C Revision 1.2 1995/06/28 19:21:20 gdsjaar -C Applied fixes found in memo dated May 13, 1991. The bug shows itself -C for rare cases of semicircular regions being paved. -C -c Revision 1.1.1.1 1990/11/30 11:14:15 gdsjaar -c FASTQ Version 2.0X -c -c Revision 1.1 90/11/30 11:14:14 gdsjaar -c Initial revision -c -C -CC* FILE: [.PAVING]QUAL2N.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE QUAL2N (MXND, MXCORN, MLN, NCORN, LCORN, LNODES, ICOMB, & BNSIZE, ANGLE, LXN, ITEST, LTEST, QUAL, POSBL2, POSBL3, ROWCHN, & SIDPIN, ISTART, IEND, IPINCH, NPINCH, ERR) C*********************************************************************** -C + C SUBROTINE QUAL2 = CHECKS THE QUALITY OF A SEMICIRCLE INTERPRETATION -C + C*********************************************************************** -C + DIMENSION LNODES (MLN, MXND), ANGLE (MXND), LCORN (MXCORN) DIMENSION BNSIZE (2, MXND), IPINCH(4) DIMENSION ICOMB (MXCORN), ITEST (2), LTEST (2), LXN (4, MXND) -C + LOGICAL ERR, POSBL2, POSBL3, ROWCHN, SHRUNK, SIDPIN -C + REAL NICKS, NICKC -C + ERR = .FALSE. C ... See note below regarding bug... ISTEP = 0 -C + C ASSUME PERFECT QUALITY -C + QUAL = 0. POSBL2 = .FALSE. POSBL3 = .FALSE. ROWCHN = .FALSE. SIDPIN = .FALSE. -C + C FIRST GET THE INTERVAL LENGTHS TO THE CHOSEN CORNERS -C + ILEN = 2 CALL SPACED (MXND, MXCORN, MLN, ILEN, NCORN, LCORN, LNODES, ICOMB, & ITEST, LTEST, ERR) IF (ERR) GOTO 130 -C + C SEE IF A SEMICIRCLE INTERPRETATION IS POSSIBLE WITH C THESE INTERVALS -C + IF ( (LTEST(1) .GE. 2) .AND. (LTEST(2) .GE. 2) ) THEN POSBL2 = .TRUE. ENDIF -C + C NOT ADD UP THE NICKS FOR BAD ANGLES -C + DO 100 I =1, NCORN NODE = LCORN (I) IF (ICOMB (I) .EQ. 1) THEN @@ -88,9 +58,9 @@ SUBROUTINE QUAL2N (MXND, MXCORN, MLN, NCORN, LCORN, LNODES, ICOMB, QUAL = QUAL + NICKS (ANGLE (NODE), LXN (1, NODE)) ENDIF 100 CONTINUE -C + C NOW SEE IF A TRIANGLE INTERPRETATION IS WARRANTED -C + IF (LTEST (1) .GT. LTEST (2)) THEN I1 = ITEST (1) L1 = LTEST (1) @@ -104,10 +74,10 @@ SUBROUTINE QUAL2N (MXND, MXCORN, MLN, NCORN, LCORN, LNODES, ICOMB, ENDIF LDIF = (L1 - L2) / 2 IF (LDIF .GT. L1 / 2) LDIF = L1 - LDIF -C + C THIS TESTS THE FORCED RETANGLE - THE TWO NEW ROWS MUST BE C ENDED AT CURRENT SIDE NODES -C + IF (L1 .EQ. L2) THEN NCHG1 = JUMPLP (MXND, MLN, LNODES, I1, L1 / 2) NCHG2 = JUMPLP (MXND, MLN, LNODES, I2, L1 / 2) @@ -122,10 +92,10 @@ SUBROUTINE QUAL2N (MXND, MXCORN, MLN, NCORN, LCORN, LNODES, ICOMB, ISTART = I1 ENDIF ENDIF -C + C SEE IF THE ROW NEEDS ADJUSTED SO THAT A RECTANGLE REMAINS POSSIBLE C WITH A SIGNIFICANTLY REDUCED ELEMENT SIZE ON THE LONG SIDE -C + ELSE C ... There is a bug here since ISTEP is not defined C Since it has been 'kindof' working for several years, @@ -138,9 +108,9 @@ SUBROUTINE QUAL2N (MXND, MXCORN, MLN, NCORN, LCORN, LNODES, ICOMB, ROWCHN = .TRUE. ISTART = I2 IEND = I1 -C + C CHECK THE SIZE REDUCTIONS AND TRIANGLE INTERPRETATION -C + ELSE DO 110 ISTEP = LDIF + 1, L1 / 2 - 1 NCHG1 = JUMPLP (MXND, MLN, LNODES, I1, ISTEP) @@ -152,14 +122,14 @@ SUBROUTINE QUAL2N (MXND, MXCORN, MLN, NCORN, LCORN, LNODES, ICOMB, IEND = I1 GOTO 120 ENDIF -C + 110 CONTINUE 120 CONTINUE ENDIF ENDIF -C + 130 CONTINUE -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/qual3.f b/packages/seacas/applications/fastq/qual3.f index b1959b046117..ae3ba22dc817 100644 --- a/packages/seacas/applications/fastq/qual3.f +++ b/packages/seacas/applications/fastq/qual3.f @@ -1,52 +1,41 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: qual3.f,v 1.1 1990/11/30 11:14:17 gdsjaar Exp $ -C $Log: qual3.f,v $ -C Revision 1.1 1990/11/30 11:14:17 gdsjaar -C Initial revision -C -C -CC* FILE: [.PAVING]QUAL3.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE QUAL3 (MXND, MXCORN, MLN, NCORN, LCORN, LNODES, ICOMB, & ANGLE, LXN, ITEST, LTEST, QUAL, POSBL3, POSBL4, ERR) C*********************************************************************** -C + C SUBROTINE QUAL3 = CHECKS THE QUALITY OF A TRIANGLE INTERPRETATION -C + C*********************************************************************** -C + DIMENSION LNODES (MLN, MXND), ANGLE (MXND), LCORN (MXCORN) DIMENSION ICOMB (MXCORN), ITEST (3), LTEST (3), LXN (4, MXND) -C + LOGICAL ERR, POSBL3, POSBL4 -C + REAL NICKS, NICKC -C + ERR = .FALSE. -C + C ASSUME PERFECT QUALITY -C + QUAL = 0. POSBL3 = .FALSE. POSBL4 = .FALSE. -C + C FIRST GET THE INTERVAL LENGTHS TO THE CHOSEN CORNERS -C + ILEN = 3 CALL SPACED (MXND, MXCORN, MLN, ILEN, NCORN, LCORN, LNODES, ICOMB, & ITEST, LTEST, ERR) IF (ERR) GOTO 110 -C + C SEE IF A TRIANGLE INTERPRETATION IS POSSIBLE WITH THESE INTERVALS -C + MMAX = MAX0 (LTEST(1), LTEST(2), LTEST(3)) IF (LTEST(1) .EQ. MMAX) THEN IBIG = LTEST(1) @@ -58,9 +47,9 @@ SUBROUTINE QUAL3 (MXND, MXCORN, MLN, NCORN, LCORN, LNODES, ICOMB, IBIG = LTEST(3) ISUM = LTEST(1) + LTEST(2) ENDIF -C + IDIFF = ISUM - IBIG -C + IF (IDIFF .LT. 0) THEN RETURN ELSEIF (IDIFF .LT. 2) THEN @@ -68,9 +57,9 @@ SUBROUTINE QUAL3 (MXND, MXCORN, MLN, NCORN, LCORN, LNODES, ICOMB, ELSE POSBL3 = .TRUE. ENDIF -C + C NOW ADD UP THE NICKS FOR BAD ANGLES AND BAD CONNECTIVITY -C + DO 100 I = 1, NCORN NODE = LCORN (I) IF (ICOMB (I) .EQ. 1) THEN @@ -79,13 +68,13 @@ SUBROUTINE QUAL3 (MXND, MXCORN, MLN, NCORN, LCORN, LNODES, ICOMB, QUAL = QUAL + NICKS (ANGLE (NODE), LXN (1, NODE)) ENDIF 100 CONTINUE -C + IF (POSBL4) QUAL = QUAL * 1.3 MMIN = MIN0 (LTEST(1), LTEST(2), LTEST(3)) IF (MMIN.EQ.1) QUAL = QUAL * 1.3 -C + 110 CONTINUE -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/qual4.f b/packages/seacas/applications/fastq/qual4.f index 5000bb5ad43e..7d2108c9482e 100644 --- a/packages/seacas/applications/fastq/qual4.f +++ b/packages/seacas/applications/fastq/qual4.f @@ -1,61 +1,50 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: qual4.f,v 1.1 1990/11/30 11:14:20 gdsjaar Exp $ -C $Log: qual4.f,v $ -C Revision 1.1 1990/11/30 11:14:20 gdsjaar -C Initial revision -C -C -CC* FILE: [.PAVING]QUAL4.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE QUAL4 (MXND, MXCORN, MLN, NCORN, LCORN, LNODES, ICOMB, & ANGLE, LXN, ITEST, LTEST, QUAL, POSBL4, ERR) C*********************************************************************** -C + C SUBROTINE QUAL4 = CHECKS THE QUALITY OF A RECTANGLE INTERPRETATION -C + C*********************************************************************** -C + DIMENSION LNODES (MLN, MXND), ANGLE (MXND), LCORN (MXCORN) DIMENSION ICOMB (MXCORN), ITEST (4), LTEST (4), LXN (4, MXND) -C + LOGICAL ERR, POSBL4 -C + REAL NICKS, NICKC -C + ERR = .FALSE. -C + C ASSUME PERFECT QUALITY -C + QUAL = 0. POSBL4 = .FALSE. -C + C FIRST GET THE INTERVAL LENGTHS TO THE CHOSEN CORNERS -C + ILEN = 4 CALL SPACED (MXND, MXCORN, MLN, ILEN, NCORN, LCORN, LNODES, ICOMB, & ITEST, LTEST, ERR) IF (ERR) GOTO 110 -C + C GET SEE IF A RECTANGLE INTERPRETATION IS POSSIBLE WITH C THESE INTERVALS -C + IF ( (LTEST(1) .EQ. LTEST(3)) .AND. & (LTEST(2) .EQ. LTEST(4)) ) THEN POSBL4 = .TRUE. ELSE RETURN ENDIF -C + C NOT ADD UP THE NICKS FOR BAD ANGLES -C + DO 100 I =1, NCORN NODE = LCORN (I) IF (ICOMB (I) .EQ. 1) THEN @@ -64,9 +53,9 @@ SUBROUTINE QUAL4 (MXND, MXCORN, MLN, NCORN, LCORN, LNODES, ICOMB, QUAL = QUAL + (.8 * NICKS (ANGLE (NODE), LXN (1, NODE)) ) ENDIF 100 CONTINUE -C + 110 CONTINUE -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/rdfsq.f b/packages/seacas/applications/fastq/rdfsq.f index ee6121bc0b19..d565bb9113a4 100644 --- a/packages/seacas/applications/fastq/rdfsq.f +++ b/packages/seacas/applications/fastq/rdfsq.f @@ -1,10 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: rdfsq.f,v 1.4 1999/01/25 16:28:46 gdsjaar Exp $ SUBROUTINE RDFSQ (MP, ML, MS, MR, MSNAP, MSC, MA, IUNIT, IDUMP, N, & IPOINT, COOR, IPBOUN, ILINE, LTYPE, NINT, FACTOR, LCON, ILBOUN, & ISBOUN, ISIDE, NLPS, IFLINE, ILLIST, IBARST, JMAT, JCENT, NLPB, @@ -17,16 +16,16 @@ SUBROUTINE RDFSQ (MP, ML, MS, MR, MSNAP, MSC, MA, IUNIT, IDUMP, N, & DEFSCH, DEFSIZ, TITLE, OPTIM, MERGE, THREE, EIGHT, NINE, & SNAP, SNAPDX, NSNAP, RATIO, NOROOM, EXODUSII) C*********************************************************************** -C + C SUBROUTINE RDFSQ = READS AND/OR MERGES FASTQ CARD FILE(S) -C + C*********************************************************************** -C + C SUBROUTINE CALLED BY: C FASTQ = A PROGRAM TO QUICKLY PREPARE FASTQ INPUT -C + C*********************************************************************** -C + C VARIABLES USED: C TITLE = MESH TITLE C IHOLDP = AN ARRAY TO HOLD THE POINTS DURING RENUMBERING @@ -38,11 +37,11 @@ SUBROUTINE RDFSQ (MP, ML, MS, MR, MSNAP, MSC, MA, IUNIT, IDUMP, N, C MERGE = .TRUE. IF THE DATA IS TO BE MERGED WITH EXISTING DATA C NOROOM = .TRUE. IF THE AMOUNT OF DATA EXCEEDS DIMENSIONED LIMITS C NODATA = .TRUE. IF NO DATA HAS BEEN READ FROM THE FILE -C + C*********************************************************************** -C + PARAMETER (NIN = 1000) -C + DIMENSION IPOINT(MP), COOR(2, MP), IPBOUN(MP) DIMENSION ILINE(ML), LTYPE(ML), NINT(ML), FACTOR(ML), LCON(3, ML) DIMENSION ILBOUN(ML), ISBOUN(ML) @@ -67,16 +66,16 @@ SUBROUTINE RDFSQ (MP, ML, MS, MR, MSNAP, MSC, MA, IUNIT, IDUMP, N, DIMENSION N(29), NOLD(29), III(1) DIMENSION KIN(NIN), CIN(NIN), IIN(NIN), RIN(NIN) DIMENSION SNAPDX(2, MSNAP), NSNAP(2) -C + CHARACTER*72 SCHEME, DEFSCH CHARACTER*72 TITLE, HOLD, NUMBER*80, CIN*72 -C + LOGICAL OPTIM, MERGE, NEWNUM, NOROOM, ADDOLD, DOLINK, ERR LOGICAL NODATA, ADDLNK, THREE, EIGHT, NINE, SIDEOK, SNAP LOGICAL EXODUSII -C + C SET UP THE INITIALIZATION OF VARIABLES -C + DO 100 I = 1, 29 NOLD(I) = N(I) 100 CONTINUE @@ -99,19 +98,19 @@ SUBROUTINE RDFSQ (MP, ML, MS, MR, MSNAP, MSC, MA, IUNIT, IDUMP, N, NODATA = .TRUE. ADDLNK = .TRUE. DEFSCH = 'M' -C + C READ THE INPUT CARDS AND SORT AS NEEDED -C + DO 130 I = 1, MP + 2*ML + MS + 2*MR CALL FREFLD (IUNIT, IDUMP, ' ', NIN, IOSTAT, IFOUND, & KIN, CIN, IIN, RIN) -C + C CHECK FOR THE END OF THE FILE OR FOR AN ERROR -C + IF (IOSTAT .LT. 0) GO TO 140 -C + C INPUT THE TITLE -C + IF (CIN(1)(1:5) .EQ. 'TITLE') THEN NODATA = .FALSE. IF (MERGE) THEN @@ -129,9 +128,9 @@ SUBROUTINE RDFSQ (MP, ML, MS, MR, MSNAP, MSC, MA, IUNIT, IDUMP, N, END IF CALL STRCUT (TITLE) CALL STRLNG (TITLE, LEN) -C + C INPUT A POINT INTO THE DATABASE -C + ELSE IF (CIN(1)(1:5) .EQ. 'POINT') THEN NODATA = .FALSE. JJ = IIN(2) @@ -142,9 +141,9 @@ SUBROUTINE RDFSQ (MP, ML, MS, MR, MSNAP, MSC, MA, IUNIT, IDUMP, N, CALL INPOIN (MP, N(1), N(18), JJ, RIN(3), RIN(4), NHOLDP, & IHOLDP, IPOINT, COOR, IPBOUN, LINKP, MERGE, NOROOM) IF (NOROOM) GO TO 310 -C + C INPUT A LINE INTO THE DATABASE -C + ELSE IF (CIN(1)(1:5) .EQ. 'LINE ')THEN NODATA = .FALSE. JJ = IIN(2) @@ -180,9 +179,9 @@ SUBROUTINE RDFSQ (MP, ML, MS, MR, MSNAP, MSC, MA, IUNIT, IDUMP, N, & IIN(6), IIN(7), RIN(8), NHOLDL, IHOLDL, ILINE, LTYPE, & NINT, FACTOR, LCON, ILBOUN, ISBOUN, LINKL, MERGE, NOROOM) IF (NOROOM) GO TO 310 -C + C INPUT A SIDE INTO THE DATABASE -C + ELSE IF (CIN(1)(1:5) .EQ. 'SIDE ') THEN NODATA = .FALSE. JJ = IIN(2) @@ -197,9 +196,9 @@ SUBROUTINE RDFSQ (MP, ML, MS, MR, MSNAP, MSC, MA, IUNIT, IDUMP, N, & ISIDE, NLPS, IFLINE, ILLIST, LINKS, NHOLDS, IHOLDS, & MERGE, NOROOM) IF (NOROOM) GO TO 310 -C + C INPUT A BAR SET INTO THE DATABASE -C + ELSE IF (CIN(1)(1:6) .EQ. 'BARSET') THEN NODATA = .FALSE. JJ = IIN(2) @@ -215,9 +214,9 @@ SUBROUTINE RDFSQ (MP, ML, MS, MR, MSNAP, MSC, MA, IUNIT, IDUMP, N, & JFLINE, JLLIST, LINKB, LINKM, NHOLDM, IHOLDM, NHOLDB, & IHOLDB, MERGE, NOROOM) IF (NOROOM) GO TO 310 -C + C INPUT A REGION INTO THE DATABASE -C + ELSE IF (CIN(1)(1:6) .EQ. 'REGION') THEN NODATA = .FALSE. JJ = IIN(2) @@ -238,9 +237,9 @@ SUBROUTINE RDFSQ (MP, ML, MS, MR, MSNAP, MSC, MA, IUNIT, IDUMP, N, RSIZE(JJPNTR) = 0. NHPR(JJPNTR) = 0 IF (NOROOM) GO TO 310 -C + C INPUT A GROUP INTO THE DATABASE -C + ELSE IF (CIN(1)(1:6) .EQ. 'GROUP ') THEN NODATA = .FALSE. JJ = IIN(2) @@ -255,9 +254,9 @@ SUBROUTINE RDFSQ (MP, ML, MS, MR, MSNAP, MSC, MA, IUNIT, IDUMP, N, & IFOUND - 2, IREGN, NSPR, IFSIDE, ISLIST, LINKR, NHOLDR, & IHOLDR, IRGFLG, MERGE, NOROOM) IF (NOROOM) GO TO 310 -C + C INPUT A REGION'S HOLES INTO THE DATABASE -C + ELSE IF (CIN(1)(1:6) .EQ. 'HOLE ') THEN NODATA = .FALSE. JJ = IIN(2) @@ -280,9 +279,9 @@ SUBROUTINE RDFSQ (MP, ML, MS, MR, MSNAP, MSC, MA, IUNIT, IDUMP, N, CALL INHOLE (MR, N(7), N(29), JJPNTR, IIN(3), IFOUND - 2, & IFHOLE, NHPR, IHLIST, MERGE, NOROOM) IF (NOROOM) GO TO 310 -C + C INPUT A SCHEME INTO THE DATABASE -C + ELSE IF (CIN(1)(1:6) .EQ. 'SCHEME') THEN NODATA = .FALSE. JJ = IIN(2) @@ -312,9 +311,9 @@ SUBROUTINE RDFSQ (MP, ML, MS, MR, MSNAP, MSC, MA, IUNIT, IDUMP, N, CALL MESAGE ('SCHEME CARD IS THUS IGNORED') CALL MESAGE ('************************************') END IF -C + C INPUT INTERVALS FOR SIDES OR LINES -C + ELSE IF (CIN(1)(1:3) .EQ. 'INT') THEN NODATA = .FALSE. JJ = IIN(3) @@ -330,9 +329,9 @@ SUBROUTINE RDFSQ (MP, ML, MS, MR, MSNAP, MSC, MA, IUNIT, IDUMP, N, CALL ININTR (ML, MS, IFOUND - 2, IIN(2), IIN(3), N(19), & N(20), NINT, NLPS, IFLINE, ILLIST, LINKL, LINKS, ADDLNK) ADDLNK = .TRUE. -C + C INPUT FACTORS FOR SIDES OR LINES -C + ELSE IF (CIN(1)(1:3) .EQ. 'FAC') THEN NODATA = .FALSE. JJ = IIN(3) @@ -349,9 +348,9 @@ SUBROUTINE RDFSQ (MP, ML, MS, MR, MSNAP, MSC, MA, IUNIT, IDUMP, N, & N(20), FACTOR, NLPS, IFLINE, ILLIST, LINKL, LINKS, & ADDLNK) ADDLNK = .TRUE. -C + C INPUT A REGION'S INTERVAL SIZE INTO THE DATABASE -C + ELSE IF (CIN(1)(1:5) .EQ. 'SIZE ') THEN NODATA = .FALSE. IF (IFOUND .LT. 3) THEN @@ -368,9 +367,9 @@ SUBROUTINE RDFSQ (MP, ML, MS, MR, MSNAP, MSC, MA, IUNIT, IDUMP, N, 110 CONTINUE ADDLNK = .TRUE. END IF -C + C INPUT A BODY DEFINITION INTO THE DATABASE -C + ELSE IF (CIN(1)(1:4) .EQ. 'BODY') THEN NODATA = .FALSE. IF (IFOUND .GT. 1) THEN @@ -378,9 +377,9 @@ SUBROUTINE RDFSQ (MP, ML, MS, MR, MSNAP, MSC, MA, IUNIT, IDUMP, N, & NOROOM) IF (NOROOM) GO TO 310 END IF -C + C INPUT A POINT BOUNDARY INTO THE DATABASE -C + ELSE IF (CIN(1)(1:6) .EQ. 'POINBC') THEN IF (IFOUND .LT. 3) THEN WRITE(*, 10200) IIN(2) @@ -397,9 +396,9 @@ SUBROUTINE RDFSQ (MP, ML, MS, MR, MSNAP, MSC, MA, IUNIT, IDUMP, N, WRITE(*, 10210)JHOLD, IPNTR ADDLNK = .TRUE. END IF -C + C INPUT A LINE BOUNDARY INTO THE DATABASE -C + ELSE IF ((CIN(1)(1:6) .EQ. 'NODEBC') .OR. & (CIN(1)(1:6) .EQ. 'LINEBC')) THEN IF (IFOUND .LT. 3) THEN @@ -417,9 +416,9 @@ SUBROUTINE RDFSQ (MP, ML, MS, MR, MSNAP, MSC, MA, IUNIT, IDUMP, N, WRITE(*, 10230)JHOLD, IPNTR ADDLNK = .TRUE. END IF -C + C INPUT A SIDE BOUNDARY INTO THE DATABASE -C + ELSE IF ((CIN(1)(1:6) .EQ. 'ELEMBC') .OR. & (CIN(1)(1:6) .EQ. 'SIDEBC')) THEN IF (IFOUND .LT. 3) THEN @@ -437,15 +436,15 @@ SUBROUTINE RDFSQ (MP, ML, MS, MR, MSNAP, MSC, MA, IUNIT, IDUMP, N, WRITE(*, 10250)JHOLD, IPNTR ADDLNK = .TRUE. END IF -C + C INPUT A FLAG WEIGHTING INTO THE DATABASE -C + ELSE IF (CIN(1)(1:6) .EQ. 'WEIGHT') THEN ADDLNK = .FALSE. NODATA = .FALSE. -C + C GET THE FLAG TYPE -C + IF (CIN(2)(1:1) .EQ. 'P') THEN CALL LTSORT (MP, LINKPB, IIN(3), JJ, ADDLNK) IF (JJ .GT. 0) THEN @@ -474,15 +473,15 @@ SUBROUTINE RDFSQ (MP, ML, MS, MR, MSNAP, MSC, MA, IUNIT, IDUMP, N, WRITE(*, 10270) 'SIDE', IIN(3) END IF ELSE -C + C NO FLAG TYPE HAS BEEN RECOGNIZED -C + WRITE(*, 10280) CIN(2)(1:5) END IF ADDLNK = .TRUE. -C + C FLAG THE BANDWIDTH OPTIMIZATION ROUTINES ON, AND READ A RENUM CARD -C + ELSE IF (CIN(1)(1:5) .EQ. 'RENUM') THEN NODATA = .FALSE. OPTIM = .TRUE. @@ -503,47 +502,47 @@ SUBROUTINE RDFSQ (MP, ML, MS, MR, MSNAP, MSC, MA, IUNIT, IDUMP, N, CALL MESAGE ('RENUM CARD READ WITHOUT ANY DATA') CALL MESAGE ('DEFAULT RENUM PROCESSING WILL BE USED') END IF -C + C Write Database in exodusII format -C + ELSE IF (CIN(1)(1:2) .EQ. 'X2') THEN NODATA = .FALSE. EXODUSII = .TRUE. -C + C Write Database in exodusI/genesis format -C + ELSE IF (CIN(1)(1:2) .EQ. 'X1') THEN NODATA = .FALSE. EXODUSII = .FALSE. -C + C FLAG THE GENERATION OF THREE NODE ELEMENTS -C + ELSE IF (CIN(1)(1:5) .EQ. 'THREE') THEN NODATA = .FALSE. THREE = .TRUE. -C + C FLAG THE GENERATION OF EIGHT NODE ELEMENTS -C + ELSE IF (CIN(1)(1:5) .EQ. 'EIGHT') THEN NODATA = .FALSE. EIGHT = .TRUE. NINE = .FALSE. -C + C FLAG THE GENERATION OF NINE NODE ELEMENTS -C + ELSE IF (CIN(1)(1:4) .EQ. 'NINE') THEN NODATA = .FALSE. NINE = .TRUE. EIGHT = .FALSE. -C + C INPUT SNAP-TO-GRID FLAG -C + ELSE IF (CIN(1)(1:4) .EQ. 'SNAP') THEN NODATA = .FALSE. SNAP = CIN(2)(1:2) .EQ. 'ON' -C + C INPUT X-GRID LINES -C + ELSE IF (CIN(1)(1:4) .EQ. 'XGRI') THEN IF (IFOUND .LT. 2) THEN WRITE(*, 10290) 'XGRID' @@ -552,9 +551,9 @@ SUBROUTINE RDFSQ (MP, ML, MS, MR, MSNAP, MSC, MA, IUNIT, IDUMP, N, NODATA = .FALSE. CALL INGRID (MSNAP, SNAPDX, NSNAP, 1, RIN(2), IFOUND - 1, & ERR) -C + C INPUT Y-GRID LINES -C + ELSE IF (CIN(1)(1:4) .EQ. 'YGRI') THEN IF (IFOUND .LT. 2) THEN WRITE(*, 10290) 'YGRID' @@ -563,28 +562,28 @@ SUBROUTINE RDFSQ (MP, ML, MS, MR, MSNAP, MSC, MA, IUNIT, IDUMP, N, NODATA = .FALSE. CALL INGRID (MSNAP, SNAPDX, NSNAP, 2, RIN(2), IFOUND - 1, & ERR) -C + C END OF DATA -C + ELSE IF (CIN(1)(1:4) .EQ. 'EXIT') THEN NODATA = .FALSE. GO TO 150 END IF 120 CONTINUE 130 CONTINUE -C + 140 CONTINUE CALL MESAGE ('FILE END ENCOUNTERED BEFORE -EXIT- CARD WAS FOUND') CALL MESAGE ('POSSIBLE PROBLEM IN FILE') -C + C RENUMBER THE CARDS IF MERGING -C + 150 CONTINUE ADDLNK = .FALSE. IF (MERGE) THEN -C + C RENUMBER THE POINTS CONTAINED IN THE LINE, AND POINT BOUNDARY CARDS -C + DO 170 I = NOLD(2) + 1, N(2) DO 160 J = 1, 3 CALL LTSORT (MP, IHOLDP, LCON(J, I), IPNTR, ADDLNK) @@ -597,10 +596,10 @@ SUBROUTINE RDFSQ (MP, ML, MS, MR, MSNAP, MSC, MA, IUNIT, IDUMP, N, IF ((LISTPB(1, I) .LE. NHOLDP) .AND. (IPNTR .GT. 0)) & LISTPB(1, I) = IPNTR 180 CONTINUE -C + C RENUMBER THE LINES CONTAINED IN THE SIDE, BAR SET, REGION, C LINE BOUNDARY, AND SIDE BOUNDARY CARDS -C + DO 190 I = NOLD(4) + 1, N(4) CALL LTSORT (ML, IHOLDL, ILLIST(I), IPNTR, ADDLNK) IF ((ILLIST(I) .LE. NHOLDL) .AND. (IPNTR .GT. 0)) @@ -629,9 +628,9 @@ SUBROUTINE RDFSQ (MP, ML, MS, MR, MSNAP, MSC, MA, IUNIT, IDUMP, N, IF ((LISTSB(1, I) .LE. NHOLDL) .AND. (IPNTR .GT. 0)) & LISTSB(1, I) = IPNTR 230 CONTINUE -C + C RENUMBER THE SIDES CONTAINED IN THE REGION CARDS -C + DO 240 I = NOLD(8) + 1, N(8) IF (ISLIST(I) .GT. 0) THEN CALL LTSORT (MS, IHOLDS, ISLIST(I), IPNTR, ADDLNK) @@ -639,9 +638,9 @@ SUBROUTINE RDFSQ (MP, ML, MS, MR, MSNAP, MSC, MA, IUNIT, IDUMP, N, & ISLIST(I) = IPNTR END IF 240 CONTINUE -C + C RENUMBER THE REGIONS CONTAINED IN THE HOLE CARDS -C + DO 250 I = NOLD(29) + 1, N(29) IF (IHLIST(I) .GT. 0) THEN CALL LTSORT (MR, IHOLDR, IHLIST(I), IPNTR, ADDLNK) @@ -649,10 +648,10 @@ SUBROUTINE RDFSQ (MP, ML, MS, MR, MSNAP, MSC, MA, IUNIT, IDUMP, N, & IHLIST(I) = IPNTR END IF 250 CONTINUE -C + C RENUMBER THE BAR SETS AND REGIONS CONTAINED IN THE BODY, C AND THE REGIONS CONTAINED IN THE SCHEME CARDS -C + DO 260 I = NOLD(9) + 1, N(9) IF (IRPB(I) .GT. 0) THEN CALL LTSORT (MR, IHOLDR, IRPB(I), IPNTR, ADDLNK) @@ -670,17 +669,17 @@ SUBROUTINE RDFSQ (MP, ML, MS, MR, MSNAP, MSC, MA, IUNIT, IDUMP, N, & ISCHM(I) = IPNTR 270 CONTINUE END IF -C + C LINK THE SCHEME CARDS -C + ADDLNK = .TRUE. DO 280 I = NOLD(10) + 1, N(10) IF (ISCHM(I) .GT. N(24)) N(24) = ISCHM(I) CALL LTSORT (MR, LINKSC, ISCHM(I), I, ADDLNK) 280 CONTINUE -C + C LINK UP THE POINTS AND LINES TO THEIR ASSOCIATED FLAGS -C + SIDEOK = .FALSE. CALL LINKBC (MP, MS, NOLD(11) + 1, N(11), N(1), N(25), N(11), & N(12), N(20), IPBF, IFPB, NPPF, LISTPB, NLPS, IFLINE, ILLIST, @@ -695,10 +694,10 @@ SUBROUTINE RDFSQ (MP, ML, MS, MR, MSNAP, MSC, MA, IUNIT, IDUMP, N, & N(16), N(20), ISBF, IFSB, NSPF, LISTSB, NLPS, IFLINE, ILLIST, & ISBOUN, LINKSB, IWTSBF, LINKL, LINKS, SIDEOK, NOROOM) IF (NOROOM) GO TO 310 -C + C IF NO BODY CARDS HAVE BEEN READ, ASSUME THE BODY IS ALL THE REGIONS C AND ALL THE BAR SETS -C + ADDLNK = .FALSE. IF (N(9) .EQ. NOLD(9)) THEN IFOUND = 1 @@ -720,9 +719,9 @@ SUBROUTINE RDFSQ (MP, ML, MS, MR, MSNAP, MSC, MA, IUNIT, IDUMP, N, END IF 300 CONTINUE END IF -C + C SUCCESSFUL COMPLETION - WRITE SUMMARY OF SUCCESSFUL READS -C + IF (NODATA) THEN CALL MESAGE (' ') CALL MESAGE (' *----------------------------------------- - *') @@ -760,9 +759,9 @@ SUBROUTINE RDFSQ (MP, ML, MS, MR, MSNAP, MSC, MA, IUNIT, IDUMP, N, IF (N(29) .GT. 0) WRITE(*, 10470) N(29) END IF RETURN -C + C MORE ROOM IN DIMENSIONS NEEDED -C + 310 CONTINUE CALL MESAGE (' ') CALL MESAGE ('DIMENSIONS MUST BE INCREASED - PLEASE WAIT') @@ -775,9 +774,9 @@ SUBROUTINE RDFSQ (MP, ML, MS, MR, MSNAP, MSC, MA, IUNIT, IDUMP, N, TITLE(LHOLD + 1:) = ' ' END IF NOROOM = .TRUE. -C + C FIND OUT HOW MUCH ROOM IS NEEDED -C + REWIND IUNIT NEWMP = 0 NEWML = 0 @@ -786,13 +785,13 @@ SUBROUTINE RDFSQ (MP, ML, MS, MR, MSNAP, MSC, MA, IUNIT, IDUMP, N, 330 CONTINUE CALL FREFLD (IUNIT, IDUMP, ' ', NIN, IOSTAT, IFOUND, KIN, CIN, & IIN, RIN) -C + C CHECK FOR THE END OF THE FILE OR FOR AN ERROR -C + IF (IOSTAT .LT. 0) GO TO 340 -C + C COUNT THE CARDS FOR NEEDED DIMENSIONING -C + IF (CIN(1)(1:5) .EQ. 'POINT') THEN NEWMP = NEWMP + 1 ELSE IF (CIN(1)(1:5) .EQ. 'LINE ') THEN @@ -803,14 +802,14 @@ SUBROUTINE RDFSQ (MP, ML, MS, MR, MSNAP, MSC, MA, IUNIT, IDUMP, N, NEWMR = NEWMR + 1 END IF GO TO 330 -C + C GET THE LARGEST RATIO OF NEEDED/CURRENT -C + 340 CONTINUE RATIO = AMAX1(DBLE(NEWMP)/DBLE(MP), DBLE(NEWML)/DBLE(ML), & DBLE(NEWMS)/DBLE(MS), DBLE(NEWMR)/DBLE(MR), 1.5000001)*1.1 RETURN -C + 10000 FORMAT (' A POINT NO. OF:', I7, ' IS NOT ALLOWED', /, & ' THIS POINT WILL NOT BE INPUT INTO DATABASE') 10010 FORMAT (' A LINE NO. OF:', I7, ' IS NOT ALLOWED', /, @@ -891,5 +890,5 @@ SUBROUTINE RDFSQ (MP, ML, MS, MR, MSNAP, MSC, MA, IUNIT, IDUMP, N, 10500 FORMAT (' NUMBER OF NODEBCS READ:', I5) 10510 FORMAT (' NUMBER OF ELEMBCS READ:', I5) 10520 FORMAT (' NUMBER OF RENUMS READ:', I5) -C + END diff --git a/packages/seacas/applications/fastq/rdmesh.f b/packages/seacas/applications/fastq/rdmesh.f index 2a6dc929f356..271da791f183 100644 --- a/packages/seacas/applications/fastq/rdmesh.f +++ b/packages/seacas/applications/fastq/rdmesh.f @@ -1,46 +1,35 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: rdmesh.f,v 1.1 1990/11/30 11:14:30 gdsjaar Exp $ -C $Log: rdmesh.f,v $ -C Revision 1.1 1990/11/30 11:14:30 gdsjaar -C Initial revision -C -C -CC* FILE: [.RENUM]RDMESH.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE RDMESH (NPNODE, NPELEM, NPNBC, NPSBC, NPREGN, MS, MR, & NNUID, NNXK, IUNIT, NNN, KKK, IPART, LSTNBC, LSTSBC, NUID, XN, & YN, NXK, MAT, MATMAP, NUMMAT, ISIDE, NLPS, IFLINE, ILLIST, & LINKS, LINKR, IMAT, LINKB, JMAT, NNNBC, NNSBC, ERR) C*********************************************************************** -C + C SUBROUTINE RDMESH = THE CURRENT MESH STORED ON DISK -C + C*********************************************************************** -C + DIMENSION IPART(3, NPREGN), ISIDE(MS), NLPS(MS), IFLINE(MS) DIMENSION ILLIST(MS*3), LINKS(2, MS), LINKB(2, MS), LINKR(2, MR) DIMENSION IMAT(MR), JMAT(MS) -C + DIMENSION NUID(NNUID), XN(NPNODE), YN(NPNODE) DIMENSION NXK(NNXK, NPELEM), MAT(NPELEM) -C + DIMENSION LSTNBC(NPNBC), LSTSBC(NPSBC) DIMENSION MATMAP(3, NPREGN) -C + LOGICAL ERR, BAR, ADDLNK -C + ERR = .FALSE. -C + C READ THE MESH TAPE -C + REWIND IUNIT NNN = 0 KKK = 0 @@ -52,38 +41,38 @@ SUBROUTINE RDMESH (NPNODE, NPELEM, NPNBC, NPSBC, NPREGN, MS, MR, IPART(2, I) = 0 IPART(3, I) = 0 100 CONTINUE -C + NUMMAT = 0 DO 220 IR = 1, NPREGN READ(IUNIT, END = 230) KKKREG, NNNREG, NNBCRG, NSBCRG, KREG, & BAR, M1 -C + C READ THE NODES -C + N1 = NNN + 1 NNN = NNN + NNNREG IF (NNNREG .GE. 1)READ(IUNIT, END = 230) (NUID(I), XN(I), & YN(I), I = N1, NNN) -C + C READ THE ELEMENTS -C + K1 = KKK + 1 IPART(1, IR) = KREG IPART(2, IR) = K1 KKK = KKK + KKKREG IPART(3, IR) = KKK READ(IUNIT, END = 230) ((NXK(I, K), I = 1, 4), K = K1, KKK) -C + C ZERO THE MIDSIDE NODE LOCATIONS IN THE NXK ARRAY -C + DO 120 I = 5, NNXK DO 110 K = K1, KKK NXK(I, K) = 0 110 CONTINUE 120 CONTINUE -C + C SET UP THE MATERIAL ARRAY AND MAXIMUM NUMBER OF MATERIALS -C + IF (BAR) THEN CALL LTSORT (MS, LINKB, KREG, IPNTR, ADDLNK) KMAT = ABS (JMAT(IPNTR)) @@ -91,23 +80,23 @@ SUBROUTINE RDMESH (NPNODE, NPELEM, NPNBC, NPSBC, NPREGN, MS, MR, CALL LTSORT (MR, LINKR, KREG, IPNTR, ADDLNK) KMAT = IMAT(IPNTR) END IF -C + C SEE IF ALTERNATING MATERIALS WITHIN A REGION ARE ENABLED -C + IF (KMAT .LT. 0) THEN CALL LTSORT (MS, LINKS, IABS(KMAT), JPNTR, ADDLNK) IF ((JPNTR .GT. 0) .AND. (NLPS(JPNTR) .GE. 2)) THEN -C + C ADD MATERIAL NUMBER BY ROW OF ELEMENTS -C + MATPNT = IFLINE(JPNTR) DO 140 K = K1, KKK - M1 + 1, M1 DO 130 L = K, K + M1 - 1 MAT(L) = ILLIST(MATPNT) 130 CONTINUE -C + C UPDATE THE POINTER TO THE NEXT MATERIAL -C + MATPNT = MATPNT + 1 IF (MATPNT .GT. IFLINE(JPNTR) + NLPS(JPNTR) - 1) & MATPNT = IFLINE(JPNTR) @@ -115,9 +104,9 @@ SUBROUTINE RDMESH (NPNODE, NPELEM, NPNBC, NPSBC, NPREGN, MS, MR, ELSE WRITE(*, 10000) IABS(KMAT), ISIDE(JPNTR) END IF -C + C PUT THE NEW MATERIALS INTO THE MATERIAL ARRAYS -C + DO 170 MATPNT = IFLINE(JPNTR), & IFLINE(JPNTR) + NLPS(JPNTR) - 1 DO 150 K = 1, NUMMAT @@ -128,9 +117,9 @@ SUBROUTINE RDMESH (NPNODE, NPELEM, NPNBC, NPSBC, NPREGN, MS, MR, 160 CONTINUE 170 CONTINUE ELSE -C + C JUST INPUT THE ONE MATERIAL -C + DO 180 K = K1, KKK MAT(K) = KMAT 180 CONTINUE @@ -141,15 +130,15 @@ SUBROUTINE RDMESH (NPNODE, NPELEM, NPNBC, NPSBC, NPREGN, MS, MR, MATMAP(1, NUMMAT) = KMAT END IF 200 CONTINUE -C + C READ THE NODAL BOUNDARY CONDITIONS -C + NNNBC1 = NNNBC + 1 NNNBC = NNNBC + NNBCRG IF (NNBCRG .GE. 1) READ(IUNIT)(LSTNBC(I), I = NNNBC1, NNNBC) -C + C READ THE SIDE BOUNDARY CONDITIONS -C + NNSBC1 = NNSBC + 1 NNSBC = NNSBC + NSBCRG IF (NSBCRG .GE. 1) THEN @@ -159,9 +148,9 @@ SUBROUTINE RDMESH (NPNODE, NPELEM, NPNBC, NPSBC, NPREGN, MS, MR, 210 CONTINUE END IF 220 CONTINUE -C + RETURN -C + 230 CONTINUE CALL MESAGE ('PREMATURE END OF FILE ON MESH READ') CALL MESAGE ('CHECK MESH PROCESSING OUTPUT TO DETERMINE') @@ -170,9 +159,9 @@ SUBROUTINE RDMESH (NPNODE, NPELEM, NPNBC, NPSBC, NPREGN, MS, MR, NNN = 0 KKK = 0 RETURN -C + 10000 FORMAT(' THE ALTERNATING MATERIAL NUMBERS FOR REGION(S) WITH', /, & ' NEGATIVE MATERIAL NUMBER:', I5, ' DO NOT CORRESPOND TO A',/, & ' VALID SIDE NUMBER:', I5, ' WITH AT LEAST TWO LINES.') -C + END diff --git a/packages/seacas/applications/fastq/refrsh.F b/packages/seacas/applications/fastq/refrsh.F index 8be7e002edd6..00c7229ab161 100644 --- a/packages/seacas/applications/fastq/refrsh.F +++ b/packages/seacas/applications/fastq/refrsh.F @@ -1,45 +1,24 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: refrsh.F,v 1.1 1998/04/10 04:30:23 gdsjaar Exp $ -C $Log: refrsh.F,v $ -C Revision 1.1 1998/04/10 04:30:23 gdsjaar -C Added the ifdef needsdoubleescape to the graphics symbol -C plotting. Required moving some .f to .F files and specifying in Imakefile -C -C Revision 1.2 1991/03/22 19:44:09 gdsjaar -C Initialized ADDLNK to .FALSE. -C -c Revision 1.1.1.1 1990/11/30 11:14:34 gdsjaar -c FASTQ Version 2.0X -c -c Revision 1.1 90/11/30 11:14:33 gdsjaar -c Initial revision -c -C -CC* FILE: [.MAIN]REFRSH.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE REFRSH (MP, ML, MS, MR, MSNAP, N, COOR, ILINE, LTYPE, & LCON, NLPS, IFLINE, ILLIST, NSPR, IFSIDE, ISLIST, LINKP, LINKL, & LINKS, LINKR, TITLE, X1, X2, Y1, Y2, ALPHA, SNAP, SNAPDX, & NSNAP, SNAPDR, TALL, X11, X22, Y11, Y22, AXIST) C*********************************************************************** -C + C SUBROUTINE REFRSH = REPAINTS THE DIGITIZING SCREEN WITH SNAP LINES -C + C*********************************************************************** -C + C SUBROUTINE CALLED BY: C DIGIT = A SUBROUTINE TO DIGITIZE GEOMETRY -C + C*********************************************************************** -C + DIMENSION COOR(2, MP), ILINE(ML), LTYPE(ML), LCON(3, ML) DIMENSION NLPS(MS), IFLINE(MS), ILLIST(MS*3) DIMENSION NSPR(MR), IFSIDE(MR), ISLIST(MR*4) @@ -47,12 +26,12 @@ SUBROUTINE REFRSH (MP, ML, MS, MR, MSNAP, N, COOR, ILINE, LTYPE, DIMENSION LINKR(2, MR) DIMENSION XDUM(2), YDUM(2) DIMENSION N(28), SNAPDX(2, MSNAP), NSNAP(2) -C + CHARACTER*72 TITLE -C + LOGICAL ALPHA, SNAP, SNAPDR, CPUIFC, AXIST LOGICAL ADDLNK, GETMAX, NUMPLT, TEST -C + ADDLNK = .FALSE. IF (.NOT.ALPHA)THEN @@ -94,9 +73,9 @@ SUBROUTINE REFRSH (MP, ML, MS, MR, MSNAP, N, COOR, ILINE, LTYPE, Y22 = Y22 + (YDIMR*SHRINK) CALL MPORT2 (X11, X22, Y11, Y22) CALL PLTFRM (0) -C + C PLOT THE TITLE -C + CALL STRLNG (TITLE, LEN) IF ((LEN.GT.1).OR. (TITLE (1:1).NE.' '))THEN CALL PLTXHL (TITLE(1:LEN), XLEN) @@ -105,43 +84,43 @@ SUBROUTINE REFRSH (MP, ML, MS, MR, MSNAP, N, COOR, ILINE, LTYPE, IF (CPUIFC (.TRUE.) )RETURN ENDIF CALL PLTFLU -C + C PLOT THE GRID LINES IF APPLICABLE -C + IF (SNAP)THEN SNAPDR = .TRUE. CALL PLTSTD (1, 4.) -C + C PLOT THE X GRID LINES -C + YBOT = SNAPDX(2, 1) YTOP = SNAPDX(2, NSNAP(2)) DO 100 I = 1, NSNAP(1) CALL D2GRID (SNAPDX(1, I), YBOT, SNAPDX(1, I), YTOP) IF (CPUIFC (.TRUE.) )RETURN 100 CONTINUE -C + C PLOT THE Y GRID LINES -C + XLEFT = SNAPDX(1, 1) XRIGHT = SNAPDX(1, NSNAP(1)) DO 110 I = 1, NSNAP(2) CALL D2GRID (XLEFT, SNAPDX(2, I), XRIGHT, SNAPDX(2, I)) IF (CPUIFC(.TRUE.) )RETURN 110 CONTINUE -C + CALL PLTSTD (1, 7.) ELSE SNAPDR = .FALSE. ENDIF -C + C PLOT THE AXIS IF APPLICABLE -C + IF (AXIST) CALL SETAXS(XDUM,YDUM) IF (CPUIFC(.TRUE.) )RETURN -C + C PLOT POINTS ALREADY IN THE DATABASE -C + CALL PLTSTT (2, TALL*.5) CALL PLTSTD (1, 3.) DO 120 I = 1, N(18) @@ -155,9 +134,9 @@ SUBROUTINE REFRSH (MP, ML, MS, MR, MSNAP, N, COOR, ILINE, LTYPE, ENDIF IF (CPUIFC (.TRUE.) )RETURN 120 CONTINUE -C + C PLOT LINES ALREADY IN THE DATABASE -C + KNUM = 0 CALL PLTSTD (1, 7.) COLOR = 7. @@ -181,9 +160,9 @@ SUBROUTINE REFRSH (MP, ML, MS, MR, MSNAP, N, COOR, ILINE, LTYPE, ENDIF ENDIF 130 CONTINUE -C + C PLOT REGIONS ALREADY IN THE DATABASE -C + CALL PLTSTD (1, 3.) DO 140 I = 1, N(22) CALL LTSORT (MR, LINKR, I, II, ADDLNK) @@ -202,7 +181,7 @@ SUBROUTINE REFRSH (MP, ML, MS, MR, MSNAP, N, COOR, ILINE, LTYPE, ENDIF 140 CONTINUE ENDIF -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/regext.f b/packages/seacas/applications/fastq/regext.f index 66a64b6c5690..71d92ad939a2 100644 --- a/packages/seacas/applications/fastq/regext.f +++ b/packages/seacas/applications/fastq/regext.f @@ -1,38 +1,18 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: regext.f,v 1.2 1999/06/17 19:02:22 gdsjaar Exp $ -C $Log: regext.f,v $ -C Revision 1.2 1999/06/17 19:02:22 gdsjaar -C Fixed several problems related to holes. In several places, a -C nonpositive integer was being used to index into an array. This seems -C to fix all of those cases. I'm not sure if I fixed the true cause of -C these errors or just the symptom though... -C -C Revision 1.1.1.1 1990/11/30 11:14:37 gdsjaar -C FASTQ Version 2.0X -C -c Revision 1.1 90/11/30 11:14:36 gdsjaar -c Initial revision -c -C -CC* FILE: [.MAIN]REGEXT.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE REGEXT (MP, ML, MS, MR, N, II, COOR, ILINE, LTYPE, & LCON, NLPS, IFLINE, ILLIST, NSPR, IFSIDE, ISLIST, LINKP, & LINKL, LINKS, LINKR, XMIN, XMAX, YMIN, YMAX) C*********************************************************************** -C + C SUBROUTINE REGEXT = GETS THE REGION EXTREMES -C + C*********************************************************************** -C + DIMENSION COOR (2, MP) DIMENSION ILINE (ML), LTYPE (ML), LCON (3, ML) DIMENSION NLPS (MS), IFLINE (MS), ILLIST (MS * 3) @@ -40,18 +20,18 @@ SUBROUTINE REGEXT (MP, ML, MS, MR, N, II, COOR, ILINE, LTYPE, DIMENSION LINKP (2, MP), LINKL (2, ML), LINKS (2, MS) DIMENSION LINKR (2, MR) DIMENSION N (29) -C + LOGICAL FOUND, GETMAX, ADDLNK LOGICAL NUMPLT, TEST -C + ADDLNK = .FALSE. GETMAX = .TRUE. FOUND = .FALSE. -C + DO 110 J = IFSIDE (II), IFSIDE (II) + NSPR (II) - 1 -C + C GET SIDE EXTREMES -C + IF ( ISLIST(J) .GT. 0) THEN CALL LTSORT (MS, LINKS, ISLIST (J), IPNTR, ADDLNK) IF (IPNTR .GT. 0) THEN @@ -79,9 +59,9 @@ SUBROUTINE REGEXT (MP, ML, MS, MR, N, II, COOR, ILINE, LTYPE, ENDIF 100 CONTINUE END IF -C + C GET LINE EXTREMES -C + ELSEIF (ISLIST (J) .LT. 0) THEN JJ = IABS (ISLIST (J)) CALL LTSORT (ML, LINKL, JJ, KK, ADDLNK) @@ -106,7 +86,7 @@ SUBROUTINE REGEXT (MP, ML, MS, MR, N, II, COOR, ILINE, LTYPE, ENDIF ENDIF 110 CONTINUE -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/renum.f b/packages/seacas/applications/fastq/renum.f index 7cc77bebcadc..394dad310d8e 100644 --- a/packages/seacas/applications/fastq/renum.f +++ b/packages/seacas/applications/fastq/renum.f @@ -1,16 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: renum.f,v 1.6 2005/06/23 20:18:44 gdsjaar Exp $ -C -CC* FILE: [.RENUM]RENUM.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE RENUM (NPNODE, NPELEM, MXNFLG, MXSFLG, NPNBC, NPSBC, & NPWTS, NPREGN, MP, ML, MS, MR, MSC, MAXKXN, NNUID, NNXK, & MXLPS, IUNIT, NNN, KKK, KCRD, NL, NPBF, NLBF, NSBF, IPART, @@ -24,17 +17,17 @@ SUBROUTINE RENUM (NPNODE, NPELEM, MXNFLG, MXSFLG, NPNBC, NPSBC, & IWTSBF, LINKPB, LINKLB, LINKSB, NUMBER, THREE, EIGHT, NINE, & OPTIM, ISBARS) C*********************************************************************** -C + C SUBROUTINE RENUM = NUMBERS QMESH OUTPUT, AND RENUMBERS AS NEEDED FOR C OPTIMIZATION -C + C*********************************************************************** -C + C THE REFERENCE DOCUMENTS FOR THIS CODE ARE SLA-73-1088, JULY 1974, C AND SLA-74-0239, JULY 1974 -C + C*********************************************************************** -C + DIMENSION NLIST(20), IPART(3, NPREGN) DIMENSION COOR(2, MP), ILINE(ML), LTYPE(ML), LCON(3, ML) DIMENSION ISIDE(MS), NLPS(MS), IFLINE(MS), ILLIST(MS*3) @@ -46,33 +39,33 @@ SUBROUTINE RENUM (NPNODE, NPELEM, MXNFLG, MXSFLG, NPNBC, NPSBC, DIMENSION ISBF(ML), NSPF(ML), IFSB(ML), LISTSB(2, ML) DIMENSION IWTPBF(3, MP), IWTLBF(3, ML), IWTSBF(3, ML) DIMENSION LINKPB(2, MP), LINKLB(2, ML), LINKSB(2, ML) -C + DIMENSION LIST(NNUID), LISTN(NNUID), NUID(NNUID), XN(NPNODE) DIMENSION YN(NPNODE), NXK(NNXK, NPELEM), MAT(NPELEM) DIMENSION KXN(NNXK, MAXKXN), LA(NPNODE), LB(NPNODE) DIMENSION IHERE(NNUID), ILIST(MXLPS), XLIST(MXLPS) -C + DIMENSION LSTNBC(NPNBC), LSTSBC(NPSBC), NSIDEN(NPSBC) DIMENSION NNFLG(MXNFLG), NNLEN(MXNFLG), NNPTR(MXNFLG) DIMENSION NSFLG(MXSFLG), NSLEN(MXSFLG), NSPTR(MXSFLG) DIMENSION WTHOLD(NPWTS), WTNODE(NPNBC), WTSIDE(NPSBC) DIMENSION NVLEN(MXSFLG), NVPTR(MXSFLG), MATMAP(3, NPREGN) -C + DIMENSION KLIST(20) -C + LOGICAL OPTIM, ERR, NOROOM, ALL, THREE, EIGHT, NINE LOGICAL ITSOK, ISBARS -C + CHARACTER*80 NUMBER(MSC) -C + C HEADER -C + CALL MESAGE (' ') CALL MESAGE ('NUMBERING OF GENERATED OUTPUT BEGUN') IF (OPTIM) CALL MESAGE (' -- OPTIMIZATION IS ENABLED --') -C + C READ THE MESH TAPE -C + CALL RDMESH (NPNODE, NPELEM, NPNBC, NPSBC, NPREGN, MS, MR, NNUID, & NNXK, IUNIT, NNN, KKK, IPART, LSTNBC, LSTSBC, NUID, XN, YN, & NXK, MAT, MATMAP, NUMMAT, ISIDE, NLPS, IFLINE, ILLIST, LINKS, @@ -81,9 +74,9 @@ SUBROUTINE RENUM (NPNODE, NPELEM, MXNFLG, MXSFLG, NPNBC, NPSBC, CALL MESAGE ('** NUMBERING ABORT **') RETURN END IF -C + C SORT NODE LIST INTO INCREASING NUID-S -C + DO 100 I = 1, NNN LISTN(I) = NUID(I) 100 CONTINUE @@ -95,10 +88,10 @@ SUBROUTINE RENUM (NPNODE, NPELEM, MXNFLG, MXSFLG, NPNBC, NPSBC, 110 CONTINUE CALL SORT (NNN, NUID, LIST) END IF -C + C CONVERT REFERENCES TO NUID-S TO REFERENCES TO C SEQUENCE NUMBERS -C + DO 130 I = 1, 4 DO 120 K = 1, KKK IF (NXK(I, K) .GT. 0) THEN @@ -117,7 +110,7 @@ SUBROUTINE RENUM (NPNODE, NPELEM, MXNFLG, MXSFLG, NPNBC, NPSBC, END IF 120 CONTINUE 130 CONTINUE -C + IF (NNNBC .GT. 0) THEN DO 140 I = 1, NNNBC IF (LSTNBC(I) .GT. 0) THEN @@ -136,16 +129,16 @@ SUBROUTINE RENUM (NPNODE, NPELEM, MXNFLG, MXSFLG, NPNBC, NPSBC, END IF 140 CONTINUE END IF -C + C BUILD KXN ARRAY -C + NUMKXN = NNN DO 160 I = 1, NNXK DO 150 J = 1, MAXKXN KXN(I, J) = 0 150 CONTINUE 160 CONTINUE -C + DO 180 I = 1, 4 DO 170 K = 1, KKK IF (NXK(I, K) .GT. 0) THEN @@ -160,9 +153,9 @@ SUBROUTINE RENUM (NPNODE, NPELEM, MXNFLG, MXSFLG, NPNBC, NPSBC, 170 CONTINUE 180 CONTINUE IF (OPTIM) THEN -C + C GET STARTING LIST FOR CUTHILL-MCKEE PROCESS -C + IF (KCRD .GT. 0) THEN CALL GNLIST (NPNODE, NNUID, MSC, NPNODE, NPELEM, MAXKXN, & NNXK, KXN, NXK, NUID, XN, YN, LIST, NUML, NUMBER, KCRD, @@ -186,25 +179,25 @@ SUBROUTINE RENUM (NPNODE, NPELEM, MXNFLG, MXSFLG, NPNBC, NPSBC, NUML = 1 LIST(1) = 1 END IF -C + C INITIALIZE LISTS -C + DO 190 I = 1, NNN LISTN(I) = I 190 CONTINUE -C + C USE LISTN AS A CHECK ON WHETHER THE NODE HAS BEEN USED (NEGATED) -C + DO 200 I = 1, NUML LA(I) = LIST(I) NODE = LIST(I) LISTN(NODE) = -LISTN(NODE) 200 CONTINUE -C + NUMA = NUML -C + C CREATE LIST OF NEW NODES CONNECTED TO LIST A -C + 210 CONTINUE NUMB = 0 DO 230 N = 1, NUMA @@ -233,31 +226,31 @@ SUBROUTINE RENUM (NPNODE, NPELEM, MXNFLG, MXSFLG, NPNBC, NPSBC, END IF 230 CONTINUE IF (NUMB .GT. 0) THEN -C + C INCLUDE LIST B INTO FULL LIST C ALSO TRANSFER LIST B TO LIST A -C + DO 240 I = 1, NUMB NUML = NUML + 1 LIST(NUML) = LB(I) LA(I) = LB(I) 240 CONTINUE NUMA = NUMB -C + C CHECK FOR CONVERGENCE -C + IF (NUML .LT. NNN) GO TO 210 -C + C PROCESS HAS CONVERGED C CHECK IF ALL NODES WERE COVERED -C + ELSE IF (NUML .LT. NNN) THEN -C + DO 250 I = 1, NNN IF (LISTN(I) .GT. 0) THEN -C + C START THE LIST AGAIN WITH THE MISSED NODE -C + CALL MESAGE ('A DISCONTINUITY (SLIDE LINE) IN THE '// & 'BODY HAS BEEN FOUND') CALL MESAGE @@ -267,33 +260,33 @@ SUBROUTINE RENUM (NPNODE, NPELEM, MXNFLG, MXSFLG, NPNBC, NPSBC, GO TO 210 END IF 250 CONTINUE -C + C DEFINITE ERROR IN THE NUMBERING PROCESS -C + CALL MESAGE ('ALL NODES COULD NOT BE FOUND TO NUMBER') CALL MESAGE (' *** NO MESH SAVED ***') CALL MESAGE (' ** NUMBERING ABORT **') KKK = 0 RETURN END IF -C + C PREPARE TO PUT NODE LIST INTO NEWLY DETERMINED ORDER C LISTN BECOMES THE POINTER FROM THE OLD NUMBER TO THE NEW -C + DO 260 I = 1, NNN J = LIST(I) LISTN(J) = I 260 CONTINUE -C + C CONVERT NODE NUMBERS TO NEW NODE ORDER BY REDOING THE NXK ARRAY -C + DO 280 I = 1, 4 DO 270 K = 1, KKK J = NXK(I, K) IF (J .GT. 0) NXK(I, K) = LISTN(J) 270 CONTINUE 280 CONTINUE -C + IF (NNNBC .GT. 0) THEN DO 290 I = 1, NNNBC IF (LSTNBC(I) .GT. 0) THEN @@ -302,20 +295,20 @@ SUBROUTINE RENUM (NPNODE, NPELEM, MXNFLG, MXSFLG, NPNBC, NPSBC, END IF 290 CONTINUE END IF -C + C PUT NODE LIST INTO NEW ORDER -C + CALL NODORD (NPNODE, XN, YN, LISTN, NUID, NNN) -C + C REBUILD KXN ARRAY -C + NUMKXN = NNN DO 310 I = 1, NNXK DO 300 J = 1, MAXKXN KXN(I, J) = 0 300 CONTINUE 310 CONTINUE -C + DO 330 I = 1, 4 DO 320 K = 1, KKK IF (NXK(I, K) .GT. 0) THEN @@ -329,9 +322,9 @@ SUBROUTINE RENUM (NPNODE, NPELEM, MXNFLG, MXSFLG, NPNBC, NPSBC, END IF 320 CONTINUE 330 CONTINUE -C + C PUT ELEMENT NUMBERING INTO NEW ORDER USING LA AS TEMPORARY STORAGE -C + DO 340 I = 1, KKK LA(I) = 0 LB(I) = 0 @@ -348,60 +341,60 @@ SUBROUTINE RENUM (NPNODE, NPELEM, MXNFLG, MXSFLG, NPNBC, NPSBC, END IF 350 CONTINUE 360 CONTINUE -C + C END OF OPTIMIZATION -C + ELSE DO 370 I = 1, NNN NUID(I) = LISTN(I) 370 CONTINUE END IF -C + C STICK LSTNBC INTO LISTN AS A WORK ARRAY FOR SORTING NODAL BOUNDARY C CONDITIONS LISTS -C + IF (NNNBC .GT. 0) THEN DO 380 I = 1, NNNBC LISTN(I) = LSTNBC(I) 380 CONTINUE -C + C SORT THROUGH LSTNBC AND RECREATE IT IN PLACE C USING LISTN AS THE ARRAY TO TAKE LSTNBC OVER C AND IHERE AS A WORK ARRAY C (LSTNBC NOW BECOMES THE NODES ARRAY FOR THE C GENESIS DATA BASE) -C + CALL SRTNBC (MXNFLG, NPNBC, NNN, NNFLG, NNLEN, NNPTR, LSTNBC, & LISTN, IHERE, NNNBC, NBCNOD, NNLIST) ELSE NNLIST = 0 NBCNOD = 0 END IF -C + C SORT THROUGH LSTSBC AND RECREATE IT IN PLACE C USING LISTN AS THE ARRAY TO TAKE LSTSBC OVER C AND KXN AS A WORK ARRAY C (LSTSBC NOW BECOMES THE NELEMS ARRAY FOR THE C GENESIS DATA BASE) -C + IF (NNSBC .GT. 0) THEN DO 390 I = 1, NNSBC LISTN(I) = LSTSBC(I) 390 CONTINUE -C + CALL SRTSBC (MXSFLG, NPSBC, NPELEM, NNXK, NXK, NSFLG, NSLEN, & NSPTR, NVLEN, NVPTR, LISTN, LSTSBC, NSIDEN, IHERE, NNSBC, & NSLIST, NVLIST, NBCSID) -C + ELSE NBCSID = 0 NSLIST = 0 NVLIST = 0 END IF -C + C PUT WEIGHTS ON FLAGGED NODES AS NEEDED C USE THE IHERE ARRAY AS A WORK ARRAY -C + CALL ADDWT (NNUID, NNXK, MAXKXN, NPNODE, NPELEM, MXLPS, MP, ML, & MS, NPNBC, NPSBC, MXNFLG, MXSFLG, NPWTS, COOR, ILINE, LTYPE, & LCON, ISIDE, NLPS, IFLINE, ILLIST, LINKP, LINKL, LINKS, IPBF, @@ -410,21 +403,21 @@ SUBROUTINE RENUM (NPNODE, NPELEM, MXNFLG, MXSFLG, NPNBC, NPSBC, & YN, NUID, NXK, KXN, LSTNBC, NNFLG, NNPTR, NNLEN, NSFLG, NVPTR, & NVLEN, NSIDEN, WTNODE, WTSIDE, WTHOLD, NBCNOD, NNLIST, NBCSID, & NSLIST, NVLIST, ILIST, XLIST) -C + C SORT NUMBERS ACCORDING TO MATERIAL TYPE C USE KXN AS A WORK ARRAY -C + DO 410 J = 1, 4 DO 400 I = 1, KKK KXN(J, I) = NXK(J, I) 400 CONTINUE 410 CONTINUE -C + C SET UP THE MATERIAL MAPPING ARRAY C MATMAP(1, I) = THE MATERIAL ID FOR THE I'TH BLOCK C MATMAP(2, I) = THE FIRST ELEMENT IN THE I'TH BLOCK C MATMAP(3, I) = THE LAST ELEMENT IN THE I'TH BLOCK -C + KOUNT = 1 DO 440 I = 1, NUMMAT KMAT = MATMAP(1, I) @@ -447,72 +440,72 @@ SUBROUTINE RENUM (NPNODE, NPELEM, MXNFLG, MXSFLG, NPNBC, NPSBC, KKK = 0 RETURN END IF -C + C REDO THE REGION POINTER ARRAY -C + DO 450 I = 1, NPREGN IPART(2, I) = LISTN(IPART(2, I)) IPART(3, I) = LISTN(IPART(3, I)) 450 CONTINUE -C + C REDO THE MATERIAL ARRAY -C + DO 470 I = 1, NUMMAT DO 460 J = MATMAP(2, I), MATMAP(3, I) MAT(J) = MATMAP(1, I) 460 CONTINUE 470 CONTINUE -C + C REDO THE MAPPING ARRAY IF OPTIMIZING RENUMBERING HAS BEEN DONE -C + IF (OPTIM) THEN DO 480 I = 1, KKK LA(I) = LISTN(LA(I)) 480 CONTINUE END IF -C + C REDO THE ELEMENT SIDE BOUNDARY LISTING WITH THE CURRENT ELEMENT NO. -C + DO 490 I = 1, NSLIST LSTSBC(I) = LISTN(LSTSBC(I)) 490 CONTINUE -C + C STORE THE LISTN POINTER SYSTEM FOR NOW -C + DO 500 I = 1, KKK LIST(I) = LISTN(I) 500 CONTINUE -C + C ADD THE MID-SIDE NODES IF EIGHT OR NINE NODE QUADS ARE WANTED C OR IF THREE NODE BARS ARE WANTED -C + IF ((EIGHT) .OR. (NINE) .OR. (THREE)) THEN -C + C FLAG ALL ELEMENT SIDES ONLY ONCE (NO SHARED SIDE FLAGGED) -C + CALL NXKBDY (NNXK * MAXKXN, NNXK, NPELEM, NXK, KKK, KXN, & THREE, EIGHT, NINE) -C + C CREATE THE MIDSIDE NODES -C + CALL MIDNOD (NPNODE, NNUID, NPELEM, NNXK, MP, ML, KKK, NNN, & NALL, NL, NXK, NUID, XN, YN, LISTN, COOR, ILINE, LTYPE, & LCON, LINKP, LINKL, THREE, EIGHT, NINE) -C + C MODIFY THE IDENTIFIERS OF THE OLD NODES -C + DO 510 I = 1, NNN LISTN(I) = I * 100000 510 CONTINUE NNN = NALL -C + C ORDER THE EXPANDED NODE LIST -C + CALL NODORD (NPNODE, XN, YN, LISTN, NUID, NNN) -C + C EXPAND THE CONNECTIVITY ARRAY TO INCLUDE THE MIDSIDE NODES C WHILE REPOSITIONING THE CORNER NODES INTO PROPER SEQUENCE -C + DO 540 I = 1, KKK IF ((THREE) .AND. (NXK (3, I) .EQ. 0)) THEN ITSOK = .TRUE. @@ -528,9 +521,9 @@ SUBROUTINE RENUM (NPNODE, NPELEM, MXNFLG, MXSFLG, NPNBC, NPSBC, IF (JJ .EQ. 5) JJ = 1 NODEA = IABS(NXK(J, I)) NODEB = IABS(NXK(JJ, I)) -C + C CHECK FOR 3 NODE BAR ELEMENTS -C + IF ((NODEA .GT. 0) .AND. (NODEB .GT. 0)) THEN NXK (J * 2 - 1, I) = NODEA * 100000 NLO = MIN0(NODEA, NODEB) @@ -546,10 +539,10 @@ SUBROUTINE RENUM (NPNODE, NPELEM, MXNFLG, MXSFLG, NPNBC, NPSBC, 530 CONTINUE ENDIF 540 CONTINUE -C + C GET THE LIST OF NODAL BOUNDARY FLAGS EXTENDED AND THE NEW IDENTIFIERS C IN PLACE (USE NUID AND WTHOLD AS WORK ARRAYS) -C + IF (NBCNOD .GT. 0) THEN KOUNT = 0 DO 570 I = 1, NBCNOD @@ -578,10 +571,10 @@ SUBROUTINE RENUM (NPNODE, NPELEM, MXNFLG, MXSFLG, NPNBC, NPSBC, WTNODE(I) = WTHOLD(I) 580 CONTINUE END IF -C + C GET THE LIST OF SIDE BOUNDARY FLAGS EXTENDED AND THE NEW IDENTIFIERS C IN PLACE (USE NUID, WTHOLD, AND KXN AS WORK ARRAYS) -C + IF (NBCSID .GT. 0) THEN KOUNT = 0 KOUNT2 = 0 @@ -598,9 +591,9 @@ SUBROUTINE RENUM (NPNODE, NPELEM, MXNFLG, MXSFLG, NPNBC, NPSBC, KOUNT2 = KOUNT2 + 1 NUID(KOUNT2) = NSIDEN(J) * 100000 WTHOLD(KOUNT2) = WTSIDE(J) -C + C DO THE ADJUSTMENTS IF THE ELEMENT IS ONE THAT HAS BEEN EXPANDED -C + IF ( ((THREE) .AND. (NXK (4, KELEM) .EQ. 0)) .OR. & ( ((EIGHT) .OR. (NINE)) .AND. & (NXK (4, KELEM) .NE. 0) ) ) THEN @@ -628,9 +621,9 @@ SUBROUTINE RENUM (NPNODE, NPELEM, MXNFLG, MXSFLG, NPNBC, NPSBC, NVPTR(I) = NVPTR(I - 1) + NVLEN(I - 1) ENDIF 600 CONTINUE -C + C TRANSFER THE ELEMENT BOUNDARIES BACK FROM THE WORK ARRAYS -C + NSLIST = KOUNT DO 610 I = 1, NSLIST LSTSBC(I) = KXN(1, I) @@ -641,15 +634,15 @@ SUBROUTINE RENUM (NPNODE, NPELEM, MXNFLG, MXSFLG, NPNBC, NPSBC, WTSIDE(I) = WTHOLD(I) 620 CONTINUE END IF -C + C ADD A CENTER NODE TO THE NODE LIST IF NEEDED -C + IF (NINE) THEN NOLD = NNN DO 630 I = 1, KKK -C + C WATCH OUT FOR 3 NODE BAR ELEMENTS -C + IF (.NOT. ISBARS .OR. NXK(4, I) .GT. 0) THEN N2 = INDX(NOLD, LISTN, NXK(2, I)) N4 = INDX(NOLD, LISTN, NXK(4, I)) @@ -681,9 +674,9 @@ SUBROUTINE RENUM (NPNODE, NPELEM, MXNFLG, MXSFLG, NPNBC, NPSBC, write (*,*) 'Element ', i, ' is a 3-node bar?' END IF 630 CONTINUE -C + C NOW, ORDER THE EXPANDED NODE LIST AGAIN -C + CALL NODORD (NPNODE, XN, YN, LISTN, NUID, NNN) IEND = 9 ELSEIF (EIGHT) THEN @@ -691,16 +684,16 @@ SUBROUTINE RENUM (NPNODE, NPELEM, MXNFLG, MXSFLG, NPNBC, NPSBC, ELSE IEND = 4 END IF -C + C NOW REPLACE THE NODE REFERENCES WITH AN EXPANDED ORDER NUMBER -C + C FIRST FIX THE CONNECTIVITY (NXK ARRAY) -C + DO 650 I = 1, IEND DO 640 K = 1, KKK -C + C AGAIN, WATCH OUT FOR 3 NODE BAR ELEMENTS -C + IF (.NOT. ISBARS .OR. NXK(I, K) .GT. 0) THEN NEW = INDX(NNN, LISTN, NXK(I, K)) IF (NEW .EQ. 0) THEN @@ -713,9 +706,9 @@ SUBROUTINE RENUM (NPNODE, NPELEM, MXNFLG, MXSFLG, NPNBC, NPSBC, END IF 640 CONTINUE 650 CONTINUE -C + C NOW FIX THE NODE BOUNDARY FLAGS -C + IF (NBCNOD .GT. 0) THEN DO 660 I = 1, NNLIST NEW = INDX(NNN, LISTN, LSTNBC(I)) @@ -728,9 +721,9 @@ SUBROUTINE RENUM (NPNODE, NPELEM, MXNFLG, MXSFLG, NPNBC, NPSBC, LSTNBC(I) = NEW 660 CONTINUE END IF -C + C NOW FIX THE SIDE BOUNDARY FLAGS -C + IF (NBCSID .GT. 0) THEN DO 670 I = 1, NVLIST NEW = INDX(NNN, LISTN, NSIDEN(I)) @@ -744,9 +737,9 @@ SUBROUTINE RENUM (NPNODE, NPELEM, MXNFLG, MXSFLG, NPNBC, NPSBC, 670 CONTINUE END IF END IF -C + C RENUMBERING COMPLETED -C + CALL MESAGE (' ') CALL MESAGE ('**************************************************') CALL MESAGE ('** MESH PROCESSING COMPLETED **') @@ -764,9 +757,9 @@ SUBROUTINE RENUM (NPNODE, NPELEM, MXNFLG, MXSFLG, NPNBC, NPSBC, IF (OPTIM) THEN CALL MESAGE & ('** WITH NODE AND ELEMENT NUMBERING OPTIMIZED **') -C + C FIND LARGEST NODE DIFFERENCE FOR AN ELEMENT -C + LWID = 0 DO 680 K = 1, KKK N1 = NXK(1, K) @@ -798,10 +791,10 @@ SUBROUTINE RENUM (NPNODE, NPELEM, MXNFLG, MXSFLG, NPNBC, NPSBC, END IF WRITE(*, 10010) NNN, KKK, NUMMAT CALL MESAGE ('**************************************************') -C + C RESTORE THE NUID ARRAY AS A POINTER ARRAY OF OLD TO NEW ELEMENTS C (MAPDXG ARRAY) -C + IF (OPTIM) THEN DO 690 I = 1, KKK NUID(I) = LA(I) @@ -813,11 +806,11 @@ SUBROUTINE RENUM (NPNODE, NPELEM, MXNFLG, MXSFLG, NPNBC, NPSBC, LIST(I) = I 700 CONTINUE END IF -C + RETURN -C + 10000 FORMAT(' ** LARGEST NODE DIFFERENCE PER ELEMENT:', I6, ' **') 10010 FORMAT(' ** NODES:', I6, '; ELEMENTS:', I6, '; MATERIALS:', I3, & ' **') -C + END diff --git a/packages/seacas/applications/fastq/repsmo.f b/packages/seacas/applications/fastq/repsmo.f index f6a5a141a09d..33a433e5e67b 100644 --- a/packages/seacas/applications/fastq/repsmo.f +++ b/packages/seacas/applications/fastq/repsmo.f @@ -1,72 +1,52 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: repsmo.f,v 1.2 1998/07/14 18:19:56 gdsjaar Exp $ -C $Log: repsmo.f,v $ -C Revision 1.2 1998/07/14 18:19:56 gdsjaar -C Removed unused variables, cleaned up a little. -C -C Changed BLUE labels to GREEN to help visibility on black background -C (indirectly requested by a couple users) -C -C Revision 1.1.1.1 1990/11/30 11:14:46 gdsjaar -C FASTQ Version 2.0X -C -c Revision 1.1 90/11/30 11:14:44 gdsjaar -c Initial revision -c -C -CC* FILE: [.QMESH]REPSMO.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE REPSMO (MXND, XN, YN, LXN, NNN, NNNOLD, NIT, EPS, RO, & M1) C*********************************************************************** -C + C SUBROUTINE REPSMO = SMOOTHS A MESH GENERATED BY RMESH BY THE C EQUIPOTENTIAL, OR WEIGHTED LAPLACIAN METHOD. C GAUSS-SEIDEL TYPE RELAXATION IS USED. C REFERENCE--MESH GENERATION-A SURVEY, BY BUELL AND BUSH, F.M.C. -C + C*********************************************************************** -C + C NIT - MAX NUMBER OF ITERATIONS C EPS - CONVERGENCE CRITERION FOR NODE MOVEMENTS C RO - RELAXATION FACTOR (USUALLY 1.0 OR LARGER) C M1 - SAME AS M1 GIVEN TO RMESH. THE MESH MUST BE LOGICALLY C EXACTLY AS PRODUCED BY RMESH. -C + C*********************************************************************** -C + DIMENSION LXN (4, MXND), XN (MXND), YN (MXND) -C + LOGICAL BIG -C + EPS2 = (EPS*RO)**2 NROW = M1 + 1 -C + C ITERATION LOOP -C + DO 110 IT = 1, NIT BIG = .FALSE. -C + C NODE LOOP -C + DO 100 NODE = NNNOLD + 1, NNN -C + C SKIP BOUNDARY NODES -C + IF (LXN (2, NODE) .GT. 0) THEN NT = NODE + NROW NB = NODE - NROW -C + C COMPUTE WEIGHTS -C + XPHI = 0.5* (XN (NT) - XN (NB)) YPHI = 0.5* (YN (NT) - YN (NB)) XPSI = 0.5* (XN (NODE + 1) - XN (NODE - 1)) @@ -75,9 +55,9 @@ SUBROUTINE REPSMO (MXND, XN, YN, LXN, NNN, NNNOLD, NIT, EPS, RO, GAMMA = XPHI**2 + YPHI**2 BETA2 = (XPHI*XPSI + YPHI*YPSI)*0.5 WEIGHT = 2.0* (ALPHA + GAMMA) -C + C COMPUTE WEIGHTED SUM OF COORDINATES -C + XSUM = ALPHA * (XN (NT) + XN (NB)) & + GAMMA * (XN (NODE - 1) + XN (NODE + 1)) & + BETA2 * (XN (NT - 1) + XN (NB + 1) @@ -86,9 +66,9 @@ SUBROUTINE REPSMO (MXND, XN, YN, LXN, NNN, NNNOLD, NIT, EPS, RO, & + GAMMA * (YN (NODE - 1) + YN (NODE + 1)) & + BETA2 * (YN (NT - 1) + YN (NB + 1) & - YN (NT + 1) - YN (NB - 1)) -C + C MOVE THE NODE AS INDICATED -C + DELX = (XSUM/WEIGHT - XN (NODE)) * RO DELY = (YSUM/WEIGHT - YN (NODE)) * RO XN (NODE) = XN (NODE) + DELX diff --git a/packages/seacas/applications/fastq/resta.f b/packages/seacas/applications/fastq/resta.f index 82fd0c41d13a..4af76e5fd9b1 100644 --- a/packages/seacas/applications/fastq/resta.f +++ b/packages/seacas/applications/fastq/resta.f @@ -1,54 +1,43 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: resta.f,v 1.1 1990/11/30 11:14:47 gdsjaar Exp $ -C $Log: resta.f,v $ -C Revision 1.1 1990/11/30 11:14:47 gdsjaar -C Initial revision -C -C -CC* FILE: [.QMESH]RESTA.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE RESTA (MXND, XN, YN, NUID, LXK, KXL, NXL, LXN, KKK, & KKKOLD, NAVAIL, IAVAIL, NNN, LIMIT, IREST, TILT, ERR, NOROOM) C************************************************************************ -C + C SUBROUTINE RESTA = RESTRUCTURES THE MESH TO ELIMINATE WORST ELELMENTS -C + C*********************************************************************** -C + C NOTE: C A RECORD IS KEPT OF UP TO 25 OF THE CURRENT WORST CONDITION NUMBERS C AND THE WORST ELEMENT POSSIBLE IS RESTRUCTURED C UNTIL NO FURTHER RESTRUCTURING CAN BE DONE. -C + C*********************************************************************** -C + DIMENSION KCND(26), CND(26) DIMENSION NXL(2, 3*MXND), XN(MXND), YN(MXND), NUID(MXND) DIMENSION LXK(4, MXND), KXL(2, 3*MXND), LXN(4, MXND) DIMENSION NODES(4), ANGLES(4), SIDES(4) -C + LOGICAL ERR, NOROOM, LSIDE, CCW, CAREA, DONE -C + ERR = .FALSE. -C + C CHECK FOR IMPENDING OVERFLOW -C + IF (NAVAIL .LE. 1) THEN NOROOM = .TRUE. CALL MESAGE ('INSUFFICIENT STORAGE AVAILABLE IN RESTA') RETURN ENDIF -C + C INITIALIZE -C + NTAB = 0 MAXTAB = 25 CNDTOL = 2.0 @@ -57,30 +46,30 @@ SUBROUTINE RESTA (MXND, XN, YN, NUID, LXK, KXL, NXL, LXN, KKK, CCW = .TRUE. CAREA = .FALSE. IREST = 0 -C + DO 110 K = KKKOLD + 1, KKK IF (LXK(1, K) .GT. 0) THEN LSIDE = .FALSE. -C + C GET THE ELEMENTS COND VALUE (BASED ON ANGLE AND SIDE LENGTH) -C + CALL GNXKA (MXND, XN, YN, K, NODES, AREA, LXK, NXL, CCW) CALL QAAVAL (MXND, NODES, ANGLES, QRAT, DUMMY, XN, YN, & CAREA) CALL CONDNO (MXND, NODES, QRAT, SRAT, COND, SIDES, XN, YN, & LSIDE) -C + C ADD UP THE NUMBER OF ANGLES < PI/2 -C + DO 100 I = 1, 4 IF (ANGLES(I) .LE. 1.58) THEN ASUM = ASUM + ANGLES(I) NSUM = NSUM + 1 ENDIF 100 CONTINUE -C + C ADD BAD ELEMENTS TO THE LIST -C + IF (COND .GE. CNDTOL) THEN CND(NTAB + 1) = COND KCND(NTAB + 1) = K @@ -89,9 +78,9 @@ SUBROUTINE RESTA (MXND, XN, YN, NUID, LXK, KXL, NXL, LXN, KKK, ENDIF ENDIF 110 CONTINUE -C + C TILT IS THE AVERAGE VALUE IN DEGREES OF ANGLES < PI/2 -C + IF (NSUM .GT. 0) THEN TILT = (ASUM/DBLE(NSUM))*57.2957795 ELSE @@ -99,9 +88,9 @@ SUBROUTINE RESTA (MXND, XN, YN, NUID, LXK, KXL, NXL, LXN, KKK, ENDIF IF ((LIMIT .LE. 0) .OR. (NTAB .LE. 0)) RETURN CNDTOL = CND(NTAB) -C + C TRY TO RESTRUCTURE ON THE 10 WORST ELEMENTS ONLY -C + 120 CONTINUE NTRY = MIN0(NTAB, 10) DO 130 IK = 1, NTRY @@ -115,9 +104,9 @@ SUBROUTINE RESTA (MXND, XN, YN, NUID, LXK, KXL, NXL, LXN, KKK, 140 CONTINUE IREST = IREST + 1 IF (IREST .GE. LIMIT) RETURN -C + C UPDATE THE TABLE (AFTER 1 RESTRUCTURE) -C + CALL GNXKA (MXND, XN, YN, KCND(IK1), NODES, AREA, LXK, NXL, CCW) CALL QAAVAL (MXND, NODES, ANGLES, QRAT, DUMMY, XN, YN, CAREA) CALL CONDNO (MXND, NODES, QRAT, SRAT, COND1, SIDES, XN, YN, LSIDE) @@ -134,9 +123,9 @@ SUBROUTINE RESTA (MXND, XN, YN, NUID, LXK, KXL, NXL, LXN, KKK, CALL CONDNO (MXND, NODES, QRAT, SRAT, COND2, SIDES, XN, YN, LSIDE) CND(IK2) = COND2 KCND(IK2) = K2 -C + C RE-SORT AND PRUNE -C + CALL BUBBLE (CND, KCND, 1, NTAB) DO 170 I = 1, 2 IF (CND(NTAB) .LT. CNDTOL)NTAB = NTAB - 1 @@ -145,5 +134,5 @@ SUBROUTINE RESTA (MXND, XN, YN, NUID, LXK, KXL, NXL, LXN, KKK, IF (NTAB .LE. 0) RETURN CNDTOL = CND(NTAB) GO TO 120 -C + END diff --git a/packages/seacas/applications/fastq/restry.f b/packages/seacas/applications/fastq/restry.f index e96a52fa3e12..387655017472 100644 --- a/packages/seacas/applications/fastq/restry.f +++ b/packages/seacas/applications/fastq/restry.f @@ -1,34 +1,17 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: restry.f,v 1.2 1991/03/21 15:45:14 gdsjaar Exp $ -C $Log: restry.f,v $ -C Revision 1.2 1991/03/21 15:45:14 gdsjaar -C Changed all 3.14159... to atan2(0.0, -1.0) -C -c Revision 1.1.1.1 1990/11/30 11:14:51 gdsjaar -c FASTQ Version 2.0X -c -c Revision 1.1 90/11/30 11:14:50 gdsjaar -c Initial revision -c -C -CC* FILE: [.QMESH]RESTRY.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE RESTRY (MXND, K, K2, LXK, NXL, KXL, LXN, XN, YN, NUID, & NAVAIL, IAVAIL, NNN, DONE, ERR, NOROOM) C*********************************************************************** -C + C SUBROUTINE RESTRY = TRY TO RESTRUCTURE K AND ONE OF ITS NEIGHBORS -C + C*********************************************************************** -C + C NOTE: C THE ELEMENT OPPOSITE THE LONGEST - OR IN SOME CASES THE SECOND C LONGEST - SIDE OF ELEMENT K WILL BE FOUND. @@ -39,34 +22,34 @@ SUBROUTINE RESTRY (MXND, K, K2, LXK, NXL, KXL, LXN, XN, YN, NUID, C - THE MAX AND AVERAGE Q - NUMBERS BOTH DECREASE C - AN AREA BREAKDOWN CONSISTENT WITH THE IMPROVEMENT C IN THE AVERAGE Q - NUMBER OCCURS -C + C*********************************************************************** -C + DIMENSION LXK (4, MXND), NXL (2, 3*MXND) DIMENSION KXL (2, 3*MXND), XN (MXND) DIMENSION YN (MXND), NUID (MXND), LXN (4, MXND) DIMENSION NSA (4), NSB (4), NSC (4), NSD (4) DIMENSION NS1 (4), AL1 (4), ANG1 (4) DIMENSION NS2 (4), AL2 (4), ANG2 (4) -C + LOGICAL ERR, CCW, CAREA, IOKB, IOKF, IBGOOD LOGICAL IFGOOD, DONE, LSIDE, NOROOM -C + DONE = .FALSE. ERR = .FALSE. PI = ATAN2(0.0, -1.0) PITOL = PI* (195. / 180.) -C + C GET DATA FOR ELEMENT K -C + CCW = .TRUE. CAREA = .FALSE. CALL GNXKA (MXND, XN, YN, K, NS1, AREA1, LXK, NXL, CCW) CALL QAAVAL (MXND, NS1, ANG1, QRAT1, DUMMY, XN, YN, CAREA) CALL CONDNO (MXND, NS1, QRAT1, SRAT1, COND1, AL1, XN, YN, LSIDE) -C + C FIND LONGEST AND SECOND LONGEST SIDES, EXCLUDING BOUNDARY LINES -C + S1MAX = - 1. L1MAX = 0 A1MAX = 0. @@ -94,13 +77,13 @@ SUBROUTINE RESTRY (MXND, K, K2, LXK, NXL, KXL, LXN, XN, YN, NUID, WRITE (*, 10000)N1, N2, K ERR = .TRUE. RETURN -C + C N1 TO N2 IS AN INTERIOR LINE -C + 110 CONTINUE -C + C LONGEST INTERIOR LINE SO FAR -C + IF (AL1 (I) .GT. S1MAX) THEN S2MAX = S1MAX L2MAX = L1MAX @@ -108,9 +91,9 @@ SUBROUTINE RESTRY (MXND, K, K2, LXK, NXL, KXL, LXN, XN, YN, NUID, S1MAX = AL1 (I) L1MAX = L A1MAX = ANG1 (I) + ANG1 (J) -C + C SECOND LONGEST LINE SO FAR -C + ELSE S2MAX = AL1 (I) L2MAX = L @@ -119,7 +102,7 @@ SUBROUTINE RESTRY (MXND, K, K2, LXK, NXL, KXL, LXN, XN, YN, NUID, ENDIF 120 CONTINUE 130 CONTINUE -C + C*********************************************************************** C NOTE: C IF LONGEST SIDE IS SUBSTANTIALLY LONGER THAN SECOND @@ -129,9 +112,9 @@ SUBROUTINE RESTRY (MXND, K, K2, LXK, NXL, KXL, LXN, XN, YN, NUID, C LONGEST OR SECOND LONGEST SIDE DEPENDING ON WHICH HAS THE C SMALLER SUM OF ADJACENT ANGLES. (LOOK AT A TRAPEZOID TO C SEE WHY THIS IS REASONABLE.) -C + C*********************************************************************** -C + IF (L1MAX .LE. 0) RETURN SLEN = S1MAX LINT = L1MAX @@ -141,32 +124,32 @@ SUBROUTINE RESTRY (MXND, K, K2, LXK, NXL, KXL, LXN, XN, YN, NUID, LINT = L2MAX ENDIF K2 = KXL (1, LINT) + KXL (2, LINT) - K -C + C DOUBLE CHECK -C + IF (K2 .LE. 0) RETURN -C + C GET DATA FOR ELEMENT K2 -C + CALL GNXKA (MXND, XN, YN, K2, NS2, AREA2, LXK, NXL, CCW) CALL QAAVAL (MXND, NS2, ANG2, QRAT2, DUMMY, XN, YN, CAREA) CALL CONDNO (MXND, NS2, QRAT2, SRAT2, COND2, AL2, XN, YN, LSIDE) -C + C FIND LONGEST SIDE IN SECOND ELEMENT -C + SMAXB = AMAX1 (AL2 (1), AL2 (2), AL2 (3), AL2 (4)) -C + C IF THE INTERFACE SIDE IS SIGNIFICANTLY SHORTER THAN THE C LONGEST SIDE OF THE SECOND ELEMENT, SKIP THE RESTRUCTURE. -C + IF (SLEN .LT. 0.50 * SMAXB) RETURN -C + C CIRCULARLY SHIFT THE TWO NODE LISTS TO CREATE CANONICAL ORDER. C IN CANONICAL ORDER THE FIRST NODE IS THE NODE IN BOTH ELEMENTS C WHOSE COUNTER - CLOCKWISE SUCCESSOR IN THE FIRST ELEMENT IS NOT C ALSO IN THE SECOND ELEMENT. C NOTE : ORDER OF SIDE LENGTH AND ANGLE DATA IS NO GOOD AFTER THIS -C + N1 = NXL (1, LINT) CALL NXKORD (NS1, N1) DO 140 I = 1, 4 @@ -179,10 +162,10 @@ SUBROUTINE RESTRY (MXND, K, K2, LXK, NXL, KXL, LXN, XN, YN, NUID, 140 CONTINUE CALL NXKORD (NS2, N1) 150 CONTINUE -C + C SEE IF THEY MATCH AS THEY SHOULD (BUTTERFLY ELEMENTS MAY CAUSE C PROBLEMS WITH THE CCW ROUTINES -C + IF (NS1 (4) .NE. NS2 (2)) THEN NSHOLD = NS2 (2) NS2 (2) = NS2 (4) @@ -192,20 +175,20 @@ SUBROUTINE RESTRY (MXND, K, K2, LXK, NXL, KXL, LXN, XN, YN, NUID, NS1 (2) = NS1 (4) NS1 (4) = NSHOLD IF (NS1 (4) .NE. NS2 (2)) THEN -C + C ERROR MATCHING ELEMENTS ALONG A COMMON SIDE -C + WRITE ( * , 10010)K, K2, NS1 (1), NS1 (4) ERR = .TRUE. RETURN ENDIF ENDIF ENDIF -C + C COMPUTE ALL RELEVANT DATA FOR ALL THREE STRUCTURES -C + C ORIGINAL STRUCTURE -C + QMAX = AMAX1 (QRAT1, QRAT2) TOLQX = .95 * QMAX + .05 QAVG = 0.5 * (QRAT1 + QRAT2) @@ -215,9 +198,9 @@ SUBROUTINE RESTRY (MXND, K, K2, LXK, NXL, KXL, LXN, XN, YN, NUID, ELSE ARAT = 1.0E10 ENDIF -C + C * BACKWARDS * STRUCTURE -C + NSA (1) = NS2 (4) NSA (2) = NS1 (1) NSA (3) = NS1 (2) @@ -245,9 +228,9 @@ SUBROUTINE RESTRY (MXND, K, K2, LXK, NXL, KXL, LXN, XN, YN, NUID, ELSE ARATB = 1.0E10 ENDIF -C + C * FORWARDS * STRUCTURE -C + NSC (1) = NS1 (2) NSC (2) = NS1 (3) NSC (3) = NS1 (4) @@ -274,30 +257,30 @@ SUBROUTINE RESTRY (MXND, K, K2, LXK, NXL, KXL, LXN, XN, YN, NUID, ELSE ARATF = 1.0E10 ENDIF -C + C SEE IF BACKWARD IS BETTER THAN ORIGINAL -C + IF ( (IOKB) .AND. (QMAXB .LE. TOLQX) .AND. (QAVGB .LE. QAVG) .AND. & (ARATB * QAVGB .LE. ARAT * QAVG)) THEN IBGOOD = .TRUE. ELSE IBGOOD = .FALSE. ENDIF -C + C SEE IF FORWARD IS BETTER THAN ORIGINAL -C + IF ( (IOKF) .AND. (QMAXF .LE. TOLQX) .AND. (QAVGF .LE. QAVG) .AND. & (ARATF * QAVGF .LE. ARAT * QAVG)) THEN IFGOOD = .TRUE. ELSE IFGOOD = .FALSE. ENDIF -C + C CHOOSE BEST ALTERNATIVE C IF BOTH FORWARD AND BACKWARD IS BETTER THAN ORIGINAL, THEN C COMPUTE PAIR - VALUES TO CHOOSE BETWEEN FORWARD AND BACKWARD. C VALUE = (AVERAGE CONDITION NUMBER) * SQRT (AREA RATIO) -C + IF ( (IFGOOD) .AND. (IBGOOD)) THEN LSIDE = .FALSE. CALL CONDNO (MXND, NSA, QRAT1B, SRAT1B, COND1B, AL1, XN, YN, @@ -312,11 +295,11 @@ SUBROUTINE RESTRY (MXND, K, K2, LXK, NXL, KXL, LXN, XN, YN, NUID, VALUEF = ARATF * (COND1F + COND2F) **2 IF (VALUEB .GT. VALUEF)IBGOOD = .FALSE. ENDIF -C + C BACKWARD STRUCTURE IS BEST. IMPLEMENT IT. -C + C FIRST FIX LXK AND KXL ARRAYS -C + IF (IBGOOD) THEN CALL FNDLNK (MXND, LXK, NXL, K, NS1 (3), NS1 (4), L1EE, ERR) IF (ERR) RETURN @@ -324,12 +307,12 @@ SUBROUTINE RESTRY (MXND, K, K2, LXK, NXL, KXL, LXN, XN, YN, NUID, IF (ERR) RETURN CALL LSWAP (MXND, LXK, KXL, K, L1EE, K2, L2EE, ERR) IF (ERR) RETURN -C + C FIX NXL ARRAY (MOVE THE DIAGONAL) -C + NXL (1, LINT) = NS2 (4) NXL (2, LINT) = NS1 (3) -C + C FIX LXN ARRAY CALL DELLXN (MXND, LXN, NUID, NAVAIL, IAVAIL, NS1 (1), LINT, @@ -345,11 +328,11 @@ SUBROUTINE RESTRY (MXND, K, K2, LXK, NXL, KXL, LXN, XN, YN, NUID, & NNN, ERR, NOROOM) IF (ERR) RETURN DONE = .TRUE. -C + C FORWARD STRUCTURE IS BEST. IMPLEMENT IT. -C + C FIX LXK AND KXL ARRAYS -C + ELSEIF (IFGOOD) THEN CALL FNDLNK (MXND, LXK, NXL, K, NS1 (1), NS1 (2), L1EE, ERR) IF (ERR) RETURN @@ -357,14 +340,14 @@ SUBROUTINE RESTRY (MXND, K, K2, LXK, NXL, KXL, LXN, XN, YN, NUID, IF (ERR) RETURN CALL LSWAP (MXND, LXK, KXL, K, L1EE, K2, L2EE, ERR) IF (ERR) RETURN -C + C FIX NXL ARRAY (MOVE THE DIAGONAL) -C + NXL (1, LINT) = NS1 (2) NXL (2, LINT) = NS2 (3) -C + C FIX LXN ARRAY -C + CALL DELLXN (MXND, LXN, NUID, NAVAIL, IAVAIL, NS1 (1), LINT, & NNN, ERR, NOROOM) IF (ERR) RETURN @@ -379,12 +362,12 @@ SUBROUTINE RESTRY (MXND, K, K2, LXK, NXL, KXL, LXN, XN, YN, NUID, IF (ERR) RETURN DONE = .TRUE. ENDIF -C + RETURN -C + 10000 FORMAT (' IN RESTRY, NODES', 2I5, /, & ' DO NOT DEFINE A LINE IN ELEMENT', I5) 10010 FORMAT (' IN RESTRY, ELEMENTS', 2I5, /, & ' DO NOT CONTAIN A COMMON SIDE USING NODES', 2I5) -C + END diff --git a/packages/seacas/applications/fastq/revers.f b/packages/seacas/applications/fastq/revers.f index 447ba9ef942d..ace8d146782d 100644 --- a/packages/seacas/applications/fastq/revers.f +++ b/packages/seacas/applications/fastq/revers.f @@ -1,31 +1,20 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: revers.f,v 1.1 1990/11/30 11:14:53 gdsjaar Exp $ -C $Log: revers.f,v $ -C Revision 1.1 1990/11/30 11:14:53 gdsjaar -C Initial revision -C -C -CC* FILE: [.QMESH]REVERS.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE REVERS (X, N) C*********************************************************************** -C + C SUBROUTINE REVERS = REVERS THE REAL ARRAY OF X (I), I=1, N -C + C*********************************************************************** -C + DIMENSION X (N) -C + IF (N .LE. 1) RETURN -C + NUP = N + 1 M = N / 2 DO 100 I = 1, M @@ -34,7 +23,7 @@ SUBROUTINE REVERS (X, N) X (I) = X (NUP) X (NUP) = XK 100 CONTINUE -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/rgdstr.f b/packages/seacas/applications/fastq/rgdstr.f index 088db0051f3e..89bfa795ba8b 100644 --- a/packages/seacas/applications/fastq/rgdstr.f +++ b/packages/seacas/applications/fastq/rgdstr.f @@ -1,40 +1,20 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: rgdstr.f,v 1.2 1998/07/14 18:19:58 gdsjaar Exp $ -C $Log: rgdstr.f,v $ -C Revision 1.2 1998/07/14 18:19:58 gdsjaar -C Removed unused variables, cleaned up a little. -C -C Changed BLUE labels to GREEN to help visibility on black background -C (indirectly requested by a couple users) -C -C Revision 1.1.1.1 1990/11/30 11:14:57 gdsjaar -C FASTQ Version 2.0X -C -c Revision 1.1 90/11/30 11:14:56 gdsjaar -c Initial revision -c -C -CC* FILE: [.MAIN]RGDSTR.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE RGDSTR (NPNODE, NPELEM, KKK, NNXK, XN, YN, NXK) C************************************************************************ -C + C SUBROUTINE RGDSTR = CALCULATES A REGION DISTORTION MEASURE -C + C*********************************************************************** -C + DIMENSION XN (NPNODE), YN (NPNODE), NXK (NNXK, NPELEM) -C + C CALCULATE THE ELEMENT DISTORTION -C + N1 = NXK (1,1) N2 = NXK (2,1) N3 = NXK (3,1) @@ -62,17 +42,17 @@ SUBROUTINE RGDSTR (NPNODE, NPELEM, KKK, NNXK, XN, YN, NXK) ENDIF SUM = SUM + VALUE 100 CONTINUE -C + C PRINT OUT THE RESULTS -C + SUM = SUM / DBLE(KKK) WRITE (*, 10000) VMIN, KMIN, VMAX, KMAX, SUM -C + RETURN -C + 10000 FORMAT (' THE MINIMUM DISTORTION IS: ',G14.7,' IN ELEMENT: ',I10, & /, & ' THE MAXIMUM DISTORTION IS: ',G14.7,' IN ELEMENT: ',I10, /, & ' THE AVERAGE DISTORTION IS: ',G14.7) -C + END diff --git a/packages/seacas/applications/fastq/rgnsch.f b/packages/seacas/applications/fastq/rgnsch.f index 9a494974b865..d72b90a78ad2 100644 --- a/packages/seacas/applications/fastq/rgnsch.f +++ b/packages/seacas/applications/fastq/rgnsch.f @@ -1,54 +1,37 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: rgnsch.f,v 1.1 1990/11/30 11:14:59 gdsjaar Exp $ -C $Log: rgnsch.f,v $ -C Revision 1.1 1990/11/30 11:14:59 gdsjaar -C Initial revision -C -C -CC* FILE: [.QMESH]RGNSCH.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 8/1/90 -CC* MODIFICATION: FORCED SCHEME TO BE "X" WHEN REMESHING FOR -CC* ERROR ESTIMATION - THIS INCLUDED CHANGING THE -CC* CALL TO ADD THE LOGICAL REMESH. -C SUBROUTINE RGNSCH (MCOM, ICOM, JCOM, CIN, IIN, RIN, KIN, STEP, & IREGN, IPNTR, N24, MSC, SCHEME, DEFSCH, SCHSTR, LENSCH, NPER, & PENTAG, TRIANG, TRNSIT, HALFC, FILL, ICODE, REMESH) C*********************************************************************** -C + C RGNSCH - GET A REGION'S SCHEME -C + C*********************************************************************** -C + DIMENSION CIN(MCOM), IIN(MCOM), RIN(MCOM), KIN(MCOM) DIMENSION SCHEME(MSC) -C + CHARACTER*72 SCHEME, DEFSCH, SCHSTR, CIN -C + LOGICAL STEP, PENTAG, TRIANG, TRNSIT, HALFC, FILL, IANS, REMESH -C + DATA IEXIT, IOVER, IQUIT /1, 2, 3/ -C + ICODE = 0 -C + C CHECK FOR REMESHING -C + IF (REMESH) THEN SCHSTR = 'X' ELSE -C + C GET THE INITIAL SCHEME -C + IF ((ABS(IREGN) .LE. N24) .AND. (IPNTR .GT. 0)) THEN SCHSTR = SCHEME(IPNTR) ELSE @@ -57,16 +40,16 @@ SUBROUTINE RGNSCH (MCOM, ICOM, JCOM, CIN, IIN, RIN, KIN, STEP, END IF CALL STRCUT (SCHSTR) CALL STRLNG (SCHSTR, LENSCH) -C + C STEP PROCESSING -C + IF (STEP) THEN WRITE (*, 10000) SCHSTR(1:LENSCH) CALL INTRUP ('USE CURRENT SCHEME TO BEGIN PROCESSING', IANS, & MCOM, ICOM, JCOM, CIN, IIN, RIN, KIN) -C + C CHANGE THE SCHEME -C + IF (.NOT.IANS) THEN 100 CONTINUE IF (ICOM .LE. JCOM) THEN @@ -78,9 +61,9 @@ SUBROUTINE RGNSCH (MCOM, ICOM, JCOM, CIN, IIN, RIN, KIN, STEP, END IF CALL STRCUT (SCHSTR) CALL STRLNG (SCHSTR, LENSCH) -C + C HELP FOR SCHEME -C + IF ((SCHSTR(1:1) .EQ. 'H') .OR. & (SCHSTR(1:1) .EQ. 'h')) THEN CALL MESAGE (' ') @@ -89,9 +72,9 @@ SUBROUTINE RGNSCH (MCOM, ICOM, JCOM, CIN, IIN, RIN, KIN, STEP, GO TO 100 END IF END IF -C + C BLANK SCHEME -C + IF ((LENSCH .LE. 0) .OR. (SCHSTR(1:1) .EQ. ' ')) THEN CALL MESAGE ('NO INITIAL SCHEME INPUT') CALL MESAGE ('FORCED RECTANGLE PROCESSING USED') @@ -100,17 +83,17 @@ SUBROUTINE RGNSCH (MCOM, ICOM, JCOM, CIN, IIN, RIN, KIN, STEP, GO TO 120 END IF END IF -C + C DETERMINE MESHING SCHEME -C + PENTAG = .FALSE. TRIANG = .FALSE. TRNSIT = .FALSE. FILL = .FALSE. DO 110 J = 1, LENSCH -C + C SEE IF A PENTAGON REGION HAS BEEN FLAGGED -C + IF ((SCHSTR(J:J) .EQ. 'U') .OR. (SCHSTR(J:J) .EQ. 'u')) THEN IF (NPER .GE. 10) THEN PENTAG = .TRUE. @@ -122,9 +105,9 @@ SUBROUTINE RGNSCH (MCOM, ICOM, JCOM, CIN, IIN, RIN, KIN, STEP, CALL MESAGE ('REGULAR PROCESSING WILL BE ATTEMPTED') END IF GO TO 120 -C + C SEE IF A TRANSITION REGION HAS BEEN FLAGGED -C + ELSE IF ((SCHSTR(J:J) .EQ. 'B') .OR. & (SCHSTR(J:J) .EQ. 'b')) THEN IF (NPER .GE. 8) THEN @@ -138,9 +121,9 @@ SUBROUTINE RGNSCH (MCOM, ICOM, JCOM, CIN, IIN, RIN, KIN, STEP, CALL MESAGE ('REGULAR PROCESSING WILL BE ATTEMPTED') END IF GO TO 120 -C + C SEE IF A SEMI-CIRCLE REGION HAS BEEN FLAGGED -C + ELSE IF ((SCHSTR(J:J) .EQ. 'C') .OR. & (SCHSTR(J:J) .EQ. 'c')) THEN IF (NPER .GE. 8) THEN @@ -155,9 +138,9 @@ SUBROUTINE RGNSCH (MCOM, ICOM, JCOM, CIN, IIN, RIN, KIN, STEP, CALL MESAGE ('REGULAR PROCESSING WILL BE ATTEMPTED') END IF GO TO 120 -C + C SEE IF A TRIANGULAR REGION HAS BEEN FLAGGED -C + ELSE IF ((SCHSTR(J:J) .EQ. 'T') .OR. & (SCHSTR(J:J) .EQ. 't')) THEN IF (NPER .GE. 6) THEN @@ -170,23 +153,23 @@ SUBROUTINE RGNSCH (MCOM, ICOM, JCOM, CIN, IIN, RIN, KIN, STEP, CALL MESAGE ('REGULAR PROCESSING WILL BE ATTEMPTED') END IF GO TO 120 -C + C SEE IF A FILL REGION HAS BEEN FLAGGED -C + ELSE IF ((SCHSTR(J:J) .EQ. 'X') .OR. & (SCHSTR(J:J) .EQ. 'x')) THEN FILL = .TRUE. CALL MESAGE ('PAVING TECHNIQUE INITIALLY USED') GO TO 120 -C + C SEE IF A REGULAR RECTANGULAR REGION HAS BEEN FLAGGED -C + ELSE IF ((SCHSTR(J:J) .EQ. 'M') .OR. & (SCHSTR(J:J) .EQ. 'm')) THEN GO TO 120 -C + C OTHER POSSIBILITIES -C + ELSE IF ((SCHSTR(J:J) .EQ. 'E') .OR. & (SCHSTR(J:J) .EQ. 'e')) THEN ICODE = IEXIT @@ -202,8 +185,8 @@ SUBROUTINE RGNSCH (MCOM, ICOM, JCOM, CIN, IIN, RIN, KIN, STEP, END IF 110 CONTINUE 120 CONTINUE -C + RETURN -C + 10000 FORMAT ('0INITIAL MESH DEFINED USING THIS SCHEME:', /, 5X, A) END diff --git a/packages/seacas/applications/fastq/ringbl.f b/packages/seacas/applications/fastq/ringbl.f index b5206dc8f832..c96b2cd279c6 100644 --- a/packages/seacas/applications/fastq/ringbl.f +++ b/packages/seacas/applications/fastq/ringbl.f @@ -1,23 +1,17 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: ringbl.f,v 1.1 1990/11/30 11:15:02 gdsjaar Exp $ -C $Log: ringbl.f,v $ -C Revision 1.1 1990/11/30 11:15:02 gdsjaar -C Initial revision -C -C SUBROUTINE RINGBL C*********************************************************************** -C + C SUBROUTINE RINGBL = RINGS THE TERMINAL BELL -C + C*********************************************************************** -C + CALL PLTBEL RETURN -C + END diff --git a/packages/seacas/applications/fastq/rmesh.f b/packages/seacas/applications/fastq/rmesh.f index be356b758a70..a461ec95287b 100644 --- a/packages/seacas/applications/fastq/rmesh.f +++ b/packages/seacas/applications/fastq/rmesh.f @@ -1,24 +1,19 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -CC* FILE: [.QMESH]RMESH.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE RMESH (NPER, MXND, X, Y, NID, XN, YN, NUID, LXK, KXL, & NXL, LXN, M1, M2, KKK, KKKOLD, NNN, NNNOLD, LLL, LLLOLD, & IAVAIL, NAVAIL, ERR) C*********************************************************************** -C + C SUBROUTINE RMESH = GENERATES AN INITIAL LOGICAL RECTANGULAR MESH C WHOSE PERIMETER IS (X (I), Y (I), I=1, N). -C + C*********************************************************************** -C + C VARIABLES USED: C X = X VALUES AROUND THE PERIMETER C Y = Y VALUES AROUND THE PERIMETER @@ -46,27 +41,26 @@ SUBROUTINE RMESH (NPER, MXND, X, Y, NID, XN, YN, NUID, LXK, KXL, C A CONTINUATION ROW. (RMESH ITSELF GENERATES NO SUCH NEGATIVES.) C A NEGATIVE FLAG IN THE SECOND COLUMN OF THE LXN ARRAY MEANS C THAT THIS NODE IS A BOUNDARY NODE. -C -C + C*********************************************************************** -C + DIMENSION X (NPER), Y (NPER), NID (NPER) DIMENSION XN (MXND), YN (MXND), NUID (MXND) DIMENSION LXK (4, MXND), KXL (2, 3 * MXND) DIMENSION NXL (2, 3 * MXND), LXN (4, MXND) -C + LOGICAL ERR, NOROOM -C + C NOTE: NOROOM SHOULD NEVER BE TRUE WITH CROSS BEING CALLED IN RMESH. C THUS, IT IS NEVER PASSED BACK TO QMESH. -C + KKK = M1 * M2 + KKKOLD LLL = (M1 * (M2 + 1)) + (M2 * (M1 + 1)) + LLLOLD NNN = (M1 + 1) * (M2 + 1) + NNNOLD ERR = .TRUE. -C + C CHECK INPUT -C + IF (2 * (NPER / 2) .NE. NPER) THEN CALL MESAGE ('IN RMESH, NO. OF PERIMETER NODES IS ODD') RETURN @@ -74,24 +68,24 @@ SUBROUTINE RMESH (NPER, MXND, X, Y, NID, XN, YN, NUID, LXK, KXL, WRITE ( * , 10000)NPER, M1 RETURN ENDIF -C + C COMPUTE CONSTANTS -C + NLC = 2 * M1 + 1 M1P1 = M1 + 1 M2P1 = M2 + 1 -C + C PRODUCE LXK ARRAY -C + C LINES FOR FIRST ELEMENT -C + LXK (1, KKKOLD + 1) = 1 + LLLOLD LXK (2, KKKOLD + 1) = M1 + 1 + LLLOLD LXK (3, KKKOLD + 1) = M1 + 2 + LLLOLD LXK (4, KKKOLD + 1) = NLC + 1 + LLLOLD -C + C FIRST ROW (SHIFT FIRST ELEMENT TO SECOND, ETC.) -C + IF (M1 .GT. 1) THEN DO 110 K = 2, M1 DO 100 I = 1, 4 @@ -99,9 +93,9 @@ SUBROUTINE RMESH (NPER, MXND, X, Y, NID, XN, YN, NUID, LXK, KXL, 100 CONTINUE 110 CONTINUE ENDIF -C + C SUCCEEDING ROWS (SHIFT FIRST COLUMN TO SECOND, ETC.) -C + IF (M2 .GT. 1) THEN K = M1 + KKKOLD DO 140 K2 = 2, M2 @@ -114,18 +108,18 @@ SUBROUTINE RMESH (NPER, MXND, X, Y, NID, XN, YN, NUID, LXK, KXL, 130 CONTINUE 140 CONTINUE ENDIF -C + C PREPARE KXL TABLE BY USING SUBROUTINE CROSS ON THE LXK TABLE -C + CALL CCROSS (4, KKK, 2, LLL, LXK, KXL, KKKOLD + 1, LLLOLD + 1, & NOROOM, ERR) IF (ERR) RETURN ERR = .TRUE. -C + C MAKE NXL TABLE -C + C FIRST DO HORIZONTAL LINES -C + DO 160 J = 1, M2P1 NODE = 1 + (J - 1) * (M1 + 1) + NNNOLD L = 1 + ( (J - 1) * NLC) + LLLOLD @@ -136,9 +130,9 @@ SUBROUTINE RMESH (NPER, MXND, X, Y, NID, XN, YN, NUID, LXK, KXL, L = L + 1 150 CONTINUE 160 CONTINUE -C + C NEXT DO VERTICAL LINES -C + DO 180 J = 1, M1P1 NODE = J + NNNOLD L = J + M1 + LLLOLD @@ -149,16 +143,16 @@ SUBROUTINE RMESH (NPER, MXND, X, Y, NID, XN, YN, NUID, LXK, KXL, L = L + NLC 170 CONTINUE 180 CONTINUE -C + C PREPARE LXN TABLE FROM NXL TABLE -C + CALL CCROSS (2, LLL, 4, NNN, NXL, LXN, LLLOLD + 1, NNNOLD + 1, & NOROOM, ERR) IF (ERR) RETURN ERR = .TRUE. -C + C LINK - UP AVAILABLE LXN SPACE -C + IAVAIL = NNN + 1 NAVAIL = MXND - NNN DO 190 I = IAVAIL, MXND @@ -167,29 +161,29 @@ SUBROUTINE RMESH (NPER, MXND, X, Y, NID, XN, YN, NUID, LXK, KXL, LXN (3, I) = 0 LXN (4, I) = I + 1 190 CONTINUE -C + C LOGICAL CONNECTION TABLES ARE COMPLETE C FILL IN THE CO - ORDINATES OF THE INTERIOR POINTS C USE THE UNIT SQUARE TRANSFORMATION (OF COOK / THIOKOL) -C + IF ( (M1 .GT. 1) .AND. (M2 .GT. 1)) THEN -C + C GET NODE NUMBERS FOR CORNERS -C + I1Z = M1 + 1 IZ1 = NPER - (M2 - 1) I11 = M1 + M2 + 1 -C + C COLUMN LOOP -C + DO 210 J = 2, M2 KL = NPER + 2 - J KR = M1 + J ETA = DBLE(J - 1) / DBLE(M2) OMETA = 1.0 - ETA -C + C ROW LOOP -C + DO 200 I = 2, M1 KB = I KT = IZ1 + 1 - I @@ -207,18 +201,18 @@ SUBROUTINE RMESH (NPER, MXND, X, Y, NID, XN, YN, NUID, LXK, KXL, 200 CONTINUE 210 CONTINUE ENDIF -C + C DEFINE THE COORDINATES OF THE PERIMETER NODES. C ALSO FLAG SECOND ELEMENTS OF LXN ARRAY TO INDICATE C WHICH NODES ARE BOUNDARY NODES. C DEFINE UNIQUE NODE ID NUMBERS ALSO. -C + DO 220 I = NNNOLD + 1, NNN NUID (I) = 0 220 CONTINUE -C + C BOTTOM -C + IP = 0 DO 230 I = 1, M1P1 IM = I + NNNOLD @@ -228,9 +222,9 @@ SUBROUTINE RMESH (NPER, MXND, X, Y, NID, XN, YN, NUID, LXK, KXL, XN (IM) = X (IP) YN (IM) = Y (IP) 230 CONTINUE -C + C RIGHT -C + IP = M1P1 DO 240 I = 2, M2P1 IP = IP + 1 @@ -240,9 +234,9 @@ SUBROUTINE RMESH (NPER, MXND, X, Y, NID, XN, YN, NUID, LXK, KXL, XN (IM) = X (IP) YN (IM) = Y (IP) 240 CONTINUE -C + C TOP -C + DO 250 I = 2, M1P1 IP = IP + 1 IM = IM - 1 @@ -251,9 +245,9 @@ SUBROUTINE RMESH (NPER, MXND, X, Y, NID, XN, YN, NUID, LXK, KXL, XN (IM) = X (IP) YN (IM) = Y (IP) 250 CONTINUE -C + C LEFT -C + DO 260 I = 2, M2 IP = IP + 1 IM = IM - M1P1 @@ -262,14 +256,14 @@ SUBROUTINE RMESH (NPER, MXND, X, Y, NID, XN, YN, NUID, LXK, KXL, XN (IM) = X (IP) YN (IM) = Y (IP) 260 CONTINUE -C + C EXIT -C + ERR = .FALSE. -C + RETURN -C + 10000 FORMAT (' IN RMESH, N = ', I5, ' AND M1 = ', I5, & ' ARE INCOMPATIBLE') -C + END diff --git a/packages/seacas/applications/fastq/rowsmo.f b/packages/seacas/applications/fastq/rowsmo.f index d0712db48f2b..84bec53c1d74 100644 --- a/packages/seacas/applications/fastq/rowsmo.f +++ b/packages/seacas/applications/fastq/rowsmo.f @@ -1,87 +1,40 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: rowsmo.f,v 1.5 2004/01/22 14:25:22 gdsjaar Exp $ -C $Log: rowsmo.f,v $ -C Revision 1.5 2004/01/22 14:25:22 gdsjaar -C Attempt to fix strange problem on x86_64 AMD Opteron system using -C Portland Group 5.1-3 compilers. The getang function would work -C correctly if compiled with no optimization and in debug mode, but -C would crash if compiled optimized. The location of the crash was not -C in a place that made any sense that something was wrong. -C -C After much trial and error, it was found that adding a 'SAVE' -C statement at the beginning of the file fixed the problem. -C -C Also cleaned out some unused parameters being passed to the function. -C -C Revision 1.4 1998/11/24 20:45:09 gdsjaar -C Added code to avoid array bound read errors and uninitialized -C variables. In some cases, the correct fix was difficult to determine, -C so added something that looked like it made sense... -C -C This fixes problems with very slow run times on g77-compiled code. It -C was taking an uninitialized variable to be INT_MAX instead of zero -C which resulted in lots of iterations through a loop. This variable was -C initialized to zero since that is what it was being set to on the sun -C and when compiled with fort77 (f2c-based). Gives the exact same mesh -C on linux and sun for several test cases. -C -C Revision 1.3 1998/07/14 18:19:59 gdsjaar -C Removed unused variables, cleaned up a little. -C -C Changed BLUE labels to GREEN to help visibility on black background -C (indirectly requested by a couple users) -C -C Revision 1.2 1991/03/21 15:45:16 gdsjaar -C Changed all 3.14159... to atan2(0.0, -1.0) -C -c Revision 1.1.1.1 1990/11/30 11:15:12 gdsjaar -c FASTQ Version 2.0X -c -c Revision 1.1 90/11/30 11:15:10 gdsjaar -c Initial revision -c -C -CC* FILE: [.PAVING]ROWSMO.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE ROWSMO (MXND, MLN, XN, YN, ZN, LXK, KXL, NXL, LXN, NNN, & WFAC, WFAC2, NIT, EPS, RO, NNN2, LNODES, BNSIZE, LLL, GRAPH, & XMIN, XMAX, YMIN, YMAX, ZMIN, ZMAX, DEV1, KREG) C*********************************************************************** -C + C SUBROUTINE ROWSMO = SMOOTHS AN ADDED ROW DURING FILLING USING THE C ISOPARAMETRIC SMOOTHER WITH SPECIAL CONSIDERATION C GIVEN TO THE 2-LINE NODES (ROW CORNERS) -C + C*********************************************************************** -C + C VARIABLES USED: C WFAC = WEIGHT (0. = LAPLACIAN, 1. = ISOPARAMETRIC) C NIT = THE MAX NUMBER OF ITERATIONS TO DO. C EPS = MINIMUM DISTANCE NODES MUST MOVE TO CONTINUE ITERATIONS C RO = AN UNDER- OR OVER-RELAXATION FACTOR (NORMALLY 1.0) -C + C*********************************************************************** -C + DIMENSION AREA(20) -C + DIMENSION KLIST(20), NODES(4) DIMENSION XN(MXND), YN(MXND), ZN(MXND) DIMENSION LXN(4, MXND), NXL(2, 3*MXND) DIMENSION LXK(4, MXND), KXL(2, 3*MXND) DIMENSION LINES(20), LNODES (MLN, MXND), BNSIZE (2, MXND) -C + LOGICAL BIG, CCW, ERR, GRAPH, NEAR2L, TEST, AVER -C + CHARACTER*3 DEV1 -C + PI = ATAN2(0.0, -1.0) nodes(1) = -1 @@ -95,17 +48,17 @@ SUBROUTINE ROWSMO (MXND, MLN, XN, YN, ZN, LXK, KXL, NXL, LXN, NNN, EPS2 = EPS * RO TEST = .FALSE. AVER = .TRUE. -C + C ITERATION LOOP -C + DO 160 IT = 1, NIT IF (IT .EQ. NIT) THEN CALL MESAGE ('THE ROWSMO ROUTINE IS NOT CONVERGING') ENDIF BIG = .FALSE. -C + C NODE LOOP -C + NBEGIN = MAX0 (NNN2 - 1, 1) NEND = NNN + 1 DO 150 J = NBEGIN, NEND @@ -116,25 +69,25 @@ SUBROUTINE ROWSMO (MXND, MLN, XN, YN, ZN, LXK, KXL, NXL, LXN, NNN, ELSE NODE = J ENDIF -C + C SKIP CONTINUATION LINES, EXTERIOR BOUNDARY LINES, AND NODES C THAT ARE ON THE INTERIOR -C + IF (NODE .gt. 0) THEN IF ((LXN(1, NODE) .GT. 0) .AND. (LXN(2, NODE) .GT. 0) .AND. & (LNODES (4, NODE) .EQ. - 1)) THEN -C + C FIND ELEMENTS AND LINES ATTACHED TO NODE -C + CALL GKXN (MXND, KXL, LXN, NODE, KS, KLIST, ERR) CALL GETLXN (MXND, LXN, NODE, LINES, NL, ERR) -C + SUMX = 0.0 SUMY = 0.0 -C + C PERFORM AN AREA PULL AND LAPLACIAN C ON ANY NODE ATTACHED TO A 2-LINE NODE -C + C TWOL = .FALSE. C NEAR2L = .FALSE. C IF (LXN (3, NODE) . EQ. 0) THEN @@ -154,9 +107,9 @@ SUBROUTINE ROWSMO (MXND, MLN, XN, YN, ZN, LXK, KXL, NXL, LXN, NNN, C ENDIF C NODES(IL) = NTEST C IF (LXN (3, NTEST) .EQ. 0) THEN -C + C MAKE SURE THAT THE OTHER END OF THE 2-LINE NODE HAS ONLY 3 LINES -C + C IF (LXN (1, NTEST) .EQ. ILL) THEN C LTEST = LXN (2, NTEST) C ELSEIF (LXN (2, NTEST) .EQ. ILL) THEN @@ -185,7 +138,7 @@ SUBROUTINE ROWSMO (MXND, MLN, XN, YN, ZN, LXK, KXL, NXL, LXN, NNN, C NFROM = 0 C ENDIF C ENDIF -C + NEAR2L = .FALSE. IF ((NEAR2L) .OR. (TEST)) THEN THETA1 = ATAN2 (YN (NODES (3)) - YN (NODES (1)), @@ -204,16 +157,16 @@ SUBROUTINE ROWSMO (MXND, MLN, XN, YN, ZN, LXK, KXL, NXL, LXN, NNN, YNEW = Y11 + R * SIN (THETA1) XDEL = XNEW - XN (NODE) YDEL = YNEW - YN (NODE) -C + C PERFORM AN ISOPARAMETRIC SMOOTH ON OTHER NODES -C + ELSE DO 120 KL = 1, KS CCW = .FALSE. KK = KLIST(KL) CALL GNXKA (MXND, XN, YN, KK, NODES, AREA(KL), LXK, & NXL, CCW) -C + DO 100 IN = 1, 4 IF (NODES(IN) .EQ. NODE) THEN J1 = IN + 1 @@ -226,7 +179,7 @@ SUBROUTINE ROWSMO (MXND, MLN, XN, YN, ZN, LXK, KXL, NXL, LXN, NNN, IF (J2 .GT. 4) J2 = 1 J3 = J2 + 1 IF (J3 .GT. 4) J3 = 1 -C + SUMX = SUMX + XN(NODES(J1)) + XN(NODES(J3)) & - WFAC * XN(NODES(J2)) SUMY = SUMY + YN(NODES(J1)) + YN(NODES(J3)) @@ -236,14 +189,14 @@ SUBROUTINE ROWSMO (MXND, MLN, XN, YN, ZN, LXK, KXL, NXL, LXN, NNN, SUMY = SUMY/(DBLE(KS) * (2.0 - WFAC)) XDEL = (RO * ( SUMX - XN (NODE) )) YDEL = (RO * ( SUMY - YN (NODE) )) -C + CALL GETFRM (MXND, LINES, NL, NXL, NODE, & LNODES (2, NODE), LNODES (3, NODE), NFROM) IF (NFROM .GT. 0) & THEN -C + C FACTOR IN THE LENGTH CONSTANT (GENERATED LENGTH) OF THE NODE -C + DIST0 = BNSIZE (1,NODE) * BNSIZE (2,NODE) XDIST = XDEL + XN (NODE) - XN (NFROM) YDIST = YDEL + YN (NODE) - YN (NFROM) @@ -253,9 +206,9 @@ SUBROUTINE ROWSMO (MXND, MLN, XN, YN, ZN, LXK, KXL, NXL, LXN, NNN, SUMY = YN (NFROM) + YDIST * DFACT XDEL = SUMX - XN (NODE) YDEL = SUMY - YN (NODE) -C + C FACTOR IN THE EQUAL ANGLE VECTORS -C + IF (LNODES (2, NODE) .NE. LNODES (3, NODE)) THEN CALL EQLANG (MXND, XN, YN, LXN, NODE, & LNODES (2, NODE), LNODES (3, NODE), NFROM, @@ -268,20 +221,20 @@ SUBROUTINE ROWSMO (MXND, MLN, XN, YN, ZN, LXK, KXL, NXL, LXN, NNN, YDEL = VY ENDIF ENDIF -C + ENDIF -C + ENDIF -C + C NOW CHECK THAT THE ROW IS NOT BENDING OVER ON ITSELF WITH THIS SMOOTH -C + IF (LXN (4, NODE) .EQ. 0) CALL INVERT_FQ (MXND, MLN, XN, & YN, ZN, LXK, KXL, NXL, LXN, LLL, LNODES, XMIN, XMAX, & YMIN, YMAX, ZMIN, ZMAX, DEV1, KREG, NODE, XDEL, YDEL) -C + C REDEFINE THIS NODE'S COORDINATES C AND PLOT THE NEW NODE AND LINES -C + IF ((XDEL * XDEL + YDEL * YDEL) .GT. EPS2) BIG = .TRUE. IF (GRAPH) THEN CALL LCOLOR ('BLACK') @@ -294,10 +247,10 @@ SUBROUTINE ROWSMO (MXND, MLN, XN, YN, ZN, LXK, KXL, NXL, LXN, NNN, CALL LCOLOR ('WHITE') CALL SFLUSH ENDIF -C + XN(NODE) = XN(NODE) + XDEL YN(NODE) = YN(NODE) + YDEL -C + IF (GRAPH) THEN DO 140 II = 1, NL IDRAW = LINES(II) @@ -307,19 +260,19 @@ SUBROUTINE ROWSMO (MXND, MLN, XN, YN, ZN, LXK, KXL, NXL, LXN, NNN, 140 CONTINUE CALL SFLUSH ENDIF -C + C CHECK FOR CONVERGENCE -C + ENDIF ENDIF 150 CONTINUE -C + C IF NO SIGNIFICANT MOVEMENTS OCCURRED, RETURN -C + IF (.NOT.BIG) RETURN 160 CONTINUE -C + C NOW SMOOTH THE INTERIOR -C + RETURN END diff --git a/packages/seacas/applications/fastq/rplotl.f b/packages/seacas/applications/fastq/rplotl.f index bf8da8b67852..214c0d3acb16 100644 --- a/packages/seacas/applications/fastq/rplotl.f +++ b/packages/seacas/applications/fastq/rplotl.f @@ -1,82 +1,48 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: rplotl.f,v 1.4 2007/07/24 13:10:18 gdsjaar Exp $ -C $Log: rplotl.f,v $ -C Revision 1.4 2007/07/24 13:10:18 gdsjaar -C Fix problem with boundary condition memory overwrite. -C -C Remove old ls5 and r25 terminal tests -C -C Revision 1.3 1998/07/14 18:20:01 gdsjaar -C Removed unused variables, cleaned up a little. -C -C Changed BLUE labels to GREEN to help visibility on black background -C (indirectly requested by a couple users) -C -C Revision 1.2 1998/05/29 14:21:23 gdsjaar -C Changed scratch file unit number from 1 to 99. On some systems -C (janus), this caused the input fastq file to be deleted since it had -C earlier been assigned to unit 1. Even though the fastq file had -C already been closed, the temporary status of the scratch file assigned -C to unit 1 propagated back to the fastq file and deleted it. -C -C Version number upped to 2.6X -C -C Revision 1.1.1.1 1990/11/30 11:15:16 gdsjaar -C FASTQ Version 2.0X -C -c Revision 1.1 90/11/30 11:15:15 gdsjaar -c Initial revision -c -C -CC* FILE: [.PAVING]RPLOTL.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE RPLOTL (MXND, XN, YN, ZN, NXL, XMIN, XMAX, YMIN, YMAX, & ZMIN, ZMAX, LLL, DEV1, KREG) C*********************************************************************** -C + C SUBROUTINE RPLOTL = REPLOTS THE CURRENT MESH FROM THE NXL ARRAY -C + C*********************************************************************** -C + DIMENSION NXL (2, 3 * MXND), XN (MXND), YN (MXND), ZN (MXND) DIMENSION X (2), Y (2) -C + CHARACTER*72 DUMMY, HOLD, DEV1*3 -C + LOGICAL HARD, FIGURE -C + HARD = .FALSE. FIGURE = .FALSE. -C + C INITIALIZE THE PLOTTING SURFACE -C + XDIMD = 1. YDIMD = .75 -C + C TURN ON THE HARDCOPY IF NEEDED -C + IF (HARD) THEN CALL VDIQES (10002, KAVAL2) IF (KAVAL2 .NE. 1) GOTO 110 CALL VDESCP (10002, 0, 0) ENDIF -C + C OPEN A FIGURE FILE IF NEEDED -C + IF (FIGURE) THEN IUNIT = 98 OPEN (UNIT = IUNIT, FILE = 'DATA.FIG', & STATUS = 'NEW', ERR = 110) ENDIF -C + CALL PLTBGN XDIMR = XMAX - XMIN YDIMR = YMAX - YMIN @@ -110,9 +76,9 @@ SUBROUTINE RPLOTL (MXND, XN, YN, ZN, NXL, XMIN, XMAX, YMIN, YMAX, DUMMY (1:7) = 'REGION ' LEN = LEN + 7 CALL PLTXTH (XDIMD * .05, YDIMD * .95, DUMMY (1:LEN)) -C + C PLOT THE LINES IN NXL ARRAY, SKIPPING DELETIONS -C + IF (FIGURE) THEN IDUM = 0 XDUM = 0. @@ -141,17 +107,17 @@ SUBROUTINE RPLOTL (MXND, XN, YN, ZN, NXL, XMIN, XMAX, YMIN, YMAX, ENDIF ENDIF 100 CONTINUE -C + CALL PLTFLU IF (HARD) THEN CALL PLTFLU CALL VDESCP (10001, 0, 0) ENDIF -C + 110 CONTINUE IF (FIGURE) CLOSE (IUNIT) RETURN -C + 10000 FORMAT (' POINT ', I6, 2X, 2 (1PE14.7, 2X)) 10010 FORMAT (' LINE ', I6, 2X, 'STR ', I6, 2X, I6) END diff --git a/packages/seacas/applications/fastq/savreg.f b/packages/seacas/applications/fastq/savreg.f index 35beac205b99..ecf5bcc01012 100644 --- a/packages/seacas/applications/fastq/savreg.f +++ b/packages/seacas/applications/fastq/savreg.f @@ -1,47 +1,36 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: savreg.f,v 1.1 1990/11/30 11:15:18 gdsjaar Exp $ -C $Log: savreg.f,v $ -C Revision 1.1 1990/11/30 11:15:18 gdsjaar -C Initial revision -C -C -CC* FILE: [.QMESH]SAVREG.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE SAVREG (MXND, MAXNBC, MAXSBC, XN, YN, NUID, LXK, NXL, & LXN, LSTNBC, LSTSBC, KNBC, KSBC, NNN, KKK, NUMREG, IUNIT, BAR, & M1) C*********************************************************************** -C + C SUBROUTINE SAVREG = SAVES THE NODE AND ELEMENT DESCRIPTIONS AS WELL C AS THE BOUNDARY CONDITIONS -C + C*********************************************************************** -C + C NOTE: C THE MESH TABLES ARE EFFECTIVELY DESTROYED BY THIS ROUTINE -C + C*********************************************************************** -C + DIMENSION XN (MXND), YN (MXND), NUID (MXND) DIMENSION LXK (4, MXND), NXL (2, MXND*3), LXN (4, MXND) DIMENSION LSTNBC (MAXNBC), LSTSBC (MAXSBC), NODES (4) -C + LOGICAL CCW, BAR -C + CCW = .TRUE. IF (.NOT.BAR) THEN -C + C DEFINE NUID-S FOR INTERIOR NODES. C SKIP DELETED NODES AND CONTINUATIONS. -C + K = 0 DO 100 I = 1, NNN IF ((NUID (I) .EQ. 0) .AND. (LXN (1, I) .GT. 0)) THEN @@ -49,11 +38,11 @@ SUBROUTINE SAVREG (MXND, MAXNBC, MAXSBC, XN, YN, NUID, LXK, NXL, NUID (I) = NUMREG*100000+K ENDIF 100 CONTINUE -C + C GET COUNTER-CLOCKWISE NODE LISTS. C (THESE LISTS WILL OVERWRITE THE LXK ARRAY.) C DELETED ELEMENTS WILL BE SKIPPED. -C + J = 0 IDEL = 0 DO 130 K = 1, KKK @@ -80,10 +69,10 @@ SUBROUTINE SAVREG (MXND, MAXNBC, MAXSBC, XN, YN, NUID, LXK, NXL, LXK (2, I) = IABS (NUID (LXK (2, I))) 140 CONTINUE ENDIF -C + C COLLAPSE THE NODE ARRAYS TO ELIMINATE DELETED NODES, C CONTINUATIONS, AND NODES ALREADY WRITTEN OUT. -C + K = 0 DO 150 I = 1, NNN IF ( ( (LXN (1, I) .GT. 0) .OR. (BAR)) @@ -95,16 +84,16 @@ SUBROUTINE SAVREG (MXND, MAXNBC, MAXSBC, XN, YN, NUID, LXK, NXL, ENDIF 150 CONTINUE NNN = K -C + C WRITE HEADER, NODE LIST, ELEMENT LIST, AND BOUNDARY LISTS -C + WRITE (IUNIT)KKK, NNN, KNBC, KSBC, NUMREG, BAR, M1 IF (NNN .GE. 1) WRITE (IUNIT) (NUID (I), XN (I), YN (I), & I = 1, NNN) WRITE (IUNIT) ((LXK (I, J), I = 1, 4), J = 1, KKK) IF (KNBC .GT. 0)WRITE (IUNIT) (LSTNBC (I), I = 1, KNBC) IF (KSBC .GT. 0)WRITE (IUNIT) (LSTSBC (I), I = 1, KSBC) -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/setaxs.f b/packages/seacas/applications/fastq/setaxs.f index e484214ea2fd..142b6c016f5b 100644 --- a/packages/seacas/applications/fastq/setaxs.f +++ b/packages/seacas/applications/fastq/setaxs.f @@ -1,36 +1,25 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: setaxs.f,v 1.1 1990/11/30 11:15:21 gdsjaar Exp $ -C $Log: setaxs.f,v $ -C Revision 1.1 1990/11/30 11:15:21 gdsjaar -C Initial revision -C -C -CC* FILE: [.MAIN]SETAXS.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE SETAXS (X, Y) C*********************************************************************** -C + C SETAXS = SETS UP THE AXIS AS NEEDED FOR PLOTTING -C + C*********************************************************************** -C + DIMENSION BUFF (11), X (2), Y (2) -C + C GET THE AXIS ON THE CORRECT LOCATION ON THE GRAPH -C + CALL MP2PT (1, X (1), Y (1), X01, Y01, MASK) CALL MP2PT (1, X (2), Y (2), X02, Y02, MASK) -C + C FORCE X AND Y LIMITS ON THE GRAPH -C + BUFF(1) = X01 CALL PLTSTG (1, BUFF) BUFF(1) = Y01 @@ -39,19 +28,19 @@ SUBROUTINE SETAXS (X, Y) CALL PLTSTG (3, BUFF) BUFF(1) = Y02 - Y01 CALL PLTSTG (4, BUFF) -C + C TURN OFF THE ZERO LINE PLOT -C + BUFF(1) = 0. CALL PLTSTG (37, BUFF) -C + C GET NICE INTERVALS ON THE AXIS -C + CALL PLTINI (X (1), X (2), XSTART, XEND, XINT, IXEXP, IXTIC) CALL PLTINI (Y (1), Y (2), YSTART, YEND, YINT, IYEXP, IYTIC) -C + C SET ALL THE BUFFER PARAMETERS -C + BUFF (1) = 4. BUFF (2) = X (1) IF (IXEXP .EQ. 0) THEN @@ -73,22 +62,22 @@ SUBROUTINE SETAXS (X, Y) ENDIF BUFF (9) = Y (2) BUFF (11) = 1 -C + C FORCE THE CORRECT AXIS SETUP -C + CALL PLTSTG (11, BUFF) -C + C PLOT THE AXIS -C + CALL PLTGPH (X, Y, - 2, 'X', ' ', 'Y', ' ') -C + C PUT THE CLIPPING RECTANGLE RIGHT AT THE AXIS -C + CALL MP2PT (1, X (1), Y (1), X01, Y01, MASK) CALL MP2PT (1, X (2), Y (2), X02, Y02, MASK) CALL MPVIEW (X01, X02, Y01, Y02) CALL MPORT2 (X (1), X (2), Y (1), Y (2)) -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/setcir.f b/packages/seacas/applications/fastq/setcir.f index 3d82a3285284..9f1be2e431f3 100644 --- a/packages/seacas/applications/fastq/setcir.f +++ b/packages/seacas/applications/fastq/setcir.f @@ -1,38 +1,27 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: setcir.f,v 1.1 1990/11/30 11:15:24 gdsjaar Exp $ -C $Log: setcir.f,v $ -C Revision 1.1 1990/11/30 11:15:24 gdsjaar -C Initial revision -C -C -CC* FILE: [.PAVING]SETCIR.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE SETCIR (MXND, MLN, NLOOP, LNODES, NODE, ERR) C*********************************************************************** -C + C SUBROUTINE SETCIR = MARKS ALL THE NODES IN THE CIRCULAR LOOP C AS SIDES EXCEPT FOR ROW CORNERS -C + C*********************************************************************** -C + DIMENSION LNODES (MLN, MXND) -C + LOGICAL ERR -C + ERR = .FALSE. -C + KOUNT = 0 INOW = NODE NEWNOD = NODE -C + 100 CONTINUE INOW = LNODES (3, INOW) IF (LNODES (1, INOW) .LE. 4) THEN @@ -45,12 +34,12 @@ SUBROUTINE SETCIR (MXND, MLN, NLOOP, LNODES, NODE, ERR) & THEN NEWNOD = INOW ENDIF -C + IF (INOW .EQ. NODE) THEN NODE = NEWNOD RETURN ENDIF -C + KOUNT = KOUNT + 1 IF (KOUNT .GT. NLOOP) THEN CALL MESAGE('PROBLEMS IN SETCIR WITH LOOP NOT CLOSING') @@ -58,9 +47,9 @@ SUBROUTINE SETCIR (MXND, MLN, NLOOP, LNODES, NODE, ERR) GOTO 110 ENDIF GOTO 100 -C + 110 CONTINUE -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/setlop.f b/packages/seacas/applications/fastq/setlop.f index 71c446700e01..bcf73d06c194 100644 --- a/packages/seacas/applications/fastq/setlop.f +++ b/packages/seacas/applications/fastq/setlop.f @@ -1,42 +1,31 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: setlop.f,v 1.1 1990/11/30 11:15:27 gdsjaar Exp $ -C $Log: setlop.f,v $ -C Revision 1.1 1990/11/30 11:15:27 gdsjaar -C Initial revision -C -C -CC* FILE: [.PAVING]SETLOP.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE SETLOP (MXND, MLN, NLOOP, LNODES, NODE, IVALUE, ERR) C*********************************************************************** -C + C SUBROUTINE SETLOP = MARKS ALL THE NODES IN THE LOOP AS DESIGNATED -C + C*********************************************************************** -C + DIMENSION LNODES (MLN, MXND) -C + LOGICAL ERR -C + ERR = .FALSE. -C + KOUNT = 0 INOW = NODE -C + 100 CONTINUE INOW = LNODES (3, INOW) LNODES (1, INOW) = IVALUE -C + IF (INOW .EQ. NODE) RETURN -C + KOUNT = KOUNT + 1 IF (KOUNT .GT. NLOOP) THEN CALL MESAGE('PROBLEMS IN SETLOP WITH LOOP NOT CLOSING') @@ -44,9 +33,9 @@ SUBROUTINE SETLOP (MXND, MLN, NLOOP, LNODES, NODE, IVALUE, ERR) GOTO 110 ENDIF GOTO 100 -C + 110 CONTINUE -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/setn02.f b/packages/seacas/applications/fastq/setn02.f index f0b9f9884c8b..a0ae9d8e9ee3 100644 --- a/packages/seacas/applications/fastq/setn02.f +++ b/packages/seacas/applications/fastq/setn02.f @@ -1,39 +1,28 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: setn02.f,v 1.1 1990/11/30 11:15:30 gdsjaar Exp $ -C $Log: setn02.f,v $ -C Revision 1.1 1990/11/30 11:15:30 gdsjaar -C Initial revision -C -C -CC* FILE: [.PAVING]SETN02.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE SETN02 (MXND, NXL, LXK, KXL, LINE, NEND, NODE, N0, N2) C*********************************************************************** -C + C SUBROUTINE SETN02 = PICKS THE NEXT LINE AROUND THE ELEMENTS ATTACHED C TO LINE WITH ONE END AT NEND, AND THE OTHER END C NOT AT NODE, AND FROM THE CONNECTIVITY OF THE C ELEMENTS DETERMINES THE BOUNDING ANGULAR LINES C AND NODES. -C + C*********************************************************************** -C + DIMENSION NXL(2, 3*MXND) DIMENSION LXK(4, MXND), KXL(2, 3*MXND) -C + K1 = KXL (1, LINE) K2 = KXL (2, LINE) -C + C FIND THE NEXT LINE IN K1 -C + DO 100 I = 1, 4 IL = LXK (I, K1) IF ((NXL (1, IL) .EQ. NEND) .AND. @@ -50,11 +39,11 @@ SUBROUTINE SETN02 (MXND, NXL, LXK, KXL, LINE, NEND, NODE, N0, N2) 100 CONTINUE CALL MESAGE ('** PROBLEMS IN SETN02 FINDING NNEW1 **') RETURN -C + 110 CONTINUE -C + C FIND THE NEXT LINE IN K2 -C + DO 120 I = 1, 4 IL = LXK (I, K2) IF ((NXL (1, IL) .EQ. NEND) .AND. @@ -69,13 +58,13 @@ SUBROUTINE SETN02 (MXND, NXL, LXK, KXL, LINE, NEND, NODE, N0, N2) 120 CONTINUE CALL MESAGE ('** PROBLEMS IN SETN02 FINDING NNEW2 **') RETURN -C + 130 CONTINUE -C + C NOW DETERMINE WHICH OF THESE NODES IS N0 AND WHICH IS N2 BASED C ON THE FACT THAT THE CONNECTIVITY OF THE ELEMENTS LINES IS ALWAYS IN C COUNTER-CLOCKWISE ORDER -C + DO 140 I = 1, 4 IF (LXK (I, K1) .EQ. LINE) THEN I0 = I - 1 @@ -101,9 +90,9 @@ SUBROUTINE SETN02 (MXND, NXL, LXK, KXL, LINE, NEND, NODE, N0, N2) ENDIF 140 CONTINUE CALL MESAGE ('** PROBLEMS IN SETN02 FINDING LINE AGAIN **') -C + 150 CONTINUE -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/sew2.f b/packages/seacas/applications/fastq/sew2.f index 9c3fe5ccec78..1f768fda2cf1 100644 --- a/packages/seacas/applications/fastq/sew2.f +++ b/packages/seacas/applications/fastq/sew2.f @@ -1,40 +1,29 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: sew2.f,v 1.1 1990/11/30 11:15:32 gdsjaar Exp $ -C $Log: sew2.f,v $ -C Revision 1.1 1990/11/30 11:15:32 gdsjaar -C Initial revision -C -C -CC* FILE: [.PAVING]SEW2.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE SEW2 (MXND, MLN, NUID, LXK, KXL, NXL, LXN, LNODES, & IAVAIL, NAVAIL, LLL, KKK, NNN, I1, I2, J1, J2, NOROOM, ERR) C*********************************************************************** -C + C SUBROUTINE SEW2 = COLLAPSES A LOOP INTO TWO POSSIBLE LOOPS -C + C*********************************************************************** -C + DIMENSION NUID (MXND) DIMENSION LXK (4, MXND), KXL (2, 3*MXND) DIMENSION NXL (2, 3*MXND), LXN (4, MXND) DIMENSION LNODES (MLN, MXND) DIMENSION L1LIST(20) -C + LOGICAL ERR, NOROOM -C + ERR = .FALSE. -C + C GET THE APPROPRIATE LINES AND NODES TO BE DELETED -C + IF ((LXN (2, J1) .LT. 0) .AND. (LXN (2, J2) .LT. 0)) THEN LSTAY = LNODES (5, J1) LGONE = LNODES (5, I1) @@ -42,7 +31,7 @@ SUBROUTINE SEW2 (MXND, MLN, NUID, LXK, KXL, NXL, LXN, LNODES, NGONE2 = I2 NSTAY1 = J2 NSTAY2 = J1 -C + ELSEIF (LXN (2, J1) .LT. 0) THEN LSTAY = LNODES (5, I1) LGONE = LNODES (5, J1) @@ -50,7 +39,7 @@ SUBROUTINE SEW2 (MXND, MLN, NUID, LXK, KXL, NXL, LXN, LNODES, NGONE2 = I2 NSTAY1 = I1 NSTAY2 = J1 -C + ELSEIF (LXN (2, J2) .LT. 0) THEN LSTAY = LNODES (5, I1) LGONE = LNODES (5, J1) @@ -58,7 +47,7 @@ SUBROUTINE SEW2 (MXND, MLN, NUID, LXK, KXL, NXL, LXN, LNODES, NGONE2 = J1 NSTAY1 = J2 NSTAY2 = I2 -C + ELSE LSTAY = LNODES (5, I1) LGONE = LNODES (5, J1) @@ -67,12 +56,12 @@ SUBROUTINE SEW2 (MXND, MLN, NUID, LXK, KXL, NXL, LXN, LNODES, NSTAY1 = I1 NSTAY2 = I2 ENDIF -C + KOLD = KXL (1, LGONE) KNEW = KXL (1, LSTAY) -C + C DELETE THE OLD LINE AND REDO LINK ARRAYS -C + IF (KNEW .EQ. 0) THEN KXL (1, LSTAY) = KOLD KXL (2, LSTAY) = 0 @@ -80,14 +69,14 @@ SUBROUTINE SEW2 (MXND, MLN, NUID, LXK, KXL, NXL, LXN, LNODES, KXL (1, LSTAY) = KNEW KXL (2, LSTAY) = KOLD ENDIF -C + KXL (1, LGONE) = 0 KXL (2, LGONE) = 0 NXL (1, LGONE) = 0 NXL (2, LGONE) = 0 -C + C FIX THE LINES PER ELEMENT ARRAY FOR THE ONE ELEMENT CHANGING -C + IF (KOLD .GT. 0) THEN DO 100 II = 1, 4 IF (LXK (II, KOLD) .EQ. LGONE) THEN @@ -95,17 +84,17 @@ SUBROUTINE SEW2 (MXND, MLN, NUID, LXK, KXL, NXL, LXN, LNODES, GOTO 110 ENDIF 100 CONTINUE -C + CALL MESAGE ('** PROBLEMS IN SEW2 FIXING THE CHANGING'// & 'ELEMENT **') ERR = .TRUE. GOTO 180 -C + 110 CONTINUE ENDIF -C + C RECONNECT ALL LINES CONNECTING TO NGONE2 TO NSTAY2 -C + CALL GETLXN (MXND, LXN, NGONE2, L1LIST, NL, ERR) IF (ERR) THEN CALL MESAGE ('** PROBLEMS IN SEW2 FINDING LXN FOR NGONE2 **') @@ -119,10 +108,10 @@ SUBROUTINE SEW2 (MXND, MLN, NUID, LXK, KXL, NXL, LXN, LNODES, NXL (2, LL) = NSTAY2 ENDIF 120 CONTINUE -C + C FIX LXN ARRAY C UNHOOK LGONE FROM NGONE2 OR NSTAY2 AS NEEDED -C + IF (LGONE .EQ. LNODES (5, J1)) THEN CALL DELLXN (MXND, LXN, NUID, NAVAIL, IAVAIL, J1, & LGONE, NNN, ERR, NOROOM) @@ -130,7 +119,7 @@ SUBROUTINE SEW2 (MXND, MLN, NUID, LXK, KXL, NXL, LXN, LNODES, CALL MESAGE ('** PROBLEMS IN SEW2 DELETING NGONE2 LINES **') GOTO 180 ENDIF -C + ELSE CALL DELLXN (MXND, LXN, NUID, NAVAIL, IAVAIL, I2, & LGONE, NNN, ERR, NOROOM) @@ -138,11 +127,11 @@ SUBROUTINE SEW2 (MXND, MLN, NUID, LXK, KXL, NXL, LXN, LNODES, CALL MESAGE ('** PROBLEMS IN SEW2 DELETING NGONE2 LINES **') GOTO 180 ENDIF -C + ENDIF -C + C ADD ALL LINES STILL HOOKED TO NGONE2 TO THE LIST OF LINES FOR NSTAY2 -C + DO 130 II = 1, NL LL = L1LIST (II) IF (LL .NE. LGONE) THEN @@ -155,9 +144,9 @@ SUBROUTINE SEW2 (MXND, MLN, NUID, LXK, KXL, NXL, LXN, LNODES, ENDIF ENDIF 130 CONTINUE -C + C DELETE NGONE2 (UNHOOK EVERYTHING FROM IT) -C + DO 140 II = 1, 3 LXN (II, NGONE2) = 0 140 CONTINUE @@ -165,9 +154,9 @@ SUBROUTINE SEW2 (MXND, MLN, NUID, LXK, KXL, NXL, LXN, LNODES, IAVAIL = NGONE2 NAVAIL = NAVAIL+1 NUID (NGONE2) = 0 -C + C RECONNECT ALL LINES CONNECTING TO NGONE1 TO NSTAY1 -C + CALL GETLXN (MXND, LXN, NGONE1, L1LIST, NL, ERR) IF (ERR) THEN CALL MESAGE ('** PROBLEMS IN SEW2 GETTING NGONE1 LINES **') @@ -181,10 +170,10 @@ SUBROUTINE SEW2 (MXND, MLN, NUID, LXK, KXL, NXL, LXN, LNODES, NXL (2, LL) = NSTAY1 ENDIF 150 CONTINUE -C + C FIX LXN ARRAY C UNHOOK LGONE FROM NGONE1 OR NSTAY1 AS APPROPRIATE -C + IF (LGONE .EQ. LNODES (5, I1)) THEN CALL DELLXN (MXND, LXN, NUID, NAVAIL, IAVAIL, I1, & LGONE, NNN, ERR, NOROOM) @@ -192,7 +181,7 @@ SUBROUTINE SEW2 (MXND, MLN, NUID, LXK, KXL, NXL, LXN, LNODES, CALL MESAGE ('** PROBLEMS IN SEW2 DELETING NGONE1 LINES **') GOTO 180 ENDIF -C + ELSE CALL DELLXN (MXND, LXN, NUID, NAVAIL, IAVAIL, J2, & LGONE, NNN, ERR, NOROOM) @@ -200,11 +189,11 @@ SUBROUTINE SEW2 (MXND, MLN, NUID, LXK, KXL, NXL, LXN, LNODES, CALL MESAGE ('** PROBLEMS IN SEW2 DELETING NGONE1 LINES **') GOTO 180 ENDIF -C + ENDIF -C + C ADD ALL LINES STILL HOOKED TO NGONE1 TO THE LIST OF LINES FOR NSTAY1 -C + DO 160 II = 1, NL LL = L1LIST (II) IF (LL .NE. LGONE) THEN @@ -217,9 +206,9 @@ SUBROUTINE SEW2 (MXND, MLN, NUID, LXK, KXL, NXL, LXN, LNODES, ENDIF ENDIF 160 CONTINUE -C + C DELETE NGONE1 (UNHOOK EVERYTHING FROM IT) -C + DO 170 II = 1, 3 LXN (II, NGONE1) = 0 170 CONTINUE @@ -227,9 +216,9 @@ SUBROUTINE SEW2 (MXND, MLN, NUID, LXK, KXL, NXL, LXN, LNODES, IAVAIL = NGONE1 NAVAIL = NAVAIL+1 NUID (NGONE1) = 0 -C + C NOW FIX THE LNODES ARRAY FOR BOTH OF THE LOOPS -C + IF (NGONE2 .EQ. J1) THEN LNODES (2, NSTAY2) = LNODES (2, NGONE2) LNODES (3, LNODES (2, NGONE2)) = NSTAY2 @@ -246,7 +235,7 @@ SUBROUTINE SEW2 (MXND, MLN, NUID, LXK, KXL, NXL, LXN, LNODES, LNODES (2, NSTAY1) = LNODES (2, NGONE1) LNODES (3, LNODES (2, NGONE1)) = NSTAY1 ENDIF -C + I1 = NSTAY1 I2 = NSTAY2 J1 = NGONE1 @@ -281,9 +270,9 @@ SUBROUTINE SEW2 (MXND, MLN, NUID, LXK, KXL, NXL, LXN, LNODES, CALL MARKSM (MXND, MLN, LXK, KXL, NXL, LXN, LNODES, & LNODES (2, LNODES (2, I2)), ERR) IF (ERR) GOTO 180 -C + 180 CONTINUE -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/sflush.f b/packages/seacas/applications/fastq/sflush.f index 7b4cc24f3847..118f66adc433 100644 --- a/packages/seacas/applications/fastq/sflush.f +++ b/packages/seacas/applications/fastq/sflush.f @@ -1,23 +1,17 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: sflush.f,v 1.1 1990/11/30 11:15:36 gdsjaar Exp $ -C $Log: sflush.f,v $ -C Revision 1.1 1990/11/30 11:15:36 gdsjaar -C Initial revision -C -C SUBROUTINE SFLUSH C*********************************************************************** -C + C SUBROUTINE SFLUSH = SCREEN FLUSH (DUMPS GRAPHICS BUFFER TO THE SCREEN) -C + C*********************************************************************** -C + CALL PLTFLU RETURN -C + END diff --git a/packages/seacas/applications/fastq/shrunk.f b/packages/seacas/applications/fastq/shrunk.f index 34560e7400c9..f16a6aa75549 100644 --- a/packages/seacas/applications/fastq/shrunk.f +++ b/packages/seacas/applications/fastq/shrunk.f @@ -1,30 +1,19 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: shrunk.f,v 1.1 1990/11/30 11:15:38 gdsjaar Exp $ -C $Log: shrunk.f,v $ -C Revision 1.1 1990/11/30 11:15:38 gdsjaar -C Initial revision -C -C -CC* FILE: [.PAVING]SHRUNK.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C LOGICAL FUNCTION SHRUNK (RATIO, NROW) C*********************************************************************** -C + C FUNCTION SHRUNK = LOGICAL FUNCTION THAT RETURNS TRUE IF THE ELEMENT C SIZE IS DIMINISHING WITH ROW DEPTH -C + C*********************************************************************** -C + DATA TOLER1 /.85/, TOLER2 /.75/, TOLER3 /.6/ -C + IF ((NROW .GE. 3) .AND. (RATIO .LT. TOLER1)) THEN SHRUNK = .TRUE. ELSEIF ((NROW .GE. 2) .AND. (RATIO .LT. TOLER2)) THEN @@ -34,6 +23,6 @@ LOGICAL FUNCTION SHRUNK (RATIO, NROW) ELSE SHRUNK = .FALSE. ENDIF -C + RETURN END diff --git a/packages/seacas/applications/fastq/sidep.f b/packages/seacas/applications/fastq/sidep.f index 408747270bf2..9fd5ce957522 100644 --- a/packages/seacas/applications/fastq/sidep.f +++ b/packages/seacas/applications/fastq/sidep.f @@ -1,36 +1,19 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: sidep.f,v 1.2 1991/03/21 15:45:18 gdsjaar Exp $ -C $Log: sidep.f,v $ -C Revision 1.2 1991/03/21 15:45:18 gdsjaar -C Changed all 3.14159... to atan2(0.0, -1.0) -C -c Revision 1.1.1.1 1990/11/30 11:15:43 gdsjaar -c FASTQ Version 2.0X -c -c Revision 1.1 90/11/30 11:15:41 gdsjaar -c Initial revision -c -C -CC* FILE: [.PAVING]SIDEP.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C LOGICAL FUNCTION SIDEP (ANGLE) C*********************************************************************** -C + C FUNCTION SIDEP = LOGICAL FUNCTION THAT RETURNS TRUE IF THE ANGLE IS C WITHIN THE CURRENT DEFINITION OF A SIDE -C + C*********************************************************************** -C + DATA EPS /1.27/ -C + PI = ATAN2(0.0, -1.0) IF ( (ANGLE .GT. (PI - EPS)) .AND. (ANGLE .LT. (PI + EPS)) ) THEN SIDEP=.TRUE. @@ -38,5 +21,5 @@ LOGICAL FUNCTION SIDEP (ANGLE) SIDEP=.FALSE. ENDIF RETURN -C + END diff --git a/packages/seacas/applications/fastq/skinit.f b/packages/seacas/applications/fastq/skinit.f index 12151cd0363f..a5a4ca5edd20 100644 --- a/packages/seacas/applications/fastq/skinit.f +++ b/packages/seacas/applications/fastq/skinit.f @@ -1,27 +1,16 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: skinit.f,v 1.1 1990/11/30 11:15:45 gdsjaar Exp $ -C $Log: skinit.f,v $ -C Revision 1.1 1990/11/30 11:15:45 gdsjaar -C Initial revision -C -C -CC* FILE: [.QMESH]SKINIT.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE SKINIT (STACK, NDIM, LENGTH, IERROR) C*********************************************************************** -C + C SUBROUTINE SKINIT = STACK MANAGEMENT ROUTINE -C + C*********************************************************************** -C + C** PARAMETERS C STACK = STACK ARRAY C NDIM = DIMENSIONED SIZE OF STACK IN CALLING PROGRAM @@ -31,13 +20,13 @@ SUBROUTINE SKINIT (STACK, NDIM, LENGTH, IERROR) C 2 - STACK EMPTY C 3 - STACK FULL C 4 - INVALID STACK TYPE -C + C********************************************************************** -C + PARAMETER (LSYOUT = 6) CHARACTER*(*) TYPE INTEGER STACK(NDIM) -C + IF (NDIM .LT. LENGTH + 2) THEN IERROR = 1 ELSE @@ -45,12 +34,12 @@ SUBROUTINE SKINIT (STACK, NDIM, LENGTH, IERROR) STACK(2) = LENGTH IERROR = 0 END IF -C + RETURN -C + C======================================================================= ENTRY SKPOP (STACK, NDIM, IVALUE, IERROR) -C + IF (STACK(1) .EQ. 0) THEN IERROR = 2 ELSE @@ -58,12 +47,12 @@ SUBROUTINE SKINIT (STACK, NDIM, LENGTH, IERROR) STACK(1) = STACK(1) - 1 IERROR = 0 END IF -C + RETURN -C + C======================================================================= ENTRY SKPUSH (STACK, NDIM, IVALUE, IERROR) -C + IF (STACK(1) .EQ. STACK(2)) THEN IERROR = 3 ELSE @@ -71,18 +60,18 @@ SUBROUTINE SKINIT (STACK, NDIM, LENGTH, IERROR) STACK(STACK(1) + 2) = IVALUE IERROR = 0 END IF -C + RETURN -C + C======================================================================= ENTRY SKEROR (LOUT, IERROR) -C + IF (LOUT .EQ. 0) THEN LUNIT = LSYOUT ELSE LUNIT = LOUT END IF -C + IF (IERROR .EQ. 0) THEN ELSE IF (IERROR .EQ. 1) THEN WRITE (LUNIT, '(A)') ' STACK ERROR: ARRAY TOO SHORT' @@ -95,19 +84,19 @@ SUBROUTINE SKINIT (STACK, NDIM, LENGTH, IERROR) ELSE WRITE (LUNIT, '(A)') ' STACK ERROR: UNKNOWN ERROR' END IF -C + IERROR = 0 RETURN -C + C======================================================================= ENTRY SKPRIN (LOUT, STACK, NDIM, TYPE, IERROR) -C + IF (LOUT .EQ. 0) THEN LUNIT = LSYOUT ELSE LUNIT = LOUT END IF -C + IF (STACK(1) .EQ. 0) THEN IERROR = 2 ELSE IF (TYPE .EQ. 'I') THEN @@ -118,7 +107,7 @@ SUBROUTINE SKINIT (STACK, NDIM, LENGTH, IERROR) ELSE IERROR = 4 END IF -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/skprnt.f b/packages/seacas/applications/fastq/skprnt.f index 3fc6876fd73a..d0ad872adf40 100644 --- a/packages/seacas/applications/fastq/skprnt.f +++ b/packages/seacas/applications/fastq/skprnt.f @@ -1,32 +1,20 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: skprnt.f,v 1.1 1990/11/30 11:15:48 gdsjaar Exp $ -C $Log: skprnt.f,v $ -C Revision 1.1 1990/11/30 11:15:48 gdsjaar -C Initial revision -C -C -CC* FILE: [.QMESH]SKPRNT.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE SKPRNT (LUNIT, LEN, RSTACK, NDIM) C*********************************************************************** -C + C SUBROUTINE SKPRNT = STACK PRINTING ROUTINE -C + C*********************************************************************** -C -C + REAL RSTACK (NDIM) -C + WRITE (LUNIT, '(I8,G12.5)') (I, RSTACK(I + 2), I = LEN, 1, -1) -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/smogs.f b/packages/seacas/applications/fastq/smogs.f index 4dd6de394d75..ff613e22fecb 100644 --- a/packages/seacas/applications/fastq/smogs.f +++ b/packages/seacas/applications/fastq/smogs.f @@ -1,88 +1,77 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: smogs.f,v 1.1 1990/11/30 11:15:51 gdsjaar Exp $ -C $Log: smogs.f,v $ -C Revision 1.1 1990/11/30 11:15:51 gdsjaar -C Initial revision -C -C -CC* FILE: [.QMESH]SMOGS.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE SMOGS (MXND, XN, YN, NXL, LXN, NNN, NNNOLD, NIT, EPS, & RO) C*********************************************************************** -C + C SUBROUTINE SMOGS = MESH SMOOTHING BY LAPLACE-S USING GAUSS-SEIDEL -C + C*********************************************************************** -C + C VARIABLES USED: C NIT = THE MAX NUMBER OF ITERATIONS TO DO. C EPS = MINIMUM DISTANCE NODES MUST MOVE TO CONTINUE ITERATIONS C RO = AN UNDER- OR OVER-RELAXATION FACTOR (NORMALLY 1.0) -C + C*********************************************************************** -C + DIMENSION LINES(20) DIMENSION LXN(4, MXND), NXL(2, 3*MXND), XN(MXND), YN(MXND) -C + LOGICAL BIG, ERR -C + IF (RO .LT. 0.01) RO = 1. EPS2 = (EPS*RO)**2 -C + C ITERATION LOOP -C + DO 120 IT = 1, NIT BIG = .FALSE. -C + C NODE LOOP -C + DO 110 NODE = NNNOLD + 1, NNN -C + C SKIP CONTINUATION AND BOUNDARY LINES -C + IF ((LXN(1, NODE) .GT. 0) .AND. (LXN(2, NODE) .GT. 0)) THEN -C + C SUM COORDINATES OF ALL NEIGHBORING NODES -C + SUMX = 0.0 SUMY = 0.0 CALL GETLXN (MXND, LXN, NODE, LINES, KOUNT, ERR) -C + C IGNORE ERR BECAUSE IT IS ALREADY TAKEN CARE OF IN THE SKIP -C + DO 100 IL = 1, KOUNT L = LINES(IL) IM = NXL(1, L) + NXL(2, L) - NODE SUMX = SUMX + XN(IM) SUMY = SUMY + YN(IM) 100 CONTINUE -C + C REDEFINE THIS NODE - S COORDINATES -C + SUMX = SUMX/DBLE(KOUNT) SUMY = SUMY/DBLE(KOUNT) XDEL = RO*(SUMX - XN(NODE)) YDEL = RO*(SUMY - YN(NODE)) XN(NODE) = XN(NODE) + XDEL YN(NODE) = YN(NODE) + YDEL -C + C CHECK FOR CONVERGENCE -C + IF ((XDEL*XDEL + YDEL*YDEL) .GT. EPS2) BIG = .TRUE. ENDIF 110 CONTINUE -C + C IF NO SIGNIFICANT MOVEMENTS OCCURRED, RETURN -C + IF (.NOT.BIG) RETURN 120 CONTINUE RETURN diff --git a/packages/seacas/applications/fastq/snapit.f b/packages/seacas/applications/fastq/snapit.f index fd371f8a43dd..3226401d17f5 100644 --- a/packages/seacas/applications/fastq/snapit.f +++ b/packages/seacas/applications/fastq/snapit.f @@ -1,15 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: snapit.f,v 1.1 1990/11/30 11:15:54 gdsjaar Exp $ -C $Log: snapit.f,v $ -C Revision 1.1 1990/11/30 11:15:54 gdsjaar -C Initial revision -C -C SUBROUTINE SNAPIT (I) RETURN END diff --git a/packages/seacas/applications/fastq/snappt.f b/packages/seacas/applications/fastq/snappt.f index 6bc6687d1601..180fb78a051b 100644 --- a/packages/seacas/applications/fastq/snappt.f +++ b/packages/seacas/applications/fastq/snappt.f @@ -1,45 +1,34 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: snappt.f,v 1.1 1990/11/30 11:15:56 gdsjaar Exp $ -C $Log: snappt.f,v $ -C Revision 1.1 1990/11/30 11:15:56 gdsjaar -C Initial revision -C -C -CC* FILE: [.MAIN]SNAPPT.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE SNAPPT (MSNAP, SNAPDX, NSNAP, X, Y) C*********************************************************************** -C + C SUBROUTINE SNAPPT = GETS THE X, Y TO THE CLOSEST GRID POINT -C + C*********************************************************************** -C + C VARIABLES USED: C SNAPDX = SNAP GRID LINE ARRAY C NSNAP = ARRAY OF GRID LINE COUNTERS C MSNAP = THE DIMENSION OF THE GRID LINE ARRAY C XMID = .TRUE. IF THE X VALUE FALLS BETWEEN TWO X GRID LINES C YMID = .TRUE. IF THE Y VALUE FALLS BETWEEN TWO Y GRID LINES -C + C*********************************************************************** -C + DIMENSION SNAPDX (2, MSNAP), NSNAP (2) -C + LOGICAL XMID, YMID -C + XMID = .FALSE. YMID = .FALSE. -C + C GET THE BOUNDING X SNAP LINES -C + IF (X .LE. SNAPDX (1, 1)) THEN XP = SNAPDX (1, 1) ELSEIF (X .GE. SNAPDX (1, NSNAP (1))) THEN @@ -55,9 +44,9 @@ SUBROUTINE SNAPPT (MSNAP, SNAPDX, NSNAP, X, Y) 100 CONTINUE 110 CONTINUE ENDIF -C + C GET THE BOUNDING Y SNAP LINES -C + IF (Y .LE. SNAPDX (2, 1)) THEN YP = SNAPDX (2, 1) ELSEIF (Y .GE. SNAPDX (2, NSNAP (2))) THEN @@ -73,21 +62,20 @@ SUBROUTINE SNAPPT (MSNAP, SNAPDX, NSNAP, X, Y) 120 CONTINUE 130 CONTINUE ENDIF -C + C NOW GET THE APPROPRIATE COMBINATION OF XLOW, XHIGH, XMID, YLOW, ETC. -C -C + C FIRST THE MOST COMMON CASE OF FITTING BETWEEN X AND Y GRIDS -C + IF ( (YMID) .AND. (XMID)) THEN -C + C GET THE SHORTEST DISTANCE TO THIS COMBINATION -C + DIST1 = SQRT ( ( (XP1 - X) ** 2) + ( (YP1 - Y) ** 2)) DIST2 = SQRT ( ( (XP1 - X) ** 2) + ( (YP2 - Y) ** 2)) DIST3 = SQRT ( ( (XP2 - X) ** 2) + ( (YP1 - Y) ** 2)) DIST4 = SQRT ( ( (XP2 - X) ** 2) + ( (YP2 - Y) ** 2)) -C + IF (DIST1 .LE. AMIN1 (DIST2, DIST3, DIST4)) THEN X = XP1 Y = YP1 @@ -101,15 +89,15 @@ SUBROUTINE SNAPPT (MSNAP, SNAPDX, NSNAP, X, Y) X = XP2 Y = YP2 ENDIF -C + C NOW THE CORNER CASES OF XLOW, XHIGH, YLOW, AND YHIGH COMBINATIONS -C + ELSEIF ( (.NOT.XMID) .AND. (.NOT.YMID)) THEN X = XP Y = YP -C + C NOW THE EDGE CASES OF XLOW OR XHIGH AND YMID -C + ELSEIF (.NOT.XMID) THEN X = XP DIST1 = SQRT ( ( (XP - X) ** 2) + ( (YP1 - Y) ** 2)) @@ -119,9 +107,9 @@ SUBROUTINE SNAPPT (MSNAP, SNAPDX, NSNAP, X, Y) ELSE Y = YP2 ENDIF -C + C NOW THE EDGE CASES OF XMID AND YHIGH OR YLOW -C + ELSEIF (.NOT.YMID) THEN Y = YP DIST1 = SQRT ( ( (XP1 - X) ** 2) + ( (YP - Y) ** 2)) @@ -131,14 +119,14 @@ SUBROUTINE SNAPPT (MSNAP, SNAPDX, NSNAP, X, Y) ELSE X = XP2 ENDIF -C + C NOW A CHECK TO MAKE SURE THAT SOMETHING DIDN'T FALL THROUGH -C + ELSE CALL MESAGE (' ** ERROR - IMPOSSIBLE CASE IN SNAPPT ** ') CALL PLTBEL ENDIF -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/snapxy.f b/packages/seacas/applications/fastq/snapxy.f index d335707787c5..a74addf41503 100644 --- a/packages/seacas/applications/fastq/snapxy.f +++ b/packages/seacas/applications/fastq/snapxy.f @@ -1,35 +1,24 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: snapxy.f,v 1.1 1990/11/30 11:15:59 gdsjaar Exp $ -C $Log: snapxy.f,v $ -C Revision 1.1 1990/11/30 11:15:59 gdsjaar -C Initial revision -C -C -CC* FILE: [.MAIN]SNAPXY.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE SNAPXY (MP, MSNAP, N, IPOINT, COOR, LINKP, SNAPDX, & NSNAP) C*********************************************************************** -C + C SUBROUTINE SNAPXY = ADDS SNAP GRIDS AT EVERY X, Y LOCATION -C + C*********************************************************************** -C + DIMENSION IPOINT (MP), COOR (2, MP), LINKP (2, MP) DIMENSION SNAPDX (2, MSNAP), NSNAP (2) -C + LOGICAL ERR, ADDLNK -C + ADDLNK = .FALSE. -C + DO 100 I = 1, N CALL LTSORT (MP, LINKP, IABS (IPOINT (I)), II, ADDLNK) IF (II.GT.0)THEN @@ -41,7 +30,7 @@ SUBROUTINE SNAPXY (MP, MSNAP, N, IPOINT, COOR, LINKP, SNAPDX, IF (ERR) RETURN ENDIF 100 CONTINUE -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/snpin1.f b/packages/seacas/applications/fastq/snpin1.f index 9a56cb0dc3b7..fad7880b186d 100644 --- a/packages/seacas/applications/fastq/snpin1.f +++ b/packages/seacas/applications/fastq/snpin1.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: snpin1.f,v 1.1 1990/11/30 11:16:02 gdsjaar Exp $ -C $Log: snpin1.f,v $ -C Revision 1.1 1990/11/30 11:16:02 gdsjaar -C Initial revision -C -C -CC* FILE: [.PAVING]SNAPIT_DUMMY.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE SNPIN1 (I, J, K, L, M) RETURN END diff --git a/packages/seacas/applications/fastq/solve.f b/packages/seacas/applications/fastq/solve.f index 95483d20baa1..97d4fb903c57 100644 --- a/packages/seacas/applications/fastq/solve.f +++ b/packages/seacas/applications/fastq/solve.f @@ -1,30 +1,19 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: solve.f,v 1.1 1990/11/30 11:16:05 gdsjaar Exp $ -C $Log: solve.f,v $ -C Revision 1.1 1990/11/30 11:16:05 gdsjaar -C Initial revision -C -C -CC* FILE: [.MAIN]SOLVE.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C REAL FUNCTION SOLVE (XA, XK, X, XCEN, YCEN, R1, R2) C*********************************************************************** -C + C FUNCTION SOLVE = FINDS A SOLUTION TO THE SPIRAL EQUATION C GIVEN AN INTERVAL THAT CONTAINS THE SOLUTION -C + C*********************************************************************** -C + EPS = 1.E-6 -C + F1 = SPIRAL (XA, XK, X, XCEN, YCEN, R1) IF (ABS(F1) .LT. EPS) THEN SOLVE = R1 @@ -35,14 +24,14 @@ REAL FUNCTION SOLVE (XA, XK, X, XCEN, YCEN, R1, R2) SOLVE = R2 GO TO 110 END IF -C + 100 CONTINUE IF (ABS(R1 - R2) .LT. EPS) THEN SOLVE = (R1 + R2)/2.0 ELSE R3 = (R1 + R2)/2.0 F3 = SPIRAL (XA, XK, X, XCEN, YCEN, R3) -C + IF (ABS(F3) .LT. EPS) THEN SOLVE = R3 GO TO 110 @@ -55,6 +44,6 @@ REAL FUNCTION SOLVE (XA, XK, X, XCEN, YCEN, R1, R2) END IF GO TO 100 END IF -C + 110 CONTINUE END diff --git a/packages/seacas/applications/fastq/sort.f b/packages/seacas/applications/fastq/sort.f index 07f45555c8b7..e554511ce112 100644 --- a/packages/seacas/applications/fastq/sort.f +++ b/packages/seacas/applications/fastq/sort.f @@ -1,27 +1,16 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: sort.f,v 1.1 1990/11/30 11:16:08 gdsjaar Exp $ -C $Log: sort.f,v $ -C Revision 1.1 1990/11/30 11:16:08 gdsjaar -C Initial revision -C -C -CC* FILE: [.RENUM]SORT.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE SORT (N, IX, IY) C*********************************************************************** -C + C SUBROUTINE SORT = SORT THE ARRAY IX, CARRYING ALONG IY -C + C*********************************************************************** -C + DIMENSION IX (N), IY (N) NN = N M = NN @@ -45,7 +34,7 @@ SUBROUTINE SORT (N, IX, IY) IF (I .GE. 1)GOTO 110 ENDIF 120 CONTINUE -C + GOTO 100 -C + END diff --git a/packages/seacas/applications/fastq/sortia.f b/packages/seacas/applications/fastq/sortia.f index 3562839386d4..32e93fea3e86 100644 --- a/packages/seacas/applications/fastq/sortia.f +++ b/packages/seacas/applications/fastq/sortia.f @@ -1,51 +1,40 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: sortia.f,v 1.1 1990/11/30 11:16:11 gdsjaar Exp $ -C $Log: sortia.f,v $ -C Revision 1.1 1990/11/30 11:16:11 gdsjaar -C Initial revision -C -C -CC* FILE: [.QMESH]SORTIA.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE SORTIA(N,IAR,IRANGE,I) C*********************************************************************** -C + C SUBROUTINE SORTIA = THIS SUBROUTINE SORTS AN INTEGER ARRAY IN C ASCENDING ORDER -C + C*********************************************************************** -C + C VARIABLES IN : N ... NUMBER OF ELEMENTS IN THE ARRAY C IAR ... INTEGER ARRAY WITH DATA TO BE SORTED C OUT: I ... INDEX ARRAY WITH ITS SORTED VALUES IN C ASCENDING ORDER. -C + C WRITTEN BY: HORACIO RECALDE DATE: FEB 25, 1988 C*********************************************************************** -C + INTEGER I(N),IAR(N) -C + C-- COPY ELEMENTS IN THE I ARRAY -C + DO 100 J = 1,IRANGE I(J) = IAR(J) 100 CONTINUE -C + C--- PERFORM AN EXCHANGE SORT ON THE FIRST IRANGE-1 -C + DO 120 K = 1,IRANGE - 1 MIN = I(K) -C + C--- EXCHANGE THE K-TH ELEMENTS WITH THE MINIMUM ELEMENT REMAIN -C + DO 110 J = K+1,IRANGE IF (I(J) .LT. MIN) THEN L = I(J) @@ -55,6 +44,6 @@ SUBROUTINE SORTIA(N,IAR,IRANGE,I) ENDIF 110 CONTINUE 120 CONTINUE -C + RETURN END diff --git a/packages/seacas/applications/fastq/sortst.f b/packages/seacas/applications/fastq/sortst.f index 6f7b578bc266..0dea1cd4ad9b 100644 --- a/packages/seacas/applications/fastq/sortst.f +++ b/packages/seacas/applications/fastq/sortst.f @@ -1,28 +1,17 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: sortst.f,v 1.1 1990/11/30 11:16:14 gdsjaar Exp $ -C $Log: sortst.f,v $ -C Revision 1.1 1990/11/30 11:16:14 gdsjaar -C Initial revision -C -C -CC* FILE: [.QMESH]SORTST.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE SORTST(N, ARRIN, ITOPP, IBOTP, IRANGE, INDX) C*********************************************************************** -C + C SUBROUTINE SORTST = THIS SUBROUTINE SORTS A REAL ARRAY IN ASCENDING C ORDER AND DOES IT JUST CHANGING THE INDEX ARRAY. -C + C*********************************************************************** -C + C VARIABLES IN : N ......NUMBER OF ELEMENTS IN THE ARRAY C ARRIN ..REAL ARRAY WITH DATA TO BE SORTED C ITOPP...TOP POINTER IN THE X ARRAY @@ -30,24 +19,24 @@ SUBROUTINE SORTST(N, ARRIN, ITOPP, IBOTP, IRANGE, INDX) C OUT: INDX ...INDEX ARRAY WITH ITS SORTED VALUES IN C ASCENDING ORDER. C IRANGE..RANGE BETWEEN THE ARRAY 'INDX' WAS SORTED -C + C WRITTEN BY: HORACIO RECALDE DATE: JAN 20, 1988 C MODIFIED BY: MB STEPHENSON DATA: MAR 08, 1989 C REPLACED EXCHANGE SORT WITH HEAPSORT FOR EFFICIENCY C*********************************************************************** -C + REAL ARRIN(N) INTEGER INDX(N) -C + C... CHECK POINTERS -C + ITOP = ITOPP IBOT = IBOTP IF (ITOP .GT. N) ITOP = ITOP - N IF (IBOT .GT. N) IBOT = IBOT - N -C + C--- CALCULATE THE RANGE AND INITIALIZE INDEX ARRAY -C + IF (ITOP .EQ. IBOT) THEN IRANGE = 1 INDX(1) = ITOP @@ -57,17 +46,17 @@ SUBROUTINE SORTST(N, ARRIN, ITOPP, IBOTP, IRANGE, INDX) ELSE IRANGE = IBOT - ITOP + N + 1 ENDIF -C + DO 100 J = 1, IRANGE INDX(J) = ITOP ITOP = ITOP + 1 IF (ITOP .GT. N) ITOP = 1 100 CONTINUE -C + C--- PERFORM A HEAPSORT ON THE ELEMENTS C (SEE NUMERICAL RECEIPTS, PG. 233) C NOTE: THERE MUST BE AT LEAST 2 ELEMENTS IN THE ARRAY -C + L = IRANGE/2 + 1 IR = IRANGE 110 CONTINUE @@ -85,7 +74,7 @@ SUBROUTINE SORTST(N, ARRIN, ITOPP, IBOTP, IRANGE, INDX) RETURN END IF END IF -C + I = L J = L + L 120 CONTINUE @@ -104,5 +93,5 @@ SUBROUTINE SORTST(N, ARRIN, ITOPP, IBOTP, IRANGE, INDX) END IF INDX(I) = INDXT GO TO 110 -C + END diff --git a/packages/seacas/applications/fastq/spaced.f b/packages/seacas/applications/fastq/spaced.f index 4e36f5973621..184cd1cf7d0e 100644 --- a/packages/seacas/applications/fastq/spaced.f +++ b/packages/seacas/applications/fastq/spaced.f @@ -1,40 +1,29 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: spaced.f,v 1.1 1990/11/30 11:16:18 gdsjaar Exp $ -C $Log: spaced.f,v $ -C Revision 1.1 1990/11/30 11:16:18 gdsjaar -C Initial revision -C -C -CC* FILE: [.PAVING]SPACED.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE SPACED (MXND, MXCORN, MLN, ILEN, NCORN, LCORN, LNODES, & ICOMB, ITEST, LTEST, ERR) C*********************************************************************** -C + C SUBROUTINE SPACED = COUNTS THE INTERVAL SPACINGS FOR A COMBINATION -C + C*********************************************************************** -C + DIMENSION ICOMB (MXCORN), LCORN (MXCORN) DIMENSION ITEST (ILEN), LTEST (ILEN) DIMENSION LNODES (MLN, MXND) -C + LOGICAL ERR -C + ERR = .TRUE. KLEN = 0 KOUNTC = 0 -C + DO 100 I = 1, NCORN -C + IF (ICOMB (I) .EQ. 1) THEN KLEN = KLEN + 1 IF (KLEN .GT. ILEN) THEN @@ -42,7 +31,7 @@ SUBROUTINE SPACED (MXND, MXCORN, MLN, ILEN, NCORN, LCORN, LNODES, & 'MATCH DATA') RETURN ENDIF -C + ITEST (KLEN) = LCORN(I) LTEST (KLEN) = KOUNTC KOUNTC = LNODES (7, LCORN(I)) @@ -50,21 +39,21 @@ SUBROUTINE SPACED (MXND, MXCORN, MLN, ILEN, NCORN, LCORN, LNODES, KOUNTC = KOUNTC + LNODES (7, LCORN (I)) ENDIF 100 CONTINUE -C + C NOW ADD THE REMAINING KOUNTC ONTO THE FRONT -C + LTEST (1) = LTEST (1) + KOUNTC -C + C NOW SWITCH THE COUNTS TO BE FOLLOWING THE CORNERS INSTEAD OF C BEFORE THE CORNERS -C + IHOLD = LTEST (1) DO 110 I = 2, KLEN LTEST (I - 1) = LTEST (I) 110 CONTINUE LTEST (KLEN) = IHOLD -C + ERR = .FALSE. RETURN -C + END diff --git a/packages/seacas/applications/fastq/spawn.f b/packages/seacas/applications/fastq/spawn.f index 193df2c5b112..ae7e5c74ca16 100644 --- a/packages/seacas/applications/fastq/spawn.f +++ b/packages/seacas/applications/fastq/spawn.f @@ -1,44 +1,27 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: spawn.f,v 1.2 1990/11/30 11:46:57 gdsjaar Exp $ -C $Log: spawn.f,v $ -C Revision 1.2 1990/11/30 11:46:57 gdsjaar -C Removed LIB$SPAWN call -C -c Revision 1.1.1.1 90/11/30 11:16:22 gdsjaar -c FASTQ Version 2.0X -c -c Revision 1.1 90/11/30 11:16:21 gdsjaar -c Initial revision -c -C -CC* FILE: [.MAIN]SPAWN.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE SPAWN (VAXVMS) C*********************************************************************** -C + C SUBROUTINE SPAWN = SPAWNS A PROCESS FOR ESCAPE OUT OF FASTQ -C + C*********************************************************************** -C + C VARIABLES USED: C VAXVMS = .TRUE. IF RUNNING ON A VAXVMS SYSTEM -C + C*********************************************************************** -C + LOGICAL VAXVMS -C + IF (VAXVMS) THEN continue ELSE CALL MESAGE ('SPAWNING POSSIBLE ONLY ON VAXVMS SYSTEM') ENDIF -C + END diff --git a/packages/seacas/applications/fastq/spiral.f b/packages/seacas/applications/fastq/spiral.f index 5cc287cfd117..ebe18e196bb9 100644 --- a/packages/seacas/applications/fastq/spiral.f +++ b/packages/seacas/applications/fastq/spiral.f @@ -1,29 +1,18 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: spiral.f,v 1.1 1990/11/30 11:16:24 gdsjaar Exp $ -C $Log: spiral.f,v $ -C Revision 1.1 1990/11/30 11:16:24 gdsjaar -C Initial revision -C -C -CC* FILE: [.MAIN]SPIRAL.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C REAL FUNCTION SPIRAL (XA, XK, X, XCEN, YCEN, ANGLE) C*********************************************************************** -C + C FUNCTION SPIRAL = CALCULATES THE Y VALUUE GIVEN THE SPIRAL AND X -C + C*********************************************************************** -C + SPIRAL = XA * EXP (XK * ANGLE) * COS (ANGLE) - (X - XCEN) -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/spring.f b/packages/seacas/applications/fastq/spring.f index 554278348b30..56d4ee576f77 100644 --- a/packages/seacas/applications/fastq/spring.f +++ b/packages/seacas/applications/fastq/spring.f @@ -1,32 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: spring.f,v 1.2 1991/04/10 19:56:54 gdsjaar Exp $ -C $Log: spring.f,v $ -C Revision 1.2 1991/04/10 19:56:54 gdsjaar -C Fixed some logical variables -C -c Revision 1.1.1.1 1990/11/30 11:16:28 gdsjaar -c FASTQ Version 2.0X -c -c Revision 1.1 90/11/30 11:16:27 gdsjaar -c Initial revision -c -C -CC* FILE: [.QMESH]SPRING.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/31/90 -CC* MODIFICATION: ADDED ARGUMENTS TO CALL TO SPRING TO PASS MINIMUM -CC** ELEMENT SIZE (SIZMIN) AND GETSIZ PARAMETERS OF -CC** EMIN AND EMAX -C SUBROUTINE SPRING (MP, ML, MS, MXNPER, MXND, MAXNBC, MAXSBC, L, & IPOINT, COOR, IPBOUN, LINKP, ILINE, LTYPE, NINT, FACTOR, LCON, & ILBOUN, ISBOUN, LINKL, NLPB, JFLINE, JLLIST, LINKPB, NPPF, @@ -37,11 +14,11 @@ SUBROUTINE SPRING (MP, ML, MS, MXNPER, MXND, MAXNBC, MAXSBC, L, & NPEOLD, NNXK, REMESH, REXMIN, REXMAX, REYMIN, REYMAX, IDIVIS, & SIZMIN, EMAX, EMIN, GRAPH) C*********************************************************************** -C + C SUBROUTINE SPRING = GENERATES SPRING ELEMENTS FROM A BARSET -C + C*********************************************************************** -C + DIMENSION IPOINT(MP), COOR(2, MP), IPBOUN(MP), LINKP(2, MP) DIMENSION ILINE(ML), LTYPE(ML), NINT(ML), FACTOR(ML), LCON(3, ML) DIMENSION ILBOUN(ML), ISBOUN(ML), LINKL(2, ML) @@ -53,13 +30,13 @@ SUBROUTINE SPRING (MP, ML, MS, MXNPER, MXND, MAXNBC, MAXSBC, L, DIMENSION LINKLB(2, ML), LINKSB(2, ML) DIMENSION X(MXNPER), Y(MXNPER), NID(MXNPER) DIMENSION XN(MXND), YN(MXND), NUID(MXND), LXK(4,MXND) -C + DIMENSION AMESUR(NPEOLD), XNOLD(NPNOLD), YNOLD(NPNOLD) DIMENSION NXKOLD(NNXK, NPEOLD), MMPOLD(3, NPROLD) DIMENSION LINKEG(2, MLINK), LISTEG(4 * NPEOLD), BMESUR(NPNOLD) -C + LOGICAL NOROOM, ERR, REAL, TEST, ADDLNK, COUNT, GRAPH -C + REAL = .TRUE. TEST = .FALSE. KKK = 0 @@ -67,10 +44,10 @@ SUBROUTINE SPRING (MP, ML, MS, MXNPER, MXND, MAXNBC, MAXSBC, L, KNBC = 0 KSBC = 0 LLL = 1 -C + C CHECK THAT THE BARSET HAS ONLY TWO SIDES AND THAT THE SIDES HAVE C EQUAL INTERVALS -C + IF (NLPB (L) .NE. 2) THEN ERR = .TRUE. CALL MESAGE (' SPRINGS CAN ONLY BE GENERATED FOR 2 LINE BAR '// @@ -88,9 +65,9 @@ SUBROUTINE SPRING (MP, ML, MS, MXNPER, MXND, MAXNBC, MAXSBC, L, GOTO 130 ENDIF ENDIF -C + C NOW GENERATE THE NODES FOR THE FIRST LINE -C + CALL LTSORT (MP, LINKP, LCON(1, KK1), IP1, ADDLNK) CALL LTSORT (MP, LINKP, LCON(2, KK1), IP2, ADDLNK) IF (LCON(3, KK1) .GT. 0) THEN @@ -102,13 +79,7 @@ SUBROUTINE SPRING (MP, ML, MS, MXNPER, MXND, MAXNBC, MAXSBC, L, ELSE IP3 = 0 END IF -C -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/31/90 -CC* MODIFICATION: ADDED ARGUMENTS TO CALL TO PLINE TO PASS MINIMUM -CC** ELEMENT SIZE (SIZMIN) AND GETSIZ PARAMETERS OF -CC** EMIN AND EMAX -C + CALL PLINE (MP, ML, MXNPER, MAXNBC, MAXSBC, IPOINT, & COOR, LINKP, ILINE(KK1), LTYPE(KK1), NINT(KK1), & FACTOR(KK1), IP1, IP2, IP3, X, Y, NID, @@ -123,9 +94,9 @@ SUBROUTINE SPRING (MP, ML, MS, MXNPER, MXND, MAXNBC, MAXSBC, L, CALL MESAGE ('PROBLEMS GENERATING NODES FOR FIRST SPRING LINE') GOTO 130 ENDIF -C + C ADD THESE NODES TO THE CURRENT LIST -C + NNN0 = NNN + 1 NNN = NNN + ABS(NINT(KK1)) + 1 KOUNT = 0 @@ -135,16 +106,15 @@ SUBROUTINE SPRING (MP, ML, MS, MXNPER, MXND, MAXNBC, MAXSBC, L, YN(I) = Y(KOUNT) NUID(I) = NID(KOUNT) 100 CONTINUE -C + C MARK THESE POINTS AND THE LINE AS BEING USED -C + NINT(KK1) = -ABS(NINT(KK1)) IPOINT(IP1) = -ABS(IPOINT(IP1)) IPOINT(IP2) = -ABS(IPOINT(IP2)) -C -C + C NOW GENERATE THE NODES FOR THE SECOND LINE -C + CALL LTSORT (MP, LINKP, LCON(1, KK2), IP1, ADDLNK) CALL LTSORT (MP, LINKP, LCON(2, KK2), IP2, ADDLNK) IF (LCON(3, KK2) .GT. 0) THEN @@ -156,13 +126,7 @@ SUBROUTINE SPRING (MP, ML, MS, MXNPER, MXND, MAXNBC, MAXSBC, L, ELSE IP3 = 0 END IF -C -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/31/90 -CC* MODIFICATION: ADDED ARGUMENTS TO CALL TO PLINE TO PASS MINIMUM -CC** ELEMENT SIZE (SIZMIN) AND GETSIZ PARAMETERS OF -CC** EMIN AND EMAX -C + CALL PLINE (MP, ML, MXNPER, MAXNBC, MAXSBC, IPOINT, & COOR, LINKP, ILINE(KK2), LTYPE(KK2), NINT(KK2), & FACTOR(KK2), IP1, IP2, IP3, X, Y, NID, @@ -177,9 +141,9 @@ SUBROUTINE SPRING (MP, ML, MS, MXNPER, MXND, MAXNBC, MAXSBC, L, CALL MESAGE ('PROBLEMS GENERATING NODES FOR FIRST SPRING LINE') GOTO 130 ENDIF -C + C ADD THESE NODES TO THE CURRENT LIST -C + NNN1 = NNN + 1 NNN = NNN + ABS(NINT(KK2)) + 1 KOUNT = 0 @@ -189,16 +153,16 @@ SUBROUTINE SPRING (MP, ML, MS, MXNPER, MXND, MAXNBC, MAXSBC, L, YN(I) = Y(KOUNT) NUID(I) = NID(KOUNT) 110 CONTINUE -C + C MARK THESE POINTS AND THE LINE AS BEING USED -C + NINT(KK2) = -ABS(NINT(KK2)) IPOINT(IP1) = -ABS(IPOINT(IP1)) IPOINT(IP2) = -ABS(IPOINT(IP2)) -C + C NOW GENERATE THE ELEMENTS BY SEEING WHICH END OF THE LINE MATCHES C UP THE CLOSEST. -C + DIST1 = SQRT ( (XN(NNN0) - XN(NNN1))**2 + & (YN(NNN0) - YN(NNN1))**2 ) DIST2= SQRT ( (XN(NNN0) - XN(NNN))**2 + @@ -215,7 +179,7 @@ SUBROUTINE SPRING (MP, ML, MS, MXNPER, MXND, MAXNBC, MAXSBC, L, LXK(3,KKK) = 0 LXK(4,KKK) = 0 120 CONTINUE -C + 130 CONTINUE -C + END diff --git a/packages/seacas/applications/fastq/squash.f b/packages/seacas/applications/fastq/squash.f index 8772e3bcf1e0..e52df92a917b 100644 --- a/packages/seacas/applications/fastq/squash.f +++ b/packages/seacas/applications/fastq/squash.f @@ -1,50 +1,33 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: squash.f,v 1.2 1991/03/21 15:45:19 gdsjaar Exp $ -C $Log: squash.f,v $ -C Revision 1.2 1991/03/21 15:45:19 gdsjaar -C Changed all 3.14159... to atan2(0.0, -1.0) -C -c Revision 1.1.1.1 1990/11/30 11:16:31 gdsjaar -c FASTQ Version 2.0X -c -c Revision 1.1 90/11/30 11:16:30 gdsjaar -c Initial revision -c -C -CC* FILE: [.QMESH]SQUASH.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE SQUASH (MXND, XN, YN, NUID, LXK, KXL, NXL, LXN, KKK, & KKKOLD, NNN, NAVAIL, IAVAIL, ASMALL, DONE, NOROOM, ERR) C*********************************************************************** -C + C SUBROUTINE SQUASH = TRIES TO SQUASH THE MOST SHARPELY RHOMBICAL C ELEMENT IN THE MESH -C + C*********************************************************************** -C + C VARIABLES: C ASMALL = AN ANGLE CONSIDERED TO BE TOO SMALL (DEGREES) C DONE = .TRUE. IF A SQUASH WAS DONE -C + C*********************************************************************** -C + DIMENSION NODES(4), LINES(4), L1LIST(20) DIMENSION RHOM(6), KR(6) DIMENSION LXK(4, MXND), NXL(2, 3*MXND), KXL(2, 3*MXND) DIMENSION LXN(4, MXND), XN(MXND), YN(MXND), NUID(MXND) -C + LOGICAL ERR, NOROOM, DONE, CCW -C + C CHECK FOR IMPENDING OVERFLOW -C + NOROOM = .FALSE. ERR = .FALSE. DONE = .FALSE. @@ -54,24 +37,24 @@ SUBROUTINE SQUASH (MXND, XN, YN, NUID, LXK, KXL, NXL, LXN, KKK, ERR = .TRUE. RETURN END IF -C + C INITIALIZATION -C + PI = ATAN2(0.0, -1.0) IF (ASMALL .GT. 80.0)ASMALL = 80.0 ALOP = ASMALL*PI/180. DMAX = SIN(0.5*ALOP)/COS(0.5*ALOP) DMAX = DMAX**2 -C + C CLEAR RECORDS -C + DO 100 I = 1, 6 RHOM(I) = 10.0 KR(I) = 0 100 CONTINUE -C + C ELEMENT LOOP -C + DO 130 K = KKKOLD + 1, KKK IF (LXK(1, K) .GT. 0) THEN CCW = .FALSE. @@ -88,9 +71,9 @@ SUBROUTINE SQUASH (MXND, XN, YN, NUID, LXK, KXL, NXL, LXN, KKK, ELSE DRAT = 0. END IF -C + C RECORD WORST FIVE -C + IF (DRAT .LE. DMAX) THEN KR(6) = K RHOM(6) = DRAT @@ -108,9 +91,9 @@ SUBROUTINE SQUASH (MXND, XN, YN, NUID, LXK, KXL, NXL, LXN, KKK, END IF END IF 130 CONTINUE -C + C SQUASH WORST ELEMENT NOT VIOLATING THE BOUNDARY -C + DO 140 IK = 1, 5 K = KR(IK) IF (K .GT. 0) THEN @@ -122,10 +105,10 @@ SUBROUTINE SQUASH (MXND, XN, YN, NUID, LXK, KXL, NXL, LXN, KKK, N4 = NODES(4) DIAG1 = (XN(N3) - XN(N1))**2 + (YN(N3) - YN(N1))**2 DIAG2 = (XN(N4) - XN(N2))**2 + (YN(N4) - YN(N2))**2 -C + C ARRANGE NODES SO THE SHORT DIAGONAL IS FROM 1ST TO 3RD NODES C AND INSURE THAT THE NODE TO BE DELETED IS NOT A BOUNDARY NODE -C + IF (DIAG1 .GT. DIAG2) CALL NXKORD (NODES, N2) N1 = NODES(1) N3 = NODES(3) @@ -135,18 +118,18 @@ SUBROUTINE SQUASH (MXND, XN, YN, NUID, LXK, KXL, NXL, LXN, KKK, END IF 140 CONTINUE RETURN -C + C PREPARE FOR THE SQUASH OF ELEMENT K -C + 150 CONTINUE DONE = .TRUE. N1 = NODES(1) N2 = NODES(2) N3 = NODES(3) N4 = NODES(4) -C + C FIND THE LINES ASSOCIATED WITH THE ELEMENT TO BE DELETED -C + DO 160 I = 1, 4 J = I + 1 IF (J .GE. 5) J = 1 @@ -158,20 +141,20 @@ SUBROUTINE SQUASH (MXND, XN, YN, NUID, LXK, KXL, NXL, LXN, KKK, RETURN END IF 160 CONTINUE -C + C FIND ELEMENTS ON OTHER SIDES OF THE LINES C K2 AND K3 ARE NEVER NEEDED -C + L1 = LINES(1) L2 = LINES(2) L3 = LINES(3) L4 = LINES(4) K1 = KXL(1, L1) + KXL(2, L1) - K K4 = KXL(1, L4) + KXL(2, L4) - K -C + C FIX LXK ARRAY C DISCARD L1 FOR L2 IN K1 -C + DO 170 I = 1, 4 IF (LXK(I, K1) .EQ. L1) THEN LXK(I, K1) = L2 @@ -182,9 +165,9 @@ SUBROUTINE SQUASH (MXND, XN, YN, NUID, LXK, KXL, NXL, LXN, KKK, ERR = .TRUE. RETURN 180 CONTINUE -C + C DISCARD L4 FOR L3 IN K4 -C + DO 190 I = 1, 4 IF (LXK(I, K4) .EQ. L4) THEN LXK(I, K4) = L3 @@ -195,47 +178,47 @@ SUBROUTINE SQUASH (MXND, XN, YN, NUID, LXK, KXL, NXL, LXN, KKK, ERR = .TRUE. RETURN 200 CONTINUE -C + C DELETE ELEMENT K -C + DO 210 I = 1, 4 LXK(I, K) = 0 210 CONTINUE -C + C FIX KXL ARRAY C DISCARD K FOR K1 WITH L2 -C + IF (KXL(1, L2) .EQ. K) THEN KXL(1, L2) = K1 ELSE IF (KXL(2, L2) .EQ. K) THEN KXL(2, L2) = K1 END IF -C + C DISCARD K FOR K4 WITH L3 -C + IF (KXL(1, L3) .EQ. K) THEN KXL(1, L3) = K4 ELSE IF (KXL(2, L3) .EQ. K) THEN KXL(2, L3) = K4 END IF -C + C DELETE L1 AND L4 -C + KXL(1, L1) = 0 KXL(2, L1) = 0 KXL(1, L4) = 0 KXL(2, L4) = 0 -C + C FIX NXL ARRAY C DELETE L1 AND L4 -C + NXL(1, L1) = 0 NXL(2, L1) = 0 NXL(1, L4) = 0 NXL(2, L4) = 0 -C + C RECONNECT ALL LINES CONNECTING TO NODE 1 TO NODE 3 -C + CALL GETLXN (MXND, LXN, N1, L1LIST, NL, ERR) IF (ERR) RETURN DO 220 I = 1, NL @@ -246,19 +229,19 @@ SUBROUTINE SQUASH (MXND, XN, YN, NUID, LXK, KXL, NXL, LXN, KKK, NXL(2, LL) = N3 END IF 220 CONTINUE -C + C FIX LXN ARRAY C UNHOOK L1 FROM N2 AND L4 FROM N4 -C + CALL DELLXN (MXND, LXN, NUID, NAVAIL, IAVAIL, N2, L1, NNN, ERR, & NOROOM) IF (ERR) RETURN CALL DELLXN (MXND, LXN, NUID, NAVAIL, IAVAIL, N4, L4, NNN, ERR, & NOROOM) IF (ERR) RETURN -C + C ADD ALL LINES HOOKED TO N3 TO THE LIST OF LINES FOR N3 -C + DO 230 I = 1, NL LL = L1LIST(I) IF ((LL .NE. L1) .AND. (LL .NE. L4)) THEN @@ -267,25 +250,25 @@ SUBROUTINE SQUASH (MXND, XN, YN, NUID, LXK, KXL, NXL, LXN, KKK, IF (ERR) RETURN END IF 230 CONTINUE -C + C DELETE N1 (UNHOOK EVERYTHING FROM IT) -C + DO 240 I = 1, 3 LXN(I, N1) = 0 240 CONTINUE LXN(4, N1) = IAVAIL IAVAIL = N1 NAVAIL = NAVAIL + 1 -C + C FIX XN AND YN ARRAYS C DEFINE POSITION OF N3 -C + IF (LXN(2, N3) .GT. 0) THEN XN(N3) = 0.5*(XN(N1) + XN(N3)) YN(N3) = 0.5*(YN(N1) + YN(N3)) END IF NUID(N1) = 0 RETURN -C + 10000 FORMAT(' IN SQUASH, ELEMENT', I5, ' DOES NOT CONTAIN LINE', I5) END diff --git a/packages/seacas/applications/fastq/srtnbc.f b/packages/seacas/applications/fastq/srtnbc.f index d236730487e0..e13057eff180 100644 --- a/packages/seacas/applications/fastq/srtnbc.f +++ b/packages/seacas/applications/fastq/srtnbc.f @@ -1,28 +1,17 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: srtnbc.f,v 1.1 1990/11/30 11:16:33 gdsjaar Exp $ -C $Log: srtnbc.f,v $ -C Revision 1.1 1990/11/30 11:16:33 gdsjaar -C Initial revision -C -C -CC* FILE: [.RENUM]SRTNBC.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE SRTNBC (MXNFLG, NPNBC, NNN, NNFLG, NNLEN, NNPTR, & NODES, LSTNBC, IHERE, NNNBC, NBCNOD, NNLIST) C*********************************************************************** -C + C SUBROUTINE SRTNBC = SORTS THE LIST OF NODAL BOUNDARY FLAGS -C + C*********************************************************************** -C + C VARIABLES USED: C IHERE = AN ATTENDANCE ARRAY TO SEE IF A NODE HAS BEEN FLAGGED C NNFLG = THE ARRAY OF FLAG VALUES @@ -34,28 +23,28 @@ SUBROUTINE SRTNBC (MXNFLG, NPNBC, NNN, NNFLG, NNLEN, NNPTR, C MXNFLG = THE NUMBER OF ENTRIES IN THE BOUNDARY LIST C ENTER = .TRUE. IF THE FOLLOWING NODES ARE TO BE CHECKED "HERE" C FOUND = .TRUE. IF A NEW UNIQUE FLAG HAS BEEN FOUND -C + C*********************************************************************** -C + DIMENSION NNFLG (MXNFLG), NNLEN (MXNFLG), NNPTR (MXNFLG) DIMENSION NODES (NPNBC), LSTNBC (NPNBC), IHERE (NNN) -C + LOGICAL ENTER, FOUND -C + NNLIST = 0 IHOLD = 1 NBCNOD = 0 -C + 100 CONTINUE ISTART = IHOLD IHOLD = NNNBC ENTER = .FALSE. FOUND = .FALSE. -C + DO 110 I = 1, NNN IHERE (I) = 0 110 CONTINUE -C + DO 120 I = ISTART, NNNBC IF (LSTNBC (I) .LT. 0) THEN IF (FOUND) THEN @@ -83,7 +72,7 @@ SUBROUTINE SRTNBC (MXNFLG, NPNBC, NNN, NNFLG, NNLEN, NNPTR, ENDIF ENDIF 120 CONTINUE -C + IF (FOUND) THEN DO 130 I = 1, NNN IF (IHERE (I) .EQ. 1) THEN @@ -96,5 +85,5 @@ SUBROUTINE SRTNBC (MXNFLG, NPNBC, NNN, NNFLG, NNLEN, NNPTR, ELSE RETURN ENDIF -C + END diff --git a/packages/seacas/applications/fastq/srtsbc.f b/packages/seacas/applications/fastq/srtsbc.f index cb4de71c96c0..9e84aa891fa0 100644 --- a/packages/seacas/applications/fastq/srtsbc.f +++ b/packages/seacas/applications/fastq/srtsbc.f @@ -1,37 +1,18 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: srtsbc.f,v 1.2 2000/11/13 15:39:05 gdsjaar Exp $ -C $Log: srtsbc.f,v $ -C Revision 1.2 2000/11/13 15:39:05 gdsjaar -C Cleaned up unused variables and labels. -C -C Removed some real to int conversion warnings. -C -C Revision 1.1.1.1 1990/11/30 11:16:37 gdsjaar -C FASTQ Version 2.0X -C -c Revision 1.1 90/11/30 11:16:36 gdsjaar -c Initial revision -c -C -CC* FILE: [.RENUM]SRTSBC.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE SRTSBC (MXSFLG, NPSBC, NPELEM, NNXK, NXK, NSFLG, NSLEN, & NSPTR, NVLEN, NVPTR, LSTSBC, NELEMS, NSIDEN, NSIDES, NNSBC, & NSLIST, NVLIST, NBCSID) C*********************************************************************** -C + C SUBROUTINE SRTSBC = SORTS THE LIST OF SIDE BOUNDARY CARDS -C + C*********************************************************************** -C + C VARIABLES USED: C NSFLG = THE ARRAY OF FLAG VALUES C NSLEN = NUMBER OF ELEMENTS IN ILIST ASSOCIATED WITH EACH FLAG @@ -40,25 +21,25 @@ SUBROUTINE SRTSBC (MXSFLG, NPSBC, NPELEM, NNXK, NXK, NSFLG, NSLEN, C KKK = THE NUMBER OF ELEMENTS IN THE MESH C MXSFLG = THE NUMBER OF ENTRIES IN THE BOUNDARY LIST C FOUND = .TRUE. IF A NEW UNIQUE FLAG HAS BEEN FOUND -C + C*********************************************************************** -C + DIMENSION NXK (NNXK, NPELEM) DIMENSION NSFLG (MXSFLG), NSLEN (MXSFLG), NSPTR (MXSFLG) DIMENSION NVLEN (MXSFLG), NVPTR (MXSFLG) DIMENSION LSTSBC (NPSBC), NELEMS (NPSBC) DIMENSION NSIDES (NPSBC), NSIDEN (NPSBC) -C + LOGICAL FOUND -C + IFLAG = -1 NSLIST = 0 NBCSID = 0 IBEGIN = 1 -C + 100 CONTINUE FOUND = .FALSE. -C + DO 110 I = IBEGIN, NNSBC, 3 IF (LSTSBC (I) .LT. 0) THEN IF (FOUND) THEN @@ -84,14 +65,14 @@ SUBROUTINE SRTSBC (MXSFLG, NPSBC, NPELEM, NNXK, NXK, NSFLG, NSLEN, ENDIF ENDIF 110 CONTINUE -C + IF (FOUND) THEN GOTO 100 ELSE -C + C PUT ALL THE NODES ATTACHED TO THE ELEMENT BCC INTO THE C NSIDEN LIST -C + NVLIST = 0 DO 130 I = 1, NBCSID ISTART = NSPTR (I) @@ -110,5 +91,5 @@ SUBROUTINE SRTSBC (MXSFLG, NPSBC, NPELEM, NNXK, NXK, NSFLG, NSLEN, 130 CONTINUE RETURN ENDIF -C + END diff --git a/packages/seacas/applications/fastq/strait.f b/packages/seacas/applications/fastq/strait.f index 44c7ac5a5eeb..caba467cd59b 100644 --- a/packages/seacas/applications/fastq/strait.f +++ b/packages/seacas/applications/fastq/strait.f @@ -1,63 +1,43 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: strait.f,v 1.2 1998/07/14 18:20:03 gdsjaar Exp $ -C $Log: strait.f,v $ -C Revision 1.2 1998/07/14 18:20:03 gdsjaar -C Removed unused variables, cleaned up a little. -C -C Changed BLUE labels to GREEN to help visibility on black background -C (indirectly requested by a couple users) -C -C Revision 1.1.1.1 1990/11/30 11:16:40 gdsjaar -C FASTQ Version 2.0X -C -c Revision 1.1 90/11/30 11:16:39 gdsjaar -c Initial revision -c -C -CC* FILE: [.MAIN]STRAIT.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE STRAIT (MP, ML, MCOM, ICOM, JCOM, CIN, RIN, IIN, KIN, & IDUMP, N, COOR, LCON, LINKP, LINKL) C*********************************************************************** -C + C SUBROUTINE STRAIT = STRAIGHTENS LINES IN THE X OR Y DIRECTION -C + C*********************************************************************** -C + C SUBROUTINE CALLED BY: C FASTQ = A PROGRAM TO QUICKLY PREPARE QMESH INPUT -C + C*********************************************************************** -C + C SUBROUTINES CALLED: C CHECK = CHECKS 2 VALUES FOR BEING OUT OF PRESCRIBED BOUNDS -C + C*********************************************************************** -C + C VARIABLES USED: C IANS = LOGICAL RESPONSE FROM YES-NO QUESTION C ANS = CHARACTER RESPONSE FOR MENU CHOICE -C + C*********************************************************************** -C + DIMENSION COOR (2, MP), LCON (3, ML), LINKP (2, MP) DIMENSION LINKL (2, ML), N (29) DIMENSION KIN (MCOM), IIN (MCOM), RIN (MCOM) -C + CHARACTER*72 CIN (MCOM) LOGICAL ADDLNK -C + IZ=0 ADDLNK=.FALSE. -C + 100 CONTINUE IF (N (2).GT.0)THEN CALL MESAGE (' ') @@ -74,9 +54,9 @@ SUBROUTINE STRAIT (MP, ML, MCOM, ICOM, JCOM, CIN, RIN, IIN, KIN, ELSE RETURN ENDIF -C + C STRAIGHTEN THE LINE IN THE Y DIRECTION -C + IF ( (CIN (ICOM) (1:1) .EQ. 'Y') .OR. & (CIN (ICOM) (1:1) .EQ. 'y'))THEN ICOM=ICOM+1 @@ -108,9 +88,9 @@ SUBROUTINE STRAIT (MP, ML, MCOM, ICOM, JCOM, CIN, RIN, IIN, KIN, ENDIF ENDIF 120 CONTINUE -C + C STRAIGHTEN THE LINE IN THE X DIRECTION -C + ELSEIF ( (CIN (ICOM) (1:1).EQ.'X') .OR. & (CIN (ICOM) (1:1).EQ.'x')) THEN ICOM=ICOM+1 @@ -154,11 +134,11 @@ SUBROUTINE STRAIT (MP, ML, MCOM, ICOM, JCOM, CIN, RIN, IIN, KIN, RETURN ENDIF GOTO 100 -C + 10000 FORMAT (' LINE', I5, ' HAS THE FOLLOWING END POINTS:', /, & ' POINT:', I5, ' X COORDINATE', G14.7, ' Y COORDINATE ', & G14.7, /, & ' POINT:', I5, ' X COORDINATE', G14.7, ' Y COORDINATE ', & G14.7) -C + END diff --git a/packages/seacas/applications/fastq/strcut.f b/packages/seacas/applications/fastq/strcut.f index d9d014c19206..6a68fc5d345f 100644 --- a/packages/seacas/applications/fastq/strcut.f +++ b/packages/seacas/applications/fastq/strcut.f @@ -1,22 +1,16 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: strcut.f,v 1.1 1990/11/30 11:16:42 gdsjaar Exp $ -C $Log: strcut.f,v $ -C Revision 1.1 1990/11/30 11:16:42 gdsjaar -C Initial revision -C -C SUBROUTINE STRCUT (STRING) C*********************************************************************** -C + C SUBROUTINE STRCUT = DELETES ALL PRECEDING BLANKS FROM A STRING -C + C*********************************************************************** -C + CHARACTER * (*) STRING, HOLD*80 CALL STRIPB (STRING, ILEFT, IRIGHT) IF (IRIGHT .GT. ILEFT) THEN diff --git a/packages/seacas/applications/fastq/strlng.f b/packages/seacas/applications/fastq/strlng.f index 18aa58efcd83..ab141fdcb1f5 100644 --- a/packages/seacas/applications/fastq/strlng.f +++ b/packages/seacas/applications/fastq/strlng.f @@ -1,22 +1,16 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: strlng.f,v 1.1 1990/11/30 11:16:45 gdsjaar Exp $ -C $Log: strlng.f,v $ -C Revision 1.1 1990/11/30 11:16:45 gdsjaar -C Initial revision -C -C SUBROUTINE STRLNG (STRING, LEN) C*********************************************************************** -C + C SUBROUTINE STRLNG = FINDS THE NO. OF NONBLANK STRING CHARACTERS -C + C*********************************************************************** -C + CHARACTER * ( * ) STRING CALL STRIPB (STRING, ILEFT, LEN) IF (LEN .EQ. 0)LEN = 1 diff --git a/packages/seacas/applications/fastq/strsiz.f b/packages/seacas/applications/fastq/strsiz.f index 1c1884709707..2b5ab11febdd 100644 --- a/packages/seacas/applications/fastq/strsiz.f +++ b/packages/seacas/applications/fastq/strsiz.f @@ -1,80 +1,36 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: strsiz.f,v 1.4 1999/06/21 22:43:41 gdsjaar Exp $ -C $Log: strsiz.f,v $ -C Revision 1.4 1999/06/21 22:43:41 gdsjaar -C Fixed more uninitialized variables; one was causing core dump on g77 -C compiled executable. -C -C VERSN was not consistently defined -- now 10 characters everywhere -C -C Updated so full version string output -C -C Added capability to debug memory using unit specified in EXT99 -C variable. Similar to STRTUP in SUPLIB -C -C Cleaned up some other code -C -C Upped version -C -C Revision 1.3 1998/07/14 18:20:05 gdsjaar -C Removed unused variables, cleaned up a little. -C -C Changed BLUE labels to GREEN to help visibility on black background -C (indirectly requested by a couple users) -C -C Revision 1.2 1991/04/10 19:56:59 gdsjaar -C Fixed some logical variables -C -c Revision 1.1.1.1 1990/11/30 11:16:50 gdsjaar -c FASTQ Version 2.0X -c -c Revision 1.1 90/11/30 11:16:49 gdsjaar -c Initial revision -c -C -CC* FILE: [.QMESH]STRSIZ.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/31/90 -CC* MODIFICATION: ADDED ARGUMENTS TO CALL TO STRSIZ TO PASS MINIMUM -CC** ELEMENT SIZE (SIZMIN) AND GETSIZ PARAMETERS OF -CC** EMIN AND EMAX -C SUBROUTINE STRSIZ (MAXNP, X, Y, NINT, N, XEND, YEND, XDIFF, YDIFF, & D, ERR, TEST, XNOLD, YNOLD, NXKOLD, LINKEG, LISTEG, BMESUR, & MLINK, NPNOLD, NPEOLD, NNXK, REMESH, REXMIN, REXMAX, REYMIN, & REYMAX, IDIVIS, SIZMIN, EMAX, EMIN, GRAPH, DXMAX) C*********************************************************************** -C + C SUBROUTINE STRSIZ = GETS INTERVALS ON A SRAIGHT LINE BASED ON ERROR C SIZE -C + C*********************************************************************** -C + DIMENSION X (MAXNP), Y (MAXNP) -C + DIMENSION XNOLD(NPNOLD), YNOLD(NPNOLD), NXKOLD(NNXK, NPEOLD) DIMENSION LINKEG(2, MLINK), LISTEG(4 * NPEOLD), BMESUR(NPNOLD) -C + LOGICAL GRAPH, REMESH, TEST, ERR, SGRAPH, MOVED -C + IF (GRAPH) THEN SGRAPH = .TRUE. ELSE SGRAPH = .FALSE. ENDIF -C + ITERAT = 100 EPS = .01 -C + DSTNOW = 0. INTNOW = 0 SIZNOW = 0.0 @@ -85,12 +41,12 @@ SUBROUTINE STRSIZ (MAXNP, X, Y, NINT, N, XEND, YEND, XDIFF, YDIFF, 100 CONTINUE INTNOW = INTNOW + 1 IF (DSTNOW + (SIZNOW * 1.3) .GT. D)THEN -C + C THE END OF THE LINE (OR CLOSE ENOUGH) HAS BEEN REACHED -C + C IF WE ARE TESTING OR THE INTERVALS MATCH, THEN SIMPLY FINISH THE C LINE. -C + IF ((TEST) .OR. (INTNOW .EQ. NINT)) THEN NINT = INTNOW N = NINT + 1 @@ -104,9 +60,9 @@ SUBROUTINE STRSIZ (MAXNP, X, Y, NINT, N, XEND, YEND, XDIFF, YDIFF, CALL PLTFLU ENDIF ELSE -C + C OTHERWISE, MAKE SURE THE INTERVALS ARE ALRIGHT AND ADD THE EXTRA ONE -C + EPS = .001 IF (INTNOW + 1 .NE. NINT) THEN CALL MESAGE ('** PROBLEMS WITH INTNOW '// @@ -132,25 +88,14 @@ SUBROUTINE STRSIZ (MAXNP, X, Y, NINT, N, XEND, YEND, XDIFF, YDIFF, ENDIF ENDIF ELSE -C + C NOT TO THE END YET -C -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/31/90 -CC* MODIFICATION: ADDED ARGUMENTS TO CALL TO GETSIZ TO PASS MINIMUM -CC** ELEMENT SIZE (SIZMIN) AND GETSIZ PARAMETERS OF -CC** EMIN AND EMAX -C + CALL GETSIZ (XNOLD, YNOLD, NXKOLD, LINKEG, LISTEG, BMESUR, & MLINK, NPNOLD, NPEOLD, NNXK, REMESH, REXMIN, REXMAX, & REYMIN, REYMAX, IDIVIS, SIZMIN, EMAX, EMIN, & X(INTNOW), Y(INTNOW), S1) -C -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 8/2/90 -CC* MODIFICATION: ADDED A SIZE ADJUSTMENT BASED ON THE REQUIRED VALUE -CC* AT THE END OF THE SEGMENT AND AT THE AVERAGE OF THE -CC* SEGMENTS - THE 2ND AND 3RD CALL TO GETSIZ. + XNEW1 = X(1) + (((DSTNOW + S1) / D) * XDIFF) YNEW1 = Y(1) + (((DSTNOW + S1) / D) * YDIFF) CALL GETSIZ (XNOLD, YNOLD, NXKOLD, LINKEG, LISTEG, BMESUR, @@ -163,9 +108,9 @@ SUBROUTINE STRSIZ (MAXNP, X, Y, NINT, N, XEND, YEND, XDIFF, YDIFF, & MLINK, NPNOLD, NPEOLD, NNXK, REMESH, REXMIN, REXMAX, & REYMIN, REYMAX, IDIVIS, SIZMIN, EMAX, EMIN, & XNEW2, YNEW2, S3) -C + SIZNOW = (((S1 + S2) * .5) + S3) * .5 -C + DSTNOW = DSTNOW + SIZNOW X(INTNOW + 1) = X(1) + ((DSTNOW / D) * XDIFF) Y(INTNOW + 1) = Y(1) + ((DSTNOW / D) * YDIFF) @@ -178,9 +123,9 @@ SUBROUTINE STRSIZ (MAXNP, X, Y, NINT, N, XEND, YEND, XDIFF, YDIFF, ENDIF GOTO 100 ENDIF -C + C ERASE THE NODES FOR REPLOTTING IF NEEDED -C + IF ((.NOT. SGRAPH) .AND. (GRAPH)) THEN DO 110 J = 2, NINT CALL LCOLOR ('BLACK') @@ -191,9 +136,9 @@ SUBROUTINE STRSIZ (MAXNP, X, Y, NINT, N, XEND, YEND, XDIFF, YDIFF, CALL PLTFLU 110 CONTINUE ENDIF -C + C NOW SMOOTH THE NODES ALONG THE LINE -C + DO 130 I = 1, ITERAT MOVED = .FALSE. DO 120 J = 2, NINT @@ -256,9 +201,9 @@ SUBROUTINE STRSIZ (MAXNP, X, Y, NINT, N, XEND, YEND, XDIFF, YDIFF, CALL PLTFLU 150 CONTINUE ENDIF -C + 160 CONTINUE -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/subpen.f b/packages/seacas/applications/fastq/subpen.f index 849827c1a470..9e995e1dd153 100644 --- a/packages/seacas/applications/fastq/subpen.f +++ b/packages/seacas/applications/fastq/subpen.f @@ -1,34 +1,23 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: subpen.f,v 1.1 1990/11/30 11:16:52 gdsjaar Exp $ -C $Log: subpen.f,v $ -C Revision 1.1 1990/11/30 11:16:52 gdsjaar -C Initial revision -C -C -CC* FILE: [.QMESH]SUBPEN.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE SUBPEN (NPER, NEWPER, X, Y, NID, XSUB, YSUB, NIDSUB, & NUM, M1, M2, IADD, ITRI, XCEN, YCEN) C*********************************************************************** -C + C SUBROUTINE SUBPEN = PUTS A PENTAGON SUBREGION'S PERIMETER INTO THE C NPERIM ARRAYS -C + C*********************************************************************** -C + DIMENSION X (NPER), Y (NPER), NID (NPER) DIMENSION XSUB (NPER), YSUB (NPER), NIDSUB (NPER) -C + C PUT SIDE ONE AND TWO INTO THE PERIMETER LIST -C + KOUNT = 0 DO 100 I = 1, NUM + 1 KOUNT = KOUNT + 1 @@ -38,9 +27,9 @@ SUBROUTINE SUBPEN (NPER, NEWPER, X, Y, NID, XSUB, YSUB, NIDSUB, YSUB (KOUNT) = Y (J) NIDSUB (KOUNT) = NID (J) 100 CONTINUE -C + C PUT SIDE THREE INTO THE LIST -C + XDIF = XCEN - XSUB (KOUNT) YDIF = YCEN - YSUB (KOUNT) XINT = XDIF / DBLE(M1) @@ -51,16 +40,16 @@ SUBROUTINE SUBPEN (NPER, NEWPER, X, Y, NID, XSUB, YSUB, NIDSUB, YSUB (KOUNT) = YSUB (KOUNT - 1) + YINT NIDSUB (KOUNT) = (ITRI * 100000) + M1 - I + 1 110 CONTINUE -C + C ENTER THE CENTER POINT -C + KOUNT = KOUNT + 1 XSUB (KOUNT) = XCEN YSUB (KOUNT) = YCEN NIDSUB (KOUNT) = 100000 -C + C PUT SIDE FOUR INTO THE LIST -C + ITRI2 = ITRI + 2 IF (ITRI2 .GT. 3)ITRI2 = ITRI2 - 3 XDIF = X (IADD + 1) - XCEN @@ -73,9 +62,9 @@ SUBROUTINE SUBPEN (NPER, NEWPER, X, Y, NID, XSUB, YSUB, NIDSUB, YSUB (KOUNT) = YSUB (KOUNT - 1) + YINT NIDSUB (KOUNT) = (100000 * ITRI2) + I + 1 120 CONTINUE -C + NEWPER = KOUNT -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/subtri.f b/packages/seacas/applications/fastq/subtri.f index f4eab3b0f166..3eeb2ead7187 100644 --- a/packages/seacas/applications/fastq/subtri.f +++ b/packages/seacas/applications/fastq/subtri.f @@ -1,34 +1,23 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: subtri.f,v 1.1 1990/11/30 11:16:55 gdsjaar Exp $ -C $Log: subtri.f,v $ -C Revision 1.1 1990/11/30 11:16:55 gdsjaar -C Initial revision -C -C -CC* FILE: [.QMESH]SUBTRI.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE SUBTRI (NPER, NEWPER, X, Y, NID, XSUB, YSUB, NIDSUB, & M1, M2, IADD, ITRI, XCEN, YCEN) C*********************************************************************** -C + C SUBROUTINE SUBPER = PUTS A SUBREGION'S PERIMETER INTO THE NPERIM C ARRAYS -C + C*********************************************************************** -C + DIMENSION X (NPER), Y (NPER), NID (NPER) DIMENSION XSUB (NPER), YSUB (NPER), NIDSUB (NPER) -C + C PUT SIDE ONE AND TWO INTO THE PERIMETER LIST -C + KOUNT = 0 DO 100 I = 1, M1 + M2 + 1 KOUNT = KOUNT + 1 @@ -38,9 +27,9 @@ SUBROUTINE SUBTRI (NPER, NEWPER, X, Y, NID, XSUB, YSUB, NIDSUB, YSUB (KOUNT) = Y (J) NIDSUB (KOUNT) = NID (J) 100 CONTINUE -C + C PUT SIDE THREE INTO THE LIST -C + XDIF = XCEN - XSUB (KOUNT) YDIF = YCEN - YSUB (KOUNT) XINT = XDIF / DBLE(M1) @@ -51,16 +40,16 @@ SUBROUTINE SUBTRI (NPER, NEWPER, X, Y, NID, XSUB, YSUB, NIDSUB, YSUB (KOUNT) = YSUB (KOUNT - 1) + YINT NIDSUB (KOUNT) = (ITRI * 100000) + M1 - I + 1 110 CONTINUE -C + C ENTER THE CENTER POINT -C + KOUNT = KOUNT + 1 XSUB (KOUNT) = XCEN YSUB (KOUNT) = YCEN NIDSUB (KOUNT) = 100000 -C + C PUT SIDE FOUR INTO THE LIST -C + ITRI2 = ITRI + 2 IF (ITRI2 .GT. 3)ITRI2 = ITRI2 - 3 XDIF = X (IADD + 1) - XCEN @@ -73,9 +62,9 @@ SUBROUTINE SUBTRI (NPER, NEWPER, X, Y, NID, XSUB, YSUB, NIDSUB, YSUB (KOUNT) = YSUB (KOUNT - 1) + YINT NIDSUB (KOUNT) = (100000 * ITRI2) + I + 1 120 CONTINUE -C + NEWPER = KOUNT -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/subtrn.f b/packages/seacas/applications/fastq/subtrn.f index 27067a63104a..0548661c160c 100644 --- a/packages/seacas/applications/fastq/subtrn.f +++ b/packages/seacas/applications/fastq/subtrn.f @@ -1,40 +1,29 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: subtrn.f,v 1.1 1990/11/30 11:16:58 gdsjaar Exp $ -C $Log: subtrn.f,v $ -C Revision 1.1 1990/11/30 11:16:58 gdsjaar -C Initial revision -C -C -CC* FILE: [.QMESH]SUBTRN.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE SUBTRN (NPER, NEWPER, IP, X, Y, NID, XSUB, YSUB, & NIDSUB, I1, I2, I3, I4, I5, I6, I7, I8, XCEN1, YCEN1, XCEN2, & YCEN2, XMID1, YMID1, XMID2, YMID2, CCW, ERR) C*********************************************************************** -C + C SUBROUTINE SUBTRN = PUTS A TRANSITION'S SUBREGION'S PERIMETER INTO C THE NPERIM ARRAYS -C + C*********************************************************************** -C + DIMENSION X (NPER), Y (NPER), NID (NPER) DIMENSION XSUB (NPER), YSUB (NPER), NIDSUB (NPER) -C + C PUT THE CORRECT PORTION OF THE PERIMETER IN XSUB, YSUB, AND NIDSUB C BASED ON THE VALUE OF IP (WHICH OF THE 6 SUBREGIONS ARE NEEDED) -C + KOUNT = 0 -C + C SUBREGION 1 - SIDE 1 -C + IF (IP .EQ. 1) THEN DO 100 I = I1, I2 KOUNT = KOUNT + 1 @@ -42,9 +31,9 @@ SUBROUTINE SUBTRN (NPER, NEWPER, IP, X, Y, NID, XSUB, YSUB, YSUB (KOUNT) = Y (I) NIDSUB (KOUNT) = NID (I) 100 CONTINUE -C + C SUBREGION 1 - SIDE 2 -C + XDIF = XCEN2 - X (I2) YDIF = YCEN2 - Y (I2) XINT = XDIF / DBLE(NPER - I8 + 1) @@ -59,9 +48,9 @@ SUBROUTINE SUBTRN (NPER, NEWPER, IP, X, Y, NID, XSUB, YSUB, XSUB (KOUNT) = XCEN2 YSUB (KOUNT) = YCEN2 NIDSUB (KOUNT) = 200000 -C + C SUBREGION 1 - SIDE 3 -C + XDIF = X (I8) - XCEN2 YDIF = Y (I8) - YCEN2 XINT = XDIF / DBLE(I2 - I1) @@ -72,18 +61,18 @@ SUBROUTINE SUBTRN (NPER, NEWPER, IP, X, Y, NID, XSUB, YSUB, YSUB (KOUNT) = YSUB (KOUNT - 1) + YINT NIDSUB (KOUNT) = 100000 + I + 1 120 CONTINUE -C + C SUBREGION 1 - SIDE 4 -C + DO 130 I = I8, NPER KOUNT = KOUNT + 1 XSUB (KOUNT) = X (I) YSUB (KOUNT) = Y (I) NIDSUB (KOUNT) = NID (I) 130 CONTINUE -C + C SUBREGION 2 - SIDE 1 -C + ELSEIF (IP .EQ. 2) THEN DO 140 I = I7, I8 KOUNT = KOUNT + 1 @@ -91,9 +80,9 @@ SUBROUTINE SUBTRN (NPER, NEWPER, IP, X, Y, NID, XSUB, YSUB, YSUB (KOUNT) = Y (I) NIDSUB (KOUNT) = NID (I) 140 CONTINUE -C + C SUBREGION 2 - SIDE 2 -C + XDIF = XCEN2 - X (I8) YDIF = YCEN2 - Y (I8) XINT = XDIF / DBLE(I2 - I1) @@ -108,9 +97,9 @@ SUBROUTINE SUBTRN (NPER, NEWPER, IP, X, Y, NID, XSUB, YSUB, XSUB (KOUNT) = XCEN2 YSUB (KOUNT) = YCEN2 NIDSUB (KOUNT) = 200000 -C + C SUBREGION 2 - SIDE 3 -C + XDIF = XMID2 - XCEN2 YDIF = YMID2 - YCEN2 XINT = XDIF / DBLE(I3 - I2) @@ -125,9 +114,9 @@ SUBROUTINE SUBTRN (NPER, NEWPER, IP, X, Y, NID, XSUB, YSUB, XSUB (KOUNT) = XMID2 YSUB (KOUNT) = YMID2 NIDSUB (KOUNT) = 700000 + NPER - I8 + 2 -C + C SUBREGION 2 - SIDE 4 -C + XDIF = X (I7) - XMID2 YDIF = Y (I7) - YMID2 XINT = XDIF / DBLE(I2 - I1) @@ -138,9 +127,9 @@ SUBROUTINE SUBTRN (NPER, NEWPER, IP, X, Y, NID, XSUB, YSUB, YSUB (KOUNT) = YSUB (KOUNT - 1) + YINT NIDSUB (KOUNT) = NIDSUB (KOUNT - 1) + 1 170 CONTINUE -C + C SUBREGION 3 - SIDE 1 -C + ELSEIF (IP .EQ. 3) THEN KOUNT = KOUNT + 1 XSUB (KOUNT) = X (I3) @@ -160,9 +149,9 @@ SUBROUTINE SUBTRN (NPER, NEWPER, IP, X, Y, NID, XSUB, YSUB, XSUB (KOUNT) = XMID2 YSUB (KOUNT) = YMID2 NIDSUB (KOUNT) = 700000 + NPER - I8 + 2 -C + C SUBREGION 3 - SIDE 2 -C + XDIF = XCEN2 - XMID2 YDIF = YCEN2 - YMID2 XINT = XDIF / DBLE(I3 - I2) @@ -177,9 +166,9 @@ SUBROUTINE SUBTRN (NPER, NEWPER, IP, X, Y, NID, XSUB, YSUB, XSUB (KOUNT) = XCEN2 YSUB (KOUNT) = YCEN2 NIDSUB (KOUNT) = 200000 -C + C SUBREGION 3 - SIDE 3 -C + XDIF = X (I2) - XCEN2 YDIF = Y (I2) - YCEN2 XINT = XDIF / DBLE(NPER - I8 + 1) @@ -190,18 +179,18 @@ SUBROUTINE SUBTRN (NPER, NEWPER, IP, X, Y, NID, XSUB, YSUB, YSUB (KOUNT) = YSUB (KOUNT - 1) + YINT NIDSUB (KOUNT) = 300000 + I + 1 200 CONTINUE -C + C SUBREGION 3 - SIDE 4 -C + DO 210 I = I2, I3 - 1 KOUNT = KOUNT + 1 XSUB (KOUNT) = X (I) YSUB (KOUNT) = Y (I) NIDSUB (KOUNT) = NID (I) 210 CONTINUE -C + C SUBREGION 4 - SIDE 1 AND 2 -C + ELSEIF (IP .EQ. 4) THEN DO 220 I = I4, I6 KOUNT = KOUNT + 1 @@ -209,9 +198,9 @@ SUBROUTINE SUBTRN (NPER, NEWPER, IP, X, Y, NID, XSUB, YSUB, YSUB (KOUNT) = Y (I) NIDSUB (KOUNT) = NID (I) 220 CONTINUE -C + C SUBREGION 4 - SIDE 3 -C + XDIF = XCEN1 - X (I6) YDIF = YCEN1 - Y (I6) XINT = XDIF / DBLE(I5 - I4) @@ -226,9 +215,9 @@ SUBROUTINE SUBTRN (NPER, NEWPER, IP, X, Y, NID, XSUB, YSUB, XSUB (KOUNT) = XCEN1 YSUB (KOUNT) = YCEN1 NIDSUB (KOUNT) = 100000 -C + C SUBREGION 4 - SIDE 4 -C + XDIF = X (I4) - XCEN1 YDIF = Y (I4) - YCEN1 XINT = XDIF / DBLE(I6 - I5) @@ -239,9 +228,9 @@ SUBROUTINE SUBTRN (NPER, NEWPER, IP, X, Y, NID, XSUB, YSUB, YSUB (KOUNT) = YSUB (KOUNT - 1) + YINT NIDSUB (KOUNT) = 600000 + I + 1 240 CONTINUE -C + C SUBREGION 5 - SIDE 1 -C + ELSEIF (IP .EQ. 5) THEN DO 250 I = I6, I7 KOUNT = KOUNT + 1 @@ -249,9 +238,9 @@ SUBROUTINE SUBTRN (NPER, NEWPER, IP, X, Y, NID, XSUB, YSUB, YSUB (KOUNT) = Y (I) NIDSUB (KOUNT) = NID (I) 250 CONTINUE -C + C SUBREGION 5 - SIDE 2 -C + XDIF = XMID1 - X (I7) YDIF = YMID1 - Y (I7) XINT = XDIF / DBLE(I5 - I4) @@ -266,9 +255,9 @@ SUBROUTINE SUBTRN (NPER, NEWPER, IP, X, Y, NID, XSUB, YSUB, XSUB (KOUNT) = XMID1 YSUB (KOUNT) = YMID1 NIDSUB (KOUNT) = 700000 + I6 - I5 + 1 -C + C SUBREGION 5 - SIDE 3 -C + XDIF = XCEN1 - XMID1 YDIF = YCEN1 - YMID1 XINT = XDIF / DBLE(I4 - I3) @@ -283,9 +272,9 @@ SUBROUTINE SUBTRN (NPER, NEWPER, IP, X, Y, NID, XSUB, YSUB, XSUB (KOUNT) = XCEN1 YSUB (KOUNT) = YCEN1 NIDSUB (KOUNT) = 100000 -C + C SUBREGION 5 - SIDE 4 -C + XDIF = X (I6) - XCEN1 YDIF = Y (I6) - YCEN1 XINT = XDIF / DBLE(I5 - I4) @@ -296,9 +285,9 @@ SUBROUTINE SUBTRN (NPER, NEWPER, IP, X, Y, NID, XSUB, YSUB, YSUB (KOUNT) = YSUB (KOUNT - 1) + YINT NIDSUB (KOUNT) = 400000 + I + 1 280 CONTINUE -C + C SUBREGION 6 - SIDE 1 -C + ELSEIF (IP .EQ. 6) THEN KOUNT = KOUNT + 1 XSUB (KOUNT) = XMID1 @@ -314,18 +303,18 @@ SUBROUTINE SUBTRN (NPER, NEWPER, IP, X, Y, NID, XSUB, YSUB, YSUB (KOUNT) = YSUB (KOUNT - 1) + YINT NIDSUB (KOUNT) = 700000 + I6 - I5 - I + 1 290 CONTINUE -C + C SUBREGION 6 - SIDE 2 -C + DO 300 I = I3, I4 KOUNT = KOUNT + 1 XSUB (KOUNT) = X (I) YSUB (KOUNT) = Y (I) NIDSUB (KOUNT) = NID (I) 300 CONTINUE -C + C SUBREGION 6 - SIDE 3 -C + XDIF = XCEN1 - X (I4) YDIF = YCEN1 - Y (I4) XINT = XDIF / DBLE(I6 - I5) @@ -340,9 +329,9 @@ SUBROUTINE SUBTRN (NPER, NEWPER, IP, X, Y, NID, XSUB, YSUB, XSUB (KOUNT) = XCEN1 YSUB (KOUNT) = YCEN1 NIDSUB (KOUNT) = 100000 -C + C SUBREGION 6 - SIDE 4 -C + XDIF = XMID1 - XCEN1 YDIF = YMID1 - YCEN1 XINT = XDIF / DBLE(I4 - I3) @@ -354,8 +343,8 @@ SUBROUTINE SUBTRN (NPER, NEWPER, IP, X, Y, NID, XSUB, YSUB, NIDSUB (KOUNT) = 500000 + I + 1 320 CONTINUE ENDIF -C + NEWPER = KOUNT RETURN -C + END diff --git a/packages/seacas/applications/fastq/tabint.f b/packages/seacas/applications/fastq/tabint.f index affbfcbe4066..747da8bf2d22 100644 --- a/packages/seacas/applications/fastq/tabint.f +++ b/packages/seacas/applications/fastq/tabint.f @@ -1,30 +1,19 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: tabint.f,v 1.1 1990/11/30 11:17:04 gdsjaar Exp $ -C $Log: tabint.f,v $ -C Revision 1.1 1990/11/30 11:17:04 gdsjaar -C Initial revision -C -C -CC* FILE: [.MAIN]TABINT.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE TABINT (X1, X2, Y1, Y2, CT, ST, SCALE, XX1, YY1, XX2, & YY2, DRWTAB) C*********************************************************************** -C + C SUBROUTINE TABINT = INITIALIZES THE TABLET TO THE PLOT LIMITS -C + C*********************************************************************** -C + LOGICAL DRWTAB -C + IF (DRWTAB) THEN THETA = ATAN2 (YY2 - YY1, XX2 - XX1) - & ATAN2 (Y2 - Y1, X2 - X1) @@ -49,7 +38,7 @@ SUBROUTINE TABINT (X1, X2, Y1, Y2, CT, ST, SCALE, XX1, YY1, XX2, XX1 = (XX2 - XX1) - ( (X2 - X1) / SCALE) ENDIF ENDIF -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/tablet.f b/packages/seacas/applications/fastq/tablet.f index 482003bdbd1b..99ba195ef5e4 100644 --- a/packages/seacas/applications/fastq/tablet.f +++ b/packages/seacas/applications/fastq/tablet.f @@ -1,29 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: tablet.f,v 1.2 1998/07/14 18:20:07 gdsjaar Exp $ -C $Log: tablet.f,v $ -C Revision 1.2 1998/07/14 18:20:07 gdsjaar -C Removed unused variables, cleaned up a little. -C -C Changed BLUE labels to GREEN to help visibility on black background -C (indirectly requested by a couple users) -C -C Revision 1.1.1.1 1990/11/30 11:17:08 gdsjaar -C FASTQ Version 2.0X -C -c Revision 1.1 90/11/30 11:17:07 gdsjaar -c Initial revision -c -C -CC* FILE: [.MAIN]TABLET.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE TABLET (MP, ML, MS, MR, MSNAP, MCOM, ICOM, JCOM, CIN, & RIN, IIN, KIN, IDUMP, N, IPOINT, COOR, IPBOUN, ILINE, LTYPE, & NINT, FACTOR, LCON, iLBOUN, ISBOUN, ISIDE, NLPS, IFLINE, @@ -36,23 +16,23 @@ SUBROUTINE TABLET (MP, ML, MS, MR, MSNAP, MCOM, ICOM, JCOM, CIN, & SNAPDX, NSNAP, VAXVMS, TBZOOM, AXIST, WROTE, BATCH, VERSN, & TIME1) C*********************************************************************** -C + C SUBROUTINE TABLET = SUBROUTINE TO CONTROL DIGITIZE FUNCTIONS -C + C*********************************************************************** -C + C SUBROUTINE CALLED BY: C FASTQ = A PROGRAM TO QUICKLY PREPARE QMESH INPUT -C + C*********************************************************************** -C + C SUBROUTINES CALLED: C DREAD = SETS ALL PARAMETERS UP FOR READING FROM A DIGI-PAD C DPREAD = READS INPUT FROM A DIGI-PAD DIGITIZER C CLOSE = FINDS THE CLOSEST EXISTING POINT TO THE MOUSE -C + C*********************************************************************** -C + C VARIABLES USED: C IANS = LOGICAL RESPONSE FROM YES-NO QUESTION C TITLE = MESH TITLE @@ -72,9 +52,9 @@ SUBROUTINE TABLET (MP, ML, MS, MR, MSNAP, MCOM, ICOM, JCOM, CIN, C SLIDE = .TRUE. IF THE NEXT POINT IS TO HAVE THE CLOSEST POINT'S C COORDINATES, BUT NEW NUMBERING (SLIDE LINE USE) C NOROOM = .TRUE. IF THE AMOUNT OF DATA EXCEEDS DIMENSIONED LIMITS -C + C*********************************************************************** -C + DIMENSION IPOINT(MP), COOR(2, MP), IPBOUN(MP) DIMENSION ILINE(ML), LTYPE(ML), NINT(ML), FACTOR(ML), LCON(3, ML) DIMENSION ILBOUN(ML), ISBOUN(ML) @@ -93,36 +73,36 @@ SUBROUTINE TABLET (MP, ML, MS, MR, MSNAP, MCOM, ICOM, JCOM, CIN, DIMENSION IHOLDS(2, MS), IRGFLG(MR) DIMENSION N(29), REXTRM(4, MR), SNAPDX(2, MSNAP), NSNAP(2) DIMENSION KIN(MCOM), IIN(MCOM), RIN(MCOM) -C + CHARACTER*72 TITLE, CIN(MCOM) CHARACTER DEV1*3, INTRNL*8, VERSN*9 -C + LOGICAL IANS, DRWTAB, ERR, NOROOM LOGICAL ALPHA LOGICAL SNAP, VAXVMS, TBZOOM, DRAWN, AXIST, WROTE, BATCH -C + DRAWN=.FALSE. -C + C GET THE BODY EXTREMES -C + CALL GETEXT(MP, ML, MS, MR, N, IPOINT, COOR, ILINE, LTYPE, & LCON, NLPS, IFLINE, ILLIST, NSPR, IFSIDE, ISLIST, LINKP, & LINKL, LINKS, LINKR, REXTRM, XMIN1, XMAX1, YMIN1, YMAX1) -C + C GET THE DEFAULT ZOOM AND GRID DEFINITIONS IF NOTHING HAS BEEN DEFINED -C + IF (.NOT.TBZOOM) THEN -C + C SET THE BODY EXTREMES AS THE ZOOM EXTREMES -C + X1 = XMIN1 X2 = XMAX1 Y1 = YMIN1 Y2 = YMAX1 WRITE (*, 10010) X1, X2, Y1, Y2 -C + C GET THE DEFAULT TABLET INITIALIZATION -C + CALL TABINT (X1, X2, Y1, Y2, CT, ST, SCALE, XX1, YY1, XX2, YY2, & DRWTAB) TBZOOM = .TRUE. @@ -132,16 +112,16 @@ SUBROUTINE TABLET (MP, ML, MS, MR, MSNAP, MCOM, ICOM, JCOM, CIN, Y1OLD = Y1 Y2OLD = Y2 ENDIF -C + C GET THE DEFAULT GRID IF NO GRID IS DEFINED -C + IF (SNAP .AND. (NSNAP(1) .LT. 2 .OR. NSNAP(2) .LT. 2)) THEN CALL SNAPXY (MP, MSNAP, N(1), IPOINT, COOR, LINKP, SNAPDX, & NSNAP) END IF -C + C ENTER DIGITIZING OPTION -C + 100 CONTINUE IF (ICOM .GT. JCOM) THEN CALL MESAGE (' ') @@ -149,16 +129,16 @@ SUBROUTINE TABLET (MP, ML, MS, MR, MSNAP, MCOM, ICOM, JCOM, CIN, & JCOM, KIN, CIN, IIN, RIN) ICOM = 1 ENDIF -C + C SPAWN A PROCESS -C + IF ((CIN(ICOM)(1:2) .EQ. 'SP') .OR. & (CIN(ICOM)(1:2) .EQ. 'sp')) THEN ICOM = ICOM + 1 CALL SPAWN (VAXVMS) -C + C SET THE SNAP FLAG ON -C + ELSE IF ((CIN(ICOM)(1:1) .EQ. 'S') .OR. & (CIN(ICOM)(1:1) .EQ. 's')) THEN ICOM = ICOM + 1 @@ -191,9 +171,9 @@ SUBROUTINE TABLET (MP, ML, MS, MR, MSNAP, MCOM, ICOM, JCOM, CIN, ENDIF ENDIF ENDIF -C + C SHOW THE BUTTON DEFINITIONS -C + ELSE IF ((CIN(ICOM)(1:1) .EQ. 'A') .OR. & (CIN(ICOM)(1:1) .EQ. 'a')) THEN ICOM = ICOM + 1 @@ -205,16 +185,15 @@ SUBROUTINE TABLET (MP, ML, MS, MR, MSNAP, MCOM, ICOM, JCOM, CIN, CALL MESAGE('AXIS DRAWING - ON') ENDIF -C C SHOW THE BUTTON DEFINITIONS -C + ELSE IF ((CIN(ICOM)(1:1) .EQ. 'B') .OR. & (CIN(ICOM)(1:1) .EQ. 'b')) THEN ICOM = ICOM + 1 CALL HELP_FQ (2) -C + C ADD UNIFORM Y SNAP GRID SPACINGS -C + ELSE IF ((CIN(ICOM)(1:2) .EQ. 'UY') .OR. & (CIN(ICOM)(1:1) .EQ. 'uy')) THEN ICOM = ICOM + 1 @@ -234,9 +213,9 @@ SUBROUTINE TABLET (MP, ML, MS, MR, MSNAP, MCOM, ICOM, JCOM, CIN, & ' UNIFORM Y GRID') CALL MESAGE ('NO ADDITIONAL Y GRID DEFINED') ENDIF -C + C ADD UNIFORM X SNAP GRID SPACINGS -C + ELSE IF ((CIN(ICOM)(1:2) .EQ. 'UX') .OR. & (CIN(ICOM)(1:1) .EQ. 'ux')) THEN ICOM = ICOM + 1 @@ -256,9 +235,9 @@ SUBROUTINE TABLET (MP, ML, MS, MR, MSNAP, MCOM, ICOM, JCOM, CIN, & ' UNIFORM X GRID') CALL MESAGE ('NO ADDITIONAL X GRID DEFINED') ENDIF -C + C ADD UNIFORM SNAP GRID SPACINGS -C + ELSE IF ((CIN(ICOM)(1:1) .EQ. 'U') .OR. & (CIN(ICOM)(1:1) .EQ. 'u')) THEN ICOM = ICOM + 1 @@ -282,18 +261,18 @@ SUBROUTINE TABLET (MP, ML, MS, MR, MSNAP, MCOM, ICOM, JCOM, CIN, & ' UNIFORM GRID') CALL MESAGE ('NO GRID DEFINED') ENDIF -C + C CLEAR ALL X GRID DEFINITIONS -C + ELSE IF ((CIN(ICOM)(1:2) .EQ. 'XC') .OR. & (CIN(ICOM)(1:2) .EQ. 'xc')) THEN ICOM = ICOM + 1 NSNAP(1) = 0 CALL MESAGE ('ALL X SNAP GRID DEFINITIONS HAVE BEEN CLEARED') CALL MESAGE (' ') -C + C ADD X SNAP GRID SPACINGS -C + ELSE IF ((CIN(ICOM)(1:1) .EQ. 'X') .OR. & (CIN(ICOM)(1:1) .EQ. 'x')) THEN ICOM = ICOM + 1 @@ -326,18 +305,18 @@ SUBROUTINE TABLET (MP, ML, MS, MR, MSNAP, MCOM, ICOM, JCOM, CIN, GO TO 110 130 CONTINUE ENDIF -C + C CLEAR ALL Y GRID DEFINITIONS -C + ELSE IF ((CIN(ICOM)(1:2) .EQ. 'YC') .OR. & (CIN(ICOM)(1:2) .EQ. 'yc')) THEN ICOM = ICOM + 1 NSNAP(2) = 0 CALL MESAGE ('ALL Y SNAP GRID DEFINITIONS HAVE BEEN CLEARED') CALL MESAGE (' ') -C + C ADD Y SNAP GRID SPACINGS -C + ELSE IF ((CIN(ICOM)(1:1) .EQ. 'Y') .OR. & (CIN(ICOM)(1:1) .EQ. 'y')) THEN ICOM = ICOM + 1 @@ -370,9 +349,9 @@ SUBROUTINE TABLET (MP, ML, MS, MR, MSNAP, MCOM, ICOM, JCOM, CIN, GO TO 140 160 CONTINUE ENDIF -C + C SET ZOOM LIMITS FOR PLOTTING -C + ELSE IF ((CIN(ICOM)(1:1) .EQ. 'P') .OR. & (CIN(ICOM)(1:1) .EQ. 'p')) THEN ICOM = ICOM + 1 @@ -381,9 +360,9 @@ SUBROUTINE TABLET (MP, ML, MS, MR, MSNAP, MCOM, ICOM, JCOM, CIN, CALL SNAPXY (MP, MSNAP, N(1), IPOINT, COOR, LINKP, SNAPDX, & NSNAP) SNAP = .TRUE. -C + C SET ZOOM LIMITS FOR PLOTTING -C + ELSE IF ((CIN(ICOM)(1:1) .EQ. 'Z') .OR. & (CIN(ICOM)(1:1) .EQ. 'z')) THEN ICOM = ICOM + 1 @@ -409,9 +388,9 @@ SUBROUTINE TABLET (MP, ML, MS, MR, MSNAP, MCOM, ICOM, JCOM, CIN, CALL MESAGE ('SCREEN PLOTTING ZOOM CHANGED') CALL MESAGE ('TABLET EXTREMES RESET TO ZOOM LIMITS') ENDIF -C + C INITIALIZE DIGITIZING PAD -C + ELSE IF ((CIN(ICOM)(1:1) .EQ. 'I') .OR. & (CIN(ICOM)(1:1) .EQ. 'i')) THEN ICOM = ICOM + 1 @@ -427,9 +406,9 @@ SUBROUTINE TABLET (MP, ML, MS, MR, MSNAP, MCOM, ICOM, JCOM, CIN, YMIN1 = Y1 YMAX1 = Y2 END IF -C + C CLEAR ALL GRID DEFINITIONS -C + ELSE IF ((CIN(ICOM)(1:1) .EQ. 'C') .OR. & (CIN(ICOM)(1:1) .EQ. 'c')) THEN ICOM = ICOM + 1 @@ -437,15 +416,15 @@ SUBROUTINE TABLET (MP, ML, MS, MR, MSNAP, MCOM, ICOM, JCOM, CIN, NSNAP(2) = 0 CALL MESAGE ('ALL SNAP GRID DEFINITIONS HAVE BEEN CLEARED') CALL MESAGE (' ') -C + C DIGITIZING OPTION -C + ELSE IF ((CIN(ICOM)(1:1) .EQ. 'D') .OR. & (CIN(ICOM)(1:1) .EQ. 'd')) THEN ICOM = ICOM + 1 -C + C GENERATE A DEFAULT SNAP GRID IF NEEDED -C + IF ((SNAP).AND.((NSNAP(1) .LT. 2) .OR. (NSNAP(2) .LT. 2))) THEN NSNAP(1) = 0 NSNAP(2) = 0 @@ -482,9 +461,9 @@ SUBROUTINE TABLET (MP, ML, MS, MR, MSNAP, MCOM, ICOM, JCOM, CIN, ENDIF ENDIF ENDIF -C + C NOW ENTER THE MOUSE CONTROL -C + CALL DIGIT (MP, ML, MS, MR, MSNAP, MCOM, ICOM, JCOM, CIN, RIN, & IIN, KIN, IDUMP, N, IPOINT, COOR, IPBOUN, ILINE, LTYPE, & NINT, FACTOR, LCON, ILBOUN, ISBOUN, ISIDE, NLPS, IFLINE, @@ -499,25 +478,24 @@ SUBROUTINE TABLET (MP, ML, MS, MR, MSNAP, MCOM, ICOM, JCOM, CIN, & NSNAP, DRWTAB, AXIST) DRAWN = .TRUE. WROTE = .FALSE. -C + C GO GET MORE ROOM IF NEEDED AND GO STRAIGHT BACK INTO DIGITIZING -C + IF (NOROOM) THEN JCOM = 1 ICOM = 1 CIN(1) = 'DIG' RETURN ENDIF -C + C RETURN FROM DIGITIZING -C + ELSE IF (CIN(ICOM)(1:1) .EQ. ' ') THEN ICOM = ICOM + 1 RETURN -C C EXIT OPTION - EXITS FASTQ -C + ELSE IF ((CIN(ICOM)(1:2) .EQ. 'EX') .OR. & (CIN(ICOM)(1:2) .EQ. 'ex')) THEN ICOM = ICOM + 1 @@ -529,15 +507,15 @@ SUBROUTINE TABLET (MP, ML, MS, MR, MSNAP, MCOM, ICOM, JCOM, CIN, CALL FEXIT (WROTE, MCOM, ICOM, JCOM, CIN, IIN, RIN, KIN, & TIME1, BATCH, VERSN) ENDIF -C + C WRITE OUT THE HELP MESSAGE -C + ELSE ICOM = ICOM + 1 CALL HELP_FQ (14) ENDIF GO TO 100 -C + 10000 FORMAT(' THE LAST SUCCESSFUL ', A1, ' INPUT WAS: ', G14.7) 10010 FORMAT(' THE TABLET (AND PLOTTING) LIMITS ARE DEFAULTED TO:', / & ' XMIN: ', G14.7, /, @@ -550,5 +528,5 @@ SUBROUTINE TABLET (MP, ML, MS, MR, MSNAP, MCOM, ICOM, JCOM, CIN, & ' THE MINIMUM Y IS: ', G14.7, /, & ' THE MAXIMUM Y IS: ', G14.7, /, & ' THE Y STEP IS: ', G14.7) -C + END diff --git a/packages/seacas/applications/fastq/tmschm.f b/packages/seacas/applications/fastq/tmschm.f index 26f588c616ab..a9960d3329f7 100644 --- a/packages/seacas/applications/fastq/tmschm.f +++ b/packages/seacas/applications/fastq/tmschm.f @@ -1,31 +1,20 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: tmschm.f,v 1.1 1990/11/30 11:17:10 gdsjaar Exp $ -C $Log: tmschm.f,v $ -C Revision 1.1 1990/11/30 11:17:10 gdsjaar -C Initial revision -C -C -CC* FILE: [.QMESH]TMSCHM.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE TMSCHM (NPER, KKK, LLL, NNN, ML, MS, NSPR, ISLIST, & NINT, IFLINE, NLPS, ILLIST, LINKL, LINKS, MXNPER, MAXPRM, MAX3, & MXND, X, Y, NID, NNPS, ANGLE, XN, YN, NUID, LXK, KXL, NXL, LXN, & XSUB, YSUB, NIDSUB, INDX, IAVAIL, NAVAIL, CCW, ERR) C*********************************************************************** -C + C TMSCHM - "T" MESH SCHEME; CALCULATE A "TRIANGULAR" MAPPED MESH C (3 RECTANGULAR SUBREGIONS) -C + C*********************************************************************** -C + DIMENSION ISLIST(NSPR), NINT(ML), IFLINE(MS), NLPS(MS) DIMENSION ILLIST(MS*3), LINKL(2, ML), LINKS(2, MS) DIMENSION X(MXNPER), Y(MXNPER), NID(MXNPER*MAXPRM), NNPS(MAX3) @@ -33,18 +22,18 @@ SUBROUTINE TMSCHM (NPER, KKK, LLL, NNN, ML, MS, NSPR, ISLIST, DIMENSION LXK(4, MXND), KXL(2, 3*MXND), NXL(2, 3*MXND) DIMENSION LXN(4, MXND) DIMENSION XSUB(MXNPER), YSUB(MXNPER), NIDSUB(MXNPER), INDX(MXND) -C + LOGICAL CCW, ERR, FINAL -C + C SET UP THE TRIANGLE DIVISIONS, AND FIND THE CENTER POINT -C + CALL GETM3 (ML, MS, MAX3, NSPR, ISLIST, NINT, IFLINE, NLPS, & ILLIST, LINKL, LINKS, X, Y, NID, NNPS, ANGLE, NPER, M1A, M1B, & M2A, M2B, M3A, M3B, XCEN, YCEN, CCW, ERR) FINAL = .FALSE. -C + C SET UP THE FIRST SUBREGION, AND SEND IT OFF TO BE GENERATED -C + IF (.NOT.ERR) THEN CALL SUBTRI (NPER, NEWPER, X, Y, NID, XSUB, YSUB, NIDSUB, M1B, & M2A, M1A, 1, XCEN, YCEN) @@ -55,9 +44,9 @@ SUBROUTINE TMSCHM (NPER, KKK, LLL, NNN, ML, MS, NSPR, ISLIST, & LXK, KXL, NXL, LXN, M1B, M2A, KKK, KKKOLD, NNN, NNNOLD, LLL, & LLLOLD, IAVAIL, NAVAIL, ERR) END IF -C + C SET UP THE SECOND SUBREGION, AND SEND IT OFF TO BE GENERATED -C + IF (.NOT.ERR) THEN CALL SUBTRI (NPER, NEWPER, X, Y, NID, XSUB, YSUB, NIDSUB, & M2B, M3A, M1A + M1B + M2A, 2, XCEN, YCEN) @@ -70,9 +59,9 @@ SUBROUTINE TMSCHM (NPER, KKK, LLL, NNN, ML, MS, NSPR, ISLIST, CALL FIXSUB (MXND, NNNOLD, NNN, LLLOLD, LLL, KKKOLD, KKK, XN, & YN, NUID, LXK, KXL, NXL, LXN, INDX, IAVAIL, NAVAIL, FINAL) END IF -C + C SET UP THE THIRD SUBREGION, AND SEND IT OFF TO BE GENERATED -C + IF (.NOT.ERR) THEN CALL SUBTRI (NPER, NEWPER, X, Y, NID, XSUB, YSUB, NIDSUB, & M3B, M1A, M1A + M1B + M2A + M2B + M3A, 3, XCEN, YCEN) @@ -87,6 +76,6 @@ SUBROUTINE TMSCHM (NPER, KKK, LLL, NNN, ML, MS, NSPR, ISLIST, CALL FIXSUB (MXND, NNNOLD, NNN, LLLOLD, LLL, KKKOLD, KKK, XN, & YN, NUID, LXK, KXL, NXL, LXN, INDX, IAVAIL, NAVAIL, FINAL) END IF -C + RETURN END diff --git a/packages/seacas/applications/fastq/tridel.f b/packages/seacas/applications/fastq/tridel.f index 910cf36a1fe2..4f2e03bd54b8 100644 --- a/packages/seacas/applications/fastq/tridel.f +++ b/packages/seacas/applications/fastq/tridel.f @@ -1,55 +1,29 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: tridel.f,v 1.4 2004/01/21 05:18:40 gdsjaar Exp $ -C $Log: tridel.f,v $ -C Revision 1.4 2004/01/21 05:18:40 gdsjaar -C Initialized several variables identified by valgrind. -C -C Revision 1.3 1998/07/14 18:20:09 gdsjaar -C Removed unused variables, cleaned up a little. -C -C Changed BLUE labels to GREEN to help visibility on black background -C (indirectly requested by a couple users) -C -C Revision 1.2 1991/03/21 15:45:21 gdsjaar -C Changed all 3.14159... to atan2(0.0, -1.0) -C -c Revision 1.1.1.1 1990/11/30 11:17:15 gdsjaar -c FASTQ Version 2.0X -c -c Revision 1.1 90/11/30 11:17:13 gdsjaar -c Initial revision -c -C -CC* FILE: [.PAVING]TRIDEL.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE TRIDEL (MXND, MLN, XN, YN, ZN, NUID, LXK, KXL, NXL, & LXN, NNN, LLL, KKK, NAVAIL, IAVAIL, ANGLE, LNODES, BNSIZE, & NLOOP, DEV1, KREG, XMIN, XMAX, YMIN, YMAX, ZMIN, ZMAX, GRAPH, & VIDEO, NOROOM, ERR) C*********************************************************************** -C + C SUBROUTINE TRIDEL = CHECKS FOR ANY TRIANGULAR SHAPED QUADS ATTACHED C TO A THREE NODE ELEMENT AND DELETES THEM WHEN C FOUND AND POSSIBLE -C + C*********************************************************************** -C + DIMENSION ANGLE (MXND), BNSIZE (2, MXND), LNODES (MLN, MXND) DIMENSION NODES(4), K(3) DIMENSION LXK(4, MXND), NXL(2, 3*MXND), KXL(2, 3*MXND) DIMENSION LXN(4, MXND), XN(MXND), YN(MXND), ZN(MXND), NUID(MXND) -C + CHARACTER*3 DEV1 LOGICAL ERR, DONE, GRAPH, CHECK, REDO, CCW, VIDEO, PASSED, NOROOM -C + PI = ATAN2(0.0, -1.0) TWOPI = 2.0 * PI @@ -60,19 +34,19 @@ SUBROUTINE TRIDEL (MXND, MLN, XN, YN, ZN, NUID, LXK, KXL, NXL, KMAX = 30 KOUNT = 0 KKKADD = 0 -C + 100 CONTINUE KOUNT = KOUNT + 1 IF (KOUNT .GT. KMAX) GOTO 180 110 CONTINUE REDO = .FALSE. -C + DO 120 I = 1, NNN IF ((LXN (1, I) .GT. 0) .AND. (LXN (2, I) .GT. 0) .AND. & (LXN (4, I) .EQ. 0)) THEN -C + C SEE IF A 2-LINE NODE NEEDS DELETED -C + IF (LXN (3, I) .LE. 0) THEN NODE = I KELEM = KXL (1, LXN (1, NODE)) @@ -85,17 +59,17 @@ SUBROUTINE TRIDEL (MXND, MLN, XN, YN, ZN, NUID, LXK, KXL, NXL, & DONE, CHECK, NOROOM, ERR) IF ((NOROOM) .OR. (ERR)) GOTO 180 IF (DONE) THEN -C + IF (VIDEO) THEN CALL RPLOTL (MXND, XN, YN, ZN, NXL, XMIN, XMAX, & YMIN, YMAX, ZMIN, ZMAX, LLL, DEV1, KREG) CALL SNAPIT (3) ENDIF -C + CALL FILSMO (MXND, MLN, XN, YN, ZN, LXK, KXL, NXL, & LXN, LLL, NNN, NNN, LNODES, BNSIZE, NLOOP, XMIN, & XMAX, YMIN, YMAX, ZMIN, ZMAX, DEV1, KREG) -C + IF ((GRAPH) .OR. (VIDEO)) THEN CALL RPLOTL (MXND, XN, YN, ZN, NXL, XMIN, XMAX, & YMIN, YMAX, ZMIN, ZMAX, LLL, DEV1, KREG) @@ -107,24 +81,23 @@ SUBROUTINE TRIDEL (MXND, MLN, XN, YN, ZN, NUID, LXK, KXL, NXL, ENDIF 120 CONTINUE IF (REDO) GOTO 110 -C + DO 170 I = 1, NNN IF ((LXN (1, I) .GT. 0) .AND. (LXN (2, I) .GT. 0) .AND. & (LXN (4, I) .EQ. 0)) THEN -C -C + C GET THE ATTACHED LINES AND ELEMENTS C K(1) IS BETWEEN L1 & L2 C K(2) IS BETWEEN L2 & L3 C K(3) IS BETWEEN L3 & L1 -C + L1 = LXN (1, I) L2 = LXN (2, I) L3 = LXN (3, I) N1 = NXL (1, L1) + NXL (2, L1) - I N2 = NXL (1, L2) + NXL (2, L2) - I N3 = NXL (1, L3) + NXL (2, L3) - I -C + IF ( (KXL (1, L1) .EQ. KXL (1, L2)) .OR. & (KXL (1, L1) .EQ. KXL (2, L2)) ) THEN K(1) = KXL (1, L1) @@ -136,7 +109,7 @@ SUBROUTINE TRIDEL (MXND, MLN, XN, YN, ZN, NUID, LXK, KXL, NXL, CALL MESAGE ('** PROBLEMS IN TRIDEL FINDING K(1) **') GOTO 180 ENDIF -C + IF ( (KXL (1, L2) .EQ. KXL (1, L3)) .OR. & (KXL (1, L2) .EQ. KXL (2, L3)) ) THEN K(2) = KXL (1, L2) @@ -148,7 +121,7 @@ SUBROUTINE TRIDEL (MXND, MLN, XN, YN, ZN, NUID, LXK, KXL, NXL, CALL MESAGE ('** PROBLEMS IN TRIDEL FINDING K(2) **') GOTO 180 ENDIF -C + IF ( (KXL (1, L3) .EQ. KXL (1, L1)) .OR. & (KXL (1, L3) .EQ. KXL (2, L1)) ) THEN K(3) = KXL (1, L3) @@ -160,7 +133,7 @@ SUBROUTINE TRIDEL (MXND, MLN, XN, YN, ZN, NUID, LXK, KXL, NXL, CALL MESAGE ('** PROBLEMS IN TRIDEL FINDING K(3) **') GOTO 180 ENDIF -C + C NOW CHECK K(1)'S, K(2)'S, AND K(3)'S ANGLE AT THE LINE JOINT. C THERE ARE THREE POSSIBILITIES FOR CHANGE: C 1) ANYTHING OVER 175 DEGREES GETS THE CORRESPONDING ELEMENT @@ -169,7 +142,7 @@ SUBROUTINE TRIDEL (MXND, MLN, XN, YN, ZN, NUID, LXK, KXL, NXL, C THE CORRESPONDING ELEMENT DELETED C 3) AN ELONGATED ELEMENT OVER 150 DEGREES GETS A 3 ELEMENT C REPLACEMENT FOR THE TWO ELEMENTS THERE -C + TOLER1 = 2.9670597 TOLER2 = 2.6179939 IF ((GRAPH) .AND. (.NOT. VIDEO)) THEN @@ -181,21 +154,21 @@ SUBROUTINE TRIDEL (MXND, MLN, XN, YN, ZN, NUID, LXK, KXL, NXL, YMIN = YN (I) - DIST YMAX = YN (I) + DIST ENDIF -C + ANG1 = ATAN2 (YN (N1) - YN (I), XN (N1) - XN (I)) IF (ANG1 .LT. 0.) ANG1 = ANG1 + TWOPI ANG2 = ATAN2 (YN (N2) - YN (I), XN (N2) - XN (I)) IF (ANG2 .LT. 0.) ANG2 = ANG2 + TWOPI ANG3 = ATAN2 (YN (N3) - YN (I), XN (N3) - XN (I)) IF (ANG3 .LT. 0.) ANG3 = ANG3 + TWOPI -C + C CHECK TO SEE IF THE NODES ARE CLOCKWISE OR COUNTERCLOCKWISE C (POSITIVE AREA IS CCW) -C + AREA = ( (YN (N1) + YN (N3)) * .5 * (XN (N3) - XN (N1)) ) + & ( (YN (N2) + YN (N1)) * .5 * (XN (N1) - XN (N2)) ) + & ( (YN (N3) + YN (N2)) * .5 * (XN (N2) - XN (N3)) ) -C + IF (AREA .GT. 0.) THEN ANG12 = ANG2 - ANG1 ANG23 = ANG3 - ANG2 @@ -208,7 +181,7 @@ SUBROUTINE TRIDEL (MXND, MLN, XN, YN, ZN, NUID, LXK, KXL, NXL, IF (ANG12 .LT. 0.) ANG12 = ANG12 + TWOPI IF (ANG23 .LT. 0.) ANG23 = ANG23 + TWOPI IF (ANG31 .LT. 0.) ANG31 = ANG31 + TWOPI -C + IF (GRAPH) THEN CALL RPLOTL (MXND, XN, YN, ZN, NXL, XMIN, XMAX, YMIN, & YMAX, ZMIN, ZMAX, LLL, DEV1, KREG) @@ -220,9 +193,9 @@ SUBROUTINE TRIDEL (MXND, MLN, XN, YN, ZN, NUID, LXK, KXL, NXL, CALL LCOLOR ('WHITE') CALL SFLUSH ENDIF -C + C NOW DO THE CHECKS FOR CHANGING THE ELEMENT -C + IF (AREA .GT. 0) THEN CALL ADJTRI (MXND, MLN, LNODES, XN, YN, ZN, NUID, LXK, & KXL, NXL, LXN, NNN, NAVAIL, IAVAIL, I, K(1), ANG12, @@ -267,10 +240,10 @@ SUBROUTINE TRIDEL (MXND, MLN, XN, YN, ZN, NUID, LXK, KXL, NXL, & VIDEO, NOROOM, ERR, KKKADD) ENDIF IF ((NOROOM) .OR. (ERR)) GOTO 180 -C + 130 CONTINUE IF (DONE) THEN -C + CALL MARKSM (MXND, MLN, LXK, KXL, NXL, LXN, LNODES, & N1, ERR) IF (ERR) GOTO 180 @@ -288,7 +261,7 @@ SUBROUTINE TRIDEL (MXND, MLN, XN, YN, ZN, NUID, LXK, KXL, NXL, & YMAX, ZMIN, ZMAX, LLL, DEV1, KREG) CALL SNAPIT (3) ENDIF -C + CALL FILSMO (MXND, MLN, XN, YN, ZN, LXK, KXL, NXL, LXN, & LLL, NNN, NNN, LNODES, BNSIZE, NLOOP, XMIN, XMAX, & YMIN, YMAX, ZMIN, ZMAX, DEV1, KREG) @@ -301,7 +274,7 @@ SUBROUTINE TRIDEL (MXND, MLN, XN, YN, ZN, NUID, LXK, KXL, NXL, REDO = .TRUE. GOTO 160 ENDIF -C + C NOW CHECK THE THREE ELEMENTS TO SEE IF AN ELEMENT EXISTS WHICH: C (1) CONTAINS ONLY 2 OPPOSING "LARGE ANGLE" THREE-LINE NODES C AND AT LEAST 1 "SMALL ANGLE" FOUR- OR FIVE-LINE NODE @@ -316,7 +289,7 @@ SUBROUTINE TRIDEL (MXND, MLN, XN, YN, ZN, NUID, LXK, KXL, NXL, C LARGE ANGLES AND IS CONSIDERABLY SMALLER THAN IS C DICTATED BY THE DESIRED SIZE C THIS ELEMENT SHOULD BE DELETED. -C + TOLER3 = 1.7453293 TOLER4 = 1.5707963 TOLER5 = 2.0943951 @@ -331,16 +304,16 @@ SUBROUTINE TRIDEL (MXND, MLN, XN, YN, ZN, NUID, LXK, KXL, NXL, ERR = .TRUE. GOTO 180 ENDIF -C + C ARRANGE NODES SO THE COLLAPSING DIAGONAL IS FROM 1ST TO 3RD NODES C AND INSURE THAT THE NODE TO BE DELETED IS NOT A BOUNDARY NODE -C + CALL NXKORD (NODES, I) N1 = NODES(1) N2 = NODES(2) N3 = NODES(3) N4 = NODES(4) -C + X21 = XN (N2) - XN (N1) X32 = XN (N3) - XN (N2) X43 = XN (N4) - XN (N3) @@ -378,9 +351,9 @@ SUBROUTINE TRIDEL (MXND, MLN, XN, YN, ZN, NUID, LXK, KXL, NXL, THETA4 = ACOS (- ( (X14 * X43) + (Y14 * Y43) ) / & (D14 * D43)) ENDIF -C + C TEST CASE ONE -C + IF ( (LXN(2, N1) .GT. 0) .AND. & (LXN (2, N3) .GT. 0) .AND. & (LXN (4, N3) .EQ. 0) .AND. @@ -393,9 +366,9 @@ SUBROUTINE TRIDEL (MXND, MLN, XN, YN, ZN, NUID, LXK, KXL, NXL, & (K (J) .NE. KKKADD)) & THEN PASSED = .TRUE. -C + C TEST CASE 2 -C + ELSEIF ( (LXN(2, N1) .GT. 0) .AND. & (LXN (2, N3) .GT. 0) .AND. & (LXN (4, N3) .GE. 0) .AND. @@ -408,9 +381,9 @@ SUBROUTINE TRIDEL (MXND, MLN, XN, YN, ZN, NUID, LXK, KXL, NXL, & (K (J) .NE. KKKADD) ) & THEN PASSED = .TRUE. -C + C TEST CASE 3 -C + ELSEIF ( (LXN(2, N1) .GT. 0) .AND. & (LXN (2, N3) .GT. 0) .AND. & (LXN (4, N3) .GE. 0) .AND. @@ -421,9 +394,9 @@ SUBROUTINE TRIDEL (MXND, MLN, XN, YN, ZN, NUID, LXK, KXL, NXL, & (K (J) .NE. KKKADD) ) & THEN PASSED = .TRUE. -C + C TEST CASE 4 -C + ELSEIF ( (LXN(2, N1) .GT. 0) .AND. & (LXN (2, N3) .GT. 0) .AND. & (THETA1 .GT. TOLER5) .AND. @@ -433,9 +406,9 @@ SUBROUTINE TRIDEL (MXND, MLN, XN, YN, ZN, NUID, LXK, KXL, NXL, & (K (J) .NE. KKKADD) ) & THEN PASSED = .TRUE. -C + C TEST CASE 5 -C + ELSEIF ( (LXN(2, N1) .GT. 0) .AND. & (LXN (2, N3) .GT. 0) .AND. & (THETA1 .GT. TOLER3) .AND. @@ -446,11 +419,11 @@ SUBROUTINE TRIDEL (MXND, MLN, XN, YN, ZN, NUID, LXK, KXL, NXL, & (K (J) .NE. KKKADD) ) & THEN PASSED = .TRUE. -C + ELSE PASSED = .FALSE. ENDIF -C + IF (PASSED) THEN IF (GRAPH) THEN CALL RPLOTL (MXND, XN, YN, ZN, NXL, XMIN, XMAX, @@ -483,25 +456,25 @@ SUBROUTINE TRIDEL (MXND, MLN, XN, YN, ZN, NUID, LXK, KXL, NXL, & DONE, CHECK, NOROOM, ERR) IF ((NOROOM) .OR. (ERR)) GOTO 180 IF (DONE) THEN -C + IF (VIDEO) THEN CALL RPLOTL (MXND, XN, YN, ZN, NXL, XMIN, XMAX, & YMIN, YMAX, ZMIN, ZMAX, LLL, DEV1, KREG) CALL SNAPIT (3) ENDIF -C + CALL FILSMO (MXND, MLN, XN, YN, ZN, LXK, KXL, NXL, & LXN, LLL, NNN, NNN, LNODES, BNSIZE, NLOOP, XMIN, & XMAX, YMIN, YMAX, ZMIN, ZMAX, DEV1, KREG) -C + IF ((GRAPH) .OR. (VIDEO)) THEN CALL RPLOTL (MXND, XN, YN, ZN, NXL, XMIN, XMAX, & YMIN, YMAX, ZMIN, ZMAX, LLL, DEV1, KREG) IF (VIDEO) CALL SNAPIT (3) ENDIF -C + C CHECK TO SEE IF WE HAVE MADE A 2-LINE NODE -C + IF (LXN (3, NODE1) .LE. 0) THEN NODE = NODE1 KELEM = KXL (1, LXN (1, NODE)) @@ -513,7 +486,7 @@ SUBROUTINE TRIDEL (MXND, MLN, XN, YN, ZN, NUID, LXK, KXL, NXL, CHECK = .FALSE. GOTO 140 ENDIF -C + CHECK = .TRUE. DONE = .FALSE. REDO = .TRUE. @@ -524,7 +497,7 @@ SUBROUTINE TRIDEL (MXND, MLN, XN, YN, ZN, NUID, LXK, KXL, NXL, 160 CONTINUE ENDIF 170 CONTINUE -C + CALL TRIFIX (MXND, MLN, XN, YN, ZN, NUID, LXK, KXL, NXL, LXN, & NNN, LLL, KKK, NAVAIL, IAVAIL, ANGLE, LNODES, BNSIZE, & NLOOP, DEV1, KREG, XMIN, XMAX, YMIN, YMAX, ZMIN, ZMAX, GRAPH, @@ -532,7 +505,7 @@ SUBROUTINE TRIDEL (MXND, MLN, XN, YN, ZN, NUID, LXK, KXL, NXL, IF ((NOROOM) .OR. (ERR)) GOTO 180 IF (REDO) GOTO 100 180 CONTINUE -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/trifix.f b/packages/seacas/applications/fastq/trifix.f index 372093019f56..f6dcd5076279 100644 --- a/packages/seacas/applications/fastq/trifix.f +++ b/packages/seacas/applications/fastq/trifix.f @@ -1,66 +1,48 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: trifix.f,v 1.3 1998/07/14 18:20:11 gdsjaar Exp $ -C $Log: trifix.f,v $ -C Revision 1.3 1998/07/14 18:20:11 gdsjaar -C Removed unused variables, cleaned up a little. -C -C Changed BLUE labels to GREEN to help visibility on black background -C (indirectly requested by a couple users) -C -C Revision 1.2 1991/03/21 15:45:23 gdsjaar -C Changed all 3.14159... to atan2(0.0, -1.0) -C -c Revision 1.1.1.1 1990/11/30 11:17:19 gdsjaar -c FASTQ Version 2.0X -c -c Revision 1.1 90/11/30 11:17:17 gdsjaar -c Initial revision -c -C SUBROUTINE TRIFIX (MXND, MLN, XN, YN, ZN, NUID, LXK, KXL, NXL, & LXN, NNN, LLL, KKK, NAVAIL, IAVAIL, ANGLE, LNODES, BNSIZE, & NLOOP, DEV1, KREG, XMIN, XMAX, YMIN, YMAX, ZMIN, ZMAXZ, GRAPH, & VIDEO, NOROOM, ERR) C*********************************************************************** -C + C SUBROUTINE TRIFIX = CHECKS ALL ELEMENTS FOR ANY TRIANGULAR SHAPED C LONG ELEMENT AND DELETES THEM WHEN C FOUND AND POSSIBLE -C + C*********************************************************************** -C + DIMENSION ANGLE (MXND), BNSIZE (2, MXND), LNODES (MLN, MXND) DIMENSION NODES(4) DIMENSION LXK(4, MXND), NXL(2, 3*MXND), KXL(2, 3*MXND) DIMENSION LXN(4, MXND), XN(MXND), YN(MXND), ZN(MXND), NUID(MXND) -C + CHARACTER*3 DEV1 LOGICAL ERR, DONE, GRAPH, REDO, CCW LOGICAL VIDEO, NOROOM -C + PI = ATAN2(0.0, -1.0) TWOPI = 2.0 * PI -C + ERR = .FALSE. DONE = .FALSE. CCW = .TRUE. KMAX = 30 KOUNT = 0 -C + C TOLERANCE IS SET AT 150 DEGREES -C + TOLER = 2.6179939 -C + 100 CONTINUE KOUNT = KOUNT + 1 IF (KOUNT .GT. KMAX) GOTO 140 REDO = .FALSE. -C + DO 130 KELEM = 1, KKK IF (LXK (1, KELEM) .GT. 0) THEN CALL GNXKA (MXND, XN, YN, KELEM, NODES, AREA, LXK, NXL, CCW) @@ -76,22 +58,22 @@ SUBROUTINE TRIFIX (MXND, MLN, XN, YN, ZN, NUID, LXK, KXL, NXL, I0 = NODES (I - 1) I2 = NODES (I + 1) ENDIF -C + ANG1 = ATAN2 (YN (I0) - YN (I1), XN (I0) - XN (I1)) IF (ANG1 .LT. 0.) ANG1 = ANG1 + TWOPI ANG2 = ATAN2 (YN (I2) - YN (I1), XN (I2) - XN (I1)) IF (ANG2 .LT. 0.) ANG2 = ANG2 + TWOPI ANG = ANG1 - ANG2 IF (ANG .LT. 0.) ANG = ANG + TWOPI -C + CALL LONGEL (MXND, MLN, LNODES, XN, YN, NUID, LXK, KXL, & NXL, LXN, NNN, NAVAIL, IAVAIL, I1, KELEM, ANG, TOLER, & I0, I2, KREG, XMIN, XMAX, YMIN, YMAX, KKK, LLL, & DONE, GRAPH, VIDEO, NOROOM, ERR, KKKADD) IF ((NOROOM) .OR. (ERR)) GOTO 140 -C + IF (DONE) THEN -C + IF ((GRAPH) .AND. (.NOT. VIDEO)) THEN DIST = MAX (ABS(XN (I0) - XN (I1)), & ABS(XN (I2) - XN (I1)), ABS(YN (I0) - YN (I1)), @@ -106,7 +88,7 @@ SUBROUTINE TRIFIX (MXND, MLN, XN, YN, ZN, NUID, LXK, KXL, NXL, & YMIN, YMAX, ZMIN, ZMAX, LLL, DEV1, KREG) CALL SNAPIT (3) ENDIF -C + CALL FILSMO (MXND, MLN, XN, YN, ZN, LXK, KXL, NXL, & LXN, LLL, NNN, NNN, LNODES, BNSIZE, NLOOP, XMIN, & XMAX, YMIN, YMAX, ZMIN, ZMAX, DEV1, KREG) @@ -119,15 +101,15 @@ SUBROUTINE TRIFIX (MXND, MLN, XN, YN, ZN, NUID, LXK, KXL, NXL, REDO = .TRUE. GOTO 120 ENDIF -C + 110 CONTINUE 120 CONTINUE ENDIF 130 CONTINUE -C + IF (REDO) GOTO 100 140 CONTINUE -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/tuck.f b/packages/seacas/applications/fastq/tuck.f index 8127a86e6f3b..e422b8b03af0 100644 --- a/packages/seacas/applications/fastq/tuck.f +++ b/packages/seacas/applications/fastq/tuck.f @@ -1,59 +1,48 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: tuck.f,v 1.1 1990/11/30 11:17:21 gdsjaar Exp $ -C $Log: tuck.f,v $ -C Revision 1.1 1990/11/30 11:17:21 gdsjaar -C Initial revision -C -C -CC* FILE: [.PAVING]TUCK.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE TUCK (MXND, MLN, NUID, XN, YN, LXK, KXL, NXL, LXN, & LNODES, IAVAIL, NAVAIL, LLL, KKK, NNN, N1, NLOOP, GRAPH, & NOROOM, ERR) C*********************************************************************** -C + C SUBROUTINE TUCK = COLLAPSES TWO SIDE LINES INTO A ROW END NODE. C THIS IS REFERRED TO AS A TUCK. -C + C*********************************************************************** -C + DIMENSION XN (MXND), YN (MXND), NUID (MXND) DIMENSION LXK (4, MXND), KXL (2, 3*MXND) DIMENSION NXL (2, 3*MXND), LXN (4, MXND) DIMENSION LNODES (MLN, MXND) DIMENSION L1LIST(20) -C + LOGICAL GRAPH, ERR, NOROOM -C + ERR = .FALSE. -C + C CHECK TO MAKE SURE THAT THE NODE STILL EXISTS -C + IF (LXN (1, N1) .LE. 0) THEN ERR = .TRUE. CALL MESAGE ('** PROBLEMS IN TUCK - N1 DOES NOT EXIST **') GOTO 290 ENDIF -C + C GET ALL THE DEFINITIONS IN ORDER -C + N0 = LNODES (2, N1) N2 = LNODES (3, N1) L1 = LNODES (5, N0) L2 = LNODES (5, N1) KOLD = KXL (1, L1) KL2 = KXL (1, L2) -C + C FIND L5 AND NC2 -C + DO 100 I = 1, 4 LTEST = LXK (I, KOLD) IF (LTEST .NE. L1) THEN @@ -72,9 +61,9 @@ SUBROUTINE TUCK (MXND, MLN, NUID, XN, YN, LXK, KXL, NXL, LXN, ERR = .TRUE. GOTO 290 110 CONTINUE -C + C FIND L4 AND NC1 -C + DO 120 I = 1, 4 LTEST = LXK (I, KOLD) IF ( (LTEST .NE. L1) .AND. (LTEST .NE. L5) ) THEN @@ -93,9 +82,9 @@ SUBROUTINE TUCK (MXND, MLN, NUID, XN, YN, LXK, KXL, NXL, LXN, ERR = .TRUE. GOTO 290 130 CONTINUE -C + C FIND L3 -C + DO 140 I = 1, 4 LTEST = LXK (I, KOLD) IF ( (LTEST .NE. L1) .AND. (LTEST .NE. L5) .AND. @@ -108,9 +97,9 @@ SUBROUTINE TUCK (MXND, MLN, NUID, XN, YN, LXK, KXL, NXL, LXN, ERR = .TRUE. GOTO 290 150 CONTINUE -C + C FIND THE ELEMENT KL5 -C + IF (KXL (1, L5) .EQ. KOLD) THEN KL5 = KXL (2, L5) ELSEIF (KXL (2, L5) .EQ. KOLD) THEN @@ -120,10 +109,10 @@ SUBROUTINE TUCK (MXND, MLN, NUID, XN, YN, LXK, KXL, NXL, LXN, ERR = .TRUE. GOTO 290 ENDIF -C + C NOW THAT ALL THE NECESSARY VARIABLES HAVE BEEN DEFINED, C START BY DELETING LINE L1, L2, AND L5 -C + KXL (1, L1) = 0 KXL (2, L1) = 0 NXL (1, L1) = 0 @@ -136,9 +125,9 @@ SUBROUTINE TUCK (MXND, MLN, NUID, XN, YN, LXK, KXL, NXL, LXN, KXL (2, L5) = 0 NXL (1, L5) = 0 NXL (2, L5) = 0 -C + C NOW FIX THE KXL ARRAY FOR LINE L3 HAVING KL5 INSTEAD OF KOLD -C + IF (KXL (1, L3) .EQ. KOLD) THEN KXL (1, L3) = KL5 ELSEIF (KXL (2, L3) .EQ. KOLD) THEN @@ -148,9 +137,9 @@ SUBROUTINE TUCK (MXND, MLN, NUID, XN, YN, LXK, KXL, NXL, LXN, ERR = .TRUE. GOTO 290 ENDIF -C + C NOW FIX THE KXL ARRAY FOR LINE L3 HAVING KL5 INSTEAD OF KOLD -C + IF (KXL (1, L4) .EQ. KOLD) THEN KXL (1, L4) = KL2 ELSEIF (KXL (2, L4) .EQ. KOLD) THEN @@ -160,10 +149,10 @@ SUBROUTINE TUCK (MXND, MLN, NUID, XN, YN, LXK, KXL, NXL, LXN, ERR = .TRUE. GOTO 290 ENDIF -C + C FIX THE LINES PER ELEMENT ARRAY FOR ELEMENT KL5 TO REFLECT C L3 TAKING L5'S PLACE -C + DO 160 I = 1, 4 IF (LXK (I, KL5) .EQ. L5) THEN LXK (I, KL5) = L3 @@ -174,10 +163,10 @@ SUBROUTINE TUCK (MXND, MLN, NUID, XN, YN, LXK, KXL, NXL, LXN, ERR = .TRUE. GOTO 290 170 CONTINUE -C + C FIX THE LINES PER ELEMENT ARRAY FOR ELEMENT KL2 TO REFLECT C L4 TAKING L2'S PLACE -C + DO 180 I = 1, 4 IF (LXK (I, KL2) .EQ. L2) THEN LXK (I, KL2) = L4 @@ -188,9 +177,9 @@ SUBROUTINE TUCK (MXND, MLN, NUID, XN, YN, LXK, KXL, NXL, LXN, ERR = .TRUE. GOTO 290 190 CONTINUE -C + C RECONNECT ALL LINES CONNECTED TO N1 TO NC1 EXCEPT L5 AND L2 -C + CALL GETLXN (MXND, LXN, N1, L1LIST, NL, ERR) IF (ERR) THEN CALL MESAGE ('** PROBLEMS IN TUCK GETTING N1 LINES **') @@ -212,10 +201,10 @@ SUBROUTINE TUCK (MXND, MLN, NUID, XN, YN, LXK, KXL, NXL, LXN, CALL LCOLOR ('WHITE') CALL SFLUSH ENDIF -C + C FIX LXN ARRAY C UNHOOK L1, L2 AND L5 FROM N1 -C + CALL DELLXN (MXND, LXN, NUID, NAVAIL, IAVAIL, N1, & L1, NNN, ERR, NOROOM) IF ((NOROOM) .OR. (ERR)) THEN @@ -234,9 +223,9 @@ SUBROUTINE TUCK (MXND, MLN, NUID, XN, YN, LXK, KXL, NXL, LXN, CALL MESAGE ('** PROBLEMS IN TUCK UNHOOKING L5 FROM N1 **') GOTO 290 ENDIF -C + C ADD ALL LINES STILL HOOKED TO N1 TO THE LIST OF LINES FOR NC1 -C + DO 210 I = 1, NL LL = L1LIST (I) IF ((LL .NE. L2) .AND. (LL .NE. L5) .AND. (LL .NE. L1)) THEN @@ -249,9 +238,9 @@ SUBROUTINE TUCK (MXND, MLN, NUID, XN, YN, LXK, KXL, NXL, LXN, ENDIF ENDIF 210 CONTINUE -C + C DELETE N1 -C + DO 220 I = 1, 3 LXN (I, N1) = 0 220 CONTINUE @@ -259,9 +248,9 @@ SUBROUTINE TUCK (MXND, MLN, NUID, XN, YN, LXK, KXL, NXL, LXN, IAVAIL = N1 NAVAIL = NAVAIL+1 NUID (N1) = 0 -C + C RECONNECT ALL LINES CONNECTED TO N2 TO N0 (EXCEPT L2) -C + CALL GETLXN (MXND, LXN, N2, L1LIST, NL, ERR) IF (ERR) THEN CALL MESAGE ('** PROBLEMS IN TUCK GETTING N2 LINES **') @@ -283,10 +272,10 @@ SUBROUTINE TUCK (MXND, MLN, NUID, XN, YN, LXK, KXL, NXL, LXN, CALL LCOLOR ('WHITE') CALL SFLUSH ENDIF -C + C FIX LXN ARRAY C UNHOOK L2 FROM N2, L1 FROM N0, AND L5 FROM NC2 -C + CALL DELLXN (MXND, LXN, NUID, NAVAIL, IAVAIL, N2, & L2, NNN, ERR, NOROOM) IF ((NOROOM) .OR. (ERR)) THEN @@ -305,9 +294,9 @@ SUBROUTINE TUCK (MXND, MLN, NUID, XN, YN, LXK, KXL, NXL, LXN, CALL MESAGE ('** PROBLEMS IN TUCK UNHOOKING L1 FROM N0 **') GOTO 290 ENDIF -C + C ADD ALL LINES STILL HOOKED TO N2 TO THE LIST OF LINES FOR N0 -C + DO 240 I = 1, NL LL = L1LIST (I) IF (LL .NE. L2) THEN @@ -320,9 +309,9 @@ SUBROUTINE TUCK (MXND, MLN, NUID, XN, YN, LXK, KXL, NXL, LXN, ENDIF ENDIF 240 CONTINUE -C + C DELETE N2 -C + DO 250 I = 1, 3 LXN (I, N2) = 0 250 CONTINUE @@ -330,24 +319,24 @@ SUBROUTINE TUCK (MXND, MLN, NUID, XN, YN, LXK, KXL, NXL, LXN, IAVAIL = N2 NAVAIL = NAVAIL+1 NUID (N2) = 0 -C + C NOW DELETE THE OLD ELEMENT -C + DO 260 I = 1, 4 LXK (I, KOLD) = 0 260 CONTINUE -C + C NOW FIX THE LNODES ARRAY -C + LNODES (3, N0) = LNODES (3, N2) LNODES (2, LNODES (3, N2) ) = N0 LNODES (5, N0) = LNODES (5, N2) -C + NLOOP = NLOOP - 2 ERR = .FALSE. -C + C NOW REDRAW THE ELEMENTS -C + IF (GRAPH) THEN CALL LCOLOR ('BLACK') CALL D2NODE (MXND, XN, YN, N0, N1) @@ -372,16 +361,16 @@ SUBROUTINE TUCK (MXND, MLN, NUID, XN, YN, LXK, KXL, NXL, LXN, 280 CONTINUE CALL SFLUSH ENDIF -C + C FLAG NODES FOR SMOOTHING -C + CALL MARKSM (MXND, MLN, LXK, KXL, NXL, LXN, LNODES, NC1, ERR) IF (ERR) GOTO 290 CALL MARKSM (MXND, MLN, LXK, KXL, NXL, LXN, LNODES, NC2, ERR) IF (ERR) GOTO 290 -C + 290 CONTINUE -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/umschm.f b/packages/seacas/applications/fastq/umschm.f index 8260bb948bd6..f6f09a720945 100644 --- a/packages/seacas/applications/fastq/umschm.f +++ b/packages/seacas/applications/fastq/umschm.f @@ -1,31 +1,20 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: umschm.f,v 1.1 1990/11/30 11:17:24 gdsjaar Exp $ -C $Log: umschm.f,v $ -C Revision 1.1 1990/11/30 11:17:24 gdsjaar -C Initial revision -C -C -CC* FILE: [.QMESH]UMSCHM.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE UMSCHM (IA, NPER, KKK, LLL, NNN, ML, MS, NSPR, ISLIST, & NINT, IFLINE, NLPS, ILLIST, LINKL, LINKS, MXNPER, MAXPRM, MAX3, & MXND, X, Y, NID, NNPS, ANGLE, XN, YN, NUID, LXK, KXL, NXL, LXN, & XSUB, YSUB, NIDSUB, INDX, IAVAIL, NAVAIL, CCW, ERR) C*********************************************************************** -C + C UMSCHM - "U" MESH SCHEME; CALCULATE A "PENTAGON" MAPPED MESH C (3 RECTANGULAR SUBREGIONS) -C + C*********************************************************************** -C + DIMENSION IA(1) DIMENSION ISLIST(NSPR), NINT(ML), IFLINE(MS), NLPS(MS) DIMENSION ILLIST(MS*3), LINKL(2, ML), LINKS(2, MS) @@ -34,18 +23,18 @@ SUBROUTINE UMSCHM (IA, NPER, KKK, LLL, NNN, ML, MS, NSPR, ISLIST, DIMENSION LXK(4, MXND), KXL(2, 3*MXND), NXL(2, 3*MXND) DIMENSION LXN(4, MXND) DIMENSION XSUB(MXNPER), YSUB(MXNPER), NIDSUB(MXNPER), INDX(MXND) -C + LOGICAL CCW, ERR, FINAL -C + C SET UP THE PENTAGON DIVISIONS, AND FIND THE CENTER POINT -C + CALL GETM5 (IA, ML, MS, MAX3, NSPR, ISLIST, NINT, IFLINE, NLPS, & ILLIST, LINKL, LINKS, X, Y, NID, NNPS, ANGLE, NPER, M1A, M1B, & M2, M3A, M3B, M4A, M4B, M5, MC, XCEN, YCEN, CCW, ERR) FINAL = .FALSE. -C + C SET UP THE FIRST SUBREGION, AND SEND IT OFF TO BE GENERATED -C + IF (.NOT.ERR) THEN CALL SUBPEN (NPER, NEWPER, X, Y, NID, XSUB, YSUB, NIDSUB, & M1B + M2 + M3A, M4A, MC, M1A, 1, XCEN, YCEN) @@ -56,9 +45,9 @@ SUBROUTINE UMSCHM (IA, NPER, KKK, LLL, NNN, ML, MS, NSPR, ISLIST, & LXK, KXL, NXL, LXN, M1B, M2, KKK, KKKOLD, NNN, NNNOLD, LLL, & LLLOLD, IAVAIL, NAVAIL, ERR) END IF -C + C SET UP THE SECOND SUBREGION, AND SEND IT OFF TO BE GENERATED -C + IF (.NOT.ERR) THEN CALL SUBPEN (NPER, NEWPER, X, Y, NID, XSUB, YSUB, NIDSUB, & M3B + M4A, M3B, M4A, M1A + M1B + M2 + M3A, 2, XCEN, YCEN) @@ -71,9 +60,9 @@ SUBROUTINE UMSCHM (IA, NPER, KKK, LLL, NNN, ML, MS, NSPR, ISLIST, CALL FIXSUB (MXND, NNNOLD, NNN, LLLOLD, LLL, KKKOLD, KKK, XN, & YN, NUID, LXK, KXL, NXL, LXN, INDX, IAVAIL, NAVAIL, FINAL) END IF -C + C SET UP THE THIRD SUBREGION, AND SEND IT OFF TO BE GENERATED -C + IF (.NOT.ERR) THEN CALL SUBPEN (NPER, NEWPER, X, Y, NID, XSUB, YSUB, NIDSUB, & M4B + M5 + M1A, MC, M3B, M1A + M1B + M2 + M3A + M3B + M4A, @@ -88,6 +77,6 @@ SUBROUTINE UMSCHM (IA, NPER, KKK, LLL, NNN, ML, MS, NSPR, ISLIST, CALL FIXSUB (MXND, NNNOLD, NNN, LLLOLD, LLL, KKKOLD, KKK, XN, & YN, NUID, LXK, KXL, NXL, LXN, INDX, IAVAIL, NAVAIL, FINAL) END IF -C + RETURN END diff --git a/packages/seacas/applications/fastq/undelm.f b/packages/seacas/applications/fastq/undelm.f index 007be98e098c..aa18836e3d8b 100644 --- a/packages/seacas/applications/fastq/undelm.f +++ b/packages/seacas/applications/fastq/undelm.f @@ -1,58 +1,38 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: undelm.f,v 1.2 1998/07/14 18:20:13 gdsjaar Exp $ -C $Log: undelm.f,v $ -C Revision 1.2 1998/07/14 18:20:13 gdsjaar -C Removed unused variables, cleaned up a little. -C -C Changed BLUE labels to GREEN to help visibility on black background -C (indirectly requested by a couple users) -C -C Revision 1.1.1.1 1990/11/30 11:17:29 gdsjaar -C FASTQ Version 2.0X -C -c Revision 1.1 90/11/30 11:17:27 gdsjaar -c Initial revision -c -C -CC* FILE: [.PAVING]UNDELM.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE UNDELM (MXND, MLN, LNODES, XN, YN, NUID, LXK, KXL, NXL, & LXN, NNN, LLL, KKK, NAVAIL, IAVAIL, N0, N1, N2, N3, L1, L2, L3, & K1, K2, NOROOM, ERR, GRAPH, VIDEO) C*********************************************************************** -C + C SUBROUTINE UNDELM = UNDELETES AN ELEMENT BY EXPANDING N1 INTO A C NEW ELEMENT -C + C*********************************************************************** -C + DIMENSION LXK(4, MXND), NXL(2, 3*MXND), KXL(2, 3*MXND) DIMENSION LXN(4, MXND), XN(MXND), YN(MXND), NUID(MXND) DIMENSION LNODES (MLN, MXND) -C + LOGICAL ERR, NOROOM, GRAPH, VIDEO -C + ERR = .FALSE. -C + C MAKE SURE THAT N2 HAS AT LEAST FOUR LINES ATTACHED TO IT -C + IF (LXN (4, N2) .EQ. 0) THEN ERR = .TRUE. CALL MESAGE ('** N2 IN UNDELM CANNOT BE USED'// & ' TO EXPAND AN ELEMENT **') GOTO 140 ENDIF -C + C ERASE THE LINE L3 -C + IF ((GRAPH) .OR. (VIDEO)) THEN CALL LCOLOR ('BLACK') CALL D2NODE (MXND, XN, YN, N0, N2) @@ -64,9 +44,9 @@ SUBROUTINE UNDELM (MXND, MLN, LNODES, XN, YN, NUID, LXK, KXL, NXL, CALL SFLUSH IF (VIDEO) CALL SNAPIT (3) ENDIF -C + C DEFINE THE NEW NODE AND THE TWO NEW LINES -C + NNN = NNN + 1 IF (NNN .GT. MXND) THEN NOROOM = .TRUE. @@ -75,7 +55,7 @@ SUBROUTINE UNDELM (MXND, MLN, LNODES, XN, YN, NUID, LXK, KXL, NXL, NNEW = NNN XN (NNEW) = (XN (N0) + XN (N2)) * .5 YN (NNEW) = (YN (N0) + YN (N2)) * .5 -C + LLL = LLL + 2 L4 = LLL -1 L5 = LLL @@ -83,9 +63,9 @@ SUBROUTINE UNDELM (MXND, MLN, LNODES, XN, YN, NUID, LXK, KXL, NXL, NXL (2, L4) = NNEW NXL (1, L5) = N3 NXL (2, L5) = NNEW -C + C NOW CHANGE LINE L3'S END POINT FROM N2 TO NNEW -C + IF (NXL (1, L3) .EQ. N2) THEN NXL (1, L3) = NNEW ELSEIF (NXL (2, L3) .EQ. N2) THEN @@ -95,9 +75,9 @@ SUBROUTINE UNDELM (MXND, MLN, LNODES, XN, YN, NUID, LXK, KXL, NXL, ERR = .TRUE. GOTO 140 ENDIF -C + C NOW UPDATE THE LXN ARRAYS -C + LXN (1, NNEW) = L3 LXN (2, NNEW) = L4 LXN (3, NNEW) = L5 @@ -105,44 +85,44 @@ SUBROUTINE UNDELM (MXND, MLN, LNODES, XN, YN, NUID, LXK, KXL, NXL, CALL FIXLXN (MXND, LXN, NXL, NUID, NAVAIL, IAVAIL, NNN, LLL, & NNN, LLL, ERR, NOROOM) IF ((NOROOM) .OR. (ERR)) GOTO 140 -C + C REMOVE L3 FROM THE LIST OF LINES FOR N2 -C + CALL DELLXN (MXND, LXN, NUID, NAVAIL, IAVAIL, N2, & L3, NNN, ERR, NOROOM) IF ((NOROOM) .OR. (ERR)) THEN CALL MESAGE ('** PROBLEMS IN UNDELM UNHOOKING L3 FROM N2 **') GOTO 140 ENDIF -C + C ADD LINE L4 TO N1 -C + CALL ADDLXN (MXND, LXN, NUID, NAVAIL, IAVAIL, & N1, L4, NNN, ERR, NOROOM) IF ((NOROOM) .OR. (ERR)) THEN CALL MESAGE ('** PROBLEMS IN UNDELM HOOKING L4 TO N1 **') GOTO 140 ENDIF -C + C ADD LINE L5 TO N3 -C + CALL ADDLXN (MXND, LXN, NUID, NAVAIL, IAVAIL, & N3, L5, NNN, ERR, NOROOM) IF ((NOROOM) .OR. (ERR)) THEN CALL MESAGE ('** PROBLEMS IN UNDELM HOOKING L5 TO N3 **') GOTO 140 ENDIF -C + C NOW ADD THE NEW ELEMENT -C + KKK = KKK + 1 LXK (1, KKK) = L1 LXK (2, KKK) = L2 LXK (3, KKK) = L5 LXK (4, KKK) = L4 -C + C NOW FIX THE KXL ARRAY FOR LINE L1 -C + IF (KXL (1, L1) .EQ. K2) THEN KXL (1, L1) = KKK ELSEIF (KXL (2, L1) .EQ. K2) THEN @@ -152,9 +132,9 @@ SUBROUTINE UNDELM (MXND, MLN, LNODES, XN, YN, NUID, LXK, KXL, NXL, ERR = .TRUE. GOTO 140 ENDIF -C + C NOW FIX THE KXL ARRAY FOR LINE L2 -C + IF (KXL (1, L2) .EQ. K1) THEN KXL (1, L2) = KKK ELSEIF (KXL (2, L2) .EQ. K1) THEN @@ -164,16 +144,16 @@ SUBROUTINE UNDELM (MXND, MLN, LNODES, XN, YN, NUID, LXK, KXL, NXL, ERR = .TRUE. GOTO 140 ENDIF -C + C ADD THE KXL ENTRIES FOR THE NEW LINES -C + KXL (1, L4) = K2 KXL (2, L4) = KKK KXL (1, L5) = K1 KXL (2, L5) = KKK -C + C NOW FIX THE LXK ARRAY FOR THE ELEMENT K1 -C + DO 100 I = 1, 4 IF (LXK (I, K1) .EQ. L2) THEN LXK (I, K1) = L5 @@ -185,9 +165,9 @@ SUBROUTINE UNDELM (MXND, MLN, LNODES, XN, YN, NUID, LXK, KXL, NXL, ERR = .TRUE. GOTO 140 110 CONTINUE -C + C NOW FIX THE LXK ARRAY FOR THE ELEMENT K2 -C + DO 120 I = 1, 4 IF (LXK (I, K2) .EQ. L1) THEN LXK (I, K2) = L4 @@ -199,9 +179,9 @@ SUBROUTINE UNDELM (MXND, MLN, LNODES, XN, YN, NUID, LXK, KXL, NXL, ERR = .TRUE. GOTO 140 130 CONTINUE -C + C NOW REDRAW THE LINES -C + IF ((GRAPH) .OR. (VIDEO)) THEN CALL D2NODE (MXND, XN, YN, N0, NNEW) CALL D2NODE (MXND, XN, YN, N1, NNEW) @@ -209,7 +189,7 @@ SUBROUTINE UNDELM (MXND, MLN, LNODES, XN, YN, NUID, LXK, KXL, NXL, CALL SFLUSH IF (VIDEO) CALL SNAPIT (3) ENDIF -C + LNODES (4, NNEW) = 2 CALL MARKSM (MXND, MLN, LXK, KXL, NXL, LXN, LNODES, & NNEW, ERR) @@ -228,5 +208,5 @@ SUBROUTINE UNDELM (MXND, MLN, LNODES, XN, YN, NUID, LXK, KXL, NXL, IF (ERR) GOTO 140 140 CONTINUE RETURN -C + END diff --git a/packages/seacas/applications/fastq/unisnp.f b/packages/seacas/applications/fastq/unisnp.f index 15151d61ace7..e4c9172dae61 100644 --- a/packages/seacas/applications/fastq/unisnp.f +++ b/packages/seacas/applications/fastq/unisnp.f @@ -1,53 +1,34 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: unisnp.f,v 1.2 2000/11/13 15:39:05 gdsjaar Exp $ -C $Log: unisnp.f,v $ -C Revision 1.2 2000/11/13 15:39:05 gdsjaar -C Cleaned up unused variables and labels. -C -C Removed some real to int conversion warnings. -C -C Revision 1.1.1.1 1990/11/30 11:17:32 gdsjaar -C FASTQ Version 2.0X -C -c Revision 1.1 90/11/30 11:17:30 gdsjaar -c Initial revision -c -C -CC* FILE: [.MAIN]UNISNP.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE UNISNP (MSNAP, SNAPDX, NSNAP, INDEX, XMIN, XMAX, STEP) C*********************************************************************** -C + C SUBROUTINE UNISNP = GENERATES UNIFORM SNAP GRID -C + C*********************************************************************** -C + C VARIABLES USED: C MSNAP = DIMENSION OV SNAP ARRAYS C SNAPDX = THE SNAP GRID VALUES ARRAY (X AND Y) C NSNAP = THE NUMBER OF SNAP GRID VALUES IN X AND Y C INDEX = 1 FOR X VALUES, 2 FOR Y VALUES -C + C*********************************************************************** -C + DIMENSION SNAPDX (2, MSNAP), NSNAP (2) -C + LOGICAL ERR -C + CHARACTER*1 AXIS (2) -C + DATA AXIS /'X', 'Y'/ -C + C DEFINE THE GRID -C + IF (STEP.EQ.0.)RETURN ILOOP = INT(((XMAX - XMIN) / STEP) + 2) XGRID = XMIN @@ -60,9 +41,9 @@ SUBROUTINE UNISNP (MSNAP, SNAPDX, NSNAP, INDEX, XMIN, XMAX, STEP) XGRID = XGRID + STEP IF (XGRID.GE. (STEP + XMAX))RETURN 100 CONTINUE -C + RETURN -C + 10000 FORMAT (' THE LAST SUCCESSFUL ', A1, ' GRID INPUT WAS: ', G14.7) -C + END diff --git a/packages/seacas/applications/fastq/vinter.f b/packages/seacas/applications/fastq/vinter.f index 29a97b67f423..0b84902c2d3a 100644 --- a/packages/seacas/applications/fastq/vinter.f +++ b/packages/seacas/applications/fastq/vinter.f @@ -1,85 +1,74 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: vinter.f,v 1.1 1990/11/30 11:17:36 gdsjaar Exp $ -C $Log: vinter.f,v $ -C Revision 1.1 1990/11/30 11:17:36 gdsjaar -C Initial revision -C -C -CC* FILE: [.PAVING]VINTER.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE VINTER (MXND, XN, YN, N1, N2, N3, XOLD, YOLD, & XNEW, YNEW, VCROSS) C*********************************************************************** -C + C SUBROUTINE VINTER = FINDS WHERE A VECTOR FROM N1 TO N2 C INTERSECTS THE VECTOR FROM N3 TO (XOLD, YOLD) -C + C*********************************************************************** -C + C NOTE: THIS INTERSECTION ROUTINE IS BASED ON AN ALGORITHM GIVEN C IN THE BOOK "GEOMETRIC MODELING" BY MICHAEL E. MORTENSON ON C PAGES 319 - 320. -C + C*********************************************************************** -C + DIMENSION XN (MXND), YN (MXND) -C + LOGICAL VCROSS -C + VCROSS = .FALSE. -C + C SET UP THE FIRST LINE'S VECTORS (A AND B) -C + XA = XN (N1) YA = YN (N1) XB = XN (N2) - XN (N1) YB = YN (N2) - YN (N1) -C + C SET UP THE SECOND LINE'S VECTORS (C AND D) -C + XC = XN (N3) YC = YN (N3) XD = XOLD - XN (N3) YD = YOLD - YN (N3) -C + C NOW USE THE VECTORS AND SOLVE FOR W. C W IS THE PROPORTION OF THE DISTANCE ALONG THE VECTOR D C WHERE THE INTERSECTION OCCURS. LIKEWISE U IS THE PROPORTIONAL C DISTANCE ALONG THE VECTOR B FOR THE INTERSECTION. -C + DENOM = (YB * XD) - (XB * YD) -C + C CHECK FOR SPECIAL PARALLEL CASE - THE DENOMINATOR IS EQUAL TO ZERO. -C + IF (DENOM .NE. 0.) THEN -C + C GET INTERSECTION LOCATION -C + W = ( (YC * XB) - (XB * YA) - (XC * YB) + (YB * XA) ) / DENOM -C + C GET THE U VALUE TO CONFIRM. -C + IF (XB .NE. 0.) THEN U = ( XC + (W * XD) - XA ) / XB ELSE U = ( YC + (W * YD) - YA ) / YB ENDIF -C + C CALCULATE THE INTERSECTION POINT BASED ON SIMILAR TRIANGLES -C + XNEW = ( (XA + (XB * U)) + (XC + (XD * W)) ) * .5 YNEW = ( (YA + (YB * U)) + (YC + (YD * W)) ) * .5 VCROSS = .TRUE. ENDIF -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/wedge.f b/packages/seacas/applications/fastq/wedge.f index 98eff15af07a..102f76494116 100644 --- a/packages/seacas/applications/fastq/wedge.f +++ b/packages/seacas/applications/fastq/wedge.f @@ -1,44 +1,27 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: wedge.f,v 1.2 2004/01/21 05:18:40 gdsjaar Exp $ -C $Log: wedge.f,v $ -C Revision 1.2 2004/01/21 05:18:40 gdsjaar -C Initialized several variables identified by valgrind. -C -C Revision 1.1.1.1 1990/11/30 11:17:41 gdsjaar -C FASTQ Version 2.0X -C -c Revision 1.1 90/11/30 11:17:39 gdsjaar -c Initial revision -c -C -CC* FILE: [.PAVING]WEDGE.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE WEDGE (MXND, MLN, NUID, LXK, KXL, NXL, LXN, XN, YN, & LNODES, BNSIZE, IAVAIL, NAVAIL, LLL, KKK, NNN, LLLOLD, NNNOLD, & N1, N6, NLOOP, PWEDGE, GRAPH, VIDEO, NOROOM, ERR) C*********************************************************************** -C + C SUBROUTINE WEDGE = EXPANDS TWO SIDE LINES INTO A CORNER NODE C THIS IS REFERRED TO AS A WEDGE. -C + C*********************************************************************** -C + DIMENSION NUID (MXND), XN (MXND), YN (MXND) DIMENSION LXK (4, MXND), KXL (2, 3*MXND) DIMENSION NXL (2, 3*MXND), LXN (4, MXND) DIMENSION LNODES (MLN, MXND), BNSIZE (2, MXND) DIMENSION L1LIST(20) -C + LOGICAL GRAPH, ERR, NOROOM, PWEDGE, VIDEO, TWOLIN -C + ERR = .FALSE. NNNOLD = MIN (NNN, NNNOLD) IF (LXN (3, N1) .EQ. 0) THEN @@ -46,18 +29,18 @@ SUBROUTINE WEDGE (MXND, MLN, NUID, LXK, KXL, NXL, LXN, XN, YN, ELSE TWOLIN = .FALSE. ENDIF -C + C GET ALL THE DEFINITIONS IN ORDER -C + l3 = 0 N0 = LNODES (2, N1) N2 = LNODES (3, N1) L1 = LNODES (5, N0) L2 = LNODES (5, N1) KL1 = KXL (1, L1) -C + C FIND L3, N4, AND KL3 -C + IF (.NOT. TWOLIN) THEN DO 100 I = 1, 4 LTEST = LXK (I, KL1) @@ -77,9 +60,9 @@ SUBROUTINE WEDGE (MXND, MLN, NUID, LXK, KXL, NXL, LXN, XN, YN, ERR = .TRUE. GOTO 200 110 CONTINUE -C + C FIND THE ELEMENT KL3 - THE ELEMENT ON THE OTHER SIDE OF L3 -C + IF (KXL (1, L3) .EQ. KL1) THEN KL3 = KXL (2, L3) ELSEIF (KXL (2, L3) .EQ. KL1) THEN @@ -90,17 +73,17 @@ SUBROUTINE WEDGE (MXND, MLN, NUID, LXK, KXL, NXL, LXN, XN, YN, GOTO 200 ENDIF ENDIF -C + C GET ALL THE N1 LINES -C + CALL GETLXN (MXND, LXN, N1, L1LIST, NL, ERR) IF (ERR) THEN CALL MESAGE ('** PROBLEMS IN WEDGE GETTING N1 LINES **') GOTO 200 ENDIF -C + C ERASE THE LINES -C + IF ((GRAPH) .OR. (VIDEO)) THEN CALL LCOLOR ('BLACK') DO 120 I = 1, NL @@ -115,10 +98,10 @@ SUBROUTINE WEDGE (MXND, MLN, NUID, LXK, KXL, NXL, LXN, XN, YN, ENDIF CALL SFLUSH ENDIF -C + C NOW THAT ALL THE NECESSARY VARIABLES HAVE BEEN DEFINED, C START BY DEFINING THE LOCATION OF ALL THE NEW NODES -C + NNN = NNN + 2 IF (NNN .GT. MXND) THEN NOROOM = .TRUE. @@ -145,9 +128,9 @@ SUBROUTINE WEDGE (MXND, MLN, NUID, LXK, KXL, NXL, LXN, XN, YN, YN (N1) = ( (YN (N0) + ( ( YN (N1) - YN (N0) ) * .666667 ) ) + & ((YN (N6) + YN (N0)) * .5) ) * .5 ENDIF -C + C NOW ADD LINES L4, L5, AND L6 -C + LLL = LLL + 3 L4 = LLL - 2 IF (TWOLIN) THEN @@ -163,36 +146,36 @@ SUBROUTINE WEDGE (MXND, MLN, NUID, LXK, KXL, NXL, LXN, XN, YN, NXL (2, L5) = N6 NXL (1, L6) = N5 NXL (2, L6) = N6 -C + C NOW UPDATE THE LXN ARRAYS -C + DO 130 I = 1, 4 LXN (I, N5) = 0 LXN (I, N6) = 0 130 CONTINUE -C + CALL FIXLXN (MXND, LXN, NXL, NUID, NAVAIL, IAVAIL, NNN, LLL, & NNNOLD, LLLOLD, NOROOM, ERR) LLLOLD = LLL NNNOLD = NNN IF ((NOROOM) .OR. (ERR)) GOTO 200 -C + C UPDATE EXISTING NODES AND THEIR LXN ARRAYS C - FIRST MAKE SURE THAT N5 TAKES N1'S BOUNDARY STATUS IF PWEDGE IS ON -C + IF ((PWEDGE) .AND. (LXN (2, N1) .LT. 0)) & LXN (2, N5) = - IABS (LXN (2, N5)) -C + C MAKE SURE THAT ALL THE LINES THAT WERE ATTACHED TO N1 C EXCLUDING L1, L3, (STILL HOOKED TO N1) L4 AND L6 (ALREADY C HOOKED TO N5) ARE NOW ATTACHED TO N5 AND HAVE N5 AS THE C CORRECT ENDPOINT -C + DO 140 I = 1, NL LL = L1LIST (I) IF ((LL .NE. L1) .AND. (LL .NE. L3) .AND. (LL .NE. L4) .AND. & (LL .NE. L6)) THEN -C + CALL DELLXN (MXND, LXN, NUID, NAVAIL, IAVAIL, N1, & LL, NNN, ERR, NOROOM) IF ((NOROOM) .OR. (ERR)) THEN @@ -200,14 +183,14 @@ SUBROUTINE WEDGE (MXND, MLN, NUID, LXK, KXL, NXL, LXN, XN, YN, & 'N1 **') GOTO 200 ENDIF -C + CALL ADDLXN (MXND, LXN, NUID, NAVAIL, IAVAIL, & N5, LL, NNN, ERR, NOROOM) IF ((NOROOM) .OR. (ERR)) THEN CALL MESAGE ('** PROBLEMS IN WEDGE HOOKING LL TO N5 **') GOTO 200 ENDIF -C + IF (NXL (1, LL) .EQ. N1) THEN NXL (1, LL) = N5 ELSEIF (NXL (2, LL) .EQ. N1) THEN @@ -218,12 +201,12 @@ SUBROUTINE WEDGE (MXND, MLN, NUID, LXK, KXL, NXL, LXN, XN, YN, ERR = .TRUE. GOTO 200 ENDIF -C + ENDIF 140 CONTINUE -C + C NOW ADD THE NEW ELEMENT -C + KKK = KKK + 1 IF (TWOLIN) THEN LXK (1, KKK) = L4 @@ -234,9 +217,9 @@ SUBROUTINE WEDGE (MXND, MLN, NUID, LXK, KXL, NXL, LXN, XN, YN, ENDIF LXK (3, KKK) = L6 LXK (4, KKK) = L5 -C + C NOW FIX THE KXL ARRAY FOR LINE L3 -C + IF (.NOT. TWOLIN) THEN IF (KXL (1, L3) .EQ. KL3) THEN KXL (1, L3) = KKK @@ -248,9 +231,9 @@ SUBROUTINE WEDGE (MXND, MLN, NUID, LXK, KXL, NXL, LXN, XN, YN, GOTO 200 ENDIF ENDIF -C + C ADD THE KXL ENTRIES FOR THE NEW LINES -C + IF (TWOLIN) THEN KXL (1, L4) = KL1 KXL (2, L4) = KKK @@ -261,9 +244,9 @@ SUBROUTINE WEDGE (MXND, MLN, NUID, LXK, KXL, NXL, LXN, XN, YN, ENDIF KXL (1, L5) = KKK KXL (1, L6) = KKK -C + C NOW FIX THE LXK ARRAY FOR THE ELEMENT KL1 IF TWOLIN -C + IF (TWOLIN) THEN DO 150 I = 1, 4 IF (LXK (I, KL1) .EQ. L2) THEN @@ -276,9 +259,9 @@ SUBROUTINE WEDGE (MXND, MLN, NUID, LXK, KXL, NXL, LXN, XN, YN, ERR = .TRUE. GOTO 200 160 CONTINUE -C + C OTHERWISE FIX THE LXK ARRAY FOR THE ELEMENT KL3 -C + ELSE DO 170 I = 1, 4 IF (LXK (I, KL3) .EQ. L3) THEN @@ -292,32 +275,32 @@ SUBROUTINE WEDGE (MXND, MLN, NUID, LXK, KXL, NXL, LXN, XN, YN, GOTO 200 180 CONTINUE ENDIF -C + C NOW FIX THE LNODES ARRAY -C + LNODES (1, N5) = 0 LNODES (1, N6) = 0 -C + LNODES (2, N6) = N1 LNODES (2, N5) = N6 LNODES (2, N2) = N5 -C + LNODES (3, N1) = N6 LNODES (3, N6) = N5 LNODES (3, N5) = N2 -C + LNODES (4, N5) = - 1 LNODES (4, N6) = - 1 -C + LNODES (5, N1) = L5 LNODES (5, N6) = L6 LNODES (5, N5) = L2 -C + LNODES (8, N5) = LNODES (8, N1) LNODES (8, N6) = LNODES (8, N1) -C + C PUT THE BEGINNING BOUNDARY DISTANCE IN PLACE -C + BNSIZE (1, N5) = BNSIZE (1, N1) BNSIZE (1, N6) = BNSIZE (1, N1) IF (BNSIZE (1, N1) .GT. 0.) THEN @@ -339,12 +322,12 @@ SUBROUTINE WEDGE (MXND, MLN, NUID, LXK, KXL, NXL, LXN, XN, YN, BNSIZE (2, N6) = BNSIZE (2, N1) BNSIZE (2, N1) = BNSIZE (2, N1) * 1.15 ENDIF -C + NLOOP = NLOOP + 2 ERR = .FALSE. -C + C NOW REDRAW THE LINES -C + IF ((GRAPH) .OR. (VIDEO)) THEN DO 190 I = 1, NL IF ((L1LIST (I) .NE. L1) .AND. (L1LIST (I) .NE. L3) .AND. @@ -366,9 +349,9 @@ SUBROUTINE WEDGE (MXND, MLN, NUID, LXK, KXL, NXL, LXN, XN, YN, ENDIF CALL SFLUSH ENDIF -C + 200 CONTINUE -C + RETURN -C + END diff --git a/packages/seacas/applications/fastq/wrabqs.f b/packages/seacas/applications/fastq/wrabqs.f index b871ee224755..b164ff7d1016 100644 --- a/packages/seacas/applications/fastq/wrabqs.f +++ b/packages/seacas/applications/fastq/wrabqs.f @@ -1,45 +1,20 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: wrabqs.f,v 1.3 2000/11/13 15:39:05 gdsjaar Exp $ -C $Log: wrabqs.f,v $ -C Revision 1.3 2000/11/13 15:39:05 gdsjaar -C Cleaned up unused variables and labels. -C -C Removed some real to int conversion warnings. -C -C Revision 1.2 1998/07/14 18:20:15 gdsjaar -C Removed unused variables, cleaned up a little. -C -C Changed BLUE labels to GREEN to help visibility on black background -C (indirectly requested by a couple users) -C -C Revision 1.1.1.1 1990/11/30 11:17:44 gdsjaar -C FASTQ Version 2.0X -C -c Revision 1.1 90/11/30 11:17:42 gdsjaar -c Initial revision -c -C -CC* FILE: [.MAIN]WRABQS.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE WRABQS (MS, MR, NPNODE, NPELEM, MXNFLG, MXSFLG, NPREGN, & NPNBC, NPSBC, IUNIT, NNN, KKK, NNXK, NODES, NELEMS, NNFLG, & NNPTR, NNLEN, NSFLG, NSPTR, NSLEN, NVPTR, NVLEN, NSIDEN, & MAPDXG, XN, YN, NXK, MAT, MAPGXD, MATMAP, NBCNOD, NNLIST, & NBCSID, NSLIST, NVLIST, NUMMAT, LINKM, TITLE, ERR, EIGHT, NINE) C*********************************************************************** -C + C SUBROUTINE WRABQS = WRITES ABAQUS DATABASE MESH OUTPUT FILE -C + C*********************************************************************** -C + DIMENSION XN (NPNODE), YN (NPNODE), NXK (NNXK, NPELEM) DIMENSION MAT (NPELEM) DIMENSION NODES (NPNBC), NELEMS (NPSBC), NSIDEN (NPSBC) @@ -48,32 +23,32 @@ SUBROUTINE WRABQS (MS, MR, NPNODE, NPELEM, MXNFLG, MXSFLG, NPREGN, DIMENSION NVLEN (MXSFLG), NVPTR (MXSFLG), LINKM (2, (MS+MR)) DIMENSION MAPDXG (NPNODE), MAPGXD (NPNODE), MATMAP (3, NPREGN) DIMENSION IHOLD (9) -C + CHARACTER*72 TITLE, DUMMY, DUMMY2 -C + LOGICAL ERR, EIGHT, NINE, DEFTYP, FOUND -C + ERR = .TRUE. -C + C WRITE OUT HEADER TITLE AND INFORMATION -C + WRITE (IUNIT, 10000, ERR = 200)TITLE WRITE (IUNIT, 10010, ERR = 200)NNN, KKK, NBCNOD, NBCSID -C + C WRITE OUT NODE BLOCK -C + WRITE (IUNIT, 10020, ERR = 200) Z = 0. DO 100 I = 1, NNN WRITE (IUNIT, 10030, ERR = 200)I, XN (I), YN (I), Z 100 CONTINUE -C + C QUERY THE USER FOR LOCAL CONTROL OF ELEMENT TYPE -C + CALL INQTRU ('USE DEFAULT ELEMENT TYPES FOR ELSETS', DEFTYP) -C + C WRITE OUT ELEMENT BLOCKS -C + DO 130 I = 1, NUMMAT CALL GETDUM (MATMAP (1, I), DUMMY, LEN) IF (NXK (3, MATMAP (2, I)) .EQ. 0) THEN @@ -148,9 +123,9 @@ SUBROUTINE WRABQS (MS, MR, NPNODE, NPELEM, MXNFLG, MXSFLG, NPREGN, 120 CONTINUE ENDIF 130 CONTINUE -C + C WRITE OUT THE NODAL BOUNDARY CONDITIONS -C + IF (NBCNOD.GT.0) THEN DO 140 I = 1, NBCNOD J1 = NNPTR (I) @@ -160,9 +135,9 @@ SUBROUTINE WRABQS (MS, MR, NPNODE, NPELEM, MXNFLG, MXSFLG, NPREGN, WRITE (IUNIT, 10110, ERR = 200) (NODES (J), J = J1, J2) 140 CONTINUE ENDIF -C + C WRITE OUT THE SIDE BOUNDARY FLAGS -C + IF (NBCSID.GT.0) THEN C CALL MESAGE ('ELEMENT NUMBERING IS WRITTEN WITH ELEMENT' // C & BOUNDARY FLAGS') @@ -180,9 +155,9 @@ SUBROUTINE WRABQS (MS, MR, NPNODE, NPELEM, MXNFLG, MXSFLG, NPREGN, J1 = NSPTR (I) J2 = NSPTR (I)+NSLEN (I)-1 CALL GETDUM (NSFLG (I), DUMMY, LEN) -C + C WRITE OUT THE SIDE 1 ELEMENTS -C + FOUND = .FALSE. JHOLD = 0 DO 150 J = J1, J2 @@ -212,13 +187,13 @@ SUBROUTINE WRABQS (MS, MR, NPNODE, NPELEM, MXNFLG, MXSFLG, NPREGN, C & (JJ2 .EQ. NXK (3, K)) ) .OR. C & ( (JJ2 .EQ. NXK (2, K)) .AND. C & (JJ1 .EQ. NXK (3, K)) ) ) ) ) THEN -C + IF (.NOT. FOUND) THEN WRITE (IUNIT, 10150, ERR = 200) & DUMMY (1:LEN) // '_1' FOUND = .TRUE. ENDIF -C + JHOLD = JHOLD + 1 IHOLD (JHOLD) = MAPGXD (K) IF (JHOLD .EQ. 9) THEN @@ -230,9 +205,9 @@ SUBROUTINE WRABQS (MS, MR, NPNODE, NPELEM, MXNFLG, MXSFLG, NPREGN, 150 CONTINUE IF (JHOLD .GT. 0) WRITE (IUNIT, 10110, ERR = 200) & (IHOLD (II), II = 1, JHOLD) -C + C WRITE OUT THE SIDE 2 ELEMENTS -C + FOUND = .FALSE. JHOLD = 0 DO 160 J = J1, J2 @@ -262,13 +237,13 @@ SUBROUTINE WRABQS (MS, MR, NPNODE, NPELEM, MXNFLG, MXSFLG, NPREGN, C & (JJ2 .EQ. NXK (5, K)) ) .OR. C & ( (JJ2 .EQ. NXK (4, K)) .AND. C & (JJ1 .EQ. NXK (5, K)) ) ) ) ) THEN -C + IF (.NOT. FOUND) THEN WRITE (IUNIT, 10150, ERR = 200) & DUMMY (1:LEN) // '_2' FOUND = .TRUE. ENDIF -C + JHOLD = JHOLD + 1 IHOLD (JHOLD) = MAPGXD (K) IF (JHOLD .EQ. 9) THEN @@ -280,9 +255,9 @@ SUBROUTINE WRABQS (MS, MR, NPNODE, NPELEM, MXNFLG, MXSFLG, NPREGN, 160 CONTINUE IF (JHOLD .GT. 0) WRITE (IUNIT, 10110, ERR = 200) & (IHOLD (II), II = 1, JHOLD) -C + C WRITE OUT THE SIDE 3 ELEMENTS -C + FOUND = .FALSE. JHOLD = 0 DO 170 J = J1, J2 @@ -312,13 +287,13 @@ SUBROUTINE WRABQS (MS, MR, NPNODE, NPELEM, MXNFLG, MXSFLG, NPREGN, C & (JJ2 .EQ. NXK (7, K)) ) .OR. C & ( (JJ2 .EQ. NXK (6, K)) .AND. C & (JJ1 .EQ. NXK (7, K)) ) ) ) ) THEN -C + IF (.NOT. FOUND) THEN WRITE (IUNIT, 10150, ERR = 200) & DUMMY (1:LEN) // '_3' FOUND = .TRUE. ENDIF -C + JHOLD = JHOLD + 1 IHOLD (JHOLD) = MAPGXD (K) IF (JHOLD .EQ. 9) THEN @@ -330,9 +305,9 @@ SUBROUTINE WRABQS (MS, MR, NPNODE, NPELEM, MXNFLG, MXSFLG, NPREGN, 170 CONTINUE IF (JHOLD .GT. 0) WRITE (IUNIT, 10110, ERR = 200) & (IHOLD (II), II = 1, JHOLD) -C + C WRITE OUT THE SIDE 4 ELEMENTS -C + FOUND = .FALSE. JHOLD = 0 DO 180 J = J1, J2 @@ -362,13 +337,13 @@ SUBROUTINE WRABQS (MS, MR, NPNODE, NPELEM, MXNFLG, MXSFLG, NPREGN, C & (JJ2 .EQ. NXK (1, K)) ) .OR. C & ( (JJ2 .EQ. NXK (8, K)) .AND. C & (JJ1 .EQ. NXK (1, K)) ) ) ) ) THEN -C + IF (.NOT. FOUND) THEN WRITE (IUNIT, 10150, ERR = 200) & DUMMY (1:LEN) // '_4' FOUND = .TRUE. ENDIF -C + JHOLD = JHOLD + 1 IHOLD (JHOLD) = MAPGXD (K) IF (JHOLD .EQ. 9) THEN @@ -380,21 +355,20 @@ SUBROUTINE WRABQS (MS, MR, NPNODE, NPELEM, MXNFLG, MXSFLG, NPREGN, 180 CONTINUE IF (JHOLD .GT. 0) WRITE (IUNIT, 10110, ERR = 200) & (IHOLD (II), II = 1, JHOLD) -C + 190 CONTINUE ENDIF CALL MESAGE ('ABAQUS OUTPUT FILE SUCCESSFULLY WRITTEN') ERR = .FALSE. RETURN -C + C ERR DURING WRITE PROBLEMS -C + 200 CONTINUE CALL MESAGE ('ERR DURING WRITE TO ABAQUS OUTPUT FILE') CALL MESAGE (' - NO FILE SAVED - ') RETURN -C -C + 10000 FORMAT ('*HEADING', /, A72) 10010 FORMAT ('**', /, & '** MESH GENERATED USING FASTQ ', /, @@ -416,5 +390,5 @@ SUBROUTINE WRABQS (MS, MR, NPNODE, NPELEM, MXNFLG, MXSFLG, NPREGN, 10120 FORMAT (4 (I10, ','), I10) 10130 FORMAT ('*NSET, NSET = NB', A) 10150 FORMAT ('*ELSET, ELSET = EB', A) -C + END diff --git a/packages/seacas/applications/fastq/wrex2.f b/packages/seacas/applications/fastq/wrex2.f index d8bd5d89ceaa..455886585daf 100644 --- a/packages/seacas/applications/fastq/wrex2.f +++ b/packages/seacas/applications/fastq/wrex2.f @@ -1,10 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: wrex2.f,v 1.5 2000/11/13 15:39:06 gdsjaar Exp $ C======================================================================= SUBROUTINE WREX2 (MS, MR, NPNODE, NPELEM, MXNFLG, MXSFLG, NPREGN, & NPNBC, NPSBC, IUNIT, NNN, KKK, NNXK, NODES, NELEMS, NNFLG, @@ -14,11 +13,11 @@ SUBROUTINE WREX2 (MS, MR, NPNODE, NPELEM, MXNFLG, MXSFLG, NPREGN, & ERR, EIGHT, NINE, VERSN, A, IA, FILENAME) C======================================================================= C************************************************************************ -C + C SUBROUTINE WREX2 = WRITES GENESIS DATABASE MESH OUTPUT -C + C*********************************************************************** -C + include 'exodusII.inc' DIMENSION XN (NPNODE), YN (NPNODE), NXK (NNXK, NPELEM) diff --git a/packages/seacas/applications/fastq/wrfsq.f b/packages/seacas/applications/fastq/wrfsq.f index e3feccc1692c..f40c08beb726 100644 --- a/packages/seacas/applications/fastq/wrfsq.f +++ b/packages/seacas/applications/fastq/wrfsq.f @@ -1,41 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: wrfsq.f,v 1.3 1999/06/21 22:43:41 gdsjaar Exp $ -C $Log: wrfsq.f,v $ -C Revision 1.3 1999/06/21 22:43:41 gdsjaar -C Fixed more uninitialized variables; one was causing core dump on g77 -C compiled executable. -C -C VERSN was not consistently defined -- now 10 characters everywhere -C -C Updated so full version string output -C -C Added capability to debug memory using unit specified in EXT99 -C variable. Similar to STRTUP in SUPLIB -C -C Cleaned up some other code -C -C Upped version -C -C Revision 1.2 1993/11/11 23:28:07 gdsjaar -C Fixed problem with writing out point bc cards following keying option -C -c Revision 1.1.1.1 1990/11/30 11:17:48 gdsjaar -c FASTQ Version 2.0X -c -c Revision 1.1 90/11/30 11:17:46 gdsjaar -c Initial revision -c -C -CC* FILE: [.MAIN]WRFSQ.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE WRFSQ (IUNIT, MP, ML, MS, MR, MSNAP, MSC, MCOM, ICOM, & JCOM, CIN, RIN, IIN, KIN, N, IPOINT, COOR, IPBOUN, ILINE, & LTYPE, NINT, FACTOR, LCON, ILBOUN, ISBOUN, ISIDE, NLPS, @@ -47,16 +15,16 @@ SUBROUTINE WRFSQ (IUNIT, MP, ML, MS, MR, MSNAP, MSC, MCOM, ICOM, & IHLIST, IRGFLG, ISCHM, SCHEME, NUMBER, DEFSCH, DEFSIZ, TITLE, & OPTIM, THREE, EIGHT, NINE, SNAP, SNAPDX, NSNAP, REGWRT, BARWRT) C*********************************************************************** -C + C SUBROUTINE WRFSQ = WRITES FASTQ CARD FILE -C + C*********************************************************************** -C + C SUBROUTINE CALLED BY: C FASTQ = A PROGRAM TO QUICKLY PREPARE FASTQ INPUT -C + C*********************************************************************** -C + DIMENSION IPOINT(MP), COOR(2, MP), IPBOUN(MP) DIMENSION ILINE(ML), LTYPE(ML), NINT(ML), FACTOR(ML), LCON(3, ML) DIMENSION ILBOUN(ML), ISBOUN(ML) @@ -76,27 +44,27 @@ SUBROUTINE WRFSQ (IUNIT, MP, ML, MS, MR, MSNAP, MSC, MCOM, ICOM, DIMENSION NUMBER(MSC), SNAPDX(2, MSNAP), NSNAP(2) DIMENSION KIN(MCOM), IIN(MCOM), RIN(MCOM) DIMENSION N(29), ID (13) -C + CHARACTER*72 SCHEME, DEFSCH, TITLE, DUMMY, CIN(MCOM) CHARACTER NUMBER*80, TYPE(7)*5 -C + LOGICAL IANS, OPTIM, THREE, EIGHT, NINE, ADDLNK, SNAP LOGICAL REGWRT, BARWRT, FLAG, GOWRIT, STAR -C + DATA TYPE/' STR', ' CORN', ' CIRC', ' CIRM', ' PARA', ' CIRR', & ' ELIP'/ -C + ADDLNK = .FALSE. GOWRIT = .FALSE. XADD = 0. YADD = 0. -C + C WRITE OUT ONLY THE REGIONS OF INTEREST IF THE REGWRT FLAG HAS BEEN SET -C + IF (REGWRT) THEN -C + C SEE IF A SHIFT OF THE REGION IS NEEDED -C + CALL INTRUP ('SHIFT REGION', IANS, MCOM, ICOM, JCOM, CIN, IIN, & RIN, KIN) IF (IANS) THEN @@ -135,18 +103,18 @@ SUBROUTINE WRFSQ (IUNIT, MP, ML, MS, MR, MSNAP, MSC, MCOM, ICOM, IF (IFOUND .GT. 0) THEN IF (I1 .GT. 0) THEN CALL CHECK (I1, I2, N (22)) -C + C FLAG ALL DATA ASSOCIATED WITH THE REGIONS -C + DO 150 I = I1, I2 CALL LTSORT (MR, LINKR, I, II, ADDLNK) IF (II.GT.0) THEN GOWRIT = .TRUE. IREGN (II) = -IABS (IREGN (II)) DO 140 J = IFSIDE (II), IFSIDE (II)+NSPR (II)-1 -C + C FLAG SIDE DATA -C + CALL LTSORT (MS, LINKS, ISLIST (J), JJ, ADDLNK) IF ((ISLIST (J) .GT. 0) .AND. (JJ .GT. 0)) THEN ISIDE (JJ) = -IABS (ISIDE (JJ)) @@ -168,9 +136,9 @@ SUBROUTINE WRFSQ (IUNIT, MP, ML, MS, MR, MSNAP, MSC, MCOM, ICOM, 110 CONTINUE ENDIF 120 CONTINUE -C + C FLAG LINE DATA -C + ELSE JJ = IABS (ISLIST (J)) CALL LTSORT (ML, LINKL, JJ, KK, ADDLNK) @@ -194,9 +162,9 @@ SUBROUTINE WRFSQ (IUNIT, MP, ML, MS, MR, MSNAP, MSC, MCOM, ICOM, GOTO 100 ENDIF ENDIF -C + C WRITE OUT THE BARSET DATA -C + ELSEIF (BARWRT) THEN FLAG = .FALSE. CALL FLAGD (MP, N (18), LINKP, IPOINT, FLAG) @@ -217,9 +185,9 @@ SUBROUTINE WRFSQ (IUNIT, MP, ML, MS, MR, MSNAP, MSC, MCOM, ICOM, IF (IFOUND .GT. 0) THEN IF (I1 .GT. 0) THEN CALL CHECK (I1, I2, N (21)) -C + C FLAG ALL LINES ASSOCIATED WITH THE BARSETS -C + DO 190 I = I1, I2 CALL LTSORT (MS, LINKB, I, II, ADDLNK) IF (II .GT. 0) THEN @@ -246,9 +214,9 @@ SUBROUTINE WRFSQ (IUNIT, MP, ML, MS, MR, MSNAP, MSC, MCOM, ICOM, GOTO 160 ENDIF ENDIF -C + C OTHERWISE FLAG ALL THE DATA TO BE WRITTEN -C + ELSE FLAG = .TRUE. CALL FLAGD (MP, N (18), LINKP, IPOINT, FLAG) @@ -258,19 +226,19 @@ SUBROUTINE WRFSQ (IUNIT, MP, ML, MS, MR, MSNAP, MSC, MCOM, ICOM, CALL FLAGD (MR, N (22), LINKR, IREGN, FLAG) GOWRIT = .TRUE. ENDIF -C + IF (.NOT. GOWRIT) THEN CALL MESAGE ('** NO DATA HAS BEEN WRITTEN **') GOTO 510 ENDIF -C + C WRITE OUT THE TITLE -C + CALL STRLNG (TITLE, LEN) WRITE (IUNIT, 10010) TITLE(1:LEN) C WRITE OUT THE POINTS IN ORDER -C + DO 200 I = 1, N(18) CALL LTSORT (MP, LINKP, I, J, ADDLNK) IF ((J .GT. 0) .AND. (IPOINT (J) .LT. 0)) THEN @@ -278,9 +246,9 @@ SUBROUTINE WRFSQ (IUNIT, MP, ML, MS, MR, MSNAP, MSC, MCOM, ICOM, & COOR(1, J) + XADD, COOR(2, J) + YADD END IF 200 CONTINUE -C + C WRITE OUT THE LINES IN ORDER -C + DO 210 I = 1, N(19) CALL LTSORT (ML, LINKL, I, J, ADDLNK) IF ((J .GT. 0) .AND. (ILINE (J) .LT. 0)) THEN @@ -288,9 +256,9 @@ SUBROUTINE WRFSQ (IUNIT, MP, ML, MS, MR, MSNAP, MSC, MCOM, ICOM, & LCON(1, J), LCON(2, J), LCON(3, J), NINT(J), FACTOR(J) END IF 210 CONTINUE -C + C WRITE OUT THE SIDES IN ORDER -C + DO 230 I = 1, N(20) CALL LTSORT (MS, LINKS, I, J, ADDLNK) IF ((J .GT. 0) .AND. (ISIDE (J) .LT. 0)) THEN @@ -321,9 +289,9 @@ SUBROUTINE WRFSQ (IUNIT, MP, ML, MS, MR, MSNAP, MSC, MCOM, ICOM, END IF END IF 230 CONTINUE -C + C WRITE OUT THE BAR SETS IN ORDER -C + DO 250 I = 1, N(21) CALL LTSORT (MS, LINKB, I, J, ADDLNK) IF ((J .GT. 0) .AND. (IBARST (J) .LT. 0)) THEN @@ -354,9 +322,9 @@ SUBROUTINE WRFSQ (IUNIT, MP, ML, MS, MR, MSNAP, MSC, MCOM, ICOM, END IF END IF 250 CONTINUE -C + C WRITE OUT THE REGIONS IN ORDER -C + DO 270 I = 1, N(22) CALL LTSORT (MR, LINKR, I, J, ADDLNK) IF ((J .GT. 0) .AND. (IRGFLG(J) .LE. -1) .AND. @@ -386,18 +354,18 @@ SUBROUTINE WRFSQ (IUNIT, MP, ML, MS, MR, MSNAP, MSC, MCOM, ICOM, WRITE (IUNIT, 10070) (ISLIST(K), K = N1, N2) END IF END IF -C + C WRITE OUT THE REGION INTERVAL SIZE DATA -C + IF (RSIZE(J) .GT. 0.) & WRITE (IUNIT, 10080) 'SIZE ', RSIZE(J), & IABS (IREGN(J)) END IF 270 CONTINUE IF (DEFSIZ .GT. 0.) WRITE (IUNIT, 10080) 'SIZE ', DEFSIZ -C + C WRITE OUT THE HOLES IN ORDER -C + DO 290 I = 1, N(22) CALL LTSORT (MR, LINKR, I, J, ADDLNK) IF ((NHPR(J) .GT. 0) .AND. (IREGN (J) .LT. 0)) THEN @@ -428,9 +396,9 @@ SUBROUTINE WRFSQ (IUNIT, MP, ML, MS, MR, MSNAP, MSC, MCOM, ICOM, END IF END IF 290 CONTINUE -C + C WRITE OUT THE GROUPS IN ORDER -C + DO 310 I = 1, N(22) CALL LTSORT (MR, LINKR, I, J, ADDLNK) IF ((J .GT. 0) .AND. (IRGFLG(J) .GE. 1)) THEN @@ -461,9 +429,9 @@ SUBROUTINE WRFSQ (IUNIT, MP, ML, MS, MR, MSNAP, MSC, MCOM, ICOM, END IF END IF 310 CONTINUE -C + C WRITE OUT THE SCHEMES IN ORDER -C + DO 320 I = 1, N(24) CALL LTSORT (MR, LINKSC, I, J, ADDLNK) IF (J .GT. 0) THEN @@ -478,9 +446,9 @@ SUBROUTINE WRFSQ (IUNIT, MP, ML, MS, MR, MSNAP, MSC, MCOM, ICOM, CALL STRLNG (DEFSCH, LEN) IZERO = 0 WRITE (IUNIT, 10110) IZERO, DEFSCH(1:LEN) -C + C WRITE OUT THE BODY LIST -C + N2 = 0 KMAX = 11 330 CONTINUE @@ -523,9 +491,9 @@ SUBROUTINE WRFSQ (IUNIT, MP, ML, MS, MR, MSNAP, MSC, MCOM, ICOM, WRITE (IUNIT, 10000) END IF END IF -C + C WRITE OUT THE POINT BOUNDARY FLAGS IN ORDER -C + DO 390 I = 1, N(25) CALL LTSORT (MP, LINKPB, I, J, ADDLNK) IF (J .GT. 0) THEN @@ -538,7 +506,7 @@ SUBROUTINE WRFSQ (IUNIT, MP, ML, MS, MR, MSNAP, MSC, MCOM, ICOM, ELSE KMAX = 11 END IF -C + KOUNT = 0 DO 370 K = N1, IFPB(J) + NPPF(J) - 1 CALL LTSORT (MP, LINKP, LISTPB (1, K), JJ, ADDLNK) @@ -550,7 +518,7 @@ SUBROUTINE WRFSQ (IUNIT, MP, ML, MS, MR, MSNAP, MSC, MCOM, ICOM, IF (KOUNT .EQ. KMAX) GOTO 380 370 CONTINUE 380 CONTINUE -C + IF (N2 .LT. IFPB(J) + NPPF(J) - 1) THEN STAR = .TRUE. IF (N1 .EQ. IFPB(J)) THEN @@ -576,9 +544,9 @@ SUBROUTINE WRFSQ (IUNIT, MP, ML, MS, MR, MSNAP, MSC, MCOM, ICOM, END IF END IF 390 CONTINUE -C + C WRITE OUT THE LINE BOUNDARY FLAGS IN ORDER -C + DO 430 I = 1, N(26) CALL LTSORT (ML, LINKLB, I, J, ADDLNK) IF (J .GT. 0) THEN @@ -591,7 +559,7 @@ SUBROUTINE WRFSQ (IUNIT, MP, ML, MS, MR, MSNAP, MSC, MCOM, ICOM, ELSE KMAX = 11 END IF -C + KOUNT = 0 DO 410 K = N1, IFLB(J) + NLPF(J) - 1 CALL LTSORT (ML, LINKL, LISTLB (1, K), JJ, ADDLNK) @@ -603,7 +571,7 @@ SUBROUTINE WRFSQ (IUNIT, MP, ML, MS, MR, MSNAP, MSC, MCOM, ICOM, IF (KOUNT .EQ. KMAX) GOTO 420 410 CONTINUE 420 CONTINUE -C + IF (N2 .LT. IFLB(J) + NLPF(J) - 1) THEN STAR = .TRUE. IF (N1 .EQ. IFLB(J)) THEN @@ -634,9 +602,9 @@ SUBROUTINE WRFSQ (IUNIT, MP, ML, MS, MR, MSNAP, MSC, MCOM, ICOM, END IF END IF 430 CONTINUE -C + C WRITE OUT THE SIDE BOUNDARY FLAGS IN ORDER -C + DO 470 I = 1, N(27) CALL LTSORT (ML, LINKSB, I, J, ADDLNK) IF (J .GT. 0) THEN @@ -649,7 +617,7 @@ SUBROUTINE WRFSQ (IUNIT, MP, ML, MS, MR, MSNAP, MSC, MCOM, ICOM, ELSE KMAX = 11 END IF -C + KOUNT = 0 DO 450 K = N1, IFSB(J) + NSPF(J) - 1 CALL LTSORT (ML, LINKL, LISTSB (1, K), JJ, ADDLNK) @@ -661,7 +629,7 @@ SUBROUTINE WRFSQ (IUNIT, MP, ML, MS, MR, MSNAP, MSC, MCOM, ICOM, IF (KOUNT .EQ. KMAX) GOTO 460 450 CONTINUE 460 CONTINUE -C + IF (N2 .LT. IFSB(J) + NSPF(J) - 1) THEN STAR = .TRUE. IF (N1 .EQ. IFSB(J)) THEN @@ -692,9 +660,9 @@ SUBROUTINE WRFSQ (IUNIT, MP, ML, MS, MR, MSNAP, MSC, MCOM, ICOM, END IF END IF 470 CONTINUE -C + C WRITE OUT THE RENUMBERING CARDS -C + IF (OPTIM) THEN IF (N(28) .GT. 0) THEN DO 480 I = 1, N(28) @@ -706,9 +674,9 @@ SUBROUTINE WRFSQ (IUNIT, MP, ML, MS, MR, MSNAP, MSC, MCOM, ICOM, WRITE (IUNIT, 10130) END IF END IF -C + C WRITE OUT THREE NODE, EIGHT NODE, OR NINE NODE FLAG -C + IF (THREE) THEN WRITE (IUNIT, 10140) ENDIF @@ -717,18 +685,18 @@ SUBROUTINE WRFSQ (IUNIT, MP, ML, MS, MR, MSNAP, MSC, MCOM, ICOM, ELSE IF (NINE) THEN WRITE (IUNIT, 10160) END IF -C + C WRITE DIGITIZER SNAP-TO-GRID FLAG -C + IF ((NSNAP(1) .GT. 0) .OR. (NSNAP(2) .GT. 0)) THEN IF (SNAP) THEN WRITE (IUNIT, 10180) ELSE WRITE (IUNIT, 10190) END IF -C + C WRITE X-GRID LINES -C + IF (NSNAP(1) .GT. 0) THEN N2 = 0 490 CONTINUE @@ -751,9 +719,9 @@ SUBROUTINE WRFSQ (IUNIT, MP, ML, MS, MR, MSNAP, MSC, MCOM, ICOM, WRITE (IUNIT, 10230) (SNAPDX(1, K), K = N1, N2) END IF END IF -C + C WRITE Y-GRID LINES -C + IF (NSNAP(2) .GT. 0) THEN N2 = 0 500 CONTINUE @@ -779,11 +747,11 @@ SUBROUTINE WRFSQ (IUNIT, MP, ML, MS, MR, MSNAP, MSC, MCOM, ICOM, END IF END IF END IF -C + C WRITE EXIT -C + WRITE (IUNIT, 10170) -C + CALL MESAGE ('FASTQ DATA FILE SUCCESSFULLY WRITTEN') 510 CONTINUE FLAG=.FALSE. @@ -793,7 +761,7 @@ SUBROUTINE WRFSQ (IUNIT, MP, ML, MS, MR, MSNAP, MSC, MCOM, ICOM, CALL FLAGD (MS, N(21), LINKB, IBARST, FLAG) CALL FLAGD (MR, N(22), LINKR, IREGN, FLAG) RETURN -C + 10000 FORMAT (' ') 10010 FORMAT (' TITLE ', /, ' ', A) 10020 FORMAT (' POINT ', I5, 2(5X, 1PE14.7)) @@ -818,5 +786,5 @@ SUBROUTINE WRFSQ (IUNIT, MP, ML, MS, MR, MSNAP, MSC, MCOM, ICOM, 10210 FORMAT (7X, 5(1X, 1PE13.6), ' *') 10220 FORMAT (A7, 5(1X, 1PE13.6)) 10230 FORMAT (7X, 5(1X, 1PE13.6)) -C + END diff --git a/packages/seacas/applications/fastq/wrgens.f b/packages/seacas/applications/fastq/wrgens.f index 9f682855a6b6..fa74187234be 100644 --- a/packages/seacas/applications/fastq/wrgens.f +++ b/packages/seacas/applications/fastq/wrgens.f @@ -1,50 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: wrgens.f,v 1.9 1998/03/23 05:17:54 gdsjaar Exp $ -C $Log: wrgens.f,v $ -C Revision 1.9 1998/03/23 05:17:54 gdsjaar -C Fixed data statement ordering -C -C Revision 1.8 1997/09/02 18:51:45 caforsy -C Increase initial value of NIN in rdfsq.f and IGUESS in wrgens.f -C -C Revision 1.7 1992/11/17 15:06:39 gdsjaar -C Fixed problem with version number output. -C -c Revision 1.6 1992/11/16 23:32:47 gdsjaar -c Fixed problem with outputting too many attributes for some elements, -c upped version number to 2.2X -c -c Revision 1.5 1992/06/09 22:31:18 gdsjaar -c Fixed problem with sideset node and element numbering for 8 and 9 node elements -c -c Revision 1.4 1992/04/15 22:56:38 gdsjaar -c Fixed EXODUS output of 3-node beams--connectivity -c conforms to EXODUS document -c Upped version number to 2.1X to reflect change -c -c Revision 1.3 1991/12/18 21:12:03 gdsjaar -c Removed the info field -c -c Revision 1.2 1990/11/30 11:30:08 gdsjaar -c Rewrote indexing for reads and writes -c -c Revision 1.1.1.1 90/11/30 11:17:52 gdsjaar -c FASTQ Version 2.0X -c -c Revision 1.1 90/11/30 11:17:51 gdsjaar -c Initial revision -c -C -CC* FILE: [.MAIN]WRGENS.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE WRGENS (MS, MR, NPNODE, NPELEM, MXNFLG, MXSFLG, NPREGN, & NPNBC, NPSBC, IUNIT, NNN, KKK, NNXK, NODES, NELEMS, NNFLG, & NNPTR, NNLEN, NSFLG, NSPTR, NSLEN, NVPTR, NVLEN, NSIDEN, @@ -52,18 +11,18 @@ SUBROUTINE WRGENS (MS, MR, NPNODE, NPELEM, MXNFLG, MXSFLG, NPREGN, & NBCNOD, NNLIST, NBCSID, NSLIST, NVLIST, NUMMAT, LINKM, TITLE, & ERR, EIGHT, NINE, VERSN) C************************************************************************ -C + C SUBROUTINE WRGENS = WRITES GENESIS DATABASE MESH OUTPUT -C + C*********************************************************************** -C + PARAMETER (IGUESS = 1000) -C + C IGUESS IS THE NUMBER OF ELEMENT BLOCKS, FOR USE WITH THE ENAME C VARIABLE. IF THIS VARIABLE IS NOT AS LARGE AS NUMMAT, IT WILL NOT C RESULT IN A FATAL ERROR, BUT SIMPLY A WARNING, AND NO ELEMENT C NAMES WILL BE WRITTEN. -C + DIMENSION XN (NPNODE), YN (NPNODE), NXK (NNXK, NPELEM) DIMENSION MAT (NPELEM) DIMENSION NODES (NPNBC), NELEMS (NPSBC), NSIDEN (NPSBC) @@ -73,14 +32,14 @@ SUBROUTINE WRGENS (MS, MR, NPNODE, NPELEM, MXNFLG, MXSFLG, NPREGN, DIMENSION NSPTR (MXSFLG), WTSIDE (NPSBC) DIMENSION NVLEN (MXSFLG), NVPTR (MXSFLG), LINKM (2, (MS+MR)) DIMENSION MAPDXG (NPNODE), MAPGXD (NPNODE), MATMAP (3, NPREGN) -C + CHARACTER*72 TITLE, HOLD*80 CHARACTER*8 DATE, TIME, VERSN1, VERSN2, XNAME, YNAME CHARACTER*8 ENAME (IGUESS) CHARACTER*10 VERSN -C + LOGICAL ERR, EIGHT, NINE -C + integer lcon(9) integer lbar(3) @@ -97,17 +56,17 @@ SUBROUTINE WRGENS (MS, MR, NPNODE, NPELEM, MXNFLG, MXSFLG, NPREGN, HOLD = TITLE XNAME = 'X' YNAME = 'Y' -C + C CHECK TO MAKE SURE THAT THERE IS ENOUGH ROOM FOR ELEMENT NAMES -C + IF (NUMMAT.GT.IGUESS) THEN CALL MESAGE ('WARNING: THE NUMBER OF ELEMENT BLOCKS EXCEEDS') CALL MESAGE (' THE CAPACITY TO NAME EACH BLOCK.') CALL MESAGE (' NO ELEMENT NAMES WILL BE WRITTEN.') ENDIF -C + C WRITE OUT HEADER INFORMATION -C + WRITE (IUNIT, ERR = 110)HOLD IJK = 2 IVERS = 1 @@ -131,15 +90,15 @@ SUBROUTINE WRGENS (MS, MR, NPNODE, NPELEM, MXNFLG, MXSFLG, NPREGN, WRITE (IUNIT, ERR = 110)NNN, IJK, KKK, NUMMAT, NBCNOD, NNLIST, & NBCSID, NSLST, NVLST, IVERS -C + C WRITE OUT NODE BLOCK -C + WRITE (IUNIT, ERR = 110) (XN (I), I = 1, NNN), & (YN (I), I = 1, NNN) WRITE (IUNIT, ERR = 110) (MAPDXG (I), I = 1, KKK) -C + C WRITE OUT ELEMENT BLOCKS -C + DO 100 I = 1, NUMMAT IF (NXK (3, MATMAP (2, I)) .EQ. 0) THEN INODE = 2 @@ -167,11 +126,11 @@ SUBROUTINE WRGENS (MS, MR, NPNODE, NPELEM, MXNFLG, MXSFLG, NPREGN, NATTR = 0 IF (I.LE.IGUESS)ENAME (I) = 'QUAD' ENDIF -C + C NLOOP IS NEEDED TO WRITE SOMETHING OUT THE CURRENT COUNTER IS ZERO. C THIS IS DONE TO SOLVE A CRAY OPERATING SYSTEM [CTSS] PROBLEM C WHERE NULL RECORD WRITES ARE NOT DONE APPROPRIATELY -C + WRITE (IUNIT, ERR = 110) MATMAP (1, I), & MATMAP (3, I) - MATMAP (2, I)+1, INODE, NATTR C... 8 or 9 node quads @@ -190,9 +149,9 @@ SUBROUTINE WRGENS (MS, MR, NPNODE, NPELEM, MXNFLG, MXSFLG, NPREGN, NLOOP = MAX0 (1, NATTR*KKK) WRITE (IUNIT, ERR = 110) (ATTR, J = 1, NLOOP) 100 CONTINUE -C + C WRITE OUT NODAL BOUNDARY FLAGS -C + NLOOP = MAX0 (1, NBCNOD) WRITE (IUNIT, ERR = 110) (NNFLG (I), I = 1, NLOOP) WRITE (IUNIT, ERR = 110) (NNLEN (I), I = 1, NLOOP) @@ -200,9 +159,8 @@ SUBROUTINE WRGENS (MS, MR, NPNODE, NPELEM, MXNFLG, MXSFLG, NPREGN, NLOOP = MAX0 (1, NNLIST) WRITE (IUNIT, ERR = 110) (NODES (I), I = 1, NLOOP) WRITE (IUNIT, ERR = 110) (WTNODE (I), I = 1, NLOOP) -C + C WRITE OUT SIDE BOUNDARY FLAGS -C C ... Fix up side set nodes and elements for 8 and 9 node elements. C ... At this point, they are treated as two linear segments, @@ -254,37 +212,37 @@ SUBROUTINE WRGENS (MS, MR, NPNODE, NPELEM, MXNFLG, MXSFLG, NPREGN, NLOOP = MAX0 (1, NVLIST) WRITE (IUNIT, ERR = 110) (NSIDEN (I), I = 1, NLOOP) WRITE (IUNIT, ERR = 110) (WTSIDE (I), I = 1, NLOOP) -C + C WRITE OUT THE QA INFORMATION -C + IHOLD = 1 WRITE (IUNIT, ERR = 110)IHOLD WRITE (IUNIT, ERR = 110)VERSN1, VERSN2, DATE, TIME -C + C WRITE THE HEADER INFORMATION -C + IHOLD = 0 WRITE (IUNIT, ERR = 110)IHOLD -C + C WRITE THE COORDINATE NAMES AND ELEMENT NAMES -C + WRITE (IUNIT)XNAME, YNAME IF (NUMMAT.LE.IGUESS)WRITE (IUNIT) (ENAME (I), I = 1, NUMMAT) -C + C SUCCESSFUL WRITE COMPLETED -C + CALL MESAGE (' ') CALL MESAGE (' ') CALL MESAGE ('GENESIS OUTPUT FILE SUCCESSFULLY WRITTEN') CALL MESAGE (' ') ERR = .FALSE. RETURN -C + C ERR DURING WRITE PROBLEMS -C + 110 CONTINUE CALL MESAGE ('ERR DURING WRITE TO OUTPUT FILE') CALL MESAGE (' - NO FILE SAVED -') RETURN -C + END diff --git a/packages/seacas/applications/fastq/wrjerr.f b/packages/seacas/applications/fastq/wrjerr.f index de29c34549d6..2b5827b789c7 100644 --- a/packages/seacas/applications/fastq/wrjerr.f +++ b/packages/seacas/applications/fastq/wrjerr.f @@ -1,43 +1,20 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: wrjerr.f,v 1.3 1998/07/14 18:20:17 gdsjaar Exp $ -C $Log: wrjerr.f,v $ -C Revision 1.3 1998/07/14 18:20:17 gdsjaar -C Removed unused variables, cleaned up a little. -C -C Changed BLUE labels to GREEN to help visibility on black background -C (indirectly requested by a couple users) -C -C Revision 1.2 1991/04/10 19:57:37 gdsjaar -C Problem with internal read, kludged -C -c Revision 1.1.1.1 1990/11/30 11:17:55 gdsjaar -c FASTQ Version 2.0X -c -c Revision 1.1 90/11/30 11:17:54 gdsjaar -c Initial revision -c -C -CC* FILE: [.MAIN]WRJERR.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE WRJERR (MS, MR, NPNODE, NPELEM, MXNFLG, MXSFLG, NPREGN, & NPNBC, NPSBC, IUNIT, NNN, KKK, NNXK, NODES, NELEMS, NNFLG, & NNPTR, NNLEN, NSFLG, NSPTR, NSLEN, NVPTR, NVLEN, NSIDEN, & MAPDXG, XN, YN, NXK, MAT, MAPGXD, MATMAP, NBCNOD, NNLIST, & NBCSID, NSLIST, NVLIST, NUMMAT, LINKM, TITLE, ERR, EIGHT, NINE) C*********************************************************************** -C + C SUBROUTINE WRJERR = WRITES JOE'S ERROR DATABASE MESH OUTPUT FILE -C + C*********************************************************************** -C + DIMENSION XN (NPNODE), YN (NPNODE), NXK (NNXK, NPELEM) DIMENSION MAT (NPELEM) DIMENSION NODES (NPNBC), NELEMS (NPSBC), NSIDEN (NPSBC) @@ -46,29 +23,29 @@ SUBROUTINE WRJERR (MS, MR, NPNODE, NPELEM, MXNFLG, MXSFLG, NPREGN, DIMENSION NVLEN (MXSFLG), NVPTR (MXSFLG), LINKM (2, (MS+MR)) DIMENSION MAPDXG (NPNODE), MAPGXD (NPNODE), MATMAP (3, NPREGN) DIMENSION IHOLD (9) -C + CHARACTER*72 TITLE, DUMMY -C + LOGICAL ERR, EIGHT, NINE, FOUND -C + ERR = .TRUE. -C + C WRITE OUT HEADER TITLE AND INFORMATION -C + CALL INQSTR ('TITLE: ',TITLE) WRITE (IUNIT, 10000, ERR = 290)TITLE WRITE (IUNIT, 10010, ERR = 290) -C + C WRITE OUT NODE BLOCK -C + WRITE (IUNIT, 10020, ERR = 290) Z = 0. DO 100 I = 1, NNN WRITE (IUNIT, 10030, ERR = 290)I, XN (I), YN (I), Z 100 CONTINUE -C + C WRITE OUT ELEMENT BLOCKS -C + DO 130 I = 1, NUMMAT CALL GETDUM (MATMAP (1, I), DUMMY, LEN) WRITE (IUNIT, 10040, ERR = 290) @@ -99,9 +76,9 @@ SUBROUTINE WRJERR (MS, MR, NPNODE, NPELEM, MXNFLG, MXSFLG, NPREGN, 120 CONTINUE ENDIF 130 CONTINUE -C + C WRITE OUT THE NODAL BOUNDARY CONDITIONS -C + IF (NBCNOD.GT.0) THEN WRITE (IUNIT, 10070) DO 150 I = 1, NBCNOD @@ -116,9 +93,9 @@ SUBROUTINE WRJERR (MS, MR, NPNODE, NPELEM, MXNFLG, MXSFLG, NPREGN, 140 CONTINUE 150 CONTINUE ENDIF -C + C WRITE OUT THE SIDE BOUNDARY FLAGS -C + WRITE (IUNIT, 10120, ERR = 290) IF (NBCSID.GT.0) THEN WRITE (IUNIT, 10130, ERR = 290) @@ -141,9 +118,9 @@ SUBROUTINE WRJERR (MS, MR, NPNODE, NPELEM, MXNFLG, MXSFLG, NPREGN, WRITE (*, 10090) NSFLG(I) CALL INQSTR ('PRESSURE MAGNITUDE: ',TITLE) READ (TITLE, '(F10.0)') PMAG -C + C WRITE OUT THE SIDE 1 ELEMENTS -C + FOUND = .FALSE. JHOLD = 0 DO 170 J = J1, J2 @@ -173,11 +150,11 @@ SUBROUTINE WRJERR (MS, MR, NPNODE, NPELEM, MXNFLG, MXSFLG, NPREGN, C & (JJ2 .EQ. NXK (3, K)) ) .OR. C & ( (JJ2 .EQ. NXK (2, K)) .AND. C & (JJ1 .EQ. NXK (3, K)) ) ) ) ) THEN -C + IF (.NOT. FOUND) THEN FOUND = .TRUE. ENDIF -C + JHOLD = JHOLD + 1 IHOLD (JHOLD) = MAPGXD (K) IF (JHOLD .EQ. 9) THEN @@ -194,9 +171,9 @@ SUBROUTINE WRJERR (MS, MR, NPNODE, NPELEM, MXNFLG, MXSFLG, NPREGN, WRITE (IUNIT, 10110, ERR = 290) IHOLD(II), 1, PMAG 180 CONTINUE ENDIF -C + C WRITE OUT THE SIDE 2 ELEMENTS -C + FOUND = .FALSE. JHOLD = 0 DO 200 J = J1, J2 @@ -226,11 +203,11 @@ SUBROUTINE WRJERR (MS, MR, NPNODE, NPELEM, MXNFLG, MXSFLG, NPREGN, C & (JJ2 .EQ. NXK (5, K)) ) .OR. C & ( (JJ2 .EQ. NXK (4, K)) .AND. C & (JJ1 .EQ. NXK (5, K)) ) ) ) ) THEN -C + IF (.NOT. FOUND) THEN FOUND = .TRUE. ENDIF -C + JHOLD = JHOLD + 1 IHOLD (JHOLD) = MAPGXD (K) IF (JHOLD .EQ. 9) THEN @@ -247,9 +224,9 @@ SUBROUTINE WRJERR (MS, MR, NPNODE, NPELEM, MXNFLG, MXSFLG, NPREGN, WRITE (IUNIT, 10110, ERR = 290) IHOLD(II), 2, PMAG 210 CONTINUE ENDIF -C + C WRITE OUT THE SIDE 3 ELEMENTS -C + FOUND = .FALSE. JHOLD = 0 DO 230 J = J1, J2 @@ -279,11 +256,11 @@ SUBROUTINE WRJERR (MS, MR, NPNODE, NPELEM, MXNFLG, MXSFLG, NPREGN, C & (JJ2 .EQ. NXK (7, K)) ) .OR. C & ( (JJ2 .EQ. NXK (6, K)) .AND. C & (JJ1 .EQ. NXK (7, K)) ) ) ) ) THEN -C + IF (.NOT. FOUND) THEN FOUND = .TRUE. ENDIF -C + JHOLD = JHOLD + 1 IHOLD (JHOLD) = MAPGXD (K) IF (JHOLD .EQ. 9) THEN @@ -300,9 +277,9 @@ SUBROUTINE WRJERR (MS, MR, NPNODE, NPELEM, MXNFLG, MXSFLG, NPREGN, WRITE (IUNIT, 10110, ERR = 290) IHOLD(II), 3, PMAG 240 CONTINUE ENDIF -C + C WRITE OUT THE SIDE 4 ELEMENTS -C + FOUND = .FALSE. JHOLD = 0 DO 260 J = J1, J2 @@ -332,11 +309,11 @@ SUBROUTINE WRJERR (MS, MR, NPNODE, NPELEM, MXNFLG, MXSFLG, NPREGN, C & (JJ2 .EQ. NXK (1, K)) ) .OR. C & ( (JJ2 .EQ. NXK (8, K)) .AND. C & (JJ1 .EQ. NXK (1, K)) ) ) ) ) THEN -C + IF (.NOT. FOUND) THEN FOUND = .TRUE. ENDIF -C + JHOLD = JHOLD + 1 IHOLD (JHOLD) = MAPGXD (K) IF (JHOLD .EQ. 9) THEN @@ -353,22 +330,21 @@ SUBROUTINE WRJERR (MS, MR, NPNODE, NPELEM, MXNFLG, MXSFLG, NPREGN, WRITE (IUNIT, 10110, ERR = 290) IHOLD(II), 4, PMAG 270 CONTINUE ENDIF -C + 280 CONTINUE ENDIF WRITE (IUNIT, 10140, ERR = 290) CALL MESAGE ('JOE''S ERROR OUTPUT FILE SUCCESSFULLY WRITTEN') ERR = .FALSE. RETURN -C + C ERR DURING WRITE PROBLEMS -C + 290 CONTINUE CALL MESAGE ('ERR DURING WRITE TO ABAQUS OUTPUT FILE') CALL MESAGE (' - NO FILE SAVED - ') RETURN -C -C + 10000 FORMAT (A72) 10010 FORMAT ('*PROSTRFAC 0.0',/, & '*PSTRESS',/, @@ -392,5 +368,5 @@ SUBROUTINE WRJERR (MS, MR, NPNODE, NPELEM, MXNFLG, MXSFLG, NPREGN, & '*MAXIT 2', /, 'PRINT 50') 10130 FORMAT ('*PTOL 1.E-2') 10140 FORMAT ('*END') -C + END diff --git a/packages/seacas/applications/fastq/wrnast.f b/packages/seacas/applications/fastq/wrnast.f index 9454cf98973e..c4cbb2ba1bff 100644 --- a/packages/seacas/applications/fastq/wrnast.f +++ b/packages/seacas/applications/fastq/wrnast.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: wrnast.f,v 1.1 1990/11/30 11:17:57 gdsjaar Exp $ -C $Log: wrnast.f,v $ -C Revision 1.1 1990/11/30 11:17:57 gdsjaar -C Initial revision -C -C -CC* FILE: [.MAIN]WRNAST.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE WRNAST (MS, MR, NPNODE, NPELEM, MXNFLG, MXSFLG, NPREGN, & NPNBC, NPSBC, IUNIT, NNN, KKK, NNXK, NODES, NELEMS, NNFLG, & NNPTR, NNLEN, NSFLG, NSPTR, NSLEN, NVPTR, NVLEN, NSIDEN, @@ -22,31 +11,31 @@ SUBROUTINE WRNAST (MS, MR, NPNODE, NPELEM, MXNFLG, MXSFLG, NPREGN, & NBCSID, NSLIST, NVLIST, NUMMAT, LINKM, TITLE, ERR, EIGHT, & NINE, LONG) C************************************************************************ -C + C SUBROUTINE WRNAST = WRITES NASTRAN DATABASE MESH OUTPUT FILE -C + C*********************************************************************** -C + DIMENSION XN(NPNODE), YN(NPNODE), NXK(NNXK, NPELEM), MAT(NPELEM) DIMENSION NODES(NPNBC), NELEMS(NPSBC), NSIDEN(NPSBC) DIMENSION NNFLG(MXNFLG), NNLEN(MXNFLG), NNPTR(MXNFLG) DIMENSION NSFLG(MXSFLG), NSLEN(MXSFLG), NSPTR(MXSFLG) DIMENSION NVLEN(MXSFLG), NVPTR(MXSFLG), LINKM(2, (MS+MR)) DIMENSION MAPDXG(NPNODE), MAPGXD(NPNODE), MATMAP(3, NPREGN) -C + CHARACTER*72 TITLE, DUMMY, DUMMY2 -C + LOGICAL ERR, EIGHT, NINE, DEFTYP, LONG -C + ERR = .TRUE. -C + C WRITE OUT HEADER TITLE AND INFORMATION -C + WRITE(IUNIT, 10000, ERR = 180)TITLE WRITE(IUNIT, 10010, ERR = 180)NNN, KKK, NBCNOD -C + C WRITE OUT NODE BLOCK -C + WRITE(IUNIT, 10020, ERR = 180) Z = 0. DO 100 I = 1, NNN @@ -58,14 +47,14 @@ SUBROUTINE WRNAST (MS, MR, NPNODE, NPELEM, MXNFLG, MXSFLG, NPREGN, WRITE(IUNIT, 10040, ERR = 180)I, XN(I), YN(I), Z ENDIF 100 CONTINUE -C + C QUERY THE USER FOR LOCAL CONTROL OF ELEMENT TYPE -C + CALL INQTRU('USE DEFAULT ELEMENT TYPES FOR ELEMENT BLOCKS', & DEFTYP) -C + C WRITE OUT ELEMENT BLOCKS -C + DO 150 I = 1, NUMMAT CALL GETDUM(MATMAP(1, I), DUMMY, LEN) IF(NXK(3, MATMAP(2, I)).EQ.0)THEN @@ -144,9 +133,9 @@ SUBROUTINE WRNAST (MS, MR, NPNODE, NPELEM, MXNFLG, MXSFLG, NPREGN, 140 CONTINUE ENDIF 150 CONTINUE -C + C WRITE OUT THE NODAL BOUNDARY CONDITIONS -C + IF(NBCNOD.GT.0)THEN DO 170 I = 1, NBCNOD J1 = NNPTR(I) @@ -162,28 +151,27 @@ SUBROUTINE WRNAST (MS, MR, NPNODE, NPELEM, MXNFLG, MXSFLG, NPREGN, 160 CONTINUE 170 CONTINUE ENDIF -C + C NOTIFY USER THAT SIDE BOUNDARY FLAGS ARE NOT SUPPORTED -C + IF (NBCSID .GT. 0) THEN CALL MESAGE('NO SIDE BOUNDARY FLAGS SUPPORTED BY NASTRAN') ENDIF -C + C END THE DATA -C + WRITE(IUNIT, 10150) CALL MESAGE ('NASTRAN OUTPUT FILE SUCCESSFULLY WRITTEN') ERR = .FALSE. RETURN -C + C ERR DURING WRITE PROBLEMS -C + 180 CONTINUE CALL MESAGE ('ERR DURING WRITE TO ABAQUS OUTPUT FILE') CALL MESAGE (' - NO FILE SAVED - ') RETURN -C -C + 10000 FORMAT('$TITLE: ', /, A72) 10010 FORMAT('$', /, & '$ MESH GENERATED USING FASTQ ', /, @@ -207,5 +195,5 @@ SUBROUTINE WRNAST (MS, MR, NPNODE, NPELEM, MXNFLG, MXSFLG, NPREGN, 10130 FORMAT(' INPUT THE CONSTRAINTS FOR NODAL BOUNDARY FLAG: ', I5) 10140 FORMAT('SPC ', 2I8, A8) 10150 FORMAT('ENDDATA') -C + END diff --git a/packages/seacas/applications/fastq/zhole.f b/packages/seacas/applications/fastq/zhole.f index 08bb06878d8a..8b769d4b72cf 100644 --- a/packages/seacas/applications/fastq/zhole.f +++ b/packages/seacas/applications/fastq/zhole.f @@ -1,40 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: zhole.f,v 1.3 2000/11/13 15:39:06 gdsjaar Exp $ -C $Log: zhole.f,v $ -C Revision 1.3 2000/11/13 15:39:06 gdsjaar -C Cleaned up unused variables and labels. -C -C Removed some real to int conversion warnings. -C -C Revision 1.2 1998/07/14 18:20:19 gdsjaar -C Removed unused variables, cleaned up a little. -C -C Changed BLUE labels to GREEN to help visibility on black background -C (indirectly requested by a couple users) -C -C Revision 1.1.1.1 1990/11/30 11:18:02 gdsjaar -C FASTQ Version 2.0X -C -c Revision 1.1 90/11/30 11:18:00 gdsjaar -c Initial revision -c -C -CC* FILE: [.QMESH]ZHOLE.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/31/90 -CC* MODIFICATION: ADDED ARGUMENTS TO CALL TO ZHOLE TO PASS MINIMUM -CC** ELEMENT SIZE (SIZMIN) AND GETSIZ PARAMETERS OF -CC** EMIN AND EMAX -C SUBROUTINE ZHOLE (MP, ML, MS, MR, NS, MAXNL, MAXNP, MAXPRM, NPRM, & MAXNBC, MAXSBC, KNBC, KSBC, KNUM, IPOINT, COOR, IPBOUN, ILINE, & LTYPE, NINT, FACTOR, LCON, ILBOUN, ISBOUN, ISIDE, NLPS, IFLINE, @@ -47,11 +16,11 @@ SUBROUTINE ZHOLE (MP, ML, MS, MR, NS, MAXNL, MAXNP, MAXPRM, NPRM, & MLINK, NPROLD, NPNOLD, NPEOLD, NNXK, REMESH, REXMIN, REXMAX, & REYMIN, REYMAX, IDIVIS, SIZMIN, EMAX, EMIN) C*********************************************************************** -C + C SUBROUTINE ZHOLE = REMESHES AROUND HOLE IN REGION -C + C*********************************************************************** -C + DIMENSION IPOINT(MP), COOR(2, MP), IPBOUN(MP) DIMENSION ILINE(ML), NINT(ML), LTYPE(ML), FACTOR(ML), LCON(3, ML) DIMENSION ILBOUN(ML), ISBOUN(ML) @@ -67,31 +36,31 @@ SUBROUTINE ZHOLE (MP, ML, MS, MR, NS, MAXNL, MAXNP, MAXPRM, NPRM, DIMENSION KXL(2, 3*MXND), NXL(2, 3*MXND), LXN(4, MXND) DIMENSION NXH(MXND) DIMENSION KLIST1(20), LINES(20), NODES(4) -C + DIMENSION AMESUR(NPEOLD), XNOLD(NPNOLD), YNOLD(NPNOLD) DIMENSION NXKOLD(NNXK, NPEOLD), MMPOLD(3, NPROLD) DIMENSION LINKEG(2, MLINK), LISTEG(4 * NPEOLD), BMESUR(NPNOLD) -C + LOGICAL ADDLNK, CCW, DELETE, ERR, EVEN, LREAL, NOROOM, COUNT LOGICAL LPNTIN, REMESH, LCIRCL, LDEL -C + C CHECK FOR INPUT ERRORS -C + ERR = .FALSE. IF (NNN - NNNOLD .LE. 0) THEN CALL MESAGE ('NO NODES DEFINED IN REGION') ERR = .TRUE. -C + C GOOD INPUT -C + ELSE LNUM = ABS(ISLIST(INDXH)) ADDLNK = .FALSE. CALL LTSORT (ML, LINKL, LNUM, LIN, ADDLNK) LCIRCL = NS .EQ. 1 .AND. LTYPE(LIN) .EQ. 3 -C + C CIRCULAR HOLE -C + IF (LCIRCL) THEN CALL LTSORT (MP, LINKP, LCON(1, LIN), I1, ADDLNK) CALL LTSORT (MP, LINKP, LCON(2, LIN), I2, ADDLNK) @@ -114,7 +83,7 @@ SUBROUTINE ZHOLE (MP, ML, MS, MR, NS, MAXNL, MAXNP, MAXPRM, NPRM, YMIN = YCEN - SQRT(RADIUS) YMAX = YCEN + SQRT(RADIUS) NPERV = NINT(LIN) -C + C NON-CIRCULAR HOLE ELSE NLP1 = NL + 1 @@ -122,12 +91,7 @@ SUBROUTINE ZHOLE (MP, ML, MS, MR, NS, MAXNL, MAXNP, MAXPRM, NPRM, COUNT = .FALSE. EVEN = .FALSE. LREAL = .FALSE. -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/31/90 -CC* MODIFICATION: ADDED ARGUMENTS TO CALL TO PERIM TO PASS MINIMUM -CC** ELEMENT SIZE (SIZMIN) AND GETSIZ PARAMETERS OF -CC** EMIN AND EMAX -C + CALL PERIM (MP, ML, MS, NS, MAXNL, MAXNP, MAXNBC, MAXSBC, & KNBC, KSBC, KNUM, IPOINT, COOR, IPBOUN, ILINE, LTYPE, & NINT, FACTOR, LCON, ILBOUN, ISBOUN, ISIDE, NLPS, IFLINE, @@ -162,15 +126,15 @@ SUBROUTINE ZHOLE (MP, ML, MS, MR, NS, MAXNL, MAXNP, MAXPRM, NPRM, RADIUS = MIN(RADIUS, R) 110 CONTINUE END IF -C + C INITIALIZE NODES PER (ON) HOLE -C + DO 120 I = 1, NNN NXH(I) = 0 120 CONTINUE -C + C DELETE EVERYTHING ATTACHED TO NODES WITHIN HOLE -C + NEAR = 0 SMALL = 0.0 DO 130 I = NNNOLD + 1, NNN @@ -191,9 +155,9 @@ SUBROUTINE ZHOLE (MP, ML, MS, MR, NS, MAXNL, MAXNP, MAXPRM, NPRM, CALL DELHOL (I, MXND, LXK, KXL, NXL, LXN, NXH, & NUID, NNN, IAVAIL, NAVAIL, NOROOM, ERR) IF (NOROOM .OR. ERR) GO TO 380 -C + C CANNOT DELETE BOUNDARY NODES -C + ELSE CALL MESAGE ('HOLE CROSSES FIXED BOUNDARY') ERR = .TRUE. @@ -202,9 +166,9 @@ SUBROUTINE ZHOLE (MP, ML, MS, MR, NS, MAXNL, MAXNP, MAXPRM, NPRM, END IF END IF 130 CONTINUE -C + C PROCESS SMALL CIRCLES (I.E. SMALLER THAN AN ELEMENT) -C + IF (SMALL .GT. RADIUS) THEN CCW = .TRUE. CALL GKXN (MXND, KXL, LXN, NEAR, KS1, KLIST1, ERR) @@ -227,7 +191,7 @@ SUBROUTINE ZHOLE (MP, ML, MS, MR, NS, MAXNL, MAXNP, MAXPRM, NPRM, ERR = .TRUE. GO TO 380 160 CONTINUE -C + DO 170 I = 1, 4 IF (NUID(NODES(I)) .EQ. 0) THEN CALL DELHOL (NODES(I), MXND, LXK, KXL, NXL, LXN, NXH, @@ -236,9 +200,9 @@ SUBROUTINE ZHOLE (MP, ML, MS, MR, NS, MAXNL, MAXNP, MAXPRM, NPRM, END IF 170 CONTINUE END IF -C + C SQUARE UP BOUNDARY (DELETE INTERIOR NODES WITH ONLY TWO LINES) -C + 180 CONTINUE DELETE = .FALSE. DO 190 I = NNNOLD + 1, NNN @@ -253,9 +217,9 @@ SUBROUTINE ZHOLE (MP, ML, MS, MR, NS, MAXNL, MAXNP, MAXPRM, NPRM, END IF 190 CONTINUE IF (DELETE) GO TO 180 -C + C GENERATE DELETED ELEMENT BOUNDARY NODE LIST -C + NH = 0 DO 200 I = NNNOLD + 1, NNN IF (NXH(I) .GT. 0) THEN @@ -263,15 +227,15 @@ SUBROUTINE ZHOLE (MP, ML, MS, MR, NS, MAXNL, MAXNP, MAXPRM, NPRM, NXH(NH) = I END IF 200 CONTINUE -C + C ENSURE THAT THERE ARE A MINIMUM OF MIN(12, NPERV) INTERVALS C AROUND HOLE -C + IF (NH .LT. MAX(12, NPERV)) THEN DO 210 I = NH + 1, MXND NXH(I) = 0 210 CONTINUE -C + DO 220 I = 1, NH IF (NUID(NXH(I)) .EQ. 0) THEN CALL DELHOL (NXH(I), MXND - NH, LXK, KXL, NXL, LXN, @@ -284,7 +248,7 @@ SUBROUTINE ZHOLE (MP, ML, MS, MR, NS, MAXNL, MAXNP, MAXPRM, NPRM, NXH(I1) = 1 END IF 220 CONTINUE -C + IF (DELETE) THEN I1 = 0 DO 230 I = NH + 1, MXND @@ -300,9 +264,9 @@ SUBROUTINE ZHOLE (MP, ML, MS, MR, NS, MAXNL, MAXNP, MAXPRM, NPRM, GO TO 380 END IF END IF -C + C ORDER THE INTERIOR NODE LIST -C + DO 260 I = 1, NH - 1 CALL GETLXN (MXND, LXN, NXH(I), LINES, NUML, ERR) DO 250 J = 1, NUML @@ -316,9 +280,9 @@ SUBROUTINE ZHOLE (MP, ML, MS, MR, NS, MAXNL, MAXNP, MAXPRM, NPRM, 240 CONTINUE 250 CONTINUE 260 CONTINUE -C + C MAKE SURE LOOP CLOSES -C + CALL GETLXN (MXND, LXN, NXH(NH), LINES, NUML, ERR) DO 270 J = 1, NUML J1 = NXL(2, LINES(J)) + NXL(1, LINES(J)) - NXH(NH) @@ -330,9 +294,9 @@ SUBROUTINE ZHOLE (MP, ML, MS, MR, NS, MAXNL, MAXNP, MAXPRM, NPRM, ERR = .TRUE. GO TO 380 280 CONTINUE -C + C MAKE SURE HOLE PERIMETER IS DEFINED COUNTER-CLOCKWISE -C + PI = ACOS(-1.0) TWOPI = PI + PI SPIRO = 0.0 @@ -360,7 +324,7 @@ SUBROUTINE ZHOLE (MP, ML, MS, MR, NS, MAXNL, MAXNP, MAXPRM, NPRM, SPIRO = SPIRO + DIFF AGOLD = AGNEW 290 CONTINUE -C + IF (SPIRO .LT .0.0) THEN DO 300 I = 1, NH/2 ITEMP = NXH(I) @@ -374,16 +338,16 @@ SUBROUTINE ZHOLE (MP, ML, MS, MR, NS, MAXNL, MAXNP, MAXPRM, NPRM, ERR = .TRUE. GO TO 380 ENDIF -C + C FIND THE BEST STARTING POINT ON THE CIRCULAR HOLE -C + IF (NNN + NH .GT. MXND) THEN NOROOM = .TRUE. GO TO 380 END IF -C + C GENERATE THE PERIMETER OF THE HOLE -C + EVEN = .TRUE. CCW = .TRUE. LREAL = .TRUE. @@ -458,15 +422,15 @@ SUBROUTINE ZHOLE (MP, ML, MS, MR, NS, MAXNL, MAXNP, MAXPRM, NPRM, ERR = .TRUE. GO TO 380 END IF -C + C TACK THE HOLE LINE LIST ONTO THE BOUNDARY LINE LIST -C + IF (NPERIM(NPRM) .NE. NH) THEN CALL MESAGE ('INTERVAL MISMATCH ON HOLE PERIMETER') ERR = .TRUE. GO TO 380 END IF -C + ISTART = 0 DIST = 0.0 DO 340 I = 1, NH @@ -478,13 +442,13 @@ SUBROUTINE ZHOLE (MP, ML, MS, MR, NS, MAXNL, MAXNP, MAXPRM, NPRM, I2 = NXH(I1) SUM = SUM + (XN(I2) - X(J))**2 + (YN(I2) - Y(J))**2 330 CONTINUE -C + IF (SUM .LT. DIST .OR. ISTART .EQ. 0) THEN DIST = SUM ISTART = I END IF 340 CONTINUE -C + NNNX = NNN DO 350 J = 1, NH NNN = NNN + 1 @@ -492,15 +456,15 @@ SUBROUTINE ZHOLE (MP, ML, MS, MR, NS, MAXNL, MAXNP, MAXPRM, NPRM, YN(NNN) = Y(J) NUID(NNN) = NID(J, NPRM) 350 CONTINUE -C + C FIRST ROW OF ELEMENTS -C + CALL INNERH (MXND, NXH, NUID, LXK, KXL, NXL, LXN, KKK, LLL, & NNN, NNNX, NH, ISTART, IAVAIL, NAVAIL, NOROOM, ERR) IF (NOROOM .OR. ERR) GO TO 380 -C + C INSERT INNER NECKLACE OF ELEMENTS -C + ISTART = 1 DO 370 J = 1, INSIDE NNNX = NNN @@ -518,7 +482,7 @@ SUBROUTINE ZHOLE (MP, ML, MS, MR, NS, MAXNL, MAXNP, MAXPRM, NPRM, IF (NOROOM .OR. ERR) GO TO 380 370 CONTINUE END IF -C + 380 CONTINUE RETURN END diff --git a/packages/seacas/applications/fastq/zoomlt.f b/packages/seacas/applications/fastq/zoomlt.f index b8ab04cd3e26..45e815e85d8b 100644 --- a/packages/seacas/applications/fastq/zoomlt.f +++ b/packages/seacas/applications/fastq/zoomlt.f @@ -1,58 +1,33 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: zoomlt.f,v 1.3 2007/07/24 13:10:18 gdsjaar Exp $ -C $Log: zoomlt.f,v $ -C Revision 1.3 2007/07/24 13:10:18 gdsjaar -C Fix problem with boundary condition memory overwrite. -C -C Remove old ls5 and r25 terminal tests -C -C Revision 1.2 1998/07/14 18:20:20 gdsjaar -C Removed unused variables, cleaned up a little. -C -C Changed BLUE labels to GREEN to help visibility on black background -C (indirectly requested by a couple users) -C -C Revision 1.1.1.1 1990/11/30 11:18:05 gdsjaar -C FASTQ Version 2.0X -C -c Revision 1.1 90/11/30 11:18:04 gdsjaar -c Initial revision -c -C -CC* FILE: [.MAIN]ZOOMLT.FOR -CC* MODIFIED BY: TED BLACKER -CC* MODIFICATION DATE: 7/6/90 -CC* MODIFICATION: COMPLETED HEADER INFORMATION -C SUBROUTINE ZOOMLT (MCOM, ICOM, JCOM, CIN, RIN, IIN, KIN, IDUMP, & DRAWN, ALPHA, DEV1, X1, X2, Y1, Y2, XX1, XX2, YY1, YY2, XMIN1, & XMAX1, YMIN1, YMAX1, XMIN, XMAX, YMIN, YMAX) C*********************************************************************** -C + C ZOOMPL = SUBROUTINE TO INPUT NEW ZOOM LIMITS -C + C*********************************************************************** -C + DIMENSION KIN(MCOM), IIN(MCOM), RIN(MCOM) -C + CHARACTER*72 CIN(MCOM) CHARACTER*3 DEV1, ANS -C + LOGICAL DRAWN, ALPHA -C + IF ((ICOM .LE. JCOM) .AND. (DRAWN) .AND. & ((CIN(ICOM)(1:1) .EQ. 'C') .OR. & (CIN(ICOM)(1:1) .EQ. 'c')) .AND. & (.NOT.ALPHA)) THEN CIN(ICOM) = 'PLOT' -C + C USE CURSOR INPUT FROM THE SCREEN -C + CALL MESAGE (' ') CALL MESAGE (' ') CALL MESAGE ('LOCATE ONE CORNER WITH CURSOR') @@ -85,9 +60,9 @@ SUBROUTINE ZOOMLT (MCOM, ICOM, JCOM, CIN, RIN, IIN, KIN, IDUMP, XMAX = ABS ( (X2 * (XX2 - XX1))) + XX1 YMIN = ABS ( ((Y1 / .75) * (YY2 - YY1)) ) + YY1 YMAX = ABS ( ((Y2 / .75) * (YY2 - YY1)) ) + YY1 -C + C USE USER INPUT FROM THE KEYPAD -C + ELSE IF ((CIN(ICOM)(1:1) .EQ. 'C') .OR. & (CIN(ICOM)(1:1) .EQ. 'c')) THEN @@ -97,9 +72,9 @@ SUBROUTINE ZOOMLT (MCOM, ICOM, JCOM, CIN, RIN, IIN, KIN, IDUMP, CALL MESAGE ('CURRENT PLOT LIMITS UNCHANGED') CALL MESAGE ('* IN OTHER WORDS ... PLOT FIRST (P) '// & 'AND THEN ZOOM (Z,C) *') -C + C SEE IF ANY OF THE VALUES ARE REDEFINED -C + ELSE IF ( (ICOM .LE. JCOM) .AND. & ( (KIN(ICOM) .GT. 0) .OR. (KIN(ICOM+1) .GT. 0) .OR. & (KIN(ICOM+2) .GT. 0) .OR. (KIN(ICOM+3) .GT. 0) ) ) THEN @@ -126,7 +101,7 @@ SUBROUTINE ZOOMLT (MCOM, ICOM, JCOM, CIN, RIN, IIN, KIN, IDUMP, CALL MESAGE ('ZOOM LIMITS RESET TO PLOT EXTREMES') END IF END IF -C + RETURN -C + END diff --git a/packages/seacas/applications/gen3d/g3_arcxyz.f b/packages/seacas/applications/gen3d/g3_arcxyz.f index ac979b6cf3aa..d541579014eb 100644 --- a/packages/seacas/applications/gen3d/g3_arcxyz.f +++ b/packages/seacas/applications/gen3d/g3_arcxyz.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/gen3d/g3_arcyxz.f b/packages/seacas/applications/gen3d/g3_arcyxz.f index 0d3b714068af..496c060b1a5a 100644 --- a/packages/seacas/applications/gen3d/g3_arcyxz.f +++ b/packages/seacas/applications/gen3d/g3_arcyxz.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/gen3d/g3_cenpar.blk b/packages/seacas/applications/gen3d/g3_cenpar.blk index 33cfeedca770..d184771e70d8 100644 --- a/packages/seacas/applications/gen3d/g3_cenpar.blk +++ b/packages/seacas/applications/gen3d/g3_cenpar.blk @@ -1,6 +1,6 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /CENPAR/ IX1, IX2, IX3, IX4 diff --git a/packages/seacas/applications/gen3d/g3_cmdlist.blk b/packages/seacas/applications/gen3d/g3_cmdlist.blk index c3f4e958daaa..15906acb24a0 100644 --- a/packages/seacas/applications/gen3d/g3_cmdlist.blk +++ b/packages/seacas/applications/gen3d/g3_cmdlist.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details 'AXISYMMETRIC', diff --git a/packages/seacas/applications/gen3d/g3_cmdsho.blk b/packages/seacas/applications/gen3d/g3_cmdsho.blk index f9abc74f5f2a..f473160399f8 100644 --- a/packages/seacas/applications/gen3d/g3_cmdsho.blk +++ b/packages/seacas/applications/gen3d/g3_cmdsho.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /CMDSHO/ CPOINT LOGICAL CPOINT diff --git a/packages/seacas/applications/gen3d/g3_comand.f b/packages/seacas/applications/gen3d/g3_comand.f index d933a69e6206..f7e3022af1ef 100644 --- a/packages/seacas/applications/gen3d/g3_comand.f +++ b/packages/seacas/applications/gen3d/g3_comand.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/gen3d/g3_dbase.blk b/packages/seacas/applications/gen3d/g3_dbase.blk index 0748d2b10597..410d1a863aec 100644 --- a/packages/seacas/applications/gen3d/g3_dbase.blk +++ b/packages/seacas/applications/gen3d/g3_dbase.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /DBASE/ NDBIN, NDBOUT, NDSPL diff --git a/packages/seacas/applications/gen3d/g3_dbmir1.f b/packages/seacas/applications/gen3d/g3_dbmir1.f index 452036d5b417..890460960f81 100644 --- a/packages/seacas/applications/gen3d/g3_dbmir1.f +++ b/packages/seacas/applications/gen3d/g3_dbmir1.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/gen3d/g3_dbmirr.f b/packages/seacas/applications/gen3d/g3_dbmirr.f index 317a9c04c8f3..3036c44ad3cc 100644 --- a/packages/seacas/applications/gen3d/g3_dbmirr.f +++ b/packages/seacas/applications/gen3d/g3_dbmirr.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/gen3d/g3_dbnum3.blk b/packages/seacas/applications/gen3d/g3_dbnum3.blk index 2d1a3e468aea..364198d90e07 100644 --- a/packages/seacas/applications/gen3d/g3_dbnum3.blk +++ b/packages/seacas/applications/gen3d/g3_dbnum3.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /DBNUM3/ NUMNP3, NDIM3, NUMEL3, NELBL3, diff --git a/packages/seacas/applications/gen3d/g3_dbnums.blk b/packages/seacas/applications/gen3d/g3_dbnums.blk index 5fa02b9bf84b..691762fb42c5 100644 --- a/packages/seacas/applications/gen3d/g3_dbnums.blk +++ b/packages/seacas/applications/gen3d/g3_dbnums.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /DBNUMS/ NDIM, NUMNP, NUMEL, NELBLK, diff --git a/packages/seacas/applications/gen3d/g3_dboqa.f b/packages/seacas/applications/gen3d/g3_dboqa.f index dad04fc82112..dc813d7380fd 100644 --- a/packages/seacas/applications/gen3d/g3_dboqa.f +++ b/packages/seacas/applications/gen3d/g3_dboqa.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/gen3d/g3_dbpini.f b/packages/seacas/applications/gen3d/g3_dbpini.f index f1cd863bbf76..87479df33a41 100644 --- a/packages/seacas/applications/gen3d/g3_dbpini.f +++ b/packages/seacas/applications/gen3d/g3_dbpini.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/gen3d/g3_dbtitl.blk b/packages/seacas/applications/gen3d/g3_dbtitl.blk index be502408bb30..81a62b3819e4 100644 --- a/packages/seacas/applications/gen3d/g3_dbtitl.blk +++ b/packages/seacas/applications/gen3d/g3_dbtitl.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /DBTITL/ TITLE diff --git a/packages/seacas/applications/gen3d/g3_exparc.f b/packages/seacas/applications/gen3d/g3_exparc.f index 25f307ac0ca1..e9d0d26b5389 100644 --- a/packages/seacas/applications/gen3d/g3_exparc.f +++ b/packages/seacas/applications/gen3d/g3_exparc.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/gen3d/g3_felcen.f b/packages/seacas/applications/gen3d/g3_felcen.f index 5c7a08177e0c..9da8937f8ab8 100644 --- a/packages/seacas/applications/gen3d/g3_felcen.f +++ b/packages/seacas/applications/gen3d/g3_felcen.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/gen3d/g3_fnpcen.f b/packages/seacas/applications/gen3d/g3_fnpcen.f index b5ece20875e3..c186cb013723 100644 --- a/packages/seacas/applications/gen3d/g3_fnpcen.f +++ b/packages/seacas/applications/gen3d/g3_fnpcen.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/gen3d/g3_getint.f b/packages/seacas/applications/gen3d/g3_getint.f index 5b45d702dcda..4f33ec3d9995 100644 --- a/packages/seacas/applications/gen3d/g3_getint.f +++ b/packages/seacas/applications/gen3d/g3_getint.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= @@ -37,7 +37,7 @@ SUBROUTINE GETINT (TYPE, IFLD, INTYP, IFIELD, RFIELD, REAL RFIELD(*), D3TRAN(*), ZGRAD(*), DIM3 INTEGER NBLK, NRTRAN(*), NEREPL, NNREPL LOGICAL FFEXST -C + PRMPTA = 'Expected number of ' // TYPE // 's' LA = LENSTR(PRMPTA) PRMPTB = 'total ' // TYPE diff --git a/packages/seacas/applications/gen3d/g3_getpro.f b/packages/seacas/applications/gen3d/g3_getpro.f index 983c9272e91c..aba247ff5a76 100644 --- a/packages/seacas/applications/gen3d/g3_getpro.f +++ b/packages/seacas/applications/gen3d/g3_getpro.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details SUBROUTINE GETPRO (NEREPL, NNREPL, *) @@ -78,13 +78,13 @@ SUBROUTINE GETPRO (NEREPL, NNREPL, *) * 'Zero length vector entered') GO TO 10 ELSE -C + C ... NOTE: Since mesh is translated in -Z direction, Z normal to plane C must be negative. If not, then reverse total vector C (This was done wrong originally, therefore to not screw C up people who figured out a correct orientation, we allow C the bug to continue if they enter DOOLDWAY. -C + DOOLD = .FALSE. IF (FFEXST (IFLD, INTYP)) THEN CALL FFCHAR (IFLD, INTYP, CFIELD, ' ', WORD) @@ -105,7 +105,7 @@ SUBROUTINE GETPRO (NEREPL, NNREPL, *) XXB = XXB / RMAG XXC = XXC / RMAG END IF -C + END IF ISXWRP = ISFLAT diff --git a/packages/seacas/applications/gen3d/g3_getspl.f b/packages/seacas/applications/gen3d/g3_getspl.f index cfe6ad430b1d..4e4202fcd8be 100644 --- a/packages/seacas/applications/gen3d/g3_getspl.f +++ b/packages/seacas/applications/gen3d/g3_getspl.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details SUBROUTINE GETSPL(A) diff --git a/packages/seacas/applications/gen3d/g3_getspt.f b/packages/seacas/applications/gen3d/g3_getspt.f index f970c1287764..52b077df4de3 100644 --- a/packages/seacas/applications/gen3d/g3_getspt.f +++ b/packages/seacas/applications/gen3d/g3_getspt.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details SUBROUTINE GETSPT(A) diff --git a/packages/seacas/applications/gen3d/g3_idblnk.f b/packages/seacas/applications/gen3d/g3_idblnk.f index 11c307b484d4..01fb7d34a701 100644 --- a/packages/seacas/applications/gen3d/g3_idblnk.f +++ b/packages/seacas/applications/gen3d/g3_idblnk.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/gen3d/g3_inigrd.f b/packages/seacas/applications/gen3d/g3_inigrd.f index 053c76ac3b1e..f9900ab993d9 100644 --- a/packages/seacas/applications/gen3d/g3_inigrd.f +++ b/packages/seacas/applications/gen3d/g3_inigrd.f @@ -1,27 +1,17 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE INIGRD (FROM, TO, GRAD, NINT, NPTS, ARRAY) C======================================================================= -C $Log: inigrd.f,v $ -C Revision 1.2 1991/02/07 10:35:19 gdsjaar -C Removed Debug Comment lines from files -C -c Revision 1.1.1.1 90/08/20 12:21:56 gdsjaar -c Gen3D Mesh Generation Program -c -c Revision 1.1 90/08/20 12:21:55 gdsjaar -c Initial revision -c C INIGRD: Initialize array ARRAY with NPTS values. C values are calculated to have a gradient of GRAD C ranging from FROM to TO with NINT segments. -C + C --- FROM - IN - Minimum value of range C --- TO - IN - Maximum value of range C --- GRAD - IN - Gradient @@ -30,10 +20,10 @@ SUBROUTINE INIGRD (FROM, TO, GRAD, NINT, NPTS, ARRAY) C do not need full range, but want gradient spacing C based on full range. Normally NPTS = NINT + 1 C --- ARRAY- OUT- Range of values -C + REAL ARRAY(NPTS) LOGICAL NOGRAD -C + IF (FROM .EQ. TO .OR. NINT .LE. 0) THEN CALL PRTERR ('PROGRAM', * 'invalid values passed to INIGRD') @@ -41,7 +31,7 @@ SUBROUTINE INIGRD (FROM, TO, GRAD, NINT, NPTS, ARRAY) END IF NOGRAD = (ABS(GRAD - 1.0)/NINT .LE. 1.0e-7) -C + IF (NOGRAD) THEN D3 = 1.0 / NINT DO 10 I=1, NPTS @@ -58,6 +48,6 @@ SUBROUTINE INIGRD (FROM, TO, GRAD, NINT, NPTS, ARRAY) DO 30 I=1, NPTS ARRAY(I) = FROM + ARRAY(I) * (TO - FROM) 30 CONTINUE -C + RETURN END diff --git a/packages/seacas/applications/gen3d/g3_ixlink.f b/packages/seacas/applications/gen3d/g3_ixlink.f index 7810a9a6b352..5c7fbb156e86 100644 --- a/packages/seacas/applications/gen3d/g3_ixlink.f +++ b/packages/seacas/applications/gen3d/g3_ixlink.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/gen3d/g3_makcol.f b/packages/seacas/applications/gen3d/g3_makcol.f index 41efb9f7c27d..c3e0794de7ea 100644 --- a/packages/seacas/applications/gen3d/g3_makcol.f +++ b/packages/seacas/applications/gen3d/g3_makcol.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/gen3d/g3_makrow.f b/packages/seacas/applications/gen3d/g3_makrow.f index 734caddbd155..16cebdb02b03 100644 --- a/packages/seacas/applications/gen3d/g3_makrow.f +++ b/packages/seacas/applications/gen3d/g3_makrow.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/gen3d/g3_mirss.f b/packages/seacas/applications/gen3d/g3_mirss.f index bf296077595b..c8010418f488 100644 --- a/packages/seacas/applications/gen3d/g3_mirss.f +++ b/packages/seacas/applications/gen3d/g3_mirss.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/gen3d/g3_mrkcen.f b/packages/seacas/applications/gen3d/g3_mrkcen.f index 5a51c5afe4e6..beab0b53b083 100644 --- a/packages/seacas/applications/gen3d/g3_mrkcen.f +++ b/packages/seacas/applications/gen3d/g3_mrkcen.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/gen3d/g3_newel1.f b/packages/seacas/applications/gen3d/g3_newel1.f index 2c6b44659c84..9c555f33849e 100644 --- a/packages/seacas/applications/gen3d/g3_newel1.f +++ b/packages/seacas/applications/gen3d/g3_newel1.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/gen3d/g3_newess.f b/packages/seacas/applications/gen3d/g3_newess.f index 1aef5af86c7b..5d85d7dd99c0 100644 --- a/packages/seacas/applications/gen3d/g3_newess.f +++ b/packages/seacas/applications/gen3d/g3_newess.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/gen3d/g3_newid.f b/packages/seacas/applications/gen3d/g3_newid.f index 4a02ac53e1db..5b96272b8dcb 100644 --- a/packages/seacas/applications/gen3d/g3_newid.f +++ b/packages/seacas/applications/gen3d/g3_newid.f @@ -1,11 +1,11 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details SUBROUTINE NEWID (TYPE, IDLST, NUMID, IDNEW, IDOLD) -C + CHARACTER*(*) TYPE DIMENSION IDLST(*) CHARACTER*80 STRING diff --git a/packages/seacas/applications/gen3d/g3_newini.f b/packages/seacas/applications/gen3d/g3_newini.f index 385071cfd395..1db34048d2e4 100644 --- a/packages/seacas/applications/gen3d/g3_newini.f +++ b/packages/seacas/applications/gen3d/g3_newini.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/gen3d/g3_newmap.f b/packages/seacas/applications/gen3d/g3_newmap.f index 054619937242..d63ad7517557 100644 --- a/packages/seacas/applications/gen3d/g3_newmap.f +++ b/packages/seacas/applications/gen3d/g3_newmap.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/gen3d/g3_newnps.f b/packages/seacas/applications/gen3d/g3_newnps.f index 52fe93a16105..d8f4a9964d1a 100644 --- a/packages/seacas/applications/gen3d/g3_newnps.f +++ b/packages/seacas/applications/gen3d/g3_newnps.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/gen3d/g3_newxyz.f b/packages/seacas/applications/gen3d/g3_newxyz.f index 89e702910715..51435745795b 100644 --- a/packages/seacas/applications/gen3d/g3_newxyz.f +++ b/packages/seacas/applications/gen3d/g3_newxyz.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/gen3d/g3_params.blk b/packages/seacas/applications/gen3d/g3_params.blk index dd75b129e1cd..8d3d8128ad80 100644 --- a/packages/seacas/applications/gen3d/g3_params.blk +++ b/packages/seacas/applications/gen3d/g3_params.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C -*- Mode: fortran -*- diff --git a/packages/seacas/applications/gen3d/g3_progqa.blk b/packages/seacas/applications/gen3d/g3_progqa.blk index a24b128ca591..f2861dcfaeca 100644 --- a/packages/seacas/applications/gen3d/g3_progqa.blk +++ b/packages/seacas/applications/gen3d/g3_progqa.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /PROGQA/ QAINFO(6) diff --git a/packages/seacas/applications/gen3d/g3_proxyz.f b/packages/seacas/applications/gen3d/g3_proxyz.f index beb22a591b62..f9fcf4bb5112 100644 --- a/packages/seacas/applications/gen3d/g3_proxyz.f +++ b/packages/seacas/applications/gen3d/g3_proxyz.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/gen3d/g3_qainfo.blk b/packages/seacas/applications/gen3d/g3_qainfo.blk index de067f06da83..81a877e12c3a 100644 --- a/packages/seacas/applications/gen3d/g3_qainfo.blk +++ b/packages/seacas/applications/gen3d/g3_qainfo.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details QAINFO(1) = 'Gen3D ' diff --git a/packages/seacas/applications/gen3d/g3_rdelb.f b/packages/seacas/applications/gen3d/g3_rdelb.f index 26384267e361..93c7abee097e 100644 --- a/packages/seacas/applications/gen3d/g3_rdelb.f +++ b/packages/seacas/applications/gen3d/g3_rdelb.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= @@ -62,7 +62,7 @@ SUBROUTINE RDELB (A, IDELB, NAMELB, NUMELB, NUMLNK, NUMATR, call exgelb(ndbin, idelb(ielb), namelb(ielb), numelb(ielb), & numlnk(ielb), numatr(ielb), ierr) if (ierr .ne. 0) goto 30 -C + C ... See if there are any non-quad element blocks since we have to C read in the connectivity different for exodusII than the code C expects diff --git a/packages/seacas/applications/gen3d/g3_rdspln.f b/packages/seacas/applications/gen3d/g3_rdspln.f index 6c54cb32f441..8e27e2bd1ec8 100644 --- a/packages/seacas/applications/gen3d/g3_rdspln.f +++ b/packages/seacas/applications/gen3d/g3_rdspln.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C -*- Mode: fortran -*- diff --git a/packages/seacas/applications/gen3d/g3_relblk.f b/packages/seacas/applications/gen3d/g3_relblk.f index 258c73036d96..6d5d475cb93d 100644 --- a/packages/seacas/applications/gen3d/g3_relblk.f +++ b/packages/seacas/applications/gen3d/g3_relblk.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/gen3d/g3_renumb.f b/packages/seacas/applications/gen3d/g3_renumb.f index a46164529c96..7e83e3aadbe8 100644 --- a/packages/seacas/applications/gen3d/g3_renumb.f +++ b/packages/seacas/applications/gen3d/g3_renumb.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/gen3d/g3_rotxyz.f b/packages/seacas/applications/gen3d/g3_rotxyz.f index e8bc8cec6fd3..56d996426372 100644 --- a/packages/seacas/applications/gen3d/g3_rotxyz.f +++ b/packages/seacas/applications/gen3d/g3_rotxyz.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/gen3d/g3_show.f b/packages/seacas/applications/gen3d/g3_show.f index df63a6262273..081d485661cb 100644 --- a/packages/seacas/applications/gen3d/g3_show.f +++ b/packages/seacas/applications/gen3d/g3_show.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/gen3d/g3_shwint.f b/packages/seacas/applications/gen3d/g3_shwint.f index 9f266312825a..eb416b5f1d06 100644 --- a/packages/seacas/applications/gen3d/g3_shwint.f +++ b/packages/seacas/applications/gen3d/g3_shwint.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/gen3d/g3_spline.f b/packages/seacas/applications/gen3d/g3_spline.f index 689eae069ca6..5c076a92c225 100644 --- a/packages/seacas/applications/gen3d/g3_spline.f +++ b/packages/seacas/applications/gen3d/g3_spline.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details SUBROUTINE SPLINE(X,Y,N,YP1,YPN,Y2, U) diff --git a/packages/seacas/applications/gen3d/g3_splxyz.blk b/packages/seacas/applications/gen3d/g3_splxyz.blk index 317879fc9eb5..8dabcc54298b 100644 --- a/packages/seacas/applications/gen3d/g3_splxyz.blk +++ b/packages/seacas/applications/gen3d/g3_splxyz.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details INTEGER XSWEEP, YSWEEP, SPHERI, SWEEP diff --git a/packages/seacas/applications/gen3d/g3_splxyz.f b/packages/seacas/applications/gen3d/g3_splxyz.f index 23acd7cc6408..e282b2d5cd50 100644 --- a/packages/seacas/applications/gen3d/g3_splxyz.f +++ b/packages/seacas/applications/gen3d/g3_splxyz.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/gen3d/g3_sptxyz.blk b/packages/seacas/applications/gen3d/g3_sptxyz.blk index 38c5c6684f1c..98bbfa4e1de6 100644 --- a/packages/seacas/applications/gen3d/g3_sptxyz.blk +++ b/packages/seacas/applications/gen3d/g3_sptxyz.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /SPLCOM/ NSPL, SLTOP, SLBOT, $ KSCR, KZSPL, KXSPL, KXSPL2, KYSPL, KYSPL2 diff --git a/packages/seacas/applications/gen3d/g3_sptxyz.f b/packages/seacas/applications/gen3d/g3_sptxyz.f index baeb58101c33..61d79af341a2 100644 --- a/packages/seacas/applications/gen3d/g3_sptxyz.f +++ b/packages/seacas/applications/gen3d/g3_sptxyz.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/gen3d/g3_trnxyz.f b/packages/seacas/applications/gen3d/g3_trnxyz.f index ce5d0df09c0c..73c60fa1dee2 100644 --- a/packages/seacas/applications/gen3d/g3_trnxyz.f +++ b/packages/seacas/applications/gen3d/g3_trnxyz.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/gen3d/g3_twist.blk b/packages/seacas/applications/gen3d/g3_twist.blk index f47f886ccf1c..bd9bd95de5e3 100644 --- a/packages/seacas/applications/gen3d/g3_twist.blk +++ b/packages/seacas/applications/gen3d/g3_twist.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /TWIST/ TWANGL, TWGRAD, TWXCEN, TWYCEN, diff --git a/packages/seacas/applications/gen3d/g3_twixyz.f b/packages/seacas/applications/gen3d/g3_twixyz.f index e3e69e8a554c..6f9254ce48ae 100644 --- a/packages/seacas/applications/gen3d/g3_twixyz.f +++ b/packages/seacas/applications/gen3d/g3_twixyz.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/gen3d/g3_usblk.f b/packages/seacas/applications/gen3d/g3_usblk.f index e6a7a021c1c9..26260aaa3812 100644 --- a/packages/seacas/applications/gen3d/g3_usblk.f +++ b/packages/seacas/applications/gen3d/g3_usblk.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/gen3d/g3_usids.f b/packages/seacas/applications/gen3d/g3_usids.f index d21f017f8982..b0952a0c67f7 100644 --- a/packages/seacas/applications/gen3d/g3_usids.f +++ b/packages/seacas/applications/gen3d/g3_usids.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/gen3d/g3_wrelb.f b/packages/seacas/applications/gen3d/g3_wrelb.f index 9ed8a9a52503..aaf8bf98facf 100644 --- a/packages/seacas/applications/gen3d/g3_wrelb.f +++ b/packages/seacas/applications/gen3d/g3_wrelb.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/gen3d/g3_wress.f b/packages/seacas/applications/gen3d/g3_wress.f index 4670ef14a0cb..acdd16b7e66f 100644 --- a/packages/seacas/applications/gen3d/g3_wress.f +++ b/packages/seacas/applications/gen3d/g3_wress.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= @@ -132,7 +132,6 @@ SUBROUTINE WRESS (A, IA, IDFRO, IDBCK, endif end do - C ... Back sidesets are surface 5 call iniint(nesur, 5, ia(kiside)) C ... If the element number is negative, then we use surface 4 diff --git a/packages/seacas/applications/gen3d/g3_wrnps.f b/packages/seacas/applications/gen3d/g3_wrnps.f index 419a9d8933d8..1bfb250884e4 100644 --- a/packages/seacas/applications/gen3d/g3_wrnps.f +++ b/packages/seacas/applications/gen3d/g3_wrnps.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/gen3d/g3_wrpxyz.f b/packages/seacas/applications/gen3d/g3_wrpxyz.f index 7afe158179b1..55fe4b3fbc3c 100644 --- a/packages/seacas/applications/gen3d/g3_wrpxyz.f +++ b/packages/seacas/applications/gen3d/g3_wrpxyz.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= @@ -38,10 +38,9 @@ SUBROUTINE WRPXYZ (XN, YN, XN3, YN3, ZN3, IXNP, NRNP, ZCORD ) INTEGER IXNP(*), NRNP(*) REAL ZCORD(NNREPL) -C C ... Doing a Warp C ... CALCULATE THE THICKNESS INCREMENT FOR EACH TRANSLATION -C + IF (VEDGE) THEN CALL INIGRD (0.0, 1.0, ZGRAD(1), NRTRAN(1), NNREPL, ZCORD) ELSE @@ -82,9 +81,9 @@ SUBROUTINE WRPXYZ (XN, YN, XN3, YN3, ZN3, IXNP, NRNP, ZCORD ) C END IF IF (IWARP .EQ. 1) THEN -C + C ... Warp type 1: Point Centered -C + DO 60 INP = 1, NUMNP JNP0 = IXNP(INP) - 1 DX = XN(INP) @@ -111,9 +110,9 @@ SUBROUTINE WRPXYZ (XN, YN, XN3, YN3, ZN3, IXNP, NRNP, ZCORD ) CONTINUE ELSE IF (IWARP .EQ. -1) THEN -C + C ... Warp type -1: X Axis Centered -C + DO 90 INP = 1, NUMNP JNP0 = IXNP(INP) - 1 THET = YN(INP) / DWARP @@ -144,9 +143,9 @@ SUBROUTINE WRPXYZ (XN, YN, XN3, YN3, ZN3, IXNP, NRNP, ZCORD ) 90 CONTINUE ELSE IF (IWARP .EQ. -2) THEN -C + C ... Warp type -2: Y Axis Centered -C + DO 120 INP = 1, NUMNP JNP0 = IXNP(INP) - 1 THET = XN(INP) / DWARP @@ -177,9 +176,9 @@ SUBROUTINE WRPXYZ (XN, YN, XN3, YN3, ZN3, IXNP, NRNP, ZCORD ) 120 CONTINUE ELSE IF (IWARP .EQ. 2) THEN -C + C ... Warp type 1: Point-Centered Ellipse -C + DO 360 INP = 1, NUMNP JNP0 = IXNP(INP) - 1 DX = XN(INP) diff --git a/packages/seacas/applications/gen3d/g3_xxxxx.blk b/packages/seacas/applications/gen3d/g3_xxxxx.blk index 27af8c6c9aa0..3e17fdc0425a 100644 --- a/packages/seacas/applications/gen3d/g3_xxxxx.blk +++ b/packages/seacas/applications/gen3d/g3_xxxxx.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details PARAMETER (ISFLAT = 0) @@ -13,7 +13,7 @@ C See packages/seacas/LICENSE for details * XXSCAL, XYSCAL, XXSCL0, XYSCL0, XXOFFS, XYOFFS, * ISXWRP, XWARP, YWARP, CONVEX LOGICAL CONVEX -C + C ... ISXWRP = 0 -- Flat Mapping C ISXWRP = 1 -- Spherical Mapping C ISXWRP = 2 -- Toroidal Mapping diff --git a/packages/seacas/applications/gen3d/g3_xyzero.blk b/packages/seacas/applications/gen3d/g3_xyzero.blk index a0dbe58704f8..5740b0fc1175 100644 --- a/packages/seacas/applications/gen3d/g3_xyzero.blk +++ b/packages/seacas/applications/gen3d/g3_xyzero.blk @@ -1,9 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /XYZERO/ XZERO, YZERO, ZZERO C --XZERR, YZERR, ZZERR - Minimum nonzero values for X, Y, and Z -C + diff --git a/packages/seacas/applications/gen3d/g3_xyzmir.blk b/packages/seacas/applications/gen3d/g3_xyzmir.blk index f5c3cb2390d4..a31fe30aaa1e 100644 --- a/packages/seacas/applications/gen3d/g3_xyzmir.blk +++ b/packages/seacas/applications/gen3d/g3_xyzmir.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /XYZMIR/ XMIRR, YMIRR, ZMIRR diff --git a/packages/seacas/applications/gen3d/g3_xyzoff.blk b/packages/seacas/applications/gen3d/g3_xyzoff.blk index 60c47185488b..aa251efd937a 100644 --- a/packages/seacas/applications/gen3d/g3_xyzoff.blk +++ b/packages/seacas/applications/gen3d/g3_xyzoff.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /XYZOFF/ XOFFS, YOFFS, ZOFFS diff --git a/packages/seacas/applications/gen3d/g3_xyzrot.blk b/packages/seacas/applications/gen3d/g3_xyzrot.blk index 21bf6bab6c5b..95bf5e57d9a9 100644 --- a/packages/seacas/applications/gen3d/g3_xyzrot.blk +++ b/packages/seacas/applications/gen3d/g3_xyzrot.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /XYZROT/ ROT3D, ROTMAT(3,3), ROTCEN(3) diff --git a/packages/seacas/applications/gen3d/g3_xyzscl.blk b/packages/seacas/applications/gen3d/g3_xyzscl.blk index 34ee203fbf47..0b5cc95eab74 100644 --- a/packages/seacas/applications/gen3d/g3_xyzscl.blk +++ b/packages/seacas/applications/gen3d/g3_xyzscl.blk @@ -1,9 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /XYZSCL/ XSCAL, YSCAL, ZSCAL C --XSCAL, YSCAL, ZSCAL - Scale factors for X, Y, and Z -C + diff --git a/packages/seacas/applications/gen3d/gen3d.f b/packages/seacas/applications/gen3d/gen3d.f index dba94e56c9e9..ce293fe0507e 100644 --- a/packages/seacas/applications/gen3d/gen3d.f +++ b/packages/seacas/applications/gen3d/gen3d.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/genshell/genshell.f b/packages/seacas/applications/genshell/genshell.f index ba0edd5f7890..4eda42aceb69 100644 --- a/packages/seacas/applications/genshell/genshell.f +++ b/packages/seacas/applications/genshell/genshell.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/genshell/gs_cenpar.blk b/packages/seacas/applications/genshell/gs_cenpar.blk index 33cfeedca770..d184771e70d8 100644 --- a/packages/seacas/applications/genshell/gs_cenpar.blk +++ b/packages/seacas/applications/genshell/gs_cenpar.blk @@ -1,6 +1,6 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /CENPAR/ IX1, IX2, IX3, IX4 diff --git a/packages/seacas/applications/genshell/gs_cmdlist.blk b/packages/seacas/applications/genshell/gs_cmdlist.blk index 57782d6b02a9..a255153890ae 100644 --- a/packages/seacas/applications/genshell/gs_cmdlist.blk +++ b/packages/seacas/applications/genshell/gs_cmdlist.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details 'AXISYMMETRIC', 'CAVITY', diff --git a/packages/seacas/applications/genshell/gs_cmdsho.blk b/packages/seacas/applications/genshell/gs_cmdsho.blk index f9abc74f5f2a..f473160399f8 100644 --- a/packages/seacas/applications/genshell/gs_cmdsho.blk +++ b/packages/seacas/applications/genshell/gs_cmdsho.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /CMDSHO/ CPOINT LOGICAL CPOINT diff --git a/packages/seacas/applications/genshell/gs_comand.f b/packages/seacas/applications/genshell/gs_comand.f index 878407d5b122..2de049bde451 100644 --- a/packages/seacas/applications/genshell/gs_comand.f +++ b/packages/seacas/applications/genshell/gs_comand.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C -*- Mode: fortran -*- @@ -11,8 +11,6 @@ SUBROUTINE COMAND (IDNPS, IDESS, IDNSET, IDESET, & XN, YN, A, *) C======================================================================= -C $Id: comand.f,v 1.13 2005/01/17 23:09:58 gdsjaar Exp $ - C --*** COMAND *** (GENSHELL) Input and process commands C -- C --COMAND inputs and executes an user command. diff --git a/packages/seacas/applications/genshell/gs_dbase.blk b/packages/seacas/applications/genshell/gs_dbase.blk index ce676bf31f70..7a1838509209 100644 --- a/packages/seacas/applications/genshell/gs_dbase.blk +++ b/packages/seacas/applications/genshell/gs_dbase.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /DBASE/ NDBIN, NDBOUT diff --git a/packages/seacas/applications/genshell/gs_dbieb1.f b/packages/seacas/applications/genshell/gs_dbieb1.f index ef609fa63b7f..9ec8f850da1f 100644 --- a/packages/seacas/applications/genshell/gs_dbieb1.f +++ b/packages/seacas/applications/genshell/gs_dbieb1.f @@ -1,10 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: dbieb1.f,v 1.1 1999/02/17 15:26:51 gdsjaar Exp $ C======================================================================= SUBROUTINE DBIEBI (NDB, OPTION, IELB, NUMELB, NUMLNK, NUMATR, & LINK, ATRIB, NATRDM, NLNKDM, *) diff --git a/packages/seacas/applications/genshell/gs_dbielb.f b/packages/seacas/applications/genshell/gs_dbielb.f index e78f3031f38f..148e3b57d321 100644 --- a/packages/seacas/applications/genshell/gs_dbielb.f +++ b/packages/seacas/applications/genshell/gs_dbielb.f @@ -1,10 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: dbielb.f,v 1.1 1999/02/17 15:26:51 gdsjaar Exp $ C======================================================================= SUBROUTINE DBIELB (NDB, OPTION, NELBS, NELBE, IDELB, NUMELB, & NUMLNK, NUMATR, A, IA, KLINK, KATRIB, NAMELB, *) @@ -88,7 +87,6 @@ SUBROUTINE DBIELB (NDB, OPTION, NELBS, NELBE, IDELB, NUMELB, IF (NERR .GT. 0) GOTO 110 END IF - IELNK = IESAV IEATR = IASAV ISATR = 0 @@ -139,4 +137,3 @@ SUBROUTINE DBIELB (NDB, OPTION, NELBS, NELBE, IDELB, NUMELB, RETURN 1 END - diff --git a/packages/seacas/applications/genshell/gs_dbmir1.f b/packages/seacas/applications/genshell/gs_dbmir1.f index 2db5e4360805..9c5755d45872 100644 --- a/packages/seacas/applications/genshell/gs_dbmir1.f +++ b/packages/seacas/applications/genshell/gs_dbmir1.f @@ -1,10 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: dbmir1.f,v 1.5 1999/02/17 15:26:52 gdsjaar Exp $ C======================================================================= SUBROUTINE DBMIR1 (IELB, NUMELB, NUMLNK, LINK) C======================================================================= diff --git a/packages/seacas/applications/genshell/gs_dbmirr.f b/packages/seacas/applications/genshell/gs_dbmirr.f index 2c2e7b14543f..3036c44ad3cc 100644 --- a/packages/seacas/applications/genshell/gs_dbmirr.f +++ b/packages/seacas/applications/genshell/gs_dbmirr.f @@ -1,10 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: dbmirr.f,v 1.2 1999/02/17 15:26:52 gdsjaar Exp $ C======================================================================= SUBROUTINE DBMIRR (NELBS, NELBE, IDELB, NUMELB, NUMLNK, LINK) C======================================================================= diff --git a/packages/seacas/applications/genshell/gs_dbnum3.blk b/packages/seacas/applications/genshell/gs_dbnum3.blk index 2d1a3e468aea..364198d90e07 100644 --- a/packages/seacas/applications/genshell/gs_dbnum3.blk +++ b/packages/seacas/applications/genshell/gs_dbnum3.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /DBNUM3/ NUMNP3, NDIM3, NUMEL3, NELBL3, diff --git a/packages/seacas/applications/genshell/gs_dbnums.blk b/packages/seacas/applications/genshell/gs_dbnums.blk index 5fa02b9bf84b..691762fb42c5 100644 --- a/packages/seacas/applications/genshell/gs_dbnums.blk +++ b/packages/seacas/applications/genshell/gs_dbnums.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /DBNUMS/ NDIM, NUMNP, NUMEL, NELBLK, diff --git a/packages/seacas/applications/genshell/gs_dboelb.f b/packages/seacas/applications/genshell/gs_dboelb.f index 87a75c7fe82b..0701d61535b5 100644 --- a/packages/seacas/applications/genshell/gs_dboelb.f +++ b/packages/seacas/applications/genshell/gs_dboelb.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/genshell/gs_dboqa.f b/packages/seacas/applications/genshell/gs_dboqa.f index 0f653b1899f0..dc813d7380fd 100644 --- a/packages/seacas/applications/genshell/gs_dboqa.f +++ b/packages/seacas/applications/genshell/gs_dboqa.f @@ -1,10 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C$Id: dboqa.f,v 1.1 1999/02/17 15:26:53 gdsjaar Exp $ C======================================================================= SUBROUTINE DBOQA (NDB, QAINFO, NQAREC, QAREC, NINFO, INFO, & PREFIX, POSTFIX) diff --git a/packages/seacas/applications/genshell/gs_dbpini.f b/packages/seacas/applications/genshell/gs_dbpini.f index 27192b6298c2..90d6ba91a6c4 100644 --- a/packages/seacas/applications/genshell/gs_dbpini.f +++ b/packages/seacas/applications/genshell/gs_dbpini.f @@ -1,10 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C$Id: dbpini.f,v 1.2 2001/09/18 18:38:49 gdsjaar Exp $ C======================================================================= SUBROUTINE DBPINI (OPTION, NDB, TITLE, NDIM, NUMNP, NUMEL, NELBLK, & NUMNPS, LNPSNL, LNPSDF, NUMESS, LESSEL, LESSNL, diff --git a/packages/seacas/applications/genshell/gs_dbtitl.blk b/packages/seacas/applications/genshell/gs_dbtitl.blk index bc832d645d17..76440bfac367 100644 --- a/packages/seacas/applications/genshell/gs_dbtitl.blk +++ b/packages/seacas/applications/genshell/gs_dbtitl.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /DBTITL/ TITLE diff --git a/packages/seacas/applications/genshell/gs_getspl.f b/packages/seacas/applications/genshell/gs_getspl.f index 74d9aa651604..482c20dfa29b 100644 --- a/packages/seacas/applications/genshell/gs_getspl.f +++ b/packages/seacas/applications/genshell/gs_getspl.f @@ -1,34 +1,13 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C -*- Mode: fortran -*- SUBROUTINE GETSPL(A) DIMENSION A(*) -C $Id: getspl.f,v 1.6 1997/11/26 16:28:38 gdsjaar Exp $ -C $Log: getspl.f,v $ -C Revision 1.6 1997/11/26 16:28:38 gdsjaar -C Added NOSCALE option to the spline sweeping. If specified, then the -C input 2D mesh is not stretched to match the spline extent. The output -C X,Y coordinates are the same as the input X,Y coordinates. -C -C Revision 1.5 1994/08/25 13:45:24 gdsjaar -C Fixed spline input to skip back or bottom. Added number of points -C output for easier debugging. -C -c Revision 1.4 1993/05/27 22:15:32 gdsjaar -c Added xsweep and ysweep options to spline transformation -c -c Revision 1.3 1991/03/28 15:39:11 gdsjaar -c Modified spline from GEN3D to work with GENSHELL -c -c Revision 1.2 1990/11/09 15:44:08 gdsjaar -c Added help option -c - INCLUDE 'gs_splxyz.blk' PARAMETER (BINGO = 1.0E38) diff --git a/packages/seacas/applications/genshell/gs_mirss.f b/packages/seacas/applications/genshell/gs_mirss.f index 54c3dda8e4de..10c41f2e748f 100644 --- a/packages/seacas/applications/genshell/gs_mirss.f +++ b/packages/seacas/applications/genshell/gs_mirss.f @@ -1,10 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: mirss.f,v 1.4 1999/02/17 15:26:56 gdsjaar Exp $ C======================================================================= SUBROUTINE MIRSS (IDFRO, IDBCK, NLINK, & NSSUR, NSSFRO, NSSBCK, LTSES3) diff --git a/packages/seacas/applications/genshell/gs_newess.f b/packages/seacas/applications/genshell/gs_newess.f index 7f709dc529ab..b9228dda16cf 100644 --- a/packages/seacas/applications/genshell/gs_newess.f +++ b/packages/seacas/applications/genshell/gs_newess.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= @@ -9,21 +9,6 @@ SUBROUTINE NEWESS (IDFRO, IDBCK, NSSUR, NLINK, LINK, & ISSFRO, ISSBCK, NSSFRO, NSSBCK) C======================================================================= -C $Id: newess.f,v 1.3 1993/11/23 21:19:23 gdsjaar Exp $ -C $Log: newess.f,v $ -C Revision 1.3 1993/11/23 21:19:23 gdsjaar -C Added capability to handle 8-node quads to 8-node shells -C -c Revision 1.2 1991/03/21 19:37:58 gdsjaar -c Initial change of sidesets from gen3d to genshell -c -c Revision 1.1.1.1 1990/08/20 12:22:16 gdsjaar -c Gen3D Mesh Generation Program -c -c Revision 1.1 90/08/20 12:22:14 gdsjaar -c Initial revision -c - C --*** NEWESS *** (GEN3D) Calculate 3D side sets C -- Written by Amy Gilkey - revised 01/12/88 C -- diff --git a/packages/seacas/applications/genshell/gs_newid.f b/packages/seacas/applications/genshell/gs_newid.f index 4a02ac53e1db..5b96272b8dcb 100644 --- a/packages/seacas/applications/genshell/gs_newid.f +++ b/packages/seacas/applications/genshell/gs_newid.f @@ -1,11 +1,11 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details SUBROUTINE NEWID (TYPE, IDLST, NUMID, IDNEW, IDOLD) -C + CHARACTER*(*) TYPE DIMENSION IDLST(*) CHARACTER*80 STRING diff --git a/packages/seacas/applications/genshell/gs_newini.f b/packages/seacas/applications/genshell/gs_newini.f index d730e0e5a4a4..6e957a2a94e9 100644 --- a/packages/seacas/applications/genshell/gs_newini.f +++ b/packages/seacas/applications/genshell/gs_newini.f @@ -1,39 +1,13 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE NEWINI (IDNSUR, IDESUR, NSSUR, NUMATR) C======================================================================= -C $Id: newini.f,v 1.6 1999/02/17 15:26:56 gdsjaar Exp $ -C $Log: newini.f,v $ -C Revision 1.6 1999/02/17 15:26:56 gdsjaar -C Converted to read/write exodusII database. -C (copied repository from genshell to genshell2 prior to these changes) -C Not tested much yet; probably still some problems -C -C Revision 1.5 1991/04/10 22:26:53 gdsjaar -C Fixed up node-set length problem -C -c Revision 1.4 1991/03/29 19:21:35 gdsjaar -c Removed the Gen3D variable blktyp -c -c Revision 1.3 1991/01/09 12:59:24 gdsjaar -c Initial conversion from GEN3D to GENSHELL, no BC yet -c -c Revision 1.2 90/10/01 15:39:50 gdsjaar -c Removed MAX() from dimension statement -- Non-ANSI usage -c -c Revision 1.1.1.1 90/08/20 12:22:20 gdsjaar -c Gen3D Mesh Generation Program -c -c Revision 1.1 90/08/20 12:22:19 gdsjaar -c Initial revision -c - C --*** NEWINI *** (GEN3D) Calculate 3D initial variables C -- Written by Amy Gilkey - revised 09/02/87 C -- diff --git a/packages/seacas/applications/genshell/gs_newxyz.f b/packages/seacas/applications/genshell/gs_newxyz.f index 01a4de97b6b0..c81314d4e79f 100644 --- a/packages/seacas/applications/genshell/gs_newxyz.f +++ b/packages/seacas/applications/genshell/gs_newxyz.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C -*- Mode: fortran -*- diff --git a/packages/seacas/applications/genshell/gs_params.blk b/packages/seacas/applications/genshell/gs_params.blk index d35565275c9a..bd8c4bff5629 100644 --- a/packages/seacas/applications/genshell/gs_params.blk +++ b/packages/seacas/applications/genshell/gs_params.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C -*- Mode: fortran -*- diff --git a/packages/seacas/applications/genshell/gs_progqa.blk b/packages/seacas/applications/genshell/gs_progqa.blk index 3dbc397b3546..484942f02f4f 100644 --- a/packages/seacas/applications/genshell/gs_progqa.blk +++ b/packages/seacas/applications/genshell/gs_progqa.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /PROGQA/ QAINFO(6) diff --git a/packages/seacas/applications/genshell/gs_qainfo.blk b/packages/seacas/applications/genshell/gs_qainfo.blk index 492584853b32..56fe0f9e822c 100644 --- a/packages/seacas/applications/genshell/gs_qainfo.blk +++ b/packages/seacas/applications/genshell/gs_qainfo.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details CHARACTER*32 CVSREV, CVSDAT @@ -28,5 +28,4 @@ C and 'Date' strings from the CVS variables. Kludgey but it might work. QAINFO(3)(MAX(1,9-LREV):8) = CVSREV(1:LREV) end if - C-------- diff --git a/packages/seacas/applications/genshell/gs_rotxyz.f b/packages/seacas/applications/genshell/gs_rotxyz.f index c893d753b265..56d996426372 100644 --- a/packages/seacas/applications/genshell/gs_rotxyz.f +++ b/packages/seacas/applications/genshell/gs_rotxyz.f @@ -1,19 +1,13 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE ROTXYZ (XYZ, ANG, ROTMAT) C======================================================================= -C $Id: rotxyz.f,v 1.1 1990/08/20 12:22:48 gdsjaar Exp $ -C $Log: rotxyz.f,v $ -C Revision 1.1 1990/08/20 12:22:48 gdsjaar -C Initial revision -C - C --*** ROTXYZ *** (GEN3D) Multiply rotation matrix by XYZ rotation C -- Written by Amy Gilkey - revised 05/23/86 C -- diff --git a/packages/seacas/applications/genshell/gs_show.f b/packages/seacas/applications/genshell/gs_show.f index 713181852216..c86a02215814 100644 --- a/packages/seacas/applications/genshell/gs_show.f +++ b/packages/seacas/applications/genshell/gs_show.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= @@ -9,8 +9,6 @@ SUBROUTINE SHOW (STYP, INTYP, IDNPS, IDESS, IDNSET, IDESET, & IDELB, NAMELB, NUMELB, NUMLNK, ELATTR) C======================================================================= -C $Id: show.f,v 1.9 2001/09/18 18:38:50 gdsjaar Exp $ - C --*** SHOW *** (GEN3D) Display information C -- Written by Amy Gilkey - revised 03/07/88 C -- diff --git a/packages/seacas/applications/genshell/gs_shwint.f b/packages/seacas/applications/genshell/gs_shwint.f index c7b7d85e6631..b51ffaac07e5 100644 --- a/packages/seacas/applications/genshell/gs_shwint.f +++ b/packages/seacas/applications/genshell/gs_shwint.f @@ -1,25 +1,13 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE SHWINT (ITRANT, DIM3) C======================================================================= -C $Id: shwint.f,v 1.2 1991/01/09 12:59:38 gdsjaar Exp $ -C $Log: shwint.f,v $ -C Revision 1.2 1991/01/09 12:59:38 gdsjaar -C Initial conversion from GEN3D to GENSHELL, no BC yet -C -c Revision 1.1.1.1 90/08/20 12:22:56 gdsjaar -c Gen3D Mesh Generation Program -c -c Revision 1.1 90/08/20 12:22:55 gdsjaar -c Initial revision -c - CHARACTER*20 RSTR(9) CHARACTER*20 TYPE @@ -52,4 +40,3 @@ SUBROUTINE SHWINT (ITRANT, DIM3) 20 FORMAT (1X, 10A) RETURN END - diff --git a/packages/seacas/applications/genshell/gs_spline.f b/packages/seacas/applications/genshell/gs_spline.f index c970c06c3c54..253e2b0c42ef 100644 --- a/packages/seacas/applications/genshell/gs_spline.f +++ b/packages/seacas/applications/genshell/gs_spline.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details SUBROUTINE SPLINE(X,Y,N,YP1,YPN,Y2, U) DIMENSION X(N),Y(N),Y2(N),U(N) diff --git a/packages/seacas/applications/genshell/gs_splxyz.blk b/packages/seacas/applications/genshell/gs_splxyz.blk index 317879fc9eb5..8dabcc54298b 100644 --- a/packages/seacas/applications/genshell/gs_splxyz.blk +++ b/packages/seacas/applications/genshell/gs_splxyz.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details INTEGER XSWEEP, YSWEEP, SPHERI, SWEEP diff --git a/packages/seacas/applications/genshell/gs_splxyz.f b/packages/seacas/applications/genshell/gs_splxyz.f index 4d608910da27..5c185a080c1c 100644 --- a/packages/seacas/applications/genshell/gs_splxyz.f +++ b/packages/seacas/applications/genshell/gs_splxyz.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C -*- Mode: fortran -*- @@ -11,7 +11,6 @@ SUBROUTINE SPLXYZ (XN, YN, XN3, YN3, ZN3, ATRIB, & SLLFT, SLRGT, RDTHET, SWEEP, NOSCAL ) C======================================================================= - C --*** SPLXYZ *** (GEN3D) Calculate 3D coordinates for Double-surface C Spline projection C -- Written by Greg Sjaardema - 01/08/90 diff --git a/packages/seacas/applications/genshell/gs_sptxyz.blk b/packages/seacas/applications/genshell/gs_sptxyz.blk index 38c5c6684f1c..98bbfa4e1de6 100644 --- a/packages/seacas/applications/genshell/gs_sptxyz.blk +++ b/packages/seacas/applications/genshell/gs_sptxyz.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /SPLCOM/ NSPL, SLTOP, SLBOT, $ KSCR, KZSPL, KXSPL, KXSPL2, KYSPL, KYSPL2 diff --git a/packages/seacas/applications/genshell/gs_trnxyz.f b/packages/seacas/applications/genshell/gs_trnxyz.f index ae6d5d937018..0584deeed403 100644 --- a/packages/seacas/applications/genshell/gs_trnxyz.f +++ b/packages/seacas/applications/genshell/gs_trnxyz.f @@ -1,25 +1,13 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE TRNXYZ (XN, YN, XN3, YN3, ZN3, ATRIB) C======================================================================= -C $Id: trnxyz.f,v 1.2 1991/01/09 12:59:44 gdsjaar Exp $ -C $Log: trnxyz.f,v $ -C Revision 1.2 1991/01/09 12:59:44 gdsjaar -C Initial conversion from GEN3D to GENSHELL, no BC yet -C -c Revision 1.1.1.1 90/08/20 12:23:11 gdsjaar -c Gen3D Mesh Generation Program -c -c Revision 1.1 90/08/20 12:23:10 gdsjaar -c Initial revision -c - C --*** TRNXYZ *** (GENSHELL) Calculate 3D coordinates for translation C -- C --TRNXYZ calculates the coordinate array for the 3D database. diff --git a/packages/seacas/applications/genshell/gs_twist.blk b/packages/seacas/applications/genshell/gs_twist.blk index 7a98dd9f149b..cc3882a06a5a 100644 --- a/packages/seacas/applications/genshell/gs_twist.blk +++ b/packages/seacas/applications/genshell/gs_twist.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /TWIST/ TWANGL, TWGRAD, TWXCEN, TWYCEN, * NTWTRN, TWDIS, TWGRD2, TWRCEN, ITWTYP diff --git a/packages/seacas/applications/genshell/gs_usids.f b/packages/seacas/applications/genshell/gs_usids.f index 683358c67c5d..35314288d82c 100644 --- a/packages/seacas/applications/genshell/gs_usids.f +++ b/packages/seacas/applications/genshell/gs_usids.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= @@ -9,12 +9,6 @@ SUBROUTINE USIDS (IFLD, INTYP, CFIELD, IFIELD, & LOLD1, IDOLD1, LOLD2, IDOLD2, LENNEW, IDNEW, *) C======================================================================= -C $Id: usids.f,v 1.1 1990/08/20 12:23:20 gdsjaar Exp $ -C $Log: usids.f,v $ -C Revision 1.1 1990/08/20 12:23:20 gdsjaar -C Initial revision -C - C --*** USIDS *** (GEN3D) Read list of IDs C -- Written by Amy Gilkey - revised 05/21/86 C -- diff --git a/packages/seacas/applications/genshell/gs_wress.f b/packages/seacas/applications/genshell/gs_wress.f index 985e88cd896a..8abe3dfb0bb7 100644 --- a/packages/seacas/applications/genshell/gs_wress.f +++ b/packages/seacas/applications/genshell/gs_wress.f @@ -1,10 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: wress.f,v 1.3 1999/03/01 14:15:08 gdsjaar Exp $ C======================================================================= SUBROUTINE WRESS (A, IA, IDFRO, IDBCK, & ISSFRO, ISSBCK, NSSUR, NSSFRO, NSSBCK, diff --git a/packages/seacas/applications/genshell/gs_wrnps.f b/packages/seacas/applications/genshell/gs_wrnps.f index bffa7b88e4b3..2f533c015531 100644 --- a/packages/seacas/applications/genshell/gs_wrnps.f +++ b/packages/seacas/applications/genshell/gs_wrnps.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/genshell/gs_wrpxyz.f b/packages/seacas/applications/genshell/gs_wrpxyz.f index c9f4c5445a02..728362f6681b 100644 --- a/packages/seacas/applications/genshell/gs_wrpxyz.f +++ b/packages/seacas/applications/genshell/gs_wrpxyz.f @@ -1,35 +1,13 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE WRPXYZ (XN, YN, XN3, YN3, ZN3, ATRIB) C======================================================================= -C $Id: wrpxyz.f,v 1.5 1993/05/27 22:17:06 gdsjaar Exp $ -C $Log: wrpxyz.f,v $ -C Revision 1.5 1993/05/27 22:17:06 gdsjaar -C Added new ellipse transformation code -C -c Revision 1.4 1991/07/31 17:30:53 gdsjaar -c Added WARP AXIS VERTICAL command to map to surface -c without changing input X and Y coordinates. Updated Version to X0.01.00 -c -c Revision 1.3 1991/01/11 08:39:58 gdsjaar -c Removed DEBUG comment lines -c -c Revision 1.2 91/01/09 12:59:47 gdsjaar -c Initial conversion from GEN3D to GENSHELL, no BC yet -c -c Revision 1.1.1.1 90/08/20 12:23:33 gdsjaar -c Gen3D Mesh Generation Program -c -c Revision 1.1 90/08/20 12:23:31 gdsjaar -c Initial revision -c - C --*** WRPXYZ *** (GEN3D) Calculate 3D coordinates C -- Written by Amy Gilkey - revised 05/09/88 C -- Modified by Greg Sjaardema - 02/06/89 @@ -57,9 +35,9 @@ SUBROUTINE WRPXYZ (XN, YN, XN3, YN3, ZN3, ATRIB) REAL ATRIB(NUMEL) IF (IWARP .EQ. 1) THEN -C + C ... Warp type 1: Point Centered -C + DO 100 INP = 1, NUMNP XN3(INP) = XN(INP) YN3(INP) = YN(INP) @@ -68,9 +46,9 @@ SUBROUTINE WRPXYZ (XN, YN, XN3, YN3, ZN3, ATRIB) CONTINUE ELSE IF (IWARP .EQ. -1) THEN -C + C ... Warp type -1: X Axis Centered -C + DO 110 INP = 1, NUMNP THET = YN(INP) / DWARP XN3(INP) = XN(INP) @@ -79,9 +57,9 @@ SUBROUTINE WRPXYZ (XN, YN, XN3, YN3, ZN3, ATRIB) 110 CONTINUE ELSE IF (IWARP .EQ. -2) THEN -C + C ... Warp type -2: Y Axis Centered -C + DO 120 INP = 1, NUMNP THET = XN(INP) / DWARP XN3(INP) = SIN(THET) * DWARP @@ -90,9 +68,9 @@ SUBROUTINE WRPXYZ (XN, YN, XN3, YN3, ZN3, ATRIB) 120 CONTINUE ELSE IF (IWARP .EQ. -3) THEN -C + C ... Warp type -3: X Axis Centered, Project straight up -C + DO 130 INP = 1, NUMNP XN3(INP) = XN(INP) YN3(INP) = YN(INP) @@ -100,9 +78,9 @@ SUBROUTINE WRPXYZ (XN, YN, XN3, YN3, ZN3, ATRIB) 130 CONTINUE ELSE IF (IWARP .EQ. -4) THEN -C + C ... Warp type -4: Y Axis Centered, Project straight up -C + DO 140 INP = 1, NUMNP XN3(INP) = XN(INP) YN3(INP) = YN(INP) @@ -110,9 +88,9 @@ SUBROUTINE WRPXYZ (XN, YN, XN3, YN3, ZN3, ATRIB) 140 CONTINUE ELSE IF (IWARP .EQ. 2) THEN -C + C ... Warp type 2: Point-Centered Ellipse -C + DO 150 INP = 1, NUMNP DX = XN(INP) DY = YN(INP) diff --git a/packages/seacas/applications/genshell/gs_xxxxx.blk b/packages/seacas/applications/genshell/gs_xxxxx.blk index 33eb8c9196d9..13340d70db33 100644 --- a/packages/seacas/applications/genshell/gs_xxxxx.blk +++ b/packages/seacas/applications/genshell/gs_xxxxx.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /XXXXX/ XXA, XXB, XXC, * XXSCAL, XYSCAL, XXSCL0, XYSCL0, XXOFFS, XYOFFS, diff --git a/packages/seacas/applications/genshell/gs_xyzero.blk b/packages/seacas/applications/genshell/gs_xyzero.blk index a0dbe58704f8..5740b0fc1175 100644 --- a/packages/seacas/applications/genshell/gs_xyzero.blk +++ b/packages/seacas/applications/genshell/gs_xyzero.blk @@ -1,9 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /XYZERO/ XZERO, YZERO, ZZERO C --XZERR, YZERR, ZZERR - Minimum nonzero values for X, Y, and Z -C + diff --git a/packages/seacas/applications/genshell/gs_xyzmir.blk b/packages/seacas/applications/genshell/gs_xyzmir.blk index f5c3cb2390d4..a31fe30aaa1e 100644 --- a/packages/seacas/applications/genshell/gs_xyzmir.blk +++ b/packages/seacas/applications/genshell/gs_xyzmir.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /XYZMIR/ XMIRR, YMIRR, ZMIRR diff --git a/packages/seacas/applications/genshell/gs_xyzoff.blk b/packages/seacas/applications/genshell/gs_xyzoff.blk index 60c47185488b..aa251efd937a 100644 --- a/packages/seacas/applications/genshell/gs_xyzoff.blk +++ b/packages/seacas/applications/genshell/gs_xyzoff.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /XYZOFF/ XOFFS, YOFFS, ZOFFS diff --git a/packages/seacas/applications/genshell/gs_xyzrot.blk b/packages/seacas/applications/genshell/gs_xyzrot.blk index 21bf6bab6c5b..95bf5e57d9a9 100644 --- a/packages/seacas/applications/genshell/gs_xyzrot.blk +++ b/packages/seacas/applications/genshell/gs_xyzrot.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /XYZROT/ ROT3D, ROTMAT(3,3), ROTCEN(3) diff --git a/packages/seacas/applications/genshell/gs_xyzscl.blk b/packages/seacas/applications/genshell/gs_xyzscl.blk index a4f3e89afc54..1f7222380061 100644 --- a/packages/seacas/applications/genshell/gs_xyzscl.blk +++ b/packages/seacas/applications/genshell/gs_xyzscl.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /XYZSCL/ XSCAL, YSCAL, ZSCAL, XRAND, YRAND, ZRAND diff --git a/packages/seacas/applications/gjoin/gj_chgint.f b/packages/seacas/applications/gjoin/gj_chgint.f index ad86302ec1be..edfe535e44a5 100644 --- a/packages/seacas/applications/gjoin/gj_chgint.f +++ b/packages/seacas/applications/gjoin/gj_chgint.f @@ -1,26 +1,12 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE CHGINT (IOLD, INEW, LIST, LLIST) C======================================================================= -C $Id: chgint.f,v 1.1 1999/01/18 19:21:20 gdsjaar Exp $ -C $Log: chgint.f,v $ -C Revision 1.1 1999/01/18 19:21:20 gdsjaar -C ExodusII version of gjoin, needs testing and syncing with exodus 1 version, but is being committed to permit easier testing and modifications. This was created by Dave Fry at Goodyear -C -c Revision 1.1.1.1 1998/11/05 16:23:25 a294617 -c Initial import == gjoin 1.36 -c -C Revision 1.1.1.1 1990/11/12 14:09:27 gdsjaar -C GJOIN - X1.00.40 - 7/17/90 -C -c Revision 1.1 90/11/12 14:09:26 gdsjaar -c Initial revision -c C --*** CHGINT *** (GJOIN) Changes all occurrences in list C -- Written by Amy Gilkey - revised 09/29/87 diff --git a/packages/seacas/applications/gjoin/gj_comand.f b/packages/seacas/applications/gjoin/gj_comand.f index a9a3ea023058..47810a6a6074 100644 --- a/packages/seacas/applications/gjoin/gj_comand.f +++ b/packages/seacas/applications/gjoin/gj_comand.f @@ -1,12 +1,11 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C -*- Mode: fortran -*- C======================================================================= -C $Id: comand.f,v 1.3 2001/06/26 17:38:54 gdsjaar Exp $ SUBROUTINE COMAND (A, IELBST, IDELB, NUMELB, NUMLNK, NUMATR, & NAMELB, INPSST, IDNPS, NNNPS, IESSST, IDESS, NEESS, DONE, *) diff --git a/packages/seacas/applications/gjoin/gj_dbmir1.f b/packages/seacas/applications/gjoin/gj_dbmir1.f index 416ff902efd2..4237f69a8c02 100644 --- a/packages/seacas/applications/gjoin/gj_dbmir1.f +++ b/packages/seacas/applications/gjoin/gj_dbmir1.f @@ -1,10 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: dbmir1.f,v 1.4 2006/02/13 20:01:58 gdsjaar Exp $ C======================================================================= SUBROUTINE DBMIR1 (IELB, NUMELB, NUMLNK, LINK, NAME, NDIM, NONQUD) C======================================================================= diff --git a/packages/seacas/applications/gjoin/gj_dbmirr.f b/packages/seacas/applications/gjoin/gj_dbmirr.f index 9106f6539b39..d0574b7cac05 100644 --- a/packages/seacas/applications/gjoin/gj_dbmirr.f +++ b/packages/seacas/applications/gjoin/gj_dbmirr.f @@ -1,10 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: dbmirr.f,v 1.3 2006/02/14 16:01:34 gdsjaar Exp $ C======================================================================= SUBROUTINE DBMIRR (NELBS, NELBE, IDELB, NUMELB, NUMLNK, LINK, * NAMELB, NDIM, NONQUD) diff --git a/packages/seacas/applications/gjoin/gj_dbpini.f b/packages/seacas/applications/gjoin/gj_dbpini.f index 9819ec22f714..e290c4a9582d 100644 --- a/packages/seacas/applications/gjoin/gj_dbpini.f +++ b/packages/seacas/applications/gjoin/gj_dbpini.f @@ -1,10 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C$Id: dbpini.f,v 1.2 2001/06/26 17:38:54 gdsjaar Exp $ C======================================================================= SUBROUTINE DBPINI (OPTION, NDB, TITLE, NDIM, NUMNP, NUMEL, NELBLK, & NUMNPS, LNPSNL, LNPSDF, NUMESS, LESSEL, @@ -51,7 +50,6 @@ SUBROUTINE DBPINI (OPTION, NDB, TITLE, NDIM, NUMNP, NUMEL, NELBLK, LOGICAL ALL ALL = (OPTION .EQ. '*') - IF (ALL .OR. (INDEX (OPTION, 'I') .GT. 0)) THEN WRITE(*, 10000) ENDIF diff --git a/packages/seacas/applications/gjoin/gj_dbvars.blk b/packages/seacas/applications/gjoin/gj_dbvars.blk index 3580d6b9b0c8..90fb2cb3ffa7 100644 --- a/packages/seacas/applications/gjoin/gj_dbvars.blk +++ b/packages/seacas/applications/gjoin/gj_dbvars.blk @@ -1,11 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: dbvars.blk,v 1.1 1999/01/18 19:21:20 gdsjaar Exp $ -C COMMON /DBVARS/ TWODB, NDIM, NEWNP, NUMNP1, NUMNP2, & NEWEL, NUMEL1, NUMEL2, NEWELB, NELBL1, NELBL2, & NEWNPS, NNPS1, NNPS2, NEWNNL, LNPSN1, LNPSN2, diff --git a/packages/seacas/applications/gjoin/gj_dorot.f b/packages/seacas/applications/gjoin/gj_dorot.f index dcd73ae30e51..9e6f334dae2b 100644 --- a/packages/seacas/applications/gjoin/gj_dorot.f +++ b/packages/seacas/applications/gjoin/gj_dorot.f @@ -1,20 +1,8 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C -C See packages/seacas/LICENSE for details - -C $Id: dorot.f,v 1.1 1999/01/18 19:21:21 gdsjaar Exp $ -C $Log: dorot.f,v $ -C Revision 1.1 1999/01/18 19:21:21 gdsjaar -C ExodusII version of gjoin, needs testing and syncing with exodus 1 version, but is being committed to permit easier testing and modifications. This was created by Dave Fry at Goodyear -C -c Revision 1.1.1.1 1998/11/05 16:23:25 a294617 -c Initial import == gjoin 1.36 -c -C Revision 1.1 1992/11/11 22:00:09 gdsjaar -C Added revolve and revcen transformation commands. C +C See packages/seacas/LICENSE for details subroutine dorot(ndim, numnp, xn, yn, zn, rotmat, rotcen) real xn(*), yn(*), zn(*) diff --git a/packages/seacas/applications/gjoin/gj_expxyz.f b/packages/seacas/applications/gjoin/gj_expxyz.f index 96c7ab67b48f..80bfbac388be 100644 --- a/packages/seacas/applications/gjoin/gj_expxyz.f +++ b/packages/seacas/applications/gjoin/gj_expxyz.f @@ -1,13 +1,11 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C -*- Mode: fortran -*- C======================================================================= -C $Id: expxyz.f,v 1.3 2002/06/24 16:09:28 gdsjaar Exp $ -c SUBROUTINE EXPXYZ (NDIM, $ MATNS1, MATNS2, NNNPS, IXNNPS, LTNNPS, $ NUMNP1, XN1, YN1, ZN1, @@ -177,7 +175,6 @@ SUBROUTINE EXPXYZ (NDIM, GOTO 180 END IF - IF (TOLER .GE. 0.0) THEN EPS = TOLER ELSE diff --git a/packages/seacas/applications/gjoin/gj_filnum.blk b/packages/seacas/applications/gjoin/gj_filnum.blk index 7b627a225e32..0e40e21f02c0 100644 --- a/packages/seacas/applications/gjoin/gj_filnum.blk +++ b/packages/seacas/applications/gjoin/gj_filnum.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /FILNUM/ KLOG diff --git a/packages/seacas/applications/gjoin/gj_fixmap.f b/packages/seacas/applications/gjoin/gj_fixmap.f index 8205833c3878..5894e7427990 100644 --- a/packages/seacas/applications/gjoin/gj_fixmap.f +++ b/packages/seacas/applications/gjoin/gj_fixmap.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details subroutine fixmap(numel, map) diff --git a/packages/seacas/applications/gjoin/gj_getall.f b/packages/seacas/applications/gjoin/gj_getall.f index a14fc33cf32d..9c8835d339db 100644 --- a/packages/seacas/applications/gjoin/gj_getall.f +++ b/packages/seacas/applications/gjoin/gj_getall.f @@ -1,26 +1,12 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE GETALL (MATCH, LLIST, LIST, NINSET, INSET) C======================================================================= -C $Id: getall.f,v 1.1 1999/01/18 19:21:21 gdsjaar Exp $ -C $Log: getall.f,v $ -C Revision 1.1 1999/01/18 19:21:21 gdsjaar -C ExodusII version of gjoin, needs testing and syncing with exodus 1 version, but is being committed to permit easier testing and modifications. This was created by Dave Fry at Goodyear -C -c Revision 1.1.1.1 1998/11/05 16:23:25 a294617 -c Initial import == gjoin 1.36 -c -C Revision 1.1.1.1 1990/11/12 14:34:44 gdsjaar -C GJOIN - X1.00.40 - 7/17/90 -C -c Revision 1.1 90/11/12 14:34:43 gdsjaar -c Initial revision -c C --*** GETALL *** (GJOIN) Get all items that match C -- Written by Amy Gilkey - revised 09/29/87 diff --git a/packages/seacas/applications/gjoin/gj_inigen.f b/packages/seacas/applications/gjoin/gj_inigen.f index 5909afd0cd51..b371ce80c99f 100644 --- a/packages/seacas/applications/gjoin/gj_inigen.f +++ b/packages/seacas/applications/gjoin/gj_inigen.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= @@ -12,7 +12,6 @@ SUBROUTINE INIGEN (A, FIRST, & KIDSS, KNESS, KNDSS, KIXESS, KIXDSS, KLTESS, kltsss, & kltsnc, KFACSS, KNMLB) C======================================================================= -C $Id: inigen.f,v 1.3 2001/06/26 17:38:54 gdsjaar Exp $ C --*** INIGEN *** (GJOIN) Initialize the memory for GENESIS database C -- Written by Amy Gilkey - revised 10/14/87 @@ -105,7 +104,6 @@ SUBROUTINE INIGEN (A, FIRST, call mdlong ('CFACNP', kcfacn, 0) ! Exo II df list array END IF - IF (FIRST) THEN CALL MDRSRV ('IDESS', KIDSS, 0) CALL MDRSRV ('NEESS', KNESS, 0) diff --git a/packages/seacas/applications/gjoin/gj_initin.f b/packages/seacas/applications/gjoin/gj_initin.f index eb101d22437d..35518c13fbb8 100644 --- a/packages/seacas/applications/gjoin/gj_initin.f +++ b/packages/seacas/applications/gjoin/gj_initin.f @@ -1,26 +1,12 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE INITIN (LIST, LLIST, IVAL) C======================================================================= -C $Id: initin.f,v 1.1 1999/01/18 19:21:22 gdsjaar Exp $ -C $Log: initin.f,v $ -C Revision 1.1 1999/01/18 19:21:22 gdsjaar -C ExodusII version of gjoin, needs testing and syncing with exodus 1 version, but is being committed to permit easier testing and modifications. This was created by Dave Fry at Goodyear -C -c Revision 1.1.1.1 1998/11/05 16:23:26 a294617 -c Initial import == gjoin 1.36 -c -C Revision 1.1.1.1 1990/11/12 14:34:52 gdsjaar -C GJOIN - X1.00.40 - 7/17/90 -C -c Revision 1.1 90/11/12 14:34:51 gdsjaar -c Initial revision -c C --*** INITIN *** (GJOIN) Initializes a list C -- Written by Amy Gilkey - revised 09/29/87 diff --git a/packages/seacas/applications/gjoin/gj_intcnt.f b/packages/seacas/applications/gjoin/gj_intcnt.f index c3e133f7aafc..1eba9641cab0 100644 --- a/packages/seacas/applications/gjoin/gj_intcnt.f +++ b/packages/seacas/applications/gjoin/gj_intcnt.f @@ -1,26 +1,12 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= INTEGER FUNCTION INTCNT (INT, LIST, LLIST) C======================================================================= -C $Id: intcnt.f,v 1.1 1999/01/18 19:21:22 gdsjaar Exp $ -C $Log: intcnt.f,v $ -C Revision 1.1 1999/01/18 19:21:22 gdsjaar -C ExodusII version of gjoin, needs testing and syncing with exodus 1 version, but is being committed to permit easier testing and modifications. This was created by Dave Fry at Goodyear -C -c Revision 1.1.1.1 1998/11/05 16:23:26 a294617 -c Initial import == gjoin 1.36 -c -C Revision 1.1.1.1 1990/11/12 14:34:54 gdsjaar -C GJOIN - X1.00.40 - 7/17/90 -C -c Revision 1.1 90/11/12 14:34:53 gdsjaar -c Initial revision -c C --*** INTCNT *** (GJOIN) Returns the number of occurrences in list C -- Written by Amy Gilkey - revised 09/29/87 diff --git a/packages/seacas/applications/gjoin/gj_irennp.f b/packages/seacas/applications/gjoin/gj_irennp.f index 384da52caa67..76760e3fc4e9 100644 --- a/packages/seacas/applications/gjoin/gj_irennp.f +++ b/packages/seacas/applications/gjoin/gj_irennp.f @@ -1,12 +1,11 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C -*- Mode: fortran -*- C======================================================================= -C $Id: irennp.f,v 1.1 1999/01/18 19:21:22 gdsjaar Exp $ SUBROUTINE IRENNP (A, NNPS1, NNPS2, IDNPS, NNNPS, & RENNP, MATNS1, MATNS2, TOLER, CLOSE, MATMAT, diff --git a/packages/seacas/applications/gjoin/gj_matxyz.f b/packages/seacas/applications/gjoin/gj_matxyz.f index a2975c482f08..8e3b6926ef86 100644 --- a/packages/seacas/applications/gjoin/gj_matxyz.f +++ b/packages/seacas/applications/gjoin/gj_matxyz.f @@ -1,12 +1,11 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C -*- Mode: fortran -*- C======================================================================= -C $Id: matxyz.f,v 1.2 2002/06/24 16:09:29 gdsjaar Exp $ SUBROUTINE MATXYZ (NDIM, & MATNS1, MATNS2, NNNPS, IXNNPS, LTNNPS, diff --git a/packages/seacas/applications/gjoin/gj_mirss.f b/packages/seacas/applications/gjoin/gj_mirss.f index 9fff6bcbf06a..cb4147f2055a 100644 --- a/packages/seacas/applications/gjoin/gj_mirss.f +++ b/packages/seacas/applications/gjoin/gj_mirss.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE MIRSS (NUMESS, LESSEL, LESSDL, IDESS, NEESS, NEDSS, @@ -44,7 +44,7 @@ SUBROUTINE MIRSS (NUMESS, LESSEL, LESSDL, IDESS, NEESS, NEDSS, C ... This routine was originally written to only handle quads, tris, and hexes. C There was no checking of this, it blindly went through the list C swapping nodes 1 and 2 (line) or nodes 4 and 2 (quad face). -C + C The routine now provides more checking and will return with a warning C if applied to elements on other faces... diff --git a/packages/seacas/applications/gjoin/gj_movint.f b/packages/seacas/applications/gjoin/gj_movint.f index 9b22b970ec2f..56ca8e81286a 100644 --- a/packages/seacas/applications/gjoin/gj_movint.f +++ b/packages/seacas/applications/gjoin/gj_movint.f @@ -1,26 +1,12 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE MOVINT (NMOV, IFROM, ITO) C======================================================================= -C $Id: movint.f,v 1.1 1999/01/18 19:21:23 gdsjaar Exp $ -C $Log: movint.f,v $ -C Revision 1.1 1999/01/18 19:21:23 gdsjaar -C ExodusII version of gjoin, needs testing and syncing with exodus 1 version, but is being committed to permit easier testing and modifications. This was created by Dave Fry at Goodyear -C -c Revision 1.1.1.1 1998/11/05 16:23:26 a294617 -c Initial import == gjoin 1.36 -c -C Revision 1.1.1.1 1990/11/12 14:35:04 gdsjaar -C GJOIN - X1.00.40 - 7/17/90 -C -c Revision 1.1 90/11/12 14:35:03 gdsjaar -c Initial revision -c C --*** MOVINT *** (GJOIN) Moves integer data C -- Written by Amy Gilkey - revised 09/29/87 diff --git a/packages/seacas/applications/gjoin/gj_movrea.f b/packages/seacas/applications/gjoin/gj_movrea.f index 5d561163ed9f..51eb718f0090 100644 --- a/packages/seacas/applications/gjoin/gj_movrea.f +++ b/packages/seacas/applications/gjoin/gj_movrea.f @@ -1,26 +1,12 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE MOVREA (NMOV, RFROM, RTO) C======================================================================= -C $Id: movrea.f,v 1.1 1999/01/18 19:21:23 gdsjaar Exp $ -C $Log: movrea.f,v $ -C Revision 1.1 1999/01/18 19:21:23 gdsjaar -C ExodusII version of gjoin, needs testing and syncing with exodus 1 version, but is being committed to permit easier testing and modifications. This was created by Dave Fry at Goodyear -C -c Revision 1.1.1.1 1998/11/05 16:23:26 a294617 -c Initial import == gjoin 1.36 -c -C Revision 1.1.1.1 1990/11/12 14:35:07 gdsjaar -C GJOIN - X1.00.40 - 7/17/90 -C -c Revision 1.1 90/11/12 14:35:06 gdsjaar -c Initial revision -c C --*** MOVREA *** (GJOIN) Moves real data C -- Written by Amy Gilkey - revised 02/22/88 diff --git a/packages/seacas/applications/gjoin/gj_munelb.f b/packages/seacas/applications/gjoin/gj_munelb.f index b40d8af77263..477fd2140bbf 100644 --- a/packages/seacas/applications/gjoin/gj_munelb.f +++ b/packages/seacas/applications/gjoin/gj_munelb.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= @@ -10,39 +10,6 @@ SUBROUTINE MUNELB (NELBLK, ISTAT, NUMEL, & LINK, ATRIB, LINKX, ATRIBX, IXEL, IXELB, NELBX, $ ISCR, NAMELB, SCRSTR, LLINK, LATRIB) C======================================================================= -C $Id: munelb.f,v 1.3 1999/03/22 15:53:00 gdsjaar Exp $ -C $Log: munelb.f,v $ -C Revision 1.3 1999/03/22 15:53:00 gdsjaar -C Fix problem with too many element blocks. GJoin has fixed size of 256 -C element blocks, but didn't check whether maximum was exceeded. -C Changed so element block names are dynamically dimensioned. -C -C Revision 1.2 1999/01/27 15:12:36 gdsjaar -C Fixed handling of element order map. For gjoin, we force a 1..numel -C map on the combined mesh. -C -C Added writing of coordinate names -C -C Fixed error handling to not overwrite error code before call to exerr -C -C Revision 1.1 1999/01/18 19:21:23 gdsjaar -C ExodusII version of gjoin, needs testing and syncing with exodus 1 version, but is being committed to permit easier testing and modifications. This was created by Dave Fry at Goodyear -C -c Revision 1.1.1.1 1998/11/05 16:23:26 a294617 -c Initial import == gjoin 1.36 -c -C Revision 1.2 1997/06/02 19:39:13 gdsjaar -C Fixed problem with link and attribute array sizes. The munelb routine -C now returns the new size of the arrays following element deletion and -C the arrays are resized using mdlong. Later calls to find the size of -C the link and attrib arrays using mdfind() now get the correct size. -C -C Revision 1.1.1.1 1990/11/12 14:35:10 gdsjaar -C GJOIN - X1.00.40 - 7/17/90 -C -c Revision 1.1 90/11/12 14:35:08 gdsjaar -c Initial revision -c C --*** MUNELB *** (GJOIN) Compress and rearrange element blocks C -- Written by Amy Gilkey - revised 09/29/87 diff --git a/packages/seacas/applications/gjoin/gj_muness.f b/packages/seacas/applications/gjoin/gj_muness.f index fa880b8b4472..f73f1c6f0eac 100644 --- a/packages/seacas/applications/gjoin/gj_muness.f +++ b/packages/seacas/applications/gjoin/gj_muness.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= @@ -10,8 +10,7 @@ SUBROUTINE MUNESS (NUMESS, ISTAT, LESSEL, LESSDL, & LTEESS, LTSSS, FACSS, & LTEX, LTSX, TDX, IXESS, IXDSS, NEX, NDX, ISCR, USESDF) C======================================================================= -C $Id: muness.f,v 1.2 2001/06/26 17:38:54 gdsjaar Exp $ -C + C --*** MUNESS *** (GJOIN) Compress and rearrange element side sets C -- Written by Amy Gilkey - revised 02/25/88 C -- diff --git a/packages/seacas/applications/gjoin/gj_munnps.f b/packages/seacas/applications/gjoin/gj_munnps.f index 3f8555db96ae..8b63fc73d9f8 100644 --- a/packages/seacas/applications/gjoin/gj_munnps.f +++ b/packages/seacas/applications/gjoin/gj_munnps.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= @@ -9,45 +9,6 @@ SUBROUTINE MUNNPS (NUMNPS, ISTAT, LNPSNL, & IDNPS, NNNPS, IXNNPS, LTNNPS, FACNPS, & LTNX, FACX, IXNPS, NNX, ISCR, NODSCR, NUMNP) C======================================================================= -C $Id: munnps.f,v 1.2 2008/07/31 20:15:56 gdsjaar Exp $ -C $Log: munnps.f,v $ -C Revision 1.2 2008/07/31 20:15:56 gdsjaar -C Change the way the nodal point node membership is calculated. For some -C reason, the locint calls used in the old method became a bottleneck on -C some compilers (runtime went from ~30 seconds to multiple hours) with -C no other changes. Recompiling the same code with 32-bit gcc gives -C short runtime; 32-bit or 64-bit intel gives long runtimes. -C -C Modified the routine to index all active nodes in a NUMNP-long array -C and then check whether a node is indexed instead of doing a locint -C call (constant time vs linear time). -C -C Revision 1.1 1999/01/18 19:21:23 gdsjaar -C ExodusII version of gjoin, needs testing and syncing with exodus 1 version, but is being committed to permit easier testing and modifications. This was created by Dave Fry at Goodyear -C -c Revision 1.1.1.1 1998/11/05 16:23:26 a294617 -c Initial import == gjoin 1.36 -c -C Revision 1.2 1997/11/18 15:55:29 gdsjaar -C Changes to improve efficiency (factor of 2 to 15 on some Goodyear Treads) -C -C Redid nodeset munching to reduce number of locint calls. First do a -C quick scan on array to get maximum node id in searched array. Then, -C before doing 'locint' call, ensure that id being searched for is less -C than maximum (most times it won't be, saves searching entire list). -C -C Modified the node matching code to also index the nodes within the -C overlap region if doing a nodeset match. This has greatest benefit if -C not all nodes in the nodeset will be matched. -C -C Minor change in offset f -- 'dimension' to 'real' -C -C Revision 1.1.1.1 1990/11/12 14:35:15 gdsjaar -C GJOIN - X1.00.40 - 7/17/90 -C -c Revision 1.1 90/11/12 14:35:14 gdsjaar -c Initial revision -c C --*** MUNNPS *** (GJOIN) Compress and rearrange nodal point sets C -- Written by Amy Gilkey - revised 02/25/88 diff --git a/packages/seacas/applications/gjoin/gj_munxyz.f b/packages/seacas/applications/gjoin/gj_munxyz.f index 90cb3f3fadfa..1b544a896f96 100644 --- a/packages/seacas/applications/gjoin/gj_munxyz.f +++ b/packages/seacas/applications/gjoin/gj_munxyz.f @@ -1,26 +1,12 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE MUNXYZ (NDIM, NUMNP2, NUMNP1, IXNP2, XN2, YN2, ZN2) C======================================================================= -C $Id: munxyz.f,v 1.1 1999/01/18 19:21:24 gdsjaar Exp $ -C $Log: munxyz.f,v $ -C Revision 1.1 1999/01/18 19:21:24 gdsjaar -C ExodusII version of gjoin, needs testing and syncing with exodus 1 version, but is being committed to permit easier testing and modifications. This was created by Dave Fry at Goodyear -C -c Revision 1.1.1.1 1998/11/05 16:23:27 a294617 -c Initial import == gjoin 1.36 -c -C Revision 1.1.1.1 1990/11/12 14:35:17 gdsjaar -C GJOIN - X1.00.40 - 7/17/90 -C -c Revision 1.1 90/11/12 14:35:16 gdsjaar -c Initial revision -c C --*** MUNXYZ *** (GJOIN) Compress coordinates from the second database C -- Written by Amy Gilkey - revised 09/29/87 diff --git a/packages/seacas/applications/gjoin/gj_offset.f b/packages/seacas/applications/gjoin/gj_offset.f index 9956902d96f7..dc268078e0ea 100644 --- a/packages/seacas/applications/gjoin/gj_offset.f +++ b/packages/seacas/applications/gjoin/gj_offset.f @@ -1,42 +1,10 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C -*- Mode: fortran -*- -C======================================================================= -C $Id: offset.f,v 1.1 1999/01/18 19:21:24 gdsjaar Exp $ -C $Log: offset.f,v $ -C Revision 1.1 1999/01/18 19:21:24 gdsjaar -C ExodusII version of gjoin, needs testing and syncing with exodus 1 version, but is being committed to permit easier testing and modifications. This was created by Dave Fry at Goodyear -C -c Revision 1.1.1.1 1998/11/05 16:23:27 a294617 -c Initial import == gjoin 1.36 -c -C Revision 1.3 1997/11/18 15:55:30 gdsjaar -C Changes to improve efficiency (factor of 2 to 15 on some Goodyear Treads) -C -C Redid nodeset munching to reduce number of locint calls. First do a -C quick scan on array to get maximum node id in searched array. Then, -C before doing 'locint' call, ensure that id being searched for is less -C than maximum (most times it won't be, saves searching entire list). -C -C Modified the node matching code to also index the nodes within the -C overlap region if doing a nodeset match. This has greatest benefit if -C not all nodes in the nodeset will be matched. -C -C Minor change in offset f -- 'dimension' to 'real' -C -C Revision 1.2 1992/09/03 20:35:02 gdsjaar -C Fixed up handling of mirror and offset - added a scale command which -C is combined with mirror, subroutine offset now does both offset and -C scale. Added help to irennp. -C -c Revision 1.1 1992/09/02 22:58:05 gdsjaar -c Added mirroring and offsetting capability to gjoin. Implemented at -c the equivalencing prompt. Only affects the second database. -c C======================================================================= subroutine offset (off, scale, crd, length) real crd(length) diff --git a/packages/seacas/applications/gjoin/gj_ordix.f b/packages/seacas/applications/gjoin/gj_ordix.f index 651e1d4734bc..e049020fcff2 100644 --- a/packages/seacas/applications/gjoin/gj_ordix.f +++ b/packages/seacas/applications/gjoin/gj_ordix.f @@ -1,26 +1,12 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE ORDIX (NORD, IXORD, LOLD, IOLD, ISCR, INEW) C======================================================================= -C $Id: ordix.f,v 1.1 1999/01/18 19:21:24 gdsjaar Exp $ -C $Log: ordix.f,v $ -C Revision 1.1 1999/01/18 19:21:24 gdsjaar -C ExodusII version of gjoin, needs testing and syncing with exodus 1 version, but is being committed to permit easier testing and modifications. This was created by Dave Fry at Goodyear -C -c Revision 1.1.1.1 1998/11/05 16:23:27 a294617 -c Initial import == gjoin 1.36 -c -C Revision 1.1.1.1 1990/11/12 14:35:22 gdsjaar -C GJOIN - X1.00.40 - 7/17/90 -C -c Revision 1.1 90/11/12 14:35:21 gdsjaar -c Initial revision -c C --*** ORDIX *** (GJOIN) Order a list according to indices C -- Written by Amy Gilkey - revised 09/29/87 diff --git a/packages/seacas/applications/gjoin/gj_ordstr.f b/packages/seacas/applications/gjoin/gj_ordstr.f index 33f57476cf98..b6c198ff55ab 100644 --- a/packages/seacas/applications/gjoin/gj_ordstr.f +++ b/packages/seacas/applications/gjoin/gj_ordstr.f @@ -1,26 +1,12 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE ORDSTR (NORD, IXORD, LOLD, IOLD, ISCR, INEW) C======================================================================= -C $Id: ordstr.f,v 1.1 1999/01/18 19:21:24 gdsjaar Exp $ -C $Log: ordstr.f,v $ -C Revision 1.1 1999/01/18 19:21:24 gdsjaar -C ExodusII version of gjoin, needs testing and syncing with exodus 1 version, but is being committed to permit easier testing and modifications. This was created by Dave Fry at Goodyear -C -c Revision 1.1.1.1 1998/11/05 16:23:27 a294617 -c Initial import == gjoin 1.36 -c -C Revision 1.1.1.1 1990/11/12 14:35:24 gdsjaar -C GJOIN - X1.00.40 - 7/17/90 -C -c Revision 1.1 90/11/12 14:35:23 gdsjaar -c Initial revision -c C --*** ORDSTR *** (GJOIN) Order a list of strings according to indices C -- Written by Greg Sjaardema - revised 07/11/90 diff --git a/packages/seacas/applications/gjoin/gj_outlog.f b/packages/seacas/applications/gjoin/gj_outlog.f index a523ec4063f3..9a5cc3cc5423 100644 --- a/packages/seacas/applications/gjoin/gj_outlog.f +++ b/packages/seacas/applications/gjoin/gj_outlog.f @@ -1,25 +1,11 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C -*- Mode: fortran -*- C======================================================================= -C $Id: outlog.f,v 1.1 1999/01/18 19:21:24 gdsjaar Exp $ -C $Log: outlog.f,v $ -C Revision 1.1 1999/01/18 19:21:24 gdsjaar -C ExodusII version of gjoin, needs testing and syncing with exodus 1 version, but is being committed to permit easier testing and modifications. This was created by Dave Fry at Goodyear -C -c Revision 1.1.1.1 1998/11/05 16:23:27 a294617 -c Initial import == gjoin 1.36 -c -C Revision 1.1.1.1 1990/11/12 14:35:27 gdsjaar -C GJOIN - X1.00.40 - 7/17/90 -C -c Revision 1.1 90/11/12 14:35:26 gdsjaar -c Initial revision -c SUBROUTINE OUTLOG (KLOG, NUMFLD, INTYP, CFIELD, IFIELD, RFIELD) C======================================================================= diff --git a/packages/seacas/applications/gjoin/gj_params.blk b/packages/seacas/applications/gjoin/gj_params.blk index 6ef97e874a8c..01b8b260dc4f 100644 --- a/packages/seacas/applications/gjoin/gj_params.blk +++ b/packages/seacas/applications/gjoin/gj_params.blk @@ -1,11 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: params.blk,v 1.2 1999/03/22 15:53:00 gdsjaar Exp $ -C C Max QA records PARAMETER (MAXQA = 1024) C Max information records diff --git a/packages/seacas/applications/gjoin/gj_progqa.blk b/packages/seacas/applications/gjoin/gj_progqa.blk index 94365583b2c2..f2861dcfaeca 100644 --- a/packages/seacas/applications/gjoin/gj_progqa.blk +++ b/packages/seacas/applications/gjoin/gj_progqa.blk @@ -1,11 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: progqa.blk,v 1.1 1999/01/18 19:21:25 gdsjaar Exp $ -C COMMON /PROGQA/ QAINFO(6) CHARACTER*32 QAINFO C --QAINFO - the current program QA information: diff --git a/packages/seacas/applications/gjoin/gj_prtelb.F b/packages/seacas/applications/gjoin/gj_prtelb.F index e5400087cbf0..f76f443ce6a6 100644 --- a/packages/seacas/applications/gjoin/gj_prtelb.F +++ b/packages/seacas/applications/gjoin/gj_prtelb.F @@ -1,46 +1,13 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE PRTELB (ISTAT, NELBL1, NELBL2, & IDELB, NUMELB, NUMLNK, NUMATR, ISCR) C======================================================================= -C $Id: prtelb.F,v 1.2 1999/03/23 15:56:43 gdsjaar Exp $ -C $Log: prtelb.F,v $ -C Revision 1.2 1999/03/23 15:56:43 gdsjaar -C Upped format fields to accommodate larger element block ids -C -C Revision 1.1 1999/01/18 19:21:25 gdsjaar -C ExodusII version of gjoin, needs testing and syncing with exodus 1 version, but is being committed to permit easier testing and modifications. This was created by Dave Fry at Goodyear -C -c Revision 1.1.1.1 1998/11/05 16:23:29 a294617 -c Initial import == gjoin 1.36 -c -C Revision 1.1 1998/04/09 05:01:59 gdsjaar -C The code which prints out the sidesets/nodesets/blocks for id -C combining/renumbering needed the needsdoubleescape if block for -C certain systems. Needed to move those routines from .f to .F -C -C Revision 1.3 1997/04/09 22:10:07 gdsjaar -C Modified the node matching code to sort the array on the coordinate -C with the largest span. Previously it was done on the x coordinate -C always. -C -C Upped the format string used for the number of elements in the prtelb, -C prtess, and prtnps output to handle large models. -C -C Revision 1.2 1993/07/23 22:34:29 gdsjaar -C Cleaned up unused variables, removed unneeded routine -C -c Revision 1.1.1.1 1990/11/12 14:35:39 gdsjaar -c GJOIN - X1.00.40 - 7/17/90 -c -c Revision 1.1 90/11/12 14:35:38 gdsjaar -c Initial revision -c C --*** PRTELB *** (GJOIN) Print summary for element blocks C -- Written by Amy Gilkey - revised 02/04/88 diff --git a/packages/seacas/applications/gjoin/gj_prtess.F b/packages/seacas/applications/gjoin/gj_prtess.F index 872dbed675f3..63f3992616fc 100644 --- a/packages/seacas/applications/gjoin/gj_prtess.F +++ b/packages/seacas/applications/gjoin/gj_prtess.F @@ -1,13 +1,12 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE PRTESS (ISTAT, NESS1, NESS2, IDESS, NEESS, ISCR) C======================================================================= -C $Id: prtess.F,v 1.2 2001/06/26 17:38:54 gdsjaar Exp $ C --*** PRTESS *** (GJOIN) Print summary for element side sets C -- Written by Amy Gilkey - revised 02/04/88 diff --git a/packages/seacas/applications/gjoin/gj_prtnps.F b/packages/seacas/applications/gjoin/gj_prtnps.F index d3815d171a61..c989d7f9c4f8 100644 --- a/packages/seacas/applications/gjoin/gj_prtnps.F +++ b/packages/seacas/applications/gjoin/gj_prtnps.F @@ -1,42 +1,12 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE PRTNPS (ISTAT, NNPS1, NNPS2, IDNPS, NNNPS, ISCR) C======================================================================= -C $Id: prtnps.F,v 1.1 1999/01/18 19:21:25 gdsjaar Exp $ -C $Log: prtnps.F,v $ -C Revision 1.1 1999/01/18 19:21:25 gdsjaar -C ExodusII version of gjoin, needs testing and syncing with exodus 1 version, but is being committed to permit easier testing and modifications. This was created by Dave Fry at Goodyear -C -c Revision 1.1.1.1 1998/11/05 16:23:29 a294617 -c Initial import == gjoin 1.36 -c -C Revision 1.1 1998/04/09 05:02:04 gdsjaar -C The code which prints out the sidesets/nodesets/blocks for id -C combining/renumbering needed the needsdoubleescape if block for -C certain systems. Needed to move those routines from .f to .F -C -C Revision 1.3 1997/04/09 22:10:09 gdsjaar -C Modified the node matching code to sort the array on the coordinate -C with the largest span. Previously it was done on the x coordinate -C always. -C -C Upped the format string used for the number of elements in the prtelb, -C prtess, and prtnps output to handle large models. -C -C Revision 1.2 1993/07/23 22:34:31 gdsjaar -C Cleaned up unused variables, removed unneeded routine -C -c Revision 1.1.1.1 1990/11/12 14:35:47 gdsjaar -c GJOIN - X1.00.40 - 7/17/90 -c -c Revision 1.1 90/11/12 14:35:46 gdsjaar -c Initial revision -c C --*** PRTNPS *** (GJOIN) Print summary for nodal point sets C -- Written by Amy Gilkey - revised 02/04/88 diff --git a/packages/seacas/applications/gjoin/gj_qainfo.blk b/packages/seacas/applications/gjoin/gj_qainfo.blk index ae5aef0b0410..edacfe484b93 100644 --- a/packages/seacas/applications/gjoin/gj_qainfo.blk +++ b/packages/seacas/applications/gjoin/gj_qainfo.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C -*- Mode: fortran -*- diff --git a/packages/seacas/applications/gjoin/gj_rdgen.f b/packages/seacas/applications/gjoin/gj_rdgen.f index 796ce09dec63..5bd89850a2d0 100644 --- a/packages/seacas/applications/gjoin/gj_rdgen.f +++ b/packages/seacas/applications/gjoin/gj_rdgen.f @@ -1,10 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: rdgen.f,v 1.14 2004/08/12 20:46:08 gdsjaar Exp $ C======================================================================= SUBROUTINE RDGEN (A, IA, C, FIRST, FILNAM, & TITLE, NDIM, NUMNP, NUMEL, NELBLK, diff --git a/packages/seacas/applications/gjoin/gj_renelb.f b/packages/seacas/applications/gjoin/gj_renelb.f index 0e775af8aed2..445d57645c05 100644 --- a/packages/seacas/applications/gjoin/gj_renelb.f +++ b/packages/seacas/applications/gjoin/gj_renelb.f @@ -1,26 +1,12 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE RENELB (NELBLK, IOFFNP, IXNP, NUMELB, NUMLNK, LINK) C======================================================================= -C $Id: renelb.f,v 1.1 1999/01/18 19:21:26 gdsjaar Exp $ -C $Log: renelb.f,v $ -C Revision 1.1 1999/01/18 19:21:26 gdsjaar -C ExodusII version of gjoin, needs testing and syncing with exodus 1 version, but is being committed to permit easier testing and modifications. This was created by Dave Fry at Goodyear -C -c Revision 1.1.1.1 1998/11/05 16:23:27 a294617 -c Initial import == gjoin 1.36 -c -C Revision 1.1.1.1 1990/11/12 14:36:00 gdsjaar -C GJOIN - X1.00.40 - 7/17/90 -C -c Revision 1.1 90/11/12 14:35:58 gdsjaar -c Initial revision -c C --*** RENELB *** (GJOIN) Renumber connectivity in element blocks C -- Written by Amy Gilkey - revised 09/29/87 diff --git a/packages/seacas/applications/gjoin/gj_renix.f b/packages/seacas/applications/gjoin/gj_renix.f index 96e2ab64248a..f46118449970 100644 --- a/packages/seacas/applications/gjoin/gj_renix.f +++ b/packages/seacas/applications/gjoin/gj_renix.f @@ -1,26 +1,12 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE RENIX (LLIST, IOFFIX, IX, LIST) C======================================================================= -C $Id: renix.f,v 1.1 1999/01/18 19:21:26 gdsjaar Exp $ -C $Log: renix.f,v $ -C Revision 1.1 1999/01/18 19:21:26 gdsjaar -C ExodusII version of gjoin, needs testing and syncing with exodus 1 version, but is being committed to permit easier testing and modifications. This was created by Dave Fry at Goodyear -C -c Revision 1.1.1.1 1998/11/05 16:23:27 a294617 -c Initial import == gjoin 1.36 -c -C Revision 1.1.1.1 1990/11/12 14:36:02 gdsjaar -C GJOIN - X1.00.40 - 7/17/90 -C -c Revision 1.1 90/11/12 14:36:01 gdsjaar -c Initial revision -c C --*** RENIX *** (GJOIN) Renumbers items according to an index list C -- Written by Amy Gilkey - revised 09/29/87 diff --git a/packages/seacas/applications/gjoin/gj_rotxyz.f b/packages/seacas/applications/gjoin/gj_rotxyz.f index 2c3b1921dd35..dd414b3073fb 100644 --- a/packages/seacas/applications/gjoin/gj_rotxyz.f +++ b/packages/seacas/applications/gjoin/gj_rotxyz.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/gjoin/gj_setitl.f b/packages/seacas/applications/gjoin/gj_setitl.f index bef456c69948..12852d63c0ef 100644 --- a/packages/seacas/applications/gjoin/gj_setitl.f +++ b/packages/seacas/applications/gjoin/gj_setitl.f @@ -1,30 +1,11 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C -*- Mode: fortran -*- C======================================================================= -C $Id: setitl.f,v 1.1 1999/01/18 19:21:26 gdsjaar Exp $ -C $Log: setitl.f,v $ -C Revision 1.1 1999/01/18 19:21:26 gdsjaar -C ExodusII version of gjoin, needs testing and syncing with exodus 1 version, but is being committed to permit easier testing and modifications. This was created by Dave Fry at Goodyear -C -c Revision 1.1.1.1 1998/11/05 16:23:28 a294617 -c Initial import == gjoin 1.36 -c -C Revision 1.2 1997/04/04 20:06:43 gdsjaar -C Better command input in setitl (TITLE submenu). It was using getinp -C instead of FREFLD, but that caused problems if the command contained -C leading spaces. Replaced to use FREFLD. -C -C Revision 1.1.1.1 1990/11/12 14:36:05 gdsjaar -C GJOIN - X1.00.40 - 7/17/90 -C -c Revision 1.1 90/11/12 14:36:03 gdsjaar -c Initial revision -c SUBROUTINE SETITL (TWODB) C======================================================================= diff --git a/packages/seacas/applications/gjoin/gj_setsta.f b/packages/seacas/applications/gjoin/gj_setsta.f index d87fc3555227..360e96994c20 100644 --- a/packages/seacas/applications/gjoin/gj_setsta.f +++ b/packages/seacas/applications/gjoin/gj_setsta.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C -*- Mode: fortran -*- @@ -129,7 +129,6 @@ SUBROUTINE SETSTA (PROMPT, ERRMSG, NITEM1, NITEM2, IDS, ISTAT, *) END IF end if - C ... Check for same ID in second set of IDs if (match .eq. 2 .or. match .eq. 3) then IF (NITEM2 .GT. 0) THEN diff --git a/packages/seacas/applications/gjoin/gj_titles.blk b/packages/seacas/applications/gjoin/gj_titles.blk index 9c6244fad417..78e82496e665 100644 --- a/packages/seacas/applications/gjoin/gj_titles.blk +++ b/packages/seacas/applications/gjoin/gj_titles.blk @@ -1,11 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: titles.blk,v 1.1 1999/01/18 19:21:26 gdsjaar Exp $ -C COMMON /TITLES/ TITLE, TITLE1, TITLE2 character*(MXLNLN) title, title1, title2 C -- title - database title (to be output) diff --git a/packages/seacas/applications/gjoin/gj_wrgen.f b/packages/seacas/applications/gjoin/gj_wrgen.f index 9c8bedb0fd18..5bcfad19a42b 100644 --- a/packages/seacas/applications/gjoin/gj_wrgen.f +++ b/packages/seacas/applications/gjoin/gj_wrgen.f @@ -1,10 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: wrgen.f,v 1.12 2006/03/20 18:38:37 gdsjaar Exp $ C======================================================================= SUBROUTINE WRGEN (A,IA, FILNAM, TITLE, NDIM, NUMNP, NUMEL, NELBLK, & NUMNPS, LNPSNL, NUMESS, LESSEL, LESSDL, @@ -159,7 +158,7 @@ SUBROUTINE WRGEN (A,IA, FILNAM, TITLE, NDIM, NUMNP, NUMEL, NELBLK, endif C --Write out the nodal point sets -C + if (numnps .gt. 0) then call expcns (idexo, ia(kidns), ia(knnns), ia(kansdf), & ia(kixnns), ia(kixnns), ia(kltnns), @@ -192,7 +191,6 @@ SUBROUTINE WRGEN (A,IA, FILNAM, TITLE, NDIM, NUMNP, NUMEL, NELBLK, goto 150 endif - ioff = katrib iptr = klink do 100 ielb = 1, nelblk diff --git a/packages/seacas/applications/gjoin/gj_xyzrot.blk b/packages/seacas/applications/gjoin/gj_xyzrot.blk index e17938c26ad4..95bf5e57d9a9 100644 --- a/packages/seacas/applications/gjoin/gj_xyzrot.blk +++ b/packages/seacas/applications/gjoin/gj_xyzrot.blk @@ -1,11 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: xyzrot.blk,v 1.1 1999/01/18 19:21:27 gdsjaar Exp $ -C COMMON /XYZROT/ ROT3D, ROTMAT(3,3), ROTCEN(3) LOGICAL ROT3D C --ROT3D - true iff 3D mesh is to be rotated diff --git a/packages/seacas/applications/gjoin/gj_zmess.f b/packages/seacas/applications/gjoin/gj_zmess.f index 969f96c662dd..ba796f6a4e7e 100644 --- a/packages/seacas/applications/gjoin/gj_zmess.f +++ b/packages/seacas/applications/gjoin/gj_zmess.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= @@ -9,7 +9,6 @@ SUBROUTINE ZMESS (NUMESS, LESSEL, LESSDL, & IDESS, NEESS, NEDSS, IXEESS, IXEDSS, LTEESS, LTSSS, LTSNC, * FAC, USESDF) C======================================================================= -C $Id: zmess.f,v 1.3 2002/01/28 19:44:47 gdsjaar Exp $ C --*** ZMESS *** (GJOIN) Compress element side sets C -- Written by Amy Gilkey - revised 01/20/88 diff --git a/packages/seacas/applications/gjoin/gj_zmfixd.f b/packages/seacas/applications/gjoin/gj_zmfixd.f index 50dc5ed0a24a..3bfcf0ed1625 100644 --- a/packages/seacas/applications/gjoin/gj_zmfixd.f +++ b/packages/seacas/applications/gjoin/gj_zmfixd.f @@ -1,26 +1,12 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE ZMFIXD (NELBLK, NUMELB, NUMLNK, LINK, NUMNP, IXNP) C======================================================================= -C $Id: zmfixd.f,v 1.1 1999/01/18 19:21:27 gdsjaar Exp $ -C $Log: zmfixd.f,v $ -C Revision 1.1 1999/01/18 19:21:27 gdsjaar -C ExodusII version of gjoin, needs testing and syncing with exodus 1 version, but is being committed to permit easier testing and modifications. This was created by Dave Fry at Goodyear -C -c Revision 1.1.1.1 1998/11/05 16:23:28 a294617 -c Initial import == gjoin 1.36 -c -C Revision 1.1.1.1 1990/11/12 14:36:24 gdsjaar -C GJOIN - X1.00.40 - 7/17/90 -C -c Revision 1.1 90/11/12 14:36:23 gdsjaar -c Initial revision -c C --*** ZMFIXD *** (GJOIN) Find nodes in element blocks C -- Written by Amy Gilkey - revised 01/20/88 diff --git a/packages/seacas/applications/gjoin/gj_zmmap.f b/packages/seacas/applications/gjoin/gj_zmmap.f index 6e1d704f7d95..588bb589ac00 100644 --- a/packages/seacas/applications/gjoin/gj_zmmap.f +++ b/packages/seacas/applications/gjoin/gj_zmmap.f @@ -1,26 +1,12 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE ZMMAP (NUMEL, MAPEL) C======================================================================= -C $Id: zmmap.f,v 1.1 1999/01/18 19:21:27 gdsjaar Exp $ -C $Log: zmmap.f,v $ -C Revision 1.1 1999/01/18 19:21:27 gdsjaar -C ExodusII version of gjoin, needs testing and syncing with exodus 1 version, but is being committed to permit easier testing and modifications. This was created by Dave Fry at Goodyear -C -c Revision 1.1.1.1 1998/11/05 16:23:28 a294617 -c Initial import == gjoin 1.36 -c -C Revision 1.1.1.1 1990/11/12 14:36:26 gdsjaar -C GJOIN - X1.00.40 - 7/17/90 -C -c Revision 1.1 90/11/12 14:36:25 gdsjaar -c Initial revision -c C --*** ZMMAP *** (GJOIN) Compress element order map C -- Written by Amy Gilkey - revised 01/20/88 diff --git a/packages/seacas/applications/gjoin/gj_zmnps.f b/packages/seacas/applications/gjoin/gj_zmnps.f index 5c79354ee229..82ba151fa382 100644 --- a/packages/seacas/applications/gjoin/gj_zmnps.f +++ b/packages/seacas/applications/gjoin/gj_zmnps.f @@ -1,27 +1,13 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE ZMNPS (NUMNPS, LNPSNL, & IDNPS, NNNPS, IXNNPS, LTNNPS, FACNPS) C======================================================================= -C $Id: zmnps.f,v 1.1 1999/01/18 19:21:27 gdsjaar Exp $ -C $Log: zmnps.f,v $ -C Revision 1.1 1999/01/18 19:21:27 gdsjaar -C ExodusII version of gjoin, needs testing and syncing with exodus 1 version, but is being committed to permit easier testing and modifications. This was created by Dave Fry at Goodyear -C -c Revision 1.1.1.1 1998/11/05 16:23:28 a294617 -c Initial import == gjoin 1.36 -c -C Revision 1.1.1.1 1990/11/12 14:36:28 gdsjaar -C GJOIN - X1.00.40 - 7/17/90 -C -c Revision 1.1 90/11/12 14:36:27 gdsjaar -c Initial revision -c C --*** ZMNPS *** (GJOIN) Compress nodal point sets C -- Written by Amy Gilkey - revised 01/20/88 diff --git a/packages/seacas/applications/gjoin/gj_zmxyz.f b/packages/seacas/applications/gjoin/gj_zmxyz.f index 35193917df9a..9d33b30fbae4 100644 --- a/packages/seacas/applications/gjoin/gj_zmxyz.f +++ b/packages/seacas/applications/gjoin/gj_zmxyz.f @@ -1,26 +1,12 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE ZMXYZ (NDIM, NUMNP, IXNP, XN, YN, ZN) C======================================================================= -C $Id: zmxyz.f,v 1.1 1999/01/18 19:21:28 gdsjaar Exp $ -C $Log: zmxyz.f,v $ -C Revision 1.1 1999/01/18 19:21:28 gdsjaar -C ExodusII version of gjoin, needs testing and syncing with exodus 1 version, but is being committed to permit easier testing and modifications. This was created by Dave Fry at Goodyear -C -c Revision 1.1.1.1 1998/11/05 16:23:28 a294617 -c Initial import == gjoin 1.36 -c -C Revision 1.1.1.1 1990/11/12 14:36:31 gdsjaar -C GJOIN - X1.00.40 - 7/17/90 -C -c Revision 1.1 90/11/12 14:36:30 gdsjaar -c Initial revision -c C --*** ZMXYZ *** (GJOIN) Compress coordinates C -- Written by Amy Gilkey - revised 01/20/88 diff --git a/packages/seacas/applications/gjoin/gjoin.f b/packages/seacas/applications/gjoin/gjoin.f index 8229b08f4651..b8af0eb0f59a 100644 --- a/packages/seacas/applications/gjoin/gjoin.f +++ b/packages/seacas/applications/gjoin/gjoin.f @@ -1,13 +1,11 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C -*- Mode: fortran -*- C======================================================================= -C $Id: gjoin2.f,v 1.10 2008/07/31 20:15:56 gdsjaar Exp $ -c PROGRAM GJOIN2 C======================================================================= @@ -25,7 +23,7 @@ PROGRAM GJOIN2 C --Output: C -- o Prompts on the standard output device. C -- o The output database (name requested) -C + C --Developed at Sandia National Laboratories. C -- C --Current author and code sponsor: Greg Sjaardema @@ -184,7 +182,6 @@ PROGRAM GJOIN2 CALL OUTLOG (KLOG, 1, 0, FILNAM, IDUM, RDUM) TWODB = (FILNAM .NE. ' ') - IF (TWODB) THEN CALL RDGEN (A, IA, C, .TRUE., FILNAM, & TITLE2, NDIM2, NUMNP2, NUMEL2, NELBL2, @@ -274,7 +271,6 @@ PROGRAM GJOIN2 zscl = 1.0 end if - IF (XSCL * YSCL * ZSCL .LT. 0.0) THEN kidel2 = kidelb + nelbl1 knelb2 = knelb + nelbl1 @@ -694,7 +690,6 @@ PROGRAM GJOIN2 FILNAM = '%gjoin' END IF - CALL WRGEN (A, A, FILNAM, TITLE, NDIM, NEWNP, NEWEL, NEWELB, & NEWNPS, NEWNNL, NEWESS, NEWSEL, NEWSDL, & KXN, KYN, KZN, KMAPEL, diff --git a/packages/seacas/applications/grepos/gp_attrot.blk b/packages/seacas/applications/grepos/gp_attrot.blk index 02ac374b102b..8bbaf8d3f2a2 100644 --- a/packages/seacas/applications/grepos/gp_attrot.blk +++ b/packages/seacas/applications/grepos/gp_attrot.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C -*- Mode: fortran -*- diff --git a/packages/seacas/applications/grepos/gp_centroid.f b/packages/seacas/applications/grepos/gp_centroid.f index 0d93ab79a7a0..dc6f28e7e586 100644 --- a/packages/seacas/applications/grepos/gp_centroid.f +++ b/packages/seacas/applications/grepos/gp_centroid.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details subroutine centroid(x, y , z, xcent, ycent, zcent, * nelblk, numelb, numlnk, link, ndim) @@ -24,7 +24,6 @@ subroutine centroid(x, y , z, xcent, ycent, zcent, RETURN END - subroutine cent1(x, y, z, xcent, ycent, zcent, * numelb, numlnk, link, ndim) diff --git a/packages/seacas/applications/grepos/gp_chkss.f b/packages/seacas/applications/grepos/gp_chkss.f index 05e82c39ce46..ff211a993a49 100644 --- a/packages/seacas/applications/grepos/gp_chkss.f +++ b/packages/seacas/applications/grepos/gp_chkss.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details subroutine chkss(nelblk, numelb, iblock) diff --git a/packages/seacas/applications/grepos/gp_cmdsho.blk b/packages/seacas/applications/grepos/gp_cmdsho.blk index 31d109936626..3258a5a0586a 100644 --- a/packages/seacas/applications/grepos/gp_cmdsho.blk +++ b/packages/seacas/applications/grepos/gp_cmdsho.blk @@ -1,11 +1,10 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C -*- Mode: fortran -*- -C $Id: cmdsho.blk,v 1.1 1999/01/18 19:18:22 gdsjaar Exp $ COMMON /CMDSHO/ CPOINT LOGICAL CPOINT diff --git a/packages/seacas/applications/grepos/gp_comand.F b/packages/seacas/applications/grepos/gp_comand.F index b5064fa689ae..95aca9900616 100644 --- a/packages/seacas/applications/grepos/gp_comand.F +++ b/packages/seacas/applications/grepos/gp_comand.F @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C -*- Mode: fortran -*- @@ -349,14 +349,14 @@ SUBROUTINE COMAND (NDBIN, EXECUT, ELSE IF (VERB .EQ. 'ADJUST') THEN C... ADJUST {CENTER|MINIMUM|MAXIMUM} {X|Y|Z} adjustment C... ADJUST {MINIMUM|MAXIMUM} {X|Y|Z} adjustment -C + C... Calculate offset such that the value in the generated mesh C (ignoring any other offsets, scales, or rotations) C will equal the input value. -C + C...EXAMPLE:adjust maximum x 10 C will set the maximum x in the generated mesh equal to 10. -C + 140 CONTINUE IF (FFEXST (IFLD, INTYP)) THEN CALL FFCHAR (IFLD, INTYP, CFIELD, ' ', WORD) @@ -600,7 +600,7 @@ SUBROUTINE COMAND (NDBIN, EXECUT, C ... Setup the scale and echo to the user CALL SCLATR(NELBLK, IDELB, NUMATR, IDATR, DOALLA, * IDBLK, DOALLB, ASCALE, ATRSCL, .TRUE., .TRUE.) -C + ELSE IF (MATSTR(WORD, 'BLOCK', 1)) THEN DO 220 IBLK = 1, NELBLK CALL INTSTR (1, 0, IDELB(IBLK), WORD, LW) diff --git a/packages/seacas/applications/grepos/gp_combine.blk b/packages/seacas/applications/grepos/gp_combine.blk index eebe7465ecc5..2816bc0399c8 100644 --- a/packages/seacas/applications/grepos/gp_combine.blk +++ b/packages/seacas/applications/grepos/gp_combine.blk @@ -1,11 +1,10 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C -*- Mode: fortran -*- -C $Id: combine.blk,v 1.1 1999/01/18 19:18:22 gdsjaar Exp $ common /combine/ equiv, eqtoler logical equiv real eqtoler diff --git a/packages/seacas/applications/grepos/gp_comid.f b/packages/seacas/applications/grepos/gp_comid.f index a7c7cca0a6b0..df7616de8fcb 100644 --- a/packages/seacas/applications/grepos/gp_comid.f +++ b/packages/seacas/applications/grepos/gp_comid.f @@ -1,13 +1,13 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE COMID (TYPE, IDLST, ISTAT, NUMID, IDFINAL, ID) C======================================================================= -C + C -- ISTAT - IN/OUT - the status of each item C -- 0 = same C -- - = delete diff --git a/packages/seacas/applications/grepos/gp_dbase.blk b/packages/seacas/applications/grepos/gp_dbase.blk index 2c5511002e76..47bb0d88fd5d 100644 --- a/packages/seacas/applications/grepos/gp_dbase.blk +++ b/packages/seacas/applications/grepos/gp_dbase.blk @@ -1,11 +1,10 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C -*- Mode: fortran -*- -C $Id: dbase.blk,v 1.1 1999/01/18 19:18:23 gdsjaar Exp $ COMMON /DBASE/ NDBIN, NDBOUT C --NDBIN - the channel number of the input database diff --git a/packages/seacas/applications/grepos/gp_dbieb1.f b/packages/seacas/applications/grepos/gp_dbieb1.f index 52a99e205187..1f54de0e4680 100644 --- a/packages/seacas/applications/grepos/gp_dbieb1.f +++ b/packages/seacas/applications/grepos/gp_dbieb1.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/grepos/gp_dbielb.f b/packages/seacas/applications/grepos/gp_dbielb.f index 3a10e4a44b4c..7c4447f9f528 100644 --- a/packages/seacas/applications/grepos/gp_dbielb.f +++ b/packages/seacas/applications/grepos/gp_dbielb.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= @@ -84,7 +84,6 @@ SUBROUTINE DBIELB (NDB, OPTION, NELBS, NELBE, IDELB, NUMELB, IF (NERR .GT. 0) GOTO 110 END IF - IELNK = IESAV IEATR = IASAV ISATR = 0 diff --git a/packages/seacas/applications/grepos/gp_dbinam.f b/packages/seacas/applications/grepos/gp_dbinam.f index 9c211b70dfc2..bba5e6af930e 100644 --- a/packages/seacas/applications/grepos/gp_dbinam.f +++ b/packages/seacas/applications/grepos/gp_dbinam.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/grepos/gp_dbinm1.f b/packages/seacas/applications/grepos/gp_dbinm1.f index eb31c676e56a..48c8fe63d176 100644 --- a/packages/seacas/applications/grepos/gp_dbinm1.f +++ b/packages/seacas/applications/grepos/gp_dbinm1.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/grepos/gp_dbist1.f b/packages/seacas/applications/grepos/gp_dbist1.f index 05cfb22e732d..1fd8ebac563b 100644 --- a/packages/seacas/applications/grepos/gp_dbist1.f +++ b/packages/seacas/applications/grepos/gp_dbist1.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/grepos/gp_dbist2.f b/packages/seacas/applications/grepos/gp_dbist2.f index 49b2962d96af..eeb4cd2cabb7 100644 --- a/packages/seacas/applications/grepos/gp_dbist2.f +++ b/packages/seacas/applications/grepos/gp_dbist2.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/grepos/gp_dbiste.f b/packages/seacas/applications/grepos/gp_dbiste.f index d30b09d8ab82..a8b48159d0d8 100644 --- a/packages/seacas/applications/grepos/gp_dbiste.f +++ b/packages/seacas/applications/grepos/gp_dbiste.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/grepos/gp_dbmir1.f b/packages/seacas/applications/grepos/gp_dbmir1.f index f4aebb16c2c6..428ee62919c5 100644 --- a/packages/seacas/applications/grepos/gp_dbmir1.f +++ b/packages/seacas/applications/grepos/gp_dbmir1.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/grepos/gp_dbmirr.f b/packages/seacas/applications/grepos/gp_dbmirr.f index e9ec455e5c59..5f7bbfd50fd9 100644 --- a/packages/seacas/applications/grepos/gp_dbmirr.f +++ b/packages/seacas/applications/grepos/gp_dbmirr.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/grepos/gp_dbnums.blk b/packages/seacas/applications/grepos/gp_dbnums.blk index 138e925bc1d3..a886133dc220 100644 --- a/packages/seacas/applications/grepos/gp_dbnums.blk +++ b/packages/seacas/applications/grepos/gp_dbnums.blk @@ -1,11 +1,10 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C -*- Mode: fortran -*- -C $Id: dbnums.blk,v 1.1 1999/01/18 19:18:24 gdsjaar Exp $ COMMON /DBNUMS/ NDIM, NUMNP, NUMEL, NELBLK, & NUMNPS, LNPSNL, NUMESS, LESSEL, LESSNL, LESSDF diff --git a/packages/seacas/applications/grepos/gp_dboelb.f b/packages/seacas/applications/grepos/gp_dboelb.f index d18a40cda485..c1f8a67b1b08 100644 --- a/packages/seacas/applications/grepos/gp_dboelb.f +++ b/packages/seacas/applications/grepos/gp_dboelb.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= @@ -36,7 +36,6 @@ SUBROUTINE DBOELB (NDB, NELBS, NELBE, REAL ATRIB(*) CHARACTER*(mxstln) BLKTYP(*) - IELNK = 0 IEATR = 0 diff --git a/packages/seacas/applications/grepos/gp_dbonam.f b/packages/seacas/applications/grepos/gp_dbonam.f index 04671b8ad05f..b8025db74846 100644 --- a/packages/seacas/applications/grepos/gp_dbonam.f +++ b/packages/seacas/applications/grepos/gp_dbonam.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/grepos/gp_dboqa.f b/packages/seacas/applications/grepos/gp_dboqa.f index fb78029a93e5..231d1af3e9e2 100644 --- a/packages/seacas/applications/grepos/gp_dboqa.f +++ b/packages/seacas/applications/grepos/gp_dboqa.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/grepos/gp_dboste.f b/packages/seacas/applications/grepos/gp_dboste.f index a315f5bc317b..76deed671eb0 100644 --- a/packages/seacas/applications/grepos/gp_dboste.f +++ b/packages/seacas/applications/grepos/gp_dboste.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/grepos/gp_dbpelb.f b/packages/seacas/applications/grepos/gp_dbpelb.f index 4b0271d68874..ce304da38c0f 100644 --- a/packages/seacas/applications/grepos/gp_dbpelb.f +++ b/packages/seacas/applications/grepos/gp_dbpelb.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/grepos/gp_dbpini.f b/packages/seacas/applications/grepos/gp_dbpini.f index 4a2ded9ccddf..4568ba711f3d 100644 --- a/packages/seacas/applications/grepos/gp_dbpini.f +++ b/packages/seacas/applications/grepos/gp_dbpini.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= @@ -51,7 +51,6 @@ SUBROUTINE DBPINI (OPTION, NDB, TITLE, NDIM, NUMNP, NUMEL, NELBLK, LOGICAL ALL ALL = (OPTION .EQ. '*') - IF (ALL .OR. (INDEX (OPTION, 'I') .GT. 0)) THEN WRITE(*, 10000) ENDIF diff --git a/packages/seacas/applications/grepos/gp_dbtitl.blk b/packages/seacas/applications/grepos/gp_dbtitl.blk index 6766961b63d7..32e8b55b2327 100644 --- a/packages/seacas/applications/grepos/gp_dbtitl.blk +++ b/packages/seacas/applications/grepos/gp_dbtitl.blk @@ -1,11 +1,10 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C -*- Mode: fortran -*- -C $Id: dbtitl.blk,v 1.1 1999/01/18 19:18:26 gdsjaar Exp $ COMMON /DBTITL/ TITLE CHARACTER*(80) TITLE diff --git a/packages/seacas/applications/grepos/gp_deform.blk b/packages/seacas/applications/grepos/gp_deform.blk index 3d75962b9ee9..e2bb81877a9f 100644 --- a/packages/seacas/applications/grepos/gp_deform.blk +++ b/packages/seacas/applications/grepos/gp_deform.blk @@ -1,6 +1,6 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /DFRM/ IDEFST diff --git a/packages/seacas/applications/grepos/gp_deform.f b/packages/seacas/applications/grepos/gp_deform.f index 7d626387ebe7..4adb90eb5889 100644 --- a/packages/seacas/applications/grepos/gp_deform.f +++ b/packages/seacas/applications/grepos/gp_deform.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details subroutine deform(x, y, z, numnp, ndim, dx, dy, dz, ndb, idefst) diff --git a/packages/seacas/applications/grepos/gp_delid.f b/packages/seacas/applications/grepos/gp_delid.f index bcf2a87f45be..220b812115ef 100644 --- a/packages/seacas/applications/grepos/gp_delid.f +++ b/packages/seacas/applications/grepos/gp_delid.f @@ -1,13 +1,13 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE DELID (TYPE, IDLST, ISTAT, NUMID, ID, DODEL) C======================================================================= -C + C -- ISTAT - IN/OUT - the status of each item C -- 0 = same C -- - = delete diff --git a/packages/seacas/applications/grepos/gp_dobnd.f b/packages/seacas/applications/grepos/gp_dobnd.f index 558740570722..0a3c3786b969 100644 --- a/packages/seacas/applications/grepos/gp_dobnd.f +++ b/packages/seacas/applications/grepos/gp_dobnd.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/grepos/gp_donrm2.f b/packages/seacas/applications/grepos/gp_donrm2.f index b1dae4a2787e..01779eeef4cd 100644 --- a/packages/seacas/applications/grepos/gp_donrm2.f +++ b/packages/seacas/applications/grepos/gp_donrm2.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= @@ -13,7 +13,7 @@ SUBROUTINE DONRM2 (NODES, ISBND, COSIN, NUMEL, LINK, X, Y, REAL X(*), Y(*), COSIN(2,*) INTEGER LINK(NLINK, *) parameter (tol = 1.0e-6) -C + do 10 inod = 1, numnp nodes(inod) = 0 10 continue @@ -34,14 +34,14 @@ SUBROUTINE DONRM2 (NODES, ISBND, COSIN, NUMEL, LINK, X, Y, XI = x( link(ISEG,iel) ) YI = y( link(ISEG,iel) ) -C + XJ = x( link(ISEGp1,iel) ) YJ = y( link(isegp1,iel) ) -C + DX = XI - XJ DY = YI - YJ RMAG = SQRT ( DX**2 + DY**2) -C + cosin(1, link(iseg, iel)) = cosin(1, link(iseg, iel)) - $ dy / rmag cosin(2, link(iseg, iel)) = cosin(2, link(iseg, iel)) + @@ -54,7 +54,6 @@ SUBROUTINE DONRM2 (NODES, ISBND, COSIN, NUMEL, LINK, X, Y, 50 continue 60 continue -C do 70 inod = 1, numnp if (nodes(inod) .ne. 0) then if (abs(cosin(1, inod)) .gt. tol .or. diff --git a/packages/seacas/applications/grepos/gp_donrm3.f b/packages/seacas/applications/grepos/gp_donrm3.f index f6004e1ad843..08961cda0356 100644 --- a/packages/seacas/applications/grepos/gp_donrm3.f +++ b/packages/seacas/applications/grepos/gp_donrm3.f @@ -1,13 +1,13 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C 1 - 12x15 2 - 26x21 3 - 37x32 4 - 48x43 C - 14x12 - 23x26 - 34x37 - 41x48 C - 15x14 - 21x23 - 32x34 - 43x41 -C + C 5 - 51x56 6 - 62x67 7 - 73x78 8 - 84x85 C - 58x51 - 65x62 - 76x73 - 87x84 C - 56x58 - 67x65 - 78x76 - 85x87 @@ -43,16 +43,16 @@ SUBROUTINE DONRM3 (NODES, ISBND, COSIN, NUMEL, LINK, X, Y, Z, XI = x( link(ISEG,iel) ) YI = y( link(ISEG,iel) ) ZI = z( link(ISEG,iel) ) -C + do 40 ino = 1, 3 XJ = x( link(map(ino,iseg,1),iel) ) - xi YJ = y( link(map(ino,iseg,1),iel) ) - yi ZJ = z( link(map(ino,iseg,1),iel) ) - zi -C + XK = x( link(map(ino,iseg,2),iel) ) - xi YK = y( link(map(ino,iseg,2),iel) ) - yi ZK = z( link(map(ino,iseg,2),iel) ) - zi -C + ax = yj * zk - zj * yk ay = zj * xk - xj * zk az = xj * yk - yj * xk @@ -69,7 +69,6 @@ SUBROUTINE DONRM3 (NODES, ISBND, COSIN, NUMEL, LINK, X, Y, Z, 50 continue 60 continue -C do 70 inod = 1, numnp if (nodes(inod) .ne. 0) then if ( abs(cosin(1, inod)) .gt. tol .or. diff --git a/packages/seacas/applications/grepos/gp_elementize.f b/packages/seacas/applications/grepos/gp_elementize.f index db0fc3176bb7..72a1e57a62d2 100644 --- a/packages/seacas/applications/grepos/gp_elementize.f +++ b/packages/seacas/applications/grepos/gp_elementize.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details subroutine elementize(var_nod, var_el, * nelblk, numelb, numlnk, link) @@ -23,7 +23,6 @@ subroutine elementize(var_nod, var_el, RETURN END - subroutine elemtz1(var_nod, var_el, numelb, numlnk, link) real var_nod(*) diff --git a/packages/seacas/applications/grepos/gp_exfcon.f b/packages/seacas/applications/grepos/gp_exfcon.f index 54ae7a11f5bb..cb8b8c46197c 100644 --- a/packages/seacas/applications/grepos/gp_exfcon.f +++ b/packages/seacas/applications/grepos/gp_exfcon.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/grepos/gp_expxyz.f b/packages/seacas/applications/grepos/gp_expxyz.f index c036b012e2a8..bc159329ce5a 100644 --- a/packages/seacas/applications/grepos/gp_expxyz.f +++ b/packages/seacas/applications/grepos/gp_expxyz.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/grepos/gp_expxyzn.f b/packages/seacas/applications/grepos/gp_expxyzn.f index 850d95496a7d..7804216702ba 100644 --- a/packages/seacas/applications/grepos/gp_expxyzn.f +++ b/packages/seacas/applications/grepos/gp_expxyzn.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/grepos/gp_getall.f b/packages/seacas/applications/grepos/gp_getall.f index 9eea6c8dced7..9c8835d339db 100644 --- a/packages/seacas/applications/grepos/gp_getall.f +++ b/packages/seacas/applications/grepos/gp_getall.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/grepos/gp_getattnam.f b/packages/seacas/applications/grepos/gp_getattnam.f index abc52ec56acd..aa7d1276850f 100644 --- a/packages/seacas/applications/grepos/gp_getattnam.f +++ b/packages/seacas/applications/grepos/gp_getattnam.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details subroutine getattnam(ndb, nelblk, id, numatr, names) include 'gp_namlen.blk' diff --git a/packages/seacas/applications/grepos/gp_getspl.f b/packages/seacas/applications/grepos/gp_getspl.f index bf29bfb728c8..84b0b38707d9 100644 --- a/packages/seacas/applications/grepos/gp_getspl.f +++ b/packages/seacas/applications/grepos/gp_getspl.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/grepos/gp_getss.f b/packages/seacas/applications/grepos/gp_getss.f index 585a5753ee77..53d03405c638 100644 --- a/packages/seacas/applications/grepos/gp_getss.f +++ b/packages/seacas/applications/grepos/gp_getss.f @@ -1,14 +1,13 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details subroutine getss(ndbin, numess, idess, neess, ndess, ixeess, * ixdess, lteess, ltsess, ltssnc, kfacss, a, allone, lessdf, * *) - integer idess(*), neess(*), ndess(*), ixeess(*), ixdess(*) integer lteess(*), ltsess(*) integer ltssnc(*) diff --git a/packages/seacas/applications/grepos/gp_hunt.f b/packages/seacas/applications/grepos/gp_hunt.f index 1b06ad33893e..905539b0eb45 100644 --- a/packages/seacas/applications/grepos/gp_hunt.f +++ b/packages/seacas/applications/grepos/gp_hunt.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/grepos/gp_incid.f b/packages/seacas/applications/grepos/gp_incid.f index aca76ebabefb..83b1bca84c67 100644 --- a/packages/seacas/applications/grepos/gp_incid.f +++ b/packages/seacas/applications/grepos/gp_incid.f @@ -1,13 +1,13 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE INCID (TYPE, IDLST, NUMID, IDINC) C======================================================================= -C + CHARACTER*(*) TYPE INTEGER IDLST(*) CHARACTER*80 STRING diff --git a/packages/seacas/applications/grepos/gp_intcnt.f b/packages/seacas/applications/grepos/gp_intcnt.f index 04ee4c166119..1eba9641cab0 100644 --- a/packages/seacas/applications/grepos/gp_intcnt.f +++ b/packages/seacas/applications/grepos/gp_intcnt.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/grepos/gp_limits.f b/packages/seacas/applications/grepos/gp_limits.f index dccaf3b2d170..0d0c3d264473 100644 --- a/packages/seacas/applications/grepos/gp_limits.f +++ b/packages/seacas/applications/grepos/gp_limits.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/grepos/gp_mapev.f b/packages/seacas/applications/grepos/gp_mapev.f index 66baf553803d..af74de7fc072 100644 --- a/packages/seacas/applications/grepos/gp_mapev.f +++ b/packages/seacas/applications/grepos/gp_mapev.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= @@ -22,7 +22,6 @@ subroutine mapev(nold, nnew, nvar, map, vars, scr) C on output in new order C -- SCR - TMP - temporary storage area - integer map(*) real vars(*) c real vars(nold, nvar) diff --git a/packages/seacas/applications/grepos/gp_mapvar.f b/packages/seacas/applications/grepos/gp_mapvar.f index f432d918757b..4f35ceda77a8 100644 --- a/packages/seacas/applications/grepos/gp_mapvar.f +++ b/packages/seacas/applications/grepos/gp_mapvar.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= @@ -22,7 +22,6 @@ subroutine mapvar(nold, nnew, nvar, map, vars, scr) C on output in new order C -- SCR - TMP - temporary storage area - integer map(*) real vars(*) c real vars(nold, nvar) diff --git a/packages/seacas/applications/grepos/gp_matxyz.f b/packages/seacas/applications/grepos/gp_matxyz.f index dd667c56052e..5650f36da771 100644 --- a/packages/seacas/applications/grepos/gp_matxyz.f +++ b/packages/seacas/applications/grepos/gp_matxyz.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/grepos/gp_mirss.f b/packages/seacas/applications/grepos/gp_mirss.f index f16c584c2a20..7ada8a655926 100644 --- a/packages/seacas/applications/grepos/gp_mirss.f +++ b/packages/seacas/applications/grepos/gp_mirss.f @@ -1,15 +1,13 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -c C======================================================================= SUBROUTINE MIRSS (IDESS, NEESS, IXEESS, LTEESS, LTSSS, $ IBLOCK, BLKTYP, ALLONE, COMTOP) C======================================================================= -C $Id: mirss.f,v 1.4 2006/02/14 16:00:58 gdsjaar Exp $ C --*** MIRSS *** (GJOIN) Mirror element side sets C -- Written by Greg Sjaardema diff --git a/packages/seacas/applications/grepos/gp_move.f b/packages/seacas/applications/grepos/gp_move.f index 20261ec61054..1d4fe4b706f3 100644 --- a/packages/seacas/applications/grepos/gp_move.f +++ b/packages/seacas/applications/grepos/gp_move.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/grepos/gp_movint.f b/packages/seacas/applications/grepos/gp_movint.f index dbd7c4a693b4..56ca8e81286a 100644 --- a/packages/seacas/applications/grepos/gp_movint.f +++ b/packages/seacas/applications/grepos/gp_movint.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/grepos/gp_movnd2.f b/packages/seacas/applications/grepos/gp_movnd2.f index e05ec5c0d337..b10b29d50b78 100644 --- a/packages/seacas/applications/grepos/gp_movnd2.f +++ b/packages/seacas/applications/grepos/gp_movnd2.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/grepos/gp_movnod.f b/packages/seacas/applications/grepos/gp_movnod.f index b879af625d4b..6148b5282581 100644 --- a/packages/seacas/applications/grepos/gp_movnod.f +++ b/packages/seacas/applications/grepos/gp_movnod.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/grepos/gp_movrea.f b/packages/seacas/applications/grepos/gp_movrea.f index 6e08b2d17316..51eb718f0090 100644 --- a/packages/seacas/applications/grepos/gp_movrea.f +++ b/packages/seacas/applications/grepos/gp_movrea.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/grepos/gp_munelb.f b/packages/seacas/applications/grepos/gp_munelb.f index 3d104c59ce69..76e20a8b8377 100644 --- a/packages/seacas/applications/grepos/gp_munelb.f +++ b/packages/seacas/applications/grepos/gp_munelb.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/grepos/gp_muness.f b/packages/seacas/applications/grepos/gp_muness.f index 0b77daf3eb13..f0afeb10acaf 100644 --- a/packages/seacas/applications/grepos/gp_muness.f +++ b/packages/seacas/applications/grepos/gp_muness.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= @@ -11,8 +11,7 @@ SUBROUTINE MUNESS (NUMESS, ISTAT, LESSEL, LESSDL, & LTEX, LTSX, TDX, IXESS, IXDSS, NEX, NDX, ISCR, * NAMSCR, NAME) C======================================================================= -C $Id: muness.f,v 1.2 2005/02/07 17:39:05 gdsjaar Exp $ -C + C --*** MUNESS *** (GJOIN) Compress and rearrange element side sets C -- Written by Amy Gilkey - revised 02/25/88 C -- diff --git a/packages/seacas/applications/grepos/gp_munnps.f b/packages/seacas/applications/grepos/gp_munnps.f index 5609ca32b79b..e901f43bfc6f 100644 --- a/packages/seacas/applications/grepos/gp_munnps.f +++ b/packages/seacas/applications/grepos/gp_munnps.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/grepos/gp_muntt.f b/packages/seacas/applications/grepos/gp_muntt.f index e9076e927f1f..1db462c3568f 100644 --- a/packages/seacas/applications/grepos/gp_muntt.f +++ b/packages/seacas/applications/grepos/gp_muntt.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details c======================================================================= diff --git a/packages/seacas/applications/grepos/gp_namlen.blk b/packages/seacas/applications/grepos/gp_namlen.blk index b1f97ebfda2a..06615c4ced39 100644 --- a/packages/seacas/applications/grepos/gp_namlen.blk +++ b/packages/seacas/applications/grepos/gp_namlen.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C -*- Mode: fortran -*- diff --git a/packages/seacas/applications/grepos/gp_newatr.f b/packages/seacas/applications/grepos/gp_newatr.f index 7d56bed8f2d0..032fd04223b9 100644 --- a/packages/seacas/applications/grepos/gp_newatr.f +++ b/packages/seacas/applications/grepos/gp_newatr.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/grepos/gp_newatt.f b/packages/seacas/applications/grepos/gp_newatt.f index d64bf1ea59d0..cdaf4f56ca58 100644 --- a/packages/seacas/applications/grepos/gp_newatt.f +++ b/packages/seacas/applications/grepos/gp_newatt.f @@ -1,13 +1,13 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE NEWATT (IDLST, ID, NUM, IDATT, NUMATR, ATTNAM, NEWNAM) C======================================================================= -C + include 'gp_namlen.blk' INTEGER IDLST(*) INTEGER NUMATR(*) diff --git a/packages/seacas/applications/grepos/gp_newid.f b/packages/seacas/applications/grepos/gp_newid.f index ba380f966eaa..6f15a061cbbe 100644 --- a/packages/seacas/applications/grepos/gp_newid.f +++ b/packages/seacas/applications/grepos/gp_newid.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/grepos/gp_newnam.f b/packages/seacas/applications/grepos/gp_newnam.f index 69b03c6174b2..03ea83d8315d 100644 --- a/packages/seacas/applications/grepos/gp_newnam.f +++ b/packages/seacas/applications/grepos/gp_newnam.f @@ -1,13 +1,13 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE NEWNAM (TYPE, IDLST, NAMLST, NUMID, ID, NEWSTR) C======================================================================= -C + CHARACTER*(*) TYPE DIMENSION IDLST(*) CHARACTER*(*) NAMLST(NUMID), NEWSTR diff --git a/packages/seacas/applications/grepos/gp_newxyz.f b/packages/seacas/applications/grepos/gp_newxyz.f index e0a7181cbc34..0b8d52afe10d 100644 --- a/packages/seacas/applications/grepos/gp_newxyz.f +++ b/packages/seacas/applications/grepos/gp_newxyz.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/grepos/gp_nsset.blk b/packages/seacas/applications/grepos/gp_nsset.blk index 8deac31bd98c..fd97301f5dc6 100644 --- a/packages/seacas/applications/grepos/gp_nsset.blk +++ b/packages/seacas/applications/grepos/gp_nsset.blk @@ -1,11 +1,10 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C -*- Mode: fortran -*- -C $Id: nsset.blk,v 1.2 2005/02/07 17:39:05 gdsjaar Exp $ COMMON /NSSET/ KIDNS, KNNNS, KIXNNS, KLTNNS, KFACNS, & KIDSS, KNESS, KNDSS, KIXESS, KIXDSS, KLTESS, diff --git a/packages/seacas/applications/grepos/gp_ordix.f b/packages/seacas/applications/grepos/gp_ordix.f index 7876ad28e5fc..e049020fcff2 100644 --- a/packages/seacas/applications/grepos/gp_ordix.f +++ b/packages/seacas/applications/grepos/gp_ordix.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/grepos/gp_ordstr.f b/packages/seacas/applications/grepos/gp_ordstr.f index 2d2647f41c66..d31d32018e13 100644 --- a/packages/seacas/applications/grepos/gp_ordstr.f +++ b/packages/seacas/applications/grepos/gp_ordstr.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/grepos/gp_params.blk b/packages/seacas/applications/grepos/gp_params.blk index deed1e9d6422..34f19f10fb6e 100644 --- a/packages/seacas/applications/grepos/gp_params.blk +++ b/packages/seacas/applications/grepos/gp_params.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details PARAMETER (MXSTLN=32) PARAMETER (MXLNLN=80) diff --git a/packages/seacas/applications/grepos/gp_progqa.blk b/packages/seacas/applications/grepos/gp_progqa.blk index 6fd3a173d377..6261fdaaa0cc 100644 --- a/packages/seacas/applications/grepos/gp_progqa.blk +++ b/packages/seacas/applications/grepos/gp_progqa.blk @@ -1,11 +1,10 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C -*- Mode: fortran -*- -C $Id: progqa.blk,v 1.1 1999/01/18 19:18:32 gdsjaar Exp $ COMMON /PROGQA/ QAINFO(6) CHARACTER*(mxstln) QAINFO diff --git a/packages/seacas/applications/grepos/gp_putss.f b/packages/seacas/applications/grepos/gp_putss.f index 9f528528bac0..4211971cbe30 100644 --- a/packages/seacas/applications/grepos/gp_putss.f +++ b/packages/seacas/applications/grepos/gp_putss.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details subroutine putss(ndbout, numess, idess, neess, ndess, ixeess, * ixdess, lteess, ltsess, facess, *) diff --git a/packages/seacas/applications/grepos/gp_qainfo.blk b/packages/seacas/applications/grepos/gp_qainfo.blk index 82cc05c03719..4e9ea94fe2c7 100644 --- a/packages/seacas/applications/grepos/gp_qainfo.blk +++ b/packages/seacas/applications/grepos/gp_qainfo.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C -*- Mode: fortran -*- diff --git a/packages/seacas/applications/grepos/gp_rdspln.f b/packages/seacas/applications/grepos/gp_rdspln.f index 9d2073cdd961..b491d68f8c6d 100644 --- a/packages/seacas/applications/grepos/gp_rdspln.f +++ b/packages/seacas/applications/grepos/gp_rdspln.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/grepos/gp_refnd1.f b/packages/seacas/applications/grepos/gp_refnd1.f index 5737871a3667..d719152a09b6 100644 --- a/packages/seacas/applications/grepos/gp_refnd1.f +++ b/packages/seacas/applications/grepos/gp_refnd1.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/grepos/gp_refnod.f b/packages/seacas/applications/grepos/gp_refnod.f index 26537f612988..42f66b5f93f8 100644 --- a/packages/seacas/applications/grepos/gp_refnod.f +++ b/packages/seacas/applications/grepos/gp_refnod.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/grepos/gp_remap.f b/packages/seacas/applications/grepos/gp_remap.f index c1bc4b0c80b3..af0cc6be6517 100644 --- a/packages/seacas/applications/grepos/gp_remap.f +++ b/packages/seacas/applications/grepos/gp_remap.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/grepos/gp_renam.f b/packages/seacas/applications/grepos/gp_renam.f index 73d01b877fa3..8fb10dc6cf86 100644 --- a/packages/seacas/applications/grepos/gp_renam.f +++ b/packages/seacas/applications/grepos/gp_renam.f @@ -1,13 +1,13 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE RENAM (TYPE, NAMLST, NUMNM, OLD, NEW) C======================================================================= -C + CHARACTER*(*) TYPE CHARACTER*(*) NAMLST(NUMNM), OLD, NEW CHARACTER*1024 STRING diff --git a/packages/seacas/applications/grepos/gp_renelb.f b/packages/seacas/applications/grepos/gp_renelb.f index 28bb562dd65e..8b850201f23b 100644 --- a/packages/seacas/applications/grepos/gp_renelb.f +++ b/packages/seacas/applications/grepos/gp_renelb.f @@ -1,13 +1,13 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE RENELB (NELBLK, IOFFNP, IXNP, NUMELB, NUMLNK, LINK) C======================================================================= -C + C --*** RENELB *** (GJOIN) Renumber connectivity in element blocks C -- Written by Amy Gilkey - revised 09/29/87 C -- diff --git a/packages/seacas/applications/grepos/gp_renix.f b/packages/seacas/applications/grepos/gp_renix.f index da0d438408c9..9c62f2aaf64c 100644 --- a/packages/seacas/applications/grepos/gp_renix.f +++ b/packages/seacas/applications/grepos/gp_renix.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/grepos/gp_rotatr.f b/packages/seacas/applications/grepos/gp_rotatr.f index 52bd08e6baf4..3f9cb37c7529 100644 --- a/packages/seacas/applications/grepos/gp_rotatr.f +++ b/packages/seacas/applications/grepos/gp_rotatr.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/grepos/gp_rotxyz.f b/packages/seacas/applications/grepos/gp_rotxyz.f index e8bc8cec6fd3..56d996426372 100644 --- a/packages/seacas/applications/grepos/gp_rotxyz.f +++ b/packages/seacas/applications/grepos/gp_rotxyz.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/grepos/gp_sclatr.f b/packages/seacas/applications/grepos/gp_sclatr.f index 2350936ec743..4e2e06259805 100644 --- a/packages/seacas/applications/grepos/gp_sclatr.f +++ b/packages/seacas/applications/grepos/gp_sclatr.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/grepos/gp_setnor.f b/packages/seacas/applications/grepos/gp_setnor.f index 002a562701af..f6a621441dd2 100644 --- a/packages/seacas/applications/grepos/gp_setnor.f +++ b/packages/seacas/applications/grepos/gp_setnor.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/grepos/gp_setnr2.f b/packages/seacas/applications/grepos/gp_setnr2.f index 4462adb3fa8d..f7e63f2405e3 100644 --- a/packages/seacas/applications/grepos/gp_setnr2.f +++ b/packages/seacas/applications/grepos/gp_setnr2.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= @@ -29,7 +29,7 @@ SUBROUTINE SETNR2 (ISPLANE, NUMNP, X, Y, IDIM, VNORM, NRMTYP, DX = XI - XJ DY = YI - YJ RMAG = SQRT ( DX**2 + DY**2) -C + AI = -dy / rmag BJ = dx / rmag diff --git a/packages/seacas/applications/grepos/gp_show.f b/packages/seacas/applications/grepos/gp_show.f index c92ed7bf226b..a0c621cf82b4 100644 --- a/packages/seacas/applications/grepos/gp_show.f +++ b/packages/seacas/applications/grepos/gp_show.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C -*- Mode: fortran -*- diff --git a/packages/seacas/applications/grepos/gp_showfl.f b/packages/seacas/applications/grepos/gp_showfl.f index c05ca9aed484..d00c968d8b58 100644 --- a/packages/seacas/applications/grepos/gp_showfl.f +++ b/packages/seacas/applications/grepos/gp_showfl.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= @@ -11,7 +11,7 @@ SUBROUTINE SHOWFL (TYPE, NUMESS, IDESS, NEESS, IPEESS, name) DIMENSION IDESS(*), NEESS(*), IPEESS(*) CHARACTER*(*) NAME(*) CHARACTER*1 TYPE -C + IF (TYPE .EQ. 'S') THEN WRITE (*, 20) DO 10 I=1, NUMESS @@ -23,7 +23,7 @@ SUBROUTINE SHOWFL (TYPE, NUMESS, IDESS, NEESS, IPEESS, name) WRITE (*, 50) I, IDESS(I), NEESS(I), NAME(I) 15 CONTINUE END IF -C + 20 FORMAT (/' Side Sets: ID Elements ', $ ' Nodes') 40 FORMAT (/' Node Sets: ID Nodes') diff --git a/packages/seacas/applications/grepos/gp_smogs.f b/packages/seacas/applications/grepos/gp_smogs.f index 350293bac769..1d64506676bc 100644 --- a/packages/seacas/applications/grepos/gp_smogs.f +++ b/packages/seacas/applications/grepos/gp_smogs.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= @@ -10,29 +10,28 @@ SUBROUTINE SMOGS (X, Y, Z, numelb, nlink, idelb, link, $ xscr, yscr, zscr, nscr, ndim) C======================================================================= C*********************************************************************** -C + C SUBROUTINE SMOGS = MESH SMOOTHING BY LAPLACE-S USING GAUSS-SEIDEL -C + C*********************************************************************** -C + C VARIABLES USED: C NIT = THE MAX NUMBER OF ITERATIONS TO DO. C EPS = MINIMUM DISTANCE NODES MUST MOVE TO CONTINUE ITERATIONS C RO = AN UNDER- OR OVER-RELAXATION FACTOR (NORMALLY 1.0) -C + C*********************************************************************** -C + real x(*), y(*), z(*) integer numelb(*), nlink(*), idelb(*), link(*) logical isbnd(*) real xscr(*), yscr(*), zscr(*) integer nscr(*) LOGICAL BIG -C + IF (R0 .LT. 0.01) R0 = 1. EPS2 = (EPS*R0)**2 - C ITERATION LOOP DO 120 IT = 1, NIT @@ -90,9 +89,8 @@ SUBROUTINE SMOGS (X, Y, Z, numelb, nlink, idelb, link, 130 continue IF (delmax .GT. EPS2) BIG = .TRUE. -C C IF NO SIGNIFICANT MOVEMENTS OCCURRED, RETURN -C + write (*,*) 'Iteration = ', it, sqrt(delmax)/r0, idel IF (.NOT.BIG) RETURN 120 CONTINUE diff --git a/packages/seacas/applications/grepos/gp_smogs2.f b/packages/seacas/applications/grepos/gp_smogs2.f index 93f50f244d24..b7495d63a6b0 100644 --- a/packages/seacas/applications/grepos/gp_smogs2.f +++ b/packages/seacas/applications/grepos/gp_smogs2.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= @@ -10,9 +10,9 @@ SUBROUTINE SMOGS2 (xscr, yscr, isbnd, x, y, numel, C======================================================================= C*********************************************************************** -C + C SUBROUTINE SMOGS = MESH SMOOTHING BY LAPLACE-S USING GAUSS-SEIDEL -C + C*********************************************************************** real x(*), y(*), xscr(*), yscr(*) diff --git a/packages/seacas/applications/grepos/gp_smogs3.f b/packages/seacas/applications/grepos/gp_smogs3.f index 298669b1a936..dbf894af25c7 100644 --- a/packages/seacas/applications/grepos/gp_smogs3.f +++ b/packages/seacas/applications/grepos/gp_smogs3.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= @@ -10,9 +10,9 @@ SUBROUTINE SMOGS3 (xscr, yscr, zscr, isbnd, x, y, z, numel, C======================================================================= C*********************************************************************** -C + C SUBROUTINE SMOGS = MESH SMOOTHING BY LAPLACE-S USING GAUSS-SEIDEL -C + C*********************************************************************** real x(*), y(*), z(*), xscr(*), yscr(*), zscr(*) diff --git a/packages/seacas/applications/grepos/gp_smooth.blk b/packages/seacas/applications/grepos/gp_smooth.blk index 639226029bef..1aea5a33ad7b 100644 --- a/packages/seacas/applications/grepos/gp_smooth.blk +++ b/packages/seacas/applications/grepos/gp_smooth.blk @@ -1,11 +1,10 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C -*- Mode: fortran -*- -C $Id: smooth.blk,v 1.1 1999/01/18 19:18:36 gdsjaar Exp $ common /smooth/ nit, r0, smotyp, toler C -- nit - number of iterations diff --git a/packages/seacas/applications/grepos/gp_snap.blk b/packages/seacas/applications/grepos/gp_snap.blk index 05bf4c15e880..74607e31e1e3 100644 --- a/packages/seacas/applications/grepos/gp_snap.blk +++ b/packages/seacas/applications/grepos/gp_snap.blk @@ -1,12 +1,11 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C -*- Mode: fortran -*- -C $Id: snap.blk,v 1.1 1999/01/18 19:18:36 gdsjaar Exp $ -C + integer pnorm, prad, pvect, pedge, mxsnap PARAMETER (PNORM = 1) diff --git a/packages/seacas/applications/grepos/gp_snap.f b/packages/seacas/applications/grepos/gp_snap.f index 410bb60b9fa9..2eef9d1d9d27 100644 --- a/packages/seacas/applications/grepos/gp_snap.f +++ b/packages/seacas/applications/grepos/gp_snap.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= @@ -55,7 +55,6 @@ SUBROUTINE SNAP(ndbin, A, IA, isnp, X, Y, Z, NDIM, numnp, 120 continue 130 continue - C------------------------------------------------------------------------ C ... Get the number of nodes on the slave surface call exgsp(ndbin, idess(indsl), nssess, nsdess, ierr) diff --git a/packages/seacas/applications/grepos/gp_snpnd2.f b/packages/seacas/applications/grepos/gp_snpnd2.f index a4dff6bd322d..783f7f41c1d6 100644 --- a/packages/seacas/applications/grepos/gp_snpnd2.f +++ b/packages/seacas/applications/grepos/gp_snpnd2.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/grepos/gp_snpnod.f b/packages/seacas/applications/grepos/gp_snpnod.f index ed39a33d0a88..397fffc7af70 100644 --- a/packages/seacas/applications/grepos/gp_snpnod.f +++ b/packages/seacas/applications/grepos/gp_snpnod.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/grepos/gp_spline.f b/packages/seacas/applications/grepos/gp_spline.f index a5c44e559061..1aef0abbf8b8 100644 --- a/packages/seacas/applications/grepos/gp_spline.f +++ b/packages/seacas/applications/grepos/gp_spline.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/grepos/gp_splxyz.blk b/packages/seacas/applications/grepos/gp_splxyz.blk index d846249580f3..8244d1684de5 100644 --- a/packages/seacas/applications/grepos/gp_splxyz.blk +++ b/packages/seacas/applications/grepos/gp_splxyz.blk @@ -1,11 +1,10 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C -*- Mode: fortran -*- -C $Id: splxyz.blk,v 1.1 1999/01/18 19:18:37 gdsjaar Exp $ COMMON /SPLCOM/ NSPL, SLTOP, SLBOT, $ KZSPL, KXSPL, KXSPL2, KYSPL, KYSPL2 diff --git a/packages/seacas/applications/grepos/gp_spoff.f b/packages/seacas/applications/grepos/gp_spoff.f index b1fec5ada0ea..26ead1be0dd3 100644 --- a/packages/seacas/applications/grepos/gp_spoff.f +++ b/packages/seacas/applications/grepos/gp_spoff.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C -*- Mode: fortran -*- diff --git a/packages/seacas/applications/grepos/gp_swpess.f b/packages/seacas/applications/grepos/gp_swpess.f index f8fa9fc10497..e163fff78dc9 100644 --- a/packages/seacas/applications/grepos/gp_swpess.f +++ b/packages/seacas/applications/grepos/gp_swpess.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/grepos/gp_swpid.f b/packages/seacas/applications/grepos/gp_swpid.f index 2ff02f7d0804..9d1d469bc24b 100644 --- a/packages/seacas/applications/grepos/gp_swpid.f +++ b/packages/seacas/applications/grepos/gp_swpid.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/grepos/gp_wrpxyz.f b/packages/seacas/applications/grepos/gp_wrpxyz.f index a8b685c3afe0..492dba6d47cd 100644 --- a/packages/seacas/applications/grepos/gp_wrpxyz.f +++ b/packages/seacas/applications/grepos/gp_wrpxyz.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/grepos/gp_xyzero.blk b/packages/seacas/applications/grepos/gp_xyzero.blk index 6ba74f93cd5a..e42f10ae6f82 100644 --- a/packages/seacas/applications/grepos/gp_xyzero.blk +++ b/packages/seacas/applications/grepos/gp_xyzero.blk @@ -1,12 +1,11 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C -*- Mode: fortran -*- -C $Id: xyzero.blk,v 1.1 1999/01/18 19:18:39 gdsjaar Exp $ COMMON /XYZERO/ XZERO, YZERO, ZZERO C --XZERR, YZERR, ZZERR - Minimum nonzero values for X, Y, and Z -C + diff --git a/packages/seacas/applications/grepos/gp_xyzmir.blk b/packages/seacas/applications/grepos/gp_xyzmir.blk index 98e43fc0431b..bc139a0ffa80 100644 --- a/packages/seacas/applications/grepos/gp_xyzmir.blk +++ b/packages/seacas/applications/grepos/gp_xyzmir.blk @@ -1,11 +1,10 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C -*- Mode: fortran -*- -C $Id: xyzmir.blk,v 1.1 1999/01/18 19:18:39 gdsjaar Exp $ COMMON /XYZMIR/ XMIRR, YMIRR, ZMIRR C --XMIRR, YMIRR, ZMIRR - 1.0 if not mirrored, -1.0 if mirrored diff --git a/packages/seacas/applications/grepos/gp_xyzmod.f b/packages/seacas/applications/grepos/gp_xyzmod.f index 1eb713a8f9ce..80d284dbefcd 100644 --- a/packages/seacas/applications/grepos/gp_xyzmod.f +++ b/packages/seacas/applications/grepos/gp_xyzmod.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/grepos/gp_xyzoff.blk b/packages/seacas/applications/grepos/gp_xyzoff.blk index 67040a6b769d..fa70b596b5cd 100644 --- a/packages/seacas/applications/grepos/gp_xyzoff.blk +++ b/packages/seacas/applications/grepos/gp_xyzoff.blk @@ -1,11 +1,10 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C -*- Mode: fortran -*- -C $Id: xyzoff.blk,v 1.1 1999/01/18 19:18:39 gdsjaar Exp $ COMMON /XYZOFF/ XOFFS, YOFFS, ZOFFS, SPLOFF LOGICAL SPLOFF diff --git a/packages/seacas/applications/grepos/gp_xyzrot.blk b/packages/seacas/applications/grepos/gp_xyzrot.blk index 9ad003b880b0..9dc230fd6726 100644 --- a/packages/seacas/applications/grepos/gp_xyzrot.blk +++ b/packages/seacas/applications/grepos/gp_xyzrot.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C -*- Mode: fortran -*- diff --git a/packages/seacas/applications/grepos/gp_xyzscl.blk b/packages/seacas/applications/grepos/gp_xyzscl.blk index e8662c3731f1..2e51c8b5e5ba 100644 --- a/packages/seacas/applications/grepos/gp_xyzscl.blk +++ b/packages/seacas/applications/grepos/gp_xyzscl.blk @@ -1,11 +1,10 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C -*- Mode: fortran -*- -C $Id: xyzscl.blk,v 1.1 1999/01/18 19:18:40 gdsjaar Exp $ COMMON /XYZSCL/ XSCAL, YSCAL, ZSCAL, XRAND, YRAND, ZRAND C --XSCAL, YSCAL, ZSCAL - Scale factors for X, Y, and Z diff --git a/packages/seacas/applications/grepos/gp_xyzwrp.blk b/packages/seacas/applications/grepos/gp_xyzwrp.blk index 825fa6808d10..073d1188feaa 100644 --- a/packages/seacas/applications/grepos/gp_xyzwrp.blk +++ b/packages/seacas/applications/grepos/gp_xyzwrp.blk @@ -1,11 +1,10 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C -*- Mode: fortran -*- -C $Id: xyzwrp.blk,v 1.1 1999/01/18 19:18:40 gdsjaar Exp $ COMMON /XYZWRP/ IWARP, WRPDIS, NRMWRP C --IWARP = type of warping selected: diff --git a/packages/seacas/applications/grepos/gp_zess.f b/packages/seacas/applications/grepos/gp_zess.f index 5c2c91c88258..c7417fdb263b 100644 --- a/packages/seacas/applications/grepos/gp_zess.f +++ b/packages/seacas/applications/grepos/gp_zess.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/grepos/gp_zlnk.f b/packages/seacas/applications/grepos/gp_zlnk.f index 97372e832c89..091cf461f2c8 100644 --- a/packages/seacas/applications/grepos/gp_zlnk.f +++ b/packages/seacas/applications/grepos/gp_zlnk.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/grepos/gp_zmap.f b/packages/seacas/applications/grepos/gp_zmap.f index 7fd72041614d..c15a3dc8a376 100644 --- a/packages/seacas/applications/grepos/gp_zmap.f +++ b/packages/seacas/applications/grepos/gp_zmap.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/grepos/gp_zmess.f b/packages/seacas/applications/grepos/gp_zmess.f index 2f33e1791fce..cb7ea3541258 100644 --- a/packages/seacas/applications/grepos/gp_zmess.f +++ b/packages/seacas/applications/grepos/gp_zmess.f @@ -1,14 +1,13 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE ZMESS (NUMESS, ISTAT, LESSEL, LESSDL, IDESS, NEESS, * NEDSS, IXEESS, IXEDSS, LTEESS, LTSSS, LTSNC, FAC, NAMES) C======================================================================= -C $Id: zmess.f,v 1.3 2007/07/20 04:07:41 gdsjaar Exp $ C --*** ZMESS *** (GJOIN) Compress element side sets C -- Written by Amy Gilkey - revised 01/20/88 diff --git a/packages/seacas/applications/grepos/gp_zmfixd.f b/packages/seacas/applications/grepos/gp_zmfixd.f index a4944fa78d57..44c9cf06b68a 100644 --- a/packages/seacas/applications/grepos/gp_zmfixd.f +++ b/packages/seacas/applications/grepos/gp_zmfixd.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/grepos/gp_zmmap.f b/packages/seacas/applications/grepos/gp_zmmap.f index 94dd750b0062..bc107e29d9e8 100644 --- a/packages/seacas/applications/grepos/gp_zmmap.f +++ b/packages/seacas/applications/grepos/gp_zmmap.f @@ -1,13 +1,13 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE ZMMAP (NUMEL, MAPEL) C======================================================================= -C + C --*** ZMMAP *** (GJOIN) Compress element and node order maps C -- Written by Amy Gilkey - revised 01/20/88 C -- diff --git a/packages/seacas/applications/grepos/gp_zmnps.f b/packages/seacas/applications/grepos/gp_zmnps.f index bf0304154e4e..a2bdd7902055 100644 --- a/packages/seacas/applications/grepos/gp_zmnps.f +++ b/packages/seacas/applications/grepos/gp_zmnps.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/grepos/gp_zmxyz.f b/packages/seacas/applications/grepos/gp_zmxyz.f index 0021c6b0aa10..866c93ac9085 100644 --- a/packages/seacas/applications/grepos/gp_zmxyz.f +++ b/packages/seacas/applications/grepos/gp_zmxyz.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/grepos/gp_znps.f b/packages/seacas/applications/grepos/gp_znps.f index 067b8a9dadeb..e05c2cba2ae7 100644 --- a/packages/seacas/applications/grepos/gp_znps.f +++ b/packages/seacas/applications/grepos/gp_znps.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/grepos/gp_zxyz.f b/packages/seacas/applications/grepos/gp_zxyz.f index 2d39f1e3c346..19ad16954c6b 100644 --- a/packages/seacas/applications/grepos/gp_zxyz.f +++ b/packages/seacas/applications/grepos/gp_zxyz.f @@ -1,13 +1,13 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE ZXYZ (X, Y, Z, MAP, NUMNP, NDIM) C======================================================================= -C + C -- X,Y,Z -- REAL - IN/OUT - Coordinates of nodes C -- MAP -- INT - IN - Map between new and old node numbers C MAP(I) for inactive nodes = NUMNP+1 diff --git a/packages/seacas/applications/grepos/grepos.f b/packages/seacas/applications/grepos/grepos.f index 21d3bd3bbddb..52aaed94da89 100644 --- a/packages/seacas/applications/grepos/grepos.f +++ b/packages/seacas/applications/grepos/grepos.f @@ -1,13 +1,13 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= PROGRAM GREPOS C======================================================================= -C + C --*** GREPOS *** (GREPOS) GENESIS Positioning Program C -- Written by Greg Sjaardema - revised 03/07/89 C -- Modified from GEN3D @@ -643,7 +643,6 @@ PROGRAM GREPOS RENEL = (I .LT. NELBLK) NUMEL1 = NUMEL - if (renel .or. delnp) then CALL MDRSRV ('MSCR', KMSCR, MAX(NUMEL0, NUMNP0)) if (exodus) then @@ -912,7 +911,6 @@ PROGRAM GREPOS & IA(KLTESO), IA(KLTSSO), A(KFACS0), IA(KIXESO), IA(KIXDS0), & IA(KNESO), IA(KNDS0), IA(KISCR), C(KNMSC), C(KNAMSS)) - CALL MDDEL ('LTEESO') CALL MDDEL ('LTSSO') CALL MDDEL ('FACS0') diff --git a/packages/seacas/applications/mapvar-kd/mapvar-kd.f b/packages/seacas/applications/mapvar-kd/mapvar-kd.f index 4fd889ac0c3e..bce4404ada8f 100644 --- a/packages/seacas/applications/mapvar-kd/mapvar-kd.f +++ b/packages/seacas/applications/mapvar-kd/mapvar-kd.f @@ -1,34 +1,34 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= *DECK,MAPVAR PROGRAM MAPVAR -C + C ****************************************************************** -C + C --MAPVAR-- C A PROGRAM TO MAP FINITE ELEMENT RESULTS C FROM ONE EXODUS-II RESTART FILE TO ANOTHER C EXODUS-II RESTART FILE TO SUPPORT REMESHING -C + C GERALD W. WELLMAN C SANDIA NATIONAL LABORATORIES C ALBUQUERQUE, NEW MEXICO -C + C MAPVAR IS BASED ON MERLIN II,A FINITE ELEMENT INTERPOLATION C PROGRAM BY DAVID K. GARTLING. -C + C THE MERLIN PROGRAM IS DESIGNED TO TRANSFER DATA BETWEEN TWO- AND C THREE-DIMENSIONAL FINITE ELEMENT MESHES. GIVEN A FINITE ELEMENT C MESH, (MESH-A), AND A SOLUTION FIELD ON THAT MESH, MERLIN C INTERPOLATES THE GIVEN SOLUTION ONTO A SECOND FINITE ELEMENT MESH, C (MESH-B). THE INTERPOLATION PROCEDURE IS BASED ON USE OF THE C ELEMENT SHAPE FUNCTIONS IN MESH-A. -C + C MAPVAR IS DESIGNED TO SERVE THE SAME GENERAL PURPOSE AS MERLIN C HOWEVER, MAPVAR IS DESIGNED TO PROVIDE THE TRANSLATION IN TERMS C OF EXODUS-II-V2 RESTART FILES. MAPVAR ALSO TRANSLATES ELEMENT @@ -38,12 +38,12 @@ PROGRAM MAPVAR C ORIGINALLY SUPPORTED BY MERLIN CAN BE INCLUDED IN MAPVAR GIVEN C THE DESIRE AND RESOURCES. THE SEARCH ENGINE OF MAPVAR HAS BEEN C CHANGED TO A BINARY SEARCH FROM THE BIN OR BUCKET SEARCH OF MERLIN. -C + C THE INTENT OF MAPVAR IS TO CREATE A RESTART FILE THAT WILL ALLOW C A FINITE ELEMENT SOLUTION TO PROCEED WITH A DIFFERENT MESH THAN C THE MESH WITH WHICH THE SOLUTION WAS STARTED. THUS, THERE IS AN C INHERENT ASSUMPTION THAT MESH-A IS AN EXODUS RESTART FILE. -C + C NODAL VARIABLE TRANSFER IS STRAIGHT FORWARD. THE MESH-B NODE IS C FOUND INSIDE THE APPROPRIATE MESH-A ELEMENT. THE ELEMENT SHAPE C FUNCTIONS ARE USED TO INTERPOLATE RESULTS ONTO THE MESH-B NODE. @@ -60,7 +60,7 @@ PROGRAM MAPVAR C NODES. THE CONSTRAINTS ARE BASED ON THE REQUIREMENTS OF THE C CONSTITUTIVE MODEL. FINALLY, A DIRECT TRANSFER HAS BEEN IMPLEMENTED C BUT IS NOT RECOMMENDED. -C + C Special considerations: C ELMASS - translated to nodal density, interpolated, translated C back to ELMASS @@ -69,11 +69,11 @@ PROGRAM MAPVAR C EQPS - constrained to be .gt. 0. C TEARING - constrained to be .gt. 0. C DECAY - constrained to be .lt. 1. -C + include 'exodusII.inc' CHARACTER*(MXSTLN) TYP CHARACTER*8 MEMDBG -C + include 'aexds1.blk' include 'amesh.blk' include 'bmesh.blk' @@ -87,43 +87,41 @@ PROGRAM MAPVAR include 'tapes.blk' include 'varnpt.blk' include 'varept.blk' -C + DIMENSION A(1),IA(1) EQUIVALENCE (A(1),IA(1)) -C + C ****************************************************************** -C + C MAIN PROGRAM FOR MAPVAR C PROGRAM EXECUTION IS DIRECTED FROM THIS ROUTINE -C + C ****************************************************************** -C + C NOTE : ALL ELEMENT DATA,NODAL POINT DATA, SOLUTION FIELDS, WORK C SPACE, ETC. ARE STORED IN THE ARRAY "A". THE MEMORY C MANAGER REQUESTS THE NEEDED STORAGE SPACE IN "A" DURING C EXECUTION. THE POINTERS NA1,NA2,....NAM PARTITION THE C ALLOCATED STORAGE INTO SEPARATE ARRAYS. SEE SAND86-0911, C "SUPES", FOR DETAILS OF THE MEMORY MANAGER. -C + C ****************************************************************** -C -C + C disable netcdf warning messages -C + CALL EXOPTS(EXVRBS,IERR) -C C open all disk files -C + call debug('MVOPNFIL') CALL MVOPNFIL -C + C get info for QA records -C + CALL VERSION(QAINFO) -C + C initialize memory manager -C + CALL MDINIT (A) C ... If EXT99 Environment variable set, turn on supes memory debugging @@ -136,24 +134,22 @@ PROGRAM MAPVAR END IF 20 CONTINUE -C -C C ****************************************************************** C read input parameters needed to control the solution from C the screen (time step(s), bins) C ****************************************************************** -C + CALL EXINQ(NTP2EX,EXTIMS,NTIMES,RDUM,CDUM,IERR) CALL EXGINI (NTP2EX,HED,NDIMA,NODESA,NUMELA,NBLKSA, & NUMNPS,NUMESS,IERR) CALL EXGINI (NTP3EX,HED,NDIMB,NODESB,NUMELB,NBLKSB, & NUMNPS,NUMESS,IERR) -C + C A(NT1) = TIMES(1:NTIMES) - times on Mesh-A database C IA(NAEB) = IDA(1:NBLKSA) - Donor mesh element block I.D.'s C IA(NBEB) = IDB(1:NBLKSA) - Recipient mesh element block I.D.'s C IA(NMAP) = MP(1:3,1:MBLK) - Donor to recipient mesh map -C + MBLK = NBLKSA * NBLKSB CALL MDRSRV ('TIMES', NT1, NTIMES) CALL MDRSRV ('IDA', NAEB, NBLKSA) @@ -170,32 +166,30 @@ PROGRAM MAPVAR & 'MEMORY MANAGER ERROR', & 'JUST BEFORE CALL TO RDINPT',0,' ',0,' ',' ',1) END IF -C -C + call debug('RDINPT') CALL RDINPT (A(NT1),IA(NAEB),IA(NBEB),IA(NMAP),A(NMAPS),IMP,MBLK) -C -C + C ****************************************************************** C INITIAL READ OF MESH-A C ****************************************************************** -C + C read sizing data for mesh A -C + WRITE (NOUT, 270) fntp2(:lenstr(fntp2)), HED WRITE (NTPOUT, 270) fntp2(:lenstr(fntp2)), HED WRITE (NOUT, 280) NDIMA,NODESA,NUMELA,NBLKSA WRITE (NTPOUT, 280) NDIMA,NODESA,NUMELA,NBLKSA -C + C allocate storage for initial read of mesh A -C + C A(NAX) = XA(1:NODESA) - Mesh-A X-coord C A(NAY) = YA(1:NODESA) - Mesh-A Y-coord C A(NAZ) = ZA(1:NODESA) - Mesh-A Z-coord C A(NADX) = DISXA(1:NODESA) - Mesh-A X-displ C A(NADY) = DISYA(1:NODESA) - Mesh-A Y-displ C A(NADZ) = DISZA(1:NODESA) - Mesh-A Z-displ -C + CALL MDRSRV ('XA', NAX, NODESA) CALL MDRSRV ('YA', NAY, NODESA) IF (NDIMA.EQ.3) THEN @@ -224,30 +218,26 @@ PROGRAM MAPVAR & 'MEMORY MANAGER ERROR', & 'JUST BEFORE CALL TO RDA1',0,' ',0,' ',' ',1) END IF -C -C + C Copy "GENESIS" from mesh-B to mesh-C -C + CALL EXCOPY(NTP3EX,NTP4EX,IERR) IF (IERR .NE. 0) & CALL ERROR('MAPVAR', & 'ERROR WITH EXCOPY - GENESIS FILE COPY', & ' ',0,' ',0,' ',' ',1) -C -C + c read mesh A (coords,displ,variable names,QA, INFO records), c write mesh C, (variable names, QA, INFO records) -c -c + call debug('RDA1') CALL RDA1 (A(NAX),A(NAY),A(NAZ),A(NADX),A(NADY),A(NADZ)) -C -C + C ... Mapvar is buggy if mesh contains: C * nodal variable(s) C * multiple element blocks C * multiple timesteps -C + C The interpolated mesh will have invalid values for most of the C nodes except for those connected to the last element block. C Since this is not what the user wants. We check this situation @@ -289,10 +279,10 @@ PROGRAM MAPVAR IF (IACCU .EQ. 1)THEN IF (IXVEL .NE. 0 .AND. IYVEL .NE. 0 .AND. & (IELMS .NE. 0 .OR. IDENS .NE. 0))THEN -C + C velocities and mass are available, compute momenta and k.e. C 1st set up storage for vel's -C + C A(NVXA) = VELXA(1:NODESA) - X-velocity in mesh-A C A(NVYA) = VELYA(1:NODESA) - Y-velocity in mesh-A C A(NVZA) = VELZA(1:NODESA) - Z-velocity in mesh-A @@ -301,7 +291,7 @@ PROGRAM MAPVAR C A(NVYB) = VELYB(1:NODESB) - Y-velocity in mesh-B C A(NVZB) = VELZB(1:NODESB) - Z-velocity in mesh-B C A(NNMSB) = RMSNB(1:NODESB) - nodal mass in mesh-B -C + CALL MDRSRV ('VELXA', NVXA, NODESA) CALL MDRSRV ('VELYA', NVYA, NODESA) IF (NDIMA .EQ. 3)THEN @@ -325,28 +315,28 @@ PROGRAM MAPVAR & 'CHECK ACCURACY - VELOCITY', & 0,' ',0,' ',' ',1) END IF -C + C initialization quantities (6 each for now) that need to be C summed over the element blocks if doing an accuracy check -C + IF (ISTEP .EQ. -1)THEN -C + C need arrays (one slot for each time), else just scalars will do -C + C A(NTMXA) = TMXA(1:NTIMES) - X-momentum all mesh-A blocks each time C A(NTMYA) = TMYA(1:NTIMES) - Y-momentum all mesh-A blocks each time C A(NTMZA) = TMZA(1:NTIMES) - Z-momentum all mesh-A blocks each time C A(NTKEA) = TKEA(1:NTIMES) - K.E. all mesh-A blocks each time C A(NTPSQA) = TPSQA(1:NTIMES) - Pressure squared mesh-A each time C A(NTJ2A) = TJ2A(1:NTIMES) - J2 mesh-A each time -C + C A(NTMXB) = TMXB(1:NTIMES) - X-momentum all mesh-B blocks each time C A(NTMYB) = TMYB(1:NTIMES) - Y-momentum all mesh-B blocks each time C A(NTMZB) = TMZB(1:NTIMES) - Z-momentum all mesh-B blocks each time C A(NTKEB) = TKEB(1:NTIMES) - K.E. all mesh-B blocks each time C A(NTPSQB) = TPSQB(1:NTIMES) - Pressure squared mesh-B each time C A(NTJ2B) = TJ2B(1:NTIMES) - J2 mesh-B each time -C + CALL MDRSRV('TMXA', NTMXA, NTIMES) CALL MDRSRV('TMYA', NTMYA, NTIMES) CALL MDRSRV('TMZA', NTMZA, NTIMES) @@ -389,22 +379,20 @@ PROGRAM MAPVAR END IF END IF END IF -C -C + C ****************************************************************** C INITIAL READ OF MESH-B C ****************************************************************** -C -C + C read sizing data for mesh B -C + WRITE (NOUT, 290) fntp3(:lenstr(fntp3)), HED WRITE (NTPOUT, 290) fntp3(:lenstr(fntp3)), HED WRITE (NOUT, 300) NDIMB,NODESB,NUMELB,NBLKSB WRITE (NTPOUT, 300) NDIMB,NODESB,NUMELB,NBLKSB -c + c quick initial check of compatibility mesh-A to mesh-B -c + IF (NDIMB .NE. NDIMA) THEN CALL ERROR('MAPVAR', & 'MESH-B INCOMPATIBLE WITH MESH-A', @@ -412,13 +400,13 @@ PROGRAM MAPVAR & 'DIMENSION OF MESH-B',NDIMB, & ' ',' ',1) END IF -C + C allocate storage for mesh B read -C + C A(NBX) = XB(1:NODESB) - Mesh-B X-coord C A(NBY) = YB(1:NODESB) - Mesh-B Y-coord C A(NBZ) = ZB(1:NODESB) - Mesh-B Z-coord -C + CALL MDRSRV ('XB', NBX, NODESB) CALL MDRSRV ('YB', NBY, NODESB) IF (NDIMB.EQ.3) THEN @@ -434,32 +422,29 @@ PROGRAM MAPVAR & 'JUST BEFORE CALL TO RDB1', & 0,' ',0,' ',' ',1) END IF -C -C + c read coordinates for mesh B -c + call debug('RDB1') CALL RDB1 (A(NBX),A(NBY),A(NBZ)) -C -C + C ********************************************************* C START INTERPOLATION C ********************************************************* -C + C set up memory for arrays for nodal results and truth table C these arrays stay around forever - they don't get deleted C after each element block is processed like the arrays C set up within the element block loop -C + C A(NASOLN) = SOLNA(1:NODESA,1:NVARNP) - Mesh-A nodal data C A(NBSOLN) = SOLNB(1:NODESB,1:NVARNP) - Mesh-B interpolated C nodal data C IA(ITTA) = ITRTA(1:NVAREL,1:NBLKSA) - Mesh-A truth table C IA(ITTB) = ITRTB(1:NVAREL,1:NBLKSB) - Mesh-B truth table -C + C A(NSN) = SN(1:NODESB) - storage for nodal vars in ininod C A(NSE) = SE(1:NODESB) - storage for element vars in ininod -C CALL MDRSRV ('SOLNA', NASOLN, NODESA*NVARNP) CALL MDRSRV ('SOLNB', NBSOLN, NODESB*NVARNP) @@ -467,7 +452,7 @@ PROGRAM MAPVAR CALL MDRSRV ('ITRTB', ITTB, NVAREL*NBLKSB) CALL MDRSRV ('SN', NSN, NODESB) CALL MDRSRV ('SE', NSE, NODESB) -C + CALL MDSTAT (MNERRS, MNUSED) IF (MNERRS .NE. 0) THEN CALL MDEROR(NOUT) @@ -476,33 +461,31 @@ PROGRAM MAPVAR & 'JUST BEFORE INTERPOLATION LOOP', & 0,' ',0,' ',' ',1) END IF -C + call inirea(nodesb*nvarnp, 0.0, a(nbsoln)) call debug('TRUTBL') CALL TRUTBL(IA(NMAP),IMP,IA(NAEB),IA(NBEB),IA(ITTA),IA(ITTB)) -C + C ********************************************************************* -C + C START OF ELEMENT BLOCK-BY-ELEMENT BLOCK INTERPOLATION LOOP -C + C ********************************************************************* -C + C store default values of search box tolerances per element type TOLSHC = TOLSHL TOLQAC = TOLQAD TOLHEC = TOLHEX TOLTEC = TOLTET -c C A(NAGV) = GVAR(1:NVARGP) Global variables -C + CALL MDRSRV ('GVAR', NAGV, NVARGP) -C + call debug('WRTC') CALL WRTC(A(NBX),A(NBY),A(NBZ),A(NAGV),A(NBSOLN)) -C -C + DO 50 IM = 1, IMP call getval(ia(nmap), im, idblka, idblkb, ischem) TOLSEA = A(NMAPS+IM-1) @@ -523,13 +506,12 @@ PROGRAM MAPVAR 25 continue 26 continue -C C set up controls for many to 1 map C if first time recipient mesh element block called, insub = 1 C else insub = 2 C if last time recipient mesh element block called, icompl = 1 C else icompl = 0 -C + INSUB = 1 ICOMPL = 1 IF (IM .GT. 1)THEN @@ -544,18 +526,17 @@ PROGRAM MAPVAR ICOMPL = 0 END IF END IF -C -C + C ********************************************************** C ELEMENT BLOCK BY ELEMENT BLOCK INTERPOLATION C REQUIRED FOR ELEMENT DATA BUT ALSO USED FOR NODAL DATA C ********************************************************** -C + WRITE(NOUT,330)IM,IMP,IDBLKB WRITE(NOUT,320)IDBLKA WRITE(NTPOUT,330)IM,IMP,IDBLKB WRITE(NTPOUT,320)IDBLKA -C + CALL EXGELB(NTP2EX,IDBLKA,TYP,NUMEBA,NELNDA,NATRIB, & IERR) CALL EXGELB(NTP3EX,IDBLKB,TYP,NUMEBB,NELNDB,NATRIB, @@ -563,16 +544,16 @@ PROGRAM MAPVAR IF (NUMEBB .EQ. 0)THEN GO TO 50 END IF -C + C set up arrays for element block-by-element block preliminaries C these arrays will be deleted at the end of the loop -C + C IA(NACON) = ICONA(1:NELNDA,1:NUMEBA) - Mesh-A connectivity C IA(NBCON) = ICONB(1:NELNDB,1:NUMEBB) - Mesh-B connectivity C IA(NANDLST) = NDLSTA(1:NODESA) - Mesh-A nodes in element block C IA(NBNDLST) = NDLSTB(1:NODESB) - Mesh-A nodes in element block C A(NASTAT) = STATUS(1:NUMEBA) - Mesh-A element status -C + CALL MDRSRV ('ICONA', NACON, NELNDA*NUMEBA) CALL MDRSRV ('ICONB', NBCON, NELNDB*NUMEBB) CALL MDRSRV ('NDLSTA', NANDLST, NODESA) @@ -587,15 +568,15 @@ PROGRAM MAPVAR & 'BLOCKS LOOP PRELIMINARIES', & 0,' ',0,' ',' ',1) END IF -C + c 2nd read of mesh A -c + call debug('RDA2') CALL RDA2 (IDBLKA,IA(NACON),IA(NANDLST),A(NASTAT), & MAXLN) -C + C Set the search box tolerance for the current mapping -C + IF ( ITYPE .EQ. 13) THEN C shell IF ( TOLSEA .GT. 0.0) THEN @@ -638,22 +619,21 @@ PROGRAM MAPVAR & 'ELEMENT TYPE =',ITYPE, & 'NOT YET IMPLEMENTED',0,' ',' ',1) END IF -c + c 2nd read of mesh-b -c + call debug('RDB2') CALL RDB2(IDBLKB,IDBLKA,IA(NBCON),IA(NBNDLST)) -C -C + C set up arrays for element block-by-element block processing C these arrays will be deleted at the end of the loop -C + C IA(NS1) = ISRCHR(1:1(NISR),1:NUMNDB) Integer search results C A(NS2) = RSRCHR(1:6(NRSR),1:NUMNDB) Real search results C IA(NS3) = LIST(1:NUMNDB) Potential contacts C A(NS16) = XYZSRF(1:NODESA,1:3) Coords defining element C A(NS17) = XYZPTS(1:NUMNDB,1:3) Coords of points searched -C + C A(NASOLE) = SOLEA(1:NUMEBA,1:NVAREL) - Mesh-A element data C A(NBSOLE) = SOLEB(1:NUMEBB,1:NVAREL) - Mesh-B interpolated C element data @@ -671,16 +651,16 @@ PROGRAM MAPVAR CALL MDRSRV ('LIST', NS3, IDIM) CALL MDRSRV ('XYZSRF', NS16, NODESA*3) CALL MDRSRV ('XYZPTS', NS17, IDIM*3) -C + CALL MDRSRV ('SOLEA', NASOLE, NUMEBA*NVAREL) CALL MDRSRV ('SOLEB', NBSOLE, NUMEBB*NVAREL) -C + IF (ISCHEM .EQ. 0)THEN -C + CALL MDRSRV ('SOLENA', NASOLEN, NODESA*NVAREL) CALL MDRSRV ('NELTN', NANELTN, NODESA) ELSE IF (ISCHEM .EQ. 1)THEN -C + CALL MDRSRV ('SOLENA', NASOLEN, NODESA*NVAREL) CALL MDRSRV ('INVLNA', NAINVLN, NODESA) CALL MDRSRV('INVCN', NAINVC, MAXLN*NODESA) @@ -688,7 +668,7 @@ PROGRAM MAPVAR ELSE IF (ISCHEM .EQ. 2)THEN CONTINUE ELSE IF (ISCHEM .EQ. 3)THEN -C + CALL MDRSRV ('CNTRA', NACTR, NUMEBA*3) CALL MDRSRV ('INVLNA', NAINVLN, NODESA) CALL MDRSRV ('INVCN', NAINVC, MAXLN*NODESA) @@ -699,7 +679,7 @@ PROGRAM MAPVAR CALL ERROR('MAPVAR',' ','ISCHEM', & ischem,'INCORRECT ARGUMENT',0,' ',' ',1) END IF -C + CALL MDSTAT (MNERRS, MNUSED) IF (MNERRS .NE. 0) THEN CALL MDEROR(NOUT) @@ -708,146 +688,145 @@ PROGRAM MAPVAR & 'JUST AFTER START OF BLOCKS LOOP', & 0,' ',0,' ',' ',1) END IF -C -C + IF (ITYPE .EQ. 13)THEN -C + C ********************************************************** C Path through code for shells C ********************************************************** -C + call debug('BLDSRF') CALL BLDSRF(A(NAX),A(NAY),A(NAZ),A(NS16)) -C + IF (NVARNP .GT. 0)THEN -C + call debug('BLDPTN') CALL BLDPTN(A(NBX),A(NBY),A(NBZ),IA(NBNDLST),A(NS17)) -C + call debug('SRCHS-nodes') CALL SRCHS (NODESA,NUMEBA,IA(NACON),A(NS16), 1 NUMNDB,A(NS17),TOLSHL,1,6, 2 NISS,NRSS,IA(NS1),A(NS2), 3 IA(NS3),IERR) -C + call debug('SINTPN') CALL SINTPN(IA(NACON),A(NASOLN),IA(NS1),1,A(NS2),6, 1 A(NBSOLN),IA(NBNDLST),A(NBX),A(NBY),A(NBZ), 2 IDBLKB,A(NT1),INSUB,A(NSN)) -C + END IF IF (NVAREL .GT. 0)THEN -C + call debug('BLDPTE') CALL BLDPTE(A(NBX),A(NBY),A(NBZ),IA(NBCON),A(NS17)) -C + call debug('SRCHS-element centroids') CALL SRCHS (NODESA,NUMEBA,IA(NACON),A(NS16), 1 NUMEBB,A(NS17),TOLSHL,1,6, 2 NISS,NRSS,IA(NS1),A(NS2), 3 IA(NS3),IERR) -C + c element centroid values to nodes by averaging -c + IF (ISCHEM .EQ. 0)THEN -C + C Set up time steps -C + IF (ISTEP .EQ. -1)THEN NTM = NTIMES ELSE NTM = 1 END IF -C + DO 610 IST = 1, NTM IF (ISTEP .EQ. -1)THEN ISTP = IST ELSE ISTP = ISTEP END IF -C + call debug('SETON0') CALL SETON0(IA(NACON),IA(NANELTN),A(NASOLE), & A(NASOLEN),IDBLKA,A(NAX),A(NAY),A(NAZ),ISTP, & IA(ITTB),iblkb) -C + call debug('SINTPE') CALL SINTPE(IA(NACON),A(NASOLEN),IA(NS1),1,A(NS2),6, & A(NBSOLE),IDBLKB,A(NBX),A(NBY),A(NBZ), & IA(NBCON),IA(ITTB),IBLKB,A(NT1),A(NS17), & ISTP,IST,INSUB,ICOMPL,A(NSE)) 610 CONTINUE -C + ELSE IF (ISCHEM .EQ. 1) THEN -C + call debug('INVCON') CALL INVCON(IA(NAINVLN),MAXLN,IA(NAINVC),IA(NACON)) -C + C Set up time steps -C + IF (ISTEP .EQ. -1)THEN NTM = NTIMES ELSE NTM = 1 END IF -C + DO 620 IST = 1, NTM IF (ISTEP .EQ. -1)THEN ISTP = IST ELSE ISTP = ISTEP END IF -C + call debug('SETON1') CALL SETON1(A(NACTR),A(NASOLE),A(NASOLEN),IDBLKA, & A(NAX),A(NAY),A(NAZ),IA(NACON),IA(NANDLST), & IA(NAINVLN),IA(NAINVC),MAXLN,ISTP, & IA(ITTB),iblkb) -C + call debug('SINTPE') CALL SINTPE(IA(NACON),A(NASOLEN),IA(NS1),1,A(NS2),6, & A(NBSOLE),IDBLKB,A(NBX),A(NBY),A(NBZ), & IA(NBCON),IA(ITTB),IBLKB,A(NT1),A(NS17), & ISTP,IST,INSUB,ICOMPL,A(NSE)) 620 CONTINUE -C + ELSE IF (ISCHEM .EQ. 2) THEN -c + c direct transfer, does not require scatter to nodes -c + call debug('STRAN') CALL STRAN(IA(NS1),1,A(NASOLE),A(NBSOLE), & IDBLKA,IDBLKB, & IA(ITTB),IBLKB,A(NT1),A(NS17), & INSUB,ICOMPL, & A(NBX),A(NBY),A(NBZ),IA(NBCON),A(NSE)) -C + ELSE IF (ISCHEM .EQ. 3)THEN -C + call debug('INVCON') CALL INVCON(IA(NAINVLN),MAXLN,IA(NAINVC),IA(NACON)) -C + C Set up time steps -C + IF (ISTEP .EQ. -1)THEN NTM = NTIMES ELSE NTM = 1 END IF -C + DO 630 IST = 1, NTM IF (ISTEP .EQ. -1)THEN ISTP = IST ELSE ISTP = ISTEP END IF -C + call debug('ELGRAD') CALL ELGRAD(A(NACTR),A(NAX),A(NAY),A(NAZ), & A(NASOLE),A(NSOLGR),IA(NICHKE), & IDBLKA,IA(NACON),IA(NAINVLN),IA(NAINVC), & MAXLN,ISTP,IA(ITTB),IBLKB) -C + call debug('INTRP3') CALL INTRP3(A(NACTR),A(NS17),IA(NS1), & A(NBSOLE),A(NASOLE),A(NSOLGR), @@ -855,37 +834,36 @@ PROGRAM MAPVAR & ISTP,IST,INSUB,ICOMPL, & A(NBX),A(NBY),A(NBZ),IA(NBCON),A(NSE)) 630 CONTINUE -C + ELSE CALL ERROR('MAPVAR',' ','ISCHEM =', & ischem,'INCORRECT ARGUMENT',0,' ',' ',1) END IF -C + END IF -C + C ITYPE = 3 - 4 node quad C ITYPE = 4 - 8 node quad C ITYPE = 5 - 9 node quad -C + ELSE IF (ITYPE .EQ. 3 .OR. ITYPE .EQ. 4 .OR. & ITYPE .EQ. 5) THEN -C -C + C ***************************************************** C PATH THROUGH CODE FOR CONTINUUM ELEMENTS C (QUAD-4) C ***************************************************** -C + C find and store location of mesh-b nodes within mesh-a -C + call debug('BLDSRF') CALL BLDSRF(A(NAX),A(NAY),A(NAZ),A(NS16)) -C + IF (NVARNP .GT. 0)THEN -C + call debug('BLDPTN') CALL BLDPTN(A(NBX),A(NBY),A(NBZ),IA(NBNDLST),A(NS17)) -C + call debug('SRCHQ-nodes') CALL SRCHQ (NODESA,NUMEBA,IA(NACON),A(NS16), 1 NUMNDB,A(NS17),TOLQAD,1,3, @@ -897,139 +875,137 @@ PROGRAM MAPVAR WRITE(NTPOUT,430)IA(NBNDLST-1+I),IDBLKB END IF 530 CONTINUE -C + c interpolate nodal variables -c + call debug('INTRPN') CALL INTRPN(IA(NACON),A(NASOLN),IA(NS1),A(NS2), & A(NBSOLN),IA(NBNDLST),A(NBX),A(NBY),A(NBZ), & IDBLKB,A(NT1),INSUB,A(NSN)) -c + c start element variable interpolation -c -c + c locate Mesh-B element centroid in Mesh-A -c + END IF IF (NVAREL .GT. 0)THEN -C + call debug('BLDPTE') CALL BLDPTE(A(NBX),A(NBY),A(NBZ),IA(NBCON),A(NS17)) -C + call debug('SRCHQ-element centroids') CALL SRCHQ (NODESA,NUMEBA,IA(NACON),A(NS16), 1 NUMEBB,A(NS17),TOLQAD,1,3, 2 NISS,NRSS,IA(NS1),A(NS2), 3 IA(NS3),IERR) -C -c + c element centroid variables averaged to nodes -c + IF (ISCHEM .EQ. 0)THEN -C + C Set up time steps -C + IF (ISTEP .EQ. -1)THEN NTM = NTIMES ELSE NTM = 1 END IF -C + DO 640 IST = 1, NTM IF (ISTEP .EQ. -1)THEN ISTP = IST ELSE ISTP = ISTEP END IF -C + call debug('ELTON0') CALL ELTON0(IA(NACON),IA(NANELTN),A(NASOLE), & A(NASOLEN),IDBLKA,A(NAX),A(NAY),A(NAZ),ISTP, & IA(ITTB),IBLKB) -c + c interpolate element vars -c + call debug('INTRPE') CALL INTRPE(IA(NACON),A(NASOLEN),IA(NS1),A(NS2), 1 A(NBSOLE),IDBLKB,A(NBX),A(NBY),A(NBZ), 2 IA(NBCON),IA(ITTB),IBLKB, A(NT1), 3 A(NS17),ISTP,IST,INSUB,ICOMPL,A(NSE)) 640 CONTINUE -C + c element centroid variables linear least squares to nodes -c + ELSE IF (ISCHEM .EQ. 1)THEN -C + call debug('INVCON') CALL INVCON(IA(NAINVLN),MAXLN,IA(NAINVC),IA(NACON)) -C + C Set up time steps -C + IF (ISTEP .EQ. -1)THEN NTM = NTIMES ELSE NTM = 1 END IF -C + DO 650 IST = 1, NTM IF (ISTEP .EQ. -1)THEN ISTP = IST ELSE ISTP = ISTEP END IF -C + call debug('ELTON1') CALL ELTON1(A(NACTR),A(NASOLE),A(NASOLEN),IDBLKA, & A(NAX),A(NAY),A(NAZ),IA(NACON),IA(NANDLST), & IA(NAINVLN),IA(NAINVC),MAXLN,ISTP, & IA(ITTB),IBLKB) -c + c interpolate element vars -c + call debug('INTRPE') CALL INTRPE(IA(NACON),A(NASOLEN),IA(NS1),A(NS2), 1 A(NBSOLE),IDBLKB,A(NBX),A(NBY),A(NBZ), 2 IA(NBCON),IA(ITTB),IBLKB, A(NT1), 3 A(NS17),ISTP,IST,INSUB,ICOMPL,A(NSE)) 650 CONTINUE -C + ELSE IF (ISCHEM .EQ. 2)THEN -C + c direct transfer from Mesh-A to Mesh-B -c + call debug('TRANAB') CALL TRANAB(IA(NS1),A(NASOLE),A(NBSOLE), & IDBLKA,IDBLKB, & IA(ITTB),IBLKB,A(NT1),A(NS17), & INSUB,ICOMPL, & A(NBX),A(NBY),A(NBZ),IA(NBCON),A(NSE)) -c + ELSE IF (ISCHEM .EQ. 3)THEN -C + call debug('INVCON') CALL INVCON(IA(NAINVLN),MAXLN,IA(NAINVC),IA(NACON)) -C + C Set up time steps -C + IF (ISTEP .EQ. -1)THEN NTM = NTIMES ELSE NTM = 1 END IF -C + DO 660 IST = 1, NTM IF (ISTEP .EQ. -1)THEN ISTP = IST ELSE ISTP = ISTEP END IF -C + call debug('ELGRAD') CALL ELGRAD(A(NACTR),A(NAX),A(NAY),A(NAZ), & A(NASOLE),A(NSOLGR),IA(NICHKE), & IDBLKA,IA(NACON),IA(NAINVLN),IA(NAINVC), & MAXLN,ISTP,IA(ITTB),IBLKB) -C + call debug('INTRP3') CALL INTRP3(A(NACTR),A(NS17),IA(NS1), & A(NBSOLE),A(NASOLE),A(NSOLGR), @@ -1041,34 +1017,33 @@ PROGRAM MAPVAR CALL ERROR('MAPVAR',' ','ISCHEM =', & ischem,'INCORRECT ARGUMENT',0,' ',' ',1) END IF -C + END IF -C + ELSE IF (ITYPE .EQ. 10 .OR. ITYPE .EQ. 6) THEN -C -C + C ***************************************************** C PATH THROUGH CODE FOR 3-D CONTINUUM ELEMENTS C (HEX-8) OR (TET-8) C ***************************************************** -C + C FIND AND STORE LOCATION OF MESH-B NODES WITHIN MESH-A -C + call debug('BLDSRF') CALL BLDSRF(A(NAX),A(NAY),A(NAZ),A(NS16)) -C + IF (NVARNP .GT. 0)THEN -C + call debug('BLDPTN') CALL BLDPTN(A(NBX),A(NBY),A(NBZ),IA(NBNDLST),A(NS17)) -C + IF (ITYPE .EQ. 10)THEN call debug('SRCHH-nodes') CALL SRCHH (NODESA,NUMEBA,IA(NACON),A(NS16), 1 NUMNDB,A(NS17),TOLHEX,1,3, 2 NISS,NRSS,IA(NS1),A(NS2),IA(NS3), 5 IERR) -C + ELSEIF (ITYPE .EQ. 6)THEN call debug('SRCHT-nodes') CALL SRCHT (NODESA,NUMEBA,IA(NACON),A(NS16), @@ -1076,31 +1051,31 @@ PROGRAM MAPVAR 2 NISS,NRSS,IA(NS1),A(NS2), 3 IA(NS3),IERR) END IF -C + c interpolate nodal variables -c + call debug('INTRPN') CALL INTRPN(IA(NACON),A(NASOLN),IA(NS1),A(NS2), & A(NBSOLN),IA(NBNDLST),A(NBX),A(NBY),A(NBZ), & IDBLKB,A(NT1),INSUB,A(NSN)) -c + c start element variable interpolation -c + c locate Mesh-B element centroid in Mesh-A -c + END IF IF (NVAREL .GT. 0)THEN -C + call debug('BLDPTE') CALL BLDPTE(A(NBX),A(NBY),A(NBZ),IA(NBCON),A(NS17)) -C + IF (ITYPE .EQ. 10)THEN call debug('SRCHH-element centroids') CALL SRCHH (NODESA,NUMEBA,IA(NACON),A(NS16), 1 NUMEBB,A(NS17),TOLHEX,1,3, 2 NISS,NRSS,IA(NS1),A(NS2), 3 IA(NS3),IERR) -C + ELSEIF (ITYPE .EQ. 6)THEN call debug('SRCHT-element centroids') CALL SRCHT (NODESA,NUMEBA,IA(NACON),A(NS16), @@ -1108,110 +1083,110 @@ PROGRAM MAPVAR 2 NISS,NRSS,IA(NS1),A(NS2), 3 IA(NS3),IERR) END IF -C + IF (ISCHEM .EQ. 0)THEN -C + C Set up time steps -C + IF (ISTEP .EQ. -1)THEN NTM = NTIMES ELSE NTM = 1 END IF -C + DO 670 IST = 1, NTM IF (ISTEP .EQ. -1)THEN ISTP = IST ELSE ISTP = ISTEP END IF -C + call debug('ELTON0') CALL ELTON0(IA(NACON),IA(NANELTN),A(NASOLE), & A(NASOLEN),IDBLKA,A(NAX),A(NAY),A(NAZ),ISTP, & IA(ITTB),IBLKB) -C + c interpolate element vars -c + call debug('INTRPE') CALL INTRPE(IA(NACON),A(NASOLEN),IA(NS1),A(NS2), 1 A(NBSOLE),IDBLKB,A(NBX),A(NBY),A(NBZ), 2 IA(NBCON),IA(ITTB),IBLKB, A(NT1), 3 A(NS17),ISTP,IST,INSUB,ICOMPL,A(NSE)) 670 CONTINUE -C + ELSE IF (ISCHEM .EQ. 1)THEN -C + call debug('INVCON') CALL INVCON(IA(NAINVLN),MAXLN,IA(NAINVC),IA(NACON)) -C + C Set up time steps -C + IF (ISTEP .EQ. -1)THEN NTM = NTIMES ELSE NTM = 1 END IF -C + DO 680 IST = 1, NTM IF (ISTEP .EQ. -1)THEN ISTP = IST ELSE ISTP = ISTEP END IF -C + call debug('ELTON1') CALL ELTON1(A(NACTR),A(NASOLE),A(NASOLEN),IDBLKA, & A(NAX),A(NAY),A(NAZ),IA(NACON),IA(NANDLST), & IA(NAINVLN),IA(NAINVC),MAXLN,ISTP, & IA(ITTB),IBLKB) -C + c interpolate element vars -c + call debug('INTRPE') CALL INTRPE(IA(NACON),A(NASOLEN),IA(NS1),A(NS2), 1 A(NBSOLE),IDBLKB,A(NBX),A(NBY),A(NBZ), 2 IA(NBCON),IA(ITTB),IBLKB, A(NT1), 3 A(NS17),ISTP,IST,INSUB,ICOMPL,A(NSE)) 680 CONTINUE -c + ELSE IF (ISCHEM .EQ. 2)THEN -C + c direct transfer from Mesh-A to Mesh-B -c + call debug('TRANAB') CALL TRANAB(IA(NS1),A(NASOLE),A(NBSOLE), & IDBLKA,IDBLKB, & IA(ITTB),IBLKB,A(NT1),A(NS17), & INSUB,ICOMPL, & A(NBX),A(NBY),A(NBZ),IA(NBCON),A(NSE)) -c + ELSE IF (ISCHEM .EQ. 3)THEN -C + call debug('INVCON') CALL INVCON(IA(NAINVLN),MAXLN,IA(NAINVC),IA(NACON)) -C + C Set up time steps -C + IF (ISTEP .EQ. -1)THEN NTM = NTIMES ELSE NTM = 1 END IF -C + DO 690 IST = 1, NTM IF (ISTEP .EQ. -1)THEN ISTP = IST ELSE ISTP = ISTEP END IF -C + call debug('ELGRAD') CALL ELGRAD(A(NACTR),A(NAX),A(NAY),A(NAZ), & A(NASOLE),A(NSOLGR),IA(NICHKE), & IDBLKA,IA(NACON),IA(NAINVLN),IA(NAINVC), & MAXLN,ISTP,IA(ITTB),IBLKB) -C + call debug('INTRP3') CALL INTRP3(A(NACTR),A(NS17),IA(NS1), & A(NBSOLE),A(NASOLE),A(NSOLGR), @@ -1224,25 +1199,25 @@ PROGRAM MAPVAR CALL ERROR('MAPVAR',' ','ISCHEM =', & ischem,'INCORRECT ARGUMENT',0,' ',' ',1) END IF -C + END IF ELSE CALL ERROR ('MAPVAR','INCORRECT ELEMENT TYPE', & 'ELEMENT TYPE =',ITYPE, & 'NOT YET IMPLEMENTED',0,' ',' ',1) -C + END IF -C + IF (IACCU .EQ. 1)THEN -C + C velocities and mass are available, compute momenta and k.e. C 1st set up storage for mass -C + IF (IELMS .NE. 0 .AND. IDENS .EQ. 0)THEN -C + C A(NEMSA) = EMSSA(1:NODESA) - element mass in mesh-A C A(NEMSB) = EMSSB(1:NODESB) - element mass in mesh-B -C + CALL MDRSRV ('EMSSA', NEMSA, NUMEBA) CALL MDRSRV ('DENSA', NDENA, 1) CALL MDRSRV ('EMSSB', NEMSB, NUMEBB) @@ -1256,12 +1231,12 @@ PROGRAM MAPVAR & 0,' ',0,' ',' ',1) END IF ELSE IF(IDENS .NE. 0)THEN -C + C A(NEMSA) = EMSSA(1:NUMEBA) - element mass in mesh-A C A(NEMSB) = EMSSB(1:NUMEBB) - element mass in mesh-B C A(NDENA) = DENSA(1:NUMEBA) - element density in mesh-A C A(NDENB) = DENSB(1:NUMEBB) - element density in mesh-B -C + CALL MDRSRV ('EMSSA', NEMSA, NUMEBA) CALL MDRSRV ('DENSA', NDENA, NUMEBA) CALL MDRSRV ('EMSSB', NEMSB, NUMEBB) @@ -1275,9 +1250,9 @@ PROGRAM MAPVAR & 0,' ',0,' ',' ',1) END IF END IF -C + IF (NDIMA .EQ. 3)THEN -C + C A(NSXXA) = SIGXXA(1:NUMEBA) - XX component of stress tensor C A(NSYYA) = SIGYYA(1:NUMEBA) - YY component of stress tensor C A(NSZZA) = SIGZZA(1:NUMEBA) - ZZ component of stress tensor @@ -1290,7 +1265,7 @@ PROGRAM MAPVAR C A(NSXYB) = SIGXYB(1:NUMEBB) - XY component of stress tensor C A(NSYZB) = SIGYZB(1:NUMEBB) - YZ component of stress tensor C A(NSZXB) = SIGZXB(1:NUMEBB) - ZX component of stress tensor -C + CALL MDRSRV ('SIGXXA' , NSXXA, NUMEBA) CALL MDRSRV ('SIGYYA' , NSYYA, NUMEBA) CALL MDRSRV ('SIGZZA' , NSZZA, NUMEBA) @@ -1312,7 +1287,7 @@ PROGRAM MAPVAR & 0,' ',0,' ',' ',1) END IF ELSE IF (NDIMA .EQ. 2)THEN -C + C A(NSXXA) = SIGXXA(1:NUMEBA) - XX component of stress tensor C A(NSYYA) = SIGYYA(1:NUMEBA) - YY component of stress tensor C A(NSZZA) = SIGZZA(1:NUMEBA) - ZZ component of stress tensor @@ -1321,7 +1296,7 @@ PROGRAM MAPVAR C A(NSYYB) = SIGYYB(1:NUMEBB) - YY component of stress tensor C A(NSZZB) = SIGZZB(1:NUMEBB) - ZZ component of stress tensor C A(NSXYB) = SIGXYB(1:NUMEBB) - XY component of stress tensor -C + CALL MDRSRV ('SIGXXA' , NSXXA, NUMEBA) CALL MDRSRV ('SIGYYA' , NSYYA, NUMEBA) CALL MDRSRV ('SIGZZA' , NSZZA, NUMEBA) @@ -1343,22 +1318,22 @@ PROGRAM MAPVAR & 0,' ',0,' ',' ',1) END IF END IF -C + C Set up time steps -C + IF (ISTEP .EQ. -1)THEN NTM = NTIMES ELSE NTM = 1 END IF -C + DO 710 IST = 1, NTM IF (ISTEP .EQ. -1)THEN ISTP = IST ELSE ISTP = ISTEP END IF -C + CALL MKEI(IST,ISTP,A(NT1),IDBLKA,IA(NACON),IA(NANDLST), & A(NAX),A(NAY),A(NAZ),A(NVXA),A(NVYA),A(NVZA), & A(NEMSA),A(NDENA),A(NNMSA), @@ -1374,7 +1349,7 @@ PROGRAM MAPVAR & A(NSXXB),A(NSYYB),A(NSZZB),A(NSXYB),A(NSYZB), & A(NSZXB)) 710 CONTINUE -C + CALL MDDEL ('EMSSA') CALL MDDEL ('DENSA') CALL MDDEL ('EMSSB') @@ -1391,14 +1366,13 @@ PROGRAM MAPVAR CALL MDDEL ('SIGXYB') CALL MDDEL ('SIGYZB') CALL MDDEL ('SIGZXB') -C + END IF -C -C + C ***************************************************************** C CLEAN UP STUFF FOR NEXT ELEMENT BLOCK C ***************************************************************** -C + CALL MDDEL ('ISRCHR') CALL MDDEL ('RSRCHR') CALL MDDEL ('LIST') @@ -1433,26 +1407,24 @@ PROGRAM MAPVAR IF (MNERRS .NE. 0) THEN CALL MDEROR(NOUT) END IF -C -c + 50 CONTINUE -C + C ***************************************************************** C STOP COMMAND C ***************************************************************** -C + C CLOSE FILES AND STOP -C -c + CALL BANNR2(84,'NORMAL',NTPOUT) CALL BANNR2(84,'EXIT',NTPOUT) call debug('CLSFIL') CALL CLSFIL -C + call addlog (qainfo(1)) call wrapup(qainfo(1)) STOP -C + 270 FORMAT (3X,/'DATA FROM MESH "A" (MESH & SOLUTION) FILE - ',A, * //,10X,'HEADING - ',A,/) 280 FORMAT (10x,I1,'-DIMENSIONAL MODEL',/ @@ -1474,18 +1446,18 @@ PROGRAM MAPVAR & ,5X,' WAS NOT FOUND IN MESH-A BY SRCHQ') END BLOCK DATA INITLZ -C + C ****************************************************************** -C + C BLOCK DATA SUBROUTINE TO INITIALIZE VARIABLES STORED IN C NAMED COMMON BLOCKS -C + C ****************************************************************** -C + C...NOTE: Cannot include exodusII.inc in a block data routine. PARAMETER (MXSTLN=32) c CHARACTER*10 ELTYPE -C + include 'header.blk' include 'ntpdat.blk' include 'contrl.blk' @@ -1499,7 +1471,7 @@ BLOCK DATA INITLZ include 'varept.blk' include 'debg.blk' include 'inival.blk' -C + DATA HED/' '/ DATA NOUT,NTPOUT,NTP2,NTP3,NTP4/ 1 6,7,12,13,14/ @@ -1517,24 +1489,24 @@ BLOCK DATA INITLZ c 1 'TETRA4','TETRA10','PRISM6','PRISM15','HEX8','HEX20', c 2 'HEX27','SHELL'/ C DATA (NNELM(I),I=1,13)/3,6,4,8,9,4,10,6,15,8,20,27,4/ -C + DATA VALINI /0.0/ DATA TOLSHL,TOLQAD,TOLHEX,TOLTET,NISS,NRSS * /0.01,0.01,0.01,0.01, 5,10/ -C + C TOLSHL=extension of box around MESH-A shell element C TOLQAD=extension of box around MESH-A quad element C TOLHEX=extension of box around MESH-A hex element C NISS=number of integer search scratch (=5) C NRSS=number of real search scratch (=10) -C + DATA TOL,EPS,STRLMT,ITERMX/0.01,0.01,20.,20/ -C + C TOL=difference in isoparametric coords after newton iteration (don't change) C EPS=tolerance used in checking if point is within element or coincident C with a node C STRLMT=tolerance for isoparametric coords to lie within an element -C + END subroutine getval(IMAP, IM, idblka, idblkb, ischem) diff --git a/packages/seacas/applications/mapvar-kd/optkd.c b/packages/seacas/applications/mapvar-kd/optkd.c index c92aeb799ca5..ab3d7e79cf72 100644 --- a/packages/seacas/applications/mapvar-kd/optkd.c +++ b/packages/seacas/applications/mapvar-kd/optkd.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /**************************************************************************/ diff --git a/packages/seacas/applications/mapvar-kd/optkd.h b/packages/seacas/applications/mapvar-kd/optkd.h index e8b64906fcaa..bac815ccfae9 100644 --- a/packages/seacas/applications/mapvar-kd/optkd.h +++ b/packages/seacas/applications/mapvar-kd/optkd.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #define BUCKETSIZE 100 diff --git a/packages/seacas/applications/mapvar-kd/srchh-kd.f b/packages/seacas/applications/mapvar-kd/srchh-kd.f index 47d0f38aef18..72e30b662f58 100644 --- a/packages/seacas/applications/mapvar-kd/srchh-kd.f +++ b/packages/seacas/applications/mapvar-kd/srchh-kd.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details SUBROUTINE SRCHH ( @@ -9,32 +9,32 @@ SUBROUTINE SRCHH ( * NPTS, XYZPTS, TOLSRCH, * NISR, NRSR, NISS, NRSS, ISRCHR, RSRCHR, * LIST, IERR) -C + C----------------------------------------------------------------------- -C + C DESCRIPTION: -C + C THIS SUBROUTINE CALCULATES THE CLOSEST POINT PROBLEM C BETWEEN NPTS POINTS AND NFSRF SURFACES AND RETURNS RESULTS OF C SEARCH IN ISRCHR,RSRCHR -C + C USED HERE FOR FINDING LOCATION OF EITHER NODE OR ELEMENT CENTROID C FROM MESH-B IN HEX-8 ELEMENT OF MESH-A -C + C----------------------------------------------------------------------- -C + C FORMAL PARAMETERS -C + C MEMORY : P=PERMANENT, S=SCRATCH C NAME : IMPLICIT A-H,O-Z REAL, I-N INTEGER C TYPE : INPUT_STATUS/OUTPUT_STATUS (I=INPUT,O=OUTPUT,P=PASSED, C U=UNMODIFIED,-=UNDEFINED) C DESCRIPTION : DESCRIPTION OF VARIABLE -C + C----------------------------------------------------------------------- -C + C CALLING ARGUMENTS: -C + C MEMORY NAME TYPE DESCRIPTION C --- ---- --- ----------- C P NPSRF I/U NUMBER OF POINTS THAT DEFINE THE SURFACE @@ -53,14 +53,13 @@ SUBROUTINE SRCHH ( C P RSRCHR -/O REAL SEARCH RESULTS C S LIST -/- LIST OF POTENTIAL CONTACTS FOR A SURFACE C P IERR -/O ERROR FLAG -C + C----------------------------------------------------------------------- -C + include 'tapes.blk' include 'debg.blk' -C + C INPUT/OUTPUT ARRAYS -C C ... Needed to interact with C routines on 64-bit systems which have C 8-byte integers in Fortran and 4-byte integers in C. @@ -72,9 +71,9 @@ SUBROUTINE SRCHH ( * ISRCHR(NISR,NPTS), RSRCHR(NRSR,NPTS) DIMENSION * XMIN(3), XMAX(3), GXMIN(3), GXMAX(3) -C + C ISRCHR and RSRCHR must be initialized to zero -C + DO 1 I = 1, NPTS DO 2 J = 1, NISR ISRCHR(J,I) = 0 @@ -83,7 +82,7 @@ SUBROUTINE SRCHH ( RSRCHR(K,I) = 0. 3 CONTINUE 1 CONTINUE -C + IF( NISR .LT. 1 .OR. NRSR .LT. 3 .OR. NISS .LT. 5 .OR. * NRSS .LT. 10 )THEN IERR = 1 @@ -126,7 +125,7 @@ SUBROUTINE SRCHH ( write(nout, *) ' Out of kdBuildTree', t2-t1 write(ntpout, *) ' Out of kdBuildTree', t2-t1 end if -C + C LOOP OVER SURFACES AND SEARCH FOR POINTS WITHIN CAPTURE BOX qt = 0.0 j = 0 @@ -146,7 +145,7 @@ SUBROUTINE SRCHH ( NN = LINKSRF(6,IFSRF) NO = LINKSRF(7,IFSRF) NP = LINKSRF(8,IFSRF) -C + XMINMS = MIN(XYZSRF(NI,1),XYZSRF(NJ,1), * XYZSRF(NK,1),XYZSRF(NL,1), * XYZSRF(NM,1),XYZSRF(NN,1), diff --git a/packages/seacas/applications/mapvar-kd/srchq-kd.f b/packages/seacas/applications/mapvar-kd/srchq-kd.f index b72bcf41ce6a..03157230b7d6 100644 --- a/packages/seacas/applications/mapvar-kd/srchq-kd.f +++ b/packages/seacas/applications/mapvar-kd/srchq-kd.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details SUBROUTINE SRCHQ ( @@ -9,32 +9,32 @@ SUBROUTINE SRCHQ ( * NPTS, XYZPTS, TOLSRCH, * NISR, NRSR, NISS, NRSS, ISRCHR, RSRCHR, * LIST, IERR ) -C + C----------------------------------------------------------------------- -C + C DESCRIPTION: -C + C THIS SUBROUTINE CALCULATES THE CLOSEST POINT PROBLEM C BETWEEN NPTS POINTS AND NFSRF SURFACES AND RETURNS RESULTS OF C SEARCH IN ISRCHR,RSRCHR -C + C USED HERE FOR FINDING LOCATION OF EITHER NODE OR ELEMENT CENTROID C FROM MESH-B IN QUAD-4 ELEMENT OF MESH-A -C + C----------------------------------------------------------------------- -C + C FORMAL PARAMETERS -C + C MEMORY : P=PERMANENT, S=SCRATCH C NAME : IMPLICIT A-H,O-Z REAL, I-N INTEGER C TYPE : INPUT_STATUS/OUTPUT_STATUS (I=INPUT,O=OUTPUT,P=PASSED, C U=UNMODIFIED,-=UNDEFINED) C DESCRIPTION : DESCRIPTION OF VARIABLE -C + C----------------------------------------------------------------------- -C + C CALLING ARGUMENTS: -C + C MEMORY NAME TYPE DESCRIPTION C --- ---- --- ----------- C P NPSRF I/U NUMBER OF POINTS THAT DEFINE THE SURFACE @@ -53,15 +53,15 @@ SUBROUTINE SRCHQ ( C P RSRCHR -/O REAL SEARCH RESULTS C S LIST -/- LIST OF POTENTIAL CONTACTS FOR A SURFACE C P IERR -/O ERROR FLAG -C + C----------------------------------------------------------------------- -C + include 'amesh.blk' include 'tapes.blk' include 'debg.blk' -C + C INPUT/OUTPUT ARRAYS -C + C ... Needed to interact with C routines on 64-bit systems which have C 8-byte integers in Fortran and 4-byte integers in C. INTEGER*4 NPTS4, NDIM4, NLIST, LIST(*) @@ -72,9 +72,9 @@ SUBROUTINE SRCHQ ( * ISRCHR(NISR,NPTS), RSRCHR(NRSR,NPTS) DIMENSION * XMIN(2), XMAX(2), GXMIN(2), GXMAX(2) -C + C ISRCHR and RSRCHR must be initialized to zero -C + DO 1 I = 1, NPTS DO 2 J = 1, NISR ISRCHR(J,I) = 0 @@ -83,7 +83,7 @@ SUBROUTINE SRCHQ ( RSRCHR(K,I) = 0. 3 CONTINUE 1 CONTINUE -C + IF( NISR .LT. 1 .OR. NRSR .LT. 2 .OR. NISS .LT. 5 .OR. * NRSS .LT. 10 )THEN IERR = 1 @@ -122,7 +122,7 @@ SUBROUTINE SRCHQ ( write(nout, *) ' Out of kdBuildTree', t2-t1 write(ntpout, *) ' Out of kdBuildTree', t2-t1 end if -C + C LOOP OVER SURFACES AND SEARCH FOR POINTS WITHIN CAPTURE BOX qt = 0.0 j = 0 @@ -137,7 +137,7 @@ SUBROUTINE SRCHQ ( NJ = LINKSRF(2,IFSRF) NK = LINKSRF(3,IFSRF) NL = LINKSRF(4,IFSRF) -C + XMINMS = MIN(XYZSRF(NI,1),XYZSRF(NJ,1), * XYZSRF(NK,1),XYZSRF(NL,1)) XMAXMS = MAX(XYZSRF(NI,1),XYZSRF(NJ,1), @@ -152,7 +152,7 @@ SUBROUTINE SRCHQ ( TOLER = TOLSRCH * (YMAXMS - YMINMS) XMIN(2) = YMINMS - TOLER XMAX(2) = YMAXMS + TOLER -C + C ... Build a list of points in the query region... j = j + 1 C ... Skip past points that are outside search domain. diff --git a/packages/seacas/applications/mapvar-kd/srchs-kd.f b/packages/seacas/applications/mapvar-kd/srchs-kd.f index 16deef6ea2ba..6ca7f2abb942 100644 --- a/packages/seacas/applications/mapvar-kd/srchs-kd.f +++ b/packages/seacas/applications/mapvar-kd/srchs-kd.f @@ -1,41 +1,40 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: srchs.f,v 1.3 2007/10/17 18:43:50 gdsjaar Exp $ SUBROUTINE SRCHS ( * NPSRF, NFSRF, LINKSRF, XYZSRF, * NPTS, XYZPTS, TOLSRCH, * NISR, NRSR, NISS, NRSS, ISRCHR, RSRCHR, * LIST, IERR ) -C + C----------------------------------------------------------------------- -C + C DESCRIPTION: -C + C THIS SUBROUTINE CALCULATES THE CLOSEST POINT PROBLEM C BETWEEN NPTS POINTS AND NFSRF SURFACES AND RETURNS RESULTS OF C SEARCH IN ISRCHR,RSRCHR -C + C USED HERE FOR FINDING LOCATION OF EITHER NODE OR ELEMENT CENTROID C FROM MESH-B IN SHELL ELEMENT OF MESH-A -C + C----------------------------------------------------------------------- -C + C FORMAL PARAMETERS -C + C MEMORY : P=PERMANENT, S=SCRATCH C NAME : IMPLICIT A-H,O-Z REAL, I-N INTEGER C TYPE : INPUT_STATUS/OUTPUT_STATUS (I=INPUT,O=OUTPUT,P=PASSED, C U=UNMODIFIED,-=UNDEFINED) C DESCRIPTION : DESCRIPTION OF VARIABLE -C + C----------------------------------------------------------------------- -C + C CALLING ARGUMENTS: -C + C MEMORY NAME TYPE DESCRIPTION C --- ---- --- ----------- C P NPSRF I/U NUMBER OF POINTS THAT DEFINE THE SURFACE @@ -61,14 +60,14 @@ SUBROUTINE SRCHS ( C S ILO -/- SEARCH BOX MINIMUM INDEX C S IUP -/- SEARCH BOX MAXIMUM INDEX C P IERR -/O ERROR FLAG -C + C----------------------------------------------------------------------- -C + include 'tapes.blk' include 'debg.blk' -C + C INPUT/OUTPUT ARRAYS -C + C ... Needed to interact with C routines on 64-bit systems which have C 8-byte integers in Fortran and 4-byte integers in C. INTEGER*4 NPTS4, NDIM4, NLIST, LIST(*) @@ -79,9 +78,9 @@ SUBROUTINE SRCHS ( * ISRCHR(NISR,NPTS), RSRCHR(NRSR,NPTS) DIMENSION * XMIN(3), XMAX(3), GXMIN(3), GXMAX(3) -C + C ISRCHR and RSRCHR must be initialized to zero -C + DO 1 I = 1, NPTS DO 2 J = 1, NISR ISRCHR(J,I) = 0 @@ -90,7 +89,7 @@ SUBROUTINE SRCHS ( RSRCHR(K,I) = 0. 3 CONTINUE 1 CONTINUE -C + IF( NISR .LT. 1 .OR. NRSR .LT. 4 .OR. NISS .LT. 5 .OR. * NRSS .LT. 10 )THEN IERR = 1 @@ -132,7 +131,7 @@ SUBROUTINE SRCHS ( write(nout, *) ' Out of kdBuildTree', t2-t1 write(ntpout, *) ' Out of kdBuildTree', t2-t1 end if -C + C LOOP OVER SURFACES AND SEARCH FOR POINTS WITHIN CAPTURE BOX qt = 0.0 j = 0 @@ -147,7 +146,7 @@ SUBROUTINE SRCHS ( NJ = LINKSRF(2,IFSRF) NK = LINKSRF(3,IFSRF) NL = LINKSRF(4,IFSRF) -C + XMINMS = MIN(XYZSRF(NI,1),XYZSRF(NJ,1), * XYZSRF(NK,1),XYZSRF(NL,1)) XMAXMS = MAX(XYZSRF(NI,1),XYZSRF(NJ,1), @@ -170,7 +169,7 @@ SUBROUTINE SRCHS ( XMAX(2) = YMAXMS + TOLER XMIN(3) = ZMINMS - TOLER XMAX(3) = ZMAXMS + TOLER -C + C ... Build a list of points in the query region... j = j + 1 C ... Skip past points that are outside search domain. @@ -211,7 +210,7 @@ SUBROUTINE SRCHS ( * NDIM, NPTS, NPSRF, NFSRF, NISR, * NRSR, NRSS, XYZSRF, XYZPTS, LINKSRF, * ISRCHR, RSRCHR, LVAL, IFSRF, TOLSRCH, IERR ) -C + 140 CONTINUE 100 CONTINUE diff --git a/packages/seacas/applications/mapvar-kd/srcht-kd.f b/packages/seacas/applications/mapvar-kd/srcht-kd.f index 4bd2fc935640..1cbe2dcd9caa 100644 --- a/packages/seacas/applications/mapvar-kd/srcht-kd.f +++ b/packages/seacas/applications/mapvar-kd/srcht-kd.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details SUBROUTINE SRCHT ( @@ -9,32 +9,32 @@ SUBROUTINE SRCHT ( * NPTS, XYZPTS, TOLSRCH, * NISR, NRSR, NISS, NRSS, ISRCHR, RSRCHR, * LIST, IERR) -C + C----------------------------------------------------------------------- -C + C DESCRIPTION: -C + C THIS SUBROUTINE CALCULATES THE CLOSEST POINT PROBLEM C BETWEEN NPTS POINTS AND NFSRF SURFACES AND RETURNS RESULTS OF C SEARCH IN ISRCHR,RSRCHR -C + C USED HERE FOR FINDING LOCATION OF EITHER NODE OR ELEMENT CENTROID C FROM MESH-B IN TET-8 ELEMENT OF MESH-A -C + C----------------------------------------------------------------------- -C + C FORMAL PARAMETERS -C + C MEMORY : P=PERMANENT, S=SCRATCH C NAME : IMPLICIT A-H,O-Z REAL, I-N INTEGER C TYPE : INPUT_STATUS/OUTPUT_STATUS (I=INPUT,O=OUTPUT,P=PASSED, C U=UNMODIFIED,-=UNDEFINED) C DESCRIPTION : DESCRIPTION OF VARIABLE -C + C----------------------------------------------------------------------- -C + C CALLING ARGUMENTS: -C + C MEMORY NAME TYPE DESCRIPTION C --- ---- --- ----------- C P NPSRF I/U NUMBER OF POINTS THAT DEFINE THE SURFACE @@ -53,14 +53,14 @@ SUBROUTINE SRCHT ( C P RSRCHR -/O REAL SEARCH RESULTS C S LIST -/- LIST OF POTENTIAL CONTACTS FOR A SURFACE C P IERR -/O ERROR FLAG -C + C----------------------------------------------------------------------- -C + include 'tapes.blk' include 'debg.blk' -C + C INPUT/OUTPUT ARRAYS -C + C ... Needed to interact with C routines on 64-bit systems which have C 8-byte integers in Fortran and 4-byte integers in C. INTEGER*4 NPTS4, NDIM4, NLIST, LIST(*) @@ -71,9 +71,9 @@ SUBROUTINE SRCHT ( * ISRCHR(NISR,NPTS), RSRCHR(NRSR,NPTS) DIMENSION * XMIN(3), XMAX(3), GXMIN(3), GXMAX(3) -C + C ISRCHR and RSRCHR must be initialized to zero -C + DO 1 I = 1, NPTS DO 2 J = 1, NISR ISRCHR(J,I) = 0 @@ -82,7 +82,7 @@ SUBROUTINE SRCHT ( RSRCHR(K,I) = 0. 3 CONTINUE 1 CONTINUE -C + IF( NISR .LT. 1 .OR. NRSR .LT. 3 .OR. NISS .LT. 5 .OR. * NRSS .LT. 10 )THEN IERR = 1 @@ -124,7 +124,7 @@ SUBROUTINE SRCHT ( write(nout, *) ' Out of kdBuildTree', t2-t1 write(ntpout, *) ' Out of kdBuildTree', t2-t1 end if -C + C LOOP OVER SURFACES AND SEARCH FOR POINTS WITHIN CAPTURE BOX qt = 0.0 j = 0 @@ -140,7 +140,7 @@ SUBROUTINE SRCHT ( NJ = LINKSRF(2,IFSRF) NK = LINKSRF(3,IFSRF) NL = LINKSRF(4,IFSRF) -C + XMINMS = MIN(XYZSRF(NI,1),XYZSRF(NJ,1), * XYZSRF(NK,1),XYZSRF(NL,1)) XMAXMS = MAX(XYZSRF(NI,1),XYZSRF(NJ,1), @@ -163,7 +163,7 @@ SUBROUTINE SRCHT ( TOLER = TOLSRCH * (ZMAXMS - ZMINMS) XMIN(3) = ZMINMS - TOLER XMAX(3) = ZMAXMS + TOLER -C + C ... Build a list of points in the query region... j = j + 1 C ... Skip past points that are outside search domain. @@ -207,7 +207,7 @@ SUBROUTINE SRCHT ( * IERR ) 140 CONTINUE 100 CONTINUE -C + C ... More debugging stats if (idebug .ge. 2) then call excpus(t3) diff --git a/packages/seacas/applications/mapvar-kd/version-kd.f b/packages/seacas/applications/mapvar-kd/version-kd.f index 8967f31472cf..97864b5bd571 100644 --- a/packages/seacas/applications/mapvar-kd/version-kd.f +++ b/packages/seacas/applications/mapvar-kd/version-kd.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C************************************************************************ @@ -25,7 +25,6 @@ subroutine version (qainfo) C -- (5) = date of current run C -- (6) = time of current run - qainfo(1) = 'mapvar-kd ' qainfo(2) = '2019/05/15 ' qainfo(3) = ' 2.01 ' diff --git a/packages/seacas/applications/mapvar/getbnd.f b/packages/seacas/applications/mapvar/getbnd.f index 5e294e6cb7ba..8d1def7520f7 100644 --- a/packages/seacas/applications/mapvar/getbnd.f +++ b/packages/seacas/applications/mapvar/getbnd.f @@ -1,58 +1,57 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details SUBROUTINE GETBND(LBLK,NE,X,IND,NP,XMIN,XMAX,NDIM,ILO,IUP, * ISCR,RSCR ) -C + C----------------------------------------------------------------------- -C + C DESCRIPTION: -C + C FIND THE ELEMENTS IN A SORTED ARRAY X WHOSE VALUES FALL IN THE C INTERVAL BETWEEN XMIN AND XMAX. NO ELEMENTS HAVING C VALUES EQUAL TO XMIN OR XMAX ARE INCLUDED. SINCE THE ARRAY IS C SORTED, THE ELEMENTS CAN BE SPECIFIED BY THE UPPER AND C LOWER ELEMENT NUMBERS IN THE RANGE. -C + C | X(ILO) . . . . . . . . . . . . . X(IUP) | C XMIN XMAX X> -C + C IT IS ASSUMED THAT THE ARRAY X HAS BEEN SORTED IN INCREASING ORDER, C BUT THE ELEMENTS HAVE NOT BEEN MOVED. C THE SORTED LIST IS DETERMINED BY THE ARRAY INDX, C WHICH POSITIONS THE ORIGINAL UNSORTED X ARRAY ELEMENTS C IN THE SORTED LIST. THUS, THE 5TH ELEMENT IN THE SORTED LIST IS C X(IND(5)) -C + C----------------------------------------------------------------------- -C + C INPUT: -C + C X - array in unsorted order C IND - index array giving the element order in the sorted list C NP - the number of particles in the list C XMIN - the lower limit of the interval C XMAX - the upper limit of the interval C NDIM - the dimension of the arrays -C + C OUTPUT: -C + C ILO - the first element in the sorted list .gt. xmin C IUP - the last element in the sorted list .lt. xmax -C + C----------------------------------------------------------------------- -C -C + include 'tapes.blk' -C + DIMENSION * X(NDIM),IND(NDIM),XMIN(LBLK),XMAX(LBLK),ILO(LBLK),IUP(LBLK) DIMENSION * ISCR(5*LBLK),RSCR(LBLK) -C + C INTEGER SCRATCH SPACE ISP = 1 LIL = ISP @@ -69,7 +68,7 @@ SUBROUTINE GETBND(LBLK,NE,X,IND,NP,XMIN,XMAX,NDIM,ILO,IUP, ISP = 1 LXTST = ISP C ISP = ISP + LBLK -C + DO 200 J = 1, NE, LBLK N = MIN(LBLK,NE-J+1) C SEARCH TO FIND THE FIRST ELEMENT .GE. XMIN @@ -84,8 +83,8 @@ SUBROUTINE GETBND(LBLK,NE,X,IND,NP,XMIN,XMAX,NDIM,ILO,IUP, DO 100 JJ = 1, N IUP(J+JJ-1)=IUP(J+JJ-1) - 1 100 CONTINUE -C + 200 CONTINUE RETURN END -C + diff --git a/packages/seacas/applications/mapvar/mapvar.f b/packages/seacas/applications/mapvar/mapvar.f index d83bbac4450a..b0f3acc45cf1 100644 --- a/packages/seacas/applications/mapvar/mapvar.f +++ b/packages/seacas/applications/mapvar/mapvar.f @@ -1,35 +1,34 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details - C======================================================================= *DECK,MAPVAR PROGRAM MAPVAR -C + C ****************************************************************** -C + C --MAPVAR-- C A PROGRAM TO MAP FINITE ELEMENT RESULTS C FROM ONE EXODUS-II RESTART FILE TO ANOTHER C EXODUS-II RESTART FILE TO SUPPORT REMESHING -C + C GERALD W. WELLMAN C SANDIA NATIONAL LABORATORIES C ALBUQUERQUE, NEW MEXICO -C + C MAPVAR IS BASED ON MERLIN II,A FINITE ELEMENT INTERPOLATION C PROGRAM BY DAVID K. GARTLING. -C + C THE MERLIN PROGRAM IS DESIGNED TO TRANSFER DATA BETWEEN TWO- AND C THREE-DIMENSIONAL FINITE ELEMENT MESHES. GIVEN A FINITE ELEMENT C MESH, (MESH-A), AND A SOLUTION FIELD ON THAT MESH, MERLIN C INTERPOLATES THE GIVEN SOLUTION ONTO A SECOND FINITE ELEMENT MESH, C (MESH-B). THE INTERPOLATION PROCEDURE IS BASED ON USE OF THE C ELEMENT SHAPE FUNCTIONS IN MESH-A. -C + C MAPVAR IS DESIGNED TO SERVE THE SAME GENERAL PURPOSE AS MERLIN C HOWEVER, MAPVAR IS DESIGNED TO PROVIDE THE TRANSLATION IN TERMS C OF EXODUS-II-V2 RESTART FILES. MAPVAR ALSO TRANSLATES ELEMENT @@ -39,12 +38,12 @@ PROGRAM MAPVAR C ORIGINALLY SUPPORTED BY MERLIN CAN BE INCLUDED IN MAPVAR GIVEN C THE DESIRE AND RESOURCES. THE SEARCH ENGINE OF MAPVAR HAS BEEN C CHANGED TO A BINARY SEARCH FROM THE BIN OR BUCKET SEARCH OF MERLIN. -C + C THE INTENT OF MAPVAR IS TO CREATE A RESTART FILE THAT WILL ALLOW C A FINITE ELEMENT SOLUTION TO PROCEED WITH A DIFFERENT MESH THAN C THE MESH WITH WHICH THE SOLUTION WAS STARTED. THUS, THERE IS AN C INHERENT ASSUMPTION THAT MESH-A IS AN EXODUS RESTART FILE. -C + C NODAL VARIABLE TRANSFER IS STRAIGHT FORWARD. THE MESH-B NODE IS C FOUND INSIDE THE APPROPRIATE MESH-A ELEMENT. THE ELEMENT SHAPE C FUNCTIONS ARE USED TO INTERPOLATE RESULTS ONTO THE MESH-B NODE. @@ -61,7 +60,7 @@ PROGRAM MAPVAR C NODES. THE CONSTRAINTS ARE BASED ON THE REQUIREMENTS OF THE C CONSTITUTIVE MODEL. FINALLY, A DIRECT TRANSFER HAS BEEN IMPLEMENTED C BUT IS NOT RECOMMENDED. -C + C Special considerations: C ELMASS - translated to nodal density, interpolated, translated C back to ELMASS @@ -70,10 +69,10 @@ PROGRAM MAPVAR C EQPS - constrained to be .gt. 0. C TEARING - constrained to be .gt. 0. C DECAY - constrained to be .lt. 1. -C + C Code Tree: C (SUPES, EXODUSII, and multiple calls to ERROR not included) -C + C SET-UP C MAPVAR - OPNFIL C ERROR - CLSFIL @@ -181,12 +180,11 @@ PROGRAM MAPVAR C WRTC C BANNER C CLSFIL -C -C + C SUPES CALLS: C EXDATE, EXTIME, FREFLD, MDDEL, MDEROR, MDGET, C MDINIT, MDRSRV, MDSTAT, STRIPB -C + C EXODUSII CALLS: C EXCLOS, EXINQ, (EXOPN)-fcn, C EXGATM, EXGCON, EXGCOR, EXGEAT, EXGEBI, EXGELB, @@ -198,19 +196,19 @@ PROGRAM MAPVAR C EXPGV, EXPINI, EXPNS, EXPNSD, EXPNV, EXPNP, C EXPP, EXPPN, EXPQA, EXPSP, EXPSS, EXPSSD, C EXPTIM, EXPVAN, -C + C ****************************************************************** -C + C THE BASIC REFERENCE DOCUMENT FOR THIS CODE IS SAND 99-0466 -C + C ****************************************************************** -C + C COMPUTER CODE MANAGEMENT SYSTEM INFORMATION -- -C -C CURRENT VERSION DESIGNATOR- $Revision: 1.12 $ -C + +C CURRENT VERSION DESIGNATOR- 1.12 + C ****************************************************************** -C + include 'aexds1.blk' include 'aexds2.blk' include 'amesh.blk' @@ -227,44 +225,43 @@ PROGRAM MAPVAR include 'toldat.blk' include 'varnpt.blk' include 'varept.blk' -C + DIMENSION A(1),IA(1) EQUIVALENCE (A(1),IA(1)) CHARACTER*(MXSTLN) TYP CHARACTER*8 MEMDBG C ****************************************************************** -C + C MAIN PROGRAM FOR MAPVAR C PROGRAM EXECUTION IS DIRECTED FROM THIS ROUTINE -C + C ****************************************************************** -C + C NOTE : ALL ELEMENT DATA,NODAL POINT DATA, SOLUTION FIELDS, WORK C SPACE, ETC. ARE STORED IN THE ARRAY "A". THE MEMORY C MANAGER REQUESTS THE NEEDED STORAGE SPACE IN "A" DURING C EXECUTION. THE POINTERS NA1,NA2,....NAM PARTITION THE C ALLOCATED STORAGE INTO SEPARATE ARRAYS. SEE SAND86-0911, C "SUPES", FOR DETAILS OF THE MEMORY MANAGER. -C + C ****************************************************************** -C + C open all disk files -C C disable netcdf warning messages -C + CALL EXOPTS(0,IERR) -C + call debug('MVOPNFIL') CALL MVOPNFIL -C + C get info for QA records -C + CALL VERSION(QAINFO) -C + C initialize memory manager -C + CALL MDINIT (A) C ... If EXT99 Environment variable set, turn on supes memory debugging @@ -276,24 +273,23 @@ PROGRAM MAPVAR CALL MDDEBG(IUNIT) END IF 20 CONTINUE -C -C + C ****************************************************************** C read input parameters needed to control the solution from C the screen (time step(s), bins) C ****************************************************************** -C + CALL EXINQ(NTP2EX,EXTIMS,NTIMES,RDUM,CDUM,IERR) CALL EXGINI (NTP2EX,HED,NDIMA,NODESA,NUMELA,NBLKSA, & NUMNPS,NUMESS,IERR) CALL EXGINI (NTP3EX,HED,NDIMB,NODESB,NUMELB,NBLKSB, & NUMNPS,NUMESS,IERR) -C + C A(NT1) = TIMES(1:NTIMES) - times on Mesh-A database C IA(NAEB) = IDA(1:NBLKSA) - Donor mesh element block I.D.'s C IA(NBEB) = IDB(1:NBLKSA) - Recipient mesh element block I.D.'s C IA(NMAP) = MP(1:3,1:MBLK) - Donor to recipient mesh map -C + MBLK = NBLKSA * NBLKSB CALL MDRSRV ('TIMES', NT1, NTIMES) CALL MDRSRV ('IDA', NAEB, NBLKSA) @@ -310,32 +306,30 @@ PROGRAM MAPVAR & 'MEMORY MANAGER ERROR', & 'JUST BEFORE CALL TO RDINPT',0,' ',0,' ',' ',1) END IF -C -C + call debug('RDINPT') CALL RDINPT (A(NT1),IA(NAEB),IA(NBEB),IA(NMAP),A(NMAPS),IMP,MBLK) -C -C + C ****************************************************************** C INITIAL READ OF MESH-A C ****************************************************************** -C + C read sizing data for mesh A -C + WRITE (NOUT, 270) fntp2(:lenstr(fntp2)), HED WRITE (NTPOUT, 270) fntp2(:lenstr(fntp2)), HED WRITE (NOUT, 280) NDIMA,NODESA,NUMELA,NBLKSA WRITE (NTPOUT, 280) NDIMA,NODESA,NUMELA,NBLKSA -C + C allocate storage for initial read of mesh A -C + C A(NAX) = XA(1:NODESA) - Mesh-A X-coord C A(NAY) = YA(1:NODESA) - Mesh-A Y-coord C A(NAZ) = ZA(1:NODESA) - Mesh-A Z-coord C A(NADX) = DISXA(1:NODESA) - Mesh-A X-displ C A(NADY) = DISYA(1:NODESA) - Mesh-A Y-displ C A(NADZ) = DISZA(1:NODESA) - Mesh-A Z-displ -C + CALL MDRSRV ('XA', NAX, NODESA) CALL MDRSRV ('DISXA', NADX, NODESA) CALL MDRSRV ('YA', NAY, NODESA) @@ -354,30 +348,26 @@ PROGRAM MAPVAR & 'MEMORY MANAGER ERROR', & 'JUST BEFORE CALL TO RDA1',0,' ',0,' ',' ',1) END IF -C -C + C Copy "GENESIS" from mesh-B to mesh-C -C + CALL EXCOPY(NTP3EX,NTP4EX,IERR) IF (IERR .NE. 0) & CALL ERROR('MAPVAR', & 'ERROR WITH EXCOPY - GENESIS FILE COPY', & ' ',0,' ',0,' ',' ',1) -C -C + c read mesh A (coords,displ,variable names,QA, INFO records), c write mesh C, (variable names, QA, INFO records) -c -c + call debug('RDA1') CALL RDA1 (A(NAX),A(NAY),A(NAZ),A(NADX),A(NADY),A(NADZ)) -C C ... Mapvar is buggy if mesh contains: C * nodal variable(s) C * multiple element blocks C * multiple timesteps -C + C The interpolated mesh will have invalid values for most of the C nodes except for those connected to the last element block. C Since this is not what the user wants. We check this situation @@ -410,10 +400,10 @@ PROGRAM MAPVAR IF (IACCU .EQ. 1)THEN IF (IXVEL .NE. 0 .AND. IYVEL .NE. 0 .AND. & (IELMS .NE. 0 .OR. IDENS .NE. 0))THEN -C + C velocities and mass are available, compute momenta and k.e. C 1st set up storage for vel's -C + C A(NVXA) = VELXA(1:NODESA) - X-velocity in mesh-A C A(NVYA) = VELYA(1:NODESA) - Y-velocity in mesh-A C A(NVZA) = VELZA(1:NODESA) - Z-velocity in mesh-A @@ -422,7 +412,7 @@ PROGRAM MAPVAR C A(NVYB) = VELYB(1:NODESB) - Y-velocity in mesh-B C A(NVZB) = VELZB(1:NODESB) - Z-velocity in mesh-B C A(NNMSB) = RMSNB(1:NODESB) - nodal mass in mesh-B -C + CALL MDRSRV ('VELXA', NVXA, NODESA) CALL MDRSRV ('VELYA', NVYA, NODESA) IF (NDIMA .EQ. 3)THEN @@ -446,28 +436,28 @@ PROGRAM MAPVAR & 'CHECK ACCURACY - VELOCITY', & 0,' ',0,' ',' ',1) END IF -C + C initialization quantities (6 each for now) that need to be C summed over the element blocks if doing an accuracy check -C + IF (ISTEP .EQ. -1)THEN -C + C need arrays (one slot for each time), else just scalars will do -C + C A(NTMXA) = TMXA(1:NTIMES) - X-momentum all mesh-A blocks each time C A(NTMYA) = TMYA(1:NTIMES) - Y-momentum all mesh-A blocks each time C A(NTMZA) = TMZA(1:NTIMES) - Z-momentum all mesh-A blocks each time C A(NTKEA) = TKEA(1:NTIMES) - K.E. all mesh-A blocks each time C A(NTPSQA) = TPSQA(1:NTIMES) - Pressure squared mesh-A each time C A(NTJ2A) = TJ2A(1:NTIMES) - J2 mesh-A each time -C + C A(NTMXB) = TMXB(1:NTIMES) - X-momentum all mesh-B blocks each time C A(NTMYB) = TMYB(1:NTIMES) - Y-momentum all mesh-B blocks each time C A(NTMZB) = TMZB(1:NTIMES) - Z-momentum all mesh-B blocks each time C A(NTKEB) = TKEB(1:NTIMES) - K.E. all mesh-B blocks each time C A(NTPSQB) = TPSQB(1:NTIMES) - Pressure squared mesh-B each time C A(NTJ2B) = TJ2B(1:NTIMES) - J2 mesh-B each time -C + CALL MDRSRV('TMXA', NTMXA, NTIMES) CALL MDRSRV('TMYA', NTMYA, NTIMES) CALL MDRSRV('TMZA', NTMZA, NTIMES) @@ -510,22 +500,20 @@ PROGRAM MAPVAR END IF END IF END IF -C -C + C ****************************************************************** C INITIAL READ OF MESH-B C ****************************************************************** -C -C + C read sizing data for mesh B -C + WRITE (NOUT, 290) fntp3(:lenstr(fntp3)), HED WRITE (NTPOUT, 290) fntp3(:lenstr(fntp3)), HED WRITE (NOUT, 300) NDIMB,NODESB,NUMELB,NBLKSB WRITE (NTPOUT, 300) NDIMB,NODESB,NUMELB,NBLKSB -c + c quick initial check of compatibility mesh-A to mesh-B -c + IF (NDIMB .NE. NDIMA) THEN CALL ERROR('MAPVAR', & 'MESH-B INCOMPATIBLE WITH MESH-A', @@ -533,13 +521,13 @@ PROGRAM MAPVAR & 'DIMENSION OF MESH-B',NDIMB, & ' ',' ',1) END IF -C + C allocate storage for mesh B read -C + C A(NBX) = XB(1:NODESB) - Mesh-B X-coord C A(NBY) = YB(1:NODESB) - Mesh-B Y-coord C A(NBZ) = ZB(1:NODESB) - Mesh-B Z-coord -C + CALL MDRSRV ('XB', NBX, NODESB) CALL MDRSRV ('YB', NBY, NODESB) IF (NDIMB.EQ.3) THEN @@ -555,32 +543,29 @@ PROGRAM MAPVAR & 'JUST BEFORE CALL TO RDB1', & 0,' ',0,' ',' ',1) END IF -C -C + c read coordinates for mesh B -c + call debug('RDB1') CALL RDB1 (A(NBX),A(NBY),A(NBZ)) -C -C + C ********************************************************* C START INTERPOLATION C ********************************************************* -C + C set up memory for arrays for nodal results and truth table C these arrays stay around forever - they don't get deleted C after each element block is processed like the arrays C set up within the element block loop -C + C A(NASOLN) = SOLNA(1:NODESA,1:NVARNP) - Mesh-A nodal data C A(NBSOLN) = SOLNB(1:NODESB,1:NVARNP) - Mesh-B interpolated C nodal data C IA(ITTA) = ITRTA(1:NVAREL,1:NBLKSA) - Mesh-A truth table C IA(ITTB) = ITRTB(1:NVAREL,1:NBLKSB) - Mesh-B truth table -C + C A(NSN) = SN(1:NODESB) - storage for nodal vars in ininod C A(NSE) = SE(1:NODESB) - storage for element vars in ininod -C CALL MDRSRV ('SOLNA', NASOLN, NODESA*NVARNP) CALL MDRSRV ('SOLNB', NBSOLN, NODESB*NVARNP) @@ -588,7 +573,7 @@ PROGRAM MAPVAR CALL MDRSRV ('ITRTB', ITTB, NVAREL*NBLKSB) CALL MDRSRV ('SN', NSN, NODESB) CALL MDRSRV ('SE', NSE, NODESB) -C + CALL MDSTAT (MNERRS, MNUSED) IF (MNERRS .NE. 0) THEN CALL MDEROR(NOUT) @@ -602,28 +587,26 @@ PROGRAM MAPVAR call debug('TRUTBL') CALL TRUTBL(IA(NMAP),IMP,IA(NAEB),IA(NBEB),IA(ITTA),IA(ITTB)) -C + C ********************************************************************* -C + C START OF ELEMENT BLOCK-BY-ELEMENT BLOCK INTERPOLATION LOOP -C + C ********************************************************************* -C + C store default values of search box tolerances per element type TOLSHC = TOLSHL TOLQAC = TOLQAD TOLHEC = TOLHEX TOLTEC = TOLTET -c C A(NAGV) = GVAR(1:NVARGP) Global variables -C + CALL MDRSRV ('GVAR', NAGV, NVARGP) -C + call debug('WRTC') CALL WRTC(A(NBX),A(NBY),A(NBZ),A(NAGV),A(NBSOLN)) -C -C + DO 50 IM = 1, IMP call getval(ia(nmap), im, idblka, idblkb, ischem) TOLSEA = A(NMAPS+IM-1) @@ -644,13 +627,12 @@ PROGRAM MAPVAR 25 continue 26 continue -C C set up controls for many to 1 map C if first time recipient mesh element block called, insub = 1 C else insub = 2 C if last time recipient mesh element block called, icompl = 1 C else icompl = 0 -C + INSUB = 1 ICOMPL = 1 IF (IM .GT. 1)THEN @@ -665,18 +647,17 @@ PROGRAM MAPVAR ICOMPL = 0 END IF END IF -C -C + C ********************************************************** C ELEMENT BLOCK BY ELEMENT BLOCK INTERPOLATION C REQUIRED FOR ELEMENT DATA BUT ALSO USED FOR NODAL DATA C ********************************************************** -C + WRITE(NOUT,330)IM,IMP,IDBLKB WRITE(NOUT,320)IDBLKA WRITE(NTPOUT,330)IM,IMP,IDBLKB WRITE(NTPOUT,320)IDBLKA -C + CALL EXGELB(NTP2EX,IDBLKA,TYP,NUMEBA,NELNDA,NATRIB, & IERR) CALL EXGELB(NTP3EX,IDBLKB,TYP,NUMEBB,NELNDB,NATRIB, @@ -684,24 +665,23 @@ PROGRAM MAPVAR IF (NUMEBB .EQ. 0)THEN GO TO 50 END IF -C + C set up arrays for element block-by-element block preliminaries C these arrays will be deleted at the end of the loop -C -C + C IA(NACON) = ICONA(1:NELNDA,1:NUMEBA) - Mesh-A connectivity C IA(NBCON) = ICONB(1:NELNDB,1:NUMEBB) - Mesh-B connectivity C IA(NANDLST) = NDLSTA(1:NODESA) - Mesh-A nodes in element block C IA(NBNDLST) = NDLSTB(1:NODESB) - Mesh-A nodes in element block C A(NASTAT) = STATUS(1:NUMEBA) - Mesh-A element status -C + CALL MDRSRV ('ICONA', NACON, NELNDA*NUMEBA) CALL MDRSRV ('ICONB', NBCON, NELNDB*NUMEBB) CALL MDRSRV ('NDLSTA', NANDLST, NODESA) CALL MDRSRV ('NDLSTB', NBNDLST, NODESB) CALL MDRSRV ('STATUS', NASTAT, NUMEBA) CALL MDSTAT (MNERRS, MNUSED) -C + IF (MNERRS .NE. 0) THEN CALL MDEROR(NOUT) CALL ERROR('MAPVAR', @@ -709,15 +689,15 @@ PROGRAM MAPVAR & 'BLOCKS LOOP PRELIMINARIES', & 0,' ',0,' ',' ',1) END IF -C + c 2nd read of mesh A -c + call debug('RDA2') CALL RDA2 (IDBLKA,IA(NACON),IA(NANDLST),A(NASTAT), & MAXLN) -C + C Set the search box tolerance for the current mapping -C + IF ( ITYPE .EQ. 13) THEN C shell IF ( TOLSEA .GT. 0.0) THEN @@ -760,16 +740,15 @@ PROGRAM MAPVAR & 'ELEMENT TYPE =',ITYPE, & 'NOT YET IMPLEMENTED',0,' ',' ',1) END IF -c + c 2nd read of mesh-b -c + call debug('RDB2') CALL RDB2(IDBLKB,IDBLKA,IA(NBCON),IA(NBNDLST)) -C -C + C set up arrays for element block-by-element block processing C these arrays will be deleted at the end of the loop -C + C IA(NS1) = ISRCHR(1:1(NISR),1:NUMNDB) Integer search results C A(NS2) = RSRCHR(1:6(NRSR),1:NUMNDB) Real search results C IA(NS3) = LIST(1:NUMNDB) Potential contacts @@ -788,7 +767,7 @@ PROGRAM MAPVAR C A(NS15) = RSCR(1:NRSS,1:LBLK) Real scratch C A(NS16) = XYZSRF(1:NODESA,1:3) Coords defining element C A(NS17) = XYZPTS(1:NUMNDB,1:3) Coords of points searched -C + C A(NASOLE) = SOLEA(1:NUMEBA,1:NVAREL) - Mesh-A element data C A(NBSOLE) = SOLEB(1:NUMEBB,1:NVAREL) - Mesh-B interpolated C element data @@ -819,10 +798,10 @@ PROGRAM MAPVAR CALL MDRSRV ('RSCR', NS15, NRSS*LBLK) CALL MDRSRV ('XYZSRF', NS16, NODESA*3) CALL MDRSRV ('XYZPTS', NS17, idim*3) -C + CALL MDRSRV ('SOLEA', NASOLE, NUMEBA*NVAREL) CALL MDRSRV ('SOLEB', NBSOLE, NUMEBB*NVAREL) -C + IF (ISCHEM .EQ. 0)THEN CALL MDRSRV ('SOLENA', NASOLEN, NODESA*NVAREL) CALL MDRSRV ('NELTN', NANELTN, NODESA) @@ -844,7 +823,7 @@ PROGRAM MAPVAR CALL ERROR('MAPVAR',' ','ISCHEM', & ischem,'INCORRECT ARGUMENT',0,' ',' ',1) END IF -C + CALL MDSTAT (MNERRS, MNUSED) IF (MNERRS .NE. 0) THEN CALL MDEROR(NOUT) @@ -853,148 +832,147 @@ PROGRAM MAPVAR & 'JUST AFTER START OF BLOCKS LOOP', & 0,' ',0,' ',' ',1) END IF -C -C + IF (ITYPE .EQ. 13)THEN -C + C ********************************************************** C Path through code for shells C ********************************************************** -C + call debug('BLDSRF') CALL BLDSRF(A(NAX),A(NAY),A(NAZ),A(NS16)) -C + IF (NVARNP .GT. 0)THEN -C + call debug('BLDPTN') CALL BLDPTN(A(NBX),A(NBY),A(NBZ),IA(NBNDLST),A(NS17)) -C + call debug('SRCHS-nodes') CALL SRCHS (NODESA,NUMEBA,IA(NACON),A(NS16), 1 NUMNDB,A(NS17),TOLSHL,1,6, 2 NISS,NRSS,IA(NS1),A(NS2),LBLK, 3 IA(NS3),IA(NS4),IA(NS5),IA(NS6),IA(NS7),IA(NS8),IA(NS9), 4 IA(NS10),IA(NS11),A(NS12),A(NS13),IA(NS14),A(NS15),IERR) -C + call debug('SINTPN') CALL SINTPN(IA(NACON),A(NASOLN),IA(NS1),1,A(NS2),6, 1 A(NBSOLN),IA(NBNDLST),A(NBX),A(NBY),A(NBZ), 2 IDBLKB,A(NT1),INSUB,A(NSN)) -C + END IF IF (NVAREL .GT. 0)THEN -C + call debug('BLDPTE') CALL BLDPTE(A(NBX),A(NBY),A(NBZ),IA(NBCON),A(NS17)) -C + call debug('SRCHS-element centroids') CALL SRCHS (NODESA,NUMEBA,IA(NACON),A(NS16), 1 NUMEBB,A(NS17),TOLSHL,1,6, 2 NISS,NRSS,IA(NS1),A(NS2),LBLK, 3 IA(NS3),IA(NS4),IA(NS5),IA(NS6),IA(NS7),IA(NS8),IA(NS9), 4 IA(NS10),IA(NS11),A(NS12),A(NS13),IA(NS14),A(NS15),IERR) -C + c element centroid values to nodes by averaging -c + IF (ISCHEM .EQ. 0)THEN -C + C Set up time steps -C + IF (ISTEP .EQ. -1)THEN NTM = NTIMES ELSE NTM = 1 END IF -C + DO 610 IST = 1, NTM IF (ISTEP .EQ. -1)THEN ISTP = IST ELSE ISTP = ISTEP END IF -C + call debug('SETON0') CALL SETON0(IA(NACON),IA(NANELTN),A(NASOLE), & A(NASOLEN),IDBLKA,A(NAX),A(NAY),A(NAZ),ISTP, & IA(ITTB),IBLKB) -C + call debug('SINTPE') CALL SINTPE(IA(NACON),A(NASOLEN),IA(NS1),1,A(NS2),6, & A(NBSOLE),IDBLKB,A(NBX),A(NBY),A(NBZ), & IA(NBCON),IA(ITTB),IBLKB,A(NT1),A(NS17), & ISTP,IST,INSUB,ICOMPL,A(NSE)) 610 CONTINUE -C + ELSE IF (ISCHEM .EQ. 1) THEN -C + call debug('INVCON') CALL INVCON(IA(NAINVLN),MAXLN,IA(NAINVC),IA(NACON)) -C + C Set up time steps -C + IF (ISTEP .EQ. -1)THEN NTM = NTIMES ELSE NTM = 1 END IF -C + DO 620 IST = 1, NTM IF (ISTEP .EQ. -1)THEN ISTP = IST ELSE ISTP = ISTEP END IF -C + call debug('SETON1') CALL SETON1(A(NACTR),A(NASOLE),A(NASOLEN),IDBLKA, & A(NAX),A(NAY),A(NAZ),IA(NACON),IA(NANDLST), & IA(NAINVLN),IA(NAINVC),MAXLN,ISTP, & IA(ITTB),IBLKB) -C + call debug('SINTPE') CALL SINTPE(IA(NACON),A(NASOLEN),IA(NS1),1,A(NS2),6, & A(NBSOLE),IDBLKB,A(NBX),A(NBY),A(NBZ), & IA(NBCON),IA(ITTB),IBLKB,A(NT1),A(NS17), & ISTP,IST,INSUB,ICOMPL,A(NSE)) 620 CONTINUE -C + ELSE IF (ISCHEM .EQ. 2) THEN -c + c direct transfer, does not require scatter to nodes -c + call debug('STRAN') CALL STRAN(IA(NS1),1,A(NASOLE),A(NBSOLE), & IDBLKA,IDBLKB, & IA(ITTB),IBLKB,A(NT1),A(NS17), & INSUB,ICOMPL, & A(NBX),A(NBY),A(NBZ),IA(NBCON),A(NSE)) -C + ELSE IF (ISCHEM .EQ. 3)THEN -C + call debug('INVCON') CALL INVCON(IA(NAINVLN),MAXLN,IA(NAINVC),IA(NACON)) -C + C Set up time steps -C + IF (ISTEP .EQ. -1)THEN NTM = NTIMES ELSE NTM = 1 END IF -C + DO 630 IST = 1, NTM IF (ISTEP .EQ. -1)THEN ISTP = IST ELSE ISTP = ISTEP END IF -C + call debug('ELGRAD') CALL ELGRAD(A(NACTR),A(NAX),A(NAY),A(NAZ), & A(NASOLE),A(NSOLGR),IA(NICHKE), & IDBLKA,IA(NACON),IA(NAINVLN),IA(NAINVC), & MAXLN,ISTP,IA(ITTB),IBLKB) -C + call debug('INTRP3') CALL INTRP3(A(NACTR),A(NS17),IA(NS1), & A(NBSOLE),A(NASOLE),A(NSOLGR), @@ -1002,37 +980,36 @@ PROGRAM MAPVAR & ISTP,IST,INSUB,ICOMPL, & A(NBX),A(NBY),A(NBZ),IA(NBCON),A(NSE)) 630 CONTINUE -C + ELSE CALL ERROR('MAPVAR',' ','ISCHEM =', & ischem,'INCORRECT ARGUMENT',0,' ',' ',1) END IF -C + END IF -C + C ITYPE = 3 - 4 node quad C ITYPE = 4 - 8 node quad C ITYPE = 5 - 9 node quad -C + ELSE IF (ITYPE .EQ. 3 .OR. ITYPE .EQ. 4 .OR. & ITYPE .EQ. 5) THEN -C -C + C ***************************************************** C PATH THROUGH CODE FOR CONTINUUM ELEMENTS C (QUAD-4) C ***************************************************** -C + C find and store location of mesh-b nodes within mesh-a -C + call debug('BLDSRF') CALL BLDSRF(A(NAX),A(NAY),A(NAZ),A(NS16)) -C + IF (NVARNP .GT. 0)THEN -C + call debug('BLDPTN') CALL BLDPTN(A(NBX),A(NBY),A(NBZ),IA(NBNDLST),A(NS17)) -C + call debug('SRCHQ-nodes') CALL SRCHQ (NODESA,NUMEBA,IA(NACON),A(NS16), 1 NUMNDB,A(NS17),TOLQAD,1,3, @@ -1045,141 +1022,139 @@ PROGRAM MAPVAR c WRITE(NTPOUT,430)IA(NBNDLST-1+I),IDBLKB c END IF c 530 CONTINUE -C + c interpolate nodal variables -c + c write(nout,1037) c write(ntpout,1037) CALL INTRPN(IA(NACON),A(NASOLN),IA(NS1),A(NS2), & A(NBSOLN),IA(NBNDLST),A(NBX),A(NBY),A(NBZ), & IDBLKB,A(NT1),INSUB,A(NSN)) -c + c start element variable interpolation -c -c + c locate Mesh-B element centroid in Mesh-A -c + END IF IF (NVAREL .GT. 0)THEN -C + call debug('BLDPTE') CALL BLDPTE(A(NBX),A(NBY),A(NBZ),IA(NBCON),A(NS17)) -C + call debug('SRCHQ-element centroids') CALL SRCHQ (NODESA,NUMEBA,IA(NACON),A(NS16), 1 NUMEBB,A(NS17),TOLQAD,1,3, 2 NISS,NRSS,IA(NS1),A(NS2),LBLK, 3 IA(NS3),IA(NS4),IA(NS5),IA(NS6),IA(NS7),IA(NS8),IA(NS9), 4 IA(NS10),IA(NS11),A(NS12),A(NS13),IA(NS14),A(NS15),IERR) -C -c + c element centroid variables averaged to nodes -c + IF (ISCHEM .EQ. 0)THEN -C + C Set up time steps -C + IF (ISTEP .EQ. -1)THEN NTM = NTIMES ELSE NTM = 1 END IF -C + DO 640 IST = 1, NTM IF (ISTEP .EQ. -1)THEN ISTP = IST ELSE ISTP = ISTEP END IF -C + call debug('ELTON0') CALL ELTON0(IA(NACON),IA(NANELTN),A(NASOLE), & A(NASOLEN),IDBLKA,A(NAX),A(NAY),A(NAZ),ISTP, & IA(ITTB),IBLKB) -c + c interpolate element vars -c + call debug('INTRPE') CALL INTRPE(IA(NACON),A(NASOLEN),IA(NS1),A(NS2), 1 A(NBSOLE),IDBLKB,A(NBX),A(NBY),A(NBZ), 2 IA(NBCON),IA(ITTB),IBLKB,A(NT1), 3 A(NS17),ISTP,IST,INSUB,ICOMPL,A(NSE)) 640 CONTINUE -C + c element centroid variables linear least squares to nodes -c + ELSE IF (ISCHEM .EQ. 1)THEN -C + call debug('INVCON') CALL INVCON(IA(NAINVLN),MAXLN,IA(NAINVC),IA(NACON)) -C + C Set up time steps -C + IF (ISTEP .EQ. -1)THEN NTM = NTIMES ELSE NTM = 1 END IF -C + DO 650 IST = 1, NTM IF (ISTEP .EQ. -1)THEN ISTP = IST ELSE ISTP = ISTEP END IF -C + call debug('ELTON1') CALL ELTON1(A(NACTR),A(NASOLE),A(NASOLEN),IDBLKA, & A(NAX),A(NAY),A(NAZ),IA(NACON),IA(NANDLST), & IA(NAINVLN),IA(NAINVC),MAXLN,ISTP, & IA(ITTB),IBLKB) -c + c interpolate element vars -c + call debug('INTRPE') CALL INTRPE(IA(NACON),A(NASOLEN),IA(NS1),A(NS2), 1 A(NBSOLE),IDBLKB,A(NBX),A(NBY),A(NBZ), 2 IA(NBCON),IA(ITTB),IBLKB,A(NT1), 3 A(NS17),ISTP,IST,INSUB,ICOMPL,A(NSE)) 650 CONTINUE -C + ELSE IF (ISCHEM .EQ. 2)THEN -C + c direct transfer from Mesh-A to Mesh-B -c + call debug('TRANAB') CALL TRANAB(IA(NS1),A(NASOLE),A(NBSOLE), & IDBLKA,IDBLKB, & IA(ITTB),IBLKB,A(NT1),A(NS17), & INSUB,ICOMPL, & A(NBX),A(NBY),A(NBZ),IA(NBCON),A(NSE)) -c + ELSE IF (ISCHEM .EQ. 3)THEN -C + call debug('INVCON') CALL INVCON(IA(NAINVLN),MAXLN,IA(NAINVC),IA(NACON)) -C + C Set up time steps -C + IF (ISTEP .EQ. -1)THEN NTM = NTIMES ELSE NTM = 1 END IF -C + DO 660 IST = 1, NTM IF (ISTEP .EQ. -1)THEN ISTP = IST ELSE ISTP = ISTEP END IF -C + call debug('ELGRAD') CALL ELGRAD(A(NACTR),A(NAX),A(NAY),A(NAZ), & A(NASOLE),A(NSOLGR),IA(NICHKE), & IDBLKA,IA(NACON),IA(NAINVLN),IA(NAINVC), & MAXLN,ISTP,IA(ITTB),IBLKB) -C + call debug('INTRP3') CALL INTRP3(A(NACTR),A(NS17),IA(NS1), & A(NBSOLE),A(NASOLE),A(NSOLGR), @@ -1191,27 +1166,26 @@ PROGRAM MAPVAR CALL ERROR('MAPVAR',' ','ISCHEM =', & ischem,'INCORRECT ARGUMENT',0,' ',' ',1) END IF -C + END IF -C + ELSE IF (ITYPE .EQ. 10 .OR. ITYPE .EQ. 6) THEN -C -C + C ***************************************************** C PATH THROUGH CODE FOR 3-D CONTINUUM ELEMENTS C (HEX-8) OR (TET-8) C ***************************************************** -C + C FIND AND STORE LOCATION OF MESH-B NODES WITHIN MESH-A -C + call debug('BLDSRF') CALL BLDSRF(A(NAX),A(NAY),A(NAZ),A(NS16)) -C + IF (NVARNP .GT. 0)THEN -C + call debug('BLDPTN') CALL BLDPTN(A(NBX),A(NBY),A(NBZ),IA(NBNDLST),A(NS17)) -C + IF (ITYPE .EQ. 10)THEN call debug('SRCHH-nodes') CALL SRCHH (NODESA,NUMEBA,IA(NACON),A(NS16), @@ -1221,7 +1195,7 @@ PROGRAM MAPVAR 4 IA(NS9), 5 IA(NS10),IA(NS11),A(NS12),A(NS13),IA(NS14),A(NS15), 6 IERR) -C + ELSEIF (ITYPE .EQ. 6)THEN call debug('SRCHT-nodes') CALL SRCHT (NODESA,NUMEBA,IA(NACON),A(NS16), @@ -1232,24 +1206,24 @@ PROGRAM MAPVAR 5 IA(NS10),IA(NS11),A(NS12),A(NS13),IA(NS14),A(NS15), 6 IERR) END IF -C + c interpolate nodal variables -c + call debug('INTRPN') CALL INTRPN(IA(NACON),A(NASOLN),IA(NS1),A(NS2), & A(NBSOLN),IA(NBNDLST),A(NBX),A(NBY),A(NBZ), & IDBLKB,A(NT1),INSUB,A(NSN)) -c + c start element variable interpolation -c + c locate Mesh-B element centroid in Mesh-A -c + END IF IF (NVAREL .GT. 0)THEN -C + call debug('BLDPTE') CALL BLDPTE(A(NBX),A(NBY),A(NBZ),IA(NBCON),A(NS17)) -C + IF (ITYPE .EQ. 10)THEN call debug('SRCHH-element centroids') CALL SRCHH (NODESA,NUMEBA,IA(NACON),A(NS16), @@ -1259,7 +1233,7 @@ PROGRAM MAPVAR 4 IA(NS9), 5 IA(NS10),IA(NS11),A(NS12),A(NS13),IA(NS14),A(NS15), 6 IERR) -C + ELSEIF (ITYPE .EQ. 6)THEN call debug('SRCHT-element centroids') CALL SRCHT (NODESA,NUMEBA,IA(NACON),A(NS16), @@ -1270,110 +1244,110 @@ PROGRAM MAPVAR 5 IA(NS10),IA(NS11),A(NS12),A(NS13),IA(NS14),A(NS15), 6 IERR) END IF -C + IF (ISCHEM .EQ. 0)THEN -C + C Set up time steps -C + IF (ISTEP .EQ. -1)THEN NTM = NTIMES ELSE NTM = 1 END IF -C + DO 670 IST = 1, NTM IF (ISTEP .EQ. -1)THEN ISTP = IST ELSE ISTP = ISTEP END IF -C + call debug('ELTON0') CALL ELTON0(IA(NACON),IA(NANELTN),A(NASOLE), & A(NASOLEN),IDBLKA,A(NAX),A(NAY),A(NAZ),ISTP, & IA(ITTB),IBLKB) -C + c interpolate element vars -c + call debug('INTRPE') CALL INTRPE(IA(NACON),A(NASOLEN),IA(NS1),A(NS2), 1 A(NBSOLE),IDBLKB,A(NBX),A(NBY),A(NBZ), 2 IA(NBCON),IA(ITTB),IBLKB,A(NT1), 3 A(NS17),ISTP,IST,INSUB,ICOMPL,A(NSE)) 670 CONTINUE -C + ELSE IF (ISCHEM .EQ. 1)THEN -C + call debug('INVCON') CALL INVCON(IA(NAINVLN),MAXLN,IA(NAINVC),IA(NACON)) -C + C Set up time steps -C + IF (ISTEP .EQ. -1)THEN NTM = NTIMES ELSE NTM = 1 END IF -C + DO 680 IST = 1, NTM IF (ISTEP .EQ. -1)THEN ISTP = IST ELSE ISTP = ISTEP END IF -C + call debug('ELTON1') CALL ELTON1(A(NACTR),A(NASOLE),A(NASOLEN),IDBLKA, & A(NAX),A(NAY),A(NAZ),IA(NACON),IA(NANDLST), & IA(NAINVLN),IA(NAINVC),MAXLN,ISTP, & IA(ITTB),IBLKB) -C + c interpolate element vars -c + call debug('INTRPE') CALL INTRPE(IA(NACON),A(NASOLEN),IA(NS1),A(NS2), 1 A(NBSOLE),IDBLKB,A(NBX),A(NBY),A(NBZ), 2 IA(NBCON),IA(ITTB),IBLKB,A(NT1), 3 A(NS17),ISTP,IST,INSUB,ICOMPL,A(NSE)) 680 CONTINUE -c + ELSE IF (ISCHEM .EQ. 2)THEN -C + c direct transfer from Mesh-A to Mesh-B -c + call debug('TRANAB') CALL TRANAB(IA(NS1),A(NASOLE),A(NBSOLE), & IDBLKA,IDBLKB, & IA(ITTB),IBLKB,A(NT1),A(NS17), & INSUB,ICOMPL, & A(NBX),A(NBY),A(NBZ),IA(NBCON),A(NSE)) -c + ELSE IF (ISCHEM .EQ. 3)THEN -C + call debug('INVCON') CALL INVCON(IA(NAINVLN),MAXLN,IA(NAINVC),IA(NACON)) -C + C Set up time steps -C + IF (ISTEP .EQ. -1)THEN NTM = NTIMES ELSE NTM = 1 END IF -C + DO 690 IST = 1, NTM IF (ISTEP .EQ. -1)THEN ISTP = IST ELSE ISTP = ISTEP END IF -C + call debug('ELGRAD') CALL ELGRAD(A(NACTR),A(NAX),A(NAY),A(NAZ), & A(NASOLE),A(NSOLGR),IA(NICHKE), & IDBLKA,IA(NACON),IA(NAINVLN),IA(NAINVC), & MAXLN,ISTP,IA(ITTB),IBLKB) -C + call debug('INTRP3') CALL INTRP3(A(NACTR),A(NS17),IA(NS1), & A(NBSOLE),A(NASOLE),A(NSOLGR), @@ -1386,25 +1360,25 @@ PROGRAM MAPVAR CALL ERROR('MAPVAR',' ','ISCHEM =', & ischem,'INCORRECT ARGUMENT',0,' ',' ',1) END IF -C + END IF ELSE CALL ERROR ('MAPVAR','INCORRECT ELEMENT TYPE', & 'ELEMENT TYPE =',ITYPE, & 'NOT YET IMPLEMENTED',0,' ',' ',1) -C + END IF -C + IF (IACCU .EQ. 1)THEN -C + C velocities and mass are available, compute momenta and k.e. C 1st set up storage for mass -C + IF (IELMS .NE. 0 .AND. IDENS .EQ. 0)THEN -C + C A(NEMSA) = EMSSA(1:NODESA) - element mass in mesh-A C A(NEMSB) = EMSSB(1:NODESB) - element mass in mesh-B -C + CALL MDRSRV ('EMSSA', NEMSA, NUMEBA) CALL MDRSRV ('DENSA', NDENA, 1) CALL MDRSRV ('EMSSB', NEMSB, NUMEBB) @@ -1417,12 +1391,12 @@ PROGRAM MAPVAR & 0,' ',0,' ',' ',1) END IF ELSE IF(IDENS .NE. 0)THEN -C + C A(NEMSA) = EMSSA(1:NUMEBA) - element mass in mesh-A C A(NEMSB) = EMSSB(1:NUMEBB) - element mass in mesh-B C A(NDENA) = DENSA(1:NUMEBA) - element density in mesh-A C A(NDENB) = DENSB(1:NUMEBB) - element density in mesh-B -C + CALL MDRSRV ('EMSSA', NEMSA, NUMEBA) CALL MDRSRV ('DENSA', NDENA, NUMEBA) CALL MDRSRV ('EMSSB', NEMSB, NUMEBB) @@ -1435,9 +1409,9 @@ PROGRAM MAPVAR & 0,' ',0,' ',' ',1) END IF END IF -C + IF (NDIMA .EQ. 3)THEN -C + C A(NSXXA) = SIGXXA(1:NUMEBA) - XX component of stress tensor C A(NSYYA) = SIGYYA(1:NUMEBA) - YY component of stress tensor C A(NSZZA) = SIGZZA(1:NUMEBA) - ZZ component of stress tensor @@ -1450,7 +1424,7 @@ PROGRAM MAPVAR C A(NSXYB) = SIGXYB(1:NUMEBB) - XY component of stress tensor C A(NSYZB) = SIGYZB(1:NUMEBB) - YZ component of stress tensor C A(NSZXB) = SIGZXB(1:NUMEBB) - ZX component of stress tensor -C + CALL MDRSRV ('SIGXXA' , NSXXA, NUMEBA) CALL MDRSRV ('SIGYYA' , NSYYA, NUMEBA) CALL MDRSRV ('SIGZZA' , NSZZA, NUMEBA) @@ -1471,7 +1445,7 @@ PROGRAM MAPVAR & 0,' ',0,' ',' ',1) END IF ELSE IF (NDIMA .EQ. 2)THEN -C + C A(NSXXA) = SIGXXA(1:NUMEBA) - XX component of stress tensor C A(NSYYA) = SIGYYA(1:NUMEBA) - YY component of stress tensor C A(NSZZA) = SIGZZA(1:NUMEBA) - ZZ component of stress tensor @@ -1480,7 +1454,7 @@ PROGRAM MAPVAR C A(NSYYB) = SIGYYB(1:NUMEBB) - YY component of stress tensor C A(NSZZB) = SIGZZB(1:NUMEBB) - ZZ component of stress tensor C A(NSXYB) = SIGXYB(1:NUMEBB) - XY component of stress tensor -C + CALL MDRSRV ('SIGXXA' , NSXXA, NUMEBA) CALL MDRSRV ('SIGYYA' , NSYYA, NUMEBA) CALL MDRSRV ('SIGZZA' , NSZZA, NUMEBA) @@ -1501,22 +1475,22 @@ PROGRAM MAPVAR & 0,' ',0,' ',' ',1) END IF END IF -C + C Set up time steps -C + IF (ISTEP .EQ. -1)THEN NTM = NTIMES ELSE NTM = 1 END IF -C + DO 710 IST = 1, NTM IF (ISTEP .EQ. -1)THEN ISTP = IST ELSE ISTP = ISTEP END IF -C + CALL MKEI(IST,ISTP,A(NT1),IDBLKA,IA(NACON),IA(NANDLST), & A(NAX),A(NAY),A(NAZ),A(NVXA),A(NVYA),A(NVZA), & A(NEMSA),A(NDENA),A(NNMSA), @@ -1532,7 +1506,7 @@ PROGRAM MAPVAR & A(NSXXB),A(NSYYB),A(NSZZB),A(NSXYB),A(NSYZB), & A(NSZXB)) 710 CONTINUE -C + CALL MDDEL ('EMSSA') CALL MDDEL ('DENSA') CALL MDDEL ('EMSSB') @@ -1549,14 +1523,13 @@ PROGRAM MAPVAR CALL MDDEL ('SIGXYB') CALL MDDEL ('SIGYZB') CALL MDDEL ('SIGZXB') -C + END IF -C -C + C ***************************************************************** C CLEAN UP STUFF FOR NEXT ELEMENT BLOCK C ***************************************************************** -C + CALL MDDEL ('ISRCHR') CALL MDDEL ('RSRCHR') CALL MDDEL ('LIST') @@ -1602,26 +1575,24 @@ PROGRAM MAPVAR IF (MNERRS .NE. 0) THEN CALL MDEROR(NOUT) END IF -C -c + 50 CONTINUE -C + C ***************************************************************** C STOP COMMAND C ***************************************************************** -C + C CLOSE FILES AND STOP -C -c + CALL BANNR2(84,'NORMAL',NTPOUT) CALL BANNR2(84,'EXIT',NTPOUT) call debug('CLSFIL') CALL CLSFIL -C + call addlog (qainfo(1)) call wrapup(qainfo(1)) STOP -C + 270 FORMAT (3X,/'DATA FROM MESH "A" (MESH & SOLUTION) FILE - ',A, * //,10X,'HEADING - ',A,/) 280 FORMAT (10x,I1,'-DIMENSIONAL MODEL',/ @@ -1641,18 +1612,18 @@ PROGRAM MAPVAR END BLOCK DATA INITLZ -C + C ****************************************************************** -C + C BLOCK DATA SUBROUTINE TO INITIALIZE VARIABLES STORED IN C NAMED COMMON BLOCKS -C + C ****************************************************************** -C + C...NOTE: Cannot include exodusII.inc in a block data routine. PARAMETER (MXSTLN=32) c CHARACTER*10 ELTYPE -C + include 'header.blk' include 'ntpdat.blk' include 'contrl.blk' @@ -1666,7 +1637,7 @@ BLOCK DATA INITLZ include 'varept.blk' include 'debg.blk' include 'inival.blk' -C + DATA HED/' '/ DATA NOUT,NTPOUT,NTP2,NTP3,NTP4/ 1 6,7,12,13,14/ @@ -1684,24 +1655,24 @@ BLOCK DATA INITLZ c 1 'TETRA4','TETRA10','PRISM6','PRISM15','HEX8','HEX20', c 2 'HEX27','SHELL'/ C DATA (NNELM(I),I=1,13)/3,6,4,8,9,4,10,6,15,8,20,27,4/ -C + DATA VALINI /0.0/ DATA TOLSHL,TOLQAD,TOLHEX,TOLTET,NISS,NRSS * /0.01,0.01,0.01,0.01, 5,10/ -C + C TOLSHL=extension of box around MESH-A shell element C TOLQAD=extension of box around MESH-A quad element C TOLHEX=extension of box around MESH-A hex element C NISS=number of integer search scratch (=5) C NRSS=number of real search scratch (=10) -C + DATA TOL,EPS,STRLMT,ITERMX/0.01,0.01,20.,20/ -C + C TOL=difference in isoparametric coords after newton iteration (don't change) C EPS=tolerance used in checking if point is within element or coincident C with a node C STRLMT=tolerance for isoparametric coords to lie within an element -C + END subroutine getval(IMAP, IM, idblka, idblkb, ischem) diff --git a/packages/seacas/applications/mapvar/mklstv.f b/packages/seacas/applications/mapvar/mklstv.f index 47fb382a12e8..516c1e33b5f3 100644 --- a/packages/seacas/applications/mapvar/mklstv.f +++ b/packages/seacas/applications/mapvar/mklstv.f @@ -1,39 +1,25 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: mklstv.f,v 1.2 2007/10/17 18:40:35 gdsjaar Exp $ -C $Log: mklstv.f,v $ -C Revision 1.2 2007/10/17 18:40:35 gdsjaar -C Added copyright notice to all files. -C -C Mapvar is licensed under the BSD license -C -C Revision 1.1 1998/03/13 18:12:24 gdsjaar -C New code -- mapvar. Interpolates results form an exodusII results file -C to a differently mesh geometry. Written by Gerry Wellman, -C 9117. Loosely based on MERLIN. Provides a superset of merlin -C functionality. -C -C SUBROUTINE MKLSTV( NUMPTS,IND,IRNK2,IUP,ILO,INDX, * IE,LIST,NLIST,NBLKSZ,NSPC) -C + C----------------------------------------------------------------------- -C + C DESCRIPTION: -C + C VECTOR MAKE LIST (3D) C GIVEN A LIST OF PARTICLES (IE THEIR INDEX AND RANK) FIND C THE LIST OF PARTICLES WITHIN THE BOUNDS SET BY XMIN AND XMAX C FOR THE IE'TH PARTICLE IN THE VECTOR BLOCK -C + C----------------------------------------------------------------------- -C + C CALLING ARGUMENTS: -C + C NUMPTS INTEGER NUMBER OF POINTS TO BE SEARCHED C IND INTEGER ORDER INDEX C IRNK2 INTEGER RANK @@ -45,14 +31,14 @@ SUBROUTINE MKLSTV( NUMPTS,IND,IRNK2,IUP,ILO,INDX, C NLIST INTEGER NUMBER OF PARTICLES FOUND C NBLKSZ INTEGER BLOCK SIZE OF IUP AND ILO BLOCKS C NSPC INTEGER NUMBER OF SPACIAL COORD. (NUMBER OF DIMENSIONS) -C + C----------------------------------------------------------------------- -C + DIMENSION * IND(NUMPTS,NSPC),IRNK2(NUMPTS,NSPC,*), * IUP(NBLKSZ,NSPC),INDX(NUMPTS), * ILO(NBLKSZ,NSPC), LIST(NUMPTS) -C + C BUILD A LIST OF POINTS THAT ARE CLOSE TO SURFACE IE J = IE NLIST = 0 @@ -65,7 +51,7 @@ SUBROUTINE MKLSTV( NUMPTS,IND,IRNK2,IUP,ILO,INDX, NLIST = NLIST +1 LIST(NLIST) = IND(I1,1) 101 CONTINUE -C + ELSE IF( NSPC .EQ. 2 )THEN C============================== t w o - d ====================== NUM1 = IUP(J,1) - ILO(J,1) + 1 @@ -82,7 +68,7 @@ SUBROUTINE MKLSTV( NUMPTS,IND,IRNK2,IUP,ILO,INDX, IY = 1 NUM = NUM2 ENDIF -C + ILOW = ILO(J,IXYZ) IUPR = IUP(J,IXYZ) C FIRST TEST @@ -103,7 +89,7 @@ SUBROUTINE MKLSTV( NUMPTS,IND,IRNK2,IUP,ILO,INDX, ENDIF 202 CONTINUE ENDIF -C + ELSE IF( NSPC .EQ. 3 )THEN C============================== t h r e e - d ====================== NUM1 = IUP(J,1) - ILO(J,1) + 1 @@ -128,7 +114,7 @@ SUBROUTINE MKLSTV( NUMPTS,IND,IRNK2,IUP,ILO,INDX, IZ = 2 NUM = NUM3 ENDIF -C + ILOW = ILO(J,IXYZ) IUPR = IUP(J,IXYZ) IF (ILOW.EQ.0) THEN @@ -173,7 +159,7 @@ SUBROUTINE MKLSTV( NUMPTS,IND,IRNK2,IUP,ILO,INDX, 313 CONTINUE ENDIF ENDIF -C + RETURN END -C + diff --git a/packages/seacas/applications/mapvar/mkrnk.f b/packages/seacas/applications/mapvar/mkrnk.f index e16ba513147b..eedb90c509d8 100644 --- a/packages/seacas/applications/mapvar/mkrnk.f +++ b/packages/seacas/applications/mapvar/mkrnk.f @@ -1,36 +1,36 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details SUBROUTINE MKRNK(N,NTOTAL,NDIM,X,IND,IRNK,IRNK2) -C + C*********************************************************************** -C + C DESCRIPTION: THIS ROUTINE CONVERTS THE IRNK VECTORS IN THE SWEGLE C SEARCH FROM AN INDIRECT GATHER TO A DIRECT GATHER -C + C N INTEGER NUMBER OF ENTITIES THAT WAS SORTED C NDIM INTEGER NUMBER OF DIMENSIONS C X REAL ENTITIES TO BE SORTED -C + C IND INTEGER INDEX VECTOR C IRNK INTEGER RANK VECTOR (INDIRECT) C IRNK2 INTEGER RANK VECTOR (DIRECT) -C + C*********************************************************************** -C + include 'tapes.blk' -C + DIMENSION X(NTOTAL,NDIM),IND(N,NDIM) DIMENSION IRNK(N,NDIM),IRNK2(N,NDIM,*) -C + DO 11 IDM = 1, NDIM CALL INDEXX(X(1,IDM),IND(1,IDM),N,.true.) CALL RANK(N,IND(1,IDM),IRNK(1,IDM),N) 11 CONTINUE -C + C CONSTRUCT DIRECT LISTS INTO ORDERED LIST OF POINTS IF(NDIM .EQ. 1)THEN DO 113 I = 1, N @@ -54,6 +54,6 @@ SUBROUTINE MKRNK(N,NTOTAL,NDIM,X,IND,IRNK,IRNK2) PRINT*,'WRONG NUMBER OF DIMENSIONS IN MKRNK' STOP ENDIF -C + RETURN END diff --git a/packages/seacas/applications/mapvar/rank.f b/packages/seacas/applications/mapvar/rank.f index e3291a060932..b3c91adc9a8d 100644 --- a/packages/seacas/applications/mapvar/rank.f +++ b/packages/seacas/applications/mapvar/rank.f @@ -1,18 +1,18 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details SUBROUTINE RANK(N,INDX,IRANK,NDIM) C... create a rank array from an index array DIMENSION INDX(NDIM),IRANK(NDIM) -C + DO J=1,N IRANK(INDX(J))=J end do -C + RETURN END -C + diff --git a/packages/seacas/applications/mapvar/srchge.f b/packages/seacas/applications/mapvar/srchge.f index 2ab5c6b89070..95745cc63a93 100644 --- a/packages/seacas/applications/mapvar/srchge.f +++ b/packages/seacas/applications/mapvar/srchge.f @@ -1,80 +1,63 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: srchge.f,v 1.3 2007/10/17 18:40:36 gdsjaar Exp $ -C $Log: srchge.f,v $ -C Revision 1.3 2007/10/17 18:40:36 gdsjaar -C Added copyright notice to all files. -C -C Mapvar is licensed under the BSD license -C -C Revision 1.2 2000/11/14 17:30:40 gdsjaar -C Removed old cray compiler directives -C -C Revision 1.1 1998/03/13 18:12:28 gdsjaar -C New code -- mapvar. Interpolates results form an exodusII results file -C to a differently mesh geometry. Written by Gerry Wellman, -C 9117. Loosely based on MERLIN. Provides a superset of merlin -C functionality. -C -C SUBROUTINE SRCHGE( LBLK,NE,X,IND,XV,IMIN,IMAX,NDIM,I, * IL,IU,IT,INDX1,INDX2,XTST ) -C + C----------------------------------------------------------------------- -C + C DESCRIPTION: -C + C PERFORM A BINARY SEARCH TO FIND THE ELEMENT NUMBER I C OF A SORTED ARRAY FOR WHICH ALL ELEMENTS AT I OR ABOVE ARE C GREATER OR EQUAL TO THAN SOME VALUE XV, C WHILE ALL ELEMENTS BELOW I ARE LESS THAN THE VALUE. -C + C X(I-2) X(I-1) X(I) X(I+1) X(I+2) C XV X> -C + C ASSUMED THAT THE ARRAY X HAS BEEN SORTED IN INCREASING ORDER, C BUT THE ELEMENTS HAVE NOT BEEN MOVED. C THE SORTED LIST IS DETERMINED BY THE ARRAY INDX, C WHICH POSITIONS THE ORIGINAL UNSORTED X ARRAY ELEMENTS C IN THE SORTED LIST. THUS, THE 5TH ELEMENT IN THE SORTED LIST IS C X(IND(5)) -C + C----------------------------------------------------------------------- -C + C INPUT: -C + C X - ARRAY IN UNSORTED ORDER C IND - INDEX ARRAY GIVING THE ELEMENT ORDER IN THE SORTED LIST C XV - X VALUE TO TEST AGAINST C IMIN - THE LOWEST NUMBERED POSITION IN THE SORTED LIST TO TEST C IMAX - THE HIGHEST NUMBERED POSITION IN THE SORTED LIST TO TEST C NDIM - THE DIMENSION OF THE ARRAYS -C + C OUTPUT: -C + C I - THE FIRST POSITION IN THE SORTED LIST .GT. XV -C + C SCRATCH: -C + C IL C IU C IT C INDX1 C INDX2 C XTST -C + C----------------------------------------------------------------------- -C + DIMENSION * X(NDIM), IND(NDIM), XV(LBLK), I(LBLK) DIMENSION * IL(LBLK),IU(LBLK),IT(LBLK),INDX1(LBLK),INDX2(LBLK), * XTST(LBLK) -C + IF (IMAX.EQ.0.OR.NDIM.EQ.0) THEN DO J = 1, NE I(J) = 0 @@ -88,7 +71,7 @@ SUBROUTINE SRCHGE( LBLK,NE,X,IND,XV,IMIN,IMAX,NDIM,I, 25 CONTINUE ILOOP = NE 1000 CONTINUE -C + DO 50 JJ = 1, ILOOP INDX2(JJ) = INDX1(JJ) J = INDX1(JJ) @@ -97,7 +80,7 @@ SUBROUTINE SRCHGE( LBLK,NE,X,IND,XV,IMIN,IMAX,NDIM,I, DO 35 J = 1, NE XTST(J) = X( IND(IT(J)) ) 35 CONTINUE -C + IF ( ILOOP .GT. 64) THEN ILP = 0 @@ -129,9 +112,9 @@ SUBROUTINE SRCHGE( LBLK,NE,X,IND,XV,IMIN,IMAX,NDIM,I, ENDIF 51 CONTINUE ENDIF -c + ILOOP = ILP -c + IF(ILOOP .NE. 0 )GO TO 1000 C RANGE HAD NARROWED TO 1 LOCATION. HOWEVER, THE POINT LAST TESTED C COULD BE ABOVE, BELOW, OR ON THE SEARCH POINT. CHECK FOR PROPER CASE @@ -142,7 +125,7 @@ SUBROUTINE SRCHGE( LBLK,NE,X,IND,XV,IMIN,IMAX,NDIM,I, I(J) = IT(J) ENDIF 200 CONTINUE -C + RETURN END -C + diff --git a/packages/seacas/applications/mapvar/srchgt.f b/packages/seacas/applications/mapvar/srchgt.f index ad3bf71e74d2..f74e1704cd5a 100644 --- a/packages/seacas/applications/mapvar/srchgt.f +++ b/packages/seacas/applications/mapvar/srchgt.f @@ -1,77 +1,58 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: srchgt.f,v 1.3 2007/10/17 18:40:36 gdsjaar Exp $ -C $Log: srchgt.f,v $ -C Revision 1.3 2007/10/17 18:40:36 gdsjaar -C Added copyright notice to all files. -C -C Mapvar is licensed under the BSD license -C -C Revision 1.2 2000/11/14 17:30:40 gdsjaar -C Removed old cray compiler directives -C -C Revision 1.1 1998/03/13 18:12:28 gdsjaar -C New code -- mapvar. Interpolates results form an exodusII results file -C to a differently mesh geometry. Written by Gerry Wellman, -C 9117. Loosely based on MERLIN. Provides a superset of merlin -C functionality. -C -c SUBROUTINE SRCHGT(LBLK,NE,X,IND,XV,IMIN,IMAX,NDIM,I, * IL,IU,IT,INDX1,INDX2,XTST ) -C + C----------------------------------------------------------------------- -C + C DESCRIPTION: -C -C + C X(I-2) X(I-1) X(I) X(I+1) X(I+2) C XV X> -C + C ASSUMED THAT THE ARRAY X HAS BEEN SORTED IN INCREASING ORDER, C BUT THE ELEMENTS HAVE NOT BEEN MOVED. C THE SORTED LIST IS DETERMINED BY THE ARRAY INDX, C WHICH POSITIONS THE ORIGINAL UNSORTED X ARRAY ELEMENTS C IN THE SORTED LIST. THUS, THE 5TH ELEMENT IN THE SORTED LIST IS C X(IND(5)) -C + C----------------------------------------------------------------------- -C + C INPUT: -C + C X - ARRAY IN UNSORTED ORDER C IND - INDEX ARRAY GIVING THE ELEMENT ORDER IN THE SORTED LIST C XV - X VALUE TO TEST AGAINST C IMIN - THE LOWEST NUMBERED POSITION IN THE SORTED LIST TO TEST C IMAX - THE HIGHEST NUMBERED POSITION IN THE SORTED LIST TO TEST C NDIM - THE DIMENSION OF THE ARRAYS -C + C OUTPUT: -C + C I - THE FIRST POSITION IN THE SORTED LIST .GE. XV -C + C SCRATCH: -C + C IL C IU C IT C INDX1 C INDX2 C XTST -C + C----------------------------------------------------------------------- -C -C + DIMENSION * X(NDIM),IND(NDIM), XV(LBLK), IMIN(LBLK), I(LBLK) DIMENSION * IL(LBLK),IU(LBLK),IT(LBLK),INDX1(LBLK),INDX2(LBLK), * XTST(LBLK) -C + IF (IMAX.EQ.0.OR.NDIM.EQ.0) THEN DO J = 1, NE I(J) = 0 @@ -85,17 +66,17 @@ SUBROUTINE SRCHGT(LBLK,NE,X,IND,XV,IMIN,IMAX,NDIM,I, 25 CONTINUE ILOOP = NE 1000 CONTINUE -C + DO 50 JJ = 1, ILOOP INDX2(JJ) = INDX1(JJ) J = INDX1(JJ) IT(J) = (IU(J) + IL(J)) / 2 50 CONTINUE -C + DO 35 J = 1, NE XTST(J) = X( IND(IT(J)) ) 35 CONTINUE -C + IF ( ILOOP .GT. 64) THEN ILP = 0 DO 60 JJ = 1, ILOOP @@ -126,9 +107,9 @@ SUBROUTINE SRCHGT(LBLK,NE,X,IND,XV,IMIN,IMAX,NDIM,I, ENDIF 51 CONTINUE ENDIF -C + ILOOP = ILP -C + IF(ILOOP .NE. 0 )GO TO 1000 C RANGE HAD NARROWED TO 1 LOCATION. HOWEVER, THE POINT LAST TESTED C COULD BE ABOVE, BELOW, OR ON THE SEARCH POINT. CHECK FOR PROPER CASE @@ -139,7 +120,7 @@ SUBROUTINE SRCHGT(LBLK,NE,X,IND,XV,IMIN,IMAX,NDIM,I, I(J) = IT(J) ENDIF 200 CONTINUE -C + RETURN END -C + diff --git a/packages/seacas/applications/mapvar/srchh.f b/packages/seacas/applications/mapvar/srchh.f index 66ea11b2ca88..4ec24a3c8bfd 100644 --- a/packages/seacas/applications/mapvar/srchh.f +++ b/packages/seacas/applications/mapvar/srchh.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details SUBROUTINE SRCHH ( @@ -10,32 +10,32 @@ SUBROUTINE SRCHH ( * NISR, NRSR, NISS, NRSS, ISRCHR, RSRCHR, LBLK, * LIST, IND, IRNK, IRNK2, INDX, ILO, IUP, * IDP, IDS, XMIN, XMAX, ISCR, RSCR, IERR) -C + C----------------------------------------------------------------------- -C + C DESCRIPTION: -C + C THIS SUBROUTINE CALCULATES THE CLOSEST POINT PROBLEM C BETWEEN NPTS POINTS AND NFSRF SURFACES AND RETURNS RESULTS OF C SEARCH IN ISRCHR,RSRCHR -C + C USED HERE FOR FINDING LOCATION OF EITHER NODE OR ELEMENT CENTROID C FROM MESH-B IN HEX-8 ELEMENT OF MESH-A -C + C----------------------------------------------------------------------- -C + C FORMAL PARAMETERS -C + C MEMORY : P=PERMANENT, S=SCRATCH C NAME : IMPLICIT A-H,O-Z REAL, I-N INTEGER C TYPE : INPUT_STATUS/OUTPUT_STATUS (I=INPUT,O=OUTPUT,P=PASSED, C U=UNMODIFIED,-=UNDEFINED) C DESCRIPTION : DESCRIPTION OF VARIABLE -C + C----------------------------------------------------------------------- -C + C CALLING ARGUMENTS: -C + C MEMORY NAME TYPE DESCRIPTION C --- ---- --- ----------- C P NPSRF I/U NUMBER OF POINTS THAT DEFINE THE SURFACE @@ -66,13 +66,13 @@ SUBROUTINE SRCHH ( C S ISCR -/- INTEGER SCRATCH MEMORY C S RSCR -/- REAL SCRATCH MEMORY C P IERR -/O ERROR FLAG -C + C----------------------------------------------------------------------- -C + include 'tapes.blk' -C + C INPUT/OUTPUT ARRAYS -C + DIMENSION * LINKSRF(8,NFSRF), XYZSRF(NPSRF,3), * XYZPTS(NPTS,3), @@ -86,9 +86,9 @@ SUBROUTINE SRCHH ( DIMENSION * XMIN(LBLK,3), XMAX(LBLK,3), ISCR(NISS*LBLK), * RSCR(NRSS*LBLK) -C + C ISRCHR and RSRCHR must be initialized to zero -C + DO 1 I = 1, NPTS DO 2 J = 1, NISR ISRCHR(J,I) = 0 @@ -97,7 +97,7 @@ SUBROUTINE SRCHH ( RSRCHR(K,I) = 0. 3 CONTINUE 1 CONTINUE -C + IF( NISR .LT. 1 .OR. NRSR .LT. 3 .OR. NISS .LT. 5 .OR. * NRSS .LT. 10 )THEN IERR = 1 @@ -107,10 +107,10 @@ SUBROUTINE SRCHH ( NDIM = 3 C ZERO SEARCH-PAIR COUNTER KOUNTS = 0 -C + C CALL SORTING ROUTINE TO MAKE RANK ARRAYS CALL MKRNK( NPTS,NPTS,NDIM,XYZPTS,IND,IRNK,IRNK2 ) -C + C LOOP OVER SURFACES AND SEARCH FOR POINTS WITHIN CAPTURE BOX DO 100 IFSRF = 1, NFSRF, LBLK NE = MIN(LBLK,NFSRF-IFSRF+1) @@ -125,7 +125,7 @@ SUBROUTINE SRCHH ( NN = LINKSRF(6,JFSRF) NO = LINKSRF(7,JFSRF) NP = LINKSRF(8,JFSRF) -C + XMINMS = MIN(XYZSRF(NI,1),XYZSRF(NJ,1), * XYZSRF(NK,1),XYZSRF(NL,1), * XYZSRF(NM,1),XYZSRF(NN,1), @@ -160,19 +160,19 @@ SUBROUTINE SRCHH ( XMIN(J,3) = ZMINMS - TOLER XMAX(J,3) = ZMAXMS + TOLER 110 CONTINUE -C + DO 120 IDIM = 1, NDIM CALL GETBND( LBLK, NE, XYZPTS(1,IDIM), IND(1,IDIM), * NPTS, XMIN(1,IDIM), XMAX(1,IDIM), * NPTS, ILO(1,IDIM), IUP(1,IDIM), * ISCR, RSCR ) 120 CONTINUE -C + DO 130 J = 1, NE JFSRF = IFSRF + J - 1 CALL MKLSTV(NPTS,IND,IRNK2,IUP,ILO,INDX,J,LIST,NLIST, * LBLK,NDIM) -C + DO 140 K = 1, NLIST LVAL = LIST(K) CALL HEXSRC( diff --git a/packages/seacas/applications/mapvar/srchq.f b/packages/seacas/applications/mapvar/srchq.f index de575a3b2866..4e31616774e5 100644 --- a/packages/seacas/applications/mapvar/srchq.f +++ b/packages/seacas/applications/mapvar/srchq.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details SUBROUTINE SRCHQ ( @@ -10,32 +10,32 @@ SUBROUTINE SRCHQ ( * NISR, NRSR, NISS, NRSS, ISRCHR, RSRCHR, LBLK, * LIST, IND, IRNK, IRNK2, INDX, ILO, IUP, * IDP, IDS, XMIN, XMAX, ISCR, RSCR, IERR ) -C + C----------------------------------------------------------------------- -C + C DESCRIPTION: -C + C THIS SUBROUTINE CALCULATES THE CLOSEST POINT PROBLEM C BETWEEN NPTS POINTS AND NFSRF SURFACES AND RETURNS RESULTS OF C SEARCH IN ISRCHR,RSRCHR -C + C USED HERE FOR FINDING LOCATION OF EITHER NODE OR ELEMENT CENTROID C FROM MESH-B IN QUAD-4 ELEMENT OF MESH-A -C + C----------------------------------------------------------------------- -C + C FORMAL PARAMETERS -C + C MEMORY : P=PERMANENT, S=SCRATCH C NAME : IMPLICIT A-H,O-Z REAL, I-N INTEGER C TYPE : INPUT_STATUS/OUTPUT_STATUS (I=INPUT,O=OUTPUT,P=PASSED, C U=UNMODIFIED,-=UNDEFINED) C DESCRIPTION : DESCRIPTION OF VARIABLE -C + C----------------------------------------------------------------------- -C + C CALLING ARGUMENTS: -C + C MEMORY NAME TYPE DESCRIPTION C --- ---- --- ----------- C P NPSRF I/U NUMBER OF POINTS THAT DEFINE THE SURFACE @@ -66,14 +66,14 @@ SUBROUTINE SRCHQ ( C S ISCR -/- INTEGER SCRATCH MEMORY C S RSCR -/- REAL SCRATCH MEMORY C P IERR -/O ERROR FLAG -C + C----------------------------------------------------------------------- -C + include 'amesh.blk' include 'tapes.blk' -C + C INPUT/OUTPUT ARRAYS -C + DIMENSION * LINKSRF(NELNDA,NFSRF), XYZSRF(NPSRF,3), * XYZPTS(NPTS,3), @@ -87,9 +87,9 @@ SUBROUTINE SRCHQ ( DIMENSION * XMIN(LBLK,3), XMAX(LBLK,3), ISCR(NISS*LBLK), * RSCR(NRSS*LBLK) -C + C ISRCHR and RSRCHR must be initialized to zero -C + DO 1 I = 1, NPTS DO 2 J = 1, NISR ISRCHR(J,I) = 0 @@ -98,7 +98,7 @@ SUBROUTINE SRCHQ ( RSRCHR(K,I) = 0. 3 CONTINUE 1 CONTINUE -C + IF( NISR .LT. 1 .OR. NRSR .LT. 2 .OR. NISS .LT. 5 .OR. * NRSS .LT. 10 )THEN IERR = 1 @@ -106,10 +106,10 @@ SUBROUTINE SRCHQ ( ENDIF C DIMENSION OF COORDINATES NDIM = 2 -C + C CALL SORTING ROUTINE TO MAKE RANK ARRAYS CALL MKRNK( NPTS,NPTS,NDIM,XYZPTS,IND,IRNK,IRNK2 ) -C + C LOOP OVER SURFACES AND SEARCH FOR POINTS WITHIN CAPTURE BOX DO 100 IFSRF = 1, NFSRF, LBLK NE = MIN(LBLK,NFSRF-IFSRF+1) @@ -120,7 +120,7 @@ SUBROUTINE SRCHQ ( NJ = LINKSRF(2,JFSRF) NK = LINKSRF(3,JFSRF) NL = LINKSRF(4,JFSRF) -C + XMINMS = MIN(XYZSRF(NI,1),XYZSRF(NJ,1), * XYZSRF(NK,1),XYZSRF(NL,1)) XMAXMS = MAX(XYZSRF(NI,1),XYZSRF(NJ,1), @@ -143,19 +143,19 @@ SUBROUTINE SRCHQ ( XMIN(J,3) = ZMINMS - TOLER XMAX(J,3) = ZMAXMS + TOLER 110 CONTINUE -C + DO 120 IDIM = 1, NDIM CALL GETBND( LBLK, NE, XYZPTS(1,IDIM), IND(1,IDIM), * NPTS, XMIN(1,IDIM), XMAX(1,IDIM), * NPTS, ILO(1,IDIM), IUP(1,IDIM), * ISCR, RSCR ) 120 CONTINUE -C + DO 130 J = 1, NE JFSRF = IFSRF + J - 1 CALL MKLSTV(NPTS,IND,IRNK2,IUP,ILO,INDX,J,LIST,NLIST, * LBLK,NDIM) -C + DO 140 K = 1, NLIST lval = list(k) CALL QADSRC( diff --git a/packages/seacas/applications/mapvar/srchs.f b/packages/seacas/applications/mapvar/srchs.f index c1fbc704134b..fd4d973902a8 100644 --- a/packages/seacas/applications/mapvar/srchs.f +++ b/packages/seacas/applications/mapvar/srchs.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details SUBROUTINE SRCHS ( @@ -10,32 +10,32 @@ SUBROUTINE SRCHS ( * NISR, NRSR, NISS, NRSS, ISRCHR, RSRCHR, LBLK, * LIST, IND, IRNK, IRNK2, INDX, ILO, IUP, * IDP, IDS, XMIN, XMAX, ISCR, RSCR, IERR ) -C + C----------------------------------------------------------------------- -C + C DESCRIPTION: -C + C THIS SUBROUTINE CALCULATES THE CLOSEST POINT PROBLEM C BETWEEN NPTS POINTS AND NFSRF SURFACES AND RETURNS RESULTS OF C SEARCH IN ISRCHR,RSRCHR -C + C USED HERE FOR FINDING LOCATION OF EITHER NODE OR ELEMENT CENTROID C FROM MESH-B IN SHELL ELEMENT OF MESH-A -C + C----------------------------------------------------------------------- -C + C FORMAL PARAMETERS -C + C MEMORY : P=PERMANENT, S=SCRATCH C NAME : IMPLICIT A-H,O-Z REAL, I-N INTEGER C TYPE : INPUT_STATUS/OUTPUT_STATUS (I=INPUT,O=OUTPUT,P=PASSED, C U=UNMODIFIED,-=UNDEFINED) C DESCRIPTION : DESCRIPTION OF VARIABLE -C + C----------------------------------------------------------------------- -C + C CALLING ARGUMENTS: -C + C MEMORY NAME TYPE DESCRIPTION C --- ---- --- ----------- C P NPSRF I/U NUMBER OF POINTS THAT DEFINE THE SURFACE @@ -66,13 +66,13 @@ SUBROUTINE SRCHS ( C S ISCR -/- INTEGER SCRATCH MEMORY C S RSCR -/- REAL SCRATCH MEMORY C P IERR -/O ERROR FLAG -C + C----------------------------------------------------------------------- -C + include 'tapes.blk' -C + C INPUT/OUTPUT ARRAYS -C + DIMENSION * LINKSRF(4,NFSRF), XYZSRF(NPSRF,3), * XYZPTS(NPTS,3), @@ -86,9 +86,9 @@ SUBROUTINE SRCHS ( DIMENSION * XMIN(LBLK,3), XMAX(LBLK,3), ISCR(NISS*LBLK), * RSCR(NRSS*LBLK) -C + C ISRCHR and RSRCHR must be initialized to zero -C + DO 1 I = 1, NPTS DO 2 J = 1, NISR ISRCHR(J,I) = 0 @@ -97,7 +97,7 @@ SUBROUTINE SRCHS ( RSRCHR(K,I) = 0. 3 CONTINUE 1 CONTINUE -C + IF( NISR .LT. 1 .OR. NRSR .LT. 4 .OR. NISS .LT. 5 .OR. * NRSS .LT. 10 )THEN IERR = 1 @@ -107,10 +107,10 @@ SUBROUTINE SRCHS ( NDIM = 3 C ZERO SEARCH-PAIR COUNTER KOUNTS = 0 -C + C CALL SORTING ROUTINE TO MAKE RANK ARRAYS CALL MKRNK( NPTS,NPTS,NDIM,XYZPTS,IND,IRNK,IRNK2 ) -C + C LOOP OVER SURFACES AND SEARCH FOR POINTS WITHIN CAPTURE BOX DO 100 IFSRF = 1, NFSRF, LBLK NE = MIN(LBLK,NFSRF-IFSRF+1) @@ -121,7 +121,7 @@ SUBROUTINE SRCHS ( NJ = LINKSRF(2,JFSRF) NK = LINKSRF(3,JFSRF) NL = LINKSRF(4,JFSRF) -C + XMINMS = MIN(XYZSRF(NI,1),XYZSRF(NJ,1), * XYZSRF(NK,1),XYZSRF(NL,1)) XMAXMS = MAX(XYZSRF(NI,1),XYZSRF(NJ,1), @@ -145,19 +145,19 @@ SUBROUTINE SRCHS ( XMIN(J,3) = ZMINMS - TOLER XMAX(J,3) = ZMAXMS + TOLER 110 CONTINUE -C + DO 120 IDIM = 1, NDIM CALL GETBND( LBLK, NE, XYZPTS(1,IDIM), IND(1,IDIM), * NPTS, XMIN(1,IDIM), XMAX(1,IDIM), * NPTS, ILO(1,IDIM), IUP(1,IDIM), * ISCR, RSCR ) 120 CONTINUE -C + DO 130 J = 1, NE JFSRF = IFSRF + J - 1 CALL MKLSTV(NPTS,IND,IRNK2,IUP,ILO,INDX,J,LIST,NLIST, * LBLK,NDIM) -C + DO 140 K = 1, NLIST LVAL = LIST(K) CALL SHLSRC( @@ -165,7 +165,7 @@ SUBROUTINE SRCHS ( * NRSR, NRSS, XYZSRF, XYZPTS, LINKSRF, * ISRCHR, RSRCHR, LVAL, JFSRF, TOLSRCH, * IERR ) -C + 140 CONTINUE 130 CONTINUE 100 CONTINUE diff --git a/packages/seacas/applications/mapvar/srcht.f b/packages/seacas/applications/mapvar/srcht.f index ffb849627824..6bfc28ccfe28 100644 --- a/packages/seacas/applications/mapvar/srcht.f +++ b/packages/seacas/applications/mapvar/srcht.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details SUBROUTINE SRCHT ( @@ -10,32 +10,32 @@ SUBROUTINE SRCHT ( * NISR, NRSR, NISS, NRSS, ISRCHR, RSRCHR, LBLK, * LIST, IND, IRNK, IRNK2, INDX, ILO, IUP, * IDP, IDS, XMIN, XMAX, ISCR, RSCR, IERR) -C + C----------------------------------------------------------------------- -C + C DESCRIPTION: -C + C THIS SUBROUTINE CALCULATES THE CLOSEST POINT PROBLEM C BETWEEN NPTS POINTS AND NFSRF SURFACES AND RETURNS RESULTS OF C SEARCH IN ISRCHR,RSRCHR -C + C USED HERE FOR FINDING LOCATION OF EITHER NODE OR ELEMENT CENTROID C FROM MESH-B IN TET-8 ELEMENT OF MESH-A -C + C----------------------------------------------------------------------- -C + C FORMAL PARAMETERS -C + C MEMORY : P=PERMANENT, S=SCRATCH C NAME : IMPLICIT A-H,O-Z REAL, I-N INTEGER C TYPE : INPUT_STATUS/OUTPUT_STATUS (I=INPUT,O=OUTPUT,P=PASSED, C U=UNMODIFIED,-=UNDEFINED) C DESCRIPTION : DESCRIPTION OF VARIABLE -C + C----------------------------------------------------------------------- -C + C CALLING ARGUMENTS: -C + C MEMORY NAME TYPE DESCRIPTION C --- ---- --- ----------- C P NPSRF I/U NUMBER OF POINTS THAT DEFINE THE SURFACE @@ -66,13 +66,13 @@ SUBROUTINE SRCHT ( C S ISCR -/- INTEGER SCRATCH MEMORY C S RSCR -/- REAL SCRATCH MEMORY C P IERR -/O ERROR FLAG -C + C----------------------------------------------------------------------- -C + include 'tapes.blk' -C + C INPUT/OUTPUT ARRAYS -C + DIMENSION * LINKSRF(4,NFSRF), XYZSRF(NPSRF,3), * XYZPTS(NPTS,3), @@ -86,9 +86,9 @@ SUBROUTINE SRCHT ( DIMENSION * XMIN(LBLK,3), XMAX(LBLK,3), ISCR(NISS*LBLK), * RSCR(NRSS*LBLK) -C + C ISRCHR and RSRCHR must be initialized to zero -C + DO 1 I = 1, NPTS DO 2 J = 1, NISR ISRCHR(J,I) = 0 @@ -97,7 +97,7 @@ SUBROUTINE SRCHT ( RSRCHR(K,I) = 0. 3 CONTINUE 1 CONTINUE -C + IF( NISR .LT. 1 .OR. NRSR .LT. 3 .OR. NISS .LT. 5 .OR. * NRSS .LT. 10 )THEN IERR = 1 @@ -108,7 +108,7 @@ SUBROUTINE SRCHT ( C CALL SORTING ROUTINE TO MAKE RANK ARRAYS CALL MKRNK( NPTS,NPTS,NDIM,XYZPTS,IND,IRNK,IRNK2 ) -C + C LOOP OVER SURFACES AND SEARCH FOR POINTS WITHIN CAPTURE BOX DO 100 IFSRF = 1, NFSRF, LBLK NE = MIN(LBLK,NFSRF-IFSRF+1) @@ -119,7 +119,7 @@ SUBROUTINE SRCHT ( NJ = LINKSRF(2,JFSRF) NK = LINKSRF(3,JFSRF) NL = LINKSRF(4,JFSRF) -C + XMINMS = MIN(XYZSRF(NI,1),XYZSRF(NJ,1), * XYZSRF(NK,1),XYZSRF(NL,1)) XMAXMS = MAX(XYZSRF(NI,1),XYZSRF(NJ,1), @@ -142,19 +142,19 @@ SUBROUTINE SRCHT ( XMIN(J,3) = ZMINMS - TOLER XMAX(J,3) = ZMAXMS + TOLER 110 CONTINUE -C + DO 120 IDIM = 1, NDIM CALL GETBND( LBLK, NE, XYZPTS(1,IDIM), IND(1,IDIM), * NPTS, XMIN(1,IDIM), XMAX(1,IDIM), * NPTS, ILO(1,IDIM), IUP(1,IDIM), * ISCR, RSCR ) 120 CONTINUE -C + DO 130 J = 1, NE JFSRF = IFSRF + J - 1 CALL MKLSTV(NPTS,IND,IRNK2,IUP,ILO,INDX,J,LIST,NLIST, * LBLK,NDIM) -C + DO 140 K = 1, NLIST LVAL = LIST(K) CALL TETSRC( diff --git a/packages/seacas/applications/mapvar/version.f b/packages/seacas/applications/mapvar/version.f index 39eecdce03b7..5d10f35a1214 100644 --- a/packages/seacas/applications/mapvar/version.f +++ b/packages/seacas/applications/mapvar/version.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C************************************************************************ @@ -19,7 +19,6 @@ subroutine version (qainfo) C -- (5) = date of current run C -- (6) = time of current run - qainfo(1) = 'mapvar ' qainfo(2) = '2019/05/15 ' qainfo(3) = ' 2.01 ' diff --git a/packages/seacas/applications/mat2exo/mat2exo.C b/packages/seacas/applications/mat2exo/mat2exo.C index 99f74bc955a1..a83cd3c172c7 100644 --- a/packages/seacas/applications/mat2exo/mat2exo.C +++ b/packages/seacas/applications/mat2exo/mat2exo.C @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /**********************************************************************/ diff --git a/packages/seacas/applications/nem_slice/elb.h b/packages/seacas/applications/nem_slice/elb.h index 58327a2c1253..6569a61c7cd1 100644 --- a/packages/seacas/applications/nem_slice/elb.h +++ b/packages/seacas/applications/nem_slice/elb.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/applications/nem_slice/elb_allo.C b/packages/seacas/applications/nem_slice/elb_allo.C index d9790b7d8246..e45245684523 100644 --- a/packages/seacas/applications/nem_slice/elb_allo.C +++ b/packages/seacas/applications/nem_slice/elb_allo.C @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/applications/nem_slice/elb_allo.h b/packages/seacas/applications/nem_slice/elb_allo.h index 1d0dc7dfeac4..b006dff10d9c 100644 --- a/packages/seacas/applications/nem_slice/elb_allo.h +++ b/packages/seacas/applications/nem_slice/elb_allo.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/applications/nem_slice/elb_elem.C b/packages/seacas/applications/nem_slice/elb_elem.C index 7a20faee58ec..cd62416310cb 100644 --- a/packages/seacas/applications/nem_slice/elb_elem.C +++ b/packages/seacas/applications/nem_slice/elb_elem.C @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/applications/nem_slice/elb_elem.h b/packages/seacas/applications/nem_slice/elb_elem.h index f16931819e16..ee772d87c691 100644 --- a/packages/seacas/applications/nem_slice/elb_elem.h +++ b/packages/seacas/applications/nem_slice/elb_elem.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/applications/nem_slice/elb_err.C b/packages/seacas/applications/nem_slice/elb_err.C index 78f9eef6a67f..1630f274903e 100644 --- a/packages/seacas/applications/nem_slice/elb_err.C +++ b/packages/seacas/applications/nem_slice/elb_err.C @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/applications/nem_slice/elb_err.h b/packages/seacas/applications/nem_slice/elb_err.h index 31d53f80d720..b1caefa9278e 100644 --- a/packages/seacas/applications/nem_slice/elb_err.h +++ b/packages/seacas/applications/nem_slice/elb_err.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/applications/nem_slice/elb_exo.h b/packages/seacas/applications/nem_slice/elb_exo.h index 363ff3a140e7..a607f3ecb273 100644 --- a/packages/seacas/applications/nem_slice/elb_exo.h +++ b/packages/seacas/applications/nem_slice/elb_exo.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/applications/nem_slice/elb_exo_util.C b/packages/seacas/applications/nem_slice/elb_exo_util.C index 7297fc86c419..778e730dd81e 100644 --- a/packages/seacas/applications/nem_slice/elb_exo_util.C +++ b/packages/seacas/applications/nem_slice/elb_exo_util.C @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/applications/nem_slice/elb_graph.C b/packages/seacas/applications/nem_slice/elb_graph.C index 1621aeecbc22..f88bb34e6a53 100644 --- a/packages/seacas/applications/nem_slice/elb_graph.C +++ b/packages/seacas/applications/nem_slice/elb_graph.C @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/applications/nem_slice/elb_graph.h b/packages/seacas/applications/nem_slice/elb_graph.h index f425e26ac92b..7888848707c0 100644 --- a/packages/seacas/applications/nem_slice/elb_graph.h +++ b/packages/seacas/applications/nem_slice/elb_graph.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/applications/nem_slice/elb_groups.C b/packages/seacas/applications/nem_slice/elb_groups.C index 9376e2e4a51d..69d5e5c26702 100644 --- a/packages/seacas/applications/nem_slice/elb_groups.C +++ b/packages/seacas/applications/nem_slice/elb_groups.C @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/applications/nem_slice/elb_groups.h b/packages/seacas/applications/nem_slice/elb_groups.h index 49b92e00ad1b..5b1b015286f2 100644 --- a/packages/seacas/applications/nem_slice/elb_groups.h +++ b/packages/seacas/applications/nem_slice/elb_groups.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/applications/nem_slice/elb_inp.C b/packages/seacas/applications/nem_slice/elb_inp.C index 2886f460ea65..06ffd5c1525d 100644 --- a/packages/seacas/applications/nem_slice/elb_inp.C +++ b/packages/seacas/applications/nem_slice/elb_inp.C @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/applications/nem_slice/elb_inp.h b/packages/seacas/applications/nem_slice/elb_inp.h index c3cd11ad1c9d..b2bf362d7167 100644 --- a/packages/seacas/applications/nem_slice/elb_inp.h +++ b/packages/seacas/applications/nem_slice/elb_inp.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/applications/nem_slice/elb_loadbal.C b/packages/seacas/applications/nem_slice/elb_loadbal.C index a7b2452d3e31..e95840f3c7bd 100644 --- a/packages/seacas/applications/nem_slice/elb_loadbal.C +++ b/packages/seacas/applications/nem_slice/elb_loadbal.C @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/applications/nem_slice/elb_loadbal.h b/packages/seacas/applications/nem_slice/elb_loadbal.h index 79ace8f24481..56731f8c3cb7 100644 --- a/packages/seacas/applications/nem_slice/elb_loadbal.h +++ b/packages/seacas/applications/nem_slice/elb_loadbal.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #ifndef _ELB_LOADBAL_CONST_H_ diff --git a/packages/seacas/applications/nem_slice/elb_main.C b/packages/seacas/applications/nem_slice/elb_main.C index 9d1c5ce4d678..b207278d1f45 100644 --- a/packages/seacas/applications/nem_slice/elb_main.C +++ b/packages/seacas/applications/nem_slice/elb_main.C @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/applications/nem_slice/elb_output.C b/packages/seacas/applications/nem_slice/elb_output.C index 9f45d79d9ff5..b6fa8780d579 100644 --- a/packages/seacas/applications/nem_slice/elb_output.C +++ b/packages/seacas/applications/nem_slice/elb_output.C @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/applications/nem_slice/elb_output.h b/packages/seacas/applications/nem_slice/elb_output.h index b94e1edd730a..7c65a4ee554d 100644 --- a/packages/seacas/applications/nem_slice/elb_output.h +++ b/packages/seacas/applications/nem_slice/elb_output.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/applications/nem_slice/elb_time.C b/packages/seacas/applications/nem_slice/elb_time.C index 933887a5f780..7e2e02264111 100644 --- a/packages/seacas/applications/nem_slice/elb_time.C +++ b/packages/seacas/applications/nem_slice/elb_time.C @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/applications/nem_slice/elb_util.C b/packages/seacas/applications/nem_slice/elb_util.C index 0133b9c30802..fbd4cdd1759a 100644 --- a/packages/seacas/applications/nem_slice/elb_util.C +++ b/packages/seacas/applications/nem_slice/elb_util.C @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/applications/nem_slice/elb_util.h b/packages/seacas/applications/nem_slice/elb_util.h index 57c209fc4101..379ac0d9f505 100644 --- a/packages/seacas/applications/nem_slice/elb_util.h +++ b/packages/seacas/applications/nem_slice/elb_util.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/applications/nem_slice/fix_column_partitions.C b/packages/seacas/applications/nem_slice/fix_column_partitions.C index 133c2245675b..f2c5142107f4 100644 --- a/packages/seacas/applications/nem_slice/fix_column_partitions.C +++ b/packages/seacas/applications/nem_slice/fix_column_partitions.C @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/applications/nem_slice/fix_column_partitions.h b/packages/seacas/applications/nem_slice/fix_column_partitions.h index 9973ce6d9644..fe68184204bd 100644 --- a/packages/seacas/applications/nem_slice/fix_column_partitions.h +++ b/packages/seacas/applications/nem_slice/fix_column_partitions.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/applications/nem_slice/input-ldbl b/packages/seacas/applications/nem_slice/input-ldbl index 9ea4acdca553..955284129f20 100644 --- a/packages/seacas/applications/nem_slice/input-ldbl +++ b/packages/seacas/applications/nem_slice/input-ldbl @@ -1,7 +1,7 @@ ############################################################################## Copyright(C) 1999-2020 National Technology & Engineering Solutions ############################################################################## of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with ############################################################################## NTESS, the U.S. Government retains certain rights in this software. -############################################################################## +############################################################################## ############################################################################## See packages/seacas/LICENSE for details ############################################################################## @@ -215,7 +215,7 @@ WEIGHTING SPECIFICATIONS = READ=testa-out-r.exoII,Var_Name=Temp,time_index=5 # quietly ignored # Example: # Assume block IDs= 1-20 31-45 -# +# # descriptor group1 group2 group3 # - {1-20} 1-20 31-45 # - {30-45 3/ 10-12} 3, 30-45 10,11,12 1,2,4-20 diff --git a/packages/seacas/applications/nem_slice/nem_slice.1 b/packages/seacas/applications/nem_slice/nem_slice.1 index 792d783f81c2..13204fd91355 100644 --- a/packages/seacas/applications/nem_slice/nem_slice.1 +++ b/packages/seacas/applications/nem_slice/nem_slice.1 @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details .TH NEM_SLICE 1 LOCAL diff --git a/packages/seacas/applications/nem_spread/el_check_monot.h b/packages/seacas/applications/nem_spread/el_check_monot.h index 229366731173..94988a5a218a 100644 --- a/packages/seacas/applications/nem_spread/el_check_monot.h +++ b/packages/seacas/applications/nem_spread/el_check_monot.h @@ -5,7 +5,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/applications/nem_spread/el_elm.h b/packages/seacas/applications/nem_spread/el_elm.h index 3c5334c916bc..dd0ac20aa460 100644 --- a/packages/seacas/applications/nem_spread/el_elm.h +++ b/packages/seacas/applications/nem_spread/el_elm.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/applications/nem_spread/el_elm_info.C b/packages/seacas/applications/nem_spread/el_elm_info.C index 4bcbb239dd92..f5b9e60763d1 100644 --- a/packages/seacas/applications/nem_spread/el_elm_info.C +++ b/packages/seacas/applications/nem_spread/el_elm_info.C @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/applications/nem_spread/el_exoII_io.C b/packages/seacas/applications/nem_spread/el_exoII_io.C index 6185a0664573..b9639f9a1c92 100644 --- a/packages/seacas/applications/nem_spread/el_exoII_io.C +++ b/packages/seacas/applications/nem_spread/el_exoII_io.C @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #include "copy_string_cpp.h" diff --git a/packages/seacas/applications/nem_spread/globals.h b/packages/seacas/applications/nem_spread/globals.h index 47d2b0838214..87133482bcf1 100644 --- a/packages/seacas/applications/nem_spread/globals.h +++ b/packages/seacas/applications/nem_spread/globals.h @@ -4,7 +4,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/applications/nem_spread/md_timer_getrusage.C b/packages/seacas/applications/nem_spread/md_timer_getrusage.C index fb8fee115812..dea6351a4357 100644 --- a/packages/seacas/applications/nem_spread/md_timer_getrusage.C +++ b/packages/seacas/applications/nem_spread/md_timer_getrusage.C @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/applications/nem_spread/nem_spread.C b/packages/seacas/applications/nem_spread/nem_spread.C index a8690c579412..cd8a687a7c88 100644 --- a/packages/seacas/applications/nem_spread/nem_spread.C +++ b/packages/seacas/applications/nem_spread/nem_spread.C @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /*--------------------------------------------------------------------------*/ diff --git a/packages/seacas/applications/nem_spread/nem_spread.h b/packages/seacas/applications/nem_spread/nem_spread.h index f511e9a0fa71..68506632f0aa 100644 --- a/packages/seacas/applications/nem_spread/nem_spread.h +++ b/packages/seacas/applications/nem_spread/nem_spread.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #ifndef NEM_SPREAD_H diff --git a/packages/seacas/applications/nem_spread/nem_spread.inp b/packages/seacas/applications/nem_spread/nem_spread.inp index 1e76779bab9a..d487c4e8e2d4 100644 --- a/packages/seacas/applications/nem_spread/nem_spread.inp +++ b/packages/seacas/applications/nem_spread/nem_spread.inp @@ -1,7 +1,7 @@ # Copyright(C) 1999-2020 National Technology & Engineering Solutions # of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with # NTESS, the U.S. Government retains certain rights in this software. -# +# # See packages/seacas/LICENSE for details ############################################################################## # GENERAL NOTES diff --git a/packages/seacas/applications/nem_spread/pe_check_inp.C b/packages/seacas/applications/nem_spread/pe_check_inp.C index 12df65cb62f2..d6bff0ddf09b 100644 --- a/packages/seacas/applications/nem_spread/pe_check_inp.C +++ b/packages/seacas/applications/nem_spread/pe_check_inp.C @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #include "fmt/ostream.h" diff --git a/packages/seacas/applications/nem_spread/pe_common.h b/packages/seacas/applications/nem_spread/pe_common.h index 3948926618fd..8a6751a88896 100644 --- a/packages/seacas/applications/nem_spread/pe_common.h +++ b/packages/seacas/applications/nem_spread/pe_common.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/applications/nem_spread/pe_input.C b/packages/seacas/applications/nem_spread/pe_input.C index 8e7eec53053e..4cb7a72419a6 100644 --- a/packages/seacas/applications/nem_spread/pe_input.C +++ b/packages/seacas/applications/nem_spread/pe_input.C @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /*--------------------------------------------------------------------------*/ diff --git a/packages/seacas/applications/nem_spread/pe_load_lb_info.C b/packages/seacas/applications/nem_spread/pe_load_lb_info.C index b61f23b0e88f..e71f6013b49c 100644 --- a/packages/seacas/applications/nem_spread/pe_load_lb_info.C +++ b/packages/seacas/applications/nem_spread/pe_load_lb_info.C @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #include diff --git a/packages/seacas/applications/nem_spread/pe_str_util.C b/packages/seacas/applications/nem_spread/pe_str_util.C index be44e7d3ff7c..c83ad5a25b46 100644 --- a/packages/seacas/applications/nem_spread/pe_str_util.C +++ b/packages/seacas/applications/nem_spread/pe_str_util.C @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #include // for isupper, tolower diff --git a/packages/seacas/applications/nem_spread/pe_str_util_const.h b/packages/seacas/applications/nem_spread/pe_str_util_const.h index d0b88f5984ad..6d43358a8437 100644 --- a/packages/seacas/applications/nem_spread/pe_str_util_const.h +++ b/packages/seacas/applications/nem_spread/pe_str_util_const.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/applications/nem_spread/pe_util.C b/packages/seacas/applications/nem_spread/pe_util.C index 1990cd638353..f8da9fccbeb7 100644 --- a/packages/seacas/applications/nem_spread/pe_util.C +++ b/packages/seacas/applications/nem_spread/pe_util.C @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/applications/nem_spread/pe_write_parExo_info.C b/packages/seacas/applications/nem_spread/pe_write_parExo_info.C index d92c714e0341..c5bd431d65ef 100644 --- a/packages/seacas/applications/nem_spread/pe_write_parExo_info.C +++ b/packages/seacas/applications/nem_spread/pe_write_parExo_info.C @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #include "copy_string_cpp.h" diff --git a/packages/seacas/applications/nem_spread/ps_pario.h b/packages/seacas/applications/nem_spread/ps_pario.h index ece2c58820d0..f481c4571457 100644 --- a/packages/seacas/applications/nem_spread/ps_pario.h +++ b/packages/seacas/applications/nem_spread/ps_pario.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #include "ps_pario_const.h" diff --git a/packages/seacas/applications/nem_spread/ps_pario_const.h b/packages/seacas/applications/nem_spread/ps_pario_const.h index 8230ae5f2ea2..e16f3de92e14 100644 --- a/packages/seacas/applications/nem_spread/ps_pario_const.h +++ b/packages/seacas/applications/nem_spread/ps_pario_const.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #ifndef PS_PARIO_CONST_H diff --git a/packages/seacas/applications/nem_spread/ps_restart.C b/packages/seacas/applications/nem_spread/ps_restart.C index c541c4e69530..c4f364691f15 100644 --- a/packages/seacas/applications/nem_spread/ps_restart.C +++ b/packages/seacas/applications/nem_spread/ps_restart.C @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #include "exodusII.h" // for ex_close, etc diff --git a/packages/seacas/applications/nem_spread/rf_allo.C b/packages/seacas/applications/nem_spread/rf_allo.C index 908d47037bcf..8e35a99ed08d 100644 --- a/packages/seacas/applications/nem_spread/rf_allo.C +++ b/packages/seacas/applications/nem_spread/rf_allo.C @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #include "fmt/ostream.h" diff --git a/packages/seacas/applications/nem_spread/rf_allo.h b/packages/seacas/applications/nem_spread/rf_allo.h index 50dcd3b8f3e2..084fb6ac9052 100644 --- a/packages/seacas/applications/nem_spread/rf_allo.h +++ b/packages/seacas/applications/nem_spread/rf_allo.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/applications/nem_spread/rf_io.h b/packages/seacas/applications/nem_spread/rf_io.h index cac1bacc5f47..82c829fc43c4 100644 --- a/packages/seacas/applications/nem_spread/rf_io.h +++ b/packages/seacas/applications/nem_spread/rf_io.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /* diff --git a/packages/seacas/applications/nem_spread/rf_io_const.h b/packages/seacas/applications/nem_spread/rf_io_const.h index f1ede47b570a..4138af1c1f58 100644 --- a/packages/seacas/applications/nem_spread/rf_io_const.h +++ b/packages/seacas/applications/nem_spread/rf_io_const.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #ifndef RF_IO_CONST_H diff --git a/packages/seacas/applications/nem_spread/rf_mesh_param.C b/packages/seacas/applications/nem_spread/rf_mesh_param.C index 0af23f3d78df..2cca49e151ec 100644 --- a/packages/seacas/applications/nem_spread/rf_mesh_param.C +++ b/packages/seacas/applications/nem_spread/rf_mesh_param.C @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/applications/nem_spread/rf_pre_proc.C b/packages/seacas/applications/nem_spread/rf_pre_proc.C index 35e5dd04e0e7..8c174c490847 100644 --- a/packages/seacas/applications/nem_spread/rf_pre_proc.C +++ b/packages/seacas/applications/nem_spread/rf_pre_proc.C @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/applications/nem_spread/rf_util.C b/packages/seacas/applications/nem_spread/rf_util.C index e45d13cb3b5c..5a0709b6249e 100644 --- a/packages/seacas/applications/nem_spread/rf_util.C +++ b/packages/seacas/applications/nem_spread/rf_util.C @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/applications/nem_spread/rf_util.h b/packages/seacas/applications/nem_spread/rf_util.h index 778422a21eee..d265edd6e310 100644 --- a/packages/seacas/applications/nem_spread/rf_util.h +++ b/packages/seacas/applications/nem_spread/rf_util.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #ifndef _RF_UTIL_H diff --git a/packages/seacas/applications/nem_spread/sort_utils.C b/packages/seacas/applications/nem_spread/sort_utils.C index 7f898676bb34..365cd14ab58d 100644 --- a/packages/seacas/applications/nem_spread/sort_utils.C +++ b/packages/seacas/applications/nem_spread/sort_utils.C @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/applications/nem_spread/sort_utils.h b/packages/seacas/applications/nem_spread/sort_utils.h index 331f92f49d67..69bea11eee77 100644 --- a/packages/seacas/applications/nem_spread/sort_utils.h +++ b/packages/seacas/applications/nem_spread/sort_utils.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ template void gds_iqsort(INT v[], INT iv[], size_t N); diff --git a/packages/seacas/applications/numbers/nu_adddsp.f b/packages/seacas/applications/numbers/nu_adddsp.f index 587a151fe3f4..674a6350542d 100644 --- a/packages/seacas/applications/numbers/nu_adddsp.f +++ b/packages/seacas/applications/numbers/nu_adddsp.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: adddsp.f,v 1.1 1991/02/21 15:42:08 gdsjaar Exp $ -C $Log: adddsp.f,v $ -C Revision 1.1 1991/02/21 15:42:08 gdsjaar -C Initial revision -C SUBROUTINE ADDDSP (COORDS, DSP) DIMENSION COORDS (NUMNP,*), DSP(NUMNP,*) CC diff --git a/packages/seacas/applications/numbers/nu_cav.blk b/packages/seacas/applications/numbers/nu_cav.blk index e74d58a5ae23..5e8f9fe3f6aa 100644 --- a/packages/seacas/applications/numbers/nu_cav.blk +++ b/packages/seacas/applications/numbers/nu_cav.blk @@ -1,13 +1,8 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: cav.blk,v 1.1 1991/02/21 15:42:19 gdsjaar Exp $ -C $Log: cav.blk,v $ -C Revision 1.1 1991/02/21 15:42:19 gdsjaar -C Initial revision -C PARAMETER (MAXCAV = 12) COMMON /CAV/ ICAV(MAXCAV), IFND(MAXCAV), NUMCAV diff --git a/packages/seacas/applications/numbers/nu_cavity.f b/packages/seacas/applications/numbers/nu_cavity.f index b3e8dd6d17ae..51d21efd7672 100644 --- a/packages/seacas/applications/numbers/nu_cavity.f +++ b/packages/seacas/applications/numbers/nu_cavity.f @@ -1,13 +1,13 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details SUBROUTINE CAVITY (A, CRD, IDESS, NEESS, NNESS, IPEESS, IPNESS, * LTEESS, LTNESS, FACESS, DISP, NUMNP, NDIM, NUMESS, * TIME, ITMSEL, TITLE, CENT, CENTER) -C + include 'nu_io.blk' DIMENSION A(*), CRD(NUMNP,NDIM), IDESS(*), NEESS(*), * NNESS(*), IPEESS(*), IPNESS(*), LTEESS(*), LTNESS(*), @@ -18,10 +18,10 @@ SUBROUTINE CAVITY (A, CRD, IDESS, NEESS, NNESS, IPEESS, IPNESS, include 'nu_ptim.blk' include 'nu_cav.blk' LOGICAL ERROR, CENTER -C + CALL GETCAV (ERROR, IDESS, NUMESS) IF (ERROR) RETURN -C + TVOL = 0.0 DO 10 NCAV = 1, NUMCAV IFLG = IFND(NCAV) @@ -33,7 +33,7 @@ SUBROUTINE CAVITY (A, CRD, IDESS, NEESS, NNESS, IPEESS, IPNESS, CALL VOL2D( CRD, LTNESS(IPTR), NEESS(IFLG), VOLUME, * NDIM, NUMESS, AXI, CENT, NUMNP, CENTER) END IF -C + TVOL = TVOL + VOLUME 10 CONTINUE DO 20 IO=IOMIN, IOMAX @@ -50,9 +50,8 @@ SUBROUTINE CAVITY (A, CRD, IDESS, NEESS, NNESS, IPEESS, IPNESS, 50 FORMAT ( ' Apex at X =',1PE15.8,', Y =',1PE15.8,', Z =',1PE15.8) 60 FORMAT (/' Undeformed Volume of Cavity is ',1PE15.8) -C C ... REWIND EXODUS FILE TO BEGINNING OF TIMESTEPS -C + IF (EXODUS .AND. ISDIS) THEN TIMEL = STMIN CALL GETDSP (CRD, DISP, NDIM, NUMNP, TIME, ITMSEL, 'R', ISTAT) @@ -67,7 +66,7 @@ SUBROUTINE CAVITY (A, CRD, IDESS, NEESS, NNESS, IPEESS, IPNESS, * ' Change Change',/ * 4X,'---- ------ ------', * ' -------- -------') -C + DELLAS = 0.0 90 CONTINUE CALL GETDSP (CRD, DISP, NDIM, NUMNP, TIME, ITMSEL, 'S', ISTAT) @@ -86,7 +85,7 @@ SUBROUTINE CAVITY (A, CRD, IDESS, NEESS, NNESS, IPEESS, IPNESS, CALL DVOL2D(CRD, DISP, LTNESS(IPTR), * NEESS(IFLG), DELCAV, NDIM, AXI, NUMNP) END IF -C + DELVOL = DELVOL + DELCAV 100 CONTINUE DELDEL = DELVOL - DELLAS diff --git a/packages/seacas/applications/numbers/nu_cgcal2.f b/packages/seacas/applications/numbers/nu_cgcal2.f index 0856c331ba6a..c29e55bbe1ac 100644 --- a/packages/seacas/applications/numbers/nu_cgcal2.f +++ b/packages/seacas/applications/numbers/nu_cgcal2.f @@ -1,43 +1,28 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: cgcal2.f,v 1.3 2000/07/06 18:07:42 gdsjaar Exp $ -C $Log: cgcal2.f,v $ -C Revision 1.3 2000/07/06 18:07:42 gdsjaar -C Fix assumption that variables are saved between subroutine calls -C -C Revision 1.2 1999/02/16 21:37:58 gdsjaar -C Converted to read exodusII database format. Somewhat tested, not -C ready for production yet. -C -C Revision 1.1.1.1 1991/02/21 15:42:24 gdsjaar -C NUMBERS: Greg Sjaardema, initial Unix release -C -c Revision 1.1 1991/02/21 15:42:23 gdsjaar -c Initial revision -c SUBROUTINE CGCAL2(CRD,IX,MAT,MASS,VOL,DENS,VOLM,CG,ZITOT,XXX, * XG,XI,XINI,AJ,NNODES,NDIM,NQUAD,VOLMN,IELM,NELBLK, * AXI,NUMNP) -C + DIMENSION CRD(NUMNP,*), IX(NNODES,*), MAT(6,*), MASS(*), * DENS(*), VOLM(*), CG(*), ZITOT(*),VOLMN(4,*),IELM(4,*), * XXX(NDIM+1,NQUAD,*),XG(NDIM,*), XI(NDIM,*), XINI(*), * AJ(2,*) DIMENSION ZI(6), ZMOM(3) DIMENSION CCC(2,4) -C + LOGICAL AXI REAL MASS, MASSE PI = ATAN2(0.0, -1.0) -C + C ... VOLMN(1,*) = MINIMUM VOLUME (AREAS FOR 2-D) C VOLMN(2,*) = MAXIMUM VOLUME C VOLMN(3,*) = TOTAL VOLUME -C + DO 10 I=1, NELBLK VOLMN(1,I) = 1.0E30 VOLMN(2,I) = 0.0 @@ -53,27 +38,27 @@ SUBROUTINE CGCAL2(CRD,IX,MAT,MASS,VOL,DENS,VOLM,CG,ZITOT,XXX, 20 CONTINUE ZMAS = 0.0 VOL = 0.0 -C + C ... GET QUADRATURE POINT LOCATIONS, EVALUATE SHAPE FUNCTIONS -C + CALL QUAD(XXX, XI, XG, NDIM, NNODES, NQUAD, WT) -C + DO 110 IBLK = 1, NELBLK IF (MAT(5,IBLK) .NE. 1) GOTO 110 IELBEG = MAT(3,IBLK) IELEND = MAT(4,IBLK) MIEL = IBLK DO 100 IEL = IELBEG, IELEND -C + C ... CALCULATE AREA, VOLUME, AND MOMENTS OF INERTIA OF ELEMENT -C + DO 30 I=1,3 ZI(I) = 0.0 ZI(I+3) = 0.0 CG(I) = 0.0 30 CONTINUE VOLUME = 0.0 -C + DO 40 I=1,4 CCC(1,I) = CRD(IX(I,IEL),1) CCC(2,I) = CRD(IX(I,IEL),2) @@ -86,7 +71,7 @@ SUBROUTINE CGCAL2(CRD,IX,MAT,MASS,VOL,DENS,VOLM,CG,ZITOT,XXX, AJ(K,J) = 0.0 50 CONTINUE 60 CONTINUE -C + DO 70 I=1,4 XINI(1) = XINI(1)+XXX(1,I,NG) * CCC(1,I) AJ(1,1) = AJ(1,1)+XXX(2,I,NG) * CCC(1,I) @@ -96,14 +81,14 @@ SUBROUTINE CGCAL2(CRD,IX,MAT,MASS,VOL,DENS,VOLM,CG,ZITOT,XXX, AJ(1,2) = AJ(1,2)+XXX(2,I,NG) * CCC(2,I) AJ(2,2) = AJ(2,2)+XXX(3,I,NG) * CCC(2,I) 70 CONTINUE -C + DET = ( AJ(1,1)*AJ(2,2) - AJ(2,1)*AJ(1,2) ) * WT DETW = DET * DENS(MIEL) -C + IF (AXI) THEN -C + C ... CG(1) IS THE VOLUME FOR AXI 2-D, VOLUME IS ACTUALLY C/S AREA -C + CG(1) = CG(1) + DET * XINI(1) CG(2) = CG(2) + DETW * XINI(1) * XINI(2) ZI(2) = ZI(2) + DETW * XINI(1)**3 @@ -117,12 +102,12 @@ SUBROUTINE CGCAL2(CRD,IX,MAT,MASS,VOL,DENS,VOLM,CG,ZITOT,XXX, ZI(3) = ZI(3) + DETW * XINI(1)*XINI(2) VOLUME = VOLUME + DET END IF -C + 80 CONTINUE -C + C ... DETERMINE MIN/MAX ELEMENT VOLUMES FOR EACH MATERIAL AND C COUNT NUMBER OF ELEMENTS FOR EACH MATERIAL -C + IELM(3,MIEL) = IELM(3,MIEL) + 1 VOLMN(3,MIEL) = VOLMN(3,MIEL) + VOLUME IF (VOLUME .LT. VOLMN(1,MIEL)) THEN @@ -132,7 +117,7 @@ SUBROUTINE CGCAL2(CRD,IX,MAT,MASS,VOL,DENS,VOLM,CG,ZITOT,XXX, VOLMN(2,MIEL) = VOLUME IELM(2,MIEL) = IEL ENDIF -C + IF (AXI) THEN VOLUME = 2. * PI * CG(1) ZI(2) = ZI(2) * 2. * PI @@ -169,6 +154,6 @@ SUBROUTINE CGCAL2(CRD,IX,MAT,MASS,VOL,DENS,VOLM,CG,ZITOT,XXX, ZITOT(4) = ZITOT(3) - ZMAS * CG(1) * CG(2) ZITOT(3) = ZITOT(1) + ZITOT(2) END IF -C + RETURN END diff --git a/packages/seacas/applications/numbers/nu_cgcal3.f b/packages/seacas/applications/numbers/nu_cgcal3.f index 991b95387e13..b22d7a5ab71d 100644 --- a/packages/seacas/applications/numbers/nu_cgcal3.f +++ b/packages/seacas/applications/numbers/nu_cgcal3.f @@ -1,50 +1,28 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: cgcal3.f,v 1.5 2000/07/06 18:07:42 gdsjaar Exp $ -C $Log: cgcal3.f,v $ -C Revision 1.5 2000/07/06 18:07:42 gdsjaar -C Fix assumption that variables are saved between subroutine calls -C -C Revision 1.4 1999/02/16 21:37:58 gdsjaar -C Converted to read exodusII database format. Somewhat tested, not -C ready for production yet. -C -C Revision 1.3 1992/05/20 16:41:29 gdsjaar -C Changed min/max element size calculation so 1 element and equal-size -C element blocks would set both min and max values. -C -c Revision 1.2 1991/11/06 18:17:11 gdsjaar -c Added warning for negative volume elements -c -c Revision 1.1.1.1 1991/02/21 15:42:27 gdsjaar -c NUMBERS: Greg Sjaardema, initial Unix release -c -c Revision 1.1 1991/02/21 15:42:26 gdsjaar -c Initial revision -c SUBROUTINE CGCAL3(CRD,IX,MAT,MASS,VOL,DENS,VOLM,CG,ZITOT,XXX, * XG,XI,XINI,AJ,NNODES,NDIM,NQUAD,VOLMN,IELM,NELBLK,NUMNP) -C + C ... CALCULATE PROPERTIES FOR THREE-DIMENSIONAL MESH --- BRICKS ONLY -C + DIMENSION CRD(NUMNP,*), IX(NNODES,*), MAT(6,*), MASS(*), * DENS(*), VOLM(*), CG(*), ZITOT(*),VOLMN(4,*),IELM(4,*), * XXX(3+1,NQUAD,*),XG(3,*), XI(3,*), XINI(*), * AJ(3,*) DIMENSION ZI(6), ZMOM(3) DIMENSION CCC(3,8) -C + REAL MASS, MASSE -C + C ... VOLMN(1,*) = MINIMUM VOLUME (AREAS FOR 2-D) C VOLMN(2,*) = MAXIMUM VOLUME C VOLMN(3,*) = TOTAL VOLUME C VOLMN(4,*) = MAXIMUM SUM OF SQUARES OF INVERSE LENGTHS -C + DO 10 I=1, NELBLK VOLMN(1,I) = 1.0E30 VOLMN(2,I) = 0.0 @@ -61,36 +39,35 @@ SUBROUTINE CGCAL3(CRD,IX,MAT,MASS,VOL,DENS,VOLM,CG,ZITOT,XXX, ZMAS = 0.0 VOL = 0.0 -C C ... GET QUADRATURE POINT LOCATIONS, EVALUATE SHAPE FUNCTIONS -C + CALL QUAD(XXX, XI, XG, NDIM, NNODES, NQUAD, WT) -C + DO 80 IBLK = 1, NELBLK IF (MAT(5,IBLK) .NE. 1) GOTO 80 IELBEG = MAT(3,IBLK) IELEND = MAT(4,IBLK) MIEL = IBLK DO 70 IEL = IELBEG, IELEND -C + C ... CALCULATE ARA, VOLUME, AND MOMENTS OF INERTIA OF ELEMENT -C + DO 30 I=1,3 ZI(I) = 0.0 ZI(I+3) = 0.0 CG(I) = 0.0 30 CONTINUE VOLUME = 0.0 -C + DO 40 I=1,8 CCC(1,I) = CRD(IX(I,IEL),1) CCC(2,I) = CRD(IX(I,IEL),2) CCC(3,I) = CRD(IX(I,IEL),3) 40 CONTINUE -C + DO 60 NG=1,NQUAD DET = 0.0 -C + XINI(1) = XXX(1,1,NG) * CCC(1,1) + * XXX(1,2,NG) * CCC(1,2) + XXX(1,3,NG) * CCC(1,3) + * XXX(1,4,NG) * CCC(1,4) + XXX(1,5,NG) * CCC(1,5) + @@ -106,7 +83,7 @@ SUBROUTINE CGCAL3(CRD,IX,MAT,MASS,VOL,DENS,VOLM,CG,ZITOT,XXX, * XXX(1,4,NG) * CCC(3,4) + XXX(1,5,NG) * CCC(3,5) + * XXX(1,6,NG) * CCC(3,6) + XXX(1,7,NG) * CCC(3,7) + * XXX(1,8,NG) * CCC(3,8) -C + AJ(1,1) = XXX(2,1,NG) * CCC(1,1) * + XXX(2,2,NG) * CCC(1,2) + XXX(2,3,NG) * CCC(1,3) * + XXX(2,4,NG) * CCC(1,4) + XXX(2,5,NG) * CCC(1,5) @@ -155,13 +132,12 @@ SUBROUTINE CGCAL3(CRD,IX,MAT,MASS,VOL,DENS,VOLM,CG,ZITOT,XXX, * + XXX(4,6,NG) * CCC(3,6) + XXX(4,7,NG) * CCC(3,7) * + XXX(4,8,NG) * CCC(3,8) -C DET = AJ(1,1) * (AJ(2,2)*AJ(3,3) - AJ(2,3)*AJ(3,2)) * -AJ(1,2) * (AJ(2,1)*AJ(3,3) - AJ(2,3)*AJ(3,1)) * +AJ(1,3) * (AJ(2,1)*AJ(3,2) - AJ(2,2)*AJ(3,1)) DET = DET * WT DETW = DET * DENS(MIEL) -C + CG(1) = CG(1) + DETW * XINI(1) CG(2) = CG(2) + DETW * XINI(2) CG(3) = CG(3) + DETW * XINI(3) @@ -175,12 +151,12 @@ SUBROUTINE CGCAL3(CRD,IX,MAT,MASS,VOL,DENS,VOLM,CG,ZITOT,XXX, ZI(6) = ZI(6) + DETW * XINI(2) * XINI(3) VOLUME = VOLUME + DET -C + 60 CONTINUE -C + C ... DETERMINE MIN/MAX ELEMENT VOLUMES FOR EACH MATERIAL AND C COUNT NUMBER OF ELEMENTS FOR EACH MATERIAL -C + IELM(3,MIEL) = IELM(3,MIEL) + 1 VOLMN(3,MIEL) = VOLMN(3,MIEL) + VOLUME IF (VOLUME .LT. VOLMN(1,MIEL)) THEN @@ -192,7 +168,7 @@ SUBROUTINE CGCAL3(CRD,IX,MAT,MASS,VOL,DENS,VOLM,CG,ZITOT,XXX, VOLMN(2,MIEL) = VOLUME IELM(2,MIEL) = IEL END IF -C + if (volume .le. 0.0) then write (*,*) 'Zero or negative volume at element', & iel @@ -223,6 +199,6 @@ SUBROUTINE CGCAL3(CRD,IX,MAT,MASS,VOL,DENS,VOLM,CG,ZITOT,XXX, ZITOT(4) = ZITOT(4) - ZMAS * CG(1) * CG(2) ZITOT(5) = ZITOT(5) - ZMAS * CG(1) * CG(3) ZITOT(6) = ZITOT(6) - ZMAS * CG(2) * CG(3) -C + RETURN END diff --git a/packages/seacas/applications/numbers/nu_cmdlist.blk b/packages/seacas/applications/numbers/nu_cmdlist.blk index 57585e3b06b7..e7286d5fd7b1 100644 --- a/packages/seacas/applications/numbers/nu_cmdlist.blk +++ b/packages/seacas/applications/numbers/nu_cmdlist.blk @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: cmdlist.blk,v 1.1 1991/02/21 15:42:33 gdsjaar Exp $ -C $Log: cmdlist.blk,v $ -C Revision 1.1 1991/02/21 15:42:33 gdsjaar -C Initial revision -C CHARACTER*8 CMDTBL(22) SAVE CMDTBL C --CMDTBL - the valid commands table diff --git a/packages/seacas/applications/numbers/nu_command.f b/packages/seacas/applications/numbers/nu_command.f index 32732f614ccb..1f43efee9cb6 100644 --- a/packages/seacas/applications/numbers/nu_command.f +++ b/packages/seacas/applications/numbers/nu_command.f @@ -1,17 +1,16 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: command.f,v 1.18 2007/03/21 20:12:37 gdsjaar Exp $ SUBROUTINE COMMAND (A, IA, TITLE, TIME, ITMSEL, MAT, DISP, * CRD, LINK, DENSTY, WAVE, ISEVOK, * NAMEGL, NAMENV, NAMEEL, * NQAREC, QAREC, NINFO, INFREC, DBNAME) -C + C READ AND INTERPRET ALL INPUT DATA -C + include 'exodusII.inc' CHARACTER*80 TITLE, COMMENT INTEGER IA(*) @@ -218,9 +217,9 @@ SUBROUTINE COMMAND (A, IA, TITLE, TIME, ITMSEL, MAT, DISP, C----------------------------------------------------------------------- ELSE IF (NAME .EQ.'PROPERTI' .OR. NAME .EQ. 'MASS') THEN -C + C ... SET NUMBER OF QUADRATURE POINTS -C + CALL FFINTG (IFLD, KV, IVAL, * 'number of quadrature points', 1, NQUAD, *20) IF (NQUAD .NE. 1 .AND. NQUAD .NE. 2**NDIM) THEN @@ -230,7 +229,7 @@ SUBROUTINE COMMAND (A, IA, TITLE, TIME, ITMSEL, MAT, DISP, * 'quadrature order must be 1 or 8') GO TO 20 END IF -C + CALL FFREAL (IFLD, KV, RV, * 'common material density', 0.0, CDENS, *20) IF (CDENS .GT. 0.) THEN @@ -241,13 +240,13 @@ SUBROUTINE COMMAND (A, IA, TITLE, TIME, ITMSEL, MAT, DISP, * 'density must be greater than zero') GO TO 20 END IF -C + CALL MASSPR (A, TIME, ITMSEL, DENSTY, MAT, * DISP, NQUAD, LABEL) C----------------------------------------------------------------------- ELSE IF (NAME .EQ. 'TIMESTEP') THEN -C + CALL FFREAL (IFLD, KV, RV, * 'common material wavespeed', 0.0, CWAVE, *20) IF (CWAVE .GT. 0.) THEN @@ -572,17 +571,17 @@ SUBROUTINE COMMAND (A, IA, TITLE, TIME, ITMSEL, MAT, DISP, ELSE IF (NAME .EQ. 'EXIT' .OR. NAME .EQ. 'END' & .or. name .eq. 'QUIT') THEN GO TO 190 -C + C ... LOCATE NODES|ELEMENTS WITHIN toler OF LINE|PLANE|POINT -C + C --- FORMAT: locate nodes line x1,y1,[z1] x2,y2,[z2], toler1, toler2 type C locate nodes plane x1,y1,[z1] i2,j2,[k2], toler1, toler2 C locate nodes point x1,y1,[z1] toler1, toler2 -C + C locate elements line x1,y1,[z1] x2,y2,[z2], toler1, toler2 type C locate elements plane x1,y1,[z1] i2,j2,[k2], toler1, toler2 C locate elements point x1,y1,[z1] toler1, toler2 -C + C x1, y1, z1, x2, y2, z2 = Coordinate locations C i2, j2, k2 = Normal Vector to plane C If TOLER2 .EQ. 0, then TOLER1 = Maximum Distance for locate @@ -593,7 +592,7 @@ SUBROUTINE COMMAND (A, IA, TITLE, TIME, ITMSEL, MAT, DISP, C----------------------------------------------------------------------- ELSE IF (NAME .EQ. 'LOCATE') THEN -C + TYPE = 'UNBOUNDE' DO 150 I=NF,4,-1 IF (KV(I) .EQ. 0) THEN @@ -652,7 +651,7 @@ SUBROUTINE COMMAND (A, IA, TITLE, TIME, ITMSEL, MAT, DISP, & // '" is an invalid LOCATE option') GO TO 170 END IF -C + 170 CONTINUE C----------------------------------------------------------------------- @@ -864,5 +863,5 @@ SUBROUTINE COMMAND (A, IA, TITLE, TIME, ITMSEL, MAT, DISP, GO TO 20 190 CONTINUE RETURN -C + END diff --git a/packages/seacas/applications/numbers/nu_con2d.f b/packages/seacas/applications/numbers/nu_con2d.f index 876a335f1ef0..e4bc3a461399 100644 --- a/packages/seacas/applications/numbers/nu_con2d.f +++ b/packages/seacas/applications/numbers/nu_con2d.f @@ -1,44 +1,24 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: con2d.f,v 1.5 2004/06/29 18:05:32 gdsjaar Exp $ -C $Log: con2d.f,v $ -C Revision 1.5 2004/06/29 18:05:32 gdsjaar -C General cleanup. Remove unused labels and variables. -C -C Revision 1.4 2000/07/06 18:07:42 gdsjaar -C Fix assumption that variables are saved between subroutine calls -C -C Revision 1.3 2000/07/06 16:49:57 gdsjaar -C Changed real*4 to real -C -C Revision 1.2 1991/04/10 19:28:18 gdsjaar -C Removed vax debug lines -C -c Revision 1.1.1.1 1991/02/21 15:42:40 gdsjaar -c NUMBERS: Greg Sjaardema, initial Unix release -c -c Revision 1.1 1991/02/21 15:42:39 gdsjaar -c Initial revision -c C======================================================================= SUBROUTINE CON2D (CRD, NDIM, NUMNP, IX, NNODES, NUMEL, MAT, * NELBLK, SELECT, ASPECT, SKEW, TAPER, AREA, * SUMRY, ISUMRY, DEBUG) C======================================================================= -C + C *** CON2D *** Calculate state of mesh -- Aspect ratio, Skewness, C and Taper -C + C (Greg Sjaardema, 16 April, 1989) -C + C Based on article by John Robinson, "CRE Method of element testing C and the Jacobian shape parameters," Eng. Comput., 1987, Vol. 4, C June, pp 113 - 118 -C + C -- ARRAYS: C CRD(NUMNP, NDIM) - IN - C IX(NNODES, NUMEL) - IN - @@ -48,24 +28,24 @@ SUBROUTINE CON2D (CRD, NDIM, NUMNP, IX, NNODES, NUMEL, MAT, C SKEW(NUMEL) - OUT- Skewness of mesh, degrees (0 <= skew <= ?) C TAPER(NUMEL) - OUT- Taper of mesh, combination of X and Y taper C AREA(NUMEL) - OUT- Area of element -C + C -- SCALARS: C NDIM - Number of spatial dimensions C NUMNP - Number of nodal points C NNODES - Number of nodes per element C NUMEL - Number of elements C NELBLK - Number of material/element blocks -C + C E2 E4 C +----------+ +-----------+ +---------+ | C | | F3 / / / \ C | | / A / / \ C +----------+ +-----------+ +---------------+ -C + C AR = E2/F3 SKEW = SIN(A) TAPER Y -C + C======================================================================= -C + REAL CRD(NUMNP, NDIM), ASPECT(*), SKEW(*), TAPER(*), AREA(*) INTEGER IX(NNODES, NUMEL), MAT(6, NELBLK), ISUMRY(2,4,NELBLK) REAL SUMRY(4,4,NELBLK) diff --git a/packages/seacas/applications/numbers/nu_con3d.f b/packages/seacas/applications/numbers/nu_con3d.f index 8d374b41a132..f0debf9636ac 100644 --- a/packages/seacas/applications/numbers/nu_con3d.f +++ b/packages/seacas/applications/numbers/nu_con3d.f @@ -1,48 +1,27 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: con3d.f,v 1.5 2004/06/29 18:05:32 gdsjaar Exp $ -C $Log: con3d.f,v $ -C Revision 1.5 2004/06/29 18:05:32 gdsjaar -C General cleanup. Remove unused labels and variables. -C -C Revision 1.4 2000/07/06 16:49:57 gdsjaar -C Changed real*4 to real -C -C Revision 1.3 1998/02/12 00:03:01 gdsjaar -C Added calculation of minimum jacobian to the condition command output. -C Routine borrowed from cubit (which borrowed it originally from numbers...) -C -C Revision 1.2 1996/06/25 21:48:57 gdsjaar -C Modified output to support large (millions of elements) models -C -c Revision 1.1.1.1 1991/02/21 15:42:42 gdsjaar -c NUMBERS: Greg Sjaardema, initial Unix release -c -c Revision 1.1 1991/02/21 15:42:41 gdsjaar -c Initial revision -c C======================================================================= SUBROUTINE CON3D (CRD, NDIM, NUMNP, IX, NNODES, NUMEL, MAT, * NELBLK, SELECT, ASPECT1, ASPECT2, ASPECT3, AREA, * SUMRY, ISUMRY, SKEWX, SKEWY, SKEWZ, TAPERX, TAPERY, TAPERZ, * JAC, DEBUG) C======================================================================= -C + C *** CON3D *** Calculate state of mesh -- Aspect ratio, Skewness, C and Taper (Three-dimensional mesh) -C + C (Greg Sjaardema, 16 April, 1989) -C + C Based on article by John Robinson, "CRE Method of element testing C and the Jacobian shape parameters," Eng. Comput., 1987, Vol. 4, C June, pp 113 - 118 -C + C NOTE: This is an experimental routine. -C + C -- ARRAYS: C CRD(NUMNP, NDIM) - IN - C IX(NNODES, NUMEL) - IN - @@ -52,24 +31,24 @@ SUBROUTINE CON3D (CRD, NDIM, NUMNP, IX, NNODES, NUMEL, MAT, C SKEW(NUMEL) - OUT- Skewness of mesh, degrees (0 <= skew <= ?) C TAPER(NUMEL) - OUT- Taper of mesh, combination of X and Y taper C AREA(NUMEL) - OUT- Area of element -C + C -- SCALARS: C NDIM - Number of spatial dimensions C NUMNP - Number of nodal points C NNODES - Number of nodes per element C NUMEL - Number of elements C NELBLK - Number of material/element blocks -C + C E2 E4 C +----------+ +-----------+ +---------+ | C | | F3 / / / \ C | | / A / / \ C +----------+ +-----------+ +---------------+ -C + C AR = E2/F3 SKEW = SIN(A) TAPER Y -C + C======================================================================= -C + C REAL CRD(NUMNP, NDIM), ASPECT(*), SKEW(*), TAPER(*), AREA(*) REAL CRD(NUMNP, NDIM) REAL ASPECT1(*), ASPECT2(*), ASPECT3(*), AREA(*) @@ -87,12 +66,12 @@ SUBROUTINE CON3D (CRD, NDIM, NUMNP, IX, NNODES, NUMEL, MAT, C LOGICAL SELECT(1) C REAL SKEWX(1), SKEWY(1) C REAL TAPERX(1), TAPERY(1), TAPERZ(1) -C + C DATA IX/1,2,3,4,5,6,7,8/ C DATA MAT /1,1,1,1,1/ C DATA SELECT /.TRUE./ C DATA NELBLK /1/ -C + include 'nu_io.blk' C IOMIN = 6 diff --git a/packages/seacas/applications/numbers/nu_cull2.f b/packages/seacas/applications/numbers/nu_cull2.f index bc62c1199ef1..6029bf0f2400 100644 --- a/packages/seacas/applications/numbers/nu_cull2.f +++ b/packages/seacas/applications/numbers/nu_cull2.f @@ -1,17 +1,12 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: cull2.f,v 1.1 1991/02/21 15:42:45 gdsjaar Exp $ -C $Log: cull2.f,v $ -C Revision 1.1 1991/02/21 15:42:45 gdsjaar -C Initial revision -C SUBROUTINE CULL2 (DIRCOS, MASSLV, NIQM) DIMENSION DIRCOS(4,*), MASSLV(2,*) -C + J = 0 DO 10 I=1, NIQM IF (MASSLV(2,I) .NE. 0) THEN @@ -24,7 +19,7 @@ SUBROUTINE CULL2 (DIRCOS, MASSLV, NIQM) DIRCOS(4, J) = DIRCOS(4, I) END IF 10 CONTINUE -C + NIQM = J RETURN END diff --git a/packages/seacas/applications/numbers/nu_cull3.f b/packages/seacas/applications/numbers/nu_cull3.f index 66fd2f04a1fa..721b8ac2dcb1 100644 --- a/packages/seacas/applications/numbers/nu_cull3.f +++ b/packages/seacas/applications/numbers/nu_cull3.f @@ -1,17 +1,12 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: cull3.f,v 1.1 1991/02/21 15:42:47 gdsjaar Exp $ -C $Log: cull3.f,v $ -C Revision 1.1 1991/02/21 15:42:47 gdsjaar -C Initial revision -C SUBROUTINE CULL3 (DIRCOS, MASSLV, NIQM) DIMENSION DIRCOS(5,*), MASSLV(2,*) -C + J = 0 DO 10 I=1, NIQM IF (MASSLV(2,I) .NE. 0) THEN @@ -25,7 +20,7 @@ SUBROUTINE CULL3 (DIRCOS, MASSLV, NIQM) DIRCOS(5, J) = DIRCOS(5, I) END IF 10 CONTINUE -C + NIQM = J RETURN END diff --git a/packages/seacas/applications/numbers/nu_cvty.blk b/packages/seacas/applications/numbers/nu_cvty.blk index 0c44662445a1..a8543ed4c0b8 100644 --- a/packages/seacas/applications/numbers/nu_cvty.blk +++ b/packages/seacas/applications/numbers/nu_cvty.blk @@ -1,16 +1,11 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: cvty.blk,v 1.1 1991/02/21 15:42:52 gdsjaar Exp $ -C $Log: cvty.blk,v $ -C Revision 1.1 1991/02/21 15:42:52 gdsjaar -C Initial revision -C COMMON /CVTY/ IBC1, IBC2, IBC3, IBC4, IBC5, IBC6, IBC7, IBC8 -C + C CAVITY POINTERS: C IBC1 = IDESS (NUMESS) ELEMENT SIDE SET IDS C IBC2 = NEESS (NUMESS) ELEMENT SIDE SET ELEMENT COUNTS @@ -20,4 +15,3 @@ C IBC5 = IPNESS (NUMESS) ELEMENT SIDE SET NODE POINTERS C IBC6 = LTEESS (LESSEL) ELEMENT SIDE SET ELEMENT LIST C IBC7 = LTNESS (LESSNL) ELEMENT SIDE SET NODE LIST C IBC8 = FACESS (LESSNL) ELEMENT SIDE SET DISTRIBUTION FACTORS -C diff --git a/packages/seacas/applications/numbers/nu_dbieb1.f b/packages/seacas/applications/numbers/nu_dbieb1.f index 2e99f4fdfe95..075eedc1db28 100644 --- a/packages/seacas/applications/numbers/nu_dbieb1.f +++ b/packages/seacas/applications/numbers/nu_dbieb1.f @@ -1,10 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: dbieb1.f,v 1.1 1999/02/16 21:37:59 gdsjaar Exp $ C======================================================================= SUBROUTINE DBIEBI (NDB, OPTION, IELB, NUMELB, NUMLNK, NUMATR, & LINK, ATRIB, NATRDM, NLNKDM, *) diff --git a/packages/seacas/applications/numbers/nu_dbielb.f b/packages/seacas/applications/numbers/nu_dbielb.f index 0c61bd67523a..3f266bdbd118 100644 --- a/packages/seacas/applications/numbers/nu_dbielb.f +++ b/packages/seacas/applications/numbers/nu_dbielb.f @@ -1,10 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: dbielb.f,v 1.2 2004/06/29 18:05:32 gdsjaar Exp $ C======================================================================= SUBROUTINE DBIELB (NDB, OPTION, NELBS, NELBE, IDELB, NUMELB, & NUMLNK, NUMATR, A, IA, KLINK, KATRIB, NAMELB, *) @@ -88,7 +87,6 @@ SUBROUTINE DBIELB (NDB, OPTION, NELBS, NELBE, IDELB, NUMELB, IF (NERR .GT. 0) GOTO 110 END IF - IELNK = IESAV IEATR = IASAV DO 100 NELB = NELBS, NELBE @@ -135,4 +133,3 @@ SUBROUTINE DBIELB (NDB, OPTION, NELBS, NELBE, IDELB, NUMELB, RETURN 1 END - diff --git a/packages/seacas/applications/numbers/nu_dbpini.f b/packages/seacas/applications/numbers/nu_dbpini.f index 2e285108c259..4197b7c6d459 100644 --- a/packages/seacas/applications/numbers/nu_dbpini.f +++ b/packages/seacas/applications/numbers/nu_dbpini.f @@ -1,10 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C$Id: dbpini.f,v 1.1 1999/02/16 21:37:59 gdsjaar Exp $ C======================================================================= SUBROUTINE DBPINI (OPTION, NDB, TITLE, NDIM, NUMNP, NUMEL, NELBLK, & NUMNPS, LNPSNL, LNPSDF, NUMESS, LESSEL, LESSNL, @@ -52,7 +51,6 @@ SUBROUTINE DBPINI (OPTION, NDB, TITLE, NDIM, NUMNP, NUMEL, NELBLK, LOGICAL ALL ALL = (OPTION .EQ. '*') - IF (ALL .OR. (INDEX (OPTION, 'I') .GT. 0)) THEN WRITE(*, 10000) ENDIF diff --git a/packages/seacas/applications/numbers/nu_dbpnam.f b/packages/seacas/applications/numbers/nu_dbpnam.f index 7761e9d189d0..eae1a6453e76 100644 --- a/packages/seacas/applications/numbers/nu_dbpnam.f +++ b/packages/seacas/applications/numbers/nu_dbpnam.f @@ -1,14 +1,13 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE DBPNAM (OPTION, NVARGL, NVARNP, NVAREL, & NAMEGV, NAMENV, NAMEEV) C======================================================================= -C$Id: dbpnam.f,v 1.1 1999/02/16 21:37:59 gdsjaar Exp $ C --*** DBPNAM *** (EXOLIB) Print database variable names C -- Written by Amy Gilkey - revised 01/21/88 diff --git a/packages/seacas/applications/numbers/nu_dbptim.f b/packages/seacas/applications/numbers/nu_dbptim.f index eec8041088f3..c274fb15474c 100644 --- a/packages/seacas/applications/numbers/nu_dbptim.f +++ b/packages/seacas/applications/numbers/nu_dbptim.f @@ -1,37 +1,12 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE DBPTIM (OPTION, NSTEPS, TIMES) C======================================================================= -C$Id: dbptim.f,v 1.2 2004/06/29 18:05:32 gdsjaar Exp $ -C$Log: dbptim.f,v $ -CRevision 1.2 2004/06/29 18:05:32 gdsjaar -CGeneral cleanup. Remove unused labels and variables. -C -CRevision 1.1 1999/02/16 21:37:59 gdsjaar -CConverted to read exodusII database format. Somewhat tested, not -Cready for production yet. -C -CRevision 1.2 1997/03/20 20:55:05 caforsy -CUpdated Imakefile for Imake 6.1. Added changed to amod in order to -Cport to tflop machine -C -CRevision 1.1 1995/10/03 21:43:39 mksmith -CAdding files new to algII for algebra2 -C -CRevision 1.1.1.1 1990/08/14 16:13:56 gdsjaar -CTesting -C -c Revision 1.1 90/08/14 16:13:55 gdsjaar -c Initial revision -c -c Revision 1.1 90/08/09 13:39:20 gdsjaar -c Initial revision -c C --*** DBPTIM *** (EXOLIB) Print database steps and min/max times C -- Written by Amy Gilkey - revised 12/18/87 diff --git a/packages/seacas/applications/numbers/nu_donrm2.f b/packages/seacas/applications/numbers/nu_donrm2.f index d1fb06fa03e6..3b020f1c66db 100644 --- a/packages/seacas/applications/numbers/nu_donrm2.f +++ b/packages/seacas/applications/numbers/nu_donrm2.f @@ -1,40 +1,35 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: donrm2.f,v 1.1 1991/02/21 15:42:55 gdsjaar Exp $ -C $Log: donrm2.f,v $ -C Revision 1.1 1991/02/21 15:42:55 gdsjaar -C Initial revision -C SUBROUTINE DONRM2 (COORD, LTNESS, MAP, DIRCOS, TEMP, * NSEG, NUMNIQ, NUMNP) DIMENSION COORD(NUMNP, *), LTNESS(2,*), MAP(*), DIRCOS(4,*), * TEMP(2,*) -C + DO 10 ISEG = 1, NSEG XI = COORD( LTNESS(1,ISEG),1 ) YI = COORD( LTNESS(1,ISEG),2 ) -C + XJ = COORD( LTNESS(2,ISEG),1 ) YJ = COORD( LTNESS(2,ISEG),2 ) -C + DX = XI - XJ DY = YI - YJ RMAG = SQRT ( DX**2 + DY**2) -C + TEMP(1,ISEG) = -DY / RMAG TEMP(2,ISEG) = DX / RMAG -C + 10 CONTINUE -C + DO 20 I=1,NUMNIQ DIRCOS(1,I) = 0.0 DIRCOS(2,I) = 0.0 20 CONTINUE -C + DO 40 ISEG = 1, NSEG DO 30 J = 1, 2 MISEG = MAP( 2 * (ISEG-1) + J ) @@ -42,9 +37,9 @@ SUBROUTINE DONRM2 (COORD, LTNESS, MAP, DIRCOS, TEMP, DIRCOS(2,MISEG) = DIRCOS(2,MISEG) + TEMP(2,ISEG) 30 CONTINUE 40 CONTINUE -C + C ... NORMALIZE ALL DIRECTION COSINES -C + DO 50 I = 1, NUMNIQ A = DIRCOS(1,I) B = DIRCOS(2,I) diff --git a/packages/seacas/applications/numbers/nu_donrm3.f b/packages/seacas/applications/numbers/nu_donrm3.f index 7e7d5ed5157a..37ace27f862a 100644 --- a/packages/seacas/applications/numbers/nu_donrm3.f +++ b/packages/seacas/applications/numbers/nu_donrm3.f @@ -1,53 +1,48 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: donrm3.f,v 1.1 1991/02/21 15:42:57 gdsjaar Exp $ -C $Log: donrm3.f,v $ -C Revision 1.1 1991/02/21 15:42:57 gdsjaar -C Initial revision -C SUBROUTINE DONRM3 (COORD, LTNESS, MAP, DIRCOS, TEMP, * NSEG, NUMNIQ, NUMNP) DIMENSION COORD(NUMNP, *), LTNESS(4,*), MAP(*), DIRCOS(5,*), * TEMP(3,*) -C + DO 10 ISEG = 1, NSEG XI = COORD(LTNESS(1,ISEG),1 ) YI = COORD(LTNESS(1,ISEG),2 ) ZI = COORD(LTNESS(1,ISEG),3 ) -C + XJ = COORD(LTNESS(2,ISEG),1 ) YJ = COORD(LTNESS(2,ISEG),2 ) ZJ = COORD(LTNESS(2,ISEG),3 ) -C + XK = COORD(LTNESS(3,ISEG),1 ) YK = COORD(LTNESS(3,ISEG),2 ) ZK = COORD(LTNESS(3,ISEG),3 ) -C + XL = COORD(LTNESS(4,ISEG),1 ) YL = COORD(LTNESS(4,ISEG),2 ) ZL = COORD(LTNESS(4,ISEG),3 ) -C + AI = (YK - YI) * (ZL - ZJ) - (ZK - ZI) * (YL - YJ) BJ = (ZK - ZI) * (XL - XJ) - (XK - XI) * (ZL - ZJ) CK = (XK - XI) * (YL - YJ) - (YK - YI) * (XL - XJ) RMAG = SQRT ( AI**2 + BJ**2 + CK**2) -C + TEMP(1,ISEG) = AI / RMAG TEMP(2,ISEG) = BJ / RMAG TEMP(3,ISEG) = CK / RMAG -C + 10 CONTINUE -C + DO 20 I=1,NUMNIQ DIRCOS(1,I) = 0.0 DIRCOS(2,I) = 0.0 DIRCOS(3,I) = 0.0 20 CONTINUE -C + DO 40 ISEG = 1, NSEG DO 30 J = 1, 4 MISEG = MAP( 4 * (ISEG-1) + J ) @@ -56,9 +51,9 @@ SUBROUTINE DONRM3 (COORD, LTNESS, MAP, DIRCOS, TEMP, DIRCOS(3,MISEG) = DIRCOS(3,MISEG) + TEMP(3,ISEG) 30 CONTINUE 40 CONTINUE -C + C ... NORMALIZE ALL DIRECTION COSINES -C + DO 50 I = 1, NUMNIQ A = DIRCOS(1,I) B = DIRCOS(2,I) diff --git a/packages/seacas/applications/numbers/nu_dvol2d.f b/packages/seacas/applications/numbers/nu_dvol2d.f index bc4c9386cd6b..5e550cbc1da5 100644 --- a/packages/seacas/applications/numbers/nu_dvol2d.f +++ b/packages/seacas/applications/numbers/nu_dvol2d.f @@ -1,23 +1,18 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: dvol2d.f,v 1.1 1991/02/21 15:42:59 gdsjaar Exp $ -C $Log: dvol2d.f,v $ -C Revision 1.1 1991/02/21 15:42:59 gdsjaar -C Initial revision -C SUBROUTINE DVOL2D( COORD, DISP, LSTSN, NSEG, DELVOL, * NDIM, AXI, NUMNP) -C + C*********************************************************************** -C + C DESCRIPTION: C This routine computes the change in volume of a cavity formed C by the boundary of an element side set flag -C + C FORMAL PARAMETERS: C COORD REAL Nodal Coordinates C DISP REAL Nodal Displacements @@ -27,44 +22,44 @@ SUBROUTINE DVOL2D( COORD, DISP, LSTSN, NSEG, DELVOL, C DELVOL REAL Change in volume of this cavity C NUMNP INTEGER Number of Nodes C AXI LOGICAL TRUE if axisymmetric mesh -C + C CALLED BY: -C + C*********************************************************************** -C + DIMENSION COORD(NUMNP, *), DISP(NUMNP, *), LSTSN(*) LOGICAL AXI PI = ATAN2(0.0, -1.0) -C + DELVOL = 0.0 -C + DO 100 KSEG = 1 , NSEG J = LSTSN(2*KSEG) I = LSTSN(2*KSEG - 1) -C + X1 = COORD(I,1) X2 = COORD(J,1) DX1 = DISP(I,1) DX2 = DISP(J,1) -C + Y1 = COORD(I,2) Y2 = COORD(J,2) DY1 = DISP(I,2) DY2 = DISP(J,2) -C + X12 = X1 - X2 Y12 = Y1 - Y2 -C + VOL = (X12 * (DY2 + DY1) - Y12 * (DX2 + DX1) + DX1 * DY2 - * DX2 * DY1 ) / 2.0 -C + IF (AXI) THEN XC = (DX2 + DX1) / 4.0 + (X2 + X1) / 2.0 VOL = 2.0 * PI * XC * VOL END IF -C + DELVOL = DELVOL + VOL 100 CONTINUE -C + RETURN END diff --git a/packages/seacas/applications/numbers/nu_dvol3d.f b/packages/seacas/applications/numbers/nu_dvol3d.f index 31d681f2bdc5..eb9f48b762c0 100644 --- a/packages/seacas/applications/numbers/nu_dvol3d.f +++ b/packages/seacas/applications/numbers/nu_dvol3d.f @@ -1,22 +1,17 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: dvol3d.f,v 1.1 1991/02/21 15:43:01 gdsjaar Exp $ -C $Log: dvol3d.f,v $ -C Revision 1.1 1991/02/21 15:43:01 gdsjaar -C Initial revision -C SUBROUTINE DVOL3D( COORD, DISP, LSTSN, NSEG, DELVOL, NDIM, NUMNP) -C + C*********************************************************************** -C + C DESCRIPTION: C This routine computes the change in volume of a cavity formed C by the boundary of an element side set flag -C + C FORMAL PARAMETERS: C COORD REAL Nodal Coordinates C DISP REAL Nodal Displacements @@ -25,41 +20,41 @@ SUBROUTINE DVOL3D( COORD, DISP, LSTSN, NSEG, DELVOL, NDIM, NUMNP) C NSEG INTEGER Number of segments in this boundary C DELVOL REAL Change in volume of this cavity C NDIM INTEGER Number of Nodes -C + C CALLED BY: -C + C*********************************************************************** -C + DIMENSION COORD(NUMNP, *), DISP(NUMNP, *), LSTSN(*) -C + DELVOL = 0.0 -C + DO 100 KSEG = 1 , NSEG L = LSTSN(4*KSEG) K = LSTSN(4*KSEG - 1) J = LSTSN(4*KSEG - 2) I = LSTSN(4*KSEG - 3) -C + Y1 = COORD(I,2) Y2 = COORD(J,2) Y3 = COORD(K,2) Y4 = COORD(L,2) -C + Y5 = COORD(I,2) + DISP(I,2) Y6 = COORD(J,2) + DISP(J,2) Y7 = COORD(K,2) + DISP(K,2) Y8 = COORD(L,2) + DISP(L,2) -C + Z1 = COORD(I,3) Z2 = COORD(J,3) Z3 = COORD(K,3) Z4 = COORD(L,3) -C + Z5 = COORD(I,3) + DISP(I,3) Z6 = COORD(J,3) + DISP(J,3) Z7 = COORD(K,3) + DISP(K,3) Z8 = COORD(L,3) + DISP(L,3) -C + Z24 = Z2 - Z4 Z52 = Z5 - Z2 Z45 = Z4 - Z5 @@ -100,9 +95,9 @@ SUBROUTINE DVOL3D( COORD, DISP, LSTSN, NSEG, DELVOL, NDIM, NUMNP) Z54 = Z5 - Z4 B81 = ( Y7*(Z3-Z6-Z54) + Y6*Z75 + Y5*(Z6-Z1-Z47) * + Y4*(Z1-Z3-Z75) + Y3*Z47 + Y1*Z54 ) / 12. -C + C Calculate volume of displaced element face -C + VOL= COORD(I,1) * B11 * + COORD(J,1) * B21 * + COORD(K,1) * B31 @@ -113,6 +108,6 @@ SUBROUTINE DVOL3D( COORD, DISP, LSTSN, NSEG, DELVOL, NDIM, NUMNP) * + (COORD(L,1) + DISP(L,1)) * B81 DELVOL = DELVOL + VOL 100 CONTINUE -C + RETURN END diff --git a/packages/seacas/applications/numbers/nu_elcent.f b/packages/seacas/applications/numbers/nu_elcent.f index 3acbd94bbb2f..b05b3d28d94c 100644 --- a/packages/seacas/applications/numbers/nu_elcent.f +++ b/packages/seacas/applications/numbers/nu_elcent.f @@ -1,17 +1,12 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: elcent.f,v 1.1 1991/02/21 15:43:04 gdsjaar Exp $ -C $Log: elcent.f,v $ -C Revision 1.1 1991/02/21 15:43:04 gdsjaar -C Initial revision -C SUBROUTINE ELCENT (ELCEN, IX, COORD, NDIM, NUMEL, NELNOD, NUMNP) DIMENSION ELCEN(NUMEL, *), IX(NELNOD, *), COORD(NUMNP, *) -C + IF (NDIM .EQ. 2) THEN DO 10 I=1, NUMEL ELCEN(I,1) = (COORD(IX(1,I),1) + COORD(IX(2,I),1) + @@ -25,12 +20,12 @@ SUBROUTINE ELCENT (ELCEN, IX, COORD, NDIM, NUMEL, NELNOD, NUMNP) * COORD(IX(3,I),1) + COORD(IX(4,I),1) + * COORD(IX(5,I),1) + COORD(IX(6,I),1) + * COORD(IX(7,I),1) + COORD(IX(8,I),1))/8.0 -C + ELCEN(I,2) = (COORD(IX(1,I),2) + COORD(IX(2,I),2) + * COORD(IX(3,I),2) + COORD(IX(4,I),2) + * COORD(IX(5,I),2) + COORD(IX(6,I),2) + * COORD(IX(7,I),2) + COORD(IX(8,I),2))/8.0 -C + ELCEN(I,3) = (COORD(IX(1,I),3) + COORD(IX(2,I),3) + * COORD(IX(3,I),3) + COORD(IX(4,I),3) + * COORD(IX(5,I),3) + COORD(IX(6,I),3) + diff --git a/packages/seacas/applications/numbers/nu_elvol.f b/packages/seacas/applications/numbers/nu_elvol.f index 3a581a01804c..aa30adc2b95a 100644 --- a/packages/seacas/applications/numbers/nu_elvol.f +++ b/packages/seacas/applications/numbers/nu_elvol.f @@ -1,20 +1,14 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C -C See packages/seacas/LICENSE for details - -C $Id: elvol.f,v 1.1 1991/11/06 20:02:49 gdsjaar Exp $ -C $Log: elvol.f,v $ -C Revision 1.1 1991/11/06 20:02:49 gdsjaar -C Initial revision C +C See packages/seacas/LICENSE for details SUBROUTINE ELVOL (NDIM, CRD, DISP, IX, NUMNP, NUMEL, NNODE, & VOLUME) -C + C ... ESTIMATE TIMESTEP FOR MESH --- BRICKS ONLY -C + DIMENSION CRD(NUMNP, *), DISP(numnp, *), IX(NNODE,*) DIMENSION GRADOP(8,8) REAL volume(*) diff --git a/packages/seacas/applications/numbers/nu_estime.f b/packages/seacas/applications/numbers/nu_estime.f index a359dd786a46..f02c2021c05f 100644 --- a/packages/seacas/applications/numbers/nu_estime.f +++ b/packages/seacas/applications/numbers/nu_estime.f @@ -1,37 +1,14 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: estime.f,v 1.5 2001/02/20 23:27:03 gdsjaar Exp $ -C $Log: estime.f,v $ -C Revision 1.5 2001/02/20 23:27:03 gdsjaar -C Special modification for Frank Dempsey. -C The command 'list nodalvol' calculates an approximate nodal volume at -C each node. A nodes nodal volume is 1/8th of the volume of each -C element connected to it. -C -C Revision 1.4 1991/12/02 17:37:16 gdsjaar -C Updated title format -C -c Revision 1.3 1991/09/24 17:42:52 gdsjaar -c Added actual pronto3d time step estimation -c -c Revision 1.2 1991/02/21 16:37:57 gdsjaar -c Moved ENGNOT function out of write statements -c -c Revision 1.1.1.1 1991/02/21 15:43:09 gdsjaar -c NUMBERS: Greg Sjaardema, initial Unix release -c -c Revision 1.1 1991/02/21 15:43:08 gdsjaar -c Initial revision -c SUBROUTINE ESTIME (CRD, WAVE, IX, MAT, LABEL, NDIM, NNODE, * NELBLK, SSQ, CCC, CDAMP, NUMNP) -C + C ... ESTIMATE TIMESTEP FOR MESH --- BRICKS ONLY -C + DIMENSION CRD(NUMNP, *), IX(NNODE,*), MAT(6,*), * WAVE(*), SSQ(3,NELBLK), CCC(NDIM,NNODE) DIMENSION GRADOP(8,3) @@ -41,7 +18,7 @@ SUBROUTINE ESTIME (CRD, WAVE, IX, MAT, LABEL, NDIM, NNODE, CHARACTER*16 ENGNOT, ENG1 include 'nu_io.blk' -C + IF (NDIM .EQ. 3) THEN DO 30 IBLK = 1, NELBLK IF (MAT(5,IBLK) .NE. 1) GOTO 30 @@ -239,20 +216,20 @@ SUBROUTINE ESTIME (CRD, WAVE, IX, MAT, LABEL, NDIM, NNODE, IELEND = MAT(4,IBLK) MIEL = IBLK DO 50 IEL = IELBEG, IELEND -C + DO 40 I=1,4 CCC(1,I) = CRD(IX(I,IEL),1) CCC(2,I) = CRD(IX(I,IEL),2) 40 CONTINUE -C + C ... CALCULATE SUM OF SQUARES OF INVERSE LENGTHS, ASSUME RECTANGULAR C USE SIDES 1-2 1-4 -C + S12 = (CCC(1,1)-CCC(1,2))**2 + * (CCC(2,1)-CCC(2,2))**2 S14 = (CCC(1,1)-CCC(1,4))**2 + * (CCC(2,1)-CCC(2,4))**2 -C + IF (S12 .EQ. 0.0 .OR. S14 .EQ. 0.0) * THEN PRINT *,'*** WARNING *** Coincident nodes in element', @@ -264,7 +241,7 @@ SUBROUTINE ESTIME (CRD, WAVE, IX, MAT, LABEL, NDIM, NNODE, SSQ(2,MIEL) = IEL END IF END IF -C + 50 CONTINUE 60 CONTINUE END IF diff --git a/packages/seacas/applications/numbers/nu_fnddis.f b/packages/seacas/applications/numbers/nu_fnddis.f index 919512caaca3..73b52ebce96c 100644 --- a/packages/seacas/applications/numbers/nu_fnddis.f +++ b/packages/seacas/applications/numbers/nu_fnddis.f @@ -1,10 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: fnddis.f,v 1.2 1999/02/16 21:38:00 gdsjaar Exp $ C======================================================================= SUBROUTINE FNDDIS (NAMECO, NAMENV, & DEFOK, NDIM, NVARNP, IXDEF, IYDEF, IZDEF) diff --git a/packages/seacas/applications/numbers/nu_gapini.f b/packages/seacas/applications/numbers/nu_gapini.f index 5e936183d951..6ded2df29859 100644 --- a/packages/seacas/applications/numbers/nu_gapini.f +++ b/packages/seacas/applications/numbers/nu_gapini.f @@ -1,28 +1,13 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: gapini.f,v 1.3 1999/02/16 21:38:00 gdsjaar Exp $ -C $Log: gapini.f,v $ -C Revision 1.3 1999/02/16 21:38:00 gdsjaar -C Converted to read exodusII database format. Somewhat tested, not -C ready for production yet. -C -C Revision 1.2 1997/06/20 19:11:26 caforsy -C Port to ibm -C -C Revision 1.1.1.1 1991/02/21 15:43:14 gdsjaar -C NUMBERS: Greg Sjaardema, initial Unix release -C -c Revision 1.1 1991/02/21 15:43:13 gdsjaar -c Initial revision -c SUBROUTINE GAPINI (A, COORD, IDESS, NEESS, NNESS, IPEESS, IPNESS, * LTEESS, LTNESS, FACESS, DISP, NUMNP, NDIM, NUMESS, * TIME, ITMSEL, TITLE, IMAS, ISLV, DMAX, GMTHD) -C + DIMENSION A(*), COORD(NUMNP,*), IDESS(*), NEESS(*), * NNESS(*), IPEESS(*), IPNESS(*), LTEESS(*), LTNESS(*), * FACESS(*), TIME(*), DISP(NUMNP,*) @@ -33,7 +18,7 @@ SUBROUTINE GAPINI (A, COORD, IDESS, NEESS, NNESS, IPEESS, IPNESS, IFLGM = LOCINT (IMAS, NUMESS, IDESS) IFLGS = LOCINT (ISLV, NUMESS, IDESS) -C + ERROR = .FALSE. IF (IFLGM .EQ. 0) THEN WRITE (STRA, 10) 'Master', IMAS @@ -49,13 +34,13 @@ SUBROUTINE GAPINI (A, COORD, IDESS, NEESS, NNESS, IPEESS, IPNESS, ERROR = .TRUE. END IF IF (ERROR) RETURN -C + NSEGM = NEESS(IFLGM) IPTRM = IPNESS(IFLGM) -C + NSEGS = NEESS(IFLGS) IPTRS = IPNESS(IFLGS) -C + MULT = 2 * NDIM - 2 CALL MDRSRV ('MAPMAS', IMPMS, MULT*NSEGM) CALL MDRSRV ('MAPSLV', IMPSL, MULT*NSEGS) @@ -65,7 +50,7 @@ SUBROUTINE GAPINI (A, COORD, IDESS, NEESS, NNESS, IPEESS, IPNESS, CALL MEMERR STOP END IF -C + CALL UNIQUE (LTNESS(IPTRM), MULT*NSEGM, A(IMPMS), A(ITMP), * NIQM, NUMNP) CALL MDRSRV ('MASSLV', IMSLV, 2*NIQM) @@ -76,7 +61,7 @@ SUBROUTINE GAPINI (A, COORD, IDESS, NEESS, NNESS, IPEESS, IPNESS, STOP END IF CALL TRANIQ (LTNESS(IPTRM), A(IMPMS), A(IMSLV), MULT*NSEGM, 2) -C + CALL UNIQUE (LTNESS(IPTRS), MULT*NSEGS, A(IMPSL), A(ITMP), * NIQS, NUMNP) CALL MDRSRV ('NIQSLV', INQS, NIQS) @@ -86,7 +71,7 @@ SUBROUTINE GAPINI (A, COORD, IDESS, NEESS, NNESS, IPEESS, IPNESS, STOP END IF CALL TRANIQ (LTNESS(IPTRS), A(IMPSL), A(INQS), MULT*NSEGS, 1) -C + DMAX = DMAX**2 IF (DMAX .EQ. 0.0) DMAX = 1.0E38 diff --git a/packages/seacas/applications/numbers/nu_gapout.f b/packages/seacas/applications/numbers/nu_gapout.f index a3b65d345e32..d5280116f85c 100644 --- a/packages/seacas/applications/numbers/nu_gapout.f +++ b/packages/seacas/applications/numbers/nu_gapout.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: gapout.f,v 1.1 1991/02/21 15:43:16 gdsjaar Exp $ -C $Log: gapout.f,v $ -C Revision 1.1 1991/02/21 15:43:16 gdsjaar -C Initial revision -C SUBROUTINE GAPOUT (DIRCOS, MASSLV, NUMNIQ, NDIM, IFLGM, IFLGS, * GMTHD) include 'nu_io.blk' @@ -18,20 +13,20 @@ SUBROUTINE GAPOUT (DIRCOS, MASSLV, NUMNIQ, NDIM, IFLGM, IFLGS, DATA COSLAB /'Cosine X','Cosine Y','Cosine Z'/ DATA DISLAB /' Normal ','Tangent '/ LENPAG = 50 -C + DO 30 IO=IOMIN,IOMAX DO 20 IPAG = 1, NUMNIQ, LENPAG IF (ISABRT()) RETURN WRITE (IO, 40) IFLGM, IFLGS, GMTHD, (COSLAB(I),I=1,NDIM), * DISLAB(1), DISLAB(2) -C + DO 10 I=IPAG, MIN(IPAG+LENPAG-1,NUMNIQ) WRITE (IO, 50) I, (MASSLV(J,I),J=1,2), * (DIRCOS(J,I),J=1,NDIM+2) 10 CONTINUE 20 CONTINUE 30 CONTINUE -C + 40 FORMAT ('1', * ' Master Flag = ',I6,', Slave Flag = ',I6,', Method: ',A8,//, * ' # Master Slave ',5(A8,3X)) diff --git a/packages/seacas/applications/numbers/nu_getcav.f b/packages/seacas/applications/numbers/nu_getcav.f index 8e227eb291fd..ab9158e55c26 100644 --- a/packages/seacas/applications/numbers/nu_getcav.f +++ b/packages/seacas/applications/numbers/nu_getcav.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: getcav.f,v 1.1 1991/02/21 15:43:18 gdsjaar Exp $ -C $Log: getcav.f,v $ -C Revision 1.1 1991/02/21 15:43:18 gdsjaar -C Initial revision -C SUBROUTINE GETCAV (ERROR, IDESS, NUMESS) DIMENSION IDESS(*) include 'nu_cav.blk' @@ -24,7 +19,7 @@ SUBROUTINE GETCAV (ERROR, IDESS, NUMESS) CALL FREFLD (0, 0, PRMPT(:LENSTR(PRMPT)+1), MAXF, IOS, * NUMCAV, KV, CV, ICAV, RV) END IF -C + ERROR = .FALSE. DO 10 NCAV = 1, NUMCAV IFND(NCAV) = LOCINT (ICAV(NCAV), NUMESS, IDESS) @@ -36,6 +31,6 @@ SUBROUTINE GETCAV (ERROR, IDESS, NUMESS) END IF 10 CONTINUE 20 FORMAT (' Cavity Flag ',I5,' not found. ') -C + RETURN END diff --git a/packages/seacas/applications/numbers/nu_getden.f b/packages/seacas/applications/numbers/nu_getden.f index d9b853f21641..8f49b586f6fe 100644 --- a/packages/seacas/applications/numbers/nu_getden.f +++ b/packages/seacas/applications/numbers/nu_getden.f @@ -1,20 +1,15 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: getden.f,v 1.1 1991/02/21 15:43:20 gdsjaar Exp $ -C $Log: getden.f,v $ -C Revision 1.1 1991/02/21 15:43:20 gdsjaar -C Initial revision -C SUBROUTINE GETDEN (MAT, DEN, NELBLK, LABEL) DIMENSION MAT(6,*), DEN(*) DIMENSION IDUM(4), RV(4), KV(4) CHARACTER*16 LABEL(*), CV(4) CHARACTER*32 PRMPT -C + WRITE (*, 20) 20 FORMAT (/,' Input DENSITY, and NAME: ') DO 40 IBLK=1,NELBLK diff --git a/packages/seacas/applications/numbers/nu_getdsp.f b/packages/seacas/applications/numbers/nu_getdsp.f index 08799e51f455..670c484f8490 100644 --- a/packages/seacas/applications/numbers/nu_getdsp.f +++ b/packages/seacas/applications/numbers/nu_getdsp.f @@ -1,13 +1,12 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: getdsp.f,v 1.4 2004/06/29 18:05:32 gdsjaar Exp $ SUBROUTINE GETDSP (CRD, CRDSP, NDIM, NUMNP, TIMES, ITMSEL, * ACTION, ISTAT) -C + C ISTAT - 0 IF OK C - -1 IF END OF FILE C ACTION - 'R' - REWIND AND POSITION AT BEGINNING OF TIME RECORD @@ -17,17 +16,17 @@ SUBROUTINE GETDSP (CRD, CRDSP, NDIM, NUMNP, TIMES, ITMSEL, C REPOS - REPOSITION AT BEGINNING OF TIME RECORDS C ADDDSP - ADD DISPLACEMENTS TO COORDINATES C SKIP - SKIP A TIMESTEP -C + REAL CRD(NUMNP,*), CRDSP(NUMNP,*), TIMES(*) LOGICAL ITMSEL(*) CHARACTER*(*) ACTION -C + include 'exodusII.inc' include 'nu_ptim.blk' include 'nu_logs.blk' include 'nu_io.blk' include 'nu_ndisp.blk' -C + IF (NDISP(1) .LE. 0) THEN CALL DBVIX ('N', 1, NDISP(1)) CALL DBVIX ('N', 2, NDISP(2)) @@ -36,7 +35,7 @@ SUBROUTINE GETDSP (CRD, CRDSP, NDIM, NUMNP, TIMES, ITMSEL, ISTAT = 0 IF (.NOT. EXODUS) RETURN -C + IF (ACTION(:1) .EQ. 'R') THEN NLAST = 0 RETURN @@ -64,7 +63,7 @@ SUBROUTINE GETDSP (CRD, CRDSP, NDIM, NUMNP, TIMES, ITMSEL, END IF GO TO 10 END IF -C + CALL PRTERR ('PROGRAM', * 'Internal code error, contact sponsor') STOP 'GETDSP' diff --git a/packages/seacas/applications/numbers/nu_getwav.f b/packages/seacas/applications/numbers/nu_getwav.f index e6cba70d400f..244370e3c40c 100644 --- a/packages/seacas/applications/numbers/nu_getwav.f +++ b/packages/seacas/applications/numbers/nu_getwav.f @@ -1,20 +1,15 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: getwav.f,v 1.1 1991/02/21 15:43:25 gdsjaar Exp $ -C $Log: getwav.f,v $ -C Revision 1.1 1991/02/21 15:43:25 gdsjaar -C Initial revision -C SUBROUTINE GETWAV (MAT, WAVE, NELBLK, LABEL) DIMENSION MAT(6,*), WAVE(*) DIMENSION IDUM(4), RV(4), KV(4) CHARACTER*16 LABEL(*), CV(4) CHARACTER*32 PRMPT -C + WRITE (*, 20) 20 FORMAT (/,' Input WAVESPEED, and NAME: ') DO 40 IBLK=1,NELBLK diff --git a/packages/seacas/applications/numbers/nu_gmdis2.f b/packages/seacas/applications/numbers/nu_gmdis2.f index 619ffb5ba308..b5c3d4b18731 100644 --- a/packages/seacas/applications/numbers/nu_gmdis2.f +++ b/packages/seacas/applications/numbers/nu_gmdis2.f @@ -1,32 +1,27 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: gmdis2.f,v 1.1 1991/02/21 15:43:27 gdsjaar Exp $ -C $Log: gmdis2.f,v $ -C Revision 1.1 1991/02/21 15:43:27 gdsjaar -C Initial revision -C SUBROUTINE GMDIS2 (COORD, DIRCOS, MASSLV, NIQSLV, TDIS, * NIQM, NIQS, DMAX, NUMNP) DIMENSION COORD (NUMNP,*), DIRCOS(4,*), MASSLV(2,*), NIQSLV(*), * TDIS(3,*) -C + C... PICK MATCH BASED ON CLOSEST DISTANCE -C + DO 30 IMAS = 1, NIQM X1 = COORD (MASSLV(1, IMAS),1) Y1 = COORD (MASSLV(1, IMAS),2) -C + DO 10 ISLV = 1, NIQS X0 = COORD (NIQSLV(ISLV),1) Y0 = COORD (NIQSLV(ISLV),2) -C + TDIS(3,ISLV) = (X0 - X1)**2 + (Y0 - Y1)**2 10 CONTINUE -C + TMIN = DMAX NMIN = 0 DO 20 ISLV = 1, NIQS @@ -35,7 +30,7 @@ SUBROUTINE GMDIS2 (COORD, DIRCOS, MASSLV, NIQSLV, TDIS, NMIN = ISLV END IF 20 CONTINUE -C + IF (NMIN .NE. 0) THEN MASSLV(2,IMAS) = NIQSLV(NMIN) DIRCOS(4,IMAS) = TDIS(3,NMIN) @@ -44,25 +39,25 @@ SUBROUTINE GMDIS2 (COORD, DIRCOS, MASSLV, NIQSLV, TDIS, END IF 30 CONTINUE CALL CULL2 (DIRCOS, MASSLV, NIQM) -C + C ... INITIALIZE TANGENT AND NORMAL DISTANCES -C + DO 40 ISEG = 1, NIQM X1 = COORD (MASSLV(1, ISEG),1) Y1 = COORD (MASSLV(1, ISEG),2) -C + X0 = COORD (MASSLV(2, ISEG),1) Y0 = COORD (MASSLV(2, ISEG),2) -C + C DIRCOS is average unit direction vector from surfaces at node -C + DCS1 = DIRCOS (1, ISEG) DCS2 = DIRCOS (2, ISEG) -C + T = -( DCS1 * (X1-X0) + DCS2 * (Y1-Y0) ) DIRCOS(3,ISEG) = T DIRCOS(4,ISEG) = SQRT( ABS(DIRCOS(4,ISEG) - T**2) ) 40 CONTINUE -C + RETURN END diff --git a/packages/seacas/applications/numbers/nu_gmdis3.f b/packages/seacas/applications/numbers/nu_gmdis3.f index 21abadd0aa75..637719899a4a 100644 --- a/packages/seacas/applications/numbers/nu_gmdis3.f +++ b/packages/seacas/applications/numbers/nu_gmdis3.f @@ -1,34 +1,29 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: gmdis3.f,v 1.1 1991/02/21 15:43:29 gdsjaar Exp $ -C $Log: gmdis3.f,v $ -C Revision 1.1 1991/02/21 15:43:29 gdsjaar -C Initial revision -C SUBROUTINE GMDIS3 (COORD, DIRCOS, MASSLV, NIQSLV, TDIS, * ITMP, NIQM, NIQS, DMAX, NUMNP) DIMENSION COORD (NUMNP,*), DIRCOS(5,*), MASSLV(2,*), NIQSLV(*), * TDIS(3,*), ITMP(*) -C + C... PICK MATCH BASED ON CLOSEST DISTANCE -C + DO 30 IMAS = 1, NIQM X1 = COORD (MASSLV(1, IMAS),1) Y1 = COORD (MASSLV(1, IMAS),2) Z1 = COORD (MASSLV(1, IMAS),3) -C + DO 10 ISLV = 1, NIQS X0 = COORD (NIQSLV(ISLV),1) Y0 = COORD (NIQSLV(ISLV),2) Z0 = COORD (NIQSLV(ISLV),3) -C + TDIS(3,ISLV) = (X0 - X1)**2 + (Y0 - Y1)**2 + (Z0 - Z1)**2 10 CONTINUE -C + TMIN = DMAX NMIN = 0 DO 20 ISLV = 1, NIQS @@ -37,7 +32,7 @@ SUBROUTINE GMDIS3 (COORD, DIRCOS, MASSLV, NIQSLV, TDIS, NMIN = ISLV END IF 20 CONTINUE -C + IF (NMIN .NE. 0) THEN MASSLV(2,IMAS) = NIQSLV(NMIN) DIRCOS(5,IMAS) = TDIS(3,NMIN) @@ -46,28 +41,28 @@ SUBROUTINE GMDIS3 (COORD, DIRCOS, MASSLV, NIQSLV, TDIS, END IF 30 CONTINUE CALL CULL3 (DIRCOS, MASSLV, NIQM) -C + C ... INITIALIZE TANGENT AND NORMAL DISTANCES -C + DO 40 ISEG = 1, NIQM X1 = COORD (MASSLV(1, ISEG),1) Y1 = COORD (MASSLV(1, ISEG),2) Z1 = COORD (MASSLV(1, ISEG),3) -C + X0 = COORD (MASSLV(2, ISEG),1) Y0 = COORD (MASSLV(2, ISEG),2) Z0 = COORD (MASSLV(2, ISEG),3) -C + C DIRCOS is average unit direction vector from surfaces at node -C + DCS1 = DIRCOS (1, ISEG) DCS2 = DIRCOS (2, ISEG) DCS3 = DIRCOS (3, ISEG) -C + T = -( DCS1 * (X1-X0) + DCS2 * (Y1-Y0) + DCS3 * (Z1-Z0) ) DIRCOS(4,ISEG) = T DIRCOS(5,ISEG) = SQRT( ABS(DIRCOS(5,ISEG) - T**2) ) 40 CONTINUE -C + RETURN END diff --git a/packages/seacas/applications/numbers/nu_gmtch2.f b/packages/seacas/applications/numbers/nu_gmtch2.f index 14f0f1401c04..87d1a7ba66f9 100644 --- a/packages/seacas/applications/numbers/nu_gmtch2.f +++ b/packages/seacas/applications/numbers/nu_gmtch2.f @@ -1,37 +1,32 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: gmtch2.f,v 1.1 1991/02/21 15:43:31 gdsjaar Exp $ -C $Log: gmtch2.f,v $ -C Revision 1.1 1991/02/21 15:43:31 gdsjaar -C Initial revision -C SUBROUTINE GMTCH2 (COORD, DIRCOS, MASSLV, NIQSLV, TDIS, * NIQM, NIQS, DMAX, NUMNP) DIMENSION COORD (NUMNP,*), DIRCOS(4,*), MASSLV(2,*), NIQSLV(*), * TDIS(3,*) -C + DO 30 IMAS = 1, NIQM X1 = COORD (MASSLV(1, IMAS),1) Y1 = COORD (MASSLV(1, IMAS),2) -C + DCS1 = DIRCOS (1, IMAS) DCS2 = DIRCOS (2, IMAS) -C + DO 10 ISLV = 1, NIQS X0 = COORD (NIQSLV(ISLV),1) Y0 = COORD (NIQSLV(ISLV),2) -C + T = -( DCS1 * (X1-X0) + DCS2 * (Y1-Y0) ) TDIS(1,ISLV) = T TDIS(2,ISLV) = (X1 + DCS1 * T - X0)**2 + * (Y1 + DCS2 * T - Y0)**2 TDIS(3,ISLV) = T**2 + TDIS(2,ISLV) 10 CONTINUE -C + TMIN = 1.0E38 NMIN = 0 DO 20 ISLV = 1, NIQS @@ -41,7 +36,7 @@ SUBROUTINE GMTCH2 (COORD, DIRCOS, MASSLV, NIQSLV, TDIS, NMIN = ISLV END IF 20 CONTINUE -C + IF (NMIN .NE. 0) THEN DIRCOS(3,IMAS) = TDIS(1,NMIN) DIRCOS(4,IMAS) = SQRT(TDIS(2,NMIN)) diff --git a/packages/seacas/applications/numbers/nu_gmtch3.f b/packages/seacas/applications/numbers/nu_gmtch3.f index 5f8416098e31..13a8bf450e15 100644 --- a/packages/seacas/applications/numbers/nu_gmtch3.f +++ b/packages/seacas/applications/numbers/nu_gmtch3.f @@ -1,41 +1,36 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: gmtch3.f,v 1.1 1991/02/21 15:43:34 gdsjaar Exp $ -C $Log: gmtch3.f,v $ -C Revision 1.1 1991/02/21 15:43:34 gdsjaar -C Initial revision -C SUBROUTINE GMTCH3 (COORD, DIRCOS, MASSLV, NIQSLV, TDIS, * ITMP, NIQM, NIQS, DMAX, NUMNP) DIMENSION COORD (NUMNP,*), DIRCOS(5,*), MASSLV(2,*), NIQSLV(*), * TDIS(3,*), ITMP(*) -C + DO 30 IMAS = 1, NIQM X1 = COORD (MASSLV(1, IMAS),1) Y1 = COORD (MASSLV(1, IMAS),2) Z1 = COORD (MASSLV(1, IMAS),3) -C + C DIRCOS is average unit direction vector from surfaces at node -C + DCS1 = DIRCOS (1, IMAS) DCS2 = DIRCOS (2, IMAS) DCS3 = DIRCOS (3, IMAS) -C + DO 10 ISLV = 1, NIQS X0 = COORD (NIQSLV(ISLV),1) Y0 = COORD (NIQSLV(ISLV),2) Z0 = COORD (NIQSLV(ISLV),3) -C + TDIS(3,ISLV) = (X0 - X1)**2 + (Y0 - Y1)**2 + (Z0 - Z1)**2 T = -( DCS1 * (X1-X0) + DCS2 * (Y1-Y0) + DCS3 * (Z1-Z0) ) TDIS(1,ISLV) = T TDIS(2,ISLV) = ABS( TDIS(3,ISLV) - T**2 ) 10 CONTINUE -C + TMIN = DMAX NMIN = 0 DO 20 ISLV = 1, NIQS @@ -45,7 +40,7 @@ SUBROUTINE GMTCH3 (COORD, DIRCOS, MASSLV, NIQSLV, TDIS, NMIN = ISLV END IF 20 CONTINUE -C + IF (NMIN .NE. 0) THEN DIRCOS(4,IMAS) = TDIS(1,NMIN) DIRCOS(5,IMAS) = SQRT(TDIS(2,NMIN)) diff --git a/packages/seacas/applications/numbers/nu_header.f b/packages/seacas/applications/numbers/nu_header.f index 66ec1029da43..6d9a527b1b24 100644 --- a/packages/seacas/applications/numbers/nu_header.f +++ b/packages/seacas/applications/numbers/nu_header.f @@ -1,10 +1,10 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details SUBROUTINE HEADER (NDIM, TITLE, NUMEL, NUMNP, AXI, GENFIL) -C + include 'nu_io.blk' CHARACTER*16 FORM(3) CHARACTER*80 TITLE @@ -15,7 +15,7 @@ SUBROUTINE HEADER (NDIM, TITLE, NUMEL, NUMNP, AXI, GENFIL) DATA DIMEN/'One', 'Two', 'Three'/ DATA FORM /', Planar',', Axisymmetric',' '/ DATA FIRST /.TRUE./ -C + IO = IHARD IF (FIRST) THEN WRITE (IO, 10) GENFIL(:LENSTR(GENFIL)) diff --git a/packages/seacas/applications/numbers/nu_io.blk b/packages/seacas/applications/numbers/nu_io.blk index a039687af07c..9042afb54363 100644 --- a/packages/seacas/applications/numbers/nu_io.blk +++ b/packages/seacas/applications/numbers/nu_io.blk @@ -1,19 +1,13 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: io.blk,v 1.1 1991/02/21 15:43:46 gdsjaar Exp $ -C $Log: io.blk,v $ -C Revision 1.1 1991/02/21 15:43:46 gdsjaar -C Initial revision -C COMMON /IO/ IOMIN, IOMAX, ITERM, IHARD, NDB -C + C -- IOMIN = MINIMUM UNIT NUMBER FOR OUTPUT OF DATA C -- IOMAX = MAXIMUM UNIT NUMBER FOR OUTPUT OF DATA C -- ITERM = UNIT NUMBER FOR TERMINAL OUTPUT C -- IHARD = UNIT NUMBER FOR LISTING (HARDCOPY) C -- NDB = UNIT NUMBER FOR EXODUS FILE -C diff --git a/packages/seacas/applications/numbers/nu_jacob.f b/packages/seacas/applications/numbers/nu_jacob.f index 5816ed33fc9c..484ed4ad1e6f 100644 --- a/packages/seacas/applications/numbers/nu_jacob.f +++ b/packages/seacas/applications/numbers/nu_jacob.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details subroutine jacob(x1,x2,x3,x4,x5,x6,x7,x8, diff --git a/packages/seacas/applications/numbers/nu_limits.f b/packages/seacas/applications/numbers/nu_limits.f index 9bfdfda90a71..4be52c57fad6 100644 --- a/packages/seacas/applications/numbers/nu_limits.f +++ b/packages/seacas/applications/numbers/nu_limits.f @@ -1,27 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: limits.f,v 1.4 1999/02/16 21:38:00 gdsjaar Exp $ -C $Log: limits.f,v $ -C Revision 1.4 1999/02/16 21:38:00 gdsjaar -C Converted to read exodusII database format. Somewhat tested, not -C ready for production yet. -C -C Revision 1.3 1993/07/21 22:34:56 gdsjaar -C Removed unused variable--error -C -c Revision 1.2 1991/02/21 16:37:58 gdsjaar -c Moved ENGNOT function out of write statements -c -c Revision 1.1.1.1 1991/02/21 15:43:50 gdsjaar -c NUMBERS: Greg Sjaardema, initial Unix release -c -c Revision 1.1 1991/02/21 15:43:48 gdsjaar -c Initial revision -c SUBROUTINE LIMITS (XYZMIN, XYZMAX, CRD, IX, MAT, NDIM, NEBLK, * NNODES, EXODUS, TIME, ITMSEL, CORDSP, NUMNP) DIMENSION CRD(NUMNP, *), IX(NNODES,*), MAT(6,*), @@ -34,9 +16,9 @@ SUBROUTINE LIMITS (XYZMIN, XYZMAX, CRD, IX, MAT, NDIM, NEBLK, LOGICAL EXODUS include 'nu_io.blk' include 'nu_ptim.blk' -C + C ... IF NOT EXODUS, THEN CORDSP CONTAINS COORDINATES -C + IF (EXODUS) THEN CALL GETDSP (CRD, CORDSP, NDIM, NUMNP, TIME, ITMSEL, * 'R', ISTAT) @@ -56,12 +38,12 @@ SUBROUTINE LIMITS (XYZMIN, XYZMAX, CRD, IX, MAT, NDIM, NEBLK, IF (MAT(5,IBLK) .NE. 1) GOTO 40 IELBEG = MAT(3,IBLK) IELEND = MAT(4,IBLK) -C + XYZMIN(1,IBLK) = CORDSP(IX(1,IELBEG),1) XYZMIN(2,IBLK) = CORDSP(IX(1,IELBEG),2) XYZMAX(1,IBLK) = CORDSP(IX(1,IELBEG),1) XYZMAX(2,IBLK) = CORDSP(IX(1,IELBEG),2) -C + DO 30 IEL = IELBEG, IELEND DO 20 I = 1, NNODES XYZMIN(1,IBLK) = MIN(XYZMIN(1,IBLK), @@ -75,20 +57,20 @@ SUBROUTINE LIMITS (XYZMIN, XYZMAX, CRD, IX, MAT, NDIM, NEBLK, 20 CONTINUE 30 CONTINUE 40 CONTINUE -C + ELSE DO 70 IBLK = 1, NEBLK IF (MAT(5,IBLK) .NE. 1) GOTO 70 IELBEG = MAT(3,IBLK) IELEND = MAT(4,IBLK) -C + XYZMIN(1,IBLK) = CORDSP(IX(1,IELBEG),1) XYZMIN(2,IBLK) = CORDSP(IX(1,IELBEG),2) XYZMIN(3,IBLK) = CORDSP(IX(1,IELBEG),3) XYZMAX(1,IBLK) = CORDSP(IX(1,IELBEG),1) XYZMAX(2,IBLK) = CORDSP(IX(1,IELBEG),2) XYZMAX(3,IBLK) = CORDSP(IX(1,IELBEG),3) -C + DO 60 IEL = IELBEG, IELEND DO 50 I = 1, NNODES XYZMIN(1,IBLK) = MIN(XYZMIN(1,IBLK), @@ -115,7 +97,7 @@ SUBROUTINE LIMITS (XYZMIN, XYZMAX, CRD, IX, MAT, NDIM, NEBLK, OVMAX(I) = MAX(OVMAX(I), XYZMAX(I,J)) 80 CONTINUE 90 CONTINUE -C + ENG1 = ENGNOT(TREAD,2) DO 120 IO=IOMIN, IOMAX IF (EXODUS) WRITE (IO, 140) ENG1 diff --git a/packages/seacas/applications/numbers/nu_line2.f b/packages/seacas/applications/numbers/nu_line2.f index 3e0a5c9acc37..e97bf247b0ab 100644 --- a/packages/seacas/applications/numbers/nu_line2.f +++ b/packages/seacas/applications/numbers/nu_line2.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: line2.f,v 1.1 1991/02/21 15:43:51 gdsjaar Exp $ -C $Log: line2.f,v $ -C Revision 1.1 1991/02/21 15:43:51 gdsjaar -C Initial revision -C SUBROUTINE LINE2 (COORD, NUMNP, DIST, T, NDIM, P1, P2, TOLER, * NODEL, BOUND, SORTYP, MAP, SORUP, INUM, OPT, SELECT) DIMENSION COORD (NUMNP,*), DIST(*), T(*), P1(*), P2(*), @@ -16,9 +11,9 @@ SUBROUTINE LINE2 (COORD, NUMNP, DIST, T, NDIM, P1, P2, TOLER, CHARACTER*(*) NODEL, BOUND, SORTYP, OPT LOGICAL SORUP, SELECT(*), ISABRT include 'nu_io.blk' -C + CALL LOCOUT ('LINE', NDIM, NODEL, TOLER, SORTYP, P1, P2, BOUND) -C + IF (BOUND(:3) .EQ. 'BOU') THEN BMULT = 1.0 ELSE @@ -28,7 +23,7 @@ SUBROUTINE LINE2 (COORD, NUMNP, DIST, T, NDIM, P1, P2, TOLER, TEMP = TOLER(1) TOLER(1) = MAX(0.0, TEMP - TOLER(2)) TOLER(2) = MAX(0.0, TEMP + TOLER(2)) -C + A = P2(1) - P1(1) B = P2(2) - P1(2) X1 = P1(1) @@ -38,16 +33,16 @@ SUBROUTINE LINE2 (COORD, NUMNP, DIST, T, NDIM, P1, P2, TOLER, CALL PRTERR ('CMDERR', 'Zero length line input') RETURN END IF -C + DO 10 I=1, NUMNP IF (SELECT(I)) THEN X0 = COORD(I,1) Y0 = COORD(I,2) T(I) = -1. * (A * (X1 - X0) + B * (Y1 - Y0)) / (A**2 + B**2) -C + X = X1 + A * T(I) Y = Y1 + B * T(I) -C + DIST(I) = (X - X0)**2 + (Y - Y0)**2 END IF 10 CONTINUE @@ -100,7 +95,7 @@ SUBROUTINE LINE2 (COORD, NUMNP, DIST, T, NDIM, P1, P2, TOLER, * T(I) 50 CONTINUE 60 CONTINUE -C + IF (INUM .EQ. 0) THEN DO 70 IO=IOMIN, IOMAX WRITE (IO, 80) SQRT(DISMIN) diff --git a/packages/seacas/applications/numbers/nu_line3.f b/packages/seacas/applications/numbers/nu_line3.f index e0c3c429c6e8..0b57d85ddca2 100644 --- a/packages/seacas/applications/numbers/nu_line3.f +++ b/packages/seacas/applications/numbers/nu_line3.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: line3.f,v 1.1 1991/02/21 15:43:53 gdsjaar Exp $ -C $Log: line3.f,v $ -C Revision 1.1 1991/02/21 15:43:53 gdsjaar -C Initial revision -C SUBROUTINE LINE3 (COORD, NUMNP, DIST, T, NDIM, P1, P2, TOLER, * NODEL, BOUND, SORTYP, MAP, SORUP, INUM, OPT, SELECT) DIMENSION COORD (NUMNP,*), DIST(*), T(*), P1(*), P2(*), @@ -16,19 +11,19 @@ SUBROUTINE LINE3 (COORD, NUMNP, DIST, T, NDIM, P1, P2, TOLER, CHARACTER*(*) NODEL, BOUND, SORTYP, OPT LOGICAL SORUP, SELECT(*), ISABRT include 'nu_io.blk' -C + CALL LOCOUT ('LINE', NDIM, NODEL, TOLER, SORTYP, P1, P2, BOUND) -C + IF (BOUND(:3) .EQ. 'BOU') THEN BMULT = 1.0 ELSE BMULT = 0.0 END IF -C + TEMP = TOLER(1) TOLER(1) = MAX(0.0, TEMP - TOLER(2)) TOLER(2) = MAX(0.0, TEMP + TOLER(2)) -C + A = P2(1) - P1(1) B = P2(2) - P1(2) C = P2(3) - P1(3) @@ -40,7 +35,7 @@ SUBROUTINE LINE3 (COORD, NUMNP, DIST, T, NDIM, P1, P2, TOLER, CALL PRTERR ('CMDERR', 'Zero length line input') RETURN END IF -C + DO 10 I=1, NUMNP IF (SELECT(I)) THEN X0 = COORD(I,1) @@ -48,11 +43,11 @@ SUBROUTINE LINE3 (COORD, NUMNP, DIST, T, NDIM, P1, P2, TOLER, Z0 = COORD(I,3) T(I) = -1. * (A * (X1 - X0) + B * (Y1 - Y0) + C * (Z1 - Z0)) * / (A**2 + B**2 + C**2) -C + X = X1 + A * T(I) Y = Y1 + B * T(I) Z = Z1 + C * T(I) -C + DIST(I) = (X - X0)**2 + (Y - Y0)**2 + (Z - Z0)**2 END IF 10 CONTINUE @@ -106,7 +101,7 @@ SUBROUTINE LINE3 (COORD, NUMNP, DIST, T, NDIM, P1, P2, TOLER, * T(I) 50 CONTINUE 60 CONTINUE -C + IF (INUM .EQ. 0) THEN DO 70 IO=IOMIN, IOMAX WRITE (IO, 80) SQRT(DISMIN) diff --git a/packages/seacas/applications/numbers/nu_lissel.f b/packages/seacas/applications/numbers/nu_lissel.f index 82539b360c44..78e15777eee0 100644 --- a/packages/seacas/applications/numbers/nu_lissel.f +++ b/packages/seacas/applications/numbers/nu_lissel.f @@ -1,25 +1,20 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: lissel.f,v 1.1 1991/02/21 15:43:56 gdsjaar Exp $ -C $Log: lissel.f,v $ -C Revision 1.1 1991/02/21 15:43:56 gdsjaar -C Initial revision -C C======================================================================= SUBROUTINE LISSEL (OPT, TYPE, IOMIN, IOMAX, LIST, SELECT, NUMLST) C======================================================================= -C + C ... Output selected entities to Terminal and/or List file -C + C OPT = IN = Option: C 'L' = Selected by logical list C 'A' = All selected are in list C 'R' = List in Range form -C + LOGICAL SELECT(*) CHARACTER*(*) OPT, TYPE INTEGER LIST(*), ISCR(12) diff --git a/packages/seacas/applications/numbers/nu_locout.f b/packages/seacas/applications/numbers/nu_locout.f index 208ba63b3355..b517d8e41c18 100644 --- a/packages/seacas/applications/numbers/nu_locout.f +++ b/packages/seacas/applications/numbers/nu_locout.f @@ -1,38 +1,33 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: locout.f,v 1.1 1991/02/21 15:43:58 gdsjaar Exp $ -C $Log: locout.f,v $ -C Revision 1.1 1991/02/21 15:43:58 gdsjaar -C Initial revision -C SUBROUTINE LOCOUT (TYPE, NDIM, NODEL, TOLER, SORT, P1, P2, BOUND) DIMENSION P1(NDIM), P2(NDIM), TOLER(2) CHARACTER*(*) NODEL, BOUND, SORT, TYPE CHARACTER*16 BNAME include 'nu_io.blk' -C + IF (NODEL(:1) .EQ. 'E') THEN NODEL = 'Elements' ELSE NODEL = 'Nodes' ENDIF -C + IF (BOUND(:3) .EQ. 'BOU') THEN BNAME = 'Bounded Search' ELSE BNAME = 'Unbounded Search' END IF -C + DO 10 IO=IOMIN, IOMAX WRITE (IO, 20) NODEL(:LENSTR(NODEL)), TOLER(1), TOLER(2), * TYPE(:LENSTR(TYPE)) 20 FORMAT (//' Locating all ',A,' at a distance ',1PE15.8, * ' plus/minus ',1PE15.8,/' from the ',A) -C + IF (TYPE .EQ. 'LINE') THEN IF (NDIM .EQ. 2) THEN WRITE (IO, 30) (P1(I),I=1,NDIM), (P2(I),I=1,NDIM), BNAME @@ -50,7 +45,7 @@ SUBROUTINE LOCOUT (TYPE, NDIM, NODEL, TOLER, SORT, P1, P2, BOUND) B = P2(2) C = P2(3) D = A * P1(1) + B * P1(2) + C * P1(3) -C + WRITE (IO, 70) A, B, C, D END IF WRITE (IO, 80) SORT(:LENSTR(SORT)) @@ -65,6 +60,6 @@ SUBROUTINE LOCOUT (TYPE, NDIM, NODEL, TOLER, SORT, P1, P2, BOUND) 70 FORMAT (' ',1PE15.8,' X + ',1PE15.8,' Y + ',1PE15.8, * ' Z = ',1PE15.8) 80 FORMAT (' Sorted on field ',A,/) -C + RETURN END diff --git a/packages/seacas/applications/numbers/nu_locrl.f b/packages/seacas/applications/numbers/nu_locrl.f index 2b714459ab6b..7650ebb92d6d 100644 --- a/packages/seacas/applications/numbers/nu_locrl.f +++ b/packages/seacas/applications/numbers/nu_locrl.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: locrl.f,v 1.1 1991/02/21 15:44:00 gdsjaar Exp $ -C $Log: locrl.f,v $ -C Revision 1.1 1991/02/21 15:44:00 gdsjaar -C Initial revision -C C======================================================================= INTEGER FUNCTION LOCRL (VALUE, NVALUS, VALUOK, VALUS) C======================================================================= diff --git a/packages/seacas/applications/numbers/nu_loctol.f b/packages/seacas/applications/numbers/nu_loctol.f index 969b46feb7f3..4a7aa29f5c55 100644 --- a/packages/seacas/applications/numbers/nu_loctol.f +++ b/packages/seacas/applications/numbers/nu_loctol.f @@ -1,16 +1,11 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: loctol.f,v 1.1 1991/02/21 15:44:03 gdsjaar Exp $ -C $Log: loctol.f,v $ -C Revision 1.1 1991/02/21 15:44:03 gdsjaar -C Initial revision -C SUBROUTINE LOCTOL (TYPE, NDIM, RV, KV) -C + C This routine is used to set the tolerances and distances C used in the LOCATE routines. C If a tolerance is not entered (blank field), then @@ -18,7 +13,7 @@ SUBROUTINE LOCTOL (TYPE, NDIM, RV, KV) C the distance is set to 0.0 C If a tolerance is entered, the values are returned with no C changes -C + DIMENSION RV(*), KV(*) CHARACTER*(*) TYPE LOGICAL MATSTR diff --git a/packages/seacas/applications/numbers/nu_logerr.f b/packages/seacas/applications/numbers/nu_logerr.f index 7c94e0f20c94..46707a845c6a 100644 --- a/packages/seacas/applications/numbers/nu_logerr.f +++ b/packages/seacas/applications/numbers/nu_logerr.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/numbers/nu_logs.blk b/packages/seacas/applications/numbers/nu_logs.blk index a4d1523048f2..441d7190858f 100644 --- a/packages/seacas/applications/numbers/nu_logs.blk +++ b/packages/seacas/applications/numbers/nu_logs.blk @@ -1,26 +1,12 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: logs.blk,v 1.2 2007/03/21 20:12:37 gdsjaar Exp $ -C $Log: logs.blk,v $ -C Revision 1.2 2007/03/21 20:12:37 gdsjaar -C Several commands which can work on the deformed geometry were only -C checking whether the file was an exodus file (had timesteps) when -C requesting deformed coordinates. Changed to also check whether the -C file had valid displacements also. -C -C Revision 1.1.1.1 1991/02/21 15:44:12 gdsjaar -C NUMBERS: Greg Sjaardema, initial Unix release -C -CRevision 1.1 1991/02/21 15:44:11 gdsjaar -CInitial revision -C COMMON /LOGS/ AXI, EXODUS, ISDIS LOGICAL AXI, EXODUS, ISDIS -C + C AXI - .TRUE. if mesh is axisymmetric C EXODUS .TRUE. if exodus, .FALSE. if genesis C ISDIS is true iff displacement variables found diff --git a/packages/seacas/applications/numbers/nu_mass.blk b/packages/seacas/applications/numbers/nu_mass.blk index 348ce2728b33..f9d9c2a2972b 100644 --- a/packages/seacas/applications/numbers/nu_mass.blk +++ b/packages/seacas/applications/numbers/nu_mass.blk @@ -1,19 +1,14 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: mass.blk,v 1.1 1991/02/21 15:44:16 gdsjaar Exp $ -C $Log: mass.blk,v $ -C Revision 1.1 1991/02/21 15:44:16 gdsjaar -C Initial revision -C COMMON /MASS/ IM, IR, IX, IS, ID, IV, IC, IZ, IXXX, IXG, * IXINI, IAJ, IECEN, IW -C + C POINTERS USED IN MASS PROPERTIES CALCULATION: -C + C IM Material block array C IR Coordinate array C IX Connectivity array @@ -28,4 +23,3 @@ C IXINI Sum of shape function functions C IAJ Jacobian matrix C IECEN Element Centroid location C IW Element Wave Speed Array -C diff --git a/packages/seacas/applications/numbers/nu_mass.f b/packages/seacas/applications/numbers/nu_mass.f index 0ad5603f04b5..3ec4009a46f6 100644 --- a/packages/seacas/applications/numbers/nu_mass.f +++ b/packages/seacas/applications/numbers/nu_mass.f @@ -1,45 +1,12 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: mass.f,v 1.7 2007/03/21 20:12:37 gdsjaar Exp $ -C $Log: mass.f,v $ -C Revision 1.7 2007/03/21 20:12:37 gdsjaar -C Several commands which can work on the deformed geometry were only -C checking whether the file was an exodus file (had timesteps) when -C requesting deformed coordinates. Changed to also check whether the -C file had valid displacements also. -C -C Revision 1.6 2000/07/06 18:07:42 gdsjaar -C Fix assumption that variables are saved between subroutine calls -C -C Revision 1.5 1999/04/20 22:33:59 gdsjaar -C Two arrays in different areas of the code used the same name for an -C array (JACOB). If the code was run in the wrong order, there would be -C a supes error when the array was reserved for the second time. -C -C Revision 1.4 1999/02/16 21:38:00 gdsjaar -C Converted to read exodusII database format. Somewhat tested, not -C ready for production yet. -C -C Revision 1.3 1998/03/22 05:34:37 gdsjaar -C General cleanp of unused variables. Reordered DATA statements in -C command.f so would compile with f2c. -C -C Revision 1.2 1993/07/21 22:36:54 gdsjaar -C Removed unused variable--error -C -c Revision 1.1.1.1 1991/02/21 15:44:20 gdsjaar -c NUMBERS: Greg Sjaardema, initial Unix release -c -c Revision 1.1 1991/02/21 15:44:19 gdsjaar -c Initial revision -c SUBROUTINE MASSPR (A, TIME, ITMSEL, DENS, MAT, DISP, * NQUAD, LABEL) -C + DIMENSION A(*), TIME(*), DENS(*), MAT(6,*), * DISP(NUMNP,*) LOGICAL ITMSEL(*), ISABRT @@ -48,14 +15,14 @@ SUBROUTINE MASSPR (A, TIME, ITMSEL, DENS, MAT, DISP, include 'nu_numg.blk' include 'nu_mass.blk' include 'nu_logs.blk' -C + DIMENSION XI2(2,4), XI3(3,8) LOGICAL FIRST, HAVDEN DATA FIRST / .TRUE. / DATA XI2/ -1.,-1., 1.,-1., 1.,1., -1.,1./ DATA XI3/ 1.,-1.,-1., -1.,-1.,-1., -1.,-1.,1., 1.,-1.,1., * 1.,1.,-1., -1.,1.,-1., -1.,1.,1., 1.,1.,1./ -C + save IF (FIRST) THEN @@ -79,14 +46,14 @@ SUBROUTINE MASSPR (A, TIME, ITMSEL, DENS, MAT, DISP, STOP END IF END IF -C + HAVDEN = .FALSE. DO 20 I=1,NELBLK IF (DENS(I) .NE. 0.0) HAVDEN = .TRUE. 20 CONTINUE IF (.NOT. HAVDEN) CALL GETDEN (MAT, DENS, NELBLK, LABEL) -C + IF (EXODUS .AND. ISDIS) THEN CALL GETDSP (A(IR), DISP, NDIM, NUMNP, TIME, ITMSEL, * 'R', ISTAT) @@ -108,11 +75,11 @@ SUBROUTINE MASSPR (A, TIME, ITMSEL, DENS, MAT, DISP, * A(IXINI),A(IAJ),NNODES,NDIM,NQUAD, * A(IVM),A(IEM),NELBLK,NUMNP) END IF -C + CALL OUTPUT (A(IS), A(ID), A(IV), A(IC), A(IZ), MAT, * NDIM,NELBLK, VOL, A(IVM), A(IEM), * NQUAD, LABEL, AXI, TREAD) -C + GO TO 30 40 CONTINUE ELSE @@ -130,7 +97,7 @@ SUBROUTINE MASSPR (A, TIME, ITMSEL, DENS, MAT, DISP, CALL OUTPUT (A(IS), A(ID), A(IV), A(IC), A(IZ), MAT, * NDIM,NELBLK, VOL, A(IVM), A(IEM), NQUAD, LABEL, * AXI, TREAD) -C + END IF RETURN END diff --git a/packages/seacas/applications/numbers/nu_ndisp.blk b/packages/seacas/applications/numbers/nu_ndisp.blk index 985d6b60e1a1..37a80b4a0d61 100644 --- a/packages/seacas/applications/numbers/nu_ndisp.blk +++ b/packages/seacas/applications/numbers/nu_ndisp.blk @@ -1,23 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: ndisp.blk,v 1.2 2007/03/21 20:12:37 gdsjaar Exp $ -C $Log: ndisp.blk,v $ -C Revision 1.2 2007/03/21 20:12:37 gdsjaar -C Several commands which can work on the deformed geometry were only -C checking whether the file was an exodus file (had timesteps) when -C requesting deformed coordinates. Changed to also check whether the -C file had valid displacements also. -C -C Revision 1.1.1.1 1991/02/21 15:44:24 gdsjaar -C NUMBERS: Greg Sjaardema, initial Unix release -C -CRevision 1.1 1991/02/21 15:44:23 gdsjaar -CInitial revision -C COMMON /NDIS/ NDISP(10) C ... NDISP(1:NDIM) are the indices of the displacement variables. C (:10) are scratch. diff --git a/packages/seacas/applications/numbers/nu_nset.blk b/packages/seacas/applications/numbers/nu_nset.blk index 61d0f3995d10..68e3e362fd9f 100644 --- a/packages/seacas/applications/numbers/nu_nset.blk +++ b/packages/seacas/applications/numbers/nu_nset.blk @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: nset.blk,v 1.1 1991/02/21 15:44:27 gdsjaar Exp $ -C $Log: nset.blk,v $ -C Revision 1.1 1991/02/21 15:44:27 gdsjaar -C Initial revision -C COMMON /NSET/ INS1, INS2, INS3, INS4, INS5 C -- Node Sets: C INS1 = IDNPS (NUMNPS) NODAL POINT SET IDS @@ -16,4 +11,3 @@ C INS2 = NNNPS (NUMNPS) NODAL POINT SET COUNTS C INS3 = IPTNPS (NUMNPS) NODAL POINT SET POINTER C INS4 = LSTNPS (LNPSNL) NODAL POINT SET NODE LIST C INS5 = FACNPS (LNPSNL) NODAL POINT DISTRIBUTION FACTORS -C diff --git a/packages/seacas/applications/numbers/nu_numg.blk b/packages/seacas/applications/numbers/nu_numg.blk index 90d6c4387fe9..492fa6f539df 100644 --- a/packages/seacas/applications/numbers/nu_numg.blk +++ b/packages/seacas/applications/numbers/nu_numg.blk @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: numg.blk,v 1.1 1991/02/21 15:44:34 gdsjaar Exp $ -C $Log: numg.blk,v $ -C Revision 1.1 1991/02/21 15:44:34 gdsjaar -C Initial revision -C COMMON /NUMG/ NUMNP, NDIM, NUMEL, NELBLK, * NUMNPS, LNPSNL, NUMESS, LESSEL, LESSNL C NUMNP INTEGER Number of nodal points @@ -20,4 +15,3 @@ C LNPSNL INTEGER Number of nodes in nodal side set C NUMESS INTEGER Number of element side sets C LESSEL INTEGER Number of elements in element side set C LESSNL INTEGER Number of nodes in element side set -C diff --git a/packages/seacas/applications/numbers/nu_output.f b/packages/seacas/applications/numbers/nu_output.f index cf65a475c5ca..470696959f1b 100644 --- a/packages/seacas/applications/numbers/nu_output.f +++ b/packages/seacas/applications/numbers/nu_output.f @@ -1,12 +1,12 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details SUBROUTINE OUTPUT (MASS, DENS, VOLM, CG, ZI, MAT, NDIM, NBLK, * VOL, VOLMN, IELM, NQUAD, LABMAT, AXI, TIME) -C + include 'nu_io.blk' CHARACTER*16 LABMAT(*) CHARACTER*16 ENGNOT, ENG1 @@ -16,7 +16,7 @@ SUBROUTINE OUTPUT (MASS, DENS, VOLM, CG, ZI, MAT, NDIM, NBLK, CHARACTER*6 LABEL(3) DATA LABEL/' ',' Area ','Volume'/ DATA FIRST /.TRUE./ -C + DO 160 IO=IOMIN,IOMAX ENG1 = ENGNOT(TIME,2) IF (FIRST) THEN @@ -40,7 +40,7 @@ SUBROUTINE OUTPUT (MASS, DENS, VOLM, CG, ZI, MAT, NDIM, NBLK, TMASS = TMASS + MASS(I) 40 FORMAT (I10,3(5X,1PE15.8),5X,A16) 50 CONTINUE -C + WRITE (IO, 60) VOL, TMASS 60 FORMAT (25X,2(5X,'----------')/,18X,'Total: ',2(5X,1PE15.8)/) IF (NDIM .EQ. 2) THEN diff --git a/packages/seacas/applications/numbers/nu_ovrlap.f b/packages/seacas/applications/numbers/nu_ovrlap.f index f1baaa2b203b..5be0db40ee6e 100644 --- a/packages/seacas/applications/numbers/nu_ovrlap.f +++ b/packages/seacas/applications/numbers/nu_ovrlap.f @@ -1,37 +1,13 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: ovrlap.f,v 1.5 2007/03/21 20:12:37 gdsjaar Exp $ -C $Log: ovrlap.f,v $ -C Revision 1.5 2007/03/21 20:12:37 gdsjaar -C Several commands which can work on the deformed geometry were only -C checking whether the file was an exodus file (had timesteps) when -C requesting deformed coordinates. Changed to also check whether the -C file had valid displacements also. -C -C Revision 1.4 1999/02/16 21:38:01 gdsjaar -C Converted to read exodusII database format. Somewhat tested, not -C ready for production yet. -C -C Revision 1.3 1997/06/20 19:11:28 caforsy -C Port to ibm -C -C Revision 1.2 1992/01/28 19:01:28 gdsjaar -C Added overlap checking of deformed mesh -C -c Revision 1.1.1.1 1991/02/21 15:44:40 gdsjaar -c NUMBERS: Greg Sjaardema, initial Unix release -c -c Revision 1.1 1991/02/21 15:44:39 gdsjaar -c Initial revision -c SUBROUTINE OVRLAP (A, COORD, IDESS, NEESS, NNESS, IPEESS, IPNESS, * LTEESS, LTNESS, FACESS, DISP, NUMNP, NDIM, NUMESS, * TIME, ITMSEL, TITLE, IMAS, ISLV, NUMEL) -C + DIMENSION A(*), COORD(NUMNP,*), IDESS(*), NEESS(*), * NNESS(*), IPEESS(*), IPNESS(*), LTEESS(*), LTNESS(*), * FACESS(*), TIME(*), DISP(NUMNP,*) @@ -44,14 +20,14 @@ SUBROUTINE OVRLAP (A, COORD, IDESS, NEESS, NNESS, IPEESS, IPNESS, LOGICAL ERROR DIMENSION CPTIME(10) -C + DO 10 I=1,10 CPTIME(I) = 0.0 10 CONTINUE IFLGM = LOCINT (IMAS, NUMESS, IDESS) IFLGS = LOCINT (ISLV, NUMESS, IDESS) -C + ERROR = .FALSE. IF (IFLGM .EQ. 0) THEN WRITE (STRA, 30) 'Master', IMAS @@ -75,34 +51,33 @@ SUBROUTINE OVRLAP (A, COORD, IDESS, NEESS, NNESS, IPEESS, IPNESS, 40 CONTINUE 50 FORMAT ('Checking Master Surface ',I5,' Versus Slave Surface ',I5) 55 FORMAT (/,1X,A,/) -C + NSEGM = NEESS(IFLGM) IPTRM = IPNESS(IFLGM) IEPTM = IPEESS(IFLGM) -C + NSEGS = NEESS(IFLGS) IPTRS = IPNESS(IFLGS) -C + MULT = 2 * NDIM - 2 -C + C ... PROCESS SLAVE SET TO REMOVE DUPLICATE NODES -C + CALL MDRSRV ('MAPSLV', IMPSL, MULT*NSEGS) CALL MDRSRV ('ITEMP', ITMP, MAX(NUMNP,3*NSEGM)) CALL UNIQUE (LTNESS(IPTRS), MULT*NSEGS, A(IMPSL), A(ITMP), * NIQS, NUMNP) CALL MDRSRV ('NIQSLV', INQS, NIQS) CALL TRANIQ (LTNESS(IPTRS), A(IMPSL), A(INQS), MULT*NSEGS, 1) -C + CALL MDRSRV ('MINMAX', IMNMX, 2*NDIM*NSEGM) CALL MDRSRV ('LFACE', ILFAC, 2*NDIM*NUMEL) CALL MDSTAT (NERRS, NUSED) -c IF (NERRS .GT. 0) THEN CALL MEMERR STOP END IF -C + C ... Beginning of Time Step Loop IF (EXODUS .AND. ISDIS) THEN @@ -142,7 +117,7 @@ SUBROUTINE OVRLAP (A, COORD, IDESS, NEESS, NNESS, IPEESS, IPNESS, * NUMIN, NUMFAC, NUMON, NUMEL, A(ILFAC), NUMNP) END IF END IF -C + IF (NUMIN .GT. 0) THEN DO 70 IO=IOMIN, IOMAX WRITE (IO, 80) NUMIN @@ -168,7 +143,7 @@ SUBROUTINE OVRLAP (A, COORD, IDESS, NEESS, NNESS, IPEESS, IPNESS, END IF IF (EXODUS) GO TO 60 150 CONTINUE -C + CALL MDDEL ('LFACE') CALL MDDEL ('MINMAX') CALL MDDEL ('NIQSLV') diff --git a/packages/seacas/applications/numbers/nu_ovrmx2.f b/packages/seacas/applications/numbers/nu_ovrmx2.f index 5606709e3eb5..734635884a7d 100644 --- a/packages/seacas/applications/numbers/nu_ovrmx2.f +++ b/packages/seacas/applications/numbers/nu_ovrmx2.f @@ -1,27 +1,13 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: ovrmx2.f,v 1.3 1991/08/05 13:44:20 gdsjaar Exp $ -C $Log: ovrmx2.f,v $ -C Revision 1.3 1991/08/05 13:44:20 gdsjaar -C Reordered penetration distance loops, fixed format statement -C -c Revision 1.2 1991/02/21 16:38:01 gdsjaar -c Moved ENGNOT function out of write statements -c -c Revision 1.1.1.1 1991/02/21 15:44:42 gdsjaar -c NUMBERS: Greg Sjaardema, initial Unix release -c -c Revision 1.1 1991/02/21 15:44:41 gdsjaar -c Initial revision -c SUBROUTINE OVRMX2 (LSTEL, CORD, IX, NSEG, MINMAX, NIQSLV, * NIQS, TEMP, LTNESS, NUMIN, NUMFAC, NUMON, * NUMEL, LFACE, NUMNP) -C + INTEGER LSTEL(*), IX(4,*), NIQSLV(*), LTNESS(2,*) INTEGER LFACE(4,*) REAL MINMAX(4,*), CORD(NUMNP,*), TEMP(*) @@ -31,17 +17,17 @@ SUBROUTINE OVRMX2 (LSTEL, CORD, IX, NSEG, MINMAX, NIQSLV, LOGICAL INSIDE, ONFACE, INIT PARAMETER (MAXFAC = 4) include 'nu_io.blk' -C + DATA MAP /1, 2, 2, 3, 3, 4, 4, 1/ INIT = .FALSE. NUMIN = 0 NUMON = 0 NUMFAC = 0 -C + DO 10 I=1,NSEG IEL = LSTEL(I) -C + MINMAX(1, I) = MIN( CORD(IX(1,IEL),1), CORD(IX(2,IEL),1), * CORD(IX(3,IEL),1), CORD(IX(4,IEL),1)) MINMAX(2, I) = MAX( CORD(IX(1,IEL),1), CORD(IX(2,IEL),1), @@ -51,11 +37,11 @@ SUBROUTINE OVRMX2 (LSTEL, CORD, IX, NSEG, MINMAX, NIQSLV, * CORD(IX(3,IEL),2), CORD(IX(4,IEL),2)) MINMAX(4, I) = MAX( CORD(IX(1,IEL),2), CORD(IX(2,IEL),2), * CORD(IX(3,IEL),2), CORD(IX(4,IEL),2)) -C + 10 CONTINUE -C + C ... DETERMINE WHICH FACES HAVE SSET FLAG -C + CALL INIINT (MAXFAC * NUMEL, 0, LFACE) DO 30 ISEG = 1, NSEG @@ -76,13 +62,13 @@ SUBROUTINE OVRMX2 (LSTEL, CORD, IX, NSEG, MINMAX, NIQSLV, LFACE(IFAC,IEL) = LFACE(IFAC,IEL) + ITST1 * ITST2 20 CONTINUE 30 CONTINUE -C + C ... DETERMINE IF NODE IS CLOSE TO ELEMENT C TEMP = 1.0 IF INSIDE MIN/MAX BOX -C + DO 130 I=1, NSEG IEL = LSTEL(I) -C + DO 40 ISLV = 1, NIQS ISN = NIQSLV(ISLV) TEMP(ISLV) = @@ -91,11 +77,11 @@ SUBROUTINE OVRMX2 (LSTEL, CORD, IX, NSEG, MINMAX, NIQSLV, * (0.5 + SIGN( 0.5, CORD (ISN,2) - MINMAX(3,I) )) * * (0.5 + SIGN( 0.5, -CORD (ISN,2) + MINMAX(4,I) )) 40 CONTINUE -C + C ... DETERMINE IF ANY INSIDE BOX ( TEMP = 1.0 ) -C + C ... FOR EACH NODE INSIDE BOX, DETERMINE IF ACTUALLY INSIDE ELEMENT -C + DO 120 ISLV = 1, NIQS IF (TEMP(ISLV) .EQ. 1.0) THEN INOD = NIQSLV(ISLV) @@ -113,18 +99,17 @@ SUBROUTINE OVRMX2 (LSTEL, CORD, IX, NSEG, MINMAX, NIQSLV, X2 = CORD(IX(MAP(2,IPYR),IEL),1) Y2 = CORD(IX(MAP(2,IPYR),IEL),2) -C C ... CALCULATE TRIANGLE AREAS (SHOULD BE DIVIDED BY 2 FOR AREA) -C + V(IPYR) = X1 * (Y2 - Y3) + X2 * (Y3 - Y1) * + X3 * (Y1 - Y2) IF (V(IPYR) .LT. 0.0) INSIDE = .FALSE. IF (V(IPYR) .EQ. 0.0) ONFACE = .TRUE. 50 CONTINUE -C + C ... FLAG NODE AND ELEMENT IF INSIDE -C + IF (ONFACE .AND. INSIDE) THEN INSIDE = .TRUE. ONFACE = .FALSE. @@ -136,9 +121,9 @@ SUBROUTINE OVRMX2 (LSTEL, CORD, IX, NSEG, MINMAX, NIQSLV, END IF 60 CONTINUE END IF -C + C ... CHECK FOR NODE ON BOTH SURFACES -C + IF (INSIDE) THEN DO 70 INOD = 1, 4 IF (IX(INOD,IEL) .EQ. NIQSLV(ISLV)) THEN diff --git a/packages/seacas/applications/numbers/nu_ovrmx3.f b/packages/seacas/applications/numbers/nu_ovrmx3.f index 11745acf6c09..40081c7a1b02 100644 --- a/packages/seacas/applications/numbers/nu_ovrmx3.f +++ b/packages/seacas/applications/numbers/nu_ovrmx3.f @@ -1,33 +1,13 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: ovrmx3.f,v 1.5 1992/01/28 19:01:27 gdsjaar Exp $ -C $Log: ovrmx3.f,v $ -C Revision 1.5 1992/01/28 19:01:27 gdsjaar -C Added overlap checking of deformed mesh -C -c Revision 1.4 1991/09/23 15:33:10 gdsjaar -c Changed overlap output from face list to slave coord -c -c Revision 1.3 1991/08/05 13:44:25 gdsjaar -c Reordered penetration distance loops, fixed format statement -c -c Revision 1.2 1991/02/21 16:38:03 gdsjaar -c Moved ENGNOT function out of write statements -c -c Revision 1.1.1.1 1991/02/21 15:44:45 gdsjaar -c NUMBERS: Greg Sjaardema, initial Unix release -c -c Revision 1.1 1991/02/21 15:44:44 gdsjaar -c Initial revision -c SUBROUTINE OVRMX3 (LSTEL, CORD, IX, NSEG, MINMAX, NIQSLV, * NIQS, TEMP, LTNESS, NUMIN, NUMFAC, NUMON, * NUMEL, LFACE, NUMNP) -C + INTEGER LSTEL(*), IX(8,*), NIQSLV(*), LTNESS(4,*) INTEGER LFACE(6,*) REAL MINMAX(6,*), CORD(NUMNP,*), TEMP(*) @@ -37,7 +17,7 @@ SUBROUTINE OVRMX3 (LSTEL, CORD, IX, NSEG, MINMAX, NIQSLV, LOGICAL INSIDE, ONFACE, INIT PARAMETER (MAXFAC = 6) include 'nu_io.blk' -C + DATA MAP /1, 2, 3, 4, 6, 7, 3, 2, 6, 5, 8, 7, * 5, 1, 4, 8, 4, 3, 7, 8, 1, 5, 6, 2/ @@ -45,10 +25,10 @@ SUBROUTINE OVRMX3 (LSTEL, CORD, IX, NSEG, MINMAX, NIQSLV, NUMIN = 0 NUMON = 0 NUMFAC = 0 -C + DO 10 I=1,NSEG IEL = LSTEL(I) -C + MINMAX(1, I) = MIN(CORD(IX(1,IEL),1), CORD(IX(2,IEL),1), * CORD(IX(3,IEL),1), CORD(IX(4,IEL),1), CORD(IX(5,IEL),1), * CORD(IX(6,IEL),1), CORD(IX(7,IEL),1), CORD(IX(8,IEL),1)) @@ -69,11 +49,11 @@ SUBROUTINE OVRMX3 (LSTEL, CORD, IX, NSEG, MINMAX, NIQSLV, MINMAX(6, I) = MAX(CORD(IX(1,IEL),3), CORD(IX(2,IEL),3), * CORD(IX(3,IEL),3), CORD(IX(4,IEL),3), CORD(IX(5,IEL),3), * CORD(IX(6,IEL),3), CORD(IX(7,IEL),3), CORD(IX(8,IEL),3)) -C + 10 CONTINUE -C + C ... DETERMINE WHICH FACES HAVE SSET FLAG -C + CALL INIINT (MAXFAC * NUMEL, 0, LFACE) DO 30 ISEG = 1, NSEG @@ -108,21 +88,21 @@ SUBROUTINE OVRMX3 (LSTEL, CORD, IX, NSEG, MINMAX, NIQSLV, * ISIGN(1,(INOD2-IFAC4)) + ISIGN(1,(IFAC4-INOD2)) + * ISIGN(1,(INOD3-IFAC4)) + ISIGN(1,(IFAC4-INOD3)) + * ISIGN(1,(INOD4-IFAC4)) + ISIGN(1,(IFAC4-INOD4)) -C + C ... LFACE(IFAC,IEL) = 0 IF FACE NOT ON CONTACT SURFACE C > 0 IF FACE ON CONTACT SURFACE -C + LFACE(IFAC,IEL) = LFACE(IFAC,IEL) + * ITST1 * ITST2 * ITST3 * ITST4 20 CONTINUE 30 CONTINUE -C + C ... DETERMINE IF NODE IS CLOSE TO ELEMENT C TEMP = 1.0 IF INSIDE MIN/MAX BOX -C + DO 150 I=1, NSEG IEL = LSTEL(I) -C + DO 40 ISLV = 1, NIQS ISN = NIQSLV(ISLV) TEMP(ISLV) = @@ -133,11 +113,11 @@ SUBROUTINE OVRMX3 (LSTEL, CORD, IX, NSEG, MINMAX, NIQSLV, * (0.5 + SIGN( 0.5, CORD (ISN,3) - MINMAX(5,I) )) * * (0.5 + SIGN( 0.5, -CORD (ISN,3) + MINMAX(6,I) )) 40 CONTINUE -C + C ... DETERMINE IF ANY INSIDE BOX ( TEMP = 1.0 ) -C + C ... FOR EACH NODE INSIDE BOX, DETERMINE IF ACTUALLY INSIDE ELEMENT -C + DO 140 ISLV = 1, NIQS IF (TEMP(ISLV) .EQ. 1.0) THEN INOD = NIQSLV(ISLV) @@ -170,9 +150,9 @@ SUBROUTINE OVRMX3 (LSTEL, CORD, IX, NSEG, MINMAX, NIQSLV, Z52 = Z5 - Z2 Z53 = Z5 - Z3 Z54 = Z5 - Z4 -C + C ... CALCULATE PYRAMIDAL VOLUMES (SHOULD BE DIVIDED BY 12 FOR VOLUME) -C + V(IPYR) = ((2.*Y5 - Y3) * Z42 + Y2 * (Z53 + Z54) - * Y4 * (Z53 + Z52) ) * X1 + * ( (Y4 - 2.*Y5) * Z31 + Y3 * (Z54 + Z51) - @@ -191,9 +171,8 @@ SUBROUTINE OVRMX3 (LSTEL, CORD, IX, NSEG, MINMAX, NIQSLV, IF (V(IPYR) .EQ. 0.0) ONFACE = .TRUE. 60 CONTINUE -C C ... FLAG NODE AND ELEMENT IF INSIDE -C + IF (ONFACE .AND. INSIDE) THEN INSIDE = .TRUE. ONFACE = .FALSE. diff --git a/packages/seacas/applications/numbers/nu_pendis.f b/packages/seacas/applications/numbers/nu_pendis.f index b88df94a3e37..96bea8c3aaae 100644 --- a/packages/seacas/applications/numbers/nu_pendis.f +++ b/packages/seacas/applications/numbers/nu_pendis.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pendis.f,v 1.1 1991/02/21 15:44:47 gdsjaar Exp $ -C $Log: pendis.f,v $ -C Revision 1.1 1991/02/21 15:44:47 gdsjaar -C Initial revision -C SUBROUTINE PENDIS (SCORD, FCORD, DIST, NDIM, NNOD) DIMENSION SCORD(*), FCORD(NDIM, NNOD) @@ -19,24 +14,24 @@ SUBROUTINE PENDIS (SCORD, FCORD, DIST, NDIM, NNOD) XI = FCORD(1, 1) YI = FCORD(2, 1) ZI = FCORD(3, 1) -C + XJ = FCORD(1, 2) YJ = FCORD(2, 2) ZJ = FCORD(3, 2) -C + XK = FCORD(1, 3) YK = FCORD(2, 3) ZK = FCORD(3, 3) -C + XL = FCORD(1, 4) YL = FCORD(2, 4) ZL = FCORD(3, 4) -C + A = (YK - YI) * (ZL - ZJ) - (ZK - ZI) * (YL - YJ) B = (ZK - ZI) * (XL - XJ) - (XK - XI) * (ZL - ZJ) C = (XK - XI) * (YL - YJ) - (YK - YI) * (XL - XJ) RMAG = SQRT (A**2 + B**2 + C**2) -C + A = A / RMAG B = B / RMAG C = C / RMAG @@ -51,14 +46,14 @@ SUBROUTINE PENDIS (SCORD, FCORD, DIST, NDIM, NNOD) X1 = FCORD(1,1) Y1 = FCORD(2,1) -C + X0 = SCORD(1) Y0 = SCORD(2) T = -1. * (A * (X1 - X0) + B * (Y1 - Y0)) / (A**2 + B**2) -C + X = X1 + A * T Y = Y1 + B * T -C + DIST = SQRT((X - X0)**2 + (Y - Y0)**2) END IF RETURN diff --git a/packages/seacas/applications/numbers/nu_plane3.f b/packages/seacas/applications/numbers/nu_plane3.f index 377495ec5f70..00f2acacb9ac 100644 --- a/packages/seacas/applications/numbers/nu_plane3.f +++ b/packages/seacas/applications/numbers/nu_plane3.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: plane3.f,v 1.1 1991/02/21 15:44:49 gdsjaar Exp $ -C $Log: plane3.f,v $ -C Revision 1.1 1991/02/21 15:44:49 gdsjaar -C Initial revision -C SUBROUTINE PLANE3 (COORD, NUMNP, DIST, DISTR, NDIM, P1, P2, TOLER, * NODEL, SORTYP, MAP, SORUP, INUM, OPT, SELECT) DIMENSION COORD (NUMNP,*), DIST(*), DISTR(*), P1(*), P2(*), @@ -16,18 +11,18 @@ SUBROUTINE PLANE3 (COORD, NUMNP, DIST, DISTR, NDIM, P1, P2, TOLER, CHARACTER*(*) NODEL, SORTYP, OPT LOGICAL SORUP, SELECT(*), ISABRT include 'nu_io.blk' -C + CALL LOCOUT ('PLANE', NDIM, NODEL, TOLER, SORTYP, P1, P2, ' ') A = P2(1) B = P2(2) C = P2(3) D = A * P1(1) + B * P1(2) + C * P1(3) -C + TEMP = TOLER(1) TOLER(1) = MAX(0.0, TEMP - TOLER(2)) TOLER(2) = MAX(0.0, TEMP + TOLER(2)) -C + DO 10 I=1, NUMNP IF (SELECT(I)) THEN X0 = COORD(I,1) diff --git a/packages/seacas/applications/numbers/nu_pnames.f b/packages/seacas/applications/numbers/nu_pnames.f index c403457a39b0..6fed0a639080 100644 --- a/packages/seacas/applications/numbers/nu_pnames.f +++ b/packages/seacas/applications/numbers/nu_pnames.f @@ -1,30 +1,25 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pnames.f,v 1.1 1991/02/21 15:44:51 gdsjaar Exp $ -C $Log: pnames.f,v $ -C Revision 1.1 1991/02/21 15:44:51 gdsjaar -C Initial revision -C SUBROUTINE PNAMES(NAMECO, NAMEBL, NAMEHV, NAMEGV, NAMENV, NAMEEV, & NDIM, NELBLK, NVARHI, NVARGL, NVARNP,NVAREL,COPY) CHARACTER*8 NLIST(6), BLANK, NAMECO(*), NAMEBL(*), NAMEHV(*), & NAMEGV(*), NAMENV(*), NAMEEV(*) include 'nu_io.blk' LOGICAL COPY -C + DATA BLANK/' '/ -C + C************************************************************************ -C + C G. D. Sjaardema, 1521, 01/30/88 -C + C DESCRIPTION: Read and transfer the names found on the data base and C print a formatted echo to SYS$OUTPUT -C + C DUMMY VARIABLES: C NAMECO CHARACTER Names of coordinates C NAMEBL CHARACTER Names of element blocks @@ -39,21 +34,21 @@ SUBROUTINE PNAMES(NAMECO, NAMEBL, NAMEHV, NAMEGV, NAMENV, NAMEEV, C NVARNP INTEGER Number of nodal variables C NVAREL INTEGER Number of element variables C COPY LOGICAL TRUE if echo to output data base -C + C COMMON VARIABLES: --NONE-- -C + C FILES: C UNIT NDB - INPUT, SEQUENTIAL, UNFORMATTED, READONLY C UNIT 11 - OUTPUT, SEQUENTIAL, UNFORMATTED C - Output database, written iff COPY = .TRUE. -C + C INTRINSICS CALLED: C MAX -- Get maximum value of items in list -C + C ROUTINES CALLED: --NONE-- -C + C************************************************************************ -C + READ (NDB,END=2000,ERR=2100) (NAMEHV(I),I=1,NVARHI), $ (NAMEGV(I),I=1,NVARGL), $ (NAMENV(I),I=1,NVARNP), @@ -78,16 +73,16 @@ SUBROUTINE PNAMES(NAMECO, NAMEBL, NAMEHV, NAMEGV, NAMENV, NAMEEV, IF (I .LE. NVAREL) NLIST(5) = NAMEEV(I) C -ELEMENT BLOCK NAMES IF (I .LE. NELBLK) NLIST(6) = NAMEBL(I) -C + PRINT 1500, (NLIST(J),J=1,6) 1500 FORMAT (T6,A8,T18,A8,T30,A8,T42,A8,T54,A8,T66,A8) 10 CONTINUE END IF -C + RETURN -C + C END OF FILE OR READ/WRITE ERROR DURING TRANSFER -C + 2000 CONTINUE PRINT *, 'End of file during names transfer' STOP 'PNAMES' diff --git a/packages/seacas/applications/numbers/nu_point2.f b/packages/seacas/applications/numbers/nu_point2.f index 6357d07f7bd0..387ceb970cad 100644 --- a/packages/seacas/applications/numbers/nu_point2.f +++ b/packages/seacas/applications/numbers/nu_point2.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: point2.f,v 1.1 1991/02/21 15:44:54 gdsjaar Exp $ -C $Log: point2.f,v $ -C Revision 1.1 1991/02/21 15:44:54 gdsjaar -C Initial revision -C C======================================================================= SUBROUTINE POINT2 (COORD, NUMNP, DIST, NDIM, P1, TOLER, * NODEL, SORTYP, MAP, ANGLE, SORUP, INUM, OPT, SELECT) @@ -19,23 +14,23 @@ SUBROUTINE POINT2 (COORD, NUMNP, DIST, NDIM, P1, TOLER, LOGICAL SORUP, SELECT(*), ISABRT include 'nu_io.blk' PI = ATAN2(0.0, -1.0) -C + CALL LOCOUT ('POINT', NDIM, NODEL, TOLER, SORTYP, P1, P1, ' ') -C + TEMP = TOLER(1) TOLER(1) = MAX(0.0, TEMP - TOLER(2)) TOLER(2) = MAX(0.0, TEMP + TOLER(2)) -C + X1 = P1(1) Y1 = P1(2) -C + DO 10 I=1, NUMNP IF (SELECT(I)) THEN X0 = COORD(I,1) Y0 = COORD(I,2) -C + DIST(I) = (X1 - X0)**2 + (Y1 - Y0)**2 -C + END IF 10 CONTINUE INUM = 0 @@ -92,7 +87,7 @@ SUBROUTINE POINT2 (COORD, NUMNP, DIST, NDIM, P1, TOLER, * ANGLE(I) 50 CONTINUE 60 CONTINUE -C + IF (INUM .EQ. 0) THEN DO 70 IO=IOMIN, IOMAX WRITE (IO, 80) SQRT(DISMIN) diff --git a/packages/seacas/applications/numbers/nu_point3.f b/packages/seacas/applications/numbers/nu_point3.f index e068c792a215..7dccee03ecc2 100644 --- a/packages/seacas/applications/numbers/nu_point3.f +++ b/packages/seacas/applications/numbers/nu_point3.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details SUBROUTINE POINT3 (COORD, NUMNP, DIST, NDIM, P1, TOLER, @@ -12,23 +12,23 @@ SUBROUTINE POINT3 (COORD, NUMNP, DIST, NDIM, P1, TOLER, LOGICAL SORUP, SELECT(*), ISABRT include 'nu_io.blk' PI = ATAN2(0.0, -1.0) -C + CALL LOCOUT ('POINT', NDIM, NODEL, TOLER, SORTYP, P1, P1, ' ') TEMP = TOLER(1) TOLER(1) = MAX(0.0, TEMP - TOLER(2)) TOLER(2) = MAX(0.0, TEMP + TOLER(2)) -C + X1 = P1(1) Y1 = P1(2) Z1 = P1(3) -C + DO 10 I=1, NUMNP IF (SELECT(I)) THEN X0 = COORD(I,1) Y0 = COORD(I,2) Z0 = COORD(I,3) -C + DIST(I) = (X1 - X0)**2 + (Y1 - Y0)**2 + (Z1 - Z0)**2 END IF 10 CONTINUE @@ -44,18 +44,18 @@ SUBROUTINE POINT3 (COORD, NUMNP, DIST, NDIM, P1, TOLER, DY = COORD(I,2) - P1(2) DZ = COORD(I,3) - P1(3) DS = SQRT(DX**2 + DZ**2) -C + FIX1 = SIGN(0.5,ABS(DX+DZ)) + SIGN(0.5,-ABS(DX+DZ)) FIX2 = SIGN(0.5,ABS(DS+DY)) + SIGN(0.5,-ABS(DS+DY)) ANGLE(1,I) = ATAN2(DZ,DX+FIX1) * 180.0 / PI ANGLE(2,I) = ATAN2(DY,DS+FIX2) * 180.0 / PI -C + INUM = INUM + 1 MAP(INUM) = I END IF END IF 20 CONTINUE -C + IF (SORTYP .EQ. 'X') THEN CALL INDEXX (COORD(1,1), MAP, INUM, .FALSE.) ELSE IF (SORTYP .EQ. 'Y') THEN diff --git a/packages/seacas/applications/numbers/nu_prnvol.f b/packages/seacas/applications/numbers/nu_prnvol.f index f3f7efa38d88..d316a1892917 100644 --- a/packages/seacas/applications/numbers/nu_prnvol.f +++ b/packages/seacas/applications/numbers/nu_prnvol.f @@ -1,15 +1,14 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: prnvol.f,v 1.4 2005/07/14 21:18:17 gdsjaar Exp $ C ... Calculate nodal volume... SUBROUTINE PRNVOL (NDIM, CRD, IX, NUMNP, NUMEL, NNODE, & VOLUME, IUNIT) -C + DIMENSION CRD(NUMNP, *), IX(NNODE,*) DIMENSION GRADOP(8) REAL volume(*) diff --git a/packages/seacas/applications/numbers/nu_progqa.blk b/packages/seacas/applications/numbers/nu_progqa.blk index d17dd9a618f0..132a490db91e 100644 --- a/packages/seacas/applications/numbers/nu_progqa.blk +++ b/packages/seacas/applications/numbers/nu_progqa.blk @@ -1,16 +1,10 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: progqa.blk,v 1.1 1991/02/21 15:45:00 gdsjaar Exp $ -C $Log: progqa.blk,v $ -C Revision 1.1 1991/02/21 15:45:00 gdsjaar -C Initial revision -C - COMMON /PROGQA/ QAINFO(6) - CHARACTER*8 QAINFO + CHARACTER*8 QAINFO(6) C --QAINFO - the current program QA information: C -- (1) = program name C -- (2) = revision date diff --git a/packages/seacas/applications/numbers/nu_prvol.f b/packages/seacas/applications/numbers/nu_prvol.f index 38670bf0d109..223d846a09ba 100644 --- a/packages/seacas/applications/numbers/nu_prvol.f +++ b/packages/seacas/applications/numbers/nu_prvol.f @@ -1,14 +1,14 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details SUBROUTINE PRVOL (NDIM, CRD, IX, NUMNP, NUMEL, NNODE, & VOLUME, IUNIT) -C + C ... ESTIMATE TIMESTEP FOR MESH --- BRICKS ONLY -C + DIMENSION CRD(NUMNP, *), IX(NNODE,*) DIMENSION GRADOP(8) REAL volume(*) diff --git a/packages/seacas/applications/numbers/nu_ptim.blk b/packages/seacas/applications/numbers/nu_ptim.blk index 8e6defad9094..d069d4b48e9f 100644 --- a/packages/seacas/applications/numbers/nu_ptim.blk +++ b/packages/seacas/applications/numbers/nu_ptim.blk @@ -1,24 +1,12 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: ptim.blk,v 1.2 1999/02/16 21:38:01 gdsjaar Exp $ -C $Log: ptim.blk,v $ -C Revision 1.2 1999/02/16 21:38:01 gdsjaar -C Converted to read exodusII database format. Somewhat tested, not -C ready for production yet. -C -C Revision 1.1.1.1 1991/02/21 15:45:07 gdsjaar -C NUMBERS: Greg Sjaardema, initial Unix release -C -CRevision 1.1 1991/02/21 15:45:05 gdsjaar -CInitial revision -C COMMON /TIMBLK/ NSTEP, NLAST, TMIN, TMAX, STMIN, STMAX, STDEL, * LSTSEL, ITIME, ITSEL, TREAD -C + C NSTEP - NUMBER OF TIMESTEPS READ FROM DATABASE C NLAST - CURRENT POSITION OF DATABASE C TMIN - MINIMUM TIME READ FROM DATABASE @@ -30,4 +18,3 @@ C LSTSEL - NUMBER OF LAST SELECTED TIMESTEP C ITIME - POINTER TO TIME ARRAY C ITSEL - POINTER TO SELECTED TIME ARRAY C TREAD - LAST TIME READ FROM DATABASE -C diff --git a/packages/seacas/applications/numbers/nu_qadata.blk b/packages/seacas/applications/numbers/nu_qadata.blk index 7c50fc3d7941..d2830e87ff9d 100644 --- a/packages/seacas/applications/numbers/nu_qadata.blk +++ b/packages/seacas/applications/numbers/nu_qadata.blk @@ -1,18 +1,12 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: qadata.blk,v 1.1 1991/02/21 15:45:11 gdsjaar Exp $ -C $Log: qadata.blk,v $ -C Revision 1.1 1991/02/21 15:45:11 gdsjaar -C Initial revision -C CHARACTER*8 TODAY, NOW, PROG, QADES COMMON /QADATA/ PROG, QADES, TODAY, NOW C PROG CHARACTER Name of program C QADES CHARACTER QA Version of program C TODAY CHARACTER Today's date MM/DD/YY C NOW CHARACTER Current time HH:MM:SS -C diff --git a/packages/seacas/applications/numbers/nu_qainfo.blk b/packages/seacas/applications/numbers/nu_qainfo.blk index da266b9bdc0e..4837d4f4cf18 100644 --- a/packages/seacas/applications/numbers/nu_qainfo.blk +++ b/packages/seacas/applications/numbers/nu_qainfo.blk @@ -1,15 +1,15 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details QAINFO(1) = 'Numbers ' QAINFO(2) = ' ' QAINFO(3) = ' ' - QAINFO(2)(:8) = '20160510' - QAINFO(3)(:8) = ' 1.27' + QAINFO(2)(:8) = '20200612' + QAINFO(3)(:8) = ' 1.28' C ... Added esum and eaverage commands c ... Fixed cavity volume output @@ -32,3 +32,4 @@ c ... check whether there are valid displacements for all commands calling getds c ... Fix handling of empty sidesets c ... increase output precision c ... Add centroid option for 3d cavity +c ... Fix/kluge command-line arg parsing on intel (qainfo not in common block) diff --git a/packages/seacas/applications/numbers/nu_quad.f b/packages/seacas/applications/numbers/nu_quad.f index 6451e19d51ac..ec895201827b 100644 --- a/packages/seacas/applications/numbers/nu_quad.f +++ b/packages/seacas/applications/numbers/nu_quad.f @@ -1,23 +1,18 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: quad.f,v 1.1 1991/02/21 15:45:19 gdsjaar Exp $ -C $Log: quad.f,v $ -C Revision 1.1 1991/02/21 15:45:19 gdsjaar -C Initial revision -C SUBROUTINE QUAD(XXX, XI, XG, NDIM, NNODES, NQUAD, WT) DIMENSION XXX(NDIM+1,NNODES,NQUAD), XI(NDIM,*), XG(NDIM,*) -C + IF (NQUAD .EQ. 1) THEN QUADL = 0.0 ELSE QUADL = 1./SQRT(3.) END IF -C + WT = 2.**NDIM / DBLE(NQUAD) IF (NQUAD .EQ. 1) THEN XG(1,1) = 0.0 @@ -30,14 +25,14 @@ SUBROUTINE QUAD(XXX, XI, XG, NDIM, NNODES, NQUAD, WT) 10 CONTINUE 20 CONTINUE END IF -C + IF (NDIM .EQ. 3) THEN DO 40 I=1, NQUAD DO 30 J=1, NNODES TMP1 = (1. + XI(1,J) * XG(1,I)) TMP2 = (1. + XI(2,J) * XG(2,I)) TMP3 = (1. + XI(3,J) * XG(3,I)) -C + XXX(1,J,I) = TMP1 * TMP2 * TMP3 / 8.0 XXX(2,J,I) = XI(1,J) * TMP2 * TMP3 / 8.0 XXX(3,J,I) = XI(2,J) * TMP1 * TMP3 / 8.0 @@ -49,7 +44,7 @@ SUBROUTINE QUAD(XXX, XI, XG, NDIM, NNODES, NQUAD, WT) DO 50 J=1, NNODES TMP1 = (1. + XI(1,J) * XG(1,I)) TMP2 = (1. + XI(2,J) * XG(2,I)) -C + XXX(1,J,I) = TMP1 * TMP2 / 4.0 XXX(2,J,I) = XI(1,J) * TMP2 / 4.0 XXX(3,J,I) = XI(2,J) * TMP1 / 4.0 diff --git a/packages/seacas/applications/numbers/nu_range.f b/packages/seacas/applications/numbers/nu_range.f index b24c07df16c6..44c102ae122a 100644 --- a/packages/seacas/applications/numbers/nu_range.f +++ b/packages/seacas/applications/numbers/nu_range.f @@ -1,21 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: range.f,v 1.2 1999/02/16 21:38:01 gdsjaar Exp $ -C $Log: range.f,v $ -C Revision 1.2 1999/02/16 21:38:01 gdsjaar -C Converted to read exodusII database format. Somewhat tested, not -C ready for production yet. -C -C Revision 1.1.1.1 1991/02/21 15:45:22 gdsjaar -C NUMBERS: Greg Sjaardema, initial Unix release -C -c Revision 1.1 1991/02/21 15:45:21 gdsjaar -c Initial revision -c SUBROUTINE RANGE (LEN, LIST, IOMIN, IOMAX) LOGICAL LIST(*), INRNG INTEGER IRANGE(3) diff --git a/packages/seacas/applications/numbers/nu_selbox.f b/packages/seacas/applications/numbers/nu_selbox.f index 8b00c5c32e9e..745db2e99530 100644 --- a/packages/seacas/applications/numbers/nu_selbox.f +++ b/packages/seacas/applications/numbers/nu_selbox.f @@ -1,28 +1,16 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: selbox.f,v 1.2 1998/03/22 05:34:43 gdsjaar Exp $ -C $Log: selbox.f,v $ -C Revision 1.2 1998/03/22 05:34:43 gdsjaar -C General cleanp of unused variables. Reordered DATA statements in -C command.f so would compile with f2c. -C -C Revision 1.1.1.1 1991/02/21 15:45:24 gdsjaar -C NUMBERS: Greg Sjaardema, initial Unix release -C -c Revision 1.1 1991/02/21 15:45:23 gdsjaar -c Initial revision -c SUBROUTINE SELBOX (COORD, NUMNP, NDIM, P1, SELECT, NODEL) DIMENSION COORD (NUMNP,*), P1(*) LOGICAL SELECT(*) CHARACTER*8 NODEL CHARACTER*80 STRTMP INTEGER LENSTR -C + CALL INILOG (NUMNP, .FALSE., SELECT) INUM = 0 IF (NDIM .EQ. 2) THEN diff --git a/packages/seacas/applications/numbers/nu_selelm.f b/packages/seacas/applications/numbers/nu_selelm.f index 8f3bef3a9249..5ab9e1d3c2d3 100644 --- a/packages/seacas/applications/numbers/nu_selelm.f +++ b/packages/seacas/applications/numbers/nu_selelm.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: selelm.f,v 1.1 1991/02/21 15:45:25 gdsjaar Exp $ -C $Log: selelm.f,v $ -C Revision 1.1 1991/02/21 15:45:25 gdsjaar -C Initial revision -C C======================================================================= SUBROUTINE SELELM (MAT, SELECT, NUMEL, NELBLK, NUMSEL) C======================================================================= diff --git a/packages/seacas/applications/numbers/nu_selinv.f b/packages/seacas/applications/numbers/nu_selinv.f index 3e530f5bdc91..4757f66666c3 100644 --- a/packages/seacas/applications/numbers/nu_selinv.f +++ b/packages/seacas/applications/numbers/nu_selinv.f @@ -1,32 +1,20 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: selinv.f,v 1.2 1999/02/16 21:38:01 gdsjaar Exp $ -C $Log: selinv.f,v $ -C Revision 1.2 1999/02/16 21:38:01 gdsjaar -C Converted to read exodusII database format. Somewhat tested, not -C ready for production yet. -C -C Revision 1.1.1.1 1991/02/21 15:45:29 gdsjaar -C NUMBERS: Greg Sjaardema, initial Unix release -C -c Revision 1.1 1991/02/21 15:45:28 gdsjaar -c Initial revision -c SUBROUTINE SELINV (TIMES, ITMSEL, NINTV) DIMENSION TIMES(*) LOGICAL ITMSEL(*) CHARACTER*16 ENGNOT, STRA, STRB CHARACTER*80 STRTMP -C + include 'nu_ptim.blk' -C + NLAST = 0 NUMSEL = 0 -C + C IFIRST = LOCRL (STMIN, NSTEP, ITMSEL, TIMES) C ILAST = LOCRL (STMAX, NSTEP, ITMSEL, TIMES) IFIRST = LOCREA (STMIN, NSTEP, TIMES) diff --git a/packages/seacas/applications/numbers/nu_selnod.f b/packages/seacas/applications/numbers/nu_selnod.f index dc698715efad..0a4ccadbdba1 100644 --- a/packages/seacas/applications/numbers/nu_selnod.f +++ b/packages/seacas/applications/numbers/nu_selnod.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: selnod.f,v 1.1 1991/02/21 15:45:30 gdsjaar Exp $ -C $Log: selnod.f,v $ -C Revision 1.1 1991/02/21 15:45:30 gdsjaar -C Initial revision -C C======================================================================= SUBROUTINE SELNOD (MAT, IX, SELECT, NUMNP, NNODES, NELBLK, NUMSEL) C======================================================================= diff --git a/packages/seacas/applications/numbers/nu_selssn.f b/packages/seacas/applications/numbers/nu_selssn.f index 6bffb2fa4cf5..d204a733b4e8 100644 --- a/packages/seacas/applications/numbers/nu_selssn.f +++ b/packages/seacas/applications/numbers/nu_selssn.f @@ -1,21 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: selssn.f,v 1.2 1998/03/22 05:34:45 gdsjaar Exp $ -C $Log: selssn.f,v $ -C Revision 1.2 1998/03/22 05:34:45 gdsjaar -C General cleanp of unused variables. Reordered DATA statements in -C command.f so would compile with f2c. -C -C Revision 1.1.1.1 1991/02/21 15:45:33 gdsjaar -C NUMBERS: Greg Sjaardema, initial Unix release -C -c Revision 1.1 1991/02/21 15:45:32 gdsjaar -c Initial revision -c C======================================================================= SUBROUTINE SELSSN (SELECT, NUMNP, NLIST, LIST, * IDSS, NNSS, IPNSS, LTNSS, NUMSS, NUMSEL) @@ -24,7 +12,7 @@ SUBROUTINE SELSSN (SELECT, NUMNP, NLIST, LIST, C NNSS (NUMSS) SIDE SET NODE COUNTS C IPNSS (NUMSS) SIDE SET NODE POINTERS C LTNSS (LSSNL) SIDE SET NODE LIST -C + LOGICAL SELECT(*) INTEGER LIST(*), IDSS(*), NNSS(*), IPNSS(*), LTNSS(*) CHARACTER*80 STRA diff --git a/packages/seacas/applications/numbers/nu_seltim.f b/packages/seacas/applications/numbers/nu_seltim.f index 2766dd13b918..28c7eec17f7e 100644 --- a/packages/seacas/applications/numbers/nu_seltim.f +++ b/packages/seacas/applications/numbers/nu_seltim.f @@ -1,44 +1,32 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: seltim.f,v 1.2 1999/02/16 21:38:01 gdsjaar Exp $ -C $Log: seltim.f,v $ -C Revision 1.2 1999/02/16 21:38:01 gdsjaar -C Converted to read exodusII database format. Somewhat tested, not -C ready for production yet. -C -C Revision 1.1.1.1 1991/02/21 15:45:35 gdsjaar -C NUMBERS: Greg Sjaardema, initial Unix release -C -c Revision 1.1 1991/02/21 15:45:34 gdsjaar -c Initial revision -c SUBROUTINE SELTIM (TIMES, ITMSEL) DIMENSION TIMES(*) LOGICAL ITMSEL(*) CHARACTER*16 ENGNOT, STRA, STRB CHARACTER*80 STRTMP EXTERNAL ENGNOT -C + include 'nu_ptim.blk' -C + C ... TOLER is the tolerance for matching a timestep. If the difference C is less than TOLER, then a match occurs. TOLER1 = TOLER + 1 -C + PARAMETER (TOLER = 1.0E-3) TOLERP1 = 1.0 + TOLER TOLERM1 = 1.0 - TOLER -C + CALL INILOG (NSTEP, .FALSE., ITMSEL) NLAST = 0 LSTSEL = NSTEP TIMGET = STMIN NUMSEL = 0 -C + IF (STDEL .EQ. 0.0) THEN 10 CONTINUE NLAST = NLAST + 1 diff --git a/packages/seacas/applications/numbers/nu_showfl.f b/packages/seacas/applications/numbers/nu_showfl.f index 88c72a44965e..89c1833d4056 100644 --- a/packages/seacas/applications/numbers/nu_showfl.f +++ b/packages/seacas/applications/numbers/nu_showfl.f @@ -1,18 +1,13 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: showfl.f,v 1.1 1991/02/21 15:45:37 gdsjaar Exp $ -C $Log: showfl.f,v $ -C Revision 1.1 1991/02/21 15:45:37 gdsjaar -C Initial revision -C SUBROUTINE SHOWFL (TYPE, NUMESS, IDESS, NEESS, IPEESS) DIMENSION IDESS(*), NEESS(*), IPEESS(*) CHARACTER*1 TYPE -C + IF (TYPE .EQ. 'S') THEN WRITE (*, 20) DO 10 I=1, NUMESS @@ -24,7 +19,7 @@ SUBROUTINE SHOWFL (TYPE, NUMESS, IDESS, NEESS, IPEESS) WRITE (*, 30) I, IDESS(I), NEESS(I) 15 CONTINUE END IF -C + 20 FORMAT (/' Side Set Flags:'/ * ' ID Elements Nodes') 40 FORMAT (/' Node Set Flags:'/ diff --git a/packages/seacas/applications/numbers/nu_shwblk.f b/packages/seacas/applications/numbers/nu_shwblk.f index 14629f090ad3..f5bd6ddc5c73 100644 --- a/packages/seacas/applications/numbers/nu_shwblk.f +++ b/packages/seacas/applications/numbers/nu_shwblk.f @@ -1,20 +1,15 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: shwblk.f,v 1.1 1991/02/21 15:45:39 gdsjaar Exp $ -C $Log: shwblk.f,v $ -C Revision 1.1 1991/02/21 15:45:39 gdsjaar -C Initial revision -C SUBROUTINE SHWBLK (NELBLK, MAT, NSELND, NSELEL) DIMENSION MAT(6, NELBLK) CHARACTER*16 TYPE CHARACTER*80 STRTMP include 'nu_io.blk' -C + DO 10 IO=IOMIN, IOMAX WRITE (IO, 50) 10 CONTINUE diff --git a/packages/seacas/applications/numbers/nu_sorblk.f b/packages/seacas/applications/numbers/nu_sorblk.f index 60b68dfdf217..129da682ebcc 100644 --- a/packages/seacas/applications/numbers/nu_sorblk.f +++ b/packages/seacas/applications/numbers/nu_sorblk.f @@ -1,12 +1,12 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details SUBROUTINE SORBLK (IDELB, INDEX, MAT, NELBLK) DIMENSION IDELB(*), INDEX(*), MAT(6,*) -C + CALL INDEXI (IDELB, INDEX, NELBLK, .TRUE.) DO 10 I=1, NELBLK MAT(6,I) = INDEX(I) diff --git a/packages/seacas/applications/numbers/nu_stimes.f b/packages/seacas/applications/numbers/nu_stimes.f index 2e0cd8d482b0..38042d8a94dd 100644 --- a/packages/seacas/applications/numbers/nu_stimes.f +++ b/packages/seacas/applications/numbers/nu_stimes.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: stimes.f,v 1.1 1991/02/21 15:45:43 gdsjaar Exp $ -C $Log: stimes.f,v $ -C Revision 1.1 1991/02/21 15:45:43 gdsjaar -C Initial revision -C C======================================================================= SUBROUTINE STIMES (OPTION, ALLPRT, ALLTIM, NSTEPS, TIMES, SELTIM) C======================================================================= diff --git a/packages/seacas/applications/numbers/nu_strng.blk b/packages/seacas/applications/numbers/nu_strng.blk index 6bd95871e1be..dccbb57ca97d 100644 --- a/packages/seacas/applications/numbers/nu_strng.blk +++ b/packages/seacas/applications/numbers/nu_strng.blk @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: strng.blk,v 1.1 1991/02/21 15:45:49 gdsjaar Exp $ -C $Log: strng.blk,v $ -C Revision 1.1 1991/02/21 15:45:49 gdsjaar -C Initial revision -C COMMON /STRNG/ STR1(32), STR2(32), STR3(32), STR4(32), STR5(32), * STR6(32), STR7(32), STR8(32), STRR(256) CHARACTER*16 STR1, STR2, STR3, STR4, STR5, STR6, STR7, STR8, STRR diff --git a/packages/seacas/applications/numbers/nu_sumelm.f b/packages/seacas/applications/numbers/nu_sumelm.f index bada09175b30..2206e224faa9 100644 --- a/packages/seacas/applications/numbers/nu_sumelm.f +++ b/packages/seacas/applications/numbers/nu_sumelm.f @@ -1,10 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: sumelm.f,v 1.8 2005/06/17 16:57:29 gdsjaar Exp $ C======================================================================= SUBROUTINE SUMELM (CRD, DISP, SVAR, MAT, NDIM, NUMNP, INDX, * ELMSEL, NAME, TIME, ITMSEL, AVER, AXI, DOABS, DODENS, @@ -90,7 +89,6 @@ SUBROUTINE SUMELM (CRD, DISP, SVAR, MAT, NDIM, NUMNP, INDX, GO TO 120 ELSE IF (ITMSEL(NLAST)) THEN - C ... If by density, then calculate volume of elements IF (DODENS) THEN C ... READ THE STEP AND STORE DISPLACEMENTS @@ -119,7 +117,6 @@ SUBROUTINE SUMELM (CRD, DISP, SVAR, MAT, NDIM, NUMNP, INDX, 56 continue TREAD = TIME(NLAST) - DO 60 I = 1, NELBLK+1 SUM(I) = 0.0 60 CONTINUE @@ -156,7 +153,7 @@ SUBROUTINE SUMELM (CRD, DISP, SVAR, MAT, NDIM, NUMNP, INDX, END IF GO TO 50 -C + 120 CONTINUE RETURN diff --git a/packages/seacas/applications/numbers/nu_summry.f b/packages/seacas/applications/numbers/nu_summry.f index 3127b6274d22..eb4372dbda72 100644 --- a/packages/seacas/applications/numbers/nu_summry.f +++ b/packages/seacas/applications/numbers/nu_summry.f @@ -1,35 +1,24 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: summry.f,v 1.2 2000/07/06 16:49:57 gdsjaar Exp $ -C $Log: summry.f,v $ -C Revision 1.2 2000/07/06 16:49:57 gdsjaar -C Changed real*4 to real -C -C Revision 1.1.1.1 1991/02/21 15:45:55 gdsjaar -C NUMBERS: Greg Sjaardema, initial Unix release -C -c Revision 1.1 1991/02/21 15:45:54 gdsjaar -c Initial revision -c SUBROUTINE SUMMRY (TYPE, NUM, SELECT, VALUE, SUMR, ISUMR, IOFF) CHARACTER*(*) TYPE LOGICAL SELECT(*) REAL VALUE(*), SUMR(*) INTEGER ISUMR(*) -C + C ... TYPE = 'A' - calculate stats based on absolute values C NOTE: VALUE will be modified if this option used C = ' ' - calculate stats based on true value -C + C ... SUMR(1) = MINIMUM ISUMR(1) = ELEMENT NUMBER C ... SUMR(2) = MAXIMUM ISUMR(2) = ELEMENT NUMBER C ... SUMR(3) = AVERAGE C ... SUMR(4) = STD. DEV. -C + SUMR(1) = 1.0E30 SUMR(2) = -1.0E30 NUMSEL = 0 diff --git a/packages/seacas/applications/numbers/nu_sumnod.f b/packages/seacas/applications/numbers/nu_sumnod.f index 00c1f69b9062..b9a1f4983bda 100644 --- a/packages/seacas/applications/numbers/nu_sumnod.f +++ b/packages/seacas/applications/numbers/nu_sumnod.f @@ -1,10 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: sumnod.f,v 1.4 1999/02/16 21:38:01 gdsjaar Exp $ SUBROUTINE SUMNOD (CRD, DISP, SVAR, NDIM, NUMNP, INDX, * NODSEL, NAME, TIME, ITMSEL, AXI, AVER, DOABS) @@ -98,7 +97,7 @@ SUBROUTINE SUMNOD (CRD, DISP, SVAR, NDIM, NUMNP, INDX, 90 CONTINUE END IF END IF -C + SUM = SUM / RSEL IF (SUM .GT. RMAX) THEN RMAX = SUM @@ -116,7 +115,7 @@ SUBROUTINE SUMNOD (CRD, DISP, SVAR, NDIM, NUMNP, INDX, END IF GO TO 50 -C + 120 CONTINUE eng1 = engnot(rmin,2) eng2 = engnot(time(itmn), 2) diff --git a/packages/seacas/applications/numbers/nu_timblk.blk b/packages/seacas/applications/numbers/nu_timblk.blk index f65c469e4d0f..44c8fc1528de 100644 --- a/packages/seacas/applications/numbers/nu_timblk.blk +++ b/packages/seacas/applications/numbers/nu_timblk.blk @@ -1,17 +1,12 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: timblk.blk,v 1.1 1991/02/21 15:46:00 gdsjaar Exp $ -C $Log: timblk.blk,v $ -C Revision 1.1 1991/02/21 15:46:00 gdsjaar -C Initial revision -C COMMON /TIMBLK/ NSTEP, NLAST, TMIN, TMAX, STMIN, STMAX, STDEL, * LSTSEL -C + C NSTEP - NUMBER OF TIMESTEPS READ FROM DATABASE C NLAST - CURRENT POSITION OF DATABASE C TMIN - MINIMUM TIME READ FROM DATABASE @@ -20,4 +15,3 @@ C STMIN - MINIMUM SELECTED TIME C STMAX - MAXIMUM SELECTED TIME C STDEL - SELECTED TIME INCREMENT (IF = 0, ALL SELECTED) C LSTSEL - NUMBER OF LAST SELECTED TIMESTEP -C diff --git a/packages/seacas/applications/numbers/nu_traniq.f b/packages/seacas/applications/numbers/nu_traniq.f index 2dfaf9accef3..8a77ecfee534 100644 --- a/packages/seacas/applications/numbers/nu_traniq.f +++ b/packages/seacas/applications/numbers/nu_traniq.f @@ -1,20 +1,15 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: traniq.f,v 1.1 1991/02/21 15:46:03 gdsjaar Exp $ -C $Log: traniq.f,v $ -C Revision 1.1 1991/02/21 15:46:03 gdsjaar -C Initial revision -C SUBROUTINE TRANIQ (LSTSN, MAP, MASSLV, NSEG, IDIM) DIMENSION LSTSN(*), MAP(*), MASSLV(IDIM,*) -C + DO 10 I=1,NSEG MASSLV(1,MAP(I)) = LSTSN(I) 10 CONTINUE -C + RETURN END diff --git a/packages/seacas/applications/numbers/nu_trblk.f b/packages/seacas/applications/numbers/nu_trblk.f index 61cd7de8a356..c7700c122273 100644 --- a/packages/seacas/applications/numbers/nu_trblk.f +++ b/packages/seacas/applications/numbers/nu_trblk.f @@ -1,24 +1,12 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: trblk.f,v 1.2 1996/07/01 14:09:12 gdsjaar Exp $ -C $Log: trblk.f,v $ -C Revision 1.2 1996/07/01 14:09:12 gdsjaar -C Trap exodus files with non-hex (3d) and non-quad (2d) element -C blocks. Exits with error message instead of core dump -C -C Revision 1.1.1.1 1991/02/21 15:46:06 gdsjaar -C NUMBERS: Greg Sjaardema, initial Unix release -C -c Revision 1.1 1991/02/21 15:46:05 gdsjaar -c Initial revision -c SUBROUTINE TRBLK (IDELB, NUMELB, NUMLNK, MAT, NELBLK, NNODES) DIMENSION IDELB(*), NUMELB(*), NUMLNK(*), MAT(6,*) -C + IBEG = 0 IEND = 0 DO 10 I=1, NELBLK diff --git a/packages/seacas/applications/numbers/nu_unique.f b/packages/seacas/applications/numbers/nu_unique.f index 59361dd17d89..97c7e4b708ee 100644 --- a/packages/seacas/applications/numbers/nu_unique.f +++ b/packages/seacas/applications/numbers/nu_unique.f @@ -1,22 +1,17 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: unique.f,v 1.1 1991/02/21 15:46:09 gdsjaar Exp $ -C $Log: unique.f,v $ -C Revision 1.1 1991/02/21 15:46:09 gdsjaar -C Initial revision -C SUBROUTINE UNIQUE (LSTSN, NSEG, MAP, ITMP, NUMNIQ, NUMNP) -C + C*********************************************************************** -C + C DESCRIPTION: C This routine determines the number of unique node numbers in C a side set. -C + C FORMAL PARAMETERS: C LSTSN INTEGER List of nodes on this boundary C NSEG INTEGER Number of nodes in side set @@ -24,16 +19,16 @@ SUBROUTINE UNIQUE (LSTSN, NSEG, MAP, ITMP, NUMNIQ, NUMNP) C ITMP INTEGER Temporary array for sorting nodes C NUMNIQ INTEGER Number of unique nodes C NDIM INTEGER Number of spatial dimensions -C + C CALLED BY: -C + C*********************************************************************** -C + DIMENSION LSTSN(*), MAP(*), ITMP(*) -C + CALL INIINT (NSEG, 0, MAP) CALL INIINT (NUMNP, 0, ITMP) -C + NUMNIQ = 0 DO 30 I = 1 , NSEG IF ( ITMP(LSTSN(I)) .EQ. 0 ) THEN @@ -44,6 +39,6 @@ SUBROUTINE UNIQUE (LSTSN, NSEG, MAP, ITMP, NUMNIQ, NUMNP) MAP(I) = ITMP(LSTSN(I)) END IF 30 CONTINUE -C + RETURN END diff --git a/packages/seacas/applications/numbers/nu_varcnt.blk b/packages/seacas/applications/numbers/nu_varcnt.blk index a1dedc7834f3..15160b6ce00a 100644 --- a/packages/seacas/applications/numbers/nu_varcnt.blk +++ b/packages/seacas/applications/numbers/nu_varcnt.blk @@ -1,21 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: varcnt.blk,v 1.2 1999/02/16 21:38:02 gdsjaar Exp $ -C $Log: varcnt.blk,v $ -C Revision 1.2 1999/02/16 21:38:02 gdsjaar -C Converted to read exodusII database format. Somewhat tested, not -C ready for production yet. -C -C Revision 1.1.1.1 1991/02/21 15:46:15 gdsjaar -C NUMBERS: Greg Sjaardema, initial Unix release -C -CRevision 1.1 1991/02/21 15:46:14 gdsjaar -CInitial revision -C COMMON /VARCNT/ NVARGL, NVARNP, NVAREL C NVARGL INTEGER Number of GLOBAL variables C NVARNP INTEGER Number of NODAL variables diff --git a/packages/seacas/applications/numbers/nu_vol2d.f b/packages/seacas/applications/numbers/nu_vol2d.f index 37d32f5c0053..b61fee72fba5 100644 --- a/packages/seacas/applications/numbers/nu_vol2d.f +++ b/packages/seacas/applications/numbers/nu_vol2d.f @@ -1,18 +1,18 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details SUBROUTINE VOL2D( COORD, LSTSN, NSEG, VOLUME, NDIM, NUMESS, AXI, * CENT, NUMNP, CENTER) -C + C*********************************************************************** -C + C DESCRIPTION: C This routine computes the volume of a cavity formed C by the boundary of an element side set flag -C + C FORMAL PARAMETERS: C COORD REAL Nodal Coordinates C LSTSN INTEGER List of nodes on this boundary @@ -22,39 +22,39 @@ SUBROUTINE VOL2D( COORD, LSTSN, NSEG, VOLUME, NDIM, NUMESS, AXI, C NUMESS INTEGER Number of Element Side Set Flags C AXI LOGICAL TRUE if axisymmetric mesh C CENT REAL Apex of volume triangles -C + C CALLED BY: -C + C*********************************************************************** -C + LOGICAL AXI, CENTER DIMENSION COORD(NUMNP, *), LSTSN(*), CENT(2) TWOPI = 2.0 * ATAN2(0.0, -1.0) -C + VOLUME = 0.0 -C + C ... CALCULATE APPROXIMATE CENTROID OF CAVITY. ASSUME XC ON C SYMMETRY AXIS. -C + IF (.NOT. CENTER) THEN DO 10 KSEG = 1 , 2*NSEG J = LSTSN(KSEG) -C + CENT(2) = CENT(2) + COORD(J,2) 10 CONTINUE CENT(2) = CENT(2) / (2 * NSEG) END IF -C + DO 20 KSEG = 1 , NSEG J = LSTSN(2*KSEG) I = LSTSN(2*KSEG - 1) -C + X1 = COORD(I,1) - CENT(1) X2 = COORD(J,1) - CENT(1) -C + Y1 = COORD(I,2) - CENT(2) Y2 = COORD(J,2) - CENT(2) -C + VP = (Y1 * X2 - Y2 * X1) / 2.0 IF (AXI) THEN XC = (X1 + X2) / 3.0 @@ -62,6 +62,6 @@ SUBROUTINE VOL2D( COORD, LSTSN, NSEG, VOLUME, NDIM, NUMESS, AXI, END IF VOLUME = VOLUME + VP 20 CONTINUE -C + RETURN END diff --git a/packages/seacas/applications/numbers/nu_vol3d.f b/packages/seacas/applications/numbers/nu_vol3d.f index c1631fbfe64a..c8dd1f091f95 100644 --- a/packages/seacas/applications/numbers/nu_vol3d.f +++ b/packages/seacas/applications/numbers/nu_vol3d.f @@ -1,18 +1,18 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details SUBROUTINE VOL3D( COORD, LSTSN, NSEG, VOLUME, NDIM, NUMESS, * CENT, NUMNP, CENTER) -C + C*********************************************************************** -C + C DESCRIPTION: C This routine computes the volume of a cavity formed C by the boundary of an element side set flag -C + C FORMAL PARAMETERS: C COORD REAL Nodal Coordinates C LSTSN INTEGER List of nodes on this boundary @@ -20,16 +20,16 @@ SUBROUTINE VOL3D( COORD, LSTSN, NSEG, VOLUME, NDIM, NUMESS, C VOLUME REAL Volume of this cavity C NDIM INTEGER Number of Nodes C CENT REAL Apex of Cavity Volume pentahedra -C + C CALLED BY: -C + C*********************************************************************** -C + DIMENSION COORD(NUMNP, *), LSTSN(*), CENT(3) LOGICAL CENTER -C + VOLUME = 0.0 -C + IF (.NOT. CENTER) THEN XC = 0.0 YC = 0.0 @@ -39,22 +39,22 @@ SUBROUTINE VOL3D( COORD, LSTSN, NSEG, VOLUME, NDIM, NUMESS, K = LSTSN(4*KSEG - 1) J = LSTSN(4*KSEG - 2) I = LSTSN(4*KSEG - 3) -C + X1 = COORD(I,1) X2 = COORD(J,1) X3 = COORD(K,1) X4 = COORD(L,1) -C + Y1 = COORD(I,2) Y2 = COORD(J,2) Y3 = COORD(K,2) Y4 = COORD(L,2) -C + Z1 = COORD(I,3) Z2 = COORD(J,3) Z3 = COORD(K,3) Z4 = COORD(L,3) -C + XC = XC + x1 + x2 + x3 + x4 YC = YC + y1 + y2 + y3 + y4 ZC = ZC + z1 + z2 + z3 + z4 @@ -63,32 +63,32 @@ SUBROUTINE VOL3D( COORD, LSTSN, NSEG, VOLUME, NDIM, NUMESS, CENT(2) = YC / (4*NSEG) CENT(3) = ZC / (4*NSEG) END IF -C + X5 = CENT(1) Y5 = CENT(2) Z5 = CENT(3) -C + DO 100 KSEG = 1 , NSEG L = LSTSN(4*KSEG) K = LSTSN(4*KSEG - 1) J = LSTSN(4*KSEG - 2) I = LSTSN(4*KSEG - 3) -C + X1 = COORD(I,1) X2 = COORD(J,1) X3 = COORD(K,1) X4 = COORD(L,1) -C + Y1 = COORD(I,2) Y2 = COORD(J,2) Y3 = COORD(K,2) Y4 = COORD(L,2) -C + Z1 = COORD(I,3) Z2 = COORD(J,3) Z3 = COORD(K,3) Z4 = COORD(L,3) -C + Z13 = Z1 - Z3 Z24 = Z2 - Z4 Z31 = Z3 - Z1 @@ -97,7 +97,7 @@ SUBROUTINE VOL3D( COORD, LSTSN, NSEG, VOLUME, NDIM, NUMESS, Z52 = Z5 - Z2 Z53 = Z5 - Z3 Z54 = Z5 - Z4 -C + VP = ((2.*Y5 - Y3) * Z42 + Y2 * (Z53 + Z54) - * Y4 * (Z53 + Z52) ) * X1 + * ( (Y4 - 2.*Y5) * Z31 + Y3 * (Z54 + Z51) - @@ -109,6 +109,6 @@ SUBROUTINE VOL3D( COORD, LSTSN, NSEG, VOLUME, NDIM, NUMESS, * ((Y2 - Y4) * (Z3 - Z1) + (Y3 - Y1) *(Z4 - Z2)) * 2. * X5 VOLUME = VOLUME + VP / 12.0 100 CONTINUE -C + RETURN END diff --git a/packages/seacas/applications/numbers/numbers.f b/packages/seacas/applications/numbers/numbers.f index 85541e59a432..844c77c3e44f 100644 --- a/packages/seacas/applications/numbers/numbers.f +++ b/packages/seacas/applications/numbers/numbers.f @@ -1,20 +1,17 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C + C See packages/seacas/LICENSE for details -C $Id: numbers.f,v 1.18 2005/07/11 19:48:48 gdsjaar Exp $ PROGRAM NUMBER -C + C ... Program to calculate the centroid location and the C mass moment of inertia for a axisymmetric and plane 2-D mesh C and a 3-D mesh defined in the genesis format. -C + C LINK WITH SUPES LIBRARY -c include 'exodusII.inc' - include 'argparse.inc' include 'nu_progqa.blk' include 'nu_numg.blk' @@ -26,7 +23,8 @@ PROGRAM NUMBER include 'nu_nset.blk' include 'nu_io.blk' include 'nu_ndisp.blk' -C + include 'argparse.inc' + CHARACTER*2048 DBNAME, SCRATCH CHARACTER*(MXLNLN) TITLE @@ -44,17 +42,26 @@ PROGRAM NUMBER C UNIT 6 = STANDARD OUTPUT C 7 = ASCII OUTPUT C 9 = BINARY MESH INPUT (GENESIS) -C + ITERM = 6 IHARD = 7 - NDB = 9 + NDB = 0 CALL STRTUP (QAINFO) -C + CALL BANNER (ITERM, QAINFO, + & 'A GENESIS/EXODUS DATABASE INFORMATION PROGRAM', + & ' ', ' ') + CALL BANNER (IHARD, QAINFO, + & 'A GENESIS/EXODUS DATABASE INFORMATION PROGRAM', + & ' ', ' ') + call cpyrgt (ITERM, '1988') + call cpyrgt (IHARD, '1988') + C ... GET FILENAMES: -C + C .. Get filename from command line. If not specified, emit error message NARG = argument_count() + if (narg .lt. 1) then CALL PRTERR ('FATAL', 'Filename(s) not specified.') CALL PRTERR ('FATAL', @@ -91,15 +98,6 @@ PROGRAM NUMBER CALL PRTERR ('FATAL', SCRATCH(:LENSTR(SCRATCH))) GOTO 60 END IF -C - CALL BANNER (ITERM, QAINFO, - & 'A GENESIS/EXODUS DATABASE INFORMATION PROGRAM', - & ' ', ' ') - CALL BANNER (IHARD, QAINFO, - & 'A GENESIS/EXODUS DATABASE INFORMATION PROGRAM', - & ' ', ' ') - call cpyrgt (ITERM, '1988') - call cpyrgt (IHARD, '1988') CALL MDINIT (A) CALL MCINIT (C) @@ -130,7 +128,7 @@ PROGRAM NUMBER AXI = .TRUE. EXODUS = .FALSE. NNODES = 2**NDIM -C + CALL MDRSRV ('CRD', IR, NUMNP*NDIM) IRX = IR IRY = IR + NUMNP @@ -174,16 +172,16 @@ PROGRAM NUMBER CALL MDDEL ('NUMLNK') CALL MDDEL ('NUMELB') CALL MDDEL ('NUMATR') -C + C ... BOUNDARY CONDITION FLAGS -C + C -- Node Sets: C INS1 = IDNPS (NUMNPS) NODAL POINT SET IDS C INS2 = NNNPS (NUMNPS) NODAL POINT SET COUNTS C INS3 = IPTNPS (NUMNPS) NODAL POINT SET POINTER C INS4 = LSTNPS (LNPSNL) NODAL POINT SET NODE LIST C INS5 = FACNPS (LNPSNL) NODAL POINT DISTRIBUTION FACTORS -C + C -- Element Side Sets: C IBC1 = IDESS (NUMESS) ELEMENT SIDE SET IDS C IBC2 = NEESS (NUMESS) ELEMENT SIDE SET ELEMENT COUNTS @@ -193,7 +191,7 @@ PROGRAM NUMBER C IBC6 = LTEESS (LESSEL) ELEMENT SIDE SET ELEMENT LIST C IBC7 = LTNESS (LESSNL) ELEMENT SIDE SET NODE LIST C IBC8 = FACESS (LESSNL) ELEMENT SIDE SET DISTRIBUTION FACTORS -C + CALL MDRSRV ('IDNPS', INS1, NUMNPS) CALL MDRSRV ('NNNPS', INS2, NUMNPS) CALL MDRSRV ('NDNPS', INS6, NUMNPS) @@ -258,9 +256,8 @@ PROGRAM NUMBER if (ierr .ne. 0) go to 60 end if -C C ... TRY TO READ QA RECORDS. IF EOF THEN NOT EXODUS FORMAT -C + call exinq(ndb, EXQA, nqarec, rdum, cdum, ierr) call exinq(ndb, EXINFO, ninfo, rdum, cdum, ierr) call mcrsrv('QAREC', kqarec, nqarec * 4 * MXSTLN) @@ -355,15 +352,19 @@ PROGRAM NUMBER 60 CONTINUE call addlog (QAINFO(1)(:lenstr(QAINFO(1)))) CALL WRAPUP (QAINFO(1)) - call exclos(ndb, ierr) + if (ndb .gt. 0) then + call exclos(ndb, ierr) + end if STOP END + subroutine exgqaw(ndb, qarec, ierr) include 'exodusII.inc' character*(mxstln) qarec(4, *) call exgqa(ndb, qarec, ierr) return end + subroutine exginw(ndb, info, ierr) include 'exodusII.inc' character*(mxlnln) info(*) diff --git a/packages/seacas/applications/slice/CMakeLists.txt b/packages/seacas/applications/slice/CMakeLists.txt index 8db9e829d532..c6e4e1b1abed 100644 --- a/packages/seacas/applications/slice/CMakeLists.txt +++ b/packages/seacas/applications/slice/CMakeLists.txt @@ -19,6 +19,4 @@ TRIBITS_ADD_EXECUTABLE( INSTALLABLE ) - TRIBITS_SUBPACKAGE_POSTPROCESS() - diff --git a/packages/seacas/applications/slice/SL_SystemInterface.C b/packages/seacas/applications/slice/SL_SystemInterface.C index d2c316da144b..2ce328e9aaf9 100644 --- a/packages/seacas/applications/slice/SL_SystemInterface.C +++ b/packages/seacas/applications/slice/SL_SystemInterface.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "SL_SystemInterface.h" @@ -19,12 +19,6 @@ #include #include -#if defined(__PUMAGON__) -#define NPOS (size_t) - 1 -#else -#define NPOS std::string::npos -#endif - namespace { int get_free_descriptor_count(); bool str_equal(const std::string &s1, const std::string &s2) diff --git a/packages/seacas/applications/slice/SL_SystemInterface.h b/packages/seacas/applications/slice/SL_SystemInterface.h index e09579f0b329..d47c2cb331de 100644 --- a/packages/seacas/applications/slice/SL_SystemInterface.h +++ b/packages/seacas/applications/slice/SL_SystemInterface.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef Sierra_SystemInterface_h #define Sierra_SystemInterface_h diff --git a/packages/seacas/applications/slice/SL_Version.h b/packages/seacas/applications/slice/SL_Version.h index 5b2131459af5..a9fe6e2cae92 100644 --- a/packages/seacas/applications/slice/SL_Version.h +++ b/packages/seacas/applications/slice/SL_Version.h @@ -1,15 +1,15 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef SEACAS_Version_h #define SEACAS_Version_h static char const *qainfo[] = { "slice", - "2020/04/21", - "0.9.93", + "2020/06/10", + "0.9.94", }; #endif // SEACAS_Version_h diff --git a/packages/seacas/applications/slice/Slice.C b/packages/seacas/applications/slice/Slice.C index 95312a4230f5..75555fadc77f 100644 --- a/packages/seacas/applications/slice/Slice.C +++ b/packages/seacas/applications/slice/Slice.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include @@ -1409,7 +1409,7 @@ namespace { } // Output histogram.. fmt::print(stderr, "Processor count per node histogram:\n"); - for (size_t i = 0; i < proc_histo.size(); i++) { + for (size_t i = 1; i < proc_histo.size(); i++) { if (proc_histo[i] > 0) { fmt::print(stderr, "\tNodes on {:2n} processors = {:12n}\t({:2})%\n", i, proc_histo[i], (proc_histo[i] * 100 + node_count / 2) / node_count); diff --git a/packages/seacas/applications/slice/new-version.txt b/packages/seacas/applications/slice/new-version.txt index c43df2a1feb3..260e79c00183 100644 --- a/packages/seacas/applications/slice/new-version.txt +++ b/packages/seacas/applications/slice/new-version.txt @@ -1,8 +1,6 @@ Assign elements to processors evenly #elem/#proc -- - - std::vector> node_to_proc(#node) blk = 1 st_blk = 0 @@ -32,7 +30,6 @@ for each (proc) { ... Add the granularity of element blocks Each block has beg, end range, and connectivity size. - ... Better to iterate by block: foreach (element block) @@ -40,13 +37,10 @@ foreach (element block) find st_proc find end_proc - proc for an element (0-based): - proc = elem / elem-per-proc + - elem-per-proc = #elem / #proc extra = #elem % #proc diff --git a/packages/seacas/applications/txtexo/dboelb.f b/packages/seacas/applications/txtexo/dboelb.f index e80f5fa80f13..18bc4ea787b1 100644 --- a/packages/seacas/applications/txtexo/dboelb.f +++ b/packages/seacas/applications/txtexo/dboelb.f @@ -1,10 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C$Id: dboelb.f,v 1.2 2007/10/17 18:47:21 gdsjaar Exp $ C======================================================================= SUBROUTINE DBOELB (NDB, NELBS, NELBE, & IDELB, NUMELB, NUMLNK, NUMATR, LINK, NAMELB, ATRIB) diff --git a/packages/seacas/applications/txtexo/rdeb1.f b/packages/seacas/applications/txtexo/rdeb1.f index 2028bc841694..2ef9a0919955 100644 --- a/packages/seacas/applications/txtexo/rdeb1.f +++ b/packages/seacas/applications/txtexo/rdeb1.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/txtexo/rdelb.f b/packages/seacas/applications/txtexo/rdelb.f index 15c68a64bfe6..3efe1bbca8d6 100644 --- a/packages/seacas/applications/txtexo/rdelb.f +++ b/packages/seacas/applications/txtexo/rdelb.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/txtexo/rdess.f b/packages/seacas/applications/txtexo/rdess.f index 5e1453d4a893..8870e8f8bdd9 100644 --- a/packages/seacas/applications/txtexo/rdess.f +++ b/packages/seacas/applications/txtexo/rdess.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/txtexo/rdinit.f b/packages/seacas/applications/txtexo/rdinit.f index 275d963dfc19..53a107677720 100644 --- a/packages/seacas/applications/txtexo/rdinit.f +++ b/packages/seacas/applications/txtexo/rdinit.f @@ -1,10 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: rdinit.f,v 1.3 2007/10/17 18:47:22 gdsjaar Exp $ C======================================================================= SUBROUTINE RDINIT (NTXT, VERS, TITLE, NDIM, NUMNP, NUMEL, NELBLK, & NUMNPS, LNPSNL, LNPSDF, NUMESS, LESSEL, LESSNL, LESSDF, NAMLEN, diff --git a/packages/seacas/applications/txtexo/rdmap.f b/packages/seacas/applications/txtexo/rdmap.f index 86b1313b1f05..0a24bb82dad3 100644 --- a/packages/seacas/applications/txtexo/rdmap.f +++ b/packages/seacas/applications/txtexo/rdmap.f @@ -1,31 +1,8 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C -C See packages/seacas/LICENSE for details - -C $Id: rdmap.f,v 1.3 2007/10/17 18:47:22 gdsjaar Exp $ -C $Log: rdmap.f,v $ -C Revision 1.3 2007/10/17 18:47:22 gdsjaar -C Added copyright notice to all files. -C -C extexo2 is licensed under the BSD license -C -C Revision 1.2 1999/02/25 21:10:54 gdsjaar -C Changes to read text file generated by exotxt2 after this change: C -C Shortened text file a little bit. If the element maps are simple -C sequences (1..number_entries), the map is not written and instead the -C text 'sequence 1..numel' or 'sequence 1..numnp' is written. If not a -C simple sequence, then the text 'explicit map' is written followed by -C the map entries on the next line. -C -C Revision 1.1.1.1 1991/02/22 19:22:41 gdsjaar -C TxtExo - Convert Text File to EXODUS File -C -c Revision 1.1 1991/02/22 19:22:40 gdsjaar -c Initial revision -c +C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE RDMAP (NTXT, NUM, MAP, *) diff --git a/packages/seacas/applications/txtexo/rdnm1.f b/packages/seacas/applications/txtexo/rdnm1.f index 1b86ba8d3921..1d26459e7f0a 100644 --- a/packages/seacas/applications/txtexo/rdnm1.f +++ b/packages/seacas/applications/txtexo/rdnm1.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/txtexo/rdnps.f b/packages/seacas/applications/txtexo/rdnps.f index 748cab0d90a7..95dee4ec60e7 100644 --- a/packages/seacas/applications/txtexo/rdnps.f +++ b/packages/seacas/applications/txtexo/rdnps.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/txtexo/rdxyz.f b/packages/seacas/applications/txtexo/rdxyz.f index 0e61639ddfab..c15dd32e0e95 100644 --- a/packages/seacas/applications/txtexo/rdxyz.f +++ b/packages/seacas/applications/txtexo/rdxyz.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= @@ -30,7 +30,7 @@ SUBROUTINE RWXYZ (NTXT, NDB, NDIM, NUMNP, XN, YN, ZN, NAMECO, integer kval(3) real rval(3) integer ival(3) - + character*512 scratch CHARACTER*32 STRA diff --git a/packages/seacas/applications/txtexo/rwname.f b/packages/seacas/applications/txtexo/rwname.f index 368b9f4a3ce2..05d8e05e74a3 100644 --- a/packages/seacas/applications/txtexo/rwname.f +++ b/packages/seacas/applications/txtexo/rwname.f @@ -1,10 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: rwname.f,v 1.4 2007/10/17 18:47:22 gdsjaar Exp $ C======================================================================= SUBROUTINE RWNAME (NTXT, NDB, NELBLK, NVARGL, NVARNP, NVAREL, & A, C, KIEVOK, EXODUS, NAMLEN, *) @@ -81,7 +80,6 @@ SUBROUTINE RWNAME (NTXT, NDB, NELBLK, NVARGL, NVARNP, NVAREL, return 1 end if - C --Read the element block variable truth table CALL MDRSRV ('ISEVOK', KIEVOK, NELBLK * NVAREL) C ... Temporary logical array @@ -132,4 +130,3 @@ subroutine rwnam1(ntxt, ndb, flag, nvar, names, namlen, *) CALL PRTERR ('FATAL', 'Writing VARIABLE NAMES') return 1 end - diff --git a/packages/seacas/applications/txtexo/rwpval.f b/packages/seacas/applications/txtexo/rwpval.f index c5d80c7fcd2d..52e175bb13a3 100644 --- a/packages/seacas/applications/txtexo/rwpval.f +++ b/packages/seacas/applications/txtexo/rwpval.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details subroutine rwpval(ntxt, ndb, a, ia, c, nelblk, numnps, numess, diff --git a/packages/seacas/applications/txtexo/rwpval1.f b/packages/seacas/applications/txtexo/rwpval1.f index 54dc0df8cae7..afcfaa5f8e48 100644 --- a/packages/seacas/applications/txtexo/rwpval1.f +++ b/packages/seacas/applications/txtexo/rwpval1.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C************************************************************************ diff --git a/packages/seacas/applications/txtexo/rwqa.f b/packages/seacas/applications/txtexo/rwqa.f index 6bdd4e6fbcf6..cbef88b0b97c 100644 --- a/packages/seacas/applications/txtexo/rwqa.f +++ b/packages/seacas/applications/txtexo/rwqa.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/txtexo/rwstep.f b/packages/seacas/applications/txtexo/rwstep.f index f97260f7cd5a..f4d27e547cd1 100644 --- a/packages/seacas/applications/txtexo/rwstep.f +++ b/packages/seacas/applications/txtexo/rwstep.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/applications/txtexo/txtexo.F b/packages/seacas/applications/txtexo/txtexo.F index 2ef2af9e8db8..fb34b7e4ff9b 100644 --- a/packages/seacas/applications/txtexo/txtexo.F +++ b/packages/seacas/applications/txtexo/txtexo.F @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/libraries/aprepro_lib/apr_aprepro.cc b/packages/seacas/libraries/aprepro_lib/apr_aprepro.cc index 03abaeee8e80..6aefa97caa4d 100644 --- a/packages/seacas/libraries/aprepro_lib/apr_aprepro.cc +++ b/packages/seacas/libraries/aprepro_lib/apr_aprepro.cc @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "apr_scanner.h" // for Scanner @@ -24,7 +24,7 @@ namespace { const unsigned int HASHSIZE = 5939; - const char * version_string = "5.16 (2020/06/09)"; + const char * version_string = "5.17 (2020/07/27)"; void output_copyright(); diff --git a/packages/seacas/libraries/aprepro_lib/apr_array.cc b/packages/seacas/libraries/aprepro_lib/apr_array.cc index 62146bd0d518..e198c28a4900 100644 --- a/packages/seacas/libraries/aprepro_lib/apr_array.cc +++ b/packages/seacas/libraries/aprepro_lib/apr_array.cc @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "aprepro.h" // for array, Aprepro, etc diff --git a/packages/seacas/libraries/aprepro_lib/apr_array.h b/packages/seacas/libraries/aprepro_lib/apr_array.h index 13904284475c..27cc5cb5d365 100644 --- a/packages/seacas/libraries/aprepro_lib/apr_array.h +++ b/packages/seacas/libraries/aprepro_lib/apr_array.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #ifndef SEAMS_ARRAY_H diff --git a/packages/seacas/libraries/aprepro_lib/apr_builtin.cc b/packages/seacas/libraries/aprepro_lib/apr_builtin.cc index 64aac84827df..ccccf2c814b1 100644 --- a/packages/seacas/libraries/aprepro_lib/apr_builtin.cc +++ b/packages/seacas/libraries/aprepro_lib/apr_builtin.cc @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "apr_builtin.h" diff --git a/packages/seacas/libraries/aprepro_lib/apr_builtin.h b/packages/seacas/libraries/aprepro_lib/apr_builtin.h index 7b773be1fedd..3445dfe5159c 100644 --- a/packages/seacas/libraries/aprepro_lib/apr_builtin.h +++ b/packages/seacas/libraries/aprepro_lib/apr_builtin.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #ifndef APR_BUILTIN_H diff --git a/packages/seacas/libraries/aprepro_lib/apr_exodus.cc b/packages/seacas/libraries/aprepro_lib/apr_exodus.cc index ed9bf189c4b8..111d1bd6ebf2 100644 --- a/packages/seacas/libraries/aprepro_lib/apr_exodus.cc +++ b/packages/seacas/libraries/aprepro_lib/apr_exodus.cc @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #if defined(EXODUS_SUPPORT) diff --git a/packages/seacas/libraries/aprepro_lib/apr_getline_int.c b/packages/seacas/libraries/aprepro_lib/apr_getline_int.c index c2c1fac4e0d7..3a05342ea9d8 100644 --- a/packages/seacas/libraries/aprepro_lib/apr_getline_int.c +++ b/packages/seacas/libraries/aprepro_lib/apr_getline_int.c @@ -1,4 +1,3 @@ -/* Based on: "$Id: getline.c,v 3.11 1993/12/02 15:54:31 thewalt Exp thewalt $"; */ /* * Copyright (C) 1991, 1992, 1993 by Chris Thewalt (thewalt@ce.berkeley.edu) diff --git a/packages/seacas/libraries/aprepro_lib/apr_getline_int.h b/packages/seacas/libraries/aprepro_lib/apr_getline_int.h index 33581c632776..a3f06ac853b3 100644 --- a/packages/seacas/libraries/aprepro_lib/apr_getline_int.h +++ b/packages/seacas/libraries/aprepro_lib/apr_getline_int.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef GETLINE_H diff --git a/packages/seacas/libraries/aprepro_lib/apr_init.cc b/packages/seacas/libraries/aprepro_lib/apr_init.cc index d777c9a8322f..9fb64af7841c 100644 --- a/packages/seacas/libraries/aprepro_lib/apr_init.cc +++ b/packages/seacas/libraries/aprepro_lib/apr_init.cc @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details /*** diff --git a/packages/seacas/libraries/aprepro_lib/apr_scanner.cc b/packages/seacas/libraries/aprepro_lib/apr_scanner.cc index 84c37ca643f8..9aac75da87d8 100644 --- a/packages/seacas/libraries/aprepro_lib/apr_scanner.cc +++ b/packages/seacas/libraries/aprepro_lib/apr_scanner.cc @@ -975,7 +975,7 @@ static yyconst flex_int16_t yy_rule_linenum[102] = { * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/aprepro_lib/apr_scanner.h b/packages/seacas/libraries/aprepro_lib/apr_scanner.h index 5016ead6ba1a..d29575c4ca0b 100644 --- a/packages/seacas/libraries/aprepro_lib/apr_scanner.h +++ b/packages/seacas/libraries/aprepro_lib/apr_scanner.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #ifndef EXAMPLE_SCANNER_H diff --git a/packages/seacas/libraries/aprepro_lib/apr_stats.cc b/packages/seacas/libraries/aprepro_lib/apr_stats.cc index 4df3107fd52a..11b400dfa242 100644 --- a/packages/seacas/libraries/aprepro_lib/apr_stats.cc +++ b/packages/seacas/libraries/aprepro_lib/apr_stats.cc @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details /******************************************************************* diff --git a/packages/seacas/libraries/aprepro_lib/apr_stats.h b/packages/seacas/libraries/aprepro_lib/apr_stats.h index ecf6f5588c04..e1d6b4dcbaa4 100644 --- a/packages/seacas/libraries/aprepro_lib/apr_stats.h +++ b/packages/seacas/libraries/aprepro_lib/apr_stats.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #include "apr_util.h" // for check_valid_var, new_string, etc diff --git a/packages/seacas/libraries/aprepro_lib/apr_test.cc b/packages/seacas/libraries/aprepro_lib/apr_test.cc index ec7c8f65be8c..fa303068fc7d 100644 --- a/packages/seacas/libraries/aprepro_lib/apr_test.cc +++ b/packages/seacas/libraries/aprepro_lib/apr_test.cc @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include diff --git a/packages/seacas/libraries/aprepro_lib/apr_tokenize.cc b/packages/seacas/libraries/aprepro_lib/apr_tokenize.cc index 4482f7e50729..b743acffa80a 100644 --- a/packages/seacas/libraries/aprepro_lib/apr_tokenize.cc +++ b/packages/seacas/libraries/aprepro_lib/apr_tokenize.cc @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "apr_tokenize.h" diff --git a/packages/seacas/libraries/aprepro_lib/apr_tokenize.h b/packages/seacas/libraries/aprepro_lib/apr_tokenize.h index aef220a99a04..af1d3828e8db 100644 --- a/packages/seacas/libraries/aprepro_lib/apr_tokenize.h +++ b/packages/seacas/libraries/aprepro_lib/apr_tokenize.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #ifndef TOKENIZE_H diff --git a/packages/seacas/libraries/aprepro_lib/apr_units.cc b/packages/seacas/libraries/aprepro_lib/apr_units.cc index 8692f993ed91..4f0257a9100e 100644 --- a/packages/seacas/libraries/aprepro_lib/apr_units.cc +++ b/packages/seacas/libraries/aprepro_lib/apr_units.cc @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "apr_util.h" // for conv_string @@ -25,16 +25,16 @@ namespace { static std::string com = aprepro->getsym("_C_")->value.svar; return com; } - + void define_var(const char *name, double val, const char *label) { aprepro->add_variable(name, val, true); - if (echo) { - *(aprepro->infoStream) << comment() << " 1 " << std::left << std::setw(10) << name - << "\t= " << std::setw(14) << std::setprecision(7) << val << " " - << label << '\n'; + if (echo) { + *(aprepro->infoStream) << comment() << " 1 " << std::left << std::setw(10) << name + << "\t= " << std::setw(14) << std::setprecision(7) << val << " " + << label << '\n'; } - } + } void load_conversion(var_init *base, svar_init *label); constexpr double LBF_TO_N = 4.4482216152605; @@ -64,14 +64,14 @@ var_init si[] = { {"m" , 1.}, {"sec" , 1.}, - {"kg" , 1.}, + {"kg" , 1.}, {"degK" , 1.}, - {"rad" , 1.}, + {"rad" , 1.}, {nullptr, 0} }; //------------------------------------------------------------------------------------- -// This is cgs units: cm, sec, g +// This is cgs units: cm, sec, g svar_init cgs_label[] = { {"tout", "second"}, @@ -94,14 +94,14 @@ var_init cgs[] = { {"m" , 100.}, {"sec" , 1.}, - {"kg" , 1000.}, + {"kg" , 1000.}, {"degK" , 1.}, - {"rad" , 1.}, + {"rad" , 1.}, {nullptr, 0} }; //------------------------------------------------------------------------------------- -// This is cgs-ev units: cm, sec, g, eV +// This is cgs-ev units: cm, sec, g, eV svar_init cgs_ev_label[] = { {"tout", "second"}, @@ -124,14 +124,14 @@ var_init cgs_ev[] = { {"m" , 100.}, {"sec" , 1.}, - {"kg" , 1000.}, + {"kg" , 1000.}, {"degK" , 1./ 11604.5221}, - {"rad" , 1.}, + {"rad" , 1.}, {nullptr, 0} }; //------------------------------------------------------------------------------------- -// This is the shock units file: cm, usec, g +// This is the shock units file: cm, usec, g svar_init shock_label[] = { {"tout", "microsecond"}, @@ -154,14 +154,14 @@ var_init shock[] = { {"m" , 100.}, {"sec" , 1.0e6}, - {"kg" , 1000.}, + {"kg" , 1000.}, {"degK" , 1.}, - {"rad" , 1.}, + {"rad" , 1.}, {nullptr, 0} }; //------------------------------------------------------------------------------------- -// This is the "swap" units file: mm, usec, 1e-4g +// This is the "swap" units file: mm, usec, 1e-4g svar_init swap_label[] = { {"tout", "microsecond"}, @@ -184,14 +184,14 @@ var_init swap[] = { {"m" , 1000.}, {"sec" , 1000000.}, - {"kg" , 10000000.}, + {"kg" , 10000000.}, {"degK" , 1.}, - {"rad" , 1.}, + {"rad" , 1.}, {nullptr, 0} }; //------------------------------------------------------------------------------------- -// This is the ft-lbf-s units file +// This is the ft-lbf-s units file svar_init ft_lbf_s_label[] = { {"tout", "second"}, @@ -214,15 +214,15 @@ var_init ft_lbf_s[] = { {"m" , 1./.3048}, {"sec" , 1.}, - {"kg" , 1/4.5359237e-1/(9.806650/.3048)}, + {"kg" , 1/4.5359237e-1/(9.806650/.3048)}, {"degK" , 1.8}, - {"rad" , 1.}, + {"rad" , 1.}, {nullptr, 0} }; //------------------------------------------------------------------------------------- -// This is the ft-lbm-s units file +// This is the ft-lbm-s units file svar_init ft_lbm_s_label[] = { {"tout", "second"}, @@ -245,14 +245,14 @@ var_init ft_lbm_s[] = { {"m" , 1./.3048}, {"sec" , 1.}, - {"kg" , 1/.45359237}, + {"kg" , 1/.45359237}, {"degK" , 1.8}, - {"rad" , 1.}, + {"rad" , 1.}, {nullptr, 0} }; //------------------------------------------------------------------------------------- -// This is the in-lbf-s units file: inch, sec, lbf +// This is the in-lbf-s units file: inch, sec, lbf svar_init in_lbf_s_label[] = { {"tout", "second"}, @@ -275,9 +275,9 @@ var_init in_lbf_s[] = { {"m" , 1./2.54e-2}, {"sec" , 1.}, - {"kg" , 1/4.5359237e-1/(9.806650/2.54e-2)}, + {"kg" , 1/4.5359237e-1/(9.806650/2.54e-2)}, {"degK" , 1.8}, - {"rad" , 1.}, + {"rad" , 1.}, {nullptr, 0} }; @@ -352,7 +352,7 @@ void load_conversion(var_init *base, svar_init *label) double kg = base[2].value; double degK = base[3].value; double rad = base[4].value; - + double foot = m * 0.3048; double inch = foot / 12.0; @@ -437,7 +437,7 @@ void load_conversion(var_init *base, svar_init *label) define_var("year", 365.25 * 24. * 60. * 60. * sec, tout); define_var("decade", 10. * 365.25 * 24. * 60. * 60. * sec, tout); define_var("century", 100. * 365.25 * 24. * 60. * 60. * sec, tout); - + if (echo != 0) { *(aprepro->infoStream) << title_prefix << "Length (L)" << '\n'; } @@ -470,7 +470,7 @@ void load_conversion(var_init *base, svar_init *label) } define_var("ga", 9.806650 * m / (sec*sec), aout); - // Force (ML/T^2) + // Force (ML/T^2) if (echo != 0) { *(aprepro->infoStream) << title_prefix << "Force (ML/T^2)" << '\n'; } @@ -485,7 +485,7 @@ void load_conversion(var_init *base, svar_init *label) define_var("poundal", 1.382550e-1 * kg*m/(sec*sec), fout); define_var("ounce", LBF_TO_N * kg*m/(sec*sec)/16.0, fout); - // Mass (M) + // Mass (M) if (echo != 0) { *(aprepro->infoStream) << title_prefix << "Mass (M)" << '\n'; } @@ -494,8 +494,8 @@ void load_conversion(var_init *base, svar_init *label) define_var("lbm", 453.59237 * kg / 1000., mout); define_var("slug", 453.59237 * kg / 1000. * 32.17404856, mout); define_var("lbfs2pin", LBF_TO_N * kg/0.0254, mout); - - // Velocity (L/T) + + // Velocity (L/T) if (echo != 0) { *(aprepro->infoStream) << title_prefix << "Velocity (L/T)" << '\n'; } @@ -506,7 +506,7 @@ void load_conversion(var_init *base, svar_init *label) define_var("kph", (1000. * m) / (60. * 60. * sec), vout); define_var("kps", (1000. * m) / sec, vout); - // Volume (L^3) + // Volume (L^3) if (echo != 0) { *(aprepro->infoStream) << title_prefix << "Volume (L^3)" << '\n'; } @@ -514,7 +514,7 @@ void load_conversion(var_init *base, svar_init *label) define_var("gal", 3.785412 * (m*m*m)/1000., Vout); define_var("gallon", 3.785412 * (m*m*m)/1000., Vout); - // Density (M/L^3) + // Density (M/L^3) if (echo != 0) { *(aprepro->infoStream) << title_prefix << "Density (M/L^3)" << '\n'; } @@ -525,71 +525,71 @@ void load_conversion(var_init *base, svar_init *label) define_var("lbmpft3", (453.59237 * kg / 1000.) / (foot*foot*foot), dout); define_var("slugpft3", (453.59237 * kg / 1000. * 32.17404856) / (foot*foot*foot), dout); - // Power: (M L^2 / T^3) + // Power: (M L^2 / T^3) if (echo != 0) { *(aprepro->infoStream) << title_prefix << "Power (M L^2 / T^3)" << '\n'; } define_var("W", kg*m/(sec*sec)*m/sec, Pout); define_var("watt", kg*m/(sec*sec)*m/sec, Pout); - define_var("Hp", kg*m/(sec*sec)*m/sec * 746, Pout); // --- (electric horsepower) + define_var("Hp", kg*m/(sec*sec)*m/sec * 746, Pout); // --- (electric horsepower) - // Energy (ML^2/T^2) + // Energy (ML^2/T^2) if (echo != 0) { *(aprepro->infoStream) << title_prefix << "Energy (M L^2 / T^2)" << '\n'; } define_var("joule", kg*m/(sec*sec)*m, eout); define_var("J", kg*m/(sec*sec)*m, eout); - define_var("ftlbf", kg*m/(sec*sec)*m * 1.355818, eout); - define_var("Btu", kg*m/(sec*sec)*m * 1.05505585262e3, eout); //--- I18n Table + define_var("ftlbf", kg*m/(sec*sec)*m * 1.355818, eout); + define_var("Btu", kg*m/(sec*sec)*m * 1.05505585262e3, eout); //--- I18n Table define_var("erg", kg*m/(sec*sec)*m * 1.0e-7, eout); - define_var("calorie", kg*m/(sec*sec)*m * 4.18680, eout); // --- I18n Table - define_var("kwh", kg*m/(sec*sec)*m * 1000.0 * 60. * 60., eout); - define_var("therm", kg*m/(sec*sec)*m * 1.054804e8, eout); // --- U.S. - define_var("tonTNT", kg*m/(sec*sec)*m * 4.184e9, eout); + define_var("calorie", kg*m/(sec*sec)*m * 4.18680, eout); // --- I18n Table + define_var("kwh", kg*m/(sec*sec)*m * 1000.0 * 60. * 60., eout); + define_var("therm", kg*m/(sec*sec)*m * 1.054804e8, eout); // --- U.S. + define_var("tonTNT", kg*m/(sec*sec)*m * 4.184e9, eout); - // Pressure: (M/L/T^2) + // Pressure: (M/L/T^2) if (echo != 0) { *(aprepro->infoStream) << title_prefix << "Pressure (M/L/T^2)" << '\n'; } define_var("Pa", kg*m/(sec*sec) / (m*m), pout); define_var("pascal", kg*m/(sec*sec) / (m*m), pout); - define_var("MPa", kg*m/(sec*sec) / (m*m) * 1.0e6, pout); - define_var("GPa", kg*m/(sec*sec) / (m*m) * 1.0e9, pout); - define_var("bar", kg*m/(sec*sec) / (m*m) * 1.0e5, pout); - define_var("kbar", kg*m/(sec*sec) / (m*m) * 1.0e5 * 1.0e3, pout); - define_var("Mbar", kg*m/(sec*sec) / (m*m) * 1.0e5 * 1.0e6, pout); - define_var("psi", LBF_TO_N * kg*m/(sec*sec) / (inch*inch), pout); - define_var("ksi", LBF_TO_N * kg*m/(sec*sec) / (inch*inch) * 1000.0, pout); - define_var("psf", LBF_TO_N * kg*m/(sec*sec) / (foot*foot), pout); - define_var("atm", kg*m/(sec*sec) / (m*m) * 1.013250e5, pout); // --- std atmosphere - define_var("torr", kg*m/(sec*sec) / (m*m) * 1.013250e5 / 760.0, pout); - define_var("mHg", kg*m/(sec*sec) / (m*m) * 1.013250e5 / 760.0 * 1000.0, pout); - define_var("mmHg", kg*m/(sec*sec) / (m*m) * 1.013250e5 / 760.0, pout); + define_var("MPa", kg*m/(sec*sec) / (m*m) * 1.0e6, pout); + define_var("GPa", kg*m/(sec*sec) / (m*m) * 1.0e9, pout); + define_var("bar", kg*m/(sec*sec) / (m*m) * 1.0e5, pout); + define_var("kbar", kg*m/(sec*sec) / (m*m) * 1.0e5 * 1.0e3, pout); + define_var("Mbar", kg*m/(sec*sec) / (m*m) * 1.0e5 * 1.0e6, pout); + define_var("psi", LBF_TO_N * kg*m/(sec*sec) / (inch*inch), pout); + define_var("ksi", LBF_TO_N * kg*m/(sec*sec) / (inch*inch) * 1000.0, pout); + define_var("psf", LBF_TO_N * kg*m/(sec*sec) / (foot*foot), pout); + define_var("atm", kg*m/(sec*sec) / (m*m) * 1.013250e5, pout); // --- std atmosphere + define_var("torr", kg*m/(sec*sec) / (m*m) * 1.013250e5 / 760.0, pout); + define_var("mHg", kg*m/(sec*sec) / (m*m) * 1.013250e5 / 760.0 * 1000.0, pout); + define_var("mmHg", kg*m/(sec*sec) / (m*m) * 1.013250e5 / 760.0, pout); define_var("inHg", kg*m/(sec*sec) / (m*m) * 1.013250e5 / 760.0 * 25.4, pout); - define_var("inH2O", kg*m/(sec*sec) / (m*m) * 249.082, pout); - define_var("ftH2O", kg*m/(sec*sec) / (m*m) * 249.082 * 12.0, pout); + define_var("inH2O", kg*m/(sec*sec) / (m*m) * 249.082, pout); + define_var("ftH2O", kg*m/(sec*sec) / (m*m) * 249.082 * 12.0, pout); - // Temperature: + // Temperature: if (echo != 0) { *(aprepro->infoStream) << title_prefix << "Temperature" << '\n'; } - define_var("kelvin", degK, Tout); - define_var("degC", degK, Tout); - define_var("degF", 5./9. * degK, Tout); + define_var("kelvin", degK, Tout); + define_var("degC", degK, Tout); + define_var("degF", 5./9. * degK, Tout); define_var("degR", 5./9. * degK, Tout); define_var("rankine",5./9. * degK, Tout); define_var("eV", 11604.5221 * degK, Tout); - // Angular - if (echo != 0) { + // Angular + if (echo != 0) { *(aprepro->infoStream) << title_prefix << "Angular" << '\n'; } - define_var("rev", 2.0 * PI * rad, Aout); - define_var("deg", 2.0 * PI * rad / 360.0, Aout); - define_var("degree", 2.0 * PI * rad / 360.0, Aout); - define_var("arcmin", 2.0 * PI * rad / 360.0 / 60.0, Aout); - define_var("arcsec", 2.0 * PI * rad / 360.0 / 60.0 / 60.0, Aout); - define_var("grade", 2.0 * PI * rad / 360.0 * 0.9, Aout); + define_var("rev", 2.0 * PI * rad, Aout); + define_var("deg", 2.0 * PI * rad / 360.0, Aout); + define_var("degree", 2.0 * PI * rad / 360.0, Aout); + define_var("arcmin", 2.0 * PI * rad / 360.0 / 60.0, Aout); + define_var("arcsec", 2.0 * PI * rad / 360.0 / 60.0 / 60.0, Aout); + define_var("grade", 2.0 * PI * rad / 360.0 * 0.9, Aout); } } } // namespace SEAMS diff --git a/packages/seacas/libraries/aprepro_lib/apr_util.cc b/packages/seacas/libraries/aprepro_lib/apr_util.cc index b4af89586809..0bd4483ca0ae 100644 --- a/packages/seacas/libraries/aprepro_lib/apr_util.cc +++ b/packages/seacas/libraries/aprepro_lib/apr_util.cc @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "aprepro.h" // for symrec, Aprepro, etc diff --git a/packages/seacas/libraries/aprepro_lib/apr_util.h b/packages/seacas/libraries/aprepro_lib/apr_util.h index 8f5e8f218635..5547558dbe41 100644 --- a/packages/seacas/libraries/aprepro_lib/apr_util.h +++ b/packages/seacas/libraries/aprepro_lib/apr_util.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #ifndef SEAMS_UTIL_H diff --git a/packages/seacas/libraries/aprepro_lib/aprepro.h b/packages/seacas/libraries/aprepro_lib/aprepro.h index 573d4ab7f4cd..020826de71bc 100644 --- a/packages/seacas/libraries/aprepro_lib/aprepro.h +++ b/packages/seacas/libraries/aprepro_lib/aprepro.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details // Might be good to add a callback function which would be called diff --git a/packages/seacas/libraries/aprepro_lib/aprepro.ll b/packages/seacas/libraries/aprepro_lib/aprepro.ll index c2c8648d6fd7..90680a7fa550 100644 --- a/packages/seacas/libraries/aprepro_lib/aprepro.ll +++ b/packages/seacas/libraries/aprepro_lib/aprepro.ll @@ -4,7 +4,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/aprepro_lib/aprepro.yy b/packages/seacas/libraries/aprepro_lib/aprepro.yy index b289c728b8c5..927662f1d3a0 100644 --- a/packages/seacas/libraries/aprepro_lib/aprepro.yy +++ b/packages/seacas/libraries/aprepro_lib/aprepro.yy @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details %{ #include "aprepro.h" diff --git a/packages/seacas/libraries/aprepro_lib/init_structs.h b/packages/seacas/libraries/aprepro_lib/init_structs.h index 5bdb5179eb15..49ae86a5b2e8 100644 --- a/packages/seacas/libraries/aprepro_lib/init_structs.h +++ b/packages/seacas/libraries/aprepro_lib/init_structs.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #ifndef INIT_STRUCTS_H diff --git a/packages/seacas/libraries/aprepro_lib/rect.csv b/packages/seacas/libraries/aprepro_lib/rect.csv index da1b9017897f..164a2ef9fee6 100644 --- a/packages/seacas/libraries/aprepro_lib/rect.csv +++ b/packages/seacas/libraries/aprepro_lib/rect.csv @@ -1,27 +1,27 @@ - 0.0000000E+000, 1.0000000E+000, 1.0000000E+000, 1.0000000E+000, 1.0000000E+000, 1.0000000E+000, 1.0000000E+000, 1.0000000E+000, 1.0000000E+000, 1.0000000E+000, 1.0000000E+000, 0.0000000E+000, 0.0000000E+000, 0.0000000E+000, 0.0000000E+000, 0.0000000E+000, 0.0000000E+000, 0.0000000E+000, 0.0000000E+000, 0.0000000E+000, 0.0000000E+000, - 1.0000000E+000, 9.9987325E-001, 9.9983240E-001, 9.9990651E-001, 9.9989789E-001, 9.9992499E-001, 9.9984721E-001, 9.9994427E-001, 9.9994427E-001, 9.9983240E-001, 9.9996271E-001, -4.5274345E-003, 5.7027978E-003, -5.8559869E-003, 1.9343975E-003, -7.8065548E-004, -8.8399481E-003, 2.7661075E-004, 2.7661075E-004, -5.7027978E-003, -5.5178336E-005, - 2.0000000E+000, 9.9845402E-001, 9.9795569E-001, 9.9886038E-001, 9.9875437E-001, 9.9908526E-001, 9.9813713E-001, 9.9932017E-001, 9.9932017E-001, 9.9795569E-001, 9.9954507E-001, -1.5813503E-002, 1.9904266E-002, -2.0434428E-002, 6.7629179E-003, -2.7306099E-003, -3.0850279E-002, 9.6836870E-004, 9.6836870E-004, -1.9904266E-002, -1.9329815E-004, - 3.0000000E+000, 9.8850008E-001, 9.8478703E-001, 9.9155875E-001, 9.9071948E-001, 9.9319953E-001, 9.8617577E-001, 9.9493740E-001, 9.9493740E-001, 9.8478703E-001, 9.9660735E-001, -4.3172077E-002, 5.4060764E-002, -5.5412197E-002, 1.8587476E-002, -7.5305988E-003, -8.3722618E-002, 2.6867021E-003, 2.6867021E-003, -5.4060764E-002, -5.3878640E-004, - 4.0000000E+000, 9.3725124E-001, 9.1675084E-001, 9.5500497E-001, 9.4891136E-001, 9.6302090E-001, 9.2550860E-001, 9.7220689E-001, 9.7220689E-001, 9.1675084E-001, 9.8122817E-001, -1.0163823E-001, 1.2385676E-001, -1.2572195E-001, 4.5352196E-002, -1.8696437E-002, -1.9087532E-001, 6.8817499E-003, 6.8817499E-003, -1.2385676E-001, -1.4128781E-003, - 5.0000000E+000, 7.8303105E-001, 7.0605164E-001, 8.5835725E-001, 8.1694487E-001, 8.7447745E-001, 7.5307557E-001, 9.0174220E-001, 9.0174220E-001, 7.0605164E-001, 9.3150588E-001, -2.0138474E-001, 2.2491240E-001, -2.1632996E-001, 1.0157337E-001, -4.3924470E-002, -3.3720391E-001, 1.7841674E-002, 1.7841674E-002, -2.2491240E-001, -3.9246734E-003, - 6.0000000E+000, 5.8749345E-001, 3.8695099E-001, 7.9137664E-001, 6.1813726E-001, 7.7851770E-001, 5.6656449E-001, 8.0515035E-001, 8.0515035E-001, 3.8695099E-001, 8.5270233E-001, -3.5930230E-001, 3.6388926E-001, -2.8607711E-001, 2.2243683E-001, -9.9339161E-002, -4.8750546E-001, 4.6877710E-002, 4.6877710E-002, -3.6388926E-001, -1.1322374E-002, - 7.0000000E+000, 4.6344872E-001, 1.0229219E-001, 8.0829933E-001, 4.4029196E-001, 7.3698231E-001, 4.8475397E-001, 7.2838129E-001, 7.2838129E-001, 1.0229219E-001, 7.7315948E-001, -5.4237647E-001, 5.3764430E-001, -3.3117305E-001, 3.8892284E-001, -1.7303342E-001, -6.2736563E-001, 9.1142312E-002, 9.1142312E-002, -5.3764430E-001, -2.3508048E-002, - 8.0000000E+000, 3.3229323E-001, -1.6617592E-001, 8.1682480E-001, 2.3869311E-001, 6.7784736E-001, 3.9602058E-001, 6.1395585E-001, 6.1395585E-001, -1.6617592E-001, 6.4317238E-001, -6.9546982E-001, 6.5939491E-001, -3.7314835E-001, 5.4310201E-001, -2.4847898E-001, -7.4067666E-001, 1.4188296E-001, 1.4188296E-001, -6.5939491E-001, -3.8766269E-002, - 9.0000000E+000, 1.7891649E-001, -3.8710265E-001, 7.7759846E-001, 2.4504973E-002, 5.8619655E-001, 2.4753853E-001, 4.1731032E-001, 4.1731032E-001, -3.8710265E-001, 3.7160176E-001, -7.8821686E-001, 6.7346847E-001, -4.3138150E-001, 6.5352921E-001, -3.2160908E-001, -8.0977014E-001, 1.9927048E-001, 1.9927048E-001, -6.7346847E-001, -5.8633647E-002, - 1.0000000E+001, -1.3164902E-001, -3.4780142E-001, 4.3521191E-001, -1.6289891E-001, 3.7388776E-001, -1.8589330E-001, 1.4518026E-001, 1.4518026E-001, -3.4780142E-001, -5.6309359E-002, -4.9001652E-001, 1.6937775E-001, -4.6671727E-001, 4.5031630E-001, -3.1591122E-001, -4.9529438E-001, 2.1231109E-001, 2.1231109E-001, -1.6937775E-001, -7.0083742E-002, - 1.1000000E+001, -3.0354290E-001, -2.7338056E-001, 4.1332959E-001, -2.1787127E-001, 2.2159388E-001, -3.3819096E-001, 7.0249167E-002, 7.0249167E-002, -2.7338056E-001, -3.1344002E-002, -3.1706446E-001, -1.4814128E-001, -5.0188227E-001, 1.9065277E-001, -2.5176215E-001, -4.0779282E-001, 1.2496344E-001, 1.2496344E-001, 1.4814128E-001, -3.4715875E-002, - 1.2000000E+001, -4.4522164E-001, -1.7411905E-001, 3.9444488E-001, -2.5313100E-001, 3.9969083E-002, -4.6247794E-001, -2.6752493E-002, -2.6752493E-002, -1.7411905E-001, -1.0102207E-002, -1.3401686E-001, -4.1583551E-001, -5.3182392E-001, -9.0431610E-002, -1.6327360E-001, -3.1213863E-001, 1.3153708E-002, 1.3153708E-002, 4.1583551E-001, 1.0753390E-002, - 1.3000000E+001, -4.5323429E-001, -1.6423295E-001, 3.8739292E-001, -2.5626728E-001, 2.9752934E-002, -4.7057195E-001, -3.2971178E-002, -3.2971178E-002, -1.6423295E-001, -9.6751029E-003, -1.2079852E-001, -4.2910234E-001, -5.3396874E-001, -1.0716627E-001, -1.5985789E-001, -2.9942973E-001, 7.0692183E-003, 7.0692183E-003, 4.2910234E-001, 1.3542511E-002, - 1.4000000E+001, -4.5726698E-001, -1.5867506E-001, 3.8281814E-001, -2.5814655E-001, 2.4843886E-002, -4.7470613E-001, -3.6113640E-002, -3.6113640E-002, -1.5867506E-001, -9.5327622E-003, -1.1385876E-001, -4.3539545E-001, -5.3509827E-001, -1.1556516E-001, -1.5860438E-001, -2.9189408E-001, 4.1556594E-003, 4.1556594E-003, 4.3539545E-001, 1.4960681E-002, - 1.5000000E+001, -4.5911461E-001, -1.5590224E-001, 3.8036274E-001, -2.5909681E-001, 2.2634211E-002, -4.7661652E-001, -3.7572910E-002, -3.7572910E-002, -1.5590224E-001, -9.4830365E-003, -1.1053679E-001, -4.3817610E-001, -5.3561397E-001, -1.1945747E-001, -1.5815753E-001, -2.8802619E-001, 2.8475236E-003, 2.8475236E-003, 4.3817610E-001, 1.5623524E-002, - 1.6000000E+001, -4.6066116E-001, -1.5342130E-001, 3.7806694E-001, -2.5994574E-001, 2.0794998E-002, -4.7822516E-001, -3.8813403E-002, -3.8813403E-002, -1.5342130E-001, -9.4487263E-003, -1.0764499E-001, -4.4044676E-001, -5.3603753E-001, -1.2276455E-001, -1.5785521E-001, -2.8450448E-001, 1.7609882E-003, 1.7609882E-003, 4.4044676E-001, 1.6190051E-002, - 1.7000000E+001, -4.6131249E-001, -1.5232075E-001, 3.7701862E-001, -2.6032025E-001, 2.0020999E-002, -4.7890567E-001, -3.9343381E-002, -3.9343381E-002, -1.5232075E-001, -9.4362538E-003, -1.0638658E-001, -4.4138589E-001, -5.3621194E-001, -1.2417743E-001, -1.5774968E-001, -2.8292397E-001, 1.3045344E-003, 1.3045344E-003, 4.4138589E-001, 1.6433130E-002, - 1.8000000E+001, -4.6186461E-001, -1.5135669E-001, 3.7608528E-001, -2.6064663E-001, 1.9364133E-002, -4.7948413E-001, -3.9797192E-002, -3.9797192E-002, -1.5135669E-001, -9.4265965E-003, -1.0529653E-001, -4.4217335E-001, -5.3635716E-001, -1.2538742E-001, -1.5767126E-001, -2.8153034E-001, 9.1760240E-004, 9.1760240E-004, 4.4217335E-001, 1.6641840E-002, - 1.9000000E+001, -4.6209974E-001, -1.5093647E-001, 3.7567407E-001, -2.6078828E-001, 1.9083993E-002, -4.7973095E-001, -3.9991917E-002, -3.9991917E-002, -1.5093647E-001, -9.4227387E-003, -1.0482499E-001, -4.4250617E-001, -5.3641813E-001, -1.2590669E-001, -1.5764111E-001, -2.8092024E-001, 7.5272150E-004, 7.5272150E-004, 4.4250617E-001, 1.6731567E-002, - 2.0000000E+001, -4.6230071E-001, -1.5057238E-001, 3.7531563E-001, -2.6091069E-001, 1.8844288E-002, -4.7994216E-001, -4.0159119E-002, -4.0159119E-002, -1.5057238E-001, -9.4195623E-003, -1.0441818E-001, -4.4278939E-001, -5.3646977E-001, -1.2635262E-001, -1.5761694E-001, -2.8039033E-001, 6.1170959E-004, 6.1170959E-004, 4.4278939E-001, 1.6808699E-002, - 2.1000000E+001, -4.6247259E-001, -1.5025718E-001, 3.7500374E-001, -2.6101639E-001, 1.8639044E-002, -4.8012298E-001, -4.0302721E-002, -4.0302721E-002, -1.5025718E-001, -9.4169340E-003, -1.0406733E-001, -4.4303070E-001, -5.3651357E-001, -1.2673565E-001, -1.5759747E-001, -2.7993062E-001, 4.9102410E-004, 4.9102410E-004, 4.4303070E-001, 1.6875009E-002, - 2.2000000E+001, -4.6261969E-001, -1.4998454E-001, 3.7473275E-001, -2.6110761E-001, 1.8463203E-002, -4.8027787E-001, -4.0426076E-002, -4.0426076E-002, -1.4998454E-001, -9.4147496E-003, -1.0376482E-001, -4.4323651E-001, -5.3655077E-001, -1.2706471E-001, -1.5758171E-001, -2.7953225E-001, 3.8766956E-004, 3.8766956E-004, 4.4323651E-001, 1.6932021E-002, - 2.3000000E+001, -4.6274565E-001, -1.4974888E-001, 3.7449762E-001, -2.6118630E-001, 1.8312477E-002, -4.8041061E-001, -4.0532058E-002, -4.0532058E-002, -1.4974888E-001, -9.4129267E-003, -1.0350408E-001, -4.4341222E-001, -5.3658239E-001, -1.2734745E-001, -1.5756888E-001, -2.7918738E-001, 2.9910796E-004, 2.9910796E-004, 4.4341222E-001, 1.6981040E-002, - 2.4000000E+001, -4.6285356E-001, -1.4954531E-001, 3.7429385E-001, -2.6125414E-001, 1.8183220E-002, -4.8052440E-001, -4.0623125E-002, -4.0623125E-002, -1.4954531E-001, -9.4114000E-003, -1.0327940E-001, -4.4356236E-001, -5.3660931E-001, -1.2759042E-001, -1.5755840E-001, -2.7888908E-001, 2.2318514E-004, 2.2318514E-004, 4.4356236E-001, 1.7023190E-002, - 2.5000000E+001, -4.6294605E-001, -1.4936957E-001, 3.7411743E-001, -2.6131261E-001, 1.8072332E-002, -4.8062199E-001, -4.0701387E-002, -4.0701387E-002, -1.4936957E-001, -9.4101171E-003, -1.0308583E-001, -4.4369076E-001, -5.3663226E-001, -1.2779925E-001, -1.5754978E-001, -2.7863125E-001, 1.5806979E-004, 1.5806979E-004, 4.4369076E-001, 1.7059434E-002, + 0.0000000E+000, 1.0000000E+000, 1.0000000E+000, 1.0000000E+000, 1.0000000E+000, 1.0000000E+000, 1.0000000E+000, 1.0000000E+000, 1.0000000E+000, 1.0000000E+000, 1.0000000E+000, 0.0000000E+000, 0.0000000E+000, 0.0000000E+000, 0.0000000E+000, 0.0000000E+000, 0.0000000E+000, 0.0000000E+000, 0.0000000E+000, 0.0000000E+000, 0.0000000E+000, + 1.0000000E+000, 9.9987325E-001, 9.9983240E-001, 9.9990651E-001, 9.9989789E-001, 9.9992499E-001, 9.9984721E-001, 9.9994427E-001, 9.9994427E-001, 9.9983240E-001, 9.9996271E-001, -4.5274345E-003, 5.7027978E-003, -5.8559869E-003, 1.9343975E-003, -7.8065548E-004, -8.8399481E-003, 2.7661075E-004, 2.7661075E-004, -5.7027978E-003, -5.5178336E-005, + 2.0000000E+000, 9.9845402E-001, 9.9795569E-001, 9.9886038E-001, 9.9875437E-001, 9.9908526E-001, 9.9813713E-001, 9.9932017E-001, 9.9932017E-001, 9.9795569E-001, 9.9954507E-001, -1.5813503E-002, 1.9904266E-002, -2.0434428E-002, 6.7629179E-003, -2.7306099E-003, -3.0850279E-002, 9.6836870E-004, 9.6836870E-004, -1.9904266E-002, -1.9329815E-004, + 3.0000000E+000, 9.8850008E-001, 9.8478703E-001, 9.9155875E-001, 9.9071948E-001, 9.9319953E-001, 9.8617577E-001, 9.9493740E-001, 9.9493740E-001, 9.8478703E-001, 9.9660735E-001, -4.3172077E-002, 5.4060764E-002, -5.5412197E-002, 1.8587476E-002, -7.5305988E-003, -8.3722618E-002, 2.6867021E-003, 2.6867021E-003, -5.4060764E-002, -5.3878640E-004, + 4.0000000E+000, 9.3725124E-001, 9.1675084E-001, 9.5500497E-001, 9.4891136E-001, 9.6302090E-001, 9.2550860E-001, 9.7220689E-001, 9.7220689E-001, 9.1675084E-001, 9.8122817E-001, -1.0163823E-001, 1.2385676E-001, -1.2572195E-001, 4.5352196E-002, -1.8696437E-002, -1.9087532E-001, 6.8817499E-003, 6.8817499E-003, -1.2385676E-001, -1.4128781E-003, + 5.0000000E+000, 7.8303105E-001, 7.0605164E-001, 8.5835725E-001, 8.1694487E-001, 8.7447745E-001, 7.5307557E-001, 9.0174220E-001, 9.0174220E-001, 7.0605164E-001, 9.3150588E-001, -2.0138474E-001, 2.2491240E-001, -2.1632996E-001, 1.0157337E-001, -4.3924470E-002, -3.3720391E-001, 1.7841674E-002, 1.7841674E-002, -2.2491240E-001, -3.9246734E-003, + 6.0000000E+000, 5.8749345E-001, 3.8695099E-001, 7.9137664E-001, 6.1813726E-001, 7.7851770E-001, 5.6656449E-001, 8.0515035E-001, 8.0515035E-001, 3.8695099E-001, 8.5270233E-001, -3.5930230E-001, 3.6388926E-001, -2.8607711E-001, 2.2243683E-001, -9.9339161E-002, -4.8750546E-001, 4.6877710E-002, 4.6877710E-002, -3.6388926E-001, -1.1322374E-002, + 7.0000000E+000, 4.6344872E-001, 1.0229219E-001, 8.0829933E-001, 4.4029196E-001, 7.3698231E-001, 4.8475397E-001, 7.2838129E-001, 7.2838129E-001, 1.0229219E-001, 7.7315948E-001, -5.4237647E-001, 5.3764430E-001, -3.3117305E-001, 3.8892284E-001, -1.7303342E-001, -6.2736563E-001, 9.1142312E-002, 9.1142312E-002, -5.3764430E-001, -2.3508048E-002, + 8.0000000E+000, 3.3229323E-001, -1.6617592E-001, 8.1682480E-001, 2.3869311E-001, 6.7784736E-001, 3.9602058E-001, 6.1395585E-001, 6.1395585E-001, -1.6617592E-001, 6.4317238E-001, -6.9546982E-001, 6.5939491E-001, -3.7314835E-001, 5.4310201E-001, -2.4847898E-001, -7.4067666E-001, 1.4188296E-001, 1.4188296E-001, -6.5939491E-001, -3.8766269E-002, + 9.0000000E+000, 1.7891649E-001, -3.8710265E-001, 7.7759846E-001, 2.4504973E-002, 5.8619655E-001, 2.4753853E-001, 4.1731032E-001, 4.1731032E-001, -3.8710265E-001, 3.7160176E-001, -7.8821686E-001, 6.7346847E-001, -4.3138150E-001, 6.5352921E-001, -3.2160908E-001, -8.0977014E-001, 1.9927048E-001, 1.9927048E-001, -6.7346847E-001, -5.8633647E-002, + 1.0000000E+001, -1.3164902E-001, -3.4780142E-001, 4.3521191E-001, -1.6289891E-001, 3.7388776E-001, -1.8589330E-001, 1.4518026E-001, 1.4518026E-001, -3.4780142E-001, -5.6309359E-002, -4.9001652E-001, 1.6937775E-001, -4.6671727E-001, 4.5031630E-001, -3.1591122E-001, -4.9529438E-001, 2.1231109E-001, 2.1231109E-001, -1.6937775E-001, -7.0083742E-002, + 1.1000000E+001, -3.0354290E-001, -2.7338056E-001, 4.1332959E-001, -2.1787127E-001, 2.2159388E-001, -3.3819096E-001, 7.0249167E-002, 7.0249167E-002, -2.7338056E-001, -3.1344002E-002, -3.1706446E-001, -1.4814128E-001, -5.0188227E-001, 1.9065277E-001, -2.5176215E-001, -4.0779282E-001, 1.2496344E-001, 1.2496344E-001, 1.4814128E-001, -3.4715875E-002, + 1.2000000E+001, -4.4522164E-001, -1.7411905E-001, 3.9444488E-001, -2.5313100E-001, 3.9969083E-002, -4.6247794E-001, -2.6752493E-002, -2.6752493E-002, -1.7411905E-001, -1.0102207E-002, -1.3401686E-001, -4.1583551E-001, -5.3182392E-001, -9.0431610E-002, -1.6327360E-001, -3.1213863E-001, 1.3153708E-002, 1.3153708E-002, 4.1583551E-001, 1.0753390E-002, + 1.3000000E+001, -4.5323429E-001, -1.6423295E-001, 3.8739292E-001, -2.5626728E-001, 2.9752934E-002, -4.7057195E-001, -3.2971178E-002, -3.2971178E-002, -1.6423295E-001, -9.6751029E-003, -1.2079852E-001, -4.2910234E-001, -5.3396874E-001, -1.0716627E-001, -1.5985789E-001, -2.9942973E-001, 7.0692183E-003, 7.0692183E-003, 4.2910234E-001, 1.3542511E-002, + 1.4000000E+001, -4.5726698E-001, -1.5867506E-001, 3.8281814E-001, -2.5814655E-001, 2.4843886E-002, -4.7470613E-001, -3.6113640E-002, -3.6113640E-002, -1.5867506E-001, -9.5327622E-003, -1.1385876E-001, -4.3539545E-001, -5.3509827E-001, -1.1556516E-001, -1.5860438E-001, -2.9189408E-001, 4.1556594E-003, 4.1556594E-003, 4.3539545E-001, 1.4960681E-002, + 1.5000000E+001, -4.5911461E-001, -1.5590224E-001, 3.8036274E-001, -2.5909681E-001, 2.2634211E-002, -4.7661652E-001, -3.7572910E-002, -3.7572910E-002, -1.5590224E-001, -9.4830365E-003, -1.1053679E-001, -4.3817610E-001, -5.3561397E-001, -1.1945747E-001, -1.5815753E-001, -2.8802619E-001, 2.8475236E-003, 2.8475236E-003, 4.3817610E-001, 1.5623524E-002, + 1.6000000E+001, -4.6066116E-001, -1.5342130E-001, 3.7806694E-001, -2.5994574E-001, 2.0794998E-002, -4.7822516E-001, -3.8813403E-002, -3.8813403E-002, -1.5342130E-001, -9.4487263E-003, -1.0764499E-001, -4.4044676E-001, -5.3603753E-001, -1.2276455E-001, -1.5785521E-001, -2.8450448E-001, 1.7609882E-003, 1.7609882E-003, 4.4044676E-001, 1.6190051E-002, + 1.7000000E+001, -4.6131249E-001, -1.5232075E-001, 3.7701862E-001, -2.6032025E-001, 2.0020999E-002, -4.7890567E-001, -3.9343381E-002, -3.9343381E-002, -1.5232075E-001, -9.4362538E-003, -1.0638658E-001, -4.4138589E-001, -5.3621194E-001, -1.2417743E-001, -1.5774968E-001, -2.8292397E-001, 1.3045344E-003, 1.3045344E-003, 4.4138589E-001, 1.6433130E-002, + 1.8000000E+001, -4.6186461E-001, -1.5135669E-001, 3.7608528E-001, -2.6064663E-001, 1.9364133E-002, -4.7948413E-001, -3.9797192E-002, -3.9797192E-002, -1.5135669E-001, -9.4265965E-003, -1.0529653E-001, -4.4217335E-001, -5.3635716E-001, -1.2538742E-001, -1.5767126E-001, -2.8153034E-001, 9.1760240E-004, 9.1760240E-004, 4.4217335E-001, 1.6641840E-002, + 1.9000000E+001, -4.6209974E-001, -1.5093647E-001, 3.7567407E-001, -2.6078828E-001, 1.9083993E-002, -4.7973095E-001, -3.9991917E-002, -3.9991917E-002, -1.5093647E-001, -9.4227387E-003, -1.0482499E-001, -4.4250617E-001, -5.3641813E-001, -1.2590669E-001, -1.5764111E-001, -2.8092024E-001, 7.5272150E-004, 7.5272150E-004, 4.4250617E-001, 1.6731567E-002, + 2.0000000E+001, -4.6230071E-001, -1.5057238E-001, 3.7531563E-001, -2.6091069E-001, 1.8844288E-002, -4.7994216E-001, -4.0159119E-002, -4.0159119E-002, -1.5057238E-001, -9.4195623E-003, -1.0441818E-001, -4.4278939E-001, -5.3646977E-001, -1.2635262E-001, -1.5761694E-001, -2.8039033E-001, 6.1170959E-004, 6.1170959E-004, 4.4278939E-001, 1.6808699E-002, + 2.1000000E+001, -4.6247259E-001, -1.5025718E-001, 3.7500374E-001, -2.6101639E-001, 1.8639044E-002, -4.8012298E-001, -4.0302721E-002, -4.0302721E-002, -1.5025718E-001, -9.4169340E-003, -1.0406733E-001, -4.4303070E-001, -5.3651357E-001, -1.2673565E-001, -1.5759747E-001, -2.7993062E-001, 4.9102410E-004, 4.9102410E-004, 4.4303070E-001, 1.6875009E-002, + 2.2000000E+001, -4.6261969E-001, -1.4998454E-001, 3.7473275E-001, -2.6110761E-001, 1.8463203E-002, -4.8027787E-001, -4.0426076E-002, -4.0426076E-002, -1.4998454E-001, -9.4147496E-003, -1.0376482E-001, -4.4323651E-001, -5.3655077E-001, -1.2706471E-001, -1.5758171E-001, -2.7953225E-001, 3.8766956E-004, 3.8766956E-004, 4.4323651E-001, 1.6932021E-002, + 2.3000000E+001, -4.6274565E-001, -1.4974888E-001, 3.7449762E-001, -2.6118630E-001, 1.8312477E-002, -4.8041061E-001, -4.0532058E-002, -4.0532058E-002, -1.4974888E-001, -9.4129267E-003, -1.0350408E-001, -4.4341222E-001, -5.3658239E-001, -1.2734745E-001, -1.5756888E-001, -2.7918738E-001, 2.9910796E-004, 2.9910796E-004, 4.4341222E-001, 1.6981040E-002, + 2.4000000E+001, -4.6285356E-001, -1.4954531E-001, 3.7429385E-001, -2.6125414E-001, 1.8183220E-002, -4.8052440E-001, -4.0623125E-002, -4.0623125E-002, -1.4954531E-001, -9.4114000E-003, -1.0327940E-001, -4.4356236E-001, -5.3660931E-001, -1.2759042E-001, -1.5755840E-001, -2.7888908E-001, 2.2318514E-004, 2.2318514E-004, 4.4356236E-001, 1.7023190E-002, + 2.5000000E+001, -4.6294605E-001, -1.4936957E-001, 3.7411743E-001, -2.6131261E-001, 1.8072332E-002, -4.8062199E-001, -4.0701387E-002, -4.0701387E-002, -1.4936957E-001, -9.4101171E-003, -1.0308583E-001, -4.4369076E-001, -5.3663226E-001, -1.2779925E-001, -1.5754978E-001, -2.7863125E-001, 1.5806979E-004, 1.5806979E-004, 4.4369076E-001, 1.7059434E-002, 2.6000000E+001, -4.6310439E-001, -1.4906590E-001, 3.7381151E-001, -2.6141341E-001, 1.7882259E-002, -4.8078920E-001, -4.0835831E-002, -4.0835831E-002, -1.4906590E-001, -9.4079760E-003, -1.0275225E-001, -4.4390995E-001, -5.3667124E-001, -1.2815802E-001, -1.5753586E-001, -2.7818510E-001, 4.6495470E-005, 4.6495470E-005, 4.4390995E-001, 1.7121745E-002, diff --git a/packages/seacas/libraries/aprepro_lib/strings.cc b/packages/seacas/libraries/aprepro_lib/strings.cc index 3623bb1235b0..06ce6bb1be3b 100644 --- a/packages/seacas/libraries/aprepro_lib/strings.cc +++ b/packages/seacas/libraries/aprepro_lib/strings.cc @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "aprepro.h" // for Aprepro diff --git a/packages/seacas/libraries/chaco/CMakeLists.txt b/packages/seacas/libraries/chaco/CMakeLists.txt index 2a827ae091b1..5f43a4e0c7fe 100644 --- a/packages/seacas/libraries/chaco/CMakeLists.txt +++ b/packages/seacas/libraries/chaco/CMakeLists.txt @@ -1,7 +1,5 @@ - TRIBITS_SUBPACKAGE(Chaco) - SET(CHACO_VERSION_MAJOR "3") SET(CHACO_VERSION_MINOR "0") SET(CHACO_VERSION_PATCH "0") @@ -52,7 +50,6 @@ FOREACH ( dir ${chaco_SUBDIRS} ) add_subdirectory(${dir}) ENDFOREACH ( dir ) - get_property(SOURCES GLOBAL PROPERTY chaco_SRCS) TRIBITS_ADD_LIBRARY( chaco diff --git a/packages/seacas/libraries/chaco/assign/assign.c b/packages/seacas/libraries/chaco/assign/assign.c index c7cab4fcb43b..1ee56bdf966b 100644 --- a/packages/seacas/libraries/chaco/assign/assign.c +++ b/packages/seacas/libraries/chaco/assign/assign.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/assign/assign_out.c b/packages/seacas/libraries/chaco/assign/assign_out.c index 3b267e02d4f4..81a8f8d264a0 100644 --- a/packages/seacas/libraries/chaco/assign/assign_out.c +++ b/packages/seacas/libraries/chaco/assign/assign_out.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/assign/mapper.c b/packages/seacas/libraries/chaco/assign/mapper.c index eaa735f2cd89..4f738818d28e 100644 --- a/packages/seacas/libraries/chaco/assign/mapper.c +++ b/packages/seacas/libraries/chaco/assign/mapper.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/assign/median.c b/packages/seacas/libraries/chaco/assign/median.c index e8fbcb8c4fa6..8835a7c840d4 100644 --- a/packages/seacas/libraries/chaco/assign/median.c +++ b/packages/seacas/libraries/chaco/assign/median.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/assign/merge_assign.c b/packages/seacas/libraries/chaco/assign/merge_assign.c index a1f010409f73..66dfbe2a3685 100644 --- a/packages/seacas/libraries/chaco/assign/merge_assign.c +++ b/packages/seacas/libraries/chaco/assign/merge_assign.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/assign/rec_median.c b/packages/seacas/libraries/chaco/assign/rec_median.c index cd4f9e681a68..b80b0726bd60 100644 --- a/packages/seacas/libraries/chaco/assign/rec_median.c +++ b/packages/seacas/libraries/chaco/assign/rec_median.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/assign/rotate.c b/packages/seacas/libraries/chaco/assign/rotate.c index d81db0cff4f5..6b58a5648135 100644 --- a/packages/seacas/libraries/chaco/assign/rotate.c +++ b/packages/seacas/libraries/chaco/assign/rotate.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/assign/y2x.c b/packages/seacas/libraries/chaco/assign/y2x.c index f276fa6ec4d3..39096861a158 100644 --- a/packages/seacas/libraries/chaco/assign/y2x.c +++ b/packages/seacas/libraries/chaco/assign/y2x.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/bpmatch/checkbp.c b/packages/seacas/libraries/chaco/bpmatch/checkbp.c index 87f0b4f67ead..ffb6874345a4 100644 --- a/packages/seacas/libraries/chaco/bpmatch/checkbp.c +++ b/packages/seacas/libraries/chaco/bpmatch/checkbp.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/bpmatch/genvals2d.c b/packages/seacas/libraries/chaco/bpmatch/genvals2d.c index d24a8e41ac8e..9305dd1ff75a 100644 --- a/packages/seacas/libraries/chaco/bpmatch/genvals2d.c +++ b/packages/seacas/libraries/chaco/bpmatch/genvals2d.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/bpmatch/genvals3d.c b/packages/seacas/libraries/chaco/bpmatch/genvals3d.c index 5ab9cc8ed073..aedc450b2f3e 100644 --- a/packages/seacas/libraries/chaco/bpmatch/genvals3d.c +++ b/packages/seacas/libraries/chaco/bpmatch/genvals3d.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/bpmatch/inits2d.c b/packages/seacas/libraries/chaco/bpmatch/inits2d.c index 1ac57afe25b5..6611fc441a6c 100644 --- a/packages/seacas/libraries/chaco/bpmatch/inits2d.c +++ b/packages/seacas/libraries/chaco/bpmatch/inits2d.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/bpmatch/inits3d.c b/packages/seacas/libraries/chaco/bpmatch/inits3d.c index 8e5d60f1fbba..bb7b6dd733d1 100644 --- a/packages/seacas/libraries/chaco/bpmatch/inits3d.c +++ b/packages/seacas/libraries/chaco/bpmatch/inits3d.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/bpmatch/map2d.c b/packages/seacas/libraries/chaco/bpmatch/map2d.c index fab6faa171b5..45401742e972 100644 --- a/packages/seacas/libraries/chaco/bpmatch/map2d.c +++ b/packages/seacas/libraries/chaco/bpmatch/map2d.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/bpmatch/map3d.c b/packages/seacas/libraries/chaco/bpmatch/map3d.c index 2a516881b3e9..de45c21a0fe5 100644 --- a/packages/seacas/libraries/chaco/bpmatch/map3d.c +++ b/packages/seacas/libraries/chaco/bpmatch/map3d.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/bpmatch/movevtxs.c b/packages/seacas/libraries/chaco/bpmatch/movevtxs.c index 87268f919211..e9ae249eae6c 100644 --- a/packages/seacas/libraries/chaco/bpmatch/movevtxs.c +++ b/packages/seacas/libraries/chaco/bpmatch/movevtxs.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/bpmatch/sorts2d.c b/packages/seacas/libraries/chaco/bpmatch/sorts2d.c index d683c39d2459..3f2b24cef720 100644 --- a/packages/seacas/libraries/chaco/bpmatch/sorts2d.c +++ b/packages/seacas/libraries/chaco/bpmatch/sorts2d.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/bpmatch/sorts3d.c b/packages/seacas/libraries/chaco/bpmatch/sorts3d.c index 342cb5e06107..6a098cea6140 100644 --- a/packages/seacas/libraries/chaco/bpmatch/sorts3d.c +++ b/packages/seacas/libraries/chaco/bpmatch/sorts3d.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/coarsen/coarsen.c b/packages/seacas/libraries/chaco/coarsen/coarsen.c index efdb69b495cd..523cda92c3ff 100644 --- a/packages/seacas/libraries/chaco/coarsen/coarsen.c +++ b/packages/seacas/libraries/chaco/coarsen/coarsen.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/coarsen/coarsen1.c b/packages/seacas/libraries/chaco/coarsen/coarsen1.c index 197a780df675..09c55bf83b40 100644 --- a/packages/seacas/libraries/chaco/coarsen/coarsen1.c +++ b/packages/seacas/libraries/chaco/coarsen/coarsen1.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/coarsen/countcedges.c b/packages/seacas/libraries/chaco/coarsen/countcedges.c index 9eccba3ba691..232aa0a6e649 100644 --- a/packages/seacas/libraries/chaco/coarsen/countcedges.c +++ b/packages/seacas/libraries/chaco/coarsen/countcedges.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/coarsen/interpolate.c b/packages/seacas/libraries/chaco/coarsen/interpolate.c index cc1f997544c2..23f29002431a 100644 --- a/packages/seacas/libraries/chaco/coarsen/interpolate.c +++ b/packages/seacas/libraries/chaco/coarsen/interpolate.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/coarsen/makeccoords.c b/packages/seacas/libraries/chaco/coarsen/makeccoords.c index dc00ff7b35f9..ace71e657c55 100644 --- a/packages/seacas/libraries/chaco/coarsen/makeccoords.c +++ b/packages/seacas/libraries/chaco/coarsen/makeccoords.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/coarsen/makecgraph.c b/packages/seacas/libraries/chaco/coarsen/makecgraph.c index cda4aa2bf0cc..42ff595c6eb2 100644 --- a/packages/seacas/libraries/chaco/coarsen/makecgraph.c +++ b/packages/seacas/libraries/chaco/coarsen/makecgraph.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/coarsen/makecgraph2.c b/packages/seacas/libraries/chaco/coarsen/makecgraph2.c index dfbe385556fa..319afe883af2 100644 --- a/packages/seacas/libraries/chaco/coarsen/makecgraph2.c +++ b/packages/seacas/libraries/chaco/coarsen/makecgraph2.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/coarsen/makefgraph.c b/packages/seacas/libraries/chaco/coarsen/makefgraph.c index 2d784f130792..b187d939f479 100644 --- a/packages/seacas/libraries/chaco/coarsen/makefgraph.c +++ b/packages/seacas/libraries/chaco/coarsen/makefgraph.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/coarsen/makev2cv.c b/packages/seacas/libraries/chaco/coarsen/makev2cv.c index 2f4b45b47b84..e1f53e523d79 100644 --- a/packages/seacas/libraries/chaco/coarsen/makev2cv.c +++ b/packages/seacas/libraries/chaco/coarsen/makev2cv.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/coarsen/maxmatch.c b/packages/seacas/libraries/chaco/coarsen/maxmatch.c index ecfe5713a482..dca52b4d1d06 100644 --- a/packages/seacas/libraries/chaco/coarsen/maxmatch.c +++ b/packages/seacas/libraries/chaco/coarsen/maxmatch.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/coarsen/maxmatch1.c b/packages/seacas/libraries/chaco/coarsen/maxmatch1.c index 54845d72142d..2bb3df7a4587 100644 --- a/packages/seacas/libraries/chaco/coarsen/maxmatch1.c +++ b/packages/seacas/libraries/chaco/coarsen/maxmatch1.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/coarsen/maxmatch2.c b/packages/seacas/libraries/chaco/coarsen/maxmatch2.c index db3310b97cb8..f29348fc7d63 100644 --- a/packages/seacas/libraries/chaco/coarsen/maxmatch2.c +++ b/packages/seacas/libraries/chaco/coarsen/maxmatch2.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/coarsen/maxmatch3.c b/packages/seacas/libraries/chaco/coarsen/maxmatch3.c index 05dd1264a6a4..eceb6e18ab5d 100644 --- a/packages/seacas/libraries/chaco/coarsen/maxmatch3.c +++ b/packages/seacas/libraries/chaco/coarsen/maxmatch3.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/coarsen/maxmatch4.c b/packages/seacas/libraries/chaco/coarsen/maxmatch4.c index e7d32c2bb0e7..7c696af4b822 100644 --- a/packages/seacas/libraries/chaco/coarsen/maxmatch4.c +++ b/packages/seacas/libraries/chaco/coarsen/maxmatch4.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/coarsen/maxmatch5.c b/packages/seacas/libraries/chaco/coarsen/maxmatch5.c index af40fe4b64b1..d81a25878bc6 100644 --- a/packages/seacas/libraries/chaco/coarsen/maxmatch5.c +++ b/packages/seacas/libraries/chaco/coarsen/maxmatch5.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/coarsen/maxmatch9.c b/packages/seacas/libraries/chaco/coarsen/maxmatch9.c index 5ed4fe396441..a855f09ab100 100644 --- a/packages/seacas/libraries/chaco/coarsen/maxmatch9.c +++ b/packages/seacas/libraries/chaco/coarsen/maxmatch9.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/connect/add_edges.c b/packages/seacas/libraries/chaco/connect/add_edges.c index 150ed2bf934c..2bcf91ed17df 100644 --- a/packages/seacas/libraries/chaco/connect/add_edges.c +++ b/packages/seacas/libraries/chaco/connect/add_edges.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/connect/connect_enforce.c b/packages/seacas/libraries/chaco/connect/connect_enforce.c index eeaf25e91401..ca337bae9756 100644 --- a/packages/seacas/libraries/chaco/connect/connect_enforce.c +++ b/packages/seacas/libraries/chaco/connect/connect_enforce.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/connect/connected.c b/packages/seacas/libraries/chaco/connect/connected.c index 3c3d1e7efcfa..3c4ad1268470 100644 --- a/packages/seacas/libraries/chaco/connect/connected.c +++ b/packages/seacas/libraries/chaco/connect/connected.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/connect/find_comps.c b/packages/seacas/libraries/chaco/connect/find_comps.c index d2f1024954c2..4475728e67ae 100644 --- a/packages/seacas/libraries/chaco/connect/find_comps.c +++ b/packages/seacas/libraries/chaco/connect/find_comps.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/connect/heap.c b/packages/seacas/libraries/chaco/connect/heap.c index 0296057eb56a..ad530cbc9b68 100644 --- a/packages/seacas/libraries/chaco/connect/heap.c +++ b/packages/seacas/libraries/chaco/connect/heap.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #include "structs.h" diff --git a/packages/seacas/libraries/chaco/eigen/Tevec.c b/packages/seacas/libraries/chaco/eigen/Tevec.c index 0e3b655c7204..595b0e89a416 100644 --- a/packages/seacas/libraries/chaco/eigen/Tevec.c +++ b/packages/seacas/libraries/chaco/eigen/Tevec.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/eigen/bidir.c b/packages/seacas/libraries/chaco/eigen/bidir.c index c7f0a468ea9e..a020daa07ae1 100644 --- a/packages/seacas/libraries/chaco/eigen/bidir.c +++ b/packages/seacas/libraries/chaco/eigen/bidir.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/eigen/bisect.c b/packages/seacas/libraries/chaco/eigen/bisect.c index b719316b976c..a3564a501c85 100644 --- a/packages/seacas/libraries/chaco/eigen/bisect.c +++ b/packages/seacas/libraries/chaco/eigen/bisect.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/eigen/checkeig.c b/packages/seacas/libraries/chaco/eigen/checkeig.c index b5d9e7658c1b..92b0978fcbe3 100644 --- a/packages/seacas/libraries/chaco/eigen/checkeig.c +++ b/packages/seacas/libraries/chaco/eigen/checkeig.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/eigen/checkeig_ext.c b/packages/seacas/libraries/chaco/eigen/checkeig_ext.c index a1689a9f786a..d53859c11131 100644 --- a/packages/seacas/libraries/chaco/eigen/checkeig_ext.c +++ b/packages/seacas/libraries/chaco/eigen/checkeig_ext.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/eigen/checkorth.c b/packages/seacas/libraries/chaco/eigen/checkorth.c index d2734ea699b6..47db459013df 100644 --- a/packages/seacas/libraries/chaco/eigen/checkorth.c +++ b/packages/seacas/libraries/chaco/eigen/checkorth.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/eigen/cksturmcnt.c b/packages/seacas/libraries/chaco/eigen/cksturmcnt.c index 4f1cce70068e..dae91daf9f89 100644 --- a/packages/seacas/libraries/chaco/eigen/cksturmcnt.c +++ b/packages/seacas/libraries/chaco/eigen/cksturmcnt.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/eigen/eigensolve.c b/packages/seacas/libraries/chaco/eigen/eigensolve.c index b8955246763a..e3fa5eaaf385 100644 --- a/packages/seacas/libraries/chaco/eigen/eigensolve.c +++ b/packages/seacas/libraries/chaco/eigen/eigensolve.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/eigen/get_extval.c b/packages/seacas/libraries/chaco/eigen/get_extval.c index 239290e3a1e1..0861724c68ee 100644 --- a/packages/seacas/libraries/chaco/eigen/get_extval.c +++ b/packages/seacas/libraries/chaco/eigen/get_extval.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/eigen/get_ritzvals.c b/packages/seacas/libraries/chaco/eigen/get_ritzvals.c index 9be229f54781..3ccbba83900b 100644 --- a/packages/seacas/libraries/chaco/eigen/get_ritzvals.c +++ b/packages/seacas/libraries/chaco/eigen/get_ritzvals.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/eigen/lanc_seconds.c b/packages/seacas/libraries/chaco/eigen/lanc_seconds.c index b5749e9da029..d7d9c9fa0e1f 100644 --- a/packages/seacas/libraries/chaco/eigen/lanc_seconds.c +++ b/packages/seacas/libraries/chaco/eigen/lanc_seconds.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/eigen/lanczos_FO.c b/packages/seacas/libraries/chaco/eigen/lanczos_FO.c index a34422e760dc..3525c0ec5084 100644 --- a/packages/seacas/libraries/chaco/eigen/lanczos_FO.c +++ b/packages/seacas/libraries/chaco/eigen/lanczos_FO.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/eigen/lanczos_SO.c b/packages/seacas/libraries/chaco/eigen/lanczos_SO.c index 455bbeb1f33c..aacdac956638 100644 --- a/packages/seacas/libraries/chaco/eigen/lanczos_SO.c +++ b/packages/seacas/libraries/chaco/eigen/lanczos_SO.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/eigen/lanczos_SO_float.c b/packages/seacas/libraries/chaco/eigen/lanczos_SO_float.c index aff56f18c727..dd943e9e3e0e 100644 --- a/packages/seacas/libraries/chaco/eigen/lanczos_SO_float.c +++ b/packages/seacas/libraries/chaco/eigen/lanczos_SO_float.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/eigen/lanczos_ext.c b/packages/seacas/libraries/chaco/eigen/lanczos_ext.c index dcfef59042e4..b0362d4c71b0 100644 --- a/packages/seacas/libraries/chaco/eigen/lanczos_ext.c +++ b/packages/seacas/libraries/chaco/eigen/lanczos_ext.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/eigen/lanczos_ext_float.c b/packages/seacas/libraries/chaco/eigen/lanczos_ext_float.c index 0d61d918b42a..656fd44964c4 100644 --- a/packages/seacas/libraries/chaco/eigen/lanczos_ext_float.c +++ b/packages/seacas/libraries/chaco/eigen/lanczos_ext_float.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/eigen/lanpause.c b/packages/seacas/libraries/chaco/eigen/lanpause.c index 32716e8664f3..9ab1818e79f8 100644 --- a/packages/seacas/libraries/chaco/eigen/lanpause.c +++ b/packages/seacas/libraries/chaco/eigen/lanpause.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/eigen/makeorthlnk.c b/packages/seacas/libraries/chaco/eigen/makeorthlnk.c index c30514a936fa..01540f4ce06f 100644 --- a/packages/seacas/libraries/chaco/eigen/makeorthlnk.c +++ b/packages/seacas/libraries/chaco/eigen/makeorthlnk.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/eigen/mkeigvecs.c b/packages/seacas/libraries/chaco/eigen/mkeigvecs.c index 367013fcacbf..01e2571e1127 100644 --- a/packages/seacas/libraries/chaco/eigen/mkeigvecs.c +++ b/packages/seacas/libraries/chaco/eigen/mkeigvecs.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/eigen/mkscanlist.c b/packages/seacas/libraries/chaco/eigen/mkscanlist.c index 7bb99aca0918..6a453e6f2676 100644 --- a/packages/seacas/libraries/chaco/eigen/mkscanlist.c +++ b/packages/seacas/libraries/chaco/eigen/mkscanlist.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/eigen/orthog1.c b/packages/seacas/libraries/chaco/eigen/orthog1.c index 80733a786d20..6512f2390b11 100644 --- a/packages/seacas/libraries/chaco/eigen/orthog1.c +++ b/packages/seacas/libraries/chaco/eigen/orthog1.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/eigen/orthogonalize.c b/packages/seacas/libraries/chaco/eigen/orthogonalize.c index dd40da88c886..39cce6210f07 100644 --- a/packages/seacas/libraries/chaco/eigen/orthogonalize.c +++ b/packages/seacas/libraries/chaco/eigen/orthogonalize.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/eigen/orthogvec.c b/packages/seacas/libraries/chaco/eigen/orthogvec.c index 5036544efc39..316b48f9f9ce 100644 --- a/packages/seacas/libraries/chaco/eigen/orthogvec.c +++ b/packages/seacas/libraries/chaco/eigen/orthogvec.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/eigen/ql.c b/packages/seacas/libraries/chaco/eigen/ql.c index f5ed0374501c..c450b2e244a0 100644 --- a/packages/seacas/libraries/chaco/eigen/ql.c +++ b/packages/seacas/libraries/chaco/eigen/ql.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/eigen/rqi.c b/packages/seacas/libraries/chaco/eigen/rqi.c index 098431cbffad..4358b1b991a4 100644 --- a/packages/seacas/libraries/chaco/eigen/rqi.c +++ b/packages/seacas/libraries/chaco/eigen/rqi.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/eigen/rqi_ext.c b/packages/seacas/libraries/chaco/eigen/rqi_ext.c index ab2e5db929e0..da7c44ef0d28 100644 --- a/packages/seacas/libraries/chaco/eigen/rqi_ext.c +++ b/packages/seacas/libraries/chaco/eigen/rqi_ext.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/eigen/scale_diag.c b/packages/seacas/libraries/chaco/eigen/scale_diag.c index af34456a6a6f..e39d0e97a012 100644 --- a/packages/seacas/libraries/chaco/eigen/scale_diag.c +++ b/packages/seacas/libraries/chaco/eigen/scale_diag.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/eigen/scanmax.c b/packages/seacas/libraries/chaco/eigen/scanmax.c index 5e0c8b5f1f89..77b7049c7cb2 100644 --- a/packages/seacas/libraries/chaco/eigen/scanmax.c +++ b/packages/seacas/libraries/chaco/eigen/scanmax.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/eigen/scanmin.c b/packages/seacas/libraries/chaco/eigen/scanmin.c index f431d28d807c..2a35d46f4cdb 100644 --- a/packages/seacas/libraries/chaco/eigen/scanmin.c +++ b/packages/seacas/libraries/chaco/eigen/scanmin.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/eigen/solistout.c b/packages/seacas/libraries/chaco/eigen/solistout.c index e0be193a32cc..f745701376b5 100644 --- a/packages/seacas/libraries/chaco/eigen/solistout.c +++ b/packages/seacas/libraries/chaco/eigen/solistout.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/eigen/sorthog.c b/packages/seacas/libraries/chaco/eigen/sorthog.c index bb9bbf52dd48..7d8795efcc41 100644 --- a/packages/seacas/libraries/chaco/eigen/sorthog.c +++ b/packages/seacas/libraries/chaco/eigen/sorthog.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/eigen/splarax.c b/packages/seacas/libraries/chaco/eigen/splarax.c index b8ba7abc8279..3b02cca79ff9 100644 --- a/packages/seacas/libraries/chaco/eigen/splarax.c +++ b/packages/seacas/libraries/chaco/eigen/splarax.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/eigen/sturmcnt.c b/packages/seacas/libraries/chaco/eigen/sturmcnt.c index 4259231a6aa3..1e7357e5bab2 100644 --- a/packages/seacas/libraries/chaco/eigen/sturmcnt.c +++ b/packages/seacas/libraries/chaco/eigen/sturmcnt.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/eigen/tri_solve.c b/packages/seacas/libraries/chaco/eigen/tri_solve.c index 0f6e1381b810..81a559e7c0e3 100644 --- a/packages/seacas/libraries/chaco/eigen/tri_solve.c +++ b/packages/seacas/libraries/chaco/eigen/tri_solve.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/eigen/warnings.c b/packages/seacas/libraries/chaco/eigen/warnings.c index 90147979cc2f..1c673ab71398 100644 --- a/packages/seacas/libraries/chaco/eigen/warnings.c +++ b/packages/seacas/libraries/chaco/eigen/warnings.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/graph/check_graph.c b/packages/seacas/libraries/chaco/graph/check_graph.c index ad9206ff121d..6bd190a89504 100644 --- a/packages/seacas/libraries/chaco/graph/check_graph.c +++ b/packages/seacas/libraries/chaco/graph/check_graph.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/graph/free_graph.c b/packages/seacas/libraries/chaco/graph/free_graph.c index ce7b3e4197db..6fa0501139e1 100644 --- a/packages/seacas/libraries/chaco/graph/free_graph.c +++ b/packages/seacas/libraries/chaco/graph/free_graph.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/graph/graph_out.c b/packages/seacas/libraries/chaco/graph/graph_out.c index 1e34eb741172..0059bf2f7f62 100644 --- a/packages/seacas/libraries/chaco/graph/graph_out.c +++ b/packages/seacas/libraries/chaco/graph/graph_out.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/graph/mm_out.c b/packages/seacas/libraries/chaco/graph/mm_out.c index abff7dbc6993..bc27a4c1bdcc 100644 --- a/packages/seacas/libraries/chaco/graph/mm_out.c +++ b/packages/seacas/libraries/chaco/graph/mm_out.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/graph/reformat.c b/packages/seacas/libraries/chaco/graph/reformat.c index 1aa61ce29799..399d1bf23d6c 100644 --- a/packages/seacas/libraries/chaco/graph/reformat.c +++ b/packages/seacas/libraries/chaco/graph/reformat.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/graph/subgraph.c b/packages/seacas/libraries/chaco/graph/subgraph.c index d07f80642436..ba49b1325b2c 100644 --- a/packages/seacas/libraries/chaco/graph/subgraph.c +++ b/packages/seacas/libraries/chaco/graph/subgraph.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/inertial/eigenvec2.c b/packages/seacas/libraries/chaco/inertial/eigenvec2.c index f8b3b47c2cfd..6fceb1e27f65 100644 --- a/packages/seacas/libraries/chaco/inertial/eigenvec2.c +++ b/packages/seacas/libraries/chaco/inertial/eigenvec2.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/inertial/eigenvec3.c b/packages/seacas/libraries/chaco/inertial/eigenvec3.c index ed80e46ecf0f..54112f6fcde7 100644 --- a/packages/seacas/libraries/chaco/inertial/eigenvec3.c +++ b/packages/seacas/libraries/chaco/inertial/eigenvec3.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/inertial/inertial.c b/packages/seacas/libraries/chaco/inertial/inertial.c index ca6ccdd9a16b..535820b7b31c 100644 --- a/packages/seacas/libraries/chaco/inertial/inertial.c +++ b/packages/seacas/libraries/chaco/inertial/inertial.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/inertial/inertial1d.c b/packages/seacas/libraries/chaco/inertial/inertial1d.c index 3aa370d96344..ad295eabb731 100644 --- a/packages/seacas/libraries/chaco/inertial/inertial1d.c +++ b/packages/seacas/libraries/chaco/inertial/inertial1d.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/inertial/inertial2d.c b/packages/seacas/libraries/chaco/inertial/inertial2d.c index 5637bb859c39..b80392860c50 100644 --- a/packages/seacas/libraries/chaco/inertial/inertial2d.c +++ b/packages/seacas/libraries/chaco/inertial/inertial2d.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/inertial/inertial3d.c b/packages/seacas/libraries/chaco/inertial/inertial3d.c index e48a8b7bd36a..af51643be661 100644 --- a/packages/seacas/libraries/chaco/inertial/inertial3d.c +++ b/packages/seacas/libraries/chaco/inertial/inertial3d.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/inertial/make_subgeom.c b/packages/seacas/libraries/chaco/inertial/make_subgeom.c index f3edc61947b6..dc4c8673be20 100644 --- a/packages/seacas/libraries/chaco/inertial/make_subgeom.c +++ b/packages/seacas/libraries/chaco/inertial/make_subgeom.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/input/check_input.c b/packages/seacas/libraries/chaco/input/check_input.c index fb4cc92ef1e1..b6b172981286 100644 --- a/packages/seacas/libraries/chaco/input/check_input.c +++ b/packages/seacas/libraries/chaco/input/check_input.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/input/input.c b/packages/seacas/libraries/chaco/input/input.c index 95a5d388e507..0707670f965a 100644 --- a/packages/seacas/libraries/chaco/input/input.c +++ b/packages/seacas/libraries/chaco/input/input.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/input/input_assign.c b/packages/seacas/libraries/chaco/input/input_assign.c index 9bbedbe5fbda..9223e4b5e5da 100644 --- a/packages/seacas/libraries/chaco/input/input_assign.c +++ b/packages/seacas/libraries/chaco/input/input_assign.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/input/input_geom.c b/packages/seacas/libraries/chaco/input/input_geom.c index 6bf5841bcdc6..a771158d0186 100644 --- a/packages/seacas/libraries/chaco/input/input_geom.c +++ b/packages/seacas/libraries/chaco/input/input_geom.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/input/input_graph.c b/packages/seacas/libraries/chaco/input/input_graph.c index fe91ef5f011e..f891d2fd444b 100644 --- a/packages/seacas/libraries/chaco/input/input_graph.c +++ b/packages/seacas/libraries/chaco/input/input_graph.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/input/read_params.c b/packages/seacas/libraries/chaco/input/read_params.c index c7a8d1efed9c..8c0889533ed5 100644 --- a/packages/seacas/libraries/chaco/input/read_params.c +++ b/packages/seacas/libraries/chaco/input/read_params.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/input/read_val.c b/packages/seacas/libraries/chaco/input/read_val.c index 2025a0a50f82..047d5e42a180 100644 --- a/packages/seacas/libraries/chaco/input/read_val.c +++ b/packages/seacas/libraries/chaco/input/read_val.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/input/reflect_input.c b/packages/seacas/libraries/chaco/input/reflect_input.c index 3d68e2e2c1eb..acead48d33d7 100644 --- a/packages/seacas/libraries/chaco/input/reflect_input.c +++ b/packages/seacas/libraries/chaco/input/reflect_input.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/internal/check_internal.c b/packages/seacas/libraries/chaco/internal/check_internal.c index 988a7d452a89..d71ee9cd3392 100644 --- a/packages/seacas/libraries/chaco/internal/check_internal.c +++ b/packages/seacas/libraries/chaco/internal/check_internal.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/internal/force_internal.c b/packages/seacas/libraries/chaco/internal/force_internal.c index ac96c33a8623..11aaf08bdc70 100644 --- a/packages/seacas/libraries/chaco/internal/force_internal.c +++ b/packages/seacas/libraries/chaco/internal/force_internal.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/internal/improve_internal.c b/packages/seacas/libraries/chaco/internal/improve_internal.c index 73b623ba9a74..5c9f724a9dea 100644 --- a/packages/seacas/libraries/chaco/internal/improve_internal.c +++ b/packages/seacas/libraries/chaco/internal/improve_internal.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/internal/internal.h b/packages/seacas/libraries/chaco/internal/internal.h index 0bda169ee176..55878f6e1590 100644 --- a/packages/seacas/libraries/chaco/internal/internal.h +++ b/packages/seacas/libraries/chaco/internal/internal.h @@ -5,7 +5,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /* Bidirectional list of integers. */ diff --git a/packages/seacas/libraries/chaco/klspiff/bilistops.c b/packages/seacas/libraries/chaco/klspiff/bilistops.c index 55da760c276e..74a498aa339c 100644 --- a/packages/seacas/libraries/chaco/klspiff/bilistops.c +++ b/packages/seacas/libraries/chaco/klspiff/bilistops.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/klspiff/buckets.c b/packages/seacas/libraries/chaco/klspiff/buckets.c index bee64eedbcc9..77308b12867b 100644 --- a/packages/seacas/libraries/chaco/klspiff/buckets.c +++ b/packages/seacas/libraries/chaco/klspiff/buckets.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/klspiff/buckets1.c b/packages/seacas/libraries/chaco/klspiff/buckets1.c index 4570585781e3..9ec56b4f7d6a 100644 --- a/packages/seacas/libraries/chaco/klspiff/buckets1.c +++ b/packages/seacas/libraries/chaco/klspiff/buckets1.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/klspiff/buckets_bi.c b/packages/seacas/libraries/chaco/klspiff/buckets_bi.c index 497aa5b5cc24..39d4568261d1 100644 --- a/packages/seacas/libraries/chaco/klspiff/buckets_bi.c +++ b/packages/seacas/libraries/chaco/klspiff/buckets_bi.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/klspiff/coarsen_kl.c b/packages/seacas/libraries/chaco/klspiff/coarsen_kl.c index 7a39f96b8360..8c43f9bcbfee 100644 --- a/packages/seacas/libraries/chaco/klspiff/coarsen_kl.c +++ b/packages/seacas/libraries/chaco/klspiff/coarsen_kl.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/klspiff/compress_ewgts.c b/packages/seacas/libraries/chaco/klspiff/compress_ewgts.c index 9d5365a7cb4d..6867c41782f2 100644 --- a/packages/seacas/libraries/chaco/klspiff/compress_ewgts.c +++ b/packages/seacas/libraries/chaco/klspiff/compress_ewgts.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/klspiff/count_weights.c b/packages/seacas/libraries/chaco/klspiff/count_weights.c index ab5ebf2147e8..1ee5052e2c2e 100644 --- a/packages/seacas/libraries/chaco/klspiff/count_weights.c +++ b/packages/seacas/libraries/chaco/klspiff/count_weights.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/klspiff/kl_init.c b/packages/seacas/libraries/chaco/klspiff/kl_init.c index 65b4bdea88b2..8f9214f731d5 100644 --- a/packages/seacas/libraries/chaco/klspiff/kl_init.c +++ b/packages/seacas/libraries/chaco/klspiff/kl_init.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/klspiff/kl_output.c b/packages/seacas/libraries/chaco/klspiff/kl_output.c index 309193fe5c77..d234129e19f1 100644 --- a/packages/seacas/libraries/chaco/klspiff/kl_output.c +++ b/packages/seacas/libraries/chaco/klspiff/kl_output.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/klspiff/klspiff.c b/packages/seacas/libraries/chaco/klspiff/klspiff.c index bf9a9459b2cc..abe9f5375de3 100644 --- a/packages/seacas/libraries/chaco/klspiff/klspiff.c +++ b/packages/seacas/libraries/chaco/klspiff/klspiff.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/klspiff/make_bndy_list.c b/packages/seacas/libraries/chaco/klspiff/make_bndy_list.c index 16163509df5e..a45e7d8ec514 100644 --- a/packages/seacas/libraries/chaco/klspiff/make_bndy_list.c +++ b/packages/seacas/libraries/chaco/klspiff/make_bndy_list.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/klspiff/make_kl_list.c b/packages/seacas/libraries/chaco/klspiff/make_kl_list.c index 3e3fd08f7f42..633fca2b4684 100644 --- a/packages/seacas/libraries/chaco/klspiff/make_kl_list.c +++ b/packages/seacas/libraries/chaco/klspiff/make_kl_list.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/klspiff/nway_kl.c b/packages/seacas/libraries/chaco/klspiff/nway_kl.c index 58d6752b37a6..e0c4efe4da9b 100644 --- a/packages/seacas/libraries/chaco/klspiff/nway_kl.c +++ b/packages/seacas/libraries/chaco/klspiff/nway_kl.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/klvspiff/bpm_improve.c b/packages/seacas/libraries/chaco/klvspiff/bpm_improve.c index 52745e9d0616..bc3c59d116cd 100644 --- a/packages/seacas/libraries/chaco/klvspiff/bpm_improve.c +++ b/packages/seacas/libraries/chaco/klvspiff/bpm_improve.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/klvspiff/bucketsv.c b/packages/seacas/libraries/chaco/klvspiff/bucketsv.c index f57b6f480207..d3e8f98c63a9 100644 --- a/packages/seacas/libraries/chaco/klvspiff/bucketsv.c +++ b/packages/seacas/libraries/chaco/klvspiff/bucketsv.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/klvspiff/clear_dvals.c b/packages/seacas/libraries/chaco/klvspiff/clear_dvals.c index 62cb833d25b1..e7e53727f058 100644 --- a/packages/seacas/libraries/chaco/klvspiff/clear_dvals.c +++ b/packages/seacas/libraries/chaco/klvspiff/clear_dvals.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/klvspiff/coarsen_klv.c b/packages/seacas/libraries/chaco/klvspiff/coarsen_klv.c index 942f7acac808..8fdbbfe504a1 100644 --- a/packages/seacas/libraries/chaco/klvspiff/coarsen_klv.c +++ b/packages/seacas/libraries/chaco/klvspiff/coarsen_klv.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/klvspiff/countup_vtx_sep.c b/packages/seacas/libraries/chaco/klvspiff/countup_vtx_sep.c index edb3ae1f22f2..8683509bb896 100644 --- a/packages/seacas/libraries/chaco/klvspiff/countup_vtx_sep.c +++ b/packages/seacas/libraries/chaco/klvspiff/countup_vtx_sep.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/klvspiff/find_bndy.c b/packages/seacas/libraries/chaco/klvspiff/find_bndy.c index bfe8055dea53..97744b3f39a5 100644 --- a/packages/seacas/libraries/chaco/klvspiff/find_bndy.c +++ b/packages/seacas/libraries/chaco/klvspiff/find_bndy.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/klvspiff/flatten.c b/packages/seacas/libraries/chaco/klvspiff/flatten.c index f6e6f53ea32d..7bb21d9756a2 100644 --- a/packages/seacas/libraries/chaco/klvspiff/flatten.c +++ b/packages/seacas/libraries/chaco/klvspiff/flatten.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/klvspiff/flow.c b/packages/seacas/libraries/chaco/klvspiff/flow.c index 231dde49b871..73ca4080e605 100644 --- a/packages/seacas/libraries/chaco/klvspiff/flow.c +++ b/packages/seacas/libraries/chaco/klvspiff/flow.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ @@ -14,7 +14,6 @@ film.graph random+KL. before size = 24, should stay 24. However, I'm not finding this much flow. - Start w/ a simple greedy weighted matching. For each node on left side w/ some remaining unmatched weight: Look for augmenting path via recursive call. @@ -37,7 +36,6 @@ This is similar to matching except: immediately from either vertex. Use a single representation of flow on an edge, and have each edge representation point to it. - */ /* diff --git a/packages/seacas/libraries/chaco/klvspiff/klv_init.c b/packages/seacas/libraries/chaco/klvspiff/klv_init.c index c4874a512925..9eff7e29f347 100644 --- a/packages/seacas/libraries/chaco/klvspiff/klv_init.c +++ b/packages/seacas/libraries/chaco/klvspiff/klv_init.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/klvspiff/klvspiff.c b/packages/seacas/libraries/chaco/klvspiff/klvspiff.c index a7ce276576b1..e1491c1affb0 100644 --- a/packages/seacas/libraries/chaco/klvspiff/klvspiff.c +++ b/packages/seacas/libraries/chaco/klvspiff/klvspiff.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/klvspiff/make_bpgraph.c b/packages/seacas/libraries/chaco/klvspiff/make_bpgraph.c index 90d6da31b67a..5cb15791c8af 100644 --- a/packages/seacas/libraries/chaco/klvspiff/make_bpgraph.c +++ b/packages/seacas/libraries/chaco/klvspiff/make_bpgraph.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/klvspiff/make_sep_list.c b/packages/seacas/libraries/chaco/klvspiff/make_sep_list.c index a549974654ad..c6570f9c210a 100644 --- a/packages/seacas/libraries/chaco/klvspiff/make_sep_list.c +++ b/packages/seacas/libraries/chaco/klvspiff/make_sep_list.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/klvspiff/matching.c b/packages/seacas/libraries/chaco/klvspiff/matching.c index 362d2e055778..140de68ff916 100644 --- a/packages/seacas/libraries/chaco/klvspiff/matching.c +++ b/packages/seacas/libraries/chaco/klvspiff/matching.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/klvspiff/nway_klv.c b/packages/seacas/libraries/chaco/klvspiff/nway_klv.c index bd7d9796ae18..8e43e19ef1f3 100644 --- a/packages/seacas/libraries/chaco/klvspiff/nway_klv.c +++ b/packages/seacas/libraries/chaco/klvspiff/nway_klv.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/main/chaco.h b/packages/seacas/libraries/chaco/main/chaco.h index dc15c77bab29..b8bd5b4fecd6 100644 --- a/packages/seacas/libraries/chaco/main/chaco.h +++ b/packages/seacas/libraries/chaco/main/chaco.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #ifndef CHACO_H diff --git a/packages/seacas/libraries/chaco/main/defs.h b/packages/seacas/libraries/chaco/main/defs.h index 6b01e7c87af4..d15961c61960 100644 --- a/packages/seacas/libraries/chaco/main/defs.h +++ b/packages/seacas/libraries/chaco/main/defs.h @@ -5,7 +5,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #include diff --git a/packages/seacas/libraries/chaco/main/interface.c b/packages/seacas/libraries/chaco/main/interface.c index 30969ec0b1a2..f1bc68ba26ff 100644 --- a/packages/seacas/libraries/chaco/main/interface.c +++ b/packages/seacas/libraries/chaco/main/interface.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/main/main.c b/packages/seacas/libraries/chaco/main/main.c index 8285854a5acd..11be6a934379 100644 --- a/packages/seacas/libraries/chaco/main/main.c +++ b/packages/seacas/libraries/chaco/main/main.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/main/params.h b/packages/seacas/libraries/chaco/main/params.h index 5188c8c0d8d4..199047893c6f 100644 --- a/packages/seacas/libraries/chaco/main/params.h +++ b/packages/seacas/libraries/chaco/main/params.h @@ -5,7 +5,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #define NAME_LENGTH 256 /**< Maximum length of file name */ diff --git a/packages/seacas/libraries/chaco/main/structs.h b/packages/seacas/libraries/chaco/main/structs.h index f02cbb5180c4..70120b8e6c2a 100644 --- a/packages/seacas/libraries/chaco/main/structs.h +++ b/packages/seacas/libraries/chaco/main/structs.h @@ -5,7 +5,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /**< An array of these stores all the data for the graph/matrix. */ diff --git a/packages/seacas/libraries/chaco/main/user_params.c b/packages/seacas/libraries/chaco/main/user_params.c index d6d56dc939e3..c46f2229379a 100644 --- a/packages/seacas/libraries/chaco/main/user_params.c +++ b/packages/seacas/libraries/chaco/main/user_params.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/misc/count.c b/packages/seacas/libraries/chaco/misc/count.c index 805c6278befc..686e96593eb4 100644 --- a/packages/seacas/libraries/chaco/misc/count.c +++ b/packages/seacas/libraries/chaco/misc/count.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/misc/countup.c b/packages/seacas/libraries/chaco/misc/countup.c index fb394d18e30c..afd7a8d6127e 100644 --- a/packages/seacas/libraries/chaco/misc/countup.c +++ b/packages/seacas/libraries/chaco/misc/countup.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/misc/countup_cube.c b/packages/seacas/libraries/chaco/misc/countup_cube.c index aa454a7361b7..3a8282e8a2bc 100644 --- a/packages/seacas/libraries/chaco/misc/countup_cube.c +++ b/packages/seacas/libraries/chaco/misc/countup_cube.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/misc/countup_mesh.c b/packages/seacas/libraries/chaco/misc/countup_mesh.c index 96d9494cfc83..065273fe26dd 100644 --- a/packages/seacas/libraries/chaco/misc/countup_mesh.c +++ b/packages/seacas/libraries/chaco/misc/countup_mesh.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/misc/define_subcubes.c b/packages/seacas/libraries/chaco/misc/define_subcubes.c index 35ca4f7ef9d7..cf17702b5d53 100644 --- a/packages/seacas/libraries/chaco/misc/define_subcubes.c +++ b/packages/seacas/libraries/chaco/misc/define_subcubes.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/misc/define_submeshes.c b/packages/seacas/libraries/chaco/misc/define_submeshes.c index 0bdbca460ac5..4d532fb0b867 100644 --- a/packages/seacas/libraries/chaco/misc/define_submeshes.c +++ b/packages/seacas/libraries/chaco/misc/define_submeshes.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/misc/divide_procs.c b/packages/seacas/libraries/chaco/misc/divide_procs.c index b48c41f9e81e..7b87d0fc1ddb 100644 --- a/packages/seacas/libraries/chaco/misc/divide_procs.c +++ b/packages/seacas/libraries/chaco/misc/divide_procs.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/misc/find_maxdeg.c b/packages/seacas/libraries/chaco/misc/find_maxdeg.c index 113af3c0159b..328fc693f888 100644 --- a/packages/seacas/libraries/chaco/misc/find_maxdeg.c +++ b/packages/seacas/libraries/chaco/misc/find_maxdeg.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/misc/make_maps.c b/packages/seacas/libraries/chaco/misc/make_maps.c index ded445e0e90a..cb75e9dd57ea 100644 --- a/packages/seacas/libraries/chaco/misc/make_maps.c +++ b/packages/seacas/libraries/chaco/misc/make_maps.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/misc/make_setlists.c b/packages/seacas/libraries/chaco/misc/make_setlists.c index 1c522e1f65b7..d74546313477 100644 --- a/packages/seacas/libraries/chaco/misc/make_setlists.c +++ b/packages/seacas/libraries/chaco/misc/make_setlists.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/misc/make_subgoal.c b/packages/seacas/libraries/chaco/misc/make_subgoal.c index 1ebc8b69afa4..b4bc7a4f138a 100644 --- a/packages/seacas/libraries/chaco/misc/make_subgoal.c +++ b/packages/seacas/libraries/chaco/misc/make_subgoal.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/misc/make_term_props.c b/packages/seacas/libraries/chaco/misc/make_term_props.c index 223f1261544b..487dabcdb541 100644 --- a/packages/seacas/libraries/chaco/misc/make_term_props.c +++ b/packages/seacas/libraries/chaco/misc/make_term_props.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/misc/merge_goals.c b/packages/seacas/libraries/chaco/misc/merge_goals.c index d8d7eb6a622e..b4cc80414e70 100644 --- a/packages/seacas/libraries/chaco/misc/merge_goals.c +++ b/packages/seacas/libraries/chaco/misc/merge_goals.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/misc/perturb.c b/packages/seacas/libraries/chaco/misc/perturb.c index 7c9fcabf5688..f870aeb3e2b2 100644 --- a/packages/seacas/libraries/chaco/misc/perturb.c +++ b/packages/seacas/libraries/chaco/misc/perturb.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/misc/sequence.c b/packages/seacas/libraries/chaco/misc/sequence.c index 1659f0ce6758..2fc2448a0541 100644 --- a/packages/seacas/libraries/chaco/misc/sequence.c +++ b/packages/seacas/libraries/chaco/misc/sequence.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/misc/simple_part.c b/packages/seacas/libraries/chaco/misc/simple_part.c index 2f7df881a7b4..305f751d2822 100644 --- a/packages/seacas/libraries/chaco/misc/simple_part.c +++ b/packages/seacas/libraries/chaco/misc/simple_part.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/misc/time_kernels.c b/packages/seacas/libraries/chaco/misc/time_kernels.c index c896b2c49c8e..7fcddde2b72e 100644 --- a/packages/seacas/libraries/chaco/misc/time_kernels.c +++ b/packages/seacas/libraries/chaco/misc/time_kernels.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/misc/timing.c b/packages/seacas/libraries/chaco/misc/timing.c index e5b9de1cba05..5e881967c6f6 100644 --- a/packages/seacas/libraries/chaco/misc/timing.c +++ b/packages/seacas/libraries/chaco/misc/timing.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/optimize/determinant.c b/packages/seacas/libraries/chaco/optimize/determinant.c index e1105b6e08eb..2092cf54fc03 100644 --- a/packages/seacas/libraries/chaco/optimize/determinant.c +++ b/packages/seacas/libraries/chaco/optimize/determinant.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/optimize/func2d.c b/packages/seacas/libraries/chaco/optimize/func2d.c index 9f52171ea9b6..249ee78c12eb 100644 --- a/packages/seacas/libraries/chaco/optimize/func2d.c +++ b/packages/seacas/libraries/chaco/optimize/func2d.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/optimize/func3d.c b/packages/seacas/libraries/chaco/optimize/func3d.c index 3e372b549c1c..2cd71bf4407f 100644 --- a/packages/seacas/libraries/chaco/optimize/func3d.c +++ b/packages/seacas/libraries/chaco/optimize/func3d.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/optimize/opt2d.c b/packages/seacas/libraries/chaco/optimize/opt2d.c index c23b1a05bbd2..e20f43654d15 100644 --- a/packages/seacas/libraries/chaco/optimize/opt2d.c +++ b/packages/seacas/libraries/chaco/optimize/opt2d.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/optimize/opt3d.c b/packages/seacas/libraries/chaco/optimize/opt3d.c index cd9de32eee55..a1338b68a4c5 100644 --- a/packages/seacas/libraries/chaco/optimize/opt3d.c +++ b/packages/seacas/libraries/chaco/optimize/opt3d.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/refine_map/compute_cube_edata.c b/packages/seacas/libraries/chaco/refine_map/compute_cube_edata.c index a8fcdd05eb93..e1dc20ad7f11 100644 --- a/packages/seacas/libraries/chaco/refine_map/compute_cube_edata.c +++ b/packages/seacas/libraries/chaco/refine_map/compute_cube_edata.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/refine_map/compute_cube_vdata.c b/packages/seacas/libraries/chaco/refine_map/compute_cube_vdata.c index db62765edeec..acc2c0366d43 100644 --- a/packages/seacas/libraries/chaco/refine_map/compute_cube_vdata.c +++ b/packages/seacas/libraries/chaco/refine_map/compute_cube_vdata.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/refine_map/compute_mesh_edata.c b/packages/seacas/libraries/chaco/refine_map/compute_mesh_edata.c index b331f9355f0b..060b5be31e8e 100644 --- a/packages/seacas/libraries/chaco/refine_map/compute_mesh_edata.c +++ b/packages/seacas/libraries/chaco/refine_map/compute_mesh_edata.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/refine_map/compute_mesh_vdata.c b/packages/seacas/libraries/chaco/refine_map/compute_mesh_vdata.c index 8223a7442aaa..ba89c92d1c97 100644 --- a/packages/seacas/libraries/chaco/refine_map/compute_mesh_vdata.c +++ b/packages/seacas/libraries/chaco/refine_map/compute_mesh_vdata.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/refine_map/find_edge_cube.c b/packages/seacas/libraries/chaco/refine_map/find_edge_cube.c index fcb583a0589b..e747c4aad05e 100644 --- a/packages/seacas/libraries/chaco/refine_map/find_edge_cube.c +++ b/packages/seacas/libraries/chaco/refine_map/find_edge_cube.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/refine_map/find_edge_mesh.c b/packages/seacas/libraries/chaco/refine_map/find_edge_mesh.c index 15fb78bb3173..ef9d70e2d381 100644 --- a/packages/seacas/libraries/chaco/refine_map/find_edge_mesh.c +++ b/packages/seacas/libraries/chaco/refine_map/find_edge_mesh.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/refine_map/init_cube_edata.c b/packages/seacas/libraries/chaco/refine_map/init_cube_edata.c index 0661cca96604..c9fa59537405 100644 --- a/packages/seacas/libraries/chaco/refine_map/init_cube_edata.c +++ b/packages/seacas/libraries/chaco/refine_map/init_cube_edata.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/refine_map/init_mesh_edata.c b/packages/seacas/libraries/chaco/refine_map/init_mesh_edata.c index 8b508bc7d6ba..98c2a9676f90 100644 --- a/packages/seacas/libraries/chaco/refine_map/init_mesh_edata.c +++ b/packages/seacas/libraries/chaco/refine_map/init_mesh_edata.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/refine_map/make_comm_graph.c b/packages/seacas/libraries/chaco/refine_map/make_comm_graph.c index fd63e2f98aba..e5b1a916a9ac 100644 --- a/packages/seacas/libraries/chaco/refine_map/make_comm_graph.c +++ b/packages/seacas/libraries/chaco/refine_map/make_comm_graph.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/refine_map/refine_cube.c b/packages/seacas/libraries/chaco/refine_map/refine_cube.c index cdb32a0c9837..fdb7545f11d3 100644 --- a/packages/seacas/libraries/chaco/refine_map/refine_cube.c +++ b/packages/seacas/libraries/chaco/refine_map/refine_cube.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/refine_map/refine_map.c b/packages/seacas/libraries/chaco/refine_map/refine_map.c index 29cc3c57fbcb..5e688d868264 100644 --- a/packages/seacas/libraries/chaco/refine_map/refine_map.c +++ b/packages/seacas/libraries/chaco/refine_map/refine_map.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/refine_map/refine_map.h b/packages/seacas/libraries/chaco/refine_map/refine_map.h index 8fa4f05f4e3b..9a703b5503b3 100644 --- a/packages/seacas/libraries/chaco/refine_map/refine_map.h +++ b/packages/seacas/libraries/chaco/refine_map/refine_map.h @@ -5,7 +5,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ struct refine_vdata diff --git a/packages/seacas/libraries/chaco/refine_map/refine_mesh.c b/packages/seacas/libraries/chaco/refine_map/refine_mesh.c index 13cd5001b7dd..c21bef6872e4 100644 --- a/packages/seacas/libraries/chaco/refine_map/refine_mesh.c +++ b/packages/seacas/libraries/chaco/refine_map/refine_mesh.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/refine_map/update_cube_edata.c b/packages/seacas/libraries/chaco/refine_map/update_cube_edata.c index 91fe1d849251..91e5ac07b04b 100644 --- a/packages/seacas/libraries/chaco/refine_map/update_cube_edata.c +++ b/packages/seacas/libraries/chaco/refine_map/update_cube_edata.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/refine_map/update_cube_vdata.c b/packages/seacas/libraries/chaco/refine_map/update_cube_vdata.c index 877774d60c87..5810f4a93e8f 100644 --- a/packages/seacas/libraries/chaco/refine_map/update_cube_vdata.c +++ b/packages/seacas/libraries/chaco/refine_map/update_cube_vdata.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/refine_map/update_mesh_edata.c b/packages/seacas/libraries/chaco/refine_map/update_mesh_edata.c index f6af85522435..a9e59f9ee771 100644 --- a/packages/seacas/libraries/chaco/refine_map/update_mesh_edata.c +++ b/packages/seacas/libraries/chaco/refine_map/update_mesh_edata.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/refine_map/update_mesh_vdata.c b/packages/seacas/libraries/chaco/refine_map/update_mesh_vdata.c index d7542b16b336..f2c8722661ac 100644 --- a/packages/seacas/libraries/chaco/refine_map/update_mesh_vdata.c +++ b/packages/seacas/libraries/chaco/refine_map/update_mesh_vdata.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/refine_part/kl_refine.c b/packages/seacas/libraries/chaco/refine_part/kl_refine.c index 55d9e52aca2e..967a69006f21 100644 --- a/packages/seacas/libraries/chaco/refine_part/kl_refine.c +++ b/packages/seacas/libraries/chaco/refine_part/kl_refine.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/refine_part/make_maps_ref.c b/packages/seacas/libraries/chaco/refine_part/make_maps_ref.c index 17567b4991cc..f4c06dad40cb 100644 --- a/packages/seacas/libraries/chaco/refine_part/make_maps_ref.c +++ b/packages/seacas/libraries/chaco/refine_part/make_maps_ref.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/refine_part/make_terms_ref.c b/packages/seacas/libraries/chaco/refine_part/make_terms_ref.c index a6b1f4335f58..2f1c8cc49f90 100644 --- a/packages/seacas/libraries/chaco/refine_part/make_terms_ref.c +++ b/packages/seacas/libraries/chaco/refine_part/make_terms_ref.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/refine_part/refine_part.c b/packages/seacas/libraries/chaco/refine_part/refine_part.c index e5ead45b0ade..884822413904 100644 --- a/packages/seacas/libraries/chaco/refine_part/refine_part.c +++ b/packages/seacas/libraries/chaco/refine_part/refine_part.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/submain/balance.c b/packages/seacas/libraries/chaco/submain/balance.c index 40e358afaf7a..35e943ecf400 100644 --- a/packages/seacas/libraries/chaco/submain/balance.c +++ b/packages/seacas/libraries/chaco/submain/balance.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/submain/divide.c b/packages/seacas/libraries/chaco/submain/divide.c index 0aee64825e9e..dd5d93d53726 100644 --- a/packages/seacas/libraries/chaco/submain/divide.c +++ b/packages/seacas/libraries/chaco/submain/divide.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/submain/submain.c b/packages/seacas/libraries/chaco/submain/submain.c index 864b8aadb517..c2ba1caa9221 100644 --- a/packages/seacas/libraries/chaco/submain/submain.c +++ b/packages/seacas/libraries/chaco/submain/submain.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/symmlq/aprod.c b/packages/seacas/libraries/chaco/symmlq/aprod.c index a513ba4450e7..141e4ffeed97 100644 --- a/packages/seacas/libraries/chaco/symmlq/aprod.c +++ b/packages/seacas/libraries/chaco/symmlq/aprod.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/symmlq/msolve.c b/packages/seacas/libraries/chaco/symmlq/msolve.c index 6ce5de1dc296..456e7bc00a8d 100644 --- a/packages/seacas/libraries/chaco/symmlq/msolve.c +++ b/packages/seacas/libraries/chaco/symmlq/msolve.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/symmlq/symmlq.c b/packages/seacas/libraries/chaco/symmlq/symmlq.c index 4f54a5be3248..6fd95aa02b7c 100644 --- a/packages/seacas/libraries/chaco/symmlq/symmlq.c +++ b/packages/seacas/libraries/chaco/symmlq/symmlq.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /* symmlq.f -- translated by f2c (version of 16 May 1991 13:06:06). diff --git a/packages/seacas/libraries/chaco/symmlq/symmlq.f b/packages/seacas/libraries/chaco/symmlq/symmlq.f index d6afbe24e887..849633717800 100644 --- a/packages/seacas/libraries/chaco/symmlq/symmlq.f +++ b/packages/seacas/libraries/chaco/symmlq/symmlq.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details subroutine symmlq( n, b, r1, r2, v, w, x, y, work, @@ -424,7 +424,6 @@ subroutine symmlq( n, b, r1, r2, v, w, x, y, work, $ 'Norm of iterate > max for well conditioned system' / * ------------------------------------------------------------------ - * Compute eps, the machine precision. The call to chdaxpy is * intended to fool compilers that use extra-length registers. @@ -658,7 +657,6 @@ subroutine symmlq( n, b, r1, r2, v, w, x, y, work, c if (mod(itn,10) .eq. 0) write(nout, 1500) * ================================================================== - * Obtain the current Lanczos vector v = (1 / beta)*y * and set up y for the next iteration. @@ -783,4 +781,3 @@ subroutine symmlq( n, b, r1, r2, v, w, x, y, work, * end of SYMMLQ end - diff --git a/packages/seacas/libraries/chaco/symmlq/symmlqblas.c b/packages/seacas/libraries/chaco/symmlq/symmlqblas.c index dcfce26f47bf..7fa49670ee46 100644 --- a/packages/seacas/libraries/chaco/symmlq/symmlqblas.c +++ b/packages/seacas/libraries/chaco/symmlq/symmlqblas.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /* symmlqblas.f -- translated by f2c (version of 16 May 1991 13:06:06). diff --git a/packages/seacas/libraries/chaco/symmlq/symmlqblas.f b/packages/seacas/libraries/chaco/symmlq/symmlqblas.f index 902a468f676c..b1e2c84f95ec 100644 --- a/packages/seacas/libraries/chaco/symmlq/symmlqblas.f +++ b/packages/seacas/libraries/chaco/symmlq/symmlqblas.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details *++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ @@ -17,21 +17,21 @@ *++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ subroutine daxpy(n,da,dx,incx,dy,incy) -c + c constant times a vector plus a vector. c uses unrolled loops for increments equal to one. c jack dongarra, linpack, 3/11/78. -c + double precision dx(*),dy(*),da integer i,incx,incy,ix,iy,m,mp1,n -c + if(n.le.0)return if (da .eq. 0.0d0) return if(incx.eq.1.and.incy.eq.1)go to 20 -c + c code for unequal increments or equal increments c not equal to 1 -c + ix = 1 iy = 1 if(incx.lt.0)ix = (-n+1)*incx + 1 @@ -42,12 +42,11 @@ subroutine daxpy(n,da,dx,incx,dy,incy) iy = iy + incy 10 continue return -c + c code for both increments equal to 1 -c -c + c clean-up loop -c + 20 m = mod(n,4) if( m .eq. 0 ) go to 40 do 30 i = 1,m @@ -67,20 +66,20 @@ subroutine daxpy(n,da,dx,incx,dy,incy) *++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ subroutine dcopy(n,dx,incx,dy,incy) -c + c copies a vector, x, to a vector, y. c uses unrolled loops for increments equal to one. c jack dongarra, linpack, 3/11/78. -c + double precision dx(*),dy(*) integer i,incx,incy,ix,iy,m,mp1,n -c + if(n.le.0)return if(incx.eq.1.and.incy.eq.1)go to 20 -c + c code for unequal increments or equal increments c not equal to 1 -c + ix = 1 iy = 1 if(incx.lt.0)ix = (-n+1)*incx + 1 @@ -91,12 +90,11 @@ subroutine dcopy(n,dx,incx,dy,incy) iy = iy + incy 10 continue return -c + c code for both increments equal to 1 -c -c + c clean-up loop -c + 20 m = mod(n,7) if( m .eq. 0 ) go to 40 do 30 i = 1,m @@ -119,22 +117,22 @@ subroutine dcopy(n,dx,incx,dy,incy) *++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ double precision function ddot(n,dx,incx,dy,incy) -c + c forms the dot product of two vectors. c uses unrolled loops for increments equal to one. c jack dongarra, linpack, 3/11/78. -c + double precision dx(*),dy(*),dtemp integer i,incx,incy,ix,iy,m,mp1,n -c + ddot = 0.0d0 dtemp = 0.0d0 if(n.le.0)return if(incx.eq.1.and.incy.eq.1)go to 20 -c + c code for unequal increments or equal increments c not equal to 1 -c + ix = 1 iy = 1 if(incx.lt.0)ix = (-n+1)*incx + 1 @@ -146,12 +144,11 @@ double precision function ddot(n,dx,incx,dy,incy) 10 continue ddot = dtemp return -c + c code for both increments equal to 1 -c -c + c clean-up loop -c + 20 m = mod(n,5) if( m .eq. 0 ) go to 40 do 30 i = 1,m @@ -173,14 +170,14 @@ double precision function dnrm2 ( n, dx, incx) integer next double precision dx(*), cutlo, cuthi, hitest, sum, xmax,zero,one data zero, one /0.0d0, 1.0d0/ -c + c euclidean norm of the n-vector stored in dx() with storage c increment incx . c if n .le. 0 return with result = 0. c if n .ge. 1 then incx must be .ge. 1 -c + c c.l.lawson, 1978 jan 08 -c + c four phase method using two built-in constants that are c hopefully applicable to all machines. c cutlo = maximum of dsqrt(u/eps) over all known machines. @@ -189,15 +186,15 @@ double precision function dnrm2 ( n, dx, incx) c eps = smallest no. such that eps + 1. .gt. 1. c u = smallest positive no. (underflow limit) c v = largest no. (overflow limit) -c + c brief outline of algorithm.. -c + c phase 1 scans zero components. c move to phase 2 when a component is nonzero and .le. cutlo c move to phase 3 when a component is .gt. cutlo c move to phase 4 when a component is .ge. cuthi/m c where m = n for x() real and m = 2*n for complex. -c + c values for cutlo and cuthi.. c from the environmental parameters listed in the imsl converter c document the limiting values are as follows.. @@ -212,11 +209,11 @@ double precision function dnrm2 ( n, dx, incx) c data cutlo, cuthi / 8.232d-11, 1.304d19 / c data cutlo, cuthi / 4.441e-16, 1.304e19 / data cutlo, cuthi / 8.232d-11, 1.304d19 / -c + if(n .gt. 0) go to 10 dnrm2 = zero go to 300 -c + 10 assign 30 to next sum = zero nn = n * incx @@ -226,67 +223,65 @@ double precision function dnrm2 ( n, dx, incx) 30 if( dabs(dx(i)) .gt. cutlo) go to 85 assign 50 to next xmax = zero -c + c phase 1. sum is zero -c + 50 if( dx(i) .eq. zero) go to 200 if( dabs(dx(i)) .gt. cutlo) go to 85 -c + c prepare for phase 2. assign 70 to next go to 105 -c + c prepare for phase 4. -c + 100 i = j assign 110 to next sum = (sum / dx(i)) / dx(i) 105 xmax = dabs(dx(i)) go to 115 -c + c phase 2. sum is small. c scale to avoid destructive underflow. -c + 70 if( dabs(dx(i)) .gt. cutlo ) go to 75 -c + c common code for phases 2 and 4. c in phase 4 sum is large. scale to avoid overflow. -c + 110 if( dabs(dx(i)) .le. xmax ) go to 115 sum = one + sum * (xmax / dx(i))**2 xmax = dabs(dx(i)) go to 200 -c + 115 sum = sum + (dx(i)/xmax)**2 go to 200 -c -c + c prepare for phase 3. -c + 75 sum = (sum * xmax) * xmax -c -c + c for real or d.p. set hitest = cuthi/n c for complex set hitest = cuthi/(2*n) -c + 85 hitest = cuthi/float( n ) -c + c phase 3. sum is mid-range. no scaling. -c + do 95 j =i,nn,incx if(dabs(dx(j)) .ge. hitest) go to 100 95 sum = sum + dx(j)**2 dnrm2 = dsqrt( sum ) go to 300 -c + 200 continue i = i + incx if ( i .le. nn ) go to 20 -c + c end of main loop. -c + c compute square root and adjust for scaling. -c + dnrm2 = xmax * dsqrt(sum) 300 continue return diff --git a/packages/seacas/libraries/chaco/tinvit/tinvit.c b/packages/seacas/libraries/chaco/tinvit/tinvit.c index 400b9fa9066e..5ae7f0900e64 100644 --- a/packages/seacas/libraries/chaco/tinvit/tinvit.c +++ b/packages/seacas/libraries/chaco/tinvit/tinvit.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /* tinvit.f -- translated by f2c (version of 16 May 1991 13:06:06). diff --git a/packages/seacas/libraries/chaco/tinvit/tinvit.f b/packages/seacas/libraries/chaco/tinvit/tinvit.f index 4597b5be4ffb..d551d04c9236 100644 --- a/packages/seacas/libraries/chaco/tinvit/tinvit.f +++ b/packages/seacas/libraries/chaco/tinvit/tinvit.f @@ -1,40 +1,40 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details subroutine tinvit(nm,n,d,e,e2,m,w,ind,z, x ierr,rv1,rv2,rv3,rv4,rv6) -c + integer i,j,m,n,p,q,r,s,ii,ip,jj,nm,its,tag,ierr,group double precision d(n),e(n),e2(n),w(m),z(nm,m), x rv1(n),rv2(n),rv3(n),rv4(n),rv6(n) double precision u,v,uk,xu,x0,x1,eps2,eps3,eps4,norm,order,epslon, x pythag integer ind(m) -c + c this subroutine is a translation of the inverse iteration tech- c nique in the algol procedure tristurm by peters and wilkinson. c handbook for auto. comp., vol.ii-linear algebra, 418-439(1971). -c + c this subroutine finds those eigenvectors of a tridiagonal c symmetric matrix corresponding to specified eigenvalues, c using inverse iteration. -c + c on input -c + c nm must be set to the row dimension of two-dimensional c array parameters as declared in the calling program c dimension statement. -c + c n is the order of the matrix. -c + c d contains the diagonal elements of the input matrix. -c + c e contains the subdiagonal elements of the input matrix c in its last n-1 positions. e(1) is arbitrary. -c + c e2 contains the squares of the corresponding elements of e, c with zeros corresponding to negligible elements of e. c e(i) is considered negligible if it is not larger than @@ -44,39 +44,39 @@ subroutine tinvit(nm,n,d,e,e2,m,w,ind,z, c if the eigenvalues are in descending order. if bisect, c tridib, or imtqlv has been used to find the eigenvalues, c their output e2 array is exactly what is expected here. -c + c m is the number of specified eigenvalues. -c + c w contains the m eigenvalues in ascending or descending order. -c + c ind contains in its first m positions the submatrix indices c associated with the corresponding eigenvalues in w -- c 1 for eigenvalues belonging to the first submatrix from c the top, 2 for those belonging to the second submatrix, etc. -c + c on output -c + c all input arrays are unaltered. -c + c z contains the associated set of orthonormal eigenvectors. c any vector which fails to converge is set to zero. -c + c ierr is set to c zero for normal return, c -r if the eigenvector corresponding to the r-th c eigenvalue fails to converge in 5 iterations. -c + c rv1, rv2, rv3, rv4, and rv6 are temporary storage arrays. -c + c calls pythag for dsqrt(a*a + b*b) . -c + c questions and comments should be directed to burton s. garbow, c mathematics and computer science div, argonne national laboratory -c + c this version dated august 1983. -c + c ------------------------------------------------------------------ -c + ierr = 0 if (m .eq. 0) go to 1001 tag = 0 @@ -84,7 +84,7 @@ subroutine tinvit(nm,n,d,e,e2,m,w,ind,z, q = 0 c .......... establish and process next submatrix .......... 100 p = q + 1 -c + do 120 q = p, n if (q .eq. n) go to 140 if (e2(q+1) .eq. 0.0d0) go to 140 @@ -92,7 +92,7 @@ subroutine tinvit(nm,n,d,e,e2,m,w,ind,z, c .......... find vectors by inverse iteration .......... 140 tag = tag + 1 s = 0 -c + do 920 r = 1, m if (ind(r) .ne. tag) go to 920 its = 1 @@ -105,7 +105,7 @@ subroutine tinvit(nm,n,d,e,e2,m,w,ind,z, go to 870 490 norm = dabs(d(p)) ip = p + 1 -c + do 500 i = ip, q 500 norm = dmax1(norm, dabs(d(i))+dabs(e(i))) c .......... eps2 is the criterion for grouping, @@ -127,7 +127,7 @@ subroutine tinvit(nm,n,d,e,e2,m,w,ind,z, c .......... elimination with interchanges and c initialization of vector .......... 520 v = 0.0d0 -c + do 580 i = p, q rv6(i) = uk if (i .eq. p) go to 560 @@ -151,7 +151,7 @@ subroutine tinvit(nm,n,d,e,e2,m,w,ind,z, 560 u = d(i) - x1 - xu * v if (i .ne. q) v = e(i+1) 580 continue -c + if (u .eq. 0.0d0) u = eps3 rv1(q) = u rv2(q) = 0.0d0 @@ -168,25 +168,25 @@ subroutine tinvit(nm,n,d,e,e2,m,w,ind,z, c members of group .......... if (group .eq. 0) go to 700 j = r -c + do 680 jj = 1, group 630 j = j - 1 if (ind(j) .ne. tag) go to 630 xu = 0.0d0 -c + do 640 i = p, q 640 xu = xu + rv6(i) * z(i,j) -c + do 660 i = p, q 660 rv6(i) = rv6(i) - xu * z(i,j) -c + 680 continue -c + 700 norm = 0.0d0 -c + do 720 i = p, q 720 norm = norm + dabs(rv6(i)) -c + if (norm .ge. 1.0d0) go to 840 c .......... forward substitution .......... if (its .eq. 5) go to 830 @@ -196,7 +196,7 @@ subroutine tinvit(nm,n,d,e,e2,m,w,ind,z, if (s .gt. q) s = p go to 780 740 xu = eps4 / norm -c + do 760 i = p, q 760 rv6(i) = rv6(i) * xu c .......... elimination operations on next vector @@ -211,7 +211,7 @@ subroutine tinvit(nm,n,d,e,e2,m,w,ind,z, rv6(i-1) = rv6(i) 800 rv6(i) = u - rv4(i) * rv6(i-1) 820 continue -c + its = its + 1 go to 600 c .......... set error -- non-converged eigenvector .......... @@ -221,21 +221,21 @@ subroutine tinvit(nm,n,d,e,e2,m,w,ind,z, c .......... normalize so that sum of squares is c 1 and expand to full order .......... 840 u = 0.0d0 -c + do 860 i = p, q 860 u = pythag(u,rv6(i)) -c + xu = 1.0d0 / u -c + 870 do 880 i = 1, n 880 z(i,r) = 0.0d0 -c + do 900 i = p, q 900 z(i,r) = rv6(i) * xu -c + x0 = x1 920 continue -c + if (q .lt. n) go to 100 1001 return end diff --git a/packages/seacas/libraries/chaco/util/affirm.c b/packages/seacas/libraries/chaco/util/affirm.c index 98a77d398eeb..34707b25f45f 100644 --- a/packages/seacas/libraries/chaco/util/affirm.c +++ b/packages/seacas/libraries/chaco/util/affirm.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/util/array_alloc_2D.c b/packages/seacas/libraries/chaco/util/array_alloc_2D.c index a05e155005ee..38243e62ff16 100644 --- a/packages/seacas/libraries/chaco/util/array_alloc_2D.c +++ b/packages/seacas/libraries/chaco/util/array_alloc_2D.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/util/bail.c b/packages/seacas/libraries/chaco/util/bail.c index e7f5de28aa22..3114704f2cb6 100644 --- a/packages/seacas/libraries/chaco/util/bail.c +++ b/packages/seacas/libraries/chaco/util/bail.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/util/bit_reverse.c b/packages/seacas/libraries/chaco/util/bit_reverse.c index 732f1c5e092a..c2cfd497bdb7 100644 --- a/packages/seacas/libraries/chaco/util/bit_reverse.c +++ b/packages/seacas/libraries/chaco/util/bit_reverse.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/util/chaco_random.h b/packages/seacas/libraries/chaco/util/chaco_random.h index 6fa3fc39ee64..2d1a9acdebbd 100644 --- a/packages/seacas/libraries/chaco/util/chaco_random.h +++ b/packages/seacas/libraries/chaco/util/chaco_random.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #ifndef CHACO_UTIL_CHACO_RANDOM_H diff --git a/packages/seacas/libraries/chaco/util/checkpnt.c b/packages/seacas/libraries/chaco/util/checkpnt.c index f2124dffa1ad..66d8e5361470 100644 --- a/packages/seacas/libraries/chaco/util/checkpnt.c +++ b/packages/seacas/libraries/chaco/util/checkpnt.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/util/cpvec.c b/packages/seacas/libraries/chaco/util/cpvec.c index 6a525e8bf156..bbf5989cfb03 100644 --- a/packages/seacas/libraries/chaco/util/cpvec.c +++ b/packages/seacas/libraries/chaco/util/cpvec.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/util/dot.c b/packages/seacas/libraries/chaco/util/dot.c index fa2bdc6e27a3..3e68d57dba8a 100644 --- a/packages/seacas/libraries/chaco/util/dot.c +++ b/packages/seacas/libraries/chaco/util/dot.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/util/doubleout.c b/packages/seacas/libraries/chaco/util/doubleout.c index 8fd642a33754..cb1983358c41 100644 --- a/packages/seacas/libraries/chaco/util/doubleout.c +++ b/packages/seacas/libraries/chaco/util/doubleout.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/util/gray.c b/packages/seacas/libraries/chaco/util/gray.c index ac7f9b96c890..e522ab0bb7c1 100644 --- a/packages/seacas/libraries/chaco/util/gray.c +++ b/packages/seacas/libraries/chaco/util/gray.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/util/input_int.c b/packages/seacas/libraries/chaco/util/input_int.c index cab3bc8f4e67..ca1b685b27ef 100644 --- a/packages/seacas/libraries/chaco/util/input_int.c +++ b/packages/seacas/libraries/chaco/util/input_int.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/util/machine_params.c b/packages/seacas/libraries/chaco/util/machine_params.c index c59f29c36883..1b1cb4eb6daf 100644 --- a/packages/seacas/libraries/chaco/util/machine_params.c +++ b/packages/seacas/libraries/chaco/util/machine_params.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/util/makevwsqrt.c b/packages/seacas/libraries/chaco/util/makevwsqrt.c index 278485077568..a9979e29fe82 100644 --- a/packages/seacas/libraries/chaco/util/makevwsqrt.c +++ b/packages/seacas/libraries/chaco/util/makevwsqrt.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/util/mergesort.c b/packages/seacas/libraries/chaco/util/mergesort.c index 86f863930b70..e4d97cfe3a7e 100644 --- a/packages/seacas/libraries/chaco/util/mergesort.c +++ b/packages/seacas/libraries/chaco/util/mergesort.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/util/mkvec.c b/packages/seacas/libraries/chaco/util/mkvec.c index b63e5192cc44..20424deea4bf 100644 --- a/packages/seacas/libraries/chaco/util/mkvec.c +++ b/packages/seacas/libraries/chaco/util/mkvec.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/util/norm.c b/packages/seacas/libraries/chaco/util/norm.c index 61ae8adc8c9f..d49c724cf370 100644 --- a/packages/seacas/libraries/chaco/util/norm.c +++ b/packages/seacas/libraries/chaco/util/norm.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/util/normalize.c b/packages/seacas/libraries/chaco/util/normalize.c index f6cf5a55e6a9..c45e094a0ef0 100644 --- a/packages/seacas/libraries/chaco/util/normalize.c +++ b/packages/seacas/libraries/chaco/util/normalize.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/util/random.c b/packages/seacas/libraries/chaco/util/random.c index c2309824a788..6c3e288e0585 100644 --- a/packages/seacas/libraries/chaco/util/random.c +++ b/packages/seacas/libraries/chaco/util/random.c @@ -9,7 +9,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/util/randomize.c b/packages/seacas/libraries/chaco/util/randomize.c index 7a8e478a9d92..052e9a901d12 100644 --- a/packages/seacas/libraries/chaco/util/randomize.c +++ b/packages/seacas/libraries/chaco/util/randomize.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/util/scadd.c b/packages/seacas/libraries/chaco/util/scadd.c index e4038874be34..ef7f4e4b0d00 100644 --- a/packages/seacas/libraries/chaco/util/scadd.c +++ b/packages/seacas/libraries/chaco/util/scadd.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/util/seconds.c b/packages/seacas/libraries/chaco/util/seconds.c index 0ad7aa3a544f..d8c91be9da99 100644 --- a/packages/seacas/libraries/chaco/util/seconds.c +++ b/packages/seacas/libraries/chaco/util/seconds.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #ifndef _MSC_VER diff --git a/packages/seacas/libraries/chaco/util/seconds.i b/packages/seacas/libraries/chaco/util/seconds.i index 65c025690581..2ab8c99b22df 100644 --- a/packages/seacas/libraries/chaco/util/seconds.i +++ b/packages/seacas/libraries/chaco/util/seconds.i @@ -1,31 +1,9 @@ - - - - - - - - - - - - - - typedef unsigned long clock_t; - - - typedef long time_t; - - - typedef unsigned int size_t; - - struct tm { int tm_sec; int tm_min; @@ -38,43 +16,21 @@ int tm_isdst; }; - - - - - - - - struct timeval { unsigned long tv_sec; long tv_usec; }; - - struct timezone { int tz_minuteswest; int tz_dsttime; }; - struct itimerval { struct timeval it_interval; struct timeval it_value; }; - - - - - - - - - - - extern double difftime(time_t, time_t); extern time_t mktime(struct tm *); extern time_t time(time_t *); @@ -84,52 +40,17 @@ extern struct tm *localtime(const time_t *); extern size_t strftime(char *, size_t, const char *, const struct tm *); - - - - - - - - - - - - - - extern clock_t clock(void); - - - - - - - extern void tzset(void); - - - extern char *tzname[2]; - - - - extern char *strptime(const char *, const char *, struct tm *); - - - extern long timezone; extern int daylight; - - - - extern struct tm *getdate(const char *); extern char *nl_asctime(struct tm *, char *, int); extern char *nl_ctime(long *, char *, int); @@ -143,150 +64,45 @@ extern int stime(const time_t *); extern void profil(const void *, size_t, size_t, int); - - - - - - - - - - - - - extern int getdate_err; - - - - - - - - - - - - - - - - - - - - - - - - - - - - struct ki_timeval { long tv_sec; long tv_nunit; }; - - - - typedef long dev_t; - - - typedef unsigned long ino_t; - - - typedef unsigned short mode_t; - - - typedef short nlink_t; - - - typedef long off_t; - - - typedef long pid_t; - - - typedef long gid_t; - - - typedef long uid_t; - - - - - - - - - - - - - typedef int ssize_t; - - - typedef unsigned short __site_t; - - - typedef unsigned short __cnode_t; - - - - - - - - - - typedef long key_t; - typedef unsigned short __ushort; typedef long __daddr_t; typedef char *__caddr_t; typedef long __swblk_t; - - - - - - typedef __caddr_t caddr_t; - - - typedef unsigned char u_char; typedef unsigned short u_short; typedef unsigned int u_int; @@ -317,34 +133,6 @@ typedef char spu_t; - - - - - - - - - - - - - - - - - - - - - - - - - - - - typedef short cpu_t; typedef struct label_t { int lbl_rp; @@ -354,133 +142,26 @@ double lbl_sf[4]; } label_t; - - typedef char *dm_message; - - - typedef long aid_t; - - - - - - - typedef pid_t sid_t; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - typedef long fd_mask; - - - - - - typedef struct fd_set { fd_mask fds_bits[ (((2048)+(((sizeof(fd_mask) * 8))-1))/((sizeof(fd_mask) * 8))) ]; } fd_set; - - - - - struct rlimit { int rlim_cur; int rlim_max; }; - - - - - - - - - extern int getrlimit(int, struct rlimit *); extern int setrlimit(int, const struct rlimit *); - - - - - - - - - - - - - - - - - - - - - - - - - - - - - struct rusage { struct timeval ru_utime; struct timeval ru_stime; @@ -508,9 +189,6 @@ double seconds() { double curtime; - - - struct rusage rusage; int getrusage(); @@ -518,13 +196,5 @@ double seconds() curtime = ((rusage.ru_utime.tv_sec + rusage.ru_stime.tv_sec) + 1.0e-6 * (rusage.ru_utime.tv_usec + rusage.ru_stime.tv_usec)); - - - - - - - - return (curtime); } diff --git a/packages/seacas/libraries/chaco/util/setvec.c b/packages/seacas/libraries/chaco/util/setvec.c index 8d865675ebc9..c9f4413acc01 100644 --- a/packages/seacas/libraries/chaco/util/setvec.c +++ b/packages/seacas/libraries/chaco/util/setvec.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/util/shell_sort.c b/packages/seacas/libraries/chaco/util/shell_sort.c index c3f0f3bacfc8..dbe22a1551df 100644 --- a/packages/seacas/libraries/chaco/util/shell_sort.c +++ b/packages/seacas/libraries/chaco/util/shell_sort.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #define SWAP(type, r, s) \ diff --git a/packages/seacas/libraries/chaco/util/smalloc.c b/packages/seacas/libraries/chaco/util/smalloc.c index 38b43426b1d2..1fa112c2a07d 100644 --- a/packages/seacas/libraries/chaco/util/smalloc.c +++ b/packages/seacas/libraries/chaco/util/smalloc.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/util/smalloc.h b/packages/seacas/libraries/chaco/util/smalloc.h index 2c17a879e507..fc78e7905bc4 100644 --- a/packages/seacas/libraries/chaco/util/smalloc.h +++ b/packages/seacas/libraries/chaco/util/smalloc.h @@ -5,7 +5,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #include diff --git a/packages/seacas/libraries/chaco/util/strout.c b/packages/seacas/libraries/chaco/util/strout.c index 6a6087f05668..64fd2c09f57e 100644 --- a/packages/seacas/libraries/chaco/util/strout.c +++ b/packages/seacas/libraries/chaco/util/strout.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/util/tri_prod.c b/packages/seacas/libraries/chaco/util/tri_prod.c index 70ccd65a9159..55502daa2ecd 100644 --- a/packages/seacas/libraries/chaco/util/tri_prod.c +++ b/packages/seacas/libraries/chaco/util/tri_prod.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/util/true_or_false.c b/packages/seacas/libraries/chaco/util/true_or_false.c index 1ee660137e89..f5f1f7c97775 100644 --- a/packages/seacas/libraries/chaco/util/true_or_false.c +++ b/packages/seacas/libraries/chaco/util/true_or_false.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/util/update.c b/packages/seacas/libraries/chaco/util/update.c index 4654e6321480..69286ac3c994 100644 --- a/packages/seacas/libraries/chaco/util/update.c +++ b/packages/seacas/libraries/chaco/util/update.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/util/vecout.c b/packages/seacas/libraries/chaco/util/vecout.c index 5dfb196ec9f8..65580b21752e 100644 --- a/packages/seacas/libraries/chaco/util/vecout.c +++ b/packages/seacas/libraries/chaco/util/vecout.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/util/vecran.c b/packages/seacas/libraries/chaco/util/vecran.c index 9dd307e21708..335849db416c 100644 --- a/packages/seacas/libraries/chaco/util/vecran.c +++ b/packages/seacas/libraries/chaco/util/vecran.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/chaco/util/vecscale.c b/packages/seacas/libraries/chaco/util/vecscale.c index 0e0069280ef6..3eb4e0d33acd 100644 --- a/packages/seacas/libraries/chaco/util/vecscale.c +++ b/packages/seacas/libraries/chaco/util/vecscale.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exoIIv2for32/src/exo_jack_32.c b/packages/seacas/libraries/exoIIv2for32/src/exo_jack_32.c index fd6dd7002f62..ccdd27d6185f 100644 --- a/packages/seacas/libraries/exoIIv2for32/src/exo_jack_32.c +++ b/packages/seacas/libraries/exoIIv2for32/src/exo_jack_32.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exoIIv2for32/test/CMakeLists.txt b/packages/seacas/libraries/exoIIv2for32/test/CMakeLists.txt index 7bbee3bad244..59a7b1eb1c67 100644 --- a/packages/seacas/libraries/exoIIv2for32/test/CMakeLists.txt +++ b/packages/seacas/libraries/exoIIv2for32/test/CMakeLists.txt @@ -1,7 +1,7 @@ # Copyright(C) 1999-2020 National Technology & Engineering Solutions # of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with # NTESS, the U.S. Government retains certain rights in this software. -# +# # See packages/seacas/LICENSE for details ADD_DEFINITIONS(-DUSING_CMAKE) @@ -24,7 +24,6 @@ endif() # =============================================== - IF ( NETCDF_NCDUMP_BINARY ) SET(NETCDF_NCDUMP ${NETCDF_NCDUMP_BINARY}) SET( forbind_OLDTESTS diff --git a/packages/seacas/libraries/exoIIv2for32/test/testall.in b/packages/seacas/libraries/exoIIv2for32/test/testall.in index ac2e528958dd..eec885246858 100644 --- a/packages/seacas/libraries/exoIIv2for32/test/testall.in +++ b/packages/seacas/libraries/exoIIv2for32/test/testall.in @@ -2,7 +2,7 @@ # Copyright(C) 1999-2020 National Technology & Engineering Solutions # of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with # NTESS, the U.S. Government retains certain rights in this software. -# +# # See packages/seacas/LICENSE for details # script to run all tests and compare them to saved dump files. diff --git a/packages/seacas/libraries/exoIIv2for32/test/testall_i64.in b/packages/seacas/libraries/exoIIv2for32/test/testall_i64.in index cd75724b686b..88882819fb25 100644 --- a/packages/seacas/libraries/exoIIv2for32/test/testall_i64.in +++ b/packages/seacas/libraries/exoIIv2for32/test/testall_i64.in @@ -2,7 +2,7 @@ # Copyright(C) 1999-2020 National Technology & Engineering Solutions # of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with # NTESS, the U.S. Government retains certain rights in this software. -# +# # See packages/seacas/LICENSE for details # script to run all tests and compare them to saved dump files. diff --git a/packages/seacas/libraries/exoIIv2for32/test/testrd.f b/packages/seacas/libraries/exoIIv2for32/test/testrd.f index 055867bd70fd..3aec617dca11 100644 --- a/packages/seacas/libraries/exoIIv2for32/test/testrd.f +++ b/packages/seacas/libraries/exoIIv2for32/test/testrd.f @@ -1,15 +1,14 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details program testrd -c c This is a test program for the Fortran binding of the EXODUS II c database read routines -c + implicit none include 'exodusII.inc' @@ -54,10 +53,7 @@ program testrd data iin /5/, iout /6/ - -c c open EXODUS II files -c cpu_ws = 4 io_ws = 4 @@ -81,9 +77,7 @@ program testrd write (iout, '(" Maximum Allowed/Used DB Name Size ",i4,i4)') * mxalnmlen, mxusnmlen -c c read database parameters -c call exgini (exoid, titl, num_dim, num_nodes, num_elem, 1 num_elem_blk, num_node_sets, num_side_sets, ierr) @@ -100,10 +94,7 @@ program testrd 8 titl,num_dim, num_nodes, num_elem, 9 num_elem_blk,num_node_sets, num_side_sets - -c c read nodal coordinates values and names from database -c call exgcor (exoid, x, y, z, ierr) write (iout, '(/"after exgcor, error = ", i3)' ) ierr @@ -131,9 +122,7 @@ program testrd write (iout, '("x coord name = ", a9)') coord_names(1) write (iout, '("y coord name = ", a9)') coord_names(2) -c c read element order map -c call exgmap (exoid, elem_map, ierr) write (iout, '(/"after exgmap, error = ", i3)' ) ierr @@ -142,10 +131,8 @@ program testrd write (iout, '("elem_map(",i1,") = ", i1)') i, elem_map(i) 30 continue -c c read element block parameters -c -c + call exgebi (exoid, ids, ierr) write (iout, '(/"after exgebi, error = ", i3)' ) ierr @@ -175,7 +162,6 @@ program testrd 1 '(/"There are ",i2," properties for each element block")') 2 num_props - call exgpn(exoid, EXEBLK, prop_names, ierr) write (iout, '("after exgpn, error = ", i3)' ) ierr @@ -192,9 +178,7 @@ program testrd 45 continue 47 continue -c c read element connectivity -c do 60 i = 1, num_elem_blk @@ -209,9 +193,8 @@ program testrd 60 continue -c c read element block names -c + call exgnams(exoid, EXEBLK, num_elem_blk, blk_names, ierr) write (iout, '(/"after exgnams, error = ", i3)' ) ierr do i=1, num_elem_blk @@ -219,9 +202,7 @@ program testrd 2 i, blk_names(i) end do -c c read element block attributes -c do 70 i = 1, num_elem_blk @@ -243,9 +224,8 @@ program testrd 69 format(A32," = ", 10(f6.4,2x)) 70 continue -c c read individual node sets -c + if (num_node_sets .gt. 0) then call exgnsi (exoid, ids, ierr) write (iout, '(/"after exgnsi, error = ", i3)' ) ierr @@ -285,9 +265,8 @@ program testrd 100 continue -c c read node set names -c + call exgnams(exoid, EXNSET, num_node_sets, nset_names, ierr) write (iout, '(/"after exgnams, error = ", i3)' ) ierr do i=1, num_node_sets @@ -295,7 +274,6 @@ program testrd 2 i, nset_names(i) end do - c read node set properties num_props = exinqi (exoid, EXNNSP) @@ -303,7 +281,6 @@ program testrd 1 '(/"There are ",i2," properties for each node set")') 2 num_props - call exgpn(exoid, EXNSET, prop_names, ierr) write (iout, '("after exgpn, error = ", i3)' ) ierr @@ -320,10 +297,9 @@ program testrd 105 continue 107 continue -c c read concatenated node sets; this produces the same information as c the above code which reads individual node sets -c + num_node_sets = exinqi (exoid, EXNODS) if (num_node_sets .gt. 0) then @@ -372,9 +348,8 @@ program testrd 150 continue endif -c c read individual side sets -c + if (num_side_sets .gt. 0) then call exgssi (exoid, ids, ierr) write (iout, '(/"after exgssi, error = ", i3)' ) ierr @@ -435,9 +410,8 @@ program testrd 190 continue -c c read side set names -c + call exgnams(exoid, EXSSET, num_side_sets, sset_names, ierr) write (iout, '(/"after exgnams, error = ", i3)' ) ierr do i=1, num_side_sets @@ -452,7 +426,6 @@ program testrd 1 '(/"There are ",i2," properties for each side set")') 2 num_props - call exgpn(exoid, EXSSET, prop_names, ierr) write (iout, '("after exgpn, error = ", i3)' ) ierr @@ -485,10 +458,10 @@ program testrd df_list_len = exinqi (exoid, EXSSDF) write (iout, '(/"after exinq: EXSSDF =",i3,", error = ",i3)') 1 df_list_len,ierr -c + c read concatenated side sets; this produces the same information as c the above code which reads individual side sets -c + call exgcss (exoid, ids, num_elem_per_set, num_df_per_set, 1 elem_ind, df_ind, elem_list, side_list, dist_fact, 2 ierr) @@ -545,9 +518,8 @@ program testrd 270 continue endif -c c read QA records -c + num_qa_rec = exinqi (exoid, EXQA) call exgqa (exoid, qa_record, ierr) write (iout, '(/"after exgqa, error = ", i3)' ) ierr @@ -560,9 +532,8 @@ program testrd 280 continue 290 continue -c c read information records -c + num_info = exinqi (exoid, EXINFO) call exginf (exoid, inform, ierr) write (iout, '(/"after exginf, error = ", i3)' ) ierr @@ -573,9 +544,8 @@ program testrd write (iout, '(a81)') inform(i) 300 continue -c c read global variables parameters and names -c + call exgvp (exoid, "g", num_glo_vars, ierr) write (iout, '(/"after exgvp, error = ", i3)' ) ierr @@ -589,9 +559,8 @@ program testrd write (iout, '(a9)') var_names(i) 320 continue -c c read nodal variables parameters and names -c + call exgvp (exoid, "n", num_nod_vars, ierr) write (iout, '(/"after exgvp, error = ", i3)' ) ierr @@ -605,9 +574,8 @@ program testrd write (iout, '(a9)') var_names(i) 330 continue -c c read element variables parameters and names -c + call exgvp (exoid, "e", num_ele_vars, ierr) write (iout, '(/"after exgvp, error = ", i3)' ) ierr @@ -621,9 +589,8 @@ program testrd write (iout, '(a9)') var_names(i) 340 continue -c c read element variable truth table -c + call exgvtt (exoid, num_elem_blk, num_ele_vars, truth_tab, ierr) write (iout, '(/"after exgvtt, error = ", i3)' ) ierr @@ -635,24 +602,23 @@ program testrd 350 continue 360 continue -c c determine how many time steps are stored -c + num_time_steps = exinqi (exoid, EXTIMS) write (iout, '("There are ",i2," time steps in the database.")') 1 num_time_steps -c + c read time value at one time step -c + time_step = 3 call exgtim (exoid, time_step, time_value, ierr) write (iout, '(/"after exgtim, error = ", i3)' ) ierr write (iout, '("time value at time step ",i2," = ", f5.3)') 1 time_step, time_value -c + c read time values at all time steps -c + call exgatm (exoid, time_values, ierr) write (iout, '(/"after exgatm, error = ", i3)' ) ierr @@ -665,9 +631,9 @@ program testrd var_index = 1 beg_time = 1 end_time = -1 -c + c read all global variables at one time step -c + call exggv (exoid, time_step, num_glo_vars, var_values, ierr) write (iout, '(/"after exggv, error = ", i3)' ) ierr @@ -678,9 +644,8 @@ program testrd write (iout, '(f5.3)') var_values(i) 400 continue -c c read a single global variable through time -c + call exggvt (exoid, var_index, beg_time, end_time, var_values, 1 ierr) write (iout, '(/"after exggvt, error = ", i3)' ) ierr @@ -692,9 +657,8 @@ program testrd write (iout, '(f5.3)') var_values(i) 410 continue -c c read a nodal variable at one time step -c + call exgnv (exoid, time_step, var_index, num_nodes, var_values, 1 ierr) write (iout, '(/"after exgnv, error = ", i3)' ) ierr @@ -706,9 +670,8 @@ program testrd write (iout, '(f5.3)') var_values(i) 420 continue -c c read a nodal variable through time -c + node_num = 1 call exgnvt (exoid, var_index, node_num, beg_time, end_time, @@ -722,9 +685,8 @@ program testrd write (iout, '(f5.3)') var_values(i) 430 continue -c c read an element variable at one time step -c + call exgebi (exoid, ids, ierr) write (iout, '(/"after exgebi, error = ", i3)' ) ierr @@ -746,9 +708,8 @@ program testrd 450 continue -c c read an element variable through time -c + var_index = 2 elem_num = 2 diff --git a/packages/seacas/libraries/exoIIv2for32/test/testrdd.f b/packages/seacas/libraries/exoIIv2for32/test/testrdd.f index a956c507699b..74811cdfc2f2 100644 --- a/packages/seacas/libraries/exoIIv2for32/test/testrdd.f +++ b/packages/seacas/libraries/exoIIv2for32/test/testrdd.f @@ -1,15 +1,14 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details program testrdd -c c This is a test program for the Fortran binding of the EXODUS II c database read routines -c + implicit none include 'exodusII.inc' @@ -54,10 +53,7 @@ program testrdd data iin /5/, iout /6/ - -c c open EXODUS II files -c cpu_ws = 8 io_ws = 8 @@ -81,9 +77,7 @@ program testrdd write (iout, '(" Maximum Allowed/Used DB Name Size ",i4,i4)') * mxalnmlen, mxusnmlen -c c read database parameters -c call exgini (exoid, titl, num_dim, num_nodes, num_elem, 1 num_elem_blk, num_node_sets, num_side_sets, ierr) @@ -100,10 +94,7 @@ program testrdd 8 titl,num_dim, num_nodes, num_elem, 9 num_elem_blk,num_node_sets, num_side_sets - -c c read nodal coordinates values and names from database -c call exgcor (exoid, x, y, z, ierr) write (iout, '(/"after exgcor, error = ", i3)' ) ierr @@ -131,9 +122,7 @@ program testrdd write (iout, '("x coord name = ", a9)') coord_names(1) write (iout, '("y coord name = ", a9)') coord_names(2) -c c read element order map -c call exgmap (exoid, elem_map, ierr) write (iout, '(/"after exgmap, error = ", i3)' ) ierr @@ -142,10 +131,8 @@ program testrdd write (iout, '("elem_map(",i1,") = ", i1)') i, elem_map(i) 30 continue -c c read element block parameters -c -c + call exgebi (exoid, ids, ierr) write (iout, '(/"after exgebi, error = ", i3)' ) ierr @@ -175,7 +162,6 @@ program testrdd 1 '(/"There are ",i2," properties for each element block")') 2 num_props - call exgpn(exoid, EXEBLK, prop_names, ierr) write (iout, '("after exgpn, error = ", i3)' ) ierr @@ -192,9 +178,7 @@ program testrdd 45 continue 47 continue -c c read element connectivity -c do 60 i = 1, num_elem_blk @@ -209,9 +193,8 @@ program testrdd 60 continue -c c read element block names -c + call exgnams(exoid, EXEBLK, num_elem_blk, blk_names, ierr) write (iout, '(/"after exgnams, error = ", i3)' ) ierr do i=1, num_elem_blk @@ -219,9 +202,7 @@ program testrdd 2 i, blk_names(i) end do -c c read element block attributes -c do 70 i = 1, num_elem_blk @@ -243,9 +224,8 @@ program testrdd 69 format(A32," = ", 10(f6.4,2x)) 70 continue -c c read individual node sets -c + if (num_node_sets .gt. 0) then call exgnsi (exoid, ids, ierr) write (iout, '(/"after exgnsi, error = ", i3)' ) ierr @@ -285,9 +265,8 @@ program testrdd 100 continue -c c read node set names -c + call exgnams(exoid, EXNSET, num_node_sets, nset_names, ierr) write (iout, '(/"after exgnams, error = ", i3)' ) ierr do i=1, num_node_sets @@ -295,7 +274,6 @@ program testrdd 2 i, nset_names(i) end do - c read node set properties num_props = exinqi (exoid, EXNNSP) @@ -303,7 +281,6 @@ program testrdd 1 '(/"There are ",i2," properties for each node set")') 2 num_props - call exgpn(exoid, EXNSET, prop_names, ierr) write (iout, '("after exgpn, error = ", i3)' ) ierr @@ -320,10 +297,9 @@ program testrdd 105 continue 107 continue -c c read concatenated node sets; this produces the same information as c the above code which reads individual node sets -c + num_node_sets = exinqi (exoid, EXNODS) if (num_node_sets .gt. 0) then @@ -372,9 +348,8 @@ program testrdd 150 continue endif -c c read individual side sets -c + if (num_side_sets .gt. 0) then call exgssi (exoid, ids, ierr) write (iout, '(/"after exgssi, error = ", i3)' ) ierr @@ -435,9 +410,8 @@ program testrdd 190 continue -c c read side set names -c + call exgnams(exoid, EXSSET, num_side_sets, sset_names, ierr) write (iout, '(/"after exgnams, error = ", i3)' ) ierr do i=1, num_side_sets @@ -452,7 +426,6 @@ program testrdd 1 '(/"There are ",i2," properties for each side set")') 2 num_props - call exgpn(exoid, EXSSET, prop_names, ierr) write (iout, '("after exgpn, error = ", i3)' ) ierr @@ -485,10 +458,10 @@ program testrdd df_list_len = exinqi (exoid, EXSSDF) write (iout, '(/"after exinq: EXSSDF =",i3,", error = ",i3)') 1 df_list_len,ierr -c + c read concatenated side sets; this produces the same information as c the above code which reads individual side sets -c + call exgcss (exoid, ids, num_elem_per_set, num_df_per_set, 1 elem_ind, df_ind, elem_list, side_list, dist_fact, 2 ierr) @@ -545,9 +518,8 @@ program testrdd 270 continue endif -c c read QA records -c + num_qa_rec = exinqi (exoid, EXQA) call exgqa (exoid, qa_record, ierr) write (iout, '(/"after exgqa, error = ", i3)' ) ierr @@ -560,9 +532,8 @@ program testrdd 280 continue 290 continue -c c read information records -c + num_info = exinqi (exoid, EXINFO) call exginf (exoid, inform, ierr) write (iout, '(/"after exginf, error = ", i3)' ) ierr @@ -573,9 +544,8 @@ program testrdd write (iout, '(a81)') inform(i) 300 continue -c c read global variables parameters and names -c + call exgvp (exoid, "g", num_glo_vars, ierr) write (iout, '(/"after exgvp, error = ", i3)' ) ierr @@ -589,9 +559,8 @@ program testrdd write (iout, '(a9)') var_names(i) 320 continue -c c read nodal variables parameters and names -c + call exgvp (exoid, "n", num_nod_vars, ierr) write (iout, '(/"after exgvp, error = ", i3)' ) ierr @@ -605,9 +574,8 @@ program testrdd write (iout, '(a9)') var_names(i) 330 continue -c c read element variables parameters and names -c + call exgvp (exoid, "e", num_ele_vars, ierr) write (iout, '(/"after exgvp, error = ", i3)' ) ierr @@ -621,9 +589,8 @@ program testrdd write (iout, '(a9)') var_names(i) 340 continue -c c read element variable truth table -c + call exgvtt (exoid, num_elem_blk, num_ele_vars, truth_tab, ierr) write (iout, '(/"after exgvtt, error = ", i3)' ) ierr @@ -635,24 +602,23 @@ program testrdd 350 continue 360 continue -c c determine how many time steps are stored -c + num_time_steps = exinqi (exoid, EXTIMS) write (iout, '("There are ",i2," time steps in the database.")') 1 num_time_steps -c + c read time value at one time step -c + time_step = 3 call exgtim (exoid, time_step, time_value, ierr) write (iout, '(/"after exgtim, error = ", i3)' ) ierr write (iout, '("time value at time step ",i2," = ", f5.3)') 1 time_step, time_value -c + c read time values at all time steps -c + call exgatm (exoid, time_values, ierr) write (iout, '(/"after exgatm, error = ", i3)' ) ierr @@ -665,9 +631,9 @@ program testrdd var_index = 1 beg_time = 1 end_time = -1 -c + c read all global variables at one time step -c + call exggv (exoid, time_step, num_glo_vars, var_values, ierr) write (iout, '(/"after exggv, error = ", i3)' ) ierr @@ -678,9 +644,8 @@ program testrdd write (iout, '(f5.3)') var_values(i) 400 continue -c c read a single global variable through time -c + call exggvt (exoid, var_index, beg_time, end_time, var_values, 1 ierr) write (iout, '(/"after exggvt, error = ", i3)' ) ierr @@ -692,9 +657,8 @@ program testrdd write (iout, '(f5.3)') var_values(i) 410 continue -c c read a nodal variable at one time step -c + call exgnv (exoid, time_step, var_index, num_nodes, var_values, 1 ierr) write (iout, '(/"after exgnv, error = ", i3)' ) ierr @@ -706,9 +670,8 @@ program testrdd write (iout, '(f5.3)') var_values(i) 420 continue -c c read a nodal variable through time -c + node_num = 1 call exgnvt (exoid, var_index, node_num, beg_time, end_time, @@ -722,9 +685,8 @@ program testrdd write (iout, '(f5.3)') var_values(i) 430 continue -c c read an element variable at one time step -c + call exgebi (exoid, ids, ierr) write (iout, '(/"after exgebi, error = ", i3)' ) ierr @@ -746,9 +708,8 @@ program testrdd 450 continue -c c read an element variable through time -c + var_index = 2 elem_num = 2 diff --git a/packages/seacas/libraries/exoIIv2for32/test/testrddi64.f b/packages/seacas/libraries/exoIIv2for32/test/testrddi64.f index 790151f3412b..3b749e2a8fdd 100644 --- a/packages/seacas/libraries/exoIIv2for32/test/testrddi64.f +++ b/packages/seacas/libraries/exoIIv2for32/test/testrddi64.f @@ -1,15 +1,14 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details program testrdd -c c This is a test program for the Fortran binding of the EXODUS II c database read routines -c + implicit none include 'exodusII.inc' @@ -56,10 +55,7 @@ program testrdd data iout /6/ - -c c open EXODUS II files -c cpu_ws = 8 io_ws = 8 @@ -86,9 +82,7 @@ program testrdd write (iout, '(" Maximum Allowed/Used DB Name Size ",i4,i4)') * mxalnmlen, mxusnmlen -c c read database parameters -c call exgini (exoid, titl, num_dim, num_nodes, num_elem, 1 num_elem_blk, num_node_sets, num_side_sets, ierr) @@ -105,10 +99,7 @@ program testrdd 8 titl,num_dim, num_nodes, num_elem, 9 num_elem_blk,num_node_sets, num_side_sets - -c c read nodal coordinates values and names from database -c call exgcor (exoid, x, y, z, ierr) write (iout, '(/"after exgcor, error = ", i3)' ) ierr @@ -136,9 +127,7 @@ program testrdd write (iout, '("x coord name = ", a9)') coord_names(1) write (iout, '("y coord name = ", a9)') coord_names(2) -c c read element order map -c call exgmap (exoid, elem_map, ierr) write (iout, '(/"after exgmap, error = ", i3)' ) ierr @@ -147,10 +136,8 @@ program testrdd write (iout, '("elem_map(",i1,") = ", i1)') i, elem_map(i) 30 continue -c c read element block parameters -c -c + call exgebi (exoid, ids, ierr) write (iout, '(/"after exgebi, error = ", i3)' ) ierr @@ -180,7 +167,6 @@ program testrdd 1 '(/"There are ",i2," properties for each element block")') 2 num_props - call exgpn(exoid, EXEBLK, prop_names, ierr) write (iout, '("after exgpn, error = ", i3)' ) ierr @@ -197,9 +183,7 @@ program testrdd 45 continue 47 continue -c c read element connectivity -c do 60 i = 1, num_elem_blk @@ -214,9 +198,8 @@ program testrdd 60 continue -c c read element block names -c + call exgnams(exoid, EXEBLK, num_elem_blk, blk_names, ierr) write (iout, '(/"after exgnams, error = ", i3)' ) ierr do i=1, num_elem_blk @@ -224,9 +207,7 @@ program testrdd 2 i, blk_names(i) end do -c c read element block attributes -c do 70 i = 1, num_elem_blk @@ -248,9 +229,8 @@ program testrdd 69 format(A32," = ", 10(f6.4,2x)) 70 continue -c c read individual node sets -c + if (num_node_sets .gt. 0) then call exgnsi (exoid, ids, ierr) write (iout, '(/"after exgnsi, error = ", i3)' ) ierr @@ -290,9 +270,8 @@ program testrdd 100 continue -c c read node set names -c + call exgnams(exoid, EXNSET, num_node_sets, nset_names, ierr) write (iout, '(/"after exgnams, error = ", i3)' ) ierr do i=1, num_node_sets @@ -300,7 +279,6 @@ program testrdd 2 i, nset_names(i) end do - c read node set properties num_props = exinqi (exoid, EXNNSP) @@ -308,7 +286,6 @@ program testrdd 1 '(/"There are ",i2," properties for each node set")') 2 num_props - call exgpn(exoid, EXNSET, prop_names, ierr) write (iout, '("after exgpn, error = ", i3)' ) ierr @@ -325,10 +302,9 @@ program testrdd 105 continue 107 continue -c c read concatenated node sets; this produces the same information as c the above code which reads individual node sets -c + num_node_sets = exinqi (exoid, EXNODS) if (num_node_sets .gt. 0) then @@ -377,9 +353,8 @@ program testrdd 150 continue endif -c c read individual side sets -c + if (num_side_sets .gt. 0) then call exgssi (exoid, ids, ierr) write (iout, '(/"after exgssi, error = ", i3)' ) ierr @@ -440,9 +415,8 @@ program testrdd 190 continue -c c read side set names -c + call exgnams(exoid, EXSSET, num_side_sets, sset_names, ierr) write (iout, '(/"after exgnams, error = ", i3)' ) ierr do i=1, num_side_sets @@ -457,7 +431,6 @@ program testrdd 1 '(/"There are ",i2," properties for each side set")') 2 num_props - call exgpn(exoid, EXSSET, prop_names, ierr) write (iout, '("after exgpn, error = ", i3)' ) ierr @@ -490,10 +463,10 @@ program testrdd df_list_len = exinqi (exoid, EXSSDF) write (iout, '(/"after exinq: EXSSDF =",i3,", error = ",i3)') 1 df_list_len,ierr -c + c read concatenated side sets; this produces the same information as c the above code which reads individual side sets -c + call exgcss (exoid, ids, num_elem_per_set, num_df_per_set, 1 elem_ind, df_ind, elem_list, side_list, dist_fact, 2 ierr) @@ -550,9 +523,8 @@ program testrdd 270 continue endif -c c read QA records -c + num_qa_rec = exinqi (exoid, EXQA) call exgqa (exoid, qa_record, ierr) write (iout, '(/"after exgqa, error = ", i3)' ) ierr @@ -565,9 +537,8 @@ program testrdd 280 continue 290 continue -c c read information records -c + num_info = exinqi (exoid, EXINFO) call exginf (exoid, inform, ierr) write (iout, '(/"after exginf, error = ", i3)' ) ierr @@ -578,9 +549,8 @@ program testrdd write (iout, '(a81)') inform(i) 300 continue -c c read global variables parameters and names -c + call exgvp (exoid, "g", num_glo_vars, ierr) write (iout, '(/"after exgvp, error = ", i3)' ) ierr @@ -594,9 +564,8 @@ program testrdd write (iout, '(a9)') var_names(i) 320 continue -c c read nodal variables parameters and names -c + call exgvp (exoid, "n", num_nod_vars, ierr) write (iout, '(/"after exgvp, error = ", i3)' ) ierr @@ -610,9 +579,8 @@ program testrdd write (iout, '(a9)') var_names(i) 330 continue -c c read element variables parameters and names -c + call exgvp (exoid, "e", num_ele_vars, ierr) write (iout, '(/"after exgvp, error = ", i3)' ) ierr @@ -626,9 +594,8 @@ program testrdd write (iout, '(a9)') var_names(i) 340 continue -c c read element variable truth table -c + call exgvtt (exoid, num_elem_blk, num_ele_vars, truth_tab, ierr) write (iout, '(/"after exgvtt, error = ", i3)' ) ierr @@ -640,24 +607,23 @@ program testrdd 350 continue 360 continue -c c determine how many time steps are stored -c + num_time_steps = exinqi (exoid, EXTIMS) write (iout, '("There are ",i2," time steps in the database.")') 1 num_time_steps -c + c read time value at one time step -c + time_step = 3 call exgtim (exoid, time_step, time_value, ierr) write (iout, '(/"after exgtim, error = ", i3)' ) ierr write (iout, '("time value at time step ",i2," = ", f5.3)') 1 time_step, time_value -c + c read time values at all time steps -c + call exgatm (exoid, time_values, ierr) write (iout, '(/"after exgatm, error = ", i3)' ) ierr @@ -670,9 +636,9 @@ program testrdd var_index = 1 beg_time = 1 end_time = -1 -c + c read all global variables at one time step -c + call exggv (exoid, time_step, num_glo_vars, var_values, ierr) write (iout, '(/"after exggv, error = ", i3)' ) ierr @@ -683,9 +649,8 @@ program testrdd write (iout, '(f5.3)') var_values(i) 400 continue -c c read a single global variable through time -c + call exggvt (exoid, var_index, beg_time, end_time, var_values, 1 ierr) write (iout, '(/"after exggvt, error = ", i3)' ) ierr @@ -697,9 +662,8 @@ program testrdd write (iout, '(f5.3)') var_values(i) 410 continue -c c read a nodal variable at one time step -c + call exgnv (exoid, time_step, var_index, num_nodes, var_values, 1 ierr) write (iout, '(/"after exgnv, error = ", i3)' ) ierr @@ -711,9 +675,8 @@ program testrdd write (iout, '(f5.3)') var_values(i) 420 continue -c c read a nodal variable through time -c + node_num = 1 call exgnvt (exoid, var_index, node_num, beg_time, end_time, @@ -727,9 +690,8 @@ program testrdd write (iout, '(f5.3)') var_values(i) 430 continue -c c read an element variable at one time step -c + call exgebi (exoid, ids, ierr) write (iout, '(/"after exgebi, error = ", i3)' ) ierr @@ -751,9 +713,8 @@ program testrdd 450 continue -c c read an element variable through time -c + var_index = 2 elem_num = 2 diff --git a/packages/seacas/libraries/exoIIv2for32/test/testwt.f b/packages/seacas/libraries/exoIIv2for32/test/testwt.f index 158bf342979b..a67f232f8df9 100644 --- a/packages/seacas/libraries/exoIIv2for32/test/testwt.f +++ b/packages/seacas/libraries/exoIIv2for32/test/testwt.f @@ -1,15 +1,15 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details program testwt implicit none -c + c This is a test program for the Fortran binding of the EXODUS II c database write routines. -c + include 'exodusII.inc' integer*4 iin, iout, ierr, id @@ -51,18 +51,17 @@ program testwt write (iout,'("after exopts, error = ", i4)') ierr cpu_word_size = 4 io_word_size = 4 -c + c create EXODUS II files -c + exoid = excre ("test.exo", 1 EXCLOB, cpu_word_size, io_word_size, ierr) write (iout,'("after excre for test.exo, id: ", i4)') exoid write (iout,'(" cpu word size: ",i4," io word size: ",i4)') 1 cpu_word_size, io_word_size write (iout,'("after excre, error = ", i4)') ierr -c + c initialize file with parameters -c num_dim = 3 num_nodes = 26 @@ -81,9 +80,8 @@ program testwt call exit (0) endif -c c write nodal coordinates values and names to database -c + c Quad #1 x(1) = 0.0 x(2) = 1.0 @@ -188,7 +186,6 @@ program testwt call exit (0) endif - coord_names(1) = "xcoor" coord_names(2) = "ycoor" coord_names(3) = "zcoor" @@ -201,10 +198,7 @@ program testwt call exit (0) endif - -c c write element order map -c do 10 i = 1, num_elem elem_map(i) = i @@ -217,9 +211,7 @@ program testwt call exit (0) endif -c c write element block parameters -c num_elem_in_block(1) = 1 num_elem_in_block(2) = 1 @@ -345,9 +337,7 @@ program testwt call exit (0) endif -c c write element connectivity -c connect(1) = 1 connect(2) = 2 @@ -415,9 +405,8 @@ program testwt call exit (0) endif -c c write element block attributes -c + attrib(1) = 3.14159 call expeat (exoid, ebids(1), attrib, ierr) write (iout, '("after expeat, error = ", i4)' ) ierr @@ -464,9 +453,8 @@ program testwt call exit (0) endif end do -c + c write individual node sets -c node_list(1) = 100 node_list(2) = 101 @@ -528,10 +516,8 @@ program testwt call exit (0) endif -c c write concatenated node sets; this produces the same information as c the above code which writes individual node sets -c ids(1) = 20 ids(2) = 21 @@ -580,7 +566,6 @@ program testwt call exit (0) endif - c write node set properties prop_names(1) = "FACE" @@ -611,9 +596,7 @@ program testwt call exit (0) endif -c c write individual side sets -c c side set #1 - quad @@ -769,10 +752,8 @@ program testwt call exit (0) endif - c write concatenated side sets; this produces the same information as c the above code which writes individual side sets -c ids(1) = 30 ids(2) = 31 @@ -923,7 +904,6 @@ program testwt c 1 node_ind, elem_list, node_list, side_list, ierr) c write (iout, '("after excn2s, error = ", i4)' ) ierr - num_df_per_set(1) = 4 num_df_per_set(2) = 4 num_df_per_set(3) = 0 @@ -976,10 +956,8 @@ program testwt call exclos(exoid,ierr) call exit (0) endif -c -c + c write QA records -c num_qa_rec = 2 @@ -999,10 +977,7 @@ program testwt call exit (0) endif - -c c write information records -c num_info = 3 @@ -1036,7 +1011,6 @@ program testwt call exit (0) endif - num_nod_vars = 2 var_names(1) = "nod_var0" @@ -1055,7 +1029,6 @@ program testwt call exit (0) endif - num_ele_vars = 3 var_names(1) = "ele_var0" @@ -1075,9 +1048,7 @@ program testwt call exit (0) endif -c c write element variable truth table -c k = 0 @@ -1094,21 +1065,18 @@ program testwt call exit (0) endif -c c for each time step, write the analysis results; c the code below fills the arrays glob_var_vals, c nodal_var_vals, and elem_var_vals with values for debugging purposes; c obviously the analysis code will populate these arrays -c whole_time_step = 1 num_time_steps = 10 do 110 i = 1, num_time_steps time_value = real(i)/100. -c + c write time value -c call exptim (exoid, whole_time_step, time_value, ierr) write (iout, '("after exptim, error = ", i4)' ) ierr @@ -1117,9 +1085,7 @@ program testwt call exit (0) endif -c c write global variables -c do 50 j = 1, num_glo_vars glob_var_vals(j) = real(j+1) * time_value @@ -1133,9 +1099,7 @@ program testwt call exit (0) endif -c c write nodal variables -c do 70 k = 1, num_nod_vars do 60 j = 1, num_nodes @@ -1154,9 +1118,7 @@ program testwt 70 continue -c c write element variables -c do 100 k = 1, num_ele_vars do 90 j = 1, num_elem_blk @@ -1181,10 +1143,9 @@ program testwt whole_time_step = whole_time_step + 1 -c c update the data file; this should be done at the end of every time c step to ensure that no data is lost if the analysis dies -c + call exupda (exoid, ierr) write (iout, '("after exupda, error = ", i4)' ) ierr if (ierr .ne. 0) then @@ -1194,9 +1155,8 @@ program testwt 110 continue -c c close the EXODUS files -c + call exclos (exoid, ierr) write (iout, '("after exclos, error = ", i4)' ) ierr diff --git a/packages/seacas/libraries/exoIIv2for32/test/testwtd.f b/packages/seacas/libraries/exoIIv2for32/test/testwtd.f index 7102f884f01f..da5e512450b7 100644 --- a/packages/seacas/libraries/exoIIv2for32/test/testwtd.f +++ b/packages/seacas/libraries/exoIIv2for32/test/testwtd.f @@ -1,15 +1,15 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details program testwt implicit none -c + c This is a test program for the Fortran binding of the EXODUS II c database write routines. -c + include 'exodusII.inc' integer*4 iin, iout, ierr, id @@ -51,18 +51,17 @@ program testwt write (iout,'("after exopts, error = ", i4)') ierr cpu_word_size = 8 io_word_size = 8 -c + c create EXODUS II files -c + exoid = excre ("test.exo", 1 EXCLOB, cpu_word_size, io_word_size, ierr) write (iout,'("after excre for test.exo, id: ", i4)') exoid write (iout,'(" cpu word size: ",i4," io word size: ",i4)') 1 cpu_word_size, io_word_size write (iout,'("after excre, error = ", i4)') ierr -c + c initialize file with parameters -c num_dim = 3 num_nodes = 26 @@ -81,9 +80,8 @@ program testwt call exit (0) endif -c c write nodal coordinates values and names to database -c + c Quad #1 x(1) = 0.0 x(2) = 1.0 @@ -188,7 +186,6 @@ program testwt call exit (0) endif - coord_names(1) = "xcoor" coord_names(2) = "ycoor" coord_names(3) = "zcoor" @@ -201,10 +198,7 @@ program testwt call exit (0) endif - -c c write element order map -c do 10 i = 1, num_elem elem_map(i) = i @@ -217,9 +211,7 @@ program testwt call exit (0) endif -c c write element block parameters -c num_elem_in_block(1) = 1 num_elem_in_block(2) = 1 @@ -344,9 +336,7 @@ program testwt call exit (0) endif -c c write element connectivity -c connect(1) = 1 connect(2) = 2 @@ -414,9 +404,8 @@ program testwt call exit (0) endif -c c write element block attributes -c + attrib(1) = 3.14159 call expeat (exoid, ebids(1), attrib, ierr) write (iout, '("after expeat, error = ", i4)' ) ierr @@ -463,9 +452,8 @@ program testwt call exit (0) endif end do -c + c write individual node sets -c node_list(1) = 100 node_list(2) = 101 @@ -525,10 +513,8 @@ program testwt call exit (0) endif -c c write concatenated node sets; this produces the same information as c the above code which writes individual node sets -c ids(1) = 20 ids(2) = 21 @@ -577,7 +563,6 @@ program testwt call exit (0) endif - c write node set properties prop_names(1) = "FACE" @@ -608,9 +593,7 @@ program testwt call exit (0) endif -c c write individual side sets -c c side set #1 - quad @@ -766,10 +749,8 @@ program testwt call exit (0) endif - c write concatenated side sets; this produces the same information as c the above code which writes individual side sets -c ids(1) = 30 ids(2) = 31 @@ -920,7 +901,6 @@ program testwt c 1 node_ind, elem_list, node_list, side_list, ierr) c write (iout, '("after excn2s, error = ", i4)' ) ierr - num_df_per_set(1) = 4 num_df_per_set(2) = 4 num_df_per_set(3) = 0 @@ -973,10 +953,8 @@ program testwt call exclos(exoid,ierr) call exit (0) endif -c -c + c write QA records -c num_qa_rec = 2 @@ -996,10 +974,7 @@ program testwt call exit (0) endif - -c c write information records -c num_info = 3 @@ -1033,7 +1008,6 @@ program testwt call exit (0) endif - num_nod_vars = 2 var_names(1) = "nod_var0" @@ -1052,7 +1026,6 @@ program testwt call exit (0) endif - num_ele_vars = 3 var_names(1) = "ele_var0" @@ -1072,9 +1045,7 @@ program testwt call exit (0) endif -c c write element variable truth table -c k = 0 @@ -1091,21 +1062,18 @@ program testwt call exit (0) endif -c c for each time step, write the analysis results; c the code below fills the arrays glob_var_vals, c nodal_var_vals, and elem_var_vals with values for debugging purposes; c obviously the analysis code will populate these arrays -c whole_time_step = 1 num_time_steps = 10 do 110 i = 1, num_time_steps time_value = real(i)/100. -c + c write time value -c call exptim (exoid, whole_time_step, time_value, ierr) write (iout, '("after exptim, error = ", i4)' ) ierr @@ -1114,9 +1082,7 @@ program testwt call exit (0) endif -c c write global variables -c do 50 j = 1, num_glo_vars glob_var_vals(j) = real(j+1) * time_value @@ -1130,9 +1096,7 @@ program testwt call exit (0) endif -c c write nodal variables -c do 70 k = 1, num_nod_vars do 60 j = 1, num_nodes @@ -1151,9 +1115,7 @@ program testwt 70 continue -c c write element variables -c do 100 k = 1, num_ele_vars do 90 j = 1, num_elem_blk @@ -1178,10 +1140,9 @@ program testwt whole_time_step = whole_time_step + 1 -c c update the data file; this should be done at the end of every time c step to ensure that no data is lost if the analysis dies -c + call exupda (exoid, ierr) write (iout, '("after exupda, error = ", i4)' ) ierr if (ierr .ne. 0) then @@ -1191,9 +1152,8 @@ program testwt 110 continue -c c close the EXODUS files -c + call exclos (exoid, ierr) write (iout, '("after exclos, error = ", i4)' ) ierr diff --git a/packages/seacas/libraries/exoIIv2for32/test/testwtdi64.f b/packages/seacas/libraries/exoIIv2for32/test/testwtdi64.f index 0050e0efb6b0..b4b47d1cbfb3 100644 --- a/packages/seacas/libraries/exoIIv2for32/test/testwtdi64.f +++ b/packages/seacas/libraries/exoIIv2for32/test/testwtdi64.f @@ -1,15 +1,15 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details program testwt implicit none -c + c This is a test program for the Fortran binding of the EXODUS II c database write routines. -c + include 'exodusII.inc' integer*4 iout, ierr @@ -53,9 +53,9 @@ program testwt write (iout,'("after exopts, error = ", i4)') ierr cpu_word_size = 8 io_word_size = 8 -c + c create EXODUS II files -c + C ... All integers passed through the API and stored on DB will be 64-bit integers exoid = excre ("test.exo", 1 EXCLOB+EX_ALL_INT64_DB+EX_ALL_INT64_API, @@ -64,9 +64,8 @@ program testwt write (iout,'(" cpu word size: ",i4," io word size: ",i4)') 1 cpu_word_size, io_word_size write (iout,'("after excre, error = ", i4)') ierr -c + c initialize file with parameters -c num_dim = 3 num_nodes = 26 @@ -85,9 +84,8 @@ program testwt call exit (0) endif -c c write nodal coordinates values and names to database -c + c Quad #1 x(1) = 0.0 x(2) = 1.0 @@ -192,7 +190,6 @@ program testwt call exit (0) endif - coord_names(1) = "xcoor" coord_names(2) = "ycoor" coord_names(3) = "zcoor" @@ -205,10 +202,7 @@ program testwt call exit (0) endif - -c c write element order map -c do 10 i = 1, num_elem elem_map(i) = i @@ -221,9 +215,7 @@ program testwt call exit (0) endif -c c write element block parameters -c num_elem_in_block(1) = 1 num_elem_in_block(2) = 1 @@ -348,9 +340,7 @@ program testwt call exit (0) endif -c c write element connectivity -c connect(1) = 1 connect(2) = 2 @@ -418,9 +408,8 @@ program testwt call exit (0) endif -c c write element block attributes -c + attrib(1) = 3.14159 call expeat (exoid, ebids(1), attrib, ierr) write (iout, '("after expeat, error = ", i4)' ) ierr @@ -467,9 +456,8 @@ program testwt call exit (0) endif end do -c + c write individual node sets -c node_list(1) = 100 node_list(2) = 101 @@ -529,10 +517,8 @@ program testwt call exit (0) endif -c c write concatenated node sets; this produces the same information as c the above code which writes individual node sets -c ids(1) = 20 ids(2) = 21 @@ -581,7 +567,6 @@ program testwt call exit (0) endif - c write node set properties prop_names(1) = "FACE" @@ -610,9 +595,7 @@ program testwt call exit (0) endif -c c write individual side sets -c c side set #1 - quad @@ -768,10 +751,8 @@ program testwt call exit (0) endif - c write concatenated side sets; this produces the same information as c the above code which writes individual side sets -c ids(1) = 30 ids(2) = 31 @@ -922,7 +903,6 @@ program testwt c 1 node_ind, elem_list, node_list, side_list, ierr) c write (iout, '("after excn2s, error = ", i4)' ) ierr - num_df_per_set(1) = 4 num_df_per_set(2) = 4 num_df_per_set(3) = 0 @@ -973,10 +953,8 @@ program testwt call exclos(exoid,ierr) call exit (0) endif -c -c + c write QA records -c num_qa_rec = 2 @@ -996,10 +974,7 @@ program testwt call exit (0) endif - -c c write information records -c num_info = 3 @@ -1033,7 +1008,6 @@ program testwt call exit (0) endif - num_nod_vars = 2 var_names(1) = "nod_var0" @@ -1052,7 +1026,6 @@ program testwt call exit (0) endif - num_ele_vars = 3 var_names(1) = "ele_var0" @@ -1072,9 +1045,7 @@ program testwt call exit (0) endif -c c write element variable truth table -c k = 0 @@ -1091,21 +1062,18 @@ program testwt call exit (0) endif -c c for each time step, write the analysis results; c the code below fills the arrays glob_var_vals, c nodal_var_vals, and elem_var_vals with values for debugging purposes; c obviously the analysis code will populate these arrays -c whole_time_step = 1 num_time_steps = 10 do 110 i = 1, num_time_steps time_value = real(i)/100. -c + c write time value -c call exptim (exoid, whole_time_step, time_value, ierr) write (iout, '("after exptim, error = ", i4)' ) ierr @@ -1114,9 +1082,7 @@ program testwt call exit (0) endif -c c write global variables -c do 50 j = 1, num_glo_vars glob_var_vals(j) = real(j+1) * time_value @@ -1130,9 +1096,7 @@ program testwt call exit (0) endif -c c write nodal variables -c do 70 k = 1, num_nod_vars do 60 j = 1, num_nodes @@ -1151,9 +1115,7 @@ program testwt 70 continue -c c write element variables -c do 100 k = 1, num_ele_vars do 90 j = 1, num_elem_blk @@ -1178,10 +1140,9 @@ program testwt whole_time_step = whole_time_step + 1 -c c update the data file; this should be done at the end of every time c step to ensure that no data is lost if the analysis dies -c + call exupda (exoid, ierr) write (iout, '("after exupda, error = ", i4)' ) ierr if (ierr .ne. 0) then @@ -1191,9 +1152,8 @@ program testwt 110 continue -c c close the EXODUS files -c + call exclos (exoid, ierr) write (iout, '("after exclos, error = ", i4)' ) ierr diff --git a/packages/seacas/libraries/exodus/Makefile.standalone b/packages/seacas/libraries/exodus/Makefile.standalone index 865dccfc8784..4c98c2eb6b21 100644 --- a/packages/seacas/libraries/exodus/Makefile.standalone +++ b/packages/seacas/libraries/exodus/Makefile.standalone @@ -1,23 +1,23 @@ # Copyright (c) 2005-2017 National Technology & Engineering Solutions # of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with # NTESS, the U.S. Government retains certain rights in this software. -# +# # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are # met: -# +# # * Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. -# +# # * Redistributions in binary form must reproduce the above # copyright notice, this list of conditions and the following # disclaimer in the documentation and/or other materials provided -# with the distribution. -# +# with the distribution. +# # * Neither the name of NTESS nor the names of its # contributors may be used to endorse or promote products derived # from this software without specific prior written permission. -# +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR @@ -29,11 +29,11 @@ # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# +# #======================================================================== # NOTE: This is unsupported and should only be used as a last resort -# if the CMake build does not work on your platform. Does not +# if the CMake build does not work on your platform. Does not # build the Fortran API. # # A platform must define: @@ -77,9 +77,9 @@ RANLIB = ranlib AR = ar -crsv CC = /opt/local/bin/gcc-mp-4.8 FC = /opt/local/bin/gfortran-mp-4.8 -CCOPTIONS = +CCOPTIONS = F77OPTIONS = -F77PREC = -fdefault-real-8 -fdefault-integer-8 +F77PREC = -fdefault-real-8 -fdefault-integer-8 endif #======================================================================== @@ -114,27 +114,24 @@ ifeq ($(COMPILER),GNU) CC = gcc FC = gfortran CCOPTIONS = -Wall -F77OPTIONS = -F77PREC = -fdefault-real-8 -fdefault-integer-8 +F77OPTIONS = +F77PREC = -fdefault-real-8 -fdefault-integer-8 endif endif - OPTIMIZE_FLAG = -O2 STD_DEFINES = -DVERBOSE - CFLAGS = $(OPTIMIZE_FLAG) $(CCOPTIONS) $(STD_DEFINES) $(LOC_EXOII_INC) $(NETCDF_INC) $(NETCDF_YES_NO) FFLAGS = $(OPTIMIZE_FLAG) $(F77OPTIONS) $(LOC_EXOII_INC) # Use include files locates in exodus/include LOC_EXOII_INC = -I../include -I../sierra - SUBDIRS = src test -all:: libexodus.a +all:: libexodus.a libexodus.a:: echo "making exodus in src" diff --git a/packages/seacas/libraries/exodus/README b/packages/seacas/libraries/exodus/README index f3609197a342..ff04ca7ae89c 100644 --- a/packages/seacas/libraries/exodus/README +++ b/packages/seacas/libraries/exodus/README @@ -7,7 +7,7 @@ gdsjaar@sandia.gov, gsjaardema@gmail.com ======================================================================== LICENSE: -The Exodus library is licensed under the terms of the BSD License. +The Exodus library is licensed under the terms of the BSD License. Legal stuff (copyright, licensing restrictions, etc.) can be found in the file COPYRIGHT which contains: diff --git a/packages/seacas/libraries/exodus/customdoxygen.css b/packages/seacas/libraries/exodus/customdoxygen.css index 27dfe7f5acc1..01d679db49fb 100644 --- a/packages/seacas/libraries/exodus/customdoxygen.css +++ b/packages/seacas/libraries/exodus/customdoxygen.css @@ -212,7 +212,7 @@ p.formulaDsp { } img.formulaDsp { - + } img.formulaInl { @@ -270,20 +270,20 @@ span.charliteral { color: #008080 } -span.vhdldigit { - color: #ff00ff +span.vhdldigit { + color: #ff00ff } -span.vhdlchar { - color: #000000 +span.vhdlchar { + color: #000000 } -span.vhdlkeyword { - color: #700070 +span.vhdlkeyword { + color: #700070 } -span.vhdllogic { - color: #ff0000 +span.vhdllogic { + color: #ff0000 } /* @end */ @@ -426,9 +426,9 @@ table.memberdecls { } .memdoc { - border-bottom: 1px solid #A8B8D9; - border-left: 1px solid #A8B8D9; - border-right: 1px solid #A8B8D9; + border-bottom: 1px solid #A8B8D9; + border-left: 1px solid #A8B8D9; + border-right: 1px solid #A8B8D9; padding: 2px 5px; background-color: #FBFCFD; border-top-width: 0; @@ -466,18 +466,18 @@ table.memberdecls { .params, .retval, .exception, .tparams { border-spacing: 6px 2px; -} +} .params .paramname, .retval .paramname { font-weight: bold; vertical-align: top; } - + .params .paramtype { font-style: italic; vertical-align: top; -} - +} + .params .paramdir { font-family: "courier new",courier,monospace; vertical-align: top; @@ -663,7 +663,7 @@ div.summary padding-right: 5px; width: 50%; text-align: right; -} +} div.summary a { diff --git a/packages/seacas/libraries/exodus/include/doxygen.h b/packages/seacas/libraries/exodus/include/doxygen.h index 3e98e4f730c3..3c6eb9defb8a 100644 --- a/packages/seacas/libraries/exodus/include/doxygen.h +++ b/packages/seacas/libraries/exodus/include/doxygen.h @@ -38,7 +38,7 @@ The EXODUS library is licensed under the BSD open source license. Copyright(C) 1999-2020 National Technology & Engineering Solutions of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with NTESS, the U.S. Government retains certain rights in this software. - + See packages/seacas/LICENSE for details Redistribution and use in source and binary forms, with or without @@ -289,7 +289,7 @@ there is a database with longer names and the reader does not change the length of names to be returned, any API call that returns a name will truncate the name at 32 characters. -To avoid this, the reading application can all +To avoid this, the reading application can all ~~~{.c} // Determine maximum length of names stored on database int max_name_length = ex_inquire_int(exoid, EX_INQ_DB_MAX_USED_NAME_LENGTH); diff --git a/packages/seacas/libraries/exodus/include/exodusII.h b/packages/seacas/libraries/exodus/include/exodusII.h index e6f1a441a518..5bfd9e6b9c78 100644 --- a/packages/seacas/libraries/exodus/include/exodusII.h +++ b/packages/seacas/libraries/exodus/include/exodusII.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ @@ -45,12 +45,12 @@ #endif /* EXODUS version number */ -#define EXODUS_VERSION "8.06" +#define EXODUS_VERSION "8.07" #define EXODUS_VERSION_MAJOR 8 -#define EXODUS_VERSION_MINOR 06 -#define EXODUS_RELEASE_DATE "May 27, 2020" +#define EXODUS_VERSION_MINOR 07 +#define EXODUS_RELEASE_DATE "June 16, 2020" -#define EX_API_VERS 8.06f +#define EX_API_VERS 8.07f #define EX_API_VERS_NODOT (100 * EXODUS_VERSION_MAJOR + EXODUS_VERSION_MINOR) diff --git a/packages/seacas/libraries/exodus/include/exodusII_cfg.h.in b/packages/seacas/libraries/exodus/include/exodusII_cfg.h.in index 37852cde09b1..ade7371a22f1 100644 --- a/packages/seacas/libraries/exodus/include/exodusII_cfg.h.in +++ b/packages/seacas/libraries/exodus/include/exodusII_cfg.h.in @@ -1,7 +1,7 @@ # Copyright(C) 1999-2020 National Technology & Engineering Solutions # of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with # NTESS, the U.S. Government retains certain rights in this software. -# +# # See packages/seacas/LICENSE for details #ifndef __exodusII_cfg_h diff --git a/packages/seacas/libraries/exodus/include/exodusII_int.h b/packages/seacas/libraries/exodus/include/exodusII_int.h index 1a69a7caed08..54e9fda0cc45 100644 --- a/packages/seacas/libraries/exodus/include/exodusII_int.h +++ b/packages/seacas/libraries/exodus/include/exodusII_int.h @@ -3,7 +3,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** @@ -694,7 +694,6 @@ struct ex__file_item unsigned int file_type : 2; /**< 0 - classic, 1 -- 64 bit classic, 2 --NetCDF4, 3 --NetCDF4 classic */ unsigned int is_write : 1; /**< for output or append */ - unsigned int is_read : 1; /**< for input */ unsigned int is_parallel : 1; /**< 1 true, 0 false */ unsigned int is_hdf5 : 1; /**< 1 true, 0 false */ unsigned int is_pnetcdf : 1; /**< 1 true, 0 false */ diff --git a/packages/seacas/libraries/exodus/include/exodusII_par.h b/packages/seacas/libraries/exodus/include/exodusII_par.h index 5a502f6836c9..5aa5420099e7 100644 --- a/packages/seacas/libraries/exodus/include/exodusII_par.h +++ b/packages/seacas/libraries/exodus/include/exodusII_par.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /* diff --git a/packages/seacas/libraries/exodus/include/exodusII_test.h b/packages/seacas/libraries/exodus/include/exodusII_test.h index 55e784a36b26..ce776a5a3e67 100644 --- a/packages/seacas/libraries/exodus/include/exodusII_test.h +++ b/packages/seacas/libraries/exodus/include/exodusII_test.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #ifndef __exodusII_test_h diff --git a/packages/seacas/libraries/exodus/sierra/exodus_config.h b/packages/seacas/libraries/exodus/sierra/exodus_config.h index 609f55410491..47a59086076d 100644 --- a/packages/seacas/libraries/exodus/sierra/exodus_config.h +++ b/packages/seacas/libraries/exodus/sierra/exodus_config.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /* NOTE: Definitions in this file only control building via the Sierra diff --git a/packages/seacas/libraries/exodus/src/Makefile.standalone b/packages/seacas/libraries/exodus/src/Makefile.standalone index 7834a3a136ce..bd79b58bfe4c 100644 --- a/packages/seacas/libraries/exodus/src/Makefile.standalone +++ b/packages/seacas/libraries/exodus/src/Makefile.standalone @@ -1,7 +1,7 @@ # Copyright(C) 1999-2020 National Technology & Engineering Solutions # of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with # NTESS, the U.S. Government retains certain rights in this software. -# +# # See packages/seacas/LICENSE for details PARSRCS = ex_create_par.c \ diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_get_concat_node_sets.c b/packages/seacas/libraries/exodus/src/deprecated/ex_get_concat_node_sets.c index 802df6f0ea62..4ef74f69b9b6 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_get_concat_node_sets.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_get_concat_node_sets.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ @@ -34,7 +34,6 @@ causes of errors include: - data file not properly opened with call to ex_create() or ex_open() - a warning value is returned if no node sets are stored in the file. - \param[in] exoid exodus file ID returned from a previous call to ex_create() or ex_open(). @@ -69,7 +68,6 @@ LocalNodeIds). \param[out] node_sets_dist_fact Returned array containing the distribution factors for all sets. - As an example, the following code segment will read concatenated node sets: diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_get_concat_side_sets.c b/packages/seacas/libraries/exodus/src/deprecated/ex_get_concat_side_sets.c index 4aa954596d6a..78ed53ef20ef 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_get_concat_side_sets.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_get_concat_side_sets.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_get_elem_attr.c b/packages/seacas/libraries/exodus/src/deprecated/ex_get_elem_attr.c index 3baf32768bed..8d295664a61a 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_get_elem_attr.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_get_elem_attr.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ @@ -36,7 +36,6 @@ attributes for the element block, with the num_attr index cycling faster. - Refer to the code example in ex_get_elem_block() for an example of reading the element attributes for an element block. */ diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_get_elem_attr_names.c b/packages/seacas/libraries/exodus/src/deprecated/ex_get_elem_attr_names.c index 6d3b6dc49922..ed75377d8b45 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_get_elem_attr_names.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_get_elem_attr_names.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_get_elem_blk_ids.c b/packages/seacas/libraries/exodus/src/deprecated/ex_get_elem_blk_ids.c index 4591e0374c19..dbdbbf42c461 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_get_elem_blk_ids.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_get_elem_blk_ids.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ @@ -22,7 +22,6 @@ number; a warning will return a positive number. Possible causes of errors include: - data file not properly opened with call to ex_create() or ex_open() - \param[in] exoid exodus file ID returned from a previous call to ex_create() or ex_open(). \param[out] ids Returned array of the element blocks IDs. The order @@ -44,7 +43,6 @@ error = ex_get_ids (exoid, EX_ELEM_BLOCK, idelbs); ~~~ - */ int ex_get_elem_blk_ids(int exoid, void_int *ids) diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_get_elem_block.c b/packages/seacas/libraries/exodus/src/deprecated/ex_get_elem_block.c index 90f2663dfed5..223582d0ab67 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_get_elem_block.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_get_elem_block.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #include "exodusII.h" diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_get_elem_conn.c b/packages/seacas/libraries/exodus/src/deprecated/ex_get_elem_conn.c index 8a680646ef7f..72b8da38dbd4 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_get_elem_conn.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_get_elem_conn.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #include "exodusII.h" diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_get_elem_map.c b/packages/seacas/libraries/exodus/src/deprecated/ex_get_elem_map.c index fa6a33b4bf6d..ce4627d5c4cc 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_get_elem_map.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_get_elem_map.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_get_elem_num_map.c b/packages/seacas/libraries/exodus/src/deprecated/ex_get_elem_num_map.c index 56d41ecdd34d..190daf67c3b9 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_get_elem_num_map.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_get_elem_num_map.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_get_elem_var.c b/packages/seacas/libraries/exodus/src/deprecated/ex_get_elem_var.c index 2ced653e1805..6d8bb2e84f01 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_get_elem_var.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_get_elem_var.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ @@ -29,7 +29,6 @@ errors include: - variable does not exist for the desired element block. - invalid element block. - \param[in] exoid exodus file ID returned from a previous call to ex_create() or ex_open(). \param[in] time_step The time step number, as described under @@ -53,7 +52,6 @@ elem_var_index element variable for the element block with ID of elem_blk_id at the time_step time step. - As an example, the following code segment will read the var_index-th element variable at one time step stored in an exodus file : diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_get_elem_var_tab.c b/packages/seacas/libraries/exodus/src/deprecated/ex_get_elem_var_tab.c index 5c6ae6e3177b..9af4f1b1b2c0 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_get_elem_var_tab.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_get_elem_var_tab.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_get_elem_var_time.c b/packages/seacas/libraries/exodus/src/deprecated/ex_get_elem_var_time.c index 4e2be33a45d7..c2b0e3a918cd 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_get_elem_var_time.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_get_elem_var_time.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** @@ -76,7 +76,6 @@ beg_time_step + 1) values of the elem_number-th element for the elem_var_index-th element variable. - For example, the following coding will read the values of the var_index-th element variable for element number 2 from the first time step to the last time step: diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_get_glob_var_time.c b/packages/seacas/libraries/exodus/src/deprecated/ex_get_glob_var_time.c index 2f4ee5a2c211..ee8cc454ccbf 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_get_glob_var_time.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_get_glob_var_time.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_get_glob_vars.c b/packages/seacas/libraries/exodus/src/deprecated/ex_get_glob_vars.c index ee4ca9eef86b..9151abd02128 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_get_glob_vars.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_get_glob_vars.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_get_n_attr.c b/packages/seacas/libraries/exodus/src/deprecated/ex_get_n_attr.c index 86823c7e3c8e..cf677304041e 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_get_n_attr.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_get_n_attr.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_get_n_conn.c b/packages/seacas/libraries/exodus/src/deprecated/ex_get_n_conn.c index 6bc59176b773..c95f20492469 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_get_n_conn.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_get_n_conn.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_get_n_coord.c b/packages/seacas/libraries/exodus/src/deprecated/ex_get_n_coord.c index 48506388f023..cab229bb0d9d 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_get_n_coord.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_get_n_coord.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_get_n_elem_attr.c b/packages/seacas/libraries/exodus/src/deprecated/ex_get_n_elem_attr.c index e51cfa2505e2..22c27cd00605 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_get_n_elem_attr.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_get_n_elem_attr.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /*****************************************************************************/ diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_get_n_elem_conn.c b/packages/seacas/libraries/exodus/src/deprecated/ex_get_n_elem_conn.c index f320ed169617..3a1a682a5310 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_get_n_elem_conn.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_get_n_elem_conn.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /*****************************************************************************/ diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_get_n_elem_num_map.c b/packages/seacas/libraries/exodus/src/deprecated/ex_get_n_elem_num_map.c index de19ce3a71db..d84cbe319e55 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_get_n_elem_num_map.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_get_n_elem_num_map.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_get_n_elem_var.c b/packages/seacas/libraries/exodus/src/deprecated/ex_get_n_elem_var.c index 94c74d7ae388..f1ee4f8f9666 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_get_n_elem_var.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_get_n_elem_var.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_get_n_nodal_var.c b/packages/seacas/libraries/exodus/src/deprecated/ex_get_n_nodal_var.c index 025f720eaa33..a40c992bdae9 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_get_n_nodal_var.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_get_n_nodal_var.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_get_n_node_num_map.c b/packages/seacas/libraries/exodus/src/deprecated/ex_get_n_node_num_map.c index 4438163dc86f..9a3084613aed 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_get_n_node_num_map.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_get_n_node_num_map.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_get_n_node_set.c b/packages/seacas/libraries/exodus/src/deprecated/ex_get_n_node_set.c index 95a32ef7343f..c04729b2adfc 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_get_n_node_set.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_get_n_node_set.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /*****************************************************************************/ diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_get_n_node_set_df.c b/packages/seacas/libraries/exodus/src/deprecated/ex_get_n_node_set_df.c index b747d8b697fa..456abc3fa6f5 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_get_n_node_set_df.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_get_n_node_set_df.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_get_n_one_attr.c b/packages/seacas/libraries/exodus/src/deprecated/ex_get_n_one_attr.c index aae7a25cd0d3..543ece839275 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_get_n_one_attr.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_get_n_one_attr.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_get_n_side_set.c b/packages/seacas/libraries/exodus/src/deprecated/ex_get_n_side_set.c index 96bf0bc4664c..24a76ecd3840 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_get_n_side_set.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_get_n_side_set.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_get_n_side_set_df.c b/packages/seacas/libraries/exodus/src/deprecated/ex_get_n_side_set_df.c index b6e21e3f3082..413096edf139 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_get_n_side_set_df.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_get_n_side_set_df.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /*****************************************************************************/ diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_get_n_var.c b/packages/seacas/libraries/exodus/src/deprecated/ex_get_n_var.c index 0c6d79091f82..944739e4b2b6 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_get_n_var.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_get_n_var.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_get_nodal_var.c b/packages/seacas/libraries/exodus/src/deprecated/ex_get_nodal_var.c index 43d869b420dd..4ebbab3dabaf 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_get_nodal_var.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_get_nodal_var.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ @@ -51,7 +51,6 @@ nodal_var_index-th nodal variable for the time_step-th time step. - For example, the following demonstrates how this function would be used: diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_get_nodal_var_time.c b/packages/seacas/libraries/exodus/src/deprecated/ex_get_nodal_var_time.c index 355bf1b69d4e..acdc88dfb7c6 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_get_nodal_var_time.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_get_nodal_var_time.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ @@ -58,7 +58,6 @@ beg_time_step +1) values nodal_var_index-th nodal variable. - For example, the following code segment will read the values of the first nodal variable for node number one for all time steps stored in the data file: diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_get_node_map.c b/packages/seacas/libraries/exodus/src/deprecated/ex_get_node_map.c index 5341ca7cf149..99dafbb7177e 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_get_node_map.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_get_node_map.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_get_node_num_map.c b/packages/seacas/libraries/exodus/src/deprecated/ex_get_node_num_map.c index ffed2160c6b2..037b8a8cd324 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_get_node_num_map.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_get_node_num_map.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_get_node_set.c b/packages/seacas/libraries/exodus/src/deprecated/ex_get_node_set.c index cdf219331e70..e8adfda066c1 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_get_node_set.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_get_node_set.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_get_node_set_dist_fact.c b/packages/seacas/libraries/exodus/src/deprecated/ex_get_node_set_dist_fact.c index 98cde8296605..c50c22c0e8e9 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_get_node_set_dist_fact.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_get_node_set_dist_fact.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_get_node_set_ids.c b/packages/seacas/libraries/exodus/src/deprecated/ex_get_node_set_ids.c index 4b3528454ca4..4c9b7ba5d355 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_get_node_set_ids.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_get_node_set_ids.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_get_node_set_param.c b/packages/seacas/libraries/exodus/src/deprecated/ex_get_node_set_param.c index 4ceb6917731c..a3f297729892 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_get_node_set_param.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_get_node_set_param.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_get_nset_var.c b/packages/seacas/libraries/exodus/src/deprecated/ex_get_nset_var.c index b0034569f01f..f1a11abae0f1 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_get_nset_var.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_get_nset_var.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_get_nset_var_tab.c b/packages/seacas/libraries/exodus/src/deprecated/ex_get_nset_var_tab.c index 3f7b7beb7682..7211602caac8 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_get_nset_var_tab.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_get_nset_var_tab.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_get_one_elem_attr.c b/packages/seacas/libraries/exodus/src/deprecated/ex_get_one_elem_attr.c index d05583d10c96..ca90f2aa29e6 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_get_one_elem_attr.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_get_one_elem_attr.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_get_partial_elem_attr.c b/packages/seacas/libraries/exodus/src/deprecated/ex_get_partial_elem_attr.c index d3a576a25bd0..2da322df661b 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_get_partial_elem_attr.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_get_partial_elem_attr.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /*****************************************************************************/ diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_get_partial_elem_conn.c b/packages/seacas/libraries/exodus/src/deprecated/ex_get_partial_elem_conn.c index a5c8832e9389..a37b2aeda7af 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_get_partial_elem_conn.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_get_partial_elem_conn.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /*****************************************************************************/ diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_get_partial_elem_map.c b/packages/seacas/libraries/exodus/src/deprecated/ex_get_partial_elem_map.c index 201f953f30ee..f198ba0133b2 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_get_partial_elem_map.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_get_partial_elem_map.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_get_partial_elem_num_map.c b/packages/seacas/libraries/exodus/src/deprecated/ex_get_partial_elem_num_map.c index 38ea59bbfd5b..c0df8e1547b1 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_get_partial_elem_num_map.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_get_partial_elem_num_map.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_get_partial_elem_var.c b/packages/seacas/libraries/exodus/src/deprecated/ex_get_partial_elem_var.c index 1ddcd4e23d91..2157ed565f2b 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_get_partial_elem_var.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_get_partial_elem_var.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /*****************************************************************************/ diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_get_partial_nodal_var.c b/packages/seacas/libraries/exodus/src/deprecated/ex_get_partial_nodal_var.c index b76dd25f131d..42e314ad390b 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_get_partial_nodal_var.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_get_partial_nodal_var.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** @@ -24,7 +24,6 @@ * * revision history - * - * $Id: ne_gnnv.c,v 1.16 2008/01/25 15:47:35 gdsjaar Exp $ * *****************************************************************************/ diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_get_partial_node_num_map.c b/packages/seacas/libraries/exodus/src/deprecated/ex_get_partial_node_num_map.c index de3d305becb9..53f831fef9fe 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_get_partial_node_num_map.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_get_partial_node_num_map.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_get_partial_node_set.c b/packages/seacas/libraries/exodus/src/deprecated/ex_get_partial_node_set.c index 20fe17a5be2b..93e32a80f494 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_get_partial_node_set.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_get_partial_node_set.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /*****************************************************************************/ diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_get_partial_node_set_df.c b/packages/seacas/libraries/exodus/src/deprecated/ex_get_partial_node_set_df.c index 53d6cb9dbe97..1811f4bd8a29 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_get_partial_node_set_df.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_get_partial_node_set_df.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /*****************************************************************************/ diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_get_partial_side_set.c b/packages/seacas/libraries/exodus/src/deprecated/ex_get_partial_side_set.c index c951c9312a41..66f4c5a87bca 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_get_partial_side_set.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_get_partial_side_set.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /*****************************************************************************/ diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_get_partial_side_set_df.c b/packages/seacas/libraries/exodus/src/deprecated/ex_get_partial_side_set_df.c index 76296558f8e9..9d5eada56cee 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_get_partial_side_set_df.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_get_partial_side_set_df.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /*****************************************************************************/ diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_get_side_set.c b/packages/seacas/libraries/exodus/src/deprecated/ex_get_side_set.c index 8a32b0f5bf5b..4ea9b94b78da 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_get_side_set.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_get_side_set.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_get_side_set_dist_fact.c b/packages/seacas/libraries/exodus/src/deprecated/ex_get_side_set_dist_fact.c index 976af324ade6..117ff3c3ab71 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_get_side_set_dist_fact.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_get_side_set_dist_fact.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_get_side_set_ids.c b/packages/seacas/libraries/exodus/src/deprecated/ex_get_side_set_ids.c index 53cd7e631f8f..c9265e28b064 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_get_side_set_ids.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_get_side_set_ids.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_get_side_set_param.c b/packages/seacas/libraries/exodus/src/deprecated/ex_get_side_set_param.c index 8c8ff9dd8a3c..08cf5df766a5 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_get_side_set_param.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_get_side_set_param.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_get_sset_var.c b/packages/seacas/libraries/exodus/src/deprecated/ex_get_sset_var.c index ba5854421d5e..71796fc51ab0 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_get_sset_var.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_get_sset_var.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_get_sset_var_tab.c b/packages/seacas/libraries/exodus/src/deprecated/ex_get_sset_var_tab.c index 62edfacb6cd0..66a03f6d7999 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_get_sset_var_tab.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_get_sset_var_tab.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_get_var_name.c b/packages/seacas/libraries/exodus/src/deprecated/ex_get_var_name.c index 5684640b4689..477aca02337a 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_get_var_name.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_get_var_name.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_get_var_names.c b/packages/seacas/libraries/exodus/src/deprecated/ex_get_var_names.c index 1472e9339729..0f066ab3bd3f 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_get_var_names.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_get_var_names.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_get_var_param.c b/packages/seacas/libraries/exodus/src/deprecated/ex_get_var_param.c index 3a5178c4efb1..e53efc947f19 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_get_var_param.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_get_var_param.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_get_var_tab.c b/packages/seacas/libraries/exodus/src/deprecated/ex_get_var_tab.c index 171f97945dac..93e352dba969 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_get_var_tab.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_get_var_tab.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_put_concat_node_sets.c b/packages/seacas/libraries/exodus/src/deprecated/ex_put_concat_node_sets.c index 72bcd8caa2ab..9f7d58cadb99 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_put_concat_node_sets.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_put_concat_node_sets.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ @@ -71,7 +71,6 @@ Internal node IDs are used in \param[in] node_sets_dist_fact Array containing the distribution factors for all sets. - For example, the following code will write out two node sets in a concatenated format: diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_put_concat_side_sets.c b/packages/seacas/libraries/exodus/src/deprecated/ex_put_concat_side_sets.c index fd1ad9b6cfcd..d33280199f68 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_put_concat_side_sets.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_put_concat_side_sets.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_put_concat_var_param.c b/packages/seacas/libraries/exodus/src/deprecated/ex_put_concat_var_param.c index 3c1eee4366e7..0dfcf9a4a2e3 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_put_concat_var_param.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_put_concat_var_param.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_put_elem_attr.c b/packages/seacas/libraries/exodus/src/deprecated/ex_put_elem_attr.c index ef3499e5cac4..c948f511d193 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_put_elem_attr.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_put_elem_attr.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_put_elem_attr_names.c b/packages/seacas/libraries/exodus/src/deprecated/ex_put_elem_attr_names.c index 345e2ce7cee5..f812669711cf 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_put_elem_attr_names.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_put_elem_attr_names.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_put_elem_block.c b/packages/seacas/libraries/exodus/src/deprecated/ex_put_elem_block.c index 3839b33522c2..17d4506e3776 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_put_elem_block.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_put_elem_block.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_put_elem_conn.c b/packages/seacas/libraries/exodus/src/deprecated/ex_put_elem_conn.c index 95ee4df4922e..f7e3b44e4561 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_put_elem_conn.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_put_elem_conn.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ @@ -22,7 +22,6 @@ errors include: - data file not initialized properly with call to ex_put_init(). - ex_put_elem_block() was not called previously. - \param[in] exoid exodus file ID returned from a previous call to ex_create() or ex_open(). \param[in] elem_blk_id The element block ID. diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_put_elem_map.c b/packages/seacas/libraries/exodus/src/deprecated/ex_put_elem_map.c index 3b84d3feac76..c89d9902acde 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_put_elem_map.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_put_elem_map.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_put_elem_num_map.c b/packages/seacas/libraries/exodus/src/deprecated/ex_put_elem_num_map.c index 6beb31d34171..b0fe164467c5 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_put_elem_num_map.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_put_elem_num_map.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_put_elem_var.c b/packages/seacas/libraries/exodus/src/deprecated/ex_put_elem_var.c index 47c913f768ef..86de9344e429 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_put_elem_var.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_put_elem_var.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_put_elem_var_slab.c b/packages/seacas/libraries/exodus/src/deprecated/ex_put_elem_var_slab.c index f5b41e34bc23..361061a99abf 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_put_elem_var_slab.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_put_elem_var_slab.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /*****************************************************************************/ diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_put_elem_var_tab.c b/packages/seacas/libraries/exodus/src/deprecated/ex_put_elem_var_tab.c index f040e2871499..d0627dfe4dda 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_put_elem_var_tab.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_put_elem_var_tab.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_put_glob_vars.c b/packages/seacas/libraries/exodus/src/deprecated/ex_put_glob_vars.c index 333c9d29f703..d557cb3f3f30 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_put_glob_vars.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_put_glob_vars.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** @@ -46,7 +46,6 @@ errors include: - ex_put_variable_param() not called previously specifying the number of global variables. - \param[in] exoid exodus file ID returned from a previous call to ex_create() or ex_open(). \param[in] time_step The time step number, as described under @@ -59,7 +58,6 @@ database. \param[in] glob_var_vals Array of num_glob_vars global variable values for the time_step-th time step. - As an example, the following coding will write the values of all the global variables at one time step to an open exodus II file: diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_put_n_attr.c b/packages/seacas/libraries/exodus/src/deprecated/ex_put_n_attr.c index 78e3265744bf..7808f97fc942 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_put_n_attr.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_put_n_attr.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_put_n_coord.c b/packages/seacas/libraries/exodus/src/deprecated/ex_put_n_coord.c index 588cdf8c940d..cb5af89fad63 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_put_n_coord.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_put_n_coord.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_put_n_elem_attr.c b/packages/seacas/libraries/exodus/src/deprecated/ex_put_n_elem_attr.c index f7ca5c0c82fc..b9e24d1d52f9 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_put_n_elem_attr.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_put_n_elem_attr.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /*****************************************************************************/ diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_put_n_elem_conn.c b/packages/seacas/libraries/exodus/src/deprecated/ex_put_n_elem_conn.c index e0c2c4b14773..82cde947a787 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_put_n_elem_conn.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_put_n_elem_conn.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /*****************************************************************************/ diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_put_n_elem_num_map.c b/packages/seacas/libraries/exodus/src/deprecated/ex_put_n_elem_num_map.c index e1a0730442ff..9c815fa1ca3b 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_put_n_elem_num_map.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_put_n_elem_num_map.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_put_n_nodal_var.c b/packages/seacas/libraries/exodus/src/deprecated/ex_put_n_nodal_var.c index 3be3bbccfc9a..d30083de603d 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_put_n_nodal_var.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_put_n_nodal_var.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_put_n_node_num_map.c b/packages/seacas/libraries/exodus/src/deprecated/ex_put_n_node_num_map.c index aca6ca33aa1c..d012dca0d05c 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_put_n_node_num_map.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_put_n_node_num_map.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_put_n_node_set.c b/packages/seacas/libraries/exodus/src/deprecated/ex_put_n_node_set.c index b954a4113156..9487dbcc96ec 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_put_n_node_set.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_put_n_node_set.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_put_n_node_set_df.c b/packages/seacas/libraries/exodus/src/deprecated/ex_put_n_node_set_df.c index 2e21a4630138..ce69aa3a7718 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_put_n_node_set_df.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_put_n_node_set_df.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_put_n_one_attr.c b/packages/seacas/libraries/exodus/src/deprecated/ex_put_n_one_attr.c index 2aea63a68c9e..6e54b80e1db6 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_put_n_one_attr.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_put_n_one_attr.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_put_n_side_set.c b/packages/seacas/libraries/exodus/src/deprecated/ex_put_n_side_set.c index aea0eb7a1db3..2372933a8b42 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_put_n_side_set.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_put_n_side_set.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_put_n_side_set_df.c b/packages/seacas/libraries/exodus/src/deprecated/ex_put_n_side_set_df.c index 32df00602f14..dee71b137f6d 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_put_n_side_set_df.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_put_n_side_set_df.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_put_n_var.c b/packages/seacas/libraries/exodus/src/deprecated/ex_put_n_var.c index 22374623ce3b..2a00b0bfa762 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_put_n_var.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_put_n_var.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_put_nodal_var_slab.c b/packages/seacas/libraries/exodus/src/deprecated/ex_put_nodal_var_slab.c index 0234c3882f0b..07b57bf57a2a 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_put_nodal_var_slab.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_put_nodal_var_slab.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_put_node_map.c b/packages/seacas/libraries/exodus/src/deprecated/ex_put_node_map.c index 1850c2da1a7e..075546d060b7 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_put_node_map.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_put_node_map.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_put_node_num_map.c b/packages/seacas/libraries/exodus/src/deprecated/ex_put_node_num_map.c index e8ef48d24a02..15bfaebf0bc9 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_put_node_num_map.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_put_node_num_map.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #include "exodusII.h" diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_put_node_set.c b/packages/seacas/libraries/exodus/src/deprecated/ex_put_node_set.c index 5658c188ceff..ba75a681f60e 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_put_node_set.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_put_node_set.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_put_node_set_dist_fact.c b/packages/seacas/libraries/exodus/src/deprecated/ex_put_node_set_dist_fact.c index c0fd5dcca325..aa2c1dc0da0d 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_put_node_set_dist_fact.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_put_node_set_dist_fact.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_put_node_set_param.c b/packages/seacas/libraries/exodus/src/deprecated/ex_put_node_set_param.c index fd2f987e3de4..b777c68b10d0 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_put_node_set_param.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_put_node_set_param.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ @@ -36,7 +36,6 @@ ex_create() or ex_open(). set. This should be either 0 (zero) for no factors, or should equal num_nodes_in_set. - The following code segment will write out a node set to an open exodus file : diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_put_nset_var.c b/packages/seacas/libraries/exodus/src/deprecated/ex_put_nset_var.c index d954360d6606..92109aa63c65 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_put_nset_var.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_put_nset_var.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_put_nset_var_tab.c b/packages/seacas/libraries/exodus/src/deprecated/ex_put_nset_var_tab.c index c45aea7216f2..0ea35bf53125 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_put_nset_var_tab.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_put_nset_var_tab.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_put_one_elem_attr.c b/packages/seacas/libraries/exodus/src/deprecated/ex_put_one_elem_attr.c index 539e9a1af872..d9c090586089 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_put_one_elem_attr.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_put_one_elem_attr.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_put_partial_elem_attr.c b/packages/seacas/libraries/exodus/src/deprecated/ex_put_partial_elem_attr.c index 75e02689da89..0d01e482bc40 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_put_partial_elem_attr.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_put_partial_elem_attr.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /*****************************************************************************/ diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_put_partial_elem_conn.c b/packages/seacas/libraries/exodus/src/deprecated/ex_put_partial_elem_conn.c index cc657b7b60ab..ee5a4f1b58e0 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_put_partial_elem_conn.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_put_partial_elem_conn.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /*****************************************************************************/ diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_put_partial_elem_map.c b/packages/seacas/libraries/exodus/src/deprecated/ex_put_partial_elem_map.c index 5ff8cf0b0ac0..908ed67cf838 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_put_partial_elem_map.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_put_partial_elem_map.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_put_partial_elem_num_map.c b/packages/seacas/libraries/exodus/src/deprecated/ex_put_partial_elem_num_map.c index 7a702b6dffe1..32483e3b9ba5 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_put_partial_elem_num_map.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_put_partial_elem_num_map.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_put_partial_nodal_var.c b/packages/seacas/libraries/exodus/src/deprecated/ex_put_partial_nodal_var.c index 904f9201eced..ee396db3aeaf 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_put_partial_nodal_var.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_put_partial_nodal_var.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_put_partial_node_num_map.c b/packages/seacas/libraries/exodus/src/deprecated/ex_put_partial_node_num_map.c index d30a578e3a8c..24c8cf710a54 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_put_partial_node_num_map.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_put_partial_node_num_map.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_put_partial_node_set.c b/packages/seacas/libraries/exodus/src/deprecated/ex_put_partial_node_set.c index 66a55a7942d2..b40b3332371b 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_put_partial_node_set.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_put_partial_node_set.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_put_partial_node_set_df.c b/packages/seacas/libraries/exodus/src/deprecated/ex_put_partial_node_set_df.c index a6db04ad8a7f..54c5f1c70352 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_put_partial_node_set_df.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_put_partial_node_set_df.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_put_partial_side_set.c b/packages/seacas/libraries/exodus/src/deprecated/ex_put_partial_side_set.c index ef07f18faefd..16a868a505c2 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_put_partial_side_set.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_put_partial_side_set.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_put_partial_side_set_df.c b/packages/seacas/libraries/exodus/src/deprecated/ex_put_partial_side_set_df.c index d3c2de361939..ca6e253334db 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_put_partial_side_set_df.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_put_partial_side_set_df.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_put_side_set.c b/packages/seacas/libraries/exodus/src/deprecated/ex_put_side_set.c index 7f20e779e6e4..a2d3e69ba23d 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_put_side_set.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_put_side_set.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_put_side_set_dist_fact.c b/packages/seacas/libraries/exodus/src/deprecated/ex_put_side_set_dist_fact.c index 8146a62c6291..be81e32224f5 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_put_side_set_dist_fact.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_put_side_set_dist_fact.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_put_side_set_param.c b/packages/seacas/libraries/exodus/src/deprecated/ex_put_side_set_param.c index 76fd26caddc4..35800141334b 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_put_side_set_param.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_put_side_set_param.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_put_sset_var.c b/packages/seacas/libraries/exodus/src/deprecated/ex_put_sset_var.c index a8c9fefb9a4b..5ed5bd7fbd0c 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_put_sset_var.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_put_sset_var.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_put_sset_var_tab.c b/packages/seacas/libraries/exodus/src/deprecated/ex_put_sset_var_tab.c index e55d318438d1..5ef8be169a38 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_put_sset_var_tab.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_put_sset_var_tab.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_put_var_name.c b/packages/seacas/libraries/exodus/src/deprecated/ex_put_var_name.c index a7f8b9b1bfa1..e469bf23f0c7 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_put_var_name.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_put_var_name.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_put_var_names.c b/packages/seacas/libraries/exodus/src/deprecated/ex_put_var_names.c index 4ed71692c409..5beb65d09e16 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_put_var_names.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_put_var_names.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_put_var_param.c b/packages/seacas/libraries/exodus/src/deprecated/ex_put_var_param.c index 66c676d62858..d503fc9f4a90 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_put_var_param.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_put_var_param.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/deprecated/ex_put_var_tab.c b/packages/seacas/libraries/exodus/src/deprecated/ex_put_var_tab.c index df93c8c42cfb..a162d2a6222c 100644 --- a/packages/seacas/libraries/exodus/src/deprecated/ex_put_var_tab.c +++ b/packages/seacas/libraries/exodus/src/deprecated/ex_put_var_tab.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/ex__put_homogenous_block_params.c b/packages/seacas/libraries/exodus/src/ex__put_homogenous_block_params.c index 7c572ce18119..c3c92cfe8637 100644 --- a/packages/seacas/libraries/exodus/src/ex__put_homogenous_block_params.c +++ b/packages/seacas/libraries/exodus/src/ex__put_homogenous_block_params.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ @@ -10,7 +10,7 @@ #include "exodusII_int.h" // for EX_FATAL, etc /*! - * Internal function used to put a homogenous `blocks` array that + * Internal function used to put a homogeneous `blocks` array that * contains all blocks of that specified type that will be defined. * Permits some optimizations and safer for N->1 parallel. * Arbitrary polyhedra are handled in more general routine; not here. diff --git a/packages/seacas/libraries/exodus/src/ex_add_attr.c b/packages/seacas/libraries/exodus/src/ex_add_attr.c index 7f251aa8dae8..859f39ac9712 100644 --- a/packages/seacas/libraries/exodus/src/ex_add_attr.c +++ b/packages/seacas/libraries/exodus/src/ex_add_attr.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #include "exodusII.h" // for ex_err, etc diff --git a/packages/seacas/libraries/exodus/src/ex_close.c b/packages/seacas/libraries/exodus/src/ex_close.c index 5a1491ca78b7..876865a95fd0 100644 --- a/packages/seacas/libraries/exodus/src/ex_close.c +++ b/packages/seacas/libraries/exodus/src/ex_close.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/ex_conv.c b/packages/seacas/libraries/exodus/src/ex_conv.c index 6580152f6bbc..59d7dfd656b4 100644 --- a/packages/seacas/libraries/exodus/src/ex_conv.c +++ b/packages/seacas/libraries/exodus/src/ex_conv.c @@ -2,21 +2,9 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ -/***************************************************************************** - * - * exutils - exodus utilities - * - * entry conditions - - * - * exit conditions - - * - * revision history - - * - * - *****************************************************************************/ #include "exodusII.h" // for ex_err, etc #include "exodusII_int.h" // for ex__file_item, EX_FATAL, etc @@ -72,7 +60,11 @@ int ex__check_multiple_open(const char *path, int mode, const char *func) " File corruption or incorrect behavior can occur.\n", path); ex_err(func, errmsg, EX_BADFILEID); +#if defined BUILT_IN_SIERRA + EX_FUNC_LEAVE(EX_NOERR); +#else EX_FUNC_LEAVE(EX_FATAL); +#endif } } ptr = ptr->next; diff --git a/packages/seacas/libraries/exodus/src/ex_copy.c b/packages/seacas/libraries/exodus/src/ex_copy.c index 3cda39767c39..96bef07bab99 100644 --- a/packages/seacas/libraries/exodus/src/ex_copy.c +++ b/packages/seacas/libraries/exodus/src/ex_copy.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/ex_create.c b/packages/seacas/libraries/exodus/src/ex_create.c index 7d2d86cad011..7589adc7a2a3 100644 --- a/packages/seacas/libraries/exodus/src/ex_create.c +++ b/packages/seacas/libraries/exodus/src/ex_create.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ @@ -34,7 +34,6 @@ causes of errors include: to create files there. - Passing an invalid file clobber mode. - \param path The file name of the new exodus file. This can be given as either an absolute path name (from the root of the file system) or a relative path name (from the current directory). diff --git a/packages/seacas/libraries/exodus/src/ex_create_group.c b/packages/seacas/libraries/exodus/src/ex_create_group.c index 948290ebd506..13420ffa0dc2 100644 --- a/packages/seacas/libraries/exodus/src/ex_create_group.c +++ b/packages/seacas/libraries/exodus/src/ex_create_group.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/ex_create_par.c b/packages/seacas/libraries/exodus/src/ex_create_par.c index 1a5d9424f284..b24cbde6b6b0 100644 --- a/packages/seacas/libraries/exodus/src/ex_create_par.c +++ b/packages/seacas/libraries/exodus/src/ex_create_par.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ @@ -34,7 +34,6 @@ causes of errors include: to create files there. - Passing an invalid file clobber mode. - \param path The file name of the new exodus file. This can be given as either an absolute path name (from the root of the file system) or a relative path name (from the current directory). diff --git a/packages/seacas/libraries/exodus/src/ex_cvt_nodes_to_sides.c b/packages/seacas/libraries/exodus/src/ex_cvt_nodes_to_sides.c index 82aaa75835ca..5a8d629143ef 100644 --- a/packages/seacas/libraries/exodus/src/ex_cvt_nodes_to_sides.c +++ b/packages/seacas/libraries/exodus/src/ex_cvt_nodes_to_sides.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ @@ -85,7 +85,6 @@ LocalNodeIds). \param[out] side_sets_side_list Returned array containing the sides for all side sets. - The following code segment will convert side sets described by nodes to side sets described by local side numbers: diff --git a/packages/seacas/libraries/exodus/src/ex_err.c b/packages/seacas/libraries/exodus/src/ex_err.c index 38436a443764..f02083b162d5 100644 --- a/packages/seacas/libraries/exodus/src/ex_err.c +++ b/packages/seacas/libraries/exodus/src/ex_err.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/ex_get_all_times.c b/packages/seacas/libraries/exodus/src/ex_get_all_times.c index 7991d3d9299e..f0a09f7b9947 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_all_times.c +++ b/packages/seacas/libraries/exodus/src/ex_get_all_times.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/ex_get_assemblies.c b/packages/seacas/libraries/exodus/src/ex_get_assemblies.c index 4a08ab352947..3e6250574201 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_assemblies.c +++ b/packages/seacas/libraries/exodus/src/ex_get_assemblies.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/ex_get_assembly.c b/packages/seacas/libraries/exodus/src/ex_get_assembly.c index 54381bf5c424..bd5ffd6b9890 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_assembly.c +++ b/packages/seacas/libraries/exodus/src/ex_get_assembly.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/ex_get_attr.c b/packages/seacas/libraries/exodus/src/ex_get_attr.c index 299c6b2c9d13..82d16d66b351 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_attr.c +++ b/packages/seacas/libraries/exodus/src/ex_get_attr.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/ex_get_attr_names.c b/packages/seacas/libraries/exodus/src/ex_get_attr_names.c index a4fff3dfabd7..33efc01d6e38 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_attr_names.c +++ b/packages/seacas/libraries/exodus/src/ex_get_attr_names.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/ex_get_attr_param.c b/packages/seacas/libraries/exodus/src/ex_get_attr_param.c index ef1c56cd86a9..9f8af5a54227 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_attr_param.c +++ b/packages/seacas/libraries/exodus/src/ex_get_attr_param.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/ex_get_attribute.c b/packages/seacas/libraries/exodus/src/ex_get_attribute.c index 811a243003ec..92c39b04e8e6 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_attribute.c +++ b/packages/seacas/libraries/exodus/src/ex_get_attribute.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/ex_get_blob.c b/packages/seacas/libraries/exodus/src/ex_get_blob.c index 546de6ad7234..8541bc7279ab 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_blob.c +++ b/packages/seacas/libraries/exodus/src/ex_get_blob.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/ex_get_blobs.c b/packages/seacas/libraries/exodus/src/ex_get_blobs.c index 323405d729eb..fde8ca7ab581 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_blobs.c +++ b/packages/seacas/libraries/exodus/src/ex_get_blobs.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/ex_get_block.c b/packages/seacas/libraries/exodus/src/ex_get_block.c index 100acbd08f45..12ea5d7b85e2 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_block.c +++ b/packages/seacas/libraries/exodus/src/ex_get_block.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /*! diff --git a/packages/seacas/libraries/exodus/src/ex_get_block_param.c b/packages/seacas/libraries/exodus/src/ex_get_block_param.c index ffe04f4ecd70..cadfe2f19e20 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_block_param.c +++ b/packages/seacas/libraries/exodus/src/ex_get_block_param.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /*! diff --git a/packages/seacas/libraries/exodus/src/ex_get_block_params.c b/packages/seacas/libraries/exodus/src/ex_get_block_params.c index 020e29b5315f..d7e939293ea9 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_block_params.c +++ b/packages/seacas/libraries/exodus/src/ex_get_block_params.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #include "exodusII.h" // for EX_NOERR, etc diff --git a/packages/seacas/libraries/exodus/src/ex_get_cmap_params.c b/packages/seacas/libraries/exodus/src/ex_get_cmap_params.c index 4e778e5664ab..d735268a8533 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_cmap_params.c +++ b/packages/seacas/libraries/exodus/src/ex_get_cmap_params.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /*****************************************************************************/ diff --git a/packages/seacas/libraries/exodus/src/ex_get_concat_sets.c b/packages/seacas/libraries/exodus/src/ex_get_concat_sets.c index 1a10833e35d4..1d441bfc3799 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_concat_sets.c +++ b/packages/seacas/libraries/exodus/src/ex_get_concat_sets.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /*! diff --git a/packages/seacas/libraries/exodus/src/ex_get_concat_side_set_node_count.c b/packages/seacas/libraries/exodus/src/ex_get_concat_side_set_node_count.c index 500e35d6e6f9..b46ab918e882 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_concat_side_set_node_count.c +++ b/packages/seacas/libraries/exodus/src/ex_get_concat_side_set_node_count.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/ex_get_conn.c b/packages/seacas/libraries/exodus/src/ex_get_conn.c index 2eaa31586398..fb776d1fd6bb 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_conn.c +++ b/packages/seacas/libraries/exodus/src/ex_get_conn.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /*! diff --git a/packages/seacas/libraries/exodus/src/ex_get_coord.c b/packages/seacas/libraries/exodus/src/ex_get_coord.c index 76a377c5ea81..7e45bf4bdaf6 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_coord.c +++ b/packages/seacas/libraries/exodus/src/ex_get_coord.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/ex_get_coord_names.c b/packages/seacas/libraries/exodus/src/ex_get_coord_names.c index 7c79ecb5e385..20496b95b93f 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_coord_names.c +++ b/packages/seacas/libraries/exodus/src/ex_get_coord_names.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/ex_get_coordinate_frames.c b/packages/seacas/libraries/exodus/src/ex_get_coordinate_frames.c index 5bd82950bf9c..d28c987a0e18 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_coordinate_frames.c +++ b/packages/seacas/libraries/exodus/src/ex_get_coordinate_frames.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/ex_get_eb_info_global.c b/packages/seacas/libraries/exodus/src/ex_get_eb_info_global.c index 5d2aa646dad1..50dc10e722c3 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_eb_info_global.c +++ b/packages/seacas/libraries/exodus/src/ex_get_eb_info_global.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /*****************************************************************************/ diff --git a/packages/seacas/libraries/exodus/src/ex_get_elem_cmap.c b/packages/seacas/libraries/exodus/src/ex_get_elem_cmap.c index 1ddf3e7d6d9a..bdb0bf99c364 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_elem_cmap.c +++ b/packages/seacas/libraries/exodus/src/ex_get_elem_cmap.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /****************************************************************************/ diff --git a/packages/seacas/libraries/exodus/src/ex_get_elem_type.c b/packages/seacas/libraries/exodus/src/ex_get_elem_type.c index 2505656aa34a..7a6cae211184 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_elem_type.c +++ b/packages/seacas/libraries/exodus/src/ex_get_elem_type.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /*****************************************************************************/ diff --git a/packages/seacas/libraries/exodus/src/ex_get_entity_count_per_polyhedra.c b/packages/seacas/libraries/exodus/src/ex_get_entity_count_per_polyhedra.c index b643a860947b..87ec3f69528a 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_entity_count_per_polyhedra.c +++ b/packages/seacas/libraries/exodus/src/ex_get_entity_count_per_polyhedra.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/ex_get_glob_var_time_int.c b/packages/seacas/libraries/exodus/src/ex_get_glob_var_time_int.c index 4d72505ff255..67da3ad9f159 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_glob_var_time_int.c +++ b/packages/seacas/libraries/exodus/src/ex_get_glob_var_time_int.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/ex_get_glob_vars_int.c b/packages/seacas/libraries/exodus/src/ex_get_glob_vars_int.c index 35bae52ccc36..945f6c7a5116 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_glob_vars_int.c +++ b/packages/seacas/libraries/exodus/src/ex_get_glob_vars_int.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/ex_get_group_id.c b/packages/seacas/libraries/exodus/src/ex_get_group_id.c index 4708f44495bb..d98c8ca401d6 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_group_id.c +++ b/packages/seacas/libraries/exodus/src/ex_get_group_id.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/ex_get_group_ids.c b/packages/seacas/libraries/exodus/src/ex_get_group_ids.c index eb8e4bbe8879..5d99af1b4b3c 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_group_ids.c +++ b/packages/seacas/libraries/exodus/src/ex_get_group_ids.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/ex_get_id_map.c b/packages/seacas/libraries/exodus/src/ex_get_id_map.c index 36aabd08f201..80c353225356 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_id_map.c +++ b/packages/seacas/libraries/exodus/src/ex_get_id_map.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/ex_get_ids.c b/packages/seacas/libraries/exodus/src/ex_get_ids.c index c0e764816077..617334740d3f 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_ids.c +++ b/packages/seacas/libraries/exodus/src/ex_get_ids.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /* diff --git a/packages/seacas/libraries/exodus/src/ex_get_info.c b/packages/seacas/libraries/exodus/src/ex_get_info.c index 39e00c78b88f..901d8dcabf2f 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_info.c +++ b/packages/seacas/libraries/exodus/src/ex_get_info.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/ex_get_init.c b/packages/seacas/libraries/exodus/src/ex_get_init.c index 7bee534fd2b4..f50bc0e33e59 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_init.c +++ b/packages/seacas/libraries/exodus/src/ex_get_init.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/ex_get_init_ext.c b/packages/seacas/libraries/exodus/src/ex_get_init_ext.c index b95a9090adbf..9b546850caaa 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_init_ext.c +++ b/packages/seacas/libraries/exodus/src/ex_get_init_ext.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/ex_get_init_global.c b/packages/seacas/libraries/exodus/src/ex_get_init_global.c index eed24c2d5cd7..e495163a2130 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_init_global.c +++ b/packages/seacas/libraries/exodus/src/ex_get_init_global.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /*****************************************************************************/ diff --git a/packages/seacas/libraries/exodus/src/ex_get_init_info.c b/packages/seacas/libraries/exodus/src/ex_get_init_info.c index 2308a39a5f1d..fec9eb75bff3 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_init_info.c +++ b/packages/seacas/libraries/exodus/src/ex_get_init_info.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /*****************************************************************************/ diff --git a/packages/seacas/libraries/exodus/src/ex_get_loadbal_param.c b/packages/seacas/libraries/exodus/src/ex_get_loadbal_param.c index bd0056567577..2b17f849eac1 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_loadbal_param.c +++ b/packages/seacas/libraries/exodus/src/ex_get_loadbal_param.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /*****************************************************************************/ diff --git a/packages/seacas/libraries/exodus/src/ex_get_map.c b/packages/seacas/libraries/exodus/src/ex_get_map.c index 2efef39bcaa3..9f560865b2f9 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_map.c +++ b/packages/seacas/libraries/exodus/src/ex_get_map.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/ex_get_map_param.c b/packages/seacas/libraries/exodus/src/ex_get_map_param.c index e6d594c6b61b..0a83df7d895d 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_map_param.c +++ b/packages/seacas/libraries/exodus/src/ex_get_map_param.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/ex_get_name.c b/packages/seacas/libraries/exodus/src/ex_get_name.c index 71419665b581..1fcde71a0dd7 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_name.c +++ b/packages/seacas/libraries/exodus/src/ex_get_name.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/ex_get_names.c b/packages/seacas/libraries/exodus/src/ex_get_names.c index 3fcad5848f70..178d58f5536f 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_names.c +++ b/packages/seacas/libraries/exodus/src/ex_get_names.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/ex_get_nodal_var_int.c b/packages/seacas/libraries/exodus/src/ex_get_nodal_var_int.c index 3f05d222f85d..7c508e95ff5d 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_nodal_var_int.c +++ b/packages/seacas/libraries/exodus/src/ex_get_nodal_var_int.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ @@ -54,7 +54,6 @@ nodal_var_index-th nodal variable for the time_step-th time step. - For example, the following demonstrates how this function would be used: diff --git a/packages/seacas/libraries/exodus/src/ex_get_nodal_var_time_int.c b/packages/seacas/libraries/exodus/src/ex_get_nodal_var_time_int.c index cd015dd84da8..3767ef4e7ed3 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_nodal_var_time_int.c +++ b/packages/seacas/libraries/exodus/src/ex_get_nodal_var_time_int.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ @@ -57,7 +57,6 @@ beg_time_step +1) values nodal_var_index-th nodal variable. - For example, the following code segment will read the values of the first nodal variable for node number one for all time steps stored in the data file: diff --git a/packages/seacas/libraries/exodus/src/ex_get_node_cmap.c b/packages/seacas/libraries/exodus/src/ex_get_node_cmap.c index f1311f356503..90299fee4f67 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_node_cmap.c +++ b/packages/seacas/libraries/exodus/src/ex_get_node_cmap.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /****************************************************************************/ diff --git a/packages/seacas/libraries/exodus/src/ex_get_ns_param_global.c b/packages/seacas/libraries/exodus/src/ex_get_ns_param_global.c index 552b1c92e31d..51c5fcc8421d 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_ns_param_global.c +++ b/packages/seacas/libraries/exodus/src/ex_get_ns_param_global.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /*****************************************************************************/ diff --git a/packages/seacas/libraries/exodus/src/ex_get_num_map.c b/packages/seacas/libraries/exodus/src/ex_get_num_map.c index db818979ce60..e664b35c8672 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_num_map.c +++ b/packages/seacas/libraries/exodus/src/ex_get_num_map.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/ex_get_object_truth_vector.c b/packages/seacas/libraries/exodus/src/ex_get_object_truth_vector.c index 2e05506dd85d..fb16974bdb04 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_object_truth_vector.c +++ b/packages/seacas/libraries/exodus/src/ex_get_object_truth_vector.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/ex_get_one_attr.c b/packages/seacas/libraries/exodus/src/ex_get_one_attr.c index e21a213a89ae..3e776f6650bb 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_one_attr.c +++ b/packages/seacas/libraries/exodus/src/ex_get_one_attr.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/ex_get_partial_attr.c b/packages/seacas/libraries/exodus/src/ex_get_partial_attr.c index 65ab9b2ea826..e2b3ad30218c 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_partial_attr.c +++ b/packages/seacas/libraries/exodus/src/ex_get_partial_attr.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/ex_get_partial_conn.c b/packages/seacas/libraries/exodus/src/ex_get_partial_conn.c index 9a45dfb7ef17..71c44f538904 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_partial_conn.c +++ b/packages/seacas/libraries/exodus/src/ex_get_partial_conn.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/ex_get_partial_coord.c b/packages/seacas/libraries/exodus/src/ex_get_partial_coord.c index e5453dcdece2..ec272b61cb23 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_partial_coord.c +++ b/packages/seacas/libraries/exodus/src/ex_get_partial_coord.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/ex_get_partial_coord_component.c b/packages/seacas/libraries/exodus/src/ex_get_partial_coord_component.c index 306e3639fc7e..b2cc201b3c7e 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_partial_coord_component.c +++ b/packages/seacas/libraries/exodus/src/ex_get_partial_coord_component.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/ex_get_partial_id_map.c b/packages/seacas/libraries/exodus/src/ex_get_partial_id_map.c index 9284dcfc140d..c27233b485aa 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_partial_id_map.c +++ b/packages/seacas/libraries/exodus/src/ex_get_partial_id_map.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/ex_get_partial_nodal_var_int.c b/packages/seacas/libraries/exodus/src/ex_get_partial_nodal_var_int.c index 9b9ef3a3437e..d226be4ddd3d 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_partial_nodal_var_int.c +++ b/packages/seacas/libraries/exodus/src/ex_get_partial_nodal_var_int.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** @@ -24,7 +24,6 @@ * * revision history - * - * $Id: ne_gnnv.c,v 1.16 2008/01/25 15:47:35 gdsjaar Exp $ * *****************************************************************************/ diff --git a/packages/seacas/libraries/exodus/src/ex_get_partial_num_map.c b/packages/seacas/libraries/exodus/src/ex_get_partial_num_map.c index 59358fb3b587..deb3e8e01890 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_partial_num_map.c +++ b/packages/seacas/libraries/exodus/src/ex_get_partial_num_map.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/ex_get_partial_one_attr.c b/packages/seacas/libraries/exodus/src/ex_get_partial_one_attr.c index e27206995fbb..2dbadde7d5ea 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_partial_one_attr.c +++ b/packages/seacas/libraries/exodus/src/ex_get_partial_one_attr.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/ex_get_partial_set.c b/packages/seacas/libraries/exodus/src/ex_get_partial_set.c index 6fc0d0ccad63..ac709c70fbc2 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_partial_set.c +++ b/packages/seacas/libraries/exodus/src/ex_get_partial_set.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/ex_get_partial_set_dist_fact.c b/packages/seacas/libraries/exodus/src/ex_get_partial_set_dist_fact.c index 5a6bc12f2e69..6f115f15e131 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_partial_set_dist_fact.c +++ b/packages/seacas/libraries/exodus/src/ex_get_partial_set_dist_fact.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/ex_get_partial_var.c b/packages/seacas/libraries/exodus/src/ex_get_partial_var.c index 49f986369300..428010ce19f4 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_partial_var.c +++ b/packages/seacas/libraries/exodus/src/ex_get_partial_var.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/ex_get_processor_elem_maps.c b/packages/seacas/libraries/exodus/src/ex_get_processor_elem_maps.c index 2269e0c8895d..5d7c0940ecf6 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_processor_elem_maps.c +++ b/packages/seacas/libraries/exodus/src/ex_get_processor_elem_maps.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /*****************************************************************************/ diff --git a/packages/seacas/libraries/exodus/src/ex_get_processor_node_maps.c b/packages/seacas/libraries/exodus/src/ex_get_processor_node_maps.c index 0b08bb8d7765..ec9f68d5f673 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_processor_node_maps.c +++ b/packages/seacas/libraries/exodus/src/ex_get_processor_node_maps.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /*****************************************************************************/ diff --git a/packages/seacas/libraries/exodus/src/ex_get_prop.c b/packages/seacas/libraries/exodus/src/ex_get_prop.c index 12ff233e6a98..783517812ff4 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_prop.c +++ b/packages/seacas/libraries/exodus/src/ex_get_prop.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ @@ -47,7 +47,6 @@ MAX_STR_LENGTH ) for | #EX_EDGE_MAP | Edge Map entity type | | #EX_FACE_MAP | Face Map entity type | - For an example of code to read an object property, refer to the description for ex_get_prop_names(). diff --git a/packages/seacas/libraries/exodus/src/ex_get_prop_array.c b/packages/seacas/libraries/exodus/src/ex_get_prop_array.c index a829ee571ebf..932817b11548 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_prop_array.c +++ b/packages/seacas/libraries/exodus/src/ex_get_prop_array.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** @@ -39,7 +39,6 @@ this function is invoked, memory must be allocated for the returned array of(num_elem_blk, num_node_sets, or {num_side_sets}) integer values. - This function can be used in place of - ex_get_elem_blk_ids(), - ex_get_node_set_ids(), and diff --git a/packages/seacas/libraries/exodus/src/ex_get_prop_names.c b/packages/seacas/libraries/exodus/src/ex_get_prop_names.c index 7890420659c8..0b10ba0046db 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_prop_names.c +++ b/packages/seacas/libraries/exodus/src/ex_get_prop_names.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ @@ -22,7 +22,6 @@ warning will return a positive number. Possible causes of errors - data file not properly opened with call to ex_create() or ex_open() - invalid object type specified. - \param[in] exoid exodus file ID returned from a previous call to ex_create() or ex_open(). \param[in] obj_type Type of object; use one of the options in the table diff --git a/packages/seacas/libraries/exodus/src/ex_get_qa.c b/packages/seacas/libraries/exodus/src/ex_get_qa.c index 852b6be0fee5..2962f1bee04c 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_qa.c +++ b/packages/seacas/libraries/exodus/src/ex_get_qa.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/ex_get_reduction_variable_name.c b/packages/seacas/libraries/exodus/src/ex_get_reduction_variable_name.c index e8cfed2e113b..8d9fac173a4a 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_reduction_variable_name.c +++ b/packages/seacas/libraries/exodus/src/ex_get_reduction_variable_name.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/ex_get_reduction_variable_names.c b/packages/seacas/libraries/exodus/src/ex_get_reduction_variable_names.c index c78a5636867d..c2b7829e5184 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_reduction_variable_names.c +++ b/packages/seacas/libraries/exodus/src/ex_get_reduction_variable_names.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/ex_get_reduction_variable_param.c b/packages/seacas/libraries/exodus/src/ex_get_reduction_variable_param.c index c8179cc1a8a4..84e67a3c6351 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_reduction_variable_param.c +++ b/packages/seacas/libraries/exodus/src/ex_get_reduction_variable_param.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/ex_get_reduction_vars.c b/packages/seacas/libraries/exodus/src/ex_get_reduction_vars.c index 5ac2c965f7f1..2c6ba7b8922c 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_reduction_vars.c +++ b/packages/seacas/libraries/exodus/src/ex_get_reduction_vars.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/ex_get_set.c b/packages/seacas/libraries/exodus/src/ex_get_set.c index 39e8cefb7551..558c865d9ffb 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_set.c +++ b/packages/seacas/libraries/exodus/src/ex_get_set.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/ex_get_set_dist_fact.c b/packages/seacas/libraries/exodus/src/ex_get_set_dist_fact.c index 154b83e64004..f453dc94c35c 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_set_dist_fact.c +++ b/packages/seacas/libraries/exodus/src/ex_get_set_dist_fact.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/ex_get_set_param.c b/packages/seacas/libraries/exodus/src/ex_get_set_param.c index 743867aa6b32..66cb2f8837f2 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_set_param.c +++ b/packages/seacas/libraries/exodus/src/ex_get_set_param.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/ex_get_sets.c b/packages/seacas/libraries/exodus/src/ex_get_sets.c index feb7279e8398..118decb46554 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_sets.c +++ b/packages/seacas/libraries/exodus/src/ex_get_sets.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/ex_get_side_set_node_count.c b/packages/seacas/libraries/exodus/src/ex_get_side_set_node_count.c index 140fc5139116..34dfcbbd9b34 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_side_set_node_count.c +++ b/packages/seacas/libraries/exodus/src/ex_get_side_set_node_count.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/ex_get_side_set_node_list.c b/packages/seacas/libraries/exodus/src/ex_get_side_set_node_list.c index dd9387c8829d..bfaa4dd1452c 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_side_set_node_list.c +++ b/packages/seacas/libraries/exodus/src/ex_get_side_set_node_list.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/ex_get_side_set_node_list_len.c b/packages/seacas/libraries/exodus/src/ex_get_side_set_node_list_len.c index edb6e8e102c7..f6bedb11ebf3 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_side_set_node_list_len.c +++ b/packages/seacas/libraries/exodus/src/ex_get_side_set_node_list_len.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/ex_get_ss_param_global.c b/packages/seacas/libraries/exodus/src/ex_get_ss_param_global.c index 023646b773ff..cfd824127cff 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_ss_param_global.c +++ b/packages/seacas/libraries/exodus/src/ex_get_ss_param_global.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /*****************************************************************************/ diff --git a/packages/seacas/libraries/exodus/src/ex_get_time.c b/packages/seacas/libraries/exodus/src/ex_get_time.c index 7af60d6aee41..45fc9e7b3129 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_time.c +++ b/packages/seacas/libraries/exodus/src/ex_get_time.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ @@ -25,7 +25,6 @@ warning will return a positive number. Possible causes of errors - data file not properly opened with call to ex_create() or ex_open() - no time steps have been stored in the file. - \param[in] exoid exodus file ID returned from a previous call to ex_create() or ex_open(). \param[in] time_step The time step number. This is essentially an index (in diff --git a/packages/seacas/libraries/exodus/src/ex_get_truth_table.c b/packages/seacas/libraries/exodus/src/ex_get_truth_table.c index 762330ee990d..6285f539a9ab 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_truth_table.c +++ b/packages/seacas/libraries/exodus/src/ex_get_truth_table.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/ex_get_var.c b/packages/seacas/libraries/exodus/src/ex_get_var.c index 205b94e939bb..b65c779b6d09 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_var.c +++ b/packages/seacas/libraries/exodus/src/ex_get_var.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/ex_get_var_time.c b/packages/seacas/libraries/exodus/src/ex_get_var_time.c index fe39cb29f51a..838b0c557d23 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_var_time.c +++ b/packages/seacas/libraries/exodus/src/ex_get_var_time.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/ex_get_variable_name.c b/packages/seacas/libraries/exodus/src/ex_get_variable_name.c index d9d503f3a363..b84daf0b268c 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_variable_name.c +++ b/packages/seacas/libraries/exodus/src/ex_get_variable_name.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/ex_get_variable_names.c b/packages/seacas/libraries/exodus/src/ex_get_variable_names.c index e4f8822e1800..4515f42ef521 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_variable_names.c +++ b/packages/seacas/libraries/exodus/src/ex_get_variable_names.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/ex_get_variable_param.c b/packages/seacas/libraries/exodus/src/ex_get_variable_param.c index ec8c24ef8565..5b436c5d7b20 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_variable_param.c +++ b/packages/seacas/libraries/exodus/src/ex_get_variable_param.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/ex_inquire.c b/packages/seacas/libraries/exodus/src/ex_inquire.c index 9e0ca3e9ceaa..e83cd7ef9198 100644 --- a/packages/seacas/libraries/exodus/src/ex_inquire.c +++ b/packages/seacas/libraries/exodus/src/ex_inquire.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/ex_int_get_block_param.c b/packages/seacas/libraries/exodus/src/ex_int_get_block_param.c index cc3f9667e613..24602a5e3d5c 100644 --- a/packages/seacas/libraries/exodus/src/ex_int_get_block_param.c +++ b/packages/seacas/libraries/exodus/src/ex_int_get_block_param.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/ex_ne_util.c b/packages/seacas/libraries/exodus/src/ex_ne_util.c index 490f6d2855c1..8854d626fa28 100644 --- a/packages/seacas/libraries/exodus/src/ex_ne_util.c +++ b/packages/seacas/libraries/exodus/src/ex_ne_util.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/ex_open.c b/packages/seacas/libraries/exodus/src/ex_open.c index 1a961709c7b2..cc36fbe158d5 100644 --- a/packages/seacas/libraries/exodus/src/ex_open.c +++ b/packages/seacas/libraries/exodus/src/ex_open.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** @@ -62,7 +62,6 @@ variables requiring reals must be passed reals declared with this passed in or returned compute word size (4 or 8). - \param[in,out] io_ws The word size in bytes (0, 4 or 8) of the floating point data as they are stored in the exodus file. If the word size does not match the word size of data stored in diff --git a/packages/seacas/libraries/exodus/src/ex_open_par.c b/packages/seacas/libraries/exodus/src/ex_open_par.c index f455d9d0403a..dfc530d287ad 100644 --- a/packages/seacas/libraries/exodus/src/ex_open_par.c +++ b/packages/seacas/libraries/exodus/src/ex_open_par.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** @@ -69,7 +69,6 @@ requiring returned compute word size (4 or 8). - \param[in,out] io_ws The word size in bytes (0, 4 or 8) of the floating point data as they are stored in the exodus file. If the word diff --git a/packages/seacas/libraries/exodus/src/ex_opts.c b/packages/seacas/libraries/exodus/src/ex_opts.c index 271b81c797df..51f364183e1f 100644 --- a/packages/seacas/libraries/exodus/src/ex_opts.c +++ b/packages/seacas/libraries/exodus/src/ex_opts.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/ex_put_all_var_param.c b/packages/seacas/libraries/exodus/src/ex_put_all_var_param.c index 2c9ca1cd48f4..5879804796f7 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_all_var_param.c +++ b/packages/seacas/libraries/exodus/src/ex_put_all_var_param.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/ex_put_all_var_param_ext.c b/packages/seacas/libraries/exodus/src/ex_put_all_var_param_ext.c index ad118bc498eb..331feb442fb1 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_all_var_param_ext.c +++ b/packages/seacas/libraries/exodus/src/ex_put_all_var_param_ext.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/ex_put_assemblies.c b/packages/seacas/libraries/exodus/src/ex_put_assemblies.c index 43f23fc29ff9..4430c8e179ac 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_assemblies.c +++ b/packages/seacas/libraries/exodus/src/ex_put_assemblies.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ @@ -168,7 +168,6 @@ int ex_put_assemblies(int exoid, size_t count, const struct ex_assembly *assembl /* Assembly are now all defined; see if any set data needs to be output... */ for (size_t i = 0; i < count; i++) { - status = EX_NOERR; if (assemblies[i].entity_list != NULL) { if ((status = nc_put_var_longlong(exoid, entlst_id[i], (long long *)assemblies[i].entity_list)) != EX_NOERR) { diff --git a/packages/seacas/libraries/exodus/src/ex_put_assembly.c b/packages/seacas/libraries/exodus/src/ex_put_assembly.c index 96e009c7ce72..0e39fff092c0 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_assembly.c +++ b/packages/seacas/libraries/exodus/src/ex_put_assembly.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/ex_put_attr.c b/packages/seacas/libraries/exodus/src/ex_put_attr.c index b9e34477201e..391af9276c81 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_attr.c +++ b/packages/seacas/libraries/exodus/src/ex_put_attr.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/ex_put_attr_names.c b/packages/seacas/libraries/exodus/src/ex_put_attr_names.c index 1816976785fd..140f4fe25a6f 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_attr_names.c +++ b/packages/seacas/libraries/exodus/src/ex_put_attr_names.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/ex_put_attr_param.c b/packages/seacas/libraries/exodus/src/ex_put_attr_param.c index 2c4f50954623..68b3291efcca 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_attr_param.c +++ b/packages/seacas/libraries/exodus/src/ex_put_attr_param.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/ex_put_attribute.c b/packages/seacas/libraries/exodus/src/ex_put_attribute.c index 3543d3d40f9d..b4e7634b607b 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_attribute.c +++ b/packages/seacas/libraries/exodus/src/ex_put_attribute.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/ex_put_blob.c b/packages/seacas/libraries/exodus/src/ex_put_blob.c index ff7bcac2b9c2..1aeb47879aa2 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_blob.c +++ b/packages/seacas/libraries/exodus/src/ex_put_blob.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ @@ -17,7 +17,4 @@ * \param *blob ex_blob structure */ -int ex_put_blob(int exoid, const struct ex_blob blob) -{ - return ex_put_blobs(exoid, 1, &blob); -} +int ex_put_blob(int exoid, const struct ex_blob blob) { return ex_put_blobs(exoid, 1, &blob); } diff --git a/packages/seacas/libraries/exodus/src/ex_put_blobs.c b/packages/seacas/libraries/exodus/src/ex_put_blobs.c index fae01b527a43..b43ef39a6d38 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_blobs.c +++ b/packages/seacas/libraries/exodus/src/ex_put_blobs.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/ex_put_block.c b/packages/seacas/libraries/exodus/src/ex_put_block.c index f8efeb8fb17c..59f4cc09e17d 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_block.c +++ b/packages/seacas/libraries/exodus/src/ex_put_block.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/ex_put_block_param.c b/packages/seacas/libraries/exodus/src/ex_put_block_param.c index 72ef26c4a925..a6c009c7ac6c 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_block_param.c +++ b/packages/seacas/libraries/exodus/src/ex_put_block_param.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/ex_put_block_params.c b/packages/seacas/libraries/exodus/src/ex_put_block_params.c index b076e8e3fc9b..2421747512fb 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_block_params.c +++ b/packages/seacas/libraries/exodus/src/ex_put_block_params.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ @@ -66,7 +66,7 @@ int ex_put_block_params(int exoid, size_t block_count, const struct ex_block *bl /* * ======================================================================== - * Check whether `blocks` is homogenous (all same type) and if so, does it + * Check whether `blocks` is homogeneous (all same type) and if so, does it * contain entries for all blocks of that type that will be defined. If so, * can consolidate some operations... */ diff --git a/packages/seacas/libraries/exodus/src/ex_put_cmap_params.c b/packages/seacas/libraries/exodus/src/ex_put_cmap_params.c index 1f0df495729f..346aee21c00a 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_cmap_params.c +++ b/packages/seacas/libraries/exodus/src/ex_put_cmap_params.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /*****************************************************************************/ diff --git a/packages/seacas/libraries/exodus/src/ex_put_cmap_params_cc.c b/packages/seacas/libraries/exodus/src/ex_put_cmap_params_cc.c index af07f616859a..6d21bdacc73f 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_cmap_params_cc.c +++ b/packages/seacas/libraries/exodus/src/ex_put_cmap_params_cc.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /*****************************************************************************/ @@ -150,6 +150,7 @@ file ID %d", snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to get variable \"%s\" from file ID %d", VAR_N_COMM_INFO_IDX, exoid); ex_err_fn(exoid, __func__, errmsg, status); + free(n_var_idx); EX_FUNC_LEAVE(EX_FATAL); } } /* "if (num_n_comm_maps > 0)" */ @@ -204,6 +205,7 @@ file ID %d", snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to get variable \"%s\" from file ID %d", VAR_E_COMM_INFO_IDX, exoid); ex_err_fn(exoid, __func__, errmsg, status); + free(e_var_idx); EX_FUNC_LEAVE(EX_FATAL); } } /* "if (num_e_comm_maps >0)" */ diff --git a/packages/seacas/libraries/exodus/src/ex_put_concat_all_blocks.c b/packages/seacas/libraries/exodus/src/ex_put_concat_all_blocks.c index 183f78eca555..98a0a1e1334b 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_concat_all_blocks.c +++ b/packages/seacas/libraries/exodus/src/ex_put_concat_all_blocks.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/ex_put_concat_elem_block.c b/packages/seacas/libraries/exodus/src/ex_put_concat_elem_block.c index fef87d81032e..2c898c37db00 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_concat_elem_block.c +++ b/packages/seacas/libraries/exodus/src/ex_put_concat_elem_block.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/ex_put_concat_sets.c b/packages/seacas/libraries/exodus/src/ex_put_concat_sets.c index 930c431c9915..b263574f418a 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_concat_sets.c +++ b/packages/seacas/libraries/exodus/src/ex_put_concat_sets.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/ex_put_conn.c b/packages/seacas/libraries/exodus/src/ex_put_conn.c index 64ef6c4dbdca..70442face720 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_conn.c +++ b/packages/seacas/libraries/exodus/src/ex_put_conn.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/ex_put_coord.c b/packages/seacas/libraries/exodus/src/ex_put_coord.c index e120b49ee8e3..7529599b91ec 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_coord.c +++ b/packages/seacas/libraries/exodus/src/ex_put_coord.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/ex_put_coord_names.c b/packages/seacas/libraries/exodus/src/ex_put_coord_names.c index 5b4f13f9e4f8..f34e0fe87c1d 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_coord_names.c +++ b/packages/seacas/libraries/exodus/src/ex_put_coord_names.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/ex_put_coordinate_frames.c b/packages/seacas/libraries/exodus/src/ex_put_coordinate_frames.c index d6b46d371681..44de2cb3a30d 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_coordinate_frames.c +++ b/packages/seacas/libraries/exodus/src/ex_put_coordinate_frames.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/ex_put_eb_info_global.c b/packages/seacas/libraries/exodus/src/ex_put_eb_info_global.c index cdc86926ecee..6cac2517c71a 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_eb_info_global.c +++ b/packages/seacas/libraries/exodus/src/ex_put_eb_info_global.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /*****************************************************************************/ diff --git a/packages/seacas/libraries/exodus/src/ex_put_elem_cmap.c b/packages/seacas/libraries/exodus/src/ex_put_elem_cmap.c index 156f68c77885..7aafb23177f5 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_elem_cmap.c +++ b/packages/seacas/libraries/exodus/src/ex_put_elem_cmap.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /****************************************************************************/ diff --git a/packages/seacas/libraries/exodus/src/ex_put_entity_count_per_polyhedra.c b/packages/seacas/libraries/exodus/src/ex_put_entity_count_per_polyhedra.c index bd952fcd2270..2248b23498f5 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_entity_count_per_polyhedra.c +++ b/packages/seacas/libraries/exodus/src/ex_put_entity_count_per_polyhedra.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/ex_put_id_map.c b/packages/seacas/libraries/exodus/src/ex_put_id_map.c index 2ac625ce0d79..126e2a154b8d 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_id_map.c +++ b/packages/seacas/libraries/exodus/src/ex_put_id_map.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/ex_put_info.c b/packages/seacas/libraries/exodus/src/ex_put_info.c index 197fa5a23462..f541c101707e 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_info.c +++ b/packages/seacas/libraries/exodus/src/ex_put_info.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ @@ -30,7 +30,6 @@ ex_create() or ex_open(). defining and outputting, pass NULL for info argument. - The following code will write out three information records to an open exodus file - @@ -61,7 +60,6 @@ num_info = 3; error = ex_put_info(exoid, num_info, NULL); - \comment{Now, actually write the information records} info[0] = "This is the first information record."; info[1] = "This is the second information record."; diff --git a/packages/seacas/libraries/exodus/src/ex_put_init.c b/packages/seacas/libraries/exodus/src/ex_put_init.c index 4eb41217cb6b..4b7ebc07e8dd 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_init.c +++ b/packages/seacas/libraries/exodus/src/ex_put_init.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/ex_put_init_ext.c b/packages/seacas/libraries/exodus/src/ex_put_init_ext.c index 941e9e54d230..311437d5d092 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_init_ext.c +++ b/packages/seacas/libraries/exodus/src/ex_put_init_ext.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** @@ -213,8 +213,8 @@ static void invalidate_id_status(int exoid, const char *var_stat, const char *va int ex_put_init_ext(int exoid, const ex_init_params *model) { - int numdimdim, numnoddim, elblkdim, edblkdim, fablkdim, esetdim, fsetdim, elsetdim, - nsetdim, ssetdim, dim_str_name, dim[2], temp; + int numdimdim, numnoddim, elblkdim, edblkdim, fablkdim, esetdim, fsetdim, elsetdim, nsetdim, + ssetdim, dim_str_name, dim[2], temp; int nmapdim, edmapdim, famapdim, emapdim, timedim; int status; int title_len; @@ -222,7 +222,7 @@ int ex_put_init_ext(int exoid, const ex_init_params *model) /* used for header size calculations which are turned off for now */ int header_size, fixed_var_size, iows; #endif - char errmsg[MAX_ERR_LENGTH]; + char errmsg[MAX_ERR_LENGTH]; EX_FUNC_ENTER(); ex__check_valid_file_id(exoid, __func__); diff --git a/packages/seacas/libraries/exodus/src/ex_put_init_global.c b/packages/seacas/libraries/exodus/src/ex_put_init_global.c index 35cf0383ead2..666f1ef77ca9 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_init_global.c +++ b/packages/seacas/libraries/exodus/src/ex_put_init_global.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/ex_put_init_info.c b/packages/seacas/libraries/exodus/src/ex_put_init_info.c index f16c43da7f50..f6f963c518e7 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_init_info.c +++ b/packages/seacas/libraries/exodus/src/ex_put_init_info.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /*****************************************************************************/ diff --git a/packages/seacas/libraries/exodus/src/ex_put_loadbal_param.c b/packages/seacas/libraries/exodus/src/ex_put_loadbal_param.c index 77de9791dfc6..078fed02dd64 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_loadbal_param.c +++ b/packages/seacas/libraries/exodus/src/ex_put_loadbal_param.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /*****************************************************************************/ diff --git a/packages/seacas/libraries/exodus/src/ex_put_loadbal_param_cc.c b/packages/seacas/libraries/exodus/src/ex_put_loadbal_param_cc.c index 7fa2bbb9f568..6ff60d9d1926 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_loadbal_param_cc.c +++ b/packages/seacas/libraries/exodus/src/ex_put_loadbal_param_cc.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/ex_put_map.c b/packages/seacas/libraries/exodus/src/ex_put_map.c index 3e8991703e3a..6c1c3bd3eb05 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_map.c +++ b/packages/seacas/libraries/exodus/src/ex_put_map.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/ex_put_map_param.c b/packages/seacas/libraries/exodus/src/ex_put_map_param.c index 74edeaf1eb77..90c3f45a2b9c 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_map_param.c +++ b/packages/seacas/libraries/exodus/src/ex_put_map_param.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/ex_put_name.c b/packages/seacas/libraries/exodus/src/ex_put_name.c index 0098e6b2bb8d..ae5254a70251 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_name.c +++ b/packages/seacas/libraries/exodus/src/ex_put_name.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/ex_put_names.c b/packages/seacas/libraries/exodus/src/ex_put_names.c index 337a30555921..7f11f7ece755 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_names.c +++ b/packages/seacas/libraries/exodus/src/ex_put_names.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/ex_put_nodal_var.c b/packages/seacas/libraries/exodus/src/ex_put_nodal_var.c index 1b31172a4334..d7d0814a2148 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_nodal_var.c +++ b/packages/seacas/libraries/exodus/src/ex_put_nodal_var.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ @@ -31,7 +31,6 @@ warning will return a positive number. Possible causes of errors - ex_put_variable_param() not called previously specifying the number of nodal variables. - \param[in] exoid exodus file ID returned from a previous call to ex_create() or ex_open(). @@ -51,7 +50,6 @@ variable has an index of 1. nodal_var_index-th nodal variable for the time_step-th time step. - As an example, the following code segment writes all the nodal variables for a single time step: diff --git a/packages/seacas/libraries/exodus/src/ex_put_nodal_var_int.c b/packages/seacas/libraries/exodus/src/ex_put_nodal_var_int.c index a0494c600570..12bbde56d26b 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_nodal_var_int.c +++ b/packages/seacas/libraries/exodus/src/ex_put_nodal_var_int.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ @@ -33,7 +33,6 @@ warning will return a positive number. Possible causes of errors - ex_put_variable_param() not called previously specifying the number of nodal variables. - \param[in] exoid exodus file ID returned from a previous call to ex_create() or ex_open(). @@ -53,7 +52,6 @@ variable has an index of 1. nodal_var_index-th nodal variable for the time_step-th time step. - As an example, the following code segment writes all the nodal variables for a single time step: diff --git a/packages/seacas/libraries/exodus/src/ex_put_node_cmap.c b/packages/seacas/libraries/exodus/src/ex_put_node_cmap.c index 1d18e2cfd286..81c275dff153 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_node_cmap.c +++ b/packages/seacas/libraries/exodus/src/ex_put_node_cmap.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /****************************************************************************/ diff --git a/packages/seacas/libraries/exodus/src/ex_put_ns_param_global.c b/packages/seacas/libraries/exodus/src/ex_put_ns_param_global.c index 0dd981de44bf..5f9556e9095f 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_ns_param_global.c +++ b/packages/seacas/libraries/exodus/src/ex_put_ns_param_global.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/ex_put_num_map.c b/packages/seacas/libraries/exodus/src/ex_put_num_map.c index b5bd8e0c6364..70e6fe08298b 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_num_map.c +++ b/packages/seacas/libraries/exodus/src/ex_put_num_map.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/ex_put_one_attr.c b/packages/seacas/libraries/exodus/src/ex_put_one_attr.c index 35112574c48b..b77959e9555e 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_one_attr.c +++ b/packages/seacas/libraries/exodus/src/ex_put_one_attr.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/ex_put_partial_attr.c b/packages/seacas/libraries/exodus/src/ex_put_partial_attr.c index 94e9a7b60468..76eaa581b3d1 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_partial_attr.c +++ b/packages/seacas/libraries/exodus/src/ex_put_partial_attr.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/ex_put_partial_conn.c b/packages/seacas/libraries/exodus/src/ex_put_partial_conn.c index 0660e99c2df2..3a1cc032cbc6 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_partial_conn.c +++ b/packages/seacas/libraries/exodus/src/ex_put_partial_conn.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/ex_put_partial_coord.c b/packages/seacas/libraries/exodus/src/ex_put_partial_coord.c index 9821f85dbfb9..6c43e20006d2 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_partial_coord.c +++ b/packages/seacas/libraries/exodus/src/ex_put_partial_coord.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/ex_put_partial_coord_component.c b/packages/seacas/libraries/exodus/src/ex_put_partial_coord_component.c index 90be28a86581..d510dbafc544 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_partial_coord_component.c +++ b/packages/seacas/libraries/exodus/src/ex_put_partial_coord_component.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/ex_put_partial_id_map.c b/packages/seacas/libraries/exodus/src/ex_put_partial_id_map.c index 9e212f64b853..6a66f372883e 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_partial_id_map.c +++ b/packages/seacas/libraries/exodus/src/ex_put_partial_id_map.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/ex_put_partial_nodal_var_int.c b/packages/seacas/libraries/exodus/src/ex_put_partial_nodal_var_int.c index bd38ca9e8bd4..cb90a7a848d3 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_partial_nodal_var_int.c +++ b/packages/seacas/libraries/exodus/src/ex_put_partial_nodal_var_int.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/ex_put_partial_num_map.c b/packages/seacas/libraries/exodus/src/ex_put_partial_num_map.c index 4192e649ffc7..d9d82d2cbb79 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_partial_num_map.c +++ b/packages/seacas/libraries/exodus/src/ex_put_partial_num_map.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/ex_put_partial_one_attr.c b/packages/seacas/libraries/exodus/src/ex_put_partial_one_attr.c index f366b2f4363e..c16a72ed15e8 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_partial_one_attr.c +++ b/packages/seacas/libraries/exodus/src/ex_put_partial_one_attr.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/ex_put_partial_set.c b/packages/seacas/libraries/exodus/src/ex_put_partial_set.c index b51ae394e043..80574a01cecc 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_partial_set.c +++ b/packages/seacas/libraries/exodus/src/ex_put_partial_set.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/ex_put_partial_set_dist_fact.c b/packages/seacas/libraries/exodus/src/ex_put_partial_set_dist_fact.c index 87afc5dd9f03..9cdc69c7e2fe 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_partial_set_dist_fact.c +++ b/packages/seacas/libraries/exodus/src/ex_put_partial_set_dist_fact.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/ex_put_partial_var.c b/packages/seacas/libraries/exodus/src/ex_put_partial_var.c index 61de940579f6..b31d93383fce 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_partial_var.c +++ b/packages/seacas/libraries/exodus/src/ex_put_partial_var.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ @@ -224,44 +224,44 @@ int ex_put_partial_var(int exoid, int time_step, ex_entity_type var_type, int va EX_FUNC_LEAVE(status); break; case EX_ASSEMBLY: - ex__look_up_var(exoid, var_type, var_index, obj_id, "", VAR_ASSEMBLY_TAB, DIM_NUM_ASSEMBLY, - DIM_NUM_ASSEMBLY_VAR, &varid); + status = ex__look_up_var(exoid, var_type, var_index, obj_id, "", VAR_ASSEMBLY_TAB, + DIM_NUM_ASSEMBLY, DIM_NUM_ASSEMBLY_VAR, &varid); break; case EX_BLOB: - ex__look_up_var(exoid, var_type, var_index, obj_id, "", VAR_BLOB_TAB, DIM_NUM_BLOB, - DIM_NUM_BLOB_VAR, &varid); + status = ex__look_up_var(exoid, var_type, var_index, obj_id, "", VAR_BLOB_TAB, DIM_NUM_BLOB, + DIM_NUM_BLOB_VAR, &varid); break; case EX_EDGE_BLOCK: - ex__look_up_var(exoid, var_type, var_index, obj_id, VAR_ID_ED_BLK, VAR_EBLK_TAB, DIM_NUM_ED_BLK, - DIM_NUM_EDG_VAR, &varid); + status = ex__look_up_var(exoid, var_type, var_index, obj_id, VAR_ID_ED_BLK, VAR_EBLK_TAB, + DIM_NUM_ED_BLK, DIM_NUM_EDG_VAR, &varid); break; case EX_FACE_BLOCK: - ex__look_up_var(exoid, var_type, var_index, obj_id, VAR_ID_FA_BLK, VAR_FBLK_TAB, DIM_NUM_FA_BLK, - DIM_NUM_FAC_VAR, &varid); + status = ex__look_up_var(exoid, var_type, var_index, obj_id, VAR_ID_FA_BLK, VAR_FBLK_TAB, + DIM_NUM_FA_BLK, DIM_NUM_FAC_VAR, &varid); break; case EX_ELEM_BLOCK: - ex__look_up_var(exoid, var_type, var_index, obj_id, VAR_ID_EL_BLK, VAR_ELEM_TAB, DIM_NUM_EL_BLK, - DIM_NUM_ELE_VAR, &varid); + status = ex__look_up_var(exoid, var_type, var_index, obj_id, VAR_ID_EL_BLK, VAR_ELEM_TAB, + DIM_NUM_EL_BLK, DIM_NUM_ELE_VAR, &varid); break; case EX_NODE_SET: - ex__look_up_var(exoid, var_type, var_index, obj_id, VAR_NS_IDS, VAR_NSET_TAB, DIM_NUM_NS, - DIM_NUM_NSET_VAR, &varid); + status = ex__look_up_var(exoid, var_type, var_index, obj_id, VAR_NS_IDS, VAR_NSET_TAB, + DIM_NUM_NS, DIM_NUM_NSET_VAR, &varid); break; case EX_EDGE_SET: - ex__look_up_var(exoid, var_type, var_index, obj_id, VAR_ES_IDS, VAR_ESET_TAB, DIM_NUM_ES, - DIM_NUM_ESET_VAR, &varid); + status = ex__look_up_var(exoid, var_type, var_index, obj_id, VAR_ES_IDS, VAR_ESET_TAB, + DIM_NUM_ES, DIM_NUM_ESET_VAR, &varid); break; case EX_FACE_SET: - ex__look_up_var(exoid, var_type, var_index, obj_id, VAR_FS_IDS, VAR_FSET_TAB, DIM_NUM_FS, - DIM_NUM_FSET_VAR, &varid); + status = ex__look_up_var(exoid, var_type, var_index, obj_id, VAR_FS_IDS, VAR_FSET_TAB, + DIM_NUM_FS, DIM_NUM_FSET_VAR, &varid); break; case EX_SIDE_SET: - ex__look_up_var(exoid, var_type, var_index, obj_id, VAR_SS_IDS, VAR_SSET_TAB, DIM_NUM_SS, - DIM_NUM_SSET_VAR, &varid); + status = ex__look_up_var(exoid, var_type, var_index, obj_id, VAR_SS_IDS, VAR_SSET_TAB, + DIM_NUM_SS, DIM_NUM_SSET_VAR, &varid); break; case EX_ELEM_SET: - ex__look_up_var(exoid, var_type, var_index, obj_id, VAR_ELS_IDS, VAR_ELSET_TAB, DIM_NUM_ELS, - DIM_NUM_ELSET_VAR, &varid); + status = ex__look_up_var(exoid, var_type, var_index, obj_id, VAR_ELS_IDS, VAR_ELSET_TAB, + DIM_NUM_ELS, DIM_NUM_ELSET_VAR, &varid); break; default: snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: invalid variable type (%d) specified for file id %d", @@ -269,8 +269,12 @@ int ex_put_partial_var(int exoid, int time_step, ex_entity_type var_type, int va ex_err_fn(exoid, __func__, errmsg, EX_BADPARAM); EX_FUNC_LEAVE(EX_FATAL); } - /* store element variable values */ + if (status != EX_NOERR) { + EX_FUNC_LEAVE(status); + } + + /* store element variable values */ start[0] = time_step - 1; start[1] = start_index - 1; if (var_type == EX_GLOBAL) { diff --git a/packages/seacas/libraries/exodus/src/ex_put_processor_elem_maps.c b/packages/seacas/libraries/exodus/src/ex_put_processor_elem_maps.c index 1eb3029c7ab9..89efa3d6b6b8 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_processor_elem_maps.c +++ b/packages/seacas/libraries/exodus/src/ex_put_processor_elem_maps.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /*****************************************************************************/ diff --git a/packages/seacas/libraries/exodus/src/ex_put_processor_node_maps.c b/packages/seacas/libraries/exodus/src/ex_put_processor_node_maps.c index 6f2e0021b56d..70e7a2ff3ed7 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_processor_node_maps.c +++ b/packages/seacas/libraries/exodus/src/ex_put_processor_node_maps.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/ex_put_prop.c b/packages/seacas/libraries/exodus/src/ex_put_prop.c index ba128bb3335f..26a81fbefbfb 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_prop.c +++ b/packages/seacas/libraries/exodus/src/ex_put_prop.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/ex_put_prop_array.c b/packages/seacas/libraries/exodus/src/ex_put_prop_array.c index 76524b01b032..288a558bb5dc 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_prop_array.c +++ b/packages/seacas/libraries/exodus/src/ex_put_prop_array.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ @@ -64,7 +64,6 @@ stored. Maximum | #EX_EDGE_MAP | Edge Map entity type | | #EX_FACE_MAP | Face Map entity type | - For an example of code to write an array of object properties, refer to the description for ex_put_prop_names(). */ diff --git a/packages/seacas/libraries/exodus/src/ex_put_prop_names.c b/packages/seacas/libraries/exodus/src/ex_put_prop_names.c index b30d029e9532..337f515c562f 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_prop_names.c +++ b/packages/seacas/libraries/exodus/src/ex_put_prop_names.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/ex_put_qa.c b/packages/seacas/libraries/exodus/src/ex_put_qa.c index 1ec71f924046..206dcfe10679 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_qa.c +++ b/packages/seacas/libraries/exodus/src/ex_put_qa.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/ex_put_reduction_variable_name.c b/packages/seacas/libraries/exodus/src/ex_put_reduction_variable_name.c index a8250eaf21b2..2e69ec5d07d7 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_reduction_variable_name.c +++ b/packages/seacas/libraries/exodus/src/ex_put_reduction_variable_name.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/ex_put_reduction_variable_names.c b/packages/seacas/libraries/exodus/src/ex_put_reduction_variable_names.c index 9d80472add80..e1c5ac517de5 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_reduction_variable_names.c +++ b/packages/seacas/libraries/exodus/src/ex_put_reduction_variable_names.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/ex_put_reduction_variable_param.c b/packages/seacas/libraries/exodus/src/ex_put_reduction_variable_param.c index 2a43d77bc770..42cbfa0fe4da 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_reduction_variable_param.c +++ b/packages/seacas/libraries/exodus/src/ex_put_reduction_variable_param.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/ex_put_reduction_vars.c b/packages/seacas/libraries/exodus/src/ex_put_reduction_vars.c index 917a50509586..192adb90919a 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_reduction_vars.c +++ b/packages/seacas/libraries/exodus/src/ex_put_reduction_vars.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ @@ -138,7 +138,6 @@ warning will return a positive number. Possible causes of errors - ex_put_variable_param() not called previously specifying the number of variables. - \param[in] exoid exodus file ID returned from a previous call to ex_create() or ex_open(). diff --git a/packages/seacas/libraries/exodus/src/ex_put_set.c b/packages/seacas/libraries/exodus/src/ex_put_set.c index 57551097cf61..cabf8cf58e6b 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_set.c +++ b/packages/seacas/libraries/exodus/src/ex_put_set.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/ex_put_set_dist_fact.c b/packages/seacas/libraries/exodus/src/ex_put_set_dist_fact.c index 10e70f068a9c..928324c2cda3 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_set_dist_fact.c +++ b/packages/seacas/libraries/exodus/src/ex_put_set_dist_fact.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/ex_put_set_param.c b/packages/seacas/libraries/exodus/src/ex_put_set_param.c index dae197d79dcb..7933bd54b88b 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_set_param.c +++ b/packages/seacas/libraries/exodus/src/ex_put_set_param.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/ex_put_sets.c b/packages/seacas/libraries/exodus/src/ex_put_sets.c index 98c5a500ec02..b58d2563d766 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_sets.c +++ b/packages/seacas/libraries/exodus/src/ex_put_sets.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/ex_put_ss_param_global.c b/packages/seacas/libraries/exodus/src/ex_put_ss_param_global.c index f92e7ce90867..48b3eaa93619 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_ss_param_global.c +++ b/packages/seacas/libraries/exodus/src/ex_put_ss_param_global.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/ex_put_time.c b/packages/seacas/libraries/exodus/src/ex_put_time.c index 0c6312141df3..1e36091125ac 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_time.c +++ b/packages/seacas/libraries/exodus/src/ex_put_time.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/ex_put_truth_table.c b/packages/seacas/libraries/exodus/src/ex_put_truth_table.c index 3822f5475c97..f5cf20d49bbc 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_truth_table.c +++ b/packages/seacas/libraries/exodus/src/ex_put_truth_table.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/ex_put_var.c b/packages/seacas/libraries/exodus/src/ex_put_var.c index 5427c18384b5..61d68fe08373 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_var.c +++ b/packages/seacas/libraries/exodus/src/ex_put_var.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ @@ -186,7 +186,6 @@ warning will return a positive number. Possible causes of errors - ex_put_variable_param() not called previously specifying the number of variables. - \param[in] exoid exodus file ID returned from a previous call to ex_create() or ex_open(). diff --git a/packages/seacas/libraries/exodus/src/ex_put_variable_name.c b/packages/seacas/libraries/exodus/src/ex_put_variable_name.c index b79c5bb6b418..0942467fb46a 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_variable_name.c +++ b/packages/seacas/libraries/exodus/src/ex_put_variable_name.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/ex_put_variable_names.c b/packages/seacas/libraries/exodus/src/ex_put_variable_names.c index 851cdee17746..1b432487a5b0 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_variable_names.c +++ b/packages/seacas/libraries/exodus/src/ex_put_variable_names.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/ex_put_variable_param.c b/packages/seacas/libraries/exodus/src/ex_put_variable_param.c index d30ae911fadc..140004448ce8 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_variable_param.c +++ b/packages/seacas/libraries/exodus/src/ex_put_variable_param.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/ex_threadsafe.c b/packages/seacas/libraries/exodus/src/ex_threadsafe.c index 81eb2ee7066b..b334069d1fe4 100644 --- a/packages/seacas/libraries/exodus/src/ex_threadsafe.c +++ b/packages/seacas/libraries/exodus/src/ex_threadsafe.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/src/ex_update.c b/packages/seacas/libraries/exodus/src/ex_update.c index 4bffd0c5df73..4cf79142c6b6 100644 --- a/packages/seacas/libraries/exodus/src/ex_update.c +++ b/packages/seacas/libraries/exodus/src/ex_update.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/src/ex_utils.c b/packages/seacas/libraries/exodus/src/ex_utils.c index 6111b80bf0e8..ec269765812b 100644 --- a/packages/seacas/libraries/exodus/src/ex_utils.c +++ b/packages/seacas/libraries/exodus/src/ex_utils.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/test/CreateEdgeFace.c b/packages/seacas/libraries/exodus/test/CreateEdgeFace.c index e8e75a812d49..a3fd9ce833ac 100644 --- a/packages/seacas/libraries/exodus/test/CreateEdgeFace.c +++ b/packages/seacas/libraries/exodus/test/CreateEdgeFace.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #include "exodusII.h" diff --git a/packages/seacas/libraries/exodus/test/Makefile.standalone b/packages/seacas/libraries/exodus/test/Makefile.standalone index 4793a63e3fa7..9240414126d8 100644 --- a/packages/seacas/libraries/exodus/test/Makefile.standalone +++ b/packages/seacas/libraries/exodus/test/Makefile.standalone @@ -1,7 +1,7 @@ # Copyright(C) 1999-2020 National Technology & Engineering Solutions # of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with # NTESS, the U.S. Government retains certain rights in this software. -# +# # See packages/seacas/LICENSE for details EXOIITEST = -L.. -lexodus @@ -14,109 +14,108 @@ PROGS = testwt testwtd testrd testrd1 testrdd testwt1 testwt2 testwtm \ testwt-one-attrib create_mesh rd_wt_mesh \ testwt-partial testwt-nsided testrd-nsided testwt-nfaced \ testrd-nfaced testwt-long-name testrd-long-name \ - test_nemesis + test_nemesis all:: check testwt: testwt.o $(LOCALEXO) - $(CC) -o $@ $(CFLAGS) testwt.o $(LIBS) $(LDFLAGS) + $(CC) -o $@ $(CFLAGS) testwt.o $(LIBS) $(LDFLAGS) testwt_clb: testwt_clb.o $(LOCALEXO) - $(CC) -o $@ $(CFLAGS) testwt_clb.o $(LIBS) $(LDFLAGS) + $(CC) -o $@ $(CFLAGS) testwt_clb.o $(LIBS) $(LDFLAGS) testwtd: testwtd.o $(LOCALEXO) - $(CC) -o $@ $(CFLAGS) testwtd.o $(LIBS) $(LDFLAGS) + $(CC) -o $@ $(CFLAGS) testwtd.o $(LIBS) $(LDFLAGS) testrd: testrd.o $(LOCALEXO) - $(CC) -o $@ $(CFLAGS) testrd.o $(LIBS) $(LDFLAGS) + $(CC) -o $@ $(CFLAGS) testrd.o $(LIBS) $(LDFLAGS) testrd1: testrd1.o $(LOCALEXO) - $(CC) -o $@ $(CFLAGS) testrd1.o $(LIBS) $(LDFLAGS) + $(CC) -o $@ $(CFLAGS) testrd1.o $(LIBS) $(LDFLAGS) testrdd: testrdd.o $(LOCALEXO) - $(CC) -o $@ $(CFLAGS) testrdd.o $(LIBS) $(LDFLAGS) + $(CC) -o $@ $(CFLAGS) testrdd.o $(LIBS) $(LDFLAGS) testwt1: testwt1.o $(LOCALEXO) - $(CC) -o $@ $(CFLAGS) testwt1.o $(LIBS) $(LDFLAGS) + $(CC) -o $@ $(CFLAGS) testwt1.o $(LIBS) $(LDFLAGS) testwt2: testwt2.o $(LOCALEXO) - $(CC) -o $@ $(CFLAGS) testwt2.o $(LIBS) $(LDFLAGS) + $(CC) -o $@ $(CFLAGS) testwt2.o $(LIBS) $(LDFLAGS) testwtm: testwtm.o $(LOCALEXO) - $(CC) -o $@ $(CFLAGS) testwtm.o $(LIBS) $(LDFLAGS) + $(CC) -o $@ $(CFLAGS) testwtm.o $(LIBS) $(LDFLAGS) testwt_ss: testwt_ss.o $(LOCALEXO) - $(CC) -o $@ $(CFLAGS) testwt_ss.o $(LIBS) $(LDFLAGS) + $(CC) -o $@ $(CFLAGS) testwt_ss.o $(LIBS) $(LDFLAGS) testwt_nossnsdf: testwt_nossnsdf.o $(LOCALEXO) - $(CC) -o $@ $(CFLAGS) testwt_nossnsdf.o $(LIBS) $(LDFLAGS) + $(CC) -o $@ $(CFLAGS) testwt_nossnsdf.o $(LIBS) $(LDFLAGS) testrd_ss: testrd_ss.o $(LOCALEXO) - $(CC) -o $@ $(CFLAGS) testrd_ss.o $(LIBS) $(LDFLAGS) + $(CC) -o $@ $(CFLAGS) testrd_ss.o $(LIBS) $(LDFLAGS) testrdwt: testrdwt.o $(LOCALEXO) - $(CC) -o $@ $(CFLAGS) testrdwt.o $(LIBS) $(LDFLAGS) + $(CC) -o $@ $(CFLAGS) testrdwt.o $(LIBS) $(LDFLAGS) testcp: testcp.o $(LOCALEXO) - $(CC) -o $@ $(CFLAGS) testcp.o $(LIBS) $(LDFLAGS) + $(CC) -o $@ $(CFLAGS) testcp.o $(LIBS) $(LDFLAGS) testcpd: testcpd.o $(LOCALEXO) - $(CC) -o $@ $(CFLAGS) testcpd.o $(LIBS) $(LDFLAGS) + $(CC) -o $@ $(CFLAGS) testcpd.o $(LIBS) $(LDFLAGS) testcp_nl : testcp_nl.o $(LOCALEXO) - $(CC) -o $@ $(CFLAGS) testcp_nl.o $(LIBS) $(LDFLAGS) + $(CC) -o $@ $(CFLAGS) testcp_nl.o $(LIBS) $(LDFLAGS) testwt_nc: testwt_nc.o $(LOCALEXO) - $(CC) -o $@ $(CFLAGS) testwt_nc.o $(LIBS) $(LDFLAGS) + $(CC) -o $@ $(CFLAGS) testwt_nc.o $(LIBS) $(LDFLAGS) testrd_nc: testrd_nc.o $(LOCALEXO) - $(CC) -o $@ $(CFLAGS) testrd_nc.o $(LIBS) $(LDFLAGS) + $(CC) -o $@ $(CFLAGS) testrd_nc.o $(LIBS) $(LDFLAGS) testwt-long-name: testwt-long-name.o $(LOCALEXO) - $(CC) -o $@ $(CFLAGS) testwt-long-name.o $(LIBS) $(LDFLAGS) + $(CC) -o $@ $(CFLAGS) testwt-long-name.o $(LIBS) $(LDFLAGS) testrd-long-name: testrd-long-name.o $(LOCALEXO) - $(CC) -o $@ $(CFLAGS) testrd-long-name.o $(LIBS) $(LDFLAGS) + $(CC) -o $@ $(CFLAGS) testrd-long-name.o $(LIBS) $(LDFLAGS) testwt-zeroe: testwt-zeroe.o $(LOCALEXO) - $(CC) -o $@ $(CFLAGS) testwt-zeroe.o $(LIBS) $(LDFLAGS) + $(CC) -o $@ $(CFLAGS) testwt-zeroe.o $(LIBS) $(LDFLAGS) testwt-zeron: testwt-zeron.o $(LOCALEXO) - $(CC) -o $@ $(CFLAGS) testwt-zeron.o $(LIBS) $(LDFLAGS) + $(CC) -o $@ $(CFLAGS) testwt-zeron.o $(LIBS) $(LDFLAGS) testwt-one-attrib: testwt-one-attrib.o $(LOCALEXO) - $(CC) -o $@ $(CFLAGS) testwt-one-attrib.o $(LIBS) $(LDFLAGS) + $(CC) -o $@ $(CFLAGS) testwt-one-attrib.o $(LIBS) $(LDFLAGS) testwt-partial: testwt-partial.o $(LOCALEXO) - $(CC) -o $@ $(CFLAGS) testwt-partial.o $(LIBS) $(LDFLAGS) + $(CC) -o $@ $(CFLAGS) testwt-partial.o $(LIBS) $(LDFLAGS) testwt-nsided: testwt-nsided.o $(LOCALEXO) - $(CC) -o $@ $(CFLAGS) testwt-nsided.o $(LIBS) $(LDFLAGS) + $(CC) -o $@ $(CFLAGS) testwt-nsided.o $(LIBS) $(LDFLAGS) testrd-nsided: testrd-nsided.o $(LOCALEXO) - $(CC) -o $@ $(CFLAGS) testrd-nsided.o $(LIBS) $(LDFLAGS) + $(CC) -o $@ $(CFLAGS) testrd-nsided.o $(LIBS) $(LDFLAGS) testwt-nfaced: testwt-nfaced.o $(LOCALEXO) - $(CC) -o $@ $(CFLAGS) testwt-nfaced.o $(LIBS) $(LDFLAGS) + $(CC) -o $@ $(CFLAGS) testwt-nfaced.o $(LIBS) $(LDFLAGS) testrd-nfaced: testrd-nfaced.o $(LOCALEXO) - $(CC) -o $@ $(CFLAGS) testrd-nfaced.o $(LIBS) $(LDFLAGS) + $(CC) -o $@ $(CFLAGS) testrd-nfaced.o $(LIBS) $(LDFLAGS) create_mesh: create_mesh.o $(LOCALEXO) - $(CC) -o $@ $(CFLAGS) create_mesh.o $(LIBS) $(LDFLAGS) + $(CC) -o $@ $(CFLAGS) create_mesh.o $(LIBS) $(LDFLAGS) rd_wt_mesh: rd_wt_mesh.o $(LOCALEXO) - $(CC) -o $@ $(CFLAGS) rd_wt_mesh.o $(LIBS) $(LDFLAGS) + $(CC) -o $@ $(CFLAGS) rd_wt_mesh.o $(LIBS) $(LDFLAGS) CreateEdgeFace: CreateEdgeFace.o $(LOCALEXO) - $(CC) -o $@ $(CFLAGS) CreateEdgeFace.o $(LIBS) $(LDFLAGS) + $(CC) -o $@ $(CFLAGS) CreateEdgeFace.o $(LIBS) $(LDFLAGS) ReadEdgeFace: ReadEdgeFace.o $(LOCALEXO) - $(CC) -o $@ $(CFLAGS) ReadEdgeFace.o $(LIBS) $(LDFLAGS) + $(CC) -o $@ $(CFLAGS) ReadEdgeFace.o $(LIBS) $(LDFLAGS) test_nemesis: test_nemesis.o $(LOCALEXO) - $(CC) -o $@ $(CFLAGS) test_nemesis.o $(LIBS) $(LDFLAGS) - + $(CC) -o $@ $(CFLAGS) test_nemesis.o $(LIBS) $(LDFLAGS) test: check check: $(PROGS) diff --git a/packages/seacas/libraries/exodus/test/ReadEdgeFace.c b/packages/seacas/libraries/exodus/test/ReadEdgeFace.c index 0817d237614f..22b4654b755c 100644 --- a/packages/seacas/libraries/exodus/test/ReadEdgeFace.c +++ b/packages/seacas/libraries/exodus/test/ReadEdgeFace.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #include "exodusII.h" diff --git a/packages/seacas/libraries/exodus/test/create_mesh.c b/packages/seacas/libraries/exodus/test/create_mesh.c index ad9eb0cd6d4c..2dceccc55d6a 100644 --- a/packages/seacas/libraries/exodus/test/create_mesh.c +++ b/packages/seacas/libraries/exodus/test/create_mesh.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/test/rd_wt_mesh.c b/packages/seacas/libraries/exodus/test/rd_wt_mesh.c index 12ca629012bd..b1d888eecf69 100644 --- a/packages/seacas/libraries/exodus/test/rd_wt_mesh.c +++ b/packages/seacas/libraries/exodus/test/rd_wt_mesh.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ @@ -134,10 +134,6 @@ int main(int argc, char **argv) ex_opts(EX_VERBOSE | EX_ABORT); -#if defined(__LIBCATAMOUNT__) - setlinebuf(stderr); -#endif - #ifdef PARALLEL_AWARE_EXODUS MPI_Init(&argc, &argv); MPI_Comm_rank(MPI_COMM_WORLD, &rank); diff --git a/packages/seacas/libraries/exodus/test/test-add-assembly.c b/packages/seacas/libraries/exodus/test/test-add-assembly.c index f5ff87b670e9..747df7096a31 100644 --- a/packages/seacas/libraries/exodus/test/test-add-assembly.c +++ b/packages/seacas/libraries/exodus/test/test-add-assembly.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/test/test-empty.c b/packages/seacas/libraries/exodus/test/test-empty.c index 37126f0fc038..94f861fbcd21 100644 --- a/packages/seacas/libraries/exodus/test/test-empty.c +++ b/packages/seacas/libraries/exodus/test/test-empty.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/test/test_nemesis.c b/packages/seacas/libraries/exodus/test/test_nemesis.c index 3dfb04560e9a..7ae0142d8e4f 100644 --- a/packages/seacas/libraries/exodus/test/test_nemesis.c +++ b/packages/seacas/libraries/exodus/test/test_nemesis.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /*****************************************************************************/ diff --git a/packages/seacas/libraries/exodus/test/test_ts_errval.c b/packages/seacas/libraries/exodus/test/test_ts_errval.c index ad412e1c7b1f..f67761be3551 100644 --- a/packages/seacas/libraries/exodus/test/test_ts_errval.c +++ b/packages/seacas/libraries/exodus/test/test_ts_errval.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/test/test_ts_files.c b/packages/seacas/libraries/exodus/test/test_ts_files.c index e073d2d6d638..24d97b3bb990 100644 --- a/packages/seacas/libraries/exodus/test/test_ts_files.c +++ b/packages/seacas/libraries/exodus/test/test_ts_files.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/test/test_ts_nvar.c b/packages/seacas/libraries/exodus/test/test_ts_nvar.c index 92a2c189ed77..4e74fa739880 100644 --- a/packages/seacas/libraries/exodus/test/test_ts_nvar.c +++ b/packages/seacas/libraries/exodus/test/test_ts_nvar.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/test/test_ts_nvar_rd.c b/packages/seacas/libraries/exodus/test/test_ts_nvar_rd.c index 4a58dc753b30..ca49f04020bf 100644 --- a/packages/seacas/libraries/exodus/test/test_ts_nvar_rd.c +++ b/packages/seacas/libraries/exodus/test/test_ts_nvar_rd.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/test/test_ts_partial_nvar.c b/packages/seacas/libraries/exodus/test/test_ts_partial_nvar.c index 27b1204b6f0a..99774abbcb21 100644 --- a/packages/seacas/libraries/exodus/test/test_ts_partial_nvar.c +++ b/packages/seacas/libraries/exodus/test/test_ts_partial_nvar.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/test/test_ts_partial_nvar_rd.c b/packages/seacas/libraries/exodus/test/test_ts_partial_nvar_rd.c index 851ae79fb5f4..6b2af03e9da2 100644 --- a/packages/seacas/libraries/exodus/test/test_ts_partial_nvar_rd.c +++ b/packages/seacas/libraries/exodus/test/test_ts_partial_nvar_rd.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/test/testall.standalone b/packages/seacas/libraries/exodus/test/testall.standalone index c72a531944a6..96b729668a75 100644 --- a/packages/seacas/libraries/exodus/test/testall.standalone +++ b/packages/seacas/libraries/exodus/test/testall.standalone @@ -1,7 +1,7 @@ # Copyright(C) 1999-2020 National Technology & Engineering Solutions # of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with # NTESS, the U.S. Government retains certain rights in this software. -# +# # See packages/seacas/LICENSE for details # script to run all tests and compare them to saved dump files. diff --git a/packages/seacas/libraries/exodus/test/testcp.c b/packages/seacas/libraries/exodus/test/testcp.c index 55201497e6ab..8f70a3f22312 100644 --- a/packages/seacas/libraries/exodus/test/testcp.c +++ b/packages/seacas/libraries/exodus/test/testcp.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/test/testcp_nl.c b/packages/seacas/libraries/exodus/test/testcp_nl.c index d918d319606e..4c300e911d1c 100644 --- a/packages/seacas/libraries/exodus/test/testcp_nl.c +++ b/packages/seacas/libraries/exodus/test/testcp_nl.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/test/testcp_tran.c b/packages/seacas/libraries/exodus/test/testcp_tran.c index 9f9ee33c1033..1197eeb8c64f 100644 --- a/packages/seacas/libraries/exodus/test/testcp_tran.c +++ b/packages/seacas/libraries/exodus/test/testcp_tran.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/test/testcpd.c b/packages/seacas/libraries/exodus/test/testcpd.c index f2562ad1c465..33d7df3ddf16 100644 --- a/packages/seacas/libraries/exodus/test/testcpd.c +++ b/packages/seacas/libraries/exodus/test/testcpd.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/test/testrd-assembly.c b/packages/seacas/libraries/exodus/test/testrd-assembly.c index b168aecfde3f..07d5cd77f1c0 100644 --- a/packages/seacas/libraries/exodus/test/testrd-assembly.c +++ b/packages/seacas/libraries/exodus/test/testrd-assembly.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** @@ -176,7 +176,7 @@ int main(int argc, char **argv) /* Clear out name to make sure still getting same name */ assemblies[i].name[0] = '\0'; - assemblies[i].entity_list = (int64_t*)&entity; + assemblies[i].entity_list = (int64_t *)&entity; EXCHECK(ex_get_assembly(exoid, &assemblies[i])); printf("Assembly named '%s' has id %" PRId64 ". It contains %d entities of type '%s'\n\t", assemblies[i].name, assemblies[i].id, assemblies[i].entity_count, @@ -208,8 +208,8 @@ int main(int argc, char **argv) for (i = 0; i < num_assembly; i++) { memset(attr, 0, sizeof(ex_attribute) * 10); int att_count = ex_get_attribute_count(exoid, EX_ASSEMBLY, assmbly[i].id); - printf("Assembly named '%s' with id %" PRId64 ". It contains %d attributes:\n", assmbly[i].name, - assmbly[i].id, att_count); + printf("Assembly named '%s' with id %" PRId64 ". It contains %d attributes:\n", + assmbly[i].name, assmbly[i].id, att_count); ex_get_attribute_param(exoid, EX_ASSEMBLY, assmbly[i].id, attr); ex_get_attributes(exoid, att_count, attr); @@ -279,8 +279,8 @@ int main(int argc, char **argv) for (int k = 0; k < num_assembly; k++) { EXCHECK(ex_get_reduction_vars(exoid, i + 1, EX_ASSEMBLY, assmbly[k].id, num_assembly_vars, var_values)); - printf("Values for Assembly %" PRId64 " at step %d: %f\t%f\t%f\t%f\n", assmbly[k].id, i + 1, - var_values[0], var_values[1], var_values[2], var_values[3]); + printf("Values for Assembly %" PRId64 " at step %d: %f\t%f\t%f\t%f\n", assmbly[k].id, + i + 1, var_values[0], var_values[1], var_values[2], var_values[3]); } } free(var_values); diff --git a/packages/seacas/libraries/exodus/test/testrd-blob.c b/packages/seacas/libraries/exodus/test/testrd-blob.c index cd48f456bd40..6adb15690f41 100644 --- a/packages/seacas/libraries/exodus/test/testrd-blob.c +++ b/packages/seacas/libraries/exodus/test/testrd-blob.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ @@ -113,8 +113,8 @@ int main(int argc, char **argv) blobs[i].name[0] = '\0'; EXCHECK(ex_get_blob(exoid, &blobs[i])); - printf("Blob named '%s' has id %" PRId64 ". It contains %" PRId64 " entries.\n\t", blobs[i].name, - blobs[i].id, blobs[i].num_entry); + printf("Blob named '%s' has id %" PRId64 ". It contains %" PRId64 " entries.\n\t", + blobs[i].name, blobs[i].id, blobs[i].num_entry); printf("\n"); } @@ -127,8 +127,8 @@ int main(int argc, char **argv) } EXCHECK(ex_get_blobs(exoid, blb)); for (i = 0; i < num_blob; i++) { - printf("Blob named '%s' has id %" PRId64 ". It contains %" PRId64 " entries.\n", blb[i].name, blb[i].id, - blb[i].num_entry); + printf("Blob named '%s' has id %" PRId64 ". It contains %" PRId64 " entries.\n", blb[i].name, + blb[i].id, blb[i].num_entry); } /* Read attributes... */ @@ -137,8 +137,8 @@ int main(int argc, char **argv) for (i = 0; i < num_blob; i++) { memset(attr, 0, sizeof(ex_attribute) * 10); int att_count = ex_get_attribute_count(exoid, EX_BLOB, blb[i].id); - printf("Blob named '%s' with id %" PRId64 ". It contains %d attributes:\n", blb[i].name, blb[i].id, - att_count); + printf("Blob named '%s' with id %" PRId64 ". It contains %d attributes:\n", blb[i].name, + blb[i].id, att_count); ex_get_attribute_param(exoid, EX_BLOB, blb[i].id, attr); ex_get_attributes(exoid, att_count, attr); @@ -231,8 +231,8 @@ int main(int argc, char **argv) for (int k = 0; k < num_blob; k++) { EXCHECK(ex_get_reduction_vars(exoid, i + 1, EX_BLOB, blb[k].id, num_red_vars, var_values)); - printf("Values for Blob %" PRId64 " at step %d: %f\t%f\t%f\t%f\n", blb[k].id, i + 1, var_values[0], - var_values[1], var_values[2], var_values[3]); + printf("Values for Blob %" PRId64 " at step %d: %f\t%f\t%f\t%f\n", blb[k].id, i + 1, + var_values[0], var_values[1], var_values[2], var_values[3]); for (int var_idx = 0; var_idx < num_vars; var_idx++) { EXCHECK(ex_get_var(exoid, i + 1, EX_BLOB, var_idx + 1, blobs[k].id, blobs[k].num_entry, diff --git a/packages/seacas/libraries/exodus/test/testrd-groups.c b/packages/seacas/libraries/exodus/test/testrd-groups.c index 40d9a8104049..d5e1db5d07e4 100644 --- a/packages/seacas/libraries/exodus/test/testrd-groups.c +++ b/packages/seacas/libraries/exodus/test/testrd-groups.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/test/testrd-long-name.c b/packages/seacas/libraries/exodus/test/testrd-long-name.c index 4d821b97d71a..01c8004fda58 100644 --- a/packages/seacas/libraries/exodus/test/testrd-long-name.c +++ b/packages/seacas/libraries/exodus/test/testrd-long-name.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/test/testrd-nfaced.c b/packages/seacas/libraries/exodus/test/testrd-nfaced.c index 4e7e6a1f76ec..21dd201db9f1 100644 --- a/packages/seacas/libraries/exodus/test/testrd-nfaced.c +++ b/packages/seacas/libraries/exodus/test/testrd-nfaced.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/test/testrd-nsided.c b/packages/seacas/libraries/exodus/test/testrd-nsided.c index 072b2abdbbf2..830d78db1231 100644 --- a/packages/seacas/libraries/exodus/test/testrd-nsided.c +++ b/packages/seacas/libraries/exodus/test/testrd-nsided.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/test/testrd.c b/packages/seacas/libraries/exodus/test/testrd.c index 7d02070cd1e3..55b9d29af258 100644 --- a/packages/seacas/libraries/exodus/test/testrd.c +++ b/packages/seacas/libraries/exodus/test/testrd.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/test/testrd1.c b/packages/seacas/libraries/exodus/test/testrd1.c index 66b1b7c7bbeb..a003282b76aa 100644 --- a/packages/seacas/libraries/exodus/test/testrd1.c +++ b/packages/seacas/libraries/exodus/test/testrd1.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/test/testrd_nc.c b/packages/seacas/libraries/exodus/test/testrd_nc.c index 8f09a54bd09e..9b1c7f904d77 100644 --- a/packages/seacas/libraries/exodus/test/testrd_nc.c +++ b/packages/seacas/libraries/exodus/test/testrd_nc.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/test/testrd_par.c b/packages/seacas/libraries/exodus/test/testrd_par.c index d7b1e32d14b5..de53fb1963ba 100644 --- a/packages/seacas/libraries/exodus/test/testrd_par.c +++ b/packages/seacas/libraries/exodus/test/testrd_par.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/test/testrd_ss.c b/packages/seacas/libraries/exodus/test/testrd_ss.c index a46f6f9c92a0..8be193e2e61f 100644 --- a/packages/seacas/libraries/exodus/test/testrd_ss.c +++ b/packages/seacas/libraries/exodus/test/testrd_ss.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/test/testrdd.c b/packages/seacas/libraries/exodus/test/testrdd.c index 26eb45d6cadb..42fedef4eb3f 100644 --- a/packages/seacas/libraries/exodus/test/testrdd.c +++ b/packages/seacas/libraries/exodus/test/testrdd.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /****************************************************************************** diff --git a/packages/seacas/libraries/exodus/test/testrdwt.c b/packages/seacas/libraries/exodus/test/testrdwt.c index 004628e3ffa8..8af6998bb72d 100644 --- a/packages/seacas/libraries/exodus/test/testrdwt.c +++ b/packages/seacas/libraries/exodus/test/testrdwt.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/test/testwt-assembly.c b/packages/seacas/libraries/exodus/test/testwt-assembly.c index 841126f67702..dcdab7cf78f0 100644 --- a/packages/seacas/libraries/exodus/test/testwt-assembly.c +++ b/packages/seacas/libraries/exodus/test/testwt-assembly.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/test/testwt-blob.c b/packages/seacas/libraries/exodus/test/testwt-blob.c index 5a017e63a959..30efc2390b0c 100644 --- a/packages/seacas/libraries/exodus/test/testwt-blob.c +++ b/packages/seacas/libraries/exodus/test/testwt-blob.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/test/testwt-compress.c b/packages/seacas/libraries/exodus/test/testwt-compress.c index 812bfa344d36..c630d2a2b085 100644 --- a/packages/seacas/libraries/exodus/test/testwt-compress.c +++ b/packages/seacas/libraries/exodus/test/testwt-compress.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/test/testwt-groups.c b/packages/seacas/libraries/exodus/test/testwt-groups.c index 883cb0a7b840..b7df5cac40a3 100644 --- a/packages/seacas/libraries/exodus/test/testwt-groups.c +++ b/packages/seacas/libraries/exodus/test/testwt-groups.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/test/testwt-localization.C b/packages/seacas/libraries/exodus/test/testwt-localization.C index 0281423243bf..63322c1dfee0 100644 --- a/packages/seacas/libraries/exodus/test/testwt-localization.C +++ b/packages/seacas/libraries/exodus/test/testwt-localization.C @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/test/testwt-long-name.c b/packages/seacas/libraries/exodus/test/testwt-long-name.c index edf3438a4d7b..0367d4dd2dd7 100644 --- a/packages/seacas/libraries/exodus/test/testwt-long-name.c +++ b/packages/seacas/libraries/exodus/test/testwt-long-name.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/test/testwt-nface-nside.c b/packages/seacas/libraries/exodus/test/testwt-nface-nside.c index 4161340f0376..e92487784c8e 100644 --- a/packages/seacas/libraries/exodus/test/testwt-nface-nside.c +++ b/packages/seacas/libraries/exodus/test/testwt-nface-nside.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/test/testwt-nfaced.c b/packages/seacas/libraries/exodus/test/testwt-nfaced.c index c9b4fe94b68a..5f04b97b8f5d 100644 --- a/packages/seacas/libraries/exodus/test/testwt-nfaced.c +++ b/packages/seacas/libraries/exodus/test/testwt-nfaced.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/test/testwt-nsided.c b/packages/seacas/libraries/exodus/test/testwt-nsided.c index 1090e1fd5ba9..fdd6a132abf6 100644 --- a/packages/seacas/libraries/exodus/test/testwt-nsided.c +++ b/packages/seacas/libraries/exodus/test/testwt-nsided.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/test/testwt-one-attrib.c b/packages/seacas/libraries/exodus/test/testwt-one-attrib.c index 041869fb6769..30543b699420 100644 --- a/packages/seacas/libraries/exodus/test/testwt-one-attrib.c +++ b/packages/seacas/libraries/exodus/test/testwt-one-attrib.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #undef NDEBUG diff --git a/packages/seacas/libraries/exodus/test/testwt-oned.c b/packages/seacas/libraries/exodus/test/testwt-oned.c index d4ed2d057a5c..c9a452e8bf30 100644 --- a/packages/seacas/libraries/exodus/test/testwt-oned.c +++ b/packages/seacas/libraries/exodus/test/testwt-oned.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus/test/testwt-partial.c b/packages/seacas/libraries/exodus/test/testwt-partial.c index ab4c9923b0f9..99d3c8fe8037 100644 --- a/packages/seacas/libraries/exodus/test/testwt-partial.c +++ b/packages/seacas/libraries/exodus/test/testwt-partial.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/test/testwt-results.c b/packages/seacas/libraries/exodus/test/testwt-results.c index ff24259f5e5b..d15842785f74 100644 --- a/packages/seacas/libraries/exodus/test/testwt-results.c +++ b/packages/seacas/libraries/exodus/test/testwt-results.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/test/testwt-zeroe.c b/packages/seacas/libraries/exodus/test/testwt-zeroe.c index c460781f4e50..b0074bb93c21 100644 --- a/packages/seacas/libraries/exodus/test/testwt-zeroe.c +++ b/packages/seacas/libraries/exodus/test/testwt-zeroe.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/test/testwt-zeron.c b/packages/seacas/libraries/exodus/test/testwt-zeron.c index d47029c842d4..8fde1b46d295 100644 --- a/packages/seacas/libraries/exodus/test/testwt-zeron.c +++ b/packages/seacas/libraries/exodus/test/testwt-zeron.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/test/testwt.c b/packages/seacas/libraries/exodus/test/testwt.c index c1c4a61ae40c..12b70f209850 100644 --- a/packages/seacas/libraries/exodus/test/testwt.c +++ b/packages/seacas/libraries/exodus/test/testwt.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/test/testwt1.c b/packages/seacas/libraries/exodus/test/testwt1.c index 0836b47e591e..63ec3f4e8d10 100644 --- a/packages/seacas/libraries/exodus/test/testwt1.c +++ b/packages/seacas/libraries/exodus/test/testwt1.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/test/testwt2.c b/packages/seacas/libraries/exodus/test/testwt2.c index 1fbb30b48c31..7e29d9c1999c 100644 --- a/packages/seacas/libraries/exodus/test/testwt2.c +++ b/packages/seacas/libraries/exodus/test/testwt2.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/test/testwt_clb.c b/packages/seacas/libraries/exodus/test/testwt_clb.c index 9b1949ba16e1..e5e9b16fd032 100644 --- a/packages/seacas/libraries/exodus/test/testwt_clb.c +++ b/packages/seacas/libraries/exodus/test/testwt_clb.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/test/testwt_nc.c b/packages/seacas/libraries/exodus/test/testwt_nc.c index 2628fb446924..4f562711e08b 100644 --- a/packages/seacas/libraries/exodus/test/testwt_nc.c +++ b/packages/seacas/libraries/exodus/test/testwt_nc.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/test/testwt_nossnsdf.c b/packages/seacas/libraries/exodus/test/testwt_nossnsdf.c index c29283f3789b..107bc7e85b6b 100644 --- a/packages/seacas/libraries/exodus/test/testwt_nossnsdf.c +++ b/packages/seacas/libraries/exodus/test/testwt_nossnsdf.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/test/testwt_ss.c b/packages/seacas/libraries/exodus/test/testwt_ss.c index 0dd24bfd747c..cf1bcc40d5eb 100644 --- a/packages/seacas/libraries/exodus/test/testwt_ss.c +++ b/packages/seacas/libraries/exodus/test/testwt_ss.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/test/testwtd.c b/packages/seacas/libraries/exodus/test/testwtd.c index 9a97dfec30c4..7f9d8aefea13 100644 --- a/packages/seacas/libraries/exodus/test/testwtd.c +++ b/packages/seacas/libraries/exodus/test/testwtd.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/test/testwtm.c b/packages/seacas/libraries/exodus/test/testwtm.c index 85d71d29c40f..c2d0ef0be4c0 100644 --- a/packages/seacas/libraries/exodus/test/testwtm.c +++ b/packages/seacas/libraries/exodus/test/testwtm.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /***************************************************************************** diff --git a/packages/seacas/libraries/exodus/test/twod.c b/packages/seacas/libraries/exodus/test/twod.c index 45ebed36957a..a01c8fc7dbf8 100644 --- a/packages/seacas/libraries/exodus/test/twod.c +++ b/packages/seacas/libraries/exodus/test/twod.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus_for/include/exodusII.inc b/packages/seacas/libraries/exodus_for/include/exodusII.inc index e07ac9c36962..52cf89024968 100644 --- a/packages/seacas/libraries/exodus_for/include/exodusII.inc +++ b/packages/seacas/libraries/exodus_for/include/exodusII.inc @@ -3,7 +3,7 @@ ! Copyright(C) 1999-2020 National Technology & Engineering Solutions ! of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with ! NTESS, the U.S. Government retains certain rights in this software. -! +! ! See packages/seacas/LICENSE for details !*************************************************************** ! @@ -61,11 +61,11 @@ parameter (EX_LARGE_MODEL = 32) ! enable mods that permit storage of larger models parameter (EX_NETCDF4 = 64) ! use the hdf5-based netcdf4 output parameter (EX_64BIT_OFFSET = 32) ! enable mods that permit storage of larger models - parameter (EX_64BIT_DATA =4194304) ! CDF-5 format: classic model but 64 bit dimensions and sizes + parameter (EX_64BIT_DATA =4194304) ! CDF-5 format: classic model but 64 bit dimensions and sizes parameter (EX_NOSHARE = 128) ! Do not open netcdf file in "share" mode parameter (EX_SHARE = 256) ! Do open netcdf file in "share" mode parameter (EX_NOCLASSIC = 512) ! Do not force netcdf to classic mode in netcdf4 mode - parameter (EX_DISKLESS =1048576) ! Experimental + parameter (EX_DISKLESS =1048576) ! Experimental parameter (EX_MMAP =2097152) ! Experimental ! Need to distinguish between storage on database (DB in name) and @@ -97,11 +97,11 @@ integer EX_INQ_NS_NODE_LEN, EX_INQ_SIDE_SETS integer EX_INQ_SS_NODE_LEN, EX_INQ_SS_ELEM_LEN, EX_INQ_QA integer EX_INQ_INFO, EX_INQ_TIME, EX_INQ_EB_PROP - integer EX_INQ_NS_PROP, EX_INQ_SS_PROP, EX_INQ_NS_DF_LEN + integer EX_INQ_NS_PROP, EX_INQ_SS_PROP, EX_INQ_NS_DF_LEN integer EX_INQ_SS_DF_LEN, EX_INQ_LIB_VERS - integer EX_INQ_EM_PROP, EX_INQ_NM_PROP, EX_INQ_ELEM_MAP + integer EX_INQ_EM_PROP, EX_INQ_NM_PROP, EX_INQ_ELEM_MAP integer EX_INQ_NODE_MAP, EX_INQ_EDGE - integer EX_INQ_EDGE_BLK, EX_INQ_EDGE_SETS, EX_INQ_ES_LEN + integer EX_INQ_EDGE_BLK, EX_INQ_EDGE_SETS, EX_INQ_ES_LEN integer EX_INQ_ES_DF_LEN, EX_INQ_EDGE_PROP integer EX_INQ_ES_PROP, EX_INQ_FACE, EX_INQ_FACE_BLK integer EX_INQ_FACE_SETS, EX_INQ_FS_LEN @@ -114,69 +114,69 @@ integer EX_INQ_MAX_READ_NAME_LENGTH integer EX_INQ_DB_FLOAT_SIZE, EX_INQ_NUM_CHILD_GROUPS integer EX_INQ_GROUP_PARENT, EX_INQ_GROUP_ROOT - integer EX_INQ_GROUP_NAME_LEN, EX_INQ_GROUP_NAME + integer EX_INQ_GROUP_NAME_LEN, EX_INQ_GROUP_NAME integer EX_INQ_FULL_GROUP_NAME_LEN, EX_INQ_FULL_GROUP_NAME integer EX_INQ_THREADSAFE, EX_INQ_INVALID parameter (EX_INQ_FILE_TYPE = 1) ! inquire EXODUS file type - parameter (EX_INQ_API_VERS = 2) ! inquire API version number - parameter (EX_INQ_DB_VERS = 3) ! inquire database version number - parameter (EX_INQ_TITLE = 4) ! inquire database title - parameter (EX_INQ_DIM = 5) ! inquire number of dimensions - parameter (EX_INQ_NODES = 6) ! inquire number of nodes - parameter (EX_INQ_ELEM = 7) ! inquire number of elements - parameter (EX_INQ_ELEM_BLK = 8) ! inquire number of element blocks + parameter (EX_INQ_API_VERS = 2) ! inquire API version number + parameter (EX_INQ_DB_VERS = 3) ! inquire database version number + parameter (EX_INQ_TITLE = 4) ! inquire database title + parameter (EX_INQ_DIM = 5) ! inquire number of dimensions + parameter (EX_INQ_NODES = 6) ! inquire number of nodes + parameter (EX_INQ_ELEM = 7) ! inquire number of elements + parameter (EX_INQ_ELEM_BLK = 8) ! inquire number of element blocks parameter (EX_INQ_NODE_SETS = 9) ! inquire number of node sets - parameter (EX_INQ_NS_NODE_LEN = 10) ! inquire length of node set node list + parameter (EX_INQ_NS_NODE_LEN = 10) ! inquire length of node set node list parameter (EX_INQ_SIDE_SETS = 11) ! inquire number of side sets - parameter (EX_INQ_SS_NODE_LEN = 12) ! inquire length of side set node list - parameter (EX_INQ_SS_ELEM_LEN = 13) ! inquire length of side set element list - parameter (EX_INQ_QA = 14) ! inquire number of QA records - parameter (EX_INQ_INFO = 15) ! inquire number of info records - parameter (EX_INQ_TIME = 16) ! inquire number of time steps in the database - parameter (EX_INQ_EB_PROP = 17) ! inquire number of element block properties - parameter (EX_INQ_NS_PROP = 18) ! inquire number of node set properties - parameter (EX_INQ_SS_PROP = 19) ! inquire number of side set properties + parameter (EX_INQ_SS_NODE_LEN = 12) ! inquire length of side set node list + parameter (EX_INQ_SS_ELEM_LEN = 13) ! inquire length of side set element list + parameter (EX_INQ_QA = 14) ! inquire number of QA records + parameter (EX_INQ_INFO = 15) ! inquire number of info records + parameter (EX_INQ_TIME = 16) ! inquire number of time steps in the database + parameter (EX_INQ_EB_PROP = 17) ! inquire number of element block properties + parameter (EX_INQ_NS_PROP = 18) ! inquire number of node set properties + parameter (EX_INQ_SS_PROP = 19) ! inquire number of side set properties parameter (EX_INQ_NS_DF_LEN = 20) ! inquire length of node set distribution factor list parameter (EX_INQ_SS_DF_LEN = 21) ! inquire length of side set distribution factor list parameter (EX_INQ_LIB_VERS = 22) ! inquire API Lib vers number - parameter (EX_INQ_EM_PROP = 23) ! inquire number of element map properties - parameter (EX_INQ_NM_PROP = 24) ! inquire number of node map properties - parameter (EX_INQ_ELEM_MAP = 25) ! inquire number of element maps + parameter (EX_INQ_EM_PROP = 23) ! inquire number of element map properties + parameter (EX_INQ_NM_PROP = 24) ! inquire number of node map properties + parameter (EX_INQ_ELEM_MAP = 25) ! inquire number of element maps parameter (EX_INQ_NODE_MAP = 26) ! inquire number of node maps - parameter (EX_INQ_EDGE = 27) ! inquire number of edges - parameter (EX_INQ_EDGE_BLK = 28) ! inquire number of edge blocks - parameter (EX_INQ_EDGE_SETS = 29) ! inquire number of edge sets - parameter (EX_INQ_ES_LEN = 30) ! inquire length of concat edge set edge list + parameter (EX_INQ_EDGE = 27) ! inquire number of edges + parameter (EX_INQ_EDGE_BLK = 28) ! inquire number of edge blocks + parameter (EX_INQ_EDGE_SETS = 29) ! inquire number of edge sets + parameter (EX_INQ_ES_LEN = 30) ! inquire length of concat edge set edge list parameter (EX_INQ_ES_DF_LEN = 31) ! inquire length of concat edge set dist factor list - parameter (EX_INQ_EDGE_PROP = 32) ! inquire number of properties stored per edge block - parameter (EX_INQ_ES_PROP = 33) ! inquire number of properties stored per edge set - parameter (EX_INQ_FACE = 34) ! inquire number of faces - parameter (EX_INQ_FACE_BLK = 35) ! inquire number of face blocks - parameter (EX_INQ_FACE_SETS = 36) ! inquire number of face sets - parameter (EX_INQ_FS_LEN = 37) ! inquire length of concat face set face list + parameter (EX_INQ_EDGE_PROP = 32) ! inquire number of properties stored per edge block + parameter (EX_INQ_ES_PROP = 33) ! inquire number of properties stored per edge set + parameter (EX_INQ_FACE = 34) ! inquire number of faces + parameter (EX_INQ_FACE_BLK = 35) ! inquire number of face blocks + parameter (EX_INQ_FACE_SETS = 36) ! inquire number of face sets + parameter (EX_INQ_FS_LEN = 37) ! inquire length of concat face set face list parameter (EX_INQ_FS_DF_LEN = 38) ! inquire length of concat face set dist factor list - parameter (EX_INQ_FACE_PROP = 39) ! inquire number of properties stored per face block - parameter (EX_INQ_FS_PROP = 40) ! inquire number of properties stored per face set - parameter (EX_INQ_ELEM_SETS = 41) ! inquire number of element sets - parameter (EX_INQ_ELS_LEN = 42) ! inquire length of concat element set element list + parameter (EX_INQ_FACE_PROP = 39) ! inquire number of properties stored per face block + parameter (EX_INQ_FS_PROP = 40) ! inquire number of properties stored per face set + parameter (EX_INQ_ELEM_SETS = 41) ! inquire number of element sets + parameter (EX_INQ_ELS_LEN = 42) ! inquire length of concat element set element list parameter (EX_INQ_ELS_DF_LEN = 43) ! inquire length of concat element set dist factor list - parameter (EX_INQ_ELS_PROP = 44) ! inquire number of properties stored per elem set - parameter (EX_INQ_EDGE_MAP = 45) ! inquire number of edge maps - parameter (EX_INQ_FACE_MAP = 46) ! inquire number of face maps - parameter (EX_INQ_COORD_FRAMES = 47) ! inquire number of coordinate frames - parameter (EX_INQ_DB_MAX_ALLOWED_NAME_LENGTH = 48) !inquire size of MAX_NAME_LENGTH dimension on database - parameter (EX_INQ_DB_MAX_USED_NAME_LENGTH = 49) ! inquire size of MAX_NAME_LENGTH dimension on database - parameter (EX_INQ_MAX_READ_NAME_LENGTH = 50) ! inquire client-specified max size of returned names - parameter (EX_INQ_DB_FLOAT_SIZE = 51) ! inquire size of floating-point values stored on database - parameter (EX_INQ_NUM_CHILD_GROUPS = 52) ! inquire number of groups contained in this (exoid) group - parameter (EX_INQ_GROUP_PARENT = 53) ! inquire id of parent of this (exoid) group; returns exoid if at root - parameter (EX_INQ_GROUP_ROOT = 54) ! inquire id of root group "/" of this (exoid) group; returns exoid if at root - parameter (EX_INQ_GROUP_NAME_LEN = 55) ! inquire length of name of group exoid - parameter (EX_INQ_GROUP_NAME = 56) ! inquire name of group exoid. "/" returned for root group - parameter (EX_INQ_FULL_GROUP_NAME_LEN = 57) ! inquire length of full path name of this (exoid) group - parameter (EX_INQ_FULL_GROUP_NAME = 58) ! inquire full "/"-separated path name of this (exoid) group - parameter (EX_INQ_THREADSAFE = 59) ! Returns 1 if library is thread-safe; 0 otherwise + parameter (EX_INQ_ELS_PROP = 44) ! inquire number of properties stored per elem set + parameter (EX_INQ_EDGE_MAP = 45) ! inquire number of edge maps + parameter (EX_INQ_FACE_MAP = 46) ! inquire number of face maps + parameter (EX_INQ_COORD_FRAMES = 47) ! inquire number of coordinate frames + parameter (EX_INQ_DB_MAX_ALLOWED_NAME_LENGTH = 48) !inquire size of MAX_NAME_LENGTH dimension on database + parameter (EX_INQ_DB_MAX_USED_NAME_LENGTH = 49) ! inquire size of MAX_NAME_LENGTH dimension on database + parameter (EX_INQ_MAX_READ_NAME_LENGTH = 50) ! inquire client-specified max size of returned names + parameter (EX_INQ_DB_FLOAT_SIZE = 51) ! inquire size of floating-point values stored on database + parameter (EX_INQ_NUM_CHILD_GROUPS = 52) ! inquire number of groups contained in this (exoid) group + parameter (EX_INQ_GROUP_PARENT = 53) ! inquire id of parent of this (exoid) group; returns exoid if at root + parameter (EX_INQ_GROUP_ROOT = 54) ! inquire id of root group "/" of this (exoid) group; returns exoid if at root + parameter (EX_INQ_GROUP_NAME_LEN = 55) ! inquire length of name of group exoid + parameter (EX_INQ_GROUP_NAME = 56) ! inquire name of group exoid. "/" returned for root group + parameter (EX_INQ_FULL_GROUP_NAME_LEN = 57) ! inquire length of full path name of this (exoid) group + parameter (EX_INQ_FULL_GROUP_NAME = 58) ! inquire full "/"-separated path name of this (exoid) group + parameter (EX_INQ_THREADSAFE = 59) ! Returns 1 if library is thread-safe; 0 otherwise parameter (EX_INQ_INVALID = -1) integer EXTYPE, EXVERS, EXDBVR, EXTITL, EXDIM, EXNODE @@ -269,25 +269,25 @@ integer EX_ELEM_SET, EX_SIDE_SET, EX_ELEM_MAP, EX_NODE_MAP integer EX_EDGE_MAP, EX_FACE_MAP, EX_GLOBAL, EX_COORDINATE integer EX_INVALID - + parameter (EX_NODAL = 14) ! nodal "block" for variables - parameter (EX_NODE_BLOCK = 14) ! alias for EX_NODAL - parameter (EX_NODE_SET = 2) ! node set property code - parameter (EX_EDGE_BLOCK = 6) ! edge block property code - parameter (EX_EDGE_SET = 7) ! edge set property code - parameter (EX_FACE_BLOCK = 8) ! face block property code - parameter (EX_FACE_SET = 9) ! face set property code + parameter (EX_NODE_BLOCK = 14) ! alias for EX_NODAL + parameter (EX_NODE_SET = 2) ! node set property code + parameter (EX_EDGE_BLOCK = 6) ! edge block property code + parameter (EX_EDGE_SET = 7) ! edge set property code + parameter (EX_FACE_BLOCK = 8) ! face block property code + parameter (EX_FACE_SET = 9) ! face set property code parameter (EX_ELEM_BLOCK = 1) ! element block property code - parameter (EX_ELEM_SET = 10) ! face set property code - parameter (EX_SIDE_SET = 3) ! side set property code - - parameter (EX_ELEM_MAP = 4) ! element map property code - parameter (EX_NODE_MAP = 5) ! node map property code - parameter (EX_EDGE_MAP = 11) ! edge map property code - parameter (EX_FACE_MAP = 12) ! face map property code - + parameter (EX_ELEM_SET = 10) ! face set property code + parameter (EX_SIDE_SET = 3) ! side set property code + + parameter (EX_ELEM_MAP = 4) ! element map property code + parameter (EX_NODE_MAP = 5) ! node map property code + parameter (EX_EDGE_MAP = 11) ! edge map property code + parameter (EX_FACE_MAP = 12) ! face map property code + parameter (EX_GLOBAL = 13) ! global "block" for variables - parameter (EX_COORDINATE = 15) ! kluge so some internal wrapper functions work + parameter (EX_COORDINATE = 15) ! kluge so some internal wrapper functions work parameter (EX_INVALID = -1) ! ! Define options codes diff --git a/packages/seacas/libraries/exodus_for/src/addrwrap.F b/packages/seacas/libraries/exodus_for/src/addrwrap.F index b1648442b7b9..c508f07d824a 100644 --- a/packages/seacas/libraries/exodus_for/src/addrwrap.F +++ b/packages/seacas/libraries/exodus_for/src/addrwrap.F @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details SUBROUTINE ADRDUM @@ -10,9 +10,9 @@ SUBROUTINE ADRDUM #ifdef Build64 SUBROUTINE EXCLOS (IDEXO, IERR) C> \sa ex_close() -C + C CLOSE EXODUS II FILE -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -29,9 +29,9 @@ SUBROUTINE EXCLOS (IDEXO, IERR) SUBROUTINE EXCN2S (IDEXO, NSESS, NDESS, IXEESS, IXNESS, & LTEESS, LTNESS, LTSESS, IERR) C> \sa ex_cvt_nodes_to_sides() -C + C CONVERT SIDE SET NODES TO SIDES -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -55,9 +55,9 @@ SUBROUTINE EXCN2S (IDEXO, NSESS, NDESS, IXEESS, IXNESS, INTEGER FUNCTION EXCRE (PATH, ICMODE, ICOMPWS, IOWS, IERR) C> \sa ex_create() -C + C CREATE EXODUS II FILE -C + IMPLICIT NONE CHARACTER* (*) PATH ! (R) INTEGER ICMODE ! (R) @@ -108,9 +108,9 @@ INTEGER FUNCTION EXCRE (PATH, ICMODE, ICOMPWS, IOWS, IERR) SUBROUTINE EXERR (MODNAM, MSG, ERRNUM) C> \sa ex_error() -C + C ERROR REPORTING -C + CHARACTER* (*) MODNAM ! (R) CHARACTER* (*) MSG ! (R) INTEGER ERRNUM ! (R) @@ -123,9 +123,9 @@ SUBROUTINE EXERR (MODNAM, MSG, ERRNUM) SUBROUTINE EXGATM (IDEXO, TIME, IERR) C> \sa ex_get_all_times() -C + C READ ALL TIME VALUES -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -143,9 +143,9 @@ SUBROUTINE EXGATM (IDEXO, TIME, IERR) SUBROUTINE EXGCNS (IDEXO, IDNPSS, NNNPS, NDNPS, IXNNPS, & IXDNPS, LTNNPS, FACNPS, IERR) C> \sa ex_get_concat_node_sets() -C + C READ CONCATENATED NODE SETS -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -171,9 +171,9 @@ SUBROUTINE EXGCNS (IDEXO, IDNPSS, NNNPS, NDNPS, IXNNPS, SUBROUTINE EXGFRM (IDEXO, NFRAME, IDSCF, COORD, ITAGS, IERR) C> \sa ex_get_coordinate_frames() -C + C READ COORDINATE FRAMES -C + implicit none include 'exodusII.inc' @@ -209,9 +209,8 @@ SUBROUTINE EXGFRM (IDEXO, NFRAME, IDSCF, COORD, ITAGS, IERR) SUBROUTINE EXPFRM (IDEXO, NFRAME, IDSCF, COORD, ITAGS, IERR) C> \sa ex_put_coordinate_frames() -C C DEFINE/WRITE COORDINATE FRAMES -C + implicit none include 'exodusII.inc' @@ -245,9 +244,8 @@ SUBROUTINE EXPFRM (IDEXO, NFRAME, IDSCF, COORD, ITAGS, IERR) SUBROUTINE EXGCON (IDEXO, NAMECO, IERR) C> \sa ex_get_coord_names() -C C READ COORDINATE NAMES -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -264,9 +262,9 @@ SUBROUTINE EXGCON (IDEXO, NAMECO, IERR) SUBROUTINE EXGCOR (IDEXO, XN, YN, ZN, IERR) C> \sa ex_get_coord() -C + C READ NODAL COORDINATES -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -287,9 +285,9 @@ SUBROUTINE EXGCOR (IDEXO, XN, YN, ZN, IERR) SUBROUTINE EXGCSS (IDEXO, IDESSS, NSESS, NDESS, IXEESS, & IXDESS, LTEESS, LTSESS, FACESS, IERR) C> \sa ex_get_concat_side_sets() -C + C READ CONCATENATED SIDE SETS -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -317,9 +315,9 @@ SUBROUTINE EXGCSS (IDEXO, IDESSS, NSESS, NDESS, IXEESS, SUBROUTINE EXGCSSF (IDEXO, IDESSS, NSESS, NDESS, IXEESS, & IXDESS, LTEESS, LTSESS, IERR) C> \sa ex_get_concat_side_sets() -C + C> READ CONCATENATED SIDE SETS, no distribution factors -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -345,9 +343,9 @@ SUBROUTINE EXGCSSF (IDEXO, IDESSS, NSESS, NDESS, IXEESS, SUBROUTINE EXGEAT (IDEXO, IDELB, ATRIB, IERR) C> \sa ex_get_elem_attr() -C + C> READ ELEMENT BLOCK ATTRIBUTES -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -365,9 +363,9 @@ SUBROUTINE EXGEAT (IDEXO, IDELB, ATRIB, IERR) SUBROUTINE EXGEAN (IDEXO, IDELB, NATTR, NAMES, IERR) C> \sa ex_get_elem_attr_names() -C + C> READ ELEMENT BLOCK ATTRIBUTES -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -388,9 +386,9 @@ SUBROUTINE EXGEAN (IDEXO, IDELB, NATTR, NAMES, IERR) SUBROUTINE EXGEBI (IDEXO, IDELBS, IERR) C> \sa ex_get_elem_blk_ids -C + C> READ ELEMENT BLOCK IDS -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -408,9 +406,9 @@ SUBROUTINE EXGEBI (IDEXO, IDELBS, IERR) SUBROUTINE EXGELB (IDEXO, IDELB, NAMELB, NUMELB, NUMLNK, & NUMATR, IERR) C> \sa ex_get_elem_block() -C + C> READ ELEMENT BLOCK PARAMETERS -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -432,9 +430,9 @@ SUBROUTINE EXGELB (IDEXO, IDELB, NAMELB, NUMELB, NUMLNK, SUBROUTINE EXGELC (IDEXO, IDELB, LINK, IERR) C> \sa ex_get_elem_conn() -C + C> READ ELEMENT BLOCK CONNECTIVITY -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -452,9 +450,9 @@ SUBROUTINE EXGELC (IDEXO, IDELB, LINK, IERR) SUBROUTINE EXGECPP (IDEXO, ITYPE, IDELB, COUNTS, IERR) C> \sa ex_get_entity_count_per_polyhedra() -C + C> READ ENTITY_COUNT-PER-POLYHEDRA -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -488,9 +486,9 @@ SUBROUTINE EXGECPP (IDEXO, ITYPE, IDELB, COUNTS, IERR) SUBROUTINE EXGENM (IDEXO, MAPEL, IERR) C> \sa ex_get_id_map() -C + C> READ ELEMENT NUMBER MAP -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -507,9 +505,9 @@ SUBROUTINE EXGENM (IDEXO, MAPEL, IERR) SUBROUTINE EXGEM (IDEXO, MAPID, MAPEL, IERR) C> \sa ex_get_num_map() -C + C> READ ELEMENT ORDER MAP -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -527,9 +525,9 @@ SUBROUTINE EXGEM (IDEXO, MAPID, MAPEL, IERR) SUBROUTINE EXGPEM (IDEXO, MAPID, ISTART, ICOUNT, MAPEL, IERR) C> \sa ex_get_partial_num_map() -C + C> READ ELEMENT ORDER MAP -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -550,9 +548,9 @@ SUBROUTINE EXGPEM (IDEXO, MAPID, ISTART, ICOUNT, MAPEL, IERR) SUBROUTINE EXGEV (IDEXO, ISTEP, IXELEV, IDELB, NUMELB, & VALEV, IERR) C> \sa ex_get_elem_var() -C + C> READ ELEMENT VARIABLE VALUES AT A TIME STEP -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -579,9 +577,9 @@ SUBROUTINE EXGEV (IDEXO, ISTEP, IXELEV, IDELB, NUMELB, SUBROUTINE EXGEVT (IDEXO, IXELEV, IELNUM, ISTPB, ISTPE, & VALEV, IERR) C> \sa ex_get_elem_var_time() -C + C> READ ELEMENT VARIABLE VALUES THROUGH TIME -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -610,9 +608,9 @@ SUBROUTINE EXGEVT (IDEXO, IXELEV, IELNUM, ISTPB, ISTPE, SUBROUTINE EXGNSV (IDEXO, ISTEP, IXV, ID, NUM, VAL, IERR) C> \sa ex_get_nset_var() -C + C> READ NODESET VARIABLE VALUES AT A TIME STEP -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -637,9 +635,9 @@ SUBROUTINE EXGNSV (IDEXO, ISTEP, IXV, ID, NUM, VAL, IERR) SUBROUTINE EXGSSV (IDEXO, ISTEP, IXV, ID, NUM, VAL, IERR) C> \sa ex_get_sset_var() -C + C> READ SIDESET VARIABLE VALUES AT A TIME STEP -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -664,9 +662,9 @@ SUBROUTINE EXGSSV (IDEXO, ISTEP, IXV, ID, NUM, VAL, IERR) SUBROUTINE EXGGV (IDEXO, ISTEP, NVARGL, VALGV, IERR) C> \sa ex_get_glob_vars() -C + C> READ GLOBAL VARIABLE VALUES AT A TIME STEP -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -689,9 +687,9 @@ SUBROUTINE EXGGV (IDEXO, ISTEP, NVARGL, VALGV, IERR) SUBROUTINE EXGGVT (IDEXO, IXGLOV, ISTPB, ISTPE, VALGV, IERR) C> \sa ex_get_glob_var_time() -C + C> READ GLOBAL VARIABLE VALUES THROUGH TIME -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -717,9 +715,9 @@ SUBROUTINE EXGGVT (IDEXO, IXGLOV, ISTPB, ISTPE, VALGV, IERR) SUBROUTINE EXGINF (IDEXO, INFO, IERR) C> \sa ex_get_info() -C + C> READ INFORMATION RECORDS -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -737,9 +735,9 @@ SUBROUTINE EXGINF (IDEXO, INFO, IERR) SUBROUTINE EXGINI (IDEXO, TITLE, NDIM, NUMNP, NUMEL, NELBLK, & NUMNPS, NUMESS, IERR) C> \sa ex_get_init() -C + C> READ INITIALIZATION PARAMETERS -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -763,9 +761,9 @@ SUBROUTINE EXGINI (IDEXO, TITLE, NDIM, NUMNP, NUMEL, NELBLK, SUBROUTINE EXGMP (IDEXO, NNMAP, NEMAP, IERR) C> \sa ex_get_map_param() -C + C> GET MAP PARAMETERS -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -787,9 +785,9 @@ SUBROUTINE EXGMP (IDEXO, NNMAP, NEMAP, IERR) SUBROUTINE EXPMP (IDEXO, NNMAP, NEMAP, IERR) C> \sa ex_put_map_param() -C + C PUT MAP PARAMETERS -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -811,9 +809,9 @@ SUBROUTINE EXPMP (IDEXO, NNMAP, NEMAP, IERR) SUBROUTINE EXGMAP (IDEXO, MAPEL, IERR) C> \sa ex_get_map() -C + C> READ ELEMENT ORDER MAP -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -830,9 +828,9 @@ SUBROUTINE EXGMAP (IDEXO, MAPEL, IERR) SUBROUTINE EXGNNM (IDEXO, MAPNOD, IERR) C> \sa ex_get_id_map() -C + C> READ NODE NUMBER MAP -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -849,9 +847,9 @@ SUBROUTINE EXGNNM (IDEXO, MAPNOD, IERR) SUBROUTINE EXGNM (IDEXO, MAPID, MAPNOD, IERR) C> \sa ex_get_num_map() -C + C> READ NODE ORDER MAP -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -869,9 +867,9 @@ SUBROUTINE EXGNM (IDEXO, MAPID, MAPNOD, IERR) SUBROUTINE EXGNP (IDEXO, IDNPS, NNNPS, NDNPS, IERR) C> \sa ex_get_node_set_param() -C + C> READ NODE SET PARAMETERS -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -890,9 +888,9 @@ SUBROUTINE EXGNP (IDEXO, IDNPS, NNNPS, NDNPS, IERR) SUBROUTINE EXGNS (IDEXO, IDNPS, LTNNPS, IERR) C> \sa ex_get_node_set() -C + C> READ NODE SET -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -910,9 +908,9 @@ SUBROUTINE EXGNS (IDEXO, IDNPS, LTNNPS, IERR) SUBROUTINE EXGNSD (IDEXO, IDNPS, FACNPS, IERR) C> \sa ex_get_node_set_dist_fact() -C + C> READ NODE SET DISTRIBUTION FACTORS -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -931,9 +929,9 @@ SUBROUTINE EXGNSD (IDEXO, IDNPS, FACNPS, IERR) SUBROUTINE EXGNSI (IDEXO, IDNPSS, IERR) C> \sa ex_get_node_set_ids() -C + C> READ NODE SET IDS -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -950,9 +948,9 @@ SUBROUTINE EXGNSI (IDEXO, IDNPSS, IERR) SUBROUTINE EXGNV (IDEXO, ISTEP, IXNODV, NUMNP, VALNV, IERR) C> \sa ex_get_nodal_var() -C + C> READ NODAL VARIABLE VALUES AT A TIME STEP -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -977,9 +975,9 @@ SUBROUTINE EXGNV (IDEXO, ISTEP, IXNODV, NUMNP, VALNV, IERR) SUBROUTINE EXGNVT (IDEXO, IXNODV, NODNUM, ISTPB, ISTPE, & VALNV, IERR) C> \sa ex_get_nodal_var_time() -C + C> READ NODAL VARIABLE VALUES THROUGH TIME -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -1007,9 +1005,9 @@ SUBROUTINE EXGNVT (IDEXO, IXNODV, NODNUM, ISTPB, ISTPE, SUBROUTINE EXGP (IDEXO, ITYPE, ID, NAMEPR, IVAL, IERR) C> \sa ex_get_prop() -C + C> READ OBJECT PROPERTY -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -1031,9 +1029,9 @@ SUBROUTINE EXGP (IDEXO, ITYPE, ID, NAMEPR, IVAL, IERR) SUBROUTINE EXGPA (IDEXO, ITYPE, NAMEPR, IVAL, IERR) C> \sa ex_get_prop_array() -C + C> READ OBJECT PROPERTY ARRAY -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -1054,9 +1052,9 @@ SUBROUTINE EXGPA (IDEXO, ITYPE, NAMEPR, IVAL, IERR) SUBROUTINE EXGPN (IDEXO, ITYPE, NAMEPR, IERR) C> \sa ex_get_prop_names() -C + C> READ PROPERTY ARRAY NAMES -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -1076,9 +1074,9 @@ SUBROUTINE EXGPN (IDEXO, ITYPE, NAMEPR, IERR) SUBROUTINE EXGQA (IDEXO, QAREC, IERR) C> \sa ex_get_qa() -C + C> READ QA RECORDS -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -1095,9 +1093,9 @@ SUBROUTINE EXGQA (IDEXO, QAREC, IERR) SUBROUTINE EXGSP (IDEXO, IDESS, NSESS, NDESS, IERR) C> \sa ex_get_side_set_param() -C + C> READ SIDE SET PARAMETERS -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -1116,9 +1114,9 @@ SUBROUTINE EXGSP (IDEXO, IDESS, NSESS, NDESS, IERR) SUBROUTINE EXGSNL (IDEXO, IDESS, NNESS, IERR) C> \sa ex_get_side_set_node_list_len() -C + C> GET SIDE SET NODELIST LENGTH -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -1136,9 +1134,9 @@ SUBROUTINE EXGSNL (IDEXO, IDESS, NNESS, IERR) SUBROUTINE EXGSS (IDEXO, IDESS, LTEESS, LTSESS, IERR) C> \sa ex_get_side_set() -C + C> READ SIDE SET -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -1157,9 +1155,9 @@ SUBROUTINE EXGSS (IDEXO, IDESS, LTEESS, LTSESS, IERR) SUBROUTINE EXGSSD (IDEXO, IDESS, FACESS, IERR) C> \sa ex_get_side_set_dist_fact() -C + C> READ SIDE SET DISTRIBUTION FACTORS -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -1177,9 +1175,9 @@ SUBROUTINE EXGSSD (IDEXO, IDESS, FACESS, IERR) SUBROUTINE EXGSSI (IDEXO, IDESSS, IERR) C> \sa ex_get_side_set_ids() -C + C> READ SIDE SET IDS -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -1196,9 +1194,9 @@ SUBROUTINE EXGSSI (IDEXO, IDESSS, IERR) SUBROUTINE EXGSSN (IDEXO, IDESS, INCNT, LTNESS, IERR) C> \sa ex_get_side_set_node_list() -C + C> READ SIDE SET NODE LIST -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -1217,9 +1215,9 @@ SUBROUTINE EXGSSN (IDEXO, IDESS, INCNT, LTNESS, IERR) SUBROUTINE EXGSSC (IDEXO, IDESS, INCNT, IERR) C> \sa ex_get_side_set_node_count() -C + C> READ SIDE SET NODE LIST COUNT -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -1247,10 +1245,10 @@ SUBROUTINE EXGSSC (IDEXO, IDESS, INCNT, IERR) SUBROUTINE EXGCSSC (IDEXO, INCNT, IERR) C> \sa ex_get_concat_side_set_node_count() -C + C> READ CONCATENATED SIDE SET NODE COUNT LIST C> (nodes/face for all faces) -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -1277,9 +1275,9 @@ SUBROUTINE EXGCSSC (IDEXO, INCNT, IERR) SUBROUTINE EXGTIM (IDEXO, NSTEP, TIME, IERR) C> \sa ex_get_time() -C + C> READ TIME VALUE FOR A TIME STEP -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -1299,9 +1297,9 @@ SUBROUTINE EXGTIM (IDEXO, NSTEP, TIME, IERR) SUBROUTINE EXGVAN (IDEXO, VARTYP, NVAR, NAMES, IERR) C> \sa ex_get_var_names() -C + C> READ RESULTS VARIABLE NAMES -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -1322,9 +1320,9 @@ SUBROUTINE EXGVAN (IDEXO, VARTYP, NVAR, NAMES, IERR) SUBROUTINE EXGVNM (IDEXO, VARTYP, NVAR, NAME, IERR) C> \sa ex_get_var_name() -C + C> READ RESULTS VARIABLE NAME -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -1345,9 +1343,9 @@ SUBROUTINE EXGVNM (IDEXO, VARTYP, NVAR, NAME, IERR) SUBROUTINE EXPVNM (IDEXO, VARTYP, NVAR, NAME, IERR) C> \sa ex_put_var_name() -C + C> WRITE RESULTS VARIABLE NAME -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -1368,9 +1366,9 @@ SUBROUTINE EXPVNM (IDEXO, VARTYP, NVAR, NAME, IERR) SUBROUTINE EXGVP (IDEXO, VARTYP, NVAR, IERR) C> \sa ex_get_var_param() -C + C> READ RESULTS VARIABLE PARAMETERS -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -1390,9 +1388,9 @@ SUBROUTINE EXGVP (IDEXO, VARTYP, NVAR, IERR) SUBROUTINE EXGVTT (IDEXO, NELBLK, NVAREL, ISEVOK, IERR) C> \sa ex_get_elem_var_tab() -C + C> READ ELEMENT VARIABLE TRUTH TABLE -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -1419,9 +1417,9 @@ SUBROUTINE EXGVTT (IDEXO, NELBLK, NVAREL, ISEVOK, IERR) SUBROUTINE EXGNSTT (IDEXO, NBLK, NVAR, ISVOK, IERR) C> \sa ex_get_nset_var_tab() -C + C> READ NODESET VARIABLE TRUTH TABLE -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -1448,9 +1446,9 @@ SUBROUTINE EXGNSTT (IDEXO, NBLK, NVAR, ISVOK, IERR) SUBROUTINE EXGSSTT (IDEXO, NBLK, NVAR, ISVOK, IERR) C> \sa ex_get_nset_var_tab() -C + C> READ SIDESET VARIABLE TRUTH TABLE -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -1477,9 +1475,9 @@ SUBROUTINE EXGSSTT (IDEXO, NBLK, NVAR, ISVOK, IERR) SUBROUTINE EXINQ (IDEXO, INFREQ, INTRET, RELRET, CHRRET, IERR) C> \sa ex_inquire() -C + C> INQUIRE EXODUS PARAMETERS -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -1503,9 +1501,9 @@ SUBROUTINE EXINQ (IDEXO, INFREQ, INTRET, RELRET, CHRRET, IERR) INTEGER FUNCTION EXINQI (IDEXO, INFREQ) C> \sa ex_inquire_int() -C + C> INQUIRE EXODUS PARAMETERS -- Integer only -C + IMPLICIT NONE INTEGER IDEXO ! (R) INTEGER INFREQ ! (R) @@ -1523,9 +1521,9 @@ INTEGER FUNCTION EXINQI (IDEXO, INFREQ) INTEGER FUNCTION EXOPEN (PATH, IMODE, ICOMPWS, IOWS, VERS, IERR) C> \sa ex_open() -C + C> OPEN EXODUS II FILE -C + IMPLICIT NONE CHARACTER* (*) PATH ! (R) INTEGER IMODE ! (R) @@ -1598,9 +1596,9 @@ INTEGER FUNCTION EXLGMD (IDEXO) SUBROUTINE EXOPTS (OPTVAL, IERR) C> \sa ex_opts() -C + C> SET ERROR REPORTING LEVEL -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER OPTVAL ! (R) @@ -1614,12 +1612,11 @@ SUBROUTINE EXOPTS (OPTVAL, IERR) IERR = IERR4 END - SUBROUTINE EXMXNM (IDEXO, LENGTH, IERR) C> \sa ex_set_max_name_length() -C + C> SET MAXIMUM NAME LENGTH -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -1636,12 +1633,11 @@ SUBROUTINE EXMXNM (IDEXO, LENGTH, IERR) IERR = IERR4 END - SUBROUTINE EXSETOPT (IDEXO, OPTION, VALUE, IERR) C> \sa ex_set_opt() -C + C> SET SPECIFIED OPTION -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -1661,13 +1657,12 @@ SUBROUTINE EXSETOPT (IDEXO, OPTION, VALUE, IERR) IERR = IERR4 END - SUBROUTINE EXPCNS (IDEXO, IDNPSS, NNNPS, NDNPS, IXNNPS, & IXDNPS, LTNNPS, FACNPS, IERR) C> \sa ex_put_concat_node_sets() -C + C> WRITE CONCATENATED NODE SETS -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -1693,9 +1688,9 @@ SUBROUTINE EXPCNS (IDEXO, IDNPSS, NNNPS, NDNPS, IXNNPS, SUBROUTINE EXPCON (IDEXO, NAMECO, IERR) C> \sa ex_put_coord_names() -C + C> WRITE COORDINATE NAMES -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -1714,9 +1709,9 @@ SUBROUTINE EXPCON (IDEXO, NAMECO, IERR) SUBROUTINE EXPCOR (IDEXO, XN, YN, ZN, IERR) C> \sa ex_put_coord() -C + C> WRITE NODAL COORDINATES -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -1738,9 +1733,9 @@ SUBROUTINE EXPCOR (IDEXO, XN, YN, ZN, IERR) SUBROUTINE EXPCSS (IDEXO, IDESSS, NSESS, NDESS, IXEESS, & IXDESS, LTEESS, LTSESS, FACESS, IERR) C> \sa ex_put_concat_side_sets() -C + C> WRITE CONCATENATED SIDE SETS -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -1767,9 +1762,9 @@ SUBROUTINE EXPCSS (IDEXO, IDESSS, NSESS, NDESS, IXEESS, SUBROUTINE EXPEAT (IDEXO, IDELB, ATRIB, IERR) C> \sa ex_put_elem_attr() -C + C> WRITE ELEMENT BLOCK ATTRIBUTES -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -1789,9 +1784,9 @@ SUBROUTINE EXPEAT (IDEXO, IDELB, ATRIB, IERR) SUBROUTINE EXPEAN (IDEXO, IDELB, NATTR, NAMES, IERR) C> \sa ex_put_elem_attr_names() -C + C> WRITE ELEMENT BLOCK ATTRIBUTE NAMES -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -1815,9 +1810,9 @@ SUBROUTINE EXPEAN (IDEXO, IDELB, NATTR, NAMES, IERR) SUBROUTINE EXPCLB (IDEXO, IDELB, NAMELB, NUMELB, NUMLNK, & NUMATR, MKMAP, IERR) C> \sa ex_put_concat_elem_block() -C + C> WRITE CONCATENATED ELEMENT BLOCK PARAMETERS -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -1844,9 +1839,9 @@ SUBROUTINE EXPCLB (IDEXO, IDELB, NAMELB, NUMELB, NUMLNK, SUBROUTINE EXPELB (IDEXO, IDELB, NAMELB, NUMELB, NUMLNK, & NUMATR, IERR) C> \sa ex_put_elem_block() -C + C> WRITE ELEMENT BLOCK PARAMETERS -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -1870,9 +1865,9 @@ SUBROUTINE EXPELB (IDEXO, IDELB, NAMELB, NUMELB, NUMLNK, SUBROUTINE EXPELC (IDEXO, IDELB, LINK, IERR) C> \sa ex_put_elem_conn() -C + C> WRITE ELEMENT BLOCK CONNECTIVITY -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -1892,9 +1887,9 @@ SUBROUTINE EXPELC (IDEXO, IDELB, LINK, IERR) SUBROUTINE EXPECPP (IDEXO, ITYPE, IDELB, COUNTS, IERR) C> ex_put_entity_count_per_polyhedra() -C + C> WRITE ELEMENT BLOCK ELEMENT COUNT PER POLYHEDRA -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -1929,9 +1924,9 @@ SUBROUTINE EXPECPP (IDEXO, ITYPE, IDELB, COUNTS, IERR) SUBROUTINE EXPENM (IDEXO, MAPEL, IERR) C> ex_put_id_map() -C + C> WRITE ELEMENT NUMBER MAP -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -1948,9 +1943,9 @@ SUBROUTINE EXPENM (IDEXO, MAPEL, IERR) SUBROUTINE EXPEM (IDEXO, MAPID, MAPEL, IERR) C> ex_put_processor_elem_maps() -C + C> WRITE ELEMENT NUMBER MAP -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -1968,9 +1963,9 @@ SUBROUTINE EXPEM (IDEXO, MAPID, MAPEL, IERR) SUBROUTINE EXPPEM (IDEXO, MAPID, ISTART, ICOUNT, MAPEL, IERR) C> ex_put_partial_num_map() -C + C> WRITE ELEMENT NUMBER MAP -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -1993,9 +1988,9 @@ SUBROUTINE EXPPEM (IDEXO, MAPID, ISTART, ICOUNT, MAPEL, IERR) SUBROUTINE EXPEV (IDEXO, ISTEP, IXELEV, IDELB, NUMELB, & VALEV, IERR) C> ex_put_elem_var() -C + C> WRITE ELEMENT VARIABLE VALUES AT A TIME STEP -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -2021,9 +2016,9 @@ SUBROUTINE EXPEV (IDEXO, ISTEP, IXELEV, IDELB, NUMELB, SUBROUTINE EXPNSV (IDEXO, ISTEP, IXV, ID, NUM, VAL, IERR) C> ex_put_nset_var() -C + C> WRITE NODESET VARIABLE VALUES AT A TIME STEP -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -2048,9 +2043,9 @@ SUBROUTINE EXPNSV (IDEXO, ISTEP, IXV, ID, NUM, VAL, IERR) SUBROUTINE EXPSSV (IDEXO, ISTEP, IXV, ID, NUM, VAL, IERR) C> ex_put_sset_var() -C + C> WRITE SIDESET VARIABLE VALUES AT A TIME STEP -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -2075,9 +2070,9 @@ SUBROUTINE EXPSSV (IDEXO, ISTEP, IXV, ID, NUM, VAL, IERR) SUBROUTINE EXPGV (IDEXO, ISTEP, NVARGL, VALGV, IERR) C> ex_put_glob_vars() -C + C> WRITE GLOBAL VARIABLE VALUES AT A TIME STEP -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -2100,9 +2095,9 @@ SUBROUTINE EXPGV (IDEXO, ISTEP, NVARGL, VALGV, IERR) SUBROUTINE EXPINF (IDEXO, NINFO, INFO, IERR) C> ex_put_info() -C + C> WRITE INFORMATION RECORDS -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -2123,9 +2118,9 @@ SUBROUTINE EXPINF (IDEXO, NINFO, INFO, IERR) SUBROUTINE EXPINI (IDEXO, TITLE, NDIM, NUMNP, NUMEL, NELBLK, & NUMNPS, NUMESS, IERR) C> ex_put_init() -C + C> WRITE INITIALIZATION PARAMETERS -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -2149,9 +2144,9 @@ SUBROUTINE EXPINI (IDEXO, TITLE, NDIM, NUMNP, NUMEL, NELBLK, SUBROUTINE EXPMAP (IDEXO, MAPEL, IERR) C> ex_put_map() -C + C> WRITE ELEMENT ORDER MAP -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -2168,9 +2163,9 @@ SUBROUTINE EXPMAP (IDEXO, MAPEL, IERR) SUBROUTINE EXPNNM (IDEXO, MAPNOD, IERR) C> ex_put_id_map() -C + C> WRITE NODE NUMBER MAP -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -2187,9 +2182,9 @@ SUBROUTINE EXPNNM (IDEXO, MAPNOD, IERR) SUBROUTINE EXPNM (IDEXO, MAPID, MAPNOD, IERR) C> ex_put_num_map() -C + C> WRITE NODE NUMBER MAP -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -2207,9 +2202,9 @@ SUBROUTINE EXPNM (IDEXO, MAPID, MAPNOD, IERR) SUBROUTINE EXPNP (IDEXO, IDNPS, NNNPS, NDNPS, IERR) C> ex_put_node_set_param() -C + C> WRITE NODE SET PARAMETERS -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -2228,9 +2223,9 @@ SUBROUTINE EXPNP (IDEXO, IDNPS, NNNPS, NDNPS, IERR) SUBROUTINE EXPNS (IDEXO, IDNPS, LTNNPS, IERR) C> ex_put_node_set() -C + C> WRITE NODE SET -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -2248,9 +2243,9 @@ SUBROUTINE EXPNS (IDEXO, IDNPS, LTNNPS, IERR) SUBROUTINE EXPNSD (IDEXO, IDNPS, FACNPS, IERR) C> ex_put_node_set_dist_fact() -C + C> WRITE NODE SET DISTRIBUTION FACTORS -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -2268,9 +2263,9 @@ SUBROUTINE EXPNSD (IDEXO, IDNPS, FACNPS, IERR) SUBROUTINE EXPNV (IDEXO, ISTEP, IXNODV, NUMNP, VALNV, IERR) C> ex_put_nodal_var() -C + C> WRITE NODAL VARIABLE VALUES AT A TIME STEP -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -2294,9 +2289,9 @@ SUBROUTINE EXPNV (IDEXO, ISTEP, IXNODV, NUMNP, VALNV, IERR) SUBROUTINE EXPP (IDEXO, ITYPE, ID, NAMEPR, IVAL, IERR) C> ex_put_prop() -C + C> WRITE OBJECT PROPERTY -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -2318,9 +2313,9 @@ SUBROUTINE EXPP (IDEXO, ITYPE, ID, NAMEPR, IVAL, IERR) SUBROUTINE EXPPA (IDEXO, ITYPE, NAMEPR, IVAL, IERR) C> ex_put_prop_array() -C + C> WRITE OBJECT PROPERTY ARRAY -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -2341,9 +2336,9 @@ SUBROUTINE EXPPA (IDEXO, ITYPE, NAMEPR, IVAL, IERR) SUBROUTINE EXPPN (IDEXO, ITYPE, NPROPS, NAMEPR, IERR) C> ex_put_prop_names() -C + C> WRITE PROPERTY ARRAY NAMES -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -2366,9 +2361,9 @@ SUBROUTINE EXPPN (IDEXO, ITYPE, NPROPS, NAMEPR, IERR) SUBROUTINE EXPQA (IDEXO, NQAREC, QAREC, IERR) C> ex_put_qa() -C + C> WRITE QA RECORDS -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -2388,9 +2383,9 @@ SUBROUTINE EXPQA (IDEXO, NQAREC, QAREC, IERR) SUBROUTINE EXPSP (IDEXO, IDESS, NSESS, NDESS, IERR) C> ex_put_side_set_param() -C + C> WRITE SIDE SET PARAMETERS -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -2409,9 +2404,9 @@ SUBROUTINE EXPSP (IDEXO, IDESS, NSESS, NDESS, IERR) SUBROUTINE EXPSS (IDEXO, IDESS, LTEESS, LTSESS, IERR) C> ex_put_side_set() -C + C> WRITE SIDE SET -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -2430,9 +2425,9 @@ SUBROUTINE EXPSS (IDEXO, IDESS, LTEESS, LTSESS, IERR) SUBROUTINE EXPSSD (IDEXO, IDESS, FACESS, IERR) C> ex_put_side_set_dist_fact() -C + C> WRITE SIDE SET DISTRIBUTION FACTORS -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -2450,9 +2445,9 @@ SUBROUTINE EXPSSD (IDEXO, IDESS, FACESS, IERR) SUBROUTINE EXPTIM (IDEXO, NSTEP, TIME, IERR) C> ex_put_time() -C + C> WRITE TIME VALUE FOR A TIME STEP -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -2472,9 +2467,9 @@ SUBROUTINE EXPTIM (IDEXO, NSTEP, TIME, IERR) SUBROUTINE EXPVAN (IDEXO, VARTYP, NVAR, NAMES, IERR) C> ex_put_var_names() -C + C> WRITE RESULTS VARIABLE NAMES -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -2495,9 +2490,9 @@ SUBROUTINE EXPVAN (IDEXO, VARTYP, NVAR, NAMES, IERR) SUBROUTINE EXPVP (IDEXO, VARTYP, NVAR, IERR) C> ex_put_var_param() -C + C> WRITE RESULTS VARIABLE PARAMETERS -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -2517,9 +2512,9 @@ SUBROUTINE EXPVP (IDEXO, VARTYP, NVAR, IERR) SUBROUTINE EXPVTT (IDEXO, NELBLK, NVAREL, ISEVOK, IERR) C> ex_put_elem_var_tab() -C + C> WRITE ELEMENT VARIABLE TRUTH TABLE -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -2546,9 +2541,9 @@ SUBROUTINE EXPVTT (IDEXO, NELBLK, NVAREL, ISEVOK, IERR) SUBROUTINE EXPNSTT (IDEXO, NBLK, NVAR, ISVOK, IERR) C> ex_put_nset_var_tab() -C + C> WRITE NODESET VARIABLE TRUTH TABLE -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -2575,9 +2570,9 @@ SUBROUTINE EXPNSTT (IDEXO, NBLK, NVAR, ISVOK, IERR) SUBROUTINE EXPSSTT (IDEXO, NBLK, NVAR, ISVOK, IERR) C> ex_put_sset_var_tab() -C + C> WRITE SIDESET VARIABLE TRUTH TABLE -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -2604,9 +2599,9 @@ SUBROUTINE EXPSSTT (IDEXO, NBLK, NVAR, ISVOK, IERR) SUBROUTINE EXGNAMS (IDEXO, ITYPE, NVAR, NAMES, IERR) C> ex_get_names() -C + C> READ OBJECT NAMES -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -2629,9 +2624,9 @@ SUBROUTINE EXGNAMS (IDEXO, ITYPE, NVAR, NAMES, IERR) SUBROUTINE EXGNAM (IDEXO, ITYPE, ID, NAME, IERR) C> ex_get_name() -C + C> READ OBJECT NAME -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -2652,9 +2647,9 @@ SUBROUTINE EXGNAM (IDEXO, ITYPE, ID, NAME, IERR) SUBROUTINE EXPNAMS (IDEXO, ITYPE, NVAR, NAMES, IERR) C> ex_put_names() -C + C> WRITE OBJECT NAMES -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -2677,9 +2672,9 @@ SUBROUTINE EXPNAMS (IDEXO, ITYPE, NVAR, NAMES, IERR) SUBROUTINE EXPNAM (IDEXO, ITYPE, ID, NAME, IERR) C> ex_put_name() -C + C> WRITE OBJECT NAME -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -2700,9 +2695,9 @@ SUBROUTINE EXPNAM (IDEXO, ITYPE, ID, NAME, IERR) SUBROUTINE EXUPDA (IDEXO, IERR) C> ex_update() -C + C> UPDATE EXODUS II FILE -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO ! (R) @@ -2718,9 +2713,9 @@ SUBROUTINE EXUPDA (IDEXO, IERR) SUBROUTINE EXCOPY (IDEXO1, IDEXO2, IERR) C> ex_copy() -C + C> COPY EXODUS II FILE -C + IMPLICIT NONE INCLUDE 'exodusII.inc' INTEGER IDEXO1 ! (R) @@ -2737,11 +2732,10 @@ SUBROUTINE EXCOPY (IDEXO1, IDEXO2, IERR) IERR = IERR4 END - C----------------------------------------------------------------------- -C + C Get initial information from nemesis file -C + subroutine exgii (idexo, nproc, nproc_in_f, ftype, ierr) C> ex_get_init_info() implicit none @@ -2750,24 +2744,24 @@ subroutine exgii (idexo, nproc, nproc_in_f, ftype, ierr) integer nproc_in_f character*(*) ftype integer ierr -C + integer*4 idexo4 integer*4 nproc4 integer*4 nproc_in_f4 integer*4 ierr4 -C + idexo4 = idexo call exgii4 (idexo4, nproc4, nproc_in_f4, ftype, ierr4) nproc = nproc4 nproc_in_f = nproc_in_f4 ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Write initial information from nemesis file -C + subroutine expii (idexo, nproc, nproc_in_f, ftype, ierr) C> ex_put_init_info() implicit none @@ -2776,24 +2770,24 @@ subroutine expii (idexo, nproc, nproc_in_f, ftype, ierr) integer nproc_in_f character*(*) ftype integer ierr -C + integer*4 idexo4 integer*4 nproc4 integer*4 nproc_in_f4 integer*4 ierr4 -C + idexo4 = idexo nproc4 = nproc nproc_in_f4 = nproc_in_f call expii4 (idexo4, nproc4, nproc_in_f4, ftype, ierr4) ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Read initial global information -C + subroutine exgig (idexo, nnodes_g, nelems_g, nelem_blks_g, $ nnode_sets_g, nside_sets_g, ierr) C> ex_get_init_global() @@ -2805,21 +2799,21 @@ subroutine exgig (idexo, nnodes_g, nelems_g, nelem_blks_g, integer nnode_sets_g integer nside_sets_g integer ierr -C + integer*4 idexo4 integer*4 ierr4 -C + idexo4 = idexo call exgig4 (idexo4, nnodes_g, nelems_g, nelem_blks_g, $ nnode_sets_g, nside_sets_g, ierr4) ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Write initial global information -C + subroutine expig (idexo, nnodes_g, nelems_g, nelem_blks_g, $ nnode_sets_g, nside_sets_g, ierr) C> ex_put_init_global() @@ -2831,21 +2825,21 @@ subroutine expig (idexo, nnodes_g, nelems_g, nelem_blks_g, integer nnode_sets_g integer nside_sets_g integer ierr -C + integer*4 idexo4 integer*4 ierr4 -C + idexo4 = idexo call expig4 (idexo4, nnodes_g, nelems_g, nelem_blks_g, $ nnode_sets_g, nside_sets_g, ierr4) ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Read load balance parameters -C + subroutine exglbp (idexo, nint_nodes, nbor_nodes, next_nodes, $ nint_elems, nbor_elems, nnode_cmaps, nelem_cmaps, $ processor, ierr) @@ -2861,24 +2855,24 @@ subroutine exglbp (idexo, nint_nodes, nbor_nodes, next_nodes, integer nelem_cmaps integer processor integer ierr -C + integer*4 idexo4 integer*4 processor4 integer*4 ierr4 -C + idexo4 = idexo processor4 = processor call exglbp4 (idexo4, nint_nodes, nbor_nodes, next_nodes, $ nint_elems, nbor_elems, nnode_cmaps, nelem_cmaps, $ processor4, ierr4) ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Write load balance parameters -C + subroutine explbp (idexo, nint_nodes, nbor_nodes, next_nodes, $ nint_elems, nbor_elems, nnode_cmaps, nelem_cmaps, $ processor, ierr) @@ -2894,24 +2888,24 @@ subroutine explbp (idexo, nint_nodes, nbor_nodes, next_nodes, integer nelem_cmaps integer processor integer ierr -C + integer*4 idexo4 integer*4 processor4 integer*4 ierr4 -C + idexo4 = idexo processor4 = processor call explbp4 (idexo4, nint_nodes, nbor_nodes, next_nodes, $ nint_elems, nbor_elems, nnode_cmaps, nelem_cmaps, $ processor4, ierr4) ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Write concatenated load balance parameters -C + subroutine explbpc (idexo, nint_nodes, nbor_nodes, next_nodes, $ nint_elems, nbor_elems, nnode_cmaps, nelem_cmaps, ierr) C> ex_put_loadbal_param_cc() @@ -2925,22 +2919,22 @@ subroutine explbpc (idexo, nint_nodes, nbor_nodes, next_nodes, integer nnode_cmaps(*) integer nelem_cmaps(*) integer ierr -C + integer*4 idexo4 integer*4 ierr4 -C + idexo4 = idexo call explbpc4 (idexo4, nint_nodes, nbor_nodes, next_nodes, $ nint_elems, nbor_elems, nnode_cmaps, nelem_cmaps, $ ierr4) ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Read global node set parameters -C + subroutine exgnspg (idexo, ns_ids_glob, ns_n_cnt_glob, $ ns_df_cnt_glob, ierr) C> ex_get_ns_param_global() @@ -2950,21 +2944,21 @@ subroutine exgnspg (idexo, ns_ids_glob, ns_n_cnt_glob, integer ns_n_cnt_glob(*) integer ns_df_cnt_glob(*) integer ierr -C + integer*4 idexo4 integer*4 ierr4 -C + idexo4 = idexo call exgnspg4 (idexo4, ns_ids_glob, ns_n_cnt_glob, $ ns_df_cnt_glob, ierr4) ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Write global node set parameters -C + subroutine expnspg (idexo, global_ids, global_n_cnts, $ global_df_cnts, ierr) C> ex_put_ns_param_global() @@ -2973,21 +2967,21 @@ subroutine expnspg (idexo, global_ids, global_n_cnts, integer global_n_cnts(*) integer global_df_cnts(*) integer ierr -C + integer*4 idexo4 integer*4 ierr4 -C + idexo4 = idexo call expnspg4 (idexo4, global_ids, global_n_cnts, $ global_df_cnts, ierr4) ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Read global side set parameters -C + subroutine exgsspg (idexo, ss_ids_glob, ss_n_cnt_glob, $ ss_df_cnt_glob, ierr) C> ex_get_ss_param_global() @@ -2997,21 +2991,21 @@ subroutine exgsspg (idexo, ss_ids_glob, ss_n_cnt_glob, integer ss_n_cnt_glob(*) integer ss_df_cnt_glob(*) integer ierr -C + integer*4 idexo4 integer*4 ierr4 -C + idexo4 = idexo call exgsspg4 (idexo4, ss_ids_glob, ss_n_cnt_glob, $ ss_df_cnt_glob, ierr4) ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Write global side set parameters -C + subroutine expsspg (idexo, global_ids, global_el_cnts, $ global_df_cnts, ierr) C> ex_put_ss_param_global() @@ -3021,21 +3015,21 @@ subroutine expsspg (idexo, global_ids, global_el_cnts, integer global_el_cnts(*) integer global_df_cnts(*) integer ierr -C + integer*4 idexo4 integer*4 ierr4 -C + idexo4 = idexo call expsspg4 (idexo4, global_ids, global_el_cnts, $ global_df_cnts, ierr4) ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Read global element block information -C + subroutine exgebig (idexo, el_blk_ids, el_blk_cnts, ierr) C> ex_get_eb_info_global() implicit none @@ -3043,20 +3037,20 @@ subroutine exgebig (idexo, el_blk_ids, el_blk_cnts, ierr) integer el_blk_ids(*) integer el_blk_cnts(*) integer ierr -C + integer*4 idexo4 integer*4 ierr4 -C + idexo4 = idexo call exgebig4 (idexo4, el_blk_ids, el_blk_cnts, ierr4) ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Write global element block information -C + subroutine expebig (idexo, el_blk_ids, el_blk_cnts, ierr) C> ex_put_eb_info_global() implicit none @@ -3064,20 +3058,20 @@ subroutine expebig (idexo, el_blk_ids, el_blk_cnts, ierr) integer el_blk_ids(*) integer el_blk_cnts(*) integer ierr -C + integer*4 idexo4 integer*4 ierr4 -C + idexo4 = idexo call expebig4 (idexo4, el_blk_ids, el_blk_cnts, ierr4) ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Read side set element list and side set side list -C + subroutine exgnss (idexo, ss_id, start_side_num, num_sides, $ ss_elem_list, ss_side_list, ierr) C> ex_get_n_side_set() @@ -3089,21 +3083,21 @@ subroutine exgnss (idexo, ss_id, start_side_num, num_sides, integer ss_elem_list(num_sides) integer ss_side_list(num_sides) integer ierr -C + integer*4 idexo4 integer*4 ierr4 -C + idexo4 = idexo call exgnss4 (idexo4, ss_id, start_side_num, num_sides, $ ss_elem_list, ss_side_list, ierr4) ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Write side set element list and side set side list -C + subroutine expnss (idexo, ss_id, start_side_num, num_sides, $ ss_elem_list, ss_side_list, ierr) C> ex_put_n_side_set() @@ -3115,21 +3109,21 @@ subroutine expnss (idexo, ss_id, start_side_num, num_sides, integer ss_elem_list(num_sides) integer ss_side_list(num_sides) integer ierr -C + integer*4 idexo4 integer*4 ierr4 -C + idexo4 = idexo call expnss4 (idexo4, ss_id, start_side_num, num_sides, $ ss_elem_list, ss_side_list, ierr4) ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Read side set distribution factor -C + subroutine exgnssd (idexo, ss_id, start_num, num_df_to_get, $ ss_df, ierr) C> ex_get_n_side_set_df() @@ -3140,21 +3134,21 @@ subroutine exgnssd (idexo, ss_id, start_num, num_df_to_get, integer num_df_to_get real ss_df(num_df_to_get) integer ierr -C + integer*4 idexo4 integer*4 ierr4 -C + idexo4 = idexo call exgnssd4 (idexo4, ss_id, start_num, num_df_to_get, $ ss_df, ierr4) ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Write side set distribution factor -C + subroutine expnssd (idexo, ss_id, start_num, num_df_to_get, $ ss_df, ierr) C> ex_put_n_side_set_df() @@ -3165,21 +3159,21 @@ subroutine expnssd (idexo, ss_id, start_num, num_df_to_get, integer num_df_to_get real ss_df(num_df_to_get) integer ierr -C + integer*4 idexo4 integer*4 ierr4 -C + idexo4 = idexo call expnssd4 (idexo4, ss_id, start_num, num_df_to_get, $ ss_df, ierr4) ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Read node set list for a single node set -C + subroutine exgnns (idexo, ns_id, start_node_num, num_node, $ ns_node_list, ierr) C> ex_get_n_node_set() @@ -3190,21 +3184,21 @@ subroutine exgnns (idexo, ns_id, start_node_num, num_node, integer num_node integer ns_node_list(num_node) integer ierr -C + integer*4 idexo4 integer*4 ierr4 -C + idexo4 = idexo call exgnns4 (idexo4, ns_id, start_node_num, num_node, $ ns_node_list, ierr4) ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Write node set list for a single node set -C + subroutine expnns (idexo, ns_id, start_node_num, num_node, $ ns_node_list, ierr) C> ex_put_n_node_set() @@ -3215,21 +3209,21 @@ subroutine expnns (idexo, ns_id, start_node_num, num_node, integer num_node integer ns_node_list(num_node) integer ierr -C + integer*4 idexo4 integer*4 ierr4 -C + idexo4 = idexo call expnns4 (idexo4, ns_id, start_node_num, num_node, $ ns_node_list, ierr4) ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Read node set distribution factor -C + subroutine exgnnsd (idexo, ns_id, start_num, num_df_to_get, $ ns_df, ierr) C> ex_get_n_node_set_df() @@ -3240,21 +3234,21 @@ subroutine exgnnsd (idexo, ns_id, start_num, num_df_to_get, integer num_df_to_get real ns_df(num_df_to_get) integer ierr -C + integer*4 idexo4 integer*4 ierr4 -C + idexo4 = idexo call exgnnsd4 (idexo4, ns_id, start_num, num_df_to_get, $ ns_df, ierr4) ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Write node set distribution factor -C + subroutine expnnsd (idexo, ns_id, start_num, num_df_to_get, $ ns_df, ierr) C> ex_put_n_node_set_df() @@ -3265,21 +3259,21 @@ subroutine expnnsd (idexo, ns_id, start_num, num_df_to_get, integer num_df_to_get real ns_df(num_df_to_get) integer ierr -C + integer*4 idexo4 integer*4 ierr4 -C + idexo4 = idexo call expnnsd4 (idexo4, ns_id, start_num, num_df_to_get, $ ns_df, ierr4) ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Read coordinates of the nodes -C + subroutine exgncor (idexo, start_node_num, num_nodes, x_coor, $ y_coor, z_coor, ierr) C> ex_get_n_coord() @@ -3291,21 +3285,21 @@ subroutine exgncor (idexo, start_node_num, num_nodes, x_coor, real y_coor(num_nodes) real z_coor(num_nodes) integer ierr -C + integer*4 idexo4 integer*4 ierr4 -C + idexo4 = idexo call exgncor4 (idexo4, start_node_num, num_nodes, x_coor, $ y_coor, z_coor, ierr4) ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Write coordinates of the nodes -C + subroutine expncor (idexo, start_node_num, num_nodes, x_coor, $ y_coor, z_coor, ierr) C> ex_put_n_coord() @@ -3317,21 +3311,21 @@ subroutine expncor (idexo, start_node_num, num_nodes, x_coor, real y_coor(num_nodes) real z_coor(num_nodes) integer ierr -C + integer*4 idexo4 integer*4 ierr4 -C + idexo4 = idexo call expncor4 (idexo4, start_node_num, num_nodes, x_coor, $ y_coor, z_coor, ierr4) ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Read an element blocks connectivity list -C + subroutine exgnec (idexo, elem_blk_id, start_elem_num, $ num_elems, connect, ierr) C> ex_get_n_elem_conn() @@ -3342,21 +3336,21 @@ subroutine exgnec (idexo, elem_blk_id, start_elem_num, integer num_elems integer connect(num_elems) integer ierr -C + integer*4 idexo4 integer*4 ierr4 -C + idexo4 = idexo call exgnec4 (idexo4, elem_blk_id, start_elem_num, $ num_elems, connect, ierr4) ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Write an element blocks connectivity list -C + subroutine expnec (idexo, elem_blk_id, start_elem_num, $ num_elems, connect, ierr) C> ex_put_n_elem_conn() @@ -3367,21 +3361,21 @@ subroutine expnec (idexo, elem_blk_id, start_elem_num, integer num_elems integer connect(num_elems) integer ierr -C + integer*4 idexo4 integer*4 ierr4 -C + idexo4 = idexo call expnec4 (idexo4, elem_blk_id, start_elem_num, $ num_elems, connect, ierr4) ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Read an element blocks attributes -C + subroutine exgneat (idexo, elem_blk_id, start_elem_num, $ num_elems, attrib, ierr) C> ex_get_n_elem_attr() @@ -3392,21 +3386,21 @@ subroutine exgneat (idexo, elem_blk_id, start_elem_num, integer num_elems real attrib(num_elems) integer ierr -C + integer*4 idexo4 integer*4 ierr4 -C + idexo4 = idexo call exgneat4 (idexo4, elem_blk_id, start_elem_num, $ num_elems, attrib, ierr4) ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Write an element blocks attributes -C + subroutine expneat (idexo, elem_blk_id, start_elem_num, $ num_elems, attrib, ierr) C> ex_put_n_elem_attr() @@ -3417,20 +3411,20 @@ subroutine expneat (idexo, elem_blk_id, start_elem_num, integer num_elems real attrib(num_elems) integer ierr -C + integer*4 idexo4 integer*4 ierr4 -C + idexo4 = idexo call expneat4 (idexo4, elem_blk_id, start_elem_num, $ num_elems, attrib, ierr4) ierr = ierr4 -C + end -C + C----------------------------------------------------------------------- C Read the element type for a specific element block -C + subroutine exgelt (idexo, elem_blk_id, elem_type, ierr) C> ex_get_elem_type() implicit none @@ -3438,20 +3432,20 @@ subroutine exgelt (idexo, elem_blk_id, elem_type, ierr) integer elem_blk_id character*(*) elem_type integer ierr -C + integer*4 idexo4 integer*4 ierr4 -C + idexo4 = idexo call exgelt4 (idexo4, elem_blk_id, elem_type, ierr4) ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Read a variable for an element block -C + subroutine exgnev (idexo, time_step, elem_var_index, $ elem_blk_id, num_elem_this_blk, start_elem_num, $ num_elem, elem_var_vals, ierr) @@ -3466,12 +3460,12 @@ subroutine exgnev (idexo, time_step, elem_var_index, integer num_elem real elem_var_vals(num_elem) integer ierr -C + integer*4 idexo4 integer*4 time_step4 integer*4 elem_var_index4 integer*4 ierr4 -C + idexo4 = idexo time_step4 = time_step elem_var_index4 = elem_var_index @@ -3479,13 +3473,13 @@ subroutine exgnev (idexo, time_step, elem_var_index, $ elem_blk_id, num_elem_this_blk, start_elem_num, $ num_elem, elem_var_vals, ierr4) ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Write a variable slab for an element block -C + subroutine expevs (idexo, time_step, elem_var_index, $ elem_blk_id, start_pos, num_vals, elem_var_vals, $ ierr) @@ -3499,12 +3493,12 @@ subroutine expevs (idexo, time_step, elem_var_index, integer num_vals real elem_var_vals(num_vals) integer ierr -C + integer*4 idexo4 integer*4 time_step4 integer*4 elem_var_index4 integer*4 ierr4 -C + idexo4 = idexo time_step4 = time_step elem_var_index4 = elem_var_index @@ -3512,13 +3506,13 @@ subroutine expevs (idexo, time_step, elem_var_index, $ elem_blk_id, start_pos, num_vals, elem_var_vals, $ ierr4) ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Read the values of a single nodal variable for a single time step -C + subroutine exgnnv (idexo, time_step, nodal_var_index, $ start_node_num, num_nodes, nodal_vars, ierr) C> ex_get_n_var() @@ -3530,25 +3524,25 @@ subroutine exgnnv (idexo, time_step, nodal_var_index, integer num_nodes real nodal_vars(num_nodes) integer ierr -C + integer*4 idexo4 integer*4 time_step4 integer*4 nodal_var_index4 integer*4 ierr4 -C + idexo4 = idexo time_step4 = time_step nodal_var_index4 = nodal_var_index call exgnnv4 (idexo4, time_step4, nodal_var_index4, $ start_node_num, num_nodes, nodal_vars, ierr4) ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Write nodal variable slab -C + subroutine expnvs (idexo, time_step, nodal_var_index, $ start_pos, num_vals, nodal_var_vals, ierr) C> ex_put_nodal_var_slab() @@ -3560,25 +3554,25 @@ subroutine expnvs (idexo, time_step, nodal_var_index, integer num_vals real nodal_var_vals(num_vals) integer ierr -C + integer*4 idexo4 integer*4 time_step4 integer*4 nodal_var_index4 integer*4 ierr4 -C + idexo4 = idexo time_step4 = time_step nodal_var_index4 = nodal_var_index call expnvs4 (idexo4, time_step4, nodal_var_index4, $ start_pos, num_vals, nodal_var_vals, ierr4) ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Read the element numbering map -C + subroutine exgnenm (idexo, starte, num_ent, elem_map, ierr) C> ex_get_n_elem_num_map() implicit none @@ -3587,20 +3581,20 @@ subroutine exgnenm (idexo, starte, num_ent, elem_map, ierr) integer num_ent integer elem_map(num_ent) integer ierr -C + integer*4 idexo4 integer*4 ierr4 -C + idexo4 = idexo call exgnenm4 (idexo4, starte, num_ent, elem_map, ierr4) ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Write the element numbering map -C + subroutine expnenm (idexo, starte, num_ent, elem_map, ierr) C> ex_put_partial_id_map() implicit none @@ -3609,20 +3603,20 @@ subroutine expnenm (idexo, starte, num_ent, elem_map, ierr) integer num_ent integer elem_map(num_ent) integer ierr -C + integer*4 idexo4 integer*4 ierr4 -C + idexo4 = idexo call expnenm4 (idexo4, starte, num_ent, elem_map, ierr4) ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Read the node numbering map -C + subroutine exgnnnm (idexo, startn, num_ent, node_map, ierr) C> ex_get_n_node_num_map() implicit none @@ -3631,20 +3625,20 @@ subroutine exgnnnm (idexo, startn, num_ent, node_map, ierr) integer num_ent integer node_map(num_ent) integer ierr -C + integer*4 idexo4 integer*4 ierr4 -C + idexo4 = idexo call exgnnnm4 (idexo4, startn, num_ent, node_map, ierr4) ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Write the node numbering map -C + subroutine expnnnm (idexo, startn, num_ent, node_map, ierr) C> ex_put_partial_id_map() implicit none @@ -3653,20 +3647,20 @@ subroutine expnnnm (idexo, startn, num_ent, node_map, ierr) integer num_ent integer node_map(num_ent) integer ierr -C + integer*4 idexo4 integer*4 ierr4 -C + idexo4 = idexo call expnnnm4 (idexo4, startn, num_ent, node_map, ierr4) ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Read the node map for a processor -C + subroutine exgnmp (idexo, node_mapi, node_mapb, node_mape, $ processor, ierr) C> ex_get_processor_node_maps() @@ -3677,23 +3671,23 @@ subroutine exgnmp (idexo, node_mapi, node_mapb, node_mape, integer node_mape(*) integer processor integer ierr -C + integer*4 idexo4 integer*4 processor4 integer*4 ierr4 -C + idexo4 = idexo processor4 = processor call exgnmp4 (idexo4, node_mapi, node_mapb, node_mape, $ processor4, ierr4) ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Write a node map for a processor -C + subroutine expnmp (idexo, node_mapi, node_mapb, node_mape, $ processor, ierr) C> ex_put_processor_node_maps() @@ -3704,23 +3698,23 @@ subroutine expnmp (idexo, node_mapi, node_mapb, node_mape, integer node_mape(*) integer processor integer ierr -C + integer*4 idexo4 integer*4 processor4 integer*4 ierr4 -C + idexo4 = idexo processor4 = processor call expnmp4 (idexo4, node_mapi, node_mapb, node_mape, $ processor4, ierr4) ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Read the element map for a processor -C + subroutine exgemp (idexo, elem_mapi, elem_mapb, processor, ierr) C> ex_get_processor_elem_maps() implicit none @@ -3729,22 +3723,22 @@ subroutine exgemp (idexo, elem_mapi, elem_mapb, processor, ierr) integer elem_mapb(*) integer processor integer ierr -C + integer*4 idexo4 integer*4 processor4 integer*4 ierr4 -C + idexo4 = idexo processor4 = processor call exgemp4 (idexo4, elem_mapi, elem_mapb, processor4, ierr4) ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Write the element map for a processor -C + subroutine expemp (idexo, elem_mapi, elem_mapb, processor, ierr) C> ex_put_processor_elem_maps() implicit none @@ -3753,22 +3747,22 @@ subroutine expemp (idexo, elem_mapi, elem_mapb, processor, ierr) integer elem_mapb(*) integer processor integer ierr -C + integer*4 idexo4 integer*4 processor4 integer*4 ierr4 -C + idexo4 = idexo processor4 = processor call expemp4 (idexo4, elem_mapi, elem_mapb, processor4, ierr4) ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Read the communications map parameters for a single processor -C + subroutine exgcmp (idexo, ncmap_ids, ncmap_node_cnts, $ ecmap_ids, ecmap_elem_cnts, processor, ierr) C> ex_get_cmap_params() @@ -3780,23 +3774,23 @@ subroutine exgcmp (idexo, ncmap_ids, ncmap_node_cnts, integer ecmap_elem_cnts(*) integer processor integer ierr -C + integer*4 idexo4 integer*4 processor4 integer*4 ierr4 -C + idexo4 = idexo processor4 = processor call exgcmp4 (idexo4, ncmap_ids, ncmap_node_cnts, $ ecmap_ids, ecmap_elem_cnts, processor4, ierr4) ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Write the communications map parameters for a single processor -C + subroutine expcmp (idexo, nmap_ids, nmap_node_cnts, emap_ids, $ emap_elem_cnts, processor, ierr) C> ex_put_cmap_params() @@ -3812,19 +3806,19 @@ subroutine expcmp (idexo, nmap_ids, nmap_node_cnts, emap_ids, integer*4 idexo4 integer*4 processor4 integer*4 ierr4 -C + idexo4 = idexo processor4 = processor call expcmp4 (idexo4, nmap_ids, nmap_node_cnts, emap_ids, $ emap_elem_cnts, processor4, ierr4) ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Write the communications map parameters for all processors -C + subroutine expcmpc (idexo, nmap_ids, nmap_node_cnts, $ nproc_ptrs, emap_ids, emap_elem_cnts, eproc_ptrs, ierr) C> ex_put_cmap_params() @@ -3840,7 +3834,7 @@ subroutine expcmpc (idexo, nmap_ids, nmap_node_cnts, integer*4 idexo4 integer*4 ierr4 -C + idexo4 = idexo call expcmpc4 (idexo4, nmap_ids, nmap_node_cnts, $ nproc_ptrs, emap_ids, emap_elem_cnts, eproc_ptrs, ierr4) @@ -3849,9 +3843,9 @@ subroutine expcmpc (idexo, nmap_ids, nmap_node_cnts, end C----------------------------------------------------------------------- -C + C Read the nodal communications map for a single processor -C + subroutine exgncm (idexo, map_id, node_ids, proc_ids, $ processor, ierr) C> ex_get_node_cmap() @@ -3862,23 +3856,23 @@ subroutine exgncm (idexo, map_id, node_ids, proc_ids, integer proc_ids(*) integer processor integer ierr -C + integer*4 idexo4 integer*4 processor4 integer*4 ierr4 -C + idexo4 = idexo processor4 = processor call exgncm4 (idexo4, map_id, node_ids, proc_ids, $ processor4, ierr4) ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Write the nodal communications map for a single processor -C + subroutine expncm (idexo, map_id, node_ids, proc_ids, $ processor, ierr) C> ex_put_node_cmap() @@ -3889,23 +3883,23 @@ subroutine expncm (idexo, map_id, node_ids, proc_ids, integer proc_ids(*) integer processor integer ierr -C + integer*4 idexo4 integer*4 processor4 integer*4 ierr4 -C + idexo4 = idexo processor4 = processor call expncm4 (idexo4, map_id, node_ids, proc_ids, $ processor4, ierr4) ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Read the elemental communications map for a single processor -C + subroutine exgecm (idexo, map_id, elem_ids, side_ids, $ proc_ids, processor, ierr) C> ex_get_elem_cmap() @@ -3921,19 +3915,19 @@ subroutine exgecm (idexo, map_id, elem_ids, side_ids, integer*4 idexo4 integer*4 processor4 integer*4 ierr4 -C + idexo4 = idexo processor4 = processor call exgecm4 (idexo4, map_id, elem_ids, side_ids, $ proc_ids, processor4, ierr4) ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Write the elemental communications map for a single processor -C + subroutine expecm (idexo, map_id, elem_ids, side_ids, $ proc_ids, processor, ierr) C> ex_put_elem_cmap() @@ -3960,9 +3954,9 @@ subroutine expecm (idexo, map_id, elem_ids, side_ids, C----------------------------------------------------------------------- SUBROUTINE I8I4 (N, I8, PI4) -C + C CREATE I4 ARRAY AND COPY I8 ARRAY CONTENTS TO I4 -C + IMPLICIT NONE INTEGER N INTEGER I8 (*) @@ -3977,9 +3971,9 @@ SUBROUTINE I8I4 (N, I8, PI4) END SUBROUTINE I4I8 (N, PI4, I8) -C + C COPY I4 ARRAY CONTENTS TO I8 AND FREE I4 ARRAY -C + IMPLICIT NONE INTEGER N INTEGER*4 I4 (1) @@ -3994,9 +3988,9 @@ SUBROUTINE I4I8 (N, PI4, I8) END SUBROUTINE I4ALLOC (N, PI4) -C + C ALLOCATE DYNAMIC I4 ARRAY N ELEMENTS IN SIZE -C + IMPLICIT NONE INTEGER N INTEGER*4 I4 (1) @@ -4020,9 +4014,9 @@ SUBROUTINE I4ALLOC (N, PI4) END SUBROUTINE I4FREE (PI4) -C + C FREE DYNAMIC MEMORY ASSOCIATED WITH I4 ARRAY REFERENCED BY PI4 -C + IMPLICIT NONE INTEGER*4 I4 (1) POINTER (PI4, I4) diff --git a/packages/seacas/libraries/exodus_for/src/exo_jack-windows.c b/packages/seacas/libraries/exodus_for/src/exo_jack-windows.c index 3b605289fe4c..07141c06182d 100644 --- a/packages/seacas/libraries/exodus_for/src/exo_jack-windows.c +++ b/packages/seacas/libraries/exodus_for/src/exo_jack-windows.c @@ -1,3277 +1,3277 @@ -/* +/* * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details - */ - -/* - * OVERVIEW - * - * This file contains jacket routines written in C for interfacing Fortran - * ExodusII function calls to the actual C binding for ExodusII. - - * In general, these functions handle - * character-string parameter conventions, convert between - * column-major-order arrays and row-major-order arrays, and map between - * array indices beginning at one and array indices beginning at zero. - * - */ - -/* LINTLIBRARY */ -#include "exodusII.h" -#include "exodusII_int.h" -#include "netcdf.h" -#include -#include -#include -#include - -/* - * The Build64 is for the "normal" SEACAS build which uses compiler - * options to change reals and integers into 8-byte quantities. The - * routines in addrwrap.F are used to down-convert the 8-byte integers - * into 4-byte integers which then call through to the routines in - * this file which have a '4' or '4_' appended to the routine name. - * These routines then call through to the C API routines. - * - * If DEFAULT_REAL_INT is defined, then the build is to build a - * fortran library interface that takes 4-byte ints and either 4-byte - * or 8-byte floating point (real/double) variables. In this case, the - * addrwrap routines are not built and a fortran client will call the - * routines in this file directly. - * - */ - -#if defined(Build64) && !defined(DEFAULT_REAL_INT) -/* 64-bit */ -#define real double -#define entity_id ex_entity_id -#ifdef ADDC_ -#define F2C(name) name##4_ -#else -#define F2C(name) name##4 -#endif - -#else -/* 32-bit */ -#define real float -#define entity_id int -#ifdef ADDC_ -#define F2C(name) name##_ -#else -#define F2C(name) name -#endif -#endif - -extern int ncopts; /* default is (NC_FATAL | NC_VERBOSE) */ -extern int exerrval; /* global integer that contains a - * Exodus-specific error code */ - -/* blank fill C string to make FORTRAN string */ -static void ex_fcdcpy(char *fstring, /* output string to be blank-filled */ - int fslen, /* length of output string */ - char *sstring) -{ /* input string, null-terminated */ - int i, len; - - if (sstring != NULL) { - len = strlen(sstring); - if (len > fslen) - len = fslen; - - for (i = 0; i < len; i++) - *(fstring + i) = *(sstring + i); - for (i = len; i < fslen; i++) - *(fstring + i) = ' '; - } - else { - for (i = 0; i < fslen; i++) - *(fstring + i) = ' '; - } -} - -/* copy function used to copy strings and strip trailing blanks */ -static void ex_fstrncpy(char *target, /* space to be copied into */ - char *source, /* string to be copied */ - int maxlen) -{ /* maximum length of *source */ - int len = maxlen; - - while (len-- && *source != '\0') - *target++ = *source++; - - len = maxlen; - while (len-- && *(--target) == ' ') - ; /* strip blanks */ - *(++target) = '\0'; /* insert new EOS marker */ -} - -/* copy function used to copy strings terminated with blanks */ -static void ex_nstrncpy(char *target, /* space to be copied into */ - char *source, /* string to be copied */ - int maxlen) -{ /* maximum length of *source */ - while (maxlen-- && *source != ' ') - *target++ = *source++; - *target = '\0'; -} - -/* Above are utility functions used below */ -/* ======================================================================== */ -/* Below are the exodus API functions */ -/* - * Adding a new function: - * + Protect the name with the f2c (uppercase) macro which will add/not add '4' and or '_' - * depending on the compilation mode. - * - * + float/double arguments are declared as 'real' which will be replaced with float or double. - * - * + If there are any character arguments 'X', then add an int* argument 'Xlen' at end of argument - * list - * This will contain the length of the passed in character argument. - * - * + Look at existing functions for guidance... - */ - -/* - * create an EXODUS II file - */ -int F2C(EXCRE)(char *path, int *clobmode, int *cpu_word_size, int *io_word_size, int *ierr, - int pathlen) -{ - char *name; - int idexo; - - if (!(name = malloc((pathlen + 1) * sizeof(char)))) { - *ierr = EX_MEMFAIL; - return (EX_FATAL); - } - (void)ex_nstrncpy(name, path, pathlen); - - if ((idexo = ex_create(name, *clobmode, cpu_word_size, io_word_size)) != EX_FATAL) { - free(name); - *ierr = 0; - return (idexo); - } - free(name); - *ierr = exerrval; - return (EX_FATAL); -} - -/* - * open an EXODUS II file - */ -int F2C(EXOPEN)(char *path, int *mode, int *cpu_word_size, int *io_word_size, - float *version, /* This is float always; not real */ - int *ierr, int pathlen) -{ - char *name; - int idexo; - - if (!(name = malloc((pathlen + 1) * sizeof(char)))) { - *ierr = EX_MEMFAIL; - return (EX_FATAL); - } - (void)ex_nstrncpy(name, path, pathlen); - if ((idexo = ex_open(name, *mode, cpu_word_size, io_word_size, version)) != EX_FATAL) { - free(name); - *ierr = 0; - return (idexo); - } - free(name); - *ierr = EX_FATAL; - return (EX_FATAL); -} - -/* - * close an EXODUS II file - */ -void F2C(EXCLOS)(int *idexo, int *ierr) { *ierr = ex_close(*idexo); } - -/* - * update an EXODUS II file - */ -void F2C(EXUPDA)(int *idexo, int *ierr) { *ierr = ex_update(*idexo); } - -/* - * write initialization parameters - */ -void F2C(EXPINI)(int *idexo, char *title, void_int *num_dim, void_int *num_nodes, - void_int *num_elem, void_int *num_elem_blk, void_int *num_node_sets, - void_int *num_side_sets, int *ierr, int titlelen) -{ - int slen; - char *name; - - slen = MAX_LINE_LENGTH; /* max line size */ - // AIS - printf("%i\n", slen); - printf("%i\n", titlelen); - if (titlelen != MAX_LINE_LENGTH) { - slen = titlelen; - } - name = malloc((slen + 1) * sizeof(char)); - (void)ex_fstrncpy(name, title, slen); - - if (ex_int64_status(*idexo) & EX_BULK_INT64_API) { - int64_t *n_dim = num_dim; - int64_t *n_nodes = num_nodes; - int64_t *n_elem = num_elem; - int64_t *n_elem_blk = num_elem_blk; - int64_t *n_node_sets = num_node_sets; - int64_t *n_side_sets = num_side_sets; - // AIS - printf("I am in then"); - // AIF - *ierr = ex_put_init(*idexo, name, *n_dim, *n_nodes, *n_elem, *n_elem_blk, *n_node_sets, - *n_side_sets); - // AIS - printf("%i\n", *ierr); - // AIF - } - else { - int *n_dim = num_dim; - int *n_nodes = num_nodes; - int *n_elem = num_elem; - int *n_elem_blk = num_elem_blk; - int *n_node_sets = num_node_sets; - int *n_side_sets = num_side_sets; - // AIS - printf("I am in else"); - // AIF - *ierr = ex_put_init(*idexo, name, *n_dim, *n_nodes, *n_elem, *n_elem_blk, *n_node_sets, - *n_side_sets); - } - free(name); -} - -/* - * read initialization parameters - */ -void F2C(EXGINI)(int *idexo, char *title, void_int *num_dim, void_int *num_nodes, - void_int *num_elem, void_int *num_elem_blk, void_int *num_node_sets, - void_int *num_side_sets, int *ierr, int titlelen) -{ - int slen; - char *name; - - *ierr = 0; - slen = MAX_LINE_LENGTH; /* max line size */ - if (titlelen != MAX_LINE_LENGTH) { - slen = titlelen; - } - name = malloc((slen + 1) * sizeof(char)); - memset(name, 0, slen + 1); - - *ierr = ex_get_init(*idexo, name, num_dim, num_nodes, num_elem, num_elem_blk, num_node_sets, - num_side_sets); - - ex_fcdcpy(title, slen, name); - free(name); -} - -/* - * write QA records - */ -void F2C(EXPQA)(int *idexo, int *num_qa_records, char *qa_record, int *ierr, int qa_recordlen) -{ - char errmsg[MAX_ERR_LENGTH]; - char **sptr; /* internal string pointer array for malloc - * use */ - int i, ii, iii, slen, alen; - - *ierr = 0; /* default no error */ - - slen = MAX_STR_LENGTH; /* max str size */ - if (qa_recordlen != MAX_STR_LENGTH) { - slen = qa_recordlen; - } - alen = 4; /* qa records are 4 strings deep */ - - /* Allocate space for the name ptr array */ - if (!(sptr = malloc(((*num_qa_records) * alen + 1) * sizeof(char *)))) { - *ierr = EX_MEMFAIL; - return; - } - /* - * Allocate space for each of the strings, where size = slen, place - * ptr into str ptr array, and Copy Fortran qa records to staging - * space - */ - iii = 0; /* offset counter */ - for (i = 0; i < *num_qa_records; i++) { - for (ii = 0; ii < alen; ii++) { - *(sptr + iii) = malloc((slen + 1) * sizeof(char)); - if (*(sptr + iii) == 0) { - free(sptr); /* free up array ptr space */ - *ierr = EX_MEMFAIL; - sprintf(errmsg, "Error: failed to allocate space for qa record %d for file id %d", i, - *idexo); - ex_err(__func__, errmsg, EX_MEMFAIL); - return; - } - /* copy fortran string into allocated space */ - ex_fstrncpy(*(sptr + iii), qa_record + iii * qa_recordlen, slen); - iii++; /* bump char array pointer */ - } - } - *(sptr + iii) = 0; /* set last pointer to null */ - - if (ex_put_qa(*idexo, *num_qa_records, (void *)sptr) == EX_FATAL) - *ierr = EX_FATAL; - - /* Free up the space we used */ - iii = 0; - for (i = 0; i < *num_qa_records; i++) { - for (ii = 0; ii < alen; ii++) { - free(*(sptr + iii)); /* First free up string space */ - iii++; - } - } - free(sptr); /* Then free up array ptr space */ -} - -/* - * read QA records - */ -void F2C(EXGQA)(int *idexo, char *qa_record, int *ierr, int qa_recordlen) -{ - int num_qa_records; - char **sptr; /* internal string pointer array for malloc - * use */ - int i, ii, iii, slen, alen; - - *ierr = 0; /* default no error */ - - slen = MAX_STR_LENGTH; /* max str size */ - if (qa_recordlen != MAX_STR_LENGTH) { - slen = qa_recordlen; - } - alen = 4; /* qa records are 4 strings deep */ - - /* do ExodusII C call to find out how many qa records are avail */ - num_qa_records = ex_inquire_int(*idexo, EX_INQ_QA); - - /* Allocate space for the QA string ptr array */ - if (!(sptr = malloc((num_qa_records * alen + 1) * sizeof(char *)))) { - *ierr = EX_MEMFAIL; - return; - } - /* - * Step 1: Allocate space for each of the strings, where size = slen, - * place string ptr into str ptr array. Step 2: Call routine to get - * qa records Step 3: Copy C qa records to passed Fortran array space - */ - - iii = 0; /* offset counter */ - for (i = 0; i < num_qa_records; i++) { /* pointer allocation loop */ - for (ii = 0; ii < alen; ii++) { - *(sptr + iii) = malloc((slen + 1) * sizeof(char)); - if (*(sptr + iii) == 0) { - *ierr = EX_MEMFAIL; - free(sptr); - return; - } - iii++; /* bump char array pointer */ - } - } - *(sptr + iii) = 0; /* null out last pointer */ - - /* do ExodusII C call to get qa records */ - if (ex_get_qa(*idexo, (void *)sptr) == EX_FATAL) { - *ierr = EX_FATAL; - } - if (*ierr != EX_FATAL) { - iii = 0; /* offset counter */ - for (i = 0; i < num_qa_records; i++) { /* string copy loop */ - for (ii = 0; ii < alen; ii++) { - /* copy fortran string into allocated space */ - ex_fcdcpy(qa_record + iii * qa_recordlen, slen, *(sptr + iii)); - iii++; /* bump char array pointer */ - } - } - } - - /* Free up the space we used */ - iii = 0; - for (i = 0; i < num_qa_records; i++) { - for (ii = 0; ii < alen; ii++) { - free(*(sptr + iii)); /* First free up string space */ - iii++; - } - } - free(sptr); /* Then free up array ptr space */ -} - -/* - * write information records - */ -void F2C(EXPINF)(int *idexo, int *num_info, char *info, int *ierr, int infolen) -{ - char **aptr; /* internal string array pointer for malloc - * use */ - char *sptr; /* internal string pointer for malloc use */ - int i, slen; - - *ierr = 0; /* default no error */ - slen = MAX_LINE_LENGTH; /* max str size */ - if (infolen != MAX_LINE_LENGTH) { - slen = infolen; - } - /* Allocate space for the string ptr array */ - if (!(aptr = malloc(((*num_info) + 1) * sizeof(char *)))) { - *ierr = EX_MEMFAIL; - return; - } - /* Allocate staging space for the info records */ - if (!(sptr = malloc(*num_info * (slen + 1) * sizeof(char)))) { - free(aptr); /* Free up string ptr array */ - *ierr = EX_MEMFAIL; - return; - } - /* Copy Fortran info records to staging space */ - for (i = 0; i < *num_info; i++) { - *(aptr + i) = sptr + i * (slen + 1); /* put address into ptr array */ - ex_fstrncpy(*(aptr + i), info + i * infolen, slen); /* copy string into - * buffer */ - } - *(aptr + i) = 0; /* null out last ptr */ - if (ex_put_info(*idexo, *num_info, aptr) == EX_FATAL) { - *ierr = EX_FATAL; - free(sptr); /* Free up string staging area */ - free(aptr); /* Free up string ptr array */ - return; - } - free(sptr); /* Free up string staging area */ - free(aptr); /* Free up string ptr array */ -} - -/* - * read information records - */ -void F2C(EXGINF)(int *idexo, char *info, int *ierr, int infolen) -{ - char **aptr; /* internal string array pointer for malloc - * use */ - char *sptr; /* internal string pointer for malloc use */ - int i, slen, num_info; - - *ierr = 0; /* default no error */ - - /* do exodusII C call to find out how many info records are avail */ - num_info = ex_inquire_int(*idexo, EX_INQ_INFO); - - slen = MAX_LINE_LENGTH; /* max str size */ - if (infolen != MAX_LINE_LENGTH) { - slen = infolen; - } - /* - * Step 1: Allocate space for string ptr array Step 2: Allocate space - * for info record strings, and put pointers into str ptr array Step - * 3: Do ExodusII call to get records Step 4: Copy strings into - * passed Fortran buffer space - */ - - /* Allocate space for the string ptr array */ - if (!(aptr = malloc((num_info + 1) * sizeof(char *)))) { - *ierr = EX_MEMFAIL; - return; - } - /* Allocate block of space for info strings */ - if (!(sptr = malloc(num_info * (slen + 1) * sizeof(char)))) { - free(aptr); /* Free up string ptr array */ - *ierr = EX_MEMFAIL; - return; - } - for (i = 0; i < num_info; i++) /* Put pointers to the info records in ptr - * array */ - *(aptr + i) = sptr + i * (slen + 1); /* put ptr in string ptr - * array */ - *(aptr + i) = 0; /* null out last pointer */ - - /* Do exodusII call to get info records */ - if (ex_get_info(*idexo, aptr) == EX_FATAL) { - *ierr = EX_FATAL; - free(sptr); - free(aptr); - return; - } - for (i = 0; i < num_info; i++) { /* Copy Fortran info records to - * staging space */ - ex_fcdcpy(info + i * infolen, slen, *(aptr + i)); /* copy string into - * buffer */ - /** printf("[exginf] rec: %d , %s\n",i,*(aptr+i)); **/ - } - - free(sptr); /* Free up string staging area */ - free(aptr); /* Free up string ptr array */ -} - -/* - * write nodal coordinates - */ -void F2C(EXPCOR)(int *idexo, real *x_coor, real *y_coor, real *z_coor, int *ierr) -{ - *ierr = ex_put_coord(*idexo, x_coor, y_coor, z_coor); -} - -/* - * read nodal coordinates - */ -void F2C(EXGCOR)(int *idexo, real *x_coor, real *y_coor, real *z_coor, int *ierr) -{ - *ierr = ex_get_coord(*idexo, x_coor, y_coor, z_coor); -} - -/* - * write coordinate names - */ -void F2C(EXPCON)(int *idexo, char *coord_names, int *ierr, int coord_nameslen) -{ - char **aptr; /* internal array of string pointers for - * malloc use */ - char *sptr; /* internal string pointer for malloc use */ - int i, ndim, slen; - - *ierr = 0; /* default no error */ - - slen = ex_inquire_int(*idexo, EX_INQ_DB_MAX_ALLOWED_NAME_LENGTH); /* max str size */ - if (coord_nameslen < slen) { - slen = coord_nameslen; - } - /* do ExodusII C call to find out how many dimensions */ - ndim = ex_inquire_int(*idexo, EX_INQ_DIM); - - /* Allocate space for the name ptr array */ - if (!(aptr = malloc((ndim + 1) * sizeof(char *)))) { - *ierr = EX_MEMFAIL; - return; - } - /* - * Allocate a block of space for the strings, where size = slen, - * place ptrs into str ptr array, and Copy Fortran coordinate names - * to staging space - */ - - if (!(sptr = malloc(ndim * (slen + 1) * sizeof(char)))) { - *ierr = EX_MEMFAIL; - free(aptr); - return; - } - for (i = 0; i < ndim; i++) { - *(aptr + i) = sptr + i * (slen + 1); - /* copy fortran string into allocated space */ - ex_fstrncpy(*(aptr + i), coord_names + i * coord_nameslen, slen); - } - *(aptr + i) = 0; /* set last pointer to null */ - - if (ex_put_coord_names(*idexo, aptr) == EX_FATAL) { - *ierr = EX_FATAL; - } - /* Free up the space we used */ - free(sptr); /* First free up string space */ - free(aptr); /* Then free up array ptr space */ -} -/* - * read coordinate names - */ -void F2C(EXGCON)(int *idexo, char *coord_names, int *ierr, int coord_nameslen) -{ - char **aptr; /* internal string array pointer for malloc - * use */ - char *sptr; /* internal string pointer for malloc use */ - int ndim; - int i, slen; - - *ierr = 0; /* default no error */ - - slen = ex_inquire_int(*idexo, EX_INQ_MAX_READ_NAME_LENGTH); /* max string size */ - if (coord_nameslen < slen) { - slen = coord_nameslen; - } - /* do ExodusII C call to find out how many dimensions */ - ndim = ex_inquire_int(*idexo, EX_INQ_DIM); - - /* allocate memory to stage the coordinate name ptrs into */ - if (!(aptr = malloc((ndim + 1) * sizeof(char *)))) { - *ierr = EX_MEMFAIL; - return; - } - /* allocate a block of memory to stage the coordinate names into */ - if (!(sptr = malloc(ndim * (slen + 1) * sizeof(char)))) { - *ierr = EX_MEMFAIL; - free(aptr); /* free up array ptr space */ - return; - } - for (i = 0; i < ndim; i++) { /* put pointers to staging space into ptr - * array */ - *(aptr + i) = sptr + i * (slen + 1); - } - - /* do ExodusII C call to get coord name records */ - if (ex_get_coord_names(*idexo, aptr) == EX_FATAL) { - *ierr = EX_FATAL; - free(sptr); /* free up string space */ - free(aptr); /* free up array ptr space */ - return; - } - /* copy C strings to Fortran arrays */ - memset(coord_names, 0, ndim * coord_nameslen); - for (i = 0; i < ndim; i++) { - ex_fcdcpy(coord_names + i * coord_nameslen, slen, *(aptr + i)); /* copy and blank fill */ - } - - free(sptr); /* Free up string buffer space */ - free(aptr); /* Finally, free up array ptr space */ - return; -} - -/* - * write element order map - */ -void F2C(EXPMAP)(int *idexo, void_int *elem_map, int *ierr) -{ - *ierr = ex_put_map(*idexo, elem_map); -} - -/* - * read element order map - */ -void F2C(EXGMAP)(int *idexo, void_int *elem_map, int *ierr) -{ - *ierr = ex_get_map(*idexo, elem_map); -} - -/* - * write concatenated element block parameters - */ -void F2C(EXPCLB)(int *idexo, void_int *elem_blk_id, char *elem_type, void_int *num_elem_this_blk, - void_int *num_nodes_per_elem, void_int *num_attr, int *create_maps, int *ierr, - int elem_typelen) -{ - size_t num_elem_blk; - - char **aptr; /* ptr to temp staging space for string array - * ptrs */ - char * sptr; /* ptr to temp staging space for strings */ - size_t i, slen; - - *ierr = 0; /* default no error */ - - num_elem_blk = ex_inquire_int(*idexo, EX_INQ_ELEM_BLK); - - slen = MAX_STR_LENGTH; /* max str size */ - if (elem_typelen != MAX_STR_LENGTH) { - slen = elem_typelen; - } - /* allocate memory for pointer array */ - if (!(aptr = malloc((num_elem_blk + 1) * sizeof(char *)))) { - *ierr = EX_MEMFAIL; - return; - } - /* allocate memory to stage the element type name into */ - if (!(sptr = malloc(num_elem_blk * (slen + 1) * sizeof(char)))) { - free(aptr); - *ierr = EX_MEMFAIL; - return; - } - /* Copy element type names from Fortran array to staging area */ - for (i = 0; i < num_elem_blk; i++) { - *(aptr + i) = sptr + i * (slen + 1); /* put address into ptr array */ - ex_fstrncpy(*(aptr + i), elem_type + i * elem_typelen, slen); /* copy string into - * buffer */ - } - *(aptr + i) = 0; /* null out last ptr */ - - if (ex_put_concat_elem_block(*idexo, elem_blk_id, aptr, num_elem_this_blk, num_nodes_per_elem, - num_attr, *create_maps) == EX_FATAL) { - *ierr = EX_FATAL; - } - free(sptr); - free(aptr); -} - -/* - * write element block parameters - */ -void F2C(EXPELB)(int *idexo, entity_id *elem_blk_id, char *elem_type, void_int *num_elem_this_blk, - void_int *num_nodes_per_elem, void_int *num_attr, int *ierr, int elem_typelen) -{ - char *sptr; /* internal string pointer for malloc use */ - int slen; - - *ierr = 0; /* default no error */ - - slen = MAX_STR_LENGTH; /* max str size */ - if (elem_typelen != MAX_STR_LENGTH) { - slen = elem_typelen; - } - /* allocate memory to stage the element type name into */ - if (!(sptr = malloc((slen + 1) * sizeof(char)))) { - *ierr = EX_MEMFAIL; - return; - } - /* Copy element type names from Fortran array to staging area */ - ex_fstrncpy(sptr, elem_type, slen); - - if (ex_int64_status(*idexo) & EX_BULK_INT64_API) { - int64_t *n_elem_this_blk = num_elem_this_blk; - int64_t *n_nodes_per_elem = num_nodes_per_elem; - int64_t *n_attr = num_attr; - - *ierr = - ex_put_elem_block(*idexo, *elem_blk_id, sptr, *n_elem_this_blk, *n_nodes_per_elem, *n_attr); - } - else { - int *n_elem_this_blk = num_elem_this_blk; - int *n_nodes_per_elem = num_nodes_per_elem; - int *n_attr = num_attr; - - *ierr = - ex_put_elem_block(*idexo, *elem_blk_id, sptr, *n_elem_this_blk, *n_nodes_per_elem, *n_attr); - } - free(sptr); -} - -/* - * read element block parameters - */ -void F2C(EXGELB)(int *idexo, entity_id *elem_blk_id, char *elem_type, void_int *num_elem_this_blk, - void_int *num_nodes_per_elem, void_int *num_attr, int *ierr, int elem_typelen) -{ - char *sptr; /* internal string pointer for malloc use */ - int slen; - - *ierr = 0; - - slen = MAX_STR_LENGTH; /* max str size */ - if (elem_typelen != MAX_STR_LENGTH) { - slen = elem_typelen; - } - /* allocate memory to stage the element type names into */ - if (!(sptr = malloc((slen + 1) * sizeof(char)))) { - *ierr = EX_MEMFAIL; - return; - } - if (ex_get_elem_block(*idexo, *elem_blk_id, sptr, num_elem_this_blk, num_nodes_per_elem, - num_attr) == EX_FATAL) { - *ierr = EX_FATAL; - return; - } - /* Copy element type name from staging area to Fortran array */ - memset(elem_type, 0, elem_typelen); - ex_fcdcpy(elem_type, slen, sptr); - free(sptr); -} - -/* - * read element blocks IDs - */ -void F2C(EXGEBI)(int *idexo, void_int *elem_blk_ids, int *ierr) -{ - *ierr = ex_get_elem_blk_ids(*idexo, elem_blk_ids); -} - -/* - * write element block connectivity - */ -void F2C(EXPELC)(int *idexo, entity_id *elem_blk_id, void_int *connect, int *ierr) -{ - *ierr = ex_put_elem_conn(*idexo, *elem_blk_id, connect); -} - -/* - * read element block connectivity - */ -void F2C(EXGELC)(int *idexo, entity_id *elem_blk_id, void_int *connect, int *ierr) -{ - *ierr = ex_get_elem_conn(*idexo, *elem_blk_id, connect); -} - -/* - * write entity count-per-polyhedra information for nsided block - */ -void F2C(EXPECPP)(int *idexo, int *obj_type, entity_id *elem_blk_id, int *counts, int *ierr) -{ - *ierr = - ex_put_entity_count_per_polyhedra(*idexo, (ex_entity_type)*obj_type, *elem_blk_id, counts); -} - -/* - * read entity count-per-polyhedra information for nsided block - */ -void F2C(EXGECPP)(int *idexo, int *obj_type, entity_id *elem_blk_id, int *counts, int *ierr) -{ - *ierr = - ex_get_entity_count_per_polyhedra(*idexo, (ex_entity_type)*obj_type, *elem_blk_id, counts); -} - -/* - * write element block attributes - */ -void F2C(EXPEAT)(int *idexo, entity_id *elem_blk_id, real *attrib, int *ierr) -{ - *ierr = ex_put_elem_attr(*idexo, *elem_blk_id, attrib); -} - -/* - * read element block attributes - */ -void F2C(EXGEAT)(int *idexo, entity_id *elem_blk_id, real *attrib, int *ierr) -{ - *ierr = ex_get_elem_attr(*idexo, *elem_blk_id, attrib); -} - -/* - * read element block attribute names - */ -void F2C(EXGEAN)(int *idexo, entity_id *elem_blk_id, int *num_attr, char *names, int *ierr, - int nameslen) -{ - char **aptr; /* ptr to temp staging space for string array - * ptrs */ - char *sptr; /* ptr to temp staging space for strings */ - int i, slen; - - *ierr = 0; /* default no error */ - - slen = ex_inquire_int(*idexo, EX_INQ_MAX_READ_NAME_LENGTH); /* max string size */ - if (nameslen < slen) { - slen = nameslen; - } - /* allocate memory to for pointer array */ - if (!(aptr = malloc((*num_attr + 1) * sizeof(char *)))) { - *ierr = EX_MEMFAIL; - return; - } - /* Allocate staging space for the variable names */ - if (!(sptr = malloc(*num_attr * (slen + 1) * sizeof(char)))) { - *ierr = EX_MEMFAIL; - free(aptr); /* Free up string ptr array */ - return; - } - for (i = 0; i < *num_attr; i++) - *(aptr + i) = sptr + i * (slen + 1); /* put address into ptr array */ - *(aptr + i) = 0; /* null out last ptr */ - - *ierr = 0; - if (ex_get_elem_attr_names(*idexo, *elem_blk_id, aptr) == EX_FATAL) { - *ierr = EX_FATAL; - free(sptr); /* free up allocated space */ - free(aptr); - return; - } - /* Copy Fortran names from staging space */ - memset(names, 0, *num_attr * nameslen); - for (i = 0; i < *num_attr; i++) { - ex_fcdcpy(names + i * nameslen, slen, *(aptr + i)); /* copy str into Fortran - * buffer */ - } - - free(sptr); /* Free up string staging area */ - free(aptr); /* Free up string ptr array */ -} - -/* - * write element block attribute names - */ -void F2C(EXPEAN)(int *idexo, entity_id *elem_blk_id, int *num_attr, char *names, int *ierr, - int nameslen) -{ - char **aptr; /* ptr to temp staging space for string array - * ptrs */ - char *sptr; /* ptr to temp staging space for strings */ - int i, slen; - - *ierr = 0; /* default no error */ - - slen = ex_inquire_int(*idexo, EX_INQ_DB_MAX_ALLOWED_NAME_LENGTH); /* max str size */ - if (nameslen < slen) { - slen = nameslen; - } - /* allocate memory to for pointer array */ - if (!(aptr = malloc((*num_attr + 1) * sizeof(char *)))) { - *ierr = EX_MEMFAIL; - return; - } - /* Allocate staging space for the variable names */ - if (!(sptr = malloc(*num_attr * (slen + 1) * sizeof(char)))) { - *ierr = EX_MEMFAIL; - free(aptr); /* Free up string ptr array */ - return; - } - /* Copy Fortran names to staging space */ - for (i = 0; i < *num_attr; i++) { - *(aptr + i) = sptr + i * (slen + 1); /* put address into ptr array */ - ex_fstrncpy(*(aptr + i), names + i * nameslen, slen); /* copy string into - * buffer */ - } - *(aptr + i) = 0; /* null out last ptr */ - - *ierr = 0; - if (ex_put_elem_attr_names(*idexo, *elem_blk_id, aptr) == EX_FATAL) { - *ierr = EX_FATAL; - } - free(sptr); /* Free up string staging area */ - free(aptr); /* Free up string ptr array */ -} - -/* - * write object names - */ -void F2C(EXPNAMS)(int *idexo, int *type, int *num_obj, char *names, int *ierr, int nameslen) -{ - char **aptr; /* ptr to temp staging space for string array - * ptrs */ - char *sptr; /* ptr to temp staging space for strings */ - int i, slen; - - *ierr = 0; /* default no error */ - - slen = ex_inquire_int(*idexo, EX_INQ_DB_MAX_ALLOWED_NAME_LENGTH); /* max str size */ - if (nameslen < slen) { - slen = nameslen; - } - /* allocate memory for pointer array */ - if (!(aptr = malloc((*num_obj + 1) * sizeof(char *)))) { - *ierr = EX_MEMFAIL; - return; - } - /* Allocate staging space for the variable names */ - if (!(sptr = malloc(*num_obj * (slen + 1) * sizeof(char)))) { - free(aptr); /* Free up string ptr array */ - *ierr = EX_MEMFAIL; - return; - } - /* Copy Fortran names to staging space */ - for (i = 0; i < *num_obj; i++) { - *(aptr + i) = sptr + i * (slen + 1); /* put address into ptr array */ - ex_fstrncpy(*(aptr + i), names + i * nameslen, slen); /* copy string into - * buffer */ - } - *(aptr + i) = 0; /* null out last ptr */ - /* do ExodusII C call to write results variables names */ - if (ex_put_names(*idexo, (ex_entity_type)*type, aptr) == EX_FATAL) { - *ierr = EX_FATAL; - } - free(sptr); /* Free up string staging area */ - free(aptr); /* Free up string ptr array */ -} - -/* - * read object names - */ -void F2C(EXGNAMS)(int *idexo, int *type, int *num_obj, char *names, int *ierr, int nameslen) -{ - char **aptr; /* ptr to temp staging space for string array - * ptrs */ - char *sptr; /* ptr to temp staging space for strings */ - int i, slen; - - *ierr = 0; /* default no error */ - - slen = ex_inquire_int(*idexo, EX_INQ_MAX_READ_NAME_LENGTH); /* max string size */ - if (nameslen < slen) { - slen = nameslen; - } - /* allocate memory to for pointer array */ - if (!(aptr = malloc((*num_obj + 1) * sizeof(char *)))) { - *ierr = EX_MEMFAIL; - return; - } - /* Allocate staging space for the variable names */ - if (!(sptr = malloc(*num_obj * (slen + 1) * sizeof(char)))) { - *ierr = EX_MEMFAIL; - free(aptr); /* Free up string ptr array */ - return; - } - for (i = 0; i < *num_obj; i++) - *(aptr + i) = sptr + i * (slen + 1); /* put address into ptr array */ - *(aptr + i) = 0; /* null out last ptr */ - - /* do ExodusII C call to read results variables names */ - if (ex_get_names(*idexo, (ex_entity_type)*type, aptr) == EX_FATAL) { - *ierr = EX_FATAL; - free(sptr); /* free up allocated space */ - free(aptr); - return; - } - /* Copy Fortran names from staging space */ - memset(names, 0, *num_obj * nameslen); - for (i = 0; i < *num_obj; i++) { - ex_fcdcpy(names + i * nameslen, slen, *(aptr + i)); /* copy str into Fortran - * buffer */ - } - - free(sptr); /* Free up string staging area */ - free(aptr); /* Free up string ptr array */ -} - -/* - * write property array names - */ -void F2C(EXPPN)(int *idexo, int *obj_type, int *num_props, char *prop_names, int *ierr, - int prop_nameslen) -{ - char **aptr; /* internal string array pointer for malloc - * use */ - char *sptr; /* internal string pointer for malloc use */ - int i, slen; - - *ierr = 0; - - slen = ex_inquire_int(*idexo, EX_INQ_DB_MAX_ALLOWED_NAME_LENGTH); /* max str size */ - if (prop_nameslen < slen) { - slen = prop_nameslen; - } - /* Allocate space for the name ptr array */ - if (!(aptr = malloc((*num_props + 1) * sizeof(char *)))) { - *ierr = EX_MEMFAIL; - return; - } - /* - * Allocate a block of space for the strings, where size = slen, - * place ptrs into str ptr array, and Copy Fortran coordinate names - * to staging space - */ - - if (!(sptr = malloc((*num_props) * (slen + 1) * sizeof(char)))) { - *ierr = EX_MEMFAIL; - free(aptr); - return; - } - for (i = 0; i < *num_props; i++) { - *(aptr + i) = sptr + i * (slen + 1); - /* copy fortran string into allocated space */ - ex_fstrncpy(*(aptr + i), prop_names + i * prop_nameslen, slen); - } - *(aptr + i) = 0; /* set last pointer to null */ - - if (ex_put_prop_names(*idexo, (ex_entity_type)*obj_type, *num_props, aptr) == EX_FATAL) { - *ierr = EX_FATAL; - } - /* Free up the space we used */ - free(sptr); /* First free up string space */ - free(aptr); /* Then free up array ptr space */ -} - -/* - * read property array names - */ -void F2C(EXGPN)(int *idexo, int *obj_type, char *prop_names, int *ierr, int prop_nameslen) -{ - char errmsg[MAX_ERR_LENGTH]; - char **aptr; /* internal string array pointer for malloc - * use */ - char * sptr; /* internal string pointer for malloc use */ - int i, slen; - ex_inquiry inq_code; - int num_props; - - *ierr = 0; - - slen = ex_inquire_int(*idexo, EX_INQ_MAX_READ_NAME_LENGTH); /* max string size */ - if (prop_nameslen < slen) { - slen = prop_nameslen; - } - switch ((ex_entity_type)*obj_type) { - case EX_ELEM_BLOCK: inq_code = EX_INQ_EB_PROP; break; - case EX_NODE_SET: inq_code = EX_INQ_NS_PROP; break; - case EX_SIDE_SET: inq_code = EX_INQ_SS_PROP; break; - case EX_ELEM_MAP: inq_code = EX_INQ_EM_PROP; break; - case EX_NODE_MAP: inq_code = EX_INQ_NM_PROP; break; - default: - exerrval = EX_BADPARAM; - *ierr = EX_BADPARAM; - sprintf(errmsg, "Error: object type %d not supported; file id %d", *obj_type, *idexo); - ex_err(__func__, errmsg, exerrval); - return; - } - - /* do ExodusII C call to find out how many properties */ - num_props = ex_inquire_int(*idexo, inq_code); - - /* Allocate space for the name ptr array */ - if (!(aptr = malloc((num_props + 1) * sizeof(char *)))) { - *ierr = EX_MEMFAIL; - return; - } - /* - * Allocate a block of space for the strings, where size = slen, - * place ptrs into str ptr array, and Copy Fortran coordinate names - * to staging space - */ - - if (!(sptr = malloc(num_props * (slen + 1) * sizeof(char)))) { - *ierr = EX_MEMFAIL; - free(aptr); - return; - } - memset(sptr, 0, num_props * (slen + 1)); - - for (i = 0; i < num_props; i++) - *(aptr + i) = sptr + i * (slen + 1); /* put ptrs to staging space - * into ptr array */ - *(aptr + i) = 0; /* set last pointer to null */ - - /* do ExodusII C call to get property name records */ - if (ex_get_prop_names(*idexo, (ex_entity_type)*obj_type, aptr) == EX_FATAL) { - *ierr = EX_FATAL; - free(sptr); /* free up string space */ - free(aptr); /* free up array ptr space */ - return; - } - /* copy C strings to Fortran arrays */ - memset(prop_names, 0, num_props * prop_nameslen); - for (i = 0; i < num_props; i++) { - ex_fcdcpy(prop_names + i * prop_nameslen, slen, *(aptr + i)); /* copy and blank fill */ - } - - /* Free up the space we used */ - free(sptr); /* First free up string space */ - free(aptr); /* Then free up array ptr space */ -} - -/* - * write object property - */ -void F2C(EXPP)(int *idexo, int *obj_type, entity_id *obj_id, char *prop_name, entity_id *value, - int *ierr, int prop_namelen) -{ - char *sptr; /* internal string pointer for malloc use */ - int slen; - - *ierr = 0; - - slen = ex_inquire_int(*idexo, EX_INQ_DB_MAX_ALLOWED_NAME_LENGTH); /* max str size */ - if (prop_namelen < slen) { - slen = prop_namelen; - } - /* allocate memory to stage the property name into */ - if (!(sptr = malloc((slen + 1) * sizeof(char)))) { - *ierr = EX_MEMFAIL; - return; - } - /* Copy property name from Fortran string to staging area */ - ex_fstrncpy(sptr, prop_name, slen); - - *ierr = ex_put_prop(*idexo, (ex_entity_type)*obj_type, *obj_id, sptr, *value); - - free(sptr); -} - -/* - * read object property - */ -void F2C(EXGP)(int *idexo, int *obj_type, entity_id *obj_id, char *prop_name, void_int *value, - int *ierr, int prop_namelen) -{ - char *sptr; /* internal string pointer for malloc use */ - int slen; - - *ierr = 0; - - slen = ex_inquire_int(*idexo, EX_INQ_MAX_READ_NAME_LENGTH); /* max string size */ - if (prop_namelen < slen) { - slen = prop_namelen; - } - /* allocate memory to stage the property name into */ - if (!(sptr = malloc((slen + 1) * sizeof(char)))) { - *ierr = EX_MEMFAIL; - } - /* Copy property name from Fortran string to staging area */ - ex_fstrncpy(sptr, prop_name, slen); - - /* use exodusII C routine to get the property value */ - if (ex_get_prop(*idexo, (ex_entity_type)*obj_type, *obj_id, sptr, value) == EX_FATAL) { - *ierr = EX_FATAL; - } - free(sptr); -} - -/* - * read object property array - */ -void F2C(EXGPA)(int *idexo, int *obj_type, char *prop_name, void_int *values, int *ierr, - int prop_namelen) -{ - char *sptr; /* internal string pointer for malloc use */ - int slen; - - *ierr = 0; - - slen = ex_inquire_int(*idexo, EX_INQ_MAX_READ_NAME_LENGTH); /* max string size */ - if (prop_namelen < slen) { - slen = prop_namelen; - } - /* allocate memory to stage the property name into */ - if (!(sptr = malloc((slen + 1) * sizeof(char)))) { - *ierr = EX_MEMFAIL; - } - memset(sptr, 0, slen + 1); - - /* Copy property name from Fortran string to staging area */ - ex_fstrncpy(sptr, prop_name, slen); - - /* use exodusII C routine to get the values array */ - if (ex_get_prop_array(*idexo, (ex_entity_type)*obj_type, sptr, values) == EX_FATAL) { - *ierr = EX_FATAL; - } - free(sptr); -} - -/* - * write object property array - */ -void F2C(EXPPA)(int *idexo, int *obj_type, char *prop_name, void_int *values, int *ierr, - int prop_namelen) -{ - char *sptr; /* internal string pointer for malloc use */ - int slen; - - *ierr = 0; - - slen = ex_inquire_int(*idexo, EX_INQ_DB_MAX_ALLOWED_NAME_LENGTH); /* max str size */ - if (prop_namelen < slen) { - slen = prop_namelen; - } - /* allocate memory to stage the property name into */ - if (!(sptr = malloc((slen + 1) * sizeof(char)))) { - *ierr = EX_MEMFAIL; - } - /* Copy property name from Fortran string to staging area */ - ex_fstrncpy(sptr, prop_name, slen); - - /* Use exodusII C routine to store the property values */ - if (ex_put_prop_array(*idexo, (ex_entity_type)*obj_type, sptr, values) == EX_FATAL) { - *ierr = EX_FATAL; - } - free(sptr); -} - -/* - * write node set parameters - */ -void F2C(EXPNP)(int *idexo, entity_id *node_set_id, void_int *num_nodes_in_set, - void_int *num_dist_in_set, int *ierr) -{ - if (ex_int64_status(*idexo) & EX_BULK_INT64_API) { - int64_t nnis = *(int64_t *)num_nodes_in_set; - int64_t ndis = *(int64_t *)num_dist_in_set; - *ierr = ex_put_node_set_param(*idexo, *node_set_id, nnis, ndis); - } - else { - int nnis = *(int *)num_nodes_in_set; - int ndis = *(int *)num_dist_in_set; - *ierr = ex_put_node_set_param(*idexo, *node_set_id, nnis, ndis); - } -} - -/* - * read node set parameters - */ -void F2C(EXGNP)(int *idexo, entity_id *node_set_id, void_int *num_nodes_in_set, - void_int *num_dist_in_set, int *ierr) -{ - *ierr = ex_get_node_set_param(*idexo, *node_set_id, num_nodes_in_set, num_dist_in_set); -} - -/* - * write node set - */ -void F2C(EXPNS)(int *idexo, entity_id *node_set_id, void_int *node_set_node_list, int *ierr) -{ - *ierr = ex_put_node_set(*idexo, *node_set_id, node_set_node_list); -} - -/* - * write node set dist factors - */ -void F2C(EXPNSD)(int *idexo, entity_id *node_set_id, real *node_set_dist_fact, int *ierr) -{ - *ierr = ex_put_node_set_dist_fact(*idexo, *node_set_id, node_set_dist_fact); -} - -/* - * read node set - */ -void F2C(EXGNS)(int *idexo, entity_id *node_set_id, void_int *node_set_node_list, int *ierr) -{ - *ierr = ex_get_node_set(*idexo, *node_set_id, node_set_node_list); -} - -/* - * read node set dist factors - */ -void F2C(EXGNSD)(int *idexo, entity_id *node_set_id, real *node_set_dist_fact, int *ierr) -{ - *ierr = ex_get_node_set_dist_fact(*idexo, *node_set_id, node_set_dist_fact); -} - -/* - * read node sets IDs - */ -void F2C(EXGNSI)(int *idexo, void_int *node_set_ids, int *ierr) -{ - *ierr = ex_get_node_set_ids(*idexo, node_set_ids); -} - -/* - * write concatenated node sets - */ -void F2C(EXPCNS)(int *idexo, void_int *node_set_ids, void_int *num_nodes_per_set, - void_int *num_dist_per_set, void_int *node_sets_node_index, - void_int *node_sets_dist_index, void_int *node_sets_node_list, - real *node_sets_dist_fact, int *ierr) -{ - size_t num_node_sets, i; - int int_size; - - void_int *node_index_ptr, *dist_index_ptr; - - *ierr = 0; - - num_node_sets = ex_inquire_int(*idexo, EX_INQ_NODE_SETS); - - int_size = sizeof(int); - if (ex_int64_status(*idexo) & EX_BULK_INT64_API) { - int_size = sizeof(int64_t); - } - - /* allocate memory for C node index array */ - if (!(node_index_ptr = malloc(num_node_sets * int_size))) { - *ierr = EX_MEMFAIL; - return; - } - /* allocate memory for C dist factor index array */ - if (!(dist_index_ptr = malloc(num_node_sets * int_size))) { - free(node_index_ptr); - *ierr = EX_MEMFAIL; - return; - } - - if (int_size == sizeof(int64_t)) { - for (i = 0; i < num_node_sets; i++) { /* change from 1-based to 0 index */ - ((int64_t *)node_index_ptr)[i] = ((int64_t *)node_sets_node_index)[i] - 1; - ((int64_t *)dist_index_ptr)[i] = ((int64_t *)node_sets_dist_index)[i] - 1; - } - } - else { - for (i = 0; i < num_node_sets; i++) { /* change from 1-based to 0 index */ - ((int *)node_index_ptr)[i] = ((int *)node_sets_node_index)[i] - 1; - ((int *)dist_index_ptr)[i] = ((int *)node_sets_dist_index)[i] - 1; - } - } - - *ierr = ex_put_concat_node_sets(*idexo, node_set_ids, num_nodes_per_set, num_dist_per_set, - node_index_ptr, dist_index_ptr, node_sets_node_list, - node_sets_dist_fact); - free(node_index_ptr); - free(dist_index_ptr); -} - -/* - * read concatenated node sets - */ -void F2C(EXGCNS)(int *idexo, void_int *node_set_ids, void_int *num_nodes_per_set, - void_int *num_dist_per_set, void_int *node_sets_node_index, - void_int *node_sets_dist_index, void_int *node_sets_node_list, - real *node_sets_dist_fact, int *ierr) -{ - size_t num_node_sets, i; - - *ierr = ex_get_concat_node_sets(*idexo, node_set_ids, num_nodes_per_set, num_dist_per_set, - node_sets_node_index, node_sets_dist_index, node_sets_node_list, - node_sets_dist_fact); - - num_node_sets = ex_inquire_int(*idexo, EX_INQ_NODE_SETS); - - if (ex_int64_status(*idexo) & EX_BULK_INT64_API) { - for (i = 0; i < num_node_sets; i++) { /* change from 0-based to 1 index */ - ((int64_t *)node_sets_node_index)[i] += 1; - ((int64_t *)node_sets_dist_index)[i] += 1; - } - } - else { - for (i = 0; i < num_node_sets; i++) { /* change from 0-based to 1 index */ - ((int *)node_sets_node_index)[i] += 1; - ((int *)node_sets_dist_index)[i] += 1; - } - } -} - -/* - * write side set parameters - */ -void F2C(EXPSP)(int *idexo, entity_id *side_set_id, void_int *num_sides_in_set, - void_int *num_df_in_set, int *ierr) -{ - if (ex_int64_status(*idexo) & EX_BULK_INT64_API) { - int64_t nsis = *(int64_t *)num_sides_in_set; - int64_t ndis = *(int64_t *)num_df_in_set; - *ierr = ex_put_side_set_param(*idexo, *side_set_id, nsis, ndis); - } - else { - int nsis = *(int *)num_sides_in_set; - int ndis = *(int *)num_df_in_set; - *ierr = ex_put_side_set_param(*idexo, *side_set_id, nsis, ndis); - } -} - -/* - * read side set parameters - */ -void F2C(EXGSP)(int *idexo, entity_id *side_set_id, void_int *num_sides_in_set, - void_int *num_df_in_set, int *ierr) -{ - *ierr = ex_get_side_set_param(*idexo, *side_set_id, num_sides_in_set, num_df_in_set); -} - -/* - * get side set node list length - */ -void F2C(EXGSNL)(int *idexo, entity_id *side_set_id, void_int *num_nodes_in_set, int *ierr) -{ - *ierr = ex_get_side_set_node_list_len(*idexo, *side_set_id, num_nodes_in_set); -} - -/* - * write side set - */ -void F2C(EXPSS)(int *idexo, entity_id *side_set_id, void_int *side_set_elem_list, - void_int *side_set_side_list, int *ierr) -{ - *ierr = ex_put_side_set(*idexo, *side_set_id, side_set_elem_list, side_set_side_list); -} - -/* - * read side set - */ -void F2C(EXGSS)(int *idexo, entity_id *side_set_id, void_int *side_set_elem_list, - void_int *side_set_side_list, int *ierr) -{ - *ierr = ex_get_side_set(*idexo, *side_set_id, side_set_elem_list, side_set_side_list); -} - -/* - * write side set distribution factors - */ -void F2C(EXPSSD)(int *idexo, entity_id *side_set_id, real *side_set_dist_fact, int *ierr) -{ - *ierr = ex_put_side_set_dist_fact(*idexo, *side_set_id, side_set_dist_fact); -} - -/* - * read side set distribution factors - */ -void F2C(EXGSSD)(int *idexo, entity_id *side_set_id, real *side_set_dist_fact, int *ierr) -{ - *ierr = ex_get_side_set_dist_fact(*idexo, *side_set_id, side_set_dist_fact); -} - -/* - * read side sets IDs - */ -void F2C(EXGSSI)(int *idexo, void_int *side_set_ids, int *ierr) -{ - *ierr = ex_get_side_set_ids(*idexo, side_set_ids); -} - -/* - * write concatenated side sets - */ -void F2C(EXPCSS)(int *idexo, void_int *side_set_ids, void_int *num_elem_per_set, - void_int *num_dist_per_set, void_int *side_sets_elem_index, - void_int *side_sets_dist_index, void_int *side_sets_elem_list, - void_int *side_sets_side_list, real *side_sets_dist_fact, int *ierr) -{ - size_t num_side_sets, i; - void_int *elem_index_ptr, *dist_index_ptr; - int int_size; - - *ierr = 0; - - num_side_sets = ex_inquire_int(*idexo, EX_INQ_SIDE_SETS); - - int_size = sizeof(int); - if (ex_int64_status(*idexo) & EX_BULK_INT64_API) { - int_size = sizeof(int64_t); - } - - /* allocate memory for C element index array */ - if (!(elem_index_ptr = malloc(num_side_sets * int_size))) { - *ierr = EX_MEMFAIL; - return; - } - - /* allocate memory for C dist factor index array */ - if (!(dist_index_ptr = malloc(num_side_sets * int_size))) { - free(elem_index_ptr); - *ierr = EX_MEMFAIL; - return; - } - - if (int_size == sizeof(int64_t)) { - for (i = 0; i < num_side_sets; i++) { /* change from 1-based to 0 index */ - ((int64_t *)elem_index_ptr)[i] = ((int64_t *)side_sets_elem_index)[i] - 1; - ((int64_t *)dist_index_ptr)[i] = ((int64_t *)side_sets_dist_index)[i] - 1; - } - } - else { - for (i = 0; i < num_side_sets; i++) { /* change from 1-based to 0 index */ - ((int *)elem_index_ptr)[i] = ((int *)side_sets_elem_index)[i] - 1; - ((int *)dist_index_ptr)[i] = ((int *)side_sets_dist_index)[i] - 1; - } - } - - *ierr = ex_put_concat_side_sets(*idexo, side_set_ids, num_elem_per_set, num_dist_per_set, - elem_index_ptr, dist_index_ptr, side_sets_elem_list, - side_sets_side_list, side_sets_dist_fact); - free(elem_index_ptr); - free(dist_index_ptr); -} - -/* - * read concatenated side sets - */ -void F2C(EXGCSS)(int *idexo, void_int *side_set_ids, void_int *num_elem_per_set, - void_int *num_dist_per_set, void_int *side_sets_elem_index, - void_int *side_sets_dist_index, void_int *side_sets_elem_list, - void_int *side_sets_side_list, real *side_sets_dist_fact, int *ierr) -{ - size_t i, num_side_sets; - - *ierr = 0; - - num_side_sets = ex_inquire_int(*idexo, EX_INQ_SIDE_SETS); - - *ierr = ex_get_concat_side_sets(*idexo, side_set_ids, num_elem_per_set, num_dist_per_set, - side_sets_elem_index, side_sets_dist_index, side_sets_elem_list, - side_sets_side_list, side_sets_dist_fact); - - if (ex_int64_status(*idexo) & EX_BULK_INT64_API) { - for (i = 0; i < num_side_sets; i++) { /* change from 0-based to 1 index */ - ((int64_t *)side_sets_elem_index)[i] += 1; - ((int64_t *)side_sets_dist_index)[i] += 1; - } - } - else { - for (i = 0; i < num_side_sets; i++) { /* change from 0-based to 1 index */ - ((int *)side_sets_elem_index)[i] += 1; - ((int *)side_sets_dist_index)[i] += 1; - } - } -} - -/* - * read concatenated side sets (no dist factors) - */ -void F2C(EXGCSSF)(int *idexo, void_int *side_set_ids, void_int *num_elem_per_set, - void_int *num_dist_per_set, void_int *side_sets_elem_index, - void_int *side_sets_dist_index, void_int *side_sets_elem_list, - void_int *side_sets_side_list, int *ierr) -{ - size_t i, num_side_sets; - - num_side_sets = ex_inquire_int(*idexo, EX_INQ_SIDE_SETS); - - *ierr = ex_get_concat_side_sets(*idexo, side_set_ids, num_elem_per_set, num_dist_per_set, - side_sets_elem_index, side_sets_dist_index, side_sets_elem_list, - side_sets_side_list, 0); - - if (ex_int64_status(*idexo) & EX_BULK_INT64_API) { - for (i = 0; i < num_side_sets; i++) { /* change from 0-based to 1 index */ - ((int64_t *)side_sets_elem_index)[i] += 1; - ((int64_t *)side_sets_dist_index)[i] += 1; - } - } - else { - for (i = 0; i < num_side_sets; i++) { /* change from 0-based to 1 index */ - ((int *)side_sets_elem_index)[i] += 1; - ((int *)side_sets_dist_index)[i] += 1; - } - } -} - -/* - * write results variables parameters - */ -void F2C(EXPVP)(int *idexo, char *var_type, int *num_vars, int *ierr, int var_typelen) -{ - *ierr = ex_put_var_param(*idexo, var_type, *num_vars); -} - -/* - * read results variables parameters - */ -void F2C(EXGVP)(int *idexo, char *var_type, int *num_vars, int *ierr, int var_typelen) -{ - *ierr = ex_get_var_param(*idexo, var_type, num_vars); -} - -/* - * write results variables names - */ -void F2C(EXPVAN)(int *idexo, char *var_type, int *num_vars, char *var_names, int *ierr, - int var_typelen, int var_nameslen) -{ - char **aptr; /* ptr to temp staging space for string array - * ptrs */ - char *sptr; /* ptr to temp staging space for strings */ - int i, slen; - - *ierr = 0; /* default no error */ - - slen = ex_inquire_int(*idexo, EX_INQ_DB_MAX_ALLOWED_NAME_LENGTH); /* max str size */ - if (var_nameslen < slen) { - slen = var_nameslen; - } - /* allocate memory for pointer array */ - if (!(aptr = malloc((*num_vars + 1) * sizeof(char *)))) { - *ierr = EX_MEMFAIL; - return; - } - /* Allocate staging space for the variable names */ - if (!(sptr = malloc(*num_vars * (slen + 1) * sizeof(char)))) { - free(aptr); /* Free up string ptr array */ - *ierr = EX_MEMFAIL; - return; - } - /* Copy Fortran variable names to staging space */ - for (i = 0; i < *num_vars; i++) { - *(aptr + i) = sptr + i * (slen + 1); /* put address into ptr array */ - ex_fstrncpy(*(aptr + i), var_names + i * var_nameslen, slen); /* copy string into - * buffer */ - } - *(aptr + i) = 0; /* null out last ptr */ - /* do ExodusII C call to write results variables names */ - if (ex_put_var_names(*idexo, var_type, *num_vars, aptr) == EX_FATAL) { - *ierr = EX_FATAL; - } - free(sptr); /* Free up string staging area */ - free(aptr); /* Free up string ptr array */ -} -/* - * read results variables names - */ -void F2C(EXGVAN)(int *idexo, char *var_type, int *num_vars, char *var_names, int *ierr, - int var_typelen, int var_nameslen) -{ - char **aptr; /* ptr to temp staging space for string array - * ptrs */ - char *sptr; /* ptr to temp staging space for strings */ - int i, slen; - - *ierr = 0; /* default no error */ - - slen = ex_inquire_int(*idexo, EX_INQ_MAX_READ_NAME_LENGTH); /* max string size */ - if (var_nameslen < slen) { - slen = var_nameslen; - } - /* allocate memory to for pointer array */ - if (!(aptr = malloc((*num_vars + 1) * sizeof(char *)))) { - *ierr = EX_MEMFAIL; - return; - } - /* Allocate staging space for the variable names */ - if (!(sptr = malloc(*num_vars * (slen + 1) * sizeof(char)))) { - *ierr = EX_MEMFAIL; - free(aptr); /* Free up string ptr array */ - return; - } - for (i = 0; i < *num_vars; i++) - *(aptr + i) = sptr + i * (slen + 1); /* put address into ptr array */ - *(aptr + i) = 0; /* null out last ptr */ - - /* do ExodusII C call to read results variables names */ - if (ex_get_var_names(*idexo, var_type, *num_vars, aptr) == EX_FATAL) { - *ierr = EX_FATAL; - free(sptr); /* free up allocated space */ - free(aptr); - return; - } - /* Copy Fortran variable names to staging space */ - memset(var_names, 0, *num_vars * var_nameslen); - for (i = 0; i < *num_vars; i++) { - ex_fcdcpy(var_names + i * var_nameslen, slen, *(aptr + i)); /* copy str into Fortran - * buffer */ - } - - free(sptr); /* Free up string staging area */ - free(aptr); /* Free up string ptr array */ -} - -/* - * write element variable truth table - */ -void F2C(EXPVTT)(int *idexo, int *num_elem_blk, int *num_elem_var, int *elem_var_tab, int *ierr) -{ - *ierr = ex_put_elem_var_tab(*idexo, *num_elem_blk, *num_elem_var, elem_var_tab); -} - -/* - * write nodeset variable truth table - */ -void F2C(EXPNSTT)(int *idexo, int *num_entity, int *num_var, int *var_tab, int *ierr) -{ - *ierr = ex_put_nset_var_tab(*idexo, *num_entity, *num_var, var_tab); -} - -/* - * write sideset variable truth table - */ -void F2C(EXPSSTT)(int *idexo, int *num_entity, int *num_var, int *var_tab, int *ierr) -{ - *ierr = ex_put_sset_var_tab(*idexo, *num_entity, *num_var, var_tab); -} - -/* - * read element variable truth table - */ -void F2C(EXGVTT)(int *idexo, int *num_elem_blk, int *num_elem_var, int *elem_var_tab, int *ierr) -{ - *ierr = ex_get_elem_var_tab(*idexo, *num_elem_blk, *num_elem_var, elem_var_tab); -} - -/* - * read nodeset variable truth table - */ -void F2C(EXGNSTT)(int *idexo, int *num_entity, int *num_var, int *var_tab, int *ierr) -{ - *ierr = ex_get_nset_var_tab(*idexo, *num_entity, *num_var, var_tab); -} - -/* - * read sideset variable truth table - */ -void F2C(EXGSSTT)(int *idexo, int *num_entity, int *num_var, int *var_tab, int *ierr) -{ - *ierr = ex_get_sset_var_tab(*idexo, *num_entity, *num_var, var_tab); -} - -/* - * write global variable values at time step - */ -void F2C(EXPGV)(int *idexo, int *time_step, int *num_glob_vars, real *glob_var_vals, int *ierr) -{ - *ierr = ex_put_glob_vars(*idexo, *time_step, *num_glob_vars, glob_var_vals); -} - -/* - * read global variable values at a time step - */ -void F2C(EXGGV)(int *idexo, int *time_step, int *num_glob_vars, real *glob_var_vals, int *ierr) -{ - *ierr = ex_get_glob_vars(*idexo, *time_step, *num_glob_vars, glob_var_vals); -} - -/* - * read global variable values through time - */ -void F2C(EXGGVT)(int *idexo, int *glob_var_index, int *beg_time_step, int *end_time_step, - real *glob_var_vals, int *ierr) -{ - *ierr = - ex_get_glob_var_time(*idexo, *glob_var_index, *beg_time_step, *end_time_step, glob_var_vals); -} - -/* - * write nodal variable values at a time step - */ -void F2C(EXPNV)(int *idexo, int *time_step, int *nodal_var_index, void_int *num_nodes, - real *nodal_var_vals, int *ierr) -{ - int64_t nnodes; - if (ex_int64_status(*idexo) & EX_BULK_INT64_API) { - nnodes = *(int64_t *)num_nodes; - } - else { - nnodes = *(int *)num_nodes; - } - - *ierr = ex_put_nodal_var(*idexo, *time_step, *nodal_var_index, nnodes, nodal_var_vals); -} - -/* - * read nodal variable values at a time step - */ -void F2C(EXGNV)(int *idexo, int *time_step, int *nodal_var_index, void_int *num_nodes, - real *nodal_var_vals, int *ierr) -{ - int64_t nnodes; - if (ex_int64_status(*idexo) & EX_BULK_INT64_API) { - nnodes = *(int64_t *)num_nodes; - } - else { - nnodes = *(int *)num_nodes; - } - - *ierr = ex_get_nodal_var(*idexo, *time_step, *nodal_var_index, nnodes, nodal_var_vals); -} - -/* - * read nodal variable values through time - */ -void F2C(EXGNVT)(int *idexo, int *nodal_var_index, void_int *node_number, int *beg_time_step, - int *end_time_step, real *nodal_var_vals, int *ierr) -{ - int64_t nnode; - if (ex_int64_status(*idexo) & EX_BULK_INT64_API) { - nnode = *(int64_t *)node_number; - } - else { - nnode = *(int *)node_number; - } - - *ierr = ex_get_nodal_var_time(*idexo, *nodal_var_index, nnode, *beg_time_step, *end_time_step, - nodal_var_vals); -} - -/* - * write element variable values at a time step - */ -void F2C(EXPEV)(int *idexo, int *time_step, int *elem_var_index, entity_id *elem_blk_id, - void_int *num_elem_this_blk, real *elem_var_vals, int *ierr) -{ - int64_t neblk; - if (ex_int64_status(*idexo) & EX_BULK_INT64_API) { - neblk = *(int64_t *)num_elem_this_blk; - } - else { - neblk = *(int *)num_elem_this_blk; - } - - *ierr = ex_put_elem_var(*idexo, *time_step, *elem_var_index, *elem_blk_id, neblk, elem_var_vals); -} - -/* - * read element variable values at a time step - */ -void F2C(EXGEV)(int *idexo, int *time_step, int *elem_var_index, entity_id *elem_blk_id, - void_int *num_elem_this_blk, real *elem_var_vals, int *ierr) -{ - int64_t neblk; - if (ex_int64_status(*idexo) & EX_BULK_INT64_API) { - neblk = *(int64_t *)num_elem_this_blk; - } - else { - neblk = *(int *)num_elem_this_blk; - } - - *ierr = ex_get_elem_var(*idexo, *time_step, *elem_var_index, *elem_blk_id, neblk, elem_var_vals); -} - -/* - * read element variable values through time - */ -void F2C(EXGEVT)(int *idexo, int *elem_var_index, void_int *elem_number, int *beg_time_step, - int *end_time_step, real *elem_var_vals, int *ierr) -{ - int64_t el_num; - if (ex_int64_status(*idexo) & EX_BULK_INT64_API) { - el_num = *(int64_t *)elem_number; - } - else { - el_num = *(int *)elem_number; - } - - *ierr = ex_get_elem_var_time(*idexo, *elem_var_index, el_num, *beg_time_step, *end_time_step, - elem_var_vals); -} - -/* - * write nodeset variable values at a time step - */ -void F2C(EXPNSV)(int *idexo, int *time_step, int *var_index, entity_id *id, void_int *num_entity, - real *var_vals, int *ierr) -{ - int64_t n_entity; - if (ex_int64_status(*idexo) & EX_BULK_INT64_API) { - n_entity = *(int64_t *)num_entity; - } - else { - n_entity = *(int *)num_entity; - } - - *ierr = ex_put_nset_var(*idexo, *time_step, *var_index, *id, n_entity, var_vals); -} - -/* - * read nodeset variable values at a time step - */ -void F2C(EXGNSV)(int *idexo, int *time_step, int *var_index, entity_id *id, void_int *num_entity, - real *var_vals, int *ierr) -{ - int64_t n_entity; - if (ex_int64_status(*idexo) & EX_BULK_INT64_API) { - n_entity = *(int64_t *)num_entity; - } - else { - n_entity = *(int *)num_entity; - } - - *ierr = ex_get_nset_var(*idexo, *time_step, *var_index, *id, n_entity, var_vals); -} - -/* - * write sideset variable values at a time step - */ -void F2C(EXPSSV)(int *idexo, int *time_step, int *var_index, entity_id *id, void_int *num_entity, - real *var_vals, int *ierr) -{ - int64_t n_entity; - if (ex_int64_status(*idexo) & EX_BULK_INT64_API) { - n_entity = *(int64_t *)num_entity; - } - else { - n_entity = *(int *)num_entity; - } - - *ierr = ex_put_sset_var(*idexo, *time_step, *var_index, *id, n_entity, var_vals); -} - -/* - * read sideset variable values at a time step - */ -void F2C(EXGSSV)(int *idexo, int *time_step, int *var_index, entity_id *id, void_int *num_entity, - real *var_vals, int *ierr) -{ - int64_t n_entity; - if (ex_int64_status(*idexo) & EX_BULK_INT64_API) { - n_entity = *(int64_t *)num_entity; - } - else { - n_entity = *(int *)num_entity; - } - - *ierr = ex_get_sset_var(*idexo, *time_step, *var_index, *id, n_entity, var_vals); -} - -/* - * write time value for a time step - */ -void F2C(EXPTIM)(int *idexo, int *time_step, real *time_value, int *ierr) -{ - *ierr = ex_put_time(*idexo, *time_step, time_value); -} - -/* - * read time value for a time step - */ -void F2C(EXGTIM)(int *idexo, int *time_step, real *time_value, int *ierr) -{ - *ierr = ex_get_time(*idexo, *time_step, time_value); -} - -/* - * read all time values - */ -void F2C(EXGATM)(int *idexo, real *time_values, int *ierr) -{ - *ierr = ex_get_all_times(*idexo, time_values); -} - -/* - * inquire EXODUS parameters - */ -void F2C(EXINQ)(int *idexo, int *req_info, void_int *ret_int, float *ret_float, char *ret_char, - int *ierr, int ret_charlen) -{ - *ierr = ex_inquire(*idexo, (ex_inquiry)*req_info, ret_int, ret_float, ret_char); -} - -/* - * inquire integer EXODUS parameters - */ -int64_t F2C(EXINQI)(int *idexo, int *req_info) -{ - return ex_inquire_int(*idexo, (ex_inquiry)*req_info); -} - -/* - * convert side set node lists to side set side lists - */ -void F2C(EXCN2S)(int *idexo, void_int *num_elem_per_set, void_int *num_nodes_per_set, - void_int *side_sets_elem_index, void_int *side_sets_node_index, - void_int *side_sets_elem_list, void_int *side_sets_node_list, - void_int *side_sets_side_list, int *ierr) -{ - *ierr = ex_cvt_nodes_to_sides(*idexo, num_elem_per_set, num_nodes_per_set, NULL, /* unused */ - NULL, /* unused */ - side_sets_elem_list, side_sets_node_list, side_sets_side_list); -} - -/* - * read side set node list - */ -void F2C(EXGSSN)(int *idexo, entity_id *side_set_id, int *side_set_node_cnt_list, - void_int *side_set_node_list, int *ierr) -{ - *ierr = - ex_get_side_set_node_list(*idexo, *side_set_id, side_set_node_cnt_list, side_set_node_list); -} - -/* - * read side set node count - */ -void F2C(EXGSSC)(int *idexo, entity_id *side_set_id, int *side_set_node_cnt_list, int *ierr) -{ - *ierr = ex_get_side_set_node_count(*idexo, *side_set_id, side_set_node_cnt_list); -} - -/* - * read concatenated side set node count - */ -void F2C(EXGCSSC)(int *idexo, int *side_set_node_cnt_list, int *ierr) -{ - *ierr = ex_get_concat_side_set_node_count(*idexo, side_set_node_cnt_list); -} - -/* ex_get_coordinate_frames -- read coordinate frames */ -void F2C(EXGFRM)(int *idexo, int *nframeo, void_int *cfids, real *coord, int *tags, int *ierr) -{ - int i; - char *ctags = NULL; - - /* Determine number of coordinate frames stored in file */ - int nframe = ex_inquire_int(*idexo, EX_INQ_COORD_FRAMES); - - if (nframe != *nframeo) { - *ierr = EX_FATAL; - return; - } - /* Create array of characters to store tags... */ - if (nframe > 0) { - if (!(ctags = calloc(nframe, sizeof(char)))) { - *ierr = EX_MEMFAIL; - return; - } - *ierr = 0; - - if (ex_get_coordinate_frames(*idexo, &nframe, cfids, coord, ctags) == EX_FATAL) { - *ierr = EX_FATAL; - return; - } - /* Convert character tags back to integer tags for fortran */ - for (i = 0; i < nframe; i++) { - if (ctags[i] == 'R' || ctags[i] == 'r') - tags[i] = EX_CF_RECTANGULAR; - else if (ctags[i] == 'C' || ctags[i] == 'c') - tags[i] = EX_CF_CYLINDRICAL; - else if (ctags[i] == 'S' || ctags[i] == 's') - tags[i] = EX_CF_SPHERICAL; - } - free(ctags); - } -} - -/* ex_put_coordinate_frames -- define/write coordinate frames */ -void F2C(EXPFRM)(int *idexo, int *nframe, void_int *cfids, real *coord, int *tags, int *ierr) -{ - int i; - char *ctags = NULL; - - /* Create array of characters to store tags... */ - if (*nframe > 0) { - if (!(ctags = calloc(*nframe, sizeof(char)))) { - *ierr = EX_MEMFAIL; - return; - } - /* Convert fortran integer tags to C API character tags */ - for (i = 0; i < *nframe; i++) { - if (tags[i] == EX_CF_RECTANGULAR) - ctags[i] = 'R'; - else if (tags[i] == EX_CF_CYLINDRICAL) - ctags[i] = 'C'; - else if (tags[i] == EX_CF_SPHERICAL) - ctags[i] = 'S'; - } - - *ierr = 0; - - if (ex_put_coordinate_frames(*idexo, *nframe, cfids, coord, ctags) == EX_FATAL) { - *ierr = EX_FATAL; - return; - } - free(ctags); - } -} - -/* Routine to return floating point word size */ -int F2C(EXCPWS)() { return (ex__get_cpu_ws()); } - -/* Routine to return large model setting */ -int F2C(EXLGMD)(int *idexo) { return (ex_large_model(*idexo)); } - -/* Generalized error handling function */ -void F2C(EXERR)(char *pname, char *err_string, int *errcode, int pnamelen, int err_stringlen) -{ - - char *proc_name, *error_string; - if (!(proc_name = malloc((pnamelen + 1) * sizeof(char)))) { - ex_err(__func__, "Error: failed to allocate space for process name buffer", EX_MEMFAIL); - return; - } - if (!(error_string = malloc((err_stringlen + 1) * sizeof(char)))) { - free(proc_name); - ex_err(__func__, "Error: failed to allocate space for error msg buffer", EX_MEMFAIL); - return; - } - ex_fstrncpy(proc_name, pname, pnamelen); - ex_fstrncpy(error_string, err_string, err_stringlen); - ex_err(proc_name, error_string, *errcode); - free(proc_name); - free(error_string); -} - -/* Error message reporting options setting function */ -void F2C(EXOPTS)(int *option_val, int *ierr) -{ - *ierr = 0; - ex_opts((ex_options)*option_val); - if (exerrval != 0) { - *ierr = EX_FATAL; - } -} - -void F2C(EXMXNM)(int *idexo, int *length, int *ierr) -{ - *ierr = ex_set_max_name_length(*idexo, *length); -} - -/* - * copy EXODUS file - */ -void F2C(EXCOPY)(int *idexo_in, int *idexo_out, int *ierr) -{ - *ierr = ex_copy(*idexo_in, *idexo_out); -} - -/* - * get element map - */ -void - - F2C(EXGEM)(int *idexo, entity_id *map_id, void_int *elem_map, int *ierr) -{ - *ierr = ex_get_num_map(*idexo, EX_ELEM_MAP, *map_id, elem_map); -} - -/* - * get partial_element map - */ -void F2C(EXGPEM)(int *idexo, entity_id *map_id, void_int *start, void_int *count, - void_int *elem_map, int *ierr) -{ - int64_t st, cnt; - if (ex_int64_status(*idexo) & EX_BULK_INT64_API) { - st = *(int64_t *)start; - cnt = *(int64_t *)count; - } - else { - st = *(int *)start; - cnt = *(int *)count; - } - - *ierr = ex_get_partial_num_map(*idexo, EX_ELEM_MAP, *map_id, st, cnt, elem_map); -} - -/* - * get element number map - */ -void F2C(EXGENM)(int *idexo, void_int *elem_map, int *ierr) -{ - *ierr = ex_get_id_map(*idexo, EX_ELEM_MAP, elem_map); -} - -/* - * get map parameters - */ -void F2C(EXGMP)(int *idexo, int *num_node_maps, int *num_elem_maps, int *ierr) -{ - *ierr = ex_get_map_param(*idexo, num_node_maps, num_elem_maps); -} - -/* - * get node map - */ -void F2C(EXGNM)(int *idexo, entity_id *map_id, void_int *node_map, int *ierr) -{ - *ierr = ex_get_num_map(*idexo, EX_NODE_MAP, *map_id, node_map); -} - -/* - * get node number map - */ -void F2C(EXGNNM)(int *idexo, void_int *node_map, int *ierr) -{ - *ierr = ex_get_id_map(*idexo, EX_NODE_MAP, node_map); -} - -/* - * read results variables names - */ -void F2C(EXGVNM)(int *idexo, char *var_type, int *var_index, char *var_name, int *ierr, - int var_typelen, int var_namelen) -{ - char *sptr; /* ptr to temp staging space for string */ - int slen; - *ierr = 0; /* default no error */ - - slen = ex_inquire_int(*idexo, EX_INQ_MAX_READ_NAME_LENGTH); /* max string size */ - if (var_namelen < slen) { - slen = var_namelen; - } - /* Allocate staging space for the variable name */ - if (!(sptr = malloc((slen + 1) * sizeof(char)))) { - *ierr = EX_MEMFAIL; - return; - } - /* do ExodusII C call to read results variables names */ - if (ex_get_var_name(*idexo, var_type, *var_index, sptr) == EX_FATAL) { - *ierr = EX_FATAL; - free(sptr); /* free up allocated space */ - return; - } - /* Copy Fortran variable names to staging space */ - /** printf("[exgvnm] var_name(%d): %s\n",*var_index,sptr)); **/ - memset(var_name, 0, var_namelen); - ex_fcdcpy(var_name, slen, sptr); /* copy string into Fortran buffer */ - - free(sptr); /* Free up string staging area */ -} - -/* - * put element map - */ -void F2C(EXPEM)(int *idexo, entity_id *map_id, void_int *elem_map, int *ierr) -{ - *ierr = ex_put_num_map(*idexo, EX_ELEM_MAP, *map_id, elem_map); -} - -/* - * put partial element map - */ -void F2C(EXPPEM)(int *idexo, entity_id *map_id, void_int *start, void_int *count, - void_int *elem_map, int *ierr) -{ - int64_t st, cnt; - if (ex_int64_status(*idexo) & EX_BULK_INT64_API) { - st = *(int64_t *)start; - cnt = *(int64_t *)count; - } - else { - st = *(int *)start; - cnt = *(int *)count; - } - *ierr = ex_put_partial_num_map(*idexo, EX_ELEM_MAP, *map_id, st, cnt, elem_map); -} - -/* - * put element number map - */ -void F2C(EXPENM)(int *idexo, void_int *elem_map, int *ierr) -{ - *ierr = ex_put_id_map(*idexo, EX_ELEM_MAP, elem_map); -} - -/* - * put map parameters - */ -void F2C(EXPMP)(int *idexo, int *num_node_maps, int *num_elem_maps, int *ierr) -{ - *ierr = ex_put_map_param(*idexo, *num_node_maps, *num_elem_maps); -} - -/* - * put node map - */ -void F2C(EXPNM)(int *idexo, entity_id *map_id, void_int *node_map, int *ierr) -{ - *ierr = ex_put_num_map(*idexo, EX_NODE_MAP, *map_id, node_map); -} - -/* - * put node number map - */ -void F2C(EXPNNM)(int *idexo, void_int *node_map, int *ierr) -{ - *ierr = ex_put_id_map(*idexo, EX_NODE_MAP, node_map); -} - -/* - * write results variable name - */ -void F2C(EXPVNM)(int *idexo, char *var_type, int *var_index, char *var_name, int *ierr, - int var_typelen, int var_namelen) -{ - char *sptr; /* ptr to temp staging space for string */ - int slen; - *ierr = 0; /* default no error */ - - slen = ex_inquire_int(*idexo, EX_INQ_DB_MAX_ALLOWED_NAME_LENGTH); /* max str size */ - if (var_namelen < slen) { - slen = var_namelen; - } - /* Allocate staging space for the variable name */ - if (!(sptr = (char *)malloc((slen + 1) * sizeof(char)))) { - *ierr = EX_MEMFAIL; - return; - } - ex_fstrncpy(sptr, var_name, slen); /* copy string into buffer */ - - /* do ExodusII C call to write results variable name */ - if (ex_put_var_name(*idexo, var_type, *var_index, sptr) == EX_FATAL) { - *ierr = EX_FATAL; - free(sptr); /* free up allocated space */ - return; - } - free(sptr); /* Free up string staging area */ -} - -/* - * Get initial information from nemesis file - */ -void F2C(EXGII)(int *idne, int *nproc, int *nproc_in_f, char *ftype, int *ierr, size_t ftypelen) -{ - size_t slen = 1; - char * file_type; - - /* WARNING: ftypelen SHOULD be 1, but may not be depending on how - the Fortran programmer passed it. It is best at - this time to hard code it per NEPII spec. */ - if (ftypelen != 1) { -#if defined(EXODUS_STRING_LENGTH_WARNING) - char errmsg[MAX_ERR_LENGTH]; - sprintf(errmsg, "Warning: file type string length is %lu in file id %d\n", ftypelen, *idne); - ex_err(__func__, errmsg, EX_MSG); -#endif - slen = ftypelen; - } - - file_type = (char *)malloc((slen + 1) * sizeof(char)); - - if ((*ierr = ex_get_init_info(*idne, nproc, nproc_in_f, file_type)) != 0) { - char errmsg[MAX_ERR_LENGTH]; - sprintf(errmsg, "Error: failed to get initial information from file id %d", *idne); - ex_err(__func__, errmsg, EX_MSG); - } - - if (*ierr == 0) - ex_fcdcpy(ftype, slen, file_type); - - free(file_type); -} - -/* - * Write initial information from nemesis file - */ -void F2C(EXPII)(int *idne, int *nproc, int *nproc_in_f, char *ftype, int *ierr, size_t ftypelen) -{ - - char errmsg[MAX_ERR_LENGTH]; - - size_t slen = 1; - char * file_type; - - /* WARNING: ftypelen SHOULD be 1, but may not be depending on how - the Fortran programmer passed it. It is best at - this time to hard code it per NEPII spec. */ - if (ftypelen != 1) { - slen = ftypelen; -#if defined(EXODUS_STRING_LENGTH_WARNING) - sprintf(errmsg, "Warning: file type string length is %lu in file id %d\n", ftypelen, *idne); - ex_err(__func__, errmsg, EX_MSG); -#endif - } - - file_type = (char *)malloc((slen + 1) * sizeof(char)); - - ex_fstrncpy(file_type, ftype, slen); - - if ((*ierr = ex_put_init_info(*idne, *nproc, *nproc_in_f, file_type)) != 0) { - sprintf(errmsg, "Error: failed to put initial information in file id %d", *idne); - ex_err(__func__, errmsg, EX_MSG); - } - - free(file_type); -} - -/* - * Read initial global information - */ -void F2C(EXGIG)(int *idne, void_int *nnodes_g, void_int *nelems_g, void_int *nelem_blks_g, - void_int *nnode_sets_g, void_int *nside_sets_g, int *ierr) -{ - if ((*ierr = ex_get_init_global(*idne, nnodes_g, nelems_g, nelem_blks_g, nnode_sets_g, - nside_sets_g)) != 0) { - char errmsg[MAX_ERR_LENGTH]; - sprintf(errmsg, "Error: failed to read initial global information from file id %d", *idne); - ex_err(__func__, errmsg, EX_MSG); - } -} - -/* - * Write initial global information - */ -void F2C(EXPIG)(int *idne, void_int *nnodes_g, void_int *nelems_g, void_int *nelem_blks_g, - void_int *nnode_sets_g, void_int *nside_sets_g, int *ierr) -{ - if (ex_int64_status(*idne) & EX_BULK_INT64_API) { - int64_t *n_nnodes_g = (int64_t *)nnodes_g; - int64_t *n_nelems_g = (int64_t *)nelems_g; - int64_t *n_nelem_blks_g = (int64_t *)nelem_blks_g; - int64_t *n_nnode_sets_g = (int64_t *)nnode_sets_g; - int64_t *n_nside_sets_g = (int64_t *)nside_sets_g; - *ierr = ex_put_init_global(*idne, *n_nnodes_g, *n_nelems_g, *n_nelem_blks_g, *n_nnode_sets_g, - *n_nside_sets_g); - } - else { - int *n_nnodes_g = (int *)nnodes_g; - int *n_nelems_g = (int *)nelems_g; - int *n_nelem_blks_g = (int *)nelem_blks_g; - int *n_nnode_sets_g = (int *)nnode_sets_g; - int *n_nside_sets_g = (int *)nside_sets_g; - *ierr = ex_put_init_global(*idne, *n_nnodes_g, *n_nelems_g, *n_nelem_blks_g, *n_nnode_sets_g, - *n_nside_sets_g); - } - - if (*ierr != 0) { - char errmsg[MAX_ERR_LENGTH]; - sprintf(errmsg, "Error: failed to store initial global information in file id %d", *idne); - ex_err(__func__, errmsg, EX_MSG); - } -} - -/* - * Read load balance parameters - */ -void F2C(EXGLBP)(int *idne, void_int *nint_nodes, void_int *nbor_nodes, void_int *next_nodes, - void_int *nint_elems, void_int *nbor_elems, void_int *nnode_cmaps, - void_int *nelem_cmaps, int *processor, int *ierr) -{ - if ((*ierr = ex_get_loadbal_param(*idne, nint_nodes, nbor_nodes, next_nodes, nint_elems, - nbor_elems, nnode_cmaps, nelem_cmaps, *processor)) != 0) { - char errmsg[MAX_ERR_LENGTH]; - sprintf(errmsg, "Error: failed to read load balance parameters from file id %d", *idne); - ex_err(__func__, errmsg, EX_MSG); - } -} - -/* - * Write load balance parameters - */ -void F2C(EXPLBP)(int *idne, void_int *nint_nodes, void_int *nbor_nodes, void_int *next_nodes, - void_int *nint_elems, void_int *nbor_elems, void_int *nnode_cmaps, - void_int *nelem_cmaps, int *processor, int *ierr) -{ - if (ex_int64_status(*idne) & EX_BULK_INT64_API) { - int64_t *n_nint_nodes = (int64_t *)nint_nodes; - int64_t *n_nbor_nodes = (int64_t *)nbor_nodes; - int64_t *n_next_nodes = (int64_t *)next_nodes; - int64_t *n_nint_elems = (int64_t *)nint_elems; - int64_t *n_nbor_elems = (int64_t *)nbor_elems; - int64_t *n_nnode_cmaps = (int64_t *)nnode_cmaps; - int64_t *n_nelem_cmaps = (int64_t *)nelem_cmaps; - *ierr = ex_put_loadbal_param(*idne, *n_nint_nodes, *n_nbor_nodes, *n_next_nodes, *n_nint_elems, - *n_nbor_elems, *n_nnode_cmaps, *n_nelem_cmaps, *processor); - } - else { - int *n_nint_nodes = (int *)nint_nodes; - int *n_nbor_nodes = (int *)nbor_nodes; - int *n_next_nodes = (int *)next_nodes; - int *n_nint_elems = (int *)nint_elems; - int *n_nbor_elems = (int *)nbor_elems; - int *n_nnode_cmaps = (int *)nnode_cmaps; - int *n_nelem_cmaps = (int *)nelem_cmaps; - *ierr = ex_put_loadbal_param(*idne, *n_nint_nodes, *n_nbor_nodes, *n_next_nodes, *n_nint_elems, - *n_nbor_elems, *n_nnode_cmaps, *n_nelem_cmaps, *processor); - } - if (*ierr != 0) { - char errmsg[MAX_ERR_LENGTH]; - sprintf(errmsg, "Error: failed to store load balance parameters in file id %d", *idne); - ex_err(__func__, errmsg, EX_MSG); - } -} - -/* - * Write concatenated load balance parameters - */ -void F2C(EXPLBPC)(int *idne, void_int *nint_nodes, void_int *nbor_nodes, void_int *next_nodes, - void_int *nint_elems, void_int *nbor_elems, void_int *nnode_cmaps, - void_int *nelem_cmaps, int *ierr) -{ - if ((*ierr = ex_put_loadbal_param_cc(*idne, nint_nodes, nbor_nodes, next_nodes, nint_elems, - nbor_elems, nnode_cmaps, nelem_cmaps)) != 0) { - char errmsg[MAX_ERR_LENGTH]; - sprintf(errmsg, "Error: failed to store load balance parameters in file id %d", *idne); - ex_err(__func__, errmsg, EX_MSG); - } -} - -/* - * Read global node set parameters - */ -void F2C(EXGNSPG)(int *idne, void_int *ns_ids_glob, void_int *ns_n_cnt_glob, - void_int *ns_df_cnt_glob, int *ierr) -{ - if ((*ierr = ex_get_ns_param_global(*idne, ns_ids_glob, ns_n_cnt_glob, ns_df_cnt_glob)) != 0) { - char errmsg[MAX_ERR_LENGTH]; - sprintf(errmsg, "Error: failed to read global node set parameters from file id %d", *idne); - ex_err(__func__, errmsg, EX_MSG); - } -} - -/* - * Write global node set parameters - */ -void F2C(EXPNSPG)(int *idne, void_int *global_ids, void_int *global_n_cnts, - void_int *global_df_cnts, int *ierr) -{ - if ((*ierr = ex_put_ns_param_global(*idne, global_ids, global_n_cnts, global_df_cnts)) != 0) { - char errmsg[MAX_ERR_LENGTH]; - sprintf(errmsg, "Error: failed to store global node set parameters in file id %d", *idne); - ex_err(__func__, errmsg, EX_MSG); - } -} - -/* - * Read global side set parameters - */ -void F2C(EXGSSPG)(int *idne, void_int *ss_ids_glob, void_int *ss_n_cnt_glob, - void_int *ss_df_cnt_glob, int *ierr) -{ - - if ((*ierr = ex_get_ss_param_global(*idne, ss_ids_glob, ss_n_cnt_glob, ss_df_cnt_glob)) != 0) { - char errmsg[MAX_ERR_LENGTH]; - sprintf(errmsg, "Error: failed to read global side set parameters from file id %d", *idne); - ex_err(__func__, errmsg, EX_MSG); - } -} - -/* - * Write global side set parameters - */ -void F2C(EXPSSPG)(int *idne, void_int *global_ids, void_int *global_el_cnts, - void_int *global_df_cnts, int *ierr) -{ - if ((*ierr = ex_put_ss_param_global(*idne, global_ids, global_el_cnts, global_df_cnts)) != 0) { - char errmsg[MAX_ERR_LENGTH]; - sprintf(errmsg, "Error: failed to store global side set parameters in file id %d", *idne); - ex_err(__func__, errmsg, EX_MSG); - } -} - -/* - * Read global element block information - */ -void F2C(EXGEBIG)(int *idne, void_int *el_blk_ids, void_int *el_blk_cnts, int *ierr) -{ - if ((*ierr = ex_get_eb_info_global(*idne, el_blk_ids, el_blk_cnts)) != 0) { - char errmsg[MAX_ERR_LENGTH]; - sprintf(errmsg, "Error: failed to read global element block info from file id %d", *idne); - ex_err(__func__, errmsg, EX_MSG); - } -} - -/* - * Write global element block information - */ -void F2C(EXPEBIG)(int *idne, void_int *el_blk_ids, void_int *el_blk_cnts, int *ierr) -{ - if ((*ierr = ex_put_eb_info_global(*idne, el_blk_ids, el_blk_cnts)) != 0) { - char errmsg[MAX_ERR_LENGTH]; - sprintf(errmsg, "Error: failed to store global element block info in file id %d", *idne); - ex_err(__func__, errmsg, EX_MSG); - } -} - -/* - * Read side set element list and side set side list - */ -void F2C(EXGNSS)(int *idne, entity_id *ss_id, void_int *start, void_int *count, - void_int *ss_elem_list, void_int *ss_side_list, int *ierr) -{ - int64_t st, cnt; - if (ex_int64_status(*idne) & EX_BULK_INT64_API) { - st = *(int64_t *)start; - cnt = *(int64_t *)count; - } - else { - st = *(int *)start; - cnt = *(int *)count; - } - - if ((*ierr = ex_get_n_side_set(*idne, *ss_id, st, cnt, ss_elem_list, ss_side_list)) != 0) { - char errmsg[MAX_ERR_LENGTH]; - sprintf(errmsg, "Error: failed to read side set element list from file id %d", *idne); - ex_err(__func__, errmsg, EX_MSG); - } -} - -/* - * Write side set element list and side set side list - */ -void F2C(EXPNSS)(int *idne, entity_id *ss_id, void_int *start, void_int *count, - void_int *ss_elem_list, void_int *ss_side_list, int *ierr) -{ - int64_t st, cnt; - if (ex_int64_status(*idne) & EX_BULK_INT64_API) { - st = *(int64_t *)start; - cnt = *(int64_t *)count; - } - else { - st = *(int *)start; - cnt = *(int *)count; - } - - if ((*ierr = ex_put_n_side_set(*idne, *ss_id, st, cnt, ss_elem_list, ss_side_list)) != 0) { - char errmsg[MAX_ERR_LENGTH]; - sprintf(errmsg, "Error: failed to write side set element list to file id %d", *idne); - ex_err(__func__, errmsg, EX_MSG); - } -} - -/* - * Read side set distribution factor - */ -void F2C(EXGNSSD)(int *idne, entity_id *ss_id, void_int *start, void_int *count, real *ss_df, - int *ierr) -{ - int64_t st, cnt; - if (ex_int64_status(*idne) & EX_BULK_INT64_API) { - st = *(int64_t *)start; - cnt = *(int64_t *)count; - } - else { - st = *(int *)start; - cnt = *(int *)count; - } - - if ((*ierr = ex_get_n_side_set_df(*idne, *ss_id, st, cnt, ss_df)) != 0) { - char errmsg[MAX_ERR_LENGTH]; - sprintf(errmsg, "Error: failed to read side set dist factor from file id %d", *idne); - ex_err(__func__, errmsg, EX_MSG); - } -} - -/* - * Write side set distribution factor - */ -void F2C(EXPNSSD)(int *idne, entity_id *ss_id, void_int *start, void_int *count, real *ss_df, - int *ierr) -{ - int64_t st, cnt; - if (ex_int64_status(*idne) & EX_BULK_INT64_API) { - st = *(int64_t *)start; - cnt = *(int64_t *)count; - } - else { - st = *(int *)start; - cnt = *(int *)count; - } - - if ((*ierr = ex_put_n_side_set_df(*idne, *ss_id, st, cnt, ss_df)) != 0) { - char errmsg[MAX_ERR_LENGTH]; - sprintf(errmsg, "Error: failed to write side set dist factor to file id %d", *idne); - ex_err(__func__, errmsg, EX_MSG); - } -} - -/* - * Read node set list for a single node set - */ -void F2C(EXGNNS)(int *idne, entity_id *ns_id, void_int *start, void_int *count, - void_int *ns_node_list, int *ierr) -{ - int64_t st, cnt; - if (ex_int64_status(*idne) & EX_BULK_INT64_API) { - st = *(int64_t *)start; - cnt = *(int64_t *)count; - } - else { - st = *(int *)start; - cnt = *(int *)count; - } - - if ((*ierr = ex_get_n_node_set(*idne, *ns_id, st, cnt, ns_node_list)) != 0) { - char errmsg[MAX_ERR_LENGTH]; - sprintf(errmsg, "Error: failed to read node set node list from file id %d", *idne); - ex_err(__func__, errmsg, EX_MSG); - } -} - -/* - * Write node set list for a single node set - */ -void F2C(EXPNNS)(int *idne, entity_id *ns_id, void_int *start, void_int *count, - void_int *ns_node_list, int *ierr) -{ - int64_t st, cnt; - if (ex_int64_status(*idne) & EX_BULK_INT64_API) { - st = *(int64_t *)start; - cnt = *(int64_t *)count; - } - else { - st = *(int *)start; - cnt = *(int *)count; - } - - if ((*ierr = ex_put_n_node_set(*idne, *ns_id, st, cnt, ns_node_list)) != 0) { - char errmsg[MAX_ERR_LENGTH]; - sprintf(errmsg, "Error: failed to write node set node list to file id %d", *idne); - ex_err(__func__, errmsg, EX_MSG); - } -} - -/* - * Read node set distribution factor - */ -void F2C(EXGNNSD)(int *idne, entity_id *ns_id, void_int *start, void_int *count, real *ns_df, - int *ierr) -{ - int64_t st, cnt; - if (ex_int64_status(*idne) & EX_BULK_INT64_API) { - st = *(int64_t *)start; - cnt = *(int64_t *)count; - } - else { - st = *(int *)start; - cnt = *(int *)count; - } - - if ((*ierr = ex_get_n_node_set_df(*idne, *ns_id, st, cnt, ns_df)) != 0) { - char errmsg[MAX_ERR_LENGTH]; - sprintf(errmsg, "Error: failed to read node set dist factor from file id %d", *idne); - ex_err(__func__, errmsg, EX_MSG); - } -} - -/* - * Write node set distribution factor - */ -void F2C(EXPNNSD)(int *idne, entity_id *ns_id, void_int *start, void_int *count, real *ns_df, - int *ierr) -{ - int64_t st, cnt; - if (ex_int64_status(*idne) & EX_BULK_INT64_API) { - st = *(int64_t *)start; - cnt = *(int64_t *)count; - } - else { - st = *(int *)start; - cnt = *(int *)count; - } - - if ((*ierr = ex_put_n_node_set_df(*idne, *ns_id, st, cnt, ns_df)) != 0) { - char errmsg[MAX_ERR_LENGTH]; - sprintf(errmsg, "Error: failed to write node set dist factor to file id %d", *idne); - ex_err(__func__, errmsg, EX_MSG); - } -} - -/* - * Read coordinates of the nodes - */ -void F2C(EXGNCOR)(int *idne, void_int *start, void_int *count, real *x_coor, real *y_coor, - real *z_coor, int *ierr) -{ - int64_t st, cnt; - if (ex_int64_status(*idne) & EX_BULK_INT64_API) { - st = *(int64_t *)start; - cnt = *(int64_t *)count; - } - else { - st = *(int *)start; - cnt = *(int *)count; - } - - if ((*ierr = ex_get_n_coord(*idne, st, cnt, x_coor, y_coor, z_coor)) != 0) { - char errmsg[MAX_ERR_LENGTH]; - sprintf(errmsg, "Error: failed to read node coordinates from file id %d", *idne); - ex_err(__func__, errmsg, EX_MSG); - } -} - -/* - * Write coordinates of the nodes - */ -void F2C(EXPNCOR)(int *idne, void_int *start, void_int *count, real *x_coor, real *y_coor, - real *z_coor, int *ierr) -{ - int64_t st, cnt; - if (ex_int64_status(*idne) & EX_BULK_INT64_API) { - st = *(int64_t *)start; - cnt = *(int64_t *)count; - } - else { - st = *(int *)start; - cnt = *(int *)count; - } - - if ((*ierr = ex_put_n_coord(*idne, st, cnt, x_coor, y_coor, z_coor)) != 0) { - char errmsg[MAX_ERR_LENGTH]; - sprintf(errmsg, "Error: failed to write node coordinates to file id %d", *idne); - ex_err(__func__, errmsg, EX_MSG); - } -} - -/* - * Read an element block's connectivity list - */ -void F2C(EXGNEC)(int *idne, entity_id *elem_blk_id, void_int *start, void_int *count, - void_int *connect, int *ierr) -{ - int64_t st, cnt; - if (ex_int64_status(*idne) & EX_BULK_INT64_API) { - st = *(int64_t *)start; - cnt = *(int64_t *)count; - } - else { - st = *(int *)start; - cnt = *(int *)count; - } - - if ((*ierr = ex_get_n_elem_conn(*idne, *elem_blk_id, st, cnt, connect)) != 0) { - char errmsg[MAX_ERR_LENGTH]; - sprintf(errmsg, "Error: failed to read element block connectivity from file id %d", *idne); - ex_err(__func__, errmsg, EX_MSG); - } -} - -/* - * Write an element block's connectivity list - */ -void F2C(EXPNEC)(int *idne, entity_id *elem_blk_id, void_int *start, void_int *count, - void_int *connect, int *ierr) -{ - int64_t st, cnt; - if (ex_int64_status(*idne) & EX_BULK_INT64_API) { - st = *(int64_t *)start; - cnt = *(int64_t *)count; - } - else { - st = *(int *)start; - cnt = *(int *)count; - } - - if ((*ierr = ex_put_n_elem_conn(*idne, *elem_blk_id, st, cnt, connect)) != 0) { - char errmsg[MAX_ERR_LENGTH]; - sprintf(errmsg, "Error: failed to write element block connectivity to file id %d", *idne); - ex_err(__func__, errmsg, EX_MSG); - } -} - -/* - * Read an element block's attributes - */ -void F2C(EXGNEAT)(int *idne, entity_id *elem_blk_id, void_int *start, void_int *count, real *attrib, - int *ierr) -{ - int64_t st, cnt; - if (ex_int64_status(*idne) & EX_BULK_INT64_API) { - st = *(int64_t *)start; - cnt = *(int64_t *)count; - } - else { - st = *(int *)start; - cnt = *(int *)count; - } - - if ((*ierr = ex_get_n_elem_attr(*idne, *elem_blk_id, st, cnt, attrib)) != 0) { - char errmsg[MAX_ERR_LENGTH]; - sprintf(errmsg, "Error: failed to read element block attribute from file id %d", *idne); - ex_err(__func__, errmsg, EX_MSG); - } -} - -/* - * Write an element block's attributes - */ -void F2C(EXPNEAT)(int *idne, entity_id *elem_blk_id, void_int *start, void_int *count, real *attrib, - int *ierr) -{ - int64_t st, cnt; - if (ex_int64_status(*idne) & EX_BULK_INT64_API) { - st = *(int64_t *)start; - cnt = *(int64_t *)count; - } - else { - st = *(int *)start; - cnt = *(int *)count; - } - - if ((*ierr = ex_put_n_elem_attr(*idne, *elem_blk_id, st, cnt, attrib)) != 0) { - char errmsg[MAX_ERR_LENGTH]; - sprintf(errmsg, "Error: failed to write element block attribute to file id %d", *idne); - ex_err(__func__, errmsg, EX_MSG); - } -} - -/* - * Read the element type for a specific element block - */ -void F2C(EXGELT)(int *idne, entity_id *elem_blk_id, char *elem_type, int *ierr, size_t elem_typelen) -{ - size_t slen = MAX_STR_LENGTH; - char * etype; - - /* WARNING: ftypelen SHOULD be MAX_STR_LENGTH, but may not be depending - on how the Fortran programmer passed it. It is best at - this time to hard code it per NEMESIS spec. */ - if (elem_typelen != MAX_STR_LENGTH) { -#if defined(EXODUS_STRING_LENGTH_WARNING) - char errmsg[MAX_ERR_LENGTH]; - sprintf(errmsg, "Warning: element type string length is %lu in file id %d\n", elem_typelen, - *idne); - ex_err(__func__, errmsg, EX_MSG); -#endif - slen = elem_typelen; - } - - etype = (char *)malloc((slen + 1) * sizeof(char)); - - if ((*ierr = ex_get_elem_type(*idne, *elem_blk_id, etype)) != 0) { - char errmsg[MAX_ERR_LENGTH]; - sprintf(errmsg, "Error: failed to read element block type from file id %d", *idne); - ex_err(__func__, errmsg, EX_MSG); - } - - if (*ierr == 0) - ex_fcdcpy(elem_type, slen, etype); - - free(etype); -} - -/* - * Read a variable for an element block - */ -void F2C(EXGNEV)(int *idne, int *time_step, int *elem_var_index, entity_id *elem_blk_id, - void_int *num_elem_this_blk, void_int *start, void_int *count, real *elem_var_vals, - int *ierr) -{ - int64_t st, cnt; - if (ex_int64_status(*idne) & EX_BULK_INT64_API) { - st = *(int64_t *)start; - cnt = *(int64_t *)count; - } - else { - st = *(int *)start; - cnt = *(int *)count; - } - - if ((*ierr = ex_get_n_var(*idne, *time_step, EX_ELEM_BLOCK, *elem_var_index, *elem_blk_id, st, - cnt, elem_var_vals)) != 0) { - char errmsg[MAX_ERR_LENGTH]; - sprintf(errmsg, "Error: failed to read element block variable from file id %d", *idne); - ex_err(__func__, errmsg, EX_MSG); - } -} - -/* - * Write a variable slab for an element block - */ -void F2C(EXPEVS)(int *idne, int *time_step, int *elem_var_index, entity_id *elem_blk_id, - void_int *start, void_int *count, real *elem_var_vals, int *ierr) -{ - int64_t st, cnt; - if (ex_int64_status(*idne) & EX_BULK_INT64_API) { - st = *(int64_t *)start; - cnt = *(int64_t *)count; - } - else { - st = *(int *)start; - cnt = *(int *)count; - } - - if ((*ierr = ex_put_elem_var_slab(*idne, *time_step, *elem_var_index, *elem_blk_id, st, cnt, - elem_var_vals)) != 0) { - char errmsg[MAX_ERR_LENGTH]; - sprintf(errmsg, "Error: failed to write elem block variable slab to file id %d", *idne); - ex_err(__func__, errmsg, EX_MSG); - } -} - -/* - * Read the values of a single nodal variable for a single time step - */ -void F2C(EXGNNV)(int *idne, int *time_step, int *nodal_var_index, void_int *start, void_int *count, - real *nodal_vars, int *ierr) -{ - int64_t st, cnt; - if (ex_int64_status(*idne) & EX_BULK_INT64_API) { - st = *(int64_t *)start; - cnt = *(int64_t *)count; - } - else { - st = *(int *)start; - cnt = *(int *)count; - } - - if ((*ierr = ex_get_n_var(*idne, *time_step, EX_NODAL, *nodal_var_index, 1, st, cnt, - nodal_vars)) != 0) { - char errmsg[MAX_ERR_LENGTH]; - sprintf(errmsg, "Error: failed to read nodal variable from file id %d", *idne); - ex_err(__func__, errmsg, EX_MSG); - } -} - -/* - * Write nodal variable slab - */ -void F2C(EXPNVS)(int *idne, int *time_step, int *nodal_var_index, void_int *start, void_int *count, - real *nodal_var_vals, int *ierr) -{ - int64_t st, cnt; - if (ex_int64_status(*idne) & EX_BULK_INT64_API) { - st = *(int64_t *)start; - cnt = *(int64_t *)count; - } - else { - st = *(int *)start; - cnt = *(int *)count; - } - - if ((*ierr = ex_put_nodal_var_slab(*idne, *time_step, *nodal_var_index, st, cnt, - nodal_var_vals)) != 0) { - char errmsg[MAX_ERR_LENGTH]; - sprintf(errmsg, "Error: failed to write nodal variable slab to file id %d", *idne); - ex_err(__func__, errmsg, EX_MSG); - } -} - -/* - * Read the element numbering map - */ -void F2C(EXGNENM)(int *idne, void_int *starte, void_int *num_ent, void_int *elem_map, int *ierr) -{ - int64_t st, cnt; - if (ex_int64_status(*idne) & EX_BULK_INT64_API) { - st = *(int64_t *)starte; - cnt = *(int64_t *)num_ent; - } - else { - st = *(int *)starte; - cnt = *(int *)num_ent; - } - - if ((*ierr = ex_get_n_elem_num_map(*idne, st, cnt, elem_map)) != 0) { - char errmsg[MAX_ERR_LENGTH]; - sprintf(errmsg, "Error: failed to read element numbering map from file id %d", *idne); - ex_err(__func__, errmsg, EX_MSG); - } -} - -/* - * Write the element numbering map - */ -void F2C(EXPNENM)(int *idne, void_int *starte, void_int *num_ent, void_int *elem_map, int *ierr) -{ - int64_t st, cnt; - if (ex_int64_status(*idne) & EX_BULK_INT64_API) { - st = *(int64_t *)starte; - cnt = *(int64_t *)num_ent; - } - else { - st = *(int *)starte; - cnt = *(int *)num_ent; - } - - if ((*ierr = ex_put_partial_id_map(*idne, EX_ELEM_MAP, st, cnt, elem_map)) != 0) { - char errmsg[MAX_ERR_LENGTH]; - sprintf(errmsg, "Error: failed to write element numbering map to file id %d", *idne); - ex_err(__func__, errmsg, EX_MSG); - } -} - -/* - * Read the node numbering map - */ -void F2C(EXGNNNM)(int *idne, void_int *startn, void_int *num_ent, void_int *node_map, int *ierr) -{ - int64_t st, cnt; - if (ex_int64_status(*idne) & EX_BULK_INT64_API) { - st = *(int64_t *)startn; - cnt = *(int64_t *)num_ent; - } - else { - st = *(int *)startn; - cnt = *(int *)num_ent; - } - - if ((*ierr = ex_get_n_node_num_map(*idne, st, cnt, node_map)) != 0) { - char errmsg[MAX_ERR_LENGTH]; - sprintf(errmsg, "Error: failed to read node numbering map from file id %d", *idne); - ex_err(__func__, errmsg, EX_MSG); - } -} - -/* - * Write the node numbering map - */ -void F2C(EXPNNNM)(int *idne, void_int *startn, void_int *num_ent, void_int *node_map, int *ierr) -{ - int64_t st, cnt; - if (ex_int64_status(*idne) & EX_BULK_INT64_API) { - st = *(int64_t *)startn; - cnt = *(int64_t *)num_ent; - } - else { - st = *(int *)startn; - cnt = *(int *)num_ent; - } - - if ((*ierr = ex_put_partial_id_map(*idne, EX_NODE_MAP, st, cnt, node_map)) != 0) { - char errmsg[MAX_ERR_LENGTH]; - sprintf(errmsg, "Error: failed to write node numbering map to file id %d", *idne); - ex_err(__func__, errmsg, EX_MSG); - } -} - -/* - * Read the node map for a processor - */ -void F2C(EXGNMP)(int *idne, void_int *node_mapi, void_int *node_mapb, void_int *node_mape, - int *processor, int *ierr) -{ - if ((*ierr = ex_get_processor_node_maps(*idne, node_mapi, node_mapb, node_mape, *processor)) != - 0) { - char errmsg[MAX_ERR_LENGTH]; - sprintf(errmsg, "Error: failed to read processor node map from file id %d", *idne); - ex_err(__func__, errmsg, EX_MSG); - } -} - -/* - * Write a node map for a processor - */ -void F2C(EXPNMP)(int *idne, void_int *node_mapi, void_int *node_mapb, void_int *node_mape, - int *processor, int *ierr) -{ - if ((*ierr = ex_put_processor_node_maps(*idne, node_mapi, node_mapb, node_mape, *processor)) != - 0) { - char errmsg[MAX_ERR_LENGTH]; - sprintf(errmsg, "Error: failed to write processor node map to file id %d", *idne); - ex_err(__func__, errmsg, EX_MSG); - } -} - -/* - * Read the element map for a processor - */ -void F2C(EXGEMP)(int *idne, void_int *elem_mapi, void_int *elem_mapb, int *processor, int *ierr) -{ - if ((*ierr = ex_get_processor_elem_maps(*idne, elem_mapi, elem_mapb, *processor)) != 0) { - char errmsg[MAX_ERR_LENGTH]; - sprintf(errmsg, "Error: failed to read processor element map from file id %d", *idne); - ex_err(__func__, errmsg, EX_MSG); - } -} - -/* - * Write the element map for a processor - */ -void F2C(EXPEMP)(int *idne, void_int *elem_mapi, void_int *elem_mapb, int *processor, int *ierr) -{ - if ((*ierr = ex_put_processor_elem_maps(*idne, elem_mapi, elem_mapb, *processor)) != 0) { - char errmsg[MAX_ERR_LENGTH]; - sprintf(errmsg, "Error: failed to write processor element map to file id %d", *idne); - ex_err(__func__, errmsg, EX_MSG); - } -} - -/* - * Read the communications map parameters for a single processor - */ -void F2C(EXGCMP)(int *idne, void_int *ncmap_ids, void_int *ncmap_node_cnts, void_int *ecmap_ids, - void_int *ecmap_elem_cnts, int *processor, int *ierr) -{ - if ((*ierr = ex_get_cmap_params(*idne, ncmap_ids, ncmap_node_cnts, ecmap_ids, ecmap_elem_cnts, - *processor)) != 0) { - char errmsg[MAX_ERR_LENGTH]; - sprintf(errmsg, "Error: failed to read comm map parameters from file id %d", *idne); - ex_err(__func__, errmsg, EX_MSG); - } -} - -/* - * Write the communications map parameters for a single processor - */ -void F2C(EXPCMP)(int *idne, void_int *nmap_ids, void_int *nmap_node_cnts, void_int *emap_ids, - void_int *emap_elem_cnts, int *processor, int *ierr) -{ - if ((*ierr = ex_put_cmap_params(*idne, nmap_ids, nmap_node_cnts, emap_ids, emap_elem_cnts, - *processor)) != 0) { - char errmsg[MAX_ERR_LENGTH]; - sprintf(errmsg, "Error: failed to write comm map parameters to file id %d", *idne); - ex_err(__func__, errmsg, EX_MSG); - } -} - -/* - * Write the communications map parameters for all processors - */ -void F2C(EXPCMPC)(int *idne, void_int *nmap_ids, void_int *nmap_node_cnts, void_int *nproc_ptrs, - void_int *emap_ids, void_int *emap_elem_cnts, void_int *eproc_ptrs, int *ierr) -{ - if ((*ierr = ex_put_cmap_params_cc(*idne, nmap_ids, nmap_node_cnts, nproc_ptrs, emap_ids, - emap_elem_cnts, eproc_ptrs)) != 0) { - char errmsg[MAX_ERR_LENGTH]; - sprintf(errmsg, "Error: failed to write comm map parameters to file id %d", *idne); - ex_err(__func__, errmsg, EX_MSG); - } -} - -/* - * Read the nodal communications map for a single processor - */ -void F2C(EXGNCM)(int *idne, entity_id *map_id, void_int *node_ids, void_int *proc_ids, - int *processor, int *ierr) -{ - if ((*ierr = ex_get_node_cmap(*idne, *map_id, node_ids, proc_ids, *processor)) != 0) { - char errmsg[MAX_ERR_LENGTH]; - sprintf(errmsg, "Error: failed to read nodal communications map from file id %d", *idne); - ex_err(__func__, errmsg, EX_MSG); - } -} - -/* - * Write the nodal communications map for a single processor - */ -void F2C(EXPNCM)(int *idne, entity_id *map_id, void_int *node_ids, void_int *proc_ids, - int *processor, int *ierr) -{ - if ((*ierr = ex_put_node_cmap(*idne, *map_id, node_ids, proc_ids, *processor)) != 0) { - char errmsg[MAX_ERR_LENGTH]; - sprintf(errmsg, "Error: failed to write nodal communications map to file id %d", *idne); - ex_err(__func__, errmsg, EX_MSG); - } -} - -/* - * Read the elemental communications map for a single processor - */ -void F2C(EXGECM)(int *idne, entity_id *map_id, void_int *elem_ids, void_int *side_ids, - void_int *proc_ids, int *processor, int *ierr) -{ - if ((*ierr = ex_get_elem_cmap(*idne, *map_id, elem_ids, side_ids, proc_ids, *processor)) != 0) { - char errmsg[MAX_ERR_LENGTH]; - sprintf(errmsg, "Error: failed to read elemental comm map from file id %d", *idne); - ex_err(__func__, errmsg, EX_MSG); - } -} - -/* - * Write the elemental communications map for a single processor - */ -void F2C(EXPECM)(int *idne, entity_id *map_id, void_int *elem_ids, void_int *side_ids, - void_int *proc_ids, int *processor, int *ierr) -{ - if ((*ierr = ex_put_elem_cmap(*idne, *map_id, elem_ids, side_ids, proc_ids, *processor)) != 0) { - char errmsg[MAX_ERR_LENGTH]; - sprintf(errmsg, "Error: failed to write elemental comm map to file id %d", *idne); - ex_err(__func__, errmsg, EX_MSG); - } -} + */ + +/* + * OVERVIEW + * + * This file contains jacket routines written in C for interfacing Fortran + * ExodusII function calls to the actual C binding for ExodusII. + + * In general, these functions handle + * character-string parameter conventions, convert between + * column-major-order arrays and row-major-order arrays, and map between + * array indices beginning at one and array indices beginning at zero. + * + */ + +/* LINTLIBRARY */ +#include "exodusII.h" +#include "exodusII_int.h" +#include "netcdf.h" +#include +#include +#include +#include + +/* + * The Build64 is for the "normal" SEACAS build which uses compiler + * options to change reals and integers into 8-byte quantities. The + * routines in addrwrap.F are used to down-convert the 8-byte integers + * into 4-byte integers which then call through to the routines in + * this file which have a '4' or '4_' appended to the routine name. + * These routines then call through to the C API routines. + * + * If DEFAULT_REAL_INT is defined, then the build is to build a + * fortran library interface that takes 4-byte ints and either 4-byte + * or 8-byte floating point (real/double) variables. In this case, the + * addrwrap routines are not built and a fortran client will call the + * routines in this file directly. + * + */ + +#if defined(Build64) && !defined(DEFAULT_REAL_INT) +/* 64-bit */ +#define real double +#define entity_id ex_entity_id +#ifdef ADDC_ +#define F2C(name) name##4_ +#else +#define F2C(name) name##4 +#endif + +#else +/* 32-bit */ +#define real float +#define entity_id int +#ifdef ADDC_ +#define F2C(name) name##_ +#else +#define F2C(name) name +#endif +#endif + +extern int ncopts; /* default is (NC_FATAL | NC_VERBOSE) */ +extern int exerrval; /* global integer that contains a + * Exodus-specific error code */ + +/* blank fill C string to make FORTRAN string */ +static void ex_fcdcpy(char *fstring, /* output string to be blank-filled */ + int fslen, /* length of output string */ + char *sstring) +{ /* input string, null-terminated */ + int i, len; + + if (sstring != NULL) { + len = strlen(sstring); + if (len > fslen) + len = fslen; + + for (i = 0; i < len; i++) + *(fstring + i) = *(sstring + i); + for (i = len; i < fslen; i++) + *(fstring + i) = ' '; + } + else { + for (i = 0; i < fslen; i++) + *(fstring + i) = ' '; + } +} + +/* copy function used to copy strings and strip trailing blanks */ +static void ex_fstrncpy(char *target, /* space to be copied into */ + char *source, /* string to be copied */ + int maxlen) +{ /* maximum length of *source */ + int len = maxlen; + + while (len-- && *source != '\0') + *target++ = *source++; + + len = maxlen; + while (len-- && *(--target) == ' ') + ; /* strip blanks */ + *(++target) = '\0'; /* insert new EOS marker */ +} + +/* copy function used to copy strings terminated with blanks */ +static void ex_nstrncpy(char *target, /* space to be copied into */ + char *source, /* string to be copied */ + int maxlen) +{ /* maximum length of *source */ + while (maxlen-- && *source != ' ') + *target++ = *source++; + *target = '\0'; +} + +/* Above are utility functions used below */ +/* ======================================================================== */ +/* Below are the exodus API functions */ +/* + * Adding a new function: + * + Protect the name with the f2c (uppercase) macro which will add/not add '4' and or '_' + * depending on the compilation mode. + * + * + float/double arguments are declared as 'real' which will be replaced with float or double. + * + * + If there are any character arguments 'X', then add an int* argument 'Xlen' at end of argument + * list + * This will contain the length of the passed in character argument. + * + * + Look at existing functions for guidance... + */ + +/* + * create an EXODUS II file + */ +int F2C(EXCRE)(char *path, int *clobmode, int *cpu_word_size, int *io_word_size, int *ierr, + int pathlen) +{ + char *name; + int idexo; + + if (!(name = malloc((pathlen + 1) * sizeof(char)))) { + *ierr = EX_MEMFAIL; + return (EX_FATAL); + } + (void)ex_nstrncpy(name, path, pathlen); + + if ((idexo = ex_create(name, *clobmode, cpu_word_size, io_word_size)) != EX_FATAL) { + free(name); + *ierr = 0; + return (idexo); + } + free(name); + *ierr = exerrval; + return (EX_FATAL); +} + +/* + * open an EXODUS II file + */ +int F2C(EXOPEN)(char *path, int *mode, int *cpu_word_size, int *io_word_size, + float *version, /* This is float always; not real */ + int *ierr, int pathlen) +{ + char *name; + int idexo; + + if (!(name = malloc((pathlen + 1) * sizeof(char)))) { + *ierr = EX_MEMFAIL; + return (EX_FATAL); + } + (void)ex_nstrncpy(name, path, pathlen); + if ((idexo = ex_open(name, *mode, cpu_word_size, io_word_size, version)) != EX_FATAL) { + free(name); + *ierr = 0; + return (idexo); + } + free(name); + *ierr = EX_FATAL; + return (EX_FATAL); +} + +/* + * close an EXODUS II file + */ +void F2C(EXCLOS)(int *idexo, int *ierr) { *ierr = ex_close(*idexo); } + +/* + * update an EXODUS II file + */ +void F2C(EXUPDA)(int *idexo, int *ierr) { *ierr = ex_update(*idexo); } + +/* + * write initialization parameters + */ +void F2C(EXPINI)(int *idexo, char *title, void_int *num_dim, void_int *num_nodes, + void_int *num_elem, void_int *num_elem_blk, void_int *num_node_sets, + void_int *num_side_sets, int *ierr, int titlelen) +{ + int slen; + char *name; + + slen = MAX_LINE_LENGTH; /* max line size */ + // AIS + printf("%i\n", slen); + printf("%i\n", titlelen); + if (titlelen != MAX_LINE_LENGTH) { + slen = titlelen; + } + name = malloc((slen + 1) * sizeof(char)); + (void)ex_fstrncpy(name, title, slen); + + if (ex_int64_status(*idexo) & EX_BULK_INT64_API) { + int64_t *n_dim = num_dim; + int64_t *n_nodes = num_nodes; + int64_t *n_elem = num_elem; + int64_t *n_elem_blk = num_elem_blk; + int64_t *n_node_sets = num_node_sets; + int64_t *n_side_sets = num_side_sets; + // AIS + printf("I am in then"); + // AIF + *ierr = ex_put_init(*idexo, name, *n_dim, *n_nodes, *n_elem, *n_elem_blk, *n_node_sets, + *n_side_sets); + // AIS + printf("%i\n", *ierr); + // AIF + } + else { + int *n_dim = num_dim; + int *n_nodes = num_nodes; + int *n_elem = num_elem; + int *n_elem_blk = num_elem_blk; + int *n_node_sets = num_node_sets; + int *n_side_sets = num_side_sets; + // AIS + printf("I am in else"); + // AIF + *ierr = ex_put_init(*idexo, name, *n_dim, *n_nodes, *n_elem, *n_elem_blk, *n_node_sets, + *n_side_sets); + } + free(name); +} + +/* + * read initialization parameters + */ +void F2C(EXGINI)(int *idexo, char *title, void_int *num_dim, void_int *num_nodes, + void_int *num_elem, void_int *num_elem_blk, void_int *num_node_sets, + void_int *num_side_sets, int *ierr, int titlelen) +{ + int slen; + char *name; + + *ierr = 0; + slen = MAX_LINE_LENGTH; /* max line size */ + if (titlelen != MAX_LINE_LENGTH) { + slen = titlelen; + } + name = malloc((slen + 1) * sizeof(char)); + memset(name, 0, slen + 1); + + *ierr = ex_get_init(*idexo, name, num_dim, num_nodes, num_elem, num_elem_blk, num_node_sets, + num_side_sets); + + ex_fcdcpy(title, slen, name); + free(name); +} + +/* + * write QA records + */ +void F2C(EXPQA)(int *idexo, int *num_qa_records, char *qa_record, int *ierr, int qa_recordlen) +{ + char errmsg[MAX_ERR_LENGTH]; + char **sptr; /* internal string pointer array for malloc + * use */ + int i, ii, iii, slen, alen; + + *ierr = 0; /* default no error */ + + slen = MAX_STR_LENGTH; /* max str size */ + if (qa_recordlen != MAX_STR_LENGTH) { + slen = qa_recordlen; + } + alen = 4; /* qa records are 4 strings deep */ + + /* Allocate space for the name ptr array */ + if (!(sptr = malloc(((*num_qa_records) * alen + 1) * sizeof(char *)))) { + *ierr = EX_MEMFAIL; + return; + } + /* + * Allocate space for each of the strings, where size = slen, place + * ptr into str ptr array, and Copy Fortran qa records to staging + * space + */ + iii = 0; /* offset counter */ + for (i = 0; i < *num_qa_records; i++) { + for (ii = 0; ii < alen; ii++) { + *(sptr + iii) = malloc((slen + 1) * sizeof(char)); + if (*(sptr + iii) == 0) { + free(sptr); /* free up array ptr space */ + *ierr = EX_MEMFAIL; + sprintf(errmsg, "Error: failed to allocate space for qa record %d for file id %d", i, + *idexo); + ex_err(__func__, errmsg, EX_MEMFAIL); + return; + } + /* copy fortran string into allocated space */ + ex_fstrncpy(*(sptr + iii), qa_record + iii * qa_recordlen, slen); + iii++; /* bump char array pointer */ + } + } + *(sptr + iii) = 0; /* set last pointer to null */ + + if (ex_put_qa(*idexo, *num_qa_records, (void *)sptr) == EX_FATAL) + *ierr = EX_FATAL; + + /* Free up the space we used */ + iii = 0; + for (i = 0; i < *num_qa_records; i++) { + for (ii = 0; ii < alen; ii++) { + free(*(sptr + iii)); /* First free up string space */ + iii++; + } + } + free(sptr); /* Then free up array ptr space */ +} + +/* + * read QA records + */ +void F2C(EXGQA)(int *idexo, char *qa_record, int *ierr, int qa_recordlen) +{ + int num_qa_records; + char **sptr; /* internal string pointer array for malloc + * use */ + int i, ii, iii, slen, alen; + + *ierr = 0; /* default no error */ + + slen = MAX_STR_LENGTH; /* max str size */ + if (qa_recordlen != MAX_STR_LENGTH) { + slen = qa_recordlen; + } + alen = 4; /* qa records are 4 strings deep */ + + /* do ExodusII C call to find out how many qa records are avail */ + num_qa_records = ex_inquire_int(*idexo, EX_INQ_QA); + + /* Allocate space for the QA string ptr array */ + if (!(sptr = malloc((num_qa_records * alen + 1) * sizeof(char *)))) { + *ierr = EX_MEMFAIL; + return; + } + /* + * Step 1: Allocate space for each of the strings, where size = slen, + * place string ptr into str ptr array. Step 2: Call routine to get + * qa records Step 3: Copy C qa records to passed Fortran array space + */ + + iii = 0; /* offset counter */ + for (i = 0; i < num_qa_records; i++) { /* pointer allocation loop */ + for (ii = 0; ii < alen; ii++) { + *(sptr + iii) = malloc((slen + 1) * sizeof(char)); + if (*(sptr + iii) == 0) { + *ierr = EX_MEMFAIL; + free(sptr); + return; + } + iii++; /* bump char array pointer */ + } + } + *(sptr + iii) = 0; /* null out last pointer */ + + /* do ExodusII C call to get qa records */ + if (ex_get_qa(*idexo, (void *)sptr) == EX_FATAL) { + *ierr = EX_FATAL; + } + if (*ierr != EX_FATAL) { + iii = 0; /* offset counter */ + for (i = 0; i < num_qa_records; i++) { /* string copy loop */ + for (ii = 0; ii < alen; ii++) { + /* copy fortran string into allocated space */ + ex_fcdcpy(qa_record + iii * qa_recordlen, slen, *(sptr + iii)); + iii++; /* bump char array pointer */ + } + } + } + + /* Free up the space we used */ + iii = 0; + for (i = 0; i < num_qa_records; i++) { + for (ii = 0; ii < alen; ii++) { + free(*(sptr + iii)); /* First free up string space */ + iii++; + } + } + free(sptr); /* Then free up array ptr space */ +} + +/* + * write information records + */ +void F2C(EXPINF)(int *idexo, int *num_info, char *info, int *ierr, int infolen) +{ + char **aptr; /* internal string array pointer for malloc + * use */ + char *sptr; /* internal string pointer for malloc use */ + int i, slen; + + *ierr = 0; /* default no error */ + slen = MAX_LINE_LENGTH; /* max str size */ + if (infolen != MAX_LINE_LENGTH) { + slen = infolen; + } + /* Allocate space for the string ptr array */ + if (!(aptr = malloc(((*num_info) + 1) * sizeof(char *)))) { + *ierr = EX_MEMFAIL; + return; + } + /* Allocate staging space for the info records */ + if (!(sptr = malloc(*num_info * (slen + 1) * sizeof(char)))) { + free(aptr); /* Free up string ptr array */ + *ierr = EX_MEMFAIL; + return; + } + /* Copy Fortran info records to staging space */ + for (i = 0; i < *num_info; i++) { + *(aptr + i) = sptr + i * (slen + 1); /* put address into ptr array */ + ex_fstrncpy(*(aptr + i), info + i * infolen, slen); /* copy string into + * buffer */ + } + *(aptr + i) = 0; /* null out last ptr */ + if (ex_put_info(*idexo, *num_info, aptr) == EX_FATAL) { + *ierr = EX_FATAL; + free(sptr); /* Free up string staging area */ + free(aptr); /* Free up string ptr array */ + return; + } + free(sptr); /* Free up string staging area */ + free(aptr); /* Free up string ptr array */ +} + +/* + * read information records + */ +void F2C(EXGINF)(int *idexo, char *info, int *ierr, int infolen) +{ + char **aptr; /* internal string array pointer for malloc + * use */ + char *sptr; /* internal string pointer for malloc use */ + int i, slen, num_info; + + *ierr = 0; /* default no error */ + + /* do exodusII C call to find out how many info records are avail */ + num_info = ex_inquire_int(*idexo, EX_INQ_INFO); + + slen = MAX_LINE_LENGTH; /* max str size */ + if (infolen != MAX_LINE_LENGTH) { + slen = infolen; + } + /* + * Step 1: Allocate space for string ptr array Step 2: Allocate space + * for info record strings, and put pointers into str ptr array Step + * 3: Do ExodusII call to get records Step 4: Copy strings into + * passed Fortran buffer space + */ + + /* Allocate space for the string ptr array */ + if (!(aptr = malloc((num_info + 1) * sizeof(char *)))) { + *ierr = EX_MEMFAIL; + return; + } + /* Allocate block of space for info strings */ + if (!(sptr = malloc(num_info * (slen + 1) * sizeof(char)))) { + free(aptr); /* Free up string ptr array */ + *ierr = EX_MEMFAIL; + return; + } + for (i = 0; i < num_info; i++) /* Put pointers to the info records in ptr + * array */ + *(aptr + i) = sptr + i * (slen + 1); /* put ptr in string ptr + * array */ + *(aptr + i) = 0; /* null out last pointer */ + + /* Do exodusII call to get info records */ + if (ex_get_info(*idexo, aptr) == EX_FATAL) { + *ierr = EX_FATAL; + free(sptr); + free(aptr); + return; + } + for (i = 0; i < num_info; i++) { /* Copy Fortran info records to + * staging space */ + ex_fcdcpy(info + i * infolen, slen, *(aptr + i)); /* copy string into + * buffer */ + /** printf("[exginf] rec: %d , %s\n",i,*(aptr+i)); **/ + } + + free(sptr); /* Free up string staging area */ + free(aptr); /* Free up string ptr array */ +} + +/* + * write nodal coordinates + */ +void F2C(EXPCOR)(int *idexo, real *x_coor, real *y_coor, real *z_coor, int *ierr) +{ + *ierr = ex_put_coord(*idexo, x_coor, y_coor, z_coor); +} + +/* + * read nodal coordinates + */ +void F2C(EXGCOR)(int *idexo, real *x_coor, real *y_coor, real *z_coor, int *ierr) +{ + *ierr = ex_get_coord(*idexo, x_coor, y_coor, z_coor); +} + +/* + * write coordinate names + */ +void F2C(EXPCON)(int *idexo, char *coord_names, int *ierr, int coord_nameslen) +{ + char **aptr; /* internal array of string pointers for + * malloc use */ + char *sptr; /* internal string pointer for malloc use */ + int i, ndim, slen; + + *ierr = 0; /* default no error */ + + slen = ex_inquire_int(*idexo, EX_INQ_DB_MAX_ALLOWED_NAME_LENGTH); /* max str size */ + if (coord_nameslen < slen) { + slen = coord_nameslen; + } + /* do ExodusII C call to find out how many dimensions */ + ndim = ex_inquire_int(*idexo, EX_INQ_DIM); + + /* Allocate space for the name ptr array */ + if (!(aptr = malloc((ndim + 1) * sizeof(char *)))) { + *ierr = EX_MEMFAIL; + return; + } + /* + * Allocate a block of space for the strings, where size = slen, + * place ptrs into str ptr array, and Copy Fortran coordinate names + * to staging space + */ + + if (!(sptr = malloc(ndim * (slen + 1) * sizeof(char)))) { + *ierr = EX_MEMFAIL; + free(aptr); + return; + } + for (i = 0; i < ndim; i++) { + *(aptr + i) = sptr + i * (slen + 1); + /* copy fortran string into allocated space */ + ex_fstrncpy(*(aptr + i), coord_names + i * coord_nameslen, slen); + } + *(aptr + i) = 0; /* set last pointer to null */ + + if (ex_put_coord_names(*idexo, aptr) == EX_FATAL) { + *ierr = EX_FATAL; + } + /* Free up the space we used */ + free(sptr); /* First free up string space */ + free(aptr); /* Then free up array ptr space */ +} +/* + * read coordinate names + */ +void F2C(EXGCON)(int *idexo, char *coord_names, int *ierr, int coord_nameslen) +{ + char **aptr; /* internal string array pointer for malloc + * use */ + char *sptr; /* internal string pointer for malloc use */ + int ndim; + int i, slen; + + *ierr = 0; /* default no error */ + + slen = ex_inquire_int(*idexo, EX_INQ_MAX_READ_NAME_LENGTH); /* max string size */ + if (coord_nameslen < slen) { + slen = coord_nameslen; + } + /* do ExodusII C call to find out how many dimensions */ + ndim = ex_inquire_int(*idexo, EX_INQ_DIM); + + /* allocate memory to stage the coordinate name ptrs into */ + if (!(aptr = malloc((ndim + 1) * sizeof(char *)))) { + *ierr = EX_MEMFAIL; + return; + } + /* allocate a block of memory to stage the coordinate names into */ + if (!(sptr = malloc(ndim * (slen + 1) * sizeof(char)))) { + *ierr = EX_MEMFAIL; + free(aptr); /* free up array ptr space */ + return; + } + for (i = 0; i < ndim; i++) { /* put pointers to staging space into ptr + * array */ + *(aptr + i) = sptr + i * (slen + 1); + } + + /* do ExodusII C call to get coord name records */ + if (ex_get_coord_names(*idexo, aptr) == EX_FATAL) { + *ierr = EX_FATAL; + free(sptr); /* free up string space */ + free(aptr); /* free up array ptr space */ + return; + } + /* copy C strings to Fortran arrays */ + memset(coord_names, 0, ndim * coord_nameslen); + for (i = 0; i < ndim; i++) { + ex_fcdcpy(coord_names + i * coord_nameslen, slen, *(aptr + i)); /* copy and blank fill */ + } + + free(sptr); /* Free up string buffer space */ + free(aptr); /* Finally, free up array ptr space */ + return; +} + +/* + * write element order map + */ +void F2C(EXPMAP)(int *idexo, void_int *elem_map, int *ierr) +{ + *ierr = ex_put_map(*idexo, elem_map); +} + +/* + * read element order map + */ +void F2C(EXGMAP)(int *idexo, void_int *elem_map, int *ierr) +{ + *ierr = ex_get_map(*idexo, elem_map); +} + +/* + * write concatenated element block parameters + */ +void F2C(EXPCLB)(int *idexo, void_int *elem_blk_id, char *elem_type, void_int *num_elem_this_blk, + void_int *num_nodes_per_elem, void_int *num_attr, int *create_maps, int *ierr, + int elem_typelen) +{ + size_t num_elem_blk; + + char **aptr; /* ptr to temp staging space for string array + * ptrs */ + char * sptr; /* ptr to temp staging space for strings */ + size_t i, slen; + + *ierr = 0; /* default no error */ + + num_elem_blk = ex_inquire_int(*idexo, EX_INQ_ELEM_BLK); + + slen = MAX_STR_LENGTH; /* max str size */ + if (elem_typelen != MAX_STR_LENGTH) { + slen = elem_typelen; + } + /* allocate memory for pointer array */ + if (!(aptr = malloc((num_elem_blk + 1) * sizeof(char *)))) { + *ierr = EX_MEMFAIL; + return; + } + /* allocate memory to stage the element type name into */ + if (!(sptr = malloc(num_elem_blk * (slen + 1) * sizeof(char)))) { + free(aptr); + *ierr = EX_MEMFAIL; + return; + } + /* Copy element type names from Fortran array to staging area */ + for (i = 0; i < num_elem_blk; i++) { + *(aptr + i) = sptr + i * (slen + 1); /* put address into ptr array */ + ex_fstrncpy(*(aptr + i), elem_type + i * elem_typelen, slen); /* copy string into + * buffer */ + } + *(aptr + i) = 0; /* null out last ptr */ + + if (ex_put_concat_elem_block(*idexo, elem_blk_id, aptr, num_elem_this_blk, num_nodes_per_elem, + num_attr, *create_maps) == EX_FATAL) { + *ierr = EX_FATAL; + } + free(sptr); + free(aptr); +} + +/* + * write element block parameters + */ +void F2C(EXPELB)(int *idexo, entity_id *elem_blk_id, char *elem_type, void_int *num_elem_this_blk, + void_int *num_nodes_per_elem, void_int *num_attr, int *ierr, int elem_typelen) +{ + char *sptr; /* internal string pointer for malloc use */ + int slen; + + *ierr = 0; /* default no error */ + + slen = MAX_STR_LENGTH; /* max str size */ + if (elem_typelen != MAX_STR_LENGTH) { + slen = elem_typelen; + } + /* allocate memory to stage the element type name into */ + if (!(sptr = malloc((slen + 1) * sizeof(char)))) { + *ierr = EX_MEMFAIL; + return; + } + /* Copy element type names from Fortran array to staging area */ + ex_fstrncpy(sptr, elem_type, slen); + + if (ex_int64_status(*idexo) & EX_BULK_INT64_API) { + int64_t *n_elem_this_blk = num_elem_this_blk; + int64_t *n_nodes_per_elem = num_nodes_per_elem; + int64_t *n_attr = num_attr; + + *ierr = + ex_put_elem_block(*idexo, *elem_blk_id, sptr, *n_elem_this_blk, *n_nodes_per_elem, *n_attr); + } + else { + int *n_elem_this_blk = num_elem_this_blk; + int *n_nodes_per_elem = num_nodes_per_elem; + int *n_attr = num_attr; + + *ierr = + ex_put_elem_block(*idexo, *elem_blk_id, sptr, *n_elem_this_blk, *n_nodes_per_elem, *n_attr); + } + free(sptr); +} + +/* + * read element block parameters + */ +void F2C(EXGELB)(int *idexo, entity_id *elem_blk_id, char *elem_type, void_int *num_elem_this_blk, + void_int *num_nodes_per_elem, void_int *num_attr, int *ierr, int elem_typelen) +{ + char *sptr; /* internal string pointer for malloc use */ + int slen; + + *ierr = 0; + + slen = MAX_STR_LENGTH; /* max str size */ + if (elem_typelen != MAX_STR_LENGTH) { + slen = elem_typelen; + } + /* allocate memory to stage the element type names into */ + if (!(sptr = malloc((slen + 1) * sizeof(char)))) { + *ierr = EX_MEMFAIL; + return; + } + if (ex_get_elem_block(*idexo, *elem_blk_id, sptr, num_elem_this_blk, num_nodes_per_elem, + num_attr) == EX_FATAL) { + *ierr = EX_FATAL; + return; + } + /* Copy element type name from staging area to Fortran array */ + memset(elem_type, 0, elem_typelen); + ex_fcdcpy(elem_type, slen, sptr); + free(sptr); +} + +/* + * read element blocks IDs + */ +void F2C(EXGEBI)(int *idexo, void_int *elem_blk_ids, int *ierr) +{ + *ierr = ex_get_elem_blk_ids(*idexo, elem_blk_ids); +} + +/* + * write element block connectivity + */ +void F2C(EXPELC)(int *idexo, entity_id *elem_blk_id, void_int *connect, int *ierr) +{ + *ierr = ex_put_elem_conn(*idexo, *elem_blk_id, connect); +} + +/* + * read element block connectivity + */ +void F2C(EXGELC)(int *idexo, entity_id *elem_blk_id, void_int *connect, int *ierr) +{ + *ierr = ex_get_elem_conn(*idexo, *elem_blk_id, connect); +} + +/* + * write entity count-per-polyhedra information for nsided block + */ +void F2C(EXPECPP)(int *idexo, int *obj_type, entity_id *elem_blk_id, int *counts, int *ierr) +{ + *ierr = + ex_put_entity_count_per_polyhedra(*idexo, (ex_entity_type)*obj_type, *elem_blk_id, counts); +} + +/* + * read entity count-per-polyhedra information for nsided block + */ +void F2C(EXGECPP)(int *idexo, int *obj_type, entity_id *elem_blk_id, int *counts, int *ierr) +{ + *ierr = + ex_get_entity_count_per_polyhedra(*idexo, (ex_entity_type)*obj_type, *elem_blk_id, counts); +} + +/* + * write element block attributes + */ +void F2C(EXPEAT)(int *idexo, entity_id *elem_blk_id, real *attrib, int *ierr) +{ + *ierr = ex_put_elem_attr(*idexo, *elem_blk_id, attrib); +} + +/* + * read element block attributes + */ +void F2C(EXGEAT)(int *idexo, entity_id *elem_blk_id, real *attrib, int *ierr) +{ + *ierr = ex_get_elem_attr(*idexo, *elem_blk_id, attrib); +} + +/* + * read element block attribute names + */ +void F2C(EXGEAN)(int *idexo, entity_id *elem_blk_id, int *num_attr, char *names, int *ierr, + int nameslen) +{ + char **aptr; /* ptr to temp staging space for string array + * ptrs */ + char *sptr; /* ptr to temp staging space for strings */ + int i, slen; + + *ierr = 0; /* default no error */ + + slen = ex_inquire_int(*idexo, EX_INQ_MAX_READ_NAME_LENGTH); /* max string size */ + if (nameslen < slen) { + slen = nameslen; + } + /* allocate memory to for pointer array */ + if (!(aptr = malloc((*num_attr + 1) * sizeof(char *)))) { + *ierr = EX_MEMFAIL; + return; + } + /* Allocate staging space for the variable names */ + if (!(sptr = malloc(*num_attr * (slen + 1) * sizeof(char)))) { + *ierr = EX_MEMFAIL; + free(aptr); /* Free up string ptr array */ + return; + } + for (i = 0; i < *num_attr; i++) + *(aptr + i) = sptr + i * (slen + 1); /* put address into ptr array */ + *(aptr + i) = 0; /* null out last ptr */ + + *ierr = 0; + if (ex_get_elem_attr_names(*idexo, *elem_blk_id, aptr) == EX_FATAL) { + *ierr = EX_FATAL; + free(sptr); /* free up allocated space */ + free(aptr); + return; + } + /* Copy Fortran names from staging space */ + memset(names, 0, *num_attr * nameslen); + for (i = 0; i < *num_attr; i++) { + ex_fcdcpy(names + i * nameslen, slen, *(aptr + i)); /* copy str into Fortran + * buffer */ + } + + free(sptr); /* Free up string staging area */ + free(aptr); /* Free up string ptr array */ +} + +/* + * write element block attribute names + */ +void F2C(EXPEAN)(int *idexo, entity_id *elem_blk_id, int *num_attr, char *names, int *ierr, + int nameslen) +{ + char **aptr; /* ptr to temp staging space for string array + * ptrs */ + char *sptr; /* ptr to temp staging space for strings */ + int i, slen; + + *ierr = 0; /* default no error */ + + slen = ex_inquire_int(*idexo, EX_INQ_DB_MAX_ALLOWED_NAME_LENGTH); /* max str size */ + if (nameslen < slen) { + slen = nameslen; + } + /* allocate memory to for pointer array */ + if (!(aptr = malloc((*num_attr + 1) * sizeof(char *)))) { + *ierr = EX_MEMFAIL; + return; + } + /* Allocate staging space for the variable names */ + if (!(sptr = malloc(*num_attr * (slen + 1) * sizeof(char)))) { + *ierr = EX_MEMFAIL; + free(aptr); /* Free up string ptr array */ + return; + } + /* Copy Fortran names to staging space */ + for (i = 0; i < *num_attr; i++) { + *(aptr + i) = sptr + i * (slen + 1); /* put address into ptr array */ + ex_fstrncpy(*(aptr + i), names + i * nameslen, slen); /* copy string into + * buffer */ + } + *(aptr + i) = 0; /* null out last ptr */ + + *ierr = 0; + if (ex_put_elem_attr_names(*idexo, *elem_blk_id, aptr) == EX_FATAL) { + *ierr = EX_FATAL; + } + free(sptr); /* Free up string staging area */ + free(aptr); /* Free up string ptr array */ +} + +/* + * write object names + */ +void F2C(EXPNAMS)(int *idexo, int *type, int *num_obj, char *names, int *ierr, int nameslen) +{ + char **aptr; /* ptr to temp staging space for string array + * ptrs */ + char *sptr; /* ptr to temp staging space for strings */ + int i, slen; + + *ierr = 0; /* default no error */ + + slen = ex_inquire_int(*idexo, EX_INQ_DB_MAX_ALLOWED_NAME_LENGTH); /* max str size */ + if (nameslen < slen) { + slen = nameslen; + } + /* allocate memory for pointer array */ + if (!(aptr = malloc((*num_obj + 1) * sizeof(char *)))) { + *ierr = EX_MEMFAIL; + return; + } + /* Allocate staging space for the variable names */ + if (!(sptr = malloc(*num_obj * (slen + 1) * sizeof(char)))) { + free(aptr); /* Free up string ptr array */ + *ierr = EX_MEMFAIL; + return; + } + /* Copy Fortran names to staging space */ + for (i = 0; i < *num_obj; i++) { + *(aptr + i) = sptr + i * (slen + 1); /* put address into ptr array */ + ex_fstrncpy(*(aptr + i), names + i * nameslen, slen); /* copy string into + * buffer */ + } + *(aptr + i) = 0; /* null out last ptr */ + /* do ExodusII C call to write results variables names */ + if (ex_put_names(*idexo, (ex_entity_type)*type, aptr) == EX_FATAL) { + *ierr = EX_FATAL; + } + free(sptr); /* Free up string staging area */ + free(aptr); /* Free up string ptr array */ +} + +/* + * read object names + */ +void F2C(EXGNAMS)(int *idexo, int *type, int *num_obj, char *names, int *ierr, int nameslen) +{ + char **aptr; /* ptr to temp staging space for string array + * ptrs */ + char *sptr; /* ptr to temp staging space for strings */ + int i, slen; + + *ierr = 0; /* default no error */ + + slen = ex_inquire_int(*idexo, EX_INQ_MAX_READ_NAME_LENGTH); /* max string size */ + if (nameslen < slen) { + slen = nameslen; + } + /* allocate memory to for pointer array */ + if (!(aptr = malloc((*num_obj + 1) * sizeof(char *)))) { + *ierr = EX_MEMFAIL; + return; + } + /* Allocate staging space for the variable names */ + if (!(sptr = malloc(*num_obj * (slen + 1) * sizeof(char)))) { + *ierr = EX_MEMFAIL; + free(aptr); /* Free up string ptr array */ + return; + } + for (i = 0; i < *num_obj; i++) + *(aptr + i) = sptr + i * (slen + 1); /* put address into ptr array */ + *(aptr + i) = 0; /* null out last ptr */ + + /* do ExodusII C call to read results variables names */ + if (ex_get_names(*idexo, (ex_entity_type)*type, aptr) == EX_FATAL) { + *ierr = EX_FATAL; + free(sptr); /* free up allocated space */ + free(aptr); + return; + } + /* Copy Fortran names from staging space */ + memset(names, 0, *num_obj * nameslen); + for (i = 0; i < *num_obj; i++) { + ex_fcdcpy(names + i * nameslen, slen, *(aptr + i)); /* copy str into Fortran + * buffer */ + } + + free(sptr); /* Free up string staging area */ + free(aptr); /* Free up string ptr array */ +} + +/* + * write property array names + */ +void F2C(EXPPN)(int *idexo, int *obj_type, int *num_props, char *prop_names, int *ierr, + int prop_nameslen) +{ + char **aptr; /* internal string array pointer for malloc + * use */ + char *sptr; /* internal string pointer for malloc use */ + int i, slen; + + *ierr = 0; + + slen = ex_inquire_int(*idexo, EX_INQ_DB_MAX_ALLOWED_NAME_LENGTH); /* max str size */ + if (prop_nameslen < slen) { + slen = prop_nameslen; + } + /* Allocate space for the name ptr array */ + if (!(aptr = malloc((*num_props + 1) * sizeof(char *)))) { + *ierr = EX_MEMFAIL; + return; + } + /* + * Allocate a block of space for the strings, where size = slen, + * place ptrs into str ptr array, and Copy Fortran coordinate names + * to staging space + */ + + if (!(sptr = malloc((*num_props) * (slen + 1) * sizeof(char)))) { + *ierr = EX_MEMFAIL; + free(aptr); + return; + } + for (i = 0; i < *num_props; i++) { + *(aptr + i) = sptr + i * (slen + 1); + /* copy fortran string into allocated space */ + ex_fstrncpy(*(aptr + i), prop_names + i * prop_nameslen, slen); + } + *(aptr + i) = 0; /* set last pointer to null */ + + if (ex_put_prop_names(*idexo, (ex_entity_type)*obj_type, *num_props, aptr) == EX_FATAL) { + *ierr = EX_FATAL; + } + /* Free up the space we used */ + free(sptr); /* First free up string space */ + free(aptr); /* Then free up array ptr space */ +} + +/* + * read property array names + */ +void F2C(EXGPN)(int *idexo, int *obj_type, char *prop_names, int *ierr, int prop_nameslen) +{ + char errmsg[MAX_ERR_LENGTH]; + char **aptr; /* internal string array pointer for malloc + * use */ + char * sptr; /* internal string pointer for malloc use */ + int i, slen; + ex_inquiry inq_code; + int num_props; + + *ierr = 0; + + slen = ex_inquire_int(*idexo, EX_INQ_MAX_READ_NAME_LENGTH); /* max string size */ + if (prop_nameslen < slen) { + slen = prop_nameslen; + } + switch ((ex_entity_type)*obj_type) { + case EX_ELEM_BLOCK: inq_code = EX_INQ_EB_PROP; break; + case EX_NODE_SET: inq_code = EX_INQ_NS_PROP; break; + case EX_SIDE_SET: inq_code = EX_INQ_SS_PROP; break; + case EX_ELEM_MAP: inq_code = EX_INQ_EM_PROP; break; + case EX_NODE_MAP: inq_code = EX_INQ_NM_PROP; break; + default: + exerrval = EX_BADPARAM; + *ierr = EX_BADPARAM; + sprintf(errmsg, "Error: object type %d not supported; file id %d", *obj_type, *idexo); + ex_err(__func__, errmsg, exerrval); + return; + } + + /* do ExodusII C call to find out how many properties */ + num_props = ex_inquire_int(*idexo, inq_code); + + /* Allocate space for the name ptr array */ + if (!(aptr = malloc((num_props + 1) * sizeof(char *)))) { + *ierr = EX_MEMFAIL; + return; + } + /* + * Allocate a block of space for the strings, where size = slen, + * place ptrs into str ptr array, and Copy Fortran coordinate names + * to staging space + */ + + if (!(sptr = malloc(num_props * (slen + 1) * sizeof(char)))) { + *ierr = EX_MEMFAIL; + free(aptr); + return; + } + memset(sptr, 0, num_props * (slen + 1)); + + for (i = 0; i < num_props; i++) + *(aptr + i) = sptr + i * (slen + 1); /* put ptrs to staging space + * into ptr array */ + *(aptr + i) = 0; /* set last pointer to null */ + + /* do ExodusII C call to get property name records */ + if (ex_get_prop_names(*idexo, (ex_entity_type)*obj_type, aptr) == EX_FATAL) { + *ierr = EX_FATAL; + free(sptr); /* free up string space */ + free(aptr); /* free up array ptr space */ + return; + } + /* copy C strings to Fortran arrays */ + memset(prop_names, 0, num_props * prop_nameslen); + for (i = 0; i < num_props; i++) { + ex_fcdcpy(prop_names + i * prop_nameslen, slen, *(aptr + i)); /* copy and blank fill */ + } + + /* Free up the space we used */ + free(sptr); /* First free up string space */ + free(aptr); /* Then free up array ptr space */ +} + +/* + * write object property + */ +void F2C(EXPP)(int *idexo, int *obj_type, entity_id *obj_id, char *prop_name, entity_id *value, + int *ierr, int prop_namelen) +{ + char *sptr; /* internal string pointer for malloc use */ + int slen; + + *ierr = 0; + + slen = ex_inquire_int(*idexo, EX_INQ_DB_MAX_ALLOWED_NAME_LENGTH); /* max str size */ + if (prop_namelen < slen) { + slen = prop_namelen; + } + /* allocate memory to stage the property name into */ + if (!(sptr = malloc((slen + 1) * sizeof(char)))) { + *ierr = EX_MEMFAIL; + return; + } + /* Copy property name from Fortran string to staging area */ + ex_fstrncpy(sptr, prop_name, slen); + + *ierr = ex_put_prop(*idexo, (ex_entity_type)*obj_type, *obj_id, sptr, *value); + + free(sptr); +} + +/* + * read object property + */ +void F2C(EXGP)(int *idexo, int *obj_type, entity_id *obj_id, char *prop_name, void_int *value, + int *ierr, int prop_namelen) +{ + char *sptr; /* internal string pointer for malloc use */ + int slen; + + *ierr = 0; + + slen = ex_inquire_int(*idexo, EX_INQ_MAX_READ_NAME_LENGTH); /* max string size */ + if (prop_namelen < slen) { + slen = prop_namelen; + } + /* allocate memory to stage the property name into */ + if (!(sptr = malloc((slen + 1) * sizeof(char)))) { + *ierr = EX_MEMFAIL; + } + /* Copy property name from Fortran string to staging area */ + ex_fstrncpy(sptr, prop_name, slen); + + /* use exodusII C routine to get the property value */ + if (ex_get_prop(*idexo, (ex_entity_type)*obj_type, *obj_id, sptr, value) == EX_FATAL) { + *ierr = EX_FATAL; + } + free(sptr); +} + +/* + * read object property array + */ +void F2C(EXGPA)(int *idexo, int *obj_type, char *prop_name, void_int *values, int *ierr, + int prop_namelen) +{ + char *sptr; /* internal string pointer for malloc use */ + int slen; + + *ierr = 0; + + slen = ex_inquire_int(*idexo, EX_INQ_MAX_READ_NAME_LENGTH); /* max string size */ + if (prop_namelen < slen) { + slen = prop_namelen; + } + /* allocate memory to stage the property name into */ + if (!(sptr = malloc((slen + 1) * sizeof(char)))) { + *ierr = EX_MEMFAIL; + } + memset(sptr, 0, slen + 1); + + /* Copy property name from Fortran string to staging area */ + ex_fstrncpy(sptr, prop_name, slen); + + /* use exodusII C routine to get the values array */ + if (ex_get_prop_array(*idexo, (ex_entity_type)*obj_type, sptr, values) == EX_FATAL) { + *ierr = EX_FATAL; + } + free(sptr); +} + +/* + * write object property array + */ +void F2C(EXPPA)(int *idexo, int *obj_type, char *prop_name, void_int *values, int *ierr, + int prop_namelen) +{ + char *sptr; /* internal string pointer for malloc use */ + int slen; + + *ierr = 0; + + slen = ex_inquire_int(*idexo, EX_INQ_DB_MAX_ALLOWED_NAME_LENGTH); /* max str size */ + if (prop_namelen < slen) { + slen = prop_namelen; + } + /* allocate memory to stage the property name into */ + if (!(sptr = malloc((slen + 1) * sizeof(char)))) { + *ierr = EX_MEMFAIL; + } + /* Copy property name from Fortran string to staging area */ + ex_fstrncpy(sptr, prop_name, slen); + + /* Use exodusII C routine to store the property values */ + if (ex_put_prop_array(*idexo, (ex_entity_type)*obj_type, sptr, values) == EX_FATAL) { + *ierr = EX_FATAL; + } + free(sptr); +} + +/* + * write node set parameters + */ +void F2C(EXPNP)(int *idexo, entity_id *node_set_id, void_int *num_nodes_in_set, + void_int *num_dist_in_set, int *ierr) +{ + if (ex_int64_status(*idexo) & EX_BULK_INT64_API) { + int64_t nnis = *(int64_t *)num_nodes_in_set; + int64_t ndis = *(int64_t *)num_dist_in_set; + *ierr = ex_put_node_set_param(*idexo, *node_set_id, nnis, ndis); + } + else { + int nnis = *(int *)num_nodes_in_set; + int ndis = *(int *)num_dist_in_set; + *ierr = ex_put_node_set_param(*idexo, *node_set_id, nnis, ndis); + } +} + +/* + * read node set parameters + */ +void F2C(EXGNP)(int *idexo, entity_id *node_set_id, void_int *num_nodes_in_set, + void_int *num_dist_in_set, int *ierr) +{ + *ierr = ex_get_node_set_param(*idexo, *node_set_id, num_nodes_in_set, num_dist_in_set); +} + +/* + * write node set + */ +void F2C(EXPNS)(int *idexo, entity_id *node_set_id, void_int *node_set_node_list, int *ierr) +{ + *ierr = ex_put_node_set(*idexo, *node_set_id, node_set_node_list); +} + +/* + * write node set dist factors + */ +void F2C(EXPNSD)(int *idexo, entity_id *node_set_id, real *node_set_dist_fact, int *ierr) +{ + *ierr = ex_put_node_set_dist_fact(*idexo, *node_set_id, node_set_dist_fact); +} + +/* + * read node set + */ +void F2C(EXGNS)(int *idexo, entity_id *node_set_id, void_int *node_set_node_list, int *ierr) +{ + *ierr = ex_get_node_set(*idexo, *node_set_id, node_set_node_list); +} + +/* + * read node set dist factors + */ +void F2C(EXGNSD)(int *idexo, entity_id *node_set_id, real *node_set_dist_fact, int *ierr) +{ + *ierr = ex_get_node_set_dist_fact(*idexo, *node_set_id, node_set_dist_fact); +} + +/* + * read node sets IDs + */ +void F2C(EXGNSI)(int *idexo, void_int *node_set_ids, int *ierr) +{ + *ierr = ex_get_node_set_ids(*idexo, node_set_ids); +} + +/* + * write concatenated node sets + */ +void F2C(EXPCNS)(int *idexo, void_int *node_set_ids, void_int *num_nodes_per_set, + void_int *num_dist_per_set, void_int *node_sets_node_index, + void_int *node_sets_dist_index, void_int *node_sets_node_list, + real *node_sets_dist_fact, int *ierr) +{ + size_t num_node_sets, i; + int int_size; + + void_int *node_index_ptr, *dist_index_ptr; + + *ierr = 0; + + num_node_sets = ex_inquire_int(*idexo, EX_INQ_NODE_SETS); + + int_size = sizeof(int); + if (ex_int64_status(*idexo) & EX_BULK_INT64_API) { + int_size = sizeof(int64_t); + } + + /* allocate memory for C node index array */ + if (!(node_index_ptr = malloc(num_node_sets * int_size))) { + *ierr = EX_MEMFAIL; + return; + } + /* allocate memory for C dist factor index array */ + if (!(dist_index_ptr = malloc(num_node_sets * int_size))) { + free(node_index_ptr); + *ierr = EX_MEMFAIL; + return; + } + + if (int_size == sizeof(int64_t)) { + for (i = 0; i < num_node_sets; i++) { /* change from 1-based to 0 index */ + ((int64_t *)node_index_ptr)[i] = ((int64_t *)node_sets_node_index)[i] - 1; + ((int64_t *)dist_index_ptr)[i] = ((int64_t *)node_sets_dist_index)[i] - 1; + } + } + else { + for (i = 0; i < num_node_sets; i++) { /* change from 1-based to 0 index */ + ((int *)node_index_ptr)[i] = ((int *)node_sets_node_index)[i] - 1; + ((int *)dist_index_ptr)[i] = ((int *)node_sets_dist_index)[i] - 1; + } + } + + *ierr = ex_put_concat_node_sets(*idexo, node_set_ids, num_nodes_per_set, num_dist_per_set, + node_index_ptr, dist_index_ptr, node_sets_node_list, + node_sets_dist_fact); + free(node_index_ptr); + free(dist_index_ptr); +} + +/* + * read concatenated node sets + */ +void F2C(EXGCNS)(int *idexo, void_int *node_set_ids, void_int *num_nodes_per_set, + void_int *num_dist_per_set, void_int *node_sets_node_index, + void_int *node_sets_dist_index, void_int *node_sets_node_list, + real *node_sets_dist_fact, int *ierr) +{ + size_t num_node_sets, i; + + *ierr = ex_get_concat_node_sets(*idexo, node_set_ids, num_nodes_per_set, num_dist_per_set, + node_sets_node_index, node_sets_dist_index, node_sets_node_list, + node_sets_dist_fact); + + num_node_sets = ex_inquire_int(*idexo, EX_INQ_NODE_SETS); + + if (ex_int64_status(*idexo) & EX_BULK_INT64_API) { + for (i = 0; i < num_node_sets; i++) { /* change from 0-based to 1 index */ + ((int64_t *)node_sets_node_index)[i] += 1; + ((int64_t *)node_sets_dist_index)[i] += 1; + } + } + else { + for (i = 0; i < num_node_sets; i++) { /* change from 0-based to 1 index */ + ((int *)node_sets_node_index)[i] += 1; + ((int *)node_sets_dist_index)[i] += 1; + } + } +} + +/* + * write side set parameters + */ +void F2C(EXPSP)(int *idexo, entity_id *side_set_id, void_int *num_sides_in_set, + void_int *num_df_in_set, int *ierr) +{ + if (ex_int64_status(*idexo) & EX_BULK_INT64_API) { + int64_t nsis = *(int64_t *)num_sides_in_set; + int64_t ndis = *(int64_t *)num_df_in_set; + *ierr = ex_put_side_set_param(*idexo, *side_set_id, nsis, ndis); + } + else { + int nsis = *(int *)num_sides_in_set; + int ndis = *(int *)num_df_in_set; + *ierr = ex_put_side_set_param(*idexo, *side_set_id, nsis, ndis); + } +} + +/* + * read side set parameters + */ +void F2C(EXGSP)(int *idexo, entity_id *side_set_id, void_int *num_sides_in_set, + void_int *num_df_in_set, int *ierr) +{ + *ierr = ex_get_side_set_param(*idexo, *side_set_id, num_sides_in_set, num_df_in_set); +} + +/* + * get side set node list length + */ +void F2C(EXGSNL)(int *idexo, entity_id *side_set_id, void_int *num_nodes_in_set, int *ierr) +{ + *ierr = ex_get_side_set_node_list_len(*idexo, *side_set_id, num_nodes_in_set); +} + +/* + * write side set + */ +void F2C(EXPSS)(int *idexo, entity_id *side_set_id, void_int *side_set_elem_list, + void_int *side_set_side_list, int *ierr) +{ + *ierr = ex_put_side_set(*idexo, *side_set_id, side_set_elem_list, side_set_side_list); +} + +/* + * read side set + */ +void F2C(EXGSS)(int *idexo, entity_id *side_set_id, void_int *side_set_elem_list, + void_int *side_set_side_list, int *ierr) +{ + *ierr = ex_get_side_set(*idexo, *side_set_id, side_set_elem_list, side_set_side_list); +} + +/* + * write side set distribution factors + */ +void F2C(EXPSSD)(int *idexo, entity_id *side_set_id, real *side_set_dist_fact, int *ierr) +{ + *ierr = ex_put_side_set_dist_fact(*idexo, *side_set_id, side_set_dist_fact); +} + +/* + * read side set distribution factors + */ +void F2C(EXGSSD)(int *idexo, entity_id *side_set_id, real *side_set_dist_fact, int *ierr) +{ + *ierr = ex_get_side_set_dist_fact(*idexo, *side_set_id, side_set_dist_fact); +} + +/* + * read side sets IDs + */ +void F2C(EXGSSI)(int *idexo, void_int *side_set_ids, int *ierr) +{ + *ierr = ex_get_side_set_ids(*idexo, side_set_ids); +} + +/* + * write concatenated side sets + */ +void F2C(EXPCSS)(int *idexo, void_int *side_set_ids, void_int *num_elem_per_set, + void_int *num_dist_per_set, void_int *side_sets_elem_index, + void_int *side_sets_dist_index, void_int *side_sets_elem_list, + void_int *side_sets_side_list, real *side_sets_dist_fact, int *ierr) +{ + size_t num_side_sets, i; + void_int *elem_index_ptr, *dist_index_ptr; + int int_size; + + *ierr = 0; + + num_side_sets = ex_inquire_int(*idexo, EX_INQ_SIDE_SETS); + + int_size = sizeof(int); + if (ex_int64_status(*idexo) & EX_BULK_INT64_API) { + int_size = sizeof(int64_t); + } + + /* allocate memory for C element index array */ + if (!(elem_index_ptr = malloc(num_side_sets * int_size))) { + *ierr = EX_MEMFAIL; + return; + } + + /* allocate memory for C dist factor index array */ + if (!(dist_index_ptr = malloc(num_side_sets * int_size))) { + free(elem_index_ptr); + *ierr = EX_MEMFAIL; + return; + } + + if (int_size == sizeof(int64_t)) { + for (i = 0; i < num_side_sets; i++) { /* change from 1-based to 0 index */ + ((int64_t *)elem_index_ptr)[i] = ((int64_t *)side_sets_elem_index)[i] - 1; + ((int64_t *)dist_index_ptr)[i] = ((int64_t *)side_sets_dist_index)[i] - 1; + } + } + else { + for (i = 0; i < num_side_sets; i++) { /* change from 1-based to 0 index */ + ((int *)elem_index_ptr)[i] = ((int *)side_sets_elem_index)[i] - 1; + ((int *)dist_index_ptr)[i] = ((int *)side_sets_dist_index)[i] - 1; + } + } + + *ierr = ex_put_concat_side_sets(*idexo, side_set_ids, num_elem_per_set, num_dist_per_set, + elem_index_ptr, dist_index_ptr, side_sets_elem_list, + side_sets_side_list, side_sets_dist_fact); + free(elem_index_ptr); + free(dist_index_ptr); +} + +/* + * read concatenated side sets + */ +void F2C(EXGCSS)(int *idexo, void_int *side_set_ids, void_int *num_elem_per_set, + void_int *num_dist_per_set, void_int *side_sets_elem_index, + void_int *side_sets_dist_index, void_int *side_sets_elem_list, + void_int *side_sets_side_list, real *side_sets_dist_fact, int *ierr) +{ + size_t i, num_side_sets; + + *ierr = 0; + + num_side_sets = ex_inquire_int(*idexo, EX_INQ_SIDE_SETS); + + *ierr = ex_get_concat_side_sets(*idexo, side_set_ids, num_elem_per_set, num_dist_per_set, + side_sets_elem_index, side_sets_dist_index, side_sets_elem_list, + side_sets_side_list, side_sets_dist_fact); + + if (ex_int64_status(*idexo) & EX_BULK_INT64_API) { + for (i = 0; i < num_side_sets; i++) { /* change from 0-based to 1 index */ + ((int64_t *)side_sets_elem_index)[i] += 1; + ((int64_t *)side_sets_dist_index)[i] += 1; + } + } + else { + for (i = 0; i < num_side_sets; i++) { /* change from 0-based to 1 index */ + ((int *)side_sets_elem_index)[i] += 1; + ((int *)side_sets_dist_index)[i] += 1; + } + } +} + +/* + * read concatenated side sets (no dist factors) + */ +void F2C(EXGCSSF)(int *idexo, void_int *side_set_ids, void_int *num_elem_per_set, + void_int *num_dist_per_set, void_int *side_sets_elem_index, + void_int *side_sets_dist_index, void_int *side_sets_elem_list, + void_int *side_sets_side_list, int *ierr) +{ + size_t i, num_side_sets; + + num_side_sets = ex_inquire_int(*idexo, EX_INQ_SIDE_SETS); + + *ierr = ex_get_concat_side_sets(*idexo, side_set_ids, num_elem_per_set, num_dist_per_set, + side_sets_elem_index, side_sets_dist_index, side_sets_elem_list, + side_sets_side_list, 0); + + if (ex_int64_status(*idexo) & EX_BULK_INT64_API) { + for (i = 0; i < num_side_sets; i++) { /* change from 0-based to 1 index */ + ((int64_t *)side_sets_elem_index)[i] += 1; + ((int64_t *)side_sets_dist_index)[i] += 1; + } + } + else { + for (i = 0; i < num_side_sets; i++) { /* change from 0-based to 1 index */ + ((int *)side_sets_elem_index)[i] += 1; + ((int *)side_sets_dist_index)[i] += 1; + } + } +} + +/* + * write results variables parameters + */ +void F2C(EXPVP)(int *idexo, char *var_type, int *num_vars, int *ierr, int var_typelen) +{ + *ierr = ex_put_var_param(*idexo, var_type, *num_vars); +} + +/* + * read results variables parameters + */ +void F2C(EXGVP)(int *idexo, char *var_type, int *num_vars, int *ierr, int var_typelen) +{ + *ierr = ex_get_var_param(*idexo, var_type, num_vars); +} + +/* + * write results variables names + */ +void F2C(EXPVAN)(int *idexo, char *var_type, int *num_vars, char *var_names, int *ierr, + int var_typelen, int var_nameslen) +{ + char **aptr; /* ptr to temp staging space for string array + * ptrs */ + char *sptr; /* ptr to temp staging space for strings */ + int i, slen; + + *ierr = 0; /* default no error */ + + slen = ex_inquire_int(*idexo, EX_INQ_DB_MAX_ALLOWED_NAME_LENGTH); /* max str size */ + if (var_nameslen < slen) { + slen = var_nameslen; + } + /* allocate memory for pointer array */ + if (!(aptr = malloc((*num_vars + 1) * sizeof(char *)))) { + *ierr = EX_MEMFAIL; + return; + } + /* Allocate staging space for the variable names */ + if (!(sptr = malloc(*num_vars * (slen + 1) * sizeof(char)))) { + free(aptr); /* Free up string ptr array */ + *ierr = EX_MEMFAIL; + return; + } + /* Copy Fortran variable names to staging space */ + for (i = 0; i < *num_vars; i++) { + *(aptr + i) = sptr + i * (slen + 1); /* put address into ptr array */ + ex_fstrncpy(*(aptr + i), var_names + i * var_nameslen, slen); /* copy string into + * buffer */ + } + *(aptr + i) = 0; /* null out last ptr */ + /* do ExodusII C call to write results variables names */ + if (ex_put_var_names(*idexo, var_type, *num_vars, aptr) == EX_FATAL) { + *ierr = EX_FATAL; + } + free(sptr); /* Free up string staging area */ + free(aptr); /* Free up string ptr array */ +} +/* + * read results variables names + */ +void F2C(EXGVAN)(int *idexo, char *var_type, int *num_vars, char *var_names, int *ierr, + int var_typelen, int var_nameslen) +{ + char **aptr; /* ptr to temp staging space for string array + * ptrs */ + char *sptr; /* ptr to temp staging space for strings */ + int i, slen; + + *ierr = 0; /* default no error */ + + slen = ex_inquire_int(*idexo, EX_INQ_MAX_READ_NAME_LENGTH); /* max string size */ + if (var_nameslen < slen) { + slen = var_nameslen; + } + /* allocate memory to for pointer array */ + if (!(aptr = malloc((*num_vars + 1) * sizeof(char *)))) { + *ierr = EX_MEMFAIL; + return; + } + /* Allocate staging space for the variable names */ + if (!(sptr = malloc(*num_vars * (slen + 1) * sizeof(char)))) { + *ierr = EX_MEMFAIL; + free(aptr); /* Free up string ptr array */ + return; + } + for (i = 0; i < *num_vars; i++) + *(aptr + i) = sptr + i * (slen + 1); /* put address into ptr array */ + *(aptr + i) = 0; /* null out last ptr */ + + /* do ExodusII C call to read results variables names */ + if (ex_get_var_names(*idexo, var_type, *num_vars, aptr) == EX_FATAL) { + *ierr = EX_FATAL; + free(sptr); /* free up allocated space */ + free(aptr); + return; + } + /* Copy Fortran variable names to staging space */ + memset(var_names, 0, *num_vars * var_nameslen); + for (i = 0; i < *num_vars; i++) { + ex_fcdcpy(var_names + i * var_nameslen, slen, *(aptr + i)); /* copy str into Fortran + * buffer */ + } + + free(sptr); /* Free up string staging area */ + free(aptr); /* Free up string ptr array */ +} + +/* + * write element variable truth table + */ +void F2C(EXPVTT)(int *idexo, int *num_elem_blk, int *num_elem_var, int *elem_var_tab, int *ierr) +{ + *ierr = ex_put_elem_var_tab(*idexo, *num_elem_blk, *num_elem_var, elem_var_tab); +} + +/* + * write nodeset variable truth table + */ +void F2C(EXPNSTT)(int *idexo, int *num_entity, int *num_var, int *var_tab, int *ierr) +{ + *ierr = ex_put_nset_var_tab(*idexo, *num_entity, *num_var, var_tab); +} + +/* + * write sideset variable truth table + */ +void F2C(EXPSSTT)(int *idexo, int *num_entity, int *num_var, int *var_tab, int *ierr) +{ + *ierr = ex_put_sset_var_tab(*idexo, *num_entity, *num_var, var_tab); +} + +/* + * read element variable truth table + */ +void F2C(EXGVTT)(int *idexo, int *num_elem_blk, int *num_elem_var, int *elem_var_tab, int *ierr) +{ + *ierr = ex_get_elem_var_tab(*idexo, *num_elem_blk, *num_elem_var, elem_var_tab); +} + +/* + * read nodeset variable truth table + */ +void F2C(EXGNSTT)(int *idexo, int *num_entity, int *num_var, int *var_tab, int *ierr) +{ + *ierr = ex_get_nset_var_tab(*idexo, *num_entity, *num_var, var_tab); +} + +/* + * read sideset variable truth table + */ +void F2C(EXGSSTT)(int *idexo, int *num_entity, int *num_var, int *var_tab, int *ierr) +{ + *ierr = ex_get_sset_var_tab(*idexo, *num_entity, *num_var, var_tab); +} + +/* + * write global variable values at time step + */ +void F2C(EXPGV)(int *idexo, int *time_step, int *num_glob_vars, real *glob_var_vals, int *ierr) +{ + *ierr = ex_put_glob_vars(*idexo, *time_step, *num_glob_vars, glob_var_vals); +} + +/* + * read global variable values at a time step + */ +void F2C(EXGGV)(int *idexo, int *time_step, int *num_glob_vars, real *glob_var_vals, int *ierr) +{ + *ierr = ex_get_glob_vars(*idexo, *time_step, *num_glob_vars, glob_var_vals); +} + +/* + * read global variable values through time + */ +void F2C(EXGGVT)(int *idexo, int *glob_var_index, int *beg_time_step, int *end_time_step, + real *glob_var_vals, int *ierr) +{ + *ierr = + ex_get_glob_var_time(*idexo, *glob_var_index, *beg_time_step, *end_time_step, glob_var_vals); +} + +/* + * write nodal variable values at a time step + */ +void F2C(EXPNV)(int *idexo, int *time_step, int *nodal_var_index, void_int *num_nodes, + real *nodal_var_vals, int *ierr) +{ + int64_t nnodes; + if (ex_int64_status(*idexo) & EX_BULK_INT64_API) { + nnodes = *(int64_t *)num_nodes; + } + else { + nnodes = *(int *)num_nodes; + } + + *ierr = ex_put_nodal_var(*idexo, *time_step, *nodal_var_index, nnodes, nodal_var_vals); +} + +/* + * read nodal variable values at a time step + */ +void F2C(EXGNV)(int *idexo, int *time_step, int *nodal_var_index, void_int *num_nodes, + real *nodal_var_vals, int *ierr) +{ + int64_t nnodes; + if (ex_int64_status(*idexo) & EX_BULK_INT64_API) { + nnodes = *(int64_t *)num_nodes; + } + else { + nnodes = *(int *)num_nodes; + } + + *ierr = ex_get_nodal_var(*idexo, *time_step, *nodal_var_index, nnodes, nodal_var_vals); +} + +/* + * read nodal variable values through time + */ +void F2C(EXGNVT)(int *idexo, int *nodal_var_index, void_int *node_number, int *beg_time_step, + int *end_time_step, real *nodal_var_vals, int *ierr) +{ + int64_t nnode; + if (ex_int64_status(*idexo) & EX_BULK_INT64_API) { + nnode = *(int64_t *)node_number; + } + else { + nnode = *(int *)node_number; + } + + *ierr = ex_get_nodal_var_time(*idexo, *nodal_var_index, nnode, *beg_time_step, *end_time_step, + nodal_var_vals); +} + +/* + * write element variable values at a time step + */ +void F2C(EXPEV)(int *idexo, int *time_step, int *elem_var_index, entity_id *elem_blk_id, + void_int *num_elem_this_blk, real *elem_var_vals, int *ierr) +{ + int64_t neblk; + if (ex_int64_status(*idexo) & EX_BULK_INT64_API) { + neblk = *(int64_t *)num_elem_this_blk; + } + else { + neblk = *(int *)num_elem_this_blk; + } + + *ierr = ex_put_elem_var(*idexo, *time_step, *elem_var_index, *elem_blk_id, neblk, elem_var_vals); +} + +/* + * read element variable values at a time step + */ +void F2C(EXGEV)(int *idexo, int *time_step, int *elem_var_index, entity_id *elem_blk_id, + void_int *num_elem_this_blk, real *elem_var_vals, int *ierr) +{ + int64_t neblk; + if (ex_int64_status(*idexo) & EX_BULK_INT64_API) { + neblk = *(int64_t *)num_elem_this_blk; + } + else { + neblk = *(int *)num_elem_this_blk; + } + + *ierr = ex_get_elem_var(*idexo, *time_step, *elem_var_index, *elem_blk_id, neblk, elem_var_vals); +} + +/* + * read element variable values through time + */ +void F2C(EXGEVT)(int *idexo, int *elem_var_index, void_int *elem_number, int *beg_time_step, + int *end_time_step, real *elem_var_vals, int *ierr) +{ + int64_t el_num; + if (ex_int64_status(*idexo) & EX_BULK_INT64_API) { + el_num = *(int64_t *)elem_number; + } + else { + el_num = *(int *)elem_number; + } + + *ierr = ex_get_elem_var_time(*idexo, *elem_var_index, el_num, *beg_time_step, *end_time_step, + elem_var_vals); +} + +/* + * write nodeset variable values at a time step + */ +void F2C(EXPNSV)(int *idexo, int *time_step, int *var_index, entity_id *id, void_int *num_entity, + real *var_vals, int *ierr) +{ + int64_t n_entity; + if (ex_int64_status(*idexo) & EX_BULK_INT64_API) { + n_entity = *(int64_t *)num_entity; + } + else { + n_entity = *(int *)num_entity; + } + + *ierr = ex_put_nset_var(*idexo, *time_step, *var_index, *id, n_entity, var_vals); +} + +/* + * read nodeset variable values at a time step + */ +void F2C(EXGNSV)(int *idexo, int *time_step, int *var_index, entity_id *id, void_int *num_entity, + real *var_vals, int *ierr) +{ + int64_t n_entity; + if (ex_int64_status(*idexo) & EX_BULK_INT64_API) { + n_entity = *(int64_t *)num_entity; + } + else { + n_entity = *(int *)num_entity; + } + + *ierr = ex_get_nset_var(*idexo, *time_step, *var_index, *id, n_entity, var_vals); +} + +/* + * write sideset variable values at a time step + */ +void F2C(EXPSSV)(int *idexo, int *time_step, int *var_index, entity_id *id, void_int *num_entity, + real *var_vals, int *ierr) +{ + int64_t n_entity; + if (ex_int64_status(*idexo) & EX_BULK_INT64_API) { + n_entity = *(int64_t *)num_entity; + } + else { + n_entity = *(int *)num_entity; + } + + *ierr = ex_put_sset_var(*idexo, *time_step, *var_index, *id, n_entity, var_vals); +} + +/* + * read sideset variable values at a time step + */ +void F2C(EXGSSV)(int *idexo, int *time_step, int *var_index, entity_id *id, void_int *num_entity, + real *var_vals, int *ierr) +{ + int64_t n_entity; + if (ex_int64_status(*idexo) & EX_BULK_INT64_API) { + n_entity = *(int64_t *)num_entity; + } + else { + n_entity = *(int *)num_entity; + } + + *ierr = ex_get_sset_var(*idexo, *time_step, *var_index, *id, n_entity, var_vals); +} + +/* + * write time value for a time step + */ +void F2C(EXPTIM)(int *idexo, int *time_step, real *time_value, int *ierr) +{ + *ierr = ex_put_time(*idexo, *time_step, time_value); +} + +/* + * read time value for a time step + */ +void F2C(EXGTIM)(int *idexo, int *time_step, real *time_value, int *ierr) +{ + *ierr = ex_get_time(*idexo, *time_step, time_value); +} + +/* + * read all time values + */ +void F2C(EXGATM)(int *idexo, real *time_values, int *ierr) +{ + *ierr = ex_get_all_times(*idexo, time_values); +} + +/* + * inquire EXODUS parameters + */ +void F2C(EXINQ)(int *idexo, int *req_info, void_int *ret_int, float *ret_float, char *ret_char, + int *ierr, int ret_charlen) +{ + *ierr = ex_inquire(*idexo, (ex_inquiry)*req_info, ret_int, ret_float, ret_char); +} + +/* + * inquire integer EXODUS parameters + */ +int64_t F2C(EXINQI)(int *idexo, int *req_info) +{ + return ex_inquire_int(*idexo, (ex_inquiry)*req_info); +} + +/* + * convert side set node lists to side set side lists + */ +void F2C(EXCN2S)(int *idexo, void_int *num_elem_per_set, void_int *num_nodes_per_set, + void_int *side_sets_elem_index, void_int *side_sets_node_index, + void_int *side_sets_elem_list, void_int *side_sets_node_list, + void_int *side_sets_side_list, int *ierr) +{ + *ierr = ex_cvt_nodes_to_sides(*idexo, num_elem_per_set, num_nodes_per_set, NULL, /* unused */ + NULL, /* unused */ + side_sets_elem_list, side_sets_node_list, side_sets_side_list); +} + +/* + * read side set node list + */ +void F2C(EXGSSN)(int *idexo, entity_id *side_set_id, int *side_set_node_cnt_list, + void_int *side_set_node_list, int *ierr) +{ + *ierr = + ex_get_side_set_node_list(*idexo, *side_set_id, side_set_node_cnt_list, side_set_node_list); +} + +/* + * read side set node count + */ +void F2C(EXGSSC)(int *idexo, entity_id *side_set_id, int *side_set_node_cnt_list, int *ierr) +{ + *ierr = ex_get_side_set_node_count(*idexo, *side_set_id, side_set_node_cnt_list); +} + +/* + * read concatenated side set node count + */ +void F2C(EXGCSSC)(int *idexo, int *side_set_node_cnt_list, int *ierr) +{ + *ierr = ex_get_concat_side_set_node_count(*idexo, side_set_node_cnt_list); +} + +/* ex_get_coordinate_frames -- read coordinate frames */ +void F2C(EXGFRM)(int *idexo, int *nframeo, void_int *cfids, real *coord, int *tags, int *ierr) +{ + int i; + char *ctags = NULL; + + /* Determine number of coordinate frames stored in file */ + int nframe = ex_inquire_int(*idexo, EX_INQ_COORD_FRAMES); + + if (nframe != *nframeo) { + *ierr = EX_FATAL; + return; + } + /* Create array of characters to store tags... */ + if (nframe > 0) { + if (!(ctags = calloc(nframe, sizeof(char)))) { + *ierr = EX_MEMFAIL; + return; + } + *ierr = 0; + + if (ex_get_coordinate_frames(*idexo, &nframe, cfids, coord, ctags) == EX_FATAL) { + *ierr = EX_FATAL; + return; + } + /* Convert character tags back to integer tags for fortran */ + for (i = 0; i < nframe; i++) { + if (ctags[i] == 'R' || ctags[i] == 'r') + tags[i] = EX_CF_RECTANGULAR; + else if (ctags[i] == 'C' || ctags[i] == 'c') + tags[i] = EX_CF_CYLINDRICAL; + else if (ctags[i] == 'S' || ctags[i] == 's') + tags[i] = EX_CF_SPHERICAL; + } + free(ctags); + } +} + +/* ex_put_coordinate_frames -- define/write coordinate frames */ +void F2C(EXPFRM)(int *idexo, int *nframe, void_int *cfids, real *coord, int *tags, int *ierr) +{ + int i; + char *ctags = NULL; + + /* Create array of characters to store tags... */ + if (*nframe > 0) { + if (!(ctags = calloc(*nframe, sizeof(char)))) { + *ierr = EX_MEMFAIL; + return; + } + /* Convert fortran integer tags to C API character tags */ + for (i = 0; i < *nframe; i++) { + if (tags[i] == EX_CF_RECTANGULAR) + ctags[i] = 'R'; + else if (tags[i] == EX_CF_CYLINDRICAL) + ctags[i] = 'C'; + else if (tags[i] == EX_CF_SPHERICAL) + ctags[i] = 'S'; + } + + *ierr = 0; + + if (ex_put_coordinate_frames(*idexo, *nframe, cfids, coord, ctags) == EX_FATAL) { + *ierr = EX_FATAL; + return; + } + free(ctags); + } +} + +/* Routine to return floating point word size */ +int F2C(EXCPWS)() { return (ex__get_cpu_ws()); } + +/* Routine to return large model setting */ +int F2C(EXLGMD)(int *idexo) { return (ex_large_model(*idexo)); } + +/* Generalized error handling function */ +void F2C(EXERR)(char *pname, char *err_string, int *errcode, int pnamelen, int err_stringlen) +{ + + char *proc_name, *error_string; + if (!(proc_name = malloc((pnamelen + 1) * sizeof(char)))) { + ex_err(__func__, "Error: failed to allocate space for process name buffer", EX_MEMFAIL); + return; + } + if (!(error_string = malloc((err_stringlen + 1) * sizeof(char)))) { + free(proc_name); + ex_err(__func__, "Error: failed to allocate space for error msg buffer", EX_MEMFAIL); + return; + } + ex_fstrncpy(proc_name, pname, pnamelen); + ex_fstrncpy(error_string, err_string, err_stringlen); + ex_err(proc_name, error_string, *errcode); + free(proc_name); + free(error_string); +} + +/* Error message reporting options setting function */ +void F2C(EXOPTS)(int *option_val, int *ierr) +{ + *ierr = 0; + ex_opts((ex_options)*option_val); + if (exerrval != 0) { + *ierr = EX_FATAL; + } +} + +void F2C(EXMXNM)(int *idexo, int *length, int *ierr) +{ + *ierr = ex_set_max_name_length(*idexo, *length); +} + +/* + * copy EXODUS file + */ +void F2C(EXCOPY)(int *idexo_in, int *idexo_out, int *ierr) +{ + *ierr = ex_copy(*idexo_in, *idexo_out); +} + +/* + * get element map + */ +void + + F2C(EXGEM)(int *idexo, entity_id *map_id, void_int *elem_map, int *ierr) +{ + *ierr = ex_get_num_map(*idexo, EX_ELEM_MAP, *map_id, elem_map); +} + +/* + * get partial_element map + */ +void F2C(EXGPEM)(int *idexo, entity_id *map_id, void_int *start, void_int *count, + void_int *elem_map, int *ierr) +{ + int64_t st, cnt; + if (ex_int64_status(*idexo) & EX_BULK_INT64_API) { + st = *(int64_t *)start; + cnt = *(int64_t *)count; + } + else { + st = *(int *)start; + cnt = *(int *)count; + } + + *ierr = ex_get_partial_num_map(*idexo, EX_ELEM_MAP, *map_id, st, cnt, elem_map); +} + +/* + * get element number map + */ +void F2C(EXGENM)(int *idexo, void_int *elem_map, int *ierr) +{ + *ierr = ex_get_id_map(*idexo, EX_ELEM_MAP, elem_map); +} + +/* + * get map parameters + */ +void F2C(EXGMP)(int *idexo, int *num_node_maps, int *num_elem_maps, int *ierr) +{ + *ierr = ex_get_map_param(*idexo, num_node_maps, num_elem_maps); +} + +/* + * get node map + */ +void F2C(EXGNM)(int *idexo, entity_id *map_id, void_int *node_map, int *ierr) +{ + *ierr = ex_get_num_map(*idexo, EX_NODE_MAP, *map_id, node_map); +} + +/* + * get node number map + */ +void F2C(EXGNNM)(int *idexo, void_int *node_map, int *ierr) +{ + *ierr = ex_get_id_map(*idexo, EX_NODE_MAP, node_map); +} + +/* + * read results variables names + */ +void F2C(EXGVNM)(int *idexo, char *var_type, int *var_index, char *var_name, int *ierr, + int var_typelen, int var_namelen) +{ + char *sptr; /* ptr to temp staging space for string */ + int slen; + *ierr = 0; /* default no error */ + + slen = ex_inquire_int(*idexo, EX_INQ_MAX_READ_NAME_LENGTH); /* max string size */ + if (var_namelen < slen) { + slen = var_namelen; + } + /* Allocate staging space for the variable name */ + if (!(sptr = malloc((slen + 1) * sizeof(char)))) { + *ierr = EX_MEMFAIL; + return; + } + /* do ExodusII C call to read results variables names */ + if (ex_get_var_name(*idexo, var_type, *var_index, sptr) == EX_FATAL) { + *ierr = EX_FATAL; + free(sptr); /* free up allocated space */ + return; + } + /* Copy Fortran variable names to staging space */ + /** printf("[exgvnm] var_name(%d): %s\n",*var_index,sptr)); **/ + memset(var_name, 0, var_namelen); + ex_fcdcpy(var_name, slen, sptr); /* copy string into Fortran buffer */ + + free(sptr); /* Free up string staging area */ +} + +/* + * put element map + */ +void F2C(EXPEM)(int *idexo, entity_id *map_id, void_int *elem_map, int *ierr) +{ + *ierr = ex_put_num_map(*idexo, EX_ELEM_MAP, *map_id, elem_map); +} + +/* + * put partial element map + */ +void F2C(EXPPEM)(int *idexo, entity_id *map_id, void_int *start, void_int *count, + void_int *elem_map, int *ierr) +{ + int64_t st, cnt; + if (ex_int64_status(*idexo) & EX_BULK_INT64_API) { + st = *(int64_t *)start; + cnt = *(int64_t *)count; + } + else { + st = *(int *)start; + cnt = *(int *)count; + } + *ierr = ex_put_partial_num_map(*idexo, EX_ELEM_MAP, *map_id, st, cnt, elem_map); +} + +/* + * put element number map + */ +void F2C(EXPENM)(int *idexo, void_int *elem_map, int *ierr) +{ + *ierr = ex_put_id_map(*idexo, EX_ELEM_MAP, elem_map); +} + +/* + * put map parameters + */ +void F2C(EXPMP)(int *idexo, int *num_node_maps, int *num_elem_maps, int *ierr) +{ + *ierr = ex_put_map_param(*idexo, *num_node_maps, *num_elem_maps); +} + +/* + * put node map + */ +void F2C(EXPNM)(int *idexo, entity_id *map_id, void_int *node_map, int *ierr) +{ + *ierr = ex_put_num_map(*idexo, EX_NODE_MAP, *map_id, node_map); +} + +/* + * put node number map + */ +void F2C(EXPNNM)(int *idexo, void_int *node_map, int *ierr) +{ + *ierr = ex_put_id_map(*idexo, EX_NODE_MAP, node_map); +} + +/* + * write results variable name + */ +void F2C(EXPVNM)(int *idexo, char *var_type, int *var_index, char *var_name, int *ierr, + int var_typelen, int var_namelen) +{ + char *sptr; /* ptr to temp staging space for string */ + int slen; + *ierr = 0; /* default no error */ + + slen = ex_inquire_int(*idexo, EX_INQ_DB_MAX_ALLOWED_NAME_LENGTH); /* max str size */ + if (var_namelen < slen) { + slen = var_namelen; + } + /* Allocate staging space for the variable name */ + if (!(sptr = (char *)malloc((slen + 1) * sizeof(char)))) { + *ierr = EX_MEMFAIL; + return; + } + ex_fstrncpy(sptr, var_name, slen); /* copy string into buffer */ + + /* do ExodusII C call to write results variable name */ + if (ex_put_var_name(*idexo, var_type, *var_index, sptr) == EX_FATAL) { + *ierr = EX_FATAL; + free(sptr); /* free up allocated space */ + return; + } + free(sptr); /* Free up string staging area */ +} + +/* + * Get initial information from nemesis file + */ +void F2C(EXGII)(int *idne, int *nproc, int *nproc_in_f, char *ftype, int *ierr, size_t ftypelen) +{ + size_t slen = 1; + char * file_type; + + /* WARNING: ftypelen SHOULD be 1, but may not be depending on how + the Fortran programmer passed it. It is best at + this time to hard code it per NEPII spec. */ + if (ftypelen != 1) { +#if defined(EXODUS_STRING_LENGTH_WARNING) + char errmsg[MAX_ERR_LENGTH]; + sprintf(errmsg, "Warning: file type string length is %lu in file id %d\n", ftypelen, *idne); + ex_err(__func__, errmsg, EX_MSG); +#endif + slen = ftypelen; + } + + file_type = (char *)malloc((slen + 1) * sizeof(char)); + + if ((*ierr = ex_get_init_info(*idne, nproc, nproc_in_f, file_type)) != 0) { + char errmsg[MAX_ERR_LENGTH]; + sprintf(errmsg, "Error: failed to get initial information from file id %d", *idne); + ex_err(__func__, errmsg, EX_MSG); + } + + if (*ierr == 0) + ex_fcdcpy(ftype, slen, file_type); + + free(file_type); +} + +/* + * Write initial information from nemesis file + */ +void F2C(EXPII)(int *idne, int *nproc, int *nproc_in_f, char *ftype, int *ierr, size_t ftypelen) +{ + + char errmsg[MAX_ERR_LENGTH]; + + size_t slen = 1; + char * file_type; + + /* WARNING: ftypelen SHOULD be 1, but may not be depending on how + the Fortran programmer passed it. It is best at + this time to hard code it per NEPII spec. */ + if (ftypelen != 1) { + slen = ftypelen; +#if defined(EXODUS_STRING_LENGTH_WARNING) + sprintf(errmsg, "Warning: file type string length is %lu in file id %d\n", ftypelen, *idne); + ex_err(__func__, errmsg, EX_MSG); +#endif + } + + file_type = (char *)malloc((slen + 1) * sizeof(char)); + + ex_fstrncpy(file_type, ftype, slen); + + if ((*ierr = ex_put_init_info(*idne, *nproc, *nproc_in_f, file_type)) != 0) { + sprintf(errmsg, "Error: failed to put initial information in file id %d", *idne); + ex_err(__func__, errmsg, EX_MSG); + } + + free(file_type); +} + +/* + * Read initial global information + */ +void F2C(EXGIG)(int *idne, void_int *nnodes_g, void_int *nelems_g, void_int *nelem_blks_g, + void_int *nnode_sets_g, void_int *nside_sets_g, int *ierr) +{ + if ((*ierr = ex_get_init_global(*idne, nnodes_g, nelems_g, nelem_blks_g, nnode_sets_g, + nside_sets_g)) != 0) { + char errmsg[MAX_ERR_LENGTH]; + sprintf(errmsg, "Error: failed to read initial global information from file id %d", *idne); + ex_err(__func__, errmsg, EX_MSG); + } +} + +/* + * Write initial global information + */ +void F2C(EXPIG)(int *idne, void_int *nnodes_g, void_int *nelems_g, void_int *nelem_blks_g, + void_int *nnode_sets_g, void_int *nside_sets_g, int *ierr) +{ + if (ex_int64_status(*idne) & EX_BULK_INT64_API) { + int64_t *n_nnodes_g = (int64_t *)nnodes_g; + int64_t *n_nelems_g = (int64_t *)nelems_g; + int64_t *n_nelem_blks_g = (int64_t *)nelem_blks_g; + int64_t *n_nnode_sets_g = (int64_t *)nnode_sets_g; + int64_t *n_nside_sets_g = (int64_t *)nside_sets_g; + *ierr = ex_put_init_global(*idne, *n_nnodes_g, *n_nelems_g, *n_nelem_blks_g, *n_nnode_sets_g, + *n_nside_sets_g); + } + else { + int *n_nnodes_g = (int *)nnodes_g; + int *n_nelems_g = (int *)nelems_g; + int *n_nelem_blks_g = (int *)nelem_blks_g; + int *n_nnode_sets_g = (int *)nnode_sets_g; + int *n_nside_sets_g = (int *)nside_sets_g; + *ierr = ex_put_init_global(*idne, *n_nnodes_g, *n_nelems_g, *n_nelem_blks_g, *n_nnode_sets_g, + *n_nside_sets_g); + } + + if (*ierr != 0) { + char errmsg[MAX_ERR_LENGTH]; + sprintf(errmsg, "Error: failed to store initial global information in file id %d", *idne); + ex_err(__func__, errmsg, EX_MSG); + } +} + +/* + * Read load balance parameters + */ +void F2C(EXGLBP)(int *idne, void_int *nint_nodes, void_int *nbor_nodes, void_int *next_nodes, + void_int *nint_elems, void_int *nbor_elems, void_int *nnode_cmaps, + void_int *nelem_cmaps, int *processor, int *ierr) +{ + if ((*ierr = ex_get_loadbal_param(*idne, nint_nodes, nbor_nodes, next_nodes, nint_elems, + nbor_elems, nnode_cmaps, nelem_cmaps, *processor)) != 0) { + char errmsg[MAX_ERR_LENGTH]; + sprintf(errmsg, "Error: failed to read load balance parameters from file id %d", *idne); + ex_err(__func__, errmsg, EX_MSG); + } +} + +/* + * Write load balance parameters + */ +void F2C(EXPLBP)(int *idne, void_int *nint_nodes, void_int *nbor_nodes, void_int *next_nodes, + void_int *nint_elems, void_int *nbor_elems, void_int *nnode_cmaps, + void_int *nelem_cmaps, int *processor, int *ierr) +{ + if (ex_int64_status(*idne) & EX_BULK_INT64_API) { + int64_t *n_nint_nodes = (int64_t *)nint_nodes; + int64_t *n_nbor_nodes = (int64_t *)nbor_nodes; + int64_t *n_next_nodes = (int64_t *)next_nodes; + int64_t *n_nint_elems = (int64_t *)nint_elems; + int64_t *n_nbor_elems = (int64_t *)nbor_elems; + int64_t *n_nnode_cmaps = (int64_t *)nnode_cmaps; + int64_t *n_nelem_cmaps = (int64_t *)nelem_cmaps; + *ierr = ex_put_loadbal_param(*idne, *n_nint_nodes, *n_nbor_nodes, *n_next_nodes, *n_nint_elems, + *n_nbor_elems, *n_nnode_cmaps, *n_nelem_cmaps, *processor); + } + else { + int *n_nint_nodes = (int *)nint_nodes; + int *n_nbor_nodes = (int *)nbor_nodes; + int *n_next_nodes = (int *)next_nodes; + int *n_nint_elems = (int *)nint_elems; + int *n_nbor_elems = (int *)nbor_elems; + int *n_nnode_cmaps = (int *)nnode_cmaps; + int *n_nelem_cmaps = (int *)nelem_cmaps; + *ierr = ex_put_loadbal_param(*idne, *n_nint_nodes, *n_nbor_nodes, *n_next_nodes, *n_nint_elems, + *n_nbor_elems, *n_nnode_cmaps, *n_nelem_cmaps, *processor); + } + if (*ierr != 0) { + char errmsg[MAX_ERR_LENGTH]; + sprintf(errmsg, "Error: failed to store load balance parameters in file id %d", *idne); + ex_err(__func__, errmsg, EX_MSG); + } +} + +/* + * Write concatenated load balance parameters + */ +void F2C(EXPLBPC)(int *idne, void_int *nint_nodes, void_int *nbor_nodes, void_int *next_nodes, + void_int *nint_elems, void_int *nbor_elems, void_int *nnode_cmaps, + void_int *nelem_cmaps, int *ierr) +{ + if ((*ierr = ex_put_loadbal_param_cc(*idne, nint_nodes, nbor_nodes, next_nodes, nint_elems, + nbor_elems, nnode_cmaps, nelem_cmaps)) != 0) { + char errmsg[MAX_ERR_LENGTH]; + sprintf(errmsg, "Error: failed to store load balance parameters in file id %d", *idne); + ex_err(__func__, errmsg, EX_MSG); + } +} + +/* + * Read global node set parameters + */ +void F2C(EXGNSPG)(int *idne, void_int *ns_ids_glob, void_int *ns_n_cnt_glob, + void_int *ns_df_cnt_glob, int *ierr) +{ + if ((*ierr = ex_get_ns_param_global(*idne, ns_ids_glob, ns_n_cnt_glob, ns_df_cnt_glob)) != 0) { + char errmsg[MAX_ERR_LENGTH]; + sprintf(errmsg, "Error: failed to read global node set parameters from file id %d", *idne); + ex_err(__func__, errmsg, EX_MSG); + } +} + +/* + * Write global node set parameters + */ +void F2C(EXPNSPG)(int *idne, void_int *global_ids, void_int *global_n_cnts, + void_int *global_df_cnts, int *ierr) +{ + if ((*ierr = ex_put_ns_param_global(*idne, global_ids, global_n_cnts, global_df_cnts)) != 0) { + char errmsg[MAX_ERR_LENGTH]; + sprintf(errmsg, "Error: failed to store global node set parameters in file id %d", *idne); + ex_err(__func__, errmsg, EX_MSG); + } +} + +/* + * Read global side set parameters + */ +void F2C(EXGSSPG)(int *idne, void_int *ss_ids_glob, void_int *ss_n_cnt_glob, + void_int *ss_df_cnt_glob, int *ierr) +{ + + if ((*ierr = ex_get_ss_param_global(*idne, ss_ids_glob, ss_n_cnt_glob, ss_df_cnt_glob)) != 0) { + char errmsg[MAX_ERR_LENGTH]; + sprintf(errmsg, "Error: failed to read global side set parameters from file id %d", *idne); + ex_err(__func__, errmsg, EX_MSG); + } +} + +/* + * Write global side set parameters + */ +void F2C(EXPSSPG)(int *idne, void_int *global_ids, void_int *global_el_cnts, + void_int *global_df_cnts, int *ierr) +{ + if ((*ierr = ex_put_ss_param_global(*idne, global_ids, global_el_cnts, global_df_cnts)) != 0) { + char errmsg[MAX_ERR_LENGTH]; + sprintf(errmsg, "Error: failed to store global side set parameters in file id %d", *idne); + ex_err(__func__, errmsg, EX_MSG); + } +} + +/* + * Read global element block information + */ +void F2C(EXGEBIG)(int *idne, void_int *el_blk_ids, void_int *el_blk_cnts, int *ierr) +{ + if ((*ierr = ex_get_eb_info_global(*idne, el_blk_ids, el_blk_cnts)) != 0) { + char errmsg[MAX_ERR_LENGTH]; + sprintf(errmsg, "Error: failed to read global element block info from file id %d", *idne); + ex_err(__func__, errmsg, EX_MSG); + } +} + +/* + * Write global element block information + */ +void F2C(EXPEBIG)(int *idne, void_int *el_blk_ids, void_int *el_blk_cnts, int *ierr) +{ + if ((*ierr = ex_put_eb_info_global(*idne, el_blk_ids, el_blk_cnts)) != 0) { + char errmsg[MAX_ERR_LENGTH]; + sprintf(errmsg, "Error: failed to store global element block info in file id %d", *idne); + ex_err(__func__, errmsg, EX_MSG); + } +} + +/* + * Read side set element list and side set side list + */ +void F2C(EXGNSS)(int *idne, entity_id *ss_id, void_int *start, void_int *count, + void_int *ss_elem_list, void_int *ss_side_list, int *ierr) +{ + int64_t st, cnt; + if (ex_int64_status(*idne) & EX_BULK_INT64_API) { + st = *(int64_t *)start; + cnt = *(int64_t *)count; + } + else { + st = *(int *)start; + cnt = *(int *)count; + } + + if ((*ierr = ex_get_n_side_set(*idne, *ss_id, st, cnt, ss_elem_list, ss_side_list)) != 0) { + char errmsg[MAX_ERR_LENGTH]; + sprintf(errmsg, "Error: failed to read side set element list from file id %d", *idne); + ex_err(__func__, errmsg, EX_MSG); + } +} + +/* + * Write side set element list and side set side list + */ +void F2C(EXPNSS)(int *idne, entity_id *ss_id, void_int *start, void_int *count, + void_int *ss_elem_list, void_int *ss_side_list, int *ierr) +{ + int64_t st, cnt; + if (ex_int64_status(*idne) & EX_BULK_INT64_API) { + st = *(int64_t *)start; + cnt = *(int64_t *)count; + } + else { + st = *(int *)start; + cnt = *(int *)count; + } + + if ((*ierr = ex_put_n_side_set(*idne, *ss_id, st, cnt, ss_elem_list, ss_side_list)) != 0) { + char errmsg[MAX_ERR_LENGTH]; + sprintf(errmsg, "Error: failed to write side set element list to file id %d", *idne); + ex_err(__func__, errmsg, EX_MSG); + } +} + +/* + * Read side set distribution factor + */ +void F2C(EXGNSSD)(int *idne, entity_id *ss_id, void_int *start, void_int *count, real *ss_df, + int *ierr) +{ + int64_t st, cnt; + if (ex_int64_status(*idne) & EX_BULK_INT64_API) { + st = *(int64_t *)start; + cnt = *(int64_t *)count; + } + else { + st = *(int *)start; + cnt = *(int *)count; + } + + if ((*ierr = ex_get_n_side_set_df(*idne, *ss_id, st, cnt, ss_df)) != 0) { + char errmsg[MAX_ERR_LENGTH]; + sprintf(errmsg, "Error: failed to read side set dist factor from file id %d", *idne); + ex_err(__func__, errmsg, EX_MSG); + } +} + +/* + * Write side set distribution factor + */ +void F2C(EXPNSSD)(int *idne, entity_id *ss_id, void_int *start, void_int *count, real *ss_df, + int *ierr) +{ + int64_t st, cnt; + if (ex_int64_status(*idne) & EX_BULK_INT64_API) { + st = *(int64_t *)start; + cnt = *(int64_t *)count; + } + else { + st = *(int *)start; + cnt = *(int *)count; + } + + if ((*ierr = ex_put_n_side_set_df(*idne, *ss_id, st, cnt, ss_df)) != 0) { + char errmsg[MAX_ERR_LENGTH]; + sprintf(errmsg, "Error: failed to write side set dist factor to file id %d", *idne); + ex_err(__func__, errmsg, EX_MSG); + } +} + +/* + * Read node set list for a single node set + */ +void F2C(EXGNNS)(int *idne, entity_id *ns_id, void_int *start, void_int *count, + void_int *ns_node_list, int *ierr) +{ + int64_t st, cnt; + if (ex_int64_status(*idne) & EX_BULK_INT64_API) { + st = *(int64_t *)start; + cnt = *(int64_t *)count; + } + else { + st = *(int *)start; + cnt = *(int *)count; + } + + if ((*ierr = ex_get_n_node_set(*idne, *ns_id, st, cnt, ns_node_list)) != 0) { + char errmsg[MAX_ERR_LENGTH]; + sprintf(errmsg, "Error: failed to read node set node list from file id %d", *idne); + ex_err(__func__, errmsg, EX_MSG); + } +} + +/* + * Write node set list for a single node set + */ +void F2C(EXPNNS)(int *idne, entity_id *ns_id, void_int *start, void_int *count, + void_int *ns_node_list, int *ierr) +{ + int64_t st, cnt; + if (ex_int64_status(*idne) & EX_BULK_INT64_API) { + st = *(int64_t *)start; + cnt = *(int64_t *)count; + } + else { + st = *(int *)start; + cnt = *(int *)count; + } + + if ((*ierr = ex_put_n_node_set(*idne, *ns_id, st, cnt, ns_node_list)) != 0) { + char errmsg[MAX_ERR_LENGTH]; + sprintf(errmsg, "Error: failed to write node set node list to file id %d", *idne); + ex_err(__func__, errmsg, EX_MSG); + } +} + +/* + * Read node set distribution factor + */ +void F2C(EXGNNSD)(int *idne, entity_id *ns_id, void_int *start, void_int *count, real *ns_df, + int *ierr) +{ + int64_t st, cnt; + if (ex_int64_status(*idne) & EX_BULK_INT64_API) { + st = *(int64_t *)start; + cnt = *(int64_t *)count; + } + else { + st = *(int *)start; + cnt = *(int *)count; + } + + if ((*ierr = ex_get_n_node_set_df(*idne, *ns_id, st, cnt, ns_df)) != 0) { + char errmsg[MAX_ERR_LENGTH]; + sprintf(errmsg, "Error: failed to read node set dist factor from file id %d", *idne); + ex_err(__func__, errmsg, EX_MSG); + } +} + +/* + * Write node set distribution factor + */ +void F2C(EXPNNSD)(int *idne, entity_id *ns_id, void_int *start, void_int *count, real *ns_df, + int *ierr) +{ + int64_t st, cnt; + if (ex_int64_status(*idne) & EX_BULK_INT64_API) { + st = *(int64_t *)start; + cnt = *(int64_t *)count; + } + else { + st = *(int *)start; + cnt = *(int *)count; + } + + if ((*ierr = ex_put_n_node_set_df(*idne, *ns_id, st, cnt, ns_df)) != 0) { + char errmsg[MAX_ERR_LENGTH]; + sprintf(errmsg, "Error: failed to write node set dist factor to file id %d", *idne); + ex_err(__func__, errmsg, EX_MSG); + } +} + +/* + * Read coordinates of the nodes + */ +void F2C(EXGNCOR)(int *idne, void_int *start, void_int *count, real *x_coor, real *y_coor, + real *z_coor, int *ierr) +{ + int64_t st, cnt; + if (ex_int64_status(*idne) & EX_BULK_INT64_API) { + st = *(int64_t *)start; + cnt = *(int64_t *)count; + } + else { + st = *(int *)start; + cnt = *(int *)count; + } + + if ((*ierr = ex_get_n_coord(*idne, st, cnt, x_coor, y_coor, z_coor)) != 0) { + char errmsg[MAX_ERR_LENGTH]; + sprintf(errmsg, "Error: failed to read node coordinates from file id %d", *idne); + ex_err(__func__, errmsg, EX_MSG); + } +} + +/* + * Write coordinates of the nodes + */ +void F2C(EXPNCOR)(int *idne, void_int *start, void_int *count, real *x_coor, real *y_coor, + real *z_coor, int *ierr) +{ + int64_t st, cnt; + if (ex_int64_status(*idne) & EX_BULK_INT64_API) { + st = *(int64_t *)start; + cnt = *(int64_t *)count; + } + else { + st = *(int *)start; + cnt = *(int *)count; + } + + if ((*ierr = ex_put_n_coord(*idne, st, cnt, x_coor, y_coor, z_coor)) != 0) { + char errmsg[MAX_ERR_LENGTH]; + sprintf(errmsg, "Error: failed to write node coordinates to file id %d", *idne); + ex_err(__func__, errmsg, EX_MSG); + } +} + +/* + * Read an element block's connectivity list + */ +void F2C(EXGNEC)(int *idne, entity_id *elem_blk_id, void_int *start, void_int *count, + void_int *connect, int *ierr) +{ + int64_t st, cnt; + if (ex_int64_status(*idne) & EX_BULK_INT64_API) { + st = *(int64_t *)start; + cnt = *(int64_t *)count; + } + else { + st = *(int *)start; + cnt = *(int *)count; + } + + if ((*ierr = ex_get_n_elem_conn(*idne, *elem_blk_id, st, cnt, connect)) != 0) { + char errmsg[MAX_ERR_LENGTH]; + sprintf(errmsg, "Error: failed to read element block connectivity from file id %d", *idne); + ex_err(__func__, errmsg, EX_MSG); + } +} + +/* + * Write an element block's connectivity list + */ +void F2C(EXPNEC)(int *idne, entity_id *elem_blk_id, void_int *start, void_int *count, + void_int *connect, int *ierr) +{ + int64_t st, cnt; + if (ex_int64_status(*idne) & EX_BULK_INT64_API) { + st = *(int64_t *)start; + cnt = *(int64_t *)count; + } + else { + st = *(int *)start; + cnt = *(int *)count; + } + + if ((*ierr = ex_put_n_elem_conn(*idne, *elem_blk_id, st, cnt, connect)) != 0) { + char errmsg[MAX_ERR_LENGTH]; + sprintf(errmsg, "Error: failed to write element block connectivity to file id %d", *idne); + ex_err(__func__, errmsg, EX_MSG); + } +} + +/* + * Read an element block's attributes + */ +void F2C(EXGNEAT)(int *idne, entity_id *elem_blk_id, void_int *start, void_int *count, real *attrib, + int *ierr) +{ + int64_t st, cnt; + if (ex_int64_status(*idne) & EX_BULK_INT64_API) { + st = *(int64_t *)start; + cnt = *(int64_t *)count; + } + else { + st = *(int *)start; + cnt = *(int *)count; + } + + if ((*ierr = ex_get_n_elem_attr(*idne, *elem_blk_id, st, cnt, attrib)) != 0) { + char errmsg[MAX_ERR_LENGTH]; + sprintf(errmsg, "Error: failed to read element block attribute from file id %d", *idne); + ex_err(__func__, errmsg, EX_MSG); + } +} + +/* + * Write an element block's attributes + */ +void F2C(EXPNEAT)(int *idne, entity_id *elem_blk_id, void_int *start, void_int *count, real *attrib, + int *ierr) +{ + int64_t st, cnt; + if (ex_int64_status(*idne) & EX_BULK_INT64_API) { + st = *(int64_t *)start; + cnt = *(int64_t *)count; + } + else { + st = *(int *)start; + cnt = *(int *)count; + } + + if ((*ierr = ex_put_n_elem_attr(*idne, *elem_blk_id, st, cnt, attrib)) != 0) { + char errmsg[MAX_ERR_LENGTH]; + sprintf(errmsg, "Error: failed to write element block attribute to file id %d", *idne); + ex_err(__func__, errmsg, EX_MSG); + } +} + +/* + * Read the element type for a specific element block + */ +void F2C(EXGELT)(int *idne, entity_id *elem_blk_id, char *elem_type, int *ierr, size_t elem_typelen) +{ + size_t slen = MAX_STR_LENGTH; + char * etype; + + /* WARNING: ftypelen SHOULD be MAX_STR_LENGTH, but may not be depending + on how the Fortran programmer passed it. It is best at + this time to hard code it per NEMESIS spec. */ + if (elem_typelen != MAX_STR_LENGTH) { +#if defined(EXODUS_STRING_LENGTH_WARNING) + char errmsg[MAX_ERR_LENGTH]; + sprintf(errmsg, "Warning: element type string length is %lu in file id %d\n", elem_typelen, + *idne); + ex_err(__func__, errmsg, EX_MSG); +#endif + slen = elem_typelen; + } + + etype = (char *)malloc((slen + 1) * sizeof(char)); + + if ((*ierr = ex_get_elem_type(*idne, *elem_blk_id, etype)) != 0) { + char errmsg[MAX_ERR_LENGTH]; + sprintf(errmsg, "Error: failed to read element block type from file id %d", *idne); + ex_err(__func__, errmsg, EX_MSG); + } + + if (*ierr == 0) + ex_fcdcpy(elem_type, slen, etype); + + free(etype); +} + +/* + * Read a variable for an element block + */ +void F2C(EXGNEV)(int *idne, int *time_step, int *elem_var_index, entity_id *elem_blk_id, + void_int *num_elem_this_blk, void_int *start, void_int *count, real *elem_var_vals, + int *ierr) +{ + int64_t st, cnt; + if (ex_int64_status(*idne) & EX_BULK_INT64_API) { + st = *(int64_t *)start; + cnt = *(int64_t *)count; + } + else { + st = *(int *)start; + cnt = *(int *)count; + } + + if ((*ierr = ex_get_n_var(*idne, *time_step, EX_ELEM_BLOCK, *elem_var_index, *elem_blk_id, st, + cnt, elem_var_vals)) != 0) { + char errmsg[MAX_ERR_LENGTH]; + sprintf(errmsg, "Error: failed to read element block variable from file id %d", *idne); + ex_err(__func__, errmsg, EX_MSG); + } +} + +/* + * Write a variable slab for an element block + */ +void F2C(EXPEVS)(int *idne, int *time_step, int *elem_var_index, entity_id *elem_blk_id, + void_int *start, void_int *count, real *elem_var_vals, int *ierr) +{ + int64_t st, cnt; + if (ex_int64_status(*idne) & EX_BULK_INT64_API) { + st = *(int64_t *)start; + cnt = *(int64_t *)count; + } + else { + st = *(int *)start; + cnt = *(int *)count; + } + + if ((*ierr = ex_put_elem_var_slab(*idne, *time_step, *elem_var_index, *elem_blk_id, st, cnt, + elem_var_vals)) != 0) { + char errmsg[MAX_ERR_LENGTH]; + sprintf(errmsg, "Error: failed to write elem block variable slab to file id %d", *idne); + ex_err(__func__, errmsg, EX_MSG); + } +} + +/* + * Read the values of a single nodal variable for a single time step + */ +void F2C(EXGNNV)(int *idne, int *time_step, int *nodal_var_index, void_int *start, void_int *count, + real *nodal_vars, int *ierr) +{ + int64_t st, cnt; + if (ex_int64_status(*idne) & EX_BULK_INT64_API) { + st = *(int64_t *)start; + cnt = *(int64_t *)count; + } + else { + st = *(int *)start; + cnt = *(int *)count; + } + + if ((*ierr = ex_get_n_var(*idne, *time_step, EX_NODAL, *nodal_var_index, 1, st, cnt, + nodal_vars)) != 0) { + char errmsg[MAX_ERR_LENGTH]; + sprintf(errmsg, "Error: failed to read nodal variable from file id %d", *idne); + ex_err(__func__, errmsg, EX_MSG); + } +} + +/* + * Write nodal variable slab + */ +void F2C(EXPNVS)(int *idne, int *time_step, int *nodal_var_index, void_int *start, void_int *count, + real *nodal_var_vals, int *ierr) +{ + int64_t st, cnt; + if (ex_int64_status(*idne) & EX_BULK_INT64_API) { + st = *(int64_t *)start; + cnt = *(int64_t *)count; + } + else { + st = *(int *)start; + cnt = *(int *)count; + } + + if ((*ierr = ex_put_nodal_var_slab(*idne, *time_step, *nodal_var_index, st, cnt, + nodal_var_vals)) != 0) { + char errmsg[MAX_ERR_LENGTH]; + sprintf(errmsg, "Error: failed to write nodal variable slab to file id %d", *idne); + ex_err(__func__, errmsg, EX_MSG); + } +} + +/* + * Read the element numbering map + */ +void F2C(EXGNENM)(int *idne, void_int *starte, void_int *num_ent, void_int *elem_map, int *ierr) +{ + int64_t st, cnt; + if (ex_int64_status(*idne) & EX_BULK_INT64_API) { + st = *(int64_t *)starte; + cnt = *(int64_t *)num_ent; + } + else { + st = *(int *)starte; + cnt = *(int *)num_ent; + } + + if ((*ierr = ex_get_n_elem_num_map(*idne, st, cnt, elem_map)) != 0) { + char errmsg[MAX_ERR_LENGTH]; + sprintf(errmsg, "Error: failed to read element numbering map from file id %d", *idne); + ex_err(__func__, errmsg, EX_MSG); + } +} + +/* + * Write the element numbering map + */ +void F2C(EXPNENM)(int *idne, void_int *starte, void_int *num_ent, void_int *elem_map, int *ierr) +{ + int64_t st, cnt; + if (ex_int64_status(*idne) & EX_BULK_INT64_API) { + st = *(int64_t *)starte; + cnt = *(int64_t *)num_ent; + } + else { + st = *(int *)starte; + cnt = *(int *)num_ent; + } + + if ((*ierr = ex_put_partial_id_map(*idne, EX_ELEM_MAP, st, cnt, elem_map)) != 0) { + char errmsg[MAX_ERR_LENGTH]; + sprintf(errmsg, "Error: failed to write element numbering map to file id %d", *idne); + ex_err(__func__, errmsg, EX_MSG); + } +} + +/* + * Read the node numbering map + */ +void F2C(EXGNNNM)(int *idne, void_int *startn, void_int *num_ent, void_int *node_map, int *ierr) +{ + int64_t st, cnt; + if (ex_int64_status(*idne) & EX_BULK_INT64_API) { + st = *(int64_t *)startn; + cnt = *(int64_t *)num_ent; + } + else { + st = *(int *)startn; + cnt = *(int *)num_ent; + } + + if ((*ierr = ex_get_n_node_num_map(*idne, st, cnt, node_map)) != 0) { + char errmsg[MAX_ERR_LENGTH]; + sprintf(errmsg, "Error: failed to read node numbering map from file id %d", *idne); + ex_err(__func__, errmsg, EX_MSG); + } +} + +/* + * Write the node numbering map + */ +void F2C(EXPNNNM)(int *idne, void_int *startn, void_int *num_ent, void_int *node_map, int *ierr) +{ + int64_t st, cnt; + if (ex_int64_status(*idne) & EX_BULK_INT64_API) { + st = *(int64_t *)startn; + cnt = *(int64_t *)num_ent; + } + else { + st = *(int *)startn; + cnt = *(int *)num_ent; + } + + if ((*ierr = ex_put_partial_id_map(*idne, EX_NODE_MAP, st, cnt, node_map)) != 0) { + char errmsg[MAX_ERR_LENGTH]; + sprintf(errmsg, "Error: failed to write node numbering map to file id %d", *idne); + ex_err(__func__, errmsg, EX_MSG); + } +} + +/* + * Read the node map for a processor + */ +void F2C(EXGNMP)(int *idne, void_int *node_mapi, void_int *node_mapb, void_int *node_mape, + int *processor, int *ierr) +{ + if ((*ierr = ex_get_processor_node_maps(*idne, node_mapi, node_mapb, node_mape, *processor)) != + 0) { + char errmsg[MAX_ERR_LENGTH]; + sprintf(errmsg, "Error: failed to read processor node map from file id %d", *idne); + ex_err(__func__, errmsg, EX_MSG); + } +} + +/* + * Write a node map for a processor + */ +void F2C(EXPNMP)(int *idne, void_int *node_mapi, void_int *node_mapb, void_int *node_mape, + int *processor, int *ierr) +{ + if ((*ierr = ex_put_processor_node_maps(*idne, node_mapi, node_mapb, node_mape, *processor)) != + 0) { + char errmsg[MAX_ERR_LENGTH]; + sprintf(errmsg, "Error: failed to write processor node map to file id %d", *idne); + ex_err(__func__, errmsg, EX_MSG); + } +} + +/* + * Read the element map for a processor + */ +void F2C(EXGEMP)(int *idne, void_int *elem_mapi, void_int *elem_mapb, int *processor, int *ierr) +{ + if ((*ierr = ex_get_processor_elem_maps(*idne, elem_mapi, elem_mapb, *processor)) != 0) { + char errmsg[MAX_ERR_LENGTH]; + sprintf(errmsg, "Error: failed to read processor element map from file id %d", *idne); + ex_err(__func__, errmsg, EX_MSG); + } +} + +/* + * Write the element map for a processor + */ +void F2C(EXPEMP)(int *idne, void_int *elem_mapi, void_int *elem_mapb, int *processor, int *ierr) +{ + if ((*ierr = ex_put_processor_elem_maps(*idne, elem_mapi, elem_mapb, *processor)) != 0) { + char errmsg[MAX_ERR_LENGTH]; + sprintf(errmsg, "Error: failed to write processor element map to file id %d", *idne); + ex_err(__func__, errmsg, EX_MSG); + } +} + +/* + * Read the communications map parameters for a single processor + */ +void F2C(EXGCMP)(int *idne, void_int *ncmap_ids, void_int *ncmap_node_cnts, void_int *ecmap_ids, + void_int *ecmap_elem_cnts, int *processor, int *ierr) +{ + if ((*ierr = ex_get_cmap_params(*idne, ncmap_ids, ncmap_node_cnts, ecmap_ids, ecmap_elem_cnts, + *processor)) != 0) { + char errmsg[MAX_ERR_LENGTH]; + sprintf(errmsg, "Error: failed to read comm map parameters from file id %d", *idne); + ex_err(__func__, errmsg, EX_MSG); + } +} + +/* + * Write the communications map parameters for a single processor + */ +void F2C(EXPCMP)(int *idne, void_int *nmap_ids, void_int *nmap_node_cnts, void_int *emap_ids, + void_int *emap_elem_cnts, int *processor, int *ierr) +{ + if ((*ierr = ex_put_cmap_params(*idne, nmap_ids, nmap_node_cnts, emap_ids, emap_elem_cnts, + *processor)) != 0) { + char errmsg[MAX_ERR_LENGTH]; + sprintf(errmsg, "Error: failed to write comm map parameters to file id %d", *idne); + ex_err(__func__, errmsg, EX_MSG); + } +} + +/* + * Write the communications map parameters for all processors + */ +void F2C(EXPCMPC)(int *idne, void_int *nmap_ids, void_int *nmap_node_cnts, void_int *nproc_ptrs, + void_int *emap_ids, void_int *emap_elem_cnts, void_int *eproc_ptrs, int *ierr) +{ + if ((*ierr = ex_put_cmap_params_cc(*idne, nmap_ids, nmap_node_cnts, nproc_ptrs, emap_ids, + emap_elem_cnts, eproc_ptrs)) != 0) { + char errmsg[MAX_ERR_LENGTH]; + sprintf(errmsg, "Error: failed to write comm map parameters to file id %d", *idne); + ex_err(__func__, errmsg, EX_MSG); + } +} + +/* + * Read the nodal communications map for a single processor + */ +void F2C(EXGNCM)(int *idne, entity_id *map_id, void_int *node_ids, void_int *proc_ids, + int *processor, int *ierr) +{ + if ((*ierr = ex_get_node_cmap(*idne, *map_id, node_ids, proc_ids, *processor)) != 0) { + char errmsg[MAX_ERR_LENGTH]; + sprintf(errmsg, "Error: failed to read nodal communications map from file id %d", *idne); + ex_err(__func__, errmsg, EX_MSG); + } +} + +/* + * Write the nodal communications map for a single processor + */ +void F2C(EXPNCM)(int *idne, entity_id *map_id, void_int *node_ids, void_int *proc_ids, + int *processor, int *ierr) +{ + if ((*ierr = ex_put_node_cmap(*idne, *map_id, node_ids, proc_ids, *processor)) != 0) { + char errmsg[MAX_ERR_LENGTH]; + sprintf(errmsg, "Error: failed to write nodal communications map to file id %d", *idne); + ex_err(__func__, errmsg, EX_MSG); + } +} + +/* + * Read the elemental communications map for a single processor + */ +void F2C(EXGECM)(int *idne, entity_id *map_id, void_int *elem_ids, void_int *side_ids, + void_int *proc_ids, int *processor, int *ierr) +{ + if ((*ierr = ex_get_elem_cmap(*idne, *map_id, elem_ids, side_ids, proc_ids, *processor)) != 0) { + char errmsg[MAX_ERR_LENGTH]; + sprintf(errmsg, "Error: failed to read elemental comm map from file id %d", *idne); + ex_err(__func__, errmsg, EX_MSG); + } +} + +/* + * Write the elemental communications map for a single processor + */ +void F2C(EXPECM)(int *idne, entity_id *map_id, void_int *elem_ids, void_int *side_ids, + void_int *proc_ids, int *processor, int *ierr) +{ + if ((*ierr = ex_put_elem_cmap(*idne, *map_id, elem_ids, side_ids, proc_ids, *processor)) != 0) { + char errmsg[MAX_ERR_LENGTH]; + sprintf(errmsg, "Error: failed to write elemental comm map to file id %d", *idne); + ex_err(__func__, errmsg, EX_MSG); + } +} diff --git a/packages/seacas/libraries/exodus_for/src/exo_jack.c b/packages/seacas/libraries/exodus_for/src/exo_jack.c index 3399c6f8303e..afb96214acae 100644 --- a/packages/seacas/libraries/exodus_for/src/exo_jack.c +++ b/packages/seacas/libraries/exodus_for/src/exo_jack.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/exodus_for/test/CMakeLists.txt b/packages/seacas/libraries/exodus_for/test/CMakeLists.txt index d71eb4b2b426..105f6edca434 100644 --- a/packages/seacas/libraries/exodus_for/test/CMakeLists.txt +++ b/packages/seacas/libraries/exodus_for/test/CMakeLists.txt @@ -1,4 +1,3 @@ - ADD_DEFINITIONS(-DUSING_CMAKE) if ( NETCDF_NCDUMP_BINARY ) @@ -19,7 +18,6 @@ endif() # =============================================== - IF ( NETCDF_NCDUMP_BINARY ) SET(NETCDF_NCDUMP ${NETCDF_NCDUMP_BINARY}) SET( forbind_OLDTESTS diff --git a/packages/seacas/libraries/exodus_for/test/test_nem.f b/packages/seacas/libraries/exodus_for/test/test_nem.f index dc900c8e58be..49ce19c60b86 100644 --- a/packages/seacas/libraries/exodus_for/test/test_nem.f +++ b/packages/seacas/libraries/exodus_for/test/test_nem.f @@ -1,15 +1,15 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C================================================================= -C + C This is just a simple test program to test the fortran interface C for the NEMESIS I library. -C + C This file was created by translating ne_test.c into fortran. -C + C================================================================= C================================================================= diff --git a/packages/seacas/libraries/exodus_for/test/test_nem.inc b/packages/seacas/libraries/exodus_for/test/test_nem.inc index e979c59b2ba9..857980317e14 100644 --- a/packages/seacas/libraries/exodus_for/test/test_nem.inc +++ b/packages/seacas/libraries/exodus_for/test/test_nem.inc @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C================================================== C Parameters for the NE_TEST fortran interface test diff --git a/packages/seacas/libraries/exodus_for/test/testall.in b/packages/seacas/libraries/exodus_for/test/testall.in index 4daf5064c170..47a8cf9eb89d 100644 --- a/packages/seacas/libraries/exodus_for/test/testall.in +++ b/packages/seacas/libraries/exodus_for/test/testall.in @@ -2,7 +2,7 @@ # Copyright(C) 1999-2020 National Technology & Engineering Solutions # of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with # NTESS, the U.S. Government retains certain rights in this software. -# +# # See packages/seacas/LICENSE for details # script to run all tests and compare them to saved dump files. diff --git a/packages/seacas/libraries/exodus_for/test/testall.in1 b/packages/seacas/libraries/exodus_for/test/testall.in1 index f71735f424ee..2f3d5df71813 100644 --- a/packages/seacas/libraries/exodus_for/test/testall.in1 +++ b/packages/seacas/libraries/exodus_for/test/testall.in1 @@ -1,7 +1,7 @@ # Copyright(C) 1999-2020 National Technology & Engineering Solutions # of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with # NTESS, the U.S. Government retains certain rights in this software. -# +# # See packages/seacas/LICENSE for details # script to run all tests and compare them to saved dump files. @@ -76,7 +76,7 @@ ${PREFIX} ${SRCDIR}/testrdd | grep -v version | diff - testrdd.dmp | tee testrdd # testwt2 - single precision write 2 files (simultaneously open) test echo "testwt2 ..." echo "begin testwt2" >> test.output -${PREFIX} ${SRCDIR}/testwt2 >> test.output | grep -v "property name string" +${PREFIX} ${SRCDIR}/testwt2 >> test.output | grep -v "property name string" echo "end testwt2" >> test.output ${NCDUMP} -d5,5 test.exo | grep -v version | diff - test2-1.dmp | tee testwt2-1.res ${NCDUMP} -d5,5 test2.exo | grep -v version | diff - test2-2.dmp | tee testwt2-2.res diff --git a/packages/seacas/libraries/exodus_for/test/testall.standalone b/packages/seacas/libraries/exodus_for/test/testall.standalone index 880d30d7d7a3..474d0f5656a8 100755 --- a/packages/seacas/libraries/exodus_for/test/testall.standalone +++ b/packages/seacas/libraries/exodus_for/test/testall.standalone @@ -1,7 +1,7 @@ # Copyright(C) 1999-2020 National Technology & Engineering Solutions # of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with # NTESS, the U.S. Government retains certain rights in this software. -# +# # See packages/seacas/LICENSE for details # script to run all tests and compare them to saved dump files. @@ -81,7 +81,7 @@ ${PREFIX} ${SRCDIR}/testrdd | grep -v version | diff - testrdd.dmp | tee testrdd # testwt2 - single precision write 2 files (simultaneously open) test echo "testwt2 ..." echo "begin testwt2" >> test.output -${PREFIX} ${SRCDIR}/testwt2 >> test.output |&grep -v "property name string" +${PREFIX} ${SRCDIR}/testwt2 >> test.output |&grep -v "property name string" echo "end testwt2" >> test.output ${NCDUMP} -d5,5 test.exo | grep -v version | diff - test2-1.dmp | tee testwt2-1.res ${NCDUMP} -d5,5 test2.exo | grep -v version | diff - test2-2.dmp | tee testwt2-2.res diff --git a/packages/seacas/libraries/exodus_for/test/testcp.f b/packages/seacas/libraries/exodus_for/test/testcp.f index 050e43692349..10e51e0cbbcb 100644 --- a/packages/seacas/libraries/exodus_for/test/testcp.f +++ b/packages/seacas/libraries/exodus_for/test/testcp.f @@ -1,15 +1,14 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details program testcpd -c c This is a test program for the Fortran binding of the EXODUS II c database copy function (excopy). -c + implicit none include 'exodusII.inc' @@ -20,9 +19,7 @@ program testcpd data iin /5/, iout /6/ -c c open EXODUS II input file -c c the setting of cpu_ws isn't used for copying but will test the c conversion routines @@ -38,9 +35,8 @@ program testcpd 1 f4.2)') vers write (iout, '(" I/O word size: ",i4)') io_ws -c c create EXODUS II output file with default size reals -c + c the setting of cpu_ws isn't used for copying but will test the c conversion routines diff --git a/packages/seacas/libraries/exodus_for/test/testcpd.f b/packages/seacas/libraries/exodus_for/test/testcpd.f index 7d72d55f5835..3dda68d2befa 100644 --- a/packages/seacas/libraries/exodus_for/test/testcpd.f +++ b/packages/seacas/libraries/exodus_for/test/testcpd.f @@ -1,15 +1,14 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details program testcpd -c c This is a test program for the Fortran binding of the EXODUS II c database copy function (excopy). -c + implicit none include 'exodusII.inc' @@ -20,9 +19,7 @@ program testcpd data iin /5/, iout /6/ -c c open EXODUS II input file -c c the setting of cpu_ws isn't used in copying but will test the c conversion routines @@ -38,9 +35,8 @@ program testcpd 1 f4.2)') vers write (iout, '(" I/O word size: ",i4)') io_ws -c c create EXODUS II output file with 8-byte reals -c + c the setting of cpu_ws isn't used in copying but will test the c conversion routines diff --git a/packages/seacas/libraries/exodus_for/test/testcpnl.f b/packages/seacas/libraries/exodus_for/test/testcpnl.f index 7aa28744d592..4cfd2f31a3f9 100644 --- a/packages/seacas/libraries/exodus_for/test/testcpnl.f +++ b/packages/seacas/libraries/exodus_for/test/testcpnl.f @@ -1,15 +1,14 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details program testcpnl -c c This is a test program for the Fortran binding of the EXODUS II c database copy function (excopy). -c + implicit none include 'exodusII.inc' @@ -20,9 +19,7 @@ program testcpnl data iin /5/, iout /6/ -c c open EXODUS II input file -c c the setting of cpu_ws isn't used for copying but will test the c conversion routines @@ -40,9 +37,8 @@ program testcpnl mod_sz = exlgmd(exoid) write (iout, '(" Model Size",i2)') mod_sz -c c create EXODUS II output file with default size reals -c + c the setting of cpu_ws isn't used for copying but will test the c conversion routines diff --git a/packages/seacas/libraries/exodus_for/test/testrd.f b/packages/seacas/libraries/exodus_for/test/testrd.f index 3ebc6a615c55..df3723fd6318 100644 --- a/packages/seacas/libraries/exodus_for/test/testrd.f +++ b/packages/seacas/libraries/exodus_for/test/testrd.f @@ -1,15 +1,14 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details program testrd -c c This is a test program for the Fortran binding of the EXODUS II c database read routines -c + c 09/07/93 V.R. Yarberry - Modified for API 2.00 implicit none @@ -55,10 +54,7 @@ program testrd data iin /5/, iout /6/ - -c c open EXODUS II files -c cpu_ws = 0 io_ws = 0 @@ -82,9 +78,7 @@ program testrd write (iout, '(" Maximum Allowed/Used DB Name Size ",i4,i4)') * mxalnmlen, mxusnmlen -c c read database parameters -c call exgini (exoid, titl, num_dim, num_nodes, num_elem, 1 num_elem_blk, num_node_sets, num_side_sets, ierr) @@ -101,10 +95,7 @@ program testrd 8 titl,num_dim, num_nodes, num_elem, 9 num_elem_blk,num_node_sets, num_side_sets - -c c read nodal coordinates values and names from database -c call exgcor (exoid, x, y, z, ierr) write (iout, '(/"after exgcor, error = ", i3)' ) ierr @@ -132,9 +123,7 @@ program testrd write (iout, '("x coord name = ", a9)') coord_names(1) write (iout, '("y coord name = ", a9)') coord_names(2) -c c read element order map -c call exgmap (exoid, elem_map, ierr) write (iout, '(/"after exgmap, error = ", i3)' ) ierr @@ -143,10 +132,8 @@ program testrd write (iout, '("elem_map(",i1,") = ", i1)') i, elem_map(i) 30 continue -c c read element block parameters -c -c + call exgebi (exoid, ids, ierr) write (iout, '(/"after exgebi, error = ", i3)' ) ierr @@ -176,7 +163,6 @@ program testrd 1 '(/"There are ",i2," properties for each element block")') 2 num_props - call exgpn(exoid, EXEBLK, prop_names, ierr) write (iout, '("after exgpn, error = ", i3)' ) ierr @@ -193,9 +179,7 @@ program testrd 45 continue 47 continue -c c read element connectivity -c do 60 i = 1, num_elem_blk @@ -210,9 +194,8 @@ program testrd 60 continue -c c read element block names -c + call exgnams(exoid, EXEBLK, num_elem_blk, blk_names, ierr) write (iout, '(/"after exgnams, error = ", i3)' ) ierr do i=1, num_elem_blk @@ -220,9 +203,7 @@ program testrd 2 i, blk_names(i) end do -c c read element block attributes -c do 70 i = 1, num_elem_blk @@ -244,9 +225,8 @@ program testrd 69 format(A32," = ", 10(f6.4,2x)) 70 continue -c c read individual node sets -c + if (num_node_sets .gt. 0) then call exgnsi (exoid, ids, ierr) write (iout, '(/"after exgnsi, error = ", i3)' ) ierr @@ -286,9 +266,8 @@ program testrd 100 continue -c c read node set names -c + call exgnams(exoid, EXNSET, num_node_sets, nset_names, ierr) write (iout, '(/"after exgnams, error = ", i3)' ) ierr do i=1, num_node_sets @@ -296,7 +275,6 @@ program testrd 2 i, nset_names(i) end do - c read node set properties num_props = exinqi (exoid, EXNNSP) @@ -304,7 +282,6 @@ program testrd 1 '(/"There are ",i2," properties for each node set")') 2 num_props - call exgpn(exoid, EXNSET, prop_names, ierr) write (iout, '("after exgpn, error = ", i3)' ) ierr @@ -321,10 +298,9 @@ program testrd 105 continue 107 continue -c c read concatenated node sets; this produces the same information as c the above code which reads individual node sets -c + num_node_sets = exinqi (exoid, EXNODS) if (num_node_sets .gt. 0) then @@ -373,9 +349,8 @@ program testrd 150 continue endif -c c read individual side sets -c + if (num_side_sets .gt. 0) then call exgssi (exoid, ids, ierr) write (iout, '(/"after exgssi, error = ", i3)' ) ierr @@ -436,9 +411,8 @@ program testrd 190 continue -c c read side set names -c + call exgnams(exoid, EXSSET, num_side_sets, sset_names, ierr) write (iout, '(/"after exgnams, error = ", i3)' ) ierr do i=1, num_side_sets @@ -453,7 +427,6 @@ program testrd 1 '(/"There are ",i2," properties for each side set")') 2 num_props - call exgpn(exoid, EXSSET, prop_names, ierr) write (iout, '("after exgpn, error = ", i3)' ) ierr @@ -486,10 +459,10 @@ program testrd df_list_len = exinqi (exoid, EXSSDF) write (iout, '(/"after exinq: EXSSDF =",i3,", error = ",i3)') 1 df_list_len,ierr -c + c read concatenated side sets; this produces the same information as c the above code which reads individual side sets -c + call exgcss (exoid, ids, num_elem_per_set, num_df_per_set, 1 elem_ind, df_ind, elem_list, side_list, dist_fact, 2 ierr) @@ -546,9 +519,8 @@ program testrd 270 continue endif -c c read QA records -c + num_qa_rec = exinqi (exoid, EXQA) call exgqa (exoid, qa_record, ierr) write (iout, '(/"after exgqa, error = ", i3)' ) ierr @@ -561,9 +533,8 @@ program testrd 280 continue 290 continue -c c read information records -c + num_info = exinqi (exoid, EXINFO) call exginf (exoid, inform, ierr) write (iout, '(/"after exginf, error = ", i3)' ) ierr @@ -574,9 +545,8 @@ program testrd write (iout, '(a81)') inform(i) 300 continue -c c read global variables parameters and names -c + call exgvp (exoid, "g", num_glo_vars, ierr) write (iout, '(/"after exgvp, error = ", i3)' ) ierr @@ -590,9 +560,8 @@ program testrd write (iout, '(a9)') var_names(i) 320 continue -c c read nodal variables parameters and names -c + call exgvp (exoid, "n", num_nod_vars, ierr) write (iout, '(/"after exgvp, error = ", i3)' ) ierr @@ -606,9 +575,8 @@ program testrd write (iout, '(a9)') var_names(i) 330 continue -c c read element variables parameters and names -c + call exgvp (exoid, "e", num_ele_vars, ierr) write (iout, '(/"after exgvp, error = ", i3)' ) ierr @@ -622,9 +590,8 @@ program testrd write (iout, '(a9)') var_names(i) 340 continue -c c read element variable truth table -c + call exgvtt (exoid, num_elem_blk, num_ele_vars, truth_tab, ierr) write (iout, '(/"after exgvtt, error = ", i3)' ) ierr @@ -636,24 +603,23 @@ program testrd 350 continue 360 continue -c c determine how many time steps are stored -c + num_time_steps = exinqi (exoid, EXTIMS) write (iout, '("There are ",i2," time steps in the database.")') 1 num_time_steps -c + c read time value at one time step -c + time_step = 3 call exgtim (exoid, time_step, time_value, ierr) write (iout, '(/"after exgtim, error = ", i3)' ) ierr write (iout, '("time value at time step ",i2," = ", f5.3)') 1 time_step, time_value -c + c read time values at all time steps -c + call exgatm (exoid, time_values, ierr) write (iout, '(/"after exgatm, error = ", i3)' ) ierr @@ -666,9 +632,9 @@ program testrd var_index = 1 beg_time = 1 end_time = -1 -c + c read all global variables at one time step -c + call exggv (exoid, time_step, num_glo_vars, var_values, ierr) write (iout, '(/"after exggv, error = ", i3)' ) ierr @@ -679,9 +645,8 @@ program testrd write (iout, '(f5.3)') var_values(i) 400 continue -c c read a single global variable through time -c + call exggvt (exoid, var_index, beg_time, end_time, var_values, 1 ierr) write (iout, '(/"after exggvt, error = ", i3)' ) ierr @@ -693,9 +658,8 @@ program testrd write (iout, '(f5.3)') var_values(i) 410 continue -c c read a nodal variable at one time step -c + call exgnv (exoid, time_step, var_index, num_nodes, var_values, 1 ierr) write (iout, '(/"after exgnv, error = ", i3)' ) ierr @@ -707,9 +671,8 @@ program testrd write (iout, '(f5.3)') var_values(i) 420 continue -c c read a nodal variable through time -c + node_num = 1 call exgnvt (exoid, var_index, node_num, beg_time, end_time, @@ -723,9 +686,8 @@ program testrd write (iout, '(f5.3)') var_values(i) 430 continue -c c read an element variable at one time step -c + call exgebi (exoid, ids, ierr) write (iout, '(/"after exgebi, error = ", i3)' ) ierr @@ -747,9 +709,8 @@ program testrd 450 continue -c c read an element variable through time -c + var_index = 2 elem_num = 2 diff --git a/packages/seacas/libraries/exodus_for/test/testrd1.f b/packages/seacas/libraries/exodus_for/test/testrd1.f index e6f468247c39..7541247d31ae 100644 --- a/packages/seacas/libraries/exodus_for/test/testrd1.f +++ b/packages/seacas/libraries/exodus_for/test/testrd1.f @@ -1,15 +1,14 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details program testrd1 -c c This is a test program for the Fortran binding of the EXODUS II c database read routines -c + c 09/07/93 V.R. Yarberry - Modified for API 2.00 implicit none @@ -53,9 +52,7 @@ program testrd1 c call exopts (EXVRBS, ierr) c write (iout, '(/"after exopts, error = ", i3)' ) ierr -c c open EXODUS II files -c cpu_ws = 0 io_ws = 0 @@ -68,9 +65,7 @@ program testrd1 1 f4.2)') vers write (iout, '(" I/O word size",i2)') io_ws -c c read database parameters -c call exgini (exoid, titl, num_dim, num_nodes, num_elem, 1 num_elem_blk, num_node_sets, num_side_sets, ierr) @@ -87,10 +82,7 @@ program testrd1 8 titl,num_dim, num_nodes, num_elem, 9 num_elem_blk,num_node_sets, num_side_sets - -c c read nodal coordinates values and names from database -c call exgcor (exoid, x, y, z, ierr) write (iout, '(/"after exgcor, error = ", i3)' ) ierr @@ -118,16 +110,12 @@ program testrd1 write (iout, '("x coord name = ", a9)') coord_names(1) write (iout, '("y coord name = ", a9)') coord_names(2) -c c read map parameters -c call exgmp (exoid, n_node_map, n_elem_map, ierr) write (iout, '(/"after exgmp, error = ", i3)' ) ierr -c c read element maps -c call exgpa (exoid, EXEMAP, "ID", ids, ierr) write (iout, '(/"after exgpa, error = ", i3)' ) ierr @@ -151,16 +139,13 @@ program testrd1 26 continue -c c read element map properties -c num_props = exinqi (exoid, EXNEMP) write (iout, 1 '(/"There are ",i2," properties for each element map")') 2 num_props - call exgpn(exoid, EXEMAP, prop_names, ierr) write (iout, '("after exgpn, error = ", i3)' ) ierr @@ -177,9 +162,7 @@ program testrd1 28 continue 30 continue -c c read node maps -c call exgpa (exoid, EXNMAP, "ID", ids, ierr) write (iout, '(/"after exgpa, error = ", i3)' ) ierr @@ -197,16 +180,13 @@ program testrd1 34 continue -c c read node map properties -c num_props = exinqi (exoid, EXNNMP) write (iout, 1 '(/"There are ",i2," properties for each node map")') 2 num_props - call exgpn(exoid, EXNMAP, prop_names, ierr) write (iout, '("after exgpn, error = ", i3)' ) ierr @@ -223,10 +203,8 @@ program testrd1 36 continue 38 continue -c c read element block parameters -c -c + call exgebi (exoid, ids, ierr) write (iout, '(/"after exgebi, error = ", i3)' ) ierr @@ -253,7 +231,6 @@ program testrd1 1 '(/"There are ",i2," properties for each element block")') 2 num_props - call exgpn(exoid, EXEBLK, prop_names, ierr) write (iout, '("after exgpn, error = ", i3)' ) ierr @@ -270,9 +247,7 @@ program testrd1 45 continue 47 continue -c c read element connectivity -c do 60 i = 1, num_elem_blk @@ -287,9 +262,7 @@ program testrd1 60 continue -c c read element block attributes -c do 70 i = 1, num_elem_blk @@ -311,9 +284,8 @@ program testrd1 69 format(A32," = ", 10(f6.4,2x)) 70 continue -c c read individual node sets -c + if (num_node_sets .gt. 0) then call exgnsi (exoid, ids, ierr) write (iout, '(/"after exgnsi, error = ", i3)' ) ierr @@ -360,7 +332,6 @@ program testrd1 1 '(/"There are ",i2," properties for each node set")') 2 num_props - call exgpn(exoid, EXNSET, prop_names, ierr) write (iout, '("after exgpn, error = ", i3)' ) ierr @@ -377,10 +348,9 @@ program testrd1 105 continue 107 continue -c c read concatenated node sets; this produces the same information as c the above code which reads individual node sets -c + num_node_sets = exinqi (exoid, EXNODS) if (num_node_sets .gt. 0) then list_len = exinqi (exoid, EXNSNL) @@ -428,9 +398,8 @@ program testrd1 150 continue endif -c c read individual side sets -c + if (num_side_sets .gt. 0) then call exgssi (exoid, ids, ierr) write (iout, '(/"after exgssi, error = ", i3)' ) ierr @@ -498,7 +467,6 @@ program testrd1 1 '(/"There are ",i2," properties for each side set")') 2 num_props - call exgpn(exoid, EXSSET, prop_names, ierr) write (iout, '("after exgpn, error = ", i3)' ) ierr @@ -531,10 +499,10 @@ program testrd1 df_list_len = exinqi (exoid, EXSSDF) write (iout, '(/"after exinq: EXSSDF =",i3,", error = ",i3)') 1 df_list_len,ierr -c + c read concatenated side sets; this produces the same information as c the above code which reads individual side sets -c + call exgcss (exoid, ids, num_elem_per_set, num_df_per_set, 1 elem_ind, df_ind, elem_list, side_list, dist_fact, 2 ierr) @@ -591,9 +559,8 @@ program testrd1 270 continue endif -c c read QA records -c + num_qa_rec = exinqi (exoid, EXQA) call exgqa (exoid, qa_record, ierr) write (iout, '(/"after exgqa, error = ", i3)' ) ierr @@ -606,9 +573,8 @@ program testrd1 280 continue 290 continue -c c read information records -c + num_info = exinqi (exoid, EXINFO) call exginf (exoid, inform, ierr) write (iout, '(/"after exginf, error = ", i3)' ) ierr @@ -619,9 +585,8 @@ program testrd1 write (iout, '(a81)') inform(i) 300 continue -c c read global variables parameters and names -c + call exgvp (exoid, "g", num_glo_vars, ierr) write (iout, '(/"after exgvp, error = ", i3)' ) ierr @@ -635,9 +600,8 @@ program testrd1 write (iout, '(a9)') var_names(i) 320 continue -c c read nodal variables parameters and names -c + call exgvp (exoid, "n", num_nod_vars, ierr) write (iout, '(/"after exgvp, error = ", i3)' ) ierr @@ -651,9 +615,8 @@ program testrd1 write (iout, '(a9)') var_names(i) 330 continue -c c read element variables parameters and names -c + call exgvp (exoid, "e", num_ele_vars, ierr) write (iout, '(/"after exgvp, error = ", i3)' ) ierr @@ -667,9 +630,8 @@ program testrd1 write (iout, '(a9)') var_names(i) 340 continue -c c read element variable truth table -c + call exgvtt (exoid, num_elem_blk, num_ele_vars, truth_tab, ierr) write (iout, '(/"after exgvtt, error = ", i3)' ) ierr @@ -681,24 +643,23 @@ program testrd1 350 continue 360 continue -c c determine how many time steps are stored -c + num_time_steps = exinqi (exoid, EXTIMS) write (iout, '("There are ",i2," time steps in the database.")') 1 num_time_steps -c + c read time value at one time step -c + time_step = 3 call exgtim (exoid, time_step, time_value, ierr) write (iout, '(/"after exgtim, error = ", i3)' ) ierr write (iout, '("time value at time step ",i2," = ", f5.3)') 1 time_step, time_value -c + c read time values at all time steps -c + call exgatm (exoid, time_values, ierr) write (iout, '(/"after exgatm, error = ", i3)' ) ierr @@ -711,9 +672,9 @@ program testrd1 var_index = 1 beg_time = 1 end_time = -1 -c + c read all global variables at one time step -c + call exggv (exoid, time_step, num_glo_vars, var_values, ierr) write (iout, '(/"after exggv, error = ", i3)' ) ierr @@ -724,9 +685,8 @@ program testrd1 write (iout, '(f5.3)') var_values(i) 400 continue -c c read a single global variable through time -c + call exggvt (exoid, var_index, beg_time, end_time, var_values, 1 ierr) write (iout, '(/"after exggvt, error = ", i3)' ) ierr @@ -738,9 +698,8 @@ program testrd1 write (iout, '(f5.3)') var_values(i) 410 continue -c c read a nodal variable at one time step -c + call exgnv (exoid, time_step, var_index, num_nodes, var_values, 1 ierr) write (iout, '(/"after exgnv, error = ", i3)' ) ierr @@ -752,9 +711,8 @@ program testrd1 write (iout, '(f5.3)') var_values(i) 420 continue -c c read a nodal variable through time -c + node_num = 1 call exgnvt (exoid, var_index, node_num, beg_time, end_time, @@ -768,9 +726,8 @@ program testrd1 write (iout, '(f5.3)') var_values(i) 430 continue -c c read an element variable at one time step -c + call exgebi (exoid, ids, ierr) write (iout, '(/"after exgebi, error = ", i3)' ) ierr @@ -792,9 +749,8 @@ program testrd1 450 continue -c c read an element variable through time -c + var_index = 2 elem_num = 2 diff --git a/packages/seacas/libraries/exodus_for/test/testrd_nsid.f b/packages/seacas/libraries/exodus_for/test/testrd_nsid.f index 8db1c37edfb1..fd5db73993ff 100644 --- a/packages/seacas/libraries/exodus_for/test/testrd_nsid.f +++ b/packages/seacas/libraries/exodus_for/test/testrd_nsid.f @@ -1,15 +1,14 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details program testrd -c c This is a test program for the Fortran binding of the EXODUS II c database read routines -c + c 09/07/93 V.R. Yarberry - Modified for API 2.00 implicit none @@ -34,10 +33,7 @@ program testrd data iin /5/, iout /6/ - -c c open EXODUS II files -c cpu_ws = 0 io_ws = 0 @@ -54,9 +50,7 @@ program testrd mod_sz = exlgmd(exoid) write (iout, '(" Model Size",i2)') mod_sz -c c read database parameters -c call exgini (exoid, titl, num_dim, num_nodes, num_elem, 1 num_elem_blk, num_node_sets, num_side_sets, ierr) @@ -73,10 +67,7 @@ program testrd 8 titl,num_dim, num_nodes, num_elem, 9 num_elem_blk,num_node_sets, num_side_sets - -c c read nodal coordinates values and names from database -c call exgcor (exoid, x, y, z, ierr) write (iout, '(/"after exgcor, error = ", i3)' ) ierr @@ -104,9 +95,7 @@ program testrd write (iout, '("x coord name = ", a9)') coord_names(1) write (iout, '("y coord name = ", a9)') coord_names(2) -c c read element order map -c call exgmap (exoid, elem_map, ierr) write (iout, '(/"after exgmap, error = ", i3)' ) ierr @@ -115,10 +104,8 @@ program testrd write (iout, '("elem_map(",i1,") = ", i1)') i, elem_map(i) 30 continue -c c read element block parameters -c -c + call exgebi (exoid, ids, ierr) write (iout, '(/"after exgebi, error = ", i3)' ) ierr @@ -138,9 +125,7 @@ program testrd 40 continue -c c read element connectivity -c do 60 i = 1, num_elem_blk diff --git a/packages/seacas/libraries/exodus_for/test/testrdd.f b/packages/seacas/libraries/exodus_for/test/testrdd.f index 4f136f1ebcde..ebdda5ec07bb 100644 --- a/packages/seacas/libraries/exodus_for/test/testrdd.f +++ b/packages/seacas/libraries/exodus_for/test/testrdd.f @@ -1,15 +1,14 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details program testrdd -c c This is a test program for the Fortran binding of the EXODUS II c database read routines with double precision -c + c 09/07/93 V.R. Yarberry - Modified for API 2.00 implicit none @@ -49,10 +48,7 @@ program testrdd data iin /5/, iout /6/ - -c c open EXODUS II files -c cpu_ws = 8 io_ws = 0 @@ -65,9 +61,7 @@ program testrdd 1 f4.2)') vers write (iout, '(" I/O word size",i2)') io_ws -c c read database parameters -c call exgini (exoid, titl, num_dim, num_nodes, num_elem, 1 num_elem_blk, num_node_sets, num_side_sets, ierr) @@ -84,10 +78,7 @@ program testrdd 8 titl,num_dim, num_nodes, num_elem, 9 num_elem_blk,num_node_sets, num_side_sets - -c c read nodal coordinates values and names from database -c call exgcor (exoid, x, y, dummy, ierr) write (iout, '(/"after exgcor, error = ", i3)' ) ierr @@ -108,9 +99,7 @@ program testrdd write (iout, '("x coord name = ", a9)') coord_names(1) write (iout, '("y coord name = ", a9)') coord_names(2) -c c read element order map -c call exgmap (exoid, elem_map, ierr) write (iout, '(/"after exgmap, error = ", i3)' ) ierr @@ -119,10 +108,8 @@ program testrdd write (iout, '("elem_map(",i1,") = ", i1)') i, elem_map(i) 30 continue -c c read element block parameters -c -c + call exgebi (exoid, ids, ierr) write (iout, '(/"after exgebi, error = ", i3)' ) ierr @@ -149,7 +136,6 @@ program testrdd 1 '(/"There are ",i2," properties for each element block")') 2 num_props - call exgpn(exoid, EXEBLK, prop_names, ierr) write (iout, '("after exgpn, error = ", i3)' ) ierr @@ -166,9 +152,7 @@ program testrdd 45 continue 47 continue -c c read element connectivity -c do 60 i = 1, num_elem_blk @@ -183,9 +167,7 @@ program testrdd 60 continue -c c read element block attributes -c do 70 i = 1, num_elem_blk @@ -197,9 +179,8 @@ program testrdd 70 continue -c c read individual node sets -c + if (num_node_sets .gt. 0) then call exgnsi (exoid, ids, ierr) write (iout, '(/"after exgnsi, error = ", i3)' ) ierr @@ -240,7 +221,6 @@ program testrdd 1 '(/"There are ",i2," properties for each node set")') 2 num_props - call exgpn(exoid, EXNSET, prop_names, ierr) write (iout, '("after exgpn, error = ", i3)' ) ierr @@ -257,10 +237,9 @@ program testrdd 105 continue 107 continue -c c read concatenated node sets; this produces the same information as c the above code which reads individual node sets -c + num_node_sets = exinqi (exoid, EXNODS) if (num_node_sets .gt. 0) then list_len = exinqi (exoid, EXNSNL) @@ -308,9 +287,8 @@ program testrdd 150 continue endif -c c read individual side sets -c + if (num_side_sets .gt. 0) then call exgssi (exoid, ids, ierr) write (iout, '(/"after exgssi, error = ", i3)' ) ierr @@ -346,7 +324,6 @@ program testrdd write (iout, '(i3)') side_list(j) 170 continue - write (iout, '("dist factors for side set ", i2)') ids(i) do 180 j = 1, num_df_in_set @@ -362,7 +339,6 @@ program testrdd 1 '(/"There are ",i2," properties for each side set")') 2 num_props - call exgpn(exoid, EXSSET, prop_names, ierr) write (iout, '("after exgpn, error = ", i3)' ) ierr @@ -391,13 +367,13 @@ program testrdd df_list_len = exinqi (exoid, EXSSDF) write (iout, '(/"after exinq: EXSSDF =",i3,", error = ",i3)') 1 df_list_len,ierr -c + c read concatenated side sets; this produces the same information as c the above code which reads individual side sets -c + c NOTE: SKIP concatenated side set until routine exgcss has been redefined c if (.TRUE.) goto 275 -c + call exgcss (exoid, ids, num_elem_per_set, num_df_per_set, 1 elem_ind, df_ind, elem_list, side_list, dist_fact, 2 ierr) @@ -454,9 +430,8 @@ program testrdd 270 continue endif -c c read QA records -c + num_qa_rec = exinqi (exoid, EXQA) call exgqa (exoid, qa_record, ierr) write (iout, '(/"after exgqa, error = ", i3)' ) ierr @@ -469,9 +444,8 @@ program testrdd 280 continue 290 continue -c c read information records -c + num_info = exinqi (exoid, EXINFO) call exginf (exoid, inform, ierr) @@ -483,9 +457,8 @@ program testrdd write (iout, '(a81)') inform(i) 300 continue -c c read global variables parameters and names -c + call exgvp (exoid, "g", num_glo_vars, ierr) write (iout, '(/"after exgvp, error = ", i3)' ) ierr @@ -499,9 +472,8 @@ program testrdd write (iout, '(a9)') var_names(i) 320 continue -c c read nodal variables parameters and names -c + call exgvp (exoid, "n", num_nod_vars, ierr) write (iout, '(/"after exgvp, error = ", i3)' ) ierr @@ -515,9 +487,8 @@ program testrdd write (iout, '(a9)') var_names(i) 330 continue -c c read element variables parameters and names -c + call exgvp (exoid, "e", num_ele_vars, ierr) write (iout, '(/"after exgvp, error = ", i3)' ) ierr @@ -531,9 +502,8 @@ program testrdd write (iout, '(a9)') var_names(i) 340 continue -c c read element variable truth table -c + call exgvtt (exoid, num_elem_blk, num_ele_vars, truth_tab, ierr) write (iout, '(/"after exgvtt, error = ", i3)' ) ierr @@ -545,24 +515,23 @@ program testrdd 350 continue 360 continue -c c determine how many time steps are stored -c + num_time_steps = exinqi (exoid, EXTIMS) write (iout, '("There are ",i2," time steps in the database.")') 1 num_time_steps -c + c read time value at one time step -c + time_step = 3 call exgtim (exoid, time_step, time_value, ierr) write (iout, '(/"after exgtim, error = ", i3)' ) ierr write (iout, '("time value at time step ",i2," = ", f5.3)') 1 time_step, time_value -c + c read time values at all time steps -c + call exgatm (exoid, time_values, ierr) write (iout, '(/"after exgatm, error = ", i3)' ) ierr @@ -575,9 +544,9 @@ program testrdd var_index = 1 beg_time = 1 end_time = -1 -c + c read all global variables at one time step -c + call exggv (exoid, time_step, num_glo_vars, var_values, ierr) write (iout, '(/"after exggv, error = ", i3)' ) ierr @@ -588,9 +557,8 @@ program testrdd write (iout, '(f5.3)') var_values(i) 400 continue -c c read a single global variable through time -c + call exggvt (exoid, var_index, beg_time, end_time, var_values, 1 ierr) write (iout, '(/"after exggvt, error = ", i3)' ) ierr @@ -602,9 +570,8 @@ program testrdd write (iout, '(f5.3)') var_values(i) 410 continue -c c read a nodal variable at one time step -c + call exgnv (exoid, time_step, var_index, num_nodes, var_values, 1 ierr) write (iout, '(/"after exgnv, error = ", i3)' ) ierr @@ -616,9 +583,8 @@ program testrdd write (iout, '(f5.3)') var_values(i) 420 continue -c c read a nodal variable through time -c + node_num = 1 call exgnvt (exoid, var_index, node_num, beg_time, end_time, @@ -632,9 +598,8 @@ program testrdd write (iout, '(f5.3)') var_values(i) 430 continue -c c read an element variable at one time step -c + call exgebi (exoid, ids, ierr) write (iout, '(/"after exgebi, error = ", i3)' ) ierr @@ -656,9 +621,8 @@ program testrdd 450 continue -c c read an element variable through time -c + var_index = 2 elem_num = 2 diff --git a/packages/seacas/libraries/exodus_for/test/testwt.f b/packages/seacas/libraries/exodus_for/test/testwt.f index 6b5b0c623f53..c3dd6ded01f2 100644 --- a/packages/seacas/libraries/exodus_for/test/testwt.f +++ b/packages/seacas/libraries/exodus_for/test/testwt.f @@ -1,14 +1,14 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details program testwt -c + c This is a test program for the Fortran binding of the EXODUS II c database write routines. -c + include 'exodusII.inc' integer iin, iout @@ -49,18 +49,17 @@ program testwt write (iout,'("after exopts, error = ", i4)') ierr cpu_word_size = 0 io_word_size = 0 -c + c create EXODUS II files -c + exoid = excre ("test.exo", 1 EXCLOB, cpu_word_size, io_word_size, ierr) write (iout,'("after excre for test.exo, id: ", i4)') exoid write (iout,'(" cpu word size: ",i4," io word size: ",i4)') 1 cpu_word_size, io_word_size write (iout,'("after excre, error = ", i4)') ierr -c + c initialize file with parameters -c num_dim = 3 num_nodes = 26 @@ -79,9 +78,8 @@ program testwt call exit (0) endif -c c write nodal coordinates values and names to database -c + c Quad #1 x(1) = 0.0 x(2) = 1.0 @@ -186,7 +184,6 @@ program testwt call exit (0) endif - coord_names(1) = "xcoor" coord_names(2) = "ycoor" coord_names(3) = "zcoor" @@ -199,10 +196,7 @@ program testwt call exit (0) endif - -c c write element order map -c do 10 i = 1, num_elem elem_map(i) = i @@ -215,9 +209,7 @@ program testwt call exit (0) endif -c c write element block parameters -c num_elem_in_block(1) = 1 num_elem_in_block(2) = 1 @@ -342,9 +334,7 @@ program testwt call exit (0) endif -c c write element connectivity -c connect(1) = 1 connect(2) = 2 @@ -412,9 +402,8 @@ program testwt call exit (0) endif -c c write element block attributes -c + attrib(1) = 3.14159 call expeat (exoid, ebids(1), attrib, ierr) write (iout, '("after expeat, error = ", i4)' ) ierr @@ -461,9 +450,8 @@ program testwt call exit (0) endif end do -c + c write individual node sets -c node_list(1) = 100 node_list(2) = 101 @@ -523,10 +511,8 @@ program testwt call exit (0) endif -c c write concatenated node sets; this produces the same information as c the above code which writes individual node sets -c ids(1) = 20 ids(2) = 21 @@ -575,7 +561,6 @@ program testwt call exit (0) endif - c write node set properties prop_names(1) = "FACE" @@ -604,9 +589,7 @@ program testwt call exit (0) endif -c c write individual side sets -c c side set #1 - quad @@ -762,10 +745,8 @@ program testwt call exit (0) endif - c write concatenated side sets; this produces the same information as c the above code which writes individual side sets -c ids(1) = 30 ids(2) = 31 @@ -916,7 +897,6 @@ program testwt c 1 node_ind, elem_list, node_list, side_list, ierr) c write (iout, '("after excn2s, error = ", i4)' ) ierr - num_df_per_set(1) = 4 num_df_per_set(2) = 4 num_df_per_set(3) = 0 @@ -967,10 +947,8 @@ program testwt call exclos(exoid,ierr) call exit (0) endif -c -c + c write QA records -c num_qa_rec = 2 @@ -990,10 +968,7 @@ program testwt call exit (0) endif - -c c write information records -c num_info = 3 @@ -1027,7 +1002,6 @@ program testwt call exit (0) endif - num_nod_vars = 2 var_names(1) = "nod_var0" @@ -1046,7 +1020,6 @@ program testwt call exit (0) endif - num_ele_vars = 3 var_names(1) = "ele_var0" @@ -1066,9 +1039,7 @@ program testwt call exit (0) endif -c c write element variable truth table -c k = 0 @@ -1085,21 +1056,18 @@ program testwt call exit (0) endif -c c for each time step, write the analysis results; c the code below fills the arrays glob_var_vals, c nodal_var_vals, and elem_var_vals with values for debugging purposes; c obviously the analysis code will populate these arrays -c whole_time_step = 1 num_time_steps = 10 do 110 i = 1, num_time_steps time_value = real(i)/100. -c + c write time value -c call exptim (exoid, whole_time_step, time_value, ierr) write (iout, '("after exptim, error = ", i4)' ) ierr @@ -1108,9 +1076,7 @@ program testwt call exit (0) endif -c c write global variables -c do 50 j = 1, num_glo_vars glob_var_vals(j) = real(j+1) * time_value @@ -1124,9 +1090,7 @@ program testwt call exit (0) endif -c c write nodal variables -c do 70 k = 1, num_nod_vars do 60 j = 1, num_nodes @@ -1145,9 +1109,7 @@ program testwt 70 continue -c c write element variables -c do 100 k = 1, num_ele_vars do 90 j = 1, num_elem_blk @@ -1172,10 +1134,9 @@ program testwt whole_time_step = whole_time_step + 1 -c c update the data file; this should be done at the end of every time c step to ensure that no data is lost if the analysis dies -c + call exupda (exoid, ierr) write (iout, '("after exupda, error = ", i4)' ) ierr if (ierr .ne. 0) then @@ -1185,9 +1146,8 @@ program testwt 110 continue -c c close the EXODUS files -c + call exclos (exoid, ierr) write (iout, '("after exclos, error = ", i4)' ) ierr diff --git a/packages/seacas/libraries/exodus_for/test/testwt1.f b/packages/seacas/libraries/exodus_for/test/testwt1.f index 5172e76208d8..9a2ae2797fcb 100644 --- a/packages/seacas/libraries/exodus_for/test/testwt1.f +++ b/packages/seacas/libraries/exodus_for/test/testwt1.f @@ -1,21 +1,20 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details program testwt1 -c + c This is a test program for the Fortran binding of the EXODUS II c database write routines. -c c history - c Original L.A. Schoof c 02/25/93 V.R. Yarberry - Added error checks for file creation. c 03/04/93 V.R. Yarberry - Fixed bug in expvtt test, ebids was not passed c 08/31/93 VRY - updated to match API version 2.00 -c + include 'exodusII.inc' integer iin, iout @@ -52,18 +51,17 @@ program testwt1 cpu_word_size = 0 io_word_size = 0 -c + c create EXODUS II files -c + exoid = excre ("test.exo", 1 EXCLOB, cpu_word_size, io_word_size, ierr) write (iout,'("after excre for test.exo, id: ", i4)') exoid write (iout,'(" cpu word size: ",i4," io word size: ",i4)') 1 cpu_word_size, io_word_size write (iout,'("after excre, error = ", i4)') ierr -c + c initialize file with parameters -c num_dim = 3 num_nodes = 28 @@ -80,9 +78,8 @@ program testwt1 write (iout, '("after expini, error = ", i4)' ) ierr -c c write nodal coordinates values and names to database -c + c Quad #1 x(1) = 0.0 x(2) = 1.0 @@ -200,9 +197,7 @@ program testwt1 call expcon (exoid, coord_names, ierr) write (iout, '("after expcon, error = ", i4)' ) ierr -c c write node and element map parameters -c n_node_maps = 1 n_elem_maps = 2 @@ -210,18 +205,14 @@ program testwt1 call expmp (exoid, n_node_maps, n_elem_maps, ierr) write (iout, '("after expmp, error = ", i4)' ) ierr -c c write element map properties -c prop_names(1) = "ORDER" prop_names(2) = "NUMBER" call exppn(exoid,EXEMAP,2,prop_names,ierr) write (iout, '("after exppn, error = ", i4)' ) ierr -c c write element order map -c do 10 i = 1, num_elem elem_map(i) = i @@ -234,9 +225,8 @@ program testwt1 call expp(exoid, EXEMAP, id, "ORDER", 1, ierr) write (iout, '("after expp, error = ", i4)' ) ierr -c c write element numbering map -c + id = 222 C write map an element at a time... do 11 i = 1, num_elem @@ -248,17 +238,13 @@ program testwt1 call expp(exoid, EXEMAP, id, "NUMBER", 1, ierr) write (iout, '("after expp, error = ", i4)' ) ierr -c c write node map properties -c prop_names(1) = "NUMBER" call exppn(exoid,EXNMAP,1,prop_names,ierr) write (iout, '("after exppn, error = ", i4)' ) ierr -c c write node numbering map -c do 13 i = 1, num_nodes node_map(i) = i*3 @@ -271,9 +257,7 @@ program testwt1 call expp(exoid, EXNMAP, id, "NUMBER", 1, ierr) write (iout, '("after expp, error = ", i4)' ) ierr -c c write element block parameters -c num_elem_in_block(1) = 1 num_elem_in_block(2) = 2 @@ -392,9 +376,7 @@ program testwt1 call expp(exoid, EXEBLK, ebids(7), "MATL", 70, ierr) write (iout, '("after expp, error = ", i4)' ) ierr -c c write element connectivity -c connect(1) = 1 connect(2) = 2 @@ -456,9 +438,8 @@ program testwt1 call expelc (exoid, ebids(7), connect, ierr) write (iout, '("after expelc, error = ", i4)' ) ierr -c c write element block attributes -c + attrib(1) = 1.0 ! block 1 attrib(2) = 2.0 attrib(3) = 3.0 @@ -513,9 +494,7 @@ program testwt1 write (iout, '("after expean, error = ", i4)' ) ierr end do -c c write individual node sets -c node_list(1) = 100 node_list(2) = 101 @@ -551,10 +530,8 @@ program testwt1 c call expnsd (exoid, 21, dist_fact, ierr) c write (iout, '("after expnsd, error = ", i4)' ) ierr -c c write concatenated node sets; this produces the same information as c the above code which writes individual node sets -c ids(1) = 20 ids(2) = 21 @@ -609,9 +586,7 @@ program testwt1 call exppa(exoid, EXNSET, prop_names(1), prop_array, ierr) write (iout, '("after exppa, error = ", i4)' ) ierr -c c write individual side sets -c elem_list(1) = 11 elem_list(2) = 12 @@ -655,7 +630,6 @@ program testwt1 c write concatenated side sets; this produces the same information as c the above code which writes individual side sets -c ids(1) = 30 ids(2) = 31 @@ -853,10 +827,8 @@ program testwt1 call expp(exoid, EXSSET, 31, prop_names(1), 101, ierr) write (iout, '("after expp, error = ", i4)' ) ierr -c -c + c write QA records -c num_qa_rec = 2 @@ -872,10 +844,7 @@ program testwt1 call expqa (exoid, num_qa_rec, qa_record, ierr) write (iout, '("after expqa, error = ", i4)' ) ierr - -c c write information records -c num_info = 3 @@ -886,7 +855,6 @@ program testwt1 call expinf (exoid, num_info, inform, ierr) write (iout, '("after expinf, error = ", i4)' ) ierr - c write results variables parameters and names num_glo_vars = 1 @@ -898,7 +866,6 @@ program testwt1 call expvnm (exoid, "g", 1, var_names(1), ierr) write (iout, '("after expvan, error = ", i4)' ) ierr - num_nod_vars = 2 var_names(1) = "nod_var0" @@ -909,7 +876,6 @@ program testwt1 call expvan (exoid, "n", num_nod_vars, var_names, ierr) write (iout, '("after expvan, error = ", i4)' ) ierr - num_ele_vars = 3 var_names(1) = "ele_var0" @@ -921,9 +887,7 @@ program testwt1 call expvan (exoid, "e", num_ele_vars, var_names, ierr) write (iout, '("after expvan, error = ", i4)' ) ierr -c c write element variable truth table -c k = 0 @@ -938,28 +902,23 @@ program testwt1 c call expvtt (exoid, num_elem_blk, num_ele_vars, truth_tab, ierr) c write (iout, '("after expvtt, error = ", i4)' ) ierr -c c for each time step, write the analysis results; c the code below fills the arrays glob_var_vals, c nodal_var_vals, and elem_var_vals with values for debugging purposes; c obviously the analysis code will populate these arrays -c whole_time_step = 1 num_time_steps = 10 do 110 i = 1, num_time_steps time_value = real(i)/100. -c + c write time value -c call exptim (exoid, whole_time_step, time_value, ierr) write (iout, '("after exptim, error = ", i4)' ) ierr -c c write global variables -c do 50 j = 1, num_glo_vars glob_var_vals(j) = real(j+1) * time_value @@ -969,9 +928,7 @@ program testwt1 1 glob_var_vals, ierr) write (iout, '("after expgv, error = ", i4)' ) ierr -c c write nodal variables -c do 70 k = 1, num_nod_vars do 60 j = 1, num_nodes @@ -986,9 +943,7 @@ program testwt1 70 continue -c c write element variables -c do 100 k = 1, num_ele_vars do 90 j = 1, num_elem_blk @@ -1013,18 +968,16 @@ program testwt1 whole_time_step = whole_time_step + 1 -c c update the data file; this should be done at the end of every time c step to ensure that no data is lost if the analysis dies -c + call exupda (exoid, ierr) write (iout, '("after exupda, error = ", i4)' ) ierr 110 continue -c c close the EXODUS files -c + call exclos (exoid, ierr) write (iout, '("after exclos, error = ", i4)' ) ierr diff --git a/packages/seacas/libraries/exodus_for/test/testwt2.f b/packages/seacas/libraries/exodus_for/test/testwt2.f index 97e8614f375b..e1ecd02fd14b 100644 --- a/packages/seacas/libraries/exodus_for/test/testwt2.f +++ b/packages/seacas/libraries/exodus_for/test/testwt2.f @@ -1,14 +1,14 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details program testwt2 -c + c This is a test program for the Fortran binding of the EXODUS II c database write routines. It tests multiple simultaneous output files. -c + c 09/07/93 V.R. Yarberry - Revised for 2.00 API include 'exodusII.inc' @@ -61,15 +61,14 @@ program testwt2 data iin /5/, iout /6/ -c c create EXODUS II files -c + cpu_word_size = 0 io_word_size = 4 -c + c first create a "regular" file that contains everything except c history variable info -c + exoid = excre ("test.exo", 1 EXCLOB, cpu_word_size, io_word_size, ierr) write (iout,'("after excre for test.exo,id: ",i4,", err=",i3)') @@ -84,9 +83,7 @@ program testwt2 1 exoid2, ierr write (iout, '("after excre (2), error = ", i4)' ) ierr -c c initialize file with parameters -c title = "This is test 2" num_dim = 3 @@ -116,10 +113,8 @@ program testwt2 write (iout, '("after expini (2), error = ", i4)' ) ierr - -c c write nodal coordinates values and names to database -c + c Quad #1 x(1) = 0.0 x(2) = 1.0 @@ -319,7 +314,6 @@ program testwt2 z2(25) = 2.0 z2(26) = 0.0 - call expcor (exoid2, x2, y2, z2, ierr) write (iout, '("after expcor (2), error = ", i4)' ) ierr @@ -337,10 +331,7 @@ program testwt2 call expcon (exoid2, coord_names2, ierr) write (iout, '("after expcon (2), error = ", i4)' ) ierr - -c c write element order map -c do 10 i = 1, num_elem elem_map(i) = i @@ -356,9 +347,7 @@ program testwt2 call expmap (exoid2, elem_map2, ierr) write (iout, '("after expmap (2), error = ", i4)' ) ierr -c c write element block parameters -c num_elem_in_block(1) = 1 num_elem_in_block(2) = 1 @@ -458,7 +447,6 @@ program testwt2 1 num_nodes_per_elem2(5),numattr2(5),ierr) write (iout, '("after expelb (2), error = ", i4)' ) ierr - c write element block properties prop_names(1) = "MATL" @@ -491,10 +479,7 @@ program testwt2 call expp(exoid2, EXEBLK, ebids(5), "MATL", 500, ierr) write (iout, '("after expp (2), error = ", i4)' ) ierr - -c c write element connectivity -c connect(1) = 1 connect(2) = 2 @@ -588,9 +573,7 @@ program testwt2 call expelc (exoid2, ebids2(5), connect2, ierr) write (iout, '("after expelc (2), error = ", i4)' ) ierr -c c write element block attributes -c attrib(1) = 3.14159 call expeat (exoid, ebids(1), attrib, ierr) @@ -609,7 +592,6 @@ program testwt2 call expeat (exoid, ebids(5), attrib, ierr) write (iout, '("after expeat, error = ", i4)' ) ierr - attrib2(1) = 3. call expeat (exoid2, ebids2(1), attrib2, ierr) write (iout, '("after expeat (2), error = ", i4)' ) ierr @@ -627,10 +609,7 @@ program testwt2 call expeat (exoid2, ebids(5), attrib2, ierr) write (iout, '("after expeat (2), error = ", i4)' ) ierr - -c c write individual node sets -c call expnp (exoid, 20, 5, 5, ierr) write (iout, '("after expnp, error = ", i4)' ) ierr @@ -720,10 +699,8 @@ program testwt2 call expnsd (exoid2, 21, dist_fact2, ierr) write (iout, '("after expnsd (2), error = ", i4)' ) ierr -c c write concatenated node sets; this produces the same information as c the above code which writes individual node sets -c ids(1) = 20 ids(2) = 21 @@ -755,7 +732,6 @@ program testwt2 c call expcns (exoid, ids, num_nodes_per_set, node_ind, node_list, c 1 dist_fact, ierr) c write (iout, '("after expcns, error = ", i4)' ) ierr -c prop_names(1) = "FACE" call expp(exoid2, EXNSET, 20, prop_names(1), 4, ierr) @@ -773,7 +749,6 @@ program testwt2 write (iout, '("after exppa (2), error = ", i4)' ) ierr c write individual side sets -c c side set #1 - quad @@ -881,7 +856,6 @@ program testwt2 call expss (exoid, 34, elem_list, side_list, ierr) write (iout, '("after expss, error = ", i4)' ) ierr - c side set #1 - quad elem_list2(1) = 2 @@ -988,10 +962,9 @@ program testwt2 call expss (exoid2, 34, elem_list2, side_list2, ierr) write (iout, '("after expss (2), error = ", i4)' ) ierr -c c write concatenated side sets; this produces the same information as c the above code which writes individual side sets -c + ids(1) = 30 ids(2) = 31 ids(3) = 32 @@ -1137,7 +1110,6 @@ program testwt2 c side_list(3) = 3 c side_list(4) = 4 - c call excn2s(exoid, num_elem_per_set, num_nodes_per_set, elem_ind, c 1 node_ind, elem_list, node_list, side_list, ierr) c write (iout, '("after excn2s, error = ", i4)' ) ierr @@ -1151,7 +1123,6 @@ program testwt2 df_ind(1) = 1 df_ind(2) = 5 - dist_fact(1) = 30.0 dist_fact(2) = 30.1 dist_fact(3) = 30.2 @@ -1178,7 +1149,6 @@ program testwt2 call expp(exoid, EXSSET, 31, prop_names(1), 101, ierr) write (iout, '("after expp, error = ", i4)' ) ierr - prop_names(1) = "COLOR" call expp(exoid2, EXSSET, 30, prop_names(1), 100, ierr) write (iout, '("after expp (2), error = ", i4)' ) ierr @@ -1186,10 +1156,7 @@ program testwt2 call expp(exoid2, EXSSET, 31, prop_names(1), 101, ierr) write (iout, '("after expp (2), error = ", i4)' ) ierr - -c c write QA records -c num_qa_rec = 2 @@ -1219,10 +1186,7 @@ program testwt2 call expqa (exoid2, num_qa_rec2, qa_record2, ierr) write (iout, '("after expqa (2), error = ", i4)' ) ierr - -c c write information records -c num_info = 3 @@ -1242,7 +1206,6 @@ program testwt2 call expinf (exoid2, num_info2, inform2, ierr) write (iout, '("after expinf (2), error = ", i4)' ) ierr - c write results variables parameters and names num_glo_vars = 1 @@ -1263,7 +1226,6 @@ program testwt2 call expvan (exoid2, "g", num_glo_vars2, var_names2, ierr) write (iout, '("after expvan (2), error = ", i4)' ) ierr - num_nod_vars = 2 var_names(1) = "nod_var0" @@ -1284,7 +1246,6 @@ program testwt2 call expvan (exoid2, "n", num_nod_vars2, var_names2, ierr) write (iout, '("after expvan (2), error = ", i4)' ) ierr - num_ele_vars = 3 var_names(1) = "ele_var0" @@ -1307,9 +1268,7 @@ program testwt2 call expvan (exoid2, "e", num_ele_vars2, var_names2, ierr) write (iout, '("after expvan, error = ", i4)' ) ierr -c c write element variable truth table -c k = 0 @@ -1328,12 +1287,10 @@ program testwt2 call expvtt (exoid2, num_elem_blk, num_ele_vars, truth_tab, ierr) write (iout, '("after expvtt, error = ", i4)' ) ierr -c c for each time step, write the analysis results; c the code below fills the arrays glob_var_vals, c nodal_var_vals, and elem_var_vals with values for debugging purposes; c obviously the analysis code will populate these arrays -c whole_time_step = 1 num_time_steps = 10 @@ -1341,9 +1298,8 @@ program testwt2 do 110 i = 1, num_time_steps time_value = real(i)/100 time_value2 = real(i)/100 -c + c write time value to regular file -c call exptim (exoid, whole_time_step, time_value, ierr) write (iout, '("after exptim, error = ", i4)' ) ierr @@ -1351,9 +1307,7 @@ program testwt2 call exptim (exoid2, whole_time_step, time_value2, ierr) write (iout, '("after exptim (2), error = ", i4)' ) ierr -c c write global variables -c do 50 j = 1, num_glo_vars glob_var_vals(j) = real(j+1) * time_value @@ -1367,9 +1321,7 @@ program testwt2 1 glob_var_vals, ierr) write (iout, '("after expgv (2), error = ", i4)' ) ierr -c c write nodal variables -c do 70 k = 1, num_nod_vars do 60 j = 1, num_nodes @@ -1388,9 +1340,7 @@ program testwt2 70 continue -c c write element variables -c do 100 k = 1, num_ele_vars do 90 j = 1, num_elem_blk @@ -1413,10 +1363,9 @@ program testwt2 whole_time_step = whole_time_step + 1 -c c update the data file; this should be done at the end of every time c step to ensure that no data is lost if the analysis dies -c + call exupda (exoid, ierr) write (iout, '("after exupda, error = ", i4)' ) ierr call exupda (exoid2, ierr) @@ -1424,9 +1373,8 @@ program testwt2 110 continue -c c close the EXODUS files -c + call exclos (exoid, ierr) write (iout, '("after exclos, error = ", i4)' ) ierr diff --git a/packages/seacas/libraries/exodus_for/test/testwt3.f b/packages/seacas/libraries/exodus_for/test/testwt3.f index 55f357b09a25..c9dfd7ade15c 100644 --- a/packages/seacas/libraries/exodus_for/test/testwt3.f +++ b/packages/seacas/libraries/exodus_for/test/testwt3.f @@ -1,15 +1,15 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details program testwt3 -c + c This is a test program for the Fortran binding of the EXODUS II c database write routines. This test writes GENISIS (geometry) c data to the history file. -c + c 08/10/93 V.R. Yarberry - Updated for use with 2.01 API include 'exodus_app.inc' @@ -43,31 +43,27 @@ program testwt3 data iin /5/, iout /6/ -c c create EXODUS II files -c + cpu_word_size = 4 io_word_size = 4 -c + c first create a "regular" file that contains everything except c history variable info -c + exoid = excre ("test.exo", 1 "r", EXCLOB, cpu_word_size, io_word_size, ierr) write (iout,'("after excre for test.exo, id: ", i3)') exoid write (iout,'("after excre, error = ", i3)') ierr -c c create a "history" file if you will output history variables -c + exoidh = excre ("testh.exo", 1 "h", EXCLOB, cpu_word_size, io_word_size, ierr) write (iout,'("after excre for testh.exo, id: ", i3)') exoidh write (iout,'("after excre, error = ", i3)') ierr -c c initialize file with parameters -c title = "This is test 3 - genisis data in history file" num_dim = 2 @@ -89,9 +85,7 @@ program testwt3 write (iout, '("after expini (h), error = ", i3)' ) ierr -c c write nodal coordinates values and names to database -c x(1) = 0.0 x(2) = 1.0 @@ -125,10 +119,7 @@ program testwt3 call expcon (exoidh, coord_names, ierr) write (iout, '("after expcon (h), error = ", i3)' ) ierr - -c c write element order map -c do 10 i = 1, num_elem elem_map(i) = i @@ -140,9 +131,7 @@ program testwt3 call expmap (exoidh, elem_map, ierr) write (iout, '("after expmap (h), error = ", i3)' ) ierr -c c write element block parameters -c num_elem_in_block(1) = 1 num_elem_in_block(2) = 1 @@ -168,9 +157,7 @@ program testwt3 1 4,1,ierr) write (iout, '("after expelbi(h), error = ", i3)' ) ierr -c c write element connectivity -c connect(1) = 1 connect(2) = 2 @@ -194,9 +181,7 @@ program testwt3 call expelc (exoidh, ebids(2), connect, ierr) write (iout, '("after expelc (h), error = ", i3)' ) ierr -c c write element block attributes -c attrib(1) = 3.14159 call expeat (exoid, ebids(1), attrib, ierr) @@ -212,9 +197,7 @@ program testwt3 call expeat (exoidh, ebids(2), attrib, ierr) write (iout, '("after expeat (h), error = ", i3)' ) ierr -c c write individual node sets -c call expnp (exoid, 20, 5, ierr) write (iout, '("after expnp, error = ", i3)' ) ierr @@ -260,10 +243,8 @@ program testwt3 call expns (exoidh, 21, node_list, dist_fact, ierr) write (iout, '("after expns (h), error = ", i3)' ) ierr -c c write concatenated node sets; this produces the same information as c the above code which writes individual node sets -c c ids(1) = 20 c ids(2) = 21 @@ -296,9 +277,7 @@ program testwt3 c 1 dist_fact, ierr) c write (iout, '("after expcns, error = ", i3)' ) ierr -c c write individual side sets -c call expsp (exoid, 30, 2, 4, ierr) write (iout, '("after expsp, error = ", i3)' ) ierr @@ -331,10 +310,8 @@ program testwt3 call expssd (exoidh, 30, dist_fact, ierr) write (iout, '("after expssd (h), error = ", i3)' ) ierr -c c write concatenated side sets; this produces the same information as c the above code which writes individual side sets -c c ids(1) = 30 @@ -364,9 +341,7 @@ program testwt3 c 2 ierr) c write (iout, '("after expcss, error = ", i3)' ) ierr -c c write QA records -c num_qa_rec = 2 @@ -385,10 +360,7 @@ program testwt3 call expqa (exoidh, num_qa_rec, qa_record, ierr) write (iout, '("after expqa (h), error = ", i3)' ) ierr - -c c write information records -c num_info = 3 @@ -402,7 +374,6 @@ program testwt3 call expinf (exoidh, num_info, inform, ierr) write (iout, '("after expinf (h), error = ", i3)' ) ierr - c write results variables parameters and names num_his_vars = 1 @@ -414,7 +385,6 @@ program testwt3 call expvan (exoidh, "h", num_his_vars, var_names, ierr) write (iout, '("after expvan, error = ", i3)' ) ierr - num_glo_vars = 1 var_names(1) = "glo_vars" @@ -424,7 +394,6 @@ program testwt3 call expvan (exoid, "g", num_glo_vars, var_names, ierr) write (iout, '("after expvan, error = ", i3)' ) ierr - num_nod_vars = 2 var_names(1) = "nod_var0" @@ -435,7 +404,6 @@ program testwt3 call expvan (exoid, "n", num_nod_vars, var_names, ierr) write (iout, '("after expvan, error = ", i3)' ) ierr - num_ele_vars = 3 var_names(1) = "ele_var0" @@ -447,9 +415,7 @@ program testwt3 call expvan (exoid, "e", num_ele_vars, var_names, ierr) write (iout, '("after expvan, error = ", i3)' ) ierr -c c write element variable truth table -c k = 0 @@ -465,12 +431,10 @@ program testwt3 & ierr) write (iout, '("after expvtt, error = ", i3)' ) ierr -c c for each time step, write the analysis results; c the code below fills the arrays hist_var_vals, glob_var_vals, c nodal_var_vals, and elem_var_vals with values for debugging purposes; c obviously the analysis code will populate these arrays -c whole = .true. hist_time_step = 1 @@ -480,20 +444,14 @@ program testwt3 do 110 i = 1, num_time_steps time_value = real(i)/100 -c c if history time step -c -c c write time value to history file -c call exptim (exoidh, hist_time_step, time_value, ierr) write (iout, '("after exptim, error = ", i3)' ) ierr -c c write history variables to history file -c do 40 j = 1, num_his_vars hist_var_vals(j) = real(j+1) * time_value @@ -504,29 +462,22 @@ program testwt3 write (iout, '("after exphv, error = ", i3)' ) ierr hist_time_step = hist_time_step + 1 -c + c update the history file -c call exupda (exoidh, ierr) write (iout, '("after exupda, error = ", i3)' ) ierr -c c if whole time step -c if (whole) then -c c write time value to regular file -c call exptim (exoid, whole_time_step, time_value, ierr) write (iout, '("after exptim, error = ", i3)' ) ierr -c c write global variables -c do 50 j = 1, num_glo_vars glob_var_vals(j) = real(j+1) * time_value @@ -536,9 +487,7 @@ program testwt3 1 glob_var_vals, ierr) write (iout, '("after expgv, error = ", i3)' ) ierr -c c write nodal variables -c do 70 k = 1, num_nod_vars do 60 j = 1, num_nodes @@ -553,9 +502,7 @@ program testwt3 70 continue -c c write element variables -c do 100 k = 1, num_ele_vars do 90 j = 1, num_elem_blk @@ -575,10 +522,9 @@ program testwt3 whole_time_step = whole_time_step + 1 -c c update the data file; this should be done at the end of every time c step to ensure that no data is lost if the analysis dies -c + call exupda (exoid, ierr) write (iout, '("after exupda, error = ", i3)' ) ierr @@ -586,9 +532,8 @@ program testwt3 110 continue -c c close the EXODUS files -c + call exclos (exoid, ierr) write (iout, '("after exclos, error = ", i3)' ) ierr diff --git a/packages/seacas/libraries/exodus_for/test/testwt_nsid.f b/packages/seacas/libraries/exodus_for/test/testwt_nsid.f index df67833801fb..6771b7c3641b 100644 --- a/packages/seacas/libraries/exodus_for/test/testwt_nsid.f +++ b/packages/seacas/libraries/exodus_for/test/testwt_nsid.f @@ -1,14 +1,14 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details program testwt -c + c This is a test program for the Fortran binding of the EXODUS II c database write routines. -c + include 'exodusII.inc' integer iin, iout @@ -33,18 +33,18 @@ program testwt write (iout,'("after exopts, error = ", i4)') ierr cpu_word_size = 0 io_word_size = 0 -c + c create EXODUS II files -c + exoid = excre ("test-nsided.exo", 1 EXCLOB, cpu_word_size, io_word_size, ierr) write (iout,'("after excre for test-nsided.exo, id: ", i8)') exoid write (iout,'(" cpu word size: ",i4," io word size: ",i4)') 1 cpu_word_size, io_word_size write (iout,'("after excre, error = ", i4)') ierr -c + c initialize file with parameters -c + num_dim = 3 num_nodes = 33 num_elem = 7 @@ -63,9 +63,8 @@ program testwt call exit (0) endif -c c write nodal coordinates values and names to database -c + c Quad #1 x(1) = 0.0 x(2) = 1.0 @@ -212,10 +211,7 @@ program testwt call exit (0) endif - -c c write element order map -c do 10 i = 1, num_elem elem_map(i) = i @@ -228,9 +224,7 @@ program testwt call exit (0) endif -c c write element block parameters -c num_elem_in_block(1) = 7 @@ -250,9 +244,8 @@ program testwt call exit (0) endif -c c write element connectivity -c + connect( 1) = 1 connect( 2) = 2 connect( 3) = 3 @@ -317,10 +310,8 @@ program testwt call exclos(exoid,ierr) call exit (0) endif -c -c + c write QA records -c num_qa_rec = 2 @@ -340,10 +331,7 @@ program testwt call exit (0) endif - -c c write information records -c num_info = 3 @@ -361,9 +349,8 @@ program testwt c ... Define and write some coordinate frames call putfrm(exoid) -c c close the EXODUS files -c + call exclos (exoid, ierr) write (iout, '("after exclos, error = ", i4)' ) ierr diff --git a/packages/seacas/libraries/exodus_for/test/testwtd.f b/packages/seacas/libraries/exodus_for/test/testwtd.f index b895e76597d7..8d79d13dc44d 100644 --- a/packages/seacas/libraries/exodus_for/test/testwtd.f +++ b/packages/seacas/libraries/exodus_for/test/testwtd.f @@ -1,21 +1,20 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details program testwtd -c + c This is a test program for the Fortran binding of the EXODUS II c database write routines using double precision reals. -c c history - c Original L.A. Schoof c 02/25/93 V.R. Yarberry - Added error checks for file creation. c 03/04/93 V.R. Yarberry - Fixed bug in expvtt test, ebids was not passed c 08/31/93 VRY - updated to match API version 2.00 -c + include 'exodusII.inc' integer iin, iout @@ -51,9 +50,9 @@ program testwtd cpu_word_size = 8 io_word_size = 8 -c + c create EXODUS II files -c + exoid = excre ("test.exo", 1 EXCLOB, cpu_word_size, io_word_size, ierr) write (iout,'("after excre for test.exo,id: ",i4,", err=",i3)') @@ -61,9 +60,8 @@ program testwtd write (iout,'(" cpu word size: ",i4," io word size: ",i4)') 1 cpu_word_size, io_word_size write (iout,'("after excre, error = ", i4)') ierr -c + c initialize file with parameters -c num_dim = 2 num_nodes = 8 @@ -78,9 +76,7 @@ program testwtd write (iout, '("after expini, error = ", i4)' ) ierr -c c write nodal coordinates values and names to database -c x(1) = 0.0 x(2) = 1.0 @@ -108,10 +104,7 @@ program testwtd call expcon (exoid, coord_names, ierr) write (iout, '("after expcon, error = ", i4)' ) ierr - -c c write element order map -c do 10 i = 1, num_elem elem_map(i) = i @@ -120,9 +113,7 @@ program testwtd call expmap (exoid, elem_map, ierr) write (iout, '("after expmap, error = ", i4)' ) ierr -c c write element block parameters -c num_elem_in_block(1) = 1 num_elem_in_block(2) = 1 @@ -150,9 +141,7 @@ program testwtd call expp(exoid, EXEBLK, ebids(2), "MATL", 20, ierr) write (iout, '("after expp, error = ", i4)' ) ierr -c c write element connectivity -c connect(1) = 1 connect(2) = 2 @@ -170,9 +159,7 @@ program testwtd call expelc (exoid, ebids(2), connect, ierr) write (iout, '("after expelc, error = ", i4)' ) ierr -c c write element block attributes -c attrib(1) = 3.14159 call expeat (exoid, ebids(1), attrib, ierr) @@ -182,9 +169,7 @@ program testwtd call expeat (exoid, ebids(2), attrib, ierr) write (iout, '("after expeat, error = ", i4)' ) ierr -c c write individual node sets -c node_list(1) = 100 node_list(2) = 101 @@ -220,10 +205,8 @@ program testwtd c call expnsd (exoid, 21, dist_fact, ierr) c write (iout, '("after expnsd, error = ", i4)' ) ierr -c c write concatenated node sets; this produces the same information as c the above code which writes individual node sets -c ids(1) = 20 ids(2) = 21 @@ -278,9 +261,7 @@ program testwtd call exppa(exoid, EXNSET, prop_names(1), prop_array, ierr) write (iout, '("after exppa, error = ", i4)' ) ierr -c c write individual side sets -c elem_list(1) = 11 elem_list(2) = 12 @@ -324,7 +305,6 @@ program testwtd c write concatenated side sets; this produces the same information as c the above code which writes individual side sets -c ids(1) = 30 ids(2) = 31 @@ -371,10 +351,8 @@ program testwtd call expp(exoid, EXSSET, 31, prop_names(1), 101, ierr) write (iout, '("after expp, error = ", i4)' ) ierr -c -c + c write QA records -c num_qa_rec = 2 @@ -390,10 +368,7 @@ program testwtd call expqa (exoid, num_qa_rec, qa_record, ierr) write (iout, '("after expqa, error = ", i4)' ) ierr - -c c write information records -c num_info = 3 @@ -404,7 +379,6 @@ program testwtd call expinf (exoid, num_info, inform, ierr) write (iout, '("after expinf, error = ", i4)' ) ierr - c write results variables parameters and names num_glo_vars = 1 @@ -416,7 +390,6 @@ program testwtd call expvan (exoid, "g", num_glo_vars, var_names, ierr) write (iout, '("after expvan, error = ", i4)' ) ierr - num_nod_vars = 2 var_names(1) = "nod_var0" @@ -427,7 +400,6 @@ program testwtd call expvan (exoid, "n", num_nod_vars, var_names, ierr) write (iout, '("after expvan, error = ", i4)' ) ierr - num_ele_vars = 3 var_names(1) = "ele_var0" @@ -439,9 +411,7 @@ program testwtd call expvan (exoid, "e", num_ele_vars, var_names, ierr) write (iout, '("after expvan, error = ", i4)' ) ierr -c c write element variable truth table -c k = 0 @@ -453,12 +423,10 @@ program testwtd call expvtt (exoid, num_elem_blk, num_ele_vars, truth_tab, ierr) write (iout, '("after expvtt, error = ", i4)' ) ierr -c c for each time step, write the analysis results; c the code below fills the arrays hist_var_vals, glob_var_vals, c nodal_var_vals, and elem_var_vals with values for debugging purposes; c obviously the analysis code will populate these arrays -c whole = .true. hist_time_step = 1 @@ -467,16 +435,13 @@ program testwtd do 110 i = 1, num_time_steps time_value = dble(i)/100 -c + c write time value -c call exptim (exoid, whole_time_step, time_value, ierr) write (iout, '("after exptim, error = ", i4)' ) ierr -c c write global variables -c do 50 j = 1, num_glo_vars glob_var_vals(j) = real(j+1) * time_value @@ -486,9 +451,7 @@ program testwtd 1 glob_var_vals, ierr) write (iout, '("after expgv, error = ", i4)' ) ierr -c c write nodal variables -c do 70 k = 1, num_nod_vars do 60 j = 1, num_nodes @@ -503,9 +466,7 @@ program testwtd 70 continue -c c write element variables -c do 100 k = 1, num_ele_vars do 90 j = 1, num_elem_blk @@ -526,18 +487,16 @@ program testwtd whole_time_step = whole_time_step + 1 -c c update the data file; this should be done at the end of every time c step to ensure that no data is lost if the analysis dies -c + call exupda (exoid, ierr) write (iout, '("after exupda, error = ", i4)' ) ierr 110 continue -c c close the EXODUS files -c + call exclos (exoid, ierr) write (iout, '("after exclos, error = ", i4)' ) ierr diff --git a/packages/seacas/libraries/exodus_for/test/testwtm.f b/packages/seacas/libraries/exodus_for/test/testwtm.f index fccfc88e5f8b..d6c898594d1e 100644 --- a/packages/seacas/libraries/exodus_for/test/testwtm.f +++ b/packages/seacas/libraries/exodus_for/test/testwtm.f @@ -1,14 +1,14 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details program testwtm -c + c This is a test program for the Fortran binding of the EXODUS II c database write routines. It tests multiple simultaneous output files. -c + c 09/07/93 V.R. Yarberry - Revised for 2.00 API include 'exodusII.inc' @@ -62,12 +62,11 @@ program testwtm data iin /5/, iout /6/, nexofiles /5/ -c c create EXODUS II files -c + cpu_word_size = 0 io_word_size = 4 -c + exoid = excre ("test.exo", 1 EXCLOB, cpu_word_size, io_word_size, ierr) write (iout,'("after excre for test.exo,id: ",i4,", err=",i3)') @@ -87,9 +86,7 @@ program testwtm 1 i, ierr 1000 continue -c c initialize file with parameters -c title = "This is test m" num_dim = 2 @@ -122,10 +119,7 @@ program testwtm 1 i, ierr 1001 continue - -c c write nodal coordinates values and names to database -c x(1) = 0.0 x(2) = 1.0 @@ -185,10 +179,7 @@ program testwtm 1 i, ierr 1003 continue - -c c write element order map -c do 10 i = 1, num_elem elem_map(i) = i @@ -207,9 +198,7 @@ program testwtm 1 i, ierr 1004 continue -c c write element block parameters -c num_elem_in_block(1) = 1 num_elem_in_block(2) = 1 @@ -272,9 +261,7 @@ program testwtm 1 i, ierr 1006 continue -c c write element connectivity -c connect(1) = 1 connect(2) = 2 @@ -314,9 +301,7 @@ program testwtm 1 i, ierr 1008 continue -c c write element block attributes -c attrib(1) = 3.14159 call expeat (exoid, ebids(1), attrib, ierr) @@ -340,9 +325,7 @@ program testwtm 1 i, ierr 1010 continue -c c write individual node sets -c call expnp (exoid, 20, 5, 5, ierr) write (iout, '("after expnp, error = ", i4)' ) ierr @@ -442,10 +425,8 @@ program testwtm 1 i, ierr 1012 continue -c c write concatenated node sets; this produces the same information as c the above code which writes individual node sets -c ids(1) = 20 ids(2) = 21 @@ -477,7 +458,6 @@ program testwtm c call expcns (exoid, ids, num_nodes_per_set, node_ind, node_list, c 1 dist_fact, ierr) c write (iout, '("after expcns, error = ", i4)' ) ierr -c do 1013 i=1,nexofiles prop_names(1) = "FACE" @@ -499,7 +479,6 @@ program testwtm 1013 continue c write individual side sets -c elem_list(1) = 11 elem_list(2) = 12 @@ -543,7 +522,6 @@ program testwtm call expssd (exoid, 31, dist_fact, ierr) write (iout, '("after expssd, error = ", i3)' ) ierr - elem_list2(1) = 11 elem_list2(2) = 12 @@ -596,10 +574,8 @@ program testwtm 1 i, ierr 1015 continue -c c write concatenated side sets; this produces the same information as c the above code which writes individual side sets -c ids(1) = 30 ids(2) = 31 @@ -652,7 +628,6 @@ program testwtm call expp(exoid, EXSSET, 31, prop_names(1), 101, ierr) write (iout, '("after expp, error = ", i4)' ) ierr - do 1016 i=1,nexofiles prop_names(1) = "COLOR" call expp(exoidm(i), EXSSET, 30, prop_names(1), 100, ierr) @@ -664,10 +639,7 @@ program testwtm 1 i, ierr 1016 continue - -c c write QA records -c num_qa_rec = 2 @@ -700,10 +672,7 @@ program testwtm 1 i, ierr 1017 continue - -c c write information records -c num_info = 3 @@ -799,9 +768,8 @@ program testwtm write (iout, '("after expvan (",i1,"), error = ", i4)') 1 i, ierr 1021 continue -c + c write element variable truth table -c k = 0 @@ -824,12 +792,11 @@ program testwtm write (iout, '("after expvtt (",i1,"), error = ", i4)') 1 i, ierr 1022 continue -c + c for each time step, write the analysis results; c the code below fills the arrays glob_var_vals, c nodal_var_vals, and elem_var_vals with values for debugging purposes; c obviously the analysis code will populate these arrays -c whole_time_step = 1 num_time_steps = 10 @@ -837,9 +804,8 @@ program testwtm do 110 iii = 1, num_time_steps time_value = real(iii)/100 time_value2 = real(iii)/100 -c + c write time value to regular file -c call exptim (exoid, whole_time_step, time_value, ierr) write (iout, '("after exptim, error = ", i4)' ) ierr @@ -850,9 +816,7 @@ program testwtm 1 i, ierr 1023 continue -c c write global variables -c do 50 j = 1, num_glo_vars glob_var_vals(j) = real(j+1) * time_value @@ -869,9 +833,7 @@ program testwtm 1 i, ierr 1024 continue -c c write nodal variables -c do 70 k = 1, num_nod_vars do 60 j = 1, num_nodes @@ -893,9 +855,7 @@ program testwtm 70 continue -c c write element variables -c do 100 k = 1, num_ele_vars do 90 j = 1, num_elem_blk @@ -921,10 +881,9 @@ program testwtm whole_time_step = whole_time_step + 1 -c c update the data file; this should be done at the end of every time c step to ensure that no data is lost if the analysis dies -c + call exupda (exoid, ierr) write (iout, '("after exupda, error = ", i4)' ) ierr do 1027 i=1,nexofiles @@ -935,9 +894,8 @@ program testwtm 110 continue -c c close the EXODUS files -c + call exclos (exoid, ierr) write (iout, '("after exclos, error = ", i4)' ) ierr diff --git a/packages/seacas/libraries/exodus_for/test/update_all_tests b/packages/seacas/libraries/exodus_for/test/update_all_tests index 0ba7a595cec2..5b34fd08012c 100644 --- a/packages/seacas/libraries/exodus_for/test/update_all_tests +++ b/packages/seacas/libraries/exodus_for/test/update_all_tests @@ -1,7 +1,7 @@ # Copyright(C) 1999-2020 National Technology & Engineering Solutions # of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with # NTESS, the U.S. Government retains certain rights in this software. -# +# # See packages/seacas/LICENSE for details # script to run all tests and compare them to saved dump files. @@ -26,14 +26,14 @@ ${NCDUMP} -d5,5 test.exo | grep -v version > test.dmp # testrd - single precision read test echo "testrd ..." echo "testrd ... [Expect ex_create NOCLOBBER error from this test]" -${PREFIX} ${SRCDIR}/testrd | grep -v version > testrd.dmp +${PREFIX} ${SRCDIR}/testrd | grep -v version > testrd.dmp # testcp_ss - single-to-single precision copy test echo "testcp_ss ..." echo "begin testcp_ss" >> test.output ${PREFIX} ${SRCDIR}/testcp >> test.output echo "end testcp_ss" >> test.output -${NCDUMP} -d5,5 testcp.exo | grep -v version > testcp_ss.dmp +${NCDUMP} -d5,5 testcp.exo | grep -v version > testcp_ss.dmp # testcpln - single-to-single, large to normal copy test echo "testcpln ..." @@ -47,7 +47,7 @@ echo "testcpnl ..." echo "begin testcpnl" >> test.output ${PREFIX} ${SRCDIR}/testcpnl >> test.output echo "end testcpnl" >> test.output -${NCDUMP} -d5,5 testcpnl.exo | grep -v version > testcpnl.dmp +${NCDUMP} -d5,5 testcpnl.exo | grep -v version > testcpnl.dmp # testwt1 - single precision write test with multiple side sets echo "testwt1 ..." @@ -76,7 +76,7 @@ ${PREFIX} ${SRCDIR}/testrdd | grep -v version > testrdd.dmp # testwt2 - single precision write 2 files (simultaneously open) test echo "testwt2 ..." echo "begin testwt2" >> test.output -${PREFIX} ${SRCDIR}/testwt2 >> test.output |&grep -v "property name string" +${PREFIX} ${SRCDIR}/testwt2 >> test.output |&grep -v "property name string" echo "end testwt2" >> test.output ${NCDUMP} -d5,5 test.exo | grep -v version > test2-1.dmp ${NCDUMP} -d5,5 test2.exo | grep -v version > test2-2.dmp @@ -89,7 +89,7 @@ ${NCDUMP} -d5,5 test-nsided.exo | grep -v version > test-nsided.dmp # testrd_nsid - single precision read test echo "testrd_nsid ..." -${PREFIX} ${SRCDIR}/testrd_nsid | grep -v version > testrd_nsid.dmp +${PREFIX} ${SRCDIR}/testrd_nsid | grep -v version > testrd_nsid.dmp echo "************************************************************************" echo "************************************************************************" diff --git a/packages/seacas/libraries/ioss/doc/IOSystem.tex b/packages/seacas/libraries/ioss/doc/IOSystem.tex index eed7f3c76a3f..74f8f2770805 100644 --- a/packages/seacas/libraries/ioss/doc/IOSystem.tex +++ b/packages/seacas/libraries/ioss/doc/IOSystem.tex @@ -161,7 +161,7 @@ \subsubsection{Ioss::Region and Ioss::GroupingEntity Classes} the Sierra datastructures. It also contains metadata about that portion of the finite element model. Each specific \code{GroupingEntity} type has a few required properties and -fields and some optional properties and fields. +fields and some optional properties and fields. The \code{Ioss::GroupingEntity}'s define the basic finite element model. For example, a model with two element blocks, a nodeset, @@ -232,7 +232,7 @@ \subsubsection{Ioss::Field and Ioss::FieldManager} the entire \code{Field}. Equal to \code{rawCount\_ * sizeof(type\_) * (rawStorage\_ components)}. } \item { -std::vector{\textless} Iotr::Transform * {\textgreater} +std::vector{\textless} Iotr::Transform * {\textgreater} \code{ransforms\_} -- A list of transforms which are applied to this field. \textit{Note that the transforms are implemented at the Field level, but are not yet functional in Sierra @@ -285,7 +285,7 @@ \subsubsection{Ioss::Field and Ioss::FieldManager} \item [\code{ATTRIBUTE}] A field which is used to define an attribute on an \code{EntityBlock} derived class. Examples would be thickness of the elements in a shell element block or the radius of particles in -a particle element block. +a particle element block. \item [\code{TRANSIENT}] A field which is typically calculated at multiple steps or times in an analysis. These are typically ``results'' data. Examples would be nodal displacement or element @@ -387,7 +387,7 @@ \subsubsection{Defined Properties and Fields} And the fields: \begin{quote} \begin{tabular}{lll} -\code{ids} & (Integer) & scalar \\ +\code{ids} & (Integer) & scalar \\ \code{connectivity} & (Integer) & topology\_node\_count \\ \end{tabular} \end{quote} @@ -649,7 +649,7 @@ \subsubsection{Database Traits Interface} If the boolean `\code{must\_exist}' is true, then it is an error if the specified node does not exist; otherwise if \code{must\_exist} is false, then the function returns `0' if -a node with that global id does not exist. +a node with that global id does not exist. \item [\code{virtual int maximum\_symbol\_length()}]-- Return the maximum length of the `field names' that the database can handle; return 0 if it is unlimited. This is used by the restart system which @@ -726,17 +726,17 @@ \section{Database Registration} \begin{source} namespace IoXX \{ - + \ \ const IOFactory* IOFactory::factory()\{ \ \ \ \ static IOFactory registerThis; \ \ \ \ return \®isterThis; \ \ \} - + \ \ IOFactory::IOFactory() \ \ \ \ : Ioss::IOFactory({\textquotedbl}database\_type{\textquotedbl}) \{ \ \ \ \ Ioss::IOFactory::alias({\textquotedbl}database\_type{\textquotedbl}, {\textquotedbl}alias\_for\_database\_type{\textquotedbl}); \ \ \} - + \ \ Ioss::DatabaseIO* IOFactory::make\_IO(const std::string\& filename, \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Ioss::EventInterest db\_usage) const \ \ \{ return new DatabaseIO(NULL, filename, db\_usage); \} @@ -794,8 +794,8 @@ \section{Build System} requires the exodusII, nemesis, and netcdf libraries and that is specified as: \begin{source} lib ioex - : - [ glob $(io_system-root)/src/exodusII/*.C ] + : + [ glob $(io_system-root)/src/exodusII/*.C ] ioss /sierra/utility//utility /tpl/exodus//exodus @@ -817,8 +817,8 @@ \section{Build System} instructions are defined as: \begin{source} lib ioex - : - [ glob $(io_system-root)/src/exodusII/*.C ] + : + [ glob $(io_system-root)/src/exodusII/*.C ] ioss /sierra/utility//utility /tpl/exodus//exodus @@ -841,8 +841,8 @@ \section{Build System} this in the following code block for the \code{io\_shell} executable: \begin{source} exe io_shell - : - $(io_system-root)/src/main/Main_io_shell.C + : + $(io_system-root)/src/main/Main_io_shell.C ioinit ioss iotr diff --git a/packages/seacas/libraries/ioss/doc/cth_presto_one_way_coupling.tex b/packages/seacas/libraries/ioss/doc/cth_presto_one_way_coupling.tex index eabdd33b365e..7261d810a3c1 100644 --- a/packages/seacas/libraries/ioss/doc/cth_presto_one_way_coupling.tex +++ b/packages/seacas/libraries/ioss/doc/cth_presto_one_way_coupling.tex @@ -79,7 +79,7 @@ \section{Overview} representation of the structural model to calculate the structural response. There is no feedback or communication of data from the \code{presto} analysis back to \code{CTH}; all communication is -one{}-way from \code{CTH} to \code{presto}. +one{}-way from \code{CTH} to \code{presto}. The codes involved in this process include CTH, Presto, and a few utility programs (described below) used to facilitate the data @@ -92,7 +92,7 @@ \section{Procedure Overview} Generate finite element mesh of the structural model. The model must consist entirely of volume elements (hexes, tetrahedrons, wedges) at this time; structural elements (shells, beams, trusses) are not yet -supported. A workaround for shell models is discussed in Section~\ref{sec:shell}. +supported. A workaround for shell models is discussed in Section~\ref{sec:shell}. \item Generate a model consisting of the exposed surface (`skin') of the structural model. @@ -126,8 +126,8 @@ \subsection{Step 2: Generation of exposed surface model}\label{sec:surfmodel} BEGIN SIERRA \textit{label} BEGIN FINITE ELEMENT MODEL \textit{model\_label} DATABASE NAME = \file{structural\_model.g} - OMIT BLOCK block\_[?] # optional - END + OMIT BLOCK block\_[?] # optional + END BEGIN MODEL TO SKIN USE FINITE ELEMENT MODEL \textit{model\_label} @@ -287,7 +287,7 @@ \subsection{Step 5: Merge Pressure Data With Original Structural Model} \code{io\_shell} instead.} is used for this. The basic minimal command line for this is: \begin{source} -sierra cth\_pressure\_map {-}i \file{merge\_file.i} +sierra cth\_pressure\_map {-}i \file{merge\_file.i} \end{source} The \file{merge\_file.i} file contains three lines: \begin{source} @@ -402,8 +402,8 @@ \subsection{Step 5: Merge Pressure Data With Original Structural Model} \subsection{Step 6: Perform Presto Structural Analysis}\label{sec:step6} Within Presto, the pressure data and the finite element model are read -from the same exodusII database -(\file{structural\_model\_with\_pressures.g }in the above example). +from the same exodusII database +(\file{structural\_model\_with\_pressures.g }in the above example). The following `pressure block' located in the `region scope' tells presto where to find the pressure data: @@ -446,11 +446,11 @@ \section{Notes} \item We recommend having at least three CTH cells through any solid material (through thickness) in order to avoid any `bleed through' of pressure -from one side to the other, e.g on thin plates. +from one side to the other, e.g on thin plates. \item The pressure distributions can be spatially clipped within Presto input deck by using the `\cmd{remove surface}' option within the -\cmd{pressure} block. +\cmd{pressure} block. \item Care must be exercised when solid material in the CTH simulation is in contact with the inserted finite{}-element model as only the scalar diff --git a/packages/seacas/libraries/ioss/doc/ioss-doxygen.cfg b/packages/seacas/libraries/ioss/doc/ioss-doxygen.cfg index 73c8a99f9830..6b140a9f364a 100644 --- a/packages/seacas/libraries/ioss/doc/ioss-doxygen.cfg +++ b/packages/seacas/libraries/ioss/doc/ioss-doxygen.cfg @@ -14,198 +14,198 @@ # Project related configuration options #--------------------------------------------------------------------------- -# This tag specifies the encoding used for all characters in the config file that -# follow. The default is UTF-8 which is also the encoding used for all text before -# the first occurrence of this tag. Doxygen uses libiconv (or the iconv built into -# libc) for the transcoding. See http://www.gnu.org/software/libiconv for the list of +# This tag specifies the encoding used for all characters in the config file that +# follow. The default is UTF-8 which is also the encoding used for all text before +# the first occurrence of this tag. Doxygen uses libiconv (or the iconv built into +# libc) for the transcoding. See http://www.gnu.org/software/libiconv for the list of # possible encodings. DOXYFILE_ENCODING = UTF-8 -# The PROJECT_NAME tag is a single word (or a sequence of words surrounded +# The PROJECT_NAME tag is a single word (or a sequence of words surrounded # by quotes) that should identify the project. PROJECT_NAME = "IO Subsystem " -# The PROJECT_NUMBER tag can be used to enter a project or revision number. -# This could be handy for archiving the generated documentation or +# The PROJECT_NUMBER tag can be used to enter a project or revision number. +# This could be handy for archiving the generated documentation or # if some version control system is used. PROJECT_NUMBER = votd -# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) -# base path where the generated documentation will be put. -# If a relative path is entered, it will be relative to the location +# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) +# base path where the generated documentation will be put. +# If a relative path is entered, it will be relative to the location # where doxygen was started. If left blank the current directory will be used. -OUTPUT_DIRECTORY = +OUTPUT_DIRECTORY = -# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create -# 4096 sub-directories (in 2 levels) under the output directory of each output -# format and will distribute the generated files over these directories. -# Enabling this option can be useful when feeding doxygen a huge amount of -# source files, where putting all generated files in the same directory would +# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create +# 4096 sub-directories (in 2 levels) under the output directory of each output +# format and will distribute the generated files over these directories. +# Enabling this option can be useful when feeding doxygen a huge amount of +# source files, where putting all generated files in the same directory would # otherwise cause performance problems for the file system. CREATE_SUBDIRS = NO -# The OUTPUT_LANGUAGE tag is used to specify the language in which all -# documentation generated by doxygen is written. Doxygen will use this -# information to generate all constant output in the proper language. -# The default language is English, other supported languages are: -# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, -# Croatian, Czech, Danish, Dutch, Finnish, French, German, Greek, Hungarian, -# Italian, Japanese, Japanese-en (Japanese with English messages), Korean, -# Korean-en, Lithuanian, Norwegian, Polish, Portuguese, Romanian, Russian, +# The OUTPUT_LANGUAGE tag is used to specify the language in which all +# documentation generated by doxygen is written. Doxygen will use this +# information to generate all constant output in the proper language. +# The default language is English, other supported languages are: +# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, +# Croatian, Czech, Danish, Dutch, Finnish, French, German, Greek, Hungarian, +# Italian, Japanese, Japanese-en (Japanese with English messages), Korean, +# Korean-en, Lithuanian, Norwegian, Polish, Portuguese, Romanian, Russian, # Serbian, Slovak, Slovene, Spanish, Swedish, and Ukrainian. OUTPUT_LANGUAGE = English -# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will -# include brief member descriptions after the members that are listed in -# the file and class documentation (similar to JavaDoc). +# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will +# include brief member descriptions after the members that are listed in +# the file and class documentation (similar to JavaDoc). # Set to NO to disable this. BRIEF_MEMBER_DESC = YES -# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend -# the brief description of a member or function before the detailed description. -# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the +# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend +# the brief description of a member or function before the detailed description. +# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the # brief descriptions will be completely suppressed. REPEAT_BRIEF = YES -# This tag implements a quasi-intelligent brief description abbreviator -# that is used to form the text in various listings. Each string -# in this list, if found as the leading text of the brief description, will be -# stripped from the text and the result after processing the whole list, is -# used as the annotated text. Otherwise, the brief description is used as-is. -# If left blank, the following values are used ("$name" is automatically -# replaced with the name of the entity): "The $name class" "The $name widget" -# "The $name file" "is" "provides" "specifies" "contains" +# This tag implements a quasi-intelligent brief description abbreviator +# that is used to form the text in various listings. Each string +# in this list, if found as the leading text of the brief description, will be +# stripped from the text and the result after processing the whole list, is +# used as the annotated text. Otherwise, the brief description is used as-is. +# If left blank, the following values are used ("$name" is automatically +# replaced with the name of the entity): "The $name class" "The $name widget" +# "The $name file" "is" "provides" "specifies" "contains" # "represents" "a" "an" "the" -ABBREVIATE_BRIEF = +ABBREVIATE_BRIEF = -# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then -# Doxygen will generate a detailed section even if there is only a brief +# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then +# Doxygen will generate a detailed section even if there is only a brief # description. ALWAYS_DETAILED_SEC = NO -# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all -# inherited members of a class in the documentation of that class as if those -# members were ordinary class members. Constructors, destructors and assignment +# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all +# inherited members of a class in the documentation of that class as if those +# members were ordinary class members. Constructors, destructors and assignment # operators of the base classes will not be shown. INLINE_INHERITED_MEMB = NO -# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full -# path before files name in the file list and in the header files. If set +# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full +# path before files name in the file list and in the header files. If set # to NO the shortest path that makes the file name unique will be used. FULL_PATH_NAMES = NO -# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag -# can be used to strip a user-defined part of the path. Stripping is -# only done if one of the specified strings matches the left-hand part of -# the path. The tag can be used to show relative paths in the file list. -# If left blank the directory from which doxygen is run is used as the +# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag +# can be used to strip a user-defined part of the path. Stripping is +# only done if one of the specified strings matches the left-hand part of +# the path. The tag can be used to show relative paths in the file list. +# If left blank the directory from which doxygen is run is used as the # path to strip. -STRIP_FROM_PATH = +STRIP_FROM_PATH = -# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of -# the path mentioned in the documentation of a class, which tells -# the reader which header file to include in order to use a class. -# If left blank only the name of the header file containing the class -# definition is used. Otherwise one should specify the include paths that +# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of +# the path mentioned in the documentation of a class, which tells +# the reader which header file to include in order to use a class. +# If left blank only the name of the header file containing the class +# definition is used. Otherwise one should specify the include paths that # are normally passed to the compiler using the -I flag. -STRIP_FROM_INC_PATH = +STRIP_FROM_INC_PATH = -# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter -# (but less readable) file names. This can be useful is your file systems +# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter +# (but less readable) file names. This can be useful is your file systems # doesn't support long names like on DOS, Mac, or CD-ROM. SHORT_NAMES = NO -# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen -# will interpret the first line (until the first dot) of a JavaDoc-style -# comment as the brief description. If set to NO, the JavaDoc -# comments will behave just like regular Qt-style comments +# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen +# will interpret the first line (until the first dot) of a JavaDoc-style +# comment as the brief description. If set to NO, the JavaDoc +# comments will behave just like regular Qt-style comments # (thus requiring an explicit @brief command for a brief description.) JAVADOC_AUTOBRIEF = NO -# If the QT_AUTOBRIEF tag is set to YES then Doxygen will -# interpret the first line (until the first dot) of a Qt-style -# comment as the brief description. If set to NO, the comments -# will behave just like regular Qt-style comments (thus requiring +# If the QT_AUTOBRIEF tag is set to YES then Doxygen will +# interpret the first line (until the first dot) of a Qt-style +# comment as the brief description. If set to NO, the comments +# will behave just like regular Qt-style comments (thus requiring # an explicit \brief command for a brief description.) QT_AUTOBRIEF = NO -# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen -# treat a multi-line C++ special comment block (i.e. a block of //! or /// -# comments) as a brief description. This used to be the default behaviour. -# The new default is to treat a multi-line C++ comment block as a detailed +# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen +# treat a multi-line C++ special comment block (i.e. a block of //! or /// +# comments) as a brief description. This used to be the default behaviour. +# The new default is to treat a multi-line C++ comment block as a detailed # description. Set this tag to YES if you prefer the old behaviour instead. MULTILINE_CPP_IS_BRIEF = NO -# If the DETAILS_AT_TOP tag is set to YES then Doxygen +# If the DETAILS_AT_TOP tag is set to YES then Doxygen # will output the detailed description near the top, like JavaDoc. -# If set to NO, the detailed description appears after the member +# If set to NO, the detailed description appears after the member # documentation. DETAILS_AT_TOP = NO -# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented -# member inherits the documentation from any documented member that it +# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented +# member inherits the documentation from any documented member that it # re-implements. INHERIT_DOCS = YES -# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce -# a new page for each member. If set to NO, the documentation of a member will +# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce +# a new page for each member. If set to NO, the documentation of a member will # be part of the file/class/namespace that contains it. SEPARATE_MEMBER_PAGES = NO -# The TAB_SIZE tag can be used to set the number of spaces in a tab. +# The TAB_SIZE tag can be used to set the number of spaces in a tab. # Doxygen uses this value to replace tabs by spaces in code fragments. TAB_SIZE = 8 -# This tag can be used to specify a number of aliases that acts -# as commands in the documentation. An alias has the form "name=value". -# For example adding "sideeffect=\par Side Effects:\n" will allow you to -# put the command \sideeffect (or @sideeffect) in the documentation, which -# will result in a user-defined paragraph with heading "Side Effects:". +# This tag can be used to specify a number of aliases that acts +# as commands in the documentation. An alias has the form "name=value". +# For example adding "sideeffect=\par Side Effects:\n" will allow you to +# put the command \sideeffect (or @sideeffect) in the documentation, which +# will result in a user-defined paragraph with heading "Side Effects:". # You can put \n's in the value part of an alias to insert newlines. -ALIASES = +ALIASES = -# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C -# sources only. Doxygen will then generate output that is more tailored for C. -# For instance, some of the names that are used will be different. The list +# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C +# sources only. Doxygen will then generate output that is more tailored for C. +# For instance, some of the names that are used will be different. The list # of all members will be omitted, etc. OPTIMIZE_OUTPUT_FOR_C = YES -# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java -# sources only. Doxygen will then generate output that is more tailored for Java. -# For instance, namespaces will be presented as packages, qualified scopes +# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java +# sources only. Doxygen will then generate output that is more tailored for Java. +# For instance, namespaces will be presented as packages, qualified scopes # will look different, etc. OPTIMIZE_OUTPUT_JAVA = NO -# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want to -# include (a tag file for) the STL sources as input, then you should -# set this tag to YES in order to let doxygen match functions declarations and -# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. -# func(std::string) {}). This also make the inheritance and collaboration +# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want to +# include (a tag file for) the STL sources as input, then you should +# set this tag to YES in order to let doxygen match functions declarations and +# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. +# func(std::string) {}). This also make the inheritance and collaboration # diagrams that involve STL classes more complete and accurate. BUILTIN_STL_SUPPORT = YES @@ -215,17 +215,17 @@ BUILTIN_STL_SUPPORT = YES CPP_CLI_SUPPORT = NO -# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC -# tag is set to YES, then doxygen will reuse the documentation of the first -# member in the group (if any) for the other members of the group. By default +# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC +# tag is set to YES, then doxygen will reuse the documentation of the first +# member in the group (if any) for the other members of the group. By default # all members of a group must be documented explicitly. DISTRIBUTE_GROUP_DOC = NO -# Set the SUBGROUPING tag to YES (the default) to allow class member groups of -# the same type (for instance a group of public functions) to be put as a -# subgroup of that type (e.g. under the Public Functions section). Set it to -# NO to prevent subgrouping. Alternatively, this can be done per class using +# Set the SUBGROUPING tag to YES (the default) to allow class member groups of +# the same type (for instance a group of public functions) to be put as a +# subgroup of that type (e.g. under the Public Functions section). Set it to +# NO to prevent subgrouping. Alternatively, this can be done per class using # the \nosubgrouping command. SUBGROUPING = YES @@ -234,236 +234,236 @@ SUBGROUPING = YES # Build related configuration options #--------------------------------------------------------------------------- -# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in -# documentation are documented, even if no documentation was available. -# Private class members and static file members will be hidden unless +# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in +# documentation are documented, even if no documentation was available. +# Private class members and static file members will be hidden unless # the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES EXTRACT_ALL = NO -# If the EXTRACT_PRIVATE tag is set to YES all private members of a class +# If the EXTRACT_PRIVATE tag is set to YES all private members of a class # will be included in the documentation. EXTRACT_PRIVATE = NO -# If the EXTRACT_STATIC tag is set to YES all static members of a file +# If the EXTRACT_STATIC tag is set to YES all static members of a file # will be included in the documentation. EXTRACT_STATIC = YES -# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) -# defined locally in source files will be included in the documentation. +# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) +# defined locally in source files will be included in the documentation. # If set to NO only classes defined in header files are included. EXTRACT_LOCAL_CLASSES = YES -# This flag is only useful for Objective-C code. When set to YES local -# methods, which are defined in the implementation section but not in -# the interface are included in the documentation. +# This flag is only useful for Objective-C code. When set to YES local +# methods, which are defined in the implementation section but not in +# the interface are included in the documentation. # If set to NO (the default) only methods in the interface are included. EXTRACT_LOCAL_METHODS = NO -# If this flag is set to YES, the members of anonymous namespaces will be extracted -# and appear in the documentation as a namespace called 'anonymous_namespace{file}', -# where file will be replaced with the base name of the file that contains the anonymous +# If this flag is set to YES, the members of anonymous namespaces will be extracted +# and appear in the documentation as a namespace called 'anonymous_namespace{file}', +# where file will be replaced with the base name of the file that contains the anonymous # namespace. By default anonymous namespace are hidden. EXTRACT_ANON_NSPACES = NO -# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all -# undocumented members of documented classes, files or namespaces. -# If set to NO (the default) these members will be included in the -# various overviews, but no documentation section is generated. +# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all +# undocumented members of documented classes, files or namespaces. +# If set to NO (the default) these members will be included in the +# various overviews, but no documentation section is generated. # This option has no effect if EXTRACT_ALL is enabled. HIDE_UNDOC_MEMBERS = NO -# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all -# undocumented classes that are normally visible in the class hierarchy. -# If set to NO (the default) these classes will be included in the various +# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all +# undocumented classes that are normally visible in the class hierarchy. +# If set to NO (the default) these classes will be included in the various # overviews. This option has no effect if EXTRACT_ALL is enabled. HIDE_UNDOC_CLASSES = NO -# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all -# friend (class|struct|union) declarations. -# If set to NO (the default) these declarations will be included in the +# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all +# friend (class|struct|union) declarations. +# If set to NO (the default) these declarations will be included in the # documentation. HIDE_FRIEND_COMPOUNDS = NO -# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any -# documentation blocks found inside the body of a function. -# If set to NO (the default) these blocks will be appended to the +# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any +# documentation blocks found inside the body of a function. +# If set to NO (the default) these blocks will be appended to the # function's detailed documentation block. HIDE_IN_BODY_DOCS = NO -# The INTERNAL_DOCS tag determines if documentation -# that is typed after a \internal command is included. If the tag is set -# to NO (the default) then the documentation will be excluded. +# The INTERNAL_DOCS tag determines if documentation +# that is typed after a \internal command is included. If the tag is set +# to NO (the default) then the documentation will be excluded. # Set it to YES to include the internal documentation. INTERNAL_DOCS = YES -# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate -# file names in lower-case letters. If set to YES upper-case letters are also -# allowed. This is useful if you have classes or files whose names only differ -# in case and if your file system supports case sensitive file names. Windows +# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate +# file names in lower-case letters. If set to YES upper-case letters are also +# allowed. This is useful if you have classes or files whose names only differ +# in case and if your file system supports case sensitive file names. Windows # and Mac users are advised to set this option to NO. CASE_SENSE_NAMES = YES -# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen -# will show members with their full class and namespace scopes in the +# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen +# will show members with their full class and namespace scopes in the # documentation. If set to YES the scope will be hidden. HIDE_SCOPE_NAMES = NO -# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen -# will put a list of the files that are included by a file in the documentation +# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen +# will put a list of the files that are included by a file in the documentation # of that file. SHOW_INCLUDE_FILES = YES -# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] +# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] # is inserted in the documentation for inline members. INLINE_INFO = YES -# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen -# will sort the (detailed) documentation of file and class members -# alphabetically by member name. If set to NO the members will appear in +# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen +# will sort the (detailed) documentation of file and class members +# alphabetically by member name. If set to NO the members will appear in # declaration order. SORT_MEMBER_DOCS = YES -# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the -# brief documentation of file, namespace and class members alphabetically -# by member name. If set to NO (the default) the members will appear in +# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the +# brief documentation of file, namespace and class members alphabetically +# by member name. If set to NO (the default) the members will appear in # declaration order. SORT_BRIEF_DOCS = NO -# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be -# sorted by fully-qualified names, including namespaces. If set to -# NO (the default), the class list will be sorted only by class name, -# not including the namespace part. +# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be +# sorted by fully-qualified names, including namespaces. If set to +# NO (the default), the class list will be sorted only by class name, +# not including the namespace part. # Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. -# Note: This option applies only to the class list, not to the +# Note: This option applies only to the class list, not to the # alphabetical list. SORT_BY_SCOPE_NAME = YES -# The GENERATE_TODOLIST tag can be used to enable (YES) or -# disable (NO) the todo list. This list is created by putting \todo +# The GENERATE_TODOLIST tag can be used to enable (YES) or +# disable (NO) the todo list. This list is created by putting \todo # commands in the documentation. GENERATE_TODOLIST = YES -# The GENERATE_TESTLIST tag can be used to enable (YES) or -# disable (NO) the test list. This list is created by putting \test +# The GENERATE_TESTLIST tag can be used to enable (YES) or +# disable (NO) the test list. This list is created by putting \test # commands in the documentation. GENERATE_TESTLIST = YES -# The GENERATE_BUGLIST tag can be used to enable (YES) or -# disable (NO) the bug list. This list is created by putting \bug +# The GENERATE_BUGLIST tag can be used to enable (YES) or +# disable (NO) the bug list. This list is created by putting \bug # commands in the documentation. GENERATE_BUGLIST = YES -# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or -# disable (NO) the deprecated list. This list is created by putting +# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or +# disable (NO) the deprecated list. This list is created by putting # \deprecated commands in the documentation. GENERATE_DEPRECATEDLIST= YES -# The ENABLED_SECTIONS tag can be used to enable conditional +# The ENABLED_SECTIONS tag can be used to enable conditional # documentation sections, marked by \if sectionname ... \endif. -ENABLED_SECTIONS = +ENABLED_SECTIONS = -# The MAX_INITIALIZER_LINES tag determines the maximum number of lines -# the initial value of a variable or define consists of for it to appear in -# the documentation. If the initializer consists of more lines than specified -# here it will be hidden. Use a value of 0 to hide initializers completely. -# The appearance of the initializer of individual variables and defines in the -# documentation can be controlled using \showinitializer or \hideinitializer +# The MAX_INITIALIZER_LINES tag determines the maximum number of lines +# the initial value of a variable or define consists of for it to appear in +# the documentation. If the initializer consists of more lines than specified +# here it will be hidden. Use a value of 0 to hide initializers completely. +# The appearance of the initializer of individual variables and defines in the +# documentation can be controlled using \showinitializer or \hideinitializer # command in the documentation regardless of this setting. MAX_INITIALIZER_LINES = 30 -# Set the SHOW_USED_FILES tag to NO to disable the list of files generated -# at the bottom of the documentation of classes and structs. If set to YES the +# Set the SHOW_USED_FILES tag to NO to disable the list of files generated +# at the bottom of the documentation of classes and structs. If set to YES the # list will mention the files that were used to generate the documentation. SHOW_USED_FILES = YES -# If the sources in your project are distributed over multiple directories -# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy +# If the sources in your project are distributed over multiple directories +# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy # in the documentation. The default is NO. SHOW_DIRECTORIES = YES -# The FILE_VERSION_FILTER tag can be used to specify a program or script that -# doxygen should invoke to get the current version for each file (typically from the -# version control system). Doxygen will invoke the program by executing (via -# popen()) the command , where is the value of -# the FILE_VERSION_FILTER tag, and is the name of an input file -# provided by doxygen. Whatever the program writes to standard output +# The FILE_VERSION_FILTER tag can be used to specify a program or script that +# doxygen should invoke to get the current version for each file (typically from the +# version control system). Doxygen will invoke the program by executing (via +# popen()) the command , where is the value of +# the FILE_VERSION_FILTER tag, and is the name of an input file +# provided by doxygen. Whatever the program writes to standard output # is used as the file version. See the manual for examples. -FILE_VERSION_FILTER = +FILE_VERSION_FILTER = #--------------------------------------------------------------------------- # configuration options related to warning and progress messages #--------------------------------------------------------------------------- -# The QUIET tag can be used to turn on/off the messages that are generated +# The QUIET tag can be used to turn on/off the messages that are generated # by doxygen. Possible values are YES and NO. If left blank NO is used. QUIET = NO -# The WARNINGS tag can be used to turn on/off the warning messages that are -# generated by doxygen. Possible values are YES and NO. If left blank +# The WARNINGS tag can be used to turn on/off the warning messages that are +# generated by doxygen. Possible values are YES and NO. If left blank # NO is used. WARNINGS = YES -# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings -# for undocumented members. If EXTRACT_ALL is set to YES then this flag will +# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings +# for undocumented members. If EXTRACT_ALL is set to YES then this flag will # automatically be disabled. WARN_IF_UNDOCUMENTED = YES -# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for -# potential errors in the documentation, such as not documenting some -# parameters in a documented function, or documenting parameters that +# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for +# potential errors in the documentation, such as not documenting some +# parameters in a documented function, or documenting parameters that # don't exist or using markup commands wrongly. WARN_IF_DOC_ERROR = YES -# This WARN_NO_PARAMDOC option can be abled to get warnings for -# functions that are documented, but have no documentation for their parameters -# or return value. If set to NO (the default) doxygen will only warn about -# wrong or incomplete parameter documentation, but not about the absence of +# This WARN_NO_PARAMDOC option can be abled to get warnings for +# functions that are documented, but have no documentation for their parameters +# or return value. If set to NO (the default) doxygen will only warn about +# wrong or incomplete parameter documentation, but not about the absence of # documentation. WARN_NO_PARAMDOC = NO -# The WARN_FORMAT tag determines the format of the warning messages that -# doxygen can produce. The string should contain the $file, $line, and $text -# tags, which will be replaced by the file and line number from which the -# warning originated and the warning text. Optionally the format may contain -# $version, which will be replaced by the version of the file (if it could +# The WARN_FORMAT tag determines the format of the warning messages that +# doxygen can produce. The string should contain the $file, $line, and $text +# tags, which will be replaced by the file and line number from which the +# warning originated and the warning text. Optionally the format may contain +# $version, which will be replaced by the version of the file (if it could # be obtained via FILE_VERSION_FILTER) WARN_FORMAT = "$file:$line: $text " -# The WARN_LOGFILE tag can be used to specify a file to which warning -# and error messages should be written. If left blank the output is written +# The WARN_LOGFILE tag can be used to specify a file to which warning +# and error messages should be written. If left blank the output is written # to stderr. WARN_LOGFILE = ioss.doxygen.warn @@ -472,110 +472,110 @@ WARN_LOGFILE = ioss.doxygen.warn # configuration options related to the input files #--------------------------------------------------------------------------- -# The INPUT tag can be used to specify the files and/or directories that contain -# documented source files. You may enter file names like "myfile.cpp" or -# directories like "/usr/src/myproject". Separate the files or directories +# The INPUT tag can be used to specify the files and/or directories that contain +# documented source files. You may enter file names like "myfile.cpp" or +# directories like "/usr/src/myproject". Separate the files or directories # with spaces. INPUT = src -# This tag can be used to specify the character encoding of the source files that -# doxygen parses. Internally doxygen uses the UTF-8 encoding, which is also the default -# input encoding. Doxygen uses libiconv (or the iconv built into libc) for the transcoding. +# This tag can be used to specify the character encoding of the source files that +# doxygen parses. Internally doxygen uses the UTF-8 encoding, which is also the default +# input encoding. Doxygen uses libiconv (or the iconv built into libc) for the transcoding. # See http://www.gnu.org/software/libiconv for the list of possible encodings. INPUT_ENCODING = UTF-8 -# If the value of the INPUT tag contains directories, you can use the -# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp -# and *.h) to filter out the source-files in the directories. If left -# blank the following patterns are tested: -# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx +# If the value of the INPUT tag contains directories, you can use the +# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp +# and *.h) to filter out the source-files in the directories. If left +# blank the following patterns are tested: +# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx # *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py FILE_PATTERNS = *.C \ *.h -# The RECURSIVE tag can be used to turn specify whether or not subdirectories -# should be searched for input files as well. Possible values are YES and NO. +# The RECURSIVE tag can be used to turn specify whether or not subdirectories +# should be searched for input files as well. Possible values are YES and NO. # If left blank NO is used. RECURSIVE = YES -# The EXCLUDE tag can be used to specify files and/or directories that should -# excluded from the INPUT source files. This way you can easily exclude a +# The EXCLUDE tag can be used to specify files and/or directories that should +# excluded from the INPUT source files. This way you can easily exclude a # subdirectory from a directory tree whose root is specified with the INPUT tag. -EXCLUDE = +EXCLUDE = -# The EXCLUDE_SYMLINKS tag can be used select whether or not files or -# directories that are symbolic links (a Unix filesystem feature) are excluded +# The EXCLUDE_SYMLINKS tag can be used select whether or not files or +# directories that are symbolic links (a Unix filesystem feature) are excluded # from the input. EXCLUDE_SYMLINKS = NO -# If the value of the INPUT tag contains directories, you can use the -# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude -# certain files from those directories. Note that the wildcards are matched -# against the file with absolute path, so to exclude all test directories +# If the value of the INPUT tag contains directories, you can use the +# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude +# certain files from those directories. Note that the wildcards are matched +# against the file with absolute path, so to exclude all test directories # for example use the pattern */test/* -EXCLUDE_PATTERNS = +EXCLUDE_PATTERNS = -# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names -# (namespaces, classes, functions, etc.) that should be excluded from the output. -# The symbol name can be a fully qualified name, a word, or if the wildcard * is used, +# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names +# (namespaces, classes, functions, etc.) that should be excluded from the output. +# The symbol name can be a fully qualified name, a word, or if the wildcard * is used, # a substring. Examples: ANamespace, AClass, AClass::ANamespace, ANamespace::*Test -EXCLUDE_SYMBOLS = +EXCLUDE_SYMBOLS = -# The EXAMPLE_PATH tag can be used to specify one or more files or -# directories that contain example code fragments that are included (see +# The EXAMPLE_PATH tag can be used to specify one or more files or +# directories that contain example code fragments that are included (see # the \include command). -EXAMPLE_PATH = +EXAMPLE_PATH = -# If the value of the EXAMPLE_PATH tag contains directories, you can use the -# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp -# and *.h) to filter out the source-files in the directories. If left +# If the value of the EXAMPLE_PATH tag contains directories, you can use the +# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp +# and *.h) to filter out the source-files in the directories. If left # blank all files are included. -EXAMPLE_PATTERNS = +EXAMPLE_PATTERNS = -# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be -# searched for input files to be used with the \include or \dontinclude -# commands irrespective of the value of the RECURSIVE tag. +# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be +# searched for input files to be used with the \include or \dontinclude +# commands irrespective of the value of the RECURSIVE tag. # Possible values are YES and NO. If left blank NO is used. EXAMPLE_RECURSIVE = NO -# The IMAGE_PATH tag can be used to specify one or more files or -# directories that contain image that are included in the documentation (see +# The IMAGE_PATH tag can be used to specify one or more files or +# directories that contain image that are included in the documentation (see # the \image command). -IMAGE_PATH = +IMAGE_PATH = -# The INPUT_FILTER tag can be used to specify a program that doxygen should -# invoke to filter for each input file. Doxygen will invoke the filter program -# by executing (via popen()) the command , where -# is the value of the INPUT_FILTER tag, and is the name of an -# input file. Doxygen will then use the output that the filter program writes -# to standard output. If FILTER_PATTERNS is specified, this tag will be +# The INPUT_FILTER tag can be used to specify a program that doxygen should +# invoke to filter for each input file. Doxygen will invoke the filter program +# by executing (via popen()) the command , where +# is the value of the INPUT_FILTER tag, and is the name of an +# input file. Doxygen will then use the output that the filter program writes +# to standard output. If FILTER_PATTERNS is specified, this tag will be # ignored. -INPUT_FILTER = +INPUT_FILTER = -# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern -# basis. Doxygen will compare the file name with each pattern and apply the -# filter if there is a match. The filters are a list of the form: -# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further -# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER +# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern +# basis. Doxygen will compare the file name with each pattern and apply the +# filter if there is a match. The filters are a list of the form: +# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further +# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER # is applied to all files. -FILTER_PATTERNS = +FILTER_PATTERNS = -# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using -# INPUT_FILTER) will be used to filter the input files when producing source +# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using +# INPUT_FILTER) will be used to filter the input files when producing source # files to browse (i.e. when SOURCE_BROWSER is set to YES). FILTER_SOURCE_FILES = NO @@ -584,34 +584,34 @@ FILTER_SOURCE_FILES = NO # configuration options related to source browsing #--------------------------------------------------------------------------- -# If the SOURCE_BROWSER tag is set to YES then a list of source files will -# be generated. Documented entities will be cross-referenced with these sources. -# Note: To get rid of all source code in the generated output, make sure also -# VERBATIM_HEADERS is set to NO. If you have enabled CALL_GRAPH or CALLER_GRAPH -# then you must also enable this option. If you don't then doxygen will produce +# If the SOURCE_BROWSER tag is set to YES then a list of source files will +# be generated. Documented entities will be cross-referenced with these sources. +# Note: To get rid of all source code in the generated output, make sure also +# VERBATIM_HEADERS is set to NO. If you have enabled CALL_GRAPH or CALLER_GRAPH +# then you must also enable this option. If you don't then doxygen will produce # a warning and turn it on anyway SOURCE_BROWSER = YES -# Setting the INLINE_SOURCES tag to YES will include the body +# Setting the INLINE_SOURCES tag to YES will include the body # of functions and classes directly in the documentation. INLINE_SOURCES = NO -# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct -# doxygen to hide any special comment blocks from generated source code +# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct +# doxygen to hide any special comment blocks from generated source code # fragments. Normal C and C++ comments will always remain visible. STRIP_CODE_COMMENTS = NO -# If the REFERENCED_BY_RELATION tag is set to YES (the default) -# then for each documented function all documented +# If the REFERENCED_BY_RELATION tag is set to YES (the default) +# then for each documented function all documented # functions referencing it will be listed. REFERENCED_BY_RELATION = YES -# If the REFERENCES_RELATION tag is set to YES (the default) -# then for each documented function all documented entities +# If the REFERENCES_RELATION tag is set to YES (the default) +# then for each documented function all documented entities # called/used by that function will be listed. REFERENCES_RELATION = YES @@ -623,16 +623,16 @@ REFERENCES_RELATION = YES REFERENCES_LINK_SOURCE = YES -# If the USE_HTAGS tag is set to YES then the references to source code -# will point to the HTML generated by the htags(1) tool instead of doxygen -# built-in source browser. The htags tool is part of GNU's global source -# tagging system (see http://www.gnu.org/software/global/global.html). You +# If the USE_HTAGS tag is set to YES then the references to source code +# will point to the HTML generated by the htags(1) tool instead of doxygen +# built-in source browser. The htags tool is part of GNU's global source +# tagging system (see http://www.gnu.org/software/global/global.html). You # will need version 4.8.6 or higher. USE_HTAGS = NO -# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen -# will generate a verbatim copy of the header file for each class for +# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen +# will generate a verbatim copy of the header file for each class for # which an include is specified. Set to NO to disable this. VERBATIM_HEADERS = YES @@ -641,141 +641,141 @@ VERBATIM_HEADERS = YES # configuration options related to the alphabetical class index #--------------------------------------------------------------------------- -# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index -# of all compounds will be generated. Enable this if the project +# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index +# of all compounds will be generated. Enable this if the project # contains a lot of classes, structs, unions or interfaces. ALPHABETICAL_INDEX = YES -# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then -# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns +# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then +# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns # in which this list will be split (can be a number in the range [1..20]) COLS_IN_ALPHA_INDEX = 3 -# In case all classes in a project start with a common prefix, all -# classes will be put under the same header in the alphabetical index. -# The IGNORE_PREFIX tag can be used to specify one or more prefixes that +# In case all classes in a project start with a common prefix, all +# classes will be put under the same header in the alphabetical index. +# The IGNORE_PREFIX tag can be used to specify one or more prefixes that # should be ignored while generating the index headers. -IGNORE_PREFIX = +IGNORE_PREFIX = #--------------------------------------------------------------------------- # configuration options related to the HTML output #--------------------------------------------------------------------------- -# If the GENERATE_HTML tag is set to YES (the default) Doxygen will +# If the GENERATE_HTML tag is set to YES (the default) Doxygen will # generate HTML output. GENERATE_HTML = YES -# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be # put in front of it. If left blank `html' will be used as the default path. -HTML_OUTPUT = +HTML_OUTPUT = -# The HTML_FILE_EXTENSION tag can be used to specify the file extension for -# each generated HTML page (for example: .htm,.php,.asp). If it is left blank +# The HTML_FILE_EXTENSION tag can be used to specify the file extension for +# each generated HTML page (for example: .htm,.php,.asp). If it is left blank # doxygen will generate files with .html extension. HTML_FILE_EXTENSION = .html -# The HTML_HEADER tag can be used to specify a personal HTML header for -# each generated HTML page. If it is left blank doxygen will generate a +# The HTML_HEADER tag can be used to specify a personal HTML header for +# each generated HTML page. If it is left blank doxygen will generate a # standard header. -HTML_HEADER = +HTML_HEADER = -# The HTML_FOOTER tag can be used to specify a personal HTML footer for -# each generated HTML page. If it is left blank doxygen will generate a +# The HTML_FOOTER tag can be used to specify a personal HTML footer for +# each generated HTML page. If it is left blank doxygen will generate a # standard footer. -HTML_FOOTER = +HTML_FOOTER = -# The HTML_STYLESHEET tag can be used to specify a user-defined cascading -# style sheet that is used by each HTML page. It can be used to -# fine-tune the look of the HTML output. If the tag is left blank doxygen -# will generate a default style sheet. Note that doxygen will try to copy -# the style sheet file to the HTML output directory, so don't put your own +# The HTML_STYLESHEET tag can be used to specify a user-defined cascading +# style sheet that is used by each HTML page. It can be used to +# fine-tune the look of the HTML output. If the tag is left blank doxygen +# will generate a default style sheet. Note that doxygen will try to copy +# the style sheet file to the HTML output directory, so don't put your own # stylesheet in the HTML output directory as well, or it will be erased! -HTML_STYLESHEET = +HTML_STYLESHEET = -# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, -# files or namespaces will be aligned in HTML using tables. If set to +# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, +# files or namespaces will be aligned in HTML using tables. If set to # NO a bullet list will be used. HTML_ALIGN_MEMBERS = YES -# If the GENERATE_HTMLHELP tag is set to YES, additional index files -# will be generated that can be used as input for tools like the -# Microsoft HTML help workshop to generate a compressed HTML help file (.chm) +# If the GENERATE_HTMLHELP tag is set to YES, additional index files +# will be generated that can be used as input for tools like the +# Microsoft HTML help workshop to generate a compressed HTML help file (.chm) # of the generated HTML documentation. GENERATE_HTMLHELP = NO -# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML -# documentation will contain sections that can be hidden and shown after the -# page has loaded. For this to work a browser that supports -# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox +# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML +# documentation will contain sections that can be hidden and shown after the +# page has loaded. For this to work a browser that supports +# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox # Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari). HTML_DYNAMIC_SECTIONS = YES -# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can -# be used to specify the file name of the resulting .chm file. You -# can add a path in front of the file if the result should not be +# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can +# be used to specify the file name of the resulting .chm file. You +# can add a path in front of the file if the result should not be # written to the html output directory. -CHM_FILE = +CHM_FILE = -# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can -# be used to specify the location (absolute path including file name) of -# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run +# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can +# be used to specify the location (absolute path including file name) of +# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run # the HTML help compiler on the generated index.hhp. -HHC_LOCATION = +HHC_LOCATION = -# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag -# controls if a separate .chi index file is generated (YES) or that +# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag +# controls if a separate .chi index file is generated (YES) or that # it should be included in the master .chm file (NO). GENERATE_CHI = NO -# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag -# controls whether a binary table of contents is generated (YES) or a +# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag +# controls whether a binary table of contents is generated (YES) or a # normal table of contents (NO) in the .chm file. BINARY_TOC = NO -# The TOC_EXPAND flag can be set to YES to add extra items for group members +# The TOC_EXPAND flag can be set to YES to add extra items for group members # to the contents of the HTML help documentation and to the tree view. TOC_EXPAND = NO -# The DISABLE_INDEX tag can be used to turn on/off the condensed index at -# top of each HTML page. The value NO (the default) enables the index and +# The DISABLE_INDEX tag can be used to turn on/off the condensed index at +# top of each HTML page. The value NO (the default) enables the index and # the value YES disables it. DISABLE_INDEX = NO -# This tag can be used to set the number of enum values (range [1..20]) +# This tag can be used to set the number of enum values (range [1..20]) # that doxygen will group on one line in the generated HTML documentation. ENUM_VALUES_PER_LINE = 4 # If the GENERATE_TREEVIEW tag is set to YES, a side panel will be -# generated containing a tree-like index structure (just like the one that -# is generated for HTML Help). For this to work a browser that supports -# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, -# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are +# generated containing a tree-like index structure (just like the one that +# is generated for HTML Help). For this to work a browser that supports +# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, +# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are # probably better off using the HTML help feature. GENERATE_TREEVIEW = YES -# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be -# used to set the initial width (in pixels) of the frame in which the tree +# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be +# used to set the initial width (in pixels) of the frame in which the tree # is shown. TREEVIEW_WIDTH = 250 @@ -784,74 +784,74 @@ TREEVIEW_WIDTH = 250 # configuration options related to the LaTeX output #--------------------------------------------------------------------------- -# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will +# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will # generate Latex output. GENERATE_LATEX = NO -# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be # put in front of it. If left blank `latex' will be used as the default path. -LATEX_OUTPUT = +LATEX_OUTPUT = -# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be +# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be # invoked. If left blank `latex' will be used as the default command name. LATEX_CMD_NAME = latex -# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to -# generate index for LaTeX. If left blank `makeindex' will be used as the +# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to +# generate index for LaTeX. If left blank `makeindex' will be used as the # default command name. MAKEINDEX_CMD_NAME = makeindex -# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact -# LaTeX documents. This may be useful for small projects and may help to +# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact +# LaTeX documents. This may be useful for small projects and may help to # save some trees in general. COMPACT_LATEX = NO -# The PAPER_TYPE tag can be used to set the paper type that is used -# by the printer. Possible values are: a4, a4wide, letter, legal and +# The PAPER_TYPE tag can be used to set the paper type that is used +# by the printer. Possible values are: a4, a4wide, letter, legal and # executive. If left blank a4wide will be used. PAPER_TYPE = a4wide -# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX +# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX # packages that should be included in the LaTeX output. -EXTRA_PACKAGES = +EXTRA_PACKAGES = -# The LATEX_HEADER tag can be used to specify a personal LaTeX header for -# the generated latex document. The header should contain everything until -# the first chapter. If it is left blank doxygen will generate a +# The LATEX_HEADER tag can be used to specify a personal LaTeX header for +# the generated latex document. The header should contain everything until +# the first chapter. If it is left blank doxygen will generate a # standard header. Notice: only use this tag if you know what you are doing! -LATEX_HEADER = +LATEX_HEADER = -# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated -# is prepared for conversion to pdf (using ps2pdf). The pdf file will -# contain links (just like the HTML output) instead of page references +# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated +# is prepared for conversion to pdf (using ps2pdf). The pdf file will +# contain links (just like the HTML output) instead of page references # This makes the output suitable for online browsing using a pdf viewer. PDF_HYPERLINKS = NO -# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of -# plain latex in the generated Makefile. Set this option to YES to get a +# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of +# plain latex in the generated Makefile. Set this option to YES to get a # higher quality PDF documentation. USE_PDFLATEX = NO -# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. -# command to the generated LaTeX files. This will instruct LaTeX to keep -# running if errors occur, instead of asking the user for help. +# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. +# command to the generated LaTeX files. This will instruct LaTeX to keep +# running if errors occur, instead of asking the user for help. # This option is also used when generating formulas in HTML. LATEX_BATCHMODE = NO -# If LATEX_HIDE_INDICES is set to YES then doxygen will not -# include the index chapters (such as File Index, Compound Index, etc.) +# If LATEX_HIDE_INDICES is set to YES then doxygen will not +# include the index chapters (such as File Index, Compound Index, etc.) # in the output. LATEX_HIDE_INDICES = NO @@ -860,68 +860,68 @@ LATEX_HIDE_INDICES = NO # configuration options related to the RTF output #--------------------------------------------------------------------------- -# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output -# The RTF output is optimized for Word 97 and may not look very pretty with +# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output +# The RTF output is optimized for Word 97 and may not look very pretty with # other RTF readers or editors. GENERATE_RTF = NO -# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be # put in front of it. If left blank `rtf' will be used as the default path. -RTF_OUTPUT = +RTF_OUTPUT = -# If the COMPACT_RTF tag is set to YES Doxygen generates more compact -# RTF documents. This may be useful for small projects and may help to +# If the COMPACT_RTF tag is set to YES Doxygen generates more compact +# RTF documents. This may be useful for small projects and may help to # save some trees in general. COMPACT_RTF = NO -# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated -# will contain hyperlink fields. The RTF file will -# contain links (just like the HTML output) instead of page references. -# This makes the output suitable for online browsing using WORD or other -# programs which support those fields. +# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated +# will contain hyperlink fields. The RTF file will +# contain links (just like the HTML output) instead of page references. +# This makes the output suitable for online browsing using WORD or other +# programs which support those fields. # Note: wordpad (write) and others do not support links. RTF_HYPERLINKS = NO -# Load stylesheet definitions from file. Syntax is similar to doxygen's -# config file, i.e. a series of assignments. You only have to provide +# Load stylesheet definitions from file. Syntax is similar to doxygen's +# config file, i.e. a series of assignments. You only have to provide # replacements, missing definitions are set to their default value. -RTF_STYLESHEET_FILE = +RTF_STYLESHEET_FILE = -# Set optional variables used in the generation of an rtf document. +# Set optional variables used in the generation of an rtf document. # Syntax is similar to doxygen's config file. -RTF_EXTENSIONS_FILE = +RTF_EXTENSIONS_FILE = #--------------------------------------------------------------------------- # configuration options related to the man page output #--------------------------------------------------------------------------- -# If the GENERATE_MAN tag is set to YES (the default) Doxygen will +# If the GENERATE_MAN tag is set to YES (the default) Doxygen will # generate man pages GENERATE_MAN = NO -# The MAN_OUTPUT tag is used to specify where the man pages will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# The MAN_OUTPUT tag is used to specify where the man pages will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be # put in front of it. If left blank `man' will be used as the default path. -MAN_OUTPUT = +MAN_OUTPUT = -# The MAN_EXTENSION tag determines the extension that is added to +# The MAN_EXTENSION tag determines the extension that is added to # the generated man pages (default is the subroutine's section .3) MAN_EXTENSION = .3 -# If the MAN_LINKS tag is set to YES and Doxygen generates man output, -# then it will generate one additional man file for each entity -# documented in the real man page(s). These additional files -# only source the real man page, but without them the man command +# If the MAN_LINKS tag is set to YES and Doxygen generates man output, +# then it will generate one additional man file for each entity +# documented in the real man page(s). These additional files +# only source the real man page, but without them the man command # would be unable to find the correct page. The default is NO. MAN_LINKS = NO @@ -930,33 +930,33 @@ MAN_LINKS = NO # configuration options related to the XML output #--------------------------------------------------------------------------- -# If the GENERATE_XML tag is set to YES Doxygen will -# generate an XML file that captures the structure of +# If the GENERATE_XML tag is set to YES Doxygen will +# generate an XML file that captures the structure of # the code including all documentation. GENERATE_XML = NO -# The XML_OUTPUT tag is used to specify where the XML pages will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# The XML_OUTPUT tag is used to specify where the XML pages will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be # put in front of it. If left blank `xml' will be used as the default path. XML_OUTPUT = xml -# The XML_SCHEMA tag can be used to specify an XML schema, -# which can be used by a validating XML parser to check the +# The XML_SCHEMA tag can be used to specify an XML schema, +# which can be used by a validating XML parser to check the # syntax of the XML files. -XML_SCHEMA = +XML_SCHEMA = -# The XML_DTD tag can be used to specify an XML DTD, -# which can be used by a validating XML parser to check the +# The XML_DTD tag can be used to specify an XML DTD, +# which can be used by a validating XML parser to check the # syntax of the XML files. -XML_DTD = +XML_DTD = -# If the XML_PROGRAMLISTING tag is set to YES Doxygen will -# dump the program listings (including syntax highlighting -# and cross-referencing information) to the XML output. Note that +# If the XML_PROGRAMLISTING tag is set to YES Doxygen will +# dump the program listings (including syntax highlighting +# and cross-referencing information) to the XML output. Note that # enabling this will significantly increase the size of the XML output. XML_PROGRAMLISTING = YES @@ -965,10 +965,10 @@ XML_PROGRAMLISTING = YES # configuration options for the AutoGen Definitions output #--------------------------------------------------------------------------- -# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will -# generate an AutoGen Definitions (see autogen.sf.net) file -# that captures the structure of the code including all -# documentation. Note that this feature is still experimental +# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will +# generate an AutoGen Definitions (see autogen.sf.net) file +# that captures the structure of the code including all +# documentation. Note that this feature is still experimental # and incomplete at the moment. GENERATE_AUTOGEN_DEF = NO @@ -977,319 +977,319 @@ GENERATE_AUTOGEN_DEF = NO # configuration options related to the Perl module output #--------------------------------------------------------------------------- -# If the GENERATE_PERLMOD tag is set to YES Doxygen will -# generate a Perl module file that captures the structure of -# the code including all documentation. Note that this -# feature is still experimental and incomplete at the +# If the GENERATE_PERLMOD tag is set to YES Doxygen will +# generate a Perl module file that captures the structure of +# the code including all documentation. Note that this +# feature is still experimental and incomplete at the # moment. GENERATE_PERLMOD = NO -# If the PERLMOD_LATEX tag is set to YES Doxygen will generate -# the necessary Makefile rules, Perl scripts and LaTeX code to be able +# If the PERLMOD_LATEX tag is set to YES Doxygen will generate +# the necessary Makefile rules, Perl scripts and LaTeX code to be able # to generate PDF and DVI output from the Perl module output. PERLMOD_LATEX = NO -# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be -# nicely formatted so it can be parsed by a human reader. This is useful -# if you want to understand what is going on. On the other hand, if this -# tag is set to NO the size of the Perl module output will be much smaller +# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be +# nicely formatted so it can be parsed by a human reader. This is useful +# if you want to understand what is going on. On the other hand, if this +# tag is set to NO the size of the Perl module output will be much smaller # and Perl will parse it just the same. PERLMOD_PRETTY = YES -# The names of the make variables in the generated doxyrules.make file -# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. -# This is useful so different doxyrules.make files included by the same +# The names of the make variables in the generated doxyrules.make file +# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. +# This is useful so different doxyrules.make files included by the same # Makefile don't overwrite each other's variables. -PERLMOD_MAKEVAR_PREFIX = +PERLMOD_MAKEVAR_PREFIX = #--------------------------------------------------------------------------- -# Configuration options related to the preprocessor +# Configuration options related to the preprocessor #--------------------------------------------------------------------------- -# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will -# evaluate all C-preprocessor directives found in the sources and include +# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will +# evaluate all C-preprocessor directives found in the sources and include # files. ENABLE_PREPROCESSING = YES -# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro -# names in the source code. If set to NO (the default) only conditional -# compilation will be performed. Macro expansion can be done in a controlled +# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro +# names in the source code. If set to NO (the default) only conditional +# compilation will be performed. Macro expansion can be done in a controlled # way by setting EXPAND_ONLY_PREDEF to YES. MACRO_EXPANSION = YES -# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES -# then the macro expansion is limited to the macros specified with the +# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES +# then the macro expansion is limited to the macros specified with the # PREDEFINED and EXPAND_AS_DEFINED tags. EXPAND_ONLY_PREDEF = YES -# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files +# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files # in the INCLUDE_PATH (see below) will be search if a #include is found. SEARCH_INCLUDES = YES -# The INCLUDE_PATH tag can be used to specify one or more directories that -# contain include files that are not input files but should be processed by +# The INCLUDE_PATH tag can be used to specify one or more directories that +# contain include files that are not input files but should be processed by # the preprocessor. -INCLUDE_PATH = +INCLUDE_PATH = -# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard -# patterns (like *.h and *.hpp) to filter out the header-files in the -# directories. If left blank, the patterns specified with FILE_PATTERNS will +# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard +# patterns (like *.h and *.hpp) to filter out the header-files in the +# directories. If left blank, the patterns specified with FILE_PATTERNS will # be used. -INCLUDE_FILE_PATTERNS = +INCLUDE_FILE_PATTERNS = -# The PREDEFINED tag can be used to specify one or more macro names that -# are defined before the preprocessor is started (similar to the -D option of -# gcc). The argument of the tag is a list of macros of the form: name -# or name=definition (no spaces). If the definition and the = are -# omitted =1 is assumed. To prevent a macro definition from being -# undefined via #undef or recursively expanded use the := operator +# The PREDEFINED tag can be used to specify one or more macro names that +# are defined before the preprocessor is started (similar to the -D option of +# gcc). The argument of the tag is a list of macros of the form: name +# or name=definition (no spaces). If the definition and the = are +# omitted =1 is assumed. To prevent a macro definition from being +# undefined via #undef or recursively expanded use the := operator # instead of the = operator. PREDEFINED = "SEACAS_HAVE_KOKKOS=1" -# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then -# this tag can be used to specify a list of macro names that should be expanded. -# The macro definition that is found in the sources will be used. +# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then +# this tag can be used to specify a list of macro names that should be expanded. +# The macro definition that is found in the sources will be used. # Use the PREDEFINED tag if you want to use a different macro definition. -EXPAND_AS_DEFINED = +EXPAND_AS_DEFINED = -# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then -# doxygen's preprocessor will remove all function-like macros that are alone -# on a line, have an all uppercase name, and do not end with a semicolon. Such -# function macros are typically used for boiler-plate code, and will confuse +# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then +# doxygen's preprocessor will remove all function-like macros that are alone +# on a line, have an all uppercase name, and do not end with a semicolon. Such +# function macros are typically used for boiler-plate code, and will confuse # the parser if not removed. SKIP_FUNCTION_MACROS = YES #--------------------------------------------------------------------------- -# Configuration::additions related to external references +# Configuration::additions related to external references #--------------------------------------------------------------------------- -# The TAGFILES option can be used to specify one or more tagfiles. -# Optionally an initial location of the external documentation -# can be added for each tagfile. The format of a tag file without -# this location is as follows: -# TAGFILES = file1 file2 ... -# Adding location for the tag files is done as follows: -# TAGFILES = file1=loc1 "file2 = loc2" ... -# where "loc1" and "loc2" can be relative or absolute paths or -# URLs. If a location is present for each tag, the installdox tool +# The TAGFILES option can be used to specify one or more tagfiles. +# Optionally an initial location of the external documentation +# can be added for each tagfile. The format of a tag file without +# this location is as follows: +# TAGFILES = file1 file2 ... +# Adding location for the tag files is done as follows: +# TAGFILES = file1=loc1 "file2 = loc2" ... +# where "loc1" and "loc2" can be relative or absolute paths or +# URLs. If a location is present for each tag, the installdox tool # does not have to be run to correct the links. # Note that each tag file must have a unique name # (where the name does NOT include the path) -# If a tag file is not located in the directory in which doxygen +# If a tag file is not located in the directory in which doxygen # is run, you must also specify the path to the tagfile here. -TAGFILES = +TAGFILES = -# When a file name is specified after GENERATE_TAGFILE, doxygen will create +# When a file name is specified after GENERATE_TAGFILE, doxygen will create # a tag file that is based on the input files it reads. GENERATE_TAGFILE = ioss.tags -# If the ALLEXTERNALS tag is set to YES all external classes will be listed -# in the class index. If set to NO only the inherited external classes +# If the ALLEXTERNALS tag is set to YES all external classes will be listed +# in the class index. If set to NO only the inherited external classes # will be listed. ALLEXTERNALS = NO -# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed -# in the modules index. If set to NO, only the current project's groups will +# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed +# in the modules index. If set to NO, only the current project's groups will # be listed. EXTERNAL_GROUPS = YES -# The PERL_PATH should be the absolute path and name of the perl script +# The PERL_PATH should be the absolute path and name of the perl script # interpreter (i.e. the result of `which perl'). PERL_PATH = /usr/bin/perl #--------------------------------------------------------------------------- -# Configuration options related to the dot tool +# Configuration options related to the dot tool #--------------------------------------------------------------------------- -# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will -# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base -# or super classes. Setting the tag to NO turns the diagrams off. Note that -# this option is superseded by the HAVE_DOT option below. This is only a -# fallback. It is recommended to install and use dot, since it yields more +# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will +# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base +# or super classes. Setting the tag to NO turns the diagrams off. Note that +# this option is superseded by the HAVE_DOT option below. This is only a +# fallback. It is recommended to install and use dot, since it yields more # powerful graphs. CLASS_DIAGRAMS = YES -# You can define message sequence charts within doxygen comments using the \msc -# command. Doxygen will then run the mscgen tool (see http://www.mcternan.me.uk/mscgen/) to -# produce the chart and insert it in the documentation. The MSCGEN_PATH tag allows you to -# specify the directory where the mscgen tool resides. If left empty the tool is assumed to +# You can define message sequence charts within doxygen comments using the \msc +# command. Doxygen will then run the mscgen tool (see http://www.mcternan.me.uk/mscgen/) to +# produce the chart and insert it in the documentation. The MSCGEN_PATH tag allows you to +# specify the directory where the mscgen tool resides. If left empty the tool is assumed to # be found in the default search path. -MSCGEN_PATH = +MSCGEN_PATH = -# If set to YES, the inheritance and collaboration graphs will hide -# inheritance and usage relations if the target is undocumented +# If set to YES, the inheritance and collaboration graphs will hide +# inheritance and usage relations if the target is undocumented # or is not a class. HIDE_UNDOC_RELATIONS = YES -# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is -# available from the path. This tool is part of Graphviz, a graph visualization -# toolkit from AT&T and Lucent Bell Labs. The other options in this section +# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is +# available from the path. This tool is part of Graphviz, a graph visualization +# toolkit from AT&T and Lucent Bell Labs. The other options in this section # have no effect if this option is set to NO (the default) HAVE_DOT = YES -# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen -# will generate a graph for each documented class showing the direct and -# indirect inheritance relations. Setting this tag to YES will force the +# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for each documented class showing the direct and +# indirect inheritance relations. Setting this tag to YES will force the # the CLASS_DIAGRAMS tag to NO. CLASS_GRAPH = YES -# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen -# will generate a graph for each documented class showing the direct and -# indirect implementation dependencies (inheritance, containment, and +# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for each documented class showing the direct and +# indirect implementation dependencies (inheritance, containment, and # class references variables) of the class with other documented classes. COLLABORATION_GRAPH = YES -# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen +# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen # will generate a graph for groups, showing the direct groups dependencies GROUP_GRAPHS = YES -# If the UML_LOOK tag is set to YES doxygen will generate inheritance and -# collaboration diagrams in a style similar to the OMG's Unified Modeling +# If the UML_LOOK tag is set to YES doxygen will generate inheritance and +# collaboration diagrams in a style similar to the OMG's Unified Modeling # Language. UML_LOOK = NO -# If set to YES, the inheritance and collaboration graphs will show the +# If set to YES, the inheritance and collaboration graphs will show the # relations between templates and their instances. TEMPLATE_RELATIONS = YES -# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT -# tags are set to YES then doxygen will generate a graph for each documented -# file showing the direct and indirect include dependencies of the file with +# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT +# tags are set to YES then doxygen will generate a graph for each documented +# file showing the direct and indirect include dependencies of the file with # other documented files. INCLUDE_GRAPH = YES -# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and -# HAVE_DOT tags are set to YES then doxygen will generate a graph for each -# documented header file showing the documented files that directly or +# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and +# HAVE_DOT tags are set to YES then doxygen will generate a graph for each +# documented header file showing the documented files that directly or # indirectly include this file. INCLUDED_BY_GRAPH = YES -# If the CALL_GRAPH, SOURCE_BROWSER and HAVE_DOT tags are set to YES then doxygen will -# generate a call dependency graph for every global function or class method. -# Note that enabling this option will significantly increase the time of a run. -# So in most cases it will be better to enable call graphs for selected +# If the CALL_GRAPH, SOURCE_BROWSER and HAVE_DOT tags are set to YES then doxygen will +# generate a call dependency graph for every global function or class method. +# Note that enabling this option will significantly increase the time of a run. +# So in most cases it will be better to enable call graphs for selected # functions only using the \callgraph command. CALL_GRAPH = NO -# If the CALLER_GRAPH, SOURCE_BROWSER and HAVE_DOT tags are set to YES then doxygen will -# generate a caller dependency graph for every global function or class method. -# Note that enabling this option will significantly increase the time of a run. -# So in most cases it will be better to enable caller graphs for selected +# If the CALLER_GRAPH, SOURCE_BROWSER and HAVE_DOT tags are set to YES then doxygen will +# generate a caller dependency graph for every global function or class method. +# Note that enabling this option will significantly increase the time of a run. +# So in most cases it will be better to enable caller graphs for selected # functions only using the \callergraph command. CALLER_GRAPH = NO -# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen +# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen # will graphical hierarchy of all classes instead of a textual one. GRAPHICAL_HIERARCHY = YES -# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES -# then doxygen will show the dependencies a directory has on other directories +# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES +# then doxygen will show the dependencies a directory has on other directories # in a graphical way. The dependency relations are determined by the #include # relations between the files in the directories. DIRECTORY_GRAPH = YES -# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images +# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images # generated by dot. Possible values are png, jpg, or gif # If left blank png will be used. DOT_IMAGE_FORMAT = png -# The tag DOT_PATH can be used to specify the path where the dot tool can be +# The tag DOT_PATH can be used to specify the path where the dot tool can be # found. If left blank, it is assumed the dot tool can be found in the path. DOT_PATH = /var/scratch2/bin -# The DOTFILE_DIRS tag can be used to specify one or more directories that -# contain dot files that are included in the documentation (see the +# The DOTFILE_DIRS tag can be used to specify one or more directories that +# contain dot files that are included in the documentation (see the # \dotfile command). -DOTFILE_DIRS = +DOTFILE_DIRS = -# The MAX_DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of -# nodes that will be shown in the graph. If the number of nodes in a graph -# becomes larger than this value, doxygen will truncate the graph, which is -# visualized by representing a node as a red box. Note that doxygen if the number -# of direct children of the root node in a graph is already larger than -# MAX_DOT_GRAPH_NOTES then the graph will not be shown at all. Also note +# The MAX_DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of +# nodes that will be shown in the graph. If the number of nodes in a graph +# becomes larger than this value, doxygen will truncate the graph, which is +# visualized by representing a node as a red box. Note that doxygen if the number +# of direct children of the root node in a graph is already larger than +# MAX_DOT_GRAPH_NOTES then the graph will not be shown at all. Also note # that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH. DOT_GRAPH_MAX_NODES = 50 -# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the -# graphs generated by dot. A depth value of 3 means that only nodes reachable -# from the root by following a path via at most 3 edges will be shown. Nodes -# that lay further from the root node will be omitted. Note that setting this -# option to 1 or 2 may greatly reduce the computation time needed for large -# code bases. Also note that the size of a graph can be further restricted by +# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the +# graphs generated by dot. A depth value of 3 means that only nodes reachable +# from the root by following a path via at most 3 edges will be shown. Nodes +# that lay further from the root node will be omitted. Note that setting this +# option to 1 or 2 may greatly reduce the computation time needed for large +# code bases. Also note that the size of a graph can be further restricted by # DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction. MAX_DOT_GRAPH_DEPTH = 3 -# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent -# background. This is disabled by default, which results in a white background. -# Warning: Depending on the platform used, enabling this option may lead to -# badly anti-aliased labels on the edges of a graph (i.e. they become hard to +# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent +# background. This is disabled by default, which results in a white background. +# Warning: Depending on the platform used, enabling this option may lead to +# badly anti-aliased labels on the edges of a graph (i.e. they become hard to # read). DOT_TRANSPARENT = NO -# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output -# files in one run (i.e. multiple -o and -T options on the command line). This -# makes dot run faster, but since only newer versions of dot (>1.8.10) +# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output +# files in one run (i.e. multiple -o and -T options on the command line). This +# makes dot run faster, but since only newer versions of dot (>1.8.10) # support this, this feature is disabled by default. DOT_MULTI_TARGETS = YES -# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will -# generate a legend page explaining the meaning of the various boxes and +# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will +# generate a legend page explaining the meaning of the various boxes and # arrows in the dot generated graphs. GENERATE_LEGEND = YES -# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will -# remove the intermediate dot files that are used to generate +# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will +# remove the intermediate dot files that are used to generate # the various graphs. DOT_CLEANUP = YES #--------------------------------------------------------------------------- -# Configuration::additions related to the search engine +# Configuration::additions related to the search engine #--------------------------------------------------------------------------- -# The SEARCHENGINE tag specifies whether or not a search engine should be +# The SEARCHENGINE tag specifies whether or not a search engine should be # used. If set to NO the values of all tags below this one will be ignored. SEARCHENGINE = YES diff --git a/packages/seacas/libraries/ioss/scripts/README b/packages/seacas/libraries/ioss/scripts/README index 93bd84fb605f..2387cd0d762b 100644 --- a/packages/seacas/libraries/ioss/scripts/README +++ b/packages/seacas/libraries/ioss/scripts/README @@ -6,7 +6,7 @@ not require any other Sierra Framework code. This code includes database readers/writers for the exodusII and cgns database formats. There is also a unit test code which can function -as a translator. +as a translator. To compile the code, move the Makefile in io_system/scripts to the top-level directory and then modify any paths that are required. Then @@ -27,7 +27,7 @@ libraries. 1. The io_system/src/main/Main_io_shell.C file can serve as minimal documentation of how to use the Sierra IO system and also the -conventions used in the Sierra IO system. +conventions used in the Sierra IO system. 2. There is also some documentation in the io_system/documents directory. Typing "make" in that directory should build the diff --git a/packages/seacas/libraries/ioss/scripts/ioss.cfg b/packages/seacas/libraries/ioss/scripts/ioss.cfg index 9ad661b0d876..8a16ea797a57 100644 --- a/packages/seacas/libraries/ioss/scripts/ioss.cfg +++ b/packages/seacas/libraries/ioss/scripts/ioss.cfg @@ -14,198 +14,198 @@ # Project related configuration options #--------------------------------------------------------------------------- -# This tag specifies the encoding used for all characters in the config file that -# follow. The default is UTF-8 which is also the encoding used for all text before -# the first occurrence of this tag. Doxygen uses libiconv (or the iconv built into -# libc) for the transcoding. See http://www.gnu.org/software/libiconv for the list of +# This tag specifies the encoding used for all characters in the config file that +# follow. The default is UTF-8 which is also the encoding used for all text before +# the first occurrence of this tag. Doxygen uses libiconv (or the iconv built into +# libc) for the transcoding. See http://www.gnu.org/software/libiconv for the list of # possible encodings. DOXYFILE_ENCODING = UTF-8 -# The PROJECT_NAME tag is a single word (or a sequence of words surrounded +# The PROJECT_NAME tag is a single word (or a sequence of words surrounded # by quotes) that should identify the project. PROJECT_NAME = "Sierra IO Subsystem " -# The PROJECT_NUMBER tag can be used to enter a project or revision number. -# This could be handy for archiving the generated documentation or +# The PROJECT_NUMBER tag can be used to enter a project or revision number. +# This could be handy for archiving the generated documentation or # if some version control system is used. PROJECT_NUMBER = votd -# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) -# base path where the generated documentation will be put. -# If a relative path is entered, it will be relative to the location +# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) +# base path where the generated documentation will be put. +# If a relative path is entered, it will be relative to the location # where doxygen was started. If left blank the current directory will be used. -OUTPUT_DIRECTORY = +OUTPUT_DIRECTORY = -# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create -# 4096 sub-directories (in 2 levels) under the output directory of each output -# format and will distribute the generated files over these directories. -# Enabling this option can be useful when feeding doxygen a huge amount of -# source files, where putting all generated files in the same directory would +# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create +# 4096 sub-directories (in 2 levels) under the output directory of each output +# format and will distribute the generated files over these directories. +# Enabling this option can be useful when feeding doxygen a huge amount of +# source files, where putting all generated files in the same directory would # otherwise cause performance problems for the file system. CREATE_SUBDIRS = YES -# The OUTPUT_LANGUAGE tag is used to specify the language in which all -# documentation generated by doxygen is written. Doxygen will use this -# information to generate all constant output in the proper language. -# The default language is English, other supported languages are: -# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, -# Croatian, Czech, Danish, Dutch, Finnish, French, German, Greek, Hungarian, -# Italian, Japanese, Japanese-en (Japanese with English messages), Korean, -# Korean-en, Lithuanian, Norwegian, Polish, Portuguese, Romanian, Russian, +# The OUTPUT_LANGUAGE tag is used to specify the language in which all +# documentation generated by doxygen is written. Doxygen will use this +# information to generate all constant output in the proper language. +# The default language is English, other supported languages are: +# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, +# Croatian, Czech, Danish, Dutch, Finnish, French, German, Greek, Hungarian, +# Italian, Japanese, Japanese-en (Japanese with English messages), Korean, +# Korean-en, Lithuanian, Norwegian, Polish, Portuguese, Romanian, Russian, # Serbian, Slovak, Slovene, Spanish, Swedish, and Ukrainian. OUTPUT_LANGUAGE = English -# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will -# include brief member descriptions after the members that are listed in -# the file and class documentation (similar to JavaDoc). +# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will +# include brief member descriptions after the members that are listed in +# the file and class documentation (similar to JavaDoc). # Set to NO to disable this. BRIEF_MEMBER_DESC = YES -# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend -# the brief description of a member or function before the detailed description. -# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the +# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend +# the brief description of a member or function before the detailed description. +# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the # brief descriptions will be completely suppressed. REPEAT_BRIEF = YES -# This tag implements a quasi-intelligent brief description abbreviator -# that is used to form the text in various listings. Each string -# in this list, if found as the leading text of the brief description, will be -# stripped from the text and the result after processing the whole list, is -# used as the annotated text. Otherwise, the brief description is used as-is. -# If left blank, the following values are used ("$name" is automatically -# replaced with the name of the entity): "The $name class" "The $name widget" -# "The $name file" "is" "provides" "specifies" "contains" +# This tag implements a quasi-intelligent brief description abbreviator +# that is used to form the text in various listings. Each string +# in this list, if found as the leading text of the brief description, will be +# stripped from the text and the result after processing the whole list, is +# used as the annotated text. Otherwise, the brief description is used as-is. +# If left blank, the following values are used ("$name" is automatically +# replaced with the name of the entity): "The $name class" "The $name widget" +# "The $name file" "is" "provides" "specifies" "contains" # "represents" "a" "an" "the" -ABBREVIATE_BRIEF = +ABBREVIATE_BRIEF = -# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then -# Doxygen will generate a detailed section even if there is only a brief +# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then +# Doxygen will generate a detailed section even if there is only a brief # description. ALWAYS_DETAILED_SEC = NO -# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all -# inherited members of a class in the documentation of that class as if those -# members were ordinary class members. Constructors, destructors and assignment +# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all +# inherited members of a class in the documentation of that class as if those +# members were ordinary class members. Constructors, destructors and assignment # operators of the base classes will not be shown. INLINE_INHERITED_MEMB = NO -# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full -# path before files name in the file list and in the header files. If set +# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full +# path before files name in the file list and in the header files. If set # to NO the shortest path that makes the file name unique will be used. FULL_PATH_NAMES = NO -# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag -# can be used to strip a user-defined part of the path. Stripping is -# only done if one of the specified strings matches the left-hand part of -# the path. The tag can be used to show relative paths in the file list. -# If left blank the directory from which doxygen is run is used as the +# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag +# can be used to strip a user-defined part of the path. Stripping is +# only done if one of the specified strings matches the left-hand part of +# the path. The tag can be used to show relative paths in the file list. +# If left blank the directory from which doxygen is run is used as the # path to strip. -STRIP_FROM_PATH = +STRIP_FROM_PATH = -# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of -# the path mentioned in the documentation of a class, which tells -# the reader which header file to include in order to use a class. -# If left blank only the name of the header file containing the class -# definition is used. Otherwise one should specify the include paths that +# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of +# the path mentioned in the documentation of a class, which tells +# the reader which header file to include in order to use a class. +# If left blank only the name of the header file containing the class +# definition is used. Otherwise one should specify the include paths that # are normally passed to the compiler using the -I flag. -STRIP_FROM_INC_PATH = +STRIP_FROM_INC_PATH = -# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter -# (but less readable) file names. This can be useful is your file systems +# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter +# (but less readable) file names. This can be useful is your file systems # doesn't support long names like on DOS, Mac, or CD-ROM. SHORT_NAMES = NO -# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen -# will interpret the first line (until the first dot) of a JavaDoc-style -# comment as the brief description. If set to NO, the JavaDoc -# comments will behave just like regular Qt-style comments +# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen +# will interpret the first line (until the first dot) of a JavaDoc-style +# comment as the brief description. If set to NO, the JavaDoc +# comments will behave just like regular Qt-style comments # (thus requiring an explicit @brief command for a brief description.) JAVADOC_AUTOBRIEF = NO -# If the QT_AUTOBRIEF tag is set to YES then Doxygen will -# interpret the first line (until the first dot) of a Qt-style -# comment as the brief description. If set to NO, the comments -# will behave just like regular Qt-style comments (thus requiring +# If the QT_AUTOBRIEF tag is set to YES then Doxygen will +# interpret the first line (until the first dot) of a Qt-style +# comment as the brief description. If set to NO, the comments +# will behave just like regular Qt-style comments (thus requiring # an explicit \brief command for a brief description.) QT_AUTOBRIEF = NO -# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen -# treat a multi-line C++ special comment block (i.e. a block of //! or /// -# comments) as a brief description. This used to be the default behaviour. -# The new default is to treat a multi-line C++ comment block as a detailed +# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen +# treat a multi-line C++ special comment block (i.e. a block of //! or /// +# comments) as a brief description. This used to be the default behaviour. +# The new default is to treat a multi-line C++ comment block as a detailed # description. Set this tag to YES if you prefer the old behaviour instead. MULTILINE_CPP_IS_BRIEF = NO -# If the DETAILS_AT_TOP tag is set to YES then Doxygen +# If the DETAILS_AT_TOP tag is set to YES then Doxygen # will output the detailed description near the top, like JavaDoc. -# If set to NO, the detailed description appears after the member +# If set to NO, the detailed description appears after the member # documentation. DETAILS_AT_TOP = NO -# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented -# member inherits the documentation from any documented member that it +# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented +# member inherits the documentation from any documented member that it # re-implements. INHERIT_DOCS = YES -# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce -# a new page for each member. If set to NO, the documentation of a member will +# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce +# a new page for each member. If set to NO, the documentation of a member will # be part of the file/class/namespace that contains it. SEPARATE_MEMBER_PAGES = NO -# The TAB_SIZE tag can be used to set the number of spaces in a tab. +# The TAB_SIZE tag can be used to set the number of spaces in a tab. # Doxygen uses this value to replace tabs by spaces in code fragments. TAB_SIZE = 8 -# This tag can be used to specify a number of aliases that acts -# as commands in the documentation. An alias has the form "name=value". -# For example adding "sideeffect=\par Side Effects:\n" will allow you to -# put the command \sideeffect (or @sideeffect) in the documentation, which -# will result in a user-defined paragraph with heading "Side Effects:". +# This tag can be used to specify a number of aliases that acts +# as commands in the documentation. An alias has the form "name=value". +# For example adding "sideeffect=\par Side Effects:\n" will allow you to +# put the command \sideeffect (or @sideeffect) in the documentation, which +# will result in a user-defined paragraph with heading "Side Effects:". # You can put \n's in the value part of an alias to insert newlines. -ALIASES = +ALIASES = -# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C -# sources only. Doxygen will then generate output that is more tailored for C. -# For instance, some of the names that are used will be different. The list +# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C +# sources only. Doxygen will then generate output that is more tailored for C. +# For instance, some of the names that are used will be different. The list # of all members will be omitted, etc. OPTIMIZE_OUTPUT_FOR_C = NO -# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java -# sources only. Doxygen will then generate output that is more tailored for Java. -# For instance, namespaces will be presented as packages, qualified scopes +# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java +# sources only. Doxygen will then generate output that is more tailored for Java. +# For instance, namespaces will be presented as packages, qualified scopes # will look different, etc. OPTIMIZE_OUTPUT_JAVA = NO -# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want to -# include (a tag file for) the STL sources as input, then you should -# set this tag to YES in order to let doxygen match functions declarations and -# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. -# func(std::string) {}). This also make the inheritance and collaboration +# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want to +# include (a tag file for) the STL sources as input, then you should +# set this tag to YES in order to let doxygen match functions declarations and +# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. +# func(std::string) {}). This also make the inheritance and collaboration # diagrams that involve STL classes more complete and accurate. BUILTIN_STL_SUPPORT = YES @@ -215,17 +215,17 @@ BUILTIN_STL_SUPPORT = YES CPP_CLI_SUPPORT = NO -# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC -# tag is set to YES, then doxygen will reuse the documentation of the first -# member in the group (if any) for the other members of the group. By default +# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC +# tag is set to YES, then doxygen will reuse the documentation of the first +# member in the group (if any) for the other members of the group. By default # all members of a group must be documented explicitly. DISTRIBUTE_GROUP_DOC = NO -# Set the SUBGROUPING tag to YES (the default) to allow class member groups of -# the same type (for instance a group of public functions) to be put as a -# subgroup of that type (e.g. under the Public Functions section). Set it to -# NO to prevent subgrouping. Alternatively, this can be done per class using +# Set the SUBGROUPING tag to YES (the default) to allow class member groups of +# the same type (for instance a group of public functions) to be put as a +# subgroup of that type (e.g. under the Public Functions section). Set it to +# NO to prevent subgrouping. Alternatively, this can be done per class using # the \nosubgrouping command. SUBGROUPING = YES @@ -234,236 +234,236 @@ SUBGROUPING = YES # Build related configuration options #--------------------------------------------------------------------------- -# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in -# documentation are documented, even if no documentation was available. -# Private class members and static file members will be hidden unless +# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in +# documentation are documented, even if no documentation was available. +# Private class members and static file members will be hidden unless # the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES EXTRACT_ALL = YES -# If the EXTRACT_PRIVATE tag is set to YES all private members of a class +# If the EXTRACT_PRIVATE tag is set to YES all private members of a class # will be included in the documentation. EXTRACT_PRIVATE = YES -# If the EXTRACT_STATIC tag is set to YES all static members of a file +# If the EXTRACT_STATIC tag is set to YES all static members of a file # will be included in the documentation. EXTRACT_STATIC = NO -# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) -# defined locally in source files will be included in the documentation. +# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) +# defined locally in source files will be included in the documentation. # If set to NO only classes defined in header files are included. EXTRACT_LOCAL_CLASSES = YES -# This flag is only useful for Objective-C code. When set to YES local -# methods, which are defined in the implementation section but not in -# the interface are included in the documentation. +# This flag is only useful for Objective-C code. When set to YES local +# methods, which are defined in the implementation section but not in +# the interface are included in the documentation. # If set to NO (the default) only methods in the interface are included. EXTRACT_LOCAL_METHODS = NO -# If this flag is set to YES, the members of anonymous namespaces will be extracted -# and appear in the documentation as a namespace called 'anonymous_namespace{file}', -# where file will be replaced with the base name of the file that contains the anonymous +# If this flag is set to YES, the members of anonymous namespaces will be extracted +# and appear in the documentation as a namespace called 'anonymous_namespace{file}', +# where file will be replaced with the base name of the file that contains the anonymous # namespace. By default anonymous namespace are hidden. EXTRACT_ANON_NSPACES = NO -# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all -# undocumented members of documented classes, files or namespaces. -# If set to NO (the default) these members will be included in the -# various overviews, but no documentation section is generated. +# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all +# undocumented members of documented classes, files or namespaces. +# If set to NO (the default) these members will be included in the +# various overviews, but no documentation section is generated. # This option has no effect if EXTRACT_ALL is enabled. HIDE_UNDOC_MEMBERS = NO -# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all -# undocumented classes that are normally visible in the class hierarchy. -# If set to NO (the default) these classes will be included in the various +# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all +# undocumented classes that are normally visible in the class hierarchy. +# If set to NO (the default) these classes will be included in the various # overviews. This option has no effect if EXTRACT_ALL is enabled. HIDE_UNDOC_CLASSES = NO -# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all -# friend (class|struct|union) declarations. -# If set to NO (the default) these declarations will be included in the +# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all +# friend (class|struct|union) declarations. +# If set to NO (the default) these declarations will be included in the # documentation. HIDE_FRIEND_COMPOUNDS = NO -# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any -# documentation blocks found inside the body of a function. -# If set to NO (the default) these blocks will be appended to the +# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any +# documentation blocks found inside the body of a function. +# If set to NO (the default) these blocks will be appended to the # function's detailed documentation block. HIDE_IN_BODY_DOCS = NO -# The INTERNAL_DOCS tag determines if documentation -# that is typed after a \internal command is included. If the tag is set -# to NO (the default) then the documentation will be excluded. +# The INTERNAL_DOCS tag determines if documentation +# that is typed after a \internal command is included. If the tag is set +# to NO (the default) then the documentation will be excluded. # Set it to YES to include the internal documentation. INTERNAL_DOCS = YES -# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate -# file names in lower-case letters. If set to YES upper-case letters are also -# allowed. This is useful if you have classes or files whose names only differ -# in case and if your file system supports case sensitive file names. Windows +# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate +# file names in lower-case letters. If set to YES upper-case letters are also +# allowed. This is useful if you have classes or files whose names only differ +# in case and if your file system supports case sensitive file names. Windows # and Mac users are advised to set this option to NO. CASE_SENSE_NAMES = YES -# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen -# will show members with their full class and namespace scopes in the +# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen +# will show members with their full class and namespace scopes in the # documentation. If set to YES the scope will be hidden. HIDE_SCOPE_NAMES = NO -# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen -# will put a list of the files that are included by a file in the documentation +# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen +# will put a list of the files that are included by a file in the documentation # of that file. SHOW_INCLUDE_FILES = YES -# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] +# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] # is inserted in the documentation for inline members. INLINE_INFO = YES -# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen -# will sort the (detailed) documentation of file and class members -# alphabetically by member name. If set to NO the members will appear in +# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen +# will sort the (detailed) documentation of file and class members +# alphabetically by member name. If set to NO the members will appear in # declaration order. SORT_MEMBER_DOCS = YES -# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the -# brief documentation of file, namespace and class members alphabetically -# by member name. If set to NO (the default) the members will appear in +# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the +# brief documentation of file, namespace and class members alphabetically +# by member name. If set to NO (the default) the members will appear in # declaration order. SORT_BRIEF_DOCS = NO -# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be -# sorted by fully-qualified names, including namespaces. If set to -# NO (the default), the class list will be sorted only by class name, -# not including the namespace part. +# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be +# sorted by fully-qualified names, including namespaces. If set to +# NO (the default), the class list will be sorted only by class name, +# not including the namespace part. # Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. -# Note: This option applies only to the class list, not to the +# Note: This option applies only to the class list, not to the # alphabetical list. SORT_BY_SCOPE_NAME = YES -# The GENERATE_TODOLIST tag can be used to enable (YES) or -# disable (NO) the todo list. This list is created by putting \todo +# The GENERATE_TODOLIST tag can be used to enable (YES) or +# disable (NO) the todo list. This list is created by putting \todo # commands in the documentation. GENERATE_TODOLIST = YES -# The GENERATE_TESTLIST tag can be used to enable (YES) or -# disable (NO) the test list. This list is created by putting \test +# The GENERATE_TESTLIST tag can be used to enable (YES) or +# disable (NO) the test list. This list is created by putting \test # commands in the documentation. GENERATE_TESTLIST = YES -# The GENERATE_BUGLIST tag can be used to enable (YES) or -# disable (NO) the bug list. This list is created by putting \bug +# The GENERATE_BUGLIST tag can be used to enable (YES) or +# disable (NO) the bug list. This list is created by putting \bug # commands in the documentation. GENERATE_BUGLIST = YES -# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or -# disable (NO) the deprecated list. This list is created by putting +# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or +# disable (NO) the deprecated list. This list is created by putting # \deprecated commands in the documentation. GENERATE_DEPRECATEDLIST= YES -# The ENABLED_SECTIONS tag can be used to enable conditional +# The ENABLED_SECTIONS tag can be used to enable conditional # documentation sections, marked by \if sectionname ... \endif. -ENABLED_SECTIONS = +ENABLED_SECTIONS = -# The MAX_INITIALIZER_LINES tag determines the maximum number of lines -# the initial value of a variable or define consists of for it to appear in -# the documentation. If the initializer consists of more lines than specified -# here it will be hidden. Use a value of 0 to hide initializers completely. -# The appearance of the initializer of individual variables and defines in the -# documentation can be controlled using \showinitializer or \hideinitializer +# The MAX_INITIALIZER_LINES tag determines the maximum number of lines +# the initial value of a variable or define consists of for it to appear in +# the documentation. If the initializer consists of more lines than specified +# here it will be hidden. Use a value of 0 to hide initializers completely. +# The appearance of the initializer of individual variables and defines in the +# documentation can be controlled using \showinitializer or \hideinitializer # command in the documentation regardless of this setting. MAX_INITIALIZER_LINES = 30 -# Set the SHOW_USED_FILES tag to NO to disable the list of files generated -# at the bottom of the documentation of classes and structs. If set to YES the +# Set the SHOW_USED_FILES tag to NO to disable the list of files generated +# at the bottom of the documentation of classes and structs. If set to YES the # list will mention the files that were used to generate the documentation. SHOW_USED_FILES = YES -# If the sources in your project are distributed over multiple directories -# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy +# If the sources in your project are distributed over multiple directories +# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy # in the documentation. The default is NO. SHOW_DIRECTORIES = YES -# The FILE_VERSION_FILTER tag can be used to specify a program or script that -# doxygen should invoke to get the current version for each file (typically from the -# version control system). Doxygen will invoke the program by executing (via -# popen()) the command , where is the value of -# the FILE_VERSION_FILTER tag, and is the name of an input file -# provided by doxygen. Whatever the program writes to standard output +# The FILE_VERSION_FILTER tag can be used to specify a program or script that +# doxygen should invoke to get the current version for each file (typically from the +# version control system). Doxygen will invoke the program by executing (via +# popen()) the command , where is the value of +# the FILE_VERSION_FILTER tag, and is the name of an input file +# provided by doxygen. Whatever the program writes to standard output # is used as the file version. See the manual for examples. -FILE_VERSION_FILTER = +FILE_VERSION_FILTER = #--------------------------------------------------------------------------- # configuration options related to warning and progress messages #--------------------------------------------------------------------------- -# The QUIET tag can be used to turn on/off the messages that are generated +# The QUIET tag can be used to turn on/off the messages that are generated # by doxygen. Possible values are YES and NO. If left blank NO is used. QUIET = NO -# The WARNINGS tag can be used to turn on/off the warning messages that are -# generated by doxygen. Possible values are YES and NO. If left blank +# The WARNINGS tag can be used to turn on/off the warning messages that are +# generated by doxygen. Possible values are YES and NO. If left blank # NO is used. WARNINGS = YES -# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings -# for undocumented members. If EXTRACT_ALL is set to YES then this flag will +# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings +# for undocumented members. If EXTRACT_ALL is set to YES then this flag will # automatically be disabled. WARN_IF_UNDOCUMENTED = YES -# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for -# potential errors in the documentation, such as not documenting some -# parameters in a documented function, or documenting parameters that +# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for +# potential errors in the documentation, such as not documenting some +# parameters in a documented function, or documenting parameters that # don't exist or using markup commands wrongly. WARN_IF_DOC_ERROR = YES -# This WARN_NO_PARAMDOC option can be abled to get warnings for -# functions that are documented, but have no documentation for their parameters -# or return value. If set to NO (the default) doxygen will only warn about -# wrong or incomplete parameter documentation, but not about the absence of +# This WARN_NO_PARAMDOC option can be abled to get warnings for +# functions that are documented, but have no documentation for their parameters +# or return value. If set to NO (the default) doxygen will only warn about +# wrong or incomplete parameter documentation, but not about the absence of # documentation. WARN_NO_PARAMDOC = NO -# The WARN_FORMAT tag determines the format of the warning messages that -# doxygen can produce. The string should contain the $file, $line, and $text -# tags, which will be replaced by the file and line number from which the -# warning originated and the warning text. Optionally the format may contain -# $version, which will be replaced by the version of the file (if it could +# The WARN_FORMAT tag determines the format of the warning messages that +# doxygen can produce. The string should contain the $file, $line, and $text +# tags, which will be replaced by the file and line number from which the +# warning originated and the warning text. Optionally the format may contain +# $version, which will be replaced by the version of the file (if it could # be obtained via FILE_VERSION_FILTER) WARN_FORMAT = "$file:$line: $text " -# The WARN_LOGFILE tag can be used to specify a file to which warning -# and error messages should be written. If left blank the output is written +# The WARN_LOGFILE tag can be used to specify a file to which warning +# and error messages should be written. If left blank the output is written # to stderr. WARN_LOGFILE = ioss.doxygen.warn @@ -472,111 +472,111 @@ WARN_LOGFILE = ioss.doxygen.warn # configuration options related to the input files #--------------------------------------------------------------------------- -# The INPUT tag can be used to specify the files and/or directories that contain -# documented source files. You may enter file names like "myfile.cpp" or -# directories like "/usr/src/myproject". Separate the files or directories +# The INPUT tag can be used to specify the files and/or directories that contain +# documented source files. You may enter file names like "myfile.cpp" or +# directories like "/usr/src/myproject". Separate the files or directories # with spaces. INPUT = io_system/include \ io_system/src -# This tag can be used to specify the character encoding of the source files that -# doxygen parses. Internally doxygen uses the UTF-8 encoding, which is also the default -# input encoding. Doxygen uses libiconv (or the iconv built into libc) for the transcoding. +# This tag can be used to specify the character encoding of the source files that +# doxygen parses. Internally doxygen uses the UTF-8 encoding, which is also the default +# input encoding. Doxygen uses libiconv (or the iconv built into libc) for the transcoding. # See http://www.gnu.org/software/libiconv for the list of possible encodings. INPUT_ENCODING = UTF-8 -# If the value of the INPUT tag contains directories, you can use the -# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp -# and *.h) to filter out the source-files in the directories. If left -# blank the following patterns are tested: -# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx +# If the value of the INPUT tag contains directories, you can use the +# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp +# and *.h) to filter out the source-files in the directories. If left +# blank the following patterns are tested: +# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx # *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py FILE_PATTERNS = *.C \ *.h -# The RECURSIVE tag can be used to turn specify whether or not subdirectories -# should be searched for input files as well. Possible values are YES and NO. +# The RECURSIVE tag can be used to turn specify whether or not subdirectories +# should be searched for input files as well. Possible values are YES and NO. # If left blank NO is used. RECURSIVE = YES -# The EXCLUDE tag can be used to specify files and/or directories that should -# excluded from the INPUT source files. This way you can easily exclude a +# The EXCLUDE tag can be used to specify files and/or directories that should +# excluded from the INPUT source files. This way you can easily exclude a # subdirectory from a directory tree whose root is specified with the INPUT tag. -EXCLUDE = +EXCLUDE = -# The EXCLUDE_SYMLINKS tag can be used select whether or not files or -# directories that are symbolic links (a Unix filesystem feature) are excluded +# The EXCLUDE_SYMLINKS tag can be used select whether or not files or +# directories that are symbolic links (a Unix filesystem feature) are excluded # from the input. EXCLUDE_SYMLINKS = NO -# If the value of the INPUT tag contains directories, you can use the -# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude -# certain files from those directories. Note that the wildcards are matched -# against the file with absolute path, so to exclude all test directories +# If the value of the INPUT tag contains directories, you can use the +# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude +# certain files from those directories. Note that the wildcards are matched +# against the file with absolute path, so to exclude all test directories # for example use the pattern */test/* -EXCLUDE_PATTERNS = +EXCLUDE_PATTERNS = -# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names -# (namespaces, classes, functions, etc.) that should be excluded from the output. -# The symbol name can be a fully qualified name, a word, or if the wildcard * is used, +# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names +# (namespaces, classes, functions, etc.) that should be excluded from the output. +# The symbol name can be a fully qualified name, a word, or if the wildcard * is used, # a substring. Examples: ANamespace, AClass, AClass::ANamespace, ANamespace::*Test -EXCLUDE_SYMBOLS = +EXCLUDE_SYMBOLS = -# The EXAMPLE_PATH tag can be used to specify one or more files or -# directories that contain example code fragments that are included (see +# The EXAMPLE_PATH tag can be used to specify one or more files or +# directories that contain example code fragments that are included (see # the \include command). -EXAMPLE_PATH = +EXAMPLE_PATH = -# If the value of the EXAMPLE_PATH tag contains directories, you can use the -# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp -# and *.h) to filter out the source-files in the directories. If left +# If the value of the EXAMPLE_PATH tag contains directories, you can use the +# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp +# and *.h) to filter out the source-files in the directories. If left # blank all files are included. -EXAMPLE_PATTERNS = +EXAMPLE_PATTERNS = -# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be -# searched for input files to be used with the \include or \dontinclude -# commands irrespective of the value of the RECURSIVE tag. +# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be +# searched for input files to be used with the \include or \dontinclude +# commands irrespective of the value of the RECURSIVE tag. # Possible values are YES and NO. If left blank NO is used. EXAMPLE_RECURSIVE = NO -# The IMAGE_PATH tag can be used to specify one or more files or -# directories that contain image that are included in the documentation (see +# The IMAGE_PATH tag can be used to specify one or more files or +# directories that contain image that are included in the documentation (see # the \image command). -IMAGE_PATH = +IMAGE_PATH = -# The INPUT_FILTER tag can be used to specify a program that doxygen should -# invoke to filter for each input file. Doxygen will invoke the filter program -# by executing (via popen()) the command , where -# is the value of the INPUT_FILTER tag, and is the name of an -# input file. Doxygen will then use the output that the filter program writes -# to standard output. If FILTER_PATTERNS is specified, this tag will be +# The INPUT_FILTER tag can be used to specify a program that doxygen should +# invoke to filter for each input file. Doxygen will invoke the filter program +# by executing (via popen()) the command , where +# is the value of the INPUT_FILTER tag, and is the name of an +# input file. Doxygen will then use the output that the filter program writes +# to standard output. If FILTER_PATTERNS is specified, this tag will be # ignored. -INPUT_FILTER = +INPUT_FILTER = -# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern -# basis. Doxygen will compare the file name with each pattern and apply the -# filter if there is a match. The filters are a list of the form: -# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further -# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER +# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern +# basis. Doxygen will compare the file name with each pattern and apply the +# filter if there is a match. The filters are a list of the form: +# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further +# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER # is applied to all files. -FILTER_PATTERNS = +FILTER_PATTERNS = -# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using -# INPUT_FILTER) will be used to filter the input files when producing source +# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using +# INPUT_FILTER) will be used to filter the input files when producing source # files to browse (i.e. when SOURCE_BROWSER is set to YES). FILTER_SOURCE_FILES = NO @@ -585,34 +585,34 @@ FILTER_SOURCE_FILES = NO # configuration options related to source browsing #--------------------------------------------------------------------------- -# If the SOURCE_BROWSER tag is set to YES then a list of source files will -# be generated. Documented entities will be cross-referenced with these sources. -# Note: To get rid of all source code in the generated output, make sure also -# VERBATIM_HEADERS is set to NO. If you have enabled CALL_GRAPH or CALLER_GRAPH -# then you must also enable this option. If you don't then doxygen will produce +# If the SOURCE_BROWSER tag is set to YES then a list of source files will +# be generated. Documented entities will be cross-referenced with these sources. +# Note: To get rid of all source code in the generated output, make sure also +# VERBATIM_HEADERS is set to NO. If you have enabled CALL_GRAPH or CALLER_GRAPH +# then you must also enable this option. If you don't then doxygen will produce # a warning and turn it on anyway SOURCE_BROWSER = YES -# Setting the INLINE_SOURCES tag to YES will include the body +# Setting the INLINE_SOURCES tag to YES will include the body # of functions and classes directly in the documentation. INLINE_SOURCES = NO -# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct -# doxygen to hide any special comment blocks from generated source code +# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct +# doxygen to hide any special comment blocks from generated source code # fragments. Normal C and C++ comments will always remain visible. STRIP_CODE_COMMENTS = NO -# If the REFERENCED_BY_RELATION tag is set to YES (the default) -# then for each documented function all documented +# If the REFERENCED_BY_RELATION tag is set to YES (the default) +# then for each documented function all documented # functions referencing it will be listed. REFERENCED_BY_RELATION = YES -# If the REFERENCES_RELATION tag is set to YES (the default) -# then for each documented function all documented entities +# If the REFERENCES_RELATION tag is set to YES (the default) +# then for each documented function all documented entities # called/used by that function will be listed. REFERENCES_RELATION = YES @@ -624,16 +624,16 @@ REFERENCES_RELATION = YES REFERENCES_LINK_SOURCE = YES -# If the USE_HTAGS tag is set to YES then the references to source code -# will point to the HTML generated by the htags(1) tool instead of doxygen -# built-in source browser. The htags tool is part of GNU's global source -# tagging system (see http://www.gnu.org/software/global/global.html). You +# If the USE_HTAGS tag is set to YES then the references to source code +# will point to the HTML generated by the htags(1) tool instead of doxygen +# built-in source browser. The htags tool is part of GNU's global source +# tagging system (see http://www.gnu.org/software/global/global.html). You # will need version 4.8.6 or higher. USE_HTAGS = NO -# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen -# will generate a verbatim copy of the header file for each class for +# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen +# will generate a verbatim copy of the header file for each class for # which an include is specified. Set to NO to disable this. VERBATIM_HEADERS = YES @@ -642,141 +642,141 @@ VERBATIM_HEADERS = YES # configuration options related to the alphabetical class index #--------------------------------------------------------------------------- -# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index -# of all compounds will be generated. Enable this if the project +# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index +# of all compounds will be generated. Enable this if the project # contains a lot of classes, structs, unions or interfaces. ALPHABETICAL_INDEX = YES -# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then -# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns +# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then +# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns # in which this list will be split (can be a number in the range [1..20]) COLS_IN_ALPHA_INDEX = 3 -# In case all classes in a project start with a common prefix, all -# classes will be put under the same header in the alphabetical index. -# The IGNORE_PREFIX tag can be used to specify one or more prefixes that +# In case all classes in a project start with a common prefix, all +# classes will be put under the same header in the alphabetical index. +# The IGNORE_PREFIX tag can be used to specify one or more prefixes that # should be ignored while generating the index headers. -IGNORE_PREFIX = +IGNORE_PREFIX = #--------------------------------------------------------------------------- # configuration options related to the HTML output #--------------------------------------------------------------------------- -# If the GENERATE_HTML tag is set to YES (the default) Doxygen will +# If the GENERATE_HTML tag is set to YES (the default) Doxygen will # generate HTML output. GENERATE_HTML = YES -# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be # put in front of it. If left blank `html' will be used as the default path. -HTML_OUTPUT = +HTML_OUTPUT = -# The HTML_FILE_EXTENSION tag can be used to specify the file extension for -# each generated HTML page (for example: .htm,.php,.asp). If it is left blank +# The HTML_FILE_EXTENSION tag can be used to specify the file extension for +# each generated HTML page (for example: .htm,.php,.asp). If it is left blank # doxygen will generate files with .html extension. HTML_FILE_EXTENSION = .html -# The HTML_HEADER tag can be used to specify a personal HTML header for -# each generated HTML page. If it is left blank doxygen will generate a +# The HTML_HEADER tag can be used to specify a personal HTML header for +# each generated HTML page. If it is left blank doxygen will generate a # standard header. -HTML_HEADER = +HTML_HEADER = -# The HTML_FOOTER tag can be used to specify a personal HTML footer for -# each generated HTML page. If it is left blank doxygen will generate a +# The HTML_FOOTER tag can be used to specify a personal HTML footer for +# each generated HTML page. If it is left blank doxygen will generate a # standard footer. -HTML_FOOTER = +HTML_FOOTER = -# The HTML_STYLESHEET tag can be used to specify a user-defined cascading -# style sheet that is used by each HTML page. It can be used to -# fine-tune the look of the HTML output. If the tag is left blank doxygen -# will generate a default style sheet. Note that doxygen will try to copy -# the style sheet file to the HTML output directory, so don't put your own +# The HTML_STYLESHEET tag can be used to specify a user-defined cascading +# style sheet that is used by each HTML page. It can be used to +# fine-tune the look of the HTML output. If the tag is left blank doxygen +# will generate a default style sheet. Note that doxygen will try to copy +# the style sheet file to the HTML output directory, so don't put your own # stylesheet in the HTML output directory as well, or it will be erased! -HTML_STYLESHEET = +HTML_STYLESHEET = -# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, -# files or namespaces will be aligned in HTML using tables. If set to +# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, +# files or namespaces will be aligned in HTML using tables. If set to # NO a bullet list will be used. HTML_ALIGN_MEMBERS = YES -# If the GENERATE_HTMLHELP tag is set to YES, additional index files -# will be generated that can be used as input for tools like the -# Microsoft HTML help workshop to generate a compressed HTML help file (.chm) +# If the GENERATE_HTMLHELP tag is set to YES, additional index files +# will be generated that can be used as input for tools like the +# Microsoft HTML help workshop to generate a compressed HTML help file (.chm) # of the generated HTML documentation. GENERATE_HTMLHELP = NO -# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML -# documentation will contain sections that can be hidden and shown after the -# page has loaded. For this to work a browser that supports -# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox +# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML +# documentation will contain sections that can be hidden and shown after the +# page has loaded. For this to work a browser that supports +# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox # Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari). HTML_DYNAMIC_SECTIONS = YES -# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can -# be used to specify the file name of the resulting .chm file. You -# can add a path in front of the file if the result should not be +# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can +# be used to specify the file name of the resulting .chm file. You +# can add a path in front of the file if the result should not be # written to the html output directory. -CHM_FILE = +CHM_FILE = -# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can -# be used to specify the location (absolute path including file name) of -# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run +# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can +# be used to specify the location (absolute path including file name) of +# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run # the HTML help compiler on the generated index.hhp. -HHC_LOCATION = +HHC_LOCATION = -# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag -# controls if a separate .chi index file is generated (YES) or that +# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag +# controls if a separate .chi index file is generated (YES) or that # it should be included in the master .chm file (NO). GENERATE_CHI = NO -# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag -# controls whether a binary table of contents is generated (YES) or a +# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag +# controls whether a binary table of contents is generated (YES) or a # normal table of contents (NO) in the .chm file. BINARY_TOC = NO -# The TOC_EXPAND flag can be set to YES to add extra items for group members +# The TOC_EXPAND flag can be set to YES to add extra items for group members # to the contents of the HTML help documentation and to the tree view. TOC_EXPAND = NO -# The DISABLE_INDEX tag can be used to turn on/off the condensed index at -# top of each HTML page. The value NO (the default) enables the index and +# The DISABLE_INDEX tag can be used to turn on/off the condensed index at +# top of each HTML page. The value NO (the default) enables the index and # the value YES disables it. DISABLE_INDEX = NO -# This tag can be used to set the number of enum values (range [1..20]) +# This tag can be used to set the number of enum values (range [1..20]) # that doxygen will group on one line in the generated HTML documentation. ENUM_VALUES_PER_LINE = 4 # If the GENERATE_TREEVIEW tag is set to YES, a side panel will be -# generated containing a tree-like index structure (just like the one that -# is generated for HTML Help). For this to work a browser that supports -# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, -# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are +# generated containing a tree-like index structure (just like the one that +# is generated for HTML Help). For this to work a browser that supports +# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, +# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are # probably better off using the HTML help feature. GENERATE_TREEVIEW = YES -# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be -# used to set the initial width (in pixels) of the frame in which the tree +# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be +# used to set the initial width (in pixels) of the frame in which the tree # is shown. TREEVIEW_WIDTH = 250 @@ -785,74 +785,74 @@ TREEVIEW_WIDTH = 250 # configuration options related to the LaTeX output #--------------------------------------------------------------------------- -# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will +# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will # generate Latex output. GENERATE_LATEX = NO -# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be # put in front of it. If left blank `latex' will be used as the default path. -LATEX_OUTPUT = +LATEX_OUTPUT = -# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be +# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be # invoked. If left blank `latex' will be used as the default command name. LATEX_CMD_NAME = latex -# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to -# generate index for LaTeX. If left blank `makeindex' will be used as the +# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to +# generate index for LaTeX. If left blank `makeindex' will be used as the # default command name. MAKEINDEX_CMD_NAME = makeindex -# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact -# LaTeX documents. This may be useful for small projects and may help to +# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact +# LaTeX documents. This may be useful for small projects and may help to # save some trees in general. COMPACT_LATEX = NO -# The PAPER_TYPE tag can be used to set the paper type that is used -# by the printer. Possible values are: a4, a4wide, letter, legal and +# The PAPER_TYPE tag can be used to set the paper type that is used +# by the printer. Possible values are: a4, a4wide, letter, legal and # executive. If left blank a4wide will be used. PAPER_TYPE = a4wide -# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX +# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX # packages that should be included in the LaTeX output. -EXTRA_PACKAGES = +EXTRA_PACKAGES = -# The LATEX_HEADER tag can be used to specify a personal LaTeX header for -# the generated latex document. The header should contain everything until -# the first chapter. If it is left blank doxygen will generate a +# The LATEX_HEADER tag can be used to specify a personal LaTeX header for +# the generated latex document. The header should contain everything until +# the first chapter. If it is left blank doxygen will generate a # standard header. Notice: only use this tag if you know what you are doing! -LATEX_HEADER = +LATEX_HEADER = -# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated -# is prepared for conversion to pdf (using ps2pdf). The pdf file will -# contain links (just like the HTML output) instead of page references +# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated +# is prepared for conversion to pdf (using ps2pdf). The pdf file will +# contain links (just like the HTML output) instead of page references # This makes the output suitable for online browsing using a pdf viewer. PDF_HYPERLINKS = NO -# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of -# plain latex in the generated Makefile. Set this option to YES to get a +# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of +# plain latex in the generated Makefile. Set this option to YES to get a # higher quality PDF documentation. USE_PDFLATEX = NO -# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. -# command to the generated LaTeX files. This will instruct LaTeX to keep -# running if errors occur, instead of asking the user for help. +# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. +# command to the generated LaTeX files. This will instruct LaTeX to keep +# running if errors occur, instead of asking the user for help. # This option is also used when generating formulas in HTML. LATEX_BATCHMODE = NO -# If LATEX_HIDE_INDICES is set to YES then doxygen will not -# include the index chapters (such as File Index, Compound Index, etc.) +# If LATEX_HIDE_INDICES is set to YES then doxygen will not +# include the index chapters (such as File Index, Compound Index, etc.) # in the output. LATEX_HIDE_INDICES = NO @@ -861,68 +861,68 @@ LATEX_HIDE_INDICES = NO # configuration options related to the RTF output #--------------------------------------------------------------------------- -# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output -# The RTF output is optimized for Word 97 and may not look very pretty with +# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output +# The RTF output is optimized for Word 97 and may not look very pretty with # other RTF readers or editors. GENERATE_RTF = NO -# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be # put in front of it. If left blank `rtf' will be used as the default path. -RTF_OUTPUT = +RTF_OUTPUT = -# If the COMPACT_RTF tag is set to YES Doxygen generates more compact -# RTF documents. This may be useful for small projects and may help to +# If the COMPACT_RTF tag is set to YES Doxygen generates more compact +# RTF documents. This may be useful for small projects and may help to # save some trees in general. COMPACT_RTF = NO -# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated -# will contain hyperlink fields. The RTF file will -# contain links (just like the HTML output) instead of page references. -# This makes the output suitable for online browsing using WORD or other -# programs which support those fields. +# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated +# will contain hyperlink fields. The RTF file will +# contain links (just like the HTML output) instead of page references. +# This makes the output suitable for online browsing using WORD or other +# programs which support those fields. # Note: wordpad (write) and others do not support links. RTF_HYPERLINKS = NO -# Load stylesheet definitions from file. Syntax is similar to doxygen's -# config file, i.e. a series of assignments. You only have to provide +# Load stylesheet definitions from file. Syntax is similar to doxygen's +# config file, i.e. a series of assignments. You only have to provide # replacements, missing definitions are set to their default value. -RTF_STYLESHEET_FILE = +RTF_STYLESHEET_FILE = -# Set optional variables used in the generation of an rtf document. +# Set optional variables used in the generation of an rtf document. # Syntax is similar to doxygen's config file. -RTF_EXTENSIONS_FILE = +RTF_EXTENSIONS_FILE = #--------------------------------------------------------------------------- # configuration options related to the man page output #--------------------------------------------------------------------------- -# If the GENERATE_MAN tag is set to YES (the default) Doxygen will +# If the GENERATE_MAN tag is set to YES (the default) Doxygen will # generate man pages GENERATE_MAN = NO -# The MAN_OUTPUT tag is used to specify where the man pages will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# The MAN_OUTPUT tag is used to specify where the man pages will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be # put in front of it. If left blank `man' will be used as the default path. -MAN_OUTPUT = +MAN_OUTPUT = -# The MAN_EXTENSION tag determines the extension that is added to +# The MAN_EXTENSION tag determines the extension that is added to # the generated man pages (default is the subroutine's section .3) MAN_EXTENSION = .3 -# If the MAN_LINKS tag is set to YES and Doxygen generates man output, -# then it will generate one additional man file for each entity -# documented in the real man page(s). These additional files -# only source the real man page, but without them the man command +# If the MAN_LINKS tag is set to YES and Doxygen generates man output, +# then it will generate one additional man file for each entity +# documented in the real man page(s). These additional files +# only source the real man page, but without them the man command # would be unable to find the correct page. The default is NO. MAN_LINKS = NO @@ -931,33 +931,33 @@ MAN_LINKS = NO # configuration options related to the XML output #--------------------------------------------------------------------------- -# If the GENERATE_XML tag is set to YES Doxygen will -# generate an XML file that captures the structure of +# If the GENERATE_XML tag is set to YES Doxygen will +# generate an XML file that captures the structure of # the code including all documentation. GENERATE_XML = NO -# The XML_OUTPUT tag is used to specify where the XML pages will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# The XML_OUTPUT tag is used to specify where the XML pages will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be # put in front of it. If left blank `xml' will be used as the default path. XML_OUTPUT = xml -# The XML_SCHEMA tag can be used to specify an XML schema, -# which can be used by a validating XML parser to check the +# The XML_SCHEMA tag can be used to specify an XML schema, +# which can be used by a validating XML parser to check the # syntax of the XML files. -XML_SCHEMA = +XML_SCHEMA = -# The XML_DTD tag can be used to specify an XML DTD, -# which can be used by a validating XML parser to check the +# The XML_DTD tag can be used to specify an XML DTD, +# which can be used by a validating XML parser to check the # syntax of the XML files. -XML_DTD = +XML_DTD = -# If the XML_PROGRAMLISTING tag is set to YES Doxygen will -# dump the program listings (including syntax highlighting -# and cross-referencing information) to the XML output. Note that +# If the XML_PROGRAMLISTING tag is set to YES Doxygen will +# dump the program listings (including syntax highlighting +# and cross-referencing information) to the XML output. Note that # enabling this will significantly increase the size of the XML output. XML_PROGRAMLISTING = YES @@ -966,10 +966,10 @@ XML_PROGRAMLISTING = YES # configuration options for the AutoGen Definitions output #--------------------------------------------------------------------------- -# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will -# generate an AutoGen Definitions (see autogen.sf.net) file -# that captures the structure of the code including all -# documentation. Note that this feature is still experimental +# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will +# generate an AutoGen Definitions (see autogen.sf.net) file +# that captures the structure of the code including all +# documentation. Note that this feature is still experimental # and incomplete at the moment. GENERATE_AUTOGEN_DEF = NO @@ -978,319 +978,319 @@ GENERATE_AUTOGEN_DEF = NO # configuration options related to the Perl module output #--------------------------------------------------------------------------- -# If the GENERATE_PERLMOD tag is set to YES Doxygen will -# generate a Perl module file that captures the structure of -# the code including all documentation. Note that this -# feature is still experimental and incomplete at the +# If the GENERATE_PERLMOD tag is set to YES Doxygen will +# generate a Perl module file that captures the structure of +# the code including all documentation. Note that this +# feature is still experimental and incomplete at the # moment. GENERATE_PERLMOD = NO -# If the PERLMOD_LATEX tag is set to YES Doxygen will generate -# the necessary Makefile rules, Perl scripts and LaTeX code to be able +# If the PERLMOD_LATEX tag is set to YES Doxygen will generate +# the necessary Makefile rules, Perl scripts and LaTeX code to be able # to generate PDF and DVI output from the Perl module output. PERLMOD_LATEX = NO -# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be -# nicely formatted so it can be parsed by a human reader. This is useful -# if you want to understand what is going on. On the other hand, if this -# tag is set to NO the size of the Perl module output will be much smaller +# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be +# nicely formatted so it can be parsed by a human reader. This is useful +# if you want to understand what is going on. On the other hand, if this +# tag is set to NO the size of the Perl module output will be much smaller # and Perl will parse it just the same. PERLMOD_PRETTY = YES -# The names of the make variables in the generated doxyrules.make file -# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. -# This is useful so different doxyrules.make files included by the same +# The names of the make variables in the generated doxyrules.make file +# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. +# This is useful so different doxyrules.make files included by the same # Makefile don't overwrite each other's variables. -PERLMOD_MAKEVAR_PREFIX = +PERLMOD_MAKEVAR_PREFIX = #--------------------------------------------------------------------------- -# Configuration options related to the preprocessor +# Configuration options related to the preprocessor #--------------------------------------------------------------------------- -# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will -# evaluate all C-preprocessor directives found in the sources and include +# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will +# evaluate all C-preprocessor directives found in the sources and include # files. ENABLE_PREPROCESSING = YES -# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro -# names in the source code. If set to NO (the default) only conditional -# compilation will be performed. Macro expansion can be done in a controlled +# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro +# names in the source code. If set to NO (the default) only conditional +# compilation will be performed. Macro expansion can be done in a controlled # way by setting EXPAND_ONLY_PREDEF to YES. MACRO_EXPANSION = NO -# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES -# then the macro expansion is limited to the macros specified with the +# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES +# then the macro expansion is limited to the macros specified with the # PREDEFINED and EXPAND_AS_DEFINED tags. EXPAND_ONLY_PREDEF = NO -# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files +# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files # in the INCLUDE_PATH (see below) will be search if a #include is found. SEARCH_INCLUDES = YES -# The INCLUDE_PATH tag can be used to specify one or more directories that -# contain include files that are not input files but should be processed by +# The INCLUDE_PATH tag can be used to specify one or more directories that +# contain include files that are not input files but should be processed by # the preprocessor. -INCLUDE_PATH = +INCLUDE_PATH = -# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard -# patterns (like *.h and *.hpp) to filter out the header-files in the -# directories. If left blank, the patterns specified with FILE_PATTERNS will +# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard +# patterns (like *.h and *.hpp) to filter out the header-files in the +# directories. If left blank, the patterns specified with FILE_PATTERNS will # be used. -INCLUDE_FILE_PATTERNS = +INCLUDE_FILE_PATTERNS = -# The PREDEFINED tag can be used to specify one or more macro names that -# are defined before the preprocessor is started (similar to the -D option of -# gcc). The argument of the tag is a list of macros of the form: name -# or name=definition (no spaces). If the definition and the = are -# omitted =1 is assumed. To prevent a macro definition from being -# undefined via #undef or recursively expanded use the := operator +# The PREDEFINED tag can be used to specify one or more macro names that +# are defined before the preprocessor is started (similar to the -D option of +# gcc). The argument of the tag is a list of macros of the form: name +# or name=definition (no spaces). If the definition and the = are +# omitted =1 is assumed. To prevent a macro definition from being +# undefined via #undef or recursively expanded use the := operator # instead of the = operator. -PREDEFINED = +PREDEFINED = -# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then -# this tag can be used to specify a list of macro names that should be expanded. -# The macro definition that is found in the sources will be used. +# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then +# this tag can be used to specify a list of macro names that should be expanded. +# The macro definition that is found in the sources will be used. # Use the PREDEFINED tag if you want to use a different macro definition. -EXPAND_AS_DEFINED = +EXPAND_AS_DEFINED = -# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then -# doxygen's preprocessor will remove all function-like macros that are alone -# on a line, have an all uppercase name, and do not end with a semicolon. Such -# function macros are typically used for boiler-plate code, and will confuse +# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then +# doxygen's preprocessor will remove all function-like macros that are alone +# on a line, have an all uppercase name, and do not end with a semicolon. Such +# function macros are typically used for boiler-plate code, and will confuse # the parser if not removed. SKIP_FUNCTION_MACROS = YES #--------------------------------------------------------------------------- -# Configuration::additions related to external references +# Configuration::additions related to external references #--------------------------------------------------------------------------- -# The TAGFILES option can be used to specify one or more tagfiles. -# Optionally an initial location of the external documentation -# can be added for each tagfile. The format of a tag file without -# this location is as follows: -# TAGFILES = file1 file2 ... -# Adding location for the tag files is done as follows: -# TAGFILES = file1=loc1 "file2 = loc2" ... -# where "loc1" and "loc2" can be relative or absolute paths or -# URLs. If a location is present for each tag, the installdox tool +# The TAGFILES option can be used to specify one or more tagfiles. +# Optionally an initial location of the external documentation +# can be added for each tagfile. The format of a tag file without +# this location is as follows: +# TAGFILES = file1 file2 ... +# Adding location for the tag files is done as follows: +# TAGFILES = file1=loc1 "file2 = loc2" ... +# where "loc1" and "loc2" can be relative or absolute paths or +# URLs. If a location is present for each tag, the installdox tool # does not have to be run to correct the links. # Note that each tag file must have a unique name # (where the name does NOT include the path) -# If a tag file is not located in the directory in which doxygen +# If a tag file is not located in the directory in which doxygen # is run, you must also specify the path to the tagfile here. -TAGFILES = +TAGFILES = -# When a file name is specified after GENERATE_TAGFILE, doxygen will create +# When a file name is specified after GENERATE_TAGFILE, doxygen will create # a tag file that is based on the input files it reads. GENERATE_TAGFILE = ioss.tags -# If the ALLEXTERNALS tag is set to YES all external classes will be listed -# in the class index. If set to NO only the inherited external classes +# If the ALLEXTERNALS tag is set to YES all external classes will be listed +# in the class index. If set to NO only the inherited external classes # will be listed. ALLEXTERNALS = NO -# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed -# in the modules index. If set to NO, only the current project's groups will +# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed +# in the modules index. If set to NO, only the current project's groups will # be listed. EXTERNAL_GROUPS = YES -# The PERL_PATH should be the absolute path and name of the perl script +# The PERL_PATH should be the absolute path and name of the perl script # interpreter (i.e. the result of `which perl'). PERL_PATH = /usr/bin/perl #--------------------------------------------------------------------------- -# Configuration options related to the dot tool +# Configuration options related to the dot tool #--------------------------------------------------------------------------- -# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will -# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base -# or super classes. Setting the tag to NO turns the diagrams off. Note that -# this option is superseded by the HAVE_DOT option below. This is only a -# fallback. It is recommended to install and use dot, since it yields more +# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will +# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base +# or super classes. Setting the tag to NO turns the diagrams off. Note that +# this option is superseded by the HAVE_DOT option below. This is only a +# fallback. It is recommended to install and use dot, since it yields more # powerful graphs. CLASS_DIAGRAMS = YES -# You can define message sequence charts within doxygen comments using the \msc -# command. Doxygen will then run the mscgen tool (see http://www.mcternan.me.uk/mscgen/) to -# produce the chart and insert it in the documentation. The MSCGEN_PATH tag allows you to -# specify the directory where the mscgen tool resides. If left empty the tool is assumed to +# You can define message sequence charts within doxygen comments using the \msc +# command. Doxygen will then run the mscgen tool (see http://www.mcternan.me.uk/mscgen/) to +# produce the chart and insert it in the documentation. The MSCGEN_PATH tag allows you to +# specify the directory where the mscgen tool resides. If left empty the tool is assumed to # be found in the default search path. -MSCGEN_PATH = +MSCGEN_PATH = -# If set to YES, the inheritance and collaboration graphs will hide -# inheritance and usage relations if the target is undocumented +# If set to YES, the inheritance and collaboration graphs will hide +# inheritance and usage relations if the target is undocumented # or is not a class. HIDE_UNDOC_RELATIONS = YES -# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is -# available from the path. This tool is part of Graphviz, a graph visualization -# toolkit from AT&T and Lucent Bell Labs. The other options in this section +# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is +# available from the path. This tool is part of Graphviz, a graph visualization +# toolkit from AT&T and Lucent Bell Labs. The other options in this section # have no effect if this option is set to NO (the default) HAVE_DOT = YES -# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen -# will generate a graph for each documented class showing the direct and -# indirect inheritance relations. Setting this tag to YES will force the +# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for each documented class showing the direct and +# indirect inheritance relations. Setting this tag to YES will force the # the CLASS_DIAGRAMS tag to NO. CLASS_GRAPH = YES -# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen -# will generate a graph for each documented class showing the direct and -# indirect implementation dependencies (inheritance, containment, and +# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for each documented class showing the direct and +# indirect implementation dependencies (inheritance, containment, and # class references variables) of the class with other documented classes. COLLABORATION_GRAPH = YES -# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen +# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen # will generate a graph for groups, showing the direct groups dependencies GROUP_GRAPHS = YES -# If the UML_LOOK tag is set to YES doxygen will generate inheritance and -# collaboration diagrams in a style similar to the OMG's Unified Modeling +# If the UML_LOOK tag is set to YES doxygen will generate inheritance and +# collaboration diagrams in a style similar to the OMG's Unified Modeling # Language. UML_LOOK = NO -# If set to YES, the inheritance and collaboration graphs will show the +# If set to YES, the inheritance and collaboration graphs will show the # relations between templates and their instances. TEMPLATE_RELATIONS = YES -# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT -# tags are set to YES then doxygen will generate a graph for each documented -# file showing the direct and indirect include dependencies of the file with +# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT +# tags are set to YES then doxygen will generate a graph for each documented +# file showing the direct and indirect include dependencies of the file with # other documented files. INCLUDE_GRAPH = YES -# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and -# HAVE_DOT tags are set to YES then doxygen will generate a graph for each -# documented header file showing the documented files that directly or +# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and +# HAVE_DOT tags are set to YES then doxygen will generate a graph for each +# documented header file showing the documented files that directly or # indirectly include this file. INCLUDED_BY_GRAPH = YES -# If the CALL_GRAPH, SOURCE_BROWSER and HAVE_DOT tags are set to YES then doxygen will -# generate a call dependency graph for every global function or class method. -# Note that enabling this option will significantly increase the time of a run. -# So in most cases it will be better to enable call graphs for selected +# If the CALL_GRAPH, SOURCE_BROWSER and HAVE_DOT tags are set to YES then doxygen will +# generate a call dependency graph for every global function or class method. +# Note that enabling this option will significantly increase the time of a run. +# So in most cases it will be better to enable call graphs for selected # functions only using the \callgraph command. CALL_GRAPH = NO -# If the CALLER_GRAPH, SOURCE_BROWSER and HAVE_DOT tags are set to YES then doxygen will -# generate a caller dependency graph for every global function or class method. -# Note that enabling this option will significantly increase the time of a run. -# So in most cases it will be better to enable caller graphs for selected +# If the CALLER_GRAPH, SOURCE_BROWSER and HAVE_DOT tags are set to YES then doxygen will +# generate a caller dependency graph for every global function or class method. +# Note that enabling this option will significantly increase the time of a run. +# So in most cases it will be better to enable caller graphs for selected # functions only using the \callergraph command. CALLER_GRAPH = NO -# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen +# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen # will graphical hierarchy of all classes instead of a textual one. GRAPHICAL_HIERARCHY = YES -# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES -# then doxygen will show the dependencies a directory has on other directories +# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES +# then doxygen will show the dependencies a directory has on other directories # in a graphical way. The dependency relations are determined by the #include # relations between the files in the directories. DIRECTORY_GRAPH = YES -# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images +# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images # generated by dot. Possible values are png, jpg, or gif # If left blank png will be used. DOT_IMAGE_FORMAT = png -# The tag DOT_PATH can be used to specify the path where the dot tool can be +# The tag DOT_PATH can be used to specify the path where the dot tool can be # found. If left blank, it is assumed the dot tool can be found in the path. DOT_PATH = /var/scratch2/bin -# The DOTFILE_DIRS tag can be used to specify one or more directories that -# contain dot files that are included in the documentation (see the +# The DOTFILE_DIRS tag can be used to specify one or more directories that +# contain dot files that are included in the documentation (see the # \dotfile command). -DOTFILE_DIRS = +DOTFILE_DIRS = -# The MAX_DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of -# nodes that will be shown in the graph. If the number of nodes in a graph -# becomes larger than this value, doxygen will truncate the graph, which is -# visualized by representing a node as a red box. Note that doxygen if the number -# of direct children of the root node in a graph is already larger than -# MAX_DOT_GRAPH_NOTES then the graph will not be shown at all. Also note +# The MAX_DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of +# nodes that will be shown in the graph. If the number of nodes in a graph +# becomes larger than this value, doxygen will truncate the graph, which is +# visualized by representing a node as a red box. Note that doxygen if the number +# of direct children of the root node in a graph is already larger than +# MAX_DOT_GRAPH_NOTES then the graph will not be shown at all. Also note # that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH. DOT_GRAPH_MAX_NODES = 50 -# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the -# graphs generated by dot. A depth value of 3 means that only nodes reachable -# from the root by following a path via at most 3 edges will be shown. Nodes -# that lay further from the root node will be omitted. Note that setting this -# option to 1 or 2 may greatly reduce the computation time needed for large -# code bases. Also note that the size of a graph can be further restricted by +# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the +# graphs generated by dot. A depth value of 3 means that only nodes reachable +# from the root by following a path via at most 3 edges will be shown. Nodes +# that lay further from the root node will be omitted. Note that setting this +# option to 1 or 2 may greatly reduce the computation time needed for large +# code bases. Also note that the size of a graph can be further restricted by # DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction. MAX_DOT_GRAPH_DEPTH = 3 -# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent -# background. This is disabled by default, which results in a white background. -# Warning: Depending on the platform used, enabling this option may lead to -# badly anti-aliased labels on the edges of a graph (i.e. they become hard to +# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent +# background. This is disabled by default, which results in a white background. +# Warning: Depending on the platform used, enabling this option may lead to +# badly anti-aliased labels on the edges of a graph (i.e. they become hard to # read). DOT_TRANSPARENT = NO -# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output -# files in one run (i.e. multiple -o and -T options on the command line). This -# makes dot run faster, but since only newer versions of dot (>1.8.10) +# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output +# files in one run (i.e. multiple -o and -T options on the command line). This +# makes dot run faster, but since only newer versions of dot (>1.8.10) # support this, this feature is disabled by default. DOT_MULTI_TARGETS = YES -# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will -# generate a legend page explaining the meaning of the various boxes and +# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will +# generate a legend page explaining the meaning of the various boxes and # arrows in the dot generated graphs. GENERATE_LEGEND = YES -# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will -# remove the intermediate dot files that are used to generate +# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will +# remove the intermediate dot files that are used to generate # the various graphs. DOT_CLEANUP = YES #--------------------------------------------------------------------------- -# Configuration::additions related to the search engine +# Configuration::additions related to the search engine #--------------------------------------------------------------------------- -# The SEARCHENGINE tag specifies whether or not a search engine should be +# The SEARCHENGINE tag specifies whether or not a search engine should be # used. If set to NO the values of all tags below this one will be ignored. SEARCHENGINE = YES diff --git a/packages/seacas/libraries/ioss/src/CMakeLists.txt b/packages/seacas/libraries/ioss/src/CMakeLists.txt index 44485467a481..9ecf3023ae87 100644 --- a/packages/seacas/libraries/ioss/src/CMakeLists.txt +++ b/packages/seacas/libraries/ioss/src/CMakeLists.txt @@ -1,4 +1,3 @@ - IF (${PROJECT_NAME}_ENABLE_Kokkos) SET(SEACAS_HAVE_KOKKOS ON) ENDIF() @@ -65,7 +64,9 @@ TRIBITS_ADD_LIBRARY( HEADERS ${HEADERS} SOURCES ${SOURCES} ) - +IF (MINGW) + target_link_libraries(Ioss psapi) +ENDIF () if (${CMAKE_PROJECT_NAME} STREQUAL "SEACASProj") # add a target to generate API documentation with Doxygen diff --git a/packages/seacas/libraries/ioss/src/Ioss_Assembly.C b/packages/seacas/libraries/ioss/src/Ioss_Assembly.C index c4263a2e8cbe..1255a6bcfc0e 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Assembly.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Assembly.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include diff --git a/packages/seacas/libraries/ioss/src/Ioss_Assembly.h b/packages/seacas/libraries/ioss/src/Ioss_Assembly.h index b20b2f027d35..7663d52dd89f 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Assembly.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Assembly.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_Assembly_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_Beam2.C b/packages/seacas/libraries/ioss/src/Ioss_Beam2.C index 6ec67b13fdce..d011393efd4f 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Beam2.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Beam2.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "Ioss_CodeTypes.h" // for IntVector diff --git a/packages/seacas/libraries/ioss/src/Ioss_Beam2.h b/packages/seacas/libraries/ioss/src/Ioss_Beam2.h index a508687deb0e..e79308d1f787 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Beam2.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Beam2.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_Beam2_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_Beam3.C b/packages/seacas/libraries/ioss/src/Ioss_Beam3.C index 0a7fe55a6ebf..fac85fbca434 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Beam3.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Beam3.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "Ioss_CodeTypes.h" // for IntVector diff --git a/packages/seacas/libraries/ioss/src/Ioss_Beam3.h b/packages/seacas/libraries/ioss/src/Ioss_Beam3.h index 01e58f5bdad0..b0d5c56e09af 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Beam3.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Beam3.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_Beam3_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_Beam4.C b/packages/seacas/libraries/ioss/src/Ioss_Beam4.C index e80fd61739e6..9b026211e67b 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Beam4.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Beam4.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "Ioss_CodeTypes.h" // for IntVector diff --git a/packages/seacas/libraries/ioss/src/Ioss_Beam4.h b/packages/seacas/libraries/ioss/src/Ioss_Beam4.h index e61ca188e23e..f353a8387961 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Beam4.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Beam4.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_Beam4_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_Blob.C b/packages/seacas/libraries/ioss/src/Ioss_Blob.C index 1bedb8882135..84f547fb4c5b 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Blob.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Blob.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include diff --git a/packages/seacas/libraries/ioss/src/Ioss_Blob.h b/packages/seacas/libraries/ioss/src/Ioss_Blob.h index 8d983b02cf53..4d244ca789b2 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Blob.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Blob.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_Blob_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_BoundingBox.h b/packages/seacas/libraries/ioss/src/Ioss_BoundingBox.h index df6eb3e88d34..72ba06ce3a7f 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_BoundingBox.h +++ b/packages/seacas/libraries/ioss/src/Ioss_BoundingBox.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_BoundingBox_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_CodeTypes.h b/packages/seacas/libraries/ioss/src/Ioss_CodeTypes.h index 09498dbd9e9b..0b8fa68bdd4f 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_CodeTypes.h +++ b/packages/seacas/libraries/ioss/src/Ioss_CodeTypes.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_code_types_h @@ -58,6 +58,9 @@ inline const std::string IOSS_SYM_TENSOR() { return std::string("sym_tensor_33") (void)(x); \ } while (0) +#ifndef MPI_COMM_SELF +#define MPI_COMM_SELF 0 +#endif #ifndef MPI_COMM_WORLD #define MPI_COMM_WORLD 0 using MPI_Comm = int; diff --git a/packages/seacas/libraries/ioss/src/Ioss_CommSet.C b/packages/seacas/libraries/ioss/src/Ioss_CommSet.C index 70d7dac1432a..190cdf475b3f 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_CommSet.C +++ b/packages/seacas/libraries/ioss/src/Ioss_CommSet.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include diff --git a/packages/seacas/libraries/ioss/src/Ioss_CommSet.h b/packages/seacas/libraries/ioss/src/Ioss_CommSet.h index a47d954e5380..9b0e8a4a9e8a 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_CommSet.h +++ b/packages/seacas/libraries/ioss/src/Ioss_CommSet.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_CommSet_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_CompositeVariableType.C b/packages/seacas/libraries/ioss/src/Ioss_CompositeVariableType.C index 60c0ed39f3b9..0bb7b3b18ad3 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_CompositeVariableType.C +++ b/packages/seacas/libraries/ioss/src/Ioss_CompositeVariableType.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include diff --git a/packages/seacas/libraries/ioss/src/Ioss_CompositeVariableType.h b/packages/seacas/libraries/ioss/src/Ioss_CompositeVariableType.h index 40895dad0fe7..985bc91301e3 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_CompositeVariableType.h +++ b/packages/seacas/libraries/ioss/src/Ioss_CompositeVariableType.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_CompositeVariableType_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_ConcreteVariableType.C b/packages/seacas/libraries/ioss/src/Ioss_ConcreteVariableType.C index 5d8aea17e423..72258faf0929 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_ConcreteVariableType.C +++ b/packages/seacas/libraries/ioss/src/Ioss_ConcreteVariableType.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include diff --git a/packages/seacas/libraries/ioss/src/Ioss_ConcreteVariableType.h b/packages/seacas/libraries/ioss/src/Ioss_ConcreteVariableType.h index dbe2a55d3ee9..86a14a5d3955 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_ConcreteVariableType.h +++ b/packages/seacas/libraries/ioss/src/Ioss_ConcreteVariableType.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_ConcreteVariableType_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_ConstructedVariableType.C b/packages/seacas/libraries/ioss/src/Ioss_ConstructedVariableType.C index be25b3dd02ff..f51a511ccb08 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_ConstructedVariableType.C +++ b/packages/seacas/libraries/ioss/src/Ioss_ConstructedVariableType.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include diff --git a/packages/seacas/libraries/ioss/src/Ioss_ConstructedVariableType.h b/packages/seacas/libraries/ioss/src/Ioss_ConstructedVariableType.h index 5d5c89cc08d3..9a9d71fea471 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_ConstructedVariableType.h +++ b/packages/seacas/libraries/ioss/src/Ioss_ConstructedVariableType.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_ConstructedVariableType_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_CoordinateFrame.C b/packages/seacas/libraries/ioss/src/Ioss_CoordinateFrame.C index 4aa6d00fccc1..1b49b8605df5 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_CoordinateFrame.C +++ b/packages/seacas/libraries/ioss/src/Ioss_CoordinateFrame.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include diff --git a/packages/seacas/libraries/ioss/src/Ioss_CoordinateFrame.h b/packages/seacas/libraries/ioss/src/Ioss_CoordinateFrame.h index 21705fe21b34..c159c40623b6 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_CoordinateFrame.h +++ b/packages/seacas/libraries/ioss/src/Ioss_CoordinateFrame.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_CoordinateFrame_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_DBUsage.h b/packages/seacas/libraries/ioss/src/Ioss_DBUsage.h index ce0720d2d9fd..d596ec7862ef 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_DBUsage.h +++ b/packages/seacas/libraries/ioss/src/Ioss_DBUsage.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_DBUsage_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_DataSize.h b/packages/seacas/libraries/ioss/src/Ioss_DataSize.h index a1dd7147203b..555e859ac3df 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_DataSize.h +++ b/packages/seacas/libraries/ioss/src/Ioss_DataSize.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_DataSize_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_DatabaseIO.C b/packages/seacas/libraries/ioss/src/Ioss_DatabaseIO.C index 7973eddadbe4..af433a28a357 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_DatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/Ioss_DatabaseIO.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include @@ -74,8 +74,8 @@ namespace { if (max_hash != min_hash) { const std::string &ge_name = ge->name(); fmt::print(Ioss::WARNING(), - "Parallel inconsistency detected for {} field '{}' on entity '{}'\n", - in_out == 0 ? "writing" : "reading", field_name, ge_name); + "[{}] Parallel inconsistency detected for {} field '{}' on entity '{}'. (Hash: {} {} {})\n", + in_out == 0 ? "writing" : "reading", util.parallel_rank(), field_name, ge_name, hash_code, min_hash, max_hash); return false; } return true; @@ -131,7 +131,9 @@ namespace { namespace Ioss { DatabaseIO::DatabaseIO(Region *region, std::string filename, DatabaseUsage db_usage, MPI_Comm communicator, const PropertyManager &props) - : properties(props), DBFilename(std::move(filename)), dbUsage(db_usage), util_(communicator), + : properties(props), DBFilename(std::move(filename)), dbUsage(db_usage), + util_(db_usage == WRITE_HISTORY || db_usage == WRITE_HEARTBEAT ? MPI_COMM_SELF + : communicator), region_(region), isInput(is_input_event(db_usage)), singleProcOnly(db_usage == WRITE_HISTORY || db_usage == WRITE_HEARTBEAT || SerializeIO::isEnabled()) diff --git a/packages/seacas/libraries/ioss/src/Ioss_DatabaseIO.h b/packages/seacas/libraries/ioss/src/Ioss_DatabaseIO.h index ea1f8db58837..f135133613a2 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_DatabaseIO.h +++ b/packages/seacas/libraries/ioss/src/Ioss_DatabaseIO.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_DatabaseIO_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_Decomposition.C b/packages/seacas/libraries/ioss/src/Ioss_Decomposition.C index 04c949da95c9..b4097038b253 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Decomposition.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Decomposition.C @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ @@ -1221,7 +1221,7 @@ namespace Ioss { // // * iterate all local nodes (those that are in both file and ioss // decomposition) - // on this procesor and all exported nodes, + // on this processor and all exported nodes, // * put in a vector and sort on (id,proc). // * iterate and create a vector of all shared nodes and the // processor they are on.. diff --git a/packages/seacas/libraries/ioss/src/Ioss_Decomposition.h b/packages/seacas/libraries/ioss/src/Ioss_Decomposition.h index a0415dfae463..a52f30a62573 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Decomposition.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Decomposition.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #ifndef IOSS_DECOMPOSITON_H diff --git a/packages/seacas/libraries/ioss/src/Ioss_Doxygen.h b/packages/seacas/libraries/ioss/src/Ioss_Doxygen.h index 002e11239033..4b4788a0dc11 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Doxygen.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Doxygen.h @@ -92,7 +92,6 @@ PARALLEL_IO_MODE | netcdf4, hdf5, pnetcdf, (mpiio and mpiposix are deprecated) SHOW_LEGEND | [on]/off | Should a legend be printed at the beginning of the output showing the field names for each column of data. SHOW_TIME_FIELD | on/[off] | Should the current analysis time be output as the first field. - ## Experimental Property | Value | Description @@ -138,7 +137,7 @@ The IOSS library is licensed under the BSD open source license. Copyright(C) 1999-2020 National Technology & Engineering Solutions of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with NTESS, the U.S. Government retains certain rights in this software. - + See packages/seacas/LICENSE for details Redistribution and use in source and binary forms, with or without diff --git a/packages/seacas/libraries/ioss/src/Ioss_Edge2.C b/packages/seacas/libraries/ioss/src/Ioss_Edge2.C index 040911e36a2a..ed1c8fecf3ad 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Edge2.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Edge2.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "Ioss_CodeTypes.h" // for IntVector diff --git a/packages/seacas/libraries/ioss/src/Ioss_Edge2.h b/packages/seacas/libraries/ioss/src/Ioss_Edge2.h index d18d2ad7cc83..4ad465e5d080 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Edge2.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Edge2.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_Edge2_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_Edge2D2.C b/packages/seacas/libraries/ioss/src/Ioss_Edge2D2.C index 63bda42b52f0..204e72a2abb2 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Edge2D2.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Edge2D2.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "Ioss_CodeTypes.h" // for IntVector diff --git a/packages/seacas/libraries/ioss/src/Ioss_Edge2D2.h b/packages/seacas/libraries/ioss/src/Ioss_Edge2D2.h index 5fdb98c4a9a2..a94965e5824d 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Edge2D2.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Edge2D2.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_Edge2D2_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_Edge2D3.C b/packages/seacas/libraries/ioss/src/Ioss_Edge2D3.C index 80ff75902dd6..608f7f10544b 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Edge2D3.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Edge2D3.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "Ioss_CodeTypes.h" // for IntVector diff --git a/packages/seacas/libraries/ioss/src/Ioss_Edge2D3.h b/packages/seacas/libraries/ioss/src/Ioss_Edge2D3.h index 660d805e6e88..17a6de301388 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Edge2D3.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Edge2D3.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_Edge2D3_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_Edge3.C b/packages/seacas/libraries/ioss/src/Ioss_Edge3.C index c0352d9c63ab..4de22ab8ec07 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Edge3.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Edge3.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "Ioss_CodeTypes.h" // for IntVector diff --git a/packages/seacas/libraries/ioss/src/Ioss_Edge3.h b/packages/seacas/libraries/ioss/src/Ioss_Edge3.h index ac39e095d0c6..933797cf1035 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Edge3.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Edge3.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_Edge3_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_Edge4.C b/packages/seacas/libraries/ioss/src/Ioss_Edge4.C index ea1114a563ce..c95bd8b2c2d4 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Edge4.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Edge4.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "Ioss_CodeTypes.h" // for IntVector diff --git a/packages/seacas/libraries/ioss/src/Ioss_Edge4.h b/packages/seacas/libraries/ioss/src/Ioss_Edge4.h index 6cfba6e5bff3..e9f9b3f24e79 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Edge4.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Edge4.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_Edge4_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_EdgeBlock.C b/packages/seacas/libraries/ioss/src/Ioss_EdgeBlock.C index 82a44ec00fcb..cde4ebd69c0c 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_EdgeBlock.C +++ b/packages/seacas/libraries/ioss/src/Ioss_EdgeBlock.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include // for IntVector diff --git a/packages/seacas/libraries/ioss/src/Ioss_EdgeBlock.h b/packages/seacas/libraries/ioss/src/Ioss_EdgeBlock.h index e152bbb53788..fbb6893ad36a 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_EdgeBlock.h +++ b/packages/seacas/libraries/ioss/src/Ioss_EdgeBlock.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_EdgeBlock_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_EdgeSet.C b/packages/seacas/libraries/ioss/src/Ioss_EdgeSet.C index 97ea0b68953f..dff6d9e53f56 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_EdgeSet.C +++ b/packages/seacas/libraries/ioss/src/Ioss_EdgeSet.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include diff --git a/packages/seacas/libraries/ioss/src/Ioss_EdgeSet.h b/packages/seacas/libraries/ioss/src/Ioss_EdgeSet.h index a12d956d13a2..99f9184e7e82 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_EdgeSet.h +++ b/packages/seacas/libraries/ioss/src/Ioss_EdgeSet.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_EdgeSet_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_ElementBlock.C b/packages/seacas/libraries/ioss/src/Ioss_ElementBlock.C index e09721b06e1a..71774df68cb9 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_ElementBlock.C +++ b/packages/seacas/libraries/ioss/src/Ioss_ElementBlock.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "Ioss_BoundingBox.h" // for AxisAlignedBoundingBox diff --git a/packages/seacas/libraries/ioss/src/Ioss_ElementBlock.h b/packages/seacas/libraries/ioss/src/Ioss_ElementBlock.h index a931d414fb3b..2d41c1059884 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_ElementBlock.h +++ b/packages/seacas/libraries/ioss/src/Ioss_ElementBlock.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_ElementBlock_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_ElementSet.C b/packages/seacas/libraries/ioss/src/Ioss_ElementSet.C index a2028ac4d03a..cd5729159769 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_ElementSet.C +++ b/packages/seacas/libraries/ioss/src/Ioss_ElementSet.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include diff --git a/packages/seacas/libraries/ioss/src/Ioss_ElementSet.h b/packages/seacas/libraries/ioss/src/Ioss_ElementSet.h index 0372728fd78c..246a06569011 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_ElementSet.h +++ b/packages/seacas/libraries/ioss/src/Ioss_ElementSet.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_ElementSet_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_ElementTopology.C b/packages/seacas/libraries/ioss/src/Ioss_ElementTopology.C index 7726f6f3f0bf..4baecbaa8af8 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_ElementTopology.C +++ b/packages/seacas/libraries/ioss/src/Ioss_ElementTopology.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include // for IntVector diff --git a/packages/seacas/libraries/ioss/src/Ioss_ElementTopology.h b/packages/seacas/libraries/ioss/src/Ioss_ElementTopology.h index f18687b6ee35..16540e134532 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_ElementTopology.h +++ b/packages/seacas/libraries/ioss/src/Ioss_ElementTopology.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_Element_Topology_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_ElementVariableType.h b/packages/seacas/libraries/ioss/src/Ioss_ElementVariableType.h index 22c7075dd980..0c02b24ef1f7 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_ElementVariableType.h +++ b/packages/seacas/libraries/ioss/src/Ioss_ElementVariableType.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_ElementVariableType_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_EntityBlock.C b/packages/seacas/libraries/ioss/src/Ioss_EntityBlock.C index d6bc4882d864..4a8e3b07ad99 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_EntityBlock.C +++ b/packages/seacas/libraries/ioss/src/Ioss_EntityBlock.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include diff --git a/packages/seacas/libraries/ioss/src/Ioss_EntityBlock.h b/packages/seacas/libraries/ioss/src/Ioss_EntityBlock.h index e2fe259b708a..ff3101220dfd 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_EntityBlock.h +++ b/packages/seacas/libraries/ioss/src/Ioss_EntityBlock.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_EntityBlock_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_EntitySet.C b/packages/seacas/libraries/ioss/src/Ioss_EntitySet.C index 33a88013402b..c344a7e02d2e 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_EntitySet.C +++ b/packages/seacas/libraries/ioss/src/Ioss_EntitySet.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include diff --git a/packages/seacas/libraries/ioss/src/Ioss_EntitySet.h b/packages/seacas/libraries/ioss/src/Ioss_EntitySet.h index e4ff5fa296e7..49de96fd082a 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_EntitySet.h +++ b/packages/seacas/libraries/ioss/src/Ioss_EntitySet.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_EntitySet_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_EntityType.h b/packages/seacas/libraries/ioss/src/Ioss_EntityType.h index b68cb9657475..c795ba2e67c9 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_EntityType.h +++ b/packages/seacas/libraries/ioss/src/Ioss_EntityType.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_EntityType_H diff --git a/packages/seacas/libraries/ioss/src/Ioss_FaceBlock.C b/packages/seacas/libraries/ioss/src/Ioss_FaceBlock.C index 92dd57436f85..96c857457351 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_FaceBlock.C +++ b/packages/seacas/libraries/ioss/src/Ioss_FaceBlock.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include diff --git a/packages/seacas/libraries/ioss/src/Ioss_FaceBlock.h b/packages/seacas/libraries/ioss/src/Ioss_FaceBlock.h index ff8e6d18e25f..228ec7fd6b07 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_FaceBlock.h +++ b/packages/seacas/libraries/ioss/src/Ioss_FaceBlock.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_FaceBlock_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_FaceGenerator.C b/packages/seacas/libraries/ioss/src/Ioss_FaceGenerator.C index 65366dbe3772..af954d31ec0b 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_FaceGenerator.C +++ b/packages/seacas/libraries/ioss/src/Ioss_FaceGenerator.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include diff --git a/packages/seacas/libraries/ioss/src/Ioss_FaceGenerator.h b/packages/seacas/libraries/ioss/src/Ioss_FaceGenerator.h index 0a3b2a08c0e5..e0e6d25a3d0c 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_FaceGenerator.h +++ b/packages/seacas/libraries/ioss/src/Ioss_FaceGenerator.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_FaceGenerator_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_FaceSet.C b/packages/seacas/libraries/ioss/src/Ioss_FaceSet.C index fec7683b6098..0283e27261e0 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_FaceSet.C +++ b/packages/seacas/libraries/ioss/src/Ioss_FaceSet.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include diff --git a/packages/seacas/libraries/ioss/src/Ioss_FaceSet.h b/packages/seacas/libraries/ioss/src/Ioss_FaceSet.h index 7630761dcbe5..95da29671a7a 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_FaceSet.h +++ b/packages/seacas/libraries/ioss/src/Ioss_FaceSet.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_FaceSet_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_Field.C b/packages/seacas/libraries/ioss/src/Ioss_Field.C index c325c2e8df8f..cbbd7b9e4cce 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Field.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Field.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include diff --git a/packages/seacas/libraries/ioss/src/Ioss_Field.h b/packages/seacas/libraries/ioss/src/Ioss_Field.h index 8368ac92582d..702309ffeedb 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Field.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Field.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_Field_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_FieldManager.C b/packages/seacas/libraries/ioss/src/Ioss_FieldManager.C index d44e38dec90b..2db59f817c43 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_FieldManager.C +++ b/packages/seacas/libraries/ioss/src/Ioss_FieldManager.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include diff --git a/packages/seacas/libraries/ioss/src/Ioss_FieldManager.h b/packages/seacas/libraries/ioss/src/Ioss_FieldManager.h index c477cd8d9c6c..91ce51377c7e 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_FieldManager.h +++ b/packages/seacas/libraries/ioss/src/Ioss_FieldManager.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_FieldManager_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_FileInfo.C b/packages/seacas/libraries/ioss/src/Ioss_FileInfo.C index f850c4525fe2..b1db4441269e 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_FileInfo.C +++ b/packages/seacas/libraries/ioss/src/Ioss_FileInfo.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include @@ -13,7 +13,7 @@ #include #include -#ifndef _MSC_VER +#ifndef _WIN32 #include #else #include @@ -156,7 +156,7 @@ namespace Ioss { //: Returns TRUE if we are pointing to a symbolic link bool FileInfo::is_symlink() const { -#ifndef _MSC_VER +#ifndef _WIN32 struct stat s { }; @@ -289,7 +289,7 @@ namespace Ioss { std::string FileInfo::realpath() const { -#ifdef _MSC_VER +#ifdef _WIN32 char *path = _fullpath(nullptr, filename_.c_str(), _MAX_PATH); #else char *path = ::realpath(filename_.c_str(), nullptr); @@ -326,7 +326,7 @@ namespace Ioss { struct stat st; if (stat(path_root.c_str(), &st) != 0) { const int mode = 0777; // Users umask will be applied to this. -#ifdef _MSC_VER +#ifdef _WIN32 if (mkdir(path_root.c_str()) != 0 && errno != EEXIST) { #else if (mkdir(path_root.c_str(), mode) != 0 && errno != EEXIST) { @@ -400,12 +400,6 @@ namespace { bool do_stat(const std::string &filename, struct stat *s) { -#if defined(__PUMAGON__) - // Portland pgCC compiler on janus has 'char*' instead of 'const char*' for - // first argument to stat function. - return (stat((char *)filename.c_str(), s) == 0); -#else return (stat(filename.c_str(), s) == 0); -#endif } } // namespace diff --git a/packages/seacas/libraries/ioss/src/Ioss_FileInfo.h b/packages/seacas/libraries/ioss/src/Ioss_FileInfo.h index 5f98def511cb..ad8cad9be005 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_FileInfo.h +++ b/packages/seacas/libraries/ioss/src/Ioss_FileInfo.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_FileInfo_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_GetLongOpt.C b/packages/seacas/libraries/ioss/src/Ioss_GetLongOpt.C index b362ece7fb84..9b992a960d15 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_GetLongOpt.C +++ b/packages/seacas/libraries/ioss/src/Ioss_GetLongOpt.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details /* S Manoharan. Advanced Computer Research Institute. Lyon. France */ diff --git a/packages/seacas/libraries/ioss/src/Ioss_GetLongOpt.h b/packages/seacas/libraries/ioss/src/Ioss_GetLongOpt.h index b0e673384453..445b0bf988e5 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_GetLongOpt.h +++ b/packages/seacas/libraries/ioss/src/Ioss_GetLongOpt.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /* S Manoharan. Advanced Computer Research Institute. Lyon. France */ diff --git a/packages/seacas/libraries/ioss/src/Ioss_Getline.c b/packages/seacas/libraries/ioss/src/Ioss_Getline.c index def2d81a33d2..e01195c0f9de 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Getline.c +++ b/packages/seacas/libraries/ioss/src/Ioss_Getline.c @@ -1,4 +1,3 @@ -/* Based on: "$Id: getline.c,v 3.11 1993/12/02 15:54:31 thewalt Exp thewalt $"; */ /* * Copyright (C) 1991, 1992, 1993, 2020 by Chris Thewalt (thewalt@ce.berkeley.edu) @@ -20,7 +19,7 @@ * Note: This version has been updated by Mike Gleason */ -#if defined(WIN32) || defined(_WINDOWS) || defined(_MSC_VER) +#if defined(_WIN32) #define __windows__ 1 #include @@ -1033,8 +1032,9 @@ static void gl_killword(int direction) } memcpy(gl_killbuf, gl_buf + startpos, (size_t)(pos - startpos)); gl_killbuf[pos - startpos] = '\0'; - if (isspace(gl_killbuf[pos - startpos - 1])) + if (pos - startpos - 1 >= 0 && isspace(gl_killbuf[pos - startpos - 1])) { gl_killbuf[pos - startpos - 1] = '\0'; + } gl_fixup(gl_prompt, -1, startpos); for (i = 0, tmp = pos - startpos; i < tmp; i++) gl_del(0, 0); diff --git a/packages/seacas/libraries/ioss/src/Ioss_Getline.h b/packages/seacas/libraries/ioss/src/Ioss_Getline.h index a3c2426b6d54..a795c7d4fb54 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Getline.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Getline.h @@ -1,4 +1,3 @@ -/* Based on: "$Id: getline.c,v 3.11 1993/12/02 15:54:31 thewalt Exp thewalt $"; */ /* * Copyright (C) 1991, 1992, 1993 by Chris Thewalt (thewalt@ce.berkeley.edu) diff --git a/packages/seacas/libraries/ioss/src/Ioss_GroupingEntity.C b/packages/seacas/libraries/ioss/src/Ioss_GroupingEntity.C index e86967132406..f6ed85628da8 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_GroupingEntity.C +++ b/packages/seacas/libraries/ioss/src/Ioss_GroupingEntity.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include diff --git a/packages/seacas/libraries/ioss/src/Ioss_GroupingEntity.h b/packages/seacas/libraries/ioss/src/Ioss_GroupingEntity.h index 533f9db76a98..604bdcb09c50 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_GroupingEntity.h +++ b/packages/seacas/libraries/ioss/src/Ioss_GroupingEntity.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_GroupingEntity_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_Hex16.C b/packages/seacas/libraries/ioss/src/Ioss_Hex16.C index d91c7e49bcce..859a2e634ea5 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Hex16.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Hex16.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "Ioss_CodeTypes.h" // for IntVector diff --git a/packages/seacas/libraries/ioss/src/Ioss_Hex16.h b/packages/seacas/libraries/ioss/src/Ioss_Hex16.h index fa91a500c1a8..fcfa3f6969ca 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Hex16.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Hex16.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_Hex16_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_Hex20.C b/packages/seacas/libraries/ioss/src/Ioss_Hex20.C index 1feeec047e1c..b01dbe31eadb 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Hex20.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Hex20.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "Ioss_CodeTypes.h" // for IntVector diff --git a/packages/seacas/libraries/ioss/src/Ioss_Hex20.h b/packages/seacas/libraries/ioss/src/Ioss_Hex20.h index aa0b405fde29..5736bc6489cd 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Hex20.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Hex20.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_Hex20_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_Hex27.C b/packages/seacas/libraries/ioss/src/Ioss_Hex27.C index 835df970ea58..08fc440d2218 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Hex27.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Hex27.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "Ioss_CodeTypes.h" // for IntVector diff --git a/packages/seacas/libraries/ioss/src/Ioss_Hex27.h b/packages/seacas/libraries/ioss/src/Ioss_Hex27.h index 48ab4e3b106a..5c7460c87691 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Hex27.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Hex27.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_Hex27_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_Hex32.C b/packages/seacas/libraries/ioss/src/Ioss_Hex32.C index 6fa3a250ac2a..4916ef0ceae5 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Hex32.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Hex32.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "Ioss_CodeTypes.h" // for IntVector diff --git a/packages/seacas/libraries/ioss/src/Ioss_Hex32.h b/packages/seacas/libraries/ioss/src/Ioss_Hex32.h index 3ff643111dcd..dee2ebcd7b70 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Hex32.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Hex32.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_Hex32_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_Hex64.C b/packages/seacas/libraries/ioss/src/Ioss_Hex64.C index 84108edd437b..660ee456519e 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Hex64.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Hex64.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "Ioss_CodeTypes.h" // for IntVector diff --git a/packages/seacas/libraries/ioss/src/Ioss_Hex64.h b/packages/seacas/libraries/ioss/src/Ioss_Hex64.h index 5b5f397adaf0..1dc3a47008aa 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Hex64.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Hex64.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_Hex64_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_Hex8.C b/packages/seacas/libraries/ioss/src/Ioss_Hex8.C index fde76359f664..1e383dd271d9 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Hex8.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Hex8.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "Ioss_CodeTypes.h" // for IntVector diff --git a/packages/seacas/libraries/ioss/src/Ioss_Hex8.h b/packages/seacas/libraries/ioss/src/Ioss_Hex8.h index 3598f755b16b..da3f268d973c 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Hex8.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Hex8.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_Hex8_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_IOFactory.C b/packages/seacas/libraries/ioss/src/Ioss_IOFactory.C index 2cb9d2fd44f4..954481e2968b 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_IOFactory.C +++ b/packages/seacas/libraries/ioss/src/Ioss_IOFactory.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "Ioss_DBUsage.h" // for DatabaseUsage diff --git a/packages/seacas/libraries/ioss/src/Ioss_IOFactory.h b/packages/seacas/libraries/ioss/src/Ioss_IOFactory.h index b00eee60556b..e4048b010338 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_IOFactory.h +++ b/packages/seacas/libraries/ioss/src/Ioss_IOFactory.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_IOFactory_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_Initializer.C b/packages/seacas/libraries/ioss/src/Ioss_Initializer.C index 7fe4f78a27a6..649ae51ae839 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Initializer.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Initializer.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include diff --git a/packages/seacas/libraries/ioss/src/Ioss_Initializer.h b/packages/seacas/libraries/ioss/src/Ioss_Initializer.h index 9eb29fe022f2..db41f1969c7d 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Initializer.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Initializer.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details namespace Ioss { diff --git a/packages/seacas/libraries/ioss/src/Ioss_Map.C b/packages/seacas/libraries/ioss/src/Ioss_Map.C index 0cd9293f9e42..aac607402b77 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Map.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Map.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include // for Field, etc diff --git a/packages/seacas/libraries/ioss/src/Ioss_Map.h b/packages/seacas/libraries/ioss/src/Ioss_Map.h index fd3b8624fbd6..a271ac4d4dc7 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Map.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Map.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_Map_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_MeshCopyOptions.h b/packages/seacas/libraries/ioss/src/Ioss_MeshCopyOptions.h index d8575c4764a9..608569b87834 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_MeshCopyOptions.h +++ b/packages/seacas/libraries/ioss/src/Ioss_MeshCopyOptions.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ namespace Ioss { diff --git a/packages/seacas/libraries/ioss/src/Ioss_MeshType.h b/packages/seacas/libraries/ioss/src/Ioss_MeshType.h index 89ea6336aa69..1f28b468502c 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_MeshType.h +++ b/packages/seacas/libraries/ioss/src/Ioss_MeshType.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_mesh_type_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_NamedSuffixVariableType.h b/packages/seacas/libraries/ioss/src/Ioss_NamedSuffixVariableType.h index 9ad4ca907fe8..b3a63f75b7c9 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_NamedSuffixVariableType.h +++ b/packages/seacas/libraries/ioss/src/Ioss_NamedSuffixVariableType.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #ifndef IOSS_Ioss_NamedSuffixVariableType_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_Node.C b/packages/seacas/libraries/ioss/src/Ioss_Node.C index d72f8969b249..b020d4ff57f3 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Node.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Node.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details //------------------------------------------------------------------------ diff --git a/packages/seacas/libraries/ioss/src/Ioss_Node.h b/packages/seacas/libraries/ioss/src/Ioss_Node.h index 6340d88c77f3..727e1181117c 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Node.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Node.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_Node_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_NodeBlock.C b/packages/seacas/libraries/ioss/src/Ioss_NodeBlock.C index 764f114923a9..2cfaa05811b8 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_NodeBlock.C +++ b/packages/seacas/libraries/ioss/src/Ioss_NodeBlock.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include diff --git a/packages/seacas/libraries/ioss/src/Ioss_NodeBlock.h b/packages/seacas/libraries/ioss/src/Ioss_NodeBlock.h index eddfd2b40494..b0c87d217d52 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_NodeBlock.h +++ b/packages/seacas/libraries/ioss/src/Ioss_NodeBlock.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_NodeBlock_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_NodeSet.C b/packages/seacas/libraries/ioss/src/Ioss_NodeSet.C index fea03aab55fc..ea7fd7440e64 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_NodeSet.C +++ b/packages/seacas/libraries/ioss/src/Ioss_NodeSet.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include diff --git a/packages/seacas/libraries/ioss/src/Ioss_NodeSet.h b/packages/seacas/libraries/ioss/src/Ioss_NodeSet.h index 4376a4801196..8206d4b5f5e9 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_NodeSet.h +++ b/packages/seacas/libraries/ioss/src/Ioss_NodeSet.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_NodeSet_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_NullEntity.h b/packages/seacas/libraries/ioss/src/Ioss_NullEntity.h index 0c575fcf6934..c3d436c52bde 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_NullEntity.h +++ b/packages/seacas/libraries/ioss/src/Ioss_NullEntity.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_NullEntity_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_ParallelUtils.C b/packages/seacas/libraries/ioss/src/Ioss_ParallelUtils.C index 13417ea553ef..12a4c7d29611 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_ParallelUtils.C +++ b/packages/seacas/libraries/ioss/src/Ioss_ParallelUtils.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include diff --git a/packages/seacas/libraries/ioss/src/Ioss_ParallelUtils.h b/packages/seacas/libraries/ioss/src/Ioss_ParallelUtils.h index c2cd4b713253..68284199080d 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_ParallelUtils.h +++ b/packages/seacas/libraries/ioss/src/Ioss_ParallelUtils.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_ParallelUtils_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_Property.C b/packages/seacas/libraries/ioss/src/Ioss_Property.C index d9c1c646a40f..6c5078effe77 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Property.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Property.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include #include diff --git a/packages/seacas/libraries/ioss/src/Ioss_Property.h b/packages/seacas/libraries/ioss/src/Ioss_Property.h index 5892eba956ad..6100e86761e0 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Property.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Property.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_Property_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_PropertyManager.C b/packages/seacas/libraries/ioss/src/Ioss_PropertyManager.C index 27ccd1a6832d..6f789b2c7250 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_PropertyManager.C +++ b/packages/seacas/libraries/ioss/src/Ioss_PropertyManager.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include diff --git a/packages/seacas/libraries/ioss/src/Ioss_PropertyManager.h b/packages/seacas/libraries/ioss/src/Ioss_PropertyManager.h index 07924b256119..358ddfdfaf93 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_PropertyManager.h +++ b/packages/seacas/libraries/ioss/src/Ioss_PropertyManager.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_PropertyManager_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_Pyramid13.C b/packages/seacas/libraries/ioss/src/Ioss_Pyramid13.C index 52a6fefe3312..3b25f416255f 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Pyramid13.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Pyramid13.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details //------------------------------------------------------------------------ diff --git a/packages/seacas/libraries/ioss/src/Ioss_Pyramid13.h b/packages/seacas/libraries/ioss/src/Ioss_Pyramid13.h index e86561438ca6..7935cfce2646 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Pyramid13.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Pyramid13.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_Pyramid13_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_Pyramid14.C b/packages/seacas/libraries/ioss/src/Ioss_Pyramid14.C index 513c2a235b75..4f3c524ac194 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Pyramid14.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Pyramid14.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details //------------------------------------------------------------------------ diff --git a/packages/seacas/libraries/ioss/src/Ioss_Pyramid14.h b/packages/seacas/libraries/ioss/src/Ioss_Pyramid14.h index 823fd7c7159c..22c5517ba995 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Pyramid14.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Pyramid14.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_Pyramid14_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_Pyramid18.C b/packages/seacas/libraries/ioss/src/Ioss_Pyramid18.C index 071fb7327519..a564d1c6f26a 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Pyramid18.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Pyramid18.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details //------------------------------------------------------------------------ diff --git a/packages/seacas/libraries/ioss/src/Ioss_Pyramid18.h b/packages/seacas/libraries/ioss/src/Ioss_Pyramid18.h index 8c6dedbf5007..1c49f296adf1 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Pyramid18.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Pyramid18.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_Pyramid18_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_Pyramid19.C b/packages/seacas/libraries/ioss/src/Ioss_Pyramid19.C index 2fd900849ba8..54dc4fd59ec6 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Pyramid19.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Pyramid19.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details //------------------------------------------------------------------------ diff --git a/packages/seacas/libraries/ioss/src/Ioss_Pyramid19.h b/packages/seacas/libraries/ioss/src/Ioss_Pyramid19.h index 060ce3370ff8..60f9f62d872d 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Pyramid19.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Pyramid19.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_Pyramid19_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_Pyramid5.C b/packages/seacas/libraries/ioss/src/Ioss_Pyramid5.C index 230b3c086afc..52b3723d4ea4 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Pyramid5.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Pyramid5.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details //------------------------------------------------------------------------ diff --git a/packages/seacas/libraries/ioss/src/Ioss_Pyramid5.h b/packages/seacas/libraries/ioss/src/Ioss_Pyramid5.h index 4f4a9ee19e3e..31874d4598d6 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Pyramid5.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Pyramid5.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_Pyramid5_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_Quad12.C b/packages/seacas/libraries/ioss/src/Ioss_Quad12.C index cf333771be58..e4ef3776132b 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Quad12.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Quad12.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details //------------------------------------------------------------------------ diff --git a/packages/seacas/libraries/ioss/src/Ioss_Quad12.h b/packages/seacas/libraries/ioss/src/Ioss_Quad12.h index 56df52412eaa..5ff5b50f102c 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Quad12.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Quad12.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_Quad12_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_Quad16.C b/packages/seacas/libraries/ioss/src/Ioss_Quad16.C index 0296a1e04d96..979155e43291 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Quad16.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Quad16.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details //------------------------------------------------------------------------ diff --git a/packages/seacas/libraries/ioss/src/Ioss_Quad16.h b/packages/seacas/libraries/ioss/src/Ioss_Quad16.h index 924670a5bedd..274baa2ce29d 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Quad16.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Quad16.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_Quad16_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_Quad4.C b/packages/seacas/libraries/ioss/src/Ioss_Quad4.C index e01e49c5590b..518979fd8431 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Quad4.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Quad4.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details //------------------------------------------------------------------------ diff --git a/packages/seacas/libraries/ioss/src/Ioss_Quad4.h b/packages/seacas/libraries/ioss/src/Ioss_Quad4.h index a2384318c214..42372c4ac231 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Quad4.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Quad4.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_Quad4_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_Quad6.C b/packages/seacas/libraries/ioss/src/Ioss_Quad6.C index 8452f7c0137d..364240d8c1d2 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Quad6.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Quad6.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details //------------------------------------------------------------------------ diff --git a/packages/seacas/libraries/ioss/src/Ioss_Quad6.h b/packages/seacas/libraries/ioss/src/Ioss_Quad6.h index 1317056e275a..6417fee9f162 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Quad6.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Quad6.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_Quad6_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_Quad8.C b/packages/seacas/libraries/ioss/src/Ioss_Quad8.C index d03b233b208b..b8b297551ff4 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Quad8.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Quad8.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details //------------------------------------------------------------------------ diff --git a/packages/seacas/libraries/ioss/src/Ioss_Quad8.h b/packages/seacas/libraries/ioss/src/Ioss_Quad8.h index d104098b87ce..10f819743b1a 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Quad8.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Quad8.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_Quad8_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_Quad9.C b/packages/seacas/libraries/ioss/src/Ioss_Quad9.C index 2d48da379ff0..18f7110bed88 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Quad9.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Quad9.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details //------------------------------------------------------------------------ diff --git a/packages/seacas/libraries/ioss/src/Ioss_Quad9.h b/packages/seacas/libraries/ioss/src/Ioss_Quad9.h index 8a0487532f9c..1c2e5938962a 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Quad9.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Quad9.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_Quad9_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_Region.C b/packages/seacas/libraries/ioss/src/Ioss_Region.C index d35a5dab381a..c0d24b7e0381 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Region.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Region.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include @@ -64,7 +64,8 @@ namespace { return nullptr; } - template size_t internal_get_variable_count(const std::vector &entities, Ioss::Field::RoleType role) + template + size_t internal_get_variable_count(const std::vector &entities, Ioss::Field::RoleType role) { Ioss::NameList names; for (auto ent : entities) { @@ -132,7 +133,7 @@ namespace { } fmt::print(errmsg, "ERROR: There are multiple blocks or sets with the same name defined in the " - "exodus file '{}'.\n" + "database file '{}'.\n" "\tBoth {} {} and {} {} are named '{}'. All names must be unique.", filename, entity->type_string(), id1, old_ge->type_string(), id2, name); IOSS_ERROR(errmsg); diff --git a/packages/seacas/libraries/ioss/src/Ioss_Region.h b/packages/seacas/libraries/ioss/src/Ioss_Region.h index 5ea20df3ca0d..f405adfba5d7 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Region.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Region.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_Region_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_ScopeGuard.h b/packages/seacas/libraries/ioss/src/Ioss_ScopeGuard.h index 3893c99b2d79..fdf9ed0280fb 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_ScopeGuard.h +++ b/packages/seacas/libraries/ioss/src/Ioss_ScopeGuard.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #ifndef SCOPEGUARD_H_ diff --git a/packages/seacas/libraries/ioss/src/Ioss_SerializeIO.C b/packages/seacas/libraries/ioss/src/Ioss_SerializeIO.C index d4c71265e9f1..d034c61cd1b0 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_SerializeIO.C +++ b/packages/seacas/libraries/ioss/src/Ioss_SerializeIO.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "Ioss_CodeTypes.h" // for SEACAS_HAVE_MPI #include // for DatabaseIO diff --git a/packages/seacas/libraries/ioss/src/Ioss_SerializeIO.h b/packages/seacas/libraries/ioss/src/Ioss_SerializeIO.h index 2d8d4641d2d3..c0361a39f92b 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_SerializeIO.h +++ b/packages/seacas/libraries/ioss/src/Ioss_SerializeIO.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_SerializeIO_h #define IOSS_Ioss_SerializeIO_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_Shell4.C b/packages/seacas/libraries/ioss/src/Ioss_Shell4.C index bd3234fad24c..750bdf184615 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Shell4.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Shell4.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details //------------------------------------------------------------------------ diff --git a/packages/seacas/libraries/ioss/src/Ioss_Shell4.h b/packages/seacas/libraries/ioss/src/Ioss_Shell4.h index eef584330a19..9f6a95a9840c 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Shell4.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Shell4.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_Shell4_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_Shell8.C b/packages/seacas/libraries/ioss/src/Ioss_Shell8.C index c25bce647ec8..f7ad66711878 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Shell8.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Shell8.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details //------------------------------------------------------------------------ diff --git a/packages/seacas/libraries/ioss/src/Ioss_Shell8.h b/packages/seacas/libraries/ioss/src/Ioss_Shell8.h index 71e254979b9f..c5757768bb87 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Shell8.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Shell8.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_Shell8_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_Shell9.C b/packages/seacas/libraries/ioss/src/Ioss_Shell9.C index 7c3a03c08665..e42db622d799 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Shell9.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Shell9.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "Ioss_CodeTypes.h" // for IntVector diff --git a/packages/seacas/libraries/ioss/src/Ioss_Shell9.h b/packages/seacas/libraries/ioss/src/Ioss_Shell9.h index 2106ae85687f..6a769bc3cc28 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Shell9.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Shell9.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_Shell9_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_ShellLine2D2.C b/packages/seacas/libraries/ioss/src/Ioss_ShellLine2D2.C index 2d7fe2b38316..6777fb16f226 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_ShellLine2D2.C +++ b/packages/seacas/libraries/ioss/src/Ioss_ShellLine2D2.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "Ioss_CodeTypes.h" // for IntVector diff --git a/packages/seacas/libraries/ioss/src/Ioss_ShellLine2D2.h b/packages/seacas/libraries/ioss/src/Ioss_ShellLine2D2.h index cc483df9e4ea..cda5b6253c16 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_ShellLine2D2.h +++ b/packages/seacas/libraries/ioss/src/Ioss_ShellLine2D2.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_ShellLine2D2_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_ShellLine2D3.C b/packages/seacas/libraries/ioss/src/Ioss_ShellLine2D3.C index f9500e0c2a59..8637152ee943 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_ShellLine2D3.C +++ b/packages/seacas/libraries/ioss/src/Ioss_ShellLine2D3.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "Ioss_CodeTypes.h" // for IntVector diff --git a/packages/seacas/libraries/ioss/src/Ioss_ShellLine2D3.h b/packages/seacas/libraries/ioss/src/Ioss_ShellLine2D3.h index b56a587c8b37..8125d0d35668 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_ShellLine2D3.h +++ b/packages/seacas/libraries/ioss/src/Ioss_ShellLine2D3.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_ShellLine2D3_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_SideBlock.C b/packages/seacas/libraries/ioss/src/Ioss_SideBlock.C index 493b8ebbb5a3..e0912a8f1a26 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_SideBlock.C +++ b/packages/seacas/libraries/ioss/src/Ioss_SideBlock.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include diff --git a/packages/seacas/libraries/ioss/src/Ioss_SideBlock.h b/packages/seacas/libraries/ioss/src/Ioss_SideBlock.h index 5b4b117920af..f0c3a7f34f95 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_SideBlock.h +++ b/packages/seacas/libraries/ioss/src/Ioss_SideBlock.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_SideBlock_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_SideSet.C b/packages/seacas/libraries/ioss/src/Ioss_SideSet.C index bb8358feffdf..0f821d47b98b 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_SideSet.C +++ b/packages/seacas/libraries/ioss/src/Ioss_SideSet.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include diff --git a/packages/seacas/libraries/ioss/src/Ioss_SideSet.h b/packages/seacas/libraries/ioss/src/Ioss_SideSet.h index 5f15383e10b3..5201072433e8 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_SideSet.h +++ b/packages/seacas/libraries/ioss/src/Ioss_SideSet.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_SideSet_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_SmartAssert.C b/packages/seacas/libraries/ioss/src/Ioss_SmartAssert.C index f64a9b05bfae..41d54c903113 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_SmartAssert.C +++ b/packages/seacas/libraries/ioss/src/Ioss_SmartAssert.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include diff --git a/packages/seacas/libraries/ioss/src/Ioss_SmartAssert.h b/packages/seacas/libraries/ioss/src/Ioss_SmartAssert.h index 1e526cf0ec54..6d35292f043b 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_SmartAssert.h +++ b/packages/seacas/libraries/ioss/src/Ioss_SmartAssert.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #if !defined(IOSS_SMART_ASSERT_H) #define IOSS_SMART_ASSERT_H diff --git a/packages/seacas/libraries/ioss/src/Ioss_Sort.h b/packages/seacas/libraries/ioss/src/Ioss_Sort.h index e67024c5d9c1..7568f18d44b6 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Sort.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Sort.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_Sort_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_Sphere.C b/packages/seacas/libraries/ioss/src/Ioss_Sphere.C index 30db9cc5b243..0eb7b30e44ed 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Sphere.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Sphere.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "Ioss_CodeTypes.h" // for IntVector diff --git a/packages/seacas/libraries/ioss/src/Ioss_Sphere.h b/packages/seacas/libraries/ioss/src/Ioss_Sphere.h index 3ad0c0496e37..00b72b60bac7 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Sphere.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Sphere.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_Sphere_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_Spring2.C b/packages/seacas/libraries/ioss/src/Ioss_Spring2.C index 4bfa469bed36..db6efea72102 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Spring2.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Spring2.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "Ioss_CodeTypes.h" // for IntVector diff --git a/packages/seacas/libraries/ioss/src/Ioss_Spring2.h b/packages/seacas/libraries/ioss/src/Ioss_Spring2.h index bca81befc99c..64d242c03d63 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Spring2.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Spring2.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_Spring2_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_Spring3.C b/packages/seacas/libraries/ioss/src/Ioss_Spring3.C index 219340343f6c..cd910a55ffca 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Spring3.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Spring3.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "Ioss_CodeTypes.h" // for IntVector diff --git a/packages/seacas/libraries/ioss/src/Ioss_Spring3.h b/packages/seacas/libraries/ioss/src/Ioss_Spring3.h index 94fa4f4f012c..7917ef042b75 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Spring3.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Spring3.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_Spring3_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_StandardElementTypes.h b/packages/seacas/libraries/ioss/src/Ioss_StandardElementTypes.h index 699627bfc0a9..a7c22dc8428c 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_StandardElementTypes.h +++ b/packages/seacas/libraries/ioss/src/Ioss_StandardElementTypes.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #ifndef Ioss_STANDARD_ELEMENT_TYPES_H diff --git a/packages/seacas/libraries/ioss/src/Ioss_State.h b/packages/seacas/libraries/ioss/src/Ioss_State.h index 73ce970f564c..1c89077ac901 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_State.h +++ b/packages/seacas/libraries/ioss/src/Ioss_State.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_State_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_StructuredBlock.C b/packages/seacas/libraries/ioss/src/Ioss_StructuredBlock.C index c78ad969d71f..b25395790f5a 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_StructuredBlock.C +++ b/packages/seacas/libraries/ioss/src/Ioss_StructuredBlock.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include // for AxisAlignedBoundingBox diff --git a/packages/seacas/libraries/ioss/src/Ioss_StructuredBlock.h b/packages/seacas/libraries/ioss/src/Ioss_StructuredBlock.h index 414da4715ecd..42d1c886a1b5 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_StructuredBlock.h +++ b/packages/seacas/libraries/ioss/src/Ioss_StructuredBlock.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_StructuredBlock_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_SubSystem.h b/packages/seacas/libraries/ioss/src/Ioss_SubSystem.h index 3e23b33d3881..a711db149985 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_SubSystem.h +++ b/packages/seacas/libraries/ioss/src/Ioss_SubSystem.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_SubSystem_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_Super.C b/packages/seacas/libraries/ioss/src/Ioss_Super.C index 1f51f58ab6ae..b4dece267905 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Super.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Super.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "Ioss_CodeTypes.h" // for IntVector diff --git a/packages/seacas/libraries/ioss/src/Ioss_Super.h b/packages/seacas/libraries/ioss/src/Ioss_Super.h index 5480fdb93b66..75794f39fd87 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Super.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Super.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_Super_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_SurfaceSplit.h b/packages/seacas/libraries/ioss/src/Ioss_SurfaceSplit.h index 2664816baa5d..efd4c69e99c4 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_SurfaceSplit.h +++ b/packages/seacas/libraries/ioss/src/Ioss_SurfaceSplit.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_SurfaceSplit_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_Tet10.C b/packages/seacas/libraries/ioss/src/Ioss_Tet10.C index d4dc3ccdbcd7..b74370c961fa 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Tet10.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Tet10.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "Ioss_CodeTypes.h" // for IntVector diff --git a/packages/seacas/libraries/ioss/src/Ioss_Tet10.h b/packages/seacas/libraries/ioss/src/Ioss_Tet10.h index 29f61506a582..f5a083f9ebda 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Tet10.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Tet10.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_Tet10_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_Tet11.C b/packages/seacas/libraries/ioss/src/Ioss_Tet11.C index 638d6dcc6b7a..9a5be292b073 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Tet11.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Tet11.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "Ioss_CodeTypes.h" // for IntVector diff --git a/packages/seacas/libraries/ioss/src/Ioss_Tet11.h b/packages/seacas/libraries/ioss/src/Ioss_Tet11.h index 52f33a7ee92f..393a310481b7 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Tet11.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Tet11.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_Tet11_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_Tet14.C b/packages/seacas/libraries/ioss/src/Ioss_Tet14.C index 486cdd638539..55a387b47b40 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Tet14.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Tet14.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "Ioss_CodeTypes.h" // for IntVector diff --git a/packages/seacas/libraries/ioss/src/Ioss_Tet14.h b/packages/seacas/libraries/ioss/src/Ioss_Tet14.h index 34876de2459c..b98a3ae42376 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Tet14.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Tet14.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_Tet14_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_Tet15.C b/packages/seacas/libraries/ioss/src/Ioss_Tet15.C index f63e164b7e0d..e28f906f6dd2 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Tet15.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Tet15.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "Ioss_CodeTypes.h" // for IntVector diff --git a/packages/seacas/libraries/ioss/src/Ioss_Tet15.h b/packages/seacas/libraries/ioss/src/Ioss_Tet15.h index f24db32612aa..a7be7e363783 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Tet15.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Tet15.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_Tet15_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_Tet16.C b/packages/seacas/libraries/ioss/src/Ioss_Tet16.C index c226ac033c46..879f7fe7c330 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Tet16.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Tet16.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "Ioss_CodeTypes.h" // for IntVector diff --git a/packages/seacas/libraries/ioss/src/Ioss_Tet16.h b/packages/seacas/libraries/ioss/src/Ioss_Tet16.h index af2060e6fd06..85e11a83f0a7 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Tet16.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Tet16.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_Tet16_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_Tet4.C b/packages/seacas/libraries/ioss/src/Ioss_Tet4.C index bcec791f3f25..a67e89d986c9 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Tet4.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Tet4.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "Ioss_CodeTypes.h" // for IntVector diff --git a/packages/seacas/libraries/ioss/src/Ioss_Tet4.h b/packages/seacas/libraries/ioss/src/Ioss_Tet4.h index 66a1a02dbf53..bd5e40b2a48d 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Tet4.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Tet4.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_Tet4_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_Tet40.C b/packages/seacas/libraries/ioss/src/Ioss_Tet40.C index 70a2f7eadb43..2e0611b747ba 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Tet40.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Tet40.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "Ioss_CodeTypes.h" // for IntVector diff --git a/packages/seacas/libraries/ioss/src/Ioss_Tet40.h b/packages/seacas/libraries/ioss/src/Ioss_Tet40.h index 2ac5d3eb4ea4..af2a4df88163 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Tet40.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Tet40.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_Tet40_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_Tet7.C b/packages/seacas/libraries/ioss/src/Ioss_Tet7.C index ada7cedb5c0c..fc14bd00ad6d 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Tet7.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Tet7.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "Ioss_CodeTypes.h" // for IntVector diff --git a/packages/seacas/libraries/ioss/src/Ioss_Tet7.h b/packages/seacas/libraries/ioss/src/Ioss_Tet7.h index 253b9822d4af..788a67732253 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Tet7.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Tet7.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_Tet7_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_Tet8.C b/packages/seacas/libraries/ioss/src/Ioss_Tet8.C index 5137761d73ca..298e877fd354 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Tet8.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Tet8.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "Ioss_CodeTypes.h" // for IntVector diff --git a/packages/seacas/libraries/ioss/src/Ioss_Tet8.h b/packages/seacas/libraries/ioss/src/Ioss_Tet8.h index c04dfa53e84f..4fd5f4444abf 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Tet8.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Tet8.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_Tet8_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_Tracer.C b/packages/seacas/libraries/ioss/src/Ioss_Tracer.C index 22c7e7b0ffd3..c41f78407353 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Tracer.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Tracer.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include diff --git a/packages/seacas/libraries/ioss/src/Ioss_Tracer.h b/packages/seacas/libraries/ioss/src/Ioss_Tracer.h index bec0c2742e28..b628f48a9a39 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Tracer.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Tracer.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #ifndef IOSS_Tracer_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_Transform.C b/packages/seacas/libraries/ioss/src/Ioss_Transform.C index c4c60ba2f636..bafd02406f01 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Transform.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Transform.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include diff --git a/packages/seacas/libraries/ioss/src/Ioss_Transform.h b/packages/seacas/libraries/ioss/src/Ioss_Transform.h index 5e6bcbf651fe..b4a61bd47c0b 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Transform.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Transform.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_Transform_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_Tri13.C b/packages/seacas/libraries/ioss/src/Ioss_Tri13.C index b367b623a402..e6e34e32a5a2 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Tri13.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Tri13.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details // ======================================================================== diff --git a/packages/seacas/libraries/ioss/src/Ioss_Tri13.h b/packages/seacas/libraries/ioss/src/Ioss_Tri13.h index 5efeeee76418..6f70ff25b429 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Tri13.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Tri13.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details // -*- Mode: c++ -*- diff --git a/packages/seacas/libraries/ioss/src/Ioss_Tri3.C b/packages/seacas/libraries/ioss/src/Ioss_Tri3.C index ebad54b36b4f..44f2d2161a46 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Tri3.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Tri3.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "Ioss_CodeTypes.h" // for IntVector diff --git a/packages/seacas/libraries/ioss/src/Ioss_Tri3.h b/packages/seacas/libraries/ioss/src/Ioss_Tri3.h index 92ff8ce20983..7f8fe2ccac6e 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Tri3.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Tri3.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_Tri3_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_Tri4.C b/packages/seacas/libraries/ioss/src/Ioss_Tri4.C index 341760a6f1aa..a0c765701c30 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Tri4.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Tri4.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "Ioss_CodeTypes.h" // for IntVector diff --git a/packages/seacas/libraries/ioss/src/Ioss_Tri4.h b/packages/seacas/libraries/ioss/src/Ioss_Tri4.h index 7b6f7d145b95..c1d3ac848b81 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Tri4.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Tri4.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details // -*- Mode: c++ -*- diff --git a/packages/seacas/libraries/ioss/src/Ioss_Tri4a.C b/packages/seacas/libraries/ioss/src/Ioss_Tri4a.C index 05eaee255666..99b50e5eee23 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Tri4a.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Tri4a.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "Ioss_CodeTypes.h" // for IntVector diff --git a/packages/seacas/libraries/ioss/src/Ioss_Tri4a.h b/packages/seacas/libraries/ioss/src/Ioss_Tri4a.h index f9f436c96aea..85e63e985b42 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Tri4a.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Tri4a.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details // -*- Mode: c++ -*- diff --git a/packages/seacas/libraries/ioss/src/Ioss_Tri6.C b/packages/seacas/libraries/ioss/src/Ioss_Tri6.C index 752222122ab6..30b8692a873e 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Tri6.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Tri6.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details // ======================================================================== diff --git a/packages/seacas/libraries/ioss/src/Ioss_Tri6.h b/packages/seacas/libraries/ioss/src/Ioss_Tri6.h index 4e3ae80a904a..1b10aedc2d13 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Tri6.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Tri6.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details // -*- Mode: c++ -*- diff --git a/packages/seacas/libraries/ioss/src/Ioss_Tri7.C b/packages/seacas/libraries/ioss/src/Ioss_Tri7.C index 3ca5519c4926..ab9899e50f20 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Tri7.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Tri7.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details // ======================================================================== diff --git a/packages/seacas/libraries/ioss/src/Ioss_Tri7.h b/packages/seacas/libraries/ioss/src/Ioss_Tri7.h index 8d8974d2aa82..334050696667 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Tri7.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Tri7.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details // -*- Mode: c++ -*- diff --git a/packages/seacas/libraries/ioss/src/Ioss_Tri9.C b/packages/seacas/libraries/ioss/src/Ioss_Tri9.C index 64f5532e38e0..67da8985b8d3 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Tri9.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Tri9.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details // ======================================================================== diff --git a/packages/seacas/libraries/ioss/src/Ioss_Tri9.h b/packages/seacas/libraries/ioss/src/Ioss_Tri9.h index feb35826b6dc..c3b7b62da268 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Tri9.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Tri9.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details // -*- Mode: c++ -*- diff --git a/packages/seacas/libraries/ioss/src/Ioss_TriShell3.C b/packages/seacas/libraries/ioss/src/Ioss_TriShell3.C index 899f026932b6..c7c69ebe7828 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_TriShell3.C +++ b/packages/seacas/libraries/ioss/src/Ioss_TriShell3.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "Ioss_CodeTypes.h" // for IntVector diff --git a/packages/seacas/libraries/ioss/src/Ioss_TriShell3.h b/packages/seacas/libraries/ioss/src/Ioss_TriShell3.h index 90c67762e553..f467002b0464 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_TriShell3.h +++ b/packages/seacas/libraries/ioss/src/Ioss_TriShell3.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #ifndef IOSS_Ioss_TriShell3_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_TriShell4.C b/packages/seacas/libraries/ioss/src/Ioss_TriShell4.C index b5a9a6ece785..4cb826763bb1 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_TriShell4.C +++ b/packages/seacas/libraries/ioss/src/Ioss_TriShell4.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "Ioss_CodeTypes.h" // for IntVector diff --git a/packages/seacas/libraries/ioss/src/Ioss_TriShell4.h b/packages/seacas/libraries/ioss/src/Ioss_TriShell4.h index a53e636b92cb..13ee6dc774ac 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_TriShell4.h +++ b/packages/seacas/libraries/ioss/src/Ioss_TriShell4.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #ifndef IOSS_Ioss_TriShell4_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_TriShell6.C b/packages/seacas/libraries/ioss/src/Ioss_TriShell6.C index 582a8869cec8..421380e7fa82 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_TriShell6.C +++ b/packages/seacas/libraries/ioss/src/Ioss_TriShell6.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "Ioss_CodeTypes.h" // for IntVector diff --git a/packages/seacas/libraries/ioss/src/Ioss_TriShell6.h b/packages/seacas/libraries/ioss/src/Ioss_TriShell6.h index de4b7721244f..e7cf7b700a41 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_TriShell6.h +++ b/packages/seacas/libraries/ioss/src/Ioss_TriShell6.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #ifndef IOSS_Ioss_TriShell6_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_TriShell7.C b/packages/seacas/libraries/ioss/src/Ioss_TriShell7.C index 5fc28a4874ef..ef9d62a2b8ff 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_TriShell7.C +++ b/packages/seacas/libraries/ioss/src/Ioss_TriShell7.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "Ioss_CodeTypes.h" // for IntVector diff --git a/packages/seacas/libraries/ioss/src/Ioss_TriShell7.h b/packages/seacas/libraries/ioss/src/Ioss_TriShell7.h index 4b4b6a215358..6afe3f0574f5 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_TriShell7.h +++ b/packages/seacas/libraries/ioss/src/Ioss_TriShell7.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #ifndef IOSS_Ioss_TriShell7_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_Unknown.C b/packages/seacas/libraries/ioss/src/Ioss_Unknown.C index 1433ba8a4604..6c07f35a6b2a 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Unknown.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Unknown.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "Ioss_CodeTypes.h" // for IntVector diff --git a/packages/seacas/libraries/ioss/src/Ioss_Unknown.h b/packages/seacas/libraries/ioss/src/Ioss_Unknown.h index bec4128da61d..6b6046c0b562 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Unknown.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Unknown.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details // -*- Mode: c++ -*- diff --git a/packages/seacas/libraries/ioss/src/Ioss_Utils.C b/packages/seacas/libraries/ioss/src/Ioss_Utils.C index 60e16e7c6408..27e5d9244599 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Utils.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Utils.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include @@ -244,15 +244,14 @@ namespace { void Ioss::Utils::time_and_date(char *time_string, char *date_string, size_t length) { - time_t calendar_time = time(nullptr); - auto * lt = std::localtime(&calendar_time); - std::string time = fmt::format("{:%H:%M:%S}", *lt); + std::time_t t = std::time(nullptr); + std::string time = fmt::format("{:%H:%M:%S}", fmt::localtime(t)); std::string date; if (length >= 10) { - date = fmt::format("{:%Y/%m/%d}", *lt); + date = fmt::format("{:%Y/%m/%d}", fmt::localtime(t)); } else { - date = fmt::format("{:%y/%m/%d}", *lt); + date = fmt::format("{:%y/%m/%d}", fmt::localtime(t)); } copy_string(time_string, time, 9); copy_string(date_string, date, length + 1); diff --git a/packages/seacas/libraries/ioss/src/Ioss_Utils.h b/packages/seacas/libraries/ioss/src/Ioss_Utils.h index 12c0f67e9616..c4c9c76a48d7 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Utils.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Utils.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_Utils_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_VariableType.C b/packages/seacas/libraries/ioss/src/Ioss_VariableType.C index ff2f8034586c..7e0809d7445b 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_VariableType.C +++ b/packages/seacas/libraries/ioss/src/Ioss_VariableType.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include diff --git a/packages/seacas/libraries/ioss/src/Ioss_VariableType.h b/packages/seacas/libraries/ioss/src/Ioss_VariableType.h index 3430d3de0de6..85814d0692d8 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_VariableType.h +++ b/packages/seacas/libraries/ioss/src/Ioss_VariableType.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_VariableType_h diff --git a/packages/seacas/libraries/ioss/src/Ioss_Version.h b/packages/seacas/libraries/ioss/src/Ioss_Version.h index b6ebea3379c7..69f69f3e6db4 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Version.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Version.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_VERSION_H diff --git a/packages/seacas/libraries/ioss/src/Ioss_Wedge12.C b/packages/seacas/libraries/ioss/src/Ioss_Wedge12.C index 2536b41274e7..91b8dc7cad6d 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Wedge12.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Wedge12.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "Ioss_CodeTypes.h" // for IntVector diff --git a/packages/seacas/libraries/ioss/src/Ioss_Wedge12.h b/packages/seacas/libraries/ioss/src/Ioss_Wedge12.h index 2b256c65c4c4..3f6a11e70466 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Wedge12.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Wedge12.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details // -*- Mode: c++ -*- diff --git a/packages/seacas/libraries/ioss/src/Ioss_Wedge15.C b/packages/seacas/libraries/ioss/src/Ioss_Wedge15.C index 9905340b17b5..a3a2f4439cba 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Wedge15.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Wedge15.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "Ioss_CodeTypes.h" // for IntVector diff --git a/packages/seacas/libraries/ioss/src/Ioss_Wedge15.h b/packages/seacas/libraries/ioss/src/Ioss_Wedge15.h index 2f6a5a3df983..927aa06f4c79 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Wedge15.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Wedge15.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details // -*- Mode: c++ -*- diff --git a/packages/seacas/libraries/ioss/src/Ioss_Wedge16.C b/packages/seacas/libraries/ioss/src/Ioss_Wedge16.C index 8abcf8e38a3b..18cbbfbcd884 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Wedge16.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Wedge16.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "Ioss_CodeTypes.h" // for IntVector diff --git a/packages/seacas/libraries/ioss/src/Ioss_Wedge16.h b/packages/seacas/libraries/ioss/src/Ioss_Wedge16.h index 37e23bed6332..080abb37e940 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Wedge16.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Wedge16.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details // -*- Mode: c++ -*- diff --git a/packages/seacas/libraries/ioss/src/Ioss_Wedge18.C b/packages/seacas/libraries/ioss/src/Ioss_Wedge18.C index b48a1badd202..cad4a703a32f 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Wedge18.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Wedge18.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "Ioss_CodeTypes.h" // for IntVector diff --git a/packages/seacas/libraries/ioss/src/Ioss_Wedge18.h b/packages/seacas/libraries/ioss/src/Ioss_Wedge18.h index f5bea4d5fd94..c281611d43bd 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Wedge18.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Wedge18.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details // -*- Mode: c++ -*- diff --git a/packages/seacas/libraries/ioss/src/Ioss_Wedge20.C b/packages/seacas/libraries/ioss/src/Ioss_Wedge20.C index de3275604466..36012e1a16a2 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Wedge20.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Wedge20.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "Ioss_CodeTypes.h" // for IntVector diff --git a/packages/seacas/libraries/ioss/src/Ioss_Wedge20.h b/packages/seacas/libraries/ioss/src/Ioss_Wedge20.h index c7f155e96a32..7b5427966db8 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Wedge20.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Wedge20.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details // -*- Mode: c++ -*- diff --git a/packages/seacas/libraries/ioss/src/Ioss_Wedge21.C b/packages/seacas/libraries/ioss/src/Ioss_Wedge21.C index 5742d0b2045b..bae72a7cd2e1 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Wedge21.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Wedge21.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "Ioss_CodeTypes.h" // for IntVector diff --git a/packages/seacas/libraries/ioss/src/Ioss_Wedge21.h b/packages/seacas/libraries/ioss/src/Ioss_Wedge21.h index 93500e017cc3..3760035b8570 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Wedge21.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Wedge21.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details // -*- Mode: c++ -*- diff --git a/packages/seacas/libraries/ioss/src/Ioss_Wedge24.C b/packages/seacas/libraries/ioss/src/Ioss_Wedge24.C index 9f216d56c1fa..5d5c4d56f964 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Wedge24.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Wedge24.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "Ioss_CodeTypes.h" // for IntVector diff --git a/packages/seacas/libraries/ioss/src/Ioss_Wedge24.h b/packages/seacas/libraries/ioss/src/Ioss_Wedge24.h index 0af5fd9d009d..0571c32a5d6a 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Wedge24.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Wedge24.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details // -*- Mode: c++ -*- diff --git a/packages/seacas/libraries/ioss/src/Ioss_Wedge52.C b/packages/seacas/libraries/ioss/src/Ioss_Wedge52.C index e661185d6a33..42034c12edc3 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Wedge52.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Wedge52.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "Ioss_CodeTypes.h" // for IntVector diff --git a/packages/seacas/libraries/ioss/src/Ioss_Wedge52.h b/packages/seacas/libraries/ioss/src/Ioss_Wedge52.h index df489ff928de..8de13d9cbf38 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Wedge52.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Wedge52.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details // -*- Mode: c++ -*- diff --git a/packages/seacas/libraries/ioss/src/Ioss_Wedge6.C b/packages/seacas/libraries/ioss/src/Ioss_Wedge6.C index 0f1d84a26c57..19dde1505ba8 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Wedge6.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Wedge6.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "Ioss_CodeTypes.h" // for IntVector diff --git a/packages/seacas/libraries/ioss/src/Ioss_Wedge6.h b/packages/seacas/libraries/ioss/src/Ioss_Wedge6.h index bbd9096f800e..1b95e374f95a 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Wedge6.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Wedge6.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details // -*- Mode: c++ -*- diff --git a/packages/seacas/libraries/ioss/src/Ioss_ZoneConnectivity.C b/packages/seacas/libraries/ioss/src/Ioss_ZoneConnectivity.C index f03caaddb073..d63c819ac386 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_ZoneConnectivity.C +++ b/packages/seacas/libraries/ioss/src/Ioss_ZoneConnectivity.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include diff --git a/packages/seacas/libraries/ioss/src/Ioss_ZoneConnectivity.h b/packages/seacas/libraries/ioss/src/Ioss_ZoneConnectivity.h index 5e3d74a75353..779b5cf28b04 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_ZoneConnectivity.h +++ b/packages/seacas/libraries/ioss/src/Ioss_ZoneConnectivity.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioss_ZoneConnectivity_h diff --git a/packages/seacas/libraries/ioss/src/adios/AdiosWrapper.C b/packages/seacas/libraries/ioss/src/adios/AdiosWrapper.C index 9a7c38535ede..30d2b9e93af2 100644 --- a/packages/seacas/libraries/ioss/src/adios/AdiosWrapper.C +++ b/packages/seacas/libraries/ioss/src/adios/AdiosWrapper.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "adios/AdiosWrapper.h" diff --git a/packages/seacas/libraries/ioss/src/adios/AdiosWrapper.h b/packages/seacas/libraries/ioss/src/adios/AdiosWrapper.h index afd4e0bfda70..48818173b361 100644 --- a/packages/seacas/libraries/ioss/src/adios/AdiosWrapper.h +++ b/packages/seacas/libraries/ioss/src/adios/AdiosWrapper.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioad_AdiosWrapper_h diff --git a/packages/seacas/libraries/ioss/src/adios/AdiosWrapper.hpp b/packages/seacas/libraries/ioss/src/adios/AdiosWrapper.hpp index 760033e8eaa2..63f9ee6c224e 100644 --- a/packages/seacas/libraries/ioss/src/adios/AdiosWrapper.hpp +++ b/packages/seacas/libraries/ioss/src/adios/AdiosWrapper.hpp @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioad_AdiosWrapper_hpp diff --git a/packages/seacas/libraries/ioss/src/adios/Ioad_Constants.h b/packages/seacas/libraries/ioss/src/adios/Ioad_Constants.h index 95154f1af2fd..3b9eb0e1484d 100644 --- a/packages/seacas/libraries/ioss/src/adios/Ioad_Constants.h +++ b/packages/seacas/libraries/ioss/src/adios/Ioad_Constants.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioad_Constants_h diff --git a/packages/seacas/libraries/ioss/src/adios/Ioad_DatabaseIO.C b/packages/seacas/libraries/ioss/src/adios/Ioad_DatabaseIO.C index 2d9cc6d49234..df9393cc44da 100644 --- a/packages/seacas/libraries/ioss/src/adios/Ioad_DatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/adios/Ioad_DatabaseIO.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include diff --git a/packages/seacas/libraries/ioss/src/adios/Ioad_DatabaseIO.h b/packages/seacas/libraries/ioss/src/adios/Ioad_DatabaseIO.h index 6cb164ed1e96..bdc5fcdd5e38 100644 --- a/packages/seacas/libraries/ioss/src/adios/Ioad_DatabaseIO.h +++ b/packages/seacas/libraries/ioss/src/adios/Ioad_DatabaseIO.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioad_DatabaseIO_h diff --git a/packages/seacas/libraries/ioss/src/adios/Ioad_Helper.C b/packages/seacas/libraries/ioss/src/adios/Ioad_Helper.C index 0da194f6bc80..d413d39df525 100644 --- a/packages/seacas/libraries/ioss/src/adios/Ioad_Helper.C +++ b/packages/seacas/libraries/ioss/src/adios/Ioad_Helper.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "Ioss_SideBlock.h" // for SideBlockContainer diff --git a/packages/seacas/libraries/ioss/src/adios/Ioad_Helper.h b/packages/seacas/libraries/ioss/src/adios/Ioad_Helper.h index 3750272da62a..43ef6062599c 100644 --- a/packages/seacas/libraries/ioss/src/adios/Ioad_Helper.h +++ b/packages/seacas/libraries/ioss/src/adios/Ioad_Helper.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioad_Helper_h diff --git a/packages/seacas/libraries/ioss/src/adios/Ioad_IOFactory.C b/packages/seacas/libraries/ioss/src/adios/Ioad_IOFactory.C index 7a0454b103f3..40d3d9ab06d3 100644 --- a/packages/seacas/libraries/ioss/src/adios/Ioad_IOFactory.C +++ b/packages/seacas/libraries/ioss/src/adios/Ioad_IOFactory.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "Ioss_DBUsage.h" // for DatabaseUsage diff --git a/packages/seacas/libraries/ioss/src/adios/Ioad_IOFactory.h b/packages/seacas/libraries/ioss/src/adios/Ioad_IOFactory.h index 0bc110c19fa8..47c7c8c18dc5 100644 --- a/packages/seacas/libraries/ioss/src/adios/Ioad_IOFactory.h +++ b/packages/seacas/libraries/ioss/src/adios/Ioad_IOFactory.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioad_IOFactory_h diff --git a/packages/seacas/libraries/ioss/src/adios/Ioad_Initializer.C b/packages/seacas/libraries/ioss/src/adios/Ioad_Initializer.C index 799a1a13d273..f78b5a4b31ef 100644 --- a/packages/seacas/libraries/ioss/src/adios/Ioad_Initializer.C +++ b/packages/seacas/libraries/ioss/src/adios/Ioad_Initializer.C @@ -1,10 +1,9 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details -#if !defined(__PUMAGON__) || (defined(__PUMAGON__) && defined(JANUS2)) #include #include @@ -35,4 +34,3 @@ namespace Ioad { } } // namespace Ioad -#endif diff --git a/packages/seacas/libraries/ioss/src/adios/Ioad_Initializer.h b/packages/seacas/libraries/ioss/src/adios/Ioad_Initializer.h index 5126b6ceced2..0689c5cbb984 100644 --- a/packages/seacas/libraries/ioss/src/adios/Ioad_Initializer.h +++ b/packages/seacas/libraries/ioss/src/adios/Ioad_Initializer.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioad_Initializer_h diff --git a/packages/seacas/libraries/ioss/src/adios/Ioad_TemplateToValue.h b/packages/seacas/libraries/ioss/src/adios/Ioad_TemplateToValue.h index 17abd3272f1c..be963bbb35df 100644 --- a/packages/seacas/libraries/ioss/src/adios/Ioad_TemplateToValue.h +++ b/packages/seacas/libraries/ioss/src/adios/Ioad_TemplateToValue.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioad_TemplateToValue_h diff --git a/packages/seacas/libraries/ioss/src/adios/Ioad_TemplateToValue.hpp b/packages/seacas/libraries/ioss/src/adios/Ioad_TemplateToValue.hpp index c1d549005dba..1cd95b73f08b 100644 --- a/packages/seacas/libraries/ioss/src/adios/Ioad_TemplateToValue.hpp +++ b/packages/seacas/libraries/ioss/src/adios/Ioad_TemplateToValue.hpp @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioad_TemplateToValue_hpp @@ -11,211 +11,111 @@ namespace Ioad { -template -constexpr Ioss::Field::BasicType template_to_basic_type() noexcept -{ + template constexpr Ioss::Field::BasicType template_to_basic_type() noexcept + { return Ioss::Field::BasicType::INVALID; -} + } -template <> -constexpr Ioss::Field::BasicType template_to_basic_type() noexcept -{ + template <> constexpr Ioss::Field::BasicType template_to_basic_type() noexcept + { return Ioss::Field::BasicType::DOUBLE; -} + } -template <> -constexpr Ioss::Field::BasicType template_to_basic_type() noexcept -{ + template <> constexpr Ioss::Field::BasicType template_to_basic_type() noexcept + { return Ioss::Field::BasicType::INT32; -} + } -template <> -constexpr Ioss::Field::BasicType template_to_basic_type() noexcept -{ + template <> constexpr Ioss::Field::BasicType template_to_basic_type() noexcept + { return Ioss::Field::BasicType::INT64; -} + } -template <> -constexpr Ioss::Field::BasicType template_to_basic_type() noexcept -{ + template <> constexpr Ioss::Field::BasicType template_to_basic_type() noexcept + { return Ioss::Field::BasicType::COMPLEX; -} + } -template <> -constexpr Ioss::Field::BasicType template_to_basic_type() noexcept -{ + template <> constexpr Ioss::Field::BasicType template_to_basic_type() noexcept + { return Ioss::Field::BasicType::STRING; -} + } -template <> -constexpr Ioss::Field::BasicType template_to_basic_type() noexcept -{ + template <> constexpr Ioss::Field::BasicType template_to_basic_type() noexcept + { return Ioss::Field::BasicType::CHARACTER; -} + } -template <> -constexpr char const *get_entity_type() noexcept -{ + template <> constexpr char const *get_entity_type() noexcept + { return "SideBlock"; -} + } -template <> -constexpr char const *get_entity_type() noexcept -{ - return "SideSet"; -} + template <> constexpr char const *get_entity_type() noexcept { return "SideSet"; } -template <> -constexpr char const *get_entity_type() noexcept -{ + template <> constexpr char const *get_entity_type() noexcept + { return "NodeBlock"; -} + } -template <> -constexpr char const *get_entity_type() noexcept -{ + template <> constexpr char const *get_entity_type() noexcept + { return "EdgeBlock"; -} + } -template <> -constexpr char const *get_entity_type() noexcept -{ + template <> constexpr char const *get_entity_type() noexcept + { return "FaceBlock"; -} + } -template <> -constexpr char const *get_entity_type() noexcept -{ + template <> constexpr char const *get_entity_type() noexcept + { return "ElementBlock"; -} - -template <> -constexpr char const *get_entity_type() noexcept -{ - return "NodeSet"; -} - -template <> -constexpr char const *get_entity_type() noexcept -{ - return "EdgeSet"; -} - -template <> -constexpr char const *get_entity_type() noexcept -{ - return "FaceSet"; -} - -template <> -constexpr char const *get_entity_type() noexcept -{ + } + + template <> constexpr char const *get_entity_type() noexcept { return "NodeSet"; } + + template <> constexpr char const *get_entity_type() noexcept { return "EdgeSet"; } + + template <> constexpr char const *get_entity_type() noexcept { return "FaceSet"; } + + template <> constexpr char const *get_entity_type() noexcept + { return "ElementSet"; -} - -template <> -constexpr char const *get_entity_type() noexcept -{ - return "CommSet"; -} - -template -inline std::string GetType() noexcept -{ - return "compound"; -} -template <> -inline std::string GetType() noexcept -{ - return "unknown"; -} - -template <> -inline std::string GetType() noexcept -{ - return "string"; -} - -template <> -inline std::string GetType() noexcept -{ - return "char"; -} -template <> -inline std::string GetType() noexcept -{ - return "signed char"; -} -template <> -inline std::string GetType() noexcept -{ - return "unsigned char"; -} -template <> -inline std::string GetType() noexcept -{ - return "short"; -} -template <> -inline std::string GetType() noexcept -{ - return "unsigned short"; -} -template <> -inline std::string GetType() noexcept -{ - return "int"; -} -template <> -inline std::string GetType() noexcept -{ - return "unsigned int"; -} -template <> -inline std::string GetType() noexcept -{ - return "long int"; -} -template <> -inline std::string GetType() noexcept -{ + } + + template <> constexpr char const *get_entity_type() noexcept { return "CommSet"; } + + template inline std::string GetType() noexcept { return "compound"; } + template <> inline std::string GetType() noexcept { return "unknown"; } + + template <> inline std::string GetType() noexcept { return "string"; } + + template <> inline std::string GetType() noexcept { return "char"; } + template <> inline std::string GetType() noexcept { return "signed char"; } + template <> inline std::string GetType() noexcept { return "unsigned char"; } + template <> inline std::string GetType() noexcept { return "short"; } + template <> inline std::string GetType() noexcept { return "unsigned short"; } + template <> inline std::string GetType() noexcept { return "int"; } + template <> inline std::string GetType() noexcept { return "unsigned int"; } + template <> inline std::string GetType() noexcept { return "long int"; } + template <> inline std::string GetType() noexcept + { return "unsigned long int"; -} -template <> -inline std::string GetType() noexcept -{ - return "long long int"; -} -template <> -inline std::string GetType() noexcept -{ + } + template <> inline std::string GetType() noexcept { return "long long int"; } + template <> inline std::string GetType() noexcept + { return "unsigned long long int"; -} -template <> -inline std::string GetType() noexcept -{ - return "float"; -} -template <> -inline std::string GetType() noexcept -{ - return "double"; -} -template <> -inline std::string GetType() noexcept -{ - return "long double"; -} -template <> -inline std::string GetType>() noexcept -{ - return "float complex"; -} -template <> -inline std::string GetType>() noexcept -{ + } + template <> inline std::string GetType() noexcept { return "float"; } + template <> inline std::string GetType() noexcept { return "double"; } + template <> inline std::string GetType() noexcept { return "long double"; } + template <> inline std::string GetType>() noexcept { return "float complex"; } + template <> inline std::string GetType>() noexcept + { return "double complex"; -} + } } // namespace Ioad diff --git a/packages/seacas/libraries/ioss/src/adios/utest/Ut_ioad.C b/packages/seacas/libraries/ioss/src/adios/utest/Ut_ioad.C index 57d50aa05496..c98429238173 100644 --- a/packages/seacas/libraries/ioss/src/adios/utest/Ut_ioad.C +++ b/packages/seacas/libraries/ioss/src/adios/utest/Ut_ioad.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #define CATCH_CONFIG_RUNNER diff --git a/packages/seacas/libraries/ioss/src/catch.hpp b/packages/seacas/libraries/ioss/src/catch.hpp index f64422ae1839..667334eb1dd2 100644 --- a/packages/seacas/libraries/ioss/src/catch.hpp +++ b/packages/seacas/libraries/ioss/src/catch.hpp @@ -12,7 +12,6 @@ #define TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED // start catch.hpp - #define CATCH_VERSION_MAJOR 2 #define CATCH_VERSION_MINOR 12 #define CATCH_VERSION_PATCH 2 @@ -693,7 +692,6 @@ constexpr auto operator "" _catch_sr( char const* rawChars, std::size_t size ) n // end catch_stringref.h // start catch_preprocessor.hpp - #define CATCH_RECURSION_LEVEL0(...) __VA_ARGS__ #define CATCH_RECURSION_LEVEL1(...) CATCH_RECURSION_LEVEL0(CATCH_RECURSION_LEVEL0(CATCH_RECURSION_LEVEL0(__VA_ARGS__))) #define CATCH_RECURSION_LEVEL2(...) CATCH_RECURSION_LEVEL1(CATCH_RECURSION_LEVEL1(CATCH_RECURSION_LEVEL1(__VA_ARGS__))) @@ -921,7 +919,6 @@ constexpr auto operator "" _catch_sr( char const* rawChars, std::size_t size ) n // end catch_preprocessor.hpp // start catch_meta.hpp - #include namespace Catch { @@ -3840,7 +3837,6 @@ namespace Catch { // start catch_interfaces_generatortracker.h - #include namespace Catch { @@ -5415,7 +5411,6 @@ namespace Catch { // Statistics estimates - namespace Catch { namespace Benchmark { template @@ -6029,7 +6024,6 @@ namespace Catch { // end catch_console_colour.h // start catch_reporter_registrars.hpp - namespace Catch { template @@ -6430,12 +6424,10 @@ namespace Catch { // User-facing chronometer - // start catch_clock.hpp // Clocks - #include #include @@ -6467,7 +6459,6 @@ namespace Catch { // Hinting the optimizer - #if defined(_MSC_VER) # include // atomic_thread_fence #endif @@ -6527,7 +6518,6 @@ namespace Catch { // Invoke with a special case for void - #include #include @@ -6637,7 +6627,6 @@ namespace Catch { // Environment information - namespace Catch { namespace Benchmark { template @@ -6664,12 +6653,10 @@ namespace Catch { // Execution plan - // start catch_benchmark_function.hpp // Dumb std::function implementation for consistent call overhead - #include #include #include @@ -6762,7 +6749,6 @@ namespace Catch { // repeat algorithm - #include #include @@ -6791,17 +6777,14 @@ namespace Catch { // Run a function for a minimum amount of time - // start catch_measure.hpp // Measure - // start catch_timing.hpp // Timing - #include #include @@ -6924,12 +6907,10 @@ namespace Catch { // Environment measurement - // start catch_stats.hpp // Statistical analysis tools - #include #include #include @@ -7170,12 +7151,10 @@ namespace Catch { // Run and analyse one benchmark - // start catch_sample_analysis.hpp // Benchmark results - #include #include #include @@ -7369,7 +7348,6 @@ namespace Catch { // Constructor and destructor helpers - #include namespace Catch { @@ -7958,7 +7936,6 @@ namespace Catch { // start catch_windows_h_proxy.h - #if defined(CATCH_PLATFORM_WINDOWS) #if !defined(NOMINMAX) && !defined(CATCH_CONFIG_NO_NOMINMAX) @@ -8419,7 +8396,6 @@ namespace Catch { // Clara v1.1.5 - #ifndef CATCH_CLARA_CONFIG_CONSOLE_WIDTH #define CATCH_CLARA_CONFIG_CONSOLE_WIDTH 80 #endif @@ -8448,7 +8424,6 @@ namespace Catch { // // This project is hosted at https://github.com/philsquared/textflowcpp - #include #include #include @@ -17689,7 +17664,6 @@ using Catch::Detail::Approx; // start catch_reenable_warnings.h - #ifdef __clang__ # ifdef __ICC // icpc defines the __clang__ macro # pragma warning(pop) diff --git a/packages/seacas/libraries/ioss/src/cgns/Iocgns_DatabaseIO.C b/packages/seacas/libraries/ioss/src/cgns/Iocgns_DatabaseIO.C index e9b02761b40a..4f35f4c45446 100644 --- a/packages/seacas/libraries/ioss/src/cgns/Iocgns_DatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/cgns/Iocgns_DatabaseIO.C @@ -7,7 +7,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include @@ -80,6 +80,42 @@ namespace { return has_decomp_flag; } + bool has_decomp_name_kluge(int cgns_file_ptr, int base, int zone, int zgc_idx) + { + // Check the `zgc_idx`-th ZGC node to see if the name matches the + // form described in the `name_is_decomp` function below. We want to + // see if there are *any* names that match this form and if so, we can + // use the kluge; otherwise we can't and need to rely on other hueristics. + char connectname[CGNS_MAX_NAME_LENGTH + 1]; + char donorname[CGNS_MAX_NAME_LENGTH + 1]; + std::array range; + std::array donor_range; + Ioss::IJK_t transform; + + cg_1to1_read(cgns_file_ptr, base, zone, zgc_idx, connectname, donorname, range.data(), + donor_range.data(), transform.data()); + + std::string name{connectname}; + bool has_decomp_name = ((name.find_first_not_of("0123456789_-") == std::string::npos) && + (name.find("--", 1 != std::string::npos))); + + return has_decomp_name; + } + + bool name_is_decomp(const std::string &name) + { + // Major kluge to deal with fpp files which don't have the + // decomp descriptor. Usually only required if the model is + // periodic... + // + // A zgc name that is generated as part of the decomposition process + // has the following characteristics: + // * is all [0-9_-] characters + // * has "--" in the middle (approx) of the name + return ((name.find_first_not_of("0123456789_-") == std::string::npos) && + (name.find("--", 1 != std::string::npos))); + } + void zgc_check_descriptor(int cgns_file_ptr, int base, int zone, int zgc_idx, Ioss::ZoneConnectivity &zgc) { @@ -256,6 +292,14 @@ namespace { int br = bb; do { global[ijk] += blocks[br].range[ijk]; +#if IOSS_DEBUG_OUTPUT + const auto b = blocks[br]; + fmt::print(Ioss::DEBUG(), "Min {}: {} {} ({} {} {}) [{}]\n", + (ijk == 0 ? 'i' : ijk == 1 ? 'j' : 'k'), + b.name, b.face_adj[ijk], + b.range[0], b.range[1], b.range[2], + b.face_adj.to_string('.','+')); +#endif br = adjacent_block(blocks[br], ijk + 3, proc_block_map); if (++iter > end - begin) { auto bp = adjacent_block(blocks[br], ijk + 3, proc_block_map); @@ -315,10 +359,13 @@ namespace { // normal inter-zone ZGC. If the descriptor does not exist, then have // to rely on hueristics... bool has_decomp_flag = false; + bool has_decomp_names = false; for (int i = 0; i < nconn; i++) { if (has_decomp_descriptor(cgns_file_ptr, base, zone, i + 1)) { has_decomp_flag = true; - break; + } + if (has_decomp_name_kluge(cgns_file_ptr, base, zone, i + 1)) { + has_decomp_names = true; } } @@ -345,7 +392,11 @@ namespace { is_from_decomp = has_decomp_descriptor(cgns_file_ptr, base, zone, i + 1); } else { - is_from_decomp = donor_name == zone_name && donor_proc >= 0 && donor_proc != myProcessor; +#if IOSS_DEBUG_OUTPUT + fmt::print("Name: {}, decomp? = {}\n", connectname, name_is_decomp(connectname)); +#endif + is_from_decomp = donor_name == zone_name && donor_proc >= 0 && donor_proc != myProcessor && + (!has_decomp_names || name_is_decomp(connectname)); } if (is_from_decomp) { @@ -856,7 +907,7 @@ namespace Iocgns { fmt::print(Ioss::DEBUG(), "{} {} {} ({} {} {}) ({} {} {}) ({} {} {}) [{}]\n", b.name, b.proc, b.local_zone, b.range[0], b.range[1], b.range[2], b.glob_range[0], b.glob_range[1], b.glob_range[2], b.offset[0], b.offset[1], b.offset[2], - b.face_adj); + b.face_adj.to_string('.','+')); } #endif diff --git a/packages/seacas/libraries/ioss/src/cgns/Iocgns_DatabaseIO.h b/packages/seacas/libraries/ioss/src/cgns/Iocgns_DatabaseIO.h index 224178a2a073..199e1814a8d7 100644 --- a/packages/seacas/libraries/ioss/src/cgns/Iocgns_DatabaseIO.h +++ b/packages/seacas/libraries/ioss/src/cgns/Iocgns_DatabaseIO.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Iocgns_DatabaseIO_h diff --git a/packages/seacas/libraries/ioss/src/cgns/Iocgns_DecompositionData.C b/packages/seacas/libraries/ioss/src/cgns/Iocgns_DecompositionData.C index 4c9c915ca242..fc340a0cce0d 100644 --- a/packages/seacas/libraries/ioss/src/cgns/Iocgns_DecompositionData.C +++ b/packages/seacas/libraries/ioss/src/cgns/Iocgns_DecompositionData.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include @@ -298,7 +298,7 @@ namespace Iocgns { zone_node_count); auto zgcs = zone->m_zoneConnectivity; #if 0 - // This should work, but doesn't... + // This should work, but doesn't... fmt::print(Ioss::DEBUG(), "{}\n", fmt::join(zgcs, "\n")); #else for (auto &zgc : zgcs) { diff --git a/packages/seacas/libraries/ioss/src/cgns/Iocgns_DecompositionData.h b/packages/seacas/libraries/ioss/src/cgns/Iocgns_DecompositionData.h index ad2e79c826e9..07dba3883b46 100644 --- a/packages/seacas/libraries/ioss/src/cgns/Iocgns_DecompositionData.h +++ b/packages/seacas/libraries/ioss/src/cgns/Iocgns_DecompositionData.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #ifndef IOCGNS_DECOMPOSITONDATA_H diff --git a/packages/seacas/libraries/ioss/src/cgns/Iocgns_Defines.h b/packages/seacas/libraries/ioss/src/cgns/Iocgns_Defines.h index 0b2ca6659649..d3be94e88ebb 100644 --- a/packages/seacas/libraries/ioss/src/cgns/Iocgns_Defines.h +++ b/packages/seacas/libraries/ioss/src/cgns/Iocgns_Defines.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_IOCGNS_DEFINES_H diff --git a/packages/seacas/libraries/ioss/src/cgns/Iocgns_IOFactory.C b/packages/seacas/libraries/ioss/src/cgns/Iocgns_IOFactory.C index d9e907cfabe0..0a963c0d1f3d 100644 --- a/packages/seacas/libraries/ioss/src/cgns/Iocgns_IOFactory.C +++ b/packages/seacas/libraries/ioss/src/cgns/Iocgns_IOFactory.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include // for DatabaseIO -- serial diff --git a/packages/seacas/libraries/ioss/src/cgns/Iocgns_IOFactory.h b/packages/seacas/libraries/ioss/src/cgns/Iocgns_IOFactory.h index eff70678b3c8..342e59c6619e 100644 --- a/packages/seacas/libraries/ioss/src/cgns/Iocgns_IOFactory.h +++ b/packages/seacas/libraries/ioss/src/cgns/Iocgns_IOFactory.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Iocgns_IOFactory_h diff --git a/packages/seacas/libraries/ioss/src/cgns/Iocgns_Initializer.C b/packages/seacas/libraries/ioss/src/cgns/Iocgns_Initializer.C index c5b0426aab85..4940fdd66654 100644 --- a/packages/seacas/libraries/ioss/src/cgns/Iocgns_Initializer.C +++ b/packages/seacas/libraries/ioss/src/cgns/Iocgns_Initializer.C @@ -1,9 +1,8 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details -#if !defined(__PUMAGON__) || (defined(__PUMAGON__) && defined(JANUS2)) #include #include @@ -20,4 +19,3 @@ namespace Iocgns { } } // namespace Iocgns -#endif diff --git a/packages/seacas/libraries/ioss/src/cgns/Iocgns_Initializer.h b/packages/seacas/libraries/ioss/src/cgns/Iocgns_Initializer.h index 9a590d185968..267e73e9d4e9 100644 --- a/packages/seacas/libraries/ioss/src/cgns/Iocgns_Initializer.h +++ b/packages/seacas/libraries/ioss/src/cgns/Iocgns_Initializer.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Iocgns_Initializer_h diff --git a/packages/seacas/libraries/ioss/src/cgns/Iocgns_ParallelDatabaseIO.C b/packages/seacas/libraries/ioss/src/cgns/Iocgns_ParallelDatabaseIO.C index 534e0748de09..d66579e4958c 100644 --- a/packages/seacas/libraries/ioss/src/cgns/Iocgns_ParallelDatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/cgns/Iocgns_ParallelDatabaseIO.C @@ -6,7 +6,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include @@ -290,8 +290,8 @@ namespace Iocgns { double t_end = Ioss::Utils::timer(); double duration = util().global_minmax(t_end - t_begin, Ioss::ParallelUtils::DO_MAX); if (myProcessor == 0) { - fmt::print(Ioss::DEBUG(), "{} Base File Close Time = {}\n", is_input() ? "Input" : "Output", - duration); + fmt::print(Ioss::DEBUG(), "{} Base File Close Time = {}\n", + is_input() ? "Input" : "Output", duration); } } } diff --git a/packages/seacas/libraries/ioss/src/cgns/Iocgns_ParallelDatabaseIO.h b/packages/seacas/libraries/ioss/src/cgns/Iocgns_ParallelDatabaseIO.h index 20e6552848e7..ea763f6bee4a 100644 --- a/packages/seacas/libraries/ioss/src/cgns/Iocgns_ParallelDatabaseIO.h +++ b/packages/seacas/libraries/ioss/src/cgns/Iocgns_ParallelDatabaseIO.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Iocgns_ParallelDatabaseIO_h diff --git a/packages/seacas/libraries/ioss/src/cgns/Iocgns_StructuredZoneData.C b/packages/seacas/libraries/ioss/src/cgns/Iocgns_StructuredZoneData.C index faed5f18d48f..4aec519d484c 100644 --- a/packages/seacas/libraries/ioss/src/cgns/Iocgns_StructuredZoneData.C +++ b/packages/seacas/libraries/ioss/src/cgns/Iocgns_StructuredZoneData.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include diff --git a/packages/seacas/libraries/ioss/src/cgns/Iocgns_StructuredZoneData.h b/packages/seacas/libraries/ioss/src/cgns/Iocgns_StructuredZoneData.h index be805eaad49a..95b3b8e90d99 100644 --- a/packages/seacas/libraries/ioss/src/cgns/Iocgns_StructuredZoneData.h +++ b/packages/seacas/libraries/ioss/src/cgns/Iocgns_StructuredZoneData.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #ifndef IOCGNS_STRUCTUREDZONEDATA_H diff --git a/packages/seacas/libraries/ioss/src/cgns/Iocgns_Utils.C b/packages/seacas/libraries/ioss/src/cgns/Iocgns_Utils.C index 645e995075b6..3bb42a1e6409 100644 --- a/packages/seacas/libraries/ioss/src/cgns/Iocgns_Utils.C +++ b/packages/seacas/libraries/ioss/src/cgns/Iocgns_Utils.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include @@ -2606,6 +2606,8 @@ void Iocgns::Utils::assign_zones_to_procs(std::vector &zones, double avg_work, double load_balance, int proc_rank, int proc_count, bool verbose) { + auto original_zones(zones); // In case we need to call this again... + auto new_zones(zones); size_t new_zone_id = zones.size() + 1; @@ -2800,9 +2802,28 @@ size_t Iocgns::Utils::pre_split(std::vector &zones } } std::swap(new_zones, zones); - if (zones.size() < (size_t)proc_count && load_balance > 1.05) { + size_t active = std::count_if(zones.begin(), zones.end(), [](const Iocgns::StructuredZoneData *z) { return z->is_active(); }); + + if (active < (size_t)proc_count && load_balance > 1.05) { // Tighten up the load_balance factor to get some decomposition going... double new_load_balance = (1.0 + load_balance) / 2.0; + + // If any of the original zones were split the first time we called this routine, + // we need to delete the zones created via splitting. + // Also reset the parent zone to not have any children... + for (auto &zone : zones) { + if (!zone->is_active()) { + zone->m_child1 = nullptr; + zone->m_child2 = nullptr; + } + if (zone->m_adam != zone) { + // Created via a split; delete... + delete zone; + } + } + + // Revert `zones` back to original version (with no zones split) + zones = original_zones; new_zone_id = pre_split(zones, avg_work, new_load_balance, proc_rank, proc_count, verbose); } return new_zone_id; diff --git a/packages/seacas/libraries/ioss/src/cgns/Iocgns_Utils.h b/packages/seacas/libraries/ioss/src/cgns/Iocgns_Utils.h index c400331ebd56..20bbe71b03e2 100644 --- a/packages/seacas/libraries/ioss/src/cgns/Iocgns_Utils.h +++ b/packages/seacas/libraries/ioss/src/cgns/Iocgns_Utils.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_IOCGNS_UTILS_H diff --git a/packages/seacas/libraries/ioss/src/data_warehouse/Iodw_DatabaseIO.C b/packages/seacas/libraries/ioss/src/data_warehouse/Iodw_DatabaseIO.C index 8f1ce766774d..55338a8e6992 100644 --- a/packages/seacas/libraries/ioss/src/data_warehouse/Iodw_DatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/data_warehouse/Iodw_DatabaseIO.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include diff --git a/packages/seacas/libraries/ioss/src/data_warehouse/Iodw_DatabaseIO.h b/packages/seacas/libraries/ioss/src/data_warehouse/Iodw_DatabaseIO.h index ef3b5dfd7041..3487ec56f15e 100644 --- a/packages/seacas/libraries/ioss/src/data_warehouse/Iodw_DatabaseIO.h +++ b/packages/seacas/libraries/ioss/src/data_warehouse/Iodw_DatabaseIO.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef Iodw_DatabaseIO_h diff --git a/packages/seacas/libraries/ioss/src/data_warehouse/Iodw_MetaData.h b/packages/seacas/libraries/ioss/src/data_warehouse/Iodw_MetaData.h index f04ddf0bc03a..e18c796b09fe 100644 --- a/packages/seacas/libraries/ioss/src/data_warehouse/Iodw_MetaData.h +++ b/packages/seacas/libraries/ioss/src/data_warehouse/Iodw_MetaData.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef Iodw_MetaData_h diff --git a/packages/seacas/libraries/ioss/src/data_warehouse/Iodw_Utils.C b/packages/seacas/libraries/ioss/src/data_warehouse/Iodw_Utils.C index 71038172ed83..192aa975098b 100644 --- a/packages/seacas/libraries/ioss/src/data_warehouse/Iodw_Utils.C +++ b/packages/seacas/libraries/ioss/src/data_warehouse/Iodw_Utils.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include diff --git a/packages/seacas/libraries/ioss/src/data_warehouse/Iodw_Utils.h b/packages/seacas/libraries/ioss/src/data_warehouse/Iodw_Utils.h index dff074f80f4f..5de48db7c3da 100644 --- a/packages/seacas/libraries/ioss/src/data_warehouse/Iodw_Utils.h +++ b/packages/seacas/libraries/ioss/src/data_warehouse/Iodw_Utils.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include diff --git a/packages/seacas/libraries/ioss/src/exodus/Ioex_BaseDatabaseIO.C b/packages/seacas/libraries/ioss/src/exodus/Ioex_BaseDatabaseIO.C index faa2aa81421e..f600139e4645 100644 --- a/packages/seacas/libraries/ioss/src/exodus/Ioex_BaseDatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/exodus/Ioex_BaseDatabaseIO.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include @@ -216,7 +216,7 @@ namespace Ioex { void BaseDatabaseIO::set_int_byte_size_api(Ioss::DataSize size) const { - if (exodusFilePtr > 0) { + if (m_exodusFilePtr > 0) { int old_status = ex_int64_status(get_file_pointer()); if (size == 8) { ex_set_int64_status(get_file_pointer(), EX_ALL_INT64_API | old_status); @@ -226,7 +226,7 @@ namespace Ioex { if ((old_status & EX_ALL_INT64_API) != 0) { old_status &= ~EX_ALL_INT64_API; assert(!(old_status & EX_ALL_INT64_API)); - ex_set_int64_status(exodusFilePtr, old_status); + ex_set_int64_status(m_exodusFilePtr, old_status); } } } @@ -276,7 +276,7 @@ namespace Ioex { { // Returns the file_pointer used to access the file on disk. // Checks that the file is open and if not, opens it first. - if (exodusFilePtr < 0) { + if (m_exodusFilePtr < 0) { bool write_message = true; bool abort_if_error = true; if (is_input()) { @@ -288,24 +288,24 @@ namespace Ioex { } if (!m_groupName.empty()) { - ex_get_group_id(exodusFilePtr, m_groupName.c_str(), &exodusFilePtr); + ex_get_group_id(m_exodusFilePtr, m_groupName.c_str(), &m_exodusFilePtr); } } - assert(exodusFilePtr >= 0); + assert(m_exodusFilePtr >= 0); fileExists = true; - return exodusFilePtr; + return m_exodusFilePtr; } int BaseDatabaseIO::free_file_pointer() const { - if (exodusFilePtr != -1) { + if (m_exodusFilePtr != -1) { bool do_timer = false; if (isParallel) { Ioss::Utils::check_set_bool_property(properties, "IOSS_TIME_FILE_OPEN_CLOSE", do_timer); } double t_begin = (do_timer ? Ioss::Utils::timer() : 0); - ex_close(exodusFilePtr); + ex_close(m_exodusFilePtr); closeDW(); if (do_timer && isParallel) { double t_end = Ioss::Utils::timer(); @@ -315,9 +315,9 @@ namespace Ioex { } } } - exodusFilePtr = -1; + m_exodusFilePtr = -1; - return exodusFilePtr; + return m_exodusFilePtr; } bool BaseDatabaseIO::ok__(bool write_message, std::string *error_msg, int *bad_count) const @@ -349,9 +349,9 @@ namespace Ioex { bool overwrite = false; is_ok = handle_output_file(write_message, error_msg, bad_count, overwrite, abort_if_error); // Close all open files... - if (exodusFilePtr >= 0) { - ex_close(exodusFilePtr); - exodusFilePtr = -1; + if (m_exodusFilePtr >= 0) { + ex_close(m_exodusFilePtr); + m_exodusFilePtr = -1; } } return is_ok; @@ -359,25 +359,25 @@ namespace Ioex { void BaseDatabaseIO::finalize_file_open() const { - assert(exodusFilePtr >= 0); + assert(m_exodusFilePtr >= 0); // Check byte-size of integers stored on the database... - if ((ex_int64_status(exodusFilePtr) & EX_ALL_INT64_DB) != 0) { + if ((ex_int64_status(m_exodusFilePtr) & EX_ALL_INT64_DB) != 0) { if (myProcessor == 0) { fmt::print(Ioss::OUTPUT(), "IOSS: Input database contains 8-byte integers. Setting Ioss to use " "8-byte integers.\n"); } - ex_set_int64_status(exodusFilePtr, EX_ALL_INT64_API); + ex_set_int64_status(m_exodusFilePtr, EX_ALL_INT64_API); set_int_byte_size_api(Ioss::USE_INT64_API); } // Check for maximum name length used on the input file. - int max_name_length = ex_inquire_int(exodusFilePtr, EX_INQ_DB_MAX_USED_NAME_LENGTH); + int max_name_length = ex_inquire_int(m_exodusFilePtr, EX_INQ_DB_MAX_USED_NAME_LENGTH); if (max_name_length > maximumNameLength) { maximumNameLength = max_name_length; } - ex_set_max_name_length(exodusFilePtr, maximumNameLength); + ex_set_max_name_length(m_exodusFilePtr, maximumNameLength); } bool BaseDatabaseIO::open_group__(const std::string &group_name) @@ -388,9 +388,9 @@ namespace Ioex { int exoid = get_file_pointer(); m_groupName = group_name; - ex_get_group_id(exoid, m_groupName.c_str(), &exodusFilePtr); + ex_get_group_id(exoid, m_groupName.c_str(), &m_exodusFilePtr); - if (exodusFilePtr < 0) { + if (m_exodusFilePtr < 0) { std::ostringstream errmsg; fmt::print(errmsg, "ERROR: Could not open group named '{}' in file '{}'.\n", m_groupName, get_filename()); @@ -427,7 +427,7 @@ namespace Ioex { IOSS_ERROR(errmsg); } else { - exodusFilePtr = exoid; + m_exodusFilePtr = exoid; success = true; } } @@ -630,7 +630,7 @@ namespace Ioex { if (nblob > 0) { std::vector blobs(nblob); - int max_name_length = ex_inquire_int(exodusFilePtr, EX_INQ_DB_MAX_USED_NAME_LENGTH); + int max_name_length = ex_inquire_int(m_exodusFilePtr, EX_INQ_DB_MAX_USED_NAME_LENGTH); for (auto &bl : blobs) { bl.name = new char[max_name_length + 1]; } @@ -2279,9 +2279,9 @@ namespace Ioex { if (region->mesh_type() != Ioss::MeshType::UNSTRUCTURED) { std::ostringstream errmsg; fmt::print(errmsg, - "ERROR: The mesh type is '{}' which Exodus does not support.\n" - " Only 'Unstructured' is supported at this time.\n", - region->mesh_type_string()); + "ERROR: The mesh type is '{}' which Exodus does not support.\n" + " Only 'Unstructured' is supported at this time.\n", + region->mesh_type_string()); IOSS_ERROR(errmsg); } @@ -2380,13 +2380,15 @@ namespace Ioex { } m_groupCount[EX_ELEM_BLOCK] = element_blocks.size(); - // Set "global_entity_count" property on all blocks. - // Used to skip output on "globally" empty blocks. - Ioss::Int64Vector global_counts(element_counts.size()); - util().global_count(element_counts, global_counts); - size_t idx = 0; - for (auto &element_block : element_blocks) { - element_block->property_add(Ioss::Property("global_entity_count", global_counts[idx++])); + if (isParallel) { + // Set "global_entity_count" property on all blocks. + // Used to skip output on "globally" empty blocks. + Ioss::Int64Vector global_counts(element_counts.size()); + util().global_count(element_counts, global_counts); + size_t idx = 0; + for (auto &element_block : element_blocks) { + element_block->property_add(Ioss::Property("global_entity_count", global_counts[idx++])); + } } } @@ -2468,7 +2470,7 @@ namespace Ioex { // the id of the sideblock must be the same as the sideset // id. new_block->property_update("id", id); - new_block->property_update("guid", util().generate_guid(1)); + new_block->property_update("guid", util().generate_guid(id)); entity_count += block->entity_count(); df_count += block->get_property("distribution_factor_count").get_int(); diff --git a/packages/seacas/libraries/ioss/src/exodus/Ioex_BaseDatabaseIO.h b/packages/seacas/libraries/ioss/src/exodus/Ioex_BaseDatabaseIO.h index 86dcf1baa336..34262dccca84 100644 --- a/packages/seacas/libraries/ioss/src/exodus/Ioex_BaseDatabaseIO.h +++ b/packages/seacas/libraries/ioss/src/exodus/Ioex_BaseDatabaseIO.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details // -*- Mode: c++ -*- @@ -265,7 +265,10 @@ namespace Ioex { // Private member data... protected: - mutable int exodusFilePtr{-1}; + mutable int m_exodusFilePtr{-1}; + // If using links to file-per-state, the file pointer for "base" file. + mutable int m_exodusBasePtr{-1}; + mutable std::string m_groupName; mutable EntityIdSet ids_; diff --git a/packages/seacas/libraries/ioss/src/exodus/Ioex_DatabaseIO.C b/packages/seacas/libraries/ioss/src/exodus/Ioex_DatabaseIO.C index 929954910204..1eff9301bd03 100644 --- a/packages/seacas/libraries/ioss/src/exodus/Ioex_DatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/exodus/Ioex_DatabaseIO.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include @@ -191,7 +191,7 @@ namespace Ioex { if (isParallel && no_collective_calls) { // Can't output a nice error message on processor 0 and throw a consistent error. // Have to just write message on processors that have issue and throw exception. - if (exodusFilePtr < 0) { + if (m_exodusFilePtr < 0) { std::ostringstream errmsg; std::string open_create = is_input() ? "open input" : "create output"; fmt::print(errmsg, "ERROR: Unable to {} exodus decomposed database file '{}'\n", @@ -209,19 +209,19 @@ namespace Ioex { } // Check for valid exodus_file_ptr (valid >= 0; invalid < 0) - int global_file_ptr = exodusFilePtr; + int global_file_ptr = m_exodusFilePtr; if (isParallel) { - global_file_ptr = util().global_minmax(exodusFilePtr, Ioss::ParallelUtils::DO_MIN); + global_file_ptr = util().global_minmax(m_exodusFilePtr, Ioss::ParallelUtils::DO_MIN); } if (global_file_ptr < 0) { if (write_message || error_msg != nullptr || bad_count != nullptr) { Ioss::IntVector status; if (isParallel) { - util().all_gather(exodusFilePtr, status); + util().all_gather(m_exodusFilePtr, status); } else { - status.push_back(exodusFilePtr); + status.push_back(m_exodusFilePtr); } std::string open_create = is_input() ? "open input" : "create output"; @@ -288,7 +288,7 @@ namespace Ioex { double t_begin = (do_timer ? Ioss::Utils::timer() : 0); int app_opt_val = ex_opts(EX_VERBOSE); - exodusFilePtr = ex_open(decoded_filename().c_str(), EX_READ | mode, &cpu_word_size, + m_exodusFilePtr = ex_open(decoded_filename().c_str(), EX_READ | mode, &cpu_word_size, &io_word_size, &version); if (do_timer) { @@ -356,7 +356,7 @@ namespace Ioex { #endif int app_opt_val = ex_opts(EX_VERBOSE); if (fileExists) { - exodusFilePtr = ex_open(decoded_filename().c_str(), EX_WRITE | mode, &cpu_word_size, + m_exodusFilePtr = ex_open(decoded_filename().c_str(), EX_WRITE | mode, &cpu_word_size, &io_word_size, &version); } else { @@ -374,22 +374,22 @@ namespace Ioex { mode |= EX_ALL_INT64_DB; } } - exodusFilePtr = ex_create(decoded_filename().c_str(), mode, &cpu_word_size, &dbRealWordSize); + m_exodusFilePtr = ex_create(decoded_filename().c_str(), mode, &cpu_word_size, &dbRealWordSize); } is_ok = check_valid_file_ptr(write_message, error_msg, bad_count, abort_if_error); if (is_ok) { - ex_set_max_name_length(exodusFilePtr, maximumNameLength); + ex_set_max_name_length(m_exodusFilePtr, maximumNameLength); // Check properties handled post-create/open... if (properties.exists("COMPRESSION_LEVEL")) { int comp_level = properties.get("COMPRESSION_LEVEL").get_int(); - ex_set_option(exodusFilePtr, EX_OPT_COMPRESSION_LEVEL, comp_level); + ex_set_option(m_exodusFilePtr, EX_OPT_COMPRESSION_LEVEL, comp_level); } if (properties.exists("COMPRESSION_SHUFFLE")) { int shuffle = properties.get("COMPRESSION_SHUFFLE").get_int(); - ex_set_option(exodusFilePtr, EX_OPT_COMPRESSION_SHUFFLE, shuffle); + ex_set_option(m_exodusFilePtr, EX_OPT_COMPRESSION_SHUFFLE, shuffle); } if (properties.exists("COMPRESSION_METHOD")) { auto method = properties.get("COMPRESSION_METHOD").get_string(); @@ -412,7 +412,7 @@ namespace Ioex { " 'zlib' will be used instead.\n\n", method); } - ex_set_option(exodusFilePtr, EX_OPT_COMPRESSION_TYPE, exo_method); + ex_set_option(m_exodusFilePtr, EX_OPT_COMPRESSION_TYPE, exo_method); } } ex_opts(app_opt_val); // Reset back to what it was. diff --git a/packages/seacas/libraries/ioss/src/exodus/Ioex_DatabaseIO.h b/packages/seacas/libraries/ioss/src/exodus/Ioex_DatabaseIO.h index d19889378855..a6304c310a41 100644 --- a/packages/seacas/libraries/ioss/src/exodus/Ioex_DatabaseIO.h +++ b/packages/seacas/libraries/ioss/src/exodus/Ioex_DatabaseIO.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details // -*- Mode: c++ -*- @@ -62,7 +62,7 @@ namespace Ioex { DatabaseIO &operator=(const DatabaseIO &from) = delete; ~DatabaseIO() override = default; - // Kluge -- a few applications need access so can diretly access exodus API + // Kluge -- a few applications need access so can directly access exodus API int get_file_pointer() const override; // Open file and set exodusFilePtr. private: diff --git a/packages/seacas/libraries/ioss/src/exodus/Ioex_DecompositionData.C b/packages/seacas/libraries/ioss/src/exodus/Ioex_DecompositionData.C index a184be077757..bfbff9a767df 100644 --- a/packages/seacas/libraries/ioss/src/exodus/Ioex_DecompositionData.C +++ b/packages/seacas/libraries/ioss/src/exodus/Ioex_DecompositionData.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include @@ -431,7 +431,7 @@ namespace Ioex { if (remain == 0 || total_read == entitylist_size) { // entitylist is full at this point... // * Broadcast data to other processors - // * Each procesor extracts the entities it manages. + // * Each processor extracts the entities it manages. m_decomposition.show_progress("\tBroadcast entitylist begin"); MPI_Bcast(entitylist.data(), entitylist.size(), Ioss::mpi_type(INT(0)), root, comm_); m_decomposition.show_progress("\tBroadcast entitylist end"); diff --git a/packages/seacas/libraries/ioss/src/exodus/Ioex_DecompositionData.h b/packages/seacas/libraries/ioss/src/exodus/Ioex_DecompositionData.h index 49863ef81f75..707419e05f29 100644 --- a/packages/seacas/libraries/ioss/src/exodus/Ioex_DecompositionData.h +++ b/packages/seacas/libraries/ioss/src/exodus/Ioex_DecompositionData.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #ifndef IOPX_DECOMPOSITONDATA_H diff --git a/packages/seacas/libraries/ioss/src/exodus/Ioex_IOFactory.C b/packages/seacas/libraries/ioss/src/exodus/Ioex_IOFactory.C index f67b5666be50..4622db4b0f0a 100644 --- a/packages/seacas/libraries/ioss/src/exodus/Ioex_IOFactory.C +++ b/packages/seacas/libraries/ioss/src/exodus/Ioex_IOFactory.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include // for Ioex DatabaseIO diff --git a/packages/seacas/libraries/ioss/src/exodus/Ioex_IOFactory.h b/packages/seacas/libraries/ioss/src/exodus/Ioex_IOFactory.h index ce8429fed960..315ecb506dba 100644 --- a/packages/seacas/libraries/ioss/src/exodus/Ioex_IOFactory.h +++ b/packages/seacas/libraries/ioss/src/exodus/Ioex_IOFactory.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioex_IOFactory_h diff --git a/packages/seacas/libraries/ioss/src/exodus/Ioex_Internals.C b/packages/seacas/libraries/ioss/src/exodus/Ioex_Internals.C index a39862acd9ac..515cfa83f2f1 100644 --- a/packages/seacas/libraries/ioss/src/exodus/Ioex_Internals.C +++ b/packages/seacas/libraries/ioss/src/exodus/Ioex_Internals.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include // for Internals, ElemBlock, etc diff --git a/packages/seacas/libraries/ioss/src/exodus/Ioex_Internals.h b/packages/seacas/libraries/ioss/src/exodus/Ioex_Internals.h index efdc679b17a6..09e8cc7abbcb 100644 --- a/packages/seacas/libraries/ioss/src/exodus/Ioex_Internals.h +++ b/packages/seacas/libraries/ioss/src/exodus/Ioex_Internals.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/ioss/src/exodus/Ioex_ParallelDatabaseIO.C b/packages/seacas/libraries/ioss/src/exodus/Ioex_ParallelDatabaseIO.C index 9ac0ac5f844c..09502a1cacac 100644 --- a/packages/seacas/libraries/ioss/src/exodus/Ioex_ParallelDatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/exodus/Ioex_ParallelDatabaseIO.C @@ -8,7 +8,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include @@ -91,18 +91,25 @@ namespace { // Verify that the nop (NodeOwningProcessor) vector is not empty and is of the correct size. // This vector specifies which rank owns each node on this rank // Throws error if problem, otherwise returns quietly. + if (file_node_count == 0) { + return; + } if (nop.empty()) { std::ostringstream errmsg; - fmt::print(errmsg, "ERROR: The use of the 'compose' output option requires the definition of the 'owning_processor'" - " field prior to the output of nodal data. This field has not yet been defined so output is not possible." - " For more information, contact gdsjaar@sandia.gov.\n"); + fmt::print(errmsg, "ERROR: The use of the 'compose' output option requires the definition of " + "the 'owning_processor'" + " field prior to the output of nodal data. This field has not yet been " + "defined so output is not possible." + " For more information, contact gdsjaar@sandia.gov.\n"); IOSS_ERROR(errmsg); } else if (nop.size() < file_node_count) { std::ostringstream errmsg; - fmt::print(errmsg, "ERROR: The 'owning_processor' data was defined, but it is not the correct size." - " Its size is {}, but it must be at least this size {}." - " For more information, contact gdsjaar@sandia.gov.\n", nop.size(), file_node_count); + fmt::print(errmsg, + "ERROR: The 'owning_processor' data was defined, but it is not the correct size." + " Its size is {}, but it must be at least this size {}." + " For more information, contact gdsjaar@sandia.gov.\n", + nop.size(), file_node_count); IOSS_ERROR(errmsg); } } @@ -207,7 +214,7 @@ namespace { // data, but in the node id map mapping, we have an int64_t coming // in and either an int or int64_t going out... template - void map_data(const Ioss::IntVector &owning_processor, int this_processor, const T *data, + void filter_owned_nodes(const Ioss::IntVector &owning_processor, int this_processor, const T *data, std::vector &file_data, size_t offset = 0, size_t stride = 1) { size_t index = offset; @@ -219,6 +226,21 @@ namespace { } } + // This version can be used *if* the input and output types are the same *and* the + // input `data` can be modified / overwritten. + template + void filter_owned_nodes(const Ioss::IntVector &owning_processor, int this_processor, T *data) + { + size_t index = 0; + size_t entry = 0; + for (auto op : owning_processor) { + if (op == this_processor) { + data[entry++] = data[index]; + } + index++; + } + } + template void map_local_to_global_implicit(INT *data, size_t count, const std::vector &global_implicit_map) @@ -291,12 +313,12 @@ namespace Ioex { { // Check for valid exodus_file_ptr (valid >= 0; invalid < 0) assert(isParallel); - int global_file_ptr = util().global_minmax(exodusFilePtr, Ioss::ParallelUtils::DO_MIN); + int global_file_ptr = util().global_minmax(m_exodusFilePtr, Ioss::ParallelUtils::DO_MIN); if (global_file_ptr < 0) { if (write_message || error_msg != nullptr || bad_count != nullptr) { Ioss::IntVector status; - util().all_gather(exodusFilePtr, status); + util().all_gather(m_exodusFilePtr, status); std::string open_create = is_input() ? "open input" : "create output"; if (write_message || error_msg != nullptr) { @@ -377,7 +399,7 @@ namespace Ioex { double t_begin = (do_timer ? Ioss::Utils::timer() : 0); int app_opt_val = ex_opts(EX_VERBOSE); - exodusFilePtr = ex_open_par(filename.c_str(), EX_READ | mode, &cpu_word_size, &io_word_size, + m_exodusFilePtr = ex_open_par(filename.c_str(), EX_READ | mode, &cpu_word_size, &io_word_size, &version, util().communicator(), info); if (do_timer) { @@ -469,7 +491,7 @@ namespace Ioex { double t_begin = (do_timer ? Ioss::Utils::timer() : 0); if (fileExists) { - exodusFilePtr = ex_open_par(filename.c_str(), EX_WRITE | mode, &cpu_word_size, &io_word_size, + m_exodusFilePtr = ex_open_par(filename.c_str(), EX_WRITE | mode, &cpu_word_size, &io_word_size, &version, util().communicator(), info); } else { @@ -487,7 +509,7 @@ namespace Ioex { mode |= EX_ALL_INT64_DB; } } - exodusFilePtr = ex_create_par(filename.c_str(), mode, &cpu_word_size, &dbRealWordSize, + m_exodusFilePtr = ex_create_par(filename.c_str(), mode, &cpu_word_size, &dbRealWordSize, util().communicator(), info); } @@ -506,16 +528,16 @@ namespace Ioex { bool is_ok = check_valid_file_ptr(write_message, error_msg, bad_count, abort_if_error); if (is_ok) { - ex_set_max_name_length(exodusFilePtr, maximumNameLength); + ex_set_max_name_length(m_exodusFilePtr, maximumNameLength); // Check properties handled post-create/open... if (properties.exists("COMPRESSION_LEVEL")) { int comp_level = properties.get("COMPRESSION_LEVEL").get_int(); - ex_set_option(exodusFilePtr, EX_OPT_COMPRESSION_LEVEL, comp_level); + ex_set_option(m_exodusFilePtr, EX_OPT_COMPRESSION_LEVEL, comp_level); } if (properties.exists("COMPRESSION_SHUFFLE")) { int shuffle = properties.get("COMPRESSION_SHUFFLE").get_int(); - ex_set_option(exodusFilePtr, EX_OPT_COMPRESSION_SHUFFLE, shuffle); + ex_set_option(m_exodusFilePtr, EX_OPT_COMPRESSION_SHUFFLE, shuffle); } } ex_opts(app_opt_val); // Reset back to what it was. @@ -538,8 +560,8 @@ namespace Ioex { } // Make sure all file pointers are valid... - int fp_min = util().global_minmax(exodusFilePtr, Ioss::ParallelUtils::DO_MIN); - int fp_max = util().global_minmax(exodusFilePtr, Ioss::ParallelUtils::DO_MAX); + int fp_min = util().global_minmax(m_exodusFilePtr, Ioss::ParallelUtils::DO_MIN); + int fp_max = util().global_minmax(m_exodusFilePtr, Ioss::ParallelUtils::DO_MAX); if (fp_min != fp_max && fp_min < 0) { std::ostringstream errmsg; fmt::print(errmsg, "ERROR: Inconsistent file pointer values."); @@ -2601,15 +2623,15 @@ int64_t ParallelDatabaseIO::write_attribute_field(ex_entity_type type, const Ios file_data.reserve(file_count); check_node_owning_processor_data(nodeOwningProcessor, file_count); if (ioss_type == Ioss::Field::REAL) { - map_data(nodeOwningProcessor, myProcessor, static_cast(data), file_data, i, + filter_owned_nodes(nodeOwningProcessor, myProcessor, static_cast(data), file_data, i, comp_count); } else if (ioss_type == Ioss::Field::INTEGER) { - map_data(nodeOwningProcessor, myProcessor, static_cast(data), file_data, i, + filter_owned_nodes(nodeOwningProcessor, myProcessor, static_cast(data), file_data, i, comp_count); } else if (ioss_type == Ioss::Field::INT64) { - map_data(nodeOwningProcessor, myProcessor, static_cast(data), file_data, i, + filter_owned_nodes(nodeOwningProcessor, myProcessor, static_cast(data), file_data, i, comp_count); } int ierr = ex_put_partial_one_attr(get_file_pointer(), type, id, proc_offset + 1, file_count, @@ -3270,7 +3292,7 @@ int64_t ParallelDatabaseIO::put_field_internal(const Ioss::NodeBlock *nb, const std::vector file_data; file_data.reserve(file_count); check_node_owning_processor_data(nodeOwningProcessor, file_count); - map_data(nodeOwningProcessor, myProcessor, rdata, file_data); + filter_owned_nodes(nodeOwningProcessor, myProcessor, rdata, file_data); int ierr = ex_put_partial_coord_component(get_file_pointer(), proc_offset + 1, file_count, 1, file_data.data()); @@ -3284,7 +3306,7 @@ int64_t ParallelDatabaseIO::put_field_internal(const Ioss::NodeBlock *nb, const std::vector file_data; file_data.reserve(file_count); check_node_owning_processor_data(nodeOwningProcessor, file_count); - map_data(nodeOwningProcessor, myProcessor, rdata, file_data); + filter_owned_nodes(nodeOwningProcessor, myProcessor, rdata, file_data); int ierr = ex_put_partial_coord_component(get_file_pointer(), proc_offset + 1, file_count, 2, file_data.data()); if (ierr < 0) { @@ -3297,7 +3319,7 @@ int64_t ParallelDatabaseIO::put_field_internal(const Ioss::NodeBlock *nb, const std::vector file_data; file_data.reserve(file_count); check_node_owning_processor_data(nodeOwningProcessor, file_count); - map_data(nodeOwningProcessor, myProcessor, rdata, file_data); + filter_owned_nodes(nodeOwningProcessor, myProcessor, rdata, file_data); int ierr = ex_put_partial_coord_component(get_file_pointer(), proc_offset + 1, file_count, 3, file_data.data()); if (ierr < 0) { @@ -3325,12 +3347,12 @@ int64_t ParallelDatabaseIO::put_field_internal(const Ioss::NodeBlock *nb, const // Cast 'data' to correct size -- double double *rdata = static_cast(data); check_node_owning_processor_data(nodeOwningProcessor, file_count); - map_data(nodeOwningProcessor, myProcessor, rdata, x, 0, spatialDimension); + filter_owned_nodes(nodeOwningProcessor, myProcessor, rdata, x, 0, spatialDimension); if (spatialDimension > 1) { - map_data(nodeOwningProcessor, myProcessor, rdata, y, 1, spatialDimension); + filter_owned_nodes(nodeOwningProcessor, myProcessor, rdata, y, 1, spatialDimension); } if (spatialDimension == 3) { - map_data(nodeOwningProcessor, myProcessor, rdata, z, 2, spatialDimension); + filter_owned_nodes(nodeOwningProcessor, myProcessor, rdata, z, 2, spatialDimension); } int ierr = ex_put_partial_coord(get_file_pointer(), proc_offset + 1, file_count, x.data(), @@ -3939,13 +3961,14 @@ void ParallelDatabaseIO::write_nodal_transient_field(ex_entity_type /* type */, for (int i = 0; i < comp_count; i++) { std::string var_name = var_type->label_name(field_name, i + 1, field_suffix_separator); - if (m_variables[EX_NODE_BLOCK].find(var_name) == m_variables[EX_NODE_BLOCK].end()) { + auto var_iter = m_variables[EX_NODE_BLOCK].find(var_name); + if (var_iter == m_variables[EX_NODE_BLOCK].end()) { std::ostringstream errmsg; fmt::print(errmsg, "ERROR: Could not find nodal variable '{}'\n", var_name); IOSS_ERROR(errmsg); } - var_index = m_variables[EX_NODE_BLOCK].find(var_name)->second; + var_index = var_iter->second; size_t begin_offset = (re_im * i) + complex_comp; size_t stride = re_im * comp_count; @@ -3984,12 +4007,10 @@ void ParallelDatabaseIO::write_nodal_transient_field(ex_entity_type /* type */, file_count = nb->get_property("locally_owned_count").get_int(); } - std::vector file_temp; - file_temp.reserve(file_count); check_node_owning_processor_data(nodeOwningProcessor, file_count); - map_data(nodeOwningProcessor, myProcessor, temp.data(), file_temp); + filter_owned_nodes(nodeOwningProcessor, myProcessor, temp.data()); int ierr = ex_put_partial_var(get_file_pointer(), step, EX_NODE_BLOCK, var_index, 0, - proc_offset + 1, file_count, file_temp.data()); + proc_offset + 1, file_count, temp.data()); if (ierr < 0) { std::ostringstream errmsg; fmt::print(errmsg, @@ -4158,7 +4179,7 @@ int64_t ParallelDatabaseIO::put_Xset_field_internal(ex_entity_type type, const I nodesetOwnedNodes[ns].reserve(file_count); if (int_byte_size_api() == 4) { i32data.reserve(file_count); - check_node_owning_processor_data(nodeOwningProcessor, file_count); + check_node_owning_processor_data(nodeOwningProcessor, file_count); map_nodeset_id_data(nodeOwningProcessor, nodesetOwnedNodes[ns], myProcessor, reinterpret_cast(data), num_to_get, i32data); assert(i32data.size() == file_count); @@ -4168,7 +4189,7 @@ int64_t ParallelDatabaseIO::put_Xset_field_internal(ex_entity_type type, const I } else { i64data.reserve(file_count); - check_node_owning_processor_data(nodeOwningProcessor, file_count); + check_node_owning_processor_data(nodeOwningProcessor, file_count); map_nodeset_id_data(nodeOwningProcessor, nodesetOwnedNodes[ns], myProcessor, reinterpret_cast(data), num_to_get, i64data); assert(i64data.size() == file_count); @@ -4633,7 +4654,7 @@ void ParallelDatabaseIO::output_node_map() const std::vector file_ids; file_ids.reserve(locally_owned_count); check_node_owning_processor_data(nodeOwningProcessor, locally_owned_count); - map_data(nodeOwningProcessor, myProcessor, &nodeMap.map()[1], file_ids); + filter_owned_nodes(nodeOwningProcessor, myProcessor, &nodeMap.map()[1], file_ids); ierr = ex_put_partial_id_map(get_file_pointer(), EX_NODE_MAP, processor_offset + 1, locally_owned_count, file_ids.data()); } @@ -4641,7 +4662,7 @@ void ParallelDatabaseIO::output_node_map() const std::vector file_ids; file_ids.reserve(locally_owned_count); check_node_owning_processor_data(nodeOwningProcessor, locally_owned_count); - map_data(nodeOwningProcessor, myProcessor, &nodeMap.map()[1], file_ids); + filter_owned_nodes(nodeOwningProcessor, myProcessor, &nodeMap.map()[1], file_ids); ierr = ex_put_partial_id_map(get_file_pointer(), EX_NODE_MAP, processor_offset + 1, locally_owned_count, file_ids.data()); } diff --git a/packages/seacas/libraries/ioss/src/exodus/Ioex_ParallelDatabaseIO.h b/packages/seacas/libraries/ioss/src/exodus/Ioex_ParallelDatabaseIO.h index a94586907f27..a4f894d2622b 100644 --- a/packages/seacas/libraries/ioss/src/exodus/Ioex_ParallelDatabaseIO.h +++ b/packages/seacas/libraries/ioss/src/exodus/Ioex_ParallelDatabaseIO.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details // -*- Mode: c++ -*- diff --git a/packages/seacas/libraries/ioss/src/exodus/Ioex_SuperElement.C b/packages/seacas/libraries/ioss/src/exodus/Ioex_SuperElement.C index 4505d1eab2a1..6a2f71511c27 100644 --- a/packages/seacas/libraries/ioss/src/exodus/Ioex_SuperElement.C +++ b/packages/seacas/libraries/ioss/src/exodus/Ioex_SuperElement.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include // for SuperElement diff --git a/packages/seacas/libraries/ioss/src/exodus/Ioex_SuperElement.h b/packages/seacas/libraries/ioss/src/exodus/Ioex_SuperElement.h index 04d9008be8d8..c4d51da43457 100644 --- a/packages/seacas/libraries/ioss/src/exodus/Ioex_SuperElement.h +++ b/packages/seacas/libraries/ioss/src/exodus/Ioex_SuperElement.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ioex_SuperElement_h #define IOSS_Ioex_SuperElement_h diff --git a/packages/seacas/libraries/ioss/src/exodus/Ioex_Utils.C b/packages/seacas/libraries/ioss/src/exodus/Ioex_Utils.C index 65bf37a7b1a3..df7676b85a53 100644 --- a/packages/seacas/libraries/ioss/src/exodus/Ioex_Utils.C +++ b/packages/seacas/libraries/ioss/src/exodus/Ioex_Utils.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include @@ -200,7 +200,7 @@ namespace Ioex { int status = nc_inq_att(exodusFilePtr, NC_GLOBAL, "processor_info", &att_type, &att_len); if (status == NC_NOERR && att_type == NC_INT) { // Attribute exists on this database, read it and check that the information - // matches the current processor count and procesor id. + // matches the current processor count and processor id. int proc_info[2]; status = nc_get_att_int(exodusFilePtr, NC_GLOBAL, "processor_info", proc_info); if (status == NC_NOERR) { diff --git a/packages/seacas/libraries/ioss/src/exodus/Ioex_Utils.h b/packages/seacas/libraries/ioss/src/exodus/Ioex_Utils.h index 61f647e14e04..5668e019fd27 100644 --- a/packages/seacas/libraries/ioss/src/exodus/Ioex_Utils.h +++ b/packages/seacas/libraries/ioss/src/exodus/Ioex_Utils.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #ifndef IOEX_UTILS_H diff --git a/packages/seacas/libraries/ioss/src/fmt/chrono.h b/packages/seacas/libraries/ioss/src/fmt/chrono.h index df3661eed0b6..9d1012c42317 100644 --- a/packages/seacas/libraries/ioss/src/fmt/chrono.h +++ b/packages/seacas/libraries/ioss/src/fmt/chrono.h @@ -56,11 +56,13 @@ inline std::tm localtime(std::time_t time) bool handle(std::tm *tm) { return tm != nullptr; } +#if (!defined(__INTEL_COMPILER) || (defined(__INTEL_COMPILER) && __INTEL_COMPILER > 1800)) bool handle(internal::null<>) { using namespace fmt::internal; return fallback(localtime_s(&tm_, &time_)); } +#endif bool fallback(int res) { return res == 0; } @@ -100,11 +102,13 @@ inline std::tm gmtime(std::time_t time) bool handle(std::tm *tm) { return tm != nullptr; } +#if (!defined(__INTEL_COMPILER) || (defined(__INTEL_COMPILER) && __INTEL_COMPILER > 1800)) bool handle(internal::null<>) { using namespace fmt::internal; return fallback(gmtime_s(&tm_, &time_)); } +#endif bool fallback(int res) { return res == 0; } diff --git a/packages/seacas/libraries/ioss/src/gen_struc/Iogs_DatabaseIO.C b/packages/seacas/libraries/ioss/src/gen_struc/Iogs_DatabaseIO.C index f08ee614b24d..c3719cfc3c2b 100644 --- a/packages/seacas/libraries/ioss/src/gen_struc/Iogs_DatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/gen_struc/Iogs_DatabaseIO.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "Ioss_CommSet.h" // for CommSet diff --git a/packages/seacas/libraries/ioss/src/gen_struc/Iogs_DatabaseIO.h b/packages/seacas/libraries/ioss/src/gen_struc/Iogs_DatabaseIO.h index 0da75e3accf4..45d4be3646e9 100644 --- a/packages/seacas/libraries/ioss/src/gen_struc/Iogs_DatabaseIO.h +++ b/packages/seacas/libraries/ioss/src/gen_struc/Iogs_DatabaseIO.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Iogs_DatabaseIO_h diff --git a/packages/seacas/libraries/ioss/src/gen_struc/Iogs_GeneratedMesh.C b/packages/seacas/libraries/ioss/src/gen_struc/Iogs_GeneratedMesh.C index 92511fa8166a..a84a60cc3d93 100644 --- a/packages/seacas/libraries/ioss/src/gen_struc/Iogs_GeneratedMesh.C +++ b/packages/seacas/libraries/ioss/src/gen_struc/Iogs_GeneratedMesh.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include // for EntityType, etc diff --git a/packages/seacas/libraries/ioss/src/gen_struc/Iogs_GeneratedMesh.h b/packages/seacas/libraries/ioss/src/gen_struc/Iogs_GeneratedMesh.h index 57579a351121..1178772599f3 100644 --- a/packages/seacas/libraries/ioss/src/gen_struc/Iogs_GeneratedMesh.h +++ b/packages/seacas/libraries/ioss/src/gen_struc/Iogs_GeneratedMesh.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Iogs_GeneratedMesh_h diff --git a/packages/seacas/libraries/ioss/src/generated/Iogn_DashSurfaceMesh.C b/packages/seacas/libraries/ioss/src/generated/Iogn_DashSurfaceMesh.C index d85d79abb15d..ccd905cce8d3 100644 --- a/packages/seacas/libraries/ioss/src/generated/Iogn_DashSurfaceMesh.C +++ b/packages/seacas/libraries/ioss/src/generated/Iogn_DashSurfaceMesh.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include // for copy diff --git a/packages/seacas/libraries/ioss/src/generated/Iogn_DashSurfaceMesh.h b/packages/seacas/libraries/ioss/src/generated/Iogn_DashSurfaceMesh.h index 82e71f8744bf..8cd60cbd445b 100644 --- a/packages/seacas/libraries/ioss/src/generated/Iogn_DashSurfaceMesh.h +++ b/packages/seacas/libraries/ioss/src/generated/Iogn_DashSurfaceMesh.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Iogn_DashSurfaceMesh_h diff --git a/packages/seacas/libraries/ioss/src/generated/Iogn_DatabaseIO.C b/packages/seacas/libraries/ioss/src/generated/Iogn_DatabaseIO.C index ae01c346de96..b01e87a41968 100644 --- a/packages/seacas/libraries/ioss/src/generated/Iogn_DatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/generated/Iogn_DatabaseIO.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "Ioss_CommSet.h" // for CommSet diff --git a/packages/seacas/libraries/ioss/src/generated/Iogn_DatabaseIO.h b/packages/seacas/libraries/ioss/src/generated/Iogn_DatabaseIO.h index 5bf2ab564649..32a44a33879c 100644 --- a/packages/seacas/libraries/ioss/src/generated/Iogn_DatabaseIO.h +++ b/packages/seacas/libraries/ioss/src/generated/Iogn_DatabaseIO.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Iogn_DatabaseIO_h diff --git a/packages/seacas/libraries/ioss/src/generated/Iogn_GeneratedMesh.C b/packages/seacas/libraries/ioss/src/generated/Iogn_GeneratedMesh.C index 4ed920238d7f..3d048265ad8e 100644 --- a/packages/seacas/libraries/ioss/src/generated/Iogn_GeneratedMesh.C +++ b/packages/seacas/libraries/ioss/src/generated/Iogn_GeneratedMesh.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include diff --git a/packages/seacas/libraries/ioss/src/generated/Iogn_GeneratedMesh.h b/packages/seacas/libraries/ioss/src/generated/Iogn_GeneratedMesh.h index eb1a9528fb1d..0f62116d7605 100644 --- a/packages/seacas/libraries/ioss/src/generated/Iogn_GeneratedMesh.h +++ b/packages/seacas/libraries/ioss/src/generated/Iogn_GeneratedMesh.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Iogn_GeneratedMesh_h diff --git a/packages/seacas/libraries/ioss/src/heartbeat/Iohb_DatabaseIO.C b/packages/seacas/libraries/ioss/src/heartbeat/Iohb_DatabaseIO.C index 975d661961ae..b4920ee6b82a 100644 --- a/packages/seacas/libraries/ioss/src/heartbeat/Iohb_DatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/heartbeat/Iohb_DatabaseIO.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include diff --git a/packages/seacas/libraries/ioss/src/heartbeat/Iohb_DatabaseIO.h b/packages/seacas/libraries/ioss/src/heartbeat/Iohb_DatabaseIO.h index dcf89e3c444e..9fdff3ba525b 100644 --- a/packages/seacas/libraries/ioss/src/heartbeat/Iohb_DatabaseIO.h +++ b/packages/seacas/libraries/ioss/src/heartbeat/Iohb_DatabaseIO.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Iohb_DatabaseIO_h diff --git a/packages/seacas/libraries/ioss/src/heartbeat/Iohb_Layout.C b/packages/seacas/libraries/ioss/src/heartbeat/Iohb_Layout.C index 48d83278fee5..99d74c8400d9 100644 --- a/packages/seacas/libraries/ioss/src/heartbeat/Iohb_Layout.C +++ b/packages/seacas/libraries/ioss/src/heartbeat/Iohb_Layout.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include diff --git a/packages/seacas/libraries/ioss/src/heartbeat/Iohb_Layout.h b/packages/seacas/libraries/ioss/src/heartbeat/Iohb_Layout.h index 7987459fe602..5e800e05320b 100644 --- a/packages/seacas/libraries/ioss/src/heartbeat/Iohb_Layout.h +++ b/packages/seacas/libraries/ioss/src/heartbeat/Iohb_Layout.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Iohb_Layout_h diff --git a/packages/seacas/libraries/ioss/src/init/CMakeLists.txt b/packages/seacas/libraries/ioss/src/init/CMakeLists.txt index a9aeba1e9890..2ce94ff94472 100644 --- a/packages/seacas/libraries/ioss/src/init/CMakeLists.txt +++ b/packages/seacas/libraries/ioss/src/init/CMakeLists.txt @@ -40,7 +40,7 @@ TRIBITS_ADD_LIBRARY( HEADERS ${HEADERS} SOURCES ${SOURCES} DEPLIBS Ioss ${EXODUSLIB} - Iogn Iogs Iohb Iotr ${IOVISLIB} + Iogn Iogs Iohb Iotr ${IOVISLIB} ${PAMGENLIB} ${CGNSLIB} ${VISLIB} ${DATAWAREHOUSELIB} ${ADIOS2LIB} ) diff --git a/packages/seacas/libraries/ioss/src/init/Ionit_Initializer.C b/packages/seacas/libraries/ioss/src/init/Ionit_Initializer.C index b200c03b0503..35764f017500 100644 --- a/packages/seacas/libraries/ioss/src/init/Ionit_Initializer.C +++ b/packages/seacas/libraries/ioss/src/init/Ionit_Initializer.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include diff --git a/packages/seacas/libraries/ioss/src/init/Ionit_Initializer.h b/packages/seacas/libraries/ioss/src/init/Ionit_Initializer.h index ede4d71ab05b..42a229cf5d48 100644 --- a/packages/seacas/libraries/ioss/src/init/Ionit_Initializer.h +++ b/packages/seacas/libraries/ioss/src/init/Ionit_Initializer.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Ionit_Initializer_h diff --git a/packages/seacas/libraries/ioss/src/main/CMakeLists.txt b/packages/seacas/libraries/ioss/src/main/CMakeLists.txt index 47232c737440..4f404a65fd54 100644 --- a/packages/seacas/libraries/ioss/src/main/CMakeLists.txt +++ b/packages/seacas/libraries/ioss/src/main/CMakeLists.txt @@ -1,8 +1,6 @@ - SET(HEADERS "") SET(SOURCES "") - SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}) APPEND_GLOB(HEADERS ${DIR}/*.h) APPEND_GLOB(SOURCES ${DIR}/*.C) @@ -241,7 +239,6 @@ else() ) endif() - if ( CGNS_CGNSLIST_BINARY ) TRIBITS_ADD_ADVANCED_TEST(exodus64_to_unstructured_cgns TEST_0 EXEC io_shell ARGS ${DECOMP_ARG} --64 ${CMAKE_CURRENT_SOURCE_DIR}/test/8-block.g 8-block64.cgns @@ -540,6 +537,17 @@ TRIBITS_ADD_ADVANCED_TEST(structured_cgns_roundtrip_single_fpp_single_fields COMM mpi ) +if (TPL_ENABLE_MPI) +TRIBITS_ADD_ADVANCED_TEST(structured_cgns_pre_split_join + TEST_0 EXEC io_shell ARGS --external ${CMAKE_CURRENT_SOURCE_DIR}/test/pre-split-old.cgns pre-split-old.cgns + NUM_MPI_PROCS 4 + NOEXEPREFIX NOEXESUFFIX + TEST_1 CMND ${CGNS_CGNSDIFF_BINARY} ARGS -d ${CMAKE_CURRENT_SOURCE_DIR}/test/pre-split_cgns.gold pre-split-old.cgns + NUM_MPI_PROCS 1 + COMM mpi +) +endif() + IF (TPL_ENABLE_Pamgen OR Trilinos_ENABLE_Pamgen) TRIBITS_ADD_ADVANCED_TEST(pamgen_to_unstructured_cgns TEST_0 EXEC io_shell ARGS --in_type pamgen ${CMAKE_CURRENT_SOURCE_DIR}/test/pamgen.i pamgen.cgns diff --git a/packages/seacas/libraries/ioss/src/main/cgns_decomp.C b/packages/seacas/libraries/ioss/src/main/cgns_decomp.C index 12b0d8eb55a6..57cab63f1f3b 100644 --- a/packages/seacas/libraries/ioss/src/main/cgns_decomp.C +++ b/packages/seacas/libraries/ioss/src/main/cgns_decomp.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details // Make asserts active even in non-debug build @@ -517,7 +517,7 @@ namespace { std::nth_element(pw_copy.begin(), pw_copy.begin() + pw_copy.size() / 2, pw_copy.end()); median = pw_copy[pw_copy.size() / 2]; fmt::print( - "\nWork per processor:\n\tMinimum = {:n}, Maximum = {:n}, Median = {:n}, Ratio = {}\n\n", + "\nWork per processor:\n\tMinimum = {:n}, Maximum = {:n}, Median = {:n}, Ratio = {:.3}\n\n", min_work, max_work, median, (double)(max_work) / min_work); } if (interFace.work_per_processor) { diff --git a/packages/seacas/libraries/ioss/src/main/cth_pressure_map.C b/packages/seacas/libraries/ioss/src/main/cth_pressure_map.C index fa7d259781cc..b9636719082a 100644 --- a/packages/seacas/libraries/ioss/src/main/cth_pressure_map.C +++ b/packages/seacas/libraries/ioss/src/main/cth_pressure_map.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include diff --git a/packages/seacas/libraries/ioss/src/main/info_interface.C b/packages/seacas/libraries/ioss/src/main/info_interface.C index cd522fede52f..5d8ef722b3b5 100644 --- a/packages/seacas/libraries/ioss/src/main/info_interface.C +++ b/packages/seacas/libraries/ioss/src/main/info_interface.C @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #include "Ioss_CodeTypes.h" diff --git a/packages/seacas/libraries/ioss/src/main/info_interface.h b/packages/seacas/libraries/ioss/src/main/info_interface.h index 0a916d560697..e261ed7f81f3 100644 --- a/packages/seacas/libraries/ioss/src/main/info_interface.h +++ b/packages/seacas/libraries/ioss/src/main/info_interface.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #ifndef info_SystemInterface_h diff --git a/packages/seacas/libraries/ioss/src/main/io_info.C b/packages/seacas/libraries/ioss/src/main/io_info.C index e91dc9b10f6c..e15999896091 100644 --- a/packages/seacas/libraries/ioss/src/main/io_info.C +++ b/packages/seacas/libraries/ioss/src/main/io_info.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "io_info.h" @@ -244,7 +244,7 @@ namespace { if (!sb->m_boundaryConditions.empty()) { fmt::print("\tBoundary Conditions:\n"); // NOTE: The sort here is just to make io_info more useful for regression testing. - // With the sort, we get more reproducable output. For now, only needed for BC... + // With the sort, we get more reproducible output. For now, only needed for BC... auto sb_bc = sb->m_boundaryConditions; std::sort(sb_bc.begin(), sb_bc.end(), [](const Ioss::BoundaryCondition &a, const Ioss::BoundaryCondition &b) { diff --git a/packages/seacas/libraries/ioss/src/main/io_info.h b/packages/seacas/libraries/ioss/src/main/io_info.h index fc920597abc8..e741319ee5c2 100644 --- a/packages/seacas/libraries/ioss/src/main/io_info.h +++ b/packages/seacas/libraries/ioss/src/main/io_info.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #ifndef Ioss_io_info_h diff --git a/packages/seacas/libraries/ioss/src/main/io_info_main.C b/packages/seacas/libraries/ioss/src/main/io_info_main.C index 1dbdab12388f..8b651889fbd4 100644 --- a/packages/seacas/libraries/ioss/src/main/io_info_main.C +++ b/packages/seacas/libraries/ioss/src/main/io_info_main.C @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/ioss/src/main/io_modify.C b/packages/seacas/libraries/ioss/src/main/io_modify.C index 83b8432ab600..5a29ab05032c 100644 --- a/packages/seacas/libraries/ioss/src/main/io_modify.C +++ b/packages/seacas/libraries/ioss/src/main/io_modify.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "modify_interface.h" @@ -57,13 +57,13 @@ #include #if defined(SEACAS_HAVE_EXODUS) -#include #include #include +#include #endif #if defined(SEACAS_HAVE_CGNS) -#include +#include #endif #if defined(_MSC_VER) @@ -501,20 +501,13 @@ namespace { "\t\tThis will cause the database to be rewritten. Without this option, it is " "updated in place.\n"); } - if (all || Ioss::Utils::substr_equal(topic, "regex")) { - fmt::print("\n\tRegular Expression help (used in ASSEMBLY MATCHES and LIST MATCHES and " - "ATTRIBUTE LIST MATCHES options)\n" - "\tSupports \"POSIX Extended Regular Expressions\" syntax\n" - "\tSee https://www.regular-expressions.info/posix.html\n" - "\tQuickStart: https://www.regular-expressions.info/quickstart.html\n"); - } if (all || Ioss::Utils::substr_equal(topic, "list")) { fmt::print( - "\n\tLIST summary|elementblock|block|structuredblock|assembly|nodeset|sideset|blob\n"); - fmt::print("\n\tLIST elementblock|block|structuredblock|assembly|nodeset|sideset|blob " - "{{names...}}\n\n"); - fmt::print("\n\tLIST elementblock|block|structuredblock|assembly|nodeset|sideset|blob " - "MATCHES {{regex}}\n\n"); + "\n\tLIST elementblock|block|structuredblock|assembly|nodeset|sideset|blob|summary\n"); + fmt::print("\tLIST elementblock|block|structuredblock|assembly|nodeset|sideset|blob " + "{{names...}}\n"); + fmt::print("\tLIST elementblock|block|structuredblock|assembly|nodeset|sideset|blob " + "MATCHES {{regex}}\n"); } if (all || Ioss::Utils::substr_equal(topic, "assembly")) { fmt::print("\n\tFor all commands, if an assembly named `name` does not exist, it will be " @@ -577,6 +570,13 @@ namespace { "\t\tList attributes for all entities in the specified entity type whose name " "matches the regex.\n"); } + if (all || Ioss::Utils::substr_equal(topic, "regex")) { + fmt::print("\n\tRegular Expression help (used in ASSEMBLY MATCHES and LIST MATCHES and " + "ATTRIBUTE LIST MATCHES options)\n" + "\t\tSupports \"POSIX Extended Regular Expressions\" syntax\n" + "\t\tSee https://www.regular-expressions.info/posix.html\n" + "\t\tQuickStart: https://www.regular-expressions.info/quickstart.html\n"); + } } void handle_list(const std::vector &tokens, const Ioss::Region ®ion, @@ -1158,7 +1158,7 @@ namespace { } #if defined(SEACAS_HAVE_CGNS) - void update_cgns_assembly_info(Ioss::Region ®ion, const Modify::Interface &interFace) + void update_cgns_assembly_info(Ioss::Region ®ion, const Modify::Interface &interFace) { region.end_mode(Ioss::STATE_DEFINE_MODEL); int file_ptr = region.get_database()->get_file_pointer(); @@ -1169,18 +1169,19 @@ namespace { if (assembly->property_exists("modified")) { if (assembly->property_exists("created")) { fmt::print(fg(fmt::color::cyan), "\t*** Creating assembly '{}'\n", assembly->name()); - Iocgns::Utils::output_assembly(file_ptr, assembly, false, true); + Iocgns::Utils::output_assembly(file_ptr, assembly, false, true); } else { - fmt::print(stderr, fg(fmt::color::yellow), "WARNING: Can not modify existing assembly '{}' yet.\n", - assembly->name()); + fmt::print(stderr, fg(fmt::color::yellow), + "WARNING: Can not modify existing assembly '{}' yet.\n", assembly->name()); } } } } #endif - void update_exodus_assembly_info(Ioss::Region ®ion, const Modify::Interface &interFace) +#if defined(SEACAS_HAVE_EXODUS) + void update_exodus_assembly_info(Ioss::Region ®ion, const Modify::Interface &interFace) { std::vector ex_assemblies; bool modify_existing = false; @@ -1242,22 +1243,30 @@ namespace { Ioex::write_reduction_attributes(exoid, attributes_modified); } } +#endif void update_assembly_info(Ioss::Region ®ion, const Modify::Interface &interFace) { // Determine type of underlying database... const auto type = region.get_database()->get_format(); if (type == "Exodus") { +#if defined(SEACAS_HAVE_EXODUS) update_exodus_assembly_info(region, interFace); +#else + fmt::print(stderr, fg(fmt::color::red), "ERROR: Exodus capability is not enabled.\n"); +#endif } -#if defined(SEACAS_HAVE_CGNS) else if (type == "CGNS") { +#if defined(SEACAS_HAVE_CGNS) update_cgns_assembly_info(region, interFace); +#else + fmt::print(stderr, fg(fmt::color::red), "ERROR: CGNS capability is not enabled.\n"); +#endif } -#endif else { - fmt::print(stderr, fg(fmt::color::red), "ERROR: Can not modify the database '{}' of type '{}'.\n", - interFace.filename(), type); + fmt::print(stderr, fg(fmt::color::red), + "ERROR: Can not modify the database '{}' of type '{}'.\n", interFace.filename(), + type); } } diff --git a/packages/seacas/libraries/ioss/src/main/io_shell.C b/packages/seacas/libraries/ioss/src/main/io_shell.C index 040abb683b0a..17cab444831f 100644 --- a/packages/seacas/libraries/ioss/src/main/io_shell.C +++ b/packages/seacas/libraries/ioss/src/main/io_shell.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include diff --git a/packages/seacas/libraries/ioss/src/main/io_shell_ts.C b/packages/seacas/libraries/ioss/src/main/io_shell_ts.C index b90812a0868f..d2dd691abef9 100644 --- a/packages/seacas/libraries/ioss/src/main/io_shell_ts.C +++ b/packages/seacas/libraries/ioss/src/main/io_shell_ts.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include diff --git a/packages/seacas/libraries/ioss/src/main/modify_interface.C b/packages/seacas/libraries/ioss/src/main/modify_interface.C index 19dda1dc4ceb..01f6fb725155 100644 --- a/packages/seacas/libraries/ioss/src/main/modify_interface.C +++ b/packages/seacas/libraries/ioss/src/main/modify_interface.C @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/ioss/src/main/modify_interface.h b/packages/seacas/libraries/ioss/src/main/modify_interface.h index 30b747a1ae5b..80250ca0c63b 100644 --- a/packages/seacas/libraries/ioss/src/main/modify_interface.h +++ b/packages/seacas/libraries/ioss/src/main/modify_interface.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/ioss/src/main/shell_interface.C b/packages/seacas/libraries/ioss/src/main/shell_interface.C index 013470efff6e..1e71f804e2a0 100644 --- a/packages/seacas/libraries/ioss/src/main/shell_interface.C +++ b/packages/seacas/libraries/ioss/src/main/shell_interface.C @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #include "Ioss_CodeTypes.h" @@ -19,8 +19,6 @@ #include // for string, char_traits #include // for vector -#define NPOS std::string::npos - namespace { std::string get_type_from_file(const std::string &filename) { diff --git a/packages/seacas/libraries/ioss/src/main/shell_interface.h b/packages/seacas/libraries/ioss/src/main/shell_interface.h index 4f080b656fa6..907c84f67495 100644 --- a/packages/seacas/libraries/ioss/src/main/shell_interface.h +++ b/packages/seacas/libraries/ioss/src/main/shell_interface.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #ifndef shell_SystemInterface_h diff --git a/packages/seacas/libraries/ioss/src/main/shell_to_hex.C b/packages/seacas/libraries/ioss/src/main/shell_to_hex.C index 44a26576359e..2b9158230059 100644 --- a/packages/seacas/libraries/ioss/src/main/shell_to_hex.C +++ b/packages/seacas/libraries/ioss/src/main/shell_to_hex.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include diff --git a/packages/seacas/libraries/ioss/src/main/skinner.C b/packages/seacas/libraries/ioss/src/main/skinner.C index 470de8087122..5974a66cb1ed 100644 --- a/packages/seacas/libraries/ioss/src/main/skinner.C +++ b/packages/seacas/libraries/ioss/src/main/skinner.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include diff --git a/packages/seacas/libraries/ioss/src/main/skinner_interface.C b/packages/seacas/libraries/ioss/src/main/skinner_interface.C index de5897a042a5..2a57114926e2 100644 --- a/packages/seacas/libraries/ioss/src/main/skinner_interface.C +++ b/packages/seacas/libraries/ioss/src/main/skinner_interface.C @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #include "Ioss_FileInfo.h" diff --git a/packages/seacas/libraries/ioss/src/main/skinner_interface.h b/packages/seacas/libraries/ioss/src/main/skinner_interface.h index e0cc6863385c..ad56f4568181 100644 --- a/packages/seacas/libraries/ioss/src/main/skinner_interface.h +++ b/packages/seacas/libraries/ioss/src/main/skinner_interface.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #ifndef skinner_SystemInterface_h diff --git a/packages/seacas/libraries/ioss/src/main/sphgen.C b/packages/seacas/libraries/ioss/src/main/sphgen.C index 515e138f2ba1..ff8a27346817 100644 --- a/packages/seacas/libraries/ioss/src/main/sphgen.C +++ b/packages/seacas/libraries/ioss/src/main/sphgen.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include diff --git a/packages/seacas/libraries/ioss/src/main/struc_to_unstruc.C b/packages/seacas/libraries/ioss/src/main/struc_to_unstruc.C index d056e6ba693b..547f20d521d8 100644 --- a/packages/seacas/libraries/ioss/src/main/struc_to_unstruc.C +++ b/packages/seacas/libraries/ioss/src/main/struc_to_unstruc.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include diff --git a/packages/seacas/libraries/ioss/src/main/test/pre-split-old.cgns.4.0 b/packages/seacas/libraries/ioss/src/main/test/pre-split-old.cgns.4.0 new file mode 100644 index 000000000000..f7d499050776 Binary files /dev/null and b/packages/seacas/libraries/ioss/src/main/test/pre-split-old.cgns.4.0 differ diff --git a/packages/seacas/libraries/ioss/src/main/test/pre-split-old.cgns.4.1 b/packages/seacas/libraries/ioss/src/main/test/pre-split-old.cgns.4.1 new file mode 100644 index 000000000000..23cb522d7d3c Binary files /dev/null and b/packages/seacas/libraries/ioss/src/main/test/pre-split-old.cgns.4.1 differ diff --git a/packages/seacas/libraries/ioss/src/main/test/pre-split-old.cgns.4.2 b/packages/seacas/libraries/ioss/src/main/test/pre-split-old.cgns.4.2 new file mode 100644 index 000000000000..5b99ee05be9a Binary files /dev/null and b/packages/seacas/libraries/ioss/src/main/test/pre-split-old.cgns.4.2 differ diff --git a/packages/seacas/libraries/ioss/src/main/test/pre-split-old.cgns.4.3 b/packages/seacas/libraries/ioss/src/main/test/pre-split-old.cgns.4.3 new file mode 100644 index 000000000000..d0670a730d30 Binary files /dev/null and b/packages/seacas/libraries/ioss/src/main/test/pre-split-old.cgns.4.3 differ diff --git a/packages/seacas/libraries/ioss/src/main/test/pre-split_cgns.gold b/packages/seacas/libraries/ioss/src/main/test/pre-split_cgns.gold new file mode 100644 index 000000000000..5339cfa48e29 Binary files /dev/null and b/packages/seacas/libraries/ioss/src/main/test/pre-split_cgns.gold differ diff --git a/packages/seacas/libraries/ioss/src/main/vector3d.C b/packages/seacas/libraries/ioss/src/main/vector3d.C index 418e64967823..ec9f0b0ef4c0 100644 --- a/packages/seacas/libraries/ioss/src/main/vector3d.C +++ b/packages/seacas/libraries/ioss/src/main/vector3d.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include diff --git a/packages/seacas/libraries/ioss/src/main/vector3d.h b/packages/seacas/libraries/ioss/src/main/vector3d.h index 773183b87e24..7c373bf6084d 100644 --- a/packages/seacas/libraries/ioss/src/main/vector3d.h +++ b/packages/seacas/libraries/ioss/src/main/vector3d.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #ifndef VECTOR3D diff --git a/packages/seacas/libraries/ioss/src/main/volume.C b/packages/seacas/libraries/ioss/src/main/volume.C index 829bc2c519e5..1268531b9f42 100644 --- a/packages/seacas/libraries/ioss/src/main/volume.C +++ b/packages/seacas/libraries/ioss/src/main/volume.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "Ioss_DatabaseIO.h" // for DatabaseIO diff --git a/packages/seacas/libraries/ioss/src/pamgen/Iopg_DatabaseIO.C b/packages/seacas/libraries/ioss/src/pamgen/Iopg_DatabaseIO.C index 554d933d3254..cf2c964336bd 100644 --- a/packages/seacas/libraries/ioss/src/pamgen/Iopg_DatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/pamgen/Iopg_DatabaseIO.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include diff --git a/packages/seacas/libraries/ioss/src/pamgen/Iopg_DatabaseIO.h b/packages/seacas/libraries/ioss/src/pamgen/Iopg_DatabaseIO.h index 65343d967aba..0b73bd567c10 100644 --- a/packages/seacas/libraries/ioss/src/pamgen/Iopg_DatabaseIO.h +++ b/packages/seacas/libraries/ioss/src/pamgen/Iopg_DatabaseIO.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Iopg_DatabaseIO_h diff --git a/packages/seacas/libraries/ioss/src/tokenize.C b/packages/seacas/libraries/ioss/src/tokenize.C index 99e5473d05c7..ba43c4c0f43c 100644 --- a/packages/seacas/libraries/ioss/src/tokenize.C +++ b/packages/seacas/libraries/ioss/src/tokenize.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include diff --git a/packages/seacas/libraries/ioss/src/tokenize.h b/packages/seacas/libraries/ioss/src/tokenize.h index c2c7b2db3177..03afa1c26564 100644 --- a/packages/seacas/libraries/ioss/src/tokenize.h +++ b/packages/seacas/libraries/ioss/src/tokenize.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #ifndef TOKENIZE_H diff --git a/packages/seacas/libraries/ioss/src/transform/Iotr_Factory.C b/packages/seacas/libraries/ioss/src/transform/Iotr_Factory.C index b8a07cfc3fd9..1ca709a5c37f 100644 --- a/packages/seacas/libraries/ioss/src/transform/Iotr_Factory.C +++ b/packages/seacas/libraries/ioss/src/transform/Iotr_Factory.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include diff --git a/packages/seacas/libraries/ioss/src/transform/Iotr_Initializer.C b/packages/seacas/libraries/ioss/src/transform/Iotr_Initializer.C index deec2d414de2..2da968c73e5b 100644 --- a/packages/seacas/libraries/ioss/src/transform/Iotr_Initializer.C +++ b/packages/seacas/libraries/ioss/src/transform/Iotr_Initializer.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include diff --git a/packages/seacas/libraries/ioss/src/transform/Iotr_Initializer.h b/packages/seacas/libraries/ioss/src/transform/Iotr_Initializer.h index 7f893513930f..317512d7e247 100644 --- a/packages/seacas/libraries/ioss/src/transform/Iotr_Initializer.h +++ b/packages/seacas/libraries/ioss/src/transform/Iotr_Initializer.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Iotr_Initializer_h diff --git a/packages/seacas/libraries/ioss/src/transform/Iotr_MinMax.C b/packages/seacas/libraries/ioss/src/transform/Iotr_MinMax.C index 68cc0ac7c2c4..589f0d5e1c56 100644 --- a/packages/seacas/libraries/ioss/src/transform/Iotr_MinMax.C +++ b/packages/seacas/libraries/ioss/src/transform/Iotr_MinMax.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "Ioss_Transform.h" // for Factory, Transform diff --git a/packages/seacas/libraries/ioss/src/transform/Iotr_MinMax.h b/packages/seacas/libraries/ioss/src/transform/Iotr_MinMax.h index 6ea19e462a02..7a20b58dd5c9 100644 --- a/packages/seacas/libraries/ioss/src/transform/Iotr_MinMax.h +++ b/packages/seacas/libraries/ioss/src/transform/Iotr_MinMax.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Iotr_MinMax_h diff --git a/packages/seacas/libraries/ioss/src/transform/Iotr_Offset.C b/packages/seacas/libraries/ioss/src/transform/Iotr_Offset.C index fc59344cf704..cac0fe4ecc97 100644 --- a/packages/seacas/libraries/ioss/src/transform/Iotr_Offset.C +++ b/packages/seacas/libraries/ioss/src/transform/Iotr_Offset.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include diff --git a/packages/seacas/libraries/ioss/src/transform/Iotr_Offset.h b/packages/seacas/libraries/ioss/src/transform/Iotr_Offset.h index f82143de23ea..d69ec1faf86e 100644 --- a/packages/seacas/libraries/ioss/src/transform/Iotr_Offset.h +++ b/packages/seacas/libraries/ioss/src/transform/Iotr_Offset.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Iotr_Offset_h diff --git a/packages/seacas/libraries/ioss/src/transform/Iotr_Offset3D.C b/packages/seacas/libraries/ioss/src/transform/Iotr_Offset3D.C index d92bec8eb9f4..a3e85da1089d 100644 --- a/packages/seacas/libraries/ioss/src/transform/Iotr_Offset3D.C +++ b/packages/seacas/libraries/ioss/src/transform/Iotr_Offset3D.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include diff --git a/packages/seacas/libraries/ioss/src/transform/Iotr_Offset3D.h b/packages/seacas/libraries/ioss/src/transform/Iotr_Offset3D.h index e301c3b17892..b49294fc5c81 100644 --- a/packages/seacas/libraries/ioss/src/transform/Iotr_Offset3D.h +++ b/packages/seacas/libraries/ioss/src/transform/Iotr_Offset3D.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Iotr_Offset3D_h diff --git a/packages/seacas/libraries/ioss/src/transform/Iotr_Scale.C b/packages/seacas/libraries/ioss/src/transform/Iotr_Scale.C index 1afcb2215d49..3246b82c29a4 100644 --- a/packages/seacas/libraries/ioss/src/transform/Iotr_Scale.C +++ b/packages/seacas/libraries/ioss/src/transform/Iotr_Scale.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include diff --git a/packages/seacas/libraries/ioss/src/transform/Iotr_Scale.h b/packages/seacas/libraries/ioss/src/transform/Iotr_Scale.h index d84d0fb37736..0690d7493bed 100644 --- a/packages/seacas/libraries/ioss/src/transform/Iotr_Scale.h +++ b/packages/seacas/libraries/ioss/src/transform/Iotr_Scale.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Iotr_Scale_h diff --git a/packages/seacas/libraries/ioss/src/transform/Iotr_Scale3D.C b/packages/seacas/libraries/ioss/src/transform/Iotr_Scale3D.C index 69b4348a255e..f4cf4253d162 100644 --- a/packages/seacas/libraries/ioss/src/transform/Iotr_Scale3D.C +++ b/packages/seacas/libraries/ioss/src/transform/Iotr_Scale3D.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include diff --git a/packages/seacas/libraries/ioss/src/transform/Iotr_Scale3D.h b/packages/seacas/libraries/ioss/src/transform/Iotr_Scale3D.h index de24daa4ca35..6356ea94a759 100644 --- a/packages/seacas/libraries/ioss/src/transform/Iotr_Scale3D.h +++ b/packages/seacas/libraries/ioss/src/transform/Iotr_Scale3D.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Iotr_Scale3D_h diff --git a/packages/seacas/libraries/ioss/src/transform/Iotr_Tensor.C b/packages/seacas/libraries/ioss/src/transform/Iotr_Tensor.C index 2c47366b1aac..214b080c86fe 100644 --- a/packages/seacas/libraries/ioss/src/transform/Iotr_Tensor.C +++ b/packages/seacas/libraries/ioss/src/transform/Iotr_Tensor.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include diff --git a/packages/seacas/libraries/ioss/src/transform/Iotr_Tensor.h b/packages/seacas/libraries/ioss/src/transform/Iotr_Tensor.h index 740f3d98d04a..5010e50ee52d 100644 --- a/packages/seacas/libraries/ioss/src/transform/Iotr_Tensor.h +++ b/packages/seacas/libraries/ioss/src/transform/Iotr_Tensor.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Iotr_Tensor_h diff --git a/packages/seacas/libraries/ioss/src/transform/Iotr_VectorMagnitude.C b/packages/seacas/libraries/ioss/src/transform/Iotr_VectorMagnitude.C index ef2bed601ae7..7c7586834fa3 100644 --- a/packages/seacas/libraries/ioss/src/transform/Iotr_VectorMagnitude.C +++ b/packages/seacas/libraries/ioss/src/transform/Iotr_VectorMagnitude.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include diff --git a/packages/seacas/libraries/ioss/src/transform/Iotr_VectorMagnitude.h b/packages/seacas/libraries/ioss/src/transform/Iotr_VectorMagnitude.h index 169cce366591..d1ca2fdfebec 100644 --- a/packages/seacas/libraries/ioss/src/transform/Iotr_VectorMagnitude.h +++ b/packages/seacas/libraries/ioss/src/transform/Iotr_VectorMagnitude.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #ifndef IOSS_Iotr_VectorMagnitude_h diff --git a/packages/seacas/libraries/ioss/src/unit_tests/UnitTestIofxDatabaseIO.C b/packages/seacas/libraries/ioss/src/unit_tests/UnitTestIofxDatabaseIO.C index 29a222c9d8c7..60acaab7c0cb 100644 --- a/packages/seacas/libraries/ioss/src/unit_tests/UnitTestIofxDatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/unit_tests/UnitTestIofxDatabaseIO.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include diff --git a/packages/seacas/libraries/ioss/src/unit_tests/unitMain.C b/packages/seacas/libraries/ioss/src/unit_tests/unitMain.C index ca8ce1fb7c63..fecf003ad2a3 100644 --- a/packages/seacas/libraries/ioss/src/unit_tests/unitMain.C +++ b/packages/seacas/libraries/ioss/src/unit_tests/unitMain.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include diff --git a/packages/seacas/libraries/ioss/src/utest/Utst_blob_write_read.C b/packages/seacas/libraries/ioss/src/utest/Utst_blob_write_read.C index 532d3fbda12b..5090c9df3450 100644 --- a/packages/seacas/libraries/ioss/src/utest/Utst_blob_write_read.C +++ b/packages/seacas/libraries/ioss/src/utest/Utst_blob_write_read.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include @@ -106,7 +106,7 @@ void write_blob() Ioss::Blob *blob1 = new Ioss::Blob(dbo, "Tempus", count_offset.first); region.add(blob1); - // NOTE: These properties are not neede for serial case, but don't cause problems + // NOTE: These properties are not needed for serial case, but don't cause problems blob1->property_add(Ioss::Property("processor_offset", (int64_t)count_offset.second)); blob1->property_add(Ioss::Property("global_size", (int64_t)b1_size)); diff --git a/packages/seacas/libraries/ioss/src/utest/Utst_ioel.C b/packages/seacas/libraries/ioss/src/utest/Utst_ioel.C index 9190b9a8a06a..d647e493e7ac 100644 --- a/packages/seacas/libraries/ioss/src/utest/Utst_ioel.C +++ b/packages/seacas/libraries/ioss/src/utest/Utst_ioel.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include diff --git a/packages/seacas/libraries/ioss/src/utest/Utst_map.C b/packages/seacas/libraries/ioss/src/utest/Utst_map.C index 8ee7c237700b..04ad921d7704 100644 --- a/packages/seacas/libraries/ioss/src/utest/Utst_map.C +++ b/packages/seacas/libraries/ioss/src/utest/Utst_map.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #define CATCH_CONFIG_MAIN diff --git a/packages/seacas/libraries/ioss/src/utest/Utst_sort.C b/packages/seacas/libraries/ioss/src/utest/Utst_sort.C index f75055838b87..eedc55904ffd 100644 --- a/packages/seacas/libraries/ioss/src/utest/Utst_sort.C +++ b/packages/seacas/libraries/ioss/src/utest/Utst_sort.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include @@ -70,17 +70,21 @@ int main() break; } + auto xsave = x; Ioss::qsort(x); // Copy of x assert(verify_sorted(x)); + x = xsave; std::reverse(x.begin(), x.end()); // Reversed Ioss::qsort(x); assert(verify_sorted(x)); + x = xsave; std::reverse(&x[0], &x[n / 2]); // Front half reversed Ioss::qsort(x); assert(verify_sorted(x)); + x = xsave; std::reverse(&x[n / 2], &x[n]); // Back half reversed Ioss::qsort(x); assert(verify_sorted(x)); @@ -88,6 +92,7 @@ int main() Ioss::qsort(x); // Already sorted assert(verify_sorted(x)); + x = xsave; for (size_t p = 0; p < n; p++) { x[p] += p % 5; } diff --git a/packages/seacas/libraries/ioss/src/utest/Utst_structured_decomp.C b/packages/seacas/libraries/ioss/src/utest/Utst_structured_decomp.C index 5da0fb41b952..f03ee8c971c2 100644 --- a/packages/seacas/libraries/ioss/src/utest/Utst_structured_decomp.C +++ b/packages/seacas/libraries/ioss/src/utest/Utst_structured_decomp.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #define CATCH_CONFIG_MAIN @@ -1051,3 +1051,20 @@ TEST_CASE("LotsOfZones", "[LotsOfZones]") } cleanup(zones); } + +TEST_CASE("half_sphere", "[half_sphere]") +{ + int zone = 1; + std::vector zones; + zones.push_back(new Iocgns::StructuredZoneData(zone++, "80x50x24")); + zones.push_back(new Iocgns::StructuredZoneData(zone++, "80x50x24")); + zones.push_back(new Iocgns::StructuredZoneData(zone++, "80x50x24")); + zones.push_back(new Iocgns::StructuredZoneData(zone++, "80x50x50")); + zones.push_back(new Iocgns::StructuredZoneData(zone++, "24x80x50")); + + double load_balance_tolerance = 1.4; + + std::string name = "half_sphere_8"; + SECTION(name) { check_split_assign(zones, load_balance_tolerance, 8, 0.9, 1.1); } + cleanup(zones); +} diff --git a/packages/seacas/libraries/ioss/src/utest/Utst_structured_decomp.h b/packages/seacas/libraries/ioss/src/utest/Utst_structured_decomp.h index 782e33537c07..7358df996f8d 100644 --- a/packages/seacas/libraries/ioss/src/utest/Utst_structured_decomp.h +++ b/packages/seacas/libraries/ioss/src/utest/Utst_structured_decomp.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #include diff --git a/packages/seacas/libraries/ioss/src/utest/Utst_structured_decomp_herron.C b/packages/seacas/libraries/ioss/src/utest/Utst_structured_decomp_herron.C index 5ead026f715d..5e0fdabf8679 100644 --- a/packages/seacas/libraries/ioss/src/utest/Utst_structured_decomp_herron.C +++ b/packages/seacas/libraries/ioss/src/utest/Utst_structured_decomp_herron.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "Utst_structured_decomp.h" diff --git a/packages/seacas/libraries/ioss/src/utest/Utst_structured_decomp_rocket.C b/packages/seacas/libraries/ioss/src/utest/Utst_structured_decomp_rocket.C index a842145e6e07..a346e374039a 100644 --- a/packages/seacas/libraries/ioss/src/utest/Utst_structured_decomp_rocket.C +++ b/packages/seacas/libraries/ioss/src/utest/Utst_structured_decomp_rocket.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "Utst_structured_decomp.h" diff --git a/packages/seacas/libraries/ioss/src/utest/Utst_superelement.C b/packages/seacas/libraries/ioss/src/utest/Utst_superelement.C index 70b814fc6fc2..a9aaf9e6d3ac 100644 --- a/packages/seacas/libraries/ioss/src/utest/Utst_superelement.C +++ b/packages/seacas/libraries/ioss/src/utest/Utst_superelement.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include diff --git a/packages/seacas/libraries/ioss/src/utest/Utst_utils.C b/packages/seacas/libraries/ioss/src/utest/Utst_utils.C index c8c4f8864d2c..68bd52ab4431 100644 --- a/packages/seacas/libraries/ioss/src/utest/Utst_utils.C +++ b/packages/seacas/libraries/ioss/src/utest/Utst_utils.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #define CATCH_CONFIG_MAIN diff --git a/packages/seacas/libraries/ioss/src/utest/blob_write_read_example.gold.txt b/packages/seacas/libraries/ioss/src/utest/blob_write_read_example.gold.txt index 598bf5246e4d..58cb493dbc3d 100644 --- a/packages/seacas/libraries/ioss/src/utest/blob_write_read_example.gold.txt +++ b/packages/seacas/libraries/ioss/src/utest/blob_write_read_example.gold.txt @@ -3,31 +3,31 @@ ***** Reading Blob Example File... Blob Tempus contains: 100 item(s). - Attributes (Reduction): - Offset: 1.0 2.0 0.0 Scale: 10.5 11.5 17.5 + Attributes (Reduction): + Offset: 1.0 2.0 0.0 Scale: 10.5 11.5 17.5 - Transient: - x:1 xddot:1 xdot:1 + Transient: + x:1 xddot:1 xdot:1 - Transient (Reduction): kinetic_energy:1 momentum:3 + Transient (Reduction): kinetic_energy:1 momentum:3 Blob Solver contains: 200 item(s). - Attributes (Reduction): + Attributes (Reduction): *** No attributes *** - Transient: - x:1 xdot:1 + Transient: + x:1 xdot:1 - Transient (Reduction): kinetic_energy:1 momentum:3 + Transient (Reduction): kinetic_energy:1 momentum:3 Blob ABlob contains: 57 item(s). - Attributes (Reduction): + Attributes (Reduction): *** No attributes *** - Transient: - x:1 + Transient: + x:1 - Transient (Reduction): kinetic_energy:1 momentum:3 + Transient (Reduction): kinetic_energy:1 momentum:3 File contains 10 timesteps. @@ -36,167 +36,167 @@ File contains 10 timesteps. Field x, Minimum Value = 0, Maximum Value = 990 Field xddot, Minimum Value = 1, Maximum Value = 991 Field xdot, Minimum Value = 2, Maximum Value = 992 - Reduction Field kinetic_energy, Value = 4 - Reduction Field momentum, Value = 3 13 23 + Reduction Field kinetic_energy, Value = 4 + Reduction Field momentum, Value = 3 13 23 Blob Solver: Field x, Minimum Value = 5, Maximum Value = 1995 Field xdot, Minimum Value = 6, Maximum Value = 1996 - Reduction Field kinetic_energy, Value = 8 - Reduction Field momentum, Value = 7 17 27 + Reduction Field kinetic_energy, Value = 8 + Reduction Field momentum, Value = 7 17 27 Blob ABlob: Field x, Minimum Value = 9, Maximum Value = 569 - Reduction Field kinetic_energy, Value = 11 - Reduction Field momentum, Value = 10 20 30 + Reduction Field kinetic_energy, Value = 11 + Reduction Field momentum, Value = 10 20 30 *** Step 2 is at time 0.1 Blob Tempus: Field x, Minimum Value = 10, Maximum Value = 1000 Field xddot, Minimum Value = 11, Maximum Value = 1001 Field xdot, Minimum Value = 12, Maximum Value = 1002 - Reduction Field kinetic_energy, Value = 14 - Reduction Field momentum, Value = 13 23 33 + Reduction Field kinetic_energy, Value = 14 + Reduction Field momentum, Value = 13 23 33 Blob Solver: Field x, Minimum Value = 15, Maximum Value = 2005 Field xdot, Minimum Value = 16, Maximum Value = 2006 - Reduction Field kinetic_energy, Value = 18 - Reduction Field momentum, Value = 17 27 37 + Reduction Field kinetic_energy, Value = 18 + Reduction Field momentum, Value = 17 27 37 Blob ABlob: Field x, Minimum Value = 19, Maximum Value = 579 - Reduction Field kinetic_energy, Value = 21 - Reduction Field momentum, Value = 20 30 40 + Reduction Field kinetic_energy, Value = 21 + Reduction Field momentum, Value = 20 30 40 *** Step 3 is at time 0.2 Blob Tempus: Field x, Minimum Value = 20, Maximum Value = 1010 Field xddot, Minimum Value = 21, Maximum Value = 1011 Field xdot, Minimum Value = 22, Maximum Value = 1012 - Reduction Field kinetic_energy, Value = 24 - Reduction Field momentum, Value = 23 33 43 + Reduction Field kinetic_energy, Value = 24 + Reduction Field momentum, Value = 23 33 43 Blob Solver: Field x, Minimum Value = 25, Maximum Value = 2015 Field xdot, Minimum Value = 26, Maximum Value = 2016 - Reduction Field kinetic_energy, Value = 28 - Reduction Field momentum, Value = 27 37 47 + Reduction Field kinetic_energy, Value = 28 + Reduction Field momentum, Value = 27 37 47 Blob ABlob: Field x, Minimum Value = 29, Maximum Value = 589 - Reduction Field kinetic_energy, Value = 31 - Reduction Field momentum, Value = 30 40 50 + Reduction Field kinetic_energy, Value = 31 + Reduction Field momentum, Value = 30 40 50 *** Step 4 is at time 0.3 Blob Tempus: Field x, Minimum Value = 30, Maximum Value = 1020 Field xddot, Minimum Value = 31, Maximum Value = 1021 Field xdot, Minimum Value = 32, Maximum Value = 1022 - Reduction Field kinetic_energy, Value = 34 - Reduction Field momentum, Value = 33 43 53 + Reduction Field kinetic_energy, Value = 34 + Reduction Field momentum, Value = 33 43 53 Blob Solver: Field x, Minimum Value = 35, Maximum Value = 2025 Field xdot, Minimum Value = 36, Maximum Value = 2026 - Reduction Field kinetic_energy, Value = 38 - Reduction Field momentum, Value = 37 47 57 + Reduction Field kinetic_energy, Value = 38 + Reduction Field momentum, Value = 37 47 57 Blob ABlob: Field x, Minimum Value = 39, Maximum Value = 599 - Reduction Field kinetic_energy, Value = 41 - Reduction Field momentum, Value = 40 50 60 + Reduction Field kinetic_energy, Value = 41 + Reduction Field momentum, Value = 40 50 60 *** Step 5 is at time 0.4 Blob Tempus: Field x, Minimum Value = 40, Maximum Value = 1030 Field xddot, Minimum Value = 41, Maximum Value = 1031 Field xdot, Minimum Value = 42, Maximum Value = 1032 - Reduction Field kinetic_energy, Value = 44 - Reduction Field momentum, Value = 43 53 63 + Reduction Field kinetic_energy, Value = 44 + Reduction Field momentum, Value = 43 53 63 Blob Solver: Field x, Minimum Value = 45, Maximum Value = 2035 Field xdot, Minimum Value = 46, Maximum Value = 2036 - Reduction Field kinetic_energy, Value = 48 - Reduction Field momentum, Value = 47 57 67 + Reduction Field kinetic_energy, Value = 48 + Reduction Field momentum, Value = 47 57 67 Blob ABlob: Field x, Minimum Value = 49, Maximum Value = 609 - Reduction Field kinetic_energy, Value = 51 - Reduction Field momentum, Value = 50 60 70 + Reduction Field kinetic_energy, Value = 51 + Reduction Field momentum, Value = 50 60 70 *** Step 6 is at time 0.5 Blob Tempus: Field x, Minimum Value = 50, Maximum Value = 1040 Field xddot, Minimum Value = 51, Maximum Value = 1041 Field xdot, Minimum Value = 52, Maximum Value = 1042 - Reduction Field kinetic_energy, Value = 54 - Reduction Field momentum, Value = 53 63 73 + Reduction Field kinetic_energy, Value = 54 + Reduction Field momentum, Value = 53 63 73 Blob Solver: Field x, Minimum Value = 55, Maximum Value = 2045 Field xdot, Minimum Value = 56, Maximum Value = 2046 - Reduction Field kinetic_energy, Value = 58 - Reduction Field momentum, Value = 57 67 77 + Reduction Field kinetic_energy, Value = 58 + Reduction Field momentum, Value = 57 67 77 Blob ABlob: Field x, Minimum Value = 59, Maximum Value = 619 - Reduction Field kinetic_energy, Value = 61 - Reduction Field momentum, Value = 60 70 80 + Reduction Field kinetic_energy, Value = 61 + Reduction Field momentum, Value = 60 70 80 *** Step 7 is at time 0.6 Blob Tempus: Field x, Minimum Value = 60, Maximum Value = 1050 Field xddot, Minimum Value = 61, Maximum Value = 1051 Field xdot, Minimum Value = 62, Maximum Value = 1052 - Reduction Field kinetic_energy, Value = 64 - Reduction Field momentum, Value = 63 73 83 + Reduction Field kinetic_energy, Value = 64 + Reduction Field momentum, Value = 63 73 83 Blob Solver: Field x, Minimum Value = 65, Maximum Value = 2055 Field xdot, Minimum Value = 66, Maximum Value = 2056 - Reduction Field kinetic_energy, Value = 68 - Reduction Field momentum, Value = 67 77 87 + Reduction Field kinetic_energy, Value = 68 + Reduction Field momentum, Value = 67 77 87 Blob ABlob: Field x, Minimum Value = 69, Maximum Value = 629 - Reduction Field kinetic_energy, Value = 71 - Reduction Field momentum, Value = 70 80 90 + Reduction Field kinetic_energy, Value = 71 + Reduction Field momentum, Value = 70 80 90 *** Step 8 is at time 0.7 Blob Tempus: Field x, Minimum Value = 70, Maximum Value = 1060 Field xddot, Minimum Value = 71, Maximum Value = 1061 Field xdot, Minimum Value = 72, Maximum Value = 1062 - Reduction Field kinetic_energy, Value = 74 - Reduction Field momentum, Value = 73 83 93 + Reduction Field kinetic_energy, Value = 74 + Reduction Field momentum, Value = 73 83 93 Blob Solver: Field x, Minimum Value = 75, Maximum Value = 2065 Field xdot, Minimum Value = 76, Maximum Value = 2066 - Reduction Field kinetic_energy, Value = 78 - Reduction Field momentum, Value = 77 87 97 + Reduction Field kinetic_energy, Value = 78 + Reduction Field momentum, Value = 77 87 97 Blob ABlob: Field x, Minimum Value = 79, Maximum Value = 639 - Reduction Field kinetic_energy, Value = 81 - Reduction Field momentum, Value = 80 90 100 + Reduction Field kinetic_energy, Value = 81 + Reduction Field momentum, Value = 80 90 100 *** Step 9 is at time 0.8 Blob Tempus: Field x, Minimum Value = 80, Maximum Value = 1070 Field xddot, Minimum Value = 81, Maximum Value = 1071 Field xdot, Minimum Value = 82, Maximum Value = 1072 - Reduction Field kinetic_energy, Value = 84 - Reduction Field momentum, Value = 83 93 103 + Reduction Field kinetic_energy, Value = 84 + Reduction Field momentum, Value = 83 93 103 Blob Solver: Field x, Minimum Value = 85, Maximum Value = 2075 Field xdot, Minimum Value = 86, Maximum Value = 2076 - Reduction Field kinetic_energy, Value = 88 - Reduction Field momentum, Value = 87 97 107 + Reduction Field kinetic_energy, Value = 88 + Reduction Field momentum, Value = 87 97 107 Blob ABlob: Field x, Minimum Value = 89, Maximum Value = 649 - Reduction Field kinetic_energy, Value = 91 - Reduction Field momentum, Value = 90 100 110 + Reduction Field kinetic_energy, Value = 91 + Reduction Field momentum, Value = 90 100 110 *** Step 10 is at time 0.9 Blob Tempus: Field x, Minimum Value = 90, Maximum Value = 1080 Field xddot, Minimum Value = 91, Maximum Value = 1081 Field xdot, Minimum Value = 92, Maximum Value = 1082 - Reduction Field kinetic_energy, Value = 94 - Reduction Field momentum, Value = 93 103 113 + Reduction Field kinetic_energy, Value = 94 + Reduction Field momentum, Value = 93 103 113 Blob Solver: Field x, Minimum Value = 95, Maximum Value = 2085 Field xdot, Minimum Value = 96, Maximum Value = 2086 - Reduction Field kinetic_energy, Value = 98 - Reduction Field momentum, Value = 97 107 117 + Reduction Field kinetic_energy, Value = 98 + Reduction Field momentum, Value = 97 107 117 Blob ABlob: Field x, Minimum Value = 99, Maximum Value = 659 - Reduction Field kinetic_energy, Value = 101 - Reduction Field momentum, Value = 100 110 120 + Reduction Field kinetic_energy, Value = 101 + Reduction Field momentum, Value = 100 110 120 diff --git a/packages/seacas/libraries/ioss/src/visualization/Iovs_DatabaseIO.C b/packages/seacas/libraries/ioss/src/visualization/Iovs_DatabaseIO.C index 84e62391875e..2a9b18b976bd 100644 --- a/packages/seacas/libraries/ioss/src/visualization/Iovs_DatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/visualization/Iovs_DatabaseIO.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details /*--------------------------------------------------------------------*/ @@ -84,9 +84,8 @@ namespace Iovs { const Ioss::PropertyManager &props) : Ioss::DatabaseIO(region, DatabaseIO::create_output_file_path(filename, props), db_usage, communicator, props), - isInput(false), singleProcOnly(false), doLogging(false), enableLogging(0), debugLevel(0), - underscoreVectors(0), applyDisplacements(0), createSideSets(0), createNodeSets(0), - nodeBlockCount(0), elementBlockCount(0) + enableLogging(0), debugLevel(0), underscoreVectors(0), applyDisplacements(0), + createSideSets(0), createNodeSets(0), nodeBlockCount(0), elementBlockCount(0) { std::ostringstream errmsg; @@ -1302,7 +1301,11 @@ namespace { return; } - char * cbuf = realpath(sierra_ins_dir.c_str(), nullptr); +#ifdef _WIN32 + char *cbuf = _fullpath(nullptr, sierra_ins_dir.c_str(), _MAX_PATH); +#else + char *cbuf = realpath(sierra_ins_dir.c_str(), nullptr); +#endif std::string sierra_ins_path = cbuf; free(cbuf); diff --git a/packages/seacas/libraries/ioss/src/visualization/Iovs_DatabaseIO.h b/packages/seacas/libraries/ioss/src/visualization/Iovs_DatabaseIO.h index b37e4f4e9218..4bdacc833e1e 100644 --- a/packages/seacas/libraries/ioss/src/visualization/Iovs_DatabaseIO.h +++ b/packages/seacas/libraries/ioss/src/visualization/Iovs_DatabaseIO.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /*--------------------------------------------------------------------*/ @@ -232,10 +232,6 @@ namespace Iovs { DatabaseIO(const DatabaseIO &); // Do not implement DatabaseIO &operator=(const DatabaseIO &); // Do not implement - bool isInput; - bool singleProcOnly; // True if history or heartbeat which is only written from proc 0... - bool doLogging; // True if logging field input/output - std::string databaseTitle{}; static std::string paraview_script_filename; std::string catalyst_block_file_name{}; diff --git a/packages/seacas/libraries/ioss/src/visualization/Iovs_IOFactory.C b/packages/seacas/libraries/ioss/src/visualization/Iovs_IOFactory.C index b43238b75c4d..b5b0ffd0f6db 100644 --- a/packages/seacas/libraries/ioss/src/visualization/Iovs_IOFactory.C +++ b/packages/seacas/libraries/ioss/src/visualization/Iovs_IOFactory.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details /*--------------------------------------------------------------------*/ diff --git a/packages/seacas/libraries/ioss/src/visualization/Iovs_IOFactory.h b/packages/seacas/libraries/ioss/src/visualization/Iovs_IOFactory.h index 7d4c4e0ed571..f16a4100a713 100644 --- a/packages/seacas/libraries/ioss/src/visualization/Iovs_IOFactory.h +++ b/packages/seacas/libraries/ioss/src/visualization/Iovs_IOFactory.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /*--------------------------------------------------------------------*/ diff --git a/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/CMakeLists.txt b/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/CMakeLists.txt index 5c3f5c95572e..c7dc1922186a 100644 --- a/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/CMakeLists.txt +++ b/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/CMakeLists.txt @@ -1,8 +1,8 @@ -C Copyright(C) 1999-2020 National Technology & Engineering Solutions -C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with -C NTESS, the U.S. Government retains certain rights in this software. -C -C See packages/seacas/LICENSE for details +# Copyright(C) 1999-2020 National Technology & Engineering Solutions +# of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with +# NTESS, the U.S. Government retains certain rights in this software. +# +# See packages/seacas/LICENSE for details cmake_minimum_required (VERSION 2.8.1) project(ParaViewCatalystIossAdapter) diff --git a/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/ParaViewCatalystIossAdapter.cxx b/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/ParaViewCatalystIossAdapter.cxx index 3c772d3cf0c2..d4fa3895cec2 100644 --- a/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/ParaViewCatalystIossAdapter.cxx +++ b/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/ParaViewCatalystIossAdapter.cxx @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "include/ParaViewCatalystIossAdapter.h" diff --git a/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/include/CatalystParserInterface.h b/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/include/CatalystParserInterface.h index 3d8c37c14e61..35cdafc23535 100644 --- a/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/include/CatalystParserInterface.h +++ b/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/include/CatalystParserInterface.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/include/ParaViewCatalystIossAdapter.h b/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/include/ParaViewCatalystIossAdapter.h index 8f0b83d992a2..1cf9acd60a57 100644 --- a/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/include/ParaViewCatalystIossAdapter.h +++ b/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/include/ParaViewCatalystIossAdapter.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #ifndef __PARAVIEW_CATALYST_IOSS_ADAPTER_H @@ -22,39 +22,39 @@ class ParaViewCatalystIossAdapterBase ParaViewCatalystIossAdapterBase(){}; virtual ~ParaViewCatalystIossAdapterBase(){}; virtual std::string getName() const { return "ParaViewCatalystIossAdapterBase"; } - virtual void DeletePipeline(const char *results_output_filename) = 0; - virtual void CleanupCatalyst() = 0; - virtual void CreateNewPipeline( - const char *catalyst_python_filename, const char *catalyst_sierra_block_json, - const char *catalyst_sierra_separator_character, const char *catalyst_sierra_input_deck_name, - int UnderscoreVectors, int ApplyDisplacements, const char *restart_tag, int enable_logging, - int debug_level, const char *results_output_filename, const char *catalyst_output_directory, - std::vector &catalyst_sierra_data) = 0; + virtual void DeletePipeline(const char *results_output_filename) = 0; + virtual void CleanupCatalyst() = 0; + virtual void CreateNewPipeline( + const char *catalyst_python_filename, const char *catalyst_sierra_block_json, + const char *catalyst_sierra_separator_character, const char *catalyst_sierra_input_deck_name, + int UnderscoreVectors, int ApplyDisplacements, const char *restart_tag, int enable_logging, + int debug_level, const char *results_output_filename, const char *catalyst_output_directory, + std::vector &catalyst_sierra_data) = 0; virtual void PerformCoProcessing(const char * results_output_filename, std::vector & error_and_warning_codes, - std::vector &error_and_warning_messages) = 0; + std::vector &error_and_warning_messages) = 0; virtual void SetTimeData(double currentTime, int timeStep, - const char *results_output_filename) = 0; + const char *results_output_filename) = 0; virtual void CreateGlobalVariable(std::vector &component_names, const double *data, - const char *results_output_filename) = 0; + const char *results_output_filename) = 0; virtual void CreateGlobalVariable(std::vector &component_names, const int *data, - const char *results_output_filename) = 0; + const char *results_output_filename) = 0; virtual void InitializeGlobalPoints(int num_points, int dimension, const double *data, - const char *results_output_filename) = 0; + const char *results_output_filename) = 0; virtual void InitializeElementBlocks(const std::vector &element_block_id_list, - const char * results_output_filename) = 0; + const char * results_output_filename) = 0; virtual void CreateElementBlock(const char *elem_block_name, int elem_block_id, const std::string &elem_type, int nodes_per_elem, int num_elem, const int64_t *global_elem_ids, int *connectivity, - const char *results_output_filename) = 0; + const char *results_output_filename) = 0; virtual void CreateElementBlock(const char *elem_block_name, int elem_block_id, const std::string &elem_type, int nodes_per_elem, int num_elem, const int64_t *global_elem_ids, int64_t *connectivity, - const char *results_output_filename) = 0; + const char *results_output_filename) = 0; virtual void CreateNodeSet(const char *node_set_name, int node_set_id, int num_ids, - const int *data, const char *results_output_filename) = 0; + const int *data, const char *results_output_filename) = 0; virtual void CreateNodeSet(const char *node_set_name, int node_set_id, int num_ids, - const int64_t *data, const char *results_output_filename) = 0; + const int64_t *data, const char *results_output_filename) = 0; virtual void CreateSideSet(/*const char* side_set_name,*/ const char *ss_owner_name, int side_set_id, int num_ids, const int *element_ids, const int *face_ids, @@ -64,21 +64,21 @@ class ParaViewCatalystIossAdapterBase const int64_t *element_ids, const int64_t *face_ids, const char *results_output_filename) = 0; virtual void CreateElementVariable(std::vector &component_names, int elem_block_id, - const double *data, const char *results_output_filename) = 0; + const double *data, const char *results_output_filename) = 0; virtual void CreateElementVariable(std::vector &component_names, int elem_block_id, - const int *data, const char *results_output_filename) = 0; + const int *data, const char *results_output_filename) = 0; virtual void CreateElementVariable(std::vector &component_names, int elem_block_id, const int64_t *data, const char *results_output_filename) = 0; virtual void CreateNodalVariable(std::vector &component_names, const double *data, - const char *results_output_filename) = 0; + const char *results_output_filename) = 0; virtual void CreateNodalVariable(std::vector &component_names, const int *data, - const char *results_output_filename) = 0; + const char *results_output_filename) = 0; virtual void CreateNodalVariable(std::vector &component_names, const int64_t *data, - const char *results_output_filename) = 0; - virtual void ReleaseMemory(const char *results_output_filename) = 0; - virtual void logMemoryUsageAndTakeTimerReading(const char *results_output_filename) = 0; - virtual int parseFile(const std::string & filepath, - CatalystParserInterface::parse_info &pinfo) = 0; + const char *results_output_filename) = 0; + virtual void ReleaseMemory(const char *results_output_filename) = 0; + virtual void logMemoryUsageAndTakeTimerReading(const char *results_output_filename) = 0; + virtual int parseFile(const std::string & filepath, + CatalystParserInterface::parse_info &pinfo) = 0; virtual int parseString(const std::string &s, CatalystParserInterface::parse_info &pinfo) = 0; }; diff --git a/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/parser/CMakeLists.txt b/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/parser/CMakeLists.txt index 2b66456d6f79..5063ad6283c9 100644 --- a/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/parser/CMakeLists.txt +++ b/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/parser/CMakeLists.txt @@ -1,7 +1,7 @@ # Copyright(C) 1999-2020 National Technology & Engineering Solutions # of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with # NTESS, the U.S. Government retains certain rights in this software. -# +# # See packages/seacas/LICENSE for details PROJECT(catalyst_parser) diff --git a/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/parser/CatalystParserInterface.cpp b/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/parser/CatalystParserInterface.cpp index d09a57aa4ee6..fc0c95b2fe68 100644 --- a/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/parser/CatalystParserInterface.cpp +++ b/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/parser/CatalystParserInterface.cpp @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "CatalystParserInterface.h" diff --git a/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/parser/catalystParser.l b/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/parser/catalystParser.l index af8500311e08..2fcc13ad43df 100644 --- a/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/parser/catalystParser.l +++ b/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/parser/catalystParser.l @@ -2,16 +2,16 @@ Copyright(C) 1999-2020 National Technology & Engineering Solutions of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with NTESS, the U.S. Government retains certain rights in this software. - + See packages/seacas/LICENSE for details - + Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - + * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - + * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided @@ -20,7 +20,7 @@ * Neither the name of NTESS nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. - + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR @@ -45,14 +45,14 @@ void track_location(YYLTYPE *loc, char *txt) loc->first_line = loc->last_line; loc->first_column = loc->last_column; int i; - for(i = 0; txt[i] != '\0'; i++) + for(i = 0; txt[i] != '\0'; i++) { - if(txt[i] == '\n') + if(txt[i] == '\n') { loc->last_line++; loc->last_column = 0; } - else + else { loc->last_column++; } diff --git a/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/parser/catalystParser.ypp b/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/parser/catalystParser.ypp index ea72846c80f1..f9079cad2462 100644 --- a/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/parser/catalystParser.ypp +++ b/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/parser/catalystParser.ypp @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. -* +* * See packages/seacas/LICENSE for details */ @@ -23,7 +23,7 @@ #include #include "CatalystParserInterface.h" -namespace +namespace { class parse_data { @@ -39,7 +39,7 @@ namespace this->eIDs = 0; this->sep = "_"; } - + ~parse_data() { this->root.clear(); @@ -164,46 +164,46 @@ bool has_cycle(parse_data& pd, bool check_cycles(YYLTYPE * llocp, yyscan_t yyscanner, parse_data& pd) { - for(Json::ValueIterator itr = pd.root["operation blocks"].begin() ; + for(Json::ValueIterator itr = pd.root["operation blocks"].begin() ; itr != pd.root["operation blocks"].end() ; itr++) { - if(has_cycle(pd, itr, "input") || + if(has_cycle(pd, itr, "input") || has_cycle(pd, itr, "operation group list")) { - std::string s = "Error: operation (" + itr.key().asString() + ") contains an operation cycle"; + std::string s = "Error: operation (" + itr.key().asString() + ") contains an operation cycle"; yyerror(llocp, yyscanner, &pd, s.c_str()); return false; } } - for(Json::ValueIterator itr = pd.root["imageset blocks"].begin() ; + for(Json::ValueIterator itr = pd.root["imageset blocks"].begin() ; itr != pd.root["imageset blocks"].end() ; itr++) { if(has_cycle(pd, itr, "operation")) { - std::string s = "Error: imageset (" + itr.key().asString() + ") contains an operation cycle"; + std::string s = "Error: imageset (" + itr.key().asString() + ") contains an operation cycle"; yyerror(llocp, yyscanner, &pd, s.c_str()); return false; } } - for(Json::ValueIterator itr = pd.root["scatter plot blocks"].begin() ; + for(Json::ValueIterator itr = pd.root["scatter plot blocks"].begin() ; itr != pd.root["scatter plot blocks"].end() ; itr++) { if(has_cycle(pd, itr, "operation")) { - std::string s = "Error: scatter plot (" + itr.key().asString() + ") contains an operation cycle"; + std::string s = "Error: scatter plot (" + itr.key().asString() + ") contains an operation cycle"; yyerror(llocp, yyscanner, &pd, s.c_str()); return false; } } - for(Json::ValueIterator itr = pd.root["plot over time blocks"].begin() ; + for(Json::ValueIterator itr = pd.root["plot over time blocks"].begin() ; itr != pd.root["plot over time blocks"].end() ; itr++) { if(has_cycle(pd, itr, "operation")) { - std::string s = "Error: plot over time (" + itr.key().asString() + ") contains an operation cycle"; + std::string s = "Error: plot over time (" + itr.key().asString() + ") contains an operation cycle"; yyerror(llocp, yyscanner, &pd, s.c_str()); return false; } @@ -220,7 +220,7 @@ bool check_names(YYLTYPE * llocp, yyscan_t yyscanner, parse_data& pd) /* CHECK IMAGESETS */ - for(Json::ValueIterator itr = pd.root["imageset blocks"].begin() ; + for(Json::ValueIterator itr = pd.root["imageset blocks"].begin() ; itr != pd.root["imageset blocks"].end() ; itr++) { if((*itr).isMember("camera")) @@ -228,7 +228,7 @@ bool check_names(YYLTYPE * llocp, yyscan_t yyscanner, parse_data& pd) std::string n = (*itr)["camera"].asString(); if(!pd.root["camera blocks"].isMember(n)) { - std::string s = "Error: imageset (" + itr.key().asString() + ") references camera (" + std::string s = "Error: imageset (" + itr.key().asString() + ") references camera (" + n + ") which does not exist"; yyerror(llocp, yyscanner, &pd, s.c_str()); return false; @@ -240,7 +240,7 @@ bool check_names(YYLTYPE * llocp, yyscan_t yyscanner, parse_data& pd) std::string n = (*itr)["representation"].asString(); if(!pd.root["representation blocks"].isMember(n)) { - std::string s = "Error: imageset (" + itr.key().asString() + ") references representation (" + std::string s = "Error: imageset (" + itr.key().asString() + ") references representation (" + n + ") which does not exist"; yyerror(llocp, yyscanner, &pd, s.c_str()); return false; @@ -252,7 +252,7 @@ bool check_names(YYLTYPE * llocp, yyscan_t yyscanner, parse_data& pd) std::string n = (*itr)["operation"].asString(); if(!pd.root["operation blocks"].isMember(n)) { - std::string s = "Error: imageset (" + itr.key().asString() + ") references operation (" + std::string s = "Error: imageset (" + itr.key().asString() + ") references operation (" + n + ") which does not exist"; yyerror(llocp, yyscanner, &pd, s.c_str()); return false; @@ -262,7 +262,7 @@ bool check_names(YYLTYPE * llocp, yyscan_t yyscanner, parse_data& pd) /* CHECK OPERATIONS */ - for(Json::ValueIterator itr = pd.root["operation blocks"].begin() ; + for(Json::ValueIterator itr = pd.root["operation blocks"].begin() ; itr != pd.root["operation blocks"].end() ; itr++) { std::string n; @@ -276,7 +276,7 @@ bool check_names(YYLTYPE * llocp, yyscan_t yyscanner, parse_data& pd) else if((*itr).isMember("operation group list")) { Json::Value op_names = (*itr)["operation group list"]; - for( Json::ValueIterator nitr = op_names.begin() ; + for( Json::ValueIterator nitr = op_names.begin() ; nitr != op_names.end() ; nitr++ ) { n = (*nitr).asString(); @@ -289,7 +289,7 @@ bool check_names(YYLTYPE * llocp, yyscan_t yyscanner, parse_data& pd) } if(error) { - std::string s = "Error: operation (" + itr.key().asString() + ") references operation (" + std::string s = "Error: operation (" + itr.key().asString() + ") references operation (" + n + ") which does not exist"; yyerror(llocp, yyscanner, &pd, s.c_str()); return false; @@ -298,7 +298,7 @@ bool check_names(YYLTYPE * llocp, yyscan_t yyscanner, parse_data& pd) /* CHECK SCATTER PLOTS */ - for(Json::ValueIterator itr = pd.root["scatter plot blocks"].begin() ; + for(Json::ValueIterator itr = pd.root["scatter plot blocks"].begin() ; itr != pd.root["scatter plot blocks"].end() ; itr++) { if((*itr).isMember("operation")) @@ -306,7 +306,7 @@ bool check_names(YYLTYPE * llocp, yyscan_t yyscanner, parse_data& pd) std::string n = (*itr)["operation"].asString(); if(!pd.root["operation blocks"].isMember(n)) { - std::string s = "Error: scatter plot (" + itr.key().asString() + ") references operation (" + std::string s = "Error: scatter plot (" + itr.key().asString() + ") references operation (" + n + ") which does not exist"; yyerror(llocp, yyscanner, &pd, s.c_str()); return false; @@ -316,7 +316,7 @@ bool check_names(YYLTYPE * llocp, yyscan_t yyscanner, parse_data& pd) /* CHECK PLOT OVER TIME */ - for(Json::ValueIterator itr = pd.root["plot over time blocks"].begin() ; + for(Json::ValueIterator itr = pd.root["plot over time blocks"].begin() ; itr != pd.root["plot over time blocks"].end() ; itr++) { if((*itr).isMember("operation")) @@ -324,14 +324,14 @@ bool check_names(YYLTYPE * llocp, yyscan_t yyscanner, parse_data& pd) std::string n = (*itr)["operation"].asString(); if(!pd.root["operation blocks"].isMember(n)) { - std::string s = "Error: plot over time (" + itr.key().asString() + ") references operation (" + std::string s = "Error: plot over time (" + itr.key().asString() + ") references operation (" + n + ") which does not exist"; yyerror(llocp, yyscanner, &pd, s.c_str()); return false; } } } - + return true; } @@ -354,7 +354,7 @@ bool check_color_name(YYLTYPE * llocp, yyscan_t yyscanner, parse_data& pd, const bn == "cold_and_hot" || bn == "rainbow_desaturated" || bn == "rainbow_blended_white" || - bn == "rainbow_blended_grey") + bn == "rainbow_blended_grey") { return true; } @@ -362,10 +362,10 @@ bool check_color_name(YYLTYPE * llocp, yyscan_t yyscanner, parse_data& pd, const return false; } -bool check_plot_axes(YYLTYPE * llocp, - yyscan_t yyscanner, - parse_data& pd, - const Json::Value& c, +bool check_plot_axes(YYLTYPE * llocp, + yyscan_t yyscanner, + parse_data& pd, + const Json::Value& c, const std::string& axis) { if(c.isMember(axis + " axis range") && (c.isMember(axis + " axis use current data range") || @@ -393,7 +393,7 @@ bool check_plot_axes(YYLTYPE * llocp, if(c.isMember(axis + " axis minimum range") && c.isMember(axis + " axis maximum range") ) { - if(c[axis + " axis minimum range"][1] > + if(c[axis + " axis minimum range"][1] > c[axis + " axis maximum range"][0] ) { yyerror(llocp, yyscanner, &pd, ("Error: plot block contains invalid minimum and maximum " + axis + " axis ranges").c_str()); @@ -465,7 +465,7 @@ bool check_calculator_block(YYLTYPE * llocp, return false; } } - + return true; } @@ -517,22 +517,22 @@ bool check_scatter_plot_block(YYLTYPE * llocp, if(c.isMember("x axis variable tensor component")) x_axis_variable_count++; if(c.isMember("y axis variable tensor component")) y_axis_variable_count++; - if( all_variables_count && - (x_axis_variable_count || y_axis_variable_count) ) + if( all_variables_count && + (x_axis_variable_count || y_axis_variable_count) ) { std::string s = "Scatter Plot block contains the 'all variables' command with \n" "other ' axis variable ...' commands. Only one allowed."; yyerror(llocp, yyscanner, &pd, s.c_str()); return false; } - else if(x_axis_variable_count > 1) + else if(x_axis_variable_count > 1) { std::string s = "Scatter Plot block contains more than one 'x axis variable ...' \n" "command. Only one allowed."; yyerror(llocp, yyscanner, &pd, s.c_str()); return false; } - else if(y_axis_variable_count > 1) + else if(y_axis_variable_count > 1) { std::string s = "Scatter Plot block contains more than one 'y axis variable ...' \n" "command. Only one allowed."; @@ -540,8 +540,8 @@ bool check_scatter_plot_block(YYLTYPE * llocp, return false; } - if(all_variables_count == 0 && - y_axis_variable_count == 0) + if(all_variables_count == 0 && + y_axis_variable_count == 0) { yyerror(llocp, yyscanner, &pd, "Scatter Plot block contains no y data to plot."); return false; @@ -568,7 +568,7 @@ bool check_contour(YYLTYPE * llocp, yyerror(llocp, yyscanner, &pd, "Error: contour operation contains no 'contour value ...' commands, one required"); return false; } - + count = 0; if(c.isMember("variable scalar")) count++; if(c.isMember("variable vector magnitude")) count++; @@ -611,7 +611,7 @@ bool check_threshold(YYLTYPE * llocp, yyerror(llocp, yyscanner, &pd, "Error: threshold operation contains no 'keep ...' commands, one is required"); return false; } - + count = 0; if(c.isMember("variable scalar")) count++; if(c.isMember("variable vector magnitude")) count++; @@ -649,7 +649,7 @@ bool check_box_clip(YYLTYPE * llocp, yyerror(llocp, yyscanner, &pd, "Error: box clip operation contains multiple 'center at ...' commands, only one allowed"); return false; } - + count = 0; if(c.isMember("absolute extents")) count++; if(c.isMember("relative extents")) count++; @@ -690,7 +690,7 @@ bool check_camera(YYLTYPE * llocp, parse_data& pd, const Json::Value& c) { - if(c.isMember("look at relative distance") && + if(c.isMember("look at relative distance") && c.isMember("look at absolute distance")) { yyerror(llocp, yyscanner, &pd, "Error: camera block contains both 'look at relative distance' and 'look at absolute distance'"); @@ -709,7 +709,7 @@ bool check_camera(YYLTYPE * llocp, return false; } - if(!c.isMember("camera type") || + if(!c.isMember("camera type") || c["camera type"].asString() == "multicamera8") return true; @@ -733,9 +733,9 @@ bool check_camera(YYLTYPE * llocp, bool has_camera_distance = c.isMember("look at relative distance") || c.isMember("look at absolute distance"); - if(has_camera_position && - has_look_at_point && - has_look_direction) + if(has_camera_position && + has_look_at_point && + has_look_direction) { std::string s = "Block contains an invalid camera specification. \n" "Cameras may not have a 'camera at ...' command and \n" @@ -744,9 +744,9 @@ bool check_camera(YYLTYPE * llocp, return false; } - if(has_camera_position && - has_look_at_point && - has_camera_distance) + if(has_camera_position && + has_look_at_point && + has_camera_distance) { std::string s = "Block contains an invalid camera specification. \n" "Cameras may not have a 'camera at ...' command and \n" @@ -755,9 +755,9 @@ bool check_camera(YYLTYPE * llocp, return false; } - if(has_camera_position && - has_look_direction && - has_camera_distance) + if(has_camera_position && + has_look_direction && + has_camera_distance) { std::string s = "Block contains an invalid camera specification. \n" "Cameras may not have a 'camera at ...' command and \n" @@ -823,7 +823,7 @@ bool check_imageset(YYLTYPE * llocp, r.isMember("look at node") || r.isMember("look at absolute distance") || r.isMember("look at relative distance") || - r.isMember("up vector") || + r.isMember("up vector") || r.isMember("camera fov") )) { yyerror(llocp, yyscanner, &pd, "Error: imageset block contains both camera shortcuts and a camera block reference"); @@ -844,7 +844,7 @@ bool check_representation(YYLTYPE * llocp, if(r.isMember("color by vector component")) count++; if(r.isMember("color by tensor component")) count++; if(r.isMember("color by solid color")) count++; - if(r.isMember("color by blockid")) count++; + if(r.isMember("color by blockid")) count++; if(count > 1) { @@ -852,14 +852,14 @@ bool check_representation(YYLTYPE * llocp, return false; } - if(r["show bounding box"].asBool() && + if(r["show bounding box"].asBool() && r["show surfaces"].asBool()) { yyerror(llocp, yyscanner, &pd, "Error: representation block contains both 'show bounding box = true' and 'show surfaces = true'"); return false; } - if(r["show bounding box"].asBool() && + if(r["show bounding box"].asBool() && r["show edges"].asBool()) { yyerror(llocp, yyscanner, &pd, "Error: representation block contains both 'show bounding box = true' and 'show edges = true'"); @@ -886,7 +886,7 @@ bool check_representation(YYLTYPE * llocp, if(r.isMember("color legend minimum range") && r.isMember("color legend maximum range") ) { - if(r["color legend minimum range"][1] > + if(r["color legend minimum range"][1] > r["color legend maximum range"][0] ) { yyerror(llocp, yyscanner, &pd, "Error: representation block contains invalid minimum and maximum color legend ranges"); @@ -949,14 +949,14 @@ void switch_variable_to_used(const std::string& name, } } -bool compare_variable_type(const std::string& name, +bool compare_variable_type(const std::string& name, CatalystParserInterface::var_map* v, CatalystParserInterface::var_type vt) { if(v->find(name) != v->end()) { - if( (*v)[name] == vt || - (*v)[name] == CatalystParserInterface::ALLTYPE || + if( (*v)[name] == vt || + (*v)[name] == CatalystParserInterface::ALLTYPE || (*v)[name] == CatalystParserInterface::ALLTYPE_USED ) return true; else if( (*v)[name] == CatalystParserInterface::SCALAR_USED && @@ -965,7 +965,7 @@ bool compare_variable_type(const std::string& name, else if( (*v)[name] == CatalystParserInterface::VECTOR_USED && vt == CatalystParserInterface::VECTOR ) return true; - else if( (*v)[name] == CatalystParserInterface::TENSOR_USED && + else if( (*v)[name] == CatalystParserInterface::TENSOR_USED && vt == CatalystParserInterface::TENSOR ) return true; } @@ -975,7 +975,7 @@ bool compare_variable_type(const std::string& name, bool check_variable_name(YYLTYPE * llocp, yyscan_t yyscanner, parse_data& pd, - const std::string& name, + const std::string& name, CatalystParserInterface::var_type vt) { if (pd.nv && pd.ev && pd.gv) @@ -1083,7 +1083,7 @@ bool check_catalyst_shortcuts(YYLTYPE * llocp, { if( pd.ims_shortcut.size() && (pd.root["representation blocks"].size() || - pd.root["imageset blocks"].size() || + pd.root["imageset blocks"].size() || pd.root["camera blocks"].size() || pd.root["operation blocks"].size() || pd.root["scatter plot blocks"].size() || @@ -1255,7 +1255,7 @@ void clip_or_boxclip_or_slice_shortcut_command(parse_data& pd, a[0] = p; a[1] = n; - + if(command == "boxclip") { std::string r = boxclip_type; @@ -1323,7 +1323,7 @@ void data_point_command(parse_data& pd, void threshold_or_contour_shortcut_command(parse_data& pd, const std::string& command, - const std::string& data_type, + const std::string& data_type, const std::string& variable_name, const std::string& range, std::vector& values) @@ -1366,8 +1366,8 @@ void four_argument_command(parse_data& pd, bool check_two_argument_command(YYLTYPE * llocp, yyscan_t yyscanner, parse_data& pd, - const std::string& command, - const std::string& position, + const std::string& command, + const std::string& position, double value) { if(value < 0 || value > 1) @@ -1391,7 +1391,7 @@ bool check_two_argument_command(YYLTYPE * llocp, return true; } -void remove_quotes(std::string& s) +void remove_quotes(std::string& s) { if ( s.size() > 1 && s[0] == '"' ) { @@ -1424,7 +1424,7 @@ void no_argument_command(parse_data& pd, } void float_vector_command(parse_data& pd, - const std::string& command, + const std::string& command, std::vector& values) { Json::Value a(Json::arrayValue); @@ -1460,7 +1460,7 @@ void float_vector_command(parse_data& pd, } void string_vector_command(parse_data& pd, - const std::string& command, + const std::string& command, std::vector& values) { Json::Value a(Json::arrayValue); @@ -1478,7 +1478,7 @@ void string_vector_command(parse_data& pd, } void identifier_command(parse_data& pd, - const std::string& command, + const std::string& command, const std::string& identifier) { if (pd.cb == TOKCATALYST) @@ -1537,7 +1537,7 @@ void boolean_command(parse_data& pd, } void integer_command(parse_data& pd, - const std::string& command, + const std::string& command, int value) { if (pd.cb == TOKCATALYST) @@ -1646,7 +1646,7 @@ int parseCatalystFile(const std::string& filepath, { parse_data pd; pd.nv = pinfo.node_vars; - pd.ev = pinfo.element_vars; + pd.ev = pinfo.element_vars; pd.gv = pinfo.global_vars; pd.nIDs = pinfo.nodeIDs; pd.eIDs = pinfo.elementIDs; @@ -1674,7 +1674,7 @@ int parseCatalystString(const std::string& s, { parse_data pd; pd.nv = pinfo.node_vars; - pd.ev = pinfo.element_vars; + pd.ev = pinfo.element_vars; pd.gv = pinfo.global_vars; pd.nIDs = pinfo.nodeIDs; pd.eIDs = pinfo.elementIDs; @@ -1684,7 +1684,7 @@ int parseCatalystString(const std::string& s, %} -%union +%union { int integer; double floating; @@ -1915,10 +1915,10 @@ int parseCatalystString(const std::string& s, %token TOKKEEPABOVE %token TOKKEEPBETWEEN %token TOKTENSORCOMPONENT -%token TOKVECTORCOMPONENT -%token TOKVECTORMAGNITUDE -%token TOKSCALAR -%token TOKTHRESHOLD +%token TOKVECTORCOMPONENT +%token TOKVECTORMAGNITUDE +%token TOKSCALAR +%token TOKTHRESHOLD %token TOKAXESCOLOR %token TOKTEXTCOLOR %token TOKEDGECOLOR @@ -2005,16 +2005,16 @@ int parseCatalystString(const std::string& s, %token TOKCOLORBYBLOCKID %token TOKCOLORBYSOLIDCOLOR %token TOKSHOWEDGES -%token TOKCOLORBYSCALAR +%token TOKCOLORBYSCALAR %token TOKSHOWBOUNDINGBOX %token TOKCOLORBYVECTORMAGNITUDE %token TOKCOLORBYVECTORCOMPONENT %token TOKCOLORBYTENSORCOMPONENT -%token TOKREPRESENTATION -%token TOKREPRESENTATION2 +%token TOKREPRESENTATION +%token TOKREPRESENTATION2 %token TOKREPRESENTATION3 %token TOKEQUAL -%token TOKSHOWSURFACES +%token TOKSHOWSURFACES %token TOKTOP %token TOKLEFT %token TOKBOTTOM @@ -2028,13 +2028,13 @@ int parseCatalystString(const std::string& s, /* Catalyst */ -%token TOKBEGIN -%token TOKCATALYST +%token TOKBEGIN +%token TOKCATALYST %token TOKEND /* Catalyst */ -%token TOKFALSE +%token TOKFALSE %token TOKTRUE %token TOKVALUE %token TOKIDENTIFIER @@ -2069,14 +2069,14 @@ int parseCatalystString(const std::string& s, commands : - | start_catalyst_block statements catalyst_end - { - if(!check_catalyst_shortcuts(&yylloc, scanner, c(pd))) - YYABORT; + | start_catalyst_block statements catalyst_end + { + if(!check_catalyst_shortcuts(&yylloc, scanner, c(pd))) + YYABORT; if(!check_names(&yylloc, scanner, c(pd))) - YYABORT; + YYABORT; if(!check_cycles(&yylloc, scanner, c(pd))) - YYABORT; + YYABORT; } ; @@ -2184,10 +2184,10 @@ statement representation_block : start_representation_block representation_statements representation_end - { + { if(!check_representation(&yylloc, scanner, c(pd), c(pd).root["representation blocks"][c(pd).cbn])) YYABORT; - c(pd).cb = TOKCATALYST; + c(pd).cb = TOKCATALYST; } ; @@ -2197,12 +2197,12 @@ representation_end ; start_representation_block - : TOKBEGIN TOKREPRESENTATION TOKIDENTIFIER - { - c(pd).cb = TOKREPRESENTATION; - c(pd).cbn = $3; + : TOKBEGIN TOKREPRESENTATION TOKIDENTIFIER + { + c(pd).cb = TOKREPRESENTATION; + c(pd).cbn = $3; c(pd).count = 1; - if(!initialize_block(&yylloc, scanner, c(pd))) + if(!initialize_block(&yylloc, scanner, c(pd))) YYABORT; } ; @@ -2273,43 +2273,43 @@ show_bouding_box ; color_by_scalar - : TOKCOLORBYSCALAR TOKEQUAL TOKIDENTIFIER - { - if(!check_variable_name(&yylloc, scanner, c(pd), $3, CatalystParserInterface::SCALAR)) + : TOKCOLORBYSCALAR TOKEQUAL TOKIDENTIFIER + { + if(!check_variable_name(&yylloc, scanner, c(pd), $3, CatalystParserInterface::SCALAR)) YYABORT; - identifier_command(c(pd), "color by scalar", $3); + identifier_command(c(pd), "color by scalar", $3); } ; color_by_vector_magnitude - : TOKCOLORBYVECTORMAGNITUDE TOKEQUAL TOKIDENTIFIER + : TOKCOLORBYVECTORMAGNITUDE TOKEQUAL TOKIDENTIFIER { - if(!check_variable_name(&yylloc, scanner, c(pd), $3, CatalystParserInterface::VECTOR)) + if(!check_variable_name(&yylloc, scanner, c(pd), $3, CatalystParserInterface::VECTOR)) YYABORT; - identifier_command(c(pd), "color by vector magnitude", $3); + identifier_command(c(pd), "color by vector magnitude", $3); } ; color_by_vector_component : TOKCOLORBYVECTORCOMPONENT TOKEQUAL TOKIDENTIFIER - { - if(!check_vector_component(&yylloc, scanner, c(pd), $3)) + { + if(!check_vector_component(&yylloc, scanner, c(pd), $3)) YYABORT; - identifier_command(c(pd), "color by vector component", $3); + identifier_command(c(pd), "color by vector component", $3); } ; color_by_tensor_component : TOKCOLORBYTENSORCOMPONENT TOKEQUAL TOKIDENTIFIER - { - if(!check_tensor_component(&yylloc, scanner, c(pd), $3)) + { + if(!check_tensor_component(&yylloc, scanner, c(pd), $3)) YYABORT; - identifier_command(c(pd), "color by tensor component", $3); + identifier_command(c(pd), "color by tensor component", $3); } ; color_by_solid_color - : TOKCOLORBYSOLIDCOLOR TOKEQUAL TOKVALUE TOKVALUE TOKVALUE + : TOKCOLORBYSOLIDCOLOR TOKEQUAL TOKVALUE TOKVALUE TOKVALUE { if($3 < 0 || $3 > 1 || $4 < 0 || $4 > 1 || @@ -2322,8 +2322,8 @@ color_by_solid_color c(pd).d.push_back($3); c(pd).d.push_back($4); c(pd).d.push_back($5); - float_vector_command(c(pd), "color by solid color", c(pd).d); - } + float_vector_command(c(pd), "color by solid color", c(pd).d); + } ; color_by_blockid @@ -2399,17 +2399,17 @@ position ; color_legend_position - : TOKCOLORLEGENDPOSITION TOKEQUAL position TOKVALUE + : TOKCOLORLEGENDPOSITION TOKEQUAL position TOKVALUE { if(!check_two_argument_command(&yylloc, scanner, c(pd), "color legend position", $3, $4)) YYABORT; } ; preset_color_scale : TOKPRESETCOLORSCALE TOKEQUAL TOKIDENTIFIER - { + { std::string cn($3); - if(!check_color_name(&yylloc, scanner, c(pd), cn)) + if(!check_color_name(&yylloc, scanner, c(pd), cn)) YYABORT; - identifier_command(c(pd), "preset color scale", $3); + identifier_command(c(pd), "preset color scale", $3); } ; @@ -2443,11 +2443,11 @@ show_z_axis_label ; x_axis_label_name - : TOKXAXISLABELNAME TOKEQUAL TOKSTRING - { + : TOKXAXISLABELNAME TOKEQUAL TOKSTRING + { std::string s($3); remove_quotes(s); - identifier_command(c(pd), "x axis label name", s); + identifier_command(c(pd), "x axis label name", s); } ; @@ -2572,12 +2572,12 @@ multicamera8_block c(pd).cb = TOKCATALYST; } ; - + multicamera8_end : TOKEND | TOKEND TOKMULTICAMERA8 ; - + start_multicamera8_block : TOKBEGIN TOKMULTICAMERA8 TOKIDENTIFIER { @@ -2630,7 +2630,7 @@ look_at_relative_point look_at_element : TOKLOOKATELEMENT TOKEQUAL TOKVALUE { - if( (std::floor($3) != $3) || + if( (std::floor($3) != $3) || ($3 < 1) ) { yyerror(&yylloc, scanner, pd, "Error: look at element must be an integer greater than 0"); @@ -2644,7 +2644,7 @@ look_at_element look_at_node : TOKLOOKATNODE TOKEQUAL TOKVALUE { - if( (std::floor($3) != $3) || + if( (std::floor($3) != $3) || ($3 < 1) ) { yyerror(&yylloc, scanner, pd, "Error: look at node must be an integer greater than 0"); @@ -2802,7 +2802,7 @@ camera_at_relative_point camera_at_element : TOKCAMERAATELEMENT TOKEQUAL TOKVALUE { - if( (std::floor($3) != $3) || + if( (std::floor($3) != $3) || ($3 < 1) ) { yyerror(&yylloc, scanner, pd, "Error: camera at element must be an integer greater than 0"); @@ -2816,7 +2816,7 @@ camera_at_element camera_at_node : TOKCAMERAATNODE TOKEQUAL TOKVALUE { - if( (std::floor($3) != $3) || + if( (std::floor($3) != $3) || ($3 < 1) ) { yyerror(&yylloc, scanner, pd, "Error: camera at node must be an integer greater than 0"); @@ -2830,7 +2830,7 @@ camera_at_node camera_at_element_displaced : TOKCAMERAATELEMENTDISPLACED TOKEQUAL TOKVALUE TOKVALUE TOKVALUE TOKVALUE { - if( (std::floor($3) != $3) || + if( (std::floor($3) != $3) || ($3 < 1) ) { yyerror(&yylloc, scanner, pd, "Error: camera at element displaced must be an integer greater than 0"); @@ -2844,7 +2844,7 @@ camera_at_element_displaced camera_at_node_displaced : TOKCAMERAATNODEDISPLACED TOKEQUAL TOKVALUE TOKVALUE TOKVALUE TOKVALUE { - if( (std::floor($3) != $3) || + if( (std::floor($3) != $3) || ($3 < 1) ) { yyerror(&yylloc, scanner, pd, "Error: camera at node displaced must be an integer greater than 0"); @@ -2905,7 +2905,7 @@ imageset_statements : | imageset_statements imageset_statement ; - + imageset_statement : camera | representation @@ -2932,7 +2932,7 @@ imageset_statement | on_off_criteria | markers - /* Representation and MultiCamera8 Shortcuts */ + /* Representation and MultiCamera8 Shortcuts */ | show_surfaces | show_edges @@ -2980,74 +2980,74 @@ imageset_statement | up_vector | camera_fov - /* Representation and MultiCamera8 Shortcuts */ + /* Representation and MultiCamera8 Shortcuts */ ; camera : TOKCAMERA TOKEQUAL TOKIDENTIFIER { - identifier_command(c(pd), "camera", $3); + identifier_command(c(pd), "camera", $3); } ; representation : TOKREPRESENTATION TOKEQUAL TOKIDENTIFIER { - identifier_command(c(pd), "representation", $3); + identifier_command(c(pd), "representation", $3); } ; representation2 : TOKREPRESENTATION2 TOKEQUAL TOKIDENTIFIER { - identifier_command(c(pd), "representation2", $3); + identifier_command(c(pd), "representation2", $3); } ; representation3 : TOKREPRESENTATION3 TOKEQUAL TOKIDENTIFIER { - identifier_command(c(pd), "representation3", $3); + identifier_command(c(pd), "representation3", $3); } ; operation : TOKOPERATION TOKEQUAL TOKIDENTIFIER { - identifier_command(c(pd), "operation", $3); + identifier_command(c(pd), "operation", $3); } ; operation2 : TOKOPERATION2 TOKEQUAL TOKIDENTIFIER { - identifier_command(c(pd), "operation2", $3); + identifier_command(c(pd), "operation2", $3); } ; operation3 : TOKOPERATION3 TOKEQUAL TOKIDENTIFIER { - identifier_command(c(pd), "operation3", $3); + identifier_command(c(pd), "operation3", $3); } ; image_basename : TOKIMAGEBASENAME TOKEQUAL TOKSTRING - { + { std::string s($3); remove_quotes(s); - identifier_command(c(pd), "image basename", s); + identifier_command(c(pd), "image basename", s); } ; image_basedirectory : TOKIMAGEBASEDIRECTORY TOKEQUAL TOKSTRING - { + { std::string s($3); remove_quotes(s); - identifier_command(c(pd), "image basedirectory", s); + identifier_command(c(pd), "image basedirectory", s); } ; @@ -3059,7 +3059,7 @@ image_format image_digit_count : TOKIMAGEDIGITCOUNT TOKEQUAL TOKVALUE { - if( (std::floor($3) != $3) || + if( (std::floor($3) != $3) || ($3 < 0) ) { yyerror(&yylloc, scanner, pd, "Error: image digit count must be an integer greater than or equal to 0"); @@ -3072,10 +3072,10 @@ image_digit_count image_size : TOKIMAGESIZE TOKEQUAL TOKVALUE TOKVALUE { - if( (std::floor($3) != $3) || + if( (std::floor($3) != $3) || ($3 < 1) || ($3 > 4096) || - (std::floor($4) != $4) || + (std::floor($4) != $4) || ($4 < 1) || ($4 > 4096) ) { @@ -3090,7 +3090,7 @@ image_size ; background_color - : TOKBACKGROUNDCOLOR TOKEQUAL TOKVALUE TOKVALUE TOKVALUE + : TOKBACKGROUNDCOLOR TOKEQUAL TOKVALUE TOKVALUE TOKVALUE { if($3 < 0 || $3 > 1 || $4 < 0 || $4 > 1 || @@ -3103,12 +3103,12 @@ background_color c(pd).d.push_back($3); c(pd).d.push_back($4); c(pd).d.push_back($5); - float_vector_command(c(pd), "background color", c(pd).d); - } + float_vector_command(c(pd), "background color", c(pd).d); + } ; surface_color - : TOKSURFACECOLOR TOKEQUAL TOKVALUE TOKVALUE TOKVALUE + : TOKSURFACECOLOR TOKEQUAL TOKVALUE TOKVALUE TOKVALUE { if($3 < 0 || $3 > 1 || $4 < 0 || $4 > 1 || @@ -3121,12 +3121,12 @@ surface_color c(pd).d.push_back($3); c(pd).d.push_back($4); c(pd).d.push_back($5); - float_vector_command(c(pd), "surface color", c(pd).d); - } + float_vector_command(c(pd), "surface color", c(pd).d); + } ; edge_color - : TOKEDGECOLOR TOKEQUAL TOKVALUE TOKVALUE TOKVALUE + : TOKEDGECOLOR TOKEQUAL TOKVALUE TOKVALUE TOKVALUE { if($3 < 0 || $3 > 1 || $4 < 0 || $4 > 1 || @@ -3139,12 +3139,12 @@ edge_color c(pd).d.push_back($3); c(pd).d.push_back($4); c(pd).d.push_back($5); - float_vector_command(c(pd), "edge color", c(pd).d); - } + float_vector_command(c(pd), "edge color", c(pd).d); + } ; text_color - : TOKTEXTCOLOR TOKEQUAL TOKVALUE TOKVALUE TOKVALUE + : TOKTEXTCOLOR TOKEQUAL TOKVALUE TOKVALUE TOKVALUE { if($3 < 0 || $3 > 1 || $4 < 0 || $4 > 1 || @@ -3157,12 +3157,12 @@ text_color c(pd).d.push_back($3); c(pd).d.push_back($4); c(pd).d.push_back($5); - float_vector_command(c(pd), "text color", c(pd).d); - } + float_vector_command(c(pd), "text color", c(pd).d); + } ; axes_color - : TOKAXESCOLOR TOKEQUAL TOKVALUE TOKVALUE TOKVALUE + : TOKAXESCOLOR TOKEQUAL TOKVALUE TOKVALUE TOKVALUE { if($3 < 0 || $3 > 1 || $4 < 0 || $4 > 1 || @@ -3175,8 +3175,8 @@ axes_color c(pd).d.push_back($3); c(pd).d.push_back($4); c(pd).d.push_back($5); - float_vector_command(c(pd), "axes color", c(pd).d); - } + float_vector_command(c(pd), "axes color", c(pd).d); + } ; threshold_shortcut @@ -3358,7 +3358,7 @@ clip_statements : | clip_statements clip_statement ; - + clip_statement : input | absolute_point_on_plane @@ -3372,7 +3372,7 @@ clip_statement | plane_specification ; -input +input : TOKINPUT TOKEQUAL TOKIDENTIFIER { std::string s($3); @@ -3381,7 +3381,7 @@ input yyerror(&yylloc, scanner, pd, "Error: operation cannot match operation name"); YYABORT; } - + identifier_command(c(pd), "input", $3); } ; @@ -3399,7 +3399,7 @@ absolute_point_on_plane c(pd).d.push_back($3); c(pd).d.push_back($4); c(pd).d.push_back($5); - float_vector_command(c(pd), "absolute point on plane", c(pd).d); + float_vector_command(c(pd), "absolute point on plane", c(pd).d); } | TOKABSOLUTEPOINTONPLANE point_location TOKEQUAL TOKVALUE TOKVALUE TOKVALUE { @@ -3409,7 +3409,7 @@ absolute_point_on_plane c(pd).d.push_back($4); c(pd).d.push_back($5); c(pd).d.push_back($6); - float_vector_command(c(pd), "absolute point on plane " + ct, c(pd).d); + float_vector_command(c(pd), "absolute point on plane " + ct, c(pd).d); } ; @@ -3430,14 +3430,14 @@ relative_point_on_plane c(pd).d.push_back($4); c(pd).d.push_back($5); c(pd).d.push_back($6); - float_vector_command(c(pd), "relative point on plane " + ct, c(pd).d); + float_vector_command(c(pd), "relative point on plane " + ct, c(pd).d); } ; node_on_plane : TOKNODEONPLANE TOKEQUAL TOKVALUE { - if( (std::floor($3) != $3) || + if( (std::floor($3) != $3) || ($3 < 1) ) { yyerror(&yylloc, scanner, pd, "Error: node on plane must be an integer greater than 0"); @@ -3464,7 +3464,7 @@ node_on_plane element_on_plane : TOKELEMENTONPLANE TOKEQUAL TOKVALUE { - if( (std::floor($3) != $3) || + if( (std::floor($3) != $3) || ($3 < 1) ) { yyerror(&yylloc, scanner, pd, "Error: element on plane must be an integer greater than 0"); @@ -3505,10 +3505,10 @@ plane_normal cut_type : TOKCUTTYPE TOKEQUAL cut_type_string - { + { std::string ct($3); std::transform(ct.begin(), ct.end(), ct.begin(), ::tolower); - identifier_command(c(pd), "cut type", ct); + identifier_command(c(pd), "cut type", ct); } ; @@ -3519,10 +3519,10 @@ cut_type_string side_to_keep : TOKSIDETOKEEP TOKEQUAL side_type - { + { std::string ct($3); std::transform(ct.begin(), ct.end(), ct.begin(), ::tolower); - identifier_command(c(pd), "side to keep", ct); + identifier_command(c(pd), "side to keep", ct); } ; @@ -3582,7 +3582,7 @@ slice_statements : | slice_statements slice_statement ; - + slice_statement : input | absolute_point_on_plane @@ -3627,7 +3627,7 @@ box_clip_statements : | box_clip_statements box_clip_statement ; - + box_clip_statement : input | center_at_absolute_point @@ -3649,7 +3649,7 @@ center_at_absolute_point c(pd).d.push_back($3); c(pd).d.push_back($4); c(pd).d.push_back($5); - float_vector_command(c(pd), "center at absolute point", c(pd).d); + float_vector_command(c(pd), "center at absolute point", c(pd).d); } ; @@ -3660,14 +3660,14 @@ center_at_relative_point c(pd).d.push_back($3); c(pd).d.push_back($4); c(pd).d.push_back($5); - float_vector_command(c(pd), "center at relative point", c(pd).d); + float_vector_command(c(pd), "center at relative point", c(pd).d); } ; center_at_node : TOKCENTERATNODE TOKEQUAL TOKVALUE { - if( (std::floor($3) != $3) || + if( (std::floor($3) != $3) || ($3 < 1) ) { yyerror(&yylloc, scanner, pd, "Error: center at node must be an integer greater than 0"); @@ -3681,7 +3681,7 @@ center_at_node center_at_element : TOKCENTERATELEMENT TOKEQUAL TOKVALUE { - if( (std::floor($3) != $3) || + if( (std::floor($3) != $3) || ($3 < 1) ) { yyerror(&yylloc, scanner, pd, "Error: center at element must be an integer greater than 0"); @@ -3775,7 +3775,7 @@ threshold_statements : | threshold_statements threshold_statement ; - + threshold_statement : input | variable_scalar @@ -3788,38 +3788,38 @@ threshold_statement ; variable_scalar - : TOKVARIABLESCALAR TOKEQUAL TOKIDENTIFIER - { - if(!check_variable_name(&yylloc, scanner, c(pd), $3, CatalystParserInterface::SCALAR)) + : TOKVARIABLESCALAR TOKEQUAL TOKIDENTIFIER + { + if(!check_variable_name(&yylloc, scanner, c(pd), $3, CatalystParserInterface::SCALAR)) YYABORT; - identifier_command(c(pd), "variable scalar", $3); + identifier_command(c(pd), "variable scalar", $3); } ; variable_vector_magnitude - : TOKVARIABLEVECTORMAGNITUDE TOKEQUAL TOKIDENTIFIER - { - if(!check_variable_name(&yylloc, scanner, c(pd), $3, CatalystParserInterface::VECTOR)) + : TOKVARIABLEVECTORMAGNITUDE TOKEQUAL TOKIDENTIFIER + { + if(!check_variable_name(&yylloc, scanner, c(pd), $3, CatalystParserInterface::VECTOR)) YYABORT; - identifier_command(c(pd), "variable vector magnitude", $3); + identifier_command(c(pd), "variable vector magnitude", $3); } ; variable_vector_component : TOKVARIABLEVECTORCOMPONENT TOKEQUAL TOKIDENTIFIER - { - if(!check_vector_component(&yylloc, scanner, c(pd), $3)) + { + if(!check_vector_component(&yylloc, scanner, c(pd), $3)) YYABORT; - identifier_command(c(pd), "variable vector component", $3); + identifier_command(c(pd), "variable vector component", $3); } ; variable_tensor_component : TOKVARIABLETENSORCOMPONENT TOKEQUAL TOKIDENTIFIER - { - if(!check_tensor_component(&yylloc, scanner, c(pd), $3)) + { + if(!check_tensor_component(&yylloc, scanner, c(pd), $3)) YYABORT; - identifier_command(c(pd), "variable tensor component", $3); + identifier_command(c(pd), "variable tensor component", $3); } ; @@ -3885,7 +3885,7 @@ contour_statements : | contour_statements contour_statement ; - + contour_statement : input | variable_scalar @@ -3956,7 +3956,7 @@ scatter_plot_statements : | scatter_plot_statements scatter_plot_statement ; - + scatter_plot_statement : operation | all_variables @@ -3990,74 +3990,74 @@ all_variables ; x_axis_variable_scalar - : TOKXAXISVARIABLESCALAR TOKEQUAL TOKIDENTIFIER - { - if(!check_variable_name(&yylloc, scanner, c(pd), $3, CatalystParserInterface::SCALAR)) + : TOKXAXISVARIABLESCALAR TOKEQUAL TOKIDENTIFIER + { + if(!check_variable_name(&yylloc, scanner, c(pd), $3, CatalystParserInterface::SCALAR)) YYABORT; - identifier_command(c(pd), "x axis variable scalar", $3); + identifier_command(c(pd), "x axis variable scalar", $3); } ; y_axis_variable_scalar - : TOKYAXISVARIABLESCALAR TOKEQUAL TOKIDENTIFIER - { + : TOKYAXISVARIABLESCALAR TOKEQUAL TOKIDENTIFIER + { if(!check_variable_name(&yylloc, scanner, c(pd), $3, CatalystParserInterface::SCALAR)) YYABORT; - identifier_command(c(pd), "y axis variable scalar", $3); + identifier_command(c(pd), "y axis variable scalar", $3); } ; x_axis_variable_vector_magnitude - : TOKXAXISVARIABLEVECTORMAGNITUDE TOKEQUAL TOKIDENTIFIER - { + : TOKXAXISVARIABLEVECTORMAGNITUDE TOKEQUAL TOKIDENTIFIER + { if(!check_variable_name(&yylloc, scanner, c(pd), $3, CatalystParserInterface::VECTOR)) YYABORT; - identifier_command(c(pd), "x axis variable vector magnitude", $3); + identifier_command(c(pd), "x axis variable vector magnitude", $3); } ; y_axis_variable_vector_magnitude - : TOKYAXISVARIABLEVECTORMAGNITUDE TOKEQUAL TOKIDENTIFIER - { + : TOKYAXISVARIABLEVECTORMAGNITUDE TOKEQUAL TOKIDENTIFIER + { if(!check_variable_name(&yylloc, scanner, c(pd), $3, CatalystParserInterface::VECTOR)) YYABORT; - identifier_command(c(pd), "y axis variable vector magnitude", $3); + identifier_command(c(pd), "y axis variable vector magnitude", $3); } ; x_axis_variable_vector_component : TOKXAXISVARIABLEVECTORCOMPONENT TOKEQUAL TOKIDENTIFIER - { - if(!check_vector_component(&yylloc, scanner, c(pd), $3)) + { + if(!check_vector_component(&yylloc, scanner, c(pd), $3)) YYABORT; - identifier_command(c(pd), "x axis variable vector component", $3); + identifier_command(c(pd), "x axis variable vector component", $3); } ; y_axis_variable_vector_component : TOKYAXISVARIABLEVECTORCOMPONENT TOKEQUAL TOKIDENTIFIER - { + { if(!check_vector_component(&yylloc, scanner, c(pd), $3)) YYABORT; - identifier_command(c(pd), "y axis variable vector component", $3); + identifier_command(c(pd), "y axis variable vector component", $3); } ; x_axis_variable_tensor_component : TOKXAXISVARIABLETENSORCOMPONENT TOKEQUAL TOKIDENTIFIER - { + { if(!check_tensor_component(&yylloc, scanner, c(pd), $3)) YYABORT; - identifier_command(c(pd), "x axis variable tensor component", $3); + identifier_command(c(pd), "x axis variable tensor component", $3); } ; y_axis_variable_tensor_component : TOKYAXISVARIABLETENSORCOMPONENT TOKEQUAL TOKIDENTIFIER - { + { if(!check_tensor_component(&yylloc, scanner, c(pd), $3)) YYABORT; - identifier_command(c(pd), "y axis variable tensor component", $3); + identifier_command(c(pd), "y axis variable tensor component", $3); } ; @@ -4170,19 +4170,19 @@ y_axis_maximum_range plot_base_name : TOKPLOTBASENAME TOKEQUAL TOKSTRING - { + { std::string s($3); remove_quotes(s); - identifier_command(c(pd), "plot basename", s); + identifier_command(c(pd), "plot basename", s); } ; plot_base_directory - : TOKPLOTBASEDIRECTORY TOKEQUAL TOKSTRING - { + : TOKPLOTBASEDIRECTORY TOKEQUAL TOKSTRING + { std::string s($3); remove_quotes(s); - identifier_command(c(pd), "plot basedirectory", s); + identifier_command(c(pd), "plot basedirectory", s); } ; @@ -4219,7 +4219,7 @@ plot_over_time_statements : | plot_over_time_statements plot_over_time_statement ; - + plot_over_time_statement : operation | all_variables @@ -4254,7 +4254,7 @@ plot_maximum plot_mean : TOKPLOTMEAN TOKEQUAL boolean { boolean_command(c(pd), "plot mean", $3 == 1); } ; - + plot_id : TOKPLOTID TOKEQUAL { c(pd).d.clear(); } plot_value_list { @@ -4270,7 +4270,7 @@ plot_value_list plot_value_member : TOKVALUE { - if( (std::floor($1) != $1) || + if( (std::floor($1) != $1) || ($1 < 1) ) { yyerror(&yylloc, scanner, pd, "Error: plot id must be an integer greater than 0"); @@ -4975,8 +4975,8 @@ on_off_criteria_block_statement | variable_vector_magnitude | variable_vector_component | variable_tensor_component - | frames_after_trigger - | maximum_trigger_per_threshold + | frames_after_trigger + | maximum_trigger_per_threshold | scalar_parameter | vector_parameter | integer_parameter diff --git a/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/parser/driver.cpp b/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/parser/driver.cpp index c37150423fcb..badaea4d2f1f 100644 --- a/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/parser/driver.cpp +++ b/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/parser/driver.cpp @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "CatalystParserInterface.h" diff --git a/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/parser/driver_test.cpp b/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/parser/driver_test.cpp index e33d874f41e8..ec56b254790d 100644 --- a/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/parser/driver_test.cpp +++ b/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/parser/driver_test.cpp @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "CatalystParserInterface.h" diff --git a/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/parser/jsoncpp-master/LICENSE b/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/parser/jsoncpp-master/LICENSE index a44e1aa769ea..3ecd5af7ed88 100644 --- a/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/parser/jsoncpp-master/LICENSE +++ b/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/parser/jsoncpp-master/LICENSE @@ -99,4 +99,4 @@ void StyledStreamWriter::writeArrayValue(const Value& value) { } } -bool StyledStreamWriter::isMultineArray(const Value& +bool StyledStreamWriter::isMultineArray(const Value& diff --git a/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/parser/jsoncpp-master/NEWS.txt b/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/parser/jsoncpp-master/NEWS.txt index d92e063ea91c..6f3e3265db1f 100644 --- a/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/parser/jsoncpp-master/NEWS.txt +++ b/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/parser/jsoncpp-master/NEWS.txt @@ -1,7 +1,7 @@ # Copyright(C) 1999-2020 National Technology & Engineering Solutions # of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with # NTESS, the U.S. Government retains certain rights in this software. -# +# # See packages/seacas/LICENSE for details %{ #include diff --git a/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/parser/jsoncpp-master/dev.makefile b/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/parser/jsoncpp-master/dev.makefile index 74214bacc46a..1754dc5543f1 100644 --- a/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/parser/jsoncpp-master/dev.makefile +++ b/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/parser/jsoncpp-master/dev.makefile @@ -37,4 +37,4 @@ tatic_cast(end-str))); const std::string& name = *it; const Value& childValue = value[name]; writeCommentBeforeValue(childValue); - + diff --git a/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/parser/jsoncpp-master/dist/json/json-forwards.h b/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/parser/jsoncpp-master/dist/json/json-forwards.h index d0789adfc9d2..630715fa1138 100644 --- a/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/parser/jsoncpp-master/dist/json/json-forwards.h +++ b/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/parser/jsoncpp-master/dist/json/json-forwards.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ ////////////////////////////////////////////////////////////////////// diff --git a/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/parser/jsoncpp-master/dist/json/json.h b/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/parser/jsoncpp-master/dist/json/json.h index 459211903f4d..545e61aa3574 100644 --- a/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/parser/jsoncpp-master/dist/json/json.h +++ b/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/parser/jsoncpp-master/dist/json/json.h @@ -18,7 +18,7 @@ In jurisdictions which do not recognize Public Domain property (e.g. Germany as of 2010), this software is Copyright(C) 1999-2020 National Technology & Engineering Solutions of 2010), this software is of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with of 2010), this software is NTESS, the U.S. Government retains certain rights in this software. -of 2010), this software is +of 2010), this software is of 2010), this software is See packages/seacas/LICENSE for details Solutions diff --git a/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/parser/jsoncpp-master/version b/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/parser/jsoncpp-master/version index 160b0c18740d..af3f3fa14201 100644 --- a/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/parser/jsoncpp-master/version +++ b/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/parser/jsoncpp-master/version @@ -1 +1 @@ -onst& +onst& diff --git a/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/python/PhactoriDriver.py b/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/python/PhactoriDriver.py index 7742229f9177..e64c2e275b89 100644 --- a/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/python/PhactoriDriver.py +++ b/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/python/PhactoriDriver.py @@ -1,7 +1,7 @@ # Copyright(C) 1999-2020 National Technology & Engineering Solutions # of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with # NTESS, the U.S. Government retains certain rights in this software. -# +# # See packages/seacas/LICENSE for details try: paraview.simple diff --git a/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/python/phactori.py b/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/python/phactori.py index 1a2cf137efc4..73ec9aa8bc14 100644 --- a/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/python/phactori.py +++ b/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/python/phactori.py @@ -1,7 +1,7 @@ # Copyright(C) 1999-2020 National Technology & Engineering Solutions # of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with # NTESS, the U.S. Government retains certain rights in this software. -# +# # See packages/seacas/LICENSE for details diff --git a/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/vtkExodusIIMultiBlockDataSet.cxx b/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/vtkExodusIIMultiBlockDataSet.cxx index 79c0ac8ba6c7..0ba3a564d062 100644 --- a/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/vtkExodusIIMultiBlockDataSet.cxx +++ b/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/vtkExodusIIMultiBlockDataSet.cxx @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "vtkExodusIIMultiBlockDataSet.h" diff --git a/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/vtkExodusIIMultiBlockDataSet.h b/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/vtkExodusIIMultiBlockDataSet.h index 13594c1cf77a..dfcd296a23fe 100644 --- a/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/vtkExodusIIMultiBlockDataSet.h +++ b/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/vtkExodusIIMultiBlockDataSet.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #ifndef __VTK_EXODUS_II_MULTI_BLOCK_DATA_SET_H @@ -107,11 +107,11 @@ class vtkExodusIIMultiBlockDataSet : public vtkMultiBlockDataSet std::map> ebmap; std::map> ebmap_reverse; std::map> global_elem_id_map; - std::vector global_point_id_to_global_elem_id; - std::map ebidmap; - std::map nsidmap; + std::vector global_point_id_to_global_elem_id; + std::map ebidmap; + std::map nsidmap; std::map> nsmap; - std::map ssidmap; + std::map ssidmap; // ssinfomap is used to help track when we see a new sideset. CreateSideSet // is called once for each sideset for each block which the sideset spans, @@ -121,14 +121,14 @@ class vtkExodusIIMultiBlockDataSet : public vtkMultiBlockDataSet std::map ssinfomap; std::map> ssmap; - void ContainsVector(std::vector &component_names, - std::vector &prefix_name); - double GetArrayValue(vtkVariant &v, const void *data, int index); - void ReleaseGlobalPoints(); - vtkPoints *global_points; - int num_global_points; - int UnderscoreVectors; - int ApplyDisplacements; + void ContainsVector(std::vector &component_names, + std::vector &prefix_name); + double GetArrayValue(vtkVariant &v, const void *data, int index); + void ReleaseGlobalPoints(); + vtkPoints * global_points; + int num_global_points; + int UnderscoreVectors; + int ApplyDisplacements; void CreateGlobalVariableInternal(std::vector &component_names, vtkMultiBlockDataSet *eb, unsigned int bid, vtkVariant &v, const void *data); @@ -150,9 +150,9 @@ class Ve2mSideSetInfo Ve2mSideSetInfo(); ~Ve2mSideSetInfo(); - int bid; + int bid; std::map unique_points; - std::vector object_ids; + std::vector object_ids; }; #endif /* __VTK_EXODUS_II_MULTI_BLOCK_DATA_SET_H */ diff --git a/packages/seacas/libraries/mapvarlib/aexds1.blk b/packages/seacas/libraries/mapvarlib/aexds1.blk index 9708b20392ec..a5230629e704 100644 --- a/packages/seacas/libraries/mapvarlib/aexds1.blk +++ b/packages/seacas/libraries/mapvarlib/aexds1.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /AEXDS1/ NQAREC,NVARGP,NVARNP,NVAREL diff --git a/packages/seacas/libraries/mapvarlib/aexds2.blk b/packages/seacas/libraries/mapvarlib/aexds2.blk index 4d2b0a70df5e..91e50162fcd2 100644 --- a/packages/seacas/libraries/mapvarlib/aexds2.blk +++ b/packages/seacas/libraries/mapvarlib/aexds2.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details include 'exodusII.inc' diff --git a/packages/seacas/libraries/mapvarlib/amesh.blk b/packages/seacas/libraries/mapvarlib/amesh.blk index 09bccc50e19b..100a56bc1fea 100644 --- a/packages/seacas/libraries/mapvarlib/amesh.blk +++ b/packages/seacas/libraries/mapvarlib/amesh.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /AMESH/ NUMELA,NODESA,NBLKSA,NDIMA,NELNDA diff --git a/packages/seacas/libraries/mapvarlib/avg.f b/packages/seacas/libraries/mapvarlib/avg.f index bf8f41129158..768821c9e06d 100644 --- a/packages/seacas/libraries/mapvarlib/avg.f +++ b/packages/seacas/libraries/mapvarlib/avg.f @@ -1,23 +1,23 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================== SUBROUTINE AVG(IGLND,INVCN,MAXLN,INVLEN,SOLEA,SOLENA,ITT,iblk) -C + C************************************************************************ -C + C Subroutine AVG provides for translating nodal values of element C variables back to the element centroids for the special case where C too few elements can be associated with a node. Element variable C data is simply averaged at that node. -C + C Called by ELTON1 -C + C************************************************************************ -C + C IGLND INT The global node number C INVCN INT The inverse connectivity (1:maxln,1:numnda) C MAXLN INT The maximum nomber of elements connected to any node @@ -28,18 +28,18 @@ SUBROUTINE AVG(IGLND,INVCN,MAXLN,INVLEN,SOLEA,SOLENA,ITT,iblk) C number with the global mesh node number (1:numnda) C ITT INT Truth table C iblk INT Block number being processed (not block ID) -C + C************************************************************************ -C + include 'aexds1.blk' include 'amesh.blk' include 'ebbyeb.blk' -C + DIMENSION INVCN(MAXLN,*),SOLEA(NUMEBA,*), & SOLENA(NODESA,NVAREL), ITT(NVAREL,*) -C + C************************************************************************ -C + DO 10 IVAR = 1, NVAREL IF (ITT(IVAR,iblk) .EQ. 0)GO TO 10 SUM = 0. diff --git a/packages/seacas/libraries/mapvarlib/bldpte.f b/packages/seacas/libraries/mapvarlib/bldpte.f index 71b64f969d8f..636ded66e794 100644 --- a/packages/seacas/libraries/mapvarlib/bldpte.f +++ b/packages/seacas/libraries/mapvarlib/bldpte.f @@ -1,29 +1,28 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details SUBROUTINE BLDPTE(X,Y,Z,ICON,CENTER) -C + C*********************************************************************** -C + C BLDPTE LOADS THE ELEMENT CENTROIDS INTO THE XYZSRF ARRAY -C + C Calls subroutine CNTR -C + C Called by MAPVAR -C + C*********************************************************************** -C + include 'bmesh.blk' include 'ebbyeb.blk' include 'tapes.blk' -C + DIMENSION X(*),Y(*),Z(*),CENTER(NUMEBB,*),ICON(NELNDB,*) DIMENSION XX(27), YY(27), ZZ(27) -C -C + C NNODES = NNELM(ITYPE) NNODES = NELNDB IF (ITYPE .EQ. 6) NNODES = 4 diff --git a/packages/seacas/libraries/mapvarlib/bldptn.f b/packages/seacas/libraries/mapvarlib/bldptn.f index 18d3b1f136f8..0c84d15d2eb7 100644 --- a/packages/seacas/libraries/mapvarlib/bldptn.f +++ b/packages/seacas/libraries/mapvarlib/bldptn.f @@ -1,25 +1,25 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details SUBROUTINE BLDPTN(XB,YB,ZB,NDLSTB,XYZPTS) -C + C*********************************************************************** -C + C BLDPTN CREATES ARRAYS XYZPTS FOR NODES -C + C Called by MAPVAR -C + C*********************************************************************** -C + include 'ebbyeb.blk' include 'amesh.blk' -C + DIMENSION XB(*),YB(*),ZB(*),NDLSTB(*) DIMENSION XYZPTS(NUMNDB,3) -C + DO 20 I = 1, NUMNDB XYZPTS(I,1) = XB(NDLSTB(I)) XYZPTS(I,2) = YB(NDLSTB(I)) @@ -29,6 +29,6 @@ SUBROUTINE BLDPTN(XB,YB,ZB,NDLSTB,XYZPTS) XYZPTS(I,3) = ZB(NDLSTB(I)) END IF 20 CONTINUE -C + RETURN END diff --git a/packages/seacas/libraries/mapvarlib/bldsrf.f b/packages/seacas/libraries/mapvarlib/bldsrf.f index 20d22235abba..45524655241f 100644 --- a/packages/seacas/libraries/mapvarlib/bldsrf.f +++ b/packages/seacas/libraries/mapvarlib/bldsrf.f @@ -1,25 +1,24 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details SUBROUTINE BLDSRF(XA,YA,ZA,XYZSRF) -C + C*********************************************************************** -C + C BLDSRF CREATES ARRAYS XYZSRF -C + C Called by MAPVAR -C + C*********************************************************************** -C + include 'amesh.blk' -C + DIMENSION XA(*),YA(*),ZA(*) DIMENSION XYZSRF(NODESA,3) -C -C + DO 10 I = 1, NODESA XYZSRF(I,1) = XA(I) XYZSRF(I,2) = YA(I) @@ -29,6 +28,6 @@ SUBROUTINE BLDSRF(XA,YA,ZA,XYZSRF) XYZSRF(I,3) = ZA(I) END IF 10 CONTINUE -C + RETURN END diff --git a/packages/seacas/libraries/mapvarlib/bmesh.blk b/packages/seacas/libraries/mapvarlib/bmesh.blk index fdd159c1493f..5533d70813b0 100644 --- a/packages/seacas/libraries/mapvarlib/bmesh.blk +++ b/packages/seacas/libraries/mapvarlib/bmesh.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /BMESH/ NUMELB,NODESB,NBLKSB,NDIMB,NELNDB diff --git a/packages/seacas/libraries/mapvarlib/bs.f b/packages/seacas/libraries/mapvarlib/bs.f index 0bca17040975..783e03905f8b 100644 --- a/packages/seacas/libraries/mapvarlib/bs.f +++ b/packages/seacas/libraries/mapvarlib/bs.f @@ -1,39 +1,39 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C====================================================================== SUBROUTINE BS(N,S,F,L,X) -C + C********************************************************************** -C + C Subroutine BS does the back substitution for the soultion of the C local least squares extrapolation technique for element variables C from their element centroid location to a nodal location. C The least squares solution is started by a Gauss elimination in C subroutine FRGE. The process is started in subroutines EXTQ for C 4-node quads or EXTH for 8-node hexes. -C + C Called by EXTH, EXTQ -C + C********************************************************************** -C + C N INT number of equations - 1 + the number of dimensions C S REAL the coefficient matrix - after forward gauss elimination C F REAL the load vector C L INT dummy array - placeholder for subscripts C X REAL the solution vector - coefficients of the equation C SUM REAL dummy variable - used in the solution scheme -C + C********************************************************************** -C + C subroutine written in double precision -C + DOUBLE PRECISION S(N,N),F(N),X(N),SUM INTEGER L(N) -C + DO 3 K = 1,N-1 DO 2 I = K+1,N F(L(I)) = F(L(I)) - S(L(I),K) * F(L(K)) diff --git a/packages/seacas/libraries/mapvarlib/clsfil.f b/packages/seacas/libraries/mapvarlib/clsfil.f index b8741e7df2cc..c5e1ed777e97 100644 --- a/packages/seacas/libraries/mapvarlib/clsfil.f +++ b/packages/seacas/libraries/mapvarlib/clsfil.f @@ -1,31 +1,31 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= *DECK,CLSFIL SUBROUTINE CLSFIL -C + C ****************************************************************** -C + C SUBROUTINE TO CLOSE PREVIOUSLY OPENED DISK FILES -C + C Called by ERROR, MAPVAR -C + C ****************************************************************** -C + include 'ex2tp.blk' include 'tapes.blk' include 'ntpdat.blk' -C + C ****************************************************************** -C + IF (IFILES(1).EQ.1) CLOSE (UNIT=NTPOUT, STATUS='keep') IF (IFILES(3).EQ.1) call exclos (ntp2ex,ierr) IF (IFILES(4).EQ.1) call exclos (ntp3ex,ierr) IF (IFILES(5).EQ.1) call exclos (ntp4ex,ierr) -C + RETURN END diff --git a/packages/seacas/libraries/mapvarlib/cntr.f b/packages/seacas/libraries/mapvarlib/cntr.f index add512151e5e..a9b0d32f75cb 100644 --- a/packages/seacas/libraries/mapvarlib/cntr.f +++ b/packages/seacas/libraries/mapvarlib/cntr.f @@ -1,80 +1,80 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= *DECK,CNTR SUBROUTINE CNTR (ITYPE,XX,YY,ZZ,XCNTR,YCNTR,ZCNTR) -C + C ****************************************************************** -C + C SUBROUTINE TO FIND THE CENTER COORDINATES OF AN ELEMENT -C + C Called by ELTON3, LDCENB, SRCH2D, SRCH3D -C + C ****************************************************************** -C + DIMENSION XX(*), YY(*), ZZ(*) -C + C ****************************************************************** -C + C SELECT ELEMENT TYPE -C + GO TO (100, 110, 120, 130, 140, 150, 160, 170, 180, 190, & 200, 210, 150), ITYPE -C + C 3-NODE TRIANGLE -C + 100 CONTINUE XCNTR=(XX(1)+XX(2)+XX(3))/3. YCNTR=(YY(1)+YY(2)+YY(3))/3. ZCNTR=0. RETURN -C + C 6-NODE TRIANGLE -C + 110 CONTINUE XCNTR=-(XX(1)+XX(2)+XX(3))/9.+4.*(XX(4)+XX(5)+XX(6))/9. YCNTR=-(YY(1)+YY(2)+YY(3))/9.+4.*(YY(4)+YY(5)+YY(6))/9. ZCNTR=0. RETURN -C + C 4-NODE QUADRILATERAL -C + 120 CONTINUE XCNTR=(XX(1)+XX(2)+XX(3)+XX(4))/4. YCNTR=(YY(1)+YY(2)+YY(3)+YY(4))/4. ZCNTR=0. RETURN -C + C 8-NODE QUADRILATERAL -C + 130 CONTINUE XCNTR=-(XX(1)+XX(2)+XX(3)+XX(4))/4.+(XX(5)+XX(6)+XX(7)+XX(8))/2. YCNTR=-(YY(1)+YY(2)+YY(3)+YY(4))/4.+(YY(5)+YY(6)+YY(7)+YY(8))/2. ZCNTR=0. RETURN -C + C 9-NODE QUADRILATERAL -C + 140 CONTINUE XCNTR=XX(9) YCNTR=YY(9) ZCNTR=0. RETURN -C + C 4-NODE TETRAHEDRON OR SHELL -C + 150 CONTINUE XCNTR=(XX(1)+XX(2)+XX(3)+XX(4))/4. YCNTR=(YY(1)+YY(2)+YY(3)+YY(4))/4. ZCNTR=(ZZ(1)+ZZ(2)+ZZ(3)+ZZ(4))/4. RETURN -C + C 10-NODE TETRAHEDRON -C + 160 CONTINUE XCNTR=-(XX(1)+XX(2)+XX(3)+XX(4))/8.+(XX(5)+XX(6)+XX(7)+XX(8)+ 1XX(9)+XX(10))/4. @@ -83,17 +83,17 @@ SUBROUTINE CNTR (ITYPE,XX,YY,ZZ,XCNTR,YCNTR,ZCNTR) ZCNTR=-(ZZ(1)+ZZ(2)+ZZ(3)+ZZ(4))/8.+(ZZ(5)+ZZ(6)+ZZ(7)+ZZ(8)+ 1ZZ(9)+ZZ(10))/4. RETURN -C + C 6-NODE PRISM -C + 170 CONTINUE XCNTR=(XX(1)+XX(2)+XX(3)+XX(4)+XX(5)+XX(6))/6. YCNTR=(YY(1)+YY(2)+YY(3)+YY(4)+YY(5)+YY(6))/6. ZCNTR=(ZZ(1)+ZZ(2)+ZZ(3)+ZZ(4)+ZZ(5)+ZZ(6))/6. RETURN -C + C 15-NODE PRISM -C + 180 CONTINUE XCNTR=-2.*(XX(1)+XX(2)+XX(3)+XX(4)+XX(5)+XX(6))/9.+ 12.*(XX(7)+XX(8)+XX(9)+XX(13)+XX(14)+XX(15))/9.+ @@ -105,17 +105,17 @@ SUBROUTINE CNTR (ITYPE,XX,YY,ZZ,XCNTR,YCNTR,ZCNTR) 12.*(ZZ(7)+ZZ(8)+ZZ(9)+ZZ(13)+ZZ(14)+ZZ(15))/9.+ 2(ZZ(10)+ZZ(11)+ZZ(12))/3. RETURN -C + C 8-NODE HEX -C + 190 CONTINUE XCNTR=(XX(1)+XX(2)+XX(3)+XX(4)+XX(5)+XX(6)+XX(7)+XX(8))/8. YCNTR=(YY(1)+YY(2)+YY(3)+YY(4)+YY(5)+YY(6)+YY(7)+YY(8))/8. ZCNTR=(ZZ(1)+ZZ(2)+ZZ(3)+ZZ(4)+ZZ(5)+ZZ(6)+ZZ(7)+ZZ(8))/8. RETURN -C + C 20-NODE HEX -C + 200 CONTINUE XCNTR=-(XX(1)+XX(2)+XX(3)+XX(4)+XX(5)+XX(6)+XX(7)+XX(8))/4.+ 1(XX(9)+XX(10)+XX(11)+XX(12)+XX(13)+XX(14)+XX(15)+XX(16)+XX(17)+ @@ -127,13 +127,13 @@ SUBROUTINE CNTR (ITYPE,XX,YY,ZZ,XCNTR,YCNTR,ZCNTR) 1(ZZ(9)+ZZ(10)+ZZ(11)+ZZ(12)+ZZ(13)+ZZ(14)+ZZ(15)+ZZ(16)+ZZ(17)+ 2ZZ(18)+ZZ(19)+ZZ(20))/4. RETURN -C + C 27-NODE HEX -C + 210 CONTINUE XCNTR=XX(27) YCNTR=YY(27) ZCNTR=ZZ(27) RETURN -C + END diff --git a/packages/seacas/libraries/mapvarlib/contrl.blk b/packages/seacas/libraries/mapvarlib/contrl.blk index 00814c53af61..8a03e3dbd822 100644 --- a/packages/seacas/libraries/mapvarlib/contrl.blk +++ b/packages/seacas/libraries/mapvarlib/contrl.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /CONTRL/ ISCHEM,IDEF,IACCU diff --git a/packages/seacas/libraries/mapvarlib/debg.blk b/packages/seacas/libraries/mapvarlib/debg.blk index dded694de9b8..119170ca07e7 100644 --- a/packages/seacas/libraries/mapvarlib/debg.blk +++ b/packages/seacas/libraries/mapvarlib/debg.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details common /DEBG/ idebug diff --git a/packages/seacas/libraries/mapvarlib/debug.f b/packages/seacas/libraries/mapvarlib/debug.f index 1ffd2bdf0951..4f02f2e1fd86 100644 --- a/packages/seacas/libraries/mapvarlib/debug.f +++ b/packages/seacas/libraries/mapvarlib/debug.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details subroutine debug(routine) diff --git a/packages/seacas/libraries/mapvarlib/ebbyeb.blk b/packages/seacas/libraries/mapvarlib/ebbyeb.blk index 8cfa53edcd22..38d3452a9858 100644 --- a/packages/seacas/libraries/mapvarlib/ebbyeb.blk +++ b/packages/seacas/libraries/mapvarlib/ebbyeb.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /EBBYEB/ NUMEBA,NUMEBB,NUMNDA,NUMNDB,ITYPE diff --git a/packages/seacas/libraries/mapvarlib/elgrad.f b/packages/seacas/libraries/mapvarlib/elgrad.f index 77414bd6c150..3a5294ee1172 100644 --- a/packages/seacas/libraries/mapvarlib/elgrad.f +++ b/packages/seacas/libraries/mapvarlib/elgrad.f @@ -1,29 +1,29 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= *DECK, ELGRAD SUBROUTINE ELGRAD(CNTRA,XA,YA,ZA,SOLEA,SOLGRA,ICHKEL,IDBLK, & ICONA,INVLN,INVCN,MAXLN,ISTP,ITT,iblk) -C + C ********************************************************************* -C + C Subroutine ELGRAD computes the coefficients of the gradient for C each variable within an element based on a constrained (to the C value of that element at its centroid) least squares fit to the C values in the surrounding elements. If not enough data is available C to perform the least squares is a direction, that coefficient is set C to zero. -C + C Calls subroutines CNTR, VOL, FLGRAD, ERROR -C + C Called by MAPVAR -C + C ********************************************************************* -C + C CNTRA a list of element centroid coordinates for all elements C in the current element block (1:numeba,1:ndima) C XA,YA,ZA nodal coordinates @@ -41,40 +41,39 @@ SUBROUTINE ELGRAD(CNTRA,XA,YA,ZA,SOLEA,SOLGRA,ICHKEL,IDBLK, C SHLNRM vector normal to current shell element (1:3) C ITT truth table C iblk element block being processed (not ID) -C -C + C ********************************************************************* -C + include 'aexds1.blk' include 'aexds2.blk' include 'amesh.blk' include 'ebbyeb.blk' include 'ex2tp.blk' include 'tapes.blk' -C + DIMENSION CNTRA(NUMEBA,*), SOLEA(NUMEBA,*) DIMENSION SOLGRA(NDIMA,NUMEBA,*), ICHKEL(*) DIMENSION XX(27), YY(27), ZZ(27), IELLST(100), SHLNRM(3) DIMENSION XA(*), YA(*), ZA(*), ICONA(NELNDA,*) DIMENSION INVCN(MAXLN,*),INVLN(*), ITT(NVAREL,*) -C + C ********************************************************************* -C + IF (ITYPE .EQ. 4 .OR. ITYPE .EQ. 5)THEN CALL ERROR('ELGRAD','ELEMENT TYPE',' ',ITYPE, & 'ELEMENT VARIABLE PROCESSING NOT YET IMPLEMENTED', & 0,' ',' ',1) END IF -C + C initialize ICHKEL array - only needs to be done once because C checkmark used is specific to each element -C + DO 10 I = 1, NUMEBA ICHKEL(I) = 0 10 CONTINUE -C + C load up CNTRA array - coordinates of mesh-A element centroids -C + C NNODES = NNELM(ITYPE) NNODES = NELNDA IF (ITYPE .EQ. 6) NNODES = 4 @@ -87,7 +86,7 @@ SUBROUTINE ELGRAD(CNTRA,XA,YA,ZA,SOLEA,SOLGRA,ICHKEL,IDBLK, ZZ(I) = 0. 30 CONTINUE CALL CNTR(ITYPE,XX,YY,ZZ,CNTRA(IEL,1),CNTRA(IEL,2),DUMMY) -C + 20 CONTINUE ELSE DO 40 IEL = 1, NUMEBA @@ -99,20 +98,20 @@ SUBROUTINE ELGRAD(CNTRA,XA,YA,ZA,SOLEA,SOLGRA,ICHKEL,IDBLK, 50 CONTINUE CALL CNTR(ITYPE,XX,YY,ZZ,CNTRA(IEL,1),CNTRA(IEL,2), & CNTRA(IEL,3)) -C + 40 CONTINUE END IF -C + C put element variables into SOLEA array -C + DO 80 IVAR = 1, NVAREL IF (ITT(IVAR,iblk) .EQ. 0)GO TO 80 CALL EXGEV(NTP2EX,ISTP,IVAR,IDBLK,NUMEBA,SOLEA(1,IVAR),IERR) -C + IF (NAMVAR(nvargp+IVAR)(1:6) .EQ. 'ELMASS') THEN -C + C replace element mass with density -C + DO 90 IEL = 1, NUMEBA DO 100 I = 1, NNODES XX(I) = XA(ICONA(I,IEL)) @@ -124,17 +123,17 @@ SUBROUTINE ELGRAD(CNTRA,XA,YA,ZA,SOLEA,SOLGRA,ICHKEL,IDBLK, END IF 100 CONTINUE CALL VOL(ITYPE,XX,YY,ZZ,VOLUME) -C + SOLEA(IEL,IVAR) = SOLEA(IEL,IVAR) / VOLUME 90 CONTINUE END IF 80 CONTINUE -C + C start element centroid based gradient calculation -C + C get list of elements that share at least one node with current C element being processed IELLST -C + DO 110 IEL = 1, NUMEBA ICOUNT = 0 ICHKEL(IEL) = IEL @@ -149,10 +148,10 @@ SUBROUTINE ELGRAD(CNTRA,XA,YA,ZA,SOLEA,SOLGRA,ICHKEL,IDBLK, END IF 130 CONTINUE 120 CONTINUE -C + C If shells element, compute element normal C use cross product of vectors from mid-sides -C + IF (ITYPE .EQ. 13)THEN XM1 = XA(ICONA(1,IEL)) - XA(ICONA(2,IEL)) YM1 = YA(ICONA(1,IEL)) - YA(ICONA(2,IEL)) @@ -176,12 +175,12 @@ SUBROUTINE ELGRAD(CNTRA,XA,YA,ZA,SOLEA,SOLGRA,ICHKEL,IDBLK, SHLNRM(2) = V21*V13 - V11*V23 SHLNRM(3) = V11*V22 - V21*V12 END IF -C + C compute gradients for element IEL and put in SOLGRA -C + CALL FLGRAD(IEL,ICOUNT,IELLST,CNTRA,SHLNRM,SOLEA,SOLGRA, & ITT,iblk) -C + 110 CONTINUE RETURN END diff --git a/packages/seacas/libraries/mapvarlib/elton0.f b/packages/seacas/libraries/mapvarlib/elton0.f index 77fe387130b2..cc7b6946c74e 100644 --- a/packages/seacas/libraries/mapvarlib/elton0.f +++ b/packages/seacas/libraries/mapvarlib/elton0.f @@ -1,16 +1,16 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================== *DECK, ELTON0 SUBROUTINE ELTON0(ICONA,NELTN,SOLEA,SOLENA, & IDBLK,XA,YA,ZA,ISTP,ITT,iblk) -C + C ********************************************************************* -C + C Subroutine ELTON0 extracts nodal values of element variables by C looping over each element and summing the value of the variable C at that element to each node in the connectivity list for that @@ -18,19 +18,19 @@ SUBROUTINE ELTON0(ICONA,NELTN,SOLEA,SOLENA, C by the number of elements that contributed to that node (resulting C in a nodal average of the element value.) This is done for the old C mesh elements and nodes to facilitate interpolation. -C + C Each element block must be processed independently in order to C avoid averaging element variables across material boundaries. C Note: the last set of DO loops acts over all nodes; to make sense C one element block must be completely processed before another C element block is sent into this subroutine. -C + C Calls subroutine VOL -C + c Called by MAPVAR -C + C ********************************************************************* -C + C ICONA mesh-A connectivity (1:nelnda,1:numeba) C NELTN number of elements tied to each node (1:nodesa) C SOLEA element variables (1:numeba,1:nvarel) @@ -41,57 +41,56 @@ SUBROUTINE ELTON0(ICONA,NELTN,SOLEA,SOLENA, C ISTP current time step C ITT truth table C iblk element block being processed (not ID) -C + C ********************************************************************* -C + include 'aexds1.blk' include 'aexds2.blk' include 'amesh.blk' include 'ebbyeb.blk' include 'ex2tp.blk' include 'tapes.blk' -C + DIMENSION ICONA(NELNDA,*), NELTN(*) DIMENSION SOLEA(NUMEBA,*), SOLENA(NODESA,NVAREL), ITT(NVAREL,*) DIMENSION XA(*), YA(*), ZA(*), XX(27), YY(27), ZZ(27) -C + C ********************************************************************* -C + IF (ITYPE .EQ. 4 .OR. ITYPE .EQ. 5)THEN CALL ERROR('ELTON0','ELEMENT TYPE',' ',ITYPE, & 'ELEMENT VARIABLE PROCESSING NOT YET IMPLEMENTED', & 0,' ',' ',1) END IF -C -C + DO I = 1, NODESA NELTN(I) = 0 DO J = 1, NVAREL SOLENA(I,J) = 0. end do end do -C + C NNODES = NNELM(ITYPE) NNODES = NELNDA IF (ITYPE .EQ. 6) NNODES = 4 DO NEL = 1, NUMEBA DO I = 1, NNODES -C + C number of elements associated with each node - used for C computing an average later on -C + NELTN(ICONA(I,NEL)) = NELTN(ICONA(I,NEL)) + 1 end do end do -C + DO IVAR = 1, NVAREL IF (ITT(IVAR,iblk) .EQ. 0)GO TO 40 CALL EXGEV(NTP2EX,ISTP,IVAR,IDBLK,NUMEBA,SOLEA(1,IVAR),IERR) -C + IF (NAMVAR(nvargp+IVAR)(1:6) .EQ. 'ELMASS') THEN -C + C replace element mass with nodal density for interpolation -C + DO IEL = 1, NUMEBA DO I = 1, NNODES XX(I) = XA(ICONA(I,IEL)) @@ -106,18 +105,18 @@ SUBROUTINE ELTON0(ICONA,NELTN,SOLEA,SOLENA, SOLEA(IEL,IVAR) = SOLEA(IEL,IVAR) / VOLUME end do END IF -C + C accumulate element variables to nodes -C + DO NEL = 1, NUMEBA DO I = 1, NNODES SOLENA(ICONA(I,NEL),IVAR) = & SOLENA(ICONA(I,NEL),IVAR) + SOLEA(NEL,IVAR) end do end do -C + C divide by number of elements contributing to each node (average) -C + DO I = 1, NODESA IF(NELTN(I) .NE. 0)THEN SOLENA(I,IVAR) = SOLENA(I,IVAR) / dble(NELTN(I)) diff --git a/packages/seacas/libraries/mapvarlib/elton1.f b/packages/seacas/libraries/mapvarlib/elton1.f index c870f23e9a1a..1edf7a0147a6 100644 --- a/packages/seacas/libraries/mapvarlib/elton1.f +++ b/packages/seacas/libraries/mapvarlib/elton1.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= @@ -10,26 +10,26 @@ SUBROUTINE ELTON1(CNTRA,SOLEA,SOLENA,IDBLK, & XA,YA,ZA,ICONA,NDLSTA, & INVLN,INVCN,MAXLN,ISTP, & ITT, iblk) -C + C ********************************************************************* -C + C Subroutine ELTON1 extracts nodal values of element variables by C c performing a weighted least squares fit (4 or more elements) or C c a triangulation (3 elements) over the centroids of the elements C c attached to the current node. -C + C Each element block must be processed independently in order to C avoid averaging element variables across material boundaries. C Note: the last set of DO loops acts over all nodes; to make sense C one element block must be completely processed before another C element block is sent into this subroutine. -C + C Calls subroutines CNTR, VOL, EXTQ, AVG, EXTH, ERROR -C + C Called by MAPVAR -C + C ********************************************************************* -C + C CNTRA a list of element centroid coordinates for all elements C in the current element block (1:ndima,1:numeba) C SOLEA element variables (1:numeba,1:nvarel) @@ -43,43 +43,42 @@ SUBROUTINE ELTON1(CNTRA,SOLEA,SOLENA,IDBLK, C MAXLN maximum number of elements connected to any node C ITT truth table C iblk element block being processed (not ID) -C + C** RELATIONSHIP BETWEEN NODAL IDENTIFICATIONS ** C IGLND = NDLSTA(INOD) = ICONA(NOWLND,INVCN(1,IGLND)) -C + C ********************************************************************* -C + include 'aexds1.blk' include 'aexds2.blk' include 'amesh.blk' include 'ebbyeb.blk' include 'ex2tp.blk' include 'tapes.blk' -C + DIMENSION CNTRA(NUMEBA,*), SOLEA(NUMEBA,*) DIMENSION SOLENA(NODESA,NVAREL) DIMENSION XX(27), YY(27), ZZ(27), IFCLND(4), IEGLND(2) DIMENSION XA(*), YA(*), ZA(*), ICONA(NELNDA,*), NDLSTA(*) DIMENSION INVCN(MAXLN,*), INVLN(*), ITT(NVAREL,*) -C + C ********************************************************************* -C + NXTLND = 0 IF (ITYPE .EQ. 4 .OR. ITYPE .EQ. 5)THEN CALL ERROR('ELTON1','ELEMENT TYPE',' ',ITYPE, & 'ELEMENT VARIABLE PROCESSING NOT YET IMPLEMENTED', & 0,' ',' ',1) END IF -C -C + DO I = 1, NODESA DO J = 1, NVAREL SOLENA(I,J) = 0. end do end do -C + C load up CNTRA array - coordinates of mesh-A element centroids -C + C NNODES = NNELM(ITYPE) NNODES = NELNDA IF (ITYPE .EQ. 6) NNODES = 4 @@ -105,17 +104,17 @@ SUBROUTINE ELTON1(CNTRA,SOLEA,SOLENA,IDBLK, & CNTRA(IEL,3)) 60 CONTINUE END IF -C + C put element variables into SOLEA array -C + DO 80 IVAR = 1, NVAREL IF (ITT(IVAR,iblk) .EQ. 0)GO TO 80 CALL EXGEV(NTP2EX,ISTP,IVAR,IDBLK,NUMEBA,SOLEA(1,IVAR),IERR) -C + IF (NAMVAR(nvargp+IVAR)(1:6) .EQ. 'ELMASS') THEN -C + C replace element mass with density -C + DO 90 IEL = 1, NUMEBA DO 100 I = 1, NNODES XX(I) = XA(ICONA(I,IEL)) @@ -131,32 +130,32 @@ SUBROUTINE ELTON1(CNTRA,SOLEA,SOLENA,IDBLK, 90 CONTINUE END IF 80 CONTINUE -C + C start least squares extrapolation -c + c First check element type c 3 = 4-node quad (2d) c 10 = 8-node hex (3d) -C + c******* -c + IF (ITYPE .EQ. 3)THEN -C + C Find the elements connected to the node. If fewer than 3 elements, C adjust search to find additional elements. If unable to get at C least 3 elements, must be treated as special case (just average C element values at node)(see below). -C + DO 110 INOD = 1, NUMNDA IGLND = NDLSTA(INOD) -C + C Process special case of only 1 element attached to node -C + IF (INVLN(IGLND) .EQ. 1)THEN -C + C Get node number diagonally across element, in most cases this C node will have 4 elements attached. -C + NXTLND = 0 DO 120 I = 1, NNODES IF (IGLND .EQ. ICONA(I,INVCN(1,IGLND))) THEN @@ -165,11 +164,11 @@ SUBROUTINE ELTON1(CNTRA,SOLEA,SOLENA,IDBLK, 120 CONTINUE IF (NXTLND .GT. NNODES) NXTLND = NXTLND - NNODES NXGLND = ICONA(NXTLND,INVCN(1,IGLND)) -c + C If 3 or more elements perform least c squares extrapolation to original node. If 2 or less elements, c average original element variables at original node -c + IF (INVLN(NXGLND) .GT. 2)THEN CALL EXTQ(IGLND,INVCN,MAXLN,NXGLND,INVLN(NXGLND), $ XA,YA, CNTRA,SOLEA,SOLENA,ITT,iblk) @@ -177,14 +176,14 @@ SUBROUTINE ELTON1(CNTRA,SOLEA,SOLENA,IDBLK, CALL AVG(IGLND,INVCN,MAXLN,INVLN(IGLND), $ SOLEA,SOLENA,ITT,iblk) END IF -C + C Process special case of only 2 elements attached to node -C + ELSE IF (INVLN(IGLND) .EQ. 2)THEN -c + c get second node that is shared by both elements. That is the c node on the other end of the shared element side. -c + DO I = 1, NNODES DO J = 1, NNODES IF(ICONA(I,INVCN(1,IGLND)) .NE. IGLND .AND. @@ -194,10 +193,10 @@ SUBROUTINE ELTON1(CNTRA,SOLEA,SOLENA,IDBLK, END IF end do end do -c + c If this second node has more than 2 elements, extrapolate. Otherwise c average. (at original node) -c + IF (INVLN(NXGLND) .GT. 2)THEN CALL EXTQ(IGLND,INVCN,MAXLN,NXGLND, $ INVLN(NXGLND), XA,YA,CNTRA, @@ -211,21 +210,20 @@ SUBROUTINE ELTON1(CNTRA,SOLEA,SOLENA,IDBLK, $ XA,YA,CNTRA,SOLEA,SOLENA,ITT,iblk) END IF 110 CONTINUE -c + c***** -c + ELSE IF (ITYPE .EQ. 10)THEN -c + c Do for 8-node hex in 3D, similar to 4-node quad in 2D above -c + DO 200 INOD = 1, NUMNDA IGLND = NDLSTA(INOD) -C + c First find elements connected to node - inverse connectivity -C -C + C Similar to 2D, process special cases -C + NOWLND = 0 DO 210 I = 1, NNODES IF (IGLND .EQ. ICONA(I,INVCN(1,IGLND)))THEN @@ -234,9 +232,9 @@ SUBROUTINE ELTON1(CNTRA,SOLEA,SOLENA,IDBLK, END IF 210 CONTINUE 220 CONTINUE -C + C Only 1 element connected to node, find node diagonally across hex -C + IF (INVLN(IGLND) .EQ. 1)THEN IF (NOWLND .EQ. 1 .OR. NOWLND .EQ. 2)THEN NXTLND = NOWLND + 6 @@ -248,7 +246,7 @@ SUBROUTINE ELTON1(CNTRA,SOLEA,SOLENA,IDBLK, NXTLND = NOWLND - 6 END IF NXGLND = ICONA(NXTLND,INVCN(1,IGLND)) -C + IF (INVLN(NXGLND) .GT. 5)THEN CALL EXTH(IGLND,INVCN,MAXLN,NXGLND, $ INVLN(NXGLND),XA,YA,ZA,CNTRA, @@ -258,10 +256,10 @@ SUBROUTINE ELTON1(CNTRA,SOLEA,SOLENA,IDBLK, $ SOLEA,SOLENA,ITT,iblk) END IF go to 200 -C + C Only 2 elements connected to node, find node diagonally across C shared face of 2 elements -C + ELSE IF (INVLN(IGLND) .EQ. 2)THEN DO 250 J = 1, NNODES IF (NOWLND .EQ. 1)THEN @@ -385,7 +383,7 @@ SUBROUTINE ELTON1(CNTRA,SOLEA,SOLENA,IDBLK, 250 CONTINUE 260 CONTINUE NXGLND = ICONA(NXTLND,INVCN(1,IGLND)) -C + IF (INVLN(NXGLND) .GT. 5)THEN CALL EXTH(IGLND,INVCN,MAXLN,NXGLND, $ INVLN(NXGLND),XA,YA,ZA,CNTRA, @@ -396,13 +394,13 @@ SUBROUTINE ELTON1(CNTRA,SOLEA,SOLENA,IDBLK, END IF go to 200 ELSE IF (INVLN(IGLND) .LT. 8)THEN -C + C If 3 to 7 elements are connected to a node, check for shared edge. C If all elements share an edge, transfer to other end of that edge. C Otherwise, extrapolate/average with what you have. -C + C Step-1 find shared face or edge between element-1 and element-2 -C + K = 0 DO 300 I = 1, NNODES DO 310 J = 1, NNODES @@ -414,13 +412,13 @@ SUBROUTINE ELTON1(CNTRA,SOLEA,SOLENA,IDBLK, END IF 310 CONTINUE 300 CONTINUE -C + C If K=4, shared face, process element 3 to determine shared edge C If K=6, or K=8, then there is a degenerate hex in the mesh - C don't worry how it is processed C If K=2, shared edge C IF K=1, no shared edge, extrapolate/average with elements you got -C + KC = 0 IF (K .EQ. 6 .OR. K .EQ. 8)THEN GO TO 380 @@ -497,16 +495,16 @@ SUBROUTINE ELTON1(CNTRA,SOLEA,SOLENA,IDBLK, & XA,YA,ZA,CNTRA,SOLEA,SOLENA,ITT,iblk) END IF 200 CONTINUE -c + c***** -c + ELSE IF (ITYPE .EQ. 6)THEN -c + c Do for tet what you do for hex just not the same way -c + DO 500 INOD = 1, NUMNDA IGLND = NDLSTA(INOD) -C + c First find elements connected to node - inverse connectivity C [NOTE: THIS DOES NOT SEEM TO BE USED...NOWLND?] DO 510 I = 1, NNODES @@ -516,10 +514,9 @@ SUBROUTINE ELTON1(CNTRA,SOLEA,SOLENA,IDBLK, END IF 510 CONTINUE 520 CONTINUE -C + C Less than 12 elements sharing IGLND, find the node of the C 12 elements that connects with the maximum number of elements -C C...Still not sure if this is correct for tets... NDMAX = IGLND diff --git a/packages/seacas/libraries/mapvarlib/error.f b/packages/seacas/libraries/mapvarlib/error.f index 774e22a19857..085e5d7fb35d 100644 --- a/packages/seacas/libraries/mapvarlib/error.f +++ b/packages/seacas/libraries/mapvarlib/error.f @@ -1,30 +1,30 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= *DECK,ERROR SUBROUTINE ERROR (SUBNAM,MESSAGE,LABEL1,I,LABEL2,J,LABEL3,WORD, 1 ISTOP) -C + C ****************************************************************** -C + C SUBROUTINE TO PRINT ERROR MESSAGE AND TERMINATE EXECUTION -C + C Calls subroutine CLSFIL -C + C Called by everything -C + C ****************************************************************** -C + CHARACTER*(*) SUBNAM,MESSAGE,LABEL1,LABEL2,LABEL3,WORD -C + include 'tapes.blk' -C + C ****************************************************************** -C + WRITE (NOUT, 60) WRITE (NTPOUT, 60) WRITE (NOUT, 10) SUBNAM @@ -47,13 +47,13 @@ SUBROUTINE ERROR (SUBNAM,MESSAGE,LABEL1,I,LABEL2,J,LABEL3,WORD, END IF WRITE (NOUT, 60) WRITE (NTPOUT, 60) -C + IF (ISTOP.EQ.0) RETURN -C + CALL CLSFIL -C + STOP 'ERROR' -C + 10 FORMAT (/,10X,' ERROR FOUND IN - ' ,A) 20 FORMAT (/,10X,' DESCRIPTION - ' ,A) 30 FORMAT (/,10X,' RELEVANT PARAMETERS - ') diff --git a/packages/seacas/libraries/mapvarlib/ex2tp.blk b/packages/seacas/libraries/mapvarlib/ex2tp.blk index 694066c0d11d..c813332db7cb 100644 --- a/packages/seacas/libraries/mapvarlib/ex2tp.blk +++ b/packages/seacas/libraries/mapvarlib/ex2tp.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /EX2TP/ NTP2EX,NTP3EX,NTP4EX diff --git a/packages/seacas/libraries/mapvarlib/exth.f b/packages/seacas/libraries/mapvarlib/exth.f index 0a168f07f834..f2222aa6fb47 100644 --- a/packages/seacas/libraries/mapvarlib/exth.f +++ b/packages/seacas/libraries/mapvarlib/exth.f @@ -1,29 +1,28 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================== SUBROUTINE EXTH(IGLND,INVCN,MAXLN,NOD,INVLEN,XA,YA,ZA,CNTRA, & SOLEA,SOLENA,ITT,iblk) -C + C************************************************************************ -C + C Subroutine EXTH sets up the matrix and vectors for a least squares C linear interpolation/extrapolation of element variable data to the C nodes for 3-D elements. This routine has been checked out for 8-node C hex and 4-node and 8-node (treated same as 4-node) tet elements. C In the special case of data from only 4 elements, the result is not C a true least squares fit in that the least squares error is zero. -C -C + C Calls subroutines FRGE & BS -C + C Called by ELTON3 -C + C************************************************************************ -C + C IGLND INT The global node number being processed C INVCN INT Inverse connectivity (1:maxln,1:numnda) C MAXLN INT The maximum number of elements connected to any node @@ -43,41 +42,41 @@ SUBROUTINE EXTH(IGLND,INVCN,MAXLN,NOD,INVLEN,XA,YA,ZA,CNTRA, C X REAL The solution vector - used in BS C G REAL Dummy vector - used in FRGE C F REAL The load vector for the least squares fit -C + C************************************************************************ -C + include 'aexds1.blk' include 'amesh.blk' include 'ebbyeb.blk' include 'tapes.blk' -C + DIMENSION INVCN(MAXLN,*),XA(*),YA(*),ZA(*) DIMENSION CNTRA(NUMEBA,*),SOLEA(NUMEBA,*) DIMENSION SOLENA(NODESA,NVAREL),ITT(NVAREL,*) DOUBLE PRECISION S(4,4),G(4),F(4),X(4) INTEGER L(4) -C + C************************************************************************ ICOP = 0 -C + C First check elements for coplanarity -C + C Construct a vector from first element centroid to second -C + VEC11 = CNTRA(INVCN(2,NOD),1) - CNTRA(INVCN(1,NOD),1) VEC12 = CNTRA(INVCN(2,NOD),2) - CNTRA(INVCN(1,NOD),2) VEC13 = CNTRA(INVCN(2,NOD),3) - CNTRA(INVCN(1,NOD),3) V1MAG = SQRT(VEC11*VEC11 + VEC12*VEC12 + VEC13*VEC13) -C + C Construct a vector from first element centroid to third -C + VEC21 = CNTRA(INVCN(3,NOD),1) - CNTRA(INVCN(1,NOD),1) VEC22 = CNTRA(INVCN(3,NOD),2) - CNTRA(INVCN(1,NOD),2) VEC23 = CNTRA(INVCN(3,NOD),3) - CNTRA(INVCN(1,NOD),3) -C + C X-product vector-1 with vector-2 to get normal to plane defined C by the two vectors then make a unit vector -C + VN1 = VEC12*VEC23 - VEC22*VEC13 VN2 = VEC13*VEC21 - VEC11*VEC23 VN3 = VEC11*VEC22 - VEC21*VEC12 @@ -85,13 +84,13 @@ SUBROUTINE EXTH(IGLND,INVCN,MAXLN,NOD,INVLEN,XA,YA,ZA,CNTRA, VN1 = VN1 / VNMAG VN2 = VN2 / VNMAG VN3 = VN3 / VNMAG -C + C Dot product of normal vector with vectors from first element C centroid to the remaining element centroids. If dot product C is too small, data is coplanar - try the next vector. C If dot product more then 0.1 times the vector, data is not C coplanar, set ICOP to 1 and get on with it. -C + DO 5 I = 4, INVLEN VEC1 = CNTRA(INVCN(I,NOD),1) - CNTRA(INVCN(1,NOD),1) VEC2 = CNTRA(INVCN(I,NOD),2) - CNTRA(INVCN(1,NOD),2) @@ -107,22 +106,22 @@ SUBROUTINE EXTH(IGLND,INVCN,MAXLN,NOD,INVLEN,XA,YA,ZA,CNTRA, go to 6 END IF 5 CONTINUE -C + C Zero matrix -C + 6 CONTINUE DO I = 1,4 DO J = 1,4 S(I,J) = 0.D+00 end do end do -C + C Branch on coplanar data vs truly 3-d data -C + IF (ICOP .EQ. 1)THEN -C + C Set up matrix for linear fit -C + S(1,1) = DBLE(INVLEN) DO 20 I = 1, INVLEN S(1,2) = S(1,2)+DBLE(XA(IGLND) - CNTRA(INVCN(I,NOD),1)) @@ -147,13 +146,13 @@ SUBROUTINE EXTH(IGLND,INVCN,MAXLN,NOD,INVLEN,XA,YA,ZA,CNTRA, S(3,2) = S(2,3) S(4,2) = S(2,4) S(4,3) = S(3,4) -C + C Forward Gauss elimination (Kincaid pg. 220) (double precision) -C + CALL FRGE(4,S,L,G) -C + C Set up load vectors - number of element variables -C + DO 30 IVAR = 1, NVAREL IF (ITT(IVAR,iblk) .EQ. 0)GO TO 30 F(1) = 0.D+00 @@ -169,29 +168,29 @@ SUBROUTINE EXTH(IGLND,INVCN,MAXLN,NOD,INVLEN,XA,YA,ZA,CNTRA, F(4) = F(4) + DBLE(SOLEA(INVCN(I,NOD),IVAR) * & (ZA(IGLND) - CNTRA(INVCN(I,NOD),3))) 40 CONTINUE -C + C Back substitution (Kincaid pg. 223) (double precision) -C + CALL BS(4,S,F,L,X) -C + C Fill in nodal element value array (SOLENA) C Note: X and Y distances in S and F are centered on node being C interpolated to (IGLND), thus X, Y, Z are zero in the eq. C Value = X(1) + X(2) * X + X(3) * Y + X(4) * Z -C + SOLENA(IGLND,IVAR) = SNGL(X(1)) 30 CONTINUE -C + ELSE IF (ICOP .EQ. 0)THEN -C + C first unit vector -C + V11 = VEC11 / V1MAG V12 = VEC12 / V1MAG V13 = VEC13 / V1MAG -C + C compute 2nd (orthogonal) vector in plane - make it a unit vector -C + V21 = V12 * VN3 - VN2 * V13 V22 = VN1 * V13 - V11 * VN3 V23 = V11 * VN2 - VN1 * V12 @@ -199,20 +198,20 @@ SUBROUTINE EXTH(IGLND,INVCN,MAXLN,NOD,INVLEN,XA,YA,ZA,CNTRA, V21 = V21 / V2MAG V22 = V22 / V2MAG V23 = V23 / V2MAG -C + C set up matrix for least squares fit -C + S(1,1) = DBLE(INVLEN) DO 50 I = 1, INVLEN -C + C rotate coords -C + XORI = XA(IGLND)-CNTRA(INVCN(I,NOD),1) YORI = YA(IGLND)-CNTRA(INVCN(I,NOD),2) ZORI = ZA(IGLND)-CNTRA(INVCN(I,NOD),3) XP = XORI*V11 + YORI*V12 + ZORI*V13 YP = XORI*V21 + YORI*V22 + ZORI*V23 -C + S(1,2) = S(1,2)+DBLE(XP) S(1,3) = S(1,3)+DBLE(YP) S(2,2) = S(2,2)+DBLE(XP * XP) @@ -229,13 +228,13 @@ SUBROUTINE EXTH(IGLND,INVCN,MAXLN,NOD,INVLEN,XA,YA,ZA,CNTRA, S(4,3) = 0.D+00 S(4,2) = 0.D+00 S(4,1) = 0.D+00 -C + C Forward Gauss elimination (Kincaid pg. 220) (double precision) -C + CALL FRGE(4,S,L,G) -C + C Set up load vectors - number of element variables -C + DO 60 IVAR = 1, NVAREL IF (ITT(IVAR,iblk) .EQ. 0)GO TO 60 F(1) = 0.D+00 @@ -252,26 +251,26 @@ SUBROUTINE EXTH(IGLND,INVCN,MAXLN,NOD,INVLEN,XA,YA,ZA,CNTRA, F(2) = F(2) + DBLE(SOLEA(INVCN(I,NOD),IVAR) * XP) F(3) = F(3) + DBLE(SOLEA(INVCN(I,NOD),IVAR) * YP) 70 CONTINUE -C + C Back substitution (Kincaid pg. 223) (double precision) -C + CALL BS(4,S,F,L,X) -C + C Ordinaly you would need to rotate back into cartesian coords C however, we only need X(1) so there is no need to rotate here -C + C X2 = SNGL(X(2))*V11 + SNGL(X(3))*V21 C X3 = SNGL(X(2))*V12 + SNGL(X(3))*V22 C X4 = SNGL(X(2))*V13 + SNGL(X(3))*V23 C X(2) = X2 C X(3) = X3 C X(4) = X4 -C + C Fill in nodal element value array (SOLENA) C Note: X and Y distances in S and F are centered on node being C interpolated to (IGLND), thus X, Y, Z are zero in the eq. C Value = X(1) + X(2) * X + X(3) * Y + X(4) * Z -C + SOLENA(IGLND,IVAR) = SNGL(X(1)) 60 CONTINUE END IF diff --git a/packages/seacas/libraries/mapvarlib/extq.f b/packages/seacas/libraries/mapvarlib/extq.f index ef82ffd65cb5..1a60130ef8d8 100644 --- a/packages/seacas/libraries/mapvarlib/extq.f +++ b/packages/seacas/libraries/mapvarlib/extq.f @@ -1,27 +1,27 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================== SUBROUTINE EXTQ(IGLND,INVCN,MAXLN,NOD,INVLEN,XA,YA,CNTRA,SOLEA, & SOLENA,ITT,iblk) -C + C************************************************************************ -C + C Subroutine EXTQ sets up the matrix and vectors for a least squares C linear interpolation/extrapolation of element variable data to the C nodes for a 4-node quad element. In the special case of data from C only 3 elements, the result is not least squares fit but a C triangularization. -C + C Calls subroutines FRGE & BS -C + C Called by ELTON3 -C + C************************************************************************ -C + C IGLND INT The global node number being processed C INVCN INT The inverse connectivity (1:maxln,1:numnda) C MAXLN INT The maximum number of elements connected to any node @@ -40,32 +40,32 @@ SUBROUTINE EXTQ(IGLND,INVCN,MAXLN,NOD,INVLEN,XA,YA,CNTRA,SOLEA, C X REAL The solution vector - used in BS C G REAL Dummy vector - used in FRGE C F REAL The load vector for the least squares fit -C + C************************************************************************ -C + include 'aexds1.blk' include 'amesh.blk' include 'ebbyeb.blk' include 'tapes.blk' -C + DIMENSION INVCN(MAXLN,*),XA(*),YA(*) DIMENSION CNTRA(NUMEBA,*),SOLEA(NUMEBA,*) DIMENSION SOLENA(NODESA,NVAREL), ITT(NVAREL,*) DOUBLE PRECISION S(3,3),G(3),F(3),X(3) INTEGER L(3) -C + C************************************************************************ -C + C Zero matrix -C + DO I = 1,3 DO J = 1,3 S(I,J) = 0.D+00 end do end do -C + C Set up matrix for linear fit -C + S(1,1) = DBLE(INVLEN) DO I = 1, INVLEN S(1,2) = S(1,2) + DBLE(XA(IGLND) - CNTRA(INVCN(I,NOD),1)) @@ -80,13 +80,13 @@ SUBROUTINE EXTQ(IGLND,INVCN,MAXLN,NOD,INVLEN,XA,YA,CNTRA,SOLEA, S(2,1) = S(1,2) S(3,1) = S(1,3) S(3,2) = S(2,3) -C + C Forward Gauss elimination (Kincaid pg. 220) (double precision) -C + CALL FRGE(3,S,L,G) -C + C Set up load vectors - number of element variables -C + DO IVAR = 1, NVAREL IF (ITT(IVAR,iblk) .EQ. 0)GO TO 30 F(1) = 0.D+00 @@ -99,16 +99,16 @@ SUBROUTINE EXTQ(IGLND,INVCN,MAXLN,NOD,INVLEN,XA,YA,CNTRA,SOLEA, F(3) = F(3) + DBLE(SOLEA(INVCN(I,NOD),IVAR) * & (YA(IGLND) - CNTRA(INVCN(I,NOD),2))) end do -C + C Back substitution (Kincaid pg. 223) (double precision) -C + CALL BS(3,S,F,L,X) -C + C Fill in nodal element value array (SOLENA) C Note: X and Y distances in S and F are centered on node being C interpolated to (IGLND), thus X and Y are zero in the eq. C Value = X(1) + X(2) * X + X(3) * Y -C + SOLENA(IGLND,IVAR) = SNGL(X(1)) end do 30 CONTINUE diff --git a/packages/seacas/libraries/mapvarlib/exts.f b/packages/seacas/libraries/mapvarlib/exts.f index b918720620d6..aa6fbf2160bd 100644 --- a/packages/seacas/libraries/mapvarlib/exts.f +++ b/packages/seacas/libraries/mapvarlib/exts.f @@ -1,27 +1,27 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================== SUBROUTINE EXTS(IGLND,INVCN,MAXLN,NXGLND,INVLEN,XA,YA,ZA, & CNTRA,SOLEA,SOLENA,ITT,iblk) -C +C C************************************************************************ -C +C C Subroutine EXTS sets up the matrix and vectors for a least squares C linear interpolation/extrapolation of element variable data to the C nodes for a 4-node quad element. In the special case of data from C only 3 elements, the result is not least squares fit but a C triangularization. -C +C C Calls subroutines FRGE & BS -C +C C Called by SELTN3 -C +C C************************************************************************ -C +C C IGLND INT The global node number being processed C INVCN INT Inverse connectivity (1:maxln,1:numnda) C MAXLN INT The maximum number of elements connected to any node @@ -41,14 +41,14 @@ SUBROUTINE EXTS(IGLND,INVCN,MAXLN,NXGLND,INVLEN,XA,YA,ZA, C X REAL The solution vector - used in BS C G REAL Dummy vector - used in FRGE C F REAL The load vector for the least squares fit -C +C C************************************************************************ -C +C include 'aexds1.blk' include 'amesh.blk' include 'ebbyeb.blk' include 'tapes.blk' -C +C DIMENSION INVCN(MAXLN,*),XA(*),YA(*),ZA(*) DIMENSION CNTRA(NUMEBA,*),SOLEA(NUMEBA,*) DIMENSION SOLENA(NODESA,NVAREL), ITT(NVAREL,*) @@ -56,29 +56,29 @@ SUBROUTINE EXTS(IGLND,INVCN,MAXLN,NXGLND,INVLEN,XA,YA,ZA, C DIMENSION ZLC(8) DOUBLE PRECISION S(3,3),G(3),F(3),X(3) INTEGER L(3) -C +C C************************************************************************ -C +C C Zero matrix -C +C DO I = 1,3 IFRST(I) = I DO J = 1,3 S(I,J) = 0.D+00 end do end do -c +c c find distance from interpolation point to element centroids -c +c DO I = 1, INVLEN A = XA(IGLND) - CNTRA(INVCN(I,NXGLND),1) B = YA(IGLND) - CNTRA(INVCN(I,NXGLND),2) C = ZA(IGLND) - CNTRA(INVCN(I,NXGLND),3) RLENTH(I) = SQRT(A*A + B*B + C*C) end do -C +C C find the three closest element centroids -C +C IF (INVLEN .EQ. 3) THEN DO I = 1, 2 IF (RLENTH(I) .GT. RLENTH(I+1))THEN @@ -92,7 +92,7 @@ SUBROUTINE EXTS(IGLND,INVCN,MAXLN,NXGLND,INVLEN,XA,YA,ZA, IFRST(1) = IFRST(2) IFRST(2) = ITEMP END IF -C +C ELSE DO I = 2, INVLEN IF (RLENTH(I) .LT. RLENTH(IFRST(1))) IFRST(1) = I @@ -115,11 +115,11 @@ SUBROUTINE EXTS(IGLND,INVCN,MAXLN,NXGLND,INVLEN,XA,YA,ZA, 60 CONTINUE end do END IF -C +C C use three closest element centroids to define a plane C establish coordinate system on this plane centered on C interpolation point -C +C A11 = CNTRA(INVCN(IFRST(2),NXGLND),1) - & CNTRA(INVCN(IFRST(1),NXGLND),1) A12 = CNTRA(INVCN(IFRST(2),NXGLND),2) - @@ -130,7 +130,7 @@ SUBROUTINE EXTS(IGLND,INVCN,MAXLN,NXGLND,INVLEN,XA,YA,ZA, A11 = A11/RLN A12 = A12/RLN A13 = A13/RLN -C +C A31 = (CNTRA(INVCN(IFRST(2),NXGLND),2) - & CNTRA(INVCN(IFRST(1),NXGLND),2)) & * (CNTRA(INVCN(IFRST(3),NXGLND),3) - @@ -159,11 +159,11 @@ SUBROUTINE EXTS(IGLND,INVCN,MAXLN,NXGLND,INVLEN,XA,YA,ZA, A31 = A31/RLN A32 = A32/RLN A33 = A33/RLN -C +C A21 = A32*A13 - A33*A12 A22 = A11*A33 - A31*A13 A23 = A31*A12 - A11*A32 -C +C DO I = 1, INVLEN XLC(I) = A11 * (CNTRA(INVCN(I,NXGLND),1) - XA(IGLND)) & + A12 * (CNTRA(INVCN(I,NXGLND),2) - YA(IGLND)) @@ -172,10 +172,10 @@ SUBROUTINE EXTS(IGLND,INVCN,MAXLN,NXGLND,INVLEN,XA,YA,ZA, & + A22 * (CNTRA(INVCN(I,NXGLND),2) - YA(IGLND)) & + A23 * (CNTRA(INVCN(I,NXGLND),3) - ZA(IGLND)) end do -C -C +C +C C Set up matrix for linear fit -C +C S(1,1) = INVLEN DO I = 1, INVLEN S(1,2) = S(1,2) + DBLE(XLC(I)) @@ -187,13 +187,13 @@ SUBROUTINE EXTS(IGLND,INVCN,MAXLN,NXGLND,INVLEN,XA,YA,ZA, S(2,1) = S(1,2) S(3,1) = S(1,3) S(3,2) = S(2,3) -C +C C Forward Gauss elimination (Kincaid pg. 220) (double precision) -C +C CALL FRGE(3,S,L,G) -C +C C Set up load vectors - number of element variables -C +C DO IVAR = 1, NVAREL IF (ITT(IVAR,iblk) .EQ. 0)GO TO 90 F(1) = 0.D+00 @@ -204,16 +204,16 @@ SUBROUTINE EXTS(IGLND,INVCN,MAXLN,NXGLND,INVLEN,XA,YA,ZA, F(2) = F(2) + DBLE(SOLEA(INVCN(I,NXGLND),IVAR) * XLC(I)) F(3) = F(3) + DBLE(SOLEA(INVCN(I,NXGLND),IVAR) * YLC(I)) end do -C +C C Back substitution (Kincaid pg. 223) (double precision) -C +C CALL BS(3,S,F,L,X) -C +C C Fill in nodal element value array (SOLENA) C Note: X and Y distances in S and F are centered on node being C interpolated, thus X and Y are zero in the eq. C Value = X(1) + X(2) * X + X(3) * Y -C +C SOLENA(IGLND,IVAR) = SNGL(X(1)) 90 CONTINUE end do diff --git a/packages/seacas/libraries/mapvarlib/flgrad.f b/packages/seacas/libraries/mapvarlib/flgrad.f index e62e72d75f0e..b8385349ab66 100644 --- a/packages/seacas/libraries/mapvarlib/flgrad.f +++ b/packages/seacas/libraries/mapvarlib/flgrad.f @@ -1,16 +1,16 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= *DECK, FLGRAD SUBROUTINE FLGRAD(IEL,ICOUNT,IELLST,CNTRA,SHLNRM,SOLEA,SOLGRA, & ITT,iblk) -C + C ********************************************************************* -C + C Subroutine FLGRAD performs the actual computation of the gradient C coefficients using the stuff that was set up in ELGRAD. C Start by translating into isoparametric coords (very helpful for @@ -18,13 +18,13 @@ SUBROUTINE FLGRAD(IEL,ICOUNT,IELLST,CNTRA,SHLNRM,SOLEA,SOLGRA, C subsequent interpolation. C Then do constrained least sqares to f=a0+a1eta+a2ksi+a3phi to C compute a1, a2, and a3 and stuff results into SOLGRA -C + C Calls subroutines ERROR -C + C Called by ELGRAD -C + C ********************************************************************* -C + C IEL the current element being worked C ICOUNT the number of elements that share a node with IEL C IELLST local list of elements that share a node with element @@ -38,22 +38,20 @@ SUBROUTINE FLGRAD(IEL,ICOUNT,IELLST,CNTRA,SHLNRM,SOLEA,SOLGRA, C iblk element block being processed (not ID) C IRED reduction in dimensionality of data C IRED=0 full, IRED=1 colinear, IRED=2 coplanar -C -C + C ********************************************************************* -C + include 'aexds1.blk' include 'amesh.blk' include 'ebbyeb.blk' -C DIMENSION CNTRA(NUMEBA,*), SHLNRM(3), SOLEA(NUMEBA,*) DIMENSION SOLGRA(NDIMA,NUMEBA,*), IELLST(100), ITT(NVAREL,*) DOUBLE PRECISION S(3,3), G(3), F(3), X(3) INTEGER L(3) -C + C ********************************************************************* -C + IF (ITYPE .EQ. 4 .OR. ITYPE .EQ. 5)THEN CALL ERROR('FLGRAD','ELEMENT TYPE',' ',ITYPE, & 'ELEMENT VARIABLE PROCESSING NOT YET IMPLEMENTED', @@ -65,14 +63,14 @@ SUBROUTINE FLGRAD(IEL,ICOUNT,IELLST,CNTRA,SHLNRM,SOLEA,SOLGRA, S(I,J) = 0.0D0 end do end do -C + C ********************************************************************* IF (ITYPE .EQ. 13)THEN -C + C Shell element processing (quasi 2-D) -C + C If no elements connected, there can be no gradient -C + IF (ICOUNT .EQ. 0)THEN DO 110 IVAR = 1, NVAREL IF (ITT(IVAR,iblk) .EQ. 0)GO TO 110 @@ -81,19 +79,19 @@ SUBROUTINE FLGRAD(IEL,ICOUNT,IELLST,CNTRA,SHLNRM,SOLEA,SOLGRA, SOLGRA(3,IEL,IVAR) = 0. 110 CONTINUE GO TO 500 -C + C If only one element connected, data is colinear C If two elements connected, data may be colinear -C + ELSE IF (ICOUNT .EQ. 1)THEN IRED = 1 ELSE IF (ICOUNT .EQ. 2)THEN -C + C Check for colinearity. Create unit vector to 1st connected element C centroid. Create unit vector to 2nd connected element centroid. Dot C 1st unit vector with 2nd unit vector. If dot product is greater than C 0.9, then data is colinear (IRED = 1) -C + V11 = CNTRA(IELLST(1),1) - CNTRA(IEL,1) V12 = CNTRA(IELLST(1),2) - CNTRA(IEL,2) V13 = CNTRA(IELLST(1),3) - CNTRA(IEL,3) @@ -115,10 +113,10 @@ SUBROUTINE FLGRAD(IEL,ICOUNT,IELLST,CNTRA,SHLNRM,SOLEA,SOLGRA, END IF IF (IRED .EQ. 1)THEN C Colinear data -C + C rotate into vector C NOTE: for colinearity, the XD coord is also the magnitude -C + V11 = CNTRA(IELLST(1),1) - CNTRA(IEL,1) V12 = CNTRA(IELLST(1),2) - CNTRA(IEL,2) V13 = CNTRA(IELLST(1),3) - CNTRA(IEL,3) @@ -126,7 +124,7 @@ SUBROUTINE FLGRAD(IEL,ICOUNT,IELLST,CNTRA,SHLNRM,SOLEA,SOLGRA, V11 = V11 / V1MAG V12 = V12 / V1MAG V13 = V13 / V1MAG -C + S1 = 0. DO 120 I = 1, ICOUNT XORI = CNTRA(IELLST(I),1) - CNTRA(IEL,1) @@ -135,7 +133,7 @@ SUBROUTINE FLGRAD(IEL,ICOUNT,IELLST,CNTRA,SHLNRM,SOLEA,SOLGRA, XD = XORI*V11 + YORI*V12 +ZORI*V13 S1 = S1 + (XD*XD) 120 CONTINUE -C + DO 130 IVAR = 1, NVAREL IF (ITT(IVAR,iblk) .EQ. 0)GO TO 130 F1 = 0. @@ -152,11 +150,11 @@ SUBROUTINE FLGRAD(IEL,ICOUNT,IELLST,CNTRA,SHLNRM,SOLEA,SOLGRA, SOLGRA(3,IEL,IVAR) = X1D * V13 130 CONTINUE ELSE -C + C Rotate into plane of element and treat as if 2-D -C + C first unit vector -C + V11 = CNTRA(IELLST(1),1) - CNTRA(IEL,1) V12 = CNTRA(IELLST(1),2) - CNTRA(IEL,2) V13 = CNTRA(IELLST(1),3) - CNTRA(IEL,3) @@ -164,9 +162,9 @@ SUBROUTINE FLGRAD(IEL,ICOUNT,IELLST,CNTRA,SHLNRM,SOLEA,SOLGRA, V11 = V11 / VMAG V12 = V12 / VMAG V13 = V13 / VMAG -C + C compute 2nd (orthogonal) vector in plane - make it a unit vector -C + V21 = V12 * SHLNRM(3) - SHLNRM(2) * V13 V22 = SHLNRM(1) * V13 - V11 * SHLNRM(3) V23 = V11 * SHLNRM(2) - SHLNRM(1) * V12 @@ -174,19 +172,19 @@ SUBROUTINE FLGRAD(IEL,ICOUNT,IELLST,CNTRA,SHLNRM,SOLEA,SOLGRA, V21 = V21 / VMAG2 V22 = V22 / VMAG2 V23 = V23 / VMAG2 -C + C Fill up matrix for constrained linear least squares -C + DO 150 I = 1, ICOUNT -C + C rotate coords -C + XORI = CNTRA(IELLST(I),1) - CNTRA(IEL,1) YORI = CNTRA(IELLST(I),2) - CNTRA(IEL,2) ZORI = CNTRA(IELLST(I),3) - CNTRA(IEL,3) XD = XORI*V11 + YORI*V12 + ZORI*V13 YD = XORI*V21 + YORI*V22 + ZORI*V23 -C + S(1,1) = S(1,1) + DBLE(XD * XD) S(1,2) = S(1,2) + DBLE(XD * YD) S(2,2) = S(2,2) + DBLE(YD * YD) @@ -197,13 +195,13 @@ SUBROUTINE FLGRAD(IEL,ICOUNT,IELLST,CNTRA,SHLNRM,SOLEA,SOLGRA, S(3,3) = 1.D+00 S(3,2) = 0.D+00 S(3,1) = 0.D+00 -C + C Forward Gauss -C + CALL FRGE(3,S,L,G) -C + C Set up load vectors -C + DO 160 IVAR = 1, NVAREL IF (ITT(IVAR,iblk) .EQ. 0)GO TO 160 F(1) = 0.D+00 @@ -215,32 +213,32 @@ SUBROUTINE FLGRAD(IEL,ICOUNT,IELLST,CNTRA,SHLNRM,SOLEA,SOLGRA, ZORI = CNTRA(IELLST(I),3) - CNTRA(IEL,3) XD = XORI*V11 + YORI*V12 + ZORI*V13 YD = XORI*V21 + YORI*V22 + ZORI*V23 -C + F(1) = F(1) + DBLE(XD * (SOLEA(IELLST(I),IVAR) & - SOLEA(IEL,IVAR))) F(2) = F(2) + DBLE(YD * (SOLEA(IELLST(I),IVAR) & - SOLEA(IEL,IVAR))) 170 CONTINUE -C + C Back substitution and load gradient coefficients into SOLGRA -C + CALL BS(3,S,F,L,X) -C + C Rotate back and fill up gradient array -C + SOLGRA(1,IEL,IVAR) = SNGL(X(2))*V11 + SNGL(X(3))*V21 SOLGRA(2,IEL,IVAR) = SNGL(X(2))*V12 + SNGL(X(3))*V22 SOLGRA(3,IEL,IVAR) = SNGL(X(2))*V13 + SNGL(X(3))*V23 160 CONTINUE END IF -C + C ********************************************************************* ELSE IF (ITYPE .EQ. 3)THEN -C + C Quad element processing (2-D) -C + C If no elements connected, there can be no gradient -C + IF (ICOUNT .EQ. 0)THEN DO 210 IVAR = 1, NVAREL IF (ITT(IVAR,iblk) .EQ. 0)GO TO 210 @@ -248,19 +246,19 @@ SUBROUTINE FLGRAD(IEL,ICOUNT,IELLST,CNTRA,SHLNRM,SOLEA,SOLGRA, SOLGRA(2,IEL,IVAR) = 0. 210 CONTINUE GO TO 500 -C + C If only one element connected, data is colinear C If two elements connected, data may be colinear -C + ELSE IF (ICOUNT .EQ. 1)THEN IRED = 1 ELSE IF (ICOUNT .EQ. 2)THEN -C + C Check for colinearity. Create unit vector to 1st connected element C centroid. Create unit vector to 2nd connected element centroid. Dot 1st C unit vector with 2nd unit vector. If mag of dot product is greater than C 0.9, then data is colinear (IRED = 1) -C + V11 = CNTRA(IELLST(1),1) - CNTRA(IEL,1) V12 = CNTRA(IELLST(1),2) - CNTRA(IEL,2) V1MAG = SQRT(V11*V11 + V12*V12) @@ -277,20 +275,20 @@ SUBROUTINE FLGRAD(IEL,ICOUNT,IELLST,CNTRA,SHLNRM,SOLEA,SOLGRA, END IF END IF IF(IRED .EQ. 1)THEN -C + C Colinear data C Note: constraint at X=0 implies a0 so only 1 equation C remains to solve for a1 -C + C rotate into vector C NOTE: for colinearity, the XD coord is also the magnitude -C + V11 = CNTRA(IELLST(1),1) - CNTRA(IEL,1) V12 = CNTRA(IELLST(1),2) - CNTRA(IEL,2) VMAG = SQRT(V11*V11 + V12*V12) V11 = V11 / VMAG V12 = V12 / VMAG -C + S1 = 0. DO 220 I = 1, ICOUNT XORI = CNTRA(IELLST(I),1) - CNTRA(IEL,1) @@ -298,7 +296,7 @@ SUBROUTINE FLGRAD(IEL,ICOUNT,IELLST,CNTRA,SHLNRM,SOLEA,SOLGRA, XD = XORI*V11 + YORI*V12 S1 = S1 + (XD*XD) 220 CONTINUE -C + DO 230 IVAR = 1, NVAREL IF (ITT(IVAR,iblk) .EQ. 0)GO TO 230 F1 = 0. @@ -313,11 +311,11 @@ SUBROUTINE FLGRAD(IEL,ICOUNT,IELLST,CNTRA,SHLNRM,SOLEA,SOLGRA, SOLGRA(2,IEL,IVAR) = X1D * V12 230 CONTINUE ELSE IF(IRED .EQ. 0)THEN -C + C Full 2-D data -C + C Fill up matrix for constrained linear least squares -C + DO 250 I = 1, ICOUNT XD = (CNTRA(IELLST(I),1) - CNTRA(IEL,1)) YD = (CNTRA(IELLST(I),2) - CNTRA(IEL,2)) @@ -331,13 +329,13 @@ SUBROUTINE FLGRAD(IEL,ICOUNT,IELLST,CNTRA,SHLNRM,SOLEA,SOLGRA, S(3,3) = 1.D+00 S(3,2) = 0.D+00 S(3,1) = 0.D+00 -C + C Forward Gauss -C + CALL FRGE(3,S,L,G) -C + C Set up load vectors -C + DO 260 IVAR = 1, NVAREL IF (ITT(IVAR,iblk) .EQ. 0)GO TO 260 F(1) = 0.D+00 @@ -351,25 +349,25 @@ SUBROUTINE FLGRAD(IEL,ICOUNT,IELLST,CNTRA,SHLNRM,SOLEA,SOLGRA, F(2) = F(2) + DBLE(YD * (SOLEA(IELLST(I),IVAR) & - SOLEA(IEL,IVAR))) 270 CONTINUE -C + C Back substitution and load gradient coefficients into SOLGRA -C + CALL BS(3,S,F,L,X) -C + C Fill up gradient array -C + SOLGRA(1,IEL,IVAR) = SNGL(X(1)) SOLGRA(2,IEL,IVAR) = SNGL(X(2)) 260 CONTINUE END IF -C + C ********************************************************************* ELSE IF (ITYPE .EQ. 10 .OR. ITYPE .EQ. 6)THEN -C + C Hex element processing (3-D) -C + C If no elements connected, there can be no gradient -C + IF (ICOUNT .EQ. 0)THEN DO 310 IVAR = 1, NVAREL IF (ITT(IVAR,iblk) .EQ. 0)GO TO 310 @@ -378,19 +376,19 @@ SUBROUTINE FLGRAD(IEL,ICOUNT,IELLST,CNTRA,SHLNRM,SOLEA,SOLGRA, SOLGRA(3,IEL,IVAR) = 0. 310 CONTINUE GO TO 500 -C + C If only one element connected, data is colinear C If two elements connected, data may be colinear -C + ELSE IF (ICOUNT .EQ. 1)THEN IRED = 1 ELSE IF (ICOUNT .EQ. 2)THEN -C + C Check for colinearity. Create unit vector to 1st connected element C centroid. Create unit vector to 2nd connected element centroid. Dot 1st C unit vector with 2nd unit vector. If mag of dot product is greater than C 0.9, then data is colinear (IRED = 1) -C + V11 = CNTRA(IELLST(1),1) - CNTRA(IEL,1) V12 = CNTRA(IELLST(1),2) - CNTRA(IEL,2) V13 = CNTRA(IELLST(1),3) - CNTRA(IEL,3) @@ -410,43 +408,43 @@ SUBROUTINE FLGRAD(IEL,ICOUNT,IELLST,CNTRA,SHLNRM,SOLEA,SOLGRA, IRED = 1 ELSE IRED = 2 -C + C X-product vector-1 with vector-2 to get normal to plane defined C by the two vectors; then make it a unit vector -C + VN1 = V12*V23 - V22*V13 VN2 = V13*V21 - V11*V23 VN3 = V11*V22 - V21*V12 VNMAG = SQRT(VN1*VN1 + VN2*VN2 + VN3*VN3) END IF ELSE IF (ICOUNT .GT. 2 .AND. ICOUNT .LT. 11)THEN -C + C Check for coplanarity C vector to 1st connected element -C + V11 = CNTRA(IELLST(1),1) - CNTRA(IEL,1) V12 = CNTRA(IELLST(1),2) - CNTRA(IEL,2) V13 = CNTRA(IELLST(1),3) - CNTRA(IEL,3) -C + C Construct a vector to second connected element -C + ICK = 2 311 CONTINUE V21 = CNTRA(IELLST(ICK),1) - CNTRA(IEL,1) V22 = CNTRA(IELLST(ICK),2) - CNTRA(IEL,2) V23 = CNTRA(IELLST(ICK),3) - CNTRA(IEL,3) -C + C X-product vector-1 with vector-2 to get normal to plane defined C by the two vectors; then make it a unit vector -C + VN1 = V12*V23 - V22*V13 VN2 = V13*V21 - V11*V23 VN3 = V11*V22 - V21*V12 VNMAG = SQRT(VN1*VN1 + VN2*VN2 + VN3*VN3) -C + C check for colinearity of elements C if colinear, get new element and try again -C + IF (VNMAG .LT. 1.E-13)THEN ICK = 3 GO TO 311 @@ -454,13 +452,13 @@ SUBROUTINE FLGRAD(IEL,ICOUNT,IELLST,CNTRA,SHLNRM,SOLEA,SOLGRA, VN1 = VN1 / VNMAG VN2 = VN2 / VNMAG VN3 = VN3 / VNMAG -C + C Dot product of normal vector with unit vectors C to the remaining element centroids. If dot product C is too small, set IRED=2 and try the next vector. C If dot product is more than 0.1, data is not coplanar C set IRED = 0 and get on with it. -C + DO 320 I = 3, ICOUNT V1 = CNTRA(IELLST(I),1) - CNTRA(IEL,1) V2 = CNTRA(IELLST(I),2) - CNTRA(IEL,2) @@ -477,17 +475,17 @@ SUBROUTINE FLGRAD(IEL,ICOUNT,IELLST,CNTRA,SHLNRM,SOLEA,SOLGRA, GO TO 330 END IF 320 CONTINUE -C + 330 CONTINUE END IF -C + IF (IRED .EQ. 1)THEN -C + C Colinear data -C + C rotate into vector C NOTE: for colinearity, the XD coord is also the magnitude -C + V11 = CNTRA(IELLST(1),1) - CNTRA(IEL,1) V12 = CNTRA(IELLST(1),2) - CNTRA(IEL,2) V13 = CNTRA(IELLST(1),3) - CNTRA(IEL,3) @@ -495,7 +493,7 @@ SUBROUTINE FLGRAD(IEL,ICOUNT,IELLST,CNTRA,SHLNRM,SOLEA,SOLGRA, V11 = V11 / V1MAG V12 = V12 / V1MAG V13 = V13 / V1MAG -C + S1 = 0. DO 340 I = 1, ICOUNT XORI = CNTRA(IELLST(I),1) - CNTRA(IEL,1) @@ -504,7 +502,7 @@ SUBROUTINE FLGRAD(IEL,ICOUNT,IELLST,CNTRA,SHLNRM,SOLEA,SOLGRA, XD = XORI*V11 + YORI*V12 +ZORI*V13 S1 = S1 + (XD*XD) 340 CONTINUE -C + DO 350 IVAR = 1, NVAREL IF (ITT(IVAR,iblk) .EQ. 0)GO TO 350 F1 = 0. @@ -520,13 +518,13 @@ SUBROUTINE FLGRAD(IEL,ICOUNT,IELLST,CNTRA,SHLNRM,SOLEA,SOLGRA, SOLGRA(2,IEL,IVAR) = X1D * V12 SOLGRA(3,IEL,IVAR) = X1D * V13 350 CONTINUE -C + ELSE IF (IRED .EQ. 2)THEN -C + C Coplanar data -C + C first unit vector -C + V11 = CNTRA(IELLST(1),1) - CNTRA(IEL,1) V12 = CNTRA(IELLST(1),2) - CNTRA(IEL,2) V13 = CNTRA(IELLST(1),3) - CNTRA(IEL,3) @@ -534,9 +532,9 @@ SUBROUTINE FLGRAD(IEL,ICOUNT,IELLST,CNTRA,SHLNRM,SOLEA,SOLGRA, V11 = V11 / V1MAG V12 = V12 / V1MAG V13 = V13 / V1MAG -C + C compute 2nd (orthogonal) vector in plane - make it a unit vector -C + V21 = V12 * VN3 - VN2 * V13 V22 = VN1 * V13 - V11 * VN3 V23 = V11 * VN2 - VN1 * V12 @@ -544,19 +542,19 @@ SUBROUTINE FLGRAD(IEL,ICOUNT,IELLST,CNTRA,SHLNRM,SOLEA,SOLGRA, V21 = V21 / V2MAG V22 = V22 / V2MAG V23 = V23 / V2MAG -C + C Fill up matrix for constrained linear least squares -C + DO 370 I = 1, ICOUNT -C + C rotate coords -C + XORI = CNTRA(IELLST(I),1) - CNTRA(IEL,1) YORI = CNTRA(IELLST(I),2) - CNTRA(IEL,2) ZORI = CNTRA(IELLST(I),3) - CNTRA(IEL,3) XD = XORI*V11 + YORI*V12 + ZORI*V13 YD = XORI*V21 + YORI*V22 + ZORI*V23 -C + S(1,1) = S(1,1) + DBLE(XD * XD) S(1,2) = S(1,2) + DBLE(XD * YD) S(2,2) = S(2,2) + DBLE(YD * YD) @@ -567,13 +565,13 @@ SUBROUTINE FLGRAD(IEL,ICOUNT,IELLST,CNTRA,SHLNRM,SOLEA,SOLGRA, S(3,3) = 1.D+00 S(3,2) = 0.D+00 S(3,1) = 0.D+00 -C + C Forward Gauss -C + CALL FRGE(3,S,L,G) -C + C Set up load vectors -C + DO 380 IVAR = 1, NVAREL IF (ITT(IVAR,iblk) .EQ. 0)GO TO 380 F(1) = 0.D+00 @@ -585,40 +583,40 @@ SUBROUTINE FLGRAD(IEL,ICOUNT,IELLST,CNTRA,SHLNRM,SOLEA,SOLGRA, ZORI = CNTRA(IELLST(I),3) - CNTRA(IEL,3) XD = XORI*V11 + YORI*V12 + ZORI*V13 YD = XORI*V21 + YORI*V22 + ZORI*V23 -C + F(1) = F(1) + DBLE(XD * (SOLEA(IELLST(I),IVAR) & - SOLEA(IEL,IVAR))) F(2) = F(2) + DBLE(YD * (SOLEA(IELLST(I),IVAR) & - SOLEA(IEL,IVAR))) 390 CONTINUE -C + C Back substitution and load gradient coefficients into SOLGRA -C + CALL BS(3,S,F,L,X) -C + C Rotate back and fill up gradient array -C + SOLGRA(1,IEL,IVAR) = SNGL(X(1))*V11 + SNGL(X(2))*V21 SOLGRA(2,IEL,IVAR) = SNGL(X(1))*V12 + SNGL(X(2))*V22 SOLGRA(3,IEL,IVAR) = SNGL(X(1))*V13 + SNGL(X(2))*V23 380 CONTINUE -C + ELSE -C + C Fully 3-D data (IRED=0) -C + C Zero the matrix C Note: constraint at X=Y=Z=0 implies a0 so only 3 equations C remain to solve for a1, a2, and a3 -C + DO I = 1, 3 DO J = 1, 3 S(I,J) = 0.D+00 end do end do -C + C Fill up matrix for constrained linear least squares -C + DO 410 I = 1, ICOUNT XD = CNTRA(IELLST(I),1) - CNTRA(IEL,1) YD = CNTRA(IELLST(I),2) - CNTRA(IEL,2) @@ -633,13 +631,13 @@ SUBROUTINE FLGRAD(IEL,ICOUNT,IELLST,CNTRA,SHLNRM,SOLEA,SOLGRA, S(2,1) = S(1,2) S(3,1) = S(1,3) S(3,2) = S(2,3) -C + C Forward Gauss -C + CALL FRGE(3,S,L,G) -C + C Set up load vectors -C + DO 420 IVAR = 1, NVAREL IF (ITT(IVAR,iblk) .EQ. 0)GO TO 420 F(1) = 0.D+00 @@ -656,13 +654,13 @@ SUBROUTINE FLGRAD(IEL,ICOUNT,IELLST,CNTRA,SHLNRM,SOLEA,SOLGRA, F(3) = F(3) + DBLE(ZD * (SOLEA(IELLST(I),IVAR) & - SOLEA(IEL,IVAR))) 430 CONTINUE -C + C Back substitution and load gradient coefficients into SOLGRA -C + CALL BS(3,S,F,L,X) -C + C Fill up gradient array -C + SOLGRA(1,IEL,IVAR) = SNGL(X(1)) SOLGRA(2,IEL,IVAR) = SNGL(X(2)) SOLGRA(3,IEL,IVAR) = SNGL(X(3)) diff --git a/packages/seacas/libraries/mapvarlib/frge.f b/packages/seacas/libraries/mapvarlib/frge.f index 5610cc65b907..70537178bc6b 100644 --- a/packages/seacas/libraries/mapvarlib/frge.f +++ b/packages/seacas/libraries/mapvarlib/frge.f @@ -1,25 +1,25 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C====================================================================== SUBROUTINE FRGE(N,S,L,G) -C + C********************************************************************** -C + C Subroutine BS does the back substitution for the soultion of the C local least squares extrapolation technique for element variables C from their element centroid location to a nodal location. C The least squares solution is started by a Gauss elimination in C subroutine FRGE. The process is started in subroutines EXTQ for C 4-node quads or EXTH for 8-node hexes. -C + C Called by EXTQ & EXTH -C + C********************************************************************** -C + C N INT number of equations - 1 + the number of dimensions C S REAL the coefficient matrix C G REAL dummy array @@ -29,12 +29,11 @@ SUBROUTINE FRGE(N,S,L,G) C RMAX REAL dummy variable - used in the solution scheme C XMULT REAL dummy variable - used in the solution scheme C R REAL dummy variable - used in the solution scheme -C + C********************************************************************** DOUBLE PRECISION S(N,N),G(N),SMAX,RMAX,XMULT,R INTEGER L(N) -C -C + DO 3 I = 1,N L(I) = I SMAX = 0.D+00 diff --git a/packages/seacas/libraries/mapvarlib/header.blk b/packages/seacas/libraries/mapvarlib/header.blk index 69d257cf3233..3d2b6be89cfd 100644 --- a/packages/seacas/libraries/mapvarlib/header.blk +++ b/packages/seacas/libraries/mapvarlib/header.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /HEADER/ HED diff --git a/packages/seacas/libraries/mapvarlib/hexsrc.f b/packages/seacas/libraries/mapvarlib/hexsrc.f index 46615b5d00fb..528ee66e5b5f 100644 --- a/packages/seacas/libraries/mapvarlib/hexsrc.f +++ b/packages/seacas/libraries/mapvarlib/hexsrc.f @@ -1,35 +1,35 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details SUBROUTINE HEXSRC( * NDIM, NPTS, NPSRF, NFSRF, NISR, * NRSR, NRSS, XYZE, XYZP, LS, * ISRCHR, RSRCHR, IPT, IELT, IERR ) -C + C----------------------------------------------------------------------- -C + C DESCRIPTION: -C + C THIS SUBROUTINE CALCULATES THE CLOSEST POINT PROBLEM C BETWEEN PAIRS OF POINTS AND SURFACES. -C + C----------------------------------------------------------------------- -C + C FORMAL PARAMETERS -C + C MEMORY : P=PERMANENT, S=SCRATCH C NAME : IMPLICIT A-H,O-Z REAL, I-N INTEGER C TYPE : INPUT_STATUS/OUTPUT_STATUS (I=INPUT,O=OUTPUT,P=PASSED, C U=UNMODIFIED,-=UNDEFINED) C DESCRIPTION : DESCRIPTION OF VARIABLE -C + C----------------------------------------------------------------------- -C + C CALLING ARGUMENTS -C + C MEMORY NAME TYPE DESCRIPTION C --- ---- --- ----------- C P NDIM I/U DIMENSION OF PROBLEM=3 @@ -47,25 +47,25 @@ SUBROUTINE HEXSRC( C P RSRCHR I/O REAL SEARCH RESULTS C P IPT I/U POINT PAIRED WITH SURFACE LISTED IN IELT C P IELT I/U SURFACE PAIRED WITH POINT LISTED IN IPT -C + C----------------------------------------------------------------------- -C + include 'toldat.blk' include 'tapes.blk' -C + C INPUT/OUTPUT ARRAYS DIMENSION * XYZP(NPTS,NDIM) ,XYZE(NPSRF,NDIM) ,LS(8,NFSRF) , * ISRCHR(NISR,NPTS) ,RSRCHR(NRSR,NPTS) DIMENSION XX(27), YY(27), ZZ(27) -C + IF( NISR .LT. 1 .OR. NRSR .LT. 3 .OR. NRSS .LT. 10 )THEN IERR = 1 RETURN ENDIF -C + C check for Mesh-B point coincident with node of element in Mesh-A -C + SIDE1 = (XYZE(LS(1,IELT),1)-XYZE(LS(2,IELT),1))**2 & + (XYZE(LS(1,IELT),2)-XYZE(LS(2,IELT),2))**2 & + (XYZE(LS(1,IELT),3)-XYZE(LS(2,IELT),3))**2 @@ -106,26 +106,26 @@ SUBROUTINE HEXSRC( & ,SIDE9,SIDE10,SIDE11,SIDE12) SIDMIN = MIN(SIDE1,SIDE2,SIDE3,SIDE4,SIDE5,SIDE6,SIDE7,SIDE8 & ,SIDE9,SIDE10,SIDE11,SIDE12) -C + COTEST = EPS*EPS*EPS*SIDMAX PRITST = COTEST -C + C test value for coincident nodes - used for mapping and checking C for prism element -C + C first check if recipient node is coincident with donor node C if so no need to do anything else -C + DO 110 I = 1, 8 A = XYZE(LS(I,IELT),1) - XYZP(IPT,1) B = XYZE(LS(I,IELT),2) - XYZP(IPT,2) C = XYZE(LS(I,IELT),3) - XYZP(IPT,3) DIST = A**2 + B**2 + C**2 IF (DIST .LT. COTEST)THEN -C + C coincident node, so fill search results arrays C no need to check for better search result -C + INODE = I ISRCHR(1,IPT) = IELT CALL NODE (10,INODE,RSRCHR(1,IPT),RSRCHR(2,IPT), @@ -133,14 +133,14 @@ SUBROUTINE HEXSRC( GO TO 100 END IF 110 CONTINUE -C + C check is hex degenerate -C + IF (SIDMIN .LT. COTEST)THEN -C + C hex is degenerate, check is it a prism C if prism, build prism jacobian -C + IF (SIDE1 .LT. PRITST .AND. SIDE3 .LT. PRITST)THEN XX(1) = XYZE(LS(3,IELT),1) XX(2) = XYZE(LS(7,IELT),1) @@ -389,14 +389,14 @@ SUBROUTINE HEXSRC( GO TO 100 END IF 200 CONTINUE -C + C process prism element -C + SG = 0. TG = 0. RG = 0. ITER = 0 -c + 210 CONTINUE CALL JACOBN (8,XX,YY,ZZ,SG,TG,RG,A11,A12,A13,A21,A22,A23, & A31,A32,A33,F1,F2,F3) @@ -411,7 +411,7 @@ SUBROUTINE HEXSRC( C diverging Newton iteration GOTO 100 END IF -C + AI11 = (A22*A33 - A23*A32)/DETA AI12 = -(A12*A33 - A32*A13)/DETA AI13 = (A23*A12 - A13*A22)/DETA @@ -421,14 +421,14 @@ SUBROUTINE HEXSRC( AI31 = (A21*A32 - A31*A22)/DETA AI32 = -(A11*A32 - A31*A12)/DETA AI33 = (A11*A22 - A12*A21)/DETA -C + FS = F1 - XYZP(IPT,1) FT = F2 - XYZP(IPT,2) FR = F3 - XYZP(IPT,3) SNEW = SG - (AI11*FS + AI12*FT + AI13*FR) TNEW = TG - (AI21*FS + AI22*FT + AI23*FR) RNEW = RG - (AI31*FS + AI32*FT + AI33*FR) -C + ITER = ITER + 1 DS = ABS(SNEW-SG) DT = ABS(TNEW-TG) @@ -444,17 +444,17 @@ SUBROUTINE HEXSRC( * ( ABS( RG) .GT. 1E+06)) GOTO 100 GO TO 210 ELSE -C + C hex element C compute isoparametric coordinates for hex - Use Newton's method -C + SG = 0. TG = 0. RG = 0. ITER = 0 -C + C Build Jacobian and invert -C + DO 120 I = 1, 8 XX(I) = XYZE(LS(I,IELT),1) YY(I) = XYZE(LS(I,IELT),2) @@ -473,7 +473,7 @@ SUBROUTINE HEXSRC( & 0,' ',' ',0) GOTO 100 END IF -C + AI11 = (A22*A33 - A23*A32)/DETA AI12 = -(A12*A33 - A32*A13)/DETA AI13 = (A23*A12 - A13*A22)/DETA @@ -483,14 +483,14 @@ SUBROUTINE HEXSRC( AI31 = (A21*A32 - A31*A22)/DETA AI32 = -(A11*A32 - A31*A12)/DETA AI33 = (A11*A22 - A12*A21)/DETA -C + FS = F1 - XYZP(IPT,1) FT = F2 - XYZP(IPT,2) FR = F3 - XYZP(IPT,3) SNEW = SG - (AI11*FS + AI12*FT + AI13*FR) TNEW = TG - (AI21*FS + AI22*FT + AI23*FR) RNEW = RG - (AI31*FS + AI32*FT + AI33*FR) -C + ITER = ITER + 1 DS = ABS(SNEW-SG) DT = ABS(TNEW-TG) @@ -506,25 +506,24 @@ SUBROUTINE HEXSRC( * ( ABS( RG) .GT. 1E+06)) GOTO 100 GO TO 130 END IF -C -C + 300 CONTINUE -C + C Newton converged, load up search results arrays if appropriate -C + IF (ABS(SNEW) .LT. STRLMT .AND. ABS(TNEW) .LT. STRLMT .AND. & ABS(RNEW) .LT. STRLMT)THEN -C + C Search was adequate -C + FTEST = MAX(ABS(RSRCHR(1,IPT)),ABS(RSRCHR(2,IPT)), & ABS(RSRCHR(3,IPT))) FCOMP = MAX(ABS(SNEW),ABS(TNEW),ABS(RNEW)) IF (FTEST .GT. FCOMP .OR. ISRCHR(1,IPT) .EQ. 0)THEN -C + C New search is better or first find, replace search results -C + ISRCHR(1,IPT) = IELT RSRCHR(1,IPT) = SNEW RSRCHR(2,IPT) = TNEW diff --git a/packages/seacas/libraries/mapvarlib/inielt.f b/packages/seacas/libraries/mapvarlib/inielt.f index 9d68c14d35ed..a5ca6287a628 100644 --- a/packages/seacas/libraries/mapvarlib/inielt.f +++ b/packages/seacas/libraries/mapvarlib/inielt.f @@ -1,13 +1,13 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details SUBROUTINE INIELT(SOLEB,IVAR,TIMES,ISTP,IDBLK,CENTER,DUME) -C + C ********************************************************************* -C + C INIELT initializes element variable values based on TIME, ELEMENT C BLOCK, VARIABLE NAME, COORDINATE, etc. By default, element variable C values are set to zero. It is intended that the user rewrite this @@ -15,21 +15,20 @@ SUBROUTINE INIELT(SOLEB,IVAR,TIMES,ISTP,IDBLK,CENTER,DUME) C being solved. This is the preferred method to handle element variable C assignment for recipient mesh nodes that lie outside the boundary C of the donor mesh. -C -C + C Called by INTRPE, SINTPE, TRANAB, STRAN -C + C ********************************************************************* -C + C SOLEB REAL Array of element variable values C (1:numebb,1:nvarel) C TIMES REAL Array of times (1:ntimes) C IDBLK INT The element block I. D. C CENTER REAL Array of element centroid coordinates C (1;numebb,1:3) -C + C ********************************************************************* -C + include 'exodusII.inc' include 'aexds1.blk' @@ -38,31 +37,31 @@ SUBROUTINE INIELT(SOLEB,IVAR,TIMES,ISTP,IDBLK,CENTER,DUME) DIMENSION SOLEB(NUMEBB,NVAREL), TIMES(*), CENTER(NUMEBB,*) DIMENSION DUME(*) -C + C ********************************************************************* -C + C Code to help you find some potentially useful stuff C The actual time (real number) C TIME = TIMES(ISTP) -C + C The pointer into VARNAM to get the variable name being processed C INAM = IVAR + NVARGP -C + C The name of the variable (character) being processed C NAME = NAMVAR(INAM) -C + C The coordinates of the point (element centroid) -C + C XP = CENTER(IELT,1) C YP = CENTER(IELT,2) C ZP = CENTER(IELT,3) -C + C By default, set value to 0. C User to replace this with whatever code he wishes. -C + DO 10 IELT = 1, NUMEBB SOLEB(IELT,IVAR) = VALINI 10 CONTINUE -C + RETURN END diff --git a/packages/seacas/libraries/mapvarlib/ininod.f b/packages/seacas/libraries/mapvarlib/ininod.f index 4a2c30f6c2e5..19e4023256db 100644 --- a/packages/seacas/libraries/mapvarlib/ininod.f +++ b/packages/seacas/libraries/mapvarlib/ininod.f @@ -1,14 +1,14 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details SUBROUTINE ININOD(SOLNB,IVAR,TIMES,ISTP,IDBLK,NDLSTB,XB,YB,ZB, & SN) -C + C ********************************************************************* -C + C ININOD initializes nodal variable values based on TIME, ELEMENT C BLOCK, VARIABLE NAME, COORDINATE, etc. By default, nodal variable C values are set to zero. It is intended that the user rewrite this @@ -16,12 +16,11 @@ SUBROUTINE ININOD(SOLNB,IVAR,TIMES,ISTP,IDBLK,NDLSTB,XB,YB,ZB, C being solved. This is the preferred method to handle nodal variable C assignment for recipient mesh nodes that lie outside the boundary C of the donor mesh. -C -C + C Called by INTRPN, SINTPN -C + C ********************************************************************* -C + C SOLNB REAL Array of nodal variable values C (1:nodesb,1:nvarnp,1:ntimes) C IVAR INT Position of variable in SOLNB array @@ -34,38 +33,37 @@ SUBROUTINE ININOD(SOLNB,IVAR,TIMES,ISTP,IDBLK,NDLSTB,XB,YB,ZB, C YB REAL Array of Y-coordinates (1:nodesb) C ZB REAL Array of Z-coordinates (1:nodesb) C SN REAL Dummy array to store values from MESH-B -C + C ********************************************************************* -C + include 'exodusII.inc' -C + include 'aexds1.blk' include 'bmesh.blk' include 'ebbyeb.blk' include 'ex2tp.blk' include 'inival.blk' -C + DIMENSION SOLNB(NODESB,NVARNP), TIMES(*), NDLSTB(*) DIMENSION XB(*), YB(*), ZB(*) DIMENSION SN(*) -C + C ********************************************************************* -C + C Code to help you find some potentially useful stuff C The actual time (real number) C TIME = TIMES(ISTP) -C + C The pointer into VARNAM to get the variable name being processed C INAM = IVAR + NVARGP + NVAREL -C + C The name of the variable (character) being processed C NAME = NAMVAR(INAM) -C + C INOD = NDLSTB(I) -C + C Set value of node-NDLSTB(I); variable-IVAR to 0. by default. C User to replace this with whatever code he wishes. -C C ... Note: The exgnv step assumes that variable 'ivar' on the mesh C database is the same variable as 'ivar' on the results diff --git a/packages/seacas/libraries/mapvarlib/inival.blk b/packages/seacas/libraries/mapvarlib/inival.blk index 3fc31c6556c8..90fbf28fabc5 100644 --- a/packages/seacas/libraries/mapvarlib/inival.blk +++ b/packages/seacas/libraries/mapvarlib/inival.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /INIVAL/ VALINI diff --git a/packages/seacas/libraries/mapvarlib/intrp3.f b/packages/seacas/libraries/mapvarlib/intrp3.f index d8008e97f8c0..74f63e06138a 100644 --- a/packages/seacas/libraries/mapvarlib/intrp3.f +++ b/packages/seacas/libraries/mapvarlib/intrp3.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= @@ -9,18 +9,18 @@ SUBROUTINE INTRP3 (CNTRA,CNTRB,IELPT,SOLEB,SOLEA,SOLGRA,IDBLK, & ITT,iblk,TIMES,ISTP,IST,INSUB,ICOMPL, & XB,YB,ZB,ICONB,DUME) -C + C ****************************************************************** -C + C SUBROUTINE TO CONTROL INTERPOLATION OF ELEMENT VARIABLES C FROM MESH-A TO MESH-B FOR SCHEME 3, A ELEMENT CENTROID BASED C INTERPOLATION SCHEME. PHYSICAL CONSTRAINTS ARE APPLIED TO C THE INTERPOLATED RESULTS AND THEN THEY ARE WRITTEN TO MESH-C -C + C Called by MAPVAR -C + C ****************************************************************** -C + C CNTRA REAL Centroidal coords for Mesh-A C CNTRB REAL Centroidal coords for Mesh-B C IELPT INT The element in Mesh-A within which the point @@ -37,9 +37,9 @@ SUBROUTINE INTRP3 (CNTRA,CNTRB,IELPT,SOLEB,SOLEA,SOLGRA,IDBLK, C IST INT Time step if multiple time steps are in use C INSUB INT Entry into subroutine; 1-first time in; >1-second,etc C ICOMPL INT Map completion; 0-incomplete; 1-complete -C + C ****************************************************************** -C + include 'aexds1.blk' include 'aexds2.blk' include 'amesh.blk' @@ -47,70 +47,70 @@ SUBROUTINE INTRP3 (CNTRA,CNTRB,IELPT,SOLEB,SOLEA,SOLGRA,IDBLK, include 'ebbyeb.blk' include 'ex2tp.blk' include 'tapes.blk' -C + DIMENSION CNTRB(NUMEBB,*), CNTRA(NUMEBA,*), IELPT(*) DIMENSION SOLEB(NUMEBB,*), SOLEA(NUMEBA,*) DIMENSION SOLGRA(NDIMA,NUMEBA,*) DIMENSION ITT(NVAREL,*), ICONB(NELNDB,*) DIMENSION XX(27), YY(27), ZZ(27), XB(*), YB(*), ZB(*) DIMENSION DUME(*) -C + C ****************************************************************** -C + IROT = 0 IROTF = 0 DO 40 IVAR=1,NVAREL IF (ITT(IVAR,iblk) .EQ. 0)GO TO 40 -C + C Initialize SOLEB if first time in subroutine for this element block C After first time into subroutine C retrieve SOLEB from storage in EXODUS -C + IF (INSUB .EQ. 1) THEN CALL INIELT(SOLEB,IVAR,TIMES,ISTP,IDBLK,CENTER,DUME) ELSE CALL EXGEV(NTP4EX,IST,IVAR,IDBLK,NUMEBB,SOLEB(1,IVAR),IERR) END IF -C + C Loop on elements in recipient mesh -C + DO 30 I=1,NUMEBB IF (IELPT(I) .NE. 0)THEN -C + C Distance in cartesian coordinates between mesh-A and mesh-B centroid -C + XC = CNTRB(I,1) - CNTRA(IELPT(I),1) YC = CNTRB(I,2) - CNTRA(IELPT(I),2) ZC = 0. IF (NDIMB .EQ. 3)ZC = CNTRB(I,3) - CNTRA(IELPT(I),3) -C + C Evaluate interpolation -C + SOLEB(I,IVAR) = SOLEA(IELPT(I),IVAR) & + SOLGRA(1,IELPT(I),IVAR) * XC & + SOLGRA(2,IELPT(I),IVAR) * YC & + SOLGRA(3,IELPT(I),IVAR) * ZC END IF 30 CONTINUE -C + C If there is more searching to do (i.e. many blocks to one) C use EXODUS as temporary storage C don't bother to perform needed adjustments yet -C + IF (ICOMPL .NE. 1)THEN CALL EXPEV(NTP4EX,IST,IVAR,IDBLK,NUMEBB,SOLEB(1,IVAR),IERR) ELSE -C + C write element vars out to EXODUS data base (now is convenient) -C + C+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ C ELMASS is special -C + IF (NAMVAR(nvargp+IVAR)(1:6) .EQ. 'ELMASS')THEN -C + C ELMASS was changed to nodal density prior to processing. C need to go back from density to element mass now -C + C NNODES=NNELM(ITYPE) NNODES = NELNDB IF (ITYPE .EQ. 6) NNODES = 4 @@ -128,23 +128,22 @@ SUBROUTINE INTRP3 (CNTRA,CNTRB,IELPT,SOLEB,SOLEA,SOLGRA,IDBLK, SOLEB(IEL,IVAR) = SOLEB(IEL,IVAR) * VOLUME 100 CONTINUE END IF -C + C**************************************************************** C apply constraints to variables here as applicable -C -C + C Plastic strain (EQPS) must greater than or equal to 0. -C + IF (NAMVAR(nvargp+IVAR)(1:4) .EQ. 'EQPS')THEN DO 110 IEL = 1, NUMEBB IF (SOLEB(IEL,IVAR) .LT. 0.)THEN SOLEB(IEL,IVAR) = 0. END IF 110 CONTINUE -C + C Hourglass forces and bulk viscosity have no meaning other than on C the mesh from which they originated, just set them to zero. -C + ELSE IF (NAMVAR(nvargp+IVAR)(1:2) .EQ. 'HG' .OR. & NAMVAR(nvargp+IVAR)(1:5) .EQ. 'BULKQ')THEN DO 120 IEL = 1, NUMEBB @@ -164,13 +163,13 @@ SUBROUTINE INTRP3 (CNTRA,CNTRB,IELPT,SOLEB,SOLEA,SOLGRA,IDBLK, C END IF C ??? CONTINUE c************************************************************************ -c + c######################################################################## c the rotation tensor is special -c + c just store pointers to the rotation tensor components for later c processing. do nothing here -c + IF (NAMVAR(NVARGP+IVAR)(1:8) .EQ. 'COSTHETA')THEN ICOS = IVAR IROT = IROT + 1 @@ -217,17 +216,17 @@ SUBROUTINE INTRP3 (CNTRA,CNTRB,IELPT,SOLEB,SOLEA,SOLGRA,IDBLK, GO TO 10 END IF c######################################################################## -C + C write element variables -C + CALL EXPEV(NTP4EX,IST,IVAR,IDBLK,NUMEBB,SOLEB(1,IVAR),IERR) 10 CONTINUE -c + c######################################################################## c now fix-up rotations - rotation matrix must have mag=1 -c + c some simple error checking -c + IF (NDIMB .EQ. 2)THEN IF (IROT .EQ. 2 .AND. & ICOS .NE. 0 .AND. ISIN .NE. 0) THEN @@ -243,15 +242,14 @@ SUBROUTINE INTRP3 (CNTRA,CNTRB,IELPT,SOLEB,SOLEA,SOLGRA,IDBLK, & IERR) IROTF = 1 END IF -C -C + ELSE IF (IROT .EQ. 9 .AND. IROTF .EQ. 0 .AND. IR11 .NE. 0 & .AND. IR21 .NE. 0 .AND. IR31 .NE. 0 .AND. IR12 .NE. 0 & .AND. IR22 .NE. 0 .AND. IR32 .NE. 0 .AND. IR13 .NE. 0 & .AND. IR23 .NE. 0 .AND. IR33 .NE. 0)THEN -C + C compute magnitude of matrix -C + DO 280 IEL = I, NUMEBB RMAG=SQRT(SOLEB(IEL,IR11)*SOLEB(IEL,IR22)*SOLEB(IEL,IR33) & + SOLEB(IEL,IR21)*SOLEB(IEL,IR32)*SOLEB(IEL,IR13) @@ -269,7 +267,7 @@ SUBROUTINE INTRP3 (CNTRA,CNTRB,IELPT,SOLEB,SOLEA,SOLGRA,IDBLK, SOLEB(IEL,IR13) = SOLEB(IEL,IR13) / RMAG SOLEB(IEL,IR23) = SOLEB(IEL,IR23) / RMAG SOLEB(IEL,IR33) = SOLEB(IEL,IR33) / RMAG -c + 280 CONTINUE CALL EXPEV(NTP4EX,IST,IR11,IDBLK,NUMEBB,SOLEB(1,IR11), & IERR) @@ -301,6 +299,6 @@ SUBROUTINE INTRP3 (CNTRA,CNTRB,IELPT,SOLEB,SOLEA,SOLGRA,IDBLK, & 'THIS IS ONLY A WARNING',' ',0) END IF c######################################################################## -C + RETURN END diff --git a/packages/seacas/libraries/mapvarlib/intrpe.f b/packages/seacas/libraries/mapvarlib/intrpe.f index acd6b7228e00..3376ea5226cc 100644 --- a/packages/seacas/libraries/mapvarlib/intrpe.f +++ b/packages/seacas/libraries/mapvarlib/intrpe.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= @@ -10,20 +10,20 @@ SUBROUTINE INTRPE (ICONA,SOLENA,IELPT,STRPT, & SOLEB,IDBLK,XB,YB,ZB, & ICONB,ITT,IBLK, TIMES, & CENTER,ISTP,IST,INSUB,ICOMPL,DUME) -C + C ****************************************************************** -C + C SUBROUTINE TO CONTROL INTERPOLATION OF ELEMENT TRANSFORMED C INTO NODAL RESULTS FROM MESH-A TO MESH-B C INTERPOLATED SOLUTION IS PASSED OUT TO BE RETRANSFORMED C INTO ELEMENT RESULTS AND THEN WRITTEN TO MESH-C EXODUS FILE -C + C Calls subroutines SHAPEF -C + C Called by MAPVAR -C + C ****************************************************************** -C + C ICONA INT Connectivity of Mesh-A (1:nelnda,1:numeba) C SOLENA REAL Element variables at nodes for Mesh-A C IELPT INT The element in Mesh-A within which the point @@ -36,9 +36,9 @@ SUBROUTINE INTRPE (ICONA,SOLENA,IELPT,STRPT, C ISTP INT Time step C INSUB INT Entry into subroutine; 1-first time in; >1-second,etc C ICOMPL INT Map completion; 0-incomplete; 1-complete -C + C ****************************************************************** -C + include 'aexds1.blk' include 'aexds2.blk' include 'amesh.blk' @@ -46,38 +46,38 @@ SUBROUTINE INTRPE (ICONA,SOLENA,IELPT,STRPT, include 'ebbyeb.blk' include 'ex2tp.blk' include 'tapes.blk' -C + DIMENSION TIMES(*), CENTER(NUMEBB,*) DIMENSION ICONA(NELNDA,*), SOLENA(NODESA,NVAREL) DIMENSION ITT(NVAREL,*) DIMENSION SOLEB(NUMEBB,*), XB(*), YB(*), ZB(*) DIMENSION IELPT(*), STRPT(3,NODESB), ICONB(NELNDB,*) DIMENSION SOLN(27), XX(27), YY(27), ZZ(27), DUME(*) -C + C ****************************************************************** -C + IROT = 0 IROTF = 0 DO 40 IVAR=1,NVAREL IF (ITT(IVAR,IBLK) .EQ. 0)GO TO 40 -C + C Initialize SOLEB if first time in subroutine for this element block C After first time into subroutine C retrieve SOLEB from storage in EXODUS -C + IF (INSUB .EQ. 1) THEN CALL INIELT(SOLEB,IVAR,TIMES,ISTP,IDBLK,CENTER,DUME) ELSE CALL EXGEV(NTP4EX,IST,IVAR,IDBLK,NUMEBB,SOLEB(1,IVAR),IERR) END IF -C + C Loop on centroids in recipient mesh -C + DO 30 I=1,NUMEBB IF (IELPT(I) .NE. 0)THEN -C + C Set parameters for element in donor mesh -C + S=STRPT(1,I) T=STRPT(2,I) R=0. @@ -89,32 +89,32 @@ SUBROUTINE INTRPE (ICONA,SOLENA,IELPT,STRPT, INODE=ICONA(J,IELPT(I)) SOLN(J)=SOLENA(INODE,IVAR) 20 CONTINUE -C + C Shape function to evaluate interpolation -C + CALL SHAPEF (ITYPE,S,T,R,SOLN,BVALUE) SOLEB(I,IVAR) = BVALUE END IF 30 CONTINUE -C + C If there is more searching to do (i.e. many blocks to one) C use EXODUS as temporary storage C don't bother to perform needed adjustments yet -C + IF (ICOMPL .NE. 1)THEN CALL EXPEV(NTP4EX,IST,IVAR,IDBLK,NUMEBB,SOLEB(1,IVAR),IERR) ELSE -C + C write element vars out to EXODUS data base (now is convenient) -C + C+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ C ELMASS is special -C + IF (NAMVAR(nvargp+IVAR)(1:6) .EQ. 'ELMASS')THEN -C + C ELMASS was changed to nodal density prior to processing. C need to go back from density to element mass now -C + C NNODES=NNELM(ITYPE) NNODES = NELNDB IF (ITYPE .EQ. 6) NNODES = 4 @@ -132,23 +132,22 @@ SUBROUTINE INTRPE (ICONA,SOLENA,IELPT,STRPT, SOLEB(IEL,IVAR) = SOLEB(IEL,IVAR) * VOLUME 100 CONTINUE END IF -C + C**************************************************************** C apply constraints to variables here as applicable -C -C + C Plastic strain (EQPS) must greater than or equal to 0. -C + IF (NAMVAR(nvargp+IVAR)(1:4) .EQ. 'EQPS')THEN DO 110 IEL = 1, NUMEBB IF (SOLEB(IEL,IVAR) .LT. 0.)THEN SOLEB(IEL,IVAR) = 0. END IF 110 CONTINUE -C + C Hourglass forces and bulk viscosity have no meaning other than on C the mesh from which they originated, just set them to zero. -C + ELSE IF (NAMVAR(nvargp+IVAR)(1:2) .EQ. 'HG' .OR. & NAMVAR(nvargp+IVAR)(1:5) .EQ. 'BULKQ')THEN DO 120 IEL = 1, NUMEBB @@ -168,13 +167,13 @@ SUBROUTINE INTRPE (ICONA,SOLENA,IELPT,STRPT, C END IF C ??? CONTINUE c************************************************************************ -c + c######################################################################## c the rotation tensor is special -c + c just store pointers to the rotation tensor components for later c processing. do nothing here -c + IF (NAMVAR(NVARGP+IVAR)(1:8) .EQ. 'COSTHETA')THEN ICOS = IVAR IROT = IROT + 1 @@ -221,17 +220,17 @@ SUBROUTINE INTRPE (ICONA,SOLENA,IELPT,STRPT, GO TO 10 END IF c######################################################################## -C + C write element variables -C + CALL EXPEV(NTP4EX,IST,IVAR,IDBLK,NUMEBB,SOLEB(1,IVAR),IERR) 10 CONTINUE -c + c######################################################################## c now fix-up rotations - rotation matrix must have mag=1 -c + c some simple error checking -c + IF (NDIMB .EQ. 2)THEN IF (IROT .EQ. 2 .AND. & ICOS .NE. 0 .AND. ISIN .NE. 0) THEN @@ -247,15 +246,14 @@ SUBROUTINE INTRPE (ICONA,SOLENA,IELPT,STRPT, & IERR) IROTF = 1 END IF -C -C + ELSE IF (IROT .EQ. 9 .AND. IROTF .EQ. 0 .AND. IR11 .NE. 0 & .AND. IR21 .NE. 0 .AND. IR31 .NE. 0 .AND. IR12 .NE. 0 & .AND. IR22 .NE. 0 .AND. IR32 .NE. 0 .AND. IR13 .NE. 0 & .AND. IR23 .NE. 0 .AND. IR33 .NE. 0)THEN -C + C compute magnitude of matrix -C + DO 280 IEL = I, NUMEBB RMAG=SQRT(SOLEB(IEL,IR11)*SOLEB(IEL,IR22)*SOLEB(IEL,IR33) & + SOLEB(IEL,IR21)*SOLEB(IEL,IR32)*SOLEB(IEL,IR13) @@ -273,7 +271,7 @@ SUBROUTINE INTRPE (ICONA,SOLENA,IELPT,STRPT, SOLEB(IEL,IR13) = SOLEB(IEL,IR13) / RMAG SOLEB(IEL,IR23) = SOLEB(IEL,IR23) / RMAG SOLEB(IEL,IR33) = SOLEB(IEL,IR33) / RMAG -c + 280 CONTINUE CALL EXPEV(NTP4EX,IST,IR11,IDBLK,NUMEBB,SOLEB(1,IR11), & IERR) @@ -298,6 +296,6 @@ SUBROUTINE INTRPE (ICONA,SOLENA,IELPT,STRPT, END IF 40 CONTINUE c######################################################################## -C + RETURN END diff --git a/packages/seacas/libraries/mapvarlib/intrpn.f b/packages/seacas/libraries/mapvarlib/intrpn.f index f8a399cf3f1b..959149208acd 100644 --- a/packages/seacas/libraries/mapvarlib/intrpn.f +++ b/packages/seacas/libraries/mapvarlib/intrpn.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= @@ -9,19 +9,19 @@ SUBROUTINE INTRPN(ICONA,SOLNA,IELPT,STRPT, & SOLNB,NDLSTB,XB,YB,ZB, & IDBLK,TIMES,INSUB,SN) -C + C ****************************************************************** -C + C SUBROUTINE TO CONTROL INTERPOLATION OF NODAL RESULTS FROM MESH-A C TO MESH-B C INTERPOLATED SOLUTION IS WRITTEN TO MESH-C EXODUS FILE -C + C Calls subroutine SHAPEF, ININOD -C + C Called by MAPVAR -C + C ****************************************************************** -C + C ICONA INT Connectivity of donor Mesh (1:nelnda,1:numeba) C SOLNA REAL Nodal variables for donor mesh C IELPT INT The element in donor mesh within which the point @@ -34,9 +34,9 @@ SUBROUTINE INTRPN(ICONA,SOLNA,IELPT,STRPT, C INSUB INT Number of times into subroutine for this element block C 1-first time; >1-second,etc time; C used to control mapping for many element blocks to one -C + C ****************************************************************** -C + include 'amesh.blk' include 'bmesh.blk' include 'aexds1.blk' @@ -46,64 +46,63 @@ SUBROUTINE INTRPN(ICONA,SOLNA,IELPT,STRPT, include 'steps.blk' include 'tapes.blk' include 'varnpt.blk' -C + DIMENSION XB(*), YB(*), ZB(*), TIMES(*) DIMENSION ICONA(NELNDA,*), SOLNA(NODESA,NVARNP) DIMENSION SOLNB(NODESB,NVARNP), NDLSTB(*) DIMENSION IELPT(*), STRPT(3,NODESB) DIMENSION SOLN(27), SN(*) -C + C ****************************************************************** -C + C set up time steps -C + IF (ISTEP .EQ. -1)THEN NTM = NTIMES ELSE NTM = 1 END IF -C + DO 5 IST = 1, NTM IF (ISTEP .EQ. -1)THEN ISTP = IST ELSE ISTP = ISTEP END IF -C + C Start interpolation -C + DO 10 IVAR = 1, NVARNP -C + C For IDEF = 2 do mesh annealing (used by GOMA); write out all C displacements as zero. -C + IF (IDEF .EQ. 2 .AND. (IVAR .EQ. IXDIS .OR. IVAR .EQ. IYDIS & .OR. IVAR .EQ. IZDIS))GO TO 10 -C -C + C If first time into INTRPN for this element block, initialize C else you are mapping many to one and retrieve partially mapped C results from temporary storage in EXODUS -C + IF (INSUB .EQ. 1)THEN CALL ININOD(SOLNB,IVAR,TIMES,ISTP,IDBLK,NDLSTB,XB,YB,ZB, & SN) ELSE CALL EXGNV(NTP4EX,IST,IVAR,NODESB,SOLNB(1,IVAR),IERR) END IF -C + C Get nodal results on donor mesh -C + CALL EXGNV(NTP2EX,ISTP,IVAR,NODESA,SOLNA(1,IVAR),IERR) -C + C Loop on nodes in recipient mesh -C + DO 30 I = 1,NUMNDB NEL = IELPT(I) IF (NEL .NE. 0) THEN -C + C Set parameters for element in donor mesh -C + S = STRPT(1,I) T = STRPT(2,I) R = 0. @@ -115,20 +114,20 @@ SUBROUTINE INTRPN(ICONA,SOLNA,IELPT,STRPT, INODE = ICONA(J,NEL) SOLN(J) = SOLNA(INODE,IVAR) 20 CONTINUE -C + C Shape function -C + CALL SHAPEF(ITYPE,S,T,R,SOLN,BVALUE) SOLNB(NDLSTB(I),IVAR) = BVALUE END IF 30 CONTINUE -C + C Save results, it doesn't matter if they are preliminary or final -C + CALL EXPNV(NTP4EX,IST,IVAR,NODESB,SOLNB(1,IVAR),IERR) 10 CONTINUE 5 CONTINUE -C + RETURN END diff --git a/packages/seacas/libraries/mapvarlib/invcon.f b/packages/seacas/libraries/mapvarlib/invcon.f index e0d917e91732..76c7185df5ad 100644 --- a/packages/seacas/libraries/mapvarlib/invcon.f +++ b/packages/seacas/libraries/mapvarlib/invcon.f @@ -1,38 +1,38 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================== SUBROUTINE INVCON(INVLN,MAXLN,INVCN,ICONA) -C +C C************************************************************************ -C +C C Subroutine INVC0N computes the inverse connectivity (elements connected C to a node). -C +C c Called by MAPVAR -C +C C Calls ERROR -C +C C************************************************************************ -C +C C INVLN INT The number of elements connected to a node (1:numnda) C MAXLN INT The maximum number of elements connected to any node C INVCN INT The inverse connectivity (1:maxln,1:numnda) C ICONA INT The connectivity array (1:nelnda,1:numela) -C +C C************************************************************************ -C -C +C +C include 'amesh.blk' include 'ebbyeb.blk' -C +C DIMENSION INVLN(*),INVCN(MAXLN,*),ICONA(nelnda,*) -C +C C************************************************************************ -C +C DO I = 1, NODESA INVLN(I) = 0 DO J = 1, MAXLN @@ -40,7 +40,7 @@ SUBROUTINE INVCON(INVLN,MAXLN,INVCN,ICONA) end do end do -C +C NNODES = NELNDA IF (ITYPE .EQ. 6) NNODES = 4 DO J = 1, NUMEBA diff --git a/packages/seacas/libraries/mapvarlib/jacobn.f b/packages/seacas/libraries/mapvarlib/jacobn.f index 4864733fae67..374be12b9db3 100644 --- a/packages/seacas/libraries/mapvarlib/jacobn.f +++ b/packages/seacas/libraries/mapvarlib/jacobn.f @@ -1,28 +1,27 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: jacobn.f,v 1.3 2007/10/17 18:43:49 gdsjaar Exp $ C======================================================================= *DECK,JACOBN SUBROUTINE JACOBN (ITYPE,XX,YY,ZZ,SP,TP,RP,A11,A12,A13,A21,A22, 1A23,A31,A32,A33,F1,F2,F3) -C + C ****************************************************************** -C + C SUBROUTINE TO EVALUATE ELEMENT SHAPE FUNCTIONS AND DERIVATIVES C (JACOBIAN) AT A SPECIFIED POINT (SP,TP,RP) -C + C Called by SRCH2D & SRCH3D -C + C ****************************************************************** -C + DIMENSION XX(*), YY(*), ZZ(*) -C + C ****************************************************************** -C + F1=0. F2=0. F3=0. @@ -35,27 +34,27 @@ SUBROUTINE JACOBN (ITYPE,XX,YY,ZZ,SP,TP,RP,A11,A12,A13,A21,A22, A31=0. A32=0. A33=0. -C + C SELECT ELEMENT -C + GO TO (100, 110, 120, 130, 140, 150, 160, 170, 180, 190, & 200, 210), ITYPE -C + C 3-NODE TRIANGLE -C + 100 CONTINUE PP=1.-SP-TP F1=XX(1)*SP+XX(2)*TP+XX(3)*PP F2=YY(1)*SP+YY(2)*TP+YY(3)*PP -C + A11=XX(1)-XX(3) A12=XX(2)-XX(3) A21=YY(1)-YY(3) A22=YY(2)-YY(3) RETURN -C + C 6-NODE TRIANGLE -C + 110 CONTINUE PP=1.-SP-TP F1=XX(1)*SP*(2.*SP-1.)+XX(2)*TP*(2.*TP-1.)+ @@ -64,7 +63,7 @@ SUBROUTINE JACOBN (ITYPE,XX,YY,ZZ,SP,TP,RP,A11,A12,A13,A21,A22, F2=YY(1)*SP*(2.*SP-1.)+YY(2)*TP*(2.*TP-1.)+ 1 YY(3)*PP*(2.*PP-1.)+YY(4)*4.*SP*TP+ 2 YY(5)*4.*TP*PP+YY(6)*4.*SP*PP -C + A11=XX(1)*(4.*SP-1.)-XX(3)*(4.*PP-1.)+(XX(4)-XX(5))*4.*TP+ 1 XX(6)*4.*(PP-SP) A12=XX(2)*(4.*TP-1.)-XX(3)*(4.*PP-1.)+(XX(4)-XX(6))*4.*SP+ @@ -74,23 +73,23 @@ SUBROUTINE JACOBN (ITYPE,XX,YY,ZZ,SP,TP,RP,A11,A12,A13,A21,A22, A22=YY(2)*(4.*TP-1.)-YY(3)*(4.*PP-1.)+(YY(4)-YY(6))*4.*SP+ 1 YY(5)*4.*(PP-TP) RETURN -C + C 4-NODE QUADRILATERAL -C + 120 CONTINUE F1=.25*(XX(1)*(1.-SP)*(1.-TP)+XX(2)*(1.+SP)*(1.-TP)+ 1 XX(3)*(1.+SP)*(1.+TP)+XX(4)*(1.-SP)*(1.+TP)) F2=.25*(YY(1)*(1.-SP)*(1.-TP)+YY(2)*(1.+SP)*(1.-TP)+ 1 YY(3)*(1.+SP)*(1.+TP)+YY(4)*(1.-SP)*(1.+TP)) -C + A11=.25*((XX(2)-XX(1))*(1.-TP)+(XX(3)-XX(4))*(1.+TP)) A12=.25*((XX(4)-XX(1))*(1.-SP)+(XX(3)-XX(2))*(1.+SP)) A21=.25*((YY(2)-YY(1))*(1.-TP)+(YY(3)-YY(4))*(1.+TP)) A22=.25*((YY(4)-YY(1))*(1.-SP)+(YY(3)-YY(2))*(1.+SP)) RETURN -C + C 8-NODE QUADRILATERAL -C + 130 CONTINUE F1=.25*(XX(1)*(1.-SP)*(1.-TP)*(-SP-TP-1.)+ 1 XX(2)*(1.+SP)*(1.-TP)*(SP-TP-1.)+ @@ -104,7 +103,7 @@ SUBROUTINE JACOBN (ITYPE,XX,YY,ZZ,SP,TP,RP,A11,A12,A13,A21,A22, 3 YY(4)*(1.-SP)*(1.+TP)*(-SP+TP-1.))+ 4 .50*(YY(5)*(1.-SP*SP)*(1.-TP)+YY(6)*(1.+SP)*(1.-TP*TP)+ 5 YY(7)*(1.-SP*SP)*(1.+TP)+YY(8)*(1.-SP)*(1.-TP*TP)) -C + A11=.25*(XX(1)*(1.-TP)*(TP+2.*SP)+XX(2)*(1.-TP)*(-TP+2.*SP)+ 1 XX(3)*(1.+TP)*(TP+2.*SP)+XX(4)*(1.+TP)*(-TP+2.*SP))+ 2 .50*(XX(5)*(1.-TP)*(-2.*SP)+(XX(6)-XX(8))*(1.-TP*TP)+ @@ -122,9 +121,9 @@ SUBROUTINE JACOBN (ITYPE,XX,YY,ZZ,SP,TP,RP,A11,A12,A13,A21,A22, 2 .50*(YY(6)*(1.+SP)*(-2.*TP)+(YY(7)-YY(5))*(1.-SP*SP)+ 3 YY(8)*(1.-SP)*(-2.*TP)) RETURN -C + C 9-NODE QUADRILATERAL -C + 140 CONTINUE F1=.25*(XX(1)*(1.-SP)*(1.-TP)*(SP*TP)+ 1 XX(2)*(1.+SP)*(1.-TP)*(-SP*TP)+ @@ -144,7 +143,7 @@ SUBROUTINE JACOBN (ITYPE,XX,YY,ZZ,SP,TP,RP,A11,A12,A13,A21,A22, 6 YY(7)*(1.-SP*SP)*(1.+TP)*TP+ 7 YY(8)*(1.-SP)*(1.-TP*TP)*(-SP))+ 8 YY(9)*(1.-SP*SP)*(1.-TP*TP) -C + A11=.25*(XX(1)*(1.-TP)*(TP-2.*SP*TP)+ 1 XX(2)*(1.-TP)*(-TP-2.*SP*TP)+ 2 XX(3)*(1.+TP)*(TP+2.*SP*TP)+ @@ -174,15 +173,15 @@ SUBROUTINE JACOBN (ITYPE,XX,YY,ZZ,SP,TP,RP,A11,A12,A13,A21,A22, 5 YY(7)*(1.-SP*SP)*(1.+2.*TP)+YY(8)*(-SP+SP*SP)*(-2.*TP))+ 6 YY(9)*(1.-SP*SP)*(-2.*TP) RETURN -C + C 4-NODE TETRAHEDRON -C + 150 CONTINUE PP=1.-SP-TP-RP C F1=XX(1)*SP+XX(2)*TP+XX(3)*RP+XX(4)*PP C F2=YY(1)*SP+YY(2)*TP+YY(3)*RP+YY(4)*PP C F3=ZZ(1)*SP+ZZ(2)*TP+ZZ(3)*RP+ZZ(4)*PP -C + C A11=XX(1)-XX(4) C A12=XX(2)-XX(4) C A13=XX(3)-XX(4) @@ -194,11 +193,11 @@ SUBROUTINE JACOBN (ITYPE,XX,YY,ZZ,SP,TP,RP,A11,A12,A13,A21,A22, C A33=ZZ(3)-ZZ(4) C fix gww 8/24/00 - need same fix for 10-node tet?? C merlin had opposite nodal order (left hand rule for + volume) -C + F1=XX(1)*SP+XX(2)*TP+XX(3)*PP+XX(4)*RP F2=YY(1)*SP+YY(2)*TP+YY(3)*PP+YY(4)*RP F3=ZZ(1)*SP+ZZ(2)*TP+ZZ(3)*PP+ZZ(4)*RP -C + A11=XX(1)-XX(3) A12=XX(2)-XX(3) A13=XX(4)-XX(3) @@ -209,9 +208,9 @@ SUBROUTINE JACOBN (ITYPE,XX,YY,ZZ,SP,TP,RP,A11,A12,A13,A21,A22, A32=ZZ(2)-ZZ(3) A33=ZZ(4)-ZZ(3) RETURN -C + C 10-NODE TETRAHEDRON -C + 160 CONTINUE PP=1.-SP-TP-RP F1= XX(1)*SP*(2.*SP-1.)+XX(2)*TP*(2.*TP-1.)+ @@ -226,7 +225,7 @@ SUBROUTINE JACOBN (ITYPE,XX,YY,ZZ,SP,TP,RP,A11,A12,A13,A21,A22, 1 ZZ(3)*RP*(2.*RP-1.)+ZZ(4)*PP*(2.*PP-1.)+ 2 4.*(ZZ(5)*SP*TP+ZZ(6)*TP*RP+ZZ(7)*RP*SP+ 3 ZZ(8)*SP*PP+ZZ(9)*TP*PP+ZZ(10)*RP*PP) -C + A11=XX(1)*(4.*SP-1.)-XX(4)*(4.*PP-1.)+XX(5)*4.*TP+XX(7)*4.*RP+ 1 XX(8)*4.*(PP-SP)-XX(9)*4.*TP-XX(10)*4.*(RP+TP) A12=XX(2)*(4.*TP-1.)-XX(4)*(4.*PP-1.)+XX(5)*4.*SP+XX(6)*4.*RP- @@ -246,9 +245,9 @@ SUBROUTINE JACOBN (ITYPE,XX,YY,ZZ,SP,TP,RP,A11,A12,A13,A21,A22, A33=ZZ(3)*(4.*RP-1.)-ZZ(4)*(4.*PP-1.)+ZZ(6)*4.*TP+ZZ(7)*4.*SP- 1 ZZ(8)*4.*SP-ZZ(9)*4.*TP+ZZ(10)*(4.*PP-RP) RETURN -C + C 6-NODE PRISM -C + 170 CONTINUE PP=1.-SP-TP F1=(XX(1)*SP+XX(2)*TP+XX(3)*PP)*.5*(1.-RP)+ @@ -257,7 +256,7 @@ SUBROUTINE JACOBN (ITYPE,XX,YY,ZZ,SP,TP,RP,A11,A12,A13,A21,A22, 1 (YY(4)*SP+YY(5)*TP+YY(6)*PP)*.5*(1.+RP) F3=(ZZ(1)*SP+ZZ(2)*TP+ZZ(3)*PP)*.5*(1.-RP)+ 1 (ZZ(4)*SP+ZZ(5)*TP+ZZ(6)*PP)*.5*(1.+RP) -C + A11=(XX(1)-XX(3))*.5*(1.-RP)+ 1 (XX(4)-XX(6))*.5*(1.+RP) A12=(XX(2)-XX(3))*.5*(1.-RP)+ @@ -280,9 +279,9 @@ SUBROUTINE JACOBN (ITYPE,XX,YY,ZZ,SP,TP,RP,A11,A12,A13,A21,A22, 1 (ZZ(5)-ZZ(2))*.5*TP+ 2 (ZZ(6)-ZZ(3))*.5*PP RETURN -C + C 15-NODE PRISM -C + 180 CONTINUE PP=1.-SP-TP AA=1.-RP @@ -309,7 +308,7 @@ SUBROUTINE JACOBN (ITYPE,XX,YY,ZZ,SP,TP,RP,A11,A12,A13,A21,A22, 4 2.*AA*(ZZ(7)*SP*TP+ZZ(8)*TP*PP+ZZ(9)*PP*SP)+ 5 (ZZ(10)*SP+ZZ(11)*TP+ZZ(12)*PP)*CC+ 6 2.*BB*(ZZ(13)*SP*TP+ZZ(14)*TP*PP+ZZ(15)*PP*SP) -C + A11=.5*(XX(1)*((4.*SP-1.)*AA-CC)-XX(3)*((4.*PP-1.)*AA+CC)+ 1 XX(4)*((4.*SP-1.)*BB-CC)-XX(6)*((4.*PP-1.)*BB+CC))+ 2 2.*AA*(XX(7)*TP-XX(8)*TP+XX(9)*(PP-SP))+ @@ -359,9 +358,9 @@ SUBROUTINE JACOBN (ITYPE,XX,YY,ZZ,SP,TP,RP,A11,A12,A13,A21,A22, 4 2.*(ZZ(10)*SP+ZZ(11)*TP+ZZ(12)*PP)*RP+ 5 2.*(ZZ(13)*SP*TP+ZZ(14)*TP*PP+ZZ(15)*PP*SP) RETURN -C + C 8-NODE HEX -C + 190 CONTINUE F1=.125*(XX(1)*(1.-SP)*(1.-TP)*(1.-RP)+ 1 XX(2)*(1.+SP)*(1.-TP)*(1.-RP)+ @@ -387,7 +386,7 @@ SUBROUTINE JACOBN (ITYPE,XX,YY,ZZ,SP,TP,RP,A11,A12,A13,A21,A22, 5 ZZ(6)*(1.+SP)*(1.-TP)*(1.+RP)+ 6 ZZ(7)*(1.+SP)*(1.+TP)*(1.+RP)+ 7 ZZ(8)*(1.-SP)*(1.+TP)*(1.+RP)) -C + A11=.125*((XX(2)-XX(1))*(1.-TP)*(1.-RP)+ 1 (XX(3)-XX(4))*(1.+TP)*(1.-RP)+ 2 (XX(6)-XX(5))*(1.-TP)*(1.+RP)+ @@ -425,9 +424,9 @@ SUBROUTINE JACOBN (ITYPE,XX,YY,ZZ,SP,TP,RP,A11,A12,A13,A21,A22, 2 (ZZ(7)-ZZ(3))*(1.+SP)*(1.+TP)+ 3 (ZZ(8)-ZZ(4))*(1.-SP)*(1.+TP)) RETURN -C + C 20-NODE HEX -C + 200 CONTINUE AA=.125*(XX(1)*(1.-SP)*(1.-TP)*(1.-RP)*(-SP-TP-RP-2.)+ 1 XX(2)*(1.+SP)*(1.-TP)*(1.-RP)*(SP-TP-RP-2.)+ @@ -492,7 +491,7 @@ SUBROUTINE JACOBN (ITYPE,XX,YY,ZZ,SP,TP,RP,A11,A12,A13,A21,A22, # ZZ(19)*(1.-SP**2)*(1.+TP)*(1.+RP)+ 1 ZZ(20)*(1.-SP)*(1.-TP**2)*(1.+RP)) F3=AA+BB -C + AA=.125*(-XX(1)*(1.-TP)*(1.-RP)*(-2.*SP-TP-RP-1.) 1 +XX(2)*(1.-TP)*(1.-RP)*(2.*SP-TP-RP-1.) 2 +XX(3)*(1.+TP)*(1.-RP)*(-2.*SP+TP-RP-1.) @@ -556,7 +555,7 @@ SUBROUTINE JACOBN (ITYPE,XX,YY,ZZ,SP,TP,RP,A11,A12,A13,A21,A22, # +XX(19)*(1.-SP**2)*(1.+TP) 1 +XX(20)*(1.-SP)*(1.-TP**2)) A13=AA+BB -C + AA=.125*(-YY(1)*(1.-TP)*(1.-RP)*(-2.*SP-TP-RP-1.) 1 +YY(2)*(1.-TP)*(1.-RP)*(2.*SP-TP-RP-1.) 2 +YY(3)*(1.+TP)*(1.-RP)*(-2.*SP+TP-RP-1.) @@ -620,7 +619,7 @@ SUBROUTINE JACOBN (ITYPE,XX,YY,ZZ,SP,TP,RP,A11,A12,A13,A21,A22, # +YY(19)*(1.-SP**2)*(1.+TP) 1 +YY(20)*(1.-SP)*(1.-TP**2)) A23=AA+BB -C + AA=.125*(-ZZ(1)*(1.-TP)*(1.-RP)*(-2.*SP-TP-RP-1.) 1 +ZZ(2)*(1.-TP)*(1.-RP)*(2.*SP-TP-RP-1.) 2 +ZZ(3)*(1.+TP)*(1.-RP)*(-2.*SP+TP-RP-1.) @@ -685,9 +684,9 @@ SUBROUTINE JACOBN (ITYPE,XX,YY,ZZ,SP,TP,RP,A11,A12,A13,A21,A22, 1 +ZZ(20)*(1.-SP)*(1.-TP**2)) A33=AA+BB RETURN -C + C 27-NODE HEX -C + 210 CONTINUE AA=.125*(-XX(1)*SP*TP*RP*(1.-SP)*(1.-TP)*(1.-RP) 1 +XX(2)*SP*TP*RP*(1.+SP)*(1.-TP)*(1.-RP) @@ -717,7 +716,7 @@ SUBROUTINE JACOBN (ITYPE,XX,YY,ZZ,SP,TP,RP,A11,A12,A13,A21,A22, & XX(26)*RP*(1.-SP**2)*(1.-TP**2)*(1.+RP))+ & XX(27)*(1.-SP**2)*(1.-TP**2)*(1.-RP**2) F1=AA+BB+CC -C + AA=.125*(-YY(1)*SP*TP*RP*(1.-SP)*(1.-TP)*(1.-RP) 1 +YY(2)*SP*TP*RP*(1.+SP)*(1.-TP)*(1.-RP) 2 -YY(3)*SP*TP*RP*(1.+SP)*(1.+TP)*(1.-RP) @@ -774,9 +773,9 @@ SUBROUTINE JACOBN (ITYPE,XX,YY,ZZ,SP,TP,RP,A11,A12,A13,A21,A22, & ZZ(26)*RP*(1.-SP**2)*(1.-TP**2)*(1.+RP))+ & ZZ(27)*(1.-SP**2)*(1.-TP**2)*(1.-RP**2) F3=AA+BB+CC -C + C **** SHAPE FUNCTION DERIVATIVES FOR 27 NODE HEX GO HERE -C + RETURN -C + END diff --git a/packages/seacas/libraries/mapvarlib/mke.f b/packages/seacas/libraries/mapvarlib/mke.f index de855bfe2585..c10f75e42f53 100644 --- a/packages/seacas/libraries/mapvarlib/mke.f +++ b/packages/seacas/libraries/mapvarlib/mke.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C===================================================================== @@ -10,17 +10,17 @@ SUBROUTINE MKE(NELND,NUMEB,NUMND,ICON,NDLST,ITYPE, & VELX,VELY,VELZ,EMSS,RNMS, & RMX,RMY,RMZ,RKE,PSQ,RJ2, & SIGXX,SIGYY,SIGZZ,SIGXY,SIGYZ,SIGZX) -C +C C **************************************************************** -C +C C Compute momenta (x, y, and z) and kinetic energy C for an element block. Totals are stored in MKEI. C Called when check on accuracy of map is requested -C +C C Called by MAPVAR -C +C C **************************************************************** -C +C C NELND INT Number of nodes per element C NUMEB INT Number of elements in element block C NUMND int Number of nodes in element block @@ -45,33 +45,33 @@ SUBROUTINE MKE(NELND,NUMEB,NUMND,ICON,NDLST,ITYPE, C SIGYZ REAL Component of stress tensot C SIGZX REAL Component of stress tensot -C +C C **************************************************************** -C +C include 'amesh.blk' -C +C DIMENSION ICON(NELND,*),NDLST(*) DIMENSION VELX(*),VELY(*),VELZ(*),EMSS(*),RNMS(*) DIMENSION SIGXX(*),SIGYY(*),SIGZZ(*),SIGXY(*),SIGYZ(*),SIGZX(*) -C +C C **************************************************************** -C +C C zero nodal mass array -C +C DO I = 1, NUMEB DO J = 1, NELND RNMS(ICON(J,I)) = 0. end do end do -C +C C Translate element mass to nodal mass C First cut, come back and do better if necessary -C +C IF (ITYPE .EQ. 3 .OR. ITYPE .EQ. 4 .OR. ITYPE .EQ. 5)THEN -C +C C Treat all quads the same, use only four corner nodes C can fix if needed -C +C NEND = 4 DO I = 1, NUMEB DO J = 1, NEND @@ -79,9 +79,9 @@ SUBROUTINE MKE(NELND,NUMEB,NUMND,ICON,NDLST,ITYPE, end do end do ELSE IF (ITYPE .EQ. 10)THEN -C +C C 8-node hex -C +C NEND = 8 DO I = 1, NUMEB DO J = 1, NEND @@ -89,9 +89,9 @@ SUBROUTINE MKE(NELND,NUMEB,NUMND,ICON,NDLST,ITYPE, end do end do ELSE IF (ITYPE .EQ. 13)THEN -C +C C 4-node shell -C +C NEND = 4 DO I = 1, NUMEB DO J = 1, NEND @@ -99,10 +99,10 @@ SUBROUTINE MKE(NELND,NUMEB,NUMND,ICON,NDLST,ITYPE, end do end do ELSE IF (ITYPE .EQ. 6)THEN -C +C C treat all tets the same, use only four corner nodes C can fix if needed -C +C NEND = 4 DO I = 1, NUMEB DO J = 1, NEND @@ -113,10 +113,10 @@ SUBROUTINE MKE(NELND,NUMEB,NUMND,ICON,NDLST,ITYPE, CALL ERROR ('MKE','UNSUPPORTED ELEMENT TYPE','ITYPE',itype, & ' ',0,' ',' ',1) END IF -C +C C compute momenta, KE, P-sqM, J2-sqM for element block C loop over all nodes in element block -C +C RMX = 0. RMY = 0. RMZ = 0. @@ -136,7 +136,7 @@ SUBROUTINE MKE(NELND,NUMEB,NUMND,ICON,NDLST,ITYPE, RMY = RMY + (VELY(INOD) * RNMS(INOD)) RKE = RKE + (0.5 * RNMS(INOD) * VELSQ) end do -C +C DO I = 1, NUMEB P = (SIGXX(I) + SIGYY(I) + SIGZZ(I)) / 3. PSQ = PSQ + P*P*EMSS(I) @@ -151,6 +151,6 @@ SUBROUTINE MKE(NELND,NUMEB,NUMND,ICON,NDLST,ITYPE, & + SIGXY(I)**2) * EMSS(I)) END IF end do -C +C RETURN END diff --git a/packages/seacas/libraries/mapvarlib/mkei.f b/packages/seacas/libraries/mapvarlib/mkei.f index cc137906f2be..b2dcc4632a1d 100644 --- a/packages/seacas/libraries/mapvarlib/mkei.f +++ b/packages/seacas/libraries/mapvarlib/mkei.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C===================================================================== @@ -16,17 +16,16 @@ SUBROUTINE MKEI(IST,ISTP,TIMES,IDBLKA,ICONA,NDLSTA, & EMSSB,DENSB,RNMSB, & TMXB,TMYB,TMZB,TKEB,TPSQB,TJ2B,ICOMPL, & SIGXXB,SIGYYB,SIGZZB,SIGXYB,SIGYZB,SIGZXB) -C + C **************************************************************** -C + C Set up arrays for computing momenta and kinetic energy C Write results to text file -C -C + C Called by MAPVAR -C + C Calls MKE -C + C **************************************************************** C IST INT time step counter for loop in MAPVAR C ISTP INT Time step @@ -64,10 +63,9 @@ SUBROUTINE MKEI(IST,ISTP,TIMES,IDBLKA,ICONA,NDLSTA, C TKEA REAL REC mesh sum over elt block J2 each time step C ICOMPL INT Flag to indicate completion of rec mesh element block C SIG**B REAL Rec mesh stress components -C -C + C **************************************************************** -C + include 'amesh.blk' include 'bmesh.blk' include 'ebbyeb.blk' @@ -75,7 +73,7 @@ SUBROUTINE MKEI(IST,ISTP,TIMES,IDBLKA,ICONA,NDLSTA, include 'tapes.blk' include 'varnpt.blk' include 'varept.blk' -C + DIMENSION TIMES(*),ICONA(NELNDA,*),NDLSTA(*) DIMENSION XA(*),YA(*),ZA(*),VELXA(*),VELYA(*),VELZA(*) DIMENSION EMSSA(*),DENSA(*),RNMSA(*) @@ -89,17 +87,17 @@ SUBROUTINE MKEI(IST,ISTP,TIMES,IDBLKA,ICONA,NDLSTA, DIMENSION SIGXXB(*),SIGYYB(*),SIGZZB(*), & SIGXYB(*),SIGYZB(*),SIGZXB(*) DIMENSION XX(27),YY(27),ZZ(27) -C + C **************************************************************** -C + C get vel's and elmass for donor mesh-A -C + CALL EXGNV(NTP2EX,ISTP,IXVEL,NODESA,VELXA,IERR) CALL EXGNV(NTP2EX,ISTP,IYVEL,NODESA,VELYA,IERR) IF (NDIMA .EQ. 3)THEN CALL EXGNV(NTP2EX,ISTP,IZVEL,NODESA,VELZA,IERR) END IF -C + IF(IELMS .NE. 0)THEN CALL EXGEV(NTP2EX,ISTP,IELMS,IDBLKA,NUMEBA,EMSSA,IERR) ELSE IF (IDENS .NE. 0)THEN @@ -134,12 +132,12 @@ SUBROUTINE MKEI(IST,ISTP,TIMES,IDBLKA,ICONA,NDLSTA, CALL EXGEV(NTP2EX,ISTP,ISYZ,IDBLKA,NUMEBA,SIGYZA,IERR) CALL EXGEV(NTP2EX,ISTP,ISZX,IDBLKA,NUMEBA,SIGZXA,IERR) END IF -C + CALL MKE(NELNDA,NUMEBA,NUMNDA,ICONA,NDLSTA,ITYPE, & VELXA,VELYA,VELZA,EMSSA,RNMSA, & RMXA,RMYA,RMZA,RKEA,PSQA,RJ2A, & SIGXXA,SIGYYA,SIGZZA,SIGXYA,SIGYZA,SIGZXA) -C + IF (ICOMPL .EQ. 1)THEN TMXA(IST) = TMXA(IST) + RMXA TMYA(IST) = TMYA(IST) + RMYA @@ -148,16 +146,16 @@ SUBROUTINE MKEI(IST,ISTP,TIMES,IDBLKA,ICONA,NDLSTA, TPSQA(IST) = TPSQA(IST) + PSQA TJ2A(IST) = TJ2A(IST) + RJ2A END IF -C + C repeat for recipient mesh C get vel's and elmass for mesh-B -C + CALL EXGNV(NTP4EX,IST,IXVEL,NODESB,VELXB,IERR) CALL EXGNV(NTP4EX,IST,IYVEL,NODESB,VELYB,IERR) IF (NDIMA .EQ. 3)THEN CALL EXGNV(NTP4EX,IST,IZVEL,NODESB,VELZB,IERR) END IF -C + IF(IELMS .NE. 0)THEN CALL EXGEV(NTP4EX,IST,IELMS,IDBLKB,NUMEBB,EMSSB,IERR) ELSE IF (IDENS .NE. 0)THEN @@ -192,12 +190,12 @@ SUBROUTINE MKEI(IST,ISTP,TIMES,IDBLKA,ICONA,NDLSTA, CALL EXGEV(NTP4EX,IST,ISYZ,IDBLKB,NUMEBB,SIGYZB,IERR) CALL EXGEV(NTP4EX,IST,ISZX,IDBLKB,NUMEBB,SIGZXB,IERR) END IF -C + CALL MKE(NELNDB,NUMEBB,NUMNDB,ICONB,NDLSTB,ITYPE, & VELXB,VELYB,VELZB,EMSSB,RNMSB, & RMXB,RMYB,RMZB,RKEB,PSQB,RJ2B, & SIGXXB,SIGYYB,SIGZZB,SIGXYB,SIGYZB,SIGZXB) -C + IF (ICOMPL .EQ. 1)THEN TMXB(IST) = TMXB(IST) + RMXB TMYB(IST) = TMYB(IST) + RMYB @@ -205,9 +203,9 @@ SUBROUTINE MKEI(IST,ISTP,TIMES,IDBLKA,ICONA,NDLSTA, TKEB(IST) = TKEB(IST) + RKEB TPSQB(IST) = TPSQB(IST) + PSQB TJ2B(IST) = TJ2B(IST) + RJ2B -C + C write stuff out here -C + WRITE(NTPOUT,1010)IDBLKA,IDBLKB 1010 FORMAT(/,5X,'DONOR MESH ID ',I7,5X,'RECIPIENT MESH ID ',I7) WRITE(NTPOUT,1020)TIMES(ISTP) diff --git a/packages/seacas/libraries/mapvarlib/mvopnfil.f b/packages/seacas/libraries/mapvarlib/mvopnfil.f index aab4cf391242..4f5dca163b53 100644 --- a/packages/seacas/libraries/mapvarlib/mvopnfil.f +++ b/packages/seacas/libraries/mapvarlib/mvopnfil.f @@ -1,25 +1,25 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= *DECK,OPNFIL SUBROUTINE MVOPNFIL -C + C ****************************************************************** -C + C SUBROUTINE TO OPEN REQUIRED FILES -C + C Calls subroutine ERROR -C + C Called by MAPVAR -C + C ****************************************************************** -C + CHARACTER*2048 filnam, option, errmsg -C + include 'exodusII.inc' include 'ex2tp.blk' include 'ntpdat.blk' @@ -27,9 +27,9 @@ SUBROUTINE MVOPNFIL C include 'argparse.inc' integer argument_count external argument_count -C + C ****************************************************************** -C + C .. Get filename from command line. If not specified, emit error message NARG = argument_count() if (narg .eq. 0) then @@ -88,16 +88,16 @@ SUBROUTINE MVOPNFIL end do C OPENING OF INPUT/OUTPUT, SCRATCH AND DATA FILES -C + C TEXT OUTPUT FILE -C + IFILES(1)=1 IUNIT=NTPOUT OPEN (UNIT=NTPOUT, FILE=fntpo(:lenstr(fntpo)), STATUS='unknown', & FORM='formatted', ERR=10) -C + C EXODUS DATA FILE - MESH-A (MESH & SOLUTION) -C + IFILES(3)=1 IUNIT=NTP2 icpuws = 0 @@ -112,9 +112,9 @@ SUBROUTINE MVOPNFIL 11 format(' In opnfil - error opening mesh + solution file',/, &' error number ',i5,' tape number ',i5,' filename ',a20,/, &' ntp2ex = ',i5) -C + C GENESIS DATA FILE - MESH-B (MESH) -C + IFILES(4)=1 IUNIT=NTP3 icpuws = 0 @@ -136,9 +136,8 @@ SUBROUTINE MVOPNFIL namlen = max(namlen2, namlen3) -C C EXODUS DATA FILE - MESH-C (MESH & INTERPOLATED SOLUTION) -C + IFILES(5)=1 IUNIT=NTP4 C ... Set iows for created file to default floating point word size @@ -155,7 +154,7 @@ SUBROUTINE MVOPNFIL 13 format(' In opnfil - error opening interpolation file',/, &' error number ',i5,' tape number ',i5,' filename ',a20,/, &' ntp4ex = ',i5) -C + write (*,*) 'MESH-A (MESH & SOLUTION): ', * fntp2(:lenstr(fntp2)) write (*,*) 'MESH-B (MESH): ', @@ -169,7 +168,7 @@ SUBROUTINE MVOPNFIL call exmxnm(ntp4ex, namlen, ierr) RETURN -C + 10 CONTINUE CALL ERROR ('OPNFIL','ERROR OPENING FILE','UNIT NUMBER',IUNIT, 1' ',0,' ',' ',1) diff --git a/packages/seacas/libraries/mapvarlib/node.f b/packages/seacas/libraries/mapvarlib/node.f index abff5a38ec3d..cdde7887be7b 100644 --- a/packages/seacas/libraries/mapvarlib/node.f +++ b/packages/seacas/libraries/mapvarlib/node.f @@ -1,22 +1,22 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= *DECK,NODE SUBROUTINE NODE (ITYPE,INODE,S,T,R) -C + C ****************************************************************** -C + C SUBROUTINE TO SET THE NORMALIZED COORDINATES FOR A POINT C COINCIDENT WITH THE NODE OF AN ELEMENT -C + C Called by SRCH2D & SRCH3D -C + C ****************************************************************** -C + DIMENSION ST3(3), TT3(3), ST6(6), TT6(6) DIMENSION SQ4(4), TQ4(4), SQ8(8), TQ8(8), SQ9(9), TQ9(9) DIMENSION STT4(4), TTT4(4), RTT4(4) @@ -26,159 +26,159 @@ SUBROUTINE NODE (ITYPE,INODE,S,T,R) DIMENSION SB8(8), TB8(8), RB8(8) DIMENSION SB20(20), TB20(20), RB20(20) DIMENSION SB27(27), TB27(27), RB27(27) -C + DATA (ST3(I),I=1,3)/1.,0.,0./ DATA (TT3(I),I=1,3)/0.,1.,0./ -C + DATA (ST6(I),I=1,6)/1.,0.,0.,.5,0.,.5/ DATA (TT6(I),I=1,6)/0.,1.,0.,.5,.5,0./ -C + DATA (SQ4(I),I=1,4)/-1.,1.,1.,-1./ DATA (TQ4(I),I=1,4)/-1.,-1.,1.,1./ -C + DATA (SQ8(I),I=1,8)/-1.,1.,1.,-1.,0.,1.,0.,-1./ DATA (TQ8(I),I=1,8)/-1.,-1.,1.,1.,-1.,0.,1.,0./ -C + DATA (SQ9(I),I=1,9)/-1.,1.,1.,-1.,0.,1.,0.,-1.,0./ DATA (TQ9(I),I=1,9)/-1.,-1.,1.,1.,-1.,0.,1.,0.,0./ -C + DATA (STT4(I),I=1,4)/1.,0.,0.,0./ DATA (TTT4(I),I=1,4)/0.,1.,0.,0./ DATA (RTT4(I),I=1,4)/0.,0.,0.,1./ -C + DATA (STT10(I),I=1,10)/1.,0.,0.,0.,.25,0.,.25,.25,0.,0./ DATA (TTT10(I),I=1,10)/0.,1.,0.,0.,.25,.25,0.,0.,.25,0./ DATA (RTT10(I),I=1,10)/0.,0.,0.,1.,0.,0.,0.,.25,.25,.25/ -C + DATA (SP6(I),I=1,6)/1.,0.,0.,1.,0.,0./ DATA (TP6(I),I=1,6)/0.,1.,0.,0.,1.,0./ DATA (RP6(I),I=1,6)/-1.,-1.,-1.,1.,1.,1./ -C + DATA (SP15(I),I=1,15)/1.,0.,0.,1.,0.,0.,.5,0.,.5,1.,0., 1 0.,.5,0.,.5/ DATA (TP15(I),I=1,15)/0.,1.,0.,0.,1.,0.,.5,.5,0.,0.,1., 1 0.,.5,.5,0./ DATA (RP15(I),I=1,15)/-1.,-1.,-1.,1.,1.,1.,-1.,-1.,-1., 1 0.,0.,0.,1.,1.,1./ -C + DATA (SB8(I),I=1,8)/-1.,1.,1.,-1.,-1.,1.,1.,-1./ DATA (TB8(I),I=1,8)/-1.,-1.,1.,1.,-1.,-1.,1.,1./ DATA (RB8(I),I=1,8)/-1.,-1.,-1.,-1.,1.,1.,1.,1./ -C + DATA (SB20(I),I=1,20)/-1.,1.,1.,-1.,-1.,1.,1.,-1.,0.,1.,0., 1 -1.,-1.,1.,1.,-1.,0.,1.,0.,-1./ DATA (TB20(I),I=1,20)/-1.,-1.,1.,1.,-1.,-1.,1.,1.,-1.,0.,1., 1 0.,-1.,-1.,1.,1.,-1.,0.,1.,0./ DATA (RB20(I),I=1,20)/-1.,-1.,-1.,-1.,1.,1.,1.,1.,-1.,-1., 1 -1.,-1.,0.,0.,0.,0.,1.,1.,1.,1./ -C + DATA (SB27(I),I=1,27)/-1.,1.,1.,-1.,-1.,1.,1.,-1.,0.,1.,0., 1 -1.,-1.,1.,1.,-1.,0.,1.,0.,-1.,0.,1.,0.,-1.,0.,0.,0./ DATA (TB27(I),I=1,27)/-1.,-1.,1.,1.,-1.,-1.,1.,1.,-1.,0.,1., 1 0.,-1.,-1.,1.,1.,-1.,0.,1.,0.,-1.,0.,1.,0.,0.,0.,0./ DATA (RB27(I),I=1,27)/-1.,-1.,-1.,-1.,1.,1.,1.,1.,-1.,-1., 1 -1.,-1.,0.,0.,0.,0.,1.,1.,1.,1.,0.,0.,0.,0.,-1.,1.,0./ -C + C ****************************************************************** -C + C SELECT ELEMENT TYPE -C + GO TO (10, 20, 30, 40, 50, 60, 70, 80, 90, 100, 110, 120), ITYPE -C + C 3-NODE TRIANGLE -C + 10 CONTINUE S=ST3(INODE) T=TT3(INODE) R=0. RETURN -C + C 6-NODE TRIANGLE -C + 20 CONTINUE S=ST6(INODE) T=TT6(INODE) R=0. RETURN -C + C 4-NODE QUADRILATERAL -C + 30 CONTINUE S=SQ4(INODE) T=TQ4(INODE) R=0. RETURN -C + C 8-NODE QUADRILATERAL -C + 40 CONTINUE S=SQ8(INODE) T=TQ8(INODE) R=0. RETURN -C + C 9-NODE QUADRILATERAL -C + 50 CONTINUE S=SQ9(INODE) T=TQ9(INODE) R=0. RETURN -C + C 4-NODE TETRAHEDRON -C + 60 CONTINUE S=STT4(INODE) T=TTT4(INODE) R=RTT4(INODE) RETURN -C + C 10-NODE TETRAHEDRON -C + 70 CONTINUE S=STT10(INODE) T=TTT10(INODE) R=RTT10(INODE) RETURN -C + C 6-NODE PRISM -C + 80 CONTINUE S=SP6(INODE) T=TP6(INODE) R=RP6(INODE) RETURN -C + C 15-NODE PRISM -C + 90 CONTINUE S=SP15(INODE) T=TP15(INODE) R=RP15(INODE) RETURN -C + C 8-NODE HEX -C + 100 CONTINUE S=SB8(INODE) T=TB8(INODE) R=RB8(INODE) RETURN -C + C 20-NODE HEX -C + 110 CONTINUE S=SB20(INODE) T=TB20(INODE) R=RB20(INODE) RETURN -C + C 27-NODE HEX -C + 120 CONTINUE S=SB27(INODE) T=TB27(INODE) R=RB27(INODE) RETURN -C + END diff --git a/packages/seacas/libraries/mapvarlib/ntpdat.blk b/packages/seacas/libraries/mapvarlib/ntpdat.blk index c988cc0ab7d2..3476508ecd04 100644 --- a/packages/seacas/libraries/mapvarlib/ntpdat.blk +++ b/packages/seacas/libraries/mapvarlib/ntpdat.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /NTPDAT/ IFILES(5) diff --git a/packages/seacas/libraries/mapvarlib/qadsrc.f b/packages/seacas/libraries/mapvarlib/qadsrc.f index c02aebbdc544..4c0931860ee3 100644 --- a/packages/seacas/libraries/mapvarlib/qadsrc.f +++ b/packages/seacas/libraries/mapvarlib/qadsrc.f @@ -1,35 +1,35 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details SUBROUTINE QADSRC( * NDIM, NPTS, NPSRF, NFSRF, NISR, * NRSR, NRSS, XYZE, XYZP, LS, * ISRCHR, RSRCHR, IPT, IELT, IERR ) -C + C----------------------------------------------------------------------- -C + C DESCRIPTION: -C + C THIS SUBROUTINE CALCULATES THE CLOSEST POINT PROBLEM C BETWEEN 'KOUNTS' PAIRS OF POINTS AND SURFACES. -C + C----------------------------------------------------------------------- -C + C FORMAL PARAMETERS -C + C MEMORY : P=PERMANENT, S=SCRATCH C NAME : IMPLICIT A-H,O-Z REAL, I-N INTEGER C TYPE : INPUT_STATUS/OUTPUT_STATUS (I=INPUT,O=OUTPUT,P=PASSED, C U=UNMODIFIED,-=UNDEFINED) C DESCRIPTION : DESCRIPTION OF VARIABLE -C + C----------------------------------------------------------------------- -C + C CALLING ARGUMENTS -C + C MEMORY NAME TYPE DESCRIPTION C --- ---- --- ----------- C P NDIM I/U DIMENSION OF PROBLEM=3 @@ -47,27 +47,27 @@ SUBROUTINE QADSRC( C P RSRCHR I/O REAL SEARCH RESULTS C P IPT I/U POINT PAIRED WITH SURFACE LISTED IN IELT C P IELT I/U SURFACE PAIRED WITH POINT LISTED IN IPT -C + C----------------------------------------------------------------------- -C + include 'amesh.blk' include 'ebbyeb.blk' include 'toldat.blk' include 'tapes.blk' -C + C INPUT/OUTPUT ARRAYS DIMENSION * XYZP(NPTS,NDIM) ,XYZE(NPSRF,NDIM) ,LS(NELNDA,NFSRF) , * ISRCHR(NISR,NPTS) ,RSRCHR(NRSR,NPTS) DIMENSION XX(27), YY(27), ZZ(27) -C + IF( NISR .LT. 1 .OR. NRSR .LT. 3 .OR. NRSS .LT. 10 )THEN IERR = 1 RETURN ENDIF -C + C check for Mesh-B point coincident with node of element in Mesh-A -C + SIDE1 = (XYZE(LS(1,IELT),1)-XYZE(LS(2,IELT),1))**2 & + (XYZE(LS(1,IELT),2)-XYZE(LS(2,IELT),2))**2 SIDE2 = (XYZE(LS(2,IELT),1)-XYZE(LS(3,IELT),1))**2 @@ -84,10 +84,10 @@ SUBROUTINE QADSRC( B = XYZE(LS(I,IELT),2) - XYZP(IPT,2) DIST = A**2+B**2 IF (DIST .LT. COTEST)THEN -C + C coincident node, so fill search results arrays C no need to check for better search result -C + INODE = I ISRCHR(1,IPT) = IELT CALL NODE (3,INODE,RSRCHR(1,IPT),RSRCHR(2,IPT), @@ -95,17 +95,17 @@ SUBROUTINE QADSRC( GO TO 100 END IF 110 CONTINUE -C + C Mesh-B point not coincident with Mesh-A node so compute isoparametric C coordinates. Use Newton's method -C + SG = 0. TG = 0. RG = 0. ITER = 0 -C + C Build Jacobian and invert -C + DO 120 I = 1, NELNDA XX(I) = XYZE(LS(I,IELT),1) YY(I) = XYZE(LS(I,IELT),2) @@ -116,17 +116,17 @@ SUBROUTINE QADSRC( & A31,A32,A33,F1,F2,F3) DETA = A11*A22 - A12*A21 IF (ABS(DETA) .GT. 1.E-25)THEN -C + AI11 = A22/DETA AI12 = -A12/DETA AI21 = -A21/DETA AI22 = A11/DETA -C + FS = F1 - XYZP(IPT,1) FT = F2 - XYZP(IPT,2) SNEW = SG - (AI11*FS + AI12*FT) TNEW = TG - (AI21*FS + AI22*FT) -C + ITER = ITER + 1 DS = ABS(SNEW-SG) DT = ABS(TNEW-TG) @@ -136,9 +136,9 @@ SUBROUTINE QADSRC( IF (ITER .EQ. ITERMX)GO TO 100 GO TO 130 ELSE -C + C Zero Jacobian - check for degenerate quad (triangular element) -C + TRITST = EPS*EPS*SIDMAX IF (SIDE1 .LT. TRITST)THEN XX(1) = XYZE(LS(1,IELT),1) @@ -176,9 +176,9 @@ SUBROUTINE QADSRC( & 0,' ',' ',0) GO TO 100 END IF -C + C Process as triangle -C + 210 CONTINUE CALL JACOBN (1,XX,YY,ZZ,SG,TG,RG,A11,A12,A13,A21,A22,A23, & A31,A32,A33,F1,F2,F3) @@ -190,17 +190,17 @@ SUBROUTINE QADSRC( & 'TRYING TO PROCESS AS A DEGENERATE QUAD (TRIANGLE)', & 0,' ',' ',0) END IF -C + AI11 = A22/DETA AI12 = -A12/DETA AI21 = -A21/DETA AI22 = A11/DETA -C + FS = F1 - XYZP(IPT,1) FT = F2 - XYZP(IPT,2) SNEW = SG - (AI11*FS + AI12*FT) TNEW = TG - (AI21*FS + AI22*FT) -C + ITER = ITER + 1 DS = ABS(SNEW-SG) DT = ABS(TNEW-TG) @@ -210,21 +210,21 @@ SUBROUTINE QADSRC( IF (ITER .EQ. ITERMX)GO TO 100 GO TO 210 END IF -C + 300 CONTINUE -C + C Newton converged, load up search results arrays if appropriate -C + IF (ABS(SNEW) .LT. STRLMT .AND. ABS(TNEW) .LT. STRLMT)THEN -C + C Search was adequate -C + FTEST = MAX(ABS(RSRCHR(1,IPT)),ABS(RSRCHR(2,IPT))) FCOMP = MAX(ABS(SNEW),ABS(TNEW)) IF (FTEST .GT. FCOMP .OR. ISRCHR(1,IPT) .EQ. 0)THEN -C + C New search is better, replace search results -C + ISRCHR(1,IPT) = IELT RSRCHR(1,IPT) = SNEW RSRCHR(2,IPT) = TNEW diff --git a/packages/seacas/libraries/mapvarlib/rda1.f b/packages/seacas/libraries/mapvarlib/rda1.f index b8ad026788e5..d81f822854e6 100644 --- a/packages/seacas/libraries/mapvarlib/rda1.f +++ b/packages/seacas/libraries/mapvarlib/rda1.f @@ -1,33 +1,32 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -c C======================================================================= *DECK,RDA1 SUBROUTINE RDA1(XA,YA,ZA,DISXA,DISYA,DISZA) -C + C ****************************************************************** -C + C SUBROUTINE TO EXTRACTREAD THE CRITICAL INPUT AND SIZING PARAMETERS C FROM THE GENESIS FILE FOR MESH-A -C + C READS MESH A, WRITES MESH C DATA AS APPROPRIATE -C + C Calls function LENSTR C Calls subroutine ERROR -C + C Called by MAPVAR -C + C ****************************************************************** -C + C XA,etc REAL Coordinates of mesh-A nodes (1:nodesa) C DISXA,etc REAL Displacements of mesh-A nodes (1:nodesa) -C + C ****************************************************************** -C + include 'aexds1.blk' include 'aexds2.blk' include 'amesh.blk' @@ -37,31 +36,31 @@ SUBROUTINE RDA1(XA,YA,ZA,DISXA,DISYA,DISZA) include 'steps.blk' include 'varnpt.blk' include 'varept.blk' -C + DIMENSION xa(*),ya(*),za(*) DIMENSION DISXA(*),DISYA(*),DISZA(*) PARAMETER (MAXQA=240) -C + C ****************************************************************** -C + C nodal point coordinates and names -C + CALL EXGCON (NTP2EX,NAMECO,IERR) -C + C Convert to upper case -C + DO 10 I = 1, NDIMA CALL EXUPCS(NAMECO(I)) 10 CONTINUE -C + CALL EXPCON (NTP4EX,NAMECO,IERR) CALL EXGCOR (NTP2EX,XA,YA,ZA,IERR) -C + C QA -C + NQAREC = EXINQI(NTP2EX,EXQA) -c + IF (NQAREC.GT.MAXQA) THEN CALL ERROR ('RDA1','TOO MANY QA RECORDS IN 1MESH-A FILE','NO. RECORDS',NQAREC,'NO. RECORDS ALLOWED',240, @@ -69,7 +68,7 @@ SUBROUTINE RDA1(XA,YA,ZA,DISXA,DISYA,DISZA) 3'IF NOT ACCEPTABLE SEE CODE SPONSOR TO INCREASE ARRAY QALINE',0) NQAREC = MAXQA END IF -C + CALL EXGQA (NTP2EX,QALINE,IERR) IF (NQAREC .EQ. MAXQA)THEN DO IQ = 1,4 @@ -80,80 +79,80 @@ SUBROUTINE RDA1(XA,YA,ZA,DISXA,DISYA,DISZA) ELSE NQAREC = NQAREC + 1 END IF -C + QALINE(1,NQAREC) = QAINFO(1) QALINE(2,NQAREC) = QAINFO(3) QALINE(3,NQAREC) = QAINFO(5) QALINE(4,NQAREC) = QAINFO(6) CALL EXPQA (NTP4EX,NQAREC,QALINE,IERR) -C + C VARIABLE NAMES -C + CALL EXGVP (NTP2EX,"G",NVARGP,IERR) -C + C Do some error checking on number of variables - got me once -C + NUMNAM = NVARGP IF (NUMNAM .GT. MXVAR)CALL ERROR('RDA1','TOO MANY VARIABLE NAMES 1IN MESH-A DATA BASE','NUMBER OF VARIABLE NAMES ENCOUNTERED SO 2FAR',NUMNAM,'NUMBER ALLOWED - FIXED DIMENSION',MXVAR,'SEE CODE 3SPONSOR FOR INCREASE IN --NAMVAR--',' ',1) -C + if (nvargp .gt. 0) then CALL EXGVAN (NTP2EX,"G",NVARGP,NAMVAR,IERR) -C + C Convert to upper case -C + DO I = 1, NVARGP CALL EXUPCS(NAMVAR(I)) end do -C + CALL EXPVP (NTP4EX,"G",NVARGP,IERR) CALL EXPVAN (NTP4EX,"G",NVARGP,NAMVAR,IERR) end if CALL EXGVP (NTP2EX,"E",NVAREL,IERR) -C + NUMNAM = NUMNAM + NVAREL IF (NUMNAM .GT. MXVAR)CALL ERROR('RDA1','TOO MANY VARIABLE NAMES 1IN MESH-A DATA BASE','NUMBER OF VARIABLE NAMES ENCOUNTERED SO 2FAR',NUMNAM,'NUMBER ALLOWED - FIXED DIMENSION',MXVAR,'SEE CODE 3SPONSOR FOR INCREASE IN --NAMVAR--',' ',1) -C + if (nvarel .gt. 0) then CALL EXGVAN (NTP2EX,"E",NVAREL,NAMVAR(NVARGP+1),IERR) -C + C Convert to upper case -C + DO I = 1, NVAREL CALL EXUPCS(NAMVAR(NVARGP+I)) end do -C + CALL EXPVP (NTP4EX,"E",NVAREL,IERR) CALL EXPVAN (NTP4EX,"E",NVAREL,NAMVAR(NVARGP+1),IERR) end if CALL EXGVP (NTP2EX,"N",NVARNP,IERR) -C + NUMNAM = NUMNAM + NVARNP IF (NUMNAM .GT. MXVAR)CALL ERROR('RDA1','TOO MANY VARIABLE NAMES 1IN MESH-A DATA BASE','NUMBER OF VARIABLE NAMES ENCOUNTERED SO 2FAR',NUMNAM,'NUMBER ALLOWED - FIXED DIMENSION',MXVAR,'SEE CODE 3SPONSOR FOR INCREASE IN --NAMVAR--',' ',1) -C + if (nvarnp .gt. 0) then CALL EXGVAN (NTP2EX,"N",NVARNP,NAMVAR(NVARGP+NVAREL+1),IERR) -C + C Convert to upper case -C + DO I = 1, NVARNP CALL EXUPCS(NAMVAR(NVARGP+NVAREL+I)) end do -C + CALL EXPVP (NTP4EX,"N",NVARNP,IERR) CALL EXPVAN (NTP4EX,"N",NVARNP,NAMVAR(NVARGP+NVAREL+1),IERR) end if -c + LC1 = LENSTR (NAMECO(1)) LC2 = LENSTR (NAMECO(2)) LC3 = 2 @@ -172,11 +171,11 @@ SUBROUTINE RDA1(XA,YA,ZA,DISXA,DISYA,DISZA) END IF END IF end do -C + IF (IDEF .NE. 0 .AND. IXDIS .NE. 0 .AND. IYDIS .NE. 0)THEN -C + C Work in deformed coordinates -C + CALL EXGNV (NTP2EX,ISTEP,IXDIS,NODESA,DISXA,IERR) CALL EXGNV (NTP2EX,ISTEP,IYDIS,NODESA,DISYA,IERR) IF (NDIMA .GE. 3) THEN @@ -188,31 +187,30 @@ SUBROUTINE RDA1(XA,YA,ZA,DISXA,DISYA,DISZA) IF (NDIMA .GE. 3) ZA(I) = ZA(I) + DISZA(I) end do ELSE -C + C No displacements in Mesh-A data, can't do deformed processing -C + IDEF = 0 END IF IF (IACCU .EQ. 1)THEN -C + C ******************************************************************** C accuracy checK C ******************************************************************** -C -C + C find needed variables C 1st velocities C coordinate names - velocity will start with "v" C and end with last character C of coordinate name -C + LC1 = LENSTR(NAMECO(1)) LC2 = LENSTR(NAMECO(2)) LC3 = 2 IF (NDIMA .EQ. 3)LC3 = LENSTR(NAMECO(3)) -C + C search nodal variables, get ptrs to vel's and elmass if available -C + IXVEL = 0 IYVEL = 0 IZVEL = 0 @@ -291,6 +289,6 @@ SUBROUTINE RDA1(XA,YA,ZA,DISXA,DISYA,DISZA) END IF 100 CONTINUE END IF -c + RETURN END diff --git a/packages/seacas/libraries/mapvarlib/rda2.f b/packages/seacas/libraries/mapvarlib/rda2.f index 5136aef9295a..a61b08940ef1 100644 --- a/packages/seacas/libraries/mapvarlib/rda2.f +++ b/packages/seacas/libraries/mapvarlib/rda2.f @@ -1,23 +1,23 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= *DECK,RDA2 SUBROUTINE RDA2 (IDBLKA,ICONA,NDLSTA,STATUS,MAXLN) -C + C ****************************************************************** -C + C SUBROUTINE TO READ MESH A, WRITE MESH C DATA AS APPROPRIATE -C + C Calls subroutine ERROR -C + C Called by MAPVAR -C + C ****************************************************************** -C + C IDBLKA INT Element block I.D. donor mesh C ICONA INT Connectivity for elt block (1:nelnda,1:numeba) C NDLSTA INT The array that identifies the local element block node @@ -28,35 +28,34 @@ SUBROUTINE RDA2 (IDBLKA,ICONA,NDLSTA,STATUS,MAXLN) C NUMNDA INT Number of nodes in element block C NUMEBA INT Number of elements in element block C MAXLN INT Maximum number of elements per node for INVCON -C + C ****************************************************************** -C + CHARACTER*(32) TYP -C + include 'aexds1.blk' include 'aexds2.blk' include 'amesh.blk' include 'ebbyeb.blk' include 'ex2tp.blk' include 'steps.blk' -C + DIMENSION ICONA(NELNDA,*),NDLSTA(*),STATUS(*) -C + C ****************************************************************** -C + C element type per element block -C -C + C fix this routine when i have time C create array 1-nnodes C loop over all elements - add 1 to value in array whenever C node appears in connectivity C maxln = max value of array -C + CALL EXGELB (NTP2EX,IDBLKA,TYP,NUMEBA,NELNDA, & NATRIB,IERR) CALL EXUPCS(TYP) -c + IF (TYP(1:3) .EQ. 'QUA')THEN IF (NELNDA .EQ. 4)THEN ITYPE = 3 @@ -78,22 +77,21 @@ SUBROUTINE RDA2 (IDBLKA,ICONA,NDLSTA,STATUS,MAXLN) CALL ERROR ('RDA2','UNSUPPORTED ELEMENT TYPE',' ',0,' ',0, 1 'TYPE',typ,1) END IF -C -C + CALL EXGELC(NTP2EX,IDBLKA,ICONA(1,1),IERR) -C + DO 5 I = 1, NODESA NDLSTA(I) = 0 5 CONTINUE -C + DO 10 IEL = 1, NUMEBA DO 20 INODE = 1, NELNDA NDLSTA(ICONA(INODE,IEL)) = NDLSTA(ICONA(INODE,IEL)) + 1 20 CONTINUE 10 CONTINUE -C + NUMNDA = 0 -C + MAXLN = 0 DO 30 I = 1, NODESA IF (NDLSTA(I) .GT. 0) THEN @@ -105,10 +103,9 @@ SUBROUTINE RDA2 (IDBLKA,ICONA,NDLSTA,STATUS,MAXLN) END IF 30 CONTINUE -C C get STATUS array for use in SEARCH so that dead elements can be C eliminated from the search -C + DO 99 I = 1, NUMEBA STATUS(I) = 0. 99 CONTINUE @@ -116,6 +113,6 @@ SUBROUTINE RDA2 (IDBLKA,ICONA,NDLSTA,STATUS,MAXLN) IF (NAMVAR(nvargp+ISTATUS) .NE. 'STATUS')GO TO 100 CALL EXGEV(NTP2EX,ISTEP,ISTATUS,IDBLKA,NUMEBA,STATUS,IERR) 100 CONTINUE -c + RETURN END diff --git a/packages/seacas/libraries/mapvarlib/rdb1.f b/packages/seacas/libraries/mapvarlib/rdb1.f index 04f918be6e08..fcb93ee61882 100644 --- a/packages/seacas/libraries/mapvarlib/rdb1.f +++ b/packages/seacas/libraries/mapvarlib/rdb1.f @@ -1,34 +1,33 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -c C====================================================================== *DECK,RDB1 SUBROUTINE RDB1(XB,YB,ZB) -C + C ***************************************************************** -C + C READS MESH-B -C + C Called by MAPVAR -C + C ***************************************************************** -C + C XB,etc Original coordinates read from Mesh-B -C + C ***************************************************************** -C + include 'ex2tp.blk' -C + DIMENSION XB(*),YB(*),ZB(*) C ***************************************************************** -C + C read coordinates -C + CALL EXGCOR (NTP3EX,XB,YB,ZB,IERR) -C + RETURN END diff --git a/packages/seacas/libraries/mapvarlib/rdb2.f b/packages/seacas/libraries/mapvarlib/rdb2.f index 8c2a976e41aa..9aea449dd9f5 100644 --- a/packages/seacas/libraries/mapvarlib/rdb2.f +++ b/packages/seacas/libraries/mapvarlib/rdb2.f @@ -1,52 +1,52 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= *DECK,RDB2 SUBROUTINE RDB2 (IDBLKB,IDBLKA,ICONB,NDLSTB) -C + C ****************************************************************** -C + C SUBROUTINE TO GET MESH B DATA -c + C Calls subroutine ERROR -C + C Called by MAPVAR -C + C ****************************************************************** -C + C IDBLKA INT Element block I.D. - donor mesh C IDBLKB INT Element block I.D. - recipient mesh C ICONB INT Connectivity of block in donor mesh (1:nelndb,1:numebb) C NDLSTB INT Vector of nodes in element block donor mesh (1:nodesb) -C + C ****************************************************************** -C + character*(32) typ,typa -C + include 'bmesh.blk' include 'ebbyeb.blk' include 'ex2tp.blk' -C + DIMENSION ICONB(NELNDB,*),NDLSTB(*) -C + C ****************************************************************** -C + C READ ELEMENT NAMES AND ID BLOCKS -C + CALL EXGELB(NTP3EX,IDBLKB,TYP,NUMEBB,NELNDB,NATRIB,IERR) CALL EXUPCS(TYP) CALL EXGELB(NTP2EX,IDBLKA,TYPA,IDUM,IDUM,IDUM,IERR) CALL EXUPCS(TYPA) -c + c check here for match of mesh-A element block to mesh-B element block. c Probably need to put this into a DO LOOP over all element block id's c in mesh B. For now, assume that element blocks match if id's match. c Only check element types. -c + IF (TYP(1:3) .NE. TYPA(1:3)) THEN CALL ERROR('RDB2', & 'ELEMENT TYPE MISMATCH - MESH-B DOES NOT MATCH MESH-A', diff --git a/packages/seacas/libraries/mapvarlib/rdinpt.f b/packages/seacas/libraries/mapvarlib/rdinpt.f index 04f1171941a4..d7f004d4c687 100644 --- a/packages/seacas/libraries/mapvarlib/rdinpt.f +++ b/packages/seacas/libraries/mapvarlib/rdinpt.f @@ -1,31 +1,31 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE RDINPT (TIMES,IDA,IDB,MP,SEABMP,IMP,MBLK) -C + C ****************************************************************** -C + C SUBROUTINE TO READ, CHECK AND PRINT INPUT DATA FROM STD-INPUT C BATCH TYPE EXECUTION IS ACCOMPLISHEDBY PIPING INPUT DATA C FROM A TEXT FILE; NORMALLY INPUT READ INTERACTIVELY. C INPUT IS READ UNDER A FREE FIELD FORMAT IN SUBROUTINE FREFLD -C + C SUBROUTINE FREFLD IS PART OF THE EXTERNAL "SUPES" C LIBRARY (SAND86-0911) -C + C Calls subroutines BANNR2, ERROR -C + C Called by MAPVAR -C + C ****************************************************************** -C + include 'exodusII.inc' CHARACTER*10 CVAL -C + include 'amesh.blk' include 'bmesh.blk' include 'contrl.blk' @@ -36,17 +36,17 @@ SUBROUTINE RDINPT (TIMES,IDA,IDB,MP,SEABMP,IMP,MBLK) include 'tapes.blk' include 'debg.blk' include 'inival.blk' -C + DIMENSION KVALUE(8),CVAL(8),IVALUE(8),RVALUE(8) DIMENSION TIMES(*),IDA(*),IDB(*),MP(3,*) C search box size per map DIMENSION SEABMP(*) -C + C ****************************************************************** MFIELD = 8 -C + C PRINT RUN-TIME DATA -C + WRITE (NOUT, 1000) WRITE (NTPOUT, 1000) CALL BANNR2 (84,QAINFO(1),NOUT) @@ -61,9 +61,9 @@ SUBROUTINE RDINPT (TIMES,IDA,IDB,MP,SEABMP,IMP,MBLK) WRITE (NTPOUT, 1040) QAINFO(6) WRITE (NOUT, 1050) WRITE (NTPOUT, 1050) -C + C default map -C + CALL EXGEBI(NTP2EX,IDA,IERR) CALL EXGEBI(NTP3EX,IDB,IERR) IMP = 0 @@ -80,7 +80,7 @@ SUBROUTINE RDINPT (TIMES,IDA,IDB,MP,SEABMP,IMP,MBLK) END IF 3 CONTINUE 2 CONTINUE -C + NUMTIM = EXINQI (NTP2EX,EXTIMS) CALL EXGATM (NTP2EX,TIMES,IERR) OUTTIM = -1. @@ -89,11 +89,11 @@ SUBROUTINE RDINPT (TIMES,IDA,IDB,MP,SEABMP,IMP,MBLK) 4 CONTINUE WRITE (NOUT, 1060) WRITE (NOUT, 1061) -C + 5 CONTINUE CALL FREFLD (0,0,'CMD >',MFIELD,IOSTAT,NFIELD,KVALUE,CVAL, 1IVALUE,RVALUE) -C + if (iostat .ne. 0) go to 100 if (nfield .eq. 0) go to 5 IF (KVALUE(1) .NE. 0) GO TO 10 @@ -117,19 +117,19 @@ SUBROUTINE RDINPT (TIMES,IDA,IDB,MP,SEABMP,IMP,MBLK) IF (CVAL(1)(1:3) .EQ. 'END') GO TO 100 IF (CVAL(1)(1:3) .EQ. 'EXI') GO TO 100 IF (CVAL(1)(1:3) .EQ. 'RUN') GO TO 100 -C + 10 CONTINUE -C + C Bad input -C + WRITE (NOUT,1100) CVAL(1) WRITE (NTPOUT,1100) CVAL(1) GO TO 5 -C + 20 CONTINUE -C + C Help -C + IF (NFIELD .EQ. 1)THEN GO TO 4 ELSE IF (CVAL(2)(1:3) .EQ. 'TIM') THEN @@ -156,11 +156,11 @@ SUBROUTINE RDINPT (TIMES,IDA,IDB,MP,SEABMP,IMP,MBLK) WRITE(NOUT,2070) GO TO 5 END IF -C + 30 CONTINUE -C + C Time -C + IF (KVALUE(2) .NE. 1 .AND. KVALUE(2) .NE. 2)THEN IF(CVAL(2)(1:3) .EQ. 'ALL')THEN ISTEP = -1 @@ -172,9 +172,9 @@ SUBROUTINE RDINPT (TIMES,IDA,IDB,MP,SEABMP,IMP,MBLK) GO TO 5 END IF ELSE -C + C convert time to closest time step -C + RTIME = RVALUE(2) ISTEP = NUMTIM DO 32 I = 1, NUMTIM - 1 @@ -187,11 +187,11 @@ SUBROUTINE RDINPT (TIMES,IDA,IDB,MP,SEABMP,IMP,MBLK) 33 WRITE(NOUT,3020)RTIME,TIMES(ISTEP),ISTEP GO TO 5 END IF -C + 35 CONTINUE -C + C Step -C + IF (KVALUE(2) .NE. 1 .AND. KVALUE(2) .NE. 2)THEN IF(CVAL(2)(1:3) .EQ. 'ALL')THEN ISTEP = -1 @@ -207,11 +207,11 @@ SUBROUTINE RDINPT (TIMES,IDA,IDB,MP,SEABMP,IMP,MBLK) WRITE(NOUT,3025)ISTEP,TIMES(ISTEP) GO TO 5 END IF -C + 39 CONTINUE -C + C output time -C + IF (ISTEP .EQ. -1)THEN WRITE(NOUT,3040) GO TO 5 @@ -226,19 +226,19 @@ SUBROUTINE RDINPT (TIMES,IDA,IDB,MP,SEABMP,IMP,MBLK) WRITE(NOUT,3030)CVAL(2),CVAL(3) END IF GO TO 5 -C + 40 CONTINUE -C + C List times -C + WRITE (NOUT,4000) WRITE (NOUT,4010)(TIMES(I),I=1,NUMTIM) GO TO 5 -C + 50 CONTINUE -C + C Scheme -C + IF (KVALUE(2) .NE. 2)THEN WRITE(NOUT,5000)CVAL(2) GO TO 5 @@ -259,12 +259,12 @@ SUBROUTINE RDINPT (TIMES,IDA,IDB,MP,SEABMP,IMP,MBLK) WRITE(NOUT,5040)ISCHEM END IF GO TO 5 -C + 60 CONTINUE -C + C Searchbox (tolerance) C Searchbox toler_shell, toler_quad, toler_hex, toler_tet -C + if (nfield .eq. 2) then IF (KVALUE(2) .EQ. 1 .OR. KVALUE(2) .EQ. 2) THEN TOLSHL = RVALUE(2) @@ -313,11 +313,11 @@ SUBROUTINE RDINPT (TIMES,IDA,IDB,MP,SEABMP,IMP,MBLK) end if GO TO 5 end if -C + 65 CONTINUE -C + C Initial Value (value) -C + IF (KVALUE(3) .EQ. 1 .OR. KVALUE(3) .EQ. 2) THEN VALINI = RVALUE(3) WRITE(NOUT,6501) VALINI @@ -328,9 +328,9 @@ SUBROUTINE RDINPT (TIMES,IDA,IDB,MP,SEABMP,IMP,MBLK) GO TO 5 70 CONTINUE -C + C Deformed vs undeformed processing -C + IF (KVALUE(2) .NE. 2)THEN WRITE(NOUT,7000)CVAL(2) GO TO 5 @@ -352,11 +352,11 @@ SUBROUTINE RDINPT (TIMES,IDA,IDB,MP,SEABMP,IMP,MBLK) WRITE(NOUT,7040)idef END IF GO TO 5 -C + 75 CONTINUE -C + C Debug output -C + IF (KVALUE(2) .NE. 2)THEN WRITE(NOUT,7005)CVAL(2) GO TO 5 @@ -367,9 +367,9 @@ SUBROUTINE RDINPT (TIMES,IDA,IDB,MP,SEABMP,IMP,MBLK) GO TO 5 80 CONTINUE -C + C Map definition - donor mesh e-block to recipient mesh e-block -C + if (nfield .eq. 2 .and. cval(2)(1:3) .eq. 'RES') then C ... Reset to no block mappings. IMP = 0 @@ -583,12 +583,12 @@ SUBROUTINE RDINPT (TIMES,IDA,IDB,MP,SEABMP,IMP,MBLK) WRITE(NTPOUT,8060)CVAL(2) GO TO 5 END IF -C + 89 CONTINUE -C + C Read integer flag for accuracy checks (comparison of C various quantities between donor and recipient meshes -C + IF (KVALUE(2) .NE. 2) THEN WRITE (NOUT,8900)CVAL(2) WRITE (NTPOUT,8900)CVAL(2) @@ -606,28 +606,27 @@ SUBROUTINE RDINPT (TIMES,IDA,IDB,MP,SEABMP,IMP,MBLK) WRITE(NTPOUT,8930)IACCU END IF GO TO 5 -C + 90 CONTINUE -C + C Stop execution -C + WRITE(NOUT,9000) WRITE(NTPOUT,9000) CALL ERROR('RDINPT','YOU ELECTED TO TERMINATE THE PROGRAM',' ', & 0,' ',0,' ',' ',1) -C + 100 CONTINUE -C + C Continue execution (run) -C + C sort map array (MP) on second entry (recipient mesh element block) C this is required because of way mapping of multiple donor mesh C element blocks into one recipient mesh element blocks is C implemented (required to have all such maps located sequentially) C a simple sort on the 2nd entry accomplishes this and is easier C than rewriting the offending algorithm -C -C + IBOTOM = IMP - 1 110 ISWICH = 1 DO 120 I = 1, IBOTOM @@ -657,9 +656,9 @@ SUBROUTINE RDINPT (TIMES,IDA,IDB,MP,SEABMP,IMP,MBLK) GO TO 110 END IF 130 CONTINUE -C + C end sort -C + WRITE(NOUT,10000) WRITE(NTPOUT,10000) IF (ISTEP .EQ. -1) THEN @@ -729,10 +728,10 @@ SUBROUTINE RDINPT (TIMES,IDA,IDB,MP,SEABMP,IMP,MBLK) 3' RUN - END INPUT - RESUME PROGRAM',/, 3' QUIT - TERMINATES THE PROGRAM',/, 4' STOP - TERMINATES THE PROGRAM') -C + 1100 FORMAT(5X,'UNKNOWN INPUT - READING',A20,/, 1' PLEASE TRY AGAIN') -C + 2000 FORMAT(5X,'TIMe ',//, 1' IF A REAL NUMBER VALUE IS ENTERED, IT REPRESENTS',/, 2' THE TIME (STEP) SELECTED AT WHICH VARIABLES WILL',/, @@ -819,7 +818,7 @@ SUBROUTINE RDINPT (TIMES,IDA,IDB,MP,SEABMP,IMP,MBLK) 4' 0 - NO CHECK QUANTITIES COMPUTED',/, 5' 1 - ALL APPROPRIATE QUANTITIES COMPUTED',/, 6' DEFAULT - 0') -C + 3000 FORMAT(5X,'TIME YOU HAVE ENTERED - TIMES ALL',/, 1' ALL THE TIME STEPS WILL BE MAPPED',/, 2' ONLY UNDEFORMED GEOMETRY PROCESSING IS',/, @@ -850,10 +849,10 @@ SUBROUTINE RDINPT (TIMES,IDA,IDB,MP,SEABMP,IMP,MBLK) 3040 FORMAT(5X,'YOU HAVE ALREADY SELECTED TO PROCESS',/, 1' ALL TIME STEPS AVAILABLE. YOU CANNOT ALSO',/, 2' CHANGE THE OUTPUT TIME') -C + 4000 FORMAT(5X,'TIMES AVAILABLE FROM THE RESTART FILE') 4010 FORMAT(5X,/,E14.6) -C + 5000 FORMAT(5X,'READING SCHEME COMMAND',/, 1' EXPECTED AN INTEGER IN FIELD 2',/, 2' READ',A20,/, @@ -869,7 +868,7 @@ SUBROUTINE RDINPT (TIMES,IDA,IDB,MP,SEABMP,IMP,MBLK) 5040 FORMAT(5X,'YOU HAVE ENTERED SCHEME ',I5,/, 1' THIS SCHEME HAS NOT BEEN IMPLEMENTED',/, 2' PLEASE TRY AGAIN') -C + 6000 FORMAT(//,5X,'YOU HAVE ENTERED SEARCH ',F12.4,/, 1' VALUES GREATER THAN 1. ARE NOT RECOMMENDED') 6001 FORMAT(//,5X,A,' Search Tolerance is ',F12.4) @@ -886,7 +885,7 @@ SUBROUTINE RDINPT (TIMES,IDA,IDB,MP,SEABMP,IMP,MBLK) 1' EXPECTED A REAL NUMBER IN FIELD 3',/, 2' READ',A20,/, 3' PLEASE TRY AGAIN') -C + 7000 FORMAT(5X,'READING DEFORMED GEOMETRY COMMAND',/, 1' EXPECTED AN INTEGER IN FIELD 2',/, 2' READ',A20,/, @@ -914,7 +913,7 @@ SUBROUTINE RDINPT (TIMES,IDA,IDB,MP,SEABMP,IMP,MBLK) 7040 FORMAT(//,5X,'YOU HAVE ENTERED - DEFORMED',I5,/, 1' value - MUST BE EITHER 0 OR 1',/, 2' PLEASE TRY AGAIN') -C + 8000 FORMAT(5x,'Reset all block mappings.') 8010 FORMAT(5X,'READING MAP COMMAND',/, &' EXPECTING THE CHARACTER STRING "TO" ',/, @@ -939,7 +938,7 @@ SUBROUTINE RDINPT (TIMES,IDA,IDB,MP,SEABMP,IMP,MBLK) 8080 FORMAT(10X,I7) 8090 FORMAT(//,5x,'ERROR: The entered id ', i5, * ' is not a valid block id.',/) -C + 8900 FORMAT(5X,'READING CHECK ACCURACY COMMAND',/, 1' EXPECTED AN INTEGER IN FIELD 2',/, 2' READ',A20,/, @@ -952,10 +951,10 @@ SUBROUTINE RDINPT (TIMES,IDA,IDB,MP,SEABMP,IMP,MBLK) 3' COMPARISON BETWEEN THE DONOR AND RECIPIENT MESHES') 8930 FORMAT(//,5X,'YOU HAVE ENTERED - CHECK',I5,/, 1' ONLY VALUES 0 OR 1 HAVE BEEN IMPLEMENTED') -C + 9000 FORMAT(5X,'YOU HAVE ELECTED TO TERMINATE THE PROGRAM',/, 1' NOTHING WILL BE COMPUTED OR SAVED') -C + 10000 FORMAT(5X,'LEAVING RDINPT - VALUES USED ARE:',//) 10010 FORMAT(//5X,'YOU HAVE ENTERED FOR THE TIMES COMMAND',/, 1' *TIMES ALL* - ALL TIME STEPS WILL BE MAPPED',//) @@ -966,7 +965,7 @@ SUBROUTINE RDINPT (TIMES,IDA,IDB,MP,SEABMP,IMP,MBLK) 4' TIME STEP',/, 5' istep =',i5,//) 10030 FORMAT(5X,'MAP TO BE USED:') -C + END subroutine pmap(imp, mp, seabmp, nout) diff --git a/packages/seacas/libraries/mapvarlib/rundat.blk b/packages/seacas/libraries/mapvarlib/rundat.blk index 8f226eef2b67..b4dfd642b1e4 100644 --- a/packages/seacas/libraries/mapvarlib/rundat.blk +++ b/packages/seacas/libraries/mapvarlib/rundat.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details CHARACTER*(32) QAINFO(6) diff --git a/packages/seacas/libraries/mapvarlib/schdat.blk b/packages/seacas/libraries/mapvarlib/schdat.blk index 38f9fddb1669..7236a640aee4 100644 --- a/packages/seacas/libraries/mapvarlib/schdat.blk +++ b/packages/seacas/libraries/mapvarlib/schdat.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /SCHDAT/ TOLSHL,TOLQAD,TOLHEX,TOLTET,NISS,NRSS,LBLK diff --git a/packages/seacas/libraries/mapvarlib/seton0.f b/packages/seacas/libraries/mapvarlib/seton0.f index 09328dc7ab51..1b2b578a04b0 100644 --- a/packages/seacas/libraries/mapvarlib/seton0.f +++ b/packages/seacas/libraries/mapvarlib/seton0.f @@ -1,16 +1,16 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================== * DECK, SETON0 SUBROUTINE SETON0(ICONA,NELTN,SOLEA,SOLENA,IDBLK,XA,YA,ZA,ISTP, & ITT,iblk) -C +C C ********************************************************************* -C +C C Subroutine SETON0 extracts nodal values of shell element variables by C looping over each element and summing the value of the variable C in that element to each node in the connectivity list for that @@ -18,19 +18,19 @@ SUBROUTINE SETON0(ICONA,NELTN,SOLEA,SOLENA,IDBLK,XA,YA,ZA,ISTP, C by the number of elements that contributed to that node (resulting C in a nodal average of the element value.) This is done for the old C mesh elements and nodes to facilitate interpolation. -C +C C Each element block must be processed independently in order to C avoid averaging element variables across material boundaries. C Note: the last set of DO loops acts over all nodes; to make sense C one element block must be completely processed before another C element block is sent into this subroutine. -C +C C Calls subroutine VOL -C +C c Called by MAPVAR -C +C C ********************************************************************* -C +C C ICONA mesh-A connectivity (1:nelnda,1:numeba) C NELTN number of elements tied to each node (1:nodesa) C SOLEA element variables (1:numeba,1:nvarel) @@ -41,22 +41,22 @@ SUBROUTINE SETON0(ICONA,NELTN,SOLEA,SOLENA,IDBLK,XA,YA,ZA,ISTP, C ISTP current time step C ITT truth table C iblk element block being processed (not ID) -C +C C ********************************************************************* -C +C include 'aexds1.blk' include 'aexds2.blk' include 'amesh.blk' include 'ebbyeb.blk' include 'ex2tp.blk' include 'tapes.blk' -C +C DIMENSION ICONA(NELNDA,*), NELTN(*) DIMENSION SOLEA(NUMEBA,*), SOLENA(NODESA,NVAREL), ITT(NVAREL,*) DIMENSION XA(*), YA(*), ZA(*), XX(27), YY(27), ZZ(27) -C +C C ********************************************************************* -C +C NNODES = 4 DO I = 1, NODESA NELTN(I) = 0 @@ -64,25 +64,25 @@ SUBROUTINE SETON0(ICONA,NELTN,SOLEA,SOLENA,IDBLK,XA,YA,ZA,ISTP, SOLENA(I,J) = 0. end do end do -C +C DO NEL = 1, NUMEBA DO I = 1, NNODES -C +C C number of elements associated with each node - used for C computing an average later on -C +C NELTN(ICONA(I,NEL)) = NELTN(ICONA(I,NEL)) + 1 end do end do -C +C DO IVAR = 1, NVAREL IF (ITT(IVAR,iblk) .EQ. 0)GO TO 40 CALL EXGEV(NTP2EX,ISTP,IVAR,IDBLK,NUMEBA,SOLEA(1,IVAR),IERR) -C +C IF (NAMVAR(nvargp+IVAR)(1:6) .EQ. 'ELMASS') THEN -C +C C replace element mass with nodal density for interpolation -C +C DO IEL = 1, NUMEBA DO I = 1, NNODES XX(I) = XA(ICONA(I,IEL)) @@ -93,18 +93,18 @@ SUBROUTINE SETON0(ICONA,NELTN,SOLEA,SOLENA,IDBLK,XA,YA,ZA,ISTP, SOLEA(IEL,IVAR) = SOLEA(IEL,IVAR) / VOLUME end do END IF -C +C C accumulate element variables to nodes -C +C DO NEL = 1, NUMEBA DO I = 1, NNODES SOLENA(ICONA(I,NEL),IVAR) = & SOLENA(ICONA(I,NEL),IVAR) + SOLEA(NEL,IVAR) end do end do -C +C C divide by number of elements contributing to each node (average) -C +C DO I = 1, NODESA IF(NELTN(I) .NE. 0)THEN SOLENA(I,IVAR) = SOLENA(I,IVAR) / dble(NELTN(I)) diff --git a/packages/seacas/libraries/mapvarlib/seton1.f b/packages/seacas/libraries/mapvarlib/seton1.f index d8a42b608b44..69c6d8840301 100644 --- a/packages/seacas/libraries/mapvarlib/seton1.f +++ b/packages/seacas/libraries/mapvarlib/seton1.f @@ -1,33 +1,33 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= *DECK, SETON1 SUBROUTINE SETON1(CNTRA,SOLEA,SOLENA,IDBLK,XA,YA,ZA,ICONA, & NDLSTA,INVLN,INVCN,MAXLN,ISTP,ITT,iblk) -C + C ********************************************************************* -C + C Subroutine SETON1 extracts nodal values of element variables by C performing a weighted least squares fit (4 or more elements) or C a triangulation (3 elements) over the centroids of the elements C attached to the current node. -C + C Each element block must be processed independently in order to C avoid averaging element variables across material boundaries. C Note: the last set of DO loops acts over all nodes; to make sense C one element block must be completely processed before another C element block is sent into this subroutine. -C + C Calls subroutines CNTR, VOL, EXTS, AVG, ERROR -C + C Called by MAPVAR -C + C ********************************************************************* -C + C CNTRA a list of element centroid coordinates for all elements C in the current element block (1:ndima,1:numeba) C SOLEA element variables (1:numeba,1:nvarel) @@ -41,35 +41,35 @@ SUBROUTINE SETON1(CNTRA,SOLEA,SOLENA,IDBLK,XA,YA,ZA,ICONA, C MAXLN maximum number of elements connected to any node C ITT truth table C iblk element block being processed (not ID) -C + C** RELATIONSHIP BETWEEN NODAL IDENTIFICATIONS ** C IGLND = NDLSTA(INOD) = ICONA(NOWLND,INVCN(1,IGLND)) -C + C ********************************************************************* -C + include 'aexds1.blk' include 'aexds2.blk' include 'amesh.blk' include 'ebbyeb.blk' include 'ex2tp.blk' include 'tapes.blk' -C + DIMENSION CNTRA(NUMEBA,*), SOLEA(NUMEBA,*) DIMENSION SOLENA(NODESA,NVAREL) DIMENSION XX(27), YY(27), ZZ(27) DIMENSION XA(*), YA(*), ZA(*), ICONA(NELNDA,*), NDLSTA(*) DIMENSION INVCN(MAXLN,*),INVLN(*), ITT(NVAREL,*) -C + C ********************************************************************* -C + DO I = 1, NODESA DO J = 1, NVAREL SOLENA(I,J) = 0. end do end do -C + C load up CNTRA array - coordinates of donor mesh element centroids -C + NNODES = 4 DO IEL = 1, NUMEBA DO I = 1, NNODES @@ -80,17 +80,17 @@ SUBROUTINE SETON1(CNTRA,SOLEA,SOLENA,IDBLK,XA,YA,ZA,ICONA, end do CALL CNTR(13,XX,YY,ZZ,CNTRA(IEL,1),CNTRA(IEL,2),CNTRA(IEL,3)) end do -C + C put element variables into SOLEA array -C + DO IVAR = 1, NVAREL IF (ITT(IVAR,iblk) .EQ. 0)GO TO 30 CALL EXGEV(NTP2EX,ISTP,IVAR,IDBLK,NUMEBA,SOLEA(1,IVAR),IERR) -C + IF (NAMVAR(nvargp+IVAR)(1:6) .EQ. 'ELMASS') THEN -C + C replace element mass with density -C + DO IEL = 1, NUMEBA DO I = 1, NNODES XX(I) = XA(ICONA(I,IEL)) @@ -103,37 +103,37 @@ SUBROUTINE SETON1(CNTRA,SOLEA,SOLENA,IDBLK,XA,YA,ZA,ICONA, END IF 30 CONTINUE end do -C + C start least squares extrapolation C Find the elements connected to the node. If fewer than 3 elements, C adjust search to find additional elements. If unable to get at C least 3 elements, must be treated as special case (just average C element values at node)(see below). -C + DO INOD = 1, NUMNDA IGLND = NDLSTA(INOD) -C + C Process special case of only 1 element attached to node -C + IF (INVLN(IGLND) .EQ. 1)THEN -C + C Get node number diagonally across element, in most cases this C node will have 4 elements attached. -C + NXTLND = 0 DO I = 1, NNODES IF (IGLND .EQ. ICONA(I,INVCN(1,IGLND)))NXTLND = I + 2 end do IF (NXTLND .GT. NNODES) NXTLND = NXTLND - NNODES NXGLND = ICONA(NXTLND,INVCN(1,IGLND)) -C + C If 3 or more elements, c fit a plane through the element centroids, project element c centroids and original node onto plane, extrapolate c in 2-d (coords of plane) to original node (done in EXTS). c If 2 or less elements, c average original element variables at original node -c + IF (INVLN(NXGLND) .GT. 2)THEN CALL EXTS(IGLND,INVCN,MAXLN,NXGLND,INVLN(NXGLND),XA,YA,ZA, & CNTRA,SOLEA,SOLENA,ITT,iblk) @@ -141,14 +141,14 @@ SUBROUTINE SETON1(CNTRA,SOLEA,SOLENA,IDBLK,XA,YA,ZA,ICONA, CALL AVG(IGLND,INVCN,MAXLN,INVLN(IGLND),SOLEA,SOLENA, & ITT,iblk) END IF -C + C Process special case of only 2 elements attached to node -C + ELSE IF (INVLN(IGLND) .EQ. 2)THEN -c + c get second node that is shared by both elements. That is the c node on the other end of the shared element side. -c + DO I = 1, NNODES DO J = 1, NNODES IF(ICONA(I,INVCN(1,IGLND)) .NE. IGLND .AND. @@ -156,10 +156,10 @@ SUBROUTINE SETON1(CNTRA,SOLEA,SOLENA,IDBLK,XA,YA,ZA,ICONA, & NXGLND = ICONA(I,INVCN(1,IGLND)) end do end do -c +c c If this second node has more than 3 elements, extrapolate. Otherwise c average. (at original node) -c + IF (INVLN(NXGLND) .GT. 2)THEN CALL EXTS(IGLND,INVCN,MAXLN,NXGLND,INVLN(NXGLND),XA,YA,ZA, & CNTRA,SOLEA,SOLENA,ITT,iblk) diff --git a/packages/seacas/libraries/mapvarlib/shapef.f b/packages/seacas/libraries/mapvarlib/shapef.f index 2777e5d823b0..4b0df4af186a 100644 --- a/packages/seacas/libraries/mapvarlib/shapef.f +++ b/packages/seacas/libraries/mapvarlib/shapef.f @@ -1,62 +1,61 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: shapef.f,v 1.3 2007/10/17 18:43:50 gdsjaar Exp $ SUBROUTINE SHAPEF (ITYPE,SP,TP,RP,SOLN,BVALUE) -C + C ****************************************************************** -C + C SUBROUTINE TO EVALUATE THE SOLUTION AT A POINT (SP,TP,RP) C WITHIN AN ELEMENT -C + C Called by INTRPE & INTRPN -C + C ****************************************************************** -C + C SP INT The KSI isoparametric coord of the point in the element C TP INT The ETA isoparametric coord of the point in the element C RP INT The PHI isoparametric coord of the point in the element C SOLN REAL The variables at the nodes of the element C BVALUE REAL The value of the variable at the point inside the element -C + C ****************************************************************** -C + DIMENSION SOLN(*) -C + C ****************************************************************** -C + C SELECT TYPE OF ELEMENT -C + GO TO (10, 20, 30, 40, 50, 60, 70, 80, 90, 100, 110, 120), ITYPE -C + C 3-NODE TRIANGLE -C + 10 CONTINUE PP=1.-SP-TP BVALUE=SOLN(1)*SP+SOLN(2)*TP+SOLN(3)*PP RETURN -C + C 6-NODE TRIANGLE -C + 20 CONTINUE PP=1.-SP-TP BVALUE=SOLN(1)*SP*(2.*SP-1.)+SOLN(2)*TP*(2.*TP-1.)+ 1 SOLN(3)*PP*(2.*PP-1.)+SOLN(4)*4.*SP*TP+ 2 SOLN(5)*4.*TP*PP+SOLN(6)*4.*SP*PP RETURN -C + C 4-NODE QUADRILATERAL -C + 30 CONTINUE BVALUE=.25*(SOLN(1)*(1.-SP)*(1.-TP)+SOLN(2)*(1.+SP)*(1.-TP)+ 1 SOLN(3)*(1.+SP)*(1.+TP)+SOLN(4)*(1.-SP)*(1.+TP)) RETURN -C + C 8-NODE QUADRILATERAL -C + 40 CONTINUE BVALUE=.25*(SOLN(1)*(1.-SP)*(1.-TP)*(-SP-TP-1.)+ 1 SOLN(2)*(1.+SP)*(1.-TP)*(SP-TP-1.)+ @@ -67,9 +66,9 @@ SUBROUTINE SHAPEF (ITYPE,SP,TP,RP,SOLN,BVALUE) 6 SOLN(7)*(1.-SP*SP)*(1.+TP)+ 7 SOLN(8)*(1.-SP)*(1.-TP*TP)) RETURN -C + C 9-NODE QUADRILATERAL -C + 50 CONTINUE BVALUE=.25*(SOLN(1)*(1.-SP)*(1.-TP)*(SP*TP)+ 1 SOLN(2)*(1.+SP)*(1.-TP)*(-SP*TP)+ @@ -81,20 +80,20 @@ SUBROUTINE SHAPEF (ITYPE,SP,TP,RP,SOLN,BVALUE) 7 SOLN(8)*(1.-SP)*(1.-TP*TP)*(-SP))+ 8 SOLN(9)*(1.-SP*SP)*(1.-TP*TP) RETURN -C + C 4-NODE TETRAHEDRON -C + 60 CONTINUE PP=1.-SP-TP-RP C BVALUE=SOLN(1)*SP+SOLN(2)*TP+SOLN(3)*RP+SOLN(4)*PP C fix gww 8/24/00 - probably same fix for 10-node tet but not done yet C merlin had opposite nodal order (left hand rule for + volume) -C + BVALUE=SOLN(1)*SP+SOLN(2)*TP+SOLN(3)*PP+SOLN(4)*RP RETURN -C + C 10-NODE TETRAHEDRON -C + 70 CONTINUE PP=1.-SP-TP-RP BVALUE= SOLN(1)*SP*(2.*SP-1.)+SOLN(2)*TP*(2.*TP-1.)+ @@ -102,17 +101,17 @@ SUBROUTINE SHAPEF (ITYPE,SP,TP,RP,SOLN,BVALUE) 2 4.*(SOLN(5)*SP*TP+SOLN(6)*TP*RP+SOLN(7)*RP*SP+ 3 SOLN(8)*SP*PP+SOLN(9)*TP*PP+SOLN(10)*RP*PP) RETURN -C + C 6-NODE PRISM -C + 80 CONTINUE PP=1.-SP-TP BVALUE=(SOLN(1)*SP+SOLN(2)*TP+SOLN(3)*PP)*.5*(1.-RP)+ 1 (SOLN(4)*SP+SOLN(5)*TP+SOLN(6)*PP)*.5*(1.+RP) RETURN -C + C 15-NODE PRISM -C + 90 CONTINUE PP=1.-SP-TP AA=1.-RP @@ -128,9 +127,9 @@ SUBROUTINE SHAPEF (ITYPE,SP,TP,RP,SOLN,BVALUE) 7 (SOLN(10)*SP+SOLN(11)*TP+SOLN(12)*PP)*CC+ 8 2.*BB*(SOLN(13)*SP*TP+SOLN(14)*TP*PP+SOLN(15)*PP*SP) RETURN -C + C 8-NODE HEX -C + 100 CONTINUE BVALUE=.125*(SOLN(1)*(1.-SP)*(1.-TP)*(1.-RP)+ 1 SOLN(2)*(1.+SP)*(1.-TP)*(1.-RP)+ @@ -141,9 +140,9 @@ SUBROUTINE SHAPEF (ITYPE,SP,TP,RP,SOLN,BVALUE) 6 SOLN(7)*(1.+SP)*(1.+TP)*(1.+RP)+ 7 SOLN(8)*(1.-SP)*(1.+TP)*(1.+RP)) RETURN -C + C 20-NODE HEX -C + 110 CONTINUE AA=.125*(SOLN(1)*(1.-SP)*(1.-TP)*(1.-RP)*(-SP-TP-RP-2.)+ 1 SOLN(2)*(1.+SP)*(1.-TP)*(1.-RP)*(SP-TP-RP-2.)+ @@ -167,9 +166,9 @@ SUBROUTINE SHAPEF (ITYPE,SP,TP,RP,SOLN,BVALUE) $ SOLN(20)*(1.-SP)*(1.-TP**2)*(1.+RP)) BVALUE=AA+BB RETURN -C + C 27-NODE HEX -C + 120 CONTINUE AA=.125*(-SOLN(1)*SP*TP*RP*(1.-SP)*(1.-TP)*(1.-RP) 1 +SOLN(2)*SP*TP*RP*(1.+SP)*(1.-TP)*(1.-RP) @@ -200,5 +199,5 @@ SUBROUTINE SHAPEF (ITYPE,SP,TP,RP,SOLN,BVALUE) $)*(1.-RP**2) BVALUE=AA+BB+CC RETURN -C + END diff --git a/packages/seacas/libraries/mapvarlib/shlsrc.f b/packages/seacas/libraries/mapvarlib/shlsrc.f index 9ae66ee4b15d..b271b18b6847 100644 --- a/packages/seacas/libraries/mapvarlib/shlsrc.f +++ b/packages/seacas/libraries/mapvarlib/shlsrc.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details SUBROUTINE SHLSRC( @@ -9,28 +9,28 @@ SUBROUTINE SHLSRC( * NRSR, NRSS, XYZSRF, XYZPTS, LINKSRF, * ISRCHR, RSRCHR, NN, IFSRF, TOLSRCH, * IERR ) -C + C----------------------------------------------------------------------- -C + C DESCRIPTION: -C + C THIS SUBROUTINE CALCULATES THE CLOSEST POINT PROBLEM C BETWEEN 'KOUNTS' PAIRS OF POINTS AND SURFACES. -C + C----------------------------------------------------------------------- -C + C FORMAL PARAMETERS -C + C MEMORY : P=PERMANENT, S=SCRATCH C NAME : IMPLICIT A-H,O-Z REAL, I-N INTEGER C TYPE : INPUT_STATUS/OUTPUT_STATUS (I=INPUT,O=OUTPUT,P=PASSED, C U=UNMODIFIED,-=UNDEFINED) C DESCRIPTION : DESCRIPTION OF VARIABLE -C + C----------------------------------------------------------------------- -C + C CALLING ARGUMENTS -C + C MEMORY NAME TYPE DESCRIPTION C --- ---- --- ----------- C P NDIM I/U DIMENSION OF PROBLEM=3 @@ -50,16 +50,16 @@ SUBROUTINE SHLSRC( C P IFSRF I/U SURFACE PAIRED WITH POINT NN C S CTRCL -/- TRACKING ARRAY FOR KOUNTS POINT-SURFACE PAIRS C P TOLSRCH I/U PROXIMITY TOLERANCE FOR POINT-TO-SURFACE SEARCH -C + C----------------------------------------------------------------------- -C + C INPUT/OUTPUT ARRAYS DIMENSION * XYZPTS(NPTS,NDIM) ,XYZSRF(NPSRF,NDIM) ,LINKSRF(4,NFSRF) , * ISRCHR(NISR,NPTS) ,RSRCHR(NRSR,NPTS) C SCRATCH ARRAYS DIMENSION CTRCL(10) -C + C ... Eliminate uninitialized variable warning... do i=1, 10 ctrcl(i) = 0.0 @@ -71,7 +71,7 @@ SUBROUTINE SHLSRC( ENDIF ZERO = 0 ONE = 1 -C + C COMPUTE SURFACE NORMALS AND STORE N1 = LINKSRF(1,IFSRF) N2 = LINKSRF(2,IFSRF) @@ -90,7 +90,7 @@ SUBROUTINE SHLSRC( CTRCL(8) = PMX / PMAG CTRCL(9) = PMY / PMAG CTRCL(10) = PMZ / PMAG -C + C SURFACE NORMAL A4I = CTRCL(8) A4J = CTRCL(9) @@ -156,7 +156,7 @@ SUBROUTINE SHLSRC( IF( ABS(XCOORD) .GT. 1 .OR. ABS(ECOORD) .GT. 1 ) * CTRCL(1) = -CTRCL(1) ENDIF -C + C SURFACE NORMAL A4I = CTRCL(8) A4J = CTRCL(9) @@ -214,7 +214,7 @@ SUBROUTINE SHLSRC( CTRCL(6) = VCS12Y/DISPS CTRCL(7) = VCS12Z/DISPS ENDIF -C + C SURFACE NORMAL A4I = CTRCL(8) A4J = CTRCL(9) @@ -272,7 +272,7 @@ SUBROUTINE SHLSRC( CTRCL(6) = VCS12Y/DISPS CTRCL(7) = VCS12Z/DISPS ENDIF -C + C SURFACE NORMAL A4I = CTRCL(8) A4J = CTRCL(9) @@ -330,7 +330,7 @@ SUBROUTINE SHLSRC( CTRCL(6) = VCS12Y/DISPS CTRCL(7) = VCS12Z/DISPS ENDIF -C + C SURFACE NORMAL A4I = CTRCL(8) A4J = CTRCL(9) @@ -388,11 +388,11 @@ SUBROUTINE SHLSRC( CTRCL(6) = VCS12Y/DISPS CTRCL(7) = VCS12Z/DISPS ENDIF -C + C SELECT THE CLOSEST SURFACE -C + IF( NINT(CTRCL(1)) .NE. 0 )THEN -C + C STORE CURRENT SEARCH RESULTS IF( ISRCHR(1,NN) .EQ. 0 )THEN C STORE INTEGER SEARCH RESULTS @@ -429,9 +429,7 @@ SUBROUTINE SHLSRC( ENDIF ENDIF ENDIF -C + RETURN END -C - diff --git a/packages/seacas/libraries/mapvarlib/sintpe.f b/packages/seacas/libraries/mapvarlib/sintpe.f index faba952d2547..c33e157ecc46 100644 --- a/packages/seacas/libraries/mapvarlib/sintpe.f +++ b/packages/seacas/libraries/mapvarlib/sintpe.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= @@ -10,20 +10,20 @@ SUBROUTINE SINTPE (ICONA,SOLENA,ISRCHR,NISR,RSRCHR,NRSR, & SOLEB,IDBLK,XB,YB,ZB, & ICONB,ITT,IBLK,TIMES,CENTER, & ISTP,IST,INSUB,ICOMPL,DUME) -C + C ****************************************************************** -C + C SUBROUTINE TO CONTROL INTERPOLATION OF ELEMENT TRANSFORMED C INTO NODAL RESULTS FROM MESH-A TO MESH-B C INTERPOLATED SOLUTION IS PASSED OUT TO BE RETRANSFORMED C INTO ELEMENT RESULTS AND THEN WRITTEN TO MESH-C EXODUS FILE -C + C Calls subroutines SHAPEF -C + C Called by MAPVAR -C + C ****************************************************************** -C + C ICONA INT Connectivity of donor mesh (1:nelnda,1:numeba) C SOLENA REAL Element variables at nodes for donor mesh C ISRCHR INT Donor mesh element in which point is found @@ -44,9 +44,9 @@ SUBROUTINE SINTPE (ICONA,SOLENA,ISRCHR,NISR,RSRCHR,NRSR, C used to control mapping for many element blocks to one C ICOMPL INT Flag for completion of mapping; used in many to one C 0-incomplete; 1-complete -C + C ****************************************************************** -C + include 'aexds1.blk' include 'aexds2.blk' include 'amesh.blk' @@ -54,36 +54,36 @@ SUBROUTINE SINTPE (ICONA,SOLENA,ISRCHR,NISR,RSRCHR,NRSR, include 'ebbyeb.blk' include 'ex2tp.blk' include 'tapes.blk' -C + DIMENSION TIMES(*), CENTER(NUMEBB,*) DIMENSION ICONA(NELNDA,*), SOLENA(NODESA,NVAREL) DIMENSION ITT(NVAREL,*) DIMENSION SOLEB(NUMEBB,*), XB(*), YB(*), ZB(*) DIMENSION ISRCHR(NISR,*), RSRCHR(NRSR,*), ICONB(nelndb,*) DIMENSION SOLN(27), XX(27), YY(27), ZZ(27), DUME(*) -C + C ****************************************************************** -C + DO 10 IVAR = 1,NVAREL IF (ITT(IVAR,IBLK) .EQ. 0)GO TO 10 -C + C Initialize SOLEB if first time in subroutine for this element block C After first time into subroutine C retrieve SOLEB from storage in EXODUS -C + IF (INSUB .EQ. 1)THEN CALL INIELT(SOLEB,IVAR,TIMES,ISTP,IDBLK,CENTER,DUME) ELSE CALL EXGEV(NTP4EX,IST,IVAR,IDBLK,NUMEBB,SOLEB(1,IVAR),IERR) END IF -C + C Loop on centroids in recipient mesh -C + DO 30 I = 1,NUMEBB IF (ISRCHR(1,I) .NE. 0)THEN -C + C Set parameters for element in donor mesh -C + S = RSRCHR(5,I) T = RSRCHR(6,I) R = 0. @@ -92,9 +92,9 @@ SUBROUTINE SINTPE (ICONA,SOLENA,ISRCHR,NISR,RSRCHR,NRSR, INODE = ICONA(J,ISRCHR(1,I)) SOLN(J) = SOLENA(INODE,IVAR) 20 CONTINUE -C + C Shape function to evaluate interpolation -C + CALL SHAPEF (3,S,T,R,SOLN,BVALUE) SOLEB(I,IVAR) = BVALUE ELSE @@ -106,26 +106,26 @@ SUBROUTINE SINTPE (ICONA,SOLENA,ISRCHR,NISR,RSRCHR,NRSR, end if END IF 30 CONTINUE -C + C If there is more searching to do (i.e. many blocks to one) C use EXODUS as temporary storage C don't bother to make adjustments to element variables yet -C + IF (ICOMPL .NE. 1)THEN CALL EXPEV(NTP4EX,IST,IVAR,IDBLK,NUMEBB,SOLEB(1,IVAR),IERR) ELSE -C + C Do needed modification to element variable values C write element vars out to EXODUS data base -C + C+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ C ELMASS is special -C + IF (NAMVAR(nvargp+IVAR)(1:6) .EQ. 'ELMASS')THEN -C + C ELMASS was changed to nodal density prior to processing. C need to go back from density to element mass now -C + DO 100 IEL = 1, NUMEBB DO 105 I = 1, NNODES XX(I) = XB(ICONB(I,IEL)) @@ -136,13 +136,13 @@ SUBROUTINE SINTPE (ICONA,SOLENA,ISRCHR,NISR,RSRCHR,NRSR, SOLEB(IEL,IVAR) = SOLEB(IEL,IVAR) * VOLUME 100 CONTINUE END IF -C + C**************************************************************** C apply constraints to variables here as applicable -C + C Plastic strain (EQPS) and tearing C must greater than or equal to 0. -C + IF (NAMVAR(nvargp+IVAR)(1:4) .EQ. 'EQPS')THEN DO 110 IEL = 1, NUMEBB IF (SOLEB(IEL,IVAR) .LT. 0.)THEN @@ -155,36 +155,36 @@ SUBROUTINE SINTPE (ICONA,SOLENA,ISRCHR,NISR,RSRCHR,NRSR, SOLEB(IEL,IVAR) = 0. END IF 120 CONTINUE -C + C Hourglass forces and bulk viscosity have no meaning other than on C the mesh from which they originated, just set them to zero. -C + ELSE IF (NAMVAR(nvargp+IVAR)(1:2) .EQ. 'HG' .OR. & NAMVAR(nvargp+IVAR)(1:5) .EQ. 'BULKQ')THEN DO 130 IEL = 1, NUMEBB SOLEB(IEL,IVAR) = 0. 130 CONTINUE -C + C Shell element basis vectors are computed from the mesh C It makes no sense to transfer them - set them to zero. -C + ELSE IF (NAMVAR(nvargp+IVAR)(1:5) .EQ. 'BASEL')THEN DO 140 IEL = 1, NUMEBB SOLEB(IEL,IVAR) = 0. 140 CONTINUE -C + C ELSE IF (NAMVAR(nvargp+IVAR)(1:?) .EQ. ?????)THEN C DO ??? IEL = 1, NUMEBB C IF (SOLEB(IEL,IVAR) .??. ?.)THEN C SOLEB(IEL,IVAR) = ?. C END IF C ??? CONTINUE -C + END IF c************************************************************************ -C + C write element variables -C + CALL EXPEV(NTP4EX,IST,IVAR,IDBLK,NUMEBB,SOLEB(1,IVAR),IERR) END IF 10 CONTINUE diff --git a/packages/seacas/libraries/mapvarlib/sintpn.f b/packages/seacas/libraries/mapvarlib/sintpn.f index 34364bfc2c1f..d609b735416c 100644 --- a/packages/seacas/libraries/mapvarlib/sintpn.f +++ b/packages/seacas/libraries/mapvarlib/sintpn.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= @@ -9,19 +9,19 @@ SUBROUTINE SINTPN(ICONA,SOLNA,ISRCHR,NISR,RSRCHR,NRSR, & SOLNB,NDLSTB,XB,YB,ZB, & IDBLK,TIMES,INSUB,DUMN) -C + C ****************************************************************** -C + C SUBROUTINE TO CONTROL INTERPOLATION OF NODAL RESULTS FROM C DONOR MESH TO RECIPIENT MESH FOR SHELLS C INTERPOLATED SOLUTION IS WRITTEN TO EXODUS FILE -C + C Calls subroutine SHAPEF, ININOD -C + C Called by MAPVAR -C + C ****************************************************************** -C + C ICONA INT Connectivity of donor mesh (1:nelnda,1:numeba) C SOLNA REAL Nodal variables for donor mesh C ISRCHR INT Contains the element in donor mesh within which @@ -33,9 +33,9 @@ SUBROUTINE SINTPN(ICONA,SOLNA,ISRCHR,NISR,RSRCHR,NRSR, C INSUB INT Number of times into subroutine for this element block C 1-first time; >1-second,etc time; C used to control mapping for many element blocks to one -C + C ****************************************************************** -C + include 'amesh.blk' include 'bmesh.blk' include 'aexds1.blk' @@ -45,63 +45,63 @@ SUBROUTINE SINTPN(ICONA,SOLNA,ISRCHR,NISR,RSRCHR,NRSR, include 'steps.blk' include 'varnpt.blk' include 'tapes.blk' -C + DIMENSION XB(*), YB(*), ZB(*), TIMES(*) DIMENSION ICONA(NELNDA,*), SOLNA(NODESA,NVARNP) DIMENSION SOLNB(NODESB,NVARNP), NDLSTB(*) DIMENSION ISRCHR(NISR,*),RSRCHR(NRSR,*) DIMENSION SOLN(27),DUMN(*) -C + C ****************************************************************** -C + C Set up time steps -C + IF (ISTEP .EQ. -1)THEN NTM = NTIMES ELSE NTM = 1 END IF -C + DO 5 IST = 1, NTM IF (ISTEP .EQ. -1)THEN ISTP = IST ELSE ISTP = ISTEP END IF -C + C Start interpolation -C + DO 10 IVAR = 1, NVARNP -C + C For IDEF = 2 do mesh annealing (used by GOMA); write out all C displacements as zero. -C + IF (IDEF .EQ. 2 .AND. (IVAR .EQ. IXDIS .OR. IVAR .EQ. IYDIS & .OR. IVAR .EQ. IZDIS))GO TO 10 -C + CALL EXGNV(NTP4EX,IST,IVAR,NODESB,SOLNB(1,IVAR),IERR) -C + C If first time into SINTPN for this element block, initialize C else you are mapping many to one and retrieve partially mapped C results from temporary storage in EXODUS -C + IF (INSUB .EQ. 1)THEN CALL ININOD(SOLNB,IVAR,TIMES,ISTP,IDBLK,NDLSTB,XB,YB,ZB, & DUMN) END IF -C + C Get nodal results on donor mesh -C + CALL EXGNV(NTP2EX,ISTP,IVAR,NODESA,SOLNA(1,IVAR),IERR) -C + C Loop on nodes in recipient mesh -C + DO 30 I = 1,NUMNDB NEL = ISRCHR(1,I) IF (NEL .NE. 0) THEN -C + C Set parameters for element in donor mesh -C + S = RSRCHR(5,I) T = RSRCHR(6,I) R = 0. @@ -110,16 +110,16 @@ SUBROUTINE SINTPN(ICONA,SOLNA,ISRCHR,NISR,RSRCHR,NRSR, INODE = ICONA(J,NEL) SOLN(J) = SOLNA(INODE,IVAR) 20 CONTINUE -C + C shape function for shell is same as for quad -C + CALL SHAPEF(3,S,T,R,SOLN,BVALUE) SOLNB(NDLSTB(I),IVAR) = BVALUE END IF 30 CONTINUE -C + C Save results, it doesn't matter if they are preliminary or final -C + CALL EXPNV(NTP4EX,IST,IVAR,NODESB,SOLNB(1,IVAR),IERR) 10 CONTINUE 5 CONTINUE diff --git a/packages/seacas/libraries/mapvarlib/steps.blk b/packages/seacas/libraries/mapvarlib/steps.blk index a428330988c7..5be32ccf5d54 100644 --- a/packages/seacas/libraries/mapvarlib/steps.blk +++ b/packages/seacas/libraries/mapvarlib/steps.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /STEPS/ ISTEP,NTIMES,OUTTIM diff --git a/packages/seacas/libraries/mapvarlib/stran.f b/packages/seacas/libraries/mapvarlib/stran.f index d3ebd082bc1a..7d43c2b6eb98 100644 --- a/packages/seacas/libraries/mapvarlib/stran.f +++ b/packages/seacas/libraries/mapvarlib/stran.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details SUBROUTINE STRAN(ISRCHR,NISR,SOLEA,SOLEB, @@ -9,7 +9,7 @@ SUBROUTINE STRAN(ISRCHR,NISR,SOLEA,SOLEB, & ITT,iblk,TIMES,CENTER, & INSUB,ICOMPL, & XB,YB,ZB,ICONB,DUME) -C + include 'aexds1.blk' include 'aexds2.blk' include 'bmesh.blk' @@ -17,41 +17,40 @@ SUBROUTINE STRAN(ISRCHR,NISR,SOLEA,SOLEB, include 'ex2tp.blk' include 'steps.blk' include 'tapes.blk' -C + DIMENSION SOLEB(NUMEBB,*),SOLEA(NUMEBA,*),ISRCHR(NISR,*), & ITT(NVAREL,*),TIMES(*),CENTER(NUMEBB,*) DIMENSION XB(*),YB(*),ZB(*),XX(27),YY(27),ZZ(27),ICONB(NELNDB,*) DIMENSION DUME(*) -C -C + IF (ISTEP .EQ. -1)THEN NTM = NTIMES ELSE NTM = 1 END IF -C + DO 5 IST = 1, NTM IF (ISTEP .EQ. -1)THEN ISTP = IST ELSE ISTP = ISTEP END IF -C + DO 10 IVAR = 1, NVAREL IF (ITT(IVAR,iblk) .EQ. 0)GO TO 10 -C + C If first time into subroutine for this element block, C initialize the SOLEB array C If not first time into subroutine for this element block C retrieve SOLEB from storage in EXODUS -C + IF (INSUB .EQ. 1)THEN CALL INIELT(SOLEB,IVAR,TIMES,ISTP,IDBLK,CENTER,DUME) ELSE CALL EXGEV(NTP4EX,IST,IVAR,IDBLKB,NUMEBB,SOLEB(1,IVAR), & IERR) END IF -C + CALL EXGEV(NTP2EX,ISTP,IVAR,IDBLKA,NUMEBA,SOLEA(1,IVAR),IERR) DO 20 IELB = 1, NUMEBB IELA = ISRCHR(1,IELB) @@ -59,26 +58,26 @@ SUBROUTINE STRAN(ISRCHR,NISR,SOLEA,SOLEB, SOLEB(IELB,IVAR) = SOLEA(IELA,IVAR) END IF 20 CONTINUE -C + C If there is more searching to do (i.e. many blocks to one) C use EXODUS as temporary storage C don't bother to perform needed adjustments yet -C + IF (ICOMPL .NE. 1)THEN CALL EXPEV(NTP4EX,IST,IVAR,IDBLKB,NUMEBB,SOLEB(1,IVAR), & IERR) ELSE -C + C Make needed adjustments to element variable data and C write element vars out to EXODUS data base -C + C ELMASS is special -C + IF (NAMVAR(NVARGP+IVAR)(1:6) .EQ. 'ELMASS')THEN -C + C ELMASS was changed to nodal density prior to processing. C need to go back from density to element mass now -C + NNODES = 4 DO 100 IEL = 1, NUMEBB DO 105 I = 1, NNODES @@ -93,7 +92,7 @@ SUBROUTINE STRAN(ISRCHR,NISR,SOLEA,SOLEB, CALL EXPEV(NTP4EX,IST,IVAR,IDBLKB,NUMEBB,SOLEB(1,IVAR), & IERR) END IF -C + 10 CONTINUE 5 CONTINUE RETURN diff --git a/packages/seacas/libraries/mapvarlib/tapes.blk b/packages/seacas/libraries/mapvarlib/tapes.blk index fd6718f2a85c..d46136d8dacc 100644 --- a/packages/seacas/libraries/mapvarlib/tapes.blk +++ b/packages/seacas/libraries/mapvarlib/tapes.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details CHARACTER*2048 fntpo, fntp2, fntp3, fntp4 diff --git a/packages/seacas/libraries/mapvarlib/tetsrc.f b/packages/seacas/libraries/mapvarlib/tetsrc.f index 4f3ed1e71fa6..08ebfeb31c53 100644 --- a/packages/seacas/libraries/mapvarlib/tetsrc.f +++ b/packages/seacas/libraries/mapvarlib/tetsrc.f @@ -1,35 +1,35 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details SUBROUTINE TETSRC( * NDIM, NPTS, NPSRF, NFSRF, NISR, * NRSR, NRSS, XYZE, XYZP, LS, * ISRCHR, RSRCHR, IPT, IELT, IERR ) -C + C----------------------------------------------------------------------- -C + C DESCRIPTION: -C + C THIS SUBROUTINE CALCULATES THE CLOSEST POINT PROBLEM C BETWEEN 'KOUNTS' PAIRS OF POINTS AND SURFACES. -C + C----------------------------------------------------------------------- -C + C FORMAL PARAMETERS -C + C MEMORY : P=PERMANENT, S=SCRATCH C NAME : IMPLICIT A-H,O-Z REAL, I-N INTEGER C TYPE : INPUT_STATUS/OUTPUT_STATUS (I=INPUT,O=OUTPUT,P=PASSED, C U=UNMODIFIED,-=UNDEFINED) C DESCRIPTION : DESCRIPTION OF VARIABLE -C + C----------------------------------------------------------------------- -C + C CALLING ARGUMENTS -C + C MEMORY NAME TYPE DESCRIPTION C --- ---- --- ----------- C P NDIM I/U DIMENSION OF PROBLEM=3 @@ -47,25 +47,25 @@ SUBROUTINE TETSRC( C P RSRCHR I/O REAL SEARCH RESULTS C P IPT I/U POINT PAIRED WITH SURFACE IELT C P IELT I/U SURFACE PAIRED WITH POINT IPT -C + C----------------------------------------------------------------------- -C + include 'toldat.blk' include 'tapes.blk' -C + C INPUT/OUTPUT ARRAYS DIMENSION * XYZP(NPTS,NDIM) ,XYZE(NPSRF,NDIM) ,LS(4,NFSRF) , * ISRCHR(NISR,NPTS) ,RSRCHR(NRSR,NPTS) DIMENSION XX(27), YY(27), ZZ(27) -C + IF( NISR .LT. 1 .OR. NRSR .LT. 3 .OR. NRSS .LT. 10 )THEN IERR = 1 RETURN ENDIF -C + C check for Mesh-B point coincident with node of element in Mesh-A -C + SIDE1 = (XYZE(LS(1,IELT),1)-XYZE(LS(2,IELT),1))**2 & + (XYZE(LS(1,IELT),2)-XYZE(LS(2,IELT),2))**2 & + (XYZE(LS(1,IELT),3)-XYZE(LS(2,IELT),3))**2 @@ -92,10 +92,10 @@ SUBROUTINE TETSRC( C = XYZE(LS(I,IELT),3) - XYZP(IPT,3) DIST = A**2 + B**2 + C**2 IF (DIST .LT. COTEST)THEN -C + C coincident node, so fill search results arrays C no need to check for better search result -C + INODE = I ISRCHR(1,IPT) = IELT CALL NODE (6,INODE,RSRCHR(1,IPT),RSRCHR(2,IPT), @@ -103,17 +103,17 @@ SUBROUTINE TETSRC( GO TO 100 END IF 110 CONTINUE -C + C Mesh-B point not coincident with Mesh-A node so compute isoparametric C coordinates. Use Newton's method -C + SG = 0. TG = 0. RG = 0. ITER = 0 -C + C Build Jacobian and invert -C + DO 120 I = 1, 4 XX(I) = XYZE(LS(I,IELT),1) YY(I) = XYZE(LS(I,IELT),2) @@ -131,7 +131,7 @@ SUBROUTINE TETSRC( & ' ',0,' ',' ',0) GO TO 100 END IF -C + AI11 = (A22*A33 - A23*A32)/DETA AI12 = -(A12*A33 - A32*A13)/DETA AI13 = (A23*A12 - A13*A22)/DETA @@ -141,14 +141,14 @@ SUBROUTINE TETSRC( AI31 = (A21*A32 - A31*A22)/DETA AI32 = -(A11*A32 - A31*A12)/DETA AI33 = (A11*A22 - A12*A21)/DETA -C + FS = F1 - XYZP(IPT,1) FT = F2 - XYZP(IPT,2) FR = F3 - XYZP(IPT,3) SNEW = SG - (AI11*FS + AI12*FT + AI13*FR) TNEW = TG - (AI21*FS + AI22*FT + AI23*FR) RNEW = RG - (AI31*FS + AI32*FT + AI33*FR) -C + ITER = ITER + 1 DS = ABS(SNEW-SG) DT = ABS(TNEW-TG) @@ -159,23 +159,23 @@ SUBROUTINE TETSRC( RG = RNEW IF (ITER .EQ. ITERMX)GO TO 100 GO TO 130 -C + 300 CONTINUE -C + C Newton converged, load up search results arrays if appropriate -C + IF (ABS(SNEW) .LT. STRLMT .AND. ABS(TNEW) .LT. STRLMT .AND. & ABS(RNEW) .LT. STRLMT)THEN -C + C Search was adequate -C + FTEST = MAX(ABS(RSRCHR(1,IPT)),ABS(RSRCHR(2,IPT)), & ABS(RSRCHR(3,IPT))) FCOMP = MAX(ABS(SNEW),ABS(TNEW),ABS(RNEW)) IF (FTEST .GT. FCOMP .OR. ISRCHR(1,IPT) .EQ. 0)THEN -C + C New search is better or first find, replace search results -C + ISRCHR(1,IPT) = IELT RSRCHR(1,IPT) = SNEW RSRCHR(2,IPT) = TNEW diff --git a/packages/seacas/libraries/mapvarlib/toldat.blk b/packages/seacas/libraries/mapvarlib/toldat.blk index 63d15ba8284c..72585fd9c6fe 100644 --- a/packages/seacas/libraries/mapvarlib/toldat.blk +++ b/packages/seacas/libraries/mapvarlib/toldat.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /TOLDAT/ TOL,EPS,STRLMT,ITERMX diff --git a/packages/seacas/libraries/mapvarlib/tranab.f b/packages/seacas/libraries/mapvarlib/tranab.f index 6cccb9f35bcf..45b873e955f9 100644 --- a/packages/seacas/libraries/mapvarlib/tranab.f +++ b/packages/seacas/libraries/mapvarlib/tranab.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details SUBROUTINE TRANAB(IELPT,SOLEA,SOLEB, @@ -9,7 +9,7 @@ SUBROUTINE TRANAB(IELPT,SOLEA,SOLEB, & ITT,iblk,TIMES,CENTER, & INSUB,ICOMPL, & XB,YB,ZB,ICONB,DUME) -C + include 'aexds1.blk' include 'aexds2.blk' include 'bmesh.blk' @@ -17,41 +17,40 @@ SUBROUTINE TRANAB(IELPT,SOLEA,SOLEB, include 'ex2tp.blk' include 'steps.blk' include 'tapes.blk' -C + DIMENSION SOLEB(NUMEBB,*),SOLEA(NUMEBA,*),IELPT(*), & ITT(NVAREL,*),TIMES(*),CENTER(NUMEBB,*) DIMENSION XB(*),YB(*),ZB(*),XX(27),YY(27),ZZ(27),ICONB(NELNDB,*) DIMENSION DUME(*) -C -C + IF (ISTEP .EQ. -1)THEN NTM = NTIMES ELSE NTM = 1 END IF -C + DO 5 IST = 1, NTM IF (ISTEP .EQ. -1)THEN ISTP = IST ELSE ISTP = ISTEP END IF -C + DO 10 IVAR = 1, NVAREL IF (ITT(IVAR,iblk) .EQ. 0)GO TO 10 -C + C If first time into subroutine for this element block, C initialize the SOLEB array C If not first time into subroutine for this element block C retrieve SOLEB from storage in EXODUS -C + IF (INSUB .EQ. 1)THEN CALL INIELT(SOLEB,IVAR,TIMES,ISTP,IDBLKB,CENTER,DUME) ELSE CALL EXGEV(NTP4EX,IST,IVAR,IDBLKB,NUMEBB,SOLEB(1,IVAR), & IERR) END IF -C + CALL EXGEV(NTP2EX,ISTP,IVAR,IDBLKA,NUMEBA,SOLEA(1,IVAR),IERR) DO 20 IELB = 1, NUMEBB IELA = IELPT(IELB) @@ -59,26 +58,26 @@ SUBROUTINE TRANAB(IELPT,SOLEA,SOLEB, SOLEB(IELB,IVAR) = SOLEA(IELA,IVAR) END IF 20 CONTINUE -C + C If there is more searching to do (i.e. many blocks to one) C use EXODUS as temporary storage C don't bother to perform needed adjustments yet -C + IF (ICOMPL .NE. 1)THEN CALL EXPEV(NTP4EX,IST,IVAR,IDBLKB,NUMEBB,SOLEB(1,IVAR), & IERR) ELSE -C + C Make needed adjustments to element variable data and C write element vars out to EXODUS data base -C + C ELMASS is special -C + IF (NAMVAR(nvargp+IVAR)(1:6) .EQ. 'ELMASS')THEN -C + C ELMASS was changed to nodal density prior to processing. C need to go back from density to element mass now -C + C NNODES=NNELM(ITYPE) NNODES = NELNDB IF (ITYPE .EQ. 6)NNODES = 4 diff --git a/packages/seacas/libraries/mapvarlib/trutbl.f b/packages/seacas/libraries/mapvarlib/trutbl.f index bac899076d94..6a2a4e8318bf 100644 --- a/packages/seacas/libraries/mapvarlib/trutbl.f +++ b/packages/seacas/libraries/mapvarlib/trutbl.f @@ -1,23 +1,23 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= *DECK,TRUTBL SUBROUTINE TRUTBL(MP,IMP,IDA,IDB,ITRTA,ITRTB) -C + C ****************************************************************** -C + C SUBROUTINE TO BUILD THE TRUTH TABLE FOR THE RECIPIENT MESH C THIS IMPROVES (SPEEDS-UP) THE PROCESS OF WRITING ELEMENT C VARIABLES -C + C Called by MAPVAR -C + C ****************************************************************** -C + C MP INT Array of element block mapping from donor C mesh to recipient mesh (1:2,1:IMP) C IMP INT Number of entries in MP @@ -25,20 +25,19 @@ SUBROUTINE TRUTBL(MP,IMP,IDA,IDB,ITRTA,ITRTB) C IDB INT Recipient mesh element block I.D. (1:nblksa) C ITRTA INT Donor mesh truth table (1:nvarel,1:nblksa) C ITRTB INT Recipient mesh truth table (1:nvarel,1:nblksb) -C + C ****************************************************************** -C + include 'aexds1.blk' include 'amesh.blk' include 'bmesh.blk' include 'ex2tp.blk' include 'tapes.blk' -C DIMENSION MP(3,*),IDA(*),IDB(*),ITRTA(NVAREL,*),ITRTB(NVAREL,*) -C + C ****************************************************************** -C + C ... For later sanity check do 2 iblkb = 1, nblksb do 1 ivar = 1, nvarel @@ -47,9 +46,9 @@ SUBROUTINE TRUTBL(MP,IMP,IDA,IDB,ITRTA,ITRTB) 2 continue CALL EXGVTT (NTP2EX,NBLKSA,NVAREL,ITRTA,IERR) -C + C Match element block I.D.'s from donor and recipient mesh -C + DO 10 IBLKB = 1, NBLKSB IDBLKB = IDB(IBLKB) DO 20 IBLKA = 1, NBLKSA @@ -64,9 +63,9 @@ SUBROUTINE TRUTBL(MP,IMP,IDA,IDB,ITRTA,ITRTB) 30 CONTINUE 20 CONTINUE 10 CONTINUE -C + C Do some error checking - write a warning -C + DO 50 IBLKB = 1, NBLKSB IFND = 0 IDBLKB = IDB(IBLKB) @@ -83,7 +82,7 @@ SUBROUTINE TRUTBL(MP,IMP,IDA,IDB,ITRTA,ITRTB) WRITE(NTPOUT,1000)IBLKB,IDBLKB END IF 50 CONTINUE -C + C ... Sanity check do 90 iblkb = 1, nblksb do 80 ivar = 1, nvarel @@ -96,7 +95,7 @@ SUBROUTINE TRUTBL(MP,IMP,IDA,IDB,ITRTA,ITRTB) 90 continue CALL EXPVTT(NTP4EX,NBLKSB,NVAREL,ITRTB,IERR) -C + 1000 FORMAT(5X,'MAPPING BACK INTO DONOR MESH FOR',/, 1' RECIPIENT MESH ELEMENT BLOCK NUMBER',I7,/, 2' ELEMENT BLOCK I. D.',I7,/, diff --git a/packages/seacas/libraries/mapvarlib/varept.blk b/packages/seacas/libraries/mapvarlib/varept.blk index b7aea3da0c08..b7c9feff4fe5 100644 --- a/packages/seacas/libraries/mapvarlib/varept.blk +++ b/packages/seacas/libraries/mapvarlib/varept.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /VAREPT/ ISXX,ISYY,ISZZ,ISXY,ISYZ,ISZX,IELMS,IDENS diff --git a/packages/seacas/libraries/mapvarlib/varnpt.blk b/packages/seacas/libraries/mapvarlib/varnpt.blk index 4964429ebff8..926e66a8cf0e 100644 --- a/packages/seacas/libraries/mapvarlib/varnpt.blk +++ b/packages/seacas/libraries/mapvarlib/varnpt.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details COMMON /VARNPT/ IXDIS,IYDIS,IZDIS,IXVEL,IYVEL,IZVEL diff --git a/packages/seacas/libraries/mapvarlib/vol.f b/packages/seacas/libraries/mapvarlib/vol.f index c33ae16be5a5..12f8a97f3206 100644 --- a/packages/seacas/libraries/mapvarlib/vol.f +++ b/packages/seacas/libraries/mapvarlib/vol.f @@ -1,110 +1,110 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= *DECK,VOL SUBROUTINE VOL (ITYPE,XX,YY,ZZ,VOLUME) -C + C ****************************************************************** -C + C SUBROUTINE TO FIND THE VOLUME OF AN ELEMENT -C + C Called by ELTON3, ELTOND -C + C ****************************************************************** -C + DIMENSION XX(*), YY(*), ZZ(*) -C + C ****************************************************************** -C + IF (ITYPE .EQ. 3) THEN -C + C 4-node quad -C + A1 = XX(1) - XX(3) B1 = YY(1) - YY(3) A2 = XX(2) - XX(4) B2 = YY(2) - YY(4) CCR = (A1 * B2) - (A2 * B1) VOLUME = 0.5 * ABS(CCR) -C + RETURN -C + ELSE IF (ITYPE .EQ. 10) THEN -C + C 8-node hex -C + GR1 = ( YY(2)*(ZZ(6)-ZZ(3)-ZZ(4)+ZZ(5)) + YY(3)*(ZZ(2)-ZZ(4)) & + YY(4)*(ZZ(3)-ZZ(8)-ZZ(5)+ZZ(2)) & + YY(5)*(ZZ(8)-ZZ(6)-ZZ(2)+ZZ(4)) & + YY(6)*(ZZ(5)-ZZ(2)) + YY(8)*(ZZ(4)-ZZ(5)) ) / 12. -c + GR2 = ( YY(3)*(ZZ(7)-ZZ(4)-ZZ(1)+ZZ(6)) + YY(4)*(ZZ(3)-ZZ(1)) & + YY(1)*(ZZ(4)-ZZ(5)-ZZ(6)+ZZ(3)) & + YY(6)*(ZZ(5)-ZZ(7)-ZZ(3)+ZZ(1)) & + YY(7)*(ZZ(6)-ZZ(3)) + YY(5)*(ZZ(1)-ZZ(6)) ) / 12. -c + GR3 = ( YY(4)*(ZZ(8)-ZZ(1)-ZZ(2)+ZZ(7)) + YY(1)*(ZZ(4)-ZZ(2)) & + YY(2)*(ZZ(1)-ZZ(6)-ZZ(7)+ZZ(4)) & + YY(7)*(ZZ(6)-ZZ(8)-ZZ(4)+ZZ(2)) & + YY(8)*(ZZ(7)-ZZ(4)) + YY(6)*(ZZ(2)-ZZ(7)) ) / 12. -c + GR4 = ( YY(1)*(ZZ(5)-ZZ(2)-ZZ(3)+ZZ(8)) + YY(2)*(ZZ(1)-ZZ(3)) & + YY(3)*(ZZ(2)-ZZ(7)-ZZ(8)+ZZ(1)) & + YY(8)*(ZZ(7)-ZZ(5)-ZZ(1)+ZZ(3)) & + YY(5)*(ZZ(8)-ZZ(1)) + YY(7)*(ZZ(3)-ZZ(8)) ) / 12. -c + GR5 = ( YY(8)*(ZZ(4)-ZZ(7)-ZZ(6)+ZZ(1)) + YY(7)*(ZZ(8)-ZZ(6)) & + YY(6)*(ZZ(7)-ZZ(2)-ZZ(1)+ZZ(8)) & + YY(1)*(ZZ(2)-ZZ(4)-ZZ(8)+ZZ(6)) & + YY(4)*(ZZ(1)-ZZ(8)) + YY(2)*(ZZ(6)-ZZ(1)) ) / 12. -c + GR6 = ( YY(5)*(ZZ(1)-ZZ(8)-ZZ(7)+ZZ(2)) + YY(8)*(ZZ(5)-ZZ(7)) & + YY(7)*(ZZ(8)-ZZ(3)-ZZ(2)+ZZ(5)) & + YY(2)*(ZZ(3)-ZZ(1)-ZZ(5)+ZZ(7)) & + YY(1)*(ZZ(2)-ZZ(5)) + YY(3)*(ZZ(7)-ZZ(2)) ) / 12. -c + GR7 = ( YY(6)*(ZZ(2)-ZZ(5)-ZZ(8)+ZZ(3)) + YY(5)*(ZZ(6)-ZZ(8)) & + YY(8)*(ZZ(5)-ZZ(4)-ZZ(3)+ZZ(6)) & + YY(3)*(ZZ(4)-ZZ(2)-ZZ(6)+ZZ(8)) & + YY(2)*(ZZ(3)-ZZ(6)) + YY(4)*(ZZ(8)-ZZ(3)) ) / 12. -c + GR8 = ( YY(7)*(ZZ(3)-ZZ(6)-ZZ(5)+ZZ(4)) + YY(6)*(ZZ(7)-ZZ(5)) & + YY(5)*(ZZ(6)-ZZ(1)-ZZ(4)+ZZ(7)) & + YY(4)*(ZZ(1)-ZZ(3)-ZZ(7)+ZZ(5)) & + YY(3)*(ZZ(4)-ZZ(7)) + YY(1)*(ZZ(5)-ZZ(4)) ) / 12. -c + VOLUME = XX(1) * GR1 + XX(2) * GR2 + XX(3) * GR3 + XX(4) * GR4 & + XX(5) * GR5 + XX(6) * GR6 + XX(7) * GR7 + XX(8) * GR8 -C + RETURN -C + ELSE IF (ITYPE .EQ. 13) THEN -C + C 4-node shell, ignore curvature -C + A1 = XX(1) - XX(3) B1 = YY(1) - YY(3) C1 = ZZ(1) - ZZ(3) A2 = XX(2) - XX(4) B2 = YY(2) - YY(4) C2 = ZZ(2) - ZZ(4) -C + ACR = (B1 * C2) - (B2 * C1) BCR = (A1 * C2) - (A2 * C1) CCR = (A1 * B2) - (A2 * B1) -C + VOLUME = 0.5 * SQRT(ACR*ACR + BCR*BCR + CCR*CCR) -C + RETURN ELSE IF (ITYPE .EQ. 6) THEN -C + C 4-node tet C (process Key's 8-node tet the same way using first 4 nodes) -C + Y12 = YY(1) - YY(2) Y13 = YY(1) - YY(3) Y14 = YY(1) - YY(4) @@ -115,12 +115,12 @@ SUBROUTINE VOL (ITYPE,XX,YY,ZZ,VOLUME) Z14 = ZZ(1) - ZZ(4) Z24 = ZZ(2) - ZZ(4) Z34 = ZZ(3) - ZZ(4) -C + BX1 = (Y34*Z24 - Y24*Z34) / 6.0 BX2 = (Y13*Z14 - Y14*Z13) / 6.0 BX3 = (Y14*Z12 - Y12*Z14) / 6.0 BX4 = (Y12*Z13 - Y13*Z12) / 6.0 -C + VOLUME = BX1*XX(1) + BX2*XX(2) + BX3*XX(3) + BX4*XX(4) ELSE CALL ERROR('VOL','ELEMENT TYPE',' ',ITYPE, diff --git a/packages/seacas/libraries/mapvarlib/wrtc.f b/packages/seacas/libraries/mapvarlib/wrtc.f index c7f4bdb38b39..9e80c9652af4 100644 --- a/packages/seacas/libraries/mapvarlib/wrtc.f +++ b/packages/seacas/libraries/mapvarlib/wrtc.f @@ -1,71 +1,71 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= *DECK,WRTC SUBROUTINE WRTC (XB,YB,ZB,GVAR,SOLNB) -C + C ****************************************************************** -C + C SUBROUTINE TO WRITE INTERPOLATED SOLUTION TO MESH-C EXODUS FILE -C + C Called by MAPVAR -C + C ****************************************************************** -C + C GVAR REAL Global variables C SOLNB REAL Element variables interpolated onto Mesh-B C IXDIS INT Pointer to x-displ nodal variable C IYDIS INT Pointer to y-displ nodal variable C IZDIS INT Pointer to z-displ nodal variable -C + C ****************************************************************** -C + include 'aexds1.blk' include 'bmesh.blk' include 'contrl.blk' include 'ex2tp.blk' include 'steps.blk' include 'varnpt.blk' -C + DIMENSION SOLNB(NODESB,NVARNP) DIMENSION XB(*),YB(*),ZB(*),GVAR(*) -C + C ****************************************************************** IF (ISTEP .EQ. -1)THEN NTM = NTIMES ELSE NTM = 1 END IF -C + DO 10 IST = 1, NTM IF (ISTEP .EQ. -1)THEN ISTP = IST ELSE ISTP = ISTEP END IF -c + c Time -c + CALL EXGTIM (NTP2EX,ISTP,RTIME,IERR) IF (OUTTIM .LT. 0)THEN CALL EXPTIM (NTP4EX,IST,RTIME,IERR) ELSE CALL EXPTIM (NTP4EX,IST,OUTTIM,IERR) END IF -c + c Global variables -c + if (nvargp .gt. 0) then CALL EXGGV (NTP2EX,ISTP,NVARGP,GVAR,IERR) CALL EXPGV (NTP4EX,IST,NVARGP,GVAR,IERR) end if -C + C Coordinates -C + IF (IDEF .EQ. 1)THEN IF (IXDIS .NE. 0 .AND. IYDIS .NE. 0)THEN DO 60 I = 1, NODESB @@ -76,8 +76,8 @@ SUBROUTINE WRTC (XB,YB,ZB,GVAR,SOLNB) END IF END IF CALL EXPCOR(NTP4EX,XB,YB,ZB,IERR) -C + 10 CONTINUE -C + RETURN END diff --git a/packages/seacas/libraries/nemesis/forbind/addrwrpn.F b/packages/seacas/libraries/nemesis/forbind/addrwrpn.F index 07232e9cba71..7b4cd67d67c8 100644 --- a/packages/seacas/libraries/nemesis/forbind/addrwrpn.F +++ b/packages/seacas/libraries/nemesis/forbind/addrwrpn.F @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details subroutine adrdumn @@ -9,9 +9,9 @@ subroutine adrdumn #ifdef Build64 C----------------------------------------------------------------------- -C + C Get initial information from nemesis file -C + subroutine negii (idne, nproc, nproc_in_f, ftype, ierr) implicit none integer idne @@ -19,24 +19,24 @@ subroutine negii (idne, nproc, nproc_in_f, ftype, ierr) integer nproc_in_f character*(*) ftype integer ierr -C + integer*4 idne4 integer*4 nproc4 integer*4 nproc_in_f4 integer*4 ierr4 -C + idne4 = idne call negii4 (idne4, nproc4, nproc_in_f4, ftype, ierr4) nproc = nproc4 nproc_in_f = nproc_in_f4 ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Write initial information from nemesis file -C + subroutine nepii (idne, nproc, nproc_in_f, ftype, ierr) implicit none integer idne @@ -44,24 +44,24 @@ subroutine nepii (idne, nproc, nproc_in_f, ftype, ierr) integer nproc_in_f character*(*) ftype integer ierr -C + integer*4 idne4 integer*4 nproc4 integer*4 nproc_in_f4 integer*4 ierr4 -C + idne4 = idne nproc4 = nproc nproc_in_f4 = nproc_in_f call nepii4 (idne4, nproc4, nproc_in_f4, ftype, ierr4) ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Read initial global information -C + subroutine negig (idne, nnodes_g, nelems_g, nelem_blks_g, $ nnode_sets_g, nside_sets_g, ierr) implicit none @@ -72,21 +72,21 @@ subroutine negig (idne, nnodes_g, nelems_g, nelem_blks_g, integer nnode_sets_g integer nside_sets_g integer ierr -C + integer*4 idne4 integer*4 ierr4 -C + idne4 = idne call negig4 (idne4, nnodes_g, nelems_g, nelem_blks_g, $ nnode_sets_g, nside_sets_g, ierr4) ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Write initial global information -C + subroutine nepig (idne, nnodes_g, nelems_g, nelem_blks_g, $ nnode_sets_g, nside_sets_g, ierr) implicit none @@ -97,21 +97,21 @@ subroutine nepig (idne, nnodes_g, nelems_g, nelem_blks_g, integer nnode_sets_g integer nside_sets_g integer ierr -C + integer*4 idne4 integer*4 ierr4 -C + idne4 = idne call nepig4 (idne4, nnodes_g, nelems_g, nelem_blks_g, $ nnode_sets_g, nside_sets_g, ierr4) ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Read load balance parameters -C + subroutine neglbp (idne, nint_nodes, nbor_nodes, next_nodes, $ nint_elems, nbor_elems, nnode_cmaps, nelem_cmaps, $ processor, ierr) @@ -126,24 +126,24 @@ subroutine neglbp (idne, nint_nodes, nbor_nodes, next_nodes, integer nelem_cmaps integer processor integer ierr -C + integer*4 idne4 integer*4 processor4 integer*4 ierr4 -C + idne4 = idne processor4 = processor call neglbp4 (idne4, nint_nodes, nbor_nodes, next_nodes, $ nint_elems, nbor_elems, nnode_cmaps, nelem_cmaps, $ processor4, ierr4) ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Write load balance parameters -C + subroutine neplbp (idne, nint_nodes, nbor_nodes, next_nodes, $ nint_elems, nbor_elems, nnode_cmaps, nelem_cmaps, $ processor, ierr) @@ -158,24 +158,24 @@ subroutine neplbp (idne, nint_nodes, nbor_nodes, next_nodes, integer nelem_cmaps integer processor integer ierr -C + integer*4 idne4 integer*4 processor4 integer*4 ierr4 -C + idne4 = idne processor4 = processor call neplbp4 (idne4, nint_nodes, nbor_nodes, next_nodes, $ nint_elems, nbor_elems, nnode_cmaps, nelem_cmaps, $ processor4, ierr4) ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Write concatenated load balance parameters -C + subroutine neplbpc (idne, nint_nodes, nbor_nodes, next_nodes, $ nint_elems, nbor_elems, nnode_cmaps, nelem_cmaps, ierr) implicit none @@ -188,22 +188,22 @@ subroutine neplbpc (idne, nint_nodes, nbor_nodes, next_nodes, integer nnode_cmaps(*) integer nelem_cmaps(*) integer ierr -C + integer*4 idne4 integer*4 ierr4 -C + idne4 = idne call neplbpc4 (idne4, nint_nodes, nbor_nodes, next_nodes, $ nint_elems, nbor_elems, nnode_cmaps, nelem_cmaps, $ ierr4) ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Read global node set parameters -C + subroutine negnspg (idne, ns_ids_glob, ns_n_cnt_glob, $ ns_df_cnt_glob, ierr) implicit none @@ -212,21 +212,21 @@ subroutine negnspg (idne, ns_ids_glob, ns_n_cnt_glob, integer ns_n_cnt_glob(*) integer ns_df_cnt_glob(*) integer ierr -C + integer*4 idne4 integer*4 ierr4 -C + idne4 = idne call negnspg4 (idne4, ns_ids_glob, ns_n_cnt_glob, $ ns_df_cnt_glob, ierr4) ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Write global node set parameters -C + subroutine nepnspg (idne, global_ids, global_n_cnts, $ global_df_cnts, ierr) integer idne @@ -234,21 +234,21 @@ subroutine nepnspg (idne, global_ids, global_n_cnts, integer global_n_cnts(*) integer global_df_cnts(*) integer ierr -C + integer*4 idne4 integer*4 ierr4 -C + idne4 = idne call nepnspg4 (idne4, global_ids, global_n_cnts, $ global_df_cnts, ierr4) ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Read global side set parameters -C + subroutine negsspg (idne, ss_ids_glob, ss_n_cnt_glob, $ ss_df_cnt_glob, ierr) implicit none @@ -257,21 +257,21 @@ subroutine negsspg (idne, ss_ids_glob, ss_n_cnt_glob, integer ss_n_cnt_glob(*) integer ss_df_cnt_glob(*) integer ierr -C + integer*4 idne4 integer*4 ierr4 -C + idne4 = idne call negsspg4 (idne4, ss_ids_glob, ss_n_cnt_glob, $ ss_df_cnt_glob, ierr4) ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Write global side set parameters -C + subroutine nepsspg (idne, global_ids, global_el_cnts, $ global_df_cnts, ierr) implicit none @@ -280,61 +280,61 @@ subroutine nepsspg (idne, global_ids, global_el_cnts, integer global_el_cnts(*) integer global_df_cnts(*) integer ierr -C + integer*4 idne4 integer*4 ierr4 -C + idne4 = idne call nepsspg4 (idne4, global_ids, global_el_cnts, $ global_df_cnts, ierr4) ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Read global element block information -C + subroutine negebig (idne, el_blk_ids, el_blk_cnts, ierr) implicit none integer idne integer el_blk_ids(*) integer el_blk_cnts(*) integer ierr -C + integer*4 idne4 integer*4 ierr4 -C + idne4 = idne call negebig4 (idne4, el_blk_ids, el_blk_cnts, ierr4) ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Write global element block information -C + subroutine nepebig (idne, el_blk_ids, el_blk_cnts, ierr) implicit none integer idne integer el_blk_ids(*) integer el_blk_cnts(*) integer ierr -C + integer*4 idne4 integer*4 ierr4 -C + idne4 = idne call nepebig4 (idne4, el_blk_ids, el_blk_cnts, ierr4) ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Read side set element list and side set side list -C + subroutine negnss (idne, ss_id, start_side_num, num_sides, $ ss_elem_list, ss_side_list, ierr) implicit none @@ -345,21 +345,21 @@ subroutine negnss (idne, ss_id, start_side_num, num_sides, integer ss_elem_list(num_sides) integer ss_side_list(num_sides) integer ierr -C + integer*4 idne4 integer*4 ierr4 -C + idne4 = idne call negnss4 (idne4, ss_id, start_side_num, num_sides, $ ss_elem_list, ss_side_list, ierr4) ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Write side set element list and side set side list -C + subroutine nepnss (idne, ss_id, start_side_num, num_sides, $ ss_elem_list, ss_side_list, ierr) implicit none @@ -370,21 +370,21 @@ subroutine nepnss (idne, ss_id, start_side_num, num_sides, integer ss_elem_list(num_sides) integer ss_side_list(num_sides) integer ierr -C + integer*4 idne4 integer*4 ierr4 -C + idne4 = idne call nepnss4 (idne4, ss_id, start_side_num, num_sides, $ ss_elem_list, ss_side_list, ierr4) ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Read side set distribution factor -C + subroutine negnssd (idne, ss_id, start_num, num_df_to_get, $ ss_df, ierr) implicit none @@ -394,21 +394,21 @@ subroutine negnssd (idne, ss_id, start_num, num_df_to_get, integer num_df_to_get real ss_df(num_df_to_get) integer ierr -C + integer*4 idne4 integer*4 ierr4 -C + idne4 = idne call negnssd4 (idne4, ss_id, start_num, num_df_to_get, $ ss_df, ierr4) ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Write side set distribution factor -C + subroutine nepnssd (idne, ss_id, start_num, num_df_to_get, $ ss_df, ierr) implicit none @@ -418,21 +418,21 @@ subroutine nepnssd (idne, ss_id, start_num, num_df_to_get, integer num_df_to_get real ss_df(num_df_to_get) integer ierr -C + integer*4 idne4 integer*4 ierr4 -C + idne4 = idne call nepnssd4 (idne4, ss_id, start_num, num_df_to_get, $ ss_df, ierr4) ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Read node set list for a single node set -C + subroutine negnns (idne, ns_id, start_node_num, num_node, $ ns_node_list, ierr) implicit none @@ -442,21 +442,21 @@ subroutine negnns (idne, ns_id, start_node_num, num_node, integer num_node integer ns_node_list(num_node) integer ierr -C + integer*4 idne4 integer*4 ierr4 -C + idne4 = idne call negnns4 (idne4, ns_id, start_node_num, num_node, $ ns_node_list, ierr4) ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Write node set list for a single node set -C + subroutine nepnns (idne, ns_id, start_node_num, num_node, $ ns_node_list, ierr) implicit none @@ -466,21 +466,21 @@ subroutine nepnns (idne, ns_id, start_node_num, num_node, integer num_node integer ns_node_list(num_node) integer ierr -C + integer*4 idne4 integer*4 ierr4 -C + idne4 = idne call nepnns4 (idne4, ns_id, start_node_num, num_node, $ ns_node_list, ierr4) ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Read node set distribution factor -C + subroutine negnnsd (idne, ns_id, start_num, num_df_to_get, $ ns_df, ierr) implicit none @@ -490,21 +490,21 @@ subroutine negnnsd (idne, ns_id, start_num, num_df_to_get, integer num_df_to_get real ns_df(num_df_to_get) integer ierr -C + integer*4 idne4 integer*4 ierr4 -C + idne4 = idne call negnnsd4 (idne4, ns_id, start_num, num_df_to_get, $ ns_df, ierr4) ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Write node set distribution factor -C + subroutine nepnnsd (idne, ns_id, start_num, num_df_to_get, $ ns_df, ierr) implicit none @@ -514,21 +514,21 @@ subroutine nepnnsd (idne, ns_id, start_num, num_df_to_get, integer num_df_to_get real ns_df(num_df_to_get) integer ierr -C + integer*4 idne4 integer*4 ierr4 -C + idne4 = idne call nepnnsd4 (idne4, ns_id, start_num, num_df_to_get, $ ns_df, ierr4) ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Read coordinates of the nodes -C + subroutine negcor (idne, start_node_num, num_nodes, x_coor, $ y_coor, z_coor, ierr) implicit none @@ -539,21 +539,21 @@ subroutine negcor (idne, start_node_num, num_nodes, x_coor, real y_coor(num_nodes) real z_coor(num_nodes) integer ierr -C + integer*4 idne4 integer*4 ierr4 -C + idne4 = idne call negcor4 (idne4, start_node_num, num_nodes, x_coor, $ y_coor, z_coor, ierr4) ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Write coordinates of the nodes -C + subroutine nepcor (idne, start_node_num, num_nodes, x_coor, $ y_coor, z_coor, ierr) implicit none @@ -564,21 +564,21 @@ subroutine nepcor (idne, start_node_num, num_nodes, x_coor, real y_coor(num_nodes) real z_coor(num_nodes) integer ierr -C + integer*4 idne4 integer*4 ierr4 -C + idne4 = idne call nepcor4 (idne4, start_node_num, num_nodes, x_coor, $ y_coor, z_coor, ierr4) ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Read an element blocks connectivity list -C + subroutine negnec (idne, elem_blk_id, start_elem_num, $ num_elems, connect, ierr) implicit none @@ -588,21 +588,21 @@ subroutine negnec (idne, elem_blk_id, start_elem_num, integer num_elems integer connect(num_elems) integer ierr -C + integer*4 idne4 integer*4 ierr4 -C + idne4 = idne call negnec4 (idne4, elem_blk_id, start_elem_num, $ num_elems, connect, ierr4) ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Write an element blocks connectivity list -C + subroutine nepnec (idne, elem_blk_id, start_elem_num, $ num_elems, connect, ierr) implicit none @@ -612,21 +612,21 @@ subroutine nepnec (idne, elem_blk_id, start_elem_num, integer num_elems integer connect(num_elems) integer ierr -C + integer*4 idne4 integer*4 ierr4 -C + idne4 = idne call nepnec4 (idne4, elem_blk_id, start_elem_num, $ num_elems, connect, ierr4) ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Read an element blocks attributes -C + subroutine negneat (idne, elem_blk_id, start_elem_num, $ num_elems, attrib, ierr) implicit none @@ -636,21 +636,21 @@ subroutine negneat (idne, elem_blk_id, start_elem_num, integer num_elems real attrib(num_elems) integer ierr -C + integer*4 idne4 integer*4 ierr4 -C + idne4 = idne call negneat4 (idne4, elem_blk_id, start_elem_num, $ num_elems, attrib, ierr4) ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Write an element blocks attributes -C + subroutine nepneat (idne, elem_blk_id, start_elem_num, $ num_elems, attrib, ierr) implicit none @@ -660,40 +660,40 @@ subroutine nepneat (idne, elem_blk_id, start_elem_num, integer num_elems real attrib(num_elems) integer ierr -C + integer*4 idne4 integer*4 ierr4 -C + idne4 = idne call nepneat4 (idne4, elem_blk_id, start_elem_num, $ num_elems, attrib, ierr4) ierr = ierr4 -C + end -C + C----------------------------------------------------------------------- C Read the element type for a specific element block -C + subroutine negelt (idne, elem_blk_id, elem_type, ierr) implicit none integer idne integer elem_blk_id character*(*) elem_type integer ierr -C + integer*4 idne4 integer*4 ierr4 -C + idne4 = idne call negelt4 (idne4, elem_blk_id, elem_type, ierr4) ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Read a variable for an element block -C + subroutine negnev (idne, time_step, elem_var_index, $ elem_blk_id, num_elem_this_blk, start_elem_num, $ num_elem, elem_var_vals, ierr) @@ -707,12 +707,12 @@ subroutine negnev (idne, time_step, elem_var_index, integer num_elem real elem_var_vals(num_elem) integer ierr -C + integer*4 idne4 integer*4 time_step4 integer*4 elem_var_index4 integer*4 ierr4 -C + idne4 = idne time_step4 = time_step elem_var_index4 = elem_var_index @@ -720,13 +720,13 @@ subroutine negnev (idne, time_step, elem_var_index, $ elem_blk_id, num_elem_this_blk, start_elem_num, $ num_elem, elem_var_vals, ierr4) ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Write a variable slab for an element block -C + subroutine nepevs (idne, time_step, elem_var_index, $ elem_blk_id, start_pos, num_vals, elem_var_vals, $ ierr) @@ -739,12 +739,12 @@ subroutine nepevs (idne, time_step, elem_var_index, integer num_vals real elem_var_vals(num_vals) integer ierr -C + integer*4 idne4 integer*4 time_step4 integer*4 elem_var_index4 integer*4 ierr4 -C + idne4 = idne time_step4 = time_step elem_var_index4 = elem_var_index @@ -752,13 +752,13 @@ subroutine nepevs (idne, time_step, elem_var_index, $ elem_blk_id, start_pos, num_vals, elem_var_vals, $ ierr4) ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Read the values of a single nodal variable for a single time step -C + subroutine negnnv (idne, time_step, nodal_var_index, $ start_node_num, num_nodes, nodal_vars, ierr) implicit none @@ -769,25 +769,25 @@ subroutine negnnv (idne, time_step, nodal_var_index, integer num_nodes real nodal_vars(num_nodes) integer ierr -C + integer*4 idne4 integer*4 time_step4 integer*4 nodal_var_index4 integer*4 ierr4 -C + idne4 = idne time_step4 = time_step nodal_var_index4 = nodal_var_index call negnnv4 (idne4, time_step4, nodal_var_index4, $ start_node_num, num_nodes, nodal_vars, ierr4) ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Write nodal variable slab -C + subroutine nepnvs (idne, time_step, nodal_var_index, $ start_pos, num_vals, nodal_var_vals, ierr) implicit none @@ -798,25 +798,25 @@ subroutine nepnvs (idne, time_step, nodal_var_index, integer num_vals real nodal_var_vals(num_vals) integer ierr -C + integer*4 idne4 integer*4 time_step4 integer*4 nodal_var_index4 integer*4 ierr4 -C + idne4 = idne time_step4 = time_step nodal_var_index4 = nodal_var_index call nepnvs4 (idne4, time_step4, nodal_var_index4, $ start_pos, num_vals, nodal_var_vals, ierr4) ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Read the element numbering map -C + subroutine negnenm (idne, starte, num_ent, elem_map, ierr) implicit none integer idne @@ -824,20 +824,20 @@ subroutine negnenm (idne, starte, num_ent, elem_map, ierr) integer num_ent integer elem_map(num_ent) integer ierr -C + integer*4 idne4 integer*4 ierr4 -C + idne4 = idne call negnenm4 (idne4, starte, num_ent, elem_map, ierr4) ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Write the element numbering map -C + subroutine nepnenm (idne, starte, num_ent, elem_map, ierr) implicit none integer idne @@ -845,20 +845,20 @@ subroutine nepnenm (idne, starte, num_ent, elem_map, ierr) integer num_ent integer elem_map(num_ent) integer ierr -C + integer*4 idne4 integer*4 ierr4 -C + idne4 = idne call nepnenm4 (idne4, starte, num_ent, elem_map, ierr4) ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Read the node numbering map -C + subroutine negnnnm (idne, startn, num_ent, node_map, ierr) implicit none integer idne @@ -866,20 +866,20 @@ subroutine negnnnm (idne, startn, num_ent, node_map, ierr) integer num_ent integer node_map(num_ent) integer ierr -C + integer*4 idne4 integer*4 ierr4 -C + idne4 = idne call negnnnm4 (idne4, startn, num_ent, node_map, ierr4) ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Write the node numbering map -C + subroutine nepnnnm (idne, startn, num_ent, node_map, ierr) implicit none integer idne @@ -887,20 +887,20 @@ subroutine nepnnnm (idne, startn, num_ent, node_map, ierr) integer num_ent integer node_map(num_ent) integer ierr -C + integer*4 idne4 integer*4 ierr4 -C + idne4 = idne call nepnnnm4 (idne4, startn, num_ent, node_map, ierr4) ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Read the node map for a processor -C + subroutine negnm (idne, node_mapi, node_mapb, node_mape, $ processor, ierr) implicit none @@ -910,23 +910,23 @@ subroutine negnm (idne, node_mapi, node_mapb, node_mape, integer node_mape(*) integer processor integer ierr -C + integer*4 idne4 integer*4 processor4 integer*4 ierr4 -C + idne4 = idne processor4 = processor call negnm4 (idne4, node_mapi, node_mapb, node_mape, $ processor4, ierr4) ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Write a node map for a processor -C + subroutine nepnm (idne, node_mapi, node_mapb, node_mape, $ processor, ierr) implicit none @@ -936,23 +936,23 @@ subroutine nepnm (idne, node_mapi, node_mapb, node_mape, integer node_mape(*) integer processor integer ierr -C + integer*4 idne4 integer*4 processor4 integer*4 ierr4 -C + idne4 = idne processor4 = processor call nepnm4 (idne4, node_mapi, node_mapb, node_mape, $ processor4, ierr4) ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Read the element map for a processor -C + subroutine negem (idne, elem_mapi, elem_mapb, processor, ierr) implicit none integer idne @@ -960,22 +960,22 @@ subroutine negem (idne, elem_mapi, elem_mapb, processor, ierr) integer elem_mapb(*) integer processor integer ierr -C + integer*4 idne4 integer*4 processor4 integer*4 ierr4 -C + idne4 = idne processor4 = processor call negem4 (idne4, elem_mapi, elem_mapb, processor4, ierr4) ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Write the element map for a processor -C + subroutine nepem (idne, elem_mapi, elem_mapb, processor, ierr) implicit none integer idne @@ -983,22 +983,22 @@ subroutine nepem (idne, elem_mapi, elem_mapb, processor, ierr) integer elem_mapb(*) integer processor integer ierr -C + integer*4 idne4 integer*4 processor4 integer*4 ierr4 -C + idne4 = idne processor4 = processor call nepem4 (idne4, elem_mapi, elem_mapb, processor4, ierr4) ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Read the communications map parameters for a single processor -C + subroutine negcmp (idne, ncmap_ids, ncmap_node_cnts, $ ecmap_ids, ecmap_elem_cnts, processor, ierr) implicit none @@ -1009,23 +1009,23 @@ subroutine negcmp (idne, ncmap_ids, ncmap_node_cnts, integer ecmap_elem_cnts(*) integer processor integer ierr -C + integer*4 idne4 integer*4 processor4 integer*4 ierr4 -C + idne4 = idne processor4 = processor call negcmp4 (idne4, ncmap_ids, ncmap_node_cnts, $ ecmap_ids, ecmap_elem_cnts, processor4, ierr4) ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Write the communications map parameters for a single processor -C + subroutine nepcmp (idne, nmap_ids, nmap_node_cnts, emap_ids, $ emap_elem_cnts, processor, ierr) implicit none @@ -1040,19 +1040,19 @@ subroutine nepcmp (idne, nmap_ids, nmap_node_cnts, emap_ids, integer*4 idne4 integer*4 processor4 integer*4 ierr4 -C + idne4 = idne processor4 = processor call nepcmp4 (idne4, nmap_ids, nmap_node_cnts, emap_ids, $ emap_elem_cnts, processor4, ierr4) ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Write the communications map parameters for all processors -C + subroutine nepcmpc (idne, nmap_ids, nmap_node_cnts, $ nproc_ptrs, emap_ids, emap_elem_cnts, eproc_ptrs, ierr) implicit none @@ -1067,7 +1067,7 @@ subroutine nepcmpc (idne, nmap_ids, nmap_node_cnts, integer*4 idne4 integer*4 ierr4 -C + idne4 = idne call nepcmpc4 (idne4, nmap_ids, nmap_node_cnts, $ nproc_ptrs, emap_ids, emap_elem_cnts, eproc_ptrs, ierr4) @@ -1076,9 +1076,9 @@ subroutine nepcmpc (idne, nmap_ids, nmap_node_cnts, end C----------------------------------------------------------------------- -C + C Read the nodal communications map for a single processor -C + subroutine negncm (idne, map_id, node_ids, proc_ids, $ processor, ierr) implicit none @@ -1088,23 +1088,23 @@ subroutine negncm (idne, map_id, node_ids, proc_ids, integer proc_ids(*) integer processor integer ierr -C + integer*4 idne4 integer*4 processor4 integer*4 ierr4 -C + idne4 = idne processor4 = processor call negncm4 (idne4, map_id, node_ids, proc_ids, $ processor4, ierr4) ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Write the nodal communications map for a single processor -C + subroutine nepncm (idne, map_id, node_ids, proc_ids, $ processor, ierr) implicit none @@ -1114,23 +1114,23 @@ subroutine nepncm (idne, map_id, node_ids, proc_ids, integer proc_ids(*) integer processor integer ierr -C + integer*4 idne4 integer*4 processor4 integer*4 ierr4 -C + idne4 = idne processor4 = processor call nepncm4 (idne4, map_id, node_ids, proc_ids, $ processor4, ierr4) ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Read the elemental communications map for a single processor -C + subroutine negecm (idne, map_id, elem_ids, side_ids, $ proc_ids, processor, ierr) implicit none @@ -1145,19 +1145,19 @@ subroutine negecm (idne, map_id, elem_ids, side_ids, integer*4 idne4 integer*4 processor4 integer*4 ierr4 -C + idne4 = idne processor4 = processor call negecm4 (idne4, map_id, elem_ids, side_ids, $ proc_ids, processor4, ierr4) ierr = ierr4 -C + end C----------------------------------------------------------------------- -C + C Write the elemental communications map for a single processor -C + subroutine nepecm (idne, map_id, elem_ids, side_ids, $ proc_ids, processor, ierr) implicit none diff --git a/packages/seacas/libraries/nemesis/forbind/ne_ftest.F b/packages/seacas/libraries/nemesis/forbind/ne_ftest.F index d4c44b86490c..2e9bb42c0fce 100644 --- a/packages/seacas/libraries/nemesis/forbind/ne_ftest.F +++ b/packages/seacas/libraries/nemesis/forbind/ne_ftest.F @@ -1,15 +1,15 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C================================================================= -C + C This is just a simple test program to test the fortran interface C for the NEMESIS I library. -C + C This file was created by translating ne_test.c into fortran. -C + C================================================================= C================================================================= diff --git a/packages/seacas/libraries/nemesis/forbind/ne_jack.c b/packages/seacas/libraries/nemesis/forbind/ne_jack.c index 4ddec1834414..22a6e705f3a9 100644 --- a/packages/seacas/libraries/nemesis/forbind/ne_jack.c +++ b/packages/seacas/libraries/nemesis/forbind/ne_jack.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /*==================================================================== diff --git a/packages/seacas/libraries/nemesis/forbind/ne_test.inc b/packages/seacas/libraries/nemesis/forbind/ne_test.inc index e979c59b2ba9..857980317e14 100644 --- a/packages/seacas/libraries/nemesis/forbind/ne_test.inc +++ b/packages/seacas/libraries/nemesis/forbind/ne_test.inc @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C================================================== C Parameters for the NE_TEST fortran interface test diff --git a/packages/seacas/libraries/nemesis/ne_ctest_wrap.c b/packages/seacas/libraries/nemesis/ne_ctest_wrap.c index eb088744a733..ffa430019bf2 100644 --- a/packages/seacas/libraries/nemesis/ne_ctest_wrap.c +++ b/packages/seacas/libraries/nemesis/ne_ctest_wrap.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /*****************************************************************************/ diff --git a/packages/seacas/libraries/nemesis/ne_nemesisI.h b/packages/seacas/libraries/nemesis/ne_nemesisI.h index 4eefeecc78d4..2d449b70dd3b 100644 --- a/packages/seacas/libraries/nemesis/ne_nemesisI.h +++ b/packages/seacas/libraries/nemesis/ne_nemesisI.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/nemesis/ne_nemesisI_int.h b/packages/seacas/libraries/nemesis/ne_nemesisI_int.h index 0ecab336a9b1..e08b2a3401c0 100644 --- a/packages/seacas/libraries/nemesis/ne_nemesisI_int.h +++ b/packages/seacas/libraries/nemesis/ne_nemesisI_int.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /* Dummy file -- Not needed after integration of nemesis library into exodus. */ diff --git a/packages/seacas/libraries/nemesis/nemesis_cfg.h.in b/packages/seacas/libraries/nemesis/nemesis_cfg.h.in index 6aae42299635..0204cdfff52f 100755 --- a/packages/seacas/libraries/nemesis/nemesis_cfg.h.in +++ b/packages/seacas/libraries/nemesis/nemesis_cfg.h.in @@ -1,7 +1,7 @@ # Copyright(C) 1999-2020 National Technology & Engineering Solutions # of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with # NTESS, the U.S. Government retains certain rights in this software. -# +# # See packages/seacas/LICENSE for details #ifndef __nemesis_cfg_h diff --git a/packages/seacas/libraries/nemesis/nemesis_wrapper.c b/packages/seacas/libraries/nemesis/nemesis_wrapper.c index 9860ae2012eb..c0670d6739c5 100644 --- a/packages/seacas/libraries/nemesis/nemesis_wrapper.c +++ b/packages/seacas/libraries/nemesis/nemesis_wrapper.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #include diff --git a/packages/seacas/libraries/plt/chrci.f b/packages/seacas/libraries/plt/chrci.f index 2d06a56eea90..409d7ff5e435 100644 --- a/packages/seacas/libraries/plt/chrci.f +++ b/packages/seacas/libraries/plt/chrci.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: chrci.f,v 1.1 1993/07/16 16:46:16 gdsjaar Exp $ -C $Log: chrci.f,v $ -C Revision 1.1 1993/07/16 16:46:16 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= LOGICAL FUNCTION CHRCI(LINE,INTE) CHARACTER LINE* (*),FORM*10,CL*2 diff --git a/packages/seacas/libraries/plt/chrcmp.f b/packages/seacas/libraries/plt/chrcmp.f index 59196add655a..946e2f346ce8 100644 --- a/packages/seacas/libraries/plt/chrcmp.f +++ b/packages/seacas/libraries/plt/chrcmp.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: chrcmp.f,v 1.1 1993/07/16 16:46:17 gdsjaar Exp $ -C $Log: chrcmp.f,v $ -C Revision 1.1 1993/07/16 16:46:17 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= LOGICAL FUNCTION CHRCMP(KWD,PART1,PART2) CHARACTER*(*) KWD diff --git a/packages/seacas/libraries/plt/chrcr.f b/packages/seacas/libraries/plt/chrcr.f index c69b3bb28a4d..2f6d0824c612 100644 --- a/packages/seacas/libraries/plt/chrcr.f +++ b/packages/seacas/libraries/plt/chrcr.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: chrcr.f,v 1.1 1993/07/16 16:46:17 gdsjaar Exp $ -C $Log: chrcr.f,v $ -C Revision 1.1 1993/07/16 16:46:17 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= LOGICAL FUNCTION CHRCR(LINE,REAL) CHARACTER LINE* (*),FORM*10,CL*2 diff --git a/packages/seacas/libraries/plt/chrdn.f b/packages/seacas/libraries/plt/chrdn.f index 6bf5f9aefdd2..027999e50161 100644 --- a/packages/seacas/libraries/plt/chrdn.f +++ b/packages/seacas/libraries/plt/chrdn.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/libraries/plt/chric.f b/packages/seacas/libraries/plt/chric.f index 815941c80cce..c028ac2d7d49 100644 --- a/packages/seacas/libraries/plt/chric.f +++ b/packages/seacas/libraries/plt/chric.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: chric.f,v 1.1 1993/07/16 16:46:19 gdsjaar Exp $ -C $Log: chric.f,v $ -C Revision 1.1 1993/07/16 16:46:19 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE CHRIC(JIN,DS,ND) CHARACTER*(*) DS diff --git a/packages/seacas/libraries/plt/chrlen.f b/packages/seacas/libraries/plt/chrlen.f index 524d2a819d78..b486621c3f06 100644 --- a/packages/seacas/libraries/plt/chrlen.f +++ b/packages/seacas/libraries/plt/chrlen.f @@ -1,19 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: chrlen.f,v $ -C Revision 1.3 1993/07/19 14:18:12 gdsjaar -C Reformatted flow of control -C -c Revision 1.2 1993/07/19 14:16:17 gdsjaar -c Reformatted flow of control -c -c Revision 1.1 1993/07/16 16:46:20 gdsjaar -c Changed plt to library rather than single source file. -c C======================================================================= INTEGER FUNCTION CHRLEN(S) CHARACTER*(*) S diff --git a/packages/seacas/libraries/plt/chrrvc.f b/packages/seacas/libraries/plt/chrrvc.f index 793e6860824b..59e246093b36 100644 --- a/packages/seacas/libraries/plt/chrrvc.f +++ b/packages/seacas/libraries/plt/chrrvc.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: chrrvc.f,v 1.1 1993/07/16 16:46:21 gdsjaar Exp $ -C $Log: chrrvc.f,v $ -C Revision 1.1 1993/07/16 16:46:21 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE CHRRVC(BUFF,TXT,L) CHARACTER*16 LOCTXT diff --git a/packages/seacas/libraries/plt/chrstr.f b/packages/seacas/libraries/plt/chrstr.f index e8c68adee23c..f9bfd44448fd 100644 --- a/packages/seacas/libraries/plt/chrstr.f +++ b/packages/seacas/libraries/plt/chrstr.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: chrstr.f,v 1.1 1993/07/16 16:46:22 gdsjaar Exp $ -C $Log: chrstr.f,v $ -C Revision 1.1 1993/07/16 16:46:22 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE CHRSTR(LINE1,LINE2,L) CHARACTER*(*) LINE1,LINE2 diff --git a/packages/seacas/libraries/plt/chrtrm.f b/packages/seacas/libraries/plt/chrtrm.f index c64ef6388aeb..0f05a3a5fdf1 100644 --- a/packages/seacas/libraries/plt/chrtrm.f +++ b/packages/seacas/libraries/plt/chrtrm.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: chrtrm.f,v 1.1 1993/07/16 16:46:23 gdsjaar Exp $ -C $Log: chrtrm.f,v $ -C Revision 1.1 1993/07/16 16:46:23 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE CHRTRM(LINE,L) CHARACTER*(*) LINE diff --git a/packages/seacas/libraries/plt/chrup.f b/packages/seacas/libraries/plt/chrup.f index 33388f2bf5c6..a6cf2ef9d22c 100644 --- a/packages/seacas/libraries/plt/chrup.f +++ b/packages/seacas/libraries/plt/chrup.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: chrup.f,v 1.1 1993/07/16 16:46:24 gdsjaar Exp $ -C $Log: chrup.f,v $ -C Revision 1.1 1993/07/16 16:46:24 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE CHRUP(LINE1,LINE2) CHARACTER*(*) LINE1,LINE2 diff --git a/packages/seacas/libraries/plt/cpucml.f b/packages/seacas/libraries/plt/cpucml.f index 5a5db066de27..dca4388318ed 100644 --- a/packages/seacas/libraries/plt/cpucml.f +++ b/packages/seacas/libraries/plt/cpucml.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: cpucml.f,v 1.1 1993/07/16 16:46:25 gdsjaar Exp $ -C $Log: cpucml.f,v $ -C Revision 1.1 1993/07/16 16:46:25 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE CPUCML(LINE,PROMPT,L) CHARACTER*(*) LINE,PROMPT diff --git a/packages/seacas/libraries/plt/cpudac.f b/packages/seacas/libraries/plt/cpudac.f index dac8fb188ba2..5519ba36358c 100644 --- a/packages/seacas/libraries/plt/cpudac.f +++ b/packages/seacas/libraries/plt/cpudac.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: cpudac.f,v 1.1 1993/07/16 16:46:26 gdsjaar Exp $ -C $Log: cpudac.f,v $ -C Revision 1.1 1993/07/16 16:46:26 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE CPUDAC(DS) CHARACTER*(*) DS diff --git a/packages/seacas/libraries/plt/cpuerr.f b/packages/seacas/libraries/plt/cpuerr.f index 787e1a996ac0..13fdf471e712 100644 --- a/packages/seacas/libraries/plt/cpuerr.f +++ b/packages/seacas/libraries/plt/cpuerr.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: cpuerr.f,v 1.1 1993/07/16 16:46:27 gdsjaar Exp $ -C $Log: cpuerr.f,v $ -C Revision 1.1 1993/07/16 16:46:27 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE CPUERR(STR,DISP) CHARACTER*(*) STR diff --git a/packages/seacas/libraries/plt/cpumvu.f b/packages/seacas/libraries/plt/cpumvu.f index 587ed54748eb..d3af3ef334fc 100644 --- a/packages/seacas/libraries/plt/cpumvu.f +++ b/packages/seacas/libraries/plt/cpumvu.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: cpumvu.f,v 1.1 1993/07/16 16:46:28 gdsjaar Exp $ -C $Log: cpumvu.f,v $ -C Revision 1.1 1993/07/16 16:46:28 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE CPUMVU(A,B,L) IMPLICIT INTEGER (A-Z) diff --git a/packages/seacas/libraries/plt/cpunal.f b/packages/seacas/libraries/plt/cpunal.f index 097041256500..a36c89fdcecb 100644 --- a/packages/seacas/libraries/plt/cpunal.f +++ b/packages/seacas/libraries/plt/cpunal.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: cpunal.f,v 1.1 1993/07/16 16:46:29 gdsjaar Exp $ -C $Log: cpunal.f,v $ -C Revision 1.1 1993/07/16 16:46:29 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= LOGICAL FUNCTION CPUNAL(IU) CHARACTER*40 CPUHLB diff --git a/packages/seacas/libraries/plt/cpunde.f b/packages/seacas/libraries/plt/cpunde.f index e8e2ea8d2926..8569ced51f8e 100644 --- a/packages/seacas/libraries/plt/cpunde.f +++ b/packages/seacas/libraries/plt/cpunde.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: cpunde.f,v 1.1 1993/07/16 16:46:30 gdsjaar Exp $ -C $Log: cpunde.f,v $ -C Revision 1.1 1993/07/16 16:46:30 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE CPUNDE(IU) CHARACTER*40 CPUHLB diff --git a/packages/seacas/libraries/plt/cpuqa.f b/packages/seacas/libraries/plt/cpuqa.f index 930eb9076fc8..ee6676512e80 100644 --- a/packages/seacas/libraries/plt/cpuqa.f +++ b/packages/seacas/libraries/plt/cpuqa.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: cpuqa.f,v 1.1 1993/07/16 16:46:31 gdsjaar Exp $ -C $Log: cpuqa.f,v $ -C Revision 1.1 1993/07/16 16:46:31 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE CPUQA(DATE1,TIME,USER,JOBID,DIV,ENUM,CASENO,CLASS) CHARACTER*(*) DATE1 diff --git a/packages/seacas/libraries/plt/ldrota.f b/packages/seacas/libraries/plt/ldrota.f index 59b84faf171c..54300d2e3292 100644 --- a/packages/seacas/libraries/plt/ldrota.f +++ b/packages/seacas/libraries/plt/ldrota.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: ldrota.f,v 1.1 1993/07/16 16:46:34 gdsjaar Exp $ -C $Log: ldrota.f,v $ -C Revision 1.1 1993/07/16 16:46:34 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE LDROTA(AXIS,COSANG,SINANG,MAT) REAL MAT(4,4) diff --git a/packages/seacas/libraries/plt/ldscal.f b/packages/seacas/libraries/plt/ldscal.f index 5d972aedfe45..82773bdc956e 100644 --- a/packages/seacas/libraries/plt/ldscal.f +++ b/packages/seacas/libraries/plt/ldscal.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: ldscal.f,v 1.1 1993/07/16 16:46:35 gdsjaar Exp $ -C $Log: ldscal.f,v $ -C Revision 1.1 1993/07/16 16:46:35 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE LDSCAL(X,Y,Z,MAT) REAL MAT(4,4) diff --git a/packages/seacas/libraries/plt/ldtran.f b/packages/seacas/libraries/plt/ldtran.f index d30f630b0691..4916f0ae1ef7 100644 --- a/packages/seacas/libraries/plt/ldtran.f +++ b/packages/seacas/libraries/plt/ldtran.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: ldtran.f,v 1.1 1993/07/16 16:46:36 gdsjaar Exp $ -C $Log: ldtran.f,v $ -C Revision 1.1 1993/07/16 16:46:36 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE LDTRAN(X,Y,Z,MAT) REAL MAT(4,4) diff --git a/packages/seacas/libraries/plt/lxany.f b/packages/seacas/libraries/plt/lxany.f index 2b2eb30c1d3c..57da6557a757 100644 --- a/packages/seacas/libraries/plt/lxany.f +++ b/packages/seacas/libraries/plt/lxany.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: lxany.f,v 1.1 1993/07/16 16:46:37 gdsjaar Exp $ -C $Log: lxany.f,v $ -C Revision 1.1 1993/07/16 16:46:37 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= LOGICAL FUNCTION LXANY(CH) IMPLICIT INTEGER (A-Z) diff --git a/packages/seacas/libraries/plt/lxcln.f b/packages/seacas/libraries/plt/lxcln.f index 21256cc4c8ae..b2f4dec2d556 100644 --- a/packages/seacas/libraries/plt/lxcln.f +++ b/packages/seacas/libraries/plt/lxcln.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: lxcln.f,v 1.1 1993/07/16 16:46:37 gdsjaar Exp $ -C $Log: lxcln.f,v $ -C Revision 1.1 1993/07/16 16:46:37 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE LXCLN IMPLICIT INTEGER (A-Z) diff --git a/packages/seacas/libraries/plt/lxerr.f b/packages/seacas/libraries/plt/lxerr.f index 81ed053379e0..6c737bbec271 100644 --- a/packages/seacas/libraries/plt/lxerr.f +++ b/packages/seacas/libraries/plt/lxerr.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: lxerr.f,v 1.1 1993/07/16 16:46:38 gdsjaar Exp $ -C $Log: lxerr.f,v $ -C Revision 1.1 1993/07/16 16:46:38 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE LXERR(MSG,DISP) CHARACTER*(*) MSG diff --git a/packages/seacas/libraries/plt/lxgtbp.f b/packages/seacas/libraries/plt/lxgtbp.f index e07ab540200d..c9b07a3de358 100644 --- a/packages/seacas/libraries/plt/lxgtbp.f +++ b/packages/seacas/libraries/plt/lxgtbp.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: lxgtbp.f,v 1.1 1993/07/16 16:46:39 gdsjaar Exp $ -C $Log: lxgtbp.f,v $ -C Revision 1.1 1993/07/16 16:46:39 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= LOGICAL FUNCTION LXGTBP(STR,NS,CH) IMPLICIT INTEGER (A-Z) diff --git a/packages/seacas/libraries/plt/lxgtch.f b/packages/seacas/libraries/plt/lxgtch.f index 2a36cebd852f..849499f7e9cc 100644 --- a/packages/seacas/libraries/plt/lxgtch.f +++ b/packages/seacas/libraries/plt/lxgtch.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: lxgtch.f,v 1.1 1993/07/16 16:46:40 gdsjaar Exp $ -C $Log: lxgtch.f,v $ -C Revision 1.1 1993/07/16 16:46:40 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= LOGICAL FUNCTION LXGTCH(CH1,CH) IMPLICIT INTEGER (A-Z) diff --git a/packages/seacas/libraries/plt/lxgtqt.f b/packages/seacas/libraries/plt/lxgtqt.f index 34c7252b0964..b55e61f20609 100644 --- a/packages/seacas/libraries/plt/lxgtqt.f +++ b/packages/seacas/libraries/plt/lxgtqt.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: lxgtqt.f,v 1.1 1993/07/16 16:46:41 gdsjaar Exp $ -C $Log: lxgtqt.f,v $ -C Revision 1.1 1993/07/16 16:46:41 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= LOGICAL FUNCTION LXGTQT(STR,NS,CH) IMPLICIT INTEGER (A-Z) diff --git a/packages/seacas/libraries/plt/lxgtwh.f b/packages/seacas/libraries/plt/lxgtwh.f index 68e30d7da86a..ca1853df161a 100644 --- a/packages/seacas/libraries/plt/lxgtwh.f +++ b/packages/seacas/libraries/plt/lxgtwh.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: lxgtwh.f,v 1.1 1993/07/16 16:46:42 gdsjaar Exp $ -C $Log: lxgtwh.f,v $ -C Revision 1.1 1993/07/16 16:46:42 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= LOGICAL FUNCTION LXGTWH(CH) IMPLICIT INTEGER (A-Z) diff --git a/packages/seacas/libraries/plt/lxnbs.f b/packages/seacas/libraries/plt/lxnbs.f index 786ff913da42..b310b48c9900 100644 --- a/packages/seacas/libraries/plt/lxnbs.f +++ b/packages/seacas/libraries/plt/lxnbs.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: lxnbs.f,v 1.1 1993/07/16 16:46:43 gdsjaar Exp $ -C $Log: lxnbs.f,v $ -C Revision 1.1 1993/07/16 16:46:43 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= LOGICAL FUNCTION LXNBS(LINE,L) IMPLICIT INTEGER (A-Z) diff --git a/packages/seacas/libraries/plt/lxnumb.f b/packages/seacas/libraries/plt/lxnumb.f index 730d226ca984..bc7f49ec9426 100644 --- a/packages/seacas/libraries/plt/lxnumb.f +++ b/packages/seacas/libraries/plt/lxnumb.f @@ -1,17 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: lxnumb.f,v 1.2 1993/07/16 18:28:50 gdsjaar Exp $ -C $Log: lxnumb.f,v $ -C Revision 1.2 1993/07/16 18:28:50 gdsjaar -C Changed real*8 to double precision -C -c Revision 1.1 1993/07/16 16:46:44 gdsjaar -c Changed plt to library rather than single source file. -c C======================================================================= LOGICAL FUNCTION LXNUMB(N,ND,CH) CHARACTER*(*) CH diff --git a/packages/seacas/libraries/plt/lxreal.f b/packages/seacas/libraries/plt/lxreal.f index d9318e36d389..9e7d735cfad9 100644 --- a/packages/seacas/libraries/plt/lxreal.f +++ b/packages/seacas/libraries/plt/lxreal.f @@ -1,17 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: lxreal.f,v 1.2 1993/07/16 18:28:51 gdsjaar Exp $ -C $Log: lxreal.f,v $ -C Revision 1.2 1993/07/16 18:28:51 gdsjaar -C Changed real*8 to double precision -C -c Revision 1.1 1993/07/16 16:46:45 gdsjaar -c Changed plt to library rather than single source file. -c C======================================================================= LOGICAL FUNCTION LXREAL(VALUE,CH) LOGICAL LXSET,LXNUMB diff --git a/packages/seacas/libraries/plt/lxrem.f b/packages/seacas/libraries/plt/lxrem.f index b6f740c9bc2a..d92e3637095d 100644 --- a/packages/seacas/libraries/plt/lxrem.f +++ b/packages/seacas/libraries/plt/lxrem.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: lxrem.f,v 1.1 1993/07/16 16:46:46 gdsjaar Exp $ -C $Log: lxrem.f,v $ -C Revision 1.1 1993/07/16 16:46:46 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE LXREM(LINE,L) IMPLICIT INTEGER (A-Z) diff --git a/packages/seacas/libraries/plt/lxrnl.f b/packages/seacas/libraries/plt/lxrnl.f index 4e45189a9b50..eb63eaa6c1dd 100644 --- a/packages/seacas/libraries/plt/lxrnl.f +++ b/packages/seacas/libraries/plt/lxrnl.f @@ -1,21 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: lxrnl.f,v 1.3 1993/07/16 18:28:52 gdsjaar Exp $ -C $Log: lxrnl.f,v $ -C Revision 1.3 1993/07/16 18:28:52 gdsjaar -C Changed real*8 to double precision -C -c Revision 1.2 1993/07/16 18:07:49 gdsjaar -c Added external pltblk statements so that linkers would pull in block -c data subprogram to initialize constants. -c -c Revision 1.1 1993/07/16 16:46:47 gdsjaar -c Changed plt to library rather than single source file. -c C======================================================================= LOGICAL FUNCTION LXRNL(VAL,N,CH) DOUBLE PRECISION VAL(*) diff --git a/packages/seacas/libraries/plt/lxrs.f b/packages/seacas/libraries/plt/lxrs.f index 50bc1324887d..7d130b3f4ef5 100644 --- a/packages/seacas/libraries/plt/lxrs.f +++ b/packages/seacas/libraries/plt/lxrs.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: lxrs.f,v 1.1 1993/07/16 16:46:47 gdsjaar Exp $ -C $Log: lxrs.f,v $ -C Revision 1.1 1993/07/16 16:46:47 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE LXRS(IP) IMPLICIT INTEGER (A-Z) diff --git a/packages/seacas/libraries/plt/lxrst.f b/packages/seacas/libraries/plt/lxrst.f index 09a95c2638b0..bea07924b738 100644 --- a/packages/seacas/libraries/plt/lxrst.f +++ b/packages/seacas/libraries/plt/lxrst.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: lxrst.f,v 1.1 1993/07/16 16:46:48 gdsjaar Exp $ -C $Log: lxrst.f,v $ -C Revision 1.1 1993/07/16 16:46:48 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE LXRST IMPLICIT INTEGER (A-Z) diff --git a/packages/seacas/libraries/plt/lxscan.f b/packages/seacas/libraries/plt/lxscan.f index 4d91c73c7ee3..3f7827e954ec 100644 --- a/packages/seacas/libraries/plt/lxscan.f +++ b/packages/seacas/libraries/plt/lxscan.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: lxscan.f,v 1.1 1993/07/16 16:46:49 gdsjaar Exp $ -C $Log: lxscan.f,v $ -C Revision 1.1 1993/07/16 16:46:49 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= LOGICAL FUNCTION LXSCAN(DELIM,REM,L,CH) IMPLICIT INTEGER (A-Z) diff --git a/packages/seacas/libraries/plt/lxscnp.f b/packages/seacas/libraries/plt/lxscnp.f index fddc384cb183..c543fabaed77 100644 --- a/packages/seacas/libraries/plt/lxscnp.f +++ b/packages/seacas/libraries/plt/lxscnp.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: lxscnp.f,v 1.1 1993/07/16 16:46:50 gdsjaar Exp $ -C $Log: lxscnp.f,v $ -C Revision 1.1 1993/07/16 16:46:50 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= LOGICAL FUNCTION LXSCNP(DELIM,STR,NS,CH) IMPLICIT INTEGER (A-Z) diff --git a/packages/seacas/libraries/plt/lxset.f b/packages/seacas/libraries/plt/lxset.f index 72189a72902a..b04cfe19e036 100644 --- a/packages/seacas/libraries/plt/lxset.f +++ b/packages/seacas/libraries/plt/lxset.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: lxset.f,v 1.1 1993/07/16 16:46:51 gdsjaar Exp $ -C $Log: lxset.f,v $ -C Revision 1.1 1993/07/16 16:46:51 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= LOGICAL FUNCTION LXSET(SET,CH) IMPLICIT INTEGER (A-Z) diff --git a/packages/seacas/libraries/plt/lxsetp.f b/packages/seacas/libraries/plt/lxsetp.f index 7b30c5396c60..692dd87dd32b 100644 --- a/packages/seacas/libraries/plt/lxsetp.f +++ b/packages/seacas/libraries/plt/lxsetp.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: lxsetp.f,v 1.1 1993/07/16 16:46:52 gdsjaar Exp $ -C $Log: lxsetp.f,v $ -C Revision 1.1 1993/07/16 16:46:52 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE LXSETP(LINE) IMPLICIT INTEGER (A-Z) diff --git a/packages/seacas/libraries/plt/lxstk.f b/packages/seacas/libraries/plt/lxstk.f index 1c125149b0bb..6ed9724769de 100644 --- a/packages/seacas/libraries/plt/lxstk.f +++ b/packages/seacas/libraries/plt/lxstk.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: lxstk.f,v 1.1 1993/07/16 16:46:53 gdsjaar Exp $ -C $Log: lxstk.f,v $ -C Revision 1.1 1993/07/16 16:46:53 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE LXSTK(LINE) IMPLICIT INTEGER (A-Z) diff --git a/packages/seacas/libraries/plt/lxsv.f b/packages/seacas/libraries/plt/lxsv.f index 6a3d3238f395..ee17984967ea 100644 --- a/packages/seacas/libraries/plt/lxsv.f +++ b/packages/seacas/libraries/plt/lxsv.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: lxsv.f,v 1.1 1993/07/16 16:46:54 gdsjaar Exp $ -C $Log: lxsv.f,v $ -C Revision 1.1 1993/07/16 16:46:54 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= INTEGER FUNCTION LXSV() IMPLICIT INTEGER (A-Z) diff --git a/packages/seacas/libraries/plt/lxsym2.f b/packages/seacas/libraries/plt/lxsym2.f index f0162ed44ad6..b7844b31d323 100644 --- a/packages/seacas/libraries/plt/lxsym2.f +++ b/packages/seacas/libraries/plt/lxsym2.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: lxsym2.f,v 1.1 1993/07/16 16:46:55 gdsjaar Exp $ -C $Log: lxsym2.f,v $ -C Revision 1.1 1993/07/16 16:46:55 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= LOGICAL FUNCTION LXSYM2(SYM,NS,CH) IMPLICIT INTEGER (A-Z) diff --git a/packages/seacas/libraries/plt/lxsymb.f b/packages/seacas/libraries/plt/lxsymb.f index e5983efe04a9..5b582e2466a4 100644 --- a/packages/seacas/libraries/plt/lxsymb.f +++ b/packages/seacas/libraries/plt/lxsymb.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: lxsymb.f,v 1.1 1993/07/16 16:46:55 gdsjaar Exp $ -C $Log: lxsymb.f,v $ -C Revision 1.1 1993/07/16 16:46:55 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= LOGICAL FUNCTION LXSYMB(SYM,NS,CH) IMPLICIT INTEGER (A-Z) diff --git a/packages/seacas/libraries/plt/memall.f b/packages/seacas/libraries/plt/memall.f index b67a3559996f..1d82e89f4cd0 100644 --- a/packages/seacas/libraries/plt/memall.f +++ b/packages/seacas/libraries/plt/memall.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: memall.f,v 1.1 1993/07/16 16:46:56 gdsjaar Exp $ -C $Log: memall.f,v $ -C Revision 1.1 1993/07/16 16:46:56 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= INTEGER FUNCTION MEMALL(LENGTH,MEMRY) INTEGER LENGTH diff --git a/packages/seacas/libraries/plt/memext.f b/packages/seacas/libraries/plt/memext.f index ed0d9ccae684..ce63fe99a920 100644 --- a/packages/seacas/libraries/plt/memext.f +++ b/packages/seacas/libraries/plt/memext.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: memext.f,v 1.1 1993/07/16 16:46:58 gdsjaar Exp $ -C $Log: memext.f,v $ -C Revision 1.1 1993/07/16 16:46:58 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= LOGICAL FUNCTION MEMEXT(IB,MEMRY,INCL) INTEGER IB diff --git a/packages/seacas/libraries/plt/memfre.f b/packages/seacas/libraries/plt/memfre.f index 5d6e9787977c..9986a1ab27e2 100644 --- a/packages/seacas/libraries/plt/memfre.f +++ b/packages/seacas/libraries/plt/memfre.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: memfre.f,v 1.1 1993/07/16 16:46:59 gdsjaar Exp $ -C $Log: memfre.f,v $ -C Revision 1.1 1993/07/16 16:46:59 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= LOGICAL FUNCTION MEMFRE(IB,MEMRY) INTEGER IB diff --git a/packages/seacas/libraries/plt/memini.f b/packages/seacas/libraries/plt/memini.f index 299d651a2768..6b61d8099377 100644 --- a/packages/seacas/libraries/plt/memini.f +++ b/packages/seacas/libraries/plt/memini.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: memini.f,v 1.1 1993/07/16 16:47:00 gdsjaar Exp $ -C $Log: memini.f,v $ -C Revision 1.1 1993/07/16 16:47:00 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE MEMINI(MEMRY,LENGTH) INTEGER MEMRY(*) diff --git a/packages/seacas/libraries/plt/memtrc.f b/packages/seacas/libraries/plt/memtrc.f index 5511d6b1958f..b82a4c039753 100644 --- a/packages/seacas/libraries/plt/memtrc.f +++ b/packages/seacas/libraries/plt/memtrc.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/libraries/plt/mp2pg.f b/packages/seacas/libraries/plt/mp2pg.f index 9ef165a085aa..d4cce1a2ff2a 100644 --- a/packages/seacas/libraries/plt/mp2pg.f +++ b/packages/seacas/libraries/plt/mp2pg.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: mp2pg.f,v 1.1 1993/07/16 16:47:02 gdsjaar Exp $ -C $Log: mp2pg.f,v $ -C Revision 1.1 1993/07/16 16:47:02 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE MP2PG(N,XV,YV,NO,XVO,YVO) COMMON /MAP/MODEL(4,4),VIEW(4,4),PROJ(4,4),CPNEAR,CPFAR,VWPORT(4), diff --git a/packages/seacas/libraries/plt/mp2pt.f b/packages/seacas/libraries/plt/mp2pt.f index 8e31a4715b24..81ad14e9051f 100644 --- a/packages/seacas/libraries/plt/mp2pt.f +++ b/packages/seacas/libraries/plt/mp2pt.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: mp2pt.f,v 1.1 1993/07/16 16:47:03 gdsjaar Exp $ -C $Log: mp2pt.f,v $ -C Revision 1.1 1993/07/16 16:47:03 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE MP2PT(N,X0,Y0,PX,PY,MASK) COMMON /MAP/MODEL(4,4),VIEW(4,4),PROJ(4,4),CPNEAR,CPFAR,VWPORT(4), diff --git a/packages/seacas/libraries/plt/mp2vc.f b/packages/seacas/libraries/plt/mp2vc.f index 5da83076d559..5931132a8031 100644 --- a/packages/seacas/libraries/plt/mp2vc.f +++ b/packages/seacas/libraries/plt/mp2vc.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: mp2vc.f,v 1.1 1993/07/16 16:47:03 gdsjaar Exp $ -C $Log: mp2vc.f,v $ -C Revision 1.1 1993/07/16 16:47:03 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE MP2VC(N,X0,Y0,X1,Y1,PX,PY,QX,QY,MASK) COMMON /MAP/MODEL(4,4),VIEW(4,4),PROJ(4,4),CPNEAR,CPFAR,VWPORT(4), diff --git a/packages/seacas/libraries/plt/mp3pg.f b/packages/seacas/libraries/plt/mp3pg.f index b46b10aeae59..a982d22fdfab 100644 --- a/packages/seacas/libraries/plt/mp3pg.f +++ b/packages/seacas/libraries/plt/mp3pg.f @@ -1,21 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: mp3pg.f,v 1.2 2000/10/25 18:55:01 gdsjaar Exp $ -C $Log: mp3pg.f,v $ -C Revision 1.2 2000/10/25 18:55:01 gdsjaar -C In the pltli? functions, check for N==0 before doing any array -C accesses. -C -C Also changed all references to 'mask' to be arrays where they were -C scalars since downstream code seems to treat them as arrays. -C -C Revision 1.1 1993/07/16 16:47:04 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE MP3PG(NV,XV,YV,ZV,NO,XVO,YVO,ZVO) COMMON /MAP/MODEL(4,4),VIEW(4,4),PROJ(4,4),CPNEAR,CPFAR,VWPORT(4), diff --git a/packages/seacas/libraries/plt/mp3pt.f b/packages/seacas/libraries/plt/mp3pt.f index 14b3cacfd548..3d26f5cca39f 100644 --- a/packages/seacas/libraries/plt/mp3pt.f +++ b/packages/seacas/libraries/plt/mp3pt.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: mp3pt.f,v 1.1 1993/07/16 16:47:05 gdsjaar Exp $ -C $Log: mp3pt.f,v $ -C Revision 1.1 1993/07/16 16:47:05 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE MP3PT(N,X0,Y0,Z0,PX,PY,PZ,MASK) COMMON /MAP/MODEL(4,4),VIEW(4,4),PROJ(4,4),CPNEAR,CPFAR,VWPORT(4), diff --git a/packages/seacas/libraries/plt/mp3vc.f b/packages/seacas/libraries/plt/mp3vc.f index 445aff4b1358..59f93f028953 100644 --- a/packages/seacas/libraries/plt/mp3vc.f +++ b/packages/seacas/libraries/plt/mp3vc.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: mp3vc.f,v 1.1 1993/07/16 16:47:06 gdsjaar Exp $ -C $Log: mp3vc.f,v $ -C Revision 1.1 1993/07/16 16:47:06 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE MP3VC(N,X0,Y0,Z0,X1,Y1,Z1,PX,PY,PZ,QX,QY,QZ,MASK) COMMON /MAP/MODEL(4,4),VIEW(4,4),PROJ(4,4),CPNEAR,CPFAR,VWPORT(4), diff --git a/packages/seacas/libraries/plt/mpclp2.f b/packages/seacas/libraries/plt/mpclp2.f index d8461ec7174b..969c1da4b346 100644 --- a/packages/seacas/libraries/plt/mpclp2.f +++ b/packages/seacas/libraries/plt/mpclp2.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: mpclp2.f,v 1.1 1993/07/16 16:47:07 gdsjaar Exp $ -C $Log: mpclp2.f,v $ -C Revision 1.1 1993/07/16 16:47:07 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= LOGICAL FUNCTION MPCLP2(N,C1X,C1Y,C2X,C2Y) COMMON /MAP/MODEL(4,4),VIEW(4,4),PROJ(4,4),CPNEAR,CPFAR,VWPORT(4), diff --git a/packages/seacas/libraries/plt/mpclp3.f b/packages/seacas/libraries/plt/mpclp3.f index ede39718c94c..c5e62e428494 100644 --- a/packages/seacas/libraries/plt/mpclp3.f +++ b/packages/seacas/libraries/plt/mpclp3.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: mpclp3.f,v 1.1 1993/07/16 16:47:08 gdsjaar Exp $ -C $Log: mpclp3.f,v $ -C Revision 1.1 1993/07/16 16:47:08 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= LOGICAL FUNCTION MPCLP3(N,PX,PY,PZ,VX,VY,VZ) COMMON /MAP/MODEL(4,4),VIEW(4,4),PROJ(4,4),CPNEAR,CPFAR,VWPORT(4), diff --git a/packages/seacas/libraries/plt/mpd2pg.f b/packages/seacas/libraries/plt/mpd2pg.f index c1416ac22dad..183fcb78999e 100644 --- a/packages/seacas/libraries/plt/mpd2pg.f +++ b/packages/seacas/libraries/plt/mpd2pg.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: mpd2pg.f,v 1.1 1993/07/16 16:47:09 gdsjaar Exp $ -C $Log: mpd2pg.f,v $ -C Revision 1.1 1993/07/16 16:47:09 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE MPD2PG(N,XV,YV,MODE) COMMON /MAP/MODEL(4,4),VIEW(4,4),PROJ(4,4),CPNEAR,CPFAR,VWPORT(4), diff --git a/packages/seacas/libraries/plt/mpd2pt.f b/packages/seacas/libraries/plt/mpd2pt.f index 403499549487..14970cfe67ce 100644 --- a/packages/seacas/libraries/plt/mpd2pt.f +++ b/packages/seacas/libraries/plt/mpd2pt.f @@ -1,21 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: mpd2pt.f,v 1.2 2000/10/25 18:55:01 gdsjaar Exp $ -C $Log: mpd2pt.f,v $ -C Revision 1.2 2000/10/25 18:55:01 gdsjaar -C In the pltli? functions, check for N==0 before doing any array -C accesses. -C -C Also changed all references to 'mask' to be arrays where they were -C scalars since downstream code seems to treat them as arrays. -C -C Revision 1.1 1993/07/16 16:47:10 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE MPD2PT(N,X0,Y0) COMMON /MAP/MODEL(4,4),VIEW(4,4),PROJ(4,4),CPNEAR,CPFAR,VWPORT(4), diff --git a/packages/seacas/libraries/plt/mpd2sy.f b/packages/seacas/libraries/plt/mpd2sy.f index 36c99bffbab5..fe3237c43ab1 100644 --- a/packages/seacas/libraries/plt/mpd2sy.f +++ b/packages/seacas/libraries/plt/mpd2sy.f @@ -1,21 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: mpd2sy.f,v 1.2 2000/10/25 18:55:01 gdsjaar Exp $ -C $Log: mpd2sy.f,v $ -C Revision 1.2 2000/10/25 18:55:01 gdsjaar -C In the pltli? functions, check for N==0 before doing any array -C accesses. -C -C Also changed all references to 'mask' to be arrays where they were -C scalars since downstream code seems to treat them as arrays. -C -C Revision 1.1 1993/07/16 16:47:11 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE MPD2SY(N,X0,Y0,SYM) COMMON /MAP/MODEL(4,4),VIEW(4,4),PROJ(4,4),CPNEAR,CPFAR,VWPORT(4), diff --git a/packages/seacas/libraries/plt/mpd2vc.f b/packages/seacas/libraries/plt/mpd2vc.f index bd26ead8a04e..4e7ab0a0555e 100644 --- a/packages/seacas/libraries/plt/mpd2vc.f +++ b/packages/seacas/libraries/plt/mpd2vc.f @@ -1,24 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: mpd2vc.f,v 1.3 2000/10/25 18:55:01 gdsjaar Exp $ -C $Log: mpd2vc.f,v $ -C Revision 1.3 2000/10/25 18:55:01 gdsjaar -C In the pltli? functions, check for N==0 before doing any array -C accesses. -C -C Also changed all references to 'mask' to be arrays where they were -C scalars since downstream code seems to treat them as arrays. -C -C Revision 1.2 1993/07/16 22:40:56 gdsjaar -C Reformatted flow of control -C -c Revision 1.1 1993/07/16 16:47:12 gdsjaar -c Changed plt to library rather than single source file. -c C======================================================================= SUBROUTINE MPD2VC(N,X0,Y0,X1,Y1) COMMON /MAP/MODEL(4,4),VIEW(4,4),PROJ(4,4),CPNEAR,CPFAR,VWPORT(4), diff --git a/packages/seacas/libraries/plt/mpd3pg.f b/packages/seacas/libraries/plt/mpd3pg.f index 53555b0ef70d..e917fa3e09e3 100644 --- a/packages/seacas/libraries/plt/mpd3pg.f +++ b/packages/seacas/libraries/plt/mpd3pg.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: mpd3pg.f,v 1.1 1993/07/16 16:47:13 gdsjaar Exp $ -C $Log: mpd3pg.f,v $ -C Revision 1.1 1993/07/16 16:47:13 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE MPD3PG(NV,XV,YV,ZV,MODE) COMMON /MAP/MODEL(4,4),VIEW(4,4),PROJ(4,4),CPNEAR,CPFAR,VWPORT(4), diff --git a/packages/seacas/libraries/plt/mpd3pt.f b/packages/seacas/libraries/plt/mpd3pt.f index 8803316f868a..c715c27ac32a 100644 --- a/packages/seacas/libraries/plt/mpd3pt.f +++ b/packages/seacas/libraries/plt/mpd3pt.f @@ -1,21 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: mpd3pt.f,v 1.2 2000/10/25 18:55:01 gdsjaar Exp $ -C $Log: mpd3pt.f,v $ -C Revision 1.2 2000/10/25 18:55:01 gdsjaar -C In the pltli? functions, check for N==0 before doing any array -C accesses. -C -C Also changed all references to 'mask' to be arrays where they were -C scalars since downstream code seems to treat them as arrays. -C -C Revision 1.1 1993/07/16 16:47:14 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE MPD3PT(N,X0,Y0,Z0) COMMON /MAP/MODEL(4,4),VIEW(4,4),PROJ(4,4),CPNEAR,CPFAR,VWPORT(4), diff --git a/packages/seacas/libraries/plt/mpd3vc.f b/packages/seacas/libraries/plt/mpd3vc.f index 6df06dd4205e..609aadb96f36 100644 --- a/packages/seacas/libraries/plt/mpd3vc.f +++ b/packages/seacas/libraries/plt/mpd3vc.f @@ -1,21 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: mpd3vc.f,v 1.2 2000/10/25 18:55:01 gdsjaar Exp $ -C $Log: mpd3vc.f,v $ -C Revision 1.2 2000/10/25 18:55:01 gdsjaar -C In the pltli? functions, check for N==0 before doing any array -C accesses. -C -C Also changed all references to 'mask' to be arrays where they were -C scalars since downstream code seems to treat them as arrays. -C -C Revision 1.1 1993/07/16 16:47:14 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE MPD3VC(N,X0,Y0,Z0,X1,Y1,Z1) COMMON /MAP/MODEL(4,4),VIEW(4,4),PROJ(4,4),CPNEAR,CPFAR,VWPORT(4), diff --git a/packages/seacas/libraries/plt/mpgetm.f b/packages/seacas/libraries/plt/mpgetm.f index 05382d80747a..d5b7f23a2dba 100644 --- a/packages/seacas/libraries/plt/mpgetm.f +++ b/packages/seacas/libraries/plt/mpgetm.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: mpgetm.f,v 1.1 1993/07/16 16:47:15 gdsjaar Exp $ -C $Log: mpgetm.f,v $ -C Revision 1.1 1993/07/16 16:47:15 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE MPGETM(TMODEL,TVIEW,TPROJ,TVWPT) COMMON /MAP/MODEL(4,4),VIEW(4,4),PROJ(4,4),CPNEAR,CPFAR,VWPORT(4), diff --git a/packages/seacas/libraries/plt/mpinit.f b/packages/seacas/libraries/plt/mpinit.f index ae56d4163cad..7dd4cea29006 100644 --- a/packages/seacas/libraries/plt/mpinit.f +++ b/packages/seacas/libraries/plt/mpinit.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: mpinit.f,v 1.1 1993/07/16 16:47:16 gdsjaar Exp $ -C $Log: mpinit.f,v $ -C Revision 1.1 1993/07/16 16:47:16 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE MPINIT() COMMON /MAP/MODEL(4,4),VIEW(4,4),PROJ(4,4),CPNEAR,CPFAR,VWPORT(4), diff --git a/packages/seacas/libraries/plt/mplook.f b/packages/seacas/libraries/plt/mplook.f index 75fd5eb8641d..d4dd9bac53a3 100644 --- a/packages/seacas/libraries/plt/mplook.f +++ b/packages/seacas/libraries/plt/mplook.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: mplook.f,v 1.1 1993/07/16 16:47:17 gdsjaar Exp $ -C $Log: mplook.f,v $ -C Revision 1.1 1993/07/16 16:47:17 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= LOGICAL FUNCTION MPLOOK(VX,VY,VZ,PX,PY,PZ,TWIST) COMMON /MAP/MODEL(4,4),VIEW(4,4),PROJ(4,4),CPNEAR,CPFAR,VWPORT(4), diff --git a/packages/seacas/libraries/plt/mpmul2.f b/packages/seacas/libraries/plt/mpmul2.f index aee8a4c4a81b..1d46d4619a46 100644 --- a/packages/seacas/libraries/plt/mpmul2.f +++ b/packages/seacas/libraries/plt/mpmul2.f @@ -1,17 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: mpmul2.f,v 1.2 1993/07/16 22:11:16 gdsjaar Exp $ -C $Log: mpmul2.f,v $ -C Revision 1.2 1993/07/16 22:11:16 gdsjaar -C Unrolled do loops to speed up execution. -C -c Revision 1.1 1993/07/16 16:47:18 gdsjaar -c Changed plt to library rather than single source file. -c C======================================================================= SUBROUTINE MPMUL2(N,X0,Y0,MAT,RES1,RES2,RES3,RES4) DIMENSION X0(*),Y0(*),MAT(4,4),RES1(*),RES2(*),RES3(*),RES4(*) diff --git a/packages/seacas/libraries/plt/mpmul3.f b/packages/seacas/libraries/plt/mpmul3.f index 38b85d1142a1..50ee5d8e78a6 100644 --- a/packages/seacas/libraries/plt/mpmul3.f +++ b/packages/seacas/libraries/plt/mpmul3.f @@ -1,17 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: mpmul3.f,v 1.2 1993/07/16 22:11:17 gdsjaar Exp $ -C $Log: mpmul3.f,v $ -C Revision 1.2 1993/07/16 22:11:17 gdsjaar -C Unrolled do loops to speed up execution. -C -c Revision 1.1 1993/07/16 16:47:19 gdsjaar -c Changed plt to library rather than single source file. -c C======================================================================= SUBROUTINE MPMUL3(N,X0,Y0,Z0,MAT,RES1,RES2,RES3,RES4) DIMENSION X0(*),Y0(*),Z0(*),MAT(4,4),RES1(*),RES2(*),RES3(*), diff --git a/packages/seacas/libraries/plt/mpmul4.f b/packages/seacas/libraries/plt/mpmul4.f index 725159981af2..8758e9967831 100644 --- a/packages/seacas/libraries/plt/mpmul4.f +++ b/packages/seacas/libraries/plt/mpmul4.f @@ -1,24 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: mpmul4.f,v 1.4 1993/07/19 17:06:30 gdsjaar Exp $ -C $Log: mpmul4.f,v $ -C Revision 1.4 1993/07/19 17:06:30 gdsjaar -C Changed hex constants back to preceding X, --needed on cray. Works -C either way on other systems. -C -c Revision 1.3 1993/07/16 22:11:18 gdsjaar -c Unrolled do loops to speed up execution. -c -c Revision 1.2 1993/07/16 17:33:06 gdsjaar -c Integer constant too big on sun, replaced it with hexadecimal notation -c -c Revision 1.1 1993/07/16 16:47:20 gdsjaar -c Changed plt to library rather than single source file. -c C======================================================================= SUBROUTINE MPMUL4(N,MASK,ARR1,ARR2,ARR3,ARR4,MAT,RES1,RES2,RES3, * RES4) diff --git a/packages/seacas/libraries/plt/mport2.f b/packages/seacas/libraries/plt/mport2.f index cdbdcff218cc..0c4c8df2bab1 100644 --- a/packages/seacas/libraries/plt/mport2.f +++ b/packages/seacas/libraries/plt/mport2.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: mport2.f,v 1.1 1993/07/16 16:47:20 gdsjaar Exp $ -C $Log: mport2.f,v $ -C Revision 1.1 1993/07/16 16:47:20 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= LOGICAL FUNCTION MPORT2(LEFT,RIGHT,BOTTOM,TOP) REAL LEFT diff --git a/packages/seacas/libraries/plt/mport3.f b/packages/seacas/libraries/plt/mport3.f index 2230b37d11a1..eeaa7d33774d 100644 --- a/packages/seacas/libraries/plt/mport3.f +++ b/packages/seacas/libraries/plt/mport3.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: mport3.f,v 1.1 1993/07/16 16:47:21 gdsjaar Exp $ -C $Log: mport3.f,v $ -C Revision 1.1 1993/07/16 16:47:21 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= LOGICAL FUNCTION MPORT3(LEFT,RIGHT,BOTTOM,TOP,NEAR,FAR) REAL LEFT,NEAR diff --git a/packages/seacas/libraries/plt/mppers.f b/packages/seacas/libraries/plt/mppers.f index 5668bdcd1a67..088b9e414f63 100644 --- a/packages/seacas/libraries/plt/mppers.f +++ b/packages/seacas/libraries/plt/mppers.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: mppers.f,v 1.1 1993/07/16 16:47:22 gdsjaar Exp $ -C $Log: mppers.f,v $ -C Revision 1.1 1993/07/16 16:47:22 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= LOGICAL FUNCTION MPPERS(FOVY,ASPECT,NEAR,FAR) CHARACTER*6 SUBNAM diff --git a/packages/seacas/libraries/plt/mppola.f b/packages/seacas/libraries/plt/mppola.f index 01f728359126..782addc88ba7 100644 --- a/packages/seacas/libraries/plt/mppola.f +++ b/packages/seacas/libraries/plt/mppola.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: mppola.f,v 1.1 1993/07/16 16:47:23 gdsjaar Exp $ -C $Log: mppola.f,v $ -C Revision 1.1 1993/07/16 16:47:23 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE MPPOLA(DIST,AZIM,INC,TWIST) COMMON /MAP/MODEL(4,4),VIEW(4,4),PROJ(4,4),CPNEAR,CPFAR,VWPORT(4), diff --git a/packages/seacas/libraries/plt/mppopm.f b/packages/seacas/libraries/plt/mppopm.f index bb5f78aa9fa1..fa352e93f45f 100644 --- a/packages/seacas/libraries/plt/mppopm.f +++ b/packages/seacas/libraries/plt/mppopm.f @@ -1,18 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: mppopm.f,v 1.2 1993/07/16 18:07:50 gdsjaar Exp $ -C $Log: mppopm.f,v $ -C Revision 1.2 1993/07/16 18:07:50 gdsjaar -C Added external pltblk statements so that linkers would pull in block -C data subprogram to initialize constants. -C -c Revision 1.1 1993/07/16 16:47:24 gdsjaar -c Changed plt to library rather than single source file. -c C======================================================================= SUBROUTINE MPPOPM() COMMON /MAP/MODEL(4,4),VIEW(4,4),PROJ(4,4),CPNEAR,CPFAR,VWPORT(4), diff --git a/packages/seacas/libraries/plt/mppshm.f b/packages/seacas/libraries/plt/mppshm.f index d36caf37dd43..42a13a42c627 100644 --- a/packages/seacas/libraries/plt/mppshm.f +++ b/packages/seacas/libraries/plt/mppshm.f @@ -1,18 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: mppshm.f,v 1.2 1993/07/16 18:07:51 gdsjaar Exp $ -C $Log: mppshm.f,v $ -C Revision 1.2 1993/07/16 18:07:51 gdsjaar -C Added external pltblk statements so that linkers would pull in block -C data subprogram to initialize constants. -C -c Revision 1.1 1993/07/16 16:47:25 gdsjaar -c Changed plt to library rather than single source file. -c C======================================================================= LOGICAL FUNCTION MPPSHM() COMMON /MAP/MODEL(4,4),VIEW(4,4),PROJ(4,4),CPNEAR,CPFAR,VWPORT(4), diff --git a/packages/seacas/libraries/plt/mpputm.f b/packages/seacas/libraries/plt/mpputm.f index dd3d4e484f9d..ec781b47a230 100644 --- a/packages/seacas/libraries/plt/mpputm.f +++ b/packages/seacas/libraries/plt/mpputm.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: mpputm.f,v 1.1 1993/07/16 16:47:26 gdsjaar Exp $ -C $Log: mpputm.f,v $ -C Revision 1.1 1993/07/16 16:47:26 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE MPPUTM(TMODEL,TVIEW,TPROJ,TVWPT) COMMON /MAP/MODEL(4,4),VIEW(4,4),PROJ(4,4),CPNEAR,CPFAR,VWPORT(4), diff --git a/packages/seacas/libraries/plt/mprese.f b/packages/seacas/libraries/plt/mprese.f index 012fb4b151de..b3bea3e61440 100644 --- a/packages/seacas/libraries/plt/mprese.f +++ b/packages/seacas/libraries/plt/mprese.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: mprese.f,v 1.1 1993/07/16 16:47:27 gdsjaar Exp $ -C $Log: mprese.f,v $ -C Revision 1.1 1993/07/16 16:47:27 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE MPRESE() COMMON /MAP/MODEL(4,4),VIEW(4,4),PROJ(4,4),CPNEAR,CPFAR,VWPORT(4), diff --git a/packages/seacas/libraries/plt/mprloc.f b/packages/seacas/libraries/plt/mprloc.f index 33f28708fd69..ae8eedaa8abf 100644 --- a/packages/seacas/libraries/plt/mprloc.f +++ b/packages/seacas/libraries/plt/mprloc.f @@ -1,17 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: mprloc.f,v 1.2 1993/07/16 22:31:59 gdsjaar Exp $ -C $Log: mprloc.f,v $ -C Revision 1.2 1993/07/16 22:31:59 gdsjaar -C Unrolled do loops to speed up execution. -C -c Revision 1.1 1993/07/16 16:47:27 gdsjaar -c Changed plt to library rather than single source file. -c C======================================================================= SUBROUTINE MPRLOC(EYE,LOOKAT,TWIST) COMMON /MAP/MODEL(4,4),VIEW(4,4),PROJ(4,4),CPNEAR,CPFAR,VWPORT(4), diff --git a/packages/seacas/libraries/plt/mprota.f b/packages/seacas/libraries/plt/mprota.f index 6cc2ed97014d..e17a02f93b81 100644 --- a/packages/seacas/libraries/plt/mprota.f +++ b/packages/seacas/libraries/plt/mprota.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: mprota.f,v 1.1 1993/07/16 16:47:28 gdsjaar Exp $ -C $Log: mprota.f,v $ -C Revision 1.1 1993/07/16 16:47:28 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= LOGICAL FUNCTION MPROTA(ANGLE,AXIS) COMMON /MAP/MODEL(4,4),VIEW(4,4),PROJ(4,4),CPNEAR,CPFAR,VWPORT(4), diff --git a/packages/seacas/libraries/plt/mpscal.f b/packages/seacas/libraries/plt/mpscal.f index 7ab390269ae4..d06215d176b6 100644 --- a/packages/seacas/libraries/plt/mpscal.f +++ b/packages/seacas/libraries/plt/mpscal.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: mpscal.f,v 1.1 1993/07/16 16:47:29 gdsjaar Exp $ -C $Log: mpscal.f,v $ -C Revision 1.1 1993/07/16 16:47:29 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE MPSCAL(X,Y,Z) COMMON /MAP/MODEL(4,4),VIEW(4,4),PROJ(4,4),CPNEAR,CPFAR,VWPORT(4), diff --git a/packages/seacas/libraries/plt/mpview.f b/packages/seacas/libraries/plt/mpview.f index fa13e32c18ab..40314bc22c68 100644 --- a/packages/seacas/libraries/plt/mpview.f +++ b/packages/seacas/libraries/plt/mpview.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: mpview.f,v 1.1 1993/07/16 16:47:31 gdsjaar Exp $ -C $Log: mpview.f,v $ -C Revision 1.1 1993/07/16 16:47:31 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= LOGICAL FUNCTION MPVIEW(LEFT,RIGHT,BOTTOM,TOP) COMMON /MAP/MODEL(4,4),VIEW(4,4),PROJ(4,4),CPNEAR,CPFAR,VWPORT(4), diff --git a/packages/seacas/libraries/plt/mpwind.f b/packages/seacas/libraries/plt/mpwind.f index 4b80bcbb9d36..985895d31286 100644 --- a/packages/seacas/libraries/plt/mpwind.f +++ b/packages/seacas/libraries/plt/mpwind.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: mpwind.f,v 1.1 1993/07/16 16:47:32 gdsjaar Exp $ -C $Log: mpwind.f,v $ -C Revision 1.1 1993/07/16 16:47:32 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= LOGICAL FUNCTION MPWIND(LEFT,RIGHT,BOTTOM,TOP,NEAR,FAR) COMMON /MAP/MODEL(4,4),VIEW(4,4),PROJ(4,4),CPNEAR,CPFAR,VWPORT(4), diff --git a/packages/seacas/libraries/plt/mxcopy.f b/packages/seacas/libraries/plt/mxcopy.f index f42a33e3acdb..a7f55a803f95 100644 --- a/packages/seacas/libraries/plt/mxcopy.f +++ b/packages/seacas/libraries/plt/mxcopy.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: mxcopy.f,v 1.3 1993/07/19 18:08:44 gdsjaar Exp $ -C $Log: mxcopy.f,v $ -C Revision 1.3 1993/07/19 18:08:44 gdsjaar -C Added special case for n=4 since that is how plt calls it primarily -C -c Revision 1.2 1993/07/16 19:35:45 gdsjaar -c Restructured to optimize faster -c -c Revision 1.1 1993/07/16 16:47:33 gdsjaar -c Changed plt to library rather than single source file. -c C======================================================================= SUBROUTINE MXCOPY(N,MAT1,MAT2) REAL MAT1(N,*),MAT2(N,*) diff --git a/packages/seacas/libraries/plt/mxiden.f b/packages/seacas/libraries/plt/mxiden.f index fd4a6a8bed6b..207339c1c077 100644 --- a/packages/seacas/libraries/plt/mxiden.f +++ b/packages/seacas/libraries/plt/mxiden.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: mxiden.f,v 1.3 1993/07/19 18:08:45 gdsjaar Exp $ -C $Log: mxiden.f,v $ -C Revision 1.3 1993/07/19 18:08:45 gdsjaar -C Added special case for n=4 since that is how plt calls it primarily -C -c Revision 1.2 1993/07/16 19:35:47 gdsjaar -c Restructured to optimize faster -c -c Revision 1.1 1993/07/16 16:47:34 gdsjaar -c Changed plt to library rather than single source file. -c C======================================================================= SUBROUTINE MXIDEN(N,MAT) REAL MAT(N,*) diff --git a/packages/seacas/libraries/plt/mxmult.f b/packages/seacas/libraries/plt/mxmult.f index 0b108f76bb8b..75944679b253 100644 --- a/packages/seacas/libraries/plt/mxmult.f +++ b/packages/seacas/libraries/plt/mxmult.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: mxmult.f,v 1.3 1993/07/16 22:50:49 gdsjaar Exp $ -C $Log: mxmult.f,v $ -C Revision 1.3 1993/07/16 22:50:49 gdsjaar -C Unrolled loops for faster execution -C -c Revision 1.2 1993/07/16 19:14:19 gdsjaar -c Restructured to optimize faster -c -c Revision 1.1 1993/07/16 16:47:35 gdsjaar -c Changed plt to library rather than single source file. -c C======================================================================= SUBROUTINE MXMULT(N,MAT1,MAT2,MATR) REAL MAT1(N,*),MAT2(N,*),MATR(N,*) diff --git a/packages/seacas/libraries/plt/mxvect.f b/packages/seacas/libraries/plt/mxvect.f index 4cadf231e4bc..24150394647c 100644 --- a/packages/seacas/libraries/plt/mxvect.f +++ b/packages/seacas/libraries/plt/mxvect.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: mxvect.f,v 1.3 1993/07/16 22:56:19 gdsjaar Exp $ -C $Log: mxvect.f,v $ -C Revision 1.3 1993/07/16 22:56:19 gdsjaar -C Unrolled loops for faster execution -C -c Revision 1.2 1993/07/16 19:30:48 gdsjaar -c Restructured to optimize faster -c -c Revision 1.1 1993/07/16 16:47:36 gdsjaar -c Changed plt to library rather than single source file. -c C======================================================================= SUBROUTINE MXVECT(N,VEC,MAT,RES) REAL VEC(*),MAT(N,*),RES(*) diff --git a/packages/seacas/libraries/plt/mxzero.f b/packages/seacas/libraries/plt/mxzero.f index 3838a6e42037..466fcf1f4512 100644 --- a/packages/seacas/libraries/plt/mxzero.f +++ b/packages/seacas/libraries/plt/mxzero.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: mxzero.f,v 1.3 1993/07/19 18:08:46 gdsjaar Exp $ -C $Log: mxzero.f,v $ -C Revision 1.3 1993/07/19 18:08:46 gdsjaar -C Added special case for n=4 since that is how plt calls it primarily -C -c Revision 1.2 1993/07/16 19:35:48 gdsjaar -c Restructured to optimize faster -c -c Revision 1.1 1993/07/16 16:47:37 gdsjaar -c Changed plt to library rather than single source file. -c C======================================================================= SUBROUTINE MXZERO(N,MAT) REAL MAT(N,*) diff --git a/packages/seacas/libraries/plt/plt_font_data.c b/packages/seacas/libraries/plt/plt_font_data.c index b6daafc68d60..3e8a5ea373ae 100644 --- a/packages/seacas/libraries/plt/plt_font_data.c +++ b/packages/seacas/libraries/plt/plt_font_data.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #include diff --git a/packages/seacas/libraries/plt/plt_init_font.f b/packages/seacas/libraries/plt/plt_init_font.f index 475817ce17a3..fca31ccf9698 100644 --- a/packages/seacas/libraries/plt/plt_init_font.f +++ b/packages/seacas/libraries/plt/plt_init_font.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details SUBROUTINE PLT_SANSERIF() diff --git a/packages/seacas/libraries/plt/pltarr.f b/packages/seacas/libraries/plt/pltarr.f index e708d4f37791..0b148b20bce8 100644 --- a/packages/seacas/libraries/plt/pltarr.f +++ b/packages/seacas/libraries/plt/pltarr.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltarr.f,v 1.1 1993/07/16 16:47:39 gdsjaar Exp $ -C $Log: pltarr.f,v $ -C Revision 1.1 1993/07/16 16:47:39 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE PLTARR(XTAIL,YTAIL,XHEAD,YHEAD,THETA,ARRLEN) REAL XTAIL,YTAIL diff --git a/packages/seacas/libraries/plt/pltav2.f b/packages/seacas/libraries/plt/pltav2.f index 2ece60bf3a9b..161b4c2251ca 100644 --- a/packages/seacas/libraries/plt/pltav2.f +++ b/packages/seacas/libraries/plt/pltav2.f @@ -1,28 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltav2.f,v 1.4 2000/10/25 18:55:01 gdsjaar Exp $ -C $Log: pltav2.f,v $ -C Revision 1.4 2000/10/25 18:55:01 gdsjaar -C In the pltli? functions, check for N==0 before doing any array -C accesses. -C -C Also changed all references to 'mask' to be arrays where they were -C scalars since downstream code seems to treat them as arrays. -C -C Revision 1.3 1993/07/19 17:06:31 gdsjaar -C Changed hex constants back to preceding X, --needed on cray. Works -C either way on other systems. -C -c Revision 1.2 1993/07/16 17:33:07 gdsjaar -c Integer constant too big on sun, replaced it with hexadecimal notation -c -c Revision 1.1 1993/07/16 16:47:40 gdsjaar -c Changed plt to library rather than single source file. -c C======================================================================= SUBROUTINE PLTAV2(UMAP,N,X1,Y1,X2,Y2,TH,XL) REAL UMAP(*) diff --git a/packages/seacas/libraries/plt/pltav3.f b/packages/seacas/libraries/plt/pltav3.f index ca9ccf5a0673..dcc5f5836e97 100644 --- a/packages/seacas/libraries/plt/pltav3.f +++ b/packages/seacas/libraries/plt/pltav3.f @@ -1,28 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltav3.f,v 1.4 2000/10/25 18:55:02 gdsjaar Exp $ -C $Log: pltav3.f,v $ -C Revision 1.4 2000/10/25 18:55:02 gdsjaar -C In the pltli? functions, check for N==0 before doing any array -C accesses. -C -C Also changed all references to 'mask' to be arrays where they were -C scalars since downstream code seems to treat them as arrays. -C -C Revision 1.3 1993/07/19 17:06:32 gdsjaar -C Changed hex constants back to preceding X, --needed on cray. Works -C either way on other systems. -C -c Revision 1.2 1993/07/16 17:33:09 gdsjaar -c Integer constant too big on sun, replaced it with hexadecimal notation -c -c Revision 1.1 1993/07/16 16:47:41 gdsjaar -c Changed plt to library rather than single source file. -c C======================================================================= SUBROUTINE PLTAV3(UMAP,N,X1,Y1,Z1,X2,Y2,Z2,TH,XL) REAL UMAP(*) diff --git a/packages/seacas/libraries/plt/pltaxs.F b/packages/seacas/libraries/plt/pltaxs.F index de22902c76ca..a97248fe4651 100644 --- a/packages/seacas/libraries/plt/pltaxs.F +++ b/packages/seacas/libraries/plt/pltaxs.F @@ -1,23 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltaxs.F,v 1.2 1998/03/24 17:53:08 gdsjaar Exp $ -C $Log: pltaxs.F,v $ -C Revision 1.2 1998/03/24 17:53:08 gdsjaar -C Missed a couple places where double escapes are needed -C -C Revision 1.1 1997/09/10 15:38:04 gdsjaar -C Some of the axis labelling code needed the 'NeedsDoubleEscape' ifdefs -C for the Sun (and presumably other) systems. This removes the -C extraneous trailing '-' on the plot labels. Needed to change to .f -C file to .F files and add the necessary code to the Imakefile. -C -C Revision 1.1 1993/07/16 16:47:42 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE PLTAXS(X,Y,XLENG,YLENG,TYPE,XMIN,XMAX,XSTART,NDEC, * INTER,MININT,LABEL,UNITS,EXP) diff --git a/packages/seacas/libraries/plt/pltbel.f b/packages/seacas/libraries/plt/pltbel.f index 0bdf9fea5103..f14902a50ddf 100644 --- a/packages/seacas/libraries/plt/pltbel.f +++ b/packages/seacas/libraries/plt/pltbel.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltbel.f,v 1.1 1993/07/16 16:47:44 gdsjaar Exp $ -C $Log: pltbel.f,v $ -C Revision 1.1 1993/07/16 16:47:44 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE PLTBEL diff --git a/packages/seacas/libraries/plt/pltbgn.f b/packages/seacas/libraries/plt/pltbgn.f index 8c10dcf11af9..a6a4fc402cb3 100644 --- a/packages/seacas/libraries/plt/pltbgn.f +++ b/packages/seacas/libraries/plt/pltbgn.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltbgn.f,v 1.1 1993/07/16 16:47:45 gdsjaar Exp $ -C $Log: pltbgn.f,v $ -C Revision 1.1 1993/07/16 16:47:45 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE PLTBGN REAL DEVCAP(23) diff --git a/packages/seacas/libraries/plt/pltblk.f b/packages/seacas/libraries/plt/pltblk.f index 6faf27d20419..83e1de0af9c2 100644 --- a/packages/seacas/libraries/plt/pltblk.f +++ b/packages/seacas/libraries/plt/pltblk.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltblk.f,v 1.1 1993/07/16 16:47:46 gdsjaar Exp $ -C $Log: pltblk.f,v $ -C Revision 1.1 1993/07/16 16:47:46 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= BLOCK DATA PLTBLK REAL SAVLEN diff --git a/packages/seacas/libraries/plt/pltcg2.f b/packages/seacas/libraries/plt/pltcg2.f index 604c9442d694..5d79f55de3df 100644 --- a/packages/seacas/libraries/plt/pltcg2.f +++ b/packages/seacas/libraries/plt/pltcg2.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltcg2.f,v 1.1 1993/07/16 16:47:47 gdsjaar Exp $ -C $Log: pltcg2.f,v $ -C Revision 1.1 1993/07/16 16:47:47 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE PLTCG2(N,XV,YV,NO,XVO,YVO,C1,C2) INTEGER N diff --git a/packages/seacas/libraries/plt/pltcnm.f b/packages/seacas/libraries/plt/pltcnm.f index ac1baa32626b..37ed54b8ab81 100644 --- a/packages/seacas/libraries/plt/pltcnm.f +++ b/packages/seacas/libraries/plt/pltcnm.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltcnm.f,v 1.1 1993/07/16 16:47:48 gdsjaar Exp $ -C $Log: pltcnm.f,v $ -C Revision 1.1 1993/07/16 16:47:48 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= LOGICAL FUNCTION PLTCNM(VALUE,CLR) CHARACTER*(*) CLR diff --git a/packages/seacas/libraries/plt/pltcol.f b/packages/seacas/libraries/plt/pltcol.f index 9da8c4c2e98c..dc8bede0d9bf 100644 --- a/packages/seacas/libraries/plt/pltcol.f +++ b/packages/seacas/libraries/plt/pltcol.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltcol.f,v 1.1 1993/07/16 16:47:49 gdsjaar Exp $ -C $Log: pltcol.f,v $ -C Revision 1.1 1993/07/16 16:47:49 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE PLTCOL(INDEX,R,G,B) REAL DEVCAP(23) diff --git a/packages/seacas/libraries/plt/pltcp2.f b/packages/seacas/libraries/plt/pltcp2.f index ae302fda9f67..f8706c7d0147 100644 --- a/packages/seacas/libraries/plt/pltcp2.f +++ b/packages/seacas/libraries/plt/pltcp2.f @@ -1,21 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltcp2.f,v 1.3 1993/07/19 17:06:33 gdsjaar Exp $ -C $Log: pltcp2.f,v $ -C Revision 1.3 1993/07/19 17:06:33 gdsjaar -C Changed hex constants back to preceding X, --needed on cray. Works -C either way on other systems. -C -c Revision 1.2 1993/07/16 17:33:10 gdsjaar -c Integer constant too big on sun, replaced it with hexadecimal notation -c -c Revision 1.1 1993/07/16 16:47:50 gdsjaar -c Changed plt to library rather than single source file. -c C======================================================================= SUBROUTINE PLTCP2(N,MASK,PX,PY,C1,C2) DIMENSION MASK(*),PX(*),PY(*),C1(*),C2(*) diff --git a/packages/seacas/libraries/plt/pltcp3.f b/packages/seacas/libraries/plt/pltcp3.f index 5bc390dc5aa6..59478ac88ae4 100644 --- a/packages/seacas/libraries/plt/pltcp3.f +++ b/packages/seacas/libraries/plt/pltcp3.f @@ -1,21 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltcp3.f,v 1.3 1993/07/19 17:06:34 gdsjaar Exp $ -C $Log: pltcp3.f,v $ -C Revision 1.3 1993/07/19 17:06:34 gdsjaar -C Changed hex constants back to preceding X, --needed on cray. Works -C either way on other systems. -C -c Revision 1.2 1993/07/16 17:33:11 gdsjaar -c Integer constant too big on sun, replaced it with hexadecimal notation -c -c Revision 1.1 1993/07/16 16:47:51 gdsjaar -c Changed plt to library rather than single source file. -c C======================================================================= SUBROUTINE PLTCP3(N,MASK,PX,PY,PZ,V,Q) DIMENSION MASK(*),PX(*),PY(*),PZ(*),V(*),Q(*) diff --git a/packages/seacas/libraries/plt/pltcpy.f b/packages/seacas/libraries/plt/pltcpy.f index 4186410e43d2..d91109478c76 100644 --- a/packages/seacas/libraries/plt/pltcpy.f +++ b/packages/seacas/libraries/plt/pltcpy.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltcpy.f,v 1.1 1993/07/16 16:47:52 gdsjaar Exp $ -C $Log: pltcpy.f,v $ -C Revision 1.1 1993/07/16 16:47:52 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE PLTCPY INTEGER SUPPO diff --git a/packages/seacas/libraries/plt/pltcrs.f b/packages/seacas/libraries/plt/pltcrs.f index 417a3a069a66..e35deffc3784 100644 --- a/packages/seacas/libraries/plt/pltcrs.f +++ b/packages/seacas/libraries/plt/pltcrs.f @@ -1,17 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltcrs.f,v 1.2 1993/10/14 15:02:37 gdsjaar Exp $ -C $Log: pltcrs.f,v $ -C Revision 1.2 1993/10/14 15:02:37 gdsjaar -C Removed warp pointer call in location setting -C -c Revision 1.1 1993/07/16 16:47:53 gdsjaar -c Changed plt to library rather than single source file. -c C======================================================================= LOGICAL FUNCTION PLTCRS(X,Y,KEY) CHARACTER KEY*1 diff --git a/packages/seacas/libraries/plt/pltcur.f b/packages/seacas/libraries/plt/pltcur.f index e529b750a927..e70619d33751 100644 --- a/packages/seacas/libraries/plt/pltcur.f +++ b/packages/seacas/libraries/plt/pltcur.f @@ -1,31 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltcur.f,v 1.5 2000/10/25 18:55:02 gdsjaar Exp $ -C $Log: pltcur.f,v $ -C Revision 1.5 2000/10/25 18:55:02 gdsjaar -C In the pltli? functions, check for N==0 before doing any array -C accesses. -C -C Also changed all references to 'mask' to be arrays where they were -C scalars since downstream code seems to treat them as arrays. -C -C Revision 1.4 2000/10/25 13:32:35 gdsjaar -C Modified intrinsic functions to use generic versions to avoid warnings on SGI 64-bit compiles -C -C Revision 1.3 1993/07/19 17:06:35 gdsjaar -C Changed hex constants back to preceding X, --needed on cray. Works -C either way on other systems. -C -c Revision 1.2 1993/07/16 17:33:12 gdsjaar -c Integer constant too big on sun, replaced it with hexadecimal notation -c -c Revision 1.1 1993/07/16 16:47:54 gdsjaar -c Changed plt to library rather than single source file. -c C======================================================================= SUBROUTINE PLTCUR(X,Y,NUM) REAL DEVCAP(23) diff --git a/packages/seacas/libraries/plt/pltcv2.f b/packages/seacas/libraries/plt/pltcv2.f index 57febaca5ca3..5f5d392c4c3e 100644 --- a/packages/seacas/libraries/plt/pltcv2.f +++ b/packages/seacas/libraries/plt/pltcv2.f @@ -1,21 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltcv2.f,v 1.3 1993/07/19 17:06:36 gdsjaar Exp $ -C $Log: pltcv2.f,v $ -C Revision 1.3 1993/07/19 17:06:36 gdsjaar -C Changed hex constants back to preceding X, --needed on cray. Works -C either way on other systems. -C -c Revision 1.2 1993/07/16 17:33:13 gdsjaar -c Integer constant too big on sun, replaced it with hexadecimal notation -c -c Revision 1.1 1993/07/16 16:47:55 gdsjaar -c Changed plt to library rather than single source file. -c C======================================================================= SUBROUTINE PLTCV2(N,MASK,PX,PY,QX,QY,PPX,PPY,QQX,QQY,C1,C2) DIMENSION MASK(*),PX(*),PY(*),QX(*),QY(*),PPX(*),PPY(*),QQX(*), diff --git a/packages/seacas/libraries/plt/pltcv3.f b/packages/seacas/libraries/plt/pltcv3.f index 1252d0fd439e..55d11b6d3973 100644 --- a/packages/seacas/libraries/plt/pltcv3.f +++ b/packages/seacas/libraries/plt/pltcv3.f @@ -1,21 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltcv3.f,v 1.3 1993/07/19 17:06:37 gdsjaar Exp $ -C $Log: pltcv3.f,v $ -C Revision 1.3 1993/07/19 17:06:37 gdsjaar -C Changed hex constants back to preceding X, --needed on cray. Works -C either way on other systems. -C -c Revision 1.2 1993/07/16 17:33:14 gdsjaar -c Integer constant too big on sun, replaced it with hexadecimal notation -c -c Revision 1.1 1993/07/16 16:47:56 gdsjaar -c Changed plt to library rather than single source file. -c C======================================================================= SUBROUTINE PLTCV3(N,MASK,PX,PY,PZ,QX,QY,QZ,PPX,PPY,PPZ,QQX,QQY, * QQZ,V,Q) diff --git a/packages/seacas/libraries/plt/pltd2g.f b/packages/seacas/libraries/plt/pltd2g.f index 0699ee1dcd61..e54dad3978c8 100644 --- a/packages/seacas/libraries/plt/pltd2g.f +++ b/packages/seacas/libraries/plt/pltd2g.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltd2g.f,v 1.1 1993/07/16 16:47:57 gdsjaar Exp $ -C $Log: pltd2g.f,v $ -C Revision 1.1 1993/07/16 16:47:57 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= LOGICAL FUNCTION PLTD2G(XD,YD,XG,YG) DIMENSION UMAP(14), TYPE(1) diff --git a/packages/seacas/libraries/plt/pltd2p.f b/packages/seacas/libraries/plt/pltd2p.f index 28bcc7b49e54..5bfaa9e888bc 100644 --- a/packages/seacas/libraries/plt/pltd2p.f +++ b/packages/seacas/libraries/plt/pltd2p.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltd2p.f,v 1.1 1993/07/16 16:47:59 gdsjaar Exp $ -C $Log: pltd2p.f,v $ -C Revision 1.1 1993/07/16 16:47:59 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE PLTD2P(XD,YD,XP,YP) REAL DEVCAP(23) diff --git a/packages/seacas/libraries/plt/pltdg2.f b/packages/seacas/libraries/plt/pltdg2.f index a5fef13d3b75..13b3e434ce0d 100644 --- a/packages/seacas/libraries/plt/pltdg2.f +++ b/packages/seacas/libraries/plt/pltdg2.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltdg2.f,v 1.1 1993/07/16 16:48:00 gdsjaar Exp $ -C $Log: pltdg2.f,v $ -C Revision 1.1 1993/07/16 16:48:00 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE PLTDG2(MAP,N,XV,YV) REAL MAP(*) diff --git a/packages/seacas/libraries/plt/pltdp2.f b/packages/seacas/libraries/plt/pltdp2.f index 5ca2af5d0e8d..91dab1a272f3 100644 --- a/packages/seacas/libraries/plt/pltdp2.f +++ b/packages/seacas/libraries/plt/pltdp2.f @@ -1,21 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltdp2.f,v 1.2 2000/10/25 18:55:02 gdsjaar Exp $ -C $Log: pltdp2.f,v $ -C Revision 1.2 2000/10/25 18:55:02 gdsjaar -C In the pltli? functions, check for N==0 before doing any array -C accesses. -C -C Also changed all references to 'mask' to be arrays where they were -C scalars since downstream code seems to treat them as arrays. -C -C Revision 1.1 1993/07/16 16:48:01 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE PLTDP2(MAP,N,PX,PY) REAL MAP(*),PX(*),PY(*) diff --git a/packages/seacas/libraries/plt/pltdp3.f b/packages/seacas/libraries/plt/pltdp3.f index 285134a8d258..193d40d42c15 100644 --- a/packages/seacas/libraries/plt/pltdp3.f +++ b/packages/seacas/libraries/plt/pltdp3.f @@ -1,28 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltdp3.f,v 1.4 2000/10/25 18:55:02 gdsjaar Exp $ -C $Log: pltdp3.f,v $ -C Revision 1.4 2000/10/25 18:55:02 gdsjaar -C In the pltli? functions, check for N==0 before doing any array -C accesses. -C -C Also changed all references to 'mask' to be arrays where they were -C scalars since downstream code seems to treat them as arrays. -C -C Revision 1.3 1993/07/19 17:06:38 gdsjaar -C Changed hex constants back to preceding X, --needed on cray. Works -C either way on other systems. -C -c Revision 1.2 1993/07/16 17:33:15 gdsjaar -c Integer constant too big on sun, replaced it with hexadecimal notation -c -c Revision 1.1 1993/07/16 16:48:02 gdsjaar -c Changed plt to library rather than single source file. -c C======================================================================= SUBROUTINE PLTDP3(MAP,N,PX,PY,PZ) REAL MAP(*),PX(*),PY(*),PZ(*) diff --git a/packages/seacas/libraries/plt/pltdrw.f b/packages/seacas/libraries/plt/pltdrw.f index e14e3cdc8118..4ad9527a1ba1 100644 --- a/packages/seacas/libraries/plt/pltdrw.f +++ b/packages/seacas/libraries/plt/pltdrw.f @@ -1,24 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltdrw.f,v 1.4 2001/01/05 18:17:07 gdsjaar Exp $ -C $Log: pltdrw.f,v $ -C Revision 1.4 2001/01/05 18:17:07 gdsjaar -C Variable was assumed to be saved, but wasn't. Added a SAVE statement -C -C Revision 1.3 1998/03/23 04:58:35 gdsjaar -C Fixed data statement ordering -C -C Revision 1.2 1993/07/16 18:07:52 gdsjaar -C Added external pltblk statements so that linkers would pull in block -C data subprogram to initialize constants. -C -c Revision 1.1 1993/07/16 16:48:03 gdsjaar -c Changed plt to library rather than single source file. -c C======================================================================= SUBROUTINE PLTDRW(X,Y) REAL DEVCAP(23) diff --git a/packages/seacas/libraries/plt/pltdv2.f b/packages/seacas/libraries/plt/pltdv2.f index 3b82325b4d20..4756b901039e 100644 --- a/packages/seacas/libraries/plt/pltdv2.f +++ b/packages/seacas/libraries/plt/pltdv2.f @@ -1,21 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltdv2.f,v 1.2 2000/10/25 18:55:02 gdsjaar Exp $ -C $Log: pltdv2.f,v $ -C Revision 1.2 2000/10/25 18:55:02 gdsjaar -C In the pltli? functions, check for N==0 before doing any array -C accesses. -C -C Also changed all references to 'mask' to be arrays where they were -C scalars since downstream code seems to treat them as arrays. -C -C Revision 1.1 1993/07/16 16:48:04 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE PLTDV2(MAP,N,PX,PY,QX,QY) REAL MAP(*),PX(*),PY(*),QX(*),QY(*) diff --git a/packages/seacas/libraries/plt/pltdv3.f b/packages/seacas/libraries/plt/pltdv3.f index ac40afe1075e..ce96716d03cb 100644 --- a/packages/seacas/libraries/plt/pltdv3.f +++ b/packages/seacas/libraries/plt/pltdv3.f @@ -1,28 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltdv3.f,v 1.4 2000/10/25 18:55:02 gdsjaar Exp $ -C $Log: pltdv3.f,v $ -C Revision 1.4 2000/10/25 18:55:02 gdsjaar -C In the pltli? functions, check for N==0 before doing any array -C accesses. -C -C Also changed all references to 'mask' to be arrays where they were -C scalars since downstream code seems to treat them as arrays. -C -C Revision 1.3 1993/07/19 17:06:39 gdsjaar -C Changed hex constants back to preceding X, --needed on cray. Works -C either way on other systems. -C -c Revision 1.2 1993/07/16 17:33:16 gdsjaar -c Integer constant too big on sun, replaced it with hexadecimal notation -c -c Revision 1.1 1993/07/16 16:48:05 gdsjaar -c Changed plt to library rather than single source file. -c C======================================================================= SUBROUTINE PLTDV3(MAP,N,UX,UY,UZ,VX,VY,VZ) REAL MAP(*),UX(*),UY(*),UZ(*),VX(*),VY(*),VZ(*) diff --git a/packages/seacas/libraries/plt/pltend.f b/packages/seacas/libraries/plt/pltend.f index 1e8f43174a3c..c0df37c04888 100644 --- a/packages/seacas/libraries/plt/pltend.f +++ b/packages/seacas/libraries/plt/pltend.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltend.f,v 1.1 1993/07/16 16:48:06 gdsjaar Exp $ -C $Log: pltend.f,v $ -C Revision 1.1 1993/07/16 16:48:06 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE PLTEND diff --git a/packages/seacas/libraries/plt/pltesc.f b/packages/seacas/libraries/plt/pltesc.f index fcc6b6efaf4b..aa78e06bdfb2 100644 --- a/packages/seacas/libraries/plt/pltesc.f +++ b/packages/seacas/libraries/plt/pltesc.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltesc.f,v 1.1 1993/07/16 16:48:07 gdsjaar Exp $ -C $Log: pltesc.f,v $ -C Revision 1.1 1993/07/16 16:48:07 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE PLTESC(TEXT,I,ESC) CHARACTER*(*) TEXT,ESC diff --git a/packages/seacas/libraries/plt/pltflu.f b/packages/seacas/libraries/plt/pltflu.f index 81470a84808c..2ebf8f9732d4 100644 --- a/packages/seacas/libraries/plt/pltflu.f +++ b/packages/seacas/libraries/plt/pltflu.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltflu.f,v 1.1 1993/07/16 16:48:08 gdsjaar Exp $ -C $Log: pltflu.f,v $ -C Revision 1.1 1993/07/16 16:48:08 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE PLTFLU diff --git a/packages/seacas/libraries/plt/pltfnt.f b/packages/seacas/libraries/plt/pltfnt.f index 9e83bfbf2d96..4979f85e2c9d 100644 --- a/packages/seacas/libraries/plt/pltfnt.f +++ b/packages/seacas/libraries/plt/pltfnt.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/libraries/plt/pltfrc.f b/packages/seacas/libraries/plt/pltfrc.f index e36422972807..370ba8c127a4 100644 --- a/packages/seacas/libraries/plt/pltfrc.f +++ b/packages/seacas/libraries/plt/pltfrc.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltfrc.f,v 1.1 1993/07/16 16:48:10 gdsjaar Exp $ -C $Log: pltfrc.f,v $ -C Revision 1.1 1993/07/16 16:48:10 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= FUNCTION PLTFRC(REALN) diff --git a/packages/seacas/libraries/plt/pltfrm.f b/packages/seacas/libraries/plt/pltfrm.f index 91d436b26213..31758233299b 100644 --- a/packages/seacas/libraries/plt/pltfrm.f +++ b/packages/seacas/libraries/plt/pltfrm.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltfrm.f,v 1.1 1993/07/16 16:48:12 gdsjaar Exp $ -C $Log: pltfrm.f,v $ -C Revision 1.1 1993/07/16 16:48:12 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE PLTFRM(TYPE) INTEGER TYPE diff --git a/packages/seacas/libraries/plt/pltg2d.f b/packages/seacas/libraries/plt/pltg2d.f index 83517bd7078e..237c7ce75d62 100644 --- a/packages/seacas/libraries/plt/pltg2d.f +++ b/packages/seacas/libraries/plt/pltg2d.f @@ -1,17 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltg2d.f,v 1.2 2000/10/25 13:32:35 gdsjaar Exp $ -C $Log: pltg2d.f,v $ -C Revision 1.2 2000/10/25 13:32:35 gdsjaar -C Modified intrinsic functions to use generic versions to avoid warnings on SGI 64-bit compiles -C -C Revision 1.1 1993/07/16 16:48:13 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= LOGICAL FUNCTION PLTG2D(XG,YG,XD,YD) DIMENSION UMAP(14) diff --git a/packages/seacas/libraries/plt/pltgm2.f b/packages/seacas/libraries/plt/pltgm2.f index 548c1c7c0aa8..3e2629b44f3e 100644 --- a/packages/seacas/libraries/plt/pltgm2.f +++ b/packages/seacas/libraries/plt/pltgm2.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltgm2.f,v 1.1 1993/07/16 16:48:14 gdsjaar Exp $ -C $Log: pltgm2.f,v $ -C Revision 1.1 1993/07/16 16:48:14 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE PLTGM2(XL,XU,YL,YU,PXL,PXU,PYL,PYU,UMAP) REAL UMAP(*) diff --git a/packages/seacas/libraries/plt/pltgm3.f b/packages/seacas/libraries/plt/pltgm3.f index a18d56586643..edc7f861100f 100644 --- a/packages/seacas/libraries/plt/pltgm3.f +++ b/packages/seacas/libraries/plt/pltgm3.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltgm3.f,v 1.1 1993/07/16 16:48:15 gdsjaar Exp $ -C $Log: pltgm3.f,v $ -C Revision 1.1 1993/07/16 16:48:15 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE PLTGM3(PX,PY,PZ,S,UMAP) REAL UMAP(*) diff --git a/packages/seacas/libraries/plt/pltgph.f b/packages/seacas/libraries/plt/pltgph.f index 4192eaa8baa0..6f1cc36482db 100644 --- a/packages/seacas/libraries/plt/pltgph.f +++ b/packages/seacas/libraries/plt/pltgph.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltgph.f,v 1.1 1993/07/16 16:48:16 gdsjaar Exp $ -C $Log: pltgph.f,v $ -C Revision 1.1 1993/07/16 16:48:16 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE PLTGPH(X,Y,NUM,XLAB,XUNIT,YLAB,YUNIT) REAL DEVCAP(23) diff --git a/packages/seacas/libraries/plt/pltgtc.f b/packages/seacas/libraries/plt/pltgtc.f index b221de3cf626..ac488366e180 100644 --- a/packages/seacas/libraries/plt/pltgtc.f +++ b/packages/seacas/libraries/plt/pltgtc.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltgtc.f,v 1.1 1993/07/16 16:48:17 gdsjaar Exp $ -C $Log: pltgtc.f,v $ -C Revision 1.1 1993/07/16 16:48:17 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= LOGICAL FUNCTION PLTGTC(INDX,BUFF) CHARACTER*16 IERROR diff --git a/packages/seacas/libraries/plt/pltgtd.f b/packages/seacas/libraries/plt/pltgtd.f index ef3f2163df8c..fed9f33937b1 100644 --- a/packages/seacas/libraries/plt/pltgtd.f +++ b/packages/seacas/libraries/plt/pltgtd.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltgtd.f,v 1.1 1993/07/16 16:48:18 gdsjaar Exp $ -C $Log: pltgtd.f,v $ -C Revision 1.1 1993/07/16 16:48:18 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= LOGICAL FUNCTION PLTGTD(INDX,BUFF) CHARACTER*16 IERROR diff --git a/packages/seacas/libraries/plt/pltgtg.f b/packages/seacas/libraries/plt/pltgtg.f index 960067170b86..a46cd0295421 100644 --- a/packages/seacas/libraries/plt/pltgtg.f +++ b/packages/seacas/libraries/plt/pltgtg.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltgtg.f,v 1.1 1993/07/16 16:48:19 gdsjaar Exp $ -C $Log: pltgtg.f,v $ -C Revision 1.1 1993/07/16 16:48:19 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= LOGICAL FUNCTION PLTGTG(INDX,BUFF) CHARACTER*16 IERROR diff --git a/packages/seacas/libraries/plt/pltgtm.f b/packages/seacas/libraries/plt/pltgtm.f index 9e365b97aa70..426184a87c61 100644 --- a/packages/seacas/libraries/plt/pltgtm.f +++ b/packages/seacas/libraries/plt/pltgtm.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltgtm.f,v 1.1 1993/07/16 16:48:20 gdsjaar Exp $ -C $Log: pltgtm.f,v $ -C Revision 1.1 1993/07/16 16:48:20 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= LOGICAL FUNCTION PLTGTM(INDX,BUFF) REAL DEVCAP(23) diff --git a/packages/seacas/libraries/plt/pltgtt.f b/packages/seacas/libraries/plt/pltgtt.f index 3301b044dc4a..d5f1eeb8e8ad 100644 --- a/packages/seacas/libraries/plt/pltgtt.f +++ b/packages/seacas/libraries/plt/pltgtt.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltgtt.f,v 1.1 1993/07/16 16:48:21 gdsjaar Exp $ -C $Log: pltgtt.f,v $ -C Revision 1.1 1993/07/16 16:48:21 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= LOGICAL FUNCTION PLTGTT(INDX,BUFF) CHARACTER*16 IERROR diff --git a/packages/seacas/libraries/plt/pltgtv.f b/packages/seacas/libraries/plt/pltgtv.f index 679070827414..43ac62b59b53 100644 --- a/packages/seacas/libraries/plt/pltgtv.f +++ b/packages/seacas/libraries/plt/pltgtv.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltgtv.f,v 1.1 1993/07/16 16:48:22 gdsjaar Exp $ -C $Log: pltgtv.f,v $ -C Revision 1.1 1993/07/16 16:48:22 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= LOGICAL FUNCTION PLTGTV(INDX,BUFF) CHARACTER*16 IERROR diff --git a/packages/seacas/libraries/plt/plticl.f b/packages/seacas/libraries/plt/plticl.f index 9206a4fc8e25..7ffae6d9b652 100644 --- a/packages/seacas/libraries/plt/plticl.f +++ b/packages/seacas/libraries/plt/plticl.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: plticl.f,v 1.1 1993/07/16 16:48:23 gdsjaar Exp $ -C $Log: plticl.f,v $ -C Revision 1.1 1993/07/16 16:48:23 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= LOGICAL FUNCTION PLTICL(CLR,VAL) REAL DEVCAP(23) diff --git a/packages/seacas/libraries/plt/pltini.f b/packages/seacas/libraries/plt/pltini.f index d70c23c25ea8..1e517a2249e5 100644 --- a/packages/seacas/libraries/plt/pltini.f +++ b/packages/seacas/libraries/plt/pltini.f @@ -1,17 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltini.f,v 1.2 2000/10/25 13:32:35 gdsjaar Exp $ -C $Log: pltini.f,v $ -C Revision 1.2 2000/10/25 13:32:35 gdsjaar -C Modified intrinsic functions to use generic versions to avoid warnings on SGI 64-bit compiles -C -C Revision 1.1 1993/07/16 16:48:24 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE PLTINI(MIN,MAX,START,REND,INTER,EXP,NMIN) REAL MIN,MAX,INTER diff --git a/packages/seacas/libraries/plt/pltino.f b/packages/seacas/libraries/plt/pltino.f index acb51890ea06..c7ebd2271e60 100644 --- a/packages/seacas/libraries/plt/pltino.f +++ b/packages/seacas/libraries/plt/pltino.f @@ -1,17 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltino.f,v 1.2 2000/10/25 13:32:35 gdsjaar Exp $ -C $Log: pltino.f,v $ -C Revision 1.2 2000/10/25 13:32:35 gdsjaar -C Modified intrinsic functions to use generic versions to avoid warnings on SGI 64-bit compiles -C -C Revision 1.1 1993/07/16 16:48:25 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE PLTINO(MIN,MAX,START,REND,INTER,EXP,NMIN) REAL MIN,MAX,INTER,NINTER diff --git a/packages/seacas/libraries/plt/pltint.f b/packages/seacas/libraries/plt/pltint.f index 6001a12c5431..db663dff7b88 100644 --- a/packages/seacas/libraries/plt/pltint.f +++ b/packages/seacas/libraries/plt/pltint.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltint.f,v 1.1 1993/07/16 16:48:26 gdsjaar Exp $ -C $Log: pltint.f,v $ -C Revision 1.1 1993/07/16 16:48:26 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE PLTINT REAL DEVCAP(23) diff --git a/packages/seacas/libraries/plt/pltiqc.f b/packages/seacas/libraries/plt/pltiqc.f index e86cbe3e7baa..dc8b42898f5d 100644 --- a/packages/seacas/libraries/plt/pltiqc.f +++ b/packages/seacas/libraries/plt/pltiqc.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltiqc.f,v 1.1 1993/07/16 16:48:27 gdsjaar Exp $ -C $Log: pltiqc.f,v $ -C Revision 1.1 1993/07/16 16:48:27 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE PLTIQC(ICOLOR,R,G,B) DIMENSION CARRAY(3) diff --git a/packages/seacas/libraries/plt/pltiqd.f b/packages/seacas/libraries/plt/pltiqd.f index 311efaff2111..eb6a03796e3b 100644 --- a/packages/seacas/libraries/plt/pltiqd.f +++ b/packages/seacas/libraries/plt/pltiqd.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltiqd.f,v 1.1 1993/07/16 16:48:28 gdsjaar Exp $ -C $Log: pltiqd.f,v $ -C Revision 1.1 1993/07/16 16:48:28 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE PLTIQD(ARRAY) DIMENSION ARRAY(*) diff --git a/packages/seacas/libraries/plt/pltisp.f b/packages/seacas/libraries/plt/pltisp.f index cee82c3bbd75..be6dde17c02c 100644 --- a/packages/seacas/libraries/plt/pltisp.f +++ b/packages/seacas/libraries/plt/pltisp.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltisp.f,v 1.1 1993/07/16 16:48:29 gdsjaar Exp $ -C $Log: pltisp.f,v $ -C Revision 1.1 1993/07/16 16:48:29 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE PLTISP(SV,CV) REAL DEVCAP(23) diff --git a/packages/seacas/libraries/plt/pltitl.f b/packages/seacas/libraries/plt/pltitl.f index 694737c227df..de08184bd967 100644 --- a/packages/seacas/libraries/plt/pltitl.f +++ b/packages/seacas/libraries/plt/pltitl.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltitl.f,v 1.1 1993/07/16 16:48:30 gdsjaar Exp $ -C $Log: pltitl.f,v $ -C Revision 1.1 1993/07/16 16:48:30 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= INTEGER FUNCTION PLTITL(REALN) diff --git a/packages/seacas/libraries/plt/pltitm.f b/packages/seacas/libraries/plt/pltitm.f index 267ceb168bf9..038cfb1346f7 100644 --- a/packages/seacas/libraries/plt/pltitm.f +++ b/packages/seacas/libraries/plt/pltitm.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltitm.f,v 1.1 1993/07/16 16:48:31 gdsjaar Exp $ -C $Log: pltitm.f,v $ -C Revision 1.1 1993/07/16 16:48:31 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE PLTITM REAL DEVCAP(23) diff --git a/packages/seacas/libraries/plt/pltix2.f b/packages/seacas/libraries/plt/pltix2.f index 6e9220bd92a8..effe5703f937 100644 --- a/packages/seacas/libraries/plt/pltix2.f +++ b/packages/seacas/libraries/plt/pltix2.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltix2.f,v 1.1 1993/07/16 16:48:32 gdsjaar Exp $ -C $Log: pltix2.f,v $ -C Revision 1.1 1993/07/16 16:48:32 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE PLTIX2(UMAP) REAL UMAP(*) diff --git a/packages/seacas/libraries/plt/pltiy2.f b/packages/seacas/libraries/plt/pltiy2.f index ffe8df66ff29..bbd69777d6a8 100644 --- a/packages/seacas/libraries/plt/pltiy2.f +++ b/packages/seacas/libraries/plt/pltiy2.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltiy2.f,v 1.1 1993/07/16 16:48:33 gdsjaar Exp $ -C $Log: pltiy2.f,v $ -C Revision 1.1 1993/07/16 16:48:33 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE PLTIY2(UMAP) REAL UMAP(*) diff --git a/packages/seacas/libraries/plt/pltlax.F b/packages/seacas/libraries/plt/pltlax.F index 4e93e735ae6d..83426b383666 100644 --- a/packages/seacas/libraries/plt/pltlax.F +++ b/packages/seacas/libraries/plt/pltlax.F @@ -1,29 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltlax.F,v 1.4 2000/10/25 13:36:38 gdsjaar Exp $ -C $Log: pltlax.F,v $ -C Revision 1.4 2000/10/25 13:36:38 gdsjaar -C Modified intrinsic functions to use generic versions to avoid warnings on SGI 64-bit compiles -C -C Revision 1.3 1998/04/01 22:26:36 gdsjaar -C Added missing needsdoubleescape -C -C Revision 1.2 1998/03/24 17:53:11 gdsjaar -C Missed a couple places where double escapes are needed -C -C Revision 1.1 1997/09/10 15:38:05 gdsjaar -C Some of the axis labelling code needed the 'NeedsDoubleEscape' ifdefs -C for the Sun (and presumably other) systems. This removes the -C extraneous trailing '-' on the plot labels. Needed to change to .f -C file to .F files and add the necessary code to the Imakefile. -C -C Revision 1.1 1993/07/16 16:48:34 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE PLTLAX(X,Y,XLENG,YLENG,TYPE,MINEXP,MAXEXP,LABEL,UNITS) REAL DEVCAP(23) diff --git a/packages/seacas/libraries/plt/pltlgx.f b/packages/seacas/libraries/plt/pltlgx.f index 251c4c80ade0..20953ebd4218 100644 --- a/packages/seacas/libraries/plt/pltlgx.f +++ b/packages/seacas/libraries/plt/pltlgx.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/libraries/plt/pltlgy.f b/packages/seacas/libraries/plt/pltlgy.f index 1afab403c957..644acd0acb9b 100644 --- a/packages/seacas/libraries/plt/pltlgy.f +++ b/packages/seacas/libraries/plt/pltlgy.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/libraries/plt/pltli1.f b/packages/seacas/libraries/plt/pltli1.f index 92af713e0fce..977d6708215a 100644 --- a/packages/seacas/libraries/plt/pltli1.f +++ b/packages/seacas/libraries/plt/pltli1.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltli1.f,v 1.1 1993/07/16 16:48:37 gdsjaar Exp $ -C $Log: pltli1.f,v $ -C Revision 1.1 1993/07/16 16:48:37 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE PLTLI1(PLL,PUR,N,XV,YV,NO,XVO,YVO) CHARACTER*6 SUBNAM diff --git a/packages/seacas/libraries/plt/pltli2.f b/packages/seacas/libraries/plt/pltli2.f index 79bc2d14e58b..b0c4f72db1a5 100644 --- a/packages/seacas/libraries/plt/pltli2.f +++ b/packages/seacas/libraries/plt/pltli2.f @@ -1,21 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltli2.f,v 1.2 2000/10/25 18:55:02 gdsjaar Exp $ -C $Log: pltli2.f,v $ -C Revision 1.2 2000/10/25 18:55:02 gdsjaar -C In the pltli? functions, check for N==0 before doing any array -C accesses. -C -C Also changed all references to 'mask' to be arrays where they were -C scalars since downstream code seems to treat them as arrays. -C -C Revision 1.1 1993/07/16 16:48:38 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE PLTLI2(PLL,PUR,N,XV,YV,NO,XVO,YVO) DIMENSION PLL(2),PUR(2),XV(*),YV(*),XVO(*),YVO(*) diff --git a/packages/seacas/libraries/plt/pltli3.f b/packages/seacas/libraries/plt/pltli3.f index 758fb963f267..bbf20ab7f3c5 100644 --- a/packages/seacas/libraries/plt/pltli3.f +++ b/packages/seacas/libraries/plt/pltli3.f @@ -1,21 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltli3.f,v 1.2 2000/10/25 18:55:02 gdsjaar Exp $ -C $Log: pltli3.f,v $ -C Revision 1.2 2000/10/25 18:55:02 gdsjaar -C In the pltli? functions, check for N==0 before doing any array -C accesses. -C -C Also changed all references to 'mask' to be arrays where they were -C scalars since downstream code seems to treat them as arrays. -C -C Revision 1.1 1993/07/16 16:48:39 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE PLTLI3(PLL,PUR,N,XV,YV,NO,XVO,YVO) DIMENSION PLL(2),PUR(2),XV(*),YV(*),XVO(*),YVO(*) diff --git a/packages/seacas/libraries/plt/pltli4.f b/packages/seacas/libraries/plt/pltli4.f index 7572c156816b..3a14ce455482 100644 --- a/packages/seacas/libraries/plt/pltli4.f +++ b/packages/seacas/libraries/plt/pltli4.f @@ -1,21 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltli4.f,v 1.2 2000/10/25 18:55:02 gdsjaar Exp $ -C $Log: pltli4.f,v $ -C Revision 1.2 2000/10/25 18:55:02 gdsjaar -C In the pltli? functions, check for N==0 before doing any array -C accesses. -C -C Also changed all references to 'mask' to be arrays where they were -C scalars since downstream code seems to treat them as arrays. -C -C Revision 1.1 1993/07/16 16:48:40 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE PLTLI4(PLL,PUR,N,XV,YV,NO,XVO,YVO) DIMENSION PLL(2),PUR(2),XV(*),YV(*),XVO(*),YVO(*) diff --git a/packages/seacas/libraries/plt/pltlig.f b/packages/seacas/libraries/plt/pltlig.f index da4ad15459b7..440691d5be33 100644 --- a/packages/seacas/libraries/plt/pltlig.f +++ b/packages/seacas/libraries/plt/pltlig.f @@ -1,21 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltlig.f,v 1.2 2000/10/25 18:55:02 gdsjaar Exp $ -C $Log: pltlig.f,v $ -C Revision 1.2 2000/10/25 18:55:02 gdsjaar -C In the pltli? functions, check for N==0 before doing any array -C accesses. -C -C Also changed all references to 'mask' to be arrays where they were -C scalars since downstream code seems to treat them as arrays. -C -C Revision 1.1 1993/07/16 16:48:42 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE PLTLIG(X,Y) REAL DEVCAP(23) diff --git a/packages/seacas/libraries/plt/pltloa.f b/packages/seacas/libraries/plt/pltloa.f index 8ef048506487..9491137dbfbf 100644 --- a/packages/seacas/libraries/plt/pltloa.f +++ b/packages/seacas/libraries/plt/pltloa.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltloa.f,v 1.1 1993/07/16 16:48:43 gdsjaar Exp $ -C $Log: pltloa.f,v $ -C Revision 1.1 1993/07/16 16:48:43 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE PLTLOA(LINE1,NUM,TYPE) CHARACTER*10 LINE diff --git a/packages/seacas/libraries/plt/pltlod.f b/packages/seacas/libraries/plt/pltlod.f index 8883de018d65..e09c9221cc96 100644 --- a/packages/seacas/libraries/plt/pltlod.f +++ b/packages/seacas/libraries/plt/pltlod.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltlod.f,v 1.1 1993/07/16 16:48:44 gdsjaar Exp $ -C $Log: pltlod.f,v $ -C Revision 1.1 1993/07/16 16:48:44 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE PLTLOD(LINE1,J,NUM) CHARACTER*(*) LINE1 diff --git a/packages/seacas/libraries/plt/pltlxy.f b/packages/seacas/libraries/plt/pltlxy.f index c66d7da4a8f6..246ef9643b18 100644 --- a/packages/seacas/libraries/plt/pltlxy.f +++ b/packages/seacas/libraries/plt/pltlxy.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/libraries/plt/pltmaa.f b/packages/seacas/libraries/plt/pltmaa.f index 89ae3a606a4f..d7d5cdf3d55c 100644 --- a/packages/seacas/libraries/plt/pltmaa.f +++ b/packages/seacas/libraries/plt/pltmaa.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltmaa.f,v 1.1 1993/07/16 16:48:46 gdsjaar Exp $ -C $Log: pltmaa.f,v $ -C Revision 1.1 1993/07/16 16:48:46 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE PLTMAA(ALT,AZI,UMAP) COMMON /CENBOD/XC,YC,ZC diff --git a/packages/seacas/libraries/plt/pltmg2.f b/packages/seacas/libraries/plt/pltmg2.f index 6bad23354d89..d9d9e5151f78 100644 --- a/packages/seacas/libraries/plt/pltmg2.f +++ b/packages/seacas/libraries/plt/pltmg2.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltmg2.f,v 1.1 1993/07/16 16:48:47 gdsjaar Exp $ -C $Log: pltmg2.f,v $ -C Revision 1.1 1993/07/16 16:48:47 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE PLTMG2(MAP,N,XV,YV,NO,XVO,YVO) REAL MAP(*) diff --git a/packages/seacas/libraries/plt/pltmix.f b/packages/seacas/libraries/plt/pltmix.f index 2ff9dcd311a7..3022b6b076b7 100644 --- a/packages/seacas/libraries/plt/pltmix.f +++ b/packages/seacas/libraries/plt/pltmix.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltmix.f,v 1.1 1993/07/16 16:48:48 gdsjaar Exp $ -C $Log: pltmix.f,v $ -C Revision 1.1 1993/07/16 16:48:48 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE PLTMIX(UMAP) COMMON /CENBOD/XC,YC,ZC diff --git a/packages/seacas/libraries/plt/pltmiy.f b/packages/seacas/libraries/plt/pltmiy.f index 1bc401a91e2d..8a70791ca504 100644 --- a/packages/seacas/libraries/plt/pltmiy.f +++ b/packages/seacas/libraries/plt/pltmiy.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltmiy.f,v 1.1 1993/07/16 16:48:49 gdsjaar Exp $ -C $Log: pltmiy.f,v $ -C Revision 1.1 1993/07/16 16:48:49 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE PLTMIY(UMAP) COMMON /CENBOD/XC,YC,ZC diff --git a/packages/seacas/libraries/plt/pltmiz.f b/packages/seacas/libraries/plt/pltmiz.f index ff7871c0c60d..0b7b61e06dc4 100644 --- a/packages/seacas/libraries/plt/pltmiz.f +++ b/packages/seacas/libraries/plt/pltmiz.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltmiz.f,v 1.1 1993/07/16 16:48:50 gdsjaar Exp $ -C $Log: pltmiz.f,v $ -C Revision 1.1 1993/07/16 16:48:50 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE PLTMIZ(UMAP) COMMON /CENBOD/XC,YC,ZC diff --git a/packages/seacas/libraries/plt/pltmmo.f b/packages/seacas/libraries/plt/pltmmo.f index c0ab2217149e..f7c836a0c474 100644 --- a/packages/seacas/libraries/plt/pltmmo.f +++ b/packages/seacas/libraries/plt/pltmmo.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltmmo.f,v 1.1 1993/07/16 16:48:51 gdsjaar Exp $ -C $Log: pltmmo.f,v $ -C Revision 1.1 1993/07/16 16:48:51 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE PLTMMO(FACT,UMAP) COMMON /CENBOD/XC,YC,ZC diff --git a/packages/seacas/libraries/plt/pltmmv.f b/packages/seacas/libraries/plt/pltmmv.f index 272ebd32b151..ef42898cab31 100644 --- a/packages/seacas/libraries/plt/pltmmv.f +++ b/packages/seacas/libraries/plt/pltmmv.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltmmv.f,v 1.1 1993/07/16 16:48:52 gdsjaar Exp $ -C $Log: pltmmv.f,v $ -C Revision 1.1 1993/07/16 16:48:52 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE PLTMMV(DX,DY,DZ,UMAP) COMMON /CENBOD/XC,YC,ZC diff --git a/packages/seacas/libraries/plt/pltmor.f b/packages/seacas/libraries/plt/pltmor.f index 86f00b832162..a32534e4f551 100644 --- a/packages/seacas/libraries/plt/pltmor.f +++ b/packages/seacas/libraries/plt/pltmor.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltmor.f,v 1.1 1993/07/16 16:48:53 gdsjaar Exp $ -C $Log: pltmor.f,v $ -C Revision 1.1 1993/07/16 16:48:53 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE PLTMOR(X,Y,Z,UMAP) COMMON /CENBOD/XC,YC,ZC diff --git a/packages/seacas/libraries/plt/pltmov.f b/packages/seacas/libraries/plt/pltmov.f index db397cfcec0f..a0667bed1e7e 100644 --- a/packages/seacas/libraries/plt/pltmov.f +++ b/packages/seacas/libraries/plt/pltmov.f @@ -1,25 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltmov.f,v 1.3 2000/10/25 18:55:02 gdsjaar Exp $ -C $Log: pltmov.f,v $ -C Revision 1.3 2000/10/25 18:55:02 gdsjaar -C In the pltli? functions, check for N==0 before doing any array -C accesses. -C -C Also changed all references to 'mask' to be arrays where they were -C scalars since downstream code seems to treat them as arrays. -C -C Revision 1.2 1993/07/16 18:07:55 gdsjaar -C Added external pltblk statements so that linkers would pull in block -C data subprogram to initialize constants. -C -c Revision 1.1 1993/07/16 16:48:54 gdsjaar -c Changed plt to library rather than single source file. -c C======================================================================= SUBROUTINE PLTMOV(X,Y) REAL DEVCAP(23) diff --git a/packages/seacas/libraries/plt/pltmp2.f b/packages/seacas/libraries/plt/pltmp2.f index 163becaf9975..1bb6fcc7040a 100644 --- a/packages/seacas/libraries/plt/pltmp2.f +++ b/packages/seacas/libraries/plt/pltmp2.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltmp2.f,v 1.1 1993/07/16 16:48:55 gdsjaar Exp $ -C $Log: pltmp2.f,v $ -C Revision 1.1 1993/07/16 16:48:55 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE PLTMP2(UMP,N,MASK,PX,PY,QX,QY) DIMENSION UMP(*),MASK(*),PX(*),PY(*),QX(*),QY(*) diff --git a/packages/seacas/libraries/plt/pltmp3.f b/packages/seacas/libraries/plt/pltmp3.f index 5c55503d820e..344d9c95fd5f 100644 --- a/packages/seacas/libraries/plt/pltmp3.f +++ b/packages/seacas/libraries/plt/pltmp3.f @@ -1,21 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltmp3.f,v 1.3 1993/07/19 17:06:40 gdsjaar Exp $ -C $Log: pltmp3.f,v $ -C Revision 1.3 1993/07/19 17:06:40 gdsjaar -C Changed hex constants back to preceding X, --needed on cray. Works -C either way on other systems. -C -c Revision 1.2 1993/07/16 17:33:17 gdsjaar -c Integer constant too big on sun, replaced it with hexadecimal notation -c -c Revision 1.1 1993/07/16 16:48:56 gdsjaar -c Changed plt to library rather than single source file. -c C======================================================================= SUBROUTINE PLTMP3(UMAP,N,MASK,PX,PY,PZ,QX,QY) DIMENSION UMAP(*),MASK(*),PX(*),PY(*),PZ(*),QX(*),QY(*) diff --git a/packages/seacas/libraries/plt/pltmv2.f b/packages/seacas/libraries/plt/pltmv2.f index 469cf8a03238..0c7bd47f7f0f 100644 --- a/packages/seacas/libraries/plt/pltmv2.f +++ b/packages/seacas/libraries/plt/pltmv2.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltmv2.f,v 1.1 1993/07/16 16:48:57 gdsjaar Exp $ -C $Log: pltmv2.f,v $ -C Revision 1.1 1993/07/16 16:48:57 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE PLTMV2(UMAP,N,MASK,PX,PY,QX,QY,PPX,PPY,QQX,QQY) DIMENSION UMAP(*),MASK(*),PX(*),PY(*),QX(*),QY(*),PPX(*),PPY(*), diff --git a/packages/seacas/libraries/plt/pltmv3.f b/packages/seacas/libraries/plt/pltmv3.f index 422faf9c953b..9c389ed7c4f3 100644 --- a/packages/seacas/libraries/plt/pltmv3.f +++ b/packages/seacas/libraries/plt/pltmv3.f @@ -1,21 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltmv3.f,v 1.3 1993/07/19 17:06:41 gdsjaar Exp $ -C $Log: pltmv3.f,v $ -C Revision 1.3 1993/07/19 17:06:41 gdsjaar -C Changed hex constants back to preceding X, --needed on cray. Works -C either way on other systems. -C -c Revision 1.2 1993/07/16 17:33:18 gdsjaar -c Integer constant too big on sun, replaced it with hexadecimal notation -c -c Revision 1.1 1993/07/16 16:48:58 gdsjaar -c Changed plt to library rather than single source file. -c C======================================================================= SUBROUTINE PLTMV3(UMAP,N,MASK,UX,UY,UZ,VX,VY,VZ,PX,PY,QX,QY) DIMENSION UMAP(*),MASK(*),UX(*),UY(*),UZ(*),VX(*),VY(*),VZ(*), diff --git a/packages/seacas/libraries/plt/pltmzm.f b/packages/seacas/libraries/plt/pltmzm.f index af49d91e66d2..8c015213be7a 100644 --- a/packages/seacas/libraries/plt/pltmzm.f +++ b/packages/seacas/libraries/plt/pltmzm.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltmzm.f,v 1.1 1993/07/16 16:48:58 gdsjaar Exp $ -C $Log: pltmzm.f,v $ -C Revision 1.1 1993/07/16 16:48:58 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE PLTMZM(FACT,UMAP) REAL FACT diff --git a/packages/seacas/libraries/plt/pltncf.f b/packages/seacas/libraries/plt/pltncf.f index 3d4333ec092a..43d95e2208c3 100644 --- a/packages/seacas/libraries/plt/pltncf.f +++ b/packages/seacas/libraries/plt/pltncf.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltncf.f,v 1.1 1993/07/16 16:48:59 gdsjaar Exp $ -C $Log: pltncf.f,v $ -C Revision 1.1 1993/07/16 16:48:59 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE PLTNCF(X,TYPE,FN,NE) CHARACTER*(*) TYPE diff --git a/packages/seacas/libraries/plt/pltner.f b/packages/seacas/libraries/plt/pltner.f index 67a5017577a1..4fd6e1095d2d 100644 --- a/packages/seacas/libraries/plt/pltner.f +++ b/packages/seacas/libraries/plt/pltner.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltner.f,v 1.1 1993/07/16 16:49:00 gdsjaar Exp $ -C $Log: pltner.f,v $ -C Revision 1.1 1993/07/16 16:49:00 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= LOGICAL FUNCTION PLTNER(X,Y) diff --git a/packages/seacas/libraries/plt/pltnic.f b/packages/seacas/libraries/plt/pltnic.f index ba2e6788b82e..1956b84d709f 100644 --- a/packages/seacas/libraries/plt/pltnic.f +++ b/packages/seacas/libraries/plt/pltnic.f @@ -1,17 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltnic.f,v 1.2 2000/10/25 13:32:35 gdsjaar Exp $ -C $Log: pltnic.f,v $ -C Revision 1.2 2000/10/25 13:32:35 gdsjaar -C Modified intrinsic functions to use generic versions to avoid warnings on SGI 64-bit compiles -C -C Revision 1.1 1993/07/16 16:49:01 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE PLTNIC(X,TYPE,FN,NE,INTER,NMIN) CHARACTER*(*) TYPE diff --git a/packages/seacas/libraries/plt/pltnor.f b/packages/seacas/libraries/plt/pltnor.f index 4c68765d32d1..72010ec04298 100644 --- a/packages/seacas/libraries/plt/pltnor.f +++ b/packages/seacas/libraries/plt/pltnor.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltnor.f,v 1.1 1993/07/16 16:49:02 gdsjaar Exp $ -C $Log: pltnor.f,v $ -C Revision 1.1 1993/07/16 16:49:02 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE PLTNOR(YBUMP,YCHRSZ) REAL DEVCAP(23) diff --git a/packages/seacas/libraries/plt/pltnxy.f b/packages/seacas/libraries/plt/pltnxy.f index 8c9272ffa22f..9d2a92296e65 100644 --- a/packages/seacas/libraries/plt/pltnxy.f +++ b/packages/seacas/libraries/plt/pltnxy.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/libraries/plt/pltp2d.f b/packages/seacas/libraries/plt/pltp2d.f index 655066595a85..761f738003b1 100644 --- a/packages/seacas/libraries/plt/pltp2d.f +++ b/packages/seacas/libraries/plt/pltp2d.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltp2d.f,v 1.1 1993/07/16 16:49:04 gdsjaar Exp $ -C $Log: pltp2d.f,v $ -C Revision 1.1 1993/07/16 16:49:04 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE PLTP2D(X,Y,XN,YN) REAL DEVCAP(23) diff --git a/packages/seacas/libraries/plt/pltpal.f b/packages/seacas/libraries/plt/pltpal.f index c991390c7cc2..075dac536682 100644 --- a/packages/seacas/libraries/plt/pltpal.f +++ b/packages/seacas/libraries/plt/pltpal.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltpal.f,v 1.1 1993/07/16 16:49:05 gdsjaar Exp $ -C $Log: pltpal.f,v $ -C Revision 1.1 1993/07/16 16:49:05 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE PLTPAL(COL,R,G,B) CHARACTER*10 ECOLOR diff --git a/packages/seacas/libraries/plt/pltpgz.f b/packages/seacas/libraries/plt/pltpgz.f index 5514d8c63c19..843869f11841 100644 --- a/packages/seacas/libraries/plt/pltpgz.f +++ b/packages/seacas/libraries/plt/pltpgz.f @@ -1,18 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltpgz.f,v 1.2 1997/11/18 20:03:15 gdsjaar Exp $ -C $Log: pltpgz.f,v $ -C Revision 1.2 1997/11/18 20:03:15 gdsjaar -C Fixed problem accessing array outside of valid bounds. -C Fixes coredump problem on DEC -C -C Revision 1.1 1993/07/16 16:49:06 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= FUNCTION PLTPGZ(N,X,Y,Z,XQ,YQ) DIMENSION X(3),Y(3),Z(3),D(2) diff --git a/packages/seacas/libraries/plt/pltply.f b/packages/seacas/libraries/plt/pltply.f index 9f738b5dcf38..1f5d766a5642 100644 --- a/packages/seacas/libraries/plt/pltply.f +++ b/packages/seacas/libraries/plt/pltply.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltply.f,v 1.1 1993/07/16 16:49:07 gdsjaar Exp $ -C $Log: pltply.f,v $ -C Revision 1.1 1993/07/16 16:49:07 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE PLTPLY(N,XA,YA) REAL DEVCAP(23) diff --git a/packages/seacas/libraries/plt/pltpnt.f b/packages/seacas/libraries/plt/pltpnt.f index 0929675c8870..303b7f2a4118 100644 --- a/packages/seacas/libraries/plt/pltpnt.f +++ b/packages/seacas/libraries/plt/pltpnt.f @@ -1,25 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltpnt.f,v 1.3 2000/10/25 18:55:02 gdsjaar Exp $ -C $Log: pltpnt.f,v $ -C Revision 1.3 2000/10/25 18:55:02 gdsjaar -C In the pltli? functions, check for N==0 before doing any array -C accesses. -C -C Also changed all references to 'mask' to be arrays where they were -C scalars since downstream code seems to treat them as arrays. -C -C Revision 1.2 1993/07/16 18:07:57 gdsjaar -C Added external pltblk statements so that linkers would pull in block -C data subprogram to initialize constants. -C -c Revision 1.1 1993/07/16 16:49:08 gdsjaar -c Changed plt to library rather than single source file. -c C======================================================================= SUBROUTINE PLTPNT(N,X,Y) REAL DEVCAP(23) diff --git a/packages/seacas/libraries/plt/pltptm.f b/packages/seacas/libraries/plt/pltptm.f index 57ee364a337e..8cb8fab9e2fd 100644 --- a/packages/seacas/libraries/plt/pltptm.f +++ b/packages/seacas/libraries/plt/pltptm.f @@ -1,21 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltptm.f,v 1.3 1993/07/19 17:06:42 gdsjaar Exp $ -C $Log: pltptm.f,v $ -C Revision 1.3 1993/07/19 17:06:42 gdsjaar -C Changed hex constants back to preceding X, --needed on cray. Works -C either way on other systems. -C -c Revision 1.2 1993/07/16 17:33:20 gdsjaar -c Integer constant too big on sun, replaced it with hexadecimal notation -c -c Revision 1.1 1993/07/16 16:49:09 gdsjaar -c Changed plt to library rather than single source file. -c C======================================================================= SUBROUTINE PLTPTM(N,MASK,X,Y) DIMENSION X(*),Y(*),MASK(*) diff --git a/packages/seacas/libraries/plt/pltrdc.f b/packages/seacas/libraries/plt/pltrdc.f index b86e1c1362c5..e28723ede544 100644 --- a/packages/seacas/libraries/plt/pltrdc.f +++ b/packages/seacas/libraries/plt/pltrdc.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltrdc.f,v 1.1 1993/07/16 16:49:10 gdsjaar Exp $ -C $Log: pltrdc.f,v $ -C Revision 1.1 1993/07/16 16:49:10 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE PLTRDC(XNDC,YNDC) diff --git a/packages/seacas/libraries/plt/pltred.f b/packages/seacas/libraries/plt/pltred.f index 3661940a8c21..b645dc6ea183 100644 --- a/packages/seacas/libraries/plt/pltred.f +++ b/packages/seacas/libraries/plt/pltred.f @@ -1,18 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltred.f,v 1.2 1993/07/16 18:07:59 gdsjaar Exp $ -C $Log: pltred.f,v $ -C Revision 1.2 1993/07/16 18:07:59 gdsjaar -C Added external pltblk statements so that linkers would pull in block -C data subprogram to initialize constants. -C -c Revision 1.1 1993/07/16 16:49:12 gdsjaar -c Changed plt to library rather than single source file. -c C======================================================================= SUBROUTINE PLTRED REAL DEVCAP(23) diff --git a/packages/seacas/libraries/plt/pltreg.f b/packages/seacas/libraries/plt/pltreg.f index b66bbef7f768..26196275127d 100644 --- a/packages/seacas/libraries/plt/pltreg.f +++ b/packages/seacas/libraries/plt/pltreg.f @@ -1,18 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltreg.f,v 1.2 1993/07/16 18:08:00 gdsjaar Exp $ -C $Log: pltreg.f,v $ -C Revision 1.2 1993/07/16 18:08:00 gdsjaar -C Added external pltblk statements so that linkers would pull in block -C data subprogram to initialize constants. -C -c Revision 1.1 1993/07/16 16:49:13 gdsjaar -c Changed plt to library rather than single source file. -c C======================================================================= SUBROUTINE PLTREG REAL DEVCAP(23) diff --git a/packages/seacas/libraries/plt/pltrem.f b/packages/seacas/libraries/plt/pltrem.f index 6db2ad259ae8..8716ec7955e3 100644 --- a/packages/seacas/libraries/plt/pltrem.f +++ b/packages/seacas/libraries/plt/pltrem.f @@ -1,18 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltrem.f,v 1.2 1993/07/16 18:08:01 gdsjaar Exp $ -C $Log: pltrem.f,v $ -C Revision 1.2 1993/07/16 18:08:01 gdsjaar -C Added external pltblk statements so that linkers would pull in block -C data subprogram to initialize constants. -C -c Revision 1.1 1993/07/16 16:49:14 gdsjaar -c Changed plt to library rather than single source file. -c C======================================================================= SUBROUTINE PLTREM REAL DEVCAP(23) diff --git a/packages/seacas/libraries/plt/pltret.f b/packages/seacas/libraries/plt/pltret.f index 5d1a90a3394c..fd8e2f3bcfc7 100644 --- a/packages/seacas/libraries/plt/pltret.f +++ b/packages/seacas/libraries/plt/pltret.f @@ -1,18 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltret.f,v 1.2 1993/07/16 18:08:02 gdsjaar Exp $ -C $Log: pltret.f,v $ -C Revision 1.2 1993/07/16 18:08:02 gdsjaar -C Added external pltblk statements so that linkers would pull in block -C data subprogram to initialize constants. -C -c Revision 1.1 1993/07/16 16:49:15 gdsjaar -c Changed plt to library rather than single source file. -c C======================================================================= SUBROUTINE PLTRET REAL DEVCAP(23) diff --git a/packages/seacas/libraries/plt/pltrev.f b/packages/seacas/libraries/plt/pltrev.f index e0253d4c62dc..eece8353fb8f 100644 --- a/packages/seacas/libraries/plt/pltrev.f +++ b/packages/seacas/libraries/plt/pltrev.f @@ -1,18 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltrev.f,v 1.2 1993/07/16 18:08:03 gdsjaar Exp $ -C $Log: pltrev.f,v $ -C Revision 1.2 1993/07/16 18:08:03 gdsjaar -C Added external pltblk statements so that linkers would pull in block -C data subprogram to initialize constants. -C -c Revision 1.1 1993/07/16 16:49:16 gdsjaar -c Changed plt to library rather than single source file. -c C======================================================================= SUBROUTINE PLTREV REAL DEVCAP(23) diff --git a/packages/seacas/libraries/plt/pltrim.f b/packages/seacas/libraries/plt/pltrim.f index b22760aed25c..84768f25e648 100644 --- a/packages/seacas/libraries/plt/pltrim.f +++ b/packages/seacas/libraries/plt/pltrim.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltrim.f,v 1.1 1993/07/16 16:49:17 gdsjaar Exp $ -C $Log: pltrim.f,v $ -C Revision 1.1 1993/07/16 16:49:17 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE PLTRIM(LINE,L) CHARACTER*(*) LINE diff --git a/packages/seacas/libraries/plt/pltrot.f b/packages/seacas/libraries/plt/pltrot.f index 5aad21effb0e..26555802ff5c 100644 --- a/packages/seacas/libraries/plt/pltrot.f +++ b/packages/seacas/libraries/plt/pltrot.f @@ -1,17 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltrot.f,v 1.2 1993/07/16 22:27:49 gdsjaar Exp $ -C $Log: pltrot.f,v $ -C Revision 1.2 1993/07/16 22:27:49 gdsjaar -C Unrolled do loops to speed up execution. -C -c Revision 1.1 1993/07/16 16:49:18 gdsjaar -c Changed plt to library rather than single source file. -c C======================================================================= SUBROUTINE PLTROT(R,A,B) REAL R(3,3),A(3,3),B(3,3) diff --git a/packages/seacas/libraries/plt/pltrsc.f b/packages/seacas/libraries/plt/pltrsc.f index 1818a172a490..ac1c58e71ac0 100644 --- a/packages/seacas/libraries/plt/pltrsc.f +++ b/packages/seacas/libraries/plt/pltrsc.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltrsc.f,v 1.1 1993/07/16 16:49:19 gdsjaar Exp $ -C $Log: pltrsc.f,v $ -C Revision 1.1 1993/07/16 16:49:19 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE PLTRSC REAL DEVCAP(23) diff --git a/packages/seacas/libraries/plt/pltrsd.f b/packages/seacas/libraries/plt/pltrsd.f index 18268b7171d5..8ad932c6d8b9 100644 --- a/packages/seacas/libraries/plt/pltrsd.f +++ b/packages/seacas/libraries/plt/pltrsd.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltrsd.f,v 1.1 1993/07/16 16:49:20 gdsjaar Exp $ -C $Log: pltrsd.f,v $ -C Revision 1.1 1993/07/16 16:49:20 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE PLTRSD REAL DEVCAP(23) diff --git a/packages/seacas/libraries/plt/pltrsg.f b/packages/seacas/libraries/plt/pltrsg.f index fd6324506318..0f1cdbb9f87a 100644 --- a/packages/seacas/libraries/plt/pltrsg.f +++ b/packages/seacas/libraries/plt/pltrsg.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltrsg.f,v 1.1 1993/07/16 16:49:21 gdsjaar Exp $ -C $Log: pltrsg.f,v $ -C Revision 1.1 1993/07/16 16:49:21 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE PLTRSG REAL DEVCAP(23) diff --git a/packages/seacas/libraries/plt/pltrsm.f b/packages/seacas/libraries/plt/pltrsm.f index 4a22a5e1fddd..9c73b74d19f9 100644 --- a/packages/seacas/libraries/plt/pltrsm.f +++ b/packages/seacas/libraries/plt/pltrsm.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltrsm.f,v 1.1 1993/07/16 16:49:22 gdsjaar Exp $ -C $Log: pltrsm.f,v $ -C Revision 1.1 1993/07/16 16:49:22 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE PLTRSM REAL DEVCAP(23) diff --git a/packages/seacas/libraries/plt/pltrst.f b/packages/seacas/libraries/plt/pltrst.f index 5f4129b331fd..1e1c87cd1b4e 100644 --- a/packages/seacas/libraries/plt/pltrst.f +++ b/packages/seacas/libraries/plt/pltrst.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltrst.f,v 1.1 1993/07/16 16:49:23 gdsjaar Exp $ -C $Log: pltrst.f,v $ -C Revision 1.1 1993/07/16 16:49:23 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE PLTRST REAL DEVCAP(23) diff --git a/packages/seacas/libraries/plt/pltrsv.f b/packages/seacas/libraries/plt/pltrsv.f index 02634c5f3bc5..19bddd95e616 100644 --- a/packages/seacas/libraries/plt/pltrsv.f +++ b/packages/seacas/libraries/plt/pltrsv.f @@ -1,18 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltrsv.f,v 1.2 1993/07/16 18:08:04 gdsjaar Exp $ -C $Log: pltrsv.f,v $ -C Revision 1.2 1993/07/16 18:08:04 gdsjaar -C Added external pltblk statements so that linkers would pull in block -C data subprogram to initialize constants. -C -c Revision 1.1 1993/07/16 16:49:24 gdsjaar -c Changed plt to library rather than single source file. -c C======================================================================= SUBROUTINE PLTRSV REAL DEVCAP(23) diff --git a/packages/seacas/libraries/plt/pltrtx.f b/packages/seacas/libraries/plt/pltrtx.f index efb833a9b3a2..6fb34590ef7d 100644 --- a/packages/seacas/libraries/plt/pltrtx.f +++ b/packages/seacas/libraries/plt/pltrtx.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltrtx.f,v 1.1 1993/07/16 16:49:24 gdsjaar Exp $ -C $Log: pltrtx.f,v $ -C Revision 1.1 1993/07/16 16:49:24 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE PLTRTX(VAL,UMAP) REAL UMAP(*) diff --git a/packages/seacas/libraries/plt/pltrty.f b/packages/seacas/libraries/plt/pltrty.f index c292fab88800..6c2ec0fdb44a 100644 --- a/packages/seacas/libraries/plt/pltrty.f +++ b/packages/seacas/libraries/plt/pltrty.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltrty.f,v 1.1 1993/07/16 16:49:25 gdsjaar Exp $ -C $Log: pltrty.f,v $ -C Revision 1.1 1993/07/16 16:49:25 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE PLTRTY(VAL,UMAP) REAL UMAP(*) diff --git a/packages/seacas/libraries/plt/pltrtz.f b/packages/seacas/libraries/plt/pltrtz.f index 876e896f6685..73962aeaf35d 100644 --- a/packages/seacas/libraries/plt/pltrtz.f +++ b/packages/seacas/libraries/plt/pltrtz.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltrtz.f,v 1.1 1993/07/16 16:49:26 gdsjaar Exp $ -C $Log: pltrtz.f,v $ -C Revision 1.1 1993/07/16 16:49:26 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE PLTRTZ(VAL,UMAP) REAL UMAP(*) diff --git a/packages/seacas/libraries/plt/pltrxy.f b/packages/seacas/libraries/plt/pltrxy.f index a5773b0fba07..d70d45c1dac7 100644 --- a/packages/seacas/libraries/plt/pltrxy.f +++ b/packages/seacas/libraries/plt/pltrxy.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltrxy.f,v 1.1 1993/07/16 16:49:27 gdsjaar Exp $ -C $Log: pltrxy.f,v $ -C Revision 1.1 1993/07/16 16:49:27 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE PLTRXY(X,Y) REAL DEVCAP(23) diff --git a/packages/seacas/libraries/plt/pltsbm.f b/packages/seacas/libraries/plt/pltsbm.f index b4f5f296ec21..e61940c5abf4 100644 --- a/packages/seacas/libraries/plt/pltsbm.f +++ b/packages/seacas/libraries/plt/pltsbm.f @@ -1,21 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltsbm.f,v 1.3 1993/07/19 17:06:43 gdsjaar Exp $ -C $Log: pltsbm.f,v $ -C Revision 1.3 1993/07/19 17:06:43 gdsjaar -C Changed hex constants back to preceding X, --needed on cray. Works -C either way on other systems. -C -c Revision 1.2 1993/07/16 17:33:21 gdsjaar -c Integer constant too big on sun, replaced it with hexadecimal notation -c -c Revision 1.1 1993/07/16 16:49:28 gdsjaar -c Changed plt to library rather than single source file. -c C======================================================================= SUBROUTINE PLTSBM(N,MASK,X,Y,SYMB) DIMENSION X(*),Y(*),MASK(*) diff --git a/packages/seacas/libraries/plt/pltspc.f b/packages/seacas/libraries/plt/pltspc.f index a03cc2863fef..3b2d407f5589 100644 --- a/packages/seacas/libraries/plt/pltspc.f +++ b/packages/seacas/libraries/plt/pltspc.f @@ -1,17 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltspc.f,v 1.2 1993/07/16 17:55:28 gdsjaar Exp $ -C $Log: pltspc.f,v $ -C Revision 1.2 1993/07/16 17:55:28 gdsjaar -C Fixed do loop bounds to get rid of truncation message. -C -c Revision 1.1 1993/07/16 16:49:29 gdsjaar -c Changed plt to library rather than single source file. -c C======================================================================= SUBROUTINE PLTSPC(S1,RED1,GREEN1,BLUE1,S2,RED2,GREEN2,BLUE2) REAL DEVCAP(23) diff --git a/packages/seacas/libraries/plt/pltsta.f b/packages/seacas/libraries/plt/pltsta.f index f4809740ff88..3aca66162958 100644 --- a/packages/seacas/libraries/plt/pltsta.f +++ b/packages/seacas/libraries/plt/pltsta.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltsta.f,v 1.1 1993/07/16 16:49:30 gdsjaar Exp $ -C $Log: pltsta.f,v $ -C Revision 1.1 1993/07/16 16:49:30 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE PLTSTA REAL DEVCAP(23) diff --git a/packages/seacas/libraries/plt/pltstc.f b/packages/seacas/libraries/plt/pltstc.f index b984b444dc79..f92e3698ec23 100644 --- a/packages/seacas/libraries/plt/pltstc.f +++ b/packages/seacas/libraries/plt/pltstc.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltstc.f,v 1.1 1993/07/16 16:49:31 gdsjaar Exp $ -C $Log: pltstc.f,v $ -C Revision 1.1 1993/07/16 16:49:31 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= LOGICAL FUNCTION PLTSTC(INDX,BUFF) REAL DEVCAP(23) diff --git a/packages/seacas/libraries/plt/pltstd.f b/packages/seacas/libraries/plt/pltstd.f index 22c83a5c181b..35de4e3f4ad5 100644 --- a/packages/seacas/libraries/plt/pltstd.f +++ b/packages/seacas/libraries/plt/pltstd.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltstd.f,v 1.1 1993/07/16 16:49:32 gdsjaar Exp $ -C $Log: pltstd.f,v $ -C Revision 1.1 1993/07/16 16:49:32 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= LOGICAL FUNCTION PLTSTD(INDX,BUFF) REAL DEVCAP(23) diff --git a/packages/seacas/libraries/plt/pltstg.f b/packages/seacas/libraries/plt/pltstg.f index 0f79b7e22223..7a6540aaf5e4 100644 --- a/packages/seacas/libraries/plt/pltstg.f +++ b/packages/seacas/libraries/plt/pltstg.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= LOGICAL FUNCTION PLTSTG(INDX,BUFF) @@ -339,7 +339,7 @@ LOGICAL FUNCTION PLTSTG(INDX,BUFF) END -C .. Same as PLTSTG +C .. Same as PLTSTG LOGICAL FUNCTION PLTSTG1(INDX,BUFF) REAL DEVCAP(23) REAL DEFOUT(7) @@ -532,4 +532,4 @@ LOGICAL FUNCTION PLTSTG1(INDX,BUFF) RETURN END - + diff --git a/packages/seacas/libraries/plt/pltstm.f b/packages/seacas/libraries/plt/pltstm.f index 4c3c36c853b9..0807e9624651 100644 --- a/packages/seacas/libraries/plt/pltstm.f +++ b/packages/seacas/libraries/plt/pltstm.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltstm.f,v 1.1 1993/07/16 16:49:35 gdsjaar Exp $ -C $Log: pltstm.f,v $ -C Revision 1.1 1993/07/16 16:49:35 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= LOGICAL FUNCTION PLTSTM(INDX,BUFF) REAL DEVCAP(23) diff --git a/packages/seacas/libraries/plt/pltstt.f b/packages/seacas/libraries/plt/pltstt.f index a1179e95b8b5..09daf0e7b263 100644 --- a/packages/seacas/libraries/plt/pltstt.f +++ b/packages/seacas/libraries/plt/pltstt.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltstt.f,v 1.1 1993/07/16 16:49:36 gdsjaar Exp $ -C $Log: pltstt.f,v $ -C Revision 1.1 1993/07/16 16:49:36 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= LOGICAL FUNCTION PLTSTT(INDX,BUFF) REAL DEVCAP(23) diff --git a/packages/seacas/libraries/plt/pltstv.f b/packages/seacas/libraries/plt/pltstv.f index bcfba21a10d7..93994b26c7e0 100644 --- a/packages/seacas/libraries/plt/pltstv.f +++ b/packages/seacas/libraries/plt/pltstv.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltstv.f,v 1.1 1993/07/16 16:49:37 gdsjaar Exp $ -C $Log: pltstv.f,v $ -C Revision 1.1 1993/07/16 16:49:37 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= LOGICAL FUNCTION PLTSTV(INDX,BUFF) REAL DEVCAP(23) diff --git a/packages/seacas/libraries/plt/pltsub.f b/packages/seacas/libraries/plt/pltsub.f index 94ab4e67768e..fcb5ad93bb22 100644 --- a/packages/seacas/libraries/plt/pltsub.f +++ b/packages/seacas/libraries/plt/pltsub.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltsub.f,v 1.1 1993/07/16 16:49:38 gdsjaar Exp $ -C $Log: pltsub.f,v $ -C Revision 1.1 1993/07/16 16:49:38 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE PLTSUB(YBUMP,YCHRSZ) REAL DEVCAP(23) diff --git a/packages/seacas/libraries/plt/pltsup.f b/packages/seacas/libraries/plt/pltsup.f index 587286ec03f2..f76c8614d885 100644 --- a/packages/seacas/libraries/plt/pltsup.f +++ b/packages/seacas/libraries/plt/pltsup.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltsup.f,v 1.1 1993/07/16 16:49:39 gdsjaar Exp $ -C $Log: pltsup.f,v $ -C Revision 1.1 1993/07/16 16:49:39 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE PLTSUP(YBUMP,YCHRSZ) REAL DEVCAP(23) diff --git a/packages/seacas/libraries/plt/pltsvd.f b/packages/seacas/libraries/plt/pltsvd.f index dcb92fa0c88d..12e88b06436e 100644 --- a/packages/seacas/libraries/plt/pltsvd.f +++ b/packages/seacas/libraries/plt/pltsvd.f @@ -1,18 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltsvd.f,v 1.2 1993/07/16 18:08:05 gdsjaar Exp $ -C $Log: pltsvd.f,v $ -C Revision 1.2 1993/07/16 18:08:05 gdsjaar -C Added external pltblk statements so that linkers would pull in block -C data subprogram to initialize constants. -C -c Revision 1.1 1993/07/16 16:49:40 gdsjaar -c Changed plt to library rather than single source file. -c C======================================================================= SUBROUTINE PLTSVD REAL DEVCAP(23) diff --git a/packages/seacas/libraries/plt/pltsvg.f b/packages/seacas/libraries/plt/pltsvg.f index f20d6d38854e..a873504d512d 100644 --- a/packages/seacas/libraries/plt/pltsvg.f +++ b/packages/seacas/libraries/plt/pltsvg.f @@ -1,18 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltsvg.f,v 1.2 1993/07/16 18:08:06 gdsjaar Exp $ -C $Log: pltsvg.f,v $ -C Revision 1.2 1993/07/16 18:08:06 gdsjaar -C Added external pltblk statements so that linkers would pull in block -C data subprogram to initialize constants. -C -c Revision 1.1 1993/07/16 16:49:41 gdsjaar -c Changed plt to library rather than single source file. -c C======================================================================= SUBROUTINE PLTSVG REAL DEVCAP(23) diff --git a/packages/seacas/libraries/plt/pltsvm.f b/packages/seacas/libraries/plt/pltsvm.f index b957c307123a..b2c63f74d35f 100644 --- a/packages/seacas/libraries/plt/pltsvm.f +++ b/packages/seacas/libraries/plt/pltsvm.f @@ -1,18 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltsvm.f,v 1.2 1993/07/16 18:08:07 gdsjaar Exp $ -C $Log: pltsvm.f,v $ -C Revision 1.2 1993/07/16 18:08:07 gdsjaar -C Added external pltblk statements so that linkers would pull in block -C data subprogram to initialize constants. -C -c Revision 1.1 1993/07/16 16:49:42 gdsjaar -c Changed plt to library rather than single source file. -c C======================================================================= SUBROUTINE PLTSVM REAL DEVCAP(23) diff --git a/packages/seacas/libraries/plt/pltsvt.f b/packages/seacas/libraries/plt/pltsvt.f index eb13e472574d..2f68e3697564 100644 --- a/packages/seacas/libraries/plt/pltsvt.f +++ b/packages/seacas/libraries/plt/pltsvt.f @@ -1,18 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltsvt.f,v 1.2 1993/07/16 18:08:08 gdsjaar Exp $ -C $Log: pltsvt.f,v $ -C Revision 1.2 1993/07/16 18:08:08 gdsjaar -C Added external pltblk statements so that linkers would pull in block -C data subprogram to initialize constants. -C -c Revision 1.1 1993/07/16 16:49:43 gdsjaar -c Changed plt to library rather than single source file. -c C======================================================================= SUBROUTINE PLTSVT REAL DEVCAP(23) diff --git a/packages/seacas/libraries/plt/pltsvv.f b/packages/seacas/libraries/plt/pltsvv.f index bea401f5ffc3..6fe2db6cbcb3 100644 --- a/packages/seacas/libraries/plt/pltsvv.f +++ b/packages/seacas/libraries/plt/pltsvv.f @@ -1,21 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltsvv.f,v 1.3 1993/07/16 22:30:21 gdsjaar Exp $ -C $Log: pltsvv.f,v $ -C Revision 1.3 1993/07/16 22:30:21 gdsjaar -C Unrolled do loops to speed up execution. -C -c Revision 1.2 1993/07/16 18:08:09 gdsjaar -c Added external pltblk statements so that linkers would pull in block -c data subprogram to initialize constants. -c -c Revision 1.1 1993/07/16 16:49:44 gdsjaar -c Changed plt to library rather than single source file. -c C======================================================================= SUBROUTINE PLTSVV REAL DEVCAP(23) diff --git a/packages/seacas/libraries/plt/pltsym.f b/packages/seacas/libraries/plt/pltsym.f index a5c236cc85d4..3aed8c37e8b4 100644 --- a/packages/seacas/libraries/plt/pltsym.f +++ b/packages/seacas/libraries/plt/pltsym.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltsym.f,v 1.1 1993/07/16 16:49:45 gdsjaar Exp $ -C $Log: pltsym.f,v $ -C Revision 1.1 1993/07/16 16:49:45 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE PLTSYM(X,Y,S) REAL DEVCAP(23) diff --git a/packages/seacas/libraries/plt/pltuwn.f b/packages/seacas/libraries/plt/pltuwn.f index 0d1ceb2d7f87..7880ac5ee9f2 100644 --- a/packages/seacas/libraries/plt/pltuwn.f +++ b/packages/seacas/libraries/plt/pltuwn.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltuwn.f,v 1.1 1993/07/16 16:49:46 gdsjaar Exp $ -C $Log: pltuwn.f,v $ -C Revision 1.1 1993/07/16 16:49:46 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE PLTUWN(GMAP) DIMENSION GMAP(*) diff --git a/packages/seacas/libraries/plt/pltvcm.f b/packages/seacas/libraries/plt/pltvcm.f index 717e4300cdf7..d1a2e08d7ae0 100644 --- a/packages/seacas/libraries/plt/pltvcm.f +++ b/packages/seacas/libraries/plt/pltvcm.f @@ -1,21 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltvcm.f,v 1.3 1993/07/19 17:06:44 gdsjaar Exp $ -C $Log: pltvcm.f,v $ -C Revision 1.3 1993/07/19 17:06:44 gdsjaar -C Changed hex constants back to preceding X, --needed on cray. Works -C either way on other systems. -C -c Revision 1.2 1993/07/16 17:33:22 gdsjaar -c Integer constant too big on sun, replaced it with hexadecimal notation -c -c Revision 1.1 1993/07/16 16:49:47 gdsjaar -c Changed plt to library rather than single source file. -c C======================================================================= SUBROUTINE PLTVCM(N,MASK,XX0,YY0,XX1,YY1) REAL DEVCAP(23) diff --git a/packages/seacas/libraries/plt/pltvct.f b/packages/seacas/libraries/plt/pltvct.f index 54b8b5319295..019d5e8dea57 100644 --- a/packages/seacas/libraries/plt/pltvct.f +++ b/packages/seacas/libraries/plt/pltvct.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltvct.f,v 1.1 1993/07/16 16:49:48 gdsjaar Exp $ -C $Log: pltvct.f,v $ -C Revision 1.1 1993/07/16 16:49:48 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE PLTVCT(N,XX0,YY0,XX1,YY1) REAL DEVCAP(23) diff --git a/packages/seacas/libraries/plt/pltvwg.f b/packages/seacas/libraries/plt/pltvwg.f index 9742a38285e5..4ee6b0120512 100644 --- a/packages/seacas/libraries/plt/pltvwg.f +++ b/packages/seacas/libraries/plt/pltvwg.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltvwg.f,v 1.1 1993/07/16 16:49:49 gdsjaar Exp $ -C $Log: pltvwg.f,v $ -C Revision 1.1 1993/07/16 16:49:49 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE PLTVWG(PLL,PUR,N,XV,YV,ZV,NO,XVO,YVO,ZVO) DIMENSION XV(*),YV(*),ZV(*),XVO(*),YVO(*),ZVO(*),PLL(*),PUR(*) diff --git a/packages/seacas/libraries/plt/pltvwp.f b/packages/seacas/libraries/plt/pltvwp.f index 1a211c4f976f..1a71cb19cd40 100644 --- a/packages/seacas/libraries/plt/pltvwp.f +++ b/packages/seacas/libraries/plt/pltvwp.f @@ -1,21 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltvwp.f,v 1.3 1993/07/19 17:06:45 gdsjaar Exp $ -C $Log: pltvwp.f,v $ -C Revision 1.3 1993/07/19 17:06:45 gdsjaar -C Changed hex constants back to preceding X, --needed on cray. Works -C either way on other systems. -C -c Revision 1.2 1993/07/16 17:33:23 gdsjaar -c Integer constant too big on sun, replaced it with hexadecimal notation -c -c Revision 1.1 1993/07/16 16:49:50 gdsjaar -c Changed plt to library rather than single source file. -c C======================================================================= SUBROUTINE PLTVWP(PLL,PUR,N,MASK,PX,PY) REAL PLL(2),PUR(2) diff --git a/packages/seacas/libraries/plt/pltvwv.f b/packages/seacas/libraries/plt/pltvwv.f index 0c0d4355e033..30a0dbf7e75f 100644 --- a/packages/seacas/libraries/plt/pltvwv.f +++ b/packages/seacas/libraries/plt/pltvwv.f @@ -1,24 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltvwv.f,v 1.4 1993/07/19 17:06:46 gdsjaar Exp $ -C $Log: pltvwv.f,v $ -C Revision 1.4 1993/07/19 17:06:46 gdsjaar -C Changed hex constants back to preceding X, --needed on cray. Works -C either way on other systems. -C -c Revision 1.3 1993/07/19 14:38:19 gdsjaar -c Reformatted flow of control -c -c Revision 1.2 1993/07/16 17:33:24 gdsjaar -c Integer constant too big on sun, replaced it with hexadecimal notation -c -c Revision 1.1 1993/07/16 16:49:51 gdsjaar -c Changed plt to library rather than single source file. -c C======================================================================= SUBROUTINE PLTVWV(PLL,PUR,N,MASK,PX,PY,QX,QY) REAL PLL(2) diff --git a/packages/seacas/libraries/plt/pltwai.f b/packages/seacas/libraries/plt/pltwai.f index 8f6cc06fd687..c90f74ea6b78 100644 --- a/packages/seacas/libraries/plt/pltwai.f +++ b/packages/seacas/libraries/plt/pltwai.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltwai.f,v 1.1 1993/07/16 16:49:52 gdsjaar Exp $ -C $Log: pltwai.f,v $ -C Revision 1.1 1993/07/16 16:49:52 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE PLTWAI diff --git a/packages/seacas/libraries/plt/pltxhe.f b/packages/seacas/libraries/plt/pltxhe.f index 9893a0f253ef..5473549881d2 100644 --- a/packages/seacas/libraries/plt/pltxhe.f +++ b/packages/seacas/libraries/plt/pltxhe.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltxhe.f,v 1.1 1993/07/16 16:49:53 gdsjaar Exp $ -C $Log: pltxhe.f,v $ -C Revision 1.1 1993/07/16 16:49:53 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE PLTXHE(X,Y) REAL DEVCAP(23) diff --git a/packages/seacas/libraries/plt/pltxhl.f b/packages/seacas/libraries/plt/pltxhl.f index cef2fe6834e1..e9758b61dbc5 100644 --- a/packages/seacas/libraries/plt/pltxhl.f +++ b/packages/seacas/libraries/plt/pltxhl.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltxhl.f,v 1.1 1993/07/16 16:49:54 gdsjaar Exp $ -C $Log: pltxhl.f,v $ -C Revision 1.1 1993/07/16 16:49:54 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE PLTXHL(CHARST,LENGTH) REAL DEVCAP(23) diff --git a/packages/seacas/libraries/plt/pltxhn.f b/packages/seacas/libraries/plt/pltxhn.f index 0a5f12bf781e..2c679ec72c8e 100644 --- a/packages/seacas/libraries/plt/pltxhn.f +++ b/packages/seacas/libraries/plt/pltxhn.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltxhn.f,v 1.1 1993/07/16 16:49:55 gdsjaar Exp $ -C $Log: pltxhn.f,v $ -C Revision 1.1 1993/07/16 16:49:55 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE PLTXHN(X,Y) REAL DEVCAP(23) diff --git a/packages/seacas/libraries/plt/pltxse.f b/packages/seacas/libraries/plt/pltxse.f index 4f4422e888f9..e72f96bf4486 100644 --- a/packages/seacas/libraries/plt/pltxse.f +++ b/packages/seacas/libraries/plt/pltxse.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltxse.f,v 1.1 1993/07/16 16:49:56 gdsjaar Exp $ -C $Log: pltxse.f,v $ -C Revision 1.1 1993/07/16 16:49:56 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE PLTXSE(X,Y) REAL DEVCAP(23) diff --git a/packages/seacas/libraries/plt/pltxsl.f b/packages/seacas/libraries/plt/pltxsl.f index 08c87988298f..3c862faa59f9 100644 --- a/packages/seacas/libraries/plt/pltxsl.f +++ b/packages/seacas/libraries/plt/pltxsl.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltxsl.f,v 1.1 1993/07/16 16:49:57 gdsjaar Exp $ -C $Log: pltxsl.f,v $ -C Revision 1.1 1993/07/16 16:49:57 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE PLTXSL(CHARST,LENGTH) REAL DEVCAP(23) diff --git a/packages/seacas/libraries/plt/pltxsn.f b/packages/seacas/libraries/plt/pltxsn.f index 228246257c9a..65b325fdbd8e 100644 --- a/packages/seacas/libraries/plt/pltxsn.f +++ b/packages/seacas/libraries/plt/pltxsn.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltxsn.f,v 1.1 1993/07/16 16:49:58 gdsjaar Exp $ -C $Log: pltxsn.f,v $ -C Revision 1.1 1993/07/16 16:49:58 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE PLTXSN(X,Y) REAL DEVCAP(23) diff --git a/packages/seacas/libraries/plt/pltxtc.f b/packages/seacas/libraries/plt/pltxtc.f index 973a21508cd4..f8709a1b01a9 100644 --- a/packages/seacas/libraries/plt/pltxtc.f +++ b/packages/seacas/libraries/plt/pltxtc.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/libraries/plt/pltxth.f b/packages/seacas/libraries/plt/pltxth.f index ac23d24fdffa..9e2507f526ca 100644 --- a/packages/seacas/libraries/plt/pltxth.f +++ b/packages/seacas/libraries/plt/pltxth.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltxth.f,v 1.1 1993/07/16 16:50:00 gdsjaar Exp $ -C $Log: pltxth.f,v $ -C Revision 1.1 1993/07/16 16:50:00 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE PLTXTH(X,Y,TEXT) REAL DEVCAP(23) diff --git a/packages/seacas/libraries/plt/pltxts.f b/packages/seacas/libraries/plt/pltxts.f index f093b0dc66b2..a02f8efa93d6 100644 --- a/packages/seacas/libraries/plt/pltxts.f +++ b/packages/seacas/libraries/plt/pltxts.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltxts.f,v 1.1 1993/07/16 16:50:02 gdsjaar Exp $ -C $Log: pltxts.f,v $ -C Revision 1.1 1993/07/16 16:50:02 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE PLTXTS(X,Y,TEXT) REAL DEVCAP(23) diff --git a/packages/seacas/libraries/plt/pltzcp.f b/packages/seacas/libraries/plt/pltzcp.f index 8553b159aee0..6c9af5537488 100644 --- a/packages/seacas/libraries/plt/pltzcp.f +++ b/packages/seacas/libraries/plt/pltzcp.f @@ -1,21 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltzcp.f,v 1.3 1993/07/19 17:06:47 gdsjaar Exp $ -C $Log: pltzcp.f,v $ -C Revision 1.3 1993/07/19 17:06:47 gdsjaar -C Changed hex constants back to preceding X, --needed on cray. Works -C either way on other systems. -C -c Revision 1.2 1993/07/16 17:33:25 gdsjaar -c Integer constant too big on sun, replaced it with hexadecimal notation -c -c Revision 1.1 1993/07/16 16:50:03 gdsjaar -c Changed plt to library rather than single source file. -c C======================================================================= SUBROUTINE PLTZCP(ZNEAR,ZFAR,N,MASK,PZ) INTEGER N diff --git a/packages/seacas/libraries/plt/pltzcv.f b/packages/seacas/libraries/plt/pltzcv.f index 0cdac678ffde..204c71c42503 100644 --- a/packages/seacas/libraries/plt/pltzcv.f +++ b/packages/seacas/libraries/plt/pltzcv.f @@ -1,21 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: pltzcv.f,v 1.3 1993/07/19 17:06:48 gdsjaar Exp $ -C $Log: pltzcv.f,v $ -C Revision 1.3 1993/07/19 17:06:48 gdsjaar -C Changed hex constants back to preceding X, --needed on cray. Works -C either way on other systems. -C -c Revision 1.2 1993/07/16 17:33:26 gdsjaar -c Integer constant too big on sun, replaced it with hexadecimal notation -c -c Revision 1.1 1993/07/16 16:50:04 gdsjaar -c Changed plt to library rather than single source file. -c C======================================================================= SUBROUTINE PLTZCV(ZNEAR,ZFAR,N,MASK,PX,PY,PZ,QX,QY,QZ) INTEGER N diff --git a/packages/seacas/libraries/plt/siorpt.f b/packages/seacas/libraries/plt/siorpt.f index 2eb51d3b0003..fddc0624751a 100644 --- a/packages/seacas/libraries/plt/siorpt.f +++ b/packages/seacas/libraries/plt/siorpt.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: siorpt.f,v 1.1 1993/07/16 16:50:05 gdsjaar Exp $ -C $Log: siorpt.f,v $ -C Revision 1.1 1993/07/16 16:50:05 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE SIORPT(MODULE,MESS,DISP) IMPLICIT INTEGER (A-Z) diff --git a/packages/seacas/libraries/plt/vecrgp.f b/packages/seacas/libraries/plt/vecrgp.f index 7be0eb6ade92..11f2ed6a0e60 100644 --- a/packages/seacas/libraries/plt/vecrgp.f +++ b/packages/seacas/libraries/plt/vecrgp.f @@ -1,14 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: vecrgp.f,v 1.1 1993/07/16 16:50:07 gdsjaar Exp $ -C $Log: vecrgp.f,v $ -C Revision 1.1 1993/07/16 16:50:07 gdsjaar -C Changed plt to library rather than single source file. -C C======================================================================= SUBROUTINE VECRGP(ND,V,VMAX,VMIN) DIMENSION V(*) diff --git a/packages/seacas/libraries/plt/vecrgs.f b/packages/seacas/libraries/plt/vecrgs.f index c71a409216d4..19ac1357c9c6 100644 --- a/packages/seacas/libraries/plt/vecrgs.f +++ b/packages/seacas/libraries/plt/vecrgs.f @@ -1,19 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Log: vecrgs.f,v $ -C Revision 1.3 1993/07/19 14:18:13 gdsjaar -C Reformatted flow of control -C -c Revision 1.2 1993/07/19 14:16:18 gdsjaar -c Reformatted flow of control -c -c Revision 1.1 1993/07/16 16:50:08 gdsjaar -c Changed plt to library rather than single source file. -c C======================================================================= SUBROUTINE VECRGS(ND,V,VMAX,VMIN) DIMENSION V(*) diff --git a/packages/seacas/libraries/supes/doc/abstract.tex b/packages/seacas/libraries/supes/doc/abstract.tex index b4a2414d65ac..79b09b955f7d 100644 --- a/packages/seacas/libraries/supes/doc/abstract.tex +++ b/packages/seacas/libraries/supes/doc/abstract.tex @@ -5,4 +5,4 @@ management, and (3) system dependent utilities. The subprograms in categories one and two are written in standard FORTRAN-77, while the subprograms in category three are written to provide a standardized FORTRAN interface to -several system dependent features. +several system dependent features. diff --git a/packages/seacas/libraries/supes/doc/arg.sty b/packages/seacas/libraries/supes/doc/arg.sty index 8d26def3ab99..308f7322fa9d 100644 --- a/packages/seacas/libraries/supes/doc/arg.sty +++ b/packages/seacas/libraries/supes/doc/arg.sty @@ -4,10 +4,10 @@ \setlength{\labelwidth}{2.8 cm} \setlength{\labelsep}{.4 cm} \setlength{\leftmargin}{3.3 cm}} -\item[Argument:] #1 -\item[Type:] #2 -\item[Access:] #3 -\item[Description:] +\item[Argument:] #1 +\item[Type:] #2 +\item[Access:] #3 +\item[Description:] }{\end{list}} \newcommand{\last}{\raisebox{-.4 ex}{*}} diff --git a/packages/seacas/libraries/supes/doc/extlib.tex b/packages/seacas/libraries/supes/doc/extlib.tex index ac43127ecdba..deef6bf73c1b 100644 --- a/packages/seacas/libraries/supes/doc/extlib.tex +++ b/packages/seacas/libraries/supes/doc/extlib.tex @@ -46,51 +46,51 @@ \chapter{EXTENSION LIBRARY} \label{sec:extlib} file \verb+exdate.c+: \begin{verbatim} #include - + #if defined (unix) # if defined (alliant) - + # include # include exdate_( string ) /* Sadly, on the Alliant, */ /* strings are not passed */ /* similar to the SUN. */ char *string; - + # endif /* Alliant */ # if defined (sun) - + # include exdate_( string, len ) char *string; long len; - + # else /* Not Sun */ # if defined (CRAY) - + # include # include # include EXDATE( string ) _fcd string; - + # endif /* Unicos */ # endif /* Sun */ #else /* Not UNIX */ # if defined (VMS) - + #include time #include descrip exdate( string ) struct dsc$descriptor_s *string; /* We know that the VAX saves */ /* FORTRAN char arrays */ /* as descriptors. */ - + # else /* not VMS */ # endif /* VMS */ #endif /* UNIX */ -\end{verbatim} +\end{verbatim} The passages beginning with \verb+#if defined+ query the system at compile time through the use of a pre-processor to determine the hardware/software configuration. @@ -126,7 +126,7 @@ \subsection{Get Today's Date (EXDATE)} \begin{argy}{STRING}{CHARACTER\last8}{Write Only} Current date formatted as ``MM/DD/YY'' where ``MM'', ``DD'', and ``YY'' are two digit integers representing the month, day, and year, respectively. For -example, ``07/04/86'' would be returned on July 4, 1986. +example, ``07/04/86'' would be returned on July 4, 1986. \end{argy} \subsection{Get Time of Day (EXTIME)} @@ -136,7 +136,7 @@ \subsection{Get Time of Day (EXTIME)} \begin{argy}{STRING}{CHARACTER\last8}{Write Only} Current time formatted as ``HH:MM:SS'' where ``HH'', ``MM'', and ``SS'' are two digit integers representing the hour (00-24), minute, and second, -respectively. For example, ``16:30:00'' would be returned at 4:30 PM. +respectively. For example, ``16:30:00'' would be returned at 4:30 PM. \end{argy} \subsection{Get Accumulated Processor Time (EXCPUS)} @@ -146,7 +146,7 @@ \subsection{Get Accumulated Processor Time (EXCPUS)} \begin{argy}{CPUSEC}{REAL}{Write Only} Accumulated CPU time in seconds. The base time is undefined; only relative times are valid. This is an unweighted value which measures performance -rather than cost. +rather than cost. \end{argy} \subsection{Get Operating Environment Parameters (EXPARM)} @@ -163,7 +163,7 @@ \subsection{Get Operating Environment Parameters (EXPARM)} \begin{argy}{MODE}{INTEGER}{Write Only} Job mode: 0 = batch, 1=interactive. For this purpose, an interactive -environment means that the user can respond to unanticipated questions. +environment means that the user can respond to unanticipated questions. \end{argy} \begin{argy}{KCSU}{INTEGER}{Write Only} @@ -206,12 +206,12 @@ \subsection{Get Unit File Name or Symbol Value (EXNAME)} \begin{argy}{NAME}{CHARACTER\last(\last)}{Write Only} File name or symbol value obtained from the operating system. It is assumed that the unit/file name or symbol/value linkage will be passed to this -routine at program activation. +routine at program activation. \end{argy} \begin{argy}{LN}{INTEGER}{Write Only} Effective length of the string returned in NAME. Zero indicates that no -name or value was available. +name or value was available. \end{argy} This routine provides a standard interface for establishing execution time @@ -231,7 +231,7 @@ \section{Utility Support Routines} the SUPES free field input and memory manager utilities. While calling these routines directly will not disturb the internal operation of these other facilities, the use of EXMEMY (section~\ref{sec:exmemy}) in -conjunction with the memory manager is discouraged. +conjunction with the memory manager is discouraged. \subsection{Convert String to Uppercase (EXUPCS)} \label{sec:exupcs} @@ -240,7 +240,7 @@ \subsection{Convert String to Uppercase (EXUPCS)} \label{sec:exupcs} \begin{argy}{STRING}{CHARACTER\last(\last)}{Read and Write} Character string for which lowercase letters will be translated to uppercase. All other characters which are not in the printable ASCII character -set are converted to spaces. +set are converted to spaces. \end{argy} \subsection{Prompt/Read/Echo Input Record (EXREAD)} \label{sec:exread} @@ -279,7 +279,7 @@ \subsection{Evaluate Numeric Storage Location (IXLNUM)} \begin{argy}{NUMLOC}{INTEGER}{Write Only} Numeric location of NUMVAR. This value is an address measured in ANSI -FORTRAN numeric storage units. +FORTRAN numeric storage units. \end{argy} @@ -293,7 +293,7 @@ \subsection{Evaluate Character Storage Location (IXLCHR)} \begin{argy}{CHRLOC}{INTEGER}{Write Only} Character location of CHRVAR. This value is an address measured in ANSI -FORTRAN character storage units. +FORTRAN character storage units. \end{argy} @@ -303,13 +303,13 @@ \subsection{Get/Release Memory Block (EXMEMY)} \label{sec:exmemy} \begin{argy}{MEMREQ}{INTEGER}{Read Only} Number of numeric storage units to allocate if MEMREQ $>$ 0, or release if -MEMREQ $<$ 0. +MEMREQ $<$ 0. \end{argy} \begin{argy}{LOCBLK}{INTEGER}{Read (release) or Write (allocate)} Numeric location of memory block. This value is an address measured in ANSI FORTRAN numeric storage units. Only memory previously allocated to the -caller via EXMEMY can be released via EXMEMY. +caller via EXMEMY can be released via EXMEMY. \end{argy} \begin{argy}{MEMRTN}{INTEGER}{Write Only} diff --git a/packages/seacas/libraries/supes/doc/frefld.tex b/packages/seacas/libraries/supes/doc/frefld.tex index bae2d9e73705..fecd4c7d5437 100644 --- a/packages/seacas/libraries/supes/doc/frefld.tex +++ b/packages/seacas/libraries/supes/doc/frefld.tex @@ -31,7 +31,7 @@ \chapter{FREE FIELD INPUT} would be possible when reading only from a file. \item Whole, real numbers (e.g., 12.3E3) will translate to both INTEGER and -REAL values if the absolute value of the number is not greater than +REAL values if the absolute value of the number is not greater than 1.0E9. \item Quoted strings are allowed. This makes the free field reader more @@ -99,7 +99,7 @@ \section{Syntax Rules} \label{sec:syntax} \item An asterisk (\last) indicates that the next input record/string will be treated as a continuation of the current line. All characters after and -including the continuation indicator on the current line are ignored. +including the continuation indicator on the current line are ignored. Multiple records/strings that are ''joined'' by continuation indicators are treated as a single logical record. @@ -111,7 +111,7 @@ \section{Syntax Rules} \label{sec:syntax} \item \label{itm:case} Lowercase letters not contained in a quoted string are converted to uppercase. All other non-printable ASCII characters are converted - to spaces. + to spaces. \item A numeric field is a data field which adheres to an ANSI FORTRAN numeric format. A numeric field cannot be longer than 32 characters. A numeric @@ -261,7 +261,7 @@ \subsection{Internal Input Routine (FFISTR)}\label{sec:ffistr} character strings supplied through FFISTR's argument list. FFISTR returns the parsed data field values defined in the input string. If a string contains a continuation character, a flag is returned to the user indicating -that another string should be supplied to complete the logical record. +that another string should be supplied to complete the logical record. The arguments to FFISTR are prescribed below. \begin{verbatim} CALL FFISTR( LINE, MFIELD, IDCONT, NFIELD, KVALUE, @@ -376,7 +376,7 @@ \subsection{Basic Examples} 10,, \end{verbatim} -Results returned from FREFLD:\\ +Results returned from FREFLD:\\ NFIELD = 2 \begin{tabular}{|ccccc|} \hline \hline @@ -393,7 +393,7 @@ \subsection{Basic Examples} 'Quoted strings', '5 ', '$*,=''"' $ rest is comment \end{verbatim} -Results returned from FREFLD:\\ +Results returned from FREFLD:\\ NFIELD = 3 \begin{tabular}{|ccccc|} \hline \hline @@ -410,7 +410,7 @@ \subsection{Basic Examples} quotes's \end{verbatim} -Results returned from FREFLD:\\ +Results returned from FREFLD:\\ NFIELD = 1 \begin{tabular}{|ccccc|} \hline \hline diff --git a/packages/seacas/libraries/supes/doc/introduction.tex b/packages/seacas/libraries/supes/doc/introduction.tex index 3df5238a3622..ca84dd6ab477 100644 --- a/packages/seacas/libraries/supes/doc/introduction.tex +++ b/packages/seacas/libraries/supes/doc/introduction.tex @@ -1,4 +1,4 @@ -\chapter{INTRODUCTION} +\chapter{INTRODUCTION} The Software Utilities Package for the Engineering Sciences (SUPES) is a collection of subprograms which perform frequently used non-numerical services for the engineering applications programmer. @@ -27,8 +27,8 @@ \chapter{INTRODUCTION} Applications programmers face many similar user and system interface problems during code development. Because ANSI standard FORTRAN does not address many of these problems, each programmer solves these problems for his/her own code. -SUPES aids the programmer by: -\begin{enumerate} +SUPES aids the programmer by: +\begin{enumerate} \item Providing a library of useful subprograms. diff --git a/packages/seacas/libraries/supes/doc/memmgr.tex b/packages/seacas/libraries/supes/doc/memmgr.tex index 27e62658748e..9d9c0ddced6b 100644 --- a/packages/seacas/libraries/supes/doc/memmgr.tex +++ b/packages/seacas/libraries/supes/doc/memmgr.tex @@ -26,7 +26,7 @@ \chapter{MEMORY MANAGER} will operate, allocating space from a user-supplied work array. This mode is described as dynamic allocation of static memory. Thus, modification of a user's application program is minimal on systems where dynamic memory is not -implemented. +implemented. All user entry points to memory manager routines begin with either ``MD'' or ``MC.'' In most cases, the ``MD'' routines are used for numeric data, @@ -105,7 +105,7 @@ \subsection{Initialize (MDINIT/MCINIT)} base arrays in memory. MDINIT must be called first, and MCINIT second. In the case where character dynamic memory is not used, MCINIT need not be called. When calling MxINIT, the user must pass (explicitly or -implicitly) subscript 1 of the base array. +implicitly) subscript 1 of the base array. \begin{verbatim} CALL MDINIT (NUMBAS(1)) CALL MCINIT (CHRBAS(1)) @@ -126,7 +126,7 @@ \subsection{Define Dynamic Array (MDRSRV/MCRSRV)} MxRSRV declares new dynamic arrays. The user specifies the space required, and an index to the new space is returned. Note that, by default, the contents of the new storage are not initialized to any specific -value. MxFILL may be used for data initialization. +value. MxFILL may be used for data initialization. \begin{verbatim} CALL MDRSRV (NAME, NEWIDX, NEWLEN) CALL MCRSRV (NAME, NEWIDX, NEWLEN) @@ -190,7 +190,7 @@ \subsection{Reserve Memory Block (MDGET/MCGET)} \end{argy} \subsection{Release Unallocated Memory (MDGIVE/MCGIVE)} -MxGIVE +MxGIVE causes the memory manager to return unused storage to the operating system, if possible. MDGIVE and MCGIVE are synonyms. \begin{verbatim} @@ -209,7 +209,7 @@ \subsection{Obtain Statistics (MDSTAT/MCSTAT)} \begin{argy}{MNERRS}{INTEGER}{Write Only} This is the total number of errors detected by the memory manager during the -current execution. +current execution. \end{argy} \begin{argy}{MNUSED}{INTEGER}{Write Only} @@ -217,7 +217,7 @@ \subsection{Obtain Statistics (MDSTAT/MCSTAT)} dynamic arrays. MDSTAT returns the numeric storage in numeric storage units, and MCSTAT returns the character storage in character storage units. If any storage has been requested in the deferred mode and not yet allocated by the -memory manager (Section~\ref{sec:wait}), this storage is counted as though +memory manager (Section~\ref{sec:wait}), this storage is counted as though it were actually allocated. \end{argy} @@ -227,7 +227,7 @@ \subsection{Print Error Summary (MDEROR/MCEROR)} also printed. MxEROR should be called any time an error is detected by a call to MxSTAT. Table~\ref{tab:ecode} lists the error codes. -MDEROR and MCEROR are synonyms. +MDEROR and MCEROR are synonyms. \begin{table}[htbp] \centering \caption{Memory Manager Error Codes} \label{tab:ecode} @@ -260,14 +260,14 @@ \subsection{Print Error Summary (MDEROR/MCEROR)} internal array is full. For example, the table which records the names of the arrays allocated with MxRSRV may not be large enough for the application. In this case, the memory manager subroutines must be modified -to accommodate the user. A local support person should perform this task. +to accommodate the user. A local support person should perform this task. \begin{verbatim} CALL MDEROR (IUNIT) CALL MCEROR (IUNIT) \end{verbatim} \begin{argy}{IUNIT}{INTEGER}{Read Only} -This is the FORTRAN unit number of the output device. +This is the FORTRAN unit number of the output device. \end{argy} @@ -290,7 +290,7 @@ \subsection{Enable data initialization (MDFILL/MCFILL)} storage. Since the internal machine representation of REAL data is different than INTEGER data (or LOGICAL data), the user may experience unexpected results when dynamic memory is used as a numeric type which is different -from the type of the initialization datum. +from the type of the initialization datum. \end{argy} \begin{argy}{CHRDAT}{CHARACTER\last(\last)}{Read Only} @@ -361,8 +361,8 @@ \subsection{Rename Dynamic Array (MDNAME/MCNAME)} \subsection{Adjust Dynamic Array Length (MDLONG/MCLONG)} MxLONG changes the length of a dynamic array. The memory manager will relocate the array and move its data if storage cannot be extended at -the array's current location. The user should assume that MxLONG -invalidates the previous index to this array if the array is extended. +the array's current location. The user should assume that MxLONG +invalidates the previous index to this array if the array is extended. MDLONG is used for numeric arrays and MCLONG is used for character arrays. \begin{verbatim} CALL MDLONG (NAME, NEWIDX, NEWLEN) @@ -384,7 +384,7 @@ \subsection{Adjust Dynamic Array Length (MDLONG/MCLONG)} \end{argy} \subsection{Locate Dynamic Array (MDFIND/MCFIND)} -MxFIND +MxFIND returns the index and length of storage allocated to a dynamic array. This routine would be used if the index from an earlier call to MxRSRV was not available in a particular program segment. MDFIND @@ -413,10 +413,10 @@ \subsection{Locate Dynamic Array (MDFIND/MCFIND)} \subsection{Compress Storage (MDCOMP/MCCOMP)} MxCOMP causes fragmented memory to be consolidated. Note that this may cause array storage locations to change. It is important to -realize that all indexes must be recalculated by calling MxFIND +realize that all indexes must be recalculated by calling MxFIND after a compress operation. A call to MxCOMP prior to MxGIVE will result in the return of the maximum memory to the system. -MDCOMP and MCCOMP are synonyms. +MDCOMP and MCCOMP are synonyms. \begin{verbatim} CALL MDCOMP () CALL MCCOMP () @@ -468,7 +468,7 @@ \subsection{Report Last Error (MDLAST/MCLAST)} \begin{argy}{IFLAG}{INTEGER}{Write Only} IFLAG is the number of the last error caused by a previous call to the -memory manager. +memory manager. \end{argy} \subsection{Enable Deferred Memory Mode (MDWAIT/MCWAIT)} \label{sec:wait} @@ -478,7 +478,7 @@ \subsection{Enable Deferred Memory Mode (MDWAIT/MCWAIT)} \label{sec:wait} required, the request for memory is deferred and will be satisfied when the deferred mode is canceled by calling MxEXEC or a call to MxLONG requires a system call for memory for an existing array. -MDWAIT and MCWAIT are synonyms. +MDWAIT and MCWAIT are synonyms. Because the deferred mode may not actually provide array space at the time a call to MxRSRV is made, the base array pointer re\-turn\-ed by @@ -487,7 +487,7 @@ \subsection{Enable Deferred Memory Mode (MDWAIT/MCWAIT)} \label{sec:wait} be erroneously used. When the deferred memory requests are eventually satisfied (by calling MxEXEC), the indexes are automatically, asynchronously updated by the memory manager. Thus, upon return from -MxEXEC the indexes used in MxRSRV will have a valid value. +MxEXEC the indexes used in MxRSRV will have a valid value. The deferred mode is provided as a means of reducing the sometimes time-consuming calls to the operating system for new memory. A similar @@ -495,7 +495,7 @@ \subsection{Enable Deferred Memory Mode (MDWAIT/MCWAIT)} \label{sec:wait} deferred mode relieves the user of the burden of adding all memory requests before calling MxRSRV. The deferred mode is a sophisticated capability and should not be enabled if the user does not understand its -implications. +implications. The deferred mode must be used as follows: \begin{enumerate} @@ -504,7 +504,7 @@ \subsection{Enable Deferred Memory Mode (MDWAIT/MCWAIT)} \label{sec:wait} in the deferred mode. \item Indexes returned by MxRSRV, MxFIND, and MxLONG may not be assigned to other variables while the deferred mode is -in effect. +in effect. \item Dynamic memory may not be accessed while the deferred mode is in effect. \item The deferred mode is canceled by calling MxEXEC. @@ -550,11 +550,11 @@ \subsection{Report storage information (MDMEMS/MCMEMS)} different units. \end{argy} -\begin{argy}{NSULV}{INTEGER}{Write Only} +\begin{argy}{NSULV}{INTEGER}{Write Only} NSULV is the size of the largest void space in numeric or character storage units. Note that MDMEMS and MCMEMS may be reporting the same space for -NSULV, but in different units. -\end{argy} +NSULV, but in different units. +\end{argy} \section{Development Aids}\label{sec:mdev} The routines in this section are designed to aid the programmer during @@ -564,7 +564,7 @@ \section{Development Aids}\label{sec:mdev} \subsection{List Storage Tables (MDLIST/MCLIST)} MxLIST prints the contents of the memory manager's internal tables. Section~\ref{sec:table} describes these tables. MDLIST and MCLIST -are synonyms. +are synonyms. \begin{verbatim} CALL MDLIST (IUNIT) CALL MCLIST (IUNIT) diff --git a/packages/seacas/libraries/supes/doc/memmgr1.tex b/packages/seacas/libraries/supes/doc/memmgr1.tex index a4bc79c26d89..e01f82a4abc6 100644 --- a/packages/seacas/libraries/supes/doc/memmgr1.tex +++ b/packages/seacas/libraries/supes/doc/memmgr1.tex @@ -16,7 +16,7 @@ \chapter{MEMORY MANAGER} resources. Machine dependencies are isolated through the use of the FORTRAN extension library (Chapter~\ref{sec:extlib}). All memory requests are in terms of {\em numeric storage units} (the amount of memory occupied by an -integer, real, or logical datum~\cite{ansi}). +integer, real, or logical datum~\cite{ansi}). The memory manager utility is divided into three categories; basic routines, advanced routines, and development aids. These categories will be discussed @@ -35,7 +35,7 @@ \section{Pointer System} \begin{enumerate} \item The array must be of type INTEGER, REAL, or LOGICAL. Modified word length storage arrays such as INTEGER\last2 or REAL\last8 will result in -invalid pointers with no error message. +invalid pointers with no error message. \item The lower bound of the array subscript must be one. \end{enumerate} @@ -65,12 +65,12 @@ \section{Basic Routines}\label{sec:mbas} \subsection{Initialize (MDINIT)} The memory manager {\em must} be initialized with a call to MDINIT before any memory can be allocated. The main purpose of the initialization is to -determine the location of the base array in memory. +determine the location of the base array in memory. \verb+CALL MDINIT (BASE)+ \begin{argy}{BASE}{INTEGER, LOGICAL or REAL Array}{Read Only} -This array is used as a base reference to all dynamically allocated memory. +This array is used as a base reference to all dynamically allocated memory. \end{argy} \subsection{Define Dynamic Array (MDRSRV)} @@ -84,18 +84,18 @@ \subsection{Define Dynamic Array (MDRSRV)} This is the name of the new dynamic array. The memory manager will add this name to its internal dictionary; each array must have a unique name. The first eight characters are used for comparison, and leading and embedded -blanks are significant. +blanks are significant. \end{argy} \begin{argy}{NEWPNT}{INTEGER}{Write Only} This is the pointer to storage allocated to this dynamic array relative to -the base array. +the base array. \end{argy} \begin{argy}{NEWLEN}{INTEGER}{Read Only} This is the length to be reserved for the new array. Any nonnegative number is acceptable. A zero length does not cause any storage to be allocated and -returns a pointer equal to one. +returns a pointer equal to one. \end{argy} \subsection{Delete Dynamic Array (MDDEL)} @@ -107,7 +107,7 @@ \subsection{Delete Dynamic Array (MDDEL)} This is the name of the dynamic array which is to be deleted. The array name must match an existing name in the dictionary. The first eight characters are used for comparison, and leading and embedded blanks are -significant. +significant. \end{argy} \subsection{Reserve Memory Block (MDGET)} @@ -138,12 +138,12 @@ \subsection{Obtain Statistics (MDSTAT)} \begin{argy}{MNERRS}{INTEGER}{Write Only} This is the total number of errors detected by the memory manager during the -current execution. +current execution. \end{argy} \begin{argy}{MNUSED}{INTEGER}{Write Only} This is the total number of words that are currently allocated to dynamic -arrays. +arrays. \end{argy} \subsection{Print Error Summary (MDEROR)} @@ -207,11 +207,11 @@ \subsection{Rename Dynamic Array (MDNAME)} \begin{argy}{NAME1}{CHARACTER\last(\last)}{Read Only} This is the old name of the array. The first eight characters are used for -comparison. +comparison. \end{argy} \begin{argy}{NAME2}{CHARACTER\last(\last)}{Read Only} -This is the new name of the array. The first eight characters are used. +This is the new name of the array. The first eight characters are used. \end{argy} \subsection{Adjust Dynamic Array Length (MDLONG)} @@ -224,7 +224,7 @@ \subsection{Adjust Dynamic Array Length (MDLONG)} \begin{argy}{NAME}{CHARACTER\last(\last)}{Read Only} This is the name of the dynamic array which the user wishes to extend or -shorten. +shorten. \end{argy} \begin{argy}{NEWPNT}{INTEGER}{Write Only} @@ -248,7 +248,7 @@ \subsection{Locate Dynamic Array (MDFIND)} \begin{argy}{NEWPNT}{INTEGER}{Write Only} This is the pointer to the dynamic array relative to the user's reference -array. +array. \end{argy} \begin{argy}{NEWLEN}{INTEGER}{Write Only} @@ -272,7 +272,7 @@ \section{Development Aids}\label{sec:mdev} \subsection{List Storage Tables (MDLIST)} MDLIST prints the contents of the memory manager's internal tables. -Section~\ref{sec:table} describes these tables. +Section~\ref{sec:table} describes these tables. \verb+CALL MDLIST (IUNIT)+ @@ -296,5 +296,5 @@ \subsection{Print Dynamic Array (MDPRNT)} \begin{argy}{NTYPE}{CHARACTER\last(\last)}{Read Only} NTYPE indicates the data type of the data to be printed; "R" for REAL, or "I" for INTEGER. Note that this is not necessarily the declared type of the -base array. +base array. \end{argy} diff --git a/packages/seacas/libraries/supes/doc/references.tex b/packages/seacas/libraries/supes/doc/references.tex index f28c2def6bc9..8537a9411149 100644 --- a/packages/seacas/libraries/supes/doc/references.tex +++ b/packages/seacas/libraries/supes/doc/references.tex @@ -3,7 +3,7 @@ \filbreak\bibitem{ansi} American-2017 National Standard Programming Language FORTRAN, American-2017 National Standards Institute, Inc., - ANSI X3.9-1978, New York, 1978. + ANSI X3.9-1978, New York, 1978. \filbreak\bibitem{SUPES} D.~P. Flanagan, W.~C. Mills-Curran, and L.~M. Taylor, ``{SUPES} A Software diff --git a/packages/seacas/libraries/supes/doc/site.tex b/packages/seacas/libraries/supes/doc/site.tex index 298a3927c278..0bd930dcafb6 100644 --- a/packages/seacas/libraries/supes/doc/site.tex +++ b/packages/seacas/libraries/supes/doc/site.tex @@ -18,7 +18,7 @@ \chapter{SITE SUPPLEMENTS} \label{sec:site} for the SUPES library. The previous version is stored under the root directory ``/SUPES''. -The table below documents the files stored in this directory. +The table below documents the files stored in this directory. \begin{tabular}{|ll|} \hline \hline \multicolumn{1}{|c}{Node} & \multicolumn{1}{c|}{Contents} \\ \hline @@ -165,7 +165,7 @@ \subsection{Defining Unit/File or Symbol/Value for EXNAME:} \end{verbatim} -\subsection{Interface to EXREAD} +\subsection{Interface to EXREAD} EXREAD will prompt to, and read from, SYS\$INPUT. @@ -178,7 +178,7 @@ \subsection{Interface to EXREAD} himself with an appropriate call parameter to the routine FREFLD. EXREAD supports all the VMS command line editing features (e.g., CTRL/U, $<$up-arrow$>$, etc.). An end-of-file from the terminal keyboard is -indicated by CTRL/Z. +indicated by CTRL/Z. \subsection{Additional Comments Regarding SUPES2\_1} When attempting to redefine the logical SYS\$OUTPUT, @@ -492,7 +492,7 @@ \subsection{Defining Unit/File or Symbol/Value for EXNAME} \end{verbatim} EXNAME looks for a symbol on the execution line of the form extn, where -``n'' is a one digit integer which defines a symbol number. For example: +``n'' is a one digit integer which defines a symbol number. For example: \begin{verbatim} myprog ext1=HELLO @@ -624,7 +624,7 @@ \section{Site Supplement for SNLA Sun Workstations (SunOS version 4)} \subsection{Linking} The new version of SUPES is also the only one that is available for this system. -Note that the SUPES installation must have been performed according to +Note that the SUPES installation must have been performed according to the installation instructions~\ref{sec:install}. If so, then it resides in the directory \verb+/usr/local/lib+ diff --git a/packages/seacas/libraries/supes/doc/support.tex b/packages/seacas/libraries/supes/doc/support.tex index 929be0c8ce63..4213edd44086 100644 --- a/packages/seacas/libraries/supes/doc/support.tex +++ b/packages/seacas/libraries/supes/doc/support.tex @@ -9,12 +9,12 @@ \section{Free Field Input} The SUPES free field input system consists of four subroutines: FREFLD (section~\ref{sec:frefld}), FFISTR (section~\ref{sec:ffistr}), GETINP (section~\ref{sec:getinp}), and STRIPB (section~\ref{sec:stripb}). All of -these routines are written in fully standard ANSI FORTRAN. +these routines are written in fully standard ANSI FORTRAN. FREFLD calls the extension library routine EXUPCS (section~\ref{sec:exupcs}). If only the skeleton version of EXUPCS is available, case insensitivity of input data (rule~\ref{itm:case} of -section~\ref{sec:syntax}) can not be guaranteed. +section~\ref{sec:syntax}) can not be guaranteed. FFISTR is the input line parsing routine. It is called by FREFLD, @@ -24,7 +24,7 @@ \section{Free Field Input} The SUPES free field input system consists of GETINP calls the extension library routine EXREAD (section~\ref{sec:exread}). If only the skeleton version of EXREAD is available, GETINP will not prompt nor guarantee echo when reading from the -standard input device (KIN = 0). +standard input device (KIN = 0). \subsection{Implementation Notes on FREFLD} @@ -115,7 +115,7 @@ \subsection{Test Program for FREFLD} 4 -1 " " 0. 0 5 -1 " " 0. 0 5: ^C <-- To exit, the user enters a ^C. -% +% \end{verbatim} \section{Memory Manager} \label{sec:table} @@ -125,11 +125,11 @@ \section{Memory Manager} \label{sec:table} extension library. -\subsection{Table Architecture and Maintenance} +\subsection{Table Architecture and Maintenance} The bookkeeping for the memory manager is accomplished with three tables; a memory block table, a void area table, and a dictionary. -The {\em +The {\em memory block table} maintains a record of contiguous blocks of memory that have been received from the operating system. If a series of requests causes separate blocks to become contiguous, these blocks are joined. The @@ -139,7 +139,7 @@ \subsection{Table Architecture and Maintenance} Within each memory block, sections of memory that are not currently allocated to arrays are recorded in the {\em void area table}. As in the case of the memory block table, contiguous voids are joined and this table -is sorted in location order. +is sorted in location order. The {\em dictionary} relates storage locations with eight character array names. The dictionary is sorted via the default FORTRAN collating sequence. @@ -147,7 +147,7 @@ \subsection{Table Architecture and Maintenance} All names are converted to upper case then blank filled or truncated to eight characters. In addition to the array name, the -dictionary stores the location and length of each dynamic array. +dictionary stores the location and length of each dynamic array. Any call for memory (MDGET or MDRSRV) will be satisfied in one of two ways: \begin{enumerate} @@ -265,7 +265,7 @@ \subsection{Test Program} ************************************************** -0 * * * * * * * D I C T I O N A R Y * * * * * * * +0 * * * * * * * D I C T I O N A R Y * * * * * * * 0 NUMERIC CHARACTER NAME LOCATION LENGTH LENGTH @@ -283,14 +283,14 @@ \subsection{Test Program} ************************************************** -0 * * * * * * O R D E R E D L I S T * * * * * * +0 * * * * * * O R D E R E D L I S T * * * * * * 0 NUMERIC CHARACTER NAME LOCATION LENGTH LENGTH 1 CHAR 17664 107 850 2 REAL1 17771 108 -1 3 REAL2 17879 108 -1 - 4 17987 61 + 4 17987 61 BLOCK SIZE 384 850 ALLOCATED TOTAL 384 850 @@ -298,8 +298,8 @@ \subsection{Test Program} GRAND TOTAL 384 850 FUNC: exit - STOP in MEMTEST -% + STOP in MEMTEST +% \end{verbatim} @@ -387,29 +387,29 @@ \section{Extension Library Implementation} \subsection{Implementation Notes for Modules} The format of the date for \underline{EXDATE} must be strictly observed. Many systems supply a date service routine which formats the date in a -different style. Conversion to the SUPES format should be straightforward. +different style. Conversion to the SUPES format should be straightforward. Most systems provide a time of day service routine which formats the time in the desired style. Some systems also return fractional seconds which can easily be trimmed off. In any case, the format specified by -\underline{EXTIME} must be strictly observed. +\underline{EXTIME} must be strictly observed. \underline{EXCPUS} is intended to measure performance rather than cost. The quantity returned by EXCPUS should be raw CPU seconds; any weighting for memory use or priority should be removed. I/O time should be included only -if it is performed by the CPU. +if it is performed by the CPU. The hardware ID string for \underline{EXPARM} should reflect both the manufacturer and model of the processor. For example, ``VAX 8600'' rather than just ``VAX'' allows the user to make sense of the CPU time returned by -EXCPUS. +EXCPUS. The software ID string should reflect the release of the operating system in use, such as ``COS 1.11''. It is not a trivial exercise to provide all pertinent information in eight characters for ad hoc systems like CTSS which vary widely between installations. For example, the string ``CFTLIB14'' has been used to indicate a variation of the SUPES package for CTSS using CFTLIB -and the CFT 1.14 compiler. +and the CFT 1.14 compiler. On most systems KCSU will give the number of characters per numeric word and KNSU will be unity. For a hypothetical 36-bit processor which allows 8-bit @@ -423,7 +423,7 @@ \subsection{Implementation Notes for Modules} possible to whatever convention the particular operating system uses for connecting a FORTRAN I/O unit to a file at execution time. This feature should be easy to implement on systems which support pre-connection. Support -for units 1-99 should be sufficient. +for units 1-99 should be sufficient. The symbol mode feature of EXNAME should be designed to obtain messages from the system level procedure which activates the program. Eight characters @@ -437,7 +437,7 @@ \subsection{Implementation Notes for Modules} The skeleton version of \underline{EXUPCS} is designed to work on any system which supports lower case letters. This routine will rarely require any -change. +change. \underline{EXREAD} must provide a prompt for an interactive device and guarantee that input is echoed. This requires a careful determination of @@ -445,13 +445,13 @@ \subsection{Implementation Notes for Modules} handle input from a script file as well as from a terminal. Any automatic echo service provided by the operating system should be employed wherever possible, as long as the user supplied prompt appears along with the input -data echo. +data echo. In all instances, the C programming language provides a clean method for returning the address for \underline{IXLNUM}\@. In some cases it may be necessary to convert the address to numeric units. For example, addresses on VMS must be -divided by four to convert from bytes to numeric storage units. +divided by four to convert from bytes to numeric storage units. The same cannot necessarily be said for a character address as returned by \underline{IXLCHR}\@. The reader is referred to the source file \verb+ixlchr.c+ for further details @@ -493,9 +493,9 @@ \subsection{Extension Library Test Program} Input line = LDKJ <-- The input line is returned in upper case. Date = 12/18/89 Time = 09:58:05 -Unit 1 name = junk.dat -Unit 10 name = -Symbol 1 = +Unit 1 name = junk.dat +Unit 10 name = +Symbol 1 = Processor = Sun4 System = OS4.0.3c Mode = 1 Character, Numeric, D/A Units: 4 1 0 Memory block location and length: 24700 128 diff --git a/packages/seacas/libraries/supes/ext_lib/README b/packages/seacas/libraries/supes/ext_lib/README index 031387fa0e8c..9b4145bdfcc4 100644 --- a/packages/seacas/libraries/supes/ext_lib/README +++ b/packages/seacas/libraries/supes/ext_lib/README @@ -15,7 +15,7 @@ Notes on this version of SUPES: in the C programming language. This was done for a number of reasons. Among them are that we will now be able to run with only one version of the source for all of the architectures that we - will be supporting, and the ease in which a port will be made + will be supporting, and the ease in which a port will be made possible. The former case is made possible through the liberal use of C Preprocessor compiler directives while the latter by comparison with the existing code itself. @@ -35,38 +35,38 @@ Notes on this version of SUPES: #if defined (unix) # if defined (sun) - + # include extime_( string, len ) char string[]; long int len; - + # else /* Not Sun */ # if defined (CRAY) - + # include # include EXTIME( string ) _fcd string; - + # endif /* Unicos */ # endif /* Sun */ #else /* Not UNIX */ # if defined (VMS) - + # include time # include descrip extime( string ) struct dsc$descriptor_s *string; - + # else /* not VMS */ - + # endif /* VMS */ #endif /* UNIX */ ----------------------------------- +---------------------------------- Again, there are a number of observations to be made here: a) The string passing mechanisms are different for each - architecture. + architecture. b) The convention of including ``header'' files is addressed on a machine to machine basis. I found that this was the most expedient way to handle them. diff --git a/packages/seacas/libraries/supes/ext_lib/excpus.c b/packages/seacas/libraries/supes/ext_lib/excpus.c index 581d76391a3f..07e3ed6a1e4d 100644 --- a/packages/seacas/libraries/supes/ext_lib/excpus.c +++ b/packages/seacas/libraries/supes/ext_lib/excpus.c @@ -2,11 +2,10 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /* - * $Id: excpus.c,v 1.26 2008/03/14 13:22:35 gdsjaar Exp $ */ /* diff --git a/packages/seacas/libraries/supes/ext_lib/exdate.c b/packages/seacas/libraries/supes/ext_lib/exdate.c index 09ba8bb5dda0..2bd4ca7da3f6 100644 --- a/packages/seacas/libraries/supes/ext_lib/exdate.c +++ b/packages/seacas/libraries/supes/ext_lib/exdate.c @@ -2,31 +2,30 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /* - * $Id: exdate.c,v 1.19 2008/03/14 13:22:36 gdsjaar Exp $ */ /* C DESCRIPTION: C This routine returns the current date in a character string. The C format is as follows: -C + C YYYYMMDD -C + C MM is a two digit month C DD is a two digit day C YYYY is a four digit year -C + C This is known as the "Compact ISO 8601 format" -C + C FORMAL PARAMETERS: C STRING CHARACTER String to receive the date -C + ************************************************************************ -C + */ #define STRLEN 8 diff --git a/packages/seacas/libraries/supes/ext_lib/exmemy.c b/packages/seacas/libraries/supes/ext_lib/exmemy.c index 33137359f9c5..b760c5715692 100644 --- a/packages/seacas/libraries/supes/ext_lib/exmemy.c +++ b/packages/seacas/libraries/supes/ext_lib/exmemy.c @@ -2,11 +2,10 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /* - * $Id: exmemy.c,v 1.19 2008/12/17 22:47:19 gdsjaar Exp $ */ /* diff --git a/packages/seacas/libraries/supes/ext_lib/exname.c b/packages/seacas/libraries/supes/ext_lib/exname.c index fcaba68f3d15..4fc10dbabb99 100644 --- a/packages/seacas/libraries/supes/ext_lib/exname.c +++ b/packages/seacas/libraries/supes/ext_lib/exname.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ @@ -131,12 +131,12 @@ C OPEN statement. If IUNIT .LE. 0, the returned name is the value of C a system symbol. It is assumed that the unit/file name or symbol C linkage will be passed to this routine during program execution. C A null string (LN = 0) will be returned if no name is available. -C + C FORMAL PARAMETERS: C IUNIT INTEGER Logical Unit Number ( >0 ) C or Symbol ID ( = -IUNIT ) C NAME CHARACTER File Name C LN INTEGER Length of File Name -C + ************************************************************************ */ diff --git a/packages/seacas/libraries/supes/ext_lib/exparm.c b/packages/seacas/libraries/supes/ext_lib/exparm.c index f8aba9a0d391..b343538769ed 100644 --- a/packages/seacas/libraries/supes/ext_lib/exparm.c +++ b/packages/seacas/libraries/supes/ext_lib/exparm.c @@ -2,11 +2,10 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /* - * $Id: exparm.c,v 1.26 2008/03/14 13:22:37 gdsjaar Exp $ */ /* diff --git a/packages/seacas/libraries/supes/ext_lib/exread.c b/packages/seacas/libraries/supes/ext_lib/exread.c index 40f5b86be91f..91a319008147 100644 --- a/packages/seacas/libraries/supes/ext_lib/exread.c +++ b/packages/seacas/libraries/supes/ext_lib/exread.c @@ -2,11 +2,10 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /* - * $Id: exread.c,v 1.20 2008/05/05 19:42:09 gdsjaar Exp $ */ #include "fortranc.h" @@ -34,7 +33,7 @@ void exread(char *prompt, char *input, FTNINT *iostat, long int PromptLength, lo /* ************************************************************************ -C + C DESCRIPTION: C This routine prompts, reads, and echos from the standard input C device. For an interactive job, this would prompt for input from @@ -43,12 +42,12 @@ C job, this would read from the main input file and echo to the C log file with the prompt string as a prefix. This routine should C assume the burden of assuring that the standard input and output C devices are properly opened. -C + C FORMAL PARAMETERS: C PROMPT CHARACTER Prompt String C INPUT CHARACTER Input String C IOSTAT INTEGER I/O Status ( -1 = EOF, 0 = normal ) -C + ************************************************************************ */ { diff --git a/packages/seacas/libraries/supes/ext_lib/extime.c b/packages/seacas/libraries/supes/ext_lib/extime.c index 69f2845388ea..66b419153431 100644 --- a/packages/seacas/libraries/supes/ext_lib/extime.c +++ b/packages/seacas/libraries/supes/ext_lib/extime.c @@ -2,31 +2,30 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /* - * $Id: extime.c,v 1.16 2008/03/14 13:22:38 gdsjaar Exp $ */ /* ************************************************************************ -C + C DESCRIPTION: C This routine returns the current time in a CHARACTER string. The C format is as follows: -C + C HH:MM:SS -C + C HH is a two digit hour C MM is a two digit minute C SS is a two digit second -C + C FORMAL PARAMETERS: C STRING CHARACTER String to receive the time -C + ************************************************************************ -C + */ #define STRLEN 8 diff --git a/packages/seacas/libraries/supes/ext_lib/exupcs.c b/packages/seacas/libraries/supes/ext_lib/exupcs.c index 149386ba87ed..b0f2ab76a926 100644 --- a/packages/seacas/libraries/supes/ext_lib/exupcs.c +++ b/packages/seacas/libraries/supes/ext_lib/exupcs.c @@ -2,11 +2,10 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /* - * $Id: exupcs.c,v 1.12 2008/03/14 13:22:38 gdsjaar Exp $ */ #include diff --git a/packages/seacas/libraries/supes/ext_lib/getline_int.c b/packages/seacas/libraries/supes/ext_lib/getline_int.c index 73f0d67274a5..186a83bbe274 100644 --- a/packages/seacas/libraries/supes/ext_lib/getline_int.c +++ b/packages/seacas/libraries/supes/ext_lib/getline_int.c @@ -1,10 +1,9 @@ -/* Based on: "$Id: getline.c,v 3.11 1993/12/02 15:54:31 thewalt Exp thewalt $"; */ /* * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/supes/ext_lib/getline_int.h b/packages/seacas/libraries/supes/ext_lib/getline_int.h index ef92862902e6..4af9fc4c9654 100644 --- a/packages/seacas/libraries/supes/ext_lib/getline_int.h +++ b/packages/seacas/libraries/supes/ext_lib/getline_int.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/supes/ext_lib/ixlchr.c b/packages/seacas/libraries/supes/ext_lib/ixlchr.c index 05a2989df5ba..0f7e5364452a 100644 --- a/packages/seacas/libraries/supes/ext_lib/ixlchr.c +++ b/packages/seacas/libraries/supes/ext_lib/ixlchr.c @@ -2,11 +2,10 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /* - * $Id: ixlchr.c,v 1.13 2008/03/14 13:22:39 gdsjaar Exp $ */ #include "fortranc.h" @@ -20,14 +19,14 @@ FTNINT ixlchr(long *chrvar) } /* -C + ************************************************************************ C DESCRIPTION: C This function returns the absolute location of a character variable. C This location must be measured in character storage units. -C + C FORMAL PARAMETERS: C CHRVAR CHARACTER Character Variable ************************************************************************ -C + */ diff --git a/packages/seacas/libraries/supes/ext_lib/ixlnum.c b/packages/seacas/libraries/supes/ext_lib/ixlnum.c index 366cde053446..c2d740ff146b 100644 --- a/packages/seacas/libraries/supes/ext_lib/ixlnum.c +++ b/packages/seacas/libraries/supes/ext_lib/ixlnum.c @@ -2,11 +2,10 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /* - * $Id: ixlnum.c,v 1.14 2008/03/14 13:22:39 gdsjaar Exp $ */ #include "fortranc.h" @@ -22,15 +21,15 @@ FTNINT ixlnum(long *numvar) /* INTEGER FUNCTION IXLNUM( NUMVAR ) -C + ************************************************************************ -C + C DESCRIPTION: C This function returns the absolute location of a numeric variable. C This location must be measured in numeric storage units. -C + C FORMAL PARAMETERS: C NUMVAR INTEGER Numeric Variable -C + ************************************************************************ */ diff --git a/packages/seacas/libraries/supes/exttest.f b/packages/seacas/libraries/supes/exttest.f index ccb6ced3a835..528194941c39 100644 --- a/packages/seacas/libraries/supes/exttest.f +++ b/packages/seacas/libraries/supes/exttest.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details PROGRAM TSTEXT diff --git a/packages/seacas/libraries/supes/ffrtest.f b/packages/seacas/libraries/supes/ffrtest.f index 7e1ddfbcd1a9..ce05f88486b6 100644 --- a/packages/seacas/libraries/supes/ffrtest.f +++ b/packages/seacas/libraries/supes/ffrtest.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details PROGRAM FFRTEST PARAMETER (MFIELD=5) diff --git a/packages/seacas/libraries/supes/fortranc.h b/packages/seacas/libraries/supes/fortranc.h index 17c5e96f44b3..2dbe2bcdada9 100644 --- a/packages/seacas/libraries/supes/fortranc.h +++ b/packages/seacas/libraries/supes/fortranc.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /* diff --git a/packages/seacas/libraries/supes/fre_fld/ffistr.f b/packages/seacas/libraries/supes/fre_fld/ffistr.f index e67eafb00fd5..bacf8e015b23 100644 --- a/packages/seacas/libraries/supes/fre_fld/ffistr.f +++ b/packages/seacas/libraries/supes/fre_fld/ffistr.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details SUBROUTINE FFISTR( LINE,MFIELD,IDCONT,NFIELD,KVALUE,CVALUE,IVALUE, * RVALUE ) @@ -12,11 +12,11 @@ SUBROUTINE FFISTR( LINE,MFIELD,IDCONT,NFIELD,KVALUE,CVALUE,IVALUE, INTEGER TABC TABC = 9 -C + ************************************************************************ -C + C FREFLD INPUT SYSTEM - ANSI FORTRAN - USER INTERFACE ROUTINE -C + C DESCRIPTION: C This routine is the main parsing routine of the SUPES Free Field C Input system. It parses a CHARACTER string into data fields, and @@ -24,7 +24,7 @@ SUBROUTINE FFISTR( LINE,MFIELD,IDCONT,NFIELD,KVALUE,CVALUE,IVALUE, C value which indicates whether the character and numeric values C were explicitly defined by a valid string or simply set to a C default blank or zero is also returned. -C + C FORMAL PARAMETERS: C LINE CHARACTER Input string. C MFIELD INTEGER Maximum number of data fields to be returned. @@ -38,18 +38,17 @@ SUBROUTINE FFISTR( LINE,MFIELD,IDCONT,NFIELD,KVALUE,CVALUE,IVALUE, C CVALUE CHARACTER Character values of the data fields. C RVALUE REAL Floating-point values of the data fields. C IVALUE INTEGER Integer values of the data fields. -C -C + C ROUTINES CALLED: C STRIPB Strip leading/trailing blanks from a string. C EXUPCS Convert a string to ANSI FORTRAN character set. C QUOTED Process a quoted string. -C + ************************************************************************ -C + C Initialize output arrays to their default values and zero field C counter, unless IDCONT indicates that this is a continuation record. -C + IF ( IDCONT .EQ. 0 ) THEN DO 300 I = 1 , MFIELD KVALUE(I) = -1 @@ -60,63 +59,62 @@ SUBROUTINE FFISTR( LINE,MFIELD,IDCONT,NFIELD,KVALUE,CVALUE,IVALUE, NFIELD = 0 END IF IDCONT = 0 -C ************************************************************************ -C + C Isolate the effective portion of the input line. At the end C of this phase LINE(ILEFT:ISTOP) will represent this portion. C The continuation flag IDCONT will indicate whether or not a C continuation line is to follow this record. Exit at any C point where the effective portion of the line becomes null. -C + ILEFT = 1 ISTOP = LEN ( LINE ) -C + C Now start processing fields. C Upper range of loop is a dummy maximum. -C + c Had to fix more VAX FORTRAN specific stuff. We'll try this only c for a short while. JRR. -c + DO 1 IFLD = 1, ISTOP -C + CALL STRIPB( LINE(ILEFT:ISTOP), IL, ISTOP ) ISTOP = ISTOP + ILEFT - 1 ILEFT = IL + ILEFT - 1 IF ( ILEFT .GT. ISTOP ) THEN -C + C Remainder of line is null. -C + RETURN ELSE IF ( LINE(ILEFT:ILEFT) .EQ. '$' ) THEN -C + C Rest is comment. -C + RETURN ELSE IF ( LINE(ILEFT:ILEFT) .EQ. '*' ) THEN -C + C Continuation. -C + IDCONT = 1 RETURN ELSE IF ( LINE(ILEFT:ILEFT) .EQ. '''' ) THEN -C + C This is the beginning of a quoted string. Call a special handler. -C + CALL QUOTED ( LINE(ILEFT:ISTOP), IL, IRIGHT ) IF ( IRIGHT .NE. 0 ) IRIGHT = IRIGHT + ILEFT - 1 ILEFT = IL+ ILEFT - 1 ELSE IF ( INDEX ( ',=', LINE(ILEFT:ILEFT) ) .NE. 0 ) THEN -C + C This is a null field. -C + IRIGHT = 0 ELSE -C + C Find the end of this token. C Valid delimiters, are ' ', '*', ',', '=', '$'. -C + IBLNK = INDEX ( LINE(ILEFT:ISTOP), ' ' ) + ILEFT - 2 IAST = INDEX ( LINE(ILEFT:ISTOP), '*' ) + ILEFT - 2 ICOMA = INDEX ( LINE(ILEFT:ISTOP), ',' ) + ILEFT - 2 @@ -132,43 +130,43 @@ SUBROUTINE FFISTR( LINE,MFIELD,IDCONT,NFIELD,KVALUE,CVALUE,IVALUE, IF ( ITAB .LT. ILEFT ) ITAB = ISTOP + 1 IRIGHT = MIN ( IBLNK, IAST, ICOMA, IEQLS, IDOLR, $ ITAB, ISTOP ) -C + C Convert data to standard character set - -C + CALL EXUPCS( LINE(ILEFT:IRIGHT) ) END IF -C + C Process this field. C Don't process this field unless there is room in the data arrays - -C + NFIELD = NFIELD + 1 IF ( NFIELD .LE. MFIELD ) THEN -C + C Calculate the effective length of this field - -C + LFIELD = IRIGHT - ILEFT + 1 IF ( LFIELD .LE. 0 ) THEN -C + C This is a null field; skip it - -C + ELSE IF ( LFIELD .GT. 32 ) THEN -C + C This field exceeds the maximum allowable numeric C field size; define only the character value - -C + CVALUE(NFIELD) = LINE(ILEFT:IRIGHT) KVALUE(NFIELD) = 0 ELSE -C + C Define the character value for this field, C then right-justify and attempt numeric translations - -C + CVALUE(NFIELD) = LINE(ILEFT:IRIGHT) KVALUE(NFIELD) = 0 CFIELD = ' ' IJUST = 32 - LFIELD + 1 CFIELD(IJUST:32) = LINE(ILEFT:IRIGHT) -C + C See if a digit is present in this field. C If there is no digit present, then do not accept C this token as a valid real or integer value. @@ -197,48 +195,48 @@ SUBROUTINE FFISTR( LINE,MFIELD,IDCONT,NFIELD,KVALUE,CVALUE,IVALUE, ELSE IDIG = 0 END IF -C + C ... It should not be necessary to initialize ITRANS, but the gcc-4.0.0 gfortran C Does not correctly set ITRANS after the first execution if it is non-zero. C It seems to work correctly if initialized to zero. ITRANS = 0 READ( CFIELD,3000,IOSTAT=ITRANS ) RFIELD IF ( IDIG .EQ. 1 .AND. ITRANS .EQ. 0 ) THEN -C + C This field has a valid floating-point value - -C + RVALUE(NFIELD) = RFIELD KVALUE(NFIELD) = 1 END IF READ( CFIELD,4000,IOSTAT=ITRANS ) IFIELD IF ( IDIG .EQ. 1 .AND. ITRANS .EQ. 0 ) THEN -C + C This field has a valid integer value - -C + IVALUE(NFIELD) = IFIELD KVALUE(NFIELD) = 2 ELSE IF ( KVALUE(NFIELD) .EQ. 1 .AND. * ABS ( RVALUE(NFIELD) ) .LE. 1.E9 ) THEN -C + C This field has a valid real that did not automatically C Translate to an integer. Try to convert the real to an C integer. -C + IFIELD = RVALUE(NFIELD) RFIELD = IFIELD IF ( RFIELD .EQ. RVALUE(NFIELD) ) THEN -C + C Successful conversion of real to integer. -C + IVALUE(NFIELD) = IFIELD KVALUE(NFIELD) = 2 END IF END IF END IF END IF -C + C Remove any trailing delimiters before looping. -C + IF ( IRIGHT .GT. 0 ) ILEFT = MAX ( ILEFT, IRIGHT ) + 1 IF ( ILEFT .GT. ISTOP ) RETURN CALL STRIPB( LINE(ILEFT:ISTOP), IL, ISTOP ) @@ -249,11 +247,11 @@ SUBROUTINE FFISTR( LINE,MFIELD,IDCONT,NFIELD,KVALUE,CVALUE,IVALUE, * ILEFT = ILEFT + 1 IF ( ILEFT .GT. ISTOP ) RETURN 1 continue -c + c The end of the VAX FORTRAN DO Loop that I commented out. jrr. -c + c END DO 3000 FORMAT( F32.0 ) 4000 FORMAT( I32 ) -C + END diff --git a/packages/seacas/libraries/supes/fre_fld/frefld.f b/packages/seacas/libraries/supes/fre_fld/frefld.f index ebfbfb9a7065..5452b58f5819 100644 --- a/packages/seacas/libraries/supes/fre_fld/frefld.f +++ b/packages/seacas/libraries/supes/fre_fld/frefld.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details SUBROUTINE FREFLD( KIN,KOUT,PROMPT,MFIELD,IOSTAT,NFIELD,KVALUE, * CVALUE,IVALUE,RVALUE ) @@ -10,16 +10,16 @@ SUBROUTINE FREFLD( KIN,KOUT,PROMPT,MFIELD,IOSTAT,NFIELD,KVALUE, CHARACTER*132 PREFIX INTEGER KVALUE(MFIELD),IVALUE(MFIELD) REAL RVALUE(MFIELD) -C + ************************************************************************ -C + C FREFLD INPUT SYSTEM - ANSI FORTRAN - USER INTERFACE ROUTINE -C + C DESCRIPTION: C This routine is the main user interface to the SUPES Free Field C Input system. It obtains a record from the input stream, then C call FFISTR to parse the record into data fields. -C + C FORMAL PARAMETERS: C KIN INTEGER Unit from which to read input. C KOUT INTEGER Unit to which to echo input. @@ -35,18 +35,17 @@ SUBROUTINE FREFLD( KIN,KOUT,PROMPT,MFIELD,IOSTAT,NFIELD,KVALUE, C CVALUE CHARACTER Character values of the data fields. C RVALUE REAL Floating-point values of the data fields. C IVALUE INTEGER Integer values of the data fields. -C -C + C ROUTINES CALLED: C GETINP Get input line. C FFISTR Parse input line. -C + ************************************************************************ -C + C PHASE 1: Initialize output arrays to their default values and zero C field counter. Set continuation flag to suppress further C initialization by FFISTR. -C + DO 300 I = 1 , MFIELD KVALUE(I) = -1 CVALUE(I) = ' ' @@ -55,29 +54,29 @@ SUBROUTINE FREFLD( KIN,KOUT,PROMPT,MFIELD,IOSTAT,NFIELD,KVALUE, 300 CONTINUE NFIELD = 0 IDCONT = 1 -C + C Initialize prompt to the caller's - PREFIX = PROMPT LPRE = LEN( PROMPT ) -C + ************************************************************************ -C + C PHASE 2: Get the next input record via GETINP. Return to caller if an C end-of-file or error was detected by GETINP. C Re-enter here to process a continuation line. -C + 500 CONTINUE -C + C Get the next input line - CALL GETINP( KIN,KOUT,PREFIX(1:LPRE),LINE,IOSTAT ) -C + C Return if I/O error or EOF detected - IF ( IOSTAT .NE. 0 ) RETURN -C + C Call FFISTR to parse input record - CALL FFISTR( LINE,MFIELD,IDCONT,NFIELD,KVALUE,CVALUE,IVALUE, * RVALUE ) -C + C If the continuation flag is set, define a continuation prompt and C re-enter at phase 2. Otherwise, return to the caller - IF ( IDCONT .NE. 0 ) THEN @@ -90,5 +89,5 @@ SUBROUTINE FREFLD( KIN,KOUT,PROMPT,MFIELD,IOSTAT,NFIELD,KVALUE, END IF GO TO 500 END IF -C + END diff --git a/packages/seacas/libraries/supes/fre_fld/getinp.f b/packages/seacas/libraries/supes/fre_fld/getinp.f index f0bd7469ac66..b2aed95a2d06 100644 --- a/packages/seacas/libraries/supes/fre_fld/getinp.f +++ b/packages/seacas/libraries/supes/fre_fld/getinp.f @@ -1,49 +1,49 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details SUBROUTINE GETINP( KIN,KOUT,PROMPT,LINE,IOSTAT ) CHARACTER*(*) PROMPT,LINE CHARACTER*132 PREFIX DATA KOUNT /0/ -C + ************************************************************************ -C + C FREFLD INPUT SYSTEM - ANSI FORTRAN - UTILITY ROUTINE -C + C DESCRIPTION: C This routine is performs all I/O for the SUPES Free Field Input C system. Its operation depends on the input and output units C specified by the caller as follows. -C + C KIN KOUT Source Echo C ------------------------------------------------------------------ C 0 0 Standard Input Standard Output C 0 M Standard Input Standard Output and File (M) C N M File (N) File (N) C N 0 File (N) none -C + C If the prompt string is 'AUTO' this routine will generate a prompt C of the form ' n: ', where "n" is the current input line number. C Only lines read under the AUTO feature are counted. -C + C This routine does not restrict the length of the input string, but C no more than 132 characters, including the prompt, will be echoed. -C + C FORMAL PARAMETERS: C KIN INTEGER Unit from which to read input. C KOUT INTEGER Unit to which to echo input. C PROMPT CHARACTER Prompt string. C LINE CHARACTER Input record. C IOSTAT INTEGER ANSI FORTRAN I/O status. -C + C ROUTINES CALLED: C STRIPB Strip leading/trailing blanks from a string. C EXREAD Prompt, read, and echo and input record. -C + ************************************************************************ -C + C Generate a prompt if autoincrement mode is requested; in any case C PREFIX(1:LPRE) will contain the prompt - IF( PROMPT .EQ. 'AUTO' ) THEN @@ -56,23 +56,23 @@ SUBROUTINE GETINP( KIN,KOUT,PROMPT,LINE,IOSTAT ) PREFIX = PROMPT LPRE = LEN( PROMPT ) END IF -C + C Read the input line - IF ( KIN .EQ. 0 ) THEN CALL EXREAD( PREFIX(1:LPRE),LINE,IOSTAT ) ELSE READ( KIN,2000,IOSTAT=IOSTAT ) LINE END IF -C + C Return if I/O error or EOF detected - IF ( IOSTAT .NE. 0 ) RETURN -C + C Find the last non-blank character - CALL STRIPB( LINE,ILEFT,IRIGHT ) -C + C Truncate the string for echo, if necessary - IRIGHT = MIN( IRIGHT,132-LPRE ) -C + C Echo the input line, if requested - IF ( KOUT .GT. 0 ) THEN IF ( IRIGHT .EQ. 0 ) THEN @@ -81,9 +81,9 @@ SUBROUTINE GETINP( KIN,KOUT,PROMPT,LINE,IOSTAT ) WRITE( KOUT,3000 ) PREFIX(1:LPRE),LINE(1:IRIGHT) END IF END IF -C + 1000 FORMAT( I4,': ' ) 2000 FORMAT( A ) 3000 FORMAT( 1X,A,A ) -C + END diff --git a/packages/seacas/libraries/supes/fre_fld/gsupev.f b/packages/seacas/libraries/supes/fre_fld/gsupev.f index c28cce510d51..a02ed813e8d2 100644 --- a/packages/seacas/libraries/supes/fre_fld/gsupev.f +++ b/packages/seacas/libraries/supes/fre_fld/gsupev.f @@ -1,23 +1,22 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE GSUPEV (STRING) C======================================================================= -C$Id: gsupev.f,v 1.16 2008/12/17 22:47:19 gdsjaar Exp $ -C + C*********************************************************************** -C + C *** GSUPEV *** Returns current version number of the supes library C Get SUPEs Version number C Parameters: C STRING - OUT - string containing versions of supes -C + C Version Number Format: C n1.n2.n3 -C + C where n1 is the major version number C n2 is the minor version or change capability number C n3 is the bug-fix number diff --git a/packages/seacas/libraries/supes/fre_fld/quoted.f b/packages/seacas/libraries/supes/fre_fld/quoted.f index 92638245cb76..c37d52c59c57 100644 --- a/packages/seacas/libraries/supes/fre_fld/quoted.f +++ b/packages/seacas/libraries/supes/fre_fld/quoted.f @@ -1,57 +1,57 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details SUBROUTINE QUOTED ( LINE, ILEFT, IRIGHT ) -C + CHARACTER*(*) LINE -C + CALL STRIPB ( LINE, ILEFT, IRIGHT ) -C + C The first character is required to be a quote, so remove it. -C + LINE(1:1) = ' ' ILEFT = 2 IBEGIN = 2 -C + C Begin loop looking for more quotes. There should be at least 1 more. -C + 100 CONTINUE IQUOTE = INDEX ( LINE(IBEGIN:IRIGHT), '''' ) -C + C Has the quote ended within this record? -C + IF ( IQUOTE .EQ. 0 ) THEN IF ( ILEFT .GT. IRIGHT ) IRIGHT = 0 RETURN END IF -C + IQUOTE = IQUOTE + IBEGIN - 1 IF ( IQUOTE .EQ. IRIGHT ) THEN -C + C The quote is at the end of the record. -C + LINE(IRIGHT:IRIGHT) = ' ' IRIGHT = IQUOTE - 1 IF ( ILEFT .GT. IRIGHT ) IRIGHT = 0 RETURN END IF -C + C The quote is internal -- check for double quote. -C + IF ( LINE(IQUOTE+1:IQUOTE+1) .NE. '''' ) THEN -C + C The quote is single, thus ending the quoted string. -C + LINE(IQUOTE:IQUOTE) = ' ' IRIGHT = IQUOTE - 1 IF ( ILEFT .GT. IRIGHT ) IRIGHT = 0 RETURN END IF -C + C The quote is a double quote. Remove the repeated quote and loop. -C + DO 10 I = IQUOTE, ILEFT, -1 LINE(I+1:I+1) = LINE(I:I) 10 CONTINUE diff --git a/packages/seacas/libraries/supes/fre_fld/stripb.f b/packages/seacas/libraries/supes/fre_fld/stripb.f index 6ef2ba1fb640..6839224885c9 100644 --- a/packages/seacas/libraries/supes/fre_fld/stripb.f +++ b/packages/seacas/libraries/supes/fre_fld/stripb.f @@ -1,29 +1,29 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details SUBROUTINE STRIPB( STRING,ILEFT,IRIGHT ) CHARACTER*(*) STRING -C + ************************************************************************ -C + C FREFLD INPUT SYSTEM - ANSI FORTRAN - UTILITY ROUTINE -C + C DESCRIPTION: C This routine strips leading and trailing blanks from a string. It C does not modify or copy the string, but simply returns the C location of the first and last non-blank characters. If the C string is completely blank, ILEFT=LEN(STRING)+1 and IRIGHT=0 will C be returned. -C + C FORMAL PARAMETERS: C STRING CHARACTER Any character string. C ILEFT INTEGER Position of first non-blank character. C IRIGHT INTEGER Position of last non-blank character. -C + ************************************************************************ -C + C ... Needed for 64-bit Solaris compile. Arg to CHAR must be C an integer of correct size. @@ -32,7 +32,7 @@ SUBROUTINE STRIPB( STRING,ILEFT,IRIGHT ) C Get length of the string - LS = LEN( STRING ) -C + C Find the first non-blank character - DO 10 N = 1 , LS IF ( STRING(N:N) .NE. ' ' @@ -40,7 +40,7 @@ SUBROUTINE STRIPB( STRING,ILEFT,IRIGHT ) 10 CONTINUE 15 CONTINUE ILEFT = N -C + C Find the last non-blank character - DO 20 N = LS , 1 , -1 IF ( STRING(N:N) .NE. ' ' @@ -48,5 +48,5 @@ SUBROUTINE STRIPB( STRING,ILEFT,IRIGHT ) 20 CONTINUE 25 CONTINUE IRIGHT = N -C + END diff --git a/packages/seacas/libraries/supes/mem_mgr/mdinit.F b/packages/seacas/libraries/supes/mem_mgr/mdinit.F index 480a0e263e6d..1a8b2604820a 100644 --- a/packages/seacas/libraries/supes/mem_mgr/mdinit.F +++ b/packages/seacas/libraries/supes/mem_mgr/mdinit.F @@ -1,111 +1,111 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details SUBROUTINE MDINIT (USERV) -C + C THIS SUBPROGRAM PROVIDES DATA MANAGEMENT WITH DYNAMIC MEMORY C ALLOCATION CAPABILITIES. THE ENTIRE PACKAGE IS WRITTEN IN C STANDARD FORTRAN-77 WITH THE EXCEPTION OF TWO SYSTEM DEPENDENT C SUBPROGRAMS: IXLNUM AND EXMEMY. -C + C ENTRY POINTS: -C + C MDINIT (USERV) C MCINIT (UCHAR) C Initializes the data manager and calculates the offset of the C users base vector. -C + C MDCOMP C MCCOMP C Compresses all storage to consolidate the voids within a C memory block. -C + C MDDEBG (UNIT) C MCDEBG (UNIT) C Turns on immediate error output at the time an error is triggered. -C + C MDDEL (NAME1) C MCDEL (NAME1) C "Deletes" (frees the storage of) an array. -C + C MDEFIX (ENUM, COUNT) C MCEFIX (ENUM, COUNT) C Resets the error counter for a particular error flag. -C + C MDEROR (UNIT) C MCEROR (UNIT) C Prints an error summary. -C + C MDERPT (ENUM, COUNT) C MCERPT (ENUM, COUNT) C Returns the error count for a particular error flag. -C + C MCEXEC () C MDEXEC () C Turns off deferred allocation and resolves all deferred requests. -C + C MDFILL (TFILL) C MCFILL (NAME1) C Turns on data initialization to a specific value. -C + C MDFIND (NAME1, NEWLOC, NEWLEN) C MCFIND (NAME1, NEWLOC, NEWLEN) C Reports the location and length of an array. -C + C MDFOFF () C MCFOFF () C Turns off data initialization. -C + C MDGET (MNGET) C MCGET (MNGET) C Requests a contiguous block of storage. -C + C MDGIVE C MCGIVE C Returns storage to the system under certain conditions. -C + C MDLAST (ENUM) C MCLAST (ENUM) C Returns the flag number of the last error. -C + C MDLIST (UNIT) C MCLIST (UNIT) C Prints a storage summary. -C + C MDLONG (NAME1, NEWLOC, NEWLEN) C MCLONG (NAME1, NEWLOC, NEWLEN) C Changes the length of an array. -C + C MDNAME (NAME1, NAME2) C MCNAME (NAME1, TNAME2) C Changes the name of an array. -C + C MDMEMS (NSUA, NSUD, NSUV, NSULV) C Reports numeric storage information. -C + C MCMEMS (NSUA, NSUD, NSUV, NSULV) C Reports character storage information. -C + C MDPRNT (NAME1, UNIT, NAME2) C MCPRNT (NAME1, UNIT, NEWLEN) C Prints an array. -C + C MDRSRV (NAME1, NEWLOC, NEWLEN) C MCRSRV (NAME1, NEWLOC, NEWLEN) C Reserves space for an array and reports the storage location. -C + C MDSTAT (MNERRS, MNUSED) C MCSTAT (MNERRS, MNUSED) C Reports on accumulated errors and space used. -C + C MCWAIT () C MDWAIT () C Turns on deferred allocation mode. -C + C Associated subroutines: -C + C IXLCHR MXLIST MYLONG C MDINIT MXLONG MYMEMY C MEMTEST MXLOOK MYNSRT @@ -116,18 +116,17 @@ SUBROUTINE MDINIT (USERV) C MXFIND MYDEL SRCHC C MXGET MYFIND SRCHI C MXGIVE MYGET VTABLE -C -C + IMPLICIT INTEGER (A-Z) -C + C Dictionary and tables lengths. -C + C LDICT Maximum number of dictionary entries/allocated arrays. -C + C LVOID Maximum number of voids. -C + C These parameters may be changed independently. -C + PARAMETER (LPDICT=256, LPVOID=2048) CHARACTER*8 DICT(LPDICT, 2) DIMENSION DPOINT(LPDICT, 2, 3) @@ -142,55 +141,54 @@ SUBROUTINE MDINIT (USERV) C * 2: SIZE (IN NUMERIC UNITS FOR MIXED MODE) C *> 1: NUMERIC C 2: CHARACTER FOR NON MIXED MODE -C + C The strategy for the above arrays is to fix the second dimension C at 1 for mixed mode, but let the first dimension "overrun" so C that the storage is usable. In nonmixed mode, the first dimension C will not overrun and the character stuff will use a value of 2 for C for the second dimension. The mixed vs. nonmixed mode is C indicated by the variable CHRCOL. (1 = mixed, 2 = nonmixed) -C + INCLUDE 'params.inc' DIMENSION ERRVEC(NERVEC) -C + C Internal base vectors. C All pointers in the tables are relative to these base vectors, and C an offset to the users base vector is maintained to give the C user the correct pointer to the users base vector. They are C equivalenced to allow printing as real or integer (see mdprnt). -C #if __GFORTRAN__ && __GNUC__ == 10 -C ... For some reason, gfortran-10 needs this SAVE in addition to later save... +C ... For some reason, gfortran-10 needs this SAVE in addition to later save... save myv #endif double precision dmyv(1) REAL RMYV(1) equivalence (dmyv,rmyv) -c + DIMENSION MYV(1) EQUIVALENCE (MYV,RMYV) -c + PARAMETER (MAXSIZ=2) CHARACTER*1 MYCHAR(MAXSIZ), CFDATA C COMMON /EXTCLB/ MYCHAR -C + LOGICAL INIT, CINIT, DEFER, DEFROK, FILL, CFILL -C + C Users base vector. This is an argument in the entry point C MDINIT. -C + DIMENSION USERV(1) CHARACTER*1 UCHAR(1) -C + PARAMETER (NCOLP=132) CHARACTER*8 NAME1, NAME2, NAMET CHARACTER*(*) TNAME1, TNAME2 DIMENSION NVOIDS(2), NNAMES(2) SAVE -C + C Data initialization -C + DATA NVOIDS /2*0/, NNAMES /2*0/ DATA ERRVEC /NERVEC*0/ DATA INIT /.FALSE./, CINIT /.FALSE./, @@ -199,26 +197,26 @@ SUBROUTINE MDINIT (USERV) DATA EUNIT /0/ DATA LERROR /0/ DATA CHRCOL /1/ -C + LDICT = 2 * LPDICT LVOID = 2 * LPVOID -C + C Get the offset between "USERV" and "MYV". All internal C information is in terms of "MYV" since most operations are done C with this base address. -C + MYLOC = IXLNUM (MYV(1)) ULOC = IXLNUM (USERV(1)) OFFSET = MYLOC - ULOC -C + C Check to see if deferred mode will be allowed. This requires C a functioning IXLNUM. C IF (IXLNUM(NVOIDS(1)) .NE. IXLNUM(NVOIDS(2))) DEFROK = .TRUE. C ... Using malloc/free -- ignore deferred mode DEFROK = .false. -C + C Was MDINIT previously called? -C + IF (INIT) THEN LASTER = REINIT IF (EUNIT .GT. 0) WRITE (EUNIT, *)'SECOND CALL TO MDINIT NOT ', @@ -230,15 +228,15 @@ SUBROUTINE MDINIT (USERV) ERRVEC(LASTER) = ERRVEC(LASTER) + 1 IF (LASTER .NE. SUCESS) LERROR = LASTER RETURN -C + C*********************************************************************** -C + ENTRY MCINIT (UCHAR) -C + C*********************************************************************** -C + C Was MDINIT previously called? -C + IF (.NOT. INIT) THEN LASTER = NOINIT ERRVEC(LASTER) = ERRVEC(LASTER) + 1 @@ -246,20 +244,20 @@ SUBROUTINE MDINIT (USERV) * 'CALLING MCINIT.' RETURN END IF -C + MYCLOC = IXLCHR (MYCHAR(1)) UCLOC = IXLCHR (UCHAR(1)) TEMP = IXLCHR (MYCHAR(2)) IF (MYCLOC .NE. TEMP) THEN -C + C Mixed mode - character and numeric data intermixed. -C + CALL EXPARM (NAMET, NAMET, I, CHRNUM, I, I) COFFST = CHRNUM * MYLOC - UCLOC ELSE -C + C Split mode - character and numeric data separate. -C + COFFST = 0 CHRCOL = 2 CHRNUM = 1 @@ -273,8 +271,7 @@ SUBROUTINE MDINIT (USERV) LASTER = SUCESS END IF END IF -C -C + ERRVEC(LASTER) = ERRVEC(LASTER) + 1 IF (LASTER .NE. SUCESS) THEN LERROR = LASTER @@ -286,15 +283,15 @@ SUBROUTINE MDINIT (USERV) CINIT = .TRUE. END IF RETURN -C + C*********************************************************************** -C + ENTRY MCCOMP -C + C*********************************************************************** -C + C Was MCINIT previously called? -C + IF (.NOT. CINIT) THEN LASTER = NOINIT IF (EUNIT .GT. 0) WRITE (EUNIT, *) 'MCINIT WAS NOT CALLED ', @@ -303,18 +300,18 @@ SUBROUTINE MDINIT (USERV) LERROR = LASTER RETURN END IF -C + C*********************************************************************** -C + ENTRY MDCOMP -C + C*********************************************************************** -C + C This section compresses all void space to the end of each block. C No attempt is made to shift storage between blocks. -C + C Was MDINIT previously called? -C + IF (.NOT. INIT) THEN LASTER = NOINIT ERRVEC(LASTER) = ERRVEC(LASTER) + 1 @@ -322,17 +319,17 @@ SUBROUTINE MDINIT (USERV) * 'CALLING MDCOMP.' RETURN END IF -C + C ... Using malloc/free -- ignore MCCOMP/MDDOMP Calls c CALL MXCOMP (MYV, VOID, LVOID, c * NVOIDS, DPOINT, LDICT, NNAMES, CHRCOL, LASTER) -C + c IF (LASTER .EQ. SUCESS .AND. CHRCOL .EQ. 2) THEN c CALL MYCOMP (MYCHAR, VOID, LVOID, c * NVOIDS, DPOINT, LDICT, NNAMES, CHRCOL, LASTER) c END IF -C + laster = SUCESS ERRVEC(LASTER) = ERRVEC(LASTER) + 1 IF (LASTER .NE. SUCESS) THEN @@ -342,32 +339,32 @@ SUBROUTINE MDINIT (USERV) WRITE (EUNIT, *) 'ERROR IN MDCOMP/MCCOMP.' END IF END IF -C + RETURN -C + C*********************************************************************** -C + ENTRY MCDEBG (UNIT) ENTRY MDDEBG (UNIT) -C + C*********************************************************************** -C + IF (UNIT .GE. 1) THEN EUNIT = UNIT ELSE EUNIT = 0 END IF RETURN -C + C*********************************************************************** -C + ENTRY MDDEL (TNAME1) -C + C*********************************************************************** -C + C This entry point deletes an entry from the dictionary and C inserts an entry in the void table. -C + NAMET = TNAME1 CALL EXUPCS (NAMET) CALL STRIPB (NAMET, LEFT, RIGHT) @@ -379,9 +376,9 @@ SUBROUTINE MDINIT (USERV) RETURN END IF NAME1 = NAMET(LEFT:RIGHT) -C + C Was MDINIT previously called? -C + IF (.NOT. INIT) THEN LASTER = NOINIT IF (EUNIT .GT. 0) WRITE (EUNIT, *) 'MDINIT WAS NOT CALLED ', @@ -390,10 +387,10 @@ SUBROUTINE MDINIT (USERV) LERROR = LASTER RETURN END IF -C + CALL MXDEL (NAME1, DICT, DPOINT, LDICT, NNAMES, VOID, * LVOID, NVOIDS, CHRCOL, LASTER, MYLOC) -C + if (eunit .gt. 0) then write (eunit,*) 'MDDEL: ', NAME1 end if @@ -406,16 +403,16 @@ SUBROUTINE MDINIT (USERV) END IF END IF RETURN -C + C*********************************************************************** -C + ENTRY MCDEL (TNAME1) -C + C*********************************************************************** -C + C This entry point deletes an entry from the dictionary and C inserts an entry in the void table. -C + NAMET = TNAME1 CALL EXUPCS (NAMET) CALL STRIPB (NAMET, LEFT, RIGHT) @@ -427,9 +424,9 @@ SUBROUTINE MDINIT (USERV) RETURN END IF NAME1 = NAMET(LEFT:RIGHT) -C + C Was MCINIT previously called? -C + IF (.NOT. CINIT) THEN LASTER = NOINIT IF (EUNIT .GT. 0) WRITE (EUNIT, *) 'MCINIT WAS NOT CALLED ', @@ -438,10 +435,10 @@ SUBROUTINE MDINIT (USERV) LERROR = LASTER RETURN END IF -C + CALL MYDEL (NAME1, DICT, DPOINT, LDICT, NNAMES, VOID, * LVOID, NVOIDS, CHRCOL, LASTER, MYLOC, MYCLOC) -C + if (eunit .gt. 0) then write (eunit,*) 'MCDEL: ', NAME1 end if @@ -454,18 +451,18 @@ SUBROUTINE MDINIT (USERV) END IF END IF RETURN -C + C*********************************************************************** -C + ENTRY MCEFIX (ENUM, COUNT) ENTRY MDEFIX (ENUM, COUNT) -C + C*********************************************************************** -C + C This resets the number of occurrences of a particular error. C If the requested error number (enum) is out of range, an error C is flagged. -C + IF (ENUM .GE. 1 .AND. ENUM .LE. NERVEC) THEN ERRVEC(ENUM) = COUNT LASTER = SUCESS @@ -477,32 +474,32 @@ SUBROUTINE MDINIT (USERV) LASTER = SUCESS ERRVEC(LASTER) = ERRVEC(LASTER) + 1 RETURN -C + C*********************************************************************** -C + ENTRY MCEROR (UNIT) ENTRY MDEROR (UNIT) -C + C*********************************************************************** -C + C This section prints the error codes. -C + CALL MXEROR (UNIT, LASTER, ERRVEC) LASTER = SUCESS ERRVEC(LASTER) = ERRVEC(LASTER) + 1 RETURN -C + C*********************************************************************** -C + ENTRY MCERPT (ENUM, COUNT) ENTRY MDERPT (ENUM, COUNT) -C + C*********************************************************************** -C + C This reports the number of occurrences of a particular error. C If the requested error number (ENUM) is out of range, a -1 C is returned. -C + IF (ENUM .GE. 1 .AND. ENUM .LE. NERVEC) THEN COUNT = ERRVEC(ENUM) ELSE @@ -511,15 +508,15 @@ SUBROUTINE MDINIT (USERV) LASTER = SUCESS ERRVEC(LASTER) = ERRVEC(LASTER) + 1 RETURN -C + C*********************************************************************** -C + ENTRY MCEXEC () -C + C*********************************************************************** -C + C Was MCINIT previously called? -C + IF (.NOT. CINIT) THEN LASTER = NOINIT ERRVEC(LASTER) = ERRVEC(LASTER) + 1 @@ -527,15 +524,15 @@ SUBROUTINE MDINIT (USERV) * 'CALLING MCEXEC.' RETURN END IF -C + C*********************************************************************** -C + ENTRY MDEXEC () -C + C*********************************************************************** -C + C Was MDINIT previously called? -C + IF (.NOT. INIT) THEN LASTER = NOINIT ERRVEC(LASTER) = ERRVEC(LASTER) + 1 @@ -543,7 +540,7 @@ SUBROUTINE MDINIT (USERV) * 'CALLING MDEXEC.' RETURN END IF -C + C ... Using malloc/free -- ignore MCEXEC/MDEXEC calls. c CALL MXEXEC (MYV, MYCHAR, MYLOC, MYCLOC, UCLOC, COFFST, @@ -561,16 +558,15 @@ SUBROUTINE MDINIT (USERV) END IF END IF RETURN -C + C*********************************************************************** -C + ENTRY MDFILL (TFILL) -C + C*********************************************************************** -C -C + C Was MDINIT previously called? -C + IF (.NOT. INIT) THEN LASTER = NOINIT ERRVEC(LASTER) = ERRVEC(LASTER) + 1 @@ -578,21 +574,20 @@ SUBROUTINE MDINIT (USERV) * 'CALLING MDFILL.' RETURN END IF -C + FDATA = TFILL FILL = .TRUE. ERRVEC(SUCESS) = ERRVEC(SUCESS) + 1 RETURN -C + C*********************************************************************** -C + ENTRY MCFILL (TNAME1) -C + C*********************************************************************** -C -C + C Was MCINIT previously called? -C + IF (.NOT. CINIT) THEN LASTER = NOINIT ERRVEC(LASTER) = ERRVEC(LASTER) + 1 @@ -600,7 +595,7 @@ SUBROUTINE MDINIT (USERV) * 'CALLING MCFILL.' RETURN END IF -C + IF (LEN(TNAME1) .LT. 1) THEN LASTER = BADNAM LERROR = LASTER @@ -613,16 +608,16 @@ SUBROUTINE MDINIT (USERV) CFILL = .TRUE. ERRVEC(SUCESS) = ERRVEC(SUCESS) + 1 RETURN -C + C*********************************************************************** -C + ENTRY MDFIND (TNAME1, NEWLOC, NEWLEN) -C + C*********************************************************************** -C + C This section finds a name in the dictionary and returns the C location and length of that vector. -C + NAMET = TNAME1 CALL EXUPCS (NAMET) CALL STRIPB (NAMET, LEFT, RIGHT) @@ -634,9 +629,9 @@ SUBROUTINE MDINIT (USERV) RETURN END IF NAME1 = NAMET(LEFT:RIGHT) -C + C Was MDINIT previously called? -C + IF (.NOT. INIT) THEN LASTER = NOINIT ERRVEC(LASTER) = ERRVEC(LASTER) + 1 @@ -644,16 +639,16 @@ SUBROUTINE MDINIT (USERV) * 'CALLING MDFIND.' RETURN END IF -C + C Find the name in the dictionary. -C + CALL MXFIND (NAME1, DICT, DPOINT, LDICT, NNAMES, * CHRCOL, LASTER, ROW) -C + IF (LASTER .EQ. SUCESS) THEN -C + C Entry was found in dictionary. -C + IF (DPOINT(ROW,1,2) .LT. 0) THEN DPOINT(ROW,1,1) = IXLNUM(NEWLOC) NEWLOC = - ULOC @@ -662,7 +657,7 @@ SUBROUTINE MDINIT (USERV) END IF NEWLEN = ABS(DPOINT(ROW,1,2)) END IF -C + ERRVEC(LASTER) = ERRVEC(LASTER) + 1 IF (LASTER .NE. SUCESS) THEN LERROR = LASTER @@ -672,16 +667,16 @@ SUBROUTINE MDINIT (USERV) END IF END IF RETURN -C + C*********************************************************************** -C + ENTRY MCFIND (TNAME1, NEWLOC, NEWLEN) -C + C*********************************************************************** -C + C This section finds a name in the dictionary and returns the C location and length of that vector. -C + NAMET = TNAME1 CALL EXUPCS (NAMET) CALL STRIPB (NAMET, LEFT, RIGHT) @@ -693,9 +688,9 @@ SUBROUTINE MDINIT (USERV) RETURN END IF NAME1 = NAMET(LEFT:RIGHT) -C + C Was MCINIT previously called? -C + IF (.NOT. CINIT) THEN LASTER = NOINIT ERRVEC(LASTER) = ERRVEC(LASTER) + 1 @@ -703,16 +698,16 @@ SUBROUTINE MDINIT (USERV) * 'CALLING MCFIND.' RETURN END IF -C + C Find the name in the dictionary. -C + CALL MYFIND (NAME1, DICT, DPOINT, LDICT, NNAMES, * CHRCOL, LASTER, ROW) -C + IF (LASTER .EQ. SUCESS) THEN -C + C Entry was found in dictionary. -C + IF (DPOINT(ROW,CHRCOL,2) .LT. 0) THEN DPOINT(ROW,CHRCOL,1) = IXLNUM(NEWLOC) NEWLOC = - UCLOC @@ -723,7 +718,7 @@ SUBROUTINE MDINIT (USERV) END IF NEWLEN = DPOINT(ROW,1,3) END IF -C + ERRVEC(LASTER) = ERRVEC(LASTER) + 1 IF (LASTER .NE. SUCESS) THEN LERROR = LASTER @@ -733,16 +728,15 @@ SUBROUTINE MDINIT (USERV) END IF END IF RETURN -C + C*********************************************************************** -C + ENTRY MDFOFF () -C + C*********************************************************************** -C -C + C Was MDINIT previously called? -C + IF (.NOT. INIT) THEN LASTER = NOINIT ERRVEC(LASTER) = ERRVEC(LASTER) + 1 @@ -750,20 +744,19 @@ SUBROUTINE MDINIT (USERV) * 'CALLING MDFOFF.' RETURN END IF -C + FILL = .FALSE. ERRVEC(SUCESS) = ERRVEC(SUCESS) + 1 RETURN -C + C*********************************************************************** -C + ENTRY MCFOFF () -C + C*********************************************************************** -C -C + C Was MCINIT previously called? -C + IF (.NOT. CINIT) THEN LASTER = NOINIT ERRVEC(LASTER) = ERRVEC(LASTER) + 1 @@ -771,24 +764,24 @@ SUBROUTINE MDINIT (USERV) * 'CALLING MCFOFF.' RETURN END IF -C + CFILL = .FALSE. ERRVEC(SUCESS) = ERRVEC(SUCESS) + 1 RETURN -C + C*********************************************************************** -C + ENTRY MDGET (MNGET) -C + C*********************************************************************** -C + C This section processes a request for a contiguous C chunk of memory. C If a void of sufficient size is available, no action is taken, C otherwise a call to the system for the memory is made. -C + C Was MDINIT previously called? -C + IF (.NOT. INIT) THEN LASTER = NOINIT IF (EUNIT .GT. 0) WRITE (EUNIT, *) 'MDINIT NOT CALLED BEFORE ', @@ -797,30 +790,30 @@ SUBROUTINE MDINIT (USERV) LERROR = LASTER RETURN END IF -C + C ... Using malloc/free -- ignore mdget calls. c CALL MXGET (MYLOC, MNGET, VOID, LVOID, NVOIDS, c * CHRCOL, LASTER, VROW) -C + if (eunit .gt. 0) then write (eunit,*) 'MDGET: ', 0 end if RETURN -C + C*********************************************************************** -C + ENTRY MCGET (MNGET) -C + C*********************************************************************** -C + C This section processes a request for a contiguous C chunk of memory. C If a void of sufficient size is available, no action is taken, C otherwise a call to the system for the memory is made. -C + C Was MCINIT previously called? -C + IF (.NOT. CINIT) THEN LASTER = NOINIT IF (EUNIT .GT. 0) WRITE (EUNIT, *) 'MCINIT NOT CALLED BEFORE ', @@ -829,26 +822,26 @@ SUBROUTINE MDINIT (USERV) LERROR = LASTER RETURN END IF -C + C ... Using malloc/free -- ignore mdget calls. -C + if (eunit .gt. 0) then write (eunit,*) 'MCGET: ', 0 end if RETURN -C + C*********************************************************************** -C + ENTRY MCGIVE -C + C*********************************************************************** -C + C This section returns unused space at the end of all storage C blocks to the system. It does not return character memory C in split mode. -C + C Was MCINIT previously called? -C + IF (.NOT. CINIT) THEN LASTER = NOINIT IF (EUNIT .GT. 0) WRITE (EUNIT, *) 'MCINIT NOT CALLED BEFORE ', @@ -857,18 +850,18 @@ SUBROUTINE MDINIT (USERV) LERROR = LASTER RETURN END IF -C + C*********************************************************************** -C + ENTRY MDGIVE -C + C*********************************************************************** -C + C This section returns unused space at the end of all storage C blocks to the system. -C + C Was MDINIT previously called? -C + IF (.NOT. INIT) THEN LASTER = NOINIT IF (EUNIT .GT. 0) WRITE (EUNIT, *) 'MDINIT NOT CALLED BEFORE ', @@ -877,34 +870,34 @@ SUBROUTINE MDINIT (USERV) LERROR = LASTER RETURN END IF -C + C ... Using malloc/free -- ignore mcgive/mdgive calls. -C + c CALL MXGIVE (MYLOC, DPOINT, LDICT, NNAMES, VOID, LVOID, c * NVOIDS, CHRCOL, LASTER) -C + RETURN -C + C*********************************************************************** -C + ENTRY MCLAST (ENUM) ENTRY MDLAST (ENUM) -C + C*********************************************************************** -C + ENUM = LERROR RETURN -C + C*********************************************************************** -C + ENTRY MCLIST (UNIT) -C + C*********************************************************************** -C + C This section lists the internal tables of the data manager. -C + C Was MCINIT previously called? -C + IF (.NOT. CINIT) THEN LASTER = NOINIT IF (EUNIT .GT. 0) WRITE (EUNIT, *) 'MCINIT NOT CALLED BEFORE ', @@ -913,17 +906,17 @@ SUBROUTINE MDINIT (USERV) LERROR = LASTER RETURN END IF -C + C*********************************************************************** -C + ENTRY MDLIST (UNIT) -C + C*********************************************************************** -C + C This section lists the internal tables of the data manager. -C + C Was MDINIT previously called? -C + IF (.NOT. INIT) THEN LASTER = NOINIT IF (EUNIT .GT. 0) WRITE (EUNIT, *) 'MDINIT NOT CALLED BEFORE ', @@ -932,10 +925,10 @@ SUBROUTINE MDINIT (USERV) LERROR = LASTER RETURN END IF -C + CALL MXLIST (UNIT, OFFSET, DICT, DPOINT, LDICT, NNAMES, * VOID, LVOID, NVOIDS, CHRCOL) -C + if (eunit .gt. 0) then CALL MXLIST (EUNIT, OFFSET, DICT, DPOINT, LDICT, NNAMES, * VOID, LVOID, NVOIDS, CHRCOL) @@ -944,16 +937,16 @@ SUBROUTINE MDINIT (USERV) LASTER = SUCESS ERRVEC(LASTER) = ERRVEC(LASTER) + 1 RETURN -C + C*********************************************************************** -C + ENTRY MDLONG (TNAME1, NEWLOC, NEWLEN) -C + C*********************************************************************** -C + C This section expands or shortens a vector. C Any nonnegative value of newlen is permissible. -C + NAMET = TNAME1 CALL EXUPCS (NAMET) CALL STRIPB (NAMET, LEFT, RIGHT) @@ -965,9 +958,9 @@ SUBROUTINE MDINIT (USERV) RETURN END IF NAME1 = NAMET(LEFT:RIGHT) -C + C Was MDINIT previously called? -C + IF (.NOT. INIT) THEN LASTER = NOINIT IF (EUNIT .GT. 0) WRITE (EUNIT, *) 'MDINIT NOT CALLED BEFORE ', @@ -976,9 +969,9 @@ SUBROUTINE MDINIT (USERV) LERROR = LASTER RETURN END IF -C + C Is the new length sensible? -C + IF (NEWLEN .LT. 0) THEN LASTER = BADLEN IF (EUNIT .GT. 0) WRITE (EUNIT, *) 'NEGATIVE LENGTH REQUEST ', @@ -987,18 +980,18 @@ SUBROUTINE MDINIT (USERV) LERROR = LASTER RETURN END IF -C + C Ensure that the amount of space called for is even --- this C guarantees that the memory will align on an eight byte boundary. C (this is only a quick fix for the HP750 --- jrr 10/25/91) -C + dummy = mod( newlen, 2 ) if ( dummy .ne. 0 ) then junk = newlen + ( 2 - dummy ) else junk = newlen endif -C + #ifdef SDP INUM = junk #else @@ -1008,7 +1001,7 @@ SUBROUTINE MDINIT (USERV) * MYCLOC, UCLOC, COFFST, OFFSET, * DICT, DPOINT, LDICT, NNAMES, VOID, LVOID, NVOIDS, * FILL, FDATA, CFILL, CFDATA, CHRNUM, CHRCOL, LASTER) -C + if (eunit .gt. 0) then write (eunit,*) 'MDLONG: ', NAME1, INUM, newloc end if @@ -1021,16 +1014,16 @@ SUBROUTINE MDINIT (USERV) END IF END IF RETURN -C + C*********************************************************************** -C + ENTRY MCLONG (TNAME1, NEWLOC, NEWLEN) -C + C*********************************************************************** -C + C This section expands or shortens a vector. C Any nonnegative value of newlen is permissible. -C + NAMET = TNAME1 CALL EXUPCS (NAMET) CALL STRIPB (NAMET, LEFT, RIGHT) @@ -1042,9 +1035,9 @@ SUBROUTINE MDINIT (USERV) RETURN END IF NAME1 = NAMET(LEFT:RIGHT) -C + C Was MCINIT previously called? -C + IF (.NOT. CINIT) THEN LASTER = NOINIT IF (EUNIT .GT. 0) WRITE (EUNIT, *) 'MCINIT NOT CALLED BEFORE ', @@ -1053,9 +1046,9 @@ SUBROUTINE MDINIT (USERV) LERROR = LASTER RETURN END IF -C + C Is the new length sensible? -C + IF (NEWLEN .LT. 0) THEN LASTER = BADLEN IF (EUNIT .GT. 0) WRITE (EUNIT, *) 'NEGATIVE LENGTH REQUEST ', @@ -1064,11 +1057,11 @@ SUBROUTINE MDINIT (USERV) LERROR = LASTER RETURN END IF -C + C Ensure that the amount of space called for is a multiple of eight c ---this guarantees that the memory will align on an eight byte boundary. C (this is only a quick fix for the HP750 --- jrr 10/25/91) -C + dummy = mod( newlen, 8 ) if ( dummy .ne. 0 ) then junk = newlen + ( 8 - dummy ) @@ -1080,12 +1073,12 @@ SUBROUTINE MDINIT (USERV) #else INUM = newlen #endif -C + CALL MYLONG (NAME1, INUM, NEWLOC, MYV, MYCHAR, MYLOC, * MYCLOC, UCLOC, COFFST, OFFSET, * DICT, DPOINT, LDICT, NNAMES, VOID, LVOID, NVOIDS, * FILL, FDATA, CFILL, CFDATA, CHRNUM, CHRCOL, MAXSIZ, LASTER) -C + if (eunit .gt. 0) then write (eunit,*) 'MCLONG: ', NAME1, INUM, newloc end if @@ -1099,21 +1092,21 @@ SUBROUTINE MDINIT (USERV) END IF END IF RETURN -C + C*********************************************************************** -C + ENTRY MDMEMS (NSUA, NSUD, NSUV, NSULV) -C + C*********************************************************************** -C + C This section returns: C NSUA Number of numeric storage units allocated C NSUD Number of numeric storage units deferred C NSUV Number of numeric storage units in voids C NSULV Number of numeric storage units in largest void -C + C Was MDINIT previously called? -C + IF (.NOT. INIT) THEN LASTER = NOINIT IF (EUNIT .GT. 0) WRITE (EUNIT, *) 'MDINIT NOT CALLED BEFORE ', @@ -1122,19 +1115,19 @@ SUBROUTINE MDINIT (USERV) LERROR = LASTER RETURN END IF -C + NSUA = 0 NSUD = 0 NSUV = 0 NSULV= 0 -C + DO 100 I = 1, NNAMES(1) IF (DPOINT(I,1,3) .EQ. -1) THEN NSUA = NSUA + MAX(DPOINT(I,1,2),0) NSUD = NSUD + MIN(DPOINT(I,1,2),0) END IF 100 CONTINUE -C + DO 110 I = 1, NVOIDS(1) NSUV = NSUV + VOID(I,1,2) NSULV = MAX ( NSULV, VOID(I,1,2) ) @@ -1142,21 +1135,21 @@ SUBROUTINE MDINIT (USERV) LASTER = SUCESS ERRVEC(LASTER) = ERRVEC(LASTER) + 1 RETURN -C + C*********************************************************************** -C + ENTRY MCMEMS (NSUA, NSUD, NSUV, NSULV) -C + C*********************************************************************** -C + C This section returns: C NSUA Number of character storage units allocated C NSUD Number of character storage units deferred C NSUV Number of character storage units in voids C NSULV Number of character storage units in largest void -C + C Was MDINIT previously called? -C + IF (.NOT. INIT) THEN LASTER = NOINIT IF (EUNIT .GT. 0) WRITE (EUNIT, *) 'MDINIT NOT CALLED BEFORE ', @@ -1165,12 +1158,12 @@ SUBROUTINE MDINIT (USERV) LERROR = LASTER RETURN END IF -C + NSUA = 0 NSUD = 0 NSUV = 0 NSULV= 0 -C + DO 120 I = 1, NNAMES(CHRCOL) IF (DPOINT(I,CHRCOL,3) .GE. 0) THEN IF (DPOINT(I,CHRCOL,2) .GE. 0) THEN @@ -1180,7 +1173,7 @@ SUBROUTINE MDINIT (USERV) END IF END IF 120 CONTINUE -C + DO 130 I = 1, NVOIDS(CHRCOL) NSUV = NSUV + VOID(I,CHRCOL,2) NSULV = MAX ( NSULV, VOID(I,CHRCOL,2) ) @@ -1190,15 +1183,15 @@ SUBROUTINE MDINIT (USERV) LASTER = SUCESS ERRVEC(LASTER) = ERRVEC(LASTER) + 1 RETURN -C + C*********************************************************************** -C + ENTRY MDNAME (TNAME1, TNAME2) -C + C*********************************************************************** -C + C This section renames an array from NAME1 to NAME2. -C + NAMET = TNAME1 CALL EXUPCS (NAMET) CALL STRIPB (NAMET, LEFT, RIGHT) @@ -1221,9 +1214,9 @@ SUBROUTINE MDINIT (USERV) RETURN END IF NAME2 = NAMET(LEFT:RIGHT) -C + C Was MDINIT previously called? -C + IF (.NOT. INIT) THEN LASTER = NOINIT IF (EUNIT .GT. 0) WRITE (EUNIT, *) 'MDINIT NOT CALLED BEFORE ', @@ -1232,33 +1225,33 @@ SUBROUTINE MDINIT (USERV) LERROR = LASTER RETURN END IF -C + C Find NAME1 in dictionary. -C + CALL MXFIND (NAME1, DICT, DPOINT, LDICT, NNAMES, * CHRCOL, LASTER, ROW) IF (LASTER .EQ. SUCESS) THEN -C + LOC = DPOINT(ROW,1,1) LEN1 = DPOINT(ROW,1,2) -C + C Delete dictionary entry. -C + CALL SHFTC (DICT, CHRCOL*LDICT, ROW+1, NNAMES(1), 1) CALL SHFTI (DPOINT, LDICT*CHRCOL, 3, ROW+1, NNAMES(1), 1) NNAMES(1) = NNAMES(1) - 1 -C + C insert NAME2 with old pointer and length. -C + CALL MXNSRT (NAME2, LOC, LEN1, DICT, DPOINT, LDICT, * NNAMES, CHRCOL, LASTER) IF (LASTER .NE. SUCESS) THEN CALL MXNSRT (NAME1, LOC, LEN1, DICT, DPOINT, LDICT, * NNAMES, CHRCOL, TMP) END IF -C + END IF -C + ERRVEC(LASTER) = ERRVEC(LASTER) + 1 IF (LASTER .NE. SUCESS) THEN LERROR = LASTER @@ -1269,15 +1262,15 @@ SUBROUTINE MDINIT (USERV) END IF END IF RETURN -C + C*********************************************************************** -C + ENTRY MCNAME (TNAME1, TNAME2) -C + C*********************************************************************** -C + C This section renames an array from NAME1 to NAME2. -C + NAMET = TNAME1 CALL EXUPCS (NAMET) CALL STRIPB (NAMET, LEFT, RIGHT) @@ -1300,9 +1293,9 @@ SUBROUTINE MDINIT (USERV) RETURN END IF NAME2 = NAMET(LEFT:RIGHT) -C + C Was MCINIT previously called? -C + IF (.NOT. CINIT) THEN LASTER = NOINIT IF (EUNIT .GT. 0) WRITE (EUNIT, *) 'MCINIT NOT CALLED BEFORE ', @@ -1311,36 +1304,36 @@ SUBROUTINE MDINIT (USERV) LERROR = LASTER RETURN END IF -C + C Find NAME1 in dictionary. -C + CALL MYFIND (NAME1, DICT, DPOINT, LDICT, NNAMES, * CHRCOL, LASTER, ROW) IF (LASTER .EQ. SUCESS) THEN -C + LOC = DPOINT(ROW,CHRCOL,1) LEN1 = DPOINT(ROW,CHRCOL,2) LEN2 = DPOINT(ROW,CHRCOL,3) -C + C Delete dictionary entry. -C + CALL SHFTC (DICT(1,CHRCOL), CHRCOL*LDICT, ROW+1, * NNAMES(CHRCOL), 1) CALL SHFTI (DPOINT(1,CHRCOL,1), LDICT*CHRCOL, 3, ROW+1, * NNAMES(CHRCOL), 1) NNAMES(CHRCOL) = NNAMES(CHRCOL) - 1 -C + C insert NAME2 with old pointer and length. -C + CALL MYNSRT (NAME2, LOC, LEN1, LEN2, DICT, DPOINT, LDICT, * NNAMES, CHRCOL, LASTER) IF (LASTER .NE. SUCESS) THEN CALL MYNSRT (NAME1, LOC, LEN1, LEN2, DICT, DPOINT, LDICT, * NNAMES, CHRCOL, TMP) END IF -C + END IF -C + ERRVEC(LASTER) = ERRVEC(LASTER) + 1 IF (LASTER .NE. SUCESS) THEN LERROR = LASTER @@ -1351,16 +1344,16 @@ SUBROUTINE MDINIT (USERV) END IF END IF RETURN -C + C*********************************************************************** -C + ENTRY MDPRNT (TNAME1, UNIT, TNAME2) -C + C*********************************************************************** -C + C This section prints a named vector as integer or real, as C indicated by NAME2. -C + NAMET = TNAME1 CALL EXUPCS (NAMET) CALL STRIPB (NAMET, LEFT, RIGHT) @@ -1383,9 +1376,9 @@ SUBROUTINE MDINIT (USERV) RETURN END IF NAME2 = NAMET(LEFT:RIGHT) -C + C Was MDINIT previously called? -C + IF (.NOT. INIT) THEN LASTER = NOINIT IF (EUNIT .GT. 0) WRITE (EUNIT, *) 'MDINIT NOT CALLED BEFORE ', @@ -1394,10 +1387,10 @@ SUBROUTINE MDINIT (USERV) LERROR = LASTER RETURN END IF -C + CALL MXPRNT (NAME1, UNIT, NAME2, MYV, RMYV, OFFSET, * DICT, DPOINT, LDICT, NNAMES, CHRCOL, NCOLP, LASTER) -C + ERRVEC(LASTER) = ERRVEC(LASTER) + 1 IF (LASTER .NE. SUCESS) THEN LERROR = LASTER @@ -1406,17 +1399,17 @@ SUBROUTINE MDINIT (USERV) WRITE (EUNIT, *) ' MDPRNT ERROR.' END IF END IF -C + RETURN -C + C*********************************************************************** -C + ENTRY MCPRNT (TNAME1, UNIT, NEWLEN) -C + C*********************************************************************** -C + C This section prints a named vector as character. -C + NAMET = TNAME1 CALL EXUPCS (NAMET) CALL STRIPB (NAMET, LEFT, RIGHT) @@ -1428,9 +1421,9 @@ SUBROUTINE MDINIT (USERV) RETURN END IF NAME1 = NAMET(LEFT:RIGHT) -C + C Was MCINIT previously called? -C + IF (.NOT. CINIT) THEN LASTER = NOINIT IF (EUNIT .GT. 0) WRITE (EUNIT, *) 'MCINIT NOT CALLED BEFORE ', @@ -1439,11 +1432,11 @@ SUBROUTINE MDINIT (USERV) LERROR = LASTER RETURN END IF -C + CALL MYPRNT (NAME1, UNIT, MYCHAR, COFFST, COFFST+UCLOC-MYCLOC, * DICT, DPOINT, LDICT, NNAMES, CHRNUM, * CHRCOL, NCOLP, NEWLEN, LASTER) -C + ERRVEC(LASTER) = ERRVEC(LASTER) + 1 IF (LASTER .NE. SUCESS) THEN LERROR = LASTER @@ -1452,19 +1445,19 @@ SUBROUTINE MDINIT (USERV) WRITE (EUNIT, *) ' MCPRNT ERROR.' END IF END IF -C + RETURN -C + C*********************************************************************** -C + ENTRY MDRSRV (TNAME1, NEWLOC, NEWLEN) -C + C*********************************************************************** -C + C This section reserves space for an array. If a void is not C available, a system call will be made for the space. Any C nonnegative request is permissible. -C + NAMET = TNAME1 CALL EXUPCS (NAMET) CALL STRIPB (NAMET, LEFT, RIGHT) @@ -1476,9 +1469,9 @@ SUBROUTINE MDINIT (USERV) RETURN END IF NAME1 = NAMET(LEFT:RIGHT) -C + C Was MDINIT previously called? -C + IF (.NOT. INIT) THEN LASTER = NOINIT IF (EUNIT .GT. 0) WRITE (EUNIT, *) 'MDINIT NOT CALLED BEFORE ', @@ -1487,9 +1480,9 @@ SUBROUTINE MDINIT (USERV) LERROR = LASTER RETURN END IF -C + C Check for sensible length. -C + IF (NEWLEN .LT. 0) THEN LASTER = BADLEN IF (EUNIT .GT. 0) WRITE (EUNIT, *) 'NEGATIVE LENGTH REQUEST ', @@ -1498,11 +1491,11 @@ SUBROUTINE MDINIT (USERV) LERROR = LASTER RETURN END IF -C + C Ensure that the amount of space called for is even --- this C guarantees that the memory will align on an eight byte boundary. C (this is only a quick fix for the HP750 --- jrr 10/25/91) -C + dummy = mod( newlen, 2 ) if ( dummy .ne. 0 ) then junk = newlen + ( 2 - dummy ) @@ -1514,12 +1507,12 @@ SUBROUTINE MDINIT (USERV) #else INUM = newlen #endif -C + CALL MXRSRV (MYV, NAME1, INUM, NEWLOC, MYLOC, OFFSET, * VOID, LVOID, NVOIDS, * DICT, DPOINT, LDICT, NNAMES, CHRCOL, DEFER, FILL, FDATA, * LASTER) -C + if (eunit .gt. 0) then write (eunit,*) 'MDRSRV: ', NAME1, INUM, newloc end if @@ -1532,19 +1525,19 @@ SUBROUTINE MDINIT (USERV) WRITE (EUNIT, *) ' MDRSRV ERROR.' END IF END IF -C + RETURN -C + C*********************************************************************** -C + ENTRY MCRSRV (TNAME1, NEWLOC, NEWLEN) -C + C*********************************************************************** -C + C This section reserves space for an array. If a void is not C available, a system call will be made for the space. Any C nonnegative request is permissible. -C + NAMET = TNAME1 CALL EXUPCS (NAMET) CALL STRIPB (NAMET, LEFT, RIGHT) @@ -1556,9 +1549,9 @@ SUBROUTINE MDINIT (USERV) RETURN END IF NAME1 = NAMET(LEFT:RIGHT) -C + C Was MCINIT previously called? -C + IF (.NOT. CINIT) THEN LASTER = NOINIT IF (EUNIT .GT. 0) WRITE (EUNIT, *) 'MCINIT NOT CALLED BEFORE ', @@ -1567,9 +1560,9 @@ SUBROUTINE MDINIT (USERV) LERROR = LASTER RETURN END IF -C + C Check for sensible length. -C + IF (NEWLEN .LT. 0) THEN LASTER = BADLEN IF (EUNIT .GT. 0) WRITE (EUNIT, *) 'NEGATIVE LENGTH REQUEST ', @@ -1578,11 +1571,11 @@ SUBROUTINE MDINIT (USERV) LERROR = LASTER RETURN END IF -C + C Ensure that the amount of space called for is a multiple of eight c ---this guarantees that the memory will align on an eight byte boundary. C (this is only a quick fix for the HP750 --- jrr 10/25/91) -C + dummy = mod( newlen, 8 ) if ( dummy .ne. 0 ) then junk = newlen + ( 8 - dummy ) @@ -1594,14 +1587,14 @@ SUBROUTINE MDINIT (USERV) #else INUM = newlen #endif -C + CALL MYRSRV (MYCHAR, NAME1, INUM, NEWLOC, MYLOC, MYCLOC, * UCLOC, OFFSET, COFFST, * VOID, LVOID, NVOIDS, * DICT, DPOINT, LDICT, NNAMES, CHRCOL, CHRNUM, DEFER, * CFILL, CFDATA, MAXSIZ, * LASTER) -C + if (eunit .gt. 0) then write (eunit,*) 'MCRSRV: ', NAME1, INUM, newloc end if @@ -1614,18 +1607,18 @@ SUBROUTINE MDINIT (USERV) WRITE (EUNIT, *) ' MCRSRV ERROR.' END IF END IF -C + RETURN -C + C*********************************************************************** -C + ENTRY MDSTAT (MNERRS, MNUSED) -C + C*********************************************************************** -C + C This section returns the total number of errors and the total C amount of numeric storage assigned to arrays. -C + ERRVEC(SUCESS) = ERRVEC(SUCESS) + 1 MNERRS = 0 DO 140 I = 2, NERVEC @@ -1641,16 +1634,16 @@ SUBROUTINE MDINIT (USERV) write (eunit,*) 'MDSTAT: ',MNERRS, MNUSED end if RETURN -C + C*********************************************************************** -C + ENTRY MCSTAT (MNERRS, MNUSED) -C + C*********************************************************************** -C + C This section returns the total number of errors and the total C amount of character storage assigned to arrays. -C + ERRVEC(SUCESS) = ERRVEC(SUCESS) + 1 MNERRS = 0 DO 160 I = 2, NERVEC @@ -1664,13 +1657,13 @@ SUBROUTINE MDINIT (USERV) write (eunit, *) 'MCSTAT: ', MNERRS, MNUSED end if RETURN -C + C*********************************************************************** -C + ENTRY MCWAIT () -C + C Was MCINIT previously called? -C + IF (.NOT. CINIT) THEN LASTER = NOINIT IF (EUNIT .GT. 0) WRITE (EUNIT, *) 'MCINIT NOT CALLED BEFORE ', @@ -1679,14 +1672,13 @@ SUBROUTINE MDINIT (USERV) LERROR = LASTER RETURN END IF -C + ENTRY MDWAIT () -C + C*********************************************************************** -C -C + C Was MDINIT previously called? -C + IF (.NOT. INIT) THEN LASTER = NOINIT ERRVEC(LASTER) = ERRVEC(LASTER) + 1 @@ -1694,9 +1686,9 @@ SUBROUTINE MDINIT (USERV) * 'CALLING MDWAIT.' RETURN END IF -C + IF (DEFROK) DEFER = .TRUE. ERRVEC(SUCESS) = ERRVEC(SUCESS) + 1 RETURN -C + END diff --git a/packages/seacas/libraries/supes/mem_mgr/mxcomp.f b/packages/seacas/libraries/supes/mem_mgr/mxcomp.f index dbd54f81ec56..6bee38e0a156 100644 --- a/packages/seacas/libraries/supes/mem_mgr/mxcomp.f +++ b/packages/seacas/libraries/supes/mem_mgr/mxcomp.f @@ -1,18 +1,18 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details SUBROUTINE MXCOMP (MYV, VOID, LVOID, * NVOIDS, DPOINT, LDICT, NNAMES, CHRCOL, LASTER) -C + IMPLICIT INTEGER (A-Z) INCLUDE 'params.inc' -C + C THIS ROUTINE PERFORMS THE NUMERIC DATA COMPRESSION OPERATION. -C + C************************************************************************ -C + C MYV Reference array C VOID Void table C LVOID Dimension of VOID @@ -22,18 +22,18 @@ SUBROUTINE MXCOMP (MYV, VOID, LVOID, C NNAMES Number of names C CHRCOL Column for character tables C LASTER Error return code -C + DIMENSION DPOINT(LDICT,CHRCOL,2), VOID(LVOID,CHRCOL,2), MYV(*) DIMENSION NNAMES(2), NVOIDS(2) -C + C************************************************************************ -C + LASTER = SUCESS -C + C The basic strategy is to look for an array in the dictionary C which is immediately preceded by a void. If found, a shift C is performed, and the void table is updated. -C + IVOID = 0 100 CONTINUE IVOID = IVOID + 1 @@ -42,9 +42,9 @@ SUBROUTINE MXCOMP (MYV, VOID, LVOID, DO 120 IDICT = 1, NNAMES(1) DADDR = DPOINT(IDICT,1,1) IF (VADDR .EQ. DADDR .AND. DPOINT(IDICT,1,2) .GT. 0) THEN -C + C Perform data shift and update void table. -C + CALL SHFTI (MYV, 1, 1, * DADDR, DADDR+DPOINT(IDICT,1,2)-1, VOID(IVOID,1,2)) DPOINT(IDICT,1,1) = VOID(IVOID,1,1) @@ -53,7 +53,7 @@ SUBROUTINE MXCOMP (MYV, VOID, LVOID, * LASTER) IF (LASTER .NE. SUCESS) RETURN GO TO 110 -C + END IF 120 CONTINUE GO TO 100 diff --git a/packages/seacas/libraries/supes/mem_mgr/mxdel.f b/packages/seacas/libraries/supes/mem_mgr/mxdel.f index ab9a8e322818..8011a366a0e1 100644 --- a/packages/seacas/libraries/supes/mem_mgr/mxdel.f +++ b/packages/seacas/libraries/supes/mem_mgr/mxdel.f @@ -1,19 +1,19 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details SUBROUTINE MXDEL (NAME1, DICT, DPOINT, LDICT, NNAMES, VOID, * LVOID, NVOIDS, CHRCOL, LASTER, MYLOC) -C + IMPLICIT INTEGER (A-Z) INCLUDE 'params.inc' -C + C This routine removes a name from the dictionary and returns the C available space to the void table. -C + C*********************************************************************** -C + C NAME1 Name to be deleted CHARACTER*8 NAME1 C DICT Dictionary name table @@ -28,27 +28,27 @@ SUBROUTINE MXDEL (NAME1, DICT, DPOINT, LDICT, NNAMES, VOID, DIMENSION VOID(LVOID,CHRCOL,2), NVOIDS(2) C CHRCOL Number of column for character names. C LASTER Error return -C + C*********************************************************************** -C + C FIND NAME1 IN DICTIONARY. -C + CALL MXFIND (NAME1, DICT, DPOINT, LDICT, NNAMES, * CHRCOL, LASTER, ROW) IF (LASTER .NE. SUCESS) RETURN -C + LOC = DPOINT(ROW,1,1) LEN = DPOINT(ROW,1,2) -C + C DELETE DICTIONARY ENTRY. -C + CALL SHFTC (DICT, CHRCOL*LDICT, ROW+1, NNAMES(1), 1) CALL SHFTI (DPOINT, LDICT*CHRCOL, 3, ROW+1, NNAMES(1), 1) NNAMES(1) = NNAMES(1) - 1 IF (LEN .LE. 0) RETURN -C + C MAKE AN ENTRY IN THE VOID TABLE. -C + c CALL VTABLE (LOC, LEN, VOID, LVOID, NVOIDS(1), CHRCOL, LASTER) C ... Using malloc/free -- let system manage void space. Return diff --git a/packages/seacas/libraries/supes/mem_mgr/mxeror.f b/packages/seacas/libraries/supes/mem_mgr/mxeror.f index 951aa76831db..b5a767b9ead6 100644 --- a/packages/seacas/libraries/supes/mem_mgr/mxeror.f +++ b/packages/seacas/libraries/supes/mem_mgr/mxeror.f @@ -1,14 +1,14 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details SUBROUTINE MXEROR (UNIT, LASTER, ERRVEC) -C + IMPLICIT INTEGER (A-Z) INCLUDE 'params.inc' DIMENSION ERRVEC(NERVEC) -C + WRITE (UNIT, 10010)LASTER WRITE (UNIT, 10000) (ERRVEC(I), I, I=1,NERVEC) RETURN diff --git a/packages/seacas/libraries/supes/mem_mgr/mxexec.f b/packages/seacas/libraries/supes/mem_mgr/mxexec.f index 394310f56cb1..be593d01b346 100644 --- a/packages/seacas/libraries/supes/mem_mgr/mxexec.f +++ b/packages/seacas/libraries/supes/mem_mgr/mxexec.f @@ -1,23 +1,23 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details SUBROUTINE MXEXEC (MYV, MYCV, MYLOC, MYCLOC, UCLOC, COFFST, * OFFSET, DPOINT, LDICT, NNAMES, * VOID, LVOID, NVOIDS, FILL, FDATA, CFILL, CFDATA, CHRNUM, * CHRCOL, LASTER) -C + IMPLICIT INTEGER (A-Z) INCLUDE 'params.inc' -C + C This routine satisfies deferred memory requests. C It will service both numeric and character C deferred requests in the mixed mode. In the nonmixed mode, C character memory is not deferred. -C + C*********************************************************************** -C + C MYV Internal reference vector. DIMENSION MYV(*) C MYCV Internal reference array. @@ -46,9 +46,9 @@ SUBROUTINE MXEXEC (MYV, MYCV, MYLOC, MYCLOC, UCLOC, COFFST, C CHRNUM Number of characters per numeric storage unit C CHRCOL Column for character tables. C LASTER Error return. -C + C*********************************************************************** -C + LASTER = SUCESS MEM = 0 DO 100 IDICT = 1, NNAMES(1) @@ -56,14 +56,13 @@ SUBROUTINE MXEXEC (MYV, MYCV, MYLOC, MYCLOC, UCLOC, COFFST, 100 CONTINUE IF (MEM .EQ. 0) RETURN MEM = - MEM -C -C + CALL MXGET (MYLOC, MEM, VOID, LVOID, NVOIDS, * CHRCOL, LASTER, VROW) IF (LASTER .NE. SUCESS) RETURN -C + C Now satisfy all the deferred requests. -C + DO 130 IDICT = 1, NNAMES(1) IF (DPOINT(IDICT,1,2) .LT. 0) THEN IF (DPOINT(IDICT,1,3) .EQ. -1) THEN @@ -77,9 +76,9 @@ SUBROUTINE MXEXEC (MYV, MYCV, MYLOC, MYCLOC, UCLOC, COFFST, DPOINT(IDICT,1,2) = - DPOINT(IDICT,1,2) DPOINT(IDICT,1,1) = VOID(VROW,1,1) VOID(VROW,1,1) = VOID(VROW,1,1) + DPOINT(IDICT,1,2) -C + C Perform data fill if appropriate. -C + IF (FILL .AND. DPOINT(IDICT,1,3) .EQ. -1) THEN DO 110 I = DPOINT(IDICT,1,1), * DPOINT(IDICT,1,1)+DPOINT(IDICT,1,2)-1 @@ -92,10 +91,10 @@ SUBROUTINE MXEXEC (MYV, MYCV, MYLOC, MYCLOC, UCLOC, COFFST, MYCV(I) = CFDATA 120 CONTINUE END IF -C + END IF 130 CONTINUE -C + CALL VTABLE (0, 0, VOID, LVOID, NVOIDS(1), CHRCOL, LASTER) RETURN END diff --git a/packages/seacas/libraries/supes/mem_mgr/mxfind.f b/packages/seacas/libraries/supes/mem_mgr/mxfind.f index 5ffe7c763f23..be94c8c66ec0 100644 --- a/packages/seacas/libraries/supes/mem_mgr/mxfind.f +++ b/packages/seacas/libraries/supes/mem_mgr/mxfind.f @@ -1,16 +1,16 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details SUBROUTINE MXFIND (NAME1, DICT, DPOINT, LDICT, NNAMES, * CHRCOL, LASTER, ROW) -C + IMPLICIT INTEGER (A-Z) INCLUDE 'params.inc' -C + C*********************************************************************** -C + C NAME1 Name to be found CHARACTER*8 NAME1 C DICT Dictionary name table @@ -23,28 +23,28 @@ SUBROUTINE MXFIND (NAME1, DICT, DPOINT, LDICT, NNAMES, C CHRCOL Column number for character array names. C LASTER Error return C ROW Location of found name or place to insert new name -C + C*********************************************************************** -C + CALL SRCHC (DICT(1,CHRCOL), 1, NNAMES(CHRCOL), NAME1, ERR, ROW) IF (ERR .EQ. 1) THEN IF (DPOINT(ROW,CHRCOL,3) .EQ. -1) THEN -C + C The names was found and is of numeric type. LASTER = SUCESS -C + ELSE -C + C The found name is a name for a character array. LASTER = WRTYPE END IF -C + ELSE IF (CHRCOL .EQ. 1) THEN -C + C ENTRY NOT FOUND. -C + LASTER = NONAME -C + ELSE CALL SRCHC (DICT, 1, NNAMES(1), NAME1, ERR, ROW) IF (ERR .EQ. 1) THEN @@ -53,6 +53,6 @@ SUBROUTINE MXFIND (NAME1, DICT, DPOINT, LDICT, NNAMES, LASTER = NONAME END IF END IF -C + RETURN END diff --git a/packages/seacas/libraries/supes/mem_mgr/mxget.f b/packages/seacas/libraries/supes/mem_mgr/mxget.f index b02f7b2bd6e0..78fbb3bb91ba 100644 --- a/packages/seacas/libraries/supes/mem_mgr/mxget.f +++ b/packages/seacas/libraries/supes/mem_mgr/mxget.f @@ -1,21 +1,20 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details SUBROUTINE MXGET (MYLOC, MNGET, VOID, LVOID, NVOIDS, * CHRCOL, LASTER, VROW) -C + IMPLICIT INTEGER (A-Z) INCLUDE 'params.inc' -C + C This subroutine returns the location (row number) of a void with C sufficient space for the memory request. If necessary, memory is C acquired from the system. The memory is contiguous. -C -C + C*********************************************************************** -C + C MYLOC Address of internal reference array C MNGET Memory request in numerical storage units C VOID Void table @@ -25,11 +24,11 @@ SUBROUTINE MXGET (MYLOC, MNGET, VOID, LVOID, NVOIDS, C CHRCOL Column for character tables. C LASTER Error return C VROW Row number of void which satisfies the memory request -C + C*********************************************************************** -C + C IS THE MEMORY REQUEST SENSIBLE? -C + IF (MNGET .LT. 0) THEN LASTER = BADLEN RETURN @@ -37,35 +36,35 @@ SUBROUTINE MXGET (MYLOC, MNGET, VOID, LVOID, NVOIDS, LASTER = SUCESS RETURN END IF -C + CALL MXLOOK (MNGET, VOID, CHRCOL*LVOID, NVOIDS(1), VROW, LASTER) IF (LASTER .EQ. SUCESS) RETURN -C + C CALL EXTENSION LIBRARY ROUTINE TO GET SPACE FROM SYSTEM. -C + CALL EXMEMY (MNGET, LOC, MEMRET) LOC = LOC - MYLOC + 1 -C + c On return from exmemy, memret is set equal to -1 on an invalid c memory request (at least that's the plan under the new C code c extension library). Therefore, I've made the change that should c test the appropriate condition. -c + IF (MEMRET .LT. 0) THEN -C + C ILLEGAL MEMORY REQUEST. -C + LASTER = NOGET RETURN -C + END IF -C + C UPDATE VOID TABLE. -C + CALL VTABLE (LOC, MEMRET, VOID, LVOID, NVOIDS(1), CHRCOL, LASTER) IF (LASTER .NE. SUCESS) RETURN -C + CALL MXLOOK (MNGET, VOID, CHRCOL*LVOID, NVOIDS(1), VROW, LASTER) -C + RETURN END diff --git a/packages/seacas/libraries/supes/mem_mgr/mxgive.f b/packages/seacas/libraries/supes/mem_mgr/mxgive.f index f66d45988a67..aeff9973f62f 100644 --- a/packages/seacas/libraries/supes/mem_mgr/mxgive.f +++ b/packages/seacas/libraries/supes/mem_mgr/mxgive.f @@ -1,16 +1,16 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details SUBROUTINE MXGIVE (MYLOC, DPOINT, LDICT, NNAMES, VOID, LVOID, * NVOIDS, CHRCOL, LASTER) -C + IMPLICIT INTEGER (A-Z) INCLUDE 'params.inc' -C + C*********************************************************************** -C + C MYLOC Internal reference array address C DPOINT Dictionary pointer table C LDICT Dimension of dictionary @@ -22,11 +22,11 @@ SUBROUTINE MXGIVE (MYLOC, DPOINT, LDICT, NNAMES, VOID, LVOID, DIMENSION VOID(LVOID,CHRCOL,2), NVOIDS(2) C CHRCOL Column for character tables C LASTER Error return -C + C*********************************************************************** -C + LASTER = SUCESS -C + C Look for a void that is not followed by a dictionary entry. C If one is found, release the space to the system. C NOTE: In previous versions of SUPES, the memory manager @@ -37,42 +37,41 @@ SUBROUTINE MXGIVE (MYLOC, DPOINT, LDICT, NNAMES, VOID, LVOID, C only allow release from the top of the user's program C space. jrr, 3/5/90. C (For reference, the old code had this line: -C + C IF (VADDR .EQ. DPOINT(IDICT,1,1) -C + C I've changed it to: -C + C IF (VADDR .LE. DPOINT(IDICT,1,1) -C -C + DO 120 IVOID = 1, NVOIDS(1) VADDR = VOID(IVOID,1,1) + VOID(IVOID,1,2) DO 100 IDICT = 1, NNAMES(1) IF (VADDR .LE. DPOINT(IDICT,1,1) * .AND. DPOINT(IDICT,1,2) .GE. 0) GO TO 110 100 CONTINUE -C + C Release this void. -C + CALL EXMEMY (-VOID(IVOID,1,2), VOID(IVOID,1,1)+MYLOC-1, MEMRET) IF (MEMRET .LT. 0 .OR. MEMRET .GT. VOID(IVOID,1,2)) THEN -C + C Illegal memory block size. -C + LASTER = ILBLK RETURN -C + END IF -C + C Update void table. -C + VOID(IVOID,1,2) = MEMRET 110 CONTINUE 120 CONTINUE -C + C Update void table to reflect zero length voids. -C + CALL VTABLE(1, 0, VOID, LVOID, NVOIDS(1), CHRCOL, LASTER) -C + RETURN END diff --git a/packages/seacas/libraries/supes/mem_mgr/mxlist.f b/packages/seacas/libraries/supes/mem_mgr/mxlist.f index d638c0bb43d7..2eb760e96f51 100644 --- a/packages/seacas/libraries/supes/mem_mgr/mxlist.f +++ b/packages/seacas/libraries/supes/mem_mgr/mxlist.f @@ -1,19 +1,19 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details SUBROUTINE MXLIST (UNIT, OFFSET, * DICT, DPOINT, LDICT, NNAMES, * VOID, LVOID, NVOIDS, CHRCOL) -C + IMPLICIT INTEGER (A-Z) -C + C This routine lists the contents of the tables of the C memory manager. -C + C*********************************************************************** -C + C UNIT Output unit number C OFFSET Offset to internal reference vector C DICT Dictionary table @@ -27,11 +27,11 @@ SUBROUTINE MXLIST (UNIT, OFFSET, C NVOIDS Number of voids DIMENSION VOID(LVOID,CHRCOL,2), NVOIDS(2) C CHRCOL Column number for character tables -C + C*********************************************************************** -C + CHARACTER*8 TNAME1, TNAME2 -C + TOFF = OFFSET DO 290 ICOL = 1, CHRCOL IF (ICOL .EQ. 2) THEN @@ -39,7 +39,7 @@ SUBROUTINE MXLIST (UNIT, OFFSET, WRITE (UNIT, 10090) END IF C DICTIONARY. -C + MNDICT = 0 MCDICT = 0 DO 100 I = 1, NNAMES(ICOL) @@ -58,9 +58,9 @@ SUBROUTINE MXLIST (UNIT, OFFSET, END IF 110 CONTINUE WRITE (UNIT,10040) MNDICT, MCDICT -C + C VOID TABLE. -C + MNVOID = 0 DO 120 I = 1, NVOIDS(ICOL) MNVOID = MNVOID + VOID(I,ICOL,2) @@ -69,12 +69,12 @@ SUBROUTINE MXLIST (UNIT, OFFSET, WRITE (UNIT,10060) (I,VOID(I,ICOL,1)+TOFF, * VOID(I,ICOL,2),I=1,NVOIDS(ICOL)) WRITE (UNIT,10050) MNVOID -C + C OUTPUT ORDERED LIST OF TABLES. -C + C First sort dictionary into location order with unresolved C allocations first. -C + JSTRT = 2 DO 150 I = 1, NNAMES(ICOL)-1 IF (DPOINT(I,ICOL,2) .GE. 0) THEN @@ -125,9 +125,9 @@ SUBROUTINE MXLIST (UNIT, OFFSET, END IF 190 CONTINUE 200 CONTINUE -C + C STARTING STUFF FOR LOOP -C + DO 210 IDICT = 1, NNAMES(ICOL) IF (DPOINT(IDICT,ICOL,2) .GE. 0) GO TO 220 210 CONTINUE @@ -142,12 +142,12 @@ SUBROUTINE MXLIST (UNIT, OFFSET, NXTLOC = 0 END IF IVOID = 1 -C + WRITE (UNIT, 10080) ILIST = 0 -C + C Deferred space names first. -C + DTOT = 0 DCTOT = 0 DO 230 IDICT = 1, NNAMES(ICOL) @@ -165,9 +165,9 @@ SUBROUTINE MXLIST (UNIT, OFFSET, 240 CONTINUE IF (IDICT .GT. 1) WRITE (UNIT, 10030) * 'DEFERRED TOTAL', DTOT, DCTOT -C + C LOOP -C + TOTAL = 0 SUBTOT = 0 CSTOT = 0 @@ -241,9 +241,9 @@ SUBROUTINE MXLIST (UNIT, OFFSET, WRITE (UNIT, 10030) 'BLOCK SIZE', SUBTOT, CSTOT WRITE (UNIT, 10030) 'ALLOCATED TOTAL', TOTAL, CTOT WRITE (UNIT, 10030) ' GRAND TOTAL', TOTAL+DTOT, CTOT+DCTOT -C + C SORT DICTIONARY BACK INTO NAME ORDER -C + DO 280 I = 1, NNAMES(ICOL)-1 DO 270 J = I+1, NNAMES(ICOL) IF (DICT(J,ICOL) .LT. DICT(I,ICOL)) THEN diff --git a/packages/seacas/libraries/supes/mem_mgr/mxlong.f b/packages/seacas/libraries/supes/mem_mgr/mxlong.f index ecd36b4198d2..592ce87fc181 100644 --- a/packages/seacas/libraries/supes/mem_mgr/mxlong.f +++ b/packages/seacas/libraries/supes/mem_mgr/mxlong.f @@ -1,18 +1,18 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details SUBROUTINE MXLONG (NAME1, NEWLEN, NEWLOC, MYV, MYCHAR, MYLOC, * MYCLOC, UCLOC, COFFST, OFFSET, * DICT, DPOINT, LDICT, NNAMES, VOID, LVOID, NVOIDS, * FILL, FDATA, CFILL, CFDATA, CHRNUM, CHRCOL, LASTER) -C + IMPLICIT INTEGER (A-Z) INCLUDE 'params.inc' -C + C*********************************************************************** -C + C NAME1 Name of the vector which changes length CHARACTER*8 NAME1 C NEWLEN The new length of the vector @@ -47,17 +47,17 @@ SUBROUTINE MXLONG (NAME1, NEWLEN, NEWLOC, MYV, MYCHAR, MYLOC, C CHRNUM Number of characters per numeric storage unit C CHRCOL Number of column for character names. C LASTER Error return -C + C*********************************************************************** -C + C Get current location and length. -C + CALL MXFIND (NAME1, DICT, DPOINT, LDICT, NNAMES, * CHRCOL, LASTER, ROW) IF (LASTER .NE. SUCESS) RETURN -C + C Save the current location of the array. -C + OLDLOC = DPOINT(ROW,1,1) OLDLEN = DPOINT(ROW,1,2) @@ -88,9 +88,9 @@ SUBROUTINE MXLONG (NAME1, NEWLEN, NEWLOC, MYV, MYCHAR, MYLOC, DPOINT(ROW,1,1) = oldadr+1-myloc NEWLOC = DPOINT(ROW,1,1) + OFFSET DPOINT(ROW,1,2) = NEWLEN -C + C Perform data fill if appropriate. -C + IF (FILL) THEN DO 120 I = DPOINT(ROW,1,1)+OLDLEN, DPOINT(ROW,1,1)+NEWLEN-1-7,8 MYV(I+0) = FDATA diff --git a/packages/seacas/libraries/supes/mem_mgr/mxlook.f b/packages/seacas/libraries/supes/mem_mgr/mxlook.f index d64e98bb6e65..86ad4f1f54e0 100644 --- a/packages/seacas/libraries/supes/mem_mgr/mxlook.f +++ b/packages/seacas/libraries/supes/mem_mgr/mxlook.f @@ -1,17 +1,17 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details SUBROUTINE MXLOOK (MNGET, VOID, LVOID, NVOIDS, VROW, LASTER) -C + IMPLICIT INTEGER (A-Z) INCLUDE 'params.inc' -C + C This routine looks for space in the void table. -C + C*********************************************************************** -C + C MNGET Amount of space requested. C VOID Void table. C LVOID Dimension of void table. @@ -19,19 +19,19 @@ SUBROUTINE MXLOOK (MNGET, VOID, LVOID, NVOIDS, VROW, LASTER) DIMENSION VOID(LVOID,2) C VROW Row number that contains void to satisfy space request. C LASTER Error return. -C + C*********************************************************************** -C + C CHECK TO SEE IF A VOID WILL CONTAIN THE MEMORY REQUEST. -C + VROW = 0 VLEN = 0 DO 100 I = 1, NVOIDS IF (VOID(I,2) .GE. MNGET) THEN -C + C THIS VOID HAS ENOUGH ROOM - FIND THE SMALLEST VOID THAT C IS LARGE ENOUGH. -C + IF (VLEN .EQ. 0 .OR. VOID(I,2) .LT. VLEN) THEN VROW = I VLEN = VOID(I,2) diff --git a/packages/seacas/libraries/supes/mem_mgr/mxnsrt.f b/packages/seacas/libraries/supes/mem_mgr/mxnsrt.f index 5afcf8bfa389..72ef1428a0d9 100644 --- a/packages/seacas/libraries/supes/mem_mgr/mxnsrt.f +++ b/packages/seacas/libraries/supes/mem_mgr/mxnsrt.f @@ -1,22 +1,22 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details SUBROUTINE MXNSRT (NAME1, NEWLOC, NEWLEN, * DICT, DPOINT, LDICT, * NNAMES, CHRCOL, LASTER) -C + IMPLICIT INTEGER (A-Z) INCLUDE 'params.inc' -C + C This routine updates the dictionary with a new name (if it is new) C and updates the location and length tables. The length of the C dictionary is checked before the new name is added. If LASTER is C not returned with a value of SUCESS, the tables are unchanged. -C + C*********************************************************************** -C + C NAME1 Name to be inserted CHARACTER*8 NAME1 C NEWLOC Location of storage @@ -29,18 +29,18 @@ SUBROUTINE MXNSRT (NAME1, NEWLOC, NEWLEN, DIMENSION DPOINT(LDICT,CHRCOL,3), NNAMES(2) C CHRCOL Number of column for character names. C LASTER Error return -C + C*********************************************************************** -C + C IS THERE ROOM IN THE DICTIONARY? -C + IF (NNAMES(1) .GE. LDICT) THEN LASTER = DFULL RETURN END IF -C + C FIND NAME1 IN DICTIONARY -C + CALL MXFIND (NAME1, DICT, DPOINT, LDICT, NNAMES, * CHRCOL, LASTER, ROW) IF (LASTER .EQ. WRTYPE) THEN @@ -51,9 +51,9 @@ SUBROUTINE MXNSRT (NAME1, NEWLOC, NEWLEN, ELSE IF (LASTER .EQ. NONAME) THEN LASTER = SUCESS END IF -C + C UPDATE DICTIONARY. -C + CALL SHFTC (DICT, CHRCOL*LDICT, ROW, NNAMES(1), -1) CALL SHFTI (DPOINT, CHRCOL*LDICT, 3, ROW, NNAMES(1), -1) NNAMES(1) = NNAMES(1) + 1 diff --git a/packages/seacas/libraries/supes/mem_mgr/mxprnt.f b/packages/seacas/libraries/supes/mem_mgr/mxprnt.f index d334443828f7..cd0ffd246b5d 100644 --- a/packages/seacas/libraries/supes/mem_mgr/mxprnt.f +++ b/packages/seacas/libraries/supes/mem_mgr/mxprnt.f @@ -1,16 +1,16 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details SUBROUTINE MXPRNT (NAME1, UNIT, NAME2, MYV, RMYV, OFFSET, * DICT, DPOINT, LDICT, NNAMES, CHRCOL, NCOLP, LASTER) -C + IMPLICIT INTEGER (A-Z) INCLUDE 'params.inc' -C + C*********************************************************************** -C + C NAME1 Name of array to be printed CHARACTER*8 NAME1 C UNIT Output unit number. @@ -29,11 +29,11 @@ SUBROUTINE MXPRNT (NAME1, UNIT, NAME2, MYV, RMYV, OFFSET, C CHRCOL Number of column for character names. C NCOLP Number of print columns C LASTER Error return -C + C*********************************************************************** -C + C FIND NAME1 IN DICTIONARY -C + CALL MXFIND (NAME1, DICT, DPOINT, LDICT, NNAMES, * CHRCOL, LASTER, ROW) IF (LASTER .NE. SUCESS) RETURN @@ -47,9 +47,9 @@ SUBROUTINE MXPRNT (NAME1, UNIT, NAME2, MYV, RMYV, OFFSET, RETURN END IF IF (NAME2(1:1) .EQ. 'R') THEN -C + C VECTOR IS REAL -C + NCOL=(NCOLP-11)/13 NROW=DPOINT(ROW,1,2)/NCOL+1 NGRP=NROW/10+1 @@ -65,11 +65,11 @@ SUBROUTINE MXPRNT (NAME1, UNIT, NAME2, MYV, RMYV, OFFSET, WRITE(UNIT,10020)J,(RMYV(K),K=J+DELTA,KU+DELTA) 100 CONTINUE 110 CONTINUE -C + ELSE IF (NAME2(1:1) .EQ. 'I') THEN -C + C VECTOR IS INTEGER -C + NCOL=(NCOLP-11)/10 NROW=DPOINT(ROW,1,2)/NCOL+1 NGRP=NROW/10+1 @@ -85,14 +85,14 @@ SUBROUTINE MXPRNT (NAME1, UNIT, NAME2, MYV, RMYV, OFFSET, WRITE(UNIT,10030)J,(MYV(K),K=J+DELTA,KU+DELTA) 120 CONTINUE 130 CONTINUE -C + ELSE -C + C TYPE IS UNKNOWN -C + LASTER = BDTYPE RETURN -C + END IF LASTER = SUCESS RETURN diff --git a/packages/seacas/libraries/supes/mem_mgr/mxrsrv.f b/packages/seacas/libraries/supes/mem_mgr/mxrsrv.f index 11a1c4c94d14..accd08876891 100644 --- a/packages/seacas/libraries/supes/mem_mgr/mxrsrv.f +++ b/packages/seacas/libraries/supes/mem_mgr/mxrsrv.f @@ -1,23 +1,23 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details SUBROUTINE MXRSRV (MYV, NAME1, NEWLEN, NEWLOC, MYLOC, OFFSET, * VOID, LVOID, * NVOIDS, DICT, DPOINT, LDICT, NNAMES, CHRCOL, * DEFER, FILL, FDATA, * LASTER) -C + IMPLICIT INTEGER (A-Z) INCLUDE 'params.inc' -C + C This routine finds space to service a non-negative space request. C If zero space is requested, a valid pointer of 1 will be C generated. -C + C*********************************************************************** -C + C MYV Internal reference array. DIMENSION MYV(*) C NAME1 Name to be inserted in the dictionary @@ -43,58 +43,58 @@ SUBROUTINE MXRSRV (MYV, NAME1, NEWLEN, NEWLOC, MYLOC, OFFSET, C FDATA Data for fill. LOGICAL FILL C LASTER Error return -C + C*********************************************************************** -C + LASTER = SUCESS MYLEN = NEWLEN -C + IF (NEWLEN .EQ. 0) THEN -C + C Zero length entry. -C + NEWLOC = 1 - OFFSET -C + ELSE IF (DEFER) THEN -C + CALL MXLOOK (MYLEN, VOID, CHRCOL*LVOID, NVOIDS(1), * VROW, LASTER) -C + IF (LASTER .EQ. SUCESS) THEN NEWLOC = VOID(VROW,1,1) ELSE IF (LASTER .EQ. NOGET) THEN -C + C A good void was not found - defer the space request. -C + NEWLOC = IXLNUM(NEWLOC) MYLEN = - NEWLEN LASTER = SUCESS -C + END IF -C + ELSE -C + C Get space. -C + CALL MXGET (MYLOC, MYLEN, VOID, LVOID, NVOIDS, * CHRCOL, LASTER, VROW) IF (LASTER .NE. SUCESS) RETURN -C + NEWLOC = VOID(VROW,1,1) -C + END IF -C + C Update dictionary. -C + CALL MXNSRT (NAME1, NEWLOC, MYLEN, DICT, DPOINT, LDICT, * NNAMES, CHRCOL, LASTER) IF (LASTER .EQ. WRTYPE) LASTER = BDNAME IF (LASTER .NE. SUCESS) RETURN -C + IF (MYLEN .GT. 0) THEN -C + C Data fill pattern. -C + IF (FILL) THEN DO 100 I = VOID(VROW,1,1), VOID(VROW,1,1)+MYLEN-1-7,8 MYV(I+0) = FDATA @@ -110,19 +110,19 @@ SUBROUTINE MXRSRV (MYV, NAME1, NEWLEN, NEWLOC, MYLOC, OFFSET, MYV(J) = FDATA 110 continue END IF -C + C Update void table. -C + VOID(VROW,1,1) = VOID(VROW,1,1) + MYLEN VOID(VROW,1,2) = VOID(VROW,1,2) - MYLEN CALL VTABLE (1, 0, VOID, LVOID, NVOIDS(1), CHRCOL, LASTER) NEWLOC = NEWLOC + OFFSET -C + ELSE IF (MYLEN .LT. 0) THEN -C + NEWLOC = OFFSET - MYLOC -C + END IF -C + RETURN END diff --git a/packages/seacas/libraries/supes/mem_mgr/mycomp.f b/packages/seacas/libraries/supes/mem_mgr/mycomp.f index 311a071c4fe5..e1a1e5b4de74 100644 --- a/packages/seacas/libraries/supes/mem_mgr/mycomp.f +++ b/packages/seacas/libraries/supes/mem_mgr/mycomp.f @@ -1,18 +1,18 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details SUBROUTINE MYCOMP (MYV, VOID, LVOID, * NVOIDS, DPOINT, LDICT, NNAMES, CHRCOL, LASTER) -C + IMPLICIT INTEGER (A-Z) INCLUDE 'params.inc' -C + C THIS ROUTINE PERFORMS THE NUMERIC DATA COMPRESSION OPERATION. -C + C************************************************************************ -C + C MYV Reference array C VOID Void table C LVOID Dimension of VOID @@ -22,19 +22,19 @@ SUBROUTINE MYCOMP (MYV, VOID, LVOID, C NNAMES Number of names C CHRCOL Column for character tables C LASTER Error return code -C + DIMENSION DPOINT(LDICT,CHRCOL,2), VOID(LVOID,CHRCOL,2) DIMENSION NNAMES(2), NVOIDS(2) CHARACTER*1 MYV(1) -C + C************************************************************************ -C + LASTER = SUCESS -C + C The basic strategy is to look for an array in the dictionary C which is immediately preceded by a void. If found, a shift C is performed, and the void table is updated. -C + IVOID = 0 100 CONTINUE IVOID = IVOID + 1 @@ -43,9 +43,9 @@ SUBROUTINE MYCOMP (MYV, VOID, LVOID, DO 120 IDICT = 1, NNAMES(2) DADDR = DPOINT(IDICT,2,1) IF (VADDR .EQ. DADDR .AND. DPOINT(IDICT,2,2) .GT. 0) THEN -C + C Perform data shift and update void table. -C + CALL SHFTC (MYV, LDICT, * DADDR, DADDR+DPOINT(IDICT,2,2)-1, VOID(IVOID,2,2)) DPOINT(IDICT,2,1) = VOID(IVOID,2,1) @@ -54,7 +54,7 @@ SUBROUTINE MYCOMP (MYV, VOID, LVOID, * CHRCOL, LASTER) IF (LASTER .NE. SUCESS) RETURN GO TO 110 -C + END IF 120 CONTINUE GO TO 100 diff --git a/packages/seacas/libraries/supes/mem_mgr/mydel.f b/packages/seacas/libraries/supes/mem_mgr/mydel.f index bf181179ce30..375d4004dfc3 100644 --- a/packages/seacas/libraries/supes/mem_mgr/mydel.f +++ b/packages/seacas/libraries/supes/mem_mgr/mydel.f @@ -1,19 +1,19 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details SUBROUTINE MYDEL (NAME1, DICT, DPOINT, LDICT, NNAMES, VOID, * LVOID, NVOIDS, CHRCOL, LASTER, MYLOC, MYCLOC) -C + IMPLICIT INTEGER (A-Z) INCLUDE 'params.inc' -C + C This routine removes a name from the dictionary and returns the C available space to the void table. -C + C*********************************************************************** -C + C NAME1 Name to be deleted CHARACTER*8 NAME1 C DICT Dictionary name table @@ -28,27 +28,27 @@ SUBROUTINE MYDEL (NAME1, DICT, DPOINT, LDICT, NNAMES, VOID, DIMENSION VOID(LVOID,CHRCOL,2), NVOIDS(2) C CHRCOL Number of column for character names. C LASTER Error return -C + C*********************************************************************** -C + C FIND NAME1 IN DICTIONARY. -C + CALL MYFIND (NAME1, DICT, DPOINT, LDICT, NNAMES, * CHRCOL, LASTER, ROW) IF (LASTER .NE. SUCESS) RETURN -C + LOC = DPOINT(ROW,CHRCOL,1) LEN = DPOINT(ROW,CHRCOL,2) -C + C DELETE DICTIONARY ENTRY. -C + CALL SHFTC (DICT(1,CHRCOL), CHRCOL*LDICT, ROW+1, * NNAMES(CHRCOL), 1) CALL SHFTI (DPOINT(1,CHRCOL,1), CHRCOL*LDICT, 3, ROW+1, * NNAMES(CHRCOL), 1) NNAMES(CHRCOL) = NNAMES(CHRCOL) - 1 IF (LEN .LE. 0) RETURN -C + C ... Using malloc/free -- let system manage void space. Return C memory to system via 'free'. The value given to memret C is a flag which tells the system that this is a 'safe' free diff --git a/packages/seacas/libraries/supes/mem_mgr/myfind.f b/packages/seacas/libraries/supes/mem_mgr/myfind.f index 8c08f8e00a26..4197868af360 100644 --- a/packages/seacas/libraries/supes/mem_mgr/myfind.f +++ b/packages/seacas/libraries/supes/mem_mgr/myfind.f @@ -1,16 +1,16 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details SUBROUTINE MYFIND (NAME1, DICT, DPOINT, LDICT, NNAMES, * CHRCOL, LASTER, ROW) -C + IMPLICIT INTEGER (A-Z) INCLUDE 'params.inc' -C + C*********************************************************************** -C + C NAME1 Name to be found CHARACTER*8 NAME1 C DICT Dictionary name table @@ -23,28 +23,28 @@ SUBROUTINE MYFIND (NAME1, DICT, DPOINT, LDICT, NNAMES, C CHRCOL Column number for character array names. C LASTER Error return C ROW Location of found name or place to insert new name -C + C*********************************************************************** -C + CALL SRCHC (DICT, 1, NNAMES(1), NAME1, ERR, ROW) IF (ERR .EQ. 1) THEN IF (DPOINT(ROW,1,3) .NE. -1) THEN -C + C The found name is a name for a character array. LASTER = SUCESS -C + ELSE -C + C The names was found and is of numeric type. LASTER = WRTYPE END IF -C + ELSE IF (CHRCOL .EQ. 1) THEN -C + C ENTRY NOT FOUND. -C + LASTER = NONAME -C + ELSE CALL SRCHC (DICT(1,2), 1, NNAMES(2), NAME1, ERR, ROW) IF (ERR .EQ. 1) THEN @@ -53,6 +53,6 @@ SUBROUTINE MYFIND (NAME1, DICT, DPOINT, LDICT, NNAMES, LASTER = NONAME END IF END IF -C + RETURN END diff --git a/packages/seacas/libraries/supes/mem_mgr/myget.f b/packages/seacas/libraries/supes/mem_mgr/myget.f index 5c7dab17e494..e286dfd5c15b 100644 --- a/packages/seacas/libraries/supes/mem_mgr/myget.f +++ b/packages/seacas/libraries/supes/mem_mgr/myget.f @@ -1,22 +1,21 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details SUBROUTINE MYGET (MYLOC, MNGET, VOID, LVOID, NVOIDS, * CHRCOL, MAXSIZ, LASTER, VROW) -C + IMPLICIT INTEGER (A-Z) INCLUDE 'params.inc' -C + C This subroutine returns the location (row number) of a void with C sufficient space for the memory request. If necessary, memory is C requested from the system. The memory is contiguous. C This routine is to be used only if CHRCOL = 2. -C -C + C*********************************************************************** -C + C MYLOC Address of internal reference array C MNGET Memory request in character storage units C VOID Void table @@ -27,11 +26,11 @@ SUBROUTINE MYGET (MYLOC, MNGET, VOID, LVOID, NVOIDS, C MAXSIZ Dimension of static character array. C LASTER Error return C VROW Row number of void which satisfies the memory request -C + C*********************************************************************** -C + C IS THE MEMORY REQUEST SENSIBLE? -C + IF (MNGET .LT. 0) THEN LASTER = BADLEN RETURN @@ -39,33 +38,33 @@ SUBROUTINE MYGET (MYLOC, MNGET, VOID, LVOID, NVOIDS, LASTER = SUCESS RETURN END IF -C + CALL MXLOOK (MNGET, VOID(1,CHRCOL,1), CHRCOL*LVOID, * NVOIDS(CHRCOL), VROW, LASTER) IF (LASTER .EQ. SUCESS) RETURN -C + C CALL EXTENSION LIBRARY ROUTINE TO GET SPACE FROM SYSTEM. -C + CALL MYMEMY (MNGET, LOC, MEMRET, MAXSIZ) LOC = LOC - MYLOC + 1 -C + IF (MEMRET .LT. 0) THEN -C + C ILLEGAL MEMORY BLOCK SIZE. -C + LASTER = ILBLK RETURN -C + END IF -C + C UPDATE VOID TABLE. -C + CALL VTABLE (LOC, MEMRET, VOID(1,CHRCOL,1), LVOID, * NVOIDS(CHRCOL), CHRCOL, LASTER) IF (LASTER .NE. SUCESS) RETURN -C + CALL MXLOOK (MNGET, VOID(1,CHRCOL,1), CHRCOL*LVOID, * NVOIDS(CHRCOL), VROW, LASTER) -C + RETURN END diff --git a/packages/seacas/libraries/supes/mem_mgr/mylong.f b/packages/seacas/libraries/supes/mem_mgr/mylong.f index 012be2dfce92..67c8257528d3 100644 --- a/packages/seacas/libraries/supes/mem_mgr/mylong.f +++ b/packages/seacas/libraries/supes/mem_mgr/mylong.f @@ -1,18 +1,18 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details SUBROUTINE MYLONG (NAME1, NEWLEN, NEWLOC, MYV, MYCHAR, MYLOC, * MYCLOC, UCLOC, COFFST, OFFSET, * DICT, DPOINT, LDICT, NNAMES, VOID, LVOID, NVOIDS, * FILL, FDATA, CFILL, CFDATA, CHRNUM, CHRCOL, MAXSIZ, LASTER) -C + IMPLICIT INTEGER (A-Z) INCLUDE 'params.inc' -C + C*********************************************************************** -C + C NAME1 Name of the vector which changes length CHARACTER*8 NAME1 C NEWLEN The new length of the vector (character units) @@ -48,19 +48,19 @@ SUBROUTINE MYLONG (NAME1, NEWLEN, NEWLOC, MYV, MYCHAR, MYLOC, C CHRCOL Number of column for character names. C MAXSIZ Dimension of static character array. C LASTER Error return -C + C*********************************************************************** -C + INTLEN = (NEWLEN + CHRNUM - 1) / CHRNUM -C + C Get current location and length. -C + CALL MYFIND (NAME1, DICT, DPOINT, LDICT, NNAMES, * CHRCOL, LASTER, ROW) IF (LASTER .NE. SUCESS) RETURN -C + C Save the current location of the array. -C + OLDLOC = DPOINT(ROW,CHRCOL,1) OLDLEN = DPOINT(ROW,CHRCOL,2) OLDCL = DPOINT(ROW,CHRCOL,3) @@ -109,9 +109,9 @@ SUBROUTINE MYLONG (NAME1, NEWLEN, NEWLOC, MYV, MYCHAR, MYLOC, NEWLOC = (DPOINT(ROW,CHRCOL,1) - 1) * CHRNUM + 1 + COFFST DPOINT(ROW,CHRCOL,2) = INTLEN DPOINT(ROW,CHRCOL,3) = NEWLEN -C + C Perform data fill if appropriate. -C + IF (CFILL) THEN I1 = NEWLOC + UCLOC - MYCLOC + OLDCL I2 = I1 + NEWLEN - OLDCL - 1 @@ -119,6 +119,6 @@ SUBROUTINE MYLONG (NAME1, NEWLEN, NEWLOC, MYV, MYCHAR, MYLOC, MYCHAR(I) = CFDATA 130 CONTINUE END IF -C + RETURN END diff --git a/packages/seacas/libraries/supes/mem_mgr/mymemy.f b/packages/seacas/libraries/supes/mem_mgr/mymemy.f index 8beca2ed3551..c4b8e32ef36b 100644 --- a/packages/seacas/libraries/supes/mem_mgr/mymemy.f +++ b/packages/seacas/libraries/supes/mem_mgr/mymemy.f @@ -1,54 +1,54 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details SUBROUTINE MYMEMY( MEMREQ, LOCBLK, MEMRTN, MAXSIZ ) SAVE NUSED DATA NUSED /0/ -C + ************************************************************************ -C + C FORTRAN EXTENSION LIBRARY - ANSI FORTRAN - USER INTERFACE ROUTINE -C + C DESCRIPTION: C This routine requests the operating system to allocate or release C numeric storage. A positive MEMREQ indicates a request for memory, C while a negative MEMREQ indicates a release. All locations and C sizes are measured in numeric storage units. -C + C In memory request mode, MEMRTN .LT. MEMREQ indicates an error. -C + C In memory release mode, MEMRTN .LE. -MEMREQ. Furthermore, memory C must be released from the top down, i.e., LOCBLK must not change. -C + C This version actually allocates storage from a static pool, whose C size is defined by the parameter MAXSIZ. If system dependent C support for the function IXLNUM is not implemented, the PARAMETER C and COMMON statements above must be duplicated in the caller. -C + C FORMAL PARAMETERS: C MEMREQ INTEGER Number of numeric units C LOCBLK INTEGER Location of memory block C MEMRTN INTEGER Size of memory block at routine completion C MAXSIZ INTEGER Size of character memory - dimension in C MDINIT. -C + C SAVED VARIABLES: C NUSED INTEGER Number of units dynamically allocated -C + ************************************************************************ -C + IF ( MEMREQ .GE. 0 ) THEN -C + C Allocate storage - LOCBLK = 1 + NUSED MEMRTN = MIN( MAXSIZ-NUSED , MEMREQ ) NUSED = NUSED + MEMRTN ELSE -C + MEMRTN = -MEMREQ END IF -C + RETURN END diff --git a/packages/seacas/libraries/supes/mem_mgr/mynsrt.f b/packages/seacas/libraries/supes/mem_mgr/mynsrt.f index 9c02c0208199..35adcc5d5262 100644 --- a/packages/seacas/libraries/supes/mem_mgr/mynsrt.f +++ b/packages/seacas/libraries/supes/mem_mgr/mynsrt.f @@ -1,22 +1,22 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details SUBROUTINE MYNSRT (NAME1, NEWLOC, NUMLEN, CLEN, * DICT, DPOINT, LDICT, * NNAMES, CHRCOL, LASTER) -C + IMPLICIT INTEGER (A-Z) INCLUDE 'params.inc' -C + C This routine updates the dictionary with a new name (if it is new) C and updates the location and length tables. The length of the C dictionary is checked before the new name is added. If LASTER is C not returned with a value of SUCESS, the tables are unchanged. -C + C*********************************************************************** -C + C NAME1 Name to be inserted CHARACTER*8 NAME1 C NEWLOC Location of storage @@ -30,18 +30,18 @@ SUBROUTINE MYNSRT (NAME1, NEWLOC, NUMLEN, CLEN, DIMENSION DPOINT(LDICT,CHRCOL,3), NNAMES(2) C CHRCOL Number of column for character names. C LASTER Error return -C + C*********************************************************************** -C + C IS THERE ROOM IN THE DICTIONARY? -C + IF (NNAMES(CHRCOL) .GE. LDICT) THEN LASTER = DFULL RETURN END IF -C + C FIND NAME1 IN DICTIONARY -C + CALL MYFIND (NAME1, DICT, DPOINT, LDICT, NNAMES, * CHRCOL, LASTER, ROW) IF (LASTER .EQ. WRTYPE) THEN @@ -52,9 +52,9 @@ SUBROUTINE MYNSRT (NAME1, NEWLOC, NUMLEN, CLEN, ELSE IF (LASTER .EQ. NONAME) THEN LASTER = SUCESS END IF -C + C UPDATE DICTIONARY. -C + CALL SHFTC (DICT(1,CHRCOL), CHRCOL*LDICT, ROW, NNAMES(CHRCOL), -1) CALL SHFTI (DPOINT(1,CHRCOL,1), CHRCOL*LDICT, 3, ROW, * NNAMES(CHRCOL), -1) diff --git a/packages/seacas/libraries/supes/mem_mgr/myprnt.f b/packages/seacas/libraries/supes/mem_mgr/myprnt.f index a4967003e6a8..cb992d023e81 100644 --- a/packages/seacas/libraries/supes/mem_mgr/myprnt.f +++ b/packages/seacas/libraries/supes/mem_mgr/myprnt.f @@ -1,17 +1,17 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details SUBROUTINE MYPRNT (NAME1, UNIT, MYCV, OFFSET, TOFFST, * DICT, DPOINT, LDICT, NNAMES, CHRNUM, * CHRCOL, NCOLP, WRDSIZ, LASTER) -C + IMPLICIT INTEGER (A-Z) INCLUDE 'params.inc' -C + C*********************************************************************** -C + C NAME1 Name of array to be printed CHARACTER*8 NAME1 C UNIT Output unit number. @@ -31,18 +31,17 @@ SUBROUTINE MYPRNT (NAME1, UNIT, MYCV, OFFSET, TOFFST, C NCOLP Number of print columns C WRDSIZ Number of characters to group together in printing. C LASTER Error return -C + C*********************************************************************** -C -C + C Check worklength -C + IF (WRDSIZ .LT. 1 .OR. WRDSIZ+2+11 .GT. NCOLP) THEN LASTER = BADLEN RETURN END IF C FIND NAME1 IN DICTIONARY -C + CALL MYFIND (NAME1, DICT, DPOINT, LDICT, NNAMES, * CHRCOL, LASTER, ROW) IF (LASTER .NE. SUCESS) RETURN @@ -56,7 +55,7 @@ SUBROUTINE MYPRNT (NAME1, UNIT, MYCV, OFFSET, TOFFST, * 'MODE AND IS NOT YET RESOLVED.' RETURN END IF -C + DELTA = (DPOINT(ROW,CHRCOL,1) - 1) * CHRNUM + TOFFST NCOL = (NCOLP - 11) / (WRDSIZ + 2) NROW = (DPOINT(ROW,CHRCOL,3) + WRDSIZ * NCOL - 1) @@ -78,7 +77,7 @@ SUBROUTINE MYPRNT (NAME1, UNIT, MYCV, OFFSET, TOFFST, J = J + NCOL * WRDSIZ 100 CONTINUE 110 CONTINUE -C + LASTER = SUCESS RETURN 10000 FORMAT('0'/'0ARRAY NAME = ',A,3X,'LOCATION = ',I16,3X, diff --git a/packages/seacas/libraries/supes/mem_mgr/myrsrv.f b/packages/seacas/libraries/supes/mem_mgr/myrsrv.f index a37661207948..5ca7840a2b5c 100644 --- a/packages/seacas/libraries/supes/mem_mgr/myrsrv.f +++ b/packages/seacas/libraries/supes/mem_mgr/myrsrv.f @@ -1,23 +1,23 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details SUBROUTINE MYRSRV (MYCV, NAME1, NEWLEN, NEWLOC, MYLOC, MYCLOC, * UCLOC, OFFSET, COFFST, VOID, LVOID, * NVOIDS, DICT, DPOINT, LDICT, NNAMES, CHRCOL, CHRNUM, * DEFER, CFILL, CFDATA, MAXSIZ, * LASTER) -C + IMPLICIT INTEGER (A-Z) INCLUDE 'params.inc' -C + C This routine finds space to service a non-negative space request. C If zero space is requested, a valid pointer of 1 will be C generated. -C + C*********************************************************************** -C + C MYCV Internal reference array. CHARACTER MYCV(*) C NAME1 Name to be inserted in the dictionary @@ -53,64 +53,64 @@ SUBROUTINE MYRSRV (MYCV, NAME1, NEWLEN, NEWLOC, MYLOC, MYCLOC, CHARACTER*1 CFDATA C MAXSIZ Dimension of static character array. C LASTER Error return -C + C*********************************************************************** -C + LASTER = SUCESS INTLEN = (NEWLEN + CHRNUM - 1) / CHRNUM -C + IF (NEWLEN .EQ. 0) THEN -C + C Zero length entry. -C + NEWLOC = 1 - COFFST / CHRNUM ELSE -C + CALL MXLOOK (INTLEN, VOID(1,CHRCOL,1), CHRCOL*LVOID, * NVOIDS(CHRCOL), VROW, LASTER) -C + IF (LASTER .EQ. SUCESS) THEN NEWLOC = VOID(VROW,1,1) ELSE IF (DEFER .AND. CHRCOL .EQ. 1) THEN -C + C A good void was not found - defer the space request. -C + NEWLOC = IXLNUM(NEWLOC) INTLEN = - INTLEN LASTER = SUCESS -C + ELSE IF (CHRCOL .EQ. 1) THEN -C + C Get space. -C + CALL MXGET (MYLOC, INTLEN, VOID, LVOID, * NVOIDS, CHRCOL, LASTER, VROW) IF (LASTER .NE. SUCESS) RETURN NEWLOC = VOID(VROW,1,1) -C + ELSE -C + C CHRCOL .EQ. 2 -C + CALL MYGET (MYCLOC, NEWLEN, VOID, LVOID, * NVOIDS, CHRCOL, MAXSIZ, LASTER, VROW) IF (LASTER .NE. SUCESS) RETURN NEWLOC = VOID(VROW,2,1) -C + END IF END IF -C + C Update dictionary. -C + CALL MYNSRT (NAME1, NEWLOC, INTLEN, NEWLEN, DICT, DPOINT, LDICT, * NNAMES, CHRCOL, LASTER) IF (LASTER .EQ. WRTYPE) LASTER = BDNAME IF (LASTER .NE. SUCESS) RETURN -C + IF (INTLEN .GT. 0) THEN -C + C Data fill pattern. -C + IF (CFILL) THEN TLOC = (VOID(VROW,CHRCOL,1) - 1) * CHRNUM + 1 + COFFST * + UCLOC - MYCLOC @@ -118,9 +118,9 @@ SUBROUTINE MYRSRV (MYCV, NAME1, NEWLEN, NEWLOC, MYLOC, MYCLOC, MYCV(I) = CFDATA 100 CONTINUE END IF -C + C Update void table. -C + VOID(VROW,CHRCOL,1) = VOID(VROW,CHRCOL,1) + INTLEN VOID(VROW,CHRCOL,2) = VOID(VROW,CHRCOL,2) - INTLEN CALL VTABLE (1, 0, VOID(1,CHRCOL,1), LVOID, NVOIDS(CHRCOL), @@ -129,6 +129,6 @@ SUBROUTINE MYRSRV (MYCV, NAME1, NEWLEN, NEWLOC, MYLOC, MYCLOC, ELSE NEWLOC = - UCLOC END IF -C + RETURN END diff --git a/packages/seacas/libraries/supes/mem_mgr/params.inc b/packages/seacas/libraries/supes/mem_mgr/params.inc index e54f59be55e5..d5d457304048 100644 --- a/packages/seacas/libraries/supes/mem_mgr/params.inc +++ b/packages/seacas/libraries/supes/mem_mgr/params.inc @@ -1,11 +1,11 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details PARAMETER (NERVEC=18) - PARAMETER (SUCESS=1, NOGET=2, NOINIT=3, REINIT=4, NONAME=5, - * BDNAME=6, BADLEN=7, BDTYPE=8, DFULL=9, VFULL=10, BFULL=11, + PARAMETER (SUCESS=1, NOGET=2, NOINIT=3, REINIT=4, NONAME=5, + * BDNAME=6, BADLEN=7, BDTYPE=8, DFULL=9, VFULL=10, BFULL=11, * BDVOID=12, BDBLK=13, ILBLK=14, BADCOD=15, BADNAM=16, * DEFRON=17, WRTYPE=18, BADOFF=18) -C + diff --git a/packages/seacas/libraries/supes/mem_mgr/shftc.f b/packages/seacas/libraries/supes/mem_mgr/shftc.f index be5e55db994c..de018792f165 100644 --- a/packages/seacas/libraries/supes/mem_mgr/shftc.f +++ b/packages/seacas/libraries/supes/mem_mgr/shftc.f @@ -1,41 +1,41 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details SUBROUTINE SHFTC(IARAY,N,ISTRT,IEND,INT) -C + C THIS SUBROUTINE SHIFTS THE ROWS IN A CHARACTER ARRAY. IF INT>0 C THEN ALL ROWS ISTRT TO IEND ARE SHIFTED UP "INT" ROWS. IF INT<0 C THEN ALL ROWS ISTRT TO IEND ARE SHIFTED DOWN "INT" ROWS. -C + C MODIFIED JAN 1986 BY BILL MILLS-CURRAN C THE CHARACTER ARRAY IS NOW 1-D RATHER THAN 2-D. -C + CHARACTER*(*) IARAY(N) -C + C CALCULATE RANGE AND INCREMENT OF DO LOOP -C + IF(INT.LT.0)THEN -C + C SHIFT DOWN -C + I1=IEND I2=ISTRT ID=-1 ELSE IF(INT.GT.0)THEN -C + C SHIFT UP -C + I1=ISTRT I2=IEND ID=1 ELSE RETURN END IF -C + C PERFORM SHIFT -C + DO I=I1,I2,ID IARAY(I-INT)=IARAY(I) END DO diff --git a/packages/seacas/libraries/supes/mem_mgr/shfti.f b/packages/seacas/libraries/supes/mem_mgr/shfti.f index fee21dee5750..2e6a205bb654 100644 --- a/packages/seacas/libraries/supes/mem_mgr/shfti.f +++ b/packages/seacas/libraries/supes/mem_mgr/shfti.f @@ -1,38 +1,38 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details SUBROUTINE SHFTI(IARAY,N,M,ISTRT,IEND,INT) -C + C THIS SUBROUTINE SHIFTS THE ROWS IN AN INTEGER ARRAY. IF INT>0 THEN C ALL ROWS ISTRT TO IEND ARE SHIFTED UP "INT" ROWS. IF INT<0 THE ALL C ROWS ISTRT TO IEND ARE SHIFTED DOWN "INT" ROWS. -C + DIMENSION IARAY(N,M) -C + C CALCULATE RANGE AND INCREMENT OF DO LOOP -C + IF(INT.LT.0)THEN -C + C SHIFT DOWN -C + I1=IEND I2=ISTRT ID=-1 ELSE IF(INT.GT.0)THEN -C + C SHIFT UP -C + I1=ISTRT I2=IEND ID=1 ELSE RETURN END IF -C + C PERFORM SHIFT -C + DO J=1,M DO I=I1,I2,ID IARAY(I-INT,J)=IARAY(I,J) diff --git a/packages/seacas/libraries/supes/mem_mgr/srchc.f b/packages/seacas/libraries/supes/mem_mgr/srchc.f index ca3a1ccd8f75..17296933b113 100644 --- a/packages/seacas/libraries/supes/mem_mgr/srchc.f +++ b/packages/seacas/libraries/supes/mem_mgr/srchc.f @@ -1,10 +1,10 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details SUBROUTINE SRCHC(IVEC,ILBIN,IUBIN,NUM,ICOD,LOC) -C + C THIS SUBROUTINE SEARCHES ROW ILB THOURGH ROW IUB OF A C NUMERICALLY ORDERED CHARACTER COLUMN VECTOR FOR THE OCCURRENCE C THE VALUE NUM. @@ -12,25 +12,25 @@ SUBROUTINE SRCHC(IVEC,ILBIN,IUBIN,NUM,ICOD,LOC) C WHERE NUM RESIDES. IF NUM IS NOT FOUND ICOD IS ZERO AND LOC IS C THE ROW NUMBER WHERE NUM WOULD RESIDE IF IT WERE IN THE NUMER- C ICALLY ORDER LIST. BOB LUST -C + C THIS SUBROUTINE HAS BEEN CHANGED FROM BOB LUST'S VERSION C AND NOW ASSUMES THAT THERE IS NO MORE THAN ONE MATCH C IN THE ORDERED LIST 'IVEC'. BILL MILLS-CURRAN JAN. 1, 1983 -C + C IVEC ORDERED CHARACTER LIST (SINGLE COLUMN) -C + C ILBIN LOW NUMBERED ROW OF SEARCH RANGE -C + C IUBIN HIGH NUMBERED ROW OF SEARCH RANGE -C + C NUM VALUE TO BE LOCATED IN IVEC -C + C ICOD RETURN CODE 0 = NO MATCH 1 = MATCH -C + C LOC LOCATION IN IVEC FOR NUM -C + CHARACTER*(*) IVEC(1),NUM -C + ILB = ILBIN IUB = IUBIN ICOD=0 @@ -38,9 +38,9 @@ SUBROUTINE SRCHC(IVEC,ILBIN,IUBIN,NUM,ICOD,LOC) LOC = 1 RETURN END IF -C + C CHECK TO SEE IF NUM IS AT EITHER END OF LIST -C + IF(IVEC(ILB).GT.NUM)THEN LOC=ILB RETURN @@ -48,57 +48,57 @@ SUBROUTINE SRCHC(IVEC,ILBIN,IUBIN,NUM,ICOD,LOC) LOC=IUB+1 RETURN END IF -C + C NUM IS INTERNAL TO IVEC -C + 100 MID=(ILB+IUB)/2 IF(MID.LE.ILB)GO TO 110 -C + C SEARCH RANGE IS MORE THAN 2 -C + IF(IVEC(MID).LT.NUM) THEN -C + C UPPER PART OF LIST -C + ILB=MID GO TO 100 ELSE IF(IVEC(MID).GT.NUM) THEN -C + C LOWER PART OF LIST -C + IUB=MID GO TO 100 ELSE -C + C MATCH HAS OCCURRED AT "MID" -C + ICOD=1 LOC=MID RETURN END IF 110 CONTINUE -C + C SEARCH RANGE IS 2 OR LESS -C + IF(NUM.EQ.IVEC(ILB)) THEN -C + C MATCH AT "ILB" -C + ICOD=1 LOC=ILB RETURN ELSE IF(NUM.EQ.IVEC(IUB)) THEN -C + C MATCH AT "IUB" -C + ICOD=1 LOC=IUB RETURN ELSE -C + C NO MATCH IN LIST. C LOCATION FOR NEW ENTRY IS "IUB". -C + LOC=IUB RETURN END IF diff --git a/packages/seacas/libraries/supes/mem_mgr/srchi.f b/packages/seacas/libraries/supes/mem_mgr/srchi.f index 746bd2fe190a..984352f6bf6c 100644 --- a/packages/seacas/libraries/supes/mem_mgr/srchi.f +++ b/packages/seacas/libraries/supes/mem_mgr/srchi.f @@ -1,10 +1,10 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details SUBROUTINE SRCHI(IVEC,ILBIN,IUBIN,NUM,ICOD,LOC) -C + C THIS SUBROUTINE SEARCHES ROW ILB THOURGH ROW IUB OF A C NUMERICALLY ORDERED INTEGER COLUMN VECTOR FOR THE OCCURRENCE C THE VALUE NUM. @@ -12,25 +12,25 @@ SUBROUTINE SRCHI(IVEC,ILBIN,IUBIN,NUM,ICOD,LOC) C WHERE NUM RESIDES. IF NUM IS NOT FOUND ICOD IS ZERO AND LOC IS C THE ROW NUMBER WHERE NUM WOULD RESIDE IF IT WERE IN THE NUMER- C ICALLY ORDER LIST. BOB LUST -C + C THIS SUBROUTINE HAS BEEN CHANGED FROM BOB LUST'S VERSION C AND NOW ASSUMES THAT THERE IS NO MORE THAN ONE MATCH C IN THE ORDERED LIST 'IVEC'. BILL MILLS-CURRAN JAN. 1, 1983 -C + C IVEC ORDERED LIST -C + C ILBIN LOW NUMBERED ROW OF SEARCH RANGE -C + C IUBIN HIGH NUMBERED ROW OF SEARCH RANGE -C + C NUM VALUE TO BE LOCATED IN IVEC -C + C ICOD RETURN CODE 0 = NO MATCH 1 = MATCH -C + C LOC LOCATION IN IVEC FOR NUM -C + DIMENSION IVEC(1) -C + ILB = ILBIN IUB = IUBIN ICOD=0 @@ -38,9 +38,9 @@ SUBROUTINE SRCHI(IVEC,ILBIN,IUBIN,NUM,ICOD,LOC) LOC = 1 RETURN END IF -C + C CHECK TO SEE IF NUM IS AT EITHER END OF LIST -C + IF(IVEC(ILB).GT.NUM)THEN LOC=ILB RETURN @@ -48,9 +48,9 @@ SUBROUTINE SRCHI(IVEC,ILBIN,IUBIN,NUM,ICOD,LOC) LOC=IUB+1 RETURN END IF -C + C NUM IS INTERNAL TO IVEC -C + 100 MID=(ILB+IUB)/2 IF(MID.LE.ILB)GO TO 110 NVAL=IVEC(MID) diff --git a/packages/seacas/libraries/supes/mem_mgr/vtable.f b/packages/seacas/libraries/supes/mem_mgr/vtable.f index a2ab554d848f..19886b14b546 100644 --- a/packages/seacas/libraries/supes/mem_mgr/vtable.f +++ b/packages/seacas/libraries/supes/mem_mgr/vtable.f @@ -1,101 +1,101 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details SUBROUTINE VTABLE (NEWLOC, NEWLEN, VOID, LVOID, NVOIDS, CHRCOL, * ERR) IMPLICIT INTEGER (A-Z) -C + C THIS SUBROUTINE INSERTS NEW VOIDS IN THE VOID TABLE AND C THEN CHECKS FOR CONTIGUOUS VOIDS WHICH ARE THEN JOINED. -C + C ERROR CODES -C + C ERROR VECTOR AND FLAGS. C THE ERROR PARAMETERS BELONG IN MDINIT ALSO. -C + INCLUDE 'params.inc' -C + C VFULL = NO ROOM IN VOID TABLE C BDVOID = OVERLAPPING VOIDS -C + DIMENSION VOID(LVOID,CHRCOL,2) -C + IF (NEWLEN .GT. 0) THEN -C + IF (NVOIDS .GE. LVOID) THEN ERR = VFULL RETURN END IF -C + C FIND LOCATION FOR NEW ENTRY. -C + CALL SRCHI(VOID,1,NVOIDS,NEWLOC,ERR,ROW) IF (ERR .NE. 0) THEN ERR = BDVOID RETURN END IF -C + C NEW ENTRY IN TABLE. -C + IF (ROW .LE. NVOIDS) THEN -C + C MAKE ROOM FOR NEW ENTRY. -C + CALL SHFTI (VOID, LVOID*CHRCOL, 2, ROW, NVOIDS, -1) -C + END IF -C + VOID(ROW,1,1) = NEWLOC VOID(ROW,1,2) = NEWLEN NVOIDS = NVOIDS + 1 -C + END IF -C + C CHECK TABLE TO SEE IF ANY VOIDS HAVE JOINED OR ARE ZERO LENGTH. -C + C NOTE THAT A STANDARD DO LOOP CANNOT BE USED BECAUSE THE UPPER C LIMIT OF THE LOOP CAN CHANGE INSIDE THE LOOP. -C + I = 1 100 IF (I .GE. NVOIDS) GO TO 110 IF (VOID(I,1,1)+VOID(I,1,2) .EQ. VOID(I+1,1,1)) THEN -C + C THESE TWO VOIDS SHOULD BE JOINED. -C + VOID(I,1,2) = VOID(I,1,2) + VOID(I+1,1,2) CALL SHFTI (VOID, LVOID*CHRCOL, 2, I+2, NVOIDS, 1) NVOIDS = NVOIDS - 1 GO TO 100 -C + ELSE IF (VOID(I,1,2) .EQ. 0) THEN -C + C THIS VOID IS ZERO LENGTH. -C + CALL SHFTI (VOID, LVOID*CHRCOL, 2, I+1, NVOIDS, 1) NVOIDS = NVOIDS - 1 -C + ELSE IF (VOID(I,1,1)+VOID(I,1,2) .GT. VOID(I+1,1,1)) THEN -C + C OVERLAPPING VOIDS -C + ERR = BDVOID RETURN -C + END IF -C + I = I + 1 GO TO 100 -C + 110 CONTINUE -C + C CHECK LAST VOID -C + IF (NVOIDS .GE. 1) THEN IF (VOID(NVOIDS,1,2) .EQ. 0) NVOIDS = NVOIDS - 1 END IF -C + ERR = SUCESS RETURN END diff --git a/packages/seacas/libraries/supes/memtest.f b/packages/seacas/libraries/supes/memtest.f index 4fdf62dd3831..b79d9f19baf4 100644 --- a/packages/seacas/libraries/supes/memtest.f +++ b/packages/seacas/libraries/supes/memtest.f @@ -1,13 +1,13 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details PROGRAM MEMTEST -C + C THIS PROGRAM TESTS THE SUPES MEMORY MANAGER. -C + PARAMETER (MFIELD=4) CHARACTER*32 VERSN CHARACTER*8 CV(MFIELD) diff --git a/packages/seacas/libraries/suplib/abrstr.f b/packages/seacas/libraries/suplib/abrstr.f index ede3a7b16727..4a63934d24b7 100644 --- a/packages/seacas/libraries/suplib/abrstr.f +++ b/packages/seacas/libraries/suplib/abrstr.f @@ -1,26 +1,12 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE ABRSTR (RETWRD, ABBR, STRTBL) C======================================================================= -C$Id: abrstr.f,v 1.2 2009/03/25 12:46:01 gdsjaar Exp $ -C$Log: abrstr.f,v $ -CRevision 1.2 2009/03/25 12:46:01 gdsjaar -CAdd copyright and license notice to all files. -C -CRevision 1.1.1.1 1990/08/14 16:11:58 gdsjaar -CTesting -C -c Revision 1.1 90/08/14 16:11:57 gdsjaar -c Initial revision -c -c Revision 1.1 90/08/09 13:39:03 gdsjaar -c Initial revision -c C --*** ABRSTR *** (STRLIB) Find abbreviation for string C -- Written by Amy Gilkey - revised 02/14/86 diff --git a/packages/seacas/libraries/suplib/addlog.c b/packages/seacas/libraries/suplib/addlog.c index cf6bdc9481a0..1279fbc2b0cb 100644 --- a/packages/seacas/libraries/suplib/addlog.c +++ b/packages/seacas/libraries/suplib/addlog.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/suplib/addv.f b/packages/seacas/libraries/suplib/addv.f index 4469ffe467ef..4ef42b84f9bd 100644 --- a/packages/seacas/libraries/suplib/addv.f +++ b/packages/seacas/libraries/suplib/addv.f @@ -1,38 +1,29 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: addv.f,v 1.2 2009/03/25 12:46:01 gdsjaar Exp $ -C $Log: addv.f,v $ -C Revision 1.2 2009/03/25 12:46:01 gdsjaar -C Add copyright and license notice to all files. -C -C Revision 1.1 1993/11/18 21:32:06 gdsjaar -C Added scilib routines saxpy.f scopy.f sdot.f snrm2.f subv.f -C Added utility routines addv.f subv.f -C C----------------------------------------------------------------------- SUBROUTINE ADDV( N,A,B,C ) -C + C*********************************************************************** -C + C DESCRIPTION: This routine adds two vectors -C + C FORMAL PARAMETERS: C N INTEGER Number of entries in A, B C A REAL First vector C B REAL Vector to be added C C REAL Vector with the result -C + C*********************************************************************** -C + DIMENSION A(N),B(N),C(N) -C + DO 100 I = 1,N C(I) = A(I) + B(I) 100 CONTINUE -C + RETURN END diff --git a/packages/seacas/libraries/suplib/argparse.F b/packages/seacas/libraries/suplib/argparse.F index c241dc171e9c..8372068f6fce 100644 --- a/packages/seacas/libraries/suplib/argparse.F +++ b/packages/seacas/libraries/suplib/argparse.F @@ -1,10 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details - integer function argument_count() integer*4 arg_count4 arg_count4 = iargc() @@ -16,7 +15,7 @@ subroutine get_argument(which, optvalue, length) integer which character*(*) optvalue integer length -#if defined(__XLF__) +#if defined(__XLF__) || defined(__INTEL_COMPILER) integer*4 which4 which4 = which call getarg(which4, optvalue) diff --git a/packages/seacas/libraries/suplib/banner.f b/packages/seacas/libraries/suplib/banner.f index 76f9328acf71..4fa92e257600 100644 --- a/packages/seacas/libraries/suplib/banner.f +++ b/packages/seacas/libraries/suplib/banner.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= @@ -127,7 +127,6 @@ SUBROUTINE BANNER (NOUT, QAINFO, LINE1, LINE2, LINE3) WRITE (NOUT, *) END IF - RETURN 10000 FORMAT (8A) 10010 FORMAT ('Run on ', A4, '-', A2, '-', A2, ' at ', A8) diff --git a/packages/seacas/libraries/suplib/bannr2.f b/packages/seacas/libraries/suplib/bannr2.f index f84a8ba4b572..1fce65ee27f4 100644 --- a/packages/seacas/libraries/suplib/bannr2.f +++ b/packages/seacas/libraries/suplib/bannr2.f @@ -1,20 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: bannr2.f,v 1.3 2009/03/25 12:46:01 gdsjaar Exp $ -C $Log: bannr2.f,v $ -C Revision 1.3 2009/03/25 12:46:01 gdsjaar -C Add copyright and license notice to all files. -C -C Revision 1.2 1993/07/30 20:26:42 gdsjaar -C Fixed to write to unit * if iout equals 0 -C -c Revision 1.1 1991/07/11 19:58:14 gdsjaar -c Initial revision -c C======================================================================= SUBROUTINE BANNR2 (NCOLS, LINEIN, IOUT) C======================================================================= @@ -30,12 +19,12 @@ SUBROUTINE BANNR2 (NCOLS, LINEIN, IOUT) DATA MATRIX(1:36) /'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'/ DATA MATRIX(37:48) /'$()*+,/.: -='/ DATA MATRIX(49:49) /''''/ -C + C THE FOLLOWING CHARACTER SET IS NOT ANSI STANDARD -C + C DATA MATRIX(37:68) /'!"#$%&()*+,/.:;<>?@[\]^_`{|}~ -='/ C DATA MATRIX(69:69) /''''/ -C + DATA (LETTER(I, 1),I=1,7) / * ' AAAAA ', * 'AA AA ', @@ -588,11 +577,11 @@ SUBROUTINE BANNR2 (NCOLS, LINEIN, IOUT) * ' ', * ' ', * ' '/ -C + MAXCOL = MIN(NCOLS/9, MAXCHR) -C + C DELIMIT NONBLANK STRING. -C + CALL STRIPB (LINEIN, ILEFT, IRIGHT) IF (ILEFT .LE. IRIGHT) THEN LINE = LINEIN (ILEFT:IRIGHT) @@ -605,67 +594,66 @@ SUBROUTINE BANNR2 (NCOLS, LINEIN, IOUT) LINE = ' ' LENIN = 0 END IF -C + C LENIN IS LAST PRINTABLE NONBLANK -C + C CONVERT ALPHABET TO UPPER CASE -C + DO 100 J=1,LENIN IF (LGE(LINE(J:J),'a') .AND. LLE(LINE(J:J),'z')) THEN ITEMP = ICHAR(LINE(J:J)) LINE(J:J)=CHAR(ITEMP-(ICHAR('a')-ICHAR('A'))) END IF 100 CONTINUE -C + C CALCULATE BLANK FILL. -C + NBLANK = (NCOLS - LENIN * 9) / 2 NBLANK = MIN (NBLANK, 66) -C + C LOAD UP CHARACTERS -C + DO 130 ICOL = 1, LENIN IPT = INDEX(MATRIX,LINE(ICOL:ICOL)) IF (IPT .EQ. 0) THEN -C + C CHARACTER NOT FOUND - REPLACE WITH A BLANK -C + DO 110 IROW = 1, 7 SECT(IROW,ICOL) = ' ' 110 CONTINUE -C + ELSE -C + C CHARACTER FOUND - INSERT BANNER LETTER -C + DO 120 IROW = 1, 7 SECT(IROW,ICOL) = LETTER(IROW,IPT) 120 CONTINUE -C + END IF 130 CONTINUE -C + IF ((IRIGHT - ILEFT + 1) .NE. LENIN .AND. LENIN .NE. 0) THEN -C + C STRING IS TRUNCATED. -C + if (iout .eq. 0) then WRITE (*, 5010) LINEIN(ILEFT:IRIGHT) else WRITE (IOUT, 5010) LINEIN(ILEFT:IRIGHT) end if -C ELSE -C + C STRING IS NOT TRUNCATED OR IS NULL. -C + if (iout .eq. 0) then WRITE (*,5000) else WRITE (IOUT,5000) end if -C + END IF if (iout .eq. 0) then DO 140 IROW = 1, 7 diff --git a/packages/seacas/libraries/suplib/batch.f b/packages/seacas/libraries/suplib/batch.f index 9bb896d36aa3..a90240f39a03 100644 --- a/packages/seacas/libraries/suplib/batch.f +++ b/packages/seacas/libraries/suplib/batch.f @@ -1,26 +1,12 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= LOGICAL FUNCTION BATCH () C======================================================================= -C$Id: batch.f,v 1.2 2009/03/25 12:46:01 gdsjaar Exp $ -C$Log: batch.f,v $ -CRevision 1.2 2009/03/25 12:46:01 gdsjaar -CAdd copyright and license notice to all files. -C -CRevision 1.1.1.1 1990/08/14 16:12:03 gdsjaar -CTesting -C -c Revision 1.1 90/08/14 16:12:02 gdsjaar -c Initial revision -c -c Revision 1.1 90/08/09 13:39:03 gdsjaar -c Initial revision -c C --*** BATCH *** (ETCLIB) Return batch versus interactive flag C -- Written by Amy Gilkey - revised 01/20/87 diff --git a/packages/seacas/libraries/suplib/ckexod.f b/packages/seacas/libraries/suplib/ckexod.f index 13644c23d84b..585638c4703c 100644 --- a/packages/seacas/libraries/suplib/ckexod.f +++ b/packages/seacas/libraries/suplib/ckexod.f @@ -1,26 +1,12 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE CKEXOD (EXODUS, *) C======================================================================= -C$Id: ckexod.f,v 1.2 2009/03/25 12:46:01 gdsjaar Exp $ -C$Log: ckexod.f,v $ -CRevision 1.2 2009/03/25 12:46:01 gdsjaar -CAdd copyright and license notice to all files. -C -CRevision 1.1.1.1 1990/08/14 16:12:06 gdsjaar -CTesting -C -c Revision 1.1 90/08/14 16:12:05 gdsjaar -c Initial revision -c -c Revision 1.1 90/08/09 13:39:04 gdsjaar -c Initial revision -c C --*** CKEXOD *** (ETCLIB) Check for EXODUS format C -- Written by Amy Gilkey - revised 12/23/87 diff --git a/packages/seacas/libraries/suplib/cknone.f b/packages/seacas/libraries/suplib/cknone.f index ebe7f1946f11..1abd029e61ab 100644 --- a/packages/seacas/libraries/suplib/cknone.f +++ b/packages/seacas/libraries/suplib/cknone.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/libraries/suplib/ckwhol.f b/packages/seacas/libraries/suplib/ckwhol.f index 7ba462b00992..a2adfc8ed3cf 100644 --- a/packages/seacas/libraries/suplib/ckwhol.f +++ b/packages/seacas/libraries/suplib/ckwhol.f @@ -1,26 +1,12 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE CKWHOL (WHOTIM, *) C======================================================================= -C$Id: ckwhol.f,v 1.2 2009/03/25 12:46:01 gdsjaar Exp $ -C$Log: ckwhol.f,v $ -CRevision 1.2 2009/03/25 12:46:01 gdsjaar -CAdd copyright and license notice to all files. -C -CRevision 1.1.1.1 1990/08/14 16:12:13 gdsjaar -CTesting -C -c Revision 1.1 90/08/14 16:12:12 gdsjaar -c Initial revision -c -c Revision 1.1 90/08/09 13:39:05 gdsjaar -c Initial revision -c C --*** CKWHOL *** (ETCLIB) Check for whole time step C -- Written by Amy Gilkey - revised 12/23/87 diff --git a/packages/seacas/libraries/suplib/copint.f b/packages/seacas/libraries/suplib/copint.f index 0478df84f32a..1151bed1b8f4 100644 --- a/packages/seacas/libraries/suplib/copint.f +++ b/packages/seacas/libraries/suplib/copint.f @@ -1,26 +1,12 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE COPINT (LEN, IFROM, ITO) C======================================================================= -C$Id: copint.f,v 1.2 2009/03/25 12:46:01 gdsjaar Exp $ -C$Log: copint.f,v $ -CRevision 1.2 2009/03/25 12:46:01 gdsjaar -CAdd copyright and license notice to all files. -C -CRevision 1.1.1.1 1990/08/14 16:12:16 gdsjaar -CTesting -C -c Revision 1.1 90/08/14 16:12:15 gdsjaar -c Initial revision -c -c Revision 1.1 90/08/09 13:39:05 gdsjaar -c Initial revision -c C --*** COPINT *** (ETCLIB) Copy all integers in list C -- Written by Amy Gilkey - revised 11/03/87 diff --git a/packages/seacas/libraries/suplib/cpuifc.f b/packages/seacas/libraries/suplib/cpuifc.f index bfdfe9829071..9ce4e6265973 100644 --- a/packages/seacas/libraries/suplib/cpuifc.f +++ b/packages/seacas/libraries/suplib/cpuifc.f @@ -1,26 +1,12 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= LOGICAL FUNCTION CPUIFC (LDUM) C======================================================================= -C$Id: cpuifc.f,v 1.2 2009/03/25 12:46:01 gdsjaar Exp $ -C$Log: cpuifc.f,v $ -CRevision 1.2 2009/03/25 12:46:01 gdsjaar -CAdd copyright and license notice to all files. -C -CRevision 1.1.1.1 1990/08/14 16:12:19 gdsjaar -CTesting -C -c Revision 1.1 90/08/14 16:12:17 gdsjaar -c Initial revision -c -c Revision 1.1 90/08/09 13:39:06 gdsjaar -c Initial revision -c C --*** CPUIFC *** Dummy cancel function C -- Written by Amy Gilkey - revised 02/11/88 diff --git a/packages/seacas/libraries/suplib/cpyint.f b/packages/seacas/libraries/suplib/cpyint.f index d1f8b54e8408..560dac033a29 100644 --- a/packages/seacas/libraries/suplib/cpyint.f +++ b/packages/seacas/libraries/suplib/cpyint.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/libraries/suplib/cpylog.f b/packages/seacas/libraries/suplib/cpylog.f index e2ef2d151c22..25183c133eb6 100644 --- a/packages/seacas/libraries/suplib/cpylog.f +++ b/packages/seacas/libraries/suplib/cpylog.f @@ -1,26 +1,12 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE CPYLOG (LEN, LFROM, LTO) C======================================================================= -C$Id: cpylog.f,v 1.2 2009/03/25 12:46:01 gdsjaar Exp $ -C$Log: cpylog.f,v $ -CRevision 1.2 2009/03/25 12:46:01 gdsjaar -CAdd copyright and license notice to all files. -C -CRevision 1.1.1.1 1990/08/14 16:12:24 gdsjaar -CTesting -C -c Revision 1.1 90/08/14 16:12:22 gdsjaar -c Initial revision -c -c Revision 1.1 90/08/09 13:39:07 gdsjaar -c Initial revision -c C --*** CPYLOG *** (ETCLIB) Copy all logicals in list C -- Written by Amy Gilkey - revised 11/03/87 diff --git a/packages/seacas/libraries/suplib/cpyrea.f b/packages/seacas/libraries/suplib/cpyrea.f index 8c5fc5e851e3..e18646585c42 100644 --- a/packages/seacas/libraries/suplib/cpyrea.f +++ b/packages/seacas/libraries/suplib/cpyrea.f @@ -1,26 +1,12 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE CPYREA (LEN, RFROM, RTO) C======================================================================= -C$Id: cpyrea.f,v 1.2 2009/03/25 12:46:01 gdsjaar Exp $ -C$Log: cpyrea.f,v $ -CRevision 1.2 2009/03/25 12:46:01 gdsjaar -CAdd copyright and license notice to all files. -C -CRevision 1.1.1.1 1990/08/14 16:12:26 gdsjaar -CTesting -C -c Revision 1.1 90/08/14 16:12:25 gdsjaar -c Initial revision -c -c Revision 1.1 90/08/09 13:39:07 gdsjaar -c Initial revision -c C --*** CPYREA *** (ETCLIB) Copy all real numbers in list C -- Written by Amy Gilkey - revised 03/15/88 diff --git a/packages/seacas/libraries/suplib/cpyrgt.f b/packages/seacas/libraries/suplib/cpyrgt.f index affedbf209da..88477cb33090 100644 --- a/packages/seacas/libraries/suplib/cpyrgt.f +++ b/packages/seacas/libraries/suplib/cpyrgt.f @@ -1,27 +1,12 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE CPYRGT (NOUT, YEAR) C======================================================================= -C $Id: cpyrgt.f,v 1.4 2009/03/25 14:31:47 gdsjaar Exp $ -C $Log: cpyrgt.f,v $ -C Revision 1.4 2009/03/25 14:31:47 gdsjaar -C Update copyright info -C -C Revision 1.3 2009/03/25 12:46:01 gdsjaar -C Add copyright and license notice to all files. -C -C Revision 1.2 1993/07/06 21:57:53 gdsjaar -C Updated copyright output information based on latest memo from Art Silva -C -c Revision 1.1 1992/05/13 16:57:30 gdsjaar -c Added routine to output copyright notice during execution -c - C --*** CPYRGT *** (ETCLIB) Print copyright notice C -- Written by Greg Sjaardema - revised 5-13-92 - C -- diff --git a/packages/seacas/libraries/suplib/cpystr.f b/packages/seacas/libraries/suplib/cpystr.f index 30fe5f7cb834..b33ac5fae860 100644 --- a/packages/seacas/libraries/suplib/cpystr.f +++ b/packages/seacas/libraries/suplib/cpystr.f @@ -1,26 +1,12 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE CPYSTR (LEN, IFROM, ITO) C======================================================================= -C$Id: cpystr.f,v 1.2 2009/03/25 12:46:01 gdsjaar Exp $ -C$Log: cpystr.f,v $ -CRevision 1.2 2009/03/25 12:46:01 gdsjaar -CAdd copyright and license notice to all files. -C -CRevision 1.1.1.1 1990/08/14 16:12:29 gdsjaar -CTesting -C -c Revision 1.1 90/08/14 16:12:28 gdsjaar -c Initial revision -c -c Revision 1.1 90/08/09 13:39:07 gdsjaar -c Initial revision -c C --*** CPYSTR *** (STRLIB) Copy all strings in list C -- Written by Amy Gilkey - revised 03/15/88 diff --git a/packages/seacas/libraries/suplib/dberr.f b/packages/seacas/libraries/suplib/dberr.f index 8beaba74acd5..e87103fde63b 100644 --- a/packages/seacas/libraries/suplib/dberr.f +++ b/packages/seacas/libraries/suplib/dberr.f @@ -1,32 +1,12 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE DBERR (IOSTAT, ERRMSG) C======================================================================= -C$Id: dberr.f,v 1.4 2009/03/25 12:46:01 gdsjaar Exp $ -C$Log: dberr.f,v $ -CRevision 1.4 2009/03/25 12:46:01 gdsjaar -CAdd copyright and license notice to all files. -C -CRevision 1.3 1991/09/30 20:08:33 gdsjaar -CIncreased error number format for Cray -C -c Revision 1.2 1991/02/04 08:34:36 gdsjaar -c Changed IOSTAT format to I3 -c -c Revision 1.1.1.1 90/08/14 16:12:31 gdsjaar -c Testing -c -c Revision 1.1 90/08/14 16:12:30 gdsjaar -c Initial revision -c -c Revision 1.1 90/08/09 13:39:08 gdsjaar -c Initial revision -c C --*** DBERR *** (EXOLIB) Display a database error message C -- Written by Amy Gilkey - revised 02/27/86 diff --git a/packages/seacas/libraries/suplib/dbiv0.f b/packages/seacas/libraries/suplib/dbiv0.f index ef24c5c23071..b28fb53ff516 100644 --- a/packages/seacas/libraries/suplib/dbiv0.f +++ b/packages/seacas/libraries/suplib/dbiv0.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/libraries/suplib/dbpini.f b/packages/seacas/libraries/suplib/dbpini.f index 7f08a0984b6a..62c4008460cd 100644 --- a/packages/seacas/libraries/suplib/dbpini.f +++ b/packages/seacas/libraries/suplib/dbpini.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/libraries/suplib/dbpqa.f b/packages/seacas/libraries/suplib/dbpqa.f index 74cc4b0f0414..4f01fc8cb1df 100644 --- a/packages/seacas/libraries/suplib/dbpqa.f +++ b/packages/seacas/libraries/suplib/dbpqa.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE DBPQA (OPTION, NQAREC, QAREC, NINFO, INFO) diff --git a/packages/seacas/libraries/suplib/dbvini.f b/packages/seacas/libraries/suplib/dbvini.f index c93ad2ce8b07..1330b6aefb53 100644 --- a/packages/seacas/libraries/suplib/dbvini.f +++ b/packages/seacas/libraries/suplib/dbvini.f @@ -1,29 +1,12 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE DBVINI (NVARHI, NVARGL, NVARNP, NVAREL) C======================================================================= -C$Id: dbvini.f,v 1.3 2009/03/25 12:46:01 gdsjaar Exp $ -C$Log: dbvini.f,v $ -CRevision 1.3 2009/03/25 12:46:01 gdsjaar -CAdd copyright and license notice to all files. -C -CRevision 1.2 1990/11/30 09:50:55 gdsjaar -CModified to work on Unicos -C -c Revision 1.1.1.1 90/08/14 16:13:59 gdsjaar -c Testing -c -c Revision 1.1 90/08/14 16:13:58 gdsjaar -c Initial revision -c -c Revision 1.1 90/08/09 13:39:20 gdsjaar -c Initial revision -c C --*** DBVINI *** (EXOLIB) Initialize for DBVTYP and DBVIX C -- Written by Amy Gilkey - revised 10/14/87 @@ -66,23 +49,6 @@ SUBROUTINE DBVINI (NVARHI, NVARGL, NVARNP, NVAREL) C======================================================================= ENTRY DBVTYP (IIX, TYP, ID) C======================================================================= -C$Id: dbvini.f,v 1.3 2009/03/25 12:46:01 gdsjaar Exp $ -C$Log: dbvini.f,v $ -CRevision 1.3 2009/03/25 12:46:01 gdsjaar -CAdd copyright and license notice to all files. -C -CRevision 1.2 1990/11/30 09:50:55 gdsjaar -CModified to work on Unicos -C -c Revision 1.1.1.1 90/08/14 16:13:59 gdsjaar -c Testing -c -c Revision 1.1 90/08/14 16:13:58 gdsjaar -c Initial revision -c -c Revision 1.1 90/08/09 13:39:20 gdsjaar -c Initial revision -c C --*** DBVTYP *** (EXOLIB) Return the variable type and number C -- Written by Amy Gilkey - revised 03/18/88 @@ -125,23 +91,6 @@ SUBROUTINE DBVINI (NVARHI, NVARGL, NVARNP, NVAREL) C======================================================================= ENTRY DBVIX (ITYP, IID, IX) C======================================================================= -C$Id: dbvini.f,v 1.3 2009/03/25 12:46:01 gdsjaar Exp $ -C$Log: dbvini.f,v $ -CRevision 1.3 2009/03/25 12:46:01 gdsjaar -CAdd copyright and license notice to all files. -C -CRevision 1.2 1990/11/30 09:50:55 gdsjaar -CModified to work on Unicos -C -c Revision 1.1.1.1 90/08/14 16:13:59 gdsjaar -c Testing -c -c Revision 1.1 90/08/14 16:13:58 gdsjaar -c Initial revision -c -c Revision 1.1 90/08/09 13:39:20 gdsjaar -c Initial revision -c C --*** DBVIX *** (EXOLIB) Return the variable index C -- Written by Amy Gilkey - revised 10/14/87 diff --git a/packages/seacas/libraries/suplib/engnot.f b/packages/seacas/libraries/suplib/engnot.f index b5a85fd27f97..0b55349a8436 100644 --- a/packages/seacas/libraries/suplib/engnot.f +++ b/packages/seacas/libraries/suplib/engnot.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details CHARACTER*16 FUNCTION ENGNOT (RNUM, IPREC) diff --git a/packages/seacas/libraries/suplib/engstr.f b/packages/seacas/libraries/suplib/engstr.f index f212c9dc637d..7168cb0ff008 100644 --- a/packages/seacas/libraries/suplib/engstr.f +++ b/packages/seacas/libraries/suplib/engstr.f @@ -1,27 +1,12 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details - C======================================================================= SUBROUTINE ENGSTR (NNUM, NSIG, RNUM, RSTR, LSTR) C======================================================================= -C$Id: engstr.f,v 1.2 2009/03/25 12:46:01 gdsjaar Exp $ -C$Log: engstr.f,v $ -CRevision 1.2 2009/03/25 12:46:01 gdsjaar -CAdd copyright and license notice to all files. -C -CRevision 1.1.1.1 1990/08/14 16:14:04 gdsjaar -CTesting -C -c Revision 1.1 90/08/14 16:14:03 gdsjaar -c Initial revision -c -c Revision 1.1 90/08/09 13:39:21 gdsjaar -c Initial revision -c C --*** ENGSTR *** (STRLIB) Convert real numbers to strings C -- Written by Amy Gilkey - revised 02/14/86 diff --git a/packages/seacas/libraries/suplib/ffaddc.f b/packages/seacas/libraries/suplib/ffaddc.f index 97e2808af312..3c682728e95e 100644 --- a/packages/seacas/libraries/suplib/ffaddc.f +++ b/packages/seacas/libraries/suplib/ffaddc.f @@ -1,26 +1,12 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE FFADDC (CVAL, LINE) C======================================================================= -C$Id: ffaddc.f,v 1.2 2009/03/25 12:46:01 gdsjaar Exp $ -C$Log: ffaddc.f,v $ -CRevision 1.2 2009/03/25 12:46:01 gdsjaar -CAdd copyright and license notice to all files. -C -CRevision 1.1.1.1 1990/08/14 16:14:07 gdsjaar -CTesting -C -c Revision 1.1 90/08/14 16:14:05 gdsjaar -c Initial revision -c -c Revision 1.1 90/08/09 13:39:22 gdsjaar -c Initial revision -c C --*** FFADDC *** (FFLIB) Add character string to line C -- Written by Amy Gilkey - revised 11/16/87 diff --git a/packages/seacas/libraries/suplib/ffaddi.f b/packages/seacas/libraries/suplib/ffaddi.f index fb7dbc8a11b6..cc592bddfe18 100644 --- a/packages/seacas/libraries/suplib/ffaddi.f +++ b/packages/seacas/libraries/suplib/ffaddi.f @@ -1,26 +1,12 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE FFADDI (IVAL, LINE) C======================================================================= -C$Id: ffaddi.f,v 1.2 2009/03/25 12:46:01 gdsjaar Exp $ -C$Log: ffaddi.f,v $ -CRevision 1.2 2009/03/25 12:46:01 gdsjaar -CAdd copyright and license notice to all files. -C -CRevision 1.1.1.1 1990/08/14 16:14:09 gdsjaar -CTesting -C -c Revision 1.1 90/08/14 16:14:08 gdsjaar -c Initial revision -c -c Revision 1.1 90/08/09 13:39:22 gdsjaar -c Initial revision -c C --*** FFADDI *** (FFLIB) Add integer to line C -- Written by Amy Gilkey - revised 11/16/87 diff --git a/packages/seacas/libraries/suplib/ffaddo.f b/packages/seacas/libraries/suplib/ffaddo.f index 38b7c0647f89..7c0af0acccd3 100644 --- a/packages/seacas/libraries/suplib/ffaddo.f +++ b/packages/seacas/libraries/suplib/ffaddo.f @@ -1,26 +1,12 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE FFADDO (ISON, LINE) C======================================================================= -C$Id: ffaddo.f,v 1.2 2009/03/25 12:46:01 gdsjaar Exp $ -C$Log: ffaddo.f,v $ -CRevision 1.2 2009/03/25 12:46:01 gdsjaar -CAdd copyright and license notice to all files. -C -CRevision 1.1.1.1 1990/08/14 16:14:13 gdsjaar -CTesting -C -c Revision 1.1 90/08/14 16:14:11 gdsjaar -c Initial revision -c -c Revision 1.1 90/08/09 13:39:23 gdsjaar -c Initial revision -c C --*** FFADDO *** (FFLIB) Add ON/OFF to line C -- Written by Amy Gilkey - revised 11/16/87 diff --git a/packages/seacas/libraries/suplib/ffaddr.f b/packages/seacas/libraries/suplib/ffaddr.f index 01abce04a683..6fc7e2a60721 100644 --- a/packages/seacas/libraries/suplib/ffaddr.f +++ b/packages/seacas/libraries/suplib/ffaddr.f @@ -1,26 +1,12 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE FFADDR (RVAL, LINE) C======================================================================= -C$Id: ffaddr.f,v 1.2 2009/03/25 12:46:02 gdsjaar Exp $ -C$Log: ffaddr.f,v $ -CRevision 1.2 2009/03/25 12:46:02 gdsjaar -CAdd copyright and license notice to all files. -C -CRevision 1.1.1.1 1990/08/14 16:14:15 gdsjaar -CTesting -C -c Revision 1.1 90/08/14 16:14:14 gdsjaar -c Initial revision -c -c Revision 1.1 90/08/09 13:39:23 gdsjaar -c Initial revision -c C --*** FFADDR *** (FFLIB) Add real to line C -- Written by Amy Gilkey - revised 11/16/87 diff --git a/packages/seacas/libraries/suplib/ffaddv.f b/packages/seacas/libraries/suplib/ffaddv.f index 786d5d6dd540..15360a7c458f 100644 --- a/packages/seacas/libraries/suplib/ffaddv.f +++ b/packages/seacas/libraries/suplib/ffaddv.f @@ -1,26 +1,12 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE FFADDV (IRANGE, LINE) C======================================================================= -C$Id: ffaddv.f,v 1.2 2009/03/25 12:46:02 gdsjaar Exp $ -C$Log: ffaddv.f,v $ -CRevision 1.2 2009/03/25 12:46:02 gdsjaar -CAdd copyright and license notice to all files. -C -CRevision 1.1.1.1 1990/08/14 16:14:18 gdsjaar -CTesting -C -c Revision 1.1 90/08/14 16:14:17 gdsjaar -c Initial revision -c -c Revision 1.1 90/08/09 13:39:23 gdsjaar -c Initial revision -c C --*** FFADDV *** (FFLIB) Add integer range to line C -- Written by Amy Gilkey - revised 11/16/87 diff --git a/packages/seacas/libraries/suplib/ffchar.f b/packages/seacas/libraries/suplib/ffchar.f index 49f145d1ee79..212b4ff02ab9 100644 --- a/packages/seacas/libraries/suplib/ffchar.f +++ b/packages/seacas/libraries/suplib/ffchar.f @@ -1,26 +1,12 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE FFCHAR (IFLD, INTYP, CFIELD, DEFVAL, CVAL) C======================================================================= -C$Id: ffchar.f,v 1.2 2009/03/25 12:46:02 gdsjaar Exp $ -C$Log: ffchar.f,v $ -CRevision 1.2 2009/03/25 12:46:02 gdsjaar -CAdd copyright and license notice to all files. -C -CRevision 1.1.1.1 1990/08/14 16:14:20 gdsjaar -CTesting -C -c Revision 1.1 90/08/14 16:14:19 gdsjaar -c Initial revision -c -c Revision 1.1 90/08/09 13:39:24 gdsjaar -c Initial revision -c C --*** FFCHAR *** (FFLIB) Parse free-field character string C -- Written by Amy Gilkey - revised 02/24/86 diff --git a/packages/seacas/libraries/suplib/ffexst.f b/packages/seacas/libraries/suplib/ffexst.f index 7360a656bd9b..128326adb929 100644 --- a/packages/seacas/libraries/suplib/ffexst.f +++ b/packages/seacas/libraries/suplib/ffexst.f @@ -1,26 +1,12 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= LOGICAL FUNCTION FFEXST (IFLD, INTYP) C======================================================================= -C$Id: ffexst.f,v 1.2 2009/03/25 12:46:02 gdsjaar Exp $ -C$Log: ffexst.f,v $ -CRevision 1.2 2009/03/25 12:46:02 gdsjaar -CAdd copyright and license notice to all files. -C -CRevision 1.1.1.1 1990/08/14 16:14:23 gdsjaar -CTesting -C -c Revision 1.1 90/08/14 16:14:22 gdsjaar -c Initial revision -c -c Revision 1.1 90/08/09 13:39:24 gdsjaar -c Initial revision -c C --*** FFEXST *** (FFLIB) Return end of fields status C -- Written by Amy Gilkey - revised 08/26/86 diff --git a/packages/seacas/libraries/suplib/ffintg.f b/packages/seacas/libraries/suplib/ffintg.f index 357d2ba4a445..f04a2fcfaea8 100644 --- a/packages/seacas/libraries/suplib/ffintg.f +++ b/packages/seacas/libraries/suplib/ffintg.f @@ -1,26 +1,12 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE FFINTG (IFLD, INTYP, IFIELD, EXPECT, IDEFVL, IVAL, *) C======================================================================= -C$Id: ffintg.f,v 1.2 2009/03/25 12:46:02 gdsjaar Exp $ -C$Log: ffintg.f,v $ -CRevision 1.2 2009/03/25 12:46:02 gdsjaar -CAdd copyright and license notice to all files. -C -CRevision 1.1.1.1 1990/08/14 16:14:26 gdsjaar -CTesting -C -c Revision 1.1 90/08/14 16:14:24 gdsjaar -c Initial revision -c -c Revision 1.1 90/08/09 13:39:25 gdsjaar -c Initial revision -c C --*** FFINTG *** (FFLIB) Parse free-field integer C -- Written by Amy Gilkey - revised 02/24/86 diff --git a/packages/seacas/libraries/suplib/ffmatc.f b/packages/seacas/libraries/suplib/ffmatc.f index b615e14a1e31..d1c2a1606b47 100644 --- a/packages/seacas/libraries/suplib/ffmatc.f +++ b/packages/seacas/libraries/suplib/ffmatc.f @@ -1,26 +1,12 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= LOGICAL FUNCTION FFMATC (IFLD, INTYP, CFIELD, MATCH, NLET) C======================================================================= -C$Id: ffmatc.f,v 1.2 2009/03/25 12:46:02 gdsjaar Exp $ -C$Log: ffmatc.f,v $ -CRevision 1.2 2009/03/25 12:46:02 gdsjaar -CAdd copyright and license notice to all files. -C -CRevision 1.1.1.1 1990/08/14 16:14:28 gdsjaar -CTesting -C -c Revision 1.1 90/08/14 16:14:27 gdsjaar -c Initial revision -c -c Revision 1.1 90/08/09 13:39:25 gdsjaar -c Initial revision -c C --*** FFMATC *** (FFLIB) Parse free-field character string if match C -- Written by Amy Gilkey - revised 07/01/87 diff --git a/packages/seacas/libraries/suplib/ffneed.f b/packages/seacas/libraries/suplib/ffneed.f index 5a8792f37752..f19ad1ea8fee 100644 --- a/packages/seacas/libraries/suplib/ffneed.f +++ b/packages/seacas/libraries/suplib/ffneed.f @@ -1,29 +1,12 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE FFNEED (IFLD, INTYP, FTYPE, NFLD, EXPECT, *) C======================================================================= -C$Id: ffneed.f,v 1.3 2009/03/25 12:46:02 gdsjaar Exp $ -C$Log: ffneed.f,v $ -CRevision 1.3 2009/03/25 12:46:02 gdsjaar -CAdd copyright and license notice to all files. -C -CRevision 1.2 1993/08/19 18:40:54 gdsjaar -CFixed incorrect itype for integers -C -c Revision 1.1.1.1 1990/08/14 16:14:31 gdsjaar -c Testing -c -c Revision 1.1 90/08/14 16:14:29 gdsjaar -c Initial revision -c -c Revision 1.1 90/08/09 13:39:25 gdsjaar -c Initial revision -c C --*** FFNEED *** (FFLIB) Check free-field fields for type C -- Written by Amy Gilkey - revised 10/21/86 diff --git a/packages/seacas/libraries/suplib/ffnumb.f b/packages/seacas/libraries/suplib/ffnumb.f index 1146cf1b0990..da9047743d32 100644 --- a/packages/seacas/libraries/suplib/ffnumb.f +++ b/packages/seacas/libraries/suplib/ffnumb.f @@ -1,26 +1,12 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= LOGICAL FUNCTION FFNUMB (IFLD, INTYP) C======================================================================= -C$Id: ffnumb.f,v 1.2 2009/03/25 12:46:02 gdsjaar Exp $ -C$Log: ffnumb.f,v $ -CRevision 1.2 2009/03/25 12:46:02 gdsjaar -CAdd copyright and license notice to all files. -C -CRevision 1.1.1.1 1990/08/14 16:14:33 gdsjaar -CTesting -C -c Revision 1.1 90/08/14 16:14:32 gdsjaar -c Initial revision -c -c Revision 1.1 90/08/09 13:39:26 gdsjaar -c Initial revision -c C --*** FFNUMB *** (FFLIB) Return number field status C -- Written by Amy Gilkey - revised 08/26/86 diff --git a/packages/seacas/libraries/suplib/ffonof.f b/packages/seacas/libraries/suplib/ffonof.f index 51d2f45a3a48..bdd813393d7e 100644 --- a/packages/seacas/libraries/suplib/ffonof.f +++ b/packages/seacas/libraries/suplib/ffonof.f @@ -1,26 +1,12 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE FFONOF (IFLD, INTYP, CFIELD, ISON, *) C======================================================================= -C$Id: ffonof.f,v 1.2 2009/03/25 12:46:02 gdsjaar Exp $ -C$Log: ffonof.f,v $ -CRevision 1.2 2009/03/25 12:46:02 gdsjaar -CAdd copyright and license notice to all files. -C -CRevision 1.1.1.1 1990/08/14 16:14:36 gdsjaar -CTesting -C -c Revision 1.1 90/08/14 16:14:35 gdsjaar -c Initial revision -c -c Revision 1.1 90/08/09 13:39:26 gdsjaar -c Initial revision -c C --*** FFONOF *** (FFLIB) Parse free-field ON/OFF C -- Written by Amy Gilkey - revised 02/24/86 diff --git a/packages/seacas/libraries/suplib/ffreal.f b/packages/seacas/libraries/suplib/ffreal.f index 28e99e173f1b..46198d4e0dce 100644 --- a/packages/seacas/libraries/suplib/ffreal.f +++ b/packages/seacas/libraries/suplib/ffreal.f @@ -1,26 +1,12 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE FFREAL (IFLD, INTYP, RFIELD, EXPECT, DEFVAL, RVAL, *) C======================================================================= -C$Id: ffreal.f,v 1.2 2009/03/25 12:46:02 gdsjaar Exp $ -C$Log: ffreal.f,v $ -CRevision 1.2 2009/03/25 12:46:02 gdsjaar -CAdd copyright and license notice to all files. -C -CRevision 1.1.1.1 1990/08/14 16:14:38 gdsjaar -CTesting -C -c Revision 1.1 90/08/14 16:14:37 gdsjaar -c Initial revision -c -c Revision 1.1 90/08/09 13:39:27 gdsjaar -c Initial revision -c C --*** FFREAL *** (FFLIB) Parse free-field real C -- Written by Amy Gilkey - revised 02/24/86 diff --git a/packages/seacas/libraries/suplib/ffrrng.f b/packages/seacas/libraries/suplib/ffrrng.f index c4dacd34f3fd..b13313e93be2 100644 --- a/packages/seacas/libraries/suplib/ffrrng.f +++ b/packages/seacas/libraries/suplib/ffrrng.f @@ -1,27 +1,13 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE FFRRNG (IFLD, INTYP, CFIELD, RFIELD, EXPECT, RMAX, & RANGE, *) C======================================================================= -C$Id: ffrrng.f,v 1.2 2009/03/25 12:46:02 gdsjaar Exp $ -C$Log: ffrrng.f,v $ -CRevision 1.2 2009/03/25 12:46:02 gdsjaar -CAdd copyright and license notice to all files. -C -CRevision 1.1.1.1 1990/08/14 16:14:41 gdsjaar -CTesting -C -c Revision 1.1 90/08/14 16:14:40 gdsjaar -c Initial revision -c -c Revision 1.1 90/08/09 13:39:27 gdsjaar -c Initial revision -c C --*** FFVRNG *** (FFLIB) Parse free-field real range C -- Written by Amy Gilkey - revised 02/24/86 diff --git a/packages/seacas/libraries/suplib/ffvrng.f b/packages/seacas/libraries/suplib/ffvrng.f index 4a0c2e927d6a..35daf5dd3ff6 100644 --- a/packages/seacas/libraries/suplib/ffvrng.f +++ b/packages/seacas/libraries/suplib/ffvrng.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/libraries/suplib/gslibv.f b/packages/seacas/libraries/suplib/gslibv.f index b340689d4ce0..7bcfec9b4e47 100644 --- a/packages/seacas/libraries/suplib/gslibv.f +++ b/packages/seacas/libraries/suplib/gslibv.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= @@ -9,15 +9,15 @@ SUBROUTINE GSLIBV (STRING) C======================================================================= C*********************************************************************** -C + C *** GSLIBV *** Returns current version number of the suplib library C Get SupLIB Version number C Parameters: C STRING - OUT - string containing version number of suplib -C + C Version Number Format: C n1.n2.n3 -C + C where n1 is the major version number C n2 is the minor version or change capability number C n3 is the bug-fix number diff --git a/packages/seacas/libraries/suplib/heap_sort.f b/packages/seacas/libraries/suplib/heap_sort.f index c322da9dd900..f3809f0e8d13 100644 --- a/packages/seacas/libraries/suplib/heap_sort.f +++ b/packages/seacas/libraries/suplib/heap_sort.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details subroutine heapsort(a,n) @@ -52,4 +52,3 @@ subroutine hs_siftdown(a, start, bottom) return end - diff --git a/packages/seacas/libraries/suplib/help.f b/packages/seacas/libraries/suplib/help.f index f4964d17fae1..abde083ea3a4 100644 --- a/packages/seacas/libraries/suplib/help.f +++ b/packages/seacas/libraries/suplib/help.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/libraries/suplib/hunt.f b/packages/seacas/libraries/suplib/hunt.f index 5b329bd189b8..98e3e0e61389 100644 --- a/packages/seacas/libraries/suplib/hunt.f +++ b/packages/seacas/libraries/suplib/hunt.f @@ -1,16 +1,16 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details subroutine hunt(a,n,x,jlo) C ... find jlo such that a(jlo) .le. x .and. a(jlo+1) .gt. x C (if jlo .ne. n) -C + C Start search at passed in 'jlo' position -C + DIMENSION a(n) integer jlo, low, high diff --git a/packages/seacas/libraries/suplib/idblnk.f b/packages/seacas/libraries/suplib/idblnk.f index c3a2cc6cc9db..38b12e2bc41e 100644 --- a/packages/seacas/libraries/suplib/idblnk.f +++ b/packages/seacas/libraries/suplib/idblnk.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= INTEGER FUNCTION IDBLNK (IELBLK, IEL, IXELB, NUMLNK) diff --git a/packages/seacas/libraries/suplib/iengrx.f b/packages/seacas/libraries/suplib/iengrx.f index c60413591daa..4bee346347fb 100644 --- a/packages/seacas/libraries/suplib/iengrx.f +++ b/packages/seacas/libraries/suplib/iengrx.f @@ -1,26 +1,12 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= INTEGER FUNCTION IENGRX (IMAXE, IMINE) C======================================================================= -C$Id: iengrx.f,v 1.2 2009/03/25 12:46:02 gdsjaar Exp $ -C$Log: iengrx.f,v $ -CRevision 1.2 2009/03/25 12:46:02 gdsjaar -CAdd copyright and license notice to all files. -C -CRevision 1.1.1.1 1990/08/14 16:14:55 gdsjaar -CTesting -C -c Revision 1.1 90/08/14 16:14:54 gdsjaar -c Initial revision -c -c Revision 1.1 90/08/09 13:39:29 gdsjaar -c Initial revision -c C --*** IENGX *** (STRLIB) Internal to NUMSTR C -- Written by Amy Gilkey - revised 02/14/86 diff --git a/packages/seacas/libraries/suplib/indexi.f b/packages/seacas/libraries/suplib/indexi.f index 545dfe293892..aedbc81e5717 100644 --- a/packages/seacas/libraries/suplib/indexi.f +++ b/packages/seacas/libraries/suplib/indexi.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details c$$$ program test @@ -29,20 +29,20 @@ c$$$ end do c$$$ c$$$ end -C + C------------------------------------------------------------------------ C SUBROUTINE INDEXI: Indexes an integer array ARRAY, that is C it outputs an array INDX such that ARRAY(INDX(J)) is in C ascending order for J=1,2,...,N. The input quantities N and C ARRAY are not changed. -C + C ARRAY (*) - Array to be sorted C INDX (modified) - Sorted order of ARRAY C N - Number of elements in ARRAY C INIT - .FALSE. if INDX already setup C .TRUE. if INDX must be initialized C------------------------------------------------------------------------ -C + subroutine indexi(a, indx, n, init) integer a(*) @@ -101,4 +101,3 @@ subroutine siftdowni(a, indx, start, bottom) return end - diff --git a/packages/seacas/libraries/suplib/indexn.f b/packages/seacas/libraries/suplib/indexn.f index 09699729c9f5..9cf8f91a7ca7 100644 --- a/packages/seacas/libraries/suplib/indexn.f +++ b/packages/seacas/libraries/suplib/indexn.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details c$$$ program test @@ -29,13 +29,13 @@ c$$$ end do c$$$ c$$$ end -C + C------------------------------------------------------------------------ C SUBROUTINE INDEXN: Indexes an array ARRAY, that is C it outputs an array INDX such that ARRAY(INDX(J)) is in C ascending order for J=1,2,...,N. The input quantities N and C ARRAY are not changed. -C + C ARRAY (NROW, *) - Array to be sorted, sorted on row IROW C NROW - Row dimension of ARRAY C IROW - Row of ARRAY to be sorted @@ -44,7 +44,7 @@ C INIT - .FALSE. if INDX already setup C .TRUE. if INDX must be initialized C------------------------------------------------------------------------ -C + subroutine indexn (a, nrow, irow, indx, n, init) dimension a(nrow, *) @@ -104,4 +104,3 @@ subroutine siftdownn(a, nrow, irow, indx, start, bottom) return end - diff --git a/packages/seacas/libraries/suplib/indexr.f b/packages/seacas/libraries/suplib/indexr.f index 5af2223b0e43..fa221860a801 100644 --- a/packages/seacas/libraries/suplib/indexr.f +++ b/packages/seacas/libraries/suplib/indexr.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/libraries/suplib/indexx.f b/packages/seacas/libraries/suplib/indexx.f index d2b8d533cc5e..57e26a277f5c 100644 --- a/packages/seacas/libraries/suplib/indexx.f +++ b/packages/seacas/libraries/suplib/indexx.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details c$$$ program test @@ -29,20 +29,20 @@ c$$$ end do c$$$ c$$$ end -C + C------------------------------------------------------------------------ C SUBROUTINE INDEXX: Indexes an array ARRAY, that is C it outputs an array INDX such that ARRAY(INDX(J)) is in C ascending order for J=1,2,...,N. The input quantities N and C ARRAY are not changed. -C + C ARRAY (*) - Array to be sorted C INDX (modified) - Sorted order of ARRAY C N - Number of elements in ARRAY C INIT - .FALSE. if INDX already setup C .TRUE. if INDX must be initialized C------------------------------------------------------------------------ -C + subroutine indexx(a, indx, n, init) dimension a(*) @@ -101,4 +101,3 @@ subroutine my_siftdown(a, indx, start, bottom) return end - diff --git a/packages/seacas/libraries/suplib/inigrd.f b/packages/seacas/libraries/suplib/inigrd.f index 6552b6f3f093..f9900ab993d9 100644 --- a/packages/seacas/libraries/suplib/inigrd.f +++ b/packages/seacas/libraries/suplib/inigrd.f @@ -1,34 +1,17 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE INIGRD (FROM, TO, GRAD, NINT, NPTS, ARRAY) C======================================================================= -C $Id: inigrd.f,v 1.4 2009/03/25 12:46:02 gdsjaar Exp $ -C $Log: inigrd.f,v $ -C Revision 1.4 2009/03/25 12:46:02 gdsjaar -C Add copyright and license notice to all files. -C -C Revision 1.3 1992/01/02 18:55:16 gdsjaar -C Moved from gen3d to here, overwrite old one -C -c Revision 1.2 1991/02/07 10:35:19 gdsjaar -c Removed Debug Comment lines from files -c -c Revision 1.1.1.1 90/08/20 12:21:56 gdsjaar -c Gen3D Mesh Generation Program -c -c Revision 1.1 90/08/20 12:21:55 gdsjaar -c Initial revision -c C INIGRD: Initialize array ARRAY with NPTS values. C values are calculated to have a gradient of GRAD C ranging from FROM to TO with NINT segments. -C + C --- FROM - IN - Minimum value of range C --- TO - IN - Maximum value of range C --- GRAD - IN - Gradient @@ -37,10 +20,10 @@ SUBROUTINE INIGRD (FROM, TO, GRAD, NINT, NPTS, ARRAY) C do not need full range, but want gradient spacing C based on full range. Normally NPTS = NINT + 1 C --- ARRAY- OUT- Range of values -C + REAL ARRAY(NPTS) LOGICAL NOGRAD -C + IF (FROM .EQ. TO .OR. NINT .LE. 0) THEN CALL PRTERR ('PROGRAM', * 'invalid values passed to INIGRD') @@ -48,7 +31,7 @@ SUBROUTINE INIGRD (FROM, TO, GRAD, NINT, NPTS, ARRAY) END IF NOGRAD = (ABS(GRAD - 1.0)/NINT .LE. 1.0e-7) -C + IF (NOGRAD) THEN D3 = 1.0 / NINT DO 10 I=1, NPTS @@ -65,6 +48,6 @@ SUBROUTINE INIGRD (FROM, TO, GRAD, NINT, NPTS, ARRAY) DO 30 I=1, NPTS ARRAY(I) = FROM + ARRAY(I) * (TO - FROM) 30 CONTINUE -C + RETURN END diff --git a/packages/seacas/libraries/suplib/iniint.f b/packages/seacas/libraries/suplib/iniint.f index a90ca3a227a2..57932d049c87 100644 --- a/packages/seacas/libraries/suplib/iniint.f +++ b/packages/seacas/libraries/suplib/iniint.f @@ -1,26 +1,12 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE INIINT (LEN, IFROM, ITO) C======================================================================= -C$Id: iniint.f,v 1.2 2009/03/25 12:46:02 gdsjaar Exp $ -C$Log: iniint.f,v $ -CRevision 1.2 2009/03/25 12:46:02 gdsjaar -CAdd copyright and license notice to all files. -C -CRevision 1.1.1.1 1990/08/14 16:15:00 gdsjaar -CTesting -C -c Revision 1.1 90/08/14 16:14:59 gdsjaar -c Initial revision -c -c Revision 1.1 90/08/09 13:39:30 gdsjaar -c Initial revision -c C --*** INIINT *** (ETCLIB) Initialize all integers in list C -- Written by Amy Gilkey - revised 03/15/88 diff --git a/packages/seacas/libraries/suplib/inilog.f b/packages/seacas/libraries/suplib/inilog.f index 7ea7e39b790d..7aa6cd44dad5 100644 --- a/packages/seacas/libraries/suplib/inilog.f +++ b/packages/seacas/libraries/suplib/inilog.f @@ -1,26 +1,12 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE INILOG (LEN, LFROM, LTO) C======================================================================= -C$Id: inilog.f,v 1.2 2009/03/25 12:46:02 gdsjaar Exp $ -C$Log: inilog.f,v $ -CRevision 1.2 2009/03/25 12:46:02 gdsjaar -CAdd copyright and license notice to all files. -C -CRevision 1.1.1.1 1990/08/14 16:15:03 gdsjaar -CTesting -C -c Revision 1.1 90/08/14 16:15:02 gdsjaar -c Initial revision -c -c Revision 1.1 90/08/09 13:39:31 gdsjaar -c Initial revision -c C --*** INILOG *** (ETCLIB) Initialize all logicals in list C -- Written by Amy Gilkey - revised 03/15/88 diff --git a/packages/seacas/libraries/suplib/inirea.f b/packages/seacas/libraries/suplib/inirea.f index 2b8289b3bfc9..71b517066d89 100644 --- a/packages/seacas/libraries/suplib/inirea.f +++ b/packages/seacas/libraries/suplib/inirea.f @@ -1,26 +1,12 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE INIREA (LEN, RFROM, RTO) C======================================================================= -C$Id: inirea.f,v 1.2 2009/03/25 12:46:02 gdsjaar Exp $ -C$Log: inirea.f,v $ -CRevision 1.2 2009/03/25 12:46:02 gdsjaar -CAdd copyright and license notice to all files. -C -CRevision 1.1.1.1 1990/08/14 16:15:05 gdsjaar -CTesting -C -c Revision 1.1 90/08/14 16:15:04 gdsjaar -c Initial revision -c -c Revision 1.1 90/08/09 13:39:31 gdsjaar -c Initial revision -c C --*** INIREA *** (ETCLIB) Initialize all real numbers in list C -- Written by Amy Gilkey - revised 03/15/88 diff --git a/packages/seacas/libraries/suplib/inistr.f b/packages/seacas/libraries/suplib/inistr.f index 961f0b020688..6e33ae085a5e 100644 --- a/packages/seacas/libraries/suplib/inistr.f +++ b/packages/seacas/libraries/suplib/inistr.f @@ -1,26 +1,12 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE INISTR (LEN, IFROM, ITO) C======================================================================= -C$Id: inistr.f,v 1.2 2009/03/25 12:46:02 gdsjaar Exp $ -C$Log: inistr.f,v $ -CRevision 1.2 2009/03/25 12:46:02 gdsjaar -CAdd copyright and license notice to all files. -C -CRevision 1.1.1.1 1990/08/14 16:15:08 gdsjaar -CTesting -C -c Revision 1.1 90/08/14 16:15:07 gdsjaar -c Initial revision -c -c Revision 1.1 90/08/09 13:39:32 gdsjaar -c Initial revision -c C --*** INISTR *** (STRLIB) Initialize all strings in list C -- Written by Amy Gilkey - revised 03/15/88 diff --git a/packages/seacas/libraries/suplib/intadd.f b/packages/seacas/libraries/suplib/intadd.f index c4dd75851c02..b0c1d811fa9c 100644 --- a/packages/seacas/libraries/suplib/intadd.f +++ b/packages/seacas/libraries/suplib/intadd.f @@ -1,26 +1,12 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= INTEGER FUNCTION INTADD (LENLST, INTLST) C======================================================================= -C$Id: intadd.f,v 1.2 2009/03/25 12:46:02 gdsjaar Exp $ -C$Log: intadd.f,v $ -CRevision 1.2 2009/03/25 12:46:02 gdsjaar -CAdd copyright and license notice to all files. -C -CRevision 1.1.1.1 1990/08/14 16:15:10 gdsjaar -CTesting -C -c Revision 1.1 90/08/14 16:15:09 gdsjaar -c Initial revision -c -c Revision 1.1 90/08/09 13:39:32 gdsjaar -c Initial revision -c C --*** INTADD *** (ETCLIB) Add all integers in list C -- Written by Amy Gilkey - revised 11/10/87 diff --git a/packages/seacas/libraries/suplib/intstr.f b/packages/seacas/libraries/suplib/intstr.f index 7c46e5a2e617..ac6836a20976 100644 --- a/packages/seacas/libraries/suplib/intstr.f +++ b/packages/seacas/libraries/suplib/intstr.f @@ -1,26 +1,12 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE INTSTR (NNUM, LNGSTR, INUM, ISTR, LSTR) C======================================================================= -C$Id: intstr.f,v 1.2 2009/03/25 12:46:02 gdsjaar Exp $ -C$Log: intstr.f,v $ -CRevision 1.2 2009/03/25 12:46:02 gdsjaar -CAdd copyright and license notice to all files. -C -CRevision 1.1.1.1 1990/08/14 16:15:14 gdsjaar -CTesting -C -c Revision 1.1 90/08/14 16:15:12 gdsjaar -c Initial revision -c -c Revision 1.1 90/08/09 13:39:32 gdsjaar -c Initial revision -c C --*** INTSTR *** (STRLIB) Convert integer numbers to strings C -- Written by Amy Gilkey - revised 03/14/88 diff --git a/packages/seacas/libraries/suplib/iowdsz.f b/packages/seacas/libraries/suplib/iowdsz.f index 046034db76a7..fae7072cf6ed 100644 --- a/packages/seacas/libraries/suplib/iowdsz.f +++ b/packages/seacas/libraries/suplib/iowdsz.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= @@ -9,7 +9,7 @@ INTEGER FUNCTION IOWDSZ() C======================================================================= C convenience function for setting desired exodusII output word size C via the EXT05 environment variable. -C + character*80 ws character*8 cdum diff --git a/packages/seacas/libraries/suplib/ismax.f b/packages/seacas/libraries/suplib/ismax.f index 380b6a8e3ec2..0008750e14bf 100644 --- a/packages/seacas/libraries/suplib/ismax.f +++ b/packages/seacas/libraries/suplib/ismax.f @@ -1,29 +1,29 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C------------------------------------------------------------- ************ C ISMAX C ************ INTEGER FUNCTION ISMAX(N,SX,INCX) -C + C FINDS THE INDEX OF ELEMENT WITH MAX. VALUE. C JACK DONGARRA, LINPACK, 3/11/78. -C + INTEGER I,INCX,IX,N REAL SX(*),SMAX -C + ISMAX = 0 IF (N .LT. 0) STOP IF (N .EQ. 0) RETURN ISMAX = 1 IF (N .EQ. 1) RETURN IF (INCX .EQ. 1) GO TO 20 -C + C CODE FOR INCREMENT NOT EQUAL TO 1 -C + IX = 1 IF (INCX .LE. 0) IX = (-N+1)*INCX + 1 SMAX = SX(IX) @@ -35,9 +35,9 @@ INTEGER FUNCTION ISMAX(N,SX,INCX) 5 IX = IX + INCX 10 CONTINUE RETURN -C + C CODE FOR INCREMENT EQUAL TO 1 -C + 20 SMAX = SX(1) DO 30 I = 2,N,1 IF (SX(I) .LE. SMAX) GO TO 30 diff --git a/packages/seacas/libraries/suplib/ismin.f b/packages/seacas/libraries/suplib/ismin.f index 8ea185da1daa..f8cca69ea1d0 100644 --- a/packages/seacas/libraries/suplib/ismin.f +++ b/packages/seacas/libraries/suplib/ismin.f @@ -1,29 +1,29 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C------------------------------------------------------------- ************ C ISMIN C ************ INTEGER FUNCTION ISMIN(N,SX,INCX) -C + C FINDS THE INDEX OF ELEMENT WITH MIN. VALUE. C JACK DONGARRA, LINPACK, 3/11/78. -C + INTEGER I,INCX,IX,N REAL SX(*),SMIN -C + ISMIN = 0 IF (N .LT. 0) STOP IF (N .EQ. 0) RETURN ISMIN = 1 IF (N .EQ. 1) RETURN IF (INCX .EQ. 1) GO TO 20 -C + C CODE FOR INCREMENT NOT EQUAL TO 1 -C + IX = 1 IF (INCX .LE. 0) IX = (-N+1)*INCX + 1 SMIN = SX(IX) @@ -35,9 +35,9 @@ INTEGER FUNCTION ISMIN(N,SX,INCX) 5 IX = IX + INCX 10 CONTINUE RETURN -C + C CODE FOR INCREMENT EQUAL TO 1 -C + 20 SMIN = SX(1) DO 30 I = 2,N,1 IF (SX(I) .GE. SMIN) GO TO 30 diff --git a/packages/seacas/libraries/suplib/lenstr.f b/packages/seacas/libraries/suplib/lenstr.f index 252f071aaed7..498bbd6ff901 100644 --- a/packages/seacas/libraries/suplib/lenstr.f +++ b/packages/seacas/libraries/suplib/lenstr.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/libraries/suplib/locint.f b/packages/seacas/libraries/suplib/locint.f index 94317609f4b0..cc295d4ab987 100644 --- a/packages/seacas/libraries/suplib/locint.f +++ b/packages/seacas/libraries/suplib/locint.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/libraries/suplib/locrea.f b/packages/seacas/libraries/suplib/locrea.f index b430d7374df0..c35e906b3e61 100644 --- a/packages/seacas/libraries/suplib/locrea.f +++ b/packages/seacas/libraries/suplib/locrea.f @@ -1,26 +1,12 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= INTEGER FUNCTION LOCREA (VALU, NVALUS, VALUS) C======================================================================= -C$Id: locrea.f,v 1.2 2009/03/25 12:46:02 gdsjaar Exp $ -C$Log: locrea.f,v $ -CRevision 1.2 2009/03/25 12:46:02 gdsjaar -CAdd copyright and license notice to all files. -C -CRevision 1.1.1.1 1990/08/14 16:15:21 gdsjaar -CTesting -C -c Revision 1.1 90/08/14 16:15:20 gdsjaar -c Initial revision -c -c Revision 1.1 90/08/09 13:39:34 gdsjaar -c Initial revision -c C --*** LOCREA *** (ETCLIB) Find closest real value C -- Written by Amy Gilkey - revised 11/03/87 diff --git a/packages/seacas/libraries/suplib/locstr.f b/packages/seacas/libraries/suplib/locstr.f index 4c856536e7d6..38337f60744e 100644 --- a/packages/seacas/libraries/suplib/locstr.f +++ b/packages/seacas/libraries/suplib/locstr.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/libraries/suplib/logerr.f b/packages/seacas/libraries/suplib/logerr.f index 3a51442c8d5c..e161fc6301c5 100644 --- a/packages/seacas/libraries/suplib/logerr.f +++ b/packages/seacas/libraries/suplib/logerr.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/libraries/suplib/lowstr.f b/packages/seacas/libraries/suplib/lowstr.f index ddf5bc418525..d9d8c7dca527 100644 --- a/packages/seacas/libraries/suplib/lowstr.f +++ b/packages/seacas/libraries/suplib/lowstr.f @@ -1,26 +1,12 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE LOWSTR (LCSTR, UCSTR) C======================================================================= -C$Id: lowstr.f,v 1.2 2009/03/25 12:46:02 gdsjaar Exp $ -C$Log: lowstr.f,v $ -CRevision 1.2 2009/03/25 12:46:02 gdsjaar -CAdd copyright and license notice to all files. -C -CRevision 1.1.1.1 1990/08/14 16:15:29 gdsjaar -CTesting -C -c Revision 1.1 90/08/14 16:15:28 gdsjaar -c Initial revision -c -c Revision 1.1 90/08/09 13:39:35 gdsjaar -c Initial revision -c C --*** LOWSTR *** (STRLIB) Convert string to lower-case C -- Written by Amy Gilkey - revised 08/06/87 diff --git a/packages/seacas/libraries/suplib/matstr.f b/packages/seacas/libraries/suplib/matstr.f index 9f5ed48ece99..2c201024f3a3 100644 --- a/packages/seacas/libraries/suplib/matstr.f +++ b/packages/seacas/libraries/suplib/matstr.f @@ -1,26 +1,12 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= LOGICAL FUNCTION MATSTR (INSTR, MATCH, NLET) C======================================================================= -C$Id: matstr.f,v 1.2 2009/03/25 12:46:02 gdsjaar Exp $ -C$Log: matstr.f,v $ -CRevision 1.2 2009/03/25 12:46:02 gdsjaar -CAdd copyright and license notice to all files. -C -CRevision 1.1.1.1 1990/08/14 16:15:32 gdsjaar -CTesting -C -c Revision 1.1 90/08/14 16:15:30 gdsjaar -c Initial revision -c -c Revision 1.1 90/08/09 13:39:36 gdsjaar -c Initial revision -c C --*** MATSTR *** (STRLIB) Check if string matches C -- Written by Amy Gilkey - revised 07/01/87 diff --git a/packages/seacas/libraries/suplib/memerr.f b/packages/seacas/libraries/suplib/memerr.f index a307e0d5ecab..e0973fdbb4f4 100644 --- a/packages/seacas/libraries/suplib/memerr.f +++ b/packages/seacas/libraries/suplib/memerr.f @@ -1,26 +1,12 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE MEMERR C======================================================================= -C$Id: memerr.f,v 1.2 2009/03/25 12:46:02 gdsjaar Exp $ -C$Log: memerr.f,v $ -CRevision 1.2 2009/03/25 12:46:02 gdsjaar -CAdd copyright and license notice to all files. -C -CRevision 1.1.1.1 1990/08/14 16:15:34 gdsjaar -CTesting -C -c Revision 1.1 90/08/14 16:15:33 gdsjaar -c Initial revision -c -c Revision 1.1 90/08/09 13:39:37 gdsjaar -c Initial revision -c C --*** MEMERR *** (ETCLIB) Flag dynamic memory error C -- Written by Amy Gilkey - revised 02/23/88 diff --git a/packages/seacas/libraries/suplib/minmax.f b/packages/seacas/libraries/suplib/minmax.f index b6d171513bac..c918e8d4b0bb 100644 --- a/packages/seacas/libraries/suplib/minmax.f +++ b/packages/seacas/libraries/suplib/minmax.f @@ -1,30 +1,12 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE MINMAX (NPTS, PTS, VMIN, VMAX) C======================================================================= -C$Id: minmax.f,v 1.3 2009/03/25 12:46:02 gdsjaar Exp $ -C$Log: minmax.f,v $ -CRevision 1.3 2009/03/25 12:46:02 gdsjaar -CAdd copyright and license notice to all files. -C -CRevision 1.2 1997/11/11 21:45:59 gdsjaar -CAdded check for NaN (not a number) in the min/max limit determination. -CPrints a warning message and sets the min/max to be +/-1e30. -C -CRevision 1.1.1.1 1990/08/14 16:15:37 gdsjaar -CTesting -C -c Revision 1.1 90/08/14 16:15:36 gdsjaar -c Initial revision -c -c Revision 1.1 90/08/09 13:39:38 gdsjaar -c Initial revision -c C --*** MINMAX *** (ETCLIB) Calculate min/max value C -- Written by Amy Gilkey - revised 11/10/87 diff --git a/packages/seacas/libraries/suplib/minmxl.f b/packages/seacas/libraries/suplib/minmxl.f index b5455e88a7aa..6fb0b0f2ce78 100644 --- a/packages/seacas/libraries/suplib/minmxl.f +++ b/packages/seacas/libraries/suplib/minmxl.f @@ -1,26 +1,12 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE MINMXL (NPTS, PTOK, PTS, VMIN, VMAX) C======================================================================= -C$Id: minmxl.f,v 1.2 2009/03/25 12:46:02 gdsjaar Exp $ -C$Log: minmxl.f,v $ -CRevision 1.2 2009/03/25 12:46:02 gdsjaar -CAdd copyright and license notice to all files. -C -CRevision 1.1.1.1 1990/08/14 16:15:39 gdsjaar -CTesting -C -c Revision 1.1 90/08/14 16:15:38 gdsjaar -c Initial revision -c -c Revision 1.1 90/08/09 13:39:38 gdsjaar -c Initial revision -c C --*** MINMXL *** (ETCLIB) Calculate min/max value in selected list C -- Written by Amy Gilkey - revised 11/10/87 diff --git a/packages/seacas/libraries/suplib/minmxs.f b/packages/seacas/libraries/suplib/minmxs.f index b5e8f8af614f..2058dd39857c 100644 --- a/packages/seacas/libraries/suplib/minmxs.f +++ b/packages/seacas/libraries/suplib/minmxs.f @@ -1,26 +1,12 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE MINMXS (NPTSEL, IXSEL, PTS, VMIN, VMAX) C======================================================================= -C$Id: minmxs.f,v 1.2 2009/03/25 12:46:02 gdsjaar Exp $ -C$Log: minmxs.f,v $ -CRevision 1.2 2009/03/25 12:46:02 gdsjaar -CAdd copyright and license notice to all files. -C -CRevision 1.1.1.1 1990/08/14 16:15:42 gdsjaar -CTesting -C -c Revision 1.1 90/08/14 16:15:41 gdsjaar -c Initial revision -c -c Revision 1.1 90/08/09 13:39:39 gdsjaar -c Initial revision -c C --*** MINMXS *** (ETCLIB) Calculate min/max value of selected points C -- Written by Amy Gilkey - revised 11/10/87 diff --git a/packages/seacas/libraries/suplib/num2ix.f b/packages/seacas/libraries/suplib/num2ix.f index 5ffa8cad040c..77f2fa620777 100644 --- a/packages/seacas/libraries/suplib/num2ix.f +++ b/packages/seacas/libraries/suplib/num2ix.f @@ -1,26 +1,12 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE NUM2IX (NSETS, NINSET, IXSET) C======================================================================= -C$Id: num2ix.f,v 1.2 2009/03/25 12:46:02 gdsjaar Exp $ -C$Log: num2ix.f,v $ -CRevision 1.2 2009/03/25 12:46:02 gdsjaar -CAdd copyright and license notice to all files. -C -CRevision 1.1.1.1 1990/08/14 16:15:45 gdsjaar -CTesting -C -c Revision 1.1 90/08/14 16:15:44 gdsjaar -c Initial revision -c -c Revision 1.1 90/08/09 13:39:39 gdsjaar -c Initial revision -c C --*** NUM2IX *** (ETCLIB) Change number-in-set to set indices C -- Written by Amy Gilkey - revised 10/23/87 diff --git a/packages/seacas/libraries/suplib/numeqi.f b/packages/seacas/libraries/suplib/numeqi.f index 21724d91b3dc..87c3b03aa52b 100644 --- a/packages/seacas/libraries/suplib/numeqi.f +++ b/packages/seacas/libraries/suplib/numeqi.f @@ -1,26 +1,12 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= INTEGER FUNCTION NUMEQI (INT, LENLST, INTLST) C======================================================================= -C$Id: numeqi.f,v 1.2 2009/03/25 12:46:02 gdsjaar Exp $ -C$Log: numeqi.f,v $ -CRevision 1.2 2009/03/25 12:46:02 gdsjaar -CAdd copyright and license notice to all files. -C -CRevision 1.1.1.1 1990/08/14 16:15:48 gdsjaar -CTesting -C -c Revision 1.1 90/08/14 16:15:47 gdsjaar -c Initial revision -c -c Revision 1.1 90/08/09 13:39:40 gdsjaar -c Initial revision -c C --*** NUMEQI *** (ETCLIB) Count number of occurrences of integer in list C -- Written by Amy Gilkey - revised 11/10/87 diff --git a/packages/seacas/libraries/suplib/numeql.f b/packages/seacas/libraries/suplib/numeql.f index e2e22653f825..47537f63c700 100644 --- a/packages/seacas/libraries/suplib/numeql.f +++ b/packages/seacas/libraries/suplib/numeql.f @@ -1,26 +1,12 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= INTEGER FUNCTION NUMEQL (TORF, LENLST, LOGLST) C======================================================================= -C$Id: numeql.f,v 1.2 2009/03/25 12:46:02 gdsjaar Exp $ -C$Log: numeql.f,v $ -CRevision 1.2 2009/03/25 12:46:02 gdsjaar -CAdd copyright and license notice to all files. -C -CRevision 1.1.1.1 1990/08/14 16:15:50 gdsjaar -CTesting -C -c Revision 1.1 90/08/14 16:15:49 gdsjaar -c Initial revision -c -c Revision 1.1 90/08/09 13:39:40 gdsjaar -c Initial revision -c C --*** NUMEQL *** (ETCLIB) Count number of occurrences of logical in list C -- Written by Amy Gilkey - revised 12/21/87 diff --git a/packages/seacas/libraries/suplib/numstr.f b/packages/seacas/libraries/suplib/numstr.f index 4d19ed3bce27..4fbb6076bd39 100644 --- a/packages/seacas/libraries/suplib/numstr.f +++ b/packages/seacas/libraries/suplib/numstr.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE NUMSTR (NNUM, NSIG, RNUM, RSTR, LSTR) diff --git a/packages/seacas/libraries/suplib/numstr1.f b/packages/seacas/libraries/suplib/numstr1.f index ea548cb34b02..f53925f61c99 100644 --- a/packages/seacas/libraries/suplib/numstr1.f +++ b/packages/seacas/libraries/suplib/numstr1.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE NUMSTR1 (NSIG, RNUM, RSTR, LSTR) diff --git a/packages/seacas/libraries/suplib/okabrt.f b/packages/seacas/libraries/suplib/okabrt.f index 9383711e41d7..86f5fbab7ecc 100644 --- a/packages/seacas/libraries/suplib/okabrt.f +++ b/packages/seacas/libraries/suplib/okabrt.f @@ -1,29 +1,12 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= LOGICAL FUNCTION OKABRT (ISOK) C======================================================================= -C$Id: okabrt.f,v 1.3 2009/03/25 12:46:02 gdsjaar Exp $ -C$Log: okabrt.f,v $ -CRevision 1.3 2009/03/25 12:46:02 gdsjaar -CAdd copyright and license notice to all files. -C -CRevision 1.2 1990/11/30 09:51:00 gdsjaar -CModified to work on Unicos -C -c Revision 1.1.1.1 90/08/14 16:15:56 gdsjaar -c Testing -c -c Revision 1.1 90/08/14 16:15:54 gdsjaar -c Initial revision -c -c Revision 1.1 90/08/09 13:39:41 gdsjaar -c Initial revision -c C --*** OKABRT *** (ETCLIB) Initialize cancel function C -- Written by Amy Gilkey - revised 12/21/87 @@ -58,23 +41,6 @@ LOGICAL FUNCTION OKABRT (ISOK) C======================================================================= ENTRY ISABRT () C======================================================================= -C$Id: okabrt.f,v 1.3 2009/03/25 12:46:02 gdsjaar Exp $ -C$Log: okabrt.f,v $ -CRevision 1.3 2009/03/25 12:46:02 gdsjaar -CAdd copyright and license notice to all files. -C -CRevision 1.2 1990/11/30 09:51:00 gdsjaar -CModified to work on Unicos -C -c Revision 1.1.1.1 90/08/14 16:15:56 gdsjaar -c Testing -c -c Revision 1.1 90/08/14 16:15:54 gdsjaar -c Initial revision -c -c Revision 1.1 90/08/09 13:39:41 gdsjaar -c Initial revision -c C --*** ISABRT *** (ETCLIB) Check cancel function C -- Written by Amy Gilkey - revised 12/17/87 diff --git a/packages/seacas/libraries/suplib/opnfil.f b/packages/seacas/libraries/suplib/opnfil.f index c2246b900a02..f97e33519c77 100644 --- a/packages/seacas/libraries/suplib/opnfil.f +++ b/packages/seacas/libraries/suplib/opnfil.f @@ -1,13 +1,12 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE OPNFIL (IUNIT, INOUT, FFORM, IDAPAR, IERR) C======================================================================= -C$Id: opnfil.f,v 1.4 2009/03/25 12:46:02 gdsjaar Exp $ C --*** OPNFIL *** (ETCLIB) Open a file C -- Written by Amy Gilkey - revised 04/20/88 C -- diff --git a/packages/seacas/libraries/suplib/packt.f b/packages/seacas/libraries/suplib/packt.f index 31220f80dd03..822d0523b502 100644 --- a/packages/seacas/libraries/suplib/packt.f +++ b/packages/seacas/libraries/suplib/packt.f @@ -1,21 +1,21 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details SUBROUTINE PACKT (TITLE,LENGTH) -C + C ... REMOVE MULTIPLE BLANKS FROM A TITLE OR LABEL -C + CHARACTER*(*) TITLE CHARACTER*1 BLANK DATA BLANK/' '/ I=1 L=1 -C + C ... SKIP LEADING BLANKS -C + 10 CONTINUE IF (TITLE(I:I) .NE. BLANK) GO TO 20 I=I+1 diff --git a/packages/seacas/libraries/suplib/pcklab.f b/packages/seacas/libraries/suplib/pcklab.f index ba4dbf5c2cce..99ab647931e3 100644 --- a/packages/seacas/libraries/suplib/pcklab.f +++ b/packages/seacas/libraries/suplib/pcklab.f @@ -1,20 +1,20 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details SUBROUTINE PCKLAB (CURVE,ACURVE,NCURVE) -C + C THIS SUBROUTINE PACKS A 8 CHARACTER WORD AND A 'I8' MAXIMUM C INTEGER INTO A 16 CHARACTER WORD BY REMOVING C INCLUDED BLANKS -- USED TO CREATE VARIABLE 'CURVE' FOR PLTONE -C + CHARACTER*8 ACURVE CHARACTER*16 CURVE CHARACTER*1 BLANK DATA BLANK/' '/ -C + IF (NCURVE .NE. 0) THEN WRITE (CURVE, 10) ACURVE, NCURVE 10 FORMAT (A8,I8) @@ -34,5 +34,5 @@ SUBROUTINE PCKLAB (CURVE,ACURVE,NCURVE) CURVE(J:J)= BLANK 30 CONTINUE RETURN -C + END diff --git a/packages/seacas/libraries/suplib/pckstr.f b/packages/seacas/libraries/suplib/pckstr.f index 4266cdc6f05d..b768fa7bafcd 100644 --- a/packages/seacas/libraries/suplib/pckstr.f +++ b/packages/seacas/libraries/suplib/pckstr.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/libraries/suplib/pltond.f b/packages/seacas/libraries/suplib/pltond.f index 9f8c53e06197..f70214452ca1 100644 --- a/packages/seacas/libraries/suplib/pltond.f +++ b/packages/seacas/libraries/suplib/pltond.f @@ -1,16 +1,15 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details - SUBROUTINE PLTOND (MD, TITLE, NTITLE, XX, YY, XLAB, YLAB, NP, 1 CURVE, TPLOT) -C + C DOUBLE PRECISION VERSION C OUTPUT DATA IN GRAFAID NEUTRAL FILE FORMAT FOR ONE PLOT -C + C ---------------------------------------------------------------------- C VARIABLES: C Name Type Description @@ -23,20 +22,20 @@ SUBROUTINE PLTOND (MD, TITLE, NTITLE, XX, YY, XLAB, YLAB, NP, C CURVE char*16 Curve Name C TPLOT logical .TRUE. if X-variable is time C .FALSE. if X-variable is not time -C + C ARRAYS: C Name Dimension Type Description C ---- --------- ---- ---------------------------------- C TITLE NTITLE char*80 Title for current curve C XX NP real X-variable data C YY NP real Y-variable data -C + C SUBROUTINES AND FUNCTIONS CALLED: -C + CHARACTER*(*) TITLE(*) CHARACTER*(*) XLAB,YLAB REAL*8 XX(*), YY(*), XMN, XMX, YMN, YMX -C + LOGICAL MONO, TPLOT CHARACTER*(*) CURVE CHARACTER*11 BEGIN @@ -45,9 +44,9 @@ SUBROUTINE PLTOND (MD, TITLE, NTITLE, XX, YY, XLAB, YLAB, NP, CHARACTER*4 XTYP, AXTYP DATA COMMA/','/, AXTYP/'NOLO'/ DATA BEGIN/'BEGIN CURVE'/, ECURVE/'END CURVE'/, AUX/'F'/ -C + C ...LOCATE MINIMUM AND MAXIMUM VALUES AND CHECK FOR NONMONOTONIC DATA -C + MONO = .TRUE. IF (TPLOT) THEN XMN = XX(1) @@ -69,16 +68,16 @@ SUBROUTINE PLTOND (MD, TITLE, NTITLE, XX, YY, XLAB, YLAB, NP, ELSE XTYP = 'NONM' END IF -C + YMN=YY(1) YMX=YY(1) DO 20 I=2,NP YMN = MIN(YMN, YY(I)) YMX = MAX(YMX, YY(I)) 20 CONTINUE -C + C BEGIN TO WRITE CURVE PACKET -C + WRITE (MD, 40) BEGIN,COMMA,CURVE WRITE (MD, 50) NTITLE,COMMA,TITLE(1) DO 30 I=2,NTITLE @@ -89,18 +88,18 @@ SUBROUTINE PLTOND (MD, TITLE, NTITLE, XX, YY, XLAB, YLAB, NP, WRITE (MD, 80) XMN,COMMA,XMX,COMMA,YMN,COMMA,YMX,COMMA, 1 NP,COMMA,AUX WRITE (MD, 90) AXTYP,COMMA,XTYP,COMMA -C + C WRITE DATA PAIRS -C + DO 35 III=1,NP WRITE (MD, 100) XX(III),COMMA,YY(III) 35 CONTINUE -C + C WRITE END OF CURVE PACKET -C + WRITE (MD, 110) ECURVE,COMMA,CURVE RETURN -C + 40 FORMAT (A11,A1,A16) 50 FORMAT (I1,A1,A) 60 FORMAT (A) diff --git a/packages/seacas/libraries/suplib/pltone.f b/packages/seacas/libraries/suplib/pltone.f index b48c6b900066..bc58c0958e33 100644 --- a/packages/seacas/libraries/suplib/pltone.f +++ b/packages/seacas/libraries/suplib/pltone.f @@ -1,15 +1,14 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details - SUBROUTINE PLTONE (MD, TITLE, NTITLE, XX, YY, XLAB, YLAB, NP, 1 CURVE, TPLOT) -C + C OUTPUT DATA IN GRAFAID NEUTRAL FILE FORMAT FOR ONE PLOT -C + C ---------------------------------------------------------------------- C VARIABLES: C Name Type Description @@ -22,23 +21,23 @@ SUBROUTINE PLTONE (MD, TITLE, NTITLE, XX, YY, XLAB, YLAB, NP, C CURVE char*16 Curve Name C TPLOT logical .TRUE. if X-variable is time C .FALSE. if X-variable is not time -C + C ARRAYS: C Name Dimension Type Description C ---- --------- ---- ---------------------------------- C TITLE NTITLE char*80 Title for current curve C XX NP real X-variable data C YY NP real Y-variable data -C + C SUBROUTINES AND FUNCTIONS CALLED: C PACKT - Remove multiple blanks from a character string C The string: "This is the title" C Is returned as: "This is the title" -C + CHARACTER*(*) TITLE(*) CHARACTER*(*) XLAB,YLAB DIMENSION XX(*), YY(*) -C + LOGICAL MONO, TPLOT CHARACTER*(*) CURVE CHARACTER*11 BEGIN @@ -47,9 +46,9 @@ SUBROUTINE PLTONE (MD, TITLE, NTITLE, XX, YY, XLAB, YLAB, NP, CHARACTER*4 XTYP, AXTYP DATA COMMA/','/, AXTYP/'NOLO'/ DATA BEGIN/'BEGIN CURVE'/, ECURVE/'END CURVE'/, AUX/'F'/ -C + C ...LOCATE MINIMUM AND MAXIMUM VALUES AND CHECK FOR NONMONOTONIC DATA -C + MONO = .TRUE. IF (TPLOT) THEN XMN = XX(1) @@ -71,16 +70,16 @@ SUBROUTINE PLTONE (MD, TITLE, NTITLE, XX, YY, XLAB, YLAB, NP, ELSE XTYP = 'NONM' END IF -C + YMN=YY(1) YMX=YY(1) DO 20 I=2,NP YMN = MIN(YMN, YY(I)) YMX = MAX(YMX, YY(I)) 20 CONTINUE -C + C BEGIN TO WRITE CURVE PACKET -C + WRITE (MD, 40) BEGIN,COMMA,CURVE CALL PACKT (TITLE(1),80) WRITE (MD, 50) NTITLE,COMMA,TITLE(1) @@ -95,18 +94,18 @@ SUBROUTINE PLTONE (MD, TITLE, NTITLE, XX, YY, XLAB, YLAB, NP, WRITE (MD, 80) XMN,COMMA,XMX,COMMA,YMN,COMMA,YMX,COMMA, 1 NP,COMMA,AUX WRITE (MD, 90) AXTYP,COMMA,XTYP,COMMA -C + C WRITE DATA PAIRS -C + DO 35 III=1,NP WRITE (MD, 100) XX(III),COMMA,YY(III) 35 CONTINUE -C + C WRITE END OF CURVE PACKET -C + WRITE (MD, 110) ECURVE,COMMA,CURVE RETURN -C + 40 FORMAT (A11,A1,A16) 50 FORMAT (I1,A1,A80) 60 FORMAT (A) diff --git a/packages/seacas/libraries/suplib/prterr.f b/packages/seacas/libraries/suplib/prterr.f index 391344466756..6d479aaa1753 100644 --- a/packages/seacas/libraries/suplib/prterr.f +++ b/packages/seacas/libraries/suplib/prterr.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/libraries/suplib/ran1.f b/packages/seacas/libraries/suplib/ran1.f index dab7ba8d9dc7..3579f34cd504 100644 --- a/packages/seacas/libraries/suplib/ran1.f +++ b/packages/seacas/libraries/suplib/ran1.f @@ -1,28 +1,28 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details REAL FUNCTION RAN1(idum) -C + C This function returns a pseudo-random number for each invocation. C It is a FORTRAN 77 adaptation of the "Integer Version 2" minimal C standard number generator whose Pascal code appears in the article: -C + C Park, Steven K. and Miller, Keith W., "Random Number Generators: C Good Ones are Hard to Find", Communications of the ACM, C October, 1988. -C + PARAMETER (MPLIER=16807,MODLUS=2147483647,MOBYMP=127773, + MOMDMP=2836) -C + data jseed /123456789/ data ifrst /0/ INTEGER HVLUE, LVLUE, TESTV, NEXTN SAVE NEXTN -C + IF (IFRST .EQ. 0) THEN if (idum .ne. 0) then nextn = idum @@ -32,7 +32,7 @@ REAL FUNCTION RAN1(idum) IFRST = 1 ENDIF -C + HVLUE = NEXTN / MOBYMP LVLUE = MOD(NEXTN, MOBYMP) TESTV = MPLIER*LVLUE - MOMDMP*HVLUE @@ -42,6 +42,6 @@ REAL FUNCTION RAN1(idum) NEXTN = TESTV + MODLUS ENDIF RAN1 = REAL(NEXTN)/REAL(MODLUS) -C + RETURN END diff --git a/packages/seacas/libraries/suplib/scneof.f b/packages/seacas/libraries/suplib/scneof.f index a1510e709a6c..43554a0e73c5 100644 --- a/packages/seacas/libraries/suplib/scneof.f +++ b/packages/seacas/libraries/suplib/scneof.f @@ -1,26 +1,12 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE SCNEOF C======================================================================= -C$Id: scneof.f,v 1.2 2009/03/25 12:46:02 gdsjaar Exp $ -C$Log: scneof.f,v $ -CRevision 1.2 2009/03/25 12:46:02 gdsjaar -CAdd copyright and license notice to all files. -C -CRevision 1.1.1.1 1990/08/14 16:16:17 gdsjaar -CTesting -C -c Revision 1.1 90/08/14 16:16:16 gdsjaar -c Initial revision -c -c Revision 1.1 90/08/09 13:39:45 gdsjaar -c Initial revision -c C --*** SCNEOF *** (ETCLIB) Scan input until end of file C -- Written by Amy Gilkey - revised 02/23/88 diff --git a/packages/seacas/libraries/suplib/screrr.f b/packages/seacas/libraries/suplib/screrr.f index 0538ef8ffef5..1f4631d49c53 100644 --- a/packages/seacas/libraries/suplib/screrr.f +++ b/packages/seacas/libraries/suplib/screrr.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details subroutine screrr(iunit, filin, lnam, name1, name2) diff --git a/packages/seacas/libraries/suplib/shocmd.f b/packages/seacas/libraries/suplib/shocmd.f index 50fdb2b36535..36f8f517718b 100644 --- a/packages/seacas/libraries/suplib/shocmd.f +++ b/packages/seacas/libraries/suplib/shocmd.f @@ -1,26 +1,12 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE SHOCMD (HEADER, LIST) C======================================================================= -C$Id: shocmd.f,v 1.2 2009/03/25 12:46:02 gdsjaar Exp $ -C$Log: shocmd.f,v $ -CRevision 1.2 2009/03/25 12:46:02 gdsjaar -CAdd copyright and license notice to all files. -C -CRevision 1.1.1.1 1990/08/14 16:16:19 gdsjaar -CTesting -C -c Revision 1.1 90/08/14 16:16:18 gdsjaar -c Initial revision -c -c Revision 1.1 90/08/09 13:39:45 gdsjaar -c Initial revision -c C --*** SHOCMD *** (ETCLIB) Display list of strings C -- Written by Amy Gilkey - revised 10/27/86 diff --git a/packages/seacas/libraries/suplib/sqzstr.f b/packages/seacas/libraries/suplib/sqzstr.f index ba1f91a60a9c..6a4e9f7baee1 100644 --- a/packages/seacas/libraries/suplib/sqzstr.f +++ b/packages/seacas/libraries/suplib/sqzstr.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/libraries/suplib/strtup.f b/packages/seacas/libraries/suplib/strtup.f index 2fd5021ec936..d36a55095a46 100644 --- a/packages/seacas/libraries/suplib/strtup.f +++ b/packages/seacas/libraries/suplib/strtup.f @@ -1,14 +1,13 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C + C See packages/seacas/LICENSE for details C======================================================================= SUBROUTINE STRTUP (QAINFO) C======================================================================= -C$Id: strtup.f,v 1.4 2009/03/25 12:46:02 gdsjaar Exp $ -C + C --*** STRTUP *** (ETCLIB) Startup program C -- Written by Amy Gilkey - revised 11/24/87 C -- diff --git a/packages/seacas/libraries/suplib/subv.f b/packages/seacas/libraries/suplib/subv.f index 0d2f243b36a6..9518b1ab9818 100644 --- a/packages/seacas/libraries/suplib/subv.f +++ b/packages/seacas/libraries/suplib/subv.f @@ -1,38 +1,28 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: subv.f,v 1.2 2009/03/25 12:46:02 gdsjaar Exp $ -C $Log: subv.f,v $ -C Revision 1.2 2009/03/25 12:46:02 gdsjaar -C Add copyright and license notice to all files. -C -C Revision 1.1 1993/11/18 21:32:11 gdsjaar -C Added scilib routines saxpy.f scopy.f sdot.f snrm2.f subv.f -C Added utility routines addv.f subv.f -C -C----------------------------------------------------------------------- SUBROUTINE SUBV( N,A,B,C ) -C + C*********************************************************************** -C + C DESCRIPTION: This routine subtracts two vectors -C + C FORMAL PARAMETERS: C N INTEGER Number of entries in A, B C A REAL First vector C B REAL Vector to be subtracted C C REAL Vector with the result -C + C*********************************************************************** -C + DIMENSION A(N),B(N),C(N) -C + DO 100 I = 1,N C(I) = A(I) - B(I) 100 CONTINUE -C + RETURN END diff --git a/packages/seacas/libraries/suplib/wheneq.f b/packages/seacas/libraries/suplib/wheneq.f index fb24289f60fa..8c599cf80c0d 100644 --- a/packages/seacas/libraries/suplib/wheneq.f +++ b/packages/seacas/libraries/suplib/wheneq.f @@ -1,18 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: wheneq.f,v 1.2 2009/03/25 12:46:02 gdsjaar Exp $ -C $Log: wheneq.f,v $ -C Revision 1.2 2009/03/25 12:46:02 gdsjaar -C Add copyright and license notice to all files. -C -C Revision 1.1 1993/07/06 22:01:27 gdsjaar -C Added wheneq function for non-cray systems. -C -c subroutine wheneq(n,array,inc,target,index,nval) C see WHENEQ (3SCI) Math and Scientific Library, Cray Research, Inc DIMENSION ARRAY(*), INDEX(*) diff --git a/packages/seacas/libraries/suplib/wrapup.f b/packages/seacas/libraries/suplib/wrapup.f index e5accc43ab77..2751c3136888 100644 --- a/packages/seacas/libraries/suplib/wrapup.f +++ b/packages/seacas/libraries/suplib/wrapup.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C======================================================================= diff --git a/packages/seacas/libraries/suplib_c/CMakeLists.txt b/packages/seacas/libraries/suplib_c/CMakeLists.txt index 82a3aaabf736..eab7ea187cf3 100644 --- a/packages/seacas/libraries/suplib_c/CMakeLists.txt +++ b/packages/seacas/libraries/suplib_c/CMakeLists.txt @@ -1,4 +1,3 @@ - TRIBITS_SUBPACKAGE(SuplibC) SET(SUPLIBC_VERSION_MAJOR "3") @@ -11,7 +10,6 @@ INCLUDE_DIRECTORIES( "${CMAKE_CURRENT_SOURCE_DIR}" ) - SET(SOURCES add_to_log.c getline.c @@ -21,7 +19,7 @@ SET(SOURCES ) IF (CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows") - APPEND_GLOB(SOURCES XGetopt.c) + APPEND_GLOB(SOURCES XGetopt.c) ENDIF() TRIBITS_ADD_LIBRARY( diff --git a/packages/seacas/libraries/suplib_c/add_to_log.c b/packages/seacas/libraries/suplib_c/add_to_log.c index 11b3fe485d9d..ac83c4e3d3ea 100644 --- a/packages/seacas/libraries/suplib_c/add_to_log.c +++ b/packages/seacas/libraries/suplib_c/add_to_log.c @@ -2,15 +2,15 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #include #include #ifndef _MSC_VER -#include #include +#include #endif #include #include @@ -98,5 +98,5 @@ void add_to_log(const char *my_name, double elapsed) } } } - #endif +#endif } diff --git a/packages/seacas/libraries/suplib_c/add_to_log.h b/packages/seacas/libraries/suplib_c/add_to_log.h index ebef737008bc..bfa6520b7d58 100644 --- a/packages/seacas/libraries/suplib_c/add_to_log.h +++ b/packages/seacas/libraries/suplib_c/add_to_log.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #ifdef __cplusplus diff --git a/packages/seacas/libraries/suplib_c/adler.h b/packages/seacas/libraries/suplib_c/adler.h index 0a6e08c358cf..b6352a85d840 100644 --- a/packages/seacas/libraries/suplib_c/adler.h +++ b/packages/seacas/libraries/suplib_c/adler.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #ifndef ADLER_H diff --git a/packages/seacas/libraries/suplib_c/copy_string.c b/packages/seacas/libraries/suplib_c/copy_string.c index 4994aef3149b..1536f20d86ae 100644 --- a/packages/seacas/libraries/suplib_c/copy_string.c +++ b/packages/seacas/libraries/suplib_c/copy_string.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #include diff --git a/packages/seacas/libraries/suplib_c/copy_string.h b/packages/seacas/libraries/suplib_c/copy_string.h index 96dcc3cb49a2..ac42b96cac6e 100644 --- a/packages/seacas/libraries/suplib_c/copy_string.h +++ b/packages/seacas/libraries/suplib_c/copy_string.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #ifndef SUPLIB_C_COPY_STRING diff --git a/packages/seacas/libraries/suplib_c/getline.h b/packages/seacas/libraries/suplib_c/getline.h index b011c33112e7..48b0aa0503d9 100644 --- a/packages/seacas/libraries/suplib_c/getline.h +++ b/packages/seacas/libraries/suplib_c/getline.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #ifndef GETLINE_H diff --git a/packages/seacas/libraries/suplib_c/term_width.c b/packages/seacas/libraries/suplib_c/term_width.c index 77d1c114c189..11b8f5ef8e27 100644 --- a/packages/seacas/libraries/suplib_c/term_width.c +++ b/packages/seacas/libraries/suplib_c/term_width.c @@ -2,15 +2,15 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #define _POSIX_SOURCE #include #ifdef _MSC_VER -#include #include +#include #define isatty _isatty #else #include diff --git a/packages/seacas/libraries/suplib_c/term_width.h b/packages/seacas/libraries/suplib_c/term_width.h index 6d9a8c98545c..e918fc62e289 100644 --- a/packages/seacas/libraries/suplib_c/term_width.h +++ b/packages/seacas/libraries/suplib_c/term_width.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #ifndef SUPLIB_C_TERM_WIDTH diff --git a/packages/seacas/libraries/suplib_cpp/SL_tokenize.C b/packages/seacas/libraries/suplib_cpp/SL_tokenize.C index 85cc137ba68c..9ba8bd8ef396 100644 --- a/packages/seacas/libraries/suplib_cpp/SL_tokenize.C +++ b/packages/seacas/libraries/suplib_cpp/SL_tokenize.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "SL_tokenize.h" diff --git a/packages/seacas/libraries/suplib_cpp/SL_tokenize.h b/packages/seacas/libraries/suplib_cpp/SL_tokenize.h index b880513cb29a..68d7518eec04 100644 --- a/packages/seacas/libraries/suplib_cpp/SL_tokenize.h +++ b/packages/seacas/libraries/suplib_cpp/SL_tokenize.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #ifndef TOKENIZE_H diff --git a/packages/seacas/libraries/suplib_cpp/copy_string_cpp.h b/packages/seacas/libraries/suplib_cpp/copy_string_cpp.h index 9b3e5efc2572..3be5edcae336 100644 --- a/packages/seacas/libraries/suplib_cpp/copy_string_cpp.h +++ b/packages/seacas/libraries/suplib_cpp/copy_string_cpp.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #ifndef copy_string_cpp_h diff --git a/packages/seacas/libraries/suplib_cpp/copyright.C b/packages/seacas/libraries/suplib_cpp/copyright.C index 93182874a0dc..a3bb1e5746ab 100644 --- a/packages/seacas/libraries/suplib_cpp/copyright.C +++ b/packages/seacas/libraries/suplib_cpp/copyright.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include diff --git a/packages/seacas/libraries/suplib_cpp/copyright.h b/packages/seacas/libraries/suplib_cpp/copyright.h index 960f7d671543..f2e615d53ef1 100644 --- a/packages/seacas/libraries/suplib_cpp/copyright.h +++ b/packages/seacas/libraries/suplib_cpp/copyright.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #ifndef SUPLIB_COPYRIGHT_H diff --git a/packages/seacas/libraries/suplib_cpp/fmt/chrono.h b/packages/seacas/libraries/suplib_cpp/fmt/chrono.h index df3661eed0b6..9d1012c42317 100644 --- a/packages/seacas/libraries/suplib_cpp/fmt/chrono.h +++ b/packages/seacas/libraries/suplib_cpp/fmt/chrono.h @@ -56,11 +56,13 @@ inline std::tm localtime(std::time_t time) bool handle(std::tm *tm) { return tm != nullptr; } +#if (!defined(__INTEL_COMPILER) || (defined(__INTEL_COMPILER) && __INTEL_COMPILER > 1800)) bool handle(internal::null<>) { using namespace fmt::internal; return fallback(localtime_s(&tm_, &time_)); } +#endif bool fallback(int res) { return res == 0; } @@ -100,11 +102,13 @@ inline std::tm gmtime(std::time_t time) bool handle(std::tm *tm) { return tm != nullptr; } +#if (!defined(__INTEL_COMPILER) || (defined(__INTEL_COMPILER) && __INTEL_COMPILER > 1800)) bool handle(internal::null<>) { using namespace fmt::internal; return fallback(gmtime_s(&tm_, &time_)); } +#endif bool fallback(int res) { return res == 0; } diff --git a/packages/seacas/libraries/suplib_cpp/scopeguard.h b/packages/seacas/libraries/suplib_cpp/scopeguard.h index 3893c99b2d79..fdf9ed0280fb 100644 --- a/packages/seacas/libraries/suplib_cpp/scopeguard.h +++ b/packages/seacas/libraries/suplib_cpp/scopeguard.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #ifndef SCOPEGUARD_H_ diff --git a/packages/seacas/libraries/suplib_cpp/smart_assert.C b/packages/seacas/libraries/suplib_cpp/smart_assert.C index 735de10e79e9..6dddcc63d71d 100644 --- a/packages/seacas/libraries/suplib_cpp/smart_assert.C +++ b/packages/seacas/libraries/suplib_cpp/smart_assert.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include "smart_assert.h" diff --git a/packages/seacas/libraries/suplib_cpp/smart_assert.h b/packages/seacas/libraries/suplib_cpp/smart_assert.h index 8eef31632363..9f482ea5514b 100644 --- a/packages/seacas/libraries/suplib_cpp/smart_assert.h +++ b/packages/seacas/libraries/suplib_cpp/smart_assert.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #if !defined(SMART_ASSERT_H) #define SMART_ASSERT_H diff --git a/packages/seacas/libraries/suplib_cpp/timer.C b/packages/seacas/libraries/suplib_cpp/timer.C index e389e570f01e..8629438e494b 100644 --- a/packages/seacas/libraries/suplib_cpp/timer.C +++ b/packages/seacas/libraries/suplib_cpp/timer.C @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include // for duration, etc #include // for ratio diff --git a/packages/seacas/libraries/suplib_cpp/to_string.h b/packages/seacas/libraries/suplib_cpp/to_string.h index f41cc2a5c9ca..1ac34d99b6f8 100644 --- a/packages/seacas/libraries/suplib_cpp/to_string.h +++ b/packages/seacas/libraries/suplib_cpp/to_string.h @@ -1,7 +1,7 @@ // Copyright(C) 1999-2020 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. -// +// // See packages/seacas/LICENSE for details #include std::string to_string(int t) { return std::to_string(t); } diff --git a/packages/seacas/libraries/svdi/cdr/cdrabc.F b/packages/seacas/libraries/svdi/cdr/cdrabc.F index 731926ded585..73b182423d96 100644 --- a/packages/seacas/libraries/svdi/cdr/cdrabc.F +++ b/packages/seacas/libraries/svdi/cdr/cdrabc.F @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details block data cdrabc @@ -25,7 +25,6 @@ block data cdrabc logical*4 onode common /vconod/ onode - #if defined(CRAY) data kwrdsz /64/ data kcpw /8/ @@ -67,4 +66,3 @@ block data cdrabc data kidsiz /0/ end -C $Id: cdrabc.F,v 1.3 2004/12/09 14:19:03 gdsjaar Exp $ diff --git a/packages/seacas/libraries/svdi/cdr/cdrsrc.c b/packages/seacas/libraries/svdi/cdr/cdrsrc.c index 3528a45643bc..09430ed7569b 100644 --- a/packages/seacas/libraries/svdi/cdr/cdrsrc.c +++ b/packages/seacas/libraries/svdi/cdr/cdrsrc.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /* ifdef.h - ifdef file for cdr routines @@ -854,7 +854,6 @@ This routine uses the array KUNTFD, in the FORTRAN common and the C external structure, cdrunx, to translate from FORTRAN unit number to UNIX/C file descriptors. - Parameters: ifilcd - IN - the FORTRAN unit number of the file to open diff --git a/packages/seacas/libraries/svdi/cgi/cdrcom.h b/packages/seacas/libraries/svdi/cgi/cdrcom.h index 67b9c6b7b070..3699665a7d6a 100644 --- a/packages/seacas/libraries/svdi/cgi/cdrcom.h +++ b/packages/seacas/libraries/svdi/cgi/cdrcom.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /* cdrcom.h - external structure is used to hook up with fortran diff --git a/packages/seacas/libraries/svdi/cgi/cgi.h b/packages/seacas/libraries/svdi/cgi/cgi.h index 98b2323aa3dd..f64696ba4ab7 100644 --- a/packages/seacas/libraries/svdi/cgi/cgi.h +++ b/packages/seacas/libraries/svdi/cgi/cgi.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /* cgi.h - header file to define useful stuff for cgi diff --git a/packages/seacas/libraries/svdi/cgi/cgi_dummy.c b/packages/seacas/libraries/svdi/cgi/cgi_dummy.c index f31a127fbbe7..29250eb574fc 100644 --- a/packages/seacas/libraries/svdi/cgi/cgi_dummy.c +++ b/packages/seacas/libraries/svdi/cgi/cgi_dummy.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/svdi/cgi/cgidef.h b/packages/seacas/libraries/svdi/cgi/cgidef.h index 271b283c22b1..6f94a77d3d44 100644 --- a/packages/seacas/libraries/svdi/cgi/cgidef.h +++ b/packages/seacas/libraries/svdi/cgi/cgidef.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /* cgidef.h CGI enumerated type definitions for C programs diff --git a/packages/seacas/libraries/svdi/cgi/cgisdum.c b/packages/seacas/libraries/svdi/cgi/cgisdum.c index c1a8eb0beba8..104932f96859 100644 --- a/packages/seacas/libraries/svdi/cgi/cgisdum.c +++ b/packages/seacas/libraries/svdi/cgi/cgisdum.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /* cgidmy - dummy routine loaded if no load line devices specified diff --git a/packages/seacas/libraries/svdi/cgi/data_def.h b/packages/seacas/libraries/svdi/cgi/data_def.h index d1d8ffee5de9..03ee959dab66 100644 --- a/packages/seacas/libraries/svdi/cgi/data_def.h +++ b/packages/seacas/libraries/svdi/cgi/data_def.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ #ifndef DATA_DEF_H diff --git a/packages/seacas/libraries/svdi/cgi/devid.h b/packages/seacas/libraries/svdi/cgi/devid.h index 34b6cc525d07..0dc18784f791 100644 --- a/packages/seacas/libraries/svdi/cgi/devid.h +++ b/packages/seacas/libraries/svdi/cgi/devid.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /* devid.h - these functions are used to map SVDI device code numbers diff --git a/packages/seacas/libraries/svdi/cgi/fortyp.h b/packages/seacas/libraries/svdi/cgi/fortyp.h index 5f9f78cb8ca4..eab3f3f9068f 100644 --- a/packages/seacas/libraries/svdi/cgi/fortyp.h +++ b/packages/seacas/libraries/svdi/cgi/fortyp.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/svdi/cgi/ifdefx.h b/packages/seacas/libraries/svdi/cgi/ifdefx.h index 7bcd3778991e..3be958c80ef5 100644 --- a/packages/seacas/libraries/svdi/cgi/ifdefx.h +++ b/packages/seacas/libraries/svdi/cgi/ifdefx.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /* ifdefx.h - ifdef file for cgi shell routines diff --git a/packages/seacas/libraries/svdi/cgi/mdcgi.c b/packages/seacas/libraries/svdi/cgi/mdcgi.c index ec93ca1271cf..854f1ebec56b 100644 --- a/packages/seacas/libraries/svdi/cgi/mdcgi.c +++ b/packages/seacas/libraries/svdi/cgi/mdcgi.c @@ -2,13 +2,13 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /* mdcgi - multiple simultaneous devices routines for cgi */ #include "mdcgi.h" #include "stdtyp.h" -#include // for fprintf, stderr, NULL +#include // for fprintf, stderr, NULL /******************************************************************************/ /* */ /* Global variables */ diff --git a/packages/seacas/libraries/svdi/cgi/mdcgi.h b/packages/seacas/libraries/svdi/cgi/mdcgi.h index c05559b0fc60..c7d1e5c370fc 100644 --- a/packages/seacas/libraries/svdi/cgi/mdcgi.h +++ b/packages/seacas/libraries/svdi/cgi/mdcgi.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/svdi/cgi/met_cgismet.c b/packages/seacas/libraries/svdi/cgi/met_cgismet.c index 1e0243681c6b..2a475fdc9f72 100644 --- a/packages/seacas/libraries/svdi/cgi/met_cgismet.c +++ b/packages/seacas/libraries/svdi/cgi/met_cgismet.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /* cgismet.c - linker specifiable driver routine for driver Metafile (met) */ diff --git a/packages/seacas/libraries/svdi/cgi/met_metxlate.c b/packages/seacas/libraries/svdi/cgi/met_metxlate.c index bc23ed3a8a48..db73ab8d46fd 100644 --- a/packages/seacas/libraries/svdi/cgi/met_metxlate.c +++ b/packages/seacas/libraries/svdi/cgi/met_metxlate.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /* @@ -1525,7 +1525,7 @@ static void xcpl(anything **params, int num_surfaces, anything **surf_list) /* This clipping algorithm is loosely based on the Cohen- * Sutherland algorithm. This algorithm takes into account - * the fact that points are consective, ie., it tries to + * the fact that points are consecutive, ie., it tries to * encode each point only once. Everything is done * inline for efficiency */ @@ -3991,7 +3991,7 @@ static void xcqfl(anything **params, anything **surf_list) *(int *)params[12] = 0; *(int *)params[13] = 0; - /* pattern transfomation support - patterns not supported */ + /* pattern transformation support - patterns not supported */ *(int *)params[14] = CPTNO; } /* end xcqfl */ diff --git a/packages/seacas/libraries/svdi/cgi/met_vdimet.f b/packages/seacas/libraries/svdi/cgi/met_vdimet.f index bffbe77cf3ba..fff72cf9a81a 100644 --- a/packages/seacas/libraries/svdi/cgi/met_vdimet.f +++ b/packages/seacas/libraries/svdi/cgi/met_vdimet.f @@ -1,68 +1,59 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C C VDMOVA VDMONI VDGNAM VBIQDV VBIQPK VDLINA VDTEXT VDPNTA VDPOLY VDIQCP VDSTOS C WMETMV WMETMO WMETGN WMETIV WMETQP WMETLN WMETTX WMETPT WMETPY WMETCP WMETOS -C -C + C VDIQOS VDSTFC VDSTBC VDSTIN VDSTLS VDSTLW VDSTCS VDAABU VDALOC VDABGL VDAKGL C WMETIO WMETFC WMETBC WMETIN WMETLS WMETLW WMETCS WMETBU WMETLO WMETBL WMETKL -C -C + C VDSTLA VDINIT VDFRAM VDTERM VDIQDC VDNWPG VDBELL VDWAIT VDBUFL VDSTCO VDIQCO C WMETLA WMETNT WMETFR WMETTR WMETDC WMETPG WMETBE WMETWT WMETFL WMETCO WMETIC -C -C + C VDESCP VDIQES VDIQND VIMOVA VILINA VIPNTA VITEXT VIINIT VITERM VINWPG CDRCOM C WMETES WMETIE WMETID WMETIM WMETIL WMETIP WMETIX WMETII WMETIT WMETIG CDRCOM -C -C + C VCJOB VCONOD VBERRH VDLOGE CDRWFS CDRRFS CDROFS CDROF3 CDRCFS CDROFF CDROAB C VCJOB VCONOD WMETER WMETLE WMETWF WMETRF WMETOF WMETO3 WMETCF WMETFF WMETAB -C -C + C BGPBUF QMSBUF QMSBU1 DDCBUF H75BUF BTKBUF NMTBUF VBIMBF VBPKG VBDEV VDIQRS C WMETBF WMETQM WMETBF WMETBF WMETBF WMETBF WMETBF WMETIB WMETPK WMETDV WMETQR -C -C + C VDSTMP VDSTRS VDSTRV VDBRGB VDFRGB VDPIXL VDPIXI VDRPIX VDRPXI VDRSCL VDIQCI C WMETMP WMETRS WMETRV WMETBG WMETFG WMETPX WMETPI WMETRP WMETRI WMETRL WMETCI -C -C + C VBSTMP VIFRAM VCNDCM VCATTR VBINI1 VB2HLS VB2RGB VCCOLT VCCRPS VCSCAL VCDDIM C WMET01 WMET02 WMET03 WMET04 WMET05 WMET06 WMET07 WMET08 WMET09 WMET10 WMET11 -C -C + C VIPOLY VBOUT C WMET12 WMET13 -C + SUBROUTINE WMET01( IMAP ) integer*4 imap GOTO (1,2,3,4,5),IMAP -C + CALL WMETMP('UNKNOWN') RETURN -C + 1 CALL WMETMP('1-TO-1') RETURN -C + 2 CALL WMETMP('REPLICATE') RETURN -C + 3 CALL WMETMP('VIRTUAL') RETURN -C + 4 CALL WMETMP('NODISTORT') RETURN -C + 5 CALL WMETMP('FREEFORM') RETURN -C + END SUBROUTINE WMETRS(I1,I2) c************************************************************************* @@ -91,78 +82,77 @@ SUBROUTINE WMETRS(I1,I2) END SUBROUTINE WMETFR(ITYPE) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDFRAM - Draw header or trailer frame -C + C P. Watterberg - 27 Aug 81 -C + C ENVIRONMENT -Computer-independent, system-independent, FORTRAN 77 -C + C ENTRY CONDITIONS - ITYPE = 0 for header frame C = 1 for trailer frame -C + C CALLS - VIFRAM -C + C EXIT CONDITIONS - -C + C NARRATIVE - Calls vifram to get time and date from the c system via the computer-dependent routine CDRTOD(entry c point in CDRJOB) and writes it on an identification frame. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER*4 ITYPE -C + CALL WMET02(ITYPE) RETURN END SUBROUTINE WMET02(ITYPE) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VIFRAM - Draw header or trailer frame -C + C P. Watterberg - 27 Aug 81 -C + C ENVIRONMENT -Computer-independent, system-independent, FORTRAN 77 -C + C ENTRY CONDITIONS - ITYPE = 0 for header frame C = 1 for trailer frame -C + C CALLS - -C + C EXIT CONDITIONS - -C + C NARRATIVE -NULL ROUTINE -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER*4 ITYPE -C + RETURN END SUBROUTINE WMETGN(NAME) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDGNAM -Name the graphics output file -C -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -NAME = character string; < 80 characters -C + C CALLS -C + C EXIT CONDITIONS -output graphics file is assigned the name NAME -C + C NARRATIVE -This subroutine associates a file name with C the graphics output file (KOUTFL). If this C routine is not called, a system dependent C default name is used. VDGNAM must be called C before VDINIT. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + CHARACTER*(*) NAME INTEGER*4 LENGTH,ISTART,IEND,I LENGTH = MIN(LEN(NAME),132) @@ -194,26 +184,26 @@ SUBROUTINE WMETGN(NAME) END SUBROUTINE WMETNT(ASPECT,JUSTIF) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDINIT -Initialize SVDI. -C + C R.W.Simons -08APR81 C 30SEP81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -ASPECT = real ratio of X dimension to Y dimension. C Range >0.0. Default: 0.0 (device dependent). C JUSTIF = integer justification of NDC space on the C device. Range 0-9. Default: 0 (device dependent). -C + C CALLS -CDRJOB, VBERRH, VIINIT. -C + C EXIT CONDITIONS -XNDCMX,YNDCMX = real NDC maximum valid values. C VECTOR = real array of default attribute values (all C device-dependent except VECTOR(4)=0.0). -C + C NARRATIVE -This must be the first SVDI call made. All C attribute values, the color table, and current C position are set to appropriate defaults for the @@ -221,7 +211,7 @@ SUBROUTINE WMETNT(ASPECT,JUSTIF) C is done. The screen is cleared or paper advanced C if necessary to guarantee a blank view surface for C drawing. -C + C ASPECT specifies the ratio of the X dimension to the C Y dimension. Maximum NDC values (at least one of C which will be 1.0) are computed to give the ASPECT @@ -232,7 +222,7 @@ SUBROUTINE WMETNT(ASPECT,JUSTIF) C aspect of 1.0. The NDC rectangle is scaled until C one dimension fills the corresponding dimension of C the device. -C + C JUSTIF determines where the rectangle is located on C the device as diagrammed below: C --------- @@ -242,34 +232,34 @@ SUBROUTINE WMETNT(ASPECT,JUSTIF) C --------- C For example, JUSTIF = 7 indicates NDC space will be C upper left justified on the device. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL*4 ASPECT INTEGER*4 JUSTIF CALL WMETII(ASPECT,JUSTIF) -C + RETURN END SUBROUTINE WMETLE(ERRNUM,ERRSEV) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDLOGE -Log Error. -C + C R.W.Simons -08APR81 C K.M.Erickson -8OCT84 - add buffer flush -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -ERRNUM = integer error number. C ERRSEV = integer error severity. -C + C CALLS -CDRTBK, VDBUFL -C + C EXIT CONDITIONS - -C + C NARRATIVE -Report error with message to user and possibly C terminate job depending on severity. Notice that C by judicious use of the error routines (see VBERRH) @@ -278,79 +268,79 @@ SUBROUTINE WMETLE(ERRNUM,ERRSEV) C occurrences of a particular error, or terminate C if more than 10 errors of a particular severity C occur. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER ERRNUM INTEGER ERRSEV -C + INTEGER*4 KWRTFL,KRDFL,KOUTFL,KINFL,KWRDSZ,KBYTEL,KCPW,KBAUD, 1KCOMTP COMMON /CDRCOM/ KWRTFL,KRDFL,KOUTFL,KINFL,KWRDSZ,KBYTEL,KCPW, 1 KBAUD,KCOMTP -C + C flush buffer before we do a write CALL WMETFL -C + C WRITE THE ERROR TO THE LISTING. WRITE(KWRTFL,10)ERRNUM,ERRSEV 10 FORMAT(' SVDI ERROR NUMBER ',I5,' SEVERITY CODE ',I5) -C + C TRACEBACK. CALL CDRTBK -C + RETURN END SUBROUTINE WMETID(XNDC,YNDC) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDIQND -Inquire NDC Space. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -XNDCMX,YNDCMX = real maximum valid NDC values. -C + C CALLS - -C + C EXIT CONDITIONS -XNDC,YNDC = real maximum valid NDC values (XNDCMX, C YNDCMX). -C + C NARRATIVE -Return the maximum NDC values as set to realize the C aspect defined by VDINIT. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL*4 XNDC,YNDC -C + REAL*4 XNDCMX,YNDCMX COMMON /WMET03/ XNDCMX,YNDCMX -C + C RETURN THE MAXIMUM VALID NDC VALUES. XNDC=XNDCMX YNDC=YNDCMX -C + RETURN END SUBROUTINE WMETIO(ATTARR) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDIQOS -Inquire Output Status (of Attributes). -C + C K.M. ERICKSON -14 NOV 80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -VECTOR = real array of current attribute values. -C + C CALLS - -C + C EXIT CONDITIONS -ATTARR = real array of current attribute value C (VECTOR). -C + C NARRATIVE -Return the current attribute values in ATTARR as C given below. C ATTARR(1)=Foreground Color @@ -360,70 +350,69 @@ SUBROUTINE WMETIO(ATTARR) C (5)=Line Width C (6)=Character Box Y C (7)=Character Box X -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL*4 ATTARR(7) -C + REAL*4 VECTOR(7) COMMON /WMET04/ VECTOR -C + INTEGER*4 I -C + DO 100 I=1,7 ATTARR(I)=VECTOR(I) 100 CONTINUE -C + RETURN END SUBROUTINE WMETLN(X,Y) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDLINA -Line Absolute. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -X,Y = real NDC position. -C + C CALLS -VILINA. -C + C EXIT CONDITIONS - -C + C NARRATIVE -Draw a line from current position to absolute NDC C position X,Y and update current position. C Attributes foreground color, intensity, line style, C and line width apply. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL*4 X,Y -C + C THIS IS JUST A DUMMY ROUTINE WHICH DOES NOTHING BUT CALL VILINA. C THIS ORGANIZATION FACILITATES ADDING SECURITY MARKINGS TO SVDI. CALL WMETIL(X,Y) -C + RETURN END SUBROUTINE WMETMO(ISTATE) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDMONI -Logs Usage Information.. -C -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -ISTATE = 0 - initialization C 1 - new page C 2 - terminate -C + C CALLS -CDRMON -C + C EXIT CONDITIONS - -C + c NARRATIVE -For ISTATE=0, job information is initialized, and C timers are initialized called by VIINIT. C ISTATE=1 will increment a common block page @@ -437,10 +426,9 @@ SUBROUTINE WMETMO(ISTATE) C Entry point VBDEV has an 8 character parameter C which will set a common block variable specifying C the device being used. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C -C + CHARACTER *8 C1,C2,MDEV,MPKG INTEGER ISTATE INTEGER*4 MPAGES @@ -449,7 +437,7 @@ SUBROUTINE WMETMO(ISTATE) DATA MPKG /' '/ DATA MDEV /' '/ DATA MPAGES /0/ -c + IF(ISTATE.EQ.0) THEN CALL CDRELA(0) ELSEIF (ISTATE.EQ.1) THEN @@ -460,7 +448,7 @@ SUBROUTINE WMETMO(ISTATE) ENDIF RETURN C Usage Monitoring Information -c + ENTRY WMETPK (C1) MPKG = C1 RETURN @@ -476,106 +464,106 @@ SUBROUTINE WMETMO(ISTATE) END SUBROUTINE WMETMV(X,Y) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDMOVA -Move Absolute. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -X,Y = real NDC position. -C + C CALLS -VIMOVA -C + C EXIT CONDITIONS - -C + C NARRATIVE -Set current position to absolute NDC position X,Y. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL*4 X,Y -C + C THIS IS JUST A DUMMY ROUTINE WHICH DOES NOTHING BUT CALL VIMOVA. C THIS ORGANIZATION FACILITATES ADDING SECURITY MARKINGS TO SVDI. CALL WMETIM(X,Y) -C + RETURN END SUBROUTINE WMETPG C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDNWPG -New Page. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS - -C + C CALLS -VINWPG. -C + C EXIT CONDITIONS - -C + C NARRATIVE -Physically advance the medium or clear the screen, C whichever is appropriate. Also flood the screen C with the background color on devices that support C this function. The current position is not changed. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C THIS IS JUST A DUMMY ROUTINE WHICH DOES NOTHING BUT CALL VINWPG. C THIS ORGANIZATION FACILITATES ADDING SECURITY MARKINGS TO SVDI. CALL WMETIG -C + RETURN END SUBROUTINE WMETPT(X,Y) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDPNTA -Point Absolute. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -X,Y = real NDC position. -C + C CALLS -VIPNTA. -C + C EXIT CONDITIONS - -C + C NARRATIVE -Set current position to absolute NDC position X,Y C and put a visible point there. Attributes C foreground color and intensity apply. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL*4 X,Y -C + C THIS IS JUST A DUMMY ROUTINE WHICH DOES NOTHING BUT CALL VIPNTA. C THIS ORGANIZATION FACILITATES ADDING SECURITY MARKINGS TO SVDI. CALL WMETIP(X,Y) -C + RETURN END SUBROUTINE WMETPY(XARRAY,YARRAY,NPTS) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDPOLY -POLYGON FILL ROUTINE -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS -XARRAY-ARRAY OF X VALUES OF THE POLYGON C YARRAY-CORRESPONDING ARRAY OF Y VALUES C NPTS- NUMBER OF POINTS IN (XARRAY,YARRAY) -C + C CALLS -VIPOLY -C + C EXIT CONDITIONS - -C + C NARRATIVE -The polygon defined by XARRAY,YARRAY will be drawn C and filled (constrained by any limitations of the C physical device -- see below). No checking will be @@ -584,11 +572,11 @@ SUBROUTINE WMETPY(XARRAY,YARRAY,NPTS) C boundary is drawn using the solid line style. C VDI will close the polygon (i.e. the last point C will be connected to the first). -C + C The level of support for this primitive is device- C dependent. The level of support is categorized C as follows: -C + C Level 0 -- no polygon fill. Only the polygon C boundary is drawn. C Level 1 -- the device fills convex polygons. @@ -601,37 +589,37 @@ SUBROUTINE WMETPY(XARRAY,YARRAY,NPTS) C is drawn to that point from a point far outside C the polygon, that line intersects the polygon C boundary an odd number of times. -C + C Note that the level of support for a particular device C can be inquired using the function VDIQDC. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER*4 NPTS REAL*4 XARRAY(NPTS),YARRAY(NPTS) -C + C THIS IS JUST A DUMMY ROUTINE WHICH DOES NOTHING BUT CALL VIPOLY. C THIS ORGANIZATION FACILITATES ADDING SECURITY MARKINGS TO SVDI. CALL WMET12(XARRAY,YARRAY,NPTS) -C + RETURN END SUBROUTINE WMETOS(ATTARR) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDSTOS -Set Output Status (of Attributes). -C + C K.M. ERICKSON -14 NOV 80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -ATTARR = real array of attribute values. -C + C CALLS -VDSTBC,VDSTCS,VDSTFC,VDSTIN,VDSTLS,VDSTLW -C + C EXIT CONDITIONS -VECTOR = real updated attribute values (ATTARR). -C + C NARRATIVE -Set the attribute values from ATTARR as given below. C ATTARR(1)=Foreground Color C (2)=Background Color @@ -639,15 +627,15 @@ SUBROUTINE WMETOS(ATTARR) C (4)=Line Style C (5)=Line Width C (6)=Character Box Y -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL*4 ATTARR(6) -C + REAL*4 VECTOR(7) COMMON /WMET04/ VECTOR integer*4 i4 -C + C CALL EACH OF THE INDIVIDUAL ATTRIBUTE SETTING ROUTINES. C CHECK FOR VALIDITY OF INPUT VALUES WILL BE DONE IN EACH INDIVIDUAL C ROUTINE. @@ -660,56 +648,56 @@ SUBROUTINE WMETOS(ATTARR) CALL WMETLS(i4) CALL WMETLW(ATTARR(5)) CALL WMETCS(ATTARR(6)) -C + RETURN END SUBROUTINE WMETTR C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDTERM -Terminate SVDI. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS - -C + C CALLS -VITERM. -C + C EXIT CONDITIONS - -C + C NARRATIVE -Terminate the SVDI by flushing buffers, etc. This C should be the last SVDI call made. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C THIS IS JUST A DUMMY ROUTINE WHICH DOES NOTHING BUT CALL VITERM. C THIS ORGANIZATION FACILITATES ADDING SECURITY MARKINGS TO SVDI. CALL WMETIT -C + RETURN END SUBROUTINE WMETTX(LENGTH,CHARS) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDTEXT -Text from Array. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -LENGTH = integer number of characters in CHARS. C Range 1-136. C CHARS = integer array of ASCII characters, one C character per array element, right justified. C Range 8,10,32-126. -C + C CALLS -VITEXT. -C + C EXIT CONDITIONS - -C + C NARRATIVE -Draw LENGTH characters in CHARS, starting at C current position and update current position to C the point after the last character box where the @@ -722,36 +710,36 @@ SUBROUTINE WMETTX(LENGTH,CHARS) C considered reasonable. Attributes foreground color, C background color, intensity, and character size C apply. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER*4 LENGTH,CHARS(136) -C + C THIS IS JUST A DUMMY ROUTINE WHICH DOES NOTHING BUT CALL VITEXT. C THIS ORGANIZATION FACILITATES ADDING SECURITY NARKINGS TO SVDI. CALL WMETIX(LENGTH,CHARS) -C + RETURN END SUBROUTINE WMETER(ERRNUM,ERRSEV) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VBERRH -Error Handler. -C + C R.W.Simons -08APR81 C 30SEP81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -ERRNUM = integer error number. C ERRSEV = integer severity code. If > 12, error is C fatal. -C + C CALLS -VDLOGE. -C + C EXIT CONDITIONS - -C + C NARRATIVE -An error will normally cause an error message to C be printed on the error output device and possible C termination of the program, unless a routine VBERRH @@ -761,181 +749,181 @@ SUBROUTINE WMETER(ERRNUM,ERRSEV) C returning. All versions of VBERRH, whether user- C supplied or default, must STOP on any error severity C greater than 12. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER ERRNUM INTEGER ERRSEV -C + C REPORT THE ERROR USING VDLOGE. CALL WMETLE(ERRNUM,ERRSEV) -C + C CHECK FOR FATAL ERROR. IF(ERRSEV.GT.12) STOP -C + RETURN END SUBROUTINE WMETBU(BTNNUM) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDAABU -Await Any Button. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Batch Devices. -C + C ENTRY CONDITIONS - -C + C CALLS - -C + C EXIT CONDITIONS -BTNNUM = integer number of the button pressed. C Range 1 to a device dependent maximum which must be C at least 8. -C + C NARRATIVE -When a button has been pressed, its integer button C number is returned in BTNNUM. This function flushes C the button buffer, if any. This function flushes C the output buffers before doing input. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER*4 BTNNUM -C + INTEGER*4 KWRTFL,KRDFL,KOUTFL,KINFL,KWRDSZ,KBYTEL,KCPW,KBAUD, 1KCOMTP COMMON /CDRCOM/ KWRTFL,KRDFL,KOUTFL,KINFL,KWRDSZ,KBYTEL,KCPW, 1 KBAUD,KCOMTP -C + C BATCH DEVICES DON'T NEED TO FLUSH BUFFERS. -C + C READ A RECORD FROM COMPUTER DEPENDENT FILE KINFL IN I5 FORMAT. READ(KINFL,10) BTNNUM 10 FORMAT(I5) -C + C CHECK FOR VALID BTNNUM. C RANGE FOR BATCH DEVICES IS 1-99999. IF OUT OF RANGE, MAP IT BACK IN: C MAPPING (-1)-(-9999) TO 1-9999 AND MAPPING 0 TO 10000. IF(BTNNUM.LT.0) BTNNUM=-BTNNUM IF(BTNNUM.EQ.0) BTNNUM=10000 -C + RETURN END SUBROUTINE WMETBL(BTNNUM,X,Y) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDABGL -Await Button, Get Locator. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Batch Devices. -C + C ENTRY CONDITIONS - -C + C CALLS - -C + C EXIT CONDITIONS -BTNNUM = integer number of the button pressed. C Range 1 to a device dependent maximum that must be C at least 8. C X,Y = real NDC position of the locator. -C + C NARRATIVE -Wait until a button is hit, then return the number C of the button in BTNNUM and the NDC value of the C locator in X,Y. This function flushes the output C buffers before doing input. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL*4 X,Y INTEGER*4 BTNNUM -C + INTEGER*4 KWRTFL,KRDFL,KOUTFL,KINFL,KWRDSZ,KBYTEL,KCPW,KBAUD, 1KCOMTP COMMON /CDRCOM/ KWRTFL,KRDFL,KOUTFL,KINFL,KWRDSZ,KBYTEL,KCPW, 1 KBAUD,KCOMTP -C + C BATCH DEVICES DON'T NEED TO FLUSH BUFFERS. -C + C READ A RECORD FROM COMPUTER DEPENDENT FILE KINFL IN I5,2F10.7 FORMAT. READ(KINFL,10) BTNNUM,X,Y 10 FORMAT(I5,2F10.7) -C + C CHECK FOR VALID BTNNUM. C RANGE FOR BATCH DEVICES IS 1-99999. IF OUT OF RANGE, MAP IT BACK IN: C MAPPING (-1)-(-9999) TO 1-9999 AND MAPPING 0 TO 10000. IF(BTNNUM.LT.0) BTNNUM=-BTNNUM IF(BTNNUM.EQ.0) BTNNUM=10000 -C + RETURN END SUBROUTINE WMETKL(CHAR,X,Y) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDAKGL -Await Keyboard, Get Locator. -C + C R.W.SIMONS -02DEC80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Batch Devices. -C + C ENTRY CONDITIONS - -C + C CALLS - -C + C EXIT CONDITIONS -CHAR = integer ASCII character input from the C keyboard, right-justified, zero fill. Range 32-126. C X,Y = real NDC position of the locator. -C + C NARRATIVE -Wait until a key is hit, then return the character C entered in CHAR and the NDC value of the locator C in X,Y. If the character entered does not fall in C the range 32-126, a blank(32) is returned in CHAR. C This function flushes the output buffers before C doing input. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL*4 X,Y INTEGER*4 CHAR -C + INTEGER*4 IN,CHR -C + INTEGER*4 KWRTFL,KRDFL,KOUTFL,KINFL,KWRDSZ,KBYTEL,KCPW,KBAUD, 1KCOMTP COMMON /CDRCOM/ KWRTFL,KRDFL,KOUTFL,KINFL,KWRDSZ,KBYTEL,KCPW, 1 KBAUD,KCOMTP -C + C BATCH DEVICES DON'T NEED TO FLUSH BUFFERS. -C + C READ A CHARACTER AND AN X,Y POSITION FROM COMPUTER DEPENDENT FILE C KINFL WITH FORMAT A1,2F10.7. READ(KINFL,10) CHR,X,Y 10 FORMAT(A1,2F10.7) -C + C CONVERT CHARACTER TO INTEGER ASCII AND CHECK FOR VALID RANGE. CALL CDR1CH(1,CHR,IN) CALL CDRCVT(IN,CHAR) IF(CHAR.LT.32.OR.CHAR.GT.126) CHAR=32 -C + RETURN END SUBROUTINE WMETLO(X,Y) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDALOC -Await Locator. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Batch Devices. -C + C ENTRY CONDITIONS - -C + C CALLS - -C + C EXIT CONDITIONS -X,Y = real NDC position of the locator. -C + C NARRATIVE -Wait until the locator is positioned, then return C the NDC value of the locator in X,Y. The fact that C the locator is positioned can be signaled in a @@ -946,158 +934,157 @@ SUBROUTINE WMETLO(X,Y) C function, as only the locator position is returned. C This function flushes the output buffers before C doing input. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL*4 X,Y -C + INTEGER*4 KWRTFL,KRDFL,KOUTFL,KINFL,KWRDSZ,KBYTEL,KCPW,KBAUD, 1KCOMTP COMMON /CDRCOM/ KWRTFL,KRDFL,KOUTFL,KINFL,KWRDSZ,KBYTEL,KCPW, 1 KBAUD,KCOMTP -C + C BATCH DEVICES DON'T NEED TO FLUSH BUFFERS. -C + C READ AN X,Y POSITION FROM COMPUTER DEPENDENT FILE C KINFL WITH FORMAT 2F10.7. READ(KINFL,10) X,Y 10 FORMAT(2F10.7) -C + RETURN END SUBROUTINE WMETBE C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDBELL -Ring Bell -C + C R.W.SIMONS -02DEC80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Batch Devices. -C + C ENTRY CONDITIONS - -C + C CALLS - -C + C EXIT CONDITIONS - -C + C NARRATIVE -Ring user's bell to get his attention. This C function is ignored by batch devices. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C THIS FUNCTION IS IGNORED BY BATCH DEVICES. -C + RETURN END SUBROUTINE WMETLA(LOCX,LOCY) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDSTLA -Set Initial Locator Position. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Batch Devices. -C + C ENTRY CONDITIONS -LOCX,LOCY = real NDC position that the locator is C initilaized to. -C + C CALLS - -C + C EXIT CONDITIONS - -C + C NARRATIVE -Set the initial locator position (light pen tracking C cross, for example) each time this function is C called. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL*4 LOCX,LOCY -C + C BATCH DEVICES IGNORE THIS FUNCTION. -C + RETURN END SUBROUTINE WMETWT C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDWAIT -Wait for User. -C + C R.W.SIMONS -02DEC80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Batch Devices. -C + C ENTRY CONDITIONS - -C + C CALLS - -C + C EXIT CONDITIONS - -C + C NARRATIVE -Wait for the user to view the screen and signal he C is done, normally by hitting any key. This function C flushes the output buffers before doing input. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C BATCH DEVICES IGNORE THIS COMMAND. -C + RETURN END SUBROUTINE WMET05(N,NSTR) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VBINI1 -Virtual Device Initialization String Output. -C + C R.W.Simons -18MAY81 -C + C ENVIRONMENT -Computer-independent, System-independent, FORTRAN 77 C Hard Copy Format 1. -C + C ENTRY CONDITIONS -N = integer number of words in NSTR. (max=4) C NSTR = integer array containing the string to be C converted and output. The last character must C be the string terminator. -C + C CALLS -CDRCVT,CDR1CH,VBOUT. -C + C EXIT CONDITIONS - -C + C NARRATIVE -This routine converts a string from C internal computer-dependent format to C ASCII and sends it to the device. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER N INTEGER*4 NSTR(4) integer i, j integer*4 itemp integer*4 itemp1, itemp2 integer itemp8 -C + INTEGER*4 KWRTFL,KRDFL,KOUTFL,KINFL,KWRDSZ,KBYTEL,KCPW,KBAUD, 1KCOMTP COMMON /CDRCOM/ KWRTFL,KRDFL,KOUTFL,KINFL,KWRDSZ,KBYTEL,KCPW, 1 KBAUD,KCOMTP -C + C KTERM = STRING TERMINATOR CHARACTER (\). INTEGER*4 KTERM DATA KTERM /92/ -C C LOOP THROUGH EACH CHARACTER IN EACH WORD OF NSTR. DO I=1,N DO J=1,KCPW CALL CDR1CH(J,NSTR(I),ITEMP) -C + C CONVERT CHARACTER. CALL CDRCVT(ITEMP,ITEMP1) -C +C C CHECK FOR END-OF-STRING CHARACTER. IF (ITEMP1.EQ.KTERM) GO TO 20 -C +C C SEND PAIRS OF CHARACTERS TO THE OUTPUT FILE. IF(MOD(J,2).EQ.1) THEN ITEMP2=ITEMP1 @@ -1107,71 +1094,71 @@ SUBROUTINE WMET05(N,NSTR) ENDIF END DO END DO -C +C C PAD WITH A BLANK IF NECESSARY TO MAKE NUMBER OF CHARS EVEN. 20 CONTINUE IF(MOD(J,2).EQ.0) THEN ITEMP8=256*ITEMP2+32 CALL WMET13S(ITEMP8) ENDIF -C + RETURN END SUBROUTINE WMET06(RGB,MAXVAL,HLS) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VB2HLS - Transform RGB to HLS -C + C P. Watterberg - 2 APR 81 -C + C ENVIRONMENT - COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS - RGB = integer array with 3 elements specifying C Red, RGB(1), range 0 - MAXVAL C Green, RGB(2), range 0 - MAXVAL C Blue, RGB(3), range 0 - MAXVAL -C + C MAXVAL = integer, largest value that each of R, G or B C can assume -C + C CALLS - none -C + C EXIT CONDITIONS - HLS = Real array with 3 elements specifying C Hue, HLS(1), range 0. - 360. C Lightness, HLS(2), range 0. - 1. C Saturation, HLS(3), range 0. - 1. -C + C NARRATIVE - This routine converts RGB to HLS. The interpretation C of HLS is the one adopted by GSPC 79. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + integer maxval REAL*4 HLS(3), temp INTEGER*4 RGB(3) integer*4 ired, igre, iblu, maxc, minc, isum, idif integer*4 maxlit -C + C copy the inputs to locals -C + IRED = RGB(1) IGRE = RGB(2) IBLU = RGB(3) -c + c compute some useful quantities -c + MAXC = MAX(IRED,IGRE,IBLU) MINC = MIN(IRED,IGRE,IBLU) ISUM = MAXC + MINC IDIF = MAXC - MINC MAXLIT = 2*MAXVAL -c + c getting lightness is easy -c + HLS(2) = DBLE(ISUM)/DBLE(MAXLIT) -c + c getting saturation is a little more difficult -c + IF(IDIF.EQ.0) THEN HLS(3) = 0. ELSE @@ -1181,27 +1168,27 @@ SUBROUTINE WMET06(RGB,MAXVAL,HLS) HLS(3) = DBLE(IDIF)/(MAXLIT-ISUM) ENDIF ENDIF -c + c getting hue is a little harder yet -c + IF(IDIF.EQ.0) THEN TEMP = 0. ELSE TEMP = 60./IDIF ENDIF -c + c is the maximum color red? -c + IF(MAXC.EQ.IRED) THEN HLS(1) = 120. + ((IGRE-MINC) - (IBLU-MINC))*TEMP -c + c is it green? -c + ELSE IF(MAXC.EQ.IGRE) THEN HLS(1) = 240. + ((IBLU-MINC) - (IRED-MINC))*TEMP -c + c well then, it must be blue -c + ELSE IF(IRED.GE.IGRE) THEN HLS(1) = (IRED-MINC)*TEMP @@ -1209,38 +1196,38 @@ SUBROUTINE WMET06(RGB,MAXVAL,HLS) HLS(1) = 360. - (IGRE-MINC)*TEMP ENDIF ENDIF -c + RETURN END SUBROUTINE WMET07(HLS,RGB,MAXVAL) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VB2RGB - Transform HLS to RGB -C + C P. Watterberg - 30 MAR 81 -C + C ENVIRONMENT - COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS - HLS = Real array with 3 elements specifying C Hue, HLS(1), range 0. - 360. C Lightness, HLS(2), range 0. - 1. C Saturation, HLS(3), range 0. - 1. -C + C MAXVAL = integer, largest value that any of R, G or B C can assume -C + C CALLS - none -C + C EXIT CONDITIONS - RGB = integer array with 3 elements specifying C Red, RGB(1), range 0 - MAXVAL C Green, RGB(2), range 0 - MAXVAL C Blue , RGB(3), range 0 - MAXVAL -C + C NARRATIVE - This routine converts HLS to RGB. The interpretation C of HLS is the one adopted by GSPC 79. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER MAXVAL REAL*4 HLS(3), LIT, HUE, SAT, f INTEGER*4 RGB(3), inten, irange, irang2, isplus @@ -1250,108 +1237,108 @@ SUBROUTINE WMET07(HLS,RGB,MAXVAL) zero = 0 imaxval = maxval -C + C copy the inputs to locals -C + HUE = HLS(1) LIT = HLS(2) SAT = HLS(3) -C + C find out which major hue (0 - 5) we are interested in -C + HUE = HUE/60. -C + C avoid the maximum boundary conditions -C + IF(HUE.GE.6.) HUE = 5.99 IF(SAT.GE.1.) SAT = .99 IF(LIT.GE.1.) LIT = .99 -C + C the conversions and convolutions that happen here are not C very easy to understand. It's best to talk to Peter but C if you need to try to decipher it yourself, you might try C by first assuming a saturation of 1. That way, irang2=irange, C isplus goes away and you are left with the outer shell of C rgb color cube to deal with. -C + C ijump represents one of the six edges of the color cube C connecting the six major hues. -c + IJUMP = HUE -c + c f is the distance (0.-.999) along an edge between two major hues -c + F = HUE - IJUMP INTEN = LIT*DBLE(2*IMAXVAL+1) -c + c irange is the range a color may take on (i.e. maxval adjusted for c intensity c irang2 is irange adjusted for saturation -c + IRANGE = IMAXVAL - ABS(INTEN-IMAXVAL) C ... This is done for the 8-byte systems so we can pass native int to mod intrinsic IRANGT = IRANGE IRANG2 = 2*(INT((IRANGT/2+1)*SAT)) + MOD(IRANGT,2) -c + c isplus is an additive to account for saturation -c + ISPLUS = (IRANGE-IRANG2)/2 IV1 = MIN(INTEN,IMAXVAL) - ISPLUS IV2 = MAX(zero,INTEN-IMAXVAL) + ISPLUS IV3 = F*IRANG2 + .5 + IV2 IV4 = (1.-F)*IRANG2 + .5 + IV2 GOTO (610,620,630,640,650,660),IJUMP+1 -c + 610 IB = IV1 IG = IV2 IR = IV3 GOTO 670 -c + 620 IR = IV1 IG = IV2 IB = IV4 GOTO 670 -c + 630 IR = IV1 IB = IV2 IG = IV3 GOTO 670 -c + 640 IG = IV1 IB = IV2 IR = IV4 GOTO 670 -c + 650 IG = IV1 IR = IV2 IB = IV3 GOTO 670 -c + 660 IB = IV1 IR = IV2 IG = IV4 -c + 670 RGB(1) = IR RGB(2) = IG RGB(3) = IB -c + RETURN END SUBROUTINE WMETFL C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDBUFL -Buffer Flush. -C + C K.M.ERICKSON -04 MAY 81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS - -C + C CALLS -VBOUT -C + C EXIT CONDITIONS - -C + C NARRATIVE -Assure that the picture is up-to-date by flushing C buffers if necessary. This is necessary to C guarantee that the picture is in a certain state @@ -1359,7 +1346,7 @@ SUBROUTINE WMETFL C -set terminal to alpha mode in order to facilitate c fortran IO. C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + c flush buffers c modified 2-23-87 to be a dummy routine by JFM. C** CALL VBOUT(0,1) @@ -1367,27 +1354,27 @@ SUBROUTINE WMETFL END SUBROUTINE WMETIC(NUM,INDEX,CLRARY,CLRMOD) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDIQCO - Inquire Color Table. -C + C K.M.Erickson - 04 May 81 -C + C ENVIRONMENT - COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS - NUM = integer number of color indexes to inquire. C Range 1-256. C INDEX = integer array of indexes to inquire. Range C 0-255. C CLRMOD = integer color model to be used. Range 0,1. -C + C CALLS - vb2hls -C + C EXIT CONDITIONS - CLRARY = real array of 3 by NUM elements returning C the values of the components of the indexes inquired. C Range for rgb: 0. - 1. C Range for hls: hue 0. - 360. C l & s 0. - 1. -C + C NARRATIVE - Inquire one or more color table entries. NUM and C INDEX specify how many and which indexes are being C inquired. CLRMOD specifies which color model @@ -1396,33 +1383,33 @@ SUBROUTINE WMETIC(NUM,INDEX,CLRARY,CLRMOD) C support the color table indexes specified will C return -1. in the first element of the CLRARY value C for that index. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER*4 NUM,INDEX(NUM),CLRMOD, RGB(3) REAL*4 CLRARY(3,NUM) -C + INTEGER*4 CLRTAB(256,3) COMMON /WMET08/ CLRTAB -C + C check for valid num. -C + integer*4 i, indexn IF(NUM.LT.1.OR.NUM.GT.256) THEN CALL WMETER(723,5) GOTO 999 END IF -C + C check for valid clrmod. -C + IF(CLRMOD.NE.0.AND.CLRMOD.NE.1) THEN CALL WMETER(725,5) GOTO 999 END IF -C + C check for valid indexes. -C + DO I=1,NUM INDEXN=INDEX(I) IF(INDEXN.LT.0.OR.INDEXN.GT.255) THEN @@ -1445,41 +1432,41 @@ SUBROUTINE WMETIC(NUM,INDEX,CLRARY,CLRMOD) END SUBROUTINE WMETCP(X,Y) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDIQCP -Inquire Where Current Position Is. -C + C K.M. ERICKSON -14 NOV 80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS - -C + C CALLS - -C + C EXIT CONDITIONS -X,Y = real NDC position. -C + C NARRATIVE -Return the value of current position. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C COMMON /WMET09/XCP,YCP REAL*4 XCP,YCP REAL*4 X,Y -C + C ASSIGN THE CP TO X,Y -C + X=XCP Y=YCP RETURN END SUBROUTINE WMETCO(NUM,INDEX,CLRARY,CLRMOD) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDSTCO - Set Color Table. -C + C K.M.ERICKSON -04 MAY 81 -C + C ENVIRONMENT - COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS - NUM = integer number of color indexes to be set. C Range 1-256. C INDEX = integer array of indexes to be set. Range @@ -1505,11 +1492,11 @@ SUBROUTINE WMETCO(NUM,INDEX,CLRARY,CLRMOD) C 7 white 1.,1.,1. C CLRMOD = integer color model being used. Range 0,1. C Default: 0 (RGB). -C + C CALLS - VBOUT -C + C EXIT CONDITIONS - The Dicomed color table has been set -C + C NARRATIVE - Set one or more color table entries. This is a C dynamic setting, if the device will support it. C "Dynamic" neans that primitives which have already @@ -1533,57 +1520,57 @@ SUBROUTINE WMETCO(NUM,INDEX,CLRARY,CLRMOD) C dependent INDEX value in the range 0-7. If an C unsupported value is C specified, it should be ignored. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER*4 NUM, INDEX(NUM), CLRMOD, RGB(3), i REAL*4 CLRARY(3,NUM) -c + INTEGER*4 CLRTAB(256,3) COMMON /WMET08/ CLRTAB -c + c batch update mode--c700 INTEGER IBATUP -c + c send color table--c800 INTEGER ISNDCO -c + INTEGER*4 IBUF(6) DATA IBUF/36869,5*0/ c ibuf (1) (2) (3) (4) (5) (6) c 9005 index z R g Y B M C W -C + DATA IBATUP/50944/ DATA ISNDCO/51200/ -C + c check for valid NUM. -c + IF(NUM.LT.1.OR.NUM.GT.256) THEN CALL WMETER(723,5) GOTO 999 END IF -c + c check for valid clrmod. -c + IF(CLRMOD.NE.0.AND.CLRMOD.NE.1) THEN CALL WMETER(725,5) GOTO 999 END IF -c + c send batch update mode CALL WMET13S(IBATUP) c check for valid indexes. -c + DO 100 I=1,NUM IF(INDEX(I).LT.0.OR.INDEX(I).GT.255) THEN CALL WMETER(724,5) GOTO 100 END IF -c + IBUF(2) = INDEX(I) c check for valid clrary. c rgb -c + IF(CLRMOD.EQ.0) THEN IF( CLRARY(1,I).LT.0..OR.CLRARY(1,I).GT.1. X .OR.CLRARY(2,I).LT.0..OR.CLRARY(2,I).GT.1. @@ -1597,10 +1584,10 @@ SUBROUTINE WMETCO(NUM,INDEX,CLRARY,CLRMOD) c green/yellow IBUF(5)=INT(255.99*CLRARY(3,I)) *256 c blue/magenta -c + ELSE c hls -c + IF( CLRARY(1,I).LT.0..OR.CLRARY(1,I).GT.360. X .OR.CLRARY(2,I).LT.0..OR.CLRARY(2,I).GT.1. X .OR.CLRARY(3,I).LT.0..OR.CLRARY(3,I).GT.1.) THEN @@ -1614,37 +1601,37 @@ SUBROUTINE WMETCO(NUM,INDEX,CLRARY,CLRMOD) c green IBUF(5)=INT(255.99*RGB(3))*256 c blue -c + END IF c store color table values -c + CLRTAB(IBUF(2)+1,1)=IBUF(3) CLRTAB(IBUF(2)+1,2)=IBUF(4)/256 CLRTAB(IBUF(2)+1,3)=IBUF(5)/256 -c + CALL WMET13(6,IBUF) 100 CONTINUE -c + 999 CALL WMET13S(ISNDCO) c send color table RETURN END SUBROUTINE WMETFC(COLOR) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDSTFC -Set Foreground Color. -C + C K.M. ERICKSON -12 NOV 80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS -COLOR = integer color table index . Range 0-255. C Default is device dependent, in range 0-7. -C + C CALLS - -C + C EXIT CONDITIONS -VECTOR(1) = real updated foreground color (COLOR). -C + C NARRATIVE -Set the foreground color index, i.e., the color C table index used for drawing future primitives. C Color is an integer from 0-255 which is used as an @@ -1653,24 +1640,24 @@ SUBROUTINE WMETFC(COLOR) C dependent value in the range 0-7. C If an unsupported value is specified, set to C default. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER*4 COLOR -C + INTEGER*4 COL(2) -C + REAL*4 VECTOR(7) COMMON /WMET04/ VECTOR -C + DATA COL/37121,0/ -C + C CHECK FOR VALID COLOR. IF(COLOR.LT.0.OR.COLOR.GT.255) THEN CALL WMETER(724,5) GOTO 999 END IF -C + C VECTOR(1)=FOREGROUND COLOR C (2)=BACKGROUND COLOR C (3)=INTENSITY @@ -1685,33 +1672,33 @@ SUBROUTINE WMETFC(COLOR) END SUBROUTINE WMETLW(LINWTH) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDSTLW -Set Line Width. -C + C K.M. ERICKSON -14 NOV 80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS -LINWTH = real line width of line drawing output C primitives. Range 0.-1. Default: device dependent. -C + C CALLS - -C + C EXIT CONDITIONS -VECTOR(5) = real updated line width (LINWTH). -C + C NARRATIVE -Set the relative width of an output line. Values C are 0.-1. with 1. being .01 in NDC space. C All devices must support at least a single device C dependent value that is the default. If an C unsupported value is specified, set to the closest C supported line width. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL*4 LINWTH -C + INTEGER*4 LW(2) -C + REAL*4 VECTOR(7) COMMON /WMET04/ VECTOR C CURRENT ATTRIBUTE VALUES. (DEVICE-INDEPENDENT) @@ -1724,105 +1711,105 @@ SUBROUTINE WMETLW(LINWTH) C (5)=LINE WIDTH C (6)=CHARACTER BOX Y C (7)=CHARACTER BOX X -C + DATA LW/43265,0/ -C + C CHECK FOR VALID LINWTH. IF(LINWTH.LT.0.0.OR.LINWTH.GT.1.0) THEN CALL WMETER(401,5) GOTO 999 END IF -C + C ASSIGN VECTOR(5) -C + VECTOR(5)=LINWTH -C + C MAP 0.-1. INTO 0.-32767; FOR DICOMED C 1. IS .01 IN NDC SPACE -C + C LW(2)=LINWTH*32767*.01 LW(2)=LINWTH*32767 -C + C SEND BGP COMMAND -C + CALL WMET13(2,LW) -C + 999 RETURN END SUBROUTINE WMETIG C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VINWPG -New Page. -C + C R.W.Simons -15MAY81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Hard Copy Format 1. -C + C ENTRY CONDITIONS - -C + C CALLS -VBOUT. -C + C EXIT CONDITIONS - -C + C NARRATIVE -Physically advance the medium or clear the screen, C whichever is appropriate. Also flood the screen C with the background color on devices that support C this. The current position is not changed. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C OUTARY = NEW PAGE COMMAND C = 8505,FFFF,FFFF,FFFF,PAGE NUMBER,0 IN HEX C = 34053,65535,65535,65535,PAGE NUMBER,0 INTEGER*4 OUTARY(6) DATA OUTARY /34053,65535,65535,65535,0,0/ -C + C SEND A NEW PAGE COMMAND TO THE PLOT FILE. C INCREMENT THE PAGE NUMBER. OUTARY(5)=OUTARY(5)+1 CALL WMET13(6,OUTARY) CALL WMETMO(1) -C + RETURN END SUBROUTINE WMETIM(X,Y) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VIMOVA -Move Absolute. -C + C R.W.Simons -15MAY81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Hard Copy Format 1. -C + C ENTRY CONDITIONS -X,Y = real NDC position. -C + C CALLS -VBOUT. -C + C EXIT CONDITIONS -XCP,YCP = real updated current position. (XNDC,YNDC) -C + C NARRATIVE -Set current position to absolute NDC position X,Y. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL*4 X,Y -C + INTEGER*4 OUTARY(2) -C + C CURRENT POSITION. (LXY,HC1) REAL*4 XCP,YCP COMMON /WMET09/ XCP,YCP C Include '[VDIMAINT.COMMON]VCCRPS' -C + C SCALE FACTORS FOR NDC TO DC MAPPING. (LXY) REAL*4 XSCALE,YSCALE COMMON /WMET10/ XSCALE,YSCALE -C + C DC DIMENSIONS OF OFFSETS AND PICTURE. (LXY,HC1) REAL*4 XPAD,YPAD,XDEVIC,YDEVIC COMMON /WMET11/ XPAD,YPAD,XDEVIC,YDEVIC -C + C CONVERT TO SCREEN UNITS. C SET BIT 15 OF X = 0 TO INDICATE A COORDINATE POSITIONING COMMAND. C SET BIT 15 OF Y = 0 TO INDICATE A DRAW COMMAND. @@ -1830,59 +1817,59 @@ SUBROUTINE WMETIM(X,Y) C ARE IN THE PROPER RANGE. OUTARY(1)=X*XSCALE+XPAD OUTARY(2)=Y*YSCALE+YPAD -C + C SEND THE COMMAND TO THE PLOT FILE. CALL WMET13(2,OUTARY) -C + C UPDATE CURRENT POSITION. XCP=X YCP=Y -C + RETURN END SUBROUTINE WMETES(ESCPCD,N,ARGS) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDESCP -Escape Code Routine. -C + C K.M. ERICKSON -4 MAY 81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS -ESCPCD = integer escape function code. C N = integer number of arguments in ARG. RANGE 0-. C ARGS = real array of arguments for the escape C function specified. -C + C CALLS -vbout -C + C EXIT CONDITIONS - -C + C NARRATIVE -Invoke the nonstandard, device-dependent function C ESCPCD. N is the number of arguments used by this C function and ARGS is a real array containing those C arguments. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER*4 ESCPCD,N, i C N COULD BE EQUAL TO 0 SO: REAL*4 ARGS(N+1), ARG REAL*4 ONE -C + INTEGER*4 IBUF(4) ONE = 1.0 -C + C CHECK FOR VALID N. IF(N.LT.0) THEN CALL WMETER(802,5) GOTO 999 END IF -C + C meta file escapes 800 - -C + IF(ESCPCD.EQ.800) THEN -C + C SEND ASPECT RATIO IBUF(1) = 33539 IBUF(2) = 32767.*MIN(ARGS(1),ONE) @@ -1890,20 +1877,20 @@ SUBROUTINE WMETES(ESCPCD,N,ARGS) IBUF(4) = 0 CALL WMET13(4,IBUF) ENDIF -C + C ALL OTHER ESCAPE CODES -C + C FIRST CHECK IF THIS IS AN ESCAPE WITH ALPHA ARGUMENTS -C + IF(ESCPCD.EQ.250) THEN ELSE -C + C ALL OTHER ESCAPES HAVE REAL NUMBER ARGUMENTS C SEND 82xx 01nn ESCPCD ARGS(1) ... ARGS(N) C xx is 2*(N+1) and nn is 2*N+1 C and each arg is sent as a fixed point real with sixteen bits C integer and sixteen bits fraction. -C + IBUF(1) = 33280 + 2*(N+1) IBUF(2) = 256 + 2*N + 1 IBUF(3) = ESCPCD @@ -1916,24 +1903,24 @@ SUBROUTINE WMETES(ESCPCD,N,ARGS) CALL WMET13(2,IBUF) 10 CONTINUE ENDIF -C + 999 RETURN END SUBROUTINE WMET12(XARRAY,YARRAY,NPTS) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VIPOLY -POLYGON FILL ROUTINE -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS -XARRAY-ARRAY OF X VALUES OF THE POLYGON C YARRAY-CORRESPONDING ARRAY OF Y VALUES C NPTS- NUMBER OF POINTS IN (XARRAY,YARRAY) -C + C CALLS - -C + C EXIT CONDITIONS - -C + C NARRATIVE -The polygon defined by XARRAY,YARRAY will be drawn C and filled (constrained by any limitations of the C physical device -- see below). No checking will be @@ -1942,11 +1929,11 @@ SUBROUTINE WMET12(XARRAY,YARRAY,NPTS) C boundary is drawn using the solid line style. C VDI will close the polygon (i.e. the last point C will be connected to the first). -C + C The level of support for this primitive is device- C dependent. The level of support is categorized C as follows: -C + C Level 0 -- no polygon fill. Only the polygon C boundary is drawn. C Level 1 -- the device fills convex polygons. @@ -1959,48 +1946,48 @@ SUBROUTINE WMET12(XARRAY,YARRAY,NPTS) C is drawn to that point from a point far outside C the polygon, that line intersects the polygon C boundary an odd number of times. -C + C Note that the level of support for a particular device C can be inquired using the function VDIQDC. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + integer*4 i, nn, npts REAL*4 XARRAY(NPTS),YARRAY(NPTS) REAL*4 ATTARR(7) -C + C MAX NPTS IS 508. Constraint imposed by postprocessor. INTEGER*4 OUTARY(2) INTEGER*4 zero, i4 -C + C SCALE FACTORS FOR NDC TO DC MAPPING. (LXY) REAL*4 XSCALE,YSCALE COMMON /WMET10/ XSCALE,YSCALE -C + C DC DIMENSIONS OF OFFSETS AND PICTURE. (LXY,HC1) REAL*4 XPAD,YPAD,XDEVIC,YDEVIC COMMON /WMET11/ XPAD,YPAD,XDEVIC,YDEVIC -C + C CHECK FOR VALID N IF (NPTS.LT.1) THEN CALL WMETER(802,5) GO TO 999 END IF -C + C SAVE CURRENT ATTRIBUTES CALL WMETIO(ATTARR) -C + C SET CURRENT LINESTYLE TO SOLID zero = 0 CALL WMETLS(zero) -C + C BEGIN POLYGON COMMAND = AA00 C = 43520 C END POLYGON COMMAND = AB00 C = 43776 -C + CALL WMET13S(43520) -C + NN=NPTS C CHECK MAXIMUM POINTS LIMIT IF (NN.GT.508) NN=508 @@ -2010,89 +1997,87 @@ SUBROUTINE WMET12(XARRAY,YARRAY,NPTS) OUTARY(2) = YARRAY(I) * YSCALE + YPAD CALL WMET13(2,OUTARY) 100 CONTINUE -C + CALL WMET13S(43776) -C + C MOVE SOMEWHERE TO UPDATE CURRENT POSITION CALL WMETIM(XARRAY(1),YARRAY(1)) -C + C RESTORE LINESTYLE i4 = ATTARR(4) CALL WMETLS(i4) -C + 999 RETURN END SUBROUTINE WMET13(NUMWDS,OUTARY) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VBOUT -Output 16 Bits of Data. -C + CC ENVIRONMENT -Computer-independent, System-independent, FORTRAN 77 -C + C ENTRY CONDITIONS -NUMWDS = integer number of words in OUTARY. C = 0 means flush the buffer. C OUTARY = integer array of output data, 16 bits/word, C right-justified. -C -C + C NARRATIVE - This routine used to do all the work but due to C complex computer, device and software (COMDQ) C dependencies, the work has moved to the computer C dependent, device dependent, COMQ dependent routine C BGPBUF. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C DIMENSION OUTARY TO NUMWDS+1 TO AVOID PROBLEMS WHEN NUMWDS = 0. INTEGER NUMWDS INTEGER*4 OUTARY(NUMWDS+1) -C + CALL WMETBF(NUMWDS,OUTARY) RETURN END SUBROUTINE WMET13S(OUT) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VBOUT -Output 16 Bits of Data. -C + CC ENVIRONMENT -Computer-independent, System-independent, FORTRAN 77 -C + C ENTRY CONDITIONS -NUMWDS = integer number of words in OUTARY. C = 0 means flush the buffer. C OUTARY = integer array of output data, 16 bits/word, C right-justified. -C -C + C NARRATIVE - This routine used to do all the work but due to C complex computer, device and software (COMDQ) C dependencies, the work has moved to the computer C dependent, device dependent, COMQ dependent routine C BGPBUF. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C DIMENSION OUTARY TO NUMWDS+1 TO AVOID PROBLEMS WHEN NUMWDS = 0. INTEGER*4 OUTARY(1) INTEGER OUT -C + OUTARY(1) = OUT CALL WMETBF(1,OUTARY) RETURN END SUBROUTINE WMETDC(INDEX,VALUE) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDIQDC -Inquire Device Capabilities. -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS -INDEX = integer capability number. Range 1-33. -C + C CALLS - -C + C EXIT CONDITIONS -VALUE = real value of the capability indicated by C INDEX. -C + C NARRATIVE -Return values of various device capabilities. INDEX C is the integer capability number (as given below), C and the real value is returned in VALUE. @@ -2226,58 +2211,58 @@ SUBROUTINE WMETDC(INDEX,VALUE) C 33. Device pixel aspect - the ratio of the spacing of device C pixels in x divided by the spacing in y (1 for square C pixels) -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER*4 INDEX REAL*4 VALUE REAL*4 DEV(33) SAVE DEV -C + C SET DEVICE CAPABILITIES C THE VALUES CONTAINED IN DEV ARE: -C + c ** Jan 16, 1991 -- Dino Pavlakos c changed polygon support level (entry# 24) from 2 to 3 -c + DATA DEV/ 0.,0.,256.,256.,4096.,31.,32767.,0.,0.,0., * 0.,0.,0.,0.,32767.,32767.,0.0,0.0,8.,8., * 0.,0.,11.,3.,508.,1.,16777216.,0.,0.,21298., * 32767.,1.,0./ -c + C CHECK FOR VALID INDEX. IF(INDEX.LT.1.OR.INDEX.GT.33) THEN CALL WMETER(726,5) GOTO 999 END IF -C + C RETURN INDEXED VALUE. VALUE=DEV(INDEX) -C + 999 RETURN END SUBROUTINE WMETIE(ESCPCD,SUPPRT) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDIQES -Inquire Escape. -C + C K.M.ERICKSON -04 may 81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS -ESCPCD = integer escape function code. -C + C CALLS - -C + C EXIT CONDITIONS -SUPPRT = integer level of support for the escape C function specified. Range 0,1,2. -C + C NARRATIVE -An integer value indicating 2=hardware supported, C 1=software supported, 0=unsupported is returned in C SUPPRT for the escape function ESCPCD. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER*4 ESCPCD,SUPPRT IF(ESCPCD .GE. 200 .AND. ESCPCD .LE. 205)THEN SUPPRT=2 @@ -2289,20 +2274,20 @@ SUBROUTINE WMETIE(ESCPCD,SUPPRT) END SUBROUTINE WMETBC(COLOR) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDSTBC -Set Background Color. -C + C K.M. ERICKSON -12 NOV 80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS -COLOR = integer color table index. Range 0-255. C Default: device dependent, in range 0-7. -C + C CALLS - -C + C EXIT CONDITIONS -VECTOR(2) = real updated background color (COLOR). -C + C NARRATIVE -Set the background color for following VDNWPG or C TEXT primitives for devices supporting these C features. For example, many raster devices support @@ -2313,23 +2298,23 @@ SUBROUTINE WMETBC(COLOR) C dependent value in the range 0-7. C If an unsupported value is specified, set to C default. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER*4 COLOR INTEGER*4 SETBC(2) -C + REAL*4 VECTOR(7) COMMON /WMET04/ VECTOR -C + DATA SETBC(1) / 37633 / -C + C CHECK FOR VALID COLOR. IF(COLOR.LT.0.OR.COLOR.GT.255) THEN CALL WMETER(724,5) GOTO 999 END IF -C + C VECTOR(1)=FOREGROUND COLOR C (2)=BACKGROUND COLOR C (3)=INTENSITY @@ -2337,31 +2322,31 @@ SUBROUTINE WMETBC(COLOR) C (5)=LINE WIDTH C (6)=CHARACTER BOX Y C (7)=CHARACTER BOX X -C + VECTOR(2)=COLOR SETBC(2) = COLOR CALL WMET13(2,SETBC) -C + 999 RETURN END SUBROUTINE WMETCS(YSIZE) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDSTCS -Set Character Size. -C + C K.M.ERICKSON -04 May 81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS -YSIZE = real Y dimension of the character box in NDC C space. Range 0.-1. Default: device dependent, C typically the smallest hardware size. -C + C CALLS - -C + C EXIT CONDITIONS -VECTOR(6) = real updated character box Y (YSIZE). C VECTOR(7) = real updated character box X. -C + C NARRATIVE -Set the character size for text primitives. Size C is given by YSIZE as the Y dimension of the C character box. The SVDI will assign the X dimension @@ -2373,25 +2358,25 @@ SUBROUTINE WMETCS(YSIZE) C unsupported value is specified, set to the largest C supported character size that does not exceed the C specified size. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL*4 YSIZE -C + INTEGER*4 IBUF(4) -c + REAL*4 VECTOR(7) COMMON /WMET04/ VECTOR -c + COMMON/WMET10/XSCALE,YSCALE REAL*4 XSCALE,YSCALE -C + C CHECK FOR VALID YSIZE. IF(YSIZE.LT.0.0.OR.YSIZE.GT.1.0) THEN CALL WMETER(401,5) GOTO 999 END IF -C + C VECTOR(1)=FOREGROUND COLOR C (2)=BACKGROUND COLOR C (3)=INTENSITY @@ -2399,40 +2384,39 @@ SUBROUTINE WMETCS(YSIZE) C (5)=LINE WIDTH C (6)=CHARACTER BOX Y C (7)=CHARACTER BOX X -C -C + C SET CHARACTER BOX = SPACING OF LETTERS TO A 5/7 BOX VECTOR(6)=YSIZE VECTOR(7)=VECTOR(6)*(5./7.) -C + C SEND 15 BITS FOR THE HEIGHT AND WIDTH TO BGP. NOTE THAT CHARACTER SIZES C ARE MAPPED FROM THE SMALLEST TO THE LARGEST CHARACTER DEFINED TO BE A C CHARACTER FILLING THE SMALLEST DIMENSION OF THE SCREEN ASPECT RATIO. -C + C SEND BGP COMMAND ,B202-HEIGHT-WIDTH IBUF(1)=45570 IBUF(2)=.65*VECTOR(6)*YSCALE IBUF(3)=.65*VECTOR(7)*XSCALE CALL WMET13(3,IBUF) -c + 999 RETURN END SUBROUTINE WMETIN(INTEN) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDSTIN -Set Intensity. -C + C K.M. ERICKSON -12 NOV 80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS -INTEN = real intensity of the image of an output C primitive. Range 0.-1. Default: device dependent. -C + C CALLS - -C + C EXIT CONDITIONS -VECTOR(3) = real updated intensity (INTEN). -C + C NARRATIVE -Set the intensity value indicated for future C primitives. Intensity is a real value between 0 C (not visible) and 1 (maximum). Intensities are @@ -2440,23 +2424,23 @@ SUBROUTINE WMETIN(INTEN) C All devices must support at least a single value: C 1.0. If an unsupported value is specified, set to C the closest supported intensity. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL*4 INTEN -C + INTEGER*4 INTE(2) -C + REAL*4 VECTOR(7) COMMON /WMET04/ VECTOR -C + DATA INTE/37377,0/ C CHECK FOR VALID INTEN. IF(INTEN.LT.0.0.OR.INTEN.GT.1.0) THEN CALL WMETER(401,5) GOTO 999 END IF -C + C VECTOR(1)=FOREGROUND COLOR C (2)=BACKGROUND COLOR C (3)=INTENSITY @@ -2464,31 +2448,31 @@ SUBROUTINE WMETIN(INTEN) C (5)=LINE WIDTH C (6)=CHARACTER BOX Y C (7)=CHARACTER BOX X -C + VECTOR(3)=INTEN C MAP INTEN VALUE OF 0.-1. INTO 0.-32767. (15 BITS OF INFO) INTE(2)=INTEN*32767. -C + CALL WMET13(2,INTE) -C + 999 RETURN END SUBROUTINE WMETLS(LINSTY) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDSTLS -Set Line Style. -C + C K.M. ERICKSON -12 NOV 80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS -LINSTY = integer linestyle of line drawing output C primitives. Range 0-5. Default:0. -C + C CALLS - -C + C EXIT CONDITIONS -VECTOR(4) = real updated line style (LINSTY). -C + C NARRATIVE -Set the style of line as below. This applies only C to line drawing primitives. The line styles are: C 0 - solid @@ -2500,18 +2484,18 @@ SUBROUTINE WMETLS(LINSTY) C All devices must support at least the values 0 and C 5. If an unsupported value is specified, set to 5. C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER*4 LINSTY -C + INTEGER*4 LS(2) -C + INTEGER*4 LINS(6) REAL*4 VECTOR(7) COMMON /WMET04/ VECTOR C CURRENT ATTRIBUTE VALUES. (DEVICE-INDEPENDENT) C REAL*4 VECTOR(7) C COMMON /VCATTR/ VECTOR -C + C VECTOR(1)=FOREGROUND COLOR C (2)=BACKGROUND COLOR C (3)=INTENSITY @@ -2519,46 +2503,46 @@ SUBROUTINE WMETLS(LINSTY) C (5)=LINE WIDTH C (6)=CHARACTER BOX Y C (7)=CHARACTER BOX X -C + DATA LS/43009,0/ DATA LINS/32767,0,16382,5461,27305,16383/ -C + C CHECK FOR VALID LINSTY. IF(LINSTY.LT.0.OR.LINSTY.GT.5)THEN CALL WMETER(401,5) GOTO 99999 END IF VECTOR(4)=LINSTY -C + C LINE STYLE (15 BITS) VARIES FROM 0. : DOTTED , 1-32755 :DASHED, 32767: SOLID -C + LS(2)=LINS(LINSTY+1) -C + C SEND BGP COMMAND -C + CALL WMET13(2,LS) 99999 RETURN END SUBROUTINE WMETII(ASPECT,JUSTIF) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VIINIT -Initialize SVDI. Metafile -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C DICOMED -C + C ENTRY CONDITIONS -ASPECT = real ratio of X dimension to Y dimension. C Range >0.0. Default: 0. (device dependent). C JUSTIF = integer justification of NDC space on the C device. Range 0-9. Default: 0 (device dependent.) -C + C CALLS -VBERRH,CDROFS,VBOUT,VIMOVA. -C + C EXIT CONDITIONS -XNDCMX,YNDCMX = real NDC maximum valid values(as C constrained by ASPECT). C VECTOR = real array of attribute values(all device C dependent except VECTOR(4)=0.0). -C + C NARRATIVE -This must be the first SVDI call made. All C attribute values, the color table, and current C position are set to appropriate defaults for the @@ -2566,7 +2550,7 @@ SUBROUTINE WMETII(ASPECT,JUSTIF) C is done. The screen is cleared or paper advanced C if necessary to guarantee a blank view surface for C drawing on. -C + C ASPECT specifies the ratio of the X dimension to the C Y dimension . Maximum NDC values (at least one of C which will be 1.0) are computed to give the ASPECT @@ -2577,7 +2561,7 @@ SUBROUTINE WMETII(ASPECT,JUSTIF) C aspect of 1.0. The NDC rectangle is scaled until C one dimension fills the corresponding dimension of C the device. -C + C JUSTIF determines where the rectangle is located on C the device as diagrammed below: C --------- @@ -2587,22 +2571,22 @@ SUBROUTINE WMETII(ASPECT,JUSTIF) C --------- C For example, JUSTIF = 7 indicates NDC space will be C upper left justified on the device. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL*4 ASPECT INTEGER*4 JUSTIF integer iidsiz, iusrsz, iszrou integer*4 i, just, aspe integer istat -C + INTEGER*4 CLRTAB(256,3) COMMON /WMET08/ CLRTAB -C + C MAXIMUM VALID NDC VALUES. (DEVICE-INDEPENDENT) REAL*4 XNDCMX,YNDCMX COMMON /WMET03/ XNDCMX,YNDCMX -C + C CURRENT ATTRIBUTE VALUES. (DEVICE-INDEPENDENT) C VECTOR(1)=FOREGROUND COLOR C (2)=BACKGROUND COLOR @@ -2613,45 +2597,43 @@ SUBROUTINE WMETII(ASPECT,JUSTIF) C (7)=CHARACTER BOX X REAL*4 VECTOR(7) COMMON /WMET04/ VECTOR -C + C CURRENT POSITION. (LXY,HC1) REAL*4 XCP,YCP COMMON /WMET09/ XCP,YCP C Include '[VDIMAINT.COMMON]VCCRPS' -C + C SCALE FACTORS FOR NDC TO DC MAPPING. (LXY,HC1) REAL*4 XSCALE,YSCALE COMMON /WMET10/ XSCALE,YSCALE C Include '[VDIMAINT.COMMON]VCSCAL' -C + INTEGER*4 KWRTFL,KRDFL,KOUTFL,KINFL,KWRDSZ,KBYTEL,KCPW,KBAUD, 1KCOMTP COMMON /CDRCOM/ KWRTFL,KRDFL,KOUTFL,KINFL,KWRDSZ,KBYTEL,KCPW, 1 KBAUD,KCOMTP -C -C + C DC DIMENSIONS OF OFFSETS AND PICTURE. (LXY,HC1) REAL*4 XPAD,YPAD,XDEVIC,YDEVIC COMMON /WMET11/ XPAD,YPAD,XDEVIC,YDEVIC -C + INTEGER*4 MACHIN(3),MACLEN INTEGER*4 KIDSIZ,KJOBID(4),KUSRSZ,KUSRID(4),KSZROU INTEGER*4 KJROUT(4),KSECUR,KJTIME(4),KJDATE(4) COMMON / VCJOB/ KIDSIZ,KJOBID,KUSRSZ,KUSRID,KSZROU, 1 KJROUT,KSECUR,KJTIME,KJDATE,MACHIN,MACLEN -C + C DECLARE FILE INITIALIZATION COMMANDS. integer*4 idfile(2),isecur(3), zero(1) real*4 rzero -C + DATA ISECUR/33282,1,0/ -C -C + RZERO= 0 ZERO(1) = 0 XPAD = 0 YPAD = 0 -c + C SET DEFAULT ATTRIBUTE VALUES. ALL ARE DEVICE DEPENDENT EXCEPT C VECTOR(4)=0.0. VECTOR(1)=7. @@ -2668,30 +2650,30 @@ SUBROUTINE WMETII(ASPECT,JUSTIF) C CHARACTER BOX Y - NORMAL PRINT SIZE (100 LINES/PAGE) VECTOR(7)=.00714286 C CHARACTER BOX X - NORMAL PRINT SIZE (VECTOR(6)*5/7) -C + C ESTABLISH DEVICE UNITS (MAX ADDRESSABLE UNITS) -C + XDEVIC=32767 YDEVIC=32767 -C + C ASSIGN INPUT PARAMETERS TO ASPE AND JUST ASPE=ASPECT JUST=JUSTIF -C + C CHECK FOR VALID ASPECT. IF(ASPECT.LT.0.0) THEN CALL VBERRH(721,5), C AND USE DEFAULT ASPECT. -C + IF(ASPE.LT.0.) THEN CALL WMETER(721,5) ASPE=XDEVIC/YDEVIC END IF -C + C ESTABLISH ASPECT RATIO -C + C IF=0 SET TO DEVICE DEPENDENT ASPECT RATIO(FOR dic ASPECT=32148/21698 -C + IF(ASPE .EQ. 0.) ASPE = XDEVIC/YDEVIC -C + IF (ASPE .GT. 1.) THEN XNDCMX = 1. YNDCMX = 1./ASPE @@ -2699,31 +2681,31 @@ SUBROUTINE WMETII(ASPECT,JUSTIF) XNDCMX=ASPE YNDCMX=1. END IF -C + C DEFINE MAPPING FUNCTION FOR ANY DEVICE -C + C ESTABLISH SCALE FACTOR FOR MAXIMUM SCREEN DIMENSIONS OF THE DEVICE -C + XSCALE = XDEVIC /XNDCMX YSCALE= YDEVIC / YNDCMX XSCALE = MIN( XSCALE, YSCALE) YSCALE = XSCALE -C + C CHECK FOR VALID JUSTIF. IF(JUSTIF.LT.0 .OR. JUSTIF.GT.9) THEN C CALL VBERRH(720,5), AND USE DEFAULT JUSTIF. -C + IF(JUST .LT. 0 .OR. JUST .GT. 9) CALL WMETER(720,5) -C + C MAKE OUTPUT FILE FOR THE METAFILE BE UNIT 55 KOUTFL=55 -C + C SET UP MONITORING INFORMATION CALL WMETDV('C MET ') CALL WMETMO(0) -C + C INITIALIZE THE OUTPUT FILE. CALL WMETFF(KOUTFL,1440,1,ISTAT) -C + C COMPUTE LENGTH OF FILE ID INSTRUCTION. IIDSIZ=(KIDSIZ+1)/2 IUSRSZ=(KUSRSZ+1)/2 @@ -2733,37 +2715,37 @@ SUBROUTINE WMETII(ASPECT,JUSTIF) c SEND FILE ID. CALL WMET13(2,IDFILE) -C + C SEND DATE AND TIME. CALL WMET05(3,KJDATE) CALL WMET05(3,KJTIME) -C + C SEND LENGTH OF JOB ID AND JOB ID. CALL WMET13S(IIDSIZ) CALL WMET05(4,KJOBID) -C + C SEND LENGTH OF USER ID AND USER ID. CALL WMET13S(IUSRSZ) CALL WMET05(4,KUSRID) -C + C SEND LENGTH OF ROUTING INFO AND ROUTING INFO. CALL WMET13S(ISZROU) CALL WMET05(4,KJROUT) -C + C SEND SECURITY AND FLUSH BUFFER. ISECUR(3)=KSECUR CALL WMET13(3,ISECUR) zero(1) = 0 CALL WMET13(0,zero) -C + C SEND ASPECT RATIO CALL WMET13S(33539) CALL WMET13S(INT(XNDCMX*XDEVIC)) CALL WMET13S(INT(YNDCMX*YDEVIC)) CALL WMET13S(0) -C + C SET UP COLOR TABLE -C + DO 10 I=2,256 CLRTAB(I,1) = 255 CLRTAB(I,2) = 255 @@ -2781,51 +2763,50 @@ SUBROUTINE WMETII(ASPECT,JUSTIF) CLRTAB(5,2) = 0 CLRTAB(6,2) = 0 CLRTAB(7,1) = 0 -c + C SET CURRENT POSITION TO (0.,0.) CALL WMETIM(rzero, rzero) -C -C + RETURN END SUBROUTINE WMETIL(XNDC,YNDC) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VILINA -Line Absolute. -C + C R.W.Simons -08MAY81 -C + C ENVIRONMENT -Computer-independent, system-independent, FORTRAN 77 C Hard Copy Format 1. -C + C ENTRY CONDITIONS -XNDC,YNDC = real NDC position. -C + C CALLS - -C + C EXIT CONDITIONS -XCP,YCP = real updated current position. (XNDC,YNDC) -C + C NARRATIVE -Draw a line from current position to absolute NDC C position XNDC,YNDC and update current position. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL*4 XNDC,YNDC -C + INTEGER*4 OUTARY(2) -C + C CURRENT POSITION. (LXY,HC1) REAL*4 XCP,YCP COMMON /WMET09/ XCP,YCP C Include '[VDIMAINT.COMMON]VCCRPS' -C + C SCALE FACTORS FOR NDC TO DC MAPPING. (LXY) REAL*4 XSCALE,YSCALE COMMON /WMET10/ XSCALE,YSCALE -C + C DC DIMENSIONS OF OFFSETS AND PICTURE. (LXY,HC1) REAL*4 XPAD,YPAD,XDEVIC,YDEVIC COMMON /WMET11/ XPAD,YPAD,XDEVIC,YDEVIC -C + C CONVERT TO SCREEN UNITS. C SET BIT 15 OF X = 0 TO INDICATE A COORDINATE POSITIONING COMMAND. C SET BIT 15 OF Y = 1 TO INDICATE A DRAW COMMAND. @@ -2833,67 +2814,67 @@ SUBROUTINE WMETIL(XNDC,YNDC) C ARE IN THE PROPER RANGE. OUTARY(1)=XNDC*XSCALE+XPAD OUTARY(2)=YNDC*YSCALE+YPAD+32768 -C + C SEND THE COMMAND TO THE PLOT FILE. CALL WMET13(2,OUTARY) -C + C UPDATE CURRENT POSITION. XCP=XNDC YCP=YNDC -C + RETURN END SUBROUTINE WMETIP(X,Y) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VIPNTA -Point Absolute. -C + C R.W.Simons -15MAY81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Hard Copy Format 1. -C + C ENTRY CONDITIONS -X,Y = real NDC position. -C + C CALLS -VIMOVA,VBOUT. -C + C EXIT CONDITIONS - -C + C NARRATIVE -Set current position to absolute NDC position X,Y C and put a visible point there. Attributes C foreground color and intensity apply. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL*4 X,Y -C + C MOVE TO THE POSITION SPECIFIED. CALL WMETIM(X,Y) C plot marker at current position (A400 HEX = 41984) TO THE OUTPUT FILE. CALL WMET13S(41984) -C + RETURN END SUBROUTINE WMETIT C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VITERM -Terminate SVDI. -C + C R.W.Simons -13MAY81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Hard Copy Format 1. -C + C ENTRY CONDITIONS - -C + C CALLS -VBOUT,VBERRH. -C + C EXIT CONDITIONS - -C + C NARRATIVE -Terminate the SVDI. Flush buffers, etc. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + integer*4 i INTEGER*4 KWRTFL,KRDFL,KOUTFL,KINFL,KWRDSZ,KBYTEL,KCPW,KBAUD, @@ -2901,55 +2882,55 @@ SUBROUTINE WMETIT COMMON /CDRCOM/ KWRTFL,KRDFL,KOUTFL,KINFL,KWRDSZ,KBYTEL,KCPW, 1 KBAUD,KCOMTP INTEGER FILLER -C + C FILLER IS 1440 BYTES WORTH OF DECIMAL 8100 PADD CHARACTERS DATA FILLER /33024/ integer*4 zero(1) -C + C SEND AN END OF DATA COMMAND TO THE OUTPUT FILE. C 8600 HEX = 34304 = END OF DATA COMMAND. CALL WMET13S(34304) -C + C UPON TERMINATION, WE WANT TO SEND AN EXTRA BUFFER FULL OF PADD C CHARACTERS. BY DOING THIS, WE CAN EASILY BUILD A STANDARD C METAFILE WHICH CAN BE PASSED AROUND SYSTEMS. IT MAY BE C NECESSARY FOR SOME SYSTEMS TO THROW AWAY DATA AT THE END OF C THE FILE, AND THIS WILL ENSURE THAT NOTHING WORTHWHILE GETS C DISCARDED. -C + zero(1) = 0 DO 10 I=1,2048 CALL WMET13S(FILLER) 10 CONTINUE -C + C FLUSH OUTPUT BUFFERS. CALL WMET13(0,zero) -C + CALL WMETCF(KOUTFL,1) CALL WMETMO(2) -C + RETURN END SUBROUTINE WMETIX(LENGT1,CHARS) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VITEXT - Text from Array. -C + C P. Watterberg - 24 MAR 81 -C + C ENVIRONMENT - COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS - LENGT1 = integer number of characters in CHARS. C Range 1-136. C CHARS = integer array of ASCII characters, one C character per array element, right justified. C Range 8,10,32-126. -C + C CALLS - vbout -C + C EXIT CONDITIONS - XCP,YCP = integer updated current position (at the end C of the string). -C + C NARRATIVE - Draw LENGT1 characters in CHARS, starting at C current position and update current position to C the point after the last character box where the @@ -2962,58 +2943,58 @@ SUBROUTINE WMETIX(LENGT1,CHARS) C considered reasonable. Attributes foreground color, C background color, intensity, and character size C apply. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER JSPOT INTEGER*4 LENGT1, CHARS(136), LENGTH, i REAL*4 VECTOR(7) COMMON /WMET04/ VECTOR -C + COMMON /WMET09/XCP,YCP REAL*4 XCP,YCP -C + LOGICAL ODD INTEGER*4 TBUF(73) -c + c check for valid length. -c + LENGTH = LENGT1 IF(LENGTH.LT.1) THEN CALL WMETER(212,5) GO TO 999 END IF -c + c if(length.gt.136) then call vberrh(213,5), and use the c maximum length of 136. -c + IF(LENGTH.GT.136) THEN CALL WMETER(213,5) LENGTH = 136 ENDIF -C + c initialized the number of chars in tbuf, c the spot marker and the odd/even flag -c + ODD = .TRUE. JSPOT = 1 -c + c loop through length characters. -c + DO 100 I=1,LENGTH -c + c check for valid chars. c ignore control characters, except backspace and linefeed. -C + IF(CHARS(I).LT.32 .OR. CHARS(I).GT.126) THEN IF(CHARS(I).NE.8.AND.CHARS(I).NE.10) THEN CALL WMETER(208,5) GOTO 100 ENDIF END IF -c + c now pack the chars into the buffer -c + IF(ODD) THEN JSPOT = JSPOT + 1 TBUF(JSPOT) = CHARS(I)*256 @@ -3021,9 +3002,9 @@ SUBROUTINE WMETIX(LENGT1,CHARS) TBUF(JSPOT) = TBUF(JSPOT) + CHARS(I) ENDIF ODD = .NOT. ODD -C + C UPDATE THE CURRENT POSITION -C + IF(CHARS(I).GE.32) THEN XCP = XCP + VECTOR(7) ELSE IF(CHARS(I).EQ.10) THEN @@ -3031,17 +3012,17 @@ SUBROUTINE WMETIX(LENGT1,CHARS) ELSE XCP = XCP - VECTOR(7) ENDIF -c + 100 CONTINUE -c + c send the chars to the bgp file -c + c 45056 :: b000 tbuf(1)=45056 + jspot -1 c jspot is the number of words filled or partially filled up in tbuf c including the 1st word with the command -C + TBUF(1)=JSPOT+45055 CALL WMET13(JSPOT,TBUF) -C + 999 RETURN END diff --git a/packages/seacas/libraries/svdi/cgi/pst_cgispst.c b/packages/seacas/libraries/svdi/cgi/pst_cgispst.c index 0ace0df729d2..ebe08989797b 100644 --- a/packages/seacas/libraries/svdi/cgi/pst_cgispst.c +++ b/packages/seacas/libraries/svdi/cgi/pst_cgispst.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /* cgispst.c - linker specifiable driver routine for driver Postscript B/W (pst) */ diff --git a/packages/seacas/libraries/svdi/cgi/pst_pstxlate.c b/packages/seacas/libraries/svdi/cgi/pst_pstxlate.c index 8330cbd37156..2002b4d5e386 100644 --- a/packages/seacas/libraries/svdi/cgi/pst_pstxlate.c +++ b/packages/seacas/libraries/svdi/cgi/pst_pstxlate.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /* @@ -1534,7 +1534,7 @@ static void xcpl(anything **params, int num_surfaces, anything **surf_list) /* This clipping algorithm is loosely based on the Cohen- * Sutherland algorithm. This algorithm takes into account - * the fact that points are consective, ie., it tries to + * the fact that points are consecutive, ie., it tries to * encode each point only once. Everything is done * inline for efficiency */ @@ -4010,7 +4010,7 @@ static void xcqfl(anything **params, anything **surf_list) *(int *)params[12] = 0; *(int *)params[13] = 0; - /* pattern transfomation support - patterns not supported */ + /* pattern transformation support - patterns not supported */ *(int *)params[14] = CPTNO; } /* end xcqfl */ diff --git a/packages/seacas/libraries/svdi/cgi/pst_vdipst.f b/packages/seacas/libraries/svdi/cgi/pst_vdipst.f index 8aabd71c8214..c1b34e5c9389 100644 --- a/packages/seacas/libraries/svdi/cgi/pst_vdipst.f +++ b/packages/seacas/libraries/svdi/cgi/pst_vdipst.f @@ -1,66 +1,57 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C C VDMOVA VDMONI VDGNAM VBIQDV VBIQPK VDLINA VDTEXT VDPNTA VDPOLY VDIQCP VDSTOS C WPSTMV WPSTMO WPSTGN WPSTIV WPSTQP WPSTLN WPSTTX WPSTPT WPSTPY WPSTCP WPSTOS -C -C + C VDIQOS VDSTFC VDSTBC VDSTIN VDSTLS VDSTLW VDSTCS VDAABU VDALOC VDABGL VDAKGL C WPSTIO WPSTFC WPSTBC WPSTIN WPSTLS WPSTLW WPSTCS WPSTBU WPSTLO WPSTBL WPSTKL -C -C + C VDSTLA VDINIT VDFRAM VDTERM VDIQDC VDNWPG VDBELL VDWAIT VDBUFL VDSTCO VDIQCO C WPSTLA WPSTNT WPSTFR WPSTTR WPSTDC WPSTPG WPSTBE WPSTWT WPSTFL WPSTCO WPSTIC -C -C + C VDESCP VDIQES VDIQND VIMOVA VILINA VIPNTA VITEXT VIINIT VITERM VINWPG CDRCOM C WPSTES WPSTIE WPSTID WPSTIM WPSTIL WPSTIP WPSTIX WPSTII WPSTIT WPSTIG CDRCOM -C -C + C VCJOB VCONOD VBERRH VDLOGE CDRWFS CDRRFS CDROFS CDROF3 CDRCFS CDROFF CDROAB C VCJOB WPSTON WPSTER WPSTLE WPSTWF WPSTRF WPSTOF WPSTO3 WPSTCF WPSTFF WPSTAB -C -C + C BGPBUF QMSBUF QMSBU1 DDCBUF H75BUF BTKBUF NMTBUF ONHBUF VBIMBF VBPKG VBDEV C WPSTBF WPSTQM WPSTBF WPSTBF WPSTBF WPSTBF WPSTBF WPSTOH WPSTIB WPSTPK WPSTDV -C -C + C VDIQRS VDSTMP VDSTRS VDSTRV VDBRGB VDFRGB VDPIXL VDPIXI VDRPIX VDRPXI VDRSCL C WPSTQR WPSTMP WPSTRS WPSTRV WPSTBG WPSTFG WPSTPX WPSTPI WPSTRP WPSTRI WPSTRL -C -C + C VDIQCI VBSTMP VCNDCM VCATTR VIFRAM VCCRPS VCESCP DEVCAP VCSCAL VCDDIM VIPOLY C WPSTCI WPST01 WPST02 WPST03 WPST04 WPST05 WPST06 WPST07 WPST08 WPST09 WPST10 -C -C + C VCVECT VBLINA VBVECT VBSTLS PSTBUF C WPST11 WPST12 WPST13 WPST14 WPST15 -C + SUBROUTINE WPST01( IMAP ) GOTO (1,2,3,4,5),IMAP -C + CALL WPSTMP('UNKNOWN') RETURN -C + 1 CALL WPSTMP('1-TO-1') RETURN -C + 2 CALL WPSTMP('REPLICATE') RETURN -C + 3 CALL WPSTMP('VIRTUAL') RETURN -C + 4 CALL WPSTMP('NODISTORT') RETURN -C + 5 CALL WPSTMP('FREEFORM') RETURN -C + END SUBROUTINE WPSTRS(I1,I2) c************************************************************************* @@ -86,23 +77,23 @@ SUBROUTINE WPSTRS(I1,I2) END SUBROUTINE WPSTER(ERRNUM,ERRSEV) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VBERRH -Error Handler. -C + C R.W.Simons -08APR81 C 30SEP81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -ERRNUM = integer error number. C ERRSEV = integer severity code. If > 12, error is C fatal. -C + C CALLS -VDLOGE. -C + C EXIT CONDITIONS - -C + C NARRATIVE -An error will normally cause an error message to C be printed on the error output device and possible C termination of the program, unless a routine VBERRH @@ -112,42 +103,41 @@ SUBROUTINE WPSTER(ERRNUM,ERRSEV) C returning. All versions of VBERRH, whether user- C supplied or default, must STOP on any error severity C greater than 12. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER ERRNUM,ERRSEV -C + C REPORT THE ERROR USING VDLOGE. CALL WPSTLE(ERRNUM,ERRSEV) -C + C CHECK FOR FATAL ERROR. IF(ERRSEV.GT.12) STOP -C + RETURN END SUBROUTINE WPSTGN(NAME) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDGNAM -Name the graphics output file -C -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -NAME = character string; < 80 characters -C + C CALLS -C + C EXIT CONDITIONS -output graphics file is assigned the name NAME -C + C NARRATIVE -This subroutine associates a file name with C the graphics output file (KOUTFL). If this C routine is not called, a system dependent C default name is used. VDGNAM must be called C before VDINIT. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + CHARACTER*(*) NAME INTEGER LENGTH,ISTART,IEND,I LENGTH = MIN(LEN(NAME),132) @@ -179,26 +169,26 @@ SUBROUTINE WPSTGN(NAME) END SUBROUTINE WPSTNT(ASPECT,JUSTIF) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDINIT -Initialize SVDI. -C + C R.W.Simons -08APR81 C 30SEP81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -ASPECT = real ratio of X dimension to Y dimension. C Range >0.0. Default: 0.0 (device dependent). C JUSTIF = integer justification of NDC space on the C device. Range 0-9. Default: 0 (device dependent). -C + C CALLS -CDRJOB, VBERRH, VIINIT. -C + C EXIT CONDITIONS -XNDCMX,YNDCMX = real NDC maximum valid values. C VECTOR = real array of default attribute values (all C device-dependent except VECTOR(4)=0.0). -C + C NARRATIVE -This must be the first SVDI call made. All C attribute values, the color table, and current C position are set to appropriate defaults for the @@ -206,7 +196,7 @@ SUBROUTINE WPSTNT(ASPECT,JUSTIF) C is done. The screen is cleared or paper advanced C if necessary to guarantee a blank view surface for C drawing. -C + C ASPECT specifies the ratio of the X dimension to the C Y dimension. Maximum NDC values (at least one of C which will be 1.0) are computed to give the ASPECT @@ -217,7 +207,7 @@ SUBROUTINE WPSTNT(ASPECT,JUSTIF) C aspect of 1.0. The NDC rectangle is scaled until C one dimension fills the corresponding dimension of C the device. -C + C JUSTIF determines where the rectangle is located on C the device as diagrammed below: C --------- @@ -227,74 +217,74 @@ SUBROUTINE WPSTNT(ASPECT,JUSTIF) C --------- C For example, JUSTIF = 7 indicates NDC space will be C upper left justified on the device. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL ASPECT INTEGER JUSTIF -C + INTEGER*4 MACHIN(3),MACLEN INTEGER*4 KIDSIZ,KJOBID(4),KUSRSZ,KUSRID(4),KSZROU INTEGER*4 KJROUT(4),KSECUR,KJTIME(4),KJDATE(4) COMMON / VCJOB/ KIDSIZ,KJOBID,KUSRSZ,KUSRID,KSZROU, 1 KJROUT,KSECUR,KJTIME,KJDATE,MACHIN,MACLEN -C + C THIS IS JUST A DUMMY ROUTINE WHICH DOES NOTHING BUT CALL VIINIT. C THIS ORGANIZATION FACILITATES ADDING SECURITY MARKINGS TO SVDI. CALL WPSTII(ASPECT,JUSTIF) -C + RETURN END SUBROUTINE WPSTID(XNDC,YNDC) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDIQND -Inquire NDC Space. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -XNDCMX,YNDCMX = real maximum valid NDC values. -C + C CALLS - -C + C EXIT CONDITIONS -XNDC,YNDC = real maximum valid NDC values (XNDCMX, C YNDCMX). -C + C NARRATIVE -Return the maximum NDC values as set to realize the C aspect defined by VDINIT. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL XNDC,YNDC -C + REAL XNDCMX,YNDCMX COMMON /WPST02/ XNDCMX,YNDCMX -C + C RETURN THE MAXIMUM VALID NDC VALUES. XNDC=XNDCMX YNDC=YNDCMX -C + RETURN END SUBROUTINE WPSTIO(ATTARR) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDIQOS -Inquire Output Status (of Attributes). -C + C K.M. ERICKSON -14 NOV 80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -VECTOR = real array of current attribute values. -C + C CALLS - -C + C EXIT CONDITIONS -ATTARR = real array of current attribute value C (VECTOR). -C + C NARRATIVE -Return the current attribute values in ATTARR as C given below. C ATTARR(1)=Foreground Color @@ -304,71 +294,71 @@ SUBROUTINE WPSTIO(ATTARR) C (5)=Line Width C (6)=Character Box Y C (7)=Character Box X -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL ATTARR(7) -C + REAL VECTOR(7) COMMON /WPST03/ VECTOR -C + INTEGER I -C + DO 100 I=1,7 ATTARR(I)=VECTOR(I) 100 CONTINUE -C + RETURN END SUBROUTINE WPSTLN(X,Y) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDLINA -Line Absolute. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -X,Y = real NDC position. -C + C CALLS -VILINA. -C + C EXIT CONDITIONS - -C + C NARRATIVE -Draw a line from current position to absolute NDC C position X,Y and update current position. C Attributes foreground color, intensity, line style, C and line width apply. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL X,Y -C + C THIS IS JUST A DUMMY ROUTINE WHICH DOES NOTHING BUT CALL VILINA. C THIS ORGANIZATION FACILITATES ADDING SECURITY MARKINGS TO SVDI. CALL WPSTIL(X,Y) -C + RETURN END SUBROUTINE WPSTLE(ERRNUM,ERRSEV) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDLOGE -Log Error. -C + C R.W.Simons -08APR81 C K.M.Erickson -8OCT84 - add buffer flush -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -ERRNUM = integer error number. C ERRSEV = integer error severity. -C + C CALLS -CDRTBK, VDBUFL -C + C EXIT CONDITIONS - -C + C NARRATIVE -Report error with message to user and possibly C terminate job depending on severity. Notice that C by judicious use of the error routines (see VBERRH) @@ -377,45 +367,44 @@ SUBROUTINE WPSTLE(ERRNUM,ERRSEV) C occurrences of a particular error, or terminate C if more than 10 errors of a particular severity C occur. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER ERRNUM,ERRSEV -C + INTEGER*4 KWRTFL,KRDFL,KOUTFL,KINFL,KWRDSZ,KBYTEL,KCPW,KBAUD, 1KCOMTP COMMON /CDRCOM/ KWRTFL,KRDFL,KOUTFL,KINFL,KWRDSZ,KBYTEL,KCPW, 1 KBAUD,KCOMTP -C + C flush buffer before we do a write CALL WPSTFL -C + C WRITE THE ERROR TO THE LISTING. WRITE(KWRTFL,10)ERRNUM,ERRSEV 10 FORMAT(' SVDI ERROR NUMBER ',I5,' SEVERITY CODE ',I5) -C + C TRACEBACK. CALL CDRTBK -C + RETURN END SUBROUTINE WPSTMO(ISTATE) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDMONI -Logs Usage Information.. -C -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -ISTATE = 0 - initialization C 1 - new page C 2 - terminate -C + C CALLS -CDRMON -C + C EXIT CONDITIONS - -C + c NARRATIVE -For ISTATE=0, job information is initialized, and C timers are initialized called by VIINIT. C ISTATE=1 will increment a common block page @@ -429,17 +418,16 @@ SUBROUTINE WPSTMO(ISTATE) C Entry point VBDEV has an 8 character parameter C which will set a common block variable specifying C the device being used. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C -C + CHARACTER *8 C1,C2,MDEV,MPKG INTEGER ISTATE,MPAGES SAVE MDEV,MPKG,MPAGES DATA MPKG /' '/ DATA MDEV /' '/ DATA MPAGES /0/ -c + IF(ISTATE.EQ.0) THEN CALL CDRELA(0) ELSEIF (ISTATE.EQ.1) THEN @@ -450,7 +438,7 @@ SUBROUTINE WPSTMO(ISTATE) ENDIF RETURN C Usage Monitoring Information -c + ENTRY WPSTPK (C1) MPKG = C1 RETURN @@ -466,106 +454,106 @@ SUBROUTINE WPSTMO(ISTATE) END SUBROUTINE WPSTMV(X,Y) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDMOVA -Move Absolute. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -X,Y = real NDC position. -C + C CALLS -VIMOVA -C + C EXIT CONDITIONS - -C + C NARRATIVE -Set current position to absolute NDC position X,Y. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL X,Y -C + C THIS IS JUST A DUMMY ROUTINE WHICH DOES NOTHING BUT CALL VIMOVA. C THIS ORGANIZATION FACILITATES ADDING SECURITY MARKINGS TO SVDI. CALL WPSTIM(X,Y) -C + RETURN END SUBROUTINE WPSTPG C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDNWPG -New Page. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS - -C + C CALLS -VINWPG. -C + C EXIT CONDITIONS - -C + C NARRATIVE -Physically advance the medium or clear the screen, C whichever is appropriate. Also flood the screen C with the background color on devices that support C this function. The current position is not changed. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C THIS IS JUST A DUMMY ROUTINE WHICH DOES NOTHING BUT CALL VINWPG. C THIS ORGANIZATION FACILITATES ADDING SECURITY MARKINGS TO SVDI. CALL WPSTIG -C + RETURN END SUBROUTINE WPSTPT(X,Y) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDPNTA -Point Absolute. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -X,Y = real NDC position. -C + C CALLS -VIPNTA. -C + C EXIT CONDITIONS - -C + C NARRATIVE -Set current position to absolute NDC position X,Y C and put a visible point there. Attributes C foreground color and intensity apply. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL X,Y -C + C THIS IS JUST A DUMMY ROUTINE WHICH DOES NOTHING BUT CALL VIPNTA. C THIS ORGANIZATION FACILITATES ADDING SECURITY MARKINGS TO SVDI. CALL WPSTIP(X,Y) -C + RETURN END SUBROUTINE WPSTPY(XARRAY,YARRAY,NPTS) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDPOLY -POLYGON FILL ROUTINE -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS -XARRAY-ARRAY OF X VALUES OF THE POLYGON C YARRAY-CORRESPONDING ARRAY OF Y VALUES C NPTS- NUMBER OF POINTS IN (XARRAY,YARRAY) -C + C CALLS -VIPOLY -C + C EXIT CONDITIONS - -C + C NARRATIVE -The polygon defined by XARRAY,YARRAY will be drawn C and filled (constrained by any limitations of the C physical device -- see below). No checking will be @@ -574,11 +562,11 @@ SUBROUTINE WPSTPY(XARRAY,YARRAY,NPTS) C boundary is drawn using the solid line style. C VDI will close the polygon (i.e. the last point C will be connected to the first). -C + C The level of support for this primitive is device- C dependent. The level of support is categorized C as follows: -C + C Level 0 -- no polygon fill. Only the polygon C boundary is drawn. C Level 1 -- the device fills convex polygons. @@ -591,37 +579,37 @@ SUBROUTINE WPSTPY(XARRAY,YARRAY,NPTS) C is drawn to that point from a point far outside C the polygon, that line intersects the polygon C boundary an odd number of times. -C + C Note that the level of support for a particular device C can be inquired using the function VDIQDC. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER NPTS REAL XARRAY(NPTS),YARRAY(NPTS) -C + C THIS IS JUST A DUMMY ROUTINE WHICH DOES NOTHING BUT CALL VIPOLY. C THIS ORGANIZATION FACILITATES ADDING SECURITY MARKINGS TO SVDI. CALL WPST10(XARRAY,YARRAY,NPTS) -C + RETURN END SUBROUTINE WPSTOS(ATTARR) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDSTOS -Set Output Status (of Attributes). -C + C K.M. ERICKSON -14 NOV 80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -ATTARR = real array of attribute values. -C + C CALLS -VDSTBC,VDSTCS,VDSTFC,VDSTIN,VDSTLS,VDSTLW -C + C EXIT CONDITIONS -VECTOR = real updated attribute values (ATTARR). -C + C NARRATIVE -Set the attribute values from ATTARR as given below. C ATTARR(1)=Foreground Color C (2)=Background Color @@ -629,14 +617,14 @@ SUBROUTINE WPSTOS(ATTARR) C (4)=Line Style C (5)=Line Width C (6)=Character Box Y -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL ATTARR(6) -C + REAL VECTOR(7) COMMON /WPST03/ VECTOR -C + C CALL EACH OF THE INDIVIDUAL ATTRIBUTE SETTING ROUTINES. C CHECK FOR VALIDITY OF INPUT VALUES WILL BE DONE IN EACH INDIVIDUAL C ROUTINE. @@ -646,56 +634,56 @@ SUBROUTINE WPSTOS(ATTARR) CALL WPSTLS(INT(ATTARR(4))) CALL WPSTLW(ATTARR(5)) CALL WPSTCS(ATTARR(6)) -C + RETURN END SUBROUTINE WPSTTR C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDTERM -Terminate SVDI. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS - -C + C CALLS -VITERM. -C + C EXIT CONDITIONS - -C + C NARRATIVE -Terminate the SVDI by flushing buffers, etc. This C should be the last SVDI call made. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C THIS IS JUST A DUMMY ROUTINE WHICH DOES NOTHING BUT CALL VITERM. C THIS ORGANIZATION FACILITATES ADDING SECURITY MARKINGS TO SVDI. CALL WPSTIT -C + RETURN END SUBROUTINE WPSTTX(LENGTH,CHARS) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDTEXT -Text from Array. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -LENGTH = integer number of characters in CHARS. C Range 1-136. C CHARS = integer array of ASCII characters, one C character per array element, right justified. C Range 8,10,32-126. -C + C CALLS -VITEXT. -C + C EXIT CONDITIONS - -C + C NARRATIVE -Draw LENGTH characters in CHARS, starting at C current position and update current position to C the point after the last character box where the @@ -708,229 +696,229 @@ SUBROUTINE WPSTTX(LENGTH,CHARS) C considered reasonable. Attributes foreground color, C background color, intensity, and character size C apply. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER LENGTH,CHARS(136) -C + C THIS IS JUST A DUMMY ROUTINE WHICH DOES NOTHING BUT CALL VITEXT. C THIS ORGANIZATION FACILITATES ADDING SECURITY NARKINGS TO SVDI. CALL WPSTIX(LENGTH,CHARS) -C + RETURN END SUBROUTINE WPSTFR(ITYPE) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDFRAM - Draw header or trailer frame -C + C P. Watterberg - 27 Aug 81 -C + C ENVIRONMENT -Computer-independent, system-independent, FORTRAN 77 -C + C ENTRY CONDITIONS - ITYPE = 0 for header frame C = 1 for trailer frame -C + C CALLS - VIFRAM -C + C EXIT CONDITIONS - -C + C NARRATIVE - Calls vifram to get time and date from the c system via the computer-dependent routine CDRTOD(entry c point in CDRJOB) and writes it on an identification frame. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER ITYPE -C + CALL WPST04(ITYPE) RETURN END SUBROUTINE WPST04(ITYPE) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VIFRAM - Draw header or trailer frame -C + C P. Watterberg - 27 Aug 81 -C + C ENVIRONMENT -Computer-independent, system-independent, FORTRAN 77 -C + C ENTRY CONDITIONS - ITYPE = 0 for header frame C = 1 for trailer frame -C + C CALLS - -C + C EXIT CONDITIONS - -C + C NARRATIVE -NULL ROUTINE -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER ITYPE -C + RETURN END SUBROUTINE WPSTBU(BTNNUM) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDAABU -Await Any Button. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Batch Devices. -C + C ENTRY CONDITIONS - -C + C CALLS - -C + C EXIT CONDITIONS -BTNNUM = integer number of the button pressed. C Range 1 to a device dependent maximum which must be C at least 8. -C + C NARRATIVE -When a button has been pressed, its integer button C number is returned in BTNNUM. This function flushes C the button buffer, if any. This function flushes C the output buffers before doing input. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER BTNNUM -C + INTEGER*4 KWRTFL,KRDFL,KOUTFL,KINFL,KWRDSZ,KBYTEL,KCPW,KBAUD, 1KCOMTP COMMON /CDRCOM/ KWRTFL,KRDFL,KOUTFL,KINFL,KWRDSZ,KBYTEL,KCPW, 1 KBAUD,KCOMTP -C + C BATCH DEVICES DON'T NEED TO FLUSH BUFFERS. -C + C READ A RECORD FROM COMPUTER DEPENDENT FILE KINFL IN I5 FORMAT. READ(KINFL,10) BTNNUM 10 FORMAT(I5) -C + C CHECK FOR VALID BTNNUM. C RANGE FOR BATCH DEVICES IS 1-99999. IF OUT OF RANGE, MAP IT BACK IN: C MAPPING (-1)-(-9999) TO 1-9999 AND MAPPING 0 TO 10000. IF(BTNNUM.LT.0) BTNNUM=-BTNNUM IF(BTNNUM.EQ.0) BTNNUM=10000 -C + RETURN END SUBROUTINE WPSTBL(BTNNUM,X,Y) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDABGL -Await Button, Get Locator. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Batch Devices. -C + C ENTRY CONDITIONS - -C + C CALLS - -C + C EXIT CONDITIONS -BTNNUM = integer number of the button pressed. C Range 1 to a device dependent maximum that must be C at least 8. C X,Y = real NDC position of the locator. -C + C NARRATIVE -Wait until a button is hit, then return the number C of the button in BTNNUM and the NDC value of the C locator in X,Y. This function flushes the output C buffers before doing input. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL X,Y INTEGER BTNNUM -C + INTEGER*4 KWRTFL,KRDFL,KOUTFL,KINFL,KWRDSZ,KBYTEL,KCPW,KBAUD, 1KCOMTP COMMON /CDRCOM/ KWRTFL,KRDFL,KOUTFL,KINFL,KWRDSZ,KBYTEL,KCPW, 1 KBAUD,KCOMTP -C + C BATCH DEVICES DON'T NEED TO FLUSH BUFFERS. -C + C READ A RECORD FROM COMPUTER DEPENDENT FILE KINFL IN I5,2F10.7 FORMAT. READ(KINFL,10) BTNNUM,X,Y 10 FORMAT(I5,2F10.7) -C + C CHECK FOR VALID BTNNUM. C RANGE FOR BATCH DEVICES IS 1-99999. IF OUT OF RANGE, MAP IT BACK IN: C MAPPING (-1)-(-9999) TO 1-9999 AND MAPPING 0 TO 10000. IF(BTNNUM.LT.0) BTNNUM=-BTNNUM IF(BTNNUM.EQ.0) BTNNUM=10000 -C + RETURN END SUBROUTINE WPSTKL(CHAR,X,Y) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDAKGL -Await Keyboard, Get Locator. -C + C R.W.SIMONS -02DEC80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Batch Devices. -C + C ENTRY CONDITIONS - -C + C CALLS - -C + C EXIT CONDITIONS -CHAR = integer ASCII character input from the C keyboard, right-justified, zero fill. Range 32-126. C X,Y = real NDC position of the locator. -C + C NARRATIVE -Wait until a key is hit, then return the character C entered in CHAR and the NDC value of the locator C in X,Y. If the character entered does not fall in C the range 32-126, a blank(32) is returned in CHAR. C This function flushes the output buffers before C doing input. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL X,Y INTEGER CHAR -C + INTEGER IN,CHR -C + INTEGER*4 KWRTFL,KRDFL,KOUTFL,KINFL,KWRDSZ,KBYTEL,KCPW,KBAUD, 1KCOMTP COMMON /CDRCOM/ KWRTFL,KRDFL,KOUTFL,KINFL,KWRDSZ,KBYTEL,KCPW, 1 KBAUD,KCOMTP -C + C BATCH DEVICES DON'T NEED TO FLUSH BUFFERS. -C + C READ A CHARACTER AND AN X,Y POSITION FROM COMPUTER DEPENDENT FILE C KINFL WITH FORMAT A1,2F10.7. READ(KINFL,10) CHR,X,Y 10 FORMAT(A1,2F10.7) -C + C CONVERT CHARACTER TO INTEGER ASCII AND CHECK FOR VALID RANGE. CALL CDR1CH(1,CHR,IN) CALL CDRCVT(IN,CHAR) IF(CHAR.LT.32.OR.CHAR.GT.126) CHAR=32 -C + RETURN END SUBROUTINE WPSTLO(X,Y) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDALOC -Await Locator. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Batch Devices. -C + C ENTRY CONDITIONS - -C + C CALLS - -C + C EXIT CONDITIONS -X,Y = real NDC position of the locator. -C + C NARRATIVE -Wait until the locator is positioned, then return C the NDC value of the locator in X,Y. The fact that C the locator is positioned can be signaled in a @@ -941,153 +929,153 @@ SUBROUTINE WPSTLO(X,Y) C function, as only the locator position is returned. C This function flushes the output buffers before C doing input. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL X,Y -C + INTEGER*4 KWRTFL,KRDFL,KOUTFL,KINFL,KWRDSZ,KBYTEL,KCPW,KBAUD, 1KCOMTP COMMON /CDRCOM/ KWRTFL,KRDFL,KOUTFL,KINFL,KWRDSZ,KBYTEL,KCPW, 1 KBAUD,KCOMTP -C + C BATCH DEVICES DON'T NEED TO FLUSH BUFFERS. -C + C READ AN X,Y POSITION FROM COMPUTER DEPENDENT FILE C KINFL WITH FORMAT 2F10.7. READ(KINFL,10) X,Y 10 FORMAT(2F10.7) -C + RETURN END SUBROUTINE WPSTBE C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDBELL -Ring Bell -C + C R.W.SIMONS -02DEC80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Batch Devices. -C + C ENTRY CONDITIONS - -C + C CALLS - -C + C EXIT CONDITIONS - -C + C NARRATIVE -Ring user's bell to get his attention. This C function is ignored by batch devices. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C THIS FUNCTION IS IGNORED BY BATCH DEVICES. -C + RETURN END SUBROUTINE WPSTFL C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDBUFL -Buffer Flush. -C + C R.W.Simons -19DEC80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Batch Devices. -C + C ENTRY CONDITIONS - -C + C CALLS - -C + C EXIT CONDITIONS - -C + C NARRATIVE -Assure that the picture is up-to-date by flushing C buffers if necessary. Also prepare the device to C operate in alphanumeric (as opposed to graphic) C mode. This is necessary on some devices so that C alphanumeric data from FORTRAN I/O won't be C misinterpreted as graphic data. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C THIS FUNCTION IS IGNORED BY BATCH DEVICES. -C + RETURN END SUBROUTINE WPSTLA(LOCX,LOCY) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDSTLA -Set Initial Locator Position. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Batch Devices. -C + C ENTRY CONDITIONS -LOCX,LOCY = real NDC position that the locator is C initilaized to. -C + C CALLS - -C + C EXIT CONDITIONS - -C + C NARRATIVE -Set the initial locator position (light pen tracking C cross, for example) each time this function is C called. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL LOCX,LOCY -C + C BATCH DEVICES IGNORE THIS FUNCTION. -C + RETURN END SUBROUTINE WPSTWT C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDWAIT -Wait for User. -C + C R.W.SIMONS -02DEC80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Batch Devices. -C + C ENTRY CONDITIONS - -C + C CALLS - -C + C EXIT CONDITIONS - -C + C NARRATIVE -Wait for the user to view the screen and signal he C is done, normally by hitting any key. This function C flushes the output buffers before doing input. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C BATCH DEVICES IGNORE THIS COMMAND. -C + RETURN END SUBROUTINE WPSTIC(NUM,INDEX,CLRARY,CLRMOD) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDIQCO -Inquire Color Table. -C + C R.W.Simons -08APR81 C H. S. LAUSON 29MAY86 - changed for current HLS interpretation -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Black and White Devices. (LXY, HC1, ALP) -C + C ENTRY CONDITIONS -NUM = integer number of color indexes to inquire. C Range 1-256. C INDEX = integer array of indexes to inquire. Range C 0-255. C CLRMOD = integer color model to be used. Range 0,1. -C + C CALLS -VBERRH -C + C EXIT CONDITIONS -CLRARY = real array of 3 by NUM elements returning C the values of the components of the indexes inquired. C Range for RGB: red 0.0-1.0 @@ -1096,7 +1084,7 @@ SUBROUTINE WPSTIC(NUM,INDEX,CLRARY,CLRMOD) C Range for HLS: hue 0.0-360.0 C lightness 0.0-1.0 C saturation 0.0-1.0 -C + C NARRATIVE -Inquire one or more color table entries. NUM and C INDEX specify how many and which indexes are being C inquired. CLRMOD specifies which color model @@ -1105,24 +1093,24 @@ SUBROUTINE WPSTIC(NUM,INDEX,CLRARY,CLRMOD) C support a color table index specified will C return -1.0 in the first element of the CLRARY value C for that index. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER NUM,INDEX(NUM),CLRMOD REAL CLRARY(3,NUM) -C + C CHECK FOR VALID NUM. IF(NUM.LT.1.OR.NUM.GT.256) THEN CALL WPSTER(723,5) GOTO 999 END IF -C + C CHECK FOR VALID CLRMOD. IF(CLRMOD.NE.0.AND.CLRMOD.NE.1) THEN CALL WPSTER(725,5) GOTO 999 END IF -C + C CHECK FOR VALID INDEXES. DO 100 I=1,NUM INDEXN=INDEX(I) @@ -1154,57 +1142,57 @@ SUBROUTINE WPSTIC(NUM,INDEX,CLRARY,CLRMOD) CLRARY(1,I)=-1.0 END IF 100 CONTINUE -C + 999 RETURN END SUBROUTINE WPSTCP(X,Y) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDIQCP -Inquire Where Current Position Is. -C + C R.W.Simons -02DEC80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Devices that support a software CP. C (AP5,GER,H50,HC1,HCB,HPP,I10,I30,LXY,QCR,QMS,XYN) -C + C ENTRY CONDITIONS - -C + C CALLS - -C + C EXIT CONDITIONS -X,Y = real NDC position. -C + C NARRATIVE -Return the value of current position. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL XCP,YCP COMMON /WPST05/ XCP,YCP -C + C ASSIGN THE CP TO X,Y. X=XCP Y=YCP -C + RETURN END SUBROUTINE WPSTBC(COLOR) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDSTBC -Set Background Color. -C + C R.W.Simons -05DEC80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Devices with a constant white background. (LXY, C HC1, ALP) -C + C ENTRY CONDITIONS -COLOR = integer color table index. Range 0-255. C Default: device dependent, in range 0-7. -C + C CALLS -VBERRH -C + C EXIT CONDITIONS -VECTOR(2) = real updated background color (COLOR). -C + C NARRATIVE -Set the background color for following VDNWPG or C TEXT primitives for devices supporting these C features. For example, many raster devices support @@ -1215,35 +1203,35 @@ SUBROUTINE WPSTBC(COLOR) C dependent value in the range 0-7. C If an unsupported value is specified, set to C default. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER COLOR -C + REAL VECTOR(7) COMMON /WPST03/ VECTOR -C + C CHECK FOR VALID COLOR. IF(COLOR.LT.0.OR.COLOR.GT.255) THEN CALL WPSTER(724,5) GOTO 999 END IF -C + C ONLY THE SINGLE BACKGROUND COLOR 7 (WHITE) IS SUPPORTED, C SO NO ACTION IS NECESSARY. -C + 999 RETURN END SUBROUTINE WPSTCO(NUM,INDEX,CLRARY,CLRMOD) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDSTCO -Set Color Table. -C + C R.W.SIMONS -02DEC80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Black and White Devices. (LXY, HC1, ALP) -C + C ENTRY CONDITIONS -NUM = integer number of color indexes to be set. C Range 1-256. C INDEX = integer array of indexes to be set. Range @@ -1269,11 +1257,11 @@ SUBROUTINE WPSTCO(NUM,INDEX,CLRARY,CLRMOD) C 7 white 1.,1.,1. C CLRMOD = integer color model being used. Range 0,1. C Default: 0 (RGB). -C + C CALLS -VBERRH -C + C EXIT CONDITIONS - -C + C NARRATIVE -Set one or more color table entries. This is a C dynamic setting, if the device will support it. C "Dynamic" neans that primitives which have already @@ -1296,24 +1284,24 @@ SUBROUTINE WPSTCO(NUM,INDEX,CLRARY,CLRMOD) C All devices must support at least a single device C dependent INDEX value in the range 0-7. If an C unsupported value is specified, it should be ignored. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER NUM,INDEX(NUM),CLRMOD REAL CLRARY(3,NUM) -C + C CHECK FOR VALID NUM. IF(NUM.LT.1.OR.NUM.GT.256) THEN CALL WPSTER(723,5) GOTO 999 END IF -C + C CHECK FOR VALID CLRMOD. IF(CLRMOD.NE.0.AND.CLRMOD.NE.1) THEN CALL WPSTER(725,5) GOTO 999 END IF -C + C CHECK FOR VALID INDEXES. DO 100 I=1,NUM INDEXN=INDEX(I) @@ -1332,7 +1320,7 @@ SUBROUTINE WPSTCO(NUM,INDEX,CLRARY,CLRMOD) CALL WPSTER(727,5) GOTO 100 END IF -C + C ONLY TWO INDEXES ARE SUPPORTED: C 0 WHICH IS THE DEFAULT FOREGROUND COLOR AND MUST ALWAYS REMAIN C BLACK (0.0, 0.0, 0.0) @@ -1346,7 +1334,7 @@ SUBROUTINE WPSTCO(NUM,INDEX,CLRARY,CLRMOD) CALL WPSTER(727,5) GOTO 100 END IF -C + C ONLY TWO INDEXES ARE SUPPORTED: C 0 WHICH IS THE DEFAULT FOREGROUND COLOR AND MUST ALWAYS REMAIN C BLACK (0.0, 0.0, 0.0) @@ -1355,27 +1343,27 @@ SUBROUTINE WPSTCO(NUM,INDEX,CLRARY,CLRMOD) C THEREFORE, NO ACTION IS NECESSARY. END IF 100 CONTINUE -C + 999 RETURN END SUBROUTINE WPSTFC(COLOR) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDSTFC -Set Foreground Color. -C + C R.W.Simons -05DEC80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Devices with a constant black foreground. (LXY, C HC1) -C + C ENTRY CONDITIONS -COLOR = integer color table index . Range 0-255. C Default is device dependent, in range 0-7. -C + C CALLS -VBERRH -C + C EXIT CONDITIONS -VECTOR(1) = real updated foreground color (COLOR). -C + C NARRATIVE -Set the foreground color index, i.e., the color C table index used for drawing future primitives. C Color is an integer from 0-255 which is used as an @@ -1384,42 +1372,42 @@ SUBROUTINE WPSTFC(COLOR) C dependent value in the range 0-7. C If an unsupported value is specified, set to C default. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER COLOR -C + REAL VECTOR(7) COMMON /WPST03/ VECTOR -C + C CHECK FOR VALID COLOR. IF(COLOR.LT.0.OR.COLOR.GT.255) THEN CALL WPSTER(724,5) GOTO 999 END IF -C + C ONLY THE SINGLE FOREGROUND COLOR 0 (BLACK) IS SUPPORTED, C SO NO ACTION IS NECESSARY. -C + 999 RETURN END SUBROUTINE WPSTIN(INTEN) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDSTIN -Set Intensity. -C + C R.W.Simons -05DEC80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Single Intensity Devices. (LXY, HC1) -C + C ENTRY CONDITIONS -INTEN = real intensity of the image of an output C primitive. Range 0.-1. Default: device dependent. -C + C CALLS - -C + C EXIT CONDITIONS -VECTOR(3) = real updated intensity (INTEN). -C + C NARRATIVE -Set the intensity value indicated for future C primitives. Intensity is a real value between 0 C (not visible) and 1 (maximum). Intensities are @@ -1427,39 +1415,39 @@ SUBROUTINE WPSTIN(INTEN) C All devices must support at least a single value: C 1.0. If an unsupported value is specified, set to C the closest supported intensity. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL INTEN -C + REAL VECTOR(7) COMMON /WPST03/ VECTOR -C + C CHECK FOR VALID INTEN. IF(INTEN.LT.0.0.OR.INTEN.GT.1.0) THEN CALL WPSTER(401,5) GOTO 999 END IF -C + C ONLY THE SINGLE INTENSITY 1.0 (MAXIMUM) IS SUPPORTED, C SO NO ACTION IS NECESSARY. -C + 999 RETURN END SUBROUTINE WPSTDC(INDEX,VALUE) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDIQDC -Inquire Device Capabilities. -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS -INDEX = integer capability number. Range 1-33. -C + C CALLS - -C + C EXIT CONDITIONS -VALUE = real value of the capability indicated by C INDEX. -C + C NARRATIVE -Return values of various device capabilities. INDEX C is the integer capability number (as given below), C and the real value is returned in VALUE. @@ -1593,9 +1581,9 @@ SUBROUTINE WPSTDC(INDEX,VALUE) C 33. Device pixel aspect - the ratio of the spacing of device C pixels in x divided by the spacing in y (1 for square C pixels) -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER INDEX REAL VALUE C ESCAPE FLAGS @@ -1603,7 +1591,7 @@ SUBROUTINE WPSTDC(INDEX,VALUE) C DEFAULT; COMPLETE FILL WITH BORDER. PLC. COMMON /WPST06/ PGFORM,PATNO,BORDER INTEGER PGFORM,PATNO,BORDER -C + C INITIALIZE THE DEVICE CAPABILITIES VECTOR. COMMON /WPST07/DEV REAL DEV(33) @@ -1640,41 +1628,41 @@ SUBROUTINE WPSTDC(INDEX,VALUE) DEV(31) = 750. DEV(32) = 0. DEV(33) = 1. -C + C CHECK FOR VALID INDEX. IF(INDEX.LT.1.OR.INDEX.GT.33) THEN CALL WPSTER(726,5) GOTO 999 END IF -C + C RETURN INDEXED VALUE. VALUE=DEV(INDEX) -C + 999 RETURN END SUBROUTINE WPSTII(ASPECT,JUSTIF) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VIINIT -Initialize SVDI. postscript device -C + C D.L. CAMPBELL -1-DEC-1986 C J.P. LONG -9-NOV-1987 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C (postscript) -C + C ENTRY CONDITIONS -ASPECT = real ratio of X dimension to Y dimension. C Range >0.0. Default: 0. (device dependent). C JUSTIF = integer justification of NDC space on the C device. Range 0-9. Default: 0 (device dependent.) -C + C CALLS -VBERRH,VDSTCS,VDSTLW,VIMOVA -C + C EXIT CONDITIONS -XNDCMX,YNDCMX = real NDC maximum valid values(as C constrained by ASPECT). C VECTOR = real array of attribute values(all device C dependent except VECTOR(4)=0.0). -C + C NARRATIVE -This must be the first SVDI call made. All C attribute values, the color table, and current C position are set to appropriate defaults for the @@ -1682,7 +1670,7 @@ SUBROUTINE WPSTII(ASPECT,JUSTIF) C is done. The screen is cleared or paper advanced C if necessary to guarantee a blank view surface for C drawing on. -C + C ASPECT specifies the ratio of the X dimension to the C Y dimension . Maximum NDC values (at least one of C which will be 1.0) are computed to give the ASPECT @@ -1693,7 +1681,7 @@ SUBROUTINE WPSTII(ASPECT,JUSTIF) C aspect of 1.0. The NDC rectangle is scaled until C one dimension fills the corresponding dimension of C the device. -C + C JUSTIF determines where the rectangle is located on C the device as diagrammed below: C --------- @@ -1703,12 +1691,12 @@ SUBROUTINE WPSTII(ASPECT,JUSTIF) C --------- C For example, JUSTIF = 7 indicates NDC space will be C upper left justified on the device. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL ASPECT INTEGER JUSTIF -C + REAL XNDCMX,YNDCMX COMMON /WPST02/ XNDCMX,YNDCMX REAL VECTOR(7) @@ -1731,7 +1719,7 @@ SUBROUTINE WPSTII(ASPECT,JUSTIF) INTEGER*4 KJROUT(4),KSECUR,KJTIME(4),KJDATE(4) COMMON / VCJOB/ KIDSIZ,KJOBID,KUSRSZ,KUSRID,KSZROU, 1 KJROUT,KSECUR,KJTIME,KJDATE,MACHIN,MACLEN -C + COMMON /WPST07/ DEV REAL DEV(33) C ESCAPE FLAGS @@ -1740,8 +1728,7 @@ SUBROUTINE WPSTII(ASPECT,JUSTIF) COMMON /WPST06/ PGFORM,PATNO,BORDER INTEGER PGFORM,PATNO,BORDER CHARACTER XCOORD*5,YCOORD*5 -C -C + C SET DEFAULT ATTRIBUTE VALUES. ALL ARE DEVICE DEPENDENT EXCEPT C VECTOR(4)=0.0. C VECTOR(1)=FOREGROUND COLOR - BLACK @@ -1751,8 +1738,7 @@ SUBROUTINE WPSTII(ASPECT,JUSTIF) C (5)=LINE WIDTH - ABOUT 1/72 INCHES C (6)=CHARACTER BOX Y - ABOUT 1/10 INCHES C (7)=CHARACTER BOX X - 5/7 OF BOX-Y -C -C + IVECT=0 VECTOR(1) = 0. VECTOR(2) = 7. @@ -1769,21 +1755,21 @@ SUBROUTINE WPSTII(ASPECT,JUSTIF) C PROTECT INPUT PARAMETERS FROM BEING CHANGED. ASPEC1=ASPECT JUSTI1=JUSTIF -C + C CHECK FOR VALID ASPECT. IF(ASPECT.LT.0.0) THEN CALL VBERRH(721,5), C AND USE DEFAULT ASPECT. IF(ASPECT.LT.0.0) THEN CALL WPSTER(721,5) ASPEC1=0.0 END IF -C + C CHECK FOR VALID JUSTIF. IF(JUSTIF.LT.0 .OR. JUSTIF.GT.9) THEN C CALL VBERRH(720,5), AND USE DEFAULT JUSTIF. IF(JUSTIF.LT.0.OR.JUSTIF.GT.9) THEN CALL WPSTER(720,5) JUSTI1=0 END IF -C + C SCALE NDC UNITS TO DEVICE UNITS. C FOR QMS, THE PHYSICAL PLOT SURFACE IS XINCH X YINCH (10.x7.5). C DEVICE COORDINATES ARE KEPT IN 1/723 INCH TO GAIN SIMPLICITY @@ -1810,13 +1796,13 @@ SUBROUTINE WPSTII(ASPECT,JUSTIF) XUNITS=XINCH*723. YUNITS=YINCH*723. DASPEC=XUNITS/YUNITS -C + C DEFAULT ASPECT = 1., DEFAULT JUSTIF = 1. IF(ASPEC1.EQ.0.) ASPEC1=DASPEC IF(JUSTI1.EQ.0) JUSTI1=1 -C + IF(ASPEC1.GE.DASPEC) THEN -C + C THEN X DIMENSION IS FILLED. XDEVIC=XUNITS YDEVIC=XUNITS/ASPEC1 @@ -1830,7 +1816,7 @@ SUBROUTINE WPSTII(ASPECT,JUSTIF) YPAD=YUNITS-YDEVIC END IF ELSE -C + C ELSE Y DIMENSION IS FILLED. XDEVIC=YUNITS*ASPEC1 YDEVIC=YUNITS @@ -1844,7 +1830,7 @@ SUBROUTINE WPSTII(ASPECT,JUSTIF) XPAD=0 END IF END IF -C + C FIGURE MAXIMUM NDC VALUES XNDCMX AND YNDCMX. IF(ASPEC1.GE.DASPEC) THEN XNDCMX=AMIN1(1.,ASPEC1) @@ -1853,7 +1839,7 @@ SUBROUTINE WPSTII(ASPECT,JUSTIF) XNDCMX=ASPEC1 YNDCMX=1. END IF -C + C SET SCALE FACTORS FOR NDC-TO-DEVICE MAPPING. XSCALE=DBLE(XDEVIC)/XNDCMX YSCALE=DBLE(YDEVIC)/YNDCMX @@ -1864,14 +1850,14 @@ SUBROUTINE WPSTII(ASPECT,JUSTIF) XPAD = XPAD+280. YPAD = YPAD-180. ENDIF -C + C SET UP MONITORING INFORMATION CALL WPSTDV('C PST ') CALL WPSTMO(0) -C + C OPEN OUTPUT FILE CALL WPSTOF(KOUTFL) -C + C INITIALIZE THE QMS PS JET CALL WPST15(2,'%!') CALL WPST15(1,CHAR(13)) @@ -1904,7 +1890,7 @@ SUBROUTINE WPSTII(ASPECT,JUSTIF) c define the postscript current position CALL WPST15(35,'/p {showpage} def 1 setlinecap v o ') CALL WPST13(0,XCP,YCP) -C + C INIT LINE WIDTH,CHARACTER SIZE CALL WPSTLW(VECTOR(5)) CALL WPSTCS(VECTOR(6)) @@ -1912,29 +1898,29 @@ SUBROUTINE WPSTII(ASPECT,JUSTIF) END SUBROUTINE WPSTIT C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VITERM -TERMINATE. -C + C D.L. CAMPBELL -1-DEC-1986 C J.P. LONG -9-NOV-1987 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS - -C + C CALLS - -C + C EXIT CONDITIONS - -C + C NARRATIVE -Terminate graphics device. Close output file. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER*4 KWRTFL,KRDFL,KOUTFL,KINFL,KWRDSZ,KBYTEL,KCPW,KBAUD, 1KCOMTP COMMON /CDRCOM/ KWRTFL,KRDFL,KOUTFL,KINFL,KWRDSZ,KBYTEL,KCPW, 1 KBAUD,KCOMTP -c + c put out the last page and restore postscript environment so c nothing is left on the stack CALL WPSTIG @@ -1944,78 +1930,77 @@ SUBROUTINE WPSTIT C CLOSE OUTPUT FILE CALL WPSTCF(KOUTFL,1) CALL WPSTMO(2) -C + RETURN END SUBROUTINE WPSTIM(X,Y) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VIMOVA -Move Absolute. -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS -X,Y = real NDC position. -C + C CALLS - -C + C EXIT CONDITIONS -XCP,YCP = real updated current position. (X,Y) -C + C NARRATIVE -Set current position to absolute NDC position X,Y. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL X,Y -C -C + C move CALL WPST13(0,X,Y) -c + RETURN END SUBROUTINE WPSTIP(X,Y) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VIPNTA -Point Absolute. -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS -X,Y = real NDC position. -C + C CALLS -VIMOVA,VILINA -C + C EXIT CONDITIONS - -C + C NARRATIVE -Set current position to absolute NDC position X,Y C and put a visible point there. Attributes C foreground color and intensity apply. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL X,Y -C + CALL WPSTIM(X,Y) CALL WPSTIL(X,Y) -C + RETURN END SUBROUTINE WPST10(XARRAY,YARRAY,NPTS) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VIPOLY -POLYGON FILL ROUTINE -C + C D.L. CAMPBELL -1-DEC-1986 C J.P. LONG -9-NOV-1987 -C + C ENVIRONMENT -Fortran77, QMS -C + C ENTRY CONDITIONS -XARRAY-ARRAY OF X VALUES OF THE POLYGON C YARRAY-CORRESPONDING ARRAY OF Y VALUES C NPTS- NUMBER OF POINTS IN (XARRAY,YARRAY) -C + C CALLS - -C + C EXIT CONDITIONS - -C + C NARRATIVE -The polygon defined by XARRAY,YARRAY will be drawn C and filled (constrained by any limitations of the C physical device -- see below). No checking will be @@ -2024,11 +2009,11 @@ SUBROUTINE WPST10(XARRAY,YARRAY,NPTS) C boundary is drawn using the solid line style. C VDI will close the polygon (i.e. the last point C will be connected to the first). -C + C The level of support for this primitive is device- C dependent. The level of support is categorized C as follows: -C + C Level 0 -- no polygon fill. Only the polygon C boundary is drawn. C Level 1 -- the device fills convex polygons. @@ -2041,18 +2026,18 @@ SUBROUTINE WPST10(XARRAY,YARRAY,NPTS) C is drawn to that point from a point far outside C the polygon, that line intersects the polygon C boundary an odd number of times. -C + C Note that the level of support for a particular device C can be inquired using the function VDIQDC. -C + ******************************************************************************** -C + C The level for this device is level 2. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL XARRAY(NPTS),YARRAY(NPTS) -C + c ESCAPE FLAGS C PATNO AND BORDER USED BY VIPOLY FOR PATTERN FILL AND BORDER ON/OFF. DEFAULT C COMPLETE FILL AND BORDER ON @@ -2063,38 +2048,38 @@ SUBROUTINE WPST10(XARRAY,YARRAY,NPTS) COMMON /WPST11/ IVECT,COORD CHARACTER COORD*20 INTEGER IVECT -c + C CHECK FOR VALID N IF (NPTS.LT.1 .OR. NPTS.GT.1490) THEN CALL WPSTER(802,5) GO TO 999 END IF -C + C IF A SET OF VECTORS WAS IN PROCESS, ISSUE STROKE COMMAND TO DRAW THEM C Start a new path. -C + CALL WPST15(2,'s ') IVECT=0 -C + CALL WPST15(2,'r ') CALL WPST15(0,' ') CALL WPST15(4,'v o ') CALL WPSTLW(VECTOR(5)) CALL WPSTCS(VECTOR(6)) -C + C DRAW POLYGON VECTORS -C + C MOVE TO FIRST POINT CALL WPSTMV(XARRAY(1),YARRAY(1)) -C + C CALL VDLINA TO DRAW POINTS FROM 1ST POINT TO NTH POINT DO 100 I=2,NPTS CALL WPSTLN(XARRAY(I),YARRAY(I)) 100 CONTINUE -C + C THEN DRAW A LINE TO THE FIRST POINT TO CLOSE THE POLYGON CALL WPSTLN(XARRAY(1),YARRAY(1)) -c + C CLOSE THE POLYGON, GRAPHICS SAVE, FILL IT, GRAPHICS RESTORE, STROKE C TO PROVIDE THE SAME FILLED AREA AS IF IT WERE FILLED WITH VECTORS C THEN RESTORE AND SAVE POSTSCRIPT ENVIRONMENT TO AVOID INPUT BUFFER OVERFLOW @@ -2103,82 +2088,82 @@ SUBROUTINE WPST10(XARRAY,YARRAY,NPTS) CALL WPST15(4,'v o ') CALL WPSTLW(VECTOR(5)) CALL WPSTCS(VECTOR(6)) -C + C INIT THE CURRENT POSITION WITHIN POSTSCRIPT CALL WPSTMV(XARRAY(NPTS),YARRAY(NPTS)) IVECT=0 -C + 999 RETURN END SUBROUTINE WPSTIG C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VINWPG -New Page. -C + C D.L. CAMPBELL -1-DEC-1986 C J.P. LONG -9-NOV-1987 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS - -C + C CALLS - -C + C EXIT CONDITIONS - -C + C NARRATIVE -Physically advance the medium or clear the screen, C whichever is appropriate. Also flood the screen C with the background color on devices that support C this. The current position is not changed. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + COMMON /WPST11/ IVECT,COORD CHARACTER COORD*20 INTEGER IVECT REAL VECTOR(7) COMMON /WPST03/ VECTOR -C + c stroke the path in case there are any vector and show text CALL WPST15(2,'s ') IVECT=0 -c + c showpage and restore postscript environment to avoid buffer overflow c flush buffer because save and restore won't work back-to-back -c + CALL WPST15(4,'p r ') CALL WPST15(0,' ') CALL WPST15(4,'v o ') CALL WPSTLW(VECTOR(5)) CALL WPSTCS(VECTOR(6)) CALL WPSTMO(1) -C + RETURN END SUBROUTINE WPSTES(ESCPCD,N,ARGS) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDESCP -Escape Code Routine. -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS -ESCPCD = integer escape function code. C N = integer number of arguments in ARG. RANGE >=0. C ARGS = real array of arguments for the escape C function specified. -C + C CALLS - -C + C EXIT CONDITIONS - -C + C NARRATIVE -Invoke the nonstandard, device-dependent function C ESCPCD. N is the number of arguments used by this C function and ARGS is a real array containing those C arguments. Unsupported values of ESCPCD are C ignored, not causing an error. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -c + INTEGER ESCPCD,N REAL ARGS(*) INTEGER*4 KWRTFL,KRDFL,KOUTFL,KINFL,KWRDSZ,KBYTEL,KCPW,KBAUD, @@ -2189,19 +2174,18 @@ SUBROUTINE WPSTES(ESCPCD,N,ARGS) COMMON /WPST08/ XSCALE,YSCALE INTEGER XPAD,YPAD,XDEVIC,YDEVIC COMMON /WPST09/ XPAD,YPAD,XDEVIC,YDEVIC -c + C USED BY VIPOLY FOR PATTERN FILL AND BORDER ON/OFF. DEFAULT COMPLETE FILL C AND BORDER ON. PLC. COMMON/WPST06/PGFORM,PATNO,BORDER INTEGER PGFORM,PATNO,BORDER -C + C CHECK FOR VALID N. IF(N.LT.0) THEN CALL WPSTER(802,5) GOTO 999 END IF -c -C + C 2100 - PAGE FORMAT (0=LANDSCAPE,1=PORTRAIT) IF (ESCPCD.EQ.2100) THEN IF (ARGS(1).EQ.0) THEN @@ -2210,55 +2194,52 @@ SUBROUTINE WPSTES(ESCPCD,N,ARGS) PGFORM=1 ENDIF ENDIF -C + 999 RETURN END SUBROUTINE WPSTIL (X,Y) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VILINA -C + C D.L. CAMPBELL -1-DEC-1986 C J.P. LONG -9-NOV-1987 -C + C ENVIRONMENT -DEVICE DEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS -X,Y REAL NDC COORDINATES -C + C CALLS - -C + C EXIT CONDITIONS -CURRENT POSITION IS SET -C -C + C NARRATIVE C LINE-DRAW A LINE FROM CP TO ABSOLUTE NDC POSITION X,Y C AND UPDATE CP . ATTRIBUTES COLOR,INTEN,LINSTY AND C LINWTH APPLY. -C -C + C OTHER VARIABLES: C XCP,YCP-NDC COORDINATES C*************************************************************************** -C + REAL X,Y -C + C draw ENTRY WPST12(X,Y) CALL WPST13(1,X,Y) -c + RETURN END -c -c + SUBROUTINE WPST13(IPEN,X,Y) c**************************************************** c vbvect - do move or draw to x,y (depending on ipen) -c + c ipen = 0 for move, 1 for draw c x,y = NDC coordinates to be moved/drawn to -c + c****************************************************** -c + REAL X,Y,XOFF,YOFF CHARACTER CTEMP*20,XCOORD*5,YCOORD*5 REAL XSCALE,YSCALE @@ -2272,15 +2253,15 @@ SUBROUTINE WPST13(IPEN,X,Y) COMMON /WPST11/ IVECT,COORD CHARACTER COORD*20 INTEGER IVECT -c + c compute new point in dev. coord. c convert to floating offsets XOFF=XPAD YOFF=YPAD -c + IXDC=X*XSCALE+XOFF IYDC=Y*YSCALE+YOFF -c + c write(xcoord,'(i5)')ixdc c write(ycoord,'(i5)')iydc c ...include both x,y @@ -2288,7 +2269,7 @@ SUBROUTINE WPST13(IPEN,X,Y) CALL CDRI2C(IYDC,4,YCOORD) COORD = XCOORD(1:3)//'.'//XCOORD(4:4)//' '// 1 YCOORD(1:3)//'.'//YCOORD(4:4) -c + c pack up move/draw command, send it down IF (IPEN.EQ.0) THEN CTEMP= COORD(1:11) // ' m ' @@ -2298,7 +2279,7 @@ SUBROUTINE WPST13(IPEN,X,Y) CALL WPST15(14,CTEMP) c ...count the coordinate pair IVECT=IVECT+1 -c + c stroke the path if we are approaching the 1500-coord pair limit c also restore and save postscript environment to avoid c input buffer overflow (must have a c/r between restore @@ -2312,34 +2293,34 @@ SUBROUTINE WPST13(IPEN,X,Y) c reinitted the current posn IVECT=1 ENDIF -c + C UPDATE CURRENT POSITION XCP=X YCP=Y -C + RETURN END SUBROUTINE WPSTIX(LENGT1,CHARS) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VITEXT - Text from Array. -C + C P. Watterberg - 24 MAR 81 C J. P. LONG - 3 DEC 87 -C + C ENVIRONMENT - COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS - LENGT1 = integer number of characters in CHARS. C Range 1-136. C CHARS = integer array of ASCII characters, one C character per array element, right justified. C Range 8,10,32-126. -C + C CALLS - vbout -C + C EXIT CONDITIONS - XCP,YCP = integer updated current position (at the end C of the string). -C + C NARRATIVE - Draw LENGT1 characters in CHARS, starting at C current position and update current position to C the point after the last character box where the @@ -2352,11 +2333,11 @@ SUBROUTINE WPSTIX(LENGT1,CHARS) C considered reasonable. Attributes foreground color, C background color, intensity, and character size C apply. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER LENGT1, CHARS(136), LENGTH -C + INTEGER XPAD,YPAD,XDEVIC,YDEVIC COMMON /WPST09/ XPAD,YPAD,XDEVIC,YDEVIC CHARACTER CTEMP*150,STR*3 @@ -2366,39 +2347,39 @@ SUBROUTINE WPSTIX(LENGT1,CHARS) COMMON /WPST03/ VECTOR REAL XSCALE,YSCALE COMMON /WPST08/ XSCALE,YSCALE -c + c check for valid length. -c + LENGTH = LENGT1 IF(LENGTH.LT.1) THEN CALL WPSTER(212,5) GO TO 999 END IF -c + c if(length.gt.136) then call vberrh(213,5), and use the c maximum length of 136. -c + IF(LENGTH.GT.136) THEN CALL WPSTER(213,5) LENGTH = 136 ENDIF -c + CTEMP='(' LENOUT=1 -c + c loop through length characters. -c + DO 100 I=1,LENGTH -c + c check for valid chars. -c + c ignore control characters, except for: c 8 is backspace c 10 is linefeed c 13 is carriage return -C + IF(CHARS(I).LT.32 .OR. CHARS(I).GT.126) THEN -c + IF(CHARS(I).EQ.8) THEN DX=-VECTOR(7) DY=0. @@ -2414,9 +2395,9 @@ SUBROUTINE WPSTIX(LENGT1,CHARS) CALL WPSTER(208,5) GOTO 100 ENDIF -c + c finish the string, emulate the control char, and start a new one -c + c send the buffered chars to the printer if there are any IF(LENOUT.NE.1) THEN CTEMP=CTEMP(1:LENOUT)//') t ' @@ -2425,64 +2406,63 @@ SUBROUTINE WPSTIX(LENGT1,CHARS) C reset the cp from the characters XCP=XCP+(LENOUT-5)*VECTOR(7) ENDIF -c + c calculate the new current position after the control char XCP=XCP+DX YCP=YCP+DY CALL WPST13(0,XCP,YCP) -c + c start a new string CTEMP='(' LENOUT=1 -c + ELSE -c + c Char value is 32-126 inclusive. Put \ before these: c 92 is \ c 40 is ( c 41 is ) -c + IF(CHARS(I).EQ.40.OR.CHARS(I).EQ.41.OR.CHARS(I).EQ.92) THEN CTEMP=CTEMP(1:LENOUT)//char(92) LENOUT=LENOUT+1 ENDIF -c + c now pack the chars into the buffer -c + CALL CDRA2C(CHARS(I),STR) CTEMP=CTEMP(1:LENOUT)//STR(1:1) LENOUT=LENOUT+1 ENDIF -c + 100 CONTINUE -c + c send the chars to the printer -c + CTEMP=CTEMP(1:LENOUT)//') t ' LENOUT=LENOUT+4 CALL WPST15(LENOUT,CTEMP) -C + C reset the cp from the characters -C + XCP=XCP+(LENOUT-5)*VECTOR(7) -c + 999 RETURN END SUBROUTINE WPSTLS(LINSTY) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDSTLS -Set Line Style. -C -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS -LINSTY = integer linestyle of line drawing output C primitives. Range 0-5. Default:0. -C + C CALLS - -C + C EXIT CONDITIONS -VECTOR(4) = real updated line style (LINSTY). -C + C NARRATIVE -Set the style of line as below. This applies only C to line drawing primitives. The line styles are: C 0 - solid @@ -2494,14 +2474,14 @@ SUBROUTINE WPSTLS(LINSTY) C All devices must support at least the values 0 and C 5. If an unsupported value is specified, set to 5. C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL LW INTEGER LINSTY,ILL,JLL COMMON /WPST11/ IVECT,COORD CHARACTER COORD*20 INTEGER IVECT CHARACTER CTEMP*30,STRL*3,STRS*3,STRG*3 -C + REAL VECTOR(7) COMMON /WPST03/ VECTOR REAL XSCALE,YSCALE @@ -2511,7 +2491,7 @@ SUBROUTINE WPSTLS(LINSTY) C CURRENT ATTRIBUTE VALUES. (DEVICE-INDEPENDENT) C REAL VECTOR(7) C COMMON /VCATTR/ VECTOR -C + C VECTOR(1)=FOREGROUND COLOR C (2)=BACKGROUND COLOR C (3)=INTENSITY @@ -2519,35 +2499,34 @@ SUBROUTINE WPSTLS(LINSTY) C (5)=LINE WIDTH C (6)=CHARACTER BOX Y C (7)=CHARACTER BOX X -C -c + ENTRY WPST14(LINSTY) -c + C CHECK FOR VALID LINSTY. IF(LINSTY.LT.0.OR.LINSTY.GT.5) THEN CALL WPSTER(401,5) VECTOR(4) = 0 GOTO 999 END IF -C + CALL WPST15(2,'s ') C GENERATE THE LINESTYLE COMMANDS IF(LINSTY.EQ.0) THEN CALL WPST15(7,'[] 0 h ') ENDIF -c + c calculate the linewidth -- it's needed below in every case -c + c actual xscale is xscale*.1; linewidth=1 => .01 in NDC LW=VECTOR(5) LW=XSCALE*VECTOR(5)*.001 c a linewidth of zero isn't good with postscript IF(LW.LT.1.) LW=1. -c + c from here on, set; up patterns that depend on the linewidth and c the extra length added to the line segment c by the hemispherical end cap -c + IF(LINSTY.EQ.1) THEN ILL=NINT(0.5*LW) IGAP=NINT(3.*LW) @@ -2555,7 +2534,7 @@ SUBROUTINE WPSTLS(LINSTY) CALL CDRI2C(IGAP,3,STRG) CTEMP='['//STRL(1:3)//' '//STRG(1:3)//'] 0 h ' CALL WPST15(14,CTEMP) -c + ELSE IF(LINSTY.EQ.2) THEN ILL=NINT(18.*LW) JLL=NINT(1.5*LW) @@ -2567,7 +2546,7 @@ SUBROUTINE WPSTLS(LINSTY) * //' '//STRG(1:3)//'] 0 h ' CALL WPST15(22,CTEMP) c call pstbuf(14,'[2 2 6 2] 0 h ') -c + ELSE IF(LINSTY.EQ.3) THEN ILL=NINT(6.*LW) IGAP=NINT(7.*LW) @@ -2576,7 +2555,7 @@ SUBROUTINE WPSTLS(LINSTY) CTEMP='['//STRL(1:3)//' '//STRG(1:3)//'] 0 h ' CALL WPST15(14,CTEMP) c call pstbuf(8,'[4] 0 h ') -c + ELSE IF(LINSTY.EQ.4) THEN ILL=NINT(24.*LW) IGAP=NINT(18.*LW) @@ -2585,7 +2564,7 @@ SUBROUTINE WPSTLS(LINSTY) CTEMP='['//STRL(1:3)//' '//STRG(1:3)//'] 0 h ' CALL WPST15(14,CTEMP) c call pstbuf(8,'[8] 0 h ') -c + ELSE IF(LINSTY.EQ.5) THEN ILL=NINT(12.*LW) IGAP=NINT(10.*LW) @@ -2593,43 +2572,43 @@ SUBROUTINE WPSTLS(LINSTY) CALL CDRI2C(IGAP,3,STRG) CTEMP='['//STRL(1:3)//' '//STRG(1:3)//'] 0 h ' CALL WPST15(14,CTEMP) -c + ENDIF -c + c redefine the postscript current position -c + c the code below is equivalent to c call vbvect(0,xcp,ycp) c but can't do it because vbvect calls vdstlw which calls this routine -c + CTEMP=COORD(1:11)//' m ' CALL WPST15(14,CTEMP) -C + VECTOR(4)=LINSTY -C + 999 RETURN END SUBROUTINE WPSTCS(YSIZE) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDSTCS -Set Character Size. -C + C R.W.Simons -05DEC80 C J. P. LONG -03 DEC 87 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Devices that support only software characters. C (LXY, HC1) -C + C ENTRY CONDITIONS -YSIZE = real Y dimension of the character box in NDC C space. Range 0.-1. Default: device dependent, C typically the smallest hardware size. -C + C CALLS - -C + C EXIT CONDITIONS -VECTOR(6) = real updated character box Y (YSIZE). C VECTOR(7) = real updated character box X. -C + C NARRATIVE -Set the character size for text primitives. Size C is given by YSIZE as the Y dimension of the C character box. The SVDI will assign the X dimension @@ -2641,73 +2620,73 @@ SUBROUTINE WPSTCS(YSIZE) C unsupported value is specified, set to the largest C supported character size that does not exceed the C specified size. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL YSIZE CHARACTER STR*6,CTEMP*10 -C + REAL VECTOR(7) COMMON /WPST03/ VECTOR REAL XSCALE,YSCALE COMMON /WPST08/ XSCALE,YSCALE -C + C CHECK FOR VALID YSIZE. IF(YSIZE.LT.0.0.OR.YSIZE.GT.1.0) THEN CALL WPSTER(401,5) GOTO 999 END IF -C + C PROTECT INPUT PARAMETER FROM BEING CHANGED. YSIZE1=YSIZE -C + C DON'T ALLOW VALUES BELOW THE MINIMUM "HARDWARE" SIZE. IF(YSIZE1.LT.0.01) YSIZE1=0.01 -C + C VALUES ESTABLISHED HERE ARE USED BY VBSIM IN SIMULATING CHARACTERS. C ALWAYS USE A CHARACTER ASPECT RATIO OF 5/7. VECTOR(6)=YSIZE1 VECTOR(7)=YSIZE1*5./7. -C + C convert the character size into device coords -c + IYSIZE=NINT(XSCALE*YSIZE1) -c + c output the postscript command -c + CALL CDRI2C(IYSIZE,4,STR) c iysize is in tenths of device units CTEMP='y '//STR(1:3)//' x ' CALL WPST15(8,CTEMP) -c + 999 RETURN END SUBROUTINE WPSTLW(LINWTH) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDSTLW -Set Line Width. -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS -LINWTH = real line width of line drawing output C primitives. Range 0.-1. Default: device dependent. -C + C CALLS - -C + C EXIT CONDITIONS -VECTOR(5) = real updated line width (LINWTH). -C + C NARRATIVE -Set the relative width of an output line. Values C are 0.-1. with 1. being .01 in NDC space. C All devices must support at least a single device C dependent value that is the default. If an C unsupported value is specified, set to the closest C supported line width. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL LINWTH,LW CHARACTER CTEMP*19,STR*5 -C + INTEGER*4 KWRTFL,KRDFL,KOUTFL,KINFL,KWRDSZ,KBYTEL,KCPW,KBAUD, 1KCOMTP COMMON /CDRCOM/ KWRTFL,KRDFL,KOUTFL,KINFL,KWRDSZ,KBYTEL,KCPW, @@ -2716,54 +2695,54 @@ SUBROUTINE WPSTLW(LINWTH) COMMON /WPST03/ VECTOR REAL XSCALE,YSCALE COMMON /WPST08/ XSCALE,YSCALE -C + C CHECK FOR VALID LINWTH. IF(LINWTH.LT.0.0.OR.LINWTH.GT.1.) THEN CALL WPSTER(401,5) GOTO 999 END IF -C + C CONVERT LINE-WIDTH TO NDC LW=LINWTH*.01 -C + C CONVERT WIDTH TO DEVICE COORDINATES AND ADD A DIGIT; NEED IT; TO HUNDREDTHS ILW=NINT(XSCALE*LW*10.) C A LINEWIDTH OF ZERO WORKS ONLY PART OF THE TIME IF(ILW.LT.10) ILW=10 -C + C SET LINE WIDTH CALL CDRI2C(ILW,5,STR) CTEMP='s '//STR(1:3)//'.'//STR(4:5)//' w ' CALL WPST15(11,CTEMP) -C + VECTOR(5)=LINWTH -C + c since linestyle uses the linewidth in setting the pattern, call it -c + LINSTY=VECTOR(4) CALL WPST14(LINSTY) 999 RETURN END SUBROUTINE WPSTIE(ESCPCD,SUPPRT) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDIQES -Inquire Escape. -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS -ESCPCD = integer escape function code. -C + C CALLS - -C + C EXIT CONDITIONS -SUPPRT = integer level of support for the escape C function specified. Range 0,1,2. -C + C NARRATIVE -An integer value indicating 2=hardware supported, C 1=software supported, 0=unsupported is returned in C SUPPRT for the escape function ESCPCD. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER ESCPCD,SUPPRT IF (ESCPCD.EQ.2100) THEN SUPPRT=2 diff --git a/packages/seacas/libraries/svdi/cgi/sdcgi.c b/packages/seacas/libraries/svdi/cgi/sdcgi.c index bd47e9828b40..9a41cb1a50b6 100644 --- a/packages/seacas/libraries/svdi/cgi/sdcgi.c +++ b/packages/seacas/libraries/svdi/cgi/sdcgi.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /* sdcgi - standard single device cgi routines diff --git a/packages/seacas/libraries/svdi/cgi/sdcgi.h b/packages/seacas/libraries/svdi/cgi/sdcgi.h index a3cb1e87b6c7..cdfdb3b7f4db 100644 --- a/packages/seacas/libraries/svdi/cgi/sdcgi.h +++ b/packages/seacas/libraries/svdi/cgi/sdcgi.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/svdi/cgi/sdcgif.f b/packages/seacas/libraries/svdi/cgi/sdcgif.f index a1858e2a0ec3..063968e93b61 100644 --- a/packages/seacas/libraries/svdi/cgi/sdcgif.f +++ b/packages/seacas/libraries/svdi/cgi/sdcgif.f @@ -1,12 +1,11 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details c sdcgif - FORTRAN shell for handling strings - C CESC - Escape SUBROUTINE CESC (FUNCID, LDR, DATA) INTEGER FUNCID @@ -17,7 +16,6 @@ SUBROUTINE CESC (FUNCID, LDR, DATA) RETURN END - C CTX - Text SUBROUTINE CTX(X, Y, FLAG, TEXT ) REAL X,Y @@ -28,7 +26,6 @@ SUBROUTINE CTX(X, Y, FLAG, TEXT ) RETURN END - C CGTXX - Get Text Extent SUBROUTINE CGTXX( X, Y, STRING, VSTAT, VCONC, XCONC, YCONC, 1 X1, Y1, X2, Y2, X3, Y3, X4, Y4) @@ -43,7 +40,6 @@ SUBROUTINE CGTXX( X, Y, STRING, VSTAT, VCONC, XCONC, YCONC, RETURN END - C CQCHH - Inquire List of Available Character Heights SUBROUTINE CQCHH( FONT, TXP, NREQ, FIRST, VSTAT, NTOTAL, 1 NLIST, CHHIT ) diff --git a/packages/seacas/libraries/svdi/cgi/stdtyp.h b/packages/seacas/libraries/svdi/cgi/stdtyp.h index 6f7725e84f41..2f428f861f56 100644 --- a/packages/seacas/libraries/svdi/cgi/stdtyp.h +++ b/packages/seacas/libraries/svdi/cgi/stdtyp.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /* stdtyp.h - standard types, from Plum, "C Programming Guidelines", p 17 diff --git a/packages/seacas/libraries/svdi/cgi/svdi.h b/packages/seacas/libraries/svdi/cgi/svdi.h index c32eec04cb0d..dd0466722cc4 100644 --- a/packages/seacas/libraries/svdi/cgi/svdi.h +++ b/packages/seacas/libraries/svdi/cgi/svdi.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ diff --git a/packages/seacas/libraries/svdi/cgi/svdi_addrwrap.F b/packages/seacas/libraries/svdi/cgi/svdi_addrwrap.F index 9af945b25bda..bf210cb6a778 100644 --- a/packages/seacas/libraries/svdi/cgi/svdi_addrwrap.F +++ b/packages/seacas/libraries/svdi/cgi/svdi_addrwrap.F @@ -1,20 +1,20 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details subroutine cgidum end #ifdef Build64 -c + c This wrapper module handles two kinds of interface problems: c the routines starting with 'v' arbitrate between Fortran caller c and C callee; the routines; starting with 'c' arbitrate between c C caller and Fortran callee. The only exception is cgtxx1, c which arbitrates between Fortran caller and C callee. -c + subroutine vdinit (aspect,justif) real*8 aspect integer*8 justif diff --git a/packages/seacas/libraries/svdi/cgi/vdicgi.c b/packages/seacas/libraries/svdi/cgi/vdicgi.c index dc8cfe697a1a..7c5e07497100 100644 --- a/packages/seacas/libraries/svdi/cgi/vdicgi.c +++ b/packages/seacas/libraries/svdi/cgi/vdicgi.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /* diff --git a/packages/seacas/libraries/svdi/cgi/vdicgi.h b/packages/seacas/libraries/svdi/cgi/vdicgi.h index 4b511594554d..e61b69c1137e 100644 --- a/packages/seacas/libraries/svdi/cgi/vdicgi.h +++ b/packages/seacas/libraries/svdi/cgi/vdicgi.h @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ void vdicgi_errh(char errmsg[]) diff --git a/packages/seacas/libraries/svdi/cgi/vdicgi_char.f b/packages/seacas/libraries/svdi/cgi/vdicgi_char.f index ded311290604..89726424716a 100644 --- a/packages/seacas/libraries/svdi/cgi/vdicgi_char.f +++ b/packages/seacas/libraries/svdi/cgi/vdicgi_char.f @@ -1,12 +1,11 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details c vdicgi_char - FORTRAN shell for handling strings - C CESC - Escape SUBROUTINE CESC2 (FUNCID, N, ARGS) INTEGER FUNCID @@ -22,7 +21,6 @@ SUBROUTINE CESC2 (FUNCID, N, ARGS) parameter (XEMFNM= -28372, XEMXCL= -19281, XEPCTL= -190, * XEAGMD= -23671, XEPCCL= -12048, XESVDI= -1001) - c SRCP definitions c maximum error class integer XMXERR @@ -133,7 +131,6 @@ SUBROUTINE CESC2 (FUNCID, N, ARGS) c pattern transformation support - c color selection mode availability integer CCLRI, CCLRID parameter (CCLRI=0, CCLRID=1) @@ -181,7 +178,6 @@ SUBROUTINE CESC2 (FUNCID, N, ARGS) RETURN END - C CTX - Text SUBROUTINE CTX2(X, Y, TEXT1, LENGTH ) REAL X,Y @@ -239,7 +235,6 @@ subroutine vdgnam(name) parameter (XEMFNM= -28372, XEMXCL= -19281, XEPCTL= -190, * XEAGMD= -23671, XEPCCL= -12048, XESVDI= -1001) - c SRCP definitions c maximum error class integer XMXERR @@ -350,7 +345,6 @@ subroutine vdgnam(name) c pattern transformation support - c color selection mode availability integer CCLRI, CCLRID parameter (CCLRI=0, CCLRID=1) @@ -383,6 +377,3 @@ subroutine vdgnam(name) return end - - - diff --git a/packages/seacas/libraries/svdi/cgi/x11_cgisx11.c b/packages/seacas/libraries/svdi/cgi/x11_cgisx11.c index 21c298566a0e..6d1e0b3d1305 100644 --- a/packages/seacas/libraries/svdi/cgi/x11_cgisx11.c +++ b/packages/seacas/libraries/svdi/cgi/x11_cgisx11.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /* cgisx11.c - linker specifiable driver routine for driver diff --git a/packages/seacas/libraries/svdi/cgi/x11_vdix11.c b/packages/seacas/libraries/svdi/cgi/x11_vdix11.c index bee0eccdd698..bb103fa64e0b 100644 --- a/packages/seacas/libraries/svdi/cgi/x11_vdix11.c +++ b/packages/seacas/libraries/svdi/cgi/x11_vdix11.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /* diff --git a/packages/seacas/libraries/svdi/cgi/x11_x11xlate.c b/packages/seacas/libraries/svdi/cgi/x11_x11xlate.c index cdfa950ef55c..b19a3fe0f958 100644 --- a/packages/seacas/libraries/svdi/cgi/x11_x11xlate.c +++ b/packages/seacas/libraries/svdi/cgi/x11_x11xlate.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /* @@ -1528,7 +1528,7 @@ static void xcpl(anything **params, int num_surfaces, anything **surf_list) /* This clipping algorithm is loosely based on the Cohen- * Sutherland algorithm. This algorithm takes into account - * the fact that points are consective, ie., it tries to + * the fact that points are consecutive, ie., it tries to * encode each point only once. Everything is done * inline for efficiency */ @@ -4000,7 +4000,7 @@ static void xcqfl(anything **params, anything **surf_list) *(int *)params[12] = 0; *(int *)params[13] = 0; - /* pattern transfomation support - patterns not supported */ + /* pattern transformation support - patterns not supported */ *(int *)params[14] = CPTNO; } /* end xcqfl */ diff --git a/packages/seacas/libraries/svdi/post/man/post.1g b/packages/seacas/libraries/svdi/post/man/post.1g index 2af3ea9754f0..0d90ff9b391a 100644 --- a/packages/seacas/libraries/svdi/post/man/post.1g +++ b/packages/seacas/libraries/svdi/post/man/post.1g @@ -5,12 +5,12 @@ post \- Postprocess a BGP computer graphics metafile. .SH SYNOPSIS .if n .ll +10 .B post -.I file +.I file .I device .if n .ll -10 .SH DESCRIPTION Post postprocess a computer graphics meta -.I file +.I file (BGP format) to the designated graphics .I device. Post links with the appropriate device driver, producing a "postm.exe" diff --git a/packages/seacas/libraries/svdi/post/man/post.9 b/packages/seacas/libraries/svdi/post/man/post.9 index bcb85fb25703..5061496f706d 100644 --- a/packages/seacas/libraries/svdi/post/man/post.9 +++ b/packages/seacas/libraries/svdi/post/man/post.9 @@ -5,12 +5,12 @@ post \- Postprocess a BGP computer graphics metafile. .SH SYNOPSIS .if n .ll +10 .B post -.I file +.I file .I device .if n .ll -10 .SH DESCRIPTION Post postprocess a computer graphics meta -.I file +.I file (BGP format) to the designated graphics .I device. Post links with the appropriate device driver, producing a "postm.exe" diff --git a/packages/seacas/libraries/svdi/post/postm.f b/packages/seacas/libraries/svdi/post/postm.f index 0ba056acee02..842b7028bcc5 100644 --- a/packages/seacas/libraries/svdi/post/postm.f +++ b/packages/seacas/libraries/svdi/post/postm.f @@ -1,48 +1,46 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details PROGRAM POST -c + c read frame skip parameter from unit 21 (if it is there) c READ(21,*,ERR=10,END=10) IFRAM c CALL FRMSKP(IFRAM) -C + c call postprocessor loop routine 10 CALL PPLOOP STOP END -C -C -C + SUBROUTINE PPLOOP C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C LOOP - LOOP THROUGH BGP FILE, CALLING VDI EQUIVALENTS -C + C P. WATTERBERG - 25 OCT 81 C P. L. CROTTY - 4 APR 85 - UPDATETO INCLUDE POLYGON FILL (PLC) C K. Cole - 05 oct 90 - added SAVE -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS - VDI has been initialized by calling VDINIT. -C + C CALLS - Most of the VDI routines. -C + C EXIT CONDITIONS - -C + C NARRATIVE - SCAN A BGP FILE, PICKING OFF OPCODES AND OPERANDS. C MAKE A CALL TO THE EQUIVALENT VDI ROUTINE. C THE OPCODE IS USED AS AN INDEX INTO A JUMP TABLE OF C A COMPUTED GOTO. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VARIABLES THAT DON'T HAVE ANYTHING TO DO WITH COLOR -C + SAVE INTEGER OPCODE, COUNT, TEXT(132), ESNUMB(100) INTEGER NUMESC, IFRAM @@ -50,9 +48,9 @@ SUBROUTINE PPLOOP LOGICAL EOFOK, NOEOF, MARKER, TWODIM, FICHE, START, DOFISH C (PLC) REAL XARRAY(508),YARRAY(508) -C + C DESCRIPTION OF THE ABOVE VARIABLES -C + C OPCODE - When a BGP opcode is expected, the next 8 bits from the BGP C file are read into OPCODE. OPCODE-127 is then used as an index C into a jump table. Also, may be the first eight bits of an @@ -83,17 +81,17 @@ SUBROUTINE PPLOOP C a VDNWPG. C (PLC) C XARRAY,YARRAY-Real arrays to pass x,y coordinates to polygon routine (VDPOLY) -C + C VARIABLES TO HANDLE COLOR -C + INTEGER NEXTFC, NEXTBC INTEGER CSPOT, INDICES(256), NXTDEX INTEGER NUMCLR, COLMAP(0:255), INVMAP(0:255) REAL RGB(3,256), TABLE(3,0:255), VECTOR(7) LOGICAL BATCH, DRAWN, FIRST -C + C DESCRIPTION OF THE ABOVE VARIABLES -C + C TABLE(3,0:255) - This is used for holding the color table as the meta file C thinks it is. The device may not have all 256 colors that C the meta file has, so we can't just ship the color calls @@ -126,10 +124,9 @@ SUBROUTINE PPLOOP C DRAWN - True if something has been drawn since inititalization or C the background color has changed from default. C FIRST - True until after the first newpage since initialization -C -C + C NON COLOR DATA STATEMENTS -C + DATA NUMESC / 58 / DATA (ESNUMB(I),I=1,58) + / 99, 100, 101, 200, 201, 202, 203, 204, 205, 206, @@ -147,31 +144,31 @@ SUBROUTINE PPLOOP DATA IFCOUN / 0 / DATA COUNT / 0 / GOTO 80000 -C + ENTRY FRMSKP(IFRMS) IFRAM = IFRMS RETURN -C + 80000 CONTINUE IPAGE = 0 -C + C MAIN LOOP TO PROCESS FILE -C + C THROW AWAY UNUSED WORDS OF THE PREVIOUS INSTRUCTION C (NOTE: first time through count is 0) -C + 1 DO 2 I=1,COUNT CALL PPBTR(16,OPCODE,NOEOF) 2 CONTINUE -C + C GET NEXT INSTRUCTION OR MOVE/DRAW -C + 3 CALL PPBTR(8,OPCODE,EOFOK) CALL PPBTR(8,COUNT,EOFOK) -c + c If just starting up, check for file id (84HEX=132) C or escape (82HEX=130) -C + IF (START) THEN IF (OPCODE.NE.132.AND.OPCODE.NE.130) THEN PRINT 10010 @@ -180,42 +177,42 @@ SUBROUTINE PPLOOP RETURN ENDIF ENDIF -C + C CHECK FOR MOVE OR DRAW -C + IF(OPCODE.GE.128) GOTO 20 XCOORD = DBLE(256*OPCODE+COUNT)*SCALE CALL PPBTR(8,OPCODE,NOEOF) CALL PPBTR(8,COUNT,NOEOF) IF(.NOT.TWODIM) CALL PPBTR(16,OPCODE,NOEOF) -C + C IF WE ARE SKIPPING THIS FRAME THEN DON'T DO ANYTHING -C + IF(IFCOUN.NE.0) GOTO 3 -C + C IF OPCODE < 128 THEN MOVE, ELSE DRAW A POINT OR LINE -C + IF(OPCODE.LT.128) THEN YCOORD = DBLE(256*OPCODE+COUNT)*SCALE CALL VDMOVA(XCOORD,YCOORD) ELSE -C + C MAKE SURE THE COLOR WE WANT HAS BEEN SET UP -C + IF(COLMAP(NEXTFC).EQ.-1) THEN INVMAP(NXTDEX) = NEXTFC COLMAP(NEXTFC) = NXTDEX CALL VDSTFC(NXTDEX) CALL VDSTCO(1,NXTDEX,TABLE(1,NEXTFC),0) -C + C SEARCH FOR THE NEXT UNUSED ENTRY IN INVMAP -C + 4 NXTDEX = NXTDEX + 1 IF(INVMAP(NXTDEX).NE.-1) GOTO 4 ENDIF -C + C OK, MAKE A SMUDGE OF SOME SORT -C + DRAWN = .TRUE. YCOORD = DBLE(256*(OPCODE-128)+COUNT)*SCALE IF(MARKER) THEN @@ -225,9 +222,9 @@ SUBROUTINE PPLOOP ENDIF ENDIF GOTO 3 -C + C WE HAVE AN OPCODE, SO BRANCH TO APPROPRIATE CODE -C + 20 IF(OPCODE.EQ.133) THEN IFCOUN = IFCOUN + 1 IF(IFCOUN.EQ.IFRAM) IFCOUN = 0 @@ -236,65 +233,64 @@ SUBROUTINE PPLOOP GOTO ( + 1, 1, 300, 400, 500, 600, 700, 8, 8, 1000, C 80 81 82 83 84 85 86 87 88 89 -C + + 8, 8, 8, 8, 8, 8, 1700, 1800, 1900, 2000, C 8A 8B 8C 8D 8E 8F 90 91 92 93 -C + + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, C 94 95 96 97 98 99 9A 9B 9C 9D -C + + 8, 8, 3300, 3400, 3500, 3600, 3700, 1, 3, 3, C 9E 9F A0 A1 A2 A3 A4 A5 A6 A7 -C + + 4100, 4200, 4400, 8, 8, 8, 8, 8, 4900, 1, C A8 A9 AA AB AC AD AE AF B0 B1 -C + + 5100, 1, 1, 1, 8, 8, 8, 8, 8, 8, C B2 B3 B4 B5 B6 B7 B8 B9 BA BB -C + + 8, 8, 8, 8, 6500, 6600, 6700, 6800, 6900, 7000, C BC BD BE BF C0 C1 C2 C3 C4 C5 -C + + 1, 7200, 7300, 8, 8, 8, 8, 8, 8, 8, C C6 C7 C8 C9 CA CB CC CD CE CF -C + + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, C D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 -C + + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, C DA DB DC DD DE DF E0 E1 E2 E3 -C + + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, C E4 E5 E6 E7 E8 E9 EA EB EC ED -C + + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, C EE EF F0 F1 F2 F3 F4 F5 F6 F7 -C + + 8, 8, 8, 8, 8, 8, 8, 8), OPCODE-127 C F8 F9 FA FB FC FD FE FF -C -C + C 82 -- ESCAPE CODES -C + 300 CALL PPBTR(8,OPCODE,NOEOF) CALL PPBTR(8,ICOUNT, NOEOF) COUNT = COUNT - 1 IF(OPCODE.NE.1) GOTO 1 -C + C IT'S A VDI ESCAPE SO GET THE ESCAPE CODE -C + CALL PPBTR(16,OPCODE,NOEOF) COUNT = COUNT - 1 -C + C CHECK TO SEE IF IT IS A KNOWN NUMERIC ESCAPE -C + DO 310 I=1, NUMESC IF(OPCODE.EQ.ESNUMB(I)) GOTO 320 310 CONTINUE GOTO 340 -C + C GET THE NUMERIC ARGUMENTS -C + 320 ISTOP = MIN0(COUNT,2000) DO 330 I=1, ISTOP/2 CALL PPBTR(16,INTEGR,NOEOF) @@ -306,51 +302,51 @@ SUBROUTINE PPLOOP ENDIF 330 CONTINUE GOTO 350 -C + C IS IT A KNOWN ALHPA ESCAPE? -C + 340 CONTINUE GOTO 1 -C + 350 CALL VDESCP(OPCODE,ISTOP/2,ARGS) COUNT = COUNT - ISTOP GOTO 1 -C + C 83 -- ASPECT RATIO DEFINITION -C + 400 CALL PPBTR(16,IXDIM,NOEOF) CALL PPBTR(16,IYDIM,NOEOF) CALL PPBTR(16, JUNK,NOEOF) SCALE = AMIN1(XMAX/IXDIM,YMAX/IYDIM) GOTO 3 -C + C 84 -- NEW FILE ID SO REINITIALIZE EVERYTHING C IF FIRST FILE ID, THEN DO ALL THE ONE TIME INITIALIZATION STUFF -C + 500 IF (START) THEN c CALL VBPKG('POST ') CALL VDINIT(0.,5) CALL VDFRAM(0) -C + C FIND OUT MAXIMUM X AND Y C USED TO SCALE BGP COORDINATES TO NDC COORDINATES -C + CALL VDIQND(XMAX,YMAX) -C + C FIND OUT DEFAULT FOREGROUND AND BACKGROUND COLORS -C + CALL VDIQOS(VECTOR) NEXTFC = VECTOR(1) NEXTBC = VECTOR(2) -C + C FIND OUT THE NUMBER OF COLORS IN THE COLOR TABLE -C + INDEXA = 4 CALL VDIQDC(INDEXA,DUMMY) NUMCLR = DUMMY -C + C FIND OUT IF WE CAN USE FICHE BREAKS -C + CALL VDIQES(211,IANS) IF(IANS.EQ.2) FICHE = .TRUE. ENDIF @@ -361,9 +357,9 @@ SUBROUTINE PPLOOP TWODIM = .TRUE. BATCH = .FALSE. SCALE = AMIN1(XMAX/32767.,YMAX/32767.) -C + C RE-ESTABLISH DEFAULT COLOR TABLE -C + DO 510 I=0,255 COLMAP(I) = I TABLE(1,I) = 1. @@ -384,13 +380,13 @@ SUBROUTINE PPLOOP TABLE(1,6) = 0. IF(.NOT.START) THEN CALL VDWAIT -C + C DELETE ALL SEGMENTS -C + CALL VDESCP(203,1,0.) -C + C REESTABLISH DEFAULT SETTINGS -C + CALL VDSTOS(VECTOR) CALL VDSTCO(255,COLMAP,TABLE,0) IPAGE = IPAGE + 1 @@ -400,11 +396,11 @@ SUBROUTINE PPLOOP ENDIF START = .FALSE. NXTDEX = 256 -C + C IF THE DEVICE HAS LESS THAN 250 COLORS, THEN C SET UP THE MAPPINGS SO THAT THE USER WILL GET THE FIRST C FEW COLORS THEY ASK FOR. -C + IF(NUMCLR.LE.250) THEN DO 520 I=0,255 INVMAP(I) = -1 @@ -418,17 +414,17 @@ SUBROUTINE PPLOOP NEXTBC = VECTOR(2) write (*,*) 'End of Initialization' GOTO 1 -C + C 85 -- NEW PAGE -C + C IF NOTHING HAS BEEN DRAWN, THEN DON'T CALL FOR A NEW PAGE. -C + 600 IF(FIRST.AND..NOT.DRAWN) GOTO 1 FIRST = .FALSE. CALL VDWAIT -C + C RESET THE COLOR MAPS SO THE USER CAN GET A NEW SET FOR NEXT FRAM -C + IF(NUMCLR.LT.250) THEN DO 610 I= 0, 255 COLMAP(I) = -1 @@ -448,21 +444,21 @@ SUBROUTINE PPLOOP ENDIF DOFISH = .FALSE. GOTO 1 -C + C 86 -- END OF DATA FILE -C + 700 CALL VDWAIT CALL VDFRAM(1) CALL VDTERM RETURN -C + C 89 -- FICHE BREAK -C + 1000 DOFISH = FICHE GOTO 600 -C + C 90 -- DEFINE COLOR TABLE INDEX -C + 1700 CALL PPBTR(16,INDEX,NOEOF) CALL PPBTR(16,IR,NOEOF) CALL PPBTR(8,IG,NOEOF) @@ -474,10 +470,10 @@ SUBROUTINE PPLOOP TABLE(1,INDEX) = AMIN1(IR/256.+IY/256.+IM/256.+IW/256.,1.) TABLE(2,INDEX) = AMIN1(IG/256.+IY/256.+IC/256.+IW/256.,1.) TABLE(3,INDEX) = AMIN1(IB/256.+IC/256.+IM/256.+IW/256.,1.) -C + C IF THE LINK HAS ALREADY BEEN ESTABLISHED, THEN WE MAY WANT TO C CHANGE THE COLOR DYNAMICALLY. -C + IF(COLMAP(INDEX).NE.-1) THEN IF(.NOT.BATCH) THEN CALL VDSTCO(1,COLMAP(INDEX),TABLE(1,INDEX),0) @@ -490,56 +486,56 @@ SUBROUTINE PPLOOP ENDIF ENDIF GOTO 3 -C + C 91 -- SELECT COLOR -C + 1800 CALL PPBTR(16,INDEX,NOEOF) IF(COLMAP(INDEX).GE.0) CALL VDSTFC(COLMAP(INDEX)) NEXTFC = INDEX GOTO 3 -C + C 92 -- INTENSITY -C + 1900 CALL PPBTR(16,INTEN,NOEOF) CALL VDSTIN(INTEN/32767.) GOTO 3 -C + C 93 -- SET BACKGROUND COLOR -C + 2000 CALL PPBTR(16,INDEX,NOEOF) NEXTBC = INDEX drawn = .true. IF(NEXTBC.NE.INT(VECTOR(2))) DRAWN = .TRUE. GOTO 3 -C + C A0 -- SET 2D MODE / CLEAR 3D MODE -C + 3300 TWODIM = .TRUE. GOTO 3 -C + C A1 -- SET 3D MODE / CLEAR 2D MODE -C + 3400 TWODIM = .FALSE. GOTO 3 -C + C A2 -- SET DRAW MODE / CLEAR MARK MODE -C + 3500 MARKER = .FALSE. GOTO 3 -C + C A3 -- SET MARK MODE / CLEAR DRAW MODE -C + 3600 MARKER = .TRUE. GOTO 3 -C + C A4 -- PLOT MARKER AT CURRENT POSITION -C + 3700 CALL VDIQCP(XPOS,YPOS) CALL VDPNTA(XPOS,YPOS) GOTO 3 -C + C A8 -- SET LINE STYLE -C + 4100 CALL PPBTR(16,LSTYL,NOEOF) IF(LSTYL.EQ.32767) THEN CALL VDSTLS(0) @@ -555,17 +551,17 @@ SUBROUTINE PPLOOP CALL VDSTLS(5) ENDIF GOTO 3 -C + C A9 -- SET LINE WIDTH -C + 4200 CALL PPBTR(16,LWID,NOEOF) CALL VDSTLW(LWID/32767.) GOTO 3 -C + C (PLC) -C + C AA -- POLYGONS -C + 4400 NPTS =0 4401 CALL PPBTR(16,OPCODE,NOEOF) IF(OPCODE.GE.32768)GOTO 4410 @@ -575,18 +571,18 @@ SUBROUTINE PPLOOP IF(OPCODE.GE.32768)GOTO 4410 YARRAY(NPTS) = DBLE(OPCODE) * SCALE GOTO 4401 -C + C IF IT'S AN OPCODE BUT ISN'T = AB (END OF POLYGON COMMAND), C THEN IT MUST BE AN OUT OF RANGE COORDINATE. -C + 4410 IF(OPCODE.NE.43776) THEN PRINT 10030, OPCODE 10030 FORMAT(1X,'ILLEGAL X,Y COORDINATE -- ',I5) GOTO 8 ENDIF -C + C MAKE SURE THE COLOR WE WANT HAS BEEN SET UP -C + IF(COLMAP(NEXTFC).EQ.-1) THEN INVMAP(NXTDEX) = NEXTFC COLMAP(NEXTFC) = NXTDEX @@ -595,21 +591,21 @@ SUBROUTINE PPLOOP 4411 NXTDEX = NXTDEX + 1 IF(INVMAP(NXTDEX).NE.-1) GOTO 4411 ENDIF -C + drawn = .true. CALL VDPOLY(XARRAY,YARRAY,NPTS) GOTO 3 -C + C B0 -- TEXT STRING -C + 4900 NCHARS = MIN0(132,COUNT*2) IF(NCHARS.EQ.0) GOTO 3 DO 4910 I=1,NCHARS CALL PPBTR(8,TEXT(I),NOEOF) 4910 CONTINUE -C + C MAKE SURE THE COLOR WE WANT HAS BEEN SET UP -C + IF(COLMAP(NEXTFC).EQ.-1) THEN INVMAP(NXTDEX) = NEXTFC COLMAP(NEXTFC) = NXTDEX @@ -618,83 +614,83 @@ SUBROUTINE PPLOOP 4920 NXTDEX = NXTDEX + 1 IF(INVMAP(NXTDEX).NE.-1) GOTO 4920 ENDIF -C + IF(TEXT(NCHARS).EQ.0) NCHARS = NCHARS - 1 DRAWN = .TRUE. CALL VDTEXT(NCHARS,TEXT) COUNT = COUNT - (NCHARS+1)/2 GOTO 4900 -C + C B2 -- SET CHARACTER SIZE -C + 5100 CALL PPBTR(16,ICHAR,NOEOF) CALL VDSTCS(ICHAR/32767./.65) CALL PPBTR(16,JUNK,NOEOF) GOTO 3 -C + C C0 -- START SEGMENT -C + 6500 CALL PPBTR(16,NAME,NOEOF) CALL PPBTR(16,ITYPE,NOEOF) ARGS(1) = NAME ARGS(2) = ITYPE CALL VDESCP(200,2,ARGS) GOTO 3 -C + C C1 -- END OF SEGMENT -C + 6600 CALL VDESCP(201,0,0.) GOTO 3 -C + C C2 -- DELETE SEGMENT -C + 6700 CALL PPBTR(16,NAME,NOEOF) ARGS(1) = NAME CALL VDESCP(203,1,ARGS) GOTO 3 -C + C C3 -- DELETE ALL SEGMENTS -C + 6800 CALL VDESCP(203,1,0.) GOTO 3 -C + C C4 -- RENAME SEGMENT -C + 6900 CALL PPBTR(16,NAME1,NOEOF) CALL PPBTR(16,NAME2,NOEOF) ARGS(1) = NAME1 ARGS(2) = NAME2 CALL VDESCP(202,2,ARGS) GOTO 3 -C + C C5 -- SEGMENT ATTRIBUTES -C + 7000 CALL PPBTR(16,NAME,NOEOF) CALL PPBTR(16,IVALU,NOEOF) ARGS(1) = NAME ARGS(2) = IVALU CALL VDESCP(204,2,ARGS) GOTO 3 -C + C C7 -- BATCH COLOR TABLE UPDATE -C + 7200 BATCH = .TRUE. GOTO 3 -C + C C8 -- SEND COLOR TABLE / END BATCH UPDATE -C + 7300 BATCH = .FALSE. IF(CSPOT.GT.1) CALL VDSTCO(CSPOT-1,INDICES,RGB,0) CSPOT = 1 GOTO 3 -C + C ILLEGAL OP CODE -C + 8 PRINT 10020,OPCODE 10020 FORMAT(1X,'ILLEGAL OP CODE -- ',I5) -C + C SCAN FOR NEW FRAME -C + 9 CALL PPBTR(8,OPCODE,NOEOF) CALL PPBTR(8, COUNT,NOEOF) IF(OPCODE.NE.255) GOTO 9 @@ -712,47 +708,45 @@ SUBROUTINE PPLOOP write (*,*) 'End of Frame ', IPAGE CALL VDNWPG GOTO 1 -C + END -C -C -C + SUBROUTINE PPBTR(IWIDTH,RESULT,EOFOK) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C PPBTR - FETCH IWIDTH BITS FROM THE INPUT FILE -C + C P. WATTERBERG - 25 OCT 81 C K. Cole - 05 oct 90 added SAVE -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS - IWIDTH IS THE NUMBER OF BITS TO GET FROM THE FILE. C EOFOK IS TRUE IF AN END OF FILE CAN BE ENCOUNTERED C AND FALSE OTHERWISE. -C + C CALLS - CDRUPK, CDRRFS -C + C EXIT CONDITIONS - RESULT CONTAINS THE NEXT IWIDTH BITS OF THE FILE, RIGHT C JUSTIFIED, ZERO FILLED. OR, IF AN END OF FILE IS OK, C AND ENCOUNTERED, RESULT CONTAINS AN HEX 86 TO SIGNIFY C END OF FILE. -C + C NARRATIVE - -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + SAVE INTEGER IWIDTH, RESULT LOGICAL EOFOK -C + c TLC - made buffer one bigger so cdrupk doesn't go out of memory INTEGER BUFFER(10001), POINTR, BUFSIZ, PPREAD -C + DATA POINTR / 10001 / DATA BUFSIZ / 0 / DATA PPREAD / 55 / -C + RESULT = 0 CALL CDRUPK(BUFFER,POINTR,IBITLC,IWIDTH,RESULT) IF(POINTR.GT.BUFSIZ) THEN diff --git a/packages/seacas/libraries/svdi/post/posts.f b/packages/seacas/libraries/svdi/post/posts.f index 2062e08959b7..c9160ea5c835 100644 --- a/packages/seacas/libraries/svdi/post/posts.f +++ b/packages/seacas/libraries/svdi/post/posts.f @@ -1,48 +1,46 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details SUBROUTINE POST -c + c read frame skip parameter from unit 21 (if it is there) c READ(21,*,ERR=10,END=10) IFRAM c CALL FRMSKP(IFRAM) -C + c call postprocessor loop routine 10 CALL PPLOOP RETURN END -C -C -C + SUBROUTINE PPLOOP C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C LOOP - LOOP THROUGH BGP FILE, CALLING VDI EQUIVALENTS -C + C P. WATTERBERG - 25 OCT 81 C P. L. CROTTY - 4 APR 85 - UPDATETO INCLUDE POLYGON FILL (PLC) C K. Cole - 05 oct 90 - added SAVE -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS - VDI has been initialized by calling VDINIT. -C + C CALLS - Most of the VDI routines. -C + C EXIT CONDITIONS - -C + C NARRATIVE - SCAN A BGP FILE, PICKING OFF OPCODES AND OPERANDS. C MAKE A CALL TO THE EQUIVALENT VDI ROUTINE. C THE OPCODE IS USED AS AN INDEX INTO A JUMP TABLE OF C A COMPUTED GOTO. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VARIABLES THAT DON'T HAVE ANYTHING TO DO WITH COLOR -C + SAVE INTEGER OPCODE, COUNT, TEXT(132), ESNUMB(100) INTEGER NUMESC, IFRAM @@ -50,9 +48,9 @@ SUBROUTINE PPLOOP LOGICAL EOFOK, NOEOF, MARKER, TWODIM, FICHE, START, DOFISH C (PLC) REAL XARRAY(508),YARRAY(508) -C + C DESCRIPTION OF THE ABOVE VARIABLES -C + C OPCODE - When a BGP opcode is expected, the next 8 bits from the BGP C file are read into OPCODE. OPCODE-127 is then used as an index C into a jump table. Also, may be the first eight bits of an @@ -83,17 +81,17 @@ SUBROUTINE PPLOOP C a VDNWPG. C (PLC) C XARRAY,YARRAY-Real arrays to pass x,y coordinates to polygon routine (VDPOLY) -C + C VARIABLES TO HANDLE COLOR -C + INTEGER NEXTFC, NEXTBC INTEGER CSPOT, INDICES(256), NXTDEX INTEGER NUMCLR, COLMAP(0:255), INVMAP(0:255) REAL RGB(3,256), TABLE(3,0:255), VECTOR(7) LOGICAL BATCH, DRAWN, FIRST -C + C DESCRIPTION OF THE ABOVE VARIABLES -C + C TABLE(3,0:255) - This is used for holding the color table as the meta file C thinks it is. The device may not have all 256 colors that C the meta file has, so we can't just ship the color calls @@ -126,10 +124,9 @@ SUBROUTINE PPLOOP C DRAWN - True if something has been drawn since inititalization or C the background color has changed from default. C FIRST - True until after the first newpage since initialization -C -C + C NON COLOR DATA STATEMENTS -C + DATA NUMESC / 58 / DATA (ESNUMB(I),I=1,58) + / 99, 100, 101, 200, 201, 202, 203, 204, 205, 206, @@ -147,30 +144,30 @@ SUBROUTINE PPLOOP DATA IFCOUN / 0 / DATA COUNT / 0 / GOTO 80000 -C + ENTRY FRMSKP(IFRMS) IFRAM = IFRMS RETURN -C + 80000 CONTINUE -C + C MAIN LOOP TO PROCESS FILE -C + C THROW AWAY UNUSED WORDS OF THE PREVIOUS INSTRUCTION C (NOTE: first time through count is 0) -C + 1 DO 2 I=1,COUNT CALL PPBTR(16,OPCODE,NOEOF) 2 CONTINUE -C + C GET NEXT INSTRUCTION OR MOVE/DRAW -C + 3 CALL PPBTR(8,OPCODE,EOFOK) CALL PPBTR(8,COUNT,EOFOK) -c + c If just starting up, check for file id (84HEX=132) C or escape (82HEX=130) -C + IF (START) THEN IF (OPCODE.NE.132.AND.OPCODE.NE.130) THEN PRINT 10010 @@ -179,42 +176,42 @@ SUBROUTINE PPLOOP RETURN ENDIF ENDIF -C + C CHECK FOR MOVE OR DRAW -C + IF(OPCODE.GE.128) GOTO 20 XCOORD = DBLE(256*OPCODE+COUNT)*SCALE CALL PPBTR(8,OPCODE,NOEOF) CALL PPBTR(8,COUNT,NOEOF) IF(.NOT.TWODIM) CALL PPBTR(16,OPCODE,NOEOF) -C + C IF WE ARE SKIPPING THIS FRAME THEN DON'T DO ANYTHING -C + IF(IFCOUN.NE.0) GOTO 3 -C + C IF OPCODE < 128 THEN MOVE, ELSE DRAW A POINT OR LINE -C + IF(OPCODE.LT.128) THEN YCOORD = DBLE(256*OPCODE+COUNT)*SCALE CALL VDMOVA(XCOORD,YCOORD) ELSE -C + C MAKE SURE THE COLOR WE WANT HAS BEEN SET UP -C + IF(COLMAP(NEXTFC).EQ.-1) THEN INVMAP(NXTDEX) = NEXTFC COLMAP(NEXTFC) = NXTDEX CALL VDSTFC(NXTDEX) CALL VDSTCO(1,NXTDEX,TABLE(1,NEXTFC),0) -C + C SEARCH FOR THE NEXT UNUSED ENTRY IN INVMAP -C + 4 NXTDEX = NXTDEX + 1 IF(INVMAP(NXTDEX).NE.-1) GOTO 4 ENDIF -C + C OK, MAKE A SMUDGE OF SOME SORT -C + DRAWN = .TRUE. YCOORD = DBLE(256*(OPCODE-128)+COUNT)*SCALE IF(MARKER) THEN @@ -224,9 +221,9 @@ SUBROUTINE PPLOOP ENDIF ENDIF GOTO 3 -C + C WE HAVE AN OPCODE, SO BRANCH TO APPROPRIATE CODE -C + 20 IF(OPCODE.EQ.133) THEN IFCOUN = IFCOUN + 1 IF(IFCOUN.EQ.IFRAM) IFCOUN = 0 @@ -235,65 +232,64 @@ SUBROUTINE PPLOOP GOTO ( + 1, 1, 300, 400, 500, 600, 700, 8, 8, 1000, C 80 81 82 83 84 85 86 87 88 89 -C + + 8, 8, 8, 8, 8, 8, 1700, 1800, 1900, 2000, C 8A 8B 8C 8D 8E 8F 90 91 92 93 -C + + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, C 94 95 96 97 98 99 9A 9B 9C 9D -C + + 8, 8, 3300, 3400, 3500, 3600, 3700, 1, 3, 3, C 9E 9F A0 A1 A2 A3 A4 A5 A6 A7 -C + + 4100, 4200, 4400, 8, 8, 8, 8, 8, 4900, 1, C A8 A9 AA AB AC AD AE AF B0 B1 -C + + 5100, 1, 1, 1, 8, 8, 8, 8, 8, 8, C B2 B3 B4 B5 B6 B7 B8 B9 BA BB -C + + 8, 8, 8, 8, 6500, 6600, 6700, 6800, 6900, 7000, C BC BD BE BF C0 C1 C2 C3 C4 C5 -C + + 1, 7200, 7300, 8, 8, 8, 8, 8, 8, 8, C C6 C7 C8 C9 CA CB CC CD CE CF -C + + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, C D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 -C + + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, C DA DB DC DD DE DF E0 E1 E2 E3 -C + + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, C E4 E5 E6 E7 E8 E9 EA EB EC ED -C + + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, C EE EF F0 F1 F2 F3 F4 F5 F6 F7 -C + + 8, 8, 8, 8, 8, 8, 8, 8), OPCODE-127 C F8 F9 FA FB FC FD FE FF -C -C + C 82 -- ESCAPE CODES -C + 300 CALL PPBTR(8,OPCODE,NOEOF) CALL PPBTR(8,ICOUNT, NOEOF) COUNT = COUNT - 1 IF(OPCODE.NE.1) GOTO 1 -C + C IT'S A VDI ESCAPE SO GET THE ESCAPE CODE -C + CALL PPBTR(16,OPCODE,NOEOF) COUNT = COUNT - 1 -C + C CHECK TO SEE IF IT IS A KNOWN NUMERIC ESCAPE -C + DO 310 I=1, NUMESC IF(OPCODE.EQ.ESNUMB(I)) GOTO 320 310 CONTINUE GOTO 340 -C + C GET THE NUMERIC ARGUMENTS -C + 320 ISTOP = MIN0(COUNT,2000) DO 330 I=1, ISTOP/2 CALL PPBTR(16,INTEGR,NOEOF) @@ -305,51 +301,51 @@ SUBROUTINE PPLOOP ENDIF 330 CONTINUE GOTO 350 -C + C IS IT A KNOWN ALHPA ESCAPE? -C + 340 CONTINUE GOTO 1 -C + 350 CALL VDESCP(OPCODE,ISTOP/2,ARGS) COUNT = COUNT - ISTOP GOTO 1 -C + C 83 -- ASPECT RATIO DEFINITION -C + 400 CALL PPBTR(16,IXDIM,NOEOF) CALL PPBTR(16,IYDIM,NOEOF) CALL PPBTR(16, JUNK,NOEOF) SCALE = AMIN1(XMAX/IXDIM,YMAX/IYDIM) GOTO 3 -C + C 84 -- NEW FILE ID SO REINITIALIZE EVERYTHING C IF FIRST FILE ID, THEN DO ALL THE ONE TIME INITIALIZATION STUFF -C + 500 IF (START) THEN c CALL VBPKG('POST ') CALL VDINIT(0.,5) CALL VDFRAM(0) -C + C FIND OUT MAXIMUM X AND Y C USED TO SCALE BGP COORDINATES TO NDC COORDINATES -C + CALL VDIQND(XMAX,YMAX) -C + C FIND OUT DEFAULT FOREGROUND AND BACKGROUND COLORS -C + CALL VDIQOS(VECTOR) NEXTFC = VECTOR(1) NEXTBC = VECTOR(2) -C + C FIND OUT THE NUMBER OF COLORS IN THE COLOR TABLE -C + INDEXA = 4 CALL VDIQDC(4,DUMMY) NUMCLR = DUMMY -C + C FIND OUT IF WE CAN USE FICHE BREAKS -C + CALL VDIQES(211,IANS) IF(IANS.EQ.2) FICHE = .TRUE. ENDIF @@ -360,9 +356,9 @@ SUBROUTINE PPLOOP TWODIM = .TRUE. BATCH = .FALSE. SCALE = AMIN1(XMAX/32767.,YMAX/32767.) -C + C RE-ESTABLISH DEFAULT COLOR TABLE -C + DO 510 I=0,255 COLMAP(I) = I TABLE(1,I) = 1. @@ -383,13 +379,13 @@ SUBROUTINE PPLOOP TABLE(1,6) = 0. IF(.NOT.START) THEN CALL VDWAIT -C + C DELETE ALL SEGMENTS -C + CALL VDESCP(203,1,0.) -C + C REESTABLISH DEFAULT SETTINGS -C + CALL VDSTOS(VECTOR) CALL VDSTCO(255,COLMAP,TABLE,0) CALL VDNWPG @@ -397,11 +393,11 @@ SUBROUTINE PPLOOP ENDIF START = .FALSE. NXTDEX = 256 -C + C IF THE DEVICE HAS LESS THAN 250 COLORS, THEN C SET UP THE MAPPINGS SO THAT THE USER WILL GET THE FIRST C FEW COLORS THEY ASK FOR. -C + IF(NUMCLR.LE.250) THEN DO 520 I=0,255 INVMAP(I) = -1 @@ -414,17 +410,17 @@ SUBROUTINE PPLOOP NEXTFC = VECTOR(1) NEXTBC = VECTOR(2) GOTO 1 -C + C 85 -- NEW PAGE -C + C IF NOTHING HAS BEEN DRAWN, THEN DON'T CALL FOR A NEW PAGE. -C + 600 IF(FIRST.AND..NOT.DRAWN) GOTO 1 FIRST = .FALSE. CALL VDWAIT -C + C RESET THE COLOR MAPS SO THE USER CAN GET A NEW SET FOR NEXT FRAM -C + IF(NUMCLR.LT.250) THEN DO 610 I= 0, 255 COLMAP(I) = -1 @@ -442,21 +438,21 @@ SUBROUTINE PPLOOP ENDIF DOFISH = .FALSE. GOTO 1 -C + C 86 -- END OF DATA FILE -C + 700 CALL VDWAIT CALL VDFRAM(1) CALL VDTERM RETURN -C + C 89 -- FICHE BREAK -C + 1000 DOFISH = FICHE GOTO 600 -C + C 90 -- DEFINE COLOR TABLE INDEX -C + 1700 CALL PPBTR(16,INDEX,NOEOF) CALL PPBTR(16,IR,NOEOF) CALL PPBTR(8,IG,NOEOF) @@ -468,10 +464,10 @@ SUBROUTINE PPLOOP TABLE(1,INDEX) = AMIN1(IR/256.+IY/256.+IM/256.+IW/256.,1.) TABLE(2,INDEX) = AMIN1(IG/256.+IY/256.+IC/256.+IW/256.,1.) TABLE(3,INDEX) = AMIN1(IB/256.+IC/256.+IM/256.+IW/256.,1.) -C + C IF THE LINK HAS ALREADY BEEN ESTABLISHED, THEN WE MAY WANT TO C CHANGE THE COLOR DYNAMICALLY. -C + IF(COLMAP(INDEX).NE.-1) THEN IF(.NOT.BATCH) THEN CALL VDSTCO(1,COLMAP(INDEX),TABLE(1,INDEX),0) @@ -484,55 +480,55 @@ SUBROUTINE PPLOOP ENDIF ENDIF GOTO 3 -C + C 91 -- SELECT COLOR -C + 1800 CALL PPBTR(16,INDEX,NOEOF) IF(COLMAP(INDEX).GE.0) CALL VDSTFC(COLMAP(INDEX)) NEXTFC = INDEX GOTO 3 -C + C 92 -- INTENSITY -C + 1900 CALL PPBTR(16,INTEN,NOEOF) CALL VDSTIN(INTEN/32767.) GOTO 3 -C + C 93 -- SET BACKGROUND COLOR -C + 2000 CALL PPBTR(16,INDEX,NOEOF) NEXTBC = INDEX IF(NEXTBC.NE.INT(VECTOR(2))) DRAWN = .TRUE. GOTO 3 -C + C A0 -- SET 2D MODE / CLEAR 3D MODE -C + 3300 TWODIM = .TRUE. GOTO 3 -C + C A1 -- SET 3D MODE / CLEAR 2D MODE -C + 3400 TWODIM = .FALSE. GOTO 3 -C + C A2 -- SET DRAW MODE / CLEAR MARK MODE -C + 3500 MARKER = .FALSE. GOTO 3 -C + C A3 -- SET MARK MODE / CLEAR DRAW MODE -C + 3600 MARKER = .TRUE. GOTO 3 -C + C A4 -- PLOT MARKER AT CURRENT POSITION -C + 3700 CALL VDIQCP(XPOS,YPOS) CALL VDPNTA(XPOS,YPOS) GOTO 3 -C + C A8 -- SET LINE STYLE -C + 4100 CALL PPBTR(16,LSTYL,NOEOF) IF(LSTYL.EQ.32767) THEN CALL VDSTLS(0) @@ -548,17 +544,17 @@ SUBROUTINE PPLOOP CALL VDSTLS(5) ENDIF GOTO 3 -C + C A9 -- SET LINE WIDTH -C + 4200 CALL PPBTR(16,LWID,NOEOF) CALL VDSTLW(LWID/32767.) GOTO 3 -C + C (PLC) -C + C AA -- POLYGONS -C + 4400 NPTS =0 4401 CALL PPBTR(16,OPCODE,NOEOF) IF(OPCODE.GE.32768)GOTO 4410 @@ -568,18 +564,18 @@ SUBROUTINE PPLOOP IF(OPCODE.GE.32768)GOTO 4410 YARRAY(NPTS) = DBLE(OPCODE) * SCALE GOTO 4401 -C + C IF IT'S AN OPCODE BUT ISN'T = AB (END OF POLYGON COMMAND), C THEN IT MUST BE AN OUT OF RANGE COORDINATE. -C + 4410 IF(OPCODE.NE.43776) THEN PRINT 10030, OPCODE 10030 FORMAT(1X,'ILLEGAL X,Y COORDINATE -- ',I5) GOTO 8 ENDIF -C + C MAKE SURE THE COLOR WE WANT HAS BEEN SET UP -C + IF(COLMAP(NEXTFC).EQ.-1) THEN INVMAP(NXTDEX) = NEXTFC COLMAP(NEXTFC) = NXTDEX @@ -588,20 +584,20 @@ SUBROUTINE PPLOOP 4411 NXTDEX = NXTDEX + 1 IF(INVMAP(NXTDEX).NE.-1) GOTO 4411 ENDIF -C + CALL VDPOLY(XARRAY,YARRAY,NPTS) GOTO 3 -C + C B0 -- TEXT STRING -C + 4900 NCHARS = MIN0(132,COUNT*2) IF(NCHARS.EQ.0) GOTO 3 DO 4910 I=1,NCHARS CALL PPBTR(8,TEXT(I),NOEOF) 4910 CONTINUE -C + C MAKE SURE THE COLOR WE WANT HAS BEEN SET UP -C + IF(COLMAP(NEXTFC).EQ.-1) THEN INVMAP(NXTDEX) = NEXTFC COLMAP(NEXTFC) = NXTDEX @@ -610,83 +606,83 @@ SUBROUTINE PPLOOP 4920 NXTDEX = NXTDEX + 1 IF(INVMAP(NXTDEX).NE.-1) GOTO 4920 ENDIF -C + IF(TEXT(NCHARS).EQ.0) NCHARS = NCHARS - 1 DRAWN = .TRUE. CALL VDTEXT(NCHARS,TEXT) COUNT = COUNT - (NCHARS+1)/2 GOTO 4900 -C + C B2 -- SET CHARACTER SIZE -C + 5100 CALL PPBTR(16,ICHAR,NOEOF) CALL VDSTCS(ICHAR/32767./.65) CALL PPBTR(16,JUNK,NOEOF) GOTO 3 -C + C C0 -- START SEGMENT -C + 6500 CALL PPBTR(16,NAME,NOEOF) CALL PPBTR(16,ITYPE,NOEOF) ARGS(1) = NAME ARGS(2) = ITYPE CALL VDESCP(200,2,ARGS) GOTO 3 -C + C C1 -- END OF SEGMENT -C + 6600 CALL VDESCP(201,0,0.) GOTO 3 -C + C C2 -- DELETE SEGMENT -C + 6700 CALL PPBTR(16,NAME,NOEOF) ARGS(1) = NAME CALL VDESCP(203,1,ARGS) GOTO 3 -C + C C3 -- DELETE ALL SEGMENTS -C + 6800 CALL VDESCP(203,1,0.) GOTO 3 -C + C C4 -- RENAME SEGMENT -C + 6900 CALL PPBTR(16,NAME1,NOEOF) CALL PPBTR(16,NAME2,NOEOF) ARGS(1) = NAME1 ARGS(2) = NAME2 CALL VDESCP(202,2,ARGS) GOTO 3 -C + C C5 -- SEGMENT ATTRIBUTES -C + 7000 CALL PPBTR(16,NAME,NOEOF) CALL PPBTR(16,IVALU,NOEOF) ARGS(1) = NAME ARGS(2) = IVALU CALL VDESCP(204,2,ARGS) GOTO 3 -C + C C7 -- BATCH COLOR TABLE UPDATE -C + 7200 BATCH = .TRUE. GOTO 3 -C + C C8 -- SEND COLOR TABLE / END BATCH UPDATE -C + 7300 BATCH = .FALSE. IF(CSPOT.GT.1) CALL VDSTCO(CSPOT-1,INDICES,RGB,0) CSPOT = 1 GOTO 3 -C + C ILLEGAL OP CODE -C + 8 PRINT 10020,OPCODE 10020 FORMAT(1X,'ILLEGAL OP CODE -- ',I5) -C + C SCAN FOR NEW FRAME -C + 9 CALL PPBTR(8,OPCODE,NOEOF) CALL PPBTR(8, COUNT,NOEOF) IF(OPCODE.NE.255) GOTO 9 @@ -702,47 +698,45 @@ SUBROUTINE PPLOOP COUNT = 2 CALL VDNWPG GOTO 1 -C + END -C -C -C + SUBROUTINE PPBTR(IWIDTH,RESULT,EOFOK) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C PPBTR - FETCH IWIDTH BITS FROM THE INPUT FILE -C + C P. WATTERBERG - 25 OCT 81 C K. Cole - 05 oct 90 added SAVE -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS - IWIDTH IS THE NUMBER OF BITS TO GET FROM THE FILE. C EOFOK IS TRUE IF AN END OF FILE CAN BE ENCOUNTERED C AND FALSE OTHERWISE. -C + C CALLS - CDRUPK, CDRRFS -C + C EXIT CONDITIONS - RESULT CONTAINS THE NEXT IWIDTH BITS OF THE FILE, RIGHT C JUSTIFIED, ZERO FILLED. OR, IF AN END OF FILE IS OK, C AND ENCOUNTERED, RESULT CONTAINS AN HEX 86 TO SIGNIFY C END OF FILE. -C + C NARRATIVE - -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + SAVE INTEGER IWIDTH, RESULT LOGICAL EOFOK -C + c TLC - made buffer one bigger so cdrupk doesn't go out of memory INTEGER BUFFER(10001), POINTR, BUFSIZ, PPREAD -C + DATA POINTR / 10001 / DATA BUFSIZ / 0 / DATA PPREAD / 55 / -C + RESULT = 0 CALL CDRUPK(BUFFER,POINTR,IBITLC,IWIDTH,RESULT) IF(POINTR.GT.BUFSIZ) THEN diff --git a/packages/seacas/libraries/svdi/test/cgidef.f b/packages/seacas/libraries/svdi/test/cgidef.f index 3a1ec464f98f..2ad37d59bdea 100644 --- a/packages/seacas/libraries/svdi/test/cgidef.f +++ b/packages/seacas/libraries/svdi/test/cgidef.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details c CGI enumerated type definitions for FORTRAN programs @@ -14,7 +14,6 @@ parameter (XEMFNM= -28372, XEMXCL= -19281, XEPCTL= -190, * XEAGMD= -23671, XEPCCL= -12048, XESVDI= -1001) - c SRCP definitions c maximum error class integer XMXERR @@ -125,7 +124,6 @@ c pattern transformation support - c color selection mode availability integer CCLRI, CCLRID parameter (CCLRI=0, CCLRID=1) diff --git a/packages/seacas/libraries/svdi/test/cgitest.f b/packages/seacas/libraries/svdi/test/cgitest.f index 7c5481f92435..5342cefbd7a0 100644 --- a/packages/seacas/libraries/svdi/test/cgitest.f +++ b/packages/seacas/libraries/svdi/test/cgitest.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details c external cgit07 @@ -32,7 +32,6 @@ * 255, 255, 0, 0, 0, 255, 255, 0, 255, * 0, 255, 255, 255, 255, 255 / - met1 = 'file55' met2 = 'meta2' diff --git a/packages/seacas/libraries/svdi/test/wsltest.f b/packages/seacas/libraries/svdi/test/wsltest.f index eae83ed79aa1..a968027cdd63 100644 --- a/packages/seacas/libraries/svdi/test/wsltest.f +++ b/packages/seacas/libraries/svdi/test/wsltest.f @@ -1,15 +1,15 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details PROGRAM WTEST05 REAL X(102), Y(102) CHARACTER COLOR(7)*4 -C + DATA COLOR/'RED','GREE','YELL','BLUE','MAGE','CYAN','WHIT'/ -C + CALL WSTART(0.,0) CALL WTTYPE('SOFT') DO 10 I=1,102 diff --git a/packages/seacas/libraries/svdi/vdi_drivers/vcjob.blk b/packages/seacas/libraries/svdi/vdi_drivers/vcjob.blk index 5b25cb05ddbf..b91aabd0177d 100644 --- a/packages/seacas/libraries/svdi/vdi_drivers/vcjob.blk +++ b/packages/seacas/libraries/svdi/vdi_drivers/vcjob.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details INTEGER*4 MACHIN(3),MACLEN INTEGER*4 KIDSIZ,KJOBID(4),KUSRSZ,KUSRID(4),KSZROU diff --git a/packages/seacas/libraries/svdi/vdi_drivers/vcpstc.blk b/packages/seacas/libraries/svdi/vdi_drivers/vcpstc.blk index a8b5ad7c4e78..ad3fe127cd06 100644 --- a/packages/seacas/libraries/svdi/vdi_drivers/vcpstc.blk +++ b/packages/seacas/libraries/svdi/vdi_drivers/vcpstc.blk @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details INTEGER*4 KWRTFL,KRDFL,KOUTFL,KINFL,KWRDSZ,KBYTEL,KCPW,KBAUD, 1KCOMTP diff --git a/packages/seacas/libraries/svdi/vdi_drivers/vdicps.f b/packages/seacas/libraries/svdi/vdi_drivers/vdicps.f index 942ff94819a1..560887e1e6c1 100644 --- a/packages/seacas/libraries/svdi/vdi_drivers/vdicps.f +++ b/packages/seacas/libraries/svdi/vdi_drivers/vdicps.f @@ -1,15 +1,15 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details SUBROUTINE VIINIT(ASPECT,JUSTIF) -C + C VDI-PostScript driver - B&W and COLOR versions C Adapted for all systems by S.L.Thompson C Original code from D.Campbell and J.LONG -C + C vdi device numbers are C device number C black & white, batch, no poly fill 799.1 @@ -22,46 +22,46 @@ SUBROUTINE VIINIT(ASPECT,JUSTIF) C color, interactive, black-white interchange 799.8 C color, batch, black background 799.9 C color, interactive, black background 799.11 -C + C last mod 6/20/90 slt -C + C Note that there are several parameters to set depending on how C the package is to be used. Most are in routine pstsel routine C which is called at the first of this routine (viinit.) Two other c parameters (xinch,yinch) are set in this routine and vdiqd9. -C + C This code is for BOTH color and black & white systems. C Flag is set for mode in pstsel. -C + C Device can be set with escape call before call to vdinit. C Otherwise, code will interactively ask for device type. C There is also an escape flag for landscape or portrait format. -C + C This deck was generated from a qms driver and still has the C qms comments in places. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VIINIT -Initialize SVDI. postscript device -C + C D.L. CAMPBELL -1-DEC-1986 C J.P. LONG -9-NOV-1987 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C (postscript) -C + C ENTRY CONDITIONS -ASPECT = real ratio of X dimension to Y dimension. C Range >0.0. Default: 0. (device dependent). C JUSTIF = integer justification of NDC space on the C device. Range 0-9. Default: 0 (device dependent.) -C + C CALLS -VBERRH,VDSTCS,VDSTLW,VIMOVA -C + C EXIT CONDITIONS -XNDCMX,YNDCMX = real NDC maximum valid values(as C constrained by ASPECT). C VECTOR = real array of attribute values(all device C dependent except VECTOR(4)=0.0). -C + C NARRATIVE -This must be the first SVDI call made. All C attribute values, the color table, and current C position are set to appropriate defaults for the @@ -69,7 +69,7 @@ SUBROUTINE VIINIT(ASPECT,JUSTIF) C is done. The screen is cleared or paper advanced C if necessary to guarantee a blank view surface for C drawing on. -C + C ASPECT specifies the ratio of the X dimension to the C Y dimension . Maximum NDC values (at least one of C which will be 1.0) are computed to give the ASPECT @@ -80,7 +80,7 @@ SUBROUTINE VIINIT(ASPECT,JUSTIF) C aspect of 1.0. The NDC rectangle is scaled until C one dimension fills the corresponding dimension of C the device. -C + C JUSTIF determines where the rectangle is located on C the device as diagrammed below: C --------- @@ -90,22 +90,22 @@ SUBROUTINE VIINIT(ASPECT,JUSTIF) C --------- C For example, JUSTIF = 7 indicates NDC space will be C upper left justified on the device. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC -C + C Set parameters for type of usage. C Two settings are coded - one for square field of view C and one for full field of view. -C + C If VDIQDC is called before vdinit, full field of view is selected. C Otherwise, square is used. -C + C size of full view PARAMETER (XINCHO=10.0) PARAMETER (YINCHO=7.5) -C + C size of square view C PARAMETER (XINCHO=7.5) C PARAMETER (YINCHO=7.5) @@ -116,14 +116,14 @@ SUBROUTINE VIINIT(ASPECT,JUSTIF) C PARAMETER (YINCHO=7.4412525) *- COMMON /VCMODR/ XINCH, YINCH -C + CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC -C + REAL ASPECT INTEGER JUSTIF COMMON /VCVEC1/ IVECT INTEGER IVECT -C + C MAXIMUM VALID NDC VALUES. (DEVICE-INDEPENDENT) REAL XNDCMX,YNDCMX COMMON /VCNDCM/ XNDCMX,YNDCMX @@ -140,7 +140,7 @@ SUBROUTINE VIINIT(ASPECT,JUSTIF) C CURRENT POSITION. REAL XCP,YCP COMMON /VCCRPS/ XCP,YCP -C + C COMPUTER DEPENDENT COMMON VARIABLES AND CONSTANTS. include 'vcpstc.blk' C SCALE FACTORS FOR NDC TO DC MAPPING. (LXY,HC1) @@ -151,7 +151,7 @@ SUBROUTINE VIINIT(ASPECT,JUSTIF) COMMON /VCDDIM/ XPAD,YPAD,XDEVIC,YDEVIC C JOB ID INFORMATION. (HC1, DIC) include 'vcjob.blk' -C + COMMON /DEVCAP/ DEV(33) C ESCAPE FLAGS C PATNO AND BORDER USED BY VIPOLY FOR FILL PATTERN AND BORDER ON/OFF; @@ -159,7 +159,7 @@ SUBROUTINE VIINIT(ASPECT,JUSTIF) COMMON /VCESCP/ PGFORM,PATNO,BORDER INTEGER PGFORM,PATNO,BORDER CHARACTER COORD*20,XCOORD*4,YCOORD*4 -C + C pstmlw controls minimum line width C kpstbg controls background coloring C = 0, not colored (white ground from paper) @@ -168,20 +168,19 @@ SUBROUTINE VIINIT(ASPECT,JUSTIF) C = 0, no interchange C = 1, colors interchanged COMMON /VCPSTA/ PSTMLW, KPSTBG, KPSTCI -C + C mopoly controls polygon fill =0, on ; =1, off C mocolr controls color =0, on ; =1, off COMMON /VCPSTB/ MOPOLY, MOCOLR -C + DIMENSION COLDEF(3) -C + C vcpstd variables control what to do with empty frames with C command is received to dump data to output C kempty=0, frame is void - do not draw C >0, frame has data - draw it COMMON /VCPSTD/ KEMPTY -C -C + DEV(1) = 0.0 dev(2) = 1.0 dev(3) = 1.0 @@ -230,7 +229,7 @@ SUBROUTINE VIINIT(ASPECT,JUSTIF) C (5)=LINE WIDTH - ABOUT 1/72 INCHES C (6)=CHARACTER BOX Y - ABOUT 1/10 INCHES C (7)=CHARACTER BOX X - 5/7 OF BOX-Y -C + vector(1) = 0.0 vector(2) = 7.0 vector(3) = 1.0 @@ -238,7 +237,7 @@ SUBROUTINE VIINIT(ASPECT,JUSTIF) vector(5) = 0.06255 vector(6) = 0.01 vector(7) = 0.0 -C + C PROTECT INPUT PARAMETERS FROM BEING CHANGED. ASPEC1=ASPECT JUSTI1=JUSTIF @@ -249,21 +248,21 @@ SUBROUTINE VIINIT(ASPECT,JUSTIF) BORDER = 1 XCP = 0.0 YCP = 0.0 -C + C CHECK FOR VALID ASPECT. IF(ASPECT.LT.0.0) THEN CALL VBERRH(721,5), C AND USE DEFAULT ASPECT. IF(ASPECT.LT.0.0) THEN CALL VBERRH(721,5) ASPEC1=0.0 END IF -C + C CHECK FOR VALID JUSTIF. IF(JUSTIF.LT.0 .OR. JUSTIF.GT.9) THEN C CALL VBERRH(720,5), AND USE DEFAULT JUSTIF. IF(JUSTIF.LT.0.OR.JUSTIF.GT.9) THEN CALL VBERRH(720,5) JUSTI1=0 END IF -C + C SCALE NDC UNITS TO DEVICE UNITS. C FOR QMS, THE PHYSICAL PLOT SURFACE IS XINCH X YINCH (10.x7.5). C DEVICE COORDINATES ARE KEPT IN 1/723 INCH TO GAIN SIMPLICITY @@ -274,14 +273,14 @@ SUBROUTINE VIINIT(ASPECT,JUSTIF) C ADDRESSABILITY,USING AS MUCH OF THE SPACE AS POSSIBLE. XINCH=XINCHO YINCH=YINCHO -C + C test for rscors post or direct mode. Use 7.5x7.5 for direct C and 10.0x7.5 for post -C + C if VDIQDC has already been called, we are in post mode; C otherwise in direct mode CALL VDIQD9(XINCH,YINCH) -C + C CHECK PAGE FORMAT - IF PORTRAIT, C THEN SWITCH THINGS AROUND IF (PGFORM.EQ.1) THEN @@ -298,13 +297,13 @@ SUBROUTINE VIINIT(ASPECT,JUSTIF) XUNITS=XINCH*723. YUNITS=YINCH*723. DASPEC=XUNITS/YUNITS -C + C DEFAULT ASPECT = 1., DEFAULT JUSTIF = 1. IF(ASPEC1.EQ.0.) ASPEC1=DASPEC IF(JUSTI1.EQ.0) JUSTI1=1 -C + IF(ASPEC1.GE.DASPEC) THEN -C + C THEN X DIMENSION IS FILLED. XDEVIC=XUNITS YDEVIC=XUNITS/ASPEC1 @@ -318,7 +317,7 @@ SUBROUTINE VIINIT(ASPECT,JUSTIF) YPAD=YUNITS-YDEVIC END IF ELSE -C + C ELSE Y DIMENSION IS FILLED. XDEVIC=YUNITS*ASPEC1 YDEVIC=YUNITS @@ -332,7 +331,7 @@ SUBROUTINE VIINIT(ASPECT,JUSTIF) XPAD=0 END IF END IF -C + C FIGURE MAXIMUM NDC VALUES XNDCMX AND YNDCMX. IF(ASPEC1.GE.DASPEC) THEN XNDCMX=MIN(1.,ASPEC1) @@ -341,7 +340,7 @@ SUBROUTINE VIINIT(ASPECT,JUSTIF) XNDCMX=ASPEC1 YNDCMX=1. END IF -C + C SET SCALE FACTORS FOR NDC-TO-DEVICE MAPPING. XSCALE=DBLE(XDEVIC)/XNDCMX YSCALE=DBLE(YDEVIC)/YNDCMX @@ -352,21 +351,21 @@ SUBROUTINE VIINIT(ASPECT,JUSTIF) XPAD = XPAD+280. YPAD = YPAD-180. ENDIF -C + CALL PSTSEL(' ') -C + C SET UP MONITORING INFORMATION CALL VBDEV('V PST ') CALL VDMONI(0) IVECT=0 -C + C OPEN OUTPUT FILE CALL PSTOFS(KOUTFL) -C + C INITIALIZE the printer -C + CALL PSTINI -C + CALL PSTBUF(38, '%%Title: Graphics SVDI PostScript File') CALL PSTBUF(0,' ') CALL PSTBUF(40, '%%Creator: SNL SEACAS SVDI Driver -- cps') @@ -429,15 +428,15 @@ SUBROUTINE VIINIT(ASPECT,JUSTIF) CALL PSTBUF(17,'/o {newpath} def ') ENDIF CALL PSTBUF(35,'/p {showpage} def 1 setlinecap v o ') -C + C check for color or black & white mode -C + IF(MOCOLR.EQ.0) THEN -C + C color is on -C + C define some kind of color table -C + DO 120 IC=0,7 COLDEF(1)=0. COLDEF(2)=0. @@ -474,17 +473,17 @@ SUBROUTINE VIINIT(ASPECT,JUSTIF) END IF VECTOR(1)=7. VECTOR(2)=0. -C + C define the postscript current position CALL VBVECT(0,XCP,YCP) -C + C shade background if appropriate -C + IF(KPSTBG.NE.0) THEN CALL PSTBBG KEMPTY=0 END IF -C + C INIT LINE WIDTH,CHARACTER SIZE CALL VDSTLW(VECTOR(5)) c CALL VDSTCS(VECTOR(6)) @@ -494,18 +493,18 @@ SUBROUTINE VIINIT(ASPECT,JUSTIF) END SUBROUTINE VDIQDC(INDEX,VALUE) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDIQDC -Inquire Device Capabilities. -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS -INDEX = integer capability number. Range 1-33. -C + C CALLS - -C + C EXIT CONDITIONS -VALUE = real value of the capability indicated by C INDEX. -C + C NARRATIVE -Return values of various device capabilities. INDEX C is the integer capability number (as given below), C and the real value is returned in VALUE. @@ -639,9 +638,9 @@ SUBROUTINE VDIQDC(INDEX,VALUE) C 33. Device pixel aspect - the ratio of the spacing of device C pixels in x divided by the spacing in y (1 for square C pixels) -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + SAVE INTEGER INDEX REAL VALUE @@ -650,11 +649,11 @@ SUBROUTINE VDIQDC(INDEX,VALUE) C DEFAULT COMPLETE FILL WITH BORDER. PLC. COMMON /VCESCP/ PGFORM,PATNO,BORDER INTEGER PGFORM,PATNO,BORDER -C + C mopoly controls polygon fill =0, on ; =1, off C mocolr controls color =0, on ; =1, off COMMON /VCPSTB/ MOPOLY, MOCOLR -C + *- INCLUDE PSTFULL C size of full view window C parameters set to get same size plot as imagen and qms b&w. @@ -665,33 +664,33 @@ SUBROUTINE VDIQDC(INDEX,VALUE) COMMON /DEVCAP/ DEV(33) DATA NOCALL /0/ -C + C If device is 0, call to reset -C + IF(NINT(DEV(23)).EQ.0) THEN CALL PSTSEL(' ') END IF -C + C CHECK FOR VALID INDEX. IF(INDEX.LT.1.OR.INDEX.GT.33) THEN CALL VBERRH(726,5) GOTO 999 END IF -C + C RETURN INDEXED VALUE. VALUE=DEV(INDEX) IF(INDEX.EQ.23) NOCALL=1 -C + 999 RETURN -C + C********************************************************************** ENTRY VDIQD9(XINCH,YINCH) -C + C This is an added entry for rscors version of pst driver to C tell if direct or post mode operation. If post mode, vdiqdc C is called before vdinit to get terminal type. In direct mode C it is never called to get type. -C + IF(NOCALL.NE.0) THEN C XINCH=10.0 C YINCH=7.5 @@ -702,23 +701,23 @@ SUBROUTINE VDIQDC(INDEX,VALUE) END SUBROUTINE VBERRH(ERRNUM,ERRSEV) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VBERRH -Error Handler. -C + C R.W.Simons -08APR81 C 30SEP81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -ERRNUM = integer error number. C ERRSEV = integer severity code. If > 12, error is C fatal. -C + C CALLS -VDLOGE. -C + C EXIT CONDITIONS - -C + C NARRATIVE -An error will normally cause an error message to C be printed on the error output device and possible C termination of the program, unless a routine VBERRH @@ -728,43 +727,43 @@ SUBROUTINE VBERRH(ERRNUM,ERRSEV) C returning. All versions of VBERRH, whether user- C supplied or default, must STOP on any error severity C greater than 12. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER ERRNUM,ERRSEV -C + C REPORT THE ERROR USING VDLOGE. CALL VDLOGE(ERRNUM,ERRSEV) -C + C CHECK FOR FATAL ERROR. IF(ERRSEV.GT.12) STOP -C + RETURN END SUBROUTINE VDGNAM(NAME) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDGNAM -Name the graphics output file -C + C P.L.Crotty -OCT88 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -NAME = character string; < 80 characters -C + C CALLS -C + C EXIT CONDITIONS -output graphics file is assigned the name NAME -C + C NARRATIVE -This subroutine associates a file name with C the graphics output file (KOUTFL). If this C routine is not called, a system dependent C default name is used. VDGNAM must be called C before VDINIT. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + SAVE CHARACTER*(*) NAME CHARACTER*132 PSTNAM @@ -825,26 +824,26 @@ SUBROUTINE VDGNAM(NAME) END SUBROUTINE VDINIT(ASPECT,JUSTIF) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDINIT -Initialize SVDI. -C + C R.W.Simons -08APR81 C 30SEP81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -ASPECT = real ratio of X dimension to Y dimension. C Range >0.0. Default: 0.0 (device dependent). C JUSTIF = integer justification of NDC space on the C device. Range 0-9. Default: 0 (device dependent). -C + C CALLS -PSTJOB, VBERRH, VIINIT. -C + C EXIT CONDITIONS -XNDCMX,YNDCMX = real NDC maximum valid values. C VECTOR = real array of default attribute values (all C device-dependent except VECTOR(4)=0.0). -C + C NARRATIVE -This must be the first SVDI call made. All C attribute values, the color table, and current C position are set to appropriate defaults for the @@ -852,7 +851,7 @@ SUBROUTINE VDINIT(ASPECT,JUSTIF) C is done. The screen is cleared or paper advanced C if necessary to guarantee a blank view surface for C drawing. -C + C ASPECT specifies the ratio of the X dimension to the C Y dimension. Maximum NDC values (at least one of C which will be 1.0) are computed to give the ASPECT @@ -863,7 +862,7 @@ SUBROUTINE VDINIT(ASPECT,JUSTIF) C aspect of 1.0. The NDC rectangle is scaled until C one dimension fills the corresponding dimension of C the device. -C + C JUSTIF determines where the rectangle is located on C the device as diagrammed below: C --------- @@ -873,18 +872,18 @@ SUBROUTINE VDINIT(ASPECT,JUSTIF) C --------- C For example, JUSTIF = 7 indicates NDC space will be C upper left justified on the device. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL ASPECT INTEGER JUSTIF -C + C JOB ID INFORMATION. (HC1, DIC) include 'vcjob.blk' -C + C COMPUTER DEPENDENT COMMON VARIABLES AND CONSTANTS. include 'vcpstc.blk' -C + C set common variables KWRTFL=6 KRDFL=0 @@ -902,64 +901,64 @@ SUBROUTINE VDINIT(ASPECT,JUSTIF) C IF(KSECUR.NE.0) THEN C CALL VBERRH(957,13) C END IF -C + C THIS IS JUST A DUMMY ROUTINE WHICH DOES NOTHING BUT CALL VIINIT. C THIS ORGANIZATION FACILITATES ADDING SECURITY MARKINGS TO SVDI. CALL VIINIT(ASPECT,JUSTIF) -C + RETURN END SUBROUTINE VDIQND(XNDC,YNDC) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDIQND -Inquire NDC Space. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -XNDCMX,YNDCMX = real maximum valid NDC values. -C + C CALLS - -C + C EXIT CONDITIONS -XNDC,YNDC = real maximum valid NDC values (XNDCMX, C YNDCMX). -C + C NARRATIVE -Return the maximum NDC values as set to realize the C aspect defined by VDINIT. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL XNDC,YNDC -C + C MAXIMUM VALID NDC VALUES. (DEVICE-INDEPENDENT) REAL XNDCMX,YNDCMX COMMON /VCNDCM/ XNDCMX,YNDCMX -C + C RETURN THE MAXIMUM VALID NDC VALUES. XNDC=XNDCMX YNDC=YNDCMX -C + RETURN END SUBROUTINE VDIQOS(ATTARR) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDIQOS -Inquire Output Status (of Attributes). -C + C K.M. ERICKSON -14 NOV 80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -VECTOR = real array of current attribute values. -C + C CALLS - -C + C EXIT CONDITIONS -ATTARR = real array of current attribute value C (VECTOR). -C + C NARRATIVE -Return the current attribute values in ATTARR as C given below. C ATTARR(1)=Foreground Color @@ -969,11 +968,11 @@ SUBROUTINE VDIQOS(ATTARR) C (5)=Line Width C (6)=Character Box Y C (7)=Character Box X -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL ATTARR(7) -C + C CURRENT ATTRIBUTE VALUES. (DEVICE-INDEPENDENT) REAL VECTOR(7) COMMON /VCATTR/ VECTOR @@ -984,64 +983,64 @@ SUBROUTINE VDIQOS(ATTARR) C (5)=LINE WIDTH C (6)=CHARACTER BOX Y C (7)=CHARACTER BOX X -C + INTEGER I -C + DO 100 I=1,7 ATTARR(I)=VECTOR(I) 100 CONTINUE -C + RETURN END SUBROUTINE VDLINA(X,Y) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDLINA -Line Absolute. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -X,Y = real NDC position. -C + C CALLS -VILINA. -C + C EXIT CONDITIONS - -C + C NARRATIVE -Draw a line from current position to absolute NDC C position X,Y and update current position. C Attributes foreground color, intensity, line style, C and line width apply. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL X,Y -C + C THIS IS JUST A DUMMY ROUTINE WHICH DOES NOTHING BUT CALL VILINA. C THIS ORGANIZATION FACILITATES ADDING SECURITY MARKINGS TO SVDI. CALL VILINA(X,Y) -C + RETURN END SUBROUTINE VDLOGE(ERRNUM,ERRSEV) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDLOGE -Log Error. -C + C R.W.Simons -08APR81 C K.M.Erickson -8OCT84 - add buffer flush -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -ERRNUM = integer error number. C ERRSEV = integer error severity. -C + C CALLS -PSTTBK, VDBUFL -C + C EXIT CONDITIONS - -C + C NARRATIVE -Report error with message to user and possibly C terminate job depending on severity. Notice that C by judicious use of the error routines (see VBERRH) @@ -1050,44 +1049,42 @@ SUBROUTINE VDLOGE(ERRNUM,ERRSEV) C occurrences of a particular error, or terminate C if more than 10 errors of a particular severity C occur. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER ERRNUM,ERRSEV -C -C + C COMPUTER DEPENDENT COMMON VARIABLES AND CONSTANTS. include 'vcpstc.blk' -C + C flush buffer before we do a write CALL VDBUFL -C + C WRITE THE ERROR TO THE LISTING. WRITE(KWRTFL,10)ERRNUM,ERRSEV 10 FORMAT(' SVDI ERROR NUMBER ',I5,' SEVERITY CODE ',I5) -C + C TRACEBACK. csam CALL PSTTBK -C + RETURN END SUBROUTINE VDMONI(ISTATE) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDMONI -Logs Usage Information.. -C -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -ISTATE = 0 - initialization C 1 - new page C 2 - terminate -C + C CALLS -C + C EXIT CONDITIONS - -C + C NARRATIVE -For ISTATE=0, job information is initialized, and C timers are initialized called by VIINIT. C ISTATE=1 will increment a common block page @@ -1101,16 +1098,16 @@ SUBROUTINE VDMONI(ISTATE) C Entry point VBDEV has an 8 character parameter C which will set a common block variable specifying C the device being used. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C dummy routine -C + CHARACTER*(*) C1,C2 -C + RETURN C Usage Monitoring Information -C + ENTRY VBPKG (C1) RETURN ENTRY VBDEV (C2) @@ -1124,106 +1121,106 @@ SUBROUTINE VDMONI(ISTATE) END SUBROUTINE VDMOVA(X,Y) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDMOVA -Move Absolute. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -X,Y = real NDC position. -C + C CALLS -VIMOVA -C + C EXIT CONDITIONS - -C + C NARRATIVE -Set current position to absolute NDC position X,Y. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL X,Y -C + C THIS IS JUST A DUMMY ROUTINE WHICH DOES NOTHING BUT CALL VIMOVA. C THIS ORGANIZATION FACILITATES ADDING SECURITY MARKINGS TO SVDI. CALL VIMOVA(X,Y) -C + RETURN END SUBROUTINE VDNWPG C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDNWPG -New Page. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS - -C + C CALLS -VINWPG. -C + C EXIT CONDITIONS - -C + C NARRATIVE -Physically advance the medium or clear the screen, C whichever is appropriate. Also flood the screen C with the background color on devices that support C this function. The current position is not changed. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C THIS IS JUST A DUMMY ROUTINE WHICH DOES NOTHING BUT CALL VINWPG. C THIS ORGANIZATION FACILITATES ADDING SECURITY MARKINGS TO SVDI. CALL VINWPG -C + RETURN END SUBROUTINE VDPNTA(X,Y) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDPNTA -Point Absolute. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -X,Y = real NDC position. -C + C CALLS -VIPNTA. -C + C EXIT CONDITIONS - -C + C NARRATIVE -Set current position to absolute NDC position X,Y C and put a visible point there. Attributes C foreground color and intensity apply. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL X,Y -C + C THIS IS JUST A DUMMY ROUTINE WHICH DOES NOTHING BUT CALL VIPNTA. C THIS ORGANIZATION FACILITATES ADDING SECURITY MARKINGS TO SVDI. CALL VIPNTA(X,Y) -C + RETURN END SUBROUTINE VDPOLY(XARRAY,YARRAY,NPTS) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDPOLY -POLYGON FILL ROUTINE -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS -XARRAY-ARRAY OF X VALUES OF THE POLYGON C YARRAY-CORRESPONDING ARRAY OF Y VALUES C NPTS- NUMBER OF POINTS IN (XARRAY,YARRAY) -C + C CALLS -VIPOLY -C + C EXIT CONDITIONS - -C + C NARRATIVE -The polygon defined by XARRAY,YARRAY will be drawn C and filled (constrained by any limitations of the C physical device -- see below). No checking will be @@ -1232,11 +1229,11 @@ SUBROUTINE VDPOLY(XARRAY,YARRAY,NPTS) C boundary is drawn using the solid line style. C VDI will close the polygon (i.e. the last point C will be connected to the first). -C + C The level of support for this primitive is device- C dependent. The level of support is categorized C as follows: -C + C Level 0 -- no polygon fill. Only the polygon C boundary is drawn. C Level 1 -- the device fills convex polygons. @@ -1249,43 +1246,43 @@ SUBROUTINE VDPOLY(XARRAY,YARRAY,NPTS) C is drawn to that point from a point far outside C the polygon, that line intersects the polygon C boundary an odd number of times. -C + C Note that the level of support for a particular device C can be inquired using the function VDIQDC. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER NPTS REAL XARRAY(NPTS),YARRAY(NPTS) -C + C THIS IS JUST A DUMMY ROUTINE WHICH DOES NOTHING BUT CALL VIPOLY. C THIS ORGANIZATION FACILITATES ADDING SECURITY MARKINGS TO SVDI. C mopoly controls polygon fill =0, on ; =1, off C mocolr controls color =0, on ; =1, off COMMON /VCPSTB/ MOPOLY, MOCOLR -C + IF(MOPOLY.EQ.0) THEN CALL VIPOLY(XARRAY,YARRAY,NPTS) END IF -C + RETURN END SUBROUTINE VDSTOS(ATTARR) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDSTOS -Set Output Status (of Attributes). -C + C K.M. ERICKSON -14 NOV 80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -ATTARR = real array of attribute values. -C + C CALLS -VDSTBC,VDSTCS,VDSTFC,VDSTIN,VDSTLS,VDSTLW -C + C EXIT CONDITIONS -VECTOR = real updated attribute values (ATTARR). -C + C NARRATIVE -Set the attribute values from ATTARR as given below. C ATTARR(1)=Foreground Color C (2)=Background Color @@ -1293,11 +1290,11 @@ SUBROUTINE VDSTOS(ATTARR) C (4)=Line Style C (5)=Line Width C (6)=Character Box Y -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL ATTARR(6) -C + C CURRENT ATTRIBUTE VALUES. (DEVICE-INDEPENDENT) REAL VECTOR(7) COMMON /VCATTR/ VECTOR @@ -1308,7 +1305,7 @@ SUBROUTINE VDSTOS(ATTARR) C (5)=LINE WIDTH C (6)=CHARACTER BOX Y C (7)=CHARACTER BOX X -C + C CALL EACH OF THE INDIVIDUAL ATTRIBUTE SETTING ROUTINES. C CHECK FOR VALIDITY OF INPUT VALUES WILL BE DONE IN EACH INDIVIDUAL C ROUTINE. @@ -1318,56 +1315,56 @@ SUBROUTINE VDSTOS(ATTARR) CALL VDSTLS(NINT(ATTARR(4))) CALL VDSTLW(ATTARR(5)) c CALL VDSTCS(ATTARR(6)) -C + RETURN END SUBROUTINE VDTERM C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDTERM -Terminate SVDI. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS - -C + C CALLS -VITERM. -C + C EXIT CONDITIONS - -C + C NARRATIVE -Terminate the SVDI by flushing buffers, etc. This C should be the last SVDI call made. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C THIS IS JUST A DUMMY ROUTINE WHICH DOES NOTHING BUT CALL VITERM. C THIS ORGANIZATION FACILITATES ADDING SECURITY MARKINGS TO SVDI. CALL VITERM -C + RETURN END SUBROUTINE VDTEXT(LENGTH,CHARS) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDTEXT -Text from Array. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -LENGTH = integer number of characters in CHARS. C Range 1-136. C CHARS = integer array of ASCII characters, one C character per array element, right justified. C Range 8,10,32-126. -C + C CALLS -VITEXT. -C + C EXIT CONDITIONS - -C + C NARRATIVE -Draw LENGTH characters in CHARS, starting at C current position and update current position to C the point after the last character box where the @@ -1380,178 +1377,176 @@ SUBROUTINE VDTEXT(LENGTH,CHARS) C considered reasonable. Attributes foreground color, C background color, intensity, and character size C apply. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER LENGTH,CHARS(136) -C + C THIS IS JUST A DUMMY ROUTINE WHICH DOES NOTHING BUT CALL VITEXT. C THIS ORGANIZATION FACILITATES ADDING SECURITY NARKINGS TO SVDI. CALL VITEXT(LENGTH,CHARS) -C + RETURN END SUBROUTINE VDFRAM(ITYPE) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDFRAM - Draw header or trailer frame -C + C P. Watterberg - 27 Aug 81 -C + C ENVIRONMENT -Computer-independent, system-independent, FORTRAN 77 -C + C ENTRY CONDITIONS - ITYPE = 0 for header frame C = 1 for trailer frame -C + C CALLS - VIFRAM -C + C EXIT CONDITIONS - -C + C NARRATIVE - Calls vifram to get time and date from the C system via the computer-dependent routine PSTTOD(entry C point in PSTJOB) and writes it on an identification frame. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER ITYPE -C + CALL VIFRAM(ITYPE) RETURN END SUBROUTINE VIFRAM(ITYPE) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VIFRAM - Draw header or trailer frame -C + C P. Watterberg - 27 Aug 81 -C + C ENVIRONMENT -Computer-independent, system-independent, FORTRAN 77 -C + C ENTRY CONDITIONS - ITYPE = 0 for header frame C = 1 for trailer frame -C + C CALLS - -C + C EXIT CONDITIONS - -C + C NARRATIVE -NULL ROUTINE -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER ITYPE -C + RETURN END SUBROUTINE VDAABU(BTNNUM) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDAABU -Await Any Button. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Batch Devices. -C + C ENTRY CONDITIONS - -C + C CALLS - -C + C EXIT CONDITIONS -BTNNUM = integer number of the button pressed. C Range 1 to a device dependent maximum which must be C at least 8. -C + C NARRATIVE -When a button has been pressed, its integer button C number is returned in BTNNUM. This function flushes C the button buffer, if any. This function flushes C the output buffers before doing input. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER BTNNUM -C -C + C COMPUTER DEPENDENT COMMON VARIABLES AND CONSTANTS. include 'vcpstc.blk' -C + C BATCH DEVICES DON'T NEED TO FLUSH BUFFERS. -C + BTNNUM=32 -C + RETURN END SUBROUTINE VDABGL(BTNNUM,X,Y) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDABGL -Await Button, Get Locator. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Batch Devices. -C + C ENTRY CONDITIONS - -C + C CALLS - -C + C EXIT CONDITIONS -BTNNUM = integer number of the button pressed. C Range 1 to a device dependent maximum that must be C at least 8. C X,Y = real NDC position of the locator. -C + C NARRATIVE -Wait until a button is hit, then return the number C of the button in BTNNUM and the NDC value of the C locator in X,Y. This function flushes the output C buffers before doing input. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL X,Y INTEGER BTNNUM -C -C + C COMPUTER DEPENDENT COMMON VARIABLES AND CONSTANTS. include 'vcpstc.blk' -C + C BATCH DEVICES DON'T NEED TO FLUSH BUFFERS. -C + BTNNUM=32 X=0 Y=0 -C + RETURN END SUBROUTINE VDAKGL(CHAR,X,Y) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDAKGL -Await Keyboard, Get Locator. -C + C R.W.SIMONS -02DEC80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Batch Devices. -C + C ENTRY CONDITIONS - -C + C CALLS - -C + C EXIT CONDITIONS -CHAR = integer ASCII character input from the C keyboard, right-justified, zero fill. Range 32-126. C X,Y = real NDC position of the locator. -C + C NARRATIVE -Wait until a key is hit, then return the character C entered in CHAR and the NDC value of the locator C in X,Y. If the character entered does not fall in C the range 32-126, a blank(32) is returned in CHAR. C This function flushes the output buffers before C doing input. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL X,Y INTEGER CHAR -C + C dummy routine -C + CHAR=32 X=0. Y=0. @@ -1559,20 +1554,20 @@ SUBROUTINE VDAKGL(CHAR,X,Y) END SUBROUTINE VDALOC(X,Y) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDALOC -Await Locator. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Batch Devices. -C + C ENTRY CONDITIONS - -C + C CALLS - -C + C EXIT CONDITIONS -X,Y = real NDC position of the locator. -C + C NARRATIVE -Wait until the locator is positioned, then return C the NDC value of the locator in X,Y. The fact that C the locator is positioned can be signaled in a @@ -1583,150 +1578,149 @@ SUBROUTINE VDALOC(X,Y) C function, as only the locator position is returned. C This function flushes the output buffers before C doing input. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL X,Y -C -C + C COMPUTER DEPENDENT COMMON VARIABLES AND CONSTANTS. include 'vcpstc.blk' -C + C BATCH DEVICES DON'T NEED TO FLUSH BUFFERS. -C + X=0 Y=0 -C + RETURN END SUBROUTINE VDBELL C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDBELL -Ring Bell -C + C R.W.SIMONS -02DEC80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Batch Devices. -C + C ENTRY CONDITIONS - -C + C CALLS - -C + C EXIT CONDITIONS - -C + C NARRATIVE -Ring user's bell to get his attention. This C function is ignored by batch devices. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C THIS FUNCTION IS IGNORED BY BATCH DEVICES. -C + RETURN END SUBROUTINE VDBUFL C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDBUFL -Buffer Flush. -C + C R.W.Simons -19DEC80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Batch Devices. -C + C ENTRY CONDITIONS - -C + C CALLS - -C + C EXIT CONDITIONS - -C + C NARRATIVE -Assure that the picture is up-to-date by flushing C buffers if necessary. Also prepare the device to C operate in alphanumeric (as opposed to graphic) C mode. This is necessary on some devices so that C alphanumeric data from FORTRAN I/O won't be C misinterpreted as graphic data. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C THIS FUNCTION IS IGNORED BY BATCH DEVICES. -C + RETURN END SUBROUTINE VDSTLA(LOCX,LOCY) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDSTLA -Set Initial Locator Position. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Batch Devices. -C + C ENTRY CONDITIONS -LOCX,LOCY = real NDC position that the locator is C initilaized to. -C + C CALLS - -C + C EXIT CONDITIONS - -C + C NARRATIVE -Set the initial locator position (light pen tracking C cross, for example) each time this function is C called. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL LOCX,LOCY -C + C BATCH DEVICES IGNORE THIS FUNCTION. -C + RETURN END SUBROUTINE VDWAIT C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDWAIT -Wait for User. -C + C R.W.SIMONS -02DEC80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Batch Devices. -C + C ENTRY CONDITIONS - -C + C CALLS - -C + C EXIT CONDITIONS - -C + C NARRATIVE -Wait for the user to view the screen and signal he C is done, normally by hitting any key. This function C flushes the output buffers before doing input. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C BATCH DEVICES IGNORE THIS COMMAND. -C + RETURN END SUBROUTINE VDIQCO(NUM,INDEX,CLRARY,CLRMOD) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDIQCO -Inquire Color Table. -C + C R.W.Simons -08APR81 C H. S. LAUSON 29MAY86 - changed for current HLS interpretation -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Black and White Devices. (LXY, HC1, ALP) -C + C ENTRY CONDITIONS -NUM = integer number of color indexes to inquire. C Range 1-256. C INDEX = integer array of indexes to inquire. Range C 0-255. C CLRMOD = integer color model to be used. Range 0,1. -C + C CALLS -VBERRH -C + C EXIT CONDITIONS -CLRARY = real array of 3 by NUM elements returning C the values of the components of the indexes inquired. C Range for RGB: red 0.0-1.0 @@ -1735,7 +1729,7 @@ SUBROUTINE VDIQCO(NUM,INDEX,CLRARY,CLRMOD) C Range for HLS: hue 0.0-360.0 C lightness 0.0-1.0 C saturation 0.0-1.0 -C + C NARRATIVE -Inquire one or more color table entries. NUM and C INDEX specify how many and which indexes are being C inquired. CLRMOD specifies which color model @@ -1744,28 +1738,28 @@ SUBROUTINE VDIQCO(NUM,INDEX,CLRARY,CLRMOD) C support a color table index specified will C return -1.0 in the first element of the CLRARY value C for that index. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER NUM,INDEX(NUM),CLRMOD REAL CLRARY(3,NUM) -C + COMMON /PCOLST/ PCOLS(3,256) -C + C CHECK FOR VALID NUM. IF(NUM.LT.1.OR.NUM.GT.256) THEN CALL VBERRH(723,5) GOTO 999 END IF -C + C CHECK FOR VALID CLRMOD. IF(CLRMOD.NE.0.AND.CLRMOD.NE.1) THEN CALL VBERRH(725,5) GOTO 999 END IF -C + IF(CLRMOD.NE.0) STOP 'HLS COLORS NOT SUPPORTED' -C + C CHECK FOR VALID INDEXES. DO 100 I=1,NUM INDEXN=INDEX(I) @@ -1776,58 +1770,58 @@ SUBROUTINE VDIQCO(NUM,INDEX,CLRARY,CLRMOD) DO 200 IC=1,3 200 CLRARY(IC,I)=PCOLS(IC,INDEXN) 100 CONTINUE -C + 999 RETURN END SUBROUTINE VDIQCP(X,Y) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDIQCP -Inquire Where Current Position Is. -C + C R.W.Simons -02DEC80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Devices that support a software CP. C (AP5,GER,H50,HC1,HCB,HPP,I10,I30,LXY,QCR,QMS,XYN) -C + C ENTRY CONDITIONS - -C + C CALLS - -C + C EXIT CONDITIONS -X,Y = real NDC position. -C + C NARRATIVE -Return the value of current position. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C CURRENT POSITION. REAL XCP,YCP COMMON /VCCRPS/ XCP,YCP -C + C ASSIGN THE CP TO X,Y. X=XCP Y=YCP -C + RETURN END SUBROUTINE VDSTBC(COLOR) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDSTBC -Set Background Color. -C + C R.W.Simons -05DEC80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Devices with a constant white background. (LXY, C HC1, ALP) -C + C ENTRY CONDITIONS -COLOR = integer color table index. Range 0-255. C Default: device dependent, in range 0-7. -C + C CALLS -VBERRH -C + C EXIT CONDITIONS -VECTOR(2) = real updated background color (COLOR). -C + C NARRATIVE -Set the background color for following VDNWPG or C TEXT primitives for devices supporting these C features. For example, many raster devices support @@ -1838,11 +1832,11 @@ SUBROUTINE VDSTBC(COLOR) C dependent value in the range 0-7. C If an unsupported value is specified, set to C default. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER COLOR -C + C CURRENT ATTRIBUTE VALUES. (DEVICE-INDEPENDENT) REAL VECTOR(7) COMMON /VCATTR/ VECTOR @@ -1853,29 +1847,29 @@ SUBROUTINE VDSTBC(COLOR) C (5)=LINE WIDTH C (6)=CHARACTER BOX Y C (7)=CHARACTER BOX X -C + C CHECK FOR VALID COLOR. IF(COLOR.LT.0.OR.COLOR.GT.255) THEN CALL VBERRH(724,5) GOTO 999 END IF -C + C ONLY THE SINGLE BACKGROUND COLOR 7 (WHITE) IS SUPPORTED, C SO NO ACTION IS NECESSARY. -C + vector(2) = color 999 RETURN END SUBROUTINE VDSTCO(NUM,INDEX,CLRARY,CLRMOD) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDSTCO -Set Color Table. -C + C R.W.SIMONS -02DEC80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Black and White Devices. (LXY, HC1, ALP) -C + C ENTRY CONDITIONS -NUM = integer number of color indexes to be set. C Range 1-256. C INDEX = integer array of indexes to be set. Range @@ -1901,11 +1895,11 @@ SUBROUTINE VDSTCO(NUM,INDEX,CLRARY,CLRMOD) C 7 white 1.,1.,1. C CLRMOD = integer color model being used. Range 0,1. C Default: 0 (RGB). -C + C CALLS -VBERRH -C + C EXIT CONDITIONS - -C + C NARRATIVE -Set one or more color table entries. This is a C dynamic setting, if the device will support it. C "Dynamic" neans that primitives which have already @@ -1928,36 +1922,36 @@ SUBROUTINE VDSTCO(NUM,INDEX,CLRARY,CLRMOD) C All devices must support at least a single device C dependent INDEX value in the range 0-7. If an C unsupported value is specified, it should be ignored. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER NUM,INDEX(NUM),CLRMOD REAL CLRARY(3,NUM) CHARACTER*6 KOLIND CHARACTER*20 KOLCOM COMMON /VCVEC1/ IVECT INTEGER IVECT -C + C ARRAY TO CONTAIN COMPLETE COLOR TABLE -C + COMMON /PCOLST/ PCOLS(3,256) -C + C mopoly controls polygon fill =0, on ; =1, off C mocolr controls color =0, on ; =1, off COMMON /VCPSTB/ MOPOLY, MOCOLR -C + C CHECK FOR VALID NUM. IF(NUM.LT.1.OR.NUM.GT.256) THEN CALL VBERRH(723,5) GOTO 999 END IF -C + C CHECK FOR VALID CLRMOD. IF(CLRMOD.NE.0.AND.CLRMOD.NE.1) THEN CALL VBERRH(725,5) GOTO 999 END IF -C + C CHECK FOR VALID INDEXES. DO 100 I=1,NUM INDEXN=INDEX(I) @@ -1976,18 +1970,18 @@ SUBROUTINE VDSTCO(NUM,INDEX,CLRARY,CLRMOD) CALL VBERRH(727,5) GOTO 100 END IF -C + C 256 INDEXES ARE SUPPORTED: DO 200 IC=1,3 200 PCOLS(IC,INDEXN+1)=CLRARY(IC,I) -C + C define symbol for color reference -C + IF(MOCOLR.NE.0) GO TO 390 -C + C if a set of vectors was in process, issue stroke command C to draw them - then start a new path. -C + IF(IVECT.NE.0) THEN CALL PSTBUF(2,'s ') IVECT=0 @@ -2021,32 +2015,32 @@ SUBROUTINE VDSTCO(NUM,INDEX,CLRARY,CLRMOD) CALL VBERRH(727,5) GOTO 100 END IF -C + C 256 INDEXES ARE SUPPORTED: STOP 'HLS COLORS NOT AVAILABLE' END IF 100 CONTINUE -C + 999 RETURN END SUBROUTINE VDSTFC(COLOR) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDSTFC -Set Foreground Color. -C + C R.W.Simons -05DEC80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Devices with a constant black foreground. (LXY, C HC1) -C + C ENTRY CONDITIONS -COLOR = integer color table index . Range 0-255. C Default is device dependent, in range 0-7. -C + C CALLS -VBERRH -C + C EXIT CONDITIONS -VECTOR(1) = real updated foreground color (COLOR). -C + C NARRATIVE -Set the foreground color index, i.e., the color C table index used for drawing future primitives. C Color is an integer from 0-255 which is used as an @@ -2055,16 +2049,16 @@ SUBROUTINE VDSTFC(COLOR) C dependent value in the range 0-7. C If an unsupported value is specified, set to C default. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER COLOR CHARACTER*5 KOLIND -C + C ARRAY TO CONTAIN COMPLETE COLOR TABLE -C + COMMON /PCOLST/ PCOLS(3,256) -C + C pstmlw controls minimum line width C kpstbg controls background coloring C = 0, not colored (white ground from paper) @@ -2073,11 +2067,11 @@ SUBROUTINE VDSTFC(COLOR) C = 0, no interchange C = 1, colors interchanged COMMON /VCPSTA/ PSTMLW, KPSTBG, KPSTCI -C + C mopoly controls polygon fill =0, on ; =1, off C mocolr controls color =0, on ; =1, off COMMON /VCPSTB/ MOPOLY, MOCOLR -C + COMMON /VCVEC1/ IVECT INTEGER IVECT C CURRENT ATTRIBUTE VALUES. (DEVICE-INDEPENDENT) @@ -2090,17 +2084,16 @@ SUBROUTINE VDSTFC(COLOR) C (5)=LINE WIDTH C (6)=CHARACTER BOX Y C (7)=CHARACTER BOX X -C C CHECK FOR VALID COLOR. IF(COLOR.LT.0.OR.COLOR.GT.255) THEN CALL VBERRH(724,5) GO TO 999 END IF -C + VECTOR(1)=COLOR IF(MOCOLR.EQ.0) THEN -C + C draw any vectors in stack before changing colors IF(IVECT.NE.0) THEN CALL PSTBUF(4,'s r ') @@ -2109,7 +2102,7 @@ SUBROUTINE VDSTFC(COLOR) CALL PSTBUF(0,' ') IVECT=0 END IF -C + C code using symbols KOLIND='c' IF(COLOR.LE.9) THEN @@ -2132,27 +2125,27 @@ SUBROUTINE VDSTFC(COLOR) NNN=5 END IF CALL PSTBUF(NNN,KOLIND(1:NNN)) -C + END IF 999 RETURN END SUBROUTINE VDSTIN(INTEN) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDSTIN -Set Intensity. -C + C R.W.Simons -05DEC80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Single Intensity Devices. (LXY, HC1) -C + C ENTRY CONDITIONS -INTEN = real intensity of the image of an output C primitive. Range 0.-1. Default: device dependent. -C + C CALLS - -C + C EXIT CONDITIONS -VECTOR(3) = real updated intensity (INTEN). -C + C NARRATIVE -Set the intensity value indicated for future C primitives. Intensity is a real value between 0 C (not visible) and 1 (maximum). Intensities are @@ -2160,11 +2153,11 @@ SUBROUTINE VDSTIN(INTEN) C All devices must support at least a single value: C 1.0. If an unsupported value is specified, set to C the closest supported intensity. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL INTEN -C + C CURRENT ATTRIBUTE VALUES. (DEVICE-INDEPENDENT) REAL VECTOR(7) COMMON /VCATTR/ VECTOR @@ -2175,39 +2168,38 @@ SUBROUTINE VDSTIN(INTEN) C (5)=LINE WIDTH C (6)=CHARACTER BOX Y C (7)=CHARACTER BOX X -C + C CHECK FOR VALID INTEN. IF(INTEN.LT.0.0.OR.INTEN.GT.1.0) THEN CALL VBERRH(401,5) GOTO 999 END IF -C + C ONLY THE SINGLE INTENSITY 1.0 (MAXIMUM) IS SUPPORTED, C SO NO ACTION IS NECESSARY. -C + 999 RETURN END SUBROUTINE VITERM C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VITERM -TERMINATE. -C + C D.L. CAMPBELL -1-DEC-1986 C J.P. LONG -9-NOV-1987 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS - -C + C CALLS - -C + C EXIT CONDITIONS - -C + C NARRATIVE -Terminate graphics device. Close output file. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C -C + C COMPUTER DEPENDENT COMMON VARIABLES AND CONSTANTS. include 'vcpstc.blk' COMMON /VCPAGE/ TOTPAG @@ -2216,7 +2208,7 @@ SUBROUTINE VITERM C mopoly controls polygon fill =0, on ; =1, off C mocolr controls color =0, on ; =1, off COMMON /VCPSTB/ MOPOLY, MOCOLR -C + C put out the last page and restore postscript environment so C nothing is left on the stack CALL VINWPG @@ -2242,78 +2234,77 @@ SUBROUTINE VITERM C CLOSE OUTPUT FILE CALL PSTCFS(KOUTFL,1) CALL VDMONI(2) -C + RETURN END SUBROUTINE VIMOVA(X,Y) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VIMOVA -Move Absolute. -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS -X,Y = real NDC position. -C + C CALLS - -C + C EXIT CONDITIONS -XCP,YCP = real updated current position. (X,Y) -C + C NARRATIVE -Set current position to absolute NDC position X,Y. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL X,Y -C -C + C move CALL VBVECT(0,X,Y) -C + RETURN END SUBROUTINE VIPNTA(X,Y) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VIPNTA -Point Absolute. -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS -X,Y = real NDC position. -C + C CALLS -VIMOVA,VILINA -C + C EXIT CONDITIONS - -C + C NARRATIVE -Set current position to absolute NDC position X,Y C and put a visible point there. Attributes C foreground color and intensity apply. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL X,Y -C + CALL VIMOVA(X,Y) CALL VILINA(X,Y) -C + RETURN END SUBROUTINE VIPOLY(XARRAY,YARRAY,NPTS) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VIPOLY -POLYGON FILL ROUTINE -C + C D.L. CAMPBELL -1-DEC-1986 C J.P. LONG -9-NOV-1987 -C + C ENVIRONMENT -Fortran77, QMS -C + C ENTRY CONDITIONS -XARRAY-ARRAY OF X VALUES OF THE POLYGON C YARRAY-CORRESPONDING ARRAY OF Y VALUES C NPTS- NUMBER OF POINTS IN (XARRAY,YARRAY) -C + C CALLS - -C + C EXIT CONDITIONS - -C + C NARRATIVE -The polygon defined by XARRAY,YARRAY will be drawn C and filled (constrained by any limitations of the C physical device -- see below). No checking will be @@ -2322,11 +2313,11 @@ SUBROUTINE VIPOLY(XARRAY,YARRAY,NPTS) C boundary is drawn using the solid line style. C VDI will close the polygon (i.e. the last point C will be connected to the first). -C + C The level of support for this primitive is device- C dependent. The level of support is categorized C as follows: -C + C Level 0 -- no polygon fill. Only the polygon C boundary is drawn. C Level 1 -- the device fills convex polygons. @@ -2339,18 +2330,18 @@ SUBROUTINE VIPOLY(XARRAY,YARRAY,NPTS) C is drawn to that point from a point far outside C the polygon, that line intersects the polygon C boundary an odd number of times. -C + C Note that the level of support for a particular device C can be inquired using the function VDIQDC. -C + ******************************************************************************** -C + C The level for this device is level 2. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL XARRAY(NPTS),YARRAY(NPTS) -C + C ESCAPE FLAGS C PATNO AND BORDER USED BY VIPOLY FOR PATTERN FILL AND BORDER ON/OFF. DEFAULT C COMPLETE FILL AND BORDER ON @@ -2370,25 +2361,25 @@ SUBROUTINE VIPOLY(XARRAY,YARRAY,NPTS) COMMON /VCVEC2/ COORD, LSTCRD CHARACTER COORD*20, LSTCRD*20 INTEGER IVECT -C + C mopoly controls polygon fill =0, on ; =1, off C mocolr controls color =0, on ; =1, off COMMON /VCPSTB/ MOPOLY, MOCOLR -C + C CHECK FOR VALID N IF (NPTS.LT.1 .OR. NPTS.GT.1490) THEN CALL VBERRH(802,5) GO TO 999 END IF -C + C IF A SET OF VECTORS WAS IN PROCESS, ISSUE STROKE COMMAND TO DRAW THEM C Start a new path. -C + IF(IVECT.NE.0) THEN CALL PSTBUF(2,'s ') IVECT=0 END IF -C + CALL PSTBUF(2,'r ') CALL PSTBUF(0,' ') CALL PSTBUF(4,'v o ') @@ -2399,20 +2390,20 @@ SUBROUTINE VIPOLY(XARRAY,YARRAY,NPTS) CALL VDSTFC(NINT(VECTOR(1))) END IF CALL PSTBUF(0,' ') -C + C DRAW POLYGON VECTORS -C + C MOVE TO FIRST POINT CALL VIMOVA(XARRAY(1),YARRAY(1)) -C + C CALL VDLINA TO DRAW POINTS FROM 1ST POINT TO NTH POINT DO 100 I=2,NPTS CALL VILINA(XARRAY(I),YARRAY(I)) 100 CONTINUE -C + C THEN DRAW A LINE TO THE FIRST POINT TO CLOSE THE POLYGON CALL VILINA(XARRAY(1),YARRAY(1)) -C + C CLOSE THE POLYGON, GRAPHICS SAVE, FILL IT, GRAPHICS RESTORE, STROKE C TO PROVIDE THE SAME FILLED AREA AS IF IT WERE FILLED WITH VECTORS C THEN RESTORE AND SAVE POSTSCRIPT ENVIRONMENT TO AVOID INPUT BUFFER OVERFLOW @@ -2428,48 +2419,48 @@ SUBROUTINE VIPOLY(XARRAY,YARRAY,NPTS) c CALL VDSTCS(VECTOR(6)) END IF CALL PSTBUF(0,' ') -C + C INIT THE CURRENT POSITION WITHIN POSTSCRIPT CALL VDMOVA(XARRAY(NPTS),YARRAY(NPTS)) IVECT=0 -C + 999 RETURN END SUBROUTINE VINWPG C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VINWPG -New Page. -C + C D.L. CAMPBELL -1-DEC-1986 C J.P. LONG -9-NOV-1987 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS - -C + C CALLS - -C + C EXIT CONDITIONS - -C + C NARRATIVE -Physically advance the medium or clear the screen, C whichever is appropriate. Also flood the screen C with the background color on devices that support C this. The current position is not changed. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + COMMON /VCVEC1/ IVECT COMMON /VCVEC2/ COORD,LSTCRD -C + C vcpstd variables control what to do with empty frames with C command is received to dump data to output C kempty=0, frame is void - do not draw C >0, frame has data - draw it COMMON /VCPSTD/ KEMPTY -C + CHARACTER COORD*20, LSTCRD*20 CHARACTER*10 KPAGE -C + C pstmlw controls minimum line width C kpstbg controls background coloring C = 0, not colored (white ground from paper) @@ -2489,52 +2480,52 @@ SUBROUTINE VINWPG C (5)=LINE WIDTH C (6)=CHARACTER BOX Y C (7)=CHARACTER BOX X -C + COMMON /VCPAGE/ TOTPAG INTEGER TOTPAG DATA NPAGE /0/ -C + C check for void page draw request C if nothing is on page, skip request -C + NPAGE=NPAGE+1 TOTPAG = NPAGE WRITE(KPAGE,'(I10)',ERR=345) NPAGE GO TO 349 345 KPAGE=' ???' 349 IF(KEMPTY.EQ.0) GO TO 350 -C + C stroke the path in case there are any vectors and show text CALL PSTBUF(2,'s ') IVECT=0 -C + C showpage and restore postscript environment to avoid buffer overflow C flush buffer because save and restore won't work back-to-back -C + CALL PSTBUF(4,'p r ') CALL PSTBUF(0,' ') -C + C comment frame number in output file -C + CALL PSTBUF(31,'%%Page: "'//KPAGE//'" '//KPAGE) CALL PSTBUF(0,' ') CALL PSTBUF(28, '%%PageOrientation: Landscape') CALL PSTBUF(0,' ') CALL PSTBUF(32, '%%PageBoundingBox: 36 30 574 750') CALL PSTBUF(0,' ') -C + CALL PSTBUF(4,'v o ') CALL VDMONI(1) -C + C shade background if appropriate -C + IF(KPSTBG.NE.0) THEN CALL PSTBBG END IF GO TO 370 -C + C void frame -- First Page -C + 350 CALL PSTBUF(2, 'r ') CALL PSTBUF(0,' ') CALL PSTBUF(31,'%%Page: "'//KPAGE//'" '//KPAGE) @@ -2544,43 +2535,42 @@ SUBROUTINE VINWPG CALL PSTBUF(32, '%%PageBoundingBox: 36 30 574 750') CALL PSTBUF(0,' ') CALL PSTBUF(4, 'v o ') -C + 370 CALL VDSTLW(VECTOR(5)) c CALL VDSTCS(VECTOR(6)) CALL VDSTFC(NINT(VECTOR(1))) CALL PSTBUF(0,' ') 380 KEMPTY=0 -C + RETURN END SUBROUTINE VDESCP(ESCPCD,N,ARGS) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDESCP -Escape Code Routine. -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS -ESCPCD = integer escape function code. C N = integer number of arguments in ARG. RANGE >=0. C ARGS = real array of arguments for the escape C function specified. -C + C CALLS - -C + C EXIT CONDITIONS - -C + C NARRATIVE -Invoke the nonstandard, device-dependent function C ESCPCD. N is the number of arguments used by this C function and ARGS is a real array containing those C arguments. Unsupported values of ESCPCD are C ignored, not causing an error. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER ESCPCD,N REAL ARGS(*) -C C COMPUTER DEPENDENT COMMON VARIABLES AND CONSTANTS. include 'vcpstc.blk' C SCALE FACTORS FOR NDC TO DC MAPPING. (LXY,HC1) @@ -2589,18 +2579,18 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) C DC DIMENSIONS OF OFFSETS AND PICTURE. (LXY,HC1) INTEGER XPAD,YPAD,XDEVIC,YDEVIC COMMON /VCDDIM/ XPAD,YPAD,XDEVIC,YDEVIC -C + C USED BY VIPOLY FOR PATTERN FILL AND BORDER ON/OFF. DEFAULT COMPLETE FILL C AND BORDER ON. PLC. COMMON/VCESCP/PGFORM,PATNO,BORDER INTEGER PGFORM,PATNO,BORDER -C + C CHECK FOR VALID N. IF(N.LT.0) THEN CALL VBERRH(802,5) GOTO 999 END IF -C + C 2100 - PAGE FORMAT (0=LANDSCAPE,1=PORTRAIT) IF (ESCPCD.EQ.2100) THEN IF (ARGS(1).EQ.0) THEN @@ -2608,9 +2598,9 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) ELSE PGFORM=1 ENDIF -C + C set output format -C + ELSEIF (ESCPCD.EQ.2101) THEN CALL PSTSEL('1') ELSEIF (ESCPCD.EQ.2102) THEN @@ -2632,68 +2622,65 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) ELSEIF (ESCPCD.EQ.2110) THEN CALL PSTSEL('10') ENDIF -C + 999 RETURN END SUBROUTINE VILINA (X,Y) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VILINA -C + C D.L. CAMPBELL -1-DEC-1986 C J.P. LONG -9-NOV-1987 -C + C ENVIRONMENT -DEVICE DEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS -X,Y REAL NDC COORDINATES -C + C CALLS - -C + C EXIT CONDITIONS -CURRENT POSITION IS SET -C -C + C NARRATIVE C LINE-DRAW A LINE FROM CP TO ABSOLUTE NDC POSITION X,Y C AND UPDATE CP . ATTRIBUTES COLOR,INTEN,LINSTY AND C LINWTH APPLY. -C -C + C OTHER VARIABLES: C XCP,YCP-NDC COORDINATES C*************************************************************************** -C + REAL X,Y -C + C vcpstd variables control what to do with empty frames with C command is received to dump data to output C kempty=0, frame is void - do not draw C >0, frame has data - draw it COMMON /VCPSTD/ KEMPTY -C -C + C draw ENTRY VBLINA(X,Y) CALL VBVECT(1,X,Y) KEMPTY=1 -C + RETURN END SUBROUTINE VBVECT(IPEN,X,Y) C**************************************************** C vbvect - do move or draw to x,y (depending on ipen) -C + C ipen = 0 for move, 1 for draw C x,y = NDC coordinates to be moved/drawn to -C + C****************************************************** -C + REAL X,Y,XOFF,YOFF CHARACTER CTEMP*20,XCOORD*4,YCOORD*4 -C + C mopoly controls polygon fill =0, on ; =1, off C mocolr controls color =0, on ; =1, off COMMON /VCPSTB/ MOPOLY, MOCOLR -C + C SCALE FACTORS FOR NDC TO DC MAPPING. (LXY,HC1) REAL XSCALE,YSCALE COMMON /VCSCAL/ XSCALE,YSCALE @@ -2717,15 +2704,15 @@ SUBROUTINE VBVECT(IPEN,X,Y) COMMON /VCVEC2/ COORD, LSTCRD CHARACTER COORD*20, LSTCRD*20 INTEGER IVECT -C + C compute new point in dev. coord. C convert to floating offsets XOFF=XPAD YOFF=YPAD -C + IXDC=X*XSCALE+XOFF IYDC=Y*YSCALE+YOFF -C + C write(xcoord,'(i5)')ixdc C write(ycoord,'(i5)')iydc C ...include both x,y @@ -2733,7 +2720,7 @@ SUBROUTINE VBVECT(IPEN,X,Y) CALL PSTI2C(IYDC,4,YCOORD) COORD = XCOORD(1:3)//'.'//XCOORD(4:4)//' '// 1 YCOORD(1:3)//'.'//YCOORD(4:4) -C + C pack up move/draw command, send it down C if (lstcrd(1:11) .ne. coord(1:11)) then IF (IPEN.EQ.0) THEN @@ -2746,7 +2733,7 @@ SUBROUTINE VBVECT(IPEN,X,Y) IVECT=IVECT+1 C end if lstcrd(1:11) = coord(1:11) -C + C stroke the path if we are approaching the 1500-coord pair limit C also restore and save postscript environment to avoid C input buffer overflow (must have a c/r between restore @@ -2764,34 +2751,34 @@ SUBROUTINE VBVECT(IPEN,X,Y) C reinitted the current posn IVECT=1 ENDIF -C + C UPDATE CURRENT POSITION XCP=X YCP=Y -C + RETURN END SUBROUTINE VITEXT(LENGT1,CHARS) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VITEXT - Text from Array. -C + C P. Watterberg - 24 MAR 81 C J. P. LONG - 3 DEC 87 -C + C ENVIRONMENT - COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS - LENGT1 = integer number of characters in CHARS. C Range 1-136. C CHARS = integer array of ASCII characters, one C character per array element, right justified. C Range 8,10,32-126. -C + C CALLS - vbout -C + C EXIT CONDITIONS - XCP,YCP = integer updated current position (at the end C of the string). -C + C NARRATIVE - Draw LENGT1 characters in CHARS, starting at C current position and update current position to C the point after the last character box where the @@ -2804,11 +2791,11 @@ SUBROUTINE VITEXT(LENGT1,CHARS) C considered reasonable. Attributes foreground color, C background color, intensity, and character size C apply. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER LENGT1, CHARS(136), LENGTH -C + CHARACTER CTEMP*150,STR*3 C CURRENT POSITION. REAL XCP,YCP @@ -2830,15 +2817,15 @@ SUBROUTINE VITEXT(LENGT1,CHARS) C DC DIMENSIONS OF OFFSETS AND PICTURE. (LXY,HC1) INTEGER XPAD,YPAD,XDEVIC,YDEVIC COMMON /VCDDIM/ XPAD,YPAD,XDEVIC,YDEVIC -C + C vcpstd variables control what to do with empty frames with C command is received to dump data to output C kempty=0, frame is void - do not draw C >0, frame has data - draw it COMMON /VCPSTD/ KEMPTY -C + C check for valid length. -C + call vdstcs(vector(6)) KEMPTY=1 LENGTH = LENGT1 @@ -2846,31 +2833,31 @@ SUBROUTINE VITEXT(LENGT1,CHARS) CALL VBERRH(212,5) GO TO 999 END IF -C + C if(length.gt.136) then call vberrh(213,5), and use the C maximum length of 136. -C + IF(LENGTH.GT.136) THEN CALL VBERRH(213,5) LENGTH = 136 ENDIF -C + CTEMP='(' LENOUT=1 -C + C loop through length characters. -C + DO 100 I=1,LENGTH -C + C check for valid chars. -C + C ignore control characters, except for: C 8 is backspace C 10 is linefeed C 13 is carriage return -C + IF(CHARS(I).LT.32 .OR. CHARS(I).GT.126) THEN -C + IF(CHARS(I).EQ.8) THEN DX=-VECTOR(7) DY=0. @@ -2886,9 +2873,9 @@ SUBROUTINE VITEXT(LENGT1,CHARS) CALL VBERRH(208,5) GOTO 100 ENDIF -C + C finish the string, emulate the control char, and start a new one -C + C send the buffered chars to the printer if there are any IF(LENOUT.NE.1) THEN CTEMP(LENOUT+1:150)=') t ' @@ -2897,64 +2884,63 @@ SUBROUTINE VITEXT(LENGT1,CHARS) C reset the cp from the characters XCP=XCP+(LENOUT-5)*VECTOR(7) ENDIF -C + C calculate the new current position after the control char XCP=XCP+DX YCP=YCP+DY CALL VBVECT(0,XCP,YCP) -C + C start a new string CTEMP='(' LENOUT=1 -C + ELSE -C + C Char value is 32-126 inclusive. Put \ before these: C 92 is \ C 40 is ( C 41 is ) -C + IF(CHARS(I).EQ.40.OR.CHARS(I).EQ.41.OR.CHARS(I).EQ.92) THEN CTEMP(LENOUT+1:150)='\\' LENOUT=LENOUT+1 ENDIF -C + C now pack the chars into the buffer -C + CALL PSTA2C(CHARS(I),STR) CTEMP(LENOUT+1:150)=STR(1:1) LENOUT=LENOUT+1 ENDIF -C + 100 CONTINUE -C + C send the chars to the printer -C + CTEMP(LENOUT+1:150)=') t ' LENOUT=LENOUT+4 CALL PSTBUF(LENOUT,CTEMP) -C + C reset the cp from the characters -C + XCP=XCP+(LENOUT-5)*VECTOR(7) -C + 999 RETURN END SUBROUTINE VDSTLS(LINSTY) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDSTLS -Set Line Style. -C -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS -LINSTY = integer linestyle of line drawing output C primitives. Range 0-5. Default:0. -C + C CALLS - -C + C EXIT CONDITIONS -VECTOR(4) = real updated line style (LINSTY). -C + C NARRATIVE -Set the style of line as below. This applies only C to line drawing primitives. The line styles are: C 0 - solid @@ -2966,7 +2952,7 @@ SUBROUTINE VDSTLS(LINSTY) C All devices must support at least the values 0 and C 5. If an unsupported value is specified, set to 5. C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL LW INTEGER LINSTY,ILL,JLL COMMON /VCVEC1/ IVECT @@ -2974,7 +2960,7 @@ SUBROUTINE VDSTLS(LINSTY) CHARACTER COORD*20, LSTCRD*20 INTEGER IVECT CHARACTER CTEMP*30,STRL*3,STRS*3,STRG*3 -C + C CURRENT ATTRIBUTE VALUES. (DEVICE-INDEPENDENT) REAL VECTOR(7) COMMON /VCATTR/ VECTOR @@ -2994,7 +2980,7 @@ SUBROUTINE VDSTLS(LINSTY) C CURRENT ATTRIBUTE VALUES. (DEVICE-INDEPENDENT) C REAL VECTOR(7) C COMMON /VCATTR/ VECTOR -C + C VECTOR(1)=FOREGROUND COLOR C (2)=BACKGROUND COLOR C (3)=INTENSITY @@ -3002,17 +2988,16 @@ SUBROUTINE VDSTLS(LINSTY) C (5)=LINE WIDTH C (6)=CHARACTER BOX Y C (7)=CHARACTER BOX X -C -C + ENTRY VBSTLS(LINSTY) -C + C CHECK FOR VALID LINSTY. IF(LINSTY.LT.0.OR.LINSTY.GT.5) THEN CALL VBERRH(401,5) VECTOR(4) = 0 GOTO 999 END IF -C + IF(IVECT.NE.0) THEN CALL PSTBUF(2,'s ') IVECT=0 @@ -3021,19 +3006,19 @@ SUBROUTINE VDSTLS(LINSTY) IF(LINSTY.EQ.0) THEN CALL PSTBUF(7,'[] 0 h ') ENDIF -C + C calculate the linewidth -- it's needed below in every case -C + C actual xscale is xscale*.1; linewidth=1 => .01 in NDC LW=VECTOR(5) LW=XSCALE*VECTOR(5)*.001 C a linewidth of zero isn't good with postscript IF(LW.LT.1.) LW=1. -C + C from here on, set up patterns that depend on the linewidth and C the extra length added to the line segment C by the hemispherical end cap -C + IF(LINSTY.EQ.1) THEN ILL=NINT(0.5*LW) IGAP=NINT(3.*LW) @@ -3041,7 +3026,7 @@ SUBROUTINE VDSTLS(LINSTY) CALL PSTI2C(IGAP,3,STRG) CTEMP='['//STRL(1:3)//' '//STRG(1:3)//'] 0 h ' CALL PSTBUF(14,CTEMP) -C + ELSE IF(LINSTY.EQ.2) THEN ILL=NINT(18.*LW) JLL=NINT(1.5*LW) @@ -3053,7 +3038,7 @@ SUBROUTINE VDSTLS(LINSTY) * //' '//STRG(1:3)//'] 0 h ' CALL PSTBUF(22,CTEMP) C call pstbuf(14,'[2 2 6 2] 0 h ') -C + ELSE IF(LINSTY.EQ.3) THEN ILL=NINT(6.*LW) IGAP=NINT(7.*LW) @@ -3062,7 +3047,7 @@ SUBROUTINE VDSTLS(LINSTY) CTEMP='['//STRL(1:3)//' '//STRG(1:3)//'] 0 h ' CALL PSTBUF(14,CTEMP) C call pstbuf(8,'[4] 0 h ') -C + ELSE IF(LINSTY.EQ.4) THEN ILL=NINT(24.*LW) IGAP=NINT(18.*LW) @@ -3071,7 +3056,7 @@ SUBROUTINE VDSTLS(LINSTY) CTEMP='['//STRL(1:3)//' '//STRG(1:3)//'] 0 h ' CALL PSTBUF(14,CTEMP) C call pstbuf(8,'[8] 0 h ') -C + ELSE IF(LINSTY.EQ.5) THEN ILL=NINT(12.*LW) IGAP=NINT(10.*LW) @@ -3079,43 +3064,43 @@ SUBROUTINE VDSTLS(LINSTY) CALL PSTI2C(IGAP,3,STRG) CTEMP='['//STRL(1:3)//' '//STRG(1:3)//'] 0 h ' CALL PSTBUF(14,CTEMP) -C + ENDIF -C + C redefine the postscript current position -C + C the code below is equivalent to C call vbvect(0,xcp,ycp) C but can't do it because vbvect calls vdstlw which calls this routine -C + CTEMP=COORD(1:11)//' m ' CALL PSTBUF(14,CTEMP) -C + VECTOR(4)=LINSTY -C + 999 RETURN END SUBROUTINE VDSTCS(YSIZE) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDSTCS -Set Character Size. -C + C R.W.Simons -05DEC80 C J. P. LONG -03 DEC 87 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Devices that support only software characters. C (LXY, HC1) -C + C ENTRY CONDITIONS -YSIZE = real Y dimension of the character box in NDC C space. Range 0.-1. Default: device dependent, C typically the smallest hardware size. -C + C CALLS - -C + C EXIT CONDITIONS -VECTOR(6) = real updated character box Y (YSIZE). C VECTOR(7) = real updated character box X. -C + C NARRATIVE -Set the character size for text primitives. Size C is given by YSIZE as the Y dimension of the C character box. The SVDI will assign the X dimension @@ -3127,12 +3112,12 @@ SUBROUTINE VDSTCS(YSIZE) C unsupported value is specified, set to the largest C supported character size that does not exceed the C specified size. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL YSIZE CHARACTER STR*4,CTEMP*10 -C + C CURRENT ATTRIBUTE VALUES. (DEVICE-INDEPENDENT) REAL VECTOR(7) COMMON /VCATTR/ VECTOR @@ -3146,66 +3131,66 @@ SUBROUTINE VDSTCS(YSIZE) C SCALE FACTORS FOR NDC TO DC MAPPING. (LXY,HC1) REAL XSCALE,YSCALE COMMON /VCSCAL/ XSCALE,YSCALE -C + C CHECK FOR VALID YSIZE. IF(YSIZE.LT.0.0.OR.YSIZE.GT.1.0) THEN CALL VBERRH(401,5) GOTO 999 END IF -C + C PROTECT INPUT PARAMETER FROM BEING CHANGED. YSIZE1=YSIZE -C + C DON'T ALLOW VALUES BELOW THE MINIMUM "HARDWARE" SIZE. IF(YSIZE1.LT.0.01) YSIZE1=0.01 -C + C VALUES ESTABLISHED HERE ARE USED BY VBSIM IN SIMULATING CHARACTERS. C ALWAYS USE A CHARACTER ASPECT RATIO OF 5/7. VECTOR(6)=YSIZE1 VECTOR(7)=YSIZE1*5./7. -C + C convert the character size into device coords -C + IYSIZE=NINT(XSCALE*YSIZE1) -C + C output the postscript command -C + CALL PSTI2C(IYSIZE,4,STR) C iysize is in tenths of device units CTEMP='y '//STR(1:3)//' x ' CALL PSTBUF(8,CTEMP) -C + 999 RETURN END SUBROUTINE VDSTLW(LINWTH) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDSTLW -Set Line Width. -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS -LINWTH = real line width of line drawing output C primitives. Range 0.-1. Default: device dependent. -C + C CALLS - -C + C EXIT CONDITIONS -VECTOR(5) = real updated line width (LINWTH). -C + C NARRATIVE -Set the relative width of an output line. Values C are 0.-1. with 1. being .01 in NDC space. C All devices must support at least a single device C dependent value that is the default. If an C unsupported value is specified, set to the closest C supported line width. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL LINWTH,LW CHARACTER CTEMP*19,STR*5 -C + COMMON /VCVEC1/ IVECT INTEGER IVECT -C + C COMPUTER DEPENDENT COMMON VARIABLES AND CONSTANTS. include 'vcpstc.blk' C CURRENT ATTRIBUTE VALUES. (DEVICE-INDEPENDENT) @@ -3221,7 +3206,7 @@ SUBROUTINE VDSTLW(LINWTH) C SCALE FACTORS FOR NDC TO DC MAPPING. (LXY,HC1) REAL XSCALE,YSCALE COMMON /VCSCAL/ XSCALE,YSCALE -C + C pstmlw controls minimum line width C kpstbg controls background coloring C = 0, not colored (white ground from paper) @@ -3230,25 +3215,25 @@ SUBROUTINE VDSTLW(LINWTH) C = 0, no interchange C = 1, colors interchanged COMMON /VCPSTA/ PSTMLW, KPSTBG, KPSTCI -C + C CHECK FOR VALID LINWTH. IF(LINWTH.LT.0.0.OR.LINWTH.GT.1.) THEN CALL VBERRH(401,5) GOTO 999 END IF -C + C test user define minimum -C + WIDTH=MAX(PSTMLW,LINWTH) -C + C CONVERT LINE-WIDTH TO NDC LW=WIDTH*.005 -C + C CONVERT WIDTH TO DEVICE COORDINATES AND ADD A DIGIT; NEED IT TO HUNDREDTHS ILW=NINT(XSCALE*LW*10.) C A LINEWIDTH OF ZERO WORKS ONLY PART OF THE TIME IF(ILW.LT.10) ILW=10 -C + C SET LINE WIDTH CALL PSTI2C(ILW,5,STR) IF(IVECT.NE.0) THEN @@ -3259,35 +3244,35 @@ SUBROUTINE VDSTLW(LINWTH) CTEMP=STR(1:3)//'.'//STR(4:5)//' w ' CALL PSTBUF(9,CTEMP) END IF -C + VECTOR(5)=WIDTH -C + C since linestyle uses the linewidth in setting the pattern, call it -C + LINSTY=VECTOR(4) CALL VBSTLS(LINSTY) 999 RETURN END SUBROUTINE VDIQES(ESCPCD,SUPPRT) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDIQES -Inquire Escape. -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS -ESCPCD = integer escape function code. -C + C CALLS - -C + C EXIT CONDITIONS -SUPPRT = integer level of support for the escape C function specified. Range 0,1,2. -C + C NARRATIVE -An integer value indicating 2=hardware supported, C 1=software supported, 0=unsupported is returned in C SUPPRT for the escape function ESCPCD. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER ESCPCD,SUPPRT IF (ESCPCD.EQ.2100) THEN SUPPRT=2 @@ -3301,45 +3286,44 @@ SUBROUTINE VDIQES(ESCPCD,SUPPRT) END SUBROUTINE PSTBUF(NCHRS,OUT) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C PSTBUF -Output PostScript data -C + C C. D. Brown -DEC 1986 (Adapted from QMSBUF) -C + C ENVIRONMENT -COMPUTER/DEVICE DEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS -NCHRS = integer number of characters in OUT. C = 0 means flush the buffer. C OUT = character string of input data C KOUTFL = integer number of the graphics output file. -C + C CALLS - -C + C EXIT CONDITIONS - -C + C NARRATIVE -The data in OUT is buffered for output to KOUTFL. C The buffer is output when it is "full" or a buffer C flush is requested by specifying NCHRS<=0. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + SAVE INTEGER NCHRS CHARACTER OUT*(*) character*132 lstout integer lstchr -C -C + C COMPUTER DEPENDENT COMMON VARIABLES AND CONSTANTS. include 'vcpstc.blk' -C + C **NOTE: BUFFER SIZE (IN BITS) MUST BE AN EXACT MULTIPLE OF 8 (8-BIT DATA C MUST END EXACTLY AT WORD BOUNDARY) INTEGER CHARLN,ICNT,REMAIN CHARACTER CBUF*130 C CHARLN=BUFFER SIZE IN CHARS DATA ICNT/1/,CHARLN/130/,LSTCHR/-1/,LSTOUT/' '/ -C + C ...Check that last output string does not match current output GDS if (lstchr .eq. nchrs) then if (lstout(:lstchr) .eq. out(:nchrs)) return @@ -3349,7 +3333,7 @@ SUBROUTINE PSTBUF(NCHRS,OUT) C COMPUTE REMAINING AVAILABLE CHARACTERS IN BUFFER REMAIN=CHARLN-ICNT+1 -C + C CHECK FOR BUFFER FLUSH REQUEST OR NOT ENOUGH ROOM IN BUFFER. IF((NCHRS.LE.0).OR.(NCHRS.GT.REMAIN)) THEN C TEST IF THERE'S ANYTHING TO FLUSH. @@ -3364,67 +3348,67 @@ SUBROUTINE PSTBUF(NCHRS,OUT) ICNT=1 ENDIF ENDIF -C + C ADD TO BUFFER IF (NCHRS.GT.0) THEN CBUF(ICNT:ICNT+NCHRS-1)=OUT(1:NCHRS) ICNT=ICNT+NCHRS ENDIF -C + RETURN END SUBROUTINE PSTA2C(ASCI,CHARAC) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C PSTA2C - CONVERT FROM ASCII TO CHARACTER -C + C P. Watterberg - 19 Jan 1982 -C + C ENVIRONMENT - computer dependent, system dependent, fortran 77 -C + C ENTRY CONDITIONS - ASCI is an integer representing an ascii character -C + C CALLS - -C + C EXIT CONDITIONS - CHARAC is the character represented by ASCI -C + C NARRATIVE - -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + CHARACTER CHARAC*(*) INTEGER ASCI -C + CHARAC = CHAR(ASCI) -C + return end SUBROUTINE PSTI2C(INT,NDIGIT,ISTR) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C PSTI2C - convert positive integer to decimal character C string equivalent -C + C ENVIRONMENT - COMPUTER-INdependent -C + C ENTRY CONDITIONS - int = positive integer to be converted C ndigit = number of digits to be produced in string C form (pad left with zeros) C istr = character string of at least ndigit characters -C + C CALLS - -C + C EXIT CONDITIONS - istr contains decimal-string equivalent of int C (ndigits left-justified in istr) -C + C NARRATIVE - This routine modified 10/89 S.L.Thompson -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C INTEGER INT,NDIGIT CHARACTER ISTR*(*) CHARACTER*1 KA(10) DATA KA /'0','1','2','3','4','5','6','7','8','9'/ -C + C check input parameters INT1=MAX(INT,0) LENGTH=LEN(ISTR) @@ -3440,14 +3424,14 @@ SUBROUTINE PSTI2C(INT,NDIGIT,ISTR) RETURN END SUBROUTINE PSTBBG -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C Color background black for white paper device. C Should only be called from vdnwpg and viinit. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C pstmlw controls minimum line width C kpstbg controls background coloring C = 0, not colored (white ground from paper) @@ -3456,11 +3440,11 @@ SUBROUTINE PSTBBG C = 0, no interchange C = 1, colors interchanged COMMON /VCPSTA/ PSTMLW, KPSTBG, KPSTCI -C + C mopoly controls polygon fill =0, on ; =1, off C mocolr controls color =0, on ; =1, off COMMON /VCPSTB/ MOPOLY, MOCOLR -C + C CURRENT ATTRIBUTE VALUES. (DEVICE-INDEPENDENT) REAL VECTOR(7) COMMON /VCATTR/ VECTOR @@ -3471,7 +3455,7 @@ SUBROUTINE PSTBBG C (5)=LINE WIDTH C (6)=CHARACTER BOX Y C (7)=CHARACTER BOX X -C + COMMON /VCVEC1/ IVECT INTEGER IVECT COMMON /VCESCP/ PGFORM,PATNO,BORDER @@ -3479,7 +3463,7 @@ SUBROUTINE PSTBBG DIMENSION X(4),Y(4) PARAMETER (ONEN=0.99999) PARAMETER (ASP=0.75) -C + IF(MOPOLY.EQ.0) THEN IF(PGFORM.EQ.0) THEN X(1)=0. @@ -3509,39 +3493,39 @@ SUBROUTINE PSTBBG END SUBROUTINE PSTJOB C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C PSTJOB - GET JOB ID AND ROUTING INFORMATION -C + C ENVIRONMENT - COMPUTER-DEPENDENT FOR CTSS -C + C ENTRY CONDITIONS - -C + C CALLS - -C + C EXIT CONDITIONS - KJTIME - TIME HOLLERITH STRING C KJDATE - DATE HOLLERITH STRING C KUSRID - USER IDENTIFICATION C KJROUT - ROUTING INFORMATION -C + C NARRATIVE - THIS ROUTINE INQUIRES THE SYSTEM TO FIND THE ABOVE C INFORMATION. THE INFO IS PACKED INTO THE ARRAYS AS C HOLLERITH (INTERNAL DISPLAY CODE) STRINGS. A TERMI C CHARACTER "\" IS APPENDED TO EACH STRING SO THE CAL C ROUTINE CAN FIND THE END IF FOR SOME REASON THE LEN C VARIABLES ARE NOT SUFFICIENT. -C + C None of functions are used in pst driver -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C JOB ID INFORMATION. (HC1, DIC) include 'vcjob.blk' -C + C FOR SECURITY MARKINGS, CTSS CODES NEED TO MAP TO THESE SILLY C OLD SCOPE SECURITY CODES -C + C SCOPE 3 CODE -C + C 0 UNCL C 1 UNDEFINED C 2 UNDEFINED @@ -3554,38 +3538,38 @@ SUBROUTINE PSTJOB C 9 SNSI C 10 SFRD C 11 SRD -C + C GET CLASSIFICATION LEVEL KSECUR = 0 -C + C GET USER ID KUSRSZ = 8 KUSRID(1)=0 KUSRID(2)=0 KUSRID(3)=0 KUSRID(4)=0 -C + C GET JOB ID AND USERS NAME KJOBID(1) = 0 KJOBID(2) = 0 KJOBID(3) = 0 KJOBID(4) = 0 KIDSIZ = 24 -C + C GET BOX NUMBER KSZROU = 777 -C + KJROUT(1) = 0 KJROUT(2) = 0 KJROUT(3) = 0 KJROUT(4) = 0 -C + C GET MACHINE ID MACHIN(1) = 0 MACHIN(2) = 0 MACHIN(3) = 0 MACLEN=1 -C + C GET THE TIME AND DATE KJTIME(1)=0 KJTIME(2)=0 @@ -3593,15 +3577,15 @@ SUBROUTINE PSTJOB KJDATE(1)=0 KJDATE(2)=0 KJDATE(3)=0 -C + 999 RETURN END SUBROUTINE PSTSEL(KARG) -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C Select type of desired output. Four options are -C + C device number C 1. black & white, batch, no poly fill 799.1 C 2. black & white, interactive, no poly 799.2 @@ -3613,15 +3597,15 @@ SUBROUTINE PSTSEL(KARG) C 8. color, interactive, black-white interchange 799.8 C 9. color, batch, black background 799.9 C 10.color, interactive, black background 799.11 -C + C A second function of this routine is to set the minimum line C width. For most systems the minimum width line is too narrow. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + SAVE CHARACTER*(*) KARG -C + C pstmlw controls minimum line width C kpstbg controls background coloring C = 0, not colored (white ground from paper) @@ -3630,11 +3614,11 @@ SUBROUTINE PSTSEL(KARG) C = 0, no interchange C = 1, colors interchanged COMMON /VCPSTA/ PSTMLW, KPSTBG, KPSTCI -C + C mopoly controls polygon fill =0, on ; =1, off C mocolr controls color =0, on ; =1, off COMMON /VCPSTB/ MOPOLY, MOCOLR -C + COMMON /DEVCAP/ DEV(33) common /blotans/ BLTANS character*2 BLTANS @@ -3773,24 +3757,24 @@ SUBROUTINE PSTSEL(KARG) RETURN END SUBROUTINE PSTINI -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C Generate any system dependent records which must be at the first C of PostScript output file. For example, a SUN laser printer C requires the first record of the file to be %! for the file C recognized as a PostScript file. This routine writes these C initial records. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + SAVE DATA KWAY /0/ IF(KWAY.EQ.0) THEN KWAY=1 -C + C generate first records in output file -C + *- INCLUDE PSTHEAD C the following is for a SUN UNIX system C record is a comment except for sun lpr @@ -3799,6 +3783,6 @@ SUBROUTINE PSTINI CALL PSTBUF(0,' ') *- END IF -C + RETURN END diff --git a/packages/seacas/libraries/svdi/vdi_drivers/vdicps_dual.f b/packages/seacas/libraries/svdi/vdi_drivers/vdicps_dual.f index 9ee55720b045..ec0e7016407a 100644 --- a/packages/seacas/libraries/svdi/vdi_drivers/vdicps_dual.f +++ b/packages/seacas/libraries/svdi/vdi_drivers/vdicps_dual.f @@ -1,7 +1,7 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details C $Id: vdicps_dual.f,v 1.3 2008/01/09 18:18:53 gdsjaar Exp $ @@ -1932,8 +1932,8 @@ SUBROUTINE WCPSCO(INDEX,CLRARY,CLRMOD) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C - INTEGER NUM,INDEX(NUM),CLRMOD - REAL CLRARY(3,NUM) + INTEGER INDEX,CLRMOD + REAL CLRARY(3) CHARACTER*6 KOLIND CHARACTER*20 KOLCOM COMMON /VCVEC1/ IVECT @@ -1947,12 +1947,6 @@ SUBROUTINE WCPSCO(INDEX,CLRARY,CLRMOD) C mocolr controls color =0, on ; =1, off COMMON /VCPSTB/ MOPOLY, MOCOLR C -C CHECK FOR VALID NUM. - IF(NUM.LT.1.OR.NUM.GT.256) THEN - CALL VBERRH(723,5) - GOTO 999 - END IF -C C CHECK FOR VALID CLRMOD. IF(CLRMOD.NE.0.AND.CLRMOD.NE.1) THEN CALL VBERRH(725,5) @@ -1960,16 +1954,15 @@ SUBROUTINE WCPSCO(INDEX,CLRARY,CLRMOD) END IF C C CHECK FOR VALID INDEXES. - DO 100 I=1,NUM - INDEXN=INDEX(I) + INDEXN=INDEX IF(INDEXN.LT.0.OR.INDEXN.GT.255) THEN CALL VBERRH(724,5) GOTO 100 END IF C CHECK FOR VALID CLRARY. - CLRAR1=CLRARY(1,I) - CLRAR2=CLRARY(2,I) - CLRAR3=CLRARY(3,I) + CLRAR1=CLRARY(1) + CLRAR2=CLRARY(2) + CLRAR3=CLRARY(3) IF(CLRMOD.EQ.0) THEN IF(CLRAR1.LT.0..OR.CLRAR1.GT.1. X .OR.CLRAR2.LT.0..OR.CLRAR2.GT.1. @@ -1980,7 +1973,7 @@ SUBROUTINE WCPSCO(INDEX,CLRARY,CLRMOD) C C 256 INDEXES ARE SUPPORTED: DO 200 IC=1,3 - 200 PCOLS(IC,INDEXN+1)=CLRARY(IC,I) + 200 PCOLS(IC,INDEXN+1)=CLRARY(IC) C C define symbol for color reference C diff --git a/packages/seacas/libraries/svdi/vdi_drivers/vdieps.f b/packages/seacas/libraries/svdi/vdi_drivers/vdieps.f index 85d2acea5f5a..9ac92cc82325 100644 --- a/packages/seacas/libraries/svdi/vdi_drivers/vdieps.f +++ b/packages/seacas/libraries/svdi/vdi_drivers/vdieps.f @@ -1,45 +1,44 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: vdieps.f,v 1.22 2005/09/13 13:50:48 gdsjaar Exp $ SUBROUTINE PSTA2C(ASCI,CHARAC) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C PSTA2C - CONVERT FROM ASCII TO CHARACTER -C + C P. Watterberg - 19 Jan 1982 -C + C ENVIRONMENT - computer dependent, system dependent, fortran 77 -C + C ENTRY CONDITIONS - ASCI is an integer representing an ascii character -C + C CALLS - -C + C EXIT CONDITIONS - CHARAC is the character represented by ASCI -C + C NARRATIVE - -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + CHARACTER CHARAC*(*) INTEGER ASCI -C + CHARAC = CHAR(ASCI) -C + return end SUBROUTINE PSTBBG -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C Color background black for white paper device. C Should only be called from vdnwpg and viinit. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C pstmlw controls minimum line width C kpstbg controls background coloring C = 0, not colored (white ground from paper) @@ -48,11 +47,11 @@ SUBROUTINE PSTBBG C = 0, no interchange C = 1, colors interchanged COMMON /VCPSTA/ PSTMLW, KPSTBG, KPSTCI -C + C mopoly controls polygon fill =0, on ; =1, off C mocolr controls color =0, on ; =1, off COMMON /VCPSTB/ MOPOLY, MOCOLR -C + C CURRENT ATTRIBUTE VALUES. (DEVICE-INDEPENDENT) REAL VECTOR(7) COMMON /VCATTR/ VECTOR @@ -63,7 +62,7 @@ SUBROUTINE PSTBBG C (5)=LINE WIDTH C (6)=CHARACTER BOX Y C (7)=CHARACTER BOX X -C + COMMON /VCVEC1/ IVECT INTEGER IVECT COMMON /VCESCP/ PGFORM,PATNO,BORDER @@ -71,7 +70,7 @@ SUBROUTINE PSTBBG DIMENSION X(4),Y(4) PARAMETER (ONEN=0.99999) PARAMETER (ASP=0.75) -C + IF(MOPOLY.EQ.0) THEN IF(PGFORM.EQ.0) THEN X(1)=0. @@ -101,36 +100,35 @@ SUBROUTINE PSTBBG END SUBROUTINE PSTBUF(NCHRS,OUT) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C PSTBUF -Output PostScript data -C + C C. D. Brown -DEC 1986 (Adapted from QMSBUF) -C + C ENVIRONMENT -COMPUTER/DEVICE DEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS -NCHRS = integer number of characters in OUT. C = 0 means flush the buffer. C OUT = character string of input data C KOUTFL = integer number of the graphics output file. -C + C CALLS - -C + C EXIT CONDITIONS - -C + C NARRATIVE -The data in OUT is buffered for output to KOUTFL. C The buffer is output when it is "full" or a buffer C flush is requested by specifying NCHRS<=0. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + SAVE INTEGER NCHRS CHARACTER OUT*(*) -C -C + C COMPUTER DEPENDENT COMMON VARIABLES AND CONSTANTS. include 'vcpstc.blk' -C + C **NOTE: BUFFER SIZE (IN BITS) MUST BE AN EXACT MULTIPLE OF 8 (8-BIT DATA C MUST END EXACTLY AT WORD BOUNDARY) INTEGER CHARLN,ICNT,REMAIN @@ -139,17 +137,17 @@ SUBROUTINE PSTBUF(NCHRS,OUT) integer lstchr C CHARLN=BUFFER SIZE IN CHARS DATA ICNT/1/,CHARLN/130/,LSTCHR/-1/,LSTOUT/' '/ -C + C ...Check that last output string does not match current output GDS if (lstchr .eq. nchrs) then if (lstout(:lstchr) .eq. out(:nchrs)) return end if lstchr = nchrs lstout(:nchrs) = out(:nchrs) -C + C COMPUTE REMAINING AVAILABLE CHARACTERS IN BUFFER REMAIN=CHARLN-ICNT+1 -C + C CHECK FOR BUFFER FLUSH REQUEST OR NOT ENOUGH ROOM IN BUFFER. IF((NCHRS.LE.0).OR.(NCHRS.GT.REMAIN)) THEN C TEST IF THERE'S ANYTHING TO FLUSH. @@ -164,41 +162,41 @@ SUBROUTINE PSTBUF(NCHRS,OUT) ICNT=1 ENDIF ENDIF -C + C ADD TO BUFFER IF (NCHRS.GT.0) THEN CBUF(ICNT:ICNT+NCHRS-1)=OUT(1:NCHRS) ICNT=ICNT+NCHRS ENDIF -C + RETURN END SUBROUTINE PSTI2C(INT,NDIGIT,ISTR) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C PSTI2C - convert positive integer to decimal character C string equivalent -C + C ENVIRONMENT - COMPUTER-INdependent -C + C ENTRY CONDITIONS - int = positive integer to be converted C ndigit = number of digits to be produced in string C form (pad left with zeros) C istr = character string of at least ndigit characters -C + C CALLS - -C + C EXIT CONDITIONS - istr contains decimal-string equivalent of int C (ndigits left-justified in istr) -C + C NARRATIVE - This routine modified 10/89 S.L.Thompson -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C INTEGER INT,NDIGIT CHARACTER ISTR*(*) CHARACTER*1 KA(10) DATA KA /'0','1','2','3','4','5','6','7','8','9'/ -C + C check input parameters INT1=MAX(INT,0) LENGTH=LEN(ISTR) @@ -214,24 +212,24 @@ SUBROUTINE PSTI2C(INT,NDIGIT,ISTR) RETURN END SUBROUTINE PSTINI -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C Generate any system dependent records which must be at the first C of PostScript output file. For example, a SUN laser printer C requires the first record of the file to be %! for the file C recognized as a PostScript file. This routine writes these C initial records. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + SAVE DATA KWAY /0/ IF(KWAY.EQ.0) THEN KWAY=1 -C + C generate first records in output file -C + *- INCLUDE PSTHEAD C the following is for a SUN UNIX system C record is a comment except for sun lpr @@ -240,44 +238,44 @@ SUBROUTINE PSTINI CALL PSTBUF(0,' ') *- END IF -C + RETURN END SUBROUTINE PSTJOB C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C PSTJOB - GET JOB ID AND ROUTING INFORMATION -C + C ENVIRONMENT - COMPUTER-DEPENDENT FOR CTSS -C + C ENTRY CONDITIONS - -C + C CALLS - -C + C EXIT CONDITIONS - KJTIME - TIME HOLLERITH STRING C KJDATE - DATE HOLLERITH STRING C KUSRID - USER IDENTIFICATION C KJROUT - ROUTING INFORMATION -C + C NARRATIVE - THIS ROUTINE INQUIRES THE SYSTEM TO FIND THE ABOVE C INFORMATION. THE INFO IS PACKED INTO THE ARRAYS AS C HOLLERITH (INTERNAL DISPLAY CODE) STRINGS. A TERMI C CHARACTER "\" IS APPENDED TO EACH STRING SO THE CAL C ROUTINE CAN FIND THE END IF FOR SOME REASON THE LEN C VARIABLES ARE NOT SUFFICIENT. -C + C None of functions are used in pst driver -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C JOB ID INFORMATION. (HC1, DIC) include 'vcjob.blk' -C + C FOR SECURITY MARKINGS, CTSS CODES NEED TO MAP TO THESE SILLY C OLD SCOPE SECURITY CODES -C + C SCOPE 3 CODE -C + C 0 UNCL C 1 UNDEFINED C 2 UNDEFINED @@ -290,38 +288,38 @@ SUBROUTINE PSTJOB C 9 SNSI C 10 SFRD C 11 SRD -C + C GET CLASSIFICATION LEVEL KSECUR = 0 -C + C GET USER ID KUSRSZ = 8 KUSRID(1)=0 KUSRID(2)=0 KUSRID(3)=0 KUSRID(4)=0 -C + C GET JOB ID AND USERS NAME KJOBID(1) = 0 KJOBID(2) = 0 KJOBID(3) = 0 KJOBID(4) = 0 KIDSIZ = 24 -C + C GET BOX NUMBER KSZROU = 777 -C + KJROUT(1) = 0 KJROUT(2) = 0 KJROUT(3) = 0 KJROUT(4) = 0 -C + C GET MACHINE ID MACHIN(1) = 0 MACHIN(2) = 0 MACHIN(3) = 0 MACLEN=1 -C + C GET THE TIME AND DATE KJTIME(1)=0 KJTIME(2)=0 @@ -329,15 +327,15 @@ SUBROUTINE PSTJOB KJDATE(1)=0 KJDATE(2)=0 KJDATE(3)=0 -C + 999 RETURN END SUBROUTINE PSTSEL(KARG) -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C Select type of desired output. Ten options are -C + C device number C 1. black & white, batch, no poly fill 799.1 C 2. black & white, interactive, no poly 799.2 @@ -349,15 +347,15 @@ SUBROUTINE PSTSEL(KARG) C 8. color, interactive, black-white interchange 799.8 C 9. color, batch, black background 799.9 C 10.color, interactive, black background 799.11 -C + C A second function of this routine is to set the minimum line C width. For most systems the minimum width line is too narrow. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + SAVE CHARACTER*(*) KARG -C + C pstmlw controls minimum line width C kpstbg controls background coloring C = 0, not colored (white ground from paper) @@ -366,11 +364,11 @@ SUBROUTINE PSTSEL(KARG) C = 0, no interchange C = 1, colors interchanged COMMON /VCPSTA/ PSTMLW, KPSTBG, KPSTCI -C + C mopoly controls polygon fill =0, on ; =1, off C mocolr controls color =0, on ; =1, off COMMON /VCPSTB/ MOPOLY, MOCOLR -C + COMMON /DEVCAP/ DEV(33) common /blotans/ BLTANS character*2 BLTANS @@ -487,13 +485,13 @@ SUBROUTINE PSTSEL(KARG) END c>>sas subroutine setras(lsw,ixset,iyset) -c + c this subroutine does everything involving the preview raster -c + c lsw = 0... set all the bits to 0 c 1... set the bit (ixset/mscale,iyset/mscale) to 1 c 2... write raster in epsf format to the postscript file -c + c number of bits in preview raster per postscript coordinate parameter (mscale=2) c maximum postscript coordinates @@ -514,7 +512,7 @@ subroutine setras(lsw,ixset,iyset) COMMON /VCESCP/ PGFORM,PATNO,BORDER INTEGER PGFORM,PATNO,BORDER COMMON /DEVCAP/ DEV(33) -c + c flush if(lsw.eq.0) then do 30 ih=0,ihmax @@ -522,7 +520,7 @@ subroutine setras(lsw,ixset,iyset) lras(ih,iy) = 0 30 continue endif -c + c set a bit if(lsw.eq.1) then ixs = min(ixmax,max(0,ixset/mscale)) @@ -547,7 +545,7 @@ subroutine setras(lsw,ixset,iyset) lras(ih,iys) = lras(ih,iys)+1 endif endif -c + c write out the raster to the scratch file if(lsw.eq.2) then open(9,file='cgiout.epsi') @@ -634,28 +632,28 @@ subroutine setras(lsw,ixset,iyset) write(*,*) ' File cgiout.epsi created.' stop endif -c + return end SUBROUTINE VBERRH(ERRNUM,ERRSEV) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VBERRH -Error Handler. -C + C R.W.Simons -08APR81 C 30SEP81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -ERRNUM = integer error number. C ERRSEV = integer severity code. If > 12, error is C fatal. -C + C CALLS -VDLOGE. -C + C EXIT CONDITIONS - -C + C NARRATIVE -An error will normally cause an error message to C be printed on the error output device and possible C termination of the program, unless a routine VBERRH @@ -665,37 +663,36 @@ SUBROUTINE VBERRH(ERRNUM,ERRSEV) C returning. All versions of VBERRH, whether user- C supplied or default, must STOP on any error severity C greater than 12. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER ERRNUM,ERRSEV -C + C REPORT THE ERROR USING VDLOGE. CALL VDLOGE(ERRNUM,ERRSEV) -C + C CHECK FOR FATAL ERROR. IF(ERRSEV.GT.12) STOP -C + RETURN END -C -C + SUBROUTINE VBVECT(IPEN,X,Y) C**************************************************** C vbvect - do move or draw to x,y (depending on ipen) -C + C ipen = 0 for move, 1 for draw C x,y = NDC coordinates to be moved/drawn to -C + C****************************************************** -C + REAL X,Y,XOFF,YOFF CHARACTER CTEMP*20,XCOORD*4,YCOORD*4 -C + C mopoly controls polygon fill =0, on ; =1, off C mocolr controls color =0, on ; =1, off COMMON /VCPSTB/ MOPOLY, MOCOLR -C + C SCALE FACTORS FOR NDC TO DC MAPPING. (LXY,HC1) REAL XSCALE,YSCALE COMMON /VCSCAL/ XSCALE,YSCALE @@ -723,18 +720,18 @@ SUBROUTINE VBVECT(IPEN,X,Y) C>>GDSJAAR DATA IXRAS/0/ DATA IYRAS/0/ -C + C compute new point in dev. coord. C convert to floating offsets -c + c>>sas ypad = 10.0 XOFF=XPAD YOFF=YPAD -C + IXDC=X*XSCALE+XOFF IYDC=Y*YSCALE+YOFF -c + c>>sas c draw a line segment on the preview raster if(ipen.ne.0) then @@ -747,7 +744,7 @@ SUBROUTINE VBVECT(IPEN,X,Y) endif ixras = ixdc iyras = iydc -C + C write(xcoord,'(i5)')ixdc C write(ycoord,'(i5)')iydc C ...include both x,y @@ -755,7 +752,7 @@ SUBROUTINE VBVECT(IPEN,X,Y) CALL PSTI2C(IYDC,4,YCOORD) COORD = XCOORD(1:3)//'.'//XCOORD(4:4)//' '// 1 YCOORD(1:3)//'.'//YCOORD(4:4) -C + C pack up move/draw command, send it down IF (IPEN.EQ.0) THEN CTEMP= COORD(1:11) // ' m ' @@ -765,7 +762,7 @@ SUBROUTINE VBVECT(IPEN,X,Y) CALL PSTBUF(14,CTEMP) C ...count the coordinate pair IVECT=IVECT+1 -C + C stroke the path if we are approaching the 1500-coord pair limit C also restore and save postscript environment to avoid C input buffer overflow (must have a c/r between restore @@ -782,123 +779,121 @@ SUBROUTINE VBVECT(IPEN,X,Y) C reinitted the current posn IVECT=1 ENDIF -C + C UPDATE CURRENT POSITION XCP=X YCP=Y -C + RETURN END SUBROUTINE VDAABU(BTNNUM) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDAABU -Await Any Button. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Batch Devices. -C + C ENTRY CONDITIONS - -C + C CALLS - -C + C EXIT CONDITIONS -BTNNUM = integer number of the button pressed. C Range 1 to a device dependent maximum which must be C at least 8. -C + C NARRATIVE -When a button has been pressed, its integer button C number is returned in BTNNUM. This function flushes C the button buffer, if any. This function flushes C the output buffers before doing input. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER BTNNUM -C -C + C COMPUTER DEPENDENT COMMON VARIABLES AND CONSTANTS. include 'vcpstc.blk' -C + C BATCH DEVICES DON'T NEED TO FLUSH BUFFERS. -C + BTNNUM=32 -C + RETURN END SUBROUTINE VDABGL(BTNNUM,X,Y) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDABGL -Await Button, Get Locator. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Batch Devices. -C + C ENTRY CONDITIONS - -C + C CALLS - -C + C EXIT CONDITIONS -BTNNUM = integer number of the button pressed. C Range 1 to a device dependent maximum that must be C at least 8. C X,Y = real NDC position of the locator. -C + C NARRATIVE -Wait until a button is hit, then return the number C of the button in BTNNUM and the NDC value of the C locator in X,Y. This function flushes the output C buffers before doing input. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL X,Y INTEGER BTNNUM -C -C + C COMPUTER DEPENDENT COMMON VARIABLES AND CONSTANTS. include 'vcpstc.blk' -C + C BATCH DEVICES DON'T NEED TO FLUSH BUFFERS. -C + BTNNUM=32 X=0 Y=0 -C + RETURN END SUBROUTINE VDAKGL(CHAR,X,Y) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDAKGL -Await Keyboard, Get Locator. -C + C R.W.SIMONS -02DEC80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Batch Devices. -C + C ENTRY CONDITIONS - -C + C CALLS - -C + C EXIT CONDITIONS -CHAR = integer ASCII character input from the C keyboard, right-justified, zero fill. Range 32-126. C X,Y = real NDC position of the locator. -C + C NARRATIVE -Wait until a key is hit, then return the character C entered in CHAR and the NDC value of the locator C in X,Y. If the character entered does not fall in C the range 32-126, a blank(32) is returned in CHAR. C This function flushes the output buffers before C doing input. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL X,Y INTEGER CHAR -C + C dummy routine -C + CHAR=32 X=0. Y=0. @@ -906,20 +901,20 @@ SUBROUTINE VDAKGL(CHAR,X,Y) END SUBROUTINE VDALOC(X,Y) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDALOC -Await Locator. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Batch Devices. -C + C ENTRY CONDITIONS - -C + C CALLS - -C + C EXIT CONDITIONS -X,Y = real NDC position of the locator. -C + C NARRATIVE -Wait until the locator is positioned, then return C the NDC value of the locator in X,Y. The fact that C the locator is positioned can be signaled in a @@ -930,104 +925,102 @@ SUBROUTINE VDALOC(X,Y) C function, as only the locator position is returned. C This function flushes the output buffers before C doing input. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL X,Y -C -C + C COMPUTER DEPENDENT COMMON VARIABLES AND CONSTANTS. include 'vcpstc.blk' -C + C BATCH DEVICES DON'T NEED TO FLUSH BUFFERS. -C + X=0 Y=0 -C + RETURN END SUBROUTINE VDBELL C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDBELL -Ring Bell -C + C R.W.SIMONS -02DEC80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Batch Devices. -C + C ENTRY CONDITIONS - -C + C CALLS - -C + C EXIT CONDITIONS - -C + C NARRATIVE -Ring user's bell to get his attention. This C function is ignored by batch devices. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C THIS FUNCTION IS IGNORED BY BATCH DEVICES. -C + RETURN END SUBROUTINE VDBUFL C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDBUFL -Buffer Flush. -C + C R.W.Simons -19DEC80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Batch Devices. -C + C ENTRY CONDITIONS - -C + C CALLS - -C + C EXIT CONDITIONS - -C + C NARRATIVE -Assure that the picture is up-to-date by flushing C buffers if necessary. Also prepare the device to C operate in alphanumeric (as opposed to graphic) C mode. This is necessary on some devices so that C alphanumeric data from FORTRAN I/O won't be C misinterpreted as graphic data. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C THIS FUNCTION IS IGNORED BY BATCH DEVICES. -C + RETURN END SUBROUTINE VDESCP(ESCPCD,N,ARGS) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDESCP -Escape Code Routine. -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS -ESCPCD = integer escape function code. C N = integer number of arguments in ARG. RANGE >=0. C ARGS = real array of arguments for the escape C function specified. -C + C CALLS - -C + C EXIT CONDITIONS - -C + C NARRATIVE -Invoke the nonstandard, device-dependent function C ESCPCD. N is the number of arguments used by this C function and ARGS is a real array containing those C arguments. Unsupported values of ESCPCD are C ignored, not causing an error. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER ESCPCD,N REAL ARGS(*) -C C COMPUTER DEPENDENT COMMON VARIABLES AND CONSTANTS. include 'vcpstc.blk' C SCALE FACTORS FOR NDC TO DC MAPPING. (LXY,HC1) @@ -1036,18 +1029,18 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) C DC DIMENSIONS OF OFFSETS AND PICTURE. (LXY,HC1) INTEGER XPAD,YPAD,XDEVIC,YDEVIC COMMON /VCDDIM/ XPAD,YPAD,XDEVIC,YDEVIC -C + C USED BY VIPOLY FOR PATTERN FILL AND BORDER ON/OFF. DEFAULT COMPLETE FILL C AND BORDER ON. PLC. COMMON/VCESCP/PGFORM,PATNO,BORDER INTEGER PGFORM,PATNO,BORDER -C + C CHECK FOR VALID N. IF(N.LT.0) THEN CALL VBERRH(802,5) GOTO 999 END IF -C + C 2100 - PAGE FORMAT (0=LANDSCAPE,1=PORTRAIT) IF (ESCPCD.EQ.2100) THEN IF (ARGS(1).EQ.0) THEN @@ -1055,9 +1048,9 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) ELSE PGFORM=1 ENDIF -C + C set output format -C + ELSEIF (ESCPCD.EQ.2101) THEN CALL PSTSEL('1') ELSEIF (ESCPCD.EQ.2102) THEN @@ -1079,60 +1072,60 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) ELSEIF (ESCPCD.EQ.2110) THEN CALL PSTSEL('10') ENDIF -C + 999 RETURN END SUBROUTINE VDFRAM(ITYPE) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDFRAM - Draw header or trailer frame -C + C P. Watterberg - 27 Aug 81 -C + C ENVIRONMENT -Computer-independent, system-independent, FORTRAN 77 -C + C ENTRY CONDITIONS - ITYPE = 0 for header frame C = 1 for trailer frame -C + C CALLS - VIFRAM -C + C EXIT CONDITIONS - -C + C NARRATIVE - Calls vifram to get time and date from the C system via the computer-dependent routine PSTTOD(entry C point in PSTJOB) and writes it on an identification frame. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER ITYPE -C + CALL VIFRAM(ITYPE) RETURN END SUBROUTINE VDGNAM(NAME) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDGNAM -Name the graphics output file -C + C P.L.Crotty -OCT88 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -NAME = character string; < 80 characters -C + C CALLS -C + C EXIT CONDITIONS -output graphics file is assigned the name NAME -C + C NARRATIVE -This subroutine associates a file name with C the graphics output file (KOUTFL). If this C routine is not called, a system dependent C default name is used. VDGNAM must be called C before VDINIT. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + SAVE CHARACTER*(*) NAME CHARACTER*132 PSTNAM @@ -1196,26 +1189,26 @@ SUBROUTINE VDGNAM(NAME) END SUBROUTINE VDINIT(ASPECT,JUSTIF) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDINIT -Initialize SVDI. -C + C R.W.Simons -08APR81 C 30SEP81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -ASPECT = real ratio of X dimension to Y dimension. C Range >0.0. Default: 0.0 (device dependent). C JUSTIF = integer justification of NDC space on the C device. Range 0-9. Default: 0 (device dependent). -C + C CALLS -PSTJOB, VBERRH, VIINIT. -C + C EXIT CONDITIONS -XNDCMX,YNDCMX = real NDC maximum valid values. C VECTOR = real array of default attribute values (all C device-dependent except VECTOR(4)=0.0). -C + C NARRATIVE -This must be the first SVDI call made. All C attribute values, the color table, and current C position are set to appropriate defaults for the @@ -1223,7 +1216,7 @@ SUBROUTINE VDINIT(ASPECT,JUSTIF) C is done. The screen is cleared or paper advanced C if necessary to guarantee a blank view surface for C drawing. -C + C ASPECT specifies the ratio of the X dimension to the C Y dimension. Maximum NDC values (at least one of C which will be 1.0) are computed to give the ASPECT @@ -1234,7 +1227,7 @@ SUBROUTINE VDINIT(ASPECT,JUSTIF) C aspect of 1.0. The NDC rectangle is scaled until C one dimension fills the corresponding dimension of C the device. -C + C JUSTIF determines where the rectangle is located on C the device as diagrammed below: C --------- @@ -1244,18 +1237,18 @@ SUBROUTINE VDINIT(ASPECT,JUSTIF) C --------- C For example, JUSTIF = 7 indicates NDC space will be C upper left justified on the device. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL ASPECT INTEGER JUSTIF -C + C JOB ID INFORMATION. (HC1, DIC) include 'vcjob.blk' -C + C COMPUTER DEPENDENT COMMON VARIABLES AND CONSTANTS. include 'vcpstc.blk' -C + C set common variables KWRTFL=6 KRDFL=0 @@ -1273,32 +1266,32 @@ SUBROUTINE VDINIT(ASPECT,JUSTIF) C IF(KSECUR.NE.0) THEN C CALL VBERRH(957,13) C END IF -C + C THIS IS JUST A DUMMY ROUTINE WHICH DOES NOTHING BUT CALL VIINIT. C THIS ORGANIZATION FACILITATES ADDING SECURITY MARKINGS TO SVDI. CALL VIINIT(ASPECT,JUSTIF) -C + RETURN END SUBROUTINE VDIQCO(NUM,INDEX,CLRARY,CLRMOD) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDIQCO -Inquire Color Table. -C + C R.W.Simons -08APR81 C H. S. LAUSON 29MAY86 - changed for current HLS interpretation -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Black and White Devices. (LXY, HC1, ALP) -C + C ENTRY CONDITIONS -NUM = integer number of color indexes to inquire. C Range 1-256. C INDEX = integer array of indexes to inquire. Range C 0-255. C CLRMOD = integer color model to be used. Range 0,1. -C + C CALLS -VBERRH -C + C EXIT CONDITIONS -CLRARY = real array of 3 by NUM elements returning C the values of the components of the indexes inquired. C Range for RGB: red 0.0-1.0 @@ -1307,7 +1300,7 @@ SUBROUTINE VDIQCO(NUM,INDEX,CLRARY,CLRMOD) C Range for HLS: hue 0.0-360.0 C lightness 0.0-1.0 C saturation 0.0-1.0 -C + C NARRATIVE -Inquire one or more color table entries. NUM and C INDEX specify how many and which indexes are being C inquired. CLRMOD specifies which color model @@ -1316,28 +1309,28 @@ SUBROUTINE VDIQCO(NUM,INDEX,CLRARY,CLRMOD) C support a color table index specified will C return -1.0 in the first element of the CLRARY value C for that index. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER NUM,INDEX(NUM),CLRMOD REAL CLRARY(3,NUM) -C + COMMON /PCOLST/ PCOLS(3,256) -C + C CHECK FOR VALID NUM. IF(NUM.LT.1.OR.NUM.GT.256) THEN CALL VBERRH(723,5) GOTO 999 END IF -C + C CHECK FOR VALID CLRMOD. IF(CLRMOD.NE.0.AND.CLRMOD.NE.1) THEN CALL VBERRH(725,5) GOTO 999 END IF -C + IF(CLRMOD.NE.0) STOP 'HLS COLORS NOT SUPPORTED' -C + C CHECK FOR VALID INDEXES. DO 100 I=1,NUM INDEXN=INDEX(I) @@ -1348,54 +1341,54 @@ SUBROUTINE VDIQCO(NUM,INDEX,CLRARY,CLRMOD) DO 200 IC=1,3 200 CLRARY(IC,I)=PCOLS(IC,INDEXN) 100 CONTINUE -C + 999 RETURN END SUBROUTINE VDIQCP(X,Y) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDIQCP -Inquire Where Current Position Is. -C + C R.W.Simons -02DEC80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Devices that support a software CP. C (AP5,GER,H50,HC1,HCB,HPP,I10,I30,LXY,QCR,QMS,XYN) -C + C ENTRY CONDITIONS - -C + C CALLS - -C + C EXIT CONDITIONS -X,Y = real NDC position. -C + C NARRATIVE -Return the value of current position. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C CURRENT POSITION. REAL XCP,YCP COMMON /VCCRPS/ XCP,YCP -C + C ASSIGN THE CP TO X,Y. X=XCP Y=YCP -C + RETURN END SUBROUTINE VDIQDC(INDEX,VALUE) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDIQDC -Inquire Device Capabilities. -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS -INDEX = integer capability number. Range 1-33. -C + C CALLS - -C + C EXIT CONDITIONS -VALUE = real value of the capability indicated by C INDEX. -C + C NARRATIVE -Return values of various device capabilities. INDEX C is the integer capability number (as given below), C and the real value is returned in VALUE. @@ -1529,9 +1522,9 @@ SUBROUTINE VDIQDC(INDEX,VALUE) C 33. Device pixel aspect - the ratio of the spacing of device C pixels in x divided by the spacing in y (1 for square C pixels) -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + SAVE INTEGER INDEX REAL VALUE @@ -1540,11 +1533,11 @@ SUBROUTINE VDIQDC(INDEX,VALUE) C DEFAULT COMPLETE FILL WITH BORDER. PLC. COMMON /VCESCP/ PGFORM,PATNO,BORDER INTEGER PGFORM,PATNO,BORDER -C + C mopoly controls polygon fill =0, on ; =1, off C mocolr controls color =0, on ; =1, off COMMON /VCPSTB/ MOPOLY, MOCOLR -C + *- INCLUDE PSTFULL C size of full view window C parameters set to get same size plot as imagen and qms b&w. @@ -1553,41 +1546,41 @@ SUBROUTINE VDIQDC(INDEX,VALUE) *- C INITIALIZE THE DEVICE CAPABILITIES VECTOR. COMMON /DEVCAP/ DEV(33) -C + C data is for black & white device -C + DATA DEV /0.,1.,1.,1.,15.,2.,0.,0.,0.,0., + 0.,0.,0.,0.,7230.,5040.,254.,178.,4.,10., + 84.,0.,0.,3.,99999.,0.,1.,0.,0.,5000., + 750.,0.,1./ DATA NOCALL /0/ -C + C If device is 0, call to reset -C + IF(NINT(DEV(23)).EQ.0) THEN CALL PSTSEL(' ') END IF -C + C CHECK FOR VALID INDEX. IF(INDEX.LT.1.OR.INDEX.GT.33) THEN CALL VBERRH(726,5) GOTO 999 END IF -C + C RETURN INDEXED VALUE. VALUE=DEV(INDEX) IF(INDEX.EQ.23) NOCALL=1 -C + 999 RETURN -C + C********************************************************************** ENTRY VDIQD9(XINCH,YINCH) -C + C This is an added entry for rscors version of pst driver to C tell if direct or post mode operation. If post mode, vdiqdc C is called before vdinit to get terminal type. In direct mode C it is never called to get type. -C + IF(NOCALL.NE.0) THEN C XINCH=10.0 C YINCH=7.5 @@ -1598,24 +1591,24 @@ SUBROUTINE VDIQDC(INDEX,VALUE) END SUBROUTINE VDIQES(ESCPCD,SUPPRT) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDIQES -Inquire Escape. -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS -ESCPCD = integer escape function code. -C + C CALLS - -C + C EXIT CONDITIONS -SUPPRT = integer level of support for the escape C function specified. Range 0,1,2. -C + C NARRATIVE -An integer value indicating 2=hardware supported, C 1=software supported, 0=unsupported is returned in C SUPPRT for the escape function ESCPCD. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER ESCPCD,SUPPRT IF (ESCPCD.EQ.2100) THEN SUPPRT=2 @@ -1629,55 +1622,55 @@ SUBROUTINE VDIQES(ESCPCD,SUPPRT) END SUBROUTINE VDIQND(XNDC,YNDC) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDIQND -Inquire NDC Space. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -XNDCMX,YNDCMX = real maximum valid NDC values. -C + C CALLS - -C + C EXIT CONDITIONS -XNDC,YNDC = real maximum valid NDC values (XNDCMX, C YNDCMX). -C + C NARRATIVE -Return the maximum NDC values as set to realize the C aspect defined by VDINIT. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL XNDC,YNDC -C + C MAXIMUM VALID NDC VALUES. (DEVICE-INDEPENDENT) REAL XNDCMX,YNDCMX COMMON /VCNDCM/ XNDCMX,YNDCMX -C + C RETURN THE MAXIMUM VALID NDC VALUES. XNDC=XNDCMX YNDC=YNDCMX -C + RETURN END SUBROUTINE VDIQOS(ATTARR) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDIQOS -Inquire Output Status (of Attributes). -C + C K.M. ERICKSON -14 NOV 80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -VECTOR = real array of current attribute values. -C + C CALLS - -C + C EXIT CONDITIONS -ATTARR = real array of current attribute value C (VECTOR). -C + C NARRATIVE -Return the current attribute values in ATTARR as C given below. C ATTARR(1)=Foreground Color @@ -1687,11 +1680,11 @@ SUBROUTINE VDIQOS(ATTARR) C (5)=Line Width C (6)=Character Box Y C (7)=Character Box X -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL ATTARR(7) -C + C CURRENT ATTRIBUTE VALUES. (DEVICE-INDEPENDENT) REAL VECTOR(7) COMMON /VCATTR/ VECTOR @@ -1702,64 +1695,64 @@ SUBROUTINE VDIQOS(ATTARR) C (5)=LINE WIDTH C (6)=CHARACTER BOX Y C (7)=CHARACTER BOX X -C + INTEGER I -C + DO 100 I=1,7 ATTARR(I)=VECTOR(I) 100 CONTINUE -C + RETURN END SUBROUTINE VDLINA(X,Y) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDLINA -Line Absolute. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -X,Y = real NDC position. -C + C CALLS -VILINA. -C + C EXIT CONDITIONS - -C + C NARRATIVE -Draw a line from current position to absolute NDC C position X,Y and update current position. C Attributes foreground color, intensity, line style, C and line width apply. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL X,Y -C + C THIS IS JUST A DUMMY ROUTINE WHICH DOES NOTHING BUT CALL VILINA. C THIS ORGANIZATION FACILITATES ADDING SECURITY MARKINGS TO SVDI. CALL VILINA(X,Y) -C + RETURN END SUBROUTINE VDLOGE(ERRNUM,ERRSEV) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDLOGE -Log Error. -C + C R.W.Simons -08APR81 C K.M.Erickson -8OCT84 - add buffer flush -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -ERRNUM = integer error number. C ERRSEV = integer error severity. -C + C CALLS -PSTTBK, VDBUFL -C + C EXIT CONDITIONS - -C + C NARRATIVE -Report error with message to user and possibly C terminate job depending on severity. Notice that C by judicious use of the error routines (see VBERRH) @@ -1768,44 +1761,42 @@ SUBROUTINE VDLOGE(ERRNUM,ERRSEV) C occurrences of a particular error, or terminate C if more than 10 errors of a particular severity C occur. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER ERRNUM,ERRSEV -C -C + C COMPUTER DEPENDENT COMMON VARIABLES AND CONSTANTS. include 'vcpstc.blk' -C + C flush buffer before we do a write CALL VDBUFL -C + C WRITE THE ERROR TO THE LISTING. WRITE(KWRTFL,10)ERRNUM,ERRSEV 10 FORMAT(' SVDI ERROR NUMBER ',I5,' SEVERITY CODE ',I5) -C + C TRACEBACK. csam CALL PSTTBK -C + RETURN END SUBROUTINE VDMONI(ISTATE) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDMONI -Logs Usage Information.. -C -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -ISTATE = 0 - initialization C 1 - new page C 2 - terminate -C + C CALLS -C + C EXIT CONDITIONS - -C + C NARRATIVE -For ISTATE=0, job information is initialized, and C timers are initialized called by VIINIT. C ISTATE=1 will increment a common block page @@ -1819,16 +1810,16 @@ SUBROUTINE VDMONI(ISTATE) C Entry point VBDEV has an 8 character parameter C which will set a common block variable specifying C the device being used. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C dummy routine -C + CHARACTER*(*) C1,C2 -C + RETURN C Usage Monitoring Information -C + ENTRY VBPKG (C1) RETURN ENTRY VBDEV (C2) @@ -1842,106 +1833,106 @@ SUBROUTINE VDMONI(ISTATE) END SUBROUTINE VDMOVA(X,Y) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDMOVA -Move Absolute. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -X,Y = real NDC position. -C + C CALLS -VIMOVA -C + C EXIT CONDITIONS - -C + C NARRATIVE -Set current position to absolute NDC position X,Y. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL X,Y -C + C THIS IS JUST A DUMMY ROUTINE WHICH DOES NOTHING BUT CALL VIMOVA. C THIS ORGANIZATION FACILITATES ADDING SECURITY MARKINGS TO SVDI. CALL VIMOVA(X,Y) -C + RETURN END SUBROUTINE VDNWPG C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDNWPG -New Page. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS - -C + C CALLS -VINWPG. -C + C EXIT CONDITIONS - -C + C NARRATIVE -Physically advance the medium or clear the screen, C whichever is appropriate. Also flood the screen C with the background color on devices that support C this function. The current position is not changed. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C THIS IS JUST A DUMMY ROUTINE WHICH DOES NOTHING BUT CALL VINWPG. C THIS ORGANIZATION FACILITATES ADDING SECURITY MARKINGS TO SVDI. CALL VINWPG -C + RETURN END SUBROUTINE VDPNTA(X,Y) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDPNTA -Point Absolute. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -X,Y = real NDC position. -C + C CALLS -VIPNTA. -C + C EXIT CONDITIONS - -C + C NARRATIVE -Set current position to absolute NDC position X,Y C and put a visible point there. Attributes C foreground color and intensity apply. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL X,Y -C + C THIS IS JUST A DUMMY ROUTINE WHICH DOES NOTHING BUT CALL VIPNTA. C THIS ORGANIZATION FACILITATES ADDING SECURITY MARKINGS TO SVDI. CALL VIPNTA(X,Y) -C + RETURN END SUBROUTINE VDPOLY(XARRAY,YARRAY,NPTS) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDPOLY -POLYGON FILL ROUTINE -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS -XARRAY-ARRAY OF X VALUES OF THE POLYGON C YARRAY-CORRESPONDING ARRAY OF Y VALUES C NPTS- NUMBER OF POINTS IN (XARRAY,YARRAY) -C + C CALLS -VIPOLY -C + C EXIT CONDITIONS - -C + C NARRATIVE -The polygon defined by XARRAY,YARRAY will be drawn C and filled (constrained by any limitations of the C physical device -- see below). No checking will be @@ -1950,11 +1941,11 @@ SUBROUTINE VDPOLY(XARRAY,YARRAY,NPTS) C boundary is drawn using the solid line style. C VDI will close the polygon (i.e. the last point C will be connected to the first). -C + C The level of support for this primitive is device- C dependent. The level of support is categorized C as follows: -C + C Level 0 -- no polygon fill. Only the polygon C boundary is drawn. C Level 1 -- the device fills convex polygons. @@ -1967,45 +1958,45 @@ SUBROUTINE VDPOLY(XARRAY,YARRAY,NPTS) C is drawn to that point from a point far outside C the polygon, that line intersects the polygon C boundary an odd number of times. -C + C Note that the level of support for a particular device C can be inquired using the function VDIQDC. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER NPTS REAL XARRAY(NPTS),YARRAY(NPTS) -C + C THIS IS JUST A DUMMY ROUTINE WHICH DOES NOTHING BUT CALL VIPOLY. C THIS ORGANIZATION FACILITATES ADDING SECURITY MARKINGS TO SVDI. C mopoly controls polygon fill =0, on ; =1, off C mocolr controls color =0, on ; =1, off COMMON /VCPSTB/ MOPOLY, MOCOLR -C + IF(MOPOLY.EQ.0) THEN CALL VIPOLY(XARRAY,YARRAY,NPTS) END IF -C + RETURN END SUBROUTINE VDSTBC(COLOR) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDSTBC -Set Background Color. -C + C R.W.Simons -05DEC80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Devices with a constant white background. (LXY, C HC1, ALP) -C + C ENTRY CONDITIONS -COLOR = integer color table index. Range 0-255. C Default: device dependent, in range 0-7. -C + C CALLS -VBERRH -C + C EXIT CONDITIONS -VECTOR(2) = real updated background color (COLOR). -C + C NARRATIVE -Set the background color for following VDNWPG or C TEXT primitives for devices supporting these C features. For example, many raster devices support @@ -2016,11 +2007,11 @@ SUBROUTINE VDSTBC(COLOR) C dependent value in the range 0-7. C If an unsupported value is specified, set to C default. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER COLOR -C + C CURRENT ATTRIBUTE VALUES. (DEVICE-INDEPENDENT) REAL VECTOR(7) COMMON /VCATTR/ VECTOR @@ -2031,28 +2022,28 @@ SUBROUTINE VDSTBC(COLOR) C (5)=LINE WIDTH C (6)=CHARACTER BOX Y C (7)=CHARACTER BOX X -C + C CHECK FOR VALID COLOR. IF(COLOR.LT.0.OR.COLOR.GT.255) THEN CALL VBERRH(724,5) GOTO 999 END IF -C + C ONLY THE SINGLE BACKGROUND COLOR 7 (WHITE) IS SUPPORTED, C SO NO ACTION IS NECESSARY. -C + 999 RETURN END SUBROUTINE VDSTCO(NUM,INDEX,CLRARY,CLRMOD) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDSTCO -Set Color Table. -C + C R.W.SIMONS -02DEC80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Black and White Devices. (LXY, HC1, ALP) -C + C ENTRY CONDITIONS -NUM = integer number of color indexes to be set. C Range 1-256. C INDEX = integer array of indexes to be set. Range @@ -2078,11 +2069,11 @@ SUBROUTINE VDSTCO(NUM,INDEX,CLRARY,CLRMOD) C 7 white 1.,1.,1. C CLRMOD = integer color model being used. Range 0,1. C Default: 0 (RGB). -C + C CALLS -VBERRH -C + C EXIT CONDITIONS - -C + C NARRATIVE -Set one or more color table entries. This is a C dynamic setting, if the device will support it. C "Dynamic" neans that primitives which have already @@ -2105,36 +2096,36 @@ SUBROUTINE VDSTCO(NUM,INDEX,CLRARY,CLRMOD) C All devices must support at least a single device C dependent INDEX value in the range 0-7. If an C unsupported value is specified, it should be ignored. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER NUM,INDEX(NUM),CLRMOD REAL CLRARY(3,NUM) CHARACTER*6 KOLIND CHARACTER*20 KOLCOM COMMON /VCVEC1/ IVECT INTEGER IVECT -C + C ARRAY TO CONTAIN COMPLETE COLOR TABLE -C + COMMON /PCOLST/ PCOLS(3,256) -C + C mopoly controls polygon fill =0, on ; =1, off C mocolr controls color =0, on ; =1, off COMMON /VCPSTB/ MOPOLY, MOCOLR -C + C CHECK FOR VALID NUM. IF(NUM.LT.1.OR.NUM.GT.256) THEN CALL VBERRH(723,5) GOTO 999 END IF -C + C CHECK FOR VALID CLRMOD. IF(CLRMOD.NE.0.AND.CLRMOD.NE.1) THEN CALL VBERRH(725,5) GOTO 999 END IF -C + C CHECK FOR VALID INDEXES. DO 100 I=1,NUM INDEXN=INDEX(I) @@ -2153,18 +2144,18 @@ SUBROUTINE VDSTCO(NUM,INDEX,CLRARY,CLRMOD) CALL VBERRH(727,5) GOTO 100 END IF -C + C 256 INDEXES ARE SUPPORTED: DO 200 IC=1,3 200 PCOLS(IC,INDEXN+1)=CLRARY(IC,I) -C + C define symbol for color reference -C + IF(MOCOLR.NE.0) GO TO 390 -C + C if a set of vectors was in process, issue stroke command C to draw them - then start a new path. -C + IF(IVECT.NE.0) THEN CALL PSTBUF(2,'s ') IVECT=0 @@ -2198,35 +2189,35 @@ SUBROUTINE VDSTCO(NUM,INDEX,CLRARY,CLRMOD) CALL VBERRH(727,5) GOTO 100 END IF -C + C 256 INDEXES ARE SUPPORTED: STOP 'HLS COLORS NOT AVAILABLE' END IF 100 CONTINUE -C + 999 RETURN END SUBROUTINE VDSTCS(YSIZE) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDSTCS -Set Character Size. -C + C R.W.Simons -05DEC80 C J. P. LONG -03 DEC 87 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Devices that support only software characters. C (LXY, HC1) -C + C ENTRY CONDITIONS -YSIZE = real Y dimension of the character box in NDC C space. Range 0.-1. Default: device dependent, C typically the smallest hardware size. -C + C CALLS - -C + C EXIT CONDITIONS -VECTOR(6) = real updated character box Y (YSIZE). C VECTOR(7) = real updated character box X. -C + C NARRATIVE -Set the character size for text primitives. Size C is given by YSIZE as the Y dimension of the C character box. The SVDI will assign the X dimension @@ -2238,12 +2229,12 @@ SUBROUTINE VDSTCS(YSIZE) C unsupported value is specified, set to the largest C supported character size that does not exceed the C specified size. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL YSIZE CHARACTER STR*4,CTEMP*10 -C + C CURRENT ATTRIBUTE VALUES. (DEVICE-INDEPENDENT) REAL VECTOR(7) COMMON /VCATTR/ VECTOR @@ -2261,7 +2252,7 @@ SUBROUTINE VDSTCS(YSIZE) REAL YSZLST save yszlst data yszlst /0.0/ -C + C CHECK FOR VALID YSIZE. IF(YSIZE.LT.0.0.OR.YSIZE.GT.1.0) THEN CALL VBERRH(401,5) @@ -2272,49 +2263,49 @@ SUBROUTINE VDSTCS(YSIZE) else yszlst = ysize end if -C + C PROTECT INPUT PARAMETER FROM BEING CHANGED. YSIZE1=YSIZE -C + C DON'T ALLOW VALUES BELOW THE MINIMUM "HARDWARE" SIZE. IF(YSIZE1.LT.0.01) YSIZE1=0.01 -C + C VALUES ESTABLISHED HERE ARE USED BY VBSIM IN SIMULATING CHARACTERS. C ALWAYS USE A CHARACTER ASPECT RATIO OF 5/7. VECTOR(6)=YSIZE1 VECTOR(7)=YSIZE1*5./7. -C + C convert the character size into device coords -C + IYSIZE=NINT(XSCALE*YSIZE1) -C + C output the postscript command -C + CALL PSTI2C(IYSIZE,4,STR) C iysize is in tenths of device units CTEMP='y '//STR(1:3)//' x ' CALL PSTBUF(8,CTEMP) -C + 999 RETURN END SUBROUTINE VDSTFC(COLOR) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDSTFC -Set Foreground Color. -C + C R.W.Simons -05DEC80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Devices with a constant black foreground. (LXY, C HC1) -C + C ENTRY CONDITIONS -COLOR = integer color table index . Range 0-255. C Default is device dependent, in range 0-7. -C + C CALLS -VBERRH -C + C EXIT CONDITIONS -VECTOR(1) = real updated foreground color (COLOR). -C + C NARRATIVE -Set the foreground color index, i.e., the color C table index used for drawing future primitives. C Color is an integer from 0-255 which is used as an @@ -2323,16 +2314,16 @@ SUBROUTINE VDSTFC(COLOR) C dependent value in the range 0-7. C If an unsupported value is specified, set to C default. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER COLOR CHARACTER*5 KOLIND -C + C ARRAY TO CONTAIN COMPLETE COLOR TABLE -C + COMMON /PCOLST/ PCOLS(3,256) -C + C pstmlw controls minimum line width C kpstbg controls background coloring C = 0, not colored (white ground from paper) @@ -2341,11 +2332,11 @@ SUBROUTINE VDSTFC(COLOR) C = 0, no interchange C = 1, colors interchanged COMMON /VCPSTA/ PSTMLW, KPSTBG, KPSTCI -C + C mopoly controls polygon fill =0, on ; =1, off C mocolr controls color =0, on ; =1, off COMMON /VCPSTB/ MOPOLY, MOCOLR -C + COMMON /VCVEC1/ IVECT INTEGER IVECT C CURRENT ATTRIBUTE VALUES. (DEVICE-INDEPENDENT) @@ -2358,16 +2349,16 @@ SUBROUTINE VDSTFC(COLOR) C (5)=LINE WIDTH C (6)=CHARACTER BOX Y C (7)=CHARACTER BOX X -C + C CHECK FOR VALID COLOR. IF(COLOR.LT.0.OR.COLOR.GT.255) THEN CALL VBERRH(724,5) GO TO 999 END IF -C + VECTOR(1)=COLOR IF(MOCOLR.EQ.0) THEN -C + C draw any vectors in stack before changing colors IF(IVECT.NE.0) THEN CALL PSTBUF(4,'s r ') @@ -2376,7 +2367,7 @@ SUBROUTINE VDSTFC(COLOR) CALL PSTBUF(0,' ') IVECT=0 END IF -C + C code using symbols KOLIND='c' IF(COLOR.LE.9) THEN @@ -2399,27 +2390,27 @@ SUBROUTINE VDSTFC(COLOR) NNN=5 END IF CALL PSTBUF(NNN,KOLIND(1:NNN)) -C + END IF 999 RETURN END SUBROUTINE VDSTIN(INTEN) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDSTIN -Set Intensity. -C + C R.W.Simons -05DEC80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Single Intensity Devices. (LXY, HC1) -C + C ENTRY CONDITIONS -INTEN = real intensity of the image of an output C primitive. Range 0.-1. Default: device dependent. -C + C CALLS - -C + C EXIT CONDITIONS -VECTOR(3) = real updated intensity (INTEN). -C + C NARRATIVE -Set the intensity value indicated for future C primitives. Intensity is a real value between 0 C (not visible) and 1 (maximum). Intensities are @@ -2427,11 +2418,11 @@ SUBROUTINE VDSTIN(INTEN) C All devices must support at least a single value: C 1.0. If an unsupported value is specified, set to C the closest supported intensity. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL INTEN -C + C CURRENT ATTRIBUTE VALUES. (DEVICE-INDEPENDENT) REAL VECTOR(7) COMMON /VCATTR/ VECTOR @@ -2442,62 +2433,61 @@ SUBROUTINE VDSTIN(INTEN) C (5)=LINE WIDTH C (6)=CHARACTER BOX Y C (7)=CHARACTER BOX X -C + C CHECK FOR VALID INTEN. IF(INTEN.LT.0.0.OR.INTEN.GT.1.0) THEN CALL VBERRH(401,5) GOTO 999 END IF -C + C ONLY THE SINGLE INTENSITY 1.0 (MAXIMUM) IS SUPPORTED, C SO NO ACTION IS NECESSARY. -C + 999 RETURN END SUBROUTINE VDSTLA(LOCX,LOCY) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDSTLA -Set Initial Locator Position. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Batch Devices. -C + C ENTRY CONDITIONS -LOCX,LOCY = real NDC position that the locator is C initilaized to. -C + C CALLS - -C + C EXIT CONDITIONS - -C + C NARRATIVE -Set the initial locator position (light pen tracking C cross, for example) each time this function is C called. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL LOCX,LOCY -C + C BATCH DEVICES IGNORE THIS FUNCTION. -C + RETURN END SUBROUTINE VDSTLS(LINSTY) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDSTLS -Set Line Style. -C -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS -LINSTY = integer linestyle of line drawing output C primitives. Range 0-5. Default:0. -C + C CALLS - -C + C EXIT CONDITIONS -VECTOR(4) = real updated line style (LINSTY). -C + C NARRATIVE -Set the style of line as below. This applies only C to line drawing primitives. The line styles are: C 0 - solid @@ -2509,7 +2499,7 @@ SUBROUTINE VDSTLS(LINSTY) C All devices must support at least the values 0 and C 5. If an unsupported value is specified, set to 5. C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL LW INTEGER LINSTY,ILL,JLL COMMON /VCVEC1/ IVECT @@ -2517,7 +2507,7 @@ SUBROUTINE VDSTLS(LINSTY) CHARACTER COORD*20 INTEGER IVECT CHARACTER CTEMP*30,STRL*3,STRS*3,STRG*3 -C + C CURRENT ATTRIBUTE VALUES. (DEVICE-INDEPENDENT) REAL VECTOR(7) COMMON /VCATTR/ VECTOR @@ -2537,7 +2527,7 @@ SUBROUTINE VDSTLS(LINSTY) C CURRENT ATTRIBUTE VALUES. (DEVICE-INDEPENDENT) C REAL VECTOR(7) C COMMON /VCATTR/ VECTOR -C + C VECTOR(1)=FOREGROUND COLOR C (2)=BACKGROUND COLOR C (3)=INTENSITY @@ -2545,17 +2535,16 @@ SUBROUTINE VDSTLS(LINSTY) C (5)=LINE WIDTH C (6)=CHARACTER BOX Y C (7)=CHARACTER BOX X -C -C + ENTRY VBSTLS(LINSTY) -C + C CHECK FOR VALID LINSTY. IF(LINSTY.LT.0.OR.LINSTY.GT.5) THEN CALL VBERRH(401,5) VECTOR(4) = 0 GOTO 999 END IF -C + IF(IVECT.NE.0) THEN CALL PSTBUF(2,'s ') IVECT=0 @@ -2564,19 +2553,19 @@ SUBROUTINE VDSTLS(LINSTY) IF(LINSTY.EQ.0) THEN CALL PSTBUF(7,'[] 0 h ') ENDIF -C + C calculate the linewidth -- it's needed below in every case -C + C actual xscale is xscale*.1; linewidth=1 => .01 in NDC LW=VECTOR(5) LW=XSCALE*VECTOR(5)*.001 C a linewidth of zero isn't good with postscript IF(LW.LT.1.) LW=1. -C + C from here on, set up patterns that depend on the linewidth and C the extra length added to the line segment C by the hemispherical end cap -C + IF(LINSTY.EQ.1) THEN ILL=NINT(0.5*LW) IGAP=NINT(3.*LW) @@ -2584,7 +2573,7 @@ SUBROUTINE VDSTLS(LINSTY) CALL PSTI2C(IGAP,3,STRG) CTEMP='['//STRL(1:3)//' '//STRG(1:3)//'] 0 h ' CALL PSTBUF(14,CTEMP) -C + ELSE IF(LINSTY.EQ.2) THEN ILL=NINT(18.*LW) JLL=NINT(1.5*LW) @@ -2596,7 +2585,7 @@ SUBROUTINE VDSTLS(LINSTY) * //' '//STRG(1:3)//'] 0 h ' CALL PSTBUF(22,CTEMP) C call pstbuf(14,'[2 2 6 2] 0 h ') -C + ELSE IF(LINSTY.EQ.3) THEN ILL=NINT(6.*LW) IGAP=NINT(7.*LW) @@ -2605,7 +2594,7 @@ SUBROUTINE VDSTLS(LINSTY) CTEMP='['//STRL(1:3)//' '//STRG(1:3)//'] 0 h ' CALL PSTBUF(14,CTEMP) C call pstbuf(8,'[4] 0 h ') -C + ELSE IF(LINSTY.EQ.4) THEN ILL=NINT(24.*LW) IGAP=NINT(18.*LW) @@ -2614,7 +2603,7 @@ SUBROUTINE VDSTLS(LINSTY) CTEMP='['//STRL(1:3)//' '//STRG(1:3)//'] 0 h ' CALL PSTBUF(14,CTEMP) C call pstbuf(8,'[8] 0 h ') -C + ELSE IF(LINSTY.EQ.5) THEN ILL=NINT(12.*LW) IGAP=NINT(10.*LW) @@ -2622,51 +2611,51 @@ SUBROUTINE VDSTLS(LINSTY) CALL PSTI2C(IGAP,3,STRG) CTEMP='['//STRL(1:3)//' '//STRG(1:3)//'] 0 h ' CALL PSTBUF(14,CTEMP) -C + ENDIF -C + C redefine the postscript current position -C + C the code below is equivalent to C call vbvect(0,xcp,ycp) C but can't do it because vbvect calls vdstlw which calls this routine -C + CTEMP=COORD(1:11)//' m ' CALL PSTBUF(14,CTEMP) -C + VECTOR(4)=LINSTY -C + 999 RETURN END SUBROUTINE VDSTLW(LINWTH) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDSTLW -Set Line Width. -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS -LINWTH = real line width of line drawing output C primitives. Range 0.-1. Default: device dependent. -C + C CALLS - -C + C EXIT CONDITIONS -VECTOR(5) = real updated line width (LINWTH). -C + C NARRATIVE -Set the relative width of an output line. Values C are 0.-1. with 1. being .01 in NDC space. C All devices must support at least a single device C dependent value that is the default. If an C unsupported value is specified, set to the closest C supported line width. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL LINWTH,LW CHARACTER CTEMP*19,STR*5 -C + COMMON /VCVEC1/ IVECT INTEGER IVECT -C + C COMPUTER DEPENDENT COMMON VARIABLES AND CONSTANTS. include 'vcpstc.blk' C CURRENT ATTRIBUTE VALUES. (DEVICE-INDEPENDENT) @@ -2682,7 +2671,7 @@ SUBROUTINE VDSTLW(LINWTH) C SCALE FACTORS FOR NDC TO DC MAPPING. (LXY,HC1) REAL XSCALE,YSCALE COMMON /VCSCAL/ XSCALE,YSCALE -C + C pstmlw controls minimum line width C kpstbg controls background coloring C = 0, not colored (white ground from paper) @@ -2691,29 +2680,29 @@ SUBROUTINE VDSTLW(LINWTH) C = 0, no interchange C = 1, colors interchanged COMMON /VCPSTA/ PSTMLW, KPSTBG, KPSTCI -c + wmag = 1.0 -C + C CHECK FOR VALID LINWTH. IF(LINWTH.LT.0.0.OR.LINWTH.GT.1.) THEN CALL VBERRH(401,5) GOTO 999 END IF -C + C test user define minimum -C + c>>sas width=max(pstmlw*wmag,linwth) c WIDTH=MAX(PSTMLW,LINWTH) -C + C CONVERT LINE-WIDTH TO NDC LW=WIDTH*.005 -C + C CONVERT WIDTH TO DEVICE COORDINATES AND ADD A DIGIT; NEED IT TO HUNDREDTHS ILW=NINT(XSCALE*LW*10.) C A LINEWIDTH OF ZERO WORKS ONLY PART OF THE TIME IF(ILW.LT.10) ILW=10 -C + C SET LINE WIDTH CALL PSTI2C(ILW,5,STR) IF(IVECT.NE.0) THEN @@ -2724,31 +2713,31 @@ SUBROUTINE VDSTLW(LINWTH) CTEMP=STR(1:3)//'.'//STR(4:5)//' w ' CALL PSTBUF(9,CTEMP) END IF -C + VECTOR(5)=WIDTH -C + C since linestyle uses the linewidth in setting the pattern, call it -C + LINSTY=VECTOR(4) CALL VBSTLS(LINSTY) 999 RETURN END SUBROUTINE VDSTOS(ATTARR) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDSTOS -Set Output Status (of Attributes). -C + C K.M. ERICKSON -14 NOV 80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -ATTARR = real array of attribute values. -C + C CALLS -VDSTBC,VDSTCS,VDSTFC,VDSTIN,VDSTLS,VDSTLW -C + C EXIT CONDITIONS -VECTOR = real updated attribute values (ATTARR). -C + C NARRATIVE -Set the attribute values from ATTARR as given below. C ATTARR(1)=Foreground Color C (2)=Background Color @@ -2756,11 +2745,11 @@ SUBROUTINE VDSTOS(ATTARR) C (4)=Line Style C (5)=Line Width C (6)=Character Box Y -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL ATTARR(6) -C + C CURRENT ATTRIBUTE VALUES. (DEVICE-INDEPENDENT) REAL VECTOR(7) COMMON /VCATTR/ VECTOR @@ -2771,7 +2760,7 @@ SUBROUTINE VDSTOS(ATTARR) C (5)=LINE WIDTH C (6)=CHARACTER BOX Y C (7)=CHARACTER BOX X -C + C CALL EACH OF THE INDIVIDUAL ATTRIBUTE SETTING ROUTINES. C CHECK FOR VALIDITY OF INPUT VALUES WILL BE DONE IN EACH INDIVIDUAL C ROUTINE. @@ -2781,56 +2770,56 @@ SUBROUTINE VDSTOS(ATTARR) CALL VDSTLS(NINT(ATTARR(4))) CALL VDSTLW(ATTARR(5)) CALL VDSTCS(ATTARR(6)) -C + RETURN END SUBROUTINE VDTERM C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDTERM -Terminate SVDI. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS - -C + C CALLS -VITERM. -C + C EXIT CONDITIONS - -C + C NARRATIVE -Terminate the SVDI by flushing buffers, etc. This C should be the last SVDI call made. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C THIS IS JUST A DUMMY ROUTINE WHICH DOES NOTHING BUT CALL VITERM. C THIS ORGANIZATION FACILITATES ADDING SECURITY MARKINGS TO SVDI. CALL VITERM -C + RETURN END SUBROUTINE VDTEXT(LENGTH,CHARS) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDTEXT -Text from Array. -C + C R.W.Simons -08APR81 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C Device-independent. -C + C ENTRY CONDITIONS -LENGTH = integer number of characters in CHARS. C Range 1-136. C CHARS = integer array of ASCII characters, one C character per array element, right justified. C Range 8,10,32-126. -C + C CALLS -VITEXT. -C + C EXIT CONDITIONS - -C + C NARRATIVE -Draw LENGTH characters in CHARS, starting at C current position and update current position to C the point after the last character box where the @@ -2843,73 +2832,73 @@ SUBROUTINE VDTEXT(LENGTH,CHARS) C considered reasonable. Attributes foreground color, C background color, intensity, and character size C apply. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER LENGTH,CHARS(136) -C + C THIS IS JUST A DUMMY ROUTINE WHICH DOES NOTHING BUT CALL VITEXT. C THIS ORGANIZATION FACILITATES ADDING SECURITY NARKINGS TO SVDI. CALL VITEXT(LENGTH,CHARS) -C + RETURN END SUBROUTINE VDWAIT C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VDWAIT -Wait for User. -C + C R.W.SIMONS -02DEC80 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C All Batch Devices. -C + C ENTRY CONDITIONS - -C + C CALLS - -C + C EXIT CONDITIONS - -C + C NARRATIVE -Wait for the user to view the screen and signal he C is done, normally by hitting any key. This function C flushes the output buffers before doing input. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C BATCH DEVICES IGNORE THIS COMMAND. -C + RETURN END SUBROUTINE VIFRAM(ITYPE) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VIFRAM - Draw header or trailer frame -C + C P. Watterberg - 27 Aug 81 -C + C ENVIRONMENT -Computer-independent, system-independent, FORTRAN 77 -C + C ENTRY CONDITIONS - ITYPE = 0 for header frame C = 1 for trailer frame -C + C CALLS - -C + C EXIT CONDITIONS - -C + C NARRATIVE -NULL ROUTINE -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER ITYPE -C + RETURN END SUBROUTINE VIINIT(ASPECT,JUSTIF) -C + C VDI-PostScript driver - B&W and COLOR versions C Adapted for all systems by S.L.Thompson C Original code from D.Campbell and J.LONG -C + C vdi device numbers are C device number C black & white, batch, no poly fill 799.1 @@ -2922,50 +2911,50 @@ SUBROUTINE VIINIT(ASPECT,JUSTIF) C color, interactive, black-white interchange 799.8 C color, batch, black background 799.9 C color, interactive, black background 799.11 -C + C last mod 7/10/90 slt -C + C Note that there are several parameters to set depending on how C the package is to be used. Most are in routine pstsel routine C which is called at the first of this routine (viinit.) Two other c parameters (xinch,yinch) are set in this routine and vdiqd9. -C + C This code is for BOTH color and black & white systems. C Flag is set for mode in pstsel. -C + C Device can be set with escape call before call to vdinit. C Otherwise, code will interactively ask for device type, if C vdiqdc(23,value) has been called before vdinit. Otherwise, C code will make b&w output file (799.1 type). Code can be fixed C to come up in about any configuration as default. -C + C There is also an escape flag for landscape or portrait format. -C + C This deck was generated from a qms driver and still has the C qms comments in places. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VIINIT -Initialize SVDI. postscript device -C + C D.L. CAMPBELL -1-DEC-1986 C J.P. LONG -9-NOV-1987 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 C (postscript) -C + C ENTRY CONDITIONS -ASPECT = real ratio of X dimension to Y dimension. C Range >0.0. Default: 0. (device dependent). C JUSTIF = integer justification of NDC space on the C device. Range 0-9. Default: 0 (device dependent.) -C + C CALLS -VBERRH,VDSTCS,VDSTLW,VIMOVA -C + C EXIT CONDITIONS -XNDCMX,YNDCMX = real NDC maximum valid values(as C constrained by ASPECT). C VECTOR = real array of attribute values(all device C dependent except VECTOR(4)=0.0). -C + C NARRATIVE -This must be the first SVDI call made. All C attribute values, the color table, and current C position are set to appropriate defaults for the @@ -2973,7 +2962,7 @@ SUBROUTINE VIINIT(ASPECT,JUSTIF) C is done. The screen is cleared or paper advanced C if necessary to guarantee a blank view surface for C drawing on. -C + C ASPECT specifies the ratio of the X dimension to the C Y dimension . Maximum NDC values (at least one of C which will be 1.0) are computed to give the ASPECT @@ -2984,7 +2973,7 @@ SUBROUTINE VIINIT(ASPECT,JUSTIF) C aspect of 1.0. The NDC rectangle is scaled until C one dimension fills the corresponding dimension of C the device. -C + C JUSTIF determines where the rectangle is located on C the device as diagrammed below: C --------- @@ -2994,22 +2983,22 @@ SUBROUTINE VIINIT(ASPECT,JUSTIF) C --------- C For example, JUSTIF = 7 indicates NDC space will be C upper left justified on the device. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC -C + C Set parameters for type of usage. C Two settings are coded - one for square field of view C and one for full field of view. -C + C If VDIQDC is called before vdinit, full field of view is selected. C Otherwise, square is used. -C + C size of full view PARAMETER (XINCHO=10.0) PARAMETER (YINCHO=7.5) -C + C size of square view C PARAMETER (XINCHO=7.5) C PARAMETER (YINCHO=7.5) @@ -3020,14 +3009,14 @@ SUBROUTINE VIINIT(ASPECT,JUSTIF) C PARAMETER (YINCHO=7.4412525) *- COMMON /VCMODR/ XINCH, YINCH -C + CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC -C + REAL ASPECT INTEGER JUSTIF COMMON /VCVEC1/ IVECT INTEGER IVECT -C + C MAXIMUM VALID NDC VALUES. (DEVICE-INDEPENDENT) REAL XNDCMX,YNDCMX COMMON /VCNDCM/ XNDCMX,YNDCMX @@ -3044,7 +3033,7 @@ SUBROUTINE VIINIT(ASPECT,JUSTIF) C CURRENT POSITION. REAL XCP,YCP COMMON /VCCRPS/ XCP,YCP -C + C COMPUTER DEPENDENT COMMON VARIABLES AND CONSTANTS. include 'vcpstc.blk' C SCALE FACTORS FOR NDC TO DC MAPPING. (LXY,HC1) @@ -3055,14 +3044,14 @@ SUBROUTINE VIINIT(ASPECT,JUSTIF) COMMON /VCDDIM/ XPAD,YPAD,XDEVIC,YDEVIC C JOB ID INFORMATION. (HC1, DIC) include 'vcjob.blk' -C + COMMON /DEVCAP/ DEV(33) C ESCAPE FLAGS C PATNO AND BORDER USED BY VIPOLY FOR FILL PATTERN AND BORDER ON/OFF; C DEFAULT COMPLETE FILL WITH BORDER. PLC. COMMON /VCESCP/ PGFORM,PATNO,BORDER INTEGER PGFORM,PATNO,BORDER -C + C pstmlw controls minimum line width C kpstbg controls background coloring C = 0, not colored (white ground from paper) @@ -3071,26 +3060,26 @@ SUBROUTINE VIINIT(ASPECT,JUSTIF) C = 0, no interchange C = 1, colors interchanged COMMON /VCPSTA/ PSTMLW, KPSTBG, KPSTCI -C + C mopoly controls polygon fill =0, on ; =1, off C mocolr controls color =0, on ; =1, off COMMON /VCPSTB/ MOPOLY, MOCOLR -C + DIMENSION COLDEF(3) -C + C vcpstd variables control what to do with empty frames with C command is received to dump data to output C kempty=0, frame is void - do not draw C >0, frame has data - draw it COMMON /VCPSTD/ KEMPTY -C + DIMENSION ITMP(1) DATA PGFORM/0/ DATA PATNO,BORDER /20,1/ -C + DATA XCP,YCP /0.,0./ -C + C SET DEFAULT ATTRIBUTE VALUES. ALL ARE DEVICE DEPENDENT EXCEPT C VECTOR(4)=0.0. DATA VECTOR /0.,7.,1.,0.,.06255,.01,.0/ @@ -3101,27 +3090,26 @@ SUBROUTINE VIINIT(ASPECT,JUSTIF) C (5)=LINE WIDTH - ABOUT 1/72 INCHES C (6)=CHARACTER BOX Y - ABOUT 1/10 INCHES C (7)=CHARACTER BOX X - 5/7 OF BOX-Y -C -C + C PROTECT INPUT PARAMETERS FROM BEING CHANGED. ASPEC1=ASPECT JUSTI1=JUSTIF KEMPTY=0 -C + C CHECK FOR VALID ASPECT. IF(ASPECT.LT.0.0) THEN CALL VBERRH(721,5), C AND USE DEFAULT ASPECT. IF(ASPECT.LT.0.0) THEN CALL VBERRH(721,5) ASPEC1=0.0 END IF -C + C CHECK FOR VALID JUSTIF. IF(JUSTIF.LT.0 .OR. JUSTIF.GT.9) THEN C CALL VBERRH(720,5), AND USE DEFAULT JUSTIF. IF(JUSTIF.LT.0.OR.JUSTIF.GT.9) THEN CALL VBERRH(720,5) JUSTI1=0 END IF -C + C SCALE NDC UNITS TO DEVICE UNITS. C FOR QMS, THE PHYSICAL PLOT SURFACE IS XINCH X YINCH (10.x7.5). C DEVICE COORDINATES ARE KEPT IN 1/723 INCH TO GAIN SIMPLICITY @@ -3132,14 +3120,14 @@ SUBROUTINE VIINIT(ASPECT,JUSTIF) C ADDRESSABILITY,USING AS MUCH OF THE SPACE AS POSSIBLE. XINCH=XINCHO YINCH=YINCHO -C + C test for rscors post or direct mode. Use 7.5x7.5 for direct C and 10.0x7.5 for post -C + C if VDIQDC has already been called, we are in post mode; C otherwise in direct mode CALL VDIQD9(XINCH,YINCH) -C + C CHECK PAGE FORMAT - IF PORTRAIT, C THEN SWITCH THINGS AROUND IF (PGFORM.EQ.1) THEN @@ -3156,13 +3144,13 @@ SUBROUTINE VIINIT(ASPECT,JUSTIF) XUNITS=XINCH*723. YUNITS=YINCH*723. DASPEC=XUNITS/YUNITS -C + C DEFAULT ASPECT = 1., DEFAULT JUSTIF = 1. IF(ASPEC1.EQ.0.) ASPEC1=DASPEC IF(JUSTI1.EQ.0) JUSTI1=1 -C + IF(ASPEC1.GE.DASPEC) THEN -C + C THEN X DIMENSION IS FILLED. XDEVIC=XUNITS YDEVIC=XUNITS/ASPEC1 @@ -3176,7 +3164,7 @@ SUBROUTINE VIINIT(ASPECT,JUSTIF) YPAD=YUNITS-YDEVIC END IF ELSE -C + C ELSE Y DIMENSION IS FILLED. XDEVIC=YUNITS*ASPEC1 YDEVIC=YUNITS @@ -3190,7 +3178,7 @@ SUBROUTINE VIINIT(ASPECT,JUSTIF) XPAD=0 END IF END IF -C + C FIGURE MAXIMUM NDC VALUES XNDCMX AND YNDCMX. IF(ASPEC1.GE.DASPEC) THEN XNDCMX=MIN(1.,ASPEC1) @@ -3199,7 +3187,7 @@ SUBROUTINE VIINIT(ASPECT,JUSTIF) XNDCMX=ASPEC1 YNDCMX=1. END IF -C + C SET SCALE FACTORS FOR NDC-TO-DEVICE MAPPING. XSCALE=DBLE(XDEVIC)/XNDCMX YSCALE=DBLE(YDEVIC)/YNDCMX @@ -3210,30 +3198,29 @@ SUBROUTINE VIINIT(ASPECT,JUSTIF) XPAD = XPAD+280. YPAD = YPAD-180. ENDIF -C + CALL PSTSEL(' ') -C + C SET UP MONITORING INFORMATION CALL VBDEV('V PST ') CALL VDMONI(0) IVECT=0 -C + C OPEN OUTPUT FILE CALL PSTOFS(KOUTFL) -C + C INITIALIZE the printer -C + CALL PSTINI -C -C + C check for color or black & white mode -C + IF(MOCOLR.EQ.0) THEN -C + C color is on -C + C define some kind of color table -C + DO 120 IC=0,7 COLDEF(1)=0. COLDEF(2)=0. @@ -3271,22 +3258,22 @@ SUBROUTINE VIINIT(ASPECT,JUSTIF) END IF VECTOR(1)=7. VECTOR(2)=0. -C + C define the postscript current position CALL VBVECT(0,XCP,YCP) -C + C shade background if appropriate -C + IF(KPSTBG.NE.0) THEN CALL PSTBBG KEMPTY=0 END IF -C + C INIT LINE WIDTH,CHARACTER SIZE CALL VDSTLW(VECTOR(5)) CALL VDSTCS(VECTOR(6)) CALL VDSTFC(NINT(VECTOR(1))) -c + c >>sas c initialize the preview raster call setras(0,0,0) @@ -3294,107 +3281,103 @@ SUBROUTINE VIINIT(ASPECT,JUSTIF) END SUBROUTINE VILINA (X,Y) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VILINA -C + C D.L. CAMPBELL -1-DEC-1986 C J.P. LONG -9-NOV-1987 -C + C ENVIRONMENT -DEVICE DEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS -X,Y REAL NDC COORDINATES -C + C CALLS - -C + C EXIT CONDITIONS -CURRENT POSITION IS SET -C -C + C NARRATIVE C LINE-DRAW A LINE FROM CP TO ABSOLUTE NDC POSITION X,Y C AND UPDATE CP . ATTRIBUTES COLOR,INTEN,LINSTY AND C LINWTH APPLY. -C -C + C OTHER VARIABLES: C XCP,YCP-NDC COORDINATES C*************************************************************************** -C + REAL X,Y -C + C vcpstd variables control what to do with empty frames with C command is received to dump data to output C kempty=0, frame is void - do not draw C >0, frame has data - draw it COMMON /VCPSTD/ KEMPTY -C -C + C draw ENTRY VBLINA(X,Y) CALL VBVECT(1,X,Y) KEMPTY=1 -C + RETURN END SUBROUTINE VIMOVA(X,Y) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VIMOVA -Move Absolute. -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS -X,Y = real NDC position. -C + C CALLS - -C + C EXIT CONDITIONS -XCP,YCP = real updated current position. (X,Y) -C + C NARRATIVE -Set current position to absolute NDC position X,Y. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL X,Y -C -C + C move CALL VBVECT(0,X,Y) -C + RETURN END SUBROUTINE VINWPG C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VINWPG -New Page. -C + C D.L. CAMPBELL -1-DEC-1986 C J.P. LONG -9-NOV-1987 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS - -C + C CALLS - -C + C EXIT CONDITIONS - -C + C NARRATIVE -Physically advance the medium or clear the screen, C whichever is appropriate. Also flood the screen C with the background color on devices that support C this. The current position is not changed. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + COMMON /VCVEC1/ IVECT COMMON /VCVEC2/ COORD -C + C vcpstd variables control what to do with empty frames with C command is received to dump data to output C kempty=0, frame is void - do not draw C >0, frame has data - draw it COMMON /VCPSTD/ KEMPTY -C + CHARACTER COORD*20 CHARACTER*10 KPAGE -C + C pstmlw controls minimum line width C kpstbg controls background coloring C = 0, not colored (white ground from paper) @@ -3414,106 +3397,106 @@ SUBROUTINE VINWPG C (5)=LINE WIDTH C (6)=CHARACTER BOX Y C (7)=CHARACTER BOX X -C + DATA NPAGE /0/ -C + C check for void page draw request C if nothing is on page, skip request -C + NPAGE=NPAGE+1 WRITE(KPAGE,'(I10)',ERR=345) NPAGE GO TO 349 345 KPAGE=' ???' 349 IF(KEMPTY.EQ.0) GO TO 350 -C + C stroke the path in case there are any vectors and show text CALL PSTBUF(2,'s ') IVECT=0 -C + C showpage and restore postscript environment to avoid buffer overflow C flush buffer because save and restore won't work back-to-back -C + CALL PSTBUF(4,'p r ') CALL PSTBUF(0,' ') -C + C comment frame number in output file -C + CALL PSTBUF(23,'% END PAGE #'//KPAGE) CALL PSTBUF(0,' ') -C + c$$$ CALL PSTBUF(4,'v o ') c$$$ CALL VDMONI(1) -C + C shade background if appropriate -C + c$$$ IF(KPSTBG.NE.0) THEN c$$$ CALL PSTBBG c$$$ END IF -c + c>>sas c stick in the preview raster and stop --- NOTE: Does not return call setras(2,0,0) GO TO 370 -C + C void frame -C + 350 CALL PSTBUF(0,' ') CALL PSTBUF(35,'% VOID PAGE #'//KPAGE//' SUPPRESSED') CALL PSTBUF(0,' ') GO TO 380 -C + 370 CALL VDSTLW(VECTOR(5)) CALL VDSTCS(VECTOR(6)) CALL VDSTFC(NINT(VECTOR(1))) CALL PSTBUF(0,' ') 380 KEMPTY=0 -C + RETURN END SUBROUTINE VIPNTA(X,Y) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VIPNTA -Point Absolute. -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS -X,Y = real NDC position. -C + C CALLS -VIMOVA,VILINA -C + C EXIT CONDITIONS - -C + C NARRATIVE -Set current position to absolute NDC position X,Y C and put a visible point there. Attributes C foreground color and intensity apply. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL X,Y -C + CALL VIMOVA(X,Y) CALL VILINA(X,Y) -C + RETURN END SUBROUTINE VIPOLY(XARRAY,YARRAY,NPTS) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VIPOLY -POLYGON FILL ROUTINE -C + C D.L. CAMPBELL -1-DEC-1986 C J.P. LONG -9-NOV-1987 -C + C ENVIRONMENT -Fortran77, QMS -C + C ENTRY CONDITIONS -XARRAY-ARRAY OF X VALUES OF THE POLYGON C YARRAY-CORRESPONDING ARRAY OF Y VALUES C NPTS- NUMBER OF POINTS IN (XARRAY,YARRAY) -C + C CALLS - -C + C EXIT CONDITIONS - -C + C NARRATIVE -The polygon defined by XARRAY,YARRAY will be drawn C and filled (constrained by any limitations of the C physical device -- see below). No checking will be @@ -3522,11 +3505,11 @@ SUBROUTINE VIPOLY(XARRAY,YARRAY,NPTS) C boundary is drawn using the solid line style. C VDI will close the polygon (i.e. the last point C will be connected to the first). -C + C The level of support for this primitive is device- C dependent. The level of support is categorized C as follows: -C + C Level 0 -- no polygon fill. Only the polygon C boundary is drawn. C Level 1 -- the device fills convex polygons. @@ -3539,18 +3522,18 @@ SUBROUTINE VIPOLY(XARRAY,YARRAY,NPTS) C is drawn to that point from a point far outside C the polygon, that line intersects the polygon C boundary an odd number of times. -C + C Note that the level of support for a particular device C can be inquired using the function VDIQDC. -C + ******************************************************************************** -C + C The level for this device is level 2. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + REAL XARRAY(NPTS),YARRAY(NPTS) -C + C ESCAPE FLAGS C PATNO AND BORDER USED BY VIPOLY FOR PATTERN FILL AND BORDER ON/OFF. DEFAULT C COMPLETE FILL AND BORDER ON @@ -3570,25 +3553,25 @@ SUBROUTINE VIPOLY(XARRAY,YARRAY,NPTS) COMMON /VCVEC2/ COORD CHARACTER COORD*20 INTEGER IVECT -C + C mopoly controls polygon fill =0, on ; =1, off C mocolr controls color =0, on ; =1, off COMMON /VCPSTB/ MOPOLY, MOCOLR -C + C CHECK FOR VALID N IF (NPTS.LT.1 .OR. NPTS.GT.1490) THEN CALL VBERRH(802,5) GO TO 999 END IF -C + C IF A SET OF VECTORS WAS IN PROCESS, ISSUE STROKE COMMAND TO DRAW THEM C Start a new path. -C + IF(IVECT.NE.0) THEN CALL PSTBUF(2,'s ') IVECT=0 END IF -C + CALL PSTBUF(2,'r ') CALL PSTBUF(0,' ') CALL PSTBUF(4,'v o ') @@ -3599,20 +3582,20 @@ SUBROUTINE VIPOLY(XARRAY,YARRAY,NPTS) CALL VDSTFC(NINT(VECTOR(1))) END IF CALL PSTBUF(0,' ') -C + C DRAW POLYGON VECTORS -C + C MOVE TO FIRST POINT CALL VIMOVA(XARRAY(1),YARRAY(1)) -C + C CALL VDLINA TO DRAW POINTS FROM 1ST POINT TO NTH POINT DO 100 I=2,NPTS CALL VILINA(XARRAY(I),YARRAY(I)) 100 CONTINUE -C + C THEN DRAW A LINE TO THE FIRST POINT TO CLOSE THE POLYGON CALL VILINA(XARRAY(1),YARRAY(1)) -C + C CLOSE THE POLYGON, GRAPHICS SAVE, FILL IT, GRAPHICS RESTORE, STROKE C TO PROVIDE THE SAME FILLED AREA AS IF IT WERE FILLED WITH VECTORS C THEN RESTORE AND SAVE POSTSCRIPT ENVIRONMENT TO AVOID INPUT BUFFER OVERFLOW @@ -3626,37 +3609,36 @@ SUBROUTINE VIPOLY(XARRAY,YARRAY,NPTS) CALL VDSTFC(NINT(VECTOR(1))) END IF CALL PSTBUF(0,' ') -C + C INIT THE CURRENT POSITION WITHIN POSTSCRIPT CALL VDMOVA(XARRAY(NPTS),YARRAY(NPTS)) IVECT=0 -C + 999 RETURN END SUBROUTINE VITERM C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VITERM -TERMINATE. -C + C D.L. CAMPBELL -1-DEC-1986 C J.P. LONG -9-NOV-1987 -C + C ENVIRONMENT -COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS - -C + C CALLS - -C + C EXIT CONDITIONS - -C + C NARRATIVE -Terminate graphics device. Close output file. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C -C + C COMPUTER DEPENDENT COMMON VARIABLES AND CONSTANTS. include 'vcpstc.blk' -C + C put out the last page and restore postscript environment so C nothing is left on the stack CALL VINWPG @@ -3669,30 +3651,30 @@ SUBROUTINE VITERM C CLOSE OUTPUT FILE CALL PSTCFS(KOUTFL,1) CALL VDMONI(2) -C + RETURN END SUBROUTINE VITEXT(LENGT1,CHARS) C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + C VITEXT - Text from Array. -C + C P. Watterberg - 24 MAR 81 C J. P. LONG - 3 DEC 87 -C + C ENVIRONMENT - COMPUTER-INDEPENDENT, SYSTEM-INDEPENDENT, FORTRAN 77 -C + C ENTRY CONDITIONS - LENGT1 = integer number of characters in CHARS. C Range 1-136. C CHARS = integer array of ASCII characters, one C character per array element, right justified. C Range 8,10,32-126. -C + C CALLS - vbout -C + C EXIT CONDITIONS - XCP,YCP = integer updated current position (at the end C of the string). -C + C NARRATIVE - Draw LENGT1 characters in CHARS, starting at C current position and update current position to C the point after the last character box where the @@ -3705,11 +3687,11 @@ SUBROUTINE VITEXT(LENGT1,CHARS) C considered reasonable. Attributes foreground color, C background color, intensity, and character size C apply. -C + C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C -C + INTEGER LENGT1, CHARS(136), LENGTH -C + CHARACTER CTEMP*150,STR*3 C CURRENT POSITION. REAL XCP,YCP @@ -3731,46 +3713,46 @@ SUBROUTINE VITEXT(LENGT1,CHARS) C DC DIMENSIONS OF OFFSETS AND PICTURE. (LXY,HC1) INTEGER XPAD,YPAD,XDEVIC,YDEVIC COMMON /VCDDIM/ XPAD,YPAD,XDEVIC,YDEVIC -C + C vcpstd variables control what to do with empty frames with C command is received to dump data to output C kempty=0, frame is void - do not draw C >0, frame has data - draw it COMMON /VCPSTD/ KEMPTY -C + C check for valid length. -C + KEMPTY=1 LENGTH = LENGT1 IF(LENGTH.LT.1) THEN CALL VBERRH(212,5) GO TO 999 END IF -C + C if(length.gt.136) then call vberrh(213,5), and use the C maximum length of 136. -C + IF(LENGTH.GT.136) THEN CALL VBERRH(213,5) LENGTH = 136 ENDIF -C + CTEMP='(' LENOUT=1 -C + C loop through length characters. -C + DO 100 I=1,LENGTH -C + C check for valid chars. -C + C ignore control characters, except for: C 8 is backspace C 10 is linefeed C 13 is carriage return -C + IF(CHARS(I).LT.32 .OR. CHARS(I).GT.126) THEN -C + IF(CHARS(I).EQ.8) THEN DX=-VECTOR(7) DY=0. @@ -3786,9 +3768,9 @@ SUBROUTINE VITEXT(LENGT1,CHARS) CALL VBERRH(208,5) GOTO 100 ENDIF -C + C finish the string, emulate the control char, and start a new one -C + C send the buffered chars to the printer if there are any IF(LENOUT.NE.1) THEN CTEMP(LENOUT+1:150)=') t ' @@ -3797,46 +3779,46 @@ SUBROUTINE VITEXT(LENGT1,CHARS) C reset the cp from the characters XCP=XCP+(LENOUT-5)*VECTOR(7) ENDIF -C + C calculate the new current position after the control char XCP=XCP+DX YCP=YCP+DY CALL VBVECT(0,XCP,YCP) -C + C start a new string CTEMP='(' LENOUT=1 -C + ELSE -C + C Char value is 32-126 inclusive. Put \ before these: C 92 is \ C 40 is ( C 41 is ) -C + IF(CHARS(I).EQ.40.OR.CHARS(I).EQ.41.OR.CHARS(I).EQ.92) THEN CTEMP(LENOUT+1:150)='\\' LENOUT=LENOUT+1 ENDIF -C + C now pack the chars into the buffer -C + CALL PSTA2C(CHARS(I),STR) CTEMP(LENOUT+1:150)=STR(1:1) LENOUT=LENOUT+1 ENDIF -C + 100 CONTINUE -C + C send the chars to the printer -C + CTEMP(LENOUT+1:150)=') t ' LENOUT=LENOUT+4 CALL PSTBUF(LENOUT,CTEMP) -C + C reset the cp from the characters -C + XCP=XCP+(LENOUT-5)*VECTOR(7) -C + 999 RETURN END diff --git a/packages/seacas/libraries/svdi/vdi_drivers/vdix11.c b/packages/seacas/libraries/svdi/vdi_drivers/vdix11.c index 0dcd107a6d4d..60cf286f6baf 100644 --- a/packages/seacas/libraries/svdi/vdi_drivers/vdix11.c +++ b/packages/seacas/libraries/svdi/vdi_drivers/vdix11.c @@ -2,28 +2,10 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ -/* $Id: vdix11.c,v 1.4 1991/07/23 15:38:19 gdsjaar Exp $ - $Log: vdix11.c,v $ - Revision 1.4 1991/07/23 15:38:19 gdsjaar - Changed spec for x_width and x_height from static short - to static unsigned int - - * Revision 1.3 1991/05/16 19:53:43 gdsjaar - * Changed CRA symbol to CRAY--source of many trials and tribulations - * - * Revision 1.2 1991/03/29 15:45:13 gdsjaar - * Fixed Backing store attribute - was getting set even if window did not have backing store - * - * Revision 1.1.1.1 1991/03/07 22:46:44 gdsjaar - * VDI Drivers for graphics programs - * - * Revision 1.1 1991/03/07 22:46:43 gdsjaar - * Initial revision - * -*/ +** / /* The following ifdef redefines entry points for use of this X driver as an SVDI driver on systems which require an underscore "_" appended @@ -381,7 +363,7 @@ * vector[5] = character box y * vector[6] = character box x */ #define MAX_VECTOR 7 -static float vector[MAX_VECTOR] = {0., 7., 1., 0., 0., 0., 0.}; + static float vector[MAX_VECTOR] = {0., 7., 1., 0., 0., 0., 0.}; /* current position */ static float xcp = 0.; diff --git a/packages/seacas/libraries/svdi/vdi_drivers/vdx11cps.F b/packages/seacas/libraries/svdi/vdi_drivers/vdx11cps.F index 0b7ede5870a2..ad4aaf67b0e0 100644 --- a/packages/seacas/libraries/svdi/vdi_drivers/vdx11cps.F +++ b/packages/seacas/libraries/svdi/vdi_drivers/vdx11cps.F @@ -1,11 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: vdx11cps.F,v 1.3 2007/01/26 16:58:24 gdsjaar Exp $ - C cps driver is the file device C x11 driver is the terminal device SUBROUTINE VDESCP(ESCPCD,N,ARGS) @@ -52,9 +50,9 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) #else #endif DATA TERMON,FILEON,TERMUP,FILEUP /2*.TRUE.,2*.TRUE./ -C + IF ( ESCPCD.GE.10000 .AND. ESCPCD.LE.10003 ) THEN -C + C Special Escape Codes for Dual Device Control: KSTAT = ESCPCD - 10000 TERMON = (KSTAT.EQ.1 .OR. KSTAT.EQ.3) .AND. TERMUP @@ -75,10 +73,10 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) IF (FILEON) CALL wcpses(ESCPCD,N,ARGS) END IF RETURN -C + C------------------------------------------------------------------------ ENTRY VDIQES(ESCPCD,SUPPRT) -C + C Special Escape Codes for Dual Device Control: IF ( ESCPCD.EQ.10000 ) THEN SUPPRT = 1 @@ -117,10 +115,10 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) END IF END IF RETURN -C + C----------------------------------------------------------------------- ENTRY VDINIT(ASPECT,JUSTIF) -C + C Check if terminal and hardcopy devices are null: #ifdef Build64 ESC4 = 10000 @@ -134,10 +132,10 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) CALL wcpsie( 10000,ISTAT ) FILEUP = ISTAT .EQ. 0 FILEON = FILEON .AND. FILEUP -C + C Stop program if both devices are null. IF (.NOT.(TERMUP.OR.FILEUP)) STOP 'No graphics device assigned.' -C + IF (TERMON) THEN #ifdef Build64 ASPECT4 = ASPECT @@ -149,7 +147,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) END IF IF (FILEON) CALL wcpsnt(ASPECT,JUSTIF) RETURN -C + C----------------------------------------------------------------------- ENTRY VDAABU(BTNNUM) IF (FILEON) CALL wcpsbu(BTNNUM) @@ -162,7 +160,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) #endif END IF RETURN -C + C----------------------------------------------------------------------- ENTRY VDABGL(BTNNUM,X,Y) IF (FILEON) CALL wcpsbl(BTNNUM,X,Y) @@ -175,7 +173,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) #endif END IF RETURN -C + C----------------------------------------------------------------------- ENTRY VDAKGL(CHAR,X,Y) IF (FILEON) CALL wcpskl(CHAR,X,Y) @@ -190,7 +188,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) #endif END IF RETURN -C + C----------------------------------------------------------------------- ENTRY VDALOC(X,Y) IF (FILEON) CALL wcpslo(X,Y) @@ -204,7 +202,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) #endif END IF RETURN -C + C----------------------------------------------------------------------- ENTRY VDBELL IF (TERMON) THEN @@ -212,7 +210,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) END IF IF (FILEON) CALL wcpsbe RETURN -C + C----------------------------------------------------------------------- ENTRY VDBUFL IF (TERMON) THEN @@ -220,7 +218,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) END IF IF (FILEON) CALL wcpsfl RETURN -C + C----------------------------------------------------------------------- ENTRY VDFRAM(ITYPE) IF (TERMON) THEN @@ -229,7 +227,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) END IF IF (FILEON) CALL wcpsfr(ITYPE) RETURN -C + C .... disable below C----------------------------------------------------------------------- ENTRY VDIQCO(NUM,INDEXA,CLRARY,CLRMOD) @@ -250,7 +248,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) #endif END IF RETURN -C + C----------------------------------------------------------------------- ENTRY VDIQCP(X,Y) IF (FILEON) CALL wcpscp(X,Y) @@ -264,7 +262,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) #endif END IF RETURN -C + C----------------------------------------------------------------------- ENTRY VDIQDC(INDEX,VALUE) IF (FILEON) CALL wcpsdc(INDEX,VALUE) @@ -278,7 +276,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) #endif END IF RETURN -C + C----------------------------------------------------------------------- ENTRY VDIQND(XNDC,YNDC) IF (FILEON) CALL wcpsid(XNDC,YNDC) @@ -292,7 +290,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) #endif END IF RETURN -C + C----------------------------------------------------------------------- ENTRY VDIQOS(ATTARR) IF (FILEON) CALL wcpsio(ATTARR) @@ -307,7 +305,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) #endif END IF RETURN -C + C----------------------------------------------------------------------- ENTRY VDLOGE(ERRNUM,ERRSEV) IF (TERMON) THEN @@ -316,7 +314,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) END IF IF (FILEON) CALL wcpsle(ERRNUM,ERRSEV) RETURN -C + C----------------------------------------------------------------------- ENTRY VDSTBC(COLOR) IF (TERMON) THEN @@ -329,7 +327,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) END IF IF (FILEON) CALL wcpsbc(COLOR) RETURN -C + C----------------------------------------------------------------------- ENTRY VDSTCO(NUM,INDEXA,CLRARY,CLRMOD) @@ -351,7 +349,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) END IF IF (FILEON) CALL wcpsco(INDEXA,CLRARY,CLRMOD) RETURN -C + C----------------------------------------------------------------------- ENTRY VDSTCS(YSIZE) IF (TERMON) THEN @@ -364,7 +362,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) END IF IF (FILEON) CALL wcpscs(YSIZE) RETURN -C + C----------------------------------------------------------------------- ENTRY VDSTFC(COLOR) IF (TERMON) THEN @@ -377,7 +375,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) END IF IF (FILEON) CALL wcpsfc(COLOR) RETURN -C + C----------------------------------------------------------------------- ENTRY VDSTIN(INTEN) IF (TERMON) THEN @@ -390,7 +388,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) END IF IF (FILEON) CALL wcpsin(INTEN) RETURN -C + C----------------------------------------------------------------------- ENTRY VDSTLA(LOCX,LOCY) IF (TERMON) THEN @@ -404,7 +402,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) END IF IF (FILEON) CALL wcpsla(LOCX,LOCY) RETURN -C + C....enabled below C----------------------------------------------------------------------- ENTRY VDSTLS(LINSTY) @@ -418,7 +416,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) END IF IF (FILEON) CALL wcpsls(LINSTY) RETURN -C + C----------------------------------------------------------------------- ENTRY VDSTLW(LINWTH) IF (TERMON) THEN @@ -431,7 +429,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) END IF IF (FILEON) CALL wcpslw(LINWTH) RETURN -C + C----------------------------------------------------------------------- ENTRY VDSTOS(ATTARR) IF (TERMON) THEN @@ -446,7 +444,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) END IF IF (FILEON) CALL wcpsos(ATTARR) RETURN -C + C----------------------------------------------------------------------- ENTRY VDWAIT IF (TERMON) THEN @@ -454,7 +452,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) END IF IF (FILEON) CALL wcpswt RETURN -C + C----------------------------------------------------------------------- ENTRY VDLINA(XX,YY) IF (TERMON) THEN @@ -468,7 +466,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) END IF IF (FILEON) CALL wcpsln(XX,YY) RETURN -C + C----------------------------------------------------------------------- ENTRY VDMOVA(X,Y) IF (TERMON) THEN @@ -482,7 +480,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) END IF IF (FILEON) CALL wcpsmv(X,Y) RETURN -C + C----------------------------------------------------------------------- ENTRY VDNWPG IF (TERMON) THEN @@ -490,7 +488,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) END IF IF (FILEON) CALL wcpspg RETURN -C + C----------------------------------------------------------------------- ENTRY VDPNTA(X,Y) IF (TERMON) THEN @@ -504,7 +502,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) END IF IF (FILEON) CALL wcpspt(X,Y) RETURN -C + C----------------------------------------------------------------------- ENTRY VDPOLY(XARRAY,YARRAY,NPTS) IF (TERMON) THEN @@ -522,7 +520,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) END IF IF (FILEON) CALL wcpspy(XARRAY,YARRAY,NPTS) RETURN -C + C----------------------------------------------------------------------- ENTRY VDTERM IF (TERMON) THEN @@ -530,7 +528,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) END IF IF (FILEON) CALL wcpstr RETURN -C + C----------------------------------------------------------------------- ENTRY VDTEXT(LENGTH,CHARS) IF (TERMON) THEN @@ -550,7 +548,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) END IF IF (FILEON) CALL wcpstx(LENGTH,CHARS) RETURN -C + END SUBROUTINE VBERRH() diff --git a/packages/seacas/libraries/svdi/vdi_drivers/vdx11met.F b/packages/seacas/libraries/svdi/vdi_drivers/vdx11met.F index c0db062b269d..f745774cf444 100644 --- a/packages/seacas/libraries/svdi/vdi_drivers/vdx11met.F +++ b/packages/seacas/libraries/svdi/vdi_drivers/vdx11met.F @@ -1,11 +1,9 @@ C Copyright(C) 1999-2020 National Technology & Engineering Solutions C of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with C NTESS, the U.S. Government retains certain rights in this software. -C +C C See packages/seacas/LICENSE for details -C $Id: vdx11met.F,v 1.2 2007/01/26 16:25:44 gdsjaar Exp $ - C met driver is the file device C x11 driver is the terminal device SUBROUTINE VDESCP(ESCPCD,N,ARGS) @@ -52,9 +50,9 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) #endif DATA TERMON,FILEON,TERMUP,FILEUP /2*.TRUE.,2*.TRUE./ -C + IF( ESCPCD.GE.10000 .AND. ESCPCD.LE.10003 ) THEN -C + C Special Escape Codes for Dual Device Control: KSTAT = ESCPCD - 10000 TERMON = (KSTAT.EQ.1 .OR. KSTAT.EQ.3) .AND. TERMUP @@ -78,9 +76,9 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) END IF END IF RETURN -C + ENTRY VDIQES(ESCPCD,SUPPRT) -C + C Special Escape Codes for Dual Device Control: IF( ESCPCD.EQ.10000 ) THEN SUPPRT = 1 @@ -139,9 +137,9 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) END IF END IF RETURN -C + ENTRY VDINIT(ASPECT,JUSTIF) -C + C Check if terminal and hardcopy devices are null: #ifdef Build64 ESC4 = 10000 @@ -161,10 +159,10 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) #endif FILEUP = ISTAT .EQ. 0 FILEON = FILEON .AND. FILEUP -C + C Stop program if both devices are null. IF(.NOT.(TERMUP.OR.FILEUP)) STOP 'No graphics device assigned.' -C + C print *, 'About to init x11' IF(TERMON) THEN #ifdef Build64 @@ -188,7 +186,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) c print *, 'Done with init', FILEON END IF RETURN -C + ENTRY VDAABU(BTNNUM) IF(FILEON) CALL wmetbu(BTNNUM) IF(TERMON) THEN @@ -200,7 +198,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) #endif END IF RETURN -C + ENTRY VDABGL(BTNNUM,X,Y) IF(FILEON) CALL wmetbl(BTNNUM,X,Y) IF(TERMON) THEN @@ -212,7 +210,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) #endif END IF RETURN -C + ENTRY VDAKGL(CHAR,X,Y) IF(FILEON) THEN #ifdef Build64 @@ -235,7 +233,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) #endif END IF RETURN -C + ENTRY VDALOC(X,Y) IF(FILEON) THEN #ifdef Build64 @@ -256,23 +254,23 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) #endif END IF RETURN -C + ENTRY VDBELL IF(TERMON) CALL wx11be IF(FILEON) CALL wmetbe RETURN -C + ENTRY VDBUFL IF(TERMON) CALL wx11fl IF(FILEON) CALL wmetfl RETURN -C + ENTRY VDFRAM(ITYPE) C ... Doesn't do anything in X11 driver IF(TERMON) CALL wx11fr(ITYPE) IF(FILEON) CALL wmetfr(ITYPE) RETURN -C + ENTRY VDIQCO(NUM,INDEXA,CLRARY,CLRMOD) IF(FILEON) THEN #ifdef Build64 @@ -305,7 +303,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) #endif END IF RETURN -C + ENTRY VDIQCP(X,Y) IF(FILEON) THEN #ifdef Build64 @@ -326,7 +324,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) #endif END IF RETURN -C + ENTRY VDIQDC(INDEX,VALUE) IF(FILEON) THEN #ifdef Build64 @@ -347,7 +345,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) #endif END IF RETURN -C + ENTRY VDIQND(XNDC,YNDC) IF(FILEON) THEN #ifdef Build64 @@ -368,7 +366,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) #endif END IF RETURN -C + ENTRY VDIQOS(ATTARR) IF(FILEON) THEN #ifdef Build64 @@ -391,13 +389,13 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) #endif END IF RETURN -C + ENTRY VDLOGE(ERRNUM,ERRSEV) C ... Doesn't do anything in X11 driver IF(TERMON) CALL wx11le(ERRNUM,ERRSEV) IF(FILEON) CALL wmetle(ERRNUM,ERRSEV) RETURN -C + ENTRY VDSTBC(COLOR) IF(TERMON) THEN #ifdef Build64 @@ -416,7 +414,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) #endif END IF RETURN -C + ENTRY VDSTCO(NUM,INDEXA,CLRARY,CLRMOD) IF(TERMON) THEN #ifdef Build64 @@ -451,7 +449,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) #endif END IF RETURN -C + ENTRY VDSTCS(YSIZE) IF (TERMON) THEN #ifdef Build64 @@ -470,7 +468,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) #endif END IF RETURN -C + ENTRY VDSTFC(COLOR) IF (TERMON) THEN #ifdef Build64 @@ -489,7 +487,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) #endif END IF RETURN -C + ENTRY VDSTIN(INTEN) IF (TERMON) THEN #ifdef Build64 @@ -508,7 +506,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) #endif END IF RETURN -C + ENTRY VDSTLA(LOCX,LOCY) IF (TERMON) THEN #ifdef Build64 @@ -529,7 +527,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) #endif END IF RETURN -C + ENTRY VDSTLS(LINSTY) IF (TERMON) THEN #ifdef Build64 @@ -548,7 +546,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) #endif END IF RETURN -C + ENTRY VDSTLW(LINWTH) IF (TERMON) THEN #ifdef Build64 @@ -567,7 +565,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) #endif END IF RETURN -C + ENTRY VDSTOS(ATTARR) IF (TERMON) THEN #ifdef Build64 @@ -590,12 +588,12 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) #endif END IF RETURN -C + ENTRY VDWAIT IF(TERMON) CALL wx11wt IF(FILEON) CALL wmetwt RETURN -C + ENTRY VDLINA(X,Y) IF (TERMON) THEN #ifdef Build64 @@ -616,7 +614,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) #endif END IF RETURN -C + ENTRY VDMOVA(X,Y) IF (TERMON) THEN #ifdef Build64 @@ -637,12 +635,12 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) #endif END IF RETURN -C + ENTRY VDNWPG IF(TERMON) CALL wx11pg IF(FILEON) CALL wmetpg RETURN -C + ENTRY VDPNTA(X,Y) IF (TERMON) THEN #ifdef Build64 @@ -663,7 +661,7 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) #endif END IF RETURN -C + ENTRY VDPOLY(XARRAY,YARRAY,NPTS) IF (TERMON) THEN #ifdef Build64 @@ -692,12 +690,12 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) #endif END IF RETURN -C + ENTRY VDTERM IF(TERMON) CALL wx11tr IF(FILEON) CALL wmettr RETURN -C + ENTRY VDTEXT(LENGTH,CHARS) IF (TERMON) THEN #ifdef Build64 @@ -730,5 +728,5 @@ SUBROUTINE VDESCP(ESCPCD,N,ARGS) #endif END IF RETURN -C + END diff --git a/packages/seacas/libraries/svdi/vdi_drivers/wmet.c b/packages/seacas/libraries/svdi/vdi_drivers/wmet.c index 6ffc9a262308..79d584b13c89 100644 --- a/packages/seacas/libraries/svdi/vdi_drivers/wmet.c +++ b/packages/seacas/libraries/svdi/vdi_drivers/wmet.c @@ -2,11 +2,10 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ -/* $Id: wmet.c,v 1.23 2007/02/20 18:06:03 gdsjaar Exp $ - */ +* / #include #include @@ -54,7 +53,7 @@ /* #define BUFFER_SIZE 132 */ #define BUFFER_SIZE 8192 -extern char *getenv(); + extern char *getenv(); static char filename[100]; /* name of file */ static int file_d = -1; /* file descriptor - -1 if file not open */ diff --git a/packages/seacas/scripts/blot b/packages/seacas/scripts/blot index 74adfe443d9b..7bb465989750 100755 --- a/packages/seacas/scripts/blot +++ b/packages/seacas/scripts/blot @@ -2,7 +2,7 @@ # Copyright(C) 1999-2020 National Technology & Engineering Solutions # of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with # NTESS, the U.S. Government retains certain rights in this software. -# +# # See packages/seacas/LICENSE for details function usage { @@ -32,7 +32,7 @@ exit 1 function show_device { echo " " tempA=`find ${ACCESSBIN} -name ${codename}_\* |sed -e s:${ACCESSBIN}/${codename}_::` - echo "Standard options for 'device':" + echo "Standard options for 'device':" echo "${txtgrn}" $tempA "${txtrst}" echo " " } @@ -122,7 +122,7 @@ while true ; do ;; -p|--ps_option) ps_option="$2" ; shift 2 - if [ "${ps_option}" == "list" ] || [ "${ps_option}" == "help" ] + if [ "${ps_option}" == "list" ] || [ "${ps_option}" == "help" ] then show_ps_option exit 0 @@ -130,7 +130,7 @@ while true ; do ;; -d|--device) device="$2" ; shift 2 - if [ "${device}" == "list" ] || [ "${device}" == "help" ] + if [ "${device}" == "list" ] || [ "${device}" == "help" ] then show_device exit 0 @@ -161,7 +161,7 @@ else usage fi shift -fi +fi # Check for device specified, use ${device} if none specified if [ $# -gt 0 ] ; then diff --git a/packages/seacas/scripts/blot.in b/packages/seacas/scripts/blot.in index 7b35276d43f1..ee484b163e56 100644 --- a/packages/seacas/scripts/blot.in +++ b/packages/seacas/scripts/blot.in @@ -2,7 +2,7 @@ # Copyright(C) 1999-2020 National Technology & Engineering Solutions # of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with # NTESS, the U.S. Government retains certain rights in this software. -# +# # See packages/seacas/LICENSE for details diff --git a/packages/seacas/scripts/decomp b/packages/seacas/scripts/decomp index 49bae318e30e..acdb7ea58c9d 100755 --- a/packages/seacas/scripts/decomp +++ b/packages/seacas/scripts/decomp @@ -2,7 +2,7 @@ # Copyright(C) 1999-2020 National Technology & Engineering Solutions # of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with # NTESS, the U.S. Government retains certain rights in this software. -# +# # See packages/seacas/LICENSE for details ######################################################################## @@ -13,7 +13,7 @@ function usage { usage_new fi } - + function usage_new { cat < [-n ] @@ -26,7 +26,7 @@ Decomposition methods: [0..3] = speed ranking 0=fastest (See chaco and/or zoltan documentation for more details) --multikl: [3] Multilevel KL. Gives high quality partitions. Slow, high memory use. - --spectral: [2] use eigenvectors of a matrix constructed from the + --spectral: [2] use eigenvectors of a matrix constructed from the graph to partition the graph. --hsfc [?] Hilbert Space-Filling Curve (uses Zoltan) --rib: [?] Recursive Inertial Bisection (uses Zoltan) @@ -34,11 +34,11 @@ Decomposition methods: [0..3] = speed ranking 0=fastest --rcb_ignore_z: [?] Recursive Coordinate Bisection (uses Zoltan), ignoring the z dimension coordinates --inertial: [1] (default) vertices divided into sets of equal mass by planes orthogonal to the principle axis. Good, fast, medium memory - --linear: [0] vertices in order first n/p to proc 0, next to proc 1. + --linear: [0] vertices in order first n/p to proc 0, next to proc 1. (fast and sometimes good). - --random: [0] vertices are assigned randomly to sets in a way that + --random: [0] vertices are assigned randomly to sets in a way that preserves balance. - --scattered: [0] vertices are handed out in order with the next vertex + --scattered: [0] vertices are handed out in order with the next vertex going to whichever set is smallest. --brick [-] special decomposition method; not useful for general use. --zpinch [-] special decomposition method; not useful for general use. @@ -57,7 +57,7 @@ Other options: --root root_dir Root directory to begin the path to on the separate disks (-R) --subdir sub_dir Continuation of the path on the separate disks to the files (-S) --64 Force creation of 64-bit integer decomposed files (-6) - help-email: sierra-help@sandia.gov + help-email: sierra-help@sandia.gov DECOMP_USAGE_EOF exit 1 @@ -75,7 +75,7 @@ Decomposition methods: [0..3] = speed ranking 0=fastest (See chaco and/or zoltan documentation for more details) -l multikl: [3] Multilevel KL. Gives high quality partitions. Slow, high memory use. - -l spectral: [2] use eigenvectors of a matrix constructed from the + -l spectral: [2] use eigenvectors of a matrix constructed from the graph to partition the graph. -l hsfc [?] Hilbert Space-Filling Curve (uses Zoltan) -l rib: [?] Recursive Inertial Bisection (uses Zoltan) @@ -83,11 +83,11 @@ Decomposition methods: [0..3] = speed ranking 0=fastest -l rcb_ignore_z: [?] Recursive Coordinate Bisection (uses Zoltan) ignoring the z dimension coordinates -l inertial: [1] (default) vertices divided into sets of equal mass by planes orthogonal to the principle axis. Good, fast, medium memory - -l linear: [0] vertices in order first n/p to proc 0, next to proc 1. + -l linear: [0] vertices in order first n/p to proc 0, next to proc 1. (fast and sometimes good). - -l random: [0] vertices are assigned randomly to sets in a way that + -l random: [0] vertices are assigned randomly to sets in a way that preserves balance. - -l scattered: [0] vertices are handed out in order with the next vertex + -l scattered: [0] vertices are handed out in order with the next vertex going to whichever set is smallest. -l brick [-] special decomposition method; not useful for general use. -l zpinch [-] special decomposition method; not useful for general use. @@ -100,12 +100,12 @@ Other options: -i Optional nem_slice input file -s Decompose sphere elements using linear method (matches old behavior) -p #p Specify number of processors (or -j) --R root_dir Root directory to begin the path to on the separate disks +-R root_dir Root directory to begin the path to on the separate disks -S sub_dir Continuation of the path on the separate disks to the files -V Output mesh showing processor distribution of elements -6 Force creation of 64-bit integer decomposed files - help-email: sierra-help@sandia.gov + help-email: sierra-help@sandia.gov DECOMP_USAGE_EOF exit 1 @@ -162,14 +162,14 @@ function execute_loadbalance { date=`date '+%m/%d/%y'` time=`date '+%H:%M:%S'` prob_dir=`pwd | sed "s/.*\///g"` - + if [ -n "$input" -a -e "$input" ] then echo ${txtblu} echo "Executing:" echo " $LAUNCH $NEM_SLICE $decomp_type $spheres $do_viz $decomp_method $nem_slice_flag -o $nemesis -m mesh=$processors -a $input $genesis" echo ${txtrst} - ($LAUNCH $NEM_SLICE $decomp_type $spheres $do_viz $decomp_method $nem_slice_flag -o $nemesis -m mesh=$processors -a $input $genesis) + ($LAUNCH $NEM_SLICE $decomp_type $spheres $do_viz $decomp_method $nem_slice_flag -o $nemesis -m mesh=$processors -a $input $genesis) load_rc=$? else echo ${txtblu} @@ -207,7 +207,7 @@ function execute_spread { echo return -1 fi - + if [ "$subdir" != "." ] then dir=$rootdir/$subdir @@ -217,12 +217,12 @@ function execute_spread { mkdir -p $dir fi fi - + if [ -e $pexsh ] then /bin/rm -rf $pexsh fi - + echo "Input FEM file = $genesis" > $pexsh echo "LB file = $nemesis" >> $pexsh echo "Parallel Results File Base Name = $basename" >> $pexsh @@ -237,7 +237,7 @@ function execute_spread { echo "------------------------------------------------------------" >> $pexsh echo "Parallel Disk Info= number=1, offset=1, zeros, nosubdirectory">> $pexsh echo "Parallel file location = root=$rootdir, subdir=$subdir" >> $pexsh - + echo ${txtblu} echo "Executing:" echo " $NEM_SPREAD $use64 $pexsh" @@ -319,7 +319,7 @@ while true ; do (-v|--verbose) set -x ; shift ;; (-V|--viz_mesh) - do_viz="-y" ; shift ;; + do_viz="-y" ; shift ;; (-d|--debug) debug_level="$2" ; shift 2 ;; (-n|--nem_slice_flag) @@ -336,9 +336,9 @@ while true ; do rootdir=$2 ; shift 2 ;; (-S|--subdir) subdir=$2 ; shift 2 ;; - (-s|--spheres_linear) + (-s|--spheres_linear) spheres="" ; shift ;; - (-6|--64) + (-6|--64) use64="-64" ; shift ;; (--nolaunch) LAUNCH="nolaunch" ; shift ;; @@ -363,7 +363,7 @@ while true ; do esac done -# Figure out how to run nem_slice where we are. +# Figure out how to run nem_slice where we are. if [ "${LAUNCH:-}" == "nolaunch" ] then # Ensure launch is NOT used --nolaunch was passed. @@ -380,7 +380,7 @@ else LAUNCH="$LAUNCH -n 1" # If the launch script doesn't work to run something simple, don't use it. $LAUNCH >/dev/null 2>&1 true || LAUNCH= - + if [ -z "$PBS_JOBID" -a -z "$LSB_JOBID" -a -z "$SLURM_JOB_ID" ] then # Unset these if we we are NOT in an allocation. @@ -388,7 +388,7 @@ else unset OMPI_MCA_btl_openib_ib_timeout export OMPI_MCA_mtl=^psm export OMPI_MCA_pml=^cm - export OMPI_MCA_btl=tcp,sm,self + export OMPI_MCA_btl=tcp,vader,self if [ -n "${SIERRA_LIBRARY_PATH}" ] then export DYLD_LIBRARY_PATH=$SIERRA_LIBRARY_PATH @@ -424,7 +424,7 @@ else echo ${txtrst} usage fi -fi +fi if [ -n "$input" ] then diff --git a/packages/seacas/scripts/decomp.in b/packages/seacas/scripts/decomp.in index 517408997e7f..66e761392b29 100644 --- a/packages/seacas/scripts/decomp.in +++ b/packages/seacas/scripts/decomp.in @@ -2,7 +2,7 @@ # Copyright(C) 1999-2020 National Technology & Engineering Solutions # of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with # NTESS, the U.S. Government retains certain rights in this software. -# +# # See packages/seacas/LICENSE for details ######################################################################## function usage { diff --git a/packages/seacas/scripts/epup.in b/packages/seacas/scripts/epup.in index 3c054f200d88..fa9a25be5d0f 100644 --- a/packages/seacas/scripts/epup.in +++ b/packages/seacas/scripts/epup.in @@ -2,7 +2,7 @@ # Copyright(C) 1999-2020 National Technology & Engineering Solutions # of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with # NTESS, the U.S. Government retains certain rights in this software. -# +# # See packages/seacas/LICENSE for details ######################################################################## diff --git a/packages/seacas/scripts/exodus3.in.py b/packages/seacas/scripts/exodus3.in.py old mode 100755 new mode 100644 index 544f65fc6aed..5d4c98193cee --- a/packages/seacas/scripts/exodus3.in.py +++ b/packages/seacas/scripts/exodus3.in.py @@ -543,7 +543,7 @@ def __init__(self, name, type, id): def __repr__(self): return "attribute(name=%r, entity_type=%r, entity_id=%r, values=%r)" % (self.name,self.entity_type,self.entity_id,self.values) - + class ex_attribute(ctypes.Structure): """ Used for accessing underlying exodus library... @@ -709,7 +709,7 @@ def summarize(self): num_ss_vars = self.get_variable_number('EX_SIDE_SET') num_assem_vars = self.get_reduction_variable_number('EX_ASSEMBLY') num_blob_vars = self.get_reduction_variable_number('EX_BLOB') - + print("\n Database: {0}\n" " Title:\t{17}\n\n" " Number of spatial dimensions = {1:3d}\t" @@ -744,8 +744,8 @@ def summarize(self): self.num_side_sets(), total_ns_nodes, total_sides, num_glo_vars, num_nod_vars, num_ele_vars, - num_ns_vars, num_ss_vars, self.num_times(), self.title(), - self.num_assembly(), num_assem_vars, + num_ns_vars, num_ss_vars, self.num_times(), self.title(), + self.num_assembly(), num_assem_vars, self.num_blob(), num_blob_vars)) # # build the info struct @@ -6413,7 +6413,7 @@ def internal_add_variables(exo, obj_type, entvars, debugPrint): if len(entvars) == 0: return - + if debugPrint: print("Construct Truth Table for additional variables") diff --git a/packages/seacas/scripts/fastq b/packages/seacas/scripts/fastq index 201f12df2389..551951856d56 100755 --- a/packages/seacas/scripts/fastq +++ b/packages/seacas/scripts/fastq @@ -2,7 +2,7 @@ # Copyright(C) 1999-2020 National Technology & Engineering Solutions # of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with # NTESS, the U.S. Government retains certain rights in this software. -# +# # See packages/seacas/LICENSE for details function usage { @@ -26,7 +26,7 @@ exit 1 function show_device { echo " " tempA=`find ${ACCESSBIN} -name ${codename}_\* |sed -e s:${ACCESSBIN}/${codename}_::` - echo "Standard options for 'device':" + echo "Standard options for 'device':" echo "${txtgrn}" $tempA "${txtrst}" echo " " } @@ -156,7 +156,7 @@ if [ ${aprepro} == "true" ] && [ ! -z "$FOR001" ] ; then tmp=$FOR001 export FOR001="./fastq.$$" ${ACCESSBIN}/aprepro "$tmp" "${FOR001}" -fi +fi if [ "${device}" == "dual" ] ; then export DUAL_FILENAME="${filename}.met" @@ -193,7 +193,7 @@ then if [ ${device} == "pst" ] ; then mv cgiout1 ${filename}.ps ; fi fi -if [ "${aprepro}" == "file" ] ; then +if [ "${aprepro}" == "file" ] ; then rm -f ${FOR001} fi diff --git a/packages/seacas/scripts/fastq.in b/packages/seacas/scripts/fastq.in index e4a8017f12b7..8502b7c58924 100755 --- a/packages/seacas/scripts/fastq.in +++ b/packages/seacas/scripts/fastq.in @@ -2,7 +2,7 @@ # Copyright(C) 1999-2020 National Technology & Engineering Solutions # of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with # NTESS, the U.S. Government retains certain rights in this software. -# +# # See packages/seacas/LICENSE for details function usage { diff --git a/packages/seacas/scripts/getopt.seacas.c b/packages/seacas/scripts/getopt.seacas.c index fcb46578dfbe..003d6a5b9108 100644 --- a/packages/seacas/scripts/getopt.seacas.c +++ b/packages/seacas/scripts/getopt.seacas.c @@ -2,7 +2,7 @@ * Copyright(C) 1999-2020 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. - * + * * See packages/seacas/LICENSE for details */ /* diff --git a/packages/seacas/scripts/loadbal.in b/packages/seacas/scripts/loadbal.in index de9235f18508..d0db9209238d 100644 --- a/packages/seacas/scripts/loadbal.in +++ b/packages/seacas/scripts/loadbal.in @@ -2,7 +2,7 @@ # Copyright(C) 1999-2020 National Technology & Engineering Solutions # of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with # NTESS, the U.S. Government retains certain rights in this software. -# +# # See packages/seacas/LICENSE for details #************************************************************************** #************************************************************************** @@ -515,7 +515,6 @@ exit $load_rc USAGE: cat << 'EOF' -Version: $Id: loadbal.c,v 1.57 2008/05/19 12:29:22 gdsjaar Exp $ Usage: loadbal [-h] -p [-n ] [-r ] [-o ] [-slit] diff --git a/packages/seacas/scripts/pconjoin.in b/packages/seacas/scripts/pconjoin.in index 91213b497b14..169f5eea667e 100644 --- a/packages/seacas/scripts/pconjoin.in +++ b/packages/seacas/scripts/pconjoin.in @@ -2,7 +2,7 @@ # Copyright(C) 1999-2020 National Technology & Engineering Solutions # of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with # NTESS, the U.S. Government retains certain rights in this software. -# +# # See packages/seacas/LICENSE for details ######################################################################## @@ -20,12 +20,12 @@ Usage: conjoinp --proc_count --basename -- ...normal co without the '-s000?' portion (file.e.42.21) NOTE: Any "normal conjoin options" must be separated by a '--' - or they will be treated as options to conjoinp and probably + or they will be treated as options to conjoinp and probably ignored. ->->-> Send email to gdsjaar@sandia.gov for conjoinp support.<-<-<- - Uses: GNU Parallel, + Uses: GNU Parallel, O. Tange (2018): GNU Parallel 2018, Mar 2018, ISBN 9781387509881, DOI https://doi.org/10.5281/zenodo.1146014 @@ -106,7 +106,7 @@ done if [ -n "$auto" ]; then file=${auto%.*} - np=${file##*.} + np=${file##*.} file=${file%.*} fi diff --git a/packages/seacas/scripts/zpad.c b/packages/seacas/scripts/zpad.c index b22f02aaa9fe..f81beea841b6 100644 --- a/packages/seacas/scripts/zpad.c +++ b/packages/seacas/scripts/zpad.c @@ -1,10 +1,10 @@ /* -* Copyright(C) 1999-2020 National Technology & Engineering Solutions -* of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with -* NTESS, the U.S. Government retains certain rights in this software. -* -* See packages/seacas/LICENSE for details -*/ + * Copyright(C) 1999-2020 National Technology & Engineering Solutions + * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with + * NTESS, the U.S. Government retains certain rights in this software. + * + * See packages/seacas/LICENSE for details + */ #include #include diff --git a/packages/shylu/shylu_dd/frosch/src/Tools/FROSch_SubdomainSolver_decl.hpp b/packages/shylu/shylu_dd/frosch/src/Tools/FROSch_SubdomainSolver_decl.hpp index 54749db6e311..5675f568b515 100644 --- a/packages/shylu/shylu_dd/frosch/src/Tools/FROSch_SubdomainSolver_decl.hpp +++ b/packages/shylu/shylu_dd/frosch/src/Tools/FROSch_SubdomainSolver_decl.hpp @@ -100,6 +100,7 @@ #endif #ifdef HAVE_SHYLU_DDFROSCH_THYRA +#include "Stratimikos_DefaultLinearSolverBuilder.hpp" #ifdef HAVE_SHYLU_DDFROSCH_IFPACK2 #include "Teuchos_AbstractFactoryStd.hpp" #include "Thyra_Ifpack2PreconditionerFactory.hpp" diff --git a/packages/shylu/shylu_dd/frosch/src/Tools/FROSch_SubdomainSolver_def.hpp b/packages/shylu/shylu_dd/frosch/src/Tools/FROSch_SubdomainSolver_def.hpp index 7e5f59c0abdb..1d29b11736e9 100644 --- a/packages/shylu/shylu_dd/frosch/src/Tools/FROSch_SubdomainSolver_def.hpp +++ b/packages/shylu/shylu_dd/frosch/src/Tools/FROSch_SubdomainSolver_def.hpp @@ -44,7 +44,6 @@ #include - namespace FROSch { using namespace std; diff --git a/packages/shylu/shylu_node/tacho/cmake/Dependencies.cmake b/packages/shylu/shylu_node/tacho/cmake/Dependencies.cmake index 303dc6044c57..c184b938a4c3 100644 --- a/packages/shylu/shylu_node/tacho/cmake/Dependencies.cmake +++ b/packages/shylu/shylu_node/tacho/cmake/Dependencies.cmake @@ -1,6 +1,6 @@ SET(LIB_REQUIRED_DEP_PACKAGES Kokkos) -SET(LIB_OPTIONAL_DEP_PACKAGES TrilinosSS) -SET(TEST_REQUIRED_DEP_PACKAGES Kokkos TrilinosSS Gtest) +SET(LIB_OPTIONAL_DEP_PACKAGES) +SET(TEST_REQUIRED_DEP_PACKAGES Kokkos KokkosAlgorithms Gtest) SET(TEST_OPTIONAL_DEP_PACKAGES) SET(LIB_REQUIRED_DEP_TPLS) SET(LIB_OPTIONAL_DEP_TPLS METIS Scotch Cholmod HWLOC HYPRE MKL LAPACK BLAS Pthread QTHREAD VTune CUSOLVER CUSPARSE CUBLAS CUDA) diff --git a/packages/shylu/shylu_node/tacho/example/CMakeLists.txt b/packages/shylu/shylu_node/tacho/example/CMakeLists.txt index 820ae183d0b0..c871da7de1d9 100644 --- a/packages/shylu/shylu_node/tacho/example/CMakeLists.txt +++ b/packages/shylu/shylu_node/tacho/example/CMakeLists.txt @@ -8,6 +8,13 @@ FILE(GLOB SOURCES *.cpp) SET(LIBRARIES tacho) +TRIBITS_ADD_EXECUTABLE( + Tacho_ExampleCombineDataFileToMatrixMarketFile + NOEXEPREFIX + SOURCES Tacho_ExampleCombineDataFileToMatrixMarketFile.cpp + COMM serial mpi +) + IF (TACHO_HAVE_KOKKOS_TASK) # # Supernodes @@ -199,7 +206,7 @@ IF (TACHO_HAVE_KOKKOS_TASK) ENDIF() TRIBITS_COPY_FILES_TO_BINARY_DIR(Tacho_SimpleSparseTest_File - SOURCE_FILES test.mtx + SOURCE_FILES test.mtx graph.dat weight.dat graph_test.mtx SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR} DEST_DIR ${CMAKE_CURRENT_BINARY_DIR} ) diff --git a/packages/shylu/shylu_node/tacho/example/Tacho_ExampleCholCuSolver.cpp b/packages/shylu/shylu_node/tacho/example/Tacho_ExampleCholCuSolver.cpp index fc192a31ced4..9fdb578b4b73 100644 --- a/packages/shylu/shylu_node/tacho/example/Tacho_ExampleCholCuSolver.cpp +++ b/packages/shylu/shylu_node/tacho/example/Tacho_ExampleCholCuSolver.cpp @@ -73,8 +73,7 @@ int main (int argc, char *argv[]) { #if defined(TACHO_HAVE_METIS) typedef GraphTools_Metis graph_tools_type; #else - /// not recommend to use CAMD - typedef GraphTools_CAMD graph_tools_type; + typedef GraphTools graph_tools_type; #endif Graph graph(h_A.NumRows(), h_A.NumNonZeros(), h_A.RowPtr(), h_A.Cols()); graph_tools_type G(graph); diff --git a/packages/shylu/shylu_node/tacho/example/Tacho_ExampleCholLevelSet.cpp b/packages/shylu/shylu_node/tacho/example/Tacho_ExampleCholLevelSet.cpp index 91f26b5463d6..b82e6ccedc8d 100644 --- a/packages/shylu/shylu_node/tacho/example/Tacho_ExampleCholLevelSet.cpp +++ b/packages/shylu/shylu_node/tacho/example/Tacho_ExampleCholLevelSet.cpp @@ -118,7 +118,7 @@ int main (int argc, char *argv[]) { #elif defined(TACHO_HAVE_SCOTCH) Tacho::GraphTools_Scotch T(G); #else - Tacho::GraphTools_CAMD T(G); + Tacho::GraphTools T(G); #endif T.reorder(verbose); diff --git a/packages/shylu/shylu_node/tacho/example/Tacho_ExampleCholSupernodes.cpp b/packages/shylu/shylu_node/tacho/example/Tacho_ExampleCholSupernodes.cpp index f522cc04b37b..34fff8c05d56 100644 --- a/packages/shylu/shylu_node/tacho/example/Tacho_ExampleCholSupernodes.cpp +++ b/packages/shylu/shylu_node/tacho/example/Tacho_ExampleCholSupernodes.cpp @@ -108,7 +108,7 @@ int main (int argc, char *argv[]) { #elif defined(TACHO_HAVE_SCOTCH) GraphTools_Scotch T(G); #else - GraphTools_CAMD T(G); + GraphTools T(G); #endif T.reorder(verbose); diff --git a/packages/shylu/shylu_node/tacho/example/Tacho_ExampleCholTriSolve.cpp b/packages/shylu/shylu_node/tacho/example/Tacho_ExampleCholTriSolve.cpp index 532e7f813c8b..7750b1400d1e 100644 --- a/packages/shylu/shylu_node/tacho/example/Tacho_ExampleCholTriSolve.cpp +++ b/packages/shylu/shylu_node/tacho/example/Tacho_ExampleCholTriSolve.cpp @@ -107,7 +107,7 @@ int main (int argc, char *argv[]) { #elif defined(TACHO_HAVE_SCOTCH) Tacho::GraphTools_Scotch T(G); #else - Tacho::GraphTools_CAMD T(G); + Tacho::GraphTools T(G); #endif T.reorder(verbose); diff --git a/packages/shylu/shylu_node/tacho/example/Tacho_ExampleCombineDataFileToMatrixMarketFile.cpp b/packages/shylu/shylu_node/tacho/example/Tacho_ExampleCombineDataFileToMatrixMarketFile.cpp new file mode 100644 index 000000000000..45b8d79a9734 --- /dev/null +++ b/packages/shylu/shylu_node/tacho/example/Tacho_ExampleCombineDataFileToMatrixMarketFile.cpp @@ -0,0 +1,80 @@ +#include +#include +#include + +#include "Tacho_Internal.hpp" +#include "Tacho_CommandLineParser.hpp" + +using namespace Tacho; + +int main (int argc, char *argv[]) { + CommandLineParser opts("This example program combines data file into a single matrix market file"); + + std::string graph_data_file = "graph.dat"; + std::string value_data_file = "value.dat"; + std::string matrix_market_file = "mm-out.mtx"; + + opts.set_option("graph-file", "Input graph data file ", &graph_data_file); + opts.set_option("value-file", "Input value data file ", &value_data_file); + opts.set_option("matrix-market-file", "Output matrixmarket file", &matrix_market_file); + + const bool r_parse = opts.parse(argc, argv); + if (r_parse) return 0; // print help return + + Kokkos::initialize(argc, argv); + + typedef Kokkos::DefaultHostExecutionSpace host_space; + { + typedef double value_type; + typedef CrsMatrixBase CrsMatrixBaseTypeHost; + + CrsMatrixBaseTypeHost A; + using ordinal_type_array = typename CrsMatrixBaseTypeHost::ordinal_type_array; + using size_type_array = typename CrsMatrixBaseTypeHost::size_type_array; + using value_type_array = typename CrsMatrixBaseTypeHost::value_type_array; + + ordinal_type m(0), nnz(0); + size_type_array ap; + ordinal_type_array aj; + value_type_array ax; + { + std::ifstream in; + in.open(graph_data_file); + if (!in.good()) { + std::cout << "Failed in open the file: " << graph_data_file << std::endl; + return -1; + } + + in >> m; + ap = size_type_array("ap", m+1); + for (ordinal_type i=0;i<(m+1);++i) + in >> ap(i); + + nnz = ap(m); + aj = ordinal_type_array("aj", nnz); + for (ordinal_type k=0;k> aj(k); + } + { + std::ifstream in; + in.open(value_data_file); + if (!in.good()) { + std::cout << "Failed in open the file: " << value_data_file << std::endl; + return -1; + } + + ax = value_type_array("ax", nnz); + for (ordinal_type k=0;k> ax(k); + } + + A.setExternalMatrix(m, m, nnz, ap, aj, ax); + { + std::ofstream out(matrix_market_file); + MatrixMarket::write(out, A); + } + } + Kokkos::finalize(); + + return 0; +} diff --git a/packages/shylu/shylu_node/tacho/example/Tacho_ExampleExternalInterface.hpp b/packages/shylu/shylu_node/tacho/example/Tacho_ExampleExternalInterface.hpp index 6664db10f309..ad7595466dba 100644 --- a/packages/shylu/shylu_node/tacho/example/Tacho_ExampleExternalInterface.hpp +++ b/packages/shylu/shylu_node/tacho/example/Tacho_ExampleExternalInterface.hpp @@ -74,7 +74,11 @@ namespace tacho { /// with TACHO_ENABLE_INT_INT, size_type is "int" int* rowBegin, int* columns, - SX* values) + SX* values, + int numGraphRows = 0, + int* graphRowBegin = nullptr, + int* graphColumns = nullptr, + int* graphWeights = nullptr) { m_numRows = numRows; if (m_numRows == 0) return 0; @@ -83,6 +87,24 @@ namespace tacho { size_type_array_host ap_host((size_type*) rowBegin, numRows+1); ordinal_type_array_host aj_host((ordinal_type*)columns, numTerms); + size_type_array_host graph_ap_host; + ordinal_type_array_host graph_aj_host; + ordinal_type_array_host graph_aw_host; + + if (numGraphRows > 0) { + if (graphRowBegin == nullptr || + graphColumns == nullptr || + graphWeights == nullptr) { + std::cout << "ExternalInterface::Error, with non-zero numGraphRows, graph pointers should not be nullptr\n"; + std::logic_error("Error: one of graph pointers is nullptr"); + } else { + const size_type nnz_graph = graph_ap_host(numGraphRows); + graph_ap_host = size_type_array_host((size_type*)graphRowBegin, numGraphRows+1); + graph_aj_host = ordinal_type_array_host((ordinal_type*)graphColumns, nnz_graph); + graph_aw_host = ordinal_type_array_host((ordinal_type*)graphWeights, nnz_graph); + } + } + #if defined (KOKKOS_ENABLE_CUDA) /// transfer A into device value_type_array ax(Kokkos::ViewAllocateWithoutInitializing("ax"), @@ -97,7 +119,12 @@ namespace tacho { Kokkos::Impl::Timer timer; { timer.reset(); - m_Solver.analyze(numRows, ap_host, aj_host); + if (numGraphRows > 0) { + m_Solver.analyze(numRows, ap_host, aj_host, + numGraphRows, graph_ap_host, graph_aj_host, graph_aw_host); + } else { + m_Solver.analyze(numRows, ap_host, aj_host); + } const double t = timer.seconds(); std::cout << "ExternalInterface:: analyze time " << t << std::endl; } diff --git a/packages/shylu/shylu_node/tacho/example/Tacho_ExamplePerfTest.cpp b/packages/shylu/shylu_node/tacho/example/Tacho_ExamplePerfTest.cpp index 7d31795ad697..f44bd0adf005 100644 --- a/packages/shylu/shylu_node/tacho/example/Tacho_ExamplePerfTest.cpp +++ b/packages/shylu/shylu_node/tacho/example/Tacho_ExamplePerfTest.cpp @@ -135,7 +135,7 @@ int main (int argc, char *argv[]) { #elif defined(TACHO_HAVE_SCOTCH) Tacho::GraphTools_Scotch G(graph); #else - Tacho::GraphTools_CAMD G(graph); + Tacho::GraphTools G(graph); #endif G.reorder(verbose); diff --git a/packages/shylu/shylu_node/tacho/example/Tacho_ExampleSolver.hpp b/packages/shylu/shylu_node/tacho/example/Tacho_ExampleSolver.hpp index a40ae23ce6cd..00be921df7f4 100644 --- a/packages/shylu/shylu_node/tacho/example/Tacho_ExampleSolver.hpp +++ b/packages/shylu/shylu_node/tacho/example/Tacho_ExampleSolver.hpp @@ -29,6 +29,8 @@ int driver (int argc, char *argv[]) { bool verbose = true; bool sanitize = false; std::string file = "test.mtx"; + std::string graph_file = ""; + std::string weight_file = ""; int nrhs = 1; int sym = 3; int posdef = 1; @@ -53,6 +55,8 @@ int driver (int argc, char *argv[]) { opts.set_option("verbose", "Flag for verbose printing", &verbose); opts.set_option("sanitize", "Flag to sanitize input matrix (remove zeros)", &sanitize); opts.set_option("file", "Input file (MatrixMarket SPD matrix)", &file); + opts.set_option("graph", "Input condensed graph", &graph_file); + opts.set_option("weight", "Input condensed graph weight", &weight_file); opts.set_option("nrhs", "Number of RHS vectors", &nrhs); opts.set_option("symmetric", "Symmetric type: 0 - unsym, 1 - structure sym, 2 - symmetric, 3 - hermitian", &sym); opts.set_option("posdef", "Positive definite: 0 - indef, 1 - positive definite", &posdef); @@ -105,6 +109,53 @@ int driver (int argc, char *argv[]) { } Tacho::MatrixMarket::read(file, A, sanitize, verbose); } + + /// read graph file if available + using size_type_array_host = typename CrsMatrixBaseTypeHost::size_type_array; + using ordinal_type_array_host = typename CrsMatrixBaseTypeHost::ordinal_type_array; + + ordinal_type m_graph(0); + size_type_array_host ap_graph; + ordinal_type_array_host aw_graph, aj_graph; + { + if (graph_file.length() > 0 && weight_file.length() > 0) { + { + std::ifstream in; + in.open(graph_file); + if (!in.good()) { + std::cout << "Failed in open the file: " << graph_file << std::endl; + return -1; + } + in >> m_graph; + + ap_graph = size_type_array_host("ap", m_graph+1); + for (ordinal_type i=0,iend=m_graph+1;i> ap_graph(i); + + aj_graph = ordinal_type_array_host("aj", ap_graph(m_graph)); + for (ordinal_type i=0;i> aj_graph(j); + } + } + + { + std::ifstream in; + in.open(weight_file); + if (!in.good()) { + std::cout << "Failed in open the file: " << weight_file << std::endl; + return -1; + } + ordinal_type m(0); + in >> m; + in >> m_graph; + aw_graph = ordinal_type_array_host("aw", m_graph); + for (ordinal_type i=0;i> aw_graph(i); + } + } + } /// /// * to wrap triple pointers, declare following view types @@ -149,9 +200,18 @@ int driver (int argc, char *argv[]) { Kokkos::deep_copy(values_on_device, A.Values()); /// inputs are used for graph reordering and analysis - solver.analyze(A.NumRows(), - A.RowPtr(), - A.Cols()); + if (m_graph > 0 && m_graph < A.NumRows()) + solver.analyze(A.NumRows(), + A.RowPtr(), + A.Cols(), + m_graph, + ap_graph, + aj_graph, + aw_graph); + else + solver.analyze(A.NumRows(), + A.RowPtr(), + A.Cols()); /// create numeric tools and levelset tools solver.initialize(); diff --git a/packages/shylu/shylu_node/tacho/example/graph.dat b/packages/shylu/shylu_node/tacho/example/graph.dat new file mode 100644 index 000000000000..45e5cd6cb7a3 --- /dev/null +++ b/packages/shylu/shylu_node/tacho/example/graph.dat @@ -0,0 +1,372 @@ +27 +0 +8 +20 +38 +50 +62 +80 +107 +125 +133 +145 +157 +175 +187 +195 +213 +225 +233 +245 +253 +265 +283 +295 +303 +315 +327 +335 +343 +0 +1 +2 +3 +4 +5 +6 +7 +0 +1 +2 +3 +4 +5 +6 +7 +8 +9 +10 +11 +0 +1 +2 +3 +4 +5 +6 +7 +8 +9 +10 +11 +12 +13 +14 +15 +16 +17 +0 +1 +2 +3 +4 +5 +6 +7 +12 +13 +14 +15 +0 +1 +2 +3 +4 +5 +6 +7 +18 +19 +20 +21 +0 +1 +2 +3 +4 +5 +6 +7 +8 +9 +10 +11 +18 +19 +20 +21 +22 +23 +0 +1 +2 +3 +4 +5 +6 +7 +8 +9 +10 +11 +12 +13 +14 +15 +16 +17 +18 +19 +20 +21 +22 +23 +24 +25 +26 +0 +1 +2 +3 +4 +5 +6 +7 +12 +13 +14 +15 +18 +19 +20 +21 +24 +25 +1 +2 +5 +6 +8 +9 +10 +11 +1 +2 +5 +6 +8 +9 +10 +11 +12 +14 +16 +17 +1 +2 +5 +6 +8 +9 +10 +11 +19 +20 +22 +23 +1 +2 +5 +6 +8 +9 +10 +11 +12 +14 +16 +17 +19 +20 +22 +23 +24 +26 +2 +3 +6 +7 +9 +11 +12 +13 +14 +15 +16 +17 +2 +3 +6 +7 +12 +13 +14 +15 +2 +3 +6 +7 +9 +11 +12 +13 +14 +15 +16 +17 +20 +21 +23 +24 +25 +26 +2 +3 +6 +7 +12 +13 +14 +15 +20 +21 +24 +25 +2 +6 +9 +11 +12 +14 +16 +17 +2 +6 +9 +11 +12 +14 +16 +17 +20 +23 +24 +26 +4 +5 +6 +7 +18 +19 +20 +21 +4 +5 +6 +7 +10 +11 +18 +19 +20 +21 +22 +23 +4 +5 +6 +7 +10 +11 +14 +15 +17 +18 +19 +20 +21 +22 +23 +24 +25 +26 +4 +5 +6 +7 +14 +15 +18 +19 +20 +21 +24 +25 +5 +6 +10 +11 +19 +20 +22 +23 +5 +6 +10 +11 +14 +17 +19 +20 +22 +23 +24 +26 +6 +7 +11 +14 +15 +17 +20 +21 +23 +24 +25 +26 +6 +7 +14 +15 +20 +21 +24 +25 +6 +11 +14 +17 +20 +23 +24 +26 diff --git a/packages/shylu/shylu_node/tacho/example/graph_test.mtx b/packages/shylu/shylu_node/tacho/example/graph_test.mtx new file mode 100644 index 000000000000..94a814649fb5 --- /dev/null +++ b/packages/shylu/shylu_node/tacho/example/graph_test.mtx @@ -0,0 +1,3090 @@ +%%MatrixMarket matrix coordinate real general +%------------------------------------------------------------------------------- +81 81 3087 + 1 1 3.473316e+02 + 1 2 1.124657e+02 + 1 3 -1.124657e+02 + 1 4 9.725783e+01 + 1 5 6.782280e+01 + 1 6 1.631181e+01 + 1 7 4.004375e+01 + 1 8 -1.974588e+01 + 1 9 1.974588e+01 + 1 10 9.725783e+01 + 1 11 -1.631181e+01 + 1 12 -6.782280e+01 + 1 13 -1.036350e+02 + 1 14 1.631181e+01 + 1 15 -1.631181e+01 + 1 16 -1.196403e+02 + 1 17 1.974588e+01 + 1 18 1.124657e+02 + 1 19 -1.233504e+02 + 1 20 -6.782280e+01 + 1 21 6.782280e+01 + 1 22 -1.196403e+02 + 1 23 -1.124657e+02 + 1 24 -1.974588e+01 + 2 1 1.124657e+02 + 2 2 3.473316e+02 + 2 3 -1.124657e+02 + 2 4 6.782280e+01 + 2 5 9.725783e+01 + 2 6 1.631181e+01 + 2 7 1.974588e+01 + 2 8 -1.196403e+02 + 2 9 1.124657e+02 + 2 10 1.631181e+01 + 2 11 -1.036350e+02 + 2 12 -1.631181e+01 + 2 13 -1.631181e+01 + 2 14 9.725783e+01 + 2 15 -6.782280e+01 + 2 16 -1.974588e+01 + 2 17 4.004375e+01 + 2 18 1.974588e+01 + 2 19 -6.782280e+01 + 2 20 -1.233504e+02 + 2 21 6.782280e+01 + 2 22 -1.124657e+02 + 2 23 -1.196403e+02 + 2 24 -1.974588e+01 + 3 1 -1.124657e+02 + 3 2 -1.124657e+02 + 3 3 3.473316e+02 + 3 4 -1.631181e+01 + 3 5 -1.631181e+01 + 3 6 -1.036350e+02 + 3 7 -1.974588e+01 + 3 8 1.124657e+02 + 3 9 -1.196403e+02 + 3 10 -6.782280e+01 + 3 11 1.631181e+01 + 3 12 9.725783e+01 + 3 13 1.631181e+01 + 3 14 -6.782280e+01 + 3 15 9.725783e+01 + 3 16 1.124657e+02 + 3 17 -1.974588e+01 + 3 18 -1.196403e+02 + 3 19 6.782280e+01 + 3 20 6.782280e+01 + 3 21 -1.233504e+02 + 3 22 1.974588e+01 + 3 23 1.974588e+01 + 3 24 4.004375e+01 + 4 1 9.725783e+01 + 4 2 6.782280e+01 + 4 3 -1.631181e+01 + 4 4 6.946632e+02 + 4 5 2.249313e+02 + 4 6 0.000000e+00 + 4 7 1.945157e+02 + 4 8 -3.262363e+01 + 4 9 1.421085e-14 + 4 10 4.004375e+01 + 4 11 -1.974588e+01 + 4 12 -1.974588e+01 + 4 13 -1.196403e+02 + 4 14 1.974588e+01 + 4 15 -1.124657e+02 + 4 16 -2.072700e+02 + 4 17 3.262363e+01 + 4 18 -3.552714e-15 + 4 19 -2.392806e+02 + 4 20 -2.249313e+02 + 4 21 0.000000e+00 + 4 22 -1.233504e+02 + 4 23 -6.782280e+01 + 4 24 -6.782280e+01 + 4 25 9.725783e+01 + 4 26 6.782280e+01 + 4 27 1.631181e+01 + 4 28 4.004375e+01 + 4 29 -1.974588e+01 + 4 30 1.974588e+01 + 4 31 -1.196403e+02 + 4 32 1.974588e+01 + 4 33 1.124657e+02 + 4 34 -1.233504e+02 + 4 35 -6.782280e+01 + 4 36 6.782280e+01 + 5 1 6.782280e+01 + 5 2 9.725783e+01 + 5 3 -1.631181e+01 + 5 4 2.249313e+02 + 5 5 6.946632e+02 + 5 6 0.000000e+00 + 5 7 3.262363e+01 + 5 8 -2.072700e+02 + 5 9 3.552714e-15 + 5 10 1.974588e+01 + 5 11 -1.196403e+02 + 5 12 -1.124657e+02 + 5 13 -1.974588e+01 + 5 14 4.004375e+01 + 5 15 -1.974588e+01 + 5 16 -3.262363e+01 + 5 17 1.945157e+02 + 5 18 -1.421085e-14 + 5 19 -2.249313e+02 + 5 20 -2.392806e+02 + 5 21 0.000000e+00 + 5 22 -6.782280e+01 + 5 23 -1.233504e+02 + 5 24 -6.782280e+01 + 5 25 6.782280e+01 + 5 26 9.725783e+01 + 5 27 1.631181e+01 + 5 28 1.974588e+01 + 5 29 -1.196403e+02 + 5 30 1.124657e+02 + 5 31 -1.974588e+01 + 5 32 4.004375e+01 + 5 33 1.974588e+01 + 5 34 -6.782280e+01 + 5 35 -1.233504e+02 + 5 36 6.782280e+01 + 6 1 1.631181e+01 + 6 2 1.631181e+01 + 6 3 -1.036350e+02 + 6 4 0.000000e+00 + 6 5 0.000000e+00 + 6 6 6.946632e+02 + 6 7 1.421085e-14 + 6 8 0.000000e+00 + 6 9 1.945157e+02 + 6 10 1.974588e+01 + 6 11 -1.124657e+02 + 6 12 -1.196403e+02 + 6 13 -1.124657e+02 + 6 14 1.974588e+01 + 6 15 -1.196403e+02 + 6 16 0.000000e+00 + 6 17 0.000000e+00 + 6 18 1.945157e+02 + 6 19 0.000000e+00 + 6 20 0.000000e+00 + 6 21 8.008751e+01 + 6 22 -6.782280e+01 + 6 23 -6.782280e+01 + 6 24 -1.233504e+02 + 6 25 -1.631181e+01 + 6 26 -1.631181e+01 + 6 27 -1.036350e+02 + 6 28 -1.974588e+01 + 6 29 1.124657e+02 + 6 30 -1.196403e+02 + 6 31 1.124657e+02 + 6 32 -1.974588e+01 + 6 33 -1.196403e+02 + 6 34 6.782280e+01 + 6 35 6.782280e+01 + 6 36 -1.233504e+02 + 7 1 4.004375e+01 + 7 2 1.974588e+01 + 7 3 -1.974588e+01 + 7 4 1.945157e+02 + 7 5 3.262363e+01 + 7 6 1.421085e-14 + 7 7 1.389326e+03 + 7 8 0.000000e+00 + 7 9 0.000000e+00 + 7 10 1.945157e+02 + 7 11 1.421085e-14 + 7 12 -3.262363e+01 + 7 13 -1.233504e+02 + 7 14 6.782280e+01 + 7 15 -6.782280e+01 + 7 16 -2.392806e+02 + 7 17 2.249313e+02 + 7 18 -7.105427e-15 + 7 19 -4.145401e+02 + 7 20 7.105427e-15 + 7 21 -7.105427e-15 + 7 22 -2.392806e+02 + 7 23 3.552714e-15 + 7 24 -2.249313e+02 + 7 25 4.004375e+01 + 7 26 1.974588e+01 + 7 27 1.974588e+01 + 7 28 1.945157e+02 + 7 29 1.421085e-14 + 7 30 3.262363e+01 + 7 31 -1.233504e+02 + 7 32 6.782280e+01 + 7 33 6.782280e+01 + 7 34 -2.392806e+02 + 7 35 0.000000e+00 + 7 36 2.249313e+02 + 7 37 1.945157e+02 + 7 38 -3.262363e+01 + 7 39 1.421085e-14 + 7 40 4.004375e+01 + 7 41 -1.974588e+01 + 7 42 -1.974588e+01 + 7 43 -2.392806e+02 + 7 44 -2.249313e+02 + 7 45 0.000000e+00 + 7 46 -1.233504e+02 + 7 47 -6.782280e+01 + 7 48 -6.782280e+01 + 7 49 4.004375e+01 + 7 50 -1.974588e+01 + 7 51 1.974588e+01 + 7 52 -1.233504e+02 + 7 53 -6.782280e+01 + 7 54 6.782280e+01 + 8 1 -1.974588e+01 + 8 2 -1.196403e+02 + 8 3 1.124657e+02 + 8 4 -3.262363e+01 + 8 5 -2.072700e+02 + 8 6 0.000000e+00 + 8 7 0.000000e+00 + 8 8 1.389326e+03 + 8 9 0.000000e+00 + 8 10 1.421085e-14 + 8 11 1.945157e+02 + 8 12 1.065814e-14 + 8 13 6.782280e+01 + 8 14 -1.233504e+02 + 8 15 6.782280e+01 + 8 16 2.249313e+02 + 8 17 -2.392806e+02 + 8 18 0.000000e+00 + 8 19 2.486900e-14 + 8 20 3.890313e+02 + 8 21 0.000000e+00 + 8 22 -3.552714e-15 + 8 23 8.008751e+01 + 8 24 3.552714e-15 + 8 25 -1.974588e+01 + 8 26 -1.196403e+02 + 8 27 -1.124657e+02 + 8 28 1.421085e-14 + 8 29 1.945157e+02 + 8 30 7.105427e-15 + 8 31 6.782280e+01 + 8 32 -1.233504e+02 + 8 33 -6.782280e+01 + 8 34 3.552714e-15 + 8 35 8.008751e+01 + 8 36 -3.552714e-15 + 8 37 3.262363e+01 + 8 38 -2.072700e+02 + 8 39 0.000000e+00 + 8 40 1.974588e+01 + 8 41 -1.196403e+02 + 8 42 -1.124657e+02 + 8 43 -2.249313e+02 + 8 44 -2.392806e+02 + 8 45 3.552714e-15 + 8 46 -6.782280e+01 + 8 47 -1.233504e+02 + 8 48 -6.782280e+01 + 8 49 1.974588e+01 + 8 50 -1.196403e+02 + 8 51 1.124657e+02 + 8 52 -6.782280e+01 + 8 53 -1.233504e+02 + 8 54 6.782280e+01 + 9 1 1.974588e+01 + 9 2 1.124657e+02 + 9 3 -1.196403e+02 + 9 4 1.421085e-14 + 9 5 3.552714e-15 + 9 6 1.945157e+02 + 9 7 0.000000e+00 + 9 8 0.000000e+00 + 9 9 1.389326e+03 + 9 10 3.262363e+01 + 9 11 1.065814e-14 + 9 12 -2.072700e+02 + 9 13 -6.782280e+01 + 9 14 6.782280e+01 + 9 15 -1.233504e+02 + 9 16 -3.552714e-15 + 9 17 0.000000e+00 + 9 18 8.008751e+01 + 9 19 3.552714e-15 + 9 20 0.000000e+00 + 9 21 3.890313e+02 + 9 22 -2.249313e+02 + 9 23 7.105427e-15 + 9 24 -2.392806e+02 + 9 25 -1.974588e+01 + 9 26 -1.124657e+02 + 9 27 -1.196403e+02 + 9 28 -3.262363e+01 + 9 29 1.065814e-14 + 9 30 -2.072700e+02 + 9 31 6.782280e+01 + 9 32 -6.782280e+01 + 9 33 -1.233504e+02 + 9 34 2.249313e+02 + 9 35 3.552714e-15 + 9 36 -2.392806e+02 + 9 37 0.000000e+00 + 9 38 0.000000e+00 + 9 39 1.945157e+02 + 9 40 1.974588e+01 + 9 41 -1.124657e+02 + 9 42 -1.196403e+02 + 9 43 0.000000e+00 + 9 44 0.000000e+00 + 9 45 8.008751e+01 + 9 46 -6.782280e+01 + 9 47 -6.782280e+01 + 9 48 -1.233504e+02 + 9 49 -1.974588e+01 + 9 50 1.124657e+02 + 9 51 -1.196403e+02 + 9 52 6.782280e+01 + 9 53 6.782280e+01 + 9 54 -1.233504e+02 + 10 1 9.725783e+01 + 10 2 1.631181e+01 + 10 3 -6.782280e+01 + 10 4 4.004375e+01 + 10 5 1.974588e+01 + 10 6 1.974588e+01 + 10 7 1.945157e+02 + 10 8 1.421085e-14 + 10 9 3.262363e+01 + 10 10 6.946632e+02 + 10 11 0.000000e+00 + 10 12 -2.249313e+02 + 10 13 -1.196403e+02 + 10 14 1.124657e+02 + 10 15 -1.974588e+01 + 10 16 -1.233504e+02 + 10 17 6.782280e+01 + 10 18 6.782280e+01 + 10 19 -2.392806e+02 + 10 20 0.000000e+00 + 10 21 2.249313e+02 + 10 22 -2.072700e+02 + 10 23 -7.105427e-15 + 10 24 -3.262363e+01 + 10 37 4.004375e+01 + 10 38 -1.974588e+01 + 10 39 1.974588e+01 + 10 40 9.725783e+01 + 10 41 -1.631181e+01 + 10 42 -6.782280e+01 + 10 43 -1.233504e+02 + 10 44 -6.782280e+01 + 10 45 6.782280e+01 + 10 46 -1.196403e+02 + 10 47 -1.124657e+02 + 10 48 -1.974588e+01 + 11 1 -1.631181e+01 + 11 2 -1.036350e+02 + 11 3 1.631181e+01 + 11 4 -1.974588e+01 + 11 5 -1.196403e+02 + 11 6 -1.124657e+02 + 11 7 1.421085e-14 + 11 8 1.945157e+02 + 11 9 1.065814e-14 + 11 10 0.000000e+00 + 11 11 6.946632e+02 + 11 12 -1.421085e-14 + 11 13 1.124657e+02 + 11 14 -1.196403e+02 + 11 15 1.974588e+01 + 11 16 6.782280e+01 + 11 17 -1.233504e+02 + 11 18 -6.782280e+01 + 11 19 7.105427e-15 + 11 20 8.008751e+01 + 11 21 -3.552714e-15 + 11 22 1.776357e-14 + 11 23 1.945157e+02 + 11 24 0.000000e+00 + 11 37 1.974588e+01 + 11 38 -1.196403e+02 + 11 39 1.124657e+02 + 11 40 1.631181e+01 + 11 41 -1.036350e+02 + 11 42 -1.631181e+01 + 11 43 -6.782280e+01 + 11 44 -1.233504e+02 + 11 45 6.782280e+01 + 11 46 -1.124657e+02 + 11 47 -1.196403e+02 + 11 48 -1.974588e+01 + 12 1 -6.782280e+01 + 12 2 -1.631181e+01 + 12 3 9.725783e+01 + 12 4 -1.974588e+01 + 12 5 -1.124657e+02 + 12 6 -1.196403e+02 + 12 7 -3.262363e+01 + 12 8 1.065814e-14 + 12 9 -2.072700e+02 + 12 10 -2.249313e+02 + 12 11 -1.421085e-14 + 12 12 6.946632e+02 + 12 13 1.974588e+01 + 12 14 -1.974588e+01 + 12 15 4.004375e+01 + 12 16 6.782280e+01 + 12 17 -6.782280e+01 + 12 18 -1.233504e+02 + 12 19 2.249313e+02 + 12 20 3.552714e-15 + 12 21 -2.392806e+02 + 12 22 3.262363e+01 + 12 23 0.000000e+00 + 12 24 1.945157e+02 + 12 37 -1.974588e+01 + 12 38 1.124657e+02 + 12 39 -1.196403e+02 + 12 40 -6.782280e+01 + 12 41 1.631181e+01 + 12 42 9.725783e+01 + 12 43 6.782280e+01 + 12 44 6.782280e+01 + 12 45 -1.233504e+02 + 12 46 1.974588e+01 + 12 47 1.974588e+01 + 12 48 4.004375e+01 + 13 1 -1.036350e+02 + 13 2 -1.631181e+01 + 13 3 1.631181e+01 + 13 4 -1.196403e+02 + 13 5 -1.974588e+01 + 13 6 -1.124657e+02 + 13 7 -1.233504e+02 + 13 8 6.782280e+01 + 13 9 -6.782280e+01 + 13 10 -1.196403e+02 + 13 11 1.124657e+02 + 13 12 1.974588e+01 + 13 13 6.946632e+02 + 13 14 -1.421085e-14 + 13 15 1.421085e-14 + 13 16 1.945157e+02 + 13 17 1.421085e-14 + 13 18 -1.776357e-14 + 13 19 8.008751e+01 + 13 20 3.552714e-15 + 13 21 0.000000e+00 + 13 22 1.945157e+02 + 13 23 1.421085e-14 + 13 24 0.000000e+00 + 13 55 -1.036350e+02 + 13 56 1.631181e+01 + 13 57 -1.631181e+01 + 13 58 -1.196403e+02 + 13 59 1.974588e+01 + 13 60 1.124657e+02 + 13 61 -1.233504e+02 + 13 62 -6.782280e+01 + 13 63 6.782280e+01 + 13 64 -1.196403e+02 + 13 65 -1.124657e+02 + 13 66 -1.974588e+01 + 14 1 1.631181e+01 + 14 2 9.725783e+01 + 14 3 -6.782280e+01 + 14 4 1.974588e+01 + 14 5 4.004375e+01 + 14 6 1.974588e+01 + 14 7 6.782280e+01 + 14 8 -1.233504e+02 + 14 9 6.782280e+01 + 14 10 1.124657e+02 + 14 11 -1.196403e+02 + 14 12 -1.974588e+01 + 14 13 -1.421085e-14 + 14 14 6.946632e+02 + 14 15 -2.249313e+02 + 14 16 1.421085e-14 + 14 17 1.945157e+02 + 14 18 3.262363e+01 + 14 19 3.552714e-15 + 14 20 -2.392806e+02 + 14 21 2.249313e+02 + 14 22 3.552714e-15 + 14 23 -2.072700e+02 + 14 24 -3.262363e+01 + 14 55 -1.631181e+01 + 14 56 9.725783e+01 + 14 57 -6.782280e+01 + 14 58 -1.974588e+01 + 14 59 4.004375e+01 + 14 60 1.974588e+01 + 14 61 -6.782280e+01 + 14 62 -1.233504e+02 + 14 63 6.782280e+01 + 14 64 -1.124657e+02 + 14 65 -1.196403e+02 + 14 66 -1.974588e+01 + 15 1 -1.631181e+01 + 15 2 -6.782280e+01 + 15 3 9.725783e+01 + 15 4 -1.124657e+02 + 15 5 -1.974588e+01 + 15 6 -1.196403e+02 + 15 7 -6.782280e+01 + 15 8 6.782280e+01 + 15 9 -1.233504e+02 + 15 10 -1.974588e+01 + 15 11 1.974588e+01 + 15 12 4.004375e+01 + 15 13 1.421085e-14 + 15 14 -2.249313e+02 + 15 15 6.946632e+02 + 15 16 0.000000e+00 + 15 17 -3.262363e+01 + 15 18 -2.072700e+02 + 15 19 -3.552714e-15 + 15 20 2.249313e+02 + 15 21 -2.392806e+02 + 15 22 -1.421085e-14 + 15 23 3.262363e+01 + 15 24 1.945157e+02 + 15 55 1.631181e+01 + 15 56 -6.782280e+01 + 15 57 9.725783e+01 + 15 58 1.124657e+02 + 15 59 -1.974588e+01 + 15 60 -1.196403e+02 + 15 61 6.782280e+01 + 15 62 6.782280e+01 + 15 63 -1.233504e+02 + 15 64 1.974588e+01 + 15 65 1.974588e+01 + 15 66 4.004375e+01 + 16 1 -1.196403e+02 + 16 2 -1.974588e+01 + 16 3 1.124657e+02 + 16 4 -2.072700e+02 + 16 5 -3.262363e+01 + 16 6 0.000000e+00 + 16 7 -2.392806e+02 + 16 8 2.249313e+02 + 16 9 -3.552714e-15 + 16 10 -1.233504e+02 + 16 11 6.782280e+01 + 16 12 6.782280e+01 + 16 13 1.945157e+02 + 16 14 1.421085e-14 + 16 15 0.000000e+00 + 16 16 1.389326e+03 + 16 17 0.000000e+00 + 16 18 0.000000e+00 + 16 19 3.890313e+02 + 16 20 3.552714e-15 + 16 21 1.421085e-14 + 16 22 8.008751e+01 + 16 23 -3.552714e-15 + 16 24 3.552714e-15 + 16 25 -1.196403e+02 + 16 26 -1.974588e+01 + 16 27 -1.124657e+02 + 16 28 -1.233504e+02 + 16 29 6.782280e+01 + 16 30 -6.782280e+01 + 16 31 1.945157e+02 + 16 32 1.421085e-14 + 16 33 3.552714e-15 + 16 34 8.008751e+01 + 16 35 -7.105427e-15 + 16 36 -3.552714e-15 + 16 55 -1.196403e+02 + 16 56 1.974588e+01 + 16 57 -1.124657e+02 + 16 58 -2.072700e+02 + 16 59 3.262363e+01 + 16 60 3.552714e-15 + 16 61 -2.392806e+02 + 16 62 -2.249313e+02 + 16 63 0.000000e+00 + 16 64 -1.233504e+02 + 16 65 -6.782280e+01 + 16 66 -6.782280e+01 + 16 67 -1.196403e+02 + 16 68 1.974588e+01 + 16 69 1.124657e+02 + 16 70 -1.233504e+02 + 16 71 -6.782280e+01 + 16 72 6.782280e+01 + 17 1 1.974588e+01 + 17 2 4.004375e+01 + 17 3 -1.974588e+01 + 17 4 3.262363e+01 + 17 5 1.945157e+02 + 17 6 0.000000e+00 + 17 7 2.249313e+02 + 17 8 -2.392806e+02 + 17 9 0.000000e+00 + 17 10 6.782280e+01 + 17 11 -1.233504e+02 + 17 12 -6.782280e+01 + 17 13 1.421085e-14 + 17 14 1.945157e+02 + 17 15 -3.262363e+01 + 17 16 0.000000e+00 + 17 17 1.389326e+03 + 17 18 0.000000e+00 + 17 19 1.065814e-14 + 17 20 -4.145401e+02 + 17 21 7.105427e-15 + 17 22 0.000000e+00 + 17 23 -2.392806e+02 + 17 24 -2.249313e+02 + 17 25 1.974588e+01 + 17 26 4.004375e+01 + 17 27 1.974588e+01 + 17 28 6.782280e+01 + 17 29 -1.233504e+02 + 17 30 6.782280e+01 + 17 31 1.421085e-14 + 17 32 1.945157e+02 + 17 33 3.262363e+01 + 17 34 0.000000e+00 + 17 35 -2.392806e+02 + 17 36 2.249313e+02 + 17 55 -1.974588e+01 + 17 56 4.004375e+01 + 17 57 -1.974588e+01 + 17 58 -3.262363e+01 + 17 59 1.945157e+02 + 17 60 -1.421085e-14 + 17 61 -2.249313e+02 + 17 62 -2.392806e+02 + 17 63 0.000000e+00 + 17 64 -6.782280e+01 + 17 65 -1.233504e+02 + 17 66 -6.782280e+01 + 17 67 -1.974588e+01 + 17 68 4.004375e+01 + 17 69 1.974588e+01 + 17 70 -6.782280e+01 + 17 71 -1.233504e+02 + 17 72 6.782280e+01 + 18 1 1.124657e+02 + 18 2 1.974588e+01 + 18 3 -1.196403e+02 + 18 4 -3.552714e-15 + 18 5 -1.421085e-14 + 18 6 1.945157e+02 + 18 7 -7.105427e-15 + 18 8 0.000000e+00 + 18 9 8.008751e+01 + 18 10 6.782280e+01 + 18 11 -6.782280e+01 + 18 12 -1.233504e+02 + 18 13 -1.776357e-14 + 18 14 3.262363e+01 + 18 15 -2.072700e+02 + 18 16 0.000000e+00 + 18 17 0.000000e+00 + 18 18 1.389326e+03 + 18 19 1.421085e-14 + 18 20 3.552714e-15 + 18 21 3.890313e+02 + 18 22 3.552714e-15 + 18 23 -2.249313e+02 + 18 24 -2.392806e+02 + 18 25 -1.124657e+02 + 18 26 -1.974588e+01 + 18 27 -1.196403e+02 + 18 28 -6.782280e+01 + 18 29 6.782280e+01 + 18 30 -1.233504e+02 + 18 31 7.105427e-15 + 18 32 -3.262363e+01 + 18 33 -2.072700e+02 + 18 34 7.105427e-15 + 18 35 2.249313e+02 + 18 36 -2.392806e+02 + 18 55 -1.124657e+02 + 18 56 1.974588e+01 + 18 57 -1.196403e+02 + 18 58 0.000000e+00 + 18 59 -1.421085e-14 + 18 60 1.945157e+02 + 18 61 0.000000e+00 + 18 62 3.552714e-15 + 18 63 8.008751e+01 + 18 64 -6.782280e+01 + 18 65 -6.782280e+01 + 18 66 -1.233504e+02 + 18 67 1.124657e+02 + 18 68 -1.974588e+01 + 18 69 -1.196403e+02 + 18 70 6.782280e+01 + 18 71 6.782280e+01 + 18 72 -1.233504e+02 + 19 1 -1.233504e+02 + 19 2 -6.782280e+01 + 19 3 6.782280e+01 + 19 4 -2.392806e+02 + 19 5 -2.249313e+02 + 19 6 0.000000e+00 + 19 7 -4.145401e+02 + 19 8 2.486900e-14 + 19 9 3.552714e-15 + 19 10 -2.392806e+02 + 19 11 7.105427e-15 + 19 12 2.249313e+02 + 19 13 8.008751e+01 + 19 14 3.552714e-15 + 19 15 -3.552714e-15 + 19 16 3.890313e+02 + 19 17 1.065814e-14 + 19 18 1.421085e-14 + 19 19 2.778653e+03 + 19 20 0.000000e+00 + 19 21 0.000000e+00 + 19 22 3.890313e+02 + 19 23 1.421085e-14 + 19 24 -3.552714e-15 + 19 25 -1.233504e+02 + 19 26 -6.782280e+01 + 19 27 -6.782280e+01 + 19 28 -2.392806e+02 + 19 29 0.000000e+00 + 19 30 -2.249313e+02 + 19 31 8.008751e+01 + 19 32 0.000000e+00 + 19 33 0.000000e+00 + 19 34 3.890313e+02 + 19 35 1.421085e-14 + 19 36 1.065814e-14 + 19 37 -2.392806e+02 + 19 38 2.249313e+02 + 19 39 -3.552714e-15 + 19 40 -1.233504e+02 + 19 41 6.782280e+01 + 19 42 6.782280e+01 + 19 43 3.890313e+02 + 19 44 7.105427e-15 + 19 45 1.421085e-14 + 19 46 8.008751e+01 + 19 47 -3.552714e-15 + 19 48 0.000000e+00 + 19 49 -1.233504e+02 + 19 50 6.782280e+01 + 19 51 -6.782280e+01 + 19 52 8.008751e+01 + 19 53 0.000000e+00 + 19 54 0.000000e+00 + 19 55 -1.233504e+02 + 19 56 6.782280e+01 + 19 57 -6.782280e+01 + 19 58 -2.392806e+02 + 19 59 2.249313e+02 + 19 60 -3.552714e-15 + 19 61 -4.145401e+02 + 19 62 0.000000e+00 + 19 63 0.000000e+00 + 19 64 -2.392806e+02 + 19 65 7.105427e-15 + 19 66 -2.249313e+02 + 19 67 -1.233504e+02 + 19 68 6.782280e+01 + 19 69 6.782280e+01 + 19 70 -2.392806e+02 + 19 71 0.000000e+00 + 19 72 2.249313e+02 + 19 73 -2.392806e+02 + 19 74 -2.249313e+02 + 19 75 0.000000e+00 + 19 76 -1.233504e+02 + 19 77 -6.782280e+01 + 19 78 -6.782280e+01 + 19 79 -1.233504e+02 + 19 80 -6.782280e+01 + 19 81 6.782280e+01 + 20 1 -6.782280e+01 + 20 2 -1.233504e+02 + 20 3 6.782280e+01 + 20 4 -2.249313e+02 + 20 5 -2.392806e+02 + 20 6 0.000000e+00 + 20 7 7.105427e-15 + 20 8 3.890313e+02 + 20 9 0.000000e+00 + 20 10 0.000000e+00 + 20 11 8.008751e+01 + 20 12 3.552714e-15 + 20 13 3.552714e-15 + 20 14 -2.392806e+02 + 20 15 2.249313e+02 + 20 16 3.552714e-15 + 20 17 -4.145401e+02 + 20 18 3.552714e-15 + 20 19 0.000000e+00 + 20 20 2.778653e+03 + 20 21 0.000000e+00 + 20 22 1.421085e-14 + 20 23 3.890313e+02 + 20 24 7.105427e-15 + 20 25 -6.782280e+01 + 20 26 -1.233504e+02 + 20 27 -6.782280e+01 + 20 28 0.000000e+00 + 20 29 8.008751e+01 + 20 30 7.105427e-15 + 20 31 7.105427e-15 + 20 32 -2.392806e+02 + 20 33 -2.249313e+02 + 20 34 1.421085e-14 + 20 35 3.890313e+02 + 20 36 2.131628e-14 + 20 37 2.249313e+02 + 20 38 -2.392806e+02 + 20 39 0.000000e+00 + 20 40 6.782280e+01 + 20 41 -1.233504e+02 + 20 42 -6.782280e+01 + 20 43 7.105427e-15 + 20 44 -4.145401e+02 + 20 45 3.552714e-15 + 20 46 0.000000e+00 + 20 47 -2.392806e+02 + 20 48 -2.249313e+02 + 20 49 6.782280e+01 + 20 50 -1.233504e+02 + 20 51 6.782280e+01 + 20 52 3.552714e-15 + 20 53 -2.392806e+02 + 20 54 2.249313e+02 + 20 55 6.782280e+01 + 20 56 -1.233504e+02 + 20 57 6.782280e+01 + 20 58 2.249313e+02 + 20 59 -2.392806e+02 + 20 60 3.552714e-15 + 20 61 1.776357e-14 + 20 62 3.890313e+02 + 20 63 0.000000e+00 + 20 64 3.552714e-15 + 20 65 8.008751e+01 + 20 66 7.105427e-15 + 20 67 6.782280e+01 + 20 68 -1.233504e+02 + 20 69 -6.782280e+01 + 20 70 3.552714e-15 + 20 71 8.008751e+01 + 20 72 0.000000e+00 + 20 73 -2.249313e+02 + 20 74 -2.392806e+02 + 20 75 3.552714e-15 + 20 76 -6.782280e+01 + 20 77 -1.233504e+02 + 20 78 -6.782280e+01 + 20 79 -6.782280e+01 + 20 80 -1.233504e+02 + 20 81 6.782280e+01 + 21 1 6.782280e+01 + 21 2 6.782280e+01 + 21 3 -1.233504e+02 + 21 4 0.000000e+00 + 21 5 0.000000e+00 + 21 6 8.008751e+01 + 21 7 -7.105427e-15 + 21 8 0.000000e+00 + 21 9 3.890313e+02 + 21 10 2.249313e+02 + 21 11 -3.552714e-15 + 21 12 -2.392806e+02 + 21 13 0.000000e+00 + 21 14 2.249313e+02 + 21 15 -2.392806e+02 + 21 16 1.421085e-14 + 21 17 7.105427e-15 + 21 18 3.890313e+02 + 21 19 0.000000e+00 + 21 20 0.000000e+00 + 21 21 2.778653e+03 + 21 22 0.000000e+00 + 21 23 2.131628e-14 + 21 24 -4.145401e+02 + 21 25 -6.782280e+01 + 21 26 -6.782280e+01 + 21 27 -1.233504e+02 + 21 28 -2.249313e+02 + 21 29 0.000000e+00 + 21 30 -2.392806e+02 + 21 31 0.000000e+00 + 21 32 -2.249313e+02 + 21 33 -2.392806e+02 + 21 34 -1.065814e-14 + 21 35 3.552714e-15 + 21 36 -4.145401e+02 + 21 37 -3.552714e-15 + 21 38 0.000000e+00 + 21 39 8.008751e+01 + 21 40 6.782280e+01 + 21 41 -6.782280e+01 + 21 42 -1.233504e+02 + 21 43 0.000000e+00 + 21 44 0.000000e+00 + 21 45 3.890313e+02 + 21 46 0.000000e+00 + 21 47 -2.249313e+02 + 21 48 -2.392806e+02 + 21 49 -6.782280e+01 + 21 50 6.782280e+01 + 21 51 -1.233504e+02 + 21 52 3.552714e-15 + 21 53 2.249313e+02 + 21 54 -2.392806e+02 + 21 55 -6.782280e+01 + 21 56 6.782280e+01 + 21 57 -1.233504e+02 + 21 58 -3.552714e-15 + 21 59 0.000000e+00 + 21 60 8.008751e+01 + 21 61 7.105427e-15 + 21 62 -1.421085e-14 + 21 63 3.890313e+02 + 21 64 -2.249313e+02 + 21 65 -3.552714e-15 + 21 66 -2.392806e+02 + 21 67 6.782280e+01 + 21 68 -6.782280e+01 + 21 69 -1.233504e+02 + 21 70 2.249313e+02 + 21 71 3.552714e-15 + 21 72 -2.392806e+02 + 21 73 0.000000e+00 + 21 74 3.552714e-15 + 21 75 8.008751e+01 + 21 76 -6.782280e+01 + 21 77 -6.782280e+01 + 21 78 -1.233504e+02 + 21 79 6.782280e+01 + 21 80 6.782280e+01 + 21 81 -1.233504e+02 + 22 1 -1.196403e+02 + 22 2 -1.124657e+02 + 22 3 1.974588e+01 + 22 4 -1.233504e+02 + 22 5 -6.782280e+01 + 22 6 -6.782280e+01 + 22 7 -2.392806e+02 + 22 8 -3.552714e-15 + 22 9 -2.249313e+02 + 22 10 -2.072700e+02 + 22 11 1.776357e-14 + 22 12 3.262363e+01 + 22 13 1.945157e+02 + 22 14 3.552714e-15 + 22 15 -1.421085e-14 + 22 16 8.008751e+01 + 22 17 0.000000e+00 + 22 18 3.552714e-15 + 22 19 3.890313e+02 + 22 20 1.421085e-14 + 22 21 0.000000e+00 + 22 22 1.389326e+03 + 22 23 0.000000e+00 + 22 24 0.000000e+00 + 22 37 -1.233504e+02 + 22 38 6.782280e+01 + 22 39 -6.782280e+01 + 22 40 -1.196403e+02 + 22 41 1.124657e+02 + 22 42 1.974588e+01 + 22 43 8.008751e+01 + 22 44 3.552714e-15 + 22 45 3.552714e-15 + 22 46 1.945157e+02 + 22 47 3.552714e-15 + 22 48 1.421085e-14 + 22 55 -1.196403e+02 + 22 56 1.124657e+02 + 22 57 -1.974588e+01 + 22 58 -1.233504e+02 + 22 59 6.782280e+01 + 22 60 6.782280e+01 + 22 61 -2.392806e+02 + 22 62 3.552714e-15 + 22 63 2.249313e+02 + 22 64 -2.072700e+02 + 22 65 -3.552714e-15 + 22 66 -3.262363e+01 + 22 73 -1.233504e+02 + 22 74 -6.782280e+01 + 22 75 6.782280e+01 + 22 76 -1.196403e+02 + 22 77 -1.124657e+02 + 22 78 -1.974588e+01 + 23 1 -1.124657e+02 + 23 2 -1.196403e+02 + 23 3 1.974588e+01 + 23 4 -6.782280e+01 + 23 5 -1.233504e+02 + 23 6 -6.782280e+01 + 23 7 3.552714e-15 + 23 8 8.008751e+01 + 23 9 7.105427e-15 + 23 10 -7.105427e-15 + 23 11 1.945157e+02 + 23 12 0.000000e+00 + 23 13 1.421085e-14 + 23 14 -2.072700e+02 + 23 15 3.262363e+01 + 23 16 -3.552714e-15 + 23 17 -2.392806e+02 + 23 18 -2.249313e+02 + 23 19 1.421085e-14 + 23 20 3.890313e+02 + 23 21 2.131628e-14 + 23 22 0.000000e+00 + 23 23 1.389326e+03 + 23 24 -1.421085e-14 + 23 37 6.782280e+01 + 23 38 -1.233504e+02 + 23 39 6.782280e+01 + 23 40 1.124657e+02 + 23 41 -1.196403e+02 + 23 42 -1.974588e+01 + 23 43 3.552714e-15 + 23 44 -2.392806e+02 + 23 45 2.249313e+02 + 23 46 0.000000e+00 + 23 47 -2.072700e+02 + 23 48 -3.262363e+01 + 23 55 1.124657e+02 + 23 56 -1.196403e+02 + 23 57 1.974588e+01 + 23 58 6.782280e+01 + 23 59 -1.233504e+02 + 23 60 -6.782280e+01 + 23 61 7.105427e-15 + 23 62 8.008751e+01 + 23 63 0.000000e+00 + 23 64 1.776357e-14 + 23 65 1.945157e+02 + 23 66 0.000000e+00 + 23 73 -6.782280e+01 + 23 74 -1.233504e+02 + 23 75 6.782280e+01 + 23 76 -1.124657e+02 + 23 77 -1.196403e+02 + 23 78 -1.974588e+01 + 24 1 -1.974588e+01 + 24 2 -1.974588e+01 + 24 3 4.004375e+01 + 24 4 -6.782280e+01 + 24 5 -6.782280e+01 + 24 6 -1.233504e+02 + 24 7 -2.249313e+02 + 24 8 3.552714e-15 + 24 9 -2.392806e+02 + 24 10 -3.262363e+01 + 24 11 0.000000e+00 + 24 12 1.945157e+02 + 24 13 0.000000e+00 + 24 14 -3.262363e+01 + 24 15 1.945157e+02 + 24 16 3.552714e-15 + 24 17 -2.249313e+02 + 24 18 -2.392806e+02 + 24 19 -3.552714e-15 + 24 20 7.105427e-15 + 24 21 -4.145401e+02 + 24 22 0.000000e+00 + 24 23 -1.421085e-14 + 24 24 1.389326e+03 + 24 37 -6.782280e+01 + 24 38 6.782280e+01 + 24 39 -1.233504e+02 + 24 40 -1.974588e+01 + 24 41 1.974588e+01 + 24 42 4.004375e+01 + 24 43 3.552714e-15 + 24 44 2.249313e+02 + 24 45 -2.392806e+02 + 24 46 -2.842171e-14 + 24 47 3.262363e+01 + 24 48 1.945157e+02 + 24 55 1.974588e+01 + 24 56 -1.974588e+01 + 24 57 4.004375e+01 + 24 58 6.782280e+01 + 24 59 -6.782280e+01 + 24 60 -1.233504e+02 + 24 61 2.249313e+02 + 24 62 3.552714e-15 + 24 63 -2.392806e+02 + 24 64 3.262363e+01 + 24 65 0.000000e+00 + 24 66 1.945157e+02 + 24 73 6.782280e+01 + 24 74 6.782280e+01 + 24 75 -1.233504e+02 + 24 76 1.974588e+01 + 24 77 1.974588e+01 + 24 78 4.004375e+01 + 25 4 9.725783e+01 + 25 5 6.782280e+01 + 25 6 -1.631181e+01 + 25 7 4.004375e+01 + 25 8 -1.974588e+01 + 25 9 -1.974588e+01 + 25 16 -1.196403e+02 + 25 17 1.974588e+01 + 25 18 -1.124657e+02 + 25 19 -1.233504e+02 + 25 20 -6.782280e+01 + 25 21 -6.782280e+01 + 25 25 3.473316e+02 + 25 26 1.124657e+02 + 25 27 1.124657e+02 + 25 28 9.725783e+01 + 25 29 -1.631181e+01 + 25 30 6.782280e+01 + 25 31 -1.036350e+02 + 25 32 1.631181e+01 + 25 33 1.631181e+01 + 25 34 -1.196403e+02 + 25 35 -1.124657e+02 + 25 36 1.974588e+01 + 26 4 6.782280e+01 + 26 5 9.725783e+01 + 26 6 -1.631181e+01 + 26 7 1.974588e+01 + 26 8 -1.196403e+02 + 26 9 -1.124657e+02 + 26 16 -1.974588e+01 + 26 17 4.004375e+01 + 26 18 -1.974588e+01 + 26 19 -6.782280e+01 + 26 20 -1.233504e+02 + 26 21 -6.782280e+01 + 26 25 1.124657e+02 + 26 26 3.473316e+02 + 26 27 1.124657e+02 + 26 28 1.631181e+01 + 26 29 -1.036350e+02 + 26 30 1.631181e+01 + 26 31 -1.631181e+01 + 26 32 9.725783e+01 + 26 33 6.782280e+01 + 26 34 -1.124657e+02 + 26 35 -1.196403e+02 + 26 36 1.974588e+01 + 27 4 1.631181e+01 + 27 5 1.631181e+01 + 27 6 -1.036350e+02 + 27 7 1.974588e+01 + 27 8 -1.124657e+02 + 27 9 -1.196403e+02 + 27 16 -1.124657e+02 + 27 17 1.974588e+01 + 27 18 -1.196403e+02 + 27 19 -6.782280e+01 + 27 20 -6.782280e+01 + 27 21 -1.233504e+02 + 27 25 1.124657e+02 + 27 26 1.124657e+02 + 27 27 3.473316e+02 + 27 28 6.782280e+01 + 27 29 -1.631181e+01 + 27 30 9.725783e+01 + 27 31 -1.631181e+01 + 27 32 6.782280e+01 + 27 33 9.725783e+01 + 27 34 -1.974588e+01 + 27 35 -1.974588e+01 + 27 36 4.004375e+01 + 28 4 4.004375e+01 + 28 5 1.974588e+01 + 28 6 -1.974588e+01 + 28 7 1.945157e+02 + 28 8 1.421085e-14 + 28 9 -3.262363e+01 + 28 16 -1.233504e+02 + 28 17 6.782280e+01 + 28 18 -6.782280e+01 + 28 19 -2.392806e+02 + 28 20 0.000000e+00 + 28 21 -2.249313e+02 + 28 25 9.725783e+01 + 28 26 1.631181e+01 + 28 27 6.782280e+01 + 28 28 6.946632e+02 + 28 29 0.000000e+00 + 28 30 2.249313e+02 + 28 31 -1.196403e+02 + 28 32 1.124657e+02 + 28 33 1.974588e+01 + 28 34 -2.072700e+02 + 28 35 7.105427e-15 + 28 36 3.262363e+01 + 28 37 4.004375e+01 + 28 38 -1.974588e+01 + 28 39 -1.974588e+01 + 28 43 -1.233504e+02 + 28 44 -6.782280e+01 + 28 45 -6.782280e+01 + 28 49 9.725783e+01 + 28 50 -1.631181e+01 + 28 51 6.782280e+01 + 28 52 -1.196403e+02 + 28 53 -1.124657e+02 + 28 54 1.974588e+01 + 29 4 -1.974588e+01 + 29 5 -1.196403e+02 + 29 6 1.124657e+02 + 29 7 1.421085e-14 + 29 8 1.945157e+02 + 29 9 1.065814e-14 + 29 16 6.782280e+01 + 29 17 -1.233504e+02 + 29 18 6.782280e+01 + 29 19 0.000000e+00 + 29 20 8.008751e+01 + 29 21 0.000000e+00 + 29 25 -1.631181e+01 + 29 26 -1.036350e+02 + 29 27 -1.631181e+01 + 29 28 0.000000e+00 + 29 29 6.946632e+02 + 29 30 1.421085e-14 + 29 31 1.124657e+02 + 29 32 -1.196403e+02 + 29 33 -1.974588e+01 + 29 34 0.000000e+00 + 29 35 1.945157e+02 + 29 36 0.000000e+00 + 29 37 1.974588e+01 + 29 38 -1.196403e+02 + 29 39 -1.124657e+02 + 29 43 -6.782280e+01 + 29 44 -1.233504e+02 + 29 45 -6.782280e+01 + 29 49 1.631181e+01 + 29 50 -1.036350e+02 + 29 51 1.631181e+01 + 29 52 -1.124657e+02 + 29 53 -1.196403e+02 + 29 54 1.974588e+01 + 30 4 1.974588e+01 + 30 5 1.124657e+02 + 30 6 -1.196403e+02 + 30 7 3.262363e+01 + 30 8 7.105427e-15 + 30 9 -2.072700e+02 + 30 16 -6.782280e+01 + 30 17 6.782280e+01 + 30 18 -1.233504e+02 + 30 19 -2.249313e+02 + 30 20 7.105427e-15 + 30 21 -2.392806e+02 + 30 25 6.782280e+01 + 30 26 1.631181e+01 + 30 27 9.725783e+01 + 30 28 2.249313e+02 + 30 29 1.421085e-14 + 30 30 6.946632e+02 + 30 31 -1.974588e+01 + 30 32 1.974588e+01 + 30 33 4.004375e+01 + 30 34 -3.262363e+01 + 30 35 0.000000e+00 + 30 36 1.945157e+02 + 30 37 1.974588e+01 + 30 38 -1.124657e+02 + 30 39 -1.196403e+02 + 30 43 -6.782280e+01 + 30 44 -6.782280e+01 + 30 45 -1.233504e+02 + 30 49 6.782280e+01 + 30 50 -1.631181e+01 + 30 51 9.725783e+01 + 30 52 -1.974588e+01 + 30 53 -1.974588e+01 + 30 54 4.004375e+01 + 31 4 -1.196403e+02 + 31 5 -1.974588e+01 + 31 6 1.124657e+02 + 31 7 -1.233504e+02 + 31 8 6.782280e+01 + 31 9 6.782280e+01 + 31 16 1.945157e+02 + 31 17 1.421085e-14 + 31 18 7.105427e-15 + 31 19 8.008751e+01 + 31 20 7.105427e-15 + 31 21 0.000000e+00 + 31 25 -1.036350e+02 + 31 26 -1.631181e+01 + 31 27 -1.631181e+01 + 31 28 -1.196403e+02 + 31 29 1.124657e+02 + 31 30 -1.974588e+01 + 31 31 6.946632e+02 + 31 32 0.000000e+00 + 31 33 0.000000e+00 + 31 34 1.945157e+02 + 31 35 -7.105427e-15 + 31 36 -1.421085e-14 + 31 58 -1.196403e+02 + 31 59 1.974588e+01 + 31 60 -1.124657e+02 + 31 61 -1.233504e+02 + 31 62 -6.782280e+01 + 31 63 -6.782280e+01 + 31 67 -1.036350e+02 + 31 68 1.631181e+01 + 31 69 1.631181e+01 + 31 70 -1.196403e+02 + 31 71 -1.124657e+02 + 31 72 1.974588e+01 + 32 4 1.974588e+01 + 32 5 4.004375e+01 + 32 6 -1.974588e+01 + 32 7 6.782280e+01 + 32 8 -1.233504e+02 + 32 9 -6.782280e+01 + 32 16 1.421085e-14 + 32 17 1.945157e+02 + 32 18 -3.262363e+01 + 32 19 0.000000e+00 + 32 20 -2.392806e+02 + 32 21 -2.249313e+02 + 32 25 1.631181e+01 + 32 26 9.725783e+01 + 32 27 6.782280e+01 + 32 28 1.124657e+02 + 32 29 -1.196403e+02 + 32 30 1.974588e+01 + 32 31 0.000000e+00 + 32 32 6.946632e+02 + 32 33 2.249313e+02 + 32 34 3.552714e-15 + 32 35 -2.072700e+02 + 32 36 3.262363e+01 + 32 58 -1.974588e+01 + 32 59 4.004375e+01 + 32 60 -1.974588e+01 + 32 61 -6.782280e+01 + 32 62 -1.233504e+02 + 32 63 -6.782280e+01 + 32 67 -1.631181e+01 + 32 68 9.725783e+01 + 32 69 6.782280e+01 + 32 70 -1.124657e+02 + 32 71 -1.196403e+02 + 32 72 1.974588e+01 + 33 4 1.124657e+02 + 33 5 1.974588e+01 + 33 6 -1.196403e+02 + 33 7 6.782280e+01 + 33 8 -6.782280e+01 + 33 9 -1.233504e+02 + 33 16 3.552714e-15 + 33 17 3.262363e+01 + 33 18 -2.072700e+02 + 33 19 0.000000e+00 + 33 20 -2.249313e+02 + 33 21 -2.392806e+02 + 33 25 1.631181e+01 + 33 26 6.782280e+01 + 33 27 9.725783e+01 + 33 28 1.974588e+01 + 33 29 -1.974588e+01 + 33 30 4.004375e+01 + 33 31 0.000000e+00 + 33 32 2.249313e+02 + 33 33 6.946632e+02 + 33 34 2.842171e-14 + 33 35 -3.262363e+01 + 33 36 1.945157e+02 + 33 58 -1.124657e+02 + 33 59 1.974588e+01 + 33 60 -1.196403e+02 + 33 61 -6.782280e+01 + 33 62 -6.782280e+01 + 33 63 -1.233504e+02 + 33 67 -1.631181e+01 + 33 68 6.782280e+01 + 33 69 9.725783e+01 + 33 70 -1.974588e+01 + 33 71 -1.974588e+01 + 33 72 4.004375e+01 + 34 4 -1.233504e+02 + 34 5 -6.782280e+01 + 34 6 6.782280e+01 + 34 7 -2.392806e+02 + 34 8 3.552714e-15 + 34 9 2.249313e+02 + 34 16 8.008751e+01 + 34 17 0.000000e+00 + 34 18 7.105427e-15 + 34 19 3.890313e+02 + 34 20 1.421085e-14 + 34 21 -1.065814e-14 + 34 25 -1.196403e+02 + 34 26 -1.124657e+02 + 34 27 -1.974588e+01 + 34 28 -2.072700e+02 + 34 29 0.000000e+00 + 34 30 -3.262363e+01 + 34 31 1.945157e+02 + 34 32 3.552714e-15 + 34 33 2.842171e-14 + 34 34 1.389326e+03 + 34 35 0.000000e+00 + 34 36 0.000000e+00 + 34 37 -1.233504e+02 + 34 38 6.782280e+01 + 34 39 6.782280e+01 + 34 43 8.008751e+01 + 34 44 0.000000e+00 + 34 45 0.000000e+00 + 34 49 -1.196403e+02 + 34 50 1.124657e+02 + 34 51 -1.974588e+01 + 34 52 1.945157e+02 + 34 53 -3.552714e-15 + 34 54 -1.421085e-14 + 34 58 -1.233504e+02 + 34 59 6.782280e+01 + 34 60 -6.782280e+01 + 34 61 -2.392806e+02 + 34 62 3.552714e-15 + 34 63 -2.249313e+02 + 34 67 -1.196403e+02 + 34 68 1.124657e+02 + 34 69 1.974588e+01 + 34 70 -2.072700e+02 + 34 71 3.552714e-15 + 34 72 3.262363e+01 + 34 73 -1.233504e+02 + 34 74 -6.782280e+01 + 34 75 -6.782280e+01 + 34 79 -1.196403e+02 + 34 80 -1.124657e+02 + 34 81 1.974588e+01 + 35 4 -6.782280e+01 + 35 5 -1.233504e+02 + 35 6 6.782280e+01 + 35 7 0.000000e+00 + 35 8 8.008751e+01 + 35 9 3.552714e-15 + 35 16 -7.105427e-15 + 35 17 -2.392806e+02 + 35 18 2.249313e+02 + 35 19 1.421085e-14 + 35 20 3.890313e+02 + 35 21 3.552714e-15 + 35 25 -1.124657e+02 + 35 26 -1.196403e+02 + 35 27 -1.974588e+01 + 35 28 7.105427e-15 + 35 29 1.945157e+02 + 35 30 0.000000e+00 + 35 31 -7.105427e-15 + 35 32 -2.072700e+02 + 35 33 -3.262363e+01 + 35 34 0.000000e+00 + 35 35 1.389326e+03 + 35 36 1.421085e-14 + 35 37 6.782280e+01 + 35 38 -1.233504e+02 + 35 39 -6.782280e+01 + 35 43 3.552714e-15 + 35 44 -2.392806e+02 + 35 45 -2.249313e+02 + 35 49 1.124657e+02 + 35 50 -1.196403e+02 + 35 51 1.974588e+01 + 35 52 -3.552714e-15 + 35 53 -2.072700e+02 + 35 54 3.262363e+01 + 35 58 6.782280e+01 + 35 59 -1.233504e+02 + 35 60 6.782280e+01 + 35 61 3.552714e-15 + 35 62 8.008751e+01 + 35 63 3.552714e-15 + 35 67 1.124657e+02 + 35 68 -1.196403e+02 + 35 69 -1.974588e+01 + 35 70 3.552714e-15 + 35 71 1.945157e+02 + 35 72 0.000000e+00 + 35 73 -6.782280e+01 + 35 74 -1.233504e+02 + 35 75 -6.782280e+01 + 35 79 -1.124657e+02 + 35 80 -1.196403e+02 + 35 81 1.974588e+01 + 36 4 6.782280e+01 + 36 5 6.782280e+01 + 36 6 -1.233504e+02 + 36 7 2.249313e+02 + 36 8 -3.552714e-15 + 36 9 -2.392806e+02 + 36 16 -3.552714e-15 + 36 17 2.249313e+02 + 36 18 -2.392806e+02 + 36 19 1.065814e-14 + 36 20 2.131628e-14 + 36 21 -4.145401e+02 + 36 25 1.974588e+01 + 36 26 1.974588e+01 + 36 27 4.004375e+01 + 36 28 3.262363e+01 + 36 29 0.000000e+00 + 36 30 1.945157e+02 + 36 31 -1.421085e-14 + 36 32 3.262363e+01 + 36 33 1.945157e+02 + 36 34 0.000000e+00 + 36 35 1.421085e-14 + 36 36 1.389326e+03 + 36 37 6.782280e+01 + 36 38 -6.782280e+01 + 36 39 -1.233504e+02 + 36 43 0.000000e+00 + 36 44 -2.249313e+02 + 36 45 -2.392806e+02 + 36 49 1.974588e+01 + 36 50 -1.974588e+01 + 36 51 4.004375e+01 + 36 52 1.421085e-14 + 36 53 -3.262363e+01 + 36 54 1.945157e+02 + 36 58 -6.782280e+01 + 36 59 6.782280e+01 + 36 60 -1.233504e+02 + 36 61 -2.249313e+02 + 36 62 -3.552714e-15 + 36 63 -2.392806e+02 + 36 67 -1.974588e+01 + 36 68 1.974588e+01 + 36 69 4.004375e+01 + 36 70 -3.262363e+01 + 36 71 -1.421085e-14 + 36 72 1.945157e+02 + 36 73 -6.782280e+01 + 36 74 -6.782280e+01 + 36 75 -1.233504e+02 + 36 79 -1.974588e+01 + 36 80 -1.974588e+01 + 36 81 4.004375e+01 + 37 7 1.945157e+02 + 37 8 3.262363e+01 + 37 9 0.000000e+00 + 37 10 4.004375e+01 + 37 11 1.974588e+01 + 37 12 -1.974588e+01 + 37 19 -2.392806e+02 + 37 20 2.249313e+02 + 37 21 -3.552714e-15 + 37 22 -1.233504e+02 + 37 23 6.782280e+01 + 37 24 -6.782280e+01 + 37 28 4.004375e+01 + 37 29 1.974588e+01 + 37 30 1.974588e+01 + 37 34 -1.233504e+02 + 37 35 6.782280e+01 + 37 36 6.782280e+01 + 37 37 6.946632e+02 + 37 38 -2.249313e+02 + 37 39 0.000000e+00 + 37 40 9.725783e+01 + 37 41 -6.782280e+01 + 37 42 -1.631181e+01 + 37 43 -2.072700e+02 + 37 44 -3.262363e+01 + 37 45 3.552714e-15 + 37 46 -1.196403e+02 + 37 47 -1.974588e+01 + 37 48 -1.124657e+02 + 37 49 9.725783e+01 + 37 50 -6.782280e+01 + 37 51 1.631181e+01 + 37 52 -1.196403e+02 + 37 53 -1.974588e+01 + 37 54 1.124657e+02 + 38 7 -3.262363e+01 + 38 8 -2.072700e+02 + 38 9 0.000000e+00 + 38 10 -1.974588e+01 + 38 11 -1.196403e+02 + 38 12 1.124657e+02 + 38 19 2.249313e+02 + 38 20 -2.392806e+02 + 38 21 0.000000e+00 + 38 22 6.782280e+01 + 38 23 -1.233504e+02 + 38 24 6.782280e+01 + 38 28 -1.974588e+01 + 38 29 -1.196403e+02 + 38 30 -1.124657e+02 + 38 34 6.782280e+01 + 38 35 -1.233504e+02 + 38 36 -6.782280e+01 + 38 37 -2.249313e+02 + 38 38 6.946632e+02 + 38 39 0.000000e+00 + 38 40 -6.782280e+01 + 38 41 9.725783e+01 + 38 42 1.631181e+01 + 38 43 3.262363e+01 + 38 44 1.945157e+02 + 38 45 1.421085e-14 + 38 46 1.974588e+01 + 38 47 4.004375e+01 + 38 48 1.974588e+01 + 38 49 -6.782280e+01 + 38 50 9.725783e+01 + 38 51 -1.631181e+01 + 38 52 1.974588e+01 + 38 53 4.004375e+01 + 38 54 -1.974588e+01 + 39 7 1.421085e-14 + 39 8 0.000000e+00 + 39 9 1.945157e+02 + 39 10 1.974588e+01 + 39 11 1.124657e+02 + 39 12 -1.196403e+02 + 39 19 -3.552714e-15 + 39 20 0.000000e+00 + 39 21 8.008751e+01 + 39 22 -6.782280e+01 + 39 23 6.782280e+01 + 39 24 -1.233504e+02 + 39 28 -1.974588e+01 + 39 29 -1.124657e+02 + 39 30 -1.196403e+02 + 39 34 6.782280e+01 + 39 35 -6.782280e+01 + 39 36 -1.233504e+02 + 39 37 0.000000e+00 + 39 38 0.000000e+00 + 39 39 6.946632e+02 + 39 40 1.631181e+01 + 39 41 -1.631181e+01 + 39 42 -1.036350e+02 + 39 43 7.105427e-15 + 39 44 1.421085e-14 + 39 45 1.945157e+02 + 39 46 -1.124657e+02 + 39 47 -1.974588e+01 + 39 48 -1.196403e+02 + 39 49 -1.631181e+01 + 39 50 1.631181e+01 + 39 51 -1.036350e+02 + 39 52 1.124657e+02 + 39 53 1.974588e+01 + 39 54 -1.196403e+02 + 40 7 4.004375e+01 + 40 8 1.974588e+01 + 40 9 1.974588e+01 + 40 10 9.725783e+01 + 40 11 1.631181e+01 + 40 12 -6.782280e+01 + 40 19 -1.233504e+02 + 40 20 6.782280e+01 + 40 21 6.782280e+01 + 40 22 -1.196403e+02 + 40 23 1.124657e+02 + 40 24 -1.974588e+01 + 40 37 9.725783e+01 + 40 38 -6.782280e+01 + 40 39 1.631181e+01 + 40 40 3.473316e+02 + 40 41 -1.124657e+02 + 40 42 -1.124657e+02 + 40 43 -1.196403e+02 + 40 44 -1.974588e+01 + 40 45 1.124657e+02 + 40 46 -1.036350e+02 + 40 47 -1.631181e+01 + 40 48 -1.631181e+01 + 41 7 -1.974588e+01 + 41 8 -1.196403e+02 + 41 9 -1.124657e+02 + 41 10 -1.631181e+01 + 41 11 -1.036350e+02 + 41 12 1.631181e+01 + 41 19 6.782280e+01 + 41 20 -1.233504e+02 + 41 21 -6.782280e+01 + 41 22 1.124657e+02 + 41 23 -1.196403e+02 + 41 24 1.974588e+01 + 41 37 -6.782280e+01 + 41 38 9.725783e+01 + 41 39 -1.631181e+01 + 41 40 -1.124657e+02 + 41 41 3.473316e+02 + 41 42 1.124657e+02 + 41 43 1.974588e+01 + 41 44 4.004375e+01 + 41 45 -1.974588e+01 + 41 46 1.631181e+01 + 41 47 9.725783e+01 + 41 48 6.782280e+01 + 42 7 -1.974588e+01 + 42 8 -1.124657e+02 + 42 9 -1.196403e+02 + 42 10 -6.782280e+01 + 42 11 -1.631181e+01 + 42 12 9.725783e+01 + 42 19 6.782280e+01 + 42 20 -6.782280e+01 + 42 21 -1.233504e+02 + 42 22 1.974588e+01 + 42 23 -1.974588e+01 + 42 24 4.004375e+01 + 42 37 -1.631181e+01 + 42 38 1.631181e+01 + 42 39 -1.036350e+02 + 42 40 -1.124657e+02 + 42 41 1.124657e+02 + 42 42 3.473316e+02 + 42 43 1.124657e+02 + 42 44 1.974588e+01 + 42 45 -1.196403e+02 + 42 46 1.631181e+01 + 42 47 6.782280e+01 + 42 48 9.725783e+01 + 43 7 -2.392806e+02 + 43 8 -2.249313e+02 + 43 9 0.000000e+00 + 43 10 -1.233504e+02 + 43 11 -6.782280e+01 + 43 12 6.782280e+01 + 43 19 3.890313e+02 + 43 20 7.105427e-15 + 43 21 0.000000e+00 + 43 22 8.008751e+01 + 43 23 3.552714e-15 + 43 24 3.552714e-15 + 43 28 -1.233504e+02 + 43 29 -6.782280e+01 + 43 30 -6.782280e+01 + 43 34 8.008751e+01 + 43 35 3.552714e-15 + 43 36 0.000000e+00 + 43 37 -2.072700e+02 + 43 38 3.262363e+01 + 43 39 7.105427e-15 + 43 40 -1.196403e+02 + 43 41 1.974588e+01 + 43 42 1.124657e+02 + 43 43 1.389326e+03 + 43 44 0.000000e+00 + 43 45 0.000000e+00 + 43 46 1.945157e+02 + 43 47 -1.421085e-14 + 43 48 -7.105427e-15 + 43 49 -1.196403e+02 + 43 50 1.974588e+01 + 43 51 -1.124657e+02 + 43 52 1.945157e+02 + 43 53 -2.842171e-14 + 43 54 7.105427e-15 + 43 61 -2.392806e+02 + 43 62 2.249313e+02 + 43 63 0.000000e+00 + 43 64 -1.233504e+02 + 43 65 6.782280e+01 + 43 66 -6.782280e+01 + 43 70 -1.233504e+02 + 43 71 6.782280e+01 + 43 72 6.782280e+01 + 43 73 -2.072700e+02 + 43 74 -3.262363e+01 + 43 75 3.552714e-15 + 43 76 -1.196403e+02 + 43 77 -1.974588e+01 + 43 78 -1.124657e+02 + 43 79 -1.196403e+02 + 43 80 -1.974588e+01 + 43 81 1.124657e+02 + 44 7 -2.249313e+02 + 44 8 -2.392806e+02 + 44 9 0.000000e+00 + 44 10 -6.782280e+01 + 44 11 -1.233504e+02 + 44 12 6.782280e+01 + 44 19 7.105427e-15 + 44 20 -4.145401e+02 + 44 21 0.000000e+00 + 44 22 3.552714e-15 + 44 23 -2.392806e+02 + 44 24 2.249313e+02 + 44 28 -6.782280e+01 + 44 29 -1.233504e+02 + 44 30 -6.782280e+01 + 44 34 0.000000e+00 + 44 35 -2.392806e+02 + 44 36 -2.249313e+02 + 44 37 -3.262363e+01 + 44 38 1.945157e+02 + 44 39 1.421085e-14 + 44 40 -1.974588e+01 + 44 41 4.004375e+01 + 44 42 1.974588e+01 + 44 43 0.000000e+00 + 44 44 1.389326e+03 + 44 45 0.000000e+00 + 44 46 -1.421085e-14 + 44 47 1.945157e+02 + 44 48 3.262363e+01 + 44 49 -1.974588e+01 + 44 50 4.004375e+01 + 44 51 -1.974588e+01 + 44 52 -1.421085e-14 + 44 53 1.945157e+02 + 44 54 -3.262363e+01 + 44 61 2.249313e+02 + 44 62 -2.392806e+02 + 44 63 0.000000e+00 + 44 64 6.782280e+01 + 44 65 -1.233504e+02 + 44 66 6.782280e+01 + 44 70 6.782280e+01 + 44 71 -1.233504e+02 + 44 72 -6.782280e+01 + 44 73 3.262363e+01 + 44 74 1.945157e+02 + 44 75 1.421085e-14 + 44 76 1.974588e+01 + 44 77 4.004375e+01 + 44 78 1.974588e+01 + 44 79 1.974588e+01 + 44 80 4.004375e+01 + 44 81 -1.974588e+01 + 45 7 0.000000e+00 + 45 8 3.552714e-15 + 45 9 8.008751e+01 + 45 10 6.782280e+01 + 45 11 6.782280e+01 + 45 12 -1.233504e+02 + 45 19 1.421085e-14 + 45 20 3.552714e-15 + 45 21 3.890313e+02 + 45 22 3.552714e-15 + 45 23 2.249313e+02 + 45 24 -2.392806e+02 + 45 28 -6.782280e+01 + 45 29 -6.782280e+01 + 45 30 -1.233504e+02 + 45 34 0.000000e+00 + 45 35 -2.249313e+02 + 45 36 -2.392806e+02 + 45 37 3.552714e-15 + 45 38 1.421085e-14 + 45 39 1.945157e+02 + 45 40 1.124657e+02 + 45 41 -1.974588e+01 + 45 42 -1.196403e+02 + 45 43 0.000000e+00 + 45 44 0.000000e+00 + 45 45 1.389326e+03 + 45 46 7.105427e-15 + 45 47 -3.262363e+01 + 45 48 -2.072700e+02 + 45 49 -1.124657e+02 + 45 50 1.974588e+01 + 45 51 -1.196403e+02 + 45 52 -7.105427e-15 + 45 53 3.262363e+01 + 45 54 -2.072700e+02 + 45 61 -3.552714e-15 + 45 62 0.000000e+00 + 45 63 8.008751e+01 + 45 64 -6.782280e+01 + 45 65 6.782280e+01 + 45 66 -1.233504e+02 + 45 70 6.782280e+01 + 45 71 -6.782280e+01 + 45 72 -1.233504e+02 + 45 73 7.105427e-15 + 45 74 0.000000e+00 + 45 75 1.945157e+02 + 45 76 -1.124657e+02 + 45 77 -1.974588e+01 + 45 78 -1.196403e+02 + 45 79 1.124657e+02 + 45 80 1.974588e+01 + 45 81 -1.196403e+02 + 46 7 -1.233504e+02 + 46 8 -6.782280e+01 + 46 9 -6.782280e+01 + 46 10 -1.196403e+02 + 46 11 -1.124657e+02 + 46 12 1.974588e+01 + 46 19 8.008751e+01 + 46 20 0.000000e+00 + 46 21 0.000000e+00 + 46 22 1.945157e+02 + 46 23 0.000000e+00 + 46 24 -2.842171e-14 + 46 37 -1.196403e+02 + 46 38 1.974588e+01 + 46 39 -1.124657e+02 + 46 40 -1.036350e+02 + 46 41 1.631181e+01 + 46 42 1.631181e+01 + 46 43 1.945157e+02 + 46 44 -1.421085e-14 + 46 45 7.105427e-15 + 46 46 6.946632e+02 + 46 47 0.000000e+00 + 46 48 0.000000e+00 + 46 61 -1.233504e+02 + 46 62 6.782280e+01 + 46 63 6.782280e+01 + 46 64 -1.196403e+02 + 46 65 1.124657e+02 + 46 66 -1.974588e+01 + 46 73 -1.196403e+02 + 46 74 -1.974588e+01 + 46 75 1.124657e+02 + 46 76 -1.036350e+02 + 46 77 -1.631181e+01 + 46 78 -1.631181e+01 + 47 7 -6.782280e+01 + 47 8 -1.233504e+02 + 47 9 -6.782280e+01 + 47 10 -1.124657e+02 + 47 11 -1.196403e+02 + 47 12 1.974588e+01 + 47 19 -3.552714e-15 + 47 20 -2.392806e+02 + 47 21 -2.249313e+02 + 47 22 3.552714e-15 + 47 23 -2.072700e+02 + 47 24 3.262363e+01 + 47 37 -1.974588e+01 + 47 38 4.004375e+01 + 47 39 -1.974588e+01 + 47 40 -1.631181e+01 + 47 41 9.725783e+01 + 47 42 6.782280e+01 + 47 43 -1.421085e-14 + 47 44 1.945157e+02 + 47 45 -3.262363e+01 + 47 46 0.000000e+00 + 47 47 6.946632e+02 + 47 48 2.249313e+02 + 47 61 6.782280e+01 + 47 62 -1.233504e+02 + 47 63 -6.782280e+01 + 47 64 1.124657e+02 + 47 65 -1.196403e+02 + 47 66 1.974588e+01 + 47 73 1.974588e+01 + 47 74 4.004375e+01 + 47 75 -1.974588e+01 + 47 76 1.631181e+01 + 47 77 9.725783e+01 + 47 78 6.782280e+01 + 48 7 -6.782280e+01 + 48 8 -6.782280e+01 + 48 9 -1.233504e+02 + 48 10 -1.974588e+01 + 48 11 -1.974588e+01 + 48 12 4.004375e+01 + 48 19 0.000000e+00 + 48 20 -2.249313e+02 + 48 21 -2.392806e+02 + 48 22 1.421085e-14 + 48 23 -3.262363e+01 + 48 24 1.945157e+02 + 48 37 -1.124657e+02 + 48 38 1.974588e+01 + 48 39 -1.196403e+02 + 48 40 -1.631181e+01 + 48 41 6.782280e+01 + 48 42 9.725783e+01 + 48 43 -7.105427e-15 + 48 44 3.262363e+01 + 48 45 -2.072700e+02 + 48 46 0.000000e+00 + 48 47 2.249313e+02 + 48 48 6.946632e+02 + 48 61 6.782280e+01 + 48 62 -6.782280e+01 + 48 63 -1.233504e+02 + 48 64 1.974588e+01 + 48 65 -1.974588e+01 + 48 66 4.004375e+01 + 48 73 1.124657e+02 + 48 74 1.974588e+01 + 48 75 -1.196403e+02 + 48 76 1.631181e+01 + 48 77 6.782280e+01 + 48 78 9.725783e+01 + 49 7 4.004375e+01 + 49 8 1.974588e+01 + 49 9 -1.974588e+01 + 49 19 -1.233504e+02 + 49 20 6.782280e+01 + 49 21 -6.782280e+01 + 49 28 9.725783e+01 + 49 29 1.631181e+01 + 49 30 6.782280e+01 + 49 34 -1.196403e+02 + 49 35 1.124657e+02 + 49 36 1.974588e+01 + 49 37 9.725783e+01 + 49 38 -6.782280e+01 + 49 39 -1.631181e+01 + 49 43 -1.196403e+02 + 49 44 -1.974588e+01 + 49 45 -1.124657e+02 + 49 49 3.473316e+02 + 49 50 -1.124657e+02 + 49 51 1.124657e+02 + 49 52 -1.036350e+02 + 49 53 -1.631181e+01 + 49 54 1.631181e+01 + 50 7 -1.974588e+01 + 50 8 -1.196403e+02 + 50 9 1.124657e+02 + 50 19 6.782280e+01 + 50 20 -1.233504e+02 + 50 21 6.782280e+01 + 50 28 -1.631181e+01 + 50 29 -1.036350e+02 + 50 30 -1.631181e+01 + 50 34 1.124657e+02 + 50 35 -1.196403e+02 + 50 36 -1.974588e+01 + 50 37 -6.782280e+01 + 50 38 9.725783e+01 + 50 39 1.631181e+01 + 50 43 1.974588e+01 + 50 44 4.004375e+01 + 50 45 1.974588e+01 + 50 49 -1.124657e+02 + 50 50 3.473316e+02 + 50 51 -1.124657e+02 + 50 52 1.631181e+01 + 50 53 9.725783e+01 + 50 54 -6.782280e+01 + 51 7 1.974588e+01 + 51 8 1.124657e+02 + 51 9 -1.196403e+02 + 51 19 -6.782280e+01 + 51 20 6.782280e+01 + 51 21 -1.233504e+02 + 51 28 6.782280e+01 + 51 29 1.631181e+01 + 51 30 9.725783e+01 + 51 34 -1.974588e+01 + 51 35 1.974588e+01 + 51 36 4.004375e+01 + 51 37 1.631181e+01 + 51 38 -1.631181e+01 + 51 39 -1.036350e+02 + 51 43 -1.124657e+02 + 51 44 -1.974588e+01 + 51 45 -1.196403e+02 + 51 49 1.124657e+02 + 51 50 -1.124657e+02 + 51 51 3.473316e+02 + 51 52 -1.631181e+01 + 51 53 -6.782280e+01 + 51 54 9.725783e+01 + 52 7 -1.233504e+02 + 52 8 -6.782280e+01 + 52 9 6.782280e+01 + 52 19 8.008751e+01 + 52 20 3.552714e-15 + 52 21 3.552714e-15 + 52 28 -1.196403e+02 + 52 29 -1.124657e+02 + 52 30 -1.974588e+01 + 52 34 1.945157e+02 + 52 35 -3.552714e-15 + 52 36 1.421085e-14 + 52 37 -1.196403e+02 + 52 38 1.974588e+01 + 52 39 1.124657e+02 + 52 43 1.945157e+02 + 52 44 -1.421085e-14 + 52 45 -7.105427e-15 + 52 49 -1.036350e+02 + 52 50 1.631181e+01 + 52 51 -1.631181e+01 + 52 52 6.946632e+02 + 52 53 0.000000e+00 + 52 54 0.000000e+00 + 52 61 -1.233504e+02 + 52 62 6.782280e+01 + 52 63 -6.782280e+01 + 52 70 -1.196403e+02 + 52 71 1.124657e+02 + 52 72 1.974588e+01 + 52 73 -1.196403e+02 + 52 74 -1.974588e+01 + 52 75 -1.124657e+02 + 52 79 -1.036350e+02 + 52 80 -1.631181e+01 + 52 81 1.631181e+01 + 53 7 -6.782280e+01 + 53 8 -1.233504e+02 + 53 9 6.782280e+01 + 53 19 0.000000e+00 + 53 20 -2.392806e+02 + 53 21 2.249313e+02 + 53 28 -1.124657e+02 + 53 29 -1.196403e+02 + 53 30 -1.974588e+01 + 53 34 -3.552714e-15 + 53 35 -2.072700e+02 + 53 36 -3.262363e+01 + 53 37 -1.974588e+01 + 53 38 4.004375e+01 + 53 39 1.974588e+01 + 53 43 -2.842171e-14 + 53 44 1.945157e+02 + 53 45 3.262363e+01 + 53 49 -1.631181e+01 + 53 50 9.725783e+01 + 53 51 -6.782280e+01 + 53 52 0.000000e+00 + 53 53 6.946632e+02 + 53 54 -2.249313e+02 + 53 61 6.782280e+01 + 53 62 -1.233504e+02 + 53 63 6.782280e+01 + 53 70 1.124657e+02 + 53 71 -1.196403e+02 + 53 72 -1.974588e+01 + 53 73 1.974588e+01 + 53 74 4.004375e+01 + 53 75 1.974588e+01 + 53 79 1.631181e+01 + 53 80 9.725783e+01 + 53 81 -6.782280e+01 + 54 7 6.782280e+01 + 54 8 6.782280e+01 + 54 9 -1.233504e+02 + 54 19 0.000000e+00 + 54 20 2.249313e+02 + 54 21 -2.392806e+02 + 54 28 1.974588e+01 + 54 29 1.974588e+01 + 54 30 4.004375e+01 + 54 34 -1.421085e-14 + 54 35 3.262363e+01 + 54 36 1.945157e+02 + 54 37 1.124657e+02 + 54 38 -1.974588e+01 + 54 39 -1.196403e+02 + 54 43 7.105427e-15 + 54 44 -3.262363e+01 + 54 45 -2.072700e+02 + 54 49 1.631181e+01 + 54 50 -6.782280e+01 + 54 51 9.725783e+01 + 54 52 0.000000e+00 + 54 53 -2.249313e+02 + 54 54 6.946632e+02 + 54 61 -6.782280e+01 + 54 62 6.782280e+01 + 54 63 -1.233504e+02 + 54 70 -1.974588e+01 + 54 71 1.974588e+01 + 54 72 4.004375e+01 + 54 73 -1.124657e+02 + 54 74 -1.974588e+01 + 54 75 -1.196403e+02 + 54 79 -1.631181e+01 + 54 80 -6.782280e+01 + 54 81 9.725783e+01 + 55 13 -1.036350e+02 + 55 14 -1.631181e+01 + 55 15 1.631181e+01 + 55 16 -1.196403e+02 + 55 17 -1.974588e+01 + 55 18 -1.124657e+02 + 55 19 -1.233504e+02 + 55 20 6.782280e+01 + 55 21 -6.782280e+01 + 55 22 -1.196403e+02 + 55 23 1.124657e+02 + 55 24 1.974588e+01 + 55 55 3.473316e+02 + 55 56 -1.124657e+02 + 55 57 1.124657e+02 + 55 58 9.725783e+01 + 55 59 -6.782280e+01 + 55 60 -1.631181e+01 + 55 61 4.004375e+01 + 55 62 1.974588e+01 + 55 63 -1.974588e+01 + 55 64 9.725783e+01 + 55 65 1.631181e+01 + 55 66 6.782280e+01 + 56 13 1.631181e+01 + 56 14 9.725783e+01 + 56 15 -6.782280e+01 + 56 16 1.974588e+01 + 56 17 4.004375e+01 + 56 18 1.974588e+01 + 56 19 6.782280e+01 + 56 20 -1.233504e+02 + 56 21 6.782280e+01 + 56 22 1.124657e+02 + 56 23 -1.196403e+02 + 56 24 -1.974588e+01 + 56 55 -1.124657e+02 + 56 56 3.473316e+02 + 56 57 -1.124657e+02 + 56 58 -6.782280e+01 + 56 59 9.725783e+01 + 56 60 1.631181e+01 + 56 61 -1.974588e+01 + 56 62 -1.196403e+02 + 56 63 1.124657e+02 + 56 64 -1.631181e+01 + 56 65 -1.036350e+02 + 56 66 -1.631181e+01 + 57 13 -1.631181e+01 + 57 14 -6.782280e+01 + 57 15 9.725783e+01 + 57 16 -1.124657e+02 + 57 17 -1.974588e+01 + 57 18 -1.196403e+02 + 57 19 -6.782280e+01 + 57 20 6.782280e+01 + 57 21 -1.233504e+02 + 57 22 -1.974588e+01 + 57 23 1.974588e+01 + 57 24 4.004375e+01 + 57 55 1.124657e+02 + 57 56 -1.124657e+02 + 57 57 3.473316e+02 + 57 58 1.631181e+01 + 57 59 -1.631181e+01 + 57 60 -1.036350e+02 + 57 61 1.974588e+01 + 57 62 1.124657e+02 + 57 63 -1.196403e+02 + 57 64 6.782280e+01 + 57 65 1.631181e+01 + 57 66 9.725783e+01 + 58 13 -1.196403e+02 + 58 14 -1.974588e+01 + 58 15 1.124657e+02 + 58 16 -2.072700e+02 + 58 17 -3.262363e+01 + 58 18 0.000000e+00 + 58 19 -2.392806e+02 + 58 20 2.249313e+02 + 58 21 -3.552714e-15 + 58 22 -1.233504e+02 + 58 23 6.782280e+01 + 58 24 6.782280e+01 + 58 31 -1.196403e+02 + 58 32 -1.974588e+01 + 58 33 -1.124657e+02 + 58 34 -1.233504e+02 + 58 35 6.782280e+01 + 58 36 -6.782280e+01 + 58 55 9.725783e+01 + 58 56 -6.782280e+01 + 58 57 1.631181e+01 + 58 58 6.946632e+02 + 58 59 -2.249313e+02 + 58 60 0.000000e+00 + 58 61 1.945157e+02 + 58 62 3.262363e+01 + 58 63 0.000000e+00 + 58 64 4.004375e+01 + 58 65 1.974588e+01 + 58 66 1.974588e+01 + 58 67 9.725783e+01 + 58 68 -6.782280e+01 + 58 69 -1.631181e+01 + 58 70 4.004375e+01 + 58 71 1.974588e+01 + 58 72 -1.974588e+01 + 59 13 1.974588e+01 + 59 14 4.004375e+01 + 59 15 -1.974588e+01 + 59 16 3.262363e+01 + 59 17 1.945157e+02 + 59 18 -1.421085e-14 + 59 19 2.249313e+02 + 59 20 -2.392806e+02 + 59 21 0.000000e+00 + 59 22 6.782280e+01 + 59 23 -1.233504e+02 + 59 24 -6.782280e+01 + 59 31 1.974588e+01 + 59 32 4.004375e+01 + 59 33 1.974588e+01 + 59 34 6.782280e+01 + 59 35 -1.233504e+02 + 59 36 6.782280e+01 + 59 55 -6.782280e+01 + 59 56 9.725783e+01 + 59 57 -1.631181e+01 + 59 58 -2.249313e+02 + 59 59 6.946632e+02 + 59 60 0.000000e+00 + 59 61 -3.262363e+01 + 59 62 -2.072700e+02 + 59 63 3.552714e-15 + 59 64 -1.974588e+01 + 59 65 -1.196403e+02 + 59 66 -1.124657e+02 + 59 67 -6.782280e+01 + 59 68 9.725783e+01 + 59 69 1.631181e+01 + 59 70 -1.974588e+01 + 59 71 -1.196403e+02 + 59 72 1.124657e+02 + 60 13 1.124657e+02 + 60 14 1.974588e+01 + 60 15 -1.196403e+02 + 60 16 3.552714e-15 + 60 17 -1.421085e-14 + 60 18 1.945157e+02 + 60 19 -3.552714e-15 + 60 20 3.552714e-15 + 60 21 8.008751e+01 + 60 22 6.782280e+01 + 60 23 -6.782280e+01 + 60 24 -1.233504e+02 + 60 31 -1.124657e+02 + 60 32 -1.974588e+01 + 60 33 -1.196403e+02 + 60 34 -6.782280e+01 + 60 35 6.782280e+01 + 60 36 -1.233504e+02 + 60 55 -1.631181e+01 + 60 56 1.631181e+01 + 60 57 -1.036350e+02 + 60 58 0.000000e+00 + 60 59 0.000000e+00 + 60 60 6.946632e+02 + 60 61 0.000000e+00 + 60 62 0.000000e+00 + 60 63 1.945157e+02 + 60 64 -1.974588e+01 + 60 65 -1.124657e+02 + 60 66 -1.196403e+02 + 60 67 1.631181e+01 + 60 68 -1.631181e+01 + 60 69 -1.036350e+02 + 60 70 1.974588e+01 + 60 71 1.124657e+02 + 60 72 -1.196403e+02 + 61 13 -1.233504e+02 + 61 14 -6.782280e+01 + 61 15 6.782280e+01 + 61 16 -2.392806e+02 + 61 17 -2.249313e+02 + 61 18 0.000000e+00 + 61 19 -4.145401e+02 + 61 20 1.776357e-14 + 61 21 7.105427e-15 + 61 22 -2.392806e+02 + 61 23 7.105427e-15 + 61 24 2.249313e+02 + 61 31 -1.233504e+02 + 61 32 -6.782280e+01 + 61 33 -6.782280e+01 + 61 34 -2.392806e+02 + 61 35 3.552714e-15 + 61 36 -2.249313e+02 + 61 43 -2.392806e+02 + 61 44 2.249313e+02 + 61 45 -3.552714e-15 + 61 46 -1.233504e+02 + 61 47 6.782280e+01 + 61 48 6.782280e+01 + 61 52 -1.233504e+02 + 61 53 6.782280e+01 + 61 54 -6.782280e+01 + 61 55 4.004375e+01 + 61 56 -1.974588e+01 + 61 57 1.974588e+01 + 61 58 1.945157e+02 + 61 59 -3.262363e+01 + 61 60 0.000000e+00 + 61 61 1.389326e+03 + 61 62 0.000000e+00 + 61 63 0.000000e+00 + 61 64 1.945157e+02 + 61 65 0.000000e+00 + 61 66 3.262363e+01 + 61 67 4.004375e+01 + 61 68 -1.974588e+01 + 61 69 -1.974588e+01 + 61 70 1.945157e+02 + 61 71 -1.421085e-14 + 61 72 -3.262363e+01 + 61 73 1.945157e+02 + 61 74 3.262363e+01 + 61 75 0.000000e+00 + 61 76 4.004375e+01 + 61 77 1.974588e+01 + 61 78 1.974588e+01 + 61 79 4.004375e+01 + 61 80 1.974588e+01 + 61 81 -1.974588e+01 + 62 13 -6.782280e+01 + 62 14 -1.233504e+02 + 62 15 6.782280e+01 + 62 16 -2.249313e+02 + 62 17 -2.392806e+02 + 62 18 3.552714e-15 + 62 19 0.000000e+00 + 62 20 3.890313e+02 + 62 21 -1.421085e-14 + 62 22 3.552714e-15 + 62 23 8.008751e+01 + 62 24 3.552714e-15 + 62 31 -6.782280e+01 + 62 32 -1.233504e+02 + 62 33 -6.782280e+01 + 62 34 3.552714e-15 + 62 35 8.008751e+01 + 62 36 -3.552714e-15 + 62 43 2.249313e+02 + 62 44 -2.392806e+02 + 62 45 0.000000e+00 + 62 46 6.782280e+01 + 62 47 -1.233504e+02 + 62 48 -6.782280e+01 + 62 52 6.782280e+01 + 62 53 -1.233504e+02 + 62 54 6.782280e+01 + 62 55 1.974588e+01 + 62 56 -1.196403e+02 + 62 57 1.124657e+02 + 62 58 3.262363e+01 + 62 59 -2.072700e+02 + 62 60 0.000000e+00 + 62 61 0.000000e+00 + 62 62 1.389326e+03 + 62 63 0.000000e+00 + 62 64 0.000000e+00 + 62 65 1.945157e+02 + 62 66 7.105427e-15 + 62 67 1.974588e+01 + 62 68 -1.196403e+02 + 62 69 -1.124657e+02 + 62 70 0.000000e+00 + 62 71 1.945157e+02 + 62 72 1.065814e-14 + 62 73 -3.262363e+01 + 62 74 -2.072700e+02 + 62 75 3.552714e-15 + 62 76 -1.974588e+01 + 62 77 -1.196403e+02 + 62 78 -1.124657e+02 + 62 79 -1.974588e+01 + 62 80 -1.196403e+02 + 62 81 1.124657e+02 + 63 13 6.782280e+01 + 63 14 6.782280e+01 + 63 15 -1.233504e+02 + 63 16 0.000000e+00 + 63 17 0.000000e+00 + 63 18 8.008751e+01 + 63 19 0.000000e+00 + 63 20 0.000000e+00 + 63 21 3.890313e+02 + 63 22 2.249313e+02 + 63 23 0.000000e+00 + 63 24 -2.392806e+02 + 63 31 -6.782280e+01 + 63 32 -6.782280e+01 + 63 33 -1.233504e+02 + 63 34 -2.249313e+02 + 63 35 3.552714e-15 + 63 36 -2.392806e+02 + 63 43 0.000000e+00 + 63 44 0.000000e+00 + 63 45 8.008751e+01 + 63 46 6.782280e+01 + 63 47 -6.782280e+01 + 63 48 -1.233504e+02 + 63 52 -6.782280e+01 + 63 53 6.782280e+01 + 63 54 -1.233504e+02 + 63 55 -1.974588e+01 + 63 56 1.124657e+02 + 63 57 -1.196403e+02 + 63 58 0.000000e+00 + 63 59 3.552714e-15 + 63 60 1.945157e+02 + 63 61 0.000000e+00 + 63 62 0.000000e+00 + 63 63 1.389326e+03 + 63 64 -3.262363e+01 + 63 65 1.065814e-14 + 63 66 -2.072700e+02 + 63 67 1.974588e+01 + 63 68 -1.124657e+02 + 63 69 -1.196403e+02 + 63 70 3.262363e+01 + 63 71 7.105427e-15 + 63 72 -2.072700e+02 + 63 73 0.000000e+00 + 63 74 0.000000e+00 + 63 75 1.945157e+02 + 63 76 -1.974588e+01 + 63 77 -1.124657e+02 + 63 78 -1.196403e+02 + 63 79 1.974588e+01 + 63 80 1.124657e+02 + 63 81 -1.196403e+02 + 64 13 -1.196403e+02 + 64 14 -1.124657e+02 + 64 15 1.974588e+01 + 64 16 -1.233504e+02 + 64 17 -6.782280e+01 + 64 18 -6.782280e+01 + 64 19 -2.392806e+02 + 64 20 3.552714e-15 + 64 21 -2.249313e+02 + 64 22 -2.072700e+02 + 64 23 1.776357e-14 + 64 24 3.262363e+01 + 64 43 -1.233504e+02 + 64 44 6.782280e+01 + 64 45 -6.782280e+01 + 64 46 -1.196403e+02 + 64 47 1.124657e+02 + 64 48 1.974588e+01 + 64 55 9.725783e+01 + 64 56 -1.631181e+01 + 64 57 6.782280e+01 + 64 58 4.004375e+01 + 64 59 -1.974588e+01 + 64 60 -1.974588e+01 + 64 61 1.945157e+02 + 64 62 0.000000e+00 + 64 63 -3.262363e+01 + 64 64 6.946632e+02 + 64 65 0.000000e+00 + 64 66 2.249313e+02 + 64 73 4.004375e+01 + 64 74 1.974588e+01 + 64 75 -1.974588e+01 + 64 76 9.725783e+01 + 64 77 1.631181e+01 + 64 78 6.782280e+01 + 65 13 -1.124657e+02 + 65 14 -1.196403e+02 + 65 15 1.974588e+01 + 65 16 -6.782280e+01 + 65 17 -1.233504e+02 + 65 18 -6.782280e+01 + 65 19 7.105427e-15 + 65 20 8.008751e+01 + 65 21 -3.552714e-15 + 65 22 -3.552714e-15 + 65 23 1.945157e+02 + 65 24 0.000000e+00 + 65 43 6.782280e+01 + 65 44 -1.233504e+02 + 65 45 6.782280e+01 + 65 46 1.124657e+02 + 65 47 -1.196403e+02 + 65 48 -1.974588e+01 + 65 55 1.631181e+01 + 65 56 -1.036350e+02 + 65 57 1.631181e+01 + 65 58 1.974588e+01 + 65 59 -1.196403e+02 + 65 60 -1.124657e+02 + 65 61 0.000000e+00 + 65 62 1.945157e+02 + 65 63 1.065814e-14 + 65 64 0.000000e+00 + 65 65 6.946632e+02 + 65 66 0.000000e+00 + 65 73 -1.974588e+01 + 65 74 -1.196403e+02 + 65 75 1.124657e+02 + 65 76 -1.631181e+01 + 65 77 -1.036350e+02 + 65 78 -1.631181e+01 + 66 13 -1.974588e+01 + 66 14 -1.974588e+01 + 66 15 4.004375e+01 + 66 16 -6.782280e+01 + 66 17 -6.782280e+01 + 66 18 -1.233504e+02 + 66 19 -2.249313e+02 + 66 20 7.105427e-15 + 66 21 -2.392806e+02 + 66 22 -3.262363e+01 + 66 23 0.000000e+00 + 66 24 1.945157e+02 + 66 43 -6.782280e+01 + 66 44 6.782280e+01 + 66 45 -1.233504e+02 + 66 46 -1.974588e+01 + 66 47 1.974588e+01 + 66 48 4.004375e+01 + 66 55 6.782280e+01 + 66 56 -1.631181e+01 + 66 57 9.725783e+01 + 66 58 1.974588e+01 + 66 59 -1.124657e+02 + 66 60 -1.196403e+02 + 66 61 3.262363e+01 + 66 62 7.105427e-15 + 66 63 -2.072700e+02 + 66 64 2.249313e+02 + 66 65 0.000000e+00 + 66 66 6.946632e+02 + 66 73 1.974588e+01 + 66 74 1.124657e+02 + 66 75 -1.196403e+02 + 66 76 6.782280e+01 + 66 77 1.631181e+01 + 66 78 9.725783e+01 + 67 16 -1.196403e+02 + 67 17 -1.974588e+01 + 67 18 1.124657e+02 + 67 19 -1.233504e+02 + 67 20 6.782280e+01 + 67 21 6.782280e+01 + 67 31 -1.036350e+02 + 67 32 -1.631181e+01 + 67 33 -1.631181e+01 + 67 34 -1.196403e+02 + 67 35 1.124657e+02 + 67 36 -1.974588e+01 + 67 58 9.725783e+01 + 67 59 -6.782280e+01 + 67 60 1.631181e+01 + 67 61 4.004375e+01 + 67 62 1.974588e+01 + 67 63 1.974588e+01 + 67 67 3.473316e+02 + 67 68 -1.124657e+02 + 67 69 -1.124657e+02 + 67 70 9.725783e+01 + 67 71 1.631181e+01 + 67 72 -6.782280e+01 + 68 16 1.974588e+01 + 68 17 4.004375e+01 + 68 18 -1.974588e+01 + 68 19 6.782280e+01 + 68 20 -1.233504e+02 + 68 21 -6.782280e+01 + 68 31 1.631181e+01 + 68 32 9.725783e+01 + 68 33 6.782280e+01 + 68 34 1.124657e+02 + 68 35 -1.196403e+02 + 68 36 1.974588e+01 + 68 58 -6.782280e+01 + 68 59 9.725783e+01 + 68 60 -1.631181e+01 + 68 61 -1.974588e+01 + 68 62 -1.196403e+02 + 68 63 -1.124657e+02 + 68 67 -1.124657e+02 + 68 68 3.473316e+02 + 68 69 1.124657e+02 + 68 70 -1.631181e+01 + 68 71 -1.036350e+02 + 68 72 1.631181e+01 + 69 16 1.124657e+02 + 69 17 1.974588e+01 + 69 18 -1.196403e+02 + 69 19 6.782280e+01 + 69 20 -6.782280e+01 + 69 21 -1.233504e+02 + 69 31 1.631181e+01 + 69 32 6.782280e+01 + 69 33 9.725783e+01 + 69 34 1.974588e+01 + 69 35 -1.974588e+01 + 69 36 4.004375e+01 + 69 58 -1.631181e+01 + 69 59 1.631181e+01 + 69 60 -1.036350e+02 + 69 61 -1.974588e+01 + 69 62 -1.124657e+02 + 69 63 -1.196403e+02 + 69 67 -1.124657e+02 + 69 68 1.124657e+02 + 69 69 3.473316e+02 + 69 70 -6.782280e+01 + 69 71 -1.631181e+01 + 69 72 9.725783e+01 + 70 16 -1.233504e+02 + 70 17 -6.782280e+01 + 70 18 6.782280e+01 + 70 19 -2.392806e+02 + 70 20 3.552714e-15 + 70 21 2.249313e+02 + 70 31 -1.196403e+02 + 70 32 -1.124657e+02 + 70 33 -1.974588e+01 + 70 34 -2.072700e+02 + 70 35 3.552714e-15 + 70 36 -3.262363e+01 + 70 43 -1.233504e+02 + 70 44 6.782280e+01 + 70 45 6.782280e+01 + 70 52 -1.196403e+02 + 70 53 1.124657e+02 + 70 54 -1.974588e+01 + 70 58 4.004375e+01 + 70 59 -1.974588e+01 + 70 60 1.974588e+01 + 70 61 1.945157e+02 + 70 62 0.000000e+00 + 70 63 3.262363e+01 + 70 67 9.725783e+01 + 70 68 -1.631181e+01 + 70 69 -6.782280e+01 + 70 70 6.946632e+02 + 70 71 -1.421085e-14 + 70 72 -2.249313e+02 + 70 73 4.004375e+01 + 70 74 1.974588e+01 + 70 75 1.974588e+01 + 70 79 9.725783e+01 + 70 80 1.631181e+01 + 70 81 -6.782280e+01 + 71 16 -6.782280e+01 + 71 17 -1.233504e+02 + 71 18 6.782280e+01 + 71 19 0.000000e+00 + 71 20 8.008751e+01 + 71 21 3.552714e-15 + 71 31 -1.124657e+02 + 71 32 -1.196403e+02 + 71 33 -1.974588e+01 + 71 34 3.552714e-15 + 71 35 1.945157e+02 + 71 36 -1.421085e-14 + 71 43 6.782280e+01 + 71 44 -1.233504e+02 + 71 45 -6.782280e+01 + 71 52 1.124657e+02 + 71 53 -1.196403e+02 + 71 54 1.974588e+01 + 71 58 1.974588e+01 + 71 59 -1.196403e+02 + 71 60 1.124657e+02 + 71 61 -1.421085e-14 + 71 62 1.945157e+02 + 71 63 7.105427e-15 + 71 67 1.631181e+01 + 71 68 -1.036350e+02 + 71 69 -1.631181e+01 + 71 70 -1.421085e-14 + 71 71 6.946632e+02 + 71 72 0.000000e+00 + 71 73 -1.974588e+01 + 71 74 -1.196403e+02 + 71 75 -1.124657e+02 + 71 79 -1.631181e+01 + 71 80 -1.036350e+02 + 71 81 1.631181e+01 + 72 16 6.782280e+01 + 72 17 6.782280e+01 + 72 18 -1.233504e+02 + 72 19 2.249313e+02 + 72 20 0.000000e+00 + 72 21 -2.392806e+02 + 72 31 1.974588e+01 + 72 32 1.974588e+01 + 72 33 4.004375e+01 + 72 34 3.262363e+01 + 72 35 0.000000e+00 + 72 36 1.945157e+02 + 72 43 6.782280e+01 + 72 44 -6.782280e+01 + 72 45 -1.233504e+02 + 72 52 1.974588e+01 + 72 53 -1.974588e+01 + 72 54 4.004375e+01 + 72 58 -1.974588e+01 + 72 59 1.124657e+02 + 72 60 -1.196403e+02 + 72 61 -3.262363e+01 + 72 62 1.065814e-14 + 72 63 -2.072700e+02 + 72 67 -6.782280e+01 + 72 68 1.631181e+01 + 72 69 9.725783e+01 + 72 70 -2.249313e+02 + 72 71 0.000000e+00 + 72 72 6.946632e+02 + 72 73 -1.974588e+01 + 72 74 -1.124657e+02 + 72 75 -1.196403e+02 + 72 79 -6.782280e+01 + 72 80 -1.631181e+01 + 72 81 9.725783e+01 + 73 19 -2.392806e+02 + 73 20 -2.249313e+02 + 73 21 0.000000e+00 + 73 22 -1.233504e+02 + 73 23 -6.782280e+01 + 73 24 6.782280e+01 + 73 34 -1.233504e+02 + 73 35 -6.782280e+01 + 73 36 -6.782280e+01 + 73 43 -2.072700e+02 + 73 44 3.262363e+01 + 73 45 7.105427e-15 + 73 46 -1.196403e+02 + 73 47 1.974588e+01 + 73 48 1.124657e+02 + 73 52 -1.196403e+02 + 73 53 1.974588e+01 + 73 54 -1.124657e+02 + 73 61 1.945157e+02 + 73 62 -3.262363e+01 + 73 63 0.000000e+00 + 73 64 4.004375e+01 + 73 65 -1.974588e+01 + 73 66 1.974588e+01 + 73 70 4.004375e+01 + 73 71 -1.974588e+01 + 73 72 -1.974588e+01 + 73 73 6.946632e+02 + 73 74 2.249313e+02 + 73 75 0.000000e+00 + 73 76 9.725783e+01 + 73 77 6.782280e+01 + 73 78 1.631181e+01 + 73 79 9.725783e+01 + 73 80 6.782280e+01 + 73 81 -1.631181e+01 + 74 19 -2.249313e+02 + 74 20 -2.392806e+02 + 74 21 3.552714e-15 + 74 22 -6.782280e+01 + 74 23 -1.233504e+02 + 74 24 6.782280e+01 + 74 34 -6.782280e+01 + 74 35 -1.233504e+02 + 74 36 -6.782280e+01 + 74 43 -3.262363e+01 + 74 44 1.945157e+02 + 74 45 0.000000e+00 + 74 46 -1.974588e+01 + 74 47 4.004375e+01 + 74 48 1.974588e+01 + 74 52 -1.974588e+01 + 74 53 4.004375e+01 + 74 54 -1.974588e+01 + 74 61 3.262363e+01 + 74 62 -2.072700e+02 + 74 63 0.000000e+00 + 74 64 1.974588e+01 + 74 65 -1.196403e+02 + 74 66 1.124657e+02 + 74 70 1.974588e+01 + 74 71 -1.196403e+02 + 74 72 -1.124657e+02 + 74 73 2.249313e+02 + 74 74 6.946632e+02 + 74 75 0.000000e+00 + 74 76 6.782280e+01 + 74 77 9.725783e+01 + 74 78 1.631181e+01 + 74 79 6.782280e+01 + 74 80 9.725783e+01 + 74 81 -1.631181e+01 + 75 19 0.000000e+00 + 75 20 3.552714e-15 + 75 21 8.008751e+01 + 75 22 6.782280e+01 + 75 23 6.782280e+01 + 75 24 -1.233504e+02 + 75 34 -6.782280e+01 + 75 35 -6.782280e+01 + 75 36 -1.233504e+02 + 75 43 3.552714e-15 + 75 44 1.421085e-14 + 75 45 1.945157e+02 + 75 46 1.124657e+02 + 75 47 -1.974588e+01 + 75 48 -1.196403e+02 + 75 52 -1.124657e+02 + 75 53 1.974588e+01 + 75 54 -1.196403e+02 + 75 61 0.000000e+00 + 75 62 3.552714e-15 + 75 63 1.945157e+02 + 75 64 -1.974588e+01 + 75 65 1.124657e+02 + 75 66 -1.196403e+02 + 75 70 1.974588e+01 + 75 71 -1.124657e+02 + 75 72 -1.196403e+02 + 75 73 0.000000e+00 + 75 74 0.000000e+00 + 75 75 6.946632e+02 + 75 76 -1.631181e+01 + 75 77 -1.631181e+01 + 75 78 -1.036350e+02 + 75 79 1.631181e+01 + 75 80 1.631181e+01 + 75 81 -1.036350e+02 + 76 19 -1.233504e+02 + 76 20 -6.782280e+01 + 76 21 -6.782280e+01 + 76 22 -1.196403e+02 + 76 23 -1.124657e+02 + 76 24 1.974588e+01 + 76 43 -1.196403e+02 + 76 44 1.974588e+01 + 76 45 -1.124657e+02 + 76 46 -1.036350e+02 + 76 47 1.631181e+01 + 76 48 1.631181e+01 + 76 61 4.004375e+01 + 76 62 -1.974588e+01 + 76 63 -1.974588e+01 + 76 64 9.725783e+01 + 76 65 -1.631181e+01 + 76 66 6.782280e+01 + 76 73 9.725783e+01 + 76 74 6.782280e+01 + 76 75 -1.631181e+01 + 76 76 3.473316e+02 + 76 77 1.124657e+02 + 76 78 1.124657e+02 + 77 19 -6.782280e+01 + 77 20 -1.233504e+02 + 77 21 -6.782280e+01 + 77 22 -1.124657e+02 + 77 23 -1.196403e+02 + 77 24 1.974588e+01 + 77 43 -1.974588e+01 + 77 44 4.004375e+01 + 77 45 -1.974588e+01 + 77 46 -1.631181e+01 + 77 47 9.725783e+01 + 77 48 6.782280e+01 + 77 61 1.974588e+01 + 77 62 -1.196403e+02 + 77 63 -1.124657e+02 + 77 64 1.631181e+01 + 77 65 -1.036350e+02 + 77 66 1.631181e+01 + 77 73 6.782280e+01 + 77 74 9.725783e+01 + 77 75 -1.631181e+01 + 77 76 1.124657e+02 + 77 77 3.473316e+02 + 77 78 1.124657e+02 + 78 19 -6.782280e+01 + 78 20 -6.782280e+01 + 78 21 -1.233504e+02 + 78 22 -1.974588e+01 + 78 23 -1.974588e+01 + 78 24 4.004375e+01 + 78 43 -1.124657e+02 + 78 44 1.974588e+01 + 78 45 -1.196403e+02 + 78 46 -1.631181e+01 + 78 47 6.782280e+01 + 78 48 9.725783e+01 + 78 61 1.974588e+01 + 78 62 -1.124657e+02 + 78 63 -1.196403e+02 + 78 64 6.782280e+01 + 78 65 -1.631181e+01 + 78 66 9.725783e+01 + 78 73 1.631181e+01 + 78 74 1.631181e+01 + 78 75 -1.036350e+02 + 78 76 1.124657e+02 + 78 77 1.124657e+02 + 78 78 3.473316e+02 + 79 19 -1.233504e+02 + 79 20 -6.782280e+01 + 79 21 6.782280e+01 + 79 34 -1.196403e+02 + 79 35 -1.124657e+02 + 79 36 -1.974588e+01 + 79 43 -1.196403e+02 + 79 44 1.974588e+01 + 79 45 1.124657e+02 + 79 52 -1.036350e+02 + 79 53 1.631181e+01 + 79 54 -1.631181e+01 + 79 61 4.004375e+01 + 79 62 -1.974588e+01 + 79 63 1.974588e+01 + 79 70 9.725783e+01 + 79 71 -1.631181e+01 + 79 72 -6.782280e+01 + 79 73 9.725783e+01 + 79 74 6.782280e+01 + 79 75 1.631181e+01 + 79 79 3.473316e+02 + 79 80 1.124657e+02 + 79 81 -1.124657e+02 + 80 19 -6.782280e+01 + 80 20 -1.233504e+02 + 80 21 6.782280e+01 + 80 34 -1.124657e+02 + 80 35 -1.196403e+02 + 80 36 -1.974588e+01 + 80 43 -1.974588e+01 + 80 44 4.004375e+01 + 80 45 1.974588e+01 + 80 52 -1.631181e+01 + 80 53 9.725783e+01 + 80 54 -6.782280e+01 + 80 61 1.974588e+01 + 80 62 -1.196403e+02 + 80 63 1.124657e+02 + 80 70 1.631181e+01 + 80 71 -1.036350e+02 + 80 72 -1.631181e+01 + 80 73 6.782280e+01 + 80 74 9.725783e+01 + 80 75 1.631181e+01 + 80 79 1.124657e+02 + 80 80 3.473316e+02 + 80 81 -1.124657e+02 + 81 19 6.782280e+01 + 81 20 6.782280e+01 + 81 21 -1.233504e+02 + 81 34 1.974588e+01 + 81 35 1.974588e+01 + 81 36 4.004375e+01 + 81 43 1.124657e+02 + 81 44 -1.974588e+01 + 81 45 -1.196403e+02 + 81 52 1.631181e+01 + 81 53 -6.782280e+01 + 81 54 9.725783e+01 + 81 61 -1.974588e+01 + 81 62 1.124657e+02 + 81 63 -1.196403e+02 + 81 70 -6.782280e+01 + 81 71 1.631181e+01 + 81 72 9.725783e+01 + 81 73 -1.631181e+01 + 81 74 -1.631181e+01 + 81 75 -1.036350e+02 + 81 79 -1.124657e+02 + 81 80 -1.124657e+02 + 81 81 3.473316e+02 diff --git a/packages/shylu/shylu_node/tacho/example/weight.dat b/packages/shylu/shylu_node/tacho/example/weight.dat new file mode 100644 index 000000000000..69758a48abdf --- /dev/null +++ b/packages/shylu/shylu_node/tacho/example/weight.dat @@ -0,0 +1,29 @@ +81 +27 +3 +3 +3 +3 +3 +3 +3 +3 +3 +3 +3 +3 +3 +3 +3 +3 +3 +3 +3 +3 +3 +3 +3 +3 +3 +3 +3 diff --git a/packages/shylu/shylu_node/tacho/src/CMakeLists.txt b/packages/shylu/shylu_node/tacho/src/CMakeLists.txt index b93d975cd7c9..66c9de9fb03b 100644 --- a/packages/shylu/shylu_node/tacho/src/CMakeLists.txt +++ b/packages/shylu/shylu_node/tacho/src/CMakeLists.txt @@ -43,6 +43,8 @@ APPEND_SET(SOURCES impl/Tacho_Util.cpp impl/Tacho_Blas_External.cpp impl/Tacho_Lapack_External.cpp + impl/Tacho_GraphTools_Metis.cpp + impl/Tacho_SymbolicTools.cpp eti/Tacho_Solver_ETI_ChseLevTaskScheduler_complex_double_Cuda.cpp eti/Tacho_Solver_ETI_ChseLevTaskScheduler_complex_double_OpenMP.cpp eti/Tacho_Solver_ETI_ChseLevTaskScheduler_complex_double_Serial.cpp diff --git a/packages/shylu/shylu_node/tacho/src/Tacho_CuSolver.hpp b/packages/shylu/shylu_node/tacho/src/Tacho_CuSolver.hpp index d3771a4b9ec1..ff3d79ad7290 100644 --- a/packages/shylu/shylu_node/tacho/src/Tacho_CuSolver.hpp +++ b/packages/shylu/shylu_node/tacho/src/Tacho_CuSolver.hpp @@ -172,8 +172,8 @@ namespace Tacho { printf(" total time spent: %10.6f s\n", (t_alloc+t_factor)); printf("\n"); printf(" Workspace\n"); - printf(" internal data in MB: %10.2f MB\n", double(internalDataInBytes)/1.e6); - printf(" workspace in MB: %10.2f MB\n", double(workspaceInBytes)/1.e6); + printf(" internal data in MB: %10.3f MB\n", double(internalDataInBytes)/1.e6); + printf(" workspace in MB: %10.3f MB\n", double(workspaceInBytes)/1.e6); printf("\n"); } diff --git a/packages/shylu/shylu_node/tacho/src/Tacho_CuSparseTriSolve.hpp b/packages/shylu/shylu_node/tacho/src/Tacho_CuSparseTriSolve.hpp index 28bfc10afe6c..1191783fe1a9 100644 --- a/packages/shylu/shylu_node/tacho/src/Tacho_CuSparseTriSolve.hpp +++ b/packages/shylu/shylu_node/tacho/src/Tacho_CuSparseTriSolve.hpp @@ -222,9 +222,9 @@ namespace Tacho { printf(" time for analysis: %10.6f s\n", t_analyze); printf(" total time spent: %10.6f s\n", (t_copy+t_analyze)); printf(" Workspace\n"); - printf(" upper solve workspace in MB: %10.2f MB\n", double(bufSizeInBytes.second)/1.e6); - printf(" lower solve workspace in MB: %10.2f MB\n", double(bufSizeInBytes.first)/1.e6); - printf(" max workspace in MB: %10.2f MB\n", double(maxBufSizeInBytes)/1.e6); + printf(" upper solve workspace in MB: %10.3f MB\n", double(bufSizeInBytes.second)/1.e6); + printf(" lower solve workspace in MB: %10.3f MB\n", double(bufSizeInBytes.first)/1.e6); + printf(" max workspace in MB: %10.3f MB\n", double(maxBufSizeInBytes)/1.e6); printf("\n"); } diff --git a/packages/shylu/shylu_node/tacho/src/Tacho_Solver.hpp b/packages/shylu/shylu_node/tacho/src/Tacho_Solver.hpp index 27f4bb373e3d..9c09be055f18 100644 --- a/packages/shylu/shylu_node/tacho/src/Tacho_Solver.hpp +++ b/packages/shylu/shylu_node/tacho/src/Tacho_Solver.hpp @@ -16,8 +16,9 @@ namespace Tacho { class Graph; #if defined(TACHO_HAVE_METIS) class GraphTools_Metis; +#else + class GraphTools; #endif - class GraphTools_CAMD; class SymbolicTools; template class CrsMatrixBase; @@ -58,13 +59,14 @@ namespace Tacho { #if defined(TACHO_HAVE_METIS) typedef GraphTools_Metis graph_tools_type; #else - typedef GraphTools_CAMD graph_tools_type; + typedef GraphTools graph_tools_type; #endif typedef SymbolicTools symbolic_tools_type; typedef NumericTools numeric_tools_type; typedef LevelSetTools levelset_tools_var0_type; typedef LevelSetTools levelset_tools_var1_type; + typedef LevelSetTools levelset_tools_var2_type; public: enum : int { Cholesky = 1, @@ -86,6 +88,17 @@ namespace Tacho { ordinal_type_array _perm; ordinal_type_array_host _h_perm; ordinal_type_array _peri; ordinal_type_array_host _h_peri; + // ** condensed graph + ordinal_type _m_graph; + size_type _nnz_graph; + + size_type_array_host _h_ap_graph; + ordinal_type_array_host _h_aj_graph; + ordinal_type_array_host _h_aw_graph; + + ordinal_type_array_host _h_perm_graph; + ordinal_type_array_host _h_peri_graph; + // ** symbolic factorization output // supernodes output ordinal_type _nsupernodes; @@ -115,6 +128,7 @@ namespace Tacho { // ** level set interface levelset_tools_var0_type *_L0; levelset_tools_var1_type *_L1; + levelset_tools_var2_type *_L2; // small dense matrix value_type_matrix_host _U; @@ -185,11 +199,8 @@ namespace Tacho { // internal only int analyze(); - int analyze(const ordinal_type m, - const size_type_array_host &ap, - const ordinal_type_array_host &aj, - const ordinal_type_array_host &perm, - const ordinal_type_array_host &peri); + int analyze_linear_system(); + int analyze_condensed_graph(); template @@ -204,11 +215,92 @@ namespace Tacho { _h_ap = Kokkos::create_mirror_view(host_memory_space(), ap); Kokkos::deep_copy(_h_ap, ap); _h_aj = Kokkos::create_mirror_view(host_memory_space(), aj); Kokkos::deep_copy(_h_aj, aj); + _h_perm = ordinal_type_array_host(); + _h_peri = ordinal_type_array_host(); + _nnz = _h_ap(m); + + _m_graph = 0; + _nnz_graph = 0; + + _h_ap_graph = size_type_array_host(); + _h_aj_graph = ordinal_type_array_host(); + + _h_perm_graph = ordinal_type_array_host(); + _h_peri_graph = ordinal_type_array_host(); return analyze(); } + template + int analyze(const ordinal_type m, + const arg_size_type_array &ap, + const arg_ordinal_type_array &aj, + const arg_perm_type_array &perm, + const arg_perm_type_array &peri) { + _m = m; + + _ap = Kokkos::create_mirror_view(exec_memory_space(), ap); Kokkos::deep_copy(_ap, ap); + _aj = Kokkos::create_mirror_view(exec_memory_space(), aj); Kokkos::deep_copy(_aj, aj); + + _h_ap = Kokkos::create_mirror_view(host_memory_space(), ap); Kokkos::deep_copy(_h_ap, ap); + _h_aj = Kokkos::create_mirror_view(host_memory_space(), aj); Kokkos::deep_copy(_h_aj, aj); + + _h_perm = Kokkos::create_mirror_view(host_memory_space(), perm); Kokkos::deep_copy(_h_perm, perm); + _h_peri = Kokkos::create_mirror_view(host_memory_space(), peri); Kokkos::deep_copy(_h_peri, peri); + + _nnz = _h_ap(m); + + _m_graph = 0; + _nnz_graph = 0; + + _h_ap_graph = size_type_array_host(); + _h_aj_graph = ordinal_type_array_host(); + + _h_perm_graph = ordinal_type_array_host(); + _h_peri_graph = ordinal_type_array_host(); + + return analyze(); + } + + + template + int analyze(const ordinal_type m, + const arg_size_type_array &ap, + const arg_ordinal_type_array &aj, + const ordinal_type m_graph, + const arg_size_type_array &ap_graph, + const arg_ordinal_type_array &aj_graph, + const arg_ordinal_type_array &aw_graph) { + _m = m; + + _ap = Kokkos::create_mirror_view(exec_memory_space(), ap); Kokkos::deep_copy(_ap, ap); + _aj = Kokkos::create_mirror_view(exec_memory_space(), aj); Kokkos::deep_copy(_aj, aj); + + _h_ap = Kokkos::create_mirror_view(host_memory_space(), ap); Kokkos::deep_copy(_h_ap, ap); + _h_aj = Kokkos::create_mirror_view(host_memory_space(), aj); Kokkos::deep_copy(_h_aj, aj); + + _h_perm = ordinal_type_array_host(); + _h_peri = ordinal_type_array_host(); + + _nnz = _h_ap(m); + + _m_graph = m_graph; + _h_ap_graph = Kokkos::create_mirror_view(host_memory_space(), ap_graph); Kokkos::deep_copy(_h_ap_graph, ap_graph); + _h_aj_graph = Kokkos::create_mirror_view(host_memory_space(), aj_graph); Kokkos::deep_copy(_h_aj_graph, aj_graph); + _h_aw_graph = Kokkos::create_mirror_view(host_memory_space(), aw_graph); Kokkos::deep_copy(_h_aw_graph, aw_graph); + + _h_perm_graph = ordinal_type_array_host(); + _h_peri_graph = ordinal_type_array_host(); + + _nnz_graph = _h_ap_graph(m_graph); + + return analyze(); + } + int initialize(); int factorize(const value_type_array &ax); int solve(const value_type_matrix &x, diff --git a/packages/shylu/shylu_node/tacho/src/impl/Tacho_Blas_Team.hpp b/packages/shylu/shylu_node/tacho/src/impl/Tacho_Blas_Team.hpp index 8ccde7b95855..ffccf270e826 100644 --- a/packages/shylu/shylu_node/tacho/src/impl/Tacho_Blas_Team.hpp +++ b/packages/shylu/shylu_node/tacho/src/impl/Tacho_Blas_Team.hpp @@ -18,7 +18,7 @@ namespace Tacho { void set(MemberType &member, int m, const T alpha, - /* */ T *a, int as0) { + /* */ T *__restrict__ a, int as0) { Kokkos::parallel_for(Kokkos::TeamVectorRange(member,m),[&](const int &i) { a[i*as0] = alpha; }); @@ -30,7 +30,7 @@ namespace Tacho { void scale(MemberType &member, int m, const T alpha, - /* */ T *a, int as0) { + /* */ T *__restrict__ a, int as0) { Kokkos::parallel_for(Kokkos::TeamVectorRange(member,m),[&](const int &i) { a[i*as0] *= alpha; }); @@ -42,7 +42,7 @@ namespace Tacho { void set(MemberType &member, int m, int n, const T alpha, - /* */ T *a, int as0, int as1) { + /* */ T *__restrict__ a, int as0, int as1) { if (as0 == 1 || as0 < as1) Kokkos::parallel_for(Kokkos::TeamThreadRange(member,n),[&](const int &j) { Kokkos::parallel_for(Kokkos::ThreadVectorRange(member,m),[&](const int &i) { @@ -63,7 +63,7 @@ namespace Tacho { void scale(MemberType &member, int m, int n, const T alpha, - /* */ T *a, int as0, int as1) { + /* */ T *__restrict__ a, int as0, int as1) { if (as0 == 1 || as0 < as1) Kokkos::parallel_for(Kokkos::TeamThreadRange(member,n),[&](const int &j) { Kokkos::parallel_for(Kokkos::ThreadVectorRange(member,m),[&](const int &i) { @@ -84,7 +84,7 @@ namespace Tacho { void set_upper(MemberType &member, int m, int n, int offset, const T alpha, - /* */ T *a, int as0, int as1) { + /* */ T *__restrict__ a, int as0, int as1) { Kokkos::parallel_for(Kokkos::TeamThreadRange(member,n),[&](const int &j) { Kokkos::parallel_for(Kokkos::ThreadVectorRange(member,j+1-offset),[&](const int &i) { a[i*as0+j*as1] = alpha; @@ -98,7 +98,7 @@ namespace Tacho { void scale_upper(MemberType &member, int m, int n, int offset, const T alpha, - /* */ T *a, int as0, int as1) { + /* */ T *__restrict__ a, int as0, int as1) { Kokkos::parallel_for(Kokkos::TeamThreadRange(member,n),[&](const int &j) { Kokkos::parallel_for(Kokkos::ThreadVectorRange(member,j+1-offset),[&](const int &i) { a[i*as0+j*as1] *= alpha; @@ -113,7 +113,7 @@ namespace Tacho { void set_lower(MemberType &member, int m, int n, int offset, const T alpha, - /* */ T *a, int as0, int as1) { + /* */ T *__restrict__ a, int as0, int as1) { Kokkos::parallel_for(Kokkos::TeamThreadRange(member,n),[&](const int &j) { const int jj = j + offset; Kokkos::parallel_for(Kokkos::ThreadVectorRange(member,n-j-offset),[&](const int &i) { @@ -128,7 +128,7 @@ namespace Tacho { void scale_lower(MemberType &member, int m, int n, int offset, const T alpha, - /* */ T *a, int as0, int as1) { + /* */ T *__restrict__ a, int as0, int as1) { Kokkos::parallel_for(Kokkos::TeamThreadRange(member,n),[&](const int &j) { const int jj = j + offset; Kokkos::parallel_for(Kokkos::ThreadVectorRange(member,n-j-offset),[&](const int &i) { @@ -143,10 +143,10 @@ namespace Tacho { void gemv(MemberType &member, const ConjType &cj, const int m, const int n, const T alpha, - const T *A, const int as0, const int as1, - const T *x, const int xs0, + const T *__restrict__ A, const int as0, const int as1, + const T *__restrict__ x, const int xs0, const T beta, - /* */ T *y, const int ys0) { + /* */ T *__restrict__ y, const int ys0) { const T one(1), zero(0); if (beta == zero) set (member, m, zero, y, ys0); @@ -184,8 +184,8 @@ namespace Tacho { void trsv_upper(MemberType &member, const ConjType &cjA, const char diag, const int m, - const T *A, const int as0, const int as1, - /* */ T *b, const int bs0) { + const T *__restrict__ A, const int as0, const int as1, + /* */ T *__restrict__ b, const int bs0) { if (m <= 0) return; const bool use_unit_diag = diag == 'U'|| diag == 'u'; @@ -222,8 +222,8 @@ namespace Tacho { void trsv_lower(MemberType &member, const ConjType &cjA, const char diag, const int m, - const T *A, const int as0, const int as1, - /* */ T *b, const int bs0) { + const T *__restrict__ A, const int as0, const int as1, + /* */ T *__restrict__ b, const int bs0) { if (m <= 0) return; const bool use_unit_diag = diag == 'U'|| diag == 'u'; @@ -264,10 +264,10 @@ namespace Tacho { void gemm(MemberType &member, const ConjTypeA &cjA, const ConjTypeB &cjB, const int m, const int n, const int k, const T alpha, - const T *A, const int as0, const int as1, - const T *B, const int bs0, const int bs1, + const T *__restrict__ A, const int as0, const int as1, + const T *__restrict__ B, const int bs0, const int bs1, const T beta, - /* */ T *C, const int cs0, const int cs1) { + /* */ T *__restrict__ C, const int cs0, const int cs1) { const T one(1), zero(0); if (beta == zero) set (member, m, n, zero, C, cs0, cs1); @@ -300,9 +300,9 @@ namespace Tacho { void herk_upper(MemberType &member, const ConjTypeA &cjA, const ConjTypeB &cjB, const int n, const int k, const T alpha, - const T *A, const int as0, const int as1, + const T *__restrict__ A, const int as0, const int as1, const T beta, - /* */ T *C, const int cs0, const int cs1) { + /* */ T *__restrict__ C, const int cs0, const int cs1) { const T one(1), zero(0); if (beta == zero) set_upper (member, n, n, 0, zero, C, cs0, cs1); @@ -334,9 +334,9 @@ namespace Tacho { void herk_lower(MemberType &member, const ConjTypeA &cjA, const ConjTypeB &cjB, const int n, const int k, const T alpha, - const T *A, const int as0, const int as1, + const T *__restrict__ A, const int as0, const int as1, const T beta, - /* */ T *C, const int cs0, const int cs1) { + /* */ T *__restrict__ C, const int cs0, const int cs1) { const T one(1), zero(0); if (beta == zero) set_lower (member, n, n, 0, zero, C, cs0, cs1); @@ -371,8 +371,8 @@ namespace Tacho { const char diag, const int m, const int n, const T alpha, - const T *A, const int as0, const int as1, - /* */ T *B, const int bs0, const int bs1) { + const T *__restrict__ A, const int as0, const int as1, + /* */ T *__restrict__ B, const int bs0, const int bs1) { const T one(1), zero(0); if (alpha == zero) set (member, m, n, zero, B, bs0, bs1); @@ -417,8 +417,8 @@ namespace Tacho { const char diag, const int m, const int n, const T alpha, - const T *A, const int as0, const int as1, - /* */ T *B, const int bs0, const int bs1) { + const T *__restrict__ A, const int as0, const int as1, + /* */ T *__restrict__ B, const int bs0, const int bs1) { const T one(1.0), zero(0.0); // note that parallel range is different ( m*n vs m-1*n); @@ -462,10 +462,10 @@ namespace Tacho { const char trans, const int m, const int n, const T alpha, - const T *a, const int lda, - const T *x, const int xs, + const T *__restrict__ a, const int lda, + const T *__restrict__ x, const int xs, const T beta, - /* */ T *y, const int ys) { + /* */ T *__restrict__ y, const int ys) { switch (trans) { case 'N': case 'n': { @@ -515,8 +515,8 @@ namespace Tacho { void trsv(MemberType &member, const char uplo, const char trans, const char diag, const int m, - const T *a, const int lda, - /* */ T *b, const int bs) { + const T *__restrict__ a, const int lda, + /* */ T *__restrict__ b, const int bs) { if (uplo == 'U' || uplo == 'u') { switch (trans) { case 'N': @@ -591,10 +591,10 @@ namespace Tacho { const char transa, const char transb, const int m, const int n, const int k, const T alpha, - const T *a, int lda, - const T *b, int ldb, + const T *__restrict__ a, int lda, + const T *__restrict__ b, int ldb, const T beta, - /* */ T *c, int ldc) { + /* */ T *__restrict__ c, int ldc) { if (transa == 'N' || transa == 'n') { const NoConjugate cjA; @@ -735,9 +735,9 @@ namespace Tacho { const char uplo, const char trans, const int n, const int k, const T alpha, - const T *a, const int lda, + const T *__restrict__ a, const int lda, const T beta, - /* */ T *c, const int ldc) { + /* */ T *__restrict__ c, const int ldc) { if (uplo == 'U' || uplo == 'u') switch (trans) { case 'N': @@ -808,8 +808,8 @@ namespace Tacho { const char side, const char uplo, const char trans, const char diag, const int m, const int n, const T alpha, - const T *a, const int lda, - /* */ T *b, const int ldb) { + const T *__restrict__ a, const int lda, + /* */ T *__restrict__ b, const int ldb) { /// /// side left /// diff --git a/packages/shylu/shylu_node/tacho/src/impl/Tacho_Copy_Internal.hpp b/packages/shylu/shylu_node/tacho/src/impl/Tacho_Copy_Internal.hpp index ad4a39f93ec9..f4e379f41361 100644 --- a/packages/shylu/shylu_node/tacho/src/impl/Tacho_Copy_Internal.hpp +++ b/packages/shylu/shylu_node/tacho/src/impl/Tacho_Copy_Internal.hpp @@ -37,7 +37,7 @@ namespace Tacho { }); } } else { - printf("Error: abort\n"); + printf("Error: Copy A and B dimensions are not same\n"); } return 0; } diff --git a/packages/shylu/shylu_node/tacho/src/impl/Tacho_Copy_OnDevice.hpp b/packages/shylu/shylu_node/tacho/src/impl/Tacho_Copy_OnDevice.hpp index 7ce7a3f437bc..b37cc4ec9b3a 100644 --- a/packages/shylu/shylu_node/tacho/src/impl/Tacho_Copy_OnDevice.hpp +++ b/packages/shylu/shylu_node/tacho/src/impl/Tacho_Copy_OnDevice.hpp @@ -1,5 +1,5 @@ #ifndef __TACHO_COPY_ON_DEVICE_HPP__ -#define __TACHO_COPT_ON_DEVICE_HPP__ +#define __TACHO_COPY_ON_DEVICE_HPP__ /// \file Tacho_COPY_OnDevice.hpp diff --git a/packages/shylu/shylu_node/tacho/src/impl/Tacho_Graph.hpp b/packages/shylu/shylu_node/tacho/src/impl/Tacho_Graph.hpp index 521afc3aa0d4..ffa9966f5217 100644 --- a/packages/shylu/shylu_node/tacho/src/impl/Tacho_Graph.hpp +++ b/packages/shylu/shylu_node/tacho/src/impl/Tacho_Graph.hpp @@ -5,6 +5,7 @@ /// \author Kyungjoo Kim (kyukim@sandia.gov) #include "Tacho_Util.hpp" +#include "Tacho_CrsMatrixBase.hpp" namespace Tacho { diff --git a/packages/shylu/shylu_node/tacho/src/impl/Tacho_GraphTools.hpp b/packages/shylu/shylu_node/tacho/src/impl/Tacho_GraphTools.hpp new file mode 100644 index 000000000000..20401dcf7a03 --- /dev/null +++ b/packages/shylu/shylu_node/tacho/src/impl/Tacho_GraphTools.hpp @@ -0,0 +1,92 @@ +#ifndef __TACHO_GRAPH_TOOLS_HPP__ +#define __TACHO_GRAPH_TOOLS_HPP__ + +/// \file Tacho_GraphTools.hpp +/// \author Kyungjoo Kim (kyukim@sandia.gov) + +#include "Tacho_Util.hpp" +#include "Tacho_Graph.hpp" + +namespace Tacho { + + class GraphTools { + public: + typedef typename UseThisDevice::device_type host_device_type; + typedef Kokkos::View ordinal_type_array; + + private: + + ordinal_type_array _perm, _peri; + + // status flag + bool _is_ordered, _verbose; + + public: + GraphTools() = default; + GraphTools(const GraphTools &b) = default; + ~GraphTools() = default; + + /// + /// construction of scotch graph + /// + GraphTools(const Graph &g) { + _is_ordered = false; + _verbose = false; + + // input + const ordinal_type m = g.NumRows(); + + // output + _perm = ordinal_type_array(do_not_initialize_tag("PermutationArray"), m); + _peri = ordinal_type_array(do_not_initialize_tag("InvPermutationArray"), m); + } + + /// + /// setup parameters + /// + + void setVerbose(const bool verbose) { _verbose = verbose; } + + + /// + /// reorder + /// + void reorder(const ordinal_type verbose = 0) { + // do nothing + // later implement AMD + const ordinal_type m = _perm.extent(0); + for (ordinal_type i=0;i(_xadj.extent(0));++i) + _xadj(i) = g_row_ptr(i); + for (ordinal_type i=0;i(_adjncy.extent(0));++i) + _adjncy(i) = g_col_idx(i); + + METIS_SetDefaultOptions(_options); + _options[METIS_OPTION_NUMBERING] = 0; + + _perm_t = idx_t_array(do_not_initialize_tag("idx_t_perm"), _nvts); + _peri_t = idx_t_array(do_not_initialize_tag("idx_t_peri"), _nvts); + + // output + _perm = ordinal_type_array(do_not_initialize_tag("Metis::PermutationArray"), _nvts); + _peri = ordinal_type_array(do_not_initialize_tag("Metis::InvPermutationArray"), _nvts); + } + GraphTools_Metis::~GraphTools_Metis() {} + + void GraphTools_Metis::setVerbose(const bool verbose) { + _verbose = verbose; + } + void GraphTools_Metis::setOption(const int id, const idx_t value) { + _options[id] = value; + } + + /// + /// reorder by metis + /// + + void GraphTools_Metis::reorder(const ordinal_type verbose) { + Kokkos::Impl::Timer timer; + double t_metis = 0; + + int ierr = 0; + + idx_t *xadj = (idx_t*)_xadj.data(); + idx_t *adjncy = (idx_t*)_adjncy.data(); + idx_t *vwgt = (idx_t*)_vwgt.data(); + + idx_t *perm = (idx_t*)_perm_t.data(); + idx_t *peri = (idx_t*)_peri_t.data(); + + timer.reset(); + ierr = METIS_NodeND(&_nvts, xadj, adjncy, vwgt, _options, + perm, peri); + t_metis = timer.seconds(); + + for (idx_t i=0;i<_nvts;++i) { + _perm(i) = _perm_t(i); + _peri(i) = _peri_t(i); + } + + TACHO_TEST_FOR_EXCEPTION(ierr != METIS_OK, + std::runtime_error, + "Failed in METIS_NodeND"); + _is_ordered = true; + + if (verbose) { + printf("Summary: GraphTools (Metis)\n"); + printf("===========================\n"); + + switch (verbose) { + case 1: { + printf(" Time\n"); + printf(" time for reordering: %10.6f s\n", t_metis); + printf("\n"); + } + } + } + } + + typename GraphTools_Metis::ordinal_type_array GraphTools_Metis::PermVector() const { return _perm; } + typename GraphTools_Metis::ordinal_type_array GraphTools_Metis::InvPermVector() const { return _peri; } + + std::ostream& GraphTools_Metis::showMe(std::ostream &os, const bool detail) const { + std::streamsize prec = os.precision(); + os.precision(4); + os << std::scientific; + + if (_is_ordered) + os << " -- Metis Ordering -- " << std::endl + << " PERM PERI " << std::endl; + else + os << " -- Not Ordered -- " << std::endl; + + if (detail) { + const ordinal_type w = 6, m = _perm.extent(0); + for (ordinal_type i=0;i(_xadj.extent(0));++i) - _xadj(i) = g_row_ptr(i); - for (ordinal_type i=0;i(_adjncy.extent(0));++i) - _adjncy(i) = g_col_idx(i); - - METIS_SetDefaultOptions(_options); - _options[METIS_OPTION_NUMBERING] = 0; - - _perm_t = idx_t_array(do_not_initialize_tag("idx_t_perm"), _nvts); - _peri_t = idx_t_array(do_not_initialize_tag("idx_t_peri"), _nvts); - - // output - _perm = ordinal_type_array(do_not_initialize_tag("Metis::PermutationArray"), _nvts); - _peri = ordinal_type_array(do_not_initialize_tag("Metis::InvPermutationArray"), _nvts); - } - virtual~GraphTools_Metis() {} + GraphTools_Metis(const Graph &g); + virtual~GraphTools_Metis(); /// /// setup metis parameters /// - void setVerbose(const bool verbose) { _verbose = verbose; } - void setOption(const int id, const idx_t value) { - _options[id] = value; - } + void setVerbose(const bool verbose); + void setOption(const int id, const idx_t value); /// /// reorder by metis /// - void reorder(const ordinal_type verbose = 0) { - Kokkos::Impl::Timer timer; - double t_metis = 0; + void reorder(const ordinal_type verbose = 0); - int ierr = 0; - - idx_t *xadj = (idx_t*)_xadj.data(); - idx_t *adjncy = (idx_t*)_adjncy.data(); - idx_t *vwgt = (idx_t*)_vwgt.data(); - - idx_t *perm = (idx_t*)_perm_t.data(); - idx_t *peri = (idx_t*)_peri_t.data(); - - timer.reset(); - ierr = METIS_NodeND(&_nvts, xadj, adjncy, vwgt, _options, - perm, peri); - t_metis = timer.seconds(); - - for (idx_t i=0;i<_nvts;++i) { - _perm(i) = _perm_t(i); - _peri(i) = _peri_t(i); - } - - TACHO_TEST_FOR_EXCEPTION(ierr != METIS_OK, - std::runtime_error, - "Failed in METIS_NodeND"); - _is_ordered = true; - - if (verbose) { - printf("Summary: GraphTools (Metis)\n"); - printf("===========================\n"); - - switch (verbose) { - case 1: { - printf(" Time\n"); - printf(" time for reordering: %10.6f s\n", t_metis); - printf("\n"); - } - } - } - - } - - ordinal_type_array PermVector() const { return _perm; } - ordinal_type_array InvPermVector() const { return _peri; } + ordinal_type_array PermVector() const; + ordinal_type_array InvPermVector() const; - std::ostream& showMe(std::ostream &os, const bool detail = false) const { - std::streamsize prec = os.precision(); - os.precision(4); - os << std::scientific; - - if (_is_ordered) - os << " -- Metis Ordering -- " << std::endl - << " PERM PERI " << std::endl; - else - os << " -- Not Ordered -- " << std::endl; - - if (detail) { - const ordinal_type w = 6, m = _perm.extent(0); - for (ordinal_type i=0;i::Chol(m); if (variant == 1) { flop += DenseFlopCount::Trsm(true, m, m); + } + else if (variant == 2) { + flop += DenseFlopCount::Trsm(true, m, m); + flop += DenseFlopCount::Trsm(true, m, n); } flop += DenseFlopCount::Trsm(true, m, n); flop += DenseFlopCount::Syrk(m, n); } - + const double kilo(1024); printf(" Time\n"); printf(" time for extra work e.g.,workspace allocation: %10.6f s\n", stat.t_extra); printf(" time for copying A into U: %10.6f s\n", stat.t_copy); @@ -278,29 +283,30 @@ namespace Tacho { printf(" total time spent: %10.6f s\n", (stat.t_extra+stat.t_copy+stat.t_factor)); printf("\n"); printf(" Memory\n"); - printf(" memory used in factorization: %10.2f MB\n", stat.m_used/1024/1024); - printf(" peak memory used in factorization: %10.2f MB\n", stat.m_peak/1024/1024); + printf(" memory used in factorization: %10.3f MB\n", stat.m_used/kilo/kilo); + printf(" peak memory used in factorization: %10.3f MB\n", stat.m_peak/kilo/kilo); printf("\n"); printf(" Kernels\n"); printf(" # of kernels launching: %6d\n", stat.n_kernel_launching); printf("\n"); printf(" FLOPs\n"); - printf(" gflop for numeric factorization: %10.2f GFLOP\n", flop/1024/1024/1024); - printf(" gflop/s for numeric factorization: %10.2f GFLOP/s\n", flop/stat.t_factor/1024/1024/1024); + printf(" gflop for numeric factorization: %10.3f GFLOP\n", flop/kilo/kilo/kilo); + printf(" gflop/s for numeric factorization: %10.3f GFLOP/s\n", flop/stat.t_factor/kilo/kilo/kilo); printf("\n"); } - + inline void print_stat_solve() { + const double kilo(1024); printf(" Time\n"); printf(" time for extra work e.g.,workspace and permute: %10.6f s\n", stat.t_extra); printf(" time for solve: %10.6f s\n", stat.t_solve); printf(" total time spent: %10.6f s\n", (stat.t_solve+stat.t_extra)); printf("\n"); printf(" Memory\n"); - printf(" memory used in solve: %10.2f MB\n", stat.m_used/1024/1024); + printf(" memory used in solve: %10.3f MB\n", stat.m_used/kilo/kilo); printf("\n"); printf(" Kernels\n"); printf(" # of kernels launching: %6d\n", stat.n_kernel_launching); @@ -310,9 +316,10 @@ namespace Tacho { inline void print_stat_memory() { + const double kilo(1024); printf(" Memory\n"); - printf(" memory used now: %10.2f MB\n", stat.m_used/1024/1024); - printf(" peak memory used: %10.2f MB\n", stat.m_peak/1024/1024); + printf(" memory used now: %10.3f MB\n", stat.m_used/kilo/kilo); + printf(" peak memory used: %10.3f MB\n", stat.m_peak/kilo/kilo); printf("\n"); } @@ -357,7 +364,7 @@ namespace Tacho { // first count # of supernodes in each level for (ordinal_type sid=0;sid<_nsupernodes;++sid) ++_h_level_ptr(_h_stree_level(sid)+1); - + // scan for (ordinal_type i=0;i<_nlevel;++i) _h_level_ptr(i+1) += _h_level_ptr(i); @@ -406,7 +413,8 @@ namespace Tacho { const auto s = _h_supernodes(sid); const ordinal_type m = s.m, n = s.n, n_m = n-m; const ordinal_type schur_work_size = n_m*(n_m+max_factor_team_size); - const ordinal_type factor_work_size = variant == 0 ? schur_work_size : std::max(m*m, schur_work_size); + const ordinal_type factor_work_size_variants[3] = { schur_work_size, std::max(m*m, schur_work_size), m*m+schur_work_size }; + const ordinal_type factor_work_size = factor_work_size_variants[variant]; const ordinal_type solve_work_size = variant == 0 ? n_m : n; _h_buf_factor_ptr(k) = factor_work_size + _h_buf_factor_ptr(k-1); _h_buf_solve_ptr(k) = solve_work_size + _h_buf_solve_ptr(k-1); @@ -453,7 +461,7 @@ namespace Tacho { _h_factorize_mode = ordinal_type_array_host(do_not_initialize_tag("h_factorize_mode"), _nsupernodes); Kokkos::deep_copy(_h_factorize_mode, -1); - + _h_solve_mode = ordinal_type_array_host(do_not_initialize_tag("h_solve_mode"), _nsupernodes); Kokkos::deep_copy(_h_solve_mode, -1); @@ -471,7 +479,7 @@ namespace Tacho { } } } - + _team_serial_level_cut = _nlevel; { for (ordinal_type lvl=_device_level_cut;lvl<_team_serial_level_cut;++lvl) { @@ -543,7 +551,7 @@ namespace Tacho { _bufsize_solve(0), _nstreams(0), stat() {} - + LevelSetTools(const LevelSetTools &b) = default; LevelSetTools(const NumericTools &N) @@ -571,7 +579,7 @@ namespace Tacho { } _cuda_streams.clear(); _exec_instances.clear(); - + if (_is_cublas_created) { _status = cusolverDnDestroy(_handle_lapack); checkDeviceLapackStatus("cusolverDnDestroy"); } @@ -702,7 +710,7 @@ namespace Tacho { value_type *bptr = _buf.data()+h_buf_factor_ptr(p-pbeg); UnmanagedViewType T(bptr, m, m); - _status = SetIdentity::invoke(exec_instance, T); checkDeviceBlasStatus("SetIdentity"); + _status = SetIdentity::invoke(exec_instance, T, one); checkDeviceBlasStatus("SetIdentity"); exec_instance.fence(); _status = Trsm ::invoke(_handle_blas, Diag::NonUnit(), one, ATL, T); checkDeviceBlasStatus("trsm"); @@ -729,6 +737,84 @@ namespace Tacho { } } + inline + void + factorizeOnDeviceVar2(const ordinal_type pbeg, + const ordinal_type pend, + const size_type_array_host &h_buf_factor_ptr, + const value_type_array &work) { + const value_type one(1), minus_one(-1), zero(0); +#if defined(KOKKOS_ENABLE_CUDA) + ordinal_type q(0); +#endif + exec_space exec_instance; + for (ordinal_type p=pbeg;p 0) { + value_type *aptr = s.buf; + UnmanagedViewType ATL(aptr, m, m); aptr += m*m; + _status = Chol + ::invoke(_handle_lapack, ATL, W); checkDeviceLapackStatus("chol"); + + value_type *bptr = _buf.data()+h_buf_factor_ptr(p-pbeg); + if (n_m > 0) { + exec_instance.fence(); + UnmanagedViewType ABR(bptr, n_m, n_m); bptr += ABR.span(); + UnmanagedViewType ATR(aptr, m, n_m); // aptr += m*n_m; + + _status = Trsm + ::invoke(_handle_blas, Diag::NonUnit(), one, ATL, ATR); checkDeviceBlasStatus("trsm"); + exec_instance.fence(); + _status = Herk + ::invoke(_handle_blas, minus_one, ATR, zero, ABR); + exec_instance.fence(); + + /// additional things + UnmanagedViewType T(bptr, m, m); + _status = Copy::invoke(exec_instance, T, ATL); checkDeviceBlasStatus("Copy"); + exec_instance.fence(); + _status = SetIdentity::invoke(exec_instance, ATL, minus_one); checkDeviceBlasStatus("SetIdentity"); + exec_instance.fence(); + + UnmanagedViewType AT(ATL.data(), m, n); + _status = Trsm + ::invoke(_handle_blas, Diag::NonUnit(), minus_one, T, AT); checkDeviceBlasStatus("trsm"); + exec_instance.fence(); + } else { + exec_instance.fence(); + /// additional things + UnmanagedViewType T(bptr, m, m); + _status = Copy::invoke(exec_instance, T, ATL); checkDeviceBlasStatus("Copy"); + exec_instance.fence(); + _status = SetIdentity::invoke(exec_instance, ATL, one); checkDeviceBlasStatus("SetIdentity"); + exec_instance.fence(); + _status = Trsm + ::invoke(_handle_blas, Diag::NonUnit(), one, T, ATL); checkDeviceBlasStatus("trsm"); + } + } + } + } + } + } + inline void factorizeOnDevice(const ordinal_type pbeg, @@ -739,8 +825,12 @@ namespace Tacho { factorizeOnDeviceVar0(pbeg, pend, h_buf_factor_ptr, work); else if (variant == 1) factorizeOnDeviceVar1(pbeg, pend, h_buf_factor_ptr, work); - else - printf("Error: abort\n"); + else if (variant == 2) + factorizeOnDeviceVar2(pbeg, pend, h_buf_factor_ptr, work); + else { + TACHO_TEST_FOR_EXCEPTION(true, std::logic_error, + "LevelSetTools::factorizeOnDevice, algorithm variant is not supported"); + } } /// @@ -752,7 +842,7 @@ namespace Tacho { const ordinal_type verbose = 0) { constexpr bool is_host = std::is_same::value; Kokkos::Impl::Timer timer; - + timer.reset(); value_type_array work; { @@ -763,7 +853,7 @@ namespace Tacho { value_type_matrix T(NULL, _info.max_supernode_size, _info.max_supernode_size); const size_type worksize = Chol ::invoke(_handle_lapack, T, work); - + work = value_type_array(do_not_initialize_tag("work"), worksize*(_nstreams+1)); track_alloc(work.span()*sizeof(value_type)); #endif @@ -799,7 +889,7 @@ namespace Tacho { typedef Kokkos::TeamPolicy,exec_space, typename functor_type::UpdateTag> team_policy_update; #endif - + functor_type functor(_info, _factorize_mode, _level_sids, @@ -807,16 +897,16 @@ namespace Tacho { team_policy_factor policy_factor(1,1,1); team_policy_update policy_update(1,1,1); - + { for (ordinal_type lvl=(_team_serial_level_cut-1);lvl>=0;--lvl) { const ordinal_type pbeg = _h_level_ptr(lvl), pend = _h_level_ptr(lvl+1), pcnt = pend - pbeg; - + const range_type range_buf_factor_ptr(_h_buf_level_ptr(lvl), _h_buf_level_ptr(lvl+1)); - + const auto buf_factor_ptr = Kokkos::subview(_buf_factor_ptr, range_buf_factor_ptr); functor.setRange(pbeg, pend); functor.setBufferPtr(buf_factor_ptr); @@ -938,7 +1028,7 @@ namespace Tacho { value_type *bptr = _buf.data()+h_buf_solve_ptr(p-pbeg); UnmanagedViewType bT(bptr, m, nrhs); bptr += m*nrhs; - + const ordinal_type offm = s.row_begin; auto tT = Kokkos::subview(t, range_type(offm, offm+m), Kokkos::ALL()); @@ -959,6 +1049,45 @@ namespace Tacho { } } + inline + void + solveLowerOnDeviceVar2(const ordinal_type pbeg, + const ordinal_type pend, + const size_type_array_host &h_buf_solve_ptr, + const value_type_matrix &t) { + const ordinal_type nrhs = t.extent(1); + const value_type one(1), zero(0); +#if defined(KOKKOS_ENABLE_CUDA) + ordinal_type q(0); +#endif + for (ordinal_type p=pbeg;p 0) { + value_type *aptr = s.buf; + UnmanagedViewType A(aptr, m, n); + + value_type *bptr = _buf.data()+h_buf_solve_ptr(p-pbeg); + UnmanagedViewType b(bptr, n, nrhs); + + const ordinal_type offm = s.row_begin; + auto tT = Kokkos::subview(t, range_type(offm, offm+m), Kokkos::ALL()); + + _status = Gemv + ::invoke(_handle_blas, one, A, tT, zero, b); checkDeviceBlasStatus("gemv"); + } + } + } + } + } + inline void solveLowerOnDevice(const ordinal_type pbeg, @@ -969,8 +1098,12 @@ namespace Tacho { solveLowerOnDeviceVar0(pbeg, pend, h_buf_solve_ptr, t); else if (variant == 1) solveLowerOnDeviceVar1(pbeg, pend, h_buf_solve_ptr, t); - else - printf("Error: abort\n"); + else if (variant == 2) + solveLowerOnDeviceVar2(pbeg, pend, h_buf_solve_ptr, t); + else { + TACHO_TEST_FOR_EXCEPTION(true, std::logic_error, + "LevelSetTools::solveLowerOnDevice, algorithm variant is not supported"); + } } inline @@ -984,11 +1117,15 @@ namespace Tacho { #if defined(KOKKOS_ENABLE_CUDA) ordinal_type q(0); #endif + exec_space exec_instance; for (ordinal_type p=pbeg;p 0) { const UnmanagedViewType AR(aptr, m, n_m); // aptr += m*n; Gemv ::invoke(_handle_blas, minus_one, AR, bB, one, tT); checkDeviceBlasStatus("gemv"); + exec_instance.fence(); } _status = Trsv ::invoke(_handle_blas, Diag::NonUnit(), AL, tT); checkDeviceBlasStatus("trsv"); @@ -1047,7 +1185,7 @@ namespace Tacho { const ordinal_type offm = s.row_begin; const auto tT = Kokkos::subview(t, range_type(offm, offm+m), Kokkos::ALL()); - + if (n_m > 0) { const UnmanagedViewType AR(aptr, m, n_m); // aptr += m*n; const UnmanagedViewType bB(bptr, n_m, nrhs); @@ -1058,15 +1196,55 @@ namespace Tacho { _status = Gemv ::invoke(_handle_blas, one, AL, tT, zero, bT); checkDeviceBlasStatus("gemv"); - + exec_instance.fence(); - + _status = Copy::invoke(exec_instance, tT, bT); checkDeviceBlasStatus("Copy"); } } } } } + + inline + void + solveUpperOnDeviceVar2(const ordinal_type pbeg, + const ordinal_type pend, + const size_type_array_host &h_buf_solve_ptr, + const value_type_matrix &t) { + const ordinal_type nrhs = t.extent(1); + const value_type one(1), zero(0); +#if defined(KOKKOS_ENABLE_CUDA) + ordinal_type q(0); +#endif + for (ordinal_type p=pbeg;p 0 && n > 0) { + value_type *aptr = s.buf, *bptr = _buf.data()+h_buf_solve_ptr(p-pbeg);; + const UnmanagedViewType A(aptr, m, n); + const UnmanagedViewType b(bptr, n, nrhs); + + const ordinal_type offm = s.row_begin; + const auto tT = Kokkos::subview(t, range_type(offm, offm+m), Kokkos::ALL()); + + Gemv + ::invoke(_handle_blas, one, A, b, zero, tT); checkDeviceBlasStatus("gemv"); + } + } + } + } + } + inline void solveUpperOnDevice(const ordinal_type pbeg, @@ -1077,8 +1255,12 @@ namespace Tacho { solveUpperOnDeviceVar0(pbeg, pend, h_buf_solve_ptr, t); else if (variant == 1) solveUpperOnDeviceVar1(pbeg, pend, h_buf_solve_ptr, t); - else - printf("Error: abort\n"); + else if (variant == 2) + solveUpperOnDeviceVar2(pbeg, pend, h_buf_solve_ptr, t); + else { + TACHO_TEST_FOR_EXCEPTION(true, std::logic_error, + "LevelSetTools::solveUpperOnDevice, algorithm variant is not supported"); + } } inline diff --git a/packages/shylu/shylu_node/tacho/src/impl/Tacho_ModifyDiagonals.hpp b/packages/shylu/shylu_node/tacho/src/impl/Tacho_ModifyDiagonals.hpp new file mode 100644 index 000000000000..b3efac17db35 --- /dev/null +++ b/packages/shylu/shylu_node/tacho/src/impl/Tacho_ModifyDiagonals.hpp @@ -0,0 +1,22 @@ +#ifndef __TACHO_MODIFY_DIAGONALS_HPP__ +#define __TACHO_MODIFY_DIAGONALS_HPP__ + +/// \file Tacho_ModifyDiagonals.hpp +/// \brief Front interface for ModifyDiagonals +/// \author Kyungjoo Kim (kyukim@sandia.gov) + +#include "Tacho_Util.hpp" + +namespace Tacho { + + /// + /// ModifyDiagonals + /// + + /// various implementation for different uplo and algo parameters + template + struct ModifyDiagonals; + +} + +#endif diff --git a/packages/shylu/shylu_node/tacho/src/impl/Tacho_ModifyDiagonals_Internal.hpp b/packages/shylu/shylu_node/tacho/src/impl/Tacho_ModifyDiagonals_Internal.hpp new file mode 100644 index 000000000000..79d54d214ca0 --- /dev/null +++ b/packages/shylu/shylu_node/tacho/src/impl/Tacho_ModifyDiagonals_Internal.hpp @@ -0,0 +1,40 @@ +#ifndef __TACHO_MODIFY_DIAGONALS_INTERNAL_HPP__ +#define __TACHO_MODIFY_DIAGONALS_INTERNAL_HPP__ + + +/// \file Tacho_ModifyDiagonals_Internal.hpp +/// \brief Modify diagonals +/// \author Kyungjoo Kim (kyukim@sandia.gov) + +namespace Tacho { + + template<> + struct ModifyDiagonals { + template + KOKKOS_INLINE_FUNCTION + static int + invoke(MemberType &member, + const ViewTypeA &A, + const ScalarType &alpha) { + static_assert(ViewTypeA::rank == 2,"A is not rank 2 view."); + + const ordinal_type + m = A.extent(0), + n = A.extent(1), + min_mn = m > n ? n : m; + + if (min_mn > 0) { + Kokkos::parallel_for + (Kokkos::TeamVectorRange(member, min_mn), + [&](const ordinal_type &i) { + A(i,i) += alpha; + }); + } + return 0; + } + }; + +} +#endif diff --git a/packages/shylu/shylu_node/tacho/src/impl/Tacho_ModifyDiagonals_OnDevice.hpp b/packages/shylu/shylu_node/tacho/src/impl/Tacho_ModifyDiagonals_OnDevice.hpp new file mode 100644 index 000000000000..584d22c05ebf --- /dev/null +++ b/packages/shylu/shylu_node/tacho/src/impl/Tacho_ModifyDiagonals_OnDevice.hpp @@ -0,0 +1,44 @@ +#ifndef __TACHO_MODIFY_DIAGONALS_ON_DEVICE_HPP__ +#define __TACHO_MODIFY_DIAGONALS_ON_DEVICE_HPP__ + + +/// \file Tacho_ModifyDiagonals_OnDevice.hpp +/// \brief Modify diagonals +/// \author Kyungjoo Kim (kyukim@sandia.gov) + +namespace Tacho { + + template<> + struct ModifyDiagonals { + template + inline + static int + invoke(MemberType &member, + const ViewTypeA &A, + const ScalarType &alpha) { + static_assert(ViewTypeA::rank == 2,"A is not rank 2 view."); + + const ordinal_type + m = A.extent(0), + n = A.extent(1), + min_mn = m > n ? n : m;; + + if (min_mn > 0) { + using exec_space = MemberType; + using range_policy_type = Kokkos::RangePolicy; + + const auto exec_instance = member; + const auto policy = range_policy_type(exec_instance, 0, min_mn); + Kokkos::parallel_for + (policy, KOKKOS_LAMBDA(const ordinal_type &i) { + A(i,i) += alpha; + }); + } + return 0; + } + }; + +} +#endif diff --git a/packages/shylu/shylu_node/tacho/src/impl/Tacho_NumericTools.hpp b/packages/shylu/shylu_node/tacho/src/impl/Tacho_NumericTools.hpp index ca7ffbca282b..6f0c9ee53164 100644 --- a/packages/shylu/shylu_node/tacho/src/impl/Tacho_NumericTools.hpp +++ b/packages/shylu/shylu_node/tacho/src/impl/Tacho_NumericTools.hpp @@ -188,7 +188,7 @@ namespace Tacho { void track_alloc(const double in) { stat.m_used += in; - stat.m_peak = max(stat.m_peak, stat.m_used); + stat.m_peak = std::max(stat.m_peak, stat.m_used); } inline @@ -232,49 +232,52 @@ namespace Tacho { flop += DenseFlopCount::Trsm(true, m, n); flop += DenseFlopCount::Syrk(m, n); } + const double kilo(1024); printf(" Time\n"); printf(" time for copying A into U: %10.6f s\n", stat.t_copy); printf(" time for numeric factorization: %10.6f s\n", stat.t_factor); printf(" total time spent: %10.6f s\n", (stat.t_copy+stat.t_factor)); printf("\n"); printf(" Memory\n"); - printf(" memory used in factorization: %10.2f MB\n", stat.m_used/1024/1024); - printf(" peak memory used in factorization: %10.2f MB\n", stat.m_peak/1024/1024); + printf(" memory used in factorization: %10.3f MB\n", stat.m_used/kilo/kilo); + printf(" peak memory used in factorization: %10.3f MB\n", stat.m_peak/kilo/kilo); printf("\n"); printf(" Buffer Pool\n"); printf(" number of superblocks: %10d\n", int(stat.b_num_superblocks)); printf(" min and max blocksize: %e, %e Bytes\n", double(stat.b_min_block_size), double(stat.b_max_block_size)); - printf(" pool capacity: %10.2f MB\n", double(stat.b_capacity)/1024/1024); + printf(" pool capacity: %10.3f MB\n", double(stat.b_capacity)/kilo/kilo); printf("\n"); printf(" Sched Memory Pool\n"); printf(" number of superblocks: %10d\n", int(stat.s_num_superblocks)); printf(" min and max blocksize: %e, %e Bytes\n", double(stat.s_min_block_size), double(stat.s_max_block_size)); - printf(" pool capacity: %10.2f MB\n", double(stat.s_capacity)/1024/1024); + printf(" pool capacity: %10.3f MB\n", double(stat.s_capacity)/kilo/kilo); printf("\n"); printf(" FLOPs\n"); - printf(" gflop for numeric factorization: %10.2f GFLOP\n", flop/1024/1024/1024); - printf(" gflop/s for numeric factorization: %10.2f GFLOP/s\n", flop/stat.t_factor/1024/1024/1024); + printf(" gflop for numeric factorization: %10.3f GFLOP\n", flop/kilo/kilo/kilo); + printf(" gflop/s for numeric factorization: %10.3f GFLOP/s\n", flop/stat.t_factor/kilo/kilo/kilo); printf("\n"); } inline void print_stat_solve() { + const double kilo(1024); printf(" Time\n"); printf(" time for extra work e.g.,copy rhs: %10.6f s\n", stat.t_extra); printf(" time for numeric solve: %10.6f s\n", stat.t_solve); printf(" total time spent: %10.6f s\n", (stat.t_solve+stat.t_extra)); printf(" Memory\n"); - printf(" memory used in solve: %10.2f MB\n", stat.m_used/1024/1024); + printf(" memory used in solve: %10.3f MB\n", stat.m_used/kilo/kilo); printf("\n"); } inline void print_stat_memory() { + const double kilo(1024); printf(" Memory\n"); - printf(" memory used now: %10.2f MB\n", stat.m_used/1024/1024); - printf(" peak memory used: %10.2f MB\n", stat.m_peak/1024/1024); + printf(" memory used now: %10.3f MB\n", stat.m_used/kilo/kilo); + printf(" peak memory used: %10.3f MB\n", stat.m_peak/kilo/kilo); printf("\n"); } diff --git a/packages/shylu/shylu_node/tacho/src/impl/Tacho_SetIdentity_Internal.hpp b/packages/shylu/shylu_node/tacho/src/impl/Tacho_SetIdentity_Internal.hpp index ec9fdf14a339..e4e4467a8919 100644 --- a/packages/shylu/shylu_node/tacho/src/impl/Tacho_SetIdentity_Internal.hpp +++ b/packages/shylu/shylu_node/tacho/src/impl/Tacho_SetIdentity_Internal.hpp @@ -11,11 +11,13 @@ namespace Tacho { template<> struct SetIdentity { template + typename ViewTypeA, + typename ScalarType> KOKKOS_INLINE_FUNCTION static int invoke(MemberType &member, - const ViewTypeA &A) { + const ViewTypeA &A, + const ScalarType &alpha) { typedef typename ViewTypeA::non_const_value_type value_type; static_assert(ViewTypeA::rank == 2,"A is not rank 2 view."); @@ -24,14 +26,14 @@ namespace Tacho { n = A.extent(1); if (m > 0 && n > 0) { - const value_type one(1), zero(0); + const value_type diag(alpha), zero(0); Kokkos::parallel_for (Kokkos::TeamThreadRange(member, n), [&](const ordinal_type &j) { Kokkos::parallel_for (Kokkos::ThreadVectorRange(member, m), [&](const ordinal_type &i) { - A(i,j) = i==j ? one : zero; + A(i,j) = i==j ? diag : zero; }); }); } diff --git a/packages/shylu/shylu_node/tacho/src/impl/Tacho_SetIdentity_OnDevice.hpp b/packages/shylu/shylu_node/tacho/src/impl/Tacho_SetIdentity_OnDevice.hpp index 8f6b01e4abfc..40269ee78a0c 100644 --- a/packages/shylu/shylu_node/tacho/src/impl/Tacho_SetIdentity_OnDevice.hpp +++ b/packages/shylu/shylu_node/tacho/src/impl/Tacho_SetIdentity_OnDevice.hpp @@ -11,11 +11,13 @@ namespace Tacho { template<> struct SetIdentity { template + typename ViewTypeA, + typename ScalarType> inline static int invoke(MemberType &member, - const ViewTypeA &A) { + const ViewTypeA &A, + const ScalarType &alpha) { typedef typename ViewTypeA::non_const_value_type value_type; @@ -26,7 +28,7 @@ namespace Tacho { n = A.extent(1); if (m > 0 && n > 0) { - const value_type one(1), zero(0); + const value_type diag(alpha), zero(0); using exec_space = MemberType; using team_policy_type = Kokkos::TeamPolicy; @@ -38,7 +40,7 @@ namespace Tacho { Kokkos::parallel_for (Kokkos::TeamVectorRange(member, m), [&](const ordinal_type &i) { - A(i,j) = i==j ? one : zero; + A(i,j) = i==j ? diag : zero; }); }); } diff --git a/packages/shylu/shylu_node/tacho/src/impl/Tacho_Solver_Impl.hpp b/packages/shylu/shylu_node/tacho/src/impl/Tacho_Solver_Impl.hpp index 9fdbcc43e160..797f64754c28 100644 --- a/packages/shylu/shylu_node/tacho/src/impl/Tacho_Solver_Impl.hpp +++ b/packages/shylu/shylu_node/tacho/src/impl/Tacho_Solver_Impl.hpp @@ -14,11 +14,15 @@ namespace Tacho { Solver ::Solver() : _m(0), _nnz(0), - _ap(), _h_ap(),_aj(), _h_aj(), + _ap(), _h_ap(), _aj(), _h_aj(), _perm(), _h_perm(), _peri(), _h_peri(), + _m_graph(0), _nnz_graph(0), + _h_ap_graph(), _h_aj_graph(), + _h_perm_graph(), _h_peri_graph(), _N(nullptr), _L0(nullptr), _L1(nullptr), + _L2(nullptr), _verbose(0), _small_problem_thres(1024), _serial_thres_size(-1), @@ -29,8 +33,8 @@ namespace Tacho { _device_level_cut(0), _device_factor_thres(64), _device_solve_thres(128), - _variant(1), - _nstreams(8), + _variant(2), + _nstreams(16), _max_num_superblocks(-1) {} /// deleted @@ -172,8 +176,8 @@ namespace Tacho { void Solver ::setLevelSetOptionAlgorithmVariant(const ordinal_type variant) { - if (variant > 1 || variant < 0) { - std::logic_error("levelset algorithm variants range from 0 to 1"); + if (variant > 2 || variant < 0) { + std::logic_error("levelset algorithm variants range from 0 to 2"); } _variant = variant; } @@ -222,64 +226,108 @@ namespace Tacho { int Solver ::analyze() { - Graph graph(_m, _nnz, _h_ap, _h_aj); - graph_tools_type G(graph); - G.reorder(_verbose); - - _h_perm = G.PermVector(); - _h_peri = G.InvPermVector(); - - // invoke a private function - return analyze(_m, _h_ap, _h_aj, _h_perm, _h_peri); + int r_val(0); + if (_m < _small_problem_thres) { + /// do nothing + if (_verbose) { + printf("TachoSolver: Analyze\n"); + printf("====================\n"); + printf(" Linear system A\n"); + printf(" number of equations: %10d\n", _m); + printf("\n"); + printf(" A is a small problem ( < %d ) and LAPACK is used\n", _small_problem_thres); + printf("\n"); + } + } else { + const bool use_condensed_graph = (_m_graph > 0 && _m_graph < _m); + if (use_condensed_graph) { + Graph graph(_m_graph, _nnz_graph, _h_ap_graph, _h_aj_graph); + graph_tools_type G(graph); + G.reorder(_verbose); + + _h_perm_graph = G.PermVector(); + _h_peri_graph = G.InvPermVector(); + + r_val = analyze_condensed_graph(); + } else { + const bool use_graph_partitioner = (_h_perm.extent(0) == 0 && _h_peri.extent(0) == 0); + if (use_graph_partitioner) { + Graph graph(_m, _nnz, _h_ap, _h_aj); + graph_tools_type G(graph); + G.reorder(_verbose); + + _h_perm = G.PermVector(); + _h_peri = G.InvPermVector(); + + r_val = analyze_linear_system(); + } else { + r_val = analyze_linear_system(); + } + } + } + return r_val; } template int Solver - ::analyze(const ordinal_type m, - const size_type_array_host &ap, - const ordinal_type_array_host &aj, - const ordinal_type_array_host &perm, - const ordinal_type_array_host &peri) { + ::analyze_linear_system() { if (_verbose) { - printf("TachoSolver: Analyze\n"); - printf("====================\n"); + printf("TachoSolver: Analyze Linear System\n"); + printf("==================================\n"); } - if (_m == 0) { - _m = m; - - _ap = Kokkos::create_mirror_view(exec_memory_space(), ap); Kokkos::deep_copy(_ap, ap); - _aj = Kokkos::create_mirror_view(exec_memory_space(), aj); Kokkos::deep_copy(_aj, aj); + { + symbolic_tools_type S(_m, _h_ap, _h_aj, _h_perm, _h_peri); + S.symbolicFactorize(_verbose); - _h_ap = ap; - _h_aj = aj; + _nsupernodes = S.NumSupernodes(); + _stree_level = S.SupernodesTreeLevel(); + _stree_roots = S.SupernodesTreeRoots(); - _nnz = _ap(m); + _supernodes = Kokkos::create_mirror_view(exec_memory_space(), S.Supernodes()); + _gid_super_panel_ptr = Kokkos::create_mirror_view(exec_memory_space(), S.gidSuperPanelPtr()); + _gid_super_panel_colidx = Kokkos::create_mirror_view(exec_memory_space(), S.gidSuperPanelColIdx()); + _sid_super_panel_ptr = Kokkos::create_mirror_view(exec_memory_space(), S.sidSuperPanelPtr()); + _sid_super_panel_colidx = Kokkos::create_mirror_view(exec_memory_space(), S.sidSuperPanelColIdx()); + _blk_super_panel_colidx = Kokkos::create_mirror_view(exec_memory_space(), S.blkSuperPanelColIdx()); + _stree_parent = Kokkos::create_mirror_view(exec_memory_space(), S.SupernodesTreeParent()); + _stree_ptr = Kokkos::create_mirror_view(exec_memory_space(), S.SupernodesTreePtr()); + _stree_children = Kokkos::create_mirror_view(exec_memory_space(), S.SupernodesTreeChildren()); - _h_perm = perm; - _h_peri = peri; - } + Kokkos::deep_copy(_supernodes , S.Supernodes()); + Kokkos::deep_copy(_gid_super_panel_ptr , S.gidSuperPanelPtr()); + Kokkos::deep_copy(_gid_super_panel_colidx , S.gidSuperPanelColIdx()); + Kokkos::deep_copy(_sid_super_panel_ptr , S.sidSuperPanelPtr()); + Kokkos::deep_copy(_sid_super_panel_colidx , S.sidSuperPanelColIdx()); + Kokkos::deep_copy(_blk_super_panel_colidx , S.blkSuperPanelColIdx()); + Kokkos::deep_copy(_stree_parent , S.SupernodesTreeParent()); + Kokkos::deep_copy(_stree_ptr , S.SupernodesTreePtr()); + Kokkos::deep_copy(_stree_children , S.SupernodesTreeChildren()); - if (_m < _small_problem_thres) { - // for small problems, use lapack and no analysis and no permutation + // perm and peri is updated during symbolic factorization _perm = Kokkos::create_mirror_view(exec_memory_space(), _h_perm); _peri = Kokkos::create_mirror_view(exec_memory_space(), _h_peri); Kokkos::deep_copy(_perm, _h_perm); Kokkos::deep_copy(_peri, _h_peri); - - if (_verbose) { - printf(" Linear system A\n"); - printf(" number of equations: %10d\n", _m); - printf("\n"); - printf(" A is a small problem ( < %d ) and LAPACK is used\n", _small_problem_thres); - printf("\n"); - } - return 0; - } else { - symbolic_tools_type S(_m, _h_ap, _h_aj, _h_perm, _h_peri); + } + return 0; + } + + template + int + Solver + ::analyze_condensed_graph() { + if (_verbose) { + printf("TachoSolver: Analyze Condensed Graph and Evaporate the Graph\n"); + printf("============================================================\n"); + } + + { + symbolic_tools_type S(_m_graph, _h_ap_graph, _h_aj_graph, _h_perm_graph, _h_peri_graph); S.symbolicFactorize(_verbose); + S.evaporateSymbolicFactors(_h_aw_graph, _verbose); _nsupernodes = S.NumSupernodes(); _stree_level = S.SupernodesTreeLevel(); @@ -294,6 +342,8 @@ namespace Tacho { _stree_parent = Kokkos::create_mirror_view(exec_memory_space(), S.SupernodesTreeParent()); _stree_ptr = Kokkos::create_mirror_view(exec_memory_space(), S.SupernodesTreePtr()); _stree_children = Kokkos::create_mirror_view(exec_memory_space(), S.SupernodesTreeChildren()); + _perm = Kokkos::create_mirror_view(exec_memory_space(), S.PermVector()); + _peri = Kokkos::create_mirror_view(exec_memory_space(), S.InvPermVector()); Kokkos::deep_copy(_supernodes , S.Supernodes()); Kokkos::deep_copy(_gid_super_panel_ptr , S.gidSuperPanelPtr()); @@ -304,13 +354,11 @@ namespace Tacho { Kokkos::deep_copy(_stree_parent , S.SupernodesTreeParent()); Kokkos::deep_copy(_stree_ptr , S.SupernodesTreePtr()); Kokkos::deep_copy(_stree_children , S.SupernodesTreeChildren()); + Kokkos::deep_copy(_perm , S.PermVector()); + Kokkos::deep_copy(_peri , S.InvPermVector()); - // perm and peri is updated during symbolic factorization - _perm = Kokkos::create_mirror_view(exec_memory_space(), _h_perm); - _peri = Kokkos::create_mirror_view(exec_memory_space(), _h_peri); - - Kokkos::deep_copy(_perm, _h_perm); - Kokkos::deep_copy(_peri, _h_peri); + _h_perm = S.PermVector(); + _h_peri = S.InvPermVector(); } return 0; } @@ -373,6 +421,12 @@ namespace Tacho { new (_L1) levelset_tools_var1_type(*_N); _L1->initialize(_device_level_cut, _device_factor_thres, _device_solve_thres, _verbose); _L1->createStream(_nstreams); + } else if (_variant == 2) { + if (_L2 == nullptr) + _L2 = (levelset_tools_var2_type*) ::operator new (sizeof(levelset_tools_var2_type)); + new (_L2) levelset_tools_var1_type(*_N); + _L2->initialize(_device_level_cut, _device_factor_thres, _device_solve_thres, _verbose); + _L2->createStream(_nstreams); } } } @@ -428,6 +482,7 @@ namespace Tacho { if (_levelset) { if (_variant == 0) _L0->factorizeCholesky(ax, _verbose); else if (_variant == 1) _L1->factorizeCholesky(ax, _verbose); + else if (_variant == 2) _L2->factorizeCholesky(ax, _verbose); } #if !defined (KOKKOS_ENABLE_CUDA) else if (nthreads == 1) { @@ -541,6 +596,7 @@ namespace Tacho { if (_levelset) { if (_variant == 0) _L0->solveCholesky(x, b, tt, _verbose); else if (_variant == 1) _L1->solveCholesky(x, b, tt, _verbose); + else if (_variant == 2) _L2->solveCholesky(x, b, tt, _verbose); } #if !defined (KOKKOS_ENABLE_CUDA) else if (nthreads == 1) { @@ -629,6 +685,10 @@ namespace Tacho { if (_L1 != nullptr) _L1->release(_verbose); delete _L1; _L1 = nullptr; + } else if (_variant == 2) { + if (_L2 != nullptr) + _L2->release(_verbose); + delete _L2; _L2 = nullptr; } } @@ -649,7 +709,16 @@ namespace Tacho { _perm = ordinal_type_array(); _h_perm = ordinal_type_array_host(); _peri = ordinal_type_array(); _h_peri = ordinal_type_array_host(); + + _m_graph = 0; + _nnz_graph = 0; + + _h_ap_graph = size_type_array_host(); + _h_aj_graph = ordinal_type_array_host(); + _h_perm_graph = ordinal_type_array_host(); + _h_peri_graph = ordinal_type_array_host(); + _nsupernodes = 0; _supernodes = ordinal_type_array(); diff --git a/packages/shylu/shylu_node/tacho/src/impl/Tacho_SymbolicTools.cpp b/packages/shylu/shylu_node/tacho/src/impl/Tacho_SymbolicTools.cpp new file mode 100644 index 000000000000..162018f29b43 --- /dev/null +++ b/packages/shylu/shylu_node/tacho/src/impl/Tacho_SymbolicTools.cpp @@ -0,0 +1,895 @@ +/// \file Tacho_SymbolicTools.hpp +/// \author Kyungjoo Kim (kyukim@sandia.gov) + +#include "Tacho_Util.hpp" +#include "Tacho_SymbolicTools.hpp" + +namespace Tacho { + + using ordinal_type_array = SymbolicTools::ordinal_type_array; + using size_type_array = SymbolicTools::size_type_array; + + void SymbolicTools:: + computeEliminationTree(const ordinal_type m, + const size_type_array &ap, + const ordinal_type_array &aj, + const ordinal_type_array &perm, + const ordinal_type_array &peri, + const ordinal_type_array &parent, + const ordinal_type_array &ancestor) { + for (ordinal_type i=0;i= 0) { + const ordinal_type p = stack(top); + const ordinal_type i = head(p); + if (i == -1) { + --top; + post(k++) = p; + } else { + head(p) = next(i); + stack(++top) = i; + } + } + return k; + } + + void SymbolicTools:: + computePostOrdering(const ordinal_type m, + const ordinal_type_array &parent, + const ordinal_type_array &post, + const ordinal_type_array &work) { + auto head = Kokkos::subview(work, range_type(0*m, 1*m)); + auto next = Kokkos::subview(work, range_type(1*m, 2*m)); + auto stack = Kokkos::subview(work, range_type(2*m, 3*m)); + + for (ordinal_type i=0;i=0;--i) { + const ordinal_type p = parent(i); + if (p != -1) { + next(i) = head(p); + head(p) = i; + } + } + ordinal_type k = 0; + for (ordinal_type i=0;i= 0) ++count(parent(i)); + + // parent has more than a child, it becomes a supernode candidate + // roots are supernodes + for (ordinal_type i=0;i 1 || parent(i) < 0) flag(i) = true; + + // accumulate subtree sizes in count. + for (ordinal_type i=0;i= 0) count(parent(i)) += count(i); + + // tree leaves are also supernode candidate (not easy to understand this) + for (ordinal_type i=0;i ordinal_type { + // # of columns accessed by this super node + ordinal_type cnt = 0; + + // loop over super node cols (diagonal block) + for (ordinal_type col=sbeg;col ordinal_type { + ordinal_type cnt = 0; + for (ordinal_type k=0;k= 0) { + const ordinal_type sidpar = flag(parent(i)); + if (sidpar != sid) stree_parent(sid) = sidpar; + } + } + } + + auto clear_array = [](const ordinal_type cnt, + const ordinal_type_array &a) { + memset(a.data(), 0, cnt*sizeof(typename ordinal_type_array::value_type)); + }; + + // construct parent - child relations + { + clear_array(m, flag); + ordinal_type cnt = 0; + for (ordinal_type sid=0;sid w_extent) { + return; + } + } + + timer.reset(); + + /// + /// scan weights to compute the size of the system of linear equations + /// + size_type_array as(do_not_initialize_tag("as"), _m+1); + size_type_array aq(do_not_initialize_tag("aq"), _m+1); + + track_alloc(as.span()); + track_alloc(aq.span()); + + as(0) = 0; aq(0) = 0; + for (ordinal_type i=0;i<_m;++i) { + as(i+1) = as(i) + aw(i); + aq(i+1) = aq(i) + aw(_peri(i)); + } + TACHO_TEST_FOR_EXCEPTION(as(_m) != aq(_m), std::logic_error, + "Error: SymbolicTools::evaporateSymbolicFactors, # of equations do not match between as and aq"); + + /// + /// Evaporate condensed graph for a debugging purpose + /// + const size_type m = as(_m); +#if 0 + { + size_type_array ap(do_not_initialize_tag("ap"), m+1); + ap(0) = 0; + { + ordinal_type ii(0); + for (ordinal_type i=0;i<_m;++i) { + ordinal_type cnt(0); + const ordinal_type + jbeg = _ap(i), + jend = _ap(i+1); + for (ordinal_type j=jbeg;j range_type; // Tim Davis, Direct Methods for Sparse Linear Systems, Siam, p 42. - inline static void computeEliminationTree(const ordinal_type m, const size_type_array &ap, @@ -28,79 +27,26 @@ namespace Tacho { const ordinal_type_array &perm, const ordinal_type_array &peri, const ordinal_type_array &parent, - const ordinal_type_array &ancestor) { - for (ordinal_type i=0;i= 0) { - const ordinal_type p = stack(top); - const ordinal_type i = head(p); - if (i == -1) { - --top; - post(k++) = p; - } else { - head(p) = next(i); - stack(++top) = i; - } - } - return k; - } + const ordinal_type_array &stack); // Tim Davis, Direct Methods for Sparse Linear Systems, Siam, p 45. - inline static void computePostOrdering(const ordinal_type m, const ordinal_type_array &parent, const ordinal_type_array &post, - const ordinal_type_array &work) { - auto head = Kokkos::subview(work, range_type(0*m, 1*m)); - auto next = Kokkos::subview(work, range_type(1*m, 2*m)); - auto stack = Kokkos::subview(work, range_type(2*m, 3*m)); - - for (ordinal_type i=0;i=0;--i) { - const ordinal_type p = parent(i); - if (p != -1) { - next(i) = head(p); - head(p) = i; - } - } - ordinal_type k = 0; - for (ordinal_type i=0;i= 0) ++count(parent(i)); - - // parent has more than a child, it becomes a supernode candidate - // roots are supernodes - for (ordinal_type i=0;i 1 || parent(i) < 0) flag(i) = true; - - // accumulate subtree sizes in count. - for (ordinal_type i=0;i= 0) count(parent(i)) += count(i); - - // tree leaves are also supernode candidate (not easy to understand this) - for (ordinal_type i=0;i ordinal_type { - // # of columns accessed by this super node - ordinal_type cnt = 0; - - // loop over super node cols (diagonal block) - for (ordinal_type col=sbeg;col ordinal_type { - ordinal_type cnt = 0; - for (ordinal_type k=0;k= 0) { - const ordinal_type sidpar = flag(parent(i)); - if (sidpar != sid) stree_parent(sid) = sidpar; - } - } - } - - auto clear_array = [](const ordinal_type cnt, - const ordinal_type_array &a) { - memset(a.data(), 0, cnt*sizeof(typename ordinal_type_array::value_type)); - }; - - // construct parent - child relations - { - clear_array(m, flag); - ordinal_type cnt = 0; - for (ordinal_type sid=0;sid SymbolicTools(CrsMatBaseType &A, @@ -538,215 +161,24 @@ namespace Tacho { Kokkos::deep_copy(_peri, G.InvPermVector()); } - inline - ordinal_type NumSupernodes() const { return _supernodes.extent(0) - 1; } - - inline - ordinal_type_array Supernodes() const { return _supernodes; } - - inline - size_type_array gidSuperPanelPtr() const { return _gid_super_panel_ptr; } - - inline - ordinal_type_array gidSuperPanelColIdx() const { return _gid_super_panel_colidx; } - - inline - size_type_array sidSuperPanelPtr() const { return _sid_super_panel_ptr; } - - inline - ordinal_type_array sidSuperPanelColIdx() const { return _sid_super_panel_colidx; } - - inline - ordinal_type_array blkSuperPanelColIdx() const { return _blk_super_panel_colidx; } - - inline - ordinal_type_array SupernodesTreeParent() const { return _stree_parent; } - - inline - size_type_array SupernodesTreePtr() const { return _stree_ptr; } - - inline - ordinal_type_array SupernodesTreeChildren() const { return _stree_children; } - - inline - ordinal_type_array SupernodesTreeRoots() const { return _stree_roots; } - - inline - ordinal_type_array SupernodesTreeLevel() const { return _stree_level; } - - inline - void - symbolicFactorize(const ordinal_type verbose = 0) { - Kokkos::Impl::Timer timer; - double t_symfact = 0, t_supernode = 0, t_extra = 0, m_used =0, m_peak = 0; - - auto track_alloc = [&](const double in) { - m_used += in; - m_peak = max(m_used, m_peak); - }; - auto track_free = [&](const double out) { - m_used -= out; - }; - - stat.nrows = _m; - stat.nnz_a = _ap(_m); - - // compute elimination tree - timer.reset(); - ordinal_type_array work(do_not_initialize_tag("work"), _m*4); - ordinal_type_array parent(do_not_initialize_tag("parent"), _m); - - track_alloc(work.span()*sizeof(ordinal_type)); - track_alloc(parent.span()*sizeof(ordinal_type)); - { - auto post = Kokkos::subview(work, range_type(0*_m, 1*_m)); - auto w = Kokkos::subview(work, range_type(1*_m, 4*_m)); - - // compute elimination tree and its post ordering - computeEliminationTree(_m, _ap, _aj, _perm, _peri, parent, w); - computePostOrdering(_m, parent, post, w); - - // update permutation vector and elimination tree - ordinal_type *w0 = w.data(), *w1 = w0 + _m, *w2 = w1 + _m; - for (ordinal_type i=0;i<_m;++i) { - w0[i] = _perm(i); - w1[post(i)] = i; - } - for (ordinal_type i=0;i<_m;++i) { - const ordinal_type q = w0[post(i)]; - _perm(i) = q; - _peri(q) = i; - const ordinal_type p = parent(post(i)); - if (p == -1) w2[i] = p; - else w2[i] = w1[p]; - } - for (ordinal_type i=0;i<_m;++i) { - parent(i) = w2[i]; - } - - // do not compute etree again - //computeEliminationTree(_m, _ap, _aj, _perm, _peri, parent, w); - } - t_symfact += timer.seconds(); - - timer.reset(); - size_type_array ap; - ordinal_type_array aj; - { - // compute super node structure - computeSupernodes(_m, _ap, _aj, _perm, _peri, parent, _supernodes, work); - - // compute fill pattern - computeFillPatternUpper(_m, _ap, _aj, _perm, _peri, ap, aj, work); - - // allocate supernodes - allocateSupernodes(_m, ap, aj, _supernodes, work, - _gid_super_panel_ptr, - _gid_super_panel_colidx, - _sid_super_panel_ptr, - _sid_super_panel_colidx, - _blk_super_panel_colidx); - } - t_supernode += timer.seconds(); - - track_alloc(ap.span()*sizeof(size_type)); - track_alloc(aj.span()*sizeof(ordinal_type)); - - track_alloc(_supernodes.span()*sizeof(ordinal_type)); - track_alloc(_gid_super_panel_ptr.span()*sizeof(size_type)); - track_alloc(_gid_super_panel_colidx.span()*sizeof(ordinal_type)); - track_alloc(_sid_super_panel_ptr.span()*sizeof(size_type)); - track_alloc(_sid_super_panel_colidx.span()*sizeof(ordinal_type)); - track_alloc(_blk_super_panel_colidx.span()*sizeof(ordinal_type)); - - timer.reset(); - { - // supernode assembly tree - computeSupernodesAssemblyTree(parent, - _supernodes, - _stree_level, - _stree_parent, - _stree_ptr, - _stree_children, - _stree_roots, - work); - } - t_extra += timer.seconds(); - - track_alloc(_stree_level.span()*sizeof(ordinal_type)); - track_alloc(_stree_parent.span()*sizeof(ordinal_type)); - track_alloc(_stree_ptr.span()*sizeof(size_type)); - track_alloc(_stree_children.span()*sizeof(ordinal_type)); - track_alloc(_stree_roots.span()*sizeof(ordinal_type)); - - track_free(ap.span()*sizeof(size_type)); - track_free(aj.span()*sizeof(ordinal_type)); - - track_free(work.span()*sizeof(ordinal_type)); - track_free(parent.span()*sizeof(ordinal_type)); - - stat.nnz_u = ap(_m); - stat.nsupernodes = _supernodes.extent(0) - 1; - stat.max_nchildren = 0; - stat.largest_supernode = 0; - stat.largest_schur = 0; - - for (ordinal_type sid=0;sid ATL(aptr, m, m); aptr += m*m; Chol::invoke(member, ATL); - UnmanagedViewType T(ABR.data(), m, m); if (n_m > 0) { member.team_barrier(); UnmanagedViewType ATR(aptr, m, n_m); @@ -122,7 +122,7 @@ namespace Tacho { Copy ::invoke(member, T, ATL); SetIdentity - ::invoke(member, ATL); + ::invoke(member, ATL, one); Trsm ::invoke(member, Diag::NonUnit(), one, T, ATL); member.team_barrier(); @@ -133,7 +133,51 @@ namespace Tacho { Copy ::invoke(member, T, ATL); SetIdentity - ::invoke(member, ATL); + ::invoke(member, ATL, one); + Trsm + ::invoke(member, Diag::NonUnit(), one, T, ATL); + } + } + } + + template + KOKKOS_INLINE_FUNCTION + void factorize_var2(MemberType &member, + const supernode_type &s, + const value_type_matrix &T, + const value_type_matrix &ABR) const { + const value_type one(1), minus_one(-1), zero(0); + const ordinal_type m = s.m, n = s.n, n_m = n-m; + if (m > 0) { + value_type *aptr = s.buf; + UnmanagedViewType ATL(aptr, m, m); aptr += m*m; + Chol::invoke(member, ATL); + + if (n_m > 0) { + member.team_barrier(); + UnmanagedViewType ATR(aptr, m, n_m); + Trsm + ::invoke(member, Diag::NonUnit(), one, ATL, ATR); + member.team_barrier(); + Herk + ::invoke(member, minus_one, ATR, zero, ABR); + member.team_barrier(); + /// additional things + Copy + ::invoke(member, T, ATL); + member.team_barrier(); + SetIdentity::invoke(member, ATL, minus_one); + member.team_barrier(); + UnmanagedViewType AT(ATL.data(), m, n); + Trsm + ::invoke(member, Diag::NonUnit(), minus_one, T, AT); + } else { + /// additional things + Copy + ::invoke(member, T, ATL); + member.team_barrier(); + SetIdentity::invoke(member, ATL, one); + member.team_barrier(); Trsm ::invoke(member, Diag::NonUnit(), one, T, ATL); } @@ -252,15 +296,22 @@ namespace Tacho { using factorize_tag_type = FactorizeTag; const auto &s = _info.supernodes(sid); - const ordinal_type n_m = s.n-s.m; - UnmanagedViewType ABR(_buf.data()+_buf_ptr(lid), n_m, n_m); + const ordinal_type m = s.m, n = s.n, n_m = n-m; + const auto bufptr = _buf.data()+_buf_ptr(lid); if (factorize_tag_type::variant == 0) { + UnmanagedViewType ABR(bufptr, n_m, n_m); factorize_var0(member, s, ABR); } else if (factorize_tag_type::variant == 1) { - factorize_var1(member, s, ABR); + UnmanagedViewType ABR(bufptr, n_m, n_m); + UnmanagedViewType T(bufptr, m, m); + factorize_var1(member, s, T, ABR); + } else if (factorize_tag_type::variant == 2) { + UnmanagedViewType ABR(bufptr, n_m, n_m); + UnmanagedViewType T(bufptr+ABR.span(), m, m); + factorize_var2(member, s, T, ABR); } } else if (mode == -1) { - printf("Error: abort\n"); + printf("Error: TeamFunctorFactorizeChol, computing mode is not determined\n"); } else { // skip } diff --git a/packages/shylu/shylu_node/tacho/src/impl/Tacho_TeamFunctor_SolveLowerChol.hpp b/packages/shylu/shylu_node/tacho/src/impl/Tacho_TeamFunctor_SolveLowerChol.hpp index 4136d0e633bc..665485f68f93 100644 --- a/packages/shylu/shylu_node/tacho/src/impl/Tacho_TeamFunctor_SolveLowerChol.hpp +++ b/packages/shylu/shylu_node/tacho/src/impl/Tacho_TeamFunctor_SolveLowerChol.hpp @@ -227,6 +227,74 @@ namespace Tacho { } } + /// + /// Algorithm Variant 2: gemv + /// + template + KOKKOS_INLINE_FUNCTION + void solve_var2(MemberType &member, const supernode_type &s, value_type *bptr) const { + const value_type one(1), zero(0); + { + const ordinal_type m = s.m, n = s.n; + if (m > 0 && n > 0) { + value_type *aptr = s.buf; + + UnmanagedViewType A(aptr, m, n); + UnmanagedViewType b(bptr, n, _nrhs); + + const ordinal_type offm = s.row_begin; + auto tT = Kokkos::subview(_t, range_type(offm, offm+m), Kokkos::ALL()); + + Gemv + ::invoke(member, one, A, tT, zero, b); + } + } + } + + template + KOKKOS_INLINE_FUNCTION + void update_var2(MemberType &member, const supernode_type &s, value_type *bptr) const { + { + const ordinal_type m = s.m, n = s.n, n_m = n-m; + UnmanagedViewType b(bptr, n, _nrhs); + if (m > 0) { + const ordinal_type offm = s.row_begin; + auto tT = Kokkos::subview(_t, range_type(offm, offm+m), Kokkos::ALL()); + + // copy to t + Kokkos::parallel_for + (Kokkos::TeamVectorRange(member, m*_nrhs), + [&](const ordinal_type &k) { + const ordinal_type i = k%m, j = k/m; + tT(i,j) = b(i,j); + }); + + if (n_m > 0) { + // update + const ordinal_type + sbeg = s.sid_col_begin + 1, send = s.sid_col_end - 1; + for (ordinal_type i=sbeg,ip=0/*is=0*/;i struct SolveTag { enum { variant = Var }; }; template struct UpdateTag { enum { variant = Var }; }; @@ -244,10 +312,11 @@ namespace Tacho { value_type *bptr = _buf.data() + _buf_ptr(member.league_rank()); if (solve_tag_type::variant == 0) solve_var0(member, s, bptr); else if (solve_tag_type::variant == 1) solve_var1(member, s, bptr); - //else if (solve_tag_type::variant == 2) solve_var2(member, s, bptr); - else printf("Error: abort\n"); + else if (solve_tag_type::variant == 2) solve_var2(member, s, bptr); + else + printf("Error: TeamFunctorSolveLowerChol::SolveTag, algorithm variant is not supported\n"); } if (mode == -1) { - printf("Error: abort\n"); + printf("Error: TeamFunctorSolveLowerChol::SolveTag, computing mode is not determined\n"); } else { // skip } @@ -264,8 +333,9 @@ namespace Tacho { value_type *bptr = _buf.data() + _buf_ptr(member.league_rank()); if (update_tag_type::variant == 0) update_var0(member, s, bptr); else if (update_tag_type::variant == 1) update_var1(member, s, bptr); - //else if (update_tag_type::variant == 2) update_var2(member, s, bptr); - else printf("Error: abort\n"); + else if (update_tag_type::variant == 2) update_var2(member, s, bptr); + else + printf("Error: TeamFunctorSolveLowerChol::UpdateTag, algorithm variant is not supported\n"); } else { // skip } diff --git a/packages/shylu/shylu_node/tacho/src/impl/Tacho_TeamFunctor_SolveUpperChol.hpp b/packages/shylu/shylu_node/tacho/src/impl/Tacho_TeamFunctor_SolveUpperChol.hpp index 93bc37e83b5c..ebff03cbf39b 100644 --- a/packages/shylu/shylu_node/tacho/src/impl/Tacho_TeamFunctor_SolveUpperChol.hpp +++ b/packages/shylu/shylu_node/tacho/src/impl/Tacho_TeamFunctor_SolveUpperChol.hpp @@ -194,6 +194,55 @@ namespace Tacho { } } + /// + /// Algorithm Variant 2: gemv + /// + template + KOKKOS_INLINE_FUNCTION + void solve_var2(MemberType &member, const supernode_type &s, value_type *bptr) const { + const value_type one(1), zero(0); + { + const ordinal_type m = s.m, n = s.n; + if (m > 0 && n > 0) { + value_type *aptr = s.buf; + + const UnmanagedViewType A(aptr, m, n); + const UnmanagedViewType b(bptr, n, _nrhs); + + const ordinal_type offm = s.row_begin; + const auto tT = Kokkos::subview(_t, range_type(offm, offm+m), Kokkos::ALL()); + + Gemv + ::invoke(member, one, A, b, zero, tT); + } + } + } + + template + KOKKOS_INLINE_FUNCTION + void update_var2(MemberType &member, const supernode_type &s, value_type *bptr) const { + { + const ordinal_type m = s.m, n = s.n; + UnmanagedViewType b(bptr, n, _nrhs); + if (n > 0) { + const ordinal_type offm = s.row_begin; + const ordinal_type goffset = s.gid_col_begin + s.m; + Kokkos::parallel_for + (Kokkos::TeamVectorRange(member, n), + [&](const ordinal_type &i) { + for (ordinal_type j=0;j<_nrhs;++j) { + if (i < m) { + b(i,j) = _t(offm+i,j); + } else { + const ordinal_type row = _gid_colidx(i-m+goffset); + b(i,j) = _t(row,j); + } + } + }); + } + } + } + template struct SolveTag { enum { variant = Var }; }; template struct UpdateTag { enum { variant = Var }; }; struct DummyTag {}; @@ -210,9 +259,11 @@ namespace Tacho { value_type *bptr = _buf.data() + _buf_ptr(member.league_rank()); if (solve_tag_type::variant == 0) solve_var0(member, s, bptr); else if (solve_tag_type::variant == 1) solve_var1(member, s, bptr); - else printf("Error: abort\n"); + else if (solve_tag_type::variant == 2) solve_var2(member, s, bptr); + else + printf("Error: TeamFunctorSolveUpperChol::SolveTag, algorithm variant is not supported\n"); } else if (mode == -1) { - printf("Error: abort\n"); + printf("Error: TeamFunctorSolveUpperChol::SolveTag, computing mode is not determined\n"); } else { // skip } @@ -229,7 +280,9 @@ namespace Tacho { value_type *bptr = _buf.data() + _buf_ptr(member.league_rank()); if (update_tag_type::variant == 0) update_var0(member, s, bptr); else if (update_tag_type::variant == 1) update_var1(member, s, bptr); - else printf("Error: abort\n"); + else if (update_tag_type::variant == 2) update_var2(member, s, bptr); + else + printf("Error: TeamFunctorUpdateUpperChol::SolveTag, algorithm variant is not supported\n"); } else { // skip } diff --git a/packages/shylu/shylu_node/tacho/src/impl/Tacho_TriSolveTools.hpp b/packages/shylu/shylu_node/tacho/src/impl/Tacho_TriSolveTools.hpp index 981c6a78d4f0..227074d55faf 100644 --- a/packages/shylu/shylu_node/tacho/src/impl/Tacho_TriSolveTools.hpp +++ b/packages/shylu/shylu_node/tacho/src/impl/Tacho_TriSolveTools.hpp @@ -166,7 +166,7 @@ namespace Tacho { void track_alloc(const double in) { stat.m_used += in; - stat.m_peak = max(stat.m_peak, stat.m_used); + stat.m_peak = std::max(stat.m_peak, stat.m_used); } inline @@ -187,14 +187,15 @@ namespace Tacho { inline void print_stat_init() { + const double kilo(1024); printf(" Time\n"); printf(" time for initialization: %10.6f s\n", stat.t_init); printf(" time for compute mode classification: %10.6f s\n", stat.t_mode_classification); printf(" total time spent: %10.6f s\n", (stat.t_init+stat.t_mode_classification)); printf("\n"); printf(" Memory\n"); - printf(" memory used in solve: %10.2f MB\n", stat.m_used/1024/1024); - printf(" peak memory used in solve: %10.2f MB\n", stat.m_peak/1024/1024); + printf(" memory used in solve: %10.3f MB\n", stat.m_used/kilo/kilo); + printf(" peak memory used in solve: %10.3f MB\n", stat.m_peak/kilo/kilo); printf("\n"); printf(" Compute Mode in Solve (nlevel: %d, device cut %d, serial cut %d)\n", _nlevel, _device_level_cut, _team_serial_level_cut); printf(" # of subproblems using device functions: %6d\n", stat.n_device_problems); @@ -206,12 +207,13 @@ namespace Tacho { inline void print_stat_prepare() { + const double kilo(1024); printf(" Time\n"); printf(" total time spent: %10.6f s\n", stat.t_prepare); printf("\n"); printf(" Memory\n"); - printf(" memory used in solve: %10.2f MB\n", stat.m_used/1024/1024); - printf(" peak memory used in solve: %10.2f MB\n", stat.m_peak/1024/1024); + printf(" memory used in solve: %10.3f MB\n", stat.m_used/kilo/kilo); + printf(" peak memory used in solve: %10.3f MB\n", stat.m_peak/kilo/kilo); printf("\n"); printf(" Compute Mode in Prepare\n"); printf(" # of subproblems using device functions: %6d\n", stat.n_device_problems); @@ -223,11 +225,12 @@ namespace Tacho { inline void print_stat_solve() { + const double kilo(1024); printf(" Time\n"); printf(" total time spent: %10.6f s\n", (stat.t_solve+stat.t_extra)); printf("\n"); printf(" Memory\n"); - printf(" memory used in solve: %10.2f MB\n", stat.m_used/1024/1024); + printf(" memory used in solve: %10.3f MB\n", stat.m_used/kilo/kilo); printf(" Kernels\n"); printf(" # of kernel launching: %6d\n", stat.n_kernel_launching); printf("\n"); @@ -236,9 +239,10 @@ namespace Tacho { inline void print_stat_memory() { + const double kilo(1024); printf(" Memory\n"); - printf(" memory used now: %10.2f MB\n", stat.m_used/1024/1024); - printf(" peak memory used: %10.2f MB\n", stat.m_peak/1024/1024); + printf(" memory used now: %10.3f MB\n", stat.m_used/kilo/kilo); + printf(" peak memory used: %10.3f MB\n", stat.m_peak/kilo/kilo); printf("\n"); } diff --git a/packages/shylu/shylu_node/tacho/unit-test/Tacho_TestGraph.hpp b/packages/shylu/shylu_node/tacho/unit-test/Tacho_TestGraph.hpp index a1933ad13995..6cb3600a6dd7 100644 --- a/packages/shylu/shylu_node/tacho/unit-test/Tacho_TestGraph.hpp +++ b/packages/shylu/shylu_node/tacho/unit-test/Tacho_TestGraph.hpp @@ -20,8 +20,6 @@ #include "Tacho_GraphTools_Metis.hpp" #endif -#include "Tacho_GraphTools_CAMD.hpp" - using namespace Tacho; typedef CrsMatrixBase CrsMatrixBaseHostType; @@ -126,45 +124,4 @@ TEST( Graph, metis ) { } #endif -#if defined(TACHO_HAVE_SCOTCH) -TEST( Graph, camd ) { - TEST_BEGIN; - std::string inputfilename = MM_TEST_FILE + ".mtx"; - - CrsMatrixBaseHostType Ah; - MatrixMarket::read(inputfilename, Ah); - - Graph G(Ah); - GraphTools_Scotch S(G); - - const ordinal_type m = G.NumRows(); - S.setTreeLevel(log2(m)); - S.setStrategy( SCOTCH_STRATSPEED - | SCOTCH_STRATSPEED - | SCOTCH_STRATLEVELMAX - | SCOTCH_STRATLEVELMIN - | SCOTCH_STRATLEAFSIMPLE - | SCOTCH_STRATSEPASIMPLE - ); - S.reorder(); - - GraphTools_CAMD C(G); - C.setConstraint(S.NumBlocks(), - S.RangeVector(), - S.InvPermVector()); - C.reorder(); - - const auto perm = C.PermVector(); - const auto peri = C.InvPermVector(); - - /// - /// perm and invperm should be properly setup - /// - for (ordinal_type i=0;i CrsMatrixBaseHostType; @@ -74,7 +74,7 @@ TEST( Symbolic, functions ) { #elif defined(TACHO_HAVE_SCOTCH) GraphTools_Scotch T(G); #else - GraphTools_CAMD T(G); + GraphTools T(G); #endif T.reorder(); @@ -162,7 +162,7 @@ TEST( Symbolic, interface ) { #elif defined(TACHO_HAVE_SCOTCH) GraphTools_Scotch T(G); #else - GraphTools_CAMD T(G); + GraphTools T(G); #endif T.reorder(); diff --git a/packages/stk/cmake/Dependencies.cmake b/packages/stk/cmake/Dependencies.cmake index f442ee198160..7c793bc43fae 100644 --- a/packages/stk/cmake/Dependencies.cmake +++ b/packages/stk/cmake/Dependencies.cmake @@ -4,7 +4,7 @@ SET(SUBPACKAGES_DIRS_CLASSIFICATIONS_OPTREQS Simd stk_simd PT OPTIONAL Topology stk_topology PT OPTIONAL Mesh stk_mesh PT OPTIONAL - NGP stk_ngp PT OPTIONAL + NGP stk_ngp EX OPTIONAL IO stk_io PT OPTIONAL NGP_TEST stk_ngp_test PT OPTIONAL Unit_test_utils stk_unit_test_utils PT OPTIONAL @@ -15,7 +15,6 @@ SET(SUBPACKAGES_DIRS_CLASSIFICATIONS_OPTREQS Balance stk_balance PT OPTIONAL Unit_tests stk_unit_tests PT OPTIONAL Doc_tests stk_doc_tests PT OPTIONAL - Exp stk_exp EX OPTIONAL ExprEval stk_expreval PT OPTIONAL ) diff --git a/packages/stk/cmake/stk_in_sierra.cmake b/packages/stk/cmake/stk_in_sierra.cmake new file mode 100644 index 000000000000..cd16b386a816 --- /dev/null +++ b/packages/stk/cmake/stk_in_sierra.cmake @@ -0,0 +1,36 @@ +set (CMAKE_BUILD_TYPE RELEASE CACHE STRING "") + +set (Trilinos_ENABLE_STK ON CACHE BOOL "") +set (Trilinos_ENABLE_SEACAS ON CACHE BOOL "") +set (Trilinos_ENABLE_TESTS ON CACHE BOOL "") +set (Trilinos_ENABLE_ALL_OPTIONAL_PACKAGES OFF CACHE BOOL "") + +set (TPL_ENABLE_MPI ON CACHE BOOL "") +set (TPL_ENABLE_Matio OFF CACHE BOOL "") +set (TPL_ENABLE_BLAS ON CACHE BOOL "") +set (TPL_ENABLE_LAPACK ON CACHE BOOL "") +set (TPL_ENABLE_Boost ON CACHE BOOL "") +set (TPL_ENABLE_HDF5 ON CACHE BOOL "") +set (TPL_ENABLE_Netcdf ON CACHE BOOL "") + +set (CMAKE_C_COMPILER "$ENV{MPICC}" CACHE FILEPATH "") +set (CMAKE_CXX_COMPILER "$ENV{MPICXX}" CACHE FILEPATH "") +set (CMAKE_Fortran_COMPILER "$ENV{MPIF90}" CACHE FILEPATH "") + +set (MPI_BASE_DIR "$ENV{SEMS_OPENMPI_ROOT}" CACHE PATH "") + +set (Boost_INCLUDE_DIRS "$ENV{SEMS_BOOST_INCLUDE_PATH}" CACHE PATH "") +set (Boost_LIBRARY_DIRS "$ENV{SEMS_BOOST_LIBRARY_PATH}" CACHE PATH "") + +set (HDF5_INCLUDE_DIRS "$ENV{SEMS_HDF5_INCLUDE_PATH}" CACHE PATH "") +set (HDF5_LIBRARY_DIRS "$ENV{SEMS_HDF5_LIBRARY_PATH}" CACHE PATH "") + +set (Netcdf_INCLUDE_DIRS "$ENV{SEMS_NETCDF_INCLUDE_PATH}" CACHE PATH "") +set (Netcdf_LIBRARY_DIRS "$ENV{SEMS_NETCDF_LIBRARY_PATH}" CACHE PATH "") + +set (Trilinos_ENABLE_CONFIGURE_TIMING ON CACHE BOOL "") +set (Trilinos_SHOW_DEPRECATED_WARNINGS OFF CACHE BOOL "") +set (CMAKE_CXX_FLAGS "-Wall -Wno-clobbered -Wno-vla -Wno-pragmas -Wno-unknown-pragmas -Wno-unused-local-typedefs -Wno-literal-suffix -Wno-deprecated-declarations -Wno-misleading-indentation -Wno-int-in-bool-context -Wno-maybe-uninitialized -Wno-nonnull-compare -Wno-address -Wno-inline -DTRILINOS_HIDE_DEPRECATED_HEADER_WARNINGS -Werror" CACHE STRING "Warnings as errors settings") +set (STK_DISABLE_MPI_NEIGHBOR_COMM ON CACHE BOOL "") +set (MPI_EXEC_PRE_NUMPROCS_FLAGS "--bind-to;none" CACHE STRING "") + diff --git a/packages/stk/cmake/stk_in_sierra_modules.sh b/packages/stk/cmake/stk_in_sierra_modules.sh new file mode 100644 index 000000000000..532123349611 --- /dev/null +++ b/packages/stk/cmake/stk_in_sierra_modules.sh @@ -0,0 +1,9 @@ +source /projects/sems/modulefiles/utils/sems-modules-init.sh + +module load sems-gcc/7.2.0 +module load sems-openmpi/1.10.1 +module load sems-boost/1.63.0/base +module load sems-hdf5/1.8.12/parallel +module load sems-netcdf/4.4.1/exo_parallel +module load sems-cmake/3.12.2 + diff --git a/packages/stk/stk_balance/CMakeLists.txt b/packages/stk/stk_balance/CMakeLists.txt index 7babf40bc18a..0fe828e7ebde 100644 --- a/packages/stk/stk_balance/CMakeLists.txt +++ b/packages/stk/stk_balance/CMakeLists.txt @@ -36,14 +36,4 @@ TRIBITS_SUBPACKAGE(Balance) ADD_SUBDIRECTORY(stk_balance) -FILE(GLOB HEADERS_TEST_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/test_utils/*.hpp) -FILE(GLOB SOURCES_TEST_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/test_utils/*.cpp) - -TRIBITS_ADD_LIBRARY( - stk_balance_test_utils - NOINSTALLHEADERS ${HEADERS_TEST_UTILS} - SOURCES ${SOURCES_TEST_UTILS} - DEPLIBS - ) - TRIBITS_SUBPACKAGE_POSTPROCESS() diff --git a/packages/stk/stk_balance/Jamfile b/packages/stk/stk_balance/Jamfile index 2324d0dc0065..098e4cca5419 100644 --- a/packages/stk/stk_balance/Jamfile +++ b/packages/stk/stk_balance/Jamfile @@ -172,6 +172,8 @@ lib stk_balance_lib $(stk_balance-root)/stk_balance/*.cpp $(stk_balance-root)/stk_balance/internal/*.cpp $(stk_balance-root)/stk_balance/mesh/*.cpp + $(stk_balance-root)/stk_balance/io/*.cpp + $(stk_balance-root)/stk_balance/setup/*.cpp ] ] search_tolerance @@ -198,50 +200,42 @@ lib stk_balance_lib : ; -lib stk_balance_test_utils - : - [ glob $(stk_balance-root)/test_utils/*.cpp ] - stk_balance_lib - /sierra/stk_mesh//stk_mesh_base - /sierra/stk_io//stk_io - /sierra/seacas//nemesis - /sierra/stk_search//stk_search - /sierra/stk_unit_test_utils//stk_unit_test_utils - ; - # # SECTION 4: Build configuration # exe stk_balance_unit_tester : - [ glob $(stk_balance-root)/../stk_unit_tests/stk_balance/*.cpp - ] - /sierra/stk_unit_test_utils//stk_unit_main + [ glob $(stk_balance-root)/../stk_unit_tests/stk_balance/*.cpp ] + stk_balance_lib + /sierra/stk_unit_test_utils//stk_unit_test_utils /sierra/stk_unit_test_utils//stk_mesh_fixtures - stk_balance_test_utils + /sierra/stk_unit_test_utils//stk_unit_main : @sierra-exec-tag ; exe stk_balance_doc_tester : - [ glob $(stk_balance-root)/../stk_doc_tests/stk_balance/*.cpp - ] + [ glob $(stk_balance-root)/../stk_doc_tests/stk_balance/*.cpp ] + stk_balance_lib + /sierra/stk_unit_test_utils//stk_unit_test_utils /sierra/stk_unit_test_utils//stk_unit_main - stk_balance_test_utils : @sierra-exec-tag ; exe stk_balance_integration_tester : - [ glob $(stk_balance-root)/../stk_integration_tests/stk_balance/*.cpp + [ + glob $(stk_balance-root)/../stk_integration_tests/stk_balance/*.cpp + $(stk_balance-root)/../stk_integration_tests/test_utils/*.cpp ] + stk_balance_lib + /sierra/seacas//nemesis /sierra/stk_unit_test_utils//stk_unit_main - /sierra/stk_search//stk_search - stk_balance_test_utils : + $(stk_balance-root-inc)/../stk_integration_tests @sierra-exec-tag ; diff --git a/packages/stk/stk_balance/cmake/Dependencies.cmake b/packages/stk/stk_balance/cmake/Dependencies.cmake index c137fee6d850..574478989d54 100644 --- a/packages/stk/stk_balance/cmake/Dependencies.cmake +++ b/packages/stk/stk_balance/cmake/Dependencies.cmake @@ -1,4 +1,4 @@ -SET(LIB_REQUIRED_DEP_PACKAGES TeuchosCore TeuchosParameterList SEACASNemesis SEACASExodus SEACASIoss Zoltan2 STKUtil STKSearch STKMesh STKIO STKTools) +SET(LIB_REQUIRED_DEP_PACKAGES TeuchosCore TeuchosParameterList SEACASNemesis SEACASExodus SEACASIoss Zoltan2Core STKUtil STKSearch STKMesh STKIO STKTools) SET(LIB_OPTIONAL_DEP_PACKAGES) SET(TEST_REQUIRED_DEP_PACKAGES Gtest) SET(TEST_OPTIONAL_DEP_PACKAGES) diff --git a/packages/stk/stk_balance/stk_balance/CMakeLists.txt b/packages/stk/stk_balance/stk_balance/CMakeLists.txt index c95a5f8e9c61..75da71a3461c 100644 --- a/packages/stk/stk_balance/stk_balance/CMakeLists.txt +++ b/packages/stk/stk_balance/stk_balance/CMakeLists.txt @@ -60,12 +60,21 @@ INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_SOURCE_DIR}) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -FILE(GLOB HEADERS *.hpp ${CMAKE_CURRENT_SOURCE_DIR}/mesh/*.hpp) -FILE(GLOB SOURCES *.cpp ${CMAKE_CURRENT_SOURCE_DIR}/mesh/*.cpp) +FILE(GLOB HEADERS *.hpp + ${CMAKE_CURRENT_SOURCE_DIR}/mesh/*.hpp + ${CMAKE_CURRENT_SOURCE_DIR}/setup/*.hpp + ${CMAKE_CURRENT_SOURCE_DIR}/io/*.hpp) +FILE(GLOB SOURCES *.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/mesh/*.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/setup/*.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/io/*.cpp) FILE(GLOB HEADERS_INTERNAL ${CMAKE_CURRENT_SOURCE_DIR}/internal/*.hpp) FILE(GLOB SOURCES_INTERNAL ${CMAKE_CURRENT_SOURCE_DIR}/internal/*.cpp) +FILE(GLOB HEADERS_SETUP ${CMAKE_CURRENT_SOURCE_DIR}/setup/*.hpp) +FILE(GLOB SOURCES_SETUP ${CMAKE_CURRENT_SOURCE_DIR}/setup/*.cpp) + FILE(GLOB HEADERS_SEARCH_TOLERANCE ${CMAKE_CURRENT_SOURCE_DIR}/search_tolerance/*.hpp) FILE(GLOB HEADERS_SEARCH_TOLERANCE_ALGS ${CMAKE_CURRENT_SOURCE_DIR}/search_tolerance_algs/*.hpp) @@ -84,8 +93,8 @@ ENDIF() TRIBITS_ADD_LIBRARY( stk_balance_lib - NOINSTALLHEADERS ${HEADERS} ${HEADERS_INTERNAL} ${HEADERS_SEARCH_TOLERANCE} ${HEADERS_SEARCH_TOLERANCE_ALGS} - SOURCES ${SOURCES} ${SOURCES_INTERNAL} ${SOURCES_SEARCH_TOLERANCE_ALGS} + NOINSTALLHEADERS ${HEADERS} ${HEADERS_INTERNAL} ${HEADERS_SETUP} ${HEADERS_SEARCH_TOLERANCE} ${HEADERS_SEARCH_TOLERANCE_ALGS} + SOURCES ${SOURCES} ${SOURCES_INTERNAL} ${SOURCES_SETUP} ${SOURCES_SEARCH_TOLERANCE_ALGS} DEPLIBS ) @@ -111,6 +120,8 @@ INSTALL(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_balance) INSTALL(FILES ${HEADERS_INTERNAL} DESTINATION ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_balance/internal) +INSTALL(FILES ${HEADERS_SETUP} DESTINATION + ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_balance/setup) INSTALL(FILES ${HEADERS_SEARCH_TOLERANCE} DESTINATION ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_balance/search_tolerance) INSTALL(FILES ${HEADERS_SEARCH_TOLERANCE_ALGS} DESTINATION diff --git a/packages/stk/stk_balance/stk_balance/balance.cpp b/packages/stk/stk_balance/stk_balance/balance.cpp index 73fb969216fc..14c6c711ec23 100644 --- a/packages/stk/stk_balance/stk_balance/balance.cpp +++ b/packages/stk/stk_balance/stk_balance/balance.cpp @@ -1,35 +1,35 @@ - // Copyright 2002 - 2008, 2010, 2011 National Technology Engineering +// Copyright 2002 - 2008, 2010, 2011 National Technology Engineering // Solutions of Sandia, LLC (NTESS). Under the terms of Contract // DE-NA0003525 with NTESS, the U.S. Government retains certain rights // in this software. // - // Redistribution and use in source and binary forms, with or without - // modification, are permitted provided that the following conditions are - // met: - // - // * Redistributions of source code must retain the above copyright - // notice, this list of conditions and the following disclaimer. - // - // * Redistributions in binary form must reproduce the above - // copyright notice, this list of conditions and the following - // disclaimer in the documentation and/or other materials provided - // with the distribution. - // +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following +// disclaimer in the documentation and/or other materials provided +// with the distribution. +// // * Neither the name of NTESS nor the names of its contributors // may be used to endorse or promote products derived from this // software without specific prior written permission. // - // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - // "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - // A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include @@ -38,10 +38,10 @@ #include "balance.hpp" #include "balanceUtils.hpp" // for BalanceSettings, etc #include "fixSplitCoincidentElements.hpp" +#include "stk_balance/internal/Balancer.hpp" #include "internal/DetectAndFixMechanisms.hpp" #include "internal/LastStepFieldWriter.hpp" #include "internal/balanceCoincidentElements.hpp" -#include "internal/balanceCommandLine.hpp" #include "internal/privateDeclarations.hpp" // for callZoltan1, etc #include "internal/NodeBalancer.hpp" #include "stk_io/StkIoUtils.hpp" @@ -51,7 +51,6 @@ #include "stk_util/diag/StringUtil.hpp" #include "stk_util/parallel/ParallelReduce.hpp" #include "stk_util/util/ReportHandler.hpp" // for ThrowRequireMsg -#include #include #include #include @@ -174,54 +173,6 @@ std::string construct_coloring_part_name(const int color, const stk::mesh::Part& return oss.str(); } -bool loadBalance(const BalanceSettings& balanceSettings, stk::mesh::BulkData& stkMeshBulkData, unsigned numSubdomainsToCreate, const std::vector& selectors) -{ - internal::logMessage(stkMeshBulkData.parallel(), "Computing new decomposition"); - - stk::mesh::EntityProcVec decomp; - internal::calculateGeometricOrGraphBasedDecomp(balanceSettings, numSubdomainsToCreate, decomp, stkMeshBulkData, selectors); - - DecompositionChangeList changeList(stkMeshBulkData, decomp); - balanceSettings.modifyDecomposition(changeList); - - internal::logMessage(stkMeshBulkData.parallel(), "Moving coincident elements to the same processor"); - keep_coincident_elements_together(stkMeshBulkData, changeList); - - if (balanceSettings.shouldFixSpiders()) { - internal::logMessage(stkMeshBulkData.parallel(), "Preventing unnecessary movement of spider elements"); - internal::keep_spiders_on_original_proc(stkMeshBulkData, balanceSettings, changeList); - } - - const size_t num_global_entity_migrations = changeList.get_num_global_entity_migrations(); - const size_t max_global_entity_migrations = changeList.get_max_global_entity_migrations(); - - if (num_global_entity_migrations > 0) - { - internal::logMessage(stkMeshBulkData.parallel(), "Moving elements to new processors"); - internal::rebalance(changeList); - - if (balanceSettings.shouldFixMechanisms()) - { - internal::logMessage(stkMeshBulkData.parallel(), "Fixing mechanisms found during decomposition"); - stk::balance::internal::detectAndFixMechanisms(balanceSettings, stkMeshBulkData); - } - - if (balanceSettings.shouldFixSpiders()) - { - internal::logMessage(stkMeshBulkData.parallel(), "Fixing spider elements"); - stk::balance::internal::fix_spider_elements(balanceSettings, stkMeshBulkData); - } - - if (balanceSettings.shouldPrintMetrics()) - internal::print_rebalance_metrics(num_global_entity_migrations, max_global_entity_migrations, stkMeshBulkData); - } - - internal::logMessage(stkMeshBulkData.parallel(), "Finished rebalance"); - - - return (num_global_entity_migrations > 0); -} - bool colorMesh(const BalanceSettings& balanceSettings, stk::mesh::BulkData& bulk, const stk::mesh::PartVector& parts) { ThrowRequireMsg(balanceSettings.getGraphOption() == BalanceSettings::COLOR_MESH || @@ -289,31 +240,18 @@ bool colorMesh(const BalanceSettings& balanceSettings, stk::mesh::BulkData& bulk return totalNumColors > 0; } -bool internalBalanceStkMesh(const BalanceSettings& balanceSettings, BalanceMesh& mesh, const std::vector& selectors) -{ - if( balanceSettings.getGraphOption() == BalanceSettings::LOAD_BALANCE ) - { - return loadBalance(balanceSettings, mesh.get_bulk(), mesh.get_bulk().parallel_size(), selectors); - } - return false; -} - -bool internalBalanceStkMesh(const BalanceSettings& balanceSettings, BalanceMesh& mesh) -{ - std::vector selectors = {mesh.get_bulk().mesh_meta_data().locally_owned_part()}; - return internalBalanceStkMesh(balanceSettings, mesh, selectors); -} - bool balanceStkMesh(const BalanceSettings& balanceSettings, stk::mesh::BulkData& stkMeshBulkData, const std::vector& selectors) { - ExternalMesh mesh(stkMeshBulkData); - return internalBalanceStkMesh(balanceSettings, mesh, selectors); + const Balancer balancer(balanceSettings); + BalanceMesh mesh(stkMeshBulkData); + return balancer.balance(mesh, selectors); } bool balanceStkMesh(const BalanceSettings& balanceSettings, stk::mesh::BulkData& stkMeshBulkData) { - ExternalMesh mesh(stkMeshBulkData); - return internalBalanceStkMesh(balanceSettings, mesh); + const Balancer balancer(balanceSettings); + BalanceMesh mesh(stkMeshBulkData); + return balancer.balance(mesh); } bool balanceStkMeshNodes(const BalanceSettings& balanceSettings, stk::mesh::BulkData& stkMeshBulkData) @@ -374,174 +312,5 @@ void fill_coloring_parts_with_topology(const stk::mesh::MetaData& meta, const st } } -void run_static_stk_balance_with_settings(stk::io::StkMeshIoBroker &stkInput, BalanceMesh& inputMesh, const std::string& outputFilename, MPI_Comm comm, stk::balance::BalanceSettings& graphOptions) -{ - stk::mesh::MetaData metaB; - stk::mesh::BulkData bulkB(metaB, comm); - - stk::mesh::BulkData& inputBulk = inputMesh.get_bulk(); - - stk::mesh::BulkData *balancedBulk = nullptr; - if(stk::io::get_transient_fields(inputBulk.mesh_meta_data()).empty()) - { - balancedBulk = &inputBulk; - } - else - { - internal::logMessage(inputBulk.parallel(), "Copying input mesh to handle transient fields"); - stk::tools::copy_mesh(inputBulk, inputBulk.mesh_meta_data().universal_part(), bulkB); - balancedBulk = &bulkB; - } - - ExternalMesh balancedMesh(*balancedBulk); - stk::balance::internalBalanceStkMesh(graphOptions, balancedMesh); - - stk::io::StkMeshIoBroker stkOutput; - stkOutput.set_bulk_data(*balancedBulk); - stkOutput.set_attribute_field_ordering_stored_by_part_ordinal(stkInput.get_attribute_field_ordering_stored_by_part_ordinal()); - - stk::transfer_utils::TransientFieldTransferById transfer(stkInput, stkOutput); - transfer.transfer_and_write_transient_fields(outputFilename); - - internal::logMessage(inputBulk.parallel(), "Finished writing output mesh"); -} - -void register_internal_fields(stk::mesh::BulkData& bulkData, stk::balance::BalanceSettings& balanceSettings) -{ - if (balanceSettings.shouldFixSpiders()) { - stk::mesh::MetaData& meta = bulkData.mesh_meta_data(); - stk::mesh::Field & field = meta.declare_field>(stk::topology::NODE_RANK, - balanceSettings.getSpiderConnectivityCountFieldName()); - const int initValue = 0; - stk::mesh::put_field_on_mesh(field, meta.universal_part(), &initValue); - } -} - -void read_mesh_with_auto_decomp(stk::io::StkMeshIoBroker & stkIo, - const std::string& meshSpec, - stk::mesh::BulkData& bulkData, - stk::balance::BalanceSettings & balanceSettings) -{ - stkIo.set_bulk_data(bulkData); - stkIo.add_mesh_database(meshSpec, stk::io::READ_MESH); - stkIo.create_input_mesh(); - stkIo.add_all_mesh_fields_as_input_fields(); - - register_internal_fields(bulkData, balanceSettings); - - stkIo.populate_bulk_data(); - - if(stkIo.check_integer_size_requirements() == 8) { - bulkData.set_large_ids_flag(true); - } -} - -void initial_decomp_and_balance(BalanceMesh& mesh, - stk::balance::BalanceSettings& graphOptions, - const std::string& exodusFilename, - const std::string& outputFilename, - const std::string & initialDecompMethod) -{ - stk::io::StkMeshIoBroker stkInput; - stkInput.property_add(Ioss::Property("DECOMPOSITION_METHOD", initialDecompMethod)); - - internal::logMessage(mesh.get_bulk().parallel(), "Reading mesh and performing initial decomposition"); - read_mesh_with_auto_decomp(stkInput, exodusFilename, mesh.get_bulk(), graphOptions); - - make_mesh_consistent_with_parallel_mesh_rule1(mesh.get_bulk()); - run_static_stk_balance_with_settings(stkInput, mesh, outputFilename, mesh.get_bulk().parallel(), graphOptions); -} - -void initial_decomp_and_balance(stk::mesh::BulkData &bulk, - stk::balance::BalanceSettings& graphOptions, - const std::string& exodusFilename, - const std::string& outputFilename, - const std::string & initialDecompMethod) -{ - ExternalMesh mesh(bulk); - initial_decomp_and_balance(mesh, graphOptions, exodusFilename, outputFilename, initialDecompMethod); -} - -void run_stk_balance_with_settings(const std::string& outputFilename, const std::string& exodusFilename, MPI_Comm comm, stk::balance::BalanceSettings& balanceSettings) -{ - const std::string trimmedInputName = (exodusFilename.substr(0,2) == "./") ? exodusFilename.substr(2) : exodusFilename; - const std::string trimmedOutputName = (outputFilename.substr(0,2) == "./") ? outputFilename.substr(2) : outputFilename; - const bool isSerial = (stk::parallel_machine_size(comm) == 1); - const bool inputEqualsOutput = (trimmedOutputName == trimmedInputName); - ThrowRequireMsg(!(isSerial && inputEqualsOutput), - "Running on 1 MPI rank and input-file ("<()); - searchToleranceType = RELATIVE; - } - } - - if (options.is_option_provided(stk::balance::ParsedOptions::CONTACT_SEARCH)) { - balanceSettings.setIncludeSearchResultsInGraph(options.useContactSearch); - } - - if (options.is_option_provided(stk::balance::ParsedOptions::FACE_SEARCH_ABS_TOL)) searchToleranceType = ABSOLUTE; - if (options.is_option_provided(stk::balance::ParsedOptions::FACE_SEARCH_REL_TOL)) searchToleranceType = RELATIVE; - - if (searchToleranceType == ABSOLUTE) { - const double tolerance = options.is_option_provided(stk::balance::ParsedOptions::FACE_SEARCH_ABS_TOL) ? - options.faceSearchAbsTol : stk::balance::defaultFaceSearchTolerance; - balanceSettings.setToleranceForFaceSearch(tolerance); - } - else if (searchToleranceType == RELATIVE) { - if (options.is_option_provided(stk::balance::ParsedOptions::FACE_SEARCH_REL_TOL)) { - balanceSettings.setToleranceFunctionForFaceSearch( - std::make_shared(options.faceSearchRelTol)); - } - else { - balanceSettings.setToleranceFunctionForFaceSearch( - std::make_shared()); - } - } - - if (options.is_option_provided(stk::balance::ParsedOptions::DECOMP_METHOD)) { - balanceSettings.setDecompMethod(options.decompMethod); - } - - if (options.is_option_provided(stk::balance::ParsedOptions::INITIAL_DECOMP_METHOD)) { - balanceSettings.setInitialDecompMethod(options.initialDecompMethod); - } - - return balanceSettings; -} - -void run_stk_rebalance(const stk::balance::ParsedOptions& options, MPI_Comm comm) -{ - const std::string& outputDirectory = options.outputDirectory; - const std::string& inputFile = options.m_inFile; - - StkBalanceSettings balanceSettings = create_balance_settings(options); - - std::string outputFilename = construct_output_file_name(outputDirectory, inputFile); - run_stk_balance_with_settings(outputFilename, inputFile, comm, balanceSettings); -} - } } diff --git a/packages/stk/stk_balance/stk_balance/balance.hpp b/packages/stk/stk_balance/stk_balance/balance.hpp index 05433f395b81..13b19421463b 100644 --- a/packages/stk/stk_balance/stk_balance/balance.hpp +++ b/packages/stk/stk_balance/stk_balance/balance.hpp @@ -1,48 +1,45 @@ - // Copyright 2002 - 2008, 2010, 2011 National Technology Engineering +// Copyright 2002 - 2008, 2010, 2011 National Technology Engineering // Solutions of Sandia, LLC (NTESS). Under the terms of Contract // DE-NA0003525 with NTESS, the U.S. Government retains certain rights // in this software. // - // Redistribution and use in source and binary forms, with or without - // modification, are permitted provided that the following conditions are - // met: - // - // * Redistributions of source code must retain the above copyright - // notice, this list of conditions and the following disclaimer. - // - // * Redistributions in binary form must reproduce the above - // copyright notice, this list of conditions and the following - // disclaimer in the documentation and/or other materials provided - // with the distribution. - // +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following +// disclaimer in the documentation and/or other materials provided +// with the distribution. +// // * Neither the name of NTESS nor the names of its contributors // may be used to endorse or promote products derived from this // software without specific prior written permission. // - // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - // "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - // A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - // +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + #ifndef STKBALANCE_HPP #define STKBALANCE_HPP -namespace stk { namespace balance { class BalanceSettings; } } namespace stk { namespace mesh { class BulkData; } } #include #include #include #include "mpi.h" -#include -#include #include "balanceUtils.hpp" // for BalanceSettings, etc namespace stk @@ -55,17 +52,9 @@ bool balanceStkMesh(const BalanceSettings& balanceSettings, stk::mesh::BulkData& bool balanceStkMeshNodes(const BalanceSettings& balanceSettings, stk::mesh::BulkData& stkMeshBulkData); bool colorStkMesh(const BalanceSettings& colorSettings, stk::mesh::BulkData& stkMeshBulkData); -void run_stk_rebalance(const ParsedOptions& options, MPI_Comm comm); -void run_stk_balance_with_settings(const std::string& outputDirectory, const std::string& exodusFilename, MPI_Comm comm, stk::balance::BalanceSettings& graphOptions); -void initial_decomp_and_balance(stk::mesh::BulkData &bulk, - stk::balance::BalanceSettings& graphOptions, - const std::string& exodusFilename, - const std::string& outputFilename, - const std::string& initialDecompMethod); void fill_coloring_parts(const stk::mesh::MetaData& meta, stk::mesh::PartVector& coloringParts); void fill_coloring_parts_with_topology(const stk::mesh::MetaData& meta, const stk::topology topo, stk::mesh::PartVector& coloringParts); std::string construct_coloring_part_name(const int color, const stk::mesh::Part& part); -StkBalanceSettings create_balance_settings(const stk::balance::ParsedOptions & options); } } #endif diff --git a/packages/stk/stk_balance/stk_balance/balanceUtils.cpp b/packages/stk/stk_balance/stk_balance/balanceUtils.cpp index b7c3cbd9e874..0a5a467fcfea 100644 --- a/packages/stk/stk_balance/stk_balance/balanceUtils.cpp +++ b/packages/stk/stk_balance/stk_balance/balanceUtils.cpp @@ -17,7 +17,7 @@ namespace balance ////////////////////////////////////////////////////////////////////////// BalanceSettings::BalanceSettings() - : initialDecompMethod("RIB") + : m_initialDecompMethod("RIB") {} size_t BalanceSettings::getNumNodesRequiredForConnection(stk::topology element1Topology, stk::topology element2Topology) const @@ -135,14 +135,9 @@ std::string BalanceSettings::getDecompMethod() const return std::string("parmetis"); } -void BalanceSettings::setInitialDecompMethod(const std::string& method) -{ - initialDecompMethod = method; -} - std::string BalanceSettings::getInitialDecompMethod() const { - return initialDecompMethod; + return m_initialDecompMethod; } std::string BalanceSettings::getCoordinateFieldName() const @@ -190,12 +185,22 @@ bool BalanceSettings::shouldFixSpiders() const return false; } -std::string BalanceSettings::getSpiderConnectivityCountFieldName() const +std::string BalanceSettings::getSpiderBeamConnectivityCountFieldName() const { return "beam_connectivity_count"; } -const stk::mesh::Field * BalanceSettings::getSpiderConnectivityCountField(const stk::mesh::BulkData & stkMeshBulkData) const +std::string BalanceSettings::getSpiderVolumeConnectivityCountFieldName() const +{ + return "volume_connectivity_count"; +} + +const stk::mesh::Field * BalanceSettings::getSpiderBeamConnectivityCountField(const stk::mesh::BulkData & stkMeshBulkData) const +{ + return nullptr; +} + +const stk::mesh::Field * BalanceSettings::getSpiderVolumeConnectivityCountField(const stk::mesh::BulkData & stkMeshBulkData) const { return nullptr; } @@ -223,6 +228,26 @@ unsigned BalanceSettings::getNodeBalancerMaxIterations() const return 5; } +void BalanceSettings::set_input_filename(const std::string& filename) +{ + m_inputFilename = filename; +} + +std::string BalanceSettings::get_input_filename() const +{ + return m_inputFilename; +} + +void BalanceSettings::set_output_filename(const std::string& filename) +{ + m_outputFilename = filename; +} + +std::string BalanceSettings::get_output_filename() const +{ + return m_outputFilename; +} + ////////////////////////////////////// size_t GraphCreationSettings::getNumNodesRequiredForConnection(stk::topology element1Topology, stk::topology element2Topology) const @@ -319,6 +344,8 @@ int GraphCreationSettings::getGraphVertexWeight(stk::topology type) const return 6; case stk::topology::WEDGE_6: return 2; + case stk::topology::WEDGE_12: + // TODO case stk::topology::WEDGE_15: return 12; default: @@ -523,6 +550,7 @@ int GraphCreationSettings::getEdgeWeightTableIndex(stk::topology elementTopology case stk::topology::TET_11: case stk::topology::PYRAMID_13: case stk::topology::PYRAMID_14: + case stk::topology::WEDGE_12: case stk::topology::WEDGE_15: case stk::topology::WEDGE_18: case stk::topology::HEX_27: @@ -561,14 +589,28 @@ bool GraphCreationSettings::shouldFixSpiders() const return m_shouldFixSpiders; } -const stk::mesh::Field * GraphCreationSettings::getSpiderConnectivityCountField(const stk::mesh::BulkData & stkMeshBulkData) const +const stk::mesh::Field * GraphCreationSettings::getSpiderBeamConnectivityCountField(const stk::mesh::BulkData & stkMeshBulkData) const +{ + if (m_spiderBeamConnectivityCountField == nullptr) { + m_spiderBeamConnectivityCountField = + reinterpret_cast*>(stkMeshBulkData.mesh_meta_data().get_field(stk::topology::NODE_RANK, + getSpiderBeamConnectivityCountFieldName())); + ThrowRequireMsg(m_spiderBeamConnectivityCountField != nullptr, + "Must create nodal spider beam connectivity count field when stomping spiders."); + } + return m_spiderBeamConnectivityCountField; +} + +const stk::mesh::Field * GraphCreationSettings::getSpiderVolumeConnectivityCountField(const stk::mesh::BulkData & stkMeshBulkData) const { - if (m_spiderConnectivityCountField == nullptr) { - m_spiderConnectivityCountField = reinterpret_cast*>(stkMeshBulkData.mesh_meta_data().get_field(stk::topology::NODE_RANK, - getSpiderConnectivityCountFieldName())); - ThrowRequireMsg(m_spiderConnectivityCountField != nullptr, "Must create spider connectivity field when stomping spiders."); + if (m_spiderVolumeConnectivityCountField == nullptr) { + m_spiderVolumeConnectivityCountField = + reinterpret_cast*>(stkMeshBulkData.mesh_meta_data().get_field(stk::topology::ELEM_RANK, + getSpiderVolumeConnectivityCountFieldName())); + ThrowRequireMsg(m_spiderVolumeConnectivityCountField != nullptr, + "Must create element spider volume connectivity count field when stomping spiders."); } - return m_spiderConnectivityCountField; + return m_spiderVolumeConnectivityCountField; } void GraphCreationSettings::setUseNodeBalancer(bool useBalancer) diff --git a/packages/stk/stk_balance/stk_balance/balanceUtils.hpp b/packages/stk/stk_balance/stk_balance/balanceUtils.hpp index f182e6c96032..3c7d87d47441 100644 --- a/packages/stk/stk_balance/stk_balance/balanceUtils.hpp +++ b/packages/stk/stk_balance/stk_balance/balanceUtils.hpp @@ -39,6 +39,7 @@ #include #include "stk_mesh/base/Field.hpp" // for field_data #include "stk_mesh/base/FieldBase.hpp" +#include "stk_balance/setup/DefaultSettings.hpp" #include namespace stk @@ -52,8 +53,6 @@ class FaceSearchTolerance; typedef std::vector ElementDecomposition; typedef stk::mesh::Field DoubleFieldType; -constexpr double defaultFaceSearchTolerance = 0.0001; - class DecompositionChangeList { public: @@ -123,7 +122,6 @@ class BalanceSettings virtual void setDecompMethod(const std::string& method) ; virtual std::string getDecompMethod() const ; - virtual void setInitialDecompMethod(const std::string& method) ; virtual std::string getInitialDecompMethod() const ; virtual std::string getCoordinateFieldName() const ; @@ -145,16 +143,34 @@ class BalanceSettings virtual bool shouldFixMechanisms() const; virtual bool shouldFixSpiders() const; - virtual std::string getSpiderConnectivityCountFieldName() const; - virtual const stk::mesh::Field * getSpiderConnectivityCountField(const stk::mesh::BulkData & stkMeshBulkData) const; + virtual std::string getSpiderBeamConnectivityCountFieldName() const; + virtual std::string getSpiderVolumeConnectivityCountFieldName() const; + virtual const stk::mesh::Field * getSpiderBeamConnectivityCountField(const stk::mesh::BulkData & stkMeshBulkData) const; + virtual const stk::mesh::Field * getSpiderVolumeConnectivityCountField(const stk::mesh::BulkData & stkMeshBulkData) const; virtual bool useLocalIds() const; virtual bool useNodeBalancer() const; virtual double getNodeBalancerTargetLoadBalance() const; virtual unsigned getNodeBalancerMaxIterations() const; + virtual void set_input_filename(const std::string& filename); + virtual std::string get_input_filename() const; + + virtual void set_output_filename(const std::string& filename); + virtual std::string get_output_filename() const; + + virtual void setShouldFixSpiders(bool fixSpiders) { } + virtual void setEdgeWeightForSearch(double w) { } + virtual void setVertexWeightMultiplierForVertexInSearch(double w) { } + virtual void setToleranceForFaceSearch(double tol) { } + +protected: + const DefaultSettings defaults; + private: - std::string initialDecompMethod; + std::string m_initialDecompMethod; + std::string m_inputFilename; + std::string m_outputFilename; }; class BasicGeometricSettings : public BalanceSettings @@ -166,24 +182,32 @@ class BasicGeometricSettings : public BalanceSettings class GraphCreationSettings : public BalanceSettings { public: - GraphCreationSettings(): GraphCreationSettings(defaultFaceSearchTolerance, 3, 15, "parmetis", 5.0) - {} - - GraphCreationSettings(double faceSearchTol, double particleSearchTol, double edgeWeightSearch, const std::string& decompMethod, double multiplierVWSearch) - : mToleranceForFaceSearch(faceSearchTol), - mToleranceForParticleSearch(particleSearchTol), - edgeWeightForSearch (edgeWeightSearch), - method(decompMethod), - vertexWeightMultiplierForVertexInSearch(multiplierVWSearch), + GraphCreationSettings() + : mToleranceForFaceSearch(defaults.faceSearchAbsTol), + mToleranceForParticleSearch(defaults.particleSearchTol), + edgeWeightForSearch(defaults.faceSearchEdgeWeight), + method(defaults.decompMethod), + vertexWeightMultiplierForVertexInSearch(defaults.faceSearchVertexMultiplier), m_UseConstantToleranceForFaceSearch(true), m_shouldFixSpiders(false), - m_spiderConnectivityCountField(nullptr), - m_includeSearchResultInGraph(true), + m_spiderBeamConnectivityCountField(nullptr), + m_spiderVolumeConnectivityCountField(nullptr), + m_includeSearchResultInGraph(defaults.useContactSearch), m_useNodeBalancer(false), m_nodeBalancerTargetLoadBalance(1.0), m_nodeBalancerMaxIterations(5) {} + GraphCreationSettings(double faceSearchTol, double particleSearchTol, double edgeWeightSearch, const std::string& decompMethod, double multiplierVWSearch) + : GraphCreationSettings() + { + mToleranceForFaceSearch = faceSearchTol; + mToleranceForParticleSearch = particleSearchTol; + edgeWeightForSearch = edgeWeightSearch; + method = decompMethod; + vertexWeightMultiplierForVertexInSearch = multiplierVWSearch; + } + virtual ~GraphCreationSettings() = default; size_t getNumNodesRequiredForConnection(stk::topology element1Topology, stk::topology element2Topology) const override; @@ -221,7 +245,8 @@ class GraphCreationSettings : public BalanceSettings virtual bool shouldFixMechanisms() const override; virtual bool shouldFixSpiders() const override; - virtual const stk::mesh::Field * getSpiderConnectivityCountField(const stk::mesh::BulkData & stkMeshBulkData) const override; + virtual const stk::mesh::Field * getSpiderBeamConnectivityCountField(const stk::mesh::BulkData & stkMeshBulkData) const override; + virtual const stk::mesh::Field * getSpiderVolumeConnectivityCountField(const stk::mesh::BulkData & stkMeshBulkData) const override; virtual void setUseNodeBalancer(bool useBalancer); virtual void setNodeBalancerTargetLoadBalance(double targetLoadBalance); @@ -241,7 +266,8 @@ class GraphCreationSettings : public BalanceSettings double vertexWeightMultiplierForVertexInSearch; bool m_UseConstantToleranceForFaceSearch; bool m_shouldFixSpiders; - mutable const stk::mesh::Field * m_spiderConnectivityCountField; + mutable const stk::mesh::Field * m_spiderBeamConnectivityCountField; + mutable const stk::mesh::Field * m_spiderVolumeConnectivityCountField; std::shared_ptr m_faceSearchToleranceFunction; bool m_includeSearchResultInGraph; bool m_useNodeBalancer; @@ -293,6 +319,7 @@ class UserSpecifiedVertexWeightsSetting : public GraphCreationSettings public: UserSpecifiedVertexWeightsSetting() { + method = "parmetis"; m_includeSearchResultInGraph = false; } virtual double getGraphEdgeWeight(stk::topology element1Topology, stk::topology element2Topology) const { return 1.0; } @@ -310,7 +337,6 @@ class UserSpecifiedVertexWeightsSetting : public GraphCreationSettings private: std::vector vertex_weights; - std::string method = std::string("parmetis"); std::string m_field_name = std::string("coordinates"); }; @@ -330,6 +356,7 @@ class FieldVertexWeightSettings : public GraphCreationSettings m_weightField(weightField), m_defaultWeight(defaultWeight) { + method = "parmetis"; m_includeSearchResultInGraph = false; } virtual ~FieldVertexWeightSettings() = default; @@ -351,14 +378,13 @@ class FieldVertexWeightSettings : public GraphCreationSettings } protected: - FieldVertexWeightSettings() = default; + FieldVertexWeightSettings() = delete; FieldVertexWeightSettings(const FieldVertexWeightSettings&) = delete; FieldVertexWeightSettings& operator=(const FieldVertexWeightSettings&) = delete; const stk::mesh::BulkData & m_stkMeshBulkData; const DoubleFieldType &m_weightField; const double m_defaultWeight; - std::string method = std::string("parmetis"); }; class MultipleCriteriaSettings : public GraphCreationSettings @@ -409,7 +435,7 @@ class MultipleCriteriaSettings : public GraphCreationSettings } protected: - MultipleCriteriaSettings() = default; + MultipleCriteriaSettings() = delete; MultipleCriteriaSettings(const MultipleCriteriaSettings&) = delete; MultipleCriteriaSettings& operator=(const MultipleCriteriaSettings&) = delete; const std::vector*> m_critFields; diff --git a/packages/stk/stk_balance/stk_balance/balance_main/balanceMain.cpp b/packages/stk/stk_balance/stk_balance/balance_main/balanceMain.cpp index cbf664c04951..ea180f568a66 100644 --- a/packages/stk/stk_balance/stk_balance/balance_main/balanceMain.cpp +++ b/packages/stk/stk_balance/stk_balance/balance_main/balanceMain.cpp @@ -1,100 +1,51 @@ - // Copyright 2002 - 2008, 2010, 2011 National Technology Engineering +// Copyright 2002 - 2008, 2010, 2011 National Technology Engineering // Solutions of Sandia, LLC (NTESS). Under the terms of Contract // DE-NA0003525 with NTESS, the U.S. Government retains certain rights // in this software. // - // Redistribution and use in source and binary forms, with or without - // modification, are permitted provided that the following conditions are - // met: - // - // * Redistributions of source code must retain the above copyright - // notice, this list of conditions and the following disclaimer. - // - // * Redistributions in binary form must reproduce the above - // copyright notice, this list of conditions and the following - // disclaimer in the documentation and/or other materials provided - // with the distribution. - // +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following +// disclaimer in the documentation and/or other materials provided +// with the distribution. +// // * Neither the name of NTESS nor the names of its contributors // may be used to endorse or promote products derived from this // software without specific prior written permission. // - // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - // "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - // A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "mpi.h" -#include - -#include -#include -#include -#include - -#include -#include -#include -#include -#include - -#include -#include -#include +#include "Kokkos_Core.hpp" -#include "stk_util/environment/EnvData.hpp" +#include "stk_balance/setup/LifeCycle.hpp" -int main(int argc, const char**argv) +int main(int argc, const char** argv) { - MPI_Init(&argc, const_cast(&argv)); - MPI_Comm comm = MPI_COMM_WORLD; + MPI_Init(&argc, const_cast(&argv)); + Kokkos::initialize(argc, const_cast(argv)); - if(stk::parallel_machine_rank(comm) != 0) - { - stk::EnvData::instance().m_outputP0 = &stk::EnvData::instance().m_outputNull; - } + stk::balance::LifeCycle balance(MPI_COMM_WORLD, argc, argv); + balance.run(); - Kokkos::initialize(argc, const_cast(argv)); + Kokkos::finalize_all(); + MPI_Finalize(); - std::string execName = stk::tailname(argv[0]); - stk::balance::CommandLineOptions cmdLineOptions; - std::string quickExample = stk::balance::get_quick_example(execName, cmdLineOptions.infile.name, cmdLineOptions.outputDirectory.name, comm); - stk::balance::ParsedOptions balanceOptions; - try - { - balanceOptions = stk::balance::parse_balance_command_line(argc, - argv, - execName, - comm); - } - catch(const std::exception &e) - { - std::string errorMessage = e.what() + stk::get_quick_error(execName, quickExample); - stk::parallel::print_and_exit(errorMessage, comm); - } - - stk::parallel::require_file_exists(balanceOptions.m_inFile, execName, quickExample, comm); - - stk::balance::print_running_msg(execName, balanceOptions, comm); - try { - stk::balance::run_stk_rebalance(balanceOptions, comm); - } - catch(std::exception& e) - { - std::cerr< +#include + +namespace stk { +namespace balance { + +void verify_mesh_ids_are_not_too_large(const stk::mesh::BulkData& bulk) +{ + stk::mesh::EntityId maxAllowableId = std::numeric_limits::max(); + stk::mesh::EntityId maxElemId = stk::mesh::get_max_id_on_local_proc(bulk, stk::topology::ELEM_RANK); + + stk::mesh::EntityId maxNodeId = stk::mesh::get_max_id_on_local_proc(bulk, stk::topology::NODE_RANK); + stk::mesh::EntityId maxMeshId = std::max(maxElemId, maxNodeId); + + bool localMeshIdTooLarge = maxMeshId > maxAllowableId; + bool globalMeshIdTooLarge = stk::is_true_on_any_proc(bulk.parallel(), localMeshIdTooLarge); + + ThrowRequireMsg(!globalMeshIdTooLarge, "Mesh has global-ids too large to represent in the index type that was configured for Trilinos ("<& selectors) +{ + internal::logMessage(stkMeshBulkData.parallel(), "Computing new decomposition"); + + if (sizeof(BalanceGlobalNumber) < sizeof(stk::mesh::EntityId)) { + verify_mesh_ids_are_not_too_large(stkMeshBulkData); + } + + stk::mesh::EntityProcVec decomp; + internal::calculateGeometricOrGraphBasedDecomp(balanceSettings, numSubdomainsToCreate, decomp, stkMeshBulkData, selectors); + + DecompositionChangeList changeList(stkMeshBulkData, decomp); + balanceSettings.modifyDecomposition(changeList); + + internal::logMessage(stkMeshBulkData.parallel(), "Moving coincident elements to the same processor"); + keep_coincident_elements_together(stkMeshBulkData, changeList); + + if (balanceSettings.shouldFixSpiders()) { + internal::logMessage(stkMeshBulkData.parallel(), "Preventing unnecessary movement of spider elements"); + internal::keep_spiders_on_original_proc(stkMeshBulkData, balanceSettings, changeList); + } + + const size_t num_global_entity_migrations = changeList.get_num_global_entity_migrations(); + const size_t max_global_entity_migrations = changeList.get_max_global_entity_migrations(); + + if (num_global_entity_migrations > 0) + { + internal::logMessage(stkMeshBulkData.parallel(), "Moving elements to new processors"); + internal::rebalance(changeList); + + if (balanceSettings.shouldFixMechanisms()) + { + internal::logMessage(stkMeshBulkData.parallel(), "Fixing mechanisms found during decomposition"); + stk::balance::internal::detectAndFixMechanisms(balanceSettings, stkMeshBulkData); + } + + if (balanceSettings.shouldFixSpiders()) + { + internal::logMessage(stkMeshBulkData.parallel(), "Fixing spider elements"); + stk::balance::internal::fix_spider_elements(balanceSettings, stkMeshBulkData); + } + + if (balanceSettings.shouldPrintMetrics()) + internal::print_rebalance_metrics(num_global_entity_migrations, max_global_entity_migrations, stkMeshBulkData); + } + + internal::logMessage(stkMeshBulkData.parallel(), "Finished rebalance"); + + + return (num_global_entity_migrations > 0); +} + +Balancer::Balancer(const BalanceSettings& settings) + : m_settings(settings) +{ } + +bool Balancer::balance(BalanceMesh& mesh) const +{ + std::vector selectors = {mesh.get_bulk().mesh_meta_data().locally_owned_part()}; + return balance(mesh, selectors); +} + +bool Balancer::balance(BalanceMesh& mesh, const std::vector& selectors) const +{ + if( m_settings.getGraphOption() == BalanceSettings::LOAD_BALANCE ) { + return loadBalance(m_settings, mesh.get_bulk(), mesh.get_bulk().parallel_size(), selectors); + } + return false; +} + +} } + diff --git a/packages/stk/stk_balance/stk_balance/internal/Balancer.hpp b/packages/stk/stk_balance/stk_balance/internal/Balancer.hpp new file mode 100644 index 000000000000..d5beadac279a --- /dev/null +++ b/packages/stk/stk_balance/stk_balance/internal/Balancer.hpp @@ -0,0 +1,57 @@ +// Copyright 2002 - 2008, 2010, 2011 National Technology Engineering +// Solutions of Sandia, LLC (NTESS). Under the terms of Contract +// DE-NA0003525 with NTESS, the U.S. Government retains certain rights +// in this software. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following +// disclaimer in the documentation and/or other materials provided +// with the distribution. +// +// * Neither the name of NTESS nor the names of its contributors +// may be used to endorse or promote products derived from this +// software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +#ifndef STK_BALANCE_BALANCER_HPP +#define STK_BALANCE_BALANCER_HPP + +#include "stk_balance/balanceUtils.hpp" +#include "stk_balance/mesh/BalanceMesh.hpp" + +namespace stk { +namespace balance { + +class Balancer +{ +public: + Balancer(const BalanceSettings& settings); + + bool balance(BalanceMesh& mesh) const; + bool balance(BalanceMesh& mesh, const std::vector& selectors) const; + +private: + const BalanceSettings& m_settings; +}; + +} } + +#endif diff --git a/packages/stk/stk_balance/stk_balance/internal/Inputs.hpp b/packages/stk/stk_balance/stk_balance/internal/Inputs.hpp index 16dd49655f45..b466e322abd0 100644 --- a/packages/stk/stk_balance/stk_balance/internal/Inputs.hpp +++ b/packages/stk/stk_balance/stk_balance/internal/Inputs.hpp @@ -33,68 +33,10 @@ #ifndef TPLS_SRC_TRILINOS_PACKAGES_STK_STK_BALANCE_STK_BALANCE_INTERNAL_INPUTS_HPP_ #define TPLS_SRC_TRILINOS_PACKAGES_STK_STK_BALANCE_STK_BALANCE_INTERNAL_INPUTS_HPP_ -#include #include -#include // move us -#include -#include -#include -#include -#include -#include - namespace stk { namespace balance { -// Only call for proc 0 (or any single proc) -// Copied and modified from Ioss_DatabaseIO.C::create_path -inline -bool create_path(const std::string &path) -{ - bool error_found = false; - std::ostringstream errmsg; - - const int mode = 0777; // Users umask will be applied to this. - - auto iter = path.begin(); - while(iter != path.end() && !error_found) - { - iter = std::find(iter, path.end(), '/'); - std::string path_root = std::string(path.begin(), iter); - - if(iter != path.end()) - { - ++iter; // Skip past the '/' - } - - if(path_root.empty()) - { // Path started with '/' - continue; - } - - struct stat st; - if(stat(path_root.c_str(), &st) != 0) - { - if(mkdir(path_root.c_str(), mode) != 0 && errno != EEXIST) - { - errmsg << "ERROR: Cannot create directory '" << path_root << "' : " << std::strerror(errno) << "\n"; - error_found = true; - } - } - else if(!S_ISDIR(st.st_mode)) - { - errno = ENOTDIR; - errmsg << "ERROR: Path '" << path_root << "' is not a directory.\n"; - error_found = true; - } - } - - if(error_found) - std::cerr << errmsg.str(); - - return error_found == false; -} - inline bool should_write_usage_info(const std::string& filename) { diff --git a/packages/stk/stk_balance/stk_balance/internal/Vertices.cpp b/packages/stk/stk_balance/stk_balance/internal/Vertices.cpp index 1ec12839938f..cce79970bbd5 100644 --- a/packages/stk/stk_balance/stk_balance/internal/Vertices.cpp +++ b/packages/stk/stk_balance/stk_balance/internal/Vertices.cpp @@ -13,8 +13,9 @@ void Vertices::fillVertexIds(const stk::mesh::BulkData& bulkData, const stk::mesh::EntityVector &entities) { mVertexIds.resize(entities.size(), 0); - for(size_t i=0;i -#include - -#include "mpi.h" - -#include -#include -#include -#include -#include - -#include -#include - -namespace -{ - -stk::balance::CommandLineOptions cmdLineOptions; - -} - -namespace stk { -namespace balance { - -enum { OK=0, NOT_OK = 1 }; - -bool am_proc0(MPI_Comm comm) -{ - return stk::parallel_machine_rank(comm)==0; -} - -int handle_output_directory(const std::string& outputDirectory, MPI_Comm comm) -{ - bool path_ok = true; - if(am_proc0(comm)) - path_ok = stk::balance::create_path(outputDirectory); - - if(!stk::is_true_on_all_procs(comm, path_ok)) - { - return NOT_OK; - } - return OK; -} - -std::string get_quick_example(const std::string &execName, - const std::string &infileName, - const std::string &outputDirectoryName, - MPI_Comm comm) -{ - std::string mpiCmd = " > mpirun -n " + execName + " "; - std::string usage = "Usage:\n" - + mpiCmd + stk::angle_it(infileName) + " " + stk::bracket_it(outputDirectoryName) + " " - + stk::bracket_it("args") + "\n" - + mpiCmd + stk::dash_it(infileName) + " " + stk::angle_it(infileName) + " " - + stk::dash_it(outputDirectoryName) + " " + stk::bracket_it(outputDirectoryName) + " " - + stk::bracket_it("args") + "\n" - + "\n"; - return usage; -} - -std::string get_examples(const std::string &executableName) -{ - std::string examples = "Examples:\n\n"; - std::string tab = " "; - examples += tab + "To decompose for 16 processors:\n"; - examples += tab + tab + "> mpirun -n 16 " + executableName + " file.exo\n"; - examples += "\n"; - examples += tab + "To decompose for 512 processors and put the decomposition into a directory named 'temp1':\n"; - examples += tab + tab + "> mpirun -n 512 " + executableName + " file.exo temp1\n"; - examples += "\n"; - examples += tab + "To decompose for 64 processors and use settings suitable for solving Solid Mechanics problems:\n"; - examples += tab + tab + "> mpirun -n 64 " + executableName + " file.exo --sm\n"; - examples += "\n"; - examples += tab + "To decompose for 16 processors and use the default relative contact search tolerance:\n"; - examples += tab + tab + "> mpirun -n 16 " + executableName + " file.exo --face-search-rel-tol\n"; - examples += "\n"; - examples += tab + "To decompose for 16 processors and use a relative contact search tolerance of 0.05:\n"; - examples += tab + tab + "> mpirun -n 16 " + executableName + " file.exo --face-search-rel-tol=0.05\n"; - examples += "\n"; - examples += tab + "To decompose for 16 processors with the RCB decomposition method:\n"; - examples += tab + tab + "> mpirun -n 16 " + executableName + " file.exo --decomp-method=rcb\n"; - return examples; -} - -void parse_app_defaults(const stk::CommandLineParserParallel& commandLine, - const std::string &optionName, - enum AppTypeDefaults appType, - ParsedOptions &balanceOptions) -{ - if(commandLine.is_option_provided(optionName)) - { - if(balanceOptions.appTypeDefaults != NO_DEFAULTS) - throw std::invalid_argument("Can't set default settings for multiple apps at the same time."); - balanceOptions.set_app_type_default(appType); - } -} - -void parse_balance_options(const stk::CommandLineParserParallel& commandLine, ParsedOptions& balanceOptions) -{ - if (commandLine.is_option_provided(cmdLineOptions.contactSearch.name)) { - bool useContactSearch = - get_use_contact_search(commandLine.get_option_value(cmdLineOptions.contactSearch.name)); - balanceOptions.set_contact_search(useContactSearch); - } - - if (commandLine.is_option_parsed(cmdLineOptions.faceSearchAbsTol.name)) { - const double faceSearchAbsTol = commandLine.get_option_value(cmdLineOptions.faceSearchAbsTol.name); - balanceOptions.set_face_search_abs_tol(faceSearchAbsTol); - } - - if (commandLine.is_option_parsed(cmdLineOptions.faceSearchRelTol.name)) { - const double faceSearchRelTol = commandLine.get_option_value(cmdLineOptions.faceSearchRelTol.name); - balanceOptions.set_face_search_rel_tol(faceSearchRelTol); - } - - if (commandLine.is_option_parsed(cmdLineOptions.decompMethod.name)) { - const std::string decompMethod = - validate_decomp_method(commandLine.get_option_value(cmdLineOptions.decompMethod.name)); - balanceOptions.set_decomp_method(decompMethod); - } - - const bool bothTolerancesSpecified = commandLine.is_option_parsed(cmdLineOptions.faceSearchAbsTol.name) && - commandLine.is_option_parsed(cmdLineOptions.faceSearchRelTol.name); - ThrowRequireMsg(!bothTolerancesSpecified, "Must not specify both an absolute and relative tolerance"); - - parse_app_defaults(commandLine, cmdLineOptions.sdDefaults.name, SD_DEFAULTS, balanceOptions); - parse_app_defaults(commandLine, cmdLineOptions.smDefaults.name, SM_DEFAULTS, balanceOptions); -} - -ParsedOptions parse_balance_command_line(int argc, - const char**argv, - const std::string &execName, - MPI_Comm comm) -{ - stk::CommandLineParserParallel commandLine(comm); - commandLine.add_required_positional(cmdLineOptions.infile); - commandLine.add_optional_positional(cmdLineOptions.outputDirectory, "."); - commandLine.add_flag(cmdLineOptions.smDefaults); - commandLine.add_flag(cmdLineOptions.sdDefaults); - commandLine.add_optional(cmdLineOptions.contactSearch, "on"); - commandLine.add_optional_implicit(cmdLineOptions.faceSearchAbsTol, defaultFaceSearchTolerance); - commandLine.add_optional_implicit(cmdLineOptions.faceSearchRelTol, 0.15); - commandLine.add_optional(cmdLineOptions.decompMethod, "parmetis"); - - std::string quickExample = stk::balance::get_quick_example(execName, - cmdLineOptions.infile.name, - cmdLineOptions.outputDirectory.name, comm); - - stk::parse_command_line(argc, argv, quickExample, get_examples(execName), commandLine, comm); - - ParsedOptions balanceOptions{commandLine.get_option_value(cmdLineOptions.infile.name), - commandLine.get_option_value(cmdLineOptions.outputDirectory.name)}; - parse_balance_options(commandLine, balanceOptions); - - stk::parallel::require(handle_output_directory(balanceOptions.outputDirectory, comm) == OK, - "Unable to create output directory.", comm); - - return balanceOptions; -} - -void print_running_msg(const std::string &execName, const ParsedOptions &balanceOptions, MPI_Comm comm) -{ - if(am_proc0(comm)) - { - std::cerr << "\n"; - std::cerr << "\tRunning: " << execName << " " << balanceOptions.m_inFile - << " " << balanceOptions.outputDirectory << std::endl; - std::cerr << "\n"; - } -} - -std::string construct_output_file_name(const std::string& outputDirectory, const std::string& inputFile) { - std::size_t found = inputFile.find_last_of("/"); - std::string filename = inputFile; - if (found != std::string::npos) { - filename = inputFile.substr(found + 1); - } - return outputDirectory + "/" + filename; -} - -bool get_use_contact_search(std::string useContactSearch) -{ - std::transform(useContactSearch.begin(), useContactSearch.end(), useContactSearch.begin(), ::tolower); - if (useContactSearch == "on") { - return true; - } - else if (useContactSearch == "off") { - return false; - } - else { - ThrowErrorMsg("Invalid contact search type (" + useContactSearch + "). Must be one of: [on|off]"); - return false; // To keep compiler happy - } -} - -std::string validate_decomp_method(std::string decompMethod) -{ - std::set validDecomps = {"rcb", "rib", "multijagged", - "parmetis"}; - - std::transform(decompMethod.begin(), decompMethod.end(), decompMethod.begin(), ::tolower); - std::set::const_iterator it = validDecomps.find(decompMethod); - - if (it == validDecomps.end()) { - ThrowErrorMsg("Invalid decomposition type (" + decompMethod + ")"); - } - return decompMethod; -} - -} -} diff --git a/packages/stk/stk_balance/stk_balance/internal/balanceCommandLine.hpp b/packages/stk/stk_balance/stk_balance/internal/balanceCommandLine.hpp deleted file mode 100644 index 5d04bac2c801..000000000000 --- a/packages/stk/stk_balance/stk_balance/internal/balanceCommandLine.hpp +++ /dev/null @@ -1,159 +0,0 @@ -#ifndef STK_STK_BALANCE_STK_BALANCE_INTERNAL_BALANCECOMMANDLINE_HPP_ -#define STK_STK_BALANCE_STK_BALANCE_INTERNAL_BALANCECOMMANDLINE_HPP_ -#include -#include -#include -#include -#include - -namespace stk { class CommandLineParserParallel; } - -namespace stk { -namespace balance { - -struct CommandLineOptions -{ - stk::CommandLineOption infile{"infile", "i", - "undecomposed serial input mesh file"}; - stk::CommandLineOption outputDirectory{"outputDirectory", "o", - "output directory for decomposition"}; - - stk::CommandLineOption smDefaults{"sm", "", - "Use settings suitable for solving Solid Mechanics problems. " - "This flag implies:\n" - " --face-search-rel-tol=0.15\n" - " Face search graph vertex weight multiplier = 10\n" - " Face search graph edge weight = 3"}; - stk::CommandLineOption sdDefaults{"sd", "", - "Use settings suitable for solving Structural Dynamics problems. " - "This flag implies:\n" - " --face-search-abs-tol=0.0001\n" - " Face search graph vertex weight multiplier = 5\n" - " Face search graph edge weight = 15\n" - " Handle spider elements"}; - - stk::CommandLineOption contactSearch{"contact-search", "", - "Use proximity search for contact [on|off]"}; - stk::CommandLineOption faceSearchAbsTol{"face-search-abs-tol", "", - "Use an absolute tolerance for face contact search. " - "Optionally provide a numeric tolerance value."}; - stk::CommandLineOption faceSearchRelTol{"face-search-rel-tol", "", - "Use a tolerance relative to the face size for face contact search. " - "Optionally provide a numeric tolerance value."}; - stk::CommandLineOption decompMethod{"decomp-method", "", - "Use this geometric decomposition method [rcb|rib|multijagged] " - "or graph-based decomposition method [parmetis].\n" - "Note that geometric methods do not use contact search and " - "ignore all search-related options, as well as ignoring spider elements."}; -}; - -struct ParsedOptions -{ - std::string m_inFile; - std::string outputDirectory; - enum AppTypeDefaults appTypeDefaults; - double faceSearchAbsTol; - double faceSearchRelTol; - bool useContactSearch; - std::string decompMethod; - std::string initialDecompMethod; - - enum ParserFlags { - APP_TYPE = 1, - FACE_SEARCH_ABS_TOL = 2, - FACE_SEARCH_REL_TOL = 4, - CONTACT_SEARCH = 8, - DECOMP_METHOD = 16, - INITIAL_DECOMP_METHOD = 32 - }; - - ParsedOptions() - : ParsedOptions("", "") - { - } - - ParsedOptions(const std::string& inFile_, const std::string& outputDirectory_) - : m_inFile(inFile_), - outputDirectory(outputDirectory_), - appTypeDefaults(NO_DEFAULTS), - faceSearchAbsTol(defaultFaceSearchTolerance), - faceSearchRelTol(0.15), - useContactSearch(true), - decompMethod("parmetis"), - initialDecompMethod("RIB"), - m_parsedState(0) - { - } - - void set_contact_search(bool useSearch) - { - useContactSearch = useSearch; - m_parsedState |= CONTACT_SEARCH; - } - - void set_face_search_abs_tol(double tolerance) - { - faceSearchAbsTol = tolerance; - m_parsedState |= FACE_SEARCH_ABS_TOL; - } - - void set_face_search_rel_tol(double tolerance) - { - faceSearchRelTol = tolerance; - m_parsedState |= FACE_SEARCH_REL_TOL; - } - - void set_app_type_default(AppTypeDefaults appTypeDefault_) - { - appTypeDefaults = appTypeDefault_; - m_parsedState |= APP_TYPE; - } - - void set_decomp_method(std::string method) - { - decompMethod = method; - m_parsedState |= DECOMP_METHOD; - } - - void set_initial_decomp_method(std::string method) - { - initialDecompMethod = method; - m_parsedState |= INITIAL_DECOMP_METHOD; - } - - bool is_option_provided(ParserFlags parserFlags) const - { - return (m_parsedState & parserFlags); - } - -private: - unsigned m_parsedState; -}; - -std::string get_quick_example(const std::string &execName, - const std::string &infileName, - const std::string &outputDirectoryName, - MPI_Comm comm); - -ParsedOptions parse_balance_command_line(int argc, - const char**argv, - const std::string &execName, - MPI_Comm comm); - -void print_running_msg(const std::string &execName, const ParsedOptions &balanceOptions, MPI_Comm comm); - -std::string construct_output_file_name(const std::string& outputDirectory, const std::string& inputFile); - -enum SearchToleranceType { - ABSOLUTE, - RELATIVE, - UNDEFINED -}; - -bool get_use_contact_search(std::string useContactSearch); -std::string validate_decomp_method(std::string decompMethod); - -}} - -#endif /* STK_STK_BALANCE_STK_BALANCE_INTERNAL_BALANCECOMMANDLINE_HPP_ */ - diff --git a/packages/stk/stk_balance/stk_balance/internal/balanceDefaults.hpp b/packages/stk/stk_balance/stk_balance/internal/balanceDefaults.hpp deleted file mode 100644 index ce1d899367e4..000000000000 --- a/packages/stk/stk_balance/stk_balance/internal/balanceDefaults.hpp +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef STK_STK_BALANCE_STK_BALANCE_INTERNAL_BALANCEDEFAULTS_HPP_ -#define STK_STK_BALANCE_STK_BALANCE_INTERNAL_BALANCEDEFAULTS_HPP_ - - -namespace stk { -namespace balance { - -enum AppTypeDefaults {NO_DEFAULTS, SM_DEFAULTS, SD_DEFAULTS}; - -}} - -#endif /* STK_STK_BALANCE_STK_BALANCE_INTERNAL_BALANCEDEFAULTS_HPP_ */ diff --git a/packages/stk/stk_balance/stk_balance/internal/balanceTypes.hpp b/packages/stk/stk_balance/stk_balance/internal/balanceTypes.hpp index e858bb7fc02a..da3ceb6c6ac2 100644 --- a/packages/stk/stk_balance/stk_balance/internal/balanceTypes.hpp +++ b/packages/stk/stk_balance/stk_balance/internal/balanceTypes.hpp @@ -44,7 +44,7 @@ typedef long long BalanceGlobalNumber; #elif defined(HAVE_TPETRA_INST_INT_LONG) typedef long BalanceGlobalNumber; #else -#error "stk_balance requires that Tpetra instantiate either long or long-long." +typedef int BalanceGlobalNumber; #endif #endif /* BALANCETYPES_HPP_ */ diff --git a/packages/stk/stk_balance/stk_balance/internal/privateDeclarations.cpp b/packages/stk/stk_balance/stk_balance/internal/privateDeclarations.cpp index 854b6b5e871a..8c053ce566e6 100644 --- a/packages/stk/stk_balance/stk_balance/internal/privateDeclarations.cpp +++ b/packages/stk/stk_balance/stk_balance/internal/privateDeclarations.cpp @@ -639,8 +639,7 @@ void fillEntityCentroid(const stk::mesh::BulkData &stkMeshBulkData, const stk::m } } -int num_connected_beams(const stk::mesh::BulkData& bulk, - stk::mesh::Entity node) +int num_beams_connected_to_node(const stk::mesh::BulkData& bulk, stk::mesh::Entity node) { const unsigned numElems = bulk.num_elements(node); const stk::mesh::Entity* elems = bulk.begin_elements(node); @@ -655,23 +654,59 @@ int num_connected_beams(const stk::mesh::BulkData& bulk, return numBeams; } -void fill_connectivity_count_field(stk::mesh::BulkData & bulk, const BalanceSettings & balanceSettings) +bool is_not_part_of_spider(stk::topology::topology_t elemTopology) { - if (balanceSettings.shouldFixSpiders()) { - const stk::mesh::Field * connectivityCountField = balanceSettings.getSpiderConnectivityCountField(bulk); - const stk::mesh::MetaData& meta = bulk.mesh_meta_data(); - - stk::mesh::Selector selectBeamNodes(meta.locally_owned_part() & - meta.get_topology_root_part(stk::topology::BEAM_2)); - stk::mesh::EntityVector nodes; - mesh::get_selected_entities(selectBeamNodes, bulk.buckets(stk::topology::NODE_RANK), nodes); - for(stk::mesh::Entity node : nodes) { - int * connectivityCount = stk::mesh::field_data(*connectivityCountField, node); - *connectivityCount = num_connected_beams(bulk, node); - } + return ((elemTopology != stk::topology::PARTICLE) && + (elemTopology != stk::topology::BEAM_2)); +} - stk::mesh::communicate_field_data(bulk, {connectivityCountField}); +int num_volume_elements_connected_to_beam(const stk::mesh::BulkData& bulk, stk::mesh::Entity beam) +{ + const unsigned numNodes = bulk.num_nodes(beam); + const stk::mesh::Entity* nodes = bulk.begin_nodes(beam); + + int numVolumeElems = 0; + for (unsigned nodeIndex = 0; nodeIndex < numNodes; ++nodeIndex) { + const unsigned numElems = bulk.num_elements(nodes[nodeIndex]); + const stk::mesh::Entity* elems = bulk.begin_elements(nodes[nodeIndex]); + for (unsigned elemIndex = 0; elemIndex < numElems; ++elemIndex) { + const stk::topology::topology_t elemTopology = bulk.bucket(elems[elemIndex]).topology(); + if (is_not_part_of_spider(elemTopology)) { + ++numVolumeElems; + } } + } + + return numVolumeElems; +} + +void fill_spider_connectivity_count_fields(stk::mesh::BulkData & bulk, const BalanceSettings & balanceSettings) +{ + if (balanceSettings.shouldFixSpiders()) { + const stk::mesh::MetaData& meta = bulk.mesh_meta_data(); + + const stk::mesh::Field * beamConnectivityCountField = balanceSettings.getSpiderBeamConnectivityCountField(bulk); + stk::mesh::Selector selectBeamNodes(meta.locally_owned_part() & + meta.get_topology_root_part(stk::topology::BEAM_2)); + stk::mesh::EntityVector nodes; + mesh::get_selected_entities(selectBeamNodes, bulk.buckets(stk::topology::NODE_RANK), nodes); + for(stk::mesh::Entity node : nodes) { + int * beamConnectivityCount = stk::mesh::field_data(*beamConnectivityCountField, node); + *beamConnectivityCount = num_beams_connected_to_node(bulk, node); + } + + const stk::mesh::Field * volumeConnectivityCountField = balanceSettings.getSpiderVolumeConnectivityCountField(bulk); + stk::mesh::Selector selectBeamElements(meta.locally_owned_part() & + meta.get_topology_root_part(stk::topology::BEAM_2)); + stk::mesh::EntityVector beams; + mesh::get_selected_entities(selectBeamElements, bulk.buckets(stk::topology::ELEM_RANK), beams); + for(stk::mesh::Entity beam : beams) { + int * volumeConnectivityCount = stk::mesh::field_data(*volumeConnectivityCountField, beam); + *volumeConnectivityCount = num_volume_elements_connected_to_beam(bulk, beam); + } + + stk::mesh::communicate_field_data(bulk, {beamConnectivityCountField, volumeConnectivityCountField}); + } } void logMessage(MPI_Comm communicator, const std::string &message) @@ -842,18 +877,25 @@ Teuchos::ParameterList getGraphBasedParameters(const BalanceSettings& balanceSet return params; } +bool isNodePartOfSpider(const stk::mesh::BulkData& stkMeshBulkData, + const stk::mesh::Field& beamConnectivityCountField, + stk::mesh::Entity node) +{ + const int spiderConnectivityThreshold = 5; + const int connectivityCount = *stk::mesh::field_data(beamConnectivityCountField, node); + return (connectivityCount > spiderConnectivityThreshold); +} + bool isElementPartOfSpider(const stk::mesh::BulkData& stkMeshBulkData, const stk::mesh::Field& beamConnectivityCountField, stk::mesh::Entity element) { - const int spiderConnectivityThreshold = 5; const stk::mesh::Entity* nodes = stkMeshBulkData.begin_nodes(element); const unsigned numNodes = stkMeshBulkData.num_nodes(element); for (unsigned i = 0; i < numNodes; ++i) { - const int connectivityCount = *stk::mesh::field_data(beamConnectivityCountField, nodes[i]); - if (connectivityCount > spiderConnectivityThreshold) { - return true; - } + if (isNodePartOfSpider(stkMeshBulkData, beamConnectivityCountField, nodes[i])) { + return true; + } } return false; } @@ -864,7 +906,7 @@ bool shouldOmitSpiderElement(const stk::mesh::BulkData & stkMeshBulkData, { bool omitConnection = false; if (balanceSettings.shouldFixSpiders()) { - const stk::mesh::Field & beamConnectivityCountField = *balanceSettings.getSpiderConnectivityCountField(stkMeshBulkData); + const stk::mesh::Field & beamConnectivityCountField = *balanceSettings.getSpiderBeamConnectivityCountField(stkMeshBulkData); stk::topology elemTopology = stkMeshBulkData.bucket(elem).topology(); if (elemTopology == stk::topology::BEAM_2 || elemTopology == stk::topology::PARTICLE) { @@ -875,49 +917,173 @@ bool shouldOmitSpiderElement(const stk::mesh::BulkData & stkMeshBulkData, return omitConnection; } -bool found_element_at_end_of_leg(int newOwner, const stk::mesh::BulkData & bulk) +bool found_valid_new_owner(const stk::mesh::BulkData & bulk, int newOwner) { return (newOwner < bulk.parallel_size()); } +bool spider_body_element_exists(const stk::mesh::BulkData & bulk, const stk::mesh::Entity & bodyElement) +{ + return bulk.is_valid(bodyElement); +} + +stk::mesh::Entity get_spider_particle_body_for_leg(const stk::mesh::BulkData & bulk, const stk::mesh::Entity & bodyNode) +{ + const stk::mesh::Entity * elems = bulk.begin_elements(bodyNode); + const unsigned numElements = bulk.num_elements(bodyNode); + for (unsigned i = 0; i < numElements; ++i) { + const bool isParticle = (bulk.bucket(elems[i]).topology() == stk::topology::PARTICLE); + if (isParticle) { + return elems[i]; + } + } + return stk::mesh::Entity(); +} + +std::pair get_spider_beam_body_and_node_for_leg(const stk::mesh::BulkData & bulk, + const BalanceSettings & balanceSettings, + const stk::mesh::Entity & bodyNode) +{ + const stk::mesh::Entity * elems = bulk.begin_elements(bodyNode); + const unsigned numElements = bulk.num_elements(bodyNode); + const stk::mesh::Field & volumeElemConnectivityCountField = *balanceSettings.getSpiderVolumeConnectivityCountField(bulk); + + for (unsigned i = 0; i < numElements; ++i) { + if (bulk.bucket(elems[i]).topology() == stk::topology::BEAM_2) { + const int volumeElemConnectivityCount = *stk::mesh::field_data(volumeElemConnectivityCountField, elems[i]); + if (volumeElemConnectivityCount == 0) { + const stk::mesh::Entity * beamNodes = bulk.begin_nodes(elems[i]); + const stk::mesh::Entity nonBodyNode = (beamNodes[0] == bodyNode) ? beamNodes[1] : beamNodes[0]; + return std::make_pair(elems[i], nonBodyNode); + } + } + } + + return std::make_pair(stk::mesh::Entity(), stk::mesh::Entity()); +} + +void update_new_spider_entity_owner(stk::mesh::EntityProcMap & newSpiderEntityOwners, + stk::mesh::Entity entity, int candidateOwner) +{ + if (newSpiderEntityOwners.find(entity) == newSpiderEntityOwners.end()) { + newSpiderEntityOwners[entity] = candidateOwner; + } + newSpiderEntityOwners[entity] = std::min(candidateOwner, newSpiderEntityOwners[entity]); +} + +void pack_new_spider_entity_owners(const stk::mesh::BulkData & bulk, + stk::CommSparse & comm, + const stk::mesh::EntityProcMap & newSpiderEntityOwners) +{ + for (const stk::mesh::EntityProc & entityNewOwner : newSpiderEntityOwners) { + const int currentOwner = bulk.parallel_owner_rank(entityNewOwner.first); + const stk::mesh::EntityKey entityKey = bulk.entity_key(entityNewOwner.first); + comm.send_buffer(currentOwner).pack(entityKey); + comm.send_buffer(currentOwner).pack(entityNewOwner.second); + } +} + +stk::mesh::EntityProcMap unpack_new_spider_entity_owners(const stk::mesh::BulkData & bulk, + stk::CommSparse & comm) +{ + stk::mesh::EntityProcMap newSpiderEntityOwners; + for (int proc = 0; proc < bulk.parallel_size(); ++proc) { + while (comm.recv_buffer(proc).remaining()) { + stk::mesh::EntityKey entityKey; + int newOwner; + comm.recv_buffer(proc).unpack(entityKey); + comm.recv_buffer(proc).unpack(newOwner); + update_new_spider_entity_owner(newSpiderEntityOwners, bulk.get_entity(entityKey), newOwner); + } + } + return newSpiderEntityOwners; +} + + +stk::mesh::EntityProcMap determine_global_new_owner(const stk::mesh::BulkData & bulk, + const stk::mesh::EntityProcMap & newSpiderEntityOwners) +{ + stk::CommSparse comm(bulk.parallel()); + + stk::pack_and_communicate(comm, [&](){ + pack_new_spider_entity_owners(bulk, comm, newSpiderEntityOwners); + }); + + return unpack_new_spider_entity_owners(bulk, comm); +} + void fix_spider_elements(const BalanceSettings & balanceSettings, stk::mesh::BulkData & bulk) { - stk::mesh::Ghosting * customAura = stk::tools::create_custom_aura(bulk, bulk.mesh_meta_data().globally_shared_part(), "customAura"); + stk::mesh::Ghosting * customAura = stk::tools::create_custom_aura(bulk, bulk.mesh_meta_data().globally_shared_part(), "customAura"); + + stk::mesh::MetaData & meta = bulk.mesh_meta_data(); + const stk::mesh::Field & beamConnectivityCountField = *balanceSettings.getSpiderBeamConnectivityCountField(bulk); + + stk::mesh::EntityVector beams; + stk::mesh::Part & beamPart = meta.get_topology_root_part(stk::topology::BEAM_2); + stk::mesh::get_selected_entities(beamPart & meta.locally_owned_part(), bulk.buckets(stk::topology::ELEM_RANK), beams); + + stk::mesh::EntityVector particles; + stk::mesh::EntityProcMap newSpiderEntityOwners; + + stk::mesh::EntityProcVec entitiesToMove; + for (stk::mesh::Entity spiderLeg : beams) { + if (isElementPartOfSpider(bulk, beamConnectivityCountField, spiderLeg)) { + const stk::mesh::Entity* nodes = bulk.begin_nodes(spiderLeg); + const int node1ConnectivityCount = *stk::mesh::field_data(beamConnectivityCountField, nodes[0]); + const int node2ConnectivityCount = *stk::mesh::field_data(beamConnectivityCountField, nodes[1]); + + const stk::mesh::Entity footNode = (node1ConnectivityCount < node2ConnectivityCount) ? nodes[0] : nodes[1]; + const stk::mesh::Entity bodyNode = (node1ConnectivityCount < node2ConnectivityCount) ? nodes[1] : nodes[0]; + const stk::mesh::Entity* elements = bulk.begin_elements(footNode); + const unsigned numElements = bulk.num_elements(footNode); + int newLegOwner = std::numeric_limits::max(); + + for (unsigned i = 0; i < numElements; ++i) { + const stk::topology::topology_t elemTopology = bulk.bucket(elements[i]).topology(); + if (is_not_part_of_spider(elemTopology)) { + newLegOwner = std::min(newLegOwner, bulk.parallel_owner_rank(elements[i])); + } + } - stk::mesh::MetaData & meta = bulk.mesh_meta_data(); - const stk::mesh::Field & beamConnectivityCountField = *balanceSettings.getSpiderConnectivityCountField(bulk); + if (found_valid_new_owner(bulk, newLegOwner)) { + if (newLegOwner != bulk.parallel_rank()) { + entitiesToMove.push_back(std::make_pair(spiderLeg, newLegOwner)); + } - stk::mesh::EntityVector beams; - stk::mesh::Part & beamPart = meta.get_topology_root_part(stk::topology::BEAM_2); - stk::mesh::get_selected_entities(beamPart & meta.locally_owned_part(), bulk.buckets(stk::topology::ELEM_RANK), beams); - - stk::mesh::EntityProcVec beamsToMove; - for (stk::mesh::Entity beam : beams) { - if (isElementPartOfSpider(bulk, beamConnectivityCountField, beam)) { - const stk::mesh::Entity* nodes = bulk.begin_nodes(beam); - const int node1ConnectivityCount = *stk::mesh::field_data(beamConnectivityCountField, nodes[0]); - const int node2ConnectivityCount = *stk::mesh::field_data(beamConnectivityCountField, nodes[1]); - - const stk::mesh::Entity endNode = (node1ConnectivityCount < node2ConnectivityCount) ? nodes[0] : nodes[1]; - const stk::mesh::Entity* elements = bulk.begin_elements(endNode); - const unsigned numElements = bulk.num_elements(endNode); - int newOwner = std::numeric_limits::max(); - - for (unsigned i = 0; i < numElements; ++i) { - if (bulk.bucket(elements[i]).topology() != stk::topology::BEAM_2) { - newOwner = std::min(newOwner, bulk.parallel_owner_rank(elements[i])); - } + update_new_spider_entity_owner(newSpiderEntityOwners, bodyNode, newLegOwner); + + const stk::mesh::Entity spiderParticleBody = get_spider_particle_body_for_leg(bulk, bodyNode); + if (spider_body_element_exists(bulk, spiderParticleBody)) { + update_new_spider_entity_owner(newSpiderEntityOwners, spiderParticleBody, newLegOwner); + } + else { + const std::pair spiderBeamBodyAndNode = + get_spider_beam_body_and_node_for_leg(bulk, balanceSettings, bodyNode); + if (spider_body_element_exists(bulk, spiderBeamBodyAndNode.first)) { + update_new_spider_entity_owner(newSpiderEntityOwners, spiderBeamBodyAndNode.first, newLegOwner); + update_new_spider_entity_owner(newSpiderEntityOwners, spiderBeamBodyAndNode.second, newLegOwner); } - if (found_element_at_end_of_leg(newOwner, bulk) && (newOwner != bulk.parallel_rank())) { - beamsToMove.push_back(std::make_pair(beam, newOwner)); - } } + + if (newLegOwner != bulk.parallel_owner_rank(footNode)) { + update_new_spider_entity_owner(newSpiderEntityOwners, footNode, newLegOwner); + } + } } + } + + stk::mesh::EntityProcMap globalNewSpiderEntityOwners = determine_global_new_owner(bulk, newSpiderEntityOwners); - stk::tools::destroy_custom_aura(bulk, customAura); + for (const auto & entityOwner : globalNewSpiderEntityOwners) { + if (entityOwner.second != bulk.parallel_rank()) { + entitiesToMove.push_back(entityOwner); + } + } - bulk.change_entity_owner(beamsToMove); + stk::tools::destroy_custom_aura(bulk, customAura); + bulk.change_entity_owner(entitiesToMove); } void keep_spiders_on_original_proc(stk::mesh::BulkData &bulk, const stk::balance::BalanceSettings & balanceSettings, DecompositionChangeList &changeList) @@ -926,12 +1092,13 @@ void keep_spiders_on_original_proc(stk::mesh::BulkData &bulk, const stk::balance // so that we can properly determine the final ownership of the elements on the end. // Then, we can move them. // - const stk::mesh::Field & beamConnectivityCountField = *balanceSettings.getSpiderConnectivityCountField(bulk); + const stk::mesh::Field & beamConnectivityCountField = *balanceSettings.getSpiderBeamConnectivityCountField(bulk); stk::mesh::EntityProcVec entityProcs = changeList.get_all_partition_changes(); for (const stk::mesh::EntityProc & entityProc : entityProcs) { stk::mesh::Entity entity = entityProc.first; - if (bulk.bucket(entity).topology() == stk::topology::BEAM_2) { + const stk::topology entityTopology = bulk.bucket(entity).topology(); + if (entityTopology == stk::topology::BEAM_2 || entityTopology == stk::topology::PARTICLE) { if (isElementPartOfSpider(bulk, beamConnectivityCountField, entity)) { changeList.delete_entity(entity); } @@ -1106,7 +1273,7 @@ void calculateGeometricOrGraphBasedDecomp(const BalanceSettings& balanceSettings stkMeshBulkData.mesh_meta_data().globally_shared_part(), "customAura"); stk::mesh::impl::LocalIdMapper localIds(stkMeshBulkData, stk::topology::ELEM_RANK); - internal::fill_connectivity_count_field(stkMeshBulkData, balanceSettings); + internal::fill_spider_connectivity_count_fields(stkMeshBulkData, balanceSettings); fill_decomp_using_parmetis(balanceSettings, numSubdomainsToCreate, decomp, stkMeshBulkData, selectors, localIds); stk::tools::destroy_custom_aura(stkMeshBulkData, customAura); } diff --git a/packages/stk/stk_balance/stk_balance/internal/privateDeclarations.hpp b/packages/stk/stk_balance/stk_balance/internal/privateDeclarations.hpp index f8c821c28e8e..76eddd0dc1fa 100644 --- a/packages/stk/stk_balance/stk_balance/internal/privateDeclarations.hpp +++ b/packages/stk/stk_balance/stk_balance/internal/privateDeclarations.hpp @@ -97,6 +97,7 @@ bool shouldOmitSpiderElement(const stk::mesh::BulkData & stkMeshBulkData, const stk::balance::BalanceSettings & balanceSettings, stk::mesh::Entity elem); +void fill_spider_connectivity_count_fields(stk::mesh::BulkData & bulk, const BalanceSettings & balanceSettings); void keep_spiders_on_original_proc(stk::mesh::BulkData &bulk, const stk::balance::BalanceSettings & balanceSettings, DecompositionChangeList &changeList); void fix_spider_elements(const BalanceSettings & balanceSettings, stk::mesh::BulkData & stkMeshBulkData); diff --git a/packages/stk/stk_balance/stk_balance/io/BalanceIO.cpp b/packages/stk/stk_balance/stk_balance/io/BalanceIO.cpp new file mode 100644 index 000000000000..d06c3f6933cd --- /dev/null +++ b/packages/stk/stk_balance/stk_balance/io/BalanceIO.cpp @@ -0,0 +1,130 @@ +// Copyright 2002 - 2008, 2010, 2011 National Technology Engineering +// Solutions of Sandia, LLC (NTESS). Under the terms of Contract +// DE-NA0003525 with NTESS, the U.S. Government retains certain rights +// in this software. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following +// disclaimer in the documentation and/or other materials provided +// with the distribution. +// +// * Neither the name of NTESS nor the names of its contributors +// may be used to endorse or promote products derived from this +// software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +#include "BalanceIO.hpp" +#include "stk_balance/internal/privateDeclarations.hpp" +#include "stk_balance/fixSplitCoincidentElements.hpp" +#include "stk_tools/mesh_clone/MeshClone.hpp" +#include "stk_tools/transfer_utils/TransientFieldTransferById.hpp" +#include + +#include // move us +#include +#include +#include +#include +#include +#include + +namespace stk { +namespace balance { + +void register_internal_fields(stk::mesh::BulkData& bulkData, const stk::balance::BalanceSettings& balanceSettings) +{ + if (balanceSettings.shouldFixSpiders()) { + stk::mesh::MetaData& meta = bulkData.mesh_meta_data(); + const int initValue = 0; + + stk::mesh::Field & beamField = + meta.declare_field>(stk::topology::NODE_RANK, + balanceSettings.getSpiderBeamConnectivityCountFieldName()); + stk::mesh::put_field_on_mesh(beamField, meta.universal_part(), &initValue); + + stk::mesh::Field & volumeField = + meta.declare_field>(stk::topology::ELEM_RANK, + balanceSettings.getSpiderVolumeConnectivityCountFieldName()); + stk::mesh::put_field_on_mesh(volumeField, meta.universal_part(), &initValue); + } +} + +void read_mesh_with_auto_decomp(stk::io::StkMeshIoBroker & stkIo, + const std::string& meshSpec, + stk::mesh::BulkData& bulkData, + const stk::balance::BalanceSettings & balanceSettings) +{ + stkIo.set_bulk_data(bulkData); + stkIo.add_mesh_database(meshSpec, stk::io::READ_MESH); + stkIo.create_input_mesh(); + stkIo.add_all_mesh_fields_as_input_fields(); + + register_internal_fields(bulkData, balanceSettings); + + stkIo.populate_bulk_data(); + + if(stkIo.check_integer_size_requirements() == 8) { + bulkData.set_large_ids_flag(true); + } +} + +BalanceIO::BalanceIO(MPI_Comm comm, const BalanceSettings& settings) + : m_comm(comm), + m_settings(settings), + m_inputBulk(m_inputMeta, m_comm), + m_copyBulk(m_copyMeta, m_comm), + m_mesh(nullptr) +{ + m_inputMeta.set_coordinate_field_name(m_settings.getCoordinateFieldName()); +} + +BalanceMesh& BalanceIO::initial_decomp() +{ + internal::logMessage(m_comm, "Reading mesh and performing initial decomposition"); + m_inputBroker.property_add(Ioss::Property("DECOMPOSITION_METHOD", m_settings.getInitialDecompMethod())); + read_mesh_with_auto_decomp(m_inputBroker, m_settings.get_input_filename(), m_inputBulk, m_settings); + make_mesh_consistent_with_parallel_mesh_rule1(m_inputBulk); + + if(stk::io::get_transient_fields(m_inputMeta).empty()) { + m_mesh = std::unique_ptr(new BalanceMesh(m_inputBulk)); + } + else { + internal::logMessage(m_comm, "Copying input mesh to handle transient fields"); + stk::tools::copy_mesh(m_inputBulk, m_inputMeta.universal_part(), m_copyBulk); + m_mesh = std::unique_ptr(new BalanceMesh(m_copyBulk)); + } + + return *m_mesh; +} + +void BalanceIO::write(BalanceMesh& mesh) +{ + stk::io::StkMeshIoBroker outputBroker; + outputBroker.set_bulk_data(mesh.get_bulk()); + outputBroker.set_attribute_field_ordering_stored_by_part_ordinal(m_inputBroker.get_attribute_field_ordering_stored_by_part_ordinal()); + + stk::transfer_utils::TransientFieldTransferById transfer(m_inputBroker, outputBroker); + transfer.transfer_and_write_transient_fields(m_settings.get_output_filename()); + + internal::logMessage(m_comm, "Finished writing output mesh"); +} + +} } diff --git a/packages/stk/stk_balance/stk_balance/io/BalanceIO.hpp b/packages/stk/stk_balance/stk_balance/io/BalanceIO.hpp new file mode 100644 index 000000000000..fa8751ed5a9d --- /dev/null +++ b/packages/stk/stk_balance/stk_balance/io/BalanceIO.hpp @@ -0,0 +1,74 @@ +// Copyright 2002 - 2008, 2010, 2011 National Technology Engineering +// Solutions of Sandia, LLC (NTESS). Under the terms of Contract +// DE-NA0003525 with NTESS, the U.S. Government retains certain rights +// in this software. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following +// disclaimer in the documentation and/or other materials provided +// with the distribution. +// +// * Neither the name of NTESS nor the names of its contributors +// may be used to endorse or promote products derived from this +// software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +#ifndef STK_BALANCE_BALANCE_IO_HPP +#define STK_BALANCE_BALANCE_IO_HPP + +#include "mpi.h" + +#include "stk_mesh/base/MetaData.hpp" +#include "stk_mesh/base/BulkData.hpp" +#include "stk_io/StkMeshIoBroker.hpp" + +#include "stk_balance/balanceUtils.hpp" +#include "stk_balance/mesh/BalanceMesh.hpp" + +namespace stk { +namespace balance { + +class BalanceIO +{ +public: + BalanceIO(MPI_Comm comm, const BalanceSettings& settings); + + BalanceMesh& initial_decomp(); + void write(BalanceMesh& mesh); + +private: + const MPI_Comm m_comm; + const BalanceSettings& m_settings; + + stk::mesh::MetaData m_inputMeta; + stk::mesh::BulkData m_inputBulk; + + stk::mesh::MetaData m_copyMeta; + stk::mesh::BulkData m_copyBulk; + + std::unique_ptr m_mesh; + + stk::io::StkMeshIoBroker m_inputBroker; +}; + +} } + +#endif diff --git a/packages/stk/stk_balance/stk_balance/m2n_main/m2nMain.cpp b/packages/stk/stk_balance/stk_balance/m2n_main/m2nMain.cpp index bbae7e8b8298..6270c0441a90 100644 --- a/packages/stk/stk_balance/stk_balance/m2n_main/m2nMain.cpp +++ b/packages/stk/stk_balance/stk_balance/m2n_main/m2nMain.cpp @@ -70,7 +70,7 @@ ParsedOptions parse_m2n_command_line(int argc, const char**argv, stk::CommandLin std::string inFile = commandLine.get_option_value(m2nOptions.infile.name); int targetNumProcs = commandLine.get_option_value(m2nOptions.nprocs.name); - stk::parallel::require(targetNumProcs > 0, "Please specify a valid target processor count.", comm); + ThrowRequireMsg(targetNumProcs > 0, "Please specify a valid target processor count."); return ParsedOptions{inFile, targetNumProcs}; } diff --git a/packages/stk/stk_balance/stk_balance/mesh/BalanceMesh.cpp b/packages/stk/stk_balance/stk_balance/mesh/BalanceMesh.cpp index 1256afdb8458..3f2c643e8be8 100644 --- a/packages/stk/stk_balance/stk_balance/mesh/BalanceMesh.cpp +++ b/packages/stk/stk_balance/stk_balance/mesh/BalanceMesh.cpp @@ -1,61 +1,48 @@ - // Copyright 2002 - 2008, 2010, 2011 National Technology Engineering +// Copyright 2002 - 2008, 2010, 2011 National Technology Engineering // Solutions of Sandia, LLC (NTESS). Under the terms of Contract // DE-NA0003525 with NTESS, the U.S. Government retains certain rights // in this software. // - // Redistribution and use in source and binary forms, with or without - // modification, are permitted provided that the following conditions are - // met: - // - // * Redistributions of source code must retain the above copyright - // notice, this list of conditions and the following disclaimer. - // - // * Redistributions in binary form must reproduce the above - // copyright notice, this list of conditions and the following - // disclaimer in the documentation and/or other materials provided - // with the distribution. - // +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following +// disclaimer in the documentation and/or other materials provided +// with the distribution. +// // * Neither the name of NTESS nor the names of its contributors // may be used to endorse or promote products derived from this // software without specific prior written permission. // - // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - // "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - // A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "BalanceMesh.hpp" namespace stk { namespace balance { - -InternalMesh::InternalMesh(MPI_Comm comm, const std::string& coordinateFieldName) - : bulk(meta, comm) -{ - meta.set_coordinate_field_name(coordinateFieldName); -} - -stk::mesh::BulkData& InternalMesh::get_bulk() -{ - return bulk; -} - - -ExternalMesh::ExternalMesh(stk::mesh::BulkData& externalBulk) - : meta(externalBulk.mesh_meta_data()), bulk(externalBulk) +BalanceMesh::BalanceMesh(stk::mesh::BulkData& bulk) + : m_meta(bulk.mesh_meta_data()), m_bulk(bulk) { } -stk::mesh::BulkData& ExternalMesh::get_bulk() +stk::mesh::BulkData& BalanceMesh::get_bulk() { - return bulk; + return m_bulk; } diff --git a/packages/stk/stk_balance/stk_balance/mesh/BalanceMesh.hpp b/packages/stk/stk_balance/stk_balance/mesh/BalanceMesh.hpp index 3f4b9dcb4437..3d74f60a2487 100644 --- a/packages/stk/stk_balance/stk_balance/mesh/BalanceMesh.hpp +++ b/packages/stk/stk_balance/stk_balance/mesh/BalanceMesh.hpp @@ -1,35 +1,35 @@ - // Copyright 2002 - 2008, 2010, 2011 National Technology Engineering +// Copyright 2002 - 2008, 2010, 2011 National Technology Engineering // Solutions of Sandia, LLC (NTESS). Under the terms of Contract // DE-NA0003525 with NTESS, the U.S. Government retains certain rights // in this software. // - // Redistribution and use in source and binary forms, with or without - // modification, are permitted provided that the following conditions are - // met: - // - // * Redistributions of source code must retain the above copyright - // notice, this list of conditions and the following disclaimer. - // - // * Redistributions in binary form must reproduce the above - // copyright notice, this list of conditions and the following - // disclaimer in the documentation and/or other materials provided - // with the distribution. - // +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following +// disclaimer in the documentation and/or other materials provided +// with the distribution. +// // * Neither the name of NTESS nor the names of its contributors // may be used to endorse or promote products derived from this // software without specific prior written permission. // - // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - // "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - // A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef STK_BALANCE_BALANCE_MESH_HPP #define STK_BALANCE_BALANCE_MESH_HPP @@ -43,33 +43,15 @@ namespace balance { class BalanceMesh { public: - virtual stk::mesh::BulkData& get_bulk() = 0; -}; - -class InternalMesh : public BalanceMesh -{ -public: - InternalMesh(MPI_Comm comm, const std::string& coordinateFieldName); - - stk::mesh::BulkData& get_bulk(); - -private: - stk::mesh::MetaData meta; - stk::mesh::BulkData bulk; -}; - -class ExternalMesh : public BalanceMesh -{ -public: - ExternalMesh(stk::mesh::BulkData& externalBulk); + BalanceMesh(stk::mesh::BulkData& bulk); stk::mesh::BulkData& get_bulk(); private: - stk::mesh::MetaData& meta; - stk::mesh::BulkData& bulk; + stk::mesh::MetaData& m_meta; + stk::mesh::BulkData& m_bulk; }; } } -#endif // MESH_HPP +#endif diff --git a/packages/stk/stk_balance/stk_balance/setup/DefaultSettings.hpp b/packages/stk/stk_balance/stk_balance/setup/DefaultSettings.hpp new file mode 100644 index 000000000000..0ea55bceb656 --- /dev/null +++ b/packages/stk/stk_balance/stk_balance/setup/DefaultSettings.hpp @@ -0,0 +1,61 @@ +// Copyright 2002 - 2008, 2010, 2011 National Technology Engineering +// Solutions of Sandia, LLC (NTESS). Under the terms of Contract +// DE-NA0003525 with NTESS, the U.S. Government retains certain rights +// in this software. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following +// disclaimer in the documentation and/or other materials provided +// with the distribution. +// +// * Neither the name of NTESS nor the names of its contributors +// may be used to endorse or promote products derived from this +// software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +#ifndef STK_BALANCE_DEFAULT_SETTINGS_HPP +#define STK_BALANCE_DEFAULT_SETTINGS_HPP + +#include + +namespace stk { +namespace balance { + +struct DefaultSettings { + const std::string decompMethod = "parmetis"; + const std::string contactSearch = "on"; + const bool useContactSearch = (contactSearch == "on"); + + const double faceSearchRelTol = 0.15; + const double faceSearchAbsTol = 0.0001; + + const double particleSearchTol = 3.0; + + const double faceSearchVertexMultiplier = 5.0; + const double faceSearchEdgeWeight = 15.0; + + const double smFaceSearchVertexMultiplier = 10.0; + const double smFaceSearchEdgeWeight = 3.0; +}; + +} } + +#endif diff --git a/packages/stk/stk_balance/stk_balance/setup/FileValidator.cpp b/packages/stk/stk_balance/stk_balance/setup/FileValidator.cpp new file mode 100644 index 000000000000..6351eafe049e --- /dev/null +++ b/packages/stk/stk_balance/stk_balance/setup/FileValidator.cpp @@ -0,0 +1,73 @@ +// Copyright 2002 - 2008, 2010, 2011 National Technology Engineering +// Solutions of Sandia, LLC (NTESS). Under the terms of Contract +// DE-NA0003525 with NTESS, the U.S. Government retains certain rights +// in this software. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following +// disclaimer in the documentation and/or other materials provided +// with the distribution. +// +// * Neither the name of NTESS nor the names of its contributors +// may be used to endorse or promote products derived from this +// software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +#include "FileValidator.hpp" + +#include + +#include "stk_util/parallel/Parallel.hpp" +#include "stk_util/util/ReportHandler.hpp" + +namespace stk { +namespace balance { + +FileValidator::FileValidator(MPI_Comm comm) + : m_comm(comm), + m_isSerial(stk::parallel_machine_size(m_comm) == 1) +{ } + +void FileValidator::require_file_exists(const std::string& filename) const +{ + ThrowRequireMsg(does_file_exist(filename), "Input file does not exist.\n"); +} + +bool FileValidator::serial_input_equals_output(const std::string& infile, const std::string& outfile) const +{ + return m_isSerial && (trim_filename(infile) == trim_filename(outfile)); +} + +bool FileValidator::does_file_exist(const std::string& filename) const +{ + bool exists = true; + if (!std::ifstream(filename)) { + exists = false; + } + return exists; +} + +std::string FileValidator::trim_filename(const std::string& filename) const +{ + return (filename.substr(0,2) == "./") ? filename.substr(2) : filename; +} + +} } diff --git a/packages/stk/stk_balance/stk_balance/setup/FileValidator.hpp b/packages/stk/stk_balance/stk_balance/setup/FileValidator.hpp new file mode 100644 index 000000000000..1f734e9b3fcb --- /dev/null +++ b/packages/stk/stk_balance/stk_balance/setup/FileValidator.hpp @@ -0,0 +1,60 @@ +// Copyright 2002 - 2008, 2010, 2011 National Technology Engineering +// Solutions of Sandia, LLC (NTESS). Under the terms of Contract +// DE-NA0003525 with NTESS, the U.S. Government retains certain rights +// in this software. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following +// disclaimer in the documentation and/or other materials provided +// with the distribution. +// +// * Neither the name of NTESS nor the names of its contributors +// may be used to endorse or promote products derived from this +// software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +#ifndef STK_BALANCE_FILE_VALIDATOR_HPP +#define STK_BALANCE_FILE_VALIDATOR_HPP + +#include +#include "mpi.h" + +namespace stk { +namespace balance { + +class FileValidator { +public: + FileValidator(MPI_Comm comm); + + void require_file_exists(const std::string& filename) const; + bool serial_input_equals_output(const std::string& infile, const std::string& outfile) const; + +private: + bool does_file_exist(const std::string& filename) const; + std::string trim_filename(const std::string& filename) const; + + MPI_Comm m_comm; + const bool m_isSerial; +}; + +} } + +#endif diff --git a/packages/stk/stk_balance/stk_balance/setup/LifeCycle.cpp b/packages/stk/stk_balance/stk_balance/setup/LifeCycle.cpp new file mode 100644 index 000000000000..8b5b97317452 --- /dev/null +++ b/packages/stk/stk_balance/stk_balance/setup/LifeCycle.cpp @@ -0,0 +1,147 @@ +// Copyright 2002 - 2008, 2010, 2011 National Technology Engineering +// Solutions of Sandia, LLC (NTESS). Under the terms of Contract +// DE-NA0003525 with NTESS, the U.S. Government retains certain rights +// in this software. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following +// disclaimer in the documentation and/or other materials provided +// with the distribution. +// +// * Neither the name of NTESS nor the names of its contributors +// may be used to endorse or promote products derived from this +// software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +#include "LifeCycle.hpp" + +#include "stk_util/environment/Env.hpp" +#include "stk_util/environment/EnvData.hpp" + +#include "stk_balance/mesh/BalanceMesh.hpp" +#include "stk_balance/io/BalanceIO.hpp" +#include "stk_balance/internal/Balancer.hpp" + +namespace stk { +namespace balance { + +LifeCycle::LifeCycle(MPI_Comm c, int argc, const char** argv) + : m_comm(c), + m_argc(argc), + m_argv(argv), + m_exitCode(0), + m_isProc0(stk::parallel_machine_rank(m_comm) == 0), + m_validator(m_comm), + m_parser(m_comm) +{ + set_output_streams(); +} + +void LifeCycle::run() +{ + try { + parse(); + } + catch(const std::exception &e) { + print_parse_error(e.what()); + m_exitCode = 1; + return; + } + + if (serial_no_op()) { + print_no_op_message(); + return; + } + + try { + balance(); + } + catch(std::exception& e) { + print_balance_error(e.what()); + m_exitCode = 2; + } +} + +int LifeCycle::exit_code() const +{ + return m_exitCode; +} + +void LifeCycle::parse() +{ + m_parser.parse_command_line_options(m_argc, m_argv, m_settings); + m_validator.require_file_exists(m_settings.get_input_filename()); +} + +bool LifeCycle::serial_no_op() const +{ + return m_validator.serial_input_equals_output(m_settings.get_input_filename(), m_settings.get_output_filename()); +} + +void LifeCycle::balance() +{ + print_running_message(); + stk::balance::BalanceIO io(m_comm, m_settings); + const stk::balance::Balancer balancer(m_settings); + + stk::balance::BalanceMesh& mesh = io.initial_decomp(); + balancer.balance(mesh); + io.write(mesh); +} + +void LifeCycle::set_output_streams() +{ + if (!m_isProc0) { + stk::EnvData::instance().m_outputP0 = &stk::EnvData::instance().m_outputNull; + } + Ioss::Utils::set_output_stream(sierra::Env::outputP0()); +} + +void LifeCycle::print_parse_error(const char* what) const +{ + if (m_isProc0) { + std::cerr << what << m_parser.get_quick_error() << std::endl; + } +} + +void LifeCycle::print_balance_error(const char* what) const +{ + if (m_isProc0) { + std::cerr << what << std::endl; + } +} + +void LifeCycle::print_no_op_message() const +{ + sierra::Env::outputP0() << "Running on 1 MPI rank and input-file (" << m_settings.get_input_filename() + << ") == output-file (" << m_settings.get_output_filename() + << "), doing nothing. Specify outputDirectory if you " + << "wish to copy the input-file to an output-file of the same name." << std::endl; +} + +void LifeCycle::print_running_message() const +{ + sierra::Env::outputP0() << "Running stk_balance" << std::endl; + sierra::Env::outputP0() << " Input file: " << m_settings.get_input_filename() << std::endl; + sierra::Env::outputP0() << " Output file: " << m_settings.get_output_filename() << std::endl; +} + +} } diff --git a/packages/stk/stk_balance/stk_balance/setup/LifeCycle.hpp b/packages/stk/stk_balance/stk_balance/setup/LifeCycle.hpp new file mode 100644 index 000000000000..983c3f57b031 --- /dev/null +++ b/packages/stk/stk_balance/stk_balance/setup/LifeCycle.hpp @@ -0,0 +1,75 @@ +// Copyright 2002 - 2008, 2010, 2011 National Technology Engineering +// Solutions of Sandia, LLC (NTESS). Under the terms of Contract +// DE-NA0003525 with NTESS, the U.S. Government retains certain rights +// in this software. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following +// disclaimer in the documentation and/or other materials provided +// with the distribution. +// +// * Neither the name of NTESS nor the names of its contributors +// may be used to endorse or promote products derived from this +// software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +#ifndef STK_BALANCE_LIFE_CYCLE_HPP +#define STK_BALANCE_LIFE_CYCLE_HPP + +#include "stk_balance/balanceUtils.hpp" +#include "stk_balance/setup/Parser.hpp" +#include "stk_balance/setup/FileValidator.hpp" + +namespace stk { +namespace balance { + +class LifeCycle { +public: + LifeCycle(MPI_Comm c, int argc, const char** argv); + + void run(); + int exit_code() const; + +private: + void parse(); + bool serial_no_op() const; + void balance(); + + void set_output_streams(); + void print_parse_error(const char* what) const; + void print_balance_error(const char* what) const; + void print_no_op_message() const; + void print_running_message() const; + + MPI_Comm m_comm; + const int m_argc; + const char** m_argv; + int m_exitCode; + const bool m_isProc0; + + const FileValidator m_validator; + StkBalanceSettings m_settings; + Parser m_parser; +}; + +} } + +#endif diff --git a/packages/stk/stk_balance/stk_balance/setup/Parser.cpp b/packages/stk/stk_balance/stk_balance/setup/Parser.cpp new file mode 100644 index 000000000000..854d3e811d06 --- /dev/null +++ b/packages/stk/stk_balance/stk_balance/setup/Parser.cpp @@ -0,0 +1,251 @@ +// Copyright 2002 - 2008, 2010, 2011 National Technology Engineering +// Solutions of Sandia, LLC (NTESS). Under the terms of Contract +// DE-NA0003525 with NTESS, the U.S. Government retains certain rights +// in this software. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following +// disclaimer in the documentation and/or other materials provided +// with the distribution. +// +// * Neither the name of NTESS nor the names of its contributors +// may be used to endorse or promote products derived from this +// software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +#include "Parser.hpp" +#include "stk_balance/search_tolerance_algs/SecondShortestEdgeFaceSearchTolerance.hpp" +#include "stk_util/environment/Env.hpp" // for deprecatedOutputDirectory warnings + +namespace stk { +namespace balance { + +std::string construct_output_file_name(const std::string& outputDirectory, const std::string& inputFile) +{ + std::size_t found = inputFile.find_last_of("/"); + std::string filename = inputFile; + if (found != std::string::npos) { + filename = inputFile.substr(found + 1); + } + return outputDirectory + "/" + filename; +} + +std::string Examples::get_quick_example() +{ + std::string mpiCmd = " > mpirun -n " + m_execName + " "; + std::string usage = "Usage:\n" + + mpiCmd + stk::angle_it(m_optionNames.infile) + " " + stk::bracket_it("output directory") + " " + + stk::bracket_it("args") + "\n" + + mpiCmd + stk::dash_it(m_optionNames.infile) + " " + stk::angle_it(m_optionNames.infile) + " " + + stk::dash_it(m_optionNames.outputDirectory) + " " + stk::bracket_it("output directory") + " " + + stk::bracket_it("args") + "\n" + + "\n"; + return usage; +} + +std::string Examples::get_long_examples() +{ + std::string examples = "Examples:\n\n"; + std::string tab = " "; + examples += tab + "To decompose for 16 processors:\n"; + examples += tab + tab + "> mpirun -n 16 " + m_execName + " file.exo\n"; + examples += "\n"; + examples += tab + "To decompose for 512 processors and put the decomposition into a directory named 'temp1':\n"; + examples += tab + tab + "> mpirun -n 512 " + m_execName + " file.exo temp1\n"; + examples += "\n"; + examples += tab + "To decompose for 64 processors and use settings suitable for solving Solid Mechanics problems:\n"; + examples += tab + tab + "> mpirun -n 64 " + m_execName + " file.exo " + stk::dash_it(m_optionNames.smDefaults) + "\n"; + examples += "\n"; + examples += tab + "To decompose for 16 processors and use the default relative contact search tolerance:\n"; + examples += tab + tab + "> mpirun -n 16 " + m_execName + " file.exo " + stk::dash_it(m_optionNames.faceSearchRelTol) + "\n"; + examples += "\n"; + examples += tab + "To decompose for 16 processors and use a relative contact search tolerance of 0.05:\n"; + examples += tab + tab + "> mpirun -n 16 " + m_execName + " file.exo " + stk::dash_it(m_optionNames.faceSearchRelTol) + "=0.05\n"; + examples += "\n"; + examples += tab + "To decompose for 16 processors with the RCB decomposition method:\n"; + examples += tab + tab + "> mpirun -n 16 " + m_execName + " file.exo " + stk::dash_it(m_optionNames.decompMethod) + "=rcb\n"; + return examples; +} + +Parser::Parser(MPI_Comm comm) + : m_comm(comm), + m_commandLineParser(m_comm) +{ + add_options_to_parser(); +} + +void Parser::parse_command_line_options(int argc, const char** argv, BalanceSettings& settings) +{ + setup_messages(argv); + + stk::parse_command_line(argc, argv, m_quickExample, m_longExamples, m_commandLineParser, m_comm); + + set_filenames(settings); + set_app_type_defaults(settings); + set_contact_search(settings); + set_contact_search_tolerance(settings); + set_decomp_method(settings); +} + +std::string Parser::get_quick_error() const +{ + return m_quickError; +} + +void Parser::add_options_to_parser() +{ + stk::CommandLineOption infile{m_optionNames.infile, "i", + "undecomposed serial input mesh file"}; + stk::CommandLineOption outputDirectory{m_optionNames.outputDirectory, "o", + "output directory for decomposition"}; + stk::CommandLineOption deprecatedOutputDirectory{m_optionNames.deprecatedOutputDirectory, "", + "DEPRECATED: output directory for decomposition"}; + + std::ostringstream smStream; + smStream << "Use settings suitable for solving Solid Mechanics problems. " + << "This flag implies:" << std::endl + << " " << stk::dash_it(m_optionNames.faceSearchRelTol) << "=" << m_defaults.faceSearchRelTol << std::endl + << " Face search graph vertex weight multiplier = " << m_defaults.smFaceSearchVertexMultiplier << std::endl + << " Face search graph edge weight = " << m_defaults.smFaceSearchEdgeWeight; + stk::CommandLineOption smDefaults{m_optionNames.smDefaults, "", smStream.str()}; + + std::ostringstream sdStream; + sdStream << "Use settings suitable for solving Structural Dynamics problems. " + << "This flag implies:" << std::endl + << " " << stk::dash_it(m_optionNames.faceSearchAbsTol) << "=" << m_defaults.faceSearchAbsTol << std::endl + << " Face search graph vertex weight multiplier = " << m_defaults.faceSearchVertexMultiplier << std::endl + << " Face search graph edge weight = " << m_defaults.faceSearchEdgeWeight << std::endl + << " Handle spider elements"; + stk::CommandLineOption sdDefaults{m_optionNames.sdDefaults, "", sdStream.str()}; + + stk::CommandLineOption faceSearchAbsTol{m_optionNames.faceSearchAbsTol, "", + "Use an absolute tolerance for face contact search. " + "Optionally provide a numeric tolerance value."}; + stk::CommandLineOption faceSearchRelTol{m_optionNames.faceSearchRelTol, "", + "Use a tolerance relative to the face size for face contact search. " + "Optionally provide a numeric tolerance value."}; + stk::CommandLineOption contactSearch{m_optionNames.contactSearch, "", + "Use proximity search for contact [on|off]"}; + stk::CommandLineOption decompMethod{m_optionNames.decompMethod, "", + "Use this geometric decomposition method [rcb|rib|multijagged] " + "or graph-based decomposition method [parmetis].\n" + "Note that geometric methods do not use contact search and " + "ignore all search-related options, as well as ignoring spider elements."}; + + m_commandLineParser.add_required_positional(infile); + m_commandLineParser.add_optional_positional(outputDirectory, "."); + m_commandLineParser.add_optional_positional(deprecatedOutputDirectory, ""); + m_commandLineParser.add_flag(smDefaults); + m_commandLineParser.add_flag(sdDefaults); + m_commandLineParser.add_optional_implicit(faceSearchAbsTol, m_defaults.faceSearchAbsTol); + m_commandLineParser.add_optional_implicit(faceSearchRelTol, m_defaults.faceSearchRelTol); + m_commandLineParser.add_optional(contactSearch, m_defaults.contactSearch); + m_commandLineParser.add_optional(decompMethod, m_defaults.decompMethod); +} + +void Parser::setup_messages(const char** argv) +{ + m_execName = stk::tailname(argv[0]); + m_examples.set_exec_name(m_execName); + + m_quickExample = m_examples.get_quick_example(); + m_longExamples = m_examples.get_long_examples(); + + m_quickError = stk::get_quick_error(m_execName, m_quickExample); +} + +void Parser::set_filenames(BalanceSettings& settings) const +{ + std::string outputDirectory = m_commandLineParser.get_option_value(m_optionNames.outputDirectory); + if (m_commandLineParser.is_option_parsed(m_optionNames.deprecatedOutputDirectory)) { + sierra::Env::outputP0() << "Warning: The option " << stk::dash_it(m_optionNames.deprecatedOutputDirectory) + << " has been deprecated in favor of " << stk::dash_it(m_optionNames.outputDirectory) + << " and will be removed in a future release." << std::endl; + outputDirectory = m_commandLineParser.get_option_value(m_optionNames.deprecatedOutputDirectory); + } + + const std::string inputFilename = m_commandLineParser.get_option_value(m_optionNames.infile); + const std::string outputFilename = construct_output_file_name(outputDirectory, inputFilename); + + settings.set_input_filename(inputFilename); + settings.set_output_filename(outputFilename); +} + +void Parser::set_app_type_defaults(BalanceSettings& settings) const +{ + bool useSM = m_commandLineParser.is_option_provided(m_optionNames.smDefaults); + bool useSD = m_commandLineParser.is_option_provided(m_optionNames.sdDefaults); + + ThrowRequireMsg( !(useSM && useSD), "Can't set default settings for multiple apps at the same time"); + + if (useSM) { + settings.setEdgeWeightForSearch(m_defaults.smFaceSearchEdgeWeight); + settings.setVertexWeightMultiplierForVertexInSearch(m_defaults.smFaceSearchVertexMultiplier); + settings.setToleranceFunctionForFaceSearch( + std::make_shared( + m_defaults.faceSearchRelTol + )); + } + + if (useSD) { + settings.setShouldFixSpiders(true); + } +} + +void Parser::set_contact_search(BalanceSettings& settings) const +{ + if (m_commandLineParser.is_option_parsed(m_optionNames.contactSearch)) { + std::string searchOption = m_commandLineParser.get_option_value(m_optionNames.contactSearch); + std::transform(searchOption.begin(), searchOption.end(), searchOption.begin(), ::tolower); + + ThrowRequireMsg(searchOption == "on" || searchOption == "off", + "Invalid contact search type (" + searchOption + "). Must be one of: [on|off]"); + + settings.setIncludeSearchResultsInGraph(searchOption == "on"); + } +} + +void Parser::set_contact_search_tolerance(BalanceSettings& settings) const +{ + bool useAbsTol = m_commandLineParser.is_option_provided(m_optionNames.faceSearchAbsTol); + bool useRelTol = m_commandLineParser.is_option_provided(m_optionNames.faceSearchRelTol); + + ThrowRequireMsg( !(useAbsTol && useRelTol), "Must not specify both an absolute and relative tolerance"); + + if (useAbsTol) { + settings.setToleranceForFaceSearch(m_commandLineParser.get_option_value(m_optionNames.faceSearchAbsTol)); + } + + if (useRelTol) { + settings.setToleranceFunctionForFaceSearch( + std::make_shared( + m_commandLineParser.get_option_value(m_optionNames.faceSearchRelTol))); + } +} + +void Parser::set_decomp_method(BalanceSettings& settings) const +{ + if (m_commandLineParser.is_option_parsed(m_optionNames.decompMethod)) { + settings.setDecompMethod(m_commandLineParser.get_option_value(m_optionNames.decompMethod)); + } +} + +} } diff --git a/packages/stk/stk_balance/stk_balance/setup/Parser.hpp b/packages/stk/stk_balance/stk_balance/setup/Parser.hpp new file mode 100644 index 000000000000..584edf29a202 --- /dev/null +++ b/packages/stk/stk_balance/stk_balance/setup/Parser.hpp @@ -0,0 +1,108 @@ +// Copyright 2002 - 2008, 2010, 2011 National Technology Engineering +// Solutions of Sandia, LLC (NTESS). Under the terms of Contract +// DE-NA0003525 with NTESS, the U.S. Government retains certain rights +// in this software. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following +// disclaimer in the documentation and/or other materials provided +// with the distribution. +// +// * Neither the name of NTESS nor the names of its contributors +// may be used to endorse or promote products derived from this +// software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +#ifndef STK_BALANCE_PARSER_HPP +#define STK_BALANCE_PARSER_HPP + +#include "mpi.h" + +#include "stk_util/command_line/CommandLineParserParallel.hpp" +#include "stk_balance/balanceUtils.hpp" +#include "stk_balance/setup/DefaultSettings.hpp" + +namespace stk { +namespace balance { + +std::string construct_output_file_name(const std::string& outputDirectory, const std::string& inputFile); + +struct OptionNames +{ + const std::string infile = "infile"; + const std::string outputDirectory = "output-directory"; + const std::string deprecatedOutputDirectory = "outputDirectory"; + const std::string smDefaults = "sm"; + const std::string sdDefaults = "sd"; + const std::string faceSearchAbsTol = "face-search-abs-tol"; + const std::string faceSearchRelTol = "face-search-rel-tol"; + const std::string contactSearch = "contact-search"; + const std::string decompMethod = "decomp-method"; +}; + +class Examples +{ +public: + Examples() {} + + void set_exec_name(const std::string& name) { m_execName = name; } + + std::string get_quick_example(); + std::string get_long_examples(); + +private: + std::string m_execName; + const OptionNames m_optionNames; +}; + +class Parser { + +public: + Parser(MPI_Comm comm); + + void parse_command_line_options(int argc, const char** argv, BalanceSettings& settings); + std::string get_quick_error() const; + +private: + void add_options_to_parser(); + void setup_messages(const char** argv); + + void set_filenames(BalanceSettings& settings) const; + void set_app_type_defaults(BalanceSettings& settings) const; + void set_contact_search(BalanceSettings& settings) const; + void set_contact_search_tolerance(BalanceSettings& settings) const; + void set_decomp_method(BalanceSettings& settings) const; + + const MPI_Comm m_comm; + const OptionNames m_optionNames; + const DefaultSettings m_defaults; + stk::CommandLineParserParallel m_commandLineParser; + Examples m_examples; + + std::string m_execName; + std::string m_quickExample; + std::string m_longExamples; + std::string m_quickError; +}; + +} } + +#endif diff --git a/packages/stk/stk_doc/doxygen/Doxyfile b/packages/stk/stk_doc/doxygen/Doxyfile deleted file mode 100644 index 318be7289f97..000000000000 --- a/packages/stk/stk_doc/doxygen/Doxyfile +++ /dev/null @@ -1,51 +0,0 @@ -# This command is expecting to have Doxygen.input generated as: -# -# for i in ../../*/dox/Doxyfile.input; do echo @INCLUDE = $i >> Doxyfile.input; done -# -# which may be accomplished as: -# -# rm -f Doxyfile.input && for i in ../../*/dox/Doxyfile.input; do echo @INCLUDE = $i >> Doxyfile.input; done && doxygen -# -@INCLUDE = Doxyfile.options -# -# Package options -# -PROJECT_NAME = "Sierra Toolkit" -OUTPUT_DIRECTORY = ../.. -# OUTPUT_DIRECTORY = /home/www/scico/sierra/codes/doxygen/stk -# OUTPUT_DIRECTORY = /sierra/Dev/www/stk -# -# What and how documentation is extracted -# -INPUT = ./index.dox - -RECURSIVE = YES -# -# Also include doxygen documentation for the other products: -# -@INCLUDE = Doxyfile.input -#@INCLUDE = ../../trilinos_shards/doc/Doxyfile.input -#@INCLUDE = ../../stk_util/doc/Doxyfile.input -#@INCLUDE = ../../stk_*/doc/index.dox -#@INCLUDE = ../../../stk_util/doc/index.dox - -FILE_PATTERNS = *.dox *.cpp *.hpp *.h - -IMAGE_PATH = -# EXAMPLE_PATH = ../example -EXCLUDE = -EXAMPLE_PATTERNS = -INPUT_FILTER = -ALPHABETICAL_INDEX = YES -IGNORE_PREFIX = -RECURSIVE = YES -# -# Links to other packages -# -ALLEXTERNALS = YES -EXTERNAL_GROUPS = YES - -GENERATE_TREEVIEW = YES -TREEVIEW_WIDTH = 250 - -GENERATE_TAGFILE = ./tags diff --git a/packages/stk/stk_doc/doxygen/Doxyfile.input b/packages/stk/stk_doc/doxygen/Doxyfile.input deleted file mode 100644 index a7c21121546b..000000000000 --- a/packages/stk/stk_doc/doxygen/Doxyfile.input +++ /dev/null @@ -1,16 +0,0 @@ -@INCLUDE = ../../stk_algsup/doc/Doxyfile.input -@INCLUDE = ../../stk_encore/doc/Doxyfile.input -@INCLUDE = ../../stk_io/doc/Doxyfile.input -@INCLUDE = ../../stk_linsys/doc/Doxyfile.input -@INCLUDE = ../../stk_mesh/doc/Doxyfile.input -@INCLUDE = ../../stk_rebalance/doc/Doxyfile.input -@INCLUDE = ../../stk_search/doc/Doxyfile.input -@INCLUDE = ../../stk_util/doc/Doxyfile.input -@INCLUDE = ../../stk_algsup/doc/Doxyfile.input -@INCLUDE = ../../stk_encore/doc/Doxyfile.input -@INCLUDE = ../../stk_io/doc/Doxyfile.input -@INCLUDE = ../../stk_linsys/doc/Doxyfile.input -@INCLUDE = ../../stk_mesh/doc/Doxyfile.input -@INCLUDE = ../../stk_rebalance/doc/Doxyfile.input -@INCLUDE = ../../stk_search/doc/Doxyfile.input -@INCLUDE = ../../stk_util/doc/Doxyfile.input diff --git a/packages/stk/stk_doc/doxygen/Doxyfile.options b/packages/stk/stk_doc/doxygen/Doxyfile.options deleted file mode 100644 index b1bb596252ce..000000000000 --- a/packages/stk/stk_doc/doxygen/Doxyfile.options +++ /dev/null @@ -1,81 +0,0 @@ -# -# Package options -# -OUTPUT_LANGUAGE = English -PROJECT_NUMBER = "Version of the Day" -# -# What and how documentation is extracted -# -SUBGROUPING = YES -EXTRACT_ALL = NO -EXTRACT_PRIVATE = NO -EXTRACT_STATIC = YES -EXTRACT_LOCAL_CLASSES = NO -HIDE_UNDOC_MEMBERS = NO -HIDE_UNDOC_CLASSES = YES -BRIEF_MEMBER_DESC = YES -REPEAT_BRIEF = YES -ALWAYS_DETAILED_SEC = NO -DETAILS_AT_TOP = YES -#DETAILS_AT_TOP = NO -FULL_PATH_NAMES = NO -STRIP_FROM_PATH = -SHOW_DIRECTORIES = YES -INTERNAL_DOCS = NO -CLASS_DIAGRAMS = YES -SOURCE_BROWSER = YES -INLINE_SOURCES = NO -STRIP_CODE_COMMENTS = YES -REFERENCED_BY_RELATION = NO -REFERENCES_RELATION = NO -CASE_SENSE_NAMES = YES -HIDE_SCOPE_NAMES = NO -VERBATIM_HEADERS = YES -SHOW_INCLUDE_FILES = YES -JAVADOC_AUTOBRIEF = YES -INHERIT_DOCS = YES -INLINE_INFO = YES -SORT_MEMBER_DOCS = NO -TAB_SIZE = 2 -ENABLED_SECTIONS = -ENUM_VALUES_PER_LINE = 1 -GENERATE_TODOLIST = YES -GENERATE_TESTLIST = YES -QUIET = NO -WARNINGS = YES -WARN_IF_UNDOCUMENTED = YES -WARN_FORMAT = "$file:$line: $text" -ALPHABETICAL_INDEX = YES -COLS_IN_ALPHA_INDEX = 4 -# -# What diagrams are created -# -CLASS_GRAPH = YES -COLLABORATION_GRAPH = NO -INCLUDE_GRAPH = YES -INCLUDED_BY_GRAPH = YES -GRAPHICAL_HIERARCHY = YES -#UML_LOOK = YES -TEMPLATE_RELATIONS = YES -#TEMPLATE_RELATIONS = NO -#MAX_DOT_GRAPH_WIDTH = 500 -HIDE_UNDOC_RELATIONS = YES -# -# Preprocessing -# -ENABLE_PREPROCESSING = YES -MACRO_EXPANSION = YES -EXPAND_ONLY_PREDEF = NO -SEARCH_INCLUDES = YES -INCLUDE_FILE_PATTERNS = -PREDEFINED += DOXYGEN_COMPILE STK_HAS_MPI -# -# What type of documentation is generated -# -GENERATE_HTMLHELP = NO -DISABLE_INDEX = NO -GENERATE_LATEX = NO -GENERATE_RTF = NO -GENERATE_MAN = NO -GENERATE_XML = NO -SEARCHENGINE = YES diff --git a/packages/stk/stk_doc/doxygen/build.sh b/packages/stk/stk_doc/doxygen/build.sh deleted file mode 100644 index edcb30332406..000000000000 --- a/packages/stk/stk_doc/doxygen/build.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh - -rm -f Doxyfile.input -rm -f index.dox - -echo "/** \mainpage Sierra Toolkit" > index.dox -echo " *" >> index.dox - -for i in ../../stk_*/dox/Doxyfile.input; do - echo @INCLUDE = $i >> Doxyfile.input -done - -echo " * @section stk_products The Sierra Toolkit contains the following products:" >> index.dox -echo " *" >> index.dox -for i in ../../stk_*/dox/Doxyfile.input; do - gawk -- '/#BANNER/{print " * - "substr($0, 8)}' $i >> index.dox - echo " *" >> index.dox -done -echo " *" >> index.dox - -echo " * @section stk_howto How to..." >> index.dox -echo " *" >> index.dox -for i in ../../stk_*/dox/Doxyfile.input; do - echo @INCLUDE = $i >> Doxyfile.input - gawk -- '/#HOWTO/{print " * - "substr($0, 7)}' $i >> index.dox - echo " *" >> index.dox -done -echo " *" >> index.dox - -echo " */" >> index.dox - -doxygen - -# Hello Carol diff --git a/packages/stk/stk_doc/doxygen/index.dox b/packages/stk/stk_doc/doxygen/index.dox deleted file mode 100644 index 76deb233a5b7..000000000000 --- a/packages/stk/stk_doc/doxygen/index.dox +++ /dev/null @@ -1,41 +0,0 @@ -/** \mainpage Sierra Toolkit - * - * @section stk_products The Sierra Toolkit contains the following products: - * - * - @copydoc stk_algsup_banner - * - * - @copydoc stk_encore_banner - * - * - @copydoc stk_io_banner - * - * - @copydoc stk_linsys_banner - * - * - @copydoc stk_mesh_banner - * - * - @copydoc stk_rebalance_banner - * - * - @copydoc stk_search_banner - * - * - @copydoc stk_util_banner - * - * - * @section stk_howto How to... - * - * - @copydoc stk_algsup_howto - * - * - @copydoc stk_encore_howto - * - * - @copydoc stk_io_howto - * - * - @copydoc stk_linsys_howto - * - * - @copydoc stk_mesh_howto - * - * - @copydoc stk_rebalance_howto - * - * - @copydoc stk_search_howto - * - * - @copydoc stk_util_howto - * - * - */ diff --git a/packages/stk/stk_doc/stk_algsup/doc/Doxyfile b/packages/stk/stk_doc/stk_algsup/doc/Doxyfile deleted file mode 100644 index 1ab92af52e16..000000000000 --- a/packages/stk/stk_doc/stk_algsup/doc/Doxyfile +++ /dev/null @@ -1,33 +0,0 @@ -@INCLUDE = Doxyfile.options - -# -# Package options -# -PROJECT_NAME = "Sierra Toolkit Algorithm Support" -OUTPUT_DIRECTORY = ../.. - -# -# What and how documentation is extracted -# -@INCLUDE = Doxyfile.input - -FILE_PATTERNS = *.dox *.hpp *.h - -IMAGE_PATH = -# EXAMPLE_PATH = ../example -EXCLUDE = -EXAMPLE_PATTERNS = -INPUT_FILTER = -ALPHABETICAL_INDEX = YES -IGNORE_PREFIX = -RECURSIVE = YES -# -# Links to other packages -# -ALLEXTERNALS = YES -EXTERNAL_GROUPS = YES - -GENERATE_TREEVIEW = YES -TREEVIEW_WIDTH = 250 - -GENERATE_TAGFILE = ./tags diff --git a/packages/stk/stk_doc/stk_algsup/doc/Doxyfile.input b/packages/stk/stk_doc/stk_algsup/doc/Doxyfile.input deleted file mode 100644 index 675e175533f2..000000000000 --- a/packages/stk/stk_doc/stk_algsup/doc/Doxyfile.input +++ /dev/null @@ -1,5 +0,0 @@ -#BANNER @copydoc stk_algsup_banner -#HOWTO @copydoc stk_algsup_howto - -INPUT += ../stk_algsup/doc/index.dox \ - ../stk_algsup/stk_algsup diff --git a/packages/stk/stk_doc/stk_algsup/doc/Doxyfile.options b/packages/stk/stk_doc/stk_algsup/doc/Doxyfile.options deleted file mode 100755 index 91cfa7f49a28..000000000000 --- a/packages/stk/stk_doc/stk_algsup/doc/Doxyfile.options +++ /dev/null @@ -1,81 +0,0 @@ -# -# Package options -# -OUTPUT_LANGUAGE = English -PROJECT_NUMBER = "Version of the Day" -# -# What and how documentation is extracted -# -SUBGROUPING = YES -EXTRACT_ALL = NO -EXTRACT_PRIVATE = NO -EXTRACT_STATIC = YES -EXTRACT_LOCAL_CLASSES = NO -HIDE_UNDOC_MEMBERS = NO -HIDE_UNDOC_CLASSES = YES -BRIEF_MEMBER_DESC = YES -REPEAT_BRIEF = YES -ALWAYS_DETAILED_SEC = NO -DETAILS_AT_TOP = YES -#DETAILS_AT_TOP = NO -FULL_PATH_NAMES = NO -STRIP_FROM_PATH = -SHOW_DIRECTORIES = YES -INTERNAL_DOCS = NO -CLASS_DIAGRAMS = YES -SOURCE_BROWSER = YES -INLINE_SOURCES = NO -STRIP_CODE_COMMENTS = YES -REFERENCED_BY_RELATION = NO -REFERENCES_RELATION = NO -CASE_SENSE_NAMES = YES -HIDE_SCOPE_NAMES = NO -VERBATIM_HEADERS = YES -SHOW_INCLUDE_FILES = YES -JAVADOC_AUTOBRIEF = NO -INHERIT_DOCS = YES -INLINE_INFO = YES -SORT_MEMBER_DOCS = NO -TAB_SIZE = 2 -ENABLED_SECTIONS = -ENUM_VALUES_PER_LINE = 4 -GENERATE_TODOLIST = YES -GENERATE_TESTLIST = YES -QUIET = NO -WARNINGS = YES -WARN_IF_UNDOCUMENTED = YES -WARN_FORMAT = "$file:$line: $text" -ALPHABETICAL_INDEX = YES -COLS_IN_ALPHA_INDEX = 4 -# -# What diagrams are created -# -CLASS_GRAPH = YES -COLLABORATION_GRAPH = NO -INCLUDE_GRAPH = YES -INCLUDED_BY_GRAPH = YES -GRAPHICAL_HIERARCHY = YES -#UML_LOOK = YES -TEMPLATE_RELATIONS = YES -#TEMPLATE_RELATIONS = NO -#MAX_DOT_GRAPH_WIDTH = 500 -HIDE_UNDOC_RELATIONS = YES -# -# Preprocessing -# -ENABLE_PREPROCESSING = YES -MACRO_EXPANSION = YES -EXPAND_ONLY_PREDEF = NO -SEARCH_INCLUDES = YES -INCLUDE_FILE_PATTERNS = -PREDEFINED += DOXYGEN_COMPILE STK_HAS_MPI -# -# What kind of documentation is generated -# -GENERATE_HTMLHELP = NO -DISABLE_INDEX = NO -GENERATE_LATEX = NO -GENERATE_RTF = NO -GENERATE_MAN = NO -GENERATE_XML = NO -SEARCHENGINE = YES diff --git a/packages/stk/stk_doc/stk_algsup/doc/index.dox b/packages/stk/stk_doc/stk_algsup/doc/index.dox deleted file mode 100644 index 36616af33f6b..000000000000 --- a/packages/stk/stk_doc/stk_algsup/doc/index.dox +++ /dev/null @@ -1,73 +0,0 @@ -/** - * \page stk_algsup_banner Sierra Toolkit Algorithm Support - * - * \ref stk_algsup_module "Sierra Toolkit Algorithm Support" - * - * The Sierra Toolkit Algorithm Support product provides... - * - * \addtogroup stk_algsup_module Sierra Toolkit Algorithm Support Product - * - * The Sierra Toolkit Algorithm Support product provides... - * - * \code - * #include - * #include - * \endcode - * - * where directory is one of the following: - * - *
    - *
  • \ref stk_algsup_diagnostics_module "diag" - * - * functions and classes that support diagnostic output - * - *
- * - * Algorithm Support How To ... - * - * \copydoc stk_algsup_howto - * - * \page stk_algsup_howto Algorithm Support How To ... - * - * Sierra Tookit Algorithm Support - * - * - Thread Support - * - \ref stk_algsup_thread_howto_create "Create Thread Algorithms"
- * - CUDA Support - * - \ref stk_algsup_cuda_howto_create "Create Cuda Algorithms"
- * - * \defgroup stk_algsup_module_detail Sierra Toolkit Algorithm Support - * @{ - * - * \defgroup stk_algsup_module Coarse Algorithm Support - * - * The coarse algorithm support module... - * - * blah blah lah - * - * @{ - * \defgroup stk_algsup_detail Command Line Options - * \defgroup - * @} - * - * \defgroup stk_algsup_diagnostics_module Algorithm Support Diagnostics - * @{ - * \defgroup stk_algsup_diag_detail Diagnostics available for algorithm support - * \defgroup - * @} - * - * \defgroup stk_algsup_thread_module Thread - * @{ - * \defgroup stk_algsup_thread_detail Thread - * \defgroup - * @} - * - * \defgroup stk_algsup_cuda_module Cuda - * @{ - * \defgroup stk_algsup_cuda_detail Cuda - * \defgroup - * @} - * - * @} - */ - diff --git a/packages/stk/stk_doc/stk_io/doc/Doxyfile.input b/packages/stk/stk_doc/stk_io/doc/Doxyfile.input deleted file mode 100644 index 67746dd4724e..000000000000 --- a/packages/stk/stk_doc/stk_io/doc/Doxyfile.input +++ /dev/null @@ -1,17 +0,0 @@ -#BANNER @copydoc stk_io_banner -#HOWTO @copydoc stk_io_howto - -# Note, any path you set here will have to be set twice; once for when doxygen -# is run from this directory, and once for when doxygen is run from the -# TPLs_src/Trilinos/packages/stk/doc directory. - -# Put local appends here! Note: Please only put append-type changes -# (IE, VAR += CHANGE) in this section. All the STK products must -# use the same configuration because, when doxygen is run from stk/doc -# to assemble HTML for the entire STK, any configuration overrides -# that happened here would affect the html generation for ALL the -# STK products. - -INPUT += ../stk_io/doc/index.dox \ - ../stk_io/stk_io \ - ../stk_io/unit_tests diff --git a/packages/stk/stk_doc/stk_io/doc/index.dox b/packages/stk/stk_doc/stk_io/doc/index.dox deleted file mode 100644 index dd9007288659..000000000000 --- a/packages/stk/stk_doc/stk_io/doc/index.dox +++ /dev/null @@ -1,26 +0,0 @@ -/** - * - * \page stk_io_banner Sierra Toolkit I/O - * - * \ref stk_io_module "Sierra Toolkit I/O Routines" - * - * The Sierra Toolkit IO product contains functions related to the transfer of data between the - * Ioss classes and the stk::mesh classes. These functions do not provide a total turnkey mesh - * reading or results writing capability; rather, they provide helper functions for the - * application to use which make it easier to read and/or write the data. The application has - * full control over the mesh reading and results/restart writing. - * - * The basic flow chart for reading mesh data from the Ioss and defining and populating an - * stk::mesh structure is shown in the \ref stk_example_io namespace and the - * stk_io/use_cases/io_example.cpp file. - * - * \addtogroup stk_io_module Sierra Toolkit I/O Routines - * - * The Sierra Toolkit IO product contains functions related to the transfer of data between the - * Ioss classes and the stk::mesh classes. These functions do not provide a total turnkey mesh - * reading or results writing capability; rather, they provide helper functions for the - * application to use which make it easier to read and/or write the data. The application has - * full control over the mesh reading and results/restart writing. - * - */ - diff --git a/packages/stk/stk_doc/stk_linsys/doc/Doxyfile.input b/packages/stk/stk_doc/stk_linsys/doc/Doxyfile.input deleted file mode 100644 index 41ff19952e5d..000000000000 --- a/packages/stk/stk_doc/stk_linsys/doc/Doxyfile.input +++ /dev/null @@ -1,20 +0,0 @@ -#BANNER @copydoc stk_linsys_banner -#HOWTO @copydoc stk_linsys_howto - -# Note, any path you set here will have to be set twice; once for when doxygen -# is run from this directory, and once for when doxygen is run from the -# TPLs_src/Trilinos/packages/stk/doc directory. - -# Put local appends here! Note: Please only put append-type changes -# (IE, VAR += CHANGE) in this section. All the STK products must -# use the same configuration because, when doxygen is run from stk/doc -# to assemble HTML for the entire STK, any configuration overrides -# that happen here will affect the html generation for ALL the -# STK products. - -INPUT += ../../stk_linsys/doc/index.dox \ - ../../stk_linsys/stk_linsys \ - ../stk_linsys/doc/index.dox \ - ../stk_linsys/stk_linsys - - diff --git a/packages/stk/stk_doc/stk_linsys/doc/index.dox b/packages/stk/stk_doc/stk_linsys/doc/index.dox deleted file mode 100644 index a3e701039d19..000000000000 --- a/packages/stk/stk_doc/stk_linsys/doc/index.dox +++ /dev/null @@ -1,11 +0,0 @@ -/** - * \page stk_linsys_banner Sierra Toolkit Linear System - * - * \ref stk_linsys_module "Sierra Toolkit Linear-System Assembly" - *

- * The Sierra Toolkit Linear-System Assembly package supports assembly of - * matrix/vector contributions from stk::mesh data into FEI interfaces which - * in turn support Trilinos and FETI data structures. - *

- * - */ diff --git a/packages/stk/stk_doc/stk_mesh/doc/Doxyfile.input b/packages/stk/stk_doc/stk_mesh/doc/Doxyfile.input deleted file mode 100644 index 66372da07549..000000000000 --- a/packages/stk/stk_doc/stk_mesh/doc/Doxyfile.input +++ /dev/null @@ -1,20 +0,0 @@ -#BANNER @copydoc stk_mesh_banner -#HOWTO @copydoc stk_mesh_howto - -# Note, any path you set here will have to be set twice; once for when doxygen -# is run from this directory, and once for when doxygen is run from the -# TPLs_src/Trilinos/packages/stk/doc directory. - -# Put local appends here! Note: Please only put append-type changes -# (IE, VAR += CHANGE) in this section. All the STK products must -# use the same configuration because, when doxygen is run from stk/doc -# to assemble HTML for the entire STK, any configuration overrides -# that happened here would affect the html generation for ALL the -# STK products. - -EXAMPLE_PATH += ../use_cases \ - ../stk_mesh/use_cases - -INPUT += ../stk_mesh/doc/index.dox \ - ../stk_mesh/stk_mesh \ - ../stk_mesh/unit_tests diff --git a/packages/stk/stk_doc/stk_mesh/doc/index.dox b/packages/stk/stk_doc/stk_mesh/doc/index.dox deleted file mode 100644 index ab05495fbc8f..000000000000 --- a/packages/stk/stk_doc/stk_mesh/doc/index.dox +++ /dev/null @@ -1,263 +0,0 @@ -/** - * \page stk_mesh_banner Sierra Toolkit Mesh - * - * \ref stk_mesh_module "Sierra Toolkit Mesh" - *

- * The Sierra Toolkit Mesh supports parallel distributed, - * heterogeneous, and dynamically modifiable unstructured meshes - * with computational field data. - *

- * - * \addtogroup stk_mesh_module - * \{ - * - * \page stk_mesh_howto Mesh How To ... - * - * Sierra Mesh - * - * - \ref stk_mesh_example "Simple Mesh Example"
- * - * \page stk_mesh_documentation STK Mesh Documentation... - * - * STK Mesh Documentation - * - * Getting Started - * - \ref stk_mesh_first_steps "First Steps"
- * - \ref stk_mesh_tutorials_examples "Tutorials and Examples"
- * - \ref stk_mesh_demonstrations "Demonstrations"
- * - \ref stk_mesh_installation "Installation"
- * - * API Reference - * - \ref stk_mesh_class_function_documentation "Class and Function Documentation"
- * - \ref stk_mesh_modules "Modules and Extensions to STK"
- * - \ref stk_mesh_tutorials_examples "Tutorials and Examples"
- * - \ref stk_mesh_how_to_best_practices "How-To's and Best Practices"
- * - \ref stk_mesh_vocabulary "Vocabulary"
- * - \ref stk_mesh_whats_new "What's New in STK"
- * - * Working with STK (include development issues here?) - * - \ref stk_mesh_building "Building STK mesh"
- * - \ref stk_mesh_running "Running STK mesh"
- * - \ref stk_mesh_testing_and_debugging "Unit Testing and Debugging"
- * - * Community and Resources - * - \ref stk_mesh_online_resources "Online Resources"
- * - \ref stk_mesh_faq "FAQ"
- * - \ref stk_mesh_developers "Developers"
- * - \ref stk_mesh_support_training_services "Support, Training and Services"
- * - * Contributing - * - \ref stk_mesh_report_bugs_make_suggestions "Report Bugs and Make Suggestions"
- * - \ref stk_mesh_repository "Repository"
- * - \ref stk_mesh_credits "Credits"
- * - * Licenses - * - \ref stk_mesh_license_for_STK "BSD"
- * - \ref stk_mesh_licenses_in_STK "Licenses Used in STK"
- * - * \page stk_mesh_first_steps First Steps - * - * \page stk_mesh_demonstrations Demonstrations - * - Internal Force Calculation (Use Case 14) - * - Gears Demonstration & video - * - * \page stk_mesh_installation Installation - * - Use the Trilinos cmake installation instructions to install stk_mesh. - * - * \page stk_mesh_class_function_documentation Class and Function Documentation - * This page includes information on the classes and functions in STK. - * This page also includes a description of the namespace conventions in STK. - * This page also includes a description of the global objects in STK. - * - * \page stk_mesh_modules Modules and Extensions to STK - * This page explains the various STK modules and extension points in STK. - * - * \page stk_mesh_tutorials_examples Tutorials and Examples - * \ingroup stk_mesh_module - * - \ref stk_mesh_use_case_1 "Use Case 1" - * - * \page stk_mesh_how_to_best_practices How-To's and Best Practices - * - How-To's - * - How to create a fast-gather for nodal fields from an element? - * - How do I read from an exodus file? - * - How do I create a mesh by hand? - * - How do I create full topological adjacency entities in stk_mesh? - * - Design Decisions: - * - Why are parts used to determine bucket decomposition? - * - Why are attributes const? - * - Why is modified status propagated upward through relations? - * - Why can't we add parts after meta data is committed? - * - Why are attributes settable on meta data for parts, but you can only get them off of the parts? - * - etc. - * - Free Function Philosophy: - * - We endorse the use of free functions that provide the following benefits while outweighing the following disadvantages. - * - Benefits: - * - Provide extension without modification to the API in cooperation with the Open Closed Principle - * - Help encourage the Single Responsibility Principle and cohesion through a minimally defined API - * - Disadvantages: - * - Too many ways to do things - * - Too hard to find where the free functions are defined - * - Often belong in the user-space - * - * \page stk_mesh_vocabulary Vocabulary - * This page explains the vocabulary used in stk_mesh. - * - * \page stk_mesh_building Building STK mesh - * - Sierra (bake or bjam) - * - Trilinos (cmake) - * - * \page stk_mesh_running Running STK mesh - * - * \page stk_mesh_testing_and_debugging Unit Testing and Debugging - *

To run unit tests

- * - Build the stk_mesh product and look for the unit test (name/loc will depend on if you build Sierra-style or Trilinos-style). - * - You can run the exectuble in serial or in parallel with MPI - * - You can select specific unit-tests to run using the --gtest_filter flag - * - Example, to run all Entity unit tests: -- --gtest_filter=UnitTestEntity.* - * - Example, to run a specific unit test: -- --gtest_filter=UnitTestEntity.testEntityKey - * - *

To debug unit tests

- * - A unit-test can fail for a number of reasons - * - One of the macro assertions has failed; gtest will print the name -of the failing unit test, line file and line number of the failing -check, and some details about the failing check. - * - An uncaught exception was raised; the exception will be printed -along with a stacktrace. Since Gtest prints test names as it starts -them, it should be obvious which test caused the problem. - * - The program crashed, probably due to a segfault. Since Gtest -prints test names as it starts them, it should be obvious which test -caused the problem. - * - * - When debugging, it is usually best to only run the failing test (use gtest_filter to select the failing test) - * - * - Serial debugging can be done in gdb or totalview - * - GDB - * - gdb - * - % run -- --gtest_filter= - * - Totalview - * - mpirun -np 1 -tv -- --gtest_filter= - * - * - Parallel debugging should be done with totalview, but it is possible to do it with GDB as well - * - GDB - * - How to set this up is beyond the scope of this document. A good description can be found here: http://www.open-mpi.org/faq/?category=debugging - * - Totalview - * - mpirun -np -tv -- --gtest_filter= - * - To find where an exception is being generated, a common technique is to set a breakpoint at __cxa_throw - * - * - Debugging memory problems can be done with valgrind - * - In serial: valgrind -- --gtest_filter= - * - In parallel it is more difficult - * - If you have access to the sntools, you can use mpigrind: - * - mpigrind mpirun -np -- --gtest_filter= - * - Otherwise, you'll have to create a script that runs the test under valgrind and then run mpirun on that script. - * - *

Unit test development

- * - Individual Unit Tests: - * - Test one part of functionality at a time and put each test in its own STKUNIT_UNIT_TEST macro. - * - Name each test with a descriptive name. - * - Aim for short and concise unit tests that each fit on a single page - * - Use descriptive names for variables - * - Name/label all magic-numbers including 0 and 1. - * - Aim for positive logic in testing, try to be obvious - * - If using a complex fixture, use ascii art to document the fixture - * - If the unit_test is complex, have a comment at the top of the unit test describing what you're testing and why - * - * - General Notes: - * - Remember that these tests will be read 10x more than they're written (especially during refactoring) - * - Place code in namespace stk::unit_test - * - Use namespaces judiciously to improve readability ( Prefer: using stk::mesh::MetaData; over using namespace stk; and namespace stk { ) - * - Avoid “unsigned” and use pre-defined typedefs instead (EntityRank, size_t, PartOrdinal, FieldOrdinal, etc…) - * - * - STKUNIT macros for verifying results inside STKUNIT_UNIT_TEST macro: - * - STKUNIT_EXPECT_* vs. STKUNIT_ASSERT_*, the ASSERT will stop the unit test at this line on failure. - * - Boolean values: STKUNIT_ASSERT_[EQ, NE, LE, LT, GE, GT, TRUE, FALSE] - * - String values: STKUNIT_ASSERT_[STREQ, STRNE, STRCASEEQ, STRCASENE] (CASE means ignore case) - * - Exceptions: STKUNIT_ASSERT_[THROW, NO_THROW] - * - Floating point values: STKUNIT_ASSERT_[DOUBLE_EQ, NEAR] - - *

Software Architecture

- * - The site Resources for Software Architects has excellent free documentation. - * - Domain Modeling expresses the requirements for software within a -conceptual model of the problem domain. Such a model spans the -software’s requirements, architectural design (the decomposition of -software into architectural components and relationships among those -components), and key concepts of the software design. - * - *

Should I continue to copy verbatim out of the wiki?

- * - * \page stk_mesh_online_resources Online Resources - * - * \page stk_mesh_faq FAQ - * - How is Stk_mesh different from Moab? - * - How is Stk_mesh different from libMesh? - * - * \page stk_mesh_developers Developers - * - Sierra Tool-Kit Developers (in alphabetical order) - * - Dave Baur - * - Todd Coffey - * - Carter Edwards - * - Jim Foucar - * - Russell Hooper - * - James Overfelt - * - Greg Sjaardema - * - Dan Sunderland - * - Alan Williams - * - Sierra Tool-Kit Product Owner: - * - Mike Glass - * - * \page stk_mesh_support_training_services Support, Training and Services - * - For support, contact the Sierra Tool-Kit user email list: - * - Our Tutorial and Training materials are currently under development - * - For Services, please contact our product owner: Mike Glass - * - * \page stk_mesh_report_bugs_make_suggestions Report Bugs and Make Suggestions - * - To report bugs or make suggestions, please send them to - * - * \page stk_mesh_repository Repository - * - The Sierra Tool-Kit repository is located at software.sandia.gov - * - * \page stk_mesh_credits Credits - * - The following people have contributed to the Sierra Tool-Kit (in alphabetical order): - * - Roscoe Bartlett - * - Dave Baur - * - Noel Belcourt - * - Bill Cochran - * - Todd Coffey - * - Stefan Domino - * - Carter Edwards - * - Jim Foucar - * - Mike Glass - * - Russell Hooper - * - Elijah Newren - * - James Overfelt - * - Kendall Pierson - * - Greg Sjaardema - * - Dan Sunderland - * - Alan Williams - * - * \page stk_mesh_license_for_STK BSD - * - The Sierra Tool-Kit is currently distributed with Trilinos under the BSD license. - * - * \page stk_mesh_use_case_1 Use Case 1 - * \ingroup stk_mesh_module - * This is a hello world example for how to construct a stk mesh. - * \dontinclude UseCase_1.hpp - * First, these two headers need to be included: - * \skip doxygen tutorial start #includes - * \until end code snippet - * Then a simple class is created which contains MetaData and BulkData: - * \skip UseCase_1_Mesh - * \until }; - * Second, we have the definition file with the bare minimum of includes: - * \dontinclude UseCase_1.cpp - * \skip doxygen tutorial start #includes - * \until end code snippet - * And here we have a small function which creates the vector of rank - * names for MetaData. - * \skip use_case_1_rank_names - * \until } - * And finally we have the constructor which sets up MetaData and BulkData - * in a very trivial way: - * \skip doxygen tutorial start source - * \until end code snippet - * \} */ diff --git a/packages/stk/stk_doc/stk_search/doc/index.dox b/packages/stk/stk_doc/stk_search/doc/index.dox deleted file mode 100644 index 7158427c8da1..000000000000 --- a/packages/stk/stk_doc/stk_search/doc/index.dox +++ /dev/null @@ -1,78 +0,0 @@ - -/** @brief Sierra Toolkit */ -namespace stk { -}//namespace stk - -/** - * \mainpage Sierra Toolkit Search Product - * - * \copydoc stk_search_module - * - * \page stk_search_banner Sierra Toolkit Search - * - * \ref stk_search_module "Sierra Toolkit Search" - * - * The Sierra Toolkit Search product provides... - * - * \page stk_search_module Sierra Toolkit Search Product - * - * The Sierra Toolkit Search product provides... - * - * \code - * #include - * #include - * \endcode - * - * where directory is one of the following: - * - *
    - *
  • \ref stk_search_diagnostics_module "diag" - * - * functions and classes that support diagnostic output, traceback and runtime timing and metrics - * - *
- * - * Search How To ... - * - * \copydoc stk_search_howto - * - * \page stk_search_howto Search How To ... - * - * Sierra Tookit Search - * - * - Coarse Search Interface - * - \ref stk_search_coarse_howto_create "Create Coarse Searchers"
- * - \ref stk_search_coarse_howto_use "Use Coarse Searchers"
- * - ACME - * - \ref stk_search_acme_howto_create "Use ACME as coarse search"
- * - \ref stk_search_acme_howto_use "Use ACME stand alone"
- * - * \defgroup stk_search_module_detail Sierra Toolkit Search - * @{ - * - * \defgroup stk_search_coarse_module Coarse Search - * - * The coarse search module... - * - * blah blah lah - * - * @{ - * \defgroup stk_search_coarse_detail Command Line Options - * \defgroup - * @} - * - * \defgroup diagnostics_module Search Diagnostics - * @{ - * \defgroup stk_search_diag_detail Diagnostics available for search - * \defgroup - * @} - * - * \defgroup stk_search_acme_module ACME - * @{ - * \defgroup stk_search_acme_detail ACME - * \defgroup - * @} - * - * @} - */ - diff --git a/packages/stk/stk_doc/stk_util/doc/Doxyfile.input b/packages/stk/stk_doc/stk_util/doc/Doxyfile.input deleted file mode 100644 index 072e54210dfb..000000000000 --- a/packages/stk/stk_doc/stk_util/doc/Doxyfile.input +++ /dev/null @@ -1,28 +0,0 @@ -#BANNER @copydoc stk_util_banner -#HOWTO @copydoc stk_util_howto - -# Note, any path you set here will have to be set twice; once for when doxygen -# is run from this directory, and once for when doxygen is run from the -# TPLs_src/Trilinos/packages/stk/doc directory. - -# Put local appends here! Note: Please only put append-type changes -# (IE, VAR += CHANGE) in this section. All the STK products must -# use the same configuration because, when doxygen is run from stk/doc -# to assemble HTML for the entire STK, any configuration overrides -# that happened here would affect the html generation for ALL the -# STK products. - -INPUT += ../stk_util/doc/index.dox \ - ../stk_util/stk_util \ - ../stk_util/stk_util/parallel \ - ../stk_util/stk_util/util \ - ../stk_util/stk_util/environment \ - ../stk_util/stk_util/diag - -# These were the variables that were being overwritten in the prior -# implementation. We'll keep these around in case we change to an -# implementation that supports unique configurations for each -# STK product. - -#ENUM_VALUES_PER_LINE = 4 -#PROJECT_NAME = "Sierra Toolkit Utilities" diff --git a/packages/stk/stk_doc/stk_util/doc/index.dox b/packages/stk/stk_doc/stk_util/doc/index.dox deleted file mode 100644 index c87dd43a9792..000000000000 --- a/packages/stk/stk_doc/stk_util/doc/index.dox +++ /dev/null @@ -1,125 +0,0 @@ - -/** @brief Sierra Toolkit */ -namespace stk { -}//namespace stk - -/** - * - * \page stk_util_banner Sierra Toolkit Utilities - * - * \ref stk_util_module "Sierra Toolkit Utilities" - * - * The Sierra Toolkit Utility product provides many low level functions and classes which support - * the development of parallel applications. - * - * \addtogroup stk_util_module Sierra Toolkit Utilities Product - * - * The Sierra Toolkit Utility product provides many low level functions and classes which support - * the development of parallel applications. The utility product is divided into subdirectories - * and are included as - * - * \code - * #include - * \endcode - * - * where directory is one of the following: - * - *
    - *
  • \ref stk_util_environment_module "environment" - * - * functions and classes that support parallel output logging, - * product version reporting, and program command line option parsing - * - *
  • \ref stk_util_diagnostics_module "diag" - * - * functions and classes that support diagnostic output, traceback and runtime timing and metrics - * - *
  • \ref stk_util_parallel_module "parallel" - * - * functions and classes to enhance and simplify the usage of MPI. - * - *
  • \ref stk_util_module "util" - * - * functions and classes that are too broad and general to be located in a more identifying - * location and include typing checkin and conversion templates, stream buffers, and case - * insensitivy functions and classes. - * - *
- * - * Utilities How To ... - * - * \page stk_util_howto Utilities How To ... - * @ingroup stk_util_module - * - * Sierra Tookit Utilities - * - * - Sierra issues - * - \ref stk_util_output_log_howto_use_in_sierra_app "Control output logging from sierra command line"
- * - * - Output Streams - * - \ref stk_util_output_log_howto_register_streams "Register output and log streams"
- * - \ref stk_util_output_log_howto_bind_streams "Bind log streams to output streams"
- * - \ref stk_util_log_control_howto_control_output "Toggle log output based on step or other rule"
- * - * - Runtime Warnings and Errors - * - \ref stk_util_runtime_message_howto_assembly "Assemble warning and error messages"
- * - \ref stk_util_runtime_message_howto_symmetric "Write warnings and errors that always occurs on all processors (Symmetric Warning and Errors)"
- * - \ref stk_util_runtime_message_howto_deferred "Write warnings and errors that occur in an MPI unsafe location and must be deferred (Deferred Warnings and Errors)"
- * - \ref stk_util_runtime_message_howto_adhoc "Write adhoc warnings or errors (deprecated)"
- * - \ref stk_util_runtime_message_howto_throttle "Throttling the display of messages"
- * - * - User/Developer Runtime Selectable Diagnostic Messages (Diagnostic Writers) - * - \ref stk_util_diag_writer_howto_add_to_app "Add diagnostic writer to your application"
- * - \ref stk_util_diag_writer_howto_assign_new_log_bits "Adding additional LOG_mask"
- * - \ref stk_util_diag_writer_howto_add_dump_to_my_class "Adding diagnostic output to your classes"
- * - \ref stk_util_diag_writer_howto_add_dump_to_external_class "Adding diagnostic output to library classes"
- * - \ref stk_util_diag_writer_howto_write_messages "Writing to the appout writer"
- * - \ref stk_util_diag_writer_howto_throw_safe "Maintain indentation thru exception throws"
- * - * - User/Developer Runtime Selectable Timers (Diagnostic Timers) - * - \ref stk_util_diag_timer_howto_add_to_class "Add a timer to a class"
- * - \ref stk_util_diag_timer_howto_add_to_function "Add a timer to a function"
- * - \ref stk_util_diag_timer_howto_stop_watch "Using the diagnostic timers for examining execution times"
- * - * - Others - * - \ref stk_util_bootstrap_howto_bootstrap "Register a bootstrap function"
- * - * \defgroup stk_util_module_detail Sierra Toolkit Utilities - * @{ - * - * \defgroup stk_util_environment_module Run-time Environment - * - * The runtime environment include classes and function for MPI - * - * initialize/finalize, thread library initialize/finalize, command line handling, time and - * memory measurement functions, and signal management/handling. Possibly includes parallel - * exception handling and unified error, warning, and other diagnostic information reporting. - * - * @{ - * \defgroup stk_util_command_line_options_detail Command Line Options - * \defgroup stk_util_output_log_detail Output Logging - * \defgroup stk_util_log_control_detail Toggling Log Output - * \defgroup stk_util_runtime_message_detail Runtime Message Reporting, Warnings and Dooms (Errors) - * \defgroup - * @} - * - * \defgroup stk_util_diagnostics_module Runtime Diagnostics and Timers - * @{ - * \defgroup stk_util_diag_writer_detail User/Developer Runtime Selectable Diagnostic Messages - * \defgroup stk_util_diag_timer_detail User/Developer Runtime Selectable Timers and Metrics - * \defgroup - * @} - * - * \defgroup stk_util_parallel_module Parallel Services - * - * \defgroup stk_util_discrete_module Finite Element Topologies - * - * \defgroup stk_util_other_module Utilities - * @{ - * \defgroup stk_util_bootstrap_detail Bootstrapping - * \defgroup stk_util_cistring_detail Case Insensitive Template, Functions and Classes - * \defgroup - * @} - * - * @} - */ diff --git a/packages/stk/stk_doc_tests/stk_balance/howToUseStkBalance.cpp b/packages/stk/stk_doc_tests/stk_balance/howToUseStkBalance.cpp index 1f8652baa921..8f5003babe5b 100644 --- a/packages/stk/stk_doc_tests/stk_balance/howToUseStkBalance.cpp +++ b/packages/stk/stk_doc_tests/stk_balance/howToUseStkBalance.cpp @@ -242,7 +242,7 @@ class FieldVertexWeightSettings : public stk::balance::GraphCreationSettings } protected: - FieldVertexWeightSettings() = default; + FieldVertexWeightSettings() = delete; FieldVertexWeightSettings(const FieldVertexWeightSettings&) = delete; FieldVertexWeightSettings& operator=(const FieldVertexWeightSettings&) = delete; @@ -401,7 +401,7 @@ class MultipleCriteriaFieldSettings : public ParmetisSettings } protected: - MultipleCriteriaFieldSettings() = default; + MultipleCriteriaFieldSettings() = delete; MultipleCriteriaFieldSettings(const MultipleCriteriaFieldSettings&) = delete; MultipleCriteriaFieldSettings& operator=(const MultipleCriteriaFieldSettings&) = delete; diff --git a/packages/stk/stk_doc_tests/stk_topology/element_topologies.cpp b/packages/stk/stk_doc_tests/stk_topology/element_topologies.cpp index 3a302a8a49f8..6c66c0b7ad49 100644 --- a/packages/stk/stk_doc_tests/stk_topology/element_topologies.cpp +++ b/packages/stk/stk_doc_tests/stk_topology/element_topologies.cpp @@ -118,21 +118,19 @@ void checkNodeOrderingAndOffsetsForFaces(const stk::topology &element, const uns void checkNodeOrderingAndOffsetsForEdges(const stk::topology &element, const unsigned *elementNodes, const unsigned *expectedNodeOffsets) { - unsigned numNodesPerEdge = element.edge_topology().num_nodes(); - unsigned *offsets = new unsigned[numNodesPerEdge]; - unsigned *nodeIds = new unsigned[numNodesPerEdge]; - - for (unsigned index=0; index offsets; + std::vector nodeIds; + for (unsigned index=0; index& topologyMappings) iossTopologyName="hex20"; stkTopology=stk::topology::HEXAHEDRON_20; topologyMappings.push_back(TopologyMapper(exodusName, exodusNumNodes, iossTopologyName, stkTopology)); + + exodusName="quad"; + exodusNumNodes=6; + iossTopologyName="quad6"; + stkTopology=stk::topology::QUAD_6; + topologyMappings.push_back(TopologyMapper(exodusName, exodusNumNodes, iossTopologyName, stkTopology)); + + exodusName="wedge"; + exodusNumNodes=12; + iossTopologyName="wedge12"; + stkTopology=stk::topology::WEDGE_12; + topologyMappings.push_back(TopologyMapper(exodusName, exodusNumNodes, iossTopologyName, stkTopology)); } TEST(Understanding, sierra_topologies) diff --git a/packages/stk/stk_doc_tests/stk_util/parameters.cpp b/packages/stk/stk_doc_tests/stk_util/parameters.cpp index 20db81663328..009d2238f1ec 100644 --- a/packages/stk/stk_doc_tests/stk_util/parameters.cpp +++ b/packages/stk/stk_doc_tests/stk_util/parameters.cpp @@ -32,6 +32,10 @@ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // +#include + +#ifdef STK_HAVE_BOOST + #include // for AssertHelper, EXPECT_EQ, etc #include // for size_t #include // for int64_t @@ -256,5 +260,5 @@ namespace } } -// type not supported... -// iterator access valid +#endif //STK_HAVE_BOOST + diff --git a/packages/stk/stk_exp/CMakeLists.txt b/packages/stk/stk_exp/CMakeLists.txt deleted file mode 100644 index 4d410b140f39..000000000000 --- a/packages/stk/stk_exp/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ - -ADD_SUBDIRECTORY(unit_tests) - diff --git a/packages/stk/stk_exp/Jamfile b/packages/stk/stk_exp/Jamfile deleted file mode 100644 index ecf11a0e264a..000000000000 --- a/packages/stk/stk_exp/Jamfile +++ /dev/null @@ -1,157 +0,0 @@ -#-------------------------------------------------------------------- -# Copyright 2002 - 2008, 2010, 2011 National Technology & -# Engineering Solutions of Sandia, LLC (NTESS). Under the terms -# of Contract DE-NA0003525 with NTESS, there is a -# non-exclusive license for use of this work by or on behalf -# of the U.S. Government. Export of this program may require -# a license from the United States Government. -#-------------------------------------------------------------------- - -# -# The signature for Boost.build rules is described here: -# -# http://www.boost.org/build/doc/html/bbv2/overview/targets.html -# -#function-name main-target-name -# : sources -# : requirements -# : default-build -# : usage-requirements -# ; -# -# * "main-target-name" is the name used to request the target -# on command line and to use it from other main targets. -# Main target name may contain alphanumeric characters and symbols '-' and '_'; -# * "sources" is the list of source files and other main targets that must be combined. -# * "requirements" is the list of properties that must always be present -# when this main target is built. -# * "default-build" is the list of properties that will be used unless -# some other value of the same feature is already specified. -# * "usage-requirements" is the list of properties that will be propagated -# to all main targets that use this one, i.e. to all dependedents. -# -# -# SECTION 1: Project definition -# - -import set ; -import path ; - -local stk_exp-root-inc ; -if $(RTenv-arg) = "user" { - stk_exp-root-inc = $(stk_exp-root)/include ; -} else { - stk_exp-root-inc = $(stk_exp-root) ; -} - -project votd - : requirements - $(sierra-warnings) - STK_BUILT_IN_SIERRA - $(stk_exp-root-inc) - gcc:STK_EXP_BUILD_KOKKOS - : usage-requirements - $(stk_exp-root-inc) - $(stk_exp-root) - STK_BUILT_IN_SIERRA - : build-dir $(stk_exp-builddir) - ; -# -# This variable should contain the applications and associated files that -# must be installed for both developers and end users. Unless they need to -# be visible to end users, unittests should not be placed here. -local installed-end-user-files = - ; -# -# This variable should contain the applications and associated files that will -# only be installed for and visible to developers. -# Note that if the --install-developer-files option is passed to bjam these will also -# be installed for end-users. (This is only intended to be used for testing.) -local installed-developer-files = - #stk_exp_kokkos_utest - ; - -# -# SECTION 2: Development install -# -explicit install-serial-targets ; -alias install-serial-targets ; - -# Dependencies listed in this target are installed in the developer's project. -# This should include all executables and any other files needed for developer use. -explicit install-targets ; -alias install-targets - : $(installed-end-user-files) - $(installed-developer-files) - ; - -# -# SECTION 3: End-user install -# -explicit install-user-env ; -alias install-user-env : install-user-jamfile - install-user-bin install-user-include install-user-lib ; - -# This rule copies build-system related files for this product to the install-root. -explicit install-user-jamfile ; -install install-user-jamfile - : [ glob $(stk_exp-root)/Jamfile ] - : $(install-root)/stk/stk_exp - $(stk_exp-root) - ; - - -# Dependencies listed in this target are always installed for end users. -# This should include only those executables and any other files needed by end-users. -explicit install-user-bin ; -install install-user-bin - : $(installed-end-user-files) - [ if-defined-val $(install-developer-files-arg) : - # Targets listed here will only be installed if the --install-developer-files option - # is passed to bjam. This is intended for testing that requires things like - # unittests to be installed when they normally would not be. - $(installed-developer-files) - ] - : - # Note that all Sierra executables are installed in a common bin directory, - # not in a product-specific bin directory. - $(install-bin-dir) - ; - - explicit install-user-include ; - install install-user-include - : [ path.glob-tree $(stk_exp-root) : *.h *.hpp ] - : $(install-root)/stk/stk_exp/include $(stk_exp-root) - ; - - explicit install-user-lib ; - install install-user-lib - : - : $(install-root)/stk/stk_exp/lib - ; - - explicit install-exe-targets ; - alias install-exe-targets : ; - -# -# SECTION 4: Build configuration -# - -#TODO re-enable this target after kokkos_core and kokkos_containers -#flat header includes are fixed -#exe stk_exp_kokkos_utest -# : -# [ glob $(stk_exp-root)/unit_tests/kokkos/*.cpp ] -# stk_sierra_util -# /mpi//mpi -# /tpl/gtest//gtest -# /tpl/trilinos//kokkoscore -# /sierra/stk_mesh//stk_mesh_base -# /sierra/stk_io//stk_io -# /sierra/stk_io//stk_io_util -# /sierra/stk_util//stk_util_util -# /sierra/stk_util//stk_util_environment -# : @sierra-exec-tag -# gcc -# ; - diff --git a/packages/stk/stk_exp/cmake/Dependencies.cmake b/packages/stk/stk_exp/cmake/Dependencies.cmake deleted file mode 100644 index 807a65ff5dd5..000000000000 --- a/packages/stk/stk_exp/cmake/Dependencies.cmake +++ /dev/null @@ -1,8 +0,0 @@ -SET(LIB_REQUIRED_DEP_PACKAGES Gtest Shards STKTopology STKUtil STKMesh) -SET(LIB_OPTIONAL_DEP_PACKAGES) -SET(TEST_REQUIRED_DEP_PACKAGES STKMesh STKTopology) -SET(TEST_OPTIONAL_DEP_PACKAGES STKIO KokkosCore) -SET(LIB_REQUIRED_DEP_TPLS) -SET(LIB_OPTIONAL_DEP_TPLS) -SET(TEST_REQUIRED_DEP_TPLS) -SET(TEST_OPTIONAL_DEP_TPLS) diff --git a/packages/stk/stk_exp/unit_tests/CMakeLists.txt b/packages/stk/stk_exp/unit_tests/CMakeLists.txt deleted file mode 100644 index 1f98b4057310..000000000000 --- a/packages/stk/stk_exp/unit_tests/CMakeLists.txt +++ /dev/null @@ -1,5 +0,0 @@ - -ADD_SUBDIRECTORY(kokkos) - -ADD_SUBDIRECTORY(cuda) - diff --git a/packages/stk/stk_exp/unit_tests/cuda/CMakeLists.txt b/packages/stk/stk_exp/unit_tests/cuda/CMakeLists.txt deleted file mode 100644 index 4c8932be2e1e..000000000000 --- a/packages/stk/stk_exp/unit_tests/cuda/CMakeLists.txt +++ /dev/null @@ -1,22 +0,0 @@ - - -ASSERT_DEFINED(PACKAGE_SOURCE_DIR CMAKE_CURRENT_SOURCE_DIR) - -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_BINARY_DIR}/unit_tests/cuda) - -FILE(GLOB SOURCES *.cpp) - -IF(TPL_ENABLE_CUDA) - CUDA_COMPILE(OBJECTS_CUDA check_cuda.cu cuda_saxpy.cu cuda_memory.cu) - LIST( APPEND SOURCES ${OBJECTS_CUDA} ) -ENDIF() - -TRIBITS_ADD_EXECUTABLE_AND_TEST( - exp_unit_cuda - SOURCES ${SOURCES} - DEPLIBS - COMM serial mpi - NUM_MPI_PROCS 1 - ) - diff --git a/packages/stk/stk_exp/unit_tests/cuda/check_cuda.cu b/packages/stk/stk_exp/unit_tests/cuda/check_cuda.cu deleted file mode 100644 index 9a924761561b..000000000000 --- a/packages/stk/stk_exp/unit_tests/cuda/check_cuda.cu +++ /dev/null @@ -1,38 +0,0 @@ - -#include -#include -#include - -int check_cuda() -{ - int deviceCount = 0; - cudaError_t err = cudaGetDeviceCount(&deviceCount); - std::cout<<"Detected "< 0) { - int deviceId = 0; - cudaSetDevice(deviceId); -// cudaDeviceReset(); - - cudaDeviceProp deviceProp; - cudaGetDeviceProperties(&deviceProp, deviceId); - - size_t cudaFreeMem = 0, cudaTotalMem = 0; - err = cudaMemGetInfo(&cudaFreeMem, &cudaTotalMem); - if (err != cudaSuccess) { - std::cerr<<"check_cuda: ERROR, cudaMemGetInfo: "< 0 ? 0 : -1;//return 0 if device(s) found, -1 if not -} - diff --git a/packages/stk/stk_exp/unit_tests/cuda/check_cuda.h b/packages/stk/stk_exp/unit_tests/cuda/check_cuda.h deleted file mode 100644 index 026ac65e5b1e..000000000000 --- a/packages/stk/stk_exp/unit_tests/cuda/check_cuda.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef STK_CHECK_CUDA_H -#define STK_CHECK_CUDA_H - -int check_cuda(); - -#endif - diff --git a/packages/stk/stk_exp/unit_tests/cuda/cuda_memory.cu b/packages/stk/stk_exp/unit_tests/cuda/cuda_memory.cu deleted file mode 100644 index 2b21302923be..000000000000 --- a/packages/stk/stk_exp/unit_tests/cuda/cuda_memory.cu +++ /dev/null @@ -1,58 +0,0 @@ - -#include -#include -#include - -#include - -__global__ -void cuda_kernel_init(float* x, int n, float init_value) -{ - int i = blockDim.x * blockIdx.x + threadIdx.x; - - if (i < n) { - x[i] = init_value; - } -} - -float* cuda_alloc_float(size_t n, const float& init_value) -{ - float *device_mem = NULL; - cudaError_t err = cudaSuccess; - - size_t num_bytes = n*sizeof(float); - - err = cudaMalloc((void**)&device_mem, num_bytes); - if (err != cudaSuccess) { - std::cerr<<"cudaMalloc(device_mem) ERROR: "<>>(device_mem, n, init_value); - err = cudaGetLastError(); - if (err != cudaSuccess) { - std::cerr<<"cuda_kernel_init ERROR: "<& host_vec) -{ - host_vec.resize(n); - - size_t num_bytes = n*sizeof(float); - - cudaError_t err = cudaMemcpy((void*)&host_vec[0], (void*)device_mem, num_bytes, cudaMemcpyDeviceToHost); - if (err != cudaSuccess) { - std::cerr<<"cudaMemcpy(host_vec, device_mem) ERROR: "< - -float* cuda_alloc_float(size_t n, const float& init_value = 0.0); - -void copy_cuda_memory_to_host(size_t n, const float* device_mem, std::vector& host_vec); - -#endif diff --git a/packages/stk/stk_exp/unit_tests/cuda/cuda_saxpy.cu b/packages/stk/stk_exp/unit_tests/cuda/cuda_saxpy.cu deleted file mode 100644 index c580ca15fa23..000000000000 --- a/packages/stk/stk_exp/unit_tests/cuda/cuda_saxpy.cu +++ /dev/null @@ -1,37 +0,0 @@ - -#include -#include -#include - -__global__ -void cuda_kernel_saxpy(int num_times, int n, const float* x, float alpha, float* y) -{ - int i = blockDim.x * blockIdx.x + threadIdx.x; - - if (i < n) { - for(int j=0; j>>(num_times, n, x, alpha, y); - err = cudaGetLastError(); - if (err != cudaSuccess) { - std::cerr<<"cuda_kernel_saxpy ERROR: "< -#include - -#ifdef HAVE_MPI -#include "mpi.h" -#endif - -int gl_argc; -char** gl_argv; - -int main( int argc, char **argv ) -{ - ::testing::InitGoogleTest(&argc,argv); -#ifdef HAVE_MPI - MPI_Init( & argc , & argv ); -#endif - gl_argc = argc; - gl_argv = argv; - int err = RUN_ALL_TESTS(); -#ifdef HAVE_MPI - MPI_Finalize(); -#endif - return err; -} diff --git a/packages/stk/stk_exp/unit_tests/cuda/unit_test_cuda.cpp b/packages/stk/stk_exp/unit_tests/cuda/unit_test_cuda.cpp deleted file mode 100644 index 044793e8e1b0..000000000000 --- a/packages/stk/stk_exp/unit_tests/cuda/unit_test_cuda.cpp +++ /dev/null @@ -1,44 +0,0 @@ -#include - -#include - -// restrict this file to only build if cuda is enabled -#ifdef HAVE_STK_CUDA - -#include -#include -#include - -#include - -namespace { - -TEST( stk_exp_cuda, check_cuda ) -{ - int expected_return_code = 0; - EXPECT_EQ(expected_return_code, check_cuda()); -} - -TEST( stk_exp_cuda, cuda_saxpy ) -{ - const int num_times = 100; - const size_t N = 1000000; - const double alpha = 0.5; - - float* x = cuda_alloc_float(N, 2.0); - float* y = cuda_alloc_float(N, 1.0); - - int err = cuda_saxpy(num_times, N, x, alpha, y); - EXPECT_EQ(0, err); - - std::vector host_y; - copy_cuda_memory_to_host(N, y, host_y); - - double expected_value = 101.0; - EXPECT_EQ(expected_value, host_y[0]); -} - -} // namespace - -#endif - diff --git a/packages/stk/stk_exp/unit_tests/kokkos/CMakeLists.txt b/packages/stk/stk_exp/unit_tests/kokkos/CMakeLists.txt deleted file mode 100644 index 9bc6ee8d04cd..000000000000 --- a/packages/stk/stk_exp/unit_tests/kokkos/CMakeLists.txt +++ /dev/null @@ -1,25 +0,0 @@ - - -ASSERT_DEFINED(PACKAGE_SOURCE_DIR CMAKE_CURRENT_SOURCE_DIR) - -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${${PACKAGE_NAME}_BINARY_DIR}/unit_tests/kokkos) - -FILE(GLOB SOURCES *.cpp) - -IF(${PACKAGE_NAME}_ENABLE_KokkosCore) -IF(TPL_ENABLE_CUDA) - CUDA_INCLUDE_DIRECTORIES(${KokkosCore_INCLUDE_DIRS}) - CUDA_COMPILE(OBJECTS_CUDA saxpy_kokkos.cu create_kokkos_view.cu copy_kokkos_memory.cu) - LIST(APPEND SOURCES ${OBJECTS_CUDA}) -ENDIF() -ENDIF() - -TRIBITS_ADD_EXECUTABLE_AND_TEST( - exp_unit_kokkos - SOURCES ${SOURCES} - DEPLIBS - COMM serial mpi - NUM_MPI_PROCS 1 - ) - diff --git a/packages/stk/stk_exp/unit_tests/kokkos/copy_kokkos_memory.cpp b/packages/stk/stk_exp/unit_tests/kokkos/copy_kokkos_memory.cpp deleted file mode 100644 index 1587aa10fe61..000000000000 --- a/packages/stk/stk_exp/unit_tests/kokkos/copy_kokkos_memory.cpp +++ /dev/null @@ -1,26 +0,0 @@ - -#include -#include - -#if defined(KOKKOS_ENABLE_CUDA) && defined(__CUDACC__) -#define KOKKOS_DEVICE Kokkos::Cuda -#elif defined(KOKKOS_ENABLE_OPENMP) -#define KOKKOS_DEVICE Kokkos::OpenMP -#else -#define KOKKOS_DEVICE Kokkos::Serial -#endif - -void copy_kokkos_device_memory_to_host(Kokkos::View& y, std::vector& host_y) -{ - Kokkos::View::HostMirror host_view = Kokkos::create_mirror_view(y); - - Kokkos::deep_copy(host_view, y); - - size_t N = y.dimension(0); - host_y.resize(N); - - for(size_t i=0; i - diff --git a/packages/stk/stk_exp/unit_tests/kokkos/copy_kokkos_memory.hpp b/packages/stk/stk_exp/unit_tests/kokkos/copy_kokkos_memory.hpp deleted file mode 100644 index 37da4bf69260..000000000000 --- a/packages/stk/stk_exp/unit_tests/kokkos/copy_kokkos_memory.hpp +++ /dev/null @@ -1,42 +0,0 @@ -// Copyright 2002 - 2008, 2010, 2011 National Technology Engineering -// Solutions of Sandia, LLC (NTESS). Under the terms of Contract -// DE-NA0003525 with NTESS, the U.S. Government retains certain rights -// in this software. -// - // Redistribution and use in source and binary forms, with or without - // modification, are permitted provided that the following conditions are - // met: - // - // * Redistributions of source code must retain the above copyright - // notice, this list of conditions and the following disclaimer. - // - // * Redistributions in binary form must reproduce the above - // copyright notice, this list of conditions and the following - // disclaimer in the documentation and/or other materials provided - // with the distribution. - // -// * Neither the name of NTESS nor the names of its contributors -// may be used to endorse or promote products derived from this -// software without specific prior written permission. -// - // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - // "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - // A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -#ifndef _kokkos_copy_memory_hpp_ -#define _kokkos_copy_memory_hpp_ - -#include - -void copy_kokkos_device_memory_to_host(Kokkos::View& y, std::vector& host_y); - -#endif - diff --git a/packages/stk/stk_exp/unit_tests/kokkos/create_kokkos_view.cpp b/packages/stk/stk_exp/unit_tests/kokkos/create_kokkos_view.cpp deleted file mode 100644 index b8f061615c44..000000000000 --- a/packages/stk/stk_exp/unit_tests/kokkos/create_kokkos_view.cpp +++ /dev/null @@ -1,37 +0,0 @@ - -#include -#include - -//Init Functor -template -struct Init { - typedef KokkosDevice device_type; - Kokkos::View x; - float init_value; - - KOKKOS_INLINE_FUNCTION - void operator()(int i) const { - x(i) = init_value; - } -}; - -template -Kokkos::View create_kokkos_view_float1D(const std::string& name, size_t N, float init_value) -{ - Kokkos::View x(name, N); - - Init init = {x, init_value}; - - Kokkos::parallel_for(N, init); - - return x; -} - -//explicit template instantiations: -// -#ifdef KOKKOS_ENABLE_OPENMP -template Kokkos::View create_kokkos_view_float1D(const std::string& name, size_t N, float init_value); -#endif - -template Kokkos::View create_kokkos_view_float1D(const std::string& name, size_t N, float init_value); - diff --git a/packages/stk/stk_exp/unit_tests/kokkos/create_kokkos_view.cu b/packages/stk/stk_exp/unit_tests/kokkos/create_kokkos_view.cu deleted file mode 100644 index f09f3d06137d..000000000000 --- a/packages/stk/stk_exp/unit_tests/kokkos/create_kokkos_view.cu +++ /dev/null @@ -1,4 +0,0 @@ -#include - -template Kokkos::View create_kokkos_view_float1D(const std::string& name, size_t N, float init_value); - diff --git a/packages/stk/stk_exp/unit_tests/kokkos/create_kokkos_view.hpp b/packages/stk/stk_exp/unit_tests/kokkos/create_kokkos_view.hpp deleted file mode 100644 index d6faf1f2ae7f..000000000000 --- a/packages/stk/stk_exp/unit_tests/kokkos/create_kokkos_view.hpp +++ /dev/null @@ -1,45 +0,0 @@ -// Copyright 2002 - 2008, 2010, 2011 National Technology Engineering -// Solutions of Sandia, LLC (NTESS). Under the terms of Contract -// DE-NA0003525 with NTESS, the U.S. Government retains certain rights -// in this software. -// - // Redistribution and use in source and binary forms, with or without - // modification, are permitted provided that the following conditions are - // met: - // - // * Redistributions of source code must retain the above copyright - // notice, this list of conditions and the following disclaimer. - // - // * Redistributions in binary form must reproduce the above - // copyright notice, this list of conditions and the following - // disclaimer in the documentation and/or other materials provided - // with the distribution. - // -// * Neither the name of NTESS nor the names of its contributors -// may be used to endorse or promote products derived from this -// software without specific prior written permission. -// - // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - // "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - // A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - -#ifndef _create_kokkos_view_hpp_ -#define _create_kokkos_view_hpp_ - -#include -#include - -template -Kokkos::View create_kokkos_view_float1D(const std::string& name, size_t N, float init_value); - -#endif - diff --git a/packages/stk/stk_exp/unit_tests/kokkos/main_unit_tests_util.cpp b/packages/stk/stk_exp/unit_tests/kokkos/main_unit_tests_util.cpp deleted file mode 100644 index f8565ea08337..000000000000 --- a/packages/stk/stk_exp/unit_tests/kokkos/main_unit_tests_util.cpp +++ /dev/null @@ -1,24 +0,0 @@ -#include -#include - -#ifdef HAVE_MPI -#include "mpi.h" -#endif - -int gl_argc; -char** gl_argv; - -int main( int argc, char **argv ) -{ - ::testing::InitGoogleTest(&argc,argv); -#ifdef HAVE_MPI - MPI_Init( & argc , & argv ); -#endif - gl_argc = argc; - gl_argv = argv; - int err = RUN_ALL_TESTS(); -#ifdef HAVE_MPI - MPI_Finalize(); -#endif - return err; -} diff --git a/packages/stk/stk_exp/unit_tests/kokkos/saxpy_kokkos.cpp b/packages/stk/stk_exp/unit_tests/kokkos/saxpy_kokkos.cpp deleted file mode 100644 index 9babbc90705f..000000000000 --- a/packages/stk/stk_exp/unit_tests/kokkos/saxpy_kokkos.cpp +++ /dev/null @@ -1,35 +0,0 @@ - -#include - -#if defined(KOKKOS_ENABLE_CUDA) && defined(__CUDACC__) -#define KOKKOS_DEVICE Kokkos::Cuda -#define CALL_KOKKOS_SAXPY_FUNCTION call_kokkos_saxpy_cuda -#elif defined(KOKKOS_ENABLE_OPENMP) -#define KOKKOS_DEVICE Kokkos::OpenMP -#define CALL_KOKKOS_SAXPY_FUNCTION call_kokkos_saxpy_openmp -#else -#define KOKKOS_DEVICE Kokkos::Serial -#define CALL_KOKKOS_SAXPY_FUNCTION call_kokkos_saxpy_serial -#endif - -//Axpy Functor -template -struct Axpy { - typedef DEVICE device_type; - Kokkos::View x; - Kokkos::View y; - float alpha; - - KOKKOS_INLINE_FUNCTION - void operator()(int i) const { - y(i) = y(i) + alpha*x(i); - } -}; - -void CALL_KOKKOS_SAXPY_FUNCTION(size_t N, Kokkos::View y, float alpha, Kokkos::View x) -{ - Axpy axpy = {x, y, alpha}; - - Kokkos::parallel_for(N, axpy); -} - diff --git a/packages/stk/stk_exp/unit_tests/kokkos/saxpy_kokkos.cu b/packages/stk/stk_exp/unit_tests/kokkos/saxpy_kokkos.cu deleted file mode 100644 index f0e11b2f0d70..000000000000 --- a/packages/stk/stk_exp/unit_tests/kokkos/saxpy_kokkos.cu +++ /dev/null @@ -1,2 +0,0 @@ -#include - diff --git a/packages/stk/stk_exp/unit_tests/kokkos/saxpy_kokkos.hpp b/packages/stk/stk_exp/unit_tests/kokkos/saxpy_kokkos.hpp deleted file mode 100644 index ab9ec714bffe..000000000000 --- a/packages/stk/stk_exp/unit_tests/kokkos/saxpy_kokkos.hpp +++ /dev/null @@ -1,49 +0,0 @@ -// Copyright 2002 - 2008, 2010, 2011 National Technology Engineering -// Solutions of Sandia, LLC (NTESS). Under the terms of Contract -// DE-NA0003525 with NTESS, the U.S. Government retains certain rights -// in this software. -// - // Redistribution and use in source and binary forms, with or without - // modification, are permitted provided that the following conditions are - // met: - // - // * Redistributions of source code must retain the above copyright - // notice, this list of conditions and the following disclaimer. - // - // * Redistributions in binary form must reproduce the above - // copyright notice, this list of conditions and the following - // disclaimer in the documentation and/or other materials provided - // with the distribution. - // -// * Neither the name of NTESS nor the names of its contributors -// may be used to endorse or promote products derived from this -// software without specific prior written permission. -// - // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - // "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - // A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - -#ifndef _kokkos_saxpy_hpp_ -#define _kokkos_saxpy_hpp_ - -#include - -#ifdef KOKKOS_ENABLE_CUDA -void call_kokkos_saxpy_cuda(size_t N, Kokkos::View y, float alpha, Kokkos::View x); -#endif - -#ifdef KOKKOS_ENABLE_OPENMP -void call_kokkos_saxpy_openmp(size_t N, Kokkos::View y, float alpha, Kokkos::View x); -#endif - -#endif - diff --git a/packages/stk/stk_exp/unit_tests/kokkos/unit_test_exp_top.cpp b/packages/stk/stk_exp/unit_tests/kokkos/unit_test_exp_top.cpp deleted file mode 100644 index 8fdd3575caa4..000000000000 --- a/packages/stk/stk_exp/unit_tests/kokkos/unit_test_exp_top.cpp +++ /dev/null @@ -1,35 +0,0 @@ -#include - -struct Hex8 { - static const unsigned faces_per_element = 6; - static const unsigned nodes_per_face = 4; - - inline - static const unsigned * face_node_ordinals(unsigned face_ordinal) - { - static const unsigned m_face_node_ordinals[faces_per_element][nodes_per_face] = - { { 0, 1, 5, 4 }, - { 1, 2, 6, 5 }, - { 2, 3, 7, 6 }, - { 0, 4, 7, 3 }, - { 0, 3, 2, 1 }, - { 4, 5, 6, 7 } }; - - return m_face_node_ordinals[face_ordinal]; - } -}; - -TEST( exp_topology, hex8_face_node_ordinals) -{ - unsigned expected_face_node_ordinals[] = { 1, 2, 6, 5}; - - unsigned face_ordinal = 1; - - const unsigned* face_node_ordinals = Hex8::face_node_ordinals(face_ordinal); - - EXPECT_EQ(expected_face_node_ordinals[0], face_node_ordinals[0]); - EXPECT_EQ(expected_face_node_ordinals[1], face_node_ordinals[1]); - EXPECT_EQ(expected_face_node_ordinals[2], face_node_ordinals[2]); - EXPECT_EQ(expected_face_node_ordinals[3], face_node_ordinals[3]); -} - diff --git a/packages/stk/stk_exp/unit_tests/kokkos/unit_test_kokkos.cpp b/packages/stk/stk_exp/unit_tests/kokkos/unit_test_kokkos.cpp deleted file mode 100644 index 17b9341f3fd7..000000000000 --- a/packages/stk/stk_exp/unit_tests/kokkos/unit_test_kokkos.cpp +++ /dev/null @@ -1,265 +0,0 @@ -#include - -#include - -// restrict this file to only build if KokkosCore is enabled -#ifdef STK_HAVE_KOKKOSCORE - -#include - -#include - -namespace { - -#if defined(KOKKOS_ENABLE_PTHREAD) -#define KOKKOS_THREAD_DEVICE Kokkos::Threads -#elif defined(KOKKOS_ENABLE_OPENMP) -#define KOKKOS_THREAD_DEVICE Kokkos::OpenMP -#else -#define KOKKOS_THREAD_DEVICE Kokkos::Serial -#endif - -// setup and tear down for the KokkosThreads unit tests -class KokkosThreads : public ::testing::Test { -protected: - static void SetUpTestCase() - { - unsigned num_threads = 8; - - // if hwloc is present we will get better thread placement and - // numa aware allocation. - // Currently sierra does not have the hwloc TPL enabled - if (Kokkos::hwloc::available()) { - std::cout<<"Getting num_threads from Kokkos::hwloc..."< a("node views", RUN_TIME_DIMENSION); - // zero fills the array, but - // Kokkos::View a( Kokkos::ViewAllocateWithoutInitializing("node views"), RUN_TIME_DIMENSION); - // will allocate without initializing the array - - Kokkos::View a( Kokkos::ViewAllocateWithoutInitializing("node views"), RUN_TIME_DIMENSION); - - for (size_t i=0; i < a.extent(0); ++i) { - for (size_t x=0; x < a.extent(1); ++x) { - a(i,x) = i; - } - } - - // get a const view to the same array - // this view shares the same memory as a, but cannot modify the values - Kokkos::View b = a; - - for (size_t i=0; i < b.extent(0); ++i) { - for (size_t x=0; x < b.extent(1); ++x) { - EXPECT_EQ(i, b(i,x)); - } - } -} - -// Not available until c++11 support is enable in Sierra and Kokkos -#if defined (KOKKOS_HAVE_C_PLUS_PLUS_11_LAMBDA) -TEST_F( KokkosThreads, LambdaInitialize) -{ - Kokkos::View a( Kokkos::ViewAllocateWithoutInitializing("node views"), RUN_TIME_DIMENSION); - - Kokkos::parallel_for( - a.extent(0) , - [=](size_t i) { - for (size_t x=0; x < a.extent(1); ++x) { - a(i,x) = i; - } - } - ); - - Kokkos::View b = a; - - int num_error = 0; - // Cannot portably call a GTEST macro in parallel - // count the errors and test that they are equal to zero - Kokkos::parallel_reduce( - b.extent(0) , - [](int & local_errors) // init lambda - { local_errors = 0; } , - [=](size_t i, int & local_errors) { // operator() lambda - for (size_t x=0; x < b.extent(1); ++x) - local_errors += i == b(i,x) ? 0 : 1; - } , - [](volatile int & dst_err, volatile int const& src_err) // join lambda - { dst_err += src_err; } , - num_errors // where to store the result - ); - EXPECT_EQ( 0, num_errors); - -} -#endif - - -namespace { - -// Functors need to initialize and check the view with out c++11 support - -template -struct InitializeView -{ - // need a device_type typedef for all parallel functors - typedef typename View::device_type device_type; - - View a; - - // get a view to the a - template - InitializeView( RhsView const& arg_a ) - : a(arg_a) - {} - - void apply() - { - // call parallel_for on this functor - Kokkos::parallel_for( a.extent(0), *this); - } - - // initialize the a - KOKKOS_INLINE_FUNCTION - void operator()(size_t i) const - { - for (size_t x=0; x < a.extent(1); ++x) { - a(i,x) = i; - } - } -}; - -template -struct CheckView -{ - // need a device_type typedef for all parallel functors - typedef typename View::device_type device_type; - - // need a value_type typedef for the reduction - typedef int value_type; - - View a; - - // get a view to the a - template - CheckView( RhsView const& arg_a ) - : a(arg_a) - {} - - // return the number of errors found - value_type apply() - { - int num_errors = 0; - // call a parallel_reduce to count the errors - Kokkos::parallel_reduce( a.extent(0), *this, num_errors); - return num_errors; - } - - // initialize the reduction type - KOKKOS_INLINE_FUNCTION - void init(value_type & v) const - { v = 0; } - - // this threads contribution to the reduction type - // check that the value is equal to the expected value - // otherwise increment the error count - KOKKOS_INLINE_FUNCTION - void operator()(size_t i, value_type & error) const - { - for (size_t x=0; x < a.extent(1); ++x) { - error += i == a(i,x) ? 0 : 1; - } - } - - // join two threads together - KOKKOS_INLINE_FUNCTION - void join( volatile value_type & dst, volatile value_type const& src) const - { dst += src; } -}; - -struct ForceFunctor -{ - typedef typename KOKKOS_THREAD_DEVICE device_type; - - ForceFunctor(const double* disp, const double* vel, const double* acc, double *force) : - mDisp(disp), mVel(vel), mAcc(acc), mForce(force), alpha(-1.4), beta(0.3333333), gamma(3.14159) - {} - - KOKKOS_INLINE_FUNCTION - void operator()(size_t rowIndex) const - { - mForce[rowIndex] = alpha * mDisp[rowIndex] + beta * mVel[rowIndex] + gamma * mAcc[rowIndex]; - } - -private: - const double *mDisp; - const double *mVel; - const double *mAcc; - double *mForce; - const double alpha; - const double beta; - const double gamma; -}; - -} // unnameed namespace - -TEST_F( KokkosThreads, ParallelInitialize) -{ - typedef Kokkos::View view_type; - typedef Kokkos::View const_view_type; - - view_type a(Kokkos::ViewAllocateWithoutInitializing("node views"), RUN_TIME_DIMENSION); - - // call the InitializeView functor - { - InitializeView f(a); - f.apply(); - } - - // call the CheckView functor - // and expect no errors - { - const_view_type b = a; - CheckView f(a); - const int num_errors = f.apply(); - EXPECT_EQ( 0, num_errors); - } -} - -#endif - diff --git a/packages/stk/stk_exp/unit_tests/kokkos/unit_test_kokkos_saxpy.cpp b/packages/stk/stk_exp/unit_tests/kokkos/unit_test_kokkos_saxpy.cpp deleted file mode 100644 index 7b487d29d681..000000000000 --- a/packages/stk/stk_exp/unit_tests/kokkos/unit_test_kokkos_saxpy.cpp +++ /dev/null @@ -1,51 +0,0 @@ -#include - -#include - -// restrict this file to only build if KokkosCore is enabled -#ifdef STK_HAVE_KOKKOSCORE - -#include - -#include - -#if defined(KOKKOS_ENABLE_CUDA) -#define KOKKOS_DEVICE Kokkos::Cuda -#define CALL_KOKKOS_SAXPY_FUNCTION call_kokkos_saxpy_cuda -#elif defined(KOKKOS_ENABLE_OPENMP) -#define KOKKOS_DEVICE Kokkos::OpenMP -#define CALL_KOKKOS_SAXPY_FUNCTION call_kokkos_saxpy_openmp -#else -#define KOKKOS_DEVICE Kokkos::Serial -#define CALL_KOKKOS_SAXPY_FUNCTION call_kokkos_saxpy_serial -#endif - -#include -#include -#include - -TEST(stk_exp_kokkos, kokkos_saxpy) -{ - KOKKOS_DEVICE::initialize(); -#if defined(KOKKOS_ENABLE_CUDA) - KOKKOS_DEVICE::print_configuration(std::cout); -#endif - const size_t N = 1000000; - const float alpha = 0.5; - - Kokkos::View x = create_kokkos_view_float1D("x", N, 2.0); - Kokkos::View y = create_kokkos_view_float1D("y", N, 1.0); - - CALL_KOKKOS_SAXPY_FUNCTION(N, y, alpha, x); - - std::vector host_y; - copy_kokkos_device_memory_to_host(y, host_y); - - double expected_value = 2.0; - EXPECT_EQ(expected_value, host_y[0]); - - KOKKOS_DEVICE::finalize(); -} - -#endif - diff --git a/packages/stk/stk_exp/unit_tests/kokkos/unit_test_kokkos_with_STKIO.cpp b/packages/stk/stk_exp/unit_tests/kokkos/unit_test_kokkos_with_STKIO.cpp deleted file mode 100644 index cc2b8964f029..000000000000 --- a/packages/stk/stk_exp/unit_tests/kokkos/unit_test_kokkos_with_STKIO.cpp +++ /dev/null @@ -1,254 +0,0 @@ -#include - -#include - -// restrict this file to only build if KokkosCore is enabled and if STKIO is enabled -#if defined(STK_HAVE_KOKKOSCORE) && defined(STK_HAVE_STKIO) - -#include - -#include - -namespace { - -struct ForceFunctor -{ - typedef typename Kokkos::Threads device_type; - - ForceFunctor(const double* disp, const double* vel, const double* acc, double *force) : - mDisp(disp), mVel(vel), mAcc(acc), mForce(force), alpha(-1.4), beta(0.3333333), gamma(3.14159) - {} - - KOKKOS_INLINE_FUNCTION - void operator()(size_t rowIndex) const - { - mForce[rowIndex] = alpha * mDisp[rowIndex] + beta * mVel[rowIndex] + gamma * mAcc[rowIndex]; - } - -private: - const double *mDisp; - const double *mVel; - const double *mAcc; - double *mForce; - const double alpha; - const double beta; - const double gamma; -}; - -} // unnamed namespace - -#include -#include -#include -#include -#include -#include -#include -#include - -#include "mpi.h" // for MPI_COMM_WORLD, MPI_Comm, etc -#include // for StkMeshIoBroker -#include // for count_entities -#include -#include -#include - -#if defined(_OPENMP) -#include -#endif - -double initial_value1[3] = {-1, 2, -0.3}; - -void createNodalVectorField(stk::mesh::MetaData& meshMetaData, const std::string &field_name) -{ - stk::mesh::Field &field1 = meshMetaData.declare_field >(stk::topology::NODE_RANK, field_name); - stk::mesh::put_field_on_entire_mesh_with_initial_value(field1, initial_value1); -} - -void createNodalVectorFields(stk::mesh::MetaData& meshMetaData) -{ - createNodalVectorField(meshMetaData, "disp"); - createNodalVectorField(meshMetaData, "vel"); - createNodalVectorField(meshMetaData, "acc"); - createNodalVectorField(meshMetaData, "force"); - meshMetaData.commit(); -} - -void createMetaAndBulkData(stk::io::StkMeshIoBroker &exodusFileReader, stk::mesh::FieldDataManager *fieldDataManager) -{ - std::string exodusFileName = stk::unit_test_util::get_option("-i", "NO_FILE_SPECIFIED"); - ASSERT_NE(exodusFileName, "NO_FILE_SPECIFIED"); - - exodusFileReader.add_mesh_database(exodusFileName, stk::io::READ_MESH); - - std::cerr << "Starting To Read Mesh: " << exodusFileName << std::endl; - - exodusFileReader.create_input_mesh(); - stk::mesh::MetaData &stkMeshMetaData = exodusFileReader.meta_data(); - createNodalVectorFields(stkMeshMetaData); - - auto arg_bulk_data(new stk::mesh::BulkData(stkMeshMetaData, MPI_COMM_WORLD, false, NULL, fieldDataManager)); - exodusFileReader.set_bulk_data(arg_bulk_data); - stk::mesh::BulkData& stkMeshBulkData = *arg_bulk_data; - - bool delay_field_data_allocation = true; - exodusFileReader.populate_mesh(delay_field_data_allocation); - exodusFileReader.populate_field_data(); - - std::cerr << "Finished Reading Mesh: " << exodusFileName << std::endl; - - stk::mesh::Selector allEntities = stkMeshMetaData.universal_part(); - std::vector entityCounts; - stk::mesh::count_entities(allEntities, stkMeshBulkData, entityCounts); - size_t numElements = entityCounts[stk::topology::ELEMENT_RANK]; - size_t numNodes = entityCounts[stk::topology::NODE_RANK]; - - std::cerr << "Number of elements in " << exodusFileName << " = " << numElements << std::endl; - std::cerr << "Number of nodes in " << exodusFileName << " = " << numNodes << std::endl; -} - -//void timeFieldOperations(stk::mesh::MetaData &stkMeshMetaData, stk::mesh::BulkData &stkMeshBulkData, double alpha, double beta, double gamma) -//{ -// std::string numIterationsString = getOption("-numIter", "1"); -// const int numIterations = std::atoi(numIterationsString.c_str()); -// stk::mesh::Field &disp_field = *stkMeshMetaData.get_field >(stk::topology::NODE_RANK, "disp"); -// stk::mesh::Field &vel_field = *stkMeshMetaData.get_field >(stk::topology::NODE_RANK, "vel"); -// stk::mesh::Field &acc_field = *stkMeshMetaData.get_field >(stk::topology::NODE_RANK, "acc"); -// stk::mesh::Field &force_field = *stkMeshMetaData.get_field >(stk::topology::NODE_RANK, "force"); -// -// const stk::mesh::BucketVector& allNodeBuckets = stkMeshBulkData.buckets(stk::topology::NODE_RANK); -// const size_t numNodeBuckets = allNodeBuckets.size(); -// -// std::cerr << "Starting timer for " << numIterations << " iterations of nodal addition (vec4 = vec1 + vec2 + vec3) test." << std::endl; -// double startTime = stk::cpu_time(); -// double startWallTime = stk::wall_time(); -// -// for(int i = 0; i < numIterations; i++) -// { -//#if defined(_OPENMP) -//#pragma omp parallel for schedule(dynamic, 5) -//#endif -// for(size_t bucketIndex = 0; bucketIndex < numNodeBuckets; ++bucketIndex) -// { -// const stk::mesh::Bucket &bucket = *allNodeBuckets[bucketIndex]; -// double *disp = stk::mesh::field_data(disp_field, bucket); -// double *vel = stk::mesh::field_data(vel_field, bucket); -// double *acc = stk::mesh::field_data(acc_field, bucket); -// double *force = stk::mesh::field_data(force_field, bucket); -// size_t bucketLoopEnd = 3 * bucket.size(); -// for(size_t nodeIndex = 0; nodeIndex < bucketLoopEnd; nodeIndex ++) -// { -// force[nodeIndex] = alpha * disp[nodeIndex] + beta * vel[nodeIndex] + gamma * acc[nodeIndex]; -// } -// } -// } -// -// double elapsedTime = stk::cpu_time() - startTime; -// double elapsedWallTime = stk::wall_time() - startWallTime; -// -// std::cerr << "That took CPU time of " << elapsedTime << " seconds." << std::endl; -// std::cerr << "That took wall time of " << elapsedWallTime << " seconds." << std::endl; -//} - -void testGoldValues(stk::mesh::MetaData &stkMeshMetaData, stk::mesh::BulkData &stkMeshBulkData, double alpha, double beta, double gamma) -{ - double goldX = initial_value1[0] * (alpha + beta + gamma); - double goldY = initial_value1[1] * (alpha + beta + gamma); - double goldZ = initial_value1[2] * (alpha + beta + gamma); - - stk::mesh::Field &force_field = *stkMeshMetaData.get_field >(stk::topology::NODE_RANK, "force"); - double tol = 1.0e-4; - const stk::mesh::BucketVector& buckets = stkMeshBulkData.buckets(stk::topology::NODE_RANK); - for(size_t bucketIndex = 0; bucketIndex < buckets.size(); ++bucketIndex) - { - const stk::mesh::Bucket &bucket = *buckets[bucketIndex]; - double *force = stk::mesh::field_data(force_field, bucket); - for(size_t nodeIndex = 0; nodeIndex < 3 * bucket.size(); nodeIndex += 3) - { - EXPECT_NEAR(goldX, force[nodeIndex+0], tol); - EXPECT_NEAR(goldY, force[nodeIndex+1], tol); - EXPECT_NEAR(goldZ, force[nodeIndex+2], tol); - } - } -} - -void test1ToNSumOfNodalFields(stk::mesh::ContiguousFieldDataManager *fieldDataManager) -{ - MPI_Comm communicator = MPI_COMM_WORLD; - stk::io::StkMeshIoBroker exodusFileReader(communicator); - - createMetaAndBulkData(exodusFileReader, fieldDataManager); - - stk::mesh::MetaData &stkMeshMetaData = exodusFileReader.meta_data(); - stk::mesh::BulkData &stkMeshBulkData = exodusFileReader.bulk_data(); - - const stk::mesh::BucketVector& buckets = stkMeshBulkData.buckets(stk::topology::NODE_RANK); - std::cerr << "Number of node buckets: " << buckets.size() << std::endl; - - double alpha = -1.4; - double beta = 0.3333333; - double gamma = 3.14159; - - const int numIterations = stk::unit_test_util::get_command_line_option("-numIter", 1); - - stk::mesh::Field &disp_field = *stkMeshMetaData.get_field >(stk::topology::NODE_RANK, "disp"); - stk::mesh::Field &vel_field = *stkMeshMetaData.get_field >(stk::topology::NODE_RANK, "vel"); - stk::mesh::Field &acc_field = *stkMeshMetaData.get_field >(stk::topology::NODE_RANK, "acc"); - stk::mesh::Field &force_field = *stkMeshMetaData.get_field >(stk::topology::NODE_RANK, "force"); - - const stk::mesh::BucketVector& allNodeBuckets = stkMeshBulkData.buckets(stk::topology::NODE_RANK); - - size_t numBytesForField = fieldDataManager->get_num_bytes_allocated_on_field(disp_field.mesh_meta_data_ordinal()); - stk::mesh::FieldMetaDataVector& field_meta_data_vector = const_cast(disp_field.get_meta_data_for_field()); - int numBytesPerEntity = field_meta_data_vector[0].m_bytes_per_entity; - size_t numNodes = numBytesForField / numBytesPerEntity; - size_t nodeLoopEnd = 3 * numNodes; - - std::cerr << "Starting timer for " << numIterations << " iterations of nodal addition (vec4 = vec1 + vec2 + vec3) test." << std::endl; - double startTime = stk::cpu_time(); - double startWallTime = stk::wall_time(); - - size_t numThreads = 8; -// const size_t chunkSize = 118720; - - for(int i = 0; i < numIterations; i++) - { -#if defined(_OPENMP) -#pragma omp parallel firstprivate(alpha, beta, gamma) -#endif - { - const stk::mesh::Bucket &bucket = *allNodeBuckets[0]; - double *disp = stk::mesh::field_data(disp_field, bucket); - double *vel = stk::mesh::field_data(vel_field, bucket); - double *acc = stk::mesh::field_data(acc_field, bucket); - double *force = stk::mesh::field_data(force_field, bucket); -#if defined(_OPENMP) -#pragma omp for -#endif - Kokkos::Threads::initialize( numThreads ); - ForceFunctor forceF(disp, vel, acc, force); - Kokkos::parallel_for(nodeLoopEnd, forceF); - Kokkos::Threads::finalize(); -#if defined(_OPENMP) - numThreads = omp_get_num_threads(); -#endif - } - } - double elapsedTime = stk::cpu_time() - startTime; - double elapsedWallTime = stk::wall_time() - startWallTime; - - std::cerr << "That took CPU time of " << elapsedTime << " seconds." << std::endl; - std::cerr << "That took wall time of " << elapsedWallTime << " seconds." << std::endl; - std::cerr << "Using " << numThreads << " threads" << std::endl; - - testGoldValues(stkMeshMetaData, stkMeshBulkData, alpha, beta, gamma); -} - -TEST(NodalFieldPerformance, addNodalFields1ToNOrderingContiguousFieldManager) -{ - stk::mesh::ContiguousFieldDataManager fieldDataManager; - test1ToNSumOfNodalFields(&fieldDataManager); -} - -#endif - diff --git a/packages/stk/stk_exp/unit_tests/kokkos/unit_test_stk_top.cpp b/packages/stk/stk_exp/unit_tests/kokkos/unit_test_stk_top.cpp deleted file mode 100644 index 14630e7d2190..000000000000 --- a/packages/stk/stk_exp/unit_tests/kokkos/unit_test_stk_top.cpp +++ /dev/null @@ -1,22 +0,0 @@ -#include -#include - -TEST( exp_stk_topology, hex8_face_node_ordinals) -{ - unsigned expected_face_node_ordinals[] = { 1, 2, 6, 5}; - - unsigned face_ordinal = 1; - - stk::topology hex8 = stk::topology::HEX_8; - - const unsigned nodes_per_face = 4; - unsigned face_node_ordinals[nodes_per_face] = {0, 0, 0, 0}; - - hex8.face_node_ordinals(face_ordinal, face_node_ordinals); - - EXPECT_EQ(expected_face_node_ordinals[0], face_node_ordinals[0]); - EXPECT_EQ(expected_face_node_ordinals[1], face_node_ordinals[1]); - EXPECT_EQ(expected_face_node_ordinals[2], face_node_ordinals[2]); - EXPECT_EQ(expected_face_node_ordinals[3], face_node_ordinals[3]); -} - diff --git a/packages/stk/stk_integration_tests/CMakeLists.txt b/packages/stk/stk_integration_tests/CMakeLists.txt index caa8ea8a7c55..9f5ee1e48185 100644 --- a/packages/stk/stk_integration_tests/CMakeLists.txt +++ b/packages/stk/stk_integration_tests/CMakeLists.txt @@ -1,3 +1,4 @@ TRIBITS_ADD_TEST_DIRECTORIES(stk_mesh) +TRIBITS_ADD_TEST_DIRECTORIES(stk_transfer) diff --git a/packages/stk/stk_integration_tests/stk_balance/CoincidentElems.cpp b/packages/stk/stk_integration_tests/stk_balance/CoincidentElems.cpp deleted file mode 100644 index a9a42d818e4f..000000000000 --- a/packages/stk/stk_integration_tests/stk_balance/CoincidentElems.cpp +++ /dev/null @@ -1,76 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -namespace { - -class CoincidentElems : public stk::unit_test_util::MeshFixture -{ -protected: - CoincidentElems() - { - setup_empty_mesh(stk::mesh::BulkData::NO_AUTO_AURA); - } - void expect_coincidents_on_same_proc(stk::mesh::EntityId elem1Id, stk::mesh::EntityId elem2Id) - { - stk::mesh::Entity elem1 = get_bulk().get_entity(stk::topology::ELEM_RANK, elem1Id); - if(get_bulk().is_valid(elem1)) - { - stk::mesh::Entity elem2 = get_bulk().get_entity(stk::topology::ELEM_RANK, elem2Id); - EXPECT_TRUE(get_bulk().is_valid(elem2)); - } - } - void expect_proper_face_connection(const std::string& filename, size_t numSides, const std::vector& sideSet) - { - SideTestUtil::expect_global_num_sides_in_part(get_bulk(), numSides, get_meta().universal_part()); - SideTestUtil::expect_all_sides_exist_for_elem_side(get_bulk(), filename, sideSet); - } - void test_decomp_and_balance(const std::string& fileName, - stk::mesh::EntityId elem1Id, - stk::mesh::EntityId elem2Id, - const size_t numGlobalSides, - const std::vector& expectedElemSides) - { - EXPECT_NO_THROW(stk::balance::initial_decomp_and_balance(get_bulk(), graphOptions, fileName, "output_" + fileName, "RIB")); - expect_coincidents_on_same_proc(elem1Id, elem2Id); - expect_proper_face_connection(fileName, numGlobalSides, expectedElemSides); - } - stk::balance::GraphCreationSettings graphOptions; -}; - -TEST_F(CoincidentElems, balance_coincidentsNotSplit) -{ - std::string meshDesc = - "0,1,HEX_8,1,2,3,4,5,6,7,8\n\ - 1,2,HEX_8,5,6,7,8,9,10,11,12\n\ - 1,3,HEX_8,5,6,7,8,9,10,11,12"; - stk::unit_test_util::setup_text_mesh(get_bulk(), meshDesc); - - expect_coincidents_on_same_proc(2, 3); - stk::balance::balanceStkMesh(graphOptions, get_bulk()); - expect_coincidents_on_same_proc(2, 3); -} - -TEST_F(CoincidentElems, linearDecompJL_noThrow) -{ - test_decomp_and_balance("JL.e", 1, 2, 1, std::vector{{1,5}, {2,5}}); -} - -TEST_F(CoincidentElems, linearDecompALJ_noThrow) -{ - test_decomp_and_balance("ALJ.e", 2, 3, 1, std::vector{{1,5}, {2,4}, {3,4}}); -} - -TEST_F(CoincidentElems, linearDecompARefLA_noThrow) -{ - test_decomp_and_balance("ARefLA.e", 3, 4, 2, std::vector{{1,5}, {2,4}, {3,0}, {3,1}, {4,0}, {4,1}}); -} - -} diff --git a/packages/stk/stk_integration_tests/stk_balance/IntegrationTestAttributeOrdering.cpp b/packages/stk/stk_integration_tests/stk_balance/IntegrationTestAttributeOrdering.cpp new file mode 100644 index 000000000000..a51e2bd7ac82 --- /dev/null +++ b/packages/stk/stk_integration_tests/stk_balance/IntegrationTestAttributeOrdering.cpp @@ -0,0 +1,88 @@ +// Copyright 2002 - 2008, 2010, 2011 National Technology Engineering +// Solutions of Sandia, LLC (NTESS). Under the terms of Contract +// DE-NA0003525 with NTESS, the U.S. Government retains certain rights +// in this software. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following +// disclaimer in the documentation and/or other materials provided +// with the distribution. +// +// * Neither the name of NTESS nor the names of its contributors +// may be used to endorse or promote products derived from this +// software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +#include +#include +#include +#include +#include +#include + +class AttributeOrdering : public stk::unit_test_util::MeshFixture +{ +public: + AttributeOrdering() + : balanceRunner(get_comm()), + inputFile("reverseOrderAttr.exo"), + outputDir("outputDir") + { + balanceRunner.set_filename(inputFile); + balanceRunner.set_output_dir(outputDir); + balanceRunner.set_app_type_defaults("sd"); + } + + std::vector get_balanced_field_names() + { + setup_empty_mesh(stk::mesh::BulkData::NO_AUTO_AURA); + stk::io::StkMeshIoBroker stkIo(get_comm()); + + const std::string balancedFile = outputDir + "/" + inputFile; + stk::io::fill_mesh_preexisting(stkIo, balancedFile, get_bulk()); + + stk::mesh::Part *blockPart = get_meta().get_part("block_17"); + stk::mesh::FieldVector balancedAttrFields = stkIo.get_ordered_attribute_fields(blockPart); + + std::vector fieldNames; + for (stk::mesh::FieldBase* field : balancedAttrFields) { + fieldNames.push_back(field->name()); + } + return fieldNames; + } + +protected: + stk::integration_test_utils::StkBalanceRunner balanceRunner; + +private: + const std::string inputFile; + const std::string outputDir; +}; + +TEST_F(AttributeOrdering, reverseOrderPreservedAfterBalance) +{ + balanceRunner.run_end_to_end(); + + std::vector expectedAttrFieldNames = {"j", "i", "h", "g", "f", "e", "d", "c", "b", "a"}; + std::vector balancedAttrFieldNames = get_balanced_field_names(); + + EXPECT_EQ(balancedAttrFieldNames, expectedAttrFieldNames); +} diff --git a/packages/stk/stk_unit_tests/stk_balance/UnitTestBalanceNodes.cpp b/packages/stk/stk_integration_tests/stk_balance/IntegrationTestBalanceNodes.cpp similarity index 100% rename from packages/stk/stk_unit_tests/stk_balance/UnitTestBalanceNodes.cpp rename to packages/stk/stk_integration_tests/stk_balance/IntegrationTestBalanceNodes.cpp diff --git a/packages/stk/stk_unit_tests/stk_balance/UnitTestBasicLoadBalance.cpp b/packages/stk/stk_integration_tests/stk_balance/IntegrationTestBasicLoadBalance.cpp similarity index 92% rename from packages/stk/stk_unit_tests/stk_balance/UnitTestBasicLoadBalance.cpp rename to packages/stk/stk_integration_tests/stk_balance/IntegrationTestBasicLoadBalance.cpp index 35ea5550bfea..8474b85e23d4 100644 --- a/packages/stk/stk_unit_tests/stk_balance/UnitTestBasicLoadBalance.cpp +++ b/packages/stk/stk_integration_tests/stk_balance/IntegrationTestBasicLoadBalance.cpp @@ -24,24 +24,23 @@ class BasicLoadBalance : public stk::unit_test_util::MeshFixture {}; TEST_F(BasicLoadBalance, testWithAura) { + if (get_parallel_size() != 2) return; setup_mesh("generated:1x1x6", stk::mesh::BulkData::AUTO_AURA); test_simple_load_balance(get_bulk()); } TEST_F(BasicLoadBalance, testWithoutAura) { + if (get_parallel_size() != 2) return; setup_mesh("generated:1x1x6", stk::mesh::BulkData::NO_AUTO_AURA); test_simple_load_balance(get_bulk()); } void test_simple_load_balance(stk::mesh::BulkData& stkMeshBulkData) { - if(stkMeshBulkData.parallel_size() == 2) - { - move_element_to_other_proc(stkMeshBulkData, 4); - balance_mesh(stkMeshBulkData); - test_that_mesh_is_balanced(stkMeshBulkData); - } + move_element_to_other_proc(stkMeshBulkData, 4); + balance_mesh(stkMeshBulkData); + test_that_mesh_is_balanced(stkMeshBulkData); } void move_element_to_other_proc(stk::mesh::BulkData& stkMeshBulkData, stk::mesh::EntityId id) diff --git a/packages/stk/stk_integration_tests/stk_balance/IntegrationTestCoincidentElems.cpp b/packages/stk/stk_integration_tests/stk_balance/IntegrationTestCoincidentElems.cpp new file mode 100644 index 000000000000..0a54e6f8f8e0 --- /dev/null +++ b/packages/stk/stk_integration_tests/stk_balance/IntegrationTestCoincidentElems.cpp @@ -0,0 +1,121 @@ +// Copyright 2002 - 2008, 2010, 2011 National Technology Engineering +// Solutions of Sandia, LLC (NTESS). Under the terms of Contract +// DE-NA0003525 with NTESS, the U.S. Government retains certain rights +// in this software. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following +// disclaimer in the documentation and/or other materials provided +// with the distribution. +// +// * Neither the name of NTESS nor the names of its contributors +// may be used to endorse or promote products derived from this +// software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +namespace { + +class CoincidentElems : public stk::unit_test_util::MeshFixture +{ +protected: + CoincidentElems() + : balanceRunner(get_comm()), + outputDir("output") + { + balanceRunner.set_output_dir(outputDir); + } + + void expect_coincidents_on_same_proc(stk::mesh::EntityId elem1Id, stk::mesh::EntityId elem2Id) + { + stk::mesh::Entity elem1 = get_bulk().get_entity(stk::topology::ELEM_RANK, elem1Id); + if(get_bulk().is_valid(elem1)) + { + stk::mesh::Entity elem2 = get_bulk().get_entity(stk::topology::ELEM_RANK, elem2Id); + EXPECT_TRUE(get_bulk().is_valid(elem2)); + } + } + + void test_decomp_and_balance(const std::string& fileName, + stk::mesh::EntityId elem1Id, + stk::mesh::EntityId elem2Id, + const size_t numGlobalSides, + const std::vector& expectedElemSides) + { + balanceRunner.set_filename(fileName); + + EXPECT_NO_THROW(balanceRunner.run_end_to_end()); + + setup_mesh(outputDir + "/" + fileName, stk::mesh::BulkData::NO_AUTO_AURA); + + expect_coincidents_on_same_proc(elem1Id, elem2Id); + SideTestUtil::expect_global_num_sides_in_part(get_bulk(), numGlobalSides, get_meta().universal_part()); + SideTestUtil::expect_all_sides_exist_for_elem_side(get_bulk(), fileName, expectedElemSides); + } + + stk::integration_test_utils::StkBalanceRunner balanceRunner; + stk::balance::GraphCreationSettings graphOptions; + +private: + const std::string outputDir; +}; + +TEST_F(CoincidentElems, balance_coincidentsNotSplit) +{ + setup_empty_mesh(stk::mesh::BulkData::NO_AUTO_AURA); + std::string meshDesc = + "0,1,HEX_8,1,2,3,4,5,6,7,8\n" + "1,2,HEX_8,5,6,7,8,9,10,11,12\n" + "1,3,HEX_8,5,6,7,8,9,10,11,12"; + stk::unit_test_util::setup_text_mesh(get_bulk(), meshDesc); + + expect_coincidents_on_same_proc(2, 3); + stk::balance::balanceStkMesh(graphOptions, get_bulk()); + expect_coincidents_on_same_proc(2, 3); +} + +TEST_F(CoincidentElems, linearDecompJL_noThrow) +{ + test_decomp_and_balance("JL.e", 1, 2, 1, std::vector{{1,5}, {2,5}}); +} + +TEST_F(CoincidentElems, linearDecompALJ_noThrow) +{ + test_decomp_and_balance("ALJ.e", 2, 3, 1, std::vector{{1,5}, {2,4}, {3,4}}); +} + +TEST_F(CoincidentElems, linearDecompARefLA_noThrow) +{ + test_decomp_and_balance("ARefLA.e", 3, 4, 2, std::vector{{1,5}, {2,4}, {3,0}, {3,1}, {4,0}, {4,1}}); +} + +} diff --git a/packages/stk/stk_integration_tests/stk_balance/UnitTestElementAndSideMovementDuringMeshRead.cpp b/packages/stk/stk_integration_tests/stk_balance/IntegrationTestElementAndSideMovementDuringMeshRead.cpp similarity index 100% rename from packages/stk/stk_integration_tests/stk_balance/UnitTestElementAndSideMovementDuringMeshRead.cpp rename to packages/stk/stk_integration_tests/stk_balance/IntegrationTestElementAndSideMovementDuringMeshRead.cpp diff --git a/packages/stk/stk_unit_tests/stk_balance/UnitTestIncrementalRebalance.cpp b/packages/stk/stk_integration_tests/stk_balance/IntegrationTestIncrementalRebalance.cpp similarity index 99% rename from packages/stk/stk_unit_tests/stk_balance/UnitTestIncrementalRebalance.cpp rename to packages/stk/stk_integration_tests/stk_balance/IntegrationTestIncrementalRebalance.cpp index 86cbc86e29ed..8208d7cf08d1 100644 --- a/packages/stk/stk_unit_tests/stk_balance/UnitTestIncrementalRebalance.cpp +++ b/packages/stk/stk_integration_tests/stk_balance/IntegrationTestIncrementalRebalance.cpp @@ -38,7 +38,10 @@ class FieldVertexWeightSettingsWithSearchForParticles : public stk::balance::Gra : m_stkMeshBulkData(stkMeshBulkData), m_weightField(weightField), m_defaultWeight(defaultWeight), - m_incrementalRebalance(incrementalRebalance) { } + m_incrementalRebalance(incrementalRebalance) + { + method = "parmetis"; + } virtual ~FieldVertexWeightSettingsWithSearchForParticles() = default; using stk::balance::GraphCreationSettings::getToleranceForFaceSearch; @@ -66,14 +69,13 @@ class FieldVertexWeightSettingsWithSearchForParticles : public stk::balance::Gra } protected: - FieldVertexWeightSettingsWithSearchForParticles() = default; + FieldVertexWeightSettingsWithSearchForParticles() = delete; FieldVertexWeightSettingsWithSearchForParticles(const FieldVertexWeightSettingsWithSearchForParticles&) = delete; FieldVertexWeightSettingsWithSearchForParticles& operator=(const FieldVertexWeightSettingsWithSearchForParticles&) = delete; const stk::mesh::BulkData & m_stkMeshBulkData; const stk::balance::DoubleFieldType &m_weightField; const double m_defaultWeight; - std::string method = std::string("parmetis"); bool m_incrementalRebalance; }; diff --git a/packages/stk/stk_integration_tests/stk_balance/UnitTestLoadBalance.cpp b/packages/stk/stk_integration_tests/stk_balance/IntegrationTestLoadBalance.cpp similarity index 99% rename from packages/stk/stk_integration_tests/stk_balance/UnitTestLoadBalance.cpp rename to packages/stk/stk_integration_tests/stk_balance/IntegrationTestLoadBalance.cpp index cba85310d9ad..e641edfd540f 100644 --- a/packages/stk/stk_integration_tests/stk_balance/UnitTestLoadBalance.cpp +++ b/packages/stk/stk_integration_tests/stk_balance/IntegrationTestLoadBalance.cpp @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include @@ -1109,7 +1109,7 @@ TEST(LoadBalance, doSearch) } stk::balance::internal::SearchElemPairs searchResults; - do_kdtree_search(faceBoxes, faceBoxes, communicator, searchResults); + stk::search::coarse_search(faceBoxes, faceBoxes, stk::search::KDTREE, communicator, searchResults); stk::balance::internal::SearchElemPairs::iterator iter = std::unique(searchResults.begin(), searchResults.end()); searchResults.resize(iter - searchResults.begin()); diff --git a/packages/stk/stk_unit_tests/stk_balance/UnitTestLoadBalanceActiveOnly.cpp b/packages/stk/stk_integration_tests/stk_balance/IntegrationTestLoadBalanceActiveOnly.cpp similarity index 100% rename from packages/stk/stk_unit_tests/stk_balance/UnitTestLoadBalanceActiveOnly.cpp rename to packages/stk/stk_integration_tests/stk_balance/IntegrationTestLoadBalanceActiveOnly.cpp diff --git a/packages/stk/stk_unit_tests/stk_balance/UnitTestLoadBalanceEmptyMeshOnProc.cpp b/packages/stk/stk_integration_tests/stk_balance/IntegrationTestLoadBalanceEmptyMeshOnProc.cpp similarity index 91% rename from packages/stk/stk_unit_tests/stk_balance/UnitTestLoadBalanceEmptyMeshOnProc.cpp rename to packages/stk/stk_integration_tests/stk_balance/IntegrationTestLoadBalanceEmptyMeshOnProc.cpp index 03a786ba8f27..74714d8efcff 100644 --- a/packages/stk/stk_unit_tests/stk_balance/UnitTestLoadBalanceEmptyMeshOnProc.cpp +++ b/packages/stk/stk_integration_tests/stk_balance/IntegrationTestLoadBalanceEmptyMeshOnProc.cpp @@ -25,25 +25,24 @@ class EmptyMeshOnProc : public stk::unit_test_util::MeshFixture {}; TEST_F(EmptyMeshOnProc, testEmptyMeshOnProcNoAura) { + if (get_parallel_size() != 3) return; setup_mesh("generated:1x1x6", stk::mesh::BulkData::NO_AUTO_AURA); test_load_balancing_when_one_proc_has_no_mesh(get_bulk()); } TEST_F(EmptyMeshOnProc, testEmptyMeshOnProcWithAura) { + if (get_parallel_size() != 3) return; setup_mesh("generated:1x1x6", stk::mesh::BulkData::AUTO_AURA); test_load_balancing_when_one_proc_has_no_mesh(get_bulk()); } void test_load_balancing_when_one_proc_has_no_mesh(stk::mesh::BulkData& stkMeshBulkData) { - if(stkMeshBulkData.parallel_size() == 3) - { - move_elements_from_proc_2_to_proc_0(stkMeshBulkData); - test_that_empty_mesh_exists_on_proc_2(stkMeshBulkData); - balance_mesh(stkMeshBulkData); - test_that_mesh_is_balanced(stkMeshBulkData, 2); - } + move_elements_from_proc_2_to_proc_0(stkMeshBulkData); + test_that_empty_mesh_exists_on_proc_2(stkMeshBulkData); + balance_mesh(stkMeshBulkData); + test_that_mesh_is_balanced(stkMeshBulkData, 2); } void move_elements_from_proc_2_to_proc_0(stk::mesh::BulkData& bulkData) diff --git a/packages/stk/stk_unit_tests/stk_balance/UnitTestLoadBalanceLargeToSmallProc.cpp b/packages/stk/stk_integration_tests/stk_balance/IntegrationTestLoadBalanceLargeToSmallProc.cpp similarity index 100% rename from packages/stk/stk_unit_tests/stk_balance/UnitTestLoadBalanceLargeToSmallProc.cpp rename to packages/stk/stk_integration_tests/stk_balance/IntegrationTestLoadBalanceLargeToSmallProc.cpp diff --git a/packages/stk/stk_unit_tests/stk_balance/UnitTestLoadBalanceMultiPhysics.cpp b/packages/stk/stk_integration_tests/stk_balance/IntegrationTestLoadBalanceMultiPhysics.cpp similarity index 100% rename from packages/stk/stk_unit_tests/stk_balance/UnitTestLoadBalanceMultiPhysics.cpp rename to packages/stk/stk_integration_tests/stk_balance/IntegrationTestLoadBalanceMultiPhysics.cpp diff --git a/packages/stk/stk_unit_tests/stk_balance/UnitTestLoadBalanceMultipleCriteria.cpp b/packages/stk/stk_integration_tests/stk_balance/IntegrationTestLoadBalanceMultipleCriteria.cpp similarity index 100% rename from packages/stk/stk_unit_tests/stk_balance/UnitTestLoadBalanceMultipleCriteria.cpp rename to packages/stk/stk_integration_tests/stk_balance/IntegrationTestLoadBalanceMultipleCriteria.cpp diff --git a/packages/stk/stk_integration_tests/stk_balance/TestLoadBalanceMxN.cpp b/packages/stk/stk_integration_tests/stk_balance/IntegrationTestLoadBalanceMxN.cpp similarity index 100% rename from packages/stk/stk_integration_tests/stk_balance/TestLoadBalanceMxN.cpp rename to packages/stk/stk_integration_tests/stk_balance/IntegrationTestLoadBalanceMxN.cpp diff --git a/packages/stk/stk_unit_tests/stk_balance/UnitTestLoadBalanceParentChild.cpp b/packages/stk/stk_integration_tests/stk_balance/IntegrationTestLoadBalanceParentChild.cpp similarity index 99% rename from packages/stk/stk_unit_tests/stk_balance/UnitTestLoadBalanceParentChild.cpp rename to packages/stk/stk_integration_tests/stk_balance/IntegrationTestLoadBalanceParentChild.cpp index 1b97247b5d72..bc40e83c33fc 100644 --- a/packages/stk/stk_unit_tests/stk_balance/UnitTestLoadBalanceParentChild.cpp +++ b/packages/stk/stk_integration_tests/stk_balance/IntegrationTestLoadBalanceParentChild.cpp @@ -198,8 +198,7 @@ class StkFieldWeightRebalance : public stk::balance::FieldVertexWeightSettings public: StkFieldWeightRebalance(stk::mesh::BulkData &stkMeshBulkData, const stk::balance::DoubleFieldType &weightField) - : FieldVertexWeightSettings(stkMeshBulkData, weightField), - m_stkMeshBulkData(stkMeshBulkData) + : FieldVertexWeightSettings(stkMeshBulkData, weightField) { } @@ -210,11 +209,9 @@ class StkFieldWeightRebalance : public stk::balance::FieldVertexWeightSettings virtual std::string getCoordinateFieldName() const { return "model_coordinates"; } protected: - StkFieldWeightRebalance() = default; + StkFieldWeightRebalance() = delete; StkFieldWeightRebalance(const StkFieldWeightRebalance&) = delete; StkFieldWeightRebalance& operator=(const StkFieldWeightRebalance&) = delete; - - const stk::mesh::BulkData & m_stkMeshBulkData; }; //============================================================================== @@ -269,7 +266,7 @@ class StkParentRebalance : public StkFieldWeightRebalance } protected: - StkParentRebalance() = default; + StkParentRebalance() = delete; StkParentRebalance(const StkParentRebalance&) = delete; StkParentRebalance& operator=(const StkParentRebalance&) = delete; diff --git a/packages/stk/stk_unit_tests/stk_balance/UnitTestLoadBalanceParticles.cpp b/packages/stk/stk_integration_tests/stk_balance/IntegrationTestLoadBalanceParticles.cpp similarity index 98% rename from packages/stk/stk_unit_tests/stk_balance/UnitTestLoadBalanceParticles.cpp rename to packages/stk/stk_integration_tests/stk_balance/IntegrationTestLoadBalanceParticles.cpp index f401a54cdb5b..023eecf3a325 100644 --- a/packages/stk/stk_unit_tests/stk_balance/UnitTestLoadBalanceParticles.cpp +++ b/packages/stk/stk_integration_tests/stk_balance/IntegrationTestLoadBalanceParticles.cpp @@ -17,17 +17,13 @@ class StkRebalance : public stk::balance::FieldVertexWeightSettings StkRebalance(stk::mesh::BulkData &stkMeshBulkData, const stk::balance::DoubleFieldType &weightField, const double defaultVertexWeight) - : FieldVertexWeightSettings(stkMeshBulkData, weightField, defaultVertexWeight), - m_stkMeshBulkData(stkMeshBulkData) + : FieldVertexWeightSettings(stkMeshBulkData, weightField, defaultVertexWeight) {} virtual ~StkRebalance() = default; -protected: - const stk::mesh::BulkData & m_stkMeshBulkData; - private: - StkRebalance() = default; + StkRebalance() = delete; StkRebalance(const StkRebalance&) = delete; StkRebalance& operator=(const StkRebalance&) = delete; }; @@ -49,7 +45,7 @@ class StkParticleRebalance : public StkRebalance { delete_particles_from_decomposition(decomp); move_particles_with_owning_element(decomp); - }; + } private: void set_particle_destination(stk::balance::DecompositionChangeList & decomp, stk::mesh::Entity particle, const int destination) const @@ -94,7 +90,7 @@ class StkParticleRebalance : public StkRebalance } private: - StkParticleRebalance() = default; + StkParticleRebalance() = delete; StkParticleRebalance(const StkParticleRebalance&) = delete; StkParticleRebalance& operator=(const StkParticleRebalance&) = delete; diff --git a/packages/stk/stk_unit_tests/stk_balance/UnitTestLoadBalanceSmallToLargeProc.cpp b/packages/stk/stk_integration_tests/stk_balance/IntegrationTestLoadBalanceSmallToLargeProc.cpp similarity index 100% rename from packages/stk/stk_unit_tests/stk_balance/UnitTestLoadBalanceSmallToLargeProc.cpp rename to packages/stk/stk_integration_tests/stk_balance/IntegrationTestLoadBalanceSmallToLargeProc.cpp diff --git a/packages/stk/stk_unit_tests/stk_balance/UnitTestLoadBalanceUserSpecWgts.cpp b/packages/stk/stk_integration_tests/stk_balance/IntegrationTestLoadBalanceUserSpecWgts.cpp similarity index 100% rename from packages/stk/stk_unit_tests/stk_balance/UnitTestLoadBalanceUserSpecWgts.cpp rename to packages/stk/stk_integration_tests/stk_balance/IntegrationTestLoadBalanceUserSpecWgts.cpp diff --git a/packages/stk/stk_integration_tests/stk_balance/IntegrationTestSpiderElements.cpp b/packages/stk/stk_integration_tests/stk_balance/IntegrationTestSpiderElements.cpp new file mode 100644 index 000000000000..2f4d187842f0 --- /dev/null +++ b/packages/stk/stk_integration_tests/stk_balance/IntegrationTestSpiderElements.cpp @@ -0,0 +1,125 @@ +#include +#include +#include +#include "stk_util/parallel/ParallelReduce.hpp" +#include "stk_mesh/base/Comm.hpp" +#include "stk_mesh/base/FieldBase.hpp" +#include "stk_io/IossBridge.hpp" +#include "stk_unit_test_utils/getOption.h" +#include "stk_balance/internal/privateDeclarations.hpp" +#include "stk_balance/balance.hpp" +#include "stk_mesh/base/Selector.hpp" +#include "stk_balance/internal/Zoltan2ParallelGraph.hpp" + +namespace +{ + +class SpiderElementMesh : public stk::unit_test_util::MeshFixture +{ +protected: + void setup_spider_mesh(const std::string & meshSpec, stk::mesh::BulkData::AutomaticAuraOption auraOption) + { + setup_empty_mesh(auraOption); + + stk::mesh::Part& spherePart = get_meta().declare_part_with_topology("spheres", stk::topology::PARTICLE); + stk::mesh::Part& beamPart = get_meta().declare_part_with_topology("beams", stk::topology::BEAM_2); + + stk::io::put_io_part_attribute(spherePart); + stk::io::put_io_part_attribute(beamPart); + + const int initValue = 0; + stk::mesh::Field & beamField = get_meta().declare_field>(stk::topology::NODE_RANK, + m_balanceSettings.getSpiderBeamConnectivityCountFieldName()); + stk::mesh::put_field_on_mesh(beamField, get_meta().universal_part(), &initValue); + + stk::mesh::Field & volumeField = get_meta().declare_field>(stk::topology::ELEM_RANK, + m_balanceSettings.getSpiderVolumeConnectivityCountFieldName()); + stk::mesh::put_field_on_mesh(volumeField, get_meta().universal_part(), &initValue); + + stk::io::fill_mesh(meshSpec, get_bulk()); + + std::vector entity_counts; + stk::mesh::comm_mesh_counts(get_bulk(), entity_counts); + const size_t numNodes = entity_counts[stk::topology::NODE_RANK]; + const size_t numElems = entity_counts[stk::topology::ELEM_RANK]; + + const stk::mesh::EntityId sphereNodeID = numNodes+1; + + get_bulk().modification_begin(); + + if (get_bulk().parallel_rank() == 0) { + stk::mesh::EntityId elemID = numElems+1; + stk::mesh::EntityIdVector nodes = {sphereNodeID}; + stk::mesh::declare_element(get_bulk(), spherePart, elemID, nodes); + } + else { + get_bulk().declare_node(sphereNodeID); + } + + stk::mesh::Entity sphereNode = get_bulk().get_entity(stk::topology::NODE_RANK, sphereNodeID); + stk::mesh::FieldBase * coordsField = get_meta().get_field(stk::topology::NODE_RANK,"coordinates"); + EXPECT_TRUE(coordsField != nullptr); + double * coords = reinterpret_cast(stk::mesh::field_data(*coordsField, sphereNode)); + coords[0] = 0.0; + coords[1] = -1.0; + coords[2] = 0.0; + + for (int otherProc = 0; otherProc < get_bulk().parallel_size(); ++otherProc) { + if (otherProc != get_bulk().parallel_rank()) { + get_bulk().add_node_sharing(sphereNode, otherProc); + } + } + + std::vector newBeamIds; + get_bulk().generate_new_ids(stk::topology::ELEM_RANK, numNodes, newBeamIds); + + size_t idIndex = 0; + stk::mesh::EntityVector nodes; + stk::mesh::get_selected_entities(get_meta().locally_owned_part(), get_bulk().buckets(stk::topology::NODE_RANK), nodes); + for (stk::mesh::Entity node : nodes) { + double * nodeCoords = reinterpret_cast(stk::mesh::field_data(*coordsField, node)); + if (nodeCoords[1] < 0.5 && nodeCoords[1] > -0.5) { + stk::mesh::EntityIdVector beamNodes = {sphereNodeID, get_bulk().identifier(node)}; + stk::mesh::declare_element(get_bulk(), beamPart, newBeamIds[idIndex++], beamNodes); + } + } + + get_bulk().modification_end(); + + stk::mesh::EntityProcVec beamsToMove; + if (get_bulk().parallel_rank() != 0) { + stk::mesh::EntityVector beams; + stk::mesh::get_selected_entities(beamPart & get_meta().locally_owned_part(), get_bulk().buckets(stk::topology::ELEM_RANK), beams); + for (stk::mesh::Entity beam : beams) { + beamsToMove.push_back(std::make_pair(beam, 0)); + } + } + get_bulk().change_entity_owner(beamsToMove); + } + + stk::balance::GraphCreationSettings m_balanceSettings; +}; + +TEST_F(SpiderElementMesh, move_spider_legs_to_volume_elem_proc) +{ + if (get_parallel_size() > 4) return; + + m_balanceSettings.setShouldFixSpiders(true); + std::string meshSpec = stk::unit_test_util::get_option("--mesh-spec", "generated:30x3x30"); + setup_spider_mesh(meshSpec, stk::mesh::BulkData::NO_AUTO_AURA); + + stk::balance::balanceStkMesh(m_balanceSettings, get_bulk()); + + stk::mesh::EntityVector beams; + stk::mesh::get_selected_entities(get_meta().get_topology_root_part(stk::topology::BEAM_2) & get_meta().locally_owned_part(), + get_bulk().buckets(stk::topology::ELEM_RANK), beams); + const int localNumBeams = beams.size(); + int globalNumBeams = 0; + + stk::all_reduce_sum(get_bulk().parallel(), &localNumBeams, &globalNumBeams, 1); + const int targetNumBeams = globalNumBeams / get_bulk().parallel_size(); + const double beamNumError = std::abs(localNumBeams - targetNumBeams) / (double)targetNumBeams; + EXPECT_LE(beamNumError, 0.1); +} + +} // namespace diff --git a/packages/stk/stk_unit_tests/stk_balance/UnitTestTransientFields.cpp b/packages/stk/stk_integration_tests/stk_balance/IntegrationTestTransientFields.cpp similarity index 76% rename from packages/stk/stk_unit_tests/stk_balance/UnitTestTransientFields.cpp rename to packages/stk/stk_integration_tests/stk_balance/IntegrationTestTransientFields.cpp index 595f3d673b2c..197072b40a5c 100644 --- a/packages/stk/stk_unit_tests/stk_balance/UnitTestTransientFields.cpp +++ b/packages/stk/stk_integration_tests/stk_balance/IntegrationTestTransientFields.cpp @@ -1,9 +1,42 @@ -#include +// Copyright 2002 - 2008, 2010, 2011 National Technology Engineering +// Solutions of Sandia, LLC (NTESS). Under the terms of Contract +// DE-NA0003525 with NTESS, the U.S. Government retains certain rights +// in this software. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following +// disclaimer in the documentation and/or other materials provided +// with the distribution. +// +// * Neither the name of NTESS nor the names of its contributors +// may be used to endorse or promote products derived from this +// software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include #include +#include "test_utils/StkBalanceRunner.hpp" +#include #include #include #include "stk_unit_test_utils/GenerateALefRAMesh.hpp" @@ -19,48 +52,6 @@ #include #include -class StkBalanceRunner -{ -public: - StkBalanceRunner(MPI_Comm c) - : m_comm(c) - { } - - void set_filename(const std::string& name) - { - m_options.m_inFile = name; - } - - void set_output_dir(const std::string& name) - { - m_options.outputDirectory = name; - } - - void set_app_type_defaults(stk::balance::AppTypeDefaults defaults) - { - m_options.set_app_type_default(defaults); - } - - void set_initial_decomp_method(const std::string& method) - { - m_options.set_initial_decomp_method(method); - } - - void set_decomp_method(const std::string& method) - { - m_options.set_decomp_method(method); - } - - void run_end_to_end() const - { - stk::balance::run_stk_rebalance(m_options, m_comm); - } - -private: - MPI_Comm m_comm; - stk::balance::ParsedOptions m_options; -}; - class MeshFromFile { public: @@ -72,7 +63,8 @@ class MeshFromFile void fill_from_serial(const std::string& fileName) { - stk::io::fill_mesh_with_auto_decomp(fileName, bulk, broker); + broker.property_add(Ioss::Property("DECOMPOSITION_METHOD", "RIB")); + stk::io::fill_mesh_preexisting(broker, fileName, bulk); m_empty = false; } @@ -190,12 +182,13 @@ class TransientVerifier } void verify_sideset_orientation(const MeshFromFile& mesh, + int expectedProc, const stk::mesh::EntityId expectedId, const stk::mesh::ConnectivityOrdinal expectedOrdinal) const { std::vector sidesets = mesh.bulk.get_sidesets(); - if (stk::parallel_machine_rank(m_comm) == 0) { + if (stk::parallel_machine_rank(m_comm) == expectedProc) { ASSERT_EQ(sidesets.size(), 1u); ASSERT_EQ(sidesets[0]->size(), 1u); @@ -238,6 +231,14 @@ class TransientVerifier } } + void verify_decomp(MeshFromFile& mesh, const stk::mesh::EntityIdProcVec& expectedDecomp) const + { + for (const stk::mesh::EntityIdProc& idProc : expectedDecomp) { + const stk::mesh::Entity entity = mesh.bulk.get_entity(stk::topology::ELEMENT_RANK, idProc.first); + EXPECT_EQ(mesh.bulk.parallel_owner_rank(entity), idProc.second); + } + } + private: void verify_global_variable_names(const MeshFromFile& mesh, const std::string& baseName) const { @@ -312,25 +313,25 @@ class TransientFieldBalance : public stk::unit_test_util::MeshFixture balanceRunner(get_comm()), writer(get_comm(), fileBaseName), verifier(get_comm()), - m_initialMeshPtr(new MeshFromFile(get_comm())), - m_balancedMeshPtr(new MeshFromFile(get_comm())) + m_initialMesh(get_comm()), + m_balancedMesh(get_comm()) { balanceRunner.set_filename(fileBaseName); balanceRunner.set_output_dir("."); - balanceRunner.set_app_type_defaults(stk::balance::SD_DEFAULTS); + balanceRunner.set_app_type_defaults("sd"); balanceRunner.set_decomp_method("rcb"); } MeshFromFile& get_initial_mesh() { - if (m_initialMeshPtr->is_empty()) read_initial_mesh(); - return *m_initialMeshPtr; + if (m_initialMesh.is_empty()) read_initial_mesh(); + return m_initialMesh; } MeshFromFile& get_balanced_mesh() { - if (m_balancedMeshPtr->is_empty()) read_balanced_mesh(); - return *m_balancedMeshPtr; + if (m_balancedMesh.is_empty()) read_balanced_mesh(); + return m_balancedMesh; } void cleanup_files() @@ -342,12 +343,12 @@ class TransientFieldBalance : public stk::unit_test_util::MeshFixture private: void read_initial_mesh() { - m_initialMeshPtr->fill_from_serial(fileBaseName); + m_initialMesh.fill_from_serial(fileBaseName); } void read_balanced_mesh() { - m_balancedMeshPtr->fill_from_parallel(fileBaseName); + m_balancedMesh.fill_from_parallel(fileBaseName); } void unlink_parallel_file(const std::string& baseName) @@ -363,13 +364,13 @@ class TransientFieldBalance : public stk::unit_test_util::MeshFixture protected: const std::string fileBaseName; - StkBalanceRunner balanceRunner; + stk::integration_test_utils::StkBalanceRunner balanceRunner; TransientWriter writer; const TransientVerifier verifier; private: - const std::unique_ptr m_initialMeshPtr; - const std::unique_ptr m_balancedMeshPtr; + MeshFromFile m_initialMesh; + MeshFromFile m_balancedMesh; }; TEST_F(TransientFieldBalance, verifyStaticDataTransfer) @@ -476,15 +477,24 @@ TEST_F(TransientFieldBalance, verifyTransientDataTransferWithSidesets) const stk::mesh::EntityId expectedId = 1; const stk::mesh::ConnectivityOrdinal expectedOrdinal = 5; + const int initialSidesetProc = 1; + const int balancedSidesetProc = 1; + + const stk::mesh::EntityIdProcVec expectedInitialDecomp = { {1u,1}, {2u,0} }; + const stk::mesh::EntityIdProcVec expectedBalancedDecomp = { {1u,1}, {2u,0} }; + writer.write_two_element_mesh_with_sideset(stk::unit_test_util::INCREASING); MeshFromFile& initialMesh = get_initial_mesh(); - verifier.verify_sideset_orientation(initialMesh, expectedId, expectedOrdinal); + verifier.verify_sideset_orientation(initialMesh, initialSidesetProc, expectedId, expectedOrdinal); + verifier.verify_decomp(initialMesh, expectedInitialDecomp); + balanceRunner.set_decomp_method("rib"); balanceRunner.run_end_to_end(); MeshFromFile& balancedMesh = get_balanced_mesh(); - verifier.verify_sideset_orientation(balancedMesh, expectedId, expectedOrdinal); + verifier.verify_sideset_orientation(balancedMesh, balancedSidesetProc, expectedId, expectedOrdinal); + verifier.verify_decomp(balancedMesh, expectedBalancedDecomp); cleanup_files(); } @@ -496,46 +506,23 @@ TEST_F(TransientFieldBalance, verifyTransientDataTransferWithSidesetsOnMovedElem const stk::mesh::EntityId expectedId = 2; const stk::mesh::ConnectivityOrdinal expectedOrdinal = 5; + const int initialSidesetProc = 1; + const int balancedSidesetProc = 0; + + const stk::mesh::EntityIdProcVec expectedInitialDecomp = { {1u,0}, {2u,1} }; + const stk::mesh::EntityIdProcVec expectedBalancedDecomp = { {1u,1}, {2u,0} }; + writer.write_two_element_mesh_with_sideset(stk::unit_test_util::DECREASING); MeshFromFile& initialMesh = get_initial_mesh(); - verifier.verify_sideset_orientation(initialMesh, expectedId, expectedOrdinal); + verifier.verify_sideset_orientation(initialMesh, initialSidesetProc, expectedId, expectedOrdinal); + verifier.verify_decomp(initialMesh, expectedInitialDecomp); - balanceRunner.set_initial_decomp_method("BLOCK"); balanceRunner.run_end_to_end(); MeshFromFile& balancedMesh = get_balanced_mesh(); - verifier.verify_sideset_orientation(balancedMesh, expectedId, expectedOrdinal); + verifier.verify_sideset_orientation(balancedMesh, balancedSidesetProc, expectedId, expectedOrdinal); + verifier.verify_decomp(balancedMesh, expectedBalancedDecomp); cleanup_files(); } - -TEST(TestTransientFieldBalance, verifyThrowIfInputFileEqualsOutputFile) -{ - if (stk::parallel_machine_size(MPI_COMM_WORLD) == 1) - { - std::string serialMeshName = "sixteen_hex_transient.e"; - std::string parallelOutputMeshName = "sixteen_hex_transient.e"; - - stk::unit_test_util::generated_mesh_to_file_in_serial("1x4x4", serialMeshName); - - stk::balance::BasicZoltan2Settings rcbOptions; - EXPECT_THROW(stk::balance::run_stk_balance_with_settings(parallelOutputMeshName, serialMeshName, MPI_COMM_WORLD, rcbOptions), std::logic_error); - unlink(serialMeshName.c_str()); - } -} - -TEST(TestTransientFieldBalance, verifyThrowIfInputFileEqualsDotSlashOutputFile) -{ - if (stk::parallel_machine_size(MPI_COMM_WORLD) == 1) - { - std::string serialMeshName = "sixteen_hex_transient.e"; - std::string parallelOutputMeshName = "./sixteen_hex_transient.e"; - - stk::unit_test_util::generated_mesh_to_file_in_serial("1x4x4", serialMeshName); - - stk::balance::BasicZoltan2Settings rcbOptions; - EXPECT_THROW(stk::balance::run_stk_balance_with_settings(parallelOutputMeshName, serialMeshName, MPI_COMM_WORLD, rcbOptions), std::logic_error); - unlink(serialMeshName.c_str()); - } -} diff --git a/packages/stk/stk_integration_tests/stk_balance/StkbalanceUserSupport.cpp b/packages/stk/stk_integration_tests/stk_balance/IntegrationTestUserSupport.cpp similarity index 96% rename from packages/stk/stk_integration_tests/stk_balance/StkbalanceUserSupport.cpp rename to packages/stk/stk_integration_tests/stk_balance/IntegrationTestUserSupport.cpp index a271a9428f3e..277a141c0264 100644 --- a/packages/stk/stk_integration_tests/stk_balance/StkbalanceUserSupport.cpp +++ b/packages/stk/stk_integration_tests/stk_balance/IntegrationTestUserSupport.cpp @@ -23,6 +23,7 @@ #include "stk_balance/internal/LastStepFieldWriter.hpp" #include "stk_balance/search_tolerance_algs/SecondShortestEdgeFaceSearchTolerance.hpp" +#include "test_utils/StkBalanceRunner.hpp" namespace { @@ -126,6 +127,8 @@ void write_metrics_for_overlapping_BB(int myId, const stk::balance::internal::Se // actually check anything. TEST(Stkbalance, NumOverlappingBB) { + if (stk::parallel_machine_size(MPI_COMM_WORLD) > 3) return; + const std::string dummyFileName("ARefLA.e"); std::string filename = stk::unit_test_util::get_option("-i", dummyFileName); @@ -183,6 +186,8 @@ void addComponentToSet(std::set &component, stk::mesh::ElemEl // actually check anything. TEST(Stkbalance, modifyMeshIfNeeded) { + if (stk::parallel_machine_size(MPI_COMM_WORLD) > 3) return; + std::string filename = stk::unit_test_util::get_option("-i", "ARefLA.e"); stk::mesh::MetaData meta; @@ -497,18 +502,33 @@ TEST(Stkbalance, changeOptions) delete balanceOptions; } -class ToleranceTester : public stk::unit_test_util::MeshFixture {}; +class ToleranceTester : public stk::unit_test_util::MeshFixture +{ +public: + ToleranceTester() + : balanceRunner(get_comm()), + meshFile("gapped_plates.g") + { + balanceRunner.set_filename(meshFile); + balanceRunner.set_output_dir("."); + balanceRunner.set_app_type_defaults("sm"); + } + +protected: + stk::integration_test_utils::StkBalanceRunner balanceRunner; + const std::string meshFile; +}; TEST_F(ToleranceTester, smDefaults) { - if (stk::parallel_machine_size(MPI_COMM_WORLD) > 1) + if (get_parallel_size() > 4) return; + + if (get_parallel_size() > 1) { - stk::balance::ParsedOptions options("gapped_plates.g", "."); - options.set_app_type_default(stk::balance::SM_DEFAULTS); - stk::balance::run_stk_rebalance(options, MPI_COMM_WORLD); + balanceRunner.run_end_to_end(); } - setup_mesh("gapped_plates.g", stk::mesh::BulkData::NO_AUTO_AURA); + setup_mesh(meshFile, stk::mesh::BulkData::NO_AUTO_AURA); for(unsigned i=1; i<101; i++) { stk::mesh::EntityId lowerId = i; diff --git a/packages/stk/stk_integration_tests/stk_balance/TestAttributeOrdering.cpp b/packages/stk/stk_integration_tests/stk_balance/TestAttributeOrdering.cpp deleted file mode 100644 index c92fcca8c9a0..000000000000 --- a/packages/stk/stk_integration_tests/stk_balance/TestAttributeOrdering.cpp +++ /dev/null @@ -1,30 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include - -class ReverseOrderAttributes : public stk::unit_test_util::MeshFixture {}; - -TEST_F(ReverseOrderAttributes, balance_attributeOrderPreserved) -{ - const std::string inputFile = "reverseOrderAttr.exo"; - const std::string outputDir = "outputDir"; - stk::balance::ParsedOptions options(inputFile, outputDir); - options.set_app_type_default(stk::balance::SD_DEFAULTS); - stk::balance::run_stk_rebalance(options, MPI_COMM_WORLD); - - setup_empty_mesh(stk::mesh::BulkData::NO_AUTO_AURA); - stk::io::StkMeshIoBroker stkIo(get_comm()); - const std::string balancedFile = outputDir + "/" + inputFile; - stk::io::fill_mesh_preexisting(stkIo, balancedFile, get_bulk()); - stk::mesh::Part *blockPart = get_meta().get_part("block_17"); - stk::mesh::FieldVector balancedAttrFields = stkIo.get_ordered_attribute_fields(blockPart); - - std::vector expectedAttrFieldNames = {"j", "i", "h", "g", "f", "e", "d", "c", "b", "a" }; - ASSERT_EQ(expectedAttrFieldNames.size(), balancedAttrFields.size()); - for(size_t i=0; iname()); -} diff --git a/packages/stk/stk_integration_tests/stk_mesh/CMakeLists.txt b/packages/stk/stk_integration_tests/stk_mesh/CMakeLists.txt index bacbcf5f1820..b27952e3d498 100644 --- a/packages/stk/stk_integration_tests/stk_mesh/CMakeLists.txt +++ b/packages/stk/stk_integration_tests/stk_mesh/CMakeLists.txt @@ -8,12 +8,10 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../../teuchos/src) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/) -TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h) - FILE(GLOB SOURCES *.cpp) TRIBITS_ADD_EXECUTABLE_AND_TEST( - stk_integration_tests + stk_mesh_integration_tests SOURCES ${SOURCES} ARGS "" COMM serial mpi diff --git a/packages/stk/stk_integration_tests/stk_mesh/IntegrationTestTopology.cpp b/packages/stk/stk_integration_tests/stk_mesh/IntegrationTestTopology.cpp new file mode 100644 index 000000000000..14659a405828 --- /dev/null +++ b/packages/stk/stk_integration_tests/stk_mesh/IntegrationTestTopology.cpp @@ -0,0 +1,117 @@ +// Copyright 2002 - 2008, 2010, 2011 National Technology Engineering +// Solutions of Sandia, LLC (NTESS). Under the terms of Contract +// DE-NA0003525 with NTESS, the U.S. Government retains certain rights +// in this software. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following +// disclaimer in the documentation and/or other materials provided +// with the distribution. +// +// * Neither the name of NTESS nor the names of its contributors +// may be used to endorse or promote products derived from this +// software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +#include +#include +#include +#include +#include +#include // for MeshTestFixture + +#include + + +class StkTopologyTest : public stk::unit_test_util::MeshFixture +{ +public: + StkTopologyTest() + { + setup_empty_mesh(stk::mesh::BulkData::NO_AUTO_AURA); + } + + void init_mesh_with_wedge12_element(stk::mesh::BulkData& bulk) + { + std::string meshDesc = "0,1,WEDGE_12,1,2,3,4,5,6,7,8,9,10,11,12"; + stk::unit_test_util::setup_text_mesh(bulk, meshDesc); + stk::mesh::create_all_sides(bulk, bulk.mesh_meta_data().universal_part(), {}, true); + } + + stk::topology get_face_topology(stk::mesh::BulkData& bulk, unsigned faceOrdinal) + { + stk::mesh::EntityVector faces; + bulk.get_entities(stk::topology::FACE_RANK, bulk.mesh_meta_data().universal_part(), faces); + EXPECT_TRUE(faceOrdinal < faces.size()); + return bulk.bucket(faces[faceOrdinal]).topology(); + } + + stk::topology get_element_topology(const stk::mesh::BulkData& bulk) + { + stk::mesh::EntityVector elements; + bulk.get_entities(stk::topology::ELEMENT_RANK, bulk.mesh_meta_data().universal_part(), elements); + EXPECT_EQ(elements.size(), 1u); + return bulk.bucket(elements[0]).topology(); + } + + void output_mesh(stk::mesh::BulkData& bulk, const std::string& fileName) + { + stk::io::write_mesh(fileName, bulk); + } + + void check_mesh_has_wedge12(stk::mesh::BulkData& bulk) + { + EXPECT_EQ(get_element_topology(bulk), stk::topology::WEDGE_12); + + EXPECT_EQ(get_face_topology(bulk, 0), stk::topology::TRI_6); + EXPECT_EQ(get_face_topology(bulk, 1), stk::topology::TRI_6); + EXPECT_EQ(get_face_topology(bulk, 2), stk::topology::QUAD_6); + EXPECT_EQ(get_face_topology(bulk, 3), stk::topology::QUAD_6); + EXPECT_EQ(get_face_topology(bulk, 4), stk::topology::QUAD_6); + } +}; + +TEST_F(StkTopologyTest, createWedge12OnMesh) +{ + if(get_parallel_size() != 1) { return; } + + init_mesh_with_wedge12_element(get_bulk()); + check_mesh_has_wedge12(get_bulk()); +} + +TEST_F(StkTopologyTest, writeWedge12ToExodusFile) +{ + if(get_parallel_size() != 1) { return; } + + const std::string fileName = "single_wedge_case.e"; + init_mesh_with_wedge12_element(get_bulk()); + + output_mesh(get_bulk(), fileName); + + stk::mesh::MetaData newMeta(3); + stk::mesh::BulkData newBulk(newMeta, get_comm()); + stk::io::fill_mesh(fileName, newBulk); + stk::mesh::create_all_sides(newBulk, newMeta.universal_part(), {}, true); + + check_mesh_has_wedge12(newBulk); + + unlink(fileName.c_str()); +} \ No newline at end of file diff --git a/packages/stk/stk_integration_tests/stk_transfer/CMakeLists.txt b/packages/stk/stk_integration_tests/stk_transfer/CMakeLists.txt new file mode 100644 index 000000000000..99fed4715ffc --- /dev/null +++ b/packages/stk/stk_integration_tests/stk_transfer/CMakeLists.txt @@ -0,0 +1,21 @@ + + +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../stk_util) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../stk_mesh) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../stk_transfer) + +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/) + +FILE(GLOB SOURCES *.cpp) + +TRIBITS_ADD_EXECUTABLE_AND_TEST( + stk_transfer_integration_tests + SOURCES ${SOURCES} + ARGS "" + COMM serial mpi + NUM_MPI_PROCS 1 + STANDARD_PASS_OUTPUT + ) + diff --git a/packages/stk/stk_unit_tests/stk_transfer/UnitTestCopyTransfer.cpp b/packages/stk/stk_integration_tests/stk_transfer/IntgTestCopyTransfer.cpp similarity index 100% rename from packages/stk/stk_unit_tests/stk_transfer/UnitTestCopyTransfer.cpp rename to packages/stk/stk_integration_tests/stk_transfer/IntgTestCopyTransfer.cpp diff --git a/packages/stk/stk_unit_tests/stk_transfer/howToUseCopyTransfer.cpp b/packages/stk/stk_integration_tests/stk_transfer/howToUseCopyTransfer.cpp similarity index 100% rename from packages/stk/stk_unit_tests/stk_transfer/howToUseCopyTransfer.cpp rename to packages/stk/stk_integration_tests/stk_transfer/howToUseCopyTransfer.cpp diff --git a/packages/stk/stk_balance/test_utils/BalanceTestUtilities.cpp b/packages/stk/stk_integration_tests/test_utils/BalanceTestUtilities.cpp similarity index 100% rename from packages/stk/stk_balance/test_utils/BalanceTestUtilities.cpp rename to packages/stk/stk_integration_tests/test_utils/BalanceTestUtilities.cpp diff --git a/packages/stk/stk_balance/test_utils/BalanceTestUtilities.hpp b/packages/stk/stk_integration_tests/test_utils/BalanceTestUtilities.hpp similarity index 100% rename from packages/stk/stk_balance/test_utils/BalanceTestUtilities.hpp rename to packages/stk/stk_integration_tests/test_utils/BalanceTestUtilities.hpp diff --git a/packages/stk/stk_balance/test_utils/MeshFixtureMxNRebalance.hpp b/packages/stk/stk_integration_tests/test_utils/MeshFixtureMxNRebalance.hpp similarity index 100% rename from packages/stk/stk_balance/test_utils/MeshFixtureMxNRebalance.hpp rename to packages/stk/stk_integration_tests/test_utils/MeshFixtureMxNRebalance.hpp diff --git a/packages/stk/stk_balance/test_utils/NemesisInfo.hpp b/packages/stk/stk_integration_tests/test_utils/NemesisInfo.hpp similarity index 100% rename from packages/stk/stk_balance/test_utils/NemesisInfo.hpp rename to packages/stk/stk_integration_tests/test_utils/NemesisInfo.hpp diff --git a/packages/stk/stk_balance/test_utils/OptionsForTesting.hpp b/packages/stk/stk_integration_tests/test_utils/OptionsForTesting.hpp similarity index 100% rename from packages/stk/stk_balance/test_utils/OptionsForTesting.hpp rename to packages/stk/stk_integration_tests/test_utils/OptionsForTesting.hpp diff --git a/packages/stk/stk_integration_tests/test_utils/StkBalanceRunner.cpp b/packages/stk/stk_integration_tests/test_utils/StkBalanceRunner.cpp new file mode 100644 index 000000000000..26f74b40aead --- /dev/null +++ b/packages/stk/stk_integration_tests/test_utils/StkBalanceRunner.cpp @@ -0,0 +1,92 @@ +// Copyright 2002 - 2008, 2010, 2011 National Technology Engineering +// Solutions of Sandia, LLC (NTESS). Under the terms of Contract +// DE-NA0003525 with NTESS, the U.S. Government retains certain rights +// in this software. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following +// disclaimer in the documentation and/or other materials provided +// with the distribution. +// +// * Neither the name of NTESS nor the names of its contributors +// may be used to endorse or promote products derived from this +// software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +#include "gtest/gtest.h" +#include "StkBalanceRunner.hpp" +#include "stk_balance/setup/LifeCycle.hpp" + +namespace stk { +namespace integration_test_utils { + +StkBalanceRunner::StkBalanceRunner(MPI_Comm c) + : m_comm(c), + m_execName("stk_balance"), + m_inFile(""), + m_outputDirectory(""), + m_appTypeDefaultArg(""), + m_decompMethodArg("") +{ } + +void StkBalanceRunner::set_filename(const std::string& name) +{ + m_inFile = name; +} + +void StkBalanceRunner::set_output_dir(const std::string& name) +{ + m_outputDirectory = name; +} + +void StkBalanceRunner::set_app_type_defaults(const std::string& defaults) +{ + ThrowRequireMsg(defaults == "sm" || defaults == "sd", + "Passed the invalid app type default specification " << defaults + << " to StkBalanceRunner"); + + m_appTypeDefaultArg = "--" + defaults; +} + +void StkBalanceRunner::set_decomp_method(const std::string& method) +{ + m_decompMethodArg = "--decomp-method=" + method; +} + +void StkBalanceRunner::run_end_to_end() const +{ + std::vector args = assemble_args(); + stk::balance::LifeCycle balance(m_comm, args.size(), args.data()); + balance.run(); + EXPECT_EQ(balance.exit_code(), 0); +} + +std::vector StkBalanceRunner::assemble_args() const +{ + std::vector args = {m_execName.c_str(), m_inFile.c_str(), m_outputDirectory.c_str()}; + + if (m_appTypeDefaultArg != "") args.push_back(m_appTypeDefaultArg.c_str()); + if (m_decompMethodArg != "") args.push_back(m_decompMethodArg.c_str()); + + return args; +} + +} } diff --git a/packages/stk/stk_unit_tests/stk_util/util/UnitTest_filter_iterator.cpp b/packages/stk/stk_integration_tests/test_utils/StkBalanceRunner.hpp similarity index 58% rename from packages/stk/stk_unit_tests/stk_util/util/UnitTest_filter_iterator.cpp rename to packages/stk/stk_integration_tests/test_utils/StkBalanceRunner.hpp index e1265dad7aaf..6686536db035 100644 --- a/packages/stk/stk_unit_tests/stk_util/util/UnitTest_filter_iterator.cpp +++ b/packages/stk/stk_integration_tests/test_utils/StkBalanceRunner.hpp @@ -30,58 +30,38 @@ // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// - - -#include // for size_t -#include // for filter_iterator -#include // for basic_ostream::operator<<, etc -#include -#include // for vector, vector<>::iterator -namespace vector_vector_int { +#ifndef STK_INTEGRATION_TESTS_STK_BALANCE_RUNNER_HPP +#define STK_INTEGRATION_TESTS_STK_BALANCE_RUNNER_HPP -struct vec_filter { - vec_filter(size_t sz=0) : m_sz(sz) {} +#include +#include "mpi.h" - bool operator()(const std::vector& vec) const { return vec.size() > m_sz; } - - private: - size_t m_sz; -}; +namespace stk { +namespace integration_test_utils { -typedef std::vector< std::vector > nested_type; - -} - -TEST ( filter_iterator, vector_vector_int) +class StkBalanceRunner { - using namespace vector_vector_int; +public: + StkBalanceRunner(MPI_Comm c); - const int OUTER = 10; + void set_filename(const std::string& name); + void set_output_dir(const std::string& name); + void set_app_type_defaults(const std::string& defaults); + void set_decomp_method(const std::string& method); + void run_end_to_end() const; - nested_type a(OUTER); +private: + std::vector assemble_args() const; - { - int count = 0; - for (int i=0; i >::iterator> itr(vec_filter(4),a.begin(),a.end()); - boost::filter_iterator >::iterator> itr_end(a.end(), a.end()); + MPI_Comm m_comm; + std::string m_execName; + std::string m_inFile; + std::string m_outputDirectory; + std::string m_appTypeDefaultArg; + std::string m_decompMethodArg; +}; - for(; itr!=itr_end; ++itr) - { - std::vector& v = *itr; - for(std::vector::iterator vit=v.begin(),vend=v.end(); vit!=vend; ++vit) { - std::cout<<*vit<<" "; - } - std::cout< - -#include -#include -#include - -using namespace std; - -namespace -{ - -class Graph -{ - int V; // No. of vertices - list *adj; // Pointer to an array containing adjacency lists - bool isCyclicUtil(int v, bool visited[], bool *rs); // used by isCyclic() -public: - Graph(int V); // Constructor - ~Graph(); - void addEdge(int v, int w); // to add an edge to graph - bool isCyclic(); // returns true if there is a cycle in this graph -}; - -Graph::Graph(int V) -{ - this->V = V; - adj = new list[V]; -} - -Graph::~Graph() -{ - delete [] adj; -} - -void Graph::addEdge(int v, int w) -{ - adj[v].push_back(w); // Add w to v’s list. -} - -// This function is a variation of DFSUytil() in http://www.geeksforgeeks.org/archives/18212 -bool Graph::isCyclicUtil(int v, bool visited[], bool *recStack) -{ - if(visited[v] == false) - { - // Mark the current node as visited and part of recursion stack - visited[v] = true; - recStack[v] = true; - - // Recur for all the vertices adjacent to this vertex - list::iterator i; - for(i = adj[v].begin(); i != adj[v].end(); ++i) - { - if ( !visited[*i] && isCyclicUtil(*i, visited, recStack) ) - return true; - else if (recStack[*i]) - return true; - } - - } - recStack[v] = false; // remove the vertex from recursion stack - return false; -} - -// Returns true if the graph contains a cycle, else false. -// This function is a variation of DFS() in http://www.geeksforgeeks.org/archives/18212 -bool Graph::isCyclic() -{ - // Mark all the vertices as not visited and not part of recursion - // stack - bool *visited = new bool[V]; - bool *recStack = new bool[V]; - for(int i = 0; i < V; i++) - { - visited[i] = false; - recStack[i] = false; - } - - // Call the recursive helper function to detect cycle in different - // DFS trees - for(int i = 0; i < V; i++) - if (isCyclicUtil(i, visited, recStack)) - return true; - - return false; -} - -TEST(DirectedGraph, DISABLED_findCycles) -{ - Graph g(4); - g.addEdge(0, 1); - g.addEdge(0, 2); - g.addEdge(1, 2); - g.addEdge(2, 0); - g.addEdge(2, 3); - - EXPECT_TRUE(g.isCyclic()); -} - -} - diff --git a/packages/stk/stk_learning/CodeKatas/UsingLapack.C b/packages/stk/stk_learning/CodeKatas/UsingLapack.C deleted file mode 100644 index a8faeb0b5cab..000000000000 --- a/packages/stk/stk_learning/CodeKatas/UsingLapack.C +++ /dev/null @@ -1,120 +0,0 @@ -#include -#include -#include -#include // For SIERRA_FORTRAN -#include - -extern "C" -{ - void SIERRA_FORTRAN(dgesvd)(const char* jobu, const char* jobvt, int* m, int *n, - double *A, int* lda, double* s, double* u, int* ldu, - double *vt, int* ldvt, double* work, int* lwork, - int *info, - long len_jobu, long len_jobvt); -} - -namespace -{ - -// Borrowed from Salinas SVD. If using this, consider removing duplication and finding good home -// NOTE: trying to use "untransposed" data, did not work for me. Not sure why. -void SVD(std::vector& G, std::vector& singularvalues, std::vector& u, std::vector& vt, int numRow, int numCol) -{ - char jobu[8] = {'A', 0, 0, 0, 0, 0, 0, 0}; - char jobvt[8] = {'A', 0, 0, 0, 0, 0, 0, 0}; - - int workarraysize = -1; - int ldu = numCol; - int ldvt = numRow; - int info = 0; - - double getWorkSize = 0; - SIERRA_FORTRAN(dgesvd)(jobu, jobvt, &numCol, &numRow, G.data(), &numCol, singularvalues.data(), u.data(), &ldu, vt.data(), &ldvt, &getWorkSize, &workarraysize, &info, 1, 1); - workarraysize = (int) (getWorkSize + .1); - - double* work = new double[workarraysize]; - SIERRA_FORTRAN(dgesvd)(jobu, jobvt, &numCol, &numRow, G.data(), &numCol, singularvalues.data(), u.data(), &ldu, vt.data(), &ldvt, work, &workarraysize, &info, 1, 1); - delete[] work; - - if(info < 0) - std::cerr << "The %d argument to dgesvd had an illegal argument. %s %d\n"; -} - -void checkOrthogonalityOfVectors(const std::vector& eigenVecs, size_t size) -{ - for(size_t i=0;i& gold, const std::vector& notGold, const std::string& testName) -{ - ASSERT_EQ(gold.size(), notGold.size()); - for(size_t i=0;i>gold.size();++i) - EXPECT_NEAR(gold[i], notGold[i], 1.0e-8) << testName; -} - -struct myMatrix -{ - myMatrix() : numRow(0), numCol(0) {} - std::vector matrix; - int numRow; - int numCol; -}; - -myMatrix getMeasuredData() -{ - myMatrix measured; - std::vector a = {3, 2, 2, 2, 3, -2}; - measured.matrix = a; - measured.numRow = 2; - measured.numCol = 3; - return measured; -} - -// http://www.d.umn.edu/~mhampton/m4326svd_example.pdf - -TEST(SVD, testSVD_ValuesAndVectors) -{ - if(stk::parallel_machine_size(MPI_COMM_WORLD)==1) - { - myMatrix measured = getMeasuredData(); - int mins = std::min(measured.numRow, measured.numCol); - - std::vector S(mins,0); - std::vector VT(measured.numRow*measured.numRow); - std::vector U(measured.numCol*measured.numCol); - - SVD(measured.matrix, S, U, VT, measured.numRow, measured.numCol); - - double s2 = std::sqrt(2.0); - double s18 = std::sqrt(18.0); - - std::vector goldEigenVals = { 5.0, 3.0 }; - std::vector goldU = { 1.0/s2, 1.0/s2, 0.0, 1.0/s18, -1.0/s18, 4.0/s18, 2.0/3.0, 2.0/3.0, -1.0/3.0 }; - std::vector goldVT= { 1.0/s2, 1.0/s2, 1.0/s2, -1.0/s2 }; - - compareData(goldEigenVals, S, "Eigenvalues"); - compareData(goldVT, VT, "V-transpose"); - compareData(goldU, U, "U-matrix"); - - checkOrthogonalityOfVectors(U, measured.numCol); - checkOrthogonalityOfVectors(VT, measured.numRow); - } -} - -} diff --git a/packages/stk/stk_learning/DGElement/TetFixture.hpp b/packages/stk/stk_learning/DGElement/TetFixture.hpp deleted file mode 100644 index 7784cf0aaee5..000000000000 --- a/packages/stk/stk_learning/DGElement/TetFixture.hpp +++ /dev/null @@ -1,149 +0,0 @@ -// Copyright 2002 - 2008, 2010, 2011 National Technology Engineering -// Solutions of Sandia, LLC (NTESS). Under the terms of Contract -// DE-NA0003525 with NTESS, the U.S. Government retains certain rights -// in this software. -// - // Redistribution and use in source and binary forms, with or without - // modification, are permitted provided that the following conditions are - // met: - // - // * Redistributions of source code must retain the above copyright - // notice, this list of conditions and the following disclaimer. - // - // * Redistributions in binary form must reproduce the above - // copyright notice, this list of conditions and the following - // disclaimer in the documentation and/or other materials provided - // with the distribution. - // -// * Neither the name of NTESS nor the names of its contributors -// may be used to endorse or promote products derived from this -// software without specific prior written permission. -// - // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - // "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - // A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -#ifndef STK_LEARNING_DGELEMENT_TETFIXTURE_HPP -#define STK_LEARNING_DGELEMENT_TETFIXTURE_HPP - -#include - -#include -#include -#include -#include -#include -#include - -#include - -class DGTetFixture : public ::testing::Test -{ -protected: - DGTetFixture() - : communicator(MPI_COMM_WORLD), metaData(3), bulkData(nullptr) - { - tetPart = &metaData.declare_part_with_topology("TET", stk::topology::TETRAHEDRON_4); - stk::io::put_io_part_attribute(*tetPart); - skinPart = &metaData.declare_part("skin", stk::topology::FACE_RANK); - nodePart = &metaData.declare_part_with_topology("node_part", stk::topology::NODE); - coords = &metaData.declare_field>(stk::topology::NODE_RANK, "coordinates"); - stk::mesh::put_field_on_mesh(*coords, metaData.universal_part(), metaData.spatial_dimension(), nullptr); - } - - virtual ~DGTetFixture() - { - delete bulkData; - } - - void setup_mesh(const std::vector& tet_conn, const std::vector> &node_coords, stk::mesh::BulkData::AutomaticAuraOption auraOption = stk::mesh::BulkData::NO_AUTO_AURA) - { - allocate_bulk(auraOption); - stk::mesh::EntityVector nodes = setup_nodes(node_coords.size()); - setup_elements(tet_conn); - initialize_coordinates(nodes, node_coords); - } - - MPI_Comm get_comm() - { - return communicator; - } - - stk::mesh::MetaData& get_meta() - { - return metaData; - } - - stk::mesh::BulkData& get_bulk() - { - ThrowRequireMsg(bulkData!=nullptr, "Unit test error. Trying to get bulk data before it has been initialized."); - return *bulkData; - } - - void allocate_bulk(stk::mesh::BulkData::AutomaticAuraOption auraOption) - { - bulkData = new stk::mesh::BulkData(metaData, communicator, auraOption); - } - - stk::mesh::Part* get_skin_part() - { - return skinPart; - } - - stk::mesh::Field* get_coord_field() - { - return coords; - } - -private: - - stk::mesh::EntityVector setup_nodes(const size_t num_nodes) - { - stk::mesh::EntityVector nodes(num_nodes); - get_bulk().modification_begin(); - for(unsigned int i=0;i& tet_conn) - { - size_t num_tets = tet_conn.size(); - get_bulk().modification_begin(); - for(unsigned int i=0;i> &node_coords) - { - for(const stk::mesh::Entity node : nodes ) - { - double *nodeCoord = stk::mesh::field_data(*coords, node); - stk::mesh::EntityId id = get_bulk().identifier(node); - nodeCoord[0] = node_coords[id-1][0]; - nodeCoord[1] = node_coords[id-1][1]; - nodeCoord[2] = node_coords[id-1][2]; - } - } - - MPI_Comm communicator; - stk::mesh::MetaData metaData; - stk::mesh::BulkData *bulkData; - stk::mesh::Part* tetPart = nullptr; - stk::mesh::Part* nodePart = nullptr; - stk::mesh::Part* skinPart = nullptr; - stk::mesh::Field* coords = nullptr; -}; - - -#endif diff --git a/packages/stk/stk_learning/DGElement/UnitTestDisconnectMesh.cpp b/packages/stk/stk_learning/DGElement/UnitTestDisconnectMesh.cpp deleted file mode 100644 index 97ea260e8504..000000000000 --- a/packages/stk/stk_learning/DGElement/UnitTestDisconnectMesh.cpp +++ /dev/null @@ -1,659 +0,0 @@ -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -#include - -#include "TetFixture.hpp" - -#include -#include - -#include "stk_io/StkMeshIoBroker.hpp" -#include - -#include - -class DisconnectMesh : public DGTetFixture {}; - -void disconnectMesh( stk::mesh::MetaData &oldMeta, - stk::mesh::BulkData& oldBulkData, - stk::mesh::Selector subMeshSelector, - stk::mesh::MetaData &newMeta, - stk::mesh::BulkData &newBulkData); - -TEST_F(DisconnectMesh, tet) -{ - std::vector tet_conn = { - {1, 2, 3, 4}, // id 1 - {2, 3, 4, 5} // id 2 - }; - - std::vector< std::vector > node_coords= { - {0, 0, 0}, // 1 - {1, 0, 0}, // 2 - {0, 1, 0}, // 3 - {0.5, 0.5, 1.0}, // 6...just kidding, it's 4 - {1.0, 1.0, 1.0} - }; - - setup_mesh(tet_conn, node_coords); - - ////////////////////////////////////////////////////////////////////////////////////// - - stk::mesh::MetaData newMetaData; - stk::mesh::BulkData newBulkData(newMetaData, get_bulk().parallel()); - disconnectMesh(get_meta(), get_bulk(), get_meta().universal_part(), newMetaData, newBulkData); - - stk::io::write_mesh("mike_new.g", newBulkData); -} - -class TOSDTWD : public stk::unit_test_util::MeshFixture -{ -protected: - TOSDTWD() : stk::unit_test_util::MeshFixture(3) {} - virtual ~TOSDTWD() {} - - virtual void setup_mesh(const std::string &meshSpecification, stk::mesh::BulkData::AutomaticAuraOption auraOption) - { - allocate_bulk(auraOption); - stk::io::fill_mesh_save_step_info(meshSpecification, *bulkData, mNumSteps, mMaxTime); - } - - int get_num_steps() const - { - return mNumSteps; - } - - double get_max_time() const - { - return mMaxTime; - } - - int mNumSteps = 0; - double mMaxTime = 0; -}; - -TEST_F(TOSDTWD, disconnect_mesh) -{ - std::string exodusFileName = stk::unit_test_util::get_option("-i", "generated:10x10x10"); - std::string mesh_name = stk::unit_test_util::get_option("-o", "blown_up.g"); - - { - setup_mesh(exodusFileName, stk::mesh::BulkData::NO_AUTO_AURA); - stk::mesh::MetaData newMetaData; - stk::mesh::BulkData newBulkData(newMetaData, get_bulk().parallel()); - disconnectMesh(get_meta(), get_bulk(), get_meta().universal_part(), newMetaData, newBulkData); - stk::io::write_mesh(mesh_name, newBulkData); - } -} - -TEST_F(TOSDTWD, birds) -{ - std::string exodusFileName = stk::unit_test_util::get_option("-i", "generated:10x10x10"); - std::string results_name = "output_results.g"; - - double velx = stk::unit_test_util::get_command_line_option("-vx", 10.0); - double vely = stk::unit_test_util::get_command_line_option("-vy", 10.0); - unsigned int num_steps = stk::unit_test_util::get_command_line_option("-steps", 100u); - double accelx = stk::unit_test_util::get_command_line_option("-ax", 0.0); - double accely = stk::unit_test_util::get_command_line_option("-ay", 9.8); - - std::cerr << "Using (vx,vy) and (gx,gy) of (" << velx << ", " << vely << ") and (" << accelx << ", " << accely << ")" << std::endl; - - { - stk::io::StkMeshIoBroker stkIo(get_comm()); - stkIo.add_mesh_database(exodusFileName, stk::io::READ_MESH); - - stkIo.create_input_mesh(); - - typedef stk::mesh::Field CoordFieldType; - - CoordFieldType& field = stkIo.meta_data().declare_field(stk::topology::NODE_RANK, "disp"); - CoordFieldType& velocity = stkIo.meta_data().declare_field(stk::topology::ELEM_RANK, "velocity"); - stk::mesh::Field& active_status = stkIo.meta_data().declare_field>(stk::topology::ELEMENT_RANK, "active_status"); - - double init_status = 1; - std::vector init_vec = {0,0,0}; - - stk::mesh::put_field_on_mesh(field, stkIo.meta_data().universal_part(), init_vec.data()); - stk::mesh::put_field_on_mesh(velocity, stkIo.meta_data().universal_part(), init_vec.data()); - stk::mesh::put_field_on_mesh(active_status, stkIo.meta_data().universal_part(), &init_status); - - stkIo.populate_bulk_data(); - - size_t fh = stkIo.create_output_mesh(results_name, stk::io::WRITE_RESULTS); - - stkIo.add_field(fh, field); /*@\label{io:results:add_field}*/ - stkIo.add_field(fh, velocity); /*@\label{io:results:add_field}*/ - stkIo.add_field(fh, active_status); /*@\label{io:results:add_field}*/ - - std::vector elements; - stk::mesh::get_entities(stkIo.bulk_data(), stk::topology::ELEM_RANK, elements); - - CoordFieldType *coords = stkIo.meta_data().get_field(stk::topology::NODE_RANK, "coordinates"); - std::vector > direct(elements.size()); - - double minx = 0, miny = 0, minz = 0, maxx = 0, maxy = 0, maxz = 0; - - double vx = velx, vy = vely, vz = 0; - double gravity = accely; - double gx = -0.5*accelx, gy = -gravity*0.5, gz = 0; - double xc = 0, yc = 0, zc = 0; - - for(size_t i = 0; i < elements.size(); i++) - { - double *elem_vel = stk::mesh::field_data(velocity, elements[i]); - - elem_vel[0] = vx; - elem_vel[1] = vy; - elem_vel[2] = vz; - - unsigned num_nodes = stkIo.bulk_data().num_nodes(elements[i]); - const stk::mesh::Entity *nodes = stkIo.bulk_data().begin_nodes(elements[i]); - double exc = 0, eyc = 0, ezc = 0; - for(unsigned j=0;j direction = {0,0,0}; - - double *status = stk::mesh::field_data(active_status, elements[i]); - - double *elem_vel = stk::mesh::field_data(velocity, elements[i]); - - elem_vel[0] += gx * time_step; - elem_vel[1] += gy * time_step; - elem_vel[2] += gz * time_step; - - for(unsigned j=0;jyc) - top_half = true; - - direction[0] = node_data[0] - xc; - direction[1] = node_data[1] - xc; - direction[2] = node_data[2] - xc; - double mag = sqrt(direction[0]*direction[0] + direction[1]*direction[1] + direction[2]*direction[2]); - direction[0] /= mag; - direction[1] /= mag; - direction[2] /= mag; - } - } - - if (are_any_nodes_in_contact) - { - double vel_mag = sqrt(elem_vel[0]*elem_vel[0] + elem_vel[1]*elem_vel[1]); - - if(direction[1]<0) - direction[1] *=-1; - - double coeff_restitution = 1.2; - if(top_half) - coeff_restitution = 1.1; - - *status = 0; - elem_vel[0] = coeff_restitution*vel_mag*direction[0]; - elem_vel[1] = coeff_restitution*vel_mag*direction[1]; - - if(left_half) - continue; -// elem_vel[1] = -coeff_restitution*elem_vel[1]; -// if(left_half) -// elem_vel[0] = -coeff_restitution*elem_vel[0]; - } - else - { - *status = 1; - } - } - - stkIo.begin_output_step(fh, time); - stkIo.write_defined_output_fields(fh); - stkIo.end_output_step(fh); - } - } -} - -TEST_F(TOSDTWD, expand_mesh) -{ - std::string temp_name = "temp_abc.g"; - - { - std::string exodusFileName = stk::unit_test_util::get_option("-i", "generated:10x10x10"); - setup_mesh(exodusFileName, stk::mesh::BulkData::NO_AUTO_AURA); - stk::mesh::MetaData newMetaData; - stk::mesh::BulkData newBulkData(newMetaData, get_bulk().parallel()); - disconnectMesh(get_meta(), get_bulk(), get_meta().universal_part(), newMetaData, newBulkData); - - stk::io::write_mesh_with_fields(temp_name, newBulkData, get_num_steps(), get_max_time()); - } - - { - stk::io::StkMeshIoBroker stkIo(get_comm()); - stkIo.add_mesh_database(temp_name, stk::io::READ_MESH); - stkIo.create_input_mesh(); - stkIo.add_all_mesh_fields_as_input_fields(); - - typedef stk::mesh::Field CoordFieldType; - CoordFieldType& dispField = stkIo.meta_data().declare_field(stk::topology::NODE_RANK, "disp"); - stk::mesh::put_field_on_mesh(dispField, stkIo.meta_data().universal_part(), nullptr); - - stkIo.populate_bulk_data(); - - int numSteps = stkIo.get_num_time_steps(); - std::cerr << "Num steps = " << numSteps << std::endl; - double maxTime = 0; - if(numSteps>0) - { - stkIo.read_defined_input_fields(numSteps); - maxTime = stkIo.get_max_time(); - } - - std::string results_name = stk::unit_test_util::get_option("-o", "output_results.g"); - size_t fh = stkIo.create_output_mesh(results_name, stk::io::WRITE_RESULTS); - - const stk::mesh::FieldVector fields = stkIo.bulk_data().mesh_meta_data().get_fields(); - for(stk::mesh::FieldBase* field : fields) - { - const Ioss::Field::RoleType* fieldRole = stk::io::get_field_role(*field); - if(fieldRole != nullptr && *fieldRole == Ioss::Field::TRANSIENT) - stkIo.add_field(fh, *field); - } - - stkIo.add_field(fh, dispField); /*@\label{io:results:add_field}*/ - - stkIo.write_output_mesh(fh); - - std::vector elements; - stk::mesh::get_entities(stkIo.bulk_data(), stk::topology::ELEM_RANK, elements); - - CoordFieldType *coords = stkIo.meta_data().get_field(stk::topology::NODE_RANK, "coordinates"); - - stk::mesh::PartVector elementBlocks; - const stk::mesh::PartVector parts = stkIo.meta_data().get_parts(); - for(size_t i=0;i > element_centroid(elements.size()); - std::vector > part_centroid(elementBlocks.size()); - for(size_t i=0;i num_elements_in_part(elementBlocks.size(), 0); - - for(size_t i = 0; i < elements.size(); i++) - { - unsigned num_nodes = stkIo.bulk_data().num_nodes(elements[i]); - const stk::mesh::Entity *nodes = stkIo.bulk_data().begin_nodes(elements[i]); - double exc = 0, eyc = 0, ezc = 0; - for(unsigned j = 0; j < num_nodes; ++j) - { - double *node_data = stk::mesh::field_data(*coords, nodes[j]); - exc += node_data[0]; - eyc += node_data[1]; - ezc += node_data[2]; - } - - exc /= num_nodes; - eyc /= num_nodes; - ezc /= num_nodes; - xc += exc; - yc += eyc; - zc += ezc; - element_centroid[i].resize(3); - element_centroid[i][0] = exc; - element_centroid[i][1] = eyc; - element_centroid[i][2] = ezc; - - for(size_t j=0;j0) - { - part_centroid[j][0] = part_centroid[j][0] / num_elements_in_part[j] - xc; - part_centroid[j][1] = part_centroid[j][1] / num_elements_in_part[j] - yc; - part_centroid[j][2] = part_centroid[j][2] / num_elements_in_part[j] - zc; - } - } - - xc /= elements.size(); - yc /= elements.size(); - zc /= elements.size(); - - for(size_t i = 0; i < element_centroid.size(); ++i) - { - element_centroid[i][0] -= xc; - element_centroid[i][1] -= yc; - element_centroid[i][2] -= zc; - } - - std::cerr << "(x,y,z) centroid = (" << xc << ", " << yc << ", " << zc << ")\n"; - - double time = maxTime; - double scalar = 10; - - std::vector> direct(elementBlocks.size()); - for(size_t i=0;i direction = {0, 0, 0}; - for(unsigned j = 0; j < num_nodes; ++j) - { - double *disp = stk::mesh::field_data(dispField, nodes[j]); - for(size_t k=0;k &oldToNewEntityMap, - stk::mesh::MetaData &newMeta, - const stk::mesh::BulkData& newBulkData, - const stk::mesh::EntityVector &node_in_old_mesh) -{ - const stk::mesh::FieldVector &oldFields = oldMeta.get_fields(); - const stk::mesh::FieldVector &newFields = newMeta.get_fields(); - for(stk::mesh::EntityRank rank = stk::topology::EDGE_RANK; rank <= stk::topology::ELEMENT_RANK; rank++) - { - const stk::mesh::BucketVector &buckets = oldBulkData.get_buckets(rank, subMeshSelector); - for(size_t i = 0; i < buckets.size(); i++) - { - stk::mesh::Bucket &bucket = *buckets[i]; - for(size_t k = 0; k < oldFields.size(); k++) - { - if(bucket.field_data_is_allocated(*oldFields[k])) - { - for(size_t j = 0; j < bucket.size(); j++) - { - stk::mesh::Entity oldEntity = bucket[j]; - const stk::mesh::EntityKey oldKey = oldBulkData.entity_key(oldEntity); - // stk::mesh::Entity newEntity = oldToNewEntityMap.find(oldEntity)->second; - stk::mesh::Entity newEntity = newBulkData.get_entity(oldKey); - void *oldData = stk::mesh::field_data(*oldFields[k], oldEntity); - void *newData = stk::mesh::field_data(*newFields[k], newEntity); - memcpy(newData, oldData, stk::mesh::field_bytes_per_entity(*oldFields[k], oldEntity)); - } - } - } - } - } - - const stk::mesh::BucketVector &buckets = newBulkData.get_buckets(stk::topology::NODE_RANK, subMeshSelector); - for(size_t i = 0; i < buckets.size(); i++) - { - stk::mesh::Bucket &bucket = *buckets[i]; - for(size_t k = 0; k < newFields.size(); k++) - { - if(bucket.field_data_is_allocated(*newFields[k])) - { - for(size_t j = 0; j < bucket.size(); j++) - { - stk::mesh::Entity newEntity = bucket[j]; - stk::mesh::Entity oldEntity = node_in_old_mesh[newBulkData.identifier(newEntity)-1]; - void *oldData = stk::mesh::field_data(*oldFields[k], oldEntity); - void *newData = stk::mesh::field_data(*newFields[k], newEntity); - memcpy(newData, oldData, stk::mesh::field_bytes_per_entity(*oldFields[k], oldEntity)); - } - } - } - } -} - - -stk::mesh::PartVector getNewPartVectorFromOldPartVector(stk::mesh::MetaData &oldMeta, stk::mesh::MetaData &newMeta, const stk::mesh::PartVector& oldParts) -{ - stk::mesh::PartVector allOldParts = oldMeta.get_parts(); - stk::mesh::PartVector allNewParts = newMeta.get_parts(); - - unsigned counter = 0; - stk::mesh::PartVector newParts(oldParts.size()); - for(stk::mesh::Part* oldPart : oldParts) - { - stk::mesh::Ordinal ord = oldPart->mesh_meta_data_ordinal(); - stk::mesh::Part *part = allNewParts[ord]; - newParts[counter++] = part; - } - - return newParts; -} - -void disconnectMesh( stk::mesh::MetaData &oldMeta, - stk::mesh::BulkData& oldBulkData, - stk::mesh::Selector subMeshSelector, - stk::mesh::MetaData &newMeta, - stk::mesh::BulkData &newBulkData) -{ - stk::tools::copy_meta_with_io_attributes(oldMeta, newMeta); - - const stk::mesh::PartVector &allOldparts = oldMeta.get_mesh_parts(); - const stk::mesh::PartVector &allNewparts = newMeta.get_mesh_parts(); - ThrowRequireMsg(allOldparts.size() == allNewparts.size(), "Error. Contact support."); - - std::map oldToNewEntityMap; - - stk::mesh::EntityVector node_in_old_mesh; - stk::mesh::EntityVector elementsFromOldBulkData; - stk::mesh::get_selected_entities(oldMeta.locally_owned_part(), oldBulkData.buckets(stk::topology::ELEM_RANK), elementsFromOldBulkData); - size_t num_nodes_needed = 0; - for(stk::mesh::Entity element : elementsFromOldBulkData ) - { - unsigned num_nodes_this_element = oldBulkData.num_nodes(element); - const stk::mesh::Entity* nodes = oldBulkData.begin_nodes(element); - num_nodes_needed += num_nodes_this_element; - for(unsigned int i=0;i num_nodes_needed_per_proc_local(oldBulkData.parallel_size(),0); - num_nodes_needed_per_proc_local[oldBulkData.parallel_rank()] = num_nodes_needed; - std::vector num_nodes_needed_per_proc(oldBulkData.parallel_size(),0); - stk::all_reduce_sum(oldBulkData.parallel(), num_nodes_needed_per_proc_local.data(), num_nodes_needed_per_proc.data(), num_nodes_needed_per_proc.size()); - - size_t offset_this_proc = 0; - for(int i=0;i > elemSides(sides.size()); - - for(size_t i=0;i(ords[0])); - } - - newBulkData.modification_begin(); - - for(size_t i=0;i - -#include -#include -#include -#include -#include -#include - -#include - -#include "TetFixture.hpp" - -TEST_F(DGTetFixture, tet) -{ - std::vector tet_conn = { - {1, 2, 3, 4}, // id 1 - {2, 3, 4, 5} // id 2 - }; - - std::vector< std::vector > node_coords= { - {0, 0, 0}, // 1 - {1, 0, 0}, // 2 - {0, 1, 0}, // 3 - {0.5, 0.5, 1.0}, // 6...just kidding, it's 4 - {1.0, 1.0, 1.0} - }; - - setup_mesh(tet_conn, node_coords); - - stk::io::write_mesh("mike.g", get_bulk()); - - ////////////////////////////////////////////////////////////////////////////////////// - - stk::mesh::EntityVector elements; - stk::mesh::get_selected_entities(get_meta().locally_owned_part(), get_bulk().buckets(stk::topology::ELEM_RANK), elements); - - std::cerr << "num elements: " << elements.size() << std::endl; - - stk::mesh::create_exposed_block_boundary_sides(get_bulk(), get_meta().locally_owned_part(), {get_skin_part()}); - - unsigned num_faces = get_bulk().num_faces(elements[0]); - const stk::mesh::Entity* faces = get_bulk().begin_faces(elements[0]); - - std::cerr << "num faces: " << num_faces << std::endl; - - for(unsigned i=0;i(stk::mesh::field_data(*get_coord_field(), nodes[j])); - std::cerr << "Has coordinates: " << nodeCoord[0] << " " << nodeCoord[1] << " " << nodeCoord[2] << std::endl; - } - } -} - diff --git a/packages/stk/stk_learning/ForEachEntityLoops/UnitTestForEntityFunctions.cpp b/packages/stk/stk_learning/ForEachEntityLoops/UnitTestForEntityFunctions.cpp deleted file mode 100644 index 259da5f2bfdf..000000000000 --- a/packages/stk/stk_learning/ForEachEntityLoops/UnitTestForEntityFunctions.cpp +++ /dev/null @@ -1,1968 +0,0 @@ -#include -#include -#include -#include -#include // for ParallelMachine, etc -#include -#include -#include // for BulkData, etc -#include "stk_mesh/base/MetaData.hpp" // for MetaData, entity_rank_names, etc -#include "stk_mesh/base/Field.hpp" -#include -#include -#include "stk_io/StkMeshIoBroker.hpp" -#ifdef _OPENMP -#include -#endif - -namespace -{ - - //BEGIN_INHERITANCE_BASE - struct AlgorithmPerEntity - { - virtual void run_on_entity(const stk::mesh::BulkData& mesh, stk::mesh::Entity entity) = 0; - }; - //END_INHERITANCE_BASE - -struct AlgorithmPerCommunicatedEntity -{ - virtual void run_on_entity(const stk::mesh::BulkData& mesh, stk::mesh::Entity entity, const std::vector &comm_procs) = 0; -}; - -class BulkDataForEntityTester : public stk::mesh::BulkData -{ -public: - BulkDataForEntityTester(stk::mesh::MetaData &mesh_meta_data, MPI_Comm comm) : - stk::mesh::BulkData(mesh_meta_data, comm) - { - } - virtual ~BulkDataForEntityTester() - { - } - - void for_each_entity_run(stk::topology::rank_t rank, AlgorithmPerEntity &functor) - { - for_each_selected_entity_run(rank, mesh_meta_data().universal_part(), functor); - } - void for_each_selected_entity_run(stk::topology::rank_t rank, const stk::mesh::Selector &selector, AlgorithmPerEntity &functor) - { - const stk::mesh::BucketVector & buckets = this->get_buckets(rank, selector); - for(stk::mesh::Bucket *bucket : buckets) - { - for(stk::mesh::Entity entity : *bucket) - { - functor.run_on_entity(*this, entity); - } - } - } - - void for_each_node_run(AlgorithmPerEntity &functor) - { - for_each_entity_run(stk::topology::NODE_RANK, functor); - } - - void for_each_element_run(AlgorithmPerEntity &functor) - { - for_each_entity_run(stk::topology::ELEMENT_RANK, functor); - } - - void for_each_selected_element_run(const stk::mesh::Selector &selector, AlgorithmPerEntity &functor) - { - for_each_selected_entity_run(stk::topology::ELEMENT_RANK, selector, functor); - } - - void for_communicated_entities_run(AlgorithmPerCommunicatedEntity &algorithm) const - { - std::vector comm_procs; - stk::mesh::EntityCommListInfoVector::const_iterator iter = internal_comm_list().begin(), - iend = internal_comm_list().end(); - for(; iter != iend; ++iter) - { - stk::mesh::Entity entity = iter->entity; - - comm_procs.clear(); - const stk::mesh::EntityCommInfoVector& infovec = iter->entity_comm->comm_map; - stk::mesh::PairIterEntityComm ec(infovec.begin(), infovec.end()); - for(; !ec.empty(); ++ec) - { - comm_procs.push_back(ec->proc); - } - - algorithm.run_on_entity(*this, entity, comm_procs); - } - } -}; - -class BulkDataForEntityTemplatedTester : public stk::mesh::BulkData -{ -public: - BulkDataForEntityTemplatedTester(stk::mesh::MetaData &mesh_meta_data, MPI_Comm comm) : - stk::mesh::BulkData(mesh_meta_data, comm) - { - } - virtual ~BulkDataForEntityTemplatedTester() - { - } - - template - void for_each_entity_run(stk::topology::rank_t rank, const ALGORITHM_PER_ENTITY &functor) - { - for_each_selected_entity_run(rank, mesh_meta_data().universal_part(), functor); - } - - template - void for_each_selected_entity_run(stk::topology::rank_t rank, const stk::mesh::Selector &selector, const ALGORITHM_PER_ENTITY &functor) - { - const stk::mesh::BucketVector & buckets = this->get_buckets(rank, selector); - const size_t numBuckets = buckets.size(); -#ifdef _OPENMP -#pragma omp parallel for -#endif - for(size_t bucketI = 0; bucketI < numBuckets; ++bucketI) - { - stk::mesh::Bucket *bucket = buckets[bucketI]; - for(size_t entityI=0; entityIsize(); entityI++) - { - stk::mesh::Entity entity = (*bucket)[entityI]; - - const unsigned numNodesThisEntity = bucket->num_nodes(entityI); - const stk::mesh::Entity* nodes = bucket->begin_nodes(entityI); - functor(*this, entity, stk::mesh::MeshIndex({bucket,entityI}), numNodesThisEntity, nodes); - } - } - } - - template - void for_each_node_run(const ALGORITHM_PER_ENTITY &functor) - { - for_each_entity_run(stk::topology::NODE_RANK, functor); - } - - template - void for_each_element_run(const ALGORITHM_PER_ENTITY &functor) - { - for_each_entity_run(stk::topology::ELEMENT_RANK, functor); - } - - template - void for_each_selected_element_run(const stk::mesh::Selector &selector, const ALGORITHM_PER_ENTITY &functor) - { - for_each_selected_entity_run(stk::topology::ELEMENT_RANK, selector, functor); - } - - template - void for_each_node_run_and_sum(REDUCTION_VAR &reductionVar, const ALGORITHM_PER_ENTITY &functor) - { - REDUCTION_VAR localVarToReduceInto = reductionVar; - const stk::mesh::BucketVector & buckets = this->buckets(stk::topology::NODE_RANK); - const size_t numBuckets = buckets.size(); -#ifdef _OPENMP -#pragma omp parallel for reduction(+:localVarToReduceInto) -#endif - for(size_t bucketI=0; bucketI < numBuckets; ++bucketI) - { - stk::mesh::Bucket *bucket = buckets[bucketI]; - for(size_t entityI=0; entityIsize(); entityI++) - { - stk::mesh::Entity entity = (*bucket)[entityI]; - - const unsigned numNodesThisEntity = bucket->num_nodes(entityI); - const stk::mesh::Entity* nodes = bucket->begin_nodes(entityI); - functor(localVarToReduceInto, *this, entity, stk::mesh::MeshIndex({bucket,entityI}), numNodesThisEntity, nodes); - } - } - reductionVar = localVarToReduceInto; - } - - template - void for_each_entity_run_non_threadsafe(stk::topology::rank_t rank, const ALGORITHM_PER_ENTITY &functor) - { - //BEGIN_TEMPLATED_FOR_EACH_ENTITY - const stk::mesh::BucketVector & buckets = this->buckets(rank); - for(size_t j=0; jsize(); i++) - { - stk::mesh::Entity entity = (*bucket)[i]; - - const unsigned numNodesThisEntity = bucket->num_nodes(i); - const stk::mesh::Entity* nodes = bucket->begin_nodes(i); - functor(*this, entity, stk::mesh::MeshIndex({bucket,i}), numNodesThisEntity, nodes); - } - } - //END_TEMPLATED_FOR_EACH_ENTITY - } - - template - void for_each_node_run_non_threadsafe(const ALGORITHM_PER_ENTITY &functor) - { - for_each_entity_run_non_threadsafe(stk::topology::NODE_RANK, functor); - } - - template - void for_each_element_run_non_threadsafe(const ALGORITHM_PER_ENTITY &functor) - { - for_each_entity_run_non_threadsafe(stk::topology::ELEMENT_RANK, functor); - } - - void initialize_fast_entity_access() - { - mFastNumNodes.resize(m_entity_keys.size()); - mFastBeginNodes.resize(m_entity_keys.size()); - // MUST call non_threadsafe version because BulkData entity access has debug checks that - // are not thread safe because they set member data to avoid an infinite recursion. - for_each_element_run_non_threadsafe( - [this](stk::mesh::BulkData &mesh, stk::mesh::Entity element, stk::mesh::MeshIndex meshIndex, ...) - { - mFastNumNodes[element.local_offset()] = mesh.num_nodes(element); - mFastBeginNodes[element.local_offset()] = mesh.begin_nodes(element); - } - ); - } - - unsigned fast_num_nodes(stk::mesh::Entity entity) const - { - return mFastNumNodes[entity.local_offset()]; - } - - const stk::mesh::Entity * fast_begin_nodes(stk::mesh::Entity entity) const - { - return mFastBeginNodes[entity.local_offset()]; - } - -private: - std::vector mFastNumNodes; - std::vector mFastBeginNodes; -}; - - - - - //BEGIN_INHERITANCE_DERIVED - struct CountNumNodesAlgorithm : public AlgorithmPerEntity - { - CountNumNodesAlgorithm(unsigned &numNodes) : - mNumNodes(numNodes) - { - } - virtual void run_on_entity(const stk::mesh::BulkData& mesh, stk::mesh::Entity entity) - { - if(mesh.is_valid(entity)) - { - mNumNodes++; - } - } - unsigned &mNumNodes; - }; - //END_INHERITANCE_DERIVED - -TEST(ForEntityFunction, test_for_each_node_run_using_inherited_functor) -{ - MPI_Comm communicator = MPI_COMM_WORLD; - if(stk::parallel_machine_size(communicator) == 2) - { - const int spatialDim = 3; - stk::mesh::MetaData metaData(spatialDim); - BulkDataForEntityTester bulkData(metaData, communicator); - - std::string generatedMeshSpec = "generated:1x1x4"; - stk::io::fill_mesh(generatedMeshSpec, bulkData); - - //BEGIN_INHERITANCE_USAGE_EXAMPLE - unsigned numNodes = 0; - CountNumNodesAlgorithm countNumNodesAlgorithm(numNodes); - bulkData.for_each_node_run(countNumNodesAlgorithm); - //END_INHERITANCE_USAGE_EXAMPLE - - EXPECT_EQ(16u, numNodes); - } -} - -TEST(ForEntityFunction, test_for_each_node_run_using_lambda) -{ - MPI_Comm communicator = MPI_COMM_WORLD; - if(stk::parallel_machine_size(communicator) == 2) - { - const int spatialDim = 3; - stk::mesh::MetaData metaData(spatialDim); - BulkDataForEntityTemplatedTester bulkData(metaData, communicator); - - std::string generatedMeshSpec = "generated:1x1x4"; - stk::io::fill_mesh(generatedMeshSpec, bulkData); - - //BEGIN_LAMBDA_USAGE_EXAMPLE - unsigned numNodes = 0; - bulkData.for_each_node_run_non_threadsafe( - [&numNodes](const stk::mesh::BulkData& mesh, stk::mesh::Entity node, stk::mesh::MeshIndex meshIndex, ...) - { - if(mesh.is_valid(node) ) - { - ++numNodes; - } - } - ); - //END_LAMBDA_USAGE_EXAMPLE - - EXPECT_EQ(16u, numNodes); - } -} - -TEST(ForEntityFunction, test_counting_nodes_using_raw_bucket_loops) -{ - MPI_Comm communicator = MPI_COMM_WORLD; - if(stk::parallel_machine_size(communicator) == 2) - { - const int spatialDim = 3; - stk::mesh::MetaData metaData(spatialDim); - BulkDataForEntityTester bulkData(metaData, communicator); - - std::string generatedMeshSpec = "generated:1x1x4"; - stk::io::fill_mesh(generatedMeshSpec, bulkData); - - //BEGIN_RAW_LOOP_USAGE_EXAMPLE - unsigned numNodes = 0; - const stk::mesh::BucketVector & buckets = bulkData.get_buckets(stk::topology::NODE_RANK, metaData.universal_part()); - const size_t numBuckets = buckets.size(); - for(size_t iBucket = 0; iBucket < numBuckets; iBucket++) - { - stk::mesh::Bucket & bucket = *buckets[iBucket]; - const unsigned numEntitiesInBucket = bucket.size(); - for(unsigned iEntity = 0; iEntity < numEntitiesInBucket; iEntity++) - { - stk::mesh::Entity entity = bucket[iEntity]; - if(bulkData.is_valid(entity)) - { - numNodes++; - } - } - } - //END_RAW_LOOP_USAGE_EXAMPLE - - EXPECT_EQ(16u, numNodes); - } -} - - - - - - - - -struct CountNumCommunicatedEntitiesAlgorithm : public AlgorithmPerCommunicatedEntity -{ - CountNumCommunicatedEntitiesAlgorithm(size_t &numCommunicatedEntities) : - mNumCommunicatedEntities(numCommunicatedEntities) - { - } - virtual void run_on_entity(const stk::mesh::BulkData& mesh, stk::mesh::Entity entity, const std::vector &comm_procs) - { - mNumCommunicatedEntities++; - } - size_t &mNumCommunicatedEntities; -}; - -struct FillCommProcsAlgorithm : public AlgorithmPerCommunicatedEntity -{ - FillCommProcsAlgorithm(std::vector &commProcs) : - mCommProcs(commProcs) - { - } - virtual void run_on_entity(const stk::mesh::BulkData& mesh, stk::mesh::Entity entity, const std::vector &comm_procs) - { - for(size_t i = 0; i < comm_procs.size(); i++) - { - mCommProcs.push_back(comm_procs[i]); - } - } - std::vector &mCommProcs; -}; - -TEST(ForEntityFunction, test_for_communicated_entities_run) -{ - MPI_Comm communicator = MPI_COMM_WORLD; - if(stk::parallel_machine_size(communicator) == 2) - { - const int spatialDim = 3; - stk::mesh::MetaData metaData(spatialDim); - BulkDataForEntityTester bulkData(metaData, communicator); - - std::string generatedMeshSpec = "generated:1x1x4"; - stk::io::fill_mesh(generatedMeshSpec, bulkData); - - size_t numCommunicatedEntities = 0; - CountNumCommunicatedEntitiesAlgorithm countNumCommunicatedEntitiesAlgorithm(numCommunicatedEntities); - bulkData.for_communicated_entities_run(countNumCommunicatedEntitiesAlgorithm); - - size_t numSharedNodes = 4; - size_t numSendAuraNodes = 4; - size_t numRecvAuraNodes = 4; - size_t numSendAuraElems = 1; - size_t numRecvAuraElems = 1; - size_t numExpectedCommunicatedEntities = numSharedNodes + numSendAuraNodes + numRecvAuraNodes + numSendAuraElems - + numRecvAuraElems; - EXPECT_EQ(numExpectedCommunicatedEntities, numCommunicatedEntities); - - std::vector commProcs; - FillCommProcsAlgorithm fillCommProcs(commProcs); - bulkData.for_communicated_entities_run(fillCommProcs); - - ASSERT_EQ(numExpectedCommunicatedEntities, commProcs.size()); - int otherProc = 1 - stk::parallel_machine_rank(communicator); - for(size_t i = 0; i < commProcs.size(); i++) - { - EXPECT_EQ(otherProc, commProcs[i]); - } - } -} - - - - - - - - - - - - -struct CountNumNodesAlgorithmFunctor -{ - CountNumNodesAlgorithmFunctor(unsigned &numNodes) : mNumNodes(numNodes) {} - void operator()(const stk::mesh::BulkData& mesh, stk::mesh::Entity node, stk::mesh::MeshIndex meshIndex, ...) const - { - if(mesh.is_valid(node)) - { - mNumNodes++; - } - } - unsigned &mNumNodes; -}; - -struct CountNumNodesAlgorithmFunctorWithSum -{ - void operator()(unsigned &numNodes, const stk::mesh::BulkData& mesh, stk::mesh::Entity node, stk::mesh::MeshIndex meshIndex, ...) const - { - if(mesh.is_valid(node)) - { - numNodes++; - } - } -}; - -TEST(ForEntityFunction, test_for_each_node_run_using_templates) -{ - MPI_Comm communicator = MPI_COMM_WORLD; - if(stk::parallel_machine_size(communicator) == 2) - { - const int spatialDim = 3; - stk::mesh::MetaData metaData(spatialDim); - BulkDataForEntityTemplatedTester bulkData(metaData, communicator); - - std::string generatedMeshSpec = "generated:1x1x4"; - stk::io::fill_mesh(generatedMeshSpec, bulkData); - - unsigned numNodes = 0; - CountNumNodesAlgorithmFunctorWithSum countNumNodesAlgorithm; - bulkData.for_each_node_run_and_sum(numNodes, countNumNodesAlgorithm); - - EXPECT_EQ(16u, numNodes); - } -} - -TEST(ForEntityFunction, test_for_each_node_run_using_templates_and_lambdas) -{ - MPI_Comm communicator = MPI_COMM_WORLD; - if(stk::parallel_machine_size(communicator) == 2) - { - const int spatialDim = 3; - stk::mesh::MetaData metaData(spatialDim); - BulkDataForEntityTemplatedTester bulkData(metaData, communicator); - - std::string generatedMeshSpec = "generated:1x1x4"; - stk::io::fill_mesh(generatedMeshSpec, bulkData); - - unsigned numNodes = 0; - bulkData.for_each_node_run_and_sum(numNodes, - [](unsigned &numNodes, const stk::mesh::BulkData &mesh, stk::mesh::Entity node, stk::mesh::MeshIndex meshIndex, ...) - { - ++numNodes; - } - ); - - EXPECT_EQ(16u, numNodes); - } -} - - - - - - - - - -void put_locally_owned_elements_into_active_part(stk::mesh::BulkData &bulkData, stk::mesh::Part &activePart) -{ - stk::mesh::EntityVector locallyOwnedElements; - stk::mesh::get_selected_entities(bulkData.mesh_meta_data().locally_owned_part(), bulkData.buckets(stk::topology::ELEMENT_RANK), locallyOwnedElements); - std::vector partAdditionsPerElement(locallyOwnedElements.size(), stk::mesh::PartVector(1,&activePart)); - std::vector partRemovalsPerElement(locallyOwnedElements.size()); - bulkData.batch_change_entity_parts(locallyOwnedElements, partAdditionsPerElement, partRemovalsPerElement); -} -void take_killed_elements_out_of_active_part(stk::mesh::BulkData &bulkData, - const stk::mesh::EntityVector &elementsToKill, - stk::mesh::Part &activePart) -{ - std::vector partAdditionsPerElement(elementsToKill.size()); - std::vector partRemovalsPerElement(elementsToKill.size(), stk::mesh::PartVector(1,&activePart)); - bulkData.batch_change_entity_parts(elementsToKill, partAdditionsPerElement, partRemovalsPerElement); - for(size_t i=0; i &deathCriterionField) : - mDeathCriterionField(deathCriterionField) - { - } - virtual void run_on_entity(const stk::mesh::BulkData& mesh, stk::mesh::Entity entity) - { - double *deathCriterion = stk::mesh::field_data(mDeathCriterionField, entity); - *deathCriterion = static_cast(mesh.identifier(entity)); - } - stk::mesh::Field &mDeathCriterionField; -}; -struct ElementDeathFindElementsToKillAlgorithm : public AlgorithmPerEntity -{ - ElementDeathFindElementsToKillAlgorithm(const stk::mesh::Field &deathCriterionField, - double deathThreshold, - stk::mesh::EntityVector &elementsToKill) : - mDeathCriterionField(deathCriterionField), - mDeathThreshold(deathThreshold), - mElementsToKill(elementsToKill) - { - } - virtual void run_on_entity(const stk::mesh::BulkData& mesh, stk::mesh::Entity element) - { - const double *deathCriterion = stk::mesh::field_data(mDeathCriterionField, element); - if(*deathCriterion > mDeathThreshold) - { - mElementsToKill.push_back(element); - } - } - const stk::mesh::Field &mDeathCriterionField; - double mDeathThreshold; - stk::mesh::EntityVector &mElementsToKill; -}; -TEST(ForEntityFunction, test_element_death_using_inheritance) -{ - MPI_Comm communicator = MPI_COMM_WORLD; - if(stk::parallel_machine_size(communicator) == 2) - { - const int spatialDim = 3; - stk::mesh::MetaData metaData(spatialDim); - stk::mesh::Part &activePart = metaData.declare_part("active", stk::topology::ELEMENT_RANK); - auto &deathCriterionField = metaData.declare_field >(stk::topology::ELEMENT_RANK, "deathCriterion"); - double initialDeathValue = 0.0; - stk::mesh::put_field_on_mesh(deathCriterionField, metaData.universal_part(), &initialDeathValue); - BulkDataForEntityTester bulkData(metaData, communicator); - - std::string generatedMeshSpec = "generated:2x2x2"; - stk::io::fill_mesh(generatedMeshSpec, bulkData); - put_locally_owned_elements_into_active_part(bulkData, activePart); - - - SetFieldDataEqualToIdentifierAlgorithm setFieldDataEqualToIdentifierAlgorithm(deathCriterionField); - bulkData.for_each_element_run(setFieldDataEqualToIdentifierAlgorithm); - - const double deathThreshold = 6.5; - stk::mesh::EntityVector elementsToKill; - ElementDeathFindElementsToKillAlgorithm findElementsToKillAlgorithm(deathCriterionField, deathThreshold, elementsToKill); - bulkData.for_each_selected_element_run(metaData.locally_owned_part(), findElementsToKillAlgorithm); - - if(bulkData.parallel_rank() == 0) - { - ASSERT_TRUE(elementsToKill.empty()); - } - else - { - ASSERT_EQ(2u, elementsToKill.size()); - EXPECT_EQ(7u, bulkData.identifier(elementsToKill[0])); - EXPECT_EQ(8u, bulkData.identifier(elementsToKill[1])); - } - - take_killed_elements_out_of_active_part(bulkData, elementsToKill, activePart); - } -} - -TEST(ForEntityFunction, test_element_death_using_lambdas) -{ - MPI_Comm communicator = MPI_COMM_WORLD; - if(stk::parallel_machine_size(communicator) == 2) - { - const int spatialDim = 3; - stk::mesh::MetaData metaData(spatialDim); - stk::mesh::Part &activePart = metaData.declare_part("active", stk::topology::ELEMENT_RANK); - auto &deathCriterionField = metaData.declare_field >(stk::topology::ELEMENT_RANK, "deathCriterion"); - double initialDeathValue = 0.0; - stk::mesh::put_field_on_mesh(deathCriterionField, metaData.universal_part(), &initialDeathValue); - BulkDataForEntityTemplatedTester bulkData(metaData, communicator); - - std::string generatedMeshSpec = "generated:2x2x2"; - stk::io::fill_mesh(generatedMeshSpec, bulkData); - put_locally_owned_elements_into_active_part(bulkData, activePart); - - - bulkData.for_each_element_run( - [&deathCriterionField](const stk::mesh::BulkData& mesh, stk::mesh::Entity element, const stk::mesh::MeshIndex &meshIndex, ...) - { - double *deathCriterion = stk::mesh::field_data(deathCriterionField, *meshIndex.bucket, meshIndex.bucket_ordinal); - *deathCriterion = static_cast(mesh.identifier(element)); - } - ); - - const double deathThreshold = 6.5; - stk::mesh::EntityVector elementsToKill; - bulkData.for_each_selected_element_run(metaData.locally_owned_part(), - [deathThreshold, &deathCriterionField, &elementsToKill](const stk::mesh::BulkData& mesh, - stk::mesh::Entity element, - const stk::mesh::MeshIndex &meshIndex, ...) - { - const double *deathCriterion = stk::mesh::field_data(deathCriterionField, *meshIndex.bucket, meshIndex.bucket_ordinal); - if(*deathCriterion > deathThreshold) - { - elementsToKill.push_back(element); - } - } - ); - - if(bulkData.parallel_rank() == 0) - { - ASSERT_TRUE(elementsToKill.empty()); - } - else - { - ASSERT_EQ(2u, elementsToKill.size()); - EXPECT_EQ(7u, bulkData.identifier(elementsToKill[0])); - EXPECT_EQ(8u, bulkData.identifier(elementsToKill[1])); - } - - put_locally_owned_elements_into_active_part(bulkData, activePart); - } -} - -inline double get_cpu_or_wall_time() -{ -#if defined(_OPENMP) - return stk::wall_time(); -#else - return stk::cpu_time(); -#endif -} - -std::string get_timing_data_for_print(double time, double baselineTime) -{ - std::ostringstream s; - const double ratio = time/baselineTime; - s << time << " (" << ratio << "x)"; - if(ratio < 1.0) - { - s << " (" << 1/ratio << " times faster)"; - } - return s.str(); -} - -#ifdef NDEBUG -const unsigned numTimesToRun = 1e3; -const std::string countNodesMeshSpec = "generated:40x40x40"; -#else -const unsigned numTimesToRun = 10; -const std::string countNodesMeshSpec = "generated:10x10x10"; -#endif - -std::function -get_lambda_that_counts_nodes(unsigned &numNodes) -{ - return [](unsigned &numNodes, const stk::mesh::BulkData& mesh, stk::mesh::Entity node, ...) - { - if(mesh.is_valid(node)) - { - ++numNodes; - } - }; -} - -double test_count_nodes_raw_for_loops(const unsigned numIterations) -{ - MPI_Comm communicator = MPI_COMM_WORLD; - const int spatialDim = 3; - stk::mesh::MetaData metaData(spatialDim); - stk::mesh::BulkData bulkData(metaData, communicator); - - std::string generatedMeshSpec = countNodesMeshSpec; - stk::io::fill_mesh(generatedMeshSpec, bulkData); - - unsigned numNodes = 0; - double startTime = get_cpu_or_wall_time(); - for(unsigned i=0; i - myLambda = - [](unsigned &numNodes, const stk::mesh::BulkData& mesh, stk::mesh::Entity node, ...) - { - if(mesh.is_valid(node)) - { - ++numNodes; - } - }; - bulkData.for_each_node_run_and_sum(numNodes, myLambda); - //END_STD_FUNCTION_EXAMPLE - - double startTime = get_cpu_or_wall_time(); - for(unsigned i=0; i(rank) << (sizeOfbucketId+sizeOfBucketOrdinal) | - static_cast(bucketId) << sizeOfBucketOrdinal | - static_cast(bucketOrdinal); - } - - stk::topology::rank_t get_rank() const - { - return static_cast(m_value >> (sizeOfbucketId+sizeOfBucketOrdinal)); - } - unsigned get_bucket_id() const - { - return static_cast((m_value >> sizeOfBucketOrdinal) & bucketIdMask); - } - unsigned get_bucket_ordinal() const - { - return static_cast(m_value & bucketOrdinalMask); - } -}; - -TEST(ForEntityFunction, new_entity_struct_that_encodes_rank_bucket_id_and_bucket_ordinal) -{ - NewMeshIndex entity; - - const stk::topology::rank_t setRank = stk::topology::FACE_RANK; - const unsigned setBucketId = 2; - const unsigned setBucketOrdinal = 4; - entity.set_entity(setRank, setBucketId, setBucketOrdinal); - - EXPECT_EQ(setRank, entity.get_rank()); - EXPECT_EQ(setBucketId, entity.get_bucket_id()); - EXPECT_EQ(setBucketOrdinal, entity.get_bucket_ordinal()); -} - - - -unsigned count_num_nodes_using_raw_bucket_loops_access_bucket_inside(stk::mesh::BulkData &bulkData) -{ - unsigned numNodes = 0; - for(unsigned i=0; i<2*numTimesToRun; i++) - { - numNodes = 0; - const stk::mesh::BucketVector & buckets = bulkData.get_buckets(stk::topology::ELEMENT_RANK, bulkData.mesh_meta_data().universal_part()); - const size_t numBuckets = buckets.size(); - for(size_t iBucket = 0; iBucket < numBuckets; iBucket++) - { - stk::mesh::Bucket & bucket = *buckets[iBucket]; - const unsigned numEntitiesInBucket = bucket.size(); - for(unsigned iEntity = 0; iEntity < numEntitiesInBucket; iEntity++) - { - stk::topology topology = bucket.topology(); - stk::mesh::Entity entity = bucket[iEntity]; - if(bulkData.is_valid(entity) && topology == stk::topology::HEX_8) - { - for(unsigned j=0; jtopology(); - if(mesh.is_valid(element) && topology == stk::topology::HEX_8) - { - for(unsigned i=0; i &nodeField) -{ - double sum = 0.0; - for(unsigned i=0; i<2*numTimesToRun; i++) - { - sum = 0.0; - const stk::mesh::BucketVector & buckets = bulkData.get_buckets(stk::topology::NODE_RANK, bulkData.mesh_meta_data().universal_part()); - for(stk::mesh::Bucket *bucket : buckets) - { - double *nodeData = stk::mesh::field_data(nodeField, *bucket); - unsigned numScalarsPerEntity = stk::mesh::field_scalars_per_entity(nodeField, *bucket); - for(size_t j=0; jsize(); j++) - { - sum += nodeData[j] * numScalarsPerEntity; - } - } - } - return sum; -} -double access_field_data_using_raw_bucket_loops_access_bucket_inside_with_offset(stk::mesh::BulkData &bulkData, - stk::mesh::Field &nodeField) -{ - double sum = 0.0; - for(unsigned i=0; i<2*numTimesToRun; i++) - { - sum = 0.0; - const stk::mesh::BucketVector & buckets = bulkData.get_buckets(stk::topology::NODE_RANK, bulkData.mesh_meta_data().universal_part()); - for(stk::mesh::Bucket *bucket : buckets) - { - for(size_t j=0; jsize(); j++) - { - double *nodeData = stk::mesh::field_data(nodeField, *bucket, j); - unsigned numScalarsPerEntity = stk::mesh::field_scalars_per_entity(nodeField, *bucket); - sum += *nodeData * numScalarsPerEntity; - } - } - } - return sum; -} -double access_field_data_using_raw_bucket_loops_access_bucket_inside(stk::mesh::BulkData &bulkData, - stk::mesh::Field &nodeField) -{ - double sum = 0.0; - for(unsigned i=0; i<2*numTimesToRun; i++) - { - sum = 0.0; - const stk::mesh::BucketVector & buckets = bulkData.get_buckets(stk::topology::NODE_RANK, bulkData.mesh_meta_data().universal_part()); - for(stk::mesh::Bucket *bucket : buckets) - { - for(stk::mesh::Entity node : *bucket) - { - double *nodeData = stk::mesh::field_data(nodeField, node); - unsigned numScalarsPerEntity = stk::mesh::field_scalars_per_entity(nodeField, node); - sum += *nodeData * numScalarsPerEntity; - } - } - } - return sum; -} -double access_field_data_using_lambda_for_entity_loops(BulkDataForEntityTemplatedTester &bulkData, - stk::mesh::Field &nodeField) -{ - double sum = 0.0; - for(unsigned i=0; i<2*numTimesToRun; i++) - { - //BEGIN_LOOP_ABSTRACTION_WITH_SUM - sum = 0.0; - bulkData.for_each_node_run_and_sum(sum, - [&nodeField](double &sum, const stk::mesh::BulkData& mesh, stk::mesh::Entity node, const stk::mesh::MeshIndex &meshIndex, ...) - { - double *nodeData = stk::mesh::field_data(nodeField, *meshIndex.bucket, meshIndex.bucket_ordinal); - unsigned numScalarsPerEntity = stk::mesh::field_scalars_per_entity(nodeField, *meshIndex.bucket); - sum += *nodeData * numScalarsPerEntity; - } - ); - //END_LOOP_ABSTRACTION_WITH_SUM - } - return sum; -} - -TEST(ForEntityFunction, performance_test_getting_field_values_per_entity) -{ - MPI_Comm communicator = MPI_COMM_WORLD; - if(stk::parallel_machine_size(communicator) == 1) - { - const int spatialDim = 3; - stk::mesh::MetaData metaData(spatialDim); - auto &nodeField = metaData.declare_field >(stk::topology::NODE_RANK, "nodeField"); - const double initValue = 1.0; - stk::mesh::put_field_on_mesh(nodeField, metaData.universal_part(), &initValue); - BulkDataForEntityTemplatedTester bulkData(metaData, communicator); - - std::string generatedMeshSpec = countNodesMeshSpec; - stk::io::fill_mesh(generatedMeshSpec, bulkData); - - double goldSum = static_cast(stk::mesh::count_selected_entities(metaData.universal_part(), bulkData.buckets(stk::topology::NODE_RANK))); - const double tolerance = 1e-12; - double startTime = 0.0; - - - double sum = access_field_data_using_raw_bucket_loops_access_bucket_outside(bulkData, nodeField); - startTime = get_cpu_or_wall_time(); - sum = access_field_data_using_raw_bucket_loops_access_bucket_outside(bulkData, nodeField); - double timeForCallOutsideLoop = get_cpu_or_wall_time() - startTime; - EXPECT_NEAR(goldSum, sum, tolerance); - - sum = access_field_data_using_raw_bucket_loops_access_bucket_inside_with_offset(bulkData, nodeField); - startTime = get_cpu_or_wall_time(); - sum = access_field_data_using_raw_bucket_loops_access_bucket_inside_with_offset(bulkData, nodeField); - double timeForCallInsideLoopWithOffset = get_cpu_or_wall_time() - startTime; - EXPECT_NEAR(goldSum, sum, tolerance); - - sum = access_field_data_using_raw_bucket_loops_access_bucket_inside(bulkData, nodeField); - startTime = get_cpu_or_wall_time(); - sum = access_field_data_using_raw_bucket_loops_access_bucket_inside(bulkData, nodeField); - double timeForCallInsideLoop = get_cpu_or_wall_time() - startTime; - EXPECT_NEAR(goldSum, sum, tolerance); - - sum = access_field_data_using_lambda_for_entity_loops(bulkData, nodeField); - startTime = get_cpu_or_wall_time(); - sum = access_field_data_using_lambda_for_entity_loops(bulkData, nodeField); - double timeForCallingFunctorLoop = get_cpu_or_wall_time() - startTime; - EXPECT_NEAR(goldSum, sum, tolerance); - - std::cerr << " Time for call outside loop: " << get_timing_data_for_print(timeForCallOutsideLoop, timeForCallOutsideLoop) << std::endl; - std::cerr << " Time for call inside loop with offset: " << get_timing_data_for_print(timeForCallInsideLoopWithOffset, timeForCallOutsideLoop) << std::endl; - std::cerr << " Time for call inside loop: " << get_timing_data_for_print(timeForCallInsideLoop, timeForCallOutsideLoop) << std::endl; - std::cerr << " Time for call functor loop: " << get_timing_data_for_print(timeForCallingFunctorLoop, timeForCallOutsideLoop) << std::endl; - } -} - - - - - - -void calculate_acceleration_using_raw_bucket_loops(unsigned numIterations, - stk::mesh::BulkData &bulkData, - stk::mesh::Field &massField, - stk::mesh::Field &forceField, - stk::mesh::Field &accelerationField) -{ - for(unsigned i=0; i 0.0) - { - a_new[3 * j + 0] += f_con[3 * j + 0] / mass[j]; - a_new[3 * j + 1] += f_con[3 * j + 1] / mass[j]; - a_new[3 * j + 2] += f_con[3 * j + 2] / mass[j]; - } - } - } - //END_COUNT_NODES_RAW_FOR_LOOP - } -} -void calculate_acceleration_using_lambda_access_field_using_entity(unsigned numIterations, - BulkDataForEntityTemplatedTester &bulkData, - stk::mesh::Field &massField, - stk::mesh::Field &forceField, - stk::mesh::Field &accelerationField) -{ - for(unsigned i=0; i 0.0) - { - a_new[0] += f_con[0] / *mass; - a_new[1] += f_con[1] / *mass; - a_new[2] += f_con[2] / *mass; - } - } - ); - //END_COUNT_NODES_ENTITY_FUNCTOR_LOOP - } -} -void calculate_acceleration_using_lambda_for_entity_loops(unsigned numIterations, - BulkDataForEntityTemplatedTester &bulkData, - stk::mesh::Field &massField, - stk::mesh::Field &forceField, - stk::mesh::Field &accelerationField) -{ - for(unsigned i=0; i 0.0) - { - a_new[0] += f_con[0] / *mass; - a_new[1] += f_con[1] / *mass; - a_new[2] += f_con[2] / *mass; - } - } - ); - //END_COUNT_NODES_FUNCTOR_LOOP - } -} -void checkAccelerationAndZeroOut(BulkDataForEntityTemplatedTester &bulkData, - stk::mesh::Field &accelerationField, - const double goldAcceleration, - const double tolerance) -{ - bulkData.for_each_node_run( - [goldAcceleration, tolerance, &accelerationField](stk::mesh::BulkData &mesh, stk::mesh::Entity node, - stk::mesh::MeshIndex meshIndex, ...) - { - double *accelerationForNode = stk::mesh::field_data(accelerationField, node); - EXPECT_NEAR(goldAcceleration, accelerationForNode[0], tolerance); - EXPECT_NEAR(goldAcceleration, accelerationForNode[1], tolerance); - EXPECT_NEAR(goldAcceleration, accelerationForNode[2], tolerance); - accelerationForNode[0] = 0.0; - accelerationForNode[1] = 0.0; - accelerationForNode[2] = 0.0; - } - ); -} - -TEST(ForEntityFunction, performance_test_calculate_acceleration) -{ - MPI_Comm communicator = MPI_COMM_WORLD; - if(stk::parallel_machine_size(communicator) == 1) - { - const int spatialDim = 3; - stk::mesh::MetaData metaData(spatialDim); - auto &massField = metaData.declare_field >(stk::topology::NODE_RANK, "massField"); - const double initMass = 2.0; - stk::mesh::put_field_on_mesh(massField, metaData.universal_part(), &initMass); - auto &forceField = metaData.declare_field >(stk::topology::NODE_RANK, "forceField"); - const double initForce[3] = {8.0, 8.0, 8.0}; - stk::mesh::put_field_on_mesh(forceField, metaData.universal_part(), 3, initForce); - auto &accelerationField = metaData.declare_field >(stk::topology::NODE_RANK, "accelerationField"); - const double initAcceleration[3] = {0.0, 0.0, 0.0}; - stk::mesh::put_field_on_mesh(accelerationField, metaData.universal_part(), 3, initAcceleration); - - BulkDataForEntityTemplatedTester bulkData(metaData, communicator); - - std::string generatedMeshSpec = countNodesMeshSpec; - stk::io::fill_mesh(generatedMeshSpec, bulkData); - - unsigned numTimesItRan = 2; - unsigned numIterations = numTimesToRun; - const double goldAcceleration = numTimesItRan * numIterations * initForce[0] / initMass; - const double tolerance = 1e-12; - double startTime = 0.0; - - - calculate_acceleration_using_raw_bucket_loops(numIterations, bulkData, massField, forceField, accelerationField); - startTime = get_cpu_or_wall_time(); - calculate_acceleration_using_raw_bucket_loops(numIterations, bulkData, massField, forceField, accelerationField); - double timeForCallOutsideLoop = get_cpu_or_wall_time() - startTime; - checkAccelerationAndZeroOut(bulkData, accelerationField, goldAcceleration, tolerance); - - calculate_acceleration_using_lambda_access_field_using_entity(numIterations, bulkData, massField, forceField, accelerationField); - startTime = get_cpu_or_wall_time(); - calculate_acceleration_using_lambda_access_field_using_entity(numIterations, bulkData, massField, forceField, accelerationField); - double timeForCallEntityAccessFunctorLoop = get_cpu_or_wall_time() - startTime; - checkAccelerationAndZeroOut(bulkData, accelerationField, goldAcceleration, tolerance); - - calculate_acceleration_using_lambda_for_entity_loops(numIterations, bulkData, massField, forceField, accelerationField); - startTime = get_cpu_or_wall_time(); - calculate_acceleration_using_lambda_for_entity_loops(numIterations, bulkData, massField, forceField, accelerationField); - double timeForCallingFunctorLoop = get_cpu_or_wall_time() - startTime; - checkAccelerationAndZeroOut(bulkData, accelerationField, goldAcceleration, tolerance); - - std::cerr << " Time for call bucket access raw loop: " << get_timing_data_for_print(timeForCallOutsideLoop, timeForCallOutsideLoop) << std::endl; - std::cerr << " Time for call entity access functor loop: " << get_timing_data_for_print(timeForCallEntityAccessFunctorLoop, timeForCallOutsideLoop) << std::endl; - std::cerr << " Time for call mesh index access functor loop: " << get_timing_data_for_print(timeForCallingFunctorLoop, timeForCallOutsideLoop) << std::endl; - } -} - - - - - - -void calculate_center_of_mass_using_bulk_data_api(BulkDataForEntityTemplatedTester &bulkData, - const stk::mesh::FieldBase &coordField, - stk::mesh::Field ¢roidField, - unsigned numIterations) -{ - for(unsigned i=0; i(stk::mesh::field_data(coordField,nodes[j])); - centroid[0] += coordDataForNode[0]; - centroid[1] += coordDataForNode[1]; - centroid[2] += coordDataForNode[2]; - } - } - centroid[0] /= numNodesThisEntity; - centroid[1] /= numNodesThisEntity; - centroid[2] /= numNodesThisEntity; - } - } - } - } -} - -void calculate_center_of_mass_using_bucket_api(BulkDataForEntityTemplatedTester &bulkData, - const stk::mesh::FieldBase &coordField, - stk::mesh::Field ¢roidField, - unsigned numIterations) -{ - for(unsigned i=0; i(stk::mesh::field_data(coordField,nodes[j])); - centroid[0] += coordDataForNode[0]; - centroid[1] += coordDataForNode[1]; - centroid[2] += coordDataForNode[2]; - } - } - centroid[0] /= numNodesThisEntity; - centroid[1] /= numNodesThisEntity; - centroid[2] /= numNodesThisEntity; - } - } - } - } -} - -void calculate_center_of_mass_using_functors(BulkDataForEntityTemplatedTester &bulkData, - const stk::mesh::FieldBase &coordField, - stk::mesh::Field ¢roidField, - unsigned numIterations) -{ - for(unsigned i=0; i(stk::mesh::field_data(coordField,nodes[i])); - centroid[0] += coordDataForNode[0]; - centroid[1] += coordDataForNode[1]; - centroid[2] += coordDataForNode[2]; - } - } - centroid[0] /= numNodesThisEntity; - centroid[1] /= numNodesThisEntity; - centroid[2] /= numNodesThisEntity; - } - } - ); - } -} - -void checkCentroidAndZeroOut(BulkDataForEntityTemplatedTester &bulkData, - stk::mesh::Field ¢roidField) -{ - bulkData.for_each_element_run( - [¢roidField](stk::mesh::BulkData &mesh, stk::mesh::Entity element, stk::mesh::MeshIndex meshIndex, ...) - { - double *centroid = stk::mesh::field_data(centroidField, element); - EXPECT_GT(centroid[0], 0); - EXPECT_GT(centroid[1], 0); - EXPECT_GT(centroid[2], 0); - centroid[0] = 0.0; - centroid[1] = 0.0; - centroid[2] = 0.0; - } - ); -} - -TEST(ForEntityFunction, performance_test_centroid_calculation_using_bucket_accessors_vs_bulk_data_accessors) -{ - MPI_Comm communicator = MPI_COMM_WORLD; - if(stk::parallel_machine_size(communicator) == 1) - { - const int spatialDim = 3; - stk::mesh::MetaData metaData(spatialDim); - auto ¢roidField = metaData.declare_field >(stk::topology::ELEMENT_RANK, "centroidField"); - const double initValue[3] = {0.0, 0.0, 0.0}; - stk::mesh::put_field_on_mesh(centroidField, metaData.universal_part(), 3, initValue); - - BulkDataForEntityTemplatedTester bulkData(metaData, communicator); - - std::string generatedMeshSpec = countNodesMeshSpec; - stk::io::fill_mesh(generatedMeshSpec, bulkData); - - const stk::mesh::FieldBase &coordField = *metaData.coordinate_field(); - - unsigned numIterations = numTimesToRun / 10; - - calculate_center_of_mass_using_bulk_data_api(bulkData, coordField, centroidField, numIterations); - checkCentroidAndZeroOut(bulkData, centroidField); - - - double startTime = 0.0; - - startTime = get_cpu_or_wall_time(); - calculate_center_of_mass_using_bulk_data_api(bulkData, coordField, centroidField, numIterations); - double timeForCallOffBulkData = get_cpu_or_wall_time() - startTime; - checkCentroidAndZeroOut(bulkData, centroidField); - - startTime = get_cpu_or_wall_time(); - calculate_center_of_mass_using_bucket_api(bulkData, coordField, centroidField, numIterations); - double timeForCallOffBucket = get_cpu_or_wall_time() - startTime; - checkCentroidAndZeroOut(bulkData, centroidField); - - startTime = get_cpu_or_wall_time(); - calculate_center_of_mass_using_functors(bulkData, coordField, centroidField, numIterations); - double timeForCallWithFunctor = get_cpu_or_wall_time() - startTime; - checkCentroidAndZeroOut(bulkData, centroidField); - - std::cerr << " Time for call off Bucket: " << get_timing_data_for_print(timeForCallOffBucket, timeForCallOffBucket) << std::endl; - std::cerr << " Time for call off BulkData: " << get_timing_data_for_print(timeForCallOffBulkData, timeForCallOffBucket) << std::endl; - std::cerr << " Time for call with functor: " << get_timing_data_for_print(timeForCallWithFunctor, timeForCallOffBucket) << std::endl; - } -} - - - - - - -unsigned traverse_nodes_using_bucket_api(BulkDataForEntityTemplatedTester &bulkData, - unsigned numIterations) -{ - unsigned numNodes = 0; - for(unsigned i=0; ibegin_nodes(meshIndex.bucket_ordinal); - const unsigned numNodesThisEntity = meshIndex.bucket->num_nodes(meshIndex.bucket_ordinal); - if(mesh.is_valid(element)) - { - for(unsigned i=0; inum_elements(meshIndex.bucket_ordinal); - const stk::mesh::Entity* elements = meshIndex.bucket->begin_elements(meshIndex.bucket_ordinal); - if(mesh.is_valid(node)) - { - for(unsigned i=0; i -void for_each_selected_entity_run(BULK_DATA &mesh, stk::topology::rank_t rank, const stk::mesh::Selector &selector, const ALGORITHM_PER_ENTITY &functor) -{ - const stk::mesh::BucketVector & buckets = mesh.get_buckets(rank, selector); - const size_t numBuckets = buckets.size(); - for(size_t iBucket = 0; iBucket < numBuckets; iBucket++) - { - stk::mesh::Bucket & bucket = *buckets[iBucket]; - const unsigned numEntitiesInBucket = bucket.size(); - for(unsigned iEntity = 0; iEntity < numEntitiesInBucket; iEntity++) - { - stk::mesh::Entity entity = bucket[iEntity]; - functor(mesh, entity, stk::mesh::MeshIndex({&bucket,iEntity})); - } - } -} - -template -void for_each_entity_run(BULK_DATA &mesh, stk::topology::rank_t rank, const ALGORITHM_PER_ENTITY &functor) -{ - for_each_selected_entity_run(mesh, rank, mesh.mesh_meta_data().universal_part(), functor); -} - -template -void for_each_node_run(BULK_DATA &mesh, const ALGORITHM_PER_ENTITY &functor) -{ - for_each_entity_run(mesh, stk::topology::NODE_RANK, functor); -} - -TEST(ForEntityFunction, test_free_function_versions_of_for_each_entity_abstraction) -{ - MPI_Comm communicator = MPI_COMM_WORLD; - if(stk::parallel_machine_size(communicator) == 1) - { - const int spatialDim = 3; - stk::mesh::MetaData metaData(spatialDim); - stk::mesh::BulkData bulkData(metaData, communicator); - - std::string generatedMeshSpec = countNodesMeshSpec; - stk::io::fill_mesh(generatedMeshSpec, bulkData); - - unsigned numNodes = 0; - - for_each_node_run(bulkData, - [&numNodes](stk::mesh::BulkData &mesh, stk::mesh::Entity node, stk::mesh::MeshIndex meshIndex, ...) - { - numNodes++; - } - ); - - unsigned expectedNumNodes= stk::mesh::count_selected_entities(metaData.universal_part(), bulkData.buckets(stk::topology::NODE_RANK)); - EXPECT_EQ(expectedNumNodes, numNodes); - } -} - -} - diff --git a/packages/stk/stk_learning/ForEachEntityLoops/UnitTestLambdaEvaluations.cpp b/packages/stk/stk_learning/ForEachEntityLoops/UnitTestLambdaEvaluations.cpp deleted file mode 100644 index 43e88810e686..000000000000 --- a/packages/stk/stk_learning/ForEachEntityLoops/UnitTestLambdaEvaluations.cpp +++ /dev/null @@ -1,167 +0,0 @@ -#include -#include -#include -#include - -namespace -{ - - -template -void transformOverVector(const std::vector &vecToSum, const FUNC &myFunc) -{ - for(size_t i=0; i -void transformOverVectorWithSum(const std::vector &vecToSum, const FUNC &myFunc, int &sum) -{ - for(size_t i=0; i vec(10, 2); - transformOverVector(vec, myLambda); - - EXPECT_EQ(20, sum); -} - - -TEST(LambdaEvaluation, pass_in_sum) -{ - int sum = 0; - auto myLambda = - [](int x, int &sum) - { - sum += x; - }; - - std::vector vec(10, 2); - transformOverVectorWithSum(vec, myLambda, sum); - - EXPECT_EQ(20, sum); -} - - -class MySumFunctor -{ -public: - MySumFunctor(int &sum): - mSum(sum) - { - } - void operator()(int x) const - { - mSum += x; - } -private: - int &mSum; -}; -TEST(LambdaEvaluation, functor_class) -{ - int sum = 0; - MySumFunctor mySum(sum); - - std::vector vec(10, 2); - transformOverVector(vec, mySum); - - EXPECT_EQ(20, sum); -} - - -void doSum(int x, int &sum) -{ - sum += x; -} -TEST(LambdaEvaluation, function_pass_in_sum) -{ - int sum = 0; - std::vector vec(10, 2); - transformOverVectorWithSum(vec, doSum, sum); - - EXPECT_EQ(20, sum); -} - - -std::function get_my_lambda(int &sum) -{ - return [&sum](int x) - { - sum += x; - }; -} -TEST(LambdaEvaluation, try_returning_lambda) -{ - int sum = 0; - std::vector vec(10, 2); - transformOverVector(vec, get_my_lambda(sum)); - - EXPECT_EQ(20, sum); -} - - -#define STK_LAMBDA [] -#define STK_LAMBDA_USING(...) [__VA_ARGS__] -#define STK_LAMBDA_USING_ALL_LOCALS_BY_VALUE [=] -#define STK_LAMBDA_USING_ALL_LOCALS_BY_REFERENCE [&] -TEST(LambdaEvaluation, pass_in_sum_with_macro) -{ - int sum = 0; - auto myLambda = - STK_LAMBDA(int x, int &sum) - { - sum += x; - }; - - std::vector vec(10, 2); - transformOverVectorWithSum(vec, myLambda, sum); - - EXPECT_EQ(20, sum); -} -TEST(LambdaEvaluation, capture_sum_with_macro) -{ - int sum = 0; - const int extra = 1; - - std::vector vec(10, 2); - transformOverVector(vec, - STK_LAMBDA_USING(&sum)(int x) - { - sum += x + extra; - } - ); - - EXPECT_EQ(30, sum); -} -TEST(LambdaEvaluation, capture_sum_with_capture_all_macro) -{ - int sum = 0; - auto myLambda = - STK_LAMBDA_USING_ALL_LOCALS_BY_REFERENCE(int x) - { - sum += x; - }; - - std::vector vec(10, 2); - transformOverVector(vec, myLambda); - - EXPECT_EQ(20, sum); -} - - -} diff --git a/packages/stk/stk_learning/GameOfLife/GameofLife.cpp b/packages/stk/stk_learning/GameOfLife/GameofLife.cpp deleted file mode 100644 index 6609688cb1ae..000000000000 --- a/packages/stk/stk_learning/GameOfLife/GameofLife.cpp +++ /dev/null @@ -1,398 +0,0 @@ -/* - * GameofLife.cpp - * - * Created on: Jul 25, 2015 - * Author: Jonathan Chu - */ - -#include "GameofLife.hpp" -#include "GameOfLife/GameofLifeMesh.hpp" // for GameofLifeMesh -#include "stk_io/DatabasePurpose.hpp" -#include "stk_io/StkMeshIoBroker.hpp" // for StkMeshIoBroker -#include "stk_mesh/base/Bucket.hpp" // for Bucket -#include "stk_mesh/base/BulkData.hpp" // for BulkData -#include "stk_mesh/base/BulkDataInlinedMethods.hpp" -#include "stk_mesh/base/Entity.hpp" // for Entity -#include "stk_mesh/base/Field.hpp" // for Field -#include "stk_mesh/base/FieldBase.hpp" // for field_data -#include "stk_mesh/base/FieldParallel.hpp" // for communicate_field_data -#include "stk_mesh/base/GetEntities.hpp" // for get_selected_entities -#include "stk_mesh/base/MetaData.hpp" // for MetaData -#include "stk_topology/topology.hpp" // for topology, etc -#include "stk_util/util/ReportHandler.hpp" // for ThrowRequire -#include "stk_unit_test_utils/ioUtils.hpp" -/* - * GameofLife - */ -//public -GameofLife::GameofLife(GameofLifeMesh& Mesh, std::string meshName) -:m_metaData(Mesh.meta_data()), m_bulkData(Mesh.bulk_data()), - m_lifeField(Mesh.life_field()), m_stkIo(Mesh.comm()), m_meshName(meshName), m_time(0), - m_elemType(Mesh.element_type()),m_activeNeighborField(Mesh.neighbor_field()) -{ - get_elements(); - write_output_mesh(); - fill_neighbor_sets_of_elements(); -} - -void GameofLife::activate_these_ids(stk::mesh::EntityIdVector& elemIdsToActivate) -{ - activate_each_element_id_in_vector(elemIdsToActivate); -} - -void GameofLife::run_game_of_life(int numSteps) -{ - if (0 == m_time) - write_output_step(); - - for (int time = 1; time <= numSteps; time++) - { - //std::cerr << time << std::endl; - run_step_of_game_of_life(); - } -} - -void GameofLife::put_all_nodes_in_nodeset() -{ - m_bulkData.modification_begin(); - - stk::mesh::EntityVector nodes; - stk::mesh::get_entities(m_bulkData, stk::topology::NODE_RANK, nodes); - stk::mesh::Part& nodeset1Part = m_metaData.declare_part("nodelist_1", stk::topology::NODE_RANK); - for(stk::mesh::Entity node : nodes) - m_bulkData.change_entity_parts(node, stk::mesh::ConstPartVector {&nodeset1Part}); - - m_bulkData.modification_end(); -} - -void destroy_disabled_elements(stk::mesh::BulkData &bulk, const ScalarIntField &lifeField) -{ - bulk.modification_begin(); - - stk::mesh::EntityVector elements; - stk::mesh::get_entities(bulk, stk::topology::ELEM_RANK, elements); - for(stk::mesh::Entity element : elements) - { - if ( *stk::mesh::field_data(lifeField, element) != 1) - { - stk::mesh::EntityVector nodes(bulk.begin_nodes(element), bulk.end_nodes(element)); - bulk.destroy_entity(element); - for(unsigned j=0; j // for size_t -#include // for StkMeshIoBroker -#include // for Field -#include // for topology -#include // for string -#include // for unordered_map -#include // for unordered_set -#include "stk_mesh/base/HashEntityAndEntityKey.hpp" // for hash -#include "stk_mesh/base/Types.hpp" // for EntityIdVector, EntityId, etc -class GameofLifeMesh; -namespace stk { namespace mesh { class BulkData; } } -namespace stk { namespace mesh { class MetaData; } } -namespace stk { namespace mesh { class Part; } } -namespace stk { namespace mesh { struct Entity; } } - - - - -typedef stk::mesh::Field ScalarIntField; - -/* - * how to use: - * Make a MeshBuilder, and then pass the mesh and whatever name you want into the constructor. - * Pass some IDs to activate, and run the game of life for however many steps. It's that easy. - * Just remember to pass it a MeshBuilder that had an aura. - */ -class GameofLife -{ -public: - GameofLife(GameofLifeMesh& Mesh, std::string meshName); - - virtual ~GameofLife() {} - - //basics - virtual void activate_these_ids(stk::mesh::EntityIdVector& elemIdsToActivate); - - void run_game_of_life(int numSteps); - - virtual void write_mesh(); - - //test functions - inline unsigned get_num_elems_on_proc() const; - - unsigned get_num_active_elements() const; - - bool are_these_ids_active(const stk::mesh::EntityIdVector& elemIds) const; - -protected: - //big stuff - stk::mesh::MetaData& m_metaData; - stk::mesh::BulkData& m_bulkData; - stk::mesh::EntityVector m_elements; - - // housekeeping - unsigned m_elemsOnProc; - - // game of life - ScalarIntField& m_lifeField; - - //useful stuff - void update_this_element(stk::mesh::Entity elem); - bool element_is_local(stk::mesh::Entity elem) const; - -private: - // io - stk::io::StkMeshIoBroker m_stkIo; - size_t m_fileHandler; - std::string m_meshName; - int m_time; - - // members - const stk::topology m_elemType; - - //neighbors - ScalarIntField& m_activeNeighborField; - - std::unordered_map>, std::hash> - m_neighborSets; - - //constructor - void get_elements(); - - void write_output_mesh(); - - void fill_neighbor_sets_of_elements(); - void fill_neighbor_set_of_this_element(stk::mesh::Entity elem); - void add_this_nodes_elements_to_set(stk::mesh::Entity node, stk::mesh::Entity elem); - - //activate elements - virtual void activate_each_element_id_in_vector(stk::mesh::EntityIdVector& elemIdsToActivate)=0; - - //game of life - void run_step_of_game_of_life(); - virtual void communicate_data() = 0; - - void update_neighbor_fields(); - void update_neighbor_field_of_this_element(stk::mesh::Entity elem); - int get_num_active_neighbors_of_this_element(stk::mesh::Entity elem); - virtual bool element_is_active(stk::mesh::Entity elem) const = 0; - - virtual void update_each_element() = 0; - - void update_tri(stk::mesh::Entity elem); - void update_quad(stk::mesh::Entity elem); - void update_hex(stk::mesh::Entity elem); - virtual void activate_element(stk::mesh::Entity elem) = 0; - virtual void deactivate_element(stk::mesh::Entity elem) = 0; - - void write_output_step(); - void put_all_nodes_in_nodeset(); -}; - -inline unsigned GameofLife::get_num_elems_on_proc() const -{ - return m_elemsOnProc; -} - -class PartGameofLife : public GameofLife -{ -public: - PartGameofLife(GameofLifeMesh& Mesh, std::string meshName); - virtual ~PartGameofLife(){} -private: - //members - stk::mesh::Part& m_activePart; - stk::mesh::PartVector m_active; - stk::mesh::PartVector m_empty; - - //activate element ids - void activate_each_element_id_in_vector(stk::mesh::EntityIdVector& elemIdsToActivate); - void activate_this_element_id(stk::mesh::EntityId elemId); - - //game of life - virtual void communicate_data(); - - virtual bool element_is_active(stk::mesh::Entity elem) const; - virtual void update_each_element(); - virtual void activate_element(stk::mesh::Entity elem); - virtual void deactivate_element(stk::mesh::Entity elem); -}; - -class FieldGameofLife : public GameofLife -{ -public: - FieldGameofLife(GameofLifeMesh& Mesh, std::string meshName); - virtual ~FieldGameofLife(){} - -private: - //activate element ids - void activate_each_element_id_in_vector(stk::mesh::EntityIdVector& elemIdsToActivate); - void activate_this_element_id(stk::mesh::EntityId elemId); - - //game of life - virtual void communicate_data(); - - virtual bool element_is_active(stk::mesh::Entity elem) const; - virtual void update_each_element(); - virtual void activate_element(stk::mesh::Entity elem); - virtual void deactivate_element(stk::mesh::Entity elem); -}; - -class TodstwdGameOfLife : public FieldGameofLife -{ -public: - TodstwdGameOfLife(GameofLifeMesh& mesh, std::string meshName) - : FieldGameofLife(mesh, meshName) { } - virtual ~TodstwdGameOfLife() { } - virtual void write_mesh() override; -}; - -#endif /*GameofLife.hpp*/ diff --git a/packages/stk/stk_learning/GameOfLife/GameofLifeMesh.cpp b/packages/stk/stk_learning/GameOfLife/GameofLifeMesh.cpp deleted file mode 100644 index 428e3bc19ad1..000000000000 --- a/packages/stk/stk_learning/GameOfLife/GameofLifeMesh.cpp +++ /dev/null @@ -1,405 +0,0 @@ -/* - * MeshBuilder.cpp - * - * Created on: Jul 10, 2015 - * Author: Jonathan Chu - */ -#include "GameofLifeMesh.hpp" -#include // for size_t -#include "stk_io/IossBridge.hpp" // for put_io_part_attribute -#include "stk_mesh/base/BulkData.hpp" // for BulkData, etc -#include "stk_mesh/base/BulkDataInlinedMethods.hpp" -#include "stk_mesh/base/CoordinateSystems.hpp" // for Cartesian, etc -#include "stk_mesh/base/Entity.hpp" // for Entity -#include "stk_mesh/base/FEMHelpers.hpp" // for declare_element -#include "stk_mesh/base/Field.hpp" // for Field -#include "stk_mesh/base/FieldBase.hpp" // for field_data -#include "stk_mesh/base/GetEntities.hpp" // for get_entities -#include "stk_mesh/base/MetaData.hpp" // for MetaData, put_field -#include "stk_topology/topology.hpp" // for topology, etc - -// Game of Life Mesh -GameofLifeMesh::GameofLifeMesh(stk::ParallelMachine comm, stk::topology elemType, unsigned spacialDim, - stk::mesh::BulkData::AutomaticAuraOption auraOption) -:m_numProcs(stk::parallel_machine_size(comm)), m_procRank(stk::parallel_machine_rank(comm)), - m_metaData(spacialDim), m_bulkData(m_metaData, comm, auraOption), - m_comm(comm), m_elemType(elemType) -{ - declare_parts(); - declare_fields(); - put_fields_on_parts(); - put_parts_in_io(); -} - -// public -void GameofLifeMesh::fill_mesh() -{ - declare_element_nodes_ids(); - declare_element_ids(); - create_entities(); - number_coordinate_field(); -} -//private -void GameofLifeMesh::declare_fields() -{ - m_lifeField = - &m_metaData.declare_field(stk::topology::ELEMENT_RANK, "Life Field"); - m_activeNeighborField = - &m_metaData.declare_field(stk::topology::ELEMENT_RANK, - "Neighbor Field"); - - m_distFactors = &m_metaData.declare_field>(stk::topology::NODE_RANK, "distribution_factors"); -} -void GameofLifeMesh::put_fields_on_parts() -{ - int val = 0; - stk::mesh::put_field_on_mesh(*m_lifeField, m_metaData.universal_part(), &val); - stk::mesh::put_field_on_mesh(*m_activeNeighborField, m_metaData.universal_part(), &val); - - double factor = 1.0; - stk::mesh::put_field_on_mesh(*m_distFactors, *m_nodeset1, &factor); - stk::mesh::put_field_on_mesh(*m_distFactors, *m_nodeset2, &factor); - stk::mesh::put_field_on_mesh(*m_distFactors, *m_nodeset3, &factor); - stk::mesh::put_field_on_mesh(*m_distFactors, *m_nodeset4, &factor); -} -void GameofLifeMesh::declare_parts() -{ - m_elemPart = &m_metaData.declare_part_with_topology("Elem_Part", m_elemType); - stk::mesh::Part &block2 = m_metaData.declare_part_with_topology("block_2", m_elemType); - stk::mesh::Part &block3 = m_metaData.declare_part_with_topology("block_3", m_elemType); - stk::mesh::Part &block4 = m_metaData.declare_part_with_topology("block_4", m_elemType); - - stk::io::put_io_part_attribute(block2); - stk::io::put_io_part_attribute(block3); - stk::io::put_io_part_attribute(block4); - - m_activePart = &m_metaData.declare_part_with_topology("Active Part", m_elemType); - - m_nodeset1 = &m_metaData.declare_part("nodelist_1", stk::topology::NODE_RANK); - m_nodeset2 = &m_metaData.declare_part("nodelist_2", stk::topology::NODE_RANK); - m_nodeset3 = &m_metaData.declare_part("nodelist_3", stk::topology::NODE_RANK); - m_nodeset4 = &m_metaData.declare_part("nodelist_4", stk::topology::NODE_RANK); -} -void GameofLifeMesh::put_parts_in_io() -{ - stk::io::put_io_part_attribute(*m_elemPart); - - stk::io::put_io_part_attribute(*m_nodeset1); - stk::io::put_io_part_attribute(*m_nodeset2); - stk::io::put_io_part_attribute(*m_nodeset3); - stk::io::put_io_part_attribute(*m_nodeset4); -} -void GameofLifeMesh::declare_element_ids() -{ - m_elemIds.resize(m_elemsOnProc); - for (unsigned index = 0; index < m_elemsOnProc; index++) - m_elemIds[index] = index + m_elemProcOffset + 1; -} -void GameofLifeMesh::create_entities() -{ - m_bulkData.modification_begin(); - declare_entities(); - if (!only_one_active_proc()) - share_nodes_between_processors(); - m_bulkData.modification_end(); -} -void GameofLifeMesh::declare_entities() -{ - for (unsigned index = 0; index < m_elemsOnProc; index++) - declare_element(m_bulkData, *m_elemPart, m_elemIds[index], m_elemNodeIds[index]); - stk::mesh::get_entities(m_bulkData, stk::topology::NODE_RANK, m_nodes); -} - -//* -//* -//* -//* -// Two Dimensional Game ofLife Mesh -TwoDimGameofLifeMesh::TwoDimGameofLifeMesh(stk::ParallelMachine comm, - stk::topology elemType, - unsigned width, unsigned height, - stk::mesh::BulkData::AutomaticAuraOption - auraOption) -:GameofLifeMesh(comm, elemType, 2, auraOption), m_width(width), m_height(height), - m_rowsPerProc(height/m_numProcs), m_nodesPerRow(m_width+1) -{ - declare_coordinate_field(); - meta_data().commit(); -} - -// private -void TwoDimGameofLifeMesh::declare_coordinate_field() -{ - m_nodeCoords = &meta_data().declare_field>( - stk::topology::NODE_RANK, "coordinates"); - stk::mesh::put_field_on_mesh(*m_nodeCoords, meta_data().universal_part(), 2, nullptr); -} -bool TwoDimGameofLifeMesh::only_one_active_proc() -{ - return m_height < m_numProcs; -} -void TwoDimGameofLifeMesh::share_nodes_between_processors() -{ - if (m_numProcs-1!= m_procRank) - share_top_nodes(); - if (0 != m_procRank) - share_bottom_nodes(); -} -void TwoDimGameofLifeMesh::number_coordinate_field() -{ - for (size_t index = 0, numNodes = m_nodes.size(); index>( - stk::topology::NODE_RANK, "coordinates"); - stk::mesh::put_field_on_mesh(*m_nodeCoords, meta_data().universal_part(), 3, nullptr); -} -bool ThreeDimGameofLifeMesh::only_one_active_proc() -{ - return m_depth < m_numProcs; -} -void ThreeDimGameofLifeMesh::share_nodes_between_processors() -{ - if (m_numProcs-1 != m_procRank) - share_nodes_in_back(); - if (0 != m_procRank) - share_nodes_in_front(); -} -void ThreeDimGameofLifeMesh::share_nodes_in_back() -{ - unsigned nodeOffset = m_nodesPerSlice*m_slicesPerProc*(m_procRank+1); - for (unsigned index = 1; index <= m_nodesPerSlice; index++) - share_node_with_this_id_to_this_processor(index+nodeOffset, m_procRank+1); -} -void ThreeDimGameofLifeMesh::share_nodes_in_front() -{ - unsigned nodeOffset = m_nodesPerSlice*m_slicesPerProc*m_procRank; - for (unsigned index = 1; index <= m_nodesPerSlice; index++) - share_node_with_this_id_to_this_processor(index+nodeOffset, m_procRank-1); -} -void ThreeDimGameofLifeMesh::share_node_with_this_id_to_this_processor(unsigned nodeId, - unsigned procNum) -{ - stk::mesh::Entity node = bulk_data().get_entity(stk::topology::NODE_RANK, nodeId); - bulk_data().add_node_sharing(node, procNum); -} -void ThreeDimGameofLifeMesh::number_coordinate_field() -{ - for (unsigned index = 0, numNodes = m_nodes.size(); index < numNodes; index++) - number_coordinate_field_for_node(index); -} -void ThreeDimGameofLifeMesh::number_coordinate_field_for_node(unsigned nodeIndex) -{ - double* const coord = stk::mesh::field_data(*m_nodeCoords, m_nodes[nodeIndex]); - coord[0] = nodeIndex%m_nodesPerSlice%m_nodeWidth; - coord[1] = nodeIndex%m_nodesPerSlice/m_nodeWidth; - coord[2] = nodeIndex/m_nodesPerSlice + m_procRank*m_slicesPerProc; -} -//* -//* -//* -//* -//Hex Game of Life Mesh -HexGameofLifeMesh::HexGameofLifeMesh(stk::ParallelMachine comm, unsigned width, unsigned height, - unsigned depth, stk::mesh::BulkData::AutomaticAuraOption - auraOption) -:ThreeDimGameofLifeMesh(comm, stk::topology::HEX_8, width, height, depth, auraOption) -{ - m_elemsPerSlice = m_width*m_height; - if (m_numProcs-1 == m_procRank) - m_elemsOnProc = m_elemsPerSlice*(m_slicesPerProc+depth%m_numProcs); - else - m_elemsOnProc = m_elemsPerSlice*m_slicesPerProc; - m_elemProcOffset = m_elemsPerSlice*m_slicesPerProc*m_procRank; - fill_mesh(); -} - -//private -void HexGameofLifeMesh::declare_element_nodes_ids() -{ - m_elemNodeIds.resize(m_elemsOnProc); - unsigned offset = m_nodesPerSlice*m_slicesPerProc*m_procRank; - for (unsigned index = 0; index < m_elemsOnProc; index++) - declare_node_ids_of_element(index, offset); -} -void HexGameofLifeMesh::declare_node_ids_of_element(unsigned index, unsigned offset) -{ - if (index < m_elemsPerSlice) - declare_first_slice_element_node_ids(m_elemNodeIds[index], index, offset); - else - declare_remaining_element_node_ids(m_elemNodeIds[index], - m_elemNodeIds[index%m_elemsPerSlice], index); -} -void HexGameofLifeMesh::declare_first_slice_element_node_ids(stk::mesh::EntityIdVector& V, - unsigned index,unsigned offset) -{ - V.resize(8); - unsigned rowOffset = index/m_width; - unsigned totalOffset = offset+rowOffset+index; - V = {totalOffset+1+m_nodeWidth, - totalOffset+2+m_nodeWidth, - totalOffset+m_nodesPerSlice+2+m_nodeWidth, - totalOffset+m_nodesPerSlice+1+m_nodeWidth, - totalOffset+1, - totalOffset+2, - totalOffset+m_nodesPerSlice+2, - totalOffset+m_nodesPerSlice+1}; -} -void HexGameofLifeMesh::declare_remaining_element_node_ids(stk::mesh::EntityIdVector& newer, - stk::mesh::EntityIdVector& older, - unsigned index) -{ - newer.resize(8); - for (unsigned nodeIndex = 0; nodeIndex < 8; nodeIndex++) - newer[nodeIndex]= older[nodeIndex] + index/m_elemsPerSlice*m_nodesPerSlice; -} diff --git a/packages/stk/stk_learning/GameOfLife/GameofLifeMesh.hpp b/packages/stk/stk_learning/GameOfLife/GameofLifeMesh.hpp deleted file mode 100644 index 36cf9819d156..000000000000 --- a/packages/stk/stk_learning/GameOfLife/GameofLifeMesh.hpp +++ /dev/null @@ -1,322 +0,0 @@ -// Copyright 2002 - 2008, 2010, 2011 National Technology Engineering -// Solutions of Sandia, LLC (NTESS). Under the terms of Contract -// DE-NA0003525 with NTESS, the U.S. Government retains certain rights -// in this software. -// - // Redistribution and use in source and binary forms, with or without - // modification, are permitted provided that the following conditions are - // met: - // - // * Redistributions of source code must retain the above copyright - // notice, this list of conditions and the following disclaimer. - // - // * Redistributions in binary form must reproduce the above - // copyright notice, this list of conditions and the following - // disclaimer in the documentation and/or other materials provided - // with the distribution. - // -// * Neither the name of NTESS nor the names of its contributors -// may be used to endorse or promote products derived from this -// software without specific prior written permission. -// - // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - // "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - // A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -/* - * MeshBuilder.h - * - * Created on: Jul 10, 2015 - * Author: jonchu - */ - -#ifndef MESHBUILDER_HPP_ -#define MESHBUILDER_HPP_ - -#include // for basic_ostream::operator<< -#include // for BulkData, etc -#include // for Cartesian -#include // for Field -#include // for MetaData -#include // for topology -#include // for vector -#include "mpi.h" // for ompi_communicator_t -#include "stk_mesh/base/Types.hpp" // for EntityIdVector, etc -#include "stk_util/parallel/Parallel.hpp" // for ParallelMachine -namespace stk { namespace mesh { class Part; } } - - - -typedef stk::mesh::Field ScalarIntField; - -/* - How to use: - Pass in the comm, width, height, and depth (if hex), and also stk::mesh::BulkData::NO_AUTO_AURA - if you don't want an aura. Basically the only use for this class is to make GameofLife, but - hey, maybe you can come up with something else. - */ - -class GameofLifeMesh -{ -public: - GameofLifeMesh(stk::ParallelMachine comm, stk::topology elemType, - unsigned spacialDim, - stk::mesh::BulkData::AutomaticAuraOption auraOption); - - virtual ~GameofLifeMesh() {} - - - // accessor funcitions for test functions and GameofLife - inline stk::mesh::BulkData& bulk_data(); - - inline stk::mesh::MetaData& meta_data(); - - inline stk::mesh::Part& active_part(); - - inline ScalarIntField& neighbor_field(); - - inline ScalarIntField& life_field() const; - - inline stk::topology element_type() const; - - inline stk::ParallelMachine comm() const; - -protected: - //Base class needs to label nodes and assign elem node ids - stk::mesh::EntityVector m_nodes; - std::vector m_elemNodeIds; - - //Declared by base constructor, needed for math - const unsigned m_numProcs; - const unsigned m_procRank; - - //declared by derived constructor, needed for math - unsigned m_elemsOnProc; - unsigned m_elemProcOffset; - - //basics - void fill_mesh(); - -private: - //basics - stk::mesh::MetaData m_metaData; - stk::mesh::BulkData m_bulkData; - stk::ParallelMachine m_comm; - - //parts and fields - stk::mesh::Part* m_elemPart; - stk::mesh::Part* m_activePart; - ScalarIntField* m_lifeField; - ScalarIntField* m_activeNeighborField; - - stk::mesh::Part* m_nodeset1; - stk::mesh::Part* m_nodeset2; - stk::mesh::Part* m_nodeset3; - stk::mesh::Part* m_nodeset4; - stk::mesh::Field* m_distFactors; - - //members - stk::topology m_elemType; - stk::mesh::EntityIdVector m_elemIds; - - //constructor - void declare_fields(); - - void put_fields_on_parts(); - - void declare_parts(); - - void put_parts_in_io(); - - //fill_mesh - virtual void declare_element_nodes_ids()=0; - - void declare_element_ids(); - - void create_entities(); - virtual bool only_one_active_proc() = 0; - void declare_entities(); - virtual void share_nodes_between_processors()=0; - - virtual void number_coordinate_field()=0; - -}; -inline stk::mesh::MetaData& GameofLifeMesh::meta_data() -{ - return m_metaData; -} -inline stk::mesh::BulkData& GameofLifeMesh::bulk_data() -{ - return m_bulkData; -} -inline ScalarIntField& GameofLifeMesh::neighbor_field() -{ - return *m_activeNeighborField; -} -inline stk::mesh::Part& GameofLifeMesh::active_part() -{ - return *m_activePart; -} -inline ScalarIntField& GameofLifeMesh::life_field() const -{ - return *m_lifeField; -} -inline stk::topology GameofLifeMesh::element_type() const -{ - return m_elemType; -} -inline stk::ParallelMachine GameofLifeMesh::comm() const -{ - return m_comm; -} - -class TwoDimGameofLifeMesh : public GameofLifeMesh -{ -public: - TwoDimGameofLifeMesh(stk::ParallelMachine comm, stk::topology elemType, - unsigned width, unsigned height, - stk::mesh::BulkData::AutomaticAuraOption auraOption); - virtual ~TwoDimGameofLifeMesh() {} -protected: - // coordinate field - stk::mesh::Field* m_nodeCoords; - // base constructor - const unsigned m_width; - const unsigned m_height; - const unsigned m_rowsPerProc; - const unsigned m_nodesPerRow; - //derived constructor - unsigned m_elemsPerRow; -private: - //constructor - virtual void declare_coordinate_field(); - - //fill mesh - virtual void declare_element_nodes_ids()=0; - - virtual bool only_one_active_proc(); - - virtual void share_nodes_between_processors(); - virtual void share_top_nodes(); - virtual void share_bottom_nodes(); - void share_node_with_this_id_to_this_processor(unsigned nodeId, unsigned procNum); - - virtual void number_coordinate_field(); - void number_coordinate_field_of_node(unsigned nodeIndex); - -}; - -class TriGameofLifeMesh : public TwoDimGameofLifeMesh -{ -public: - TriGameofLifeMesh(stk::ParallelMachine comm, unsigned width, unsigned - rowsPerProc, - stk::mesh::BulkData::AutomaticAuraOption auraOption = - stk::mesh::BulkData::AUTO_AURA); - - virtual ~TriGameofLifeMesh() {} - -private: - //fill_mesh - - virtual void declare_element_nodes_ids(); - void declare_node_ids_of_two_elements(unsigned index, unsigned initialOffset); - void declare_node_ids_of_two_first_row_elements(unsigned index, unsigned initialOffset); - void declare_node_ids_of_two_sucessive_row_elements(unsigned index); - void declare_node_ids_of_this_element(unsigned index); - -}; - -class QuadGameofLifeMesh : public TwoDimGameofLifeMesh -{ -public: - QuadGameofLifeMesh(stk::ParallelMachine comm, unsigned width, unsigned - rowsPerProc, - stk::mesh::BulkData::AutomaticAuraOption auraOption = - stk::mesh::BulkData::AUTO_AURA); - virtual ~QuadGameofLifeMesh() {} -private: - //fill_mesh - virtual void declare_element_nodes_ids(); - void declare_node_ids_of_element(unsigned index, unsigned initialOffset); - void declare_first_row_element_nodes(unsigned index, unsigned offset); - void declare_remaining_element_nodes(unsigned index); - -}; - -class ThreeDimGameofLifeMesh : public GameofLifeMesh -{ -public: - ThreeDimGameofLifeMesh(stk::ParallelMachine comm, stk::topology elemType, - unsigned width, unsigned height, unsigned depth, - stk::mesh::BulkData::AutomaticAuraOption - auraOption); - - virtual ~ThreeDimGameofLifeMesh() {} - -protected: - // coordinate field - stk::mesh::Field* m_nodeCoords; - - //base constructor - const unsigned m_width; - const unsigned m_height; - const unsigned m_depth; - const unsigned m_slicesPerProc; - const unsigned m_nodeWidth; - const unsigned m_nodeHeight; - const unsigned m_nodesPerSlice; - - //derived constructor - unsigned m_elemsPerSlice; - -private: - //constructor - virtual void declare_coordinate_field(); - - //fill mesh - virtual void declare_element_nodes_ids()=0; - - virtual bool only_one_active_proc(); - - virtual void share_nodes_between_processors(); - void share_nodes_in_back(); - void share_nodes_in_front(); - void share_node_with_this_id_to_this_processor(unsigned nodeId, - unsigned procNum); - - virtual void number_coordinate_field(); - void number_coordinate_field_for_node(unsigned nodeIndex); - -}; - -class HexGameofLifeMesh : public ThreeDimGameofLifeMesh -{ -public: - HexGameofLifeMesh(stk::ParallelMachine comm, unsigned width, unsigned height, - unsigned depth, - stk::mesh::BulkData::AutomaticAuraOption auraOption = - stk::mesh::BulkData::AUTO_AURA); - - virtual ~HexGameofLifeMesh() {} - -private: - //fill_mesh - virtual void declare_element_nodes_ids(); - void declare_node_ids_of_element(unsigned index, unsigned offset); - void declare_first_slice_element_node_ids(stk::mesh::EntityIdVector& V, - unsigned index, - unsigned offset); - void declare_remaining_element_node_ids(stk::mesh::EntityIdVector& newer, - stk::mesh::EntityIdVector& older, - unsigned index); -}; -#endif /* MeshBuilder.hpp */ diff --git a/packages/stk/stk_learning/GameOfLife/LodePNG.cpp b/packages/stk/stk_learning/GameOfLife/LodePNG.cpp deleted file mode 100644 index 6344e4265ac6..000000000000 --- a/packages/stk/stk_learning/GameOfLife/LodePNG.cpp +++ /dev/null @@ -1,3005 +0,0 @@ -/* -LodePNG version 20150418 - -Copyright (c) 2005-2015 Lode Vandevenne - -This software is provided 'as-is', without any express or implied -warranty. In no event will the authors be held liable for any damages -arising from the use of this software. - -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it -freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - - 3. This notice may not be removed or altered from any source - distribution. -*/ - -/* -The manual and changelog are in the header file "lodepng.h" -Rename this file to lodepng.cpp to use it for C++, or to lodepng.c to use it for C. -*/ - -#include "LodePNG.hpp" - -#include -#include - -#ifdef LODEPNG_COMPILE_CPP -#include -#endif /*LODEPNG_COMPILE_CPP*/ - -#if defined(_MSC_VER) && (_MSC_VER >= 1310) /*Visual Studio: A few warning types are not desired here.*/ -#pragma warning( disable : 4244 ) /*implicit conversions: not warned by gcc -Wall -Wextra and requires too much casts*/ -#pragma warning( disable : 4996 ) /*VS does not like fopen, but fopen_s is not standard C so unusable here*/ -#endif /*_MSC_VER */ - -const char* LODEPNG_VERSION_STRING = "20150418"; - -/* -This source file is built up in the following large parts. The code sections -with the "LODEPNG_COMPILE_" #defines divide this up further in an intermixed way. --Tools for C and common code for PNG and Zlib --C Code for Zlib (huffman, deflate, ...) --C Code for PNG (file format chunks, adam7, PNG filters, color conversions, ...) --The C++ wrapper around all of the above -*/ - -/*The malloc, realloc and free functions defined here with "lodepng_" in front -of the name, so that you can easily change them to others related to your -platform if needed. Everything else in the code calls these. Pass --DLODEPNG_NO_COMPILE_ALLOCATORS to the compiler, or comment out -#define LODEPNG_COMPILE_ALLOCATORS in the header, to disable the ones here and -define them in your own project's source files without needing to change -lodepng source code. Don't forget to remove "static" if you copypaste them -from here.*/ - -#ifdef LODEPNG_COMPILE_ALLOCATORS -static void* lodepng_malloc(size_t size) -{ - return malloc(size); -} - -static void* lodepng_realloc(void* ptr, size_t new_size) -{ - return realloc(ptr, new_size); -} - -static void lodepng_free(void* ptr) -{ - free(ptr); -} -#else /*LODEPNG_COMPILE_ALLOCATORS*/ -void* lodepng_malloc(size_t size); -void* lodepng_realloc(void* ptr, size_t new_size); -void lodepng_free(void* ptr); -#endif /*LODEPNG_COMPILE_ALLOCATORS*/ - -/* ////////////////////////////////////////////////////////////////////////// */ -/* ////////////////////////////////////////////////////////////////////////// */ -/* // Tools for C, and common code for PNG and Zlib. // */ -/* ////////////////////////////////////////////////////////////////////////// */ -/* ////////////////////////////////////////////////////////////////////////// */ - -/* -Often in case of an error a value is assigned to a variable and then it breaks -out of a loop (to go to the cleanup phase of a function). This macro does that. -It makes the error handling code shorter and more readable. - -Example: if(!uivector_resizev(&frequencies_ll, 286, 0)) ERROR_BREAK(83); -*/ -#define CERROR_BREAK(errorvar, code)\ -{\ - errorvar = code;\ - break;\ -} - -/*version of CERROR_BREAK that assumes the common case where the error variable is named "error"*/ -#define ERROR_BREAK(code) CERROR_BREAK(error, code) - -/*Set error var to the error code, and return it.*/ -#define CERROR_RETURN_ERROR(errorvar, code)\ -{\ - errorvar = code;\ - return code;\ -} - -/*Try the code, if it returns error, also return the error.*/ -#define CERROR_TRY_RETURN(call)\ -{\ - unsigned error = call;\ - if(error) return error;\ -} - -/*Set error var to the error code, and return from the void function.*/ -#define CERROR_RETURN(errorvar, code)\ -{\ - errorvar = code;\ - return;\ -} - -/* -About uivector, ucvector and string: --All of them wrap dynamic arrays or text strings in a similar way. --LodePNG was originally written in C++. The vectors replace the std::vectors that were used in the C++ version. --The string tools are made to avoid problems with compilers that declare things like strncat as deprecated. --They're not used in the interface, only internally in this file as static functions. --As with many other structs in this file, the init and cleanup functions serve as ctor and dtor. -*/ - -#ifdef LODEPNG_COMPILE_ZLIB -/*dynamic vector of unsigned ints*/ -typedef struct uivector -{ - unsigned* data; - size_t size; /*size in number of unsigned longs*/ - size_t allocsize; /*allocated size in bytes*/ -} uivector; - -static void uivector_cleanup(void* p) -{ - ((uivector*)p)->size = ((uivector*)p)->allocsize = 0; - lodepng_free(((uivector*)p)->data); - ((uivector*)p)->data = NULL; -} - -/*returns 1 if success, 0 if failure ==> nothing done*/ -static unsigned uivector_reserve(uivector* p, size_t allocsize) -{ - if(allocsize > p->allocsize) - { - size_t newsize = (allocsize > p->allocsize * 2) ? allocsize : (allocsize * 3 / 2); - void* data = lodepng_realloc(p->data, newsize); - if(data) - { - p->allocsize = newsize; - p->data = (unsigned*)data; - } - else return 0; /*error: not enough memory*/ - } - return 1; -} - -/*returns 1 if success, 0 if failure ==> nothing done*/ -static unsigned uivector_resize(uivector* p, size_t size) -{ - if(!uivector_reserve(p, size * sizeof(unsigned))) return 0; - p->size = size; - return 1; /*success*/ -} - -/*resize and give all new elements the value*/ -static unsigned uivector_resizev(uivector* p, size_t size, unsigned value) -{ - size_t oldsize = p->size, i; - if(!uivector_resize(p, size)) return 0; - for(i = oldsize; i < size; ++i) p->data[i] = value; - return 1; -} - -static void uivector_init(uivector* p) -{ - p->data = NULL; - p->size = p->allocsize = 0; -} - -#endif /*LODEPNG_COMPILE_ZLIB*/ - -/* /////////////////////////////////////////////////////////////////////////// */ - -/*dynamic vector of unsigned chars*/ -typedef struct ucvector -{ - unsigned char* data; - size_t size; /*used size*/ - size_t allocsize; /*allocated size*/ -} ucvector; - -/*returns 1 if success, 0 if failure ==> nothing done*/ -static unsigned ucvector_reserve(ucvector* p, size_t allocsize) -{ - if(allocsize > p->allocsize) - { - size_t newsize = (allocsize > p->allocsize * 2) ? allocsize : (allocsize * 3 / 2); - void* data = lodepng_realloc(p->data, newsize); - if(data) - { - p->allocsize = newsize; - p->data = (unsigned char*)data; - } - else return 0; /*error: not enough memory*/ - } - return 1; -} - -/*returns 1 if success, 0 if failure ==> nothing done*/ -static unsigned ucvector_resize(ucvector* p, size_t size) -{ - if(!ucvector_reserve(p, size * sizeof(unsigned char))) return 0; - p->size = size; - return 1; /*success*/ -} - -#ifdef LODEPNG_COMPILE_PNG - -static void ucvector_cleanup(void* p) -{ - ((ucvector*)p)->size = ((ucvector*)p)->allocsize = 0; - lodepng_free(((ucvector*)p)->data); - ((ucvector*)p)->data = NULL; -} - -static void ucvector_init(ucvector* p) -{ - p->data = NULL; - p->size = p->allocsize = 0; -} - -#ifdef LODEPNG_COMPILE_DECODER -/*resize and give all new elements the value*/ -static unsigned ucvector_resizev(ucvector* p, size_t size, unsigned char value) -{ - size_t oldsize = p->size, i; - if(!ucvector_resize(p, size)) return 0; - for(i = oldsize; i < size; ++i) p->data[i] = value; - return 1; -} -#endif /*LODEPNG_COMPILE_DECODER*/ -#endif /*LODEPNG_COMPILE_PNG*/ - -#ifdef LODEPNG_COMPILE_ZLIB -/*you can both convert from vector to buffer&size and vica versa. If you use -init_buffer to take over a buffer and size, it is not needed to use cleanup*/ -static void ucvector_init_buffer(ucvector* p, unsigned char* buffer, size_t size) -{ - p->data = buffer; - p->allocsize = p->size = size; -} -#endif /*LODEPNG_COMPILE_ZLIB*/ - -#if (defined(LODEPNG_COMPILE_PNG) && defined(LODEPNG_COMPILE_ANCILLARY_CHUNKS)) || defined(LODEPNG_COMPILE_ENCODER) -#endif /*defined(LODEPNG_COMPILE_PNG) || defined(LODEPNG_COMPILE_ENCODER)*/ - -/* ////////////////////////////////////////////////////////////////////////// */ - -#ifdef LODEPNG_COMPILE_PNG -#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS -/*returns 1 if success, 0 if failure ==> nothing done*/ -static unsigned string_resize(char** out, size_t size) -{ - char* data = (char*)lodepng_realloc(*out, size + 1); - if(data) - { - data[size] = 0; /*null termination char*/ - *out = data; - } - return data != 0; -} - -/*init a {char*, size_t} pair for use as string*/ -static void string_init(char** out) -{ - *out = NULL; - string_resize(out, 0); -} - -/*free the above pair again*/ -static void string_cleanup(char** out) -{ - lodepng_free(*out); - *out = NULL; -} - -static void string_set(char** out, const char* in) -{ - size_t insize = strlen(in), i; - if(string_resize(out, insize)) - { - for(i = 0; i != insize; ++i) - { - (*out)[i] = in[i]; - } - } -} -#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ -#endif /*LODEPNG_COMPILE_PNG*/ - -/* ////////////////////////////////////////////////////////////////////////// */ - -unsigned lodepng_read32bitInt(const unsigned char* buffer) -{ - return (unsigned)((buffer[0] << 24) | (buffer[1] << 16) | (buffer[2] << 8) | buffer[3]); -} - -#ifdef LODEPNG_COMPILE_ZLIB -#ifdef LODEPNG_COMPILE_ENCODER -#endif /*LODEPNG_COMPILE_ENCODER*/ - -#ifdef LODEPNG_COMPILE_DECODER - -#define READBIT(bitpointer, bitstream) ((bitstream[bitpointer >> 3] >> (bitpointer & 0x7)) & (unsigned char)1) - -static unsigned char readBitFromStream(size_t* bitpointer, const unsigned char* bitstream) -{ - unsigned char result = (unsigned char)(READBIT(*bitpointer, bitstream)); - ++(*bitpointer); - return result; -} - -static unsigned readBitsFromStream(size_t* bitpointer, const unsigned char* bitstream, size_t nbits) -{ - unsigned result = 0, i; - for(i = 0; i != nbits; ++i) - { - result += ((unsigned)READBIT(*bitpointer, bitstream)) << i; - ++(*bitpointer); - } - return result; -} -#endif /*LODEPNG_COMPILE_DECODER*/ - -/* ////////////////////////////////////////////////////////////////////////// */ -/* / Deflate - Huffman / */ -/* ////////////////////////////////////////////////////////////////////////// */ - -#define FIRST_LENGTH_CODE_INDEX 257 -#define LAST_LENGTH_CODE_INDEX 285 -/*256 literals, the end code, some length codes, and 2 unused codes*/ -#define NUM_DEFLATE_CODE_SYMBOLS 288 -/*the distance codes have their own symbols, 30 used, 2 unused*/ -#define NUM_DISTANCE_SYMBOLS 32 -/*the code length codes. 0-15: code lengths, 16: copy previous 3-6 times, 17: 3-10 zeros, 18: 11-138 zeros*/ -#define NUM_CODE_LENGTH_CODES 19 - -/*the base lengths represented by codes 257-285*/ -static const unsigned LENGTHBASE[29] - = {3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31, 35, 43, 51, 59, - 67, 83, 99, 115, 131, 163, 195, 227, 258}; - -/*the extra bits used by codes 257-285 (added to base length)*/ -static const unsigned LENGTHEXTRA[29] - = {0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, - 4, 4, 4, 4, 5, 5, 5, 5, 0}; - -/*the base backwards distances (the bits of distance codes appear after length codes and use their own huffman tree)*/ -static const unsigned DISTANCEBASE[30] - = {1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193, 257, 385, 513, - 769, 1025, 1537, 2049, 3073, 4097, 6145, 8193, 12289, 16385, 24577}; - -/*the extra bits of backwards distances (added to base)*/ -static const unsigned DISTANCEEXTRA[30] - = {0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, - 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13}; - -/*the order in which "code length alphabet code lengths" are stored, out of this -the huffman tree of the dynamic huffman tree lengths is generated*/ -static const unsigned CLCL_ORDER[NUM_CODE_LENGTH_CODES] - = {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15}; - -/* ////////////////////////////////////////////////////////////////////////// */ - -/* -Huffman tree struct, containing multiple representations of the tree -*/ -typedef struct HuffmanTree -{ - unsigned* tree2d; - unsigned* tree1d; - unsigned* lengths; /*the lengths of the codes of the 1d-tree*/ - unsigned maxbitlen; /*maximum number of bits a single code can get*/ - unsigned numcodes; /*number of symbols in the alphabet = number of codes*/ -} HuffmanTree; - -static void HuffmanTree_init(HuffmanTree* tree) -{ - tree->tree2d = 0; - tree->tree1d = 0; - tree->lengths = 0; -} - -static void HuffmanTree_cleanup(HuffmanTree* tree) -{ - lodepng_free(tree->tree2d); - lodepng_free(tree->tree1d); - lodepng_free(tree->lengths); -} - -/*the tree representation used by the decoder. return value is error*/ -static unsigned HuffmanTree_make2DTree(HuffmanTree* tree) -{ - unsigned nodefilled = 0; /*up to which node it is filled*/ - unsigned treepos = 0; /*position in the tree (1 of the numcodes columns)*/ - unsigned n, i; - - tree->tree2d = (unsigned*)lodepng_malloc(tree->numcodes * 2 * sizeof(unsigned)); - if(!tree->tree2d) return 83; /*alloc fail*/ - - /* - convert tree1d[] to tree2d[][]. In the 2D array, a value of 32767 means - uninited, a value >= numcodes is an address to another bit, a value < numcodes - is a code. The 2 rows are the 2 possible bit values (0 or 1), there are as - many columns as codes - 1. - A good huffmann tree has N * 2 - 1 nodes, of which N - 1 are internal nodes. - Here, the internal nodes are stored (what their 0 and 1 option point to). - There is only memory for such good tree currently, if there are more nodes - (due to too long length codes), error 55 will happen - */ - for(n = 0; n < tree->numcodes * 2; ++n) - { - tree->tree2d[n] = 32767; /*32767 here means the tree2d isn't filled there yet*/ - } - - for(n = 0; n < tree->numcodes; ++n) /*the codes*/ - { - for(i = 0; i != tree->lengths[n]; ++i) /*the bits for this code*/ - { - unsigned char bit = (unsigned char)((tree->tree1d[n] >> (tree->lengths[n] - i - 1)) & 1); - if(treepos > 2147483647 || treepos + 2 > tree->numcodes) return 55; - if(tree->tree2d[2 * treepos + bit] == 32767) /*not yet filled in*/ - { - if(i + 1 == tree->lengths[n]) /*last bit*/ - { - tree->tree2d[2 * treepos + bit] = n; /*put the current code in it*/ - treepos = 0; - } - else - { - /*put address of the next step in here, first that address has to be found of course - (it's just nodefilled + 1)...*/ - ++nodefilled; - /*addresses encoded with numcodes added to it*/ - tree->tree2d[2 * treepos + bit] = nodefilled + tree->numcodes; - treepos = nodefilled; - } - } - else treepos = tree->tree2d[2 * treepos + bit] - tree->numcodes; - } - } - - for(n = 0; n < tree->numcodes * 2; ++n) - { - if(tree->tree2d[n] == 32767) tree->tree2d[n] = 0; /*remove possible remaining 32767's*/ - } - - return 0; -} - -/* -Second step for the ...makeFromLengths and ...makeFromFrequencies functions. -numcodes, lengths and maxbitlen must already be filled in correctly. return -value is error. -*/ -static unsigned HuffmanTree_makeFromLengths2(HuffmanTree* tree) -{ - uivector blcount; - uivector nextcode; - unsigned error = 0; - unsigned bits, n; - - uivector_init(&blcount); - uivector_init(&nextcode); - - tree->tree1d = (unsigned*)lodepng_malloc(tree->numcodes * sizeof(unsigned)); - if(!tree->tree1d) error = 83; /*alloc fail*/ - - if(!uivector_resizev(&blcount, tree->maxbitlen + 1, 0) - || !uivector_resizev(&nextcode, tree->maxbitlen + 1, 0)) - error = 83; /*alloc fail*/ - - if(!error) - { - /*step 1: count number of instances of each code length*/ - for(bits = 0; bits != tree->numcodes; ++bits) ++blcount.data[tree->lengths[bits]]; - /*step 2: generate the nextcode values*/ - for(bits = 1; bits <= tree->maxbitlen; ++bits) - { - nextcode.data[bits] = (nextcode.data[bits - 1] + blcount.data[bits - 1]) << 1; - } - /*step 3: generate all the codes*/ - for(n = 0; n != tree->numcodes; ++n) - { - if(tree->lengths[n] != 0) tree->tree1d[n] = nextcode.data[tree->lengths[n]]++; - } - } - - uivector_cleanup(&blcount); - uivector_cleanup(&nextcode); - - if(!error) return HuffmanTree_make2DTree(tree); - else return error; -} - -/* -given the code lengths (as stored in the PNG file), generate the tree as defined -by Deflate. maxbitlen is the maximum bits that a code in the tree can have. -return value is error. -*/ -static unsigned HuffmanTree_makeFromLengths(HuffmanTree* tree, const unsigned* bitlen, - size_t numcodes, unsigned maxbitlen) -{ - unsigned i; - tree->lengths = (unsigned*)lodepng_malloc(numcodes * sizeof(unsigned)); - if(!tree->lengths) return 83; /*alloc fail*/ - for(i = 0; i != numcodes; ++i) tree->lengths[i] = bitlen[i]; - tree->numcodes = (unsigned)numcodes; /*number of symbols*/ - tree->maxbitlen = maxbitlen; - return HuffmanTree_makeFromLengths2(tree); -} - -#ifdef LODEPNG_COMPILE_ENCODER - -/*BPM: Boundary Package Merge, see "A Fast and Space-Economical Algorithm for Length-Limited Coding", -Jyrki Katajainen, Alistair Moffat, Andrew Turpin, 1995.*/ - -/*chain node for boundary package merge*/ -typedef struct BPMNode -{ - int weight; /*the sum of all weights in this chain*/ - unsigned index; /*index of this leaf node (called "count" in the paper)*/ - struct BPMNode* tail; /*the next nodes in this chain (null if last)*/ - int in_use; -} BPMNode; - -/*lists of chains*/ -typedef struct BPMLists -{ - /*memory pool*/ - unsigned memsize; - BPMNode* memory; - unsigned numfree; - unsigned nextfree; - BPMNode** freelist; - /*two heads of lookahead chains per list*/ - unsigned listsize; - BPMNode** chains0; - BPMNode** chains1; -} BPMLists; - -#endif /*LODEPNG_COMPILE_ENCODER*/ - -/*get the literal and length code tree of a deflated block with fixed tree, as per the deflate specification*/ -static unsigned generateFixedLitLenTree(HuffmanTree* tree) -{ - unsigned i, error = 0; - unsigned* bitlen = (unsigned*)lodepng_malloc(NUM_DEFLATE_CODE_SYMBOLS * sizeof(unsigned)); - if(!bitlen) return 83; /*alloc fail*/ - - /*288 possible codes: 0-255=literals, 256=endcode, 257-285=lengthcodes, 286-287=unused*/ - for(i = 0; i <= 143; ++i) bitlen[i] = 8; - for(i = 144; i <= 255; ++i) bitlen[i] = 9; - for(i = 256; i <= 279; ++i) bitlen[i] = 7; - for(i = 280; i <= 287; ++i) bitlen[i] = 8; - - error = HuffmanTree_makeFromLengths(tree, bitlen, NUM_DEFLATE_CODE_SYMBOLS, 15); - - lodepng_free(bitlen); - return error; -} - -/*get the distance code tree of a deflated block with fixed tree, as specified in the deflate specification*/ -static unsigned generateFixedDistanceTree(HuffmanTree* tree) -{ - unsigned i, error = 0; - unsigned* bitlen = (unsigned*)lodepng_malloc(NUM_DISTANCE_SYMBOLS * sizeof(unsigned)); - if(!bitlen) return 83; /*alloc fail*/ - - /*there are 32 distance codes, but 30-31 are unused*/ - for(i = 0; i != NUM_DISTANCE_SYMBOLS; ++i) bitlen[i] = 5; - error = HuffmanTree_makeFromLengths(tree, bitlen, NUM_DISTANCE_SYMBOLS, 15); - - lodepng_free(bitlen); - return error; -} - -#ifdef LODEPNG_COMPILE_DECODER - -/* -returns the code, or (unsigned)(-1) if error happened -inbitlength is the length of the complete buffer, in bits (so its byte length times 8) -*/ -static unsigned huffmanDecodeSymbol(const unsigned char* in, size_t* bp, - const HuffmanTree* codetree, size_t inbitlength) -{ - unsigned treepos = 0, ct; - for(;;) - { - if(*bp >= inbitlength) return (unsigned)(-1); /*error: end of input memory reached without endcode*/ - /* - decode the symbol from the tree. The "readBitFromStream" code is inlined in - the expression below because this is the biggest bottleneck while decoding - */ - ct = codetree->tree2d[(treepos << 1) + READBIT(*bp, in)]; - ++(*bp); - if(ct < codetree->numcodes) return ct; /*the symbol is decoded, return it*/ - else treepos = ct - codetree->numcodes; /*symbol not yet decoded, instead move tree position*/ - - if(treepos >= codetree->numcodes) return (unsigned)(-1); /*error: it appeared outside the codetree*/ - } -} -#endif /*LODEPNG_COMPILE_DECODER*/ - -#ifdef LODEPNG_COMPILE_DECODER - -/* ////////////////////////////////////////////////////////////////////////// */ -/* / Inflator (Decompressor) / */ -/* ////////////////////////////////////////////////////////////////////////// */ - -/*get the tree of a deflated block with fixed tree, as specified in the deflate specification*/ -static void getTreeInflateFixed(HuffmanTree* tree_ll, HuffmanTree* tree_d) -{ - /*TODO: check for out of memory errors*/ - generateFixedLitLenTree(tree_ll); - generateFixedDistanceTree(tree_d); -} - -/*get the tree of a deflated block with dynamic tree, the tree itself is also Huffman compressed with a known tree*/ -static unsigned getTreeInflateDynamic(HuffmanTree* tree_ll, HuffmanTree* tree_d, - const unsigned char* in, size_t* bp, size_t inlength) -{ - /*make sure that length values that aren't filled in will be 0, or a wrong tree will be generated*/ - unsigned error = 0; - unsigned n, HLIT, HDIST, HCLEN, i; - size_t inbitlength = inlength * 8; - - /*see comments in deflateDynamic for explanation of the context and these variables, it is analogous*/ - unsigned* bitlen_ll = 0; /*lit,len code lengths*/ - unsigned* bitlen_d = 0; /*dist code lengths*/ - /*code length code lengths ("clcl"), the bit lengths of the huffman tree used to compress bitlen_ll and bitlen_d*/ - unsigned* bitlen_cl = 0; - HuffmanTree tree_cl; /*the code tree for code length codes (the huffman tree for compressed huffman trees)*/ - - if((*bp) + 14 > (inlength << 3)) return 49; /*error: the bit pointer is or will go past the memory*/ - - /*number of literal/length codes + 257. Unlike the spec, the value 257 is added to it here already*/ - HLIT = readBitsFromStream(bp, in, 5) + 257; - /*number of distance codes. Unlike the spec, the value 1 is added to it here already*/ - HDIST = readBitsFromStream(bp, in, 5) + 1; - /*number of code length codes. Unlike the spec, the value 4 is added to it here already*/ - HCLEN = readBitsFromStream(bp, in, 4) + 4; - - if((*bp) + HCLEN * 3 > (inlength << 3)) return 50; /*error: the bit pointer is or will go past the memory*/ - - HuffmanTree_init(&tree_cl); - - while(!error) - { - /*read the code length codes out of 3 * (amount of code length codes) bits*/ - - bitlen_cl = (unsigned*)lodepng_malloc(NUM_CODE_LENGTH_CODES * sizeof(unsigned)); - if(!bitlen_cl) ERROR_BREAK(83 /*alloc fail*/); - - for(i = 0; i != NUM_CODE_LENGTH_CODES; ++i) - { - if(i < HCLEN) bitlen_cl[CLCL_ORDER[i]] = readBitsFromStream(bp, in, 3); - else bitlen_cl[CLCL_ORDER[i]] = 0; /*if not, it must stay 0*/ - } - - error = HuffmanTree_makeFromLengths(&tree_cl, bitlen_cl, NUM_CODE_LENGTH_CODES, 7); - if(error) break; - - /*now we can use this tree to read the lengths for the tree that this function will return*/ - bitlen_ll = (unsigned*)lodepng_malloc(NUM_DEFLATE_CODE_SYMBOLS * sizeof(unsigned)); - bitlen_d = (unsigned*)lodepng_malloc(NUM_DISTANCE_SYMBOLS * sizeof(unsigned)); - if(!bitlen_ll || !bitlen_d) ERROR_BREAK(83 /*alloc fail*/); - for(i = 0; i != NUM_DEFLATE_CODE_SYMBOLS; ++i) bitlen_ll[i] = 0; - for(i = 0; i != NUM_DISTANCE_SYMBOLS; ++i) bitlen_d[i] = 0; - - /*i is the current symbol we're reading in the part that contains the code lengths of lit/len and dist codes*/ - i = 0; - while(i < HLIT + HDIST) - { - unsigned code = huffmanDecodeSymbol(in, bp, &tree_cl, inbitlength); - if(code <= 15) /*a length code*/ - { - if(i < HLIT) bitlen_ll[i] = code; - else bitlen_d[i - HLIT] = code; - ++i; - } - else if(code == 16) /*repeat previous*/ - { - unsigned replength = 3; /*read in the 2 bits that indicate repeat length (3-6)*/ - unsigned value; /*set value to the previous code*/ - - if(i == 0) ERROR_BREAK(54); /*can't repeat previous if i is 0*/ - - if((*bp + 2) > inbitlength) ERROR_BREAK(50); /*error, bit pointer jumps past memory*/ - replength += readBitsFromStream(bp, in, 2); - - if(i < HLIT + 1) value = bitlen_ll[i - 1]; - else value = bitlen_d[i - HLIT - 1]; - /*repeat this value in the next lengths*/ - for(n = 0; n < replength; ++n) - { - if(i >= HLIT + HDIST) ERROR_BREAK(13); /*error: i is larger than the amount of codes*/ - if(i < HLIT) bitlen_ll[i] = value; - else bitlen_d[i - HLIT] = value; - ++i; - } - } - else if(code == 17) /*repeat "0" 3-10 times*/ - { - unsigned replength = 3; /*read in the bits that indicate repeat length*/ - if((*bp + 3) > inbitlength) ERROR_BREAK(50); /*error, bit pointer jumps past memory*/ - replength += readBitsFromStream(bp, in, 3); - - /*repeat this value in the next lengths*/ - for(n = 0; n < replength; ++n) - { - if(i >= HLIT + HDIST) ERROR_BREAK(14); /*error: i is larger than the amount of codes*/ - - if(i < HLIT) bitlen_ll[i] = 0; - else bitlen_d[i - HLIT] = 0; - ++i; - } - } - else if(code == 18) /*repeat "0" 11-138 times*/ - { - unsigned replength = 11; /*read in the bits that indicate repeat length*/ - if((*bp + 7) > inbitlength) ERROR_BREAK(50); /*error, bit pointer jumps past memory*/ - replength += readBitsFromStream(bp, in, 7); - - /*repeat this value in the next lengths*/ - for(n = 0; n < replength; ++n) - { - if(i >= HLIT + HDIST) ERROR_BREAK(15); /*error: i is larger than the amount of codes*/ - - if(i < HLIT) bitlen_ll[i] = 0; - else bitlen_d[i - HLIT] = 0; - ++i; - } - } - else /*if(code == (unsigned)(-1))*/ /*huffmanDecodeSymbol returns (unsigned)(-1) in case of error*/ - { - if(code == (unsigned)(-1)) - { - /*return error code 10 or 11 depending on the situation that happened in huffmanDecodeSymbol - (10=no endcode, 11=wrong jump outside of tree)*/ - error = (*bp) > inbitlength ? 10 : 11; - } - else error = 16; /*unexisting code, this can never happen*/ - break; - } - } - if(error) break; - - if(bitlen_ll[256] == 0) ERROR_BREAK(64); /*the length of the end code 256 must be larger than 0*/ - - /*now we've finally got HLIT and HDIST, so generate the code trees, and the function is done*/ - error = HuffmanTree_makeFromLengths(tree_ll, bitlen_ll, NUM_DEFLATE_CODE_SYMBOLS, 15); - if(error) break; - error = HuffmanTree_makeFromLengths(tree_d, bitlen_d, NUM_DISTANCE_SYMBOLS, 15); - - break; /*end of error-while*/ - } - - lodepng_free(bitlen_cl); - lodepng_free(bitlen_ll); - lodepng_free(bitlen_d); - HuffmanTree_cleanup(&tree_cl); - - return error; -} - -/*inflate a block with dynamic of fixed Huffman tree*/ -static unsigned inflateHuffmanBlock(ucvector* out, const unsigned char* in, size_t* bp, - size_t* pos, size_t inlength, unsigned btype) -{ - unsigned error = 0; - HuffmanTree tree_ll; /*the huffman tree for literal and length codes*/ - HuffmanTree tree_d; /*the huffman tree for distance codes*/ - size_t inbitlength = inlength * 8; - - HuffmanTree_init(&tree_ll); - HuffmanTree_init(&tree_d); - - if(btype == 1) getTreeInflateFixed(&tree_ll, &tree_d); - else if(btype == 2) error = getTreeInflateDynamic(&tree_ll, &tree_d, in, bp, inlength); - - while(!error) /*decode all symbols until end reached, breaks at end code*/ - { - /*code_ll is literal, length or end code*/ - unsigned code_ll = huffmanDecodeSymbol(in, bp, &tree_ll, inbitlength); - if(code_ll <= 255) /*literal symbol*/ - { - /*ucvector_push_back would do the same, but for some reason the two lines below run 10% faster*/ - if(!ucvector_resize(out, (*pos) + 1)) ERROR_BREAK(83 /*alloc fail*/); - out->data[*pos] = (unsigned char)code_ll; - ++(*pos); - } - else if(code_ll >= FIRST_LENGTH_CODE_INDEX && code_ll <= LAST_LENGTH_CODE_INDEX) /*length code*/ - { - unsigned code_d, distance; - unsigned numextrabits_l, numextrabits_d; /*extra bits for length and distance*/ - size_t start, forward, backward, length; - - /*part 1: get length base*/ - length = LENGTHBASE[code_ll - FIRST_LENGTH_CODE_INDEX]; - - /*part 2: get extra bits and add the value of that to length*/ - numextrabits_l = LENGTHEXTRA[code_ll - FIRST_LENGTH_CODE_INDEX]; - if((*bp + numextrabits_l) > inbitlength) ERROR_BREAK(51); /*error, bit pointer will jump past memory*/ - length += readBitsFromStream(bp, in, numextrabits_l); - - /*part 3: get distance code*/ - code_d = huffmanDecodeSymbol(in, bp, &tree_d, inbitlength); - if(code_d > 29) - { - if(code_ll == (unsigned)(-1)) /*huffmanDecodeSymbol returns (unsigned)(-1) in case of error*/ - { - /*return error code 10 or 11 depending on the situation that happened in huffmanDecodeSymbol - (10=no endcode, 11=wrong jump outside of tree)*/ - error = (*bp) > inlength * 8 ? 10 : 11; - } - else error = 18; /*error: invalid distance code (30-31 are never used)*/ - break; - } - distance = DISTANCEBASE[code_d]; - - /*part 4: get extra bits from distance*/ - numextrabits_d = DISTANCEEXTRA[code_d]; - if((*bp + numextrabits_d) > inbitlength) ERROR_BREAK(51); /*error, bit pointer will jump past memory*/ - distance += readBitsFromStream(bp, in, numextrabits_d); - - /*part 5: fill in all the out[n] values based on the length and dist*/ - start = (*pos); - if(distance > start) ERROR_BREAK(52); /*too long backward distance*/ - backward = start - distance; - - if(!ucvector_resize(out, (*pos) + length)) ERROR_BREAK(83 /*alloc fail*/); - if (distance < length) { - for(forward = 0; forward < length; ++forward) - { - out->data[(*pos)++] = out->data[backward++]; - } - } else { - memcpy(out->data + *pos, out->data + backward, length); - *pos += length; - } - } - else if(code_ll == 256) - { - break; /*end code, break the loop*/ - } - else /*if(code == (unsigned)(-1))*/ /*huffmanDecodeSymbol returns (unsigned)(-1) in case of error*/ - { - /*return error code 10 or 11 depending on the situation that happened in huffmanDecodeSymbol - (10=no endcode, 11=wrong jump outside of tree)*/ - error = ((*bp) > inlength * 8) ? 10 : 11; - break; - } - } - - HuffmanTree_cleanup(&tree_ll); - HuffmanTree_cleanup(&tree_d); - - return error; -} - -static unsigned inflateNoCompression(ucvector* out, const unsigned char* in, size_t* bp, size_t* pos, size_t inlength) -{ - size_t p; - unsigned LEN, NLEN, n, error = 0; - - /*go to first boundary of byte*/ - while(((*bp) & 0x7) != 0) ++(*bp); - p = (*bp) / 8; /*byte position*/ - - /*read LEN (2 bytes) and NLEN (2 bytes)*/ - if(p + 4 >= inlength) return 52; /*error, bit pointer will jump past memory*/ - LEN = in[p] + 256u * in[p + 1]; p += 2; - NLEN = in[p] + 256u * in[p + 1]; p += 2; - - /*check if 16-bit NLEN is really the one's complement of LEN*/ - if(LEN + NLEN != 65535) return 21; /*error: NLEN is not one's complement of LEN*/ - - if(!ucvector_resize(out, (*pos) + LEN)) return 83; /*alloc fail*/ - - /*read the literal data: LEN bytes are now stored in the out buffer*/ - if(p + LEN > inlength) return 23; /*error: reading outside of in buffer*/ - for(n = 0; n < LEN; ++n) out->data[(*pos)++] = in[p++]; - - (*bp) = p * 8; - - return error; -} - -static unsigned lodepng_inflatev(ucvector* out, - const unsigned char* in, size_t insize, - const LodePNGDecompressSettings* settings) -{ - /*bit pointer in the "in" data, current byte is bp >> 3, current bit is bp & 0x7 (from lsb to msb of the byte)*/ - size_t bp = 0; - unsigned BFINAL = 0; - size_t pos = 0; /*byte position in the out buffer*/ - unsigned error = 0; - - (void)settings; - - while(!BFINAL) - { - unsigned BTYPE; - if(bp + 2 >= insize * 8) return 52; /*error, bit pointer will jump past memory*/ - BFINAL = readBitFromStream(&bp, in); - BTYPE = 1u * readBitFromStream(&bp, in); - BTYPE += 2u * readBitFromStream(&bp, in); - - if(BTYPE == 3) return 20; /*error: invalid BTYPE*/ - else if(BTYPE == 0) error = inflateNoCompression(out, in, &bp, &pos, insize); /*no compression*/ - else error = inflateHuffmanBlock(out, in, &bp, &pos, insize, BTYPE); /*compression, BTYPE 01 or 10*/ - - if(error) return error; - } - - return error; -} - -unsigned lodepng_inflate(unsigned char** out, size_t* outsize, - const unsigned char* in, size_t insize, - const LodePNGDecompressSettings* settings) -{ - unsigned error; - ucvector v; - ucvector_init_buffer(&v, *out, *outsize); - error = lodepng_inflatev(&v, in, insize, settings); - *out = v.data; - *outsize = v.size; - return error; -} - -static unsigned inflate(unsigned char** out, size_t* outsize, - const unsigned char* in, size_t insize, - const LodePNGDecompressSettings* settings) -{ - if(settings->custom_inflate) - { - return settings->custom_inflate(out, outsize, in, insize, settings); - } - else - { - return lodepng_inflate(out, outsize, in, insize, settings); - } -} - -#endif /*LODEPNG_COMPILE_DECODER*/ - -#ifdef LODEPNG_COMPILE_ENCODER - -/* ////////////////////////////////////////////////////////////////////////// */ -/* / Deflator (Compressor) / */ -/* ////////////////////////////////////////////////////////////////////////// */ - -typedef struct Hash -{ - int* head; /*hash value to head circular pos - can be outdated if went around window*/ - /*circular pos to prev circular pos*/ - unsigned short* chain; - int* val; /*circular pos to hash value*/ - - /*TODO: do this not only for zeros but for any repeated byte. However for PNG - it's always going to be the zeros that dominate, so not important for PNG*/ - int* headz; /*similar to head, but for chainz*/ - unsigned short* chainz; /*those with same amount of zeros*/ - unsigned short* zeros; /*length of zeros streak, used as a second hash chain*/ -} Hash; - -#endif /*LODEPNG_COMPILE_DECODER*/ - -/* ////////////////////////////////////////////////////////////////////////// */ -/* / Adler32 */ -/* ////////////////////////////////////////////////////////////////////////// */ - -static unsigned update_adler32(unsigned adler, const unsigned char* data, unsigned len) -{ - unsigned s1 = adler & 0xffff; - unsigned s2 = (adler >> 16) & 0xffff; - - while(len > 0) - { - /*at least 5550 sums can be done before the sums overflow, saving a lot of module divisions*/ - unsigned amount = len > 5550 ? 5550 : len; - len -= amount; - while(amount > 0) - { - s1 += (*data++); - s2 += s1; - --amount; - } - s1 %= 65521; - s2 %= 65521; - } - - return (s2 << 16) | s1; -} - -/*Return the adler32 of the bytes data[0..len-1]*/ -static unsigned adler32(const unsigned char* data, unsigned len) -{ - return update_adler32(1L, data, len); -} - -/* ////////////////////////////////////////////////////////////////////////// */ -/* / Zlib / */ -/* ////////////////////////////////////////////////////////////////////////// */ - -#ifdef LODEPNG_COMPILE_DECODER - -unsigned lodepng_zlib_decompress(unsigned char** out, size_t* outsize, const unsigned char* in, - size_t insize, const LodePNGDecompressSettings* settings) -{ - unsigned error = 0; - unsigned CM, CINFO, FDICT; - - if(insize < 2) return 53; /*error, size of zlib data too small*/ - /*read information from zlib header*/ - if((in[0] * 256 + in[1]) % 31 != 0) - { - /*error: 256 * in[0] + in[1] must be a multiple of 31, the FCHECK value is supposed to be made that way*/ - return 24; - } - - CM = in[0] & 15; - CINFO = (in[0] >> 4) & 15; - /*FCHECK = in[1] & 31;*/ /*FCHECK is already tested above*/ - FDICT = (in[1] >> 5) & 1; - /*FLEVEL = (in[1] >> 6) & 3;*/ /*FLEVEL is not used here*/ - - if(CM != 8 || CINFO > 7) - { - /*error: only compression method 8: inflate with sliding window of 32k is supported by the PNG spec*/ - return 25; - } - if(FDICT != 0) - { - /*error: the specification of PNG says about the zlib stream: - "The additional flags shall not specify a preset dictionary."*/ - return 26; - } - - error = inflate(out, outsize, in + 2, insize - 2, settings); - if(error) return error; - - if(!settings->ignore_adler32) - { - unsigned ADLER32 = lodepng_read32bitInt(&in[insize - 4]); - unsigned checksum = adler32(*out, (unsigned)(*outsize)); - if(checksum != ADLER32) return 58; /*error, adler checksum not correct, data must be corrupted*/ - } - - return 0; /*no error*/ -} - -static unsigned zlib_decompress(unsigned char** out, size_t* outsize, const unsigned char* in, - size_t insize, const LodePNGDecompressSettings* settings) -{ - if(settings->custom_zlib) - { - return settings->custom_zlib(out, outsize, in, insize, settings); - } - else - { - return lodepng_zlib_decompress(out, outsize, in, insize, settings); - } -} - -#endif /*LODEPNG_COMPILE_DECODER*/ - -#ifdef LODEPNG_COMPILE_ENCODER -#endif /*LODEPNG_COMPILE_ENCODER*/ - -#else /*no LODEPNG_COMPILE_ZLIB*/ - -#ifdef LODEPNG_COMPILE_DECODER -static unsigned zlib_decompress(unsigned char** out, size_t* outsize, const unsigned char* in, - size_t insize, const LodePNGDecompressSettings* settings) -{ - if(!settings->custom_zlib) return 87; /*no custom zlib function provided */ - return settings->custom_zlib(out, outsize, in, insize, settings); -} -#endif /*LODEPNG_COMPILE_DECODER*/ -#endif /*LODEPNG_COMPILE_ZLIB*/ - -/* ////////////////////////////////////////////////////////////////////////// */ - -#ifdef LODEPNG_COMPILE_ENCODER - -/*this is a good tradeoff between speed and compression ratio*/ -#define DEFAULT_WINDOWSIZE 2048 - -void lodepng_compress_settings_init(LodePNGCompressSettings* settings) -{ - /*compress with dynamic huffman tree (not in the mathematical sense, just not the predefined one)*/ - settings->btype = 2; - settings->use_lz77 = 1; - settings->windowsize = DEFAULT_WINDOWSIZE; - settings->minmatch = 3; - settings->nicematch = 128; - settings->lazymatching = 1; - - settings->custom_zlib = 0; - settings->custom_deflate = 0; - settings->custom_context = 0; -} - -const LodePNGCompressSettings lodepng_default_compress_settings = {2, 1, DEFAULT_WINDOWSIZE, 3, 128, 1, 0, 0, 0}; - - -#endif /*LODEPNG_COMPILE_ENCODER*/ - -#ifdef LODEPNG_COMPILE_DECODER - -void lodepng_decompress_settings_init(LodePNGDecompressSettings* settings) -{ - settings->ignore_adler32 = 0; - - settings->custom_zlib = 0; - settings->custom_inflate = 0; - settings->custom_context = 0; -} - -const LodePNGDecompressSettings lodepng_default_decompress_settings = {0, 0, 0, 0}; - -#endif /*LODEPNG_COMPILE_DECODER*/ - -/* ////////////////////////////////////////////////////////////////////////// */ -/* ////////////////////////////////////////////////////////////////////////// */ -/* // End of Zlib related code. Begin of PNG related code. // */ -/* ////////////////////////////////////////////////////////////////////////// */ -/* ////////////////////////////////////////////////////////////////////////// */ - -#ifdef LODEPNG_COMPILE_PNG - -/* ////////////////////////////////////////////////////////////////////////// */ -/* / CRC32 / */ -/* ////////////////////////////////////////////////////////////////////////// */ - -/* CRC polynomial: 0xedb88320 */ -static unsigned lodepng_crc32_table[256] = { - 0u, 1996959894u, 3993919788u, 2567524794u, 124634137u, 1886057615u, 3915621685u, 2657392035u, - 249268274u, 2044508324u, 3772115230u, 2547177864u, 162941995u, 2125561021u, 3887607047u, 2428444049u, - 498536548u, 1789927666u, 4089016648u, 2227061214u, 450548861u, 1843258603u, 4107580753u, 2211677639u, - 325883990u, 1684777152u, 4251122042u, 2321926636u, 335633487u, 1661365465u, 4195302755u, 2366115317u, - 997073096u, 1281953886u, 3579855332u, 2724688242u, 1006888145u, 1258607687u, 3524101629u, 2768942443u, - 901097722u, 1119000684u, 3686517206u, 2898065728u, 853044451u, 1172266101u, 3705015759u, 2882616665u, - 651767980u, 1373503546u, 3369554304u, 3218104598u, 565507253u, 1454621731u, 3485111705u, 3099436303u, - 671266974u, 1594198024u, 3322730930u, 2970347812u, 795835527u, 1483230225u, 3244367275u, 3060149565u, - 1994146192u, 31158534u, 2563907772u, 4023717930u, 1907459465u, 112637215u, 2680153253u, 3904427059u, - 2013776290u, 251722036u, 2517215374u, 3775830040u, 2137656763u, 141376813u, 2439277719u, 3865271297u, - 1802195444u, 476864866u, 2238001368u, 4066508878u, 1812370925u, 453092731u, 2181625025u, 4111451223u, - 1706088902u, 314042704u, 2344532202u, 4240017532u, 1658658271u, 366619977u, 2362670323u, 4224994405u, - 1303535960u, 984961486u, 2747007092u, 3569037538u, 1256170817u, 1037604311u, 2765210733u, 3554079995u, - 1131014506u, 879679996u, 2909243462u, 3663771856u, 1141124467u, 855842277u, 2852801631u, 3708648649u, - 1342533948u, 654459306u, 3188396048u, 3373015174u, 1466479909u, 544179635u, 3110523913u, 3462522015u, - 1591671054u, 702138776u, 2966460450u, 3352799412u, 1504918807u, 783551873u, 3082640443u, 3233442989u, - 3988292384u, 2596254646u, 62317068u, 1957810842u, 3939845945u, 2647816111u, 81470997u, 1943803523u, - 3814918930u, 2489596804u, 225274430u, 2053790376u, 3826175755u, 2466906013u, 167816743u, 2097651377u, - 4027552580u, 2265490386u, 503444072u, 1762050814u, 4150417245u, 2154129355u, 426522225u, 1852507879u, - 4275313526u, 2312317920u, 282753626u, 1742555852u, 4189708143u, 2394877945u, 397917763u, 1622183637u, - 3604390888u, 2714866558u, 953729732u, 1340076626u, 3518719985u, 2797360999u, 1068828381u, 1219638859u, - 3624741850u, 2936675148u, 906185462u, 1090812512u, 3747672003u, 2825379669u, 829329135u, 1181335161u, - 3412177804u, 3160834842u, 628085408u, 1382605366u, 3423369109u, 3138078467u, 570562233u, 1426400815u, - 3317316542u, 2998733608u, 733239954u, 1555261956u, 3268935591u, 3050360625u, 752459403u, 1541320221u, - 2607071920u, 3965973030u, 1969922972u, 40735498u, 2617837225u, 3943577151u, 1913087877u, 83908371u, - 2512341634u, 3803740692u, 2075208622u, 213261112u, 2463272603u, 3855990285u, 2094854071u, 198958881u, - 2262029012u, 4057260610u, 1759359992u, 534414190u, 2176718541u, 4139329115u, 1873836001u, 414664567u, - 2282248934u, 4279200368u, 1711684554u, 285281116u, 2405801727u, 4167216745u, 1634467795u, 376229701u, - 2685067896u, 3608007406u, 1308918612u, 956543938u, 2808555105u, 3495958263u, 1231636301u, 1047427035u, - 2932959818u, 3654703836u, 1088359270u, 936918000u, 2847714899u, 3736837829u, 1202900863u, 817233897u, - 3183342108u, 3401237130u, 1404277552u, 615818150u, 3134207493u, 3453421203u, 1423857449u, 601450431u, - 3009837614u, 3294710456u, 1567103746u, 711928724u, 3020668471u, 3272380065u, 1510334235u, 755167117u -}; - -/*Return the CRC of the bytes buf[0..len-1].*/ -unsigned lodepng_crc32(const unsigned char* buf, size_t len) -{ - unsigned c = 0xffffffffL; - size_t n; - - for(n = 0; n < len; ++n) - { - c = lodepng_crc32_table[(c ^ buf[n]) & 0xff] ^ (c >> 8); - } - return c ^ 0xffffffffL; -} - -/* ////////////////////////////////////////////////////////////////////////// */ -/* / Reading and writing single bits and bytes from/to stream for LodePNG / */ -/* ////////////////////////////////////////////////////////////////////////// */ - -static unsigned char readBitFromReversedStream(size_t* bitpointer, const unsigned char* bitstream) -{ - unsigned char result = (unsigned char)((bitstream[(*bitpointer) >> 3] >> (7 - ((*bitpointer) & 0x7))) & 1); - ++(*bitpointer); - return result; -} - -static unsigned readBitsFromReversedStream(size_t* bitpointer, const unsigned char* bitstream, size_t nbits) -{ - unsigned result = 0; - size_t i; - for(i = nbits - 1; i < nbits; --i) - { - result += (unsigned)readBitFromReversedStream(bitpointer, bitstream) << i; - } - return result; -} - -#ifdef LODEPNG_COMPILE_DECODER -static void setBitOfReversedStream0(size_t* bitpointer, unsigned char* bitstream, unsigned char bit) -{ - /*the current bit in bitstream must be 0 for this to work*/ - if(bit) - { - /*earlier bit of huffman code is in a lesser significant bit of an earlier byte*/ - bitstream[(*bitpointer) >> 3] |= (bit << (7 - ((*bitpointer) & 0x7))); - } - ++(*bitpointer); -} -#endif /*LODEPNG_COMPILE_DECODER*/ - -static void setBitOfReversedStream(size_t* bitpointer, unsigned char* bitstream, unsigned char bit) -{ - /*the current bit in bitstream may be 0 or 1 for this to work*/ - if(bit == 0) bitstream[(*bitpointer) >> 3] &= (unsigned char)(~(1 << (7 - ((*bitpointer) & 0x7)))); - else bitstream[(*bitpointer) >> 3] |= (1 << (7 - ((*bitpointer) & 0x7))); - ++(*bitpointer); -} - -/* ////////////////////////////////////////////////////////////////////////// */ -/* / PNG chunks / */ -/* ////////////////////////////////////////////////////////////////////////// */ - -unsigned lodepng_chunk_length(const unsigned char* chunk) -{ - return lodepng_read32bitInt(&chunk[0]); -} - -unsigned char lodepng_chunk_type_equals(const unsigned char* chunk, const char* type) -{ - if(strlen(type) != 4) return 0; - return (chunk[4] == type[0] && chunk[5] == type[1] && chunk[6] == type[2] && chunk[7] == type[3]); -} - -unsigned char lodepng_chunk_ancillary(const unsigned char* chunk) -{ - return((chunk[4] & 32) != 0); -} - -const unsigned char* lodepng_chunk_data_const(const unsigned char* chunk) -{ - return &chunk[8]; -} - -unsigned lodepng_chunk_check_crc(const unsigned char* chunk) -{ - unsigned length = lodepng_chunk_length(chunk); - unsigned CRC = lodepng_read32bitInt(&chunk[length + 8]); - /*the CRC is taken of the data and the 4 chunk type letters, not the length*/ - unsigned checksum = lodepng_crc32(&chunk[4], length + 4); - if(CRC != checksum) return 1; - else return 0; -} - -unsigned char* lodepng_chunk_next(unsigned char* chunk) -{ - unsigned total_chunk_length = lodepng_chunk_length(chunk) + 12; - return &chunk[total_chunk_length]; -} - -const unsigned char* lodepng_chunk_next_const(const unsigned char* chunk) -{ - unsigned total_chunk_length = lodepng_chunk_length(chunk) + 12; - return &chunk[total_chunk_length]; -} - -unsigned lodepng_chunk_append(unsigned char** out, size_t* outlength, const unsigned char* chunk) -{ - unsigned i; - unsigned total_chunk_length = lodepng_chunk_length(chunk) + 12; - unsigned char *chunk_start, *new_buffer; - size_t new_length = (*outlength) + total_chunk_length; - if(new_length < total_chunk_length || new_length < (*outlength)) return 77; /*integer overflow happened*/ - - new_buffer = (unsigned char*)lodepng_realloc(*out, new_length); - if(!new_buffer) return 83; /*alloc fail*/ - (*out) = new_buffer; - (*outlength) = new_length; - chunk_start = &(*out)[new_length - total_chunk_length]; - - for(i = 0; i != total_chunk_length; ++i) chunk_start[i] = chunk[i]; - - return 0; -} - -/* ////////////////////////////////////////////////////////////////////////// */ -/* / Color types and such / */ -/* ////////////////////////////////////////////////////////////////////////// */ - -/*return type is a LodePNG error code*/ -static unsigned checkColorValidity(LodePNGColorType colortype, unsigned bd) /*bd = bitdepth*/ -{ - switch(colortype) - { - case 0: if(!(bd == 1 || bd == 2 || bd == 4 || bd == 8 || bd == 16)) return 37; break; /*grey*/ - case 2: if(!( bd == 8 || bd == 16)) return 37; break; /*RGB*/ - case 3: if(!(bd == 1 || bd == 2 || bd == 4 || bd == 8 )) return 37; break; /*palette*/ - case 4: if(!( bd == 8 || bd == 16)) return 37; break; /*grey + alpha*/ - case 6: if(!( bd == 8 || bd == 16)) return 37; break; /*RGBA*/ - default: return 31; - } - return 0; /*allowed color type / bits combination*/ -} - -static unsigned getNumColorChannels(LodePNGColorType colortype) -{ - switch(colortype) - { - case 0: return 1; /*grey*/ - case 2: return 3; /*RGB*/ - case 3: return 1; /*palette*/ - case 4: return 2; /*grey + alpha*/ - case 6: return 4; /*RGBA*/ - } - return 0; /*unexisting color type*/ -} - -static unsigned lodepng_get_bpp_lct(LodePNGColorType colortype, unsigned bitdepth) -{ - /*bits per pixel is amount of channels * bits per channel*/ - return getNumColorChannels(colortype) * bitdepth; -} - -/* ////////////////////////////////////////////////////////////////////////// */ - -void lodepng_color_mode_init(LodePNGColorMode* info) -{ - info->key_defined = 0; - info->key_r = info->key_g = info->key_b = 0; - info->colortype = LCT_RGBA; - info->bitdepth = 8; - info->palette = 0; - info->palettesize = 0; -} - -void lodepng_color_mode_cleanup(LodePNGColorMode* info) -{ - lodepng_palette_clear(info); -} - -unsigned lodepng_color_mode_copy(LodePNGColorMode* dest, const LodePNGColorMode* source) -{ - size_t i; - lodepng_color_mode_cleanup(dest); - *dest = *source; - if(source->palette) - { - dest->palette = (unsigned char*)lodepng_malloc(1024); - if(!dest->palette && source->palettesize) return 83; /*alloc fail*/ - for(i = 0; i != source->palettesize * 4; ++i) dest->palette[i] = source->palette[i]; - } - return 0; -} - -static int lodepng_color_mode_equal(const LodePNGColorMode* a, const LodePNGColorMode* b) -{ - size_t i; - if(a->colortype != b->colortype) return 0; - if(a->bitdepth != b->bitdepth) return 0; - if(a->key_defined != b->key_defined) return 0; - if(a->key_defined) - { - if(a->key_r != b->key_r) return 0; - if(a->key_g != b->key_g) return 0; - if(a->key_b != b->key_b) return 0; - } - if(a->palettesize != b->palettesize) return 0; - for(i = 0; i != a->palettesize * 4; ++i) - { - if(a->palette[i] != b->palette[i]) return 0; - } - return 1; -} - -void lodepng_palette_clear(LodePNGColorMode* info) -{ - if(info->palette) lodepng_free(info->palette); - info->palette = 0; - info->palettesize = 0; -} - -unsigned lodepng_get_bpp(const LodePNGColorMode* info) -{ - /*calculate bits per pixel out of colortype and bitdepth*/ - return lodepng_get_bpp_lct(info->colortype, info->bitdepth); -} - -size_t lodepng_get_raw_size(unsigned w, unsigned h, const LodePNGColorMode* color) -{ - return (w * h * lodepng_get_bpp(color) + 7) / 8; -} - -#ifdef LODEPNG_COMPILE_PNG -#ifdef LODEPNG_COMPILE_DECODER -/*in an idat chunk, each scanline is a multiple of 8 bits, unlike the lodepng output buffer*/ -static size_t lodepng_get_raw_size_idat(unsigned w, unsigned h, const LodePNGColorMode* color) -{ - return h * ((w * lodepng_get_bpp(color) + 7) / 8); -} -#endif /*LODEPNG_COMPILE_DECODER*/ -#endif /*LODEPNG_COMPILE_PNG*/ - -#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS - -static void LodePNGUnknownChunks_init(LodePNGInfo* info) -{ - unsigned i; - for(i = 0; i != 3; ++i) info->unknown_chunks_data[i] = 0; - for(i = 0; i != 3; ++i) info->unknown_chunks_size[i] = 0; -} - -static void LodePNGUnknownChunks_cleanup(LodePNGInfo* info) -{ - unsigned i; - for(i = 0; i != 3; ++i) lodepng_free(info->unknown_chunks_data[i]); -} - -static void LodePNGText_init(LodePNGInfo* info) -{ - info->text_num = 0; - info->text_keys = NULL; - info->text_strings = NULL; -} - -static void LodePNGText_cleanup(LodePNGInfo* info) -{ - size_t i; - for(i = 0; i != info->text_num; ++i) - { - string_cleanup(&info->text_keys[i]); - string_cleanup(&info->text_strings[i]); - } - lodepng_free(info->text_keys); - lodepng_free(info->text_strings); -} - -unsigned lodepng_add_text(LodePNGInfo* info, const char* key, const char* str) -{ - char** new_keys = (char**)(lodepng_realloc(info->text_keys, sizeof(char*) * (info->text_num + 1))); - char** new_strings = (char**)(lodepng_realloc(info->text_strings, sizeof(char*) * (info->text_num + 1))); - if(!new_keys || !new_strings) - { - lodepng_free(new_keys); - lodepng_free(new_strings); - return 83; /*alloc fail*/ - } - - ++info->text_num; - info->text_keys = new_keys; - info->text_strings = new_strings; - - string_init(&info->text_keys[info->text_num - 1]); - string_set(&info->text_keys[info->text_num - 1], key); - - string_init(&info->text_strings[info->text_num - 1]); - string_set(&info->text_strings[info->text_num - 1], str); - - return 0; -} - -/******************************************************************************/ - -static void LodePNGIText_init(LodePNGInfo* info) -{ - info->itext_num = 0; - info->itext_keys = NULL; - info->itext_langtags = NULL; - info->itext_transkeys = NULL; - info->itext_strings = NULL; -} - -static void LodePNGIText_cleanup(LodePNGInfo* info) -{ - size_t i; - for(i = 0; i != info->itext_num; ++i) - { - string_cleanup(&info->itext_keys[i]); - string_cleanup(&info->itext_langtags[i]); - string_cleanup(&info->itext_transkeys[i]); - string_cleanup(&info->itext_strings[i]); - } - lodepng_free(info->itext_keys); - lodepng_free(info->itext_langtags); - lodepng_free(info->itext_transkeys); - lodepng_free(info->itext_strings); -} - -#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ - -void lodepng_info_init(LodePNGInfo* info) -{ - lodepng_color_mode_init(&info->color); - info->interlace_method = 0; - info->compression_method = 0; - info->filter_method = 0; -#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS - info->background_defined = 0; - info->background_r = info->background_g = info->background_b = 0; - - LodePNGText_init(info); - LodePNGIText_init(info); - - info->time_defined = 0; - info->phys_defined = 0; - - LodePNGUnknownChunks_init(info); -#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ -} - -void lodepng_info_cleanup(LodePNGInfo* info) -{ - lodepng_color_mode_cleanup(&info->color); -#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS - LodePNGText_cleanup(info); - LodePNGIText_cleanup(info); - - LodePNGUnknownChunks_cleanup(info); -#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ -} - -/*index: bitgroup index, bits: bitgroup size(1, 2 or 4), in: bitgroup value, out: octet array to add bits to*/ -static void addColorBits(unsigned char* out, size_t index, unsigned bits, unsigned in) -{ - unsigned m = bits == 1 ? 7 : bits == 2 ? 3 : 1; /*8 / bits - 1*/ - /*p = the partial index in the byte, e.g. with 4 palettebits it is 0 for first half or 1 for second half*/ - unsigned p = index & m; - in &= (1u << bits) - 1u; /*filter out any other bits of the input value*/ - in = in << (bits * (m - p)); - if(p == 0) out[index * bits / 8] = in; - else out[index * bits / 8] |= in; -} - -typedef struct ColorTree ColorTree; - -/* -One node of a color tree -This is the data structure used to count the number of unique colors and to get a palette -index for a color. It's like an octree, but because the alpha channel is used too, each -node has 16 instead of 8 children. -*/ -struct ColorTree -{ - ColorTree* children[16]; /*up to 16 pointers to ColorTree of next level*/ - int index; /*the payload. Only has a meaningful value if this is in the last level*/ -}; - -static void color_tree_init(ColorTree* tree) -{ - int i; - for(i = 0; i != 16; ++i) tree->children[i] = 0; - tree->index = -1; -} - -static void color_tree_cleanup(ColorTree* tree) -{ - int i; - for(i = 0; i != 16; ++i) - { - if(tree->children[i]) - { - color_tree_cleanup(tree->children[i]); - lodepng_free(tree->children[i]); - } - } -} - -/*returns -1 if color not present, its index otherwise*/ -static int color_tree_get(ColorTree* tree, unsigned char r, unsigned char g, unsigned char b, unsigned char a) -{ - int bit = 0; - for(bit = 0; bit < 8; ++bit) - { - int i = 8 * ((r >> bit) & 1) + 4 * ((g >> bit) & 1) + 2 * ((b >> bit) & 1) + 1 * ((a >> bit) & 1); - if(!tree->children[i]) return -1; - else tree = tree->children[i]; - } - return tree ? tree->index : -1; -} - -/*color is not allowed to already exist. -Index should be >= 0 (it's signed to be compatible with using -1 for "doesn't exist")*/ -static void color_tree_add(ColorTree* tree, - unsigned char r, unsigned char g, unsigned char b, unsigned char a, unsigned index) -{ - int bit; - for(bit = 0; bit < 8; ++bit) - { - int i = 8 * ((r >> bit) & 1) + 4 * ((g >> bit) & 1) + 2 * ((b >> bit) & 1) + 1 * ((a >> bit) & 1); - if(!tree->children[i]) - { - tree->children[i] = (ColorTree*)lodepng_malloc(sizeof(ColorTree)); - color_tree_init(tree->children[i]); - } - tree = tree->children[i]; - } - tree->index = (int)index; -} - -/*put a pixel, given its RGBA color, into image of any color type*/ -static unsigned rgba8ToPixel(unsigned char* out, size_t i, - const LodePNGColorMode* mode, ColorTree* tree /*for palette*/, - unsigned char r, unsigned char g, unsigned char b, unsigned char a) -{ - if(mode->colortype == LCT_GREY) - { - unsigned char grey = r; /*((unsigned short)r + g + b) / 3*/; - if(mode->bitdepth == 8) out[i] = grey; - else if(mode->bitdepth == 16) out[i * 2 + 0] = out[i * 2 + 1] = grey; - else - { - /*take the most significant bits of grey*/ - grey = (grey >> (8 - mode->bitdepth)) & ((1 << mode->bitdepth) - 1); - addColorBits(out, i, mode->bitdepth, grey); - } - } - else if(mode->colortype == LCT_RGB) - { - if(mode->bitdepth == 8) - { - out[i * 3 + 0] = r; - out[i * 3 + 1] = g; - out[i * 3 + 2] = b; - } - else - { - out[i * 6 + 0] = out[i * 6 + 1] = r; - out[i * 6 + 2] = out[i * 6 + 3] = g; - out[i * 6 + 4] = out[i * 6 + 5] = b; - } - } - else if(mode->colortype == LCT_PALETTE) - { - int index = color_tree_get(tree, r, g, b, a); - if(index < 0) return 82; /*color not in palette*/ - if(mode->bitdepth == 8) out[i] = index; - else addColorBits(out, i, mode->bitdepth, (unsigned)index); - } - else if(mode->colortype == LCT_GREY_ALPHA) - { - unsigned char grey = r; /*((unsigned short)r + g + b) / 3*/; - if(mode->bitdepth == 8) - { - out[i * 2 + 0] = grey; - out[i * 2 + 1] = a; - } - else if(mode->bitdepth == 16) - { - out[i * 4 + 0] = out[i * 4 + 1] = grey; - out[i * 4 + 2] = out[i * 4 + 3] = a; - } - } - else if(mode->colortype == LCT_RGBA) - { - if(mode->bitdepth == 8) - { - out[i * 4 + 0] = r; - out[i * 4 + 1] = g; - out[i * 4 + 2] = b; - out[i * 4 + 3] = a; - } - else - { - out[i * 8 + 0] = out[i * 8 + 1] = r; - out[i * 8 + 2] = out[i * 8 + 3] = g; - out[i * 8 + 4] = out[i * 8 + 5] = b; - out[i * 8 + 6] = out[i * 8 + 7] = a; - } - } - - return 0; /*no error*/ -} - -/*put a pixel, given its RGBA16 color, into image of any color 16-bitdepth type*/ -static void rgba16ToPixel(unsigned char* out, size_t i, - const LodePNGColorMode* mode, - unsigned short r, unsigned short g, unsigned short b, unsigned short a) -{ - if(mode->colortype == LCT_GREY) - { - unsigned short grey = r; /*((unsigned)r + g + b) / 3*/; - out[i * 2 + 0] = (grey >> 8) & 255; - out[i * 2 + 1] = grey & 255; - } - else if(mode->colortype == LCT_RGB) - { - out[i * 6 + 0] = (r >> 8) & 255; - out[i * 6 + 1] = r & 255; - out[i * 6 + 2] = (g >> 8) & 255; - out[i * 6 + 3] = g & 255; - out[i * 6 + 4] = (b >> 8) & 255; - out[i * 6 + 5] = b & 255; - } - else if(mode->colortype == LCT_GREY_ALPHA) - { - unsigned short grey = r; /*((unsigned)r + g + b) / 3*/; - out[i * 4 + 0] = (grey >> 8) & 255; - out[i * 4 + 1] = grey & 255; - out[i * 4 + 2] = (a >> 8) & 255; - out[i * 4 + 3] = a & 255; - } - else if(mode->colortype == LCT_RGBA) - { - out[i * 8 + 0] = (r >> 8) & 255; - out[i * 8 + 1] = r & 255; - out[i * 8 + 2] = (g >> 8) & 255; - out[i * 8 + 3] = g & 255; - out[i * 8 + 4] = (b >> 8) & 255; - out[i * 8 + 5] = b & 255; - out[i * 8 + 6] = (a >> 8) & 255; - out[i * 8 + 7] = a & 255; - } -} - -/*Get RGBA8 color of pixel with index i (y * width + x) from the raw image with given color type.*/ -static void getPixelColorRGBA8(unsigned char* r, unsigned char* g, - unsigned char* b, unsigned char* a, - const unsigned char* in, size_t i, - const LodePNGColorMode* mode) -{ - if(mode->colortype == LCT_GREY) - { - if(mode->bitdepth == 8) - { - *r = *g = *b = in[i]; - if(mode->key_defined && *r == mode->key_r) *a = 0; - else *a = 255; - } - else if(mode->bitdepth == 16) - { - *r = *g = *b = in[i * 2 + 0]; - if(mode->key_defined && 256U * in[i * 2 + 0] + in[i * 2 + 1] == mode->key_r) *a = 0; - else *a = 255; - } - else - { - unsigned highest = ((1U << mode->bitdepth) - 1U); /*highest possible value for this bit depth*/ - size_t j = i * mode->bitdepth; - unsigned value = readBitsFromReversedStream(&j, in, mode->bitdepth); - *r = *g = *b = (value * 255) / highest; - if(mode->key_defined && value == mode->key_r) *a = 0; - else *a = 255; - } - } - else if(mode->colortype == LCT_RGB) - { - if(mode->bitdepth == 8) - { - *r = in[i * 3 + 0]; *g = in[i * 3 + 1]; *b = in[i * 3 + 2]; - if(mode->key_defined && *r == mode->key_r && *g == mode->key_g && *b == mode->key_b) *a = 0; - else *a = 255; - } - else - { - *r = in[i * 6 + 0]; - *g = in[i * 6 + 2]; - *b = in[i * 6 + 4]; - if(mode->key_defined && 256U * in[i * 6 + 0] + in[i * 6 + 1] == mode->key_r - && 256U * in[i * 6 + 2] + in[i * 6 + 3] == mode->key_g - && 256U * in[i * 6 + 4] + in[i * 6 + 5] == mode->key_b) *a = 0; - else *a = 255; - } - } - else if(mode->colortype == LCT_PALETTE) - { - unsigned index; - if(mode->bitdepth == 8) index = in[i]; - else - { - size_t j = i * mode->bitdepth; - index = readBitsFromReversedStream(&j, in, mode->bitdepth); - } - - if(index >= mode->palettesize) - { - /*This is an error according to the PNG spec, but common PNG decoders make it black instead. - Done here too, slightly faster due to no error handling needed.*/ - *r = *g = *b = 0; - *a = 255; - } - else - { - *r = mode->palette[index * 4 + 0]; - *g = mode->palette[index * 4 + 1]; - *b = mode->palette[index * 4 + 2]; - *a = mode->palette[index * 4 + 3]; - } - } - else if(mode->colortype == LCT_GREY_ALPHA) - { - if(mode->bitdepth == 8) - { - *r = *g = *b = in[i * 2 + 0]; - *a = in[i * 2 + 1]; - } - else - { - *r = *g = *b = in[i * 4 + 0]; - *a = in[i * 4 + 2]; - } - } - else if(mode->colortype == LCT_RGBA) - { - if(mode->bitdepth == 8) - { - *r = in[i * 4 + 0]; - *g = in[i * 4 + 1]; - *b = in[i * 4 + 2]; - *a = in[i * 4 + 3]; - } - else - { - *r = in[i * 8 + 0]; - *g = in[i * 8 + 2]; - *b = in[i * 8 + 4]; - *a = in[i * 8 + 6]; - } - } -} - -/*Similar to getPixelColorRGBA8, but with all the for loops inside of the color -mode test cases, optimized to convert the colors much faster, when converting -to RGBA or RGB with 8 bit per cannel. buffer must be RGBA or RGB output with -enough memory, if has_alpha is true the output is RGBA. mode has the color mode -of the input buffer.*/ -static void getPixelColorsRGBA8(unsigned char* buffer, size_t numpixels, - unsigned has_alpha, const unsigned char* in, - const LodePNGColorMode* mode) -{ - unsigned num_channels = has_alpha ? 4 : 3; - size_t i; - if(mode->colortype == LCT_GREY) - { - if(mode->bitdepth == 8) - { - for(i = 0; i != numpixels; ++i, buffer += num_channels) - { - buffer[0] = buffer[1] = buffer[2] = in[i]; - if(has_alpha) buffer[3] = mode->key_defined && in[i] == mode->key_r ? 0 : 255; - } - } - else if(mode->bitdepth == 16) - { - for(i = 0; i != numpixels; ++i, buffer += num_channels) - { - buffer[0] = buffer[1] = buffer[2] = in[i * 2]; - if(has_alpha) buffer[3] = mode->key_defined && 256U * in[i * 2 + 0] + in[i * 2 + 1] == mode->key_r ? 0 : 255; - } - } - else - { - unsigned highest = ((1U << mode->bitdepth) - 1U); /*highest possible value for this bit depth*/ - size_t j = 0; - for(i = 0; i != numpixels; ++i, buffer += num_channels) - { - unsigned value = readBitsFromReversedStream(&j, in, mode->bitdepth); - buffer[0] = buffer[1] = buffer[2] = (value * 255) / highest; - if(has_alpha) buffer[3] = mode->key_defined && value == mode->key_r ? 0 : 255; - } - } - } - else if(mode->colortype == LCT_RGB) - { - if(mode->bitdepth == 8) - { - for(i = 0; i != numpixels; ++i, buffer += num_channels) - { - buffer[0] = in[i * 3 + 0]; - buffer[1] = in[i * 3 + 1]; - buffer[2] = in[i * 3 + 2]; - if(has_alpha) buffer[3] = mode->key_defined && buffer[0] == mode->key_r - && buffer[1]== mode->key_g && buffer[2] == mode->key_b ? 0 : 255; - } - } - else - { - for(i = 0; i != numpixels; ++i, buffer += num_channels) - { - buffer[0] = in[i * 6 + 0]; - buffer[1] = in[i * 6 + 2]; - buffer[2] = in[i * 6 + 4]; - if(has_alpha) buffer[3] = mode->key_defined - && 256U * in[i * 6 + 0] + in[i * 6 + 1] == mode->key_r - && 256U * in[i * 6 + 2] + in[i * 6 + 3] == mode->key_g - && 256U * in[i * 6 + 4] + in[i * 6 + 5] == mode->key_b ? 0 : 255; - } - } - } - else if(mode->colortype == LCT_PALETTE) - { - unsigned index; - size_t j = 0; - for(i = 0; i != numpixels; ++i, buffer += num_channels) - { - if(mode->bitdepth == 8) index = in[i]; - else index = readBitsFromReversedStream(&j, in, mode->bitdepth); - - if(index >= mode->palettesize) - { - /*This is an error according to the PNG spec, but most PNG decoders make it black instead. - Done here too, slightly faster due to no error handling needed.*/ - buffer[0] = buffer[1] = buffer[2] = 0; - if(has_alpha) buffer[3] = 255; - } - else - { - buffer[0] = mode->palette[index * 4 + 0]; - buffer[1] = mode->palette[index * 4 + 1]; - buffer[2] = mode->palette[index * 4 + 2]; - if(has_alpha) buffer[3] = mode->palette[index * 4 + 3]; - } - } - } - else if(mode->colortype == LCT_GREY_ALPHA) - { - if(mode->bitdepth == 8) - { - for(i = 0; i != numpixels; ++i, buffer += num_channels) - { - buffer[0] = buffer[1] = buffer[2] = in[i * 2 + 0]; - if(has_alpha) buffer[3] = in[i * 2 + 1]; - } - } - else - { - for(i = 0; i != numpixels; ++i, buffer += num_channels) - { - buffer[0] = buffer[1] = buffer[2] = in[i * 4 + 0]; - if(has_alpha) buffer[3] = in[i * 4 + 2]; - } - } - } - else if(mode->colortype == LCT_RGBA) - { - if(mode->bitdepth == 8) - { - for(i = 0; i != numpixels; ++i, buffer += num_channels) - { - buffer[0] = in[i * 4 + 0]; - buffer[1] = in[i * 4 + 1]; - buffer[2] = in[i * 4 + 2]; - if(has_alpha) buffer[3] = in[i * 4 + 3]; - } - } - else - { - for(i = 0; i != numpixels; ++i, buffer += num_channels) - { - buffer[0] = in[i * 8 + 0]; - buffer[1] = in[i * 8 + 2]; - buffer[2] = in[i * 8 + 4]; - if(has_alpha) buffer[3] = in[i * 8 + 6]; - } - } - } -} - -/*Get RGBA16 color of pixel with index i (y * width + x) from the raw image with -given color type, but the given color type must be 16-bit itself.*/ -static void getPixelColorRGBA16(unsigned short* r, unsigned short* g, unsigned short* b, unsigned short* a, - const unsigned char* in, size_t i, const LodePNGColorMode* mode) -{ - if(mode->colortype == LCT_GREY) - { - *r = *g = *b = 256 * in[i * 2 + 0] + in[i * 2 + 1]; - if(mode->key_defined && 256U * in[i * 2 + 0] + in[i * 2 + 1] == mode->key_r) *a = 0; - else *a = 65535; - } - else if(mode->colortype == LCT_RGB) - { - *r = 256 * in[i * 6 + 0] + in[i * 6 + 1]; - *g = 256 * in[i * 6 + 2] + in[i * 6 + 3]; - *b = 256 * in[i * 6 + 4] + in[i * 6 + 5]; - if(mode->key_defined && 256U * in[i * 6 + 0] + in[i * 6 + 1] == mode->key_r - && 256U * in[i * 6 + 2] + in[i * 6 + 3] == mode->key_g - && 256U * in[i * 6 + 4] + in[i * 6 + 5] == mode->key_b) *a = 0; - else *a = 65535; - } - else if(mode->colortype == LCT_GREY_ALPHA) - { - *r = *g = *b = 256 * in[i * 4 + 0] + in[i * 4 + 1]; - *a = 256 * in[i * 4 + 2] + in[i * 4 + 3]; - } - else if(mode->colortype == LCT_RGBA) - { - *r = 256 * in[i * 8 + 0] + in[i * 8 + 1]; - *g = 256 * in[i * 8 + 2] + in[i * 8 + 3]; - *b = 256 * in[i * 8 + 4] + in[i * 8 + 5]; - *a = 256 * in[i * 8 + 6] + in[i * 8 + 7]; - } -} - -unsigned lodepng_convert(unsigned char* out, const unsigned char* in, - LodePNGColorMode* mode_out, const LodePNGColorMode* mode_in, - unsigned w, unsigned h) -{ - size_t i; - ColorTree tree; - size_t numpixels = w * h; - - if(lodepng_color_mode_equal(mode_out, mode_in)) - { - size_t numbytes = lodepng_get_raw_size(w, h, mode_in); - for(i = 0; i != numbytes; ++i) out[i] = in[i]; - return 0; - } - - if(mode_out->colortype == LCT_PALETTE) - { - size_t palsize = 1u << mode_out->bitdepth; - if(mode_out->palettesize < palsize) palsize = mode_out->palettesize; - color_tree_init(&tree); - for(i = 0; i != palsize; ++i) - { - unsigned char* p = &mode_out->palette[i * 4]; - color_tree_add(&tree, p[0], p[1], p[2], p[3], i); - } - } - - if(mode_in->bitdepth == 16 && mode_out->bitdepth == 16) - { - for(i = 0; i != numpixels; ++i) - { - unsigned short r = 0, g = 0, b = 0, a = 0; - getPixelColorRGBA16(&r, &g, &b, &a, in, i, mode_in); - rgba16ToPixel(out, i, mode_out, r, g, b, a); - } - } - else if(mode_out->bitdepth == 8 && mode_out->colortype == LCT_RGBA) - { - getPixelColorsRGBA8(out, numpixels, 1, in, mode_in); - } - else if(mode_out->bitdepth == 8 && mode_out->colortype == LCT_RGB) - { - getPixelColorsRGBA8(out, numpixels, 0, in, mode_in); - } - else - { - unsigned char r = 0, g = 0, b = 0, a = 0; - for(i = 0; i != numpixels; ++i) - { - getPixelColorRGBA8(&r, &g, &b, &a, in, i, mode_in); - rgba8ToPixel(out, i, mode_out, &tree, r, g, b, a); - } - } - - if(mode_out->colortype == LCT_PALETTE) - { - color_tree_cleanup(&tree); - } - - return 0; /*no error (this function currently never has one, but maybe OOM detection added later.)*/ -} - -/* -Paeth predicter, used by PNG filter type 4 -The parameters are of type short, but should come from unsigned chars, the shorts -are only needed to make the paeth calculation correct. -*/ -static unsigned char paethPredictor(short a, short b, short c) -{ - short pa = abs(b - c); - short pb = abs(a - c); - short pc = abs(a + b - c - c); - - if(pc < pa && pc < pb) return (unsigned char)c; - else if(pb < pa) return (unsigned char)b; - else return (unsigned char)a; -} - -/*shared values used by multiple Adam7 related functions*/ - -static const unsigned ADAM7_IX[7] = { 0, 4, 0, 2, 0, 1, 0 }; /*x start values*/ -static const unsigned ADAM7_IY[7] = { 0, 0, 4, 0, 2, 0, 1 }; /*y start values*/ -static const unsigned ADAM7_DX[7] = { 8, 8, 4, 4, 2, 2, 1 }; /*x delta values*/ -static const unsigned ADAM7_DY[7] = { 8, 8, 8, 4, 4, 2, 2 }; /*y delta values*/ - -/* -Outputs various dimensions and positions in the image related to the Adam7 reduced images. -passw: output containing the width of the 7 passes -passh: output containing the height of the 7 passes -filter_passstart: output containing the index of the start and end of each - reduced image with filter bytes -padded_passstart output containing the index of the start and end of each - reduced image when without filter bytes but with padded scanlines -passstart: output containing the index of the start and end of each reduced - image without padding between scanlines, but still padding between the images -w, h: width and height of non-interlaced image -bpp: bits per pixel -"padded" is only relevant if bpp is less than 8 and a scanline or image does not - end at a full byte -*/ -static void Adam7_getpassvalues(unsigned passw[7], unsigned passh[7], size_t filter_passstart[8], - size_t padded_passstart[8], size_t passstart[8], unsigned w, unsigned h, unsigned bpp) -{ - /*the passstart values have 8 values: the 8th one indicates the byte after the end of the 7th (= last) pass*/ - unsigned i; - - /*calculate width and height in pixels of each pass*/ - for(i = 0; i != 7; ++i) - { - passw[i] = (w + ADAM7_DX[i] - ADAM7_IX[i] - 1) / ADAM7_DX[i]; - passh[i] = (h + ADAM7_DY[i] - ADAM7_IY[i] - 1) / ADAM7_DY[i]; - if(passw[i] == 0) passh[i] = 0; - if(passh[i] == 0) passw[i] = 0; - } - - filter_passstart[0] = padded_passstart[0] = passstart[0] = 0; - for(i = 0; i != 7; ++i) - { - /*if passw[i] is 0, it's 0 bytes, not 1 (no filtertype-byte)*/ - filter_passstart[i + 1] = filter_passstart[i] - + ((passw[i] && passh[i]) ? passh[i] * (1 + (passw[i] * bpp + 7) / 8) : 0); - /*bits padded if needed to fill full byte at end of each scanline*/ - padded_passstart[i + 1] = padded_passstart[i] + passh[i] * ((passw[i] * bpp + 7) / 8); - /*only padded at end of reduced image*/ - passstart[i + 1] = passstart[i] + (passh[i] * passw[i] * bpp + 7) / 8; - } -} - -#ifdef LODEPNG_COMPILE_DECODER - -/* ////////////////////////////////////////////////////////////////////////// */ -/* / PNG Decoder / */ -/* ////////////////////////////////////////////////////////////////////////// */ - -/*read the information from the header and store it in the LodePNGInfo. return value is error*/ -unsigned lodepng_inspect(unsigned* w, unsigned* h, LodePNGState* state, - const unsigned char* in, size_t insize) -{ - LodePNGInfo* info = &state->info_png; - if(insize == 0 || in == 0) - { - CERROR_RETURN_ERROR(state->error, 48); /*error: the given data is empty*/ - } - if(insize < 33) - { - CERROR_RETURN_ERROR(state->error, 27); /*error: the data length is smaller than the length of a PNG header*/ - } - - /*when decoding a new PNG image, make sure all parameters created after previous decoding are reset*/ - lodepng_info_cleanup(info); - lodepng_info_init(info); - - if(in[0] != 137 || in[1] != 80 || in[2] != 78 || in[3] != 71 - || in[4] != 13 || in[5] != 10 || in[6] != 26 || in[7] != 10) - { - CERROR_RETURN_ERROR(state->error, 28); /*error: the first 8 bytes are not the correct PNG signature*/ - } - if(in[12] != 'I' || in[13] != 'H' || in[14] != 'D' || in[15] != 'R') - { - CERROR_RETURN_ERROR(state->error, 29); /*error: it doesn't start with a IHDR chunk!*/ - } - - /*read the values given in the header*/ - *w = lodepng_read32bitInt(&in[16]); - *h = lodepng_read32bitInt(&in[20]); - info->color.bitdepth = in[24]; - info->color.colortype = (LodePNGColorType)in[25]; - info->compression_method = in[26]; - info->filter_method = in[27]; - info->interlace_method = in[28]; - - if(*w == 0 || *h == 0) - { - CERROR_RETURN_ERROR(state->error, 93); - } - - if(!state->decoder.ignore_crc) - { - unsigned CRC = lodepng_read32bitInt(&in[29]); - unsigned checksum = lodepng_crc32(&in[12], 17); - if(CRC != checksum) - { - CERROR_RETURN_ERROR(state->error, 57); /*invalid CRC*/ - } - } - - /*error: only compression method 0 is allowed in the specification*/ - if(info->compression_method != 0) CERROR_RETURN_ERROR(state->error, 32); - /*error: only filter method 0 is allowed in the specification*/ - if(info->filter_method != 0) CERROR_RETURN_ERROR(state->error, 33); - /*error: only interlace methods 0 and 1 exist in the specification*/ - if(info->interlace_method > 1) CERROR_RETURN_ERROR(state->error, 34); - - state->error = checkColorValidity(info->color.colortype, info->color.bitdepth); - return state->error; -} - -static unsigned unfilterScanline(unsigned char* recon, const unsigned char* scanline, const unsigned char* precon, - size_t bytewidth, unsigned char filterType, size_t length) -{ - /* - For PNG filter method 0 - unfilter a PNG image scanline by scanline. when the pixels are smaller than 1 byte, - the filter works byte per byte (bytewidth = 1) - precon is the previous unfiltered scanline, recon the result, scanline the current one - the incoming scanlines do NOT include the filtertype byte, that one is given in the parameter filterType instead - recon and scanline MAY be the same memory address! precon must be disjoint. - */ - - size_t i; - switch(filterType) - { - case 0: - for(i = 0; i != length; ++i) recon[i] = scanline[i]; - break; - case 1: - for(i = 0; i != bytewidth; ++i) recon[i] = scanline[i]; - for(i = bytewidth; i < length; ++i) recon[i] = scanline[i] + recon[i - bytewidth]; - break; - case 2: - if(precon) - { - for(i = 0; i != length; ++i) recon[i] = scanline[i] + precon[i]; - } - else - { - for(i = 0; i != length; ++i) recon[i] = scanline[i]; - } - break; - case 3: - if(precon) - { - for(i = 0; i != bytewidth; ++i) recon[i] = scanline[i] + precon[i] / 2; - for(i = bytewidth; i < length; ++i) recon[i] = scanline[i] + ((recon[i - bytewidth] + precon[i]) / 2); - } - else - { - for(i = 0; i != bytewidth; ++i) recon[i] = scanline[i]; - for(i = bytewidth; i < length; ++i) recon[i] = scanline[i] + recon[i - bytewidth] / 2; - } - break; - case 4: - if(precon) - { - for(i = 0; i != bytewidth; ++i) - { - recon[i] = (scanline[i] + precon[i]); - } - for(i = bytewidth; i < length; ++i) - { - recon[i] = (scanline[i] + paethPredictor(recon[i - bytewidth], precon[i], precon[i - bytewidth])); - } - } - else - { - for(i = 0; i != bytewidth; ++i) - { - recon[i] = scanline[i]; - } - for(i = bytewidth; i < length; ++i) - { - recon[i] = (scanline[i] + recon[i - bytewidth]); - } - } - break; - default: return 36; /*error: unexisting filter type given*/ - } - return 0; -} - -static unsigned unfilter(unsigned char* out, const unsigned char* in, unsigned w, unsigned h, unsigned bpp) -{ - /* - For PNG filter method 0 - this function unfilters a single image (e.g. without interlacing this is called once, with Adam7 seven times) - out must have enough bytes allocated already, in must have the scanlines + 1 filtertype byte per scanline - w and h are image dimensions or dimensions of reduced image, bpp is bits per pixel - in and out are allowed to be the same memory address (but aren't the same size since in has the extra filter bytes) - */ - - unsigned y; - unsigned char* prevline = 0; - - /*bytewidth is used for filtering, is 1 when bpp < 8, number of bytes per pixel otherwise*/ - size_t bytewidth = (bpp + 7) / 8; - size_t linebytes = (w * bpp + 7) / 8; - - for(y = 0; y < h; ++y) - { - size_t outindex = linebytes * y; - size_t inindex = (1 + linebytes) * y; /*the extra filterbyte added to each row*/ - unsigned char filterType = in[inindex]; - - CERROR_TRY_RETURN(unfilterScanline(&out[outindex], &in[inindex + 1], prevline, bytewidth, filterType, linebytes)); - - prevline = &out[outindex]; - } - - return 0; -} - -/* -in: Adam7 interlaced image, with no padding bits between scanlines, but between - reduced images so that each reduced image starts at a byte. -out: the same pixels, but re-ordered so that they're now a non-interlaced image with size w*h -bpp: bits per pixel -out has the following size in bits: w * h * bpp. -in is possibly bigger due to padding bits between reduced images. -out must be big enough AND must be 0 everywhere if bpp < 8 in the current implementation -(because that's likely a little bit faster) -NOTE: comments about padding bits are only relevant if bpp < 8 -*/ -static void Adam7_deinterlace(unsigned char* out, const unsigned char* in, unsigned w, unsigned h, unsigned bpp) -{ - unsigned passw[7], passh[7]; - size_t filter_passstart[8], padded_passstart[8], passstart[8]; - unsigned i; - - Adam7_getpassvalues(passw, passh, filter_passstart, padded_passstart, passstart, w, h, bpp); - - if(bpp >= 8) - { - for(i = 0; i != 7; ++i) - { - unsigned x, y, b; - size_t bytewidth = bpp / 8; - for(y = 0; y < passh[i]; ++y) - for(x = 0; x < passw[i]; ++x) - { - size_t pixelinstart = passstart[i] + (y * passw[i] + x) * bytewidth; - size_t pixeloutstart = ((ADAM7_IY[i] + y * ADAM7_DY[i]) * w + ADAM7_IX[i] + x * ADAM7_DX[i]) * bytewidth; - for(b = 0; b < bytewidth; ++b) - { - out[pixeloutstart + b] = in[pixelinstart + b]; - } - } - } - } - else /*bpp < 8: Adam7 with pixels < 8 bit is a bit trickier: with bit pointers*/ - { - for(i = 0; i != 7; ++i) - { - unsigned x, y, b; - unsigned ilinebits = bpp * passw[i]; - unsigned olinebits = bpp * w; - size_t obp, ibp; /*bit pointers (for out and in buffer)*/ - for(y = 0; y < passh[i]; ++y) - for(x = 0; x < passw[i]; ++x) - { - ibp = (8 * passstart[i]) + (y * ilinebits + x * bpp); - obp = (ADAM7_IY[i] + y * ADAM7_DY[i]) * olinebits + (ADAM7_IX[i] + x * ADAM7_DX[i]) * bpp; - for(b = 0; b < bpp; ++b) - { - unsigned char bit = readBitFromReversedStream(&ibp, in); - /*note that this function assumes the out buffer is completely 0, use setBitOfReversedStream otherwise*/ - setBitOfReversedStream0(&obp, out, bit); - } - } - } - } -} - -static void removePaddingBits(unsigned char* out, const unsigned char* in, - size_t olinebits, size_t ilinebits, unsigned h) -{ - /* - After filtering there are still padding bits if scanlines have non multiple of 8 bit amounts. They need - to be removed (except at last scanline of (Adam7-reduced) image) before working with pure image buffers - for the Adam7 code, the color convert code and the output to the user. - in and out are allowed to be the same buffer, in may also be higher but still overlapping; in must - have >= ilinebits*h bits, out must have >= olinebits*h bits, olinebits must be <= ilinebits - also used to move bits after earlier such operations happened, e.g. in a sequence of reduced images from Adam7 - only useful if (ilinebits - olinebits) is a value in the range 1..7 - */ - unsigned y; - size_t diff = ilinebits - olinebits; - size_t ibp = 0, obp = 0; /*input and output bit pointers*/ - for(y = 0; y < h; ++y) - { - size_t x; - for(x = 0; x < olinebits; ++x) - { - unsigned char bit = readBitFromReversedStream(&ibp, in); - setBitOfReversedStream(&obp, out, bit); - } - ibp += diff; - } -} - -/*out must be buffer big enough to contain full image, and in must contain the full decompressed data from -the IDAT chunks (with filter index bytes and possible padding bits) -return value is error*/ -static unsigned postProcessScanlines(unsigned char* out, unsigned char* in, - unsigned w, unsigned h, const LodePNGInfo* info_png) -{ - /* - This function converts the filtered-padded-interlaced data into pure 2D image buffer with the PNG's colortype. - Steps: - *) if no Adam7: 1) unfilter 2) remove padding bits (= posible extra bits per scanline if bpp < 8) - *) if adam7: 1) 7x unfilter 2) 7x remove padding bits 3) Adam7_deinterlace - NOTE: the in buffer will be overwritten with intermediate data! - */ - unsigned bpp = lodepng_get_bpp(&info_png->color); - if(bpp == 0) return 31; /*error: invalid colortype*/ - - if(info_png->interlace_method == 0) - { - if(bpp < 8 && w * bpp != ((w * bpp + 7) / 8) * 8) - { - CERROR_TRY_RETURN(unfilter(in, in, w, h, bpp)); - removePaddingBits(out, in, w * bpp, ((w * bpp + 7) / 8) * 8, h); - } - /*we can immediatly filter into the out buffer, no other steps needed*/ - else CERROR_TRY_RETURN(unfilter(out, in, w, h, bpp)); - } - else /*interlace_method is 1 (Adam7)*/ - { - unsigned passw[7], passh[7]; size_t filter_passstart[8], padded_passstart[8], passstart[8]; - unsigned i; - - Adam7_getpassvalues(passw, passh, filter_passstart, padded_passstart, passstart, w, h, bpp); - - for(i = 0; i != 7; ++i) - { - CERROR_TRY_RETURN(unfilter(&in[padded_passstart[i]], &in[filter_passstart[i]], passw[i], passh[i], bpp)); - /*TODO: possible efficiency improvement: if in this reduced image the bits fit nicely in 1 scanline, - move bytes instead of bits or move not at all*/ - if(bpp < 8) - { - /*remove padding bits in scanlines; after this there still may be padding - bits between the different reduced images: each reduced image still starts nicely at a byte*/ - removePaddingBits(&in[passstart[i]], &in[padded_passstart[i]], passw[i] * bpp, - ((passw[i] * bpp + 7) / 8) * 8, passh[i]); - } - } - - Adam7_deinterlace(out, in, w, h, bpp); - } - - return 0; -} - -static unsigned readChunk_PLTE(LodePNGColorMode* color, const unsigned char* data, size_t chunkLength) -{ - unsigned pos = 0, i; - if(color->palette) lodepng_free(color->palette); - color->palettesize = chunkLength / 3; - color->palette = (unsigned char*)lodepng_malloc(4 * color->palettesize); - if(!color->palette && color->palettesize) - { - color->palettesize = 0; - return 83; /*alloc fail*/ - } - if(color->palettesize > 256) return 38; /*error: palette too big*/ - - for(i = 0; i != color->palettesize; ++i) - { - color->palette[4 * i + 0] = data[pos++]; /*R*/ - color->palette[4 * i + 1] = data[pos++]; /*G*/ - color->palette[4 * i + 2] = data[pos++]; /*B*/ - color->palette[4 * i + 3] = 255; /*alpha*/ - } - - return 0; /* OK */ -} - -static unsigned readChunk_tRNS(LodePNGColorMode* color, const unsigned char* data, size_t chunkLength) -{ - unsigned i; - if(color->colortype == LCT_PALETTE) - { - /*error: more alpha values given than there are palette entries*/ - if(chunkLength > color->palettesize) return 38; - - for(i = 0; i != chunkLength; ++i) color->palette[4 * i + 3] = data[i]; - } - else if(color->colortype == LCT_GREY) - { - /*error: this chunk must be 2 bytes for greyscale image*/ - if(chunkLength != 2) return 30; - - color->key_defined = 1; - color->key_r = color->key_g = color->key_b = 256u * data[0] + data[1]; - } - else if(color->colortype == LCT_RGB) - { - /*error: this chunk must be 6 bytes for RGB image*/ - if(chunkLength != 6) return 41; - - color->key_defined = 1; - color->key_r = 256u * data[0] + data[1]; - color->key_g = 256u * data[2] + data[3]; - color->key_b = 256u * data[4] + data[5]; - } - else return 42; /*error: tRNS chunk not allowed for other color models*/ - - return 0; /* OK */ -} - - -#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS -/*background color chunk (bKGD)*/ -static unsigned readChunk_bKGD(LodePNGInfo* info, const unsigned char* data, size_t chunkLength) -{ - if(info->color.colortype == LCT_PALETTE) - { - /*error: this chunk must be 1 byte for indexed color image*/ - if(chunkLength != 1) return 43; - - info->background_defined = 1; - info->background_r = info->background_g = info->background_b = data[0]; - } - else if(info->color.colortype == LCT_GREY || info->color.colortype == LCT_GREY_ALPHA) - { - /*error: this chunk must be 2 bytes for greyscale image*/ - if(chunkLength != 2) return 44; - - info->background_defined = 1; - info->background_r = info->background_g = info->background_b = 256u * data[0] + data[1]; - } - else if(info->color.colortype == LCT_RGB || info->color.colortype == LCT_RGBA) - { - /*error: this chunk must be 6 bytes for greyscale image*/ - if(chunkLength != 6) return 45; - - info->background_defined = 1; - info->background_r = 256u * data[0] + data[1]; - info->background_g = 256u * data[2] + data[3]; - info->background_b = 256u * data[4] + data[5]; - } - - return 0; /* OK */ -} - -/*text chunk (tEXt)*/ -static unsigned readChunk_tEXt(LodePNGInfo* info, const unsigned char* data, size_t chunkLength) -{ - unsigned error = 0; - char *key = 0, *str = 0; - unsigned i; - - while(!error) /*not really a while loop, only used to break on error*/ - { - unsigned length, string2_begin; - - length = 0; - while(length < chunkLength && data[length] != 0) ++length; - /*even though it's not allowed by the standard, no error is thrown if - there's no null termination char, if the text is empty*/ - if(length < 1 || length > 79) CERROR_BREAK(error, 89); /*keyword too short or long*/ - - key = (char*)lodepng_malloc(length + 1); - if(!key) CERROR_BREAK(error, 83); /*alloc fail*/ - - key[length] = 0; - for(i = 0; i != length; ++i) key[i] = (char)data[i]; - - string2_begin = length + 1; /*skip keyword null terminator*/ - - length = chunkLength < string2_begin ? 0 : chunkLength - string2_begin; - str = (char*)lodepng_malloc(length + 1); - if(!str) CERROR_BREAK(error, 83); /*alloc fail*/ - - str[length] = 0; - for(i = 0; i != length; ++i) str[i] = (char)data[string2_begin + i]; - - error = lodepng_add_text(info, key, str); - - break; - } - - lodepng_free(key); - lodepng_free(str); - - return error; -} - -static unsigned readChunk_tIME(LodePNGInfo* info, const unsigned char* data, size_t chunkLength) -{ - if(chunkLength != 7) return 73; /*invalid tIME chunk size*/ - - info->time_defined = 1; - info->time.year = 256u * data[0] + data[1]; - info->time.month = data[2]; - info->time.day = data[3]; - info->time.hour = data[4]; - info->time.minute = data[5]; - info->time.second = data[6]; - - return 0; /* OK */ -} - -static unsigned readChunk_pHYs(LodePNGInfo* info, const unsigned char* data, size_t chunkLength) -{ - if(chunkLength != 9) return 74; /*invalid pHYs chunk size*/ - - info->phys_defined = 1; - info->phys_x = 16777216u * data[0] + 65536u * data[1] + 256u * data[2] + data[3]; - info->phys_y = 16777216u * data[4] + 65536u * data[5] + 256u * data[6] + data[7]; - info->phys_unit = data[8]; - - return 0; /* OK */ -} -#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ - -/*read a PNG, the result will be in the same color type as the PNG (hence "generic")*/ -static void decodeGeneric(unsigned char** out, unsigned* w, unsigned* h, - LodePNGState* state, - const unsigned char* in, size_t insize) -{ - unsigned char IEND = 0; - const unsigned char* chunk; - size_t i; - ucvector idat; /*the data from idat chunks*/ - ucvector scanlines; - size_t predict; - size_t numpixels; - - /*for unknown chunk order*/ - unsigned unknown = 0; -#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS - unsigned critical_pos = 1; /*1 = after IHDR, 2 = after PLTE, 3 = after IDAT*/ -#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ - - /*provide some proper output values if error will happen*/ - *out = 0; - - state->error = lodepng_inspect(w, h, state, in, insize); /*reads header and resets other parameters in state->info_png*/ - if(state->error) return; - - numpixels = *w * *h; - - /*multiplication overflow*/ - if(*h != 0 && numpixels / *h != *w) CERROR_RETURN(state->error, 92); - /*multiplication overflow possible further below. Allows up to 2^31-1 pixel - bytes with 16-bit RGBA, the rest is room for filter bytes.*/ - if(numpixels > 268435455) CERROR_RETURN(state->error, 92); - - ucvector_init(&idat); - chunk = &in[33]; /*first byte of the first chunk after the header*/ - - /*loop through the chunks, ignoring unknown chunks and stopping at IEND chunk. - IDAT data is put at the start of the in buffer*/ - while(!IEND && !state->error) - { - unsigned chunkLength; - const unsigned char* data; /*the data in the chunk*/ - - /*error: size of the in buffer too small to contain next chunk*/ - if((size_t)((chunk - in) + 12) > insize || chunk < in) CERROR_BREAK(state->error, 30); - - /*length of the data of the chunk, excluding the length bytes, chunk type and CRC bytes*/ - chunkLength = lodepng_chunk_length(chunk); - /*error: chunk length larger than the max PNG chunk size*/ - if(chunkLength > 2147483647) CERROR_BREAK(state->error, 63); - - if((size_t)((chunk - in) + chunkLength + 12) > insize || (chunk + chunkLength + 12) < in) - { - CERROR_BREAK(state->error, 64); /*error: size of the in buffer too small to contain next chunk*/ - } - - data = lodepng_chunk_data_const(chunk); - - /*IDAT chunk, containing compressed image data*/ - if(lodepng_chunk_type_equals(chunk, "IDAT")) - { - size_t oldsize = idat.size; - if(!ucvector_resize(&idat, oldsize + chunkLength)) CERROR_BREAK(state->error, 83 /*alloc fail*/); - for(i = 0; i != chunkLength; ++i) idat.data[oldsize + i] = data[i]; -#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS - critical_pos = 3; -#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ - } - /*IEND chunk*/ - else if(lodepng_chunk_type_equals(chunk, "IEND")) - { - IEND = 1; - } - /*palette chunk (PLTE)*/ - else if(lodepng_chunk_type_equals(chunk, "PLTE")) - { - state->error = readChunk_PLTE(&state->info_png.color, data, chunkLength); - if(state->error) break; -#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS - critical_pos = 2; -#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ - } - /*palette transparency chunk (tRNS)*/ - else if(lodepng_chunk_type_equals(chunk, "tRNS")) - { - state->error = readChunk_tRNS(&state->info_png.color, data, chunkLength); - if(state->error) break; - } -#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS - /*background color chunk (bKGD)*/ - else if(lodepng_chunk_type_equals(chunk, "bKGD")) - { - state->error = readChunk_bKGD(&state->info_png, data, chunkLength); - if(state->error) break; - } - /*text chunk (tEXt)*/ - else if(lodepng_chunk_type_equals(chunk, "tEXt")) - { - if(state->decoder.read_text_chunks) - { - state->error = readChunk_tEXt(&state->info_png, data, chunkLength); - if(state->error) break; - } - } - else if(lodepng_chunk_type_equals(chunk, "tIME")) - { - state->error = readChunk_tIME(&state->info_png, data, chunkLength); - if(state->error) break; - } - else if(lodepng_chunk_type_equals(chunk, "pHYs")) - { - state->error = readChunk_pHYs(&state->info_png, data, chunkLength); - if(state->error) break; - } -#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ - else /*it's not an implemented chunk type, so ignore it: skip over the data*/ - { - /*error: unknown critical chunk (5th bit of first byte of chunk type is 0)*/ - if(!lodepng_chunk_ancillary(chunk)) CERROR_BREAK(state->error, 69); - - unknown = 1; -#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS - if(state->decoder.remember_unknown_chunks) - { - state->error = lodepng_chunk_append(&state->info_png.unknown_chunks_data[critical_pos - 1], - &state->info_png.unknown_chunks_size[critical_pos - 1], chunk); - if(state->error) break; - } -#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ - } - - if(!state->decoder.ignore_crc && !unknown) /*check CRC if wanted, only on known chunk types*/ - { - if(lodepng_chunk_check_crc(chunk)) CERROR_BREAK(state->error, 57); /*invalid CRC*/ - } - - if(!IEND) chunk = lodepng_chunk_next_const(chunk); - } - - ucvector_init(&scanlines); - /*predict output size, to allocate exact size for output buffer to avoid more dynamic allocation. - If the decompressed size does not match the prediction, the image must be corrupt.*/ - if(state->info_png.interlace_method == 0) - { - /*The extra *h is added because this are the filter bytes every scanline starts with*/ - predict = lodepng_get_raw_size_idat(*w, *h, &state->info_png.color) + *h; - } - else - { - /*Adam-7 interlaced: predicted size is the sum of the 7 sub-images sizes*/ - const LodePNGColorMode* color = &state->info_png.color; - predict = 0; - predict += lodepng_get_raw_size_idat((*w + 7) / 8, (*h + 7) / 8, color) + (*h + 7) / 8; - if(*w > 4) predict += lodepng_get_raw_size_idat((*w + 3) / 8, (*h + 7) / 8, color) + (*h + 7) / 8; - predict += lodepng_get_raw_size_idat((*w + 3) / 4, (*h + 3) / 8, color) + (*h + 3) / 8; - if(*w > 2) predict += lodepng_get_raw_size_idat((*w + 1) / 4, (*h + 3) / 4, color) + (*h + 3) / 4; - predict += lodepng_get_raw_size_idat((*w + 1) / 2, (*h + 1) / 4, color) + (*h + 1) / 4; - if(*w > 1) predict += lodepng_get_raw_size_idat((*w + 0) / 2, (*h + 1) / 2, color) + (*h + 1) / 2; - predict += lodepng_get_raw_size_idat((*w + 0) / 1, (*h + 0) / 2, color) + (*h + 0) / 2; - } - if(!state->error && !ucvector_reserve(&scanlines, predict)) state->error = 83; /*alloc fail*/ - if(!state->error) - { - state->error = zlib_decompress(&scanlines.data, &scanlines.size, idat.data, - idat.size, &state->decoder.zlibsettings); - if(!state->error && scanlines.size != predict) state->error = 91; /*decompressed size doesn't match prediction*/ - } - ucvector_cleanup(&idat); - - if(!state->error) - { - size_t outsize = lodepng_get_raw_size(*w, *h, &state->info_png.color); - ucvector outv; - ucvector_init(&outv); - if(!ucvector_resizev(&outv, outsize, 0)) state->error = 83; /*alloc fail*/ - if(!state->error) state->error = postProcessScanlines(outv.data, scanlines.data, *w, *h, &state->info_png); - *out = outv.data; - } - ucvector_cleanup(&scanlines); -} - -unsigned lodepng_decode(unsigned char** out, unsigned* w, unsigned* h, - LodePNGState* state, - const unsigned char* in, size_t insize) -{ - *out = 0; - decodeGeneric(out, w, h, state, in, insize); - if(state->error) return state->error; - if(!state->decoder.color_convert || lodepng_color_mode_equal(&state->info_raw, &state->info_png.color)) - { - /*same color type, no copying or converting of data needed*/ - /*store the info_png color settings on the info_raw so that the info_raw still reflects what colortype - the raw image has to the end user*/ - if(!state->decoder.color_convert) - { - state->error = lodepng_color_mode_copy(&state->info_raw, &state->info_png.color); - if(state->error) return state->error; - } - } - else - { - /*color conversion needed; sort of copy of the data*/ - unsigned char* data = *out; - size_t outsize; - - /*TODO: check if this works according to the statement in the documentation: "The converter can convert - from greyscale input color type, to 8-bit greyscale or greyscale with alpha"*/ - if(!(state->info_raw.colortype == LCT_RGB || state->info_raw.colortype == LCT_RGBA) - && !(state->info_raw.bitdepth == 8)) - { - return 56; /*unsupported color mode conversion*/ - } - - outsize = lodepng_get_raw_size(*w, *h, &state->info_raw); - *out = (unsigned char*)lodepng_malloc(outsize); - if(!(*out)) - { - state->error = 83; /*alloc fail*/ - } - else state->error = lodepng_convert(*out, data, &state->info_raw, - &state->info_png.color, *w, *h); - lodepng_free(data); - } - return state->error; -} - -unsigned lodepng_decode_memory(unsigned char** out, unsigned* w, unsigned* h, const unsigned char* in, - size_t insize, LodePNGColorType colortype, unsigned bitdepth) -{ - unsigned error; - LodePNGState state; - lodepng_state_init(&state); - state.info_raw.colortype = colortype; - state.info_raw.bitdepth = bitdepth; - error = lodepng_decode(out, w, h, &state, in, insize); - lodepng_state_cleanup(&state); - return error; -} - -void lodepng_decoder_settings_init(LodePNGDecoderSettings* settings) -{ - settings->color_convert = 1; -#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS - settings->read_text_chunks = 1; - settings->remember_unknown_chunks = 0; -#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ - settings->ignore_crc = 0; - lodepng_decompress_settings_init(&settings->zlibsettings); -} - -#endif /*LODEPNG_COMPILE_DECODER*/ - -#if defined(LODEPNG_COMPILE_DECODER) || defined(LODEPNG_COMPILE_ENCODER) - -void lodepng_state_init(LodePNGState* state) -{ -#ifdef LODEPNG_COMPILE_DECODER - lodepng_decoder_settings_init(&state->decoder); -#endif /*LODEPNG_COMPILE_DECODER*/ -#ifdef LODEPNG_COMPILE_ENCODER - lodepng_encoder_settings_init(&state->encoder); -#endif /*LODEPNG_COMPILE_ENCODER*/ - lodepng_color_mode_init(&state->info_raw); - lodepng_info_init(&state->info_png); - state->error = 1; -} - -void lodepng_state_cleanup(LodePNGState* state) -{ - lodepng_color_mode_cleanup(&state->info_raw); - lodepng_info_cleanup(&state->info_png); -} - -#endif /* defined(LODEPNG_COMPILE_DECODER) || defined(LODEPNG_COMPILE_ENCODER) */ - -#ifdef LODEPNG_COMPILE_ENCODER - -/* ////////////////////////////////////////////////////////////////////////// */ -/* / PNG Encoder / */ -/* ////////////////////////////////////////////////////////////////////////// */ - -void lodepng_encoder_settings_init(LodePNGEncoderSettings* settings) -{ - lodepng_compress_settings_init(&settings->zlibsettings); - settings->filter_palette_zero = 1; - settings->filter_strategy = LFS_MINSUM; - settings->auto_convert = 1; - settings->force_palette = 0; - settings->predefined_filters = 0; -#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS - settings->add_id = 0; - settings->text_compression = 1; -#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ -} - -#endif /*LODEPNG_COMPILE_ENCODER*/ -#endif /*LODEPNG_COMPILE_PNG*/ - -/* ////////////////////////////////////////////////////////////////////////// */ -/* ////////////////////////////////////////////////////////////////////////// */ -/* // C++ Wrapper // */ -/* ////////////////////////////////////////////////////////////////////////// */ -/* ////////////////////////////////////////////////////////////////////////// */ - -#ifdef LODEPNG_COMPILE_CPP -namespace lodepng -{ - -#ifdef LODEPNG_COMPILE_DISK -void load_file(std::vector& buffer, const std::string& filename) -{ - std::ifstream file(filename.c_str(), std::ios::in|std::ios::binary|std::ios::ate); - - /*get filesize*/ - std::streamsize size = 0; - if(file.seekg(0, std::ios::end).good()) size = file.tellg(); - if(file.seekg(0, std::ios::beg).good()) size -= file.tellg(); - - /*read contents of the file into the vector*/ - buffer.resize(size_t(size)); - if(size > 0) file.read((char*)(&buffer[0]), size); -} -#endif /* LODEPNG_COMPILE_DISK */ - -#ifdef LODEPNG_COMPILE_PNG - -State::State() -{ - lodepng_state_init(this); -} - -State::~State() -{ - lodepng_state_cleanup(this); -} - -#ifdef LODEPNG_COMPILE_DECODER - -unsigned decode(std::vector& out, unsigned& w, unsigned& h, const unsigned char* in, - size_t insize, LodePNGColorType colortype, unsigned bitdepth) -{ - unsigned char* buffer; - unsigned error = lodepng_decode_memory(&buffer, &w, &h, in, insize, colortype, bitdepth); - if(buffer && !error) - { - State state; - state.info_raw.colortype = colortype; - state.info_raw.bitdepth = bitdepth; - size_t buffersize = lodepng_get_raw_size(w, h, &state.info_raw); - out.insert(out.end(), &buffer[0], &buffer[buffersize]); - lodepng_free(buffer); - } - return error; -} - -unsigned decode(std::vector& out, unsigned& w, unsigned& h, - const std::vector& in, LodePNGColorType colortype, unsigned bitdepth) -{ - return decode(out, w, h, in.empty() ? 0 : &in[0], (unsigned)in.size(), colortype, bitdepth); -} - -#ifdef LODEPNG_COMPILE_DISK -unsigned decode(std::vector& out, unsigned& w, unsigned& h, const std::string& filename, LodePNGColorType colortype, unsigned bitdepth) -{ - std::vector buffer; - load_file(buffer, filename); - return decode(out, w, h, buffer, colortype, bitdepth); -} -#endif /* LODEPNG_COMPILE_DECODER */ -#endif /* LODEPNG_COMPILE_DISK */ -#endif /* LODEPNG_COMPILE_PNG */ - -} /* namespace lodepng */ -#endif /*LODEPNG_COMPILE_CPP*/ diff --git a/packages/stk/stk_learning/GameOfLife/LodePNG.hpp b/packages/stk/stk_learning/GameOfLife/LodePNG.hpp deleted file mode 100644 index 3e998f7d16f1..000000000000 --- a/packages/stk/stk_learning/GameOfLife/LodePNG.hpp +++ /dev/null @@ -1,1329 +0,0 @@ -/* -LodePNG version 20150418 - -Copyright (c) 2005-2015 Lode Vandevenne - -This software is provided 'as-is', without any express or implied -warranty. In no event will the authors be held liable for any damages -arising from the use of this software. - -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it -freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - - 3. This notice may not be removed or altered from any source - distribution. -*/ - -#ifndef LODEPNG_H -#define LODEPNG_H - -#include /*for size_t*/ - -#ifdef __cplusplus -#include -#include -#endif /*__cplusplus*/ - -extern const char* LODEPNG_VERSION_STRING; - -/* -The following #defines are used to create code sections. They can be disabled -to disable code sections, which can give faster compile time and smaller binary. -The "NO_COMPILE" defines are designed to be used to pass as defines to the -compiler command to disable them without modifying this header, e.g. --DLODEPNG_NO_COMPILE_ZLIB for gcc. -*/ -/*deflate & zlib. If disabled, you must specify alternative zlib functions in -the custom_zlib field of the compress and decompress settings*/ -#ifndef LODEPNG_NO_COMPILE_ZLIB -#define LODEPNG_COMPILE_ZLIB -#endif -/*png encoder and png decoder*/ -#ifndef LODEPNG_NO_COMPILE_PNG -#define LODEPNG_COMPILE_PNG -#endif -/*deflate&zlib decoder and png decoder*/ -#ifndef LODEPNG_NO_COMPILE_DECODER -#define LODEPNG_COMPILE_DECODER -#endif -/*deflate&zlib encoder and png encoder*/ -#ifndef LODEPNG_NO_COMPILE_ENCODER -#define LODEPNG_COMPILE_ENCODER -#endif -/*the optional built in harddisk file loading and saving functions*/ -#ifndef LODEPNG_NO_COMPILE_DISK -#define LODEPNG_COMPILE_DISK -#endif -/*support for chunks other than IHDR, IDAT, PLTE, tRNS, IEND: ancillary and unknown chunks*/ -#ifndef LODEPNG_NO_COMPILE_ANCILLARY_CHUNKS -#define LODEPNG_COMPILE_ANCILLARY_CHUNKS -#endif -/*ability to convert error numerical codes to English text string*/ -#ifndef LODEPNG_NO_COMPILE_ERROR_TEXT -#define LODEPNG_COMPILE_ERROR_TEXT -#endif -/*Compile the default allocators (C's free, malloc and realloc). If you disable this, -you can define the functions lodepng_free, lodepng_malloc and lodepng_realloc in your -source files with custom allocators.*/ -#ifndef LODEPNG_NO_COMPILE_ALLOCATORS -#define LODEPNG_COMPILE_ALLOCATORS -#endif -/*compile the C++ version (you can disable the C++ wrapper here even when compiling for C++)*/ -#ifdef __cplusplus -#ifndef LODEPNG_NO_COMPILE_CPP -#define LODEPNG_COMPILE_CPP -#endif -#endif - -#ifdef LODEPNG_COMPILE_PNG -/*The PNG color types (also used for raw).*/ -typedef enum LodePNGColorType -{ - LCT_GREY = 0, /*greyscale: 1,2,4,8,16 bit*/ - LCT_RGB = 2, /*RGB: 8,16 bit*/ - LCT_PALETTE = 3, /*palette: 1,2,4,8 bit*/ - LCT_GREY_ALPHA = 4, /*greyscale with alpha: 8,16 bit*/ - LCT_RGBA = 6 /*RGB with alpha: 8,16 bit*/ -} LodePNGColorType; - -#ifdef LODEPNG_COMPILE_DECODER -/* -Converts PNG data in memory to raw pixel data. -out: Output parameter. Pointer to buffer that will contain the raw pixel data. - After decoding, its size is w * h * (bytes per pixel) bytes larger than - initially. Bytes per pixel depends on colortype and bitdepth. - Must be freed after usage with free(*out). - Note: for 16-bit per channel colors, uses big endian format like PNG does. -w: Output parameter. Pointer to width of pixel data. -h: Output parameter. Pointer to height of pixel data. -in: Memory buffer with the PNG file. -insize: size of the in buffer. -colortype: the desired color type for the raw output image. See explanation on PNG color types. -bitdepth: the desired bit depth for the raw output image. See explanation on PNG color types. -Return value: LodePNG error code (0 means no error). -*/ -unsigned lodepng_decode_memory(unsigned char** out, unsigned* w, unsigned* h, - const unsigned char* in, size_t insize, - LodePNGColorType colortype, unsigned bitdepth); - -#endif /*LODEPNG_COMPILE_DECODER*/ - -#ifdef LODEPNG_COMPILE_ENCODER -#endif /*LODEPNG_COMPILE_ENCODER*/ - -#ifdef LODEPNG_COMPILE_CPP -namespace lodepng -{ -#ifdef LODEPNG_COMPILE_DECODER -/*Same as lodepng_decode_memory, but decodes to an std::vector. The colortype -is the format to output the pixels to. Default is RGBA 8-bit per channel.*/ -unsigned decode(std::vector& out, unsigned& w, unsigned& h, - const unsigned char* in, size_t insize, - LodePNGColorType colortype = LCT_RGBA, unsigned bitdepth = 8); -unsigned decode(std::vector& out, unsigned& w, unsigned& h, - const std::vector& in, - LodePNGColorType colortype = LCT_RGBA, unsigned bitdepth = 8); -#ifdef LODEPNG_COMPILE_DISK -/* -Converts PNG file from disk to raw pixel data in memory. -Same as the other decode functions, but instead takes a filename as input. -*/ -unsigned decode(std::vector& out, unsigned& w, unsigned& h, - const std::string& filename, - LodePNGColorType colortype = LCT_RGBA, unsigned bitdepth = 8); -#endif /* LODEPNG_COMPILE_DISK */ -#endif /* LODEPNG_COMPILE_DECODER */ - -#ifdef LODEPNG_COMPILE_ENCODER -/*Same as lodepng_encode_memory, but encodes to an std::vector. colortype -is that of the raw input data. The output PNG color type will be auto chosen.*/ -//unsigned encode(std::vector& out, -// const unsigned char* in, unsigned w, unsigned h, -// LodePNGColorType colortype = LCT_RGBA, unsigned bitdepth = 8); -//unsigned encode(std::vector& out, -// const std::vector& in, unsigned w, unsigned h, -// LodePNGColorType colortype = LCT_RGBA, unsigned bitdepth = 8); -#ifdef LODEPNG_COMPILE_DISK -/* -Converts 32-bit RGBA raw pixel data into a PNG file on disk. -Same as the other encode functions, but instead takes a filename as output. -NOTE: This overwrites existing files without warning! -*/ -//unsigned encode(const std::string& filename, -// const unsigned char* in, unsigned w, unsigned h, -// LodePNGColorType colortype = LCT_RGBA, unsigned bitdepth = 8); -//unsigned encode(const std::string& filename, -// const std::vector& in, unsigned w, unsigned h, -// LodePNGColorType colortype = LCT_RGBA, unsigned bitdepth = 8); -#endif /* LODEPNG_COMPILE_DISK */ -#endif /* LODEPNG_COMPILE_ENCODER */ -} /* namespace lodepng */ -#endif /*LODEPNG_COMPILE_CPP*/ -#endif /*LODEPNG_COMPILE_PNG*/ - -#ifdef LODEPNG_COMPILE_ERROR_TEXT -/*Returns an English description of the numerical error code.*/ -const char* lodepng_error_text(unsigned code); -#endif /*LODEPNG_COMPILE_ERROR_TEXT*/ - -#ifdef LODEPNG_COMPILE_DECODER -/*Settings for zlib decompression*/ -typedef struct LodePNGDecompressSettings LodePNGDecompressSettings; -struct LodePNGDecompressSettings -{ - unsigned ignore_adler32; /*if 1, continue and don't give an error message if the Adler32 checksum is corrupted*/ - - /*use custom zlib decoder instead of built in one (default: null)*/ - unsigned (*custom_zlib)(unsigned char**, size_t*, - const unsigned char*, size_t, - const LodePNGDecompressSettings*); - /*use custom deflate decoder instead of built in one (default: null) - if custom_zlib is used, custom_deflate is ignored since only the built in - zlib function will call custom_deflate*/ - unsigned (*custom_inflate)(unsigned char**, size_t*, - const unsigned char*, size_t, - const LodePNGDecompressSettings*); - - const void* custom_context; /*optional custom settings for custom functions*/ -}; - -extern const LodePNGDecompressSettings lodepng_default_decompress_settings; -void lodepng_decompress_settings_init(LodePNGDecompressSettings* settings); -#endif /*LODEPNG_COMPILE_DECODER*/ - -#ifdef LODEPNG_COMPILE_ENCODER -/* -Settings for zlib compression. Tweaking these settings tweaks the balance -between speed and compression ratio. -*/ -typedef struct LodePNGCompressSettings LodePNGCompressSettings; -struct LodePNGCompressSettings /*deflate = compress*/ -{ - /*LZ77 related settings*/ - unsigned btype; /*the block type for LZ (0, 1, 2 or 3, see zlib standard). Should be 2 for proper compression.*/ - unsigned use_lz77; /*whether or not to use LZ77. Should be 1 for proper compression.*/ - unsigned windowsize; /*must be a power of two <= 32768. higher compresses more but is slower. Default value: 2048.*/ - unsigned minmatch; /*mininum lz77 length. 3 is normally best, 6 can be better for some PNGs. Default: 0*/ - unsigned nicematch; /*stop searching if >= this length found. Set to 258 for best compression. Default: 128*/ - unsigned lazymatching; /*use lazy matching: better compression but a bit slower. Default: true*/ - - /*use custom zlib encoder instead of built in one (default: null)*/ - unsigned (*custom_zlib)(unsigned char**, size_t*, - const unsigned char*, size_t, - const LodePNGCompressSettings*); - /*use custom deflate encoder instead of built in one (default: null) - if custom_zlib is used, custom_deflate is ignored since only the built in - zlib function will call custom_deflate*/ - unsigned (*custom_deflate)(unsigned char**, size_t*, - const unsigned char*, size_t, - const LodePNGCompressSettings*); - - const void* custom_context; /*optional custom settings for custom functions*/ -}; - -extern const LodePNGCompressSettings lodepng_default_compress_settings; -void lodepng_compress_settings_init(LodePNGCompressSettings* settings); -#endif /*LODEPNG_COMPILE_ENCODER*/ - -#ifdef LODEPNG_COMPILE_PNG -/* -Color mode of an image. Contains all information required to decode the pixel -bits to RGBA colors. This information is the same as used in the PNG file -format, and is used both for PNG and raw image data in LodePNG. -*/ -typedef struct LodePNGColorMode -{ - /*header (IHDR)*/ - LodePNGColorType colortype; /*color type, see PNG standard or documentation further in this header file*/ - unsigned bitdepth; /*bits per sample, see PNG standard or documentation further in this header file*/ - - /* - palette (PLTE and tRNS) - - Dynamically allocated with the colors of the palette, including alpha. - When encoding a PNG, to store your colors in the palette of the LodePNGColorMode, first use - lodepng_palette_clear, then for each color use lodepng_palette_add. - If you encode an image without alpha with palette, don't forget to put value 255 in each A byte of the palette. - - When decoding, by default you can ignore this palette, since LodePNG already - fills the palette colors in the pixels of the raw RGBA output. - - The palette is only supported for color type 3. - */ - unsigned char* palette; /*palette in RGBARGBA... order. When allocated, must be either 0, or have size 1024*/ - size_t palettesize; /*palette size in number of colors (amount of bytes is 4 * palettesize)*/ - - /* - transparent color key (tRNS) - - This color uses the same bit depth as the bitdepth value in this struct, which can be 1-bit to 16-bit. - For greyscale PNGs, r, g and b will all 3 be set to the same. - - When decoding, by default you can ignore this information, since LodePNG sets - pixels with this key to transparent already in the raw RGBA output. - - The color key is only supported for color types 0 and 2. - */ - unsigned key_defined; /*is a transparent color key given? 0 = false, 1 = true*/ - unsigned key_r; /*red/greyscale component of color key*/ - unsigned key_g; /*green component of color key*/ - unsigned key_b; /*blue component of color key*/ -} LodePNGColorMode; - -/*init, cleanup and copy functions to use with this struct*/ -void lodepng_color_mode_init(LodePNGColorMode* info); -void lodepng_color_mode_cleanup(LodePNGColorMode* info); -/*return value is error code (0 means no error)*/ -unsigned lodepng_color_mode_copy(LodePNGColorMode* dest, const LodePNGColorMode* source); - -void lodepng_palette_clear(LodePNGColorMode* info); - -/*get the total amount of bits per pixel, based on colortype and bitdepth in the struct*/ -unsigned lodepng_get_bpp(const LodePNGColorMode* info); -/*Returns the byte size of a raw image buffer with given width, height and color mode*/ -size_t lodepng_get_raw_size(unsigned w, unsigned h, const LodePNGColorMode* color); - -#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS -/*The information of a Time chunk in PNG.*/ -typedef struct LodePNGTime -{ - unsigned year; /*2 bytes used (0-65535)*/ - unsigned month; /*1-12*/ - unsigned day; /*1-31*/ - unsigned hour; /*0-23*/ - unsigned minute; /*0-59*/ - unsigned second; /*0-60 (to allow for leap seconds)*/ -} LodePNGTime; -#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ - -/*Information about the PNG image, except pixels, width and height.*/ -typedef struct LodePNGInfo -{ - /*header (IHDR), palette (PLTE) and transparency (tRNS) chunks*/ - unsigned compression_method;/*compression method of the original file. Always 0.*/ - unsigned filter_method; /*filter method of the original file*/ - unsigned interlace_method; /*interlace method of the original file*/ - LodePNGColorMode color; /*color type and bits, palette and transparency of the PNG file*/ - -#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS - /* - suggested background color chunk (bKGD) - This color uses the same color mode as the PNG (except alpha channel), which can be 1-bit to 16-bit. - - For greyscale PNGs, r, g and b will all 3 be set to the same. When encoding - the encoder writes the red one. For palette PNGs: When decoding, the RGB value - will be stored, not a palette index. But when encoding, specify the index of - the palette in background_r, the other two are then ignored. - - The decoder does not use this background color to edit the color of pixels. - */ - unsigned background_defined; /*is a suggested background color given?*/ - unsigned background_r; /*red component of suggested background color*/ - unsigned background_g; /*green component of suggested background color*/ - unsigned background_b; /*blue component of suggested background color*/ - - /* - non-international text chunks (tEXt and zTXt) - - The char** arrays each contain num strings. The actual messages are in - text_strings, while text_keys are keywords that give a short description what - the actual text represents, e.g. Title, Author, Description, or anything else. - - A keyword is minimum 1 character and maximum 79 characters long. It's - discouraged to use a single line length longer than 79 characters for texts. - - Don't allocate these text buffers yourself. Use the init/cleanup functions - correctly and use lodepng_add_text and lodepng_clear_text. - */ - size_t text_num; /*the amount of texts in these char** buffers (there may be more texts in itext)*/ - char** text_keys; /*the keyword of a text chunk (e.g. "Comment")*/ - char** text_strings; /*the actual text*/ - - /* - international text chunks (iTXt) - Similar to the non-international text chunks, but with additional strings - "langtags" and "transkeys". - */ - size_t itext_num; /*the amount of international texts in this PNG*/ - char** itext_keys; /*the English keyword of the text chunk (e.g. "Comment")*/ - char** itext_langtags; /*language tag for this text's language, ISO/IEC 646 string, e.g. ISO 639 language tag*/ - char** itext_transkeys; /*keyword translated to the international language - UTF-8 string*/ - char** itext_strings; /*the actual international text - UTF-8 string*/ - - /*time chunk (tIME)*/ - unsigned time_defined; /*set to 1 to make the encoder generate a tIME chunk*/ - LodePNGTime time; - - /*phys chunk (pHYs)*/ - unsigned phys_defined; /*if 0, there is no pHYs chunk and the values below are undefined, if 1 else there is one*/ - unsigned phys_x; /*pixels per unit in x direction*/ - unsigned phys_y; /*pixels per unit in y direction*/ - unsigned phys_unit; /*may be 0 (unknown unit) or 1 (metre)*/ - - /* - unknown chunks - There are 3 buffers, one for each position in the PNG where unknown chunks can appear - each buffer contains all unknown chunks for that position consecutively - The 3 buffers are the unknown chunks between certain critical chunks: - 0: IHDR-PLTE, 1: PLTE-IDAT, 2: IDAT-IEND - Do not allocate or traverse this data yourself. Use the chunk traversing functions declared - later, such as lodepng_chunk_next and lodepng_chunk_append, to read/write this struct. - */ - unsigned char* unknown_chunks_data[3]; - size_t unknown_chunks_size[3]; /*size in bytes of the unknown chunks, given for protection*/ -#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ -} LodePNGInfo; - -/*init, cleanup and copy functions to use with this struct*/ -void lodepng_info_init(LodePNGInfo* info); -void lodepng_info_cleanup(LodePNGInfo* info); - -#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS -unsigned lodepng_add_text(LodePNGInfo* info, const char* key, const char* str); /*push back both texts at once*/ -#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ - -/* -Converts raw buffer from one color type to another color type, based on -LodePNGColorMode structs to describe the input and output color type. -See the reference manual at the end of this header file to see which color conversions are supported. -return value = LodePNG error code (0 if all went ok, an error if the conversion isn't supported) -The out buffer must have size (w * h * bpp + 7) / 8, where bpp is the bits per pixel -of the output color type (lodepng_get_bpp). -For < 8 bpp images, there should not be padding bits at the end of scanlines. -For 16-bit per channel colors, uses big endian format like PNG does. -Return value is LodePNG error code -*/ -unsigned lodepng_convert(unsigned char* out, const unsigned char* in, - LodePNGColorMode* mode_out, const LodePNGColorMode* mode_in, - unsigned w, unsigned h); - -#ifdef LODEPNG_COMPILE_DECODER -/* -Settings for the decoder. This contains settings for the PNG and the Zlib -decoder, but not the Info settings from the Info structs. -*/ -typedef struct LodePNGDecoderSettings -{ - LodePNGDecompressSettings zlibsettings; /*in here is the setting to ignore Adler32 checksums*/ - - unsigned ignore_crc; /*ignore CRC checksums*/ - - unsigned color_convert; /*whether to convert the PNG to the color type you want. Default: yes*/ - -#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS - unsigned read_text_chunks; /*if false but remember_unknown_chunks is true, they're stored in the unknown chunks*/ - /*store all bytes from unknown chunks in the LodePNGInfo (off by default, useful for a png editor)*/ - unsigned remember_unknown_chunks; -#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ -} LodePNGDecoderSettings; - -void lodepng_decoder_settings_init(LodePNGDecoderSettings* settings); -#endif /*LODEPNG_COMPILE_DECODER*/ - -#ifdef LODEPNG_COMPILE_ENCODER -/*automatically use color type with less bits per pixel if losslessly possible. Default: AUTO*/ -typedef enum LodePNGFilterStrategy -{ - /*every filter at zero*/ - LFS_ZERO, - /*Use filter that gives minumum sum, as described in the official PNG filter heuristic.*/ - LFS_MINSUM, - /*Use the filter type that gives smallest Shannon entropy for this scanline. Depending - on the image, this is better or worse than minsum.*/ - LFS_ENTROPY, - /* - Brute-force-search PNG filters by compressing each filter for each scanline. - Experimental, very slow, and only rarely gives better compression than MINSUM. - */ - LFS_BRUTE_FORCE, - /*use predefined_filters buffer: you specify the filter type for each scanline*/ - LFS_PREDEFINED -} LodePNGFilterStrategy; - -/*Gives characteristics about the colors of the image, which helps decide which color model to use for encoding. -Used internally by default if "auto_convert" is enabled. Public because it's useful for custom algorithms.*/ -typedef struct LodePNGColorProfile -{ - unsigned colored; /*not greyscale*/ - unsigned key; /*if true, image is not opaque. Only if true and alpha is false, color key is possible.*/ - unsigned short key_r; /*these values are always in 16-bit bitdepth in the profile*/ - unsigned short key_g; - unsigned short key_b; - unsigned alpha; /*alpha channel or alpha palette required*/ - unsigned numcolors; /*amount of colors, up to 257. Not valid if bits == 16.*/ - unsigned char palette[1024]; /*Remembers up to the first 256 RGBA colors, in no particular order*/ - unsigned bits; /*bits per channel (not for palette). 1,2 or 4 for greyscale only. 16 if 16-bit per channel required.*/ -} LodePNGColorProfile; - -/*Settings for the encoder.*/ -typedef struct LodePNGEncoderSettings -{ - LodePNGCompressSettings zlibsettings; /*settings for the zlib encoder, such as window size, ...*/ - - unsigned auto_convert; /*automatically choose output PNG color type. Default: true*/ - - /*If true, follows the official PNG heuristic: if the PNG uses a palette or lower than - 8 bit depth, set all filters to zero. Otherwise use the filter_strategy. Note that to - completely follow the official PNG heuristic, filter_palette_zero must be true and - filter_strategy must be LFS_MINSUM*/ - unsigned filter_palette_zero; - /*Which filter strategy to use when not using zeroes due to filter_palette_zero. - Set filter_palette_zero to 0 to ensure always using your chosen strategy. Default: LFS_MINSUM*/ - LodePNGFilterStrategy filter_strategy; - /*used if filter_strategy is LFS_PREDEFINED. In that case, this must point to a buffer with - the same length as the amount of scanlines in the image, and each value must <= 5. You - have to cleanup this buffer, LodePNG will never free it. Don't forget that filter_palette_zero - must be set to 0 to ensure this is also used on palette or low bitdepth images.*/ - const unsigned char* predefined_filters; - - /*force creating a PLTE chunk if colortype is 2 or 6 (= a suggested palette). - If colortype is 3, PLTE is _always_ created.*/ - unsigned force_palette; -#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS - /*add LodePNG identifier and version as a text chunk, for debugging*/ - unsigned add_id; - /*encode text chunks as zTXt chunks instead of tEXt chunks, and use compression in iTXt chunks*/ - unsigned text_compression; -#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ -} LodePNGEncoderSettings; - -void lodepng_encoder_settings_init(LodePNGEncoderSettings* settings); -#endif /*LODEPNG_COMPILE_ENCODER*/ - - -#if defined(LODEPNG_COMPILE_DECODER) || defined(LODEPNG_COMPILE_ENCODER) -/*The settings, state and information for extended encoding and decoding.*/ -typedef struct LodePNGState -{ -#ifdef LODEPNG_COMPILE_DECODER - LodePNGDecoderSettings decoder; /*the decoding settings*/ -#endif /*LODEPNG_COMPILE_DECODER*/ -#ifdef LODEPNG_COMPILE_ENCODER - LodePNGEncoderSettings encoder; /*the encoding settings*/ -#endif /*LODEPNG_COMPILE_ENCODER*/ - LodePNGColorMode info_raw; /*specifies the format in which you would like to get the raw pixel buffer*/ - LodePNGInfo info_png; /*info of the PNG image obtained after decoding*/ - unsigned error; -#ifdef LODEPNG_COMPILE_CPP - /* For the lodepng::State subclass. */ - virtual ~LodePNGState(){} -#endif -} LodePNGState; - -/*init, cleanup and copy functions to use with this struct*/ -void lodepng_state_init(LodePNGState* state); -void lodepng_state_cleanup(LodePNGState* state); -#endif /* defined(LODEPNG_COMPILE_DECODER) || defined(LODEPNG_COMPILE_ENCODER) */ - -#ifdef LODEPNG_COMPILE_DECODER -/* -Same as lodepng_decode_memory, but uses a LodePNGState to allow custom settings and -getting much more information about the PNG image and color mode. -*/ -unsigned lodepng_decode(unsigned char** out, unsigned* w, unsigned* h, - LodePNGState* state, - const unsigned char* in, size_t insize); - -/* -Read the PNG header, but not the actual data. This returns only the information -that is in the header chunk of the PNG, such as width, height and color type. The -information is placed in the info_png field of the LodePNGState. -*/ -unsigned lodepng_inspect(unsigned* w, unsigned* h, - LodePNGState* state, - const unsigned char* in, size_t insize); -#endif /*LODEPNG_COMPILE_DECODER*/ - - -/* -The lodepng_chunk functions are normally not needed, except to traverse the -unknown chunks stored in the LodePNGInfo struct, or add new ones to it. -It also allows traversing the chunks of an encoded PNG file yourself. - -PNG standard chunk naming conventions: -First byte: uppercase = critical, lowercase = ancillary -Second byte: uppercase = public, lowercase = private -Third byte: must be uppercase -Fourth byte: uppercase = unsafe to copy, lowercase = safe to copy -*/ - -/* -Gets the length of the data of the chunk. Total chunk length has 12 bytes more. -There must be at least 4 bytes to read from. If the result value is too large, -it may be corrupt data. -*/ -unsigned lodepng_chunk_length(const unsigned char* chunk); - -/*check if the type is the given type*/ -unsigned char lodepng_chunk_type_equals(const unsigned char* chunk, const char* type); - -/*0: it's one of the critical chunk types, 1: it's an ancillary chunk (see PNG standard)*/ -unsigned char lodepng_chunk_ancillary(const unsigned char* chunk); - -/*get pointer to the data of the chunk, where the input points to the header of the chunk*/ -const unsigned char* lodepng_chunk_data_const(const unsigned char* chunk); - -/*returns 0 if the crc is correct, 1 if it's incorrect (0 for OK as usual!)*/ -unsigned lodepng_chunk_check_crc(const unsigned char* chunk); - -/*iterate to next chunks. don't use on IEND chunk, as there is no next chunk then*/ -unsigned char* lodepng_chunk_next(unsigned char* chunk); -const unsigned char* lodepng_chunk_next_const(const unsigned char* chunk); - -/* -Appends chunk to the data in out. The given chunk should already have its chunk header. -The out variable and outlength are updated to reflect the new reallocated buffer. -Returns error code (0 if it went ok) -*/ -unsigned lodepng_chunk_append(unsigned char** out, size_t* outlength, const unsigned char* chunk); - -/*Calculate CRC32 of buffer*/ -unsigned lodepng_crc32(const unsigned char* buf, size_t len); -#endif /*LODEPNG_COMPILE_PNG*/ - - -#ifdef LODEPNG_COMPILE_ZLIB -/* -This zlib part can be used independently to zlib compress and decompress a -buffer. It cannot be used to create gzip files however, and it only supports the -part of zlib that is required for PNG, it does not support dictionaries. -*/ - -#ifdef LODEPNG_COMPILE_DECODER -/*Inflate a buffer. Inflate is the decompression step of deflate. Out buffer must be freed after use.*/ -unsigned lodepng_inflate(unsigned char** out, size_t* outsize, - const unsigned char* in, size_t insize, - const LodePNGDecompressSettings* settings); - -/* -Decompresses Zlib data. Reallocates the out buffer and appends the data. The -data must be according to the zlib specification. -Either, *out must be NULL and *outsize must be 0, or, *out must be a valid -buffer and *outsize its size in bytes. out must be freed by user after usage. -*/ -unsigned lodepng_zlib_decompress(unsigned char** out, size_t* outsize, - const unsigned char* in, size_t insize, - const LodePNGDecompressSettings* settings); -#endif /*LODEPNG_COMPILE_DECODER*/ - -#ifdef LODEPNG_COMPILE_ENCODER -/* -Compresses data with Zlib. Reallocates the out buffer and appends the data. -Zlib adds a small header and trailer around the deflate data. -The data is output in the format of the zlib specification. -Either, *out must be NULL and *outsize must be 0, or, *out must be a valid -buffer and *outsize its size in bytes. out must be freed by user after usage. -*/ -unsigned lodepng_zlib_compress(unsigned char** out, size_t* outsize, - const unsigned char* in, size_t insize, - const LodePNGCompressSettings* settings); - -#endif /*LODEPNG_COMPILE_ENCODER*/ -#endif /*LODEPNG_COMPILE_ZLIB*/ - -#ifdef LODEPNG_COMPILE_CPP -/* The LodePNG C++ wrapper uses std::vectors instead of manually allocated memory buffers. */ -namespace lodepng -{ -#ifdef LODEPNG_COMPILE_PNG -class State : public LodePNGState -{ - public: - State(); - virtual ~State(); -}; - -#ifdef LODEPNG_COMPILE_DECODER -/* Same as other lodepng::decode, but using a State for more settings and information. */ -unsigned decode(std::vector& out, unsigned& w, unsigned& h, - State& state, - const unsigned char* in, size_t insize); -unsigned decode(std::vector& out, unsigned& w, unsigned& h, - State& state, - const std::vector& in); -#endif /*LODEPNG_COMPILE_DECODER*/ - -#ifdef LODEPNG_COMPILE_ENCODER -/* Same as other lodepng::encode, but using a State for more settings and information. */ -//unsigned encode(std::vector& out, -// const unsigned char* in, unsigned w, unsigned h, -// State& state); -//unsigned encode(std::vector& out, -// const std::vector& in, unsigned w, unsigned h, -// State& state); -#endif /*LODEPNG_COMPILE_ENCODER*/ - -#ifdef LODEPNG_COMPILE_DISK -/* -Load a file from disk into an std::vector. If the vector is empty, then either -the file doesn't exist or is an empty file. -*/ -void load_file(std::vector& buffer, const std::string& filename); -#endif /* LODEPNG_COMPILE_DISK */ -#endif /* LODEPNG_COMPILE_PNG */ -} /* namespace lodepng */ -#endif /*LODEPNG_COMPILE_CPP*/ - -/* -TODO: -[.] test if there are no memory leaks or security exploits - done a lot but needs to be checked often -[.] check compatibility with vareous compilers - done but needs to be redone for every newer version -[X] converting color to 16-bit per channel types -[ ] read all public PNG chunk types (but never let the color profile and gamma ones touch RGB values) -[ ] make sure encoder generates no chunks with size > (2^31)-1 -[ ] partial decoding (stream processing) -[X] let the "isFullyOpaque" function check color keys and transparent palettes too -[X] better name for the variables "codes", "codesD", "codelengthcodes", "clcl" and "lldl" -[ ] don't stop decoding on errors like 69, 57, 58 (make warnings) -[ ] let the C++ wrapper catch exceptions coming from the standard library and return LodePNG error codes -[ ] allow user to provide custom color conversion functions, e.g. for premultiplied alpha, padding bits or not, ... -*/ - -#endif /*LODEPNG_H inclusion guard*/ - -/* -LodePNG Documentation ---------------------- - -0. table of contents --------------------- - - 1. about - 1.1. supported features - 1.2. features not supported - 2. C and C++ version - 3. security - 4. decoding - 5. encoding - 6. color conversions - 6.1. PNG color types - 6.2. color conversions - 6.3. padding bits - 6.4. A note about 16-bits per channel and endianness - 7. error values - 8. chunks and PNG editing - 9. compiler support - 10. examples - 10.1. decoder C++ example - 10.2. decoder C example - 11. changes - 12. contact information - - -1. about --------- - -PNG is a file format to store raster images losslessly with good compression, -supporting different color types and alpha channel. - -LodePNG is a PNG codec according to the Portable Network Graphics (PNG) -Specification (Second Edition) - W3C Recommendation 10 November 2003. - -The specifications used are: - -*) Portable Network Graphics (PNG) Specification (Second Edition): - http://www.w3.org/TR/2003/REC-PNG-20031110 -*) RFC 1950 ZLIB Compressed Data Format version 3.3: - http://www.gzip.org/zlib/rfc-zlib.html -*) RFC 1951 DEFLATE Compressed Data Format Specification ver 1.3: - http://www.gzip.org/zlib/rfc-deflate.html - -The most recent version of LodePNG can currently be found at -http://lodev.org/lodepng/ - -LodePNG works both in C (ISO C90) and C++, with a C++ wrapper that adds -extra functionality. - -LodePNG exists out of two files: --lodepng.h: the header file for both C and C++ --lodepng.c(pp): give it the name lodepng.c or lodepng.cpp (or .cc) depending on your usage - -If you want to start using LodePNG right away without reading this doc, get the -examples from the LodePNG website to see how to use it in code, or check the -smaller examples in chapter 13 here. - -LodePNG is simple but only supports the basic requirements. To achieve -simplicity, the following design choices were made: There are no dependencies -on any external library. There are functions to decode and encode a PNG with -a single function call, and extended versions of these functions taking a -LodePNGState struct allowing to specify or get more information. By default -the colors of the raw image are always RGB or RGBA, no matter what color type -the PNG file uses. To read and write files, there are simple functions to -convert the files to/from buffers in memory. - -This all makes LodePNG suitable for loading textures in games, demos and small -programs, ... It's less suitable for full fledged image editors, loading PNGs -over network (it requires all the image data to be available before decoding can -begin), life-critical systems, ... - -1.1. supported features ------------------------ - -The following features are supported by the decoder: - -*) decoding of PNGs with any color type, bit depth and interlace mode, to a 24- or 32-bit color raw image, - or the same color type as the PNG -*) encoding of PNGs, from any raw image to 24- or 32-bit color, or the same color type as the raw image -*) Adam7 interlace and deinterlace for any color type -*) loading the image from harddisk or decoding it from a buffer from other sources than harddisk -*) support for alpha channels, including RGBA color model, translucent palettes and color keying -*) zlib decompression (inflate) -*) zlib compression (deflate) -*) CRC32 and ADLER32 checksums -*) handling of unknown chunks, allowing making a PNG editor that stores custom and unknown chunks. -*) the following chunks are supported (generated/interpreted) by both encoder and decoder: - IHDR: header information - PLTE: color palette - IDAT: pixel data - IEND: the final chunk - tRNS: transparency for palettized images - tEXt: textual information - zTXt: compressed textual information - iTXt: international textual information - bKGD: suggested background color - pHYs: physical dimensions - tIME: modification time - -1.2. features not supported ---------------------------- - -The following features are _not_ supported: - -*) some features needed to make a conformant PNG-Editor might be still missing. -*) partial loading/stream processing. All data must be available and is processed in one call. -*) The following public chunks are not supported but treated as unknown chunks by LodePNG - cHRM, gAMA, iCCP, sRGB, sBIT, hIST, sPLT - Some of these are not supported on purpose: LodePNG wants to provide the RGB values - stored in the pixels, not values modified by system dependent gamma or color models. - - -2. C and C++ version --------------------- - -The C version uses buffers allocated with alloc that you need to free() -yourself. You need to use init and cleanup functions for each struct whenever -using a struct from the C version to avoid exploits and memory leaks. - -The C++ version has extra functions with std::vectors in the interface and the -lodepng::State class which is a LodePNGState with constructor and destructor. - -These files work without modification for both C and C++ compilers because all -the additional C++ code is in "#ifdef __cplusplus" blocks that make C-compilers -ignore it, and the C code is made to compile both with strict ISO C90 and C++. - -To use the C++ version, you need to rename the source file to lodepng.cpp -(instead of lodepng.c), and compile it with a C++ compiler. - -To use the C version, you need to rename the source file to lodepng.c (instead -of lodepng.cpp), and compile it with a C compiler. - - -3. Security ------------ - -Even if carefully designed, it's always possible that LodePNG contains possible -exploits. If you discover one, please let me know, and it will be fixed. - -When using LodePNG, care has to be taken with the C version of LodePNG, as well -as the C-style structs when working with C++. The following conventions are used -for all C-style structs: - --if a struct has a corresponding init function, always call the init function when making a new one --if a struct has a corresponding cleanup function, call it before the struct disappears to avoid memory leaks --if a struct has a corresponding copy function, use the copy function instead of "=". - The destination must also be inited already. - - -4. Decoding ------------ - -Decoding converts a PNG compressed image to a raw pixel buffer. - -Most documentation on using the decoder is at its declarations in the header -above. For C, simple decoding can be done with functions such as -lodepng_decode32, and more advanced decoding can be done with the struct -LodePNGState and lodepng_decode. For C++, all decoding can be done with the -various lodepng::decode functions, and lodepng::State can be used for advanced -features. - -When using the LodePNGState, it uses the following fields for decoding: -*) LodePNGInfo info_png: it stores extra information about the PNG (the input) in here -*) LodePNGColorMode info_raw: here you can say what color mode of the raw image (the output) you want to get -*) LodePNGDecoderSettings decoder: you can specify a few extra settings for the decoder to use - -LodePNGInfo info_png --------------------- - -After decoding, this contains extra information of the PNG image, except the actual -pixels, width and height because these are already gotten directly from the decoder -functions. - -It contains for example the original color type of the PNG image, text comments, -suggested background color, etc... More details about the LodePNGInfo struct are -at its declaration documentation. - -LodePNGColorMode info_raw -------------------------- - -When decoding, here you can specify which color type you want -the resulting raw image to be. If this is different from the colortype of the -PNG, then the decoder will automatically convert the result. This conversion -always works, except if you want it to convert a color PNG to greyscale or to -a palette with missing colors. - -By default, 32-bit color is used for the result. - -LodePNGDecoderSettings decoder ------------------------------- - -The settings can be used to ignore the errors created by invalid CRC and Adler32 -chunks, and to disable the decoding of tEXt chunks. - -There's also a setting color_convert, true by default. If false, no conversion -is done, the resulting data will be as it was in the PNG (after decompression) -and you'll have to puzzle the colors of the pixels together yourself using the -color type information in the LodePNGInfo. - - -5. Encoding ------------ - -Encoding converts a raw pixel buffer to a PNG compressed image. - -Most documentation on using the encoder is at its declarations in the header -above. For C, simple encoding can be done with functions such as -lodepng_encode32, and more advanced decoding can be done with the struct -LodePNGState and lodepng_encode. For C++, all encoding can be done with the -various lodepng::encode functions, and lodepng::State can be used for advanced -features. - -Like the decoder, the encoder can also give errors. However it gives less errors -since the encoder input is trusted, the decoder input (a PNG image that could -be forged by anyone) is not trusted. - -When using the LodePNGState, it uses the following fields for encoding: -*) LodePNGInfo info_png: here you specify how you want the PNG (the output) to be. -*) LodePNGColorMode info_raw: here you say what color type of the raw image (the input) has -*) LodePNGEncoderSettings encoder: you can specify a few settings for the encoder to use - -LodePNGInfo info_png --------------------- - -When encoding, you use this the opposite way as when decoding: for encoding, -you fill in the values you want the PNG to have before encoding. By default it's -not needed to specify a color type for the PNG since it's automatically chosen, -but it's possible to choose it yourself given the right settings. - -The encoder will not always exactly match the LodePNGInfo struct you give, -it tries as close as possible. Some things are ignored by the encoder. The -encoder uses, for example, the following settings from it when applicable: -colortype and bitdepth, text chunks, time chunk, the color key, the palette, the -background color, the interlace method, unknown chunks, ... - -When encoding to a PNG with colortype 3, the encoder will generate a PLTE chunk. -If the palette contains any colors for which the alpha channel is not 255 (so -there are translucent colors in the palette), it'll add a tRNS chunk. - -LodePNGColorMode info_raw -------------------------- - -You specify the color type of the raw image that you give to the input here, -including a possible transparent color key and palette you happen to be using in -your raw image data. - -By default, 32-bit color is assumed, meaning your input has to be in RGBA -format with 4 bytes (unsigned chars) per pixel. - -LodePNGEncoderSettings encoder ------------------------------- - -The following settings are supported (some are in sub-structs): -*) auto_convert: when this option is enabled, the encoder will -automatically choose the smallest possible color mode (including color key) that -can encode the colors of all pixels without information loss. -*) btype: the block type for LZ77. 0 = uncompressed, 1 = fixed huffman tree, - 2 = dynamic huffman tree (best compression). Should be 2 for proper - compression. -*) use_lz77: whether or not to use LZ77 for compressed block types. Should be - true for proper compression. -*) windowsize: the window size used by the LZ77 encoder (1 - 32768). Has value - 2048 by default, but can be set to 32768 for better, but slow, compression. -*) force_palette: if colortype is 2 or 6, you can make the encoder write a PLTE - chunk if force_palette is true. This can used as suggested palette to convert - to by viewers that don't support more than 256 colors (if those still exist) -*) add_id: add text chunk "Encoder: LodePNG " to the image. -*) text_compression: default 1. If 1, it'll store texts as zTXt instead of tEXt chunks. - zTXt chunks use zlib compression on the text. This gives a smaller result on - large texts but a larger result on small texts (such as a single program name). - It's all tEXt or all zTXt though, there's no separate setting per text yet. - - -6. color conversions --------------------- - -An important thing to note about LodePNG, is that the color type of the PNG, and -the color type of the raw image, are completely independent. By default, when -you decode a PNG, you get the result as a raw image in the color type you want, -no matter whether the PNG was encoded with a palette, greyscale or RGBA color. -And if you encode an image, by default LodePNG will automatically choose the PNG -color type that gives good compression based on the values of colors and amount -of colors in the image. It can be configured to let you control it instead as -well, though. - -To be able to do this, LodePNG does conversions from one color mode to another. -It can convert from almost any color type to any other color type, except the -following conversions: RGB to greyscale is not supported, and converting to a -palette when the palette doesn't have a required color is not supported. This is -not supported on purpose: this is information loss which requires a color -reduction algorithm that is beyong the scope of a PNG encoder (yes, RGB to grey -is easy, but there are multiple ways if you want to give some channels more -weight). - -By default, when decoding, you get the raw image in 32-bit RGBA or 24-bit RGB -color, no matter what color type the PNG has. And by default when encoding, -LodePNG automatically picks the best color model for the output PNG, and expects -the input image to be 32-bit RGBA or 24-bit RGB. So, unless you want to control -the color format of the images yourself, you can skip this chapter. - -6.1. PNG color types --------------------- - -A PNG image can have many color types, ranging from 1-bit color to 64-bit color, -as well as palettized color modes. After the zlib decompression and unfiltering -in the PNG image is done, the raw pixel data will have that color type and thus -a certain amount of bits per pixel. If you want the output raw image after -decoding to have another color type, a conversion is done by LodePNG. - -The PNG specification gives the following color types: - -0: greyscale, bit depths 1, 2, 4, 8, 16 -2: RGB, bit depths 8 and 16 -3: palette, bit depths 1, 2, 4 and 8 -4: greyscale with alpha, bit depths 8 and 16 -6: RGBA, bit depths 8 and 16 - -Bit depth is the amount of bits per pixel per color channel. So the total amount -of bits per pixel is: amount of channels * bitdepth. - -6.2. color conversions ----------------------- - -As explained in the sections about the encoder and decoder, you can specify -color types and bit depths in info_png and info_raw to change the default -behaviour. - -If, when decoding, you want the raw image to be something else than the default, -you need to set the color type and bit depth you want in the LodePNGColorMode, -or the parameters colortype and bitdepth of the simple decoding function. - -If, when encoding, you use another color type than the default in the raw input -image, you need to specify its color type and bit depth in the LodePNGColorMode -of the raw image, or use the parameters colortype and bitdepth of the simple -encoding function. - -If, when encoding, you don't want LodePNG to choose the output PNG color type -but control it yourself, you need to set auto_convert in the encoder settings -to false, and specify the color type you want in the LodePNGInfo of the -encoder (including palette: it can generate a palette if auto_convert is true, -otherwise not). - -If the input and output color type differ (whether user chosen or auto chosen), -LodePNG will do a color conversion, which follows the rules below, and may -sometimes result in an error. - -To avoid some confusion: --the decoder converts from PNG to raw image --the encoder converts from raw image to PNG --the colortype and bitdepth in LodePNGColorMode info_raw, are those of the raw image --the colortype and bitdepth in the color field of LodePNGInfo info_png, are those of the PNG --when encoding, the color type in LodePNGInfo is ignored if auto_convert - is enabled, it is automatically generated instead --when decoding, the color type in LodePNGInfo is set by the decoder to that of the original - PNG image, but it can be ignored since the raw image has the color type you requested instead --if the color type of the LodePNGColorMode and PNG image aren't the same, a conversion - between the color types is done if the color types are supported. If it is not - supported, an error is returned. If the types are the same, no conversion is done. --even though some conversions aren't supported, LodePNG supports loading PNGs from any - colortype and saving PNGs to any colortype, sometimes it just requires preparing - the raw image correctly before encoding. --both encoder and decoder use the same color converter. - -Non supported color conversions: --color to greyscale: no error is thrown, but the result will look ugly because -only the red channel is taken --anything to palette when that palette does not have that color in it: in this -case an error is thrown - -Supported color conversions: --anything to 8-bit RGB, 8-bit RGBA, 16-bit RGB, 16-bit RGBA --any grey or grey+alpha, to grey or grey+alpha --anything to a palette, as long as the palette has the requested colors in it --removing alpha channel --higher to smaller bitdepth, and vice versa - -If you want no color conversion to be done (e.g. for speed or control): --In the encoder, you can make it save a PNG with any color type by giving the -raw color mode and LodePNGInfo the same color mode, and setting auto_convert to -false. --In the decoder, you can make it store the pixel data in the same color type -as the PNG has, by setting the color_convert setting to false. Settings in -info_raw are then ignored. - -The function lodepng_convert does the color conversion. It is available in the -interface but normally isn't needed since the encoder and decoder already call -it. - -6.3. padding bits ------------------ - -In the PNG file format, if a less than 8-bit per pixel color type is used and the scanlines -have a bit amount that isn't a multiple of 8, then padding bits are used so that each -scanline starts at a fresh byte. But that is NOT true for the LodePNG raw input and output. -The raw input image you give to the encoder, and the raw output image you get from the decoder -will NOT have these padding bits, e.g. in the case of a 1-bit image with a width -of 7 pixels, the first pixel of the second scanline will the 8th bit of the first byte, -not the first bit of a new byte. - -6.4. A note about 16-bits per channel and endianness ----------------------------------------------------- - -LodePNG uses unsigned char arrays for 16-bit per channel colors too, just like -for any other color format. The 16-bit values are stored in big endian (most -significant byte first) in these arrays. This is the opposite order of the -little endian used by x86 CPU's. - -LodePNG always uses big endian because the PNG file format does so internally. -Conversions to other formats than PNG uses internally are not supported by -LodePNG on purpose, there are myriads of formats, including endianness of 16-bit -colors, the order in which you store R, G, B and A, and so on. Supporting and -converting to/from all that is outside the scope of LodePNG. - -This may mean that, depending on your use case, you may want to convert the big -endian output of LodePNG to little endian with a for loop. This is certainly not -always needed, many applications and libraries support big endian 16-bit colors -anyway, but it means you cannot simply cast the unsigned char* buffer to an -unsigned short* buffer on x86 CPUs. - - -7. error values ---------------- - -All functions in LodePNG that return an error code, return 0 if everything went -OK, or a non-zero code if there was an error. - -The meaning of the LodePNG error values can be retrieved with the function -lodepng_error_text: given the numerical error code, it returns a description -of the error in English as a string. - -Check the implementation of lodepng_error_text to see the meaning of each code. - - -8. chunks and PNG editing -------------------------- - -If you want to add extra chunks to a PNG you encode, or use LodePNG for a PNG -editor that should follow the rules about handling of unknown chunks, or if your -program is able to read other types of chunks than the ones handled by LodePNG, -then that's possible with the chunk functions of LodePNG. - -A PNG chunk has the following layout: - -4 bytes length -4 bytes type name -length bytes data -4 bytes CRC - -8.1. iterating through chunks ------------------------------ - -If you have a buffer containing the PNG image data, then the first chunk (the -IHDR chunk) starts at byte number 8 of that buffer. The first 8 bytes are the -signature of the PNG and are not part of a chunk. But if you start at byte 8 -then you have a chunk, and can check the following things of it. - -NOTE: none of these functions check for memory buffer boundaries. To avoid -exploits, always make sure the buffer contains all the data of the chunks. -When using lodepng_chunk_next, make sure the returned value is within the -allocated memory. - -unsigned lodepng_chunk_length(const unsigned char* chunk): - -Get the length of the chunk's data. The total chunk length is this length + 12. - -void lodepng_chunk_type(char type[5], const unsigned char* chunk): -unsigned char lodepng_chunk_type_equals(const unsigned char* chunk, const char* type): - -Get the type of the chunk or compare if it's a certain type - -unsigned char lodepng_chunk_critical(const unsigned char* chunk): - -Check if the chunk is critical in the PNG standard (only IHDR, PLTE, IDAT and IEND are). -Check if the chunk is private (public chunks are part of the standard, private ones not). -Check if the chunk is safe to copy. If it's not, then, when modifying data in a critical -chunk, unsafe to copy chunks of the old image may NOT be saved in the new one if your -program doesn't handle that type of unknown chunk. - -const unsigned char* lodepng_chunk_data_const(const unsigned char* chunk): - -Get a pointer to the start of the data of the chunk. - -unsigned lodepng_chunk_check_crc(const unsigned char* chunk): - -Check if the crc is correct or generate a correct one. - -unsigned char* lodepng_chunk_next(unsigned char* chunk): -const unsigned char* lodepng_chunk_next_const(const unsigned char* chunk): - -Iterate to the next chunk. This works if you have a buffer with consecutive chunks. Note that these -functions do no boundary checking of the allocated data whatsoever, so make sure there is enough -data available in the buffer to be able to go to the next chunk. - -These functions are used to create new chunks that are appended to the data in *out that has -length *outlength. The append function appends an existing chunk to the new data. The create -function creates a new chunk with the given parameters and appends it. Type is the 4-letter -name of the chunk. - -8.2. chunks in info_png ------------------------ - -The LodePNGInfo struct contains fields with the unknown chunk in it. It has 3 -buffers (each with size) to contain 3 types of unknown chunks: -the ones that come before the PLTE chunk, the ones that come between the PLTE -and the IDAT chunks, and the ones that come after the IDAT chunks. -It's necessary to make the distionction between these 3 cases because the PNG -standard forces to keep the ordering of unknown chunks compared to the critical -chunks, but does not force any other ordering rules. - -info_png.unknown_chunks_data[0] is the chunks before PLTE -info_png.unknown_chunks_data[1] is the chunks after PLTE, before IDAT -info_png.unknown_chunks_data[2] is the chunks after IDAT - -The chunks in these 3 buffers can be iterated through and read by using the same -way described in the previous subchapter. - -When using the decoder to decode a PNG, you can make it store all unknown chunks -if you set the option settings.remember_unknown_chunks to 1. By default, this -option is off (0). - -The encoder will always encode unknown chunks that are stored in the info_png. -If you need it to add a particular chunk that isn't known by LodePNG, you can -use lodepng_chunk_append or lodepng_chunk_create to the chunk data in -info_png.unknown_chunks_data[x]. - -Chunks that are known by LodePNG should not be added in that way. E.g. to make -LodePNG add a bKGD chunk, set background_defined to true and add the correct -parameters there instead. - - -9. compiler support -------------------- - -No libraries other than the current standard C library are needed to compile -LodePNG. For the C++ version, only the standard C++ library is needed on top. -Add the files lodepng.c(pp) and lodepng.h to your project, include -lodepng.h where needed, and your program can read/write PNG files. - -It is compatible with C90 and up, and C++03 and up. - -If performance is important, use optimization when compiling! For both the -encoder and decoder, this makes a large difference. - -Make sure that LodePNG is compiled with the same compiler of the same version -and with the same settings as the rest of the program, or the interfaces with -std::vectors and std::strings in C++ can be incompatible. - -CHAR_BITS must be 8 or higher, because LodePNG uses unsigned chars for octets. - -*) gcc and g++ - -LodePNG is developed in gcc so this compiler is natively supported. It gives no -warnings with compiler options "-Wall -Wextra -pedantic -ansi", with gcc and g++ -version 4.7.1 on Linux, 32-bit and 64-bit. - -*) Clang - -Fully supported and warning-free. - -*) Mingw - -The Mingw compiler (a port of gcc for Windows) should be fully supported by -LodePNG. - -*) Visual Studio and Visual C++ Express Edition - -LodePNG should be warning-free with warning level W4. Two warnings were disabled -with pragmas though: warning 4244 about implicit conversions, and warning 4996 -where it wants to use a non-standard function fopen_s instead of the standard C -fopen. - -Visual Studio may want "stdafx.h" files to be included in each source file and -give an error "unexpected end of file while looking for precompiled header". -This is not standard C++ and will not be added to the stock LodePNG. You can -disable it for lodepng.cpp only by right clicking it, Properties, C/C++, -Precompiled Headers, and set it to Not Using Precompiled Headers there. - -NOTE: Modern versions of VS should be fully supported, but old versions, e.g. -VS6, are not guaranteed to work. - -*) Compilers on Macintosh - -LodePNG has been reported to work both with gcc and LLVM for Macintosh, both for -C and C++. - -*) Other Compilers - -If you encounter problems on any compilers, feel free to let me know and I may -try to fix it if the compiler is modern and standards complient. - - -10. examples ------------- - -This decoder example shows the most basic usage of LodePNG. More complex -examples can be found on the LodePNG website. - -10.1. decoder C++ example -------------------------- - -#include "lodepng.h" -#include - -int main(int argc, char *argv[]) -{ - const char* filename = argc > 1 ? argv[1] : "test.png"; - - //load and decode - std::vector image; - unsigned width, height; - unsigned error = lodepng::decode(image, width, height, filename); - - //if there's an error, display it - if(error) std::cout << "decoder error " << error << ": " << lodepng_error_text(error) << std::endl; - - //the pixels are now in the vector "image", 4 bytes per pixel, ordered RGBARGBA..., use it as texture, draw it, ... -} - -11. changes - -12. contact information ------------------------ - -Feel free to contact me with suggestions, problems, comments, ... concerning -LodePNG. If you encounter a PNG image that doesn't work properly with this -decoder, feel free to send it and I'll use it to find and fix the problem. - -My email address is (puzzle the account and domain together with an @ symbol): -Domain: gmail dot com. -Account: lode dot vandevenne. - -Copyright (c) 2005-2015 Lode Vandevenne -*/ diff --git a/packages/stk/stk_learning/GameOfLife/NoGhostGameofLife.cpp b/packages/stk/stk_learning/GameOfLife/NoGhostGameofLife.cpp deleted file mode 100644 index 6bfd48c2b8bd..000000000000 --- a/packages/stk/stk_learning/GameOfLife/NoGhostGameofLife.cpp +++ /dev/null @@ -1,583 +0,0 @@ -/* - * NoGhostGameofLife.cpp - * - * Created on: Aug 11, 2015 - * Author: jonchu - */ -#include "NoGhostGameofLife.hpp" -#include // for size_t -#include // for pair -#include "stk_mesh/base/HashEntityAndEntityKey.hpp" // for hash -#include "GameOfLife/GameofLifeMesh.hpp" // for GameofLifeMesh, etc -#include "stk_io/DatabasePurpose.hpp" -#include "stk_io/StkMeshIoBroker.hpp" // for StkMeshIoBroker -#include "stk_mesh/base/Bucket.hpp" // for Bucket -#include "stk_mesh/base/BulkData.hpp" // for BulkData -#include "stk_mesh/base/BulkDataInlinedMethods.hpp" -#include "stk_mesh/base/Field.hpp" // for Field -#include "stk_mesh/base/FieldBase.hpp" // for field_data -#include "stk_mesh/base/GetEntities.hpp" // for get_entities -#include "stk_topology/topology.hpp" // for topology, etc -#include "stk_util/util/ReportHandler.hpp" // for ThrowRequire -#include "stk_util/parallel/CommSparse.hpp" // for CommSparse -#include "stk_util/parallel/ParallelComm.hpp" // for CommBuffer, unpack - -//public -NoGhostGameofLife::NoGhostGameofLife(GameofLifeMesh& Mesh, std::string name) -: m_bulkData(Mesh.bulk_data()), - m_lifeField(Mesh.life_field()), - m_neighborField(Mesh.neighbor_field()), - m_name(name), m_stkIo(Mesh.comm()) -{ - finish_construction(); -} - -void NoGhostGameofLife::activate_these_ids(stk::mesh::EntityIdVector& elemIds) -{ - for (stk::mesh::EntityId elemId : elemIds) - activate_element_id(elemId); -} - -void NoGhostGameofLife::run_game_of_life(int numSteps) -{ - if (0 == m_time) - write_output_step(); - - for (int timeStep = 0; timeStep < numSteps; timeStep++) - run_game_of_life_step(); -} - -//test functions -stk::mesh::Entity NoGhostGameofLife::element_with_id(stk::mesh::EntityId elemId) -{ - return m_bulkData.get_entity(stk::topology::ELEM_RANK, elemId); - -} - -bool NoGhostGameofLife::is_valid_entity(stk::mesh::Entity entity) -{ - return m_bulkData.is_valid(entity); -} - -unsigned NoGhostGameofLife::num_neighbors(stk::mesh::Entity elem) -{ - return m_localElementToLocalNeighborElements[elem].size() + - m_localElementToRemoteElementKeys[elem].size(); -} - -unsigned NoGhostGameofLife::num_active_elems() -{ - unsigned count = 0; - for (stk::mesh::Entity localElem : m_elements) - if (is_element_active(localElem)) - count++; - return count; -} - -unsigned NoGhostGameofLife::num_active_neighbors(stk::mesh::Entity elem) -{ - unsigned numActiveNeighbors = 0; - //local elements - for (stk::mesh::Entity localElem : m_localElementToLocalNeighborElements[elem]) - if (is_element_active(localElem)) - numActiveNeighbors++; - - //send the remote entity keys to their processors - stk::CommSparse send(m_bulkData.parallel()); - for (int phase = 0; phase < 2; phase++) - { - for (stk::mesh::EntityKey remoteElemKey : m_localElementToRemoteElementKeys[elem]) - { - int owningProc = m_remoteElementKeyToOwningProcessor[remoteElemKey]; - send.send_buffer(owningProc).pack(remoteElemKey); - } - if (0 == phase) - send.allocate_buffers(); - else if (1 == phase) - send.communicate(); - } - - //find if those remote (now local) elements are active and send that back - unsigned numActiveNeighborsOnProc = 0; - stk::CommSparse recieve(m_bulkData.parallel()); - - std::unordered_map procToValue; - - for (int procNum = 0; procNum < m_numProcs; procNum++) - { - stk::CommBuffer& sendBuf = send.recv_buffer(procNum); - while (sendBuf.remaining()) - { - stk::mesh::EntityKey localElemKey; - sendBuf.unpack(localElemKey); - if (is_element_active(m_bulkData.get_entity(localElemKey))) - numActiveNeighborsOnProc++; - } - procToValue[procNum] = numActiveNeighborsOnProc; - numActiveNeighborsOnProc = 0; - } - - for (int phase = 0; phase < 2; phase++) - { - for (std::pair pair : procToValue) - recieve.send_buffer(pair.first).pack(pair.second); - if (0 == phase) - recieve.allocate_buffers(); - else if (1 == phase) - recieve.communicate(); - } - //get the number - for (int procNum = 0; procNum < m_numProcs; procNum++) - { - stk::CommBuffer& recieveBuf= recieve.recv_buffer(procNum); - while (recieveBuf.remaining()) - { - unsigned remoteActiveNeighbors; - recieveBuf.unpack(remoteActiveNeighbors); - numActiveNeighbors += remoteActiveNeighbors; - } - } - return numActiveNeighbors; -} - -//private -bool NoGhostGameofLife::is_element_active(stk::mesh::Entity elem) -{ - return *stk::mesh::field_data(m_lifeField, elem); // field -} -void NoGhostGameofLife::activate_element(stk::mesh::Entity elem) -{ - *stk::mesh::field_data(m_lifeField, elem) = 1; -} -void NoGhostGameofLife::deactivate_element(stk::mesh::Entity elem) -{ - *stk::mesh::field_data(m_lifeField, elem) = 0; -} -void NoGhostGameofLife::finish_construction() -{ - m_numProcs = m_bulkData.parallel_size(); - m_time = 0; - get_elements(); - create_element_connectivity_maps(); - write_output_mesh(); -} -void NoGhostGameofLife::get_elements() -{ - stk::mesh::get_entities(m_bulkData, stk::topology::ELEM_RANK, m_elements); -} -void NoGhostGameofLife::create_element_connectivity_maps() -{ - create_local_element_to_local_element_map(); - create_remote_element_key_maps(); - create_local_element_to_remote_element_key_map(); -} -void NoGhostGameofLife::activate_element_id(stk::mesh::EntityId elemId) -{ - stk::mesh::Entity elem = m_bulkData.get_entity(stk::topology::ELEM_RANK, elemId); - if (m_bulkData.is_valid(elem)) - { - activate_element(elem); - m_localActiveElements.push_back(elem); - } -} -void NoGhostGameofLife::create_local_element_to_local_element_map() -{ - for (stk::mesh::Entity localElem : m_elements) - create_map_for_this_element(localElem); -} -void NoGhostGameofLife::create_map_for_this_element(stk::mesh::Entity elem) -{ - const stk::mesh::Entity* localElemNodes = m_bulkData.begin_nodes(elem); - for (unsigned nodeIndex = 0, numNodes = m_bulkData.num_nodes(elem); - nodeIndex < numNodes; nodeIndex++) - add_this_nodes_elements_to_this_elements_map(elem, localElemNodes[nodeIndex]); -} -void NoGhostGameofLife::add_this_nodes_elements_to_this_elements_map(stk::mesh::Entity elem, - stk::mesh::Entity node) -{ - const stk::mesh::Entity* localElemNodeElems = m_bulkData.begin_elements(node); - for (unsigned elemIndex = 0, numElems = m_bulkData.num_elements(node); - elemIndex < numElems; elemIndex++) - if (localElemNodeElems[elemIndex] != elem) - m_localElementToLocalNeighborElements[elem]. - insert(localElemNodeElems[elemIndex]); -} -void NoGhostGameofLife::create_remote_element_key_maps() -{ - stk::CommSparse buffer(m_bulkData.parallel()); - fill_buffer_with_local_element_keys_and_remote_node_keys(buffer); - unpack_remote_elem_key_info_from_buffer(buffer); - create_map_of_remote_elem_keys_to_local_elements(); -} -void NoGhostGameofLife::fill_buffer_with_local_element_keys_and_remote_node_keys(stk::CommSparse& - buffer) -{ - for (int phase = 0; phase < 2; phase++) - { - for (stk::mesh::Entity elem : m_elements) - fill_buffer_with_this_elements_info(elem, buffer); - if (0 == phase) - buffer.allocate_buffers(); - else - buffer.communicate(); - } -} -void NoGhostGameofLife::fill_buffer_with_this_elements_info(stk::mesh::Entity elem, - stk::CommSparse& buffer) -{ - std::unordered_map>> remoteProcessorNumberToSharedNodes; - fill_map_with_this_elements_nodes(elem, remoteProcessorNumberToSharedNodes); - fill_buffer_with_map_info(elem, buffer, remoteProcessorNumberToSharedNodes); -} -void NoGhostGameofLife::fill_map_with_this_elements_nodes(stk::mesh::Entity elem, - std::unordered_map>>& map) -{ - unsigned numNodes = m_bulkData.num_nodes(elem); - const stk::mesh::Entity* nodeBegin = m_bulkData.begin_nodes(elem); - for (unsigned nodeIndex = 0; nodeIndex < numNodes; nodeIndex++) - { - std::vector sharingProcs; - stk::mesh::EntityKey nodeKey = m_bulkData.entity_key(nodeBegin[nodeIndex]); - m_bulkData.comm_shared_procs(nodeKey, sharingProcs); - for (int procNum : sharingProcs) - map[procNum].insert(nodeKey); - } -} -void NoGhostGameofLife::fill_buffer_with_map_info(stk::mesh::Entity elem, stk::CommSparse& buffer, - std::unordered_map>>& map) -{ - for (std::pair< const int,std::unordered_set>>& pair : map) - { - int remoteProc = pair.first; - buffer.send_buffer(remoteProc).pack(m_bulkData.entity_key(elem)); - buffer.send_buffer(remoteProc).pack(pair.second.size()); - for (stk::mesh::EntityKey nodeKey : pair.second) - buffer.send_buffer(remoteProc).pack(nodeKey); - } -} -void NoGhostGameofLife::unpack_remote_elem_key_info_from_buffer(stk::CommSparse& buffer) -{ - for (int proc = 0; proc < m_numProcs; proc++) - { - stk::CommBuffer& buf = buffer.recv_buffer(proc); - while (buf.remaining()) - unpack_remote_info_from_this_processor(proc, buf); - } -} -void NoGhostGameofLife::unpack_remote_info_from_this_processor(int proc, stk::CommBuffer& buf) -{ - stk::mesh::EntityKey elemKey = stk::unpack(buf); - size_t numNodes = stk::unpack(buf); - m_remoteElementKeys.insert(elemKey); - m_remoteElementKeyToOwningProcessor[elemKey] = proc; - for (unsigned nodeNum = 0; nodeNum < numNodes; nodeNum++) - m_remoteElementKeyToLocalNodeKeys[elemKey]. - insert(stk::unpack(buf)); -} -void NoGhostGameofLife::create_map_of_remote_elem_keys_to_local_elements() -{ - for (stk::mesh::EntityKey remoteElemKey : m_remoteElementKeys) - for (stk::mesh::EntityKey localNodeKey : m_remoteElementKeyToLocalNodeKeys[remoteElemKey]) - map_this_remote_element_key_with_this_nodes_elements(remoteElemKey, localNodeKey); - m_remoteElementKeyToLocalNodeKeys.clear(); //take out the trash -} -void NoGhostGameofLife::map_this_remote_element_key_with_this_nodes_elements(stk::mesh::EntityKey - remoteKey, - stk::mesh::EntityKey - nodeKey) -{ - stk::mesh::Entity node = m_bulkData.get_entity(nodeKey); - unsigned numElems = m_bulkData.num_elements(node); - const stk::mesh::Entity* nodeElem = m_bulkData.begin_elements(node); - for (unsigned elemIndex = 0; elemIndex < numElems; elemIndex++) - m_remoteElementKeyToLocalNeighborElements[remoteKey].insert(nodeElem[elemIndex]); -} -void NoGhostGameofLife::create_local_element_to_remote_element_key_map() -{ - stk::CommSparse buffer(m_bulkData.parallel()); - fill_buffer_with_local_neighbors_of_remote_keys(buffer); - unpack_local_and_remote_key_info_from_each_processor(buffer); -} -void NoGhostGameofLife::fill_buffer_with_local_neighbors_of_remote_keys(stk::CommSparse& buffer) -{ - for (int phase = 0; phase < 2; phase++) - { - for (stk::mesh::EntityKey remoteElemKey : m_remoteElementKeys) - fill_buffer_with_local_neighbors_of_remote_element_key(remoteElemKey, buffer); - if (0 == phase) - buffer.allocate_buffers(); - else - buffer.communicate(); - } -} -void NoGhostGameofLife::fill_buffer_with_local_neighbors_of_remote_element_key(stk::mesh::EntityKey - remoteKey, - stk::CommSparse& - buffer) -{ - int procNum = m_remoteElementKeyToOwningProcessor[remoteKey]; - size_t numNeighbors = m_remoteElementKeyToLocalNeighborElements[remoteKey].size(); - buffer.send_buffer(procNum).pack(remoteKey); - buffer.send_buffer(procNum).pack(numNeighbors); - for (stk::mesh::Entity localElem : m_remoteElementKeyToLocalNeighborElements[remoteKey]) - buffer.send_buffer(procNum).pack(m_bulkData.entity_key(localElem)); -} -void NoGhostGameofLife::unpack_local_and_remote_key_info_from_each_processor(stk::CommSparse& - buffer) -{ - for (int procRank = 0; procRank < m_numProcs; procRank++) - { - stk::CommBuffer& buf = buffer.recv_buffer(procRank); - while (buf.remaining()) - unpack_local_and_remote_keys_from_buffer(buf); - } -} -void NoGhostGameofLife::unpack_local_and_remote_keys_from_buffer(stk::CommBuffer& buf) -{ - stk::mesh::EntityKey localElemKey = stk::unpack(buf); - stk::mesh::Entity localElem = m_bulkData.get_entity(localElemKey); - size_t numRemoteNeighbors = stk::unpack(buf); - for (unsigned neighborNum = 0; neighborNum < numRemoteNeighbors; neighborNum++) - m_localElementToRemoteElementKeys[localElem].insert(stk::unpack(buf)); -} -void NoGhostGameofLife::write_output_mesh() -{ - m_name += ".e"; - m_stkIo.set_bulk_data(m_bulkData); - m_fileHandler = m_stkIo.create_output_mesh(m_name, stk::io::WRITE_RESULTS); - m_stkIo.add_field(m_fileHandler, m_lifeField); - m_stkIo.write_output_mesh(m_fileHandler); -} -void NoGhostGameofLife::write_output_step() -{ - m_stkIo.begin_output_step(m_fileHandler, m_time); - m_stkIo.write_defined_output_fields(m_fileHandler); - m_stkIo.end_output_step(m_fileHandler); - m_time++; -} -void NoGhostGameofLife::run_game_of_life_step() -{ - determine_elements_to_check(); - update_neighbor_values_with_local_elements(); - update_neighbor_values_with_remote_elements(); - update_element_membership(); - write_output_step(); -} -void NoGhostGameofLife::determine_elements_to_check() -{ - refresh_element_maps(); - stk::CommSparse buffer(m_bulkData.parallel()); - communicate_remote_element_keys_to_check(buffer); - recieve_local_element_keys_to_check(buffer); -} -void NoGhostGameofLife::refresh_element_maps() -{ - m_localElementsToVisit.clear(); - m_remoteElementKeysToVisit.clear(); - get_elements_to_visit(); -} -void NoGhostGameofLife::get_elements_to_visit() -{ - for (stk::mesh::Entity localElem : m_localActiveElements) - { - m_localElementsToVisit.insert(localElem); - for (stk::mesh::Entity localElemElem : m_localElementToLocalNeighborElements[localElem]) - m_localElementsToVisit.insert(localElemElem); - for (stk::mesh::EntityKey remoteElemKey : m_localElementToRemoteElementKeys[localElem]) - m_remoteElementKeysToVisit.insert(remoteElemKey); - } -} -void NoGhostGameofLife::communicate_remote_element_keys_to_check(stk::CommSparse& buffer) -{ - for (int phase = 0; phase < 2; phase++) - { - for (stk::mesh::EntityKey remoteElemKey : m_remoteElementKeysToVisit) - buffer.send_buffer(m_remoteElementKeyToOwningProcessor[remoteElemKey]). - pack(remoteElemKey); - if (0 == phase) - buffer.allocate_buffers(); - else - buffer.communicate(); - } -} -void NoGhostGameofLife::recieve_local_element_keys_to_check(stk::CommSparse& buffer) -{ - for (int procNum = 0; procNum < m_numProcs; procNum++) - { - stk::CommBuffer& buf = buffer.recv_buffer(procNum); - while (buf.remaining()) - m_localElementsToVisit.insert(m_bulkData. - get_entity(stk::unpack(buf))); - } -} -void NoGhostGameofLife::update_neighbor_values_with_local_elements() -{ - for (stk::mesh::Entity localElem : m_localElementsToVisit) - { - int* neighborVal = stk::mesh::field_data(m_neighborField, localElem); - *neighborVal = 0; - for (stk::mesh::Entity localElemElem : m_localElementToLocalNeighborElements[localElem]) - if (is_element_active(localElemElem)) - (*neighborVal)++; - } -} -void NoGhostGameofLife::update_neighbor_values_with_remote_elements() -{ - stk::CommSparse buffer(m_bulkData.parallel()); - send_num_active_neighbors_of_remote_elem_keys(buffer); - recieve_num_active_neighbors_of_local_elements(buffer); -} -void NoGhostGameofLife::send_num_active_neighbors_of_remote_elem_keys(stk::CommSparse& buffer) -{ - for (int phase = 0 ; phase < 2; phase++) - { - for (stk::mesh::EntityKey remoteElemKey : m_remoteElementKeysToVisit) - pack_number_of_local_neighbors_of_remote_element_into_buffer(buffer, remoteElemKey); - if (0 == phase) - buffer.allocate_buffers(); - else if (1 == phase) - buffer.communicate(); - } -} -void NoGhostGameofLife::pack_number_of_local_neighbors_of_remote_element_into_buffer(stk::CommSparse& - buffer, - stk::mesh:: - EntityKey - remoteKey) -{ - int numActive = count_local_active_neighbors_for_remote_element_key(remoteKey); - pack_num_active_neighbors_into_buffer(buffer, numActive, remoteKey); -} -int NoGhostGameofLife::count_local_active_neighbors_for_remote_element_key(stk::mesh::EntityKey - remoteKey) -{ - int numActive = 0; - for (stk::mesh::Entity localElem : - m_remoteElementKeyToLocalNeighborElements[remoteKey]) - if (is_element_active(localElem)) - numActive++; - return numActive; -} -void NoGhostGameofLife::pack_num_active_neighbors_into_buffer(stk::CommSparse& buffer, - int numActive, stk::mesh::EntityKey - remoteElemKey) -{ - int procNum = m_remoteElementKeyToOwningProcessor[remoteElemKey]; - buffer.send_buffer(procNum).pack(remoteElemKey); - buffer.send_buffer(procNum).pack(numActive); -} -void NoGhostGameofLife::recieve_num_active_neighbors_of_local_elements(stk::CommSparse& buffer) -{ - for (int procNum = 0; procNum < m_numProcs; procNum++) - { - stk::CommBuffer& buf = buffer.recv_buffer(procNum); - while(buf.remaining()) - update_local_element_with_remote_neighbor_data(buf); - } -} -void NoGhostGameofLife::update_local_element_with_remote_neighbor_data(stk::CommBuffer& buf) -{ - stk::mesh::EntityKey localElemKey = stk::unpack(buf); - stk::mesh::Entity localElem = m_bulkData.get_entity(localElemKey); - int neighborVal = stk::unpack(buf); - *stk::mesh::field_data(m_neighborField, localElem) += neighborVal; -} -void NoGhostGameofLife::update_element_membership() -{ - m_localActiveElements.clear(); // field - for (stk::mesh::Entity localElem : m_localElementsToVisit) - { - switch (m_bulkData.bucket(localElem).topology()) - { - case stk::topology::TRI_3_2D: - update_tri_membership(localElem); - break; - case stk::topology::QUAD_4_2D: - update_quad_membership(localElem); - break; - case stk::topology::HEX_8: - update_hex_membership(localElem); - break; - default: - ThrowRequire(false); - } - if (is_element_active(localElem)) // field - m_localActiveElements.push_back(localElem); - } -} -void NoGhostGameofLife::update_tri_membership(stk::mesh::Entity elem) -{ - switch (*stk::mesh::field_data(m_neighborField, elem)) - { - case 2: - case 7: - break; - case 3: - activate_element(elem); - break; - default: - deactivate_element(elem); - break; - } -} -void NoGhostGameofLife::update_quad_membership(stk::mesh::Entity elem) -{ -// maze rules -// if (*stk::mesh::field_data(m_lifeField, elem)) -// { -// switch (*stk::mesh::field_data(m_neighborField, elem)) -// { -// case 3: -// activate_element(elem); -// break; -// default: -// deactivate_element(elem); -// } -// } -// else -// { -// switch (*stk::mesh::field_data(m_neighborField, elem)) -// { -// case 1: -// case 2: -// case 3: -// case 4: -// case 5: -// activate_element(elem); -// break; -// default: -// deactivate_element(elem); -// } -// } - switch (*stk::mesh::field_data(m_neighborField, elem)) - { - case 2: - break; - case 3: - activate_element(elem); - break; - default: - deactivate_element(elem); - break; - } -} -void NoGhostGameofLife::update_hex_membership(stk::mesh::Entity elem) -{ - switch (*stk::mesh::field_data(m_neighborField, elem)) - { - case 4: - break; - case 5: - activate_element(elem); - break; - default: - deactivate_element(elem); - break; - } -} diff --git a/packages/stk/stk_learning/GameOfLife/NoGhostGameofLife.hpp b/packages/stk/stk_learning/GameOfLife/NoGhostGameofLife.hpp deleted file mode 100644 index 01be536b864e..000000000000 --- a/packages/stk/stk_learning/GameOfLife/NoGhostGameofLife.hpp +++ /dev/null @@ -1,229 +0,0 @@ -// Copyright 2002 - 2008, 2010, 2011 National Technology Engineering -// Solutions of Sandia, LLC (NTESS). Under the terms of Contract -// DE-NA0003525 with NTESS, the U.S. Government retains certain rights -// in this software. -// - // Redistribution and use in source and binary forms, with or without - // modification, are permitted provided that the following conditions are - // met: - // - // * Redistributions of source code must retain the above copyright - // notice, this list of conditions and the following disclaimer. - // - // * Redistributions in binary form must reproduce the above - // copyright notice, this list of conditions and the following - // disclaimer in the documentation and/or other materials provided - // with the distribution. - // -// * Neither the name of NTESS nor the names of its contributors -// may be used to endorse or promote products derived from this -// software without specific prior written permission. -// - // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - // "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - // A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -/* - * NoGhostGameofLife.h - * - * Created on: Aug 10, 2015 - * Author: jonchu - */ -#ifndef GAMEOFLIFE_NOGHOSTGAMEOFLIFE_HPP_ -#define GAMEOFLIFE_NOGHOSTGAMEOFLIFE_HPP_ - -#include // for StkMeshIoBroker -#include // for string -#include // for unordered_map -#include // for unordered_set -#include // for vector -#include "stk_mesh/base/HashEntityAndEntityKey.hpp" // for hash -#include "GameofLifeMesh.hpp" // for ScalarIntField -#include "stk_mesh/base/Entity.hpp" // for Entity -#include "stk_mesh/base/EntityKey.hpp" // for EntityKey -#include "stk_mesh/base/Types.hpp" // for EntityId, EntityVector, etc -namespace stk { class CommBuffer; } -namespace stk { class CommSparse; } -namespace stk { namespace mesh { class BulkData; } } - - - - - -/* - * How to use: - * Basically the same as GameofLife, but make sure the MeshBuilder had no aura. - */ -class NoGhostGameofLife -{ -public: - //basics - NoGhostGameofLife(GameofLifeMesh& Mesh, std::string name); - - //NoGhostGameofLife(stk::mesh::BulkData& bulkData, ScalarIntField& lifeField, - // ScalarIntField& neighborField, std::string name); - - ~NoGhostGameofLife(){} - - void activate_these_ids(stk::mesh::EntityIdVector& elemIds); - - void run_game_of_life(int numSteps); - - //test functions - stk::mesh::Entity element_with_id(stk::mesh::EntityId elemId); - - bool is_valid_entity(stk::mesh::Entity entity); - - unsigned num_neighbors(stk::mesh::Entity elem); - - unsigned num_active_elems(); - - unsigned num_active_neighbors(stk::mesh::Entity elem); - - //accessors - inline stk::mesh::BulkData& bulk_data(); - - inline unsigned num_procs() const; - - inline unsigned num_elems_on_proc() const; - - -private: - //basic stuff - stk::mesh::BulkData& m_bulkData; - int m_numProcs; - stk::mesh::EntityVector m_elements; - - //game stuff - ScalarIntField& m_lifeField; - ScalarIntField& m_neighborField; - - //io - std::string m_name; - stk::io::StkMeshIoBroker m_stkIo; - unsigned m_fileHandler; - int m_time; - - //book keeping - std::unordered_map>, std::hash> - m_localElementToLocalNeighborElements; - - std::unordered_set> - m_remoteElementKeys; - - std::unordered_map>, std::hash> - m_remoteElementKeyToLocalNodeKeys; - - std::unordered_map> - m_remoteElementKeyToOwningProcessor; - - std::unordered_map>, std::hash> - m_remoteElementKeyToLocalNeighborElements; - - std::unordered_map>, std::hash> - m_localElementToRemoteElementKeys; - - std::vector - m_localActiveElements; - - std::unordered_set> - m_localElementsToVisit; - - std::unordered_set> - m_remoteElementKeysToVisit; - - //whatever - bool is_element_active(stk::mesh::Entity elem); - - void activate_element(stk::mesh::Entity elem); - - void deactivate_element(stk::mesh::Entity elem); - - //constructor - void finish_construction(); - - void get_elements(); - void create_element_connectivity_maps(); - void create_local_element_to_local_element_map(); - void create_map_for_this_element(stk::mesh::Entity elem); - void add_this_nodes_elements_to_this_elements_map(stk::mesh::Entity elem, - stk::mesh::Entity node); - void create_remote_element_key_maps(); - void fill_buffer_with_local_element_keys_and_remote_node_keys(stk::CommSparse& buffer); - void fill_buffer_with_this_elements_info(stk::mesh::Entity elem, stk::CommSparse& buffer); - void fill_map_with_this_elements_nodes(stk::mesh::Entity elem, std::unordered_map>>& map); - void fill_buffer_with_map_info(stk::mesh::Entity elem, stk::CommSparse& buffer, - std::unordered_map>>& map); - void unpack_remote_elem_key_info_from_buffer(stk::CommSparse& buffer); - void unpack_remote_info_from_this_processor(int proc, stk::CommBuffer& buf); - void create_map_of_remote_elem_keys_to_local_elements(); - void map_this_remote_element_key_with_this_nodes_elements(stk::mesh::EntityKey remoteKey, - stk::mesh::EntityKey nodeKey); - void create_local_element_to_remote_element_key_map(); - void fill_buffer_with_local_neighbors_of_remote_keys(stk::CommSparse& buffer); - void fill_buffer_with_local_neighbors_of_remote_element_key(stk::mesh::EntityKey remoteKey, - stk::CommSparse& buffer); - void unpack_local_and_remote_key_info_from_each_processor(stk::CommSparse& buffer); - void unpack_local_and_remote_keys_from_buffer(stk::CommBuffer& buf); - void write_output_mesh(); - - //activate elements - void activate_element_id(stk::mesh::EntityId elemId); - - //GoL - void run_game_of_life_step(); - void determine_elements_to_check(); - void refresh_element_maps(); - void get_elements_to_visit(); - void communicate_remote_element_keys_to_check(stk::CommSparse& buffer); - void recieve_local_element_keys_to_check(stk::CommSparse& buffer); - void update_neighbor_values_with_local_elements(); - void update_neighbor_values_with_remote_elements(); - void send_num_active_neighbors_of_remote_elem_keys(stk::CommSparse& buffer); - void pack_number_of_local_neighbors_of_remote_element_into_buffer(stk::CommSparse& buffer, - stk::mesh::EntityKey remoteKey); - int count_local_active_neighbors_for_remote_element_key(stk::mesh::EntityKey remoteKey); - void pack_num_active_neighbors_into_buffer(stk::CommSparse& buffer, int numActive, - stk::mesh::EntityKey remoteKey); - void recieve_num_active_neighbors_of_local_elements(stk::CommSparse& buffer); - void update_local_element_with_remote_neighbor_data(stk::CommBuffer& buf); - void update_element_membership(); - void update_tri_membership(stk::mesh::Entity elem); - void update_quad_membership(stk::mesh::Entity elem); - void update_hex_membership(stk::mesh::Entity elem); - void write_output_step(); -}; - -//accessors -inline stk::mesh::BulkData& NoGhostGameofLife::bulk_data() -{ - return m_bulkData; -} -inline unsigned NoGhostGameofLife::num_procs() const -{ - return m_numProcs; -} -inline unsigned NoGhostGameofLife::num_elems_on_proc() const -{ - return m_elements.size(); -} - - - -#endif /* GAMEOFLIFE_NOGHOSTGAMEOFLIFE_HPP_ */ diff --git a/packages/stk/stk_learning/GameOfLife/PNGProcessor.cpp b/packages/stk/stk_learning/GameOfLife/PNGProcessor.cpp deleted file mode 100644 index d5ef53cda2bb..000000000000 --- a/packages/stk/stk_learning/GameOfLife/PNGProcessor.cpp +++ /dev/null @@ -1,203 +0,0 @@ -#include "PNGProcessor.hpp" -#include // for printf -#include // for sort -#include "GameOfLife/LodePNG.hpp" // for decode -#include "stk_mesh/base/Types.hpp" // for EntityIdVector - -unsigned char greyDivisor = 0x2f; - -PNGProcessor::PNGProcessor(std::string fileName) -{ - lodepng::decode(m_byteVector, m_imageWidth, m_imageHeight, fileName); - process_bytes_into_image_vector(); -} -void PNGProcessor::commit_image_vector_to_pixel_vector() -{ - m_pixelVector.resize(m_imageHeight); - for (unsigned rowIndex = 0; rowIndex < m_imageHeight; rowIndex++) - commit_image_row_to_pixel_row(rowIndex); - m_imageVector.clear(); // rest in pepperonis -} -void PNGProcessor::add_this_much_pixel_padding_to_right(unsigned amount) -{ - m_imageWidth += amount; - for (unsigned rowIndex = 0; rowIndex < m_imageHeight; rowIndex++) - m_pixelVector[rowIndex].insert(m_pixelVector[rowIndex].end(), amount, false); -} - -void PNGProcessor::add_this_much_pixel_padding_to_left(unsigned amount) -{ - m_imageWidth += amount; - for (unsigned rowIndex = 0; rowIndex < m_imageHeight; rowIndex++) - m_pixelVector[rowIndex].insert(m_pixelVector[rowIndex].begin(), amount, false); -} - -void PNGProcessor::add_this_much_pixel_padding_to_top(unsigned amount) -{ - m_imageHeight += amount; - std::vector example(m_imageWidth, false); - m_pixelVector.insert(m_pixelVector.begin(), amount, example); -} - -void PNGProcessor::add_this_much_pixel_padding_to_bottom(unsigned amount) -{ - m_imageHeight += amount; - std::vector example(m_imageWidth, false); - m_pixelVector.insert(m_pixelVector.end(), amount, example); -} - -void PNGProcessor::fill_id_vector_with_active_pixels(stk::mesh::EntityIdVector& elemIds) const -{ - unsigned id = 1; - for (int rowIndex = m_imageHeight-1; rowIndex >= 0; rowIndex--) - for (unsigned colIndex = 0; colIndex < m_imageWidth; colIndex++, id++) - if (m_pixelVector[rowIndex][colIndex]) - elemIds.push_back(id); -} - -void PNGProcessor::process_bytes_into_image_vector() -{ - m_imageVector.resize(m_imageHeight); - unsigned byteVectorIndex = 0; - for (unsigned row = 0; row < m_imageHeight; row++) - process_image_vector_row(row, byteVectorIndex); -} -void PNGProcessor::process_image_vector_row(unsigned row, unsigned& byteVectorIndex) -{ - m_imageVector[row].resize(m_imageWidth); - for (unsigned col = 0; col < m_imageWidth; col++) - smear_character_bytes_into_unsigned_int(row, col, byteVectorIndex); -} -void PNGProcessor::smear_character_bytes_into_unsigned_int(unsigned row, unsigned col, - unsigned& byteVectorIndex) -{ - unsigned newValue = 0x00; - for (int counter = 3; counter >= 0; counter --, byteVectorIndex++) - newValue |= (m_byteVector[byteVectorIndex] << (counter*8)); - m_imageVector[row][col] = newValue; -} -void PNGProcessor::commit_image_row_to_pixel_row(unsigned row) -{ - m_pixelVector[row].resize(m_imageWidth); - for (unsigned index = 0; index < m_imageWidth; index++) - m_pixelVector[row][index] = (0xff == m_imageVector[row][index]); -} -/* - * Bordered PNG Processor - */ -BorderedPNGProcessor::BorderedPNGProcessor(std::string fileName) -:PNGProcessor(fileName), m_numVerticalLines(0), m_numHorizontalLines(0) -{ - shrink_image(); -} - -void BorderedPNGProcessor::shrink_image() -{ - count_vertical_and_horizontal_lines(); - declare_new_height_and_width(); - shrink_image_vector(); -} - -void BorderedPNGProcessor::count_vertical_and_horizontal_lines() -{ - for (unsigned index = 0; index < m_imageWidth; index++) - if (0xc6c6c6ff == m_imageVector[1][index]) - m_numVerticalLines++; - for (unsigned index = 0; index < m_imageHeight; index++) - if (0xc6c6c6ff == m_imageVector[index][1]) - m_numHorizontalLines++; -} -void BorderedPNGProcessor::declare_new_height_and_width() -{ - m_squareHeight = (m_imageHeight-m_numHorizontalLines)/(m_numHorizontalLines-1); - m_squareWidth = (m_imageWidth-m_numVerticalLines)/(m_numVerticalLines-1); - m_imageHeight = m_numHorizontalLines-1; - m_imageWidth = m_numVerticalLines-1; -} - -void BorderedPNGProcessor::shrink_image_vector() -{ - for (unsigned row = 0; row < m_imageHeight; row++) - shrink_image_row(row); - m_imageVector.resize(m_imageHeight); -} -void BorderedPNGProcessor::shrink_image_row(unsigned row) -{ - unsigned verticalOffset = m_squareHeight*row + row + 1; - m_imageVector[row].resize(m_imageWidth); - for (unsigned col = 0; col < m_imageWidth; col++) - shrink_image_byte(row, col, verticalOffset); -} -void BorderedPNGProcessor::shrink_image_byte(unsigned row, unsigned col, unsigned verticalOffset) -{ - unsigned horizontalOffset = m_squareWidth*col + col + 1; - m_imageVector[row][col] = - m_imageVector[verticalOffset][horizontalOffset]; -} - -SimpleColoredPng::SimpleColoredPng(std::string fileName) -: PNGProcessor(fileName), mOtherPixelCount(0) -{ - for (unsigned row = 0; row < m_imageHeight; row++) - for (unsigned col = 0; col < m_imageWidth; col++) - { - store_special_colors_with_coordinates(row, col); - update_image_value_ignoring_white(row, col); - } - - PNGProcessor::commit_image_vector_to_pixel_vector(); -} - -const unsigned RED = 0xFF0000; -const unsigned GREEN = 0x00FF00; -const unsigned BLUE = 0x0000FF; - -void SimpleColoredPng::store_special_colors_with_coordinates(unsigned row, unsigned col) -{ - unsigned colorNoAlpha = (m_imageVector[row][col]>>8); - switch(colorNoAlpha) - { - case RED: - mRedPixels.push_back({row, col}); - break; - case GREEN: - mGreenPixels.push_back({row, col}); - break; - case BLUE: - mBluePixels.push_back({row, col}); - break; - default: - break; - } -} - -void SimpleColoredPng::update_image_value_ignoring_white(unsigned row, unsigned col) -{ - bool isWhite = m_imageVector[row][col] == 0xffffffff; - bool isTransparent = (m_imageVector[row][col] & 0xff) == 0; - if(!isWhite && !isTransparent) - { - m_imageVector[row][col] = 0xff; - mOtherPixelCount++; - } -} - -void SimpleColoredPng::fill_id_vector_with_active_pixels(stk::mesh::EntityIdVector& elemIds) const -{ - unsigned id = 1; - for (int rowIndex = m_imageHeight-1; rowIndex >= 0; rowIndex--) - for (unsigned colIndex = 0; colIndex < m_imageWidth; colIndex++, id++) - if (m_pixelVector[rowIndex][colIndex]) - elemIds.push_back(id); -} - -stk::mesh::EntityIdVector SimpleColoredPng::get_elemIds_for_colored_pixels(const std::vector & coloredPixels) -{ - stk::mesh::EntityIdVector elemIds; - for(Pixel pixel : coloredPixels) - { - stk::mesh::EntityId id = (m_imageHeight - pixel.x) * m_imageWidth - (m_imageWidth - (pixel.y+1)); - elemIds.push_back(id); - } - return elemIds; -} diff --git a/packages/stk/stk_learning/GameOfLife/PNGProcessor.hpp b/packages/stk/stk_learning/GameOfLife/PNGProcessor.hpp deleted file mode 100644 index f76742102cfa..000000000000 --- a/packages/stk/stk_learning/GameOfLife/PNGProcessor.hpp +++ /dev/null @@ -1,166 +0,0 @@ -// Copyright 2002 - 2008, 2010, 2011 National Technology Engineering -// Solutions of Sandia, LLC (NTESS). Under the terms of Contract -// DE-NA0003525 with NTESS, the U.S. Government retains certain rights -// in this software. -// - // Redistribution and use in source and binary forms, with or without - // modification, are permitted provided that the following conditions are - // met: - // - // * Redistributions of source code must retain the above copyright - // notice, this list of conditions and the following disclaimer. - // - // * Redistributions in binary form must reproduce the above - // copyright notice, this list of conditions and the following - // disclaimer in the documentation and/or other materials provided - // with the distribution. - // -// * Neither the name of NTESS nor the names of its contributors -// may be used to endorse or promote products derived from this -// software without specific prior written permission. -// - // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - // "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - // A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -#ifndef _PNGPROCESSOR_HPP_ -#define _PNGPROCESSOR_HPP_ - -#include // for EntityIdVector -#include // for string -#include // for pair -#include // for vector - - -/* - * How to use: - * Pass the file name of the image (make sure it's in the same directory, else segfault), - * and call the commit_image_vector function. There's another option if it's colored. Don't - * use the bordered one unless the image pulled is specifically from ConwayLife, because that - * is the only image type it really supports, and the regular one only takes in black and white, - * however the colored one can take in literally anything. The padding is pretty self-explanatory, - * and you can get the ids if you're using a quad mesh by using the fill_element_id_vector thing. - */ - -class PNGProcessor -{ -public: - PNGProcessor(std::string fileName); - - virtual ~PNGProcessor() {} - - virtual void commit_image_vector_to_pixel_vector(); - - void add_this_much_pixel_padding_to_right(unsigned amount); - - void add_this_much_pixel_padding_to_left(unsigned amount); - - void add_this_much_pixel_padding_to_top(unsigned amount); - - void add_this_much_pixel_padding_to_bottom(unsigned amount); - - //accessors and other stuff - inline unsigned get_image_width() const; - - inline unsigned get_image_height() const; - - virtual void fill_id_vector_with_active_pixels(stk::mesh::EntityIdVector& elemIds) const; - -protected: - unsigned m_imageWidth; - - unsigned m_imageHeight; - - std::vector m_byteVector; - - std::vector> m_imageVector; - - std::vector> m_pixelVector; - -private: - //constructor - void process_bytes_into_image_vector(); - void process_image_vector_row(unsigned row, unsigned& byteVectorIndex); - void smear_character_bytes_into_unsigned_int(unsigned row, unsigned col, - unsigned& byteVectorIndex); - - //convert image vector to pixel vector - void commit_image_row_to_pixel_row(unsigned row); -}; -inline unsigned PNGProcessor::get_image_width() const -{ - return m_imageWidth; -} -inline unsigned PNGProcessor::get_image_height() const -{ - return m_imageHeight; -} -class BorderedPNGProcessor : public PNGProcessor -{ -public: - BorderedPNGProcessor(std::string fileName); - - virtual ~BorderedPNGProcessor() {} - - void shrink_image(); - -private: - //random variables - unsigned m_numVerticalLines; - unsigned m_numHorizontalLines; - unsigned m_squareHeight; - unsigned m_squareWidth; - - //compress_bordered_image - void count_vertical_and_horizontal_lines(); - - void declare_new_height_and_width(); - - void shrink_image_vector(); - void shrink_image_row(unsigned row); - void shrink_image_byte(unsigned row, unsigned col, unsigned verticalOffset); -}; - -struct Pixel -{ - unsigned x; - unsigned y; -}; - -class SimpleColoredPng : public PNGProcessor -{ -public: - SimpleColoredPng(std::string fileName); - virtual ~SimpleColoredPng() {} - - virtual void fill_id_vector_with_active_pixels(stk::mesh::EntityIdVector& elemIds) const; - - size_t get_number_other_pixels() { return mOtherPixelCount; } - - std::vector get_red_color_coords() { return mRedPixels; } - std::vector get_green_color_coords() { return mGreenPixels; } - std::vector get_blue_color_coords() { return mBluePixels; } - - stk::mesh::EntityIdVector get_elemIds_for_colored_pixels(const std::vector & coloredPixels); -private: - void store_special_colors_with_coordinates(unsigned row, unsigned col); - void update_image_value_ignoring_white(unsigned row, unsigned col); -private: - size_t mOtherPixelCount; - stk::mesh::EntityIdVector mRedElementIds; - - std::vector mRedPixels; - std::vector mGreenPixels; - std::vector mBluePixels; -}; - - -#endif /*_PNGPROCESSOR_HPP_ */ diff --git a/packages/stk/stk_learning/GameOfLife/UnitTest/UnitTestGameOfLife.cpp b/packages/stk/stk_learning/GameOfLife/UnitTest/UnitTestGameOfLife.cpp deleted file mode 100644 index 82c3681bf275..000000000000 --- a/packages/stk/stk_learning/GameOfLife/UnitTest/UnitTestGameOfLife.cpp +++ /dev/null @@ -1,2119 +0,0 @@ - -#include // for AssertHelper, EXPECT_EQ, etc -#include // for PartGameofLife, etc -#include // for QuadGameofLifeMesh, etc -#include // for NoGhostGameofLife -#include // for PNGProcessor, etc -#include // for BulkData, etc -#include // for get_entities -#include // for topology, etc -#include // for string - -#include "../../../stk_io/stk_io/FillMesh.hpp" -#include "mpi.h" // for MPI_COMM_WORLD, etc -#include "stk_mesh/base/Entity.hpp" // for Entity -#include "stk_mesh/base/Types.hpp" // for EntityIdVector, etc -#include "stk_util/parallel/Parallel.hpp" // for parallel_machine_size, etc -#include "stk_unit_test_utils/getOption.h" -#include "stk_io/FillMesh.hpp" -#include "stk_io/WriteMesh.hpp" - - - -/* - * There are 1 proc and 4 proc tests, mostly clones of each other to test parallel - * consistency. - */ -namespace -{ -TEST(GameofLifeClass, 1ProcTestTest) -{ - stk::ParallelMachine comm = MPI_COMM_WORLD; - int numProcs = stk::parallel_machine_size(comm); - if (1 == numProcs) - { - std::string meshName = "1ProcTestTest"; - QuadGameofLifeMesh Mesh(comm, 4, 4); - - stk::mesh::EntityIdVector elemIds = {1, 2, 3, 4, 5, 8, 9, 12, 13, 14, 15, 16}; - PartGameofLife PartGame(Mesh, meshName); - PartGame.activate_these_ids(elemIds); - EXPECT_TRUE(PartGame.are_these_ids_active(elemIds)); - - stk::mesh::EntityIdVector notElemIds1 = {1, 2, 3, 4, 5, 6, 8, 9, 12, 13, 14, 15, 16}; - stk::mesh::EntityIdVector notElemIds2 = {1, 2, 3, 4, 5, 8, 9, 10, 12, 13, 14, 15, 16}; - stk::mesh::EntityIdVector elemIds1 = {1, 2, 3, 4}; - stk::mesh::EntityIdVector elemIds2 = {13, 14, 15, 16}; - - EXPECT_EQ(16u, PartGame.get_num_elems_on_proc()); - EXPECT_EQ(12u, PartGame.get_num_active_elements()); - EXPECT_FALSE(PartGame.are_these_ids_active(notElemIds1)); - EXPECT_FALSE(PartGame.are_these_ids_active(notElemIds2)); - EXPECT_TRUE(PartGame.are_these_ids_active(elemIds1)); - EXPECT_TRUE(PartGame.are_these_ids_active(elemIds2)); - } -} -TEST(GameofLifeClass, 4ProcTestTest) -{ - stk::ParallelMachine comm = MPI_COMM_WORLD; - int numProcs = stk::parallel_machine_size(comm); - int procRank = stk::parallel_machine_rank(comm); - if (4 == numProcs) - { - std::string meshName = "4ProcTestTest"; - QuadGameofLifeMesh Mesh(comm, 4, 4); - - stk::mesh::EntityIdVector elemIds = {1, 2, 3, 4, 5, 8, 9, 12, 13, 14, 15, 16}; - PartGameofLife PartGame(Mesh, meshName); - PartGame.activate_these_ids(elemIds); - EXPECT_TRUE(PartGame.are_these_ids_active(elemIds)); - - stk::mesh::EntityIdVector notElemIds1 = {1, 2, 3, 4, 5, 6, 8, 9, 12, 13, 14, 15, 16}; - stk::mesh::EntityIdVector notElemIds2 = {1, 2, 3, 4, 5, 8, 9, 10, 12, 13, 14, 15, 16}; - stk::mesh::EntityIdVector elemIds1 = {1, 2, 3, 4}; - stk::mesh::EntityIdVector elemIds2 = {13, 14, 15, 16}; - EXPECT_EQ(4u, PartGame.get_num_elems_on_proc()); - if (1 == procRank || 2 == procRank) - { - EXPECT_EQ(2u, PartGame.get_num_active_elements()); - } - else if (0 == procRank || 3 == procRank) - { - EXPECT_EQ(4u, PartGame.get_num_active_elements()); - } - if (1 == procRank) - { - EXPECT_FALSE(PartGame.are_these_ids_active(notElemIds1)); - } - if (2 == procRank) - { - EXPECT_FALSE(PartGame.are_these_ids_active(notElemIds2)); - } - EXPECT_TRUE(PartGame.are_these_ids_active(elemIds1)); - EXPECT_TRUE(PartGame.are_these_ids_active(elemIds2)); - } -} -TEST(TriangleGameofLifeClass, 1ProcRandomTest) -{ - stk::ParallelMachine comm = MPI_COMM_WORLD; - int numProcs = stk::parallel_machine_size(comm); - if (1 == numProcs) - { - std::string partMeshName = "1ProcPartRandomTest"; - std::string fieldMeshName = "1ProcFieldRandomTest"; - - TriGameofLifeMesh PartMesh(comm, 4, 4); - TriGameofLifeMesh FieldMesh(comm, 4, 4); - - PartGameofLife PartGame(PartMesh, partMeshName); - FieldGameofLife FieldGame(FieldMesh, fieldMeshName); - - stk::mesh::EntityIdVector elemIds = {1, 2, 3, 4, 5, 6, 7, 8, - 25, 26, 27, 28, 29, 30, 31, 32}; - PartGame.activate_these_ids(elemIds); - FieldGame.activate_these_ids(elemIds); - EXPECT_EQ(16u, PartGame.get_num_active_elements()); - EXPECT_EQ(16u, FieldGame.get_num_active_elements()); - - PartGame.run_game_of_life(5); - FieldGame.run_game_of_life(5); - - EXPECT_EQ(4u, PartGame.get_num_active_elements()); - EXPECT_EQ(4u, FieldGame.get_num_active_elements()); - stk::mesh::EntityIdVector exElemIds = {12, 14, 19, 21}; - EXPECT_TRUE(PartGame.are_these_ids_active(exElemIds)); - EXPECT_TRUE(FieldGame.are_these_ids_active(exElemIds)); - - PartGame.run_game_of_life(5); - FieldGame.run_game_of_life(5); - - EXPECT_EQ(4u, PartGame.get_num_active_elements()); - EXPECT_EQ(4u, FieldGame.get_num_active_elements()); - EXPECT_TRUE(PartGame.are_these_ids_active(exElemIds)); - EXPECT_TRUE(FieldGame.are_these_ids_active(exElemIds)); - } -} -TEST(TriangleGameofLifeClass, 4ProcRandomTest) -{ - stk::ParallelMachine comm = MPI_COMM_WORLD; - int numProcs = stk::parallel_machine_size(comm); - int procRank = stk::parallel_machine_rank(comm); - if (4 == numProcs) - { - std::string partMeshName = "4ProcPartRandomTest"; - std::string fieldMeshName = "4ProcFieldRandomTest"; - - TriGameofLifeMesh PartMesh(comm, 4, 4); - TriGameofLifeMesh FieldMesh(comm, 4, 4); - - PartGameofLife PartGame(PartMesh, partMeshName); - FieldGameofLife FieldGame(FieldMesh, fieldMeshName); - - stk::mesh::EntityIdVector elemIds = {1, 2, 3, 4, 5, 6, 7, 8, - 25, 26, 27, 28, 29, 30, 31, 32}; - PartGame.activate_these_ids(elemIds); - FieldGame.activate_these_ids(elemIds); - if (0 == procRank || 3 == procRank) - { - EXPECT_EQ(8u, PartGame.get_num_active_elements()); - EXPECT_EQ(8u, FieldGame.get_num_active_elements()); - } - else - { - EXPECT_EQ(0u, PartGame.get_num_active_elements()); - EXPECT_EQ(0u, FieldGame.get_num_active_elements()); - } - - PartGame.run_game_of_life(5); - FieldGame.run_game_of_life(5); - if (1 == procRank || 2 == procRank) - { - EXPECT_EQ(2u, PartGame.get_num_active_elements()); - EXPECT_EQ(2u, FieldGame.get_num_active_elements()); - } - else - { - EXPECT_EQ(0u, PartGame.get_num_active_elements()); - EXPECT_EQ(0u, FieldGame.get_num_active_elements()); - - } - stk::mesh::EntityIdVector exElemIds = {12, 14, 19, 21}; - EXPECT_TRUE(PartGame.are_these_ids_active(exElemIds)); - EXPECT_TRUE(FieldGame.are_these_ids_active(exElemIds)); - - PartGame.run_game_of_life(5); - FieldGame.run_game_of_life(5); - if (1 == procRank || 2 == procRank) - { - EXPECT_EQ(2u, PartGame.get_num_active_elements()); - EXPECT_EQ(2u, FieldGame.get_num_active_elements()); - } - else - { - EXPECT_EQ(0u, PartGame.get_num_active_elements()); - EXPECT_EQ(0u, FieldGame.get_num_active_elements()); - - } - EXPECT_TRUE(PartGame.are_these_ids_active(exElemIds)); - EXPECT_TRUE(FieldGame.are_these_ids_active(exElemIds)); - } -} -TEST(TriangleGameofLifeClass, 1ProcInfiniteTest) -{ - stk::ParallelMachine comm = MPI_COMM_WORLD; - int numProcs = stk::parallel_machine_size(comm); - if (1 == numProcs) - { - std::string partMeshName = "1ProcPartInfiniteTest"; - std::string fieldMeshName = "1ProcFieldInfiniteTest"; - - TriGameofLifeMesh PartMesh(comm, 10, 5); - TriGameofLifeMesh FieldMesh(comm, 10, 5); - - PartGameofLife PartGame(PartMesh, partMeshName); - FieldGameofLife FieldGame(FieldMesh, fieldMeshName); - - EXPECT_EQ(100u, PartGame.get_num_elems_on_proc()); - EXPECT_EQ(100u, FieldGame.get_num_elems_on_proc()); - - stk::mesh::EntityIdVector elemIds = {32, 48, 67, 68}; - PartGame.activate_these_ids(elemIds); - FieldGame.activate_these_ids(elemIds); - EXPECT_EQ(4u, PartGame.get_num_active_elements()); - EXPECT_EQ(4u, FieldGame.get_num_active_elements()); - EXPECT_TRUE(PartGame.are_these_ids_active(elemIds)); - EXPECT_TRUE(FieldGame.are_these_ids_active(elemIds)); - - PartGame.run_game_of_life(5); - FieldGame.run_game_of_life(5); - - stk::mesh::EntityIdVector exElemIds1 = {8, 25, 29, 43, 48, 63, 67, 83}; - EXPECT_TRUE(PartGame.are_these_ids_active(exElemIds1)); - EXPECT_TRUE(FieldGame.are_these_ids_active(exElemIds1)); - EXPECT_EQ(8u, PartGame.get_num_active_elements()); - EXPECT_EQ(8u, FieldGame.get_num_active_elements()); - - - PartGame.run_game_of_life(5); - FieldGame.run_game_of_life(5); - - stk::mesh::EntityIdVector exElemIds2 = {42, 43, 44, 45, 47, 48, 66, 67, 68, 81, 82, - 84, 85, 86, 87}; - EXPECT_TRUE(PartGame.are_these_ids_active(exElemIds2)); - EXPECT_TRUE(FieldGame.are_these_ids_active(exElemIds2)); - } -} -TEST(TriangleGameofLifeClass, 4ProcInfiniteTest) -{ - stk::ParallelMachine comm = MPI_COMM_WORLD; - int numProcs = stk::parallel_machine_size(comm); - int procRank = stk::parallel_machine_rank(comm); - if (4 == numProcs) - { - std::string partMeshName = "4ProcPartInfiniteTest"; - std::string fieldMeshName = "4ProcFieldInfiniteTest"; - - TriGameofLifeMesh PartMesh(comm, 10, 5); - TriGameofLifeMesh FieldMesh(comm, 10, 5); - - PartGameofLife PartGame(PartMesh, partMeshName); - FieldGameofLife FieldGame(FieldMesh, fieldMeshName); - - if (3 == procRank) - { - EXPECT_EQ(40u, PartGame.get_num_elems_on_proc()); - EXPECT_EQ(40u, FieldGame.get_num_elems_on_proc()); - } - else - { - EXPECT_EQ(20u, PartGame.get_num_elems_on_proc()); - EXPECT_EQ(20u, FieldGame.get_num_elems_on_proc()); - } - - stk::mesh::EntityIdVector elemIds = {32, 48, 67, 68}; - PartGame.activate_these_ids(elemIds); - FieldGame.activate_these_ids(elemIds); - if (3 == procRank) - { - EXPECT_EQ(2u, PartGame.get_num_active_elements()); - EXPECT_EQ(2u, FieldGame.get_num_active_elements()); - } - else if (2 == procRank) - { - EXPECT_EQ(1u, PartGame.get_num_active_elements()); - EXPECT_EQ(1u, FieldGame.get_num_active_elements()); - } - else if (1 == procRank) - { - EXPECT_EQ(1u, PartGame.get_num_active_elements()); - EXPECT_EQ(1u, FieldGame.get_num_active_elements()); - } - else if (0 == procRank) - { - EXPECT_EQ(0u, PartGame.get_num_active_elements()); - EXPECT_EQ(0u, FieldGame.get_num_active_elements()); - } - - PartGame.run_game_of_life(5); - FieldGame.run_game_of_life(5); - - stk::mesh::EntityIdVector exElemIds1 = {8, 25, 29, 43, 48, 63, 67, 83}; - EXPECT_TRUE(PartGame.are_these_ids_active(exElemIds1)); - EXPECT_TRUE(FieldGame.are_these_ids_active(exElemIds1)); - if (3 == procRank) - { - EXPECT_EQ(3u, PartGame.get_num_active_elements()); - EXPECT_EQ(3u, FieldGame.get_num_active_elements()); - } - else if (2 == procRank) - { - EXPECT_EQ(2u, PartGame.get_num_active_elements()); - EXPECT_EQ(2u, FieldGame.get_num_active_elements()); - } - else if (1 == procRank) - { - EXPECT_EQ(2u, PartGame.get_num_active_elements()); - EXPECT_EQ(2u, FieldGame.get_num_active_elements()); - } - else if (0 == procRank) - { - EXPECT_EQ(1u, PartGame.get_num_active_elements()); - EXPECT_EQ(1u, FieldGame.get_num_active_elements()); - } - - PartGame.run_game_of_life(5); - FieldGame.run_game_of_life(5); - - stk::mesh::EntityIdVector exElemIds2 = {42, 43, 44, 45, 47, 48, 66, 67, 68, - 81, 82, 84, 85, 86, 87}; - EXPECT_TRUE(PartGame.are_these_ids_active(exElemIds2)); - EXPECT_TRUE(FieldGame.are_these_ids_active(exElemIds2)); - if (3 == procRank) - { - EXPECT_EQ(9u, PartGame.get_num_active_elements()); - EXPECT_EQ(9u, FieldGame.get_num_active_elements()); - } - else if (2 == procRank) - { - EXPECT_EQ(6u, PartGame.get_num_active_elements()); - EXPECT_EQ(6u, FieldGame.get_num_active_elements()); - } - else - { - EXPECT_EQ(0u, PartGame.get_num_active_elements()); - EXPECT_EQ(0u, FieldGame.get_num_active_elements()); - } - } -} -TEST(QuadGameofLifeClass, 1ProcGliderTest) -{ - stk::ParallelMachine comm = MPI_COMM_WORLD; - int numProcs = stk::parallel_machine_size(comm); - if (1 == numProcs) - { - std::string meshName1 = "1ProcPartGliderTest"; - std::string meshName2 = "1ProcFieldGliderTest"; - - QuadGameofLifeMesh PartMesh(comm, 10, 10); - QuadGameofLifeMesh FieldMesh(comm, 10, 10); - - PartGameofLife PartGame(PartMesh, meshName1); - FieldGameofLife FieldGame(FieldMesh, meshName2); - - stk::mesh::EntityIdVector elemIds = {71, 72, 73, 83, 92}; - PartGame.activate_these_ids(elemIds); - FieldGame.activate_these_ids(elemIds); - - EXPECT_EQ(5u, PartGame.get_num_active_elements()); - EXPECT_EQ(5u, FieldGame.get_num_active_elements()); - - PartGame.run_game_of_life(10); - FieldGame.run_game_of_life(10); - - EXPECT_EQ(5u, PartGame.get_num_active_elements()); - EXPECT_EQ(5u, FieldGame.get_num_active_elements()); - - PartGame.run_game_of_life(10); - FieldGame.run_game_of_life(10); - - EXPECT_EQ(5u, PartGame.get_num_active_elements()); - EXPECT_EQ(5u, FieldGame.get_num_active_elements()); - } -} -TEST(QuadGameofLifeClass, 4ProcGliderTest) -{ - stk::ParallelMachine comm = MPI_COMM_WORLD; - int numProcs = stk::parallel_machine_size(comm); - int procRank = stk::parallel_machine_rank(comm); - if (4 == numProcs) - { - std::string meshName1 = "4ProcPartGliderTest"; - std::string meshName2 = "4ProcFieldGliderTest"; - - QuadGameofLifeMesh PartMesh(comm, 10, 10); - QuadGameofLifeMesh FieldMesh(comm, 10, 10); - - PartGameofLife PartGame(PartMesh, meshName1); - FieldGameofLife FieldGame(FieldMesh, meshName2); - - if (3 == procRank) - { - EXPECT_EQ(40u, PartGame.get_num_elems_on_proc()); - EXPECT_EQ(40u, FieldGame.get_num_elems_on_proc()); - } - else - { - EXPECT_EQ(20u, PartGame.get_num_elems_on_proc()); - EXPECT_EQ(20u, FieldGame.get_num_elems_on_proc()); - } - - stk::mesh::EntityIdVector elemIds = {71, 72, 73, 83, 92}; - PartGame.activate_these_ids(elemIds); - FieldGame.activate_these_ids(elemIds); - if (3 == procRank) - { - EXPECT_EQ(5u, PartGame.get_num_active_elements()); - EXPECT_EQ(5u, FieldGame.get_num_active_elements()); - } - else - { - EXPECT_EQ(0u, PartGame.get_num_active_elements()); - EXPECT_EQ(0u, FieldGame.get_num_active_elements()); - } - PartGame.run_game_of_life(10); - FieldGame.run_game_of_life(10); - if (3 == procRank) - { - EXPECT_EQ(1u, PartGame.get_num_active_elements()); - EXPECT_EQ(1u, FieldGame.get_num_active_elements()); - } - else if (2 == procRank) - { - EXPECT_EQ(4u, PartGame.get_num_active_elements()); - EXPECT_EQ(4u, FieldGame.get_num_active_elements()); - } - else - { - EXPECT_EQ(0u, PartGame.get_num_active_elements()); - EXPECT_EQ(0u, FieldGame.get_num_active_elements()); - } - PartGame.run_game_of_life(10); - FieldGame.run_game_of_life(10); - if (2 == procRank) - { - EXPECT_EQ(1u, PartGame.get_num_active_elements()); - EXPECT_EQ(1u, FieldGame.get_num_active_elements()); - } - else if (1 == procRank) - { - EXPECT_EQ(4u, PartGame.get_num_active_elements()); - EXPECT_EQ(4u, FieldGame.get_num_active_elements()); - } - else - { - EXPECT_EQ(0u, PartGame.get_num_active_elements()); - EXPECT_EQ(0u, FieldGame.get_num_active_elements()); - } - } -} -TEST(QuadGameofLifeClass, 1ProcStillLife) -{ - stk::ParallelMachine comm = MPI_COMM_WORLD; - int numProcs = stk::parallel_machine_size(comm); - if (1 == numProcs) - { - std::string meshName1 = "1ProcPartStillLifeTest"; - std::string meshName2 = "1ProcFieldStillLifeTest"; - - QuadGameofLifeMesh PartMesh(comm, 4, 4); - QuadGameofLifeMesh FieldMesh(comm, 4, 4); - - PartGameofLife PartGame(PartMesh, meshName1); - FieldGameofLife FieldGame(FieldMesh, meshName2); - - stk::mesh::EntityIdVector elemIds = {6, 7, 10, 11}; - PartGame.activate_these_ids(elemIds); - FieldGame.activate_these_ids(elemIds); - - ASSERT_EQ(4u, PartGame.get_num_active_elements()); - ASSERT_EQ(4u, FieldGame.get_num_active_elements()); - - PartGame.run_game_of_life(10); - FieldGame.run_game_of_life(10); - - ASSERT_EQ(4u, PartGame.get_num_active_elements()); - ASSERT_EQ(4u, FieldGame.get_num_active_elements()); - } -} -TEST(QuadGameofLifeClass, 4ProcStillLife) -{ - stk::ParallelMachine comm = MPI_COMM_WORLD; - int numProcs = stk::parallel_machine_size(comm); - int procRank = stk::parallel_machine_rank(comm); - if (4 == numProcs) - { - std::string meshName1 = "4ProcPartStillLifeTest"; - std::string meshName2 = "4ProcFieldStillLifeTest"; - - QuadGameofLifeMesh PartMesh(comm, 4, 4); - QuadGameofLifeMesh FieldMesh(comm, 4, 4); - - PartGameofLife PartGame(PartMesh, meshName1); - FieldGameofLife FieldGame(FieldMesh, meshName2); - - stk::mesh::EntityIdVector elemIds = {6, 7, 10, 11}; - PartGame.activate_these_ids(elemIds); - FieldGame.activate_these_ids(elemIds); - - if (1 == procRank || 2 == procRank) - { - ASSERT_EQ(2u, PartGame.get_num_active_elements()); - ASSERT_EQ(2u, FieldGame.get_num_active_elements()); - } - else - { - ASSERT_EQ(0u, PartGame.get_num_active_elements()); - ASSERT_EQ(0u, FieldGame.get_num_active_elements()); - } - - PartGame.run_game_of_life(10); - FieldGame.run_game_of_life(10); - - if (1 == procRank || 2 == procRank) - { - ASSERT_EQ(2u, PartGame.get_num_active_elements()); - ASSERT_EQ(2u, FieldGame.get_num_active_elements()); - } - else - { - ASSERT_EQ(0u, PartGame.get_num_active_elements()); - ASSERT_EQ(0u, FieldGame.get_num_active_elements()); - } - } -} -TEST(QuadGameofLifeClass, 1ProcOscillatorPeriod2) -{ - stk::ParallelMachine comm = MPI_COMM_WORLD; - int numProcs = stk::parallel_machine_size(comm); - if (1 == numProcs) - { - std::string meshName1 = "1ProcPartOscillatorPeriod2"; - std::string meshName2 = "1ProcOscillatorFieldPeriod2"; - QuadGameofLifeMesh PartMesh(comm, 3, 3); - QuadGameofLifeMesh FieldMesh(comm, 3, 3); - - PartGameofLife PartGame(PartMesh, meshName1); - FieldGameofLife FieldGame(FieldMesh, meshName2); - - stk::mesh::EntityIdVector elemIds = {4, 5, 6}; - PartGame.activate_these_ids(elemIds); - FieldGame.activate_these_ids(elemIds); - - EXPECT_EQ(3u, PartGame.get_num_active_elements()); - EXPECT_EQ(3u, FieldGame.get_num_active_elements()); - - PartGame.run_game_of_life(1); - FieldGame.run_game_of_life(1); - - stk::mesh::EntityIdVector elemIds2 = {2, 5, 8}; - - EXPECT_TRUE(PartGame.are_these_ids_active(elemIds2)); - EXPECT_TRUE(FieldGame.are_these_ids_active(elemIds2)); - EXPECT_EQ(3u, PartGame.get_num_active_elements()); - EXPECT_EQ(3u, FieldGame.get_num_active_elements()); - - PartGame.run_game_of_life(1); - FieldGame.run_game_of_life(1); - - stk::mesh::EntityIdVector elemIds3 = {4, 5, 6}; - EXPECT_TRUE(PartGame.are_these_ids_active(elemIds3)); - EXPECT_TRUE(FieldGame.are_these_ids_active(elemIds3)); - EXPECT_EQ(3u, PartGame.get_num_active_elements()); - EXPECT_EQ(3u, FieldGame.get_num_active_elements()); - } - -} -TEST(QuadGameofLifeClass, 4ProcOscillatorPeriod2) -{ - stk::ParallelMachine comm = MPI_COMM_WORLD; - int numProcs = stk::parallel_machine_size(comm); - int procRank = stk::parallel_machine_rank(comm); - - if (4 == numProcs) - { - std::string meshName1 = "4ProcPartOscillatorPeriod2"; - std::string meshName2 = "4ProcFieldOscillatorPeriod2"; - - QuadGameofLifeMesh PartMesh(comm, 3, 3); - QuadGameofLifeMesh FieldMesh(comm, 3, 3); - - PartGameofLife PartGame(PartMesh, meshName1); - FieldGameofLife FieldGame(FieldMesh, meshName2); - - stk::mesh::EntityIdVector elemIds = {4, 5, 6}; - PartGame.activate_these_ids(elemIds); - FieldGame.activate_these_ids(elemIds); - - EXPECT_TRUE(PartGame.are_these_ids_active(elemIds)); - EXPECT_TRUE(FieldGame.are_these_ids_active(elemIds)); - if (3 == procRank) - { - EXPECT_EQ(3u, PartGame.get_num_active_elements()); - EXPECT_EQ(3u, FieldGame.get_num_active_elements()); - } - else - { - EXPECT_EQ(0u, PartGame.get_num_active_elements()); - EXPECT_EQ(0u, FieldGame.get_num_active_elements()); - } - - PartGame.run_game_of_life(1); - FieldGame.run_game_of_life(1); - - stk::mesh::EntityIdVector elemIds2 = {2, 5, 8}; - EXPECT_TRUE(PartGame.are_these_ids_active(elemIds2)); - EXPECT_TRUE(FieldGame.are_these_ids_active(elemIds2)); - if (3 == procRank) - { - EXPECT_EQ(3u, PartGame.get_num_active_elements()); - EXPECT_EQ(3u, FieldGame.get_num_active_elements()); - } - else if (3 != procRank) - { - EXPECT_EQ(0u, PartGame.get_num_active_elements()); - EXPECT_EQ(0u, FieldGame.get_num_active_elements()); - } - - PartGame.run_game_of_life(1); - FieldGame.run_game_of_life(1); - - EXPECT_TRUE(PartGame.are_these_ids_active(elemIds)); - EXPECT_TRUE(FieldGame.are_these_ids_active(elemIds)); - if (3 == procRank) - { - EXPECT_EQ(3u, PartGame.get_num_active_elements()); - EXPECT_EQ(3u, FieldGame.get_num_active_elements()); - } - else - { - EXPECT_EQ(0u, PartGame.get_num_active_elements()); - EXPECT_EQ(0u, FieldGame.get_num_active_elements()); - } - } -} -TEST(QuadGameofLifeClass, 1ProcOscillatorPeriod8) -{ - stk::ParallelMachine comm = MPI_COMM_WORLD; - int numProcs = stk::parallel_machine_size(comm); - if (1 == numProcs) - { - std::string meshName1 = "1ProcPartOscillatorPeriod8"; - std::string meshName2 = "1ProcFieldOscillatorPeriod8"; - - unsigned width = 10; - unsigned rowsPerProc = 10; - QuadGameofLifeMesh PartMesh(comm, width, rowsPerProc); - QuadGameofLifeMesh FieldMesh(comm, width, rowsPerProc); - - PartGameofLife PartGame(PartMesh, meshName1); - FieldGameofLife FieldGame(FieldMesh, meshName2); - - stk::mesh::EntityIdVector elemIdsToActivate = {26, 27, 28, 36, 37, 38, 46, 47, 48, - 53, 54, 55, 63, 64, 65, 73, 74, 75}; - PartGame.activate_these_ids(elemIdsToActivate); - FieldGame.activate_these_ids(elemIdsToActivate); - - EXPECT_TRUE(PartGame.are_these_ids_active(elemIdsToActivate)); - EXPECT_TRUE(FieldGame.are_these_ids_active(elemIdsToActivate)); - EXPECT_EQ(18u, PartGame.get_num_active_elements()); - EXPECT_EQ(18u, FieldGame.get_num_active_elements()); - - PartGame.run_game_of_life(4); - FieldGame.run_game_of_life(4); - - stk::mesh::EntityIdVector exElemIds = {7, 17, 18, 26, 27, 29, 35, 38, 39, 40, - 44, 46, 48, 53, 55, 57, 61, 62, 63, 66, - 72, 74, 75, 83, 84, 94}; - EXPECT_TRUE(PartGame.are_these_ids_active(exElemIds)); - EXPECT_TRUE(FieldGame.are_these_ids_active(exElemIds)); - EXPECT_EQ(26u, PartGame.get_num_active_elements()); - EXPECT_EQ(26u, FieldGame.get_num_active_elements()); - - PartGame.run_game_of_life(4); - FieldGame.run_game_of_life(4); - - EXPECT_TRUE(PartGame.are_these_ids_active(elemIdsToActivate)); - EXPECT_TRUE(FieldGame.are_these_ids_active(elemIdsToActivate)); - EXPECT_EQ(18u, PartGame.get_num_active_elements()); - EXPECT_EQ(18u, FieldGame.get_num_active_elements()); - } -} -TEST(QuadGameofLifeClass, 4ProcOscillatorPeriod8) -{ - stk::ParallelMachine comm = MPI_COMM_WORLD; - int numProcs = stk::parallel_machine_size(comm); - int procNum = stk::parallel_machine_rank(comm); - if (4 == numProcs) - { - std::string meshName1 = "4ProcPartOscillatorPeriod8"; - std::string meshName2 = "4ProcFieldOscillatorPeriod8"; - unsigned width = 10; - unsigned height = 10; - - QuadGameofLifeMesh PartMesh(comm, width, height); - QuadGameofLifeMesh FieldMesh(comm, width, height); - - PartGameofLife PartGame(PartMesh, meshName1); - FieldGameofLife FieldGame(FieldMesh, meshName2); - - stk::mesh::EntityIdVector elemIdsToActivate = {26, 27, 28, 36, 37, 38, 46, 47, 48, - 53, 54, 55, 63, 64, 65, 73, 74, 75}; - PartGame.activate_these_ids(elemIdsToActivate); - FieldGame.activate_these_ids(elemIdsToActivate); - - EXPECT_TRUE(PartGame.are_these_ids_active(elemIdsToActivate)); - EXPECT_TRUE(FieldGame.are_these_ids_active(elemIdsToActivate)); - if (0 != procNum) - { - EXPECT_EQ(6u, PartGame.get_num_active_elements()); - EXPECT_EQ(6u, FieldGame.get_num_active_elements()); - } - else - { - EXPECT_EQ(0u, PartGame.get_num_active_elements()); - EXPECT_EQ(0u, FieldGame.get_num_active_elements()); - } - - PartGame.run_game_of_life(4); - FieldGame.run_game_of_life(4); - - stk::mesh::EntityIdVector exElemIds = {7, 17, 18, 26, 27, 29, 35, 38, 39, 40, - 44, 46, 48, 53, 55, 57, 61, 62, 63, 66, - 72, 74, 75, 83, 84, 94}; - EXPECT_TRUE(PartGame.are_these_ids_active(exElemIds)); - EXPECT_TRUE(FieldGame.are_these_ids_active(exElemIds)); - if (0 == procNum) - { - EXPECT_EQ(3u, PartGame.get_num_active_elements()); - EXPECT_EQ(3u, FieldGame.get_num_active_elements()); - } - else if (1 == procNum) - { - EXPECT_EQ(7u, PartGame.get_num_active_elements()); - EXPECT_EQ(7u, FieldGame.get_num_active_elements()); - } - else if (2 == procNum) - { - EXPECT_EQ(6u, PartGame.get_num_active_elements()); - EXPECT_EQ(6u, FieldGame.get_num_active_elements()); - } - else if (3 == procNum) - { - EXPECT_EQ(10u, PartGame.get_num_active_elements()); - EXPECT_EQ(10u, FieldGame.get_num_active_elements()); - } - - PartGame.run_game_of_life(4); - FieldGame.run_game_of_life(4); - - EXPECT_TRUE(PartGame.are_these_ids_active(elemIdsToActivate)); - EXPECT_TRUE(FieldGame.are_these_ids_active(elemIdsToActivate)); - if (0 != procNum) - { - EXPECT_EQ(6u, PartGame.get_num_active_elements()); - EXPECT_EQ(6u, FieldGame.get_num_active_elements()); - } - else - { - EXPECT_EQ(0u, PartGame.get_num_active_elements()); - EXPECT_EQ(0u, FieldGame.get_num_active_elements()); - } - } -} -TEST(HexGameofLifeClass, 1ProcBasicTest) -{ - stk::ParallelMachine comm = MPI_COMM_WORLD; - int numProcs = stk::parallel_machine_size(comm); - if (1 == numProcs) - { - std::string partMeshName = "1ProcPartBasic"; - std::string fieldMeshName = "1ProcFieldBasic"; - - HexGameofLifeMesh PartMesh(comm, 3, 3, 4); - HexGameofLifeMesh FieldMesh(comm, 3, 3, 4); - - PartGameofLife PartGame(PartMesh, partMeshName); - FieldGameofLife FieldGame(FieldMesh, fieldMeshName); - - EXPECT_EQ(36u, PartGame.get_num_elems_on_proc()); - EXPECT_EQ(36u, FieldGame.get_num_elems_on_proc()); - - stk::mesh::EntityIdVector elemIdsToActivate = {1, 3, 7, 9, 14, 23, 28, 30, 34, 36}; - PartGame.activate_these_ids(elemIdsToActivate); - FieldGame.activate_these_ids(elemIdsToActivate); - EXPECT_EQ(10u, PartGame.get_num_active_elements()); - EXPECT_EQ(10u, FieldGame.get_num_active_elements()); - - PartGame.run_game_of_life(1); - FieldGame.run_game_of_life(1); - - stk::mesh::EntityIdVector exElemIds = {5, 14, 23, 32}; - EXPECT_TRUE(PartGame.are_these_ids_active(exElemIds)); - EXPECT_TRUE(FieldGame.are_these_ids_active(exElemIds)); - EXPECT_EQ(4u, PartGame.get_num_active_elements()); - EXPECT_EQ(4u, FieldGame.get_num_active_elements()); - - PartGame.run_game_of_life(1); - FieldGame.run_game_of_life(1); - - EXPECT_EQ(0u, PartGame.get_num_active_elements()); - EXPECT_EQ(0u, FieldGame.get_num_active_elements()); - } -} -TEST(HexGameofLifeClass, 4ProcBasicTest) -{ - stk::ParallelMachine comm = MPI_COMM_WORLD; - int numProcs = stk::parallel_machine_size(comm); - int procRank = stk::parallel_machine_rank(comm); - if (4 == numProcs) - { - std::string partMeshName = "4ProcPartBasic"; - std::string fieldMeshName = "4ProcFieldBasic"; - - HexGameofLifeMesh PartMesh(comm, 3, 3, 4); - HexGameofLifeMesh FieldMesh(comm, 3, 3, 4); - - PartGameofLife PartGame(PartMesh, partMeshName); - FieldGameofLife FieldGame(FieldMesh, fieldMeshName); - - EXPECT_EQ(9u, PartGame.get_num_elems_on_proc()); - EXPECT_EQ(9u, FieldGame.get_num_elems_on_proc()); - - stk::mesh::EntityIdVector elemIdsToActivate = {1, 3, 7, 9, 14, 23, 28, 30, 34, 36}; - PartGame.activate_these_ids(elemIdsToActivate); - FieldGame.activate_these_ids(elemIdsToActivate); - if (0 == procRank || 3 == procRank) - { - EXPECT_EQ(4u, PartGame.get_num_active_elements()); - EXPECT_EQ(4u, FieldGame.get_num_active_elements()); - } - else if (1 == procRank || 2 == procRank) - { - EXPECT_EQ(1u, PartGame.get_num_active_elements()); - EXPECT_EQ(1u, FieldGame.get_num_active_elements()); - } - - PartGame.run_game_of_life(1); - FieldGame.run_game_of_life(1); - - stk::mesh::EntityIdVector exElemIds = {5, 14, 23, 32}; - EXPECT_TRUE(PartGame.are_these_ids_active(exElemIds)); - EXPECT_TRUE(FieldGame.are_these_ids_active(exElemIds)); - EXPECT_EQ(1u, FieldGame.get_num_active_elements()); - EXPECT_EQ(1u, FieldGame.get_num_active_elements()); - - PartGame.run_game_of_life(1); - FieldGame.run_game_of_life(1); - - EXPECT_EQ(0u, PartGame.get_num_active_elements()); - EXPECT_EQ(0u, FieldGame.get_num_active_elements()); - } -} -TEST(HexGameofLifeClass, 1ProcOscillator) -{ - stk::ParallelMachine comm = MPI_COMM_WORLD; - int numProcs = stk::parallel_machine_size(comm); - if (1 == numProcs) - { - std::string partMeshName = "1ProcPartOscillator"; - std::string fieldMeshName = "1ProcFieldOscillator"; - HexGameofLifeMesh PartMesh(comm, 3, 3, 4); - HexGameofLifeMesh FieldMesh(comm, 3, 3, 4); - - PartGameofLife PartGame(PartMesh, partMeshName); - FieldGameofLife FieldGame(FieldMesh, fieldMeshName); - - - EXPECT_EQ(36u, PartGame.get_num_elems_on_proc()); - EXPECT_EQ(36u, FieldGame.get_num_elems_on_proc()); - - stk::mesh::EntityIdVector elemIds = {10, 12, 13, 15, 17, 19, 21, 22, 24, 26}; - PartGame.activate_these_ids(elemIds); - FieldGame.activate_these_ids(elemIds); - - EXPECT_TRUE(PartGame.are_these_ids_active(elemIds)); - EXPECT_TRUE(FieldGame.are_these_ids_active(elemIds)); - EXPECT_EQ(10u, PartGame.get_num_active_elements()); - EXPECT_EQ(10u, FieldGame.get_num_active_elements()); - - PartGame.run_game_of_life(1); - FieldGame.run_game_of_life(1); - - stk::mesh::EntityIdVector exElemIds1 = {5, 13, 15, 17, 22, 24, 26, 32}; - EXPECT_TRUE(PartGame.are_these_ids_active(exElemIds1)); - EXPECT_TRUE(FieldGame.are_these_ids_active(exElemIds1)); - EXPECT_EQ(8u, PartGame.get_num_active_elements()); - EXPECT_EQ(8u, PartGame.get_num_active_elements()); - - PartGame.run_game_of_life(1); - FieldGame.run_game_of_life(1); - - stk::mesh::EntityIdVector exElemIds2 = {11, 13, 15, 16, 18, 20, 22, 24, 25, 27}; - EXPECT_TRUE(PartGame.are_these_ids_active(exElemIds2)); - EXPECT_TRUE(FieldGame.are_these_ids_active(exElemIds2)); - EXPECT_EQ(10u, PartGame.get_num_active_elements()); - EXPECT_EQ(10u, FieldGame.get_num_active_elements()); - - PartGame.run_game_of_life(1); - FieldGame.run_game_of_life(1); - - stk::mesh::EntityIdVector exElemIds3 = {5, 11, 13, 15, 20, 22, 24, 32}; - EXPECT_TRUE(PartGame.are_these_ids_active(exElemIds3)); - EXPECT_TRUE(FieldGame.are_these_ids_active(exElemIds3)); - EXPECT_EQ(8u, PartGame.get_num_active_elements()); - EXPECT_EQ(8u, PartGame.get_num_active_elements()); - - PartGame.run_game_of_life(1); - FieldGame.run_game_of_life(1); - - EXPECT_TRUE(PartGame.are_these_ids_active(elemIds)); - EXPECT_TRUE(FieldGame.are_these_ids_active(elemIds)); - EXPECT_EQ(10u, PartGame.get_num_active_elements()); - EXPECT_EQ(10u, FieldGame.get_num_active_elements()); - } -} -TEST(HexGameofLifeClass, 4ProcOscillator) -{ - stk::ParallelMachine comm = MPI_COMM_WORLD; - int numProcs = stk::parallel_machine_size(comm); - int procRank = stk::parallel_machine_rank(comm); - if (4 == numProcs) - { - std::string partMeshName = "4ProcPartOscillator"; - std::string fieldMeshName = "4ProcFieldOscillator"; - HexGameofLifeMesh PartMesh(comm, 3, 3, 4); - HexGameofLifeMesh FieldMesh(comm, 3, 3, 4); - - PartGameofLife PartGame(PartMesh, partMeshName); - FieldGameofLife FieldGame(FieldMesh, fieldMeshName); - - EXPECT_EQ(9u, PartGame.get_num_elems_on_proc()); - EXPECT_EQ(9u, FieldGame.get_num_elems_on_proc()); - - stk::mesh::EntityIdVector elemIds = {10, 12, 13, 15, 17, 19, 21, 22, 24, 26}; - PartGame.activate_these_ids(elemIds); - FieldGame.activate_these_ids(elemIds); - - EXPECT_TRUE(PartGame.are_these_ids_active(elemIds)); - EXPECT_TRUE(FieldGame.are_these_ids_active(elemIds)); - if (3 == procRank) - { - EXPECT_EQ(0u, PartGame.get_num_active_elements()); - EXPECT_EQ(0u, FieldGame.get_num_active_elements()); - } - else if (2 == procRank) - { - EXPECT_EQ(5u, PartGame.get_num_active_elements()); - EXPECT_EQ(5u, FieldGame.get_num_active_elements()); - } - else if (1 == procRank) - { - EXPECT_EQ(5u, PartGame.get_num_active_elements()); - EXPECT_EQ(5u, FieldGame.get_num_active_elements()); - } - else if (0 == procRank) - { - EXPECT_EQ(0u, PartGame.get_num_active_elements()); - EXPECT_EQ(0u, FieldGame.get_num_active_elements()); - } - - PartGame.run_game_of_life(1); - FieldGame.run_game_of_life(1); - - stk::mesh::EntityIdVector exElemIds1 = {5, 13, 15, 17, 22, 24, 26, 32}; - EXPECT_TRUE(PartGame.are_these_ids_active(exElemIds1)); - EXPECT_TRUE(FieldGame.are_these_ids_active(exElemIds1)); - if (3 == procRank) - { - EXPECT_EQ(1u, PartGame.get_num_active_elements()); - EXPECT_EQ(1u, FieldGame.get_num_active_elements()); - } - else if (2 == procRank) - { - EXPECT_EQ(3u, PartGame.get_num_active_elements()); - EXPECT_EQ(3u, FieldGame.get_num_active_elements()); - } - else if (1 == procRank) - { - EXPECT_EQ(3u, PartGame.get_num_active_elements()); - EXPECT_EQ(3u, FieldGame.get_num_active_elements()); - } - else if (0 == procRank) - { - EXPECT_EQ(1u, PartGame.get_num_active_elements()); - EXPECT_EQ(1u, FieldGame.get_num_active_elements()); - } - - PartGame.run_game_of_life(1); - FieldGame.run_game_of_life(1); - - stk::mesh::EntityIdVector exElemIds2 = {11, 13, 15, 16, 18, 20, 22, 24, 25, 27}; - EXPECT_TRUE(PartGame.are_these_ids_active(exElemIds2)); - EXPECT_TRUE(FieldGame.are_these_ids_active(exElemIds2)); - if (3 == procRank) - { - EXPECT_EQ(0u, PartGame.get_num_active_elements()); - EXPECT_EQ(0u, FieldGame.get_num_active_elements()); - } - else if (2 == procRank) - { - EXPECT_EQ(5u, PartGame.get_num_active_elements()); - EXPECT_EQ(5u, FieldGame.get_num_active_elements()); - } - else if (1 == procRank) - { - EXPECT_EQ(5u, PartGame.get_num_active_elements()); - EXPECT_EQ(5u, FieldGame.get_num_active_elements()); - } - else if (0 == procRank) - { - EXPECT_EQ(0u, PartGame.get_num_active_elements()); - EXPECT_EQ(0u, FieldGame.get_num_active_elements()); - } - - PartGame.run_game_of_life(1); - FieldGame.run_game_of_life(1); - - stk::mesh::EntityIdVector exElemIds3 = {5, 11, 13, 15, 20, 22, 24, 32}; - EXPECT_TRUE(PartGame.are_these_ids_active(exElemIds3)); - EXPECT_TRUE(FieldGame.are_these_ids_active(exElemIds3)); - if (3 == procRank) - { - EXPECT_EQ(1u, PartGame.get_num_active_elements()); - EXPECT_EQ(1u, FieldGame.get_num_active_elements()); - } - else if (2 == procRank) - { - EXPECT_EQ(3u, PartGame.get_num_active_elements()); - EXPECT_EQ(3u, FieldGame.get_num_active_elements()); - } - else if (1 == procRank) - { - EXPECT_EQ(3u, PartGame.get_num_active_elements()); - EXPECT_EQ(3u, FieldGame.get_num_active_elements()); - } - else if (0 == procRank) - { - EXPECT_EQ(1u, PartGame.get_num_active_elements()); - EXPECT_EQ(1u, FieldGame.get_num_active_elements()); - } - - PartGame.run_game_of_life(1); - FieldGame.run_game_of_life(1); - - EXPECT_TRUE(PartGame.are_these_ids_active(elemIds)); - EXPECT_TRUE(FieldGame.are_these_ids_active(elemIds)); - if (3 == procRank) - { - EXPECT_EQ(0u, PartGame.get_num_active_elements()); - EXPECT_EQ(0u, FieldGame.get_num_active_elements()); - } - else if (2 == procRank) - { - EXPECT_EQ(5u, PartGame.get_num_active_elements()); - EXPECT_EQ(5u, FieldGame.get_num_active_elements()); - } - else if (1 == procRank) - { - EXPECT_EQ(5u, PartGame.get_num_active_elements()); - EXPECT_EQ(5u, FieldGame.get_num_active_elements()); - } - else if (0 == procRank) - { - EXPECT_EQ(0u, PartGame.get_num_active_elements()); - EXPECT_EQ(0u, FieldGame.get_num_active_elements()); - } - } -} -/* - * - * - * - */ -TEST(PNG, 1ProcBordered) -{ - std::string fileName = "Boss.png"; - BorderedPNGProcessor png(fileName); - png.commit_image_vector_to_pixel_vector(); - - EXPECT_EQ(13u, png.get_image_width()); - EXPECT_EQ(16u, png.get_image_height()); - -} -TEST(PNG, 1ProcPaddingImages) -{ - std::string fileName = "Tiny.png"; - PNGProcessor png(fileName); - png.commit_image_vector_to_pixel_vector(); - - EXPECT_EQ(9u, png.get_image_width()); - EXPECT_EQ(10u, png.get_image_height()); - - png.add_this_much_pixel_padding_to_bottom(2); - EXPECT_EQ(12u, png.get_image_height()); - - png.add_this_much_pixel_padding_to_top(2); - EXPECT_EQ(14u, png.get_image_height()); - - png.add_this_much_pixel_padding_to_left(2); - EXPECT_EQ(11u, png.get_image_width()); - - png.add_this_much_pixel_padding_to_right(2); - EXPECT_EQ(13u, png.get_image_width()); -} -TEST(PNGGameofLife, 1ProcCompressionTest) -{ - stk::ParallelMachine comm = MPI_COMM_WORLD; - int numProcs = stk::parallel_machine_size(comm); - if (1 == numProcs) - { - std::string fileName = "Aircraftcarrier.png"; - std::string meshName = "1ProcCarrierCompression"; - - BorderedPNGProcessor carrier(fileName); - carrier.commit_image_vector_to_pixel_vector(); - - stk::mesh::EntityIdVector elemIds; - carrier.fill_id_vector_with_active_pixels(elemIds); - - unsigned width = carrier.get_image_width(); - unsigned height = carrier.get_image_height(); - - QuadGameofLifeMesh Mesh(comm, width, height); - - FieldGameofLife FieldGame(Mesh, meshName); - FieldGame.activate_these_ids(elemIds); - - stk::mesh::EntityIdVector exElemIds = {10, 11, 17, 14, 20,21}; - EXPECT_EQ(6u, FieldGame.get_num_active_elements()); - EXPECT_TRUE(FieldGame.are_these_ids_active(exElemIds)); - } -} -TEST(PNGGameofLife, 4ProcCompressionTest) -{ - stk::ParallelMachine comm = MPI_COMM_WORLD; - int numProcs = stk::parallel_machine_size(comm); - int procRank = stk::parallel_machine_rank(comm); - if (4 == numProcs) - { - std::string fileName = "Aircraftcarrier.png"; - std::string meshName = "4ProcCarrierCompression"; - - BorderedPNGProcessor carrier(fileName); - carrier.commit_image_vector_to_pixel_vector(); - - stk::mesh::EntityIdVector elemIds; - carrier.fill_id_vector_with_active_pixels(elemIds); - - unsigned width = carrier.get_image_width(); - unsigned height = carrier.get_image_height(); - - QuadGameofLifeMesh Mesh (comm, width, height); - PartGameofLife PartGame(Mesh, meshName); - PartGame.activate_these_ids(elemIds); - - stk::mesh::EntityIdVector exElemIds = {10, 11, 14, 17, 20, 21}; - - if (0 == procRank) - { - EXPECT_EQ(0u, PartGame.get_num_active_elements()); - } - else if (1 == procRank) - { - EXPECT_EQ(2u, PartGame.get_num_active_elements()); - } - else if (2 == procRank) - { - EXPECT_EQ(2u, PartGame.get_num_active_elements()); - } - else if (3 == procRank) - { - EXPECT_EQ(2u, PartGame.get_num_active_elements()); - } - } -} -TEST(PNGGameofLife, 1ProcTiny) -{ - stk::ParallelMachine comm = MPI_COMM_WORLD; - int numProcs = stk::parallel_machine_size(comm); - if (1 == numProcs) - { - std::string fileName = "Tiny.png"; - std::string meshName1 = "1ProcPartTiny"; - std::string meshName2 = "1ProcFieldTiny"; - - PNGProcessor PNG(fileName); - - EXPECT_EQ(9u, PNG.get_image_width()); - EXPECT_EQ(10u, PNG.get_image_height()); - - PNG.commit_image_vector_to_pixel_vector(); - - EXPECT_EQ(9u, PNG.get_image_width()); - EXPECT_EQ(10u, PNG.get_image_height()); - - unsigned width = PNG.get_image_width(); - unsigned height = PNG.get_image_height(); - - QuadGameofLifeMesh PartMesh(comm, width, height); - QuadGameofLifeMesh FieldMesh(comm, width, height); - - PartGameofLife PartGame(PartMesh, meshName1); - FieldGameofLife FieldGame(FieldMesh, meshName2); - - stk::mesh::EntityIdVector elemIds; - PNG.fill_id_vector_with_active_pixels(elemIds); - PartGame.activate_these_ids(elemIds); - FieldGame.activate_these_ids(elemIds); - - stk::mesh::EntityIdVector exElemIds1 = - {14, 22, 23, 24, 30, 31, 32, 33, 34, 38, - 39, 40, 41, 42, 43, 44, 48, 49, 50, 51, - 52, 58, 59, 60, 68}; - - EXPECT_TRUE(PartGame.are_these_ids_active(exElemIds1)); - EXPECT_TRUE(FieldGame.are_these_ids_active(exElemIds1)); - EXPECT_EQ(25u, PartGame.get_num_active_elements()); - EXPECT_EQ(25u, FieldGame.get_num_active_elements()); - - PartGame.run_game_of_life(5); - FieldGame.run_game_of_life(5); - - stk::mesh::EntityIdVector exElemIds2 = - { - 3, 7, 12, 16, 19, 20, 26, 27, 32, - 40, 42, 50, 55, 56, 62, 63, 66, - 70, 75, 79, 85, 86, 87 - }; - EXPECT_TRUE(PartGame.are_these_ids_active(exElemIds2)); - EXPECT_TRUE(FieldGame.are_these_ids_active(exElemIds2)); - EXPECT_EQ(23u, PartGame.get_num_active_elements()); - EXPECT_EQ(23u, FieldGame.get_num_active_elements()); - } -} - -enum PixelColor { RED = 2, GREEN, BLUE }; - -std::vector get_colored_pixels_by_color(SimpleColoredPng & image, enum PixelColor pixelColor) -{ - switch(pixelColor) - { - case RED: - return image.get_red_color_coords(); - case GREEN: - return image.get_green_color_coords(); - case BLUE: - return image.get_blue_color_coords(); - default: - break; - } - return {}; -} - - -void create_nodeset_for_colored_pixels(stk::mesh::BulkData & bulk, SimpleColoredPng & image, enum PixelColor pixelColor) -{ - std::vector coloredPixels = get_colored_pixels_by_color(image, pixelColor); - - stk::mesh::EntityIdVector elementIds = image.get_elemIds_for_colored_pixels(coloredPixels); - - stk::mesh::EntityVector elementNodes; - for(stk::mesh::EntityId elemId : elementIds) - { - stk::mesh::Entity elem = bulk.get_entity(stk::topology::ELEM_RANK, elemId); - elementNodes.insert(elementNodes.end(), bulk.begin_nodes(elem), bulk.end_nodes(elem)); - } - - bulk.modification_begin(); - std::string partName = "nodelist_" + std::to_string(pixelColor); - stk::mesh::Part& nodesetPart = bulk.mesh_meta_data().declare_part(partName, stk::topology::NODE_RANK); - for(stk::mesh::Entity node : elementNodes) - bulk.change_entity_parts(node, stk::mesh::ConstPartVector{&nodesetPart}); - bulk.modification_end(); -} - -TEST(TOSDTWD, quad_mesh_from_png) -{ - stk::ParallelMachine comm = MPI_COMM_WORLD; - int numProcs = stk::parallel_machine_size(comm); - if (1 == numProcs) - { - std::string fileName = stk::unit_test_util::get_option("-i", "Tiny.png"); - SimpleColoredPng image(fileName); - unsigned width = image.get_image_width(); - unsigned height = image.get_image_height(); - - QuadGameofLifeMesh FieldMesh(comm, width, height); - FieldGameofLife FieldGame(FieldMesh, "junk"); - - stk::mesh::EntityIdVector elemIds; - image.fill_id_vector_with_active_pixels(elemIds); - FieldGame.activate_these_ids(elemIds); - - stk::mesh::BulkData &bulk = FieldMesh.bulk_data(); - create_nodeset_for_colored_pixels(bulk, image, RED); - create_nodeset_for_colored_pixels(bulk, image, GREEN); - create_nodeset_for_colored_pixels(bulk, image, BLUE); - - FieldGame.write_mesh(); - } -} - -TEST(TOSDTWD, hex_mesh_from_png) -{ - stk::ParallelMachine comm = MPI_COMM_WORLD; - int numProcs = stk::parallel_machine_size(comm); - if (1 == numProcs) - { - std::string fileName = stk::unit_test_util::get_option("-i", "Tiny.png"); - SimpleColoredPng image(fileName); - unsigned width = image.get_image_width(); - unsigned height = image.get_image_height(); - - HexGameofLifeMesh FieldMesh(comm, width, height, 1); - FieldGameofLife FieldGame(FieldMesh, "junk"); - - stk::mesh::EntityIdVector elemIds; - image.fill_id_vector_with_active_pixels(elemIds); - FieldGame.activate_these_ids(elemIds); - - stk::mesh::BulkData &bulk = FieldMesh.bulk_data(); - create_nodeset_for_colored_pixels(bulk, image, RED); - create_nodeset_for_colored_pixels(bulk, image, GREEN); - create_nodeset_for_colored_pixels(bulk, image, BLUE); - - FieldGame.write_mesh(); - } -} - -size_t get_number_of_other_material_hexes(SimpleColoredPng & image) -{ - return get_colored_pixels_by_color(image, GREEN).size(); -} - -size_t get_number_of_steel_hexes(SimpleColoredPng & image) -{ - return image.get_number_other_pixels() - - get_number_of_other_material_hexes(image) - - get_colored_pixels_by_color(image, RED).size() - - get_colored_pixels_by_color(image, BLUE).size(); -} - - -void move_colored_pixels_into_separate_block_part(stk::mesh::BulkData & bulk, SimpleColoredPng & image, enum PixelColor pixelColor) -{ - std::vector coloredPixels = get_colored_pixels_by_color(image, pixelColor); - stk::mesh::EntityIdVector elementIds = image.get_elemIds_for_colored_pixels(coloredPixels); - - stk::mesh::EntityVector elements(elementIds.size()); - for(size_t elemI = 0; elemI < elementIds.size(); elemI++) - elements[elemI] = bulk.get_entity(stk::topology::ELEM_RANK, elementIds[elemI]); - - stk::mesh::Part *originalPart = bulk.mesh_meta_data().get_part("Elem_Part"); - std::string partName = "block_" + std::to_string(pixelColor); - stk::mesh::Part *newPart = bulk.mesh_meta_data().get_part(partName); - bulk.modification_begin(); - for(stk::mesh::Entity elem : elements) - bulk.change_entity_parts(elem, stk::mesh::PartVector{newPart}, stk::mesh::PartVector{originalPart}); - bulk.modification_end(); -} - -TEST(TOSDTWD, hex_mesh_from_image_multiple_blocks) -{ - stk::ParallelMachine comm = MPI_COMM_WORLD; - int numProcs = stk::parallel_machine_size(comm); - if (1 == numProcs) - { - std::string fileName = stk::unit_test_util::get_option("-i", "Tiny.png"); - SimpleColoredPng image(fileName); - unsigned width = image.get_image_width(); - unsigned height = image.get_image_height(); - - HexGameofLifeMesh FieldMesh(comm, width, height, 1); - TodstwdGameOfLife game(FieldMesh, "junk"); - - stk::mesh::EntityIdVector elemIds; - image.fill_id_vector_with_active_pixels(elemIds); - game.activate_these_ids(elemIds); - - stk::mesh::BulkData &bulk = FieldMesh.bulk_data(); - move_colored_pixels_into_separate_block_part(bulk, image, BLUE); - move_colored_pixels_into_separate_block_part(bulk, image, GREEN); - move_colored_pixels_into_separate_block_part(bulk, image, RED); - - std::cout << "Number Steel = " << get_number_of_steel_hexes(image) << std::endl - << "Number Other = " << get_number_of_other_material_hexes(image) << std::endl; - - game.write_mesh(); - } -} - -TEST(PNGGameofLife, 4ProcTiny) -{ - stk::ParallelMachine comm = MPI_COMM_WORLD; - int numProcs = stk::parallel_machine_size(comm); - int procRank = stk::parallel_machine_rank(comm); - if (4 == numProcs) - { - std::string fileName = "Tiny.png"; - std::string meshName1 = "4ProcPartTiny"; - std::string meshName2 = "4ProcFieldTiny"; - - PNGProcessor PNG(fileName); - - EXPECT_EQ(9u, PNG.get_image_width()); - EXPECT_EQ(10u, PNG.get_image_height()); - - PNG.commit_image_vector_to_pixel_vector(); - - EXPECT_EQ(9u, PNG.get_image_width()); - EXPECT_EQ(10u, PNG.get_image_height()); - - unsigned width = PNG.get_image_width(); - unsigned height = PNG.get_image_height(); - - QuadGameofLifeMesh PartMesh(comm, width, height); - QuadGameofLifeMesh FieldMesh(comm, width, height); - - PartGameofLife PartGame(PartMesh, meshName1); - FieldGameofLife FieldGame(FieldMesh, meshName1); - - stk::mesh::EntityIdVector elemIds; - PNG.fill_id_vector_with_active_pixels(elemIds); - PartGame.activate_these_ids(elemIds); - FieldGame.activate_these_ids(elemIds); - - stk::mesh::EntityIdVector exElemIds = {14, 22, 23, 24, 30, 31, 32, 33, 34, 38, - 39, 40, 41, 42, 43, 44, 48, 49, 50, 51, - 52, 58, 59, 50, 58}; - - EXPECT_TRUE(PartGame.are_these_ids_active(exElemIds)); - EXPECT_TRUE(FieldGame.are_these_ids_active(exElemIds)); - if (0 == procRank) - { - EXPECT_EQ(1u, PartGame.get_num_active_elements()); - EXPECT_EQ(1u, FieldGame.get_num_active_elements()); - } - else if (1 == procRank) - { - EXPECT_EQ(8u, PartGame.get_num_active_elements()); - EXPECT_EQ(8u, FieldGame.get_num_active_elements()); - } - else if (2 == procRank) - { - EXPECT_EQ(12u, PartGame.get_num_active_elements()); - EXPECT_EQ(12u, FieldGame.get_num_active_elements()); - } - else if (3 == procRank) - { - EXPECT_EQ(4u, PartGame.get_num_active_elements()); - EXPECT_EQ(4u, FieldGame.get_num_active_elements()); - } - - - PartGame.run_game_of_life(5); - FieldGame.run_game_of_life(5); - - stk::mesh::EntityIdVector exElemIds2 = {3, 7, 12, 16, 19, 20, 26, 27, 32, 40, 42, 50, - 55, 56, 62, 63, 66, 70, 75, 79}; - - EXPECT_TRUE(PartGame.are_these_ids_active(exElemIds2)); - EXPECT_TRUE(FieldGame.are_these_ids_active(exElemIds2)); - if (0 == procRank) - { - EXPECT_EQ(4u, PartGame.get_num_active_elements()); - EXPECT_EQ(4u, FieldGame.get_num_active_elements()); - } - else if (1 == procRank) - { - EXPECT_EQ(5u, PartGame.get_num_active_elements()); - EXPECT_EQ(5u, FieldGame.get_num_active_elements()); - } - else if (2 == procRank) - { - EXPECT_EQ(3u, PartGame.get_num_active_elements()); - EXPECT_EQ(3u, FieldGame.get_num_active_elements()); - } - else if (3 == procRank) - { - EXPECT_EQ(11u, PartGame.get_num_active_elements()); - EXPECT_EQ(11u, FieldGame.get_num_active_elements()); - } - } -} -TEST(NewNoGhostGame, 1ProcGeneralStuff) -{ - stk::ParallelMachine comm = MPI_COMM_WORLD; - int numProcs = stk::parallel_machine_size(comm); - if (1 == numProcs) - { - HexGameofLifeMesh Mesh(comm, 1, 1, 1, stk::mesh::BulkData::NO_AUTO_AURA); - NoGhostGameofLife PacMan(Mesh, "1ProcGeneralStuff"); - - stk::mesh::EntityVector elements; - stk::mesh::get_entities(PacMan.bulk_data(), stk::topology::ELEM_RANK, elements); - stk::mesh::Entity elem1 = PacMan.element_with_id(1); - - EXPECT_EQ(1u, elements.size()); - EXPECT_TRUE(PacMan.is_valid_entity(elem1)); - EXPECT_EQ(1u, PacMan.num_procs()); - EXPECT_EQ(1u, PacMan.num_elems_on_proc()); - } -} -TEST(NewNoGhostGame, 4ProcGeneralStuff) -{ - stk::ParallelMachine comm = MPI_COMM_WORLD; - int numProcs = stk::parallel_machine_size(comm); - int procRank = stk::parallel_machine_rank(comm); - if (4 == numProcs) - { - HexGameofLifeMesh Mesh(comm, 1, 1, 4, stk::mesh::BulkData::NO_AUTO_AURA); - NoGhostGameofLife PacMan(Mesh, "4ProcGeneralStuff"); - - stk::mesh::EntityVector elements; - stk::mesh::get_entities(PacMan.bulk_data(), stk::topology::ELEM_RANK, elements); - - if (0 == procRank) - { - stk::mesh::Entity elem = PacMan.element_with_id(1); - EXPECT_TRUE(PacMan.is_valid_entity(elem)); - } - if (1 == procRank) - { - stk::mesh::Entity elem = PacMan.element_with_id(2); - EXPECT_TRUE(PacMan.is_valid_entity(elem)); - } - if (2 == procRank) - { - stk::mesh::Entity elem = PacMan.element_with_id(3); - EXPECT_TRUE(PacMan.is_valid_entity(elem)); - } - if (3 == procRank) - { - stk::mesh::Entity elem = PacMan.element_with_id(4); - EXPECT_TRUE(PacMan.is_valid_entity(elem)); - } - - EXPECT_EQ(1u, elements.size()); - EXPECT_EQ(4u, PacMan.num_procs()); - EXPECT_EQ(1u, PacMan.num_elems_on_proc()); - } -} -TEST(NewNoGhostGame, 1ProcLessGeneralStuff) -{ - stk::ParallelMachine comm = MPI_COMM_WORLD; - int numProcs = stk::parallel_machine_size(comm); - if (1 == numProcs) - { - HexGameofLifeMesh Mesh(comm, 2, 2, 2, stk::mesh::BulkData::NO_AUTO_AURA); - NoGhostGameofLife PacMan(Mesh, "1ProcLessGeneralStuff"); - - for (unsigned id = 1; id <= 8; id++) - { - stk::mesh::Entity elem = PacMan.element_with_id(id); - EXPECT_EQ(7u, PacMan.num_neighbors(elem)); - } - - EXPECT_EQ(0u, PacMan.num_active_elems()); - - stk::mesh::EntityIdVector elemIds = {1, 2, 3, 4, 5}; - PacMan.activate_these_ids(elemIds); - - EXPECT_EQ(5u, PacMan.num_active_elems()); - } -} -TEST(NewNoGhostGame, 4ProcLessGeneralStuff) -{ - stk::ParallelMachine comm = MPI_COMM_WORLD; - int numProcs = stk::parallel_machine_size(comm); - int procRank = stk::parallel_machine_rank(comm); - if (4 == numProcs) - { - HexGameofLifeMesh Mesh(comm, 1, 1, 8, stk::mesh::BulkData::NO_AUTO_AURA); - NoGhostGameofLife PacMan(Mesh, "4ProcLessGeneralStuff4"); - - if (0 == procRank) - { - stk::mesh::Entity elem1 = PacMan.element_with_id(1); - stk::mesh::Entity elem2 = PacMan.element_with_id(2); - EXPECT_EQ(1u, PacMan.num_neighbors(elem1)); - EXPECT_EQ(2u, PacMan.num_neighbors(elem2)); - } - if (1 == procRank) - { - stk::mesh::Entity elem1 = PacMan.element_with_id(3); - stk::mesh::Entity elem2 = PacMan.element_with_id(4); - EXPECT_EQ(2u, PacMan.num_neighbors(elem1)); - EXPECT_EQ(2u, PacMan.num_neighbors(elem2)); - } - if (2 == procRank) - { - stk::mesh::Entity elem1 = PacMan.element_with_id(5); - stk::mesh::Entity elem2 = PacMan.element_with_id(6); - EXPECT_EQ(2u, PacMan.num_neighbors(elem1)); - EXPECT_EQ(2u, PacMan.num_neighbors(elem2)); - } - if (3 == procRank) - { - stk::mesh::Entity elem1 = PacMan.element_with_id(7); - stk::mesh::Entity elem2 = PacMan.element_with_id(8); - EXPECT_EQ(2u, PacMan.num_neighbors(elem1)); - EXPECT_EQ(1u, PacMan.num_neighbors(elem2)); - } - EXPECT_EQ(0u, PacMan.num_active_elems()); - - stk::mesh::EntityIdVector elemIds = {1, 3, 5, 7}; - PacMan.activate_these_ids(elemIds); - - EXPECT_EQ(1u, PacMan.num_active_elems()); - } -} -TEST(NewNoGhostGame, 1ProcNeighbors) -{ - stk::ParallelMachine comm = MPI_COMM_WORLD; - int numProcs = stk::parallel_machine_size(comm); - - if (1 == numProcs) - { - HexGameofLifeMesh Mesh(MPI_COMM_WORLD, 2, 2, 2); - NoGhostGameofLife Game(Mesh, "1ProcNeighbors"); - - stk::mesh::Entity elem1 = Game.element_with_id(1); - stk::mesh::Entity elem8 = Game.element_with_id(8); - - EXPECT_EQ(7u, Game.num_neighbors(elem1)); - EXPECT_EQ(7u, Game.num_neighbors(elem8)); - - EXPECT_EQ(0u, Game.num_active_neighbors(elem1)); - EXPECT_EQ(0u, Game.num_active_neighbors(elem8)); - - stk::mesh::EntityIdVector elemIds = {1, 2, 3, 4}; - Game.activate_these_ids(elemIds); - - EXPECT_EQ(3u, Game.num_active_neighbors(elem1)); - EXPECT_EQ(4u, Game.num_active_neighbors(elem8)); - } -} -TEST(NewNoGhostGame, 4ProcNeighbors) -{ - stk::ParallelMachine comm = MPI_COMM_WORLD; - int numProcs = stk::parallel_machine_size(comm); - int procNum = stk::parallel_machine_rank(comm); - if (4 == numProcs) - { - HexGameofLifeMesh Mesh(MPI_COMM_WORLD, 2, 2, 4, stk::mesh::BulkData::NO_AUTO_AURA); - NoGhostGameofLife Game(Mesh, "4ProcNeighbors"); - - stk::mesh::Entity elem; - unsigned expectedNeighbors; - if (0 == procNum) - { - elem = Game.element_with_id(1); - expectedNeighbors = 3u; - } - else if (1 == procNum) - { - elem = Game.element_with_id(5); - expectedNeighbors = 8u; - } - else if (2 == procNum) - { - elem = Game.element_with_id(9); - expectedNeighbors = 4u; - } - else if (3 == procNum) - { - elem = Game.element_with_id(13); - expectedNeighbors = 5u; - } - - EXPECT_EQ(0u, Game.num_active_neighbors(elem)); - - stk::mesh::EntityIdVector elemIds = {1, 2, 3, 4, 9, 10, 11, 12, 14}; - Game.activate_these_ids(elemIds); - - EXPECT_EQ(expectedNeighbors, Game.num_active_neighbors(elem)); - } -} -TEST(NewNoGhostGame, 1ProcRunGame) -{ - stk::ParallelMachine comm = MPI_COMM_WORLD; - int numProcs = stk::parallel_machine_size(comm); - if (1 == numProcs) - { - HexGameofLifeMesh Mesh(comm, 2, 2, 2); - - NoGhostGameofLife Game(Mesh, "1ProcRunGame"); - - stk::mesh::EntityIdVector elemIds = {1, 2, 3, 4, 5}; - Game.activate_these_ids(elemIds); - EXPECT_EQ(5u, Game.num_active_elems()); - - Game.run_game_of_life(1); - EXPECT_EQ(8u, Game.num_active_elems()); - - Game.run_game_of_life(1); - EXPECT_EQ(0u, Game.num_active_elems()); - - Game.run_game_of_life(1); - EXPECT_EQ(0u, Game.num_active_elems()); - } -} -TEST(NewNoGhostGame, 4ProcRunGame) -{ - stk::ParallelMachine comm = MPI_COMM_WORLD; - int numProcs = stk::parallel_machine_size(comm); - int procNum = stk::parallel_machine_rank(comm); - if (4 == numProcs) - { - HexGameofLifeMesh Mesh(comm, 3, 3, 4, stk::mesh::BulkData::NO_AUTO_AURA); - - NoGhostGameofLife Game(Mesh, "4ProcRunGame"); - - stk::mesh::EntityIdVector elemIds = {10, 12, 13, 15, 17, 19, 21, 22, 24, 26}; - Game.activate_these_ids(elemIds); - - unsigned expectedActive; - if (0 == procNum) - expectedActive = 0; - else if (1 == procNum) - expectedActive = 5; - else if (2 == procNum) - expectedActive = 5; - else if (3 == procNum) - expectedActive = 0; - - EXPECT_EQ(expectedActive, Game.num_active_elems()); - - Game.run_game_of_life(1); - - if (0 == procNum) - expectedActive = 1; - else if (1 == procNum) - expectedActive = 3; - else if (2 == procNum) - expectedActive = 3; - else if (3 == procNum) - expectedActive = 1; - - EXPECT_EQ(expectedActive, Game.num_active_elems()); - - Game.run_game_of_life(1); - - if (0 == procNum) - expectedActive = 0; - else if (1 == procNum) - expectedActive = 5; - else if (2 == procNum) - expectedActive = 5; - else if (3 == procNum) - expectedActive = 0; - - EXPECT_EQ(expectedActive, Game.num_active_elems()); - - Game.run_game_of_life(1); - - if (0 == procNum) - expectedActive = 1; - else if (1 == procNum) - expectedActive = 3; - else if (2 == procNum) - expectedActive = 3; - else if (3 == procNum) - expectedActive = 1; - - EXPECT_EQ(expectedActive, Game.num_active_elems()); - } -} -TEST(NewNoGhostGame, 1ProcQuad) -{ - stk::ParallelMachine comm = MPI_COMM_WORLD; - int numProcs = stk::parallel_machine_size(comm); - if (1 == numProcs) - { - QuadGameofLifeMesh Mesh(comm, 8, 8); - - NoGhostGameofLife Game(Mesh, "1ProcQuad"); - stk::mesh::EntityIdVector elemIds = {41, 42, 43, 51, 58}; - Game.activate_these_ids(elemIds); - - EXPECT_EQ(5u, Game.num_active_elems()); - - stk::mesh::Entity elem1 = Game.element_with_id(50); - stk::mesh::Entity elem2 = Game.element_with_id(41); - - EXPECT_EQ(8u, Game.num_neighbors(elem1)); - EXPECT_EQ(5u, Game.num_active_neighbors(elem1)); - EXPECT_EQ(5u, Game.num_neighbors(elem2)); - EXPECT_EQ(1u, Game.num_active_neighbors(elem2)); - - Game.run_game_of_life(2); - - EXPECT_EQ(5u, Game.num_active_elems()); - - EXPECT_EQ(8u, Game.num_neighbors(elem1)); - EXPECT_EQ(3u, Game.num_active_neighbors(elem1)); - EXPECT_EQ(5u, Game.num_neighbors(elem2)); - EXPECT_EQ(1u, Game.num_active_neighbors(elem2)); - - Game.run_game_of_life(2); - - stk::mesh::Entity elem3 = Game.element_with_id(36); - stk::mesh::Entity elem4 = Game.element_with_id(28); - - EXPECT_EQ(8u, Game.num_neighbors(elem3)); - EXPECT_EQ(2u, Game.num_active_neighbors(elem3)); - EXPECT_EQ(8u, Game.num_neighbors(elem4)); - EXPECT_EQ(2u, Game.num_active_neighbors(elem4)); - - Game.run_game_of_life(2); - - - EXPECT_EQ(8u, Game.num_neighbors(elem3)); - EXPECT_EQ(3u, Game.num_active_neighbors(elem3)); - EXPECT_EQ(8u, Game.num_neighbors(elem4)); - EXPECT_EQ(2u, Game.num_active_neighbors(elem4)); - } -} -TEST(NewNoGhostGame, 4ProcQuad) -{ - stk::ParallelMachine comm = MPI_COMM_WORLD; - int numProcs = stk::parallel_machine_size(comm); - int procRank = stk::parallel_machine_rank(comm); - if (4 == numProcs) - { - QuadGameofLifeMesh Mesh(comm, 8, 8, stk::mesh::BulkData::NO_AUTO_AURA); - - NoGhostGameofLife Game(Mesh, "4ProcQuad"); - stk::mesh::EntityIdVector elemIds = {41, 42, 43, 51, 58}; - Game.activate_these_ids(elemIds); - - stk::mesh::Entity elem; - unsigned expectedActive; - unsigned expectedActiveNeighbors; - if (0 == procRank) - { - expectedActive = 0; - elem = Game.element_with_id(9); - expectedActiveNeighbors = 0; - } - else if (1 == procRank) - { - expectedActive = 0; - elem = Game.element_with_id(25); - expectedActiveNeighbors = 0; - } - else if (2 == procRank) - { - expectedActive = 3; - elem = Game.element_with_id(41); - expectedActiveNeighbors = 1; - } - else if (3 == procRank) - { - expectedActive = 2; - elem = Game.element_with_id(57); - expectedActiveNeighbors = 1; - } - - EXPECT_EQ(expectedActive, Game.num_active_elems()); - EXPECT_EQ(expectedActiveNeighbors, Game.num_active_neighbors(elem)); - - Game.run_game_of_life(2); - - if (0 == procRank) - { - expectedActive = 0; - expectedActiveNeighbors = 0; - } - else if (1 == procRank) - { - expectedActive = 0; - expectedActiveNeighbors = 1; - } - else if (2 == procRank) - { - expectedActive = 4; - expectedActiveNeighbors = 1; - } - else if (3 == procRank) - { - expectedActive =1; - expectedActiveNeighbors = 0; - } - - EXPECT_EQ(expectedActive, Game.num_active_elems()); - EXPECT_EQ(expectedActiveNeighbors, Game.num_active_neighbors(elem)); - - Game.run_game_of_life(2); - - if (0 == procRank) - { - expectedActive = 0; - expectedActiveNeighbors = 0; - elem = Game.element_with_id(11); - } - else if (1 == procRank) - { - expectedActive = 0; - expectedActiveNeighbors = 3; - elem = Game.element_with_id(27); - } - else if (2 == procRank) - { - expectedActive = 4; - expectedActiveNeighbors = 5; - elem = Game.element_with_id(43); - } - else if (3 == procRank) - { - expectedActive = 1; - expectedActiveNeighbors = 1; - elem = Game.element_with_id(59); - } - - EXPECT_EQ(expectedActive, Game.num_active_elems()); - EXPECT_EQ(expectedActiveNeighbors, Game.num_active_neighbors(elem)); - - Game.run_game_of_life(2); - - if (0 == procRank) - { - expectedActive = 0; - expectedActiveNeighbors = 0; - } - else if (1 == procRank) - { - expectedActive = 2; - expectedActiveNeighbors = 3; - } - else if (2 == procRank) - { - expectedActive = 3; - expectedActiveNeighbors = 3; - } - else if (3 == procRank) - { - expectedActive = 0; - expectedActiveNeighbors = 0; - } - - EXPECT_EQ(expectedActive, Game.num_active_elems()); - EXPECT_EQ(expectedActiveNeighbors, Game.num_active_neighbors(elem)); - } -} -TEST(NewNoGhostGame, 1ProcTri) -{ - stk::ParallelMachine comm = MPI_COMM_WORLD; - int numProcs = stk::parallel_machine_size(comm); - if (1 == numProcs) - { - TriGameofLifeMesh Mesh(comm, 4, 4, stk::mesh::BulkData::NO_AUTO_AURA); - - NoGhostGameofLife Game(Mesh, "1ProcTri"); - stk::mesh::EntityIdVector elemIds = {1, 2, 3, 4, 5, 6, 7, - 8, 25, 26, 27, 28, 29, 30, 31, 32}; - Game.activate_these_ids(elemIds); - - EXPECT_EQ(16u, Game.num_active_elems()); - - stk::mesh::Entity elem1 = Game.element_with_id(1); - stk::mesh::Entity elem2 = Game.element_with_id(8); - stk::mesh::Entity elem3 = Game.element_with_id(25); - stk::mesh::Entity elem4 = Game.element_with_id(32); - - EXPECT_EQ(3u, Game.num_neighbors(elem1)); - EXPECT_EQ(6u, Game.num_neighbors(elem2)); - EXPECT_EQ(6u, Game.num_neighbors(elem3)); - EXPECT_EQ(3u, Game.num_neighbors(elem4)); - - EXPECT_EQ(2u, Game.num_active_neighbors(elem1)); - EXPECT_EQ(2u, Game.num_active_neighbors(elem2)); - EXPECT_EQ(2u, Game.num_active_neighbors(elem3)); - EXPECT_EQ(2u, Game.num_active_neighbors(elem4)); - - Game.run_game_of_life(2); - - EXPECT_EQ(14u, Game.num_active_elems()); - - EXPECT_EQ(3u, Game.num_neighbors(elem1)); - EXPECT_EQ(6u, Game.num_neighbors(elem2)); - EXPECT_EQ(6u, Game.num_neighbors(elem3)); - EXPECT_EQ(3u, Game.num_neighbors(elem4)); - - EXPECT_EQ(3u, Game.num_active_neighbors(elem1)); - EXPECT_EQ(2u, Game.num_active_neighbors(elem2)); - EXPECT_EQ(2u, Game.num_active_neighbors(elem3)); - EXPECT_EQ(3u, Game.num_active_neighbors(elem4)); - - Game.run_game_of_life(2); - - EXPECT_EQ(6u, Game.num_active_elems()); - - EXPECT_EQ(0u, Game.num_active_neighbors(elem1)); - EXPECT_EQ(1u, Game.num_active_neighbors(elem2)); - EXPECT_EQ(1u, Game.num_active_neighbors(elem3)); - EXPECT_EQ(0u, Game.num_active_neighbors(elem4)); - } -} -TEST(NewNoGhostGame, 4ProcTri) -{ - stk::ParallelMachine comm = MPI_COMM_WORLD; - int numProcs = stk::parallel_machine_size(comm); - int procRank = stk::parallel_machine_rank(comm); - if (4 == numProcs) - { - TriGameofLifeMesh Mesh(comm, 4, 4, stk::mesh::BulkData::NO_AUTO_AURA); - - NoGhostGameofLife Game(Mesh, "4ProcTri"); - stk::mesh::EntityIdVector elemIds = {1, 2, 3, 4, 5, 6, 7, 8, 25, 26, - 27, 28, 29, 30, 31, 32}; - Game.activate_these_ids(elemIds); - - unsigned expectedActive; - stk::mesh::Entity elem; - unsigned expectedNeighbors; - unsigned expectedActiveNeighbors; - - if (0 == procRank) - { - expectedActive = 8; - elem = Game.element_with_id(4); - expectedNeighbors = 9; - expectedActiveNeighbors = 4; - } - else if (1 == procRank) - { - expectedActive = 0; - elem = Game.element_with_id(13); - expectedNeighbors = 12; - expectedActiveNeighbors = 5; - } - else if (2 == procRank) - { - expectedActive = 0; - elem = Game.element_with_id(20); - expectedNeighbors = 12; - expectedActiveNeighbors = 5; - - } - else if (3 == procRank) - { - expectedActive = 8; - elem = Game.element_with_id(29); - expectedNeighbors = 9; - expectedActiveNeighbors = 4; - } - - EXPECT_EQ(expectedActive, Game.num_active_elems()); - EXPECT_EQ(expectedNeighbors, Game.num_neighbors(elem)); - EXPECT_EQ(expectedActiveNeighbors, Game.num_active_neighbors(elem)); - - Game.run_game_of_life(2); - - if (0 == procRank) - { - expectedActive = 5; - expectedActiveNeighbors = 3; - } - else if (1 == procRank) - { - expectedActive = 2; - expectedActiveNeighbors = 5; - } - else if (2 == procRank) - { - expectedActive = 2; - expectedActiveNeighbors = 5; - - } - else if (3 == procRank) - { - expectedActive = 5; - expectedActiveNeighbors = 3; - } - - EXPECT_EQ(expectedActive, Game.num_active_elems()); - EXPECT_EQ(expectedNeighbors, Game.num_neighbors(elem)); - EXPECT_EQ(expectedActiveNeighbors, Game.num_active_neighbors(elem)); - - Game.run_game_of_life(2); - - if (0 == procRank) - { - expectedActive = 1; - expectedActiveNeighbors = 1; - } - else if (1 == procRank) - { - expectedActive = 2; - expectedActiveNeighbors = 4; - } - else if (2 == procRank) - { - expectedActive = 2; - expectedActiveNeighbors = 4; - - } - else if (3 == procRank) - { - expectedActive = 1; - expectedActiveNeighbors = 1; - } - } -} -} - - - - diff --git a/packages/stk/stk_learning/Jamfile b/packages/stk/stk_learning/Jamfile deleted file mode 100644 index a0c0cdffc453..000000000000 --- a/packages/stk/stk_learning/Jamfile +++ /dev/null @@ -1,247 +0,0 @@ -#-------------------------------------------------------------------- -# Copyright 2002 - 2008, 2010, 2011 National Technology & -# Engineering Solutions of Sandia, LLC (NTESS). Under the terms -# of Contract DE-NA0003525 with NTESS, there is a -# non-exclusive license for use of this work by or on behalf -# of the U.S. Government. Export of this program may require -# a license from the United States Government. -#-------------------------------------------------------------------- - -# -# The signature for Boost.build rules is described here: -# -# http://www.boost.org/build/doc/html/bbv2/overview/targets.html -# -#function-name main-target-name -# : sources -# : requirements -# : default-build -# : usage-requirements -# ; -# -# * "main-target-name" is the name used to request the target -# on command line and to use it from other main targets. -# Main target name may contain alphanumeric characters and symbols '-' and '_'; -# * "sources" is the list of source files and other main targets that must be combined. -# * "requirements" is the list of properties that must always be present -# when this main target is built. -# * "default-build" is the list of properties that will be used unless -# some other value of the same feature is already specified. -# * "usage-requirements" is the list of properties that will be propagated -# to all main targets that use this one, i.e. to all dependedents. -# -# -# SECTION 1: Project definition -# - -import set ; -import path ; - -local stk_learning-root-inc ; -if $(RTenv-arg) = "user" { - stk_learning-root-inc = $(stk_learning-root)/include ; -} else { - stk_learning-root-inc = $(stk_learning-root) ; -} - -project votd - : requirements - $(sierra-warnings) - STK_BUILT_IN_SIERRA - $(stk_learning-root-inc) - : usage-requirements - $(stk_learning-root-inc) - STK_BUILT_IN_SIERRA - : build-dir $(stk_learning-builddir) - ; -# -# This variable should contain the applications and associated files that -# must be installed for both developers and end users. Unless they need to -# be visible to end users, unittests should not be placed here. -local installed-end-user-files = - ; -# -# This variable should contain the applications and associated files that will -# only be installed for and visible to developers. -# Note that if the --install-developer-files option is passed to bjam these will also -# be installed for end-users. (This is only intended to be used for testing.) -local installed-developer-files = - stk_learning_dgelement_utest - stk_learning_openmp_utest - stk_learning_mpi_openmp_utest - stk_learning_kokkos_utest - stk_learning_game_of_life_utest - stk_learning_mesh_builder_utest - stk_learning_imbalance_utest - stk_learning_code_katas -# stk_learning_sphere_utest - ; - -# -# SECTION 2: Development install -# -explicit install-serial-targets ; -alias install-serial-targets ; - -# Dependencies listed in this target are installed in the developer's project. -# This should include all executables and any other files needed for developer use. -explicit install-targets ; -alias install-targets - : $(installed-end-user-files) - $(installed-developer-files) - ; -# -# SECTION 3: End-user install -# -explicit install-user-env ; -alias install-user-env : install-user-jamfile - install-user-bin install-user-include ; - -# This rule copies build-system related files for this product to the install-root. -explicit install-user-jamfile ; -install install-user-jamfile - : [ glob $(stk_learning-root)/Jamfile ] - : $(install-root)/stk/stk_learning - $(stk_learning-root) - ; - -# Dependencies listed in this target are always installed for end users. -# This should include only those executables and any other files needed by end-users. -explicit install-user-bin ; -install install-user-bin - : $(installed-end-user-files) - [ if-defined-val $(install-developer-files-arg) : - # Targets listed here will only be installed if the --install-developer-files option - # is passed to bjam. This is intended for testing that requires things like - # unittests to be installed when they normally would not be. - $(installed-developer-files) - ] - : - # Note that all Sierra executables are installed in a common bin directory, - # not in a product-specific bin directory. - $(install-bin-dir) - ; - -explicit install-user-include ; -install install-user-include - : [ path.glob-tree $(stk_learning-root) : *.h *.hpp ] - : $(install-root)/stk/stk_learning/include $(stk_learning-root) - ; - -explicit install-exe-targets ; -alias install-exe-targets : ; - -# -# SECTION 4: Build configuration -# - -exe stk_learning_dgelement_utest - : - [ glob $(stk_learning-root)/DGElement/*.cpp ] - /sierra/stk_unit_test_utils//stk_unit_main - /sierra/stk_tools//stk_tools_lib - : - @sierra-exec-tag - ; - -exe stk_learning_openmp_utest - : - $(gtest-root)/googletest/src/gtest_main.cc - [ glob $(stk_learning-root)/OpenMP/*.C ] - /sierra/stk_unit_test_utils//stk_unit_test_utils - : - @sierra-exec-tag - ; - -exe stk_learning_mpi_openmp_utest - : - [ glob $(stk_learning-root)/MpiPlusOpenMp/*.C ] - [ glob $(stk_learning-root)/ForEachEntityLoops/*.cpp ] - /sierra/stk_unit_test_utils//stk_unit_main - : - @sierra-exec-tag - ; - -lib stk_learning_game_of_life - : - [ ifdevbuild - # Any parameters within this 'ifdevbuild' block apply to development - # builds only and will not be present for user builds. - [ glob $(stk_learning-root)/GameOfLife/*.cpp ] - ] - /sierra/stk_unit_test_utils//stk_unit_test_utils - /sierra/stk_mesh//stk_mesh_base - /sierra/stk_topology//stk_topology - /sierra/stk_util//stk_util_environment - : - [ ifuserbuild - # Any parameters within this 'ifuserbuild' block apply to user - # builds only and will not be present for developer builds. - $(stk_learning-root)/lib/libstk_learning_game_of_life.a - ] - ; - -exe stk_learning_game_of_life_utest - : - [ glob $(stk_learning-root)/GameOfLife/UnitTest/*.cpp ] - /sierra/stk_unit_test_utils//stk_unit_main - stk_learning_game_of_life - : - @sierra-exec-tag - ; - -lib stk_learning_mesh_builder - : - [ ifdevbuild - # Any parameters within this 'ifdevbuild' block apply to development - # builds only and will not be present for user builds. - [ glob $(stk_learning-root)/MeshBuilder/*.cpp ] - ] - /sierra/stk_unit_test_utils//stk_unit_test_utils - /sierra/stk_mesh//stk_mesh_base - /sierra/stk_topology//stk_topology - /sierra/stk_util//stk_util_environment - : - [ ifuserbuild - # Any parameters within this 'ifuserbuild' block apply to user - # builds only and will not be present for developer builds. - $(stk_learning-root)/lib/libstk_learning_mesh_builder.a - ] - ; - -exe stk_learning_imbalance_utest - : - [ glob $(stk_learning-root)/LoadImbalanceTimer/*.cpp ] - /sierra/stk_unit_test_utils//stk_unit_main - : - @sierra-exec-tag - ; - -exe stk_learning_mesh_builder_utest - : - [ glob $(stk_learning-root)/MeshBuilder/UnitTest/*.cpp ] - /sierra/stk_unit_test_utils//stk_unit_main - stk_learning_game_of_life - stk_learning_mesh_builder - : - @sierra-exec-tag - ; - -exe stk_learning_kokkos_utest - : - [ glob $(stk_learning-root)/Kokkos/*.C ] - /sierra/stk_unit_test_utils//stk_unit_main - /sierra/stk_ngp//stk_ngp - : - @sierra-exec-tag - ; - -exe stk_learning_code_katas - : - [ glob $(stk_learning-root)/CodeKatas/*.C ] - /sierra/stk_unit_test_utils//stk_unit_main - /tpl/scalapack//scalapack - : - @sierra-exec-tag - ; - diff --git a/packages/stk/stk_learning/Kokkos/KokkosFieldBLAS.C b/packages/stk/stk_learning/Kokkos/KokkosFieldBLAS.C deleted file mode 100644 index 4f79707c7aa8..000000000000 --- a/packages/stk/stk_learning/Kokkos/KokkosFieldBLAS.C +++ /dev/null @@ -1,629 +0,0 @@ -#include "mtk_kokkos.h" - -#include "stk_mesh/base/MetaData.hpp" -#include "stk_mesh/base/BulkData.hpp" -#include "stk_mesh/base/Field.hpp" -#include // for ParallelMachine, etc -#include "stk_mesh/base/FieldBLAS.hpp" -#include "stk_unit_test_utils/ioUtils.hpp" -#include "stk_unit_test_utils/getOption.h" - -#include - -typedef stk::mesh::Field ScalarField; - -#ifdef KOKKOS_ENABLE_OPENMP - typedef Kokkos::OpenMP ExecSpace ; -#elif defined(KOKKOS_ENABLE_CUDA) - typedef Kokkos::Cuda ExecSpace ; -#else - typedef Kokkos::Serial ExecSpace ; -#endif - -#ifdef KOKKOS_ENABLE_OPENMP - typedef Kokkos::OpenMP MemSpace; -#elif defined(KOKKOS_ENABLE_CUDA) - typedef Kokkos::CudaSpace MemSpace; -#else - typedef Kokkos::HostSpace MemSpace; -#endif - - // typedef Kokkos::CudaUVMSpace MemSpace; - - typedef Kokkos::LayoutLeft Layout ; - // typedef Kokkos::LayoutRight Layout ; - - typedef Kokkos::RangePolicy range_policy ; - - // Allocate y, x vectors and Matrix A: - // Device - typedef Kokkos::View ViewVectorType; - typedef ViewVectorType KokkosVector; - -inline double elapsed_time(const struct timeval &begin, const struct timeval &end) -{ - return 1.0*(end.tv_sec-begin.tv_sec) + 1.0e-6*(end.tv_usec-begin.tv_usec); -} - - -template -class NgpFieldVector -{ -public: - - NgpFieldVector(stk::mesh::Field& field, const stk::mesh::Selector& selector) : - scalarField(field), - vector(field.name(), get_max_field_bucket_length(field, selector)), - hostVector(Kokkos::create_mirror_view(vector)) - { - } - - NgpFieldVector(stk::mesh::Field& field) : - scalarField(field), - vector(field.name(), get_max_field_bucket_length(field)), - hostVector(Kokkos::create_mirror_view(vector)) - { - } - - KokkosVector& device_get() {return vector;} - KokkosVector::HostMirror& host_get() {return hostVector;} - - void copy_to_device(int kmax, Scalar x[]) - { - // Initialize x vector on host - for (int j = 0; j < kmax; ++j) { - hostVector( j ) = x[j]; - } - - //Deep copy host view to device views - Kokkos::deep_copy(vector, hostVector); - } - - stk::mesh::Field &get_field() {return scalarField;} - const stk::mesh::Field &get_field() const {return scalarField;} - - stk::mesh::BucketVector const& get_buckets() - { - return get_buckets(stk::mesh::selectField(scalarField)); - } - stk::mesh::BucketVector const& get_buckets(const stk::mesh::Selector& selector) - { - return scalarField.get_mesh().get_buckets(scalarField.entity_rank(), - selector & scalarField.mesh_meta_data().locally_owned_part()); - } - -private: - - unsigned get_max_field_bucket_length(const stk::mesh::Field & fieldBase) - { - return get_max_field_bucket_length(fieldBase, stk::mesh::selectField(fieldBase)); - } - - unsigned get_max_field_bucket_length(const stk::mesh::Field & fieldBase, - const stk::mesh::Selector& selector) - { - stk::mesh::BucketVector const& buckets = fieldBase.get_mesh().get_buckets(fieldBase.entity_rank(), - selector & fieldBase.mesh_meta_data().locally_owned_part()); - - unsigned max_field_bucket_length = 0; - - for(size_t i=0; i < buckets.size(); i++) { - stk::mesh::Bucket & b = *buckets[i]; - const stk::mesh::Bucket::size_type length = b.size(); - const unsigned int fieldSize = field_scalars_per_entity(fieldBase, b); - const unsigned kmax = length * fieldSize; - max_field_bucket_length = std::max(max_field_bucket_length, kmax); - } - return max_field_bucket_length; - } - -private: - stk::mesh::Field &scalarField; - KokkosVector vector; - KokkosVector::HostMirror hostVector; -}; - -template -struct KokkosBLAS -{ - inline - static void axpy( const int & kmax, const Scalar & alpha, const Scalar x[], Scalar y[]) - { - for(int k = 0 ; k < kmax ; ++k) { - y[k] = alpha * x[k] + y[k]; - } - } - - inline - static void copy( const int & kmax, const Scalar x[], Scalar y[]) - { - for(int k = 0 ; k < kmax ; ++k) { - y[k] = x[k]; - } - } - - inline - static void product( const int & kmax, const Scalar x[], const Scalar y[], Scalar z[]) - { - for (int k=0;k - inline - int field_length(NgpFieldVector & xField, const stk::mesh::Bucket & b) - { - const stk::mesh::Bucket::size_type length = b.size(); - const unsigned int fieldSize = field_scalars_per_entity(xField.get_field(), b); - return length * fieldSize; - } - - template - inline - Scalar * field_ptr(NgpFieldVector & xField, const stk::mesh::Bucket & b) - { - return static_cast(field_data(xField.get_field(), b)); - } - // ********************************************************************************************************************************************** - template - inline - void field_fill( - const Scalar data, - NgpFieldVector & xField, - const stk::mesh::Selector selector, - const MPI_Comm comm) - { - ThrowAssert(typeid(Scalar) == xField.get_field().data_traits().type_info); - - stk::mesh::BucketVector const& buckets = xField.get_buckets(selector); - - for(size_t i=0; i < buckets.size(); i++) { - stk::mesh::Bucket & b = *buckets[i]; - KokkosBLAS::fill(field_length(xField, b), data, field_ptr(xField, b)); - } - } - - template - inline - void field_fill( - const Scalar data, - NgpFieldVector & xField, - const stk::mesh::Selector selector) - { - const MPI_Comm comm = xField.get_field().get_mesh().parallel(); - stk::kokkos::field_fill(data,xField,selector,comm); - } - - template - inline - void field_fill( - const Scalar data, - NgpFieldVector & xField) - { - const stk::mesh::Selector selector = stk::mesh::selectField(xField.get_field()); - stk::kokkos::field_fill(data,xField,selector); - } - // ********************************************************************************************************************************************** - template - inline - void field_asum( - Scalar & glob_result, - NgpFieldVector& xField, - const stk::mesh::Selector& selector, - const MPI_Comm comm) - { - ThrowAssert(typeid(Scalar) == xField.get_field().data_traits().type_info); - - stk::mesh::BucketVector const& buckets = xField.get_buckets(selector); - KokkosVector& dev_x = xField.device_get(); - - Scalar local_result = Scalar(0.0); - - for(size_t i=0; i < buckets.size(); i++) { - stk::mesh::Bucket & b = *buckets[i]; - int kmax = field_length(xField, b); - xField.copy_to_device(kmax, field_ptr(xField, b)); - Scalar gpu_result = Scalar(0.0); - - Kokkos::parallel_reduce( range_policy( 0, kmax), KOKKOS_LAMBDA ( int k, double& update ) { - update += dev_x( k ); - }, gpu_result ); - - local_result += gpu_result; - } - - glob_result=local_result; - stk::all_reduce_sum(comm,&local_result,&glob_result,1u); - } - - template - inline - void field_asum( - Scalar & result, - NgpFieldVector& xFieldBase, - const stk::mesh::Selector& selector) - { - const MPI_Comm comm = xFieldBase.get_field().get_mesh().parallel(); - stk::kokkos::field_asum(result,xFieldBase,selector,comm); - } - - template - inline - void field_asum( - Scalar & result, - NgpFieldVector& xFieldBase) - { - const stk::mesh::Selector selector = stk::mesh::selectField(xFieldBase.get_field()); - stk::kokkos::field_asum(result,xFieldBase,selector); - } - // ********************************************************************************************************************************************** - template - inline - void field_nrm2( - Scalar & glob_result, - NgpFieldVector& xField, - const stk::mesh::Selector& selector, - const MPI_Comm comm) - { - ThrowAssert(typeid(Scalar) == xField.get_field().data_traits().type_info); - - stk::mesh::BucketVector const& buckets = xField.get_buckets(selector); - KokkosVector& dev_x = xField.device_get(); - - Scalar local_result = Scalar(0.0); - - for(size_t i=0; i < buckets.size(); i++) { - stk::mesh::Bucket & b = *buckets[i]; - int kmax = field_length(xField, b); - xField.copy_to_device(kmax, field_ptr(xField, b)); - Scalar gpu_result = Scalar(0.0); - - Kokkos::parallel_reduce( range_policy( 0, kmax), KOKKOS_LAMBDA ( int k, double& update ) { - update += dev_x( k ) * dev_x( k ); - }, gpu_result ); - - local_result += gpu_result; - } - - glob_result=local_result; - stk::all_reduce_sum(comm,&local_result,&glob_result,1u); - glob_result=sqrt(glob_result); - } - template - inline - void field_nrm2( - Scalar & result, - NgpFieldVector& xField, - const stk::mesh::Selector& selector) - { - const MPI_Comm comm = xField.get_field().get_mesh().parallel(); - stk::kokkos::field_nrm2(result,xField,selector,comm); - } - - template - inline - void field_nrm2( - Scalar & result, - NgpFieldVector& xField) - { - const stk::mesh::Selector selector = stk::mesh::selectField(xField.get_field()); - stk::kokkos::field_nrm2(result,xField,selector); - } - // ********************************************************************************************************************************************** - - template - inline - void field_dot( - Scalar & glob_result, - NgpFieldVector& xField, - NgpFieldVector& yField, - const stk::mesh::Selector& selector, - const MPI_Comm comm) - { - ThrowAssert(xField.get_field().entity_rank() == yField.get_field().entity_rank()); - ThrowAssert(&xField.get_field().get_mesh() == &yField.get_field().get_mesh()); - ThrowAssert(xField.get_field().data_traits().type_info == yField.get_field().data_traits().type_info); - ThrowAssert(typeid(Scalar) == xField.get_field().data_traits().type_info); - - stk::mesh::BucketVector const& buckets = xField.get_buckets(selector); - KokkosVector& dev_x = xField.device_get(); - KokkosVector& dev_y = yField.device_get(); - - Scalar local_result = Scalar(0.0); - - for(size_t i=0; i < buckets.size(); i++) { - stk::mesh::Bucket & b = *buckets[i]; - int kmax = field_length(xField, b); - xField.copy_to_device(kmax, field_ptr(xField, b)); - yField.copy_to_device(kmax, field_ptr(yField, b)); - Scalar gpu_result = Scalar(0.0); - - Kokkos::parallel_reduce( range_policy( 0, kmax), KOKKOS_LAMBDA ( int k, double& update ) { - update += dev_x( k ) * dev_y( k ); - }, gpu_result ); - - local_result += gpu_result; - } - - glob_result = local_result; - stk::all_reduce_sum(comm,&local_result,&glob_result,1u); - } - - template - inline - void field_dot( - Scalar & result, - NgpFieldVector& xField, - NgpFieldVector& yField, - const stk::mesh::Selector& selector) - { - const MPI_Comm comm = xField.get_field().get_mesh().parallel(); - stk::kokkos::field_dot(result,xField,yField,selector,comm); - } - - template - inline - void field_dot( - Scalar & result, - NgpFieldVector& xField, - NgpFieldVector& yField) - { - const stk::mesh::Selector selector = stk::mesh::selectField(xField.get_field()) & stk::mesh::selectField(yField.get_field()); - stk::kokkos::field_dot(result,xField,yField,selector); - } - // ********************************************************************************************************************************************** -} -} - -void get_mesh_dimensions(int &nx, int &ny, int &nz) -{ - nx = stk::unit_test_util::get_command_line_option("-nx", 10); - ny = stk::unit_test_util::get_command_line_option("-ny", 10); - nz = stk::unit_test_util::get_command_line_option("-nz", 10); -} - -void populate_mesh(stk::mesh::BulkData& bulk, int nx, int ny, int nz) -{ - stk::mesh::MetaData &meta = bulk.mesh_meta_data(); - - std::ostringstream os; - os << "generated:" << nx << "x" << ny << "x" << nz; - - double val = 0.0; - ScalarField *x = &meta.declare_field(stk::topology::ELEMENT_RANK, "x"); - ScalarField *y = &meta.declare_field(stk::topology::ELEMENT_RANK, "y"); - - stk::mesh::put_field_on_mesh(*x, meta.locally_owned_part(), &val); - stk::mesh::put_field_on_mesh(*y, meta.locally_owned_part(), &val); - - stk::io::fill_mesh(os.str(), bulk); -} - -TEST_F(MTK_Kokkos, stkFieldBLAS) { - - stk::mesh::MetaData meta(3); - stk::mesh::BulkData bulk(meta, MPI_COMM_WORLD, stk::mesh::BulkData::AUTO_AURA); - if (bulk.parallel_size() > 1) { - return; - } - - int nx, ny, nz; - get_mesh_dimensions(nx, ny, nz); - int dim = nx*ny*nz; - - populate_mesh(bulk, nx, ny, nz); - - struct timeval begin,end; - double time, result, xResult, yResult; - double Gbytes = double(sizeof(double) * ( 2* dim ))/(1024.0 * 1024.0 * 1024.0); - - ScalarField *x = static_cast(meta.get_field(stk::topology::ELEMENT_RANK, "x")); - ScalarField *y = static_cast(meta.get_field(stk::topology::ELEMENT_RANK, "y")); - - { - gettimeofday(&begin,NULL); - double alpha = 1.0; - stk::mesh::field_fill(alpha, *x); - stk::mesh::field_fill(alpha, *y); - gettimeofday(&end,NULL); - - std::cerr << "fill Time: " << elapsed_time(begin, end) << std::endl; - } - - { - gettimeofday(&begin,NULL); - stk::mesh::field_asum(xResult, *x); - stk::mesh::field_asum(yResult, *y); - gettimeofday(&end,NULL); - time = elapsed_time(begin, end); - std::cerr << "asum Time: " << time << " bandwidth( " << Gbytes/time << " GB/s )" << std::endl; - EXPECT_EQ(xResult, dim); - EXPECT_EQ(yResult, dim); - } - - { - gettimeofday(&begin,NULL); - stk::mesh::field_nrm2(xResult, *x); - stk::mesh::field_nrm2(yResult, *y); - gettimeofday(&end,NULL); - time = elapsed_time(begin, end); - std::cerr << "nrm2 Time: " << time << " bandwidth( " << Gbytes/time << " GB/s )" << std::endl; - EXPECT_EQ(xResult, std::sqrt(1.0*dim)); - EXPECT_EQ(yResult, std::sqrt(1.0*dim)); - } - - { - gettimeofday(&begin,NULL); - stk::mesh::field_dot(result, *x, *y); - gettimeofday(&end,NULL); - time = elapsed_time(begin, end); - std::cerr << "dot Time: " << time << " bandwidth( " << Gbytes/time << " GB/s )" << std::endl; - EXPECT_EQ(result, dim); - } -} - - - -TEST_F(MTK_Kokkos, kokkosFieldBLAS) { - - stk::mesh::MetaData meta(3); - stk::mesh::BulkData bulk(meta, MPI_COMM_WORLD, stk::mesh::BulkData::AUTO_AURA); - if (bulk.parallel_size() > 1) { - return; - } - - int nx, ny, nz; - get_mesh_dimensions(nx, ny, nz); - int dim = nx*ny*nz; - - populate_mesh(bulk, nx, ny, nz); - - ScalarField *xField = static_cast(meta.get_field(stk::topology::ELEMENT_RANK, "x")); - ScalarField *yField = static_cast(meta.get_field(stk::topology::ELEMENT_RANK, "y")); - - // This must be initialized after field is populated - NgpFieldVector x(*xField); - NgpFieldVector y(*yField); - - struct timeval begin,end; - double time, result, xResult, yResult; - double Gbytes = double(sizeof(double) * ( 2* dim ))/(1024.0 * 1024.0 * 1024.0); - - { - gettimeofday(&begin,NULL); - double alpha = 1.0; - stk::kokkos::field_fill(alpha, x); - stk::kokkos::field_fill(alpha, y); - gettimeofday(&end,NULL); - - std::cerr << "fill Time: " << elapsed_time(begin, end) << std::endl; - } - - { - gettimeofday(&begin,NULL); - stk::kokkos::field_asum(xResult, x); - stk::kokkos::field_asum(yResult, y); - gettimeofday(&end,NULL); - time = elapsed_time(begin, end); - std::cerr << "asum Time: " << time << " bandwidth( " << Gbytes/time << " GB/s )" << std::endl; - EXPECT_EQ(xResult, dim); - EXPECT_EQ(yResult, dim); - } - - { - gettimeofday(&begin,NULL); - stk::kokkos::field_nrm2(xResult, x); - stk::kokkos::field_nrm2(yResult, y); - gettimeofday(&end,NULL); - time = elapsed_time(begin, end); - std::cerr << "nrm2 Time: " << time << " bandwidth( " << Gbytes/time << " GB/s )" << std::endl; - EXPECT_EQ(xResult, std::sqrt(1.0*dim)); - EXPECT_EQ(yResult, std::sqrt(1.0*dim)); - } - - { - gettimeofday(&begin,NULL); - stk::kokkos::field_dot(result, x, y); - gettimeofday(&end,NULL); - time = elapsed_time(begin, end); - std::cerr << "dot Time: " << time << " bandwidth( " << Gbytes/time << " GB/s )" << std::endl; - EXPECT_EQ(result, dim); - } -} diff --git a/packages/stk/stk_learning/Kokkos/KokkosStkFieldExp.C b/packages/stk/stk_learning/Kokkos/KokkosStkFieldExp.C deleted file mode 100644 index ddffdaeb3434..000000000000 --- a/packages/stk/stk_learning/Kokkos/KokkosStkFieldExp.C +++ /dev/null @@ -1,115 +0,0 @@ -/* -//@HEADER -// ************************************************************************ -// -// Kokkos v. 2.0 -// Copyright (2014) Sandia Corporation -// -// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation, -// the U.S. Government retains certain rights in this software. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// 3. Neither the name of the Corporation nor the names of the -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY -// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL SANDIA CORPORATION OR THE -// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Questions Contact H. Carter Edwards (hcedwar@sandia.gov) -// -// ************************************************************************ -//@HEADER -*/ - -#include "mtk_kokkos.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include - -void test_field() { - - unsigned spatialDim = 3; - stk::mesh::MetaData meta(spatialDim); - stk::mesh::BulkData bulk(meta, MPI_COMM_WORLD); - unsigned dimX = 10; - unsigned dimY = 10; - unsigned dimZ = 10; - std::ostringstream mesh_spec; - mesh_spec << "generated:"< scalarField(stk::topology::NODE_RANK, initialValue, bulk, meta.locally_owned_part()); - - stk::mesh::EntityVector nodes; - stk::mesh::get_selected_entities(meta.locally_owned_part(), bulk.buckets(stk::topology::NODE_RANK), nodes); - Kokkos::View device_nodes("device_nodes", nodes.size()); - Kokkos::View host_nodes("host_nodes", nodes.size()); - - for(size_t i=0; i using Kokkos::parallel_reduce - -#include "mtk_kokkos.h" - -TEST_F(MTK_Kokkos, TUTORIAL_01) { - - int N = std::pow(2, 12); - int M = std::pow(2, 10); - int nrepeat = 100; - - // Allocate y, x vectors and Matrix A: - double * const y = new double[ N ]; - double * const x = new double[ M ]; - double * const A = new double[ N * M ]; - - // Initialize y vector - // EXERCISE: convert outer loop to Kokkos::parallel_for - for ( int i = 0 ; i < N ; ++i ) { - y[i] = 1; - } - - // Initialize x vector - // EXERCISE: convert outer loop to Kokkos::parallel_for - for ( int i = 0 ; i < M ; ++i ) { - x[i] = 1; - } - - // EXERCISE: convert outer loop to Kokkos::parallel_for - for ( int j = 0 ; j < N ; ++j ) { - for ( int i = 0 ; i < M ; ++i ) { - A[ j * M + i ] = 1; - } - } - - // Timer products - struct timeval begin,end; - - gettimeofday(&begin,NULL); - - for ( int repeat = 0; repeat < nrepeat; repeat++) { - - //Application: = y^T*A*x - // EXERCISE: convert outer loop to Kokkos::parallel_reduce - double result = 0; - for ( int j = 0 ; j < N ; ++j ) { - double temp2 = 0 ; - for ( int i = 0 ; i < M ; ++i ) { - temp2 += A[ j * M + i ] * x[ i ]; - } - result += y[ j ] * temp2; - } - - //Output result - if ( repeat == (nrepeat - 1) ) - printf(" Computed result for %d x %d is %lf\n", N, M, result); - const double solution = (double)N *(double)M; - - if ( result != solution ) { - printf(" Error: result( %lf ) != solution( %lf )\n",result,solution); - } - } - - gettimeofday(&end,NULL); - - // Calculate time - double time = 1.0*(end.tv_sec-begin.tv_sec) + - 1.0e-6*(end.tv_usec-begin.tv_usec); - - // Calculate bandwidth. - // Each matrix A row (each of length M) is read once. - // The x vector (of length M) is read N times. - // The y vector (of length N) is read once. - // double Gbytes = 1.0e-9 * double(sizeof(double) * ( 2 * M * N + N )); - double Gbytes = 1.0e-9 * double(sizeof(double) * ( M + M * N + N )) ; - - // Print results (problem size, time and bandwidth in GB/s) - printf(" M( %d ) N( %d ) nrepeat ( %d ) problem( %g MB ) time( %g s ) bandwidth( %g GB/s )\n", - M , N, nrepeat, Gbytes * 1000, time, Gbytes * nrepeat / time ); - - delete[] A ; - delete[] y ; - delete[] x ; - -} diff --git a/packages/stk/stk_learning/Kokkos/KokkosTutorial03.C b/packages/stk/stk_learning/Kokkos/KokkosTutorial03.C deleted file mode 100644 index acf30866ba09..000000000000 --- a/packages/stk/stk_learning/Kokkos/KokkosTutorial03.C +++ /dev/null @@ -1,167 +0,0 @@ -/* -//@HEADER -// ************************************************************************ -// -// Kokkos v. 2.0 -// Copyright (2014) Sandia Corporation -// -// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation, -// the U.S. Government retains certain rights in this software. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// 3. Neither the name of the Corporation nor the names of the -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY -// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL SANDIA CORPORATION OR THE -// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Questions Contact H. Carter Edwards (hcedwar@sandia.gov) -// -// ************************************************************************ -//@HEADER -*/ - -// EXERCISE 3 Goal: -// Add custom Spaces, Layouts to Views -// Add custom RangePolicy to Kokkos::parallel_*** calls -// Experiement by changing the Layouts and Spaces, then test the effect of performance - - -#include "mtk_kokkos.h" - -void example_03(int N, int M, int nrepeat) { - - // EXERCISE give-away: choose an Execution Space - // typedef Kokkos::Serial ExecSpace ; - // typedef Kokkos::Threads ExecSpace ; - // typedef Kokkos::OpenMP ExecSpace ; - // typedef Kokkos::Cuda ExecSpace ; - - //EXERCISE: Choose device memory space - // typedef Kokkos::HostSpace MemSpace; - // typedef Kokkos::OpenMP MemSpace; - // typedef Kokkos::CudaSpace MemSpace; - // typedef Kokkos::CudaUVMSpace MemSpace; - - // EXERCISE give-away: choose a Layout - // EXERCISE: When exercise is correctly implemented then - // either layout will generate the correct answer. - // However, performance will be different! - - // typedef Kokkos::LayoutLeft Layout ; - // typedef Kokkos::LayoutRight Layout ; - - // EXERCISE give-away: RangePolicy - // typedef Kokkos::RangePolicy range_policy ; - - // Allocate y, x vectors and Matrix A: - // Device - // EXERCISE: use MemSpace and Layout - typedef Kokkos::View ViewVectorType; - typedef Kokkos::View ViewMatrixType; - ViewVectorType devy("devy", N); - ViewVectorType devx("devx", M); - ViewMatrixType devA("devA", N, M); - - //Host mirror - ViewVectorType::HostMirror y = Kokkos::create_mirror_view(devy); - ViewVectorType::HostMirror x = Kokkos::create_mirror_view(devx); - ViewMatrixType::HostMirror A = Kokkos::create_mirror_view(devA); - - // Initialize y vector on host - for (int i = 0; i < N; ++i) { - y( i ) = 1; - } - - // Initialize x vector on host - for (int i = 0; i < M; ++i) { - x( i ) = 1; - } - - // Initialize A matrix, note 2D indexing computation on host - for (int j = 0; j < N; ++j) { - for ( int i = 0 ; i < M ; ++i ) { - A( j , i ) = 1; - } - } - - //Deep copy host view to device views - Kokkos::deep_copy(devy, y); - Kokkos::deep_copy(devx, x); - Kokkos::deep_copy(devA, A); - - // Timer products - struct timeval begin,end; - - gettimeofday(&begin,NULL); - - for ( int repeat = 0; repeat < nrepeat; repeat++) { - - //Application: = y^T*A*x - // EXERCISE: Use Kokkos::RangePolicy to execute parallel_reduce - // in the correct space. - double result = 0; - Kokkos::parallel_reduce( N, KOKKOS_LAMBDA ( int j, double &update ) { - double temp2 = 0; - for ( int i = 0 ; i < M ; ++i ) { - temp2 += devA( j , i ) * devx( i ); - } - update += devy( j ) * temp2; - }, result ); - - //Output result - if ( repeat == (nrepeat - 1) ) - printf(" Computed result for %d x %d is %lf\n", N, M, result); - const double solution = (double)N *(double)M; - - if ( result != solution ) { - printf(" Error: result( %lf ) != solution( %lf )\n",result,solution); - } - } - - gettimeofday(&end,NULL); - - // Calculate time - double time = 1.0*(end.tv_sec-begin.tv_sec) + - 1.0e-6*(end.tv_usec-begin.tv_usec); - - // Calculate bandwidth. - // Each matrix A row (each of length M) is read once. - // The x vector (of length M) is read N times. - // The y vector (of length N) is read once. - // double Gbytes = 1.0e-9 * double(sizeof(double) * ( 2 * M * N + N )); - double Gbytes = 1.0e-9 * double(sizeof(double) * ( M + M * N + N )) ; - - // Print results (problem size, time and bandwidth in GB/s) - printf(" M( %d ) N( %d ) nrepeat ( %d ) problem( %g MB ) time( %g s ) bandwidth( %g GB/s )\n", - M , N, nrepeat, Gbytes * 1000, time, Gbytes * nrepeat / time ); - -} - - -TEST_F(MTK_Kokkos, TUTORIAL_03) { - int N = std::pow(2, 12); - int M = std::pow(2, 10); - int nrepeat = 100; - example_03(N, M, nrepeat); -} diff --git a/packages/stk/stk_learning/Kokkos/KokkosTutorial04.C b/packages/stk/stk_learning/Kokkos/KokkosTutorial04.C deleted file mode 100644 index 2f6d5b28ce3f..000000000000 --- a/packages/stk/stk_learning/Kokkos/KokkosTutorial04.C +++ /dev/null @@ -1,173 +0,0 @@ -/* -//@HEADER -// ************************************************************************ -// -// Kokkos v. 2.0 -// Copyright (2014) Sandia Corporation -// -// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation, -// the U.S. Government retains certain rights in this software. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// 3. Neither the name of the Corporation nor the names of the -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY -// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL SANDIA CORPORATION OR THE -// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Questions Contact H. Carter Edwards (hcedwar@sandia.gov) -// -// ************************************************************************ -//@HEADER -*/ - -// EXERCISE 4 Goal: -// Convert to team parallelism using team policy within the nested loops - -#include "mtk_kokkos.h" - -void example_04(int N, int M, int nrepeat) { - - // typedef Kokkos::Threads ExecSpace ; - -#ifdef KOKKOS_ENABLE_OPENMP - typedef Kokkos::OpenMP ExecSpace ; -#elif defined(KOKKOS_ENABLE_CUDA) - typedef Kokkos::Cuda ExecSpace ; -#else - typedef Kokkos::Serial ExecSpace ; -#endif - -#ifdef KOKKOS_ENABLE_OPENMP - typedef Kokkos::OpenMP MemSpace; -#elif defined(KOKKOS_ENABLE_CUDA) - typedef Kokkos::CudaSpace MemSpace; -#else - typedef Kokkos::HostSpace MemSpace; -#endif - - // typedef Kokkos::CudaUVMSpace MemSpace; - - typedef Kokkos::LayoutLeft Layout ; - // typedef Kokkos::LayoutRight Layout ; - - typedef Kokkos::RangePolicy range_policy ; - - // Allocate y, x vectors and Matrix A: - // Device - typedef Kokkos::View ViewVectorType; - typedef Kokkos::View ViewMatrixType; - ViewVectorType devy("devy", N); - ViewVectorType devx("devx", M); - ViewMatrixType devA("devA", N, M); - - //Host mirror - ViewVectorType::HostMirror y = Kokkos::create_mirror_view(devy); - ViewVectorType::HostMirror x = Kokkos::create_mirror_view(devx); - ViewMatrixType::HostMirror A = Kokkos::create_mirror_view(devA); - - // Initialize y vector on host - for (int i = 0; i < N; ++i) { - y( i ) = 1; - } - - // Initialize x vector on host - for (int i = 0; i < M; ++i) { - x( i ) = 1; - } - - // Initialize A matrix, note 2D indexing computation on host - for (int j = 0; j < N; ++j) { - for ( int i = 0 ; i < M ; ++i ) { - A( j , i ) = 1; - } - } - - //Deep copy host view to device views - Kokkos::deep_copy(devy, y); - Kokkos::deep_copy(devx, x); - Kokkos::deep_copy(devA, A); - - // EXERCISE: Use hierarchical parallel execution policy to initialize - // EXERCISE hints: - // typedef Kokkos::TeamPolicy team_policy ; - // typedef Kokkos::TeamPolicy::member_type member_type ; - - // Timer products - struct timeval begin,end; - - gettimeofday(&begin,NULL); - - for ( int repeat = 0; repeat < nrepeat; repeat++) { - - //Application: = y^T*A*x - // EXERCISE: Convert from range_policy to team_policy - double result = 0; - // Kokkos::parallel_reduce( range_policy( 0, N ), KOKKOS_LAMBDA ( int j, double &update ) { - Kokkos::parallel_reduce( range_policy( 0, N ), KOKKOS_LAMBDA ( int j, double &update ) { - // EXERCISE: Convert to nested Kokkos::parallel_reduce - // EXERCISE hint: Kokkos::TeamThreadRange( ??? ) and [&] - double temp2 = 0; - for ( int i = 0 ; i < M ; ++i ) { - temp2 += devA( j , i ) * devx( i ); - } - // EXERCISE: Only one team member update the result - update += devy( j ) * temp2; - }, result ); - - //Output result - if ( repeat == (nrepeat - 1) ) - printf(" Computed result for %d x %d is %lf\n", N, M, result); - const double solution = (double)N *(double)M; - - if ( result != solution ) { - printf(" Error: result( %lf ) != solution( %lf )\n",result,solution); - } - } - - gettimeofday(&end,NULL); - - // Calculate time - double time = 1.0*(end.tv_sec-begin.tv_sec) + - 1.0e-6*(end.tv_usec-begin.tv_usec); - - // Calculate bandwidth. - // Each matrix A row (each of length M) is read once. - // The x vector (of length M) is read N times. - // The y vector (of length N) is read once. - // double Gbytes = 1.0e-9 * double(sizeof(double) * ( 2 * M * N + N )); - double Gbytes = 1.0e-9 * double(sizeof(double) * ( M + M * N + N )) ; - - // Print results (problem size, time and bandwidth in GB/s) - printf(" M( %d ) N( %d ) nrepeat ( %d ) problem( %g MB ) time( %g s ) bandwidth( %g GB/s )\n", - M , N, nrepeat, Gbytes * 1000, time, Gbytes * nrepeat / time ); - -} - - -TEST_F(MTK_Kokkos, TUTORIAL_04) { - int N = std::pow(2, 12); - int M = std::pow(2, 10); - int nrepeat = 100; - example_04(N, M, nrepeat); -} diff --git a/packages/stk/stk_learning/Kokkos/KokkosViewAllocOnDevice.C b/packages/stk/stk_learning/Kokkos/KokkosViewAllocOnDevice.C deleted file mode 100644 index e91682c98f3c..000000000000 --- a/packages/stk/stk_learning/Kokkos/KokkosViewAllocOnDevice.C +++ /dev/null @@ -1,90 +0,0 @@ -#include -#include -#include -#include - -#ifdef KOKKOS_ENABLE_CUDA - typedef Kokkos::Cuda Device; - typedef Kokkos::CudaSpace MemSpace; -#else - typedef Kokkos::Serial Device; - typedef Kokkos::HostSpace MemSpace; -#endif - -typedef Kokkos::View EntitiesViewType; -typedef Kokkos::View UnmanagedEntitiesViewType; - -struct Bucket { - UnmanagedEntitiesViewType entities; - EntitiesViewType::HostMirror hostEntities; -}; - -typedef Kokkos::View BucketsViewType; - -struct Mesh { - BucketsViewType buckets; - BucketsViewType::HostMirror hostBuckets; - - Mesh(size_t totalSize, size_t sizePerAlloc, size_t entitiesPerBucket) - : pool(ngp::ExecSpace::memory_space(), totalSize, sizePerAlloc, sizePerAlloc), - bytesPerAlloc(sizePerAlloc), - numEntitiesPerBucket(entitiesPerBucket) - { - } - - KOKKOS_FUNCTION - void operator()(const int& bucketIndex) const { - buckets(bucketIndex).entities = UnmanagedEntitiesViewType(static_cast(pool.allocate(bytesPerAlloc)), numEntitiesPerBucket); - for(size_t j=0; j pool; - size_t bytesPerAlloc; - size_t numEntitiesPerBucket; -}; - -void kokkos_view_allocate_on_device() { - - const size_t numBuckets = 5; - const size_t numEntitiesPerBucket = 8; - const size_t totalSize = numBuckets * numEntitiesPerBucket*sizeof(double); - const size_t bytesPerAlloc = numEntitiesPerBucket*sizeof(double); - - Mesh mesh(totalSize, bytesPerAlloc, numEntitiesPerBucket); - - mesh.fill_buckets(numBuckets); - - //now confirm that the device data came back to the host - for(size_t bucketIndex=0; bucketIndex -#include "mtk_kokkos.h" - -void mpi_device(int M, MPI_Comm comm) { - int numProcs = stk::parallel_machine_size(comm); - int localProc = stk::parallel_machine_rank(comm); - - if (numProcs != 2) { - if (localProc == 0) { - std::cout<<"This test only runs on 2 mpi procs." < ViewVectorType; - ViewVectorType devx("devx", M); - - //Host mirror - ViewVectorType::HostMirror x = Kokkos::create_mirror_view(devx); - - // Initialize x vector on host - for (int i = 0; i < M; ++i) { - x( i ) = 11.0 + 5*localProc; - } - - //Deep copy host view to device view - Kokkos::deep_copy(devx, x); - - if (localProc == 0) { - EXPECT_NEAR(11.0, x(0), 1.e-6); - EXPECT_NEAR(11.0, x(M-1), 1.e-6); - } - else { - EXPECT_NEAR(16.0, x(0), 1.e-6); - EXPECT_NEAR(16.0, x(M-1), 1.e-6); - } - - MPI_Status status; - - int mpi_tag = 32767; - - if (localProc == 0) { - MPI_Send(devx.data(), devx.size(), MPI_DOUBLE, 1, mpi_tag, comm); - } - else { - MPI_Recv(devx.data(), devx.size(), MPI_DOUBLE, 0, mpi_tag, comm, &status); - } - - //Deep copy device view to host - Kokkos::deep_copy(x, devx); - - EXPECT_NEAR(11.0, x(0), 1.e-6); - EXPECT_NEAR(11.0, x(M-1), 1.e-6); -} - -TEST(MPI_DeviceMemory, sendrecv) { - int M = 20; - mpi_device(M, MPI_COMM_WORLD); -} - diff --git a/packages/stk/stk_learning/Kokkos/mtk_kokkos.h b/packages/stk/stk_learning/Kokkos/mtk_kokkos.h deleted file mode 100644 index a14a86f52f2b..000000000000 --- a/packages/stk/stk_learning/Kokkos/mtk_kokkos.h +++ /dev/null @@ -1,34 +0,0 @@ -#ifndef MTK_KOKKOS_H -#define MTK_KOKKOS_H - -#include // for AssertHelper, etc -#include // for operator<< -#include // for basic_ostream::operator<<, etc -#include -#include -#include -#include -#include -#include -#include - -#ifdef KOKKOS_ENABLE_OPENMP -#include -#endif - - -class MTK_Kokkos : public ::testing::Test { - - protected: - - virtual void SetUp() { - std::cout << "MTK_Kokkos: Setting up fixture." << std::endl; - } - - virtual void TearDown() { - - } - -}; - -#endif diff --git a/packages/stk/stk_learning/Kokkos/testKokkosEncapsulation.C b/packages/stk/stk_learning/Kokkos/testKokkosEncapsulation.C deleted file mode 100644 index 2f7205e0f03e..000000000000 --- a/packages/stk/stk_learning/Kokkos/testKokkosEncapsulation.C +++ /dev/null @@ -1,256 +0,0 @@ -// Copyright 2002 - 2008, 2010, 2011 National Technology Engineering -// Solutions of Sandia, LLC (NTESS). Under the terms of Contract -// DE-NA0003525 with NTESS, the U.S. Government retains certain rights -// in this software. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// -// * Neither the name of NTESS nor the names of its contributors -// may be used to endorse or promote products derived from this -// software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// - -#include -#include -#include - -#include -#include - -#include "mtk_kokkos.h" - -#include - -namespace stk -{ - -#define STK_LAMBDA KOKKOS_LAMBDA -#define STK_INLINE KOKKOS_INLINE_FUNCTION - -#ifdef KOKKOS_ENABLE_CUDA -using DeviceSpace = Kokkos::CudaSpace; -#else -using DeviceSpace = Kokkos::HostSpace; -#endif - -class NgpVector -{ -public: - NgpVector(size_t size) : - vector("NgpVector", size), - hostVector(Kokkos::create_mirror_view(vector)) - { - } - NgpVector(size_t size, double initialValue) : - NgpVector(size) - { - Kokkos::deep_copy(vector, initialValue); - } - - STK_INLINE double & device_get(size_t i) const - { - return vector(i); - } - double & host_get(size_t i) const - { - return hostVector(i); - } - void copy_device_to_host() - { - Kokkos::deep_copy(hostVector, vector); - } -private: - typedef Kokkos::View KokkosVector; - KokkosVector vector; - KokkosVector::HostMirror hostVector; -}; - -class NgpMatrix -{ -public: - NgpMatrix(size_t numRows, size_t numCols) : - matrix("NgpMatrix", numRows, numCols), - hostMatrix(Kokkos::create_mirror_view(matrix)) - { - } - NgpMatrix(size_t numRows, size_t numCols, double initialValue) : - NgpMatrix(numRows, numCols) - { - Kokkos::deep_copy(matrix, initialValue); - } - - STK_INLINE double & device_get(size_t row, size_t col) const - { - return matrix(row, col); - } - double & host_get(size_t row, size_t col) const - { - return hostMatrix(row, col); - } - - STK_INLINE size_t num_rows() const - { - return matrix.extent(0); - } - STK_INLINE size_t num_cols() const - { - return matrix.extent(1); - } - - void copy_device_to_host() - { - Kokkos::deep_copy(hostMatrix, matrix); - } -private: - typedef Kokkos::View KokkosMatrix; - KokkosMatrix matrix; - KokkosMatrix::HostMirror hostMatrix; -}; - -template -void parallel_for(size_t n, const FUNCTOR &functor) -{ - Kokkos::parallel_for(n, functor); -} -template -void parallel_reduce(size_t n, const FUNCTOR &functor, VAL_TYPE &sum) -{ - Kokkos::parallel_reduce(n, functor, sum); -} - -} //namespace stk - - -namespace NgpMatrixComputations -{ - void initialize_matrix_to_row_values(stk::NgpMatrix matrix) - { - stk::parallel_for(matrix.num_rows(), - STK_LAMBDA(size_t row) - { - const size_t numCols = matrix.num_cols(); - for(size_t col=0; col hostVec("hostVec", sizeOfVector); - for(size_t i=0; i vec("vec", sizeOfVector); - Kokkos::deep_copy(vec, hostVec); - - Kokkos::View::HostMirror hostMirrorVector = Kokkos::create_mirror_view(vec); - Kokkos::deep_copy(hostMirrorVector, vec); - for(size_t i=0; i - -namespace stk { namespace util { - -inline -void calculate_max_ave_and_imbalance(const std::vector &allTimes, int &procWithMaxTime, float &maxTime, float &averageTime, float &imbalance) -{ - for(size_t i = 0; i < allTimes.size(); ++i) - { - averageTime += allTimes[i]; - if(maxTime < allTimes[i]) - { - maxTime = allTimes[i]; - procWithMaxTime = i; - } - } - - averageTime /= allTimes.size(); - imbalance = maxTime/averageTime; -} - -struct ImbalanceTimings -{ - ImbalanceTimings(MPI_Comm communicator, float time) - : myProc(-1), imbalance(0), averageTime(0), maxTime(0), procWithMaxTime(-1) - { - int numProcs = 0; - MPI_Comm_size(communicator, &numProcs); - MPI_Comm_rank(communicator, &myProc); - - allTimes.resize(numProcs, 0); - - MPI_Allgather(&time, 1, MPI_FLOAT, allTimes.data(), 1, MPI_FLOAT, communicator); - - calculate_max_ave_and_imbalance(allTimes, procWithMaxTime, maxTime, averageTime, imbalance); - } - - float get_imbalance() const { return imbalance; } - int get_proc_with_max_time() const { return procWithMaxTime; } - float get_max_time() const { return maxTime; } - float get_average_time() const { return averageTime; } - - void print_table_timings(std::ostream& os) const - { - if (myProc == 0) - { - std::ostringstream out; - out << "imbalance: " << imbalance << std::endl; - out << "Proc\tTime" << std::endl; - for(size_t i=0;i allTimes; -}; - -template -ImbalanceTimings measure_imbalance(MPI_Comm communicator, FUNCTION do_work) -{ - enum {CHILDMASK1 = 1}; - stk::diag::TimerSet enabledTimerSet(CHILDMASK1); - stk::diag::Timer rootTimer = createRootTimer("totalTestRuntime", enabledTimerSet); - rootTimer.start(); - stk::diag::Timer childTimer1("childTimer1", CHILDMASK1, rootTimer); - - { - stk::diag::TimeBlockSynchronized timerStartSynchronizedAcrossProcessors(childTimer1, communicator); - do_work(); - } - - float time = childTimer1.getMetric().getAccumulatedLap(false); - ImbalanceTimings timings(communicator, time); - stk::diag::deleteRootTimer(rootTimer); - - return timings; -} - -}} - -#endif /* IMBALANCETIMER_HPP_ */ diff --git a/packages/stk/stk_learning/LoadImbalanceTimer/UnitTestLoadImbalance.cpp b/packages/stk/stk_learning/LoadImbalanceTimer/UnitTestLoadImbalance.cpp deleted file mode 100644 index 0a70311a326e..000000000000 --- a/packages/stk/stk_learning/LoadImbalanceTimer/UnitTestLoadImbalance.cpp +++ /dev/null @@ -1,80 +0,0 @@ -#include - -#include "mpi.h" -#include -#include -#include -#include "ImbalanceTimer.hpp" - -const float workTimeProc0 = 5; -const float workTimeProcOthers = 1; - -void send_data_to_other_procs(const std::vector& data, stk::CommSparse& comm) -{ - int myprocId = comm.parallel_rank(); - for(int i=0;i dataSent(numDoubles,1); - std::vector > dataRecvd(comm.parallel_size()); - stk::pack_and_communicate(comm, [&comm, &dataSent]() { send_data_to_other_procs(dataSent, comm); }); - stk::unpack_communications(comm, - [&comm, &dataRecvd](int procId) - { - stk::unpack_vector_from_proc(comm, dataRecvd[procId], procId); - }); -} - - -TEST(LoadImbalanceTimer, unevenWork_imbalanceIsMeasured) -{ - int procId = 0; - MPI_Comm_rank(MPI_COMM_WORLD, &procId); - - size_t numDoubles = stk::unit_test_util::get_command_line_option("-n", 1000u); - - stk::util::ImbalanceTimings imbalanceTimings = stk::util::measure_imbalance(MPI_COMM_WORLD, [=](){ - do_sleep(procId, numDoubles); - }); - - int num_procs = 0; - MPI_Comm_size(MPI_COMM_WORLD, &num_procs); - std::vector timingsGold(num_procs, workTimeProcOthers); - timingsGold[0] = workTimeProc0; - - int goldProcWithMaxTime = -1; - float goldMaxTime = 0, goldAverageTime = 0, goldImbalance = 0; - stk::util::calculate_max_ave_and_imbalance(timingsGold, goldProcWithMaxTime, goldMaxTime, goldAverageTime, goldImbalance); - - - EXPECT_NEAR(goldImbalance, imbalanceTimings.get_imbalance(), 0.1); - EXPECT_NEAR(goldMaxTime, imbalanceTimings.get_max_time(), 0.1); - EXPECT_EQ(goldProcWithMaxTime, imbalanceTimings.get_proc_with_max_time()); - EXPECT_NEAR(goldAverageTime, imbalanceTimings.get_average_time(), 0.1); - - if(procId == 0) - imbalanceTimings.print_table_timings(std::cerr); -} - diff --git a/packages/stk/stk_learning/MeshBuilder/CoordinateSets.hpp b/packages/stk/stk_learning/MeshBuilder/CoordinateSets.hpp deleted file mode 100644 index 1d8ea127de1c..000000000000 --- a/packages/stk/stk_learning/MeshBuilder/CoordinateSets.hpp +++ /dev/null @@ -1,113 +0,0 @@ -// Copyright 2002 - 2008, 2010, 2011 National Technology Engineering -// Solutions of Sandia, LLC (NTESS). Under the terms of Contract -// DE-NA0003525 with NTESS, the U.S. Government retains certain rights -// in this software. -// - // Redistribution and use in source and binary forms, with or without - // modification, are permitted provided that the following conditions are - // met: - // - // * Redistributions of source code must retain the above copyright - // notice, this list of conditions and the following disclaimer. - // - // * Redistributions in binary form must reproduce the above - // copyright notice, this list of conditions and the following - // disclaimer in the documentation and/or other materials provided - // with the distribution. - // -// * Neither the name of NTESS nor the names of its contributors -// may be used to endorse or promote products derived from this -// software without specific prior written permission. -// - // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - // "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - // A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -#ifndef COORDINATESETS_H -#define COORDINATESETS_H - -#include - -inline stk::mesh::EntityId generate_two_dim_elem_id(unsigned x, unsigned y) -//returns a unique result for each coordinate in positive 2D space -{ - return (x*x + 2*x*y - 3*x + y*y - y + 2)/2; -} - -inline stk::mesh::EntityId generate_three_dim_elem_id(unsigned x, unsigned y, unsigned z) -//returns a unique result for each coordinate in positive 3D space -{ - return (x*x*x + 3*x*x*y + 3*x*x*z - 6*x*x + 3*x*y*y + 6*x*y*z - 12*x*y + 3*x*z*z - 6*x*z + - 5*x + y*y*y + 3*y*y*z - 6*y*y + 3*y*z*z - 6*y*z + 11*y + z*z*z - 3*z*z + 2*z)/6; -} - -struct ElemCoordPair -{ - ElemCoordPair(unsigned xCoord, unsigned yCoord) - { - x = xCoord; - y = yCoord; - generate_element_id(); - generate_node_ids(); - } - unsigned x; - unsigned y; - stk::mesh::EntityId elemId; - stk::mesh::EntityIdVector nodeIds; -private: - void generate_element_id() - { - elemId = generate_two_dim_elem_id(x, y); - } - void generate_node_ids() - { - nodeIds.resize(4); - unsigned XYOffset = x + y; - nodeIds = {elemId, elemId+ XYOffset-1, elemId+ 2*XYOffset, elemId+XYOffset}; - } -}; - -struct ElemCoordTriple -{ - ElemCoordTriple(unsigned xCoord, unsigned yCoord, unsigned zCoord) - { - x = xCoord; - y = yCoord; - z = zCoord; - generate_element_id(); - generate_node_ids(); - } - unsigned x; - unsigned y; - unsigned z; - stk::mesh::EntityId elemId; - stk::mesh::EntityIdVector nodeIds; -private: - void generate_element_id() - { - elemId = generate_three_dim_elem_id(x, y, z); - } - void generate_node_ids() - { - nodeIds.resize(8); - stk::mesh::EntityId one = elemId; - stk::mesh::EntityId two = generate_three_dim_elem_id(x+1, y, z); - stk::mesh::EntityId three = generate_three_dim_elem_id(x+1, y+1, z); - stk::mesh::EntityId four = generate_three_dim_elem_id(x, y+1, z); - stk::mesh::EntityId five = generate_three_dim_elem_id(x, y, z+1); - stk::mesh::EntityId six = generate_three_dim_elem_id(x+1, y, z+1); - stk::mesh::EntityId seven = generate_three_dim_elem_id(x+1, y+1, z+1); - stk::mesh::EntityId eight = generate_three_dim_elem_id(x, y+1, z+1); - nodeIds = {one, two, three, four, five, six, seven, eight}; - } -}; - -#endif // COORDINATESETS_H diff --git a/packages/stk/stk_learning/MeshBuilder/MeshBuilder.cpp b/packages/stk/stk_learning/MeshBuilder/MeshBuilder.cpp deleted file mode 100644 index eeaca7b3ce1f..000000000000 --- a/packages/stk/stk_learning/MeshBuilder/MeshBuilder.cpp +++ /dev/null @@ -1,402 +0,0 @@ -/* - * MeshBuilder.cpp - * - * Created on: Aug 17, 2015 - * Author: jonchu - */ -#include "MeshBuilder.hpp" -#include "MeshBuilder/CoordinateSets.hpp" -#include "mpi.h" // for ompi_communicator_t -#include "stk_io/DatabasePurpose.hpp" -#include "stk_io/IossBridge.hpp" // for put_io_part_attribute -#include "stk_io/StkMeshIoBroker.hpp" // for StkMeshIoBroker -#include "stk_mesh/base/BulkData.hpp" // for BulkData, etc -#include "stk_mesh/base/BulkDataInlinedMethods.hpp" -#include "stk_mesh/base/CoordinateSystems.hpp" // for Cartesian2d, etc -#include "stk_mesh/base/FEMHelpers.hpp" // for declare_element -#include "stk_mesh/base/Field.hpp" // for Field -#include "stk_mesh/base/FieldBase.hpp" // for field_data -#include "stk_mesh/base/GetEntities.hpp" // for get_entities -#include "stk_mesh/base/MetaData.hpp" // for MetaData, put_field -#include "stk_topology/topology.hpp" // for topology, etc -#include "stk_util/util/ReportHandler.hpp" // for ThrowRequire -#include // for size_t -#include // for allocator, vector - -// change for meshing big things -const double zOffset = 1; - -MeshBuilder::MeshBuilder(stk::ParallelMachine comm, std::string name, stk::topology::topology_t - elemType, int spacialDim) -:m_metaData(spacialDim), m_bulkData(m_metaData, comm, stk::mesh::BulkData::NO_AUTO_AURA), - m_spacialDim(spacialDim), m_numProcs(stk::parallel_machine_size(comm)), - m_procRank(stk::parallel_machine_rank(comm)), m_name(name), m_time(0) -{ - m_elemPart = &m_metaData.declare_part_with_topology("Elem Part", elemType); - stk::io::put_io_part_attribute(m_metaData.universal_part()); - stk::io::put_io_part_attribute(*m_elemPart); -} -void MeshBuilder::commit_meta() -{ - m_metaData.commit(); -} -void MeshBuilder::begin_modification() -{ - m_bulkData.modification_begin(); -} -void MeshBuilder::end_modification() -{ - m_bulkData.modification_end(); -} -void MeshBuilder::write_mesh() -{ - std::string timeStep = std::to_string(m_time); - while (timeStep.size() < 8) - timeStep = "0" + timeStep; - - stk::io::StkMeshIoBroker stkIo(m_bulkData.parallel()); - stkIo.set_bulk_data(m_bulkData); - size_t fh = stkIo.create_output_mesh(m_name + timeStep + ".e", stk::io::WRITE_RESULTS); - stkIo.write_output_mesh(fh); - - stkIo.begin_output_step(fh, m_time++); - stkIo.end_output_step(fh); -} - -//GoL!!! -void MeshBuilder::create_life_and_neighbor_fields(ScalarIntField*& lifeField, - ScalarIntField*& neighborField) -{ - ThrowRequire(!m_metaData.is_commit()); - - lifeField = &m_metaData.declare_field( - stk::topology::ELEM_RANK, "lifeField"); - neighborField = &m_metaData.declare_field( - stk::topology::ELEM_RANK, "neighborField"); - int val = 0; - stk::mesh::put_field_on_mesh(*lifeField, m_metaData.universal_part(), &val); - stk::mesh::put_field_on_mesh(*neighborField, m_metaData.universal_part(), &val); -} - -//test -unsigned MeshBuilder::num_elems() const -{ - stk::mesh::EntityVector elements; - stk::mesh::get_entities(m_bulkData, stk::topology::ELEM_RANK, elements); - return elements.size(); -} - -//protected -stk::mesh::Entity MeshBuilder::create_element(stk::mesh::EntityId elemId, - const stk::mesh::EntityIdVector& nodeIds, - int chosenProc) -{ - ThrowRequire(chosenProc < num_procs()); - stk::mesh::Entity elem = stk::mesh::Entity(); - - if (elem_id_not_used(elemId)) - { - if (m_procRank == chosenProc) - elem = generate_element(elemId, nodeIds); - else - share_shared_nodes(nodeIds, chosenProc); - } - - m_usedElemIds.insert(elemId); - return elem; -} -void MeshBuilder::remove_element(stk::mesh::EntityId elemId) -{ - stk::mesh::Entity elem = m_bulkData.get_entity(stk::topology::ELEM_RANK, elemId); - if (m_bulkData.is_valid(elem)) - m_bulkData.destroy_entity(elem); -} - -//private -void MeshBuilder::update_node_to_processor_map(const stk::mesh::EntityIdVector& nodeIds, int proc) -{ - for (const stk::mesh::EntityId nodeId : nodeIds) - m_nodeIdToSharingProcs[nodeId].insert(proc); -} -stk::mesh::Entity MeshBuilder::generate_element(stk::mesh::EntityId elemId, - const stk::mesh::EntityIdVector& nodeIds) -{ - stk::mesh::Entity elem = stk::mesh::Entity(); - elem = declare_element(m_bulkData, *m_elemPart, elemId, nodeIds); - share_nodes(nodeIds); - return elem; -} -bool MeshBuilder::elem_id_not_used(stk::mesh::EntityId elemId) -{ - std::unordered_set::iterator idIter = - m_usedElemIds.find(elemId); - return (m_usedElemIds.end() == idIter); -} -void MeshBuilder::share_nodes(const stk::mesh::EntityIdVector& nodeIds) -{ - for (stk::mesh::EntityId nodeId : nodeIds) - { - stk::mesh::Entity node = m_bulkData.get_entity(stk::topology::NODE_RANK, nodeId); - for (int procNum : m_nodeIdToSharingProcs[nodeId]) - m_bulkData.add_node_sharing(node, procNum); - } -} -void MeshBuilder::share_shared_nodes(const stk::mesh::EntityIdVector& nodeIds, int chosenProc) -{ - update_node_to_processor_map(nodeIds, chosenProc); - for (stk::mesh::EntityId nodeId : nodeIds) - { - stk::mesh::Entity node = m_bulkData.get_entity(stk::topology::NODE_RANK, nodeId); - if (m_bulkData.is_valid(node)) - m_bulkData.add_node_sharing(node, chosenProc); - } -} - -//Quad mesh Builder -//public -QuadMeshBuilder::QuadMeshBuilder(stk::ParallelMachine comm, std::string name) -:MeshBuilder(comm, name, stk::topology::QUAD_4, 2) -{ - declare_coordinates(); -} -void QuadMeshBuilder::create_element(unsigned xCoord, unsigned yCoord, int chosenProc) -{ - ElemCoordPair elemCoord(xCoord, yCoord); - stk::mesh::Entity elem = MeshBuilder::create_element(elemCoord.elemId, - elemCoord.nodeIds, chosenProc); - if (stk::mesh::Entity() != elem) - label_node_coordinates(elemCoord); -} -void QuadMeshBuilder::fill_area(unsigned xLower, unsigned xUpper, unsigned yLower, unsigned yUpper) -{ - std::vector layersPerProc; - int layersCreated = yUpper-yLower + 1; - unsigned basePerRow = (layersCreated)/num_procs(); - for (int procIndex = 0; procIndex < num_procs(); procIndex++) - layersPerProc.push_back(basePerRow+(layersCreated%num_procs() > procIndex)); - - unsigned bottomLayer = yLower; - for (int procIndex = 0; procIndex < num_procs(); procIndex++) - { - unsigned topLayer = bottomLayer + layersPerProc[procIndex] - 1; - fill_area_on_proc(xLower, xUpper, bottomLayer, topLayer, procIndex); - bottomLayer = topLayer + 1; - } -} -void QuadMeshBuilder::fill_area_randomly(unsigned xLower, unsigned xUpper, - unsigned yLower, unsigned yUpper) -{ - int procCounter = 0; - for (unsigned x = xLower; x <= xUpper; x++) - for (unsigned y = yLower; y <= yUpper; y++) - create_element(x, y, procCounter++%num_procs()); -} -void QuadMeshBuilder::fill_area_on_proc(unsigned xLower, unsigned xUpper, unsigned yLower, - unsigned yUpper, int chosenProc) -{ - for (unsigned x = xLower; x <= xUpper; x++) - for (unsigned y = yLower; y <= yUpper; y++) - create_element(x, y, chosenProc); -} -void QuadMeshBuilder::fill_area_with_layers(unsigned xLower, unsigned xUpper, unsigned yLower, - unsigned yUpper) -{ - int rowCounter = 0; - for (unsigned x = xLower; x <= xUpper; x++) - for (unsigned y = yLower; y <= yUpper; y++) - fill_area_on_proc(xLower, xUpper, y, y, rowCounter++%num_procs()); -} -void QuadMeshBuilder::remove_element(unsigned xCoord, unsigned yCoord) -{ - stk::mesh::EntityId elemId = generate_two_dim_elem_id(xCoord, yCoord); - MeshBuilder::remove_element(elemId); -} -void QuadMeshBuilder::remove_area(unsigned xLower, unsigned xUpper, unsigned yLower, unsigned yUpper) -{ - for (unsigned x = xLower; x <= xUpper; x++) - for (unsigned y = yLower; y <= yUpper; y++) - remove_element(x, y); -} - -//test -double QuadMeshBuilder::node_x_coord(stk::mesh::Entity node) const -{ - double* const coord = stk::mesh::field_data(*m_coordinates, node); - return coord[0]; -} -double QuadMeshBuilder::node_y_coord(stk::mesh::Entity node) const -{ - double* const coord = stk::mesh::field_data(*m_coordinates, node); - return coord[1]; -} - -//private -void QuadMeshBuilder::declare_coordinates() -{ - m_coordinates = &meta_data().declare_field>( - stk::topology::NODE_RANK, "coordinates"); - stk::mesh::put_field_on_mesh(*m_coordinates, meta_data().universal_part(), 2, nullptr); -} -void QuadMeshBuilder::label_node_coordinates(const ElemCoordPair& elemCoords) -{ - for (unsigned nodeIndex = 0; nodeIndex < 4; nodeIndex++) - { - stk::mesh::Entity node = bulk_data().get_entity(stk::topology::NODE_RANK, - elemCoords.nodeIds[nodeIndex]); - if (0 == nodeIndex) - label_coordinates(node, elemCoords.x-1, elemCoords.y-1); - else if (1 == nodeIndex) - label_coordinates(node, elemCoords.x, elemCoords.y-1); - else if (2 == nodeIndex) - label_coordinates(node, elemCoords.x, elemCoords.y); - else if (3 == nodeIndex) - label_coordinates(node, elemCoords.x-1, elemCoords.y); - } -} -void QuadMeshBuilder::label_coordinates(stk::mesh::Entity node, unsigned nodeX, unsigned nodeY) -{ - double* const coord = stk::mesh::field_data(*m_coordinates, node); - coord[0] = nodeX; - coord[1] = nodeY; -} - -//HexMeshBuilder -//public -HexMeshBuilder::HexMeshBuilder(stk::ParallelMachine comm, std::string name) -:MeshBuilder(comm, name, stk::topology::HEX_8, 3) -{ - declare_coordinates(); -} -void HexMeshBuilder::create_element(unsigned xCoord, unsigned yCoord, unsigned zCoord, int chosenProc) -{ - - ElemCoordTriple elemCoord(xCoord, yCoord, zCoord); - stk::mesh::Entity elem = MeshBuilder::create_element(elemCoord.elemId, - elemCoord.nodeIds, chosenProc); - if (stk::mesh::Entity() != elem) - label_node_coordinates(elemCoord); -} -void HexMeshBuilder::fill_area(unsigned xLower, unsigned xUpper, unsigned yLower, unsigned yUpper, - unsigned zLower, unsigned zUpper) -{ - std::vector layersPerProc; - int layersCreated = zUpper-zLower + 1; - unsigned basePerRow = (layersCreated)/num_procs(); - for (int procIndex = 0; procIndex < num_procs(); procIndex++) - layersPerProc.push_back(basePerRow+(layersCreated%num_procs() > procIndex)); - - unsigned bottomLayer = yLower; - for (int procIndex = 0; procIndex < num_procs(); procIndex++) - { - unsigned topLayer = bottomLayer + layersPerProc[procIndex] - 1; - fill_area_on_proc(xLower, xUpper, yLower, yUpper, bottomLayer, topLayer, procIndex); - bottomLayer = topLayer + 1; - } -} -void HexMeshBuilder::fill_area_randomly(unsigned xLower, unsigned xUpper, unsigned yLower, - unsigned yUpper, unsigned zLower, unsigned zUpper) -{ - int currentProc = 0; - for (unsigned x = xLower; x <= xUpper; x++) - for (unsigned y = yLower; y <= yUpper; y++) - for (unsigned z = zLower; z <= zUpper; z++) - create_element(x, y, z, currentProc++%num_procs()); -} -void HexMeshBuilder::fill_area_on_proc(unsigned xLower, unsigned xUpper, unsigned yLower, unsigned - yUpper, unsigned zLower, unsigned zUpper, int chosenProc) -{ - for (unsigned x = xLower; x <= xUpper; x++) - for (unsigned y = yLower; y <= yUpper; y++) - for (unsigned z = zLower; z <= zUpper; z++) - create_element(x, y, z, chosenProc); -} -void HexMeshBuilder::fill_area_with_layers(unsigned xLower, unsigned xUpper, unsigned yLower, - unsigned yUpper, unsigned zLower, unsigned zUpper) -{ - int layerCounter = 0; - for (unsigned z = zLower; z <= zUpper; z++) - fill_area_on_proc(xLower, xUpper, yLower, yUpper, z, z, layerCounter++%num_procs()); - -} -void HexMeshBuilder::remove_element(unsigned xCoord, unsigned yCoord, unsigned zCoord) -{ - stk::mesh::EntityId elemId = generate_three_dim_elem_id(xCoord, yCoord, zCoord); - MeshBuilder::remove_element(elemId); -} -void HexMeshBuilder::remove_area(unsigned xLower, unsigned xUpper, unsigned yLower, unsigned yUpper, - unsigned zLower, unsigned zUpper) -{ - for (unsigned x = xLower; x <= xUpper; x++) - for (unsigned y = yLower; y <= yUpper; y++) - for (unsigned z = zLower; z <= zUpper; z++) - remove_element(x, y, z); -} - -//test function -double HexMeshBuilder::node_x_coord(stk::mesh::Entity node) const -{ - double* const coord = stk::mesh::field_data(*m_coordinates, node); - return coord[0]; -} -double HexMeshBuilder::node_y_coord(stk::mesh::Entity node) const -{ - double* const coord = stk::mesh::field_data(*m_coordinates, node); - return coord[1]; -} -double HexMeshBuilder::node_z_coord(stk::mesh::Entity node) const -{ - double* const coord = stk::mesh::field_data(*m_coordinates, node); - return coord[2]; -} - -//private -void HexMeshBuilder::declare_coordinates() -{ - m_coordinates = &meta_data().declare_field>( - stk::topology::NODE_RANK, "coordinates"); - stk::mesh::put_field_on_mesh(*m_coordinates, meta_data().universal_part(), 3, nullptr); -} -void HexMeshBuilder::label_node_coordinates(const ElemCoordTriple& elemCoords) -{ - for (unsigned nodeIndex = 0; nodeIndex < 8; nodeIndex++) - { - stk::mesh::Entity node = bulk_data().get_entity(stk::topology::NODE_RANK, - elemCoords.nodeIds[nodeIndex]); - switch (nodeIndex) - { - case 0: - label_coordinates(node, elemCoords.x-1, elemCoords.y-1, elemCoords.z-1); - break; - case 1: - label_coordinates(node, elemCoords.x, elemCoords.y-1, elemCoords.z-1); - break; - case 2: - label_coordinates(node, elemCoords.x, elemCoords.y, elemCoords.z-1); - break; - case 3: - label_coordinates(node, elemCoords.x-1, elemCoords.y, elemCoords.z-1); - break; - case 4: - label_coordinates(node, elemCoords.x-1, elemCoords.y-1, elemCoords.z); - break; - case 5: - label_coordinates(node, elemCoords.x, elemCoords.y-1, elemCoords.z); - break; - case 6: - label_coordinates(node, elemCoords.x, elemCoords.y, elemCoords.z); - break; - case 7: - label_coordinates(node, elemCoords.x-1, elemCoords.y, elemCoords.z); - break; - } - } -} - -void HexMeshBuilder::label_coordinates(stk::mesh::Entity node, unsigned nodeX, unsigned nodeY, - unsigned nodeZ) -{ - double* const coord = stk::mesh::field_data(*m_coordinates, node); - coord[0] = nodeX; - coord[1] = nodeY; - coord[2] = nodeZ*zOffset; -} diff --git a/packages/stk/stk_learning/MeshBuilder/MeshBuilder.hpp b/packages/stk/stk_learning/MeshBuilder/MeshBuilder.hpp deleted file mode 100644 index 7aa349a7a6e6..000000000000 --- a/packages/stk/stk_learning/MeshBuilder/MeshBuilder.hpp +++ /dev/null @@ -1,245 +0,0 @@ -// Copyright 2002 - 2008, 2010, 2011 National Technology Engineering -// Solutions of Sandia, LLC (NTESS). Under the terms of Contract -// DE-NA0003525 with NTESS, the U.S. Government retains certain rights -// in this software. -// - // Redistribution and use in source and binary forms, with or without - // modification, are permitted provided that the following conditions are - // met: - // - // * Redistributions of source code must retain the above copyright - // notice, this list of conditions and the following disclaimer. - // - // * Redistributions in binary form must reproduce the above - // copyright notice, this list of conditions and the following - // disclaimer in the documentation and/or other materials provided - // with the distribution. - // -// * Neither the name of NTESS nor the names of its contributors -// may be used to endorse or promote products derived from this -// software without specific prior written permission. -// - // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - // "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - // A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -/* - * MeshBuilder.h - * - * Created on: Aug 17, 2015 - * Author: jonchu - */ - -#ifndef _MESHBUILDER_HPP_ -#define _MESHBUILDER_HPP_ - -#include // for basic_ostream::operator<< -#include // for BulkData -#include // for Field -#include // for MetaData -#include // for topology, etc -#include // for string -#include // for unordered_map -#include // for unordered_set -#include "stk_mesh/base/Entity.hpp" // for Entity -#include "stk_mesh/base/Types.hpp" // for EntityId, EntityIdVector -#include "stk_util/parallel/Parallel.hpp" // for ParallelMachine -namespace stk { namespace mesh { class Part; } } -namespace stk { namespace mesh { struct Cartesian2d; } } -namespace stk { namespace mesh { struct Cartesian3d; } } -struct ElemCoordPair; -struct ElemCoordTriple; - - - - -typedef stk::mesh::Field ScalarIntField; - -class MeshBuilder -{ -public: - MeshBuilder(stk::ParallelMachine comm, std::string name, stk::topology::topology_t m_elemType, - int spacialDim); - - virtual ~MeshBuilder() {} - - //public methods - void commit_meta(); - - void begin_modification(); - - void end_modification(); - - void write_mesh(); - - //gol - void create_life_and_neighbor_fields(ScalarIntField*& lifeField, ScalarIntField*& neighborField); - - //test functions - inline stk::mesh::MetaData& meta_data(); - - inline stk::mesh::BulkData& bulk_data(); - - inline int num_procs() const; - - inline int proc_rank() const; - - inline int spacial_dim() const; - - unsigned num_elems() const; - -protected: - stk::mesh::Entity create_element(stk::mesh::EntityId elemId, - const stk::mesh::EntityIdVector& nodeIds, - int chosenProc); - - void remove_element(stk::mesh::EntityId elemId); - -private: - stk::mesh::MetaData m_metaData; - stk::mesh::BulkData m_bulkData; - const int m_spacialDim; - const int m_numProcs; - const int m_procRank; - - const std::string m_name; - unsigned m_time; - - stk::mesh::Part* m_elemPart; - - std::unordered_map> m_nodeIdToSharingProcs; - - std::unordered_set m_usedElemIds; - - //constructor - virtual void declare_coordinates() = 0; - - //create element - stk::mesh::Entity generate_element(stk::mesh::EntityId elemId, - const stk::mesh::EntityIdVector& nodeIds); - - bool elem_id_not_used(stk::mesh::EntityId elemId); - - void share_nodes(const stk::mesh::EntityIdVector& nodeIds); - - void share_shared_nodes(const stk::mesh::EntityIdVector& nodeIds, int chosenProc); - - void update_node_to_processor_map(const stk::mesh::EntityIdVector& nodeIds, int proc); - -}; - -//accessor -inline stk::mesh::MetaData& MeshBuilder::meta_data() -{ - return m_metaData; -} -inline stk::mesh::BulkData& MeshBuilder::bulk_data() -{ - return m_bulkData; -} -inline int MeshBuilder::num_procs() const -{ - return m_numProcs; -} -inline int MeshBuilder::proc_rank() const -{ - return m_procRank; -} -inline int MeshBuilder::spacial_dim() const -{ - return m_spacialDim; -} - -class QuadMeshBuilder : public MeshBuilder -{ -public: - QuadMeshBuilder(stk::ParallelMachine comm, std::string name); - - virtual ~QuadMeshBuilder() {} - - void create_element(unsigned xCoord, unsigned yCoord, int chosenProc = 0); - - void fill_area(unsigned xLower, unsigned xUpper, unsigned yLower, unsigned yUpper); - - void fill_area_randomly(unsigned xLower, unsigned xUpper, unsigned yLower, unsigned yUpper); - - void fill_area_on_proc(unsigned xLower, unsigned xUpper, unsigned yLower, unsigned yUpper, - int chosenProc); - - void fill_area_with_layers(unsigned xLower, unsigned xUpper, unsigned yLower, unsigned yUpper); - - void remove_element(unsigned xCoord, unsigned yCoord); - - void remove_area(unsigned xLower, unsigned xUpper, unsigned yLower, unsigned yUpper); - - //test functions - double node_x_coord(stk::mesh::Entity node) const; - - double node_y_coord(stk::mesh::Entity node) const; - -private: - stk::mesh::Field* m_coordinates; - - virtual void declare_coordinates(); - - void label_node_coordinates(const ElemCoordPair& elemCoords); - - void label_coordinates(stk::mesh::Entity node, unsigned nodeX, unsigned nodeY); - -}; - -class HexMeshBuilder : public MeshBuilder -{ -public: - HexMeshBuilder(stk::ParallelMachine comm, std::string name); - - virtual ~HexMeshBuilder(){} - - void create_element(unsigned xCoord, unsigned yCoord, unsigned zCoord, int chosenProc = 0); - - void fill_area(unsigned xLower, unsigned xUpper, unsigned yLower, unsigned yUpper, unsigned - zLower, unsigned zUpper); - - void fill_area_randomly(unsigned xLower, unsigned xUpper, unsigned yLower, unsigned yUpper, - unsigned zLower, unsigned zUpper); - - void fill_area_on_proc(unsigned xLower, unsigned xUpper, unsigned yLower, unsigned yUpper, - unsigned zLower, unsigned zUpper, int chosenProc); - - void fill_area_with_layers(unsigned xLower, unsigned xUpper, unsigned yLower, unsigned yUpper, - unsigned zLower, unsigned zUpper); - - void remove_element(unsigned xCoord, unsigned yCoord, unsigned zCoord); - - void remove_area(unsigned xLower, unsigned xUpper, unsigned yLower, unsigned yUpper, unsigned - zLower, unsigned zUpper); - - //test functions - double node_x_coord(stk::mesh::Entity node) const; - - double node_y_coord(stk::mesh::Entity node) const; - - double node_z_coord(stk::mesh::Entity node) const; - -private: - stk::mesh::Field* m_coordinates; - - virtual void declare_coordinates(); - - void label_node_coordinates(const ElemCoordTriple& elemCoords); - - void label_coordinates(stk::mesh::Entity node, unsigned nodeX, unsigned nodeY, unsigned nodeZ); - - -}; - - -#endif /* R_MESHPRINTER_HPP_ */ diff --git a/packages/stk/stk_learning/MeshBuilder/MeshSnake.cpp b/packages/stk/stk_learning/MeshBuilder/MeshSnake.cpp deleted file mode 100644 index b187cd6b5bc5..000000000000 --- a/packages/stk/stk_learning/MeshBuilder/MeshSnake.cpp +++ /dev/null @@ -1,441 +0,0 @@ -#include "MeshSnake.hpp" -#include // for time, NULL -#include -#include // for vector -#include "MeshBuilder/MeshBuilder.hpp" // for MeshBuilder, HexMeshBuilder, etc -#include "stk_util/util/ReportHandler.hpp" // for ThrowRequire - -/* - * MeshSnake - */ -//public -MeshSnake::MeshSnake(MeshBuilder* mesh) -:m_mesh(mesh), m_moveCounter(0), m_moveMax(5) -{ -} -void MeshSnake::begin_snake() -{ - srand(time(NULL)); - get_starting_direction(); - update_move_counter(); -} -void MeshSnake::crawl(unsigned numSteps) -{ - m_mesh->begin_modification(); - for (unsigned stepNum = 0; stepNum < numSteps; stepNum++) - { - m_mesh->write_mesh(); - move(); - std::cout << stepNum << std::endl; - } - m_mesh->end_modification(); -} - -//private -void MeshSnake::update_move_counter() -{ - m_moveMax = rand()%10 + 2; - m_moveCounter = 0; -} -void MeshSnake::move() -{ - if (facing_wall() || time_to_switch_directions()) - { - get_new_direction(); - update_move_counter(); - } - move_one(); - increment_move_counter(); -} -bool MeshSnake::time_to_switch_directions() -{ - return m_moveCounter == m_moveMax; -} -void MeshSnake::increment_move_counter() -{ - m_moveCounter++; -} -/* - * QuadMeshSnake - */ -//public -QuadMeshSnake::QuadMeshSnake(QuadMeshBuilder& mesh) -:MeshSnake(&mesh), m_quadMesh(mesh), m_xLower(1), m_xUpper(1), m_yLower(1), m_yUpper(1), - m_xPos(1), m_yPos(1), m_dir(INVALID_DIR) -{ -} -void QuadMeshSnake::set_x_bounds(unsigned xLower, unsigned xUpper) -{ - m_xLower = xLower; - m_xUpper = xUpper; -} -void QuadMeshSnake::set_y_bounds(unsigned yLower, unsigned yUpper) -{ - m_yLower = yLower; - m_yUpper = yUpper; -} -void QuadMeshSnake::set_x_pos(unsigned x) -{ - if (m_xLower <= x && x <= m_xUpper) - m_xPos = x; -} -void QuadMeshSnake::set_y_pos(unsigned y) -{ - if (m_yLower <= y && y <= m_yUpper) - m_yPos = y; -} - -void QuadMeshSnake::set_pos(unsigned x, unsigned y) -{ - set_x_pos(x); - set_y_pos(y); -} -//private -void QuadMeshSnake::get_starting_direction() -{ - switch(rand()%4) - { - case 0: - m_dir = X_POSITIVE; - break; - case 1: - m_dir = X_NEGATIVE; - break; - case 2: - m_dir = Y_POSITIVE; - break; - case 3: - m_dir = Y_NEGATIVE; - break; - } -} -bool QuadMeshSnake::wall_on_right() -{ - return m_xPos == m_xUpper; -} -bool QuadMeshSnake::wall_on_left() -{ - return m_xPos == m_xLower; -} -bool QuadMeshSnake::wall_on_top() -{ - return m_yPos == m_yUpper; -} -bool QuadMeshSnake::wall_on_bottom() -{ - return m_yPos == m_yLower; -} -bool QuadMeshSnake::facing_wall() -{ - bool result = false; - switch (m_dir) - { - case X_POSITIVE: - result = wall_on_right(); - break; - case X_NEGATIVE: - result = wall_on_left(); - break; - case Y_POSITIVE: - result = wall_on_top(); - break; - case Y_NEGATIVE: - result = wall_on_bottom(); - break; - default: - ThrowRequire(false); - } - return result; -} -void QuadMeshSnake::get_new_direction() -{ - switch (m_dir) - { - case X_POSITIVE: - case X_NEGATIVE: - get_new_y_direction(); - break; - case Y_POSITIVE: - case Y_NEGATIVE: - get_new_x_direction(); - break; - default: - ThrowRequire(false); - } -} -void QuadMeshSnake::get_new_y_direction() -{ - bool top = wall_on_top(); - bool bottom = wall_on_bottom(); - ThrowRequire(!(top && bottom)); - - if (top) - m_dir = Y_NEGATIVE; - else if (bottom) - m_dir = Y_POSITIVE; - else - m_dir = rand()%2 ? Y_NEGATIVE : Y_POSITIVE; - -} -void QuadMeshSnake::get_new_x_direction() -{ - bool right = wall_on_right(); - bool left = wall_on_left(); - ThrowRequire(!(right && left)); - - if (right) - m_dir = X_NEGATIVE; - else if (left) - m_dir = X_POSITIVE; - else - m_dir = rand()%2 ? X_NEGATIVE : X_POSITIVE; - -} -void QuadMeshSnake::move_one() -{ - m_quadMesh.remove_element(m_xPos, m_yPos); - move_forward(); -} -void QuadMeshSnake::move_forward() -{ - switch (m_dir) - { - case X_POSITIVE: - m_xPos++; - break; - case X_NEGATIVE: - m_xPos--; - break; - case Y_POSITIVE: - m_yPos++; - break; - case Y_NEGATIVE: - m_yPos--; - break; - default: - ThrowRequire(false); - } -} - -/* - * HexMeshSnake (yaaay) - */ -HexMeshSnake::HexMeshSnake(HexMeshBuilder& mesh) -:MeshSnake(&mesh), m_hexMesh(mesh), m_xLower(1), m_xUpper(1), m_yLower(1), m_yUpper(1), -m_zLower(1), m_zUpper(1), m_xPos(1), m_yPos(1), m_zPos(1), m_dir(INVALID_DIR) -{ - -} -void HexMeshSnake::set_x_bounds(unsigned xLower, unsigned xUpper) -{ - m_xLower = xLower; - m_xUpper= xUpper; -} -void HexMeshSnake::set_y_bounds(unsigned yLower, unsigned yUpper) -{ - m_yLower = yLower; - m_yUpper= yUpper; -} -void HexMeshSnake::set_z_bounds(unsigned zLower, unsigned zUpper) -{ - m_zLower = zLower; - m_zUpper = zUpper; -} -void HexMeshSnake::set_x_pos(unsigned x) -{ - if (m_xLower <= x && x <= m_xUpper) - m_xPos = x; -} -void HexMeshSnake::set_y_pos(unsigned y) -{ - if (m_yLower <= y && y <= m_yUpper) - m_yPos = y; -} -void HexMeshSnake::set_z_pos(unsigned z) -{ - if (m_zLower <= z && z <= m_zUpper) - m_zPos = z; -} -void HexMeshSnake::set_pos(unsigned x, unsigned y, unsigned z) -{ - set_x_pos(x); - set_y_pos(y); - set_z_pos(z); -} -//private -void HexMeshSnake::get_starting_direction() -{ - switch(rand()%6) - { - case 0: - m_dir = X_POSITIVE; - break; - case 1: - m_dir = X_NEGATIVE; - break; - case 2: - m_dir = Y_POSITIVE; - break; - case 3: - m_dir = Y_NEGATIVE; - break; - case 4: - m_dir = Z_POSITIVE; - break; - case 5: - m_dir = Z_NEGATIVE; - break; - default: - ThrowRequire(false); - } -} -bool HexMeshSnake::wall_on_right() -{ - return m_xPos == m_xUpper; -} -bool HexMeshSnake::wall_on_left() -{ - return m_xPos == m_xLower; -} -bool HexMeshSnake::wall_on_top() -{ - return m_yPos == m_yUpper; -} -bool HexMeshSnake::wall_on_bottom() -{ - return m_yPos == m_yLower; -} -bool HexMeshSnake::wall_on_front() -{ - return m_zPos == m_zUpper; -} -bool HexMeshSnake::wall_on_back() -{ - return m_zPos == m_zLower; -} -bool HexMeshSnake::facing_wall() -{ - bool result = false; - switch (m_dir) - { - case X_POSITIVE: - result = wall_on_right(); - break; - case X_NEGATIVE: - result = wall_on_left(); - break; - case Y_POSITIVE: - result = wall_on_top(); - break; - case Y_NEGATIVE: - result = wall_on_bottom(); - break; - case Z_POSITIVE: - result = wall_on_front(); - break; - case Z_NEGATIVE: - result = wall_on_back(); - break; - default: - ThrowRequire(false); - } - return result; -} -void HexMeshSnake::get_new_direction() -{ - switch(m_dir) - { - case X_POSITIVE: - case X_NEGATIVE: - get_new_yz_direction(); - break; - case Y_POSITIVE: - case Y_NEGATIVE: - get_new_xz_direction(); - break; - case Z_POSITIVE: - case Z_NEGATIVE: - get_new_xy_direction(); - break; - default: - ThrowRequire(false); - } -} -void HexMeshSnake::get_new_xy_direction() -{ - std::vector availableDir; - - if (!wall_on_top()) - availableDir.push_back(Y_POSITIVE); - if (!wall_on_bottom()) - availableDir.push_back(Y_NEGATIVE); - if (!wall_on_right()) - availableDir.push_back(X_POSITIVE); - if (!wall_on_left()) - availableDir.push_back(X_NEGATIVE); - - m_dir = availableDir[rand()%availableDir.size()]; -} -void HexMeshSnake::get_new_xz_direction() -{ - std::vector availableDir; - - if (!wall_on_right()) - availableDir.push_back(X_POSITIVE); - if (!wall_on_left()) - availableDir.push_back(X_NEGATIVE); - if (!wall_on_front()) - availableDir.push_back(Z_POSITIVE); - if (!wall_on_back()) - availableDir.push_back(Z_NEGATIVE); - - m_dir = availableDir[rand()%availableDir.size()]; - -} -void HexMeshSnake::get_new_yz_direction() -{ - std::vector availableDir; - - if (!wall_on_top()) - availableDir.push_back(Y_POSITIVE); - if (!wall_on_bottom()) - availableDir.push_back(Y_NEGATIVE); - if (!wall_on_front()) - availableDir.push_back(Z_POSITIVE); - if (!wall_on_back()) - availableDir.push_back(Z_NEGATIVE); - - m_dir = availableDir[rand()%availableDir.size()]; - -} -void HexMeshSnake::move_one() -{ - m_hexMesh.remove_element(m_xPos, m_yPos, m_zPos); - move_forward(); -} -void HexMeshSnake::move_forward() -{ - switch (m_dir) - { - case X_POSITIVE: - m_xPos++; - break; - case X_NEGATIVE: - m_xPos--; - break; - case Y_POSITIVE: - m_yPos++; - break; - case Y_NEGATIVE: - m_yPos--; - break; - case Z_POSITIVE: - m_zPos++; - break; - case Z_NEGATIVE: - m_zPos--; - break; - default: - ThrowRequire(false); - } -} diff --git a/packages/stk/stk_learning/MeshBuilder/MeshSnake.hpp b/packages/stk/stk_learning/MeshBuilder/MeshSnake.hpp deleted file mode 100644 index 2f90fbc1a88c..000000000000 --- a/packages/stk/stk_learning/MeshBuilder/MeshSnake.hpp +++ /dev/null @@ -1,369 +0,0 @@ -// Copyright 2002 - 2008, 2010, 2011 National Technology Engineering -// Solutions of Sandia, LLC (NTESS). Under the terms of Contract -// DE-NA0003525 with NTESS, the U.S. Government retains certain rights -// in this software. -// - // Redistribution and use in source and binary forms, with or without - // modification, are permitted provided that the following conditions are - // met: - // - // * Redistributions of source code must retain the above copyright - // notice, this list of conditions and the following disclaimer. - // - // * Redistributions in binary form must reproduce the above - // copyright notice, this list of conditions and the following - // disclaimer in the documentation and/or other materials provided - // with the distribution. - // -// * Neither the name of NTESS nor the names of its contributors -// may be used to endorse or promote products derived from this -// software without specific prior written permission. -// - // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - // "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - // A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -#ifndef _MESHSNAKE_HPP_ -#define _MESHSNAKE_HPP_ - -#include // for rand -class HexMeshBuilder; -class MeshBuilder; -class QuadMeshBuilder; - - -enum direction -{ - X_POSITIVE, - X_NEGATIVE, - Y_POSITIVE, - Y_NEGATIVE, - Z_POSITIVE, - Z_NEGATIVE, - INVALID_DIR -}; -inline direction rand_2D_dir() -{ - direction dir; - switch (rand()%4) - { - case 0: - dir = X_POSITIVE; - break; - case 1: - dir = X_NEGATIVE; - break; - case 2: - dir = Y_POSITIVE; - break; - case 3: - dir = Y_NEGATIVE; - break; - } - return dir; -} -inline direction rand_3D_dir() -{ - direction dir; - switch (rand()%6) - { - case 0: - dir = X_POSITIVE; - break; - case 1: - dir = X_NEGATIVE; - break; - case 2: - dir = Y_POSITIVE; - break; - case 3: - dir = Y_NEGATIVE; - break; - case 4: - dir = Z_POSITIVE; - break; - case 5: - dir = Z_NEGATIVE; - break; - } - return dir; -} - -class MeshSnake -{ -public: - MeshSnake(MeshBuilder* mesh); - - virtual ~MeshSnake() {} - - virtual void begin_snake(); - - virtual void crawl(unsigned numSteps); - - -private: - MeshBuilder* m_mesh; - - unsigned m_moveCounter; - unsigned m_moveMax; - - void update_move_counter(); - - //begin snake - virtual void get_starting_direction() = 0; - - //crawl - void move(); - bool time_to_switch_directions(); - - void increment_move_counter(); - - virtual bool facing_wall() = 0; - - virtual void get_new_direction() = 0; - - virtual void move_one() = 0; - -}; - -class QuadMeshSnake : public MeshSnake -{ -public: - QuadMeshSnake(QuadMeshBuilder& mesh); - - virtual ~QuadMeshSnake() {} - - void set_x_bounds(unsigned xLower, unsigned xUpper); - - void set_y_bounds(unsigned yLower, unsigned yUpper); - - void set_x_pos(unsigned x); - - void set_y_pos(unsigned y); - - void set_pos(unsigned x, unsigned y); - - //test functions - inline unsigned x_lower_bound() const; - - inline unsigned x_upper_bound() const; - - inline unsigned y_lower_bound() const; - - inline unsigned y_upper_bound() const; - - inline unsigned x_pos() const; - - inline unsigned y_pos() const; - - inline direction dir() const; - -private: - QuadMeshBuilder& m_quadMesh; - - unsigned m_xLower; - unsigned m_xUpper; - unsigned m_yLower; - unsigned m_yUpper; - - unsigned m_xPos; - unsigned m_yPos; - - direction m_dir; - - //begin snake - virtual void get_starting_direction(); - - //move - bool wall_on_right(); - - bool wall_on_left(); - - bool wall_on_top(); - - bool wall_on_bottom(); - - virtual bool facing_wall(); - - virtual void get_new_direction(); - - void get_new_y_direction(); - - void get_new_x_direction(); - - virtual void move_one(); - - void move_forward(); - - -}; - -//test -inline unsigned QuadMeshSnake::x_lower_bound() const -{ - return m_xLower; -} -inline unsigned QuadMeshSnake::x_upper_bound() const -{ - return m_xUpper; -} -inline unsigned QuadMeshSnake::y_lower_bound() const -{ - return m_yLower; -} -inline unsigned QuadMeshSnake::y_upper_bound() const -{ - return m_yUpper; -} -inline unsigned QuadMeshSnake::x_pos() const -{ - return m_xPos; -} -inline unsigned QuadMeshSnake::y_pos() const -{ - return m_yPos; -} -inline direction QuadMeshSnake::dir() const -{ - return m_dir; -} - -class HexMeshSnake : public MeshSnake -{ -public: - HexMeshSnake(HexMeshBuilder& mesh); - - virtual ~HexMeshSnake() {} - - void set_x_bounds(unsigned xLower, unsigned xUpper); - - void set_y_bounds(unsigned yLower, unsigned yUpper); - - void set_z_bounds(unsigned zLower, unsigned zUpper); - - void set_x_pos(unsigned x); - - void set_y_pos(unsigned y); - - void set_z_pos(unsigned z); - - void set_pos(unsigned x, unsigned y, unsigned z); - - //test - inline unsigned x_lower_bound() const; - - inline unsigned x_upper_bound() const; - - inline unsigned y_lower_bound() const; - - inline unsigned y_upper_bound() const; - - inline unsigned z_lower_bound() const; - - inline unsigned z_upper_bound() const; - - inline unsigned x_pos() const; - - inline unsigned y_pos() const; - - inline unsigned z_pos() const; - - inline direction dir() const; - -private: - HexMeshBuilder& m_hexMesh; - - unsigned m_xLower; - unsigned m_xUpper; - unsigned m_yLower; - unsigned m_yUpper; - unsigned m_zLower; - unsigned m_zUpper; - - unsigned m_xPos; - unsigned m_yPos; - unsigned m_zPos; - - direction m_dir; - - //begin snake - virtual void get_starting_direction(); - - //move - bool wall_on_right(); - - bool wall_on_left(); - - bool wall_on_top(); - - bool wall_on_bottom(); - - bool wall_on_front(); - - bool wall_on_back(); - - virtual bool facing_wall(); - - virtual void get_new_direction(); - - void get_new_xy_direction(); - - void get_new_xz_direction(); - - void get_new_yz_direction(); - - virtual void move_one(); - - void move_forward(); -}; - -inline unsigned HexMeshSnake::x_lower_bound() const -{ - return m_xLower; -} -inline unsigned HexMeshSnake::x_upper_bound() const -{ - return m_xUpper; -} -inline unsigned HexMeshSnake::y_lower_bound() const -{ - return m_yLower; -} -inline unsigned HexMeshSnake::y_upper_bound() const -{ - return m_yUpper; -} -inline unsigned HexMeshSnake::z_lower_bound() const -{ - return m_zLower; -} -inline unsigned HexMeshSnake::z_upper_bound() const -{ - return m_zUpper; -} -inline unsigned HexMeshSnake::x_pos() const -{ - return m_xPos; -} -inline unsigned HexMeshSnake::y_pos() const -{ - return m_yPos; -} -inline unsigned HexMeshSnake::z_pos() const -{ - return m_zPos; -} -inline direction HexMeshSnake::dir() const -{ - return m_dir; -} - -#endif /*_MESHSNAKE_HPP_*/ diff --git a/packages/stk/stk_learning/MeshBuilder/UnitTest/UnitTestMeshBuilder.cpp b/packages/stk/stk_learning/MeshBuilder/UnitTest/UnitTestMeshBuilder.cpp deleted file mode 100644 index 476aca8c8ef6..000000000000 --- a/packages/stk/stk_learning/MeshBuilder/UnitTest/UnitTestMeshBuilder.cpp +++ /dev/null @@ -1,1362 +0,0 @@ -#include // for AssertHelper, EXPECT_EQ, etc -#include // for NoGhostGameofLife -#include // for PNGProcessor -#include // for generate_two_dim_elem_id -#include // for HexMeshBuilder, etc -#include // for HexMeshSnake, QuadMeshSnake, etc -#include -#include // for BulkData -#include // for Field -#include // for get_entities -#include // for topology, etc -#include // for string -#include // for pair -#include // for vector -#include "mpi.h" // for MPI_Wtime, MPI_COMM_WORLD, etc -#include "stk_mesh/base/BulkDataInlinedMethods.hpp" -#include "stk_mesh/base/Entity.hpp" // for Entity -#include "stk_mesh/base/Types.hpp" // for EntityIdVector, etc -#include "stk_util/parallel/Parallel.hpp" // for parallel_machine_size, etc -#include -#include - -typedef stk::mesh::Field ScalarIntField; - -bool element_ids_are_active(const stk::mesh::BulkData& bulkData, const - stk::mesh::EntityIdVector& elemIds) -{ - bool result = true; - stk::mesh::Entity elem; - for (stk::mesh::EntityId elemId : elemIds) - { - elem = bulkData.get_entity(stk::topology::ELEM_RANK, elemId); - if (!bulkData.is_valid(elem)) - result = false; - } - return result; -} - -namespace -{ -TEST(MeshBuilder, 1ProcQuadCreation) -{ - stk::ParallelMachine comm = MPI_COMM_WORLD; - int procSize = stk::parallel_machine_size(comm); - - if (1 == procSize) - { - QuadMeshBuilder Mesh(comm, "1ProcQuadCreation"); - Mesh.commit_meta(); - - Mesh.begin_modification(); - Mesh.create_element(1, 1); - Mesh.end_modification(); - - stk::mesh::EntityVector elements; - stk::mesh::EntityVector nodes; - stk::mesh::get_entities(Mesh.bulk_data(), stk::topology::ELEM_RANK, elements); - stk::mesh::get_entities(Mesh.bulk_data(), stk::topology::NODE_RANK, nodes); - EXPECT_EQ(1u, elements.size()); - EXPECT_EQ(4u, nodes.size()); - } -} -TEST(MeshBuilder, 1ProcQuadNodeCoordinates) -{ - stk::ParallelMachine comm = MPI_COMM_WORLD; - int procSize = stk::parallel_machine_size(comm); - - if (1 == procSize) - { - QuadMeshBuilder Mesh(comm, "1ProcQuadNodeCoordinates"); - Mesh.commit_meta(); - - Mesh.begin_modification(); - Mesh.create_element(1, 1); - Mesh.end_modification(); - - stk::mesh::EntityVector elements; - stk::mesh::get_entities(Mesh.bulk_data(), stk::topology::ELEM_RANK, elements); - ASSERT_EQ(1u, elements.size()); - - stk::mesh::Entity elem = elements[0]; - - const stk::mesh::Entity* nodes = Mesh.bulk_data().begin_nodes(elem); - const stk::mesh::ConnectivityOrdinal* nodeOrds = Mesh.bulk_data().begin_node_ordinals(elem); - unsigned numNodes = Mesh.bulk_data().num_nodes(elem); - - ASSERT_EQ(4u, numNodes); - - for (unsigned nodeIndex = 0; nodeIndex < numNodes; nodeIndex++) - { - stk::mesh::Entity node = nodes[nodeIndex]; - stk::mesh::ConnectivityOrdinal nodeOrd = nodeOrds[nodeIndex]; - - if (0u == nodeOrd) - { - EXPECT_EQ(0u, Mesh.node_x_coord(node)); - EXPECT_EQ(0u, Mesh.node_y_coord(node)); - } - else if (1u == nodeOrd) - { - EXPECT_EQ(1u, Mesh.node_x_coord(node)); - EXPECT_EQ(0u, Mesh.node_y_coord(node)); - } - else if (2u == nodeOrd) - { - EXPECT_EQ(1u, Mesh.node_x_coord(node)); - EXPECT_EQ(1u, Mesh.node_y_coord(node)); - } - else if (3u == nodeOrd) - { - EXPECT_EQ(0u, Mesh.node_x_coord(node)); - EXPECT_EQ(1u, Mesh.node_y_coord(node)); - } - } - } -} -TEST(MeshBuilder, 1ProcQuadNodeIds) -{ - stk::ParallelMachine comm = MPI_COMM_WORLD; - int procSize = stk::parallel_machine_size(comm); - - if (1 == procSize) - { - QuadMeshBuilder Mesh(comm, "1ProcQuadNodeIds"); - Mesh.commit_meta(); - - Mesh.begin_modification(); - Mesh.create_element(2, 2); - Mesh.end_modification(); - - stk::mesh::EntityVector elements; - stk::mesh::get_entities(Mesh.bulk_data(), stk::topology::ELEM_RANK, elements); - stk::mesh::Entity elem = elements[0]; - - const stk::mesh::Entity* nodes = Mesh.bulk_data().begin_nodes(elem); - const stk::mesh::ConnectivityOrdinal* nodeOrds = Mesh.bulk_data().begin_node_ordinals(elem); - unsigned numNodes = Mesh.bulk_data().num_nodes(elem); - - ASSERT_EQ(4u, numNodes); - - for (unsigned nodeIndex = 0; nodeIndex < numNodes; nodeIndex++) - { - stk::mesh::Entity node = nodes[nodeIndex]; - stk::mesh::ConnectivityOrdinal nodeOrd = nodeOrds[nodeIndex]; - - if (0u == nodeOrd) - { - EXPECT_EQ(5u, Mesh.bulk_data().identifier(node)); - EXPECT_EQ(1u, Mesh.node_x_coord(node)); - EXPECT_EQ(1u, Mesh.node_y_coord(node)); - } - else if (1u == nodeOrd) - { - EXPECT_EQ(8u, Mesh.bulk_data().identifier(node)); - EXPECT_EQ(2u, Mesh.node_x_coord(node)); - EXPECT_EQ(1u, Mesh.node_y_coord(node)); - } - else if (2u == nodeOrd) - { - EXPECT_EQ(13u, Mesh.bulk_data().identifier(node)); - EXPECT_EQ(2u, Mesh.node_x_coord(node)); - EXPECT_EQ(2u, Mesh.node_y_coord(node)); - } - else if (3u == nodeOrd) - { - EXPECT_EQ(9u, Mesh.bulk_data().identifier(node)); - EXPECT_EQ(1u, Mesh.node_x_coord(node)); - EXPECT_EQ(2u, Mesh.node_y_coord(node)); - } - } - } -} -TEST(MeshBuilder, 4ProcShareNodes) -{ - stk::ParallelMachine comm = MPI_COMM_WORLD; - int procSize = stk::parallel_machine_size(comm); - int procRank = stk::parallel_machine_rank(comm); - if (4 == procSize) - { - QuadMeshBuilder Mesh(comm, "4ProcShareNodes"); - Mesh.commit_meta(); - - Mesh.begin_modification(); - Mesh.create_element(1, 1, 0); - Mesh.create_element(1, 2, 1); - Mesh.create_element(2, 1, 2); - Mesh.create_element(2, 2, 3); - Mesh.end_modification(); - - EXPECT_EQ(1u, Mesh.num_elems()); - - stk::mesh::Entity node5 = Mesh.bulk_data().get_entity(stk::topology::NODE_RANK, 5); - std::vector node5procs; - Mesh.bulk_data().comm_shared_procs(Mesh.bulk_data().entity_key(node5), node5procs); - EXPECT_EQ(3u, node5procs.size()); - - if (1 == procRank || 0 == procRank) - { - stk::mesh::Entity node3 = Mesh.bulk_data().get_entity(stk::topology::NODE_RANK, 3); - std::vector node3procs; - Mesh.bulk_data().comm_shared_procs(Mesh.bulk_data().entity_key(node3), node3procs); - EXPECT_EQ(1u, node3procs.size()); - } - else if (3 == procRank || 2 == procRank) - { - stk::mesh::Entity node8 = Mesh.bulk_data().get_entity(stk::topology::NODE_RANK, 8); - std::vector node8procs; - Mesh.bulk_data().comm_shared_procs(Mesh.bulk_data().entity_key(node8), node8procs); - EXPECT_EQ(1u, node8procs.size()); - } - } -} -TEST(MeshBuilder, 1ProcHexCreation) -{ - stk::ParallelMachine comm = MPI_COMM_WORLD; - int procSize = stk::parallel_machine_size(comm); - - if (1 == procSize) - { - HexMeshBuilder Mesh(comm, "1ProcHexCreation"); - Mesh.commit_meta(); - - Mesh.begin_modification(); - Mesh.create_element(1, 1, 1); - Mesh.end_modification(); - - stk::mesh::EntityVector elements; - stk::mesh::EntityVector nodes; - stk::mesh::get_entities(Mesh.bulk_data(), stk::topology::ELEM_RANK, elements); - stk::mesh::get_entities(Mesh.bulk_data(), stk::topology::NODE_RANK, nodes); - EXPECT_EQ(1u, elements.size()); - EXPECT_EQ(8u, nodes.size()); - } -} -TEST(MeshBuilder, 1ProcHexNodeCoordinates) -{ - stk::ParallelMachine comm = MPI_COMM_WORLD; - int procSize = stk::parallel_machine_size(comm); - - if (1 == procSize) - { - HexMeshBuilder Mesh(comm, "1ProcHexNodeCoordinates"); - Mesh.commit_meta(); - - Mesh.begin_modification(); - Mesh.create_element(1, 1, 1); - Mesh.end_modification(); - - stk::mesh::EntityVector elements; - stk::mesh::get_entities(Mesh.bulk_data(), stk::topology::ELEM_RANK, elements); - ASSERT_EQ(1u, elements.size()); - - stk::mesh::Entity elem = elements[0]; - - const stk::mesh::Entity* nodes = Mesh.bulk_data().begin_nodes(elem); - const stk::mesh::ConnectivityOrdinal* nodeOrds = Mesh.bulk_data().begin_node_ordinals(elem); - unsigned numNodes = Mesh.bulk_data().num_nodes(elem); - - ASSERT_EQ(8u, numNodes); - - for (unsigned nodeIndex = 0; nodeIndex < numNodes; nodeIndex++) - { - stk::mesh::Entity node = nodes[nodeIndex]; - stk::mesh::ConnectivityOrdinal nodeOrd = nodeOrds[nodeIndex]; - - if (0u == nodeOrd) - { - EXPECT_EQ(0u, Mesh.node_x_coord(node)); - EXPECT_EQ(0u, Mesh.node_y_coord(node)); - EXPECT_EQ(0u, Mesh.node_z_coord(node)); - } - else if (1u == nodeOrd) - { - EXPECT_EQ(1u, Mesh.node_x_coord(node)); - EXPECT_EQ(0u, Mesh.node_y_coord(node)); - EXPECT_EQ(0u, Mesh.node_z_coord(node)); - } - else if (2u == nodeOrd) - { - EXPECT_EQ(1u, Mesh.node_x_coord(node)); - EXPECT_EQ(1u, Mesh.node_y_coord(node)); - EXPECT_EQ(0u, Mesh.node_z_coord(node)); - } - else if (3u == nodeOrd) - { - EXPECT_EQ(0u, Mesh.node_x_coord(node)); - EXPECT_EQ(1u, Mesh.node_y_coord(node)); - EXPECT_EQ(0u, Mesh.node_z_coord(node)); - } - else if (4u == nodeOrd) - { - EXPECT_EQ(0u, Mesh.node_x_coord(node)); - EXPECT_EQ(0u, Mesh.node_y_coord(node)); - EXPECT_EQ(1u, Mesh.node_z_coord(node)); - } - else if (5u == nodeOrd) - { - EXPECT_EQ(1u, Mesh.node_x_coord(node)); - EXPECT_EQ(0u, Mesh.node_y_coord(node)); - EXPECT_EQ(1u, Mesh.node_z_coord(node)); - } - else if (6u == nodeOrd) - { - EXPECT_EQ(1u, Mesh.node_x_coord(node)); - EXPECT_EQ(1u, Mesh.node_y_coord(node)); - EXPECT_EQ(1u, Mesh.node_z_coord(node)); - } - else if (7u == nodeOrd) - { - EXPECT_EQ(0u, Mesh.node_x_coord(node)); - EXPECT_EQ(1u, Mesh.node_y_coord(node)); - EXPECT_EQ(1u, Mesh.node_z_coord(node)); - } - } - } -} -TEST(MeshBuilder, 1ProcHexNodeIds) -{ - stk::ParallelMachine comm = MPI_COMM_WORLD; - int procSize = stk::parallel_machine_size(comm); - - if (1 == procSize) - { - HexMeshBuilder Mesh(comm, "1ProcHexNodeIds"); - Mesh.commit_meta(); - - Mesh.begin_modification(); - Mesh.create_element(1,1,1); - Mesh.end_modification(); - - stk::mesh::EntityVector elements; - stk::mesh::get_entities(Mesh.bulk_data(), stk::topology::ELEM_RANK, elements); - stk::mesh::Entity elem = elements[0]; - - const stk::mesh::Entity* nodes = Mesh.bulk_data().begin_nodes(elem); - const stk::mesh::ConnectivityOrdinal* nodeOrds = Mesh.bulk_data().begin_node_ordinals(elem); - unsigned numNodes = Mesh.bulk_data().num_nodes(elem); - - ASSERT_EQ(8u, numNodes); - - for (unsigned nodeIndex = 0; nodeIndex < numNodes; nodeIndex++) - { - stk::mesh::Entity node = nodes[nodeIndex]; - stk::mesh::ConnectivityOrdinal nodeOrd = nodeOrds[nodeIndex]; - - if (0u == nodeOrd) - { - EXPECT_EQ(1u, Mesh.bulk_data().identifier(node)); - } - else if (1u == nodeOrd) - { - EXPECT_EQ(2u, Mesh.bulk_data().identifier(node)); - } - else if (2u == nodeOrd) - { - EXPECT_EQ(6u, Mesh.bulk_data().identifier(node)); - } - else if (3u == nodeOrd) - { - EXPECT_EQ(3u, Mesh.bulk_data().identifier(node)); - } - else if (4u == nodeOrd) - { - EXPECT_EQ(4u, Mesh.bulk_data().identifier(node)); - } - else if (5u == nodeOrd) - { - EXPECT_EQ(8u, Mesh.bulk_data().identifier(node)); - } - else if (6u == nodeOrd) - { - EXPECT_EQ(16u, Mesh.bulk_data().identifier(node)); - } - else if (7u == nodeOrd) - { - EXPECT_EQ(9u, Mesh.bulk_data().identifier(node)); - } - } - } -} -TEST(MeshBuilder, 4ProcHexShareNodes) -{ - stk::ParallelMachine comm = MPI_COMM_WORLD; - int procSize = stk::parallel_machine_size(comm); - int procRank = stk::parallel_machine_rank(comm); - if (4 == procSize) - { - HexMeshBuilder Mesh(comm, "4ProcHexShareNodes"); - Mesh.commit_meta(); - - Mesh.begin_modification(); - Mesh.create_element(1,1,1,0); - Mesh.create_element(1,1,2,0); - Mesh.create_element(2,1,1,1); - Mesh.create_element(2,1,2,1); - Mesh.create_element(1,2,1,2); - Mesh.create_element(1,2,2,2); - Mesh.create_element(2,2,1,3); - Mesh.create_element(2,2,2,3); - Mesh.end_modification(); - - EXPECT_EQ(2u, Mesh.num_elems()); - - stk::mesh::Entity centerNode = Mesh.bulk_data().get_entity(stk::topology::NODE_RANK, 16); - std::vector centerNodeProcs; - Mesh.bulk_data().comm_shared_procs(Mesh.bulk_data().entity_key(centerNode), centerNodeProcs); - EXPECT_EQ(3u, centerNodeProcs.size()); - - if (0 == procRank || 1 == procRank) - { - stk::mesh::Entity node8 = Mesh.bulk_data().get_entity(stk::topology::NODE_RANK, 8); - std::vector node8Procs; - Mesh.bulk_data().comm_shared_procs(Mesh.bulk_data().entity_key(node8), node8Procs); - EXPECT_EQ(1u, node8Procs.size()); - } - if (0 == procRank || 2 == procRank) - { - stk::mesh::Entity node9 = Mesh.bulk_data().get_entity(stk::topology::NODE_RANK, 9); - std::vector node9Procs; - Mesh.bulk_data().comm_shared_procs(Mesh.bulk_data().entity_key(node9), node9Procs); - EXPECT_EQ(1u, node9Procs.size()); - } - if (1 == procRank || 3 == procRank) - { - stk::mesh::Entity node27 = Mesh.bulk_data().get_entity(stk::topology::NODE_RANK, 27); - std::vector node27Procs; - Mesh.bulk_data().comm_shared_procs(Mesh.bulk_data().entity_key(node27), node27Procs); - EXPECT_EQ(1u, node27Procs.size()); - } - if (2 == procRank || 3 == procRank) - { - stk::mesh::Entity node28 = Mesh.bulk_data().get_entity(stk::topology::NODE_RANK, 28); - std::vector node28Procs; - Mesh.bulk_data().comm_shared_procs(Mesh.bulk_data().entity_key(node28), node28Procs); - EXPECT_EQ(1u, node28Procs.size()); - } - } -} -TEST(MeshBuilder, 1ProcQuadFillArea) -{ - stk::ParallelMachine comm = MPI_COMM_WORLD; - int numProcs = stk::parallel_machine_size(comm); - if (1 == numProcs) - { - QuadMeshBuilder Mesh1(comm, "1ProcQuadFillArea"); - QuadMeshBuilder Mesh2(comm, "1ProcQuadFillAreaRandomly"); - QuadMeshBuilder Mesh3(comm, "1ProcQuadFillAreaOnProc"); - Mesh1.commit_meta(); - Mesh2.commit_meta(); - Mesh3.commit_meta(); - - EXPECT_EQ(0u, Mesh1.num_elems()); - EXPECT_EQ(0u, Mesh2.num_elems()); - EXPECT_EQ(0u, Mesh3.num_elems()); - - Mesh1.begin_modification(); - Mesh2.begin_modification(); - Mesh3.begin_modification(); - Mesh1.fill_area(1, 2, 1, 2); - Mesh2.fill_area_randomly(1,2,1,2); - Mesh3.fill_area_on_proc(1,2,1,2,0); - Mesh1.end_modification(); - Mesh2.end_modification(); - Mesh3.end_modification(); - - EXPECT_EQ(4u, Mesh1.num_elems()); - EXPECT_EQ(4u, Mesh2.num_elems()); - EXPECT_EQ(4u, Mesh3.num_elems()); - } -} -TEST(MeshBuilder, 4ProcQuadFillArea) -{ - stk::ParallelMachine comm = MPI_COMM_WORLD; - int numProcs = stk::parallel_machine_size(comm); - int procRank = stk::parallel_machine_rank(comm); - if (4 == numProcs) - { - QuadMeshBuilder Mesh(comm, "4ProcQuadFillArea"); - Mesh.commit_meta(); - - EXPECT_EQ(0u, Mesh.num_elems()); - - Mesh.begin_modification(); - Mesh.fill_area(1, 5, 1, 5); - Mesh.end_modification(); - - stk::mesh::EntityIdVector elemIds; - - if (0 == procRank) - { - elemIds.push_back(1); - elemIds.push_back(2); - elemIds.push_back(4); - elemIds.push_back(7); - elemIds.push_back(11); - elemIds.push_back(3); - elemIds.push_back(5); - elemIds.push_back(8); - elemIds.push_back(12); - elemIds.push_back(17); - } - else if (1 == procRank) - { - elemIds.push_back(6); - elemIds.push_back(9); - elemIds.push_back(13); - elemIds.push_back(18); - elemIds.push_back(24); - } - else if (2 == procRank) - { - elemIds.push_back(10); - elemIds.push_back(14); - elemIds.push_back(19); - elemIds.push_back(25); - elemIds.push_back(32); - } - else if (3 == procRank) - { - elemIds.push_back(15); - elemIds.push_back(20); - elemIds.push_back(26); - elemIds.push_back(33); - elemIds.push_back(41); - } - - EXPECT_TRUE(element_ids_are_active(Mesh.bulk_data(), elemIds)); - } -} -TEST(MeshBuilder, 4ProcQuadFillAreaRandom) -{ - stk::ParallelMachine comm = MPI_COMM_WORLD; - int numProcs = stk::parallel_machine_size(comm); - int procRank = stk::parallel_machine_rank(comm); - if (4 == numProcs) - { - QuadMeshBuilder Mesh(comm, "4ProcQuadFillAreaRandom"); - Mesh.commit_meta(); - - EXPECT_EQ(0u, Mesh.num_elems()); - - Mesh.begin_modification(); - Mesh.fill_area_randomly(1, 5, 1, 5); - Mesh.end_modification(); - - stk::mesh::EntityIdVector elemIds; - - if (0 == procRank) - { - elemIds.push_back(1); - elemIds.push_back(11); - elemIds.push_back(12); - elemIds.push_back(13); - elemIds.push_back(14); - elemIds.push_back(15); - elemIds.push_back(41); - } - else if (1 == procRank) - { - elemIds.push_back(2); - elemIds.push_back(3); - elemIds.push_back(17); - elemIds.push_back(18); - elemIds.push_back(19); - elemIds.push_back(20); - } - else if (2 == procRank) - { - elemIds.push_back(4); - elemIds.push_back(5); - elemIds.push_back(6); - elemIds.push_back(24); - elemIds.push_back(25); - elemIds.push_back(26); - } - else if (3 == procRank) - { - elemIds.push_back(7); - elemIds.push_back(8); - elemIds.push_back(9); - elemIds.push_back(10); - elemIds.push_back(32); - elemIds.push_back(33); - } - - EXPECT_TRUE(element_ids_are_active(Mesh.bulk_data(), elemIds)); - } -} -TEST(MeshBuilder, 4ProcQuadFillAreaOnProc) -{ - stk::ParallelMachine comm = MPI_COMM_WORLD; - int numProcs = stk::parallel_machine_size(comm); - int procRank = stk::parallel_machine_rank(comm); - if (4 == numProcs) - { - QuadMeshBuilder Mesh(comm,"4ProcQuadFillAreaOnProc"); - Mesh.commit_meta(); - - Mesh.begin_modification(); - Mesh.fill_area_on_proc(1, 2, 1, 2, 0); - Mesh.fill_area_on_proc(1, 2, 3, 4, 1); - Mesh.fill_area_on_proc(3, 4, 1, 2, 2); - Mesh.fill_area_on_proc(3, 4, 3, 4, 3); - Mesh.end_modification(); - - EXPECT_EQ(4u, Mesh.num_elems()); - - stk::mesh::EntityIdVector elemIds; - - if (0 == procRank) - { - elemIds.push_back(1); - elemIds.push_back(2); - elemIds.push_back(3); - elemIds.push_back(5); - } - else if (1 == procRank) - { - elemIds.push_back(6); - elemIds.push_back(9); - elemIds.push_back(10); - elemIds.push_back(14); - - } - else if (2 == procRank) - { - elemIds.push_back(4); - elemIds.push_back(7); - elemIds.push_back(8); - elemIds.push_back(12); - - } - - else if (3 == procRank) - { - elemIds.push_back(13); - elemIds.push_back(18); - elemIds.push_back(19); - elemIds.push_back(25); - } - - EXPECT_TRUE(element_ids_are_active(Mesh.bulk_data(), elemIds)); - } -} -TEST(MeshBuilder, 4ProcQuadFillAreaLayers) -{ - stk::ParallelMachine comm = MPI_COMM_WORLD; - int numProcs = stk::parallel_machine_size(comm); - int procRank = stk::parallel_machine_rank(comm); - if (4 == numProcs) - { - QuadMeshBuilder Mesh(comm,"4ProcQuadFillAreaLayers"); - Mesh.commit_meta(); - - Mesh.begin_modification(); - Mesh.fill_area_with_layers(1, 4, 1, 6); - Mesh.end_modification(); - - if (0 == procRank || 1 == procRank) - { - EXPECT_EQ(8u, Mesh.num_elems()); - } - else if (2 == procRank || 3 == procRank) - { - EXPECT_EQ(4u, Mesh.num_elems()); - } - - stk::mesh::EntityIdVector elemIds; - - if (0 == procRank) - { - elemIds.push_back(1); - elemIds.push_back(2); - elemIds.push_back(4); - elemIds.push_back(7); - elemIds.push_back(15); - elemIds.push_back(20); - elemIds.push_back(26); - elemIds.push_back(33); - } - else if (1 == procRank) - { - elemIds.push_back(3); - elemIds.push_back(5); - elemIds.push_back(8); - elemIds.push_back(12); - elemIds.push_back(21); - elemIds.push_back(27); - elemIds.push_back(34); - elemIds.push_back(42); - } - else if (2 == procRank) - { - elemIds.push_back(6); - elemIds.push_back(9); - elemIds.push_back(13); - elemIds.push_back(18); - - } - else if (3 == procRank) - { - elemIds.push_back(10); - elemIds.push_back(14); - elemIds.push_back(19); - elemIds.push_back(25); - } - - EXPECT_TRUE(element_ids_are_active(Mesh.bulk_data(), elemIds)); - } -} -TEST(MeshBuilder, 1ProcHexFillArea) -{ - stk::ParallelMachine comm = MPI_COMM_WORLD; - int numProcs = stk::parallel_machine_size(comm); - if (1 == numProcs) - { - HexMeshBuilder Mesh1(comm, "1ProcHexFillArea"); - HexMeshBuilder Mesh2(comm, "1ProcHexFillAreaOnProc"); - HexMeshBuilder Mesh3(comm, "1ProcHexFillAreaRandom"); - Mesh1.commit_meta(); - Mesh2.commit_meta(); - Mesh3.commit_meta(); - - EXPECT_EQ(0u, Mesh1.num_elems()); - EXPECT_EQ(0u, Mesh2.num_elems()); - EXPECT_EQ(0u, Mesh3.num_elems()); - - Mesh1.begin_modification(); - Mesh2.begin_modification(); - Mesh3.begin_modification(); - Mesh1.fill_area(1, 2, 1, 2, 1, 2); - Mesh2.fill_area_randomly(1, 2, 1, 2, 1, 2); - Mesh3.fill_area_on_proc(1, 2, 1, 2, 1, 2, 0); - Mesh1.end_modification(); - Mesh2.end_modification(); - Mesh3.end_modification(); - - EXPECT_EQ(8u, Mesh1.num_elems()); - EXPECT_EQ(8u, Mesh2.num_elems()); - EXPECT_EQ(8u, Mesh3.num_elems()); - } -} -TEST(MeshBuilder, 4ProcHexFillArea) -{ - stk::ParallelMachine comm = MPI_COMM_WORLD; - int numProcs = stk::parallel_machine_size(comm); - int procRank = stk::parallel_machine_rank(comm); - if (4 == numProcs) - { - HexMeshBuilder Mesh(comm, "4ProcHexFillAream"); - Mesh.commit_meta(); - - EXPECT_EQ(0u, Mesh.num_elems()); - - Mesh.begin_modification(); - Mesh.fill_area(1, 2, 1, 2, 1, 5); - Mesh.end_modification(); - - stk::mesh::EntityIdVector elemIds; - if (0 == procRank) - { - elemIds.push_back(1); - elemIds.push_back(2); - elemIds.push_back(4); - elemIds.push_back(8); - elemIds.push_back(3); - elemIds.push_back(6); - elemIds.push_back(9); - elemIds.push_back(16); - } - else if (1 == procRank) - { - elemIds.push_back(10); - elemIds.push_back(18); - elemIds.push_back(19); - elemIds.push_back(31); - } - else if (2 == procRank) - { - elemIds.push_back(20); - elemIds.push_back(33); - elemIds.push_back(34); - elemIds.push_back(52); - } - else if (3 == procRank) - { - elemIds.push_back(35); - elemIds.push_back(54); - elemIds.push_back(55); - elemIds.push_back(80); - } - - EXPECT_TRUE(element_ids_are_active(Mesh.bulk_data(), elemIds)); - } -} -TEST(MeshBuilder, 4ProcHexFillAreaRandom) -{ - stk::ParallelMachine comm = MPI_COMM_WORLD; - int numProcs = stk::parallel_machine_size(comm); - int procRank = stk::parallel_machine_rank(comm); - if (4 == numProcs) - { - HexMeshBuilder Mesh(comm, "4ProcHexFillAreaRandom"); - Mesh.commit_meta(); - - EXPECT_EQ(0u, Mesh.num_elems()); - - Mesh.begin_modification(); - Mesh.fill_area_randomly(1, 2, 1, 2, 1, 2); - Mesh.end_modification(); - - EXPECT_EQ(2u, Mesh.num_elems()); - - stk::mesh::EntityIdVector elemIds; - if (0 == procRank) - { - elemIds.push_back(1); - elemIds.push_back(2); - } - else if (1 == procRank) - { - elemIds.push_back(4); - elemIds.push_back(8); - } - else if (2 == procRank) - { - elemIds.push_back(3); - elemIds.push_back(6); - } - else if (3 == procRank) - { - elemIds.push_back(9); - elemIds.push_back(16); - } - - EXPECT_TRUE(element_ids_are_active(Mesh.bulk_data(), elemIds)); - } -} -TEST(MeshBuilder, 4ProcHexFillAreaOnProc) -{ - stk::ParallelMachine comm = MPI_COMM_WORLD; - int numProcs = stk::parallel_machine_size(comm); - int procRank = stk::parallel_machine_rank(comm); - if (4 == numProcs) - { - HexMeshBuilder Mesh(comm, "4ProcHexFillAreaOnProc"); - Mesh.commit_meta(); - - EXPECT_EQ(0u, Mesh.num_elems()); - - Mesh.begin_modification(); - Mesh.fill_area_on_proc(1, 2, 1, 1, 1, 1, 0); - Mesh.fill_area_on_proc(1, 2, 2, 2, 1, 1, 1); - Mesh.fill_area_on_proc(1, 2, 1, 1, 2, 2, 2); - Mesh.fill_area_on_proc(1, 2, 2, 2, 2, 2, 3); - Mesh.end_modification(); - - EXPECT_EQ(2u, Mesh.num_elems()); - - stk::mesh::EntityIdVector elemIds; - if (0 == procRank) - { - elemIds.push_back(1); - elemIds.push_back(2); - } - else if (1 == procRank) - { - elemIds.push_back(3); - elemIds.push_back(6); - } - else if (2 == procRank) - { - elemIds.push_back(4); - elemIds.push_back(8); - } - else if (3 == procRank) - { - elemIds.push_back(9); - elemIds.push_back(16); - } - - EXPECT_TRUE(element_ids_are_active(Mesh.bulk_data(), elemIds)); - } -} -TEST(MeshBuilder, 4ProcHexFillAreaLayers) -{ - stk::ParallelMachine comm = MPI_COMM_WORLD; - int numProcs = stk::parallel_machine_size(comm); - int procRank = stk::parallel_machine_rank(comm); - if (4 == numProcs) - { - HexMeshBuilder Mesh(comm, "4ProcHexFillAreaLayers"); - Mesh.commit_meta(); - - EXPECT_EQ(0u, Mesh.num_elems()); - - Mesh.begin_modification(); - Mesh.fill_area_with_layers(1, 2, 1, 3, 1, 6); - Mesh.end_modification(); - - if (0 == numProcs || 1 == numProcs) - { - EXPECT_EQ(12u, Mesh.num_elems()); - } - else if (2 == numProcs || 3 == numProcs) - { - EXPECT_EQ(6u, Mesh.num_elems()); - } - - stk::mesh::EntityIdVector elemIds; - if (0 == procRank) - { - elemIds.push_back(1); - elemIds.push_back(2); - elemIds.push_back(3); - elemIds.push_back(6); - elemIds.push_back(7); - elemIds.push_back(13); - - elemIds.push_back(35); - elemIds.push_back(54); - elemIds.push_back(55); - elemIds.push_back(80); - elemIds.push_back(81); - elemIds.push_back(113); - - } - else if (1 == procRank) - { - elemIds.push_back(4); - elemIds.push_back(8); - elemIds.push_back(9); - elemIds.push_back(16); - elemIds.push_back(17); - elemIds.push_back(28); - - - elemIds.push_back(56); - elemIds.push_back(82); - elemIds.push_back(83); - elemIds.push_back(116); - elemIds.push_back(117); - elemIds.push_back(158); - } - else if (2 == procRank) - { - elemIds.push_back(10); - elemIds.push_back(18); - elemIds.push_back(19); - elemIds.push_back(31); - elemIds.push_back(32); - elemIds.push_back(49); - } - else if (3 == procRank) - { - elemIds.push_back(20); - elemIds.push_back(33); - elemIds.push_back(34); - elemIds.push_back(52); - elemIds.push_back(53); - elemIds.push_back(77); - } - - EXPECT_TRUE(element_ids_are_active(Mesh.bulk_data(), elemIds)); - } -} -TEST(MeshBuilder, 1ProcQuadRemove) -{ - stk::ParallelMachine comm = MPI_COMM_WORLD; - int numProcs = stk::parallel_machine_size(comm); - if (1 == numProcs) - { - QuadMeshBuilder Mesh(comm, "1ProcQuadRemove"); - Mesh.commit_meta(); - - Mesh.begin_modification(); - Mesh.fill_area(1, 2, 1, 2); - Mesh.end_modification(); - - EXPECT_EQ(4u, Mesh.num_elems()); - - Mesh.begin_modification(); - Mesh.remove_element(1, 1); - Mesh.begin_modification(); - - EXPECT_EQ(3u, Mesh.num_elems()); - } -} -TEST(MeshBuilder, 4ProcQuadRemove) -{ - stk::ParallelMachine comm = MPI_COMM_WORLD; - int numProcs = stk::parallel_machine_size(comm); - int procRank = stk::parallel_machine_rank(comm); - if (4 == numProcs) - { - QuadMeshBuilder Mesh(comm, "4ProcQuadRemove"); - Mesh.commit_meta(); - - Mesh.begin_modification(); - Mesh.fill_area_randomly(1, 4, 1, 4); - Mesh.end_modification(); - - EXPECT_EQ(4u, Mesh.num_elems()); - - Mesh.begin_modification(); - Mesh.remove_element(1, 1); - Mesh.end_modification(); - - if (0 == procRank) - { - EXPECT_EQ(3u, Mesh.num_elems()); - } - else - { - EXPECT_EQ(4u, Mesh.num_elems()); - } - - Mesh.begin_modification(); - Mesh.remove_element(1, 2); - Mesh.remove_element(1, 3); - Mesh.remove_element(1, 4); - Mesh.end_modification(); - - EXPECT_EQ(3u, Mesh.num_elems()); - } -} -TEST(MeshBuilder, 1ProcHexRemove) -{ - stk::ParallelMachine comm = MPI_COMM_WORLD; - int numProcs = stk::parallel_machine_size(comm); - if (1 == numProcs) - { - HexMeshBuilder Mesh(comm, "1ProcHexRemove"); - Mesh.commit_meta(); - - Mesh.begin_modification(); - Mesh.fill_area(1, 2, 1, 2, 1, 2); - Mesh.end_modification(); - - EXPECT_EQ(8u, Mesh.num_elems()); - - Mesh.begin_modification(); - Mesh.remove_element(1, 1, 1); - Mesh.begin_modification(); - - EXPECT_EQ(7u, Mesh.num_elems()); - } -} -TEST(MeshBuilder, 4ProcHexRemove) -{ - stk::ParallelMachine comm = MPI_COMM_WORLD; - int numProcs = stk::parallel_machine_size(comm); - int procRank = stk::parallel_machine_rank(comm); - if (4 == numProcs) - { - HexMeshBuilder Mesh(comm, "4ProcHexRemove"); - Mesh.commit_meta(); - - Mesh.begin_modification(); - Mesh.fill_area(1, 4, 1, 4, 1, 4); - Mesh.end_modification(); - - stk::mesh::EntityVector elements; - stk::mesh::get_entities(Mesh.bulk_data(), stk::topology::ELEM_RANK, elements); - EXPECT_EQ(16u, Mesh.num_elems()); - - Mesh.begin_modification(); - Mesh.remove_element(1, 1, 1); - Mesh.end_modification(); - - stk::mesh::get_entities(Mesh.bulk_data(), stk::topology::ELEM_RANK, elements); - - if (0 == procRank) - { - EXPECT_EQ(15u, Mesh.num_elems()); - } - else - { - EXPECT_EQ(16u, Mesh.num_elems()); - } - - Mesh.begin_modification(); - Mesh.remove_element(1, 1, 2); - Mesh.remove_element(1, 1, 3); - Mesh.remove_element(1, 1, 4); - Mesh.end_modification(); - - stk::mesh::get_entities(Mesh.bulk_data(), stk::topology::ELEM_RANK, elements); - EXPECT_EQ(15u, Mesh.num_elems()); - } -} -TEST(MeshBuilder, 1ProcQuadRemoveArea) -{ - stk::ParallelMachine comm = MPI_COMM_WORLD; - int numProcs = stk::parallel_machine_size(comm); - if (1 == numProcs) - { - QuadMeshBuilder Mesh(comm, "1ProcQuadRemoveArea"); - Mesh.commit_meta(); - - Mesh.begin_modification(); - Mesh.fill_area_randomly(1, 5, 1, 5); - Mesh.end_modification(); - - EXPECT_EQ(25u, Mesh.num_elems()); - - Mesh.begin_modification(); - Mesh.remove_area(1, 3, 1, 3); - Mesh.end_modification(); - - EXPECT_EQ(16u, Mesh.num_elems()); - } -} -TEST(MeshBuilder, 4ProcQuadRemoveArea) -{ - stk::ParallelMachine comm = MPI_COMM_WORLD; - int numProcs = stk::parallel_machine_size(comm); - int procRank = stk::parallel_machine_rank(comm); - if (4 == numProcs) - { - QuadMeshBuilder Mesh(comm, "4ProcQuadRemoveArea"); - Mesh.commit_meta(); - - Mesh.begin_modification(); - Mesh.fill_area_randomly(1, 4, 1, 4); - Mesh.end_modification(); - - EXPECT_EQ(4u, Mesh.num_elems()); - - Mesh.begin_modification(); - Mesh.remove_area(1, 3, 1, 3); - Mesh.end_modification(); - - if (3 == procRank) - { - EXPECT_EQ(4u, Mesh.num_elems()); - } - else - { - EXPECT_EQ(1u, Mesh.num_elems()); - } - } -} -TEST(MeshBuilder, 1ProcHexRemoveArea) -{ - stk::ParallelMachine comm = MPI_COMM_WORLD; - int numProcs = stk::parallel_machine_size(comm); - if (1 == numProcs) - { - HexMeshBuilder Mesh(comm, "1ProcHexRemoveArea"); - Mesh.commit_meta(); - - Mesh.begin_modification(); - Mesh.fill_area(1, 3, 1, 3, 1, 3); - Mesh.end_modification(); - - EXPECT_EQ(27u, Mesh.num_elems()); - - Mesh.begin_modification(); - Mesh.remove_area(1, 2, 1, 2, 1, 2); - Mesh.end_modification(); - - EXPECT_EQ(19u, Mesh.num_elems()); - } -} -TEST(MeshBuilder, 4ProcHexRemoveArea) -{ - stk::ParallelMachine comm = MPI_COMM_WORLD; - int numProcs = stk::parallel_machine_size(comm); - if (4 == numProcs) - { - HexMeshBuilder Mesh(comm, "4ProcHexRemoveArea"); - Mesh.commit_meta(); - - Mesh.begin_modification(); - Mesh.fill_area(1, 4, 1, 4, 1, 4); - Mesh.end_modification(); - - EXPECT_EQ(16u, Mesh.num_elems()); - - Mesh.begin_modification(); - Mesh.remove_area(1, 4, 1, 1, 1, 4); - Mesh.end_modification(); - - EXPECT_EQ(12u, Mesh.num_elems()); - } -} -TEST(MeshSnake, 1ProcQuadSnakeConstruction) -{ - stk::ParallelMachine comm = MPI_COMM_WORLD; - int numProcs = stk::parallel_machine_size(comm); - if (1 == numProcs) - { - QuadMeshBuilder Mesh(comm, "1ProcQuadSnakeConstruction"); - Mesh.commit_meta(); - - QuadMeshSnake Snake(Mesh); - EXPECT_EQ(1u, Snake.x_lower_bound()); - EXPECT_EQ(1u, Snake.x_upper_bound()); - EXPECT_EQ(1u, Snake.y_lower_bound()); - EXPECT_EQ(1u, Snake.y_upper_bound()); - EXPECT_EQ(1u, Snake.x_pos()); - EXPECT_EQ(1u, Snake.y_pos()); - } -} -TEST(MeshSnake, 1ProcQuadSnakeBounds) -{ - stk::ParallelMachine comm = MPI_COMM_WORLD; - int numProcs = stk::parallel_machine_size(comm); - if (1 == numProcs) - { - QuadMeshBuilder Mesh(comm, "1ProcQuadSnakeBounds"); - Mesh.commit_meta(); - - QuadMeshSnake Snake(Mesh); - Snake.set_x_bounds(2, 10); - Snake.set_y_bounds(1, 5); - Snake.set_x_pos(3); - Snake.set_y_pos(2); - - EXPECT_EQ(2u, Snake.x_lower_bound()); - EXPECT_EQ(10u, Snake.x_upper_bound()); - EXPECT_EQ(1u, Snake.y_lower_bound()); - EXPECT_EQ(5u, Snake.y_upper_bound()); - EXPECT_EQ(3u, Snake.x_pos()); - EXPECT_EQ(2u, Snake.y_pos()); - - Snake.set_x_pos(1); - Snake.set_y_pos(10); - - EXPECT_EQ(3u, Snake.x_pos()); - EXPECT_EQ(2u, Snake.y_pos()); - - Snake.set_pos(6, 5); - - EXPECT_EQ(6u, Snake.x_pos()); - EXPECT_EQ(5u, Snake.y_pos()); - - } -} -TEST(MeshSnake, 1ProcQuadSnakeBegin) -{ - stk::ParallelMachine comm = MPI_COMM_WORLD; - int numProcs = stk::parallel_machine_size(comm); - if (1 == numProcs) - { - QuadMeshBuilder Mesh(comm, "1ProcQuadSnakeBegin"); - Mesh.commit_meta(); - - Mesh.begin_modification(); - Mesh.fill_area_randomly(1, 5, 1, 5); - Mesh.end_modification(); - - QuadMeshSnake Snake(Mesh); - Snake.set_x_bounds(1, 5); - Snake.set_y_bounds(1, 5); - Snake.set_x_pos(1); - Snake.set_y_pos(1); - - EXPECT_EQ(INVALID_DIR, Snake.dir()); - - Snake.begin_snake(); - - EXPECT_NE(INVALID_DIR, Snake.dir()); - } -} -TEST(MeshSnake, 1ProcHexSnakeConstruction) -{ - stk::ParallelMachine comm = MPI_COMM_WORLD; - int numProcs = stk::parallel_machine_size(comm); - if (1 == numProcs) - { - HexMeshBuilder Mesh(comm, "1ProcQuadSnakeConstruction"); - Mesh.commit_meta(); - - HexMeshSnake Snake(Mesh); - EXPECT_EQ(1u, Snake.x_lower_bound()); - EXPECT_EQ(1u, Snake.x_upper_bound()); - EXPECT_EQ(1u, Snake.y_lower_bound()); - EXPECT_EQ(1u, Snake.y_upper_bound()); - EXPECT_EQ(1u, Snake.z_lower_bound()); - EXPECT_EQ(1u, Snake.z_upper_bound()); - EXPECT_EQ(1u, Snake.x_pos()); - EXPECT_EQ(1u, Snake.y_pos()); - EXPECT_EQ(1u, Snake.z_pos()); - } -} -TEST(MeshSnake, 1ProcHexSnakeBounds) -{ - stk::ParallelMachine comm = MPI_COMM_WORLD; - int numProcs = stk::parallel_machine_size(comm); - if (1 == numProcs) - { - HexMeshBuilder Mesh(comm, "1ProcHexSnakeBounds"); - Mesh.commit_meta(); - - HexMeshSnake Snake(Mesh); - Snake.set_x_bounds(2, 10); - Snake.set_y_bounds(1, 5); - Snake.set_z_bounds(4, 12); - Snake.set_x_pos(3); - Snake.set_y_pos(2); - Snake.set_z_pos(5); - - EXPECT_EQ(2u, Snake.x_lower_bound()); - EXPECT_EQ(10u, Snake.x_upper_bound()); - - EXPECT_EQ(1u, Snake.y_lower_bound()); - EXPECT_EQ(5u, Snake.y_upper_bound()); - - EXPECT_EQ(4u, Snake.z_lower_bound()); - EXPECT_EQ(12u, Snake.z_upper_bound()); - - EXPECT_EQ(3u, Snake.x_pos()); - EXPECT_EQ(2u, Snake.y_pos()); - EXPECT_EQ(5u, Snake.z_pos()); - - Snake.set_x_pos(1); - Snake.set_y_pos(10); - Snake.set_z_pos(1); - - EXPECT_EQ(3u, Snake.x_pos()); - EXPECT_EQ(2u, Snake.y_pos()); - EXPECT_EQ(5u, Snake.z_pos()); - - Snake.set_pos(6, 5, 6); - - EXPECT_EQ(6u, Snake.x_pos()); - EXPECT_EQ(5u, Snake.y_pos()); - EXPECT_EQ(6u, Snake.z_pos()); - } -} -TEST(MeshSnake, 1ProcHexSnakeBegin) -{ - stk::ParallelMachine comm = MPI_COMM_WORLD; - int numProcs = stk::parallel_machine_size(comm); - if (1 == numProcs) - { - HexMeshBuilder Mesh(comm, "1ProcQuadSnakeBegin"); - Mesh.commit_meta(); - - Mesh.begin_modification(); - Mesh.fill_area(1, 5, 1, 5, 1, 5); - Mesh.end_modification(); - - HexMeshSnake Snake(Mesh); - Snake.set_x_bounds(1, 5); - Snake.set_y_bounds(1, 5); - Snake.set_z_bounds(1, 5); - Snake.set_x_pos(2); - Snake.set_y_pos(2); - Snake.set_z_pos(2); - - EXPECT_EQ(INVALID_DIR, Snake.dir()); - - Snake.begin_snake(); - - EXPECT_NE(INVALID_DIR, Snake.dir()); - } -} - -} diff --git a/packages/stk/stk_learning/MpiPlusOpenMp/mpiPlusOpenMp.C b/packages/stk/stk_learning/MpiPlusOpenMp/mpiPlusOpenMp.C deleted file mode 100644 index 85d0dff1a96f..000000000000 --- a/packages/stk/stk_learning/MpiPlusOpenMp/mpiPlusOpenMp.C +++ /dev/null @@ -1,145 +0,0 @@ -// Copyright 2002 - 2008, 2010, 2011 National Technology Engineering -// Solutions of Sandia, LLC (NTESS). Under the terms of Contract -// DE-NA0003525 with NTESS, the U.S. Government retains certain rights -// in this software. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// -// * Neither the name of NTESS nor the names of its contributors -// may be used to endorse or promote products derived from this -// software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// - -#include - -#include -#include -#include - -#if defined(_OPENMP) && !defined(__INTEL_COMPILER) -#include - -namespace -{ - -TEST(MpiPlusOpenMp, HelloWorld) -{ -#pragma omp parallel - { - std::cout << "Hello World\n"; - } -} - -int getNumProcs() -{ - return stk::parallel_machine_size(MPI_COMM_WORLD); -} - -int getProcId() -{ - return stk::parallel_machine_rank(MPI_COMM_WORLD); -} - -int getNumThreads() -{ - int numThreads = -1; - #pragma omp parallel - { - #pragma omp single - numThreads = omp_get_num_threads(); - } - return numThreads; -} - -TEST(MpiPlusOpenMp, Reduction) -{ - omp_set_num_threads(8); - - double threadSum = 0; - #pragma omp parallel reduction(+:threadSum) - { - threadSum = 1.0; - } - - double mpiSum = -1; - const int numItemsPerProc = 1; - stk::all_reduce_sum(MPI_COMM_WORLD, &threadSum, &mpiSum, numItemsPerProc); - - int numProcs = getNumProcs(); - int numThreads = getNumThreads(); - EXPECT_EQ(numThreads*numProcs, mpiSum); -} - -TEST(MpiPlusOpenMp, VectorSumReduction) -{ - int numProcs = getNumProcs(); -// size_t sizeOfGlobalVector = 4032000000; - size_t sizeOfGlobalVector = 40320000; - ASSERT_EQ(0u, sizeOfGlobalVector%numProcs); - size_t sizeOfLocalVector = sizeOfGlobalVector / numProcs; - double initVal = 1.0; - - double *vec = new double[sizeOfLocalVector]; - #pragma omp parallel for - for (size_t i = 0; i < sizeOfLocalVector; i++) - { - vec[i] = initVal; - } - - double start_time_wall = stk::wall_time(); - - double threadSum = 0; - #pragma omp parallel - { - #pragma omp for reduction(+:threadSum) - for (size_t i = 0; i < sizeOfLocalVector; i++) - { - threadSum += vec[i]; - } - } - - double mpiSum = -1; - const int numItemsPerProc = 1; - stk::all_reduce_sum(MPI_COMM_WORLD, &threadSum, &mpiSum, numItemsPerProc); - - double end_time_wall = stk::wall_time(); - - int procId = getProcId(); - if(procId == 0) - { - int numThreads = getNumThreads(); - std::stringstream ss; - ss << "Num MPI processes: " << numProcs << " "; - ss << "Num threads per process: " << numThreads << " "; - ss << "Wall Time: " << (end_time_wall - start_time_wall) << std::endl; - std::cerr << ss.str(); - } - - EXPECT_EQ(sizeOfGlobalVector*initVal, mpiSum); - delete [] vec; -} - -} -#endif diff --git a/packages/stk/stk_learning/OpenMP/openMP.C b/packages/stk/stk_learning/OpenMP/openMP.C deleted file mode 100644 index a30d0216b65b..000000000000 --- a/packages/stk/stk_learning/OpenMP/openMP.C +++ /dev/null @@ -1,276 +0,0 @@ -// Copyright 2002 - 2008, 2010, 2011 National Technology Engineering -// Solutions of Sandia, LLC (NTESS). Under the terms of Contract -// DE-NA0003525 with NTESS, the U.S. Government retains certain rights -// in this software. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// -// * Neither the name of NTESS nor the names of its contributors -// may be used to endorse or promote products derived from this -// software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// - -#include -#include -#include -#include -#include - -#include -#include - -#if defined(_OPENMP) && !defined(__INTEL_COMPILER) -// there seems to be an issue with OpenMP combined with GoogleTest macros with Intel compilers -// example of error: -// openMP.C(206): internal error: assertion failed at: "shared/cfe/edgcpfe/checkdir.c", line 5531 -#include - -namespace -{ - -//DocTest1 -TEST(OPENMP, HelloWorldDontSetNumThreadsInsideCode) -{ - #pragma omp parallel - { - std::cout << "Hello, World!\n"; - } -} - -//DocTest2 -TEST(OpenMp, HelloWorldSetNumThreadsstart_timeInsideCode) -{ - int numThreads = 8; - omp_set_num_threads(numThreads); - #pragma omp parallel - { - std::cout << "Hello, World!\n"; - } -} - -//DocTest3 -TEST(OPENMP, HelloWorldUsingPrivate) -{ - int numThreads = 8; - omp_set_num_threads(numThreads); - int threadId = -1; - #pragma omp parallel private(threadId) - { - threadId = omp_get_thread_num(); - std::stringstream avoidScrambledOutputByHavingSingleCoutCommand; - avoidScrambledOutputByHavingSingleCoutCommand << "Hello, World! (from thread " << threadId << "/" << numThreads << ")" << std::endl; - std::cout << avoidScrambledOutputByHavingSingleCoutCommand.str(); - } -} - -//DocTest4 -// #define DO_OUTPUT -TEST(OpenMp, MatrixVectorMultiplyUsingThreads) -{ - int numThreads = 8; - omp_set_num_threads(numThreads); - size_t numRows = 2000; - size_t numCols = 2000; - std::vector > matrix(numRows); - std::vector vecIn(numCols, 1); - std::vector vecOut(numRows, 0); - for(size_t i = 0; i < numRows; i++) - { - matrix[i].resize(numCols, i + 1); - } - - double startTime = stk::cpu_time(); - double startWallTime = stk::wall_time(); - - #pragma omp parallel - { - #if defined(DO_OUTPUT) - int tid = omp_get_thread_num(); - std::ostringstream oss; - oss << "Thread_" << tid; - std::string filename = oss.str(); - std::ofstream output(filename.c_str()); - #endif - numThreads = omp_get_num_threads(); - #pragma omp for - for(size_t i = 0; i < numRows; i++) - { - #if defined(DO_OUTPUT) - output << "Thread " << tid << " working on row " << i << std::endl; - #endif - for(size_t j = 0; j < numCols; j++) - { - vecOut[i] += matrix[i][j] * vecIn[j]; - } - } - #if defined(DO_OUTPUT) - output.close(); - #endif - } - - double endTime = stk::cpu_time(); - double endWallTime = stk::wall_time(); - - std::cerr << "Num threads: " << numThreads << std::endl; - std::cerr << "Time: " << (endTime - startTime)/static_cast(numThreads) << std::endl; - std::cerr << "Wall Time: " << (endWallTime - startWallTime) << std::endl; - - for(size_t i = 0; i < numRows; i++) - { - double goldAnswer = (i + 1) * numCols; - EXPECT_EQ(goldAnswer, vecOut[i]); - } -} - -//DocTest5 -TEST(OpenMp, SumOverVector) -{ - int numThreads = 8; - omp_set_num_threads(numThreads); - //size_t sizeOfVector = 4000000000; - size_t sizeOfVector = 1000000; - double initVal = 1.0; - std::vector vec(sizeOfVector, initVal); - - double sum = 0; - - double startTime = stk::cpu_time(); - double startWallTime = stk::wall_time(); - - #pragma omp parallel - { - numThreads = omp_get_num_threads(); - #pragma omp for reduction(+:sum) - for (size_t i = 0; i < sizeOfVector; i++) - { - sum += vec[i]; - } - } - - double endTime = stk::cpu_time(); - double endWallTime = stk::wall_time(); - - std::cerr << "Num threads: " << numThreads << std::endl; - std::cerr << "Time: " << (endTime - startTime)/static_cast(numThreads) << std::endl; - std::cerr << "Wall Time: " << (endWallTime - startWallTime) << std::endl; - - double goldAnswer = sizeOfVector*initVal; - EXPECT_EQ(goldAnswer, sum); -} - -//DocTest6 -TEST(OpenMp, SumUsingSections) -{ - int numThreads = 2; - omp_set_num_threads(numThreads); - - size_t sizeOfVector = 100000; - double initVal = 1.0; - std::vector vec(sizeOfVector,initVal); - - double sum1 = 0, sum2 = 0; - - double startTime = stk::cpu_time(); - double startWallTime = stk::wall_time(); - - size_t halfLoopSize = sizeOfVector/2; - - #pragma omp parallel - { - numThreads = omp_get_num_threads(); - #pragma omp sections - { - #pragma omp section - { - std::cerr << "Loop 1: hello from thread: " << omp_get_thread_num() << std::endl; - for (size_t i = 0; i < halfLoopSize; i++) - { - sum1 += vec[i]; - } - } - #pragma omp section - { - std::cerr << "Loop 2: hello from thread: " << omp_get_thread_num() << std::endl; - for (size_t i = halfLoopSize; i < sizeOfVector; i++) - { - sum2 += vec[i]; - } - } - } - } - - double sum = sum1 + sum2; - - double endTime = stk::cpu_time(); - double endWallTime = stk::wall_time(); - - std::cerr << "Num threads: " << numThreads << std::endl; - std::cerr << "Time: " << (endTime - startTime)/static_cast(numThreads) << std::endl; - std::cerr << "Wall Time: " << (endWallTime - startWallTime) << std::endl; - - double goldAnswer = sizeOfVector*initVal; - EXPECT_EQ(goldAnswer, sum); -} -//EndDocTest - -//DocTestForLearningAboutPrivates -struct SimpleDefaultedInt -{ - SimpleDefaultedInt() : value(-1) {} - SimpleDefaultedInt(int defaultValue) : value(defaultValue) {} - int value; -}; - -TEST(OpenMp, learningAboutPrivates) -{ - SimpleDefaultedInt a(13); - SimpleDefaultedInt b(14); - SimpleDefaultedInt c(15); - - const int numberOfIterations = 10; - #pragma omp parallel private(a) firstprivate(b) shared(c) - { - EXPECT_NE(13, a.value); - EXPECT_EQ(14, b.value); - EXPECT_EQ(15, c.value); - #pragma omp barrier - #pragma omp for lastprivate(c) - for(int i =0; i <= numberOfIterations; i++) - { - EXPECT_NE(15, c.value); // with excruciatingly high probability - - a.value = i; - b.value = i; - c.value = i; - } - } - EXPECT_EQ(13, a.value); - EXPECT_EQ(14, b.value); - EXPECT_EQ(numberOfIterations, c.value); -} -//EndDocTest - -} // end namespace -#endif diff --git a/packages/stk/stk_learning/todstwd/bridge/.gitignore b/packages/stk/stk_learning/todstwd/bridge/.gitignore deleted file mode 100644 index 0c14e10cb847..000000000000 --- a/packages/stk/stk_learning/todstwd/bridge/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -my_* -*.e.* -*.e -saved_results diff --git a/packages/stk/stk_learning/todstwd/bridge/3car_bridge.png b/packages/stk/stk_learning/todstwd/bridge/3car_bridge.png deleted file mode 100644 index 345e43cba73b..000000000000 Binary files a/packages/stk/stk_learning/todstwd/bridge/3car_bridge.png and /dev/null differ diff --git a/packages/stk/stk_learning/todstwd/bridge/3cars.png b/packages/stk/stk_learning/todstwd/bridge/3cars.png deleted file mode 100644 index da56044ab84f..000000000000 Binary files a/packages/stk/stk_learning/todstwd/bridge/3cars.png and /dev/null differ diff --git a/packages/stk/stk_learning/todstwd/bridge/Paint.py b/packages/stk/stk_learning/todstwd/bridge/Paint.py deleted file mode 100644 index 8eabf1eb3d45..000000000000 --- a/packages/stk/stk_learning/todstwd/bridge/Paint.py +++ /dev/null @@ -1,475 +0,0 @@ -from tkinter import * -from tkinter import messagebox -import tkinter.font -from PIL import ImageTk,Image,ImageDraw -import os -import sys -import time - -def strnum(i): - num = "" - if (i < 10): - num = "0000" + str(i) - elif (i < 100): - num = "000" + str(i) - elif (i < 1000): - num = "00" + str(i) - elif (i < 10000): - num = "0" + str(i) - else: - num = str(i) - return num - -def file_cleanup(): - os.system('rm -f my_*') - os.system('rm -f *.jou') - os.system('rm -f bridgeFalls.e* bridgeLoads.e*') - os.system('rm -f *.log') - -def delete_frags(): - os.system("module purge;module load sierra-devel;python delete_small_frags.py") - -def get_points(): - # Max Pts = 331 - pts = 0 - fname = 'bridgeFull.log' - if os.path.isfile(fname): - f = open(fname,'r') - lines = f.readlines() - for line in lines: - if re.search("^Death Block: 'points'",line): - stuff = line.split() - pts = int(stuff[-2]) - return pts - -def assigned_colors(): - red = rgb2int( (255,0,0) ) - green = rgb2int( (0,255,0) ) - blue = rgb2int( (0,0,255) ) - black = rgb2int( (0,0,0) ) - brown = rgb2int( hex2rgb(brownHex()) ) - grey = rgb2int( hex2rgb(grayHex()) ) - return [ (black,1), - (red,2), - (green,3), - (blue,4), - (grey,5), - (brown,6) - ] - -def add_required_colors_to_pic(picName): - im = Image.open(picName) - (pw,ph) = im.size - pixs = im.load() - i = ph-1 - my_colors = assigned_colors() - for color,blkid in my_colors: - pixs[pw-1,i] = int2rgb(color) - i = i - 1 - im.save(picName) - -def rgb2hex(r,g,b): - hex = "#{:02x}{:02x}{:02x}".format(r,g,b) - return hex - -def int2rgb(rgbint): - return (rgbint // 256 // 256 % 256, rgbint // 256 % 256, rgbint % 256) - -def hex2rgb(value): - value = value.lstrip('#') - lv = len(value) - return tuple(int(value[i:i + lv // 3], 16) for i in range(0, lv, lv // 3)) - -def rgb2int( rgb ): - return 65536 * rgb[0] + 256 * rgb[1] + rgb[2] - - -def greenHex(): - return rgb2hex(0,255,0) - -def whiteHex(): - return rgb2hex(255,255,255) - -def grayHex(): - return rgb2hex(128,128,128) - -def brownHex(): - return rgb2hex(139,69,19) - -def genHexPix(rgbPix,pw,ph): - hex_pixs = [] - for x in range(pw): - pixs = [] - for y in range(ph): - r,g,b = rgbPix[x,y] - pixs.append(rgb2hex(r,g,b)) - hex_pixs.append(pixs) - return hex_pixs - -def pic_colors( im ): - (pw,ph) = im.size - pix = im.load() - colors = {} - pixel_id = 1 - hs = list( reversed( range(ph) ) ) - ws = range(pw) - for i in ws: - for j in hs: - pixel_color = rgb2int( pix[i,j] ) - if pixel_color in colors: - colors[ pixel_color ].append( pixel_id ) - else: - colors[ pixel_color ] = [ pixel_id ] - pixel_id = pixel_id + 1 - return colors - -def assign_ids_to_block( blk_id, ids, jouFile): - strIDs = [ str(x) for x in ids ] - jouFile.write('block ' + str(blk_id) + ' add hex ' + ' '.join(strIDs) + '\n') - -def assign_colors_to_blocks( im, jouFile ): - my_colors = assigned_colors() - png_colors = pic_colors( im ) - for color,blid in my_colors: - if color in png_colors: - assign_ids_to_block( blid, png_colors[color], jouFile ) - -def make_mesh_of_pic( pic_name, mesh_name ): - jouFile = open('make_mesh.jou','w') - im = Image.open(pic_name) - (pw,ph) = im.size - jouFile.write('brick x ' + str(pw) + ' y ' + str(ph) + ' z 1\n') - jouFile.write('vol all size 1.0\n') - jouFile.write('mesh vol all\n') - assign_colors_to_blocks( im, jouFile ) - jouFile.write('export mesh "' + mesh_name + '" overwrite\n') - jouFile.write('exit\n') - jouFile.close() - os.system('cubit -batch -nographics make_mesh.jou') - -def write_latex(builderName,score): - f = open('bridgeReport.tex','r') - latexLines = f.readlines() - f.close() - w = open('my_bridgeReport.tex','w') - builderName = builderName.replace('_',' ') - for line in latexLines: - line = line.replace('',str(builderName)) - line = line.replace('',str(score)) - w.write(line) - w.close() - -def make_base_file_name(builderName,score): - fname = strnum(score) + '_' + builderName.replace(' ','_') + '_' + time.strftime('%Y%m%d-%H%M%S') - return fname - -class PaintApp(tkinter.Frame): - - def run_full_sim(self): - os.system('module purge;module load sierra;sierra -j 16 adagio -i bridgeFull.i') - - def run_load_sim(self): - os.system('module purge;module load sierra;sierra -j 16 adagio -i bridgeLoad.i') - - def post_full_sim(self): - os.system('module purge;module load viz;pvpython make_paraview_pics.py') - os.system('module purge;module load viz;/usr/netpub/ffmpeg/bin/ffmpeg -i my_pic_%04d.png my_movie.avi') - os.system('module purge;module load viz;envideo my_movie.avi') - # os.system('module purge;module load viz;paraview --state=bridgeFalls_Stressed.pvsm') - write_latex( self.BuilderName.get(), self.compute_score() ) - os.system('pdflatex my_bridgeReport.tex') - os.system('evince my_bridgeReport.pdf') - if not os.path.isdir('saved_results'): - os.mkdir('saved_results') - bName = make_base_file_name(self.BuilderName.get(),self.compute_score() ) - rptName = bName + '.pdf' - picName = bName + '.png' - os.system('cp my_bridgeReport.pdf ./saved_results/' + rptName ) - os.system('cp my_bridge.png ./saved_results/' + picName ) - - def post_load_sim(self): - os.system('module purge;module load viz;paraview --state=bridgeLoads_Stressed.pvsm') - - def compute_score(self): - pts = get_points() - pt_frac = pts / 331 ## Full Pts all Cars across - cost_frac = 1.0 - self.cost / 9313.60 ## 8901.10 ## Less Cost more Pts - score = int(pt_frac * 10000) + int(cost_frac * 10000) - return score - - def reduce_image_size(self, imgName, reducedImgName, prevReductionFactor = 1): - im = Image.open(imgName) - (pw,ph) = im.size - pixs = im.load() - pwn = int(pw / 2) - phn = int(ph / 2) - imn = Image.new('RGB',(pwn,phn),(255,255,255)) - pixsn = imn.load() - xs = range(0,pw,2) - ys = range(0,ph,2) - print ("pwn=",pwn,"phn=",phn) - print ("xs=",len(xs),"ys=",len(ys)) - for x in range(pwn): - for y in range(phn): - x1 = xs[x] - x2 = x1 + 1 - y1 = ys[y] - y2 = y1 + 1 - ps = [ pixs[x1,y1], pixs[x1,y2], pixs[x2,y1], pixs[x2,y2] ] - ps = [ rgb2int(p) for p in ps ] - pm = int2rgb( min(ps) ) - pixsn[x,y] = pm - imn.save(reducedImgName) - - def line_draw(self,xs,ys,xe,ye,w=1,c_hex=None,c_rgb=(0,0,0),event=None): - if c_hex == None: - c_hex = rgb2hex(c_rgb) - else: - c_rgb = hex2rgb(c_hex) - - self.draw_save_image.line((xs,ys,xe,ye),c_rgb,width=w) - if event: - event.widget.create_line(xs,ys,xe,ye, - fill = c_hex, - capstyle = tkinter.PROJECTING, - width=w, smooth=True) - else: - self.drawing_area.create_line(xs,ys,xe,ye, - fill=c_hex, - width=w,capstyle=tkinter.PROJECTING, - smooth=False) - - def redraw_pic(self,drawAll=False): - white = rgb2hex(255,255,255) - if drawAll: - self.canvas_image = self.drawing_area.create_image(0,0,anchor=NW,image=self.image_tk) - for a in range(self.width): - for b in range(self.height): - self.draw_save_image.point((a,b),self.image_pix[a,b]) - else: - for a in range(self.width): - for b in range(self.height): - if self.image_pix_hex[a][b] != white: - self.line_draw(a,b,a+1,b+1,1,self.image_pix_hex[a][b],self.image_pix[a,b]) - - def left_but_down(self, event=None): - self.left_but = "down" - - #self.x_pos = event.x - #self.y_pos = event.y - - self.x1_line_pt = event.x - self.y1_line_pt = event.y - - def left_but_up(self, event=None): - self.left_but = "up" - - self.x_pos = None - self.y_pos = None - - self.x2_line_pt = event.x - self.y2_line_pt = event.y - - # Draw the line - if self.drawing_tool.get() == "Line": - self.line_draw(self.x1_line_pt, self.y1_line_pt, self.x2_line_pt, self.y2_line_pt, int(self.pensize), self.penColor.get(), None, event) - - # self.redraw_pic() - - def motion(self, event=None): - if self.drawing_tool.get() == "Pencil": - self.pencil_draw(event) - - # ---------- DRAW PENCIL ---------- - def pencil_draw(self, event=None): - if self.input_mode.get() == "Screen": - self.line_draw(event.x,event.y,event.x,event.y,int(self.pensize),self.penColor.get(),None,event) - elif self.left_but == "down": - # Make sure x and y have a value - if self.x_pos is not None and self.y_pos is not None: - self.line_draw(self.x_pos,self.y_pos,event.x,event.y,int(self.pensize),self.penColor.get(),None,event) - self.x_pos = event.x - self.y_pos = event.y - - def set_pensize(self,width): - self.pensize = width - - def delete_app(self): - self.master.destroy() - - def name_has_been_set(self): - if (self.BuilderName.get() == ""): - messagebox.showerror("Error", "Please enter a Builder Name") - return False - return True - - def cost_has_been_computed(self): - if (self.costVar.get() == "$0.00"): - messagebox.showerror("Error", "Before building, let's see how much this will cost. Press compute cost!") - return False - return True - - def compute_cost(self): - self.redraw_pic() - - grey = hex2rgb(grayHex()) - green = (0,255,0) - brown = hex2rgb(brownHex()) - - numGrey = 0 - numGreen = 0 - numBrown = 0 - - for pixel in self.saved_image.getdata(): - if pixel == grey: - numGrey = numGrey + 1 - elif pixel == green: - numGreen = numGreen + 1 - elif pixel == brown: - numBrown = numBrown + 1 - - self.cost = round(numGrey*0.05 + numGreen*0.03 + numBrown*0.01, 2) - costTxt = "$%.2f" % self.cost - - self.costVar.set(costTxt) - - def save_image(self): - file_cleanup() - self.compute_cost() - self.saved_image.save('my_bridge.png') - self.reduce_image_size('my_bridge.png','my_med_bridge.png') - self.reduce_image_size('my_med_bridge.png','my_small_bridge.png',2) - add_required_colors_to_pic('my_small_bridge.png') - make_mesh_of_pic('my_small_bridge.png','my_bridge.g') - delete_frags() - - def run_full(self): - if (not self.name_has_been_set() or not self.cost_has_been_computed()): return - self.save_image() - self.run_full_sim() - self.post_full_sim() - - def run_load(self): - if (not self.name_has_been_set() or not self.cost_has_been_computed()): return - self.save_image() - self.run_load_sim() - self.post_load_sim() - - def reset_image(self): - self.redraw_pic(True) - self.BuilderName.set("") - self.costVar.set("$0.00") - - def create_widgets(self): - ## Quit - self.quit = tkinter.Button(self, text="Quit", bg="red",command=self.delete_app) - self.quit.pack(side="bottom") - - ## Simulate Full - self.sim_full = tkinter.Button(self, text="Complete Simulation", command=self.run_full) - self.sim_full.pack(side="bottom") - - ## Simulate Gravity Load - self.sim_load = tkinter.Button(self, text="Simulate Gravity Load", command=self.run_load) - self.sim_load.pack(side="bottom") - - ## Cost - self.costRow = Frame(self) - self.costLabel = Label(self.costRow, width=12, text="Bridge Cost", anchor='w') - self.costVar = StringVar() - self.costEntry = Entry(self.costRow, width=15, textvariable=self.costVar) - self.costEntry.bind("",lambda e: "break") - self.costButton = tkinter.Button(self.costRow, text="Compute Cost", command=self.compute_cost) - self.costRow.pack(side=BOTTOM, fill=X) - self.costButton.pack(side=RIGHT) - self.costEntry.pack(side=RIGHT, expand=YES, fill=X) - self.costLabel.pack(side=RIGHT) - self.costVar.set("$0.00") - - ## Builder Name - self.entryRow = Frame(self) - self.nameLabel = Label(self.entryRow, width=12, text="Builder Name", anchor='w') - self.BuilderName = StringVar() - self.nameEntry = Entry(self.entryRow, width=15, textvariable=self.BuilderName) - self.entryRow.pack(side=BOTTOM, fill=X) - self.nameEntry.pack(side=RIGHT, expand=YES, fill=X) - self.nameLabel.pack(side=RIGHT) - self.BuilderName.set("") - - ## Screen mode - self.input_mode = StringVar() - self.input_tools = {"Mouse":"Mouse", "Screen":"Touch Screen"} - for tool, toolTxt in self.input_tools.items(): - b = Radiobutton(self, text=toolTxt, variable=self.input_mode, value=tool, indicatoron=0) - b.pack(side=RIGHT, anchor=W) - self.input_mode.set("Mouse") - self.bufferLabel = Label(self, width=5, text="", anchor='w') - self.bufferLabel.pack(side=RIGHT) - - ## Drawing tool - self.drawing_tool = StringVar() - self.tools = {"Line":"Line Draw", "Pencil":"Free Draw"} - for tool, toolTxt in self.tools.items(): - b = Radiobutton(self, text=toolTxt, variable=self.drawing_tool, value=tool, indicatoron=0) - b.pack(side=RIGHT, anchor=W) - self.drawing_tool.set("Pencil") - - ## Pensize - self.slider = tkinter.Scale(self, label="Pen Size", from_=12, to=24, command=self.set_pensize, orient=tkinter.HORIZONTAL) - self.slider.set(5) - self.slider.pack(side="right") - - ## Pen color corresponding to material - self.penColor = StringVar() - self.materials = {"Eraser": whiteHex(), - "Wood": brownHex(), - "Aluminum": greenHex(), - "Steel": grayHex(),} - - for material, color in self.materials.items(): - b = Radiobutton(self, text=material, variable=self.penColor, value=color, indicatoron=0) - b.pack(side=RIGHT, anchor=W) - self.penColor.set(grayHex()) - - ## Cleanup - self.reset = tkinter.Button(self, text="Clean Up", command=self.redraw_pic) - self.reset.pack(side="right") - - ## Reset - self.reset = tkinter.Button(self, text="Reset", command=self.reset_image) - self.reset.pack(side="right") - - def __init__(self, master=None): - super().__init__(master) - self.pack() - # Tracks whether left mouse is down - self.left_but = "up" - # x and y positions for drawing with pencil - self.x_pos, self.y_pos = None, None - # x and y positions when mouse is clicked and released - self.x1_line_pt, self.y1_line_pt, self.x2_line_pt, self.y2_line_pt= None, None, None, None - self.pensize = 12 - self.background_image = '3car_bridge.png' - self.image = Image.open(self.background_image) - self.width = self.image.size[0] - self.height = self.image.size[1] - self.saved_image = Image.new('RGB',(self.width,self.height),(255,255,255)) - self.draw_save_image = ImageDraw.Draw(self.saved_image) - self.image_pix = self.image.load() - self.image_pix_hex = genHexPix(self.image_pix,self.width,self.height) - self.image_tk = ImageTk.PhotoImage(self.image) - self.drawing_area = Canvas(root,width=self.width,height=self.height) - self.drawing_area.pack() - self.drawing_area.bind("", self.motion) - self.drawing_area.bind("", self.left_but_down) - self.drawing_area.bind("", self.left_but_up) - self.create_widgets() - self.reset_image() - - -if __name__ == "__main__": - root = Tk() - paint_app = PaintApp(root) - root.mainloop() - file_cleanup() - diff --git a/packages/stk/stk_learning/todstwd/bridge/README.txt b/packages/stk/stk_learning/todstwd/bridge/README.txt deleted file mode 100644 index 5aacbeaeae58..000000000000 --- a/packages/stk/stk_learning/todstwd/bridge/README.txt +++ /dev/null @@ -1,13 +0,0 @@ -To run: - -ln -s /gpfs1/trshelt/todstwd/saved_results . - -module load sierra-devel -bake disconnected_component_finder adagio - -module purge -module load sntool -module load percept/anaconda - -python Paint.py - diff --git a/packages/stk/stk_learning/todstwd/bridge/bridgeFalls_Stressed.pvsm b/packages/stk/stk_learning/todstwd/bridge/bridgeFalls_Stressed.pvsm deleted file mode 100644 index 10510acf382f..000000000000 --- a/packages/stk/stk_learning/todstwd/bridge/bridgeFalls_Stressed.pvsm +++ /dev/null @@ -1,6547 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/packages/stk/stk_learning/todstwd/bridge/bridgeFull.i b/packages/stk/stk_learning/todstwd/bridge/bridgeFull.i deleted file mode 100644 index 98421d04ca21..000000000000 --- a/packages/stk/stk_learning/todstwd/bridge/bridgeFull.i +++ /dev/null @@ -1,275 +0,0 @@ -begin sierra TOSDTWD Bridge - - define direction down with vector 0.0 -1.0 0.0 - - begin definition for function DUMMY - type is piecewise linear - begin values - 0.0 0.0 - 1.0 1.0 - end values - end definition for function DUMMY - - begin definition for function pointsFunc - type = analytic - expression variable: x = nodal coordinates(x) - expression variable: y = nodal coordinates(y) - evaluate expression = " x > 100.0 ? ( y > 18.5 ? 1.0 : 0.0 ) : 0.0" - end - - # { gc = 32.0 } - # { mock_steel_mod = 4.176e9 } - # { mock_steel_dens = 490 } - # { mock_steel_peak_stress = 2e7 } - # { steel_dens = 8.26 } - # { aluminum_dens = 2.69 } - # { wood_dens = 0.56 } - # { steel_stiff = 235.0 } - # { aluminum_stiff = 68.0 } - # { wood_stiff = 8.0 } - - begin material steel - density = {mock_steel_dens} - begin parameters for model elastic - youngs modulus = {mock_steel_mod} - poissons ratio = 0.26 - end - end - - begin material aluminum - density = { mock_steel_dens * aluminum_dens / steel_dens } - begin parameters for model elastic - youngs modulus = { mock_steel_mod * aluminum_stiff / steel_stiff } - poissons ratio = 0.26 - end parameters for model elastic - end - - begin material wood - density = { mock_steel_dens * wood_dens / steel_dens } - begin parameters for model elastic - youngs modulus = { mock_steel_mod * wood_stiff / steel_stiff } - poissons ratio = 0.26 - end parameters for model elastic - end - - begin material car_mat - density = { ( mock_steel_dens * aluminum_dens / steel_dens ) * 0.1 } - begin parameters for model elastic - youngs modulus = { (mock_steel_mod * aluminum_stiff / steel_stiff) * 0.1 } - poissons ratio = 0.26 - end parameters for model elastic - end - - begin finite element model bridgeFalls - Database name = my_bridge_clean.g - Database type = exodusII - - begin parameters for block block_1 # black pixels - material = steel - model = elastic - end parameters for block block_1 - begin parameters for block block_2 # red pixels - material = steel - model = elastic - end parameters for block block_2 - begin parameters for block block_3 # green pixels - material = aluminum - model = elastic - end parameters for block block_3 - begin parameters for block block_4 # blue pixels - material = car_mat - model = elastic - end parameters for block block_4 - begin parameters for block block_5 # grey pixels - material = steel - model = elastic - end parameters for block block_5 - begin parameters for block block_6 # brown pixels - material = wood - model = elastic - end parameters for block block_6 - end - - begin solid mechanics procedure adagio_procedure_1 - - begin time control - begin time stepping block p0 - start time = 0.0 - begin parameters for adagio region adagio_1 - number of time steps = 10 - end parameters for adagio region adagio_1 - end - termination time = 1.0 - end time control - - begin solid mechanics region adagio_1 - use finite element model bridgeFalls - - begin gravity - include all blocks - direction = down - function = dummy - gravitational constant = {gc} - end - - begin fixed displacement - include all blocks - components = z - end fixed displacement - - begin fixed displacement - block = block_2 block_4 - components = x y - end fixed displacement - - - begin results output output_adagio - database name = bridgeLoads.e - database type = exodusII - at step 0 interval = 1 - nodal variables = displacement as displ - element variables = von_mises as stress - end results output output_adagio - - begin contact definition - skin all blocks = on - begin interaction defaults - general contact = on - self contact = on - constraint formulation = node_face - end - end - - begin solver - begin cg - maximum iterations = 500 - begin full tangent preconditioner - tangent diagonal scale = 1e-6 - end - target relative residual = 1e-8 - acceptable relative residual = 1.0 - end - begin control contact - maximum iterations = 10 - acceptable relative residual = 1e-2 - target relative residual = 1e-4 - end - end - end - end - begin solid mechanics procedure presto_procedure - - begin procedural transfer migration1 - include all blocks - end - - begin time control - begin time stepping block p0 - start time = 0.0 - begin parameters for presto region presto1 - - end - end - termination time = 3.0 - end time control - - begin solid mechanics region presto1 - use finite element model bridgeFalls - - begin node based time step parameters - step interval = 100 - end - - begin gravity - include all blocks - direction = down - gravitational constant = {gc} - end - - begin fixed displacement - include all blocks - components = z - end fixed displacement - - begin fixed displacement - block = block_2 - components = x y - end fixed displacement - - begin initial condition - block = block_4 - initialize variable name = velocity - variable type = node - magnitude = {50*1.50} 0 0 - end - - begin results output output_adagio - database name = bridgeFalls.e - database type = exodusII - at time 0.0 interval = 1.0e-2 - nodal variables = displacement as displ - nodal variables = points - global variables = total_points - element variables = von_mises as stress - element variables = death_status as death - end results output output_adagio - - begin contact definition - skin all blocks = on - begin interaction defaults - general contact = on - self contact = on - constraint formulation = node_face - end - ##begin enforcement options - ## momentum balance iterations = 1 - ##end - end - - ##begin mass scaling - ## include all blocks - ## target time step = 3.0e-4 - ##end - - # { check_death = 10 } - begin element death steel - block = block_1 block_5 - criterion is element value of von_mises > {mock_steel_peak_stress} - check step interval = {check_death} - end - begin element death aluminum - block = block_3 - criterion is element value of von_mises > {mock_steel_peak_stress * aluminum_stiff/steel_stiff} - check step interval = {check_death} - end - begin element death wood - block = block_6 - criterion is element value of von_mises > {mock_steel_peak_stress * wood_stiff/steel_stiff} - check step interval = {check_death} - end - begin element death points - block = block_4 - criterion is max nodal value of points >= 0.5 - end - begin element death bounds - include all blocks - check step interval = {check_death} - criterion is avg nodal value of coordinates(x) >= 101 - criterion is avg nodal value of coordinates(x) <= -101 - #criterion is avg nodal value of coordinates(y) >= 40 - criterion is avg nodal value of coordinates(y) <= -40 - end - begin element death inversion - include all blocks - death on inversion = on - end - - begin user output - block = block_4 - compute nodal points as function pointsFunc - compute at every step - end - - end - end -end sierra diff --git a/packages/stk/stk_learning/todstwd/bridge/bridgeLoad.i b/packages/stk/stk_learning/todstwd/bridge/bridgeLoad.i deleted file mode 100644 index 623e1638bf71..000000000000 --- a/packages/stk/stk_learning/todstwd/bridge/bridgeLoad.i +++ /dev/null @@ -1,160 +0,0 @@ -begin sierra TOSDTWD Bridge - - define direction down with vector 0.0 -1.0 0.0 - - begin definition for function DUMMY - type is piecewise linear - begin values - 0.0 0.0 - 1.0 1.0 - end values - end definition for function DUMMY - - begin definition for function pointsFunc - type = analytic - expression variable: x = nodal coordinates(x) - expression variable: y = nodal coordinates(y) - evaluate expression = " x > 100.0 ? ( y > 18.5 ? 1.0 : 0.0 ) : 0.0" - end - - # { gc = 32.0 } - # { mock_steel_mod = 4.176e9 } - # { mock_steel_dens = 490 } - # { mock_steel_peak_stress = 2e7 } - # { steel_dens = 8.26 } - # { aluminum_dens = 2.69 } - # { wood_dens = 0.56 } - # { steel_stiff = 235.0 } - # { aluminum_stiff = 68.0 } - # { wood_stiff = 8.0 } - - begin material steel - density = {mock_steel_dens} - begin parameters for model elastic - youngs modulus = {mock_steel_mod} - poissons ratio = 0.26 - end - end - - begin material aluminum - density = { mock_steel_dens * aluminum_dens / steel_dens } - begin parameters for model elastic - youngs modulus = { mock_steel_mod * aluminum_stiff / steel_stiff } - poissons ratio = 0.26 - end parameters for model elastic - end - - begin material wood - density = { mock_steel_dens * wood_dens / steel_dens } - begin parameters for model elastic - youngs modulus = { mock_steel_mod * wood_stiff / steel_stiff } - poissons ratio = 0.26 - end parameters for model elastic - end - - begin material car_mat - density = { ( mock_steel_dens * aluminum_dens / steel_dens ) * 0.1 } - begin parameters for model elastic - youngs modulus = { (mock_steel_mod * aluminum_stiff / steel_stiff) * 0.1 } - poissons ratio = 0.26 - end parameters for model elastic - end - - begin finite element model bridgeFalls - Database name = my_bridge_clean.g - Database type = exodusII - - begin parameters for block block_1 # black pixels - material = steel - model = elastic - end parameters for block block_1 - begin parameters for block block_2 # red pixels - material = steel - model = elastic - end parameters for block block_2 - begin parameters for block block_3 # green pixels - material = aluminum - model = elastic - end parameters for block block_3 - begin parameters for block block_4 # blue pixels - material = car_mat - model = elastic - end parameters for block block_4 - begin parameters for block block_5 # grey pixels - material = steel - model = elastic - end parameters for block block_5 - begin parameters for block block_6 # brown pixels - material = wood - model = elastic - end parameters for block block_6 - end - - begin solid mechanics procedure adagio_procedure_1 - - begin time control - begin time stepping block p0 - start time = 0.0 - begin parameters for adagio region adagio_1 - number of time steps = 10 - end parameters for adagio region adagio_1 - end - termination time = 1.0 - end time control - - begin solid mechanics region adagio_1 - use finite element model bridgeFalls - - begin gravity - include all blocks - direction = down - function = dummy - gravitational constant = {gc} - end - - begin fixed displacement - include all blocks - components = z - end fixed displacement - - begin fixed displacement - block = block_2 block_4 - components = x y - end fixed displacement - - - begin results output output_adagio - database name = bridgeLoads.e - database type = exodusII - at step 0 interval = 1 - nodal variables = displacement as displ - element variables = von_mises as stress - end results output output_adagio - - begin contact definition - skin all blocks = on - begin interaction defaults - general contact = on - self contact = on - constraint formulation = node_face - end - end - - begin solver - begin cg - maximum iterations = 500 - begin full tangent preconditioner - tangent diagonal scale = 1e-6 - end - target relative residual = 1e-8 - acceptable relative residual = 1.0 - end - begin control contact - maximum iterations = 10 - acceptable relative residual = 1e-2 - target relative residual = 1e-4 - end - end - end - end -end sierra diff --git a/packages/stk/stk_learning/todstwd/bridge/bridgeLoads_Stressed.pvsm b/packages/stk/stk_learning/todstwd/bridge/bridgeLoads_Stressed.pvsm deleted file mode 100644 index 70b744747cee..000000000000 --- a/packages/stk/stk_learning/todstwd/bridge/bridgeLoads_Stressed.pvsm +++ /dev/null @@ -1,4157 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/packages/stk/stk_learning/todstwd/bridge/bridgeReport.tex b/packages/stk/stk_learning/todstwd/bridge/bridgeReport.tex deleted file mode 100644 index ea8a415d5fc2..000000000000 --- a/packages/stk/stk_learning/todstwd/bridge/bridgeReport.tex +++ /dev/null @@ -1,79 +0,0 @@ -%---------------------------------------------------------------------------------------- -% PACKAGES AND OTHER DOCUMENT CONFIGURATIONS -%---------------------------------------------------------------------------------------- - -\documentclass[12pt]{article} -\usepackage[utf8x]{inputenc} -\usepackage{amsmath} -\usepackage{graphicx} -\usepackage{xcolor} -\usepackage{framed} -\usepackage[a4paper,bindingoffset=0.2in,% - left=1in,right=1in,top=1in,bottom=1in,% - footskip=.25in]{geometry} - -\begin{document} -\pagenumbering{gobble} - -\newcommand{\HRule}{\rule{\linewidth}{0.5mm}} - -\newenvironment{passbox}{% - \def\FrameCommand{\fboxsep=\FrameSep \fcolorbox{green}{white}}% - \color{green}\MakeFramed {\FrameRestore}}% - {\endMakeFramed} - -\newenvironment{failbox}{% - \def\FrameCommand{\fboxsep=\FrameSep \fcolorbox{red}{white}}% - \color{red}\MakeFramed {\FrameRestore}}% - {\endMakeFramed} - -\center - -%---------------------------------------------------------------------------------------- -% HEADING SECTIONS -%---------------------------------------------------------------------------------------- - -\textsc{\LARGE Kid's Day: Virtual Draw Bridge Competition}\\[1.5cm] -\textsc{\Large Sandia National Laboratories}\\[0.5cm] -\textsc{\Large \today}\\[0.5cm] - -%---------------------------------------------------------------------------------------- -% NAME SECTION -%---------------------------------------------------------------------------------------- - -\HRule \\[0.4cm] -{ \huge \bfseries }\\[0.4cm] -\HRule \\[1.5cm] - -%---------------------------------------------------------------------------------------- -% RESULTS SECTION -%---------------------------------------------------------------------------------------- - -%\begin{figure}[h] -%\centering -%\includegraphics[width=0.4\paperwidth]{my_bridge.png} -%%\caption{The design.} -%\end{figure} - -\begin{figure}[h] -\centering -\includegraphics[width=0.3\paperwidth]{my_pic_0001.png} -\includegraphics[width=0.3\paperwidth]{my_pic_0050.png} -\includegraphics[width=0.3\paperwidth]{my_pic_0100.png} -\includegraphics[width=0.3\paperwidth]{my_pic_0150.png} -\includegraphics[width=0.3\paperwidth]{my_pic_0200.png} -\includegraphics[width=0.3\paperwidth]{my_pic_0250.png} -%\caption{The simulation.} -\end{figure} - -%---------------------------------------------------------------------------------------- -% SCORE SECTION -%---------------------------------------------------------------------------------------- - -{ \huge \bfseries SCORE: }\\[0.4cm] - -%---------------------------------------------------------------------------------------- - - -\end{document} - diff --git a/packages/stk/stk_learning/todstwd/bridge/delete_small_frags.py b/packages/stk/stk_learning/todstwd/bridge/delete_small_frags.py deleted file mode 100644 index 8668c5d41855..000000000000 --- a/packages/stk/stk_learning/todstwd/bridge/delete_small_frags.py +++ /dev/null @@ -1,86 +0,0 @@ -#!/usr/local/epd/1.7.4/appdata/canopy-1.7.4.3348.rh5-x86_64/User/bin/python -import sys -import os - -var = 'SIERRA_SNTOOLS_PATH' -try: - snToolsPath = os.environ[var]; -except: - raise RuntimeError('Please set environment variable: ' + var) -##snToolsPath = "/scratch/sierra/toolset" - -toolset_dir = snToolsPath + "/contrib/testTools/adagio/" -module_dir = toolset_dir + "modules" -sys.path.append(module_dir) - -from exodus import exodus -import geometry - -def delete_small_frags(): - demo_unit = os.getcwd() + '/../../../../' + 'bin/linux-gcc-4.9.3-ip-openmpi-1.10.2/release/demo_disconnected_components' - if not os.path.isfile(demo_unit): - print (demo_unit) - print( 'Did you build disconnected component finder?') - sys.exit(1) - os.system("module purge;module load sierra-devel;" + demo_unit + " -mesh_basename my_bridge -universal 1") - e = exodus('my_bridge.e','r') - coordinates = e.get_coords() - elem_frag_ids = [] - blkIds = e.get_elem_blk_ids() - step = e.num_times() - fragId_numElems = dict() - for blkId in blkIds: - (elem_block_connectivity,num_elem_this_blk,num_nodes_per_elem) = e.get_elem_connectivity(blkId) - eVals = e.get_element_variable_values(blkId,"elem_fragment_id",step) - node_index = 0 - for iE in range(num_elem_this_blk): - nodeCoords = [] - for iN in range(num_nodes_per_elem): - node_id = elem_block_connectivity[node_index] - 1 ## index from 0 - node_index += 1 - nodeCoords.append( (coordinates[0][node_id],coordinates[1][node_id],coordinates[2][node_id]) ) - elem_center = geometry.averageCoord(nodeCoords) - distL = geometry.SQdistance((-100,0,0),elem_center) - distR = geometry.SQdistance(( 100,0,0),elem_center) - fid = eVals[iE] - if fid in fragId_numElems: - fragId_numElems[fid][0] = fragId_numElems[fid][0] + 1 - fragId_numElems[fid][1] = geometry.plus(fragId_numElems[fid][1],elem_center) - fragId_numElems[fid][2] = min(fragId_numElems[fid][2], distL) - fragId_numElems[fid][3] = max(fragId_numElems[fid][3], distR) - else: - fragId_numElems[fid] = [ 1 , elem_center, distL, distR ] - elem_frag_ids.extend(eVals) - fragIdsToDelete = [] - car1 = (-24.056451612903224, 24.274193548387096, 0.0) - car2 = (-58.01239669421488, 24.305785123966942, 0.0) - car3 = (-89.01239669421489, 24.305785123966942, 0.0) - print(fragId_numElems) - for fid in fragId_numElems.keys(): - fragCenter = geometry.scale(1.0/fragId_numElems[fid][0],fragId_numElems[fid][1]) - dist1 = geometry.SQdistance(car1,fragCenter) - dist2 = geometry.SQdistance(car2,fragCenter) - dist3 = geometry.SQdistance(car3,fragCenter) - if dist1 > 0.1 and dist2 > 0.1 and dist3 > 0.1 and fragId_numElems[fid][2] > 1.0 and fragId_numElems[fid][3] > 1.0: - fragIdsToDelete.append(fid) - nFrags = len(fragIdsToDelete) - print('Delete ',nFrags,' frags') - if nFrags > 0: - elemsToDelete = [] - for i in range(len(elem_frag_ids)): - if elem_frag_ids[i] in fragIdsToDelete: - elemsToDelete.append(str(i+1)) - cb = open('stripElems.jou','w') - cb.write('import mesh "my_bridge.e" no_geom\n') - cb.write('delete hex ' + ' '.join(elemsToDelete) + '\n') - cb.write('export mesh "my_bridge_clean.g" overwrite\n') - cb.write('exit\n') - cb.close() - os.system('cubit -batch -nographics stripElems.jou') - print (elemsToDelete) - else: - os.system('cp my_bridge.e my_bridge_clean.g') - e.close() - -if __name__ == "__main__": - delete_small_frags() \ No newline at end of file diff --git a/packages/stk/stk_learning/todstwd/bridge/make_paraview_pics.py b/packages/stk/stk_learning/todstwd/bridge/make_paraview_pics.py deleted file mode 100644 index da91162ea3e5..000000000000 --- a/packages/stk/stk_learning/todstwd/bridge/make_paraview_pics.py +++ /dev/null @@ -1,141 +0,0 @@ -#### import the simple module from the paraview -from paraview.simple import * -#### disable automatic camera reset on 'Show' -##paraview.simple._DisableFirstRenderCameraReset() - -import os - -def strnum(i): - num = "" - if (i < 10): - num = "000" + str(i) - elif (i < 100): - num = "00" + str(i) - elif (i < 1000): - num = "0" + str(i) - else: - num = str(i) - return num - -# create a new 'ExodusIIReader' -fileName = os.getcwd() + '/bridgeFalls.e' -bridgeFallse = ExodusIIReader(FileName=[fileName]) -bridgeFallse.ElementVariables = [] -bridgeFallse.PointVariables = [] -bridgeFallse.GlobalVariables = [] -bridgeFallse.SideSetArrayStatus = [] - -# get animation scene -animationScene1 = GetAnimationScene() - -# update animation scene based on data timesteps -animationScene1.UpdateAnimationUsingDataTimeSteps() - -# Properties modified on bridgeFallse -bridgeFallse.ElementVariables = ['death', 'stress', 'processor_id'] -bridgeFallse.PointVariables = ['displ_', 'points'] -bridgeFallse.GlobalVariables = ['external_energy', 'internal_energy', 'kinetic_energy', 'momentum_', 'timestep'] -bridgeFallse.ElementBlocks = ['block_1', 'block_2', 'block_3', 'block_4', 'block_5', 'block_6'] - -# get active view -renderView1 = GetActiveViewOrCreate('RenderView') -# uncomment following to set a specific view size -renderView1.ViewSize = [640, 480] - -# show data in view -bridgeFallseDisplay = Show(bridgeFallse, renderView1) -# trace defaults for the display properties. -bridgeFallseDisplay.Representation = 'Surface' -bridgeFallseDisplay.ColorArrayName = [None, ''] -bridgeFallseDisplay.OSPRayScaleArray = 'GlobalNodeId' -bridgeFallseDisplay.OSPRayScaleFunction = 'PiecewiseFunction' -bridgeFallseDisplay.SelectOrientationVectors = 'GlobalNodeId' -bridgeFallseDisplay.ScaleFactor = 20.0 -bridgeFallseDisplay.SelectScaleArray = 'GlobalNodeId' -bridgeFallseDisplay.GlyphType = 'Arrow' -bridgeFallseDisplay.GlyphTableIndexArray = 'GlobalNodeId' -bridgeFallseDisplay.DataAxesGrid = 'GridAxesRepresentation' -bridgeFallseDisplay.PolarAxes = 'PolarAxesRepresentation' -bridgeFallseDisplay.ScalarOpacityUnitDistance = 12.640189659732366 -bridgeFallseDisplay.GaussianRadius = 10.0 -bridgeFallseDisplay.SetScaleArray = ['POINTS', 'GlobalNodeId'] -bridgeFallseDisplay.ScaleTransferFunction = 'PiecewiseFunction' -bridgeFallseDisplay.OpacityArray = ['POINTS', 'GlobalNodeId'] -bridgeFallseDisplay.OpacityTransferFunction = 'PiecewiseFunction' - -# reset view to fit data -renderView1.ResetCamera() - -# update the view to ensure updated data information -renderView1.Update() - -# set scalar coloring -ColorBy(bridgeFallseDisplay, ('FIELD', 'vtkBlockColors')) - -# show color bar/color legend -bridgeFallseDisplay.SetScalarBarVisibility(renderView1, True) - -# get color transfer function/color map for 'vtkBlockColors' -vtkBlockColorsLUT = GetColorTransferFunction('vtkBlockColors') - -# create a new 'Threshold' -threshold1 = Threshold(Input=bridgeFallse) -threshold1.Scalars = ['POINTS', 'GlobalNodeId'] -threshold1.ThresholdRange = [1.0, 25728.0] - -# Properties modified on threshold1 -threshold1.Scalars = ['CELLS', 'death'] -threshold1.ThresholdRange = [0.1, 25728.0] - -# show data in view -threshold1Display = Show(threshold1, renderView1) -# trace defaults for the display properties. -threshold1Display.Representation = 'Surface' -threshold1Display.ColorArrayName = [None, ''] -threshold1Display.OSPRayScaleArray = 'GlobalNodeId' -threshold1Display.OSPRayScaleFunction = 'PiecewiseFunction' -threshold1Display.SelectOrientationVectors = 'GlobalNodeId' -threshold1Display.ScaleFactor = 20.0 -threshold1Display.SelectScaleArray = 'GlobalNodeId' -threshold1Display.GlyphType = 'Arrow' -threshold1Display.GlyphTableIndexArray = 'GlobalNodeId' -threshold1Display.DataAxesGrid = 'GridAxesRepresentation' -threshold1Display.PolarAxes = 'PolarAxesRepresentation' -threshold1Display.ScalarOpacityUnitDistance = 12.640189659732366 -threshold1Display.GaussianRadius = 10.0 -threshold1Display.SetScaleArray = ['POINTS', 'GlobalNodeId'] -threshold1Display.ScaleTransferFunction = 'PiecewiseFunction' -threshold1Display.OpacityArray = ['POINTS', 'GlobalNodeId'] -threshold1Display.OpacityTransferFunction = 'PiecewiseFunction' - -# hide data in view -Hide(bridgeFallse, renderView1) - -# update the view to ensure updated data information -renderView1.Update() - -# set scalar coloring -ColorBy(threshold1Display, ('FIELD', 'vtkBlockColors')) - -# show color bar/color legend -threshold1Display.SetScalarBarVisibility(renderView1, True) - -animationScene1.GoToLast() - -# hide color bar/color legend -threshold1Display.SetScalarBarVisibility(renderView1, False) - -animationScene1.GoToFirst() - -# current camera placement for renderView1 -renderView1.CameraPosition = [0, 0, 300.0] -renderView1.CameraFocalPoint = [0, 0, 0] -renderView1.CameraParallelScale = 100.0 - -numsteps = len(bridgeFallse.TimestepValues) -for i in range(numsteps): - picName = 'my_pic_' + strnum(i+1) + '.png' - # save screenshot - SaveScreenshot(picName, renderView1, ImageResolution=[640, 480], - OverrideColorPalette='PrintBackground') - animationScene1.GoToNext() diff --git a/packages/stk/stk_learning/todstwd/puckGame/puckGame.cmd.enc b/packages/stk/stk_learning/todstwd/puckGame/puckGame.cmd.enc deleted file mode 100644 index a602e2435d18..000000000000 --- a/packages/stk/stk_learning/todstwd/puckGame/puckGame.cmd.enc +++ /dev/null @@ -1,65 +0,0 @@ -VERSION 10.16 (e) -prefs: allmodelusecompdisplace ON -ext: guis.enscore activate_gui -anim_flipbook: play_style once -anim_keyframe: play_style once -annotation: 3d_label_size 18 -prefs: allmodelusecompdisplace ON -ext: guis.enscore activate_gui -anim_flipbook: play_style once -anim_keyframe: play_style once -annotation: 3d_label_size 18 -annotation: 3d_label_size 18 -case: create_viewport ON -data: binary_files_are big_endian -data: format MultiExodusII -data: path . -data: geometry game_results.exo -data: read -data_partbuild: begin -data_partbuild: data_type unstructured -data_partbuild: select_all -data_partbuild: description -data_partbuild: create -data_partbuild: end -view_transf: function global -viewport: select_begin - 0 -viewport: select_end -viewport: background_type constant -viewport: constant_rgb 1 1 1 -view: perspective OFF -part: select_begin - 4 -part: select_end -part: colorby_palette none -part: colorby_rgb 0.0 0.0 1.0 -part: select_begin - 2 -part: select_end -part: colorby_palette none -part: colorby_rgb 1.0 0.0 0.0 -part: select_begin - 1 -part: select_end -part: colorby_palette none -part: colorby_rgb 0.0 0.0 0.0 -part: select_begin -5 6 7 8 9 -part: select_end -part: modify_begin -part: visible OFF -part: modify_end -view_transf: fit 0 -annotation: axis_model OFF -solution_time: current_step 0.000000 -solution_time: update_to_current -variables: activate displ_vec -part: select_all -part: modify_begin -model: adjcoord_varscale_factor 1 -model: adjcoord_x_variable displ_vec -model: adjcoord_y_variable displ_vec -model: adjcoord_z_variable displ_vec -part: modify_end -solution_time: play_style once diff --git a/packages/stk/stk_learning/todstwd/puckGame/puckGame.i b/packages/stk/stk_learning/todstwd/puckGame/puckGame.i deleted file mode 100644 index b22e38c86749..000000000000 --- a/packages/stk/stk_learning/todstwd/puckGame/puckGame.i +++ /dev/null @@ -1,129 +0,0 @@ -begin sierra TOSDTWD Puck Game - - define direction down with vector 0.0 -1.0 0.0 - - begin definition for function DUMMY - type is constant - begin values - 1.0 - end values - end definition for function DUMMY - - begin material hard - density = 1.0 - begin parameters for model elastic - youngs modulus = 1000000. - poissons ratio = 0.3 - end parameters for model elastic - end - - begin rigid body puck - end - - begin solid section puck - rigid body = puck - end - - begin finite element model rigidBlocks - Database name = pic.g - Database type = exodusII - - begin parameters for block block_1 - material = hard - model = elastic - end parameters for block block_1 - begin parameters for block block_2 - material = hard - model = elastic - end parameters for block block_2 - begin parameters for block block_3 - material = hard - model = elastic - end parameters for block block_3 - begin parameters for block block_4 - material = hard - model = elastic - section = puck - end parameters for block block_4 - end - - begin solid mechanics procedure adagio_procedure_1 - - begin time control - begin time stepping block p0 - start time = 0.0 - begin parameters for presto region adagio_1 - user time step = 1e-4 - end parameters for presto region adagio_1 - end - termination time = 5.0 - end time control - - begin solid mechanics region adagio_1 - - use finite element model rigidBlocks - - begin gravity - block = block_4 - direction = down - function = dummy - gravitational constant = {9.8 * 100} - end - - begin fixed displacement - include all blocks - components = z - end fixed displacement - - begin fixed displacement - block = block_1 block_2 block_3 - components = x y - end fixed displacement - - begin fixed rotation - rigid body = puck - components = x y - end - - begin results output output_adagio - database name = game_results.exo - database type = exodusII - at step 0 interval = 50 - nodal variables = displacement as displ - end results output output_adagio - - begin contact definition - skin all blocks = on - begin interaction defaults - general contact = on - self contact = off - end - end - - begin user output - block = block_4 - compute at every step - compute global min_x as min of nodal coordinates(x) - compute global max_x as max of nodal coordinates(x) - compute global min_y as min of nodal coordinates(y) - compute global max_y as max of nodal coordinates(y) - end - - begin user output - block = block_2 - compute at every step - compute global laserDeath as max of nodal force_contact - end - - begin solution termination - terminate global kinetic_Energy < 1e-5 - skip times = 0.0 to 0.5 - terminate global min_x < -50 - terminate global max_x > 250 - terminate global min_y < -50 - terminate global max_y > 250 - terminate global laserDeath > 0 - end - end -end -end sierra diff --git a/packages/stk/stk_learning/todstwd/puckGame/puck_game_template.xcf b/packages/stk/stk_learning/todstwd/puckGame/puck_game_template.xcf deleted file mode 100644 index 360f3864e903..000000000000 Binary files a/packages/stk/stk_learning/todstwd/puckGame/puck_game_template.xcf and /dev/null differ diff --git a/packages/stk/stk_learning/todstwd/puckGame/runPuckGame.sh b/packages/stk/stk_learning/todstwd/puckGame/runPuckGame.sh deleted file mode 100755 index 8c2934db4b54..000000000000 --- a/packages/stk/stk_learning/todstwd/puckGame/runPuckGame.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh - -module purge -module load sierra-devel - -cp $1 puckGame.png - -/scratch/$USER/code/bin/linux-gcc-4.9.3-ip-openmpi-1.6.4/release/stk_learning_game_of_life_utest --gtest_filter=TOSDTWD.hex_mesh_from_image_multiple_blocks -i puckGame.png - -module purge -module load sierra - -sierra -j 12 adagio -i puckGame.i - -rm game_results.exo.12.* -rm *.g* -rm *.log -rm junk.e - -module load viz -ens -p puckGame.cmd.enc & diff --git a/packages/stk/stk_math/stk_math/StkMath.hpp b/packages/stk/stk_math/stk_math/StkMath.hpp index 3b20071238c6..9d8f9556a3b9 100644 --- a/packages/stk/stk_math/stk_math/StkMath.hpp +++ b/packages/stk/stk_math/stk_math/StkMath.hpp @@ -3,41 +3,41 @@ // DE-NA0003525 with NTESS, the U.S. Government retains certain rights // in this software. // - // Redistribution and use in source and binary forms, with or without - // modification, are permitted provided that the following conditions are - // met: - // - // * Redistributions of source code must retain the above copyright - // notice, this list of conditions and the following disclaimer. - // - // * Redistributions in binary form must reproduce the above - // copyright notice, this list of conditions and the following - // disclaimer in the documentation and/or other materials provided - // with the distribution. - // +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following +// disclaimer in the documentation and/or other materials provided +// with the distribution. +// // * Neither the name of NTESS nor the names of its contributors // may be used to endorse or promote products derived from this // software without specific prior written permission. // - // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - // "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - // A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef STK_MATH_H #define STK_MATH_H -#include #include -#include +#include +#include #include #define STK_MATH_FORCE_INLINE KOKKOS_FORCEINLINE_FUNCTION @@ -46,33 +46,37 @@ namespace stk { namespace math { namespace hidden { -static STK_MATH_FORCE_INLINE double Cbrt(const double x) { return cbrt(x); } -static STK_MATH_FORCE_INLINE float CbrtF(const float x) { return cbrtf(x); } +static STK_MATH_FORCE_INLINE double Cbrt(double x) { return cbrt(x); } +static STK_MATH_FORCE_INLINE float CbrtF(float x) { return cbrtf(x); } } -// double - -STK_MATH_FORCE_INLINE double fmadd(const double a, const double b, const double c) { +template::value, int>::type = 0> +STK_MATH_FORCE_INLINE T fmadd(T a, T b, T c) { return a*b+c; } -STK_MATH_FORCE_INLINE double sqrt(const double x) { +template::value, int>::type = 0> +STK_MATH_FORCE_INLINE T sqrt(T x) { return std::sqrt(x); } -STK_MATH_FORCE_INLINE double cbrt(const double x) { +template::value, int>::type = 0> +STK_MATH_FORCE_INLINE T cbrt(T x) { return hidden::Cbrt(x); } -STK_MATH_FORCE_INLINE double log(const double x) { +template::value, int>::type = 0> +STK_MATH_FORCE_INLINE T log(T x) { return std::log(x); } -STK_MATH_FORCE_INLINE double log10(const double x) { +template::value, int>::type = 0> +STK_MATH_FORCE_INLINE T log10(T x) { return std::log10(x); } -STK_MATH_FORCE_INLINE double exp(const double x) { +template::value, int>::type = 0> +STK_MATH_FORCE_INLINE T exp(T x) { return std::exp(x); } @@ -80,218 +84,151 @@ STK_MATH_FORCE_INLINE double pow(const double x, const double y) { return std::pow(x, y); } -STK_MATH_FORCE_INLINE double pow(const double x, const int y) { +STK_MATH_FORCE_INLINE float pow(const float x, const float y) { return std::pow(x, y); } -STK_MATH_FORCE_INLINE double sin(const double a) { - return std::sin(a); -} - -STK_MATH_FORCE_INLINE double cos(const double a) { - return std::cos(a); -} - -STK_MATH_FORCE_INLINE double tan(const double a) { - return std::tan(a); -} - -STK_MATH_FORCE_INLINE double sinh(const double a) { - return std::sinh(a); -} - -STK_MATH_FORCE_INLINE double cosh(const double a) { - return std::cosh(a); -} - -STK_MATH_FORCE_INLINE double tanh(const double a) { - return std::tanh(a); -} - -STK_MATH_FORCE_INLINE double asin(const double a) { - return std::asin(a); -} - -STK_MATH_FORCE_INLINE double acos(const double a) { - return std::acos(a); -} - -STK_MATH_FORCE_INLINE double atan(const double a) { - return std::atan(a); -} - -STK_MATH_FORCE_INLINE double atan2(const double a, const double b) { - return std::atan2(a, b); -} - -STK_MATH_FORCE_INLINE double asinh(const double a) { - return std::asinh(a); -} - -STK_MATH_FORCE_INLINE double acosh(const double a) { - return std::acosh(a); -} - -STK_MATH_FORCE_INLINE double atanh(const double a) { - return std::atanh(a); -} - -STK_MATH_FORCE_INLINE double erf(const double a) { - return std::erf(a); -} - -STK_MATH_FORCE_INLINE double multiplysign(const double& x, const double& y) { // return x times sign of y - return x * std::copysign(1.0, y); -} - -STK_MATH_FORCE_INLINE double copysign(const double& x, const double& y) { // return abs(x) times sign of y - return std::copysign(x, y); -} - -STK_MATH_FORCE_INLINE double abs(const double x) { - return std::abs(x); -} - -STK_MATH_FORCE_INLINE double max(const double x, const double y) { - return y > x ? y : x; -} - -STK_MATH_FORCE_INLINE double min(const double x, const double y) { - return y < x ? y : x; -} - -STK_MATH_FORCE_INLINE bool isnan(const double a) { - return std::isnan(a); -} - -STK_MATH_FORCE_INLINE double if_then_else(const bool b, const double v1, const double v2) { - return b ? v1 : v2; -} - -STK_MATH_FORCE_INLINE double if_then_else_zero(const bool b, const double v) { - return b ? v : 0.0; -} - -// float - -STK_MATH_FORCE_INLINE float fmadd(const float a, const float b, const float c) { - return a*b+c; -} - -STK_MATH_FORCE_INLINE float sqrt(const float x) { - return std::sqrt(x); -} - -STK_MATH_FORCE_INLINE float cbrt(const float x) { - return hidden::CbrtF(x); -} - -STK_MATH_FORCE_INLINE float log(const float x) { - return std::log(x); -} - -STK_MATH_FORCE_INLINE float log10(const float x) { - return std::log10(x); -} - -STK_MATH_FORCE_INLINE float exp(const float x) { - return std::exp(x); -} - -STK_MATH_FORCE_INLINE float pow(const float x, const float y) { +STK_MATH_FORCE_INLINE double pow(const double x, int y) { return std::pow(x, y); } -STK_MATH_FORCE_INLINE float pow(const float x, const int y) { +STK_MATH_FORCE_INLINE float pow(const float x, int y) { return std::pow(x, y); } -STK_MATH_FORCE_INLINE float sin(const float a) { +template::value, int>::type = 0> +STK_MATH_FORCE_INLINE T sin(T a) { return std::sin(a); } -STK_MATH_FORCE_INLINE float cos(const float a) { +template::value, int>::type = 0> +STK_MATH_FORCE_INLINE T cos(T a) { return std::cos(a); } -STK_MATH_FORCE_INLINE float tan(const float a) { +template::value, int>::type = 0> +STK_MATH_FORCE_INLINE T tan(T a) { return std::tan(a); } -STK_MATH_FORCE_INLINE float sinh(const float a) { +template::value, int>::type = 0> +STK_MATH_FORCE_INLINE T sinh(T a) { return std::sinh(a); } -STK_MATH_FORCE_INLINE float cosh(const float a) { +template::value, int>::type = 0> +STK_MATH_FORCE_INLINE T cosh(T a) { return std::cosh(a); } -STK_MATH_FORCE_INLINE float tanh(const float a) { +template::value, int>::type = 0> +STK_MATH_FORCE_INLINE T tanh(T a) { return std::tanh(a); } -STK_MATH_FORCE_INLINE float asin(const float a) { +template::value, int>::type = 0> +STK_MATH_FORCE_INLINE T asin(T a) { return std::asin(a); } -STK_MATH_FORCE_INLINE float acos(const float a) { +template::value, int>::type = 0> +STK_MATH_FORCE_INLINE T acos(T a) { return std::acos(a); } -STK_MATH_FORCE_INLINE float atan(const float a) { +template::value, int>::type = 0> +STK_MATH_FORCE_INLINE T atan(T a) { return std::atan(a); } -STK_MATH_FORCE_INLINE float atan2(const float a, const float b) { - return std::atan2(a,b); +template::value, int>::type = 0> +STK_MATH_FORCE_INLINE T atan2(T a, T b) { + return std::atan2(a, b); } -STK_MATH_FORCE_INLINE float asinh(const float a) { +template::value, int>::type = 0> +STK_MATH_FORCE_INLINE T asinh(T a) { return std::asinh(a); } -STK_MATH_FORCE_INLINE float acosh(const float a) { +template::value, int>::type = 0> +STK_MATH_FORCE_INLINE T acosh(T a) { return std::acosh(a); } -STK_MATH_FORCE_INLINE float atanh(const float a) { +template::value, int>::type = 0> +STK_MATH_FORCE_INLINE T atanh(T a) { return std::atanh(a); } -STK_MATH_FORCE_INLINE float erf(const float a) { +template::value, int>::type = 0> +STK_MATH_FORCE_INLINE T erf(T a) { return std::erf(a); } -STK_MATH_FORCE_INLINE float multiplysign(const float x, const float y) { // return x times sign of y - return x * std::copysign(1.0f, y); +template::value, int>::type = 0> +STK_MATH_FORCE_INLINE T multiplysign(T x, T y) { // return x times sign of y + return x * std::copysign(static_cast(1.0), y); } -STK_MATH_FORCE_INLINE float copysign(const float x, const float y) { // return abs(x) times sign of y +//template::value, int>::type = 0> +//STK_MATH_FORCE_INLINE T copysign(T x, T y) { // return abs(x) times sign of y +// return std::copysign(x, y); +//} + +STK_MATH_FORCE_INLINE double copysign(double x, double y) { // return abs(x) times sign of y + return std::copysign(x, y); +} + +STK_MATH_FORCE_INLINE float copysign(float x, float y) { // return abs(x) times sign of y return std::copysign(x, y); } +STK_MATH_FORCE_INLINE double abs(const double x) { + return std::abs(x); +} + STK_MATH_FORCE_INLINE float abs(const float x) { return std::abs(x); } +STK_MATH_FORCE_INLINE double max(const double x, const double y) { + return x > y ? x : y; +} + STK_MATH_FORCE_INLINE float max(const float x, const float y) { return x > y ? x : y; } -STK_MATH_FORCE_INLINE float min(const float x, const float y) { +STK_MATH_FORCE_INLINE double min(const double& x, const double& y) { return x < y ? x : y; } -STK_MATH_FORCE_INLINE bool isnan(const float a) { +STK_MATH_FORCE_INLINE float min(const float& x, const float& y) { + return x < y ? x : y; +} + +template::value, int>::type = 0> +STK_MATH_FORCE_INLINE bool isnan(T a) { return std::isnan(a); } -STK_MATH_FORCE_INLINE float if_then_else(const bool b, const float v1, const float v2) { +//template::value, int>::type = 0> +//STK_MATH_FORCE_INLINE T if_then_else(const bool b, T v1, T v2) { +// return b ? v1 : v2; +//} + +STK_MATH_FORCE_INLINE float if_then_else(const bool b, float v1, float v2) { + return b ? v1 : v2; +} + +STK_MATH_FORCE_INLINE double if_then_else(const bool b, double v1, double v2) { return b ? v1 : v2; } -STK_MATH_FORCE_INLINE float if_then_else_zero(const bool b, const float v) { - return b ? v : 0; +template::value, int>::type = 0> +STK_MATH_FORCE_INLINE T if_then_else_zero(const bool b, T v) { + return b ? v : static_cast(0); } } // namespace math diff --git a/packages/stk/stk_mesh/stk_mesh/base/Bucket.cpp b/packages/stk/stk_mesh/stk_mesh/base/Bucket.cpp index 505c6acb4374..36ba563f64f5 100644 --- a/packages/stk/stk_mesh/stk_mesh/base/Bucket.cpp +++ b/packages/stk/stk_mesh/stk_mesh/base/Bucket.cpp @@ -301,6 +301,8 @@ Bucket::Bucket(BulkData & arg_mesh, m_parts.reserve(m_key.size()); supersets(m_parts); m_mesh.new_bucket_callback(m_entity_rank, m_parts, m_capacity, this); + + initialize_ngp_field_bucket_ids(); } Bucket::~Bucket() @@ -639,10 +641,46 @@ size_t Bucket::get_others_index_count(size_type bucket_ordinal, EntityRank rank) } //---------------------------------------------------------------------- +void Bucket::initialize_ngp_field_bucket_ids() +{ + const MetaData& meta = mesh().mesh_meta_data(); + const FieldVector& allFields = meta.get_fields(); + m_ngp_field_bucket_id.resize(allFields.size()); + m_ngp_field_is_modified.resize(allFields.size()); -void Bucket::initialize_slot(size_type ordinal, Entity entity) + for(FieldBase* field : allFields) { + m_ngp_field_bucket_id[field->mesh_meta_data_ordinal()] = INVALID_BUCKET_ID; + m_ngp_field_is_modified[field->mesh_meta_data_ordinal()] = false; + } +} + +void Bucket::set_ngp_field_bucket_id(unsigned fieldOrdinal, unsigned ngpFieldBucketId) +{ + ThrowRequire(fieldOrdinal < m_ngp_field_bucket_id.size()); + m_ngp_field_bucket_id[fieldOrdinal] = ngpFieldBucketId; + m_ngp_field_is_modified[fieldOrdinal] = false; +} + +unsigned Bucket::get_ngp_field_bucket_id(unsigned fieldOrdinal) const +{ + ThrowRequire(fieldOrdinal < m_ngp_field_bucket_id.size()); + return m_ngp_field_bucket_id[fieldOrdinal]; +} + +unsigned Bucket::get_ngp_field_bucket_is_modified(unsigned fieldOrdinal) const +{ + return m_ngp_field_is_modified[fieldOrdinal]; +} + +void Bucket::mark_for_modification() { m_is_modified = true; + std::fill(m_ngp_field_is_modified.begin(), m_ngp_field_is_modified.end(), true); +} + +void Bucket::initialize_slot(size_type ordinal, Entity entity) +{ + mark_for_modification(); m_entities[ordinal] = entity; if (mesh().is_valid(entity)) { mesh().set_state(entity, Created); @@ -656,7 +694,7 @@ int Bucket::parallel_owner_rank(size_type ordinal) const void Bucket::reset_entity_location(Entity entity, size_type to_ordinal, const FieldVector* fields) { - m_is_modified = true; + mark_for_modification(); Bucket & from_bucket = mesh().bucket(entity); const Bucket::size_type from_ordinal = mesh().bucket_ordinal(entity); @@ -675,7 +713,6 @@ void Bucket::add_entity(Entity entity) ThrowAssert(!mesh().is_valid(entity) || mesh().bucket_ptr(entity) == nullptr); ThrowAssert(!mesh().is_valid(entity) || mesh().entity_rank(entity) == m_entity_rank); - m_is_modified = true; initialize_slot(m_size, entity); if (mesh().is_valid(entity)) { @@ -710,7 +747,7 @@ void Bucket::remove_entity() { ThrowAssert(m_size > 0); - m_is_modified = true; + mark_for_modification(); mesh().remove_entity_field_data_callback(entity_rank(), bucket_id(), m_size-1); --m_size; @@ -729,7 +766,7 @@ void Bucket::copy_entity(Entity entity) ThrowAssert(mesh().bucket_ptr(entity) != this); ThrowAssert(mesh().entity_rank(entity) == m_entity_rank); - m_is_modified = true; + mark_for_modification(); Bucket* old_bucket = mesh().bucket_ptr(entity); const Bucket::size_type old_ordinal = mesh().bucket_ordinal(entity); @@ -806,7 +843,8 @@ void Bucket::overwrite_entity(size_type to_ordinal, Entity entity, const FieldVe ThrowAssert(mesh().bucket_ptr(entity) != nullptr); ThrowAssert(mesh().entity_rank(entity) == m_entity_rank); - m_is_modified = true; + mark_for_modification(); + const MeshIndex from_index = m_mesh.mesh_index(entity); reset_entity_location(entity, to_ordinal, fields); diff --git a/packages/stk/stk_mesh/stk_mesh/base/Bucket.hpp b/packages/stk/stk_mesh/stk_mesh/base/Bucket.hpp index 77449d6a4ce2..ed427c3e1ffb 100644 --- a/packages/stk/stk_mesh/stk_mesh/base/Bucket.hpp +++ b/packages/stk/stk_mesh/stk_mesh/base/Bucket.hpp @@ -346,6 +346,10 @@ class Bucket bool member(stk::mesh::PartOrdinal partOrdinal) const; + void set_ngp_field_bucket_id(unsigned fieldOrdinal, unsigned ngpFieldBucketId); + unsigned get_ngp_field_bucket_id(unsigned fieldOrdinal) const; + unsigned get_ngp_field_bucket_is_modified(unsigned fieldOrdinal) const; + protected: void change_existing_connectivity(unsigned bucket_ordinal, stk::mesh::Entity* new_nodes); void change_existing_permutation_for_connected_element(unsigned bucket_ordinal_of_lower_ranked_entity, unsigned elem_connectivity_ordinal, stk::mesh::Permutation permut); @@ -399,6 +403,10 @@ class Bucket m_is_modified = false; } + void mark_for_modification(); + + void initialize_ngp_field_bucket_ids(); + Bucket(); Bucket( const Bucket & ); @@ -498,6 +506,8 @@ class Bucket bool m_shared; bool m_aura; + std::vector m_ngp_field_bucket_id; + std::vector m_ngp_field_is_modified; }; #undef CONNECTIVITY_TYPE_SWITCH #undef RANK_SWITCH @@ -636,7 +646,7 @@ template inline void Bucket::modify_all_connectivity(T& callable, Bucket* other_bucket) { - m_is_modified = true; + mark_for_modification(); switch(m_node_kind) { case FIXED_CONNECTIVITY: callable(*this, m_fixed_node_connectivity, T::template generate_args(other_bucket)); break; @@ -672,7 +682,8 @@ void Bucket::modify_connectivity(T& callable, EntityRank rank) switch(rank) { case stk::topology::NODE_RANK: ThrowAssert(m_node_kind != INVALID_CONNECTIVITY_TYPE); - m_is_modified = true; + mark_for_modification(); + switch(m_node_kind) { case FIXED_CONNECTIVITY: callable(*this, m_fixed_node_connectivity); break; case DYNAMIC_CONNECTIVITY: callable(*this, m_dynamic_node_connectivity); break; diff --git a/packages/stk/stk_mesh/stk_mesh/base/BulkData.cpp b/packages/stk/stk_mesh/stk_mesh/base/BulkData.cpp index a6915eedad70..49fd5fd1c27b 100644 --- a/packages/stk/stk_mesh/stk_mesh/base/BulkData.cpp +++ b/packages/stk/stk_mesh/stk_mesh/base/BulkData.cpp @@ -48,6 +48,8 @@ #include "stk_mesh/baseImpl/BucketRepository.hpp" // for BucketRepository #include "stk_mesh/baseImpl/MeshImplUtils.hpp" #include "stk_mesh/baseImpl/MeshCommImplUtils.hpp" +#include "stk_mesh/baseImpl/PartVectorUtils.hpp" +#include "stk_mesh/baseImpl/MeshPrintUtils.hpp" #include "stk_mesh/baseImpl/MeshModification.hpp" #include "stk_topology/topology.hpp" // for topology, etc #include "stk_util/diag/StringUtil.hpp" @@ -67,7 +69,7 @@ #include #include #include // for get_selected_entities -#include // for MetaData, print_entity_key, etc +#include // for MetaData #include #include #include // for EntityRepository, etc @@ -138,54 +140,6 @@ void BulkData::fillVectorOfSharedEntitiesByProcessor(std::vector > &shared_entities) -{ - for(int allocation_pass = 0; allocation_pass < 2; ++allocation_pass) - { - for(int proc = 0, parallel_size = mesh.parallel_size(); proc < parallel_size; ++proc) - { - if(proc != mesh.parallel_rank()) - { - for(size_t e = 0, num_shared = shared_entities[proc].size(); e < num_shared; ++e) - { - shared_entity_type const & sentity = shared_entities[proc][e]; - size_t num_nodes_on_entity = sentity.nodes.size(); - comm.send_buffer(proc).pack(sentity.topology); - for (size_t i = 0; i < num_nodes_on_entity; ++i ) - { - comm.send_buffer(proc).pack(sentity.nodes[i]); - } - comm.send_buffer(proc).pack(sentity.local_key); - } - } - } - - if(allocation_pass == 0) - { - comm.allocate_buffers(); - } - } - comm.communicate(); -} - -bool is_received_entity_in_local_shared_entity_list(bool use_entity_ids_for_resolving_sharing, const std::vector::iterator &shared_itr, - const std::vector& shared_entities_this_proc, const shared_entity_type &shared_entity_from_other_proc) -{ - bool entitiesHaveSameNodes = shared_itr != shared_entities_this_proc.end() && *shared_itr == shared_entity_from_other_proc; - bool entitiesAreTheSame = false; - - if ( use_entity_ids_for_resolving_sharing ) - { - entitiesAreTheSame = entitiesHaveSameNodes && shared_itr->local_key == shared_entity_from_other_proc.local_key; - } - else - { - entitiesAreTheSame = entitiesHaveSameNodes; - } - - return entitiesAreTheSame; -} - void BulkData::update_owner_global_key_and_sharing_proc(stk::mesh::EntityKey global_key_other_proc, shared_entity_type& shared_entity_this_proc, int proc_id) const { shared_entity_this_proc.sharing_procs.push_back(proc_id); @@ -203,7 +157,7 @@ void BulkData::check_if_entity_from_other_proc_exists_on_this_proc_and_update_in { std::vector::iterator shared_itr = std::lower_bound(shared_entities_this_proc.begin(), shared_entities_this_proc.end(), shared_entity_from_other_proc); size_t shared_itr_index = shared_itr - shared_entities_this_proc.begin(); - bool entitiesAreTheSame = is_received_entity_in_local_shared_entity_list(this->use_entity_ids_for_resolving_sharing(), + bool entitiesAreTheSame = impl::is_received_entity_in_local_shared_entity_list(this->use_entity_ids_for_resolving_sharing(), shared_itr, shared_entities_this_proc, shared_entity_from_other_proc); if( entitiesAreTheSame ) @@ -233,7 +187,7 @@ void BulkData::mark_shared_sides_and_fill_list_of_sides_not_on_boundary(std::vec std::vector &entities_to_send_data, const stk::mesh::Selector *only_consider_second_element_from_this_selector) { std::vector::iterator shared_itr = std::lower_bound(shared_entity_map.begin(), shared_entity_map.end(), sentity); - bool entitiesAreTheSame = is_received_entity_in_local_shared_entity_list(this->use_entity_ids_for_resolving_sharing(), + bool entitiesAreTheSame = impl::is_received_entity_in_local_shared_entity_list(this->use_entity_ids_for_resolving_sharing(), shared_itr, shared_entity_map, sentity); if( entitiesAreTheSame ) @@ -336,7 +290,7 @@ void BulkData::set_common_entity_key_and_fix_ordering_of_nodes_and_update_comm_m fillVectorOfSharedEntitiesByProcessor(potentially_shared_sides_this_proc, shared_entities_by_processor); stk::CommSparse comm(parallel()); - communicateSharedEntityInfo(*this, comm, shared_entities_by_processor); + impl::communicate_shared_entity_info(*this, comm, shared_entities_by_processor); unpackEntityFromOtherProcAndUpdateInfoIfSharedLocally(comm, potentially_shared_sides_this_proc); change_entity_key_and_update_sharing_info(potentially_shared_sides_this_proc); } @@ -396,7 +350,7 @@ void BulkData::find_and_delete_internal_faces(stk::mesh::EntityRank entityRank, fillVectorOfSharedEntitiesByProcessor(shared_entities, shared_entities_to_each_proc); stk::CommSparse comm(parallel()); - communicateSharedEntityInfo(*this, comm, shared_entities_to_each_proc); + impl::communicate_shared_entity_info(*this, comm, shared_entities_to_each_proc); std::vector< std::pair > shared_entities_and_proc; this->unpack_shared_entities(comm, shared_entities_and_proc); @@ -438,24 +392,6 @@ void BulkData::find_and_delete_internal_faces(stk::mesh::EntityRank entityRank, stk::mesh::impl::delete_entities_and_upward_relations(*this, entities); } -/////////////////////////////////////// End functions for create edges - -void check_size_of_types() -{ - const size_t sizeof_entity_in_bytes = sizeof(Entity); -#ifdef STK_32BIT_ENTITY - ThrowRequireMsg(4 == sizeof_entity_in_bytes, "sizeof(Entity) expected to be 4, is instead "<= elem_top.num_sides(), - "For elem " << mesh.identifier(elem) << ", localSideId " << localSideId << ", " << - "localSideId exceeds " << elem_top.name() << ".num_sides() = " << elem_top.num_sides()); - - ThrowErrorMsgIf( side_top == stk::topology::INVALID_TOPOLOGY, - "For elem " << mesh.identifier(elem) << ", localSideId " << localSideId << ", " << - "No element topology found"); -} - template PARTVECTOR add_root_topology_part(const PARTVECTOR &parts, stk::mesh::Part &rootTopoPart) { @@ -1054,7 +951,7 @@ Entity BulkData::declare_element_side_with_id(const stk::mesh::EntityId globalSi const unsigned sideOrd, const PARTVECTOR& parts) { - check_declare_element_side_inputs(*this, elem, sideOrd); + impl::check_declare_element_side_inputs(*this, elem, sideOrd); Entity side = stk::mesh::get_side_entity_for_elem_side_pair(*this, elem, sideOrd); if(is_valid(side)) @@ -1133,54 +1030,6 @@ EntityId BulkData::get_solo_side_id() return m_soloSideIdGenerator.get_solo_side_id(); } -template -void fill_add_parts_and_supersets(const PARTVECTOR & add_parts, OrdinalVector &addPartsAndSupersets) -{ - const unsigned expected_min_num_supersets = 3; - const size_t expectedSizeOfAddPartList = add_parts.size() * expected_min_num_supersets; - addPartsAndSupersets.reserve(expectedSizeOfAddPartList); - for(size_t i = 0; i < add_parts.size(); i++) - { - addPartsAndSupersets.push_back(add_parts[i]->mesh_meta_data_ordinal()); - const PartVector& supersets = add_parts[i]->supersets(); - for(size_t j = 0; j < supersets.size(); j++) - { - addPartsAndSupersets.push_back(supersets[j]->mesh_meta_data_ordinal()); - } - } - stk::util::sort_and_unique(addPartsAndSupersets); -} - -template -void fill_remove_parts_and_subsets_minus_parts_in_add_parts_list(const PARTVECTOR & remove_parts, - const OrdinalVector & addPartsAndSupersets, - stk::mesh::Bucket &entityBucket, - OrdinalVector &removePartsAndSubsetsMinusPartsInAddPartsList) -{ - const unsigned expected_min_num_subsets = 3; - const size_t expectedSizeOfRemovePartList = remove_parts.size() * expected_min_num_subsets; - removePartsAndSubsetsMinusPartsInAddPartsList.reserve(expectedSizeOfRemovePartList); - for(size_t i = 0; i < remove_parts.size(); i++) - { - if(!contains_ordinal(addPartsAndSupersets.begin(), - addPartsAndSupersets.end(), - remove_parts[i]->mesh_meta_data_ordinal())) - { - removePartsAndSubsetsMinusPartsInAddPartsList.push_back(remove_parts[i]->mesh_meta_data_ordinal()); - const PartVector& subsets = remove_parts[i]->subsets(); - for(size_t j = 0; j < subsets.size(); j++) - { - if(entityBucket.member(*subsets[j])) - { - - removePartsAndSubsetsMinusPartsInAddPartsList.push_back(subsets[j]->mesh_meta_data_ordinal()); - } - } - } - } - stk::util::sort_and_unique(removePartsAndSubsetsMinusPartsInAddPartsList); -} - template void BulkData::internal_verify_and_change_entity_parts( Entity entity, const PARTVECTOR & add_parts , @@ -1196,10 +1045,10 @@ void BulkData::internal_verify_and_change_entity_parts( Entity entity, #endif //SIERRA_MIGRATION OrdinalVector addPartsAndSupersets; - fill_add_parts_and_supersets(add_parts, addPartsAndSupersets); + impl::fill_add_parts_and_supersets(add_parts, addPartsAndSupersets); OrdinalVector removePartsAndSubsetsMinusPartsInAddPartsList; - fill_remove_parts_and_subsets_minus_parts_in_add_parts_list(remove_parts, + impl::fill_remove_parts_and_subsets_minus_parts_in_add_parts_list(remove_parts, addPartsAndSupersets, bucket(entity), removePartsAndSubsetsMinusPartsInAddPartsList); @@ -1234,9 +1083,9 @@ void BulkData::internal_verify_and_change_entity_parts( const EntityVector& enti #endif //SIERRA_MIGRATION addPartsAndSupersets.clear(); - fill_add_parts_and_supersets(add_parts, addPartsAndSupersets); + impl::fill_add_parts_and_supersets(add_parts, addPartsAndSupersets); - fill_remove_parts_and_subsets_minus_parts_in_add_parts_list(remove_parts, + impl::fill_remove_parts_and_subsets_minus_parts_in_add_parts_list(remove_parts, addPartsAndSupersets, bucket(entity), removePartsAndSubsetsMinusPartsInAddPartsList); @@ -1602,9 +1451,9 @@ void BulkData::declare_entities(stk::topology::rank_t rank, const IDVECTOR& newI } OrdinalVector partsAndSupersets; - fill_add_parts_and_supersets(parts, partsAndSupersets); + impl::fill_add_parts_and_supersets(parts, partsAndSupersets); Part * const ownedPart = & m_mesh_meta_data.locally_owned_part(); - fill_add_parts_and_supersets(ConstPartVector{ownedPart}, partsAndSupersets); + impl::fill_add_parts_and_supersets(ConstPartVector{ownedPart}, partsAndSupersets); std::vector> sortedIds(newIds.size()); for(unsigned i=0; inumber_of_states(); - - if (num_state > 1) { + const int numStates = field->number_of_states(); + if (numStates > 1) { +#ifdef STK_DEBUG_FIELD_SYNC + ThrowRequireMsg(!field->has_device_field_debug_data(), "Field state rotation currently unsupported for Field sync debugging"); +#endif - std::vector field_set(num_state); + field->rotate_multistate_data(); - for(int state=0; state(state); - field_set[state] = field->field_state(state_identifier); - field_set[state]->sync_to_host(); - field_set[state]->modify_on_host(); - } - - int outer_idx = 0; - for ( int b = 0, be = field_set[outer_idx]->get_meta_data_for_field().size(); b < be; ++b) { - if ( field_set[outer_idx]->get_meta_data_for_field()[b].m_bytes_per_entity > 0 ) { - unsigned char* data_last = field_set[outer_idx]->get_meta_data_for_field()[b].m_data; - for ( int s = 1; s < num_state; ++s ) { - std::swap(field_set[outer_idx+s]->get_meta_data_for_field()[b].m_data, data_last); - } - field_set[outer_idx]->get_meta_data_for_field()[b].m_data = data_last; - } - } + unsigned fieldOrdinal = field->mesh_meta_data_ordinal(); + for (int s = 1; s < numStates; ++s) { + m_field_data_manager->swap_fields(fieldOrdinal+s, fieldOrdinal); } + } } void BulkData::update_field_data_states() { - const std::vector & field_set = mesh_meta_data().get_fields(); + const std::vector & fields = mesh_meta_data().get_fields(); - for ( int i = 0 ; i < m_num_fields ; ) { - const FieldBase & field = * field_set[i]; - const int outer_idx = i; - const int num_state = field.number_of_states(); - i += num_state ; - - for(int s=0; s < num_state; ++s) - { - field_set[outer_idx+s]->sync_to_host(); - field_set[outer_idx+s]->modify_on_host(); - } - - if (num_state > 1) { - for ( int b = 0, be = field_set[outer_idx]->get_meta_data_for_field().size(); b < be; ++b) { - if ( field_set[outer_idx]->get_meta_data_for_field()[b].m_bytes_per_entity > 0 ) { - unsigned char* data_last = field_set[outer_idx]->get_meta_data_for_field()[b].m_data; - for ( int s = 1; s < num_state; ++s ) { - std::swap(field_set[outer_idx+s]->get_meta_data_for_field()[b].m_data, data_last); - } - field_set[outer_idx]->get_meta_data_for_field()[b].m_data = data_last; - } - } - } - - for ( int s = 1; s < num_state; ++s ) - { - m_field_data_manager->swap_fields(outer_idx+s, outer_idx); - } + for (int i = 0; i < m_num_fields; ) { + FieldBase* field = fields[i]; + const int numStates = field->number_of_states(); + if (numStates > 1) { + update_field_data_states(field); + } + i += numStates ; + } +} +void sync_to_host_and_mark_modified(MetaData& meta) +{ + const std::vector& fields = meta.get_fields(); + for(FieldBase* field : fields) { + if (field->number_of_states() > 1) { + field->sync_to_host(); + field->modify_on_host(); } + } } const_entity_iterator BulkData::begin_entities(EntityRank ent_rank) const @@ -2274,109 +2101,18 @@ void BulkData::reorder_buckets_callback(EntityRank rank, const std::vectorreorder_bucket_field_data(rank, fields, reorderedBucketIds); } -namespace { - -bool print_comm_data_for_entity_in_ghosting(const BulkData& mesh, const Ghosting& ghosting, EntityKey entityKey, std::ostream& out) -{ - std::vector procs; - mesh.comm_procs(ghosting, entityKey, procs); - if (procs.empty()) { return false; } - out << " Ghosting " << mesh.ghosting_part(ghosting).name() << " with procs: " << stk::util::join(procs, ", ") << std::endl; - return true; -} - -void print_comm_data_for_entity(const BulkData& mesh, EntityKey entityKey, std::ostream& out) -{ - const std::vector & ghostLevels = mesh.ghostings(); - bool ghostedAnywhere = false; - for (size_t ghostI=0 ; ghostI(field->entity_rank()) != bucket->entity_rank()) continue; - FieldMetaData field_meta_data = field->get_meta_data_for_field()[bucket->bucket_id()]; - unsigned data_size = field_meta_data.m_bytes_per_entity; - if (data_size > 0) { // entity has this field? - void* data = field_meta_data.m_data + field_meta_data.m_bytes_per_entity * b_ord; - out << " For field: " << *field << ", has data: "; - field->print_data(out, data, data_size); - out << std::endl; - } - } -} - -void print_entity_connectivity(const BulkData& mesh, const MeshIndex& meshIndex, std::ostream& out) -{ - const Bucket* bucket = meshIndex.bucket; - size_t b_ord = meshIndex.bucket_ordinal; - const std::vector & rank_names = mesh.mesh_meta_data().entity_rank_names(); - EntityRank b_rank = bucket->entity_rank(); - for (EntityRank r = stk::topology::NODE_RANK, re = static_cast(rank_names.size()); r < re; ++r) { - out << " Connectivity to " << rank_names[r] << std::endl; - Entity const* entities = bucket->begin(b_ord, r); - ConnectivityOrdinal const* ordinals = bucket->begin_ordinals(b_ord, r); - const int num_conn = bucket->num_connectivity(b_ord, r); - for (int c_itr = 0; c_itr < num_conn; ++c_itr) { - Entity target_entity = entities[c_itr]; - uint32_t ord = ordinals[c_itr]; - out << " [" << ord << "] " << mesh.entity_key(target_entity) << " "; - if (r != stk::topology::NODE_RANK) { - out << mesh.bucket(target_entity).topology(); - if (b_rank != stk::topology::NODE_RANK) { - Permutation const *permutations = bucket->begin_permutations(b_ord, r); - if (permutations) { - out << " permutation index " << permutations[c_itr]; - } - } - } - out << ", state = " << mesh.state(target_entity); - out << std::endl; - } - } -} - -void print_bucket_parts(const BulkData& mesh, const Bucket* bucket, std::ostream& out) -{ - out << " Found bucket " << bucket->bucket_id() << " with superset parts: { "; - const PartVector& supersets = bucket->supersets(); - for(Part* part : supersets) { - out << part->name() << " "; - } - out << "}" << std::endl; -} - -void print_entity_offset_and_state(const BulkData& mesh, const MeshIndex& meshIndex, std::ostream& out) -{ - Entity entity = (*meshIndex.bucket)[meshIndex.bucket_ordinal]; - out << " " << print_entity_key(mesh.mesh_meta_data(), mesh.entity_key(entity)) << "(offset: " << entity.local_offset() << - "), state = " << mesh.state(entity) << std::endl; -} - -} // namespace - void BulkData::dump_mesh_bucket_info(std::ostream& out, Bucket* bucket) const { - print_bucket_parts(*this, bucket, out); + impl::print_bucket_parts(*this, bucket, out); for (size_t b_ord = 0, b_end = bucket->size(); b_ord < b_end; ++b_ord) { MeshIndex meshIndex(bucket, b_ord); - print_entity_offset_and_state(*this, meshIndex, out); - print_entity_connectivity(*this, meshIndex, out); + impl::print_entity_offset_and_state(*this, meshIndex, out); + impl::print_entity_connectivity(*this, meshIndex, out); if (m_num_fields > 0) { - print_field_data_for_entity(*this, meshIndex, out); + impl::print_field_data_for_entity(*this, meshIndex, out); } - print_comm_data_for_entity(*this, entity_key((*bucket)[b_ord]), out); + impl::print_comm_data_for_entity(*this, entity_key((*bucket)[b_ord]), out); } } @@ -2401,26 +2137,6 @@ void BulkData::dump_all_mesh_info(std::ostream& out) const } } -void dump_mesh_info(const stk::mesh::BulkData& mesh, std::ostream&out, EntityVector ev) -{ - for (Entity entity : ev) { - if (mesh.is_valid(entity)) - { - EntityKey key = mesh.entity_key(entity); - MeshIndex meshIndex = mesh.mesh_index(entity); - out << "Entity: " << key << std::endl; - print_bucket_parts(mesh, meshIndex.bucket, out); - print_entity_offset_and_state(mesh, meshIndex, out); - print_entity_connectivity(mesh, meshIndex, out); - print_comm_data_for_entity(mesh, key, out); - // print_field_data_for_entity(mesh, meshIndex, out); - } - else { - out << "Entity with local offset = " << entity.local_offset() << " is not valid" << std::endl; - } - } -} - void BulkData::reserve_relation(Entity entity, const unsigned num) { if (num == 0 && aux_relations(entity).empty()) { @@ -2502,12 +2218,6 @@ void BulkData::get_entities(EntityRank rank, Selector const& selector, EntityVec } } -//---------------------------------------------------------------------- -//---------------------------------------------------------------------- -//---------------------------------------------------------------------- - -//---------------------------------------------------------------------- - void BulkData::require_valid_relation( const char action[] , const BulkData & mesh , const Entity e_from , @@ -2872,7 +2582,7 @@ void BulkData::get_entities_that_have_sharing(std::vector &en { // this communicates states of the entities to all procs so that entity states are consistent stk::mesh::EntityVector entitiesNoLongerShared; - internal_resolve_shared_modify_delete(entitiesNoLongerShared); + m_meshModification.internal_resolve_shared_modify_delete(entitiesNoLongerShared); } int myProcId = this->parallel_rank(); @@ -2963,69 +2673,13 @@ void extractEntityToMapInfoIntoVectorOfEntityKeyAndProcPairs(const int myProcId, } } -void communicateSharingInfoToProcsThatShareEntity(const int numProcs, const int myProcId, stk::CommSparse& commStage2, stk::mesh::EntityToDependentProcessorsMap &entityKeySharing) -{ - for(int phase = 0; phase < 2; ++phase) - { - stk::mesh::EntityToDependentProcessorsMap::iterator iter = entityKeySharing.begin(); - for(; iter != entityKeySharing.end(); iter++) - { - std::vector sharingProcs(iter->second.begin(), iter->second.end()); - for(size_t j = 0; j < sharingProcs.size(); j++) - { - if(sharingProcs[j] == myProcId) { continue; } - commStage2.send_buffer(sharingProcs[j]).pack(iter->first); - commStage2.send_buffer(sharingProcs[j]).pack(sharingProcs.size()); - for(size_t k = 0; k < sharingProcs.size(); k++) - { - commStage2.send_buffer(sharingProcs[j]).pack(sharingProcs[k]); - } - } - } - - if(phase == 0) - { - commStage2.allocate_buffers(); - } - else - { - commStage2.communicate(); - } - } -} - -void unpackCommunicationsAndStoreSharedEntityToProcPair(const int numProcs, const int myProcId, stk::CommSparse& commStage2, std::vector >& sharedEntities) -{ - for(int procIndex = 0; procIndex < numProcs; procIndex++) - { - if(myProcId == procIndex) { continue; } - stk::CommBuffer & dataFromAnotherProc = commStage2.recv_buffer(procIndex); - while(dataFromAnotherProc.remaining()) - { - EntityKey key; - size_t numSharingProcs = 0; - dataFromAnotherProc.unpack(key); - dataFromAnotherProc.unpack(numSharingProcs); - for(size_t j = 0; j < numSharingProcs; j++) - { - int sharingProc = -1; - dataFromAnotherProc.unpack(sharingProc); - if(sharingProc != myProcId) - { - sharedEntities.emplace_back(key, sharingProc); - } - } - } - } -} - void BulkData::get_locally_modified_shared_entities(stk::mesh::EntityToDependentProcessorsMap &entityKeySharing, std::vector >& sharedEntities) { extractEntityToMapInfoIntoVectorOfEntityKeyAndProcPairs(this->parallel_rank(), entityKeySharing, sharedEntities); stk::CommSparse commStage2(this->parallel()); - communicateSharingInfoToProcsThatShareEntity(this->parallel_size(), this->parallel_rank(), commStage2, entityKeySharing); - unpackCommunicationsAndStoreSharedEntityToProcPair(this->parallel_size(), this->parallel_rank(), commStage2, sharedEntities); + impl::communicateSharingInfoToProcsThatShareEntity(this->parallel_size(), this->parallel_rank(), commStage2, entityKeySharing); + impl::unpackCommunicationsAndStoreSharedEntityToProcPair(this->parallel_size(), this->parallel_rank(), commStage2, sharedEntities); } void BulkData::erase_all_sharing_for_invalid_entities_on_comm_map() @@ -3377,17 +3031,6 @@ void BulkData::internal_change_entity_owner( const std::vector & arg } } -//---------------------------------------------------------------------- - - -//---------------------------------------------------------------------- -//---------------------------------------------------------------------- -//---------------------------------------------------------------------- -//Ghosting -//---------------------------------------------------------------------- - -//---------------------------------------------------------------------- - Ghosting & BulkData::create_ghosting( const std::string & name ) { return internal_create_ghosting(name); @@ -3868,18 +3511,6 @@ void BulkData::internal_add_to_ghosting( ghost_entities_and_fields(ghosting, entitiesToGhostOntoOtherProcessors); } -bool is_ghost(const EntityCommInfoVector& vec, const Ghosting& ghosting) -{ - EntityCommInfoVector::const_iterator i = vec.begin(); - EntityCommInfoVector::const_iterator end = vec.end(); - for(; i!=end; ++i) { - if (i->ghost_id == ghosting.ordinal()) { - return true; - } - } - return false; -} - void BulkData::generate_ghosting_receive_list(const stk::mesh::Ghosting &ghosting, const std::vector &remove_receive, std::vector &recvGhosts, std::vector& ghostStatus) { @@ -3938,53 +3569,6 @@ void BulkData::generate_ghosting_receive_list(const stk::mesh::Ghosting &ghostin } } -void BulkData::generate_ghosting_receive_list(const stk::mesh::Ghosting &ghosting, const std::vector &remove_receive, - std::set &recvGhosts) -{ - // Iterate over all entities with communication information, adding - // the entity if it's a ghost on this process. new_recv will contain - // all ghosts on this process by the end of the loop. - for ( EntityCommListInfoVector::const_iterator - i = internal_comm_list().begin() ; i != internal_comm_list().end() ; ++i ) { - if ( is_valid(i->entity) && in_receive_ghost(ghosting, i->entity) ) { - recvGhosts.insert( i->key ); - } - } - - // Remove any entities that are in the remove list. - - for ( std::vector::const_iterator - i = remove_receive.begin() ; i != remove_receive.end() ; ++i ) { - recvGhosts.erase( *i ); - } - - // Keep the closure of the remaining received ghosts. - // Working from highest-to-lowest key (rank entity type) - // results in insertion of the closure because - // inserted entities will get looped over after they are inserted. - - // Insertion will not invalidate the associative container's iterator. - - for ( std::set::reverse_iterator - i = recvGhosts.rbegin() ; i != recvGhosts.rend() ; ++i) { - const unsigned erank = i->rank(); - - Entity e = get_entity(*i); // Could be performance issue? Not if you're just doing full regens - - for (EntityRank irank = stk::topology::BEGIN_RANK; irank < erank; ++irank) { - Entity const *rels_i = begin(e, irank); - Entity const *rels_e = end(e, irank); - for (; rels_i != rels_e; ++rels_i) - { - if ( is_valid(*rels_i) && in_receive_ghost( ghosting , *rels_i ) ) - { - recvGhosts.insert( entity_key(*rels_i) ); - } - } - } - } -} - void BulkData::delete_unneeded_entries_from_the_comm_list() { EntityCommListInfoVector::iterator i = @@ -4269,16 +3853,6 @@ void BulkData::internal_regenerate_aura() internal_change_ghosting(aura_ghosting() , entityProcMapping); } - -//---------------------------------------------------------------------- -//---------------------------------------------------------------------- -//---------------------------------------------------------------------- -//EndSync -//---------------------------------------------------------------------- - - -//---------------------------------------------------------------------- - int BulkData::determine_new_owner( Entity entity ) const { // We will decide the new owner by looking at all the processes sharing @@ -4873,7 +4447,7 @@ void BulkData::move_entities_to_proper_part_ownership( const std::vector << " cannot be parallel-shared, and were declared with" << " parallel-ghosting information. {\n"; } - error_msg << " " << print_entity_key(m_mesh_meta_data, entity_key(entity)); + error_msg << " " << impl::print_entity_key(m_mesh_meta_data, entity_key(entity)); error_msg << " also declared on"; for(PairIterEntityComm ec = internal_entity_comm_map_shared(entity_key(entity)); !ec.empty(); ++ec) { @@ -4896,7 +4470,7 @@ void BulkData::move_entities_to_proper_part_ownership( const std::vector void BulkData::add_comm_list_entries_for_entities(const std::vector& sharedModifiedEntities) { // ------------------------------------------------------------ - // Update m_entity_comm based on shared_modified + // Update m_entity_comm_list based on shared_modified const size_t n_old = m_entity_comm_list.size(); @@ -4975,74 +4549,15 @@ void BulkData::internal_resolve_parallel_create(const std::vector 0) { - return false; - } - } - - return true; -} - -void print_bucket_data(const stk::mesh::BulkData& mesh) -{ - const stk::mesh::PartVector& all_parts = mesh.mesh_meta_data().get_parts(); - for(size_t i=0; iname()<size(); - min_entities = std::min(min_entities, buckets[j]->size()); - max_entities = std::max(max_entities, buckets[j]->size()); - } - avg_entities = buckets.size()>0 ? (1.0*total_entities)/buckets.size() : 0.0; - if (total_entities == 0) { - min_entities = 0; - } - std::cout << "; min=" << min_entities << ", avg=" << avg_entities << ", max=" << max_entities << ", tot=" << total_entities << std::endl; - } - } -} - -#endif - -} - - bool BulkData::modification_end_for_entity_creation( const std::vector & entity_rank_vector, impl::MeshModification::modification_optimization opt) { notifier.notify_started_modification_end(); bool return_value = internal_modification_end_for_entity_creation( entity_rank_vector, opt ); - -#ifdef STK_VERBOSE_OUTPUT - print_bucket_data(*this); -#endif - return return_value; } @@ -5100,11 +4615,10 @@ bool BulkData::internal_modification_end_for_change_parts() stk::all_reduce_max(parallel(), &local_shared_modified, &global_shared_modified, 1); - if (this->parallel_size() > 1 && global_shared_modified > 0 /*stk::mesh::impl::shared_entities_modified_on_any_proc(*this, this->parallel())*/) { + if (this->parallel_size() > 1 && global_shared_modified > 0) { stk::mesh::EntityVector entitiesNoLongerShared; + m_meshModification.internal_resolve_shared_modify_delete(entitiesNoLongerShared); internal_resolve_shared_membership(entitiesNoLongerShared); - - // check_mesh_consistency(); } m_modSummary.write_summary(m_meshModification.synchronized_count()); @@ -5391,6 +4905,15 @@ void BulkData::internal_finish_modification_end(impl::MeshModification::modifica update_deleted_entities_container(); +#ifdef STK_DEBUG_FIELD_SYNC + for (FieldBase * stkField : mesh_meta_data().get_fields()) { + if (stkField->has_device_field_debug_data()) { + stkField->reset_debug_state(); + stkField->get_debug_ngp_field()->update_debug_storage(synchronized_count()); + } + } +#endif + notify_finished_mod_end(); } @@ -5410,6 +4933,7 @@ bool BulkData::internal_modification_end_for_skin_mesh( EntityRank entity_rank, } stk::mesh::EntityVector entitiesNoLongerShared; + m_meshModification.internal_resolve_shared_modify_delete(entitiesNoLongerShared); this->internal_resolve_shared_membership(entitiesNoLongerShared); if(is_automatic_aura_on()) @@ -5417,7 +4941,6 @@ bool BulkData::internal_modification_end_for_skin_mesh( EntityRank entity_rank, bool connectFacesToPreexistingGhosts = true; resolve_incremental_ghosting_for_entity_creation_or_skin_mesh(entity_rank, selectedToSkin, connectFacesToPreexistingGhosts); } - } m_modSummary.write_summary(m_meshModification.synchronized_count()); if (parallel_size() > 1) @@ -5877,18 +5400,6 @@ void BulkData::internal_adjust_entity_and_downward_connectivity_closure_count(st } } -void fill_inducible_parts_from_list(const MetaData& meta, const OrdinalVector & partList, EntityRank rank, OrdinalVector &induciblePartsFromList) -{ - const PartVector& allParts = meta.get_parts(); - for(size_t i = 0; i < partList.size(); i++) - { - if(allParts[partList[i]]->should_induce(rank)) - { - induciblePartsFromList.push_back(partList[i]); - } - } -} - void BulkData::internal_change_entity_parts_without_propogating_to_downward_connected_entities(Entity entity, const OrdinalVector& add_parts, const OrdinalVector& remove_parts, OrdinalVector& parts_removed, OrdinalVector& newBucketPartList, OrdinalVector& scratchSpace) { internal_adjust_closure_count(entity, add_parts, remove_parts); @@ -5901,8 +5412,8 @@ void BulkData::internal_determine_inducible_parts(Entity entity, const OrdinalVe { EntityRank e_rank = entity_rank(entity); - fill_inducible_parts_from_list(mesh_meta_data(), add_parts, e_rank, inducible_parts_added); - fill_inducible_parts_from_list(mesh_meta_data(), parts_removed, e_rank, inducible_parts_removed); + impl::fill_inducible_parts_from_list(mesh_meta_data(), add_parts, e_rank, inducible_parts_added); + impl::fill_inducible_parts_from_list(mesh_meta_data(), parts_removed, e_rank, inducible_parts_removed); } void BulkData::internal_determine_inducible_parts_and_propagate_to_downward_connected_entities(Entity entity, const OrdinalVector& add_parts, const OrdinalVector& parts_removed) @@ -6041,16 +5552,6 @@ void BulkData::internal_adjust_closure_count(Entity entity, } } -void fill_part_list_from_part_ordinal_list(stk::mesh::MetaData &meta, const OrdinalVector &partOrdinals, stk::mesh::PartVector &parts) -{ - parts.clear(); - parts.reserve(partOrdinals.size()); - for(unsigned ipart=0; ipart & vec , int val ) -{ - std::vector::iterator j = - std::lower_bound( vec.begin() , vec.end() , val ); - if ( j == vec.end() || *j != val ) { - vec.insert( j , val ); - } -} - -bool ghost_id_is_found_in_comm_data(const PairIterEntityComm& comm_data, int entity_owner, int ghost_id) -{ - bool found_ghost_id = false; - for(size_t i = 0; i < comm_data.size(); ++i) { - if (comm_data[i].ghost_id == static_cast(ghost_id) && comm_data[i].proc == entity_owner) { - found_ghost_id = true; - break; - } - } - return found_ghost_id; -} - -bool all_ghost_ids_are_found_in_comm_data(const PairIterEntityComm& comm_data, int entity_owner, const std::vector& recvd_ghost_ids) -{ - bool found_all_ghost_ids = true; - for(int ghost_id : recvd_ghost_ids) { - if (!ghost_id_is_found_in_comm_data(comm_data, entity_owner, ghost_id)) { - found_all_ghost_ids = false; - break; - } - } - return found_all_ghost_ids; -} - void BulkData::unpack_not_owned_verify_compare_comm_info( CommBuffer& buf, Entity entity, EntityKey & recv_entity_key, @@ -6435,7 +5899,7 @@ void BulkData::unpack_not_owned_verify_compare_comm_info( CommBuffer& if ( !in_shared( key ) || ghost_after_shared_count) { // recv_comm contains ghost_ids for ghosted entities - bad_comm = !all_ghost_ids_are_found_in_comm_data(ec, parallel_owner_rank(entity), recv_comm); + bad_comm = !impl::all_ghost_ids_are_found_in_comm_data(ec, parallel_owner_rank(entity), recv_comm); } } } @@ -6481,54 +5945,6 @@ void unpack_not_owned_verify_compare_closure_relations( const BulkData & } } -void fillPartListDifferences(const stk::mesh::BulkData &mesh, - stk::mesh::Entity entity, - const PartVector &recv_parts, - std::set &thisProcExtraParts, - std::set &otherProcExtraParts) -{ - - const Bucket & bucket = mesh.bucket(entity); - std::pair part_ordinals = bucket.superset_part_ordinals(); - const PartVector & mesh_parts = mesh.mesh_meta_data().get_parts(); - - std::set thisProcPartNames; - for(const unsigned * k = part_ordinals.first; k < part_ordinals.second; ++k) - { - if(mesh_parts[*k]->entity_membership_is_parallel_consistent()) - { - if(mesh_parts[*k]->name() != "{OWNS}" && mesh_parts[*k]->name() != "{SHARES}") - { - thisProcPartNames.insert(mesh_parts[*k]->name()); - } - } - } - - std::set otherProcPartNames; - for(PartVector::const_iterator ip = recv_parts.begin(); ip != recv_parts.end(); ++ip) - { - if((*ip)->entity_membership_is_parallel_consistent()) - { - if((*ip)->name() != "{OWNS}" && (*ip)->name() != "{SHARES}") - { - otherProcPartNames.insert((*ip)->name()); - } - } - } - - std::set_difference(thisProcPartNames.begin(), - thisProcPartNames.end(), - otherProcPartNames.begin(), - otherProcPartNames.end(), - std::inserter(thisProcExtraParts, thisProcExtraParts.begin())); - - std::set_difference(otherProcPartNames.begin(), - otherProcPartNames.end(), - thisProcPartNames.begin(), - thisProcPartNames.end(), - std::inserter(otherProcExtraParts, otherProcExtraParts.begin())); -} - void unpack_not_owned_verify_compare_parts(const BulkData & mesh, Entity entity, PartVector const& recv_parts, @@ -6542,7 +5958,7 @@ void unpack_not_owned_verify_compare_parts(const BulkData & mesh, std::set thisProcExtraParts; std::set otherProcExtraParts; - fillPartListDifferences(mesh, entity, recv_parts, thisProcExtraParts, otherProcExtraParts); + impl::fill_part_list_differences(mesh, entity, recv_parts, thisProcExtraParts, otherProcExtraParts); if(!thisProcExtraParts.empty() || !otherProcExtraParts.empty()) { bad_part = true; @@ -6619,7 +6035,7 @@ void BulkData::unpack_not_owned_verify_report_errors(Entity entity, std::set thisProcExtraParts; std::set otherProcExtraParts; - fillPartListDifferences(*this, entity, recv_parts, thisProcExtraParts, otherProcExtraParts); + impl::fill_part_list_differences(*this, entity, recv_parts, thisProcExtraParts, otherProcExtraParts); if ( !thisProcExtraParts.empty() ) { @@ -6832,7 +6248,7 @@ void BulkData::pack_owned_verify( CommSparse & commSparse ) } else { // No guarantee of ordering by proc - insert( ghost_procs , comm[j].proc ); + stk::util::insert_keep_sorted_and_unique(comm[j].proc, ghost_procs); } } @@ -6902,23 +6318,6 @@ void BulkData::pack_owned_verify( CommSparse & commSparse ) } } -bool is_comm_ordered(const PairIterEntityComm& ec) -{ - int n = ec.size(); - for(int i=1; i // for vector #include #include "stk_mesh/base/Bucket.hpp" // for Bucket, Bucket::size_type, etc -#include "stk_mesh/base/BucketConnectivity.hpp" // for BucketConnectivity #include "stk_mesh/base/EntityKey.hpp" // for EntityKey, hash_value #include "stk_mesh/base/FieldDataManager.hpp" #include "stk_mesh/base/Relation.hpp" // for Relation, etc @@ -66,12 +65,9 @@ #include "stk_util/util/ReportHandler.hpp" // for ThrowAssert, etc #include "stk_mesh/base/ModificationSummary.hpp" #include -#include #include #include "stk_mesh/baseImpl/MeshModification.hpp" #include "stk_mesh/baseImpl/elementGraph/GraphTypes.hpp" -#include -#include #include #include "stk_mesh/baseImpl/SoloSideIdGenerator.hpp" #include "stk_mesh/baseImpl/SideSetImpl.hpp" @@ -99,8 +95,6 @@ namespace stk { namespace mesh { namespace impl { struct RelationEntityToNode; } namespace stk { namespace mesh { class NgpMeshManager; -class SideConnector; -class BulkData; struct PartStorage; struct SideSharingData; enum class FaceCreationBehavior; @@ -1057,11 +1051,6 @@ class BulkData { void find_and_delete_internal_faces(stk::mesh::EntityRank entityRank, const stk::mesh::Selector *only_consider_second_element_from_this_selector); // Mod Mark - void internal_resolve_shared_modify_delete(stk::mesh::EntityVector & entitiesNoLongerShared) - { - m_meshModification.internal_resolve_shared_modify_delete(entitiesNoLongerShared); - } - void filter_upward_ghost_relations(const Entity entity, std::function filter); EntityVector get_upward_send_ghost_relations(const Entity entity); EntityVector get_upward_recv_ghost_relations(const Entity entity); @@ -1274,8 +1263,6 @@ class BulkData { void delete_buckets(const stk::mesh::BucketVector & buckets); void mark_entities_as_deleted(stk::mesh::Bucket * bucket); - void generate_ghosting_receive_list(const stk::mesh::Ghosting &ghosting, const std::vector &remove_receive, - std::set &recvGhosts); void generate_ghosting_receive_list(const stk::mesh::Ghosting &ghosting, const std::vector &remove_receive, std::vector &recvGhosts, std::vector& ghostStatus); @@ -1490,7 +1477,6 @@ class BulkData { stk::mesh::EntityId side_global_id, stk::mesh::ConnectivityOrdinal side_ordinal, stk::mesh::Permutation side_permutation, const stk::mesh::PartVector& parts); - bool ordered_comm( const Entity entity ); void pack_owned_verify(CommSparse & commSparse); bool unpack_not_owned_verify(CommSparse & commSparse, std::ostream & error_log); bool verify_parallel_attributes( std::ostream & error_log ); @@ -1626,6 +1612,8 @@ class BulkData { void dump_mesh_info(const stk::mesh::BulkData& mesh, std::ostream&out, EntityVector ev); +void sync_to_host_and_mark_modified(MetaData& meta); + } // namespace mesh } // namespace stk diff --git a/packages/stk/stk_mesh/stk_mesh/base/CreateEdges.cpp b/packages/stk/stk_mesh/stk_mesh/base/CreateEdges.cpp index 35dbfc60bdbc..f57046ff6856 100644 --- a/packages/stk/stk_mesh/stk_mesh/base/CreateEdges.cpp +++ b/packages/stk/stk_mesh/stk_mesh/base/CreateEdges.cpp @@ -98,16 +98,13 @@ struct create_single_edge_impl // enable if? check intel void operator()(Topology t) { - typedef topology::topology_type< Topology::edge_topology> EdgeTopology; - Topology elem_topo; - EdgeTopology edge_topo; - + auto edge_topo = Topology::edge_topology(m_edge_ordinal); BulkData & mesh = m_mesh; PartVector add_parts; - add_parts.push_back( & mesh.mesh_meta_data().get_topology_root_part( EdgeTopology::value )); + add_parts.push_back( & mesh.mesh_meta_data().get_topology_root_part( edge_topo )); if (m_part_to_insert_new_edges) add_parts.push_back(m_part_to_insert_new_edges); @@ -159,8 +156,7 @@ struct create_single_edge_impl side = mesh.declare_edge(edge_id, add_parts); m_edge_map[edge_nodes] = side; - const int num_edge_nodes = EdgeTopology::num_nodes; - for (int n=0; n EdgeTopology; - EdgeTopology edge_topo; - PartVector add_parts; - add_parts.push_back( & mesh.mesh_meta_data().get_topology_root_part( EdgeTopology::value )); - if (m_part_to_insert_new_edges) - add_parts.push_back(m_part_to_insert_new_edges); + EntityVector edge_nodes; Entity elem_nodes[(Topology::num_nodes > 0) ? Topology::num_nodes : 1]; - EntityVector edge_nodes(EdgeTopology::num_nodes); - EntityKeyVector edge_node_keys(EdgeTopology::num_nodes); OrdinalVector scratch1, scratch2, scratch3; for (size_t ielem=0, eelem=m_bucket.size(); ielem void operator()(Topology t) { - typedef topology::topology_type< Topology::edge_topology> EdgeTopology; - stk::topology face_topo = m_bucket.topology(); - EdgeTopology edge_topo; BulkData & mesh = m_bucket.mesh(); + EntityVector edge_nodes; Entity face_nodes[(Topology::num_nodes > 0) ? Topology::num_nodes : 1]; - EntityVector edge_nodes(EdgeTopology::num_nodes); OrdinalVector scratch1, scratch2, scratch3; for (size_t iface=0, eface=m_bucket.size(); iface= elem_top.num_edges(), "For elem " << mesh.identifier(elem) << ", local_edge_id " << local_edge_id << ", " << @@ -142,7 +142,7 @@ Entity declare_element_edge( verify_declare_element_edge(mesh, elem, local_edge_id); stk::topology elem_top = mesh.bucket(elem).topology(); - stk::topology edge_top = elem_top.edge_topology(); + stk::topology edge_top = elem_top.edge_topology(local_edge_id); PartVector empty_parts; if(mesh.mesh_meta_data().spatial_dimension() == 2) @@ -338,7 +338,7 @@ EquivAndPositive is_shell_edge_equivalent_and_positive(const stk::mesh::BulkData EquivAndPositive result = {false, false}; stk::topology elemTopology = mesh.bucket(element).topology(); stk::topology subTopology = elemTopology.sub_topology(mesh.mesh_meta_data().side_rank(), 0); - stk::topology edgeTopology = subTopology.sub_topology(stk::topology::EDGE_RANK, 0); + stk::topology edgeTopology = subTopology.edge_topology(0); sub_topology_check(candidateSideNodes, elemTopology, edgeTopology); const stk::mesh::Entity* elemNodes = mesh.begin_nodes(element); diff --git a/packages/stk/stk_mesh/stk_mesh/base/FaceCreator.hpp b/packages/stk/stk_mesh/stk_mesh/base/FaceCreator.hpp index 90f9acf0410d..8619641e2c14 100644 --- a/packages/stk/stk_mesh/stk_mesh/base/FaceCreator.hpp +++ b/packages/stk/stk_mesh/stk_mesh/base/FaceCreator.hpp @@ -43,9 +43,9 @@ namespace mesh { class BulkData; class ElemElemGraph; -class SideSetEntry; +struct SideSetEntry; class SideSet; -class sharing_info; +struct sharing_info; class FaceCreator { public: diff --git a/packages/stk/stk_mesh/stk_mesh/base/FieldBLAS.hpp b/packages/stk/stk_mesh/stk_mesh/base/FieldBLAS.hpp index 3703e87ad9ef..82017e32284a 100644 --- a/packages/stk/stk_mesh/stk_mesh/base/FieldBLAS.hpp +++ b/packages/stk/stk_mesh/stk_mesh/base/FieldBLAS.hpp @@ -71,15 +71,9 @@ double SIERRA_FORTRAN(dasum)(const int * n,const double * x,const int * incx); int SIERRA_FORTRAN(idamax)(const int *n, const double *vect, const int *inc); void SIERRA_FORTRAN(saxpy)(const int *n, const float *xscale, const float x[], const int *incx, float y[],const int *incy); // y=y+sscale*x void SIERRA_FORTRAN(scopy)(const int* n, const float* s, const int* inc, float* s1, const int* inc1); // s1 = s -#if defined(__INTEL_COMPILER) || !defined(STK_BUILT_IN_SIERRA) float SIERRA_FORTRAN(sdot)(const int * n, const float* x, const int * incx, const float* y, const int * incy); // < x , y > float SIERRA_FORTRAN(snrm2)(const int * n, const float* x, const int * incx); // || x || float SIERRA_FORTRAN(sasum)(const int * n,const float * x,const int * incx); -#else -double SIERRA_FORTRAN(sdot)(const int * n, const float* x, const int * incx, const float* y, const int * incy); // < x , y > -double SIERRA_FORTRAN(snrm2)(const int * n, const float* x, const int * incx); // || x || -double SIERRA_FORTRAN(sasum)(const int * n,const float * x,const int * incx); -#endif void SIERRA_FORTRAN(sswap)(const int* n, float* s, const int* inc, float* s1, const int* inc1); // switch s1 , s // D.N.E. int SIERRA_FORTRAN(isamax)(const int *n, const float *vect, const int *inc); } diff --git a/packages/stk/stk_mesh/stk_mesh/base/FieldBase.cpp b/packages/stk/stk_mesh/stk_mesh/base/FieldBase.cpp index c253bf71b81c..7b26980fcb1d 100644 --- a/packages/stk/stk_mesh/stk_mesh/base/FieldBase.cpp +++ b/packages/stk/stk_mesh/stk_mesh/base/FieldBase.cpp @@ -39,6 +39,7 @@ #include "stk_mesh/base/DataTraits.hpp" // for DataTraits #include "stk_mesh/base/FieldRestriction.hpp" // for FieldRestriction #include +#include #include "stk_util/util/ReportHandler.hpp" // for ThrowRequireMsg @@ -111,6 +112,200 @@ unsigned FieldBase::length(const stk::mesh::Part& part) const return restriction.num_scalars_per_entity(); } +void FieldBase::rotate_multistate_data() +{ + const unsigned numStates = m_impl.number_of_states(); + if (numStates > 1 && StateNew == state()) { + NgpFieldBase* ngpField = get_ngp_field(); + if (ngpField != nullptr) { + ngpField->rotate_multistate_data(); + } + for (unsigned s = 1; s < numStates; ++s) { + FieldBase* sField = field_state(static_cast(s)); + m_field_meta_data.swap(sField->m_field_meta_data); + } + } +} + +#ifdef STK_DEBUG_FIELD_SYNC +unsigned +FieldBase::get_num_components(const FastMeshIndex & index) const +{ + const unsigned bytesPerScalar = data_traits().size_of; + return m_field_meta_data[index.bucket_id].m_bytes_per_entity/bytesPerScalar; +} + +void +FieldBase::set_last_modification_view(const LastFieldModLocationType & lastModView) const +{ + m_debugFieldLastModification = lastModView; +} + +bool +FieldBase::last_accessed_entity_value_has_changed(const FastMeshIndex & index, unsigned component) const +{ + const unsigned bytesPerScalar = data_traits().size_of; + const FieldMetaData& field_meta_data = m_field_meta_data[index.bucket_id]; + const unsigned entityOffset = field_meta_data.m_bytes_per_entity * index.bucket_ord; + const unsigned componentOffset = bytesPerScalar * component; + + const uint8_t * data = field_meta_data.m_data + entityOffset + componentOffset; + const uint8_t * lastValueData = m_lastFieldValue.data() + entityOffset + componentOffset; + + return std::memcmp(data, lastValueData, bytesPerScalar); +} + +void +FieldBase::set_last_modification(const FastMeshIndex & index, unsigned component, LastModLocation location) const +{ + m_debugFieldLastModification(index.bucket_id, ORDER_INDICES(index.bucket_ord, component)) = location; +} + +void +FieldBase::detect_host_field_entity_modification() const +{ + if (m_lastFieldEntityLocation.bucket_id == INVALID_BUCKET_ID) return; + + for (unsigned component = 0; component < get_num_components(m_lastFieldEntityLocation); ++component) { + if (last_accessed_entity_value_has_changed(m_lastFieldEntityLocation, component)) { + set_last_modification(m_lastFieldEntityLocation, component, LastModLocation::HOST); + } + } +} + +bool +FieldBase::last_entity_modification_not_on_host(const FastMeshIndex & index, unsigned component) const +{ + return !(m_debugFieldLastModification(index.bucket_id, + ORDER_INDICES(index.bucket_ord, component)) & LastModLocation::HOST); +} + +void +FieldBase::store_last_entity_access_location(const FastMeshIndex & index) const +{ + const FieldMetaData& field_meta_data = m_field_meta_data[index.bucket_id]; + const uint8_t * data = field_meta_data.m_data + field_meta_data.m_bytes_per_entity * index.bucket_ord; + + const unsigned bucketCapacity = get_mesh().buckets(entity_rank())[index.bucket_id]->capacity(); + m_lastFieldValue.resize(field_meta_data.m_bytes_per_entity * bucketCapacity); + uint8_t * lastValueData = m_lastFieldValue.data() + field_meta_data.m_bytes_per_entity * index.bucket_ord; + + std::memcpy(lastValueData, data, field_meta_data.m_bytes_per_entity); + m_lastFieldEntityLocation = index; +} + +std::string location_string(const char * fullPath, int lineNumber) +{ + if (lineNumber != -1) { + std::string fileName(fullPath); + std::size_t pathDelimeter = fileName.find_last_of("/"); + if (pathDelimeter < fileName.size()) { + fileName = fileName.substr(pathDelimeter+1); + } + return fileName + ":" + std::to_string(lineNumber) + " "; + } + else { + return ""; + } +} + +void +FieldBase::check_stale_field_entity_access(const FastMeshIndex & index, const char * fileName, int lineNumber) const +{ + if (get_ngp_field()->any_device_field_modification()) { + std::cout << location_string(fileName, lineNumber) + << "*** WARNING: Lost Device values for Field " << name() + << " due to a mesh modification before a sync to Host" << std::endl; + return; + } + + for (unsigned component = 0; component < get_num_components(index); ++component) { + if (last_entity_modification_not_on_host(index, component)) { + const unsigned bytesPerScalar = data_traits().size_of; + const FieldMetaData& field_meta_data = m_field_meta_data[index.bucket_id]; + const unsigned entityOffset = field_meta_data.m_bytes_per_entity * index.bucket_ord; + const unsigned componentOffset = bytesPerScalar * component; + + uint8_t * data = field_meta_data.m_data + entityOffset + componentOffset; + + const std::string baseMessage = location_string(fileName, lineNumber) + + "*** WARNING: Accessing stale data on Host for Field " + name() + + "[" + std::to_string(component) + "]="; + if (data_traits().is_floating_point && data_traits().size_of == 8u) { + std::cout << baseMessage << *reinterpret_cast(data) << std::endl; + } + else if (data_traits().is_floating_point && data_traits().size_of == 4u) { + std::cout << baseMessage << *reinterpret_cast(data) << std::endl; + } + else if (data_traits().is_integral && data_traits().is_signed && data_traits().size_of == 4u) { + std::cout << baseMessage << *reinterpret_cast(data) << std::endl; + } + else if (data_traits().is_integral && data_traits().is_unsigned && data_traits().size_of == 4u) { + std::cout << baseMessage << *reinterpret_cast(data) << std::endl; + } + else if (data_traits().is_integral && data_traits().is_signed && data_traits().size_of == 8u) { + std::cout << baseMessage << *reinterpret_cast(data) << std::endl; + } + else if (data_traits().is_integral && data_traits().is_unsigned && data_traits().size_of == 8u) { + std::cout << baseMessage << *reinterpret_cast(data) << std::endl; + } + else if (data_traits().is_integral && data_traits().is_signed && data_traits().size_of == 2u) { + std::cout << baseMessage << *reinterpret_cast(data) << std::endl; + } + else if (data_traits().is_integral && data_traits().is_unsigned && data_traits().size_of == 2u) { + std::cout << baseMessage << *reinterpret_cast(data) << std::endl; + } + else { + std::cout << location_string(fileName, lineNumber) + << "*** WARNING: Accessing stale data on Host for Field " << name() << std::endl; + } + } + } +} + +void +FieldBase::store_last_bucket_access_location(const stk::mesh::Bucket & bucket) const +{ + const FieldMetaData& field_meta_data = m_field_meta_data[bucket.bucket_id()]; + m_lastFieldValue.resize(field_meta_data.m_bytes_per_entity * bucket.capacity()); + + std::memcpy(m_lastFieldValue.data(), field_meta_data.m_data, field_meta_data.m_bytes_per_entity * bucket.size()); + m_lastFieldBucketLocation = &const_cast(bucket); +} + +void +FieldBase::detect_host_field_bucket_modification() const +{ + if (m_lastFieldBucketLocation == nullptr) return; + + for (unsigned ordinal = 0; ordinal < m_lastFieldBucketLocation->size(); ++ordinal) { + const FastMeshIndex index {m_lastFieldBucketLocation->bucket_id(), ordinal}; + for (unsigned component = 0; component < get_num_components(index); ++component) { + if (last_accessed_entity_value_has_changed(index, component)) { + set_last_modification(index, component, LastModLocation::HOST); + } + } + } +} + +void +FieldBase::check_stale_field_bucket_access(const stk::mesh::Bucket & bucket, const char * fileName, int lineNumber) const +{ + for (unsigned ordinal = 0; ordinal < bucket.size(); ++ordinal) { + const FastMeshIndex index {bucket.bucket_id(), ordinal}; + check_stale_field_entity_access(index, fileName, lineNumber); + } +} + +void +FieldBase::reset_debug_state() +{ + m_lastFieldEntityLocation = {INVALID_BUCKET_ID, 0}; + m_lastFieldBucketLocation = nullptr; +} + +#endif + //---------------------------------------------------------------------- } // namespace mesh diff --git a/packages/stk/stk_mesh/stk_mesh/base/FieldBase.hpp b/packages/stk/stk_mesh/stk_mesh/base/FieldBase.hpp index ee05ed31feb5..42d2112dbb92 100644 --- a/packages/stk/stk_mesh/stk_mesh/base/FieldBase.hpp +++ b/packages/stk/stk_mesh/stk_mesh/base/FieldBase.hpp @@ -42,6 +42,8 @@ #include // for FieldRestriction, etc #include // for FieldState #include // for FieldTraits, EntityRank, etc +#include +#include #include // for FieldBaseImpl #include // for string #include "stk_mesh/base/DataTraits.hpp" // for DataTraits @@ -55,7 +57,6 @@ namespace stk { namespace mesh { class MetaData; } } namespace stk { namespace mesh { class UnitTestFieldImpl; } } namespace stk { namespace mesh { namespace impl { class FieldRepository; } } } namespace stk { namespace mesh { class DataTraits; } } -namespace stk { namespace mesh { class NgpFieldBase; } } namespace stk { namespace mesh { template class DeviceField; } } namespace stk { @@ -209,10 +210,40 @@ class FieldBase void modify_on_device() const { m_impl.modify_on_device(); } void sync_to_host() const { m_impl.sync_to_host(); } void sync_to_device() const { m_impl.sync_to_device(); } + void clear_sync_state() const { m_impl.clear_sync_state(); } + + unsigned synchronized_count() const + { + if (get_ngp_field() != nullptr) { + return get_ngp_field()->synchronized_count(); + } + return get_mesh().synchronized_count(); + } size_t num_syncs_to_host() const { return m_impl.num_syncs_to_host(); } size_t num_syncs_to_device() const { return m_impl.num_syncs_to_device(); } + void rotate_multistate_data(); + +#ifdef STK_DEBUG_FIELD_SYNC + unsigned get_num_components(const FastMeshIndex & index) const; + bool has_device_field_debug_data() const { return ((get_debug_ngp_field() != nullptr) && (m_debugFieldLastModification.extent(0) > 0)); } + void set_last_modification_view(const LastFieldModLocationType & lastModView) const; + bool last_accessed_entity_value_has_changed(const FastMeshIndex & index, unsigned component) const; + void set_last_modification(const FastMeshIndex & index, unsigned component, LastModLocation location) const; + void detect_host_field_entity_modification() const; + bool last_entity_modification_not_on_host(const FastMeshIndex & index, unsigned component) const; + void store_last_entity_access_location(const FastMeshIndex & index) const; + void check_stale_field_entity_access(const FastMeshIndex & index, const char * fileName, int lineNumber) const; + + void store_last_bucket_access_location(const stk::mesh::Bucket & bucket) const; + void detect_host_field_bucket_modification() const; + void check_stale_field_bucket_access(const stk::mesh::Bucket & bucket, const char * fileName, int lineNumber) const; + + void reset_debug_state(); + NgpFieldBase * get_debug_ngp_field() const { return m_impl.get_ngp_field(); } +#endif + private: // Associate this field with a bulk data. @@ -230,10 +261,10 @@ class FieldBase void increment_num_syncs_to_host() const { m_impl.increment_num_syncs_to_host(); } void increment_num_syncs_to_device() const { m_impl.increment_num_syncs_to_device(); } - friend class ::stk::mesh::MetaData ; + friend class ::stk::mesh::MetaData; friend class ::stk::mesh::BulkData; friend class ::stk::mesh::impl::FieldRepository; - friend class ::stk::mesh::impl::FieldBaseImpl ; + friend class ::stk::mesh::impl::FieldBaseImpl; /** \brief Allow the unit test driver access */ friend class ::stk::mesh::UnitTestFieldImpl ; @@ -288,6 +319,13 @@ class FieldBase private: stk::mesh::BulkData* m_mesh; impl::FieldBaseImpl m_impl; + +#ifdef STK_DEBUG_FIELD_SYNC + mutable LastFieldModLocationType m_debugFieldLastModification; + mutable FastMeshIndex m_lastFieldEntityLocation = {INVALID_BUCKET_ID, 0}; + mutable Bucket * m_lastFieldBucketLocation = nullptr; + mutable std::vector m_lastFieldValue; +#endif }; /** \brief Print the field type, text name, and number of states. */ @@ -357,40 +395,185 @@ inline unsigned field_scalars_per_entity(const FieldBase& f, Entity e) { return field_bytes_per_entity(f, bulk.bucket(e))/bytes_per_scalar; } +inline bool field_is_allocated_for_bucket(const FieldBase& f, const Bucket& b) { + ThrowAssert(&b.mesh() == &f.get_mesh()); + //return true if field and bucket have the same rank and the field is associated with the bucket + ThrowAssert(f.get_meta_data_for_field().size() > b.bucket_id()); + return (is_matching_rank(f, b) && 0 != f.get_meta_data_for_field()[b.bucket_id()].m_bytes_per_entity); +} + +struct FieldBasePtrLess { + bool operator()(const stk::mesh::FieldBase* lhs, const stk::mesh::FieldBase* rhs) const + { + return lhs->mesh_meta_data_ordinal() < rhs->mesh_meta_data_ordinal(); + } +}; + + // // Optimized field data access, here the size of the field data is passed in rather than looked up. // This accessor can be used if the field is known to exist everywhere and known to have the same // size everywhere. // +#ifdef STK_DEBUG_FIELD_SYNC + template inline typename FieldTraits::data_type* -field_data(const FieldType & f, const unsigned bucket_id, Bucket::size_type bucket_ord, const int knownSize) { +field_data(const FieldType & f, const unsigned bucket_id, Bucket::size_type bucket_ord, const int knownSize, + DummyOverload dummyArg = DummyOverload(), const char * fileName = HOST_DEBUG_FILE_NAME, int lineNumber = HOST_DEBUG_LINE_NUMBER) +{ ThrowAssertMsg(f.get_meta_data_for_field()[bucket_id].m_bytes_per_entity >= knownSize, "field name= " << f.name() << "knownSize= " << knownSize << ", m_bytes_per_entity= " << f.get_meta_data_for_field()[bucket_id].m_bytes_per_entity); ThrowAssert(f.get_meta_data_for_field()[bucket_id].m_data != NULL); + + if (f.has_device_field_debug_data()) { + stk::mesh::FastMeshIndex index {bucket_id, static_cast(bucket_ord)}; + f.get_debug_ngp_field()->detect_device_field_modification(); + f.detect_host_field_entity_modification(); + f.check_stale_field_entity_access(index, fileName, lineNumber); + f.store_last_entity_access_location(index); + } + return reinterpret_cast::data_type*>(f.get_meta_data_for_field()[bucket_id].m_data + knownSize * bucket_ord); } template inline typename FieldTraits::data_type* -field_data(const FieldType & f, const unsigned bucket_id) { +field_data(const FieldType & f, const unsigned bucket_id, + DummyOverload dummyArg = DummyOverload(), const char * fileName = HOST_DEBUG_FILE_NAME, int lineNumber = HOST_DEBUG_LINE_NUMBER) +{ + if (f.has_device_field_debug_data()) { + stk::mesh::Bucket & bucket = *f.get_mesh().buckets(f.entity_rank())[bucket_id]; + f.get_debug_ngp_field()->detect_device_field_modification(); + f.detect_host_field_bucket_modification(); + f.check_stale_field_bucket_access(bucket, fileName, lineNumber); + f.store_last_bucket_access_location(bucket); + } + return reinterpret_cast::data_type*>(f.get_meta_data_for_field()[bucket_id].m_data); } +template +inline +typename FieldTraits::data_type* +field_data(const FieldType & f, const unsigned bucket_id, Bucket::size_type bucket_ord, + DummyOverload dummyArg = DummyOverload(), const char * fileName = HOST_DEBUG_FILE_NAME, int lineNumber = HOST_DEBUG_LINE_NUMBER) +{ + if (f.has_device_field_debug_data()) { + stk::mesh::FastMeshIndex index {bucket_id, static_cast(bucket_ord)}; + f.get_debug_ngp_field()->detect_device_field_modification(); + f.detect_host_field_entity_modification(); + f.check_stale_field_entity_access(index, fileName, lineNumber); + f.store_last_entity_access_location(index); + } -inline bool field_is_allocated_for_bucket(const FieldBase& f, const Bucket& b) { + const FieldMetaData& field_meta_data = f.get_meta_data_for_field()[bucket_id]; + return reinterpret_cast::data_type*>(field_meta_data.m_data + field_meta_data.m_bytes_per_entity * bucket_ord); +} + + +template +inline +typename FieldTraits::data_type* +field_data(const FieldType & f, const Bucket& b, Bucket::size_type bucket_ord, + DummyOverload dummyArg = DummyOverload(), const char * fileName = HOST_DEBUG_FILE_NAME, int lineNumber = HOST_DEBUG_LINE_NUMBER) +{ + ThrowAssert(f.entity_rank() == b.entity_rank()); + ThrowAssert(&f.get_mesh() == &b.mesh()); + + if (f.has_device_field_debug_data()) { + stk::mesh::FastMeshIndex index {b.bucket_id(), static_cast(bucket_ord)}; + f.get_debug_ngp_field()->detect_device_field_modification(); + f.detect_host_field_entity_modification(); + f.check_stale_field_entity_access(index, fileName, lineNumber); + f.store_last_entity_access_location(index); + } + + const FieldMetaData& field_meta_data = f.get_meta_data_for_field()[b.bucket_id()]; + return reinterpret_cast::data_type*>(field_meta_data.m_data + field_meta_data.m_bytes_per_entity * bucket_ord); +} + +template +inline +typename FieldTraits::data_type* +field_data(const FieldType & f, const Bucket& b, + DummyOverload dummyArg = DummyOverload(), const char * fileName = HOST_DEBUG_FILE_NAME, int lineNumber = HOST_DEBUG_LINE_NUMBER) +{ + ThrowAssert(f.entity_rank() == b.entity_rank()); ThrowAssert(&b.mesh() == &f.get_mesh()); - //return true if field and bucket have the same rank and the field is associated with the bucket - ThrowAssert(f.get_meta_data_for_field().size() > b.bucket_id()); - return (is_matching_rank(f, b) && 0 != f.get_meta_data_for_field()[b.bucket_id()].m_bytes_per_entity); + + if (f.has_device_field_debug_data()) { + f.get_debug_ngp_field()->detect_device_field_modification(); + f.detect_host_field_bucket_modification(); + f.check_stale_field_bucket_access(b, fileName, lineNumber); + f.store_last_bucket_access_location(b); + } + + const FieldMetaData& field_meta_data = f.get_meta_data_for_field()[b.bucket_id()]; + return reinterpret_cast::data_type*>(field_meta_data.m_data); +} + +template +inline +typename FieldTraits::data_type* +ngp_debug_field_data(const FieldType & f, const Bucket& b) +{ + ThrowAssert(f.entity_rank() == b.entity_rank()); + ThrowAssert(&b.mesh() == &f.get_mesh()); + const FieldMetaData& field_meta_data = f.get_meta_data_for_field()[b.bucket_id()]; + return reinterpret_cast::data_type*>(field_meta_data.m_data); } template inline typename FieldTraits::data_type* -field_data(const FieldType & f, const unsigned bucket_id, Bucket::size_type bucket_ord) { +field_data(const FieldType & f, Entity e, + DummyOverload dummyArg = DummyOverload(), const char * fileName = HOST_DEBUG_FILE_NAME, int lineNumber = HOST_DEBUG_LINE_NUMBER) +{ + const MeshIndex& mi = f.get_mesh().mesh_index(e); + ThrowAssert(f.entity_rank() == mi.bucket->entity_rank()); + ThrowAssert(&f.get_mesh() == &mi.bucket->mesh()); + + if (f.has_device_field_debug_data()) { + stk::mesh::FastMeshIndex index {mi.bucket->bucket_id(), mi.bucket_ordinal}; + f.get_debug_ngp_field()->detect_device_field_modification(); + f.detect_host_field_entity_modification(); + f.check_stale_field_entity_access(index, fileName, lineNumber); + f.store_last_entity_access_location(index); + } + + const FieldMetaData& field_meta_data = f.get_meta_data_for_field()[mi.bucket->bucket_id()]; + return reinterpret_cast::data_type*>(field_meta_data.m_data + field_meta_data.m_bytes_per_entity * mi.bucket_ordinal); +} + +#else + +template +inline +typename FieldTraits::data_type* +field_data(const FieldType & f, const unsigned bucket_id, Bucket::size_type bucket_ord, const int knownSize) +{ + ThrowAssertMsg(f.get_meta_data_for_field()[bucket_id].m_bytes_per_entity >= knownSize, "field name= " << f.name() << "knownSize= " << knownSize << ", m_bytes_per_entity= " << f.get_meta_data_for_field()[bucket_id].m_bytes_per_entity); + ThrowAssert(f.get_meta_data_for_field()[bucket_id].m_data != NULL); + + return reinterpret_cast::data_type*>(f.get_meta_data_for_field()[bucket_id].m_data + knownSize * bucket_ord); +} + +template +inline +typename FieldTraits::data_type* +field_data(const FieldType & f, const unsigned bucket_id) +{ + return reinterpret_cast::data_type*>(f.get_meta_data_for_field()[bucket_id].m_data); +} + +template +inline +typename FieldTraits::data_type* +field_data(const FieldType & f, const unsigned bucket_id, Bucket::size_type bucket_ord) +{ const FieldMetaData& field_meta_data = f.get_meta_data_for_field()[bucket_id]; return reinterpret_cast::data_type*>(field_meta_data.m_data + field_meta_data.m_bytes_per_entity * bucket_ord); } @@ -399,7 +582,8 @@ field_data(const FieldType & f, const unsigned bucket_id, Bucket::size_type buck template inline typename FieldTraits::data_type* -field_data(const FieldType & f, const Bucket& b, Bucket::size_type bucket_ord) { +field_data(const FieldType & f, const Bucket& b, Bucket::size_type bucket_ord) +{ ThrowAssert(f.entity_rank() == b.entity_rank()); ThrowAssert(&f.get_mesh() == &b.mesh()); const FieldMetaData& field_meta_data = f.get_meta_data_for_field()[b.bucket_id()]; @@ -430,12 +614,7 @@ field_data(const FieldType & f, Entity e) return reinterpret_cast::data_type*>(field_meta_data.m_data + field_meta_data.m_bytes_per_entity * mi.bucket_ordinal); } -struct FieldBasePtrLess { - bool operator()(const stk::mesh::FieldBase* lhs, const stk::mesh::FieldBase* rhs) const - { - return lhs->mesh_meta_data_ordinal() < rhs->mesh_meta_data_ordinal(); - } -}; +#endif } //namespace mesh } //namespace stk diff --git a/packages/stk/stk_mesh/stk_mesh/base/FieldParallel.cpp b/packages/stk/stk_mesh/stk_mesh/base/FieldParallel.cpp index 016af3d1d0e7..6f498faee7d6 100644 --- a/packages/stk/stk_mesh/stk_mesh/base/FieldParallel.cpp +++ b/packages/stk/stk_mesh/stk_mesh/base/FieldParallel.cpp @@ -66,6 +66,11 @@ void communicate_field_data( const int parallel_rank = mesh.parallel_rank(); const unsigned ghost_id = ghosts.ordinal(); + for ( const FieldBase* fptr : fields) { + fptr->sync_to_host(); + fptr->modify_on_host(); + } + // Sizing for send and receive const unsigned zero = 0 ; @@ -435,6 +440,8 @@ void parallel_op_including_ghosts_impl(const BulkData & mesh, const std::vector< size_t comm_info_vec_size = comm_info_vec.size(); for ( fi = fb ; fi != fe ; ++fi ) { const FieldBase & f = **fi ; + f.sync_to_host(); + f.modify_on_host(); for (size_t i=0; i > fieldRange(fields.size(), std::make_pair(-1,-1)); for(int fi=0; fisync_to_host(); + fields[fi]->modify_on_host(); EntityRank fieldRank = fields[fi]->entity_rank(); EntityCommListInfoVector::const_iterator startIter = std::lower_bound(comm_info_vec.begin(), comm_info_vec.end(), fieldRank, InfoRankLess()); EntityCommListInfoVector::const_iterator endIter = std::upper_bound(startIter, comm_info_vec.end(), fieldRank, InfoRankLess()); diff --git a/packages/stk/stk_mesh/stk_mesh/base/FieldSyncDebugging.hpp b/packages/stk/stk_mesh/stk_mesh/base/FieldSyncDebugging.hpp new file mode 100644 index 000000000000..ab67dd4bc761 --- /dev/null +++ b/packages/stk/stk_mesh/stk_mesh/base/FieldSyncDebugging.hpp @@ -0,0 +1,53 @@ +#ifndef FIELDSYNCDEBUGGING_HPP +#define FIELDSYNCDEBUGGING_HPP + +#ifdef STK_DEBUG_FIELD_SYNC + +#include "Kokkos_Core.hpp" +#include "stk_mesh/base/NgpSpaces.hpp" + +#ifndef __has_builtin + #define __has_builtin(x) 0 // Compatibility with non-clang compilers. +#endif + +#if !defined(__INTEL_COMPILER) && !(defined(__clang__) && !(__has_builtin(__builtin_LINE))) +#define HOST_USE_LOCATION_BUILTINS +#define HOST_DEBUG_FILE_NAME __builtin_FILE() +#define HOST_DEBUG_LINE_NUMBER __builtin_LINE() +#else +#define HOST_DEBUG_FILE_NAME "" +#define HOST_DEBUG_LINE_NUMBER -1 +#endif + +#if !defined(__INTEL_COMPILER) && !(defined(__clang__) && !(__has_builtin(__builtin_LINE))) && !defined(KOKKOS_ENABLE_CUDA) +#define DEVICE_USE_LOCATION_BUILTINS +#define DEVICE_DEBUG_FILE_NAME __builtin_FILE() +#define DEVICE_DEBUG_LINE_NUMBER __builtin_LINE() +#else +#define DEVICE_DEBUG_FILE_NAME "" +#define DEVICE_DEBUG_LINE_NUMBER -1 +#endif + +namespace stk { +namespace mesh { + +enum LastModLocation : uint8_t { + NONE = 0x00, + HOST = 0x01, + DEVICE = 0x02 +}; + +using LastFieldModLocationType = Kokkos::View; + +struct DummyOverload +{ + DummyOverload() = default; + ~DummyOverload() = default; +}; + +} +} + +#endif + +#endif // FIELDSYNCDEBUGGING_HPP diff --git a/packages/stk/stk_mesh/stk_mesh/base/ForEachEntity.hpp b/packages/stk/stk_mesh/stk_mesh/base/ForEachEntity.hpp new file mode 100644 index 000000000000..9d3f8df5e2cb --- /dev/null +++ b/packages/stk/stk_mesh/stk_mesh/base/ForEachEntity.hpp @@ -0,0 +1,69 @@ +// Copyright 2002 - 2008, 2010, 2011 National Technology Engineering +// Solutions of Sandia, LLC (NTESS). Under the terms of Contract +// DE-NA0003525 with NTESS, the U.S. Government retains certain rights +// in this software. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following +// disclaimer in the documentation and/or other materials provided +// with the distribution. +// +// * Neither the name of NTESS nor the names of its contributors +// may be used to endorse or promote products derived from this +// software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +#ifndef STK_MESH_FOREACHENTITY_HPP +#define STK_MESH_FOREACHENTITY_HPP + +#include +#include +#include +#include +#include +#include + +namespace stk { +namespace mesh { + +template +void for_each_entity_run(const BulkData &mesh, + stk::topology::rank_t rank, + const Selector& selector, + const ALGORITHM_TO_RUN_PER_ENTITY &functor) +{ + impl::for_each_selected_entity_run(mesh, rank, selector, functor); +} + +template +void for_each_entity_run(const BulkData &mesh, + stk::topology::rank_t rank, + const ALGORITHM_TO_RUN_PER_ENTITY &functor) +{ + Selector selectAll = mesh.mesh_meta_data().universal_part(); + impl::for_each_selected_entity_run(mesh, rank, selectAll, functor); +} + +} // namespace mesh +} // namespace stk + +#endif + diff --git a/packages/stk/stk_mesh/stk_mesh/base/GetNgpField.hpp b/packages/stk/stk_mesh/stk_mesh/base/GetNgpField.hpp index e4a90e02eeab..8405f624a5d9 100644 --- a/packages/stk/stk_mesh/stk_mesh/base/GetNgpField.hpp +++ b/packages/stk/stk_mesh/stk_mesh/base/GetNgpField.hpp @@ -46,16 +46,15 @@ NgpField & get_updated_ngp_field(const FieldBase & stkField) NgpFieldBase * ngpField = stkField.get_ngp_field(); if (ngpField == nullptr) { - ngpField = new NgpField(stkField.get_mesh(), stkField); + NgpField* ngpFieldT = new NgpField(stkField.get_mesh(), stkField, true); + ngpField = ngpFieldT; stkField.set_ngp_field(ngpField); } else { if (stkField.get_mesh().synchronized_count() != ngpField->synchronized_count()) { - ngpField = new NgpField(stkField.get_mesh(), stkField); - stkField.set_ngp_field(ngpField); + ngpField->update_field(); } } - return dynamic_cast< NgpField& >(*ngpField); } diff --git a/packages/stk/stk_mesh/stk_mesh/base/MetaData.cpp b/packages/stk/stk_mesh/stk_mesh/base/MetaData.cpp index 3d01bd4c8e23..d5689e839f31 100644 --- a/packages/stk/stk_mesh/stk_mesh/base/MetaData.cpp +++ b/packages/stk/stk_mesh/stk_mesh/base/MetaData.cpp @@ -116,35 +116,6 @@ void MetaData::set_mesh_on_fields(BulkData* bulk) const MetaData & MetaData::get( const BulkData & bulk_data) { return bulk_data.mesh_meta_data(); } -//---------------------------------------------------------------------- - -std::ostream & -print_entity_id( std::ostream & os , const MetaData & meta_data , - EntityRank type , EntityId id ) -{ - const std::string & name = meta_data.entity_rank_name( type ); - return os << name << "[" << id << "]" ; -} - - -std::ostream & -print_entity_key( std::ostream & os , const MetaData & meta_data , - const EntityKey & key ) -{ - const EntityRank type = key.rank(); - const EntityId id = key.id(); - return print_entity_id( os , meta_data , type , id ); -} - -std::string -print_entity_key( const MetaData & meta_data , const EntityKey & key ) -{ - std::ostringstream out; - print_entity_key(out, meta_data, key); - return out.str(); -} - -//---------------------------------------------------------------------- void MetaData::require_not_committed() const { @@ -596,6 +567,7 @@ void MetaData::internal_declare_known_cell_topology_parts() register_topology(stk::topology::TRI_6); register_topology(stk::topology::QUAD_4); + register_topology(stk::topology::QUAD_6); register_topology(stk::topology::QUAD_8); register_topology(stk::topology::QUAD_9); @@ -617,6 +589,7 @@ void MetaData::internal_declare_known_cell_topology_parts() register_topology(stk::topology::PYRAMID_14); register_topology(stk::topology::WEDGE_6); + register_topology(stk::topology::WEDGE_12); register_topology(stk::topology::WEDGE_15); register_topology(stk::topology::WEDGE_18); @@ -911,6 +884,11 @@ stk::topology get_topology( shards::CellTopology shards_topology, unsigned spati else if ( shards_topology == shards::CellTopology(shards::getCellTopologyData< shards::Quadrilateral<4> >()) ) t = spatial_dimension == 3 ? stk::topology::QUAD_4 : stk::topology::QUAD_4_2D; + + //NOTE: shards does not define a quad 6 + // else if ( shards_topology == shards::CellTopology(shards::getCellTopologyData< shards::Quadrilateral<6> >()) ) + // t = stk::topology::QUAD_6; + else if ( shards_topology == shards::CellTopology(shards::getCellTopologyData< shards::Quadrilateral<8> >()) ) t = spatial_dimension == 3 ? stk::topology::QUAD_8 : stk::topology::QUAD_8_2D; else if ( shards_topology == shards::CellTopology(shards::getCellTopologyData< shards::Quadrilateral<9> >()) ) @@ -972,6 +950,11 @@ stk::topology get_topology( shards::CellTopology shards_topology, unsigned spati else if ( shards_topology == shards::CellTopology(shards::getCellTopologyData< shards::Wedge<6> >()) ) t = stk::topology::WEDGE_6; + + //NOTE: shards does not define a wedge 12 + // else if ( shards_topology == shards::CellTopology(shards::getCellTopologyData< shards::Wedge<12> >()) ) + // t = stk::topology::WEDGE_12; + else if ( shards_topology == shards::CellTopology(shards::getCellTopologyData< shards::Wedge<15> >()) ) t = stk::topology::WEDGE_15; else if ( shards_topology == shards::CellTopology(shards::getCellTopologyData< shards::Wedge<18> >()) ) @@ -1014,6 +997,9 @@ shards::CellTopology get_cell_topology(stk::topology t) return shards::CellTopology( shards::getCellTopologyData< shards::Triangle<6> >() ); case stk::topology::QUAD_4: return shards::CellTopology( shards::getCellTopologyData< shards::Quadrilateral<4> >() ); + case stk::topology::QUAD_6: + //NOTE: shards does not define a topology for a 6-noded quadrilateral element + // return shards::CellTopology( shards::getCellTopologyData< shards::Quadrilateral<6> >() ); case stk::topology::QUAD_8: return shards::CellTopology( shards::getCellTopologyData< shards::Quadrilateral<8> >() ); case stk::topology::QUAD_9: @@ -1079,6 +1065,9 @@ shards::CellTopology get_cell_topology(stk::topology t) return shards::CellTopology( shards::getCellTopologyData< shards::Pyramid<14> >() ); case stk::topology::WEDGE_6: return shards::CellTopology( shards::getCellTopologyData< shards::Wedge<6> >() ); + case stk::topology::WEDGE_12: + //NOTE: shards does not define a topology for a 12-noded wedge + // return shards::CellTopology( shards::getCellTopologyData< shards::Wedge<12> >() ); case stk::topology::WEDGE_15: return shards::CellTopology( shards::getCellTopologyData< shards::Wedge<15> >() ); case stk::topology::WEDGE_18: diff --git a/packages/stk/stk_mesh/stk_mesh/base/MetaData.hpp b/packages/stk/stk_mesh/stk_mesh/base/MetaData.hpp index ed10f57c9939..7554ec8de385 100644 --- a/packages/stk/stk_mesh/stk_mesh/base/MetaData.hpp +++ b/packages/stk/stk_mesh/stk_mesh/base/MetaData.hpp @@ -69,9 +69,7 @@ namespace shards { class ArrayDimTag; } namespace shards { class CellTopologyManagedData; } -namespace stk { namespace mesh { class Bucket; } } namespace stk { namespace mesh { class BulkData; } } -namespace stk { namespace mesh { class Ghosting; } } namespace stk { namespace mesh { class MetaData; } } namespace stk { @@ -83,13 +81,6 @@ typedef Field CoordinatesField; * \{ */ -/** \brief Print an entity key for this meta data */ -std::ostream & -print_entity_key( std::ostream & os, const MetaData & meta_data, const EntityKey & key); - -std::string -print_entity_key( const MetaData & meta_data, const EntityKey & key ); - bool is_topology_root_part(const Part & part); /** set a stk::topology on a part */ diff --git a/packages/stk/stk_mesh/stk_mesh/base/Ngp.hpp b/packages/stk/stk_mesh/stk_mesh/base/Ngp.hpp index 3fa5ac2bd901..75b4c128fe0f 100644 --- a/packages/stk/stk_mesh/stk_mesh/base/Ngp.hpp +++ b/packages/stk/stk_mesh/stk_mesh/base/Ngp.hpp @@ -44,17 +44,13 @@ class HostMesh; class DeviceMesh; template class HostField; template class DeviceField; -template class ConstHostField; -template class ConstDeviceField; #ifdef STK_USE_DEVICE_MESH using NgpMesh = stk::mesh::DeviceMesh; template using NgpField = stk::mesh::DeviceField; -template using NgpConstField = stk::mesh::ConstDeviceField; #else using NgpMesh = stk::mesh::HostMesh; template using NgpField = stk::mesh::HostField; -template using NgpConstField = stk::mesh::ConstHostField; #endif } diff --git a/packages/stk/stk_mesh/stk_mesh/base/NgpField.hpp b/packages/stk/stk_mesh/stk_mesh/base/NgpField.hpp index 3a82f7b8be95..5ee130cc3da2 100644 --- a/packages/stk/stk_mesh/stk_mesh/base/NgpField.hpp +++ b/packages/stk/stk_mesh/stk_mesh/base/NgpField.hpp @@ -37,47 +37,31 @@ #include "stk_util/stk_config.h" #include "Kokkos_Core.hpp" #include "Kokkos_DualView.hpp" +#include "stk_mesh/base/NgpFieldBase.hpp" #include "stk_mesh/base/BulkData.hpp" #include "stk_mesh/base/Field.hpp" #include "stk_mesh/base/Types.hpp" #include "stk_mesh/base/NgpForEachEntity.hpp" #include "stk_mesh/base/NgpMesh.hpp" #include "stk_mesh/base/NgpProfilingBlock.hpp" +#include "stk_mesh/base/FieldSyncDebugging.hpp" namespace stk { namespace mesh { constexpr unsigned INVALID_ORDINAL = 9999999; -template class ConstHostField; -template class MultistateField; - -class NgpFieldBase -{ -public: - KOKKOS_DEFAULTED_FUNCTION NgpFieldBase() = default; - STK_FUNCTION virtual ~NgpFieldBase() {} - virtual void update_field() = 0; - virtual void modify_on_host() = 0; - virtual void modify_on_device() = 0; - virtual void sync_to_host() = 0; - virtual void sync_to_device() = 0; - virtual size_t synchronized_count() const = 0; - virtual size_t num_syncs_to_host() const = 0; - virtual size_t num_syncs_to_device() const = 0; -}; - template class EntityFieldData { public: - STK_FUNCTION EntityFieldData(T* dataPtr, unsigned length, unsigned stride=1) + KOKKOS_FUNCTION EntityFieldData(T* dataPtr, unsigned length, unsigned stride=1) : fieldDataPtr(dataPtr), fieldDataLength(length), fieldDataStride(stride) {} KOKKOS_DEFAULTED_FUNCTION ~EntityFieldData() = default; - STK_FUNCTION unsigned size() const { return fieldDataLength; } - STK_FUNCTION T& operator[](unsigned idx) { return fieldDataPtr[idx*fieldDataStride]; } - STK_FUNCTION const T& operator[](unsigned idx) const { return fieldDataPtr[idx*fieldDataStride]; } + KOKKOS_FUNCTION unsigned size() const { return fieldDataLength; } + KOKKOS_FUNCTION T& operator[](unsigned idx) { return fieldDataPtr[idx*fieldDataStride]; } + KOKKOS_FUNCTION const T& operator[](unsigned idx) const { return fieldDataPtr[idx*fieldDataStride]; } private: T* fieldDataPtr; @@ -85,6 +69,9 @@ class EntityFieldData { unsigned fieldDataStride; }; +template using UnmanagedHostInnerView = Kokkos::View>; +template using UnmanagedDevInnerView = Kokkos::View>; + template class HostField : public NgpFieldBase { @@ -95,13 +82,15 @@ class HostField : public NgpFieldBase : NgpFieldBase(), field(nullptr) { } - HostField(const stk::mesh::BulkData& b, const stk::mesh::FieldBase& f) + HostField(const stk::mesh::BulkData& b, const stk::mesh::FieldBase& f, bool isFromGetUpdatedNgpField = false) : NgpFieldBase(), field(&f) { } virtual ~HostField() = default; - void update_field() override {} + void update_field(bool needToSyncAllDataToDevice = false) override {} + + void set_field_states(HostField* fields[]) {} size_t num_syncs_to_host() const override { return field->num_syncs_to_host(); } size_t num_syncs_to_device() const override { return field->num_syncs_to_device(); } @@ -112,6 +101,68 @@ class HostField : public NgpFieldBase return stk::mesh::field_scalars_per_entity(*field, entity.bucket_id); } +#ifdef STK_DEBUG_FIELD_SYNC + void detect_device_field_modification() override { + } + + void update_debug_storage(size_t hostSynchronizedCount) override { + } + + bool any_device_field_modification() const override { + return false; + } + + T& get(const HostMesh& ngpMesh, stk::mesh::Entity entity, int component, + const char * fileName = HOST_DEBUG_FILE_NAME, int lineNumber = HOST_DEBUG_LINE_NUMBER) const + { + T *data = static_cast(stk::mesh::field_data(*field, entity)); + ThrowAssert(data); + return data[component]; + } + + T& get(stk::mesh::FastMeshIndex entity, int component, + const char * fileName = HOST_DEBUG_FILE_NAME, int lineNumber = HOST_DEBUG_LINE_NUMBER) const + { + T *data = static_cast(stk::mesh::field_data(*field, entity.bucket_id, entity.bucket_ord)); + ThrowAssert(data); + return data[component]; + } + + T& get(HostMesh::MeshIndex entity, int component, + const char * fileName = HOST_DEBUG_FILE_NAME, int lineNumber = HOST_DEBUG_LINE_NUMBER) const + { + T* data = static_cast(stk::mesh::field_data(*field, entity.bucket->bucket_id(), entity.bucketOrd)); + ThrowAssert(data); + return data[component]; + } + + T& operator()(const stk::mesh::FastMeshIndex& index, int component, + const char * fileName = HOST_DEBUG_FILE_NAME, int lineNumber = HOST_DEBUG_LINE_NUMBER) const + { + T *data = static_cast(stk::mesh::field_data(*field, index.bucket_id, index.bucket_ord)); + ThrowAssert(data); + return data[component]; + } + + T& operator()(const HostMesh::MeshIndex& index, int component, + const char * fileName = HOST_DEBUG_FILE_NAME, int lineNumber = HOST_DEBUG_LINE_NUMBER) const + { + T* data = static_cast(stk::mesh::field_data(*field, index.bucket->bucket_id(), index.bucketOrd)); + ThrowAssert(data); + return data[component]; + } + + EntityFieldData operator()(const stk::mesh::FastMeshIndex& index, + const char * fileName = HOST_DEBUG_FILE_NAME, int lineNumber = HOST_DEBUG_LINE_NUMBER) const + { + T *data = static_cast(stk::mesh::field_data(*field, index.bucket_id, index.bucket_ord)); + unsigned numScalars = stk::mesh::field_scalars_per_entity(*field, index.bucket_id); + ThrowAssert(data); + return EntityFieldData(data, numScalars); + } + +#else + T& get(const HostMesh& ngpMesh, stk::mesh::Entity entity, int component) const { T *data = static_cast(stk::mesh::field_data(*field, entity)); @@ -154,6 +205,7 @@ class HostField : public NgpFieldBase ThrowAssert(data); return EntityFieldData(data, numScalars); } +#endif void set_all(const HostMesh& ngpMesh, const T& value) { @@ -170,15 +222,17 @@ class HostField : public NgpFieldBase void modify_on_device() override { } + void clear_sync_state() override {} + void sync_to_host() override { } void sync_to_device() override { } size_t synchronized_count() const override { return field->mesh_meta_data().mesh_bulk_data().synchronized_count(); } - void clear_sync_state() { } + FieldState state() const { return field->state(); } - void swap(ConstHostField &sf) { } + void rotate_multistate_data() override { } void swap(HostField &sf) { } @@ -186,131 +240,37 @@ class HostField : public NgpFieldBase unsigned get_ordinal() const { return field->mesh_meta_data_ordinal(); } -private: - void copy_host_to_device() { } - - void copy_device_to_host() { } - +protected: bool need_sync_to_host() const { return false; } bool need_sync_to_device() const { return false; } - const stk::mesh::FieldBase * field; - - friend ConstHostField; - friend MultistateField; -}; - -template -class ConstHostField : public NgpFieldBase -{ -public: - typedef T value_type; - - ConstHostField() - : NgpFieldBase(), - stkFieldAdapter() { } - - ConstHostField(const HostField &sfa) - : NgpFieldBase(), - stkFieldAdapter(sfa) - { - } - - ConstHostField(const stk::mesh::BulkData& b, const stk::mesh::FieldBase& f) - : NgpFieldBase(), - stkFieldAdapter(b, f) - { - } - - virtual ~ConstHostField() = default; - - void update_field() override {} - - size_t num_syncs_to_host() const override { return stkFieldAdapter.num_syncs_to_host(); } - size_t num_syncs_to_device() const override { return stkFieldAdapter.num_syncs_to_device(); } - - unsigned get_stride() const { return stkFieldAdapter.get_stride(); } - - unsigned get_num_components_per_entity(const stk::mesh::FastMeshIndex& index) const { - return stkFieldAdapter.get_num_components_per_entity(index); - } - - const T& get(const HostMesh& ngpMesh, stk::mesh::Entity entity, int component) const - { - return stkFieldAdapter.get(ngpMesh, entity, component); - } - - const T& get(stk::mesh::FastMeshIndex entity, int component) const - { - return stkFieldAdapter.get(entity, component); - } - - const T& get(HostMesh::MeshIndex entity, int component) const - { - return stkFieldAdapter.get(entity, component); - } - - const T& operator()(stk::mesh::FastMeshIndex index, int component) const - { - return stkFieldAdapter(index, component); - } - - const T& operator()(HostMesh::MeshIndex index, int component) const - { - return stkFieldAdapter(index, component); - } - - stk::mesh::EntityRank get_rank() const { return stkFieldAdapter.get_rank(); } - - unsigned get_ordinal() const { return stkFieldAdapter.get_ordinal(); } - - void modify_on_host() override { } - - void modify_on_device() override { } - - void sync_to_host() override { } - - void sync_to_device() override { } - - size_t synchronized_count() const override { return stkFieldAdapter.synchronized_count(); } - - void swap(ConstHostField &sf) { } - - void swap(HostField &sf) { } - - void clear_sync_state() { } - private: void copy_host_to_device() { } void copy_device_to_host() { } - bool need_sync_to_host() const { return false; } - - bool need_sync_to_device() const { return false; } - - HostField stkFieldAdapter; - - friend MultistateField; + const stk::mesh::FieldBase * field; }; - +template +class DeviceField : public NgpFieldBase +{ +private: #ifdef KOKKOS_ENABLE_CUDA -#define ORDER_INDICES(i,j) j,i + typedef Kokkos::DualView FieldDataDualViewType; #else -#define ORDER_INDICES(i,j) i,j + typedef Kokkos::DualView FieldDataDualViewType; #endif -template class ConstDeviceField; + typedef typename FieldDataDualViewType::t_dev FieldDataType; + typedef typename FieldDataDualViewType::t_host FieldDataHostType; -template -class DeviceField : public NgpFieldBase -{ public: typedef T value_type; - STK_FUNCTION + KOKKOS_FUNCTION DeviceField() : NgpFieldBase(), rank(stk::topology::NODE_RANK), @@ -319,22 +279,14 @@ class DeviceField : public NgpFieldBase hostField(nullptr), bucketCapacity(0), synchronizedCount(0) - { } - - void construct_view(const std::string& name, unsigned numBuckets, unsigned numPerEntity) { -#ifdef KOKKOS_ENABLE_CUDA - deviceData = FieldDataType(name, numBuckets, numPerEntity, bucketCapacity); -#else - deviceData = FieldDataType(name, numBuckets, bucketCapacity, numPerEntity); -#endif - hostData = Kokkos::create_mirror_view(deviceData); - fieldData = FieldDataDualViewType(deviceData, hostData); - - deviceFieldExistsOnBucket = BoolViewType(name + "_exists_on_bucket", numBuckets); - hostFieldExistsOnBucket = Kokkos::create_mirror_view(deviceFieldExistsOnBucket); + { + const int maxStates = static_cast(stk::mesh::MaximumFieldStates); + for (int s=0; s(stk::mesh::MaximumFieldStates); + for (int s=0; s* fields[]) { + const unsigned numStates = hostField->number_of_states(); + for (unsigned state = 0; state < numStates; ++state) { + stateFields[state] = fields[state]; + } + } + + void update_field(bool needToSyncAllDataToDevice = false) override + { + ProfilingBlock prof("update_field for " + hostField->name()); stk::mesh::Selector selector = stk::mesh::selectField(*hostField); const stk::mesh::BucketVector& buckets = hostBulk->get_buckets(hostField->entity_rank(), selector); + const stk::mesh::BucketVector& allBuckets = hostBulk->buckets(hostField->entity_rank()); + if (!buckets.empty()) { bucketCapacity = buckets[0]->capacity(); } - const stk::mesh::BucketVector& allBuckets = hostBulk->buckets(hostField->entity_rank()); unsigned numPerEntity = hostField->max_size(rank); - construct_view("deviceData_"+hostField->name(), allBuckets.size(), numPerEntity); - - hostField->increment_num_syncs_to_device(); - copy_data(buckets, [](T &hostFieldData, T &stkFieldData){hostFieldData = stkFieldData;}); - Kokkos::deep_copy(deviceData, hostData); + construct_field_exist_view(allBuckets, selector); + if(allBuckets.size() != deviceData.extent(0)) { + construct_view(buckets, "deviceData_"+hostField->name(), allBuckets.size(), numPerEntity); + } else { + move_unmodified_buckets(buckets, numPerEntity); + } - Kokkos::deep_copy(hostFieldExistsOnBucket, false); - for (size_t i = 0; i < buckets.size(); ++i) { - hostFieldExistsOnBucket(buckets[i]->bucket_id()) = true; + if(needToSyncAllDataToDevice) { + clear_sync_state(); + fieldData.modify_host(); + copy_host_to_device(); + } else { + copy_new_and_modified_buckets_from_host(buckets, numPerEntity); } - Kokkos::deep_copy(deviceFieldExistsOnBucket, hostFieldExistsOnBucket); synchronizedCount = hostBulk->synchronized_count(); + +#ifdef STK_DEBUG_FIELD_SYNC + std::strcpy(fieldName.data(), hostField->name().data()); + Kokkos::deep_copy(lastFieldValue, hostData); + reset_last_modification_state(LastModLocation::HOST | LastModLocation::DEVICE); + hostSynchronizedCount() = hostBulk->synchronized_count(); + anyDeviceFieldModification() = false; + anyPotentialDeviceFieldModification() = false; + isFieldLayoutConsistent = true; +#endif + } + + + void fill_host_view(Bucket* bucket, UnmanagedHostInnerView& unHostInnerView, unsigned numPerEntity) + { + T* hostFieldPtr = static_cast(field_data(*hostField, *bucket)); + unsigned numEntities = bucket->size(); + + for(unsigned i = 0; i < numEntities; i++) { + for(unsigned j = 0; j < numPerEntity; j++) { + unHostInnerView(ORDER_INDICES(i,j)) = hostFieldPtr[i * numPerEntity + j]; + } + } + } + + template + void copy_moved_bucket_data(DataView destView, DataView srcView, unsigned oldBucketId, unsigned newBucketId, unsigned numPerEntity) + { + T* srcPtr = srcView.data() + oldBucketId * bucketCapacity * numPerEntity; + T* destPtr = destView.data() + newBucketId * bucketCapacity * numPerEntity; + + UnmanagedView unInnerSrcView(srcPtr, ORDER_INDICES(bucketCapacity, numPerEntity)); + UnmanagedView unInnerDestView(destPtr, ORDER_INDICES(bucketCapacity, numPerEntity)); + Kokkos::deep_copy(unInnerDestView, unInnerSrcView); + } + + void copy_bucket_from_host_to_device(Bucket* bucket, unsigned numPerEntity) + { + UnmanagedHostInnerView unHostInnerView(&hostData(bucket->bucket_id(),0,0), ORDER_INDICES(bucketCapacity, numPerEntity)); + + fill_host_view(bucket, unHostInnerView, numPerEntity); + unsigned bucketId = bucket->bucket_id(); + T* ptr = deviceData.data() + bucketId * bucketCapacity * numPerEntity; + UnmanagedDevInnerView unDevInnerView(ptr, ORDER_INDICES(bucketCapacity, numPerEntity)); + + Kokkos::deep_copy(unDevInnerView, unHostInnerView); + } + + void copy_new_and_modified_buckets_from_host(const BucketVector& buckets, unsigned numPerEntity) + { + for(unsigned bucketIdx = 0; bucketIdx < buckets.size(); bucketIdx++) { + Bucket* bucket = buckets[bucketIdx]; + unsigned oldBucketId = bucket->get_ngp_field_bucket_id(get_ordinal()); + + if(oldBucketId == INVALID_BUCKET_ID || bucket->get_ngp_field_bucket_is_modified(get_ordinal())) { + copy_bucket_from_host_to_device(bucket, numPerEntity); + } + + bucket->set_ngp_field_bucket_id(get_ordinal(), bucket->bucket_id()); + } } size_t num_syncs_to_host() const override { return hostField->num_syncs_to_host(); } @@ -385,37 +420,55 @@ class DeviceField : public NgpFieldBase fieldData.modify_device(); } + void clear_sync_state() override + { + fieldData.clear_sync_state(); + } + void sync_to_host() override { if (need_sync_to_host()) { ProfilingBlock prof("copy_to_host for " + hostField->name()); copy_device_to_host(); +#ifdef STK_DEBUG_FIELD_SYNC + Kokkos::deep_copy(lastFieldValue, deviceData); + reset_last_modification_state(LastModLocation::HOST | LastModLocation::DEVICE); + anyDeviceFieldModification() = false; + anyPotentialDeviceFieldModification() = false; +#endif } } void sync_to_device() override { - if (need_sync_to_device()) { + bool needToSyncToDevice = need_sync_to_device(); + if (needToSyncToDevice) { ProfilingBlock prof("copy_to_device for " + hostField->name()); if (hostBulk->synchronized_count() == synchronizedCount) { copy_host_to_device(); +#ifdef STK_DEBUG_FIELD_SYNC + Kokkos::deep_copy(lastFieldValue, deviceData); + reset_last_modification_state(LastModLocation::HOST | LastModLocation::DEVICE); + anyDeviceFieldModification() = false; + anyPotentialDeviceFieldModification() = false; +#endif } else { - update_field(); + update_field(needToSyncToDevice); } } } size_t synchronized_count() const override { return synchronizedCount; } - void clear_sync_state() - { - fieldData.clear_sync_state(); - } - KOKKOS_DEFAULTED_FUNCTION DeviceField(const DeviceField &) = default; - STK_FUNCTION virtual ~DeviceField() {} + KOKKOS_FUNCTION virtual ~DeviceField() + { +#ifdef KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST + +#endif + } unsigned get_stride() const { @@ -426,14 +479,14 @@ class DeviceField : public NgpFieldBase return stride; } - STK_FUNCTION + KOKKOS_FUNCTION unsigned get_num_components_per_entity(const stk::mesh::FastMeshIndex& entityIndex) const { const unsigned bucketId = entityIndex.bucket_id; if (deviceFieldExistsOnBucket[bucketId]) { #ifdef KOKKOS_ENABLE_CUDA - return deviceData.extent(1); + return deviceData.extent(1); #else - return deviceData.extent(2); + return deviceData.extent(2); #endif } else { @@ -441,38 +494,289 @@ class DeviceField : public NgpFieldBase } } - template STK_FUNCTION +#ifdef STK_DEBUG_FIELD_SYNC + + void construct_debug_views(unsigned numBuckets, unsigned numPerEntity) { +#ifdef KOKKOS_ENABLE_CUDA + lastFieldValue = FieldDataType(hostField->name()+"_lastValue", numBuckets, numPerEntity, bucketCapacity); + lastFieldModLocation = LastFieldModLocationType(hostField->name()+"_lastModLocation", + numBuckets, numPerEntity, bucketCapacity); +#else + lastFieldValue = FieldDataType(hostField->name()+"_lastValue", numBuckets, bucketCapacity, numPerEntity); + lastFieldModLocation = LastFieldModLocationType(hostField->name()+"_lastModLocation", + numBuckets, bucketCapacity, numPerEntity); +#endif + hostField->set_last_modification_view(lastFieldModLocation); + } + + bool any_device_field_modification() const override { + return anyDeviceFieldModification(); + } + + void detect_device_field_modification() { + if (!anyPotentialDeviceFieldModification()) { + return; + } + + if (field_not_updated_after_mesh_mod()) { + return; + } + + stk::mesh::NgpMesh & ngpMesh = hostBulk->get_updated_ngp_mesh(); + const stk::mesh::MetaData & meta = hostBulk->mesh_meta_data(); + + FieldDataType & localDeviceData = deviceData; + FieldDataType & localLastFieldValue = lastFieldValue; + LastFieldModLocationType & localLastFieldModLocation = lastFieldModLocation; + + stk::mesh::for_each_entity_run(ngpMesh, rank, meta.locally_owned_part(), + KOKKOS_LAMBDA(const stk::mesh::FastMeshIndex& index) + { +#ifdef KOKKOS_ENABLE_CUDA + const unsigned numComponents = localDeviceData.extent(1); +#else + const unsigned numComponents = localDeviceData.extent(2); +#endif + for (unsigned component = 0; component < numComponents; ++component) { + if (localDeviceData(index.bucket_id, ORDER_INDICES(index.bucket_ord, component)) != + localLastFieldValue(index.bucket_id, ORDER_INDICES(index.bucket_ord, component))) + { + localLastFieldModLocation(index.bucket_id, ORDER_INDICES(index.bucket_ord, component)) = LastModLocation::DEVICE; + } + } + }); + + anyPotentialDeviceFieldModification() = false; + Kokkos::fence(); + } + + void detect_any_device_field_modification() { + FieldDataType & localDeviceData = deviceData; + FieldDataType & localLastFieldValue = lastFieldValue; + ScalarUvmType & localAnyDeviceFieldModification = anyDeviceFieldModification; + localAnyDeviceFieldModification() = false; + + Kokkos::parallel_for(1, KOKKOS_LAMBDA(unsigned ) { + for (size_t i = 0; i < localDeviceData.extent(0); ++i) { + for (size_t j = 0; j < localDeviceData.extent(1); ++j) { + for (size_t k = 0; k < localDeviceData.extent(2); ++k) { + if (localDeviceData(i, j, k) != localLastFieldValue(i, j, k)) { + localAnyDeviceFieldModification() = true; + return; + } + } + } + } + }); + + Kokkos::fence(); + } + + void update_debug_storage(size_t hostSyncCount) { + hostSynchronizedCount() = hostSyncCount; + + if (isFieldLayoutConsistent) { + detect_any_device_field_modification(); + isFieldLayoutConsistent = false; + } + + const unsigned numBuckets = hostBulk->buckets(hostField->entity_rank()).size(); + const unsigned numPerEntity = hostField->max_size(rank); + construct_debug_views(numBuckets, numPerEntity); + + if (anyDeviceFieldModification()) { + reset_last_modification_state(LastModLocation::DEVICE); + } + else { + reset_last_modification_state(LastModLocation::HOST | LastModLocation::DEVICE); + } + } + + void reset_last_modification_state(uint8_t value) { + Kokkos::deep_copy(lastFieldModLocation, static_cast(value)); + } + + STK_INLINE_FUNCTION + bool last_modification_not_on_device(const stk::mesh::FastMeshIndex & index, int component) const { + return !(lastFieldModLocation(index.bucket_id, ORDER_INDICES(index.bucket_ord, component)) & + LastModLocation::DEVICE); + } + + STK_INLINE_FUNCTION + bool last_modification_not_on_device(const stk::mesh::DeviceMesh::MeshIndex & index, int component) const { + return !(lastFieldModLocation(index.bucket->bucket_id(), ORDER_INDICES(index.bucketOrd, component)) & + LastModLocation::DEVICE); + } + + STK_INLINE_FUNCTION + void set_last_modification(const stk::mesh::FastMeshIndex & index, int component, LastModLocation location) const { + lastFieldModLocation(index.bucket_id, ORDER_INDICES(index.bucket_ord, component)) = location; + } + + STK_INLINE_FUNCTION + bool field_not_updated_after_mesh_mod() const { + return hostSynchronizedCount() != synchronizedCount; + } + + STK_INLINE_FUNCTION + void print_unsynchronized_field_warning(const char * fileName, int lineNumber) const + { + if (lineNumber == -1) { + printf("*** WARNING: Accessing unsynchronized Field %s on Device after mesh modification\n", fieldName.data()); + } + else { + printf("%s:%i *** WARNING: Accessing unsynchronized Field %s on Device after mesh modification\n", + fileName, lineNumber, fieldName.data()); + } + } + + STK_INLINE_FUNCTION + void print_stale_data_warning(unsigned bucketId, unsigned bucketOrdinal, int component, + const char * fileName, int lineNumber) const + { + if (lineNumber == -1) { + printf("*** WARNING: Accessing stale data on Device for Field %s[%i]=%f\n", + fieldName.data(), component, + static_cast(deviceData(bucketId, ORDER_INDICES(bucketOrdinal, component)))); + } + else { + printf("%s:%i *** WARNING: Accessing stale data on Device for Field %s[%i]=%f\n", + fileName, lineNumber, fieldName.data(), component, + static_cast(deviceData(bucketId, ORDER_INDICES(bucketOrdinal, component)))); + } + } + + STK_INLINE_FUNCTION + void check_stale_field_access(const stk::mesh::FastMeshIndex & index, int component, const char * fileName, int lineNumber) const + { + anyPotentialDeviceFieldModification() = true; + + if (field_not_updated_after_mesh_mod()) { + print_unsynchronized_field_warning(fileName, lineNumber); + return; + } + + if (last_modification_not_on_device(index, component)) { + print_stale_data_warning(index.bucket_id, index.bucket_ord, component, fileName, lineNumber); + } + } + + STK_INLINE_FUNCTION + void check_stale_field_access(const stk::mesh::DeviceMesh::MeshIndex & index, int component, const char * fileName, int lineNumber) const + { + anyPotentialDeviceFieldModification() = true; + + if (field_not_updated_after_mesh_mod()) { + print_unsynchronized_field_warning(fileName, lineNumber); + return; + } + + if (last_modification_not_on_device(index, component)) { + print_stale_data_warning(index.bucket->bucket_id(), index.bucketOrd, component, fileName, lineNumber); + } + } + + STK_INLINE_FUNCTION + void check_stale_field_access(const stk::mesh::FastMeshIndex & index, const char * fileName, int lineNumber) const + { + anyPotentialDeviceFieldModification() = true; + + if (field_not_updated_after_mesh_mod()) { + print_unsynchronized_field_warning(fileName, lineNumber); + return; + } + + for (unsigned component = 0; component < get_num_components_per_entity(index); ++component) { + if (last_modification_not_on_device(index, component)) { + print_stale_data_warning(index.bucket_id, index.bucket_ord, component, fileName, lineNumber); + } + } + } + + template KOKKOS_FUNCTION + T& get(const Mesh& ngpMesh, stk::mesh::Entity entity, int component, + const char * fileName = DEVICE_DEBUG_FILE_NAME, int lineNumber = DEVICE_DEBUG_LINE_NUMBER) const + { + stk::mesh::FastMeshIndex fastIndex = ngpMesh.fast_mesh_index(entity); + return get(fastIndex, component, fileName, lineNumber); + } + + KOKKOS_FUNCTION + T& get(stk::mesh::FastMeshIndex entity, int component, + const char * fileName = DEVICE_DEBUG_FILE_NAME, int lineNumber = DEVICE_DEBUG_LINE_NUMBER) const + { + check_stale_field_access(entity, component, fileName, lineNumber); + return deviceData(entity.bucket_id, ORDER_INDICES(entity.bucket_ord, component)); + } + + template KOKKOS_FUNCTION + T& get(MeshIndex entity, int component, + const char * fileName = DEVICE_DEBUG_FILE_NAME, int lineNumber = DEVICE_DEBUG_LINE_NUMBER) const + { + check_stale_field_access(entity, component, fileName, lineNumber); + return deviceData(entity.bucket->bucket_id(), ORDER_INDICES(entity.bucketOrd, component)); + } + + KOKKOS_FUNCTION + T& operator()(const stk::mesh::FastMeshIndex& index, int component, + const char * fileName = DEVICE_DEBUG_FILE_NAME, int lineNumber = DEVICE_DEBUG_LINE_NUMBER) const + { + check_stale_field_access(index, component, fileName, lineNumber); + return deviceData(index.bucket_id, ORDER_INDICES(index.bucket_ord, component)); + } + + template KOKKOS_FUNCTION + T& operator()(const MeshIndex& index, int component, + const char * fileName = DEVICE_DEBUG_FILE_NAME, int lineNumber = DEVICE_DEBUG_LINE_NUMBER) const + { + check_stale_field_access(index, component, fileName, lineNumber); + return deviceData(index.bucket->bucket_id(), ORDER_INDICES(index.bucketOrd, component)); + } + + KOKKOS_FUNCTION + EntityFieldData operator()(const stk::mesh::FastMeshIndex& index, + const char * fileName = DEVICE_DEBUG_FILE_NAME, int lineNumber = DEVICE_DEBUG_LINE_NUMBER) const + { + check_stale_field_access(index, fileName, lineNumber); + T* dataPtr = &deviceData(index.bucket_id, ORDER_INDICES(index.bucket_ord, 0)); + const unsigned numScalars = get_num_components_per_entity(index); + return EntityFieldData(dataPtr, numScalars, get_stride()); + } + +#else + + template KOKKOS_FUNCTION T& get(const Mesh& ngpMesh, stk::mesh::Entity entity, int component) const { stk::mesh::FastMeshIndex fastIndex = ngpMesh.fast_mesh_index(entity); return get(fastIndex, component); } - STK_FUNCTION + KOKKOS_FUNCTION T& get(stk::mesh::FastMeshIndex entity, int component) const { return deviceData(entity.bucket_id, ORDER_INDICES(entity.bucket_ord, component)); } - template STK_FUNCTION + template KOKKOS_FUNCTION T& get(MeshIndex entity, int component) const { return deviceData(entity.bucket->bucket_id(), ORDER_INDICES(entity.bucketOrd, component)); } - STK_FUNCTION + KOKKOS_FUNCTION T& operator()(const stk::mesh::FastMeshIndex& index, int component) const { return deviceData(index.bucket_id, ORDER_INDICES(index.bucket_ord, component)); } - template STK_FUNCTION + template KOKKOS_FUNCTION T& operator()(const MeshIndex& index, int component) const { return deviceData(index.bucket->bucket_id(), ORDER_INDICES(index.bucketOrd, component)); } - STK_FUNCTION + KOKKOS_FUNCTION EntityFieldData operator()(const stk::mesh::FastMeshIndex& index) const { T* dataPtr = &deviceData(index.bucket_id, ORDER_INDICES(index.bucket_ord, 0)); @@ -480,23 +784,34 @@ class DeviceField : public NgpFieldBase return EntityFieldData(dataPtr, numScalars, get_stride()); } +#endif + template void set_all(const Mesh& ngpMesh, const T& value) { Kokkos::deep_copy(hostData, value); Kokkos::deep_copy(deviceData, value); clear_sync_state(); +#ifdef STK_DEBUG_FIELD_SYNC + anyPotentialDeviceFieldModification() = true; +#endif } - STK_FUNCTION + KOKKOS_FUNCTION stk::mesh::EntityRank get_rank() const { return rank; } - STK_FUNCTION + KOKKOS_FUNCTION unsigned get_ordinal() const { return ordinal; } const stk::mesh::BulkData& get_bulk() const { return *hostBulk; } - STK_FUNCTION + FieldState state() const { return hostField->state(); } + + void rotate_multistate_data() override + { + } + + KOKKOS_FUNCTION void swap(DeviceField &sf) { swap_views(hostData, sf.hostData); @@ -504,7 +819,117 @@ class DeviceField : public NgpFieldBase swap_views(fieldData, sf.fieldData); } +protected: + bool need_sync_to_host() const + { + return fieldData.need_sync_host(); + } + + bool need_sync_to_device() const + { + return fieldData.need_sync_device(); + } + private: + + void move_unmodified_buckets_in_range_from_back(const BucketVector& buckets, unsigned numPerEntity, unsigned& currBaseIndex) + { + unsigned startIndex = currBaseIndex; + unsigned endIndex = buckets.size() - 1; + unsigned oldBucketId, newBucketId; + + for(unsigned j = currBaseIndex; j < buckets.size(); j++) { + oldBucketId = buckets[j]->get_ngp_field_bucket_id(get_ordinal()); + newBucketId = buckets[j]->bucket_id(); + + if(oldBucketId >= newBucketId || buckets[j]->get_ngp_field_bucket_is_modified(get_ordinal())) { + endIndex = j - 1; + break; + } + } + + for(unsigned j = endIndex; j >= startIndex; j--) { + oldBucketId = buckets[j]->get_ngp_field_bucket_id(get_ordinal()); + newBucketId = buckets[j]->bucket_id(); + + copy_moved_bucket_data>(hostData, hostData, oldBucketId, newBucketId, numPerEntity); + copy_moved_bucket_data>(deviceData, deviceData, oldBucketId, newBucketId, numPerEntity); + buckets[j]->set_ngp_field_bucket_id(get_ordinal(), newBucketId); + } + currBaseIndex = endIndex; + } + + void move_unmodified_buckets(const BucketVector& buckets, unsigned numPerEntity) + { + for(unsigned i = 0; i < buckets.size(); i++) { + if(hostFieldExistsOnBucket(buckets[i]->bucket_id())) { + unsigned oldBucketId = buckets[i]->get_ngp_field_bucket_id(get_ordinal()); + unsigned newBucketId = buckets[i]->bucket_id(); + + if(oldBucketId != INVALID_BUCKET_ID && oldBucketId != newBucketId && !buckets[i]->get_ngp_field_bucket_is_modified(get_ordinal())) { + if(oldBucketId > newBucketId) { + copy_moved_bucket_data>(hostData, hostData, oldBucketId, newBucketId, numPerEntity); + copy_moved_bucket_data>(deviceData, deviceData, oldBucketId, newBucketId, numPerEntity); + } else { + move_unmodified_buckets_in_range_from_back(buckets, numPerEntity, i); + } + buckets[i]->set_ngp_field_bucket_id(get_ordinal(), newBucketId); + } + } + } + } + + void copy_unmodified_buckets(const BucketVector& buckets, FieldDataType destDevView, FieldDataHostType destHostView, unsigned numPerEntity) + { + for(unsigned i = 0; i < buckets.size(); i++) { + if(hostFieldExistsOnBucket(buckets[i]->bucket_id())) { + unsigned oldBucketId = buckets[i]->get_ngp_field_bucket_id(get_ordinal()); + unsigned newBucketId = buckets[i]->bucket_id(); + + if(!buckets[i]->get_ngp_field_bucket_is_modified(get_ordinal())) { + ThrowRequire(hostData.extent(0) != 0); + copy_moved_bucket_data>(destHostView, hostData, oldBucketId, newBucketId, numPerEntity); + copy_moved_bucket_data>(destDevView, deviceData, oldBucketId, newBucketId, numPerEntity); + buckets[i]->set_ngp_field_bucket_id(get_ordinal(), newBucketId); + } + } + } + } + + void construct_view(const BucketVector& buckets, const std::string& name, unsigned numBuckets, unsigned numPerEntity) + { + FieldDataType tempDataView = FieldDataType(Kokkos::ViewAllocateWithoutInitializing(name), numBuckets, ORDER_INDICES(bucketCapacity, numPerEntity)); + FieldDataHostType tempDataViewMirror = Kokkos::create_mirror_view(tempDataView); + + copy_unmodified_buckets(buckets, tempDataView, tempDataViewMirror, numPerEntity); + + deviceData = tempDataView; + hostData = tempDataViewMirror; + fieldData = FieldDataDualViewType(deviceData, hostData); + +#ifdef STK_DEBUG_FIELD_SYNC + fieldName = FieldNameType(hostField->name()+"_name", hostField->name().size()+1); + hostSynchronizedCount = ScalarUvmType(hostField->name()+"_hostSyncCount"); + anyDeviceFieldModification = ScalarUvmType(hostField->name()+"_anyDeviceFieldMod"); + anyPotentialDeviceFieldModification = ScalarUvmType(hostField->name()+"_anyPotentialDeviceFieldMod"); + construct_debug_views(numBuckets, numPerEntity); +#endif + } + + void construct_field_exist_view(const BucketVector& allBuckets, const Selector& selector) + { + deviceFieldExistsOnBucket = BoolViewType(Kokkos::ViewAllocateWithoutInitializing(hostField->name() + "_exists_on_bucket"), allBuckets.size()); + hostFieldExistsOnBucket = Kokkos::create_mirror_view(deviceFieldExistsOnBucket); + Kokkos::deep_copy(hostFieldExistsOnBucket, false); + for (size_t i = 0; i < allBuckets.size(); ++i) { + if(selector(*allBuckets[i])) { + hostFieldExistsOnBucket(allBuckets[i]->bucket_id()) = true; + } + } + Kokkos::deep_copy(deviceFieldExistsOnBucket, hostFieldExistsOnBucket); + } + + void copy_device_to_host() { fieldData.sync_host(); // New Kokkos API @@ -513,7 +938,10 @@ class DeviceField : public NgpFieldBase stk::mesh::Selector selector = stk::mesh::selectField(*hostField); const stk::mesh::BucketVector& buckets = hostBulk->get_buckets(hostField->entity_rank(), selector); hostField->increment_num_syncs_to_host(); - copy_data(buckets, [](T &hostFieldData, T &stkFieldData){stkFieldData = hostFieldData;}); + copy_data(buckets, [](T &hostFieldData, T &stkFieldData){ + //printf("copy_device_to_host, hostFieldData: %d\n", (int)hostFieldData); + stkFieldData = hostFieldData; + }); } } @@ -523,24 +951,17 @@ class DeviceField : public NgpFieldBase stk::mesh::Selector selector = stk::mesh::selectField(*hostField); const stk::mesh::BucketVector& buckets = hostBulk->get_buckets(hostField->entity_rank(), selector); hostField->increment_num_syncs_to_device(); - copy_data(buckets, [](T &hostFieldData, T &stkFieldData){hostFieldData = stkFieldData;}); + copy_data(buckets, [](T &hostFieldData, T &stkFieldData){ + //printf("copy_host_to_device, stkFieldData: %d\n", (int)stkFieldData); + hostFieldData = stkFieldData; + }); } fieldData.sync_device(); // New Kokkos API } - bool need_sync_to_host() const - { - return fieldData.need_sync_host(); // New Kokkos API - } - - bool need_sync_to_device() const - { - return fieldData.need_sync_device(); // New Kokkos API - } - template - STK_FUNCTION + KOKKOS_FUNCTION void swap_views(ViewType & view1, ViewType & view2) { ViewType tmpView = view2; @@ -564,12 +985,17 @@ class DeviceField : public NgpFieldBase template void copy_data(const stk::mesh::BucketVector& buckets, const Assigner &assigner) { - unsigned numPerEntity = get_max_num_components_per_entity(); + ProfilingBlock prof("copy_data for " + hostField->name()); for(size_t iBucket=0; iBucket(stk::mesh::ngp_debug_field_data(*hostField, bucket)); +#else T* data = static_cast(stk::mesh::field_data(*hostField, bucket)); +#endif for(size_t iEntity=0; iEntity FieldDataDualViewType; -#else - typedef Kokkos::DualView FieldDataDualViewType; -#endif - - typedef typename FieldDataDualViewType::t_dev FieldDataType; - typedef typename FieldDataDualViewType::t_host FieldDataHostType; - FieldDataHostType hostData; FieldDataType deviceData; FieldDataDualViewType fieldData; @@ -613,181 +1021,20 @@ class DeviceField : public NgpFieldBase unsigned bucketCapacity; size_t synchronizedCount; - friend ConstDeviceField; - friend MultistateField; -}; - -template -class ConstDeviceField : public NgpFieldBase -{ -public: - typedef T value_type; - - STK_FUNCTION - ConstDeviceField() - : NgpFieldBase() - { - } - - ConstDeviceField(const DeviceField &sf) - : NgpFieldBase(), - deviceField(sf), - constDeviceData(deviceField.deviceData) - { - } - - ConstDeviceField(const stk::mesh::BulkData& bulk, const stk::mesh::FieldBase &field) - : NgpFieldBase(), - deviceField(bulk, field), - constDeviceData(deviceField.deviceData) - { - } - - KOKKOS_DEFAULTED_FUNCTION ConstDeviceField(const ConstDeviceField &) = default; - - STK_FUNCTION virtual ~ConstDeviceField() {} + DeviceField* stateFields[MaximumFieldStates]; - void update_field() override { deviceField.update_field(); } +#ifdef STK_DEBUG_FIELD_SYNC + using FieldNameType = Kokkos::View; + template using ScalarUvmType = Kokkos::View; - size_t num_syncs_to_host() const override { return deviceField.num_syncs_to_host(); } - size_t num_syncs_to_device() const override { return deviceField.num_syncs_to_device(); } - - unsigned get_stride() const - { - unsigned stride = 1; -#ifdef KOKKOS_ENABLE_CUDA - stride = deviceField.bucketCapacity; + FieldNameType fieldName; + bool isFieldLayoutConsistent; + ScalarUvmType hostSynchronizedCount; + ScalarUvmType anyDeviceFieldModification; + ScalarUvmType anyPotentialDeviceFieldModification; + LastFieldModLocationType lastFieldModLocation; + FieldDataType lastFieldValue; #endif - return stride; - } - - STK_FUNCTION - unsigned get_num_components_per_entity(const stk::mesh::FastMeshIndex& entityIndex) const { - return deviceField.get_num_components_per_entity(entityIndex); - } - - template STK_FUNCTION - T get(const Mesh& ngpMesh, stk::mesh::Entity entity, int component) const - { - stk::mesh::FastMeshIndex fastIndex = ngpMesh.fast_mesh_index(entity); - return get(fastIndex, component); - } - - STK_FUNCTION - T get(stk::mesh::FastMeshIndex entity, int component) const - { - return constDeviceData(entity.bucket_id, ORDER_INDICES(entity.bucket_ord, component)); - } - - template STK_FUNCTION - T get(MeshIndex entity, int component) const - { - return constDeviceData(entity.bucket->bucket_id(), ORDER_INDICES(entity.bucketOrd, component)); - } - - STK_FUNCTION - T operator()(const stk::mesh::FastMeshIndex& index, int component) const - { - return constDeviceData(index.bucket_id, ORDER_INDICES(index.bucket_ord, component)); - } - - template STK_FUNCTION - T operator()(const MeshIndex& index, int component) const - { - return constDeviceData(index.bucket->bucket_id(), ORDER_INDICES(index.bucketOrd, component)); - } - - STK_FUNCTION - EntityFieldData operator()(const stk::mesh::FastMeshIndex& index) const - { - T* dataPtr = constDeviceData(index.bucket_id, ORDER_INDICES(index.bucket_ord, 0)); - unsigned numScalars = get_num_components_per_entity(index); - return EntityFieldData(dataPtr, numScalars, get_stride()); - } - - STK_FUNCTION - stk::mesh::EntityRank get_rank() const { return deviceField.get_rank(); } - - STK_FUNCTION - unsigned get_ordinal() const { return deviceField.get_ordinal(); } - - void modify_on_host() override - { - } - - void modify_on_device() override - { - } - - void sync_to_host() override - { - if (need_sync_to_host()) { - copy_device_to_host(); - } - } - - void sync_to_device() override - { - if (need_sync_to_device()) { - copy_host_to_device(); - } - } - - size_t synchronized_count() const override { return deviceField.synchronized_count(); } - - STK_FUNCTION - void swap(ConstDeviceField &sf) - { - swap(sf.deviceField); - } - - STK_FUNCTION - void swap(DeviceField &sf) - { - deviceField.swap(sf); - constDeviceData = deviceField.deviceData; - } - - void clear_sync_state() - { - deviceField.clear_sync_state(); - } - -private: - void copy_device_to_host() - { - deviceField.modify_on_device(); - deviceField.copy_device_to_host(); - } - - void copy_host_to_device() - { - deviceField.modify_on_host(); - deviceField.copy_host_to_device(); - } - - bool need_sync_to_host() const - { - return deviceField.need_sync_to_host(); - } - - bool need_sync_to_device() const - { - return deviceField.need_sync_to_device(); - } - -#ifdef KOKKOS_ENABLE_CUDA - typedef Kokkos::View> ConstFieldDataType; -#else - typedef Kokkos::View > ConstFieldDataType; -#endif - - DeviceField deviceField; - ConstFieldDataType constDeviceData; - - friend MultistateField; }; } diff --git a/packages/stk/stk_mesh/stk_mesh/base/NgpFieldBase.hpp b/packages/stk/stk_mesh/stk_mesh/base/NgpFieldBase.hpp new file mode 100644 index 000000000000..1a91586f1517 --- /dev/null +++ b/packages/stk/stk_mesh/stk_mesh/base/NgpFieldBase.hpp @@ -0,0 +1,41 @@ +#ifndef NGPFIELDBASE_HPP +#define NGPFIELDBASE_HPP + +#include "stk_util/stk_config.h" +#include + +namespace stk { +namespace mesh { + +class NgpFieldBase +{ +public: + KOKKOS_DEFAULTED_FUNCTION NgpFieldBase() = default; + KOKKOS_FUNCTION virtual ~NgpFieldBase() {} + virtual void update_field(bool needToSyncAllDataToDevice = false) = 0; + virtual void rotate_multistate_data() = 0; + virtual void modify_on_host() = 0; + virtual void modify_on_device() = 0; + virtual void clear_sync_state() = 0; + virtual void sync_to_host() = 0; + virtual void sync_to_device() = 0; + virtual size_t synchronized_count() const = 0; + virtual size_t num_syncs_to_host() const = 0; + virtual size_t num_syncs_to_device() const = 0; +#ifdef STK_DEBUG_FIELD_SYNC + virtual void detect_device_field_modification() = 0; + virtual void update_debug_storage(size_t hostSynchronizedCount) = 0; + virtual bool any_device_field_modification() const = 0; +#endif +}; + +#ifdef KOKKOS_ENABLE_CUDA +#define ORDER_INDICES(i,j) j,i +#else +#define ORDER_INDICES(i,j) i,j +#endif + +} +} + +#endif // NGPFIELDBASE_HPP diff --git a/packages/stk/stk_mesh/stk_mesh/base/NgpForEachEntity.hpp b/packages/stk/stk_mesh/stk_mesh/base/NgpForEachEntity.hpp index 378a8c9ee87a..dad6c3bb5dc2 100644 --- a/packages/stk/stk_mesh/stk_mesh/base/NgpForEachEntity.hpp +++ b/packages/stk/stk_mesh/stk_mesh/base/NgpForEachEntity.hpp @@ -31,8 +31,8 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#ifndef STK_MESH_FOREACHENTITY_HPP -#define STK_MESH_FOREACHENTITY_HPP +#ifndef STK_MESH_NGP_FOREACHENTITY_HPP +#define STK_MESH_NGP_FOREACHENTITY_HPP #include #include @@ -95,19 +95,6 @@ void for_each_entity_run(Mesh &mesh, stk::topology::rank_t rank, const stk::mesh TeamFunctor(mesh, rank, bucketIds, functor)); } -// typedef typename Kokkos::TeamPolicy::member_type TeamHandleType; -// unsigned numBuckets = mesh.num_buckets(rank); -// Kokkos::parallel_for(Kokkos::TeamPolicy(numBuckets, Kokkos::AUTO), KOKKOS_LAMBDA(const TeamHandleType& team) -// { -// const int bucketIndex = team.league_rank(); -// const typename Mesh::BucketType &bucket = mesh.get_bucket(rank, bucketIndex); -// unsigned numElements = bucket.size(); -// Kokkos::parallel_for(Kokkos::TeamThreadRange(team, 0u, numElements), [&](const int& i) -// { -// functor(typename Mesh::MeshIndex{&bucket, static_cast(i)}); -// }); -// }); - } } diff --git a/packages/stk/stk_mesh/stk_mesh/base/NgpMultistateField.hpp b/packages/stk/stk_mesh/stk_mesh/base/NgpMultistateField.hpp deleted file mode 100644 index a92f5d0a50ed..000000000000 --- a/packages/stk/stk_mesh/stk_mesh/base/NgpMultistateField.hpp +++ /dev/null @@ -1,189 +0,0 @@ -// Copyright 2002 - 2008, 2010, 2011 National Technology Engineering -// Solutions of Sandia, LLC (NTESS). Under the terms of Contract -// DE-NA0003525 with NTESS, the U.S. Government retains certain rights -// in this software. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// -// * Neither the name of NTESS nor the names of its contributors -// may be used to endorse or promote products derived from this -// software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -#ifndef STK_MESH_NGPSTATEDFIELD_HPP -#define STK_MESH_NGPSTATEDFIELD_HPP - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -namespace stk { -namespace mesh { - -const unsigned MAX_NUM_FIELD_STATES = 6; - -template -class NgpMultistateField -{ -public: - NgpMultistateField() {} - - NgpMultistateField(stk::mesh::BulkData& bulk, const stk::mesh::FieldBase &stkField) : - numOldStates(stkField.number_of_states() - 1) - { - stk::mesh::FieldBase * fieldOfState = stkField.field_state(stk::mesh::StateNew); - fieldNewState = stk::mesh::NgpField(bulk, *fieldOfState); - for(unsigned i = 0; i < numOldStates; i++) - { - fieldOfState = stkField.field_state(get_old_state_for_index(i)); - fieldOldStates[i] = stk::mesh::NgpConstField(bulk, *fieldOfState); - } - } - - STK_FUNCTION - virtual ~NgpMultistateField() {} - - STK_FUNCTION - unsigned get_num_states() const - { - return numOldStates + 1; - } - - STK_FUNCTION - stk::mesh::NgpField get_field_new_state() const - { - return fieldNewState; - } - - STK_FUNCTION - stk::mesh::NgpConstField get_field_old_state(stk::mesh::FieldState state) const - { - NGP_ThrowRequire(state != stk::mesh::StateNew); - return fieldOldStates[state-1]; - } - - STK_FUNCTION - void increment_state() - { - for(unsigned i=numOldStates-1; i>0; i--) { - fieldOldStates[i].swap(fieldOldStates[i-1]); - } - fieldOldStates[0].swap(fieldNewState); - } - - void sync_to_host() - { - copy_device_to_host(); - } - - void sync_to_device() - { - copy_host_to_device(); - } - - void modify_on_host() - { - fieldNewState.modify_on_host(); - } - - void modify_on_device() - { - fieldNewState.modify_on_device(); - } - - STK_FUNCTION - T& get_new(const stk::mesh::NgpMesh& ngpMesh, stk::mesh::Entity entity, int component) const - { - return get_field_new_state().get(ngpMesh, entity, component); - } - - STK_FUNCTION - T& get_new(const stk::mesh::FastMeshIndex& entity, int component) const - { - return get_field_new_state().get(entity, component); - } - - STK_FUNCTION - T get_old(stk::mesh::FieldState state, const stk::mesh::NgpMesh& ngpMesh, stk::mesh::Entity entity, int component) const - { - return get_field_old_state(state).get(ngpMesh, entity, component); - } - - STK_FUNCTION - T get_old(stk::mesh::FieldState state, const stk::mesh::FastMeshIndex& entity, int component) const - { - return get_field_old_state(state).get(entity, component); - } - -private: - void clear_sync_state() - { - fieldNewState.clear_sync_state(); - for(unsigned i=0; i(i+1); - } - - unsigned numOldStates; - stk::mesh::NgpField fieldNewState; - stk::mesh::NgpConstField fieldOldStates[MAX_NUM_FIELD_STATES]; -}; - -} -} - -#endif diff --git a/packages/stk/stk_mesh/stk_mesh/base/NgpReductions.hpp b/packages/stk/stk_mesh/stk_mesh/base/NgpReductions.hpp index 0134260f7325..55877620d608 100644 --- a/packages/stk/stk_mesh/stk_mesh/base/NgpReductions.hpp +++ b/packages/stk/stk_mesh/stk_mesh/base/NgpReductions.hpp @@ -43,38 +43,58 @@ namespace stk { namespace mesh { - -template -KOKKOS_FUNCTION -T reduction_value_type_from_field_value(const T& i, const Index, const T&) +template +STK_FUNCTION +T reduction_value_type_from_field_value(const T& i, const int, const T&) { return i; } -template -KOKKOS_FUNCTION -Kokkos::MinMaxScalar reduction_value_type_from_field_value(const T& i, const Index, const Kokkos::MinMaxScalar&) +template +STK_FUNCTION +Kokkos::MinMaxScalar reduction_value_type_from_field_value(const T& i, const unsigned, const Kokkos::MinMaxScalar&) { return {i,i}; } -template -KOKKOS_FUNCTION -Kokkos::ValLocScalar reduction_value_type_from_field_value(const T& i, const Index index, const Kokkos::ValLocScalar&) +template +STK_FUNCTION +Kokkos::ValLocScalar reduction_value_type_from_field_value(const T& i, const unsigned index, const Kokkos::ValLocScalar&) { return {i,index}; } -template -KOKKOS_FUNCTION -Kokkos::MinMaxLocScalar reduction_value_type_from_field_value(const T& i, const Index index, const Kokkos::MinMaxLocScalar&) +template +STK_FUNCTION +Kokkos::MinMaxLocScalar reduction_value_type_from_field_value(const T& i, const unsigned index, const Kokkos::MinMaxLocScalar&) { return {i,i,index,index}; } +template +STK_FUNCTION +void replace_loc_with_entity_id(T & t, const Mesh & mesh, const typename Mesh::BucketType & bucket) +{ +} + +template +STK_FUNCTION +void replace_loc_with_entity_id(Kokkos::ValLocScalar & t, const Mesh & mesh, const typename Mesh::BucketType & bucket) +{ + t.loc = mesh.identifier(bucket[t.loc]); +} + +template +STK_FUNCTION +void replace_loc_with_entity_id(Kokkos::MinMaxLocScalar & t, const Mesh & mesh, const typename Mesh::BucketType & bucket) +{ + t.min_loc = mesh.identifier(bucket[t.min_loc]); + t.max_loc = mesh.identifier(bucket[t.max_loc]); +} + template struct identity { - KOKKOS_FUNCTION + STK_FUNCTION T operator()(const T t) const { return t; } @@ -84,26 +104,26 @@ template -1) ? component : j; auto field_value = field.get(typename stk::mesh::FastMeshIndex{bucket_id, static_cast(i)}, comp_index); auto value = fm(field_value); - value_type input = reduction_value_type_from_field_value(value,i,reduction.reference()); + value_type input = reduction_value_type_from_field_value(value, i, reduction.reference()); return input; } - KOKKOS_FUNCTION + STK_FUNCTION stk::mesh::EntityRank get_rank() const { return field.get_rank(); } - KOKKOS_DEFAULTED_FUNCTION + STK_FUNCTION FieldAccessFunctor(const FieldAccessFunctor& rhs) = default; - KOKKOS_FUNCTION + STK_FUNCTION FieldAccessFunctor(const FieldAccessFunctor& rhs, unsigned b_id, ReductionOp r) : field(rhs.field), bucket_id(b_id), reduction(r), fm(Modifier()), component(rhs.component) {} - KOKKOS_FUNCTION + STK_FUNCTION int num_components(const int i) const { if(component > -1) return 1; stk::mesh::FastMeshIndex f = {bucket_id, static_cast(i)}; @@ -147,15 +167,18 @@ struct ReductionTeamFunctor ReductionOp reduction(my_value); Accessor thread_local_accessor(accessor, bucket.bucket_id(), reduction); Kokkos::parallel_reduce(Kokkos::TeamThreadRange(team, 0u, numElements), - [&](int i, value_type& reduce){ - const int nc = thread_local_accessor.num_components(i); - for(int j = 0; j < nc; ++j){ + [&](unsigned i, value_type& reduce){ + const unsigned nc = thread_local_accessor.num_components(i); + for(unsigned j = 0; j < nc; ++j){ value_type input = thread_local_accessor(i,j); accessor.reduction.join(reduce,input); } }, reduction); - Kokkos::single(Kokkos::PerTeam(team), [&](){accessor.reduction.join(update, my_value);}); + Kokkos::single(Kokkos::PerTeam(team), [&](){ + replace_loc_with_entity_id(my_value, mesh, bucket); + accessor.reduction.join(update, my_value); + }); } private: const Mesh mesh; diff --git a/packages/stk/stk_mesh/stk_mesh/base/Types.hpp b/packages/stk/stk_mesh/stk_mesh/base/Types.hpp index 30fa77dbd210..1228cd355d68 100644 --- a/packages/stk/stk_mesh/stk_mesh/base/Types.hpp +++ b/packages/stk/stk_mesh/stk_mesh/base/Types.hpp @@ -209,15 +209,17 @@ struct RelationType */ /** \brief Pairing of an entity with a processor rank */ -typedef std::pair EntityProc ; -typedef std::vector EntityProcVec ; +using EntityProc = std::pair; +using EntityProcVec = std::vector; +using EntityProcMap = std::map; -typedef std::pair EntityKeyProc; +using EntityIdProc = std::pair; +using EntityIdProcVec = std::vector; +using EntityIdProcMap = std::map; -typedef std::pair EntityIdProc; -typedef std::vector EntityIdProcVec; - -typedef std::map EntityIdProcMap; +using EntityKeyProc = std::pair; +using EntityKeyProcVec = std::vector; +using EntityKeyProcMap = std::map; /** \brief Spans of a vector of entity-processor pairs are common. * diff --git a/packages/stk/stk_mesh/stk_mesh/baseImpl/FieldBaseImpl.cpp b/packages/stk/stk_mesh/stk_mesh/baseImpl/FieldBaseImpl.cpp index 908c0c2c9f8b..a6473f5bbefb 100644 --- a/packages/stk/stk_mesh/stk_mesh/baseImpl/FieldBaseImpl.cpp +++ b/packages/stk/stk_mesh/stk_mesh/baseImpl/FieldBaseImpl.cpp @@ -393,6 +393,14 @@ FieldBaseImpl::sync_to_device() const } } +void +FieldBaseImpl::clear_sync_state() const +{ + if (m_ngpField != nullptr) { + m_ngpField->clear_sync_state(); + } +} + NgpFieldBase * FieldBaseImpl::get_ngp_field() const { @@ -402,9 +410,8 @@ FieldBaseImpl::get_ngp_field() const void FieldBaseImpl::set_ngp_field(NgpFieldBase * ngpField) const { - if (m_ngpField != nullptr) { - delete m_ngpField; - } + ThrowRequireMsg(m_ngpField == nullptr || m_ngpField == ngpField, + "Error: Only one NgpField may be set on a StkField(" << m_name << ")"); m_ngpField = ngpField; } diff --git a/packages/stk/stk_mesh/stk_mesh/baseImpl/FieldBaseImpl.hpp b/packages/stk/stk_mesh/stk_mesh/baseImpl/FieldBaseImpl.hpp index 7283024200a8..6513030e74cd 100644 --- a/packages/stk/stk_mesh/stk_mesh/baseImpl/FieldBaseImpl.hpp +++ b/packages/stk/stk_mesh/stk_mesh/baseImpl/FieldBaseImpl.hpp @@ -171,6 +171,7 @@ class FieldBaseImpl { void modify_on_device() const; void sync_to_host() const; void sync_to_device() const; + void clear_sync_state() const; NgpFieldBase * get_ngp_field() const; void set_ngp_field(NgpFieldBase * ngpField) const; @@ -204,7 +205,6 @@ class FieldBaseImpl { mutable NgpFieldBase * m_ngpField; mutable size_t m_numSyncsToHost; mutable size_t m_numSyncsToDevice; - }; diff --git a/packages/stk/stk_mesh/stk_mesh/baseImpl/ForEachEntityLoopAbstractions.hpp b/packages/stk/stk_mesh/stk_mesh/baseImpl/ForEachEntityLoopAbstractions.hpp index 5cf92b87268b..66b9bd15aab0 100644 --- a/packages/stk/stk_mesh/stk_mesh/baseImpl/ForEachEntityLoopAbstractions.hpp +++ b/packages/stk/stk_mesh/stk_mesh/baseImpl/ForEachEntityLoopAbstractions.hpp @@ -36,15 +36,16 @@ #define stk_mesh_ForEachEntityLoopAbstractions_hpp #include // for MeshIndex, EntityRank, etc -#include "stk_mesh/base/Bucket.hpp" // for Bucket, Bucket::size_type, etc -#include "stk_mesh/base/Selector.hpp" +#include // for Bucket, Bucket::size_type, etc +#include +#include namespace stk { namespace mesh { namespace impl { -template -void for_each_selected_entity_run(BULK_DATA &mesh, stk::topology::rank_t rank, const stk::mesh::Selector &selector, const ALGORITHM_PER_ENTITY &functor) +template +void for_each_selected_entity_run(const BulkData &mesh, stk::topology::rank_t rank, const stk::mesh::Selector &selector, const ALGORITHM_PER_ENTITY &functor) { const stk::mesh::BucketVector & buckets = mesh.get_buckets(rank, selector); const size_t numBuckets = buckets.size(); @@ -61,15 +62,8 @@ void for_each_selected_entity_run(BULK_DATA &mesh, stk::topology::rank_t rank, c } } -template -void for_each_entity_run(BULK_DATA &mesh, stk::topology::rank_t rank, const ALGORITHM_PER_ENTITY &functor) -{ - const stk::mesh::Selector selectAll = !stk::mesh::Selector(); - for_each_selected_entity_run(mesh, rank, selectAll, functor); -} - -template -void for_each_selected_entity_run_no_threads(BULK_DATA &mesh, stk::topology::rank_t rank, const stk::mesh::Selector &selector, const ALGORITHM_PER_ENTITY &functor) +template +void for_each_selected_entity_run_no_threads(const BulkData &mesh, stk::topology::rank_t rank, const stk::mesh::Selector &selector, const ALGORITHM_PER_ENTITY &functor) { const stk::mesh::BucketVector & buckets = mesh.get_buckets(rank, selector); for(size_t j=0; j -void for_each_entity_run_no_threads(BULK_DATA &mesh, stk::topology::rank_t rank, const ALGORITHM_PER_ENTITY &functor) +template +void for_each_entity_run_no_threads(const BulkData &mesh, stk::topology::rank_t rank, const ALGORITHM_PER_ENTITY &functor) { const stk::mesh::Selector selectAll = !stk::mesh::Selector(); for_each_selected_entity_run_no_threads(mesh, rank, selectAll, functor); diff --git a/packages/stk/stk_mesh/stk_mesh/baseImpl/MeshCommImplUtils.cpp b/packages/stk/stk_mesh/stk_mesh/baseImpl/MeshCommImplUtils.cpp index e9a3a276e047..733abb710511 100644 --- a/packages/stk/stk_mesh/stk_mesh/baseImpl/MeshCommImplUtils.cpp +++ b/packages/stk/stk_mesh/stk_mesh/baseImpl/MeshCommImplUtils.cpp @@ -249,6 +249,135 @@ void filter_out_unneeded_induced_parts(const BulkData& bulkData, stk::mesh::Enti } } +void communicate_shared_entity_info(const BulkData &mesh, + stk::CommSparse &comm, + std::vector > &shared_entities) +{ + stk::pack_and_communicate(comm, [&comm, &mesh, &shared_entities]() { + const int parallelSize = mesh.parallel_size(); + for(int proc = 0; proc < parallelSize; ++proc) + { + if(proc != mesh.parallel_rank()) + { + const size_t numShared = shared_entities[proc].size(); + for (size_t e = 0; e < numShared; ++e) { + shared_entity_type const & sentity = shared_entities[proc][e]; + const size_t num_nodes_on_entity = sentity.nodes.size(); + comm.send_buffer(proc).pack(sentity.topology); + for (size_t i = 0; i < num_nodes_on_entity; ++i ) { + comm.send_buffer(proc).pack(sentity.nodes[i]); + } + comm.send_buffer(proc).pack(sentity.local_key); + } + } + } + }); +} + +void communicateSharingInfoToProcsThatShareEntity(const int numProcs, const int myProcId, stk::CommSparse& commStage2, stk::mesh::EntityToDependentProcessorsMap &entityKeySharing) +{ + for(int phase = 0; phase < 2; ++phase) + { + stk::mesh::EntityToDependentProcessorsMap::iterator iter = entityKeySharing.begin(); + for(; iter != entityKeySharing.end(); iter++) + { + std::vector sharingProcs(iter->second.begin(), iter->second.end()); + for(size_t j = 0; j < sharingProcs.size(); j++) + { + if(sharingProcs[j] == myProcId) { continue; } + commStage2.send_buffer(sharingProcs[j]).pack(iter->first); + commStage2.send_buffer(sharingProcs[j]).pack(sharingProcs.size()); + for(size_t k = 0; k < sharingProcs.size(); k++) + { + commStage2.send_buffer(sharingProcs[j]).pack(sharingProcs[k]); + } + } + } + + if(phase == 0) + { + commStage2.allocate_buffers(); + } + else + { + commStage2.communicate(); + } + } +} + +void unpackCommunicationsAndStoreSharedEntityToProcPair(const int numProcs, const int myProcId, stk::CommSparse& commStage2, std::vector >& sharedEntities) +{ + for(int procIndex = 0; procIndex < numProcs; procIndex++) + { + if(myProcId == procIndex) { continue; } + stk::CommBuffer & dataFromAnotherProc = commStage2.recv_buffer(procIndex); + while(dataFromAnotherProc.remaining()) + { + EntityKey key; + size_t numSharingProcs = 0; + dataFromAnotherProc.unpack(key); + dataFromAnotherProc.unpack(numSharingProcs); + for(size_t j = 0; j < numSharingProcs; j++) + { + int sharingProc = -1; + dataFromAnotherProc.unpack(sharingProc); + if(sharingProc != myProcId) + { + sharedEntities.emplace_back(key, sharingProc); + } + } + } + } +} + +bool is_received_entity_in_local_shared_entity_list( + bool use_entity_ids_for_resolving_sharing, + const std::vector::iterator &shared_itr, + const std::vector& shared_entities_this_proc, + const shared_entity_type &shared_entity_from_other_proc) +{ + bool entitiesHaveSameNodes = shared_itr != shared_entities_this_proc.end() && *shared_itr == shared_entity_from_other_proc; + bool entitiesAreTheSame = false; + + if ( use_entity_ids_for_resolving_sharing ) { + entitiesAreTheSame = entitiesHaveSameNodes && shared_itr->local_key == shared_entity_from_other_proc.local_key; + } + else { + entitiesAreTheSame = entitiesHaveSameNodes; + } + + return entitiesAreTheSame; +} + +bool ghost_id_is_found_in_comm_data(const PairIterEntityComm& comm_data, + int entity_owner, + int ghost_id) +{ + bool found_ghost_id = false; + for (size_t i = 0; i < comm_data.size(); ++i) { + if ((comm_data[i].ghost_id == static_cast(ghost_id)) && + (comm_data[i].proc == entity_owner)) { + found_ghost_id = true; + break; + } + } + return found_ghost_id; +} + +bool all_ghost_ids_are_found_in_comm_data(const PairIterEntityComm& comm_data, + int entity_owner, + const std::vector& recvd_ghost_ids) +{ + bool found_all_ghost_ids = true; + for (int ghost_id : recvd_ghost_ids) { + if (!ghost_id_is_found_in_comm_data(comm_data, entity_owner, ghost_id)) { + found_all_ghost_ids = false; + break; + } + } + return found_all_ghost_ids; +} + } // namespace impl } // namespace mesh } // namespace stk diff --git a/packages/stk/stk_mesh/stk_mesh/baseImpl/MeshCommImplUtils.hpp b/packages/stk/stk_mesh/stk_mesh/baseImpl/MeshCommImplUtils.hpp index 744c8dd2ddd3..3bb401457e89 100644 --- a/packages/stk/stk_mesh/stk_mesh/baseImpl/MeshCommImplUtils.hpp +++ b/packages/stk/stk_mesh/stk_mesh/baseImpl/MeshCommImplUtils.hpp @@ -84,6 +84,49 @@ void filter_out_unneeded_induced_parts(const BulkData& bulkData, Entity entity, const OrdinalVector& induced_parts, OrdinalVector& remove_parts); + +void communicate_shared_entity_info(const BulkData &mesh, + stk::CommSparse &comm, + std::vector > &shared_entities); + +void communicateSharingInfoToProcsThatShareEntity( + const int numProcs, + const int myProcId, + stk::CommSparse& commStage2, + stk::mesh::EntityToDependentProcessorsMap &entityKeySharing); + +void unpackCommunicationsAndStoreSharedEntityToProcPair( + const int numProcs, + const int myProcId, + stk::CommSparse& commStage2, + std::vector >& sharedEntities); + +bool is_received_entity_in_local_shared_entity_list( + bool use_entity_ids_for_resolving_sharing, + const std::vector::iterator &shared_itr, + const std::vector& shared_entities_this_proc, + const shared_entity_type &shared_entity_from_other_proc); + +bool ghost_id_is_found_in_comm_data(const PairIterEntityComm& comm_data, + int entity_owner, + int ghost_id); + +bool all_ghost_ids_are_found_in_comm_data(const PairIterEntityComm& comm_data, + int entity_owner, + const std::vector& recvd_ghost_ids); + +inline +bool is_comm_ordered(const PairIterEntityComm& ec) +{ + int n = ec.size(); + for (int i=1; i & recvGhosts, - std::set< EntityProc , EntityLess > & sendGhosts ) -{ - const int parallel_size = mesh.parallel_size(); - - stk::CommSparse sparse( mesh.parallel() ); - - // For all entity keys in new recv, send the entity key to the owning proc - for ( int phase = 0; phase < 2; ++phase) { - for ( std::set::const_iterator - i = recvGhosts.begin() ; i != recvGhosts.end() ; ++i ) { - Entity e = mesh.get_entity(*i); // Performance issue? Not if you're just doing full regens - const int owner = mesh.parallel_owner_rank(e); - const EntityKey key = mesh.entity_key(e); - sparse.send_buffer( owner ).pack( key ); - } - if (phase == 0) { //allocation phase - sparse.allocate_buffers(); - } - else { //communication phase - sparse.communicate(); - } - } - - // Insert into sendGhosts that there is an entity on another proc - for ( int proc_rank = 0 ; proc_rank < parallel_size ; ++proc_rank ) { - stk::CommBuffer & buf = sparse.recv_buffer(proc_rank); - while ( buf.remaining() ) { - EntityKey key ; - buf.unpack( key ); - EntityProc tmp( mesh.get_entity( key ) , proc_rank ); - sendGhosts.insert( tmp ); - } - } -} - void send_entity_keys_to_owners( BulkData & mesh , const std::vector & recvGhosts, @@ -1155,7 +1116,7 @@ void comm_sync_send_recv( all.communicate(); // Loop thru all the buffers, and insert ghosting request for entity e to other proc - // if the proc sending me the data is me, then insert into new_recv. + // if the proc sending me the data is me, then insert into recvGhosts. // Communication unpacking: for ( int p = 0 ; p < parallel_size ; ++p ) { CommBuffer & buf = all.recv_buffer(p); @@ -1479,28 +1440,100 @@ stk::mesh::ConnectivityOrdinal get_ordinal_for_element_side_pair(const stk::mesh return get_ordinal_from_side_entity(sideVector, ordinals, side); } -void print_field_data_for_entity(const stk::mesh::BulkData& mesh, const stk::mesh::MeshIndex& meshIndex, std::ostream& out) +void fill_inducible_parts_from_list(const MetaData& meta, + const OrdinalVector & partList, + EntityRank rank, + OrdinalVector &induciblePartsFromList) { - const stk::mesh::Bucket* bucket = meshIndex.bucket; - size_t b_ord = meshIndex.bucket_ordinal; - const stk::mesh::FieldVector& all_fields = mesh.mesh_meta_data().get_fields(); - for(stk::mesh::FieldBase* field : all_fields) { - if(static_cast(field->entity_rank()) != bucket->entity_rank()) continue; - stk::mesh::FieldMetaData field_meta_data = field->get_meta_data_for_field()[bucket->bucket_id()]; - unsigned data_size = field_meta_data.m_bytes_per_entity; - if(data_size > 0) { // entity has this field? - void* data = field_meta_data.m_data + field_meta_data.m_bytes_per_entity * b_ord; - out << " For field: " << *field << ", has data: "; - field->print_data(out, data, data_size); - out << std::endl; + const PartVector& allParts = meta.get_parts(); + for (size_t i = 0; i < partList.size(); i++) { + if (allParts[partList[i]]->should_induce(rank)) { + induciblePartsFromList.push_back(partList[i]); } } } -void print_field_data_for_entity(const stk::mesh::BulkData& mesh, const stk::mesh::Entity entity, std::ostream& out) +void fill_part_list_differences(const BulkData &mesh, + Entity entity, + const PartVector &recv_parts, + std::set &thisProcExtraParts, + std::set &otherProcExtraParts) { - const stk::mesh::MeshIndex meshIndex = mesh.mesh_index(entity); - print_field_data_for_entity(mesh, meshIndex, out); + const Bucket & bucket = mesh.bucket(entity); + std::pair part_ordinals = bucket.superset_part_ordinals(); + const PartVector & mesh_parts = mesh.mesh_meta_data().get_parts(); + + std::set thisProcPartNames; + for (const unsigned * k = part_ordinals.first; k < part_ordinals.second; ++k) { + if (mesh_parts[*k]->entity_membership_is_parallel_consistent()) { + if (mesh_parts[*k]->name() != "{OWNS}" && mesh_parts[*k]->name() != "{SHARES}" && mesh_parts[*k]->primary_entity_rank() != stk::mesh::InvalidEntityRank) + { + thisProcPartNames.insert(mesh_parts[*k]->name()); + } + } + } + + std::set otherProcPartNames; + for (const Part* part : recv_parts) { + if (part->entity_membership_is_parallel_consistent()) { + if (part->name() != "{OWNS}" && part->name() != "{SHARES}" && part->primary_entity_rank() != stk::mesh::InvalidEntityRank) { + otherProcPartNames.insert(part->name()); + } + } + } + + std::set_difference(thisProcPartNames.begin(), + thisProcPartNames.end(), + otherProcPartNames.begin(), + otherProcPartNames.end(), + std::inserter(thisProcExtraParts, thisProcExtraParts.begin())); + + std::set_difference(otherProcPartNames.begin(), + otherProcPartNames.end(), + thisProcPartNames.begin(), + thisProcPartNames.end(), + std::inserter(otherProcExtraParts, otherProcExtraParts.begin())); +} + +void check_size_of_types() +{ + const size_t sizeof_entity_in_bytes = sizeof(Entity); +#ifdef STK_32BIT_ENTITY + ThrowRequireMsg(4 == sizeof_entity_in_bytes, "sizeof(Entity) expected to be 4, is instead "<= elem_top.num_sides(), + "For elem " << mesh.identifier(elem) << ", localSideId " << localSideId + << ", localSideId exceeds " << elem_top.name() + << ".num_sides() = " << elem_top.num_sides()); + + ThrowErrorMsgIf( side_top == stk::topology::INVALID_TOPOLOGY, + "For elem " << mesh.identifier(elem) << ", localSideId " + << localSideId << ", No element topology found"); } } // namespace impl diff --git a/packages/stk/stk_mesh/stk_mesh/baseImpl/MeshImplUtils.hpp b/packages/stk/stk_mesh/stk_mesh/baseImpl/MeshImplUtils.hpp index 713c8773d371..5f301e43911d 100644 --- a/packages/stk/stk_mesh/stk_mesh/baseImpl/MeshImplUtils.hpp +++ b/packages/stk/stk_mesh/stk_mesh/baseImpl/MeshImplUtils.hpp @@ -191,6 +191,18 @@ struct OnlyVisitOnce { std::set already_visited; }; +struct OnlyVisitUnchanged +{ + OnlyVisitUnchanged(BulkData & mesh_in) : mesh(mesh_in) {} + bool operator()(Entity entity){ + if (mesh.state(entity) == Unchanged) { + return true; + } + return false; + } + BulkData & mesh; +}; + struct OnlyVisitLocallyOwnedOnce { OnlyVisitLocallyOwnedOnce(const BulkData & mesh_in) : mesh(mesh_in), ovo(mesh_in) {} bool operator()(Entity entity) @@ -528,11 +540,6 @@ struct VecPushBack { std::vector& ghostStatus; }; -void send_entity_keys_to_owners( - BulkData & mesh , - const std::set< EntityKey > & recvGhosts , - std::set< EntityProc , EntityLess > & sendGhosts ); - void send_entity_keys_to_owners( BulkData & mesh , const std::vector & recvGhosts , @@ -599,10 +606,22 @@ stk::mesh::ConnectivityOrdinal get_ordinal_for_element_side_pair(const stk::mesh stk::mesh::Entity element, stk::mesh::Entity side); -void print_field_data_for_entity(const stk::mesh::BulkData& mesh, const stk::mesh::MeshIndex& meshIndex, std::ostream& out); +void fill_inducible_parts_from_list(const MetaData& meta, + const OrdinalVector & partList, + EntityRank rank, + OrdinalVector &induciblePartsFromList); + +void fill_part_list_differences(const BulkData &mesh, + Entity entity, + const PartVector &recv_parts, + std::set &thisProcExtraParts, + std::set &otherProcExtraParts); -void print_field_data_for_entity(const stk::mesh::BulkData& mesh, const stk::mesh::Entity entity, std::ostream& out); +void check_size_of_types(); +void check_declare_element_side_inputs(const BulkData & mesh, + const Entity elem, + const unsigned localSideId); } // namespace impl } // namespace mesh } // namespace stk diff --git a/packages/stk/stk_mesh/stk_mesh/baseImpl/MeshModification.cpp b/packages/stk/stk_mesh/stk_mesh/baseImpl/MeshModification.cpp index 1dc902cde250..0eb12b4d4b83 100644 --- a/packages/stk/stk_mesh/stk_mesh/baseImpl/MeshModification.cpp +++ b/packages/stk/stk_mesh/stk_mesh/baseImpl/MeshModification.cpp @@ -80,7 +80,7 @@ bool MeshModification::internal_modification_end(modification_optimization opt) // Resolve modification or deletion of shared entities // which can cause deletion of ghost entities. stk::mesh::EntityVector entitiesNoLongerShared; - m_bulkData.internal_resolve_shared_modify_delete(entitiesNoLongerShared); + internal_resolve_shared_modify_delete(entitiesNoLongerShared); // Resolve modification or deletion of ghost entities // by destroying ghost entities that have been touched. @@ -167,6 +167,7 @@ bool MeshModification::internal_modification_end_after_node_sharing_resolution(m { m_bulkData.internal_resolve_parallel_create_edges_and_faces(); stk::mesh::EntityVector entitiesNoLongerShared; + internal_resolve_shared_modify_delete(entitiesNoLongerShared); m_bulkData.internal_resolve_shared_membership(entitiesNoLongerShared); if(m_bulkData.is_automatic_aura_on()) diff --git a/packages/stk/stk_mesh/stk_mesh/baseImpl/MeshPrintUtils.cpp b/packages/stk/stk_mesh/stk_mesh/baseImpl/MeshPrintUtils.cpp new file mode 100644 index 000000000000..bc394e8ecab5 --- /dev/null +++ b/packages/stk/stk_mesh/stk_mesh/baseImpl/MeshPrintUtils.cpp @@ -0,0 +1,169 @@ +// Copyright 2002 - 2008, 2010, 2011 National Technology Engineering +// Solutions of Sandia, LLC (NTESS). Under the terms of Contract +// DE-NA0003525 with NTESS, the U.S. Government retains certain rights +// in this software. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following +// disclaimer in the documentation and/or other materials provided +// with the distribution. +// +// * Neither the name of NTESS nor the names of its contributors +// may be used to endorse or promote products derived from this +// software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// + +#include +#include +#include +//---------------------------------------------------------------------- + +namespace stk { +namespace mesh { +namespace impl { + +std::ostream & +print_entity_id( std::ostream & os , const MetaData & meta_data , + EntityRank type , EntityId id ) +{ + const std::string & name = meta_data.entity_rank_name( type ); + return os << name << "[" << id << "]" ; +} + + +std::ostream & +print_entity_key( std::ostream & os , const MetaData & meta_data , + const EntityKey & key ) +{ + const EntityRank rank = key.rank(); + const EntityId id = key.id(); + return print_entity_id( os , meta_data , rank , id ); +} + +std::string +print_entity_key( const MetaData & meta_data , const EntityKey & key ) +{ + std::ostringstream out; + print_entity_key(out, meta_data, key); + return out.str(); +} + +bool print_comm_data_for_entity_in_ghosting(const BulkData& mesh, const Ghosting& ghosting, EntityKey entityKey, std::ostream& out) +{ + std::vector procs; + mesh.comm_procs(ghosting, entityKey, procs); + if (procs.empty()) { return false; } + out << " Ghosting " << mesh.ghosting_part(ghosting).name() << " with procs: " << stk::util::join(procs, ", ") << std::endl; + return true; +} + +void print_comm_data_for_entity(const BulkData& mesh, EntityKey entityKey, std::ostream& out) +{ + const std::vector & ghostLevels = mesh.ghostings(); + bool ghostedAnywhere = false; + for (size_t ghostI=0 ; ghostI(field->entity_rank()) != bucket->entity_rank()) continue; + FieldMetaData field_meta_data = field->get_meta_data_for_field()[bucket->bucket_id()]; + unsigned data_size = field_meta_data.m_bytes_per_entity; + if (data_size > 0) { // entity has this field? + void* data = field_meta_data.m_data + field_meta_data.m_bytes_per_entity * b_ord; + out << " For field: " << *field << ", has data: "; + field->print_data(out, data, data_size); + out << std::endl; + } + } +} + +void print_field_data_for_entity(const stk::mesh::BulkData& mesh, const stk::mesh::Entity entity, std::ostream& out) +{ + const stk::mesh::MeshIndex meshIndex = mesh.mesh_index(entity); + print_field_data_for_entity(mesh, meshIndex, out); +} + +void print_entity_connectivity(const BulkData& mesh, const MeshIndex& meshIndex, std::ostream& out) +{ + const Bucket* bucket = meshIndex.bucket; + size_t b_ord = meshIndex.bucket_ordinal; + const std::vector & rank_names = mesh.mesh_meta_data().entity_rank_names(); + EntityRank b_rank = bucket->entity_rank(); + for (EntityRank r = stk::topology::NODE_RANK, re = static_cast(rank_names.size()); r < re; ++r) { + out << " Connectivity to " << rank_names[r] << std::endl; + Entity const* entities = bucket->begin(b_ord, r); + ConnectivityOrdinal const* ordinals = bucket->begin_ordinals(b_ord, r); + const int num_conn = bucket->num_connectivity(b_ord, r); + for (int c_itr = 0; c_itr < num_conn; ++c_itr) { + Entity target_entity = entities[c_itr]; + uint32_t ord = ordinals[c_itr]; + out << " [" << ord << "] " << mesh.entity_key(target_entity) << " "; + if (r != stk::topology::NODE_RANK) { + out << mesh.bucket(target_entity).topology(); + if (b_rank != stk::topology::NODE_RANK) { + Permutation const *permutations = bucket->begin_permutations(b_ord, r); + if (permutations) { + out << " permutation index " << permutations[c_itr]; + } + } + } + out << ", state = " << mesh.state(target_entity); + out << std::endl; + } + } +} + +void print_bucket_parts(const BulkData& mesh, const Bucket* bucket, std::ostream& out) +{ + out << " Found bucket " << bucket->bucket_id() << " with superset parts: { "; + const PartVector& supersets = bucket->supersets(); + for(const Part* part : supersets) { + out << part->name() << " "; + } + out << "}" << std::endl; +} + +void print_entity_offset_and_state(const BulkData& mesh, const MeshIndex& meshIndex, std::ostream& out) +{ + Entity entity = (*meshIndex.bucket)[meshIndex.bucket_ordinal]; + out << " " << print_entity_key(mesh.mesh_meta_data(), mesh.entity_key(entity)) << "(offset: " << entity.local_offset() << + "), state = " << mesh.state(entity) << std::endl; +} + +} // namespace impl +} // namespace mesh +} // namespace stk + +//---------------------------------------------------------------------- +//---------------------------------------------------------------------- + diff --git a/packages/stk/stk_mesh/stk_mesh/baseImpl/MeshPrintUtils.hpp b/packages/stk/stk_mesh/stk_mesh/baseImpl/MeshPrintUtils.hpp new file mode 100644 index 000000000000..4b1be0b010a1 --- /dev/null +++ b/packages/stk/stk_mesh/stk_mesh/baseImpl/MeshPrintUtils.hpp @@ -0,0 +1,92 @@ +// Copyright 2002 - 2008, 2010, 2011 National Technology Engineering +// Solutions of Sandia, LLC (NTESS). Under the terms of Contract +// DE-NA0003525 with NTESS, the U.S. Government retains certain rights +// in this software. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following +// disclaimer in the documentation and/or other materials provided +// with the distribution. +// +// * Neither the name of NTESS nor the names of its contributors +// may be used to endorse or promote products derived from this +// software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// + +#ifndef stk_mesh_base_impl_MeshPrintUtils_hpp +#define stk_mesh_base_impl_MeshPrintUtils_hpp + +//---------------------------------------------------------------------- + +#include +#include +#include +#include +#include +#include + +//---------------------------------------------------------------------- + +namespace stk { +namespace mesh { +namespace impl { + +std::ostream & +print_entity_key(std::ostream & os, const MetaData & meta_data, const EntityKey & key); + +std::string +print_entity_key(const MetaData & meta_data, const EntityKey & key ); + +bool print_comm_data_for_entity_in_ghosting(const BulkData& mesh, + const Ghosting& ghosting, + EntityKey entityKey, + std::ostream& out); + +void print_comm_data_for_entity(const BulkData& mesh, + EntityKey entityKey, + std::ostream& out); + +void print_field_data_for_entity(const BulkData& mesh, + const MeshIndex& meshIndex, + std::ostream& out); + +void print_entity_connectivity(const BulkData& mesh, + const MeshIndex& meshIndex, + std::ostream& out); + +void print_bucket_parts(const BulkData& mesh, + const Bucket* bucket, + std::ostream& out); + +void print_entity_offset_and_state(const BulkData& mesh, + const MeshIndex& meshIndex, + std::ostream& out); + +} // namespace impl +} // namespace mesh +} // namespace stk + +//---------------------------------------------------------------------- +//---------------------------------------------------------------------- + +#endif // stk_mesh_base_impl_PartVectorUtils_hpp + diff --git a/packages/stk/stk_mesh/stk_mesh/baseImpl/PartVectorUtils.hpp b/packages/stk/stk_mesh/stk_mesh/baseImpl/PartVectorUtils.hpp new file mode 100644 index 000000000000..512f3c14e42b --- /dev/null +++ b/packages/stk/stk_mesh/stk_mesh/baseImpl/PartVectorUtils.hpp @@ -0,0 +1,106 @@ +// Copyright 2002 - 2008, 2010, 2011 National Technology Engineering +// Solutions of Sandia, LLC (NTESS). Under the terms of Contract +// DE-NA0003525 with NTESS, the U.S. Government retains certain rights +// in this software. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following +// disclaimer in the documentation and/or other materials provided +// with the distribution. +// +// * Neither the name of NTESS nor the names of its contributors +// may be used to endorse or promote products derived from this +// software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// + +#ifndef stk_mesh_base_impl_PartVectorUtils_hpp +#define stk_mesh_base_impl_PartVectorUtils_hpp + +//---------------------------------------------------------------------- + +#include +#include + +//---------------------------------------------------------------------- + +namespace stk { +namespace mesh { +namespace impl { + +template +void fill_add_parts_and_supersets(const PARTVECTOR & add_parts, + OrdinalVector &addPartsAndSupersets) +{ + const unsigned expected_min_num_supersets = 3; + const size_t expectedSizeOfAddPartList = add_parts.size() * expected_min_num_supersets; + addPartsAndSupersets.reserve(expectedSizeOfAddPartList); + for(const Part* addPart : add_parts) + { + addPartsAndSupersets.push_back(addPart->mesh_meta_data_ordinal()); + const PartVector& supersets = addPart->supersets(); + for(const Part* superset : supersets) + { + addPartsAndSupersets.push_back(superset->mesh_meta_data_ordinal()); + } + } + stk::util::sort_and_unique(addPartsAndSupersets); +} + +template +void fill_remove_parts_and_subsets_minus_parts_in_add_parts_list( + const PARTVECTOR & remove_parts, + const OrdinalVector & addPartsAndSupersets, + stk::mesh::Bucket &entityBucket, + OrdinalVector &removePartsAndSubsetsMinusPartsInAddPartsList) +{ + const unsigned expected_min_num_subsets = 3; + const size_t expectedSizeOfRemovePartList = remove_parts.size() * expected_min_num_subsets; + removePartsAndSubsetsMinusPartsInAddPartsList.reserve(expectedSizeOfRemovePartList); + for(const Part* rmPart : remove_parts) + { + if(!contains_ordinal(addPartsAndSupersets.begin(), + addPartsAndSupersets.end(), + rmPart->mesh_meta_data_ordinal())) + { + removePartsAndSubsetsMinusPartsInAddPartsList.push_back(rmPart->mesh_meta_data_ordinal()); + const PartVector& subsets = rmPart->subsets(); + for(const Part* subset : subsets) + { + if(entityBucket.member(*subset)) + { + removePartsAndSubsetsMinusPartsInAddPartsList.push_back(subset->mesh_meta_data_ordinal()); + } + } + } + } + stk::util::sort_and_unique(removePartsAndSubsetsMinusPartsInAddPartsList); +} + +} // namespace impl +} // namespace mesh +} // namespace stk + +//---------------------------------------------------------------------- +//---------------------------------------------------------------------- + +#endif // stk_mesh_base_impl_PartVectorUtils_hpp + diff --git a/packages/stk/stk_ngp/Jamfile b/packages/stk/stk_ngp/Jamfile index d55b52f0bc07..d6c36cfe449b 100644 --- a/packages/stk/stk_ngp/Jamfile +++ b/packages/stk/stk_ngp/Jamfile @@ -69,7 +69,6 @@ local installed-end-user-files = # Note that if the --install-developer-files option is passed to bjam these will also # be installed for end-users. (This is only intended to be used for testing.) local installed-developer-files = - stk_ngp_utest ; # @@ -143,16 +142,6 @@ alias install-exe-targets : ; # # SECTION 4: Build configuration # -exe stk_ngp_utest - : - [ glob $(stk_ngp-root)/../stk_unit_tests/stk_ngp/*.cpp - ] - /sierra/stk_unit_test_utils//stk_unit_main - stk_ngp - /sierra/stk_unit_test_utils//stk_mesh_fixtures - : @sierra-exec-tag - $(stk_ngp-root)/../stk_unit_tests/stk_ngp - ; lib stk_ngp : diff --git a/packages/stk/stk_ngp/stk_ngp/NgpField.hpp b/packages/stk/stk_ngp/stk_ngp/NgpField.hpp index 598a02390145..6a3c9a876adb 100644 --- a/packages/stk/stk_ngp/stk_ngp/NgpField.hpp +++ b/packages/stk/stk_ngp/stk_ngp/NgpField.hpp @@ -54,7 +54,7 @@ template class MultistateField; class FieldBase { public: - KOKKOS_DEFAULTED_FUNCTION FieldBase() = default; + STK_FUNCTION FieldBase() = default; STK_FUNCTION virtual ~FieldBase() {} virtual void sync_to_host() {} }; @@ -333,7 +333,7 @@ class StaticField : public FieldBase fieldData.clear_sync_state(); // New Kokkos API } - KOKKOS_DEFAULTED_FUNCTION StaticField(const StaticField &) = default; + STK_FUNCTION StaticField(const StaticField &) = default; STK_FUNCTION virtual ~StaticField() {} @@ -538,7 +538,7 @@ class ConstStaticField : public FieldBase { } - KOKKOS_DEFAULTED_FUNCTION ConstStaticField(const ConstStaticField &) = default; + STK_FUNCTION ConstStaticField(const ConstStaticField &) = default; STK_FUNCTION virtual ~ConstStaticField() {} diff --git a/packages/stk/stk_ngp/stk_ngp/NgpFieldParallel.hpp b/packages/stk/stk_ngp/stk_ngp/NgpFieldParallel.hpp index aaabc5960743..05f02b69bc0e 100644 --- a/packages/stk/stk_ngp/stk_ngp/NgpFieldParallel.hpp +++ b/packages/stk/stk_ngp/stk_ngp/NgpFieldParallel.hpp @@ -146,13 +146,13 @@ struct NgpFieldInfo NgpFieldInfo(ngp::Field& fld) : m_field(fld) {} - KOKKOS_DEFAULTED_FUNCTION + STK_FUNCTION NgpFieldInfo() = default; - KOKKOS_DEFAULTED_FUNCTION + STK_FUNCTION NgpFieldInfo(const NgpFieldInfo&) = default; - KOKKOS_DEFAULTED_FUNCTION + STK_FUNCTION ~NgpFieldInfo() = default; STK_FUNCTION diff --git a/packages/stk/stk_ngp/stk_ngp/NgpMesh.hpp b/packages/stk/stk_ngp/stk_ngp/NgpMesh.hpp index 892e551c07d8..09a8399e283a 100644 --- a/packages/stk/stk_ngp/stk_ngp/NgpMesh.hpp +++ b/packages/stk/stk_ngp/stk_ngp/NgpMesh.hpp @@ -594,7 +594,8 @@ class StaticMesh STK_FUNCTION StaticMesh() : bulk(nullptr), spatial_dimension(0), synchronizedCount(0) {} - explicit StaticMesh(const stk::mesh::BulkData& b) +#ifndef STK_HIDE_DEPRECATED_CODE // Delete all of stk_ngp after sprint 4.57.6 + STK_DEPRECATED explicit StaticMesh(const stk::mesh::BulkData& b) : bulk(&b), spatial_dimension(b.mesh_meta_data().spatial_dimension()), synchronizedCount(b.synchronized_count()) { set_entity_keys(b); @@ -615,6 +616,7 @@ class StaticMesh } copy_mesh_indices_to_device(); } +#endif //STK_HIDE_DEPRECATED_CODE void update_buckets() const { @@ -625,7 +627,7 @@ class StaticMesh //ThrowRequireMsg(false,"ERROR, update_buckets not supported for ngp::StaticMesh"); } - KOKKOS_DEFAULTED_FUNCTION + STK_FUNCTION StaticMesh(const StaticMesh &) = default; STK_FUNCTION ~StaticMesh() {} diff --git a/packages/stk/stk_ngp/stk_ngp/NgpReductions.hpp b/packages/stk/stk_ngp/stk_ngp/NgpReductions.hpp index c62c3035bb91..b36e1c5f9033 100644 --- a/packages/stk/stk_ngp/stk_ngp/NgpReductions.hpp +++ b/packages/stk/stk_ngp/stk_ngp/NgpReductions.hpp @@ -87,7 +87,7 @@ struct FieldAccessFunctor{ } KOKKOS_FUNCTION stk::mesh::EntityRank get_rank() const { return field.get_rank(); } - KOKKOS_DEFAULTED_FUNCTION + KOKKOS_FUNCTION FieldAccessFunctor(const FieldAccessFunctor& rhs) = default; KOKKOS_FUNCTION FieldAccessFunctor(const FieldAccessFunctor& rhs, const typename Mesh::BucketType* b, ReductionOp r) diff --git a/packages/stk/stk_ngp_test/cmake/Dependencies.cmake b/packages/stk/stk_ngp_test/cmake/Dependencies.cmake index 718d562d324d..a096cdbb773e 100644 --- a/packages/stk/stk_ngp_test/cmake/Dependencies.cmake +++ b/packages/stk/stk_ngp_test/cmake/Dependencies.cmake @@ -1,4 +1,4 @@ -SET(LIB_REQUIRED_DEP_PACKAGES Kokkos KokkosCore Gtest) +SET(LIB_REQUIRED_DEP_PACKAGES Kokkos KokkosContainers KokkosCore Gtest) SET(LIB_OPTIONAL_DEP_PACKAGES) SET(TEST_REQUIRED_DEP_PACKAGES) SET(TEST_OPTIONAL_DEP_PACKAGES) diff --git a/packages/stk/stk_ngp_test/stk_ngp_test/ngp_test.cpp b/packages/stk/stk_ngp_test/stk_ngp_test/ngp_test.cpp index 977028baf4a3..2ecf00bfce29 100644 --- a/packages/stk/stk_ngp_test/stk_ngp_test/ngp_test.cpp +++ b/packages/stk/stk_ngp_test/stk_ngp_test/ngp_test.cpp @@ -18,7 +18,12 @@ NgpTestEnvironment::NgpTestEnvironment(int* argc, char** argv) { inline NgpTestEnvironment::~NgpTestEnvironment() { - Kokkos::finalize_all(); + finalize(); +} + +inline +void NgpTestEnvironment::finalize() { + if(Kokkos::is_initialized()) Kokkos::finalize_all(); } inline diff --git a/packages/stk/stk_ngp_test/stk_ngp_test/ngp_test.hpp b/packages/stk/stk_ngp_test/stk_ngp_test/ngp_test.hpp index 2b1ebf0b8f82..aa674aae1539 100644 --- a/packages/stk/stk_ngp_test/stk_ngp_test/ngp_test.hpp +++ b/packages/stk/stk_ngp_test/stk_ngp_test/ngp_test.hpp @@ -9,6 +9,7 @@ struct NgpTestEnvironment { NgpTestEnvironment(int* argc, char** argv); ~NgpTestEnvironment(); int run_all_tests(); + void finalize(); }; class Test : public ::testing::Test { diff --git a/packages/stk/stk_performance_tests/stk_mesh/GatherGears.cpp b/packages/stk/stk_performance_tests/stk_mesh/GatherGears.cpp index f0df36f5909c..10e0fb56b14d 100644 --- a/packages/stk/stk_performance_tests/stk_mesh/GatherGears.cpp +++ b/packages/stk/stk_performance_tests/stk_mesh/GatherGears.cpp @@ -67,8 +67,8 @@ void do_stk_gather_gears_test(stk::mesh::BulkData& bulk, std::vector& su std::vector elem_centroid(spatial_dim, 0); - const VectorField& coord_field = *meta.get_field(stk::topology::NODE_RANK, "coordinates"); - ThrowAssert(&coord_field != NULL); + const VectorField * coord_field = meta.get_field(stk::topology::NODE_RANK, "coordinates"); + ThrowAssert(coord_field != nullptr); Selector local = meta.locally_owned_part(); @@ -91,7 +91,7 @@ void do_stk_gather_gears_test(stk::mesh::BulkData& bulk, std::vector& su unsigned offset = 0; for(size_t n=0; n& sum_cent std::vector elem_centroid(spatial_dim, 0); - const VectorField& coord_field = *meta.get_field(stk::topology::NODE_RANK, "coordinates"); - ThrowAssert(&coord_field != NULL); + const VectorField * coord_field = meta.get_field(stk::topology::NODE_RANK, "coordinates"); + ThrowAssert(coord_field != nullptr); Selector local = meta.locally_owned_part(); @@ -98,7 +98,7 @@ void do_stk_gather_test(stk::mesh::BulkData& bulk, std::vector& sum_cent for(; node_rel_itr != node_rels_end; ++node_rel_itr) { Entity node = *node_rel_itr; - double* node_coords = stk::mesh::field_data(coord_field, node); + double* node_coords = stk::mesh::field_data(*coord_field, node); elem_node_coords[offset++] = node_coords[0]; elem_node_coords[offset++] = node_coords[1]; elem_node_coords[offset++] = node_coords[2]; diff --git a/packages/stk/stk_performance_tests/stk_mesh/NgpFieldAccess.cpp b/packages/stk/stk_performance_tests/stk_mesh/NgpFieldAccess.cpp index e178b7db9d72..746c55c372ce 100644 --- a/packages/stk/stk_performance_tests/stk_mesh/NgpFieldAccess.cpp +++ b/packages/stk/stk_performance_tests/stk_mesh/NgpFieldAccess.cpp @@ -34,7 +34,6 @@ #include #include -#include #include #include #include @@ -117,25 +116,6 @@ TEST_F(NgpFieldAccess, Centroid) timer.print_timing(NUM_RUNS); } -TEST_F(NgpFieldAccess, ConstCentroid) -{ - if (get_parallel_size() != 1) return; - - const int NUM_RUNS = 400; - const int ELEMS_PER_DIM = 100; - - declare_centroid_field(); - setup_mesh(stk::unit_test_util::get_mesh_spec(ELEMS_PER_DIM), stk::mesh::BulkData::NO_AUTO_AURA); - - timer.start_timing(); - for (int run=0; run>(get_bulk(), *centroid); - verify_averaged_centroids_are_center_of_mesh(ELEMS_PER_DIM); - } - timer.update_timing(); - timer.print_timing(NUM_RUNS); -} - TEST_F(NgpFieldAccess, CentroidMultiBlock) { if (get_parallel_size() != 1) return; @@ -160,28 +140,4 @@ TEST_F(NgpFieldAccess, CentroidMultiBlock) timer.print_timing(NUM_RUNS); } -TEST_F(NgpFieldAccess, ConstCentroidMultiBlock) -{ - if (get_parallel_size() != 1) return; - - const int NUM_RUNS = 5; - const int ELEMS_PER_DIM = 100; - const int NUM_BLOCKS = 100; - - declare_centroid_field(); - setup_multi_block_mesh(ELEMS_PER_DIM, NUM_BLOCKS); - - timer.start_timing(); - for (int run=0; run>( - get_bulk(), block_selector(blockId), *centroid); - } - - verify_averaged_centroids_are_center_of_mesh(ELEMS_PER_DIM); - } - timer.update_timing(); - timer.print_timing(NUM_RUNS); -} - } diff --git a/packages/stk/stk_performance_tests/stk_mesh/NgpFieldUpdate.cpp b/packages/stk/stk_performance_tests/stk_mesh/NgpFieldUpdate.cpp index 8e071eb592c0..c411183bf694 100644 --- a/packages/stk/stk_performance_tests/stk_mesh/NgpFieldUpdate.cpp +++ b/packages/stk/stk_performance_tests/stk_mesh/NgpFieldUpdate.cpp @@ -33,6 +33,7 @@ // #include +#include #include #include #include @@ -42,6 +43,8 @@ #include #include #include +#include +#include #include #include @@ -64,6 +67,46 @@ class NgpFieldUpdateFixture : public stk::unit_test_util::MeshFixture setup_mesh_with_fields("generated:100x100x100", stk::mesh::BulkData::NO_AUTO_AURA); } + std::string generate_stacked_block_mesh_desc(unsigned numBlocks) + { + std::string meshDesc; + + for(unsigned i = 0; i < numBlocks; i++) { + meshDesc += get_nodal_string_for_block(i+1); + if(i != numBlocks-1) { + meshDesc += "\n"; + } + } + return meshDesc; + } + + std::string get_nodal_string_for_block(unsigned blockId) + { + std::ostringstream blockStr; + for(unsigned i = 0; i < 2; i++) { + blockStr << "0," << blockId*2+i-1 << ",HEX_8,"; + for(unsigned j = 0; j < 8; j++) { + blockStr << j+1 + ((blockId-1)*2 + i) * 8 << ","; + } + blockStr << "block_" << blockId; + if(i != 1) { + blockStr << "\n"; + } + } + return blockStr.str(); + } + + void setup_mesh_with_stacked_blocks(unsigned numBlocks) + { + double init = 0.0; + setup_empty_mesh(stk::mesh::BulkData::NO_AUTO_AURA); + std::string meshDesc = generate_stacked_block_mesh_desc(numBlocks); + + stk::mesh::FieldBase* field = &get_meta().declare_field>(stk::topology::ELEMENT_RANK, "FieldA"); + stk::mesh::put_field_on_mesh(*field, get_meta().universal_part(), &init); + stk::unit_test_util::setup_text_mesh(get_bulk(), meshDesc); + } + void setup_mesh_with_fields(const std::string &meshSpecification, stk::mesh::BulkData::AutomaticAuraOption auraOption) { tensorField = &get_meta().declare_field>(stk::topology::ELEMENT_RANK, "TensorField"); @@ -79,11 +122,9 @@ class NgpFieldUpdateFixture : public stk::unit_test_util::MeshFixture { stk::mesh::NgpField& ngpTensorField = stk::mesh::get_updated_ngp_field(*tensorField); ngpTensorField.sync_to_device(); - ngpTensorField.modify_on_device(); stk::mesh::NgpField& ngpVectorField = stk::mesh::get_updated_ngp_field(*vectorField); ngpVectorField.sync_to_device(); - ngpVectorField.modify_on_device(); } protected: @@ -115,8 +156,6 @@ class NgpMeshChangeElementPartMembershipWithFields : public NgpFieldUpdateFixtur get_bulk().change_entity_parts(get_element(cycle), {get_part()}); get_bulk().modification_end(); get_bulk().get_updated_ngp_mesh(); - tensorField->modify_on_host(); - vectorField->modify_on_host(); } private: @@ -147,8 +186,6 @@ class NgpMeshCreateEntityWithFields : public NgpFieldUpdateFixture get_bulk().declare_element(get_new_entity_id(cycle)); get_bulk().modification_end(); get_bulk().get_updated_ngp_mesh(); - tensorField->modify_on_host(); - vectorField->modify_on_host(); } private: @@ -250,4 +287,4 @@ TEST_F( NgpMeshGhostingEntityWithFields, Timing ) timer.update_timing(); } timer.print_timing(NUM_RUNS); -} +} \ No newline at end of file diff --git a/packages/stk/stk_performance_tests/stk_mesh/calculate_centroid.hpp b/packages/stk/stk_performance_tests/stk_mesh/calculate_centroid.hpp index 0163e4ce9c51..bab64c5237f2 100644 --- a/packages/stk/stk_performance_tests/stk_mesh/calculate_centroid.hpp +++ b/packages/stk/stk_performance_tests/stk_mesh/calculate_centroid.hpp @@ -39,6 +39,8 @@ #include "stk_mesh/base/NgpMesh.hpp" #include "stk_mesh/base/NgpField.hpp" +#include "stk_mesh/base/GetNgpField.hpp" +#include "stk_mesh/base/ForEachEntity.hpp" namespace stk { namespace performance_tests { @@ -128,10 +130,10 @@ template void calculate_centroid_using_coord_field(const stk::mesh::BulkData &bulk, const stk::mesh::Selector& selector, stk::mesh::FieldBase ¢roid) { const stk::mesh::FieldBase& coords = *bulk.mesh_meta_data().coordinate_field(); - CoordFieldType ngpCoords(bulk, coords); - stk::mesh::NgpField ngpCentroid(bulk, centroid); + stk::mesh::NgpField& ngpCentroid = stk::mesh::get_updated_ngp_field(centroid); stk::mesh::NgpMesh& ngpMesh = bulk.get_updated_ngp_mesh(); + stk::mesh::NgpField& ngpCoords = stk::mesh::get_updated_ngp_field(coords); calculate_centroid(ngpMesh, ngpCoords, selector, ngpCentroid); ngpCentroid.sync_to_host(); diff --git a/packages/stk/stk_performance_tests/stk_mesh/perfCommNeighbors.cpp b/packages/stk/stk_performance_tests/stk_mesh/perfCommNeighbors.cpp index 2948c8b11741..4897af1cb256 100644 --- a/packages/stk/stk_performance_tests/stk_mesh/perfCommNeighbors.cpp +++ b/packages/stk/stk_performance_tests/stk_mesh/perfCommNeighbors.cpp @@ -9,6 +9,8 @@ #include #include #include +#include +#include #include #include #include diff --git a/packages/stk/stk_performance_tests/stk_mesh/timer.hpp b/packages/stk/stk_performance_tests/stk_mesh/timer.hpp index 64cd6a8c0f07..136fbf1cb192 100644 --- a/packages/stk/stk_performance_tests/stk_mesh/timer.hpp +++ b/packages/stk/stk_performance_tests/stk_mesh/timer.hpp @@ -50,6 +50,7 @@ class Timer iterationStartTime(0.0), cumulativeTime(0.0), iterationStartHwm(0), + iterationStartGpuUsage(0), meshOperationHwm(1) { } @@ -57,13 +58,15 @@ class Timer { iterationStartTime = stk::wall_time(); iterationStartHwm = stk::get_max_hwm_across_procs(communicator); + iterationStartGpuUsage = stk::get_max_gpu_mem_used_across_procs(communicator); } void update_timing() { cumulativeTime += stk::wall_dtime(iterationStartTime); + size_t currentGpuUsage = stk::get_max_gpu_mem_used_across_procs(communicator) - iterationStartGpuUsage; size_t currentHwm = stk::get_max_hwm_across_procs(communicator) - iterationStartHwm; - meshOperationHwm = std::max(currentHwm, meshOperationHwm); + meshOperationHwm = std::max(meshOperationHwm, currentHwm + currentGpuUsage); } void print_timing(unsigned iterationCount) @@ -77,6 +80,7 @@ class Timer double iterationStartTime; double cumulativeTime; size_t iterationStartHwm; + size_t iterationStartGpuUsage; size_t meshOperationHwm; }; diff --git a/packages/stk/stk_search/Jamfile b/packages/stk/stk_search/Jamfile index 7ae5c9083b71..204cac235fbd 100644 --- a/packages/stk/stk_search/Jamfile +++ b/packages/stk/stk_search/Jamfile @@ -7,10 +7,6 @@ # a license from the United States Government. #-------------------------------------------------------------------- -# -# The signature for Boost.build rules is described here: -# -# http://www.boost.org/build/doc/html/bbv2/overview/targets.html # #function-name main-target-name # : sources @@ -148,9 +144,7 @@ lib stk_search /sierra/stk_util//stk_util_util /sierra/stk_util//stk_util_diag /sierra/stk_util//stk_util_parallel - /tpl/boost//boost_header_only_libs /sierra/stk_math//stk_math_headers - /sierra/stk_ngp//stk_ngp : [ ifuserbuild # Any parameters within this 'ifuserbuild' block apply to user diff --git a/packages/stk/stk_search/cmake/Dependencies.cmake b/packages/stk/stk_search/cmake/Dependencies.cmake index 0284c6f0ab70..7be386c48581 100644 --- a/packages/stk/stk_search/cmake/Dependencies.cmake +++ b/packages/stk/stk_search/cmake/Dependencies.cmake @@ -2,7 +2,7 @@ SET(LIB_REQUIRED_DEP_PACKAGES STKUtil Kokkos KokkosKernels STKMath) SET(LIB_OPTIONAL_DEP_PACKAGES) SET(TEST_REQUIRED_DEP_PACKAGES STKUnit_test_utils Gtest) SET(TEST_OPTIONAL_DEP_PACKAGES) -SET(LIB_REQUIRED_DEP_TPLS Boost MPI) +SET(LIB_REQUIRED_DEP_TPLS MPI) SET(LIB_OPTIONAL_DEP_TPLS) SET(TEST_REQUIRED_DEP_TPLS) -SET(TEST_OPTIONAL_DEP_TPLS Boost) +SET(TEST_OPTIONAL_DEP_TPLS) diff --git a/packages/stk/stk_search/stk_search/BoostRTreeInterface.hpp b/packages/stk/stk_search/stk_search/BoostRTreeInterface.hpp deleted file mode 100644 index 027bd5b92415..000000000000 --- a/packages/stk/stk_search/stk_search/BoostRTreeInterface.hpp +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef STK_SEARCH_BOOST_RTREE_INTERFACE_HPP -#define STK_SEARCH_BOOST_RTREE_INTERFACE_HPP - -#ifdef __INTEL_COMPILER -#include -#include -#include -#include -#include -#else -// this disables the checking of shadowed variables on GCC only -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow" -#include -#include -#include -#include -#include -#pragma GCC diagnostic pop -#endif - -#endif // STK_SEARCH_BOOST_RTREE_INTERFACE_HPP diff --git a/packages/stk/stk_search/stk_search/BoundingBox.hpp b/packages/stk/stk_search/stk_search/BoundingBox.hpp index a0ddddca4421..9b6aa375148c 100644 --- a/packages/stk/stk_search/stk_search/BoundingBox.hpp +++ b/packages/stk/stk_search/stk_search/BoundingBox.hpp @@ -38,6 +38,7 @@ #include #include +#include #include #include #include // for stk::math::max, stk::math::min @@ -251,6 +252,35 @@ inline bool intersects(Box const& a, Box const& b) } +// intersects: Plane,Box +template +inline bool intersects(Plane const& p, Box const& b) +{ + + std::array points = {b.get_x_min(), b.get_x_max(), b.get_y_min(), b.get_y_max(), b.get_z_min(), b.get_z_max()}; + int previousWhichSide = p.WhichSide(Point(points[0], points[0], points[0])); + for (int x=0; x<2; ++x){ + for (int y=0; y<2; ++y){ + for (int z=0; z<2; ++z){ + int whichSide = p.WhichSide(Point(points[x], points[y], points[z])); + if (whichSide != previousWhichSide){ + return true; + } + else if(whichSide == 0){ + return true; + } + } + } + } + return false; +} + +template +inline bool intersects(Box const& b, Plane const& p) +{ + return intersects(p,b); +} + template inline void scale_by(Point &p, U const& mult_fact, U const& add_fact = 0) { diff --git a/packages/stk/stk_search/stk_search/CoarseSearch.hpp b/packages/stk/stk_search/stk_search/CoarseSearch.hpp index 485380ffb824..b2d559f09e60 100644 --- a/packages/stk/stk_search/stk_search/CoarseSearch.hpp +++ b/packages/stk/stk_search/stk_search/CoarseSearch.hpp @@ -39,9 +39,6 @@ #include #include #include -#if defined(STK_HAVE_BOOST) -#include -#endif #include #include #include @@ -54,8 +51,6 @@ inline std::ostream& operator<<(std::ostream &out, SearchMethod method) { switch( method ) { - case USE_DEPRECATED_BOOST_RTREE: // fall through - case BOOST_RTREE: out << "BOOST_RTREE"; break; case KDTREE: out << "KDTREE"; break; case MORTON_LINEARIZED_BVH: out << "MORTON_LINEARIZED_BVH"; break; } @@ -96,16 +91,6 @@ void coarse_search( std::vector > const& domain { switch( method ) { - case USE_DEPRECATED_BOOST_RTREE: // fall through - case BOOST_RTREE: -#ifndef __NVCC__ -#if defined(STK_HAVE_BOOST) - coarse_search_boost_rtree(domain,range,comm,intersections,communicateRangeBoxInfo); -#else - ThrowRequireMsg(false,"ERROR, the BOOST_RTREE option in stk_search requires that Trilinos was configured with TPL_ENABLE_Boost:BOOL=ON"); -#endif - break; -#endif case KDTREE: coarse_search_kdtree_driver(domain,range,comm,intersections,communicateRangeBoxInfo); break; diff --git a/packages/stk/stk_search/stk_search/CoarseSearchBoostRTree.hpp b/packages/stk/stk_search/stk_search/CoarseSearchBoostRTree.hpp deleted file mode 100644 index 79ccf72e31d9..000000000000 --- a/packages/stk/stk_search/stk_search/CoarseSearchBoostRTree.hpp +++ /dev/null @@ -1,596 +0,0 @@ -// Copyright 2002 - 2008, 2010, 2011 National Technology Engineering -// Solutions of Sandia, LLC (NTESS). Under the terms of Contract -// DE-NA0003525 with NTESS, the U.S. Government retains certain rights -// in this software. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// -// * Neither the name of NTESS nor the names of its contributors -// may be used to endorse or promote products derived from this -// software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// - -#ifndef STK_SEARCH_COARSE_SEARCH_BOOST_RTREE_HPP -#define STK_SEARCH_COARSE_SEARCH_BOOST_RTREE_HPP - -#include -#include -#include - -#include -#include -#include -#include -#include - -#include // for static_assert -#include // for isnan -#include // for vector -#include - -namespace boost { -namespace geometry { -namespace traits { - -// traits for stk::search::Box -template struct tag< stk::search::Box > { typedef box_tag type; }; -template struct point_type< stk::search::Box > { typedef stk::search::Point type; }; - -template -struct indexed_access< stk::search::Box, min_corner, Index > -{ - static_assert((Index < 3)," Index is required to be less than 3"); - static inline T const& get( stk::search::Box const& s) { return s.min_corner()[Index]; } -}; - -template -struct indexed_access< stk::search::Box, max_corner, Index > -{ - static_assert((Index < 3)," Index is required to be less than 3"); - static inline T const& get( stk::search::Box const& s) { return s.max_corner()[Index]; } -}; - -}}} // namespace boost::geometry::traits - - -namespace boost { namespace geometry { namespace traits { - -// traits for stk::search::Point -template struct tag< stk::search::Point > { typedef point_tag type; }; -template struct coordinate_type< stk::search::Point > { typedef T type; }; -template struct coordinate_system< stk::search::Point > { typedef cs::cartesian type; }; -template struct dimension< stk::search::Point > : public boost::mpl::int_<3> {}; - -template -struct access< stk::search::Point, Index > -{ - static_assert((Index < 3)," Index is required to be less than 3"); - static inline T const& get( stk::search::Point const& p) { return p[Index]; } - static inline void set( stk::search::Point const& p, T const& v) { p[Index] = v; } -}; - -}}} // namespace boost::geometry::traits - -namespace boost { namespace geometry { namespace traits { - -// traits for stk::search::Sphere -template struct tag< stk::search::Sphere > { typedef box_tag type; }; -template struct point_type< stk::search::Sphere > { typedef stk::search::Point type; }; - -template -struct indexed_access< stk::search::Sphere, min_corner, Index > -{ - static_assert((Index < 3)," Index is required to be less than 3"); - static inline T const get( stk::search::Sphere const& s) { return s.center()[Index] - s.radius(); } -}; - -template -struct indexed_access< stk::search::Sphere, max_corner, Index > -{ - static_assert((Index < 3)," Index is required to be less than 3"); - static inline T const get( stk::search::Sphere const& s) { return s.center()[Index] + s.radius(); } -}; - -}}} // namespace boost::geometry::traits - - -namespace stk { namespace search { - -namespace impl { - -template ::value> -struct fill_point_array -{ - template - void operator()(Point const& p, InputIterator itr) const - { - namespace bg = boost::geometry; - - static_assert(Index < Dimension, "Index is required to be less than Dimension"); - - *itr = bg::get(p); - ++itr; - - fill_point_array()(p, itr); - } -}; - -template -struct fill_point_array -{ - template - void operator()(Point const&, InputIterator) const - {} -}; - -template ::value> -struct set_point_impl -{ - template - void operator()(Point & p, Iterator itr) const - { - namespace bg = boost::geometry; - - static_assert(Index < Dimension, "Index is required to be less than Dimension"); - - bg::set(p, *itr); - ++itr; - - set_point_impl()(p, itr); - } -}; - -template -struct set_point_impl -{ - template - void operator()(Point & p, Iterator itr) const - {} -}; - -template -typename boost::enable_if< std::is_same< typename boost::geometry::traits::tag::type, boost::geometry::point_tag>, void>::type -fill_array(Point const& point, InputIterator itr) -{ - fill_point_array()(point, itr); -} - -template -typename boost::enable_if< std::is_same< typename boost::geometry::traits::tag::type, boost::geometry::box_tag>, void>::type -fill_array(Box const& box, InputIterator itr) -{ - namespace bg = boost::geometry; - - fill_array(box.min_corner(), itr); - fill_array(box.max_corner(), itr + bg::dimension::type>::value); -} - -template -typename boost::enable_if< std::is_same< typename boost::geometry::traits::tag::type, boost::geometry::point_tag>, void>::type -set_point(Point & point, Iterator itr) -{ - set_point_impl()(point, itr); -} - -template -typename boost::enable_if< std::is_same< typename boost::geometry::traits::tag::type, boost::geometry::box_tag>, void>::type -set_box(Box & box, Iterator itr) -{ - namespace bg = boost::geometry; - - set_point(box.min_corner(), itr); - set_point(box.max_corner(), itr + bg::dimension::type>::value); -} - -inline -ParallelDatatype get_mpi_type(double) -{ -#ifdef STK_HAS_MPI - return MPI_DOUBLE; -#else - return 0; -#endif -} - -inline -ParallelDatatype get_mpi_type(float) -{ -#ifdef STK_HAS_MPI - return MPI_FLOAT; -#else - return 1; -#endif -} - -template -struct IntersectPredicate -{ - RangeBox const& range; - - IntersectPredicate(const RangeBox& x_range) : range(x_range) {} - - // For PointBoundingBox and AxisAlignedBoundingBox, normal boost::intersects is fine - template - bool operator()(std::pair const& domain) const { return intersects(domain.first,range); } -}; - -} // namespace impl - -template -inline -bool invalid_box(CoordType *raw_box) -{ - bool retval = false; - for (int i = 0; i < Dimension; ++i) { - retval |= std::isnan(raw_box[i]); - retval |= std::isnan(raw_box[i + Dimension]); - retval |= ((raw_box[i + Dimension] - raw_box[i]) < 0); - } - return retval; -} - -template -void // TODO: enable if box matches spatialindex -create_global_spatial_index(SpatialIndex& index, Box const& local_bounding_box, MPI_Comm comm) -{ - namespace bg = boost::geometry; - - typedef typename bg::point_type::type point_t; - typedef typename bg::coordinate_type::type coordinate_t; - - const unsigned dimension = bg::dimension::value; - - const int data_per_proc = dimension * 2; - coordinate_t local_box[data_per_proc]; - impl::fill_array(local_bounding_box, local_box); - - int size = stk::parallel_machine_size(comm); - - std::vector recv(data_per_proc * size, 0); -#ifdef STK_HAS_MPI - MPI_Allgather(local_box, data_per_proc, impl::get_mpi_type(coordinate_t()), - &*recv.begin(), data_per_proc, impl::get_mpi_type(coordinate_t()), comm); -#else - for (int i=0; i < data_per_proc; i++) { - recv[i] = local_box[i]; - } -#endif - for (int p = 0; p < size; ++p) { - coordinate_t *raw_box = &*(recv.begin() + p * data_per_proc); - if (invalid_box::value>(raw_box)) { - continue; - } - Box temp; - impl::set_box(temp, recv.begin() + p * data_per_proc); - index.insert(std::make_pair(temp, p)); - } -} - -// useful for nearest negihbor, not periodc bc -template -void create_parallel_domain(SpatialIndex& local_domain, stk::ParallelMachine comm, double box_inflation=0.0) -{ - namespace bg = boost::geometry; - namespace bgi = boost::geometry::index; - - typedef typename SpatialIndex::bounds_type box_type; - typedef typename SpatialIndex::value_type value_type; - typedef std::pair box_proc_type; - typedef bgi::rtree< box_proc_type, bgi::quadratic<16> > global_index_type; - - // inflate local box to ensure overlap - box_type local_box = local_domain.bounds(); - bg::add_value(local_box.min_corner(), -box_inflation); - bg::add_value(local_box.max_corner(), box_inflation); - - // compute global domain - global_index_type global_domain; - create_global_spatial_index(global_domain, local_box, comm); - - // compute overlaps between global_domain and local box - std::vector intersecting_procs; - bgi::query(global_domain, bgi::intersects(local_box), std::back_inserter(intersecting_procs)); - - // Communicate overlapping domains - stk::CommSparse comm_sparse( comm ); - int size = stk::parallel_machine_size(comm); - for (int phase = 0; phase < 2; ++phase) { - for (size_t i=0, ie=intersecting_procs.size(); i < ie; ++i) { - box_type box; - int proc; - boost::tie(box, proc) = intersecting_procs[i]; - - std::vector overlaps; - bgi::query(local_domain, bgi::intersects(box), std::back_inserter(overlaps)); - - stk::CommBuffer & buff = comm_sparse.send_buffer(proc); - buff.pack(&*overlaps.begin(), overlaps.size()); - } - if (phase == 0) { - comm_sparse.allocate_buffers(); - } - } - - comm_sparse.communicate(); - - // Add overlapping processes to local domain - for ( int p = 0 ; p < size ; ++p ) { - stk::CommBuffer & buf = comm_sparse.recv_buffer( p ); - - const int num_recv = buf.remaining() / sizeof(value_type); - std::vector values(num_recv); - buf.unpack<>( &*values.begin(), num_recv ); - - ThrowRequireMsg(buf.remaining() == 0, buf.remaining()); - - local_domain.insert(values.begin(), values.end()); - } -} - -namespace impl { -template -int coarse_search_boost_rtree_gather_range( std::vector< std::pair > const& local_range, - boost::geometry::index::rtree< std::pair, - boost::geometry::index::quadratic > &local_domain_tree, - std::vector > &gather_range, - stk::ParallelMachine comm) -{ - namespace bg = boost::geometry; - namespace bgi = boost::geometry::index; - - typedef std::pair RangeValue; - typedef boost::geometry::index::rtree< std::pair, - boost::geometry::index::quadratic > LocalDomainTree; - typedef typename LocalDomainTree::bounds_type GlobalBox; - typedef std::pair GlobalBoxProc; - typedef bgi::rtree< GlobalBoxProc, bgi::quadratic > GlobalDomainTree; - - GlobalDomainTree global_domain_tree; - create_global_spatial_index(global_domain_tree, local_domain_tree.bounds(), comm); - - // outer index is proc - int p_size = stk::parallel_machine_size(comm); - std::vector > range_send(p_size); - - // compute what part of range to send to each process - { - std::vector potential_process_intersections; - for (size_t i = 0, ie = local_range.size(); i < ie; ++i) { - potential_process_intersections.clear(); - bgi::query(global_domain_tree, bgi::intersects(local_range[i].first), std::back_inserter(potential_process_intersections)); - - for (size_t j = 0, je = potential_process_intersections.size(); j < je; ++j) { - int proc = potential_process_intersections[j].second; - - range_send[proc].push_back(local_range[i]); - } - } - } - - // gather all range that can potentially intersect my local domain - { - stk::CommSparse comm_sparse( comm ); - for (int phase = 0; phase < 2; ++phase) { - for (int p = 0; p < p_size; ++p) { - comm_sparse.send_buffer(p).pack(&*range_send[p].begin(), range_send[p].size()); - } - if (phase == 0) { - comm_sparse.allocate_buffers(); - } - } - - comm_sparse.communicate(); - - for ( int p = 0 ; p < p_size ; ++p ) { - stk::CommBuffer & buf = comm_sparse.recv_buffer( p ); - - const int num_recv = buf.remaining() / sizeof(RangeValue); - std::vector values(num_recv); - gather_range.resize(gather_range.size() + num_recv); - buf.unpack( &*gather_range.end() - num_recv, num_recv ); - - ThrowRequireMsg(buf.remaining() == 0, buf.remaining()); - } - } - return p_size; -} - -} //namespace impl - - - -template -void coarse_search_boost_rtree_output_locally( std::vector< std::pair > const& local_domain, - std::vector< std::pair > const& local_range, - stk::ParallelMachine comm, - std::vector >& output - ) -{ - namespace bg = boost::geometry; - namespace bgi = boost::geometry::index; - - const unsigned MaxVolumesPerNode = 16; - typedef std::pair DomainValue; - typedef std::pair RangeValue; - typedef bgi::rtree< DomainValue, bgi::quadratic > LocalDomainTree; - typedef std::pair Output; - typedef std::vector OutputVector; - - LocalDomainTree local_domain_tree(local_domain.begin(), local_domain.end()); - std::vector gather_range; - - impl::coarse_search_boost_rtree_gather_range(local_range, local_domain_tree, - gather_range, comm); - - // Gather results into output - { - for (size_t r = 0, re = gather_range.size(); r < re; ++r) { - RangeBox const& range = gather_range[r].first; - std::vector domain_intersections; - bgi::query(local_domain_tree, bgi::intersects(range) && bgi::satisfies(impl::IntersectPredicate(range)), std::back_inserter(domain_intersections)); - - for (int i = 0, ie = domain_intersections.size(); i < ie; ++i) { - DomainIdent domain_id = domain_intersections[i].second; - RangeIdent range_id = gather_range[r].second; - Output temp(domain_id, range_id); - output.push_back(temp); - } - } - } - - std::sort(output.begin(), output.end()); - typename OutputVector::iterator eitr = std::unique(output.begin(), output.end()); - output.erase(eitr, output.end()); -} - -namespace { -template -void coarse_search_boost_rtree_impl( std::vector< std::pair > const& local_domain, - std::vector< std::pair > const& local_range, - stk::ParallelMachine comm, - std::vector >& output, - bool communicateDomainBoxInfo, - bool communicateRangeBoxInfo - ) -{ - namespace bg = boost::geometry; - namespace bgi = boost::geometry::index; - - const unsigned MaxVolumesPerNode = 16; - typedef std::pair DomainValue; - typedef std::pair RangeValue; - typedef bgi::rtree< DomainValue, bgi::quadratic > LocalDomainTree; - typedef std::pair Output; - typedef std::vector OutputVector; - - LocalDomainTree local_domain_tree(local_domain.begin(), local_domain.end()); - std::vector gather_range; - - int p_size = - impl::coarse_search_boost_rtree_gather_range(local_range, local_domain_tree, - gather_range, comm); - - // Gather results into output - { - int p_rank = stk::parallel_machine_rank(comm); - - stk::CommSparse comm_sparse( comm ); - std::vector send_matches(p_size); - for (size_t r = 0, re = gather_range.size(); r < re; ++r) { - RangeBox const& range = gather_range[r].first; - std::vector domain_intersections; - bgi::query(local_domain_tree, bgi::intersects(range) && bgi::satisfies(impl::IntersectPredicate(range)), std::back_inserter(domain_intersections)); - - for (int i = 0, ie = domain_intersections.size(); i < ie; ++i) { - DomainIdent domain_id = domain_intersections[i].second; - RangeIdent range_id = gather_range[r].second; - Output temp(domain_id, range_id); - output.push_back(temp); - - if ((p_size > 1) && - ((communicateDomainBoxInfo && get_proc()(domain_id) != p_rank ) || - (communicateRangeBoxInfo && get_proc()(range_id) != p_rank ))) - { - int other_proc = get_proc()(domain_id) == p_rank ? get_proc()(range_id) : get_proc()(domain_id); - send_matches[other_proc].push_back(temp); - } - } - } - - if (p_size > 1) - { - for (int phase = 0; phase < 2; ++phase) { - for (int p = 0; p < p_size; ++p) { - comm_sparse.send_buffer(p).pack(&*send_matches[p].begin(), send_matches[p].size()); - } - if (phase == 0) { - comm_sparse.allocate_buffers(); - } - } - - comm_sparse.communicate(); - - for ( int p = 0 ; p < p_size ; ++p ) { - stk::CommBuffer & buf = comm_sparse.recv_buffer( p ); - - const int num_recv = buf.remaining() / sizeof(Output); - OutputVector values(num_recv); - buf.unpack( &*values.begin(), num_recv ); - - ThrowRequireMsg(buf.remaining() == 0, buf.remaining()); - - output.insert(output.end(), values.begin(), values.end()); - } - } - } -} -} - -template -void coarse_search_boost_rtree( std::vector< std::pair > const& local_domain, - std::vector< std::pair > const& local_range, - stk::ParallelMachine comm, - std::vector >& output, - bool communicateRangeBoxInfo - ) -{ - namespace bg = boost::geometry; - namespace bgi = boost::geometry::index; - - // The search implementation needs to communicate all domain bounding boxes that intersect the - // bounding box for all range bounding boxes on a processor to that processor. In order to minimize - // the number of bounding boxes that are communicated we use whichever of the domain or range has - // fewer bounding boxes in it as the "domain" for the call to coarse_search_boost_rtree_impl(). - const size_t local_sizes[2] = {local_domain.size(), local_range.size()}; - size_t global_sizes[2]; - all_reduce_sum(comm, local_sizes, global_sizes, 2); - const bool domain_has_more_boxes = global_sizes[0] > global_sizes[1]; - - if(domain_has_more_boxes) - { - coarse_search_boost_rtree_impl(local_domain, local_range, comm, output, true, communicateRangeBoxInfo); - } - else - { - std::vector> temp_output; - coarse_search_boost_rtree_impl(local_range, local_domain, comm, temp_output, communicateRangeBoxInfo, true); - - const int p_rank = stk::parallel_machine_rank(comm); - output.reserve(temp_output.size()); - for(auto && pair : temp_output) - { - if(communicateRangeBoxInfo || get_proc()(pair.second) == p_rank) - output.emplace_back(pair.second, pair.first); - } - } - - std::sort(output.begin(), output.end()); - auto eitr = std::unique(output.begin(), output.end()); - output.erase(eitr, output.end()); -} - -}} // namespace stk::search - -#endif // STK_SEARCH_COARSE_SEARCH_BOOST_RTREE_HPP diff --git a/packages/stk/stk_search/stk_search/CoarseSearchKdTree.hpp b/packages/stk/stk_search/stk_search/CoarseSearchKdTree.hpp index 60e0fafd3be2..73817fec3d1f 100644 --- a/packages/stk/stk_search/stk_search/CoarseSearchKdTree.hpp +++ b/packages/stk/stk_search/stk_search/CoarseSearchKdTree.hpp @@ -42,6 +42,7 @@ #include "stk_search/KDTree_BoundingBox.hpp" #include "stk_util/environment/Env.hpp" #include "stk_util/environment/WallTime.hpp" +#include "stk_util/parallel/ParallelReduce.hpp" #include #include #include diff --git a/packages/stk/stk_search/stk_search/IdentProc.hpp b/packages/stk/stk_search/stk_search/IdentProc.hpp index 454f45184cdb..75d7e523e0e9 100644 --- a/packages/stk/stk_search/stk_search/IdentProc.hpp +++ b/packages/stk/stk_search/stk_search/IdentProc.hpp @@ -39,6 +39,8 @@ #include #include +#include + namespace stk { namespace search { template @@ -50,27 +52,26 @@ class IdentProc typedef IdentProc self_type; - IdentProc() + KOKKOS_FORCEINLINE_FUNCTION IdentProc() : m_value() {} - IdentProc( ident_type const& i , proc_type const& p ) + KOKKOS_FORCEINLINE_FUNCTION IdentProc( ident_type const& i , proc_type const& p ) : m_value(p,i) {} + KOKKOS_FORCEINLINE_FUNCTION ident_type const& id() const {return m_value.second; } + KOKKOS_FORCEINLINE_FUNCTION proc_type const& proc() const {return m_value.first; } - ident_type const& id() const {return m_value.second; } - proc_type const& proc() const {return m_value.first; } - - void set_id(ident_type const& x_id) { m_value.second = x_id; } - void set_proc(proc_type const& x_proc) { m_value.first = x_proc; } + KOKKOS_FORCEINLINE_FUNCTION void set_id(ident_type const& x_id) { m_value.second = x_id; } + KOKKOS_FORCEINLINE_FUNCTION void set_proc(proc_type const& x_proc) { m_value.first = x_proc; } - bool operator==(self_type const& rhs) const { return m_value == rhs.m_value; } - bool operator!=(self_type const& rhs) const { return m_value != rhs.m_value; } - bool operator< (self_type const& rhs) const { return m_value < rhs.m_value; } - bool operator> (self_type const& rhs) const { return m_value > rhs.m_value; } - bool operator<=(self_type const& rhs) const { return m_value <= rhs.m_value; } - bool operator>=(self_type const& rhs) const { return m_value >= rhs.m_value; } + KOKKOS_FORCEINLINE_FUNCTION bool operator==(self_type const& rhs) const { return m_value == rhs.m_value; } + KOKKOS_FORCEINLINE_FUNCTION bool operator!=(self_type const& rhs) const { return m_value != rhs.m_value; } + KOKKOS_FORCEINLINE_FUNCTION bool operator< (self_type const& rhs) const { return m_value < rhs.m_value; } + KOKKOS_FORCEINLINE_FUNCTION bool operator> (self_type const& rhs) const { return m_value > rhs.m_value; } + KOKKOS_FORCEINLINE_FUNCTION bool operator<=(self_type const& rhs) const { return m_value <= rhs.m_value; } + KOKKOS_FORCEINLINE_FUNCTION bool operator>=(self_type const& rhs) const { return m_value >= rhs.m_value; } friend std::ostream& operator<<(std::ostream& out, IdentProc const& ip) { @@ -79,16 +80,16 @@ class IdentProc } private: - std::pair m_value; + Kokkos::pair m_value; }; // If you have a modern compiler, some lack of semantic safety (intent) can be // caught at compilation time. - template struct get_proc { + KOKKOS_FORCEINLINE_FUNCTION int operator()(T const& id) const { std::cerr << "get_proc::operator()(..) called on unsupported type." << std::endl; @@ -96,10 +97,10 @@ struct get_proc return -1; } }; - template struct get_proc > { + KOKKOS_FORCEINLINE_FUNCTION int operator()(std::pair const& id) const { std::cerr << "get_proc::operator()(..) called on unsupported type." << std::endl; @@ -107,10 +108,10 @@ struct get_proc > return -1; } }; - template struct get_proc< stk::search::IdentProc > { + KOKKOS_FORCEINLINE_FUNCTION int operator()(stk::search::IdentProc const& id) const { return id.proc(); diff --git a/packages/stk/stk_search/stk_search/Plane.hpp b/packages/stk/stk_search/stk_search/Plane.hpp new file mode 100644 index 000000000000..f9fa2473462d --- /dev/null +++ b/packages/stk/stk_search/stk_search/Plane.hpp @@ -0,0 +1,134 @@ +// Copyright 2002 - 2008, 2010, 2011 National Technology Engineering +// Solutions of Sandia, LLC (NTESS). Under the terms of Contract +// DE-NA0003525 with NTESS, the U.S. Government retains certain rights +// in this software. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following +// disclaimer in the documentation and/or other materials provided +// with the distribution. +// +// * Neither the name of NTESS nor the names of its contributors +// may be used to endorse or promote products derived from this +// software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// + +#ifndef STK_SEARCH_PLANE_HPP +#define STK_SEARCH_PLANE_HPP + +#include +#include +#include + +namespace stk { namespace search { + +template +class Plane +{ +public: + typedef T value_type; + typedef Point point_type; + static const int Dim = 3; + + static KOKKOS_FUNCTION constexpr value_type max() { return Kokkos::Details::ArithTraits::max() ;} + + KOKKOS_FUNCTION point_type cross(const point_type& a, const point_type& b) const{ + return point_type(a[1]*b[2] - a[2]*b[1], + a[2]*b[0] - a[0]*b[2], + a[0]*b[1] - a[1]*b[0]); + } + + KOKKOS_FUNCTION void normalize(point_type& a) const{ + const value_type vec_len = Kokkos::Details::ArithTraits::sqrt(a[0] * a[0] + a[1] * a[1] + a[2] * a[2]); + const value_type denom = vec_len == 0.0 ? 1.0 : vec_len; + const value_type vec_len_inv = 1.0 / denom; + a[0] *= vec_len_inv; + a[1] *= vec_len_inv; + a[2] *= vec_len_inv; + } + + KOKKOS_FUNCTION value_type dot(const point_type& a, const point_type& b) const { + return (a[0] * b[0] + a[1] * b[1] + a[2] * b[2]); + } + + KOKKOS_FUNCTION value_type SignedDistance(const point_type& P) const { return dot(normal, P) - constant; } + + KOKKOS_FUNCTION + int WhichSide(const point_type& P) const { + value_type Distance = SignedDistance(P); + if (Distance < 0.0) { + return -1; + } else if (Distance > 0.0) { + return 1; + } else { // Distance == 0.0 + return 0; + } + } + + KOKKOS_FUNCTION Plane() : + normal(max()), + constant(max()) + { + } + + + KOKKOS_FUNCTION Plane( const point_type normal_, const value_type constant_) : + normal(normal_), + constant(constant_) + { + } + + KOKKOS_FUNCTION Plane( const point_type pointOnPlane, const point_type normal_) : + normal(normal_), + constant() + { + constant = dot(normal, pointOnPlane); + } + + KOKKOS_FUNCTION Plane( const point_type P0, const point_type P1, const point_type P2) : + normal(), + constant() + { + point_type Edge1 = P1 - P0; + point_type Edge2 = P2 - P0; + normal = cross(Edge1, Edge2); + normalize(normal); + constant = dot(normal, P0); + } + + KOKKOS_FUNCTION bool operator==(Plane const& b) const + { return normal == b.normal && constant == b.constant; } + + KOKKOS_FUNCTION bool operator!=(Plane const& b) const + { return !(*this == b); } + + KOKKOS_DEFAULTED_FUNCTION ~Plane() = default; + +private: + point_type normal; + value_type constant; +}; + +}} //namespace stk::search + +#endif //STK_SEARCH_Plane_HPP + diff --git a/packages/stk/stk_search/stk_search/Point.hpp b/packages/stk/stk_search/stk_search/Point.hpp index f3b8a94f8f9d..35e7a68c22ad 100644 --- a/packages/stk/stk_search/stk_search/Point.hpp +++ b/packages/stk/stk_search/stk_search/Point.hpp @@ -89,7 +89,7 @@ class Point KOKKOS_FUNCTION value_type get_z_max() const { return m_value[2]; } - KOKKOS_DEFAULTED_FUNCTION ~Point() = default; + KOKKOS_FUNCTION ~Point() = default; private: value_type m_value[Dim]; diff --git a/packages/stk/stk_search/stk_search/SearchMethod.hpp b/packages/stk/stk_search/stk_search/SearchMethod.hpp index 62e1cb2e840b..f007d0073556 100644 --- a/packages/stk/stk_search/stk_search/SearchMethod.hpp +++ b/packages/stk/stk_search/stk_search/SearchMethod.hpp @@ -38,10 +38,8 @@ namespace stk { namespace search { enum SearchMethod { - BOOST_RTREE, KDTREE, MORTON_LINEARIZED_BVH, // Coming soon! - USE_DEPRECATED_BOOST_RTREE }; }} diff --git a/packages/stk/stk_search/unit_tests/UnitTestBoundingBox.cpp b/packages/stk/stk_search/unit_tests/UnitTestBoundingBox.cpp index ffe746d13ab3..382a483379d0 100644 --- a/packages/stk/stk_search/unit_tests/UnitTestBoundingBox.cpp +++ b/packages/stk/stk_search/unit_tests/UnitTestBoundingBox.cpp @@ -36,6 +36,7 @@ #include #include +#include #include #include @@ -442,5 +443,57 @@ TEST( stk_search_bounding_box, read_box_as_written) { EXPECT_EQ(box, readBox2 ); } +TEST( stk_search_bounding_box, intersects_box_plane) +{ + typedef stk::search::Box Box; + typedef stk::search::Plane Plane; + using stk::search::intersects; + + Box unitBox(Point(-0.5, -0.5, -0.5), Point(0.5, 0.5, 0.5)); + + Plane nullPlane; + Plane wayLeft (Point(-2, 0.0, 0.0), Point(1.0, 0.0, 0.0)); + Plane wayRight (Point( 5, 0.0, 0.0), Point( 1.0, 0.0, 0.0)); + Plane inside (Point(0.15, 100.0, 0.0 ), Point(1.0, 0.0, 0.0)); + Plane inside2 (Point(0.15, 0.1, 0.0 ), Point(1.0, 0.0, 0.0)); + Plane justOutsideLeft (Point(-0.500001, 1, 1), Point(-1.0, 0.0, 0.0)); + Plane justOutsideRight (Point(0.500001, 1, 1), Point(-1.0, 0.0, 0.0)); + Plane justTouchingLeft (Point(-0.5, 100.0, -99), Point(-1.0, 0.0, 0.0)); + Plane justTouchingRight (Point(0.5, 1, 0.36), Point(1.0, 0.0, 0.0)); + Plane diagonallyOutside (Point(-0.530330, 0.530330, 0.000000), Point(-0.707107, 0.707107, 0.000000)); + Plane diagonallyInside (Point(-0.459619, 0.459619, 0.000000), Point(-0.707107, 0.707107, 0.000000)); + Plane cutCorner1 (Point( -0.325000, 0.459619, -0.325000), Point(-0.500000, 0.707107, -0.500000)); + Plane cutCorner2 (Point( -0.325000, 0.459619, 0.325000), Point(-0.500000, 0.707107, 0.500000)); + Plane cutCorner3 (Point( 0.325000, 0.459619, 0.325000), Point( 0.500000, 0.707107, 0.500000)); + Plane cutCorner4 (Point( 0.325000, 0.459619, -0.325000), Point( 0.500000, 0.707107, -0.500000)); + Plane cutCorner5 (Point( -0.459619, -0.325000, -0.325000), Point(-0.707107, -0.500000, -0.500000)); + Plane cutCorner6 (Point( -0.325000, -0.325000, 0.459619), Point(-0.500000, -0.500000, 0.707107)); + Plane cutCorner7 (Point( 0.459619, -0.325000, 0.325000), Point(0.707107, -0.500000, 0.500000)); + Plane cutCorner8 (Point( 0.325000, -0.325000, -0.459619), Point(0.500000, -0.500000, -0.707107)); + + + CheckIntersections(nullPlane, unitBox, false); + CheckIntersections(wayLeft, unitBox, false); + CheckIntersections(wayRight, unitBox, false); + CheckIntersections(inside, unitBox, true); + CheckIntersections(inside2, unitBox, true); + CheckIntersections(justOutsideLeft, unitBox, false); + CheckIntersections(justOutsideRight, unitBox, false); + CheckIntersections(justTouchingLeft, unitBox, true); + CheckIntersections(justTouchingRight,unitBox, true); + CheckIntersections(diagonallyOutside,unitBox, false); + CheckIntersections(diagonallyInside, unitBox, true); + CheckIntersections(cutCorner1, unitBox, true); + CheckIntersections(cutCorner2, unitBox, true); + CheckIntersections(cutCorner3, unitBox, true); + CheckIntersections(cutCorner4, unitBox, true); + CheckIntersections(cutCorner5, unitBox, true); + CheckIntersections(cutCorner6, unitBox, true); + CheckIntersections(cutCorner7, unitBox, true); + CheckIntersections(cutCorner8, unitBox, true); + +} + + } // unnamed namespace diff --git a/packages/stk/stk_search_util/Jamfile b/packages/stk/stk_search_util/Jamfile index 23af81ca235f..5d1343154a75 100644 --- a/packages/stk/stk_search_util/Jamfile +++ b/packages/stk/stk_search_util/Jamfile @@ -7,10 +7,6 @@ # a license from the United States Government. #-------------------------------------------------------------------- -# -# The signature for Boost.build rules is described here: -# -# http://www.boost.org/build/doc/html/bbv2/overview/targets.html # #function-name main-target-name # : sources diff --git a/packages/stk/stk_search_util/cmake/Dependencies.cmake b/packages/stk/stk_search_util/cmake/Dependencies.cmake index 32822f221deb..88fce8e6ab70 100644 --- a/packages/stk/stk_search_util/cmake/Dependencies.cmake +++ b/packages/stk/stk_search_util/cmake/Dependencies.cmake @@ -3,6 +3,6 @@ SET(LIB_OPTIONAL_DEP_PACKAGES) SET(TEST_REQUIRED_DEP_PACKAGES Gtest STKUnit_test_utils) SET(TEST_OPTIONAL_DEP_PACKAGES) SET(LIB_REQUIRED_DEP_TPLS) -SET(LIB_OPTIONAL_DEP_TPLS Boost) +SET(LIB_OPTIONAL_DEP_TPLS) SET(TEST_REQUIRED_DEP_TPLS) -SET(TEST_OPTIONAL_DEP_TPLS Boost) +SET(TEST_OPTIONAL_DEP_TPLS) diff --git a/packages/stk/stk_search_util/stk_search_util/PeriodicBoundarySearch.hpp b/packages/stk/stk_search_util/stk_search_util/PeriodicBoundarySearch.hpp index 8301058c1e7b..8557d73387e3 100644 --- a/packages/stk/stk_search_util/stk_search_util/PeriodicBoundarySearch.hpp +++ b/packages/stk/stk_search_util/stk_search_util/PeriodicBoundarySearch.hpp @@ -162,17 +162,6 @@ class PeriodicBoundarySearch // Default is identity transform. } -//#if defined(STK_HAVE_BOOST) -// TransformHelper(const boost::array & trans_arg) -// : m_transform_type(TRANSLATION) -// , m_translation(3,0) -// { -// m_translation[0] = trans_arg[0]; -// m_translation[1] = trans_arg[1]; -// m_translation[2] = trans_arg[2]; -// } -//#endif -// TransformHelper(double angle, const double axis[3]) : m_transform_type(ROTATIONAL) , m_translation(3,0) diff --git a/packages/stk/stk_simd/Jamfile b/packages/stk/stk_simd/Jamfile index ad73d14b8da3..759ba469d719 100644 --- a/packages/stk/stk_simd/Jamfile +++ b/packages/stk/stk_simd/Jamfile @@ -43,35 +43,12 @@ project votd $(sierra-warnings) STK_BUILT_IN_SIERRA $(stk_simd-root) - USE_STK_SIMD_AUTO STK_KOKKOS_SIMD STK_VOLATILE_SIMD - fat_x86:USE_STK_SIMD_SSE - generic_x86:USE_STK_SIMD_SSE - nehalem:USE_STK_SIMD_SSE - sandybridge:USE_STK_SIMD_AVX - haswell:USE_STK_SIMD_AVX - skylake:USE_STK_SIMD_AVX512 - knl:USE_STK_SIMD_AVX512 - cray,intel:USE_STK_SIMD_AUTO - cray,gcc:USE_STK_SIMD_NONE - - cray,cray:USE_STK_SIMD_NONE : usage-requirements $(stk_simd-root) - USE_STK_SIMD_AUTO STK_KOKKOS_SIMD STK_VOLATILE_SIMD - fat_x86:USE_STK_SIMD_SSE - generic_x86:USE_STK_SIMD_SSE - nehalem:USE_STK_SIMD_SSE - sandybridge:USE_STK_SIMD_AVX - haswell:USE_STK_SIMD_AVX - skylake:USE_STK_SIMD_AVX512 - knl:USE_STK_SIMD_AVX512 - cray,intel:USE_STK_SIMD_AUTO - cray,gcc:USE_STK_SIMD_NONE - cray,cray:USE_STK_SIMD_NONE : build-dir $(stk_simd-builddir) ; @@ -164,6 +141,7 @@ exe stk_simd_unit : [ glob $(stk_simd-root)/../stk_unit_tests/stk_simd/*.cpp ] /sierra/stk_math//stk_math_headers + /sierra/stk_unit_test_utils//stk_unit_test_utils /tpl/trilinos//kokkoscore /tpl/gtest//gtest : @sierra-exec-tag diff --git a/packages/stk/stk_simd/stk_simd/SimdConfig.hpp b/packages/stk/stk_simd/stk_simd/SimdConfig.hpp index dc1088b892a7..bb1ed36da9e0 100644 --- a/packages/stk/stk_simd/stk_simd/SimdConfig.hpp +++ b/packages/stk/stk_simd/stk_simd/SimdConfig.hpp @@ -61,7 +61,9 @@ #else // using cuda +#ifndef USE_STK_SIMD_NONE #define USE_STK_SIMD_NONE +#endif #endif @@ -107,6 +109,7 @@ # define STK_SIMD_AVX # elif defined(__SSE_23__) || defined(__SSE4_X__) || defined(__x86_64__) # define STK_SIMD_SSE +# elif defined(__ARM_NEON) || defined(__VSX__) # else # define STK_SIMD_NONE # endif @@ -126,8 +129,11 @@ #endif -//#undef STK_SIMD_SSE -//#undef STK_SIMD_AVX +#if defined (STK_KOKKOS_SIMD) +#undef STK_SIMD_SSE +#undef STK_SIMD_AVX +#undef STK_SIMD_AVX512 +#endif #endif // #ifndef CONFIG_STK_SIMD_H diff --git a/packages/stk/stk_simd/stk_simd/Traits.hpp b/packages/stk/stk_simd/stk_simd/Traits.hpp index 1de0d4ac9546..11c4d3283a9e 100644 --- a/packages/stk/stk_simd/stk_simd/Traits.hpp +++ b/packages/stk/stk_simd/stk_simd/Traits.hpp @@ -39,7 +39,7 @@ namespace stk { namespace { - + // length template @@ -69,6 +69,11 @@ struct BoolT { typedef simd::Bool type; }; +template <> +struct BoolT { + typedef bool type; +}; + template <> struct BoolT { typedef bool type; diff --git a/packages/stk/stk_simd/stk_simd/disimd/DISimd.hpp b/packages/stk/stk_simd/stk_simd/disimd/DISimd.hpp index a65631da5c96..402648eab3cb 100644 --- a/packages/stk/stk_simd/stk_simd/disimd/DISimd.hpp +++ b/packages/stk/stk_simd/stk_simd/disimd/DISimd.hpp @@ -39,8 +39,30 @@ //currently necessary to avoid the 'always_inline' defined in simd.hpp #define SIMD_ALWAYS_INLINE __attribute__((always_inline)) #endif + +#ifdef STK_SIMD_NONE +#define native native_junk +#define native_simd native_simd_junk +#endif + #include "./simd.hpp" +#ifdef STK_SIMD_NONE +#undef native +#undef native_simd + +namespace SIMD_NAMESPACE { + +namespace simd_abi { +using native = scalar; +} + +template +using native_simd = simd; + +} +#endif + namespace stk { namespace simd { constexpr int ndoubles = SIMD_NAMESPACE::simd::size(); diff --git a/packages/stk/stk_simd/stk_simd/disimd/DISimdBool.hpp b/packages/stk/stk_simd/stk_simd/disimd/DISimdBool.hpp index d1768bb4f780..03d0723b9208 100644 --- a/packages/stk/stk_simd/stk_simd/disimd/DISimdBool.hpp +++ b/packages/stk/stk_simd/stk_simd/disimd/DISimdBool.hpp @@ -64,8 +64,19 @@ class Bool { return *this; } +#if defined(__AVX512F__) && !defined(__CUDACC__) && !defined(STK_SIMD_NONE) + STK_MATH_FORCE_INLINE double operator[](int i) const { + __m512d tmp = _mm512_mask_blend_pd(_data.get(), _mm512_set1_pd(0.0), _mm512_set1_pd(1.0)); + return (reinterpret_cast(&tmp))[i]; + } +#elif defined(__CUDACC__) || defined(STK_SIMD_NONE) + STK_MATH_FORCE_INLINE double operator[](int i) const { + return _data.get() ? 1.0 : 0.0; + } +#else STK_MATH_FORCE_INLINE double& operator[](int i) {return (reinterpret_cast(&_data))[i];} STK_MATH_FORCE_INLINE const double& operator[](int i) const {return (reinterpret_cast(&_data))[i];} +#endif SIMD_NAMESPACE::simd_mask _data; // the "_" means you should try not to use this directly // it is made public to avoid function call overhead diff --git a/packages/stk/stk_simd/stk_simd/disimd/DISimdBoolF.hpp b/packages/stk/stk_simd/stk_simd/disimd/DISimdBoolF.hpp index 8dd866bb225e..a661ac67a8cc 100644 --- a/packages/stk/stk_simd/stk_simd/disimd/DISimdBoolF.hpp +++ b/packages/stk/stk_simd/stk_simd/disimd/DISimdBoolF.hpp @@ -64,8 +64,19 @@ class Boolf { return *this; } +#if defined(__AVX512F__) && !defined(__CUDACC__) && !defined(STK_SIMD_NONE) + STK_MATH_FORCE_INLINE float operator[](int i) const { + __m512 tmp = _mm512_mask_blend_ps(_data.get(), _mm512_set1_ps(0.0), _mm512_set1_ps(1.0)); + return (reinterpret_cast(&tmp))[i]; + } +#elif defined(__CUDACC__) || defined(STK_SIMD_NONE) + STK_MATH_FORCE_INLINE float operator[](int i) const { + return _data.get() ? 1.0f : 0.0f; + } +#else STK_MATH_FORCE_INLINE float& operator[](int i) {return (reinterpret_cast(&_data))[i];} STK_MATH_FORCE_INLINE const float& operator[](int i) const {return (reinterpret_cast(&_data))[i];} +#endif SIMD_NAMESPACE::simd_mask _data; // the "_" means you should try not to use this directly // it is made public to avoid function call overhead diff --git a/packages/stk/stk_simd/stk_simd/disimd/DISimdDoubleMath.hpp b/packages/stk/stk_simd/stk_simd/disimd/DISimdDoubleMath.hpp index 5439d3272eee..7096704706b8 100644 --- a/packages/stk/stk_simd/stk_simd/disimd/DISimdDoubleMath.hpp +++ b/packages/stk/stk_simd/stk_simd/disimd/DISimdDoubleMath.hpp @@ -117,7 +117,7 @@ STK_MATH_FORCE_INLINE simd::Double sqrt(const simd::Double& x) { } STK_MATH_FORCE_INLINE simd::Double cbrt(const simd::Double& x) { -#if defined(__INTEL_COMPILER) +#if defined(__INTEL_COMPILER) && !defined(STK_SIMD_NONE) return simd::Double(SIMD_NAMESPACE::cbrt(x._data)); #else simd::Double tmp; @@ -129,7 +129,7 @@ STK_MATH_FORCE_INLINE simd::Double cbrt(const simd::Double& x) { } STK_MATH_FORCE_INLINE simd::Double log(const simd::Double& x) { -#if defined(__INTEL_COMPILER) +#if defined(__INTEL_COMPILER) && !defined(STK_SIMD_NONE) return simd::Double(SIMD_NAMESPACE::log(x._data)); #else simd::Double tmp; @@ -149,7 +149,7 @@ STK_MATH_FORCE_INLINE simd::Double log10(const simd::Double& x) { } STK_MATH_FORCE_INLINE simd::Double exp(const simd::Double& x) { -#if defined(__INTEL_COMPILER) +#if defined(__INTEL_COMPILER) && !defined(STK_SIMD_NONE) return simd::Double(SIMD_NAMESPACE::exp(x._data)); #else simd::Double tmp; diff --git a/packages/stk/stk_simd/stk_simd/disimd/DISimdFloatMath.hpp b/packages/stk/stk_simd/stk_simd/disimd/DISimdFloatMath.hpp index 8b24d3aae2b8..5b91aca28347 100644 --- a/packages/stk/stk_simd/stk_simd/disimd/DISimdFloatMath.hpp +++ b/packages/stk/stk_simd/stk_simd/disimd/DISimdFloatMath.hpp @@ -117,7 +117,7 @@ STK_MATH_FORCE_INLINE simd::Float sqrt(const simd::Float& x) { } STK_MATH_FORCE_INLINE simd::Float cbrt(const simd::Float& x) { -#if defined(__INTEL_COMPILER) +#if defined(__INTEL_COMPILER) && !defined(STK_SIMD_NONE) return simd::Float(SIMD_NAMESPACE::cbrt(x._data)); #else simd::Float tmp; @@ -129,7 +129,7 @@ STK_MATH_FORCE_INLINE simd::Float cbrt(const simd::Float& x) { } STK_MATH_FORCE_INLINE simd::Float log(const simd::Float& x) { -#if defined(__INTEL_COMPILER) +#if defined(__INTEL_COMPILER) && !defined(STK_SIMD_NONE) return simd::Float(SIMD_NAMESPACE::log(x._data)); #else simd::Float tmp; @@ -149,7 +149,7 @@ STK_MATH_FORCE_INLINE simd::Float log10(const simd::Float& x) { } STK_MATH_FORCE_INLINE simd::Float exp(const simd::Float& x) { -#if defined(__INTEL_COMPILER) +#if defined(__INTEL_COMPILER) && !defined(STK_SIMD_NONE) return simd::Float(SIMD_NAMESPACE::exp(x._data)); #else simd::Float tmp; diff --git a/packages/stk/stk_tools/stk_tools/block_extractor/ExtractBlocks.cpp b/packages/stk/stk_tools/stk_tools/block_extractor/ExtractBlocks.cpp index 8e1719a1183b..300b90e6a3e6 100644 --- a/packages/stk/stk_tools/stk_tools/block_extractor/ExtractBlocks.cpp +++ b/packages/stk/stk_tools/stk_tools/block_extractor/ExtractBlocks.cpp @@ -34,46 +34,64 @@ void remove_io_attribute_from_empty_parts(stk::mesh::BulkData & bulk) } } -void extract_blocks_from_file(const std::string &inFile, - const std::string &outFile, - const std::vector &blockNames, - MPI_Comm comm) -{ - stk::mesh::MetaData inMeta; - stk::mesh::BulkData inBulk(inMeta, comm, stk::mesh::BulkData::AUTO_AURA -#ifdef SIERRA_MIGRATION - , false -#endif - , (stk::mesh::FieldDataManager*)nullptr); +std::vector GetEntityNamesFromIDs(const stk::mesh::BulkData & meshBulk, stk::topology::rank_t stkTop, const std::vector & theIDs) + { - stk::io::StkMeshIoBroker stkInput; - stk::io::fill_mesh_preexisting(stkInput, inFile, inBulk); + std::vector entity_names; + const stk::mesh::PartVector &parts = meshBulk.mesh_meta_data().get_mesh_parts(); + for (size_t IdIndex = 0; IdIndex < theIDs.size(); IdIndex++) + { + for(size_t i = 0; i < parts.size(); i++) + { - stk::mesh::MetaData outMeta; - stk::mesh::BulkData outBulk(outMeta, comm, stk::mesh::BulkData::AUTO_AURA -#ifdef SIERRA_MIGRATION - , false -#endif - , (stk::mesh::FieldDataManager*)nullptr); + if ( parts[i]->primary_entity_rank() == stkTop && parts[i]->id() == theIDs[IdIndex] ) + { + entity_names.push_back(parts[i]->name()); + } + } + } + return entity_names; + } +std::vector GetBlockNamesFromIDs(const stk::mesh::BulkData & meshBulk, const std::vector & block_ids) +{ + return (GetEntityNamesFromIDs( meshBulk, stk::topology::ELEMENT_RANK, block_ids)); +} - extract_blocks(inBulk, outBulk, blockNames); +std::vector find_nodeset_names_from_id(const stk::mesh::BulkData & meshBulk, const std::vector & nodeset_ids) +{ + return (GetEntityNamesFromIDs( meshBulk, stk::topology::NODE_RANK, nodeset_ids)); +} +void GetPartsByName(std::vector & parts, + const stk::mesh::BulkData& inBulk, + std::vector < std::string > names) +{ + for(size_t i = 0; i < names.size(); i++) + { + parts.push_back(inBulk.mesh_meta_data().get_part(names[i])); + ThrowRequireMsg(parts[i] != nullptr, "Can't find " << names[i] << " in mesh.\n"); + } +} - remove_io_attribute_from_empty_parts(outBulk); +stk::mesh::Selector GetBlockAndNodesetSelector(const stk::mesh::BulkData & inBulk, + const std::vector& nodesetNames, + const std::vector& blockNames) +{ - stk::io::StkMeshIoBroker stkOutput; - stkOutput.set_bulk_data(outBulk); - stkOutput.set_attribute_field_ordering_stored_by_part_ordinal(stkInput.get_attribute_field_ordering_stored_by_part_ordinal()); + stk::mesh::PartVector parts; + GetPartsByName(parts, inBulk, nodesetNames); + GetPartsByName(parts, inBulk, blockNames); + stk::mesh::Selector nodeset_and_block_selector = stk::mesh::selectUnion(parts); - stk::transfer_utils::TransientFieldTransferById transfer(stkInput, stkOutput); - transfer.transfer_and_write_transient_fields(outFile); + return nodeset_and_block_selector; } + void extract_blocks_and_ns_from_file(const std::string &inFile, const std::string &outFile, - const std::vector &blockNames, - const std::vector &nodesetNames, + const std::vector &blockIDs, + const std::vector &nodesetIDs, MPI_Comm comm) { stk::mesh::MetaData inMeta; @@ -93,26 +111,25 @@ void extract_blocks_and_ns_from_file(const std::string &inFile, stk::io::StkMeshIoBroker stkInput; stk::io::fill_mesh_preexisting(stkInput, inFile, inBulk); - stk::mesh::PartVector parts; - for(size_t i=0; i blockNames = GetBlockNamesFromIDs(inBulk, blockIDs); + + stk::mesh::Selector nodeset_and_block_selector = allSelector; + // if user asks for nodeset, use selector to output nodesets and blocks (this ensures we actually get the nodes associated with the nodesets + if (nodesetIDs.size() > 0) + { + std::vector < std::string > nodesetNames = find_nodeset_names_from_id(inBulk, nodesetIDs); + nodeset_and_block_selector = GetBlockAndNodesetSelector(inBulk, nodesetNames, blockNames); + stk::tools::copy_mesh(inBulk, allSelector, outBulk); + } + else // if user only asks for blocks, use extract_blocks, which completely deletes all other blocks and associated nodes + { + extract_blocks(inBulk, outBulk, blockNames); + remove_io_attribute_from_empty_parts(outBulk); + } stk::io::StkMeshIoBroker stkOutput; stkOutput.set_bulk_data(outBulk); @@ -138,4 +155,5 @@ void extract_blocks(stk::mesh::BulkData &oldBulk, stk::mesh::BulkData &newBulk, } } + } diff --git a/packages/stk/stk_tools/stk_tools/block_extractor/ExtractBlocks.hpp b/packages/stk/stk_tools/stk_tools/block_extractor/ExtractBlocks.hpp index 79dceaeff456..84bcd1159395 100644 --- a/packages/stk/stk_tools/stk_tools/block_extractor/ExtractBlocks.hpp +++ b/packages/stk/stk_tools/stk_tools/block_extractor/ExtractBlocks.hpp @@ -39,22 +39,34 @@ namespace stk { namespace mesh { class BulkData; } } +namespace stk { namespace mesh { class Part; } } +namespace stk { namespace mesh { class Selector; } } + namespace stk { namespace tools { -void extract_blocks_from_file(const std::string &inFile, - const std::string &outFile, - const std::vector &blockNames, - MPI_Comm comm); - void extract_blocks_and_ns_from_file(const std::string &inFile, const std::string &outFile, - const std::vector &blockNames, - const std::vector &nodesetNames, + const std::vector &blockIDs, + const std::vector &nodesetIDs, MPI_Comm comm); void extract_blocks(stk::mesh::BulkData &oldBulk, stk::mesh::BulkData &newBulk, const std::vector &blockNames); + + +std::vector GetBlockNamesFromIDs(const stk::mesh::BulkData & meshBulk, const std::vector & block_ids); + +std::vector find_nodeset_names_from_id(const stk::mesh::BulkData & meshBulk, const std::vector & nodeset_ids); + +void GetPartsByName(std::vector & parts, + const stk::mesh::BulkData& inBulk, + std::vector < std::string > names); + +stk::mesh::Selector GetBlockAndNodesetSelector(const stk::mesh::BulkData & inBulk, + const std::vector& nodesetNames, + const std::vector& blockNames); + } } diff --git a/packages/stk/stk_tools/stk_tools/block_extractor/ParseCsv.hpp b/packages/stk/stk_tools/stk_tools/block_extractor/ParseCsv.hpp index 6f9a3f4dc771..6341c2780eb2 100644 --- a/packages/stk/stk_tools/stk_tools/block_extractor/ParseCsv.hpp +++ b/packages/stk/stk_tools/stk_tools/block_extractor/ParseCsv.hpp @@ -38,46 +38,70 @@ #include #include #include +#include "stk_util/util/ReportHandler.hpp" namespace stk { namespace tools { std::string strip_string(const std::string &token) { - std::string tmp(token); - tmp.erase(0, tmp.find_first_not_of(" ")); - tmp.erase(tmp.find_last_not_of(" ")+1); - return tmp; + std::string tmp(token); + tmp.erase(0, tmp.find_first_not_of(" ")); + tmp.erase(tmp.find_last_not_of(" ")+1); + return tmp; +} + +std::vector split_string(const std::string &input, const char separator) +{ + std::vector separated; + std::istringstream iss(input); + std::string token; + while(std::getline(iss, token, separator)) + separated.push_back(strip_string(token)); + return separated; } std::vector get_csv(const std::string &input) { - std::vector separated; - std::istringstream iss(input); - std::string token; - while(std::getline(iss, token, ',')) - separated.push_back(strip_string(token)); - return separated; + return split_string(input, ','); } -std::vector get_block_names_given_ids(const std::vector &ids) +int string_to_integer(const std::string &input) { - std::vector names(ids.size()); - for(size_t i=0; i get_nodeset_names_given_ids(const std::vector &ids) + +std::vector get_ids_from_strings(const std::vector & input) { - std::vector names(ids.size()); - for(size_t i=0; i ids; + for (const std::string & inputString : input) + { + const std::vector splitInput = split_string(inputString, ':'); + ThrowRequireMsg((splitInput.size() > 0) && (splitInput.size() <= 3), + "Incorrect number of fields for range (" << inputString << "). Syntax is first:last:stride"); + + const int first = string_to_integer(splitInput[0]); + const int last = (splitInput.size() > 1) ? string_to_integer(splitInput[1]) : first; + const int stride = (splitInput.size() > 2) ? string_to_integer(splitInput[2]) : 1; + + ThrowRequireMsg((first > 0) && (last > 0) && (stride > 0) && (last >= first), + "Invalid integers provided for range (" << inputString << "). Syntax is first:last:stride"); + + for (int i = first; i <= last; i += stride) { + ids.push_back(i); } - return names; + } + return ids; } }} diff --git a/packages/stk/stk_tools/stk_tools/block_extractor/main.cpp b/packages/stk/stk_tools/stk_tools/block_extractor/main.cpp index 405e92036940..2c5d452a2dc8 100644 --- a/packages/stk/stk_tools/stk_tools/block_extractor/main.cpp +++ b/packages/stk/stk_tools/stk_tools/block_extractor/main.cpp @@ -6,8 +6,18 @@ #include #include #include +#include #include "ExtractBlocks.hpp" +void print_ids_to_extract(const std::string & idType, const std::vector & ids) +{ + std::cout << "Extracting " << idType << ":"; + for (int id : ids) { + std::cout << " " << id; + } + std::cout << std::endl; +} + int main(int argc, const char**argv) { MPI_Init(&argc, const_cast(&argv)); @@ -16,38 +26,35 @@ int main(int argc, const char**argv) stk::CommandLineParserParallel commandLine(comm); commandLine.add_required({"infile", "i", "input file"}); commandLine.add_required({"outfile", "o", "output file"}); - commandLine.add_optional({"extract-blocks", "b", "Comma-separated list of blocks to extract"},{}); - commandLine.add_optional({"extract-nodesets","n","Comma-separated list of nodesets to extract"},{}); + commandLine.add_optional({"extract-blocks", "b", "Comma-separated list of block IDs or ID ranges of the " + "form first:last:stride. (Example: \"1,10:15,20:30:2,100\")"},{}); + commandLine.add_optional({"extract-nodesets","n","Comma-separated list of nodeset IDs or ID ranges"},{}); stk::CommandLineParser::ParseState state = commandLine.parse(argc, argv); - stk::parallel::require(state == stk::CommandLineParser::ParseComplete, commandLine.get_usage(), comm); + ThrowRequireMsg(state == stk::CommandLineParser::ParseComplete, commandLine.get_usage()); std::string inFile = commandLine.get_option_value("infile"); std::string outFile = commandLine.get_option_value("outfile"); + std::string csvBlocks; if (commandLine.is_option_provided("extract-blocks")) { csvBlocks = commandLine.get_option_value("extract-blocks"); } - std::vector blockNames = stk::tools::get_block_names_given_ids(stk::tools::get_csv(csvBlocks)); + std::vector block_ids = stk::tools::get_ids_from_strings(stk::tools::get_csv(csvBlocks)); std::string csvNodesets; if (commandLine.is_option_provided("extract-nodesets")) { csvNodesets = commandLine.get_option_value("extract-nodesets"); } - std::vector nodesetNames = stk::tools::get_nodeset_names_given_ids(stk::tools::get_csv(csvNodesets)); + std::vector nodeset_ids = stk::tools::get_ids_from_strings(stk::tools::get_csv(csvNodesets)); - if (nodesetNames.empty()) - { - std::cout << "No nodesets specified, extracting only desired blocks" << "\n"; - stk::tools::extract_blocks_from_file(inFile, outFile, blockNames, comm); + print_ids_to_extract("blocks", block_ids); + if (!nodeset_ids.empty()) { + print_ids_to_extract("nodesets", nodeset_ids); } - else - { - std::cout << "Nodesets specified, extracting combination of blocks and nodesets" << "\n"; - stk::tools::extract_blocks_and_ns_from_file(inFile,outFile,blockNames, nodesetNames, comm); - } + stk::tools::extract_blocks_and_ns_from_file(inFile, outFile, block_ids, nodeset_ids, comm); MPI_Finalize(); return 0; diff --git a/packages/stk/stk_tools/stk_tools/mesh_tools/DisconnectBlocksImpl.hpp b/packages/stk/stk_tools/stk_tools/mesh_tools/DisconnectBlocksImpl.hpp index b7db4464d1b4..1fe47dee2b9d 100644 --- a/packages/stk/stk_tools/stk_tools/mesh_tools/DisconnectBlocksImpl.hpp +++ b/packages/stk/stk_tools/stk_tools/mesh_tools/DisconnectBlocksImpl.hpp @@ -193,7 +193,7 @@ bool is_block(const stk::mesh::BulkData & bulk, stk::mesh::Part & part); stk::mesh::Part* get_block_part_for_element(const stk::mesh::BulkData & bulk, stk::mesh::Entity element); -unsigned get_block_id_for_element(const stk::mesh::BulkData & bulk, stk::mesh::Entity element); +int get_block_id_for_element(const stk::mesh::BulkData & bulk, stk::mesh::Entity element); void add_to_sharing_lookup(const stk::mesh::BulkData& bulk, stk::mesh::Entity node, PreservedSharingInfo& info); diff --git a/packages/stk/stk_tools/stk_tools/mesh_tools/DisconnectUtils.cpp b/packages/stk/stk_tools/stk_tools/mesh_tools/DisconnectUtils.cpp index 7a2fd80b4491..413e3dd7c75f 100644 --- a/packages/stk/stk_tools/stk_tools/mesh_tools/DisconnectUtils.cpp +++ b/packages/stk/stk_tools/stk_tools/mesh_tools/DisconnectUtils.cpp @@ -62,7 +62,7 @@ stk::mesh::Part* get_block_part_for_element(const stk::mesh::BulkData & bulk, st return nullptr; } -unsigned get_block_id_for_element(const stk::mesh::BulkData & bulk, stk::mesh::Entity element) +int get_block_id_for_element(const stk::mesh::BulkData & bulk, stk::mesh::Entity element) { const stk::mesh::PartVector & elementParts = bulk.bucket(element).supersets(); for (stk::mesh::Part * part : elementParts) { diff --git a/packages/stk/stk_tools/stk_tools/mesh_tools/DisconnectUtils.hpp b/packages/stk/stk_tools/stk_tools/mesh_tools/DisconnectUtils.hpp index e5fdb11ce366..343ce7031e5c 100644 --- a/packages/stk/stk_tools/stk_tools/mesh_tools/DisconnectUtils.hpp +++ b/packages/stk/stk_tools/stk_tools/mesh_tools/DisconnectUtils.hpp @@ -63,7 +63,7 @@ bool is_block(const stk::mesh::BulkData & bulk, stk::mesh::Part & part); stk::mesh::Part* get_block_part_for_element(const stk::mesh::BulkData & bulk, stk::mesh::Entity element); -unsigned get_block_id_for_element(const stk::mesh::BulkData & bulk, stk::mesh::Entity element); +int get_block_id_for_element(const stk::mesh::BulkData & bulk, stk::mesh::Entity element); void fill_block_membership(const stk::mesh::BulkData& bulk, stk::mesh::Entity node, stk::mesh::PartVector& members); diff --git a/packages/stk/stk_topology/stk_topology/apply_functor.hpp b/packages/stk/stk_topology/stk_topology/apply_functor.hpp index 982b23e9f97c..e3e4476c1908 100644 --- a/packages/stk/stk_topology/stk_topology/apply_functor.hpp +++ b/packages/stk/stk_topology/stk_topology/apply_functor.hpp @@ -78,6 +78,7 @@ struct topology::apply_host_functor case TRI_4: return m_functor( topology_type< TRI_4 >() ); case TRI_6: return m_functor( topology_type< TRI_6 >() ); case QUAD_4: return m_functor( topology_type< QUAD_4 >() ); + case QUAD_6: return m_functor( topology_type< QUAD_6 >() ); case QUAD_8: return m_functor( topology_type< QUAD_8 >() ); case QUAD_9: return m_functor( topology_type< QUAD_9 >() ); case PARTICLE: return m_functor( topology_type< PARTICLE >() ); @@ -109,6 +110,7 @@ struct topology::apply_host_functor case PYRAMID_13: return m_functor( topology_type< PYRAMID_13 >() ); case PYRAMID_14: return m_functor( topology_type< PYRAMID_14 >() ); case WEDGE_6: return m_functor( topology_type< WEDGE_6 >() ); + case WEDGE_12: return m_functor( topology_type< WEDGE_12 >() ); case WEDGE_15: return m_functor( topology_type< WEDGE_15 >() ); case WEDGE_18: return m_functor( topology_type< WEDGE_18 >() ); case HEX_8: return m_functor( topology_type< HEX_8 >() ); @@ -131,6 +133,7 @@ struct topology::apply_host_functor case TRI_4: return m_functor( topology_type< TRI_4 >() ); case TRI_6: return m_functor( topology_type< TRI_6 >() ); case QUAD_4: return m_functor( topology_type< QUAD_4 >() ); + case QUAD_6: return m_functor( topology_type< QUAD_6 >() ); case QUAD_8: return m_functor( topology_type< QUAD_8 >() ); case QUAD_9: return m_functor( topology_type< QUAD_9 >() ); case PARTICLE: return m_functor( topology_type< PARTICLE >() ); @@ -162,6 +165,7 @@ struct topology::apply_host_functor case PYRAMID_13: return m_functor( topology_type< PYRAMID_13 >() ); case PYRAMID_14: return m_functor( topology_type< PYRAMID_14 >() ); case WEDGE_6: return m_functor( topology_type< WEDGE_6 >() ); + case WEDGE_12: return m_functor( topology_type< WEDGE_12 >() ); case WEDGE_15: return m_functor( topology_type< WEDGE_15 >() ); case WEDGE_18: return m_functor( topology_type< WEDGE_18 >() ); case HEX_8: return m_functor( topology_type< HEX_8 >() ); @@ -203,6 +207,7 @@ struct topology::apply_functor case TRI_4: return m_functor( topology_type< TRI_4 >() ); case TRI_6: return m_functor( topology_type< TRI_6 >() ); case QUAD_4: return m_functor( topology_type< QUAD_4 >() ); + case QUAD_6: return m_functor( topology_type< QUAD_6 >() ); case QUAD_8: return m_functor( topology_type< QUAD_8 >() ); case QUAD_9: return m_functor( topology_type< QUAD_9 >() ); case PARTICLE: return m_functor( topology_type< PARTICLE >() ); @@ -234,6 +239,7 @@ struct topology::apply_functor case PYRAMID_13: return m_functor( topology_type< PYRAMID_13 >() ); case PYRAMID_14: return m_functor( topology_type< PYRAMID_14 >() ); case WEDGE_6: return m_functor( topology_type< WEDGE_6 >() ); + case WEDGE_12: return m_functor( topology_type< WEDGE_12 >() ); case WEDGE_15: return m_functor( topology_type< WEDGE_15 >() ); case WEDGE_18: return m_functor( topology_type< WEDGE_18 >() ); case HEX_8: return m_functor( topology_type< HEX_8 >() ); @@ -257,6 +263,7 @@ struct topology::apply_functor case TRI_4: return m_functor( topology_type< TRI_4 >() ); case TRI_6: return m_functor( topology_type< TRI_6 >() ); case QUAD_4: return m_functor( topology_type< QUAD_4 >() ); + case QUAD_6: return m_functor( topology_type< QUAD_6 >() ); case QUAD_8: return m_functor( topology_type< QUAD_8 >() ); case QUAD_9: return m_functor( topology_type< QUAD_9 >() ); case PARTICLE: return m_functor( topology_type< PARTICLE >() ); @@ -288,6 +295,7 @@ struct topology::apply_functor case PYRAMID_13: return m_functor( topology_type< PYRAMID_13 >() ); case PYRAMID_14: return m_functor( topology_type< PYRAMID_14 >() ); case WEDGE_6: return m_functor( topology_type< WEDGE_6 >() ); + case WEDGE_12: return m_functor( topology_type< WEDGE_12 >() ); case WEDGE_15: return m_functor( topology_type< WEDGE_15 >() ); case WEDGE_18: return m_functor( topology_type< WEDGE_18 >() ); case HEX_8: return m_functor( topology_type< HEX_8 >() ); diff --git a/packages/stk/stk_topology/stk_topology/topology.cpp b/packages/stk/stk_topology/stk_topology/topology.cpp index 911d1d32f45c..d9c494b19036 100644 --- a/packages/stk/stk_topology/stk_topology/topology.cpp +++ b/packages/stk/stk_topology/stk_topology/topology.cpp @@ -74,6 +74,7 @@ const char * topology::char_name() const case TRI_4: return "TRIANGLE_4"; case TRI_6: return "TRIANGLE_6"; case QUAD_4: return "QUADRILATERAL_4"; + case QUAD_6: return "QUADRILATERAL_6"; case QUAD_8: return "QUADRILATERAL_8"; case QUAD_9: return "QUADRILATERAL_9"; case PARTICLE: return "PARTICLE"; @@ -105,6 +106,7 @@ const char * topology::char_name() const case PYRAMID_13: return "PYRAMID_13"; case PYRAMID_14: return "PYRAMID_14"; case WEDGE_6: return "WEDGE_6"; + case WEDGE_12: return "WEDGE_12"; case WEDGE_15: return "WEDGE_15"; case WEDGE_18: return "WEDGE_18"; case HEX_8: return "HEXAHEDRON_8"; @@ -168,7 +170,7 @@ bool isHexahedronElement (topology topo) bool is_quad_side(topology topo) { - return ((topo == topology::QUAD_4) || (topo == topology::QUAD_8) || (topo == topology::QUAD_9)); + return ((topo == topology::QUAD_4) || (topo == topology::QUAD_6) || (topo == topology::QUAD_8) || (topo == topology::QUAD_9)); } bool is_tri_side(topology topo) @@ -199,11 +201,12 @@ void verbose_print_topology(std::ostream &out, topology t) out << t.defined_on_spatial_dimension(i) << ", "; out << "\b\b " << std::endl; - out << std::setw(shiftwidth) << "num edges: " << t.num_edges() << std::endl; - if (t.num_edges() > 0) { - const unsigned num_edge_nodes = t.edge_topology().num_nodes(); - out << std::setw(shiftwidth) << t.edge_topology() << std::endl; - for (unsigned i=0, e=t.num_edges(); i 0) { + for (unsigned i=0; i 0) { - for (unsigned i=0, e=t.num_faces(); i 0) { + for (unsigned i=0; i 0) { - for (unsigned i=0, e=t.num_positive_permutations(); i 0) { + for (unsigned i=0; i +STK_INLINE_FUNCTION +constexpr typename std::enable_if::type +edge_topology_() +{ + return Topology::edge_topology_vector[EdgeOrdinal]; +} + +template +STK_INLINE_FUNCTION +constexpr typename std::enable_if= Topology::num_edges, topology::topology_t>::type +edge_topology_() +{ + return topology::INVALID_TOPOLOGY; +} //------------------------------------------------------------------------------ diff --git a/packages/stk/stk_topology/stk_topology/topology_detail/topology_data.cpp b/packages/stk/stk_topology/stk_topology/topology_detail/topology_data.cpp index bb6db4912f06..feefd5c638ac 100644 --- a/packages/stk/stk_topology/stk_topology/topology_detail/topology_data.cpp +++ b/packages/stk/stk_topology/stk_topology/topology_detail/topology_data.cpp @@ -68,6 +68,30 @@ constexpr bool topology_data::spatial_dimension_vect constexpr bool topology_data::spatial_dimension_vector[]; constexpr bool topology_data::spatial_dimension_vector[]; +constexpr topology::topology_t topology_data::edge_topology_vector[]; +constexpr topology::topology_t topology_data::edge_topology_vector[]; +constexpr topology::topology_t topology_data::edge_topology_vector[]; +constexpr topology::topology_t topology_data::edge_topology_vector[]; +constexpr topology::topology_t topology_data::edge_topology_vector[]; +constexpr topology::topology_t topology_data::edge_topology_vector[]; +constexpr topology::topology_t topology_data::edge_topology_vector[]; +constexpr topology::topology_t topology_data::edge_topology_vector[]; +constexpr topology::topology_t topology_data::edge_topology_vector[]; +constexpr topology::topology_t topology_data::edge_topology_vector[]; +constexpr topology::topology_t topology_data::edge_topology_vector[]; +constexpr topology::topology_t topology_data::edge_topology_vector[]; +constexpr topology::topology_t topology_data::edge_topology_vector[]; +constexpr topology::topology_t topology_data::edge_topology_vector[]; +constexpr topology::topology_t topology_data::edge_topology_vector[]; +constexpr topology::topology_t topology_data::edge_topology_vector[]; +constexpr topology::topology_t topology_data::edge_topology_vector[]; +constexpr topology::topology_t topology_data::edge_topology_vector[]; +constexpr topology::topology_t topology_data::edge_topology_vector[]; +constexpr topology::topology_t topology_data::edge_topology_vector[]; +constexpr topology::topology_t topology_data::edge_topology_vector[]; +constexpr topology::topology_t topology_data::edge_topology_vector[]; +constexpr topology::topology_t topology_data::edge_topology_vector[]; + constexpr topology::topology_t topology_data::face_topology_vector[]; constexpr topology::topology_t topology_data::face_topology_vector[]; constexpr topology::topology_t topology_data::face_topology_vector[]; @@ -87,6 +111,7 @@ constexpr topology::topology_t topology_data::face_t constexpr topology::topology_t topology_data::face_topology_vector[]; constexpr topology::topology_t topology_data::face_topology_vector[]; constexpr topology::topology_t topology_data::face_topology_vector[]; +constexpr topology::topology_t topology_data::face_topology_vector[]; constexpr topology::topology_t topology_data::face_topology_vector[]; constexpr topology::topology_t topology_data::face_topology_vector[]; constexpr topology::topology_t topology_data::face_topology_vector[]; @@ -112,6 +137,7 @@ constexpr unsigned topology_data::face_node_ordinals constexpr unsigned topology_data::face_node_ordinals_offsets[]; constexpr unsigned topology_data::face_node_ordinals_offsets[]; constexpr unsigned topology_data::face_node_ordinals_offsets[]; +constexpr unsigned topology_data::face_node_ordinals_offsets[]; constexpr unsigned topology_data::face_node_ordinals_offsets[]; constexpr unsigned topology_data::face_node_ordinals_offsets[]; constexpr unsigned topology_data::face_node_ordinals_offsets[]; @@ -137,6 +163,7 @@ constexpr unsigned topology_data::face_node_ordinals constexpr unsigned topology_data::face_node_ordinals_vector[]; constexpr unsigned topology_data::face_node_ordinals_vector[]; constexpr unsigned topology_data::face_node_ordinals_vector[]; +constexpr unsigned topology_data::face_node_ordinals_vector[]; constexpr unsigned topology_data::face_node_ordinals_vector[]; constexpr unsigned topology_data::face_node_ordinals_vector[]; constexpr unsigned topology_data::face_node_ordinals_vector[]; @@ -149,6 +176,7 @@ constexpr unsigned topology_data::edge_node_ordinals constexpr unsigned topology_data::edge_node_ordinals_offsets[]; constexpr unsigned topology_data::edge_node_ordinals_offsets[]; constexpr unsigned topology_data::edge_node_ordinals_offsets[]; +constexpr unsigned topology_data::edge_node_ordinals_offsets[]; constexpr unsigned topology_data::edge_node_ordinals_offsets[]; constexpr unsigned topology_data::edge_node_ordinals_offsets[]; constexpr unsigned topology_data::edge_node_ordinals_offsets[]; @@ -160,6 +188,7 @@ constexpr unsigned topology_data::edge_node_ordinals constexpr unsigned topology_data::edge_node_ordinals_offsets[]; constexpr unsigned topology_data::edge_node_ordinals_offsets[]; constexpr unsigned topology_data::edge_node_ordinals_offsets[]; +constexpr unsigned topology_data::edge_node_ordinals_offsets[]; constexpr unsigned topology_data::edge_node_ordinals_offsets[]; constexpr unsigned topology_data::edge_node_ordinals_offsets[]; constexpr unsigned topology_data::edge_node_ordinals_offsets[]; @@ -170,6 +199,7 @@ constexpr unsigned topology_data::edge_node_ordinals constexpr unsigned topology_data::edge_node_ordinals_vector[]; constexpr unsigned topology_data::edge_node_ordinals_vector[]; constexpr unsigned topology_data::edge_node_ordinals_vector[]; +constexpr unsigned topology_data::edge_node_ordinals_vector[]; constexpr unsigned topology_data::edge_node_ordinals_vector[]; constexpr unsigned topology_data::edge_node_ordinals_vector[]; constexpr unsigned topology_data::edge_node_ordinals_vector[]; @@ -181,6 +211,7 @@ constexpr unsigned topology_data::edge_node_ordinals constexpr unsigned topology_data::edge_node_ordinals_vector[]; constexpr unsigned topology_data::edge_node_ordinals_vector[]; constexpr unsigned topology_data::edge_node_ordinals_vector[]; +constexpr unsigned topology_data::edge_node_ordinals_vector[]; constexpr unsigned topology_data::edge_node_ordinals_vector[]; constexpr unsigned topology_data::edge_node_ordinals_vector[]; constexpr unsigned topology_data::edge_node_ordinals_vector[]; @@ -193,6 +224,7 @@ constexpr unsigned topology_data::permutation_node_o constexpr unsigned topology_data::permutation_node_ordinals_vector[]; constexpr unsigned topology_data::permutation_node_ordinals_vector[]; constexpr unsigned topology_data::permutation_node_ordinals_vector[]; +constexpr unsigned topology_data::permutation_node_ordinals_vector[]; constexpr unsigned topology_data::permutation_node_ordinals_vector[]; constexpr unsigned topology_data::permutation_node_ordinals_vector[]; constexpr unsigned topology_data::permutation_node_ordinals_vector[]; @@ -204,6 +236,7 @@ constexpr unsigned topology_data::permutation_node_o constexpr unsigned topology_data::permutation_node_ordinals_vector[]; constexpr unsigned topology_data::permutation_node_ordinals_vector[]; constexpr unsigned topology_data::permutation_node_ordinals_vector[]; +constexpr unsigned topology_data::permutation_node_ordinals_vector[]; constexpr unsigned topology_data::permutation_node_ordinals_vector[]; constexpr unsigned topology_data::permutation_node_ordinals_vector[]; constexpr unsigned topology_data::permutation_node_ordinals_vector[]; diff --git a/packages/stk/stk_topology/stk_topology/topology_detail/topology_data.hpp b/packages/stk/stk_topology/stk_topology/topology_detail/topology_data.hpp index 40fdf11c15ad..0661fa9b5f0d 100644 --- a/packages/stk/stk_topology/stk_topology/topology_detail/topology_data.hpp +++ b/packages/stk/stk_topology/stk_topology/topology_detail/topology_data.hpp @@ -62,7 +62,7 @@ struct topology_data static constexpr bool is_valid = false; static constexpr topology::rank_t rank = topology::INVALID_RANK; static constexpr topology::rank_t side_rank = topology::INVALID_RANK; - static constexpr topology::topology_t edge_topology = topology::INVALID_TOPOLOGY; + static constexpr topology::topology_t edge_topology_vector[] = {topology::INVALID_TOPOLOGY}; static constexpr bool has_homogeneous_faces = false; static constexpr bool is_shell = false; static constexpr unsigned dimension = 0; @@ -104,7 +104,7 @@ struct topology_data static constexpr bool is_valid = true; static constexpr topology::rank_t rank = topology::NODE_RANK; static constexpr topology::rank_t side_rank = topology::INVALID_RANK; - static constexpr topology::topology_t edge_topology = topology::INVALID_TOPOLOGY; + static constexpr topology::topology_t edge_topology_vector[] = {topology::INVALID_TOPOLOGY}; static constexpr bool has_homogeneous_faces = false; static constexpr bool is_shell = false; static constexpr unsigned dimension = 0; @@ -148,7 +148,7 @@ struct topology_data static constexpr bool is_valid = true; static constexpr topology::rank_t rank = topology::ELEMENT_RANK; static constexpr topology::rank_t side_rank = topology::INVALID_RANK; - static constexpr topology::topology_t edge_topology = topology::INVALID_TOPOLOGY; + static constexpr topology::topology_t edge_topology_vector[] = {topology::INVALID_TOPOLOGY}; static constexpr bool has_homogeneous_faces = false; static constexpr bool is_shell = false; static constexpr unsigned dimension = 1; @@ -196,7 +196,7 @@ struct topology_data static constexpr bool is_valid = true; static constexpr topology::rank_t rank = topology::EDGE_RANK; static constexpr topology::rank_t side_rank = topology::NODE_RANK; - static constexpr topology::topology_t edge_topology = topology::INVALID_TOPOLOGY; + static constexpr topology::topology_t edge_topology_vector[] = {topology::INVALID_TOPOLOGY}; static constexpr bool has_homogeneous_faces = false; static constexpr bool is_shell = false; static constexpr unsigned dimension = 1; @@ -293,7 +293,7 @@ struct topology_data static constexpr topology::rank_t rank = topology::ELEMENT_RANK; static constexpr topology::rank_t side_rank = topology::EDGE_RANK; - static constexpr topology::topology_t edge_topology = topology::LINE_2; + static constexpr topology::topology_t edge_topology_vector[] = {topology::LINE_2}; static constexpr bool is_shell = false; static constexpr unsigned dimension = 2; @@ -312,7 +312,7 @@ struct topology_data static constexpr topology::rank_t rank = topology::ELEMENT_RANK; static constexpr topology::rank_t side_rank = topology::EDGE_RANK; - static constexpr topology::topology_t edge_topology = topology::LINE_3; + static constexpr topology::topology_t edge_topology_vector[] = {topology::LINE_3}; static constexpr bool is_shell = false; static constexpr unsigned dimension = 2; @@ -344,7 +344,8 @@ struct topology_data static constexpr topology::rank_t rank = topology::ELEMENT_RANK; static constexpr topology::rank_t side_rank = topology::EDGE_RANK; - static constexpr topology::topology_t edge_topology = topology::LINE_2; + static constexpr topology::topology_t edge_topology_vector[] = {topology::LINE_2, + topology::LINE_2}; static constexpr bool is_shell = true; static constexpr unsigned dimension = 2; @@ -369,7 +370,8 @@ struct topology_data static constexpr topology::rank_t rank = topology::ELEMENT_RANK; static constexpr topology::rank_t side_rank = topology::EDGE_RANK; - static constexpr topology::topology_t edge_topology = topology::LINE_3; + static constexpr topology::topology_t edge_topology_vector[] = {topology::LINE_3, + topology::LINE_3}; static constexpr bool is_shell = true; static constexpr unsigned dimension = 2; @@ -405,7 +407,7 @@ struct topology_data static constexpr bool is_valid = true; static constexpr topology::rank_t rank = topology::ELEMENT_RANK; static constexpr topology::rank_t side_rank = topology::NODE_RANK; - static constexpr topology::topology_t edge_topology = topology::INVALID_TOPOLOGY; + static constexpr topology::topology_t edge_topology_vector[] = {topology::INVALID_TOPOLOGY}; static constexpr bool has_homogeneous_faces = false; static constexpr bool is_shell = false; static constexpr unsigned dimension = 2; @@ -434,7 +436,7 @@ struct topology_data static constexpr bool is_valid = true; static constexpr topology::rank_t rank = topology::ELEMENT_RANK; static constexpr topology::rank_t side_rank = topology::NODE_RANK; - static constexpr topology::topology_t edge_topology = topology::INVALID_TOPOLOGY; + static constexpr topology::topology_t edge_topology_vector[] = {topology::INVALID_TOPOLOGY}; static constexpr bool has_homogeneous_faces = false; static constexpr bool is_shell = false; static constexpr unsigned dimension = 2; @@ -500,7 +502,9 @@ struct topology_data static constexpr bool is_valid = true; static constexpr topology::rank_t rank = topology::FACE_RANK; static constexpr topology::rank_t side_rank = topology::EDGE_RANK; - static constexpr topology::topology_t edge_topology = topology::LINE_2; + static constexpr topology::topology_t edge_topology_vector[] = {topology::LINE_2, + topology::LINE_2, + topology::LINE_2}; static constexpr bool has_homogeneous_faces = false; static constexpr bool is_shell = false; static constexpr unsigned dimension = 2; @@ -556,7 +560,9 @@ struct topology_data static constexpr topology::topology_t value = topology::TRI_6; static constexpr unsigned num_nodes = 6; - static constexpr topology::topology_t edge_topology = topology::LINE_3; + static constexpr topology::topology_t edge_topology_vector[] = {topology::LINE_3, + topology::LINE_3, + topology::LINE_3}; static constexpr unsigned edge_node_ordinals_offsets[] = {0, 3, 6, 9}; static constexpr unsigned edge_node_ordinals_vector[] = {0, 1, 3, @@ -772,6 +778,8 @@ struct topology_data // topology::QUADRILATERAL -- topology::FACE_RANK // defined on spatial dimension 3d // 4, 8, or 9 nodes with 4 edges +// for quad_6, extra node is on edge0 and edge2, so that node5 is labeled node6 +// in diagram below // // Edge #2 // @@ -802,7 +810,10 @@ struct topology_data static constexpr bool is_valid = true; static constexpr topology::rank_t rank = topology::FACE_RANK; static constexpr topology::rank_t side_rank = topology::EDGE_RANK; - static constexpr topology::topology_t edge_topology = topology::LINE_2; + static constexpr topology::topology_t edge_topology_vector[] = {topology::LINE_2, + topology::LINE_2, + topology::LINE_2, + topology::LINE_2}; static constexpr bool has_homogeneous_faces = false; static constexpr bool is_shell = false; static constexpr unsigned dimension = 2; @@ -839,6 +850,37 @@ struct topology_data 1, 0, 3, 2}; }; +template <> +struct topology_data + : public topology_data +{ + static constexpr topology::topology_t value = topology::QUAD_6; + static constexpr topology::rank_t rank = topology::FACE_RANK; + static constexpr unsigned num_nodes = 6; + + static constexpr topology::topology_t edge_topology_vector[] = {topology::LINE_3, + topology::LINE_2, + topology::LINE_3, + topology::LINE_2}; + + static constexpr unsigned edge_node_ordinals_offsets[] = {0, 3, 5, 8, 10}; + static constexpr unsigned edge_node_ordinals_vector[] = { 0, 1, 4, + 1, 2, + 2, 3, 5, + 3, 0 }; + + static constexpr unsigned permutation_node_ordinals_vector[] = { + 0, 1, 2, 3, 4, 5, + 3, 0, 1, 2, 4, 5, + 2, 3, 0, 1, 5, 4, + 1, 2, 3, 0, 5, 4, + 0, 3, 2, 1, 5, 4, + 3, 2, 1, 0, 5, 4, + 2, 1, 0, 3, 4, 5, + 1, 0, 3, 2, 4, 5 + }; +}; + template <> struct topology_data : public topology_data @@ -846,7 +888,10 @@ struct topology_data static constexpr topology::topology_t value = topology::QUAD_8; static constexpr unsigned num_nodes = 8; - static constexpr topology::topology_t edge_topology = topology::LINE_3; + static constexpr topology::topology_t edge_topology_vector[] = {topology::LINE_3, + topology::LINE_3, + topology::LINE_3, + topology::LINE_3}; static constexpr unsigned edge_node_ordinals_offsets[] = {0, 3, 6, 9, 12}; static constexpr unsigned edge_node_ordinals_vector[] = {0, 1, 4, @@ -1063,7 +1108,12 @@ struct topology_data static constexpr bool is_valid = true; static constexpr topology::rank_t rank = topology::ELEMENT_RANK; static constexpr topology::rank_t side_rank = topology::FACE_RANK; - static constexpr topology::topology_t edge_topology = topology::LINE_2; + static constexpr topology::topology_t edge_topology_vector[] = {topology::LINE_2, + topology::LINE_2, + topology::LINE_2, + topology::LINE_2, + topology::LINE_2, + topology::LINE_2}; static constexpr bool has_homogeneous_faces = true; static constexpr bool is_shell = false; static constexpr unsigned dimension = 3; @@ -1144,7 +1194,12 @@ struct topology_data static constexpr topology::topology_t value = topology::TET_10; static constexpr unsigned num_nodes = 10; - static constexpr topology::topology_t edge_topology = topology::LINE_3; + static constexpr topology::topology_t edge_topology_vector[] = {topology::LINE_3, + topology::LINE_3, + topology::LINE_3, + topology::LINE_3, + topology::LINE_3, + topology::LINE_3}; static constexpr topology::topology_t face_topology_vector[] = {topology::TRI_6, topology::TRI_6, @@ -1218,7 +1273,14 @@ struct topology_data static constexpr bool is_valid = true; static constexpr topology::rank_t rank = topology::ELEMENT_RANK; static constexpr topology::rank_t side_rank = topology::FACE_RANK; - static constexpr topology::topology_t edge_topology = topology::LINE_2; + static constexpr topology::topology_t edge_topology_vector[] = {topology::LINE_2, + topology::LINE_2, + topology::LINE_2, + topology::LINE_2, + topology::LINE_2, + topology::LINE_2, + topology::LINE_2, + topology::LINE_2,}; static constexpr bool has_homogeneous_faces = false; static constexpr bool is_shell = false; static constexpr unsigned dimension = 3; @@ -1270,7 +1332,15 @@ struct topology_data static constexpr topology::topology_t value = topology::PYRAMID_13; static constexpr unsigned num_nodes = 13; - static constexpr topology::topology_t edge_topology = topology::LINE_3; + static constexpr topology::topology_t edge_topology_vector[] = {topology::LINE_3, + topology::LINE_3, + topology::LINE_3, + topology::LINE_3, + topology::LINE_3, + topology::LINE_3, + topology::LINE_3, + topology::LINE_3}; + static constexpr topology::topology_t face_topology_vector[] = {topology::TRI_6, topology::TRI_6, @@ -1346,7 +1416,15 @@ struct topology_data static constexpr bool is_valid = true; static constexpr topology::rank_t rank = topology::ELEMENT_RANK; static constexpr topology::rank_t side_rank = topology::FACE_RANK; - static constexpr topology::topology_t edge_topology = topology::LINE_2; + static constexpr topology::topology_t edge_topology_vector[] = {topology::LINE_2, + topology::LINE_2, + topology::LINE_2, + topology::LINE_2, + topology::LINE_2, + topology::LINE_2, + topology::LINE_2, + topology::LINE_2, + topology::LINE_2}; static constexpr bool has_homogeneous_faces = false; static constexpr bool is_shell = false; static constexpr unsigned dimension = 3; @@ -1394,6 +1472,58 @@ struct topology_data 4, 3, 5, 1, 0, 2}; }; +template <> +struct topology_data + : public topology_data +{ + static constexpr topology::topology_t value = topology::WEDGE_12; + static constexpr unsigned num_nodes = 12; + + static constexpr topology::topology_t edge_topology_vector[] = {topology::LINE_3, + topology::LINE_3, + topology::LINE_3, + topology::LINE_3, + topology::LINE_3, + topology::LINE_3, + topology::LINE_2, + topology::LINE_2, + topology::LINE_2}; + + + static constexpr topology::topology_t face_topology_vector[] = {topology::QUAD_6, + topology::QUAD_6, + topology::QUAD_6, + topology::TRI_6, + topology::TRI_6}; + + static constexpr unsigned edge_node_ordinals_offsets[] = {0, 3, 6, 9, 12, 15, 18, 20, 22, 24}; + static constexpr unsigned edge_node_ordinals_vector[] = {0, 1, 6, + 1, 2, 7, + 2, 0, 8, + 3, 4, 9, + 4, 5, 10, + 5, 3, 11, + 0, 3, + 1, 4, + 2, 5}; + + static constexpr unsigned face_node_ordinals_offsets[] = {0, 6, 12, 18, 24, 30}; + static constexpr unsigned face_node_ordinals_vector[] = {0, 1, 4, 3, 6, 9, + 1, 2, 5, 4, 7, 10, + 0, 3, 5, 2, 8, 11, + 0, 2, 1, 8, 7, 6, + 3, 4, 5, 9, 10, 11}; + + static constexpr unsigned permutation_node_ordinals_vector[] = { + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, + 1, 2, 0, 4, 5, 3, 7, 8, 6, 10, 11, 9, + 2, 0, 1, 5, 3, 4, 8, 6, 7, 11, 9, 10, + 3, 5, 4, 0, 2, 1, 9, 11, 10, 8, 7, 6, + 5, 4, 3, 2, 1, 0, 11, 10, 9, 7, 6, 8, + 4, 3, 5, 1, 0, 2, 10, 9, 11, 6, 8, 7 + }; +}; + template <> struct topology_data : public topology_data @@ -1401,7 +1531,16 @@ struct topology_data static constexpr topology::topology_t value = topology::WEDGE_15; static constexpr unsigned num_nodes = 15; - static constexpr topology::topology_t edge_topology = topology::LINE_3; + static constexpr topology::topology_t edge_topology_vector[] = {topology::LINE_3, + topology::LINE_3, + topology::LINE_3, + topology::LINE_3, + topology::LINE_3, + topology::LINE_3, + topology::LINE_3, + topology::LINE_3, + topology::LINE_3}; + static constexpr topology::topology_t face_topology_vector[] = {topology::QUAD_8, topology::QUAD_8, @@ -1556,7 +1695,19 @@ struct topology_data static constexpr bool is_valid = true; static constexpr topology::rank_t rank = topology::ELEMENT_RANK; static constexpr topology::rank_t side_rank = topology::FACE_RANK; - static constexpr topology::topology_t edge_topology = topology::LINE_2; + static constexpr topology::topology_t edge_topology_vector[] = {topology::LINE_2, + topology::LINE_2, + topology::LINE_2, + topology::LINE_2, + topology::LINE_2, + topology::LINE_2, + topology::LINE_2, + topology::LINE_2, + topology::LINE_2, + topology::LINE_2, + topology::LINE_2, + topology::LINE_2}; + static constexpr bool has_homogeneous_faces = true; static constexpr bool is_shell = false; static constexpr unsigned dimension = 3; @@ -1636,7 +1787,18 @@ struct topology_data static constexpr unsigned num_permutations = 24; static constexpr unsigned num_positive_permutations = 24; - static constexpr topology::topology_t edge_topology = topology::LINE_3; + static constexpr topology::topology_t edge_topology_vector[] = {topology::LINE_3, + topology::LINE_3, + topology::LINE_3, + topology::LINE_3, + topology::LINE_3, + topology::LINE_3, + topology::LINE_3, + topology::LINE_3, + topology::LINE_3, + topology::LINE_3, + topology::LINE_3, + topology::LINE_3}; static constexpr topology::topology_t face_topology_vector[] = {topology::QUAD_8, topology::QUAD_8, diff --git a/packages/stk/stk_topology/stk_topology/topology_type.hpp b/packages/stk/stk_topology/stk_topology/topology_type.hpp index 6e792a46c2fb..3ba6583c4d7b 100644 --- a/packages/stk/stk_topology/stk_topology/topology_type.hpp +++ b/packages/stk/stk_topology/stk_topology/topology_type.hpp @@ -64,7 +64,6 @@ struct topology::topology_type static const bool is_valid = data::is_valid; static const rank_t rank = data::rank; static const rank_t side_rank = data::side_rank; - static const topology_t edge_topology = data::edge_topology; static const bool has_homogeneous_faces = data::has_homogeneous_faces; static const bool is_shell = data::is_shell; static const unsigned dimension = data::dimension; @@ -97,6 +96,30 @@ struct topology::topology_type return false; } + /// the topology of the edge at the given ordinal + STK_FUNCTION + static topology edge_topology(unsigned edge_ordinal = 0) + { + switch (edge_ordinal) + { + case 0: return topology_detail::edge_topology_(); + case 1: return topology_detail::edge_topology_(); + case 2: return topology_detail::edge_topology_(); + case 3: return topology_detail::edge_topology_(); + case 4: return topology_detail::edge_topology_(); + case 5: return topology_detail::edge_topology_(); + case 6: return topology_detail::edge_topology_(); + case 7: return topology_detail::edge_topology_(); + case 8: return topology_detail::edge_topology_(); + case 9: return topology_detail::edge_topology_(); + case 10: return topology_detail::edge_topology_(); + case 11: return topology_detail::edge_topology_(); + default: break; + } + + return INVALID_TOPOLOGY; + } + /// the topology of the face at the given ordinal STK_FUNCTION static topology face_topology(unsigned face_ordinal = 0) diff --git a/packages/stk/stk_topology/stk_topology/topology_utils.hpp b/packages/stk/stk_topology/stk_topology/topology_utils.hpp index 0dbcd55d25b6..137341272b2f 100644 --- a/packages/stk/stk_topology/stk_topology/topology_utils.hpp +++ b/packages/stk/stk_topology/stk_topology/topology_utils.hpp @@ -36,6 +36,7 @@ #define STKTOPOLOGY_TOPOLOGY_TCC // IWYU pragma: private, include "stk_topology/topology.hpp" +#include "stk_util/util/ReportHandler.hpp" namespace stk { namespace topology_detail { @@ -189,9 +190,16 @@ struct base_impl { struct edge_topology_impl { using result_type = stk::topology; + STK_INLINE_FUNCTION + edge_topology_impl(unsigned ordinal = 0) + : m_ordinal(ordinal) + {} + template STK_INLINE_FUNCTION - result_type operator()(Topology) const { return Topology::edge_topology; } + result_type operator()(Topology) const { return Topology::edge_topology(m_ordinal); } + + unsigned m_ordinal; }; struct defined_on_spatial_dimension_impl { @@ -470,6 +478,14 @@ stk::topology topology::edge_topology() const { return apply(m_value); } +STK_INLINE_FUNCTION +stk::topology topology::edge_topology(unsigned ordinal) const { + using functor = topology_detail::edge_topology_impl; + functor f(ordinal); + topology::apply_functor< functor > apply( f ); + return apply(m_value); +} + STK_INLINE_FUNCTION bool topology::defined_on_spatial_dimension(unsigned ordinal) const { using functor = topology_detail::defined_on_spatial_dimension_impl; @@ -510,6 +526,7 @@ template STK_INLINE_FUNCTION void topology::permutation_node_ordinals( unsigned ordinal, OrdinalOutputIterator output_ordinals) const { + NGP_ThrowAssert(m_value != QUAD_6 && m_value != WEDGE_12); using functor = topology_detail::permutation_node_ordinals_impl; functor f(ordinal, output_ordinals); topology::apply_functor< functor > apply( f ); diff --git a/packages/stk/stk_topology/stk_topology/types.hpp b/packages/stk/stk_topology/stk_topology/types.hpp index 529771e191c1..a7ac89e49a2e 100644 --- a/packages/stk/stk_topology/stk_topology/types.hpp +++ b/packages/stk/stk_topology/stk_topology/types.hpp @@ -48,6 +48,7 @@ struct topology::types { typedef topology_type tri_4; typedef topology_type tri_6; typedef topology_type quad_4; + typedef topology_type quad_6; typedef topology_type quad_8; typedef topology_type quad_9; typedef topology_type particle; diff --git a/packages/stk/stk_transfer/Jamfile b/packages/stk/stk_transfer/Jamfile index 5fa8cbb4d060..b428efcc5335 100644 --- a/packages/stk/stk_transfer/Jamfile +++ b/packages/stk/stk_transfer/Jamfile @@ -61,6 +61,7 @@ local installed-end-user-files = # Note that if the --install-developer-files option is passed to bjam these will also # be installed for end-users. (This is only intended to be used for testing.) local installed-developer-files = + stk_transfer_integration_tests stk_transfer_utest ; @@ -162,6 +163,18 @@ lib stk_transfer_impl ] ; +exe stk_transfer_integration_tests + : + [ glob + $(stk_transfer-root)/../stk_integration_tests/stk_transfer/*.cpp + ] + /sierra/stk_unit_test_utils//stk_unit_main + /sierra/stk_mesh//stk_mesh_base + stk_transfer_impl + : @sierra-exec-tag + $(stk_transfer-root-inc) + ; + exe stk_transfer_utest : [ glob diff --git a/packages/stk/stk_transfer/stk_transfer/GeometricTransferImpl.hpp b/packages/stk/stk_transfer/stk_transfer/GeometricTransferImpl.hpp index dcb46c444145..7b8fd4976784 100644 --- a/packages/stk/stk_transfer/stk_transfer/GeometricTransferImpl.hpp +++ b/packages/stk/stk_transfer/stk_transfer/GeometricTransferImpl.hpp @@ -13,6 +13,8 @@ #include #include #include +#include +#include namespace stk { namespace transfer { @@ -122,10 +124,10 @@ void call_copy_entities(T & ... t) } template -void print_expansion_warnings(stk::ParallelMachine shared_comm, int not_empty_count, size_t range_vector_size) { +void print_expansion_warnings(stk::ParallelMachine comm, int not_empty_count, size_t range_vector_size) { // sum and provide message to user size_t g_range_vector_size = 0; - stk::all_reduce_max( shared_comm, &range_vector_size, &g_range_vector_size, 1); + stk::all_reduce_max( comm, &range_vector_size, &g_range_vector_size, 1); sierra::Env::outputP0() << "GeometricTransfer::coarse_search(): Number of points not found: " << g_range_vector_size << " after expanding bounding boxes: " << not_empty_count << " time(s)" << std::endl; sierra::Env::outputP0() << "...will now expand the set of candidate bounding boxes and re-attempt the coarse search" << std::endl; @@ -133,7 +135,7 @@ void print_expansion_warnings(stk::ParallelMachine shared_comm, int not_empty_co template void coarse_search_impl(typename INTERPOLATE::EntityProcRelationVec &range_to_domain, - stk::ParallelMachine shared_comm, + stk::ParallelMachine comm, const typename INTERPOLATE::MeshA * mesha, const typename INTERPOLATE::MeshB * meshb, const stk::search::SearchMethod search_method, @@ -146,6 +148,12 @@ void coarse_search_impl(typename INTERPOLATE::EntityProcRelationVec &range_to_ if (mesha) mesha->bounding_boxes(domain_vector); + + const bool domainVectorEmpty = stk::is_true_on_all_procs(comm, domain_vector.empty()); + if (domainVectorEmpty) { + return; + } + if (meshb) meshb->bounding_boxes(range_vector); @@ -157,15 +165,14 @@ void coarse_search_impl(typename INTERPOLATE::EntityProcRelationVec &range_to_ // check track of how many times the coarse search needs to exercise the expanstion_factor int not_empty_count = 0; - unsigned range_vector_not_empty = !range_vector.empty(); - stk::all_reduce( shared_comm, stk::ReduceSum<1>(&range_vector_not_empty)); - while (range_vector_not_empty) { // Keep going until all range points are processed. + bool range_vector_empty = stk::is_true_on_all_procs(comm, range_vector.empty()); + while (!range_vector_empty) { // Keep going until all range points are processed. // Slightly confusing: coarse_search documentation has domain->range // relations sorted by domain key. We want range->domain type relations // sorted on range key. It might appear we have the arguments revered // in coarse_search call, but really, this is what we want. typename INTERPOLATE::EntityProcRelationVec rng_to_dom; - search::coarse_search(range_vector, domain_vector, search_method, shared_comm, rng_to_dom); + search::coarse_search(range_vector, domain_vector, search_method, comm, rng_to_dom); // increment how many times we are within the while loop not_empty_count++; @@ -175,14 +182,13 @@ void coarse_search_impl(typename INTERPOLATE::EntityProcRelationVec &range_to_ impl::delete_range_points_found(range_vector, rng_to_dom); - range_vector_not_empty = !range_vector.empty(); - stk::all_reduce( shared_comm, stk::ReduceSum<1>(&range_vector_not_empty)); + range_vector_empty = stk::is_true_on_all_procs(comm, range_vector.empty()); if (expansion_factor <= 1.0) { - if (range_vector_not_empty) { + if (!range_vector_empty) { size_t range_vector_size = range_vector.size(); size_t g_range_vector_size = 0; - stk::all_reduce_max( shared_comm, &range_vector_size, &g_range_vector_size, 1); + stk::all_reduce_max( comm, &range_vector_size, &g_range_vector_size, 1); sierra::Env::outputP0() << "GeometricTransfer::coarse_search(): Number of points not found: " << g_range_vector_size << " in initial coarse search" << std::endl; @@ -191,17 +197,17 @@ void coarse_search_impl(typename INTERPOLATE::EntityProcRelationVec &range_to_ break; } - if (range_vector_not_empty) { - for (typename std::vector::iterator i=range_vector.begin(); i!=range_vector.end(); ++i) { + if (!range_vector_empty) { + for (BoundingBoxB& rangeBox : range_vector) { // If points were missed, increase search radius. - search::scale_by(i->first, expansion_factor); + search::scale_by(rangeBox.first, expansion_factor); } // If points were missed, increase search radius; extract the number of these points and tell the user - for (typename std::vector::iterator i=domain_vector.begin(); i!=domain_vector.end(); ++i) { - search::scale_by(i->first, expansion_factor); + for (BoundingBoxA& domainBox : domain_vector) { + search::scale_by(domainBox.first, expansion_factor); } - print_expansion_warnings(shared_comm, not_empty_count, range_vector.size()); + print_expansion_warnings(comm, not_empty_count, range_vector.size()); } } sort (range_to_domain.begin(), range_to_domain.end()); diff --git a/packages/stk/stk_unit_test_utils/stk_unit_test_utils/BulkDataTester.hpp b/packages/stk/stk_unit_test_utils/stk_unit_test_utils/BulkDataTester.hpp index c3c7dec69996..96bd24e25d2f 100644 --- a/packages/stk/stk_unit_test_utils/stk_unit_test_utils/BulkDataTester.hpp +++ b/packages/stk/stk_unit_test_utils/stk_unit_test_utils/BulkDataTester.hpp @@ -232,7 +232,7 @@ class BulkDataTester : public stk::mesh::BulkData void my_internal_resolve_shared_modify_delete() { stk::mesh::EntityVector entitiesNoLongerShared; - this->internal_resolve_shared_modify_delete(entitiesNoLongerShared); + this->m_meshModification.internal_resolve_shared_modify_delete(entitiesNoLongerShared); } void my_internal_resolve_ghosted_modify_delete() diff --git a/packages/stk/stk_unit_test_utils/stk_unit_test_utils/FaceCreationTestUtils.hpp b/packages/stk/stk_unit_test_utils/stk_unit_test_utils/FaceCreationTestUtils.hpp index 9caf9eb1cbaf..fc04707aab40 100644 --- a/packages/stk/stk_unit_test_utils/stk_unit_test_utils/FaceCreationTestUtils.hpp +++ b/packages/stk/stk_unit_test_utils/stk_unit_test_utils/FaceCreationTestUtils.hpp @@ -55,21 +55,21 @@ inline bool can_find_face_for_elem_side(const stk::mesh::BulkData& bulkData, stk return iter != bulkData.end_ordinals(element, sideRank); } -inline void expect_side_exists_for_elem_side(const stk::mesh::BulkData& bulkData, const std::string &filename, const Side& side) +inline void expect_side_exists_for_elem_side(const stk::mesh::BulkData& bulkData, const std::string &meshDescription, const Side& side) { stk::mesh::Entity element = bulkData.get_entity(stk::topology::ELEM_RANK, side.elementId); if(bulkData.is_valid(element) && bulkData.bucket(element).owned()) { - EXPECT_TRUE(can_find_face_for_elem_side(bulkData, element, side.sideOrdinal)) << filename << " couldn't find face for side: " << side.elementId << ", " << side.sideOrdinal << "."; + EXPECT_TRUE(can_find_face_for_elem_side(bulkData, element, side.sideOrdinal)) << meshDescription << " couldn't find face for side: " << side.elementId << ", " << side.sideOrdinal << "."; } } inline void expect_all_sides_exist_for_elem_side(const stk::mesh::BulkData& bulkData, - const std::string& filename, + const std::string& meshDescription, const std::vector &sideSet) { for(const Side &side : sideSet) - expect_side_exists_for_elem_side(bulkData, filename, side); + expect_side_exists_for_elem_side(bulkData, meshDescription, side); } diff --git a/packages/stk/stk_unit_test_utils/stk_unit_test_utils/FaceTestingUtils.cpp b/packages/stk/stk_unit_test_utils/stk_unit_test_utils/FaceTestingUtils.cpp index 65372c7b8280..f66bd2cc7ef4 100644 --- a/packages/stk/stk_unit_test_utils/stk_unit_test_utils/FaceTestingUtils.cpp +++ b/packages/stk/stk_unit_test_utils/stk_unit_test_utils/FaceTestingUtils.cpp @@ -43,7 +43,7 @@ #include #include #include -#include +#include #include #include #include @@ -91,7 +91,7 @@ bool is_face_fully_connected(const stk::mesh::BulkData& mesh, stk::mesh::MeshInd bool fully_connected_elements_to_faces(const stk::mesh::BulkData& bulk) { bool fully_connected = true; - stk::mesh::impl::for_each_entity_run(bulk, stk::topology::ELEMENT_RANK, + stk::mesh::for_each_entity_run(bulk, stk::topology::ELEMENT_RANK, [&fully_connected](const stk::mesh::BulkData& mesh, const stk::mesh::MeshIndex& meshIndex) { fully_connected &= is_face_fully_connected(mesh,meshIndex); @@ -138,7 +138,7 @@ bool is_face_shared_between_different_elements(const stk::mesh::BulkData& mesh, unsigned count_shared_faces_between_different_elements(const stk::mesh::BulkData& bulk) { unsigned shared_face_count = 0; - stk::mesh::impl::for_each_entity_run(bulk, stk::topology::FACE_RANK, + stk::mesh::for_each_entity_run(bulk, stk::topology::FACE_RANK, [&shared_face_count](const stk::mesh::BulkData& mesh, const stk::mesh::MeshIndex& meshIndex) { if (is_face_shared_between_different_elements(mesh,stk::mesh::impl::get_entity(meshIndex))) @@ -186,7 +186,7 @@ bool is_face_shared_between_same_element(const stk::mesh::BulkData& mesh, stk::m unsigned count_shared_faces_between_same_element(const stk::mesh::BulkData& bulk) { unsigned shared_face_count = 0; - stk::mesh::impl::for_each_entity_run(bulk, stk::topology::FACE_RANK, + stk::mesh::for_each_entity_run(bulk, stk::topology::FACE_RANK, [&shared_face_count](const stk::mesh::BulkData& mesh, const stk::mesh::MeshIndex& meshIndex) { stk::mesh::Entity face = stk::mesh::impl::get_entity(meshIndex); @@ -241,7 +241,7 @@ bool is_face_at_x_equal_half(const stk::mesh::BulkData& mesh, stk::mesh::Entity stk::mesh::EntityVector get_faces_at_x_equal_half(const stk::mesh::BulkData& bulk) { stk::mesh::EntityVector faces_at_x_equal_half; - stk::mesh::impl::for_each_entity_run(bulk, stk::topology::FACE_RANK, + stk::mesh::for_each_entity_run(bulk, stk::topology::FACE_RANK, [&faces_at_x_equal_half](const stk::mesh::BulkData& mesh, const stk::mesh::MeshIndex& meshIndex) { if (is_face_at_x_equal_half(mesh,stk::mesh::impl::get_entity(meshIndex))) diff --git a/packages/stk/stk_unit_test_utils/stk_unit_test_utils/PerformanceTester.hpp b/packages/stk/stk_unit_test_utils/stk_unit_test_utils/PerformanceTester.hpp index c243aba43269..706c77183319 100644 --- a/packages/stk/stk_unit_test_utils/stk_unit_test_utils/PerformanceTester.hpp +++ b/packages/stk/stk_unit_test_utils/stk_unit_test_utils/PerformanceTester.hpp @@ -37,6 +37,8 @@ #include #include #include +#include +#include namespace stk { diff --git a/packages/stk/stk_unit_test_utils/stk_unit_test_utils/PrintType.hpp b/packages/stk/stk_unit_test_utils/stk_unit_test_utils/PrintType.hpp new file mode 100644 index 000000000000..c7dd6d7b6f5c --- /dev/null +++ b/packages/stk/stk_unit_test_utils/stk_unit_test_utils/PrintType.hpp @@ -0,0 +1,51 @@ +// Copyright 2002 - 2008, 2010, 2011 National Technology Engineering +// Solutions of Sandia, LLC (NTESS). Under the terms of Contract +// DE-NA0003525 with NTESS, the U.S. Government retains certain rights +// in this software. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following +// disclaimer in the documentation and/or other materials provided +// with the distribution. +// +// * Neither the name of NTESS nor the names of its contributors +// may be used to endorse or promote products derived from this +// software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +#ifdef __GNUG__ +#include +#endif + +namespace stk { +namespace unit_test_util { + +template +void print_type(T& t) +{ +#ifdef __GNUG__ + std::cout << abi::__cxa_demangle(typeid(t).name(), NULL, NULL, NULL) << std::endl; +#else + std::cout << typeid(t).name() << std::endl; +#endif +} + +} } diff --git a/packages/stk/stk_unit_test_utils/stk_unit_test_utils/TextMesh.cpp b/packages/stk/stk_unit_test_utils/stk_unit_test_utils/TextMesh.cpp index 9b4c34cd4a06..c08b645407a3 100644 --- a/packages/stk/stk_unit_test_utils/stk_unit_test_utils/TextMesh.cpp +++ b/packages/stk/stk_unit_test_utils/stk_unit_test_utils/TextMesh.cpp @@ -57,6 +57,7 @@ class TopologyMapping { "TRI_4" , stk::topology::TRI_4 }, { "TRI_6" , stk::topology::TRI_6 }, { "QUAD_4" , stk::topology::QUAD_4 }, + { "QUAD_6" , stk::topology::QUAD_6 }, { "QUAD_8" , stk::topology::QUAD_8 }, { "QUAD_9" , stk::topology::QUAD_9 }, { "PARTICLE" , stk::topology::PARTICLE }, @@ -88,6 +89,7 @@ class TopologyMapping { "PYRAMID_13" , stk::topology::PYRAMID_13 }, { "PYRAMID_14" , stk::topology::PYRAMID_14 }, { "WEDGE_6" , stk::topology::WEDGE_6 }, + { "WEDGE_12" , stk::topology::WEDGE_12 }, { "WEDGE_15" , stk::topology::WEDGE_15 }, { "WEDGE_18" , stk::topology::WEDGE_18 }, { "HEX_8" , stk::topology::HEX_8 }, diff --git a/packages/stk/stk_unit_test_utils/stk_unit_test_utils/unit_main_lib/UnitTestMain.cpp b/packages/stk/stk_unit_test_utils/stk_unit_test_utils/unit_main_lib/UnitTestMain.cpp index 0ad35c994905..863abfcccb49 100644 --- a/packages/stk/stk_unit_test_utils/stk_unit_test_utils/unit_main_lib/UnitTestMain.cpp +++ b/packages/stk/stk_unit_test_utils/stk_unit_test_utils/unit_main_lib/UnitTestMain.cpp @@ -46,8 +46,11 @@ char** gl_argv = 0; int main(int argc, char **argv) { - stk::parallel_machine_init(&argc, &argv); + stk::parallel_machine_init(&argc, &argv); + int returnVal = -1; + + { #ifdef STK_HAVE_STKNGP_TEST ngp_testing::NgpTestEnvironment testEnv(&argc, argv); #else @@ -63,12 +66,14 @@ int main(int argc, char **argv) #endif #ifdef STK_HAVE_STKNGP_TEST - int returnVal = testEnv.run_all_tests(); + returnVal = testEnv.run_all_tests(); + testEnv.finalize(); #else - int returnVal = RUN_ALL_TESTS(); + returnVal = RUN_ALL_TESTS(); #endif + } - stk::parallel_machine_finalize(); + stk::parallel_machine_finalize(); - return returnVal; + return returnVal; } diff --git a/packages/stk/stk_unit_tests/cmake/Dependencies.cmake b/packages/stk/stk_unit_tests/cmake/Dependencies.cmake index b61e21bbaa23..c3c943ba702e 100644 --- a/packages/stk/stk_unit_tests/cmake/Dependencies.cmake +++ b/packages/stk/stk_unit_tests/cmake/Dependencies.cmake @@ -1,5 +1,5 @@ SET(LIB_REQUIRED_DEP_PACKAGES Gtest) -SET(LIB_OPTIONAL_DEP_PACKAGES STKNGP_TEST Shards STKTopology STKUtil STKMath STKSimd STKMesh STKNGP STKIO STKUnit_test_utils STKBalance STKTransfer STKSearch STKTools) +SET(LIB_OPTIONAL_DEP_PACKAGES STKNGP_TEST Shards STKTopology STKUtil STKMath STKSimd STKMesh STKIO STKUnit_test_utils STKBalance STKTransfer STKSearch STKTools) SET(TEST_REQUIRED_DEP_PACKAGES) SET(TEST_OPTIONAL_DEP_PACKAGES) SET(LIB_REQUIRED_DEP_TPLS Boost) diff --git a/packages/stk/stk_unit_tests/stk_balance/UnitTestBalanceSettings.cpp b/packages/stk/stk_unit_tests/stk_balance/UnitTestBalanceSettings.cpp new file mode 100644 index 000000000000..e9ecdf0b16c2 --- /dev/null +++ b/packages/stk/stk_unit_tests/stk_balance/UnitTestBalanceSettings.cpp @@ -0,0 +1,169 @@ +// Copyright 2002 - 2008, 2010, 2011 National Technology Engineering +// Solutions of Sandia, LLC (NTESS). Under the terms of Contract +// DE-NA0003525 with NTESS, the U.S. Government retains certain rights +// in this software. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following +// disclaimer in the documentation and/or other materials provided +// with the distribution. +// +// * Neither the name of NTESS nor the names of its contributors +// may be used to endorse or promote products derived from this +// software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +#include "gtest/gtest.h" +#include "stk_unit_test_utils/MeshFixture.hpp" +#include "stk_balance/balanceUtils.hpp" + +class BalanceSettingsTester : public stk::unit_test_util::MeshFixture +{ +public: + stk::balance::BalanceSettings& get_balance_settings() + { + return m_settings; + } + +private: + stk::balance::StkBalanceSettings m_settings; +}; + +TEST_F(BalanceSettingsTester, defaultInitialDecompMethod) +{ + stk::balance::BalanceSettings& settings = get_balance_settings(); + EXPECT_EQ(settings.getInitialDecompMethod(), "RIB"); +} + +TEST_F(BalanceSettingsTester, inputFilename) +{ + stk::balance::BalanceSettings& settings = get_balance_settings(); + settings.set_input_filename("input.g"); + EXPECT_EQ(settings.get_input_filename(), "input.g"); + settings.set_input_filename("cube.g"); + EXPECT_EQ(settings.get_input_filename(), "cube.g"); +} + +TEST_F(BalanceSettingsTester, outputFilename) +{ + stk::balance::BalanceSettings& settings = get_balance_settings(); + settings.set_output_filename("output.g"); + EXPECT_EQ(settings.get_output_filename(), "output.g"); + settings.set_output_filename("output/cube.g"); + EXPECT_EQ(settings.get_output_filename(), "output/cube.g"); +} + +TEST(BalanceSettings, defaultContactSearchStatus) +{ + stk::balance::BalanceSettings balanceSettings; + EXPECT_FALSE(balanceSettings.includeSearchResultsInGraph()); + + stk::balance::StkBalanceSettings stkBalanceSettings; + EXPECT_TRUE(stkBalanceSettings.includeSearchResultsInGraph()); + + stk::balance::BasicGeometricSettings basicGeometricSettings; + EXPECT_FALSE(basicGeometricSettings.includeSearchResultsInGraph()); + + stk::balance::GraphCreationSettings graphCreationSettings; + EXPECT_TRUE(graphCreationSettings.includeSearchResultsInGraph()); + + stk::balance::GraphCreationSettingsWithCustomTolerances graphCreationSettingsWithCustomTolerances; + EXPECT_TRUE(graphCreationSettingsWithCustomTolerances.includeSearchResultsInGraph()); + + stk::balance::BasicZoltan2Settings basicZoltan2Settings; + EXPECT_FALSE(basicZoltan2Settings.includeSearchResultsInGraph()); + + stk::balance::UserSpecifiedVertexWeightsSetting userSpecifiedVertexWeightsSetting; + EXPECT_FALSE(userSpecifiedVertexWeightsSetting.includeSearchResultsInGraph()); + + stk::balance::GraphCreationSettingsForZoltan2 graphCreationSettingsForZoltan2; + EXPECT_TRUE(graphCreationSettingsWithCustomTolerances.includeSearchResultsInGraph()); + + stk::mesh::MetaData meta(3); + stk::mesh::BulkData bulk(meta, MPI_COMM_WORLD); + stk::balance::DoubleFieldType& field = meta.declare_field(stk::topology::NODE_RANK, "dummy", 1); + stk::balance::FieldVertexWeightSettings fieldVertexWeightSettings(bulk, field); + EXPECT_FALSE(fieldVertexWeightSettings.includeSearchResultsInGraph()); + + stk::balance::MultipleCriteriaSettings multipleCriteriaSettings({&field}); + EXPECT_FALSE(multipleCriteriaSettings.includeSearchResultsInGraph()); + + stk::balance::BasicColoringSettings basicColoringSettings; + EXPECT_FALSE(basicColoringSettings.includeSearchResultsInGraph()); + + stk::balance::BasicColoringByTopologySettings basicColoringByTopologySettings; + EXPECT_FALSE(basicColoringByTopologySettings.includeSearchResultsInGraph()); +} + +TEST(BalanceSettings, toggleContactSearchStatus) +{ + stk::balance::BalanceSettings balanceSettings; + balanceSettings.setIncludeSearchResultsInGraph(true); + EXPECT_FALSE(balanceSettings.includeSearchResultsInGraph()); + + stk::balance::StkBalanceSettings stkBalanceSettings; + stkBalanceSettings.setIncludeSearchResultsInGraph(false); + EXPECT_FALSE(stkBalanceSettings.includeSearchResultsInGraph()); + + stk::balance::BasicGeometricSettings basicGeometricSettings; + basicGeometricSettings.setIncludeSearchResultsInGraph(true); + EXPECT_FALSE(basicGeometricSettings.includeSearchResultsInGraph()); + + stk::balance::GraphCreationSettings graphCreationSettings; + graphCreationSettings.setIncludeSearchResultsInGraph(false); + EXPECT_FALSE(graphCreationSettings.includeSearchResultsInGraph()); + + stk::balance::GraphCreationSettingsWithCustomTolerances graphCreationSettingsWithCustomTolerances; + graphCreationSettingsWithCustomTolerances.setIncludeSearchResultsInGraph(false); + EXPECT_FALSE(graphCreationSettingsWithCustomTolerances.includeSearchResultsInGraph()); + + stk::balance::BasicZoltan2Settings basicZoltan2Settings; + basicZoltan2Settings.setIncludeSearchResultsInGraph(true); + EXPECT_TRUE(basicZoltan2Settings.includeSearchResultsInGraph()); + + stk::balance::UserSpecifiedVertexWeightsSetting userSpecifiedVertexWeightsSetting; + userSpecifiedVertexWeightsSetting.setIncludeSearchResultsInGraph(true); + EXPECT_TRUE(userSpecifiedVertexWeightsSetting.includeSearchResultsInGraph()); + + stk::balance::GraphCreationSettingsForZoltan2 graphCreationSettingsForZoltan2; + graphCreationSettingsForZoltan2.setIncludeSearchResultsInGraph(false); + EXPECT_FALSE(graphCreationSettingsWithCustomTolerances.includeSearchResultsInGraph()); + + stk::mesh::MetaData meta(3); + stk::mesh::BulkData bulk(meta, MPI_COMM_WORLD); + stk::balance::DoubleFieldType& field = meta.declare_field(stk::topology::NODE_RANK, "dummy", 1); + stk::balance::FieldVertexWeightSettings fieldVertexWeightSettings(bulk, field); + fieldVertexWeightSettings.setIncludeSearchResultsInGraph(true); + EXPECT_TRUE(fieldVertexWeightSettings.includeSearchResultsInGraph()); + + stk::balance::MultipleCriteriaSettings multipleCriteriaSettings({&field}); + multipleCriteriaSettings.setIncludeSearchResultsInGraph(true); + EXPECT_TRUE(multipleCriteriaSettings.includeSearchResultsInGraph()); + + stk::balance::BasicColoringSettings basicColoringSettings; + basicColoringSettings.setIncludeSearchResultsInGraph(true); + EXPECT_FALSE(basicColoringSettings.includeSearchResultsInGraph()); + + stk::balance::BasicColoringByTopologySettings basicColoringByTopologySettings; + basicColoringByTopologySettings.setIncludeSearchResultsInGraph(true); + EXPECT_FALSE(basicColoringByTopologySettings.includeSearchResultsInGraph()); +} + diff --git a/packages/stk/stk_unit_tests/stk_balance/UnitTestCommandLineParsing.cpp b/packages/stk/stk_unit_tests/stk_balance/UnitTestCommandLineParsing.cpp index 1e4dd4607595..a819d33d0e23 100644 --- a/packages/stk/stk_unit_tests/stk_balance/UnitTestCommandLineParsing.cpp +++ b/packages/stk/stk_unit_tests/stk_balance/UnitTestCommandLineParsing.cpp @@ -1,169 +1,210 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include -#include -#include -#include -#include -#include +#include "gtest/gtest.h" -namespace -{ - -TEST(BalanceOutputDirectory, checkOutputFileFromInputFileWithoutPath) -{ - const std::string inputFile = "input.e"; - const std::string outputDirectory = "/home/code/results"; +#include "stk_balance/balanceUtils.hpp" +#include "stk_balance/setup/Parser.hpp" - std::string outputFilename = stk::balance::construct_output_file_name(outputDirectory, inputFile); - EXPECT_EQ("/home/code/results/input.e", outputFilename); -} +#include "stk_unit_test_utils/MeshFixture.hpp" +#include "stk_mesh/base/GetEntities.hpp" -TEST(BalanceOutputDirectory, checkOutputFileFromInputFileAndOutputDirectoryWithExtraBackslash) -{ - const std::string inputFile = "input.e"; - const std::string outputDirectory = "/home/code/results/"; - - std::string outputFilename = stk::balance::construct_output_file_name(outputDirectory, inputFile); - EXPECT_EQ("/home/code/results//input.e", outputFilename); -} - -TEST(BalanceOutputDirectory, checkOutputFileFromInputFileWithPath) -{ - const std::string inputFile = "/another/directory/input.e"; - const std::string outputDirectory = "/home/code/results"; - - std::string outputFilename = stk::balance::construct_output_file_name(outputDirectory, inputFile); - EXPECT_EQ("/home/code/results/input.e", outputFilename); -} - -class BalanceCommandLine : public ::testing::Test +class BalanceCommandLine : public stk::unit_test_util::MeshFixture { protected: - BalanceCommandLine() { } - - std::vector get_argv_c_strings() - { - std::vector argvCstr(argv.size()); - for(size_t i=0; i 0); + } + + void use_full_infile_output_dir_options() + { + m_fullInfileOutputDirOptions = true; + } + + void set_output_directory(const std::string& dir) + { + m_outputDir = dir; + } + + void turn_on_contact_search_before_parsing() + { + m_settings.setIncludeSearchResultsInGraph(true); + } + + void turn_off_contact_search_before_parsing() + { + m_settings.setIncludeSearchResultsInGraph(false); + } + + const stk::balance::BalanceSettings& get_stk_balance_settings(const std::vector& options) + { + std::vector args = assemble_args(options); + m_parser.parse_command_line_options(args.size(), args.data(), m_settings); + return m_settings; + } + + std::vector assemble_args(const std::vector& options) const + { + std::vector args = {m_execName.c_str()}; + + if (m_fullInfileOutputDirOptions) args.push_back(m_infileOptionName.c_str()); + args.push_back(infile.c_str()); + + if (!m_outputDir.empty()) { + if (m_fullInfileOutputDirOptions) args.push_back(m_outputDirOptionName.c_str()); + args.push_back(m_outputDir.c_str()); } - void set_argv(const std::vector& inputArgv) - { - argv = inputArgv; + for (const std::string& option : options) { + args.push_back(option.c_str()); } - stk::balance::StkBalanceSettings get_stk_balance_settings(const std::vector & options) - { - std::vector args {"exe", "infile", "foobar"}; - args.insert(args.end(), options.begin(), options.end()); - set_argv(args); - std::vector argvCstr = get_argv_c_strings(); - stk::balance::ParsedOptions parsedOptions = stk::balance::parse_balance_command_line(argvCstr.size(), - argvCstr.data(), - argv[0], - MPI_COMM_WORLD); - - return stk::balance::create_balance_settings(parsedOptions); - } + return args; + } + + double get_absolute_tolerance_for_unit_mesh(const stk::balance::BalanceSettings& balanceSettings) + { + return balanceSettings.getToleranceForFaceSearch(get_bulk(), *get_meta().coordinate_field(), + get_bulk().begin_nodes(m_faces[0]), get_bulk().num_nodes(m_faces[0])); + } + + void check_absolute_tolerance_for_face_search(const stk::balance::BalanceSettings& balanceSettings, double tolerance) + { + EXPECT_TRUE(balanceSettings.isConstantFaceSearchTolerance()); + EXPECT_DOUBLE_EQ(get_absolute_tolerance_for_unit_mesh(balanceSettings), tolerance); + } + + void check_relative_tolerance_for_face_search(const stk::balance::BalanceSettings& balanceSettings, double tolerance) + { + EXPECT_FALSE(balanceSettings.isConstantFaceSearchTolerance()); + EXPECT_DOUBLE_EQ(get_absolute_tolerance_for_unit_mesh(balanceSettings), tolerance); + } + + std::string infile; + +private: + std::string m_execName; + std::string m_outputDir; + stk::balance::StkBalanceSettings m_settings; + stk::balance::Parser m_parser; + stk::mesh::EntityVector m_faces; + + bool m_fullInfileOutputDirOptions; + std::string m_infileOptionName; + std::string m_outputDirOptionName; +}; - double getAbsoluteToleranceForUnitMesh(const stk::balance::BalanceSettings & balanceSettings) - { - stk::mesh::MetaData meta(3); - stk::mesh::BulkData bulk(meta, MPI_COMM_WORLD); - stk::io::fill_mesh("generated:1x1x4|sideset:x", bulk); - stk::mesh::EntityVector faces; - stk::mesh::get_selected_entities(meta.universal_part(), bulk.buckets(stk::topology::FACE_RANK), faces); - ThrowRequire(faces.size() > 0); - - return balanceSettings.getToleranceForFaceSearch(bulk, *meta.coordinate_field(), - bulk.begin_nodes(faces[0]), bulk.num_nodes(faces[0])); - } +TEST_F(BalanceCommandLine, createBalanceSettings_default) +{ + const stk::balance::BalanceSettings& balanceSettings = get_stk_balance_settings({}); - void checkAbsoluteToleranceForFaceSearch(const stk::balance::BalanceSettings & balanceSettings, double tolerance) - { - EXPECT_TRUE(balanceSettings.isConstantFaceSearchTolerance()); - EXPECT_DOUBLE_EQ(getAbsoluteToleranceForUnitMesh(balanceSettings), tolerance); - } + EXPECT_EQ(balanceSettings.get_input_filename(), infile); + EXPECT_EQ(balanceSettings.get_output_filename(), "./"+infile); - void checkRelativeToleranceForFaceSearch(const stk::balance::BalanceSettings & balanceSettings, double tolerance) - { - EXPECT_FALSE(balanceSettings.isConstantFaceSearchTolerance()); - EXPECT_DOUBLE_EQ(getAbsoluteToleranceForUnitMesh(balanceSettings), tolerance); - } + EXPECT_EQ(balanceSettings.getDecompMethod(), "parmetis"); + EXPECT_TRUE(balanceSettings.includeSearchResultsInGraph()); + EXPECT_FALSE(balanceSettings.shouldFixSpiders()); + EXPECT_DOUBLE_EQ(balanceSettings.getGraphEdgeWeightForSearch(), 15.0); + EXPECT_DOUBLE_EQ(balanceSettings.getVertexWeightMultiplierForVertexInSearch(), 5.0); + check_absolute_tolerance_for_face_search(balanceSettings, 0.0001); +} - std::vector argv; -}; +TEST_F(BalanceCommandLine, createBalanceSettings_outputDirectory) +{ + const std::string outputDir = "output"; + set_output_directory(outputDir); + const stk::balance::BalanceSettings& balanceSettings = get_stk_balance_settings({}); -TEST_F(BalanceCommandLine, createBalanceSettings_default) + EXPECT_EQ(balanceSettings.get_input_filename(), infile); + EXPECT_EQ(balanceSettings.get_output_filename(), outputDir+"/"+infile); + + EXPECT_EQ(balanceSettings.getDecompMethod(), "parmetis"); + EXPECT_TRUE(balanceSettings.includeSearchResultsInGraph()); + EXPECT_FALSE(balanceSettings.shouldFixSpiders()); + EXPECT_DOUBLE_EQ(balanceSettings.getGraphEdgeWeightForSearch(), 15.0); + EXPECT_DOUBLE_EQ(balanceSettings.getVertexWeightMultiplierForVertexInSearch(), 5.0); + check_absolute_tolerance_for_face_search(balanceSettings, 0.0001); +} + +TEST_F(BalanceCommandLine, createBalanceSettings_outputDirectory_fullOptions) { - stk::balance::StkBalanceSettings balanceSettings = get_stk_balance_settings({}); + const std::string outputDir = "output"; + set_output_directory(outputDir); + use_full_infile_output_dir_options(); + const stk::balance::BalanceSettings& balanceSettings = get_stk_balance_settings({}); + + EXPECT_EQ(balanceSettings.get_input_filename(), infile); + EXPECT_EQ(balanceSettings.get_output_filename(), outputDir+"/"+infile); EXPECT_EQ(balanceSettings.getDecompMethod(), "parmetis"); EXPECT_TRUE(balanceSettings.includeSearchResultsInGraph()); EXPECT_FALSE(balanceSettings.shouldFixSpiders()); EXPECT_DOUBLE_EQ(balanceSettings.getGraphEdgeWeightForSearch(), 15.0); EXPECT_DOUBLE_EQ(balanceSettings.getVertexWeightMultiplierForVertexInSearch(), 5.0); - checkAbsoluteToleranceForFaceSearch(balanceSettings, 0.0001); + check_absolute_tolerance_for_face_search(balanceSettings, 0.0001); } TEST_F(BalanceCommandLine, createBalanceSettings_smDefaults) { - stk::balance::StkBalanceSettings balanceSettings = get_stk_balance_settings({"--sm"}); + const stk::balance::BalanceSettings& balanceSettings = get_stk_balance_settings({"--sm"}); EXPECT_EQ(balanceSettings.getDecompMethod(), "parmetis"); EXPECT_TRUE(balanceSettings.includeSearchResultsInGraph()); EXPECT_FALSE(balanceSettings.shouldFixSpiders()); EXPECT_DOUBLE_EQ(balanceSettings.getGraphEdgeWeightForSearch(), 3.0); EXPECT_DOUBLE_EQ(balanceSettings.getVertexWeightMultiplierForVertexInSearch(), 10.0); - checkRelativeToleranceForFaceSearch(balanceSettings, 0.15); + check_relative_tolerance_for_face_search(balanceSettings, 0.15); } TEST_F(BalanceCommandLine, createBalanceSettings_sdDefaults) { - stk::balance::StkBalanceSettings balanceSettings = get_stk_balance_settings({"--sd"}); + const stk::balance::BalanceSettings& balanceSettings = get_stk_balance_settings({"--sd"}); EXPECT_EQ(balanceSettings.getDecompMethod(), "parmetis"); EXPECT_TRUE(balanceSettings.includeSearchResultsInGraph()); EXPECT_TRUE(balanceSettings.shouldFixSpiders()); EXPECT_DOUBLE_EQ(balanceSettings.getGraphEdgeWeightForSearch(), 15.0); EXPECT_DOUBLE_EQ(balanceSettings.getVertexWeightMultiplierForVertexInSearch(), 5.0); - checkAbsoluteToleranceForFaceSearch(balanceSettings, 0.0001); + check_absolute_tolerance_for_face_search(balanceSettings, 0.0001); +} + +TEST_F(BalanceCommandLine, createBalanceSettings_bothDefaults) +{ + EXPECT_THROW(get_stk_balance_settings({"--sd", "--sm"}), std::logic_error); } TEST_F(BalanceCommandLine, createBalanceSettings_defaultAbsoluteTolerance) { - stk::balance::StkBalanceSettings balanceSettings = get_stk_balance_settings({"--face-search-abs-tol"}); + const stk::balance::BalanceSettings& balanceSettings = get_stk_balance_settings({"--face-search-abs-tol"}); EXPECT_EQ(balanceSettings.getDecompMethod(), "parmetis"); EXPECT_TRUE(balanceSettings.includeSearchResultsInGraph()); EXPECT_FALSE(balanceSettings.shouldFixSpiders()); EXPECT_DOUBLE_EQ(balanceSettings.getGraphEdgeWeightForSearch(), 15.0); EXPECT_DOUBLE_EQ(balanceSettings.getVertexWeightMultiplierForVertexInSearch(), 5.0); - checkAbsoluteToleranceForFaceSearch(balanceSettings, 0.0001); + check_absolute_tolerance_for_face_search(balanceSettings, 0.0001); } TEST_F(BalanceCommandLine, createBalanceSettings_defaultRelativeTolerance) { - stk::balance::StkBalanceSettings balanceSettings = get_stk_balance_settings({"--face-search-rel-tol"}); + const stk::balance::BalanceSettings& balanceSettings = get_stk_balance_settings({"--face-search-rel-tol"}); EXPECT_EQ(balanceSettings.getDecompMethod(), "parmetis"); EXPECT_TRUE(balanceSettings.includeSearchResultsInGraph()); EXPECT_FALSE(balanceSettings.shouldFixSpiders()); EXPECT_DOUBLE_EQ(balanceSettings.getGraphEdgeWeightForSearch(), 15.0); EXPECT_DOUBLE_EQ(balanceSettings.getVertexWeightMultiplierForVertexInSearch(), 5.0); - checkRelativeToleranceForFaceSearch(balanceSettings, 0.15); + check_relative_tolerance_for_face_search(balanceSettings, 0.15); } TEST_F(BalanceCommandLine, createBalanceSettings_bothTolerances) @@ -174,382 +215,259 @@ TEST_F(BalanceCommandLine, createBalanceSettings_bothTolerances) TEST_F(BalanceCommandLine, createBalanceSettings_faceSearchAbsoluteTolerance) { - stk::balance::StkBalanceSettings balanceSettings = get_stk_balance_settings({"--face-search-abs-tol=0.001"}); + const stk::balance::BalanceSettings& balanceSettings = get_stk_balance_settings({"--face-search-abs-tol=0.001"}); EXPECT_EQ(balanceSettings.getDecompMethod(), "parmetis"); EXPECT_TRUE(balanceSettings.includeSearchResultsInGraph()); EXPECT_FALSE(balanceSettings.shouldFixSpiders()); EXPECT_DOUBLE_EQ(balanceSettings.getGraphEdgeWeightForSearch(), 15.0); EXPECT_DOUBLE_EQ(balanceSettings.getVertexWeightMultiplierForVertexInSearch(), 5.0); - checkAbsoluteToleranceForFaceSearch(balanceSettings, 0.001); + check_absolute_tolerance_for_face_search(balanceSettings, 0.001); } TEST_F(BalanceCommandLine, createBalanceSettings_faceSearchRelativeTolerance) { - stk::balance::StkBalanceSettings balanceSettings = get_stk_balance_settings({"--face-search-rel-tol=0.123"}); + const stk::balance::BalanceSettings& balanceSettings = get_stk_balance_settings({"--face-search-rel-tol=0.123"}); EXPECT_EQ(balanceSettings.getDecompMethod(), "parmetis"); EXPECT_TRUE(balanceSettings.includeSearchResultsInGraph()); EXPECT_FALSE(balanceSettings.shouldFixSpiders()); EXPECT_DOUBLE_EQ(balanceSettings.getGraphEdgeWeightForSearch(), 15.0); EXPECT_DOUBLE_EQ(balanceSettings.getVertexWeightMultiplierForVertexInSearch(), 5.0); - checkRelativeToleranceForFaceSearch(balanceSettings, 0.123); + check_relative_tolerance_for_face_search(balanceSettings, 0.123); } TEST_F(BalanceCommandLine, createBalanceSettings_smDefaults_defaultAbsoluteTolerance) { - stk::balance::StkBalanceSettings balanceSettings = get_stk_balance_settings({"--sm", - "--face-search-abs-tol"}); + const stk::balance::BalanceSettings& balanceSettings = get_stk_balance_settings({"--sm", "--face-search-abs-tol"}); EXPECT_EQ(balanceSettings.getDecompMethod(), "parmetis"); EXPECT_TRUE(balanceSettings.includeSearchResultsInGraph()); EXPECT_FALSE(balanceSettings.shouldFixSpiders()); EXPECT_DOUBLE_EQ(balanceSettings.getGraphEdgeWeightForSearch(), 3.0); EXPECT_DOUBLE_EQ(balanceSettings.getVertexWeightMultiplierForVertexInSearch(), 10.0); - checkAbsoluteToleranceForFaceSearch(balanceSettings, 0.0001); + check_absolute_tolerance_for_face_search(balanceSettings, 0.0001); } TEST_F(BalanceCommandLine, createBalanceSettings_smDefaults_defaultRelativeTolerance) { - stk::balance::StkBalanceSettings balanceSettings = get_stk_balance_settings({"--sm", - "--face-search-rel-tol"}); + const stk::balance::BalanceSettings& balanceSettings = get_stk_balance_settings({"--sm", "--face-search-rel-tol"}); EXPECT_EQ(balanceSettings.getDecompMethod(), "parmetis"); EXPECT_TRUE(balanceSettings.includeSearchResultsInGraph()); EXPECT_FALSE(balanceSettings.shouldFixSpiders()); EXPECT_DOUBLE_EQ(balanceSettings.getGraphEdgeWeightForSearch(), 3.0); EXPECT_DOUBLE_EQ(balanceSettings.getVertexWeightMultiplierForVertexInSearch(), 10.0); - checkRelativeToleranceForFaceSearch(balanceSettings, 0.15); + check_relative_tolerance_for_face_search(balanceSettings, 0.15); } TEST_F(BalanceCommandLine, createBalanceSettings_smDefaults_faceSearchAbsoluteTolerance) { - stk::balance::StkBalanceSettings balanceSettings = get_stk_balance_settings({"--sm", - "--face-search-abs-tol=0.005"}); + const stk::balance::BalanceSettings& balanceSettings = get_stk_balance_settings({"--sm", "--face-search-abs-tol=0.005"}); EXPECT_EQ(balanceSettings.getDecompMethod(), "parmetis"); EXPECT_TRUE(balanceSettings.includeSearchResultsInGraph()); EXPECT_FALSE(balanceSettings.shouldFixSpiders()); EXPECT_DOUBLE_EQ(balanceSettings.getGraphEdgeWeightForSearch(), 3.0); EXPECT_DOUBLE_EQ(balanceSettings.getVertexWeightMultiplierForVertexInSearch(), 10.0); - checkAbsoluteToleranceForFaceSearch(balanceSettings, 0.005); + check_absolute_tolerance_for_face_search(balanceSettings, 0.005); } TEST_F(BalanceCommandLine, createBalanceSettings_smDefaults_faceSearchRelativeTolerance) { - stk::balance::StkBalanceSettings balanceSettings = get_stk_balance_settings({"--sm", - "--face-search-rel-tol=0.123"}); + const stk::balance::BalanceSettings& balanceSettings = get_stk_balance_settings({"--sm", "--face-search-rel-tol=0.123"}); EXPECT_EQ(balanceSettings.getDecompMethod(), "parmetis"); EXPECT_TRUE(balanceSettings.includeSearchResultsInGraph()); EXPECT_FALSE(balanceSettings.shouldFixSpiders()); EXPECT_DOUBLE_EQ(balanceSettings.getGraphEdgeWeightForSearch(), 3.0); EXPECT_DOUBLE_EQ(balanceSettings.getVertexWeightMultiplierForVertexInSearch(), 10.0); - checkRelativeToleranceForFaceSearch(balanceSettings, 0.123); + check_relative_tolerance_for_face_search(balanceSettings, 0.123); } TEST_F(BalanceCommandLine, createBalanceSettings_sdDefaults_defaultAbsoluteTolerance) { - stk::balance::StkBalanceSettings balanceSettings = get_stk_balance_settings({"--sd", - "--face-search-abs-tol"}); + const stk::balance::BalanceSettings& balanceSettings = get_stk_balance_settings({"--sd", "--face-search-abs-tol"}); EXPECT_EQ(balanceSettings.getDecompMethod(), "parmetis"); EXPECT_TRUE(balanceSettings.includeSearchResultsInGraph()); EXPECT_TRUE(balanceSettings.shouldFixSpiders()); EXPECT_DOUBLE_EQ(balanceSettings.getGraphEdgeWeightForSearch(), 15.0); EXPECT_DOUBLE_EQ(balanceSettings.getVertexWeightMultiplierForVertexInSearch(), 5.0); - checkAbsoluteToleranceForFaceSearch(balanceSettings, 0.0001); + check_absolute_tolerance_for_face_search(balanceSettings, 0.0001); } TEST_F(BalanceCommandLine, createBalanceSettings_sdDefaults_defaultRelativeTolerance) { - stk::balance::StkBalanceSettings balanceSettings = get_stk_balance_settings({"--sd", - "--face-search-rel-tol"}); + const stk::balance::BalanceSettings& balanceSettings = get_stk_balance_settings({"--sd", "--face-search-rel-tol"}); EXPECT_EQ(balanceSettings.getDecompMethod(), "parmetis"); EXPECT_TRUE(balanceSettings.includeSearchResultsInGraph()); EXPECT_TRUE(balanceSettings.shouldFixSpiders()); EXPECT_DOUBLE_EQ(balanceSettings.getGraphEdgeWeightForSearch(), 15.0); EXPECT_DOUBLE_EQ(balanceSettings.getVertexWeightMultiplierForVertexInSearch(), 5.0); - checkRelativeToleranceForFaceSearch(balanceSettings, 0.15); + check_relative_tolerance_for_face_search(balanceSettings, 0.15); } TEST_F(BalanceCommandLine, createBalanceSettings_sdDefaults_faceSearchAbsoluteTolerance) { - stk::balance::StkBalanceSettings balanceSettings = get_stk_balance_settings({"--sd", - "--face-search-abs-tol=0.0005"}); + const stk::balance::BalanceSettings& balanceSettings = get_stk_balance_settings({"--sd", "--face-search-abs-tol=0.0005"}); EXPECT_EQ(balanceSettings.getDecompMethod(), "parmetis"); EXPECT_TRUE(balanceSettings.includeSearchResultsInGraph()); EXPECT_TRUE(balanceSettings.shouldFixSpiders()); EXPECT_DOUBLE_EQ(balanceSettings.getGraphEdgeWeightForSearch(), 15.0); EXPECT_DOUBLE_EQ(balanceSettings.getVertexWeightMultiplierForVertexInSearch(), 5.0); - checkAbsoluteToleranceForFaceSearch(balanceSettings, 0.0005); + check_absolute_tolerance_for_face_search(balanceSettings, 0.0005); } TEST_F(BalanceCommandLine, createBalanceSettings_sdDefaults_faceSearchRelativeTolerance) { - stk::balance::StkBalanceSettings balanceSettings = get_stk_balance_settings({"--sd", - "--face-search-rel-tol=0.123"}); + const stk::balance::BalanceSettings& balanceSettings = get_stk_balance_settings({"--sd", "--face-search-rel-tol=0.123"}); EXPECT_EQ(balanceSettings.getDecompMethod(), "parmetis"); EXPECT_TRUE(balanceSettings.includeSearchResultsInGraph()); EXPECT_TRUE(balanceSettings.shouldFixSpiders()); EXPECT_DOUBLE_EQ(balanceSettings.getGraphEdgeWeightForSearch(), 15.0); EXPECT_DOUBLE_EQ(balanceSettings.getVertexWeightMultiplierForVertexInSearch(), 5.0); - checkRelativeToleranceForFaceSearch(balanceSettings, 0.123); + check_relative_tolerance_for_face_search(balanceSettings, 0.123); } +TEST_F(BalanceCommandLine, contactSearch_respectsInitialDefault_enabled) +{ + turn_on_contact_search_before_parsing(); + const stk::balance::BalanceSettings& balanceSettings = get_stk_balance_settings({}); + + EXPECT_TRUE(balanceSettings.includeSearchResultsInGraph()); +} + +TEST_F(BalanceCommandLine, contactSearch_respectsInitialDefault_disabled) +{ + turn_off_contact_search_before_parsing(); + const stk::balance::BalanceSettings& balanceSettings = get_stk_balance_settings({}); + + EXPECT_FALSE(balanceSettings.includeSearchResultsInGraph()); +} + TEST_F(BalanceCommandLine, contactSearch_badValue) { - EXPECT_THROW(get_stk_balance_settings({"--contact-search=junk"}), std::runtime_error); + EXPECT_THROW(get_stk_balance_settings({"--contact-search=junk"}), std::logic_error); } TEST_F(BalanceCommandLine, disableSearch_default_caseInsensitive) { - stk::balance::StkBalanceSettings balanceSettings = get_stk_balance_settings({"--contact-search=OFF"}); + const stk::balance::BalanceSettings& balanceSettings = get_stk_balance_settings({"--contact-search=Off"}); EXPECT_EQ(balanceSettings.getDecompMethod(), "parmetis"); EXPECT_FALSE(balanceSettings.includeSearchResultsInGraph()); EXPECT_FALSE(balanceSettings.shouldFixSpiders()); EXPECT_DOUBLE_EQ(balanceSettings.getGraphEdgeWeightForSearch(), 15.0); EXPECT_DOUBLE_EQ(balanceSettings.getVertexWeightMultiplierForVertexInSearch(), 5.0); - checkAbsoluteToleranceForFaceSearch(balanceSettings, 0.0001); + check_absolute_tolerance_for_face_search(balanceSettings, 0.0001); } TEST_F(BalanceCommandLine, disableSearch_smDefaults) { - stk::balance::StkBalanceSettings balanceSettings = get_stk_balance_settings({"--sm", "--contact-search=off"}); + const stk::balance::BalanceSettings& balanceSettings = get_stk_balance_settings({"--sm", "--contact-search=off"}); EXPECT_EQ(balanceSettings.getDecompMethod(), "parmetis"); EXPECT_FALSE(balanceSettings.includeSearchResultsInGraph()); EXPECT_FALSE(balanceSettings.shouldFixSpiders()); EXPECT_DOUBLE_EQ(balanceSettings.getGraphEdgeWeightForSearch(), 3.0); EXPECT_DOUBLE_EQ(balanceSettings.getVertexWeightMultiplierForVertexInSearch(), 10.0); - checkRelativeToleranceForFaceSearch(balanceSettings, 0.15); + check_relative_tolerance_for_face_search(balanceSettings, 0.15); } TEST_F(BalanceCommandLine, disableSearch_sdDefaults) { - stk::balance::StkBalanceSettings balanceSettings = get_stk_balance_settings({"--sd", "--contact-search=off"}); + const stk::balance::BalanceSettings& balanceSettings = get_stk_balance_settings({"--sd", "--contact-search=off"}); EXPECT_EQ(balanceSettings.getDecompMethod(), "parmetis"); EXPECT_FALSE(balanceSettings.includeSearchResultsInGraph()); EXPECT_TRUE(balanceSettings.shouldFixSpiders()); EXPECT_DOUBLE_EQ(balanceSettings.getGraphEdgeWeightForSearch(), 15.0); EXPECT_DOUBLE_EQ(balanceSettings.getVertexWeightMultiplierForVertexInSearch(), 5.0); - checkAbsoluteToleranceForFaceSearch(balanceSettings, 0.0001); + check_absolute_tolerance_for_face_search(balanceSettings, 0.0001); } TEST_F(BalanceCommandLine, enableSearch_default_caseInsensitive) { - stk::balance::StkBalanceSettings balanceSettings = get_stk_balance_settings({"--contact-search=ON"}); + const stk::balance::BalanceSettings& balanceSettings = get_stk_balance_settings({"--contact-search=ON"}); EXPECT_EQ(balanceSettings.getDecompMethod(), "parmetis"); EXPECT_TRUE(balanceSettings.includeSearchResultsInGraph()); EXPECT_FALSE(balanceSettings.shouldFixSpiders()); EXPECT_DOUBLE_EQ(balanceSettings.getGraphEdgeWeightForSearch(), 15.0); EXPECT_DOUBLE_EQ(balanceSettings.getVertexWeightMultiplierForVertexInSearch(), 5.0); - checkAbsoluteToleranceForFaceSearch(balanceSettings, 0.0001); + check_absolute_tolerance_for_face_search(balanceSettings, 0.0001); +} + +TEST_F(BalanceCommandLine, enableSearch_whenDisabledByDefault) +{ + turn_off_contact_search_before_parsing(); + const stk::balance::BalanceSettings& balanceSettings = get_stk_balance_settings({"--contact-search=ON"}); + + EXPECT_TRUE(balanceSettings.includeSearchResultsInGraph()); } TEST_F(BalanceCommandLine, enableSearch_smDefaults) { - stk::balance::StkBalanceSettings balanceSettings = get_stk_balance_settings({"--sm", "--contact-search=on"}); + const stk::balance::BalanceSettings& balanceSettings = get_stk_balance_settings({"--sm", "--contact-search=on"}); EXPECT_EQ(balanceSettings.getDecompMethod(), "parmetis"); EXPECT_TRUE(balanceSettings.includeSearchResultsInGraph()); EXPECT_FALSE(balanceSettings.shouldFixSpiders()); EXPECT_DOUBLE_EQ(balanceSettings.getGraphEdgeWeightForSearch(), 3.0); EXPECT_DOUBLE_EQ(balanceSettings.getVertexWeightMultiplierForVertexInSearch(), 10.0); - checkRelativeToleranceForFaceSearch(balanceSettings, 0.15); + check_relative_tolerance_for_face_search(balanceSettings, 0.15); } TEST_F(BalanceCommandLine, enableSearch_sdDefaults) { - stk::balance::StkBalanceSettings balanceSettings = get_stk_balance_settings({"--sd", "--contact-search=on"}); + const stk::balance::BalanceSettings& balanceSettings = get_stk_balance_settings({"--sd", "--contact-search=on"}); EXPECT_EQ(balanceSettings.getDecompMethod(), "parmetis"); EXPECT_TRUE(balanceSettings.includeSearchResultsInGraph()); EXPECT_TRUE(balanceSettings.shouldFixSpiders()); EXPECT_DOUBLE_EQ(balanceSettings.getGraphEdgeWeightForSearch(), 15.0); EXPECT_DOUBLE_EQ(balanceSettings.getVertexWeightMultiplierForVertexInSearch(), 5.0); - checkAbsoluteToleranceForFaceSearch(balanceSettings, 0.0001); + check_absolute_tolerance_for_face_search(balanceSettings, 0.0001); } TEST_F(BalanceCommandLine, decompMethodRcb) { - stk::balance::StkBalanceSettings balanceSettings = get_stk_balance_settings({"--decomp-method=rcb"}); + const stk::balance::BalanceSettings& balanceSettings = get_stk_balance_settings({"--decomp-method=rcb"}); EXPECT_EQ(balanceSettings.getDecompMethod(), "rcb"); } TEST_F(BalanceCommandLine, decompMethodRib) { - stk::balance::StkBalanceSettings balanceSettings = get_stk_balance_settings({"--decomp-method=rib"}); + const stk::balance::BalanceSettings& balanceSettings = get_stk_balance_settings({"--decomp-method=rib"}); EXPECT_EQ(balanceSettings.getDecompMethod(), "rib"); } TEST_F(BalanceCommandLine, decompMethodMultijagged) { - stk::balance::StkBalanceSettings balanceSettings = get_stk_balance_settings({"--decomp-method=multijagged"}); + const stk::balance::BalanceSettings& balanceSettings = get_stk_balance_settings({"--decomp-method=multijagged"}); EXPECT_EQ(balanceSettings.getDecompMethod(), "multijagged"); } TEST_F(BalanceCommandLine, decompMethodParmetis) { - stk::balance::StkBalanceSettings balanceSettings = get_stk_balance_settings({"--decomp-method=parmetis"}); + const stk::balance::BalanceSettings& balanceSettings = get_stk_balance_settings({"--decomp-method=parmetis"}); EXPECT_EQ(balanceSettings.getDecompMethod(), "parmetis"); EXPECT_TRUE(balanceSettings.includeSearchResultsInGraph()); EXPECT_FALSE(balanceSettings.shouldFixSpiders()); EXPECT_DOUBLE_EQ(balanceSettings.getGraphEdgeWeightForSearch(), 15.0); EXPECT_DOUBLE_EQ(balanceSettings.getVertexWeightMultiplierForVertexInSearch(), 5.0); - checkAbsoluteToleranceForFaceSearch(balanceSettings, 0.0001); -} - - -TEST_F(BalanceCommandLine, defaultContactSearchStatus) -{ - stk::balance::BalanceSettings balanceSettings; - EXPECT_FALSE(balanceSettings.includeSearchResultsInGraph()); - - stk::balance::StkBalanceSettings stkBalanceSettings; - EXPECT_TRUE(stkBalanceSettings.includeSearchResultsInGraph()); - - stk::balance::BasicGeometricSettings basicGeometricSettings; - EXPECT_FALSE(basicGeometricSettings.includeSearchResultsInGraph()); - - stk::balance::GraphCreationSettings graphCreationSettings; - EXPECT_TRUE(graphCreationSettings.includeSearchResultsInGraph()); - - stk::balance::GraphCreationSettingsWithCustomTolerances graphCreationSettingsWithCustomTolerances; - EXPECT_TRUE(graphCreationSettingsWithCustomTolerances.includeSearchResultsInGraph()); - - stk::balance::BasicZoltan2Settings basicZoltan2Settings; - EXPECT_FALSE(basicZoltan2Settings.includeSearchResultsInGraph()); - - stk::balance::UserSpecifiedVertexWeightsSetting userSpecifiedVertexWeightsSetting; - EXPECT_FALSE(userSpecifiedVertexWeightsSetting.includeSearchResultsInGraph()); - - stk::balance::GraphCreationSettingsForZoltan2 graphCreationSettingsForZoltan2; - EXPECT_TRUE(graphCreationSettingsWithCustomTolerances.includeSearchResultsInGraph()); - - stk::mesh::MetaData meta(3); - stk::mesh::BulkData bulk(meta, MPI_COMM_WORLD); - stk::balance::DoubleFieldType& field = meta.declare_field(stk::topology::NODE_RANK, "dummy", 1); - stk::balance::FieldVertexWeightSettings fieldVertexWeightSettings(bulk, field); - EXPECT_FALSE(fieldVertexWeightSettings.includeSearchResultsInGraph()); - - stk::balance::MultipleCriteriaSettings multipleCriteriaSettings({&field}); - EXPECT_FALSE(multipleCriteriaSettings.includeSearchResultsInGraph()); - - stk::balance::BasicColoringSettings basicColoringSettings; - EXPECT_FALSE(basicColoringSettings.includeSearchResultsInGraph()); - - stk::balance::BasicColoringByTopologySettings basicColoringByTopologySettings; - EXPECT_FALSE(basicColoringByTopologySettings.includeSearchResultsInGraph()); -} - -TEST_F(BalanceCommandLine, toggleContactSearchStatus) -{ - stk::balance::BalanceSettings balanceSettings; - balanceSettings.setIncludeSearchResultsInGraph(true); - EXPECT_FALSE(balanceSettings.includeSearchResultsInGraph()); - - stk::balance::StkBalanceSettings stkBalanceSettings; - stkBalanceSettings.setIncludeSearchResultsInGraph(false); - EXPECT_FALSE(stkBalanceSettings.includeSearchResultsInGraph()); - - stk::balance::BasicGeometricSettings basicGeometricSettings; - basicGeometricSettings.setIncludeSearchResultsInGraph(true); - EXPECT_FALSE(basicGeometricSettings.includeSearchResultsInGraph()); - - stk::balance::GraphCreationSettings graphCreationSettings; - graphCreationSettings.setIncludeSearchResultsInGraph(false); - EXPECT_FALSE(graphCreationSettings.includeSearchResultsInGraph()); - - stk::balance::GraphCreationSettingsWithCustomTolerances graphCreationSettingsWithCustomTolerances; - graphCreationSettingsWithCustomTolerances.setIncludeSearchResultsInGraph(false); - EXPECT_FALSE(graphCreationSettingsWithCustomTolerances.includeSearchResultsInGraph()); - - stk::balance::BasicZoltan2Settings basicZoltan2Settings; - basicZoltan2Settings.setIncludeSearchResultsInGraph(true); - EXPECT_TRUE(basicZoltan2Settings.includeSearchResultsInGraph()); - - stk::balance::UserSpecifiedVertexWeightsSetting userSpecifiedVertexWeightsSetting; - userSpecifiedVertexWeightsSetting.setIncludeSearchResultsInGraph(true); - EXPECT_TRUE(userSpecifiedVertexWeightsSetting.includeSearchResultsInGraph()); - - stk::balance::GraphCreationSettingsForZoltan2 graphCreationSettingsForZoltan2; - graphCreationSettingsForZoltan2.setIncludeSearchResultsInGraph(false); - EXPECT_FALSE(graphCreationSettingsWithCustomTolerances.includeSearchResultsInGraph()); - - stk::mesh::MetaData meta(3); - stk::mesh::BulkData bulk(meta, MPI_COMM_WORLD); - stk::balance::DoubleFieldType& field = meta.declare_field(stk::topology::NODE_RANK, "dummy", 1); - stk::balance::FieldVertexWeightSettings fieldVertexWeightSettings(bulk, field); - fieldVertexWeightSettings.setIncludeSearchResultsInGraph(true); - EXPECT_TRUE(fieldVertexWeightSettings.includeSearchResultsInGraph()); - - stk::balance::MultipleCriteriaSettings multipleCriteriaSettings({&field}); - multipleCriteriaSettings.setIncludeSearchResultsInGraph(true); - EXPECT_TRUE(multipleCriteriaSettings.includeSearchResultsInGraph()); - - stk::balance::BasicColoringSettings basicColoringSettings; - basicColoringSettings.setIncludeSearchResultsInGraph(true); - EXPECT_FALSE(basicColoringSettings.includeSearchResultsInGraph()); - - stk::balance::BasicColoringByTopologySettings basicColoringByTopologySettings; - basicColoringByTopologySettings.setIncludeSearchResultsInGraph(true); - EXPECT_FALSE(basicColoringByTopologySettings.includeSearchResultsInGraph()); -} - -class BalanceCommandLineWithOutputDir : public BalanceCommandLine -{ -protected: - BalanceCommandLineWithOutputDir() - { - argv.push_back("exe"); - argv.push_back("infile"); - argv.push_back("outputDir"); - } - - stk::balance::ParsedOptions test_command_line(stk::balance::AppTypeDefaults expectedAppDefaults) - { - const std::string quickExample = ""; - - MPI_Comm comm(MPI_COMM_WORLD); - - std::vector argvCstr = get_argv_c_strings(); - stk::balance::ParsedOptions balanceOptions = stk::balance::parse_balance_command_line(argvCstr.size(), - argvCstr.data(), - argv[0], comm); - - EXPECT_EQ(expectedAppDefaults, balanceOptions.appTypeDefaults); - EXPECT_EQ(argv[1], balanceOptions.m_inFile); - EXPECT_EQ(argv[2], balanceOptions.outputDirectory); - return balanceOptions; - } - - void add_defaults_flag(const std::string &defaultsName) - { - std::string defaultsFlag = stk::dash_it(defaultsName); - argv.push_back(defaultsFlag.c_str()); - } -}; - -TEST_F(BalanceCommandLineWithOutputDir, parseSmDefaultOption_smDefaultSet) -{ - add_defaults_flag(stk::balance::CommandLineOptions().smDefaults.name); - test_command_line(stk::balance::SM_DEFAULTS); -} - + check_absolute_tolerance_for_face_search(balanceSettings, 0.0001); } diff --git a/packages/stk/stk_unit_tests/stk_balance/UnitTestFileNames.cpp b/packages/stk/stk_unit_tests/stk_balance/UnitTestFileNames.cpp new file mode 100644 index 000000000000..17090d98c013 --- /dev/null +++ b/packages/stk/stk_unit_tests/stk_balance/UnitTestFileNames.cpp @@ -0,0 +1,84 @@ +// Copyright 2002 - 2008, 2010, 2011 National Technology Engineering +// Solutions of Sandia, LLC (NTESS). Under the terms of Contract +// DE-NA0003525 with NTESS, the U.S. Government retains certain rights +// in this software. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following +// disclaimer in the documentation and/or other materials provided +// with the distribution. +// +// * Neither the name of NTESS nor the names of its contributors +// may be used to endorse or promote products derived from this +// software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +#include "gtest/gtest.h" +#include "stk_unit_test_utils/MeshFixture.hpp" +#include "stk_balance/setup/FileValidator.hpp" +#include "stk_balance/setup/Parser.hpp" + +class InputSanity : public stk::unit_test_util::MeshFixture +{ +public: + InputSanity() + : validator(get_comm()) + { } + +protected: + stk::balance::FileValidator validator; +}; + +TEST_F(InputSanity, verifyThrowIfInputFileEqualsOutputFile) +{ + if (get_parallel_size() == 1) { + std::string serialMeshName = "sixteen_hex_transient.e"; + std::string parallelOutputMeshName = "sixteen_hex_transient.e"; + + EXPECT_TRUE(validator.serial_input_equals_output(serialMeshName, parallelOutputMeshName)); + } +} + +TEST_F(InputSanity, verifyThrowIfInputFileEqualsDotSlashOutputFile) +{ + if (get_parallel_size() == 1) { + std::string serialMeshName = "sixteen_hex_transient.e"; + std::string parallelOutputMeshName = "./sixteen_hex_transient.e"; + + EXPECT_TRUE(validator.serial_input_equals_output(serialMeshName, parallelOutputMeshName)); + } +} + +TEST(BalanceOutputFile, checkOutputFileFromInputFileWithoutPath) +{ + EXPECT_EQ(stk::balance::construct_output_file_name("/home/code/results", "input.e"), "/home/code/results/input.e"); +} + +TEST(BalanceOutputFile, checkOutputFileFromInputFileAndOutputFileWithExtraBackslash) +{ + EXPECT_EQ(stk::balance::construct_output_file_name("/home/code/results/", "input.e"), "/home/code/results//input.e"); +} + +TEST(BalanceOutputFile, checkOutputFileFromInputFileWithPath) +{ + EXPECT_EQ(stk::balance::construct_output_file_name("/home/code/results", "/another/directory/input.e"), "/home/code/results/input.e"); +} + diff --git a/packages/stk/stk_unit_tests/stk_balance/UnitTestingGeometricMethodsWithSelector.cpp b/packages/stk/stk_unit_tests/stk_balance/UnitTestGeometricMethodsWithSelector.cpp similarity index 100% rename from packages/stk/stk_unit_tests/stk_balance/UnitTestingGeometricMethodsWithSelector.cpp rename to packages/stk/stk_unit_tests/stk_balance/UnitTestGeometricMethodsWithSelector.cpp diff --git a/packages/stk/stk_unit_tests/stk_balance/UnitTestSpiderElements.cpp b/packages/stk/stk_unit_tests/stk_balance/UnitTestSpiderElements.cpp index 0cee56a2d95f..fda2d2bda200 100644 --- a/packages/stk/stk_unit_tests/stk_balance/UnitTestSpiderElements.cpp +++ b/packages/stk/stk_unit_tests/stk_balance/UnitTestSpiderElements.cpp @@ -1,120 +1,841 @@ -#include -#include #include -#include "stk_util/parallel/ParallelReduce.hpp" -#include "stk_mesh/base/Comm.hpp" -#include "stk_mesh/base/FieldBase.hpp" -#include "stk_io/IossBridge.hpp" -#include "stk_unit_test_utils/getOption.h" -#include "stk_balance/internal/privateDeclarations.hpp" -#include "stk_balance/balance.hpp" -#include "stk_mesh/base/Selector.hpp" -#include "stk_balance/internal/Zoltan2ParallelGraph.hpp" - -namespace -{ +#include +#include +#include +#include + +namespace { -class SpiderElementMesh : public stk::unit_test_util::MeshFixture +class SpiderElement : public stk::unit_test_util::MeshFixture { protected: - void setup_spider_mesh(const std::string & meshSpec, stk::mesh::BulkData::AutomaticAuraOption auraOption) - { - setup_empty_mesh(auraOption); - - stk::mesh::Part& spherePart = get_meta().declare_part_with_topology("spheres", stk::topology::PARTICLE); - stk::mesh::Part& beamPart = get_meta().declare_part_with_topology("beams", stk::topology::BEAM_2); - - stk::io::put_io_part_attribute(spherePart); - stk::io::put_io_part_attribute(beamPart); - - stk::mesh::Field & field = get_meta().declare_field>(stk::topology::NODE_RANK, "beam_connectivity_count"); - const int initValue = 0; - stk::mesh::put_field_on_mesh(field, get_meta().universal_part(), &initValue); - - stk::io::fill_mesh(meshSpec, get_bulk()); - - std::vector entity_counts; - stk::mesh::comm_mesh_counts(get_bulk(), entity_counts); - const size_t numNodes = entity_counts[stk::topology::NODE_RANK]; - const size_t numElems = entity_counts[stk::topology::ELEM_RANK]; - - const stk::mesh::EntityId sphereNodeID = numNodes+1; - - get_bulk().modification_begin(); - - if (get_bulk().parallel_rank() == 0) { - stk::mesh::EntityId elemID = numElems+1; - stk::mesh::EntityIdVector nodes = {sphereNodeID}; - stk::mesh::declare_element(get_bulk(), spherePart, elemID, nodes); - } - else { - get_bulk().declare_node(sphereNodeID); - } - - stk::mesh::Entity sphereNode = get_bulk().get_entity(stk::topology::NODE_RANK, sphereNodeID); - stk::mesh::FieldBase * coordsField = get_meta().get_field(stk::topology::NODE_RANK,"coordinates"); - EXPECT_TRUE(coordsField != nullptr); - double * coords = reinterpret_cast(stk::mesh::field_data(*coordsField, sphereNode)); - coords[0] = 0.0; - coords[1] = -1.0; - coords[2] = 0.0; - - for (int otherProc = 0; otherProc < get_bulk().parallel_size(); ++otherProc) { - if (otherProc != get_bulk().parallel_rank()) { - get_bulk().add_node_sharing(sphereNode, otherProc); - } - } - - std::vector newBeamIds; - get_bulk().generate_new_ids(stk::topology::ELEM_RANK, numNodes, newBeamIds); - - size_t idIndex = 0; - stk::mesh::EntityVector nodes; - stk::mesh::get_selected_entities(get_meta().locally_owned_part(), get_bulk().buckets(stk::topology::NODE_RANK), nodes); - for (stk::mesh::Entity node : nodes) { - double * nodeCoords = reinterpret_cast(stk::mesh::field_data(*coordsField, node)); - if (nodeCoords[1] < 0.5 && nodeCoords[1] > -0.5) { - stk::mesh::EntityIdVector beamNodes = {sphereNodeID, get_bulk().identifier(node)}; - stk::mesh::declare_element(get_bulk(), beamPart, newBeamIds[idIndex++], beamNodes); - } - } - - get_bulk().modification_end(); - - stk::mesh::EntityProcVec beamsToMove; - if (get_bulk().parallel_rank() != 0) { - stk::mesh::EntityVector beams; - stk::mesh::get_selected_entities(beamPart & get_meta().locally_owned_part(), get_bulk().buckets(stk::topology::ELEM_RANK), beams); - for (stk::mesh::Entity beam : beams) { - beamsToMove.push_back(std::make_pair(beam, 0)); - } - } - get_bulk().change_entity_owner(beamsToMove); + SpiderElement() + { + m_balanceSettings.setShouldFixSpiders(true); + const int initValue = 0; + + stk::mesh::Field & beamConnectivityField = + get_meta().declare_field>(stk::topology::NODE_RANK, + m_balanceSettings.getSpiderBeamConnectivityCountFieldName()); + stk::mesh::put_field_on_mesh(beamConnectivityField, get_meta().universal_part(), &initValue); + + stk::mesh::Field & volumeConnectivityField = + get_meta().declare_field>(stk::topology::ELEM_RANK, + m_balanceSettings.getSpiderVolumeConnectivityCountFieldName()); + stk::mesh::put_field_on_mesh(volumeConnectivityField, get_meta().universal_part(), &initValue); + + setup_empty_mesh(stk::mesh::BulkData::AUTO_AURA); + } + + void make_mesh_non_spider_no_volume_elements() + { + std::string meshDesc = "2,1,BEAM_2,1,7\n" + "2,2,BEAM_2,2,7\n" + "2,3,BEAM_2,3,7\n" + "2,4,BEAM_2,4,7\n" + "3,5,BEAM_2,5,7\n" + "3,6,BEAM_2,6,7\n"; + + std::vector coordinates { + 0,0,1, 0,0,0, 1,0,1, 1,0,0, 2,0,1, 2,0,0, + 1,1,0.5 + }; + + stk::unit_test_util::setup_text_mesh(get_bulk(), meshDesc, coordinates); + } + + void make_mesh_non_spider_not_enough_legs() + { + std::string meshDesc = "0,1,HEX_8,1,2,3,4,5,6,7,8\n" + "0,2,HEX_8,5,6,7,8,9,10,11,12\n" + "1,3,HEX_8,9,10,11,12,13,14,15,16\n" + "1,4,HEX_8,13,14,15,16,17,18,19,20\n" + "2,5,HEX_8,17,18,19,20,21,22,23,24\n" + "2,6,HEX_8,21,22,23,24,25,26,27,28\n" + "3,7,HEX_8,25,26,27,28,29,30,31,32\n" + "3,8,HEX_8,29,30,31,32,33,34,35,36\n" + "2,9,BEAM_2,8,37\n" + "2,10,BEAM_2,9,37\n" + "2,11,BEAM_2,12,37\n" + "3,12,BEAM_2,13,37\n" + "3,13,BEAM_2,16,37\n"; + + std::vector coordinates { + 0,1,1, 0,0,1, 0,0,0, 0,1,0, + 1,1,1, 1,0,1, 1,0,0, 1,1,0, + 2,1,1, 2,0,1, 2,0,0, 2,1,0, + 3,1,1, 3,0,1, 3,0,0, 3,1,0, + 4,1,1, 4,0,1, 4,0,0, 4,1,0, + 5,1,1, 5,0,1, 5,0,0, 5,1,0, + 6,1,1, 6,0,1, 6,0,0, 6,1,0, + 7,1,1, 7,0,1, 7,0,0, 7,1,0, + 8,1,1, 8,0,1, 8,0,0, 8,1,0, + 2,2,0.5 + }; + + stk::unit_test_util::setup_text_mesh(get_bulk(), meshDesc, coordinates); + } + + void make_mesh_one_spider_no_body_element() + { + std::string meshDesc = "0,1,HEX_8,1,2,3,4,5,6,7,8\n" + "0,2,HEX_8,5,6,7,8,9,10,11,12\n" + "1,3,HEX_8,9,10,11,12,13,14,15,16\n" + "1,4,HEX_8,13,14,15,16,17,18,19,20\n" + "2,5,HEX_8,17,18,19,20,21,22,23,24\n" + "2,6,HEX_8,21,22,23,24,25,26,27,28\n" + "3,7,HEX_8,25,26,27,28,29,30,31,32\n" + "3,8,HEX_8,29,30,31,32,33,34,35,36\n" + "2,9,BEAM_2,5,37\n" + "2,10,BEAM_2,8,37\n" + "2,11,BEAM_2,9,37\n" + "2,12,BEAM_2,12,37\n" + "3,13,BEAM_2,13,37\n" + "3,14,BEAM_2,16,37\n"; + + std::vector coordinates { + 0,1,1, 0,0,1, 0,0,0, 0,1,0, + 1,1,1, 1,0,1, 1,0,0, 1,1,0, + 2,1,1, 2,0,1, 2,0,0, 2,1,0, + 3,1,1, 3,0,1, 3,0,0, 3,1,0, + 4,1,1, 4,0,1, 4,0,0, 4,1,0, + 5,1,1, 5,0,1, 5,0,0, 5,1,0, + 6,1,1, 6,0,1, 6,0,0, 6,1,0, + 7,1,1, 7,0,1, 7,0,0, 7,1,0, + 8,1,1, 8,0,1, 8,0,0, 8,1,0, + 2,2,0.5 + }; + + stk::unit_test_util::setup_text_mesh(get_bulk(), meshDesc, coordinates); + } + + void make_mesh_one_spider_particle_body() + { + std::string meshDesc = "0,1,HEX_8,1,2,3,4,5,6,7,8\n" + "0,2,HEX_8,5,6,7,8,9,10,11,12\n" + "1,3,HEX_8,9,10,11,12,13,14,15,16\n" + "1,4,HEX_8,13,14,15,16,17,18,19,20\n" + "2,5,HEX_8,17,18,19,20,21,22,23,24\n" + "2,6,HEX_8,21,22,23,24,25,26,27,28\n" + "3,7,HEX_8,25,26,27,28,29,30,31,32\n" + "3,8,HEX_8,29,30,31,32,33,34,35,36\n" + "2,9,BEAM_2,5,37\n" + "2,10,BEAM_2,8,37\n" + "2,11,BEAM_2,9,37\n" + "2,12,BEAM_2,12,37\n" + "3,13,BEAM_2,13,37\n" + "3,14,BEAM_2,16,37\n" + "3,15,PARTICLE,37\n"; + + std::vector coordinates { + 0,1,1, 0,0,1, 0,0,0, 0,1,0, + 1,1,1, 1,0,1, 1,0,0, 1,1,0, + 2,1,1, 2,0,1, 2,0,0, 2,1,0, + 3,1,1, 3,0,1, 3,0,0, 3,1,0, + 4,1,1, 4,0,1, 4,0,0, 4,1,0, + 5,1,1, 5,0,1, 5,0,0, 5,1,0, + 6,1,1, 6,0,1, 6,0,0, 6,1,0, + 7,1,1, 7,0,1, 7,0,0, 7,1,0, + 8,1,1, 8,0,1, 8,0,0, 8,1,0, + 2,2,0.5 + }; + + stk::unit_test_util::setup_text_mesh(get_bulk(), meshDesc, coordinates); + } + + void make_mesh_one_spider_beam_body() + { + std::string meshDesc = "0,1,HEX_8,1,2,3,4,5,6,7,8\n" + "0,2,HEX_8,5,6,7,8,9,10,11,12\n" + "1,3,HEX_8,9,10,11,12,13,14,15,16\n" + "1,4,HEX_8,13,14,15,16,17,18,19,20\n" + "2,5,HEX_8,17,18,19,20,21,22,23,24\n" + "2,6,HEX_8,21,22,23,24,25,26,27,28\n" + "3,7,HEX_8,25,26,27,28,29,30,31,32\n" + "3,8,HEX_8,29,30,31,32,33,34,35,36\n" + "2,9,BEAM_2,5,37\n" + "2,10,BEAM_2,8,37\n" + "2,11,BEAM_2,9,37\n" + "2,12,BEAM_2,12,37\n" + "3,13,BEAM_2,13,37\n" + "3,14,BEAM_2,16,37\n" + "3,15,BEAM_2,37,38\n"; + + std::vector coordinates { + 0,1,1, 0,0,1, 0,0,0, 0,1,0, + 1,1,1, 1,0,1, 1,0,0, 1,1,0, + 2,1,1, 2,0,1, 2,0,0, 2,1,0, + 3,1,1, 3,0,1, 3,0,0, 3,1,0, + 4,1,1, 4,0,1, 4,0,0, 4,1,0, + 5,1,1, 5,0,1, 5,0,0, 5,1,0, + 6,1,1, 6,0,1, 6,0,0, 6,1,0, + 7,1,1, 7,0,1, 7,0,0, 7,1,0, + 8,1,1, 8,0,1, 8,0,0, 8,1,0, + 2,2,0.5, + 2,3,0.5 + }; + + stk::unit_test_util::setup_text_mesh(get_bulk(), meshDesc, coordinates); + } + + void make_mesh_compound_spider_beam_body() + { + std::string meshDesc = "0,1,HEX_8,1,2,3,4,5,6,7,8\n" + "0,2,HEX_8,5,6,7,8,9,10,11,12\n" + "1,3,HEX_8,9,10,11,12,13,14,15,16\n" + "1,4,HEX_8,13,14,15,16,17,18,19,20\n" + "2,5,HEX_8,17,18,19,20,21,22,23,24\n" + "2,6,HEX_8,21,22,23,24,25,26,27,28\n" + "3,7,HEX_8,25,26,27,28,29,30,31,32\n" + "3,8,HEX_8,29,30,31,32,33,34,35,36\n" + "2,9,BEAM_2,5,37\n" + "2,10,BEAM_2,8,37\n" + "2,11,BEAM_2,9,37\n" + "2,12,BEAM_2,12,37\n" + "3,13,BEAM_2,13,37\n" + "3,14,BEAM_2,16,37\n" + "0,15,BEAM_2,21,38\n" + "0,16,BEAM_2,24,38\n" + "0,17,BEAM_2,25,38\n" + "0,18,BEAM_2,28,38\n" + "1,19,BEAM_2,29,38\n" + "1,20,BEAM_2,32,38\n" + "3,21,BEAM_2,37,38\n"; + + std::vector coordinates { + 0,1,1, 0,0,1, 0,0,0, 0,1,0, + 1,1,1, 1,0,1, 1,0,0, 1,1,0, + 2,1,1, 2,0,1, 2,0,0, 2,1,0, + 3,1,1, 3,0,1, 3,0,0, 3,1,0, + 4,1,1, 4,0,1, 4,0,0, 4,1,0, + 5,1,1, 5,0,1, 5,0,0, 5,1,0, + 6,1,1, 6,0,1, 6,0,0, 6,1,0, + 7,1,1, 7,0,1, 7,0,0, 7,1,0, + 8,1,1, 8,0,1, 8,0,0, 8,1,0, + 2,2,0.5, + 6,2,0.5 + }; + + stk::unit_test_util::setup_text_mesh(get_bulk(), meshDesc, coordinates); + } + + void make_mesh_two_spiders_particle_body() + { + std::string meshDesc = "0,1,HEX_8,1,2,3,4,5,6,7,8\n" + "0,2,HEX_8,5,6,7,8,9,10,11,12\n" + "1,3,HEX_8,9,10,11,12,13,14,15,16\n" + "1,4,HEX_8,13,14,15,16,17,18,19,20\n" + "2,5,HEX_8,17,18,19,20,21,22,23,24\n" + "2,6,HEX_8,21,22,23,24,25,26,27,28\n" + "3,7,HEX_8,25,26,27,28,29,30,31,32\n" + "3,8,HEX_8,29,30,31,32,33,34,35,36\n" + "2,9,BEAM_2,5,37\n" + "2,10,BEAM_2,8,37\n" + "2,11,BEAM_2,9,37\n" + "2,12,BEAM_2,12,37\n" + "3,13,BEAM_2,13,37\n" + "3,14,BEAM_2,16,37\n" + "3,15,PARTICLE,37\n" + "0,16,BEAM_2,21,38\n" + "0,17,BEAM_2,24,38\n" + "0,18,BEAM_2,25,38\n" + "0,19,BEAM_2,28,38\n" + "1,20,BEAM_2,29,38\n" + "1,21,BEAM_2,32,38\n" + "1,22,PARTICLE,38\n"; + + std::vector coordinates { + 0,1,1, 0,0,1, 0,0,0, 0,1,0, + 1,1,1, 1,0,1, 1,0,0, 1,1,0, + 2,1,1, 2,0,1, 2,0,0, 2,1,0, + 3,1,1, 3,0,1, 3,0,0, 3,1,0, + 4,1,1, 4,0,1, 4,0,0, 4,1,0, + 5,1,1, 5,0,1, 5,0,0, 5,1,0, + 6,1,1, 6,0,1, 6,0,0, 6,1,0, + 7,1,1, 7,0,1, 7,0,0, 7,1,0, + 8,1,1, 8,0,1, 8,0,0, 8,1,0, + 2,2,0.5, + 6,2,0.5 + }; + + stk::unit_test_util::setup_text_mesh(get_bulk(), meshDesc, coordinates); + } + + void fix_spider_elements() + { + stk::balance::internal::fill_spider_connectivity_count_fields(get_bulk(), m_balanceSettings); + stk::balance::internal::fix_spider_elements(m_balanceSettings, get_bulk()); + } + + void check_spider_body(const stk::mesh::EntityKeyProcVec & spiderBody) + { + check_entity_key_ownership(spiderBody); + } + + void check_spider_legs(const stk::mesh::EntityKeyProcVec & spiderLegs) + { + check_entity_key_ownership(spiderLegs); + } + + void check_spider_feet(const stk::mesh::EntityKeyProcVec & spiderFeet) + { + check_entity_key_ownership(spiderFeet); + } + +private: + void check_entity_key_ownership(const stk::mesh::EntityKeyProcVec & entityKeyProcs) + { + for (const stk::mesh::EntityKeyProc & entityKeyProc : entityKeyProcs) { + if (entityKeyProc.second == get_parallel_rank()) { + const stk::mesh::Entity entity = get_bulk().get_entity(entityKeyProc.first); + EXPECT_TRUE(get_bulk().is_valid(entity) && get_bulk().bucket(entity).owned()) + << entityKeyProc.first << " not owned on proc " << entityKeyProc.second; + } } + } + + stk::balance::StkBalanceSettings m_balanceSettings; }; -TEST_F(SpiderElementMesh, move_spider_legs_to_volume_elem_proc) +// +// Initial: 7 Elem: (id:proc) +// /|\ Node: id +// /||\\ . +// //|| |\ . +// // || | \ . +// // || | \ . +// // / | \ \ . +// (2:2)// | | \ \(6:3) +// // | | | \ . +// // | | |(5:3) +// //(1:2) | | \ \ . +// // / |(4:2) | \ . +// // | | | \ . +// 2/ | 4 | 6 +// / (3:2)| \ . +// / | \ . +// 1 3 5 +// +// Final: (Same as initial) +// + +TEST_F(SpiderElement, notASpider_EnoughLegsNoVolumeElements_NoMovement) +{ + if (stk::parallel_machine_size(get_comm()) != 4) return; + + make_mesh_non_spider_no_volume_elements(); + + fix_spider_elements(); + + check_spider_body({{stk::mesh::EntityKey(stk::topology::NODE_RANK, 7), 2}}); + + check_spider_legs({{stk::mesh::EntityKey(stk::topology::ELEM_RANK, 1), 2}, + {stk::mesh::EntityKey(stk::topology::ELEM_RANK, 2), 2}, + {stk::mesh::EntityKey(stk::topology::ELEM_RANK, 3), 2}, + {stk::mesh::EntityKey(stk::topology::ELEM_RANK, 4), 2}, + {stk::mesh::EntityKey(stk::topology::ELEM_RANK, 5), 3}, + {stk::mesh::EntityKey(stk::topology::ELEM_RANK, 6), 3}}); + + check_spider_feet({{stk::mesh::EntityKey(stk::topology::NODE_RANK, 1), 2}, + {stk::mesh::EntityKey(stk::topology::NODE_RANK, 2), 2}, + {stk::mesh::EntityKey(stk::topology::NODE_RANK, 3), 2}, + {stk::mesh::EntityKey(stk::topology::NODE_RANK, 4), 2}, + {stk::mesh::EntityKey(stk::topology::NODE_RANK, 5), 3}, + {stk::mesh::EntityKey(stk::topology::NODE_RANK, 6), 3}}); +} + +// +// Initial: 37 Elem: (id:proc) +// /|\ Node: id +// /||\\ . +// / || |\ . +// / || | \ . +// / || | \ . +// / / | \ \ . +// (9:2)/ | | \ \(13:3) +// / | | | \ . +// / | | |(12:3) +// / | | \ \ . +// / / |(11:2)| \ . +// / | | | \ . +// 4------------8---------|--12-----|-----16-----------20-----------24-----------28-----------32-----------36 +// /| /| (10:2)| /| \ /| /| /| /| /| /| +// / | / | |/ | \ / | / | / | / | / | / | +// 1------------5------------9------------13-----------17-----------21-----------25-----------29-----------33 | +// | | | | | | | | | | | | | | | | | | +// | | (1:0) | | (2:0) | | (3:1) | | (4:1) | | (5:2) | | (6:2) | | (7:3) | | (8:3) | | +// | | | | | | | | | | | | | | | | | | +// | 3---------|--7---------|--11--------|--15--------|--19--------|--23--------|--27--------|--31--------|--35 +// | / | / | / | / | / | / | / | / | / +// |/ |/ |/ |/ |/ |/ |/ |/ |/ +// 2------------6------------10-----------14-----------18-----------22-----------26-----------30-----------34 +// +// +// Final: (Same as initial) +// + +TEST_F(SpiderElement, notASpider_NotEnoughLegs_NoMovement) +{ + if (stk::parallel_machine_size(get_comm()) != 4) return; + + make_mesh_non_spider_not_enough_legs(); + + fix_spider_elements(); + + check_spider_body({{stk::mesh::EntityKey(stk::topology::NODE_RANK, 37), 2}}); + + check_spider_legs({{stk::mesh::EntityKey(stk::topology::ELEM_RANK, 9), 2}, + {stk::mesh::EntityKey(stk::topology::ELEM_RANK, 10), 2}, + {stk::mesh::EntityKey(stk::topology::ELEM_RANK, 11), 2}, + {stk::mesh::EntityKey(stk::topology::ELEM_RANK, 12), 3}, + {stk::mesh::EntityKey(stk::topology::ELEM_RANK, 13), 3}}); + + check_spider_feet({{stk::mesh::EntityKey(stk::topology::NODE_RANK, 5), 0}, + {stk::mesh::EntityKey(stk::topology::NODE_RANK, 8), 0}, + {stk::mesh::EntityKey(stk::topology::NODE_RANK, 9), 0}, + {stk::mesh::EntityKey(stk::topology::NODE_RANK, 12), 0}, + {stk::mesh::EntityKey(stk::topology::NODE_RANK, 13), 1}, + {stk::mesh::EntityKey(stk::topology::NODE_RANK, 16), 1}}); +} + + + + + +// +// Initial: 37 Elem: (id:proc) +// /|\ Node: id +// /||\\ . +// //|| |\ . +// // || | \ . +// // || | \ . +// // / | \ \ . +// (10:2)// | | \ \(14:3) +// // | | | \ . +// // | | |(13:3) +// //(9:2) | | \ \ . +// // / |(12:2)| \ . +// // | | | \ . +// 4------------8/--------|--12-----|-----16-----------20-----------24-----------28-----------32-----------36 +// /| // (11:2)| /| \ /| /| /| /| /| /| +// / | //| |/ | \ / | / | / | / | / | / | +// 1------------5------------9------------13-----------17-----------21-----------25-----------29-----------33 | +// | | | | | | | | | | | | | | | | | | +// | | (1:0) | | (2:0) | | (3:1) | | (4:1) | | (5:2) | | (6:2) | | (7:3) | | (8:3) | | +// | | | | | | | | | | | | | | | | | | +// | 3---------|--7---------|--11--------|--15--------|--19--------|--23--------|--27--------|--31--------|--35 +// | / | / | / | / | / | / | / | / | / +// |/ |/ |/ |/ |/ |/ |/ |/ |/ +// 2------------6------------10-----------14-----------18-----------22-----------26-----------30-----------34 +// +// +// Final: 37 Elem: (id:proc) +// /|\ Node: id +// /||\\ . +// //|| |\ . +// // || | \ . +// // || | \ . +// // / | \ \ . +// (10:0)// | | \ \(14:1) +// // | | | \ . +// // | | |(13:1) +// //(9:0) | | \ \ . +// // / |(12:0)| \ . +// // | | | \ . +// 4------------8/--------|--12-----|-----16-----------20-----------24-----------28-----------32-----------36 +// /| // (11:0)| /| \ /| /| /| /| /| /| +// / | //| |/ | \ / | / | / | / | / | / | +// 1------------5------------9------------13-----------17-----------21-----------25-----------29-----------33 | +// | | | | | | | | | | | | | | | | | | +// | | (1:0) | | (2:0) | | (3:1) | | (4:1) | | (5:2) | | (6:2) | | (7:3) | | (8:3) | | +// | | | | | | | | | | | | | | | | | | +// | 3---------|--7---------|--11--------|--15--------|--19--------|--23--------|--27--------|--31--------|--35 +// | / | / | / | / | / | / | / | / | / +// |/ |/ |/ |/ |/ |/ |/ |/ |/ +// 2------------6------------10-----------14-----------18-----------22-----------26-----------30-----------34 +// +// + +TEST_F(SpiderElement, oneSpider_NoBodyElement) +{ + if (stk::parallel_machine_size(get_comm()) != 4) return; + + make_mesh_one_spider_no_body_element(); + + fix_spider_elements(); + + check_spider_body({{stk::mesh::EntityKey(stk::topology::NODE_RANK, 37), 0}}); + + check_spider_legs({{stk::mesh::EntityKey(stk::topology::ELEM_RANK, 9), 0}, + {stk::mesh::EntityKey(stk::topology::ELEM_RANK, 10), 0}, + {stk::mesh::EntityKey(stk::topology::ELEM_RANK, 11), 0}, + {stk::mesh::EntityKey(stk::topology::ELEM_RANK, 12), 0}, + {stk::mesh::EntityKey(stk::topology::ELEM_RANK, 13), 1}, + {stk::mesh::EntityKey(stk::topology::ELEM_RANK, 14), 1}}); + + check_spider_feet({{stk::mesh::EntityKey(stk::topology::NODE_RANK, 5), 0}, + {stk::mesh::EntityKey(stk::topology::NODE_RANK, 8), 0}, + {stk::mesh::EntityKey(stk::topology::NODE_RANK, 9), 0}, + {stk::mesh::EntityKey(stk::topology::NODE_RANK, 12), 0}, + {stk::mesh::EntityKey(stk::topology::NODE_RANK, 13), 1}, + {stk::mesh::EntityKey(stk::topology::NODE_RANK, 16), 1}}); +} + +// +// Initial: 37 (15:3) Elem: (id:proc) +// /|\ Node: id +// /||\\ . +// //|| |\ . +// // || | \ . +// // || | \ . +// // / | \ \ . +// (10:2)// | | \ \(14:3) +// // | | | \ . +// // | | |(13:3) +// //(9:2) | | \ \ . +// // / |(12:2)| \ . +// // | | | \ . +// 4------------8/--------|--12-----|-----16-----------20-----------24-----------28-----------32-----------36 +// /| // (11:2)| /| \ /| /| /| /| /| /| +// / | //| |/ | \ / | / | / | / | / | / | +// 1------------5------------9------------13-----------17-----------21-----------25-----------29-----------33 | +// | | | | | | | | | | | | | | | | | | +// | | (1:0) | | (2:0) | | (3:1) | | (4:1) | | (5:2) | | (6:2) | | (7:3) | | (8:3) | | +// | | | | | | | | | | | | | | | | | | +// | 3---------|--7---------|--11--------|--15--------|--19--------|--23--------|--27--------|--31--------|--35 +// | / | / | / | / | / | / | / | / | / +// |/ |/ |/ |/ |/ |/ |/ |/ |/ +// 2------------6------------10-----------14-----------18-----------22-----------26-----------30-----------34 +// +// +// Final: 37 (15:0) Elem: (id:proc) +// /|\ Node: id +// /||\\ . +// //|| |\ . +// // || | \ . +// // || | \ . +// // / | \ \ . +// (10:0)// | | \ \(14:1) +// // | | | \ . +// // | | |(13:1) +// //(9:0) | | \ \ . +// // / |(12:0)| \ . +// // | | | \ . +// 4------------8/--------|--12-----|-----16-----------20-----------24-----------28-----------32-----------36 +// /| // (11:0)| /| \ /| /| /| /| /| /| +// / | //| |/ | \ / | / | / | / | / | / | +// 1------------5------------9------------13-----------17-----------21-----------25-----------29-----------33 | +// | | | | | | | | | | | | | | | | | | +// | | (1:0) | | (2:0) | | (3:1) | | (4:1) | | (5:2) | | (6:2) | | (7:3) | | (8:3) | | +// | | | | | | | | | | | | | | | | | | +// | 3---------|--7---------|--11--------|--15--------|--19--------|--23--------|--27--------|--31--------|--35 +// | / | / | / | / | / | / | / | / | / +// |/ |/ |/ |/ |/ |/ |/ |/ |/ +// 2------------6------------10-----------14-----------18-----------22-----------26-----------30-----------34 +// +// + +TEST_F(SpiderElement, oneSpider_ParticleBody) +{ + if (stk::parallel_machine_size(get_comm()) != 4) return; + + make_mesh_one_spider_particle_body(); + + fix_spider_elements(); + + check_spider_body({{stk::mesh::EntityKey(stk::topology::NODE_RANK, 37), 0}, + {stk::mesh::EntityKey(stk::topology::ELEM_RANK, 15), 0}}); + + check_spider_legs({{stk::mesh::EntityKey(stk::topology::ELEM_RANK, 9), 0}, + {stk::mesh::EntityKey(stk::topology::ELEM_RANK, 10), 0}, + {stk::mesh::EntityKey(stk::topology::ELEM_RANK, 11), 0}, + {stk::mesh::EntityKey(stk::topology::ELEM_RANK, 12), 0}, + {stk::mesh::EntityKey(stk::topology::ELEM_RANK, 13), 1}, + {stk::mesh::EntityKey(stk::topology::ELEM_RANK, 14), 1}}); + + check_spider_feet({{stk::mesh::EntityKey(stk::topology::NODE_RANK, 5), 0}, + {stk::mesh::EntityKey(stk::topology::NODE_RANK, 8), 0}, + {stk::mesh::EntityKey(stk::topology::NODE_RANK, 9), 0}, + {stk::mesh::EntityKey(stk::topology::NODE_RANK, 12), 0}, + {stk::mesh::EntityKey(stk::topology::NODE_RANK, 13), 1}, + {stk::mesh::EntityKey(stk::topology::NODE_RANK, 16), 1}}); +} + + +// Initial: (15:3) Elem: (id:proc) +// 37------------38 Node: id +// /|\ . +// /||\\ . +// //|| |\ . +// // || | \ . +// // || | \ . +// // / | \ \ . +// (10:2)// | | \ \(14:3) +// // | | | \ . +// // | | |(13:3) +// //(9:2) | | \ \ . +// // / |(12:2)| \ . +// // | | | \ . +// 4------------8/--------|--12-----|-----16-----------20-----------24-----------28-----------32-----------36 +// /| // (11:2)| /| \ /| /| /| /| /| /| +// / | //| |/ | \ / | / | / | / | / | / | +// 1------------5------------9------------13-----------17-----------21-----------25-----------29-----------33 | +// | | | | | | | | | | | | | | | | | | +// | | (1:0) | | (2:0) | | (3:1) | | (4:1) | | (5:2) | | (6:2) | | (7:3) | | (8:3) | | +// | | | | | | | | | | | | | | | | | | +// | 3---------|--7---------|--11--------|--15--------|--19--------|--23--------|--27--------|--31--------|--35 +// | / | / | / | / | / | / | / | / | / +// |/ |/ |/ |/ |/ |/ |/ |/ |/ +// 2------------6------------10-----------14-----------18-----------22-----------26-----------30-----------34 +// +// +// Final: (15:0) Elem: (id:proc) +// 37------------38 Node: id +// /|\ . +// /||\\ . +// //|| |\ . +// // || | \ . +// // || | \ . +// // / | \ \ . +// (10:0)// | | \ \(14:1) +// // | | | \ . +// // | | |(13:1) +// //(9:0) | | \ \ . +// // / |(12:0)| \ . +// // | | | \ . +// 4------------8/--------|--12-----|-----16-----------20-----------24-----------28-----------32-----------36 +// /| // (11:0)| /| \ /| /| /| /| /| /| +// / | //| |/ | \ / | / | / | / | / | / | +// 1------------5------------9------------13-----------17-----------21-----------25-----------29-----------33 | +// | | | | | | | | | | | | | | | | | | +// | | (1:0) | | (2:0) | | (3:1) | | (4:1) | | (5:2) | | (6:2) | | (7:3) | | (8:3) | | +// | | | | | | | | | | | | | | | | | | +// | 3---------|--7---------|--11--------|--15--------|--19--------|--23--------|--27--------|--31--------|--35 +// | / | / | / | / | / | / | / | / | / +// |/ |/ |/ |/ |/ |/ |/ |/ |/ +// 2------------6------------10-----------14-----------18-----------22-----------26-----------30-----------34 +// +// + +TEST_F(SpiderElement, oneSpider_BeamBody) +{ + if (stk::parallel_machine_size(get_comm()) != 4) return; + + make_mesh_one_spider_beam_body(); + + fix_spider_elements(); + + check_spider_body({{stk::mesh::EntityKey(stk::topology::NODE_RANK, 37), 0}, + {stk::mesh::EntityKey(stk::topology::ELEM_RANK, 15), 0}}); + + check_spider_legs({{stk::mesh::EntityKey(stk::topology::ELEM_RANK, 9), 0}, + {stk::mesh::EntityKey(stk::topology::ELEM_RANK, 10), 0}, + {stk::mesh::EntityKey(stk::topology::ELEM_RANK, 11), 0}, + {stk::mesh::EntityKey(stk::topology::ELEM_RANK, 12), 0}, + {stk::mesh::EntityKey(stk::topology::ELEM_RANK, 13), 1}, + {stk::mesh::EntityKey(stk::topology::ELEM_RANK, 14), 1}}); + + check_spider_feet({{stk::mesh::EntityKey(stk::topology::NODE_RANK, 5), 0}, + {stk::mesh::EntityKey(stk::topology::NODE_RANK, 8), 0}, + {stk::mesh::EntityKey(stk::topology::NODE_RANK, 9), 0}, + {stk::mesh::EntityKey(stk::topology::NODE_RANK, 12), 0}, + {stk::mesh::EntityKey(stk::topology::NODE_RANK, 13), 1}, + {stk::mesh::EntityKey(stk::topology::NODE_RANK, 16), 1}}); +} + +// +// Initial: 37--------------------------------------------------38 Elem: (id:proc) +// /|\ (21:3) /|\ Node: id +// /||\\ /||\\ . +// //|| |\ //|| |\ . +// // || | \ // || | \ . +// // || | \ // || | \ . +// // / | \ \ // / | \ \ . +// (10:2)// | | \ \(14:3) (16:0)// | | \ \(20:1) +// // | | | \ // | | | \ . +// // | | |(13:3) // | | |(19:1) +// //(9:2) | | \ \ //(15:0)| | \ \ . +// // / |(12:2)| \ // / |(18:0)| \ . +// // | | | \ // | | | \ . +// 4------------8/--------|--12-----|-----16-----------20-----------24--------|--28-----|-----32-----------36 +// /| // (11:2)| /| \ /| /| // (17:0)| /| \ /| /| +// / | //| |/ | \ / | / | //| |/ | \ / | / | +// 1------------5------------9------------13-----------17-----------21-----------25-----------29-----------33 | +// | | | | | | | | | | | | | | | | | | +// | | (1:0) | | (2:0) | | (3:1) | | (4:1) | | (5:2) | | (6:2) | | (7:3) | | (8:3) | | +// | | | | | | | | | | | | | | | | | | +// | 3---------|--7---------|--11--------|--15--------|--19--------|--23--------|--27--------|--31--------|--35 +// | / | / | / | / | / | / | / | / | / +// |/ |/ |/ |/ |/ |/ |/ |/ |/ +// 2------------6------------10-----------14-----------18-----------22-----------26-----------30-----------34 +// +// +// Final: 37--------------------------------------------------38 Elem: (id:proc) +// /|\ (21:0) /|\ Node: id +// /||\\ /||\\ . +// //|| |\ //|| |\ . +// // || | \ // || | \ . +// // || | \ // || | \ . +// // / | \ \ // / | \ \ . +// (10:0)// | | \ \(14:1) (16:2)// | | \ \(20:3) +// // | | | \ // | | | \ . +// // | | |(13:1) // | | |(19:3) +// //(9:0) | | \ \ //(15:2)| | \ \ . +// // / |(12:0)| \ // / |(18:2)| \ . +// // | | | \ // | | | \ . +// 4------------8/--------|--12-----|-----16-----------20-----------24--------|--28-----|-----32-----------36 +// /| // (11:0)| /| \ /| /| // (17:2)| /| \ /| /| +// / | //| |/ | \ / | / | //| |/ | \ / | / | +// 1------------5------------9------------13-----------17-----------21-----------25-----------29-----------33 | +// | | | | | | | | | | | | | | | | | | +// | | (1:0) | | (2:0) | | (3:1) | | (4:1) | | (5:2) | | (6:2) | | (7:3) | | (8:3) | | +// | | | | | | | | | | | | | | | | | | +// | 3---------|--7---------|--11--------|--15--------|--19--------|--23--------|--27--------|--31--------|--35 +// | / | / | / | / | / | / | / | / | / +// |/ |/ |/ |/ |/ |/ |/ |/ |/ +// 2------------6------------10-----------14-----------18-----------22-----------26-----------30-----------34 +// +// +// +// +TEST_F(SpiderElement, compoundSpider_BeamBody) +{ + if (stk::parallel_machine_size(get_comm()) != 4) return; + + make_mesh_compound_spider_beam_body(); + + fix_spider_elements(); + + check_spider_body({{stk::mesh::EntityKey(stk::topology::NODE_RANK, 37), 0}, + {stk::mesh::EntityKey(stk::topology::NODE_RANK, 38), 0}, + {stk::mesh::EntityKey(stk::topology::ELEM_RANK, 21), 0}}); + + check_spider_legs({{stk::mesh::EntityKey(stk::topology::ELEM_RANK, 9), 0}, + {stk::mesh::EntityKey(stk::topology::ELEM_RANK, 10), 0}, + {stk::mesh::EntityKey(stk::topology::ELEM_RANK, 11), 0}, + {stk::mesh::EntityKey(stk::topology::ELEM_RANK, 12), 0}, + {stk::mesh::EntityKey(stk::topology::ELEM_RANK, 13), 1}, + {stk::mesh::EntityKey(stk::topology::ELEM_RANK, 14), 1}, + + {stk::mesh::EntityKey(stk::topology::ELEM_RANK, 15), 2}, + {stk::mesh::EntityKey(stk::topology::ELEM_RANK, 16), 2}, + {stk::mesh::EntityKey(stk::topology::ELEM_RANK, 17), 2}, + {stk::mesh::EntityKey(stk::topology::ELEM_RANK, 18), 2}, + {stk::mesh::EntityKey(stk::topology::ELEM_RANK, 19), 3}, + {stk::mesh::EntityKey(stk::topology::ELEM_RANK, 20), 3}}); + + check_spider_feet({{stk::mesh::EntityKey(stk::topology::NODE_RANK, 5), 0}, + {stk::mesh::EntityKey(stk::topology::NODE_RANK, 8), 0}, + {stk::mesh::EntityKey(stk::topology::NODE_RANK, 9), 0}, + {stk::mesh::EntityKey(stk::topology::NODE_RANK, 12), 0}, + {stk::mesh::EntityKey(stk::topology::NODE_RANK, 13), 1}, + {stk::mesh::EntityKey(stk::topology::NODE_RANK, 16), 1}, + + {stk::mesh::EntityKey(stk::topology::NODE_RANK, 21), 2}, + {stk::mesh::EntityKey(stk::topology::NODE_RANK, 24), 2}, + {stk::mesh::EntityKey(stk::topology::NODE_RANK, 25), 2}, + {stk::mesh::EntityKey(stk::topology::NODE_RANK, 28), 2}, + {stk::mesh::EntityKey(stk::topology::NODE_RANK, 29), 3}, + {stk::mesh::EntityKey(stk::topology::NODE_RANK, 32), 3}}); +} + + +// +// Initial: 37 (15:3) 38 (22:1) Elem: (id:proc) +// /|\ /|\ Node: id +// /||\\ /||\\ . +// //|| |\ //|| |\ . +// // || | \ // || | \ . +// // || | \ // || | \ . +// // / | \ \ // / | \ \ . +// (10:2)// | | \ \(14:3) (17:0)// | | \ \(21:1) +// // | | | \ // | | | \ . +// // | | |(13:3) // | | |(20:1) +// //(9:2) | | \ \ //(16:0)| | \ \ . +// // / |(12:2)| \ // / |(19:0)| \ . +// // | | | \ // | | | \ . +// 4------------8/--------|--12-----|-----16-----------20-----------24--------|--28-----|-----32-----------36 +// /| // (11:2)| /| \ /| /| // (18:0)| /| \ /| /| +// / | //| |/ | \ / | / | //| |/ | \ / | / | +// 1------------5------------9------------13-----------17-----------21-----------25-----------29-----------33 | +// | | | | | | | | | | | | | | | | | | +// | | (1:0) | | (2:0) | | (3:1) | | (4:1) | | (5:2) | | (6:2) | | (7:3) | | (8:3) | | +// | | | | | | | | | | | | | | | | | | +// | 3---------|--7---------|--11--------|--15--------|--19--------|--23--------|--27--------|--31--------|--35 +// | / | / | / | / | / | / | / | / | / +// |/ |/ |/ |/ |/ |/ |/ |/ |/ +// 2------------6------------10-----------14-----------18-----------22-----------26-----------30-----------34 +// +// +// Final: 37 (15:0) 38 (22:2) Elem: (id:proc) +// /|\ /|\ Node: id +// /||\\ /||\\ . +// //|| |\ //|| |\ . +// // || | \ // || | \ . +// // || | \ // || | \ . +// // / | \ \ // / | \ \ . +// (10:0)// | | \ \(14:1) (17:2)// | | \ \(21:3) +// // | | | \ // | | | \ . +// // | | |(13:1) // | | |(20:3) +// //(9:0) | | \ \ //(16:2)| | \ \ . +// // / |(12:0)| \ // / |(19:2)| \ . +// // | | | \ // | | | \ . +// 4------------8/--------|--12-----|-----16-----------20-----------24--------|--28-----|-----32-----------36 +// /| // (11:0)| /| \ /| /| // (18:2)| /| \ /| /| +// / | //| |/ | \ / | / | //| |/ | \ / | / | +// 1------------5------------9------------13-----------17-----------21-----------25-----------29-----------33 | +// | | | | | | | | | | | | | | | | | | +// | | (1:0) | | (2:0) | | (3:1) | | (4:1) | | (5:2) | | (6:2) | | (7:3) | | (8:3) | | +// | | | | | | | | | | | | | | | | | | +// | 3---------|--7---------|--11--------|--15--------|--19--------|--23--------|--27--------|--31--------|--35 +// | / | / | / | / | / | / | / | / | / +// |/ |/ |/ |/ |/ |/ |/ |/ |/ +// 2------------6------------10-----------14-----------18-----------22-----------26-----------30-----------34 +// +// +// +// +TEST_F(SpiderElement, twoSpiders_ParticleBody) { - std::string meshSpec = stk::unit_test_util::get_option("--mesh-spec", "generated:30x3x30"); - - setup_spider_mesh(meshSpec, stk::mesh::BulkData::NO_AUTO_AURA); - //stk::io::write_mesh("before_junk.g", get_bulk()); - - stk::balance::GraphCreationSettings graphSettings; - graphSettings.setShouldFixSpiders(true); - stk::balance::balanceStkMesh(graphSettings, get_bulk()); - //stk::io::write_mesh("after_junk.g", get_bulk()); - - stk::mesh::EntityVector beams; - stk::mesh::get_selected_entities(get_meta().get_topology_root_part(stk::topology::BEAM_2) & get_meta().locally_owned_part(), - get_bulk().buckets(stk::topology::ELEM_RANK), beams); - const int localNumBeams = beams.size(); - int globalNumBeams = 0; - - stk::all_reduce_sum(get_bulk().parallel(), &localNumBeams, &globalNumBeams, 1); - const int targetNumBeams = globalNumBeams / get_bulk().parallel_size(); - const double beamNumError = std::abs(localNumBeams - targetNumBeams) / (double)targetNumBeams; - EXPECT_LE(beamNumError, 0.1); + if (stk::parallel_machine_size(get_comm()) != 4) return; + + make_mesh_two_spiders_particle_body(); + + fix_spider_elements(); + + check_spider_body({{stk::mesh::EntityKey(stk::topology::NODE_RANK, 37), 0}, + {stk::mesh::EntityKey(stk::topology::ELEM_RANK, 15), 0}, + + {stk::mesh::EntityKey(stk::topology::NODE_RANK, 38), 2}, + {stk::mesh::EntityKey(stk::topology::ELEM_RANK, 22), 2}}); + + check_spider_legs({{stk::mesh::EntityKey(stk::topology::ELEM_RANK, 9), 0}, + {stk::mesh::EntityKey(stk::topology::ELEM_RANK, 10), 0}, + {stk::mesh::EntityKey(stk::topology::ELEM_RANK, 11), 0}, + {stk::mesh::EntityKey(stk::topology::ELEM_RANK, 12), 0}, + {stk::mesh::EntityKey(stk::topology::ELEM_RANK, 13), 1}, + {stk::mesh::EntityKey(stk::topology::ELEM_RANK, 14), 1}, + + {stk::mesh::EntityKey(stk::topology::ELEM_RANK, 16), 2}, + {stk::mesh::EntityKey(stk::topology::ELEM_RANK, 17), 2}, + {stk::mesh::EntityKey(stk::topology::ELEM_RANK, 18), 2}, + {stk::mesh::EntityKey(stk::topology::ELEM_RANK, 19), 2}, + {stk::mesh::EntityKey(stk::topology::ELEM_RANK, 20), 3}, + {stk::mesh::EntityKey(stk::topology::ELEM_RANK, 21), 3}}); + + check_spider_feet({{stk::mesh::EntityKey(stk::topology::NODE_RANK, 5), 0}, + {stk::mesh::EntityKey(stk::topology::NODE_RANK, 8), 0}, + {stk::mesh::EntityKey(stk::topology::NODE_RANK, 9), 0}, + {stk::mesh::EntityKey(stk::topology::NODE_RANK, 12), 0}, + {stk::mesh::EntityKey(stk::topology::NODE_RANK, 13), 1}, + {stk::mesh::EntityKey(stk::topology::NODE_RANK, 16), 1}, + + {stk::mesh::EntityKey(stk::topology::NODE_RANK, 21), 2}, + {stk::mesh::EntityKey(stk::topology::NODE_RANK, 24), 2}, + {stk::mesh::EntityKey(stk::topology::NODE_RANK, 25), 2}, + {stk::mesh::EntityKey(stk::topology::NODE_RANK, 28), 2}, + {stk::mesh::EntityKey(stk::topology::NODE_RANK, 29), 3}, + {stk::mesh::EntityKey(stk::topology::NODE_RANK, 32), 3}}); } -} // namespace +} diff --git a/packages/stk/stk_unit_tests/stk_disimd/UnitTestStk_DISIMD_MathDouble.cpp b/packages/stk/stk_unit_tests/stk_disimd/UnitTestStk_DISIMD_MathDouble.cpp index 4993d0742998..71ab11c105be 100644 --- a/packages/stk/stk_unit_tests/stk_disimd/UnitTestStk_DISIMD_MathDouble.cpp +++ b/packages/stk/stk_unit_tests/stk_disimd/UnitTestStk_DISIMD_MathDouble.cpp @@ -391,6 +391,57 @@ TEST_F(MathFunctionWithBoolAndTwoDoubleArg, DISimd_Ternary_ScalarAndSimdMatch) } +class SimdDoubleBool : public ::testing::Test +{ +public: + stk::simd::Double zeros_ones() + { + for (int i=0; i -#include #include "mpi.h" +#include #include #include #include @@ -41,7 +41,7 @@ namespace { -Iofx::DatabaseIO* create_output_db_io(const std::string &filename) +Ioss::DatabaseIO* create_output_db_io(const std::string &filename) { Ioss::Init::Initializer init_db; @@ -52,7 +52,8 @@ Iofx::DatabaseIO* create_output_db_io(const std::string &filename) properties.add(Ioss::Property("INTEGER_SIZE_DB", 8)); properties.add(Ioss::Property("INTEGER_SIZE_API", 8)); - Iofx::DatabaseIO *db_io = new Iofx::DatabaseIO(NULL, filename, db_usage, communicator, properties); + Ioss::DatabaseIO *db_io = Ioss::IOFactory::create("exodus", filename, db_usage, + communicator, properties); return db_io; } @@ -70,7 +71,7 @@ TEST(StkIo, write_stk_mesh_to_file) const stk::mesh::PartVector & all_parts = meta.get_parts(); - Iofx::DatabaseIO* db_io = create_output_db_io(file_written); + Ioss::DatabaseIO* db_io = create_output_db_io(file_written); Ioss::Region output_region(db_io); EXPECT_TRUE(db_io->ok()); diff --git a/packages/stk/stk_unit_tests/stk_mesh/UnitTestAura.cpp b/packages/stk/stk_unit_tests/stk_mesh/UnitTestAura.cpp index b711056138f7..a47c3eb4d5a1 100644 --- a/packages/stk/stk_unit_tests/stk_mesh/UnitTestAura.cpp +++ b/packages/stk/stk_unit_tests/stk_mesh/UnitTestAura.cpp @@ -36,6 +36,7 @@ #include // for size_t #include // for BulkData #include // for declare_element +#include #include "mpi.h" // for MPI_COMM_WORLD, etc #include "stk_mesh/base/Bucket.hpp" // for Bucket #include "stk_mesh/base/BulkDataInlinedMethods.hpp" @@ -43,6 +44,7 @@ #include "stk_mesh/base/MetaData.hpp" // for MetaData #include "stk_mesh/base/Types.hpp" // for PartVector, EntityId, etc #include "stk_topology/topology.hpp" // for topology, etc +#include "stk_io/FillMesh.hpp" namespace stk { namespace mesh { class Part; } } @@ -57,6 +59,10 @@ class FieldBase; namespace { +constexpr stk::mesh::EntityState Unchanged = stk::mesh::EntityState::Unchanged; +constexpr stk::mesh::EntityState Created = stk::mesh::EntityState::Created; +constexpr stk::mesh::EntityState Modified = stk::mesh::EntityState::Modified; + stk::mesh::Part& setupDavidNobleTestCase(stk::mesh::BulkData& bulk) { // @@ -209,5 +215,228 @@ TEST(BulkDataTest, testRemovingPartsOnNodeSharedWithOneProcAndAuraToAnotherProc) } } +void disconnect_elem1_on_proc0(stk::mesh::BulkData& bulk) +{ + bulk.modification_begin(); + + if (bulk.parallel_rank() == 0) { + stk::mesh::EntityId elemId = 1; + stk::mesh::Entity elem1 = bulk.get_entity(stk::topology::ELEM_RANK, elemId); + + const unsigned numSharedNodes = 4; + stk::mesh::EntityId sharedNodeIds[] = {5, 6, 8, 7}; + stk::mesh::ConnectivityOrdinal nodeOrds[] = {4, 5, 6, 7}; + stk::mesh::EntityId newNodeIds[] = {13, 14, 16, 15}; + + for(unsigned n=0; n // for pair #include // for vector, etc -namespace stk -{ -namespace mesh -{ -class FieldBase; -void communicateSharedEntityInfo(stk::mesh::BulkData &mesh, stk::CommSparse &comm, std::vector > &shared_entities); - -} -} - using stk::mesh::Part; using stk::mesh::MetaData; using stk::mesh::BulkData; @@ -3140,8 +3131,6 @@ TEST(BulkData, ModificationEnd) EXPECT_FALSE(stkMeshBulkData->is_valid(iter->entity)); } - // stkMeshBulkData->my_internal_resolve_shared_modify_delete(); - std::vector globalCounts; stk::mesh::comm_mesh_counts(*stkMeshBulkData, globalCounts); @@ -5900,7 +5889,7 @@ TEST(FaceCreation, test_face_creation_2Hexes_2procs) EXPECT_EQ(1u, shared_entities_by_proc[otherProc].size()); stk::CommSparse comm(mesh.parallel()); - communicateSharedEntityInfo(mesh, comm, shared_entities_by_proc); + stk::mesh::impl::communicate_shared_entity_info(mesh, comm, shared_entities_by_proc); mesh.my_unpackEntityInfromFromOtherProcsAndMarkEntitiesAsSharedAndTrackProcessorsThatNeedAlsoHaveEntity(comm, potentially_shared_sides); EXPECT_TRUE(mesh.my_internal_is_entity_marked(side) == stk::mesh::BulkData::IS_SHARED); diff --git a/packages/stk/stk_unit_tests/stk_mesh/UnitTestCEOME.cpp b/packages/stk/stk_unit_tests/stk_mesh/UnitTestCEOME.cpp index 2c4c9903c386..ab2a0f324511 100644 --- a/packages/stk/stk_unit_tests/stk_mesh/UnitTestCEOME.cpp +++ b/packages/stk/stk_unit_tests/stk_mesh/UnitTestCEOME.cpp @@ -415,8 +415,8 @@ TEST(CEOME, TwoElemGiveAllEntitiesToOneProcAndCheckParts) TEST(CEOME, change_entity_owner_4Elem4ProcEdge) { - // This unit-test is designed to test the conditions that results that - // resulted in the difficult-to-fix rebalance use-case bug. Specifically, + // This unit-test is designed to test the conditions that resulted + // in the difficult-to-fix rebalance use-case bug. Specifically, // it will test the changing-of-ownership of a shared edge to a proc that // either ghosted it or did not know about it. // diff --git a/packages/stk/stk_unit_tests/stk_mesh/UnitTestFEMHelper.cpp b/packages/stk/stk_unit_tests/stk_mesh/UnitTestFEMHelper.cpp index 9ad48ed1159f..d8e60c5c963e 100644 --- a/packages/stk/stk_unit_tests/stk_mesh/UnitTestFEMHelper.cpp +++ b/packages/stk/stk_unit_tests/stk_mesh/UnitTestFEMHelper.cpp @@ -228,9 +228,9 @@ void build_element_from_topology_verify_ordinals_and_permutations(stk::mesh::Bul { edge_nodes.clear(); - stk::mesh::Entity edge = bulk.declare_edge(edge_ids[i], stk::mesh::ConstPartVector{&meta.get_topology_root_part(topo.edge_topology())}); + stk::mesh::Entity edge = bulk.declare_edge(edge_ids[i], stk::mesh::ConstPartVector{&meta.get_topology_root_part(topo.edge_topology(i))}); - for (uint j = 0; j < topo.edge_topology().num_nodes(); ++j) + for (uint j = 0; j < topo.edge_topology(i).num_nodes(); ++j) { stk::mesh::Entity edge_node = bulk.get_entity(stk::topology::NODE_RANK, gold_edge_node_ids[i][j]); edge_nodes.push_back(edge_node); @@ -311,9 +311,9 @@ void verify_unbuildable_element(stk::mesh::BulkData &bulk, { edge_nodes.clear(); - stk::mesh::Entity edge = bulk.declare_edge(edge_ids[i], stk::mesh::ConstPartVector{&meta.get_topology_root_part(topo.edge_topology())}); + stk::mesh::Entity edge = bulk.declare_edge(edge_ids[i], stk::mesh::ConstPartVector{&meta.get_topology_root_part(topo.edge_topology(i))}); - for (uint j = 0; j < topo.edge_topology().num_nodes(); ++j) + for (uint j = 0; j < topo.edge_topology(i).num_nodes(); ++j) { stk::mesh::Entity edge_node = bulk.get_entity(stk::topology::NODE_RANK, gold_edge_node_ids[i][j]); edge_nodes.push_back(edge_node); diff --git a/packages/stk/stk_unit_tests/stk_mesh/UnitTestForEachEntityLoopAbstractions.cpp b/packages/stk/stk_unit_tests/stk_mesh/UnitTestForEachEntityLoopAbstractions.cpp index 29e3cd7b6ce2..f1b61f23a14e 100644 --- a/packages/stk/stk_unit_tests/stk_mesh/UnitTestForEachEntityLoopAbstractions.cpp +++ b/packages/stk/stk_unit_tests/stk_mesh/UnitTestForEachEntityLoopAbstractions.cpp @@ -11,7 +11,7 @@ #include "stk_io/FillMesh.hpp" #include "stk_mesh/base/BulkDataInlinedMethods.hpp" #include "stk_mesh/base/Entity.hpp" -#include "stk_mesh/baseImpl/ForEachEntityLoopAbstractions.hpp" +#include "stk_mesh/base/ForEachEntity.hpp" #include "stk_topology/topology.hpp" #include "stk_util/parallel/Parallel.hpp" namespace stk { namespace mesh { struct MeshIndex; } } @@ -37,7 +37,7 @@ TEST(ForEntityFunctionInMeshImplUtils, test_counting_nodes_using_raw_bucket_loop { unsigned numNodes = 0; stk::mesh::impl::for_each_selected_entity_run_no_threads(bulkData, stk::topology::NODE_RANK, metaData.universal_part(), - [&numNodes](stk::mesh::BulkData & mesh, const stk::mesh::MeshIndex & meshIndex) + [&numNodes](const stk::mesh::BulkData & mesh, const stk::mesh::MeshIndex & meshIndex) { stk::mesh::Entity entity = stk::mesh::impl::get_entity(meshIndex); if(mesh.is_valid(entity)) @@ -68,18 +68,16 @@ TEST(ForEntityFunctionInMeshImplUtils, test_counting_nodes_using_raw_bucket_loop ASSERT_EQ(16u, numNodes); std::vector localIds(numNodes); unsigned index = 0; - stk::mesh::impl::for_each_entity_run_no_threads(bulkData, stk::topology::NODE_RANK, - [&index](stk::mesh::BulkData & mesh, const stk::mesh::MeshIndex & meshIndex) - { - stk::mesh::Entity node = stk::mesh::impl::get_entity(meshIndex); - if(mesh.is_valid(node)) - { - mesh.set_local_id(node, index); - index++; - } + const stk::mesh::BucketVector& buckets = bulkData.get_buckets(stk::topology::NODE_RANK, metaData.universal_part()); + for(const stk::mesh::Bucket* bptr : buckets) { + for(stk::mesh::Entity node : *bptr) { + if (bulkData.is_valid(node)) { + bulkData.set_local_id(node, index); + ++index; } - ); - stk::mesh::impl::for_each_entity_run(bulkData, stk::topology::NODE_RANK, + } + } + stk::mesh::for_each_entity_run(bulkData, stk::topology::NODE_RANK, [&localIds](const stk::mesh::BulkData & mesh, const stk::mesh::MeshIndex & meshIndex) { stk::mesh::Entity node = stk::mesh::impl::get_entity(meshIndex); diff --git a/packages/stk/stk_unit_tests/stk_mesh/UnitTestSelector.cpp b/packages/stk/stk_unit_tests/stk_mesh/UnitTestSelector.cpp index 80c87422880f..79861fea428d 100644 --- a/packages/stk/stk_unit_tests/stk_mesh/UnitTestSelector.cpp +++ b/packages/stk/stk_unit_tests/stk_mesh/UnitTestSelector.cpp @@ -809,6 +809,7 @@ TEST( UnitTestRootTopology, getPartsDoesNotFindAutoCreatedRootParts ) , stk::topology::TRI_4 , stk::topology::TRI_6 , stk::topology::QUAD_4 + , stk::topology::QUAD_6 , stk::topology::QUAD_8 , stk::topology::QUAD_9 //ELEMENT_RANK diff --git a/packages/stk/stk_unit_tests/stk_mesh/entitySorting/UnitTestEntitySorting.cpp b/packages/stk/stk_unit_tests/stk_mesh/entitySorting/UnitTestEntitySorting.cpp index f7e6b995cf3b..303eacf7ef87 100644 --- a/packages/stk/stk_unit_tests/stk_mesh/entitySorting/UnitTestEntitySorting.cpp +++ b/packages/stk/stk_unit_tests/stk_mesh/entitySorting/UnitTestEntitySorting.cpp @@ -7,7 +7,7 @@ #include #include #include -#include +#include namespace { @@ -92,7 +92,7 @@ class EntitySortingFixture : public stk::unit_test_util::MeshFixture void verify_node_ordering() { EntityLessCoords entityLessCoords(get_bulk()); - stk::mesh::impl::for_each_entity_run(get_bulk(), stk::topology::NODE_RANK, + stk::mesh::for_each_entity_run(get_bulk(), stk::topology::NODE_RANK, [&entityLessCoords](const stk::mesh::BulkData& bulk, const stk::mesh::MeshIndex& meshIndex) { if(meshIndex.bucket_ordinal > 0) diff --git a/packages/stk/stk_unit_tests/stk_mesh/face_creation/element_graph/UnitTestElemElemGraphChangeOwner.cpp b/packages/stk/stk_unit_tests/stk_mesh/face_creation/element_graph/UnitTestElemElemGraphChangeOwner.cpp index c7634c49bf2f..b0f31827992f 100644 --- a/packages/stk/stk_unit_tests/stk_mesh/face_creation/element_graph/UnitTestElemElemGraphChangeOwner.cpp +++ b/packages/stk/stk_unit_tests/stk_mesh/face_creation/element_graph/UnitTestElemElemGraphChangeOwner.cpp @@ -69,9 +69,6 @@ void expect_elem_connected_to_remote_elem_id_via_side(const stk::mesh::BulkData& class ElemGraphChangeOwner : public stk::unit_test_util::MeshTestFixture { protected: - typedef std::pair EntityIdProc; - typedef std::vector EntityIdProcVector; - void expect_initial_graph_correct() { if(get_bulk().parallel_rank() == 0) @@ -152,10 +149,10 @@ class ElemGraphChangeOwner : public stk::unit_test_util::MeshTestFixture EXPECT_EQ(perm, parInfo.m_permutation); } - void move_elements(const EntityIdProcVector &elementIdProcsToMove) + void move_elements(const stk::mesh::EntityIdProcVec &elementIdProcsToMove) { stk::mesh::EntityProcVec elemProcPairsToMove; - for(const EntityIdProc &entityIdProc : elementIdProcsToMove) + for(const stk::mesh::EntityIdProc &entityIdProc : elementIdProcsToMove) append_element_if_owned(entityIdProc.first, entityIdProc.second, elemProcPairsToMove); get_bulk().change_entity_owner(elemProcPairsToMove); } @@ -213,7 +210,7 @@ class ElemGraphChangeOwnerMoveFrom1To0 : public ElemGraphChangeOwner { create_elem_graph(); expect_initial_graph_correct(); - move_elements({EntityIdProc(3, 0)}); + move_elements({stk::mesh::EntityIdProc(3, 0)}); expect_graph_updated_after_elem_3_moved_to_0(); } @@ -302,7 +299,7 @@ class ElemGraphChangeOwnerMoveEverythingFromProc1 : public ElemGraphChangeOwner { create_elem_graph(); expect_initial_graph_correct(); - move_elements({EntityIdProc(3, 0), EntityIdProc(4, 0)}); + move_elements({stk::mesh::EntityIdProc(3, 0), stk::mesh::EntityIdProc(4, 0)}); if (get_bulk().parallel_rank() == 0) { stk::mesh::Entity elem3 = get_bulk().get_entity(stk::topology::ELEM_RANK, 3); @@ -338,7 +335,7 @@ class ElemGraphChangeOwnerLeapFrog : public ElemGraphChangeOwner { create_elem_graph(); expect_initial_graph_correct(); - move_elements({EntityIdProc(2, 1), EntityIdProc(3, 2)}); + move_elements({stk::mesh::EntityIdProc(2, 1), stk::mesh::EntityIdProc(3, 2)}); if (get_bulk().parallel_rank() == 1) { stk::mesh::Entity elem2 = get_bulk().get_entity(stk::topology::ELEM_RANK, 2); @@ -376,7 +373,7 @@ class ElemGraphChangeOwnerMoveNeighborsToEnd : public ElemGraphChangeOwner { create_elem_graph(); expect_initial_graph_correct(); - move_elements({EntityIdProc(2, 2), EntityIdProc(3, 2)}); + move_elements({stk::mesh::EntityIdProc(2, 2), stk::mesh::EntityIdProc(3, 2)}); if (get_bulk().parallel_rank() == 2) { stk::mesh::Entity elem2 = get_bulk().get_entity(stk::topology::ELEM_RANK, 2); @@ -423,7 +420,7 @@ class ElemGraphChangeOwnerMoveNeighborsToDifferentProcs : public ElemGraphChange { create_elem_graph(); check_initial_graph(); - move_elements({EntityIdProc(1, 1), EntityIdProc(3, 3)}); + move_elements({stk::mesh::EntityIdProc(1, 1), stk::mesh::EntityIdProc(3, 3)}); if (get_bulk().parallel_rank() == 1) { stk::mesh::Entity elem1 = get_bulk().get_entity(stk::topology::ELEM_RANK, 1); diff --git a/packages/stk/stk_unit_tests/stk_mesh/ngp/KokkosNodalVolume.cpp b/packages/stk/stk_unit_tests/stk_mesh/ngp/KokkosNodalVolume.cpp index e7b64d712d72..7eb98fd119f7 100644 --- a/packages/stk/stk_unit_tests/stk_mesh/ngp/KokkosNodalVolume.cpp +++ b/packages/stk/stk_unit_tests/stk_mesh/ngp/KokkosNodalVolume.cpp @@ -54,8 +54,9 @@ #include #include #include +#include #include -#include +#include #include #include #include @@ -134,7 +135,7 @@ void calculate_nodal_volume_stkmesh_entity_loop(stk::mesh::BulkData& mesh, const stk::mesh::FieldBase& coords = *mesh.mesh_meta_data().coordinate_field(); for(int n=0; nbegin_nodes(elem.bucket_ordinal); const unsigned numNodesPerElem = elem.bucket->topology().num_nodes(); @@ -165,7 +166,7 @@ void calculate_nodal_volume_given_elem_volume(const stk::mesh::NgpMesh &ngpMesh, STK_FUNCTION double calculate_element_volume(const stk::mesh::NgpMesh &ngpMesh, stk::mesh::NgpMesh::ConnectedNodes nodes, - const stk::mesh::NgpConstField &coords) + const stk::mesh::NgpField &coords) { double min[3] = {DBL_MAX, DBL_MAX, DBL_MAX}; double max[3] = {DBL_MIN, DBL_MIN, DBL_MIN}; @@ -186,7 +187,7 @@ double calculate_element_volume(const stk::mesh::NgpMesh &ngpMesh, STK_FUNCTION void calculate_nodal_volume_device(const stk::mesh::NgpMesh &ngpMesh, const stk::mesh::FastMeshIndex& elem, - const stk::mesh::NgpConstField &coords, + const stk::mesh::NgpField &coords, const stk::mesh::NgpField &nodalVolume) { stk::mesh::NgpMesh::ConnectedNodes nodes = ngpMesh.get_nodes(stk::topology::ELEM_RANK, elem); @@ -195,7 +196,7 @@ void calculate_nodal_volume_device(const stk::mesh::NgpMesh &ngpMesh, calculate_nodal_volume_given_elem_volume(ngpMesh, nodes, elemVolumePerNode, nodalVolume); } -void calculate_nodal_volume(stk::mesh::NgpMesh &ngpMesh, stk::mesh::Selector selector, const stk::mesh::NgpConstField &coords, stk::mesh::NgpField &nodalVolume) +void calculate_nodal_volume(stk::mesh::NgpMesh &ngpMesh, stk::mesh::Selector selector, const stk::mesh::NgpField &coords, stk::mesh::NgpField &nodalVolume) { stk::mesh::for_each_entity_run(ngpMesh, stk::topology::ELEM_RANK, selector, KOKKOS_LAMBDA(const stk::mesh::FastMeshIndex& elem) @@ -212,8 +213,8 @@ void calculate_nodal_volume_entity_loop(stk::mesh::BulkData& mesh, { double start = stk::wall_time(); const stk::mesh::FieldBase& coords = *mesh.mesh_meta_data().coordinate_field(); - stk::mesh::NgpConstField ngpCoords(mesh, coords); - stk::mesh::NgpField ngpNodalVolume(mesh, nodalVolumeField); + stk::mesh::NgpField& ngpCoords = stk::mesh::get_updated_ngp_field(coords); + stk::mesh::NgpField& ngpNodalVolume = stk::mesh::get_updated_ngp_field(nodalVolumeField); stk::mesh::NgpMesh & ngpMesh = mesh.get_updated_ngp_mesh(); double middle = stk::wall_time(); @@ -233,8 +234,8 @@ void repeat_for_each_entity_loop_for_algorithm(stk::mesh::BulkData& mesh, int numRepeat, const Algorithm &algorithm) { - stk::mesh::NgpField staticNodalVolume(mesh, nodalVolumeField); - stk::mesh::NgpField staticElemVolume(mesh, elemVolumePerNodeField); + stk::mesh::NgpField& staticNodalVolume = stk::mesh::get_updated_ngp_field(nodalVolumeField); + stk::mesh::NgpField& staticElemVolume = stk::mesh::get_updated_ngp_field(elemVolumePerNodeField); stk::mesh::NgpMesh & ngpMesh = mesh.get_updated_ngp_mesh(); for(int n=0; n +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +namespace { + +class NgpDebugFieldSync : public stk::unit_test_util::MeshFixture +{ +public: + template + void initialize_ngp_field(stk::mesh::Field & stkField) + { + stk::mesh::get_updated_ngp_field(stkField); + } + + void set_initial_part_membership(stk::mesh::BulkData & bulk, stk::mesh::Part & part1, stk::mesh::Part & part2) + { + stk::mesh::PartVector addParts1(1, &part1); + stk::mesh::PartVector addParts2(1, &part2); + stk::mesh::EntityVector allElements; + + bulk.get_entities(stk::topology::ELEM_RANK, bulk.mesh_meta_data().universal_part(), allElements); + + bulk.modification_begin(); + bulk.change_entity_parts(allElements[0], addParts1); + bulk.change_entity_parts(allElements[1], addParts2); + bulk.modification_end(); + } + + void modify_mesh_part_membership(stk::mesh::BulkData & bulk, const std::string & partName) + { + stk::mesh::Part & meshModPart = *bulk.mesh_meta_data().get_part(partName); + stk::mesh::PartVector addParts(1, &meshModPart); + stk::mesh::EntityVector allElements; + + bulk.get_entities(stk::topology::ELEM_RANK, bulk.mesh_meta_data().universal_part(), allElements); + + bulk.modification_begin(); + bulk.change_entity_parts(allElements[1], addParts); + bulk.modification_end(); + } + + template + stk::mesh::Field & create_scalar_field(stk::topology::rank_t rank, const std::string & name) + { + unsigned numStates = 1; + const T init = 1; + stk::mesh::Field & field = get_meta().declare_field>(rank, name, numStates); + stk::mesh::put_field_on_mesh(field, get_meta().universal_part(), &init); + return field; + } + + template + stk::mesh::Field & create_scalar_multistate_field(stk::topology::rank_t rank, const std::string & name) + { + unsigned numStates = 2; + const T init = 1; + stk::mesh::Field & field = get_meta().declare_field>(rank, name, numStates); + stk::mesh::put_field_on_mesh(field, get_meta().universal_part(), &init); + return field; + } + + template + stk::mesh::Field & create_vector_field(stk::topology::rank_t rank, const std::string & name) + { + unsigned numStates = 1; + unsigned numScalarsPerEntity = 3; + const T init[] = {1, 2, 3}; + stk::mesh::Field & field = get_meta().declare_field>(rank, name, numStates); + stk::mesh::put_field_on_mesh(field, get_meta().universal_part(), numScalarsPerEntity, init); + return field; + } + + template + void fill_initial_field(stk::mesh::Field & stkField) + { + const stk::mesh::BucketVector& buckets = get_bulk().buckets(stkField.entity_rank()); + for (stk::mesh::Bucket * bucket : buckets) { + for (const stk::mesh::Entity & entity : *bucket) { + const stk::mesh::EntityId id = get_bulk().identifier(entity); + T * fieldData = stk::mesh::field_data(stkField, entity); + const unsigned numComponents = stk::mesh::field_scalars_per_entity(stkField, *bucket); + for (unsigned component = 0; component < numComponents; ++component) { + fieldData[component] = 10*id + component; + } + } + } + } + + template + stk::mesh::Field & build_mesh_with_scalar_field(const std::string & fieldName) + { + stk::mesh::Field & stkField = create_scalar_field(stk::topology::ELEM_RANK, fieldName); + get_meta().declare_part("meshModPart1", stk::topology::ELEM_RANK); + get_meta().declare_part("meshModPart2", stk::topology::ELEM_RANK); + setup_mesh("generated:1x1x2", stk::mesh::BulkData::NO_AUTO_AURA); + fill_initial_field(stkField); + initialize_ngp_field(stkField); + return stkField; + } + + template + stk::mesh::Field & build_mesh_with_scalar_multistate_field(const std::string & fieldName) + { + stk::mesh::Field & stkField = create_scalar_multistate_field(stk::topology::ELEM_RANK, fieldName); + get_meta().declare_part("meshModPart1", stk::topology::ELEM_RANK); + get_meta().declare_part("meshModPart2", stk::topology::ELEM_RANK); + setup_mesh("generated:1x1x2", stk::mesh::BulkData::NO_AUTO_AURA); + fill_initial_field(stkField); + initialize_ngp_field(stkField); + return stkField; + } + + template + stk::mesh::Field & build_mesh_with_vector_field(const std::string & fieldName) + { + stk::mesh::Field & stkField = create_vector_field(stk::topology::ELEM_RANK, fieldName); + get_meta().declare_part("meshModPart1", stk::topology::ELEM_RANK); + get_meta().declare_part("meshModPart2", stk::topology::ELEM_RANK); + setup_mesh("generated:1x1x2", stk::mesh::BulkData::NO_AUTO_AURA); + fill_initial_field(stkField); + initialize_ngp_field(stkField); + return stkField; + } + + template + stk::mesh::Field & build_mesh_with_scalar_field_two_parts(const std::string & fieldName) + { + stk::mesh::Field & stkField = create_scalar_field(stk::topology::ELEM_RANK, fieldName); + stk::mesh::Part & dummyPart1 = get_meta().declare_part("DummyPart1", stk::topology::ELEM_RANK); + stk::mesh::Part & dummyPart2 = get_meta().declare_part("DummyPart2", stk::topology::ELEM_RANK); + get_meta().declare_part("meshModPart1", stk::topology::ELEM_RANK); + get_meta().declare_part("meshModPart2", stk::topology::ELEM_RANK); + setup_mesh("generated:1x1x2", stk::mesh::BulkData::NO_AUTO_AURA); + set_initial_part_membership(get_bulk(), dummyPart1, dummyPart2); + fill_initial_field(stkField); + initialize_ngp_field(stkField); + return stkField; + } + + template + stk::mesh::Field & build_mesh_with_vector_field_two_parts(const std::string & fieldName) + { + stk::mesh::Field & stkField = create_vector_field(stk::topology::ELEM_RANK, fieldName); + stk::mesh::Part & dummyPart1 = get_meta().declare_part("DummyPart1", stk::topology::ELEM_RANK); + stk::mesh::Part & dummyPart2 = get_meta().declare_part("DummyPart2", stk::topology::ELEM_RANK); + get_meta().declare_part("meshModPart1", stk::topology::ELEM_RANK); + get_meta().declare_part("meshModPart2", stk::topology::ELEM_RANK); + setup_mesh("generated:1x1x2", stk::mesh::BulkData::NO_AUTO_AURA); + set_initial_part_membership(get_bulk(), dummyPart1, dummyPart2); + fill_initial_field(stkField); + initialize_ngp_field(stkField); + return stkField; + } +}; + + +template +void device_field_set_all(stk::mesh::BulkData & bulk, stk::mesh::Field & stkField, T value) +{ + stk::mesh::NgpMesh & ngpMesh = bulk.get_updated_ngp_mesh(); + stk::mesh::NgpField & ngpField = stk::mesh::get_updated_ngp_field(stkField); + + ngpField.set_all(ngpMesh, value); +} + +template +void write_scalar_field_on_host_using_entity(stk::mesh::BulkData & bulk, stk::mesh::Field & stkField, T value) +{ + const stk::mesh::BucketVector& buckets = bulk.buckets(stkField.entity_rank()); + for (stk::mesh::Bucket * bucket : buckets) { + for (const stk::mesh::Entity & entity : *bucket) { + T * fieldData = stk::mesh::field_data(stkField, entity); + fieldData[0] = value; + } + } +} + +template +void write_vector_field_on_host_using_entity(stk::mesh::BulkData & bulk, stk::mesh::Field & stkField, T value) +{ + const stk::mesh::BucketVector& buckets = bulk.buckets(stkField.entity_rank()); + for (stk::mesh::Bucket * bucket : buckets) { + for (const stk::mesh::Entity & entity : *bucket) { + T * fieldData = stk::mesh::field_data(stkField, entity); + fieldData[1] = value; // Write to second component only + } + } +} + +template +void write_scalar_field_on_host_using_bucket(stk::mesh::BulkData & bulk, stk::mesh::Field & stkField, T value) +{ + const stk::mesh::BucketVector& buckets = bulk.buckets(stkField.entity_rank()); + for (stk::mesh::Bucket * bucket : buckets) { + T * fieldData = stk::mesh::field_data(stkField, *bucket); + for(size_t iEntity = 0; iEntity < bucket->size(); ++iEntity) { + fieldData[iEntity] = value; + } + } +} + +template +void write_vector_field_on_host_using_bucket(stk::mesh::BulkData & bulk, stk::mesh::Field & stkField, T value) +{ + const stk::mesh::BucketVector& buckets = bulk.buckets(stkField.entity_rank()); + for (stk::mesh::Bucket * bucket : buckets) { + T * fieldData = stk::mesh::field_data(stkField, *bucket); + for(size_t iEntity = 0; iEntity < bucket->size(); ++iEntity) { + const size_t yComponent = iEntity*3 + 1; + fieldData[yComponent] = value; + } + } +} + +template +STK_INLINE_FUNCTION +bool dummy_check(T value) +{ + return (value == 0); +} + +template +void read_scalar_field_on_host_using_entity(stk::mesh::BulkData & bulk, stk::mesh::Field & stkField) +{ + const stk::mesh::BucketVector& buckets = bulk.buckets(stkField.entity_rank()); + for (stk::mesh::Bucket * bucket : buckets) { + for (const stk::mesh::Entity & entity : *bucket) { + const T * fieldData = stk::mesh::field_data(stkField, entity); + dummy_check(fieldData[0]); + } + } +} + +template +void read_scalar_field_on_host_using_bucket(stk::mesh::BulkData & bulk, stk::mesh::Field & stkField) +{ + const stk::mesh::BucketVector& buckets = bulk.buckets(stkField.entity_rank()); + for (stk::mesh::Bucket * bucket : buckets) { + const T * fieldData = stk::mesh::field_data(stkField, *bucket); + for(size_t iEntity = 0; iEntity < bucket->size(); ++iEntity) { + dummy_check(fieldData[iEntity]); + } + } +} + +template +void read_vector_field_on_host_using_entity(stk::mesh::BulkData & bulk, stk::mesh::Field & stkField) +{ + const stk::mesh::BucketVector& buckets = bulk.buckets(stkField.entity_rank()); + for (stk::mesh::Bucket * bucket : buckets) { + for (const stk::mesh::Entity & entity : *bucket) { + const T * fieldData = stk::mesh::field_data(stkField, entity); + for (unsigned component = 0; component < 3; ++component) { + dummy_check(fieldData[component]); + } + } + } +} + +template +void read_vector_field_on_host_using_bucket(stk::mesh::BulkData & bulk, stk::mesh::Field & stkField) +{ + const stk::mesh::BucketVector& buckets = bulk.buckets(stkField.entity_rank()); + for (stk::mesh::Bucket * bucket : buckets) { + const T * fieldData = stk::mesh::field_data(stkField, *bucket); + for(size_t iEntity = 0; iEntity < bucket->size(); ++iEntity) { + for (unsigned component = 0; component < 3; ++component) { + dummy_check(fieldData[iEntity*3 + component]); + } + } + } +} + +template +void write_scalar_field_on_device(stk::mesh::BulkData & bulk, stk::mesh::Field & stkField, T value) +{ + const int component = 0; + stk::mesh::NgpMesh & ngpMesh = bulk.get_updated_ngp_mesh(); + const stk::mesh::MetaData & meta = bulk.mesh_meta_data(); + stk::mesh::NgpField & ngpField = stk::mesh::get_updated_ngp_field(stkField); + + stk::mesh::for_each_entity_run(ngpMesh, stk::topology::ELEM_RANK, meta.locally_owned_part(), + KOKKOS_LAMBDA(const stk::mesh::FastMeshIndex& entity) { + ngpField(entity, component) = value; + }); +} + +template +void write_vector_field_on_device(stk::mesh::BulkData & bulk, stk::mesh::Field & stkField, T value) +{ + const int component = 1; // Just write to the second component + stk::mesh::NgpMesh & ngpMesh = bulk.get_updated_ngp_mesh(); + const stk::mesh::MetaData & meta = bulk.mesh_meta_data(); + stk::mesh::NgpField & ngpField = stk::mesh::get_updated_ngp_field(stkField); + + stk::mesh::for_each_entity_run(ngpMesh, stk::topology::ELEM_RANK, meta.locally_owned_part(), + KOKKOS_LAMBDA(const stk::mesh::FastMeshIndex& entity) { + ngpField(entity, component) = value; + }); +} + +template +void write_vector_field_on_device_using_mesh_index(stk::mesh::BulkData & bulk, stk::mesh::Field & stkField, T value) +{ + const int component = 1; // Just write to the second component + stk::mesh::NgpMesh & ngpMesh = bulk.get_updated_ngp_mesh(); + const stk::mesh::MetaData & meta = bulk.mesh_meta_data(); + stk::mesh::NgpField & ngpField = stk::mesh::get_updated_ngp_field(stkField); + stk::NgpVector bucketIds = ngpMesh.get_bucket_ids(stkField.entity_rank(), meta.locally_owned_part()); + stk::mesh::EntityRank rank = ngpField.get_rank(); + + Kokkos::parallel_for(1, KOKKOS_LAMBDA(unsigned ) { + for (unsigned i = 0; i < bucketIds.size(); ++i) { + const stk::mesh::NgpMesh::BucketType & bucket = ngpMesh.get_bucket(rank, bucketIds.device_get(i)); + for (unsigned j = 0; j < bucket.size(); ++j) { + stk::mesh::NgpMesh::MeshIndex index{&bucket, static_cast(j)}; + ngpField(index, component) = value; + } + } + }); +} + +template +void write_vector_field_on_device_using_entity_field_data(stk::mesh::BulkData & bulk, stk::mesh::Field & stkField, T value) +{ + const int component = 1; // Just write to the second component + stk::mesh::NgpMesh & ngpMesh = bulk.get_updated_ngp_mesh(); + const stk::mesh::MetaData & meta = bulk.mesh_meta_data(); + stk::mesh::NgpField & ngpField = stk::mesh::get_updated_ngp_field(stkField); + + stk::mesh::for_each_entity_run(ngpMesh, stk::topology::ELEM_RANK, meta.locally_owned_part(), + KOKKOS_LAMBDA(const stk::mesh::FastMeshIndex& entity) { +#if defined(STK_DEBUG_FIELD_SYNC) && !defined(DEVICE_USE_LOCATION_BUILTINS) + stk::mesh::EntityFieldData vals = ngpField(entity, __FILE__, __LINE__); +#else + stk::mesh::EntityFieldData vals = ngpField(entity); +#endif + vals[component] = value; + }); +} + +template +void read_scalar_field_on_device(stk::mesh::BulkData & bulk, stk::mesh::Field & stkField) +{ + const int component = 0; + stk::mesh::NgpMesh & ngpMesh = bulk.get_updated_ngp_mesh(); + const stk::mesh::MetaData & meta = bulk.mesh_meta_data(); + stk::mesh::NgpField & ngpField = stk::mesh::get_updated_ngp_field(stkField); + stk::NgpVector bucketIds = ngpMesh.get_bucket_ids(stkField.entity_rank(), meta.locally_owned_part()); + stk::mesh::EntityRank rank = ngpField.get_rank(); + + Kokkos::parallel_for(1, KOKKOS_LAMBDA(unsigned ) { + for (unsigned i = 0; i < bucketIds.size(); ++i) { + const stk::mesh::NgpMesh::BucketType & bucket = ngpMesh.get_bucket(rank, bucketIds.device_get(i)); + for (unsigned j = 0; j < bucket.size(); ++j) { + stk::mesh::FastMeshIndex index = ngpMesh.fast_mesh_index(bucket[j]); +#if defined(STK_DEBUG_FIELD_SYNC) && !defined(DEVICE_USE_LOCATION_BUILTINS) + dummy_check(ngpField(index, component, __FILE__, __LINE__)); +#else + dummy_check(ngpField(index, component)); +#endif + } + } + }); +} + +template +void read_scalar_field_on_device(stk::mesh::BulkData & bulk, stk::mesh::Field & stkField, NGPFIELD & ngpField) +{ + const int component = 0; + stk::mesh::NgpMesh & ngpMesh = bulk.get_updated_ngp_mesh(); + const stk::mesh::MetaData & meta = bulk.mesh_meta_data(); + stk::NgpVector bucketIds = ngpMesh.get_bucket_ids(stkField.entity_rank(), meta.locally_owned_part()); + stk::mesh::EntityRank rank = ngpField.get_rank(); + + Kokkos::parallel_for(1, KOKKOS_LAMBDA(unsigned ) { + for (unsigned i = 0; i < bucketIds.size(); ++i) { + const stk::mesh::NgpMesh::BucketType & bucket = ngpMesh.get_bucket(rank, bucketIds.device_get(i)); + for (unsigned j = 0; j < bucket.size(); ++j) { + stk::mesh::FastMeshIndex index = ngpMesh.fast_mesh_index(bucket[j]); +#if defined(STK_DEBUG_FIELD_SYNC) && !defined(DEVICE_USE_LOCATION_BUILTINS) + dummy_check(ngpField(index, component, __FILE__, __LINE__)); +#else + dummy_check(ngpField(index, component)); +#endif + } + } + }); +} + +template +void read_vector_field_on_device(stk::mesh::BulkData & bulk, stk::mesh::Field & stkField) +{ + stk::mesh::NgpMesh & ngpMesh = bulk.get_updated_ngp_mesh(); + const stk::mesh::MetaData & meta = bulk.mesh_meta_data(); + stk::mesh::NgpField & ngpField = stk::mesh::get_updated_ngp_field(stkField); + stk::NgpVector bucketIds = ngpMesh.get_bucket_ids(stkField.entity_rank(), meta.locally_owned_part()); + stk::mesh::EntityRank rank = ngpField.get_rank(); + + Kokkos::parallel_for(1, KOKKOS_LAMBDA(unsigned ) { + for (unsigned i = 0; i < bucketIds.size(); ++i) { + const stk::mesh::NgpMesh::BucketType & bucket = ngpMesh.get_bucket(rank, bucketIds.device_get(i)); + for (unsigned j = 0; j < bucket.size(); ++j) { + stk::mesh::FastMeshIndex index = ngpMesh.fast_mesh_index(bucket[j]); + for (int component = 0; component < 3; ++component) { +#if defined(STK_DEBUG_FIELD_SYNC) && !defined(DEVICE_USE_LOCATION_BUILTINS) + dummy_check(ngpField(index, component, __FILE__, __LINE__)); +#else + dummy_check(ngpField(index, component)); +#endif + } + } + } + }); +} + +template +void read_vector_field_on_device_using_mesh_index(stk::mesh::BulkData & bulk, stk::mesh::Field & stkField) +{ + stk::mesh::NgpMesh & ngpMesh = bulk.get_updated_ngp_mesh(); + const stk::mesh::MetaData & meta = bulk.mesh_meta_data(); + stk::mesh::NgpField & ngpField = stk::mesh::get_updated_ngp_field(stkField); + stk::NgpVector bucketIds = ngpMesh.get_bucket_ids(stkField.entity_rank(), meta.locally_owned_part()); + stk::mesh::EntityRank rank = ngpField.get_rank(); + + Kokkos::parallel_for(1, KOKKOS_LAMBDA(unsigned ) { + for (unsigned i = 0; i < bucketIds.size(); ++i) { + const stk::mesh::NgpMesh::BucketType & bucket = ngpMesh.get_bucket(rank, bucketIds.device_get(i)); + for (unsigned j = 0; j < bucket.size(); ++j) { + stk::mesh::NgpMesh::MeshIndex index{&bucket, static_cast(j)}; + for (int component = 0; component < 3; ++component) { +#if defined(STK_DEBUG_FIELD_SYNC) && !defined(DEVICE_USE_LOCATION_BUILTINS) + dummy_check(ngpField(index, component, __FILE__, __LINE__)); +#else + dummy_check(ngpField(index, component)); +#endif + } + } + } + }); +} + +template +void read_vector_field_on_device_using_entity_field_data(stk::mesh::BulkData & bulk, stk::mesh::Field & stkField) +{ + stk::mesh::NgpMesh & ngpMesh = bulk.get_updated_ngp_mesh(); + const stk::mesh::MetaData & meta = bulk.mesh_meta_data(); + stk::mesh::NgpField & ngpField = stk::mesh::get_updated_ngp_field(stkField); + stk::NgpVector bucketIds = ngpMesh.get_bucket_ids(stkField.entity_rank(), meta.locally_owned_part()); + stk::mesh::EntityRank rank = ngpField.get_rank(); + + Kokkos::parallel_for(1, KOKKOS_LAMBDA(unsigned ) { + for (unsigned bucketId = 0; bucketId < bucketIds.size(); ++bucketId) { + const stk::mesh::NgpMesh::BucketType & bucket = ngpMesh.get_bucket(rank, bucketIds.device_get(bucketId)); + for (unsigned offset = 0; offset < bucket.size(); ++offset) { + stk::mesh::FastMeshIndex index = ngpMesh.fast_mesh_index(bucket[offset]); +#if defined(STK_DEBUG_FIELD_SYNC) && !defined(DEVICE_USE_LOCATION_BUILTINS) + stk::mesh::EntityFieldData vals = ngpField(index, __FILE__, __LINE__); +#else + stk::mesh::EntityFieldData vals = ngpField(index); +#endif + for (unsigned i = 0; i < vals.size(); ++i) { + dummy_check(vals[i]); + } + } + } + }); +} + +template +void split_lines(const std::string &s, Out result) { + std::istringstream iss(s); + std::string item; + while (std::getline(iss, item)) { + *result++ = item; + } +} + +std::vector split_lines(const std::string &s) { + std::vector elems; + split_lines(s, std::back_inserter(elems)); + return elems; +} + +void extract_warning(std::string & stdoutString, int numExpectedOccurrences, const std::string & warningString) +{ + std::vector warningLines = split_lines(stdoutString); + std::string newStdoutString; + int numFound = 0; + + for (const std::string & line : warningLines) { + const size_t loc = line.find(warningString); + if (loc != std::string::npos) { + ++numFound; + } + else { + newStdoutString += line + "\n"; + } + } + +#if defined(STK_DEBUG_FIELD_SYNC) && defined(STK_USE_DEVICE_MESH) + if (numFound != numExpectedOccurrences) { + std::cout << "Warning string found " << numFound << " times when expecting " << numExpectedOccurrences << " occurrences: \"" + << warningString << "\"" << std::endl; + ADD_FAILURE(); + } +#endif + + stdoutString = newStdoutString; +} + +void check_no_warnings(const std::string & stdoutString) +{ + std::vector warningLines = split_lines(stdoutString); + + for (const std::string & line : warningLines) { + if (!line.empty()) { + std::cout << "Found unexpected warning: \"" << line << "\"" << std::endl; + ADD_FAILURE(); + } + } +} + +void check_contains_file_name(const std::string & stdoutString, const std::string & fileName) +{ +#if defined(STK_DEBUG_FIELD_SYNC) && defined(STK_USE_DEVICE_MESH) && defined(HOST_USE_LOCATION_BUILTINS) + const size_t fileNameLoc = stdoutString.find(fileName); + EXPECT_NE(fileNameLoc, std::string::npos); +#endif +} + +void check_contains_a_line_number(const std::string & stdoutString) +{ +#if defined(STK_DEBUG_FIELD_SYNC) && defined(STK_USE_DEVICE_MESH) && defined(HOST_USE_LOCATION_BUILTINS) + const size_t colonLoc = stdoutString.find(":"); + ASSERT_NE(colonLoc, std::string::npos); + const size_t lineNumberLoc = colonLoc + 1; + int lineNumber = std::stoi(stdoutString.data()+lineNumberLoc); + EXPECT_GT(lineNumber, 0); +#endif +} + +TEST_F(NgpDebugFieldSync, ScalarAccessUsingEntity_ProperlySyncToDevice_NoWarning) +{ + if (stk::parallel_machine_size(MPI_COMM_WORLD) != 1) return; + stk::mesh::Field & stkField = build_mesh_with_scalar_field("doubleScalarField"); + + testing::internal::CaptureStdout(); + write_scalar_field_on_host_using_entity(get_bulk(), stkField, 3.14); + stkField.modify_on_host(); + stkField.sync_to_device(); + + read_scalar_field_on_device(get_bulk(), stkField); + + std::string stdoutString = testing::internal::GetCapturedStdout(); + check_no_warnings(stdoutString); +} + +TEST_F(NgpDebugFieldSync, ScalarAccessUsingEntity_MissingAllModifySyncCallsToDevice_Warning) +{ + if (stk::parallel_machine_size(MPI_COMM_WORLD) != 1) return; + stk::mesh::Field & stkField = build_mesh_with_scalar_field("doubleScalarField"); + + testing::internal::CaptureStdout(); + write_scalar_field_on_host_using_entity(get_bulk(), stkField, 3.14); + + read_scalar_field_on_device(get_bulk(), stkField); + + std::string stdoutString = testing::internal::GetCapturedStdout(); + check_contains_file_name(stdoutString, "NgpDebugFieldSyncTest.cpp"); + check_contains_a_line_number(stdoutString); + extract_warning(stdoutString, 1, "WARNING: Accessing stale data on Device for Field doubleScalarField[0]=10.000000"); + check_no_warnings(stdoutString); +} + +TEST_F(NgpDebugFieldSync, ScalarAccessUsingEntity_MissingSyncToDevice_Warning) +{ + if (stk::parallel_machine_size(MPI_COMM_WORLD) != 1) return; + stk::mesh::Field & stkField = build_mesh_with_scalar_field("doubleScalarField"); + + testing::internal::CaptureStdout(); + write_scalar_field_on_host_using_entity(get_bulk(), stkField, 3.14); + stkField.modify_on_host(); + + read_scalar_field_on_device(get_bulk(), stkField); + + std::string stdoutString = testing::internal::GetCapturedStdout(); + extract_warning(stdoutString, 1, "WARNING: Accessing stale data on Device for Field doubleScalarField[0]=10.000000"); + check_no_warnings(stdoutString); +} + +TEST_F(NgpDebugFieldSync, ScalarAccessUsingEntity_MissingModifyOnHost_Warning) +{ + if (stk::parallel_machine_size(MPI_COMM_WORLD) != 1) return; + stk::mesh::Field & stkField = build_mesh_with_scalar_field("doubleScalarField"); + + testing::internal::CaptureStdout(); + write_scalar_field_on_host_using_entity(get_bulk(), stkField, 3.14); + stkField.sync_to_device(); + + read_scalar_field_on_device(get_bulk(), stkField); + + std::string stdoutString = testing::internal::GetCapturedStdout(); + extract_warning(stdoutString, 1, "WARNING: Accessing stale data on Device for Field doubleScalarField[0]=10.000000"); + check_no_warnings(stdoutString); +} + +TEST_F(NgpDebugFieldSync, VectorAccessUsingEntity_ProperlySyncToDevice_NoWarning) +{ + if (stk::parallel_machine_size(MPI_COMM_WORLD) != 1) return; + stk::mesh::Field & stkField = build_mesh_with_vector_field("doubleVectorField"); + + testing::internal::CaptureStdout(); + write_vector_field_on_host_using_entity(get_bulk(), stkField, 3.14); + stkField.modify_on_host(); + stkField.sync_to_device(); + + read_vector_field_on_device(get_bulk(), stkField); + + std::string stdoutString = testing::internal::GetCapturedStdout(); + check_no_warnings(stdoutString); +} + +TEST_F(NgpDebugFieldSync, VectorAccessUsingEntity_MissingAllModifySyncCallsToDevice_Warning) +{ + if (stk::parallel_machine_size(MPI_COMM_WORLD) != 1) return; + stk::mesh::Field & stkField = build_mesh_with_vector_field("doubleVectorField"); + + testing::internal::CaptureStdout(); + write_vector_field_on_host_using_entity(get_bulk(), stkField, 3.14); + + read_vector_field_on_device(get_bulk(), stkField); + + std::string stdoutString = testing::internal::GetCapturedStdout(); + extract_warning(stdoutString, 1, "WARNING: Accessing stale data on Device for Field doubleVectorField[1]=11.000000"); + check_no_warnings(stdoutString); +} + +TEST_F(NgpDebugFieldSync, DeviceEntityFieldDataAccess_ProperlySyncToDevice_NoWarning) +{ + if (stk::parallel_machine_size(MPI_COMM_WORLD) != 1) return; + stk::mesh::Field & stkField = build_mesh_with_vector_field("doubleVectorField"); + + testing::internal::CaptureStdout(); + write_vector_field_on_host_using_entity(get_bulk(), stkField, 3.14); + stkField.modify_on_host(); + stkField.sync_to_device(); + + read_vector_field_on_device_using_entity_field_data(get_bulk(), stkField); + + std::string stdoutString = testing::internal::GetCapturedStdout(); + check_no_warnings(stdoutString); +} + +TEST_F(NgpDebugFieldSync, DeviceEntityFieldDataAccess_MissingAllModifySyncCallsToDevice_Warning) +{ + if (stk::parallel_machine_size(MPI_COMM_WORLD) != 1) return; + stk::mesh::Field & stkField = build_mesh_with_vector_field("doubleVectorField"); + + testing::internal::CaptureStdout(); + write_vector_field_on_host_using_entity(get_bulk(), stkField, 3.14); + + read_vector_field_on_device_using_entity_field_data(get_bulk(), stkField); + + std::string stdoutString = testing::internal::GetCapturedStdout(); + extract_warning(stdoutString, 1, "WARNING: Accessing stale data on Device for Field doubleVectorField[1]=11.000000"); + check_no_warnings(stdoutString); +} + +TEST_F(NgpDebugFieldSync, DeviceMeshIndexAccess_ProperlySyncToDevice_NoWarning) +{ + if (stk::parallel_machine_size(MPI_COMM_WORLD) != 1) return; + stk::mesh::Field & stkField = build_mesh_with_vector_field("doubleVectorField"); + + testing::internal::CaptureStdout(); + write_vector_field_on_host_using_entity(get_bulk(), stkField, 3.14); + stkField.modify_on_host(); + stkField.sync_to_device(); + + read_vector_field_on_device_using_mesh_index(get_bulk(), stkField); + + std::string stdoutString = testing::internal::GetCapturedStdout(); + check_no_warnings(stdoutString); +} + +TEST_F(NgpDebugFieldSync, DeviceMeshIndexAccess_MissingAllModifySyncCallsToDevice_Warning) +{ + if (stk::parallel_machine_size(MPI_COMM_WORLD) != 1) return; + stk::mesh::Field & stkField = build_mesh_with_vector_field("doubleVectorField"); + + testing::internal::CaptureStdout(); + write_vector_field_on_host_using_entity(get_bulk(), stkField, 3.14); + + read_vector_field_on_device_using_mesh_index(get_bulk(), stkField); + std::string stdoutString = testing::internal::GetCapturedStdout(); + extract_warning(stdoutString, 1, "WARNING: Accessing stale data on Device for Field doubleVectorField[1]=11.000000"); + check_no_warnings(stdoutString); +} + +TEST_F(NgpDebugFieldSync, ScalarIntAccessUsingEntity_ProperlySyncToDevice_NoWarning) +{ + if (stk::parallel_machine_size(MPI_COMM_WORLD) != 1) return; + stk::mesh::Field & stkField = build_mesh_with_scalar_field("intScalarField"); + + testing::internal::CaptureStdout(); + write_scalar_field_on_host_using_entity(get_bulk(), stkField, 3); + stkField.modify_on_host(); + stkField.sync_to_device(); + + read_scalar_field_on_device(get_bulk(), stkField); + + std::string stdoutString = testing::internal::GetCapturedStdout(); + check_no_warnings(stdoutString); +} + +TEST_F(NgpDebugFieldSync, ScalarIntAccessUsingEntity_MissingAllModifySyncCallsToDevice_Warning) +{ + if (stk::parallel_machine_size(MPI_COMM_WORLD) != 1) return; + stk::mesh::Field & stkField = build_mesh_with_scalar_field("intScalarField"); + + testing::internal::CaptureStdout(); + write_scalar_field_on_host_using_entity(get_bulk(), stkField, 3); + + read_scalar_field_on_device(get_bulk(), stkField); + + std::string stdoutString = testing::internal::GetCapturedStdout(); + extract_warning(stdoutString, 1, "WARNING: Accessing stale data on Device for Field intScalarField[0]=10.000000"); + check_no_warnings(stdoutString); +} + +TEST_F(NgpDebugFieldSync, VectorIntAccessUsingEntity_ProperlySyncToDevice_NoWarning) +{ + if (stk::parallel_machine_size(MPI_COMM_WORLD) != 1) return; + stk::mesh::Field & stkField = build_mesh_with_vector_field("intVectorField"); + + testing::internal::CaptureStdout(); + write_vector_field_on_host_using_entity(get_bulk(), stkField, 3); + stkField.modify_on_host(); + stkField.sync_to_device(); + + read_vector_field_on_device(get_bulk(), stkField); + + std::string stdoutString = testing::internal::GetCapturedStdout(); + check_no_warnings(stdoutString); +} + +TEST_F(NgpDebugFieldSync, VectorIntAccessUsingEntity_MissingAllModifySyncCallsToDevice_Warning) +{ + if (stk::parallel_machine_size(MPI_COMM_WORLD) != 1) return; + stk::mesh::Field & stkField = build_mesh_with_vector_field("intVectorField"); + + testing::internal::CaptureStdout(); + write_vector_field_on_host_using_entity(get_bulk(), stkField, 3); + + read_vector_field_on_device(get_bulk(), stkField); + + std::string stdoutString = testing::internal::GetCapturedStdout(); + extract_warning(stdoutString, 1, "WARNING: Accessing stale data on Device for Field intVectorField[1]=11.000000"); + check_no_warnings(stdoutString); +} + + +TEST_F(NgpDebugFieldSync, ScalarAccessUsingBucket_ProperlySyncToDevice_NoWarning) +{ + if (stk::parallel_machine_size(MPI_COMM_WORLD) != 1) return; + stk::mesh::Field & stkField = build_mesh_with_scalar_field_two_parts("doubleScalarField"); + + testing::internal::CaptureStdout(); + write_scalar_field_on_host_using_bucket(get_bulk(), stkField, 3.14); + stkField.modify_on_host(); + stkField.sync_to_device(); + + read_scalar_field_on_device(get_bulk(), stkField); + + std::string stdoutString = testing::internal::GetCapturedStdout(); + check_no_warnings(stdoutString); +} + +TEST_F(NgpDebugFieldSync, ScalarAccessUsingBucket_MissingAllModifySyncCallsToDevice_Warning) +{ + if (stk::parallel_machine_size(MPI_COMM_WORLD) != 1) return; + stk::mesh::Field & stkField = build_mesh_with_scalar_field_two_parts("doubleScalarField"); + + testing::internal::CaptureStdout(); + write_scalar_field_on_host_using_bucket(get_bulk(), stkField, 3.14); + + read_scalar_field_on_device(get_bulk(), stkField); + + std::string stdoutString = testing::internal::GetCapturedStdout(); + extract_warning(stdoutString, 1, "WARNING: Accessing stale data on Device for Field doubleScalarField[0]=10.000000"); + check_no_warnings(stdoutString); +} + +TEST_F(NgpDebugFieldSync, VectorAccessUsingBucket_ProperlySyncToDevice_NoWarning) +{ + if (stk::parallel_machine_size(MPI_COMM_WORLD) != 1) return; + stk::mesh::Field & stkField = build_mesh_with_vector_field_two_parts("doubleScalarField"); + + testing::internal::CaptureStdout(); + write_vector_field_on_host_using_bucket(get_bulk(), stkField, 3.14); + stkField.modify_on_host(); + stkField.sync_to_device(); + + read_vector_field_on_device(get_bulk(), stkField); + std::string stdoutString = testing::internal::GetCapturedStdout(); + check_no_warnings(stdoutString); +} + +TEST_F(NgpDebugFieldSync, VectorAccessUsingBucket_MissingAllModifySyncCallsToDevice_Warning) +{ + if (stk::parallel_machine_size(MPI_COMM_WORLD) != 1) return; + stk::mesh::Field & stkField = build_mesh_with_vector_field_two_parts("doubleVectorField"); + + testing::internal::CaptureStdout(); + write_vector_field_on_host_using_bucket(get_bulk(), stkField, 3.14); + + read_vector_field_on_device(get_bulk(), stkField); + + std::string stdoutString = testing::internal::GetCapturedStdout(); + extract_warning(stdoutString, 1, "WARNING: Accessing stale data on Device for Field doubleVectorField[1]=11.000000"); + check_no_warnings(stdoutString); +} + +TEST_F(NgpDebugFieldSync, VectorIntAccessUsingBucket_ProperlySyncToDevice_NoWarning) +{ + if (stk::parallel_machine_size(MPI_COMM_WORLD) != 1) return; + stk::mesh::Field & stkField = build_mesh_with_vector_field_two_parts("intScalarField"); + + testing::internal::CaptureStdout(); + write_vector_field_on_host_using_bucket(get_bulk(), stkField, 3); + stkField.modify_on_host(); + stkField.sync_to_device(); + + read_vector_field_on_device(get_bulk(), stkField); + std::string stdoutString = testing::internal::GetCapturedStdout(); + check_no_warnings(stdoutString); +} + +TEST_F(NgpDebugFieldSync, VectorIntAccessUsingBucket_MissingAllModifySyncCallsToDevice_Warning) +{ + if (stk::parallel_machine_size(MPI_COMM_WORLD) != 1) return; + stk::mesh::Field & stkField = build_mesh_with_vector_field_two_parts("intVectorField"); + + testing::internal::CaptureStdout(); + write_vector_field_on_host_using_bucket(get_bulk(), stkField, 3); + + read_vector_field_on_device(get_bulk(), stkField); + + std::string stdoutString = testing::internal::GetCapturedStdout(); + extract_warning(stdoutString, 1, "WARNING: Accessing stale data on Device for Field intVectorField[1]=11.000000"); + check_no_warnings(stdoutString); +} + + +TEST_F(NgpDebugFieldSync, ScalarAccessUsingEntity_ProperlySyncToHost_NoWarning) +{ + if (stk::parallel_machine_size(MPI_COMM_WORLD) != 1) return; + stk::mesh::Field & stkField = build_mesh_with_scalar_field("doubleScalarField"); + + testing::internal::CaptureStdout(); + write_scalar_field_on_device(get_bulk(), stkField, 3.14); + stkField.modify_on_device(); + stkField.sync_to_host(); + + read_scalar_field_on_host_using_entity(get_bulk(), stkField); + + std::string stdoutString = testing::internal::GetCapturedStdout(); + check_no_warnings(stdoutString); +} + +TEST_F(NgpDebugFieldSync, ScalarAccessUsingEntity_MissingAllModifySyncCallsToHost_Warning) +{ + if (stk::parallel_machine_size(MPI_COMM_WORLD) != 1) return; + stk::mesh::Field & stkField = build_mesh_with_scalar_field("doubleScalarField"); + + testing::internal::CaptureStdout(); + write_scalar_field_on_device(get_bulk(), stkField, 3.14); + + read_scalar_field_on_host_using_entity(get_bulk(), stkField); + + std::string stdoutString = testing::internal::GetCapturedStdout(); + check_contains_file_name(stdoutString, "NgpDebugFieldSyncTest.cpp"); + check_contains_a_line_number(stdoutString); + extract_warning(stdoutString, 1, "WARNING: Accessing stale data on Host for Field doubleScalarField[0]=10"); + extract_warning(stdoutString, 1, "WARNING: Accessing stale data on Host for Field doubleScalarField[0]=20"); + check_no_warnings(stdoutString); +} + +TEST_F(NgpDebugFieldSync, ScalarAccessUsingEntity_MissingSyncToHost_Warning) +{ + if (stk::parallel_machine_size(MPI_COMM_WORLD) != 1) return; + stk::mesh::Field & stkField = build_mesh_with_scalar_field("doubleScalarField"); + + testing::internal::CaptureStdout(); + write_scalar_field_on_device(get_bulk(), stkField, 3.14); + stkField.modify_on_device(); + + read_scalar_field_on_host_using_entity(get_bulk(), stkField); + + std::string stdoutString = testing::internal::GetCapturedStdout(); + extract_warning(stdoutString, 1, "WARNING: Accessing stale data on Host for Field doubleScalarField[0]=10"); + extract_warning(stdoutString, 1, "WARNING: Accessing stale data on Host for Field doubleScalarField[0]=20"); + check_no_warnings(stdoutString); +} + +TEST_F(NgpDebugFieldSync, ScalarAccessUsingEntity_MissingModifyOnDevice_Warning) +{ + if (stk::parallel_machine_size(MPI_COMM_WORLD) != 1) return; + stk::mesh::Field & stkField = build_mesh_with_scalar_field("doubleScalarField"); + + testing::internal::CaptureStdout(); + write_scalar_field_on_device(get_bulk(), stkField, 3.14); + stkField.sync_to_host(); + + read_scalar_field_on_host_using_entity(get_bulk(), stkField); + + std::string stdoutString = testing::internal::GetCapturedStdout(); + extract_warning(stdoutString, 1, "WARNING: Accessing stale data on Host for Field doubleScalarField[0]=10"); + extract_warning(stdoutString, 1, "WARNING: Accessing stale data on Host for Field doubleScalarField[0]=20"); + check_no_warnings(stdoutString); +} + +TEST_F(NgpDebugFieldSync, VectorAccessUsingEntity_ProperlySyncToHost_NoWarning) +{ + if (stk::parallel_machine_size(MPI_COMM_WORLD) != 1) return; + stk::mesh::Field & stkField = build_mesh_with_vector_field("doubleVectorField"); + + testing::internal::CaptureStdout(); + write_vector_field_on_device(get_bulk(), stkField, 3.14); + stkField.modify_on_device(); + stkField.sync_to_host(); + + read_vector_field_on_host_using_entity(get_bulk(), stkField); + std::string stdoutString = testing::internal::GetCapturedStdout(); + check_no_warnings(stdoutString); +} + +TEST_F(NgpDebugFieldSync, VectorAccessUsingEntity_MissingAllModifySyncCallsToHost_Warning) +{ + if (stk::parallel_machine_size(MPI_COMM_WORLD) != 1) return; + stk::mesh::Field & stkField = build_mesh_with_vector_field("doubleVectorField"); + + testing::internal::CaptureStdout(); + write_vector_field_on_device(get_bulk(), stkField, 3.14); + + read_vector_field_on_host_using_entity(get_bulk(), stkField); + + std::string stdoutString = testing::internal::GetCapturedStdout(); + extract_warning(stdoutString, 1, "WARNING: Accessing stale data on Host for Field doubleVectorField[1]=11"); + extract_warning(stdoutString, 1, "WARNING: Accessing stale data on Host for Field doubleVectorField[1]=21"); + check_no_warnings(stdoutString); +} + +TEST_F(NgpDebugFieldSync, DeviceEntityFieldDataAccess_ProperlySyncToHost_NoWarning) +{ + if (stk::parallel_machine_size(MPI_COMM_WORLD) != 1) return; + stk::mesh::Field & stkField = build_mesh_with_vector_field("doubleVectorField"); + + testing::internal::CaptureStdout(); + write_vector_field_on_device_using_entity_field_data(get_bulk(), stkField, 3.14); + stkField.modify_on_device(); + stkField.sync_to_host(); + + read_vector_field_on_host_using_entity(get_bulk(), stkField); + std::string stdoutString = testing::internal::GetCapturedStdout(); + check_no_warnings(stdoutString); +} + +TEST_F(NgpDebugFieldSync, DeviceEntityFieldDataAccess_MissingAllModifySyncCallsToHost_Warning) +{ + if (stk::parallel_machine_size(MPI_COMM_WORLD) != 1) return; + stk::mesh::Field & stkField = build_mesh_with_vector_field("doubleVectorField"); + + testing::internal::CaptureStdout(); + write_vector_field_on_device_using_entity_field_data(get_bulk(), stkField, 3.14); + + read_vector_field_on_host_using_entity(get_bulk(), stkField); + + std::string stdoutString = testing::internal::GetCapturedStdout(); + extract_warning(stdoutString, 1, "WARNING: Accessing stale data on Host for Field doubleVectorField[1]=11"); + extract_warning(stdoutString, 1, "WARNING: Accessing stale data on Host for Field doubleVectorField[1]=21"); + check_no_warnings(stdoutString); +} + +TEST_F(NgpDebugFieldSync, DeviceMeshIndexAccess_ProperlySyncToHost_NoWarning) +{ + if (stk::parallel_machine_size(MPI_COMM_WORLD) != 1) return; + stk::mesh::Field & stkField = build_mesh_with_vector_field("doubleVectorField"); + + testing::internal::CaptureStdout(); + write_vector_field_on_device_using_mesh_index(get_bulk(), stkField, 3.14); + stkField.modify_on_device(); + stkField.sync_to_host(); + + read_vector_field_on_host_using_entity(get_bulk(), stkField); + + std::string stdoutString = testing::internal::GetCapturedStdout(); + check_no_warnings(stdoutString); +} + +TEST_F(NgpDebugFieldSync, DeviceMeshIndexAccess_MissingAllModifySyncCallsToHost_Warning) +{ + if (stk::parallel_machine_size(MPI_COMM_WORLD) != 1) return; + stk::mesh::Field & stkField = build_mesh_with_vector_field("doubleVectorField"); + + testing::internal::CaptureStdout(); + write_vector_field_on_device_using_mesh_index(get_bulk(), stkField, 3.14); + + read_vector_field_on_host_using_entity(get_bulk(), stkField); + + std::string stdoutString = testing::internal::GetCapturedStdout(); + extract_warning(stdoutString, 1, "WARNING: Accessing stale data on Host for Field doubleVectorField[1]=11"); + extract_warning(stdoutString, 1, "WARNING: Accessing stale data on Host for Field doubleVectorField[1]=21"); + check_no_warnings(stdoutString); +} + +TEST_F(NgpDebugFieldSync, VectorIntAccessUsingEntity_ProperlySyncToHost_NoWarning) +{ + if (stk::parallel_machine_size(MPI_COMM_WORLD) != 1) return; + stk::mesh::Field & stkField = build_mesh_with_vector_field("intVectorField"); + + testing::internal::CaptureStdout(); + write_vector_field_on_device(get_bulk(), stkField, 3); + stkField.modify_on_device(); + stkField.sync_to_host(); + + read_vector_field_on_host_using_entity(get_bulk(), stkField); + + std::string stdoutString = testing::internal::GetCapturedStdout(); + check_no_warnings(stdoutString); +} + +TEST_F(NgpDebugFieldSync, VectorIntAccessUsingEntity_MissingAllModifySyncCallsToHost_Warning) +{ + if (stk::parallel_machine_size(MPI_COMM_WORLD) != 1) return; + stk::mesh::Field & stkField = build_mesh_with_vector_field("intVectorField"); + + testing::internal::CaptureStdout(); + write_vector_field_on_device(get_bulk(), stkField, 3); + + read_vector_field_on_host_using_entity(get_bulk(), stkField); + + std::string stdoutString = testing::internal::GetCapturedStdout(); + extract_warning(stdoutString, 1, "WARNING: Accessing stale data on Host for Field intVectorField[1]=11"); + extract_warning(stdoutString, 1, "WARNING: Accessing stale data on Host for Field intVectorField[1]=21"); + check_no_warnings(stdoutString); +} + + +TEST_F(NgpDebugFieldSync, ScalarAccessUsingBucket_ProperlySyncToHost_NoWarning) +{ + if (stk::parallel_machine_size(MPI_COMM_WORLD) != 1) return; + stk::mesh::Field & stkField = build_mesh_with_scalar_field_two_parts("doubleScalarField"); + + testing::internal::CaptureStdout(); + write_scalar_field_on_device(get_bulk(), stkField, 3.14); + stkField.modify_on_device(); + stkField.sync_to_host(); + + read_scalar_field_on_host_using_bucket(get_bulk(), stkField); + + std::string stdoutString = testing::internal::GetCapturedStdout(); + check_no_warnings(stdoutString); +} + +TEST_F(NgpDebugFieldSync, ScalarAccessUsingBucket_MissingAllModifySyncCallsToHost_Warning) +{ + if (stk::parallel_machine_size(MPI_COMM_WORLD) != 1) return; + stk::mesh::Field & stkField = build_mesh_with_scalar_field_two_parts("doubleScalarField"); + + testing::internal::CaptureStdout(); + write_scalar_field_on_device(get_bulk(), stkField, 3.14); + + read_scalar_field_on_host_using_bucket(get_bulk(), stkField); + std::string stdoutString = testing::internal::GetCapturedStdout(); + extract_warning(stdoutString, 1, "WARNING: Accessing stale data on Host for Field doubleScalarField[0]=10"); + extract_warning(stdoutString, 1, "WARNING: Accessing stale data on Host for Field doubleScalarField[0]=20"); + check_no_warnings(stdoutString); +} + +TEST_F(NgpDebugFieldSync, VectorAccessUsingBucket_ProperlySyncToHost_NoWarning) +{ + if (stk::parallel_machine_size(MPI_COMM_WORLD) != 1) return; + stk::mesh::Field & stkField = build_mesh_with_vector_field_two_parts("doubleVectorField"); + + testing::internal::CaptureStdout(); + write_vector_field_on_device(get_bulk(), stkField, 3.14); + stkField.modify_on_device(); + stkField.sync_to_host(); + + read_vector_field_on_host_using_bucket(get_bulk(), stkField); + + std::string stdoutString = testing::internal::GetCapturedStdout(); + check_no_warnings(stdoutString); +} + +TEST_F(NgpDebugFieldSync, VectorAccessUsingBucket_MissingAllModifySyncCallsToHost_Warning) +{ + if (stk::parallel_machine_size(MPI_COMM_WORLD) != 1) return; + stk::mesh::Field & stkField = build_mesh_with_vector_field_two_parts("doubleVectorField"); + + testing::internal::CaptureStdout(); + write_vector_field_on_device(get_bulk(), stkField, 3.14); + + read_vector_field_on_host_using_bucket(get_bulk(), stkField); + + std::string stdoutString = testing::internal::GetCapturedStdout(); + extract_warning(stdoutString, 1, "WARNING: Accessing stale data on Host for Field doubleVectorField[1]=11"); + extract_warning(stdoutString, 1, "WARNING: Accessing stale data on Host for Field doubleVectorField[1]=21"); + check_no_warnings(stdoutString); +} + +TEST_F(NgpDebugFieldSync, VectorIntAccessUsingBucket_ProperlySyncToHost_NoWarning) +{ + if (stk::parallel_machine_size(MPI_COMM_WORLD) != 1) return; + stk::mesh::Field & stkField = build_mesh_with_vector_field_two_parts("intVectorField"); + + testing::internal::CaptureStdout(); + write_vector_field_on_device(get_bulk(), stkField, 3); + stkField.modify_on_device(); + stkField.sync_to_host(); + + read_vector_field_on_host_using_bucket(get_bulk(), stkField); + + std::string stdoutString = testing::internal::GetCapturedStdout(); + check_no_warnings(stdoutString); +} + +TEST_F(NgpDebugFieldSync, VectorIntAccessUsingBucket_MissingAllModifySyncCallsToHost_Warning) +{ + if (stk::parallel_machine_size(MPI_COMM_WORLD) != 1) return; + stk::mesh::Field & stkField = build_mesh_with_vector_field_two_parts("intVectorField"); + + testing::internal::CaptureStdout(); + write_vector_field_on_device(get_bulk(), stkField, 3); + + read_vector_field_on_host_using_bucket(get_bulk(), stkField); + + std::string stdoutString = testing::internal::GetCapturedStdout(); + extract_warning(stdoutString, 1, "WARNING: Accessing stale data on Host for Field intVectorField[1]=11"); + extract_warning(stdoutString, 1, "WARNING: Accessing stale data on Host for Field intVectorField[1]=21"); + check_no_warnings(stdoutString); +} + + + +TEST_F(NgpDebugFieldSync, ScalarDeviceSetAll_ProperlySyncToDevice_NoWarning) +{ + if (stk::parallel_machine_size(MPI_COMM_WORLD) != 1) return; + stk::mesh::Field & stkField = build_mesh_with_scalar_field("doubleScalarField"); + + testing::internal::CaptureStdout(); + write_scalar_field_on_host_using_entity(get_bulk(), stkField, 3.14); + stkField.modify_on_host(); + stkField.sync_to_device(); + + device_field_set_all(get_bulk(), stkField, 2.18); + + std::string stdoutString = testing::internal::GetCapturedStdout(); + check_no_warnings(stdoutString); +} + +TEST_F(NgpDebugFieldSync, ScalarDeviceSetAll_MissingAllModifySyncCallsToDevice_NoWarning) +{ + if (stk::parallel_machine_size(MPI_COMM_WORLD) != 1) return; + stk::mesh::Field & stkField = build_mesh_with_scalar_field("doubleScalarField"); + + testing::internal::CaptureStdout(); + write_scalar_field_on_host_using_entity(get_bulk(), stkField, 3.14); + + device_field_set_all(get_bulk(), stkField, 2.18); + + std::string stdoutString = testing::internal::GetCapturedStdout(); + check_no_warnings(stdoutString); +} + +TEST_F(NgpDebugFieldSync, ScalarDeviceSetAll_ProperlySyncToHost_NoWarning) +{ + if (stk::parallel_machine_size(MPI_COMM_WORLD) != 1) return; + stk::mesh::Field & stkField = build_mesh_with_scalar_field("doubleScalarField"); + + testing::internal::CaptureStdout(); + device_field_set_all(get_bulk(), stkField, 3.14); + stkField.modify_on_device(); + stkField.sync_to_host(); + + read_scalar_field_on_host_using_entity(get_bulk(), stkField); + + std::string stdoutString = testing::internal::GetCapturedStdout(); + check_no_warnings(stdoutString); +} + +TEST_F(NgpDebugFieldSync, ScalarDeviceSetAll_MissingAllModifySyncCallsToHost_Warning) +{ + if (stk::parallel_machine_size(MPI_COMM_WORLD) != 1) return; + stk::mesh::Field & stkField = build_mesh_with_scalar_field("doubleScalarField"); + + testing::internal::CaptureStdout(); + device_field_set_all(get_bulk(), stkField, 3.14); + + read_scalar_field_on_host_using_entity(get_bulk(), stkField); + + std::string stdoutString = testing::internal::GetCapturedStdout(); + extract_warning(stdoutString, 1, "WARNING: Accessing stale data on Host for Field doubleScalarField[0]=10"); + extract_warning(stdoutString, 1, "WARNING: Accessing stale data on Host for Field doubleScalarField[0]=20"); + check_no_warnings(stdoutString); +} + + +TEST_F(NgpDebugFieldSync, ScalarAccessUsingEntity_MultipleTimestep_ProperlySyncToDevice_NoWarning) +{ + if (stk::parallel_machine_size(MPI_COMM_WORLD) != 1) return; + stk::mesh::Field & stkField = build_mesh_with_scalar_field("doubleScalarField"); + + testing::internal::CaptureStdout(); + + const size_t numTimeSteps = 2; + for (size_t timeStep = 0; timeStep < numTimeSteps; ++timeStep) { + write_scalar_field_on_host_using_entity(get_bulk(), stkField, 3.14+timeStep); + stkField.modify_on_host(); + stkField.sync_to_device(); + read_scalar_field_on_device(get_bulk(), stkField); + } + + std::string stdoutString = testing::internal::GetCapturedStdout(); + check_no_warnings(stdoutString); +} + +TEST_F(NgpDebugFieldSync, ScalarAccessUsingEntity_MultipleTimestep_MissingAllModifySyncCallsToDevice_Warning) +{ + if (stk::parallel_machine_size(MPI_COMM_WORLD) != 1) return; + stk::mesh::Field & stkField = build_mesh_with_scalar_field("doubleScalarField"); + + testing::internal::CaptureStdout(); + + const size_t numTimeSteps = 2; + for (size_t timeStep = 0; timeStep < numTimeSteps; ++timeStep) { + write_scalar_field_on_host_using_entity(get_bulk(), stkField, 3.14+timeStep); + read_scalar_field_on_device(get_bulk(), stkField); + } + + std::string stdoutString = testing::internal::GetCapturedStdout(); + extract_warning(stdoutString, 2, "WARNING: Accessing stale data on Device for Field doubleScalarField[0]=10"); + extract_warning(stdoutString, 1, "WARNING: Accessing stale data on Device for Field doubleScalarField[0]=20"); + check_no_warnings(stdoutString); +} + +TEST_F(NgpDebugFieldSync, ScalarAccessUsingEntity_MultipleAccesses_ProperlySyncToDevice_NoWarning) +{ + if (stk::parallel_machine_size(MPI_COMM_WORLD) != 1) return; + stk::mesh::Field & stkField = build_mesh_with_scalar_field("doubleScalarField"); + + testing::internal::CaptureStdout(); + + write_scalar_field_on_host_using_entity(get_bulk(), stkField, 3.14); + stkField.modify_on_host(); + stkField.sync_to_device(); + + read_scalar_field_on_device(get_bulk(), stkField); + read_scalar_field_on_device(get_bulk(), stkField); + + std::string stdoutString = testing::internal::GetCapturedStdout(); + check_no_warnings(stdoutString); +} + +TEST_F(NgpDebugFieldSync, ScalarAccessUsingEntity_MultipleStaleAccesses_MissingAllModifySyncCallsToDevice_Warning) +{ + if (stk::parallel_machine_size(MPI_COMM_WORLD) != 1) return; + stk::mesh::Field & stkField = build_mesh_with_scalar_field("doubleScalarField"); + + testing::internal::CaptureStdout(); + + write_scalar_field_on_host_using_entity(get_bulk(), stkField, 3.14); + + read_scalar_field_on_device(get_bulk(), stkField); + read_scalar_field_on_device(get_bulk(), stkField); + + std::string stdoutString = testing::internal::GetCapturedStdout(); + extract_warning(stdoutString, 2, "WARNING: Accessing stale data on Device for Field doubleScalarField[0]=10.000000"); + check_no_warnings(stdoutString); +} + +TEST_F(NgpDebugFieldSync, ScalarAccessUsingEntity_MultipleWrites_ProperlySyncToDevice_NoWarning) +{ + if (stk::parallel_machine_size(MPI_COMM_WORLD) != 1) return; + stk::mesh::Field & stkField = build_mesh_with_scalar_field("doubleScalarField"); + + testing::internal::CaptureStdout(); + + write_scalar_field_on_host_using_entity(get_bulk(), stkField, 3.14); + write_scalar_field_on_host_using_entity(get_bulk(), stkField, 2.18); + stkField.modify_on_host(); + stkField.sync_to_device(); + + read_scalar_field_on_device(get_bulk(), stkField); + + std::string stdoutString = testing::internal::GetCapturedStdout(); + check_no_warnings(stdoutString); +} + +TEST_F(NgpDebugFieldSync, ScalarAccessUsingEntity_MultipleWrites_MissingAllModifySyncCallsToDevice_Warning) +{ + if (stk::parallel_machine_size(MPI_COMM_WORLD) != 1) return; + stk::mesh::Field & stkField = build_mesh_with_scalar_field("doubleScalarField"); + + testing::internal::CaptureStdout(); + + write_scalar_field_on_host_using_entity(get_bulk(), stkField, 3.14); + write_scalar_field_on_host_using_entity(get_bulk(), stkField, 2.18); + + read_scalar_field_on_device(get_bulk(), stkField); + + std::string stdoutString = testing::internal::GetCapturedStdout(); + extract_warning(stdoutString, 1, "WARNING: Accessing stale data on Device for Field doubleScalarField[0]=10.000000"); + extract_warning(stdoutString, 1, "WARNING: Accessing stale data on Device for Field doubleScalarField[0]=20.000000"); + check_no_warnings(stdoutString); +} + +TEST_F(NgpDebugFieldSync, VectorAccessUsingEntity_MultipleTimestep_ProperlySyncToDevice_NoWarning) +{ + if (stk::parallel_machine_size(MPI_COMM_WORLD) != 1) return; + stk::mesh::Field & stkField = build_mesh_with_vector_field("doubleVectorField"); + + testing::internal::CaptureStdout(); + + const size_t numTimeSteps = 2; + for (size_t timeStep = 0; timeStep < numTimeSteps; ++timeStep) { + write_vector_field_on_host_using_entity(get_bulk(), stkField, 3.14+timeStep); + stkField.modify_on_host(); + stkField.sync_to_device(); + read_vector_field_on_device(get_bulk(), stkField); + } + + std::string stdoutString = testing::internal::GetCapturedStdout(); + check_no_warnings(stdoutString); +} + +TEST_F(NgpDebugFieldSync, VectorAccessUsingEntity_MultipleTimestep_MissingAllModifySyncCallsToDevice_Warning) +{ + if (stk::parallel_machine_size(MPI_COMM_WORLD) != 1) return; + stk::mesh::Field & stkField = build_mesh_with_vector_field("doubleVectorField"); + + testing::internal::CaptureStdout(); + + const size_t numTimeSteps = 2; + for (size_t timeStep = 0; timeStep < numTimeSteps; ++timeStep) { + write_vector_field_on_host_using_entity(get_bulk(), stkField, 3.14+timeStep); + read_vector_field_on_device(get_bulk(), stkField); + } + + std::string stdoutString = testing::internal::GetCapturedStdout(); + extract_warning(stdoutString, 2, "WARNING: Accessing stale data on Device for Field doubleVectorField[1]=11.000000"); + extract_warning(stdoutString, 1, "WARNING: Accessing stale data on Device for Field doubleVectorField[1]=21.000000"); + check_no_warnings(stdoutString); +} + + +TEST_F(NgpDebugFieldSync, ScalarAccessUsingBucket_MultipleTimestep_ProperlySyncToDevice_NoWarning) +{ + if (stk::parallel_machine_size(MPI_COMM_WORLD) != 1) return; + stk::mesh::Field & stkField = build_mesh_with_scalar_field_two_parts("doubleScalarField"); + + testing::internal::CaptureStdout(); + + const size_t numTimeSteps = 2; + for (size_t timeStep = 0; timeStep < numTimeSteps; ++timeStep) { + write_scalar_field_on_host_using_bucket(get_bulk(), stkField, 3.14+timeStep); + stkField.modify_on_host(); + stkField.sync_to_device(); + read_scalar_field_on_device(get_bulk(), stkField); + } + + std::string stdoutString = testing::internal::GetCapturedStdout(); + check_no_warnings(stdoutString); +} + +TEST_F(NgpDebugFieldSync, ScalarAccessUsingBucket_MultipleTimestep_MissingAllModifySyncCallsToDevice_Warning) +{ + if (stk::parallel_machine_size(MPI_COMM_WORLD) != 1) return; + stk::mesh::Field & stkField = build_mesh_with_scalar_field_two_parts("doubleScalarField"); + + testing::internal::CaptureStdout(); + + const size_t numTimeSteps = 2; + for (size_t timeStep = 0; timeStep < numTimeSteps; ++timeStep) { + write_scalar_field_on_host_using_bucket(get_bulk(), stkField, 3.14+timeStep); + read_scalar_field_on_device(get_bulk(), stkField); + } + + std::string stdoutString = testing::internal::GetCapturedStdout(); + extract_warning(stdoutString, 2, "WARNING: Accessing stale data on Device for Field doubleScalarField[0]=10.000000"); + extract_warning(stdoutString, 1, "WARNING: Accessing stale data on Device for Field doubleScalarField[0]=20.000000"); + check_no_warnings(stdoutString); +} + +TEST_F(NgpDebugFieldSync, ScalarAccessUsingBucket_MultipleAccesses_ProperlySyncToDevice_NoWarning) +{ + if (stk::parallel_machine_size(MPI_COMM_WORLD) != 1) return; + stk::mesh::Field & stkField = build_mesh_with_scalar_field_two_parts("doubleScalarField"); + + testing::internal::CaptureStdout(); + + write_scalar_field_on_host_using_bucket(get_bulk(), stkField, 3.14); + stkField.modify_on_host(); + stkField.sync_to_device(); + + read_scalar_field_on_device(get_bulk(), stkField); + read_scalar_field_on_device(get_bulk(), stkField); + + std::string stdoutString = testing::internal::GetCapturedStdout(); + check_no_warnings(stdoutString); +} + +TEST_F(NgpDebugFieldSync, ScalarAccessUsingBucket_MultipleStaleAccesses_MissingAllModifySyncCallsToDevice_Warning) +{ + if (stk::parallel_machine_size(MPI_COMM_WORLD) != 1) return; + stk::mesh::Field & stkField = build_mesh_with_scalar_field_two_parts("doubleScalarField"); + + testing::internal::CaptureStdout(); + + write_scalar_field_on_host_using_bucket(get_bulk(), stkField, 3.14); + + read_scalar_field_on_device(get_bulk(), stkField); + read_scalar_field_on_device(get_bulk(), stkField); + + std::string stdoutString = testing::internal::GetCapturedStdout(); + extract_warning(stdoutString, 2, "WARNING: Accessing stale data on Device for Field doubleScalarField[0]=10.000000"); + check_no_warnings(stdoutString); +} + +TEST_F(NgpDebugFieldSync, ScalarAccessUsingBucket_MultipleWrites_ProperlySyncToDevice_NoWarning) +{ + if (stk::parallel_machine_size(MPI_COMM_WORLD) != 1) return; + stk::mesh::Field & stkField = build_mesh_with_scalar_field_two_parts("doubleScalarField"); + + testing::internal::CaptureStdout(); + + write_scalar_field_on_host_using_bucket(get_bulk(), stkField, 3.14); + write_scalar_field_on_host_using_bucket(get_bulk(), stkField, 2.18); + stkField.modify_on_host(); + stkField.sync_to_device(); + + read_scalar_field_on_device(get_bulk(), stkField); + + std::string stdoutString = testing::internal::GetCapturedStdout(); + check_no_warnings(stdoutString); +} + +TEST_F(NgpDebugFieldSync, ScalarAccessUsingBucket_MultipleWrites_MissingAllModifySyncCallsToDevice_Warning) +{ + if (stk::parallel_machine_size(MPI_COMM_WORLD) != 1) return; + stk::mesh::Field & stkField = build_mesh_with_scalar_field_two_parts("doubleScalarField"); + + testing::internal::CaptureStdout(); + + write_scalar_field_on_host_using_bucket(get_bulk(), stkField, 3.14); + write_scalar_field_on_host_using_bucket(get_bulk(), stkField, 2.18); + + read_scalar_field_on_device(get_bulk(), stkField); + + std::string stdoutString = testing::internal::GetCapturedStdout(); + extract_warning(stdoutString, 1, "WARNING: Accessing stale data on Device for Field doubleScalarField[0]=10.000000"); + extract_warning(stdoutString, 1, "WARNING: Accessing stale data on Device for Field doubleScalarField[0]=20.000000"); + check_no_warnings(stdoutString); +} + + +TEST_F(NgpDebugFieldSync, ScalarAccessUsingEntity_MultipleTimestep_ProperlySyncToHost_NoWarning) +{ + if (stk::parallel_machine_size(MPI_COMM_WORLD) != 1) return; + stk::mesh::Field & stkField = build_mesh_with_scalar_field("doubleScalarField"); + + testing::internal::CaptureStdout(); + + const size_t numTimeSteps = 2; + for (size_t timeStep = 0; timeStep < numTimeSteps; ++timeStep) { + write_scalar_field_on_device(get_bulk(), stkField, 3.14+timeStep); + stkField.modify_on_device(); + stkField.sync_to_host(); + read_scalar_field_on_host_using_entity(get_bulk(), stkField); + } + + std::string stdoutString = testing::internal::GetCapturedStdout(); + check_no_warnings(stdoutString); +} + +TEST_F(NgpDebugFieldSync, ScalarAccessUsingEntity_MultipleTimestep_MissingAllModifySyncCallsToHost_Warning) +{ + if (stk::parallel_machine_size(MPI_COMM_WORLD) != 1) return; + stk::mesh::Field & stkField = build_mesh_with_scalar_field("doubleScalarField"); + + testing::internal::CaptureStdout(); + + const size_t numTimeSteps = 2; + for (size_t timeStep = 0; timeStep < numTimeSteps; ++timeStep) { + write_scalar_field_on_device(get_bulk(), stkField, 3.14+timeStep); + read_scalar_field_on_host_using_entity(get_bulk(), stkField); + } + + std::string stdoutString = testing::internal::GetCapturedStdout(); + extract_warning(stdoutString, 2, "WARNING: Accessing stale data on Host for Field doubleScalarField[0]=10"); + extract_warning(stdoutString, 2, "WARNING: Accessing stale data on Host for Field doubleScalarField[0]=20"); + check_no_warnings(stdoutString); +} + +TEST_F(NgpDebugFieldSync, ScalarAccessUsingEntity_MultipleAccesses_ProperlySyncToHost_NoWarning) +{ + if (stk::parallel_machine_size(MPI_COMM_WORLD) != 1) return; + stk::mesh::Field & stkField = build_mesh_with_scalar_field("doubleScalarField"); + + testing::internal::CaptureStdout(); + + write_scalar_field_on_device(get_bulk(), stkField, 3.14); + stkField.modify_on_device(); + stkField.sync_to_host(); + + read_scalar_field_on_host_using_entity(get_bulk(), stkField); + read_scalar_field_on_host_using_entity(get_bulk(), stkField); + + std::string stdoutString = testing::internal::GetCapturedStdout(); + check_no_warnings(stdoutString); +} + +TEST_F(NgpDebugFieldSync, ScalarAccessUsingEntity_MultipleStaleAccesses_MissingAllModifySyncCallsToHost_Warning) +{ + if (stk::parallel_machine_size(MPI_COMM_WORLD) != 1) return; + stk::mesh::Field & stkField = build_mesh_with_scalar_field("doubleScalarField"); + + testing::internal::CaptureStdout(); + + write_scalar_field_on_device(get_bulk(), stkField, 3.14); + + read_scalar_field_on_host_using_entity(get_bulk(), stkField); + read_scalar_field_on_host_using_entity(get_bulk(), stkField); + + std::string stdoutString = testing::internal::GetCapturedStdout(); + extract_warning(stdoutString, 2, "WARNING: Accessing stale data on Host for Field doubleScalarField[0]=10"); + extract_warning(stdoutString, 2, "WARNING: Accessing stale data on Host for Field doubleScalarField[0]=20"); + check_no_warnings(stdoutString); +} + +TEST_F(NgpDebugFieldSync, ScalarAccessUsingEntity_MultipleWrites_ProperlySyncToHost_NoWarning) +{ + if (stk::parallel_machine_size(MPI_COMM_WORLD) != 1) return; + stk::mesh::Field & stkField = build_mesh_with_scalar_field("doubleScalarField"); + + testing::internal::CaptureStdout(); + + write_scalar_field_on_device(get_bulk(), stkField, 3.14); + write_scalar_field_on_device(get_bulk(), stkField, 2.18); + stkField.modify_on_device(); + stkField.sync_to_host(); + + read_scalar_field_on_host_using_entity(get_bulk(), stkField); + + std::string stdoutString = testing::internal::GetCapturedStdout(); + check_no_warnings(stdoutString); +} + +TEST_F(NgpDebugFieldSync, ScalarAccessUsingEntity_MultipleWrites_MissingAllModifySyncCallsToHost_Warning) +{ + if (stk::parallel_machine_size(MPI_COMM_WORLD) != 1) return; + stk::mesh::Field & stkField = build_mesh_with_scalar_field("doubleScalarField"); + + testing::internal::CaptureStdout(); + + write_scalar_field_on_device(get_bulk(), stkField, 3.14); + write_scalar_field_on_device(get_bulk(), stkField, 2.18); + + read_scalar_field_on_host_using_entity(get_bulk(), stkField); + + std::string stdoutString = testing::internal::GetCapturedStdout(); + extract_warning(stdoutString, 1, "WARNING: Accessing stale data on Host for Field doubleScalarField[0]=10"); + extract_warning(stdoutString, 1, "WARNING: Accessing stale data on Host for Field doubleScalarField[0]=20"); + check_no_warnings(stdoutString); +} + + +TEST_F(NgpDebugFieldSync, ScalarAccessUsingBucket_MultipleTimestep_ProperlySyncToHost_NoWarning) +{ + if (stk::parallel_machine_size(MPI_COMM_WORLD) != 1) return; + stk::mesh::Field & stkField = build_mesh_with_scalar_field_two_parts("doubleScalarField"); + + testing::internal::CaptureStdout(); + + const size_t numTimeSteps = 2; + for (size_t timeStep = 0; timeStep < numTimeSteps; ++timeStep) { + write_scalar_field_on_device(get_bulk(), stkField, 3.14+timeStep); + stkField.modify_on_device(); + stkField.sync_to_host(); + read_scalar_field_on_host_using_bucket(get_bulk(), stkField); + } + + std::string stdoutString = testing::internal::GetCapturedStdout(); + check_no_warnings(stdoutString); +} + +TEST_F(NgpDebugFieldSync, ScalarAccessUsingBucket_MultipleTimestep_MissingAllModifySyncCallsToHost_Warning) +{ + if (stk::parallel_machine_size(MPI_COMM_WORLD) != 1) return; + stk::mesh::Field & stkField = build_mesh_with_scalar_field_two_parts("doubleScalarField"); + + testing::internal::CaptureStdout(); + + const size_t numTimeSteps = 2; + for (size_t timeStep = 0; timeStep < numTimeSteps; ++timeStep) { + write_scalar_field_on_device(get_bulk(), stkField, 3.14+timeStep); + read_scalar_field_on_host_using_bucket(get_bulk(), stkField); + } + + std::string stdoutString = testing::internal::GetCapturedStdout(); + extract_warning(stdoutString, 2, "WARNING: Accessing stale data on Host for Field doubleScalarField[0]=10"); + extract_warning(stdoutString, 2, "WARNING: Accessing stale data on Host for Field doubleScalarField[0]=20"); + check_no_warnings(stdoutString); +} + +TEST_F(NgpDebugFieldSync, ScalarAccessUsingBucket_MultipleAccesses_ProperlySyncToHost_NoWarning) +{ + if (stk::parallel_machine_size(MPI_COMM_WORLD) != 1) return; + stk::mesh::Field & stkField = build_mesh_with_scalar_field_two_parts("doubleScalarField"); + + testing::internal::CaptureStdout(); + + write_scalar_field_on_device(get_bulk(), stkField, 3.14); + stkField.modify_on_device(); + stkField.sync_to_host(); + + read_scalar_field_on_host_using_bucket(get_bulk(), stkField); + read_scalar_field_on_host_using_bucket(get_bulk(), stkField); + + std::string stdoutString = testing::internal::GetCapturedStdout(); + check_no_warnings(stdoutString); +} + +TEST_F(NgpDebugFieldSync, ScalarAccessUsingBucket_MultipleStaleAccesses_MissingAllModifySyncCallsToHost_Warning) +{ + if (stk::parallel_machine_size(MPI_COMM_WORLD) != 1) return; + stk::mesh::Field & stkField = build_mesh_with_scalar_field_two_parts("doubleScalarField"); + + testing::internal::CaptureStdout(); + + write_scalar_field_on_device(get_bulk(), stkField, 3.14); + + read_scalar_field_on_host_using_bucket(get_bulk(), stkField); + read_scalar_field_on_host_using_bucket(get_bulk(), stkField); + + std::string stdoutString = testing::internal::GetCapturedStdout(); + extract_warning(stdoutString, 2, "WARNING: Accessing stale data on Host for Field doubleScalarField[0]=10"); + extract_warning(stdoutString, 2, "WARNING: Accessing stale data on Host for Field doubleScalarField[0]=20"); + check_no_warnings(stdoutString); +} + +TEST_F(NgpDebugFieldSync, ScalarAccessUsingBucket_MultipleWrites_ProperlySyncToHost_NoWarning) +{ + if (stk::parallel_machine_size(MPI_COMM_WORLD) != 1) return; + stk::mesh::Field & stkField = build_mesh_with_scalar_field_two_parts("doubleScalarField"); + + testing::internal::CaptureStdout(); + + write_scalar_field_on_device(get_bulk(), stkField, 3.14); + write_scalar_field_on_device(get_bulk(), stkField, 2.18); + stkField.modify_on_device(); + stkField.sync_to_host(); + + read_scalar_field_on_host_using_bucket(get_bulk(), stkField); + + std::string stdoutString = testing::internal::GetCapturedStdout(); + check_no_warnings(stdoutString); +} + +TEST_F(NgpDebugFieldSync, ScalarAccessUsingBucket_MultipleWrites_MissingAllModifySyncCallsToHost_Warning) +{ + if (stk::parallel_machine_size(MPI_COMM_WORLD) != 1) return; + stk::mesh::Field & stkField = build_mesh_with_scalar_field_two_parts("doubleScalarField"); + + testing::internal::CaptureStdout(); + + write_scalar_field_on_device(get_bulk(), stkField, 3.14); + write_scalar_field_on_device(get_bulk(), stkField, 2.18); + + read_scalar_field_on_host_using_bucket(get_bulk(), stkField); + + std::string stdoutString = testing::internal::GetCapturedStdout(); + extract_warning(stdoutString, 1, "WARNING: Accessing stale data on Host for Field doubleScalarField[0]=10"); + extract_warning(stdoutString, 1, "WARNING: Accessing stale data on Host for Field doubleScalarField[0]=20"); + check_no_warnings(stdoutString); +} + + +TEST_F(NgpDebugFieldSync, ScalarAccessUsingEntity_MeshModification_ProperlySyncToDevice_NoWarning) +{ + if (stk::parallel_machine_size(MPI_COMM_WORLD) != 1) return; + stk::mesh::Field & stkField = build_mesh_with_scalar_field("doubleScalarField"); + + testing::internal::CaptureStdout(); + modify_mesh_part_membership(get_bulk(), "meshModPart1"); + + write_scalar_field_on_host_using_entity(get_bulk(), stkField, 3.14); + stkField.modify_on_host(); + stkField.sync_to_device(); + + read_scalar_field_on_device(get_bulk(), stkField); + + std::string stdoutString = testing::internal::GetCapturedStdout(); + check_no_warnings(stdoutString); +} + +TEST_F(NgpDebugFieldSync, ScalarAccessUsingEntity_MeshModification_ImplicitSyncToDeviceWithUpdate_NoWarning) +{ + if (stk::parallel_machine_size(MPI_COMM_WORLD) != 1) return; + stk::mesh::Field & stkField = build_mesh_with_scalar_field("doubleScalarField"); + + testing::internal::CaptureStdout(); + modify_mesh_part_membership(get_bulk(), "meshModPart1"); + + write_scalar_field_on_host_using_entity(get_bulk(), stkField, 3.14); + + read_scalar_field_on_device(get_bulk(), stkField); + + std::string stdoutString = testing::internal::GetCapturedStdout(); + check_no_warnings(stdoutString); +} + +TEST_F(NgpDebugFieldSync, ScalarAccessUsingEntity_MeshModification_MissingDeviceFieldUpdate_AccessOnDevice_Warning) +{ + if (stk::parallel_machine_size(MPI_COMM_WORLD) != 1) return; + stk::mesh::Field & stkField = build_mesh_with_scalar_field("doubleScalarField"); + stk::mesh::NgpField & ngpField = stk::mesh::get_updated_ngp_field(stkField); + + testing::internal::CaptureStdout(); + modify_mesh_part_membership(get_bulk(), "meshModPart1"); + + // The device Field is currently out-of-date, so our debugging code on the host side needs to not + // mysteriously seg-fault before the user does the read on the Device side, where they will get + // a useful warning. Do a host-side write to confirm that we skip over dangerous code properly. + write_scalar_field_on_host_using_entity(get_bulk(), stkField, 3.14); + + read_scalar_field_on_device(get_bulk(), stkField, ngpField); + + std::string stdoutString = testing::internal::GetCapturedStdout(); + extract_warning(stdoutString, 2, "WARNING: Accessing unsynchronized Field doubleScalarField on Device after mesh modification"); + check_no_warnings(stdoutString); +} + +TEST_F(NgpDebugFieldSync, ScalarAccessUsingEntity_MeshModification_StaleDeviceFieldCopy_AccessOnDevice_Warning) +{ + if (stk::parallel_machine_size(MPI_COMM_WORLD) != 1) return; + stk::mesh::Field & stkField = build_mesh_with_scalar_field("doubleScalarField"); + stk::mesh::NgpField ngpFieldCopy = stk::mesh::get_updated_ngp_field(stkField); + + testing::internal::CaptureStdout(); + modify_mesh_part_membership(get_bulk(), "meshModPart1"); + + // The device Field is currently out-of-date, so our debugging code on the host side needs to not + // mysteriously seg-fault before the user does the read on the Device side, where they will get + // a useful warning. Do a host-side write to confirm that we skip over dangerous code properly. + write_scalar_field_on_host_using_entity(get_bulk(), stkField, 3.14); + stkField.modify_on_host(); + stkField.sync_to_device(); + + read_scalar_field_on_device(get_bulk(), stkField, ngpFieldCopy); + + std::string stdoutString = testing::internal::GetCapturedStdout(); + extract_warning(stdoutString, 2, "WARNING: Accessing unsynchronized Field doubleScalarField on Device after mesh modification"); + check_no_warnings(stdoutString); +} + +TEST_F(NgpDebugFieldSync, ScalarAccessUsingEntity_MeshModification_ProperlySyncToHost_NoWarning) +{ + if (stk::parallel_machine_size(MPI_COMM_WORLD) != 1) return; + stk::mesh::Field & stkField = build_mesh_with_scalar_field("doubleScalarField"); + + testing::internal::CaptureStdout(); + + write_scalar_field_on_device(get_bulk(), stkField, 3.14); + stkField.modify_on_device(); + stkField.sync_to_host(); + + modify_mesh_part_membership(get_bulk(), "meshModPart1"); + + read_scalar_field_on_host_using_entity(get_bulk(), stkField); + + std::string stdoutString = testing::internal::GetCapturedStdout(); + check_no_warnings(stdoutString); +} + +TEST_F(NgpDebugFieldSync, ScalarAccessUsingEntity_MeshModification_MissingAllModifySyncCallsToHost_Warning) +{ + if (stk::parallel_machine_size(MPI_COMM_WORLD) != 1) return; + stk::mesh::Field & stkField = build_mesh_with_scalar_field("doubleScalarField"); + + testing::internal::CaptureStdout(); + + write_scalar_field_on_device(get_bulk(), stkField, 3.14); + modify_mesh_part_membership(get_bulk(), "meshModPart1"); + read_scalar_field_on_host_using_entity(get_bulk(), stkField); + + std::string stdoutString = testing::internal::GetCapturedStdout(); + extract_warning(stdoutString, 2, "WARNING: Lost Device values for Field doubleScalarField due to a mesh modification before a sync to Host"); + check_no_warnings(stdoutString); +} + + +TEST_F(NgpDebugFieldSync, ScalarAccessUsingEntity_TwoAdjacentMeshModifications_ProperlySyncToDevice_NoWarning) +{ + if (stk::parallel_machine_size(MPI_COMM_WORLD) != 1) return; + stk::mesh::Field & stkField = build_mesh_with_scalar_field("doubleScalarField"); + + testing::internal::CaptureStdout(); + + modify_mesh_part_membership(get_bulk(), "meshModPart1"); + modify_mesh_part_membership(get_bulk(), "meshModPart2"); + + write_scalar_field_on_host_using_entity(get_bulk(), stkField, 3.14); + stkField.modify_on_host(); + stkField.sync_to_device(); + + read_scalar_field_on_device(get_bulk(), stkField); + + std::string stdoutString = testing::internal::GetCapturedStdout(); + check_no_warnings(stdoutString); +} + +TEST_F(NgpDebugFieldSync, ScalarAccessUsingEntity_TwoAdjacentMeshModifications_MissingDeviceFieldUpdate_AccessOnDevice_Warning) +{ + if (stk::parallel_machine_size(MPI_COMM_WORLD) != 1) return; + stk::mesh::Field & stkField = build_mesh_with_scalar_field("doubleScalarField"); + stk::mesh::NgpField & ngpField = stk::mesh::get_updated_ngp_field(stkField); + + testing::internal::CaptureStdout(); + modify_mesh_part_membership(get_bulk(), "meshModPart1"); + modify_mesh_part_membership(get_bulk(), "meshModPart2"); + + write_scalar_field_on_host_using_entity(get_bulk(), stkField, 3.14); + + read_scalar_field_on_device(get_bulk(), stkField, ngpField); + + std::string stdoutString = testing::internal::GetCapturedStdout(); + extract_warning(stdoutString, 2, "WARNING: Accessing unsynchronized Field doubleScalarField on Device after mesh modification"); + check_no_warnings(stdoutString); +} + +TEST_F(NgpDebugFieldSync, ScalarAccessUsingEntity_TwoAdjacentMeshModifications_ProperlySyncToHost_NoWarning) +{ + if (stk::parallel_machine_size(MPI_COMM_WORLD) != 1) return; + stk::mesh::Field & stkField = build_mesh_with_scalar_field("doubleScalarField"); + + testing::internal::CaptureStdout(); + + write_scalar_field_on_device(get_bulk(), stkField, 3.14); + stkField.modify_on_device(); + stkField.sync_to_host(); + + modify_mesh_part_membership(get_bulk(), "meshModPart1"); + modify_mesh_part_membership(get_bulk(), "meshModPart2"); + + read_scalar_field_on_host_using_entity(get_bulk(), stkField); + + std::string stdoutString = testing::internal::GetCapturedStdout(); + check_no_warnings(stdoutString); +} + +TEST_F(NgpDebugFieldSync, ScalarAccessUsingEntity_TwoAdjacentMeshModifications_MissingAllModifySyncCallsToHost_Warning) +{ + if (stk::parallel_machine_size(MPI_COMM_WORLD) != 1) return; + stk::mesh::Field & stkField = build_mesh_with_scalar_field("doubleScalarField"); + + testing::internal::CaptureStdout(); + + write_scalar_field_on_device(get_bulk(), stkField, 3.14); + + modify_mesh_part_membership(get_bulk(), "meshModPart1"); + modify_mesh_part_membership(get_bulk(), "meshModPart2"); + + read_scalar_field_on_host_using_entity(get_bulk(), stkField); + + std::string stdoutString = testing::internal::GetCapturedStdout(); + extract_warning(stdoutString, 2, "WARNING: Lost Device values for Field doubleScalarField due to a mesh modification before a sync to Host"); + check_no_warnings(stdoutString); +} + + +TEST_F(NgpDebugFieldSync, ScalarAccessUsingEntity_TwoMeshModifications_ProperlySyncToDevice_NoWarning) +{ + if (stk::parallel_machine_size(MPI_COMM_WORLD) != 1) return; + stk::mesh::Field & stkField = build_mesh_with_scalar_field("doubleScalarField"); + + testing::internal::CaptureStdout(); + + modify_mesh_part_membership(get_bulk(), "meshModPart1"); + write_scalar_field_on_host_using_entity(get_bulk(), stkField, 3.14); + stkField.modify_on_host(); + stkField.sync_to_device(); + read_scalar_field_on_device(get_bulk(), stkField); + + modify_mesh_part_membership(get_bulk(), "meshModPart2"); + write_scalar_field_on_host_using_entity(get_bulk(), stkField, 2.18); + stkField.modify_on_host(); + stkField.sync_to_device(); + read_scalar_field_on_device(get_bulk(), stkField); + + std::string stdoutString = testing::internal::GetCapturedStdout(); + check_no_warnings(stdoutString); +} + +TEST_F(NgpDebugFieldSync, ScalarAccessUsingEntity_TwoMeshModifications_MissingDeviceFieldUpdate_AccessOnDevice_Warning) +{ + if (stk::parallel_machine_size(MPI_COMM_WORLD) != 1) return; + stk::mesh::Field & stkField = build_mesh_with_scalar_field("doubleScalarField"); + stk::mesh::NgpField & ngpField = stk::mesh::get_updated_ngp_field(stkField); + + testing::internal::CaptureStdout(); + + modify_mesh_part_membership(get_bulk(), "meshModPart1"); + write_scalar_field_on_host_using_entity(get_bulk(), stkField, 3.14); + read_scalar_field_on_device(get_bulk(), stkField, ngpField); + + modify_mesh_part_membership(get_bulk(), "meshModPart2"); + write_scalar_field_on_host_using_entity(get_bulk(), stkField, 2.18); + read_scalar_field_on_device(get_bulk(), stkField, ngpField); + + std::string stdoutString = testing::internal::GetCapturedStdout(); + extract_warning(stdoutString, 4, "WARNING: Accessing unsynchronized Field doubleScalarField on Device after mesh modification"); + check_no_warnings(stdoutString); +} + +TEST_F(NgpDebugFieldSync, ScalarAccessUsingEntity_TwoMeshModifications_ProperlySyncToHost_NoWarning) +{ + if (stk::parallel_machine_size(MPI_COMM_WORLD) != 1) return; + stk::mesh::Field & stkField = build_mesh_with_scalar_field("doubleScalarField"); + + testing::internal::CaptureStdout(); + + write_scalar_field_on_device(get_bulk(), stkField, 3.14); + stkField.modify_on_device(); + stkField.sync_to_host(); + modify_mesh_part_membership(get_bulk(), "meshModPart1"); + read_scalar_field_on_host_using_entity(get_bulk(), stkField); + + write_scalar_field_on_device(get_bulk(), stkField, 2.18); + stkField.modify_on_device(); + stkField.sync_to_host(); + modify_mesh_part_membership(get_bulk(), "meshModPart2"); + read_scalar_field_on_host_using_entity(get_bulk(), stkField); + + std::string stdoutString = testing::internal::GetCapturedStdout(); + check_no_warnings(stdoutString); +} + +TEST_F(NgpDebugFieldSync, ScalarAccessUsingEntity_TwoMeshModifications_MissingAllModifySyncCallsToHost_Warning) +{ + if (stk::parallel_machine_size(MPI_COMM_WORLD) != 1) return; + stk::mesh::Field & stkField = build_mesh_with_scalar_field("doubleScalarField"); + + testing::internal::CaptureStdout(); + + write_scalar_field_on_device(get_bulk(), stkField, 3.14); + modify_mesh_part_membership(get_bulk(), "meshModPart1"); + read_scalar_field_on_host_using_entity(get_bulk(), stkField); + + write_scalar_field_on_device(get_bulk(), stkField, 2.18); + modify_mesh_part_membership(get_bulk(), "meshModPart2"); + read_scalar_field_on_host_using_entity(get_bulk(), stkField); + + std::string stdoutString = testing::internal::GetCapturedStdout(); + extract_warning(stdoutString, 4, "WARNING: Lost Device values for Field doubleScalarField due to a mesh modification before a sync to Host"); + check_no_warnings(stdoutString); +} + + +TEST_F(NgpDebugFieldSync, ScalarAccessUsingEntity_FieldStateRotation_Throw) +{ + if (stk::parallel_machine_size(MPI_COMM_WORLD) != 1) return; + build_mesh_with_scalar_multistate_field("doubleScalarField"); + +#if defined(STK_DEBUG_FIELD_SYNC) && defined(STK_USE_DEVICE_MESH) + EXPECT_THROW(get_bulk().update_field_data_states(), std::logic_error); +#endif +} + +} diff --git a/packages/stk/stk_unit_tests/stk_mesh/ngp/NgpMeshTest.cpp b/packages/stk/stk_unit_tests/stk_mesh/ngp/NgpMeshTest.cpp index e9321abbb756..9bb035f07839 100644 --- a/packages/stk/stk_unit_tests/stk_mesh/ngp/NgpMeshTest.cpp +++ b/packages/stk/stk_unit_tests/stk_mesh/ngp/NgpMeshTest.cpp @@ -55,7 +55,6 @@ #include #include #include -#include #include #include #include diff --git a/packages/stk/stk_unit_tests/stk_mesh/ngp/NgpMultistateFieldTest.cpp b/packages/stk/stk_unit_tests/stk_mesh/ngp/NgpMultistateFieldTest.cpp deleted file mode 100644 index 895be934e22f..000000000000 --- a/packages/stk/stk_unit_tests/stk_mesh/ngp/NgpMultistateFieldTest.cpp +++ /dev/null @@ -1,265 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - - -template -void assign_value_to_field(stk::mesh::BulkData &bulk, Field ngpField, double value) -{ - stk::mesh::NgpMesh & ngpMesh = bulk.get_updated_ngp_mesh(); - stk::mesh::for_each_entity_run(ngpMesh, stk::topology::ELEM_RANK, bulk.mesh_meta_data().universal_part(), - KOKKOS_LAMBDA(const stk::mesh::FastMeshIndex& entity) - { - ngpField(entity, 0) = value; - }); - ngpField.modify_on_device(); -} -void assign_value_to_statedfield(stk::mesh::BulkData &bulk, stk::mesh::NgpMultistateField ngpStatedField, double value) -{ - stk::mesh::NgpMesh & ngpMesh = bulk.get_updated_ngp_mesh(); - stk::mesh::for_each_entity_run(ngpMesh, stk::topology::ELEM_RANK, bulk.mesh_meta_data().universal_part(), - KOKKOS_LAMBDA(const stk::mesh::FastMeshIndex& entity) - { - ngpStatedField.get_new(entity, 0) = value; - }); - ngpStatedField.modify_on_device(); -} - -namespace { - -class StatedFields : public stk::unit_test_util::MeshFixture -{ -public: - template - void test_field_has_value_on_device(const stk::mesh::BulkData& bulk, Field ngpField, double expectedValue) - { - const stk::mesh::NgpMesh & ngpMesh = bulk.get_updated_ngp_mesh(); - stk::mesh::for_each_entity_run(ngpMesh, stk::topology::ELEM_RANK, bulk.mesh_meta_data().universal_part(), - KOKKOS_LAMBDA(const stk::mesh::FastMeshIndex& entity) - { - NGP_ThrowRequire(expectedValue == ngpField(entity, 0)); - }); - } - - template - void test_field_state_has_value_on_device(stk::mesh::BulkData& bulk, Field ngpMultiStateField, stk::mesh::FieldState state, double expectedValue) - { - stk::mesh::NgpMesh& ngpMesh = bulk.get_updated_ngp_mesh(); - - if(state == stk::mesh::StateNew) { - stk::mesh::for_each_entity_run(ngpMesh, stk::topology::ELEM_RANK, bulk.mesh_meta_data().universal_part(), - KOKKOS_LAMBDA(const stk::mesh::FastMeshIndex& entity) - { - NGP_ThrowRequire(expectedValue == ngpMultiStateField.get_new(entity, 0)); - }); - } else { - stk::mesh::for_each_entity_run(ngpMesh, stk::topology::ELEM_RANK, bulk.mesh_meta_data().universal_part(), - KOKKOS_LAMBDA(const stk::mesh::FastMeshIndex& entity) - { - NGP_ThrowRequire(expectedValue == ngpMultiStateField.get_old(state, entity, 0)); - }); - } - } - -protected: - stk::mesh::NgpMultistateField create_field_with_num_states(unsigned numStates) - { - make_mesh_with_field(numStates); - return stk::mesh::NgpMultistateField(get_bulk(), *stkField); - } - void make_mesh_with_field(unsigned numStates) - { - setup_empty_mesh(stk::mesh::BulkData::NO_AUTO_AURA); - stkField = &get_meta().declare_field>(stk::topology::ELEM_RANK, "myField", numStates); - double init = -1.0; - stk::mesh::put_field_on_mesh(*stkField, get_meta().universal_part(), &init); - stk::io::fill_mesh("generated:1x1x4", get_bulk()); - } - void test_n_states(unsigned numStates) - { - stk::mesh::NgpMultistateField ngpField = create_field_with_num_states(numStates); - EXPECT_EQ(numStates, ngpField.get_num_states()); - } - void verify_initial_value_set_per_state(stk::mesh::NgpMultistateField &ngpStatedField) - { - stk::mesh::NgpField ngpField = ngpStatedField.get_field_new_state(); - test_field_has_value(ngpField, 0, -1.0); - for(unsigned stateCount = 1; stateCount < stkField->number_of_states(); stateCount++) - { - stk::mesh::NgpConstField constNgpField = ngpStatedField.get_field_old_state(static_cast(stateCount)); - test_field_has_value(constNgpField, stateCount, -1.0); - } - } - void verify_can_assign_values_per_state(stk::mesh::NgpMultistateField &ngpStatedField) - { - assign_sequential_values_by_state(ngpStatedField); - expect_sequential_values_by_state(ngpStatedField); - } - template - void test_field_has_value(Field ngpField, unsigned stateCount, double expectedValue) - { - stk::mesh::EntityVector elems; - stk::mesh::get_entities(get_bulk(), stk::topology::ELEM_RANK, elems); - - stk::mesh::FieldBase * fieldOfState = stkField->field_state(static_cast(stateCount)); - - ngpField.sync_to_host(); // TODO: Check on the device instead - - for(stk::mesh::Entity elem : elems) - EXPECT_EQ(expectedValue, *static_cast(stk::mesh::field_data(*fieldOfState, elem))); - } - - stk::mesh::Field * stkField; - -private: - template - void expect_field_has_value(const Field &ngpField, unsigned stateCount) - { - double fieldValue = stateCount; - test_field_has_value(ngpField, stateCount, fieldValue); - } - - void assign_sequential_values_by_state(stk::mesh::NgpMultistateField& ngpStatedField) - { - assign_value_to_state_new(ngpStatedField, stkField->number_of_states() - 1); - for(unsigned stateCount = 1; stateCount < stkField->number_of_states(); stateCount++) - { - get_bulk().update_field_data_states(); - ngpStatedField.increment_state(); - assign_value_to_state_new(ngpStatedField, stkField->number_of_states() - stateCount - 1); - } - } - - void assign_value_to_state_new(stk::mesh::NgpMultistateField& ngpStatedField, double value) - { - stk::mesh::NgpField ngpField = ngpStatedField.get_field_new_state(); - assign_value_to_field(get_bulk(), ngpField, value); - } - - void expect_sequential_values_by_state(stk::mesh::NgpMultistateField& ngpStatedField) - { - stk::mesh::NgpField ngpField = ngpStatedField.get_field_new_state(); - expect_field_has_value(ngpField, 0); - for(unsigned stateCount = 1; stateCount < stkField->number_of_states(); stateCount++) - { - stk::mesh::FieldState oldState = static_cast(stateCount); - stk::mesh::NgpConstField constNgpField = ngpStatedField.get_field_old_state(oldState); - expect_field_has_value(constNgpField, stateCount); - } - } -}; - -TEST_F(StatedFields, creatingFromSingleStateStkField_hasOneState) -{ - test_n_states(1); -} -TEST_F(StatedFields, creatingFromDualStateStkField_hasTwoStates) -{ - test_n_states(2); -} -TEST_F(StatedFields, creatingFromSixStateStkField_hasSixStates) -{ - test_n_states(6); -} -TEST_F(StatedFields, creatingFromStatedStkField_ngpStatedFieldHasSameValues) -{ - stk::mesh::NgpMultistateField ngpStatedField = create_field_with_num_states(3); - verify_initial_value_set_per_state(ngpStatedField); - verify_can_assign_values_per_state(ngpStatedField); -} -TEST_F(StatedFields, incrementingState_fieldsShiftDown) -{ - stk::mesh::NgpMultistateField ngpStatedField = create_field_with_num_states(3); - verify_can_assign_values_per_state(ngpStatedField); - - get_bulk().update_field_data_states(); - ngpStatedField.increment_state(); - - stk::mesh::NgpField ngpField = ngpStatedField.get_field_new_state(); - test_field_has_value(ngpField, 0, stkField->number_of_states()-1); - for(unsigned stateCount = 1; stateCount < stkField->number_of_states(); stateCount++) - { - stk::mesh::NgpConstField constNgpField = ngpStatedField.get_field_old_state(static_cast(stateCount)); - test_field_has_value(constNgpField, stateCount, stateCount-1); - } -} -TEST_F(StatedFields, field_swap) -{ - stk::mesh::NgpMultistateField ngpStatedField = create_field_with_num_states(2); - verify_can_assign_values_per_state(ngpStatedField); - - stk::mesh::FieldBase* stkField = get_meta().get_field(stk::topology::ELEM_RANK, "myField"); - - stk::mesh::NgpField ngpFieldNew(get_bulk(), *(stkField->field_state(stk::mesh::StateNew))); - stk::mesh::NgpField ngpFieldOld(get_bulk(), *(stkField->field_state(stk::mesh::StateOld))); - EXPECT_TRUE(ngpFieldNew.get_ordinal() != ngpFieldOld.get_ordinal()); - - test_field_has_value_on_device(get_bulk(), ngpFieldNew, 0); - test_field_has_value_on_device(get_bulk(), ngpFieldOld, 1); - - get_bulk().update_field_data_states(); - ngpFieldNew.swap(ngpFieldOld); - - test_field_has_value_on_device(get_bulk(), ngpFieldNew, 1); - test_field_has_value_on_device(get_bulk(), ngpFieldOld, 0); -} - -TEST_F(StatedFields, new_field_swap) -{ - stk::mesh::NgpMultistateField ngpStatedField = create_field_with_num_states(2); - verify_can_assign_values_per_state(ngpStatedField); - - test_field_state_has_value_on_device(get_bulk(), ngpStatedField, stk::mesh::StateNew, 0); - test_field_state_has_value_on_device(get_bulk(), ngpStatedField, stk::mesh::StateOld, 1); - - get_bulk().update_field_data_states(); - ngpStatedField.increment_state(); - - test_field_state_has_value_on_device(get_bulk(), ngpStatedField, stk::mesh::StateNew, 1); - test_field_state_has_value_on_device(get_bulk(), ngpStatedField, stk::mesh::StateOld, 0); -} - -TEST_F(StatedFields, gettingFieldData_direct) -{ - stk::mesh::NgpMultistateField ngpStatedField = create_field_with_num_states(3); - verify_initial_value_set_per_state(ngpStatedField); - - assign_value_to_statedfield(get_bulk(), ngpStatedField, 2); - get_bulk().update_field_data_states(); - ngpStatedField.increment_state(); - assign_value_to_statedfield(get_bulk(), ngpStatedField, 1); - get_bulk().update_field_data_states(); - ngpStatedField.increment_state(); - assign_value_to_statedfield(get_bulk(), ngpStatedField, 0); - - stk::mesh::NgpField ngpField = ngpStatedField.get_field_new_state(); - test_field_has_value(ngpField, 0, 0); - for(unsigned stateCount = 1; stateCount < stkField->number_of_states(); stateCount++) - { - stk::mesh::NgpConstField constNgpField = ngpStatedField.get_field_old_state(static_cast(stateCount)); - test_field_has_value(constNgpField, stateCount, stateCount); - } -} -TEST_F(StatedFields, updateFromHostStkField) -{ - stk::mesh::NgpMultistateField ngpStatedField = create_field_with_num_states(1); - verify_initial_value_set_per_state(ngpStatedField); - stk::mesh::NgpField ngpField = ngpStatedField.get_field_new_state(); - - const double new_value = 999; - stk::mesh::field_fill(new_value, *stkField); - ngpField.modify_on_host(); - test_field_has_value(ngpField, 0, new_value); -} -} //namespace diff --git a/packages/stk/stk_unit_tests/stk_mesh/ngp/NgpUnitTestUtils.hpp b/packages/stk/stk_unit_tests/stk_mesh/ngp/NgpUnitTestUtils.hpp index 0e8f845cf24f..c4bf52bd70e8 100644 --- a/packages/stk/stk_unit_tests/stk_mesh/ngp/NgpUnitTestUtils.hpp +++ b/packages/stk/stk_unit_tests/stk_mesh/ngp/NgpUnitTestUtils.hpp @@ -1,11 +1,23 @@ #ifndef NgpUnitTestUtils_hpp #define NgpUnitTestUtils_hpp +#include #include #include +#include +#include +#include +#include +#include namespace ngp_unit_test_utils { +struct BucketContents +{ + std::string partName; + std::vector elements; +}; + template DualViewType create_dualview(const std::string& name, unsigned size) { @@ -18,6 +30,95 @@ DualViewType create_dualview(const std::string& name, unsigned size) return result; } +inline void setup_mesh_3hex_3block(stk::mesh::BulkData& bulk, unsigned bucketCapacity) +{ + std::string meshDesc = "0,1,HEX_8,1,2,3,4,5,6,7,8,block_1\n" + "0,2,HEX_8,5,6,7,8,9,10,11,12,block_2\n" + "0,3,HEX_8,9,10,11,12,13,14,15,16,block_3"; + stk::unit_test_util::setup_text_mesh(bulk, meshDesc); +} + +inline void setup_mesh_3hex_2block(stk::mesh::BulkData& bulk, unsigned bucketCapacity) +{ + std::string meshDesc = "0,1,HEX_8,1,2,3,4,5,6,7,8,block_1\n" + "0,2,HEX_8,5,6,7,8,9,10,11,12,block_1\n" + "0,3,HEX_8,9,10,11,12,13,14,15,16,block_3"; + stk::unit_test_util::setup_text_mesh(bulk, meshDesc); +} + +inline void setup_mesh_2hex_3block(stk::mesh::BulkData& bulk, unsigned bucketCapacity) +{ + std::string meshDesc = "0,1,HEX_8,1,2,3,4,5,6,7,8,block_1\n" + "0,2,HEX_8,5,6,7,8,9,10,11,12,block_2"; + stk::unit_test_util::setup_text_mesh(bulk, meshDesc); +} + +inline void check_bucket_layout(const stk::mesh::BulkData& bulk, const std::vector & expectedBucketLayout) +{ + const stk::mesh::MetaData& meta = bulk.mesh_meta_data(); + const stk::mesh::BucketVector & buckets = bulk.buckets(stk::topology::ELEM_RANK); + size_t numBuckets = buckets.size(); + ASSERT_EQ(numBuckets, expectedBucketLayout.size()); + + size_t numElemsAcrossBuckets = 0; + for (size_t bucketIdx = 0; bucketIdx < numBuckets; ++bucketIdx) { + const stk::mesh::Bucket & bucket = *buckets[bucketIdx]; + const BucketContents & bucketContents = expectedBucketLayout[bucketIdx]; + + const stk::mesh::Part & expectedPart = *meta.get_part(bucketContents.partName); + EXPECT_TRUE(bucket.member(expectedPart)); + + numElemsAcrossBuckets += bucket.size(); + ASSERT_EQ(bucket.size(), bucketContents.elements.size()); + for (unsigned i = 0; i < bucket.size(); ++i) { + EXPECT_EQ(bulk.identifier(bucket[i]), bucketContents.elements[i]); + } + } + + using BucketPartOrdinalType = Kokkos::View; + BucketPartOrdinalType bucketPartOrdinals("bucketPartOrdinals", numBuckets); + BucketPartOrdinalType::HostMirror hostBucketPartOrdinals = Kokkos::create_mirror_view(bucketPartOrdinals); + for (size_t i = 0; i < buckets.size(); ++i) { + hostBucketPartOrdinals[i] = meta.get_part(expectedBucketLayout[i].partName)->mesh_meta_data_ordinal(); + } + Kokkos::deep_copy(bucketPartOrdinals, hostBucketPartOrdinals); + + stk::mesh::NgpMesh & ngpMesh = bulk.get_updated_ngp_mesh(); + Kokkos::parallel_for(1, KOKKOS_LAMBDA(size_t /*index*/) { + NGP_ASSERT_EQ(ngpMesh.num_buckets(stk::topology::ELEM_RANK), numBuckets); + for (unsigned i = 0; i < numBuckets; ++i) { + NGP_EXPECT_TRUE(ngpMesh.get_bucket(stk::topology::ELEM_RANK, i).member(bucketPartOrdinals[i])); + } + }); + + using BucketEntitiesType = Kokkos::View; + BucketEntitiesType bucketEntities("bucketEntities", numElemsAcrossBuckets+numBuckets); + BucketEntitiesType::HostMirror hostBucketEntities = Kokkos::create_mirror_view(bucketEntities); + size_t index = 0; + for (size_t bucketIdx = 0; bucketIdx < numBuckets; ++bucketIdx) { + const stk::mesh::Bucket & bucket = *buckets[bucketIdx]; + hostBucketEntities[index++] = bucket.size(); + for (unsigned i = 0; i < bucket.size(); ++i) { + hostBucketEntities[index++] = bulk.identifier(bucket[i]); + } + } + Kokkos::deep_copy(bucketEntities, hostBucketEntities); + + Kokkos::parallel_for(1, KOKKOS_LAMBDA(size_t /*index*/) { + NGP_ASSERT_EQ(ngpMesh.num_buckets(stk::topology::ELEM_RANK), numBuckets); + size_t idx = 0; + for (unsigned bucketIdx = 0; bucketIdx < numBuckets; ++bucketIdx) { + const stk::mesh::NgpMesh::BucketType & bucket = ngpMesh.get_bucket(stk::topology::ELEM_RANK, + bucketIdx); + NGP_ASSERT_EQ(bucket.size(), bucketEntities[idx++]); + for (size_t i = 0; i < bucket.size(); ++i) { + NGP_EXPECT_EQ(ngpMesh.identifier(bucket[i]), bucketEntities[idx++]); + } + } + }); +} + + } // ngp_unit_test_utils #endif diff --git a/packages/stk/stk_unit_tests/stk_mesh/ngp/TestNgpMeshUpdate.cpp b/packages/stk/stk_unit_tests/stk_mesh/ngp/TestNgpMeshUpdate.cpp index 15764d71a2af..ee5a1891165f 100644 --- a/packages/stk/stk_unit_tests/stk_mesh/ngp/TestNgpMeshUpdate.cpp +++ b/packages/stk/stk_unit_tests/stk_mesh/ngp/TestNgpMeshUpdate.cpp @@ -1,14 +1,13 @@ #include #include #include -#include #include #include #include #include -#include #include #include +#include "NgpUnitTestUtils.hpp" namespace { @@ -65,7 +64,6 @@ TEST_F(UpdateNgpMesh, manualUpdate) get_bulk().update_ngp_mesh(); EXPECT_TRUE(ngpMesh.is_up_to_date()); #endif - } TEST_F(UpdateNgpMesh, OnlyOneDeviceMesh_InternalAndExternal) @@ -95,95 +93,19 @@ TEST_F(UpdateNgpMesh, OnlyOneDeviceMesh_TwoExternal) #endif } -struct BucketContents -{ - std::string partName; - std::vector elements; -}; - class BucketLayoutModification : public stk::unit_test_util::MeshFixture { public: void setup_mesh_3hex_3block(unsigned bucketCapacity) { setup_empty_mesh(stk::mesh::BulkData::NO_AUTO_AURA, bucketCapacity); - std::string meshDesc = "0,1,HEX_8,1,2,3,4,5,6,7,8,block_1\n" - "0,2,HEX_8,5,6,7,8,9,10,11,12,block_2\n" - "0,3,HEX_8,9,10,11,12,13,14,15,16,block_3"; - stk::unit_test_util::setup_text_mesh(get_bulk(), meshDesc); + ngp_unit_test_utils::setup_mesh_3hex_3block(get_bulk(), bucketCapacity); } void setup_mesh_3hex_2block(unsigned bucketCapacity) { setup_empty_mesh(stk::mesh::BulkData::NO_AUTO_AURA, bucketCapacity); - std::string meshDesc = "0,1,HEX_8,1,2,3,4,5,6,7,8,block_1\n" - "0,2,HEX_8,5,6,7,8,9,10,11,12,block_1\n" - "0,3,HEX_8,9,10,11,12,13,14,15,16,block_3"; - stk::unit_test_util::setup_text_mesh(get_bulk(), meshDesc); - } - - void check_bucket_layout(const std::vector & expectedBucketLayout) - { - const stk::mesh::BucketVector & buckets = get_bulk().buckets(stk::topology::ELEM_RANK); - size_t numBuckets = buckets.size(); - ASSERT_EQ(numBuckets, expectedBucketLayout.size()); - - size_t numElemsAcrossBuckets = 0; - for (size_t bucketIdx = 0; bucketIdx < numBuckets; ++bucketIdx) { - const stk::mesh::Bucket & bucket = *buckets[bucketIdx]; - const BucketContents & bucketContents = expectedBucketLayout[bucketIdx]; - - const stk::mesh::Part & expectedPart = *get_meta().get_part(bucketContents.partName); - EXPECT_TRUE(bucket.member(expectedPart)); - - numElemsAcrossBuckets += bucket.size(); - ASSERT_EQ(bucket.size(), bucketContents.elements.size()); - for (unsigned i = 0; i < bucket.size(); ++i) { - EXPECT_EQ(get_bulk().identifier(bucket[i]), bucketContents.elements[i]); - } - } - - using BucketPartOrdinalType = Kokkos::View; - BucketPartOrdinalType bucketPartOrdinals("bucketPartOrdinals", numBuckets); - BucketPartOrdinalType::HostMirror hostBucketPartOrdinals = Kokkos::create_mirror_view(bucketPartOrdinals); - for (size_t i = 0; i < buckets.size(); ++i) { - hostBucketPartOrdinals[i] = get_meta().get_part(expectedBucketLayout[i].partName)->mesh_meta_data_ordinal(); - } - Kokkos::deep_copy(bucketPartOrdinals, hostBucketPartOrdinals); - - stk::mesh::NgpMesh & ngpMesh = get_bulk().get_updated_ngp_mesh(); - Kokkos::parallel_for(1, KOKKOS_LAMBDA(size_t /*index*/) { - NGP_ASSERT_EQ(ngpMesh.num_buckets(stk::topology::ELEM_RANK), numBuckets); - for (unsigned i = 0; i < numBuckets; ++i) { - NGP_EXPECT_TRUE(ngpMesh.get_bucket(stk::topology::ELEM_RANK, i).member(bucketPartOrdinals[i])); - } - }); - - using BucketEntitiesType = Kokkos::View; - BucketEntitiesType bucketEntities("bucketEntities", numElemsAcrossBuckets+numBuckets); - BucketEntitiesType::HostMirror hostBucketEntities = Kokkos::create_mirror_view(bucketEntities); - size_t index = 0; - for (size_t bucketIdx = 0; bucketIdx < numBuckets; ++bucketIdx) { - const stk::mesh::Bucket & bucket = *buckets[bucketIdx]; - hostBucketEntities[index++] = bucket.size(); - for (unsigned i = 0; i < bucket.size(); ++i) { - hostBucketEntities[index++] = get_bulk().identifier(bucket[i]); - } - } - Kokkos::deep_copy(bucketEntities, hostBucketEntities); - - Kokkos::parallel_for(1, KOKKOS_LAMBDA(size_t /*index*/) { - NGP_ASSERT_EQ(ngpMesh.num_buckets(stk::topology::ELEM_RANK), numBuckets); - size_t idx = 0; - for (unsigned bucketIdx = 0; bucketIdx < numBuckets; ++bucketIdx) { - const stk::mesh::NgpMesh::BucketType & bucket = ngpMesh.get_bucket(stk::topology::ELEM_RANK, - bucketIdx); - NGP_ASSERT_EQ(bucket.size(), bucketEntities[idx++]); - for (size_t i = 0; i < bucket.size(); ++i) { - NGP_EXPECT_EQ(ngpMesh.identifier(bucket[i]), bucketEntities[idx++]); - } - } - }); + ngp_unit_test_utils::setup_mesh_3hex_2block(get_bulk(), bucketCapacity); } }; @@ -203,7 +125,7 @@ TEST_F(BucketLayoutModification, DeleteBucketInMiddle) stk::mesh::NgpMesh & ngpMesh = get_bulk().get_updated_ngp_mesh(); - check_bucket_layout({{"block_1", {1}}, {"block_2", {2}}, {"block_3", {3}}}); + ngp_unit_test_utils::check_bucket_layout(get_bulk(), {{"block_1", {1}}, {"block_2", {2}}, {"block_3", {3}}}); get_bulk().modification_begin(); stk::mesh::PartVector addParts{get_meta().get_part("block_1")}; @@ -213,7 +135,7 @@ TEST_F(BucketLayoutModification, DeleteBucketInMiddle) ngpMesh.update_mesh(); - check_bucket_layout({{"block_1", {1,2}}, {"block_3", {3}}}); + ngp_unit_test_utils::check_bucket_layout(get_bulk(), {{"block_1", {1,2}}, {"block_3", {3}}}); } // ------------------------- ------------------------- @@ -231,7 +153,7 @@ TEST_F(BucketLayoutModification, AddBucketInMiddle) stk::mesh::NgpMesh & ngpMesh = get_bulk().get_updated_ngp_mesh(); - check_bucket_layout({{"block_1", {1}}, {"block_2", {2}}, {"block_3", {3}}}); + ngp_unit_test_utils::check_bucket_layout(get_bulk(), {{"block_1", {1}}, {"block_2", {2}}, {"block_3", {3}}}); get_bulk().modification_begin(); stk::mesh::PartVector addParts{get_meta().get_part("block_1")}; @@ -241,7 +163,7 @@ TEST_F(BucketLayoutModification, AddBucketInMiddle) ngpMesh.update_mesh(); - check_bucket_layout({{"block_1", {1}}, {"block_1", {3}}, {"block_2", {2}}}); + ngp_unit_test_utils::check_bucket_layout(get_bulk(), {{"block_1", {1}}, {"block_1", {3}}, {"block_2", {2}}}); } // ------------------------- ------------------------- @@ -259,7 +181,7 @@ TEST_F(BucketLayoutModification, ChangeBucketContents) stk::mesh::NgpMesh & ngpMesh = get_bulk().get_updated_ngp_mesh(); - check_bucket_layout({{"block_1", {1,2}}, {"block_3", {3}}}); + ngp_unit_test_utils::check_bucket_layout(get_bulk(), {{"block_1", {1,2}}, {"block_3", {3}}}); get_bulk().modification_begin(); stk::mesh::PartVector addParts{get_meta().get_part("block_3")}; @@ -269,8 +191,7 @@ TEST_F(BucketLayoutModification, ChangeBucketContents) ngpMesh.update_mesh(); - check_bucket_layout({{"block_1", {1}}, {"block_3", {2,3}}}); - + ngp_unit_test_utils::check_bucket_layout(get_bulk(), {{"block_1", {1}}, {"block_3", {2,3}}}); } // ------------------------- ------------------------- @@ -288,7 +209,7 @@ TEST_F(BucketLayoutModification, DeleteBucketInMiddle_WithCopy) stk::mesh::NgpMesh ngpMesh = get_bulk().get_updated_ngp_mesh(); - check_bucket_layout({{"block_1", {1}}, {"block_2", {2}}, {"block_3", {3}}}); + ngp_unit_test_utils::check_bucket_layout(get_bulk(), {{"block_1", {1}}, {"block_2", {2}}, {"block_3", {3}}}); get_bulk().modification_begin(); stk::mesh::PartVector addParts{get_meta().get_part("block_1")}; @@ -298,7 +219,7 @@ TEST_F(BucketLayoutModification, DeleteBucketInMiddle_WithCopy) get_bulk().update_ngp_mesh(); - check_bucket_layout({{"block_1", {1,2}}, {"block_3", {3}}}); + ngp_unit_test_utils::check_bucket_layout(get_bulk(), {{"block_1", {1,2}}, {"block_3", {3}}}); } // ------------------------- ------------------------- @@ -316,7 +237,7 @@ TEST_F(BucketLayoutModification, AddBucketInMiddle_WithCopy) stk::mesh::NgpMesh ngpMesh = get_bulk().get_updated_ngp_mesh(); - check_bucket_layout({{"block_1", {1}}, {"block_2", {2}}, {"block_3", {3}}}); + ngp_unit_test_utils::check_bucket_layout(get_bulk(), {{"block_1", {1}}, {"block_2", {2}}, {"block_3", {3}}}); get_bulk().modification_begin(); stk::mesh::PartVector addParts{get_meta().get_part("block_1")}; @@ -326,7 +247,7 @@ TEST_F(BucketLayoutModification, AddBucketInMiddle_WithCopy) get_bulk().update_ngp_mesh(); - check_bucket_layout({{"block_1", {1}}, {"block_1", {3}}, {"block_2", {2}}}); + ngp_unit_test_utils::check_bucket_layout(get_bulk(), {{"block_1", {1}}, {"block_1", {3}}, {"block_2", {2}}}); } // ------------------------- ------------------------- @@ -344,7 +265,7 @@ TEST_F(BucketLayoutModification, ChangeBucketContents_WithCopy) stk::mesh::NgpMesh ngpMesh = get_bulk().get_updated_ngp_mesh(); - check_bucket_layout({{"block_1", {1,2}}, {"block_3", {3}}}); + ngp_unit_test_utils::check_bucket_layout(get_bulk(), {{"block_1", {1,2}}, {"block_3", {3}}}); get_bulk().modification_begin(); stk::mesh::PartVector addParts{get_meta().get_part("block_3")}; @@ -354,7 +275,7 @@ TEST_F(BucketLayoutModification, ChangeBucketContents_WithCopy) get_bulk().update_ngp_mesh(); - check_bucket_layout({{"block_1", {1}}, {"block_3", {2,3}}}); + ngp_unit_test_utils::check_bucket_layout(get_bulk(), {{"block_1", {1}}, {"block_3", {2,3}}}); } } diff --git a/packages/stk/stk_unit_tests/stk_mesh/ngp/howToNgp.cpp b/packages/stk/stk_unit_tests/stk_mesh/ngp/howToNgp.cpp index 9bdeca25b859..79f065d8b69f 100644 --- a/packages/stk/stk_unit_tests/stk_mesh/ngp/howToNgp.cpp +++ b/packages/stk/stk_unit_tests/stk_mesh/ngp/howToNgp.cpp @@ -1,7 +1,6 @@ #include #include #include -#include #include #include #include @@ -34,7 +33,7 @@ void set_field_on_device_and_copy_back(stk::mesh::BulkData &bulk, stk::mesh::Field &quadField, double fieldVal) { - stk::mesh::NgpField ngpQuadField(bulk, quadField); + stk::mesh::NgpField& ngpQuadField = stk::mesh::get_updated_ngp_field(quadField); EXPECT_EQ(quadField.mesh_meta_data_ordinal(), ngpQuadField.get_ordinal()); stk::mesh::NgpMesh & ngpMesh = bulk.get_updated_ngp_mesh(); @@ -725,7 +724,7 @@ void set_num_elems_in_field_on_device_and_copy_back(stk::mesh::BulkData &bulk, stk::mesh::Part &part, stk::mesh::Field &field) { - stk::mesh::NgpField ngpField(bulk, field); + stk::mesh::NgpField& ngpField = stk::mesh::get_updated_ngp_field(field); stk::mesh::NgpMesh & ngpMesh = bulk.get_updated_ngp_mesh(); unsigned numElems = count_num_elems(ngpMesh, ngpField, field.entity_rank(), part); stk::mesh::for_each_entity_run(ngpMesh, field.entity_rank(), part, @@ -789,57 +788,6 @@ stk::mesh::Field &create_field(stk::mesh::MetaData &meta) return create_field_with_num_states_and_init(meta, "myField", numStates, initialValue); } -void verify_state_new_has_value(stk::mesh::BulkData &bulk, - const stk::mesh::NgpMesh& ngpMesh, - stk::mesh::Field& field, - stk::mesh::NgpMultistateField &ngpMultistateField, - int np1Value) -{ - ngpMultistateField.sync_to_host(); - - for(const stk::mesh::Bucket* bucket : bulk.buckets(stk::topology::ELEM_RANK)) { - for(stk::mesh::Entity elem : *bucket) { - EXPECT_EQ(np1Value, *static_cast(stk::mesh::field_data(*field.field_state(stk::mesh::StateNP1), elem))); - } - } -} - -void set_new_as_old_plus_one_in_field_on_device(stk::mesh::NgpMesh &ngpMesh, - stk::mesh::EntityRank rank, - stk::mesh::Selector sel, - stk::mesh::NgpMultistateField &ngpMultistateField) -{ - int component = 0; - stk::mesh::for_each_entity_run(ngpMesh, rank, sel, - KOKKOS_LAMBDA(const stk::mesh::FastMeshIndex& entity) - { - ngpMultistateField.get_new(entity, component) = ngpMultistateField.get_old(stk::mesh::StateOld, entity, component) + 1; - }); - ngpMultistateField.modify_on_device(); -} - -TEST_F(NgpHowTo, useMultistateFields) -{ - int numStates = 2; - int initialValue = 0; - stk::mesh::Field &stkField = create_field_with_num_states_and_init(get_meta(), "myField", numStates, initialValue); - setup_mesh("generated:1x1x4", stk::mesh::BulkData::AUTO_AURA); - - stk::mesh::NgpMultistateField ngpMultistateField(get_bulk(), stkField); - stk::mesh::NgpMesh ngpMesh(get_bulk()); - - set_new_as_old_plus_one_in_field_on_device(ngpMesh, stk::topology::ELEM_RANK, get_meta().universal_part(), ngpMultistateField); - int newStateValue = 1; - verify_state_new_has_value(get_bulk(), ngpMesh, stkField, ngpMultistateField, newStateValue); - - get_bulk().update_field_data_states(); - ngpMultistateField.increment_state(); - - set_new_as_old_plus_one_in_field_on_device(ngpMesh, stk::topology::ELEM_RANK, get_meta().universal_part(), ngpMultistateField); - newStateValue = 2; - verify_state_new_has_value(get_bulk(), ngpMesh, stkField, ngpMultistateField, newStateValue); -} - TEST_F(NgpHowTo, setAllScalarFieldValues) { int numStates = 2; @@ -847,7 +795,7 @@ TEST_F(NgpHowTo, setAllScalarFieldValues) stk::mesh::Field &stkField = create_field_with_num_states_and_init(get_meta(), "myField", numStates, initialValue); setup_mesh("generated:1x1x4", stk::mesh::BulkData::AUTO_AURA); - stk::mesh::NgpField ngpField(get_bulk(), stkField); + stk::mesh::NgpField& ngpField = stk::mesh::get_updated_ngp_field(stkField); stk::mesh::NgpMesh & ngpMesh = get_bulk().get_updated_ngp_mesh(); double fieldVal = 1.0; @@ -1019,9 +967,9 @@ TEST_F(NgpReduceHowTo, minLocReduction) stk::mesh::NgpMesh & ngpMesh = get_bulk().get_updated_ngp_mesh(); stk::mesh::NgpField & ngpElemField = stk::mesh::get_updated_ngp_field(*elemField); int expectedMin = 1; - int expectedMinLoc = 0; - Kokkos::ValLocScalar minLocVal; - Kokkos::MinLoc minLoc (minLocVal); + stk::mesh::EntityId expectedMinLoc = 1; + Kokkos::ValLocScalar minLocVal; + Kokkos::MinLoc minLoc (minLocVal); stk::mesh::get_field_reduction (ngpMesh, ngpElemField, get_bulk().mesh_meta_data().universal_part(), minLoc); EXPECT_EQ(expectedMin, minLocVal.val); @@ -1034,11 +982,11 @@ TEST_F(NgpReduceHowTo, minMaxLocReduction) stk::mesh::NgpMesh & ngpMesh = get_bulk().get_updated_ngp_mesh(); stk::mesh::NgpField & ngpElemField = stk::mesh::get_updated_ngp_field(*elemField); int expectedMin = 1; - int expectedMinLoc = 0; + stk::mesh::EntityId expectedMinLoc = 1; int expectedMax = get_num_elems(); - int expectedMaxLoc = 3; - Kokkos::MinMaxLocScalar minMaxLocVal; - Kokkos::MinMaxLoc minMaxLoc (minMaxLocVal); + stk::mesh::EntityId expectedMaxLoc = 4; + Kokkos::MinMaxLocScalar minMaxLocVal; + Kokkos::MinMaxLoc minMaxLoc (minMaxLocVal); stk::mesh::get_field_reduction (ngpMesh, ngpElemField, get_bulk().mesh_meta_data().universal_part(), minMaxLoc); EXPECT_EQ(expectedMin, minMaxLocVal.min_val); EXPECT_EQ(expectedMinLoc, minMaxLocVal.min_loc); @@ -1052,11 +1000,11 @@ TEST_F(NgpReduceHowTo, minMaxLocReductionThroughAccessor) stk::mesh::NgpMesh & ngpMesh = get_bulk().get_updated_ngp_mesh(); stk::mesh::NgpField & ngpElemField = stk::mesh::get_updated_ngp_field(*elemField); int expectedMin = 1; - int expectedMinLoc = 0; + stk::mesh::EntityId expectedMinLoc = 1; int expectedMax = get_num_elems(); - int expectedMaxLoc = 3; - Kokkos::MinMaxLocScalar minMaxLocVal; - Kokkos::MinMaxLoc minMaxLoc (minMaxLocVal); + stk::mesh::EntityId expectedMaxLoc = 4; + Kokkos::MinMaxLocScalar minMaxLocVal; + Kokkos::MinMaxLoc minMaxLoc (minMaxLocVal); stk::mesh::FieldAccessFunctor, decltype(minMaxLoc), stk::mesh::identity>accessor(ngpElemField, minMaxLoc); stk::mesh::get_field_reduction(ngpMesh, get_bulk().mesh_meta_data().universal_part(), accessor); @@ -1306,14 +1254,6 @@ class FakeEntity { m_value = rhs.m_value; } - STK_FUNCTION - FakeEntity& operator=(const FakeEntity& rhs) { - printf(" FakeEntity: (%lu -> %lu) Calling copy assignment operator\n", m_value, rhs.m_value); - if (&rhs == this) return *this; - m_value = rhs.m_value; - return *this; - } - STK_FUNCTION size_t value() const { return m_value; } @@ -1351,15 +1291,6 @@ class FakeBucket { m_innerView = rhs.m_innerView; } - STK_FUNCTION - FakeBucket& operator=(const FakeBucket& rhs) { - printf("FakeBucket: (%lu -> %lu) Calling copy assignment operator\n", m_value, rhs.m_value); - if (&rhs == this) return *this; - m_value = rhs.m_value; - m_innerView = rhs.m_innerView; - return *this; - } - void initialize(size_t numValues) { m_innerView = FakeEntityType("Data", numValues); } diff --git a/packages/stk/stk_unit_tests/stk_mesh/ngp/ngpFieldTest.cpp b/packages/stk/stk_unit_tests/stk_mesh/ngp/ngpFieldTest.cpp index 0165da453a55..372d969a8eb1 100644 --- a/packages/stk/stk_unit_tests/stk_mesh/ngp/ngpFieldTest.cpp +++ b/packages/stk/stk_unit_tests/stk_mesh/ngp/ngpFieldTest.cpp @@ -2,6 +2,7 @@ #include #include #include +#include #include #include #include @@ -12,7 +13,11 @@ #include #include #include +#include #include +#include "NgpUnitTestUtils.hpp" +#include +#include namespace ngp_field_test { @@ -20,14 +25,519 @@ class NgpFieldFixture : public stk::unit_test_util::MeshFixture { public: template - stk::mesh::Field & create_field(stk::topology::rank_t rank, const std::string & name) + stk::mesh::Field & create_field(stk::topology::rank_t rank, const std::string & name, unsigned numComponent = 1) { unsigned numStates = 1; - const T init = 1; + const std::vector init(numComponent, 1); stk::mesh::Field & field = get_meta().declare_field>(rank, name, numStates); - stk::mesh::put_field_on_mesh(field, get_meta().universal_part(), &init); + stk::mesh::put_field_on_mesh(field, get_meta().universal_part(), numComponent, init.data()); return field; } + + void setup_two_field_two_element_mesh() + { + const unsigned bucketCapacity = 1; + setup_empty_mesh(stk::mesh::BulkData::NO_AUTO_AURA, bucketCapacity); + + stk::mesh::Field& stkField1 = get_meta().declare_field>( + stk::topology::ELEM_RANK, "variableLengthField"); + stk::mesh::Field& stkField2 = get_meta().declare_field>( + stk::topology::ELEM_RANK, "potentiallyOverwrittenField"); + stk::mesh::Part& block1 = get_meta().declare_part("block_1", stk::topology::ELEM_RANK); + stk::mesh::Part& block2 = get_meta().declare_part("block_2", stk::topology::ELEM_RANK); + + const int init1[2] = {1, 1}; + stk::mesh::put_field_on_mesh(stkField1, block1, 1, init1); + stk::mesh::put_field_on_mesh(stkField1, block2, 2, init1); + + const int init2 = 1; + stk::mesh::put_field_on_mesh(stkField2, block1, 1, &init2); + stk::mesh::put_field_on_mesh(stkField2, block2, 1, &init2); + + const std::string meshDesc = "0,1,SHELL_QUAD_4,1,2,5,6,block_1\n" + "0,2,SHELL_QUAD_4,2,3,4,5,block_2\n"; + stk::unit_test_util::setup_text_mesh(get_bulk(), meshDesc); + } + + void setup_mesh_3hex_3block(unsigned bucketCapacity) + { + setup_empty_mesh(stk::mesh::BulkData::NO_AUTO_AURA, bucketCapacity); + ngp_unit_test_utils::setup_mesh_3hex_3block(get_bulk(), bucketCapacity); + } + + void setup_mesh_3hex_2block(unsigned bucketCapacity) + { + setup_empty_mesh(stk::mesh::BulkData::NO_AUTO_AURA, bucketCapacity); + ngp_unit_test_utils::setup_mesh_3hex_2block(get_bulk(), bucketCapacity); + } + + void setup_mesh_2hex_3block(unsigned bucketCapacity) + { + get_meta().declare_part("block_3", stk::topology::ELEMENT_RANK); + setup_empty_mesh(stk::mesh::BulkData::NO_AUTO_AURA, bucketCapacity); + ngp_unit_test_utils::setup_mesh_2hex_3block(get_bulk(), bucketCapacity); + } + + template + void check_field_data_on_host(stk::mesh::Field& stkField, unsigned multiplier) + { + stk::mesh::EntityRank rank = stk::topology::ELEM_RANK; + stk::mesh::Selector fieldSelector(stkField); + stk::mesh::EntityVector elements; + stk::mesh::get_entities(get_bulk(), rank, elements); + + for(stk::mesh::Entity element : elements) { + T* data = stk::mesh::field_data>(stkField, element); + unsigned numComponents = stk::mesh::field_scalars_per_entity(stkField, element); + for(unsigned j = 0; j < numComponents; j++) { + int expectedVal = get_bulk().identifier(element) * multiplier + j; + EXPECT_EQ(data[j], expectedVal); + } + } + } + + template + void check_field_data_on_device(stk::mesh::NgpField& ngpField, stk::mesh::Field& stkField) + { + using FieldData = Kokkos::View; + + stk::mesh::EntityRank rank = stk::topology::ELEM_RANK; + stk::mesh::Selector fieldSelector(stkField); + stk::mesh::EntityVector elements; + stk::mesh::get_entities(get_bulk(), rank, elements); + unsigned numElems = elements.size(); + stk::NgpVector ngpElements(elements.size()); + + for(unsigned i = 0; i < elements.size(); i++) { + ngpElements[i] = elements[i]; + } + ngpElements.copy_host_to_device(); + + unsigned numPerEntity = stkField.max_size(rank); + + FieldData deviceData = FieldData("deviceData", numElems, numPerEntity); + typename FieldData::HostMirror hostData = Kokkos::create_mirror_view(deviceData); + + stk::mesh::NgpMesh& ngpMesh = get_bulk().get_updated_ngp_mesh(); + + Kokkos::parallel_for(numElems, + KOKKOS_LAMBDA(const int& elemIdx) { + stk::mesh::Entity elem = ngpElements.device_get(elemIdx); + auto meshIndex = ngpMesh.fast_mesh_index(elem); + unsigned numScalarsPerEntity = ngpField.get_num_components_per_entity(meshIndex); + + for(unsigned i = 0; i < numScalarsPerEntity; i++) { + deviceData(elemIdx,i) = ngpField(meshIndex,i); + } + } + ); + Kokkos::deep_copy(hostData, deviceData); + + for(unsigned i = 0; i < numElems; i++) { + T* data = stk::mesh::field_data>(stkField, elements[i]); + unsigned numComponents = stk::mesh::field_scalars_per_entity(stkField, elements[i]); + for(unsigned j = 0; j < numComponents; j++) { + EXPECT_EQ(hostData(i,j), data[j]) << "i: " << i << " at (" << get_bulk().identifier(elements[i]) << "," << j << ") hostdata: " << hostData(i,j) << " dev data: " << data[j] << std::endl; + } + } + } + + void set_element_field_data(stk::mesh::FieldBase* field) + { + stk::mesh::EntityVector elements; + const stk::mesh::BucketVector& buckets = get_bulk().buckets(stk::topology::ELEM_RANK); + stk::mesh::get_selected_entities(get_meta().universal_part(), buckets, elements); + + for(stk::mesh::Entity elem : elements) { + int* data = static_cast(stk::mesh::field_data(*field, elem)); + unsigned numComponents = stk::mesh::field_scalars_per_entity(*field, get_bulk().bucket(elem)); + for(unsigned i = 0; i < numComponents; i++) { + data[i] = get_bulk().identifier(elem) * 10 + i; + } + } + } +}; + +class OptimizedNgpFieldFixture : public NgpFieldFixture +{ + +public: + void set_element_field_data(stk::mesh::Field& stkIntField, stk::mesh::Selector selector, unsigned multiplier) + { + stk::mesh::EntityVector elements; + stk::mesh::get_selected_entities(selector, get_bulk().buckets(stk::topology::ELEM_RANK), elements); + + for(stk::mesh::Entity elem : elements) { + int* data = reinterpret_cast(stk::mesh::field_data(stkIntField, elem)); + unsigned numComponents = stk::mesh::field_scalars_per_entity(stkIntField, elem); + for(unsigned j = 0; j < numComponents; j++) { + data[j] = get_bulk().identifier(elem) * multiplier + j; + } + } + } + + void setup_3hex_3block_mesh_with_field(unsigned bucketCapacity, stk::mesh::Field& stkIntField) + { + setup_mesh_3hex_3block(bucketCapacity); + set_element_field_data(stkIntField, get_meta().universal_part(), 10u); + } + + void setup_3hex_2block_mesh_with_field(unsigned bucketCapacity, stk::mesh::Field& stkIntField) + { + setup_mesh_3hex_2block(bucketCapacity); + set_element_field_data(stkIntField, get_meta().universal_part(), 10u); + } + + void setup_2hex_3block_mesh_with_field(unsigned bucketCapacity, stk::mesh::Field& stkIntField) + { + setup_mesh_2hex_3block(bucketCapacity); + set_element_field_data(stkIntField, get_meta().universal_part(), 10u); + } + + void run_add_and_delete_bucket3(unsigned numComponents) + { + stk::mesh::Field& stkIntField = create_field(stk::topology::ELEM_RANK, "intField", numComponents); + const unsigned bucketCapacity = 2; + + setup_2hex_3block_mesh_with_field(bucketCapacity, stkIntField); + stk::mesh::NgpField& ngpIntField = stk::mesh::get_updated_ngp_field(stkIntField); + modify_mesh_add_and_delete_bucket3(stkIntField, ngpIntField); + + ngpIntField.modify_on_host(); + ngpIntField.update_field(); + + check_field_data_on_device(ngpIntField, stkIntField); + } + + void run_add_and_delete_bucket2(unsigned numComponents) + { + stk::mesh::Field& stkIntField = create_field(stk::topology::ELEM_RANK, "intField", numComponents); + const unsigned bucketCapacity = 2; + + setup_2hex_3block_mesh_with_field(bucketCapacity, stkIntField); + stk::mesh::NgpField& ngpIntField = stk::mesh::get_updated_ngp_field(stkIntField); + modify_mesh_add_and_delete_bucket2(stkIntField, ngpIntField); + + ngpIntField.modify_on_host(); + ngpIntField.update_field(); + + check_field_data_on_device(ngpIntField, stkIntField); + } + + void run_add_and_delete_bucket(unsigned numComponents) + { + stk::mesh::Field& stkIntField = create_field(stk::topology::ELEM_RANK, "intField", numComponents); + const unsigned bucketCapacity = 2; + + setup_2hex_3block_mesh_with_field(bucketCapacity, stkIntField); + stk::mesh::NgpField& ngpIntField = stk::mesh::get_updated_ngp_field(stkIntField); + modify_mesh_add_and_delete_bucket(stkIntField, ngpIntField); + + ngpIntField.modify_on_host(); + ngpIntField.update_field(); + + check_field_data_on_device(ngpIntField, stkIntField); + } + + + void run_delete_bucket_in_middle(unsigned numComponents) + { + stk::mesh::Field& stkIntField = create_field(stk::topology::ELEM_RANK, "intField", numComponents); + const unsigned bucketCapacity = 2; + + setup_3hex_3block_mesh_with_field(bucketCapacity, stkIntField); + stk::mesh::NgpField& ngpIntField = stk::mesh::get_updated_ngp_field(stkIntField); + modify_mesh_delete_bucket_in_middle(stkIntField, ngpIntField); + + ngpIntField.modify_on_host(); + ngpIntField.update_field(); + + check_field_data_on_device(ngpIntField, stkIntField); + } + + void run_add_new_element(unsigned numComponents, unsigned bucketCapacity) + { + stk::mesh::Field& stkIntField = create_field(stk::topology::ELEM_RANK, "intField", numComponents); + + setup_3hex_3block_mesh_with_field(bucketCapacity, stkIntField); + stk::mesh::NgpField ngpIntField = stk::mesh::get_updated_ngp_field(stkIntField); + + modify_and_test_add_element(stkIntField, ngpIntField, bucketCapacity); + } + + void run_add_new_element_and_modify_from_device(unsigned numComponents) + { + stk::mesh::Field& stkIntField = create_field(stk::topology::ELEM_RANK, "intField", numComponents); + const unsigned bucketCapacity = 2; + + setup_3hex_3block_mesh_with_field(bucketCapacity, stkIntField); + { + get_bulk().get_updated_ngp_mesh(); + stk::mesh::NgpField& ngpIntField = stk::mesh::get_updated_ngp_field(stkIntField); + + modify_and_test_add_element(stkIntField, ngpIntField, bucketCapacity); + } + + { + stk::mesh::NgpMesh& ngpMesh = get_bulk().get_updated_ngp_mesh(); + stk::mesh::NgpField& ngpIntField = stk::mesh::get_updated_ngp_field(stkIntField); + + check_field_data_on_host(stkIntField, 10u); + + ngpIntField.sync_to_device(); + ngpIntField.clear_sync_state(); + ngpIntField.modify_on_device(); + + stk::mesh::for_each_entity_run(ngpMesh, stk::topology::ELEMENT_RANK, get_meta().universal_part(), + KOKKOS_LAMBDA(const stk::mesh::FastMeshIndex& elem) { + ngpIntField(elem, 0) *= 2; + } + ); + + ngpIntField.sync_to_host(); + + check_field_data_on_host(stkIntField, 20u); + } + } + + void run_add_bucket_in_middle_copy(unsigned numComponents) + { + stk::mesh::Field& stkIntField = create_field(stk::topology::ELEM_RANK, "intField", numComponents); + const unsigned bucketCapacity = 1; + + setup_3hex_3block_mesh_with_field(bucketCapacity, stkIntField); + stk::mesh::NgpField ngpIntField = stk::mesh::get_updated_ngp_field(stkIntField); + + modify_and_test_add_bucket_in_middle(stkIntField, ngpIntField); + } + + void run_add_bucket_in_middle_external(unsigned numComponents) + { + stk::mesh::Field& stkIntField = create_field(stk::topology::ELEM_RANK, "intField", numComponents); + const unsigned bucketCapacity = 1; + + setup_3hex_3block_mesh_with_field(bucketCapacity, stkIntField); + stk::mesh::NgpField ngpIntField(get_bulk(), stkIntField); + + modify_and_test_add_bucket_in_middle(stkIntField, ngpIntField); + } + + void run_add_bucket_in_middle_internal(unsigned numComponents) + { + stk::mesh::Field& stkIntField = create_field(stk::topology::ELEM_RANK, "intField", numComponents); + const unsigned bucketCapacity = 1; + + setup_3hex_3block_mesh_with_field(bucketCapacity, stkIntField); + stk::mesh::NgpField& ngpIntField = stk::mesh::get_updated_ngp_field(stkIntField); + + modify_and_test_add_bucket_in_middle(stkIntField, ngpIntField); + } + + void modify_and_test_add_bucket_in_middle(stk::mesh::Field& stkIntField, stk::mesh::NgpField& ngpIntField) + { + modify_mesh_add_bucket_in_middle(stkIntField, ngpIntField); + + ngpIntField.modify_on_host(); + ngpIntField.update_field(); + + check_field_data_on_device(ngpIntField, stkIntField); + } + + void modify_and_test_add_element(stk::mesh::Field& stkIntField, stk::mesh::NgpField& ngpIntField, unsigned bucketCapacity) + { + modify_mesh_add_element(stkIntField, ngpIntField, bucketCapacity); + + ngpIntField.modify_on_host(); + ngpIntField.update_field(); + + check_field_data_on_device(ngpIntField, stkIntField); + } + + void run_change_bucket_content_by_mesh_modification(unsigned numComponents) + { + stk::mesh::Field& stkIntField = create_field(stk::topology::ELEM_RANK, "intField", numComponents); + const unsigned bucketCapacity = 2; + + setup_3hex_2block_mesh_with_field(bucketCapacity, stkIntField); + stk::mesh::NgpField& ngpIntField = stk::mesh::get_updated_ngp_field(stkIntField); + check_field_data_on_device(ngpIntField, stkIntField); + + modify_mesh_change_bucket_content(stkIntField, ngpIntField); + + ngpIntField.clear_sync_state(); + ngpIntField.modify_on_host(); + ngpIntField.update_field(); + + check_field_data_on_device(ngpIntField, stkIntField); + } + + void run_change_bucket_content_by_user(unsigned numComponents) + { + stk::mesh::Field& stkIntField = create_field(stk::topology::ELEM_RANK, "intField", numComponents); + const unsigned bucketCapacity = 2; + + setup_3hex_2block_mesh_with_field(bucketCapacity, stkIntField); + stk::mesh::NgpField& ngpIntField = stk::mesh::get_updated_ngp_field(stkIntField); + check_field_data_on_device(ngpIntField, stkIntField); + + set_element_field_data(stkIntField, get_meta().universal_part(), 20u); + + ngpIntField.modify_on_host(); + ngpIntField.sync_to_device(); + + check_field_data_on_device(ngpIntField, stkIntField); + } + + void modify_mesh_add_and_delete_bucket(stk::mesh::Field& stkIntField, stk::mesh::NgpField& ngpIntField) + { + stk::mesh::NgpMesh& ngpMesh = get_bulk().get_updated_ngp_mesh(); + ngp_unit_test_utils::check_bucket_layout(get_bulk(), {{"block_1", {1}}, {"block_2", {2}}}); + check_field_data_on_device(ngpIntField, stkIntField); + get_bulk().modification_begin(); + stk::mesh::PartVector addParts{get_meta().get_part("block_3")}; + stk::mesh::PartVector removeParts{get_meta().get_part("block_1")}; + get_bulk().change_entity_parts(get_bulk().get_entity(stk::topology::ELEM_RANK, 1), addParts, removeParts); + get_bulk().modification_end(); + ngpMesh.update_mesh(); + ngp_unit_test_utils::check_bucket_layout(get_bulk(), {{"block_3", {1}}, {"block_2", {2}}}); + } + + void fill_nodes(const stk::mesh::Entity element, unsigned numNodes, stk::mesh::EntityVector& nodes) + { + const stk::mesh::Entity* elementNodes = get_bulk().begin_nodes(element); + + for(unsigned i = 0; i < numNodes; i++) { + nodes.push_back(elementNodes[i]); + } + } + + stk::mesh::Entity add_element_and_place_in_block(const std::string& newBlockName) + { + stk::mesh::Entity element = get_bulk().get_entity(stk::topology::ELEMENT_RANK, 1); + stk::mesh::EntityVector nodes; + + unsigned numNodes = get_bulk().num_nodes(element); + + fill_nodes(element, numNodes, nodes); + + stk::mesh::Part* part = get_meta().get_part(newBlockName); + stk::mesh::PartVector parts = {part}; + parts.push_back(&get_meta().get_topology_root_part(stk::topology::HEX_8)); + stk::mesh::Entity newElement = get_bulk().declare_element(4, parts); + + for(unsigned i = 0; i < numNodes; i++) { + get_bulk().declare_relation(newElement, nodes[i], i); + } + + return newElement; + } + + void replace_element_and_place_in_block(const std::string& newBlockName) + { + add_element_and_place_in_block(newBlockName); + + stk::mesh::EntityVector nodes; + stk::mesh::Entity element = get_bulk().get_entity(stk::topology::ELEMENT_RANK, 1); + unsigned numNodes = get_bulk().num_nodes(element); + + fill_nodes(element, numNodes, nodes); + + for(unsigned i = 0; i < numNodes; i++) { + get_bulk().destroy_relation(element, nodes[i], i); + } + get_bulk().destroy_entity(element); + } + + void modify_mesh_add_and_delete_bucket3(stk::mesh::Field& stkIntField, stk::mesh::NgpField& ngpIntField) + { + stk::mesh::NgpMesh& ngpMesh = get_bulk().get_updated_ngp_mesh(); + ngp_unit_test_utils::check_bucket_layout(get_bulk(), {{"block_1", {1}}, {"block_2", {2}}}); + check_field_data_on_device(ngpIntField, stkIntField); + get_bulk().modification_begin(); + replace_element_and_place_in_block("block_3"); + get_bulk().modification_end(); + ngpMesh.update_mesh(); + ngp_unit_test_utils::check_bucket_layout(get_bulk(), {{"block_3", {4}}, {"block_2", {2}}}); + } + + void modify_mesh_add_and_delete_bucket2(stk::mesh::Field& stkIntField, stk::mesh::NgpField& ngpIntField) + { + stk::mesh::NgpMesh& ngpMesh = get_bulk().get_updated_ngp_mesh(); + ngp_unit_test_utils::check_bucket_layout(get_bulk(), {{"block_1", {1}}, {"block_2", {2}}}); + check_field_data_on_device(ngpIntField, stkIntField); + get_bulk().modification_begin(); + stk::mesh::PartVector addParts{get_meta().get_part("block_2")}; + stk::mesh::PartVector removeParts{get_meta().get_part("block_1")}; + get_bulk().change_entity_parts(get_bulk().get_entity(stk::topology::ELEM_RANK, 1), addParts, removeParts); + addParts[0] = get_meta().get_part("block_3"); + removeParts[0] = get_meta().get_part("block_2"); + get_bulk().change_entity_parts(get_bulk().get_entity(stk::topology::ELEM_RANK, 2), addParts, removeParts); + get_bulk().modification_end(); + ngpMesh.update_mesh(); + ngp_unit_test_utils::check_bucket_layout(get_bulk(), {{"block_3", {2}}, {"block_2", {1}}}); + } + + void modify_mesh_delete_bucket_in_middle(stk::mesh::Field& stkIntField, stk::mesh::NgpField& ngpIntField) + { + stk::mesh::NgpMesh& ngpMesh = get_bulk().get_updated_ngp_mesh(); + ngp_unit_test_utils::check_bucket_layout(get_bulk(), {{"block_1", {1}}, {"block_2", {2}}, {"block_3", {3}}}); + check_field_data_on_device(ngpIntField, stkIntField); + get_bulk().modification_begin(); + stk::mesh::PartVector addParts{get_meta().get_part("block_1")}; + stk::mesh::PartVector removeParts{get_meta().get_part("block_2")}; + get_bulk().change_entity_parts(get_bulk().get_entity(stk::topology::ELEM_RANK, 2), addParts, removeParts); + get_bulk().modification_end(); + ngpMesh.update_mesh(); + ngp_unit_test_utils::check_bucket_layout(get_bulk(), {{"block_1", {1,2}}, {"block_3", {3}}}); + } + + void modify_mesh_add_bucket_in_middle(stk::mesh::Field& stkIntField, stk::mesh::NgpField& ngpIntField) + { + stk::mesh::NgpMesh & ngpMesh = get_bulk().get_updated_ngp_mesh(); + ngp_unit_test_utils::check_bucket_layout(get_bulk(), {{"block_1", {1}}, {"block_2", {2}}, {"block_3", {3}}}); + check_field_data_on_device(ngpIntField, stkIntField); + get_bulk().modification_begin(); + stk::mesh::PartVector addParts{get_meta().get_part("block_1")}; + stk::mesh::PartVector removeParts{get_meta().get_part("block_3")}; + get_bulk().change_entity_parts(get_bulk().get_entity(stk::topology::ELEM_RANK, 3), addParts, removeParts); + get_bulk().modification_end(); + ngpMesh.update_mesh(); + ngp_unit_test_utils::check_bucket_layout(get_bulk(), {{"block_1", {1}}, {"block_1", {3}}, {"block_2", {2}}}); + } + + void modify_mesh_add_element(stk::mesh::Field& stkIntField, stk::mesh::NgpField& ngpIntField, unsigned bucketCapacity) + { + stk::mesh::NgpMesh & ngpMesh = get_bulk().get_updated_ngp_mesh(); + ngp_unit_test_utils::check_bucket_layout(get_bulk(), {{"block_1", {1}}, {"block_2", {2}}, {"block_3", {3}}}); + check_field_data_on_device(ngpIntField, stkIntField); + get_bulk().modification_begin(); + stk::mesh::Entity newElement = add_element_and_place_in_block("block_3"); + int* data = stk::mesh::field_data(stkIntField, newElement); + *data = get_bulk().identifier(newElement) * 10u; + get_bulk().modification_end(); + ngpMesh.update_mesh(); + + if(bucketCapacity == 1) { + ngp_unit_test_utils::check_bucket_layout(get_bulk(), {{"block_1", {1}}, {"block_2", {2}}, {"block_3", {3}}, {"block_3", {4}}}); + } + else if(bucketCapacity == 2) { + ngp_unit_test_utils::check_bucket_layout(get_bulk(), {{"block_1", {1}}, {"block_2", {2}}, {"block_3", {3,4}}}); + } + } + + void modify_mesh_change_bucket_content(stk::mesh::Field& stkIntField, stk::mesh::NgpField& ngpIntField) + { + stk::mesh::NgpMesh& ngpMesh = get_bulk().get_updated_ngp_mesh(); + ngp_unit_test_utils::check_bucket_layout(get_bulk(), { {"block_1", {1, 2}}, {"block_3", {3}}}); + check_field_data_on_device(ngpIntField, stkIntField); + get_bulk().modification_begin(); + stk::mesh::PartVector addParts {get_meta().get_part("block_3")}; + stk::mesh::PartVector removeParts {get_meta().get_part("block_1")}; + get_bulk().change_entity_parts(get_bulk().get_entity(stk::topology::ELEM_RANK, 2), addParts, removeParts); + get_bulk().modification_end(); + ngpMesh.update_mesh(); + ngp_unit_test_utils::check_bucket_layout(get_bulk(), { {"block_1", {1}}, {"block_3", {2, 3}}}); + } }; void move_data_between_fields_on_host(const stk::mesh::BulkData & bulk, @@ -54,51 +564,62 @@ void move_data_between_fields_on_host(const stk::mesh::BulkData & bulk, ngpDest.modify_on_host(); } -void test_field_values_on_device(stk::mesh::BulkData &bulk, - const stk::mesh::Field & stkField1, - const stk::mesh::Field & stkField2, +void test_field_values_on_device(stk::mesh::BulkData& bulk, + const stk::mesh::Field& stkField, + const stk::mesh::Part& part, const int expectedFieldValue) { - stk::mesh::NgpField & ngpField1 = stk::mesh::get_updated_ngp_field(stkField1); - stk::mesh::NgpField & ngpField2 = stk::mesh::get_updated_ngp_field(stkField2); - ngpField1.sync_to_device(); - ngpField2.sync_to_device(); - - const int component = 0; - stk::mesh::Part& locallyOwned = bulk.mesh_meta_data().locally_owned_part(); - stk::mesh::NgpMesh & ngpMesh = bulk.get_updated_ngp_mesh(); - stk::mesh::for_each_entity_run(ngpMesh, stk::topology::ELEM_RANK, locallyOwned, + stk::mesh::NgpField & ngpField = stk::mesh::get_updated_ngp_field(stkField); + ngpField.sync_to_device(); + + stk::mesh::Selector selection = bulk.mesh_meta_data().locally_owned_part() & part; + const stk::mesh::BucketVector& buckets = bulk.get_buckets(stkField.entity_rank(), selection); + const unsigned numScalarsPerEntity = stk::mesh::field_scalars_per_entity(stkField, *buckets[0]); + stk::mesh::NgpMesh& ngpMesh = bulk.get_updated_ngp_mesh(); + stk::mesh::for_each_entity_run(ngpMesh, stk::topology::ELEM_RANK, selection, KOKKOS_LAMBDA(const stk::mesh::FastMeshIndex& entity) { - NGP_ThrowRequire(ngpField1(entity, component) == expectedFieldValue); - NGP_ThrowRequire(ngpField2(entity, component) == expectedFieldValue); + for (unsigned component=0; component& stkField1, - const stk::mesh::Field& stkField2, +void test_field_values_on_device(stk::mesh::BulkData &bulk, + const stk::mesh::Field & stkField, + const int expectedFieldValue) +{ + test_field_values_on_device(bulk, stkField, bulk.mesh_meta_data().locally_owned_part(), expectedFieldValue); +} + +void test_field_values_on_host(const stk::mesh::BulkData& bulk, + const stk::mesh::Field& stkField, + const stk::mesh::Part& part, const int expectedFieldValue) { - stk::mesh::NgpField & ngpField1 = stk::mesh::get_updated_ngp_field(stkField1); - stk::mesh::NgpField & ngpField2 = stk::mesh::get_updated_ngp_field(stkField2); - ngpField1.sync_to_host(); - ngpField2.sync_to_host(); + stkField.sync_to_host(); - const stk::mesh::BucketVector& buckets = bulk.buckets(stk::topology::ELEMENT_RANK); - for(size_t iBucket=0; iBucket(stk::mesh::field_data(stkField1, bucket)); - int* field2Data = reinterpret_cast(stk::mesh::field_data(stkField2, bucket)); - for(size_t iEntity=0; iEntity(stk::mesh::field_data(stkField, bucket)); + for (size_t iEntity=0; iEntity& stkField, + const int expectedFieldValue) +{ + test_field_values_on_host(bulk, stkField, bulk.mesh_meta_data().locally_owned_part(), expectedFieldValue); +} + template void initialize_ngp_field(stk::mesh::Field & stkField) { @@ -139,14 +660,37 @@ void sync_field_to_device(stk::mesh::Field & field) template void modify_field_on_device(stk::mesh::BulkData & bulk, stk::mesh::Field & stkField, int multiplier) { - const int component = 0; stk::mesh::NgpMesh & ngpMesh = bulk.get_updated_ngp_mesh(); const stk::mesh::MetaData & meta = bulk.mesh_meta_data(); stk::mesh::NgpField & ngpField = stk::mesh::get_updated_ngp_field(stkField); + ngpField.sync_to_device(); stk::mesh::for_each_entity_run(ngpMesh, stk::topology::ELEM_RANK, meta.locally_owned_part(), KOKKOS_LAMBDA(const stk::mesh::FastMeshIndex& entity) { - ngpField(entity, component) *= multiplier; + const int numScalarsPerEntity = ngpField.get_num_components_per_entity(entity); + for (int component=0; component +void modify_field_on_device(stk::mesh::BulkData& bulk, stk::mesh::Field& stkField, stk::mesh::Part& part, int value) +{ + stk::mesh::NgpMesh & ngpMesh = bulk.get_updated_ngp_mesh(); + const stk::mesh::MetaData & meta = bulk.mesh_meta_data(); + stk::mesh::NgpField & ngpField = stk::mesh::get_updated_ngp_field(stkField); + ngpField.sync_to_device(); + + stk::mesh::Selector selection = meta.locally_owned_part() & part; + const stk::mesh::BucketVector& buckets = bulk.get_buckets(stkField.entity_rank(), selection); + const unsigned numScalarsPerEntity = stk::mesh::field_scalars_per_entity(stkField, *buckets[0]); + stk::mesh::for_each_entity_run(ngpMesh, stk::topology::ELEM_RANK, selection, + KOKKOS_LAMBDA(const stk::mesh::FastMeshIndex& entity) { + for (unsigned component=0; component& variableLengthField = dynamic_cast&>( + *get_meta().get_field(stk::topology::ELEM_RANK, "variableLengthField")); + stk::mesh::Field& potentiallyOverwrittenField = dynamic_cast&>( + *get_meta().get_field(stk::topology::ELEM_RANK, "potentiallyOverwrittenField")); + + modify_field_on_device(get_bulk(), variableLengthField, 2); + modify_field_on_host(get_bulk(), potentiallyOverwrittenField, 3); + variableLengthField.sync_to_host(); + + test_field_values_on_host(get_bulk(), potentiallyOverwrittenField, 3); +} + TEST_F(NgpFieldFixture, TestAriaAlgorithm) { if (stk::parallel_machine_size(MPI_COMM_WORLD) != 1) return; @@ -187,9 +749,11 @@ TEST_F(NgpFieldFixture, TestAriaAlgorithm) move_data_between_fields_on_host(get_bulk(), f1, f2); - test_field_values_on_device(get_bulk(), f1, f2, multiplier); + test_field_values_on_device(get_bulk(), f1, multiplier); + test_field_values_on_device(get_bulk(), f2, multiplier); - test_field_values_on_host(get_bulk(), f1, f2, multiplier); + test_field_values_on_host(get_bulk(), f1, multiplier); + test_field_values_on_host(get_bulk(), f2, multiplier); } TEST_F(NgpFieldFixture, GetNgpField) @@ -251,7 +815,7 @@ TEST_F(NgpFieldFixture, ModifyAndSync) check_field_on_host(get_bulk(), stkIntField, multiplier*multiplier); #ifdef STK_USE_DEVICE_MESH - size_t expectedSyncsToDevice = 2; + size_t expectedSyncsToDevice = 1; size_t expectedSyncsToHost = 1; #else size_t expectedSyncsToDevice = 0; @@ -292,7 +856,7 @@ TEST_F(NgpFieldFixture, UpdateNgpFieldAfterMeshMod_WithMostCurrentDataOnHost) check_field_on_host(get_bulk(), stkIntField, multiplier*multiplier); #ifdef STK_USE_DEVICE_MESH - size_t expectedSyncsToDevice = 2; + size_t expectedSyncsToDevice = 1; size_t expectedSyncsToHost = 1; #else size_t expectedSyncsToDevice = 0; @@ -329,4 +893,209 @@ TEST_F(NgpFieldFixture, UpdateNgpFieldAfterMeshMod_WithMostCurrentDataOnDevice) check_field_on_host(get_bulk(), stkIntField, multiplier); } +template +class NgpFieldTester : public stk::mesh::NgpField +{ +public: + bool test_need_sync_to_host() const { return this->need_sync_to_host(); } + bool test_need_sync_to_device() const { return this->need_sync_to_device(); } +}; + +TEST_F(NgpFieldFixture, ClearSyncStateAfterModifyOnDevice) +{ + if(stk::parallel_machine_size(MPI_COMM_WORLD) != 1) { return; } + + stk::mesh::Field& stkIntField = create_field(stk::topology::ELEM_RANK, "intField"); + setup_mesh("generated:1x1x1", stk::mesh::BulkData::NO_AUTO_AURA); + + stk::mesh::NgpField& ngpField = stk::mesh::get_updated_ngp_field(stkIntField); + NgpFieldTester& testNgpField = static_cast&>(ngpField); + + testNgpField.modify_on_device(); +#ifdef STK_USE_DEVICE_MESH + EXPECT_TRUE(testNgpField.test_need_sync_to_host()); +#else + EXPECT_FALSE(testNgpField.test_need_sync_to_host()); +#endif + + stkIntField.clear_sync_state(); + EXPECT_FALSE(testNgpField.test_need_sync_to_host()); +} + +TEST_F(OptimizedNgpFieldFixture, ChangeBucketContentsByUserWithSingleComponent) +{ + if (get_parallel_size() != 1) return; + + unsigned numComponents = 1; + + run_change_bucket_content_by_user(numComponents); +} + +// ------------------------- ------------------------- +// | | | | | | | | +// | 1 | 2 | 3 | ===> | 1 | 2 | 3 | +// |block_1|block_1|block_3| |block_1|block_3|block_3| +// ------------------------- ------------------------- +// +TEST_F(OptimizedNgpFieldFixture, ChangeBucketContentsUsingLayoutModificationWithSingleComponent) +{ + if (get_parallel_size() != 1) return; + + unsigned numComponents = 1; + + run_change_bucket_content_by_mesh_modification(numComponents); +} + +TEST_F(OptimizedNgpFieldFixture, ChangeBucketContentsUsingLayoutModificationWithThreeComponents) +{ + if (get_parallel_size() != 1) return; + + unsigned numComponents = 3; + + run_change_bucket_content_by_mesh_modification(numComponents); +} + +void construct_ngp_field(stk::mesh::Field& stkIntField) +{ + EXPECT_NO_THROW(stk::mesh::NgpField ngpField(stkIntField.get_mesh(), stkIntField)); +} + +TEST_F(OptimizedNgpFieldFixture, DISABLED_CreateConsecutiveNgpFields) +{ + if (get_parallel_size() != 1) return; + + unsigned numComponents = 1; + + stk::mesh::Field& stkIntField = create_field(stk::topology::ELEM_RANK, "intField", numComponents); + const unsigned bucketCapacity = 2; + + setup_3hex_2block_mesh_with_field(bucketCapacity, stkIntField); + + construct_ngp_field(stkIntField); + construct_ngp_field(stkIntField); +} + +// ------------------------- ------------------------- +// | | | | | | | | +// | 1 | 2 | 3 | ===> | 1 | 2 | 3 | +// |block_1|block_2|block_3| |block_1|block_2|block_1| +// ------------------------- ------------------------- +// + +TEST_F(OptimizedNgpFieldFixture, AddBucketInMiddleWithSingleComponentInternal) +{ + if (get_parallel_size() != 1) return; + + unsigned numComponents = 1; + + run_add_bucket_in_middle_internal(numComponents); +} + +TEST_F(OptimizedNgpFieldFixture, AddBucketInMiddleWithSingleComponentCopy) +{ + if (get_parallel_size() != 1) return; + + unsigned numComponents = 1; + + run_add_bucket_in_middle_copy(numComponents); +} + +// ------------------------- ------------------------- +// | | | | | | | | +// | 1 | 2 | 3 | ===> | 1 | 2 | 3,4 | +// |block_1|block_2|block_3| |block_1|block_1|block_3| +// ------------------------- ------------------------- +// + +TEST_F(OptimizedNgpFieldFixture, AddNewElementWithBucketCapacity2) +{ + if (get_parallel_size() != 1) return; + + unsigned numComponents = 1; + unsigned bucketCapacity = 2; + + run_add_new_element(numComponents, bucketCapacity); +} + +TEST_F(OptimizedNgpFieldFixture, AddNewElementAndModifyFromDevice) +{ + if (get_parallel_size() != 1) return; + + unsigned numComponents = 1; + + run_add_new_element_and_modify_from_device(numComponents); +} + +TEST_F(OptimizedNgpFieldFixture, AddNewElementWithBucketCapacity1) +{ + if (get_parallel_size() != 1) return; + + unsigned numComponents = 1; + unsigned bucketCapacity = 1; + + run_add_new_element(numComponents, bucketCapacity); +} + +// ------------------------- ------------------------- +// | | | | | | | | +// | 1 | 2 | 3 | ===> | 1 | 2 | 3 | +// |block_1|block_2|block_3| |block_1|block_1|block_3| +// ------------------------- ------------------------- +// +TEST_F(OptimizedNgpFieldFixture, DeleteBucketInMiddleWithSingleComponent) +{ + if (get_parallel_size() != 1) return; + + unsigned numComponents = 1; + + run_delete_bucket_in_middle(numComponents); +} + +// ----------------- ----------------- +// | | | | | | +// | 1 | 2 | ===> | 1 | 2 | +// |block_1|block_2| |block_3|block_1| +// ----------------- ----------------- +// + +TEST_F(OptimizedNgpFieldFixture, AddAndDeleteBucketWithSingleComponent) +{ + if (get_parallel_size() != 1) return; + + unsigned numComponents = 1; + + run_add_and_delete_bucket(numComponents); +} + +// ----------------- ----------------- +// | | | | | | +// | 1 | 2 | ===> | 1 | 2 | +// |block_1|block_2| |block_2|block_3| +// ----------------- ----------------- +// + +TEST_F(OptimizedNgpFieldFixture, AddAndDeleteBucketWithSingleComponent2) +{ + if (get_parallel_size() != 1) return; + + unsigned numComponents = 1; + + run_add_and_delete_bucket2(numComponents); +} + +// ----------------- ----------------- +// | | | | | | +// | 1 | 2 | ===> | 2 | 3 | +// |block_1|block_2| |block_2|block_3| +// ----------------- ----------------- +// + +TEST_F(OptimizedNgpFieldFixture, AddAndDeleteBucketWithSingleComponent3) +{ + if (get_parallel_size() != 1) return; + + unsigned numComponents = 1; + + run_add_and_delete_bucket3(numComponents); +} } diff --git a/packages/stk/stk_unit_tests/stk_ngp/CMakeLists.txt b/packages/stk/stk_unit_tests/stk_ngp/CMakeLists.txt deleted file mode 100644 index 717a37f08a1e..000000000000 --- a/packages/stk/stk_unit_tests/stk_ngp/CMakeLists.txt +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 2002 - 2008, 2010, 2011 National Technology Engineering -# Solutions of Sandia, LLC (NTESS). Under the terms of Contract -# DE-NA0003525 with NTESS, the U.S. Government retains certain rights -# in this software. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following -# disclaimer in the documentation and/or other materials provided -# with the distribution. -# -# * Neither the name of NTESS nor the names of its contributors -# may be used to endorse or promote products derived from this -# software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) -INCLUDE_DIRECTORIES(${${PARENT_PACKAGE_NAME}_BINARY_DIR}/stk_util/stk_util) -INCLUDE_DIRECTORIES(${${PARENT_PACKAGE_NAME}_BINARY_DIR}/stk_mesh) -INCLUDE_DIRECTORIES(${${PARENT_PACKAGE_NAME}_BINARY_DIR}/stk_ngp) - -FILE(GLOB SOURCES *.cpp) - -TRIBITS_ADD_EXECUTABLE_AND_TEST( - stk_ngp_unit_tests - SOURCES ${SOURCES} - TESTONLYLIBS stk_unit_main - DEPLIBS - ARGS "--gtest_filter=-NGP_Kokkos.*:NgpParallelSum.Performance:NgpParallelSum.DeviceMPIVersion" - COMM serial mpi - NUM_MPI_PROCS 1-4 - ) - diff --git a/packages/stk/stk_unit_tests/stk_ngp/KokkosBulkDataBucketCentroidCalculation.cpp b/packages/stk/stk_unit_tests/stk_ngp/KokkosBulkDataBucketCentroidCalculation.cpp deleted file mode 100644 index f0d20b8fe1e3..000000000000 --- a/packages/stk/stk_unit_tests/stk_ngp/KokkosBulkDataBucketCentroidCalculation.cpp +++ /dev/null @@ -1,228 +0,0 @@ -#include "KokkosBulkDataCentroidCalculation.hpp" -#include - -struct GpuGatherBucketScratchData -{ - GpuGatherBucketScratchData(const stk::mesh::BulkData &bulk) - : ngpMesh(bulk) - { - } - - unsigned getNumParallelItems() const - { - return ngpMesh.num_buckets(stk::topology::ELEM_RANK); - } - - void setup_node_coords(const stk::mesh::BulkData& bulk, const CoordFieldType& coords, const stk::mesh::Selector& selector) - { - const stk::mesh::BucketVector& nodeBuckets = bulk.buckets(stk::topology::NODE_RANK); - bucketCapacity = nodeBuckets[0]->capacity(); - unsigned nodeAllocSize = nodeBuckets.size()*bucketCapacity; - - nodeCoords = DeviceViewMatrixType("DNodeCoords", nodeAllocSize, bulk.mesh_meta_data().spatial_dimension()); - constNodeCoords = nodeCoords; - hostNodeCoords = Kokkos::create_mirror_view(nodeCoords); - - for(unsigned bktIndex = 0; bktIndex < nodeBuckets.size(); ++bktIndex) - { - const stk::mesh::Bucket& bucket = *nodeBuckets[bktIndex]; - for(unsigned nodeIndex = 0; nodeIndex < bucket.size(); ++nodeIndex) - { - stk::mesh::Entity node = bucket[nodeIndex]; - double *node_coords = stk::mesh::field_data(coords, node); - unsigned nodeCoordIndex = host_get_index(node); - for(unsigned k=0; kcapacity(); - unsigned elemAllocSize = elemBuckets.size()*bucketCapacity; - - elementCentroids = DeviceViewMatrixType("DElemCentroids", elemAllocSize, bulk.mesh_meta_data().spatial_dimension()); - hostElementCentroids = Kokkos::create_mirror_view(elementCentroids); - } - - void initialize(const stk::mesh::BulkData& bulk, const CoordFieldType& coords, CoordFieldType& centroid, const stk::mesh::Selector& selector) - { - setup_node_coords(bulk, coords, selector); - setup_element_centroids(bulk, selector); - } - - unsigned host_get_index(stk::mesh::Entity entity) const - { - const stk::mesh::FastMeshIndex& meshIndex = ngpMesh.host_mesh_index(entity); - return meshIndex.bucket_id * bucketCapacity + meshIndex.bucket_ord; - } - - STK_FUNCTION unsigned get_index(stk::mesh::Entity entity) const - { - const stk::mesh::FastMeshIndex& meshIndex = ngpMesh.device_mesh_index(entity); - return meshIndex.bucket_id * bucketCapacity + meshIndex.bucket_ord; - } - - KOKKOS_INLINE_FUNCTION void operator()(TYPE_OPERATOR(bucket, solo, compact), const int elementBucketIndex) const - { - const ngp::StaticBucket& bucket = ngpMesh.get_bucket(stk::topology::ELEM_RANK, elementBucketIndex); - const unsigned numElements = bucket.size(); - const unsigned nodesPerElem = bucket.get_num_nodes_per_entity(); - const unsigned dim = elementCentroids.extent(1); - double temp[3] = {0.0, 0.0, 0.0}; - for(unsigned elementIndex=0; elementIndex 1) { - return; - } - - MyApp app; - - GpuGatherBucketScratchData scratch(*app.bulk); - scratch.initialize(*app.bulk, *app.coords, app.centroid, app.meta.locally_owned_part()); - - CentroidCalculator calculator(scratch); - - app.start_timer(); - calculator.calculate_centroids(app.num_repeat, app.choice, app.teamSize); - app.stop_timer(); - app.report_bandwidth(); - - calculator.copy_centroids_to_host(); - - for(unsigned bucketIndex=0; bucketIndexmesh_meta_data().locally_owned_part()); - app.stop_timer(); - app.report_bandwidth(); - - stk::mesh::Entity element1 = app.bulk->get_entity(stk::topology::ELEM_RANK, 1); - double *centroid_values = stk::mesh::field_data(app.centroid, element1); - EXPECT_NEAR(0.5, centroid_values[0], 0.000001); - EXPECT_NEAR(0.5, centroid_values[1], 0.000001); - EXPECT_NEAR(0.5, centroid_values[2], 0.000001); -} - diff --git a/packages/stk/stk_unit_tests/stk_ngp/KokkosBulkDataCentroidCalculation.hpp b/packages/stk/stk_unit_tests/stk_ngp/KokkosBulkDataCentroidCalculation.hpp deleted file mode 100644 index 32b118a1d97d..000000000000 --- a/packages/stk/stk_unit_tests/stk_ngp/KokkosBulkDataCentroidCalculation.hpp +++ /dev/null @@ -1,254 +0,0 @@ -/* -//@HEADER -// ************************************************************************ -// -// Kokkos v. 2.0 -// Copyright (2014) Sandia Corporation -// -// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation, -// the U.S. Government retains certain rights in this software. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// 3. Neither the name of the Corporation nor the names of the -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY -// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL SANDIA CORPORATION OR THE -// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Questions Contact H. Carter Edwards (hcedwar@sandia.gov) -// -// ************************************************************************ -//@HEADER -*/ - - -#ifndef _KokkosBulkDataCentroidCalculation_h_ -#define _KokkosBulkDataCentroidCalculation_h_ - -#include "KokkosCentroidCalculation.hpp" - -#include -#include - -#include -#include -#include -#include -#include - -#include - -typedef Kokkos::View DeviceViewEntitiesType; - -typedef Kokkos::View DeviceViewMeshIndicesType; - -typedef Kokkos::View > ConstDeviceViewMeshIndicesType; - -typedef Kokkos::View EntityViewType; - -typedef Kokkos::View BucketConnectivityType; - -typedef Kokkos::View DeviceViewFlatConnectivityType; - -typedef Kokkos::Schedule ScheduleType; -typedef Kokkos::TeamPolicy TeamPolicyType; -typedef TeamPolicyType::member_type TeamHandleType; - -typedef stk::mesh::Field CoordFieldType; - -#define STRINGIFY(x) #x - -#define DEFINE_OPERATOR(PARALLELSCOPE, TEAMTYPE, EXPANSIONTYPE, ISTEAM) \ - struct PARALLELSCOPE##_##TEAMTYPE##_##EXPANSIONTYPE##_##operator {\ - const char *name = STRINGIFY( PARALLELSCOPE##_##TEAMTYPE##_##EXPANSIONTYPE##_##operator ); \ - const bool isTeam = ISTEAM; \ - };\ - -#define TYPE_OPERATOR(PARALLELSCOPE, TEAMTYPE, EXPANSIONTYPE) \ - PARALLELSCOPE##_##TEAMTYPE##_##EXPANSIONTYPE##_##operator\ - -#define NAME_OPERATOR(PARALLELSCOPE, TEAMTYPE, EXPANSIONTYPE) \ - STRINGIFY( PARALLELSCOPE##_##TEAMTYPE##_##EXPANSIONTYPE##_##operator )\ - -DEFINE_OPERATOR(bucket , solo, compact, false) -DEFINE_OPERATOR(bucket , solo, unroll , false) -DEFINE_OPERATOR(bucket , team, compact, true) -DEFINE_OPERATOR(bucket , team, unroll , true) -DEFINE_OPERATOR(element, solo, compact, false) -DEFINE_OPERATOR(element, solo, unroll , false) -DEFINE_OPERATOR(element, team, compact, true) -DEFINE_OPERATOR(element, team, unroll , true) - -void calculate_centroids_on_host(const stk::mesh::BulkData& bulkData, const CoordFieldType& coordinates, CoordFieldType& centroid, stk::mesh::Selector selector); - -template -class CentroidCalculator { -public: - CentroidCalculator(FUNCTOR f) : functor(f) {} - - void test_centroid_of_element_1() - { - for (unsigned k=0 ; k < functor.hostElementCentroids.extent(1) ; ++k) - EXPECT_NEAR(0.5, functor.hostElementCentroids(0, k), 0.000001); - } - - void test_centroid_of_element(CoordFieldType& expectedCentroid, - const stk::mesh::Entity element, - const unsigned elementIndex) - { - double *expectedCentroidValues = stk::mesh::field_data(expectedCentroid, element); - for (unsigned k=0 ; k < functor.hostElementCentroids.extent(1) ; ++k) { - EXPECT_NEAR(expectedCentroidValues[k], functor.hostElementCentroids(elementIndex, k), 0.000001); - } - } - - void test_centroid_of_element(const std::vector& expectedCentroidValues, - const stk::mesh::Entity element) - { - std::vector elementCentroid = functor.get_centroid_of_element(element); - EXPECT_EQ(elementCentroid.size(), elementCentroid); - - for (unsigned k=0 ; k < functor.hostElementCentroids.extent(1) ; ++k) { - EXPECT_NEAR(expectedCentroidValues[k], elementCentroid[k], 0.000001); - } - } - - template - void execute_solo(T choice, int num_repeat) - { - std::cout << "Executing operator: " << choice.name << std::endl; - size_t N = functor.getNumParallelItems(); - for (int repeat=0 ; repeat(0,N), functor); - } - - template - void execute_team(T choice, int num_repeat, int team_size) - { - std::cout << "Executing operator: " << choice.name << std::endl; - size_t N = functor.getNumParallelItems(); - for (int repeat=0 ; repeat(N, team_size), functor); - } - - void calculate_centroids(int num_repeat, int choice, int team_size) - { - TYPE_OPERATOR(bucket , solo, compact) choice_0; - TYPE_OPERATOR(bucket , team, compact) choice_1; - TYPE_OPERATOR(element, solo, compact) choice_2; - TYPE_OPERATOR(bucket, team, unroll ) choice_3; - TYPE_OPERATOR(element, team, unroll ) choice_4; - TYPE_OPERATOR(element, solo, unroll ) choice_5; - TYPE_OPERATOR(bucket , solo, unroll ) choice_6; - - switch(choice) - { - case 0: execute_solo(choice_0, num_repeat ); break; - case 1: execute_team(choice_1, num_repeat, team_size); break; - case 2: execute_solo(choice_2, num_repeat ); break; - case 3: execute_team(choice_3, num_repeat, team_size); break; - case 4: execute_team(choice_4, num_repeat, team_size); break; - case 5: execute_solo(choice_5, num_repeat ); break; - case 6: execute_solo(choice_6, num_repeat ); break; - default: printf("No current implementation available for choice %d\n",choice); break; - } - } - - void copy_centroids_to_host() - { - Kokkos::deep_copy(functor.hostElementCentroids, functor.elementCentroids); - } - - FUNCTOR functor; -}; - -struct MyApp { - MyApp() - : meta(3), bulk(nullptr), - centroid(meta.declare_field(stk::topology::ELEM_RANK, "centroid")), - hostCentroid(meta.declare_field(stk::topology::ELEM_RANK, "hostCentroid")), - coords(nullptr) - { - num_repeat = stk::unit_test_util::get_command_line_option("-n", 1); - dim = stk::unit_test_util::get_command_line_option("-d", 10); - choice = stk::unit_test_util::get_command_line_option("-c", 0); - teamSize = stk::unit_test_util::get_command_line_option("-t", 1); - - std::ostringstream os; - os << "generated:" << dim << "x" << dim << "x" << dim << std::endl; - - std::vector init_vec = {0,0,0}; - stk::mesh::put_field_on_mesh(centroid, meta.universal_part(), init_vec.data()); - stk::mesh::put_field_on_mesh(hostCentroid, meta.universal_part(), init_vec.data()); - - bulk = new stk::mesh::BulkData(meta, MPI_COMM_WORLD); - - stk::io::fill_mesh(os.str(), *bulk); - - coords = meta.get_field(stk::topology::NODE_RANK, "coordinates"); - - calculate_centroids_on_host(*bulk, *coords, hostCentroid, bulk->mesh_meta_data().locally_owned_part()); - } - - ~MyApp() { delete bulk; } - - void report_bandwidth(double time) const - { - size_t num_coords = (dim)*(dim)*(dim)*10*3; - std::cerr << "For mesh with " << num_coords << " coordinates acceses.\n"; - double Gbytes = 1.0e-9 * double(sizeof(my_double) * ( num_coords )) ; - std::cerr << "bandwidth(" << Gbytes * num_repeat / time << " GB/s )" << std::endl; - } - - void report_bandwidth() const - { - double time = 1.0*(end.tv_sec-begin.tv_sec) + - 1.0e-6*(end.tv_usec-begin.tv_usec); - - report_bandwidth(time); - } - - void start_timer() - { - gettimeofday(&begin,NULL); - } - - void stop_timer() - { - gettimeofday(&end,NULL); - } - - stk::mesh::MetaData meta; - stk::mesh::BulkData* bulk; - CoordFieldType& centroid; - CoordFieldType& hostCentroid; - CoordFieldType* coords; - int num_repeat; - size_t dim; - int choice; - int teamSize; - struct timeval begin, end; -}; - -#endif - diff --git a/packages/stk/stk_unit_tests/stk_ngp/KokkosBulkDataFlatCentroidCalculation.cpp b/packages/stk/stk_unit_tests/stk_ngp/KokkosBulkDataFlatCentroidCalculation.cpp deleted file mode 100644 index 321212985f71..000000000000 --- a/packages/stk/stk_unit_tests/stk_ngp/KokkosBulkDataFlatCentroidCalculation.cpp +++ /dev/null @@ -1,443 +0,0 @@ -#include "KokkosBulkDataCentroidCalculation.hpp" -#include "Kokkos_Atomic.hpp" - -struct GpuGatherFlatScratchData -{ - GpuGatherFlatScratchData(const int choice) - : appChoice(choice) - { - } - - void setup_elem_entities_and_connectivity_tables(const stk::mesh::BulkData& bulk, const stk::mesh::Selector& selector) - { - const stk::mesh::BucketVector& elementBuckets = bulk.get_buckets(stk::topology::ELEM_RANK, selector); - unsigned numElementBuckets = elementBuckets.size(); - - connBucketOffsets = DeviceViewIntType("D_connBucketOffsets", numElementBuckets); - hostConnBucketOffsets = Kokkos::create_mirror_view(connBucketOffsets); - - elemBucketOffsets = DeviceViewIntType("D_elemBucketOffsets", numElementBuckets); - hostElemBucketOffsets = Kokkos::create_mirror_view(elemBucketOffsets); - - elemsPerBucket = DeviceViewIntType("D_elemsPerBucket", numElementBuckets); - hostElemsPerBucket = Kokkos::create_mirror_view(elemsPerBucket); - - nodesPerElement = DeviceViewIntType("D_nodesPerElement", numElementBuckets); - hostNodesPerElement = Kokkos::create_mirror_view(nodesPerElement); - - unsigned numConnectivities = 0; - unsigned numElements = 0; - - for (unsigned elemBucketIndex = 0; elemBucketIndex < numElementBuckets; ++elemBucketIndex) - { - const stk::mesh::Bucket& bucket = *elementBuckets[elemBucketIndex]; - - unsigned numNodesPerElem = bucket.topology().num_nodes(); - unsigned numElemsInBucket = bucket.size(); - - hostConnBucketOffsets(elemBucketIndex) = numConnectivities; - hostElemBucketOffsets(elemBucketIndex) = numElements; - hostNodesPerElement(elemBucketIndex) = numNodesPerElem; - hostElemsPerBucket(elemBucketIndex) = numElemsInBucket; - - numConnectivities += numNodesPerElem*numElemsInBucket; - numElements += numElemsInBucket; - } - - Kokkos::deep_copy(elemsPerBucket, hostElemsPerBucket); - Kokkos::deep_copy(nodesPerElement, hostNodesPerElement); - Kokkos::deep_copy(connBucketOffsets, hostConnBucketOffsets); - Kokkos::deep_copy(elemBucketOffsets, hostElemBucketOffsets); - - elementNodeConnectivity = DeviceViewFlatConnectivityType("DElementNodeConnectivity", numConnectivities); - hostElementNodeConnectivity = Kokkos::create_mirror_view(elementNodeConnectivity); - - elemEntities = DeviceViewEntitiesType("DElemEntities", numElements); - hostElemEntities = Kokkos::create_mirror_view(elemEntities); - - for (unsigned elemBucketIndex = 0; elemBucketIndex < numElementBuckets; ++elemBucketIndex) - { - unsigned connBucketOffset = hostConnBucketOffsets(elemBucketIndex); - unsigned elemBucketOffset = hostElemBucketOffsets(elemBucketIndex); - - const stk::mesh::Bucket& bucket = *elementBuckets[elemBucketIndex]; - unsigned nodesPerElem = bucket.topology().num_nodes(); - - for(unsigned elemIndex = 0; elemIndex < bucket.size(); ++elemIndex) - { - unsigned connElemOffset = elemIndex*nodesPerElem + connBucketOffset; - - stk::mesh::Entity element = bucket[elemIndex]; - hostElemEntities(elemBucketOffset + elemIndex) = element; - - const stk::mesh::Entity * elemNodes = bulk.begin_nodes(element); - for(unsigned iNode = 0; iNode < nodesPerElem; ++iNode) - { - unsigned nodeOffset = connElemOffset + iNode; - hostElementNodeConnectivity(nodeOffset) = elemNodes[iNode]; - } - } - } - - Kokkos::deep_copy(elementNodeConnectivity, hostElementNodeConnectivity); - Kokkos::deep_copy(elemEntities, hostElemEntities); - } - - void setup_mesh_indices(const stk::mesh::BulkData& bulk, const stk::mesh::Selector& selector) - { - const stk::mesh::BucketVector& nodeBuckets = bulk.buckets(stk::topology::NODE_RANK); - - meshIndices = DeviceViewMeshIndicesType("DMeshIndices", bulk.get_size_of_entity_index_space()); - constMeshIndices = meshIndices; - hostMeshIndices = Kokkos::create_mirror_view(meshIndices); - - for(unsigned bktIndex = 0; bktIndex < nodeBuckets.size(); ++bktIndex) - { - const stk::mesh::Bucket& bucket = *nodeBuckets[bktIndex]; - for(unsigned nodeIndex = 0; nodeIndex < bucket.size(); ++nodeIndex) - { - stk::mesh::Entity node = bucket[nodeIndex]; - stk::mesh::FastMeshIndex meshIndex{bucket.bucket_id(), nodeIndex}; - hostMeshIndices(node.local_offset()) = meshIndex; - } - } - - const stk::mesh::BucketVector& elemBuckets = bulk.get_buckets(stk::topology::ELEM_RANK, selector); - - for(unsigned bktIndex = 0; bktIndex < elemBuckets.size(); ++bktIndex) - { - const stk::mesh::Bucket& bucket = *elemBuckets[bktIndex]; - for(unsigned elemIndex = 0; elemIndex < bucket.size(); ++elemIndex) - { - stk::mesh::Entity elem = bucket[elemIndex]; - stk::mesh::FastMeshIndex meshIndex{bucket.bucket_id(), elemIndex}; - hostMeshIndices(elem.local_offset()) = meshIndex; - } - } - - Kokkos::deep_copy(meshIndices, hostMeshIndices); - } - - void setup_node_coords(const stk::mesh::BulkData& bulk, const CoordFieldType& coords, const stk::mesh::Selector& selector) - { - const stk::mesh::BucketVector& nodeBuckets = bulk.buckets(stk::topology::NODE_RANK); - bucketCapacity = nodeBuckets[0]->capacity(); - unsigned nodeAllocSize = nodeBuckets.size()*bucketCapacity; - - nodeCoords = DeviceViewMatrixType("DNodeCoords", nodeAllocSize, bulk.mesh_meta_data().spatial_dimension()); - constNodeCoords = nodeCoords; - hostNodeCoords = Kokkos::create_mirror_view(nodeCoords); - - for(unsigned bktIndex = 0; bktIndex < nodeBuckets.size(); ++bktIndex) - { - const stk::mesh::Bucket& bucket = *nodeBuckets[bktIndex]; - for(unsigned nodeIndex = 0; nodeIndex < bucket.size(); ++nodeIndex) - { - stk::mesh::Entity node = bucket[nodeIndex]; - double *node_coords = stk::mesh::field_data(coords, node); - unsigned nodeCoordIndex = host_get_index(node); - for(unsigned k=0; kcapacity(); - unsigned elemAllocSize = elemBuckets.size()*bucketCapacity; - - elementCentroids = DeviceViewAtomicMatrixType("DElemCentroids", elemAllocSize, bulk.mesh_meta_data().spatial_dimension()); - hostElementCentroids = Kokkos::create_mirror_view(elementCentroids); - } - - void initialize(const stk::mesh::BulkData& bulk, const CoordFieldType& coords, CoordFieldType& centroid, const stk::mesh::Selector& selector) - { - setup_mesh_indices(bulk, selector); - setup_node_coords(bulk, coords, selector); - setup_elem_entities_and_connectivity_tables(bulk, selector); - setup_element_centroids(bulk, selector); - } - - unsigned host_get_index(stk::mesh::Entity entity) const - { - const stk::mesh::FastMeshIndex& meshIndex = hostMeshIndices(entity.local_offset()); - return meshIndex.bucket_id * bucketCapacity + meshIndex.bucket_ord; - } - - STK_FUNCTION unsigned get_index(stk::mesh::Entity entity) const - { - const stk::mesh::FastMeshIndex& meshIndex = constMeshIndices(entity.local_offset()); - return meshIndex.bucket_id * bucketCapacity + meshIndex.bucket_ord; - } - - KOKKOS_INLINE_FUNCTION unsigned get_bucket_id(stk::mesh::Entity entity) const - { - const stk::mesh::FastMeshIndex& meshIndex = constMeshIndices(entity.local_offset()); - return meshIndex.bucket_id; - } - - unsigned getNumParallelItems() const - { - if((2 == appChoice) || (4 == appChoice) || (5 == appChoice)) - return hostElemEntities.extent(0); - - return hostConnBucketOffsets.extent(0); - } - - KOKKOS_INLINE_FUNCTION void operator()( TYPE_OPERATOR(bucket, solo, compact) , const int elementBucketIndex) const - { - const unsigned numElements = elemsPerBucket(elementBucketIndex); - const unsigned nodesPerElem = nodesPerElement(elementBucketIndex); - const unsigned dim = elementCentroids.extent(1); - double temp[3] = {0.0, 0.0, 0.0}; - for(unsigned elementIndex=0; elementIndex calculator(scratch); - - app.start_timer(); - calculator.calculate_centroids(app.num_repeat, app.choice, app.teamSize); - app.stop_timer(); - app.report_bandwidth(); - - calculator.copy_centroids_to_host(); -// calculator.test_centroid_of_element_1(); - - for(unsigned elementIndex=0; elementIndex calculator(scratch); - - app.start_timer(); - calculator.calculate_centroids(app.num_repeat, app.choice, app.teamSize ); - app.stop_timer(); - app.report_bandwidth(); - - calculator.copy_centroids_to_host(); - calculator.test_centroid_of_element_1(); - - stk::mesh::EntityVector elements; - stk::mesh::get_selected_entities(app.meta.locally_owned_part(), app.bulk->buckets(stk::topology::ELEM_RANK), elements); - for(unsigned elementIndex=0; elementIndex - -STK_FUNCTION void get_value(DeviceViewVectorType data, size_t index, my_double& value) -{ - value = data(index); -} - -my_double get_average(const std::vector& data, int num_repeat) -{ - HostViewVectorType host_data("host_data", data.size()); - DeviceViewVectorType device_data("device_data", data.size()); - - for(size_t i=0;i("-s", 2); - std::vector data(size_data); - for(size_t i=0;i("-n", 1); - - struct timeval begin,end; - gettimeofday(&begin,NULL); - - my_double average = get_average(data, num_repeat); - - gettimeofday(&end,NULL); - - double time = 1.0*(end.tv_sec-begin.tv_sec) + - 1.0e-6*(end.tv_usec-begin.tv_usec); - double Gbytes = 1.0e-9 * double(sizeof(my_double) * ( data.size() )) ; - printf("bandwidth( %g GB/s )\n", Gbytes * num_repeat / time ); - - my_double num_items = data.size(); - my_double sum = (num_items*(num_items-1))/2.0; - my_double gold_ave = sum/data.size(); - EXPECT_NEAR(gold_ave, average, 0.0000001); - } -} - -#if defined(KOKKOS_ENABLE_CUDA) -void run_it_uvm() -{ - typedef Kokkos::View IntViewType; - typedef Kokkos::View BucketConnectivityView; - typedef Kokkos::View ViewOfBuckets; - - - const unsigned numBuckets = 2; - unsigned numElemsPerBucket[numBuckets] = {2, 3}; - unsigned numNodesPerElem[numBuckets] = {4, 8}; - - IntViewType elemsPerBucket("D_elemsPerBucket", numBuckets); - IntViewType::HostMirror hostElemsPerBucket = Kokkos::create_mirror_view(elemsPerBucket); - - IntViewType nodesPerElem("D_nodesPerElem", numBuckets); - IntViewType::HostMirror hostNodesPerElem = Kokkos::create_mirror_view(nodesPerElem); - - for(unsigned i=0; i IntViewType; - typedef Kokkos::View ViewOfBuckets; - typedef Kokkos::View HostViewOfBuckets; - - const unsigned numBuckets = 2; - unsigned numElemsPerBucket[numBuckets] = {2, 3}; - unsigned numNodesPerElem[numBuckets] = {4, 8}; - - IntViewType elemsPerBucket("D_elemsPerBucket", numBuckets); - IntViewType::HostMirror hostElemsPerBucket = Kokkos::create_mirror_view(elemsPerBucket); - - IntViewType nodesPerElem("D_nodesPerElem", numBuckets); - IntViewType::HostMirror hostNodesPerElem = Kokkos::create_mirror_view(nodesPerElem); - - IntViewType bucketOffsets("D_bucketOffsets", numBuckets); - IntViewType::HostMirror hostBucketOffsets = Kokkos::create_mirror_view(bucketOffsets); - - unsigned numConnectivities = 0; - - for(unsigned i=0; i -#include -#include - -#include -#include -#include - -namespace { - -#if defined(KOKKOS_ENABLE_CUDA) -typedef double my_double; -#else -typedef long double my_double; -#endif - -#if defined(KOKKOS_ENABLE_OPENMP) -typedef Kokkos::OpenMP ExecSpace ; -#elif defined(KOKKOS_ENABLE_CUDA) -typedef Kokkos::Cuda ExecSpace ; -#else -typedef Kokkos::Serial ExecSpace ; -#endif - -#if defined(KOKKOS_ENABLE_OPENMP) -typedef Kokkos::OpenMP MemSpace; -#elif defined(KOKKOS_ENABLE_CUDA) -typedef Kokkos::CudaSpace MemSpace; -#else -typedef Kokkos::HostSpace MemSpace; -#endif - -#if defined(KOKKOS_ENABLE_OPENMP) -typedef Kokkos::OpenMP UVMMemSpace; -#elif defined(KOKKOS_ENABLE_CUDA) -typedef Kokkos::CudaUVMSpace UVMMemSpace; -#else -typedef Kokkos::HostSpace UVMMemSpace; -#endif - - -typedef Kokkos::RangePolicy range_policy ; - -typedef Kokkos::View DeviceViewVectorType; -typedef Kokkos::View HostViewVectorType; - -typedef Kokkos::TeamPolicy team_policy ; -typedef Kokkos::TeamPolicy::member_type member_type ; - -#if defined(KOKKOS_ENABLE_CUDA) -typedef Kokkos::LayoutLeft Layout ; -#else -typedef Kokkos::LayoutRight Layout ; -#endif - -typedef Kokkos::View DeviceViewMatrixType; -typedef Kokkos::View > ConstDeviceViewMatrixType; -//typedef Kokkos::View > DeviceViewAtomicMatrixType; -typedef Kokkos::View DeviceViewAtomicMatrixType; - -typedef Kokkos::View DeviceArray2DType; -typedef Kokkos::View > ConstDeviceArray2DType; - -typedef Kokkos::View DeviceArray3DType; -typedef Kokkos::View > ConstDeviceArray3DType; - -typedef Kokkos::View DeviceViewIntType; -typedef Kokkos::View> ConstDeviceViewIntType; - -} // namespace - -class NGP_Kokkos : public ::testing::Test { -}; - -#endif diff --git a/packages/stk/stk_unit_tests/stk_ngp/KokkosNodalVolume.cpp b/packages/stk/stk_unit_tests/stk_ngp/KokkosNodalVolume.cpp deleted file mode 100644 index 14c91b26ce35..000000000000 --- a/packages/stk/stk_unit_tests/stk_ngp/KokkosNodalVolume.cpp +++ /dev/null @@ -1,536 +0,0 @@ -/* -//@HEADER -// ************************************************************************ -// -// Kokkos v. 2.0 -// Copyright (2014) Sandia Corporation -// -// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation, -// the U.S. Government retains certain rights in this software. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// 3. Neither the name of the Corporation nor the names of the -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY -// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL SANDIA CORPORATION OR THE -// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Questions Contact H. Carter Edwards (hcedwar@sandia.gov) -// -// ************************************************************************ -//@HEADER -*/ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "stk_mesh/base/FieldParallel.hpp" - -#include - -double calculate_element_volume(const stk::mesh::Entity* elemNodes, - unsigned numElemNodes, - const stk::mesh::FieldBase& coords) -{ - double min[3] = {DBL_MAX, DBL_MAX, DBL_MAX}; - double max[3] = {DBL_MIN, DBL_MIN, DBL_MIN}; - for(unsigned i=0; i(stk::mesh::field_data(coords, elemNodes[i])); - for(int j=0; j<3; ++j) { - if (val[j] > max[j]) - max[j] = val[j]; - if (val[j] < min[j]) - min[j] = val[j]; - } - } - return (max[0] - min[0]) * (max[1] - min[1]) * (max[2] - min[2]); -} - -void calculate_nodal_volume_given_elem_nodes_stkmesh(const stk::mesh::Entity* elemNodes, - const unsigned numNodesPerElem, - const stk::mesh::FieldBase& coords, - stk::mesh::Field& nodalVolumeField) -{ - double elemVolumePerNode = calculate_element_volume(elemNodes, numNodesPerElem, coords) / numNodesPerElem; - for(unsigned j = 0; j < numNodesPerElem; ++j) - { - double* nodalVolume = stk::mesh::field_data(nodalVolumeField, elemNodes[j]); - ngp::atomic_add(nodalVolume, elemVolumePerNode); - } -} - -typedef Kokkos::TeamPolicy HostTeamPolicyType; -typedef HostTeamPolicyType::member_type HostTeamHandleType; - -#ifndef KOKKOS_ENABLE_CUDA -void calculate_nodal_volume_stkmesh(stk::mesh::BulkData& mesh, stk::mesh::Field& nodalVolumeField, int numRepeat) -{ - const stk::mesh::FieldBase& coords = *mesh.mesh_meta_data().coordinate_field(); - - const stk::mesh::BucketVector& elemBuckets = mesh.get_buckets(stk::topology::ELEM_RANK, - mesh.mesh_meta_data().locally_owned_part()); - unsigned numBuckets = elemBuckets.size(); - for(int n=0; n(numBuckets, Kokkos::AUTO), - [&] (const HostTeamHandleType& team) - { - const int elementBucketIndex = team.league_rank(); - const stk::mesh::Bucket &bucket = *elemBuckets[elementBucketIndex]; - const unsigned numNodesPerElem = bucket.topology().num_nodes(); - unsigned numElements = bucket.size(); - - Kokkos::parallel_for(Kokkos::TeamThreadRange(team, 0u, numElements), [&] (const int& i) - { - const stk::mesh::Entity* elemNodes = bucket.begin_nodes(i); - calculate_nodal_volume_given_elem_nodes_stkmesh(elemNodes, numNodesPerElem, coords, nodalVolumeField); - }); - }); - } - - stk::mesh::parallel_sum(mesh, {&nodalVolumeField}); -} -#endif - -void calculate_nodal_volume_stkmesh_entity_loop(stk::mesh::BulkData& mesh, - stk::mesh::Field& nodalVolumeField, - int numRepeat) -{ - const stk::mesh::FieldBase& coords = *mesh.mesh_meta_data().coordinate_field(); - for(int n=0; nbegin_nodes(elem.bucket_ordinal); - const unsigned numNodesPerElem = elem.bucket->topology().num_nodes(); - calculate_nodal_volume_given_elem_nodes_stkmesh(elemNodes, numNodesPerElem, coords, nodalVolumeField); - }); - } - stk::mesh::parallel_sum(mesh, {&nodalVolumeField}); -} - - - - - -STK_FUNCTION -void calculate_nodal_volume_given_elem_volume(const ngp::Mesh &ngpMesh, - ngp::Mesh::ConnectedNodes nodes, - double elemVolumePerNode, - const ngp::Field& nodalVolume) -{ - const unsigned numNodesPerElem = nodes.size(); - for(unsigned j = 0; j < numNodesPerElem; ++j) - { - double* v = &nodalVolume.get(ngpMesh, nodes[j], 0); - ngp::atomic_add(v, elemVolumePerNode); - } -} - -STK_FUNCTION -double calculate_element_volume(const ngp::Mesh &ngpMesh, - ngp::Mesh::ConnectedNodes nodes, - const ngp::ConstField &coords) -{ - double min[3] = {DBL_MAX, DBL_MAX, DBL_MAX}; - double max[3] = {DBL_MIN, DBL_MIN, DBL_MIN}; - const unsigned numElemNodes = nodes.size(); - for(unsigned i=0; i max[j]) - max[j] = val; - if (val < min[j]) - min[j] = val; - } - } - return (max[0] - min[0]) * (max[1] - min[1]) * (max[2] - min[2]); -} - -STK_FUNCTION -void calculate_nodal_volume_device(const ngp::Mesh &ngpMesh, - const ngp::Mesh::MeshIndex elem, - const ngp::ConstField &coords, - const ngp::Field &nodalVolume) -{ - ngp::Mesh::ConnectedNodes nodes = ngpMesh.get_nodes(elem); - const unsigned numNodesPerElem = nodes.size(); - double elemVolumePerNode = calculate_element_volume(ngpMesh, nodes, coords) / numNodesPerElem; - calculate_nodal_volume_given_elem_volume(ngpMesh, nodes, elemVolumePerNode, nodalVolume); -} - -void calculate_nodal_volume(ngp::Mesh &ngpMesh, stk::mesh::Selector selector, const ngp::ConstField &coords, ngp::Field &nodalVolume) -{ - ngp::for_each_entity_run(ngpMesh, stk::topology::ELEM_RANK, selector, KOKKOS_LAMBDA(ngp::Mesh::MeshIndex elem) - { - calculate_nodal_volume_device(ngpMesh, elem, coords, nodalVolume); - }); - nodalVolume.modify_on_device(); -} - -void calculate_nodal_volume_entity_loop(stk::mesh::BulkData& mesh, - stk::mesh::Selector selector, - stk::mesh::Field& nodalVolumeField, - int numRepeat) -{ - double start = stk::wall_time(); - const stk::mesh::FieldBase& coords = *mesh.mesh_meta_data().coordinate_field(); - ngp::ConstField ngpCoords(mesh, coords); - ngp::Field ngpNodalVolume(mesh, nodalVolumeField); - ngp::Mesh ngpMesh(mesh); - double middle = stk::wall_time(); - - for(int n=0; n -void repeat_for_each_entity_loop_for_algorithm(stk::mesh::BulkData& mesh, - stk::mesh::Field& elemVolumePerNodeField, - stk::mesh::Field& nodalVolumeField, - int numRepeat, - const Algorithm &algorithm) -{ - ngp::Field staticNodalVolume(mesh, nodalVolumeField); - ngp::Field staticElemVolume(mesh, elemVolumePerNodeField); - ngp::Mesh ngpMesh(mesh); - - for(int n=0; n &staticNodalVolume) -{ - ngp::Mesh::ConnectedNodes nodes = ngpMesh.get_nodes(elem); - calculate_nodal_volume_given_elem_volume(ngpMesh, nodes, elemVolumePerNode, staticNodalVolume); -} - -void assemble_nodal_volume_from_elem_volume_bucket_field_access(ngp::Mesh &ngpMesh, - const ngp::Field &elemVolumePerNode, - ngp::Field &staticNodalVolume) -{ - typedef Kokkos::TeamPolicy::member_type TeamHandleType; - unsigned numBuckets = ngpMesh.num_buckets(stk::topology::ELEM_RANK); - Kokkos::parallel_for(Kokkos::TeamPolicy(numBuckets, Kokkos::AUTO), KOKKOS_LAMBDA (const TeamHandleType& team) - { - const int bucketIndex = team.league_rank(); - const ngp::Mesh::BucketType &bucket = ngpMesh.get_bucket(stk::topology::ELEM_RANK, bucketIndex); - unsigned numElements = bucket.size(); - double *volumePerNodePtr = &elemVolumePerNode.get(stk::mesh::FastMeshIndex{bucket.bucket_id(), 0}, 0); - Kokkos::parallel_for(Kokkos::TeamThreadRange(team, 0u, numElements), [&] (const int& i) - { - ngp::Mesh::MeshIndex elem{&bucket, static_cast(i)}; - assemble_nodal_volume_from_elem_volume_device(ngpMesh, elem, volumePerNodePtr[i], staticNodalVolume); - }); - }); - staticNodalVolume.modify_on_device(); -} - -void assemble_nodal_volume_bucket_field_access(stk::mesh::BulkData& mesh, - stk::mesh::Field& elemVolumePerNodeField, - stk::mesh::Field& nodalVolumeField, - int numRepeat) -{ - repeat_for_each_entity_loop_for_algorithm(mesh, elemVolumePerNodeField, nodalVolumeField, numRepeat, - [=](ngp::Mesh &ngpMesh, const ngp::Field &elemVolumePerNode, ngp::Field &staticNodalVolume) - { - assemble_nodal_volume_from_elem_volume_bucket_field_access(ngpMesh, elemVolumePerNode, staticNodalVolume); - }); -} - -void assemble_nodal_volume_from_elem_volume_entity_field_access(ngp::Mesh &ngpMesh, - stk::mesh::Selector selector, - const ngp::Field &elemVolumePerNode, - ngp::Field &staticNodalVolume) -{ - ngp::for_each_entity_run(ngpMesh, stk::topology::ELEM_RANK, selector, KOKKOS_LAMBDA(ngp::Mesh::MeshIndex elem) - { - double volumePerNode = elemVolumePerNode.get(elem, 0); - assemble_nodal_volume_from_elem_volume_device(ngpMesh, elem, volumePerNode, staticNodalVolume); - }); - staticNodalVolume.modify_on_device(); -} - -void assemble_nodal_volume_entity_field_access(stk::mesh::BulkData& mesh, - stk::mesh::Field& elemVolumePerNodeField, - stk::mesh::Field& nodalVolumeField, - int numRepeat) -{ - stk::mesh::Selector selector = mesh.mesh_meta_data().locally_owned_part(); - repeat_for_each_entity_loop_for_algorithm(mesh, elemVolumePerNodeField, nodalVolumeField, numRepeat, - [=](ngp::Mesh &ngpMesh, const ngp::Field &elemVolumePerNode, ngp::Field &staticNodalVolume) - { - assemble_nodal_volume_from_elem_volume_entity_field_access(ngpMesh, selector, elemVolumePerNode, staticNodalVolume); - }); -} - - - - -void expect_nodal_volume(const stk::mesh::BulkData& mesh, stk::mesh::Selector selector, stk::mesh::Field& nodalVolumeField, stk::mesh::Field& numElemsPerNodeField, int numRepeat) -{ - const stk::mesh::BucketVector& nodeBuckets = mesh.buckets(stk::topology::NODE_RANK); - for(const stk::mesh::Bucket* bucket : nodeBuckets) { - const double* nodalVolume = stk::mesh::field_data(nodalVolumeField, *bucket); - const int *numElemsPerNode = stk::mesh::field_data(numElemsPerNodeField, *bucket); - for(size_t i=0; isize(); ++i) { - double expectedVolume = 1.0; - if(selector(*bucket)) - { - if (numElemsPerNode[i] == 8) { - expectedVolume = 1.0; - } - else if (numElemsPerNode[i] == 4) { - expectedVolume = 0.5; - } - else if (numElemsPerNode[i] == 2) { - expectedVolume = 0.25; - } - else if (numElemsPerNode[i] == 1) { - expectedVolume = 0.125; - } - else { - ASSERT_TRUE(false) << "numElemsPerNode = " << numElemsPerNode[i]; - } - EXPECT_NEAR(numRepeat*expectedVolume, nodalVolume[i], 1.e-9); - } - } - } -} - -void count_num_elems_per_node(const stk::mesh::BulkData& mesh, stk::mesh::Selector selector, stk::mesh::Field& numElemsPerNodeField) -{ - stk::mesh::Selector ownedOrShared = mesh.mesh_meta_data().locally_owned_part() | mesh.mesh_meta_data().globally_shared_part(); - const stk::mesh::BucketVector& nodeBuckets = mesh.get_buckets(stk::topology::NODE_RANK, ownedOrShared); - for(const stk::mesh::Bucket* nodeBucket : nodeBuckets) { - int* numElemsPerNode = stk::mesh::field_data(numElemsPerNodeField, *nodeBucket); - for(size_t i=0; isize(); ++i) { - unsigned numElems = nodeBucket->num_elements(i); - const stk::mesh::Entity *elems = nodeBucket->begin_elements(i); - for(size_t j=0; j& elemVolumePerNodeField) -{ - const stk::mesh::FieldBase& coords = *mesh.mesh_meta_data().coordinate_field(); - for(const stk::mesh::Bucket *bucket : mesh.get_buckets(stk::topology::ELEM_RANK, selector)) - { - unsigned numNodesPerElem = bucket->topology().num_nodes(); - double *volume = stk::mesh::field_data(elemVolumePerNodeField, *bucket); - for(size_t j=0; jsize(); j++) - { - const stk::mesh::Entity *nodes = bucket->begin_nodes(j); - volume[j] = calculate_element_volume(nodes, bucket->topology().num_nodes(), coords) / numNodesPerElem; - } - } -} - -class NodalVolumeCalculator : public stk::unit_test_util::MeshFixture -{ -protected: - void create_mesh_and_fields(stk::mesh::BulkData::AutomaticAuraOption auraOption, const stk::mesh::Part &part) - { - elemVolumePerNodeField = &get_meta().declare_field >(stk::topology::ELEM_RANK, "elemVolumePerNodeField"); - stk::mesh::put_field_on_mesh(*elemVolumePerNodeField, part, - (stk::mesh::FieldTraits >::data_type*) nullptr); - nodalVolumeField = &get_meta().declare_field >(stk::topology::NODE_RANK, "nodal_volume"); - stk::mesh::put_field_on_mesh(*nodalVolumeField, part, - (stk::mesh::FieldTraits >::data_type*) nullptr); - numElemsPerNodeField = &get_meta().declare_field >(stk::topology::NODE_RANK, "numElemsPerNode"); - stk::mesh::put_field_on_mesh(*numElemsPerNodeField, part, - (stk::mesh::FieldTraits >::data_type*) nullptr); - std::string meshName = stk::unit_test_util::get_mesh_spec("-dim"); - setup_mesh(meshName, auraOption); - std::cout << "Using mesh: "<("-n", 20); - } - -#ifndef KOKKOS_ENABLE_CUDA - void test_nodal_volume_stkmesh(stk::mesh::BulkData::AutomaticAuraOption auraOption) - { - create_mesh_and_fill_fields(auraOption, get_meta().universal_part()); - int numRepeat = get_num_repeat(); - double startTime = stk::wall_time(); - calculate_nodal_volume_stkmesh(get_bulk(), *nodalVolumeField, numRepeat); - double elapsedTime = stk::wall_time() - startTime; - std::cout<<"\t\tstkmesh: "< *elemVolumePerNodeField; - stk::mesh::Field *nodalVolumeField; - stk::mesh::Field *numElemsPerNodeField; -}; -TEST_F(NodalVolumeCalculator, nodalVolumeForEachEntityLoop_primerTest) { - test_nodal_volume_entity_loop(stk::mesh::BulkData::NO_AUTO_AURA); -} -#ifndef KOKKOS_ENABLE_CUDA -TEST_F(NodalVolumeCalculator, stkMeshNodalVolume) { - test_nodal_volume_stkmesh(stk::mesh::BulkData::NO_AUTO_AURA); -} -#endif -TEST_F(NodalVolumeCalculator, nodalVolumeBucketFieldAccess) { - test_nodal_volume_bucket_field_access(stk::mesh::BulkData::NO_AUTO_AURA); -} -TEST_F(NodalVolumeCalculator, nodalVolumeEntityFieldAccess) { - test_nodal_volume_entity_field_access(stk::mesh::BulkData::NO_AUTO_AURA); -} -TEST_F(NodalVolumeCalculator, nodalVolumeForEachEntityLoop) { - test_nodal_volume_entity_loop(stk::mesh::BulkData::NO_AUTO_AURA); -} -TEST_F(NodalVolumeCalculator, stkMeshNodalVolumeForEachEntityLoop) { - test_nodal_volume_stkmesh_entity_loop(stk::mesh::BulkData::NO_AUTO_AURA); -} -TEST_F(NodalVolumeCalculator, nodalVolumeSubset) { - test_nodal_volume_subset(stk::mesh::BulkData::NO_AUTO_AURA); -} - - diff --git a/packages/stk/stk_unit_tests/stk_ngp/NgpFieldPerformanceTest.cpp b/packages/stk/stk_unit_tests/stk_ngp/NgpFieldPerformanceTest.cpp deleted file mode 100644 index cc9e74cabd1e..000000000000 --- a/packages/stk/stk_unit_tests/stk_ngp/NgpFieldPerformanceTest.cpp +++ /dev/null @@ -1,138 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -namespace ngp_field_perf_test -{ - -template -void calculate_centroid(const ngp::Mesh &ngpMesh, const CoordFieldType &ngpCoords, const stk::mesh::Selector &sel, ngp::Field &ngpCentroid) -{ - ngp::for_each_entity_run(ngpMesh, stk::topology::ELEM_RANK, sel, KOKKOS_LAMBDA(ngp::Mesh::MeshIndex elem) - { - for(size_t count = 0; count < 1000; count++) - { - ngp::Mesh::ConnectedNodes nodes = ngpMesh.get_nodes(elem); - - for(unsigned dim = 0; dim < 3; dim++) - ngpCentroid.get(elem, dim) = 0; - - for(size_t i = 0; i < nodes.size(); i++) - { - stk::mesh::FastMeshIndex nodeIndex = ngpMesh.fast_mesh_index(nodes[i]); - for(unsigned dim = 0; dim < 3; dim++) - ngpCentroid.get(elem, dim) += ngpCoords.get(nodeIndex, dim); - } - - for(unsigned dim = 0; dim < 3; dim++) - ngpCentroid.get(elem, dim) /= nodes.size(); - } - }); - ngpCentroid.modify_on_device(); -} - -template -void calculate_centroid_using_coord_field(const stk::mesh::BulkData &bulk, stk::mesh::FieldBase ¢roid) -{ - const stk::mesh::FieldBase& coords = *bulk.mesh_meta_data().coordinate_field(); - CoordFieldType ngpCoords(bulk, coords); - ngp::Field ngpCentroid(bulk, centroid); - ngp::Mesh ngpMesh(bulk); - - calculate_centroid(ngpMesh, ngpCoords, bulk.mesh_meta_data().locally_owned_part(), ngpCentroid); - - ngpCentroid.sync_to_host(); -} - -std::vector get_centroid_average(stk::mesh::BulkData &bulk, stk::mesh::Field ¢roid) -{ - std::vector average = {0, 0, 0}; - size_t numElems = 0; - for(const stk::mesh::Bucket *bucket : bulk.buckets(stk::topology::ELEM_RANK)) - { - for(stk::mesh::Entity elem : *bucket) - { - double *elemCentroid = stk::mesh::field_data(centroid, elem); - for(size_t dim = 0; dim < 3; dim++) - average[dim] += elemCentroid[dim]; - numElems++; - } - } - - for(size_t dim = 0; dim < 3; dim++) - average[dim] /= numElems; - - return average; -} - -class NgpFieldPerf : public stk::unit_test_util::MeshFixture -{ -protected: - void declare_centroid_field() - { - centroid = &get_meta().declare_field >(stk::topology::ELEM_RANK, "centroid"); - stk::mesh::put_field_on_mesh(*centroid, get_meta().universal_part(), 3, - (stk::mesh::FieldTraits >::data_type*) nullptr); - } - void generate_mesh() - { - std::string meshSpec = stk::unit_test_util::get_mesh_spec("-dim"); - setup_mesh(meshSpec, stk::mesh::BulkData::NO_AUTO_AURA); - } - void verify_averaged_centroids_are_center_of_mesh() - { - std::vector average = get_centroid_average(get_bulk(), *centroid); - double meshCenter = stk::unit_test_util::get_command_line_option("-dim", 20) / 2.0; - for(size_t dim = 0; dim < 3; dim++) - EXPECT_EQ(meshCenter, average[dim]); - } - template - double time_field_data_access() - { - double startTime = stk::wall_time(); - calculate_centroid_using_coord_field(get_bulk(), *centroid); - double duration = stk::wall_time() - startTime; - verify_averaged_centroids_are_center_of_mesh(); - return duration; - } - void warm_up_gpu() - { - time_field_data_access>(); - } - - stk::mesh::Field *centroid; -}; - -TEST_F(NgpFieldPerf, constFieldDataAccessIsFasterThanFieldDataAccess) -{ - declare_centroid_field(); - generate_mesh(); - warm_up_gpu(); - double constTime = time_field_data_access>(); - double nonConstTime = time_field_data_access>(); - double diffPerf = (nonConstTime - constTime) * 100 / nonConstTime; - std::cerr << "non-const time: " << nonConstTime << ", const time: " << constTime << " percentage gain: " << diffPerf << "%%\n"; - - //only expect nonConstTime to be faster in release-mode, on cude, for large problem sizes - if (stk::unit_test_util::get_command_line_option("-dim",20) >= 60) - { -#ifdef NDEBUG -#ifdef KOKKOS_ENABLE_CUDA - EXPECT_LT(constTime, nonConstTime); -#endif -#endif - } -} - -} diff --git a/packages/stk/stk_unit_tests/stk_ngp/NgpMeshTest.cpp b/packages/stk/stk_unit_tests/stk_ngp/NgpMeshTest.cpp deleted file mode 100644 index 79360a70f245..000000000000 --- a/packages/stk/stk_unit_tests/stk_ngp/NgpMeshTest.cpp +++ /dev/null @@ -1,185 +0,0 @@ -/* -//@HEADER -// ************************************************************************ -// -// Kokkos v. 2.0 -// Copyright (2014) Sandia Corporation -// -// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation, -// the U.S. Government retains certain rights in this software. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// 3. Neither the name of the Corporation nor the names of the -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY -// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL SANDIA CORPORATION OR THE -// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Questions Contact H. Carter Edwards (hcedwar@sandia.gov) -// -// ************************************************************************ -//@HEADER -*/ - -#include "stk_ngp_test/ngp_test.hpp" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "stk_mesh/base/FieldParallel.hpp" - -#include - -class NgpMeshTest : public stk::unit_test_util::MeshFixture -{ -public: - void run_get_nodes_using_FastMeshIndex_test() - { - setup_mesh("generated:1x1x4", stk::mesh::BulkData::NO_AUTO_AURA); - - stk::NgpVector numNodesVec("numNodes", 1); - - ngp::Mesh ngpMesh(get_bulk()); - Kokkos::parallel_for(1, KOKKOS_LAMBDA(const int i) - { - ngp::Mesh::ConnectedNodes nodes = ngpMesh.get_nodes(stk::topology::ELEM_RANK, stk::mesh::FastMeshIndex{0,0}); - numNodesVec.device_get(0) = nodes.size(); - }); - - numNodesVec.copy_device_to_host(); - ASSERT_EQ(8u, numNodesVec[0]); - } -}; -TEST_F(NgpMeshTest, get_nodes_using_FastMeshIndex) -{ - run_get_nodes_using_FastMeshIndex_test(); -} - -class EntityIndexSpace : public stk::unit_test_util::MeshFixture {}; -TEST_F(EntityIndexSpace, accessingLocalData_useLocalOffset) -{ - if (stk::parallel_machine_size(MPI_COMM_WORLD) > 1) { - return; - } - setup_mesh("generated:1x1x1", stk::mesh::BulkData::NO_AUTO_AURA); - std::vector entityToLocalOffset(get_bulk().get_size_of_entity_index_space(), 0); - - for(stk::mesh::EntityRank rank=stk::topology::NODE_RANK; rank gold {0,0,1,2,3,4,5,6,7,0}; - ASSERT_EQ(gold.size(), entityToLocalOffset.size()); - for(size_t i=0; i vec("vec", n); - Kokkos::parallel_for(n, KOKKOS_LAMBDA(const int i) - { - vec.device_get(i) = i; - }); - vec.copy_device_to_host(); - for(size_t i=0; i; - -NGP_TEST_F(NgpMeshTest, volatileFastSharedCommMap) -{ - if (stk::parallel_machine_size(MPI_COMM_WORLD) == 1) return; - - setup_empty_mesh(stk::mesh::BulkData::NO_AUTO_AURA); - stk::io::fill_mesh("generated:1x1x4", get_bulk()); - - ngp::Mesh ngpMesh(get_bulk()); - std::vector comm_procs = get_bulk().all_sharing_procs(stk::topology::NODE_RANK); - - for (int proc : comm_procs) { - const stk::mesh::BucketIndices & stkBktIndices = get_bulk().volatile_fast_shared_comm_map(stk::topology::NODE_RANK)[proc]; - ngp::DeviceCommMapIndices deviceNgpMeshIndices("deviceNgpMeshIndices", stkBktIndices.ords.size()); - ngp::DeviceCommMapIndices::HostMirror hostNgpMeshIndices = Kokkos::create_mirror_view(deviceNgpMeshIndices); - - size_t entryIndex = 0; - size_t stkOrdinalIndex = 0; - for (size_t i = 0; i < stkBktIndices.bucket_info.size(); ++i) { - const unsigned bucketId = stkBktIndices.bucket_info[i].bucket_id; - const unsigned numEntitiesThisBucket = stkBktIndices.bucket_info[i].num_entities_this_bucket; - for (size_t n = 0; n < numEntitiesThisBucket; ++n) { - const unsigned ordinal = stkBktIndices.ords[stkOrdinalIndex++]; - const stk::mesh::FastMeshIndex stkFastMeshIndex{bucketId, ordinal}; - hostNgpMeshIndices[entryIndex++] = stkFastMeshIndex; - } - } - Kokkos::deep_copy(deviceNgpMeshIndices, hostNgpMeshIndices); - check_volatile_fast_shared_comm_map_values_on_device(ngpMesh, proc, deviceNgpMeshIndices); - } -} - - - diff --git a/packages/stk/stk_unit_tests/stk_ngp/NgpParallelCommTest.cpp b/packages/stk/stk_unit_tests/stk_ngp/NgpParallelCommTest.cpp deleted file mode 100644 index dd7d194a2fa1..000000000000 --- a/packages/stk/stk_unit_tests/stk_ngp/NgpParallelCommTest.cpp +++ /dev/null @@ -1,234 +0,0 @@ -#include "stk_ngp_test/ngp_test.hpp" -#include "stk_util/util/SortAndUnique.hpp" -#include "Kokkos_Core.hpp" -#include -#include "stk_ngp/NgpParallelComm.hpp" -#include "stk_ngp/NgpSpaces.hpp" - -namespace { - -class NgpParallelComm : public ::ngp_testing::Test -{ -protected: - NgpParallelComm() - { - } -}; - -using NeighborCrsViewType = Kokkos::StaticCrsGraph; -using ValueViewType = Kokkos::View; - -class ParallelDataExchangeSymPackUnpackHandler -{ -public: - //STK_FUNCTION ParallelDataExchangeSymPackUnpackHandler(ngp::FieldManager & fieldManager) - ParallelDataExchangeSymPackUnpackHandler(std::vector> & neighbors, - ValueViewType & deviceValues) - : m_neighbors(neighbors), - m_deviceNeighbors(Kokkos::create_staticcrsgraph("DeviceNeighborsCrs", neighbors)), - m_deviceValues(deviceValues) - { - } - - ParallelDataExchangeSymPackUnpackHandler(const ParallelDataExchangeSymPackUnpackHandler & rhs) = default; - - void hostSizeMessages(int proc, size_t & numValues) const - { - numValues = 0; - for (size_t i = 0; i < m_neighbors.size(); ++i) { - for (size_t n = 0; n < m_neighbors[i].size(); ++n) { - if (m_neighbors[i][n] == proc) { - ++numValues; - } - } - } - } - - STK_FUNCTION - void devicePackMessage(int myProc, int proc, ValueViewType & sendData) const - { - size_t bufIdx = 0; - for (size_t i = 0; i < m_deviceNeighbors.numRows(); ++i) { - const size_t neighborBegin = m_deviceNeighbors.row_map[i]; - const size_t neighborEnd = m_deviceNeighbors.row_map[i+1]; - for (size_t n = neighborBegin; n < neighborEnd; ++n) { - if (m_deviceNeighbors.entries[n] == proc) { - sendData[bufIdx++] = m_deviceValues[i]; - } - } - } - } - - STK_FUNCTION - void deviceUnpackMessage(int myProc, int proc, ValueViewType & recvData) const - { - size_t valueLocation[3]; - size_t valueLocationIdx = 0; - size_t numSharedValues = 0; - for (size_t i = 0; i < m_deviceNeighbors.numRows(); ++i) { - const size_t neighborBegin = m_deviceNeighbors.row_map[i]; - const size_t neighborEnd = m_deviceNeighbors.row_map[i+1]; - for (size_t n = neighborBegin; n < neighborEnd; ++n) { - if (m_deviceNeighbors.entries[n] == proc) { - ++numSharedValues; - valueLocation[valueLocationIdx++] = i; - } - } - } - - if (numSharedValues == 1u) { - // Diagonal processor - m_deviceValues(valueLocation[0]) += recvData[0]; - } - else { - // Face-adjacent processor - m_deviceValues(valueLocation[0]) += recvData[0]; - - bool verticalNeighbor = (myProc == proc+1) || (myProc == proc-1); - if (verticalNeighbor) { - m_deviceValues(valueLocation[1]) += recvData[2]; - m_deviceValues(valueLocation[2]) += recvData[1]; - } - else { - m_deviceValues(valueLocation[1]) += recvData[1]; - m_deviceValues(valueLocation[2]) += recvData[2]; - } - } - } - -private: - std::vector> m_neighbors; - NeighborCrsViewType m_deviceNeighbors; - ValueViewType m_deviceValues; -}; - -void check_device_values(int pRank, ValueViewType & deviceValues) -{ - Kokkos::parallel_for(deviceValues.size(), KOKKOS_LAMBDA(size_t i) - { - //printf("[p%i] deviceValue(%lu) = %f\n", pRank, i, deviceValues(i)); - NGP_EXPECT_NEAR(1.0, deviceValues(i), 1.e-12); - }); -} - -void get_domain_shape(const int size, int & nx, int & ny) -{ - nx = 1; - ny = size; - int nxTry = std::sqrt(size); - while (nxTry >= 1) { - if (size % nxTry == 0) { - ny = size / nxTry; - nx = nxTry; - break; - } - --nxTry; - } -} - -std::vector> get_neighbors(int pSize, int pRank) -{ - int nx = 0; - int ny = 0; - get_domain_shape(pSize, nx, ny); - int dims[] = {nx, ny}; - int periods[] = {0, 0}; - int reorder = 0; - - // Put together a Cartesian communicator to organize the processors - // into a grid with well-defined neighbors. - MPI_Comm comm2D; - MPI_Cart_create(MPI_COMM_WORLD, 2, dims, periods, reorder, &comm2D); - - // Get my coordinates in this processor grid - int coords[2]; - MPI_Cart_coords(comm2D, pRank, 2, coords); - const int x = coords[0]; - const int y = coords[1]; - - // Query my neighbors in the positive and negative x and y directions. - // Negative numbers indicate no neighbor in that direction (at the edge - // of the grid). - int neighbor[8]; - std::fill_n(neighbor, 8, -1); - MPI_Cart_shift(comm2D, 0, 1, neighbor+2, neighbor ); - MPI_Cart_shift(comm2D, 1, 1, neighbor+3, neighbor+1); - - // Query my neighbors in the diagonal directions - if (neighbor[0] >= 0 && neighbor[1] >= 0) { - MPI_Cart_rank(comm2D, std::array{{x+1, y+1}}.data(), neighbor+4); - } - if (neighbor[1] >= 0 && neighbor[2] >= 0) { - MPI_Cart_rank(comm2D, std::array{{x-1, y+1}}.data(), neighbor+5); - } - if (neighbor[2] >= 0 && neighbor[3] >= 0) { - MPI_Cart_rank(comm2D, std::array{{x-1, y-1}}.data(), neighbor+6); - } - if (neighbor[3] >= 0 && neighbor[0] >= 0) { - MPI_Cart_rank(comm2D, std::array{{x+1, y-1}}.data(), neighbor+7); - } - - // We will store 8 values: 1 for each "face" of my subdomain and 1 for each - // "corner" of my subdomain. Put together an array of the processors who I - // will share values with. For axis-aligned directions (neighbors on a face), - // there can be only one sharing processor. - std::vector> neighbors(8); - for (int n = 0; n < 4; ++n) { - if (neighbor[n] >= 0) { - neighbors[n].push_back(neighbor[n]); - } - } - - // For the diagonal directions, our "corner" value will be shared with either - // one other processor (we are at the edge of the domain) or three other - // processors (we are in the middle of the domain). - for (int n = 0; n < 4; ++n) { - const int axisDir1 = n; - const int axisDir2 = (n+1) % 4; - const int diagDir = (n+4); - - if (neighbor[axisDir1] >= 0) neighbors[diagDir].push_back(neighbor[axisDir1]); - if (neighbor[axisDir2] >= 0) neighbors[diagDir].push_back(neighbor[axisDir2]); - if (neighbor[axisDir1] >= 0 && neighbor[axisDir2] >= 0) { - neighbors[diagDir].push_back(neighbor[diagDir]); - } - } - - return neighbors; -} - -NGP_TEST_F(NgpParallelComm, symmetricPackUnpack) -{ - const int pSize = stk::parallel_machine_size(MPI_COMM_WORLD); - const int pRank = stk::parallel_machine_rank(MPI_COMM_WORLD); - - std::vector> neighbors = get_neighbors(pSize, pRank); - - ValueViewType deviceValues("value", neighbors.size()); - ValueViewType::HostMirror hostValues = Kokkos::create_mirror_view(deviceValues); - for (size_t n = 0; n < neighbors.size(); ++n) { - hostValues(n) = 1.0 / (neighbors[n].size() + 1); - } - Kokkos::deep_copy(deviceValues, hostValues); - - std::vector commProcs; - for (size_t i = 0; i < neighbors.size(); ++i) { - for (const int & n : neighbors[i]) { - commProcs.push_back(n); - } - } - stk::util::sort_and_unique(commProcs); - - ParallelDataExchangeSymPackUnpackHandler exchangeHandler(neighbors, deviceValues); - - const bool deterministic = false; - ngp::parallel_data_exchange_sym_pack_unpack(MPI_COMM_WORLD, - commProcs, - exchangeHandler, - deterministic); - - Kokkos::fence(); - check_device_values(pRank, deviceValues); -} - -} diff --git a/packages/stk/stk_unit_tests/stk_ngp/NgpParallelSumTest.cpp b/packages/stk/stk_unit_tests/stk_ngp/NgpParallelSumTest.cpp deleted file mode 100644 index 70a3926a0faa..000000000000 --- a/packages/stk/stk_unit_tests/stk_ngp/NgpParallelSumTest.cpp +++ /dev/null @@ -1,414 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "stk_mesh/base/FieldParallel.hpp" -#include "stk_ngp/NgpFieldParallel.hpp" -#include -#include - -namespace { - -class NgpParallelSum : public stk::unit_test_util::MeshFixture -{ -protected: - NgpParallelSum() : stk::unit_test_util::MeshFixture(3) - { - } - - void initialize_shared_values(stk::mesh::FieldBase & userField, stk::mesh::FieldBase & goldValues, - bool leaveGoldValuesNotSummed=false) - { - const stk::mesh::BucketVector & buckets = get_bulk().get_buckets(stk::topology::NODE_RANK, get_meta().globally_shared_part()); - std::vector sharingProcs; - for (stk::mesh::Bucket * bucket : buckets) { - for (const stk::mesh::Entity & node : *bucket) { - stk::mesh::EntityKey nodeKey = get_bulk().entity_key(node); - double id = static_cast(get_bulk().identifier(node)); - double * gold = static_cast(stk::mesh::field_data(goldValues, node)); - *gold = id; - - double * user = static_cast(stk::mesh::field_data(userField, node)); - get_bulk().comm_procs(nodeKey, sharingProcs); - const size_t numSharers = sharingProcs.size() + 1; - *user = id / numSharers; - if (leaveGoldValuesNotSummed) { - *gold = *user; - } - } - } - } - -}; - -class NgpCopyOwnedToShared : public stk::unit_test_util::MeshFixture -{ -protected: - NgpCopyOwnedToShared() : stk::unit_test_util::MeshFixture(3) - { - } - - void initialize_owned_shared_values(stk::mesh::FieldBase & userField, stk::mesh::FieldBase & goldValues, - bool leaveGoldValuesZero=false) - { - const stk::mesh::BucketVector & buckets = get_bulk().get_buckets(stk::topology::NODE_RANK, get_meta().globally_shared_part()); - for (stk::mesh::Bucket * bucket : buckets) { - for (const stk::mesh::Entity & node : *bucket) { - std::vector sharingProcs; - double id = static_cast(get_bulk().identifier(node)); - double * gold = static_cast(stk::mesh::field_data(goldValues, node)); - *gold = id; - - double * user = static_cast(stk::mesh::field_data(userField, node)); - *user = bucket->owned() ? id : 0; - if (leaveGoldValuesZero) { - *gold = *user; - } - } - } - } - -}; - -class NgpCommunicateFieldData : public stk::unit_test_util::MeshFixture -{ -protected: - NgpCommunicateFieldData() : stk::unit_test_util::MeshFixture(3) - { - } - - void initialize_owned_ghosted_values(stk::mesh::FieldBase & userField, stk::mesh::FieldBase & goldValues, - bool leaveGoldValuesZero=false) - { - const stk::mesh::BucketVector & buckets = get_bulk().get_buckets(stk::topology::NODE_RANK, (get_meta().locally_owned_part() & !get_meta().globally_shared_part()) | get_meta().aura_part()); - for (stk::mesh::Bucket * bucket : buckets) { - for (const stk::mesh::Entity & node : *bucket) { - std::vector sharingProcs; - double id = static_cast(get_bulk().identifier(node)); - double * gold = static_cast(stk::mesh::field_data(goldValues, node)); - *gold = id; - - double * user = static_cast(stk::mesh::field_data(userField, node)); - *user = bucket->owned() ? id : 0; - if (leaveGoldValuesZero) { - *gold = *user; - } - } - } - } - -}; - -template -void check_field_on_device(ngp::Mesh &mesh, - ngp::Field & userField, - ngp::Field & goldValues) -{ - ngp::for_each_entity_run(mesh, stk::topology::NODE_RANK, mesh.get_bulk_on_host().mesh_meta_data().universal_part(), KOKKOS_LAMBDA(ngp::Mesh::MeshIndex entity) - { - NGP_EXPECT_NEAR(userField.get(entity, 0), goldValues.get(entity, 0), 1.e-12); - }); -} - -NGP_TEST_F(NgpParallelSum, simpleVersion) -{ - const double initValue = 0.0; - const int numStates = 1; - stk::mesh::Field & userField = get_meta().declare_field>(stk::topology::NODE_RANK, "userField", numStates); - stk::mesh::Field & goldValues = get_meta().declare_field>(stk::topology::NODE_RANK, "goldValues", numStates); - stk::mesh::put_field_on_mesh(userField, get_meta().universal_part(), &initValue); - stk::mesh::put_field_on_mesh(goldValues, get_meta().universal_part(), &initValue); - - setup_mesh("generated:1x1x4", stk::mesh::BulkData::NO_AUTO_AURA); - - initialize_shared_values(userField, goldValues); - - ngp::Mesh ngpMesh(get_bulk()); - ngp::FieldManager fieldManager(get_bulk()); - ngp::Field & deviceUserField = fieldManager.get_field(userField.mesh_meta_data_ordinal()); - ngp::Field & deviceGoldValues = fieldManager.get_field(goldValues.mesh_meta_data_ordinal()); - - ngp::parallel_sum(get_bulk(), std::vector*>{&deviceUserField}); - - check_field_on_device(ngpMesh, deviceUserField, deviceGoldValues); -} - -#ifdef KOKKOS_ENABLE_CUDA -NGP_TEST_F(NgpParallelSum, simpleVersion_noSyncToDeviceAfterwards) -{ - const double initValue = 0.0; - const int numStates = 1; - stk::mesh::Field & userField = get_meta().declare_field>(stk::topology::NODE_RANK, "userField", numStates); - stk::mesh::Field & goldValues = get_meta().declare_field>(stk::topology::NODE_RANK, "goldValues", numStates); - stk::mesh::put_field_on_mesh(userField, get_meta().universal_part(), &initValue); - stk::mesh::put_field_on_mesh(goldValues, get_meta().universal_part(), &initValue); - - setup_mesh("generated:1x1x4", stk::mesh::BulkData::NO_AUTO_AURA); - - const bool leaveSharedGoldValuesNotSummed = true; - initialize_shared_values(userField, goldValues, leaveSharedGoldValuesNotSummed); - - ngp::Mesh ngpMesh(get_bulk()); - ngp::FieldManager fieldManager(get_bulk()); - ngp::Field & deviceUserField = fieldManager.get_field(userField.mesh_meta_data_ordinal()); - ngp::Field & deviceGoldValues = fieldManager.get_field(goldValues.mesh_meta_data_ordinal()); - - const bool finalSyncToDevice = false; - ngp::parallel_sum(get_bulk(), std::vector*>{&deviceUserField}, finalSyncToDevice); - - check_field_on_device(ngpMesh, deviceUserField, deviceGoldValues); -} -#endif - -NGP_TEST_F(NgpCopyOwnedToShared, simpleVersion) -{ - const double initValue = 0.0; - const int numStates = 1; - stk::mesh::Field & userField = get_meta().declare_field>(stk::topology::NODE_RANK, "userField", numStates); - stk::mesh::Field & goldValues = get_meta().declare_field>(stk::topology::NODE_RANK, "goldValues", numStates); - stk::mesh::put_field_on_mesh(userField, get_meta().universal_part(), &initValue); - stk::mesh::put_field_on_mesh(goldValues, get_meta().universal_part(), &initValue); - - setup_mesh("generated:1x1x4", stk::mesh::BulkData::NO_AUTO_AURA); - - initialize_owned_shared_values(userField, goldValues); - - ngp::Mesh ngpMesh(get_bulk()); - ngp::FieldManager fieldManager(get_bulk()); - ngp::Field & deviceUserField = fieldManager.get_field(userField.mesh_meta_data_ordinal()); - ngp::Field & deviceGoldValues = fieldManager.get_field(goldValues.mesh_meta_data_ordinal()); - - ngp::copy_owned_to_shared(get_bulk(), std::vector*>{&deviceUserField}); - - check_field_on_device(ngpMesh, deviceUserField, deviceGoldValues); -} - -#ifdef KOKKOS_ENABLE_CUDA -NGP_TEST_F(NgpCopyOwnedToShared, simpleVersion_noSyncToDeviceAfterwards) -{ - const double initValue = 0.0; - const int numStates = 1; - stk::mesh::Field & userField = get_meta().declare_field>(stk::topology::NODE_RANK, "userField", numStates); - stk::mesh::Field & goldValues = get_meta().declare_field>(stk::topology::NODE_RANK, "goldValues", numStates); - stk::mesh::put_field_on_mesh(userField, get_meta().universal_part(), &initValue); - stk::mesh::put_field_on_mesh(goldValues, get_meta().universal_part(), &initValue); - - setup_mesh("generated:1x1x4", stk::mesh::BulkData::NO_AUTO_AURA); - - const bool leaveSharedGoldValuesZero = true; - initialize_owned_shared_values(userField, goldValues, leaveSharedGoldValuesZero); - - ngp::Mesh ngpMesh(get_bulk()); - ngp::FieldManager fieldManager(get_bulk()); - ngp::Field & deviceUserField = fieldManager.get_field(userField.mesh_meta_data_ordinal()); - ngp::Field & deviceGoldValues = fieldManager.get_field(goldValues.mesh_meta_data_ordinal()); - - const bool finalSyncToDevice = false; - ngp::copy_owned_to_shared(get_bulk(), std::vector*>{&deviceUserField}, finalSyncToDevice); - - check_field_on_device(ngpMesh, deviceUserField, deviceGoldValues); -} -#endif - -NGP_TEST_F(NgpCommunicateFieldData, simpleVersion_takesGhosting) -{ - const double initValue = 0.0; - const int numStates = 1; - stk::mesh::Field & userField = get_meta().declare_field>(stk::topology::NODE_RANK, "userField", numStates); - stk::mesh::Field & goldValues = get_meta().declare_field>(stk::topology::NODE_RANK, "goldValues", numStates); - stk::mesh::put_field_on_mesh(userField, get_meta().universal_part(), &initValue); - stk::mesh::put_field_on_mesh(goldValues, get_meta().universal_part(), &initValue); - - setup_mesh("generated:1x1x4", stk::mesh::BulkData::NO_AUTO_AURA); - - initialize_owned_ghosted_values(userField, goldValues); - - ngp::Mesh ngpMesh(get_bulk()); - ngp::FieldManager fieldManager(get_bulk()); - ngp::Field & deviceUserField = fieldManager.get_field(userField.mesh_meta_data_ordinal()); - ngp::Field & deviceGoldValues = fieldManager.get_field(goldValues.mesh_meta_data_ordinal()); - - ngp::communicate_field_data(*get_bulk().ghostings()[stk::mesh::BulkData::AURA], std::vector*>{&deviceUserField}); - - check_field_on_device(ngpMesh, deviceUserField, deviceGoldValues); -} - -#ifdef KOKKOS_ENABLE_CUDA -NGP_TEST_F(NgpCommunicateFieldData, simpleVersion_takesGhosting_noSyncToDeviceAfterwards) -{ - const double initValue = 0.0; - const int numStates = 1; - stk::mesh::Field & userField = get_meta().declare_field>(stk::topology::NODE_RANK, "userField", numStates); - stk::mesh::Field & goldValues = get_meta().declare_field>(stk::topology::NODE_RANK, "goldValues", numStates); - stk::mesh::put_field_on_mesh(userField, get_meta().universal_part(), &initValue); - stk::mesh::put_field_on_mesh(goldValues, get_meta().universal_part(), &initValue); - - setup_mesh("generated:1x1x4", stk::mesh::BulkData::NO_AUTO_AURA); - - const bool leaveRecvGhostGoldValuesZero = true; - initialize_owned_ghosted_values(userField, goldValues, leaveRecvGhostGoldValuesZero); - - ngp::Mesh ngpMesh(get_bulk()); - ngp::FieldManager fieldManager(get_bulk()); - ngp::Field & deviceUserField = fieldManager.get_field(userField.mesh_meta_data_ordinal()); - ngp::Field & deviceGoldValues = fieldManager.get_field(goldValues.mesh_meta_data_ordinal()); - - const bool finalSyncToDevice = false; - ngp::communicate_field_data(*get_bulk().ghostings()[stk::mesh::BulkData::AURA], std::vector*>{&deviceUserField}, finalSyncToDevice); - - check_field_on_device(ngpMesh, deviceUserField, deviceGoldValues); -} -#endif - -NGP_TEST_F(NgpCommunicateFieldData, simpleVersion_takesBulkData) -{ - const double initValue = 0.0; - const int numStates = 1; - stk::mesh::Field & userField = get_meta().declare_field>(stk::topology::NODE_RANK, "userField", numStates); - stk::mesh::Field & goldValues = get_meta().declare_field>(stk::topology::NODE_RANK, "goldValues", numStates); - stk::mesh::put_field_on_mesh(userField, get_meta().universal_part(), &initValue); - stk::mesh::put_field_on_mesh(goldValues, get_meta().universal_part(), &initValue); - - setup_mesh("generated:1x1x4", stk::mesh::BulkData::NO_AUTO_AURA); - - initialize_owned_ghosted_values(userField, goldValues); - - ngp::Mesh ngpMesh(get_bulk()); - ngp::FieldManager fieldManager(get_bulk()); - ngp::Field & deviceUserField = fieldManager.get_field(userField.mesh_meta_data_ordinal()); - ngp::Field & deviceGoldValues = fieldManager.get_field(goldValues.mesh_meta_data_ordinal()); - - ngp::communicate_field_data(get_bulk(), std::vector*>{&deviceUserField}); - - check_field_on_device(ngpMesh, deviceUserField, deviceGoldValues); -} - -#ifdef KOKKOS_ENABLE_CUDA -NGP_TEST_F(NgpCommunicateFieldData, simpleVersion_takesBulkData_noSyncToDeviceAfterwards) -{ - const double initValue = 0.0; - const int numStates = 1; - stk::mesh::Field & userField = get_meta().declare_field>(stk::topology::NODE_RANK, "userField", numStates); - stk::mesh::Field & goldValues = get_meta().declare_field>(stk::topology::NODE_RANK, "goldValues", numStates); - stk::mesh::put_field_on_mesh(userField, get_meta().universal_part(), &initValue); - stk::mesh::put_field_on_mesh(goldValues, get_meta().universal_part(), &initValue); - - setup_mesh("generated:1x1x4", stk::mesh::BulkData::NO_AUTO_AURA); - - const bool leaveRecvGhostGoldValuesZero = true; - initialize_owned_ghosted_values(userField, goldValues, leaveRecvGhostGoldValuesZero); - - ngp::Mesh ngpMesh(get_bulk()); - ngp::FieldManager fieldManager(get_bulk()); - ngp::Field & deviceUserField = fieldManager.get_field(userField.mesh_meta_data_ordinal()); - ngp::Field & deviceGoldValues = fieldManager.get_field(goldValues.mesh_meta_data_ordinal()); - - const bool finalSyncToDevice = false; - ngp::communicate_field_data(get_bulk(), std::vector*>{&deviceUserField}, finalSyncToDevice); - - check_field_on_device(ngpMesh, deviceUserField, deviceGoldValues); -} -#endif - -NGP_TEST_F(NgpParallelSum, DeviceMPIVersion) -{ - const double initValue = 0.0; - const int numStates = 1; - stk::mesh::Field & userField = get_meta().declare_field>(stk::topology::NODE_RANK, "userField", numStates); - stk::mesh::Field & goldValues = get_meta().declare_field>(stk::topology::NODE_RANK, "goldValues", numStates); - stk::mesh::put_field_on_mesh(userField, get_meta().universal_part(), &initValue); - stk::mesh::put_field_on_mesh(goldValues, get_meta().universal_part(), &initValue); - - setup_mesh("generated:1x1x4", stk::mesh::BulkData::NO_AUTO_AURA); - - initialize_shared_values(userField, goldValues); - - ngp::Mesh ngpMesh(get_bulk()); - ngp::FieldManager fieldManager(get_bulk()); - ngp::Field & deviceUserField = fieldManager.get_field(userField.mesh_meta_data_ordinal()); - ngp::Field & deviceGoldValues = fieldManager.get_field(goldValues.mesh_meta_data_ordinal()); - - ngp::parallel_sum_device_mpi(ngpMesh, std::vector*>{&deviceUserField}); - - check_field_on_device(ngpMesh, deviceUserField, deviceGoldValues); -} - -NGP_TEST_F(NgpParallelSum, Performance) -{ - const std::string serialMeshName = "serialParallelSumMesh.g"; - if (stk::parallel_machine_rank(MPI_COMM_WORLD) == 0) - { - stk::mesh::MetaData meta(3); - stk::mesh::BulkData bulk(meta, MPI_COMM_SELF); - - std::string meshSpecDefault = "10x10x10"; - std::string meshSpec = stk::unit_test_util::get_command_line_option("-m", meshSpecDefault); - - stk::io::fill_mesh("generated:" + meshSpec, bulk); - stk::io::write_mesh(serialMeshName, bulk); - } - - const double initValue = 0.0; - const int numStates = 1; - stk::mesh::Field & userField = get_meta().declare_field>(stk::topology::NODE_RANK, "userField", numStates); - stk::mesh::Field & goldValues = get_meta().declare_field>(stk::topology::NODE_RANK, "goldValues", numStates); - stk::mesh::put_field_on_mesh(userField, get_meta().universal_part(), &initValue); - stk::mesh::put_field_on_mesh(goldValues, get_meta().universal_part(), &initValue); - - setup_empty_mesh(stk::mesh::BulkData::NO_AUTO_AURA); - stk::io::fill_mesh_with_auto_decomp(serialMeshName, get_bulk()); - - initialize_shared_values(userField, goldValues); - - ngp::Mesh ngpMesh(get_bulk()); - ngp::FieldManager fieldManager(get_bulk()); - ngp::Field & deviceUserField = fieldManager.get_field(userField.mesh_meta_data_ordinal()); - ngp::Field & deviceGoldValues = fieldManager.get_field(goldValues.mesh_meta_data_ordinal()); - - const bool useSimpleDefault = true; - bool useSimple = stk::unit_test_util::get_command_line_option("-s", useSimpleDefault); - - const int numIterationsDefault = 1; - int numIterations = stk::unit_test_util::get_command_line_option("-n", numIterationsDefault); - - for (int i = 0; i < numIterations; ++i) { - if (useSimple) { - const double startTime = stk::wall_time(); - ngp::parallel_sum(get_bulk(), std::vector*>{&deviceUserField}); - const double stopTime = stk::wall_time(); - const double localTime = stopTime - startTime; - double globalTime = 0; - stk::all_reduce_max(MPI_COMM_WORLD, &localTime, &globalTime, 1); - - if (get_bulk().parallel_rank() == 0) { - std::cout << "Time for simple parallel_sum(): " << globalTime << " s" << std::endl; - } - } - else { - const double startTime = stk::wall_time(); - ngp::parallel_sum_device_mpi(ngpMesh, std::vector*>{&deviceUserField}); - const double stopTime = stk::wall_time(); - const double localTime = stopTime - startTime; - double globalTime = 0; - stk::all_reduce_max(MPI_COMM_WORLD, &localTime, &globalTime, 1); - - if (get_bulk().parallel_rank() == 0) { - std::cout << "Time for NGP-aware parallel_sum(): " << globalTime << " s" << std::endl; - } - } - } - - if (numIterations == 1) { - check_field_on_device(ngpMesh, deviceUserField, deviceGoldValues); - } - - unlink(serialMeshName.c_str()); -} - -} diff --git a/packages/stk/stk_unit_tests/stk_ngp/NgpUnitTestUtils.hpp b/packages/stk/stk_unit_tests/stk_ngp/NgpUnitTestUtils.hpp deleted file mode 100644 index 7d62097a100c..000000000000 --- a/packages/stk/stk_unit_tests/stk_ngp/NgpUnitTestUtils.hpp +++ /dev/null @@ -1,24 +0,0 @@ -#ifndef _NgpUnitTestUtils_hpp_ -#define _NgpUnitTestUtils_hpp_ - -#include -#include - -namespace ngp_unit_test_utils { - -template -DualViewType create_dualview(const std::string& name, unsigned size) -{ - DualViewType result(name, size); - - Kokkos::deep_copy(result.h_view, 0); - result.template modify(); - result.template sync(); - - return result; -} - -} // ngp_unit_test_utils - -#endif - diff --git a/packages/stk/stk_unit_tests/stk_ngp/NpgMultistateFieldTest.cpp b/packages/stk/stk_unit_tests/stk_ngp/NpgMultistateFieldTest.cpp deleted file mode 100644 index 7978e67be041..000000000000 --- a/packages/stk/stk_unit_tests/stk_ngp/NpgMultistateFieldTest.cpp +++ /dev/null @@ -1,225 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - - -template -void assign_value_to_field(stk::mesh::BulkData &bulk, Field ngpField, double value) -{ - ngp::Mesh ngpMesh(bulk); - ngp::for_each_entity_run(ngpMesh, stk::topology::ELEM_RANK, bulk.mesh_meta_data().universal_part(), KOKKOS_LAMBDA(ngp::Mesh::MeshIndex entity) - { - ngpField.get(entity, 0) = value; - }); - ngpField.modify_on_device(); -} -void assign_value_to_statedfield(stk::mesh::BulkData &bulk, ngp::ConvenientMultistateField ngpStatedField, double value) -{ - ngp::Mesh ngpMesh(bulk); - ngp::for_each_entity_run(ngpMesh, stk::topology::ELEM_RANK, bulk.mesh_meta_data().universal_part(), KOKKOS_LAMBDA(ngp::Mesh::MeshIndex entity) - { - ngpStatedField.get_new(entity, 0) = value; - }); - ngpStatedField.modify_on_device(); -} - -namespace { - -class StatedFields : public stk::unit_test_util::MeshFixture -{ -public: - template - void test_field_has_value_on_device(const stk::mesh::BulkData& bulk, Field ngpField, double expectedValue) - { - ngp::Mesh ngpMesh(bulk); - ngp::for_each_entity_run(ngpMesh, stk::topology::ELEM_RANK, bulk.mesh_meta_data().universal_part(), KOKKOS_LAMBDA(ngp::Mesh::MeshIndex entity) - { - NGP_ThrowRequire(expectedValue == ngpField.get(entity, 0)); - }); - } - -protected: - ngp::ConvenientMultistateField create_field_with_num_states(unsigned numStates) - { - make_mesh_with_field(numStates); - return ngp::ConvenientMultistateField(get_bulk(), *stkField); - } - void make_mesh_with_field(unsigned numStates) - { - setup_empty_mesh(stk::mesh::BulkData::NO_AUTO_AURA); - stkField = &get_meta().declare_field>(stk::topology::ELEM_RANK, "myField", numStates); - double init = -1.0; - stk::mesh::put_field_on_mesh(*stkField, get_meta().universal_part(), &init); - stk::io::fill_mesh("generated:1x1x4", get_bulk()); - } - void test_n_states(unsigned numStates) - { - ngp::MultistateField ngpField = create_field_with_num_states(numStates); - EXPECT_EQ(numStates, ngpField.get_num_states()); - } - void verify_initial_value_set_per_state(ngp::MultistateField &ngpStatedField) - { - ngp::Field ngpField = ngpStatedField.get_field_new_state(); - test_field_has_value(ngpField, 0, -1.0); - for(unsigned stateCount = 1; stateCount < stkField->number_of_states(); stateCount++) - { - ngp::ConstField constNgpField = ngpStatedField.get_field_old_state(static_cast(stateCount)); - test_field_has_value(constNgpField, stateCount, -1.0); - } - } - void verify_can_assign_values_per_state(ngp::MultistateField &ngpStatedField) - { - assign_sequential_values_by_state(ngpStatedField); - expect_sequential_values_by_state(ngpStatedField); - } - template - void test_field_has_value(Field ngpField, unsigned stateCount, double expectedValue) - { - stk::mesh::EntityVector elems; - stk::mesh::get_entities(get_bulk(), stk::topology::ELEM_RANK, elems); - - stk::mesh::FieldBase * fieldOfState = stkField->field_state(static_cast(stateCount)); - - ngpField.sync_to_host(); // TODO: Check on the device instead - - for(stk::mesh::Entity elem : elems) - EXPECT_EQ(expectedValue, *static_cast(stk::mesh::field_data(*fieldOfState, elem))); - } - - stk::mesh::Field * stkField; - -private: - template - void expect_field_has_value(const Field &ngpField, unsigned stateCount) - { - double fieldValue = stateCount; - test_field_has_value(ngpField, stateCount, fieldValue); - } - - void assign_sequential_values_by_state(ngp::MultistateField& ngpStatedField) - { - assign_value_to_state_new(ngpStatedField, stkField->number_of_states() - 1); - for(unsigned stateCount = 1; stateCount < stkField->number_of_states(); stateCount++) - { - get_bulk().update_field_data_states(); - ngpStatedField.increment_state(); - assign_value_to_state_new(ngpStatedField, stkField->number_of_states() - stateCount - 1); - } - } - - void assign_value_to_state_new(ngp::MultistateField& ngpStatedField, double value) - { - ngp::Field ngpField = ngpStatedField.get_field_new_state(); - assign_value_to_field(get_bulk(), ngpField, value); - } - - void expect_sequential_values_by_state(ngp::MultistateField& ngpStatedField) - { - ngp::Field ngpField = ngpStatedField.get_field_new_state(); - expect_field_has_value(ngpField, 0); - for(unsigned stateCount = 1; stateCount < stkField->number_of_states(); stateCount++) - { - stk::mesh::FieldState oldState = static_cast(stateCount); - ngp::ConstField constNgpField = ngpStatedField.get_field_old_state(oldState); - expect_field_has_value(constNgpField, stateCount); - } - } -}; - -TEST_F(StatedFields, creatingFromSingleStateStkField_hasOneState) -{ - test_n_states(1); -} -TEST_F(StatedFields, creatingFromDualStateStkField_hasTwoStates) -{ - test_n_states(2); -} -TEST_F(StatedFields, creatingFromSixStateStkField_hasSixStates) -{ - test_n_states(6); -} -TEST_F(StatedFields, creatingFromStatedStkField_ngpStatedFieldHasSameValues) -{ - ngp::MultistateField ngpStatedField = create_field_with_num_states(3); - verify_initial_value_set_per_state(ngpStatedField); - verify_can_assign_values_per_state(ngpStatedField); -} -TEST_F(StatedFields, incrementingState_fieldsShiftDown) -{ - ngp::MultistateField ngpStatedField = create_field_with_num_states(3); - verify_can_assign_values_per_state(ngpStatedField); - - get_bulk().update_field_data_states(); - ngpStatedField.increment_state(); - - ngp::Field ngpField = ngpStatedField.get_field_new_state(); - test_field_has_value(ngpField, 0, stkField->number_of_states()-1); - for(unsigned stateCount = 1; stateCount < stkField->number_of_states(); stateCount++) - { - ngp::ConstField constNgpField = ngpStatedField.get_field_old_state(static_cast(stateCount)); - test_field_has_value(constNgpField, stateCount, stateCount-1); - } -} -TEST_F(StatedFields, field_swap) -{ - ngp::MultistateField ngpStatedField = create_field_with_num_states(2); - verify_can_assign_values_per_state(ngpStatedField); - - stk::mesh::FieldBase* stkField = get_meta().get_field(stk::topology::ELEM_RANK, "myField"); - - ngp::Field ngpFieldNew(get_bulk(), *(stkField->field_state(stk::mesh::StateNew))); - ngp::Field ngpFieldOld(get_bulk(), *(stkField->field_state(stk::mesh::StateOld))); - EXPECT_TRUE(ngpFieldNew.get_ordinal() != ngpFieldOld.get_ordinal()); - - test_field_has_value_on_device(get_bulk(), ngpFieldNew, 0); - test_field_has_value_on_device(get_bulk(), ngpFieldOld, 1); - - get_bulk().update_field_data_states(); - ngpFieldNew.swap(ngpFieldOld); - - test_field_has_value_on_device(get_bulk(), ngpFieldNew, 1); - test_field_has_value_on_device(get_bulk(), ngpFieldOld, 0); -} -TEST_F(StatedFields, gettingFieldData_direct) -{ - ngp::ConvenientMultistateField ngpStatedField = create_field_with_num_states(3); - verify_initial_value_set_per_state(ngpStatedField); - - assign_value_to_statedfield(get_bulk(), ngpStatedField, 2); - get_bulk().update_field_data_states(); - ngpStatedField.increment_state(); - assign_value_to_statedfield(get_bulk(), ngpStatedField, 1); - get_bulk().update_field_data_states(); - ngpStatedField.increment_state(); - assign_value_to_statedfield(get_bulk(), ngpStatedField, 0); - - ngp::Field ngpField = ngpStatedField.get_field_new_state(); - test_field_has_value(ngpField, 0, 0); - for(unsigned stateCount = 1; stateCount < stkField->number_of_states(); stateCount++) - { - ngp::ConstField constNgpField = ngpStatedField.get_field_old_state(static_cast(stateCount)); - test_field_has_value(constNgpField, stateCount, stateCount); - } -} -TEST_F(StatedFields, updateFromHostStkField) -{ - ngp::ConvenientMultistateField ngpStatedField = create_field_with_num_states(1); - verify_initial_value_set_per_state(ngpStatedField); - ngp::Field ngpField = ngpStatedField.get_field_new_state(); - - const double new_value = 999; - stk::mesh::field_fill(new_value, *stkField); - ngpField.modify_on_host(); - test_field_has_value(ngpField, 0, new_value); -} -} //namespace diff --git a/packages/stk/stk_unit_tests/stk_ngp/howToNgp.cpp b/packages/stk/stk_unit_tests/stk_ngp/howToNgp.cpp deleted file mode 100644 index 82674ca78d1c..000000000000 --- a/packages/stk/stk_unit_tests/stk_ngp/howToNgp.cpp +++ /dev/null @@ -1,1225 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "NgpUnitTestUtils.hpp" - -namespace { - -using IntDualViewType = Kokkos::DualView; - -void set_field_on_device_and_copy_back(stk::mesh::BulkData &bulk, - stk::mesh::EntityRank rank, - stk::mesh::Part &quadPart, - stk::mesh::Field &quadField, - double fieldVal) -{ - ngp::Field ngpQuadField(bulk, quadField); - EXPECT_EQ(quadField.mesh_meta_data_ordinal(), ngpQuadField.get_ordinal()); - - ngp::Mesh ngpMesh(bulk); - EXPECT_EQ(bulk.mesh_meta_data().spatial_dimension(), ngpMesh.get_spatial_dimension()); - - ngp::for_each_entity_run(ngpMesh, rank, quadPart, KOKKOS_LAMBDA(ngp::Mesh::MeshIndex entity) - { - ngpQuadField.get(entity, 0) = fieldVal; - }); - ngpQuadField.modify_on_device(); - ngpQuadField.sync_to_host(); -} - -class NgpHowTo : public stk::unit_test_util::MeshFixture {}; - -TEST_F(NgpHowTo, loopOverSubsetOfMesh) -{ - setup_empty_mesh(stk::mesh::BulkData::NO_AUTO_AURA); - stk::mesh::Part &shellQuadPart = get_meta().get_topology_root_part(stk::topology::SHELL_QUAD_4); - auto &shellQuadField = get_meta().declare_field>(stk::topology::ELEM_RANK, "myField"); - double init = 0.0; - stk::mesh::put_field_on_mesh(shellQuadField, shellQuadPart, &init); - std::string meshDesc = - "0,1,HEX_8,1,2,3,4,5,6,7,8\n\ - 0,2,SHELL_QUAD_4,5,6,7,8"; - stk::unit_test_util::setup_text_mesh(get_bulk(), meshDesc); - - double fieldVal = 13.0; - set_field_on_device_and_copy_back(get_bulk(), stk::topology::ELEM_RANK, shellQuadPart, shellQuadField, fieldVal); - - for(const stk::mesh::Bucket *bucket : get_bulk().get_buckets(stk::topology::ELEM_RANK, shellQuadPart)) - { - for(stk::mesh::Entity elem : *bucket) - { - EXPECT_EQ(fieldVal, *stk::mesh::field_data(shellQuadField, elem)); - } - } -} - -template -void test_mesh_up_to_date(stk::mesh::BulkData& bulk) -{ - //BEGINNgpMeshUpToDate - MeshType ngpMesh(bulk); - EXPECT_TRUE(ngpMesh.is_up_to_date()); - - bulk.modification_begin(); - bulk.modification_end(); - - if(std::is_same::value) { - EXPECT_TRUE(ngpMesh.is_up_to_date()); - } else { - EXPECT_FALSE(ngpMesh.is_up_to_date()); - } - //ENDNgpMeshUpToDate -} - -TEST_F(NgpHowTo, checkIfUpToDate) -{ - setup_empty_mesh(stk::mesh::BulkData::NO_AUTO_AURA); - stk::mesh::Part &shellQuadPart = get_meta().get_topology_root_part(stk::topology::SHELL_QUAD_4); - auto &shellQuadField = get_meta().declare_field>(stk::topology::ELEM_RANK, "myField"); - double init = 0.0; - stk::mesh::put_field_on_mesh(shellQuadField, shellQuadPart, &init); - std::string meshDesc = - "0,1,HEX_8,1,2,3,4,5,6,7,8\n\ - 0,2,SHELL_QUAD_4,5,6,7,8"; - stk::unit_test_util::setup_text_mesh(get_bulk(), meshDesc); - - test_mesh_up_to_date(get_bulk()); - test_mesh_up_to_date(get_bulk()); -} - -template -void test_field_on_subset_of_mesh(const stk::mesh::BulkData& bulk, const FieldType& field, - stk::mesh::PartOrdinal partThatHasField, - stk::mesh::PartOrdinal partThatDoesntHaveField) -{ - MeshType ngpMesh(bulk); - - typedef Kokkos::TeamPolicy::member_type TeamHandleType; - const auto& teamPolicy = Kokkos::TeamPolicy(ngpMesh.num_buckets(stk::topology::ELEM_RANK), Kokkos::AUTO); - - Kokkos::parallel_for(teamPolicy, KOKKOS_LAMBDA (const TeamHandleType& team) - { - const typename MeshType::BucketType& bucket = ngpMesh.get_bucket(stk::topology::ELEM_RANK, team.league_rank()); - unsigned numElems = bucket.size(); - - Kokkos::parallel_for(Kokkos::TeamThreadRange(team, 0u, numElems), [&] (const int& i) - { - stk::mesh::Entity elem = bucket[i]; - stk::mesh::FastMeshIndex elemIndex = ngpMesh.fast_mesh_index(elem); - if (bucket.member(partThatHasField)) { - NGP_ThrowRequire(field.get_num_components_per_entity(elemIndex) > 0); - } - if (bucket.member(partThatDoesntHaveField)) { - NGP_ThrowRequire(field.get_num_components_per_entity(elemIndex) == 0); - } - }); - }); -} - -TEST_F(NgpHowTo, fieldOnSubsetOfMesh) -{ - setup_empty_mesh(stk::mesh::BulkData::NO_AUTO_AURA); - stk::mesh::Part &shellQuadPart = get_meta().get_topology_root_part(stk::topology::SHELL_QUAD_4); - const stk::mesh::Part &hex8Part = get_meta().get_topology_root_part(stk::topology::HEX_8); - - auto &shellQuadField = get_meta().declare_field>(stk::topology::ELEM_RANK, "myField"); - double init = 0.0; - stk::mesh::put_field_on_mesh(shellQuadField, shellQuadPart, &init); - std::string meshDesc = - "0,1,HEX_8,1,2,3,4,5,6,7,8\n\ - 0,2,SHELL_QUAD_4,5,6,7,8"; - stk::unit_test_util::setup_text_mesh(get_bulk(), meshDesc); - - double fieldVal = 13.0; - set_field_on_device_and_copy_back(get_bulk(), stk::topology::ELEM_RANK, shellQuadPart, shellQuadField, fieldVal); - -#ifndef KOKKOS_ENABLE_CUDA - ngp::StkFieldAdapter ngpShellFieldAdapter(get_bulk(), shellQuadField); - - test_field_on_subset_of_mesh >( - get_bulk(), ngpShellFieldAdapter, - shellQuadPart.mesh_meta_data_ordinal(), hex8Part.mesh_meta_data_ordinal()); -#endif - - ngp::StaticField ngpShellField(get_bulk(), shellQuadField); - test_field_on_subset_of_mesh >( - get_bulk(), ngpShellField, - shellQuadPart.mesh_meta_data_ordinal(), hex8Part.mesh_meta_data_ordinal()); -} - -TEST_F(NgpHowTo, loopOverAllMeshNodes) -{ - setup_empty_mesh(stk::mesh::BulkData::NO_AUTO_AURA); - auto &field = get_meta().declare_field>(stk::topology::NODE_RANK, "myField"); - double init = 0.0; - stk::mesh::put_field_on_mesh(field, get_meta().universal_part(), &init); - std::string meshDesc = "0,1,HEX_8,1,2,3,4,5,6,7,8"; - stk::unit_test_util::setup_text_mesh(get_bulk(), meshDesc); - - double fieldVal = 13.0; - set_field_on_device_and_copy_back(get_bulk(), stk::topology::NODE_RANK, get_meta().universal_part(), field, fieldVal); - - for(const stk::mesh::Bucket *bucket : get_bulk().get_buckets(stk::topology::NODE_RANK, get_meta().universal_part())) - for(stk::mesh::Entity node : *bucket) - EXPECT_EQ(fieldVal, *stk::mesh::field_data(field, node)); -} - -TEST_F(NgpHowTo, loopOverMeshFaces) -{ - setup_empty_mesh(stk::mesh::BulkData::NO_AUTO_AURA); - stk::mesh::Part &facePart = get_meta().declare_part("facePart", stk::topology::FACE_RANK); - auto &field = get_meta().declare_field>(stk::topology::FACE_RANK, "myField"); - double init = 0.0; - stk::mesh::put_field_on_mesh(field, facePart, &init); - std::string meshDesc = "0,1,HEX_8,1,2,3,4,5,6,7,8"; - stk::unit_test_util::setup_text_mesh(get_bulk(), meshDesc); - - stk::mesh::create_exposed_block_boundary_sides(get_bulk(), get_meta().universal_part(), {&facePart}); - - double fieldVal = 13.0; - set_field_on_device_and_copy_back(get_bulk(), stk::topology::FACE_RANK, facePart, field, fieldVal); - - for(const stk::mesh::Bucket *bucket : get_bulk().get_buckets(stk::topology::FACE_RANK, get_meta().universal_part())) - for(stk::mesh::Entity node : *bucket) - EXPECT_EQ(fieldVal, *stk::mesh::field_data(field, node)); -} - -template -void run_connected_node_test(const stk::mesh::BulkData& bulk) -{ - stk::topology elemTopo = stk::topology::HEX_8; - - stk::mesh::EntityVector elems; - stk::mesh::get_entities(bulk, stk::topology::ELEM_RANK, elems); - EXPECT_EQ(1u, elems.size()); - stk::mesh::Entity node0 = bulk.begin_nodes(elems[0])[0]; - stk::mesh::Entity node7 = bulk.begin_nodes(elems[0])[7]; - - MeshType ngpMesh(bulk); - - typedef Kokkos::TeamPolicy::member_type TeamHandleType; - const auto& teamPolicy = Kokkos::TeamPolicy(ngpMesh.num_buckets(stk::topology::ELEM_RANK), Kokkos::AUTO); - - Kokkos::parallel_for(teamPolicy, KOKKOS_LAMBDA (const TeamHandleType& team) - { - const typename MeshType::BucketType& bucket = ngpMesh.get_bucket(stk::topology::ELEM_RANK, team.league_rank()); - unsigned numElems = bucket.size(); - - Kokkos::parallel_for(Kokkos::TeamThreadRange(team, 0u, numElems), [&] (const int& i) - { - stk::mesh::Entity elem = bucket[i]; - stk::mesh::FastMeshIndex elemIndex = ngpMesh.fast_mesh_index(elem); - typename MeshType::ConnectedNodes nodes = ngpMesh.get_nodes(stk::topology::ELEM_RANK, elemIndex); - stk::topology bucketTopo = bucket.topology(); - NGP_ThrowRequire(elemTopo == bucketTopo); - NGP_ThrowRequire(nodes.size() == bucketTopo.num_nodes()); - NGP_ThrowRequire(node0 == nodes[0]); - NGP_ThrowRequire(node7 == nodes[7]); - - stk::mesh::FastMeshIndex nodeIndex = ngpMesh.fast_mesh_index(nodes[0]); - typename MeshType::ConnectedEntities node0_elems = ngpMesh.get_elements(stk::topology::NODE_RANK, nodeIndex); - NGP_ThrowRequire(1 == node0_elems.size()); - NGP_ThrowRequire(node0_elems[0] == elem); - }); - }); -} - -TEST_F(NgpHowTo, loopOverElemNodes) -{ - if (stk::parallel_machine_size(MPI_COMM_WORLD) > 1) { - return; - } - setup_empty_mesh(stk::mesh::BulkData::NO_AUTO_AURA); - auto &field = get_meta().declare_field>(stk::topology::NODE_RANK, "myField"); - double init = 0.0; - stk::mesh::put_field_on_mesh(field, get_meta().universal_part(), &init); - std::string meshDesc = "0,1,HEX_8,1,2,3,4,5,6,7,8"; - stk::unit_test_util::setup_text_mesh(get_bulk(), meshDesc); - -#ifndef KOKKOS_ENABLE_CUDA - run_connected_node_test(get_bulk()); -#endif - run_connected_node_test(get_bulk()); -} - -template -void run_id_test(const stk::mesh::BulkData& bulk) -{ - MeshType ngpMesh(bulk); - - typedef Kokkos::TeamPolicy::member_type TeamHandleType; - const auto& teamPolicy = Kokkos::TeamPolicy(ngpMesh.num_buckets(stk::topology::ELEM_RANK), Kokkos::AUTO); - - Kokkos::parallel_for(teamPolicy, KOKKOS_LAMBDA (const TeamHandleType& team) - { - const typename MeshType::BucketType& bucket = ngpMesh.get_bucket(stk::topology::ELEM_RANK, team.league_rank()); - unsigned numElems = bucket.size(); - NGP_EXPECT_EQ(1u, numElems); - - Kokkos::parallel_for(Kokkos::TeamThreadRange(team, 0u, numElems), [&] (const int& i) - { - stk::mesh::Entity elem = bucket[i]; - NGP_EXPECT_EQ(1u, ngpMesh.identifier(elem)); - NGP_EXPECT_EQ(1u, ngpMesh.entity_key(elem).id()); - NGP_EXPECT_EQ(stk::topology::ELEM_RANK, ngpMesh.entity_rank(elem)); - NGP_EXPECT_EQ(stk::topology::ELEM_RANK, ngpMesh.entity_key(elem).rank()); - - stk::mesh::FastMeshIndex elemIndex = ngpMesh.fast_mesh_index(elem); - typename MeshType::ConnectedNodes nodes = ngpMesh.get_nodes(stk::topology::ELEM_RANK, elemIndex); - for (unsigned inode = 0; inode < nodes.size(); ++inode) { - NGP_EXPECT_EQ(inode+1, ngpMesh.identifier(nodes[inode])); - NGP_EXPECT_EQ(inode+1, ngpMesh.entity_key(nodes[inode]).id()); - NGP_EXPECT_EQ(stk::topology::NODE_RANK, ngpMesh.entity_rank(nodes[inode])); - NGP_EXPECT_EQ(stk::topology::NODE_RANK, ngpMesh.entity_key(nodes[inode]).rank()); - } - }); - }); -} - -NGP_TEST_F(NgpHowTo, checkElemNodeIds) -{ - if (stk::parallel_machine_size(MPI_COMM_WORLD) > 1) { - return; - } - setup_empty_mesh(stk::mesh::BulkData::NO_AUTO_AURA); - std::string meshDesc = "0,1,HEX_8,1,2,3,4,5,6,7,8"; - stk::unit_test_util::setup_text_mesh(get_bulk(), meshDesc); - -#ifndef KOKKOS_ENABLE_CUDA - run_id_test(get_bulk()); -#endif - run_id_test(get_bulk()); -} - -void run_connected_face_test(const stk::mesh::BulkData& bulk) -{ - stk::topology elemTopo = stk::topology::HEX_8; - - stk::mesh::EntityVector elems; - stk::mesh::get_entities(bulk, stk::topology::ELEM_RANK, elems); - EXPECT_EQ(1u, elems.size()); - stk::mesh::Entity face0 = bulk.begin_faces(elems[0])[0]; - stk::mesh::Entity face1 = bulk.begin_faces(elems[0])[1]; - stk::mesh::Entity face2 = bulk.begin_faces(elems[0])[2]; - stk::mesh::Entity face3 = bulk.begin_faces(elems[0])[3]; - stk::mesh::Entity face4 = bulk.begin_faces(elems[0])[4]; - stk::mesh::Entity face5 = bulk.begin_faces(elems[0])[5]; - - ngp::StaticMesh ngpMesh(bulk); - - typedef Kokkos::TeamPolicy::member_type TeamHandleType; - const auto& teamPolicy = Kokkos::TeamPolicy(ngpMesh.num_buckets(stk::topology::ELEM_RANK), Kokkos::AUTO); - - Kokkos::parallel_for(teamPolicy, KOKKOS_LAMBDA (const TeamHandleType& team) - { - const ngp::StaticMesh::BucketType& bucket = ngpMesh.get_bucket(stk::topology::ELEM_RANK, team.league_rank()); - unsigned numElems = bucket.size(); - - Kokkos::parallel_for(Kokkos::TeamThreadRange(team, 0u, numElems), [&] (const int& i) - { - stk::mesh::Entity elem = bucket[i]; - stk::mesh::FastMeshIndex elemIndex = ngpMesh.fast_mesh_index(elem); - ngp::StaticMesh::ConnectedEntities faces = ngpMesh.get_faces(stk::topology::ELEM_RANK, elemIndex); - stk::topology bucketTopo = bucket.topology(); - NGP_ThrowRequire(elemTopo == bucketTopo); - NGP_ThrowRequire(faces.size() == bucketTopo.num_faces()); - NGP_ThrowRequire(face0 == faces[0]); - NGP_ThrowRequire(face1 == faces[1]); - NGP_ThrowRequire(face2 == faces[2]); - NGP_ThrowRequire(face3 == faces[3]); - NGP_ThrowRequire(face4 == faces[4]); - NGP_ThrowRequire(face5 == faces[5]); - - ngp::StaticMesh::ConnectedEntities edges = ngpMesh.get_edges(stk::topology::ELEM_RANK, elemIndex); - NGP_ThrowRequire(0 == edges.size()); - - stk::mesh::FastMeshIndex faceIndex = ngpMesh.fast_mesh_index(faces[0]); - ngp::StaticMesh::ConnectedEntities face0_elems = ngpMesh.get_elements(stk::topology::FACE_RANK, faceIndex); - NGP_ThrowRequire(1 == face0_elems.size()); - NGP_ThrowRequire(face0_elems[0] == elem); - }); - }); -} - -TEST_F(NgpHowTo, loopOverElemFaces) -{ - if (stk::parallel_machine_size(MPI_COMM_WORLD) > 1) { - return; - } - auto &field = get_meta().declare_field>(stk::topology::NODE_RANK, "myField"); - double init = 0.0; - stk::mesh::put_field_on_mesh(field, get_meta().universal_part(), &init); - setup_mesh("generated:1x1x1|sideset:xXyYzZ", stk::mesh::BulkData::NO_AUTO_AURA); - - run_connected_face_test(get_bulk()); -} - -template -void run_connected_face_ordinal_test(const stk::mesh::BulkData& bulk) -{ - stk::topology elemTopo = stk::topology::HEX_8; - - stk::mesh::EntityVector elems; - stk::mesh::get_entities(bulk, stk::topology::ELEM_RANK, elems); - EXPECT_EQ(1u, elems.size()); - stk::mesh::ConnectivityOrdinal ordinal0 = bulk.begin_face_ordinals(elems[0])[0]; - stk::mesh::ConnectivityOrdinal ordinal1 = bulk.begin_face_ordinals(elems[0])[1]; - stk::mesh::ConnectivityOrdinal ordinal2 = bulk.begin_face_ordinals(elems[0])[2]; - stk::mesh::ConnectivityOrdinal ordinal3 = bulk.begin_face_ordinals(elems[0])[3]; - stk::mesh::ConnectivityOrdinal ordinal4 = bulk.begin_face_ordinals(elems[0])[4]; - stk::mesh::ConnectivityOrdinal ordinal5 = bulk.begin_face_ordinals(elems[0])[5]; - - MeshType ngpMesh(bulk); - - typedef Kokkos::TeamPolicy::member_type TeamHandleType; - const auto& teamPolicy = Kokkos::TeamPolicy(ngpMesh.num_buckets(stk::topology::ELEM_RANK), Kokkos::AUTO); - - Kokkos::parallel_for(teamPolicy, KOKKOS_LAMBDA (const TeamHandleType& team) - { - const typename MeshType::BucketType& bucket = ngpMesh.get_bucket(stk::topology::ELEM_RANK, team.league_rank()); - unsigned numElems = bucket.size(); - - Kokkos::parallel_for(Kokkos::TeamThreadRange(team, 0u, numElems), [&] (const int& i) - { - stk::mesh::Entity elem = bucket[i]; - stk::mesh::FastMeshIndex elemIndex = ngpMesh.fast_mesh_index(elem); - typename MeshType::ConnectedOrdinals ordinals = ngpMesh.get_face_ordinals(stk::topology::ELEM_RANK, elemIndex); - stk::topology bucketTopo = bucket.topology(); - NGP_ThrowRequire(elemTopo == bucketTopo); - NGP_ThrowRequire(ordinals.size() == bucketTopo.num_faces()); - NGP_ThrowRequire(ordinal0 == ordinals[0]); - NGP_ThrowRequire(ordinal1 == ordinals[1]); - NGP_ThrowRequire(ordinal2 == ordinals[2]); - NGP_ThrowRequire(ordinal3 == ordinals[3]); - NGP_ThrowRequire(ordinal4 == ordinals[4]); - NGP_ThrowRequire(ordinal5 == ordinals[5]); - - typename MeshType::ConnectedOrdinals edgeOrdinals = ngpMesh.get_edge_ordinals(stk::topology::ELEM_RANK, elemIndex); - NGP_ThrowRequire(0 == edgeOrdinals.size()); - - stk::mesh::Entity face = ngpMesh.get_faces(stk::topology::ELEM_RANK, elemIndex)[0]; - stk::mesh::FastMeshIndex faceIndex = ngpMesh.fast_mesh_index(face); - typename MeshType::ConnectedOrdinals face0_elemOrdinals = ngpMesh.get_element_ordinals(stk::topology::FACE_RANK, faceIndex); - NGP_ThrowRequire(1 == face0_elemOrdinals.size()); - NGP_ThrowRequire(face0_elemOrdinals[0] == ordinal0); - }); - }); -} - -TEST_F(NgpHowTo, loopOverElemFaceOrdinals) -{ - if (stk::parallel_machine_size(MPI_COMM_WORLD) > 1) { - return; - } - auto &field = get_meta().declare_field>(stk::topology::NODE_RANK, "myField"); - double init = 0.0; - stk::mesh::put_field_on_mesh(field, get_meta().universal_part(), &init); - setup_mesh("generated:1x1x1|sideset:xXyYzZ", stk::mesh::BulkData::NO_AUTO_AURA); - -#ifndef KOKKOS_ENABLE_CUDA - run_connected_face_ordinal_test(get_bulk()); -#endif - run_connected_face_ordinal_test(get_bulk()); -} - -constexpr unsigned numFacesPerHex = 6; -constexpr unsigned numEdgesPerHex = 12; -constexpr unsigned numHexes = 2; - -struct PermutationData { - stk::mesh::Permutation elemFacePermutations[numHexes][numFacesPerHex]; - stk::mesh::Permutation elemEdgePermutations[numHexes][numEdgesPerHex]; -}; - -template -void run_connected_face_permutation_test(const stk::mesh::BulkData& bulk) -{ - stk::topology elemTopo = stk::topology::HEX_8; - - stk::mesh::EntityVector elems; - stk::mesh::get_entities(bulk, stk::topology::ELEM_RANK, elems); - EXPECT_EQ(2u, elems.size()); - PermutationData p; - for(unsigned i=0; i::member_type TeamHandleType; - const auto& teamPolicy = Kokkos::TeamPolicy(ngpMesh.num_buckets(stk::topology::ELEM_RANK), Kokkos::AUTO); - - Kokkos::parallel_for(teamPolicy, KOKKOS_LAMBDA (const TeamHandleType& team) - { - const typename MeshType::BucketType& bucket = ngpMesh.get_bucket(stk::topology::ELEM_RANK, team.league_rank()); - unsigned numElems = bucket.size(); - - Kokkos::parallel_for(Kokkos::TeamThreadRange(team, 0u, numElems), [&] (const int& i) - { - stk::mesh::Entity elem = bucket[i]; - stk::mesh::FastMeshIndex elemIndex = ngpMesh.fast_mesh_index(elem); - typename MeshType::Permutations facePermutations = ngpMesh.get_face_permutations(stk::topology::ELEM_RANK, elemIndex); - typename MeshType::Permutations edgePermutations = ngpMesh.get_edge_permutations(stk::topology::ELEM_RANK, elemIndex); - stk::topology bucketTopo = bucket.topology(); - NGP_ThrowRequire(elemTopo == bucketTopo); - NGP_ThrowRequire(facePermutations.size() == bucketTopo.num_faces()); - NGP_ThrowRequire(edgePermutations.size() == bucketTopo.num_edges()); - - for(unsigned j=0; j 1) { - return; - } - stk::mesh::Part& sidePart = get_meta().declare_part("SidePart"); - auto &field = get_meta().declare_field>(stk::topology::NODE_RANK, "myField"); - double init = 0.0; - stk::mesh::put_field_on_mesh(field, get_meta().universal_part(), &init); - setup_mesh("generated:1x1x2|sideset:xXyYzZ", stk::mesh::BulkData::NO_AUTO_AURA); - stk::mesh::create_edges(get_bulk()); - bool connectFacesToEdges = true; - stk::mesh::create_all_sides(get_bulk(), get_meta().universal_part(), {&sidePart}, connectFacesToEdges); - -#ifndef KOKKOS_ENABLE_CUDA - run_connected_face_permutation_test(get_bulk()); -#endif - run_connected_face_permutation_test(get_bulk()); -} - -void run_another_connected_face_test(const stk::mesh::BulkData& bulk) -{ - stk::topology elemTopo = stk::topology::HEX_8; - - stk::mesh::EntityVector elems; - stk::mesh::get_entities(bulk, stk::topology::ELEM_RANK, elems); - EXPECT_EQ(4u, elems.size()); - - unsigned numResults = 2; - IntDualViewType result = ngp_unit_test_utils::create_dualview("result",numResults); - enum {ELEM_FACE_CHECK = 0, FACE_NODE_CHECK = 1}; - - ngp::Mesh ngpMesh(bulk); - - typedef Kokkos::TeamPolicy::member_type TeamHandleType; - const auto& teamPolicy = Kokkos::TeamPolicy(ngpMesh.num_buckets(stk::topology::ELEM_RANK), Kokkos::AUTO); - Kokkos::parallel_for(teamPolicy, KOKKOS_LAMBDA (const TeamHandleType& team) - { - const ngp::Mesh::BucketType& bucket = ngpMesh.get_bucket(stk::topology::ELEM_RANK, team.league_rank()); - unsigned numElems = bucket.size(); - Kokkos::parallel_for(Kokkos::TeamThreadRange(team, 0u, numElems), [&] (const int& i) - { - stk::mesh::Entity elem = bucket[i]; - stk::mesh::FastMeshIndex elemIndex = ngpMesh.fast_mesh_index(elem); - ngp::Mesh::ConnectedEntities faces = ngpMesh.get_faces(stk::topology::ELEM_RANK, elemIndex); - stk::topology bucketTopo = bucket.topology(); - NGP_ThrowRequire(elemTopo == bucketTopo); - int numFaces = faces.size(); - ngp::atomic_add(&result.d_view(ELEM_FACE_CHECK), numFaces); - - if (numFaces == 1) - { - stk::mesh::FastMeshIndex faceIndex = ngpMesh.fast_mesh_index(faces[0]); - ngp::Mesh::ConnectedEntities faceNodes = ngpMesh.get_connected_entities(stk::topology::FACE_RANK, faceIndex, stk::topology::NODE_RANK); - - unsigned faceOrdinal = 0; //when we add ordinals we can fix this. But for a hex all faces have the same topology anyway... - stk::topology faceTopo = elemTopo.face_topology(faceOrdinal); - - NGP_ThrowRequire(faceNodes.size() == faceTopo.num_nodes()); - ngp::atomic_add(&result.d_view(FACE_NODE_CHECK), 1); - } - }); - }); - - result.modify(); - result.sync(); - - EXPECT_EQ(2, result.h_view(ELEM_FACE_CHECK)); //expected 2 elements that had faces - EXPECT_EQ(2, result.h_view(FACE_NODE_CHECK)); //expected 2 faces that had nodes -} - -TEST_F(NgpHowTo, anotherElemFacesTest) -{ - if (stk::parallel_machine_size(MPI_COMM_WORLD) > 1) { - return; - } - auto &field = get_meta().declare_field>(stk::topology::NODE_RANK, "myField"); - double init = 0.0; - stk::mesh::put_field_on_mesh(field, get_meta().universal_part(), &init); - setup_mesh("generated:1x1x4|sideset:zZ", stk::mesh::BulkData::NO_AUTO_AURA); - - run_another_connected_face_test(get_bulk()); -} - -void test_view_of_fields(const stk::mesh::BulkData& bulk, - stk::mesh::Field& field1, - stk::mesh::Field& field2) -{ -#ifdef KOKKOS_ENABLE_CUDA - using DeviceSpace = Kokkos::CudaSpace; -#else - using DeviceSpace = Kokkos::HostSpace; -#endif - using FieldViewType = Kokkos::View*,DeviceSpace>; - - FieldViewType fields(Kokkos::ViewAllocateWithoutInitializing("fields"),2); - FieldViewType::HostMirror hostFields = Kokkos::create_mirror_view(fields); - - Kokkos::parallel_for(2, KOKKOS_LAMBDA(const unsigned& i) - { - new (&fields(i)) ngp::StaticField(); - }); - - hostFields(0) = ngp::StaticField(bulk, field1); - hostFields(1) = ngp::StaticField(bulk, field2); - - Kokkos::deep_copy(fields, hostFields); - - unsigned numResults = 2; - IntDualViewType result = ngp_unit_test_utils::create_dualview("result",numResults); - - Kokkos::parallel_for(2, KOKKOS_LAMBDA(const unsigned& i) - { - result.d_view(i) = fields(i).get_ordinal() == i ? 1 : 0; - }); - - result.modify(); - result.sync(); - - EXPECT_EQ(1, result.h_view(0)); - EXPECT_EQ(1, result.h_view(1)); -} - -// Disabled because ngp::Field now contains a Kokkos::DualView, which is not -// properly constructible on the device in the old version of Kokkos that we -// currently have in Sierra. Versions after at least 2018-12-10 work fine, so -// this can be re-enabled after our next Trilinos pull. -TEST_F(NgpHowTo, DISABLED_viewOfFields) -{ - auto &field1 = get_meta().declare_field>(stk::topology::NODE_RANK, "myField1"); - auto &field2 = get_meta().declare_field>(stk::topology::NODE_RANK, "myField2"); - double init = 0.0; - stk::mesh::put_field_on_mesh(field1, get_meta().universal_part(), &init); - stk::mesh::put_field_on_mesh(field2, get_meta().universal_part(), &init); - setup_mesh("generated:1x1x4|sideset:zZ", stk::mesh::BulkData::NO_AUTO_AURA); - - test_view_of_fields(get_bulk(), field1, field2); -} - -void test_ngp_mesh_construction(const stk::mesh::BulkData& bulk) -{ - size_t numHostElemBuckets = bulk.buckets(stk::topology::ELEM_RANK).size(); - std::vector counts(bulk.mesh_meta_data().entity_rank_count(), 0); - stk::mesh::count_entities(bulk.mesh_meta_data().locally_owned_part(), bulk, counts); - size_t numElements = counts[stk::topology::ELEM_RANK]; - - double startTime = stk::wall_time(); - - ngp::StaticMesh ngpMesh(bulk); - - double elapsedTime = stk::wall_time() - startTime; - std::cout << "Time to construct ngp::StaticMesh with "< 1 && exodusFileName == "generated:20x20x20|sideset:xXyYzZ") { - std::cout<<"NgpHowTo.ngpMeshConstruction Only runs in parallel if user specified a mesh." << std::endl; - return; - } - - std::cout << "Using mesh: " << exodusFileName << std::endl; - - setup_empty_mesh(stk::mesh::BulkData::AUTO_AURA); - - stk::mesh::MetaData& meta = get_meta(); - stk::mesh::Part& boundaryPart = meta.declare_part("boundary"); - - stk::io::fill_mesh(exodusFileName, get_bulk()); - - stk::mesh::create_exposed_block_boundary_sides(get_bulk(), meta.universal_part(), {&boundaryPart}); - stk::mesh::create_interior_block_boundary_sides(get_bulk(), meta.universal_part(), {&boundaryPart}); - - test_ngp_mesh_construction(get_bulk()); -} - -unsigned count_num_elems(ngp::Mesh ngpMesh, - ngp::Field ngpField, - stk::mesh::EntityRank rank, - stk::mesh::Part &part) -{ -#ifdef KOKKOS_ENABLE_CUDA - using DeviceSpace = Kokkos::CudaSpace; -#else - using DeviceSpace = Kokkos::HostSpace; -#endif - Kokkos::View numElems("numElems", 1); - ngp::for_each_entity_run(ngpMesh, rank, part, KOKKOS_LAMBDA(ngp::Mesh::MeshIndex entity) - { - unsigned fieldValue = static_cast(ngpField.get(entity, 0)); - Kokkos::atomic_add(&numElems(0), fieldValue); - }); - Kokkos::View::HostMirror numElemsHost = - Kokkos::create_mirror_view(numElems); - Kokkos::deep_copy(numElemsHost, numElems); - return numElemsHost(0); -} - -void set_num_elems_in_field_on_device_and_copy_back(stk::mesh::BulkData &bulk, - stk::mesh::Part &part, - stk::mesh::Field &field) -{ - ngp::Field ngpField(bulk, field); - ngp::Mesh ngpMesh(bulk); - unsigned numElems = count_num_elems(ngpMesh, ngpField, field.entity_rank(), part); - ngp::for_each_entity_run(ngpMesh, field.entity_rank(), part, KOKKOS_LAMBDA(ngp::Mesh::MeshIndex entity) - { - ngpField.get(entity, 0) = numElems; - }); - ngpField.modify_on_device(); - ngpField.sync_to_host(); -} - -TEST_F(NgpHowTo, exerciseAura) -{ - setup_empty_mesh(stk::mesh::BulkData::AUTO_AURA); - auto &field = get_meta().declare_field>(stk::topology::ELEM_RANK, "myField"); - int init = 1; - stk::mesh::put_field_on_mesh(field, get_meta().universal_part(), &init); - std::string meshDesc; - if (get_parallel_size() == 1) { - meshDesc = "0,1,HEX_8,1,2,3,4,5,6,7,8\n" - "0,2,HEX_8,5,6,7,8,9,10,11,12"; - } - else { - meshDesc = "0,1,HEX_8,1,2,3,4,5,6,7,8\n" - "1,2,HEX_8,5,6,7,8,9,10,11,12"; - } - stk::unit_test_util::setup_text_mesh(get_bulk(), meshDesc); - - set_num_elems_in_field_on_device_and_copy_back(get_bulk(), get_meta().universal_part(), field); - - int expectedNumElemsPerProc = 2; - for(const stk::mesh::Bucket *bucket : get_bulk().get_buckets(stk::topology::ELEM_RANK, get_meta().universal_part())) - for(stk::mesh::Entity elem : *bucket) - EXPECT_EQ(expectedNumElemsPerProc, *stk::mesh::field_data(field, elem)); -} - -template -stk::mesh::Field &create_field_with_num_states_and_init(stk::mesh::MetaData &meta, const std::string & fieldName, int numStates, DataType init) -{ - auto &field = meta.declare_field>(stk::topology::ELEM_RANK, fieldName, numStates); - stk::mesh::put_field_on_mesh(field, meta.universal_part(), &init); - return field; -} - -template -stk::mesh::Field &create_vector_field_with_num_states_and_init(stk::mesh::MetaData &meta, - const std::string & fieldName, - int numStates, - int fieldDimension, - DataType* init) -{ - auto &field = meta.declare_field>(stk::topology::ELEM_RANK, fieldName, numStates); - stk::mesh::put_field_on_mesh(field, meta.universal_part(), fieldDimension, init); - return field; -} - -stk::mesh::Field &create_field(stk::mesh::MetaData &meta) -{ - int numStates = 1; - int initialValue = -1; - return create_field_with_num_states_and_init(meta, "myField", numStates, initialValue); -} - -void verify_state_new_has_value(stk::mesh::BulkData &bulk, - const ngp::Mesh& ngpMesh, - stk::mesh::Field& field, - ngp::MultistateField &ngpMultistateField, - int np1Value) -{ - ngpMultistateField.sync_to_host(); - - for(const stk::mesh::Bucket* bucket : bulk.buckets(stk::topology::ELEM_RANK)) { - for(stk::mesh::Entity elem : *bucket) { - EXPECT_EQ(np1Value, *static_cast(stk::mesh::field_data(*field.field_state(stk::mesh::StateNP1), elem))); - } - } -} - -void set_new_as_old_plus_one_on_device(ngp::Mesh &ngpMesh, - stk::mesh::EntityRank rank, - stk::mesh::Selector sel, - ngp::MultistateField &ngpMultistateField) -{ - ngpMultistateField.sync_to_device(); - int component = 0; - ngp::for_each_entity_run(ngpMesh, rank, sel, KOKKOS_LAMBDA(ngp::Mesh::MeshIndex entity) - { - ngp::ConstField stateNField = ngpMultistateField.get_field_old_state(stk::mesh::StateN); - ngp::Field stateNp1Field = ngpMultistateField.get_field_new_state(); - stateNp1Field.get(entity, component) = stateNField.get(entity, component) + 1; - }); - ngpMultistateField.modify_on_device(); -} - -TEST_F(NgpHowTo, useMultistateFields) -{ - int numStates = 2; - int initialValue = 0; - stk::mesh::Field &stkField = create_field_with_num_states_and_init(get_meta(), "myField", numStates, initialValue); - setup_mesh("generated:1x1x4", stk::mesh::BulkData::AUTO_AURA); - - ngp::MultistateField ngpMultistateField(get_bulk(), stkField); - ngp::Mesh ngpMesh(get_bulk()); - - set_new_as_old_plus_one_on_device(ngpMesh, stk::topology::ELEM_RANK, get_meta().universal_part(), ngpMultistateField); - int newStateValue = 1; - verify_state_new_has_value(get_bulk(), ngpMesh, stkField, ngpMultistateField, newStateValue); - - get_bulk().update_field_data_states(); - ngpMultistateField.increment_state(); - - set_new_as_old_plus_one_on_device(ngpMesh, stk::topology::ELEM_RANK, get_meta().universal_part(), ngpMultistateField); - newStateValue = 2; - verify_state_new_has_value(get_bulk(), ngpMesh, stkField, ngpMultistateField, newStateValue); -} - -void set_new_as_old_plus_one_in_convenient_field_on_device(ngp::Mesh &ngpMesh, - stk::mesh::EntityRank rank, - stk::mesh::Selector sel, - ngp::ConvenientMultistateField &ngpMultistateField) -{ - int component = 0; - ngp::for_each_entity_run(ngpMesh, rank, sel, KOKKOS_LAMBDA(ngp::Mesh::MeshIndex entity) - { - ngpMultistateField.get_new(entity, component) = ngpMultistateField.get_old(stk::mesh::StateOld, entity, component) + 1; - }); - ngpMultistateField.modify_on_device(); -} - -TEST_F(NgpHowTo, useConvenientMultistateFields) -{ - int numStates = 2; - int initialValue = 0; - stk::mesh::Field &stkField = create_field_with_num_states_and_init(get_meta(), "myField", numStates, initialValue); - setup_mesh("generated:1x1x4", stk::mesh::BulkData::AUTO_AURA); - - ngp::ConvenientMultistateField ngpMultistateField(get_bulk(), stkField); - ngp::Mesh ngpMesh(get_bulk()); - - set_new_as_old_plus_one_in_convenient_field_on_device(ngpMesh, stk::topology::ELEM_RANK, get_meta().universal_part(), ngpMultistateField); - int newStateValue = 1; - verify_state_new_has_value(get_bulk(), ngpMesh, stkField, ngpMultistateField, newStateValue); - - get_bulk().update_field_data_states(); - ngpMultistateField.increment_state(); - - set_new_as_old_plus_one_in_convenient_field_on_device(ngpMesh, stk::topology::ELEM_RANK, get_meta().universal_part(), ngpMultistateField); - newStateValue = 2; - verify_state_new_has_value(get_bulk(), ngpMesh, stkField, ngpMultistateField, newStateValue); -} - -TEST_F(NgpHowTo, setAllScalarFieldValues) -{ - int numStates = 2; - double initialValue = 0.0; - stk::mesh::Field &stkField = create_field_with_num_states_and_init(get_meta(), "myField", numStates, initialValue); - setup_mesh("generated:1x1x4", stk::mesh::BulkData::AUTO_AURA); - - ngp::Field ngpField(get_bulk(), stkField); - ngp::Mesh ngpMesh(get_bulk()); - - double fieldVal = 1.0; - ngpField.set_all(ngpMesh, fieldVal); - - double expectedSum = 4.0; - double sum = ngp::get_field_sum(ngpMesh, ngpField, get_meta().universal_part()); - EXPECT_NEAR(expectedSum, sum, 1e-14); -} - -TEST_F(NgpHowTo, setAllVectorFieldValues) -{ - int numStates = 2; - double initialValue[] = {0.0, 0.0, 0.0}; - int fieldDimension = 3; - auto& stkField = create_vector_field_with_num_states_and_init(get_meta(), - "myField", - numStates, - fieldDimension, - initialValue); - setup_mesh("generated:1x1x4", stk::mesh::BulkData::AUTO_AURA); - - ngp::Field ngpField(get_bulk(), stkField); - ngp::Mesh ngpMesh(get_bulk()); - - double fieldVal = 1.0; - ngpField.set_all(ngpMesh, fieldVal); - - double expectedSum = fieldDimension*stk::mesh::count_selected_entities(get_meta().locally_owned_part(), - get_bulk().buckets(stk::topology::ELEM_RANK)); - double sum = ngp::get_field_sum(ngpMesh, ngpField, get_meta().locally_owned_part()); - EXPECT_NEAR(expectedSum, sum, 1e-14); -} - - -class NgpReduceHowTo : public stk::unit_test_util::MeshFixture -{ -protected: - NgpReduceHowTo() - { - stk::mesh::Field &elemField = create_field(get_meta()); - setup_mesh("generated:1x1x4", stk::mesh::BulkData::AUTO_AURA); - stk::mesh::EntityVector elems; - stk::mesh::get_entities(get_bulk(), stk::topology::ELEM_RANK, elems); - for(stk::mesh::Entity elem : elems) - { - int *fieldData = stk::mesh::field_data(elemField, elem); - fieldData[0] = get_bulk().identifier(elem); - } - ngpMesh = ngp::Mesh(get_bulk()); - ngpElemField = ngp::StaticField(get_bulk(), elemField); - } - int get_num_elems() - { - return stk::mesh::count_selected_entities(get_meta().universal_part(), get_bulk().buckets(stk::topology::ELEM_RANK)); - } - ngp::Mesh ngpMesh; - ngp::StaticField ngpElemField; -}; - -TEST_F(NgpReduceHowTo, getMinFieldValue) -{ - int expectedMinVal = 1; - int actualMinVal = ngp::get_field_min(ngpMesh, ngpElemField, get_bulk().mesh_meta_data().universal_part()); - EXPECT_EQ(expectedMinVal, actualMinVal); -} - -TEST_F(NgpReduceHowTo, getMaxFieldValue) -{ - int max_val = ngp::get_field_max(ngpMesh, ngpElemField, get_bulk().mesh_meta_data().universal_part()); - EXPECT_EQ(get_num_elems(), max_val); -} - -TEST_F(NgpReduceHowTo, getSumFieldValue) -{ - int numElems = get_num_elems(); - int expectedSum = numElems*(numElems+1)/2; - int sum_val = ngp::get_field_sum(ngpMesh, ngpElemField, get_bulk().mesh_meta_data().universal_part()); - EXPECT_EQ(expectedSum, sum_val); -} -TEST_F(NgpReduceHowTo, minMaxPairWiseReduction) -{ - Kokkos::MinMaxScalar minMaxVal; - Kokkos::MinMax minMax(minMaxVal); - ngp::get_field_reduction - (ngpMesh, ngpElemField, get_bulk().mesh_meta_data().universal_part(), minMax); - EXPECT_EQ(1, minMaxVal.min_val); - EXPECT_EQ(get_num_elems(), minMaxVal.max_val); -} -TEST_F(NgpReduceHowTo, minLocReduction) -{ - int expectedMin = 1; - int expectedMinLoc = 0; - Kokkos::ValLocScalar minLocVal; - Kokkos::MinLoc minLoc (minLocVal); - ngp::get_field_reduction - (ngpMesh, ngpElemField, get_bulk().mesh_meta_data().universal_part(), minLoc); - EXPECT_EQ(expectedMin, minLocVal.val); - EXPECT_EQ(expectedMinLoc, minLocVal.loc); -} -TEST_F(NgpReduceHowTo, minMaxLocReduction) -{ - int expectedMin = 1; - int expectedMinLoc = 0; - int expectedMax = get_num_elems(); - int expectedMaxLoc = 3; - Kokkos::MinMaxLocScalar minMaxLocVal; - Kokkos::MinMaxLoc minMaxLoc (minMaxLocVal); - ngp::get_field_reduction - (ngpMesh, ngpElemField, get_bulk().mesh_meta_data().universal_part(), minMaxLoc); - EXPECT_EQ(expectedMin, minMaxLocVal.min_val); - EXPECT_EQ(expectedMinLoc, minMaxLocVal.min_loc); - EXPECT_EQ(expectedMax, minMaxLocVal.max_val); - EXPECT_EQ(expectedMaxLoc, minMaxLocVal.max_loc); -} -TEST_F(NgpReduceHowTo, minMaxLocReductionThroughAccessor) -{ - int expectedMin = 1; - int expectedMinLoc = 0; - int expectedMax = get_num_elems(); - int expectedMaxLoc = 3; - Kokkos::MinMaxLocScalar minMaxLocVal; - Kokkos::MinMaxLoc minMaxLoc (minMaxLocVal); - ngp::FieldAccessFunctor> - accessor(ngpElemField, minMaxLoc); - ngp::get_field_reduction - (ngpMesh, get_bulk().mesh_meta_data().universal_part(), accessor); - EXPECT_EQ(expectedMin, minMaxLocVal.min_val); - EXPECT_EQ(expectedMinLoc, minMaxLocVal.min_loc); - EXPECT_EQ(expectedMax, minMaxLocVal.max_val); - EXPECT_EQ(expectedMaxLoc, minMaxLocVal.max_loc); -} - -template -void fill_field_on_device(stk::mesh::BulkData & bulk, - ngp::Mesh &mesh, - ngp::FieldManager &fieldManager, - unsigned fieldOrdinal, - T fieldValue) -{ - ngp::Field & field = fieldManager.get_field(fieldOrdinal); - - ngp::for_each_entity_run(mesh, stk::topology::ELEM_RANK, bulk.mesh_meta_data().locally_owned_part(), KOKKOS_LAMBDA(ngp::Mesh::MeshIndex entity) - { - field.get(entity, 0) = fieldValue; - }); - field.modify_on_device(); -} - -template -void check_field_on_device(stk::mesh::BulkData & bulk, - ngp::Mesh &mesh, - ngp::FieldManager &fieldManager, - unsigned fieldOrdinal, - T expectedFieldValue) -{ - ngp::Field & field = fieldManager.get_field(fieldOrdinal); - field.sync_to_device(); - - ngp::for_each_entity_run(mesh, stk::topology::ELEM_RANK, bulk.mesh_meta_data().locally_owned_part(), KOKKOS_LAMBDA(ngp::Mesh::MeshIndex entity) - { - NGP_EXPECT_EQ(field.get(entity, 0), expectedFieldValue); - }); -} - -template -void check_field_on_host(const stk::mesh::BulkData & bulk, - unsigned fieldOrdinal, - T expectedFieldValue) -{ - const stk::mesh::MetaData& meta = bulk.mesh_meta_data(); - const stk::mesh::FieldBase* field = meta.get_fields()[fieldOrdinal]; - - const stk::mesh::BucketVector& buckets = bulk.get_buckets(stk::topology::ELEM_RANK, meta.locally_owned_part()); - for(const stk::mesh::Bucket* bptr : buckets) { - for(stk::mesh::Entity elem : *bptr) { - const double* fieldData = static_cast(stk::mesh::field_data(*field, elem)); - EXPECT_EQ(*fieldData, expectedFieldValue); - } - } -} - -NGP_TEST_F(NgpHowTo, ReuseNgpField) -{ - int numStates = 1; - stk::mesh::Field &shortStkField = create_field_with_num_states_and_init(get_meta(), "field01", numStates, (short)0); - stk::mesh::Field &ushortStkField = create_field_with_num_states_and_init(get_meta(), "field02", numStates, (unsigned short)0); - stk::mesh::Field &intStkField = create_field_with_num_states_and_init(get_meta(), "field03", numStates, (int)0); - stk::mesh::Field &uintStkField = create_field_with_num_states_and_init(get_meta(), "field04", numStates, (unsigned int)0); - stk::mesh::Field &longStkField = create_field_with_num_states_and_init(get_meta(), "field05", numStates, (long)0); - stk::mesh::Field &ulongStkField = create_field_with_num_states_and_init(get_meta(), "field06", numStates, (unsigned long)0); - stk::mesh::Field &longLongStkField = create_field_with_num_states_and_init(get_meta(), "field07", numStates, (long long)0); - stk::mesh::Field &ulongLongStkField = create_field_with_num_states_and_init(get_meta(), "field08", numStates, (unsigned long long)0); - stk::mesh::Field &floatStkField = create_field_with_num_states_and_init(get_meta(), "field09", numStates, (float)0); - stk::mesh::Field &doubleStkField = create_field_with_num_states_and_init(get_meta(), "field10", numStates, (double)0); - - setup_mesh("generated:1x1x4", stk::mesh::BulkData::AUTO_AURA); - - { - ngp::Mesh ngpMesh(get_bulk()); - ngp::FieldManager fieldManager(get_bulk()); - - fill_field_on_device(get_bulk(), ngpMesh, fieldManager, shortStkField.mesh_meta_data_ordinal(), (short)42); - check_field_on_device(get_bulk(), ngpMesh, fieldManager, shortStkField.mesh_meta_data_ordinal(), (short)42); - - fill_field_on_device(get_bulk(), ngpMesh, fieldManager, ushortStkField.mesh_meta_data_ordinal(), (unsigned short)43); - check_field_on_device(get_bulk(), ngpMesh, fieldManager, ushortStkField.mesh_meta_data_ordinal(), (unsigned short)43); - - fill_field_on_device(get_bulk(), ngpMesh, fieldManager, intStkField.mesh_meta_data_ordinal(), (int)44); - check_field_on_device(get_bulk(), ngpMesh, fieldManager, intStkField.mesh_meta_data_ordinal(), (int)44); - - fill_field_on_device(get_bulk(), ngpMesh, fieldManager, uintStkField.mesh_meta_data_ordinal(), (unsigned int)45); - check_field_on_device(get_bulk(), ngpMesh, fieldManager, uintStkField.mesh_meta_data_ordinal(), (unsigned int)45); - - fill_field_on_device(get_bulk(), ngpMesh, fieldManager, longStkField.mesh_meta_data_ordinal(), (long)46); - check_field_on_device(get_bulk(), ngpMesh, fieldManager, longStkField.mesh_meta_data_ordinal(), (long)46); - - fill_field_on_device(get_bulk(), ngpMesh, fieldManager, ulongStkField.mesh_meta_data_ordinal(), (unsigned long)47); - check_field_on_device(get_bulk(), ngpMesh, fieldManager, ulongStkField.mesh_meta_data_ordinal(), (unsigned long)47); - - fill_field_on_device(get_bulk(), ngpMesh, fieldManager, longLongStkField.mesh_meta_data_ordinal(), (long long)48); - check_field_on_device(get_bulk(), ngpMesh, fieldManager, longLongStkField.mesh_meta_data_ordinal(), (long long)48); - - fill_field_on_device(get_bulk(), ngpMesh, fieldManager, ulongLongStkField.mesh_meta_data_ordinal(), (unsigned long long)49); - check_field_on_device(get_bulk(), ngpMesh, fieldManager, ulongLongStkField.mesh_meta_data_ordinal(), (unsigned long long)49); - - fill_field_on_device(get_bulk(), ngpMesh, fieldManager, floatStkField.mesh_meta_data_ordinal(), (float)3.14); - check_field_on_device(get_bulk(), ngpMesh, fieldManager, floatStkField.mesh_meta_data_ordinal(), (float)3.14); - - fill_field_on_device(get_bulk(), ngpMesh, fieldManager, doubleStkField.mesh_meta_data_ordinal(), (double)3.141); - check_field_on_device(get_bulk(), ngpMesh, fieldManager, doubleStkField.mesh_meta_data_ordinal(), (double)3.141); - } - -//now check field on host to see if FieldManager::clear_fields() (called by FieldManager dtor) -//sync'd device fields back to host. -//Only do this check if cuda, because if not cuda then host == device. -#ifdef KOKKOS_ENABLE_CUDA - check_field_on_host(get_bulk(), doubleStkField.mesh_meta_data_ordinal(), (double)3.141); -#endif -} - -NGP_TEST_F(NgpHowTo, ReuseNgpFieldNewFieldManager) -{ - int numStates = 1; - double initialValue = 0.0; - stk::mesh::Field & stkField = create_field_with_num_states_and_init(get_meta(), "field01", numStates, initialValue); - - setup_mesh("generated:1x1x4", stk::mesh::BulkData::AUTO_AURA); - - ngp::Mesh ngpMesh(get_bulk()); - ngp::FieldManager fieldManager(get_bulk()); - - double specialValue = 42.0; - fill_field_on_device(get_bulk(), ngpMesh, fieldManager, stkField.mesh_meta_data_ordinal(), specialValue); - check_field_on_device(get_bulk(), ngpMesh, fieldManager, stkField.mesh_meta_data_ordinal(), specialValue); - - // Reassign the FieldManager, which will blow away the internal ngp::Field instances - fieldManager = ngp::FieldManager(get_bulk()); - - //When the ngp::Field instances are blown away, their field-data values should first - //be sync'd back to host. Which means that when the other field-manager re-copies the - //field to device, it should still have the same values that were set on device above... - const double expectedValue = specialValue; - - check_field_on_device(get_bulk(), ngpMesh, fieldManager, stkField.mesh_meta_data_ordinal(), expectedValue); -} - -NGP_TEST_F(NgpHowTo, CopyAndDestroyFieldManager) -{ - int numStates = 1; - double initialValue = 0.0; - stk::mesh::Field & stkField = create_field_with_num_states_and_init(get_meta(), "field01", numStates, initialValue); - - setup_mesh("generated:1x1x4", stk::mesh::BulkData::AUTO_AURA); - - ngp::Mesh ngpMesh(get_bulk()); - ngp::FieldManager fieldManager(get_bulk()); - ngp::Field & ngpField = fieldManager.get_field(stkField.mesh_meta_data_ordinal()); - stk::mesh::EntityRank rank = ngpField.get_rank(); - - { - ngp::FieldManager fieldManagerCopy(fieldManager); - ngp::Field & ngpFieldCopy = fieldManagerCopy.get_field(stkField.mesh_meta_data_ordinal()); - EXPECT_EQ(rank, ngpField.get_rank()); - EXPECT_EQ(rank, ngpFieldCopy.get_rank()); - } - EXPECT_EQ(rank, ngpField.get_rank()); -} - - -template -void run_part_membership_test(const stk::mesh::BulkData& bulk, stk::mesh::PartOrdinal partOrdinal) -{ - MeshType ngpMesh(bulk); - - typedef Kokkos::TeamPolicy::member_type TeamHandleType; - const auto& teamPolicy = Kokkos::TeamPolicy(ngpMesh.num_buckets(stk::topology::ELEM_RANK), Kokkos::AUTO); - - Kokkos::parallel_for(teamPolicy, KOKKOS_LAMBDA (const TeamHandleType& team) - { - const typename MeshType::BucketType& bucket = ngpMesh.get_bucket(stk::topology::ELEM_RANK, team.league_rank()); - unsigned numElems = bucket.size(); - - Kokkos::parallel_for(Kokkos::TeamThreadRange(team, 0u, numElems), [&] (const int& i) - { - stk::mesh::Entity elem = bucket[i]; - stk::mesh::FastMeshIndex elemIndex = ngpMesh.fast_mesh_index(elem); - typename MeshType::ConnectedNodes nodes = ngpMesh.get_nodes(stk::topology::ELEM_RANK, elemIndex); - - for(unsigned nodeIndex = 0; nodeIndex < nodes.size(); nodeIndex++) { - stk::mesh::Entity node = nodes[nodeIndex]; - stk::mesh::FastMeshIndex meshIndex = ngpMesh.fast_mesh_index(node); - const typename MeshType::BucketType& nodeBucket = ngpMesh.get_bucket(stk::topology::NODE_RANK, meshIndex.bucket_id); - if(ngpMesh.identifier(node) == 1 || ngpMesh.identifier(node) == 2) { - NGP_ThrowRequire(nodeBucket.member(partOrdinal) == true); - } else { - NGP_ThrowRequire(nodeBucket.member(partOrdinal) == false); - } - } - }); - }); -} - -TEST_F(NgpHowTo, checkPartMembership) -{ - if (stk::parallel_machine_size(MPI_COMM_WORLD) > 1) { - return; - } - setup_empty_mesh(stk::mesh::BulkData::NO_AUTO_AURA); - auto &field = get_meta().declare_field>(stk::topology::NODE_RANK, "myField"); - double init = 0.0; - stk::mesh::put_field_on_mesh(field, get_meta().universal_part(), &init); - - stk::mesh::Part& testPart = get_meta().declare_part("testPart", stk::topology::NODE_RANK); - - std::string meshDesc = "0,1,HEX_8,1,2,3,4,5,6,7,8"; - stk::unit_test_util::setup_text_mesh(get_bulk(), meshDesc); - - stk::mesh::Entity node1 = get_bulk().get_entity(stk::topology::NODE_RANK, 1u); - stk::mesh::Entity node2 = get_bulk().get_entity(stk::topology::NODE_RANK, 2u); - - get_bulk().modification_begin(); - get_bulk().change_entity_parts(node1, stk::mesh::PartVector{&testPart}, {}); - get_bulk().change_entity_parts(node2, stk::mesh::PartVector{&testPart}, {}); - get_bulk().modification_end(); - -#ifndef KOKKOS_ENABLE_CUDA - run_part_membership_test(get_bulk(), testPart.mesh_meta_data_ordinal()); -#endif - run_part_membership_test(get_bulk(), testPart.mesh_meta_data_ordinal()); -} - -} diff --git a/packages/stk/stk_unit_tests/stk_ngp/howToNgpMeshMod.cpp b/packages/stk/stk_unit_tests/stk_ngp/howToNgpMeshMod.cpp deleted file mode 100644 index 04369a32fa71..000000000000 --- a/packages/stk/stk_unit_tests/stk_ngp/howToNgpMeshMod.cpp +++ /dev/null @@ -1,73 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "NgpUnitTestUtils.hpp" - -typedef Kokkos::DualView IntViewType; - -class NgpMeshModHowTo : public stk::unit_test_util::MeshFixture {}; - -void test_change_entity_parts(stk::mesh::BulkData& bulk, stk::mesh::Entity elem, unsigned active_ordinal) -{ - unsigned numResults = 6; - IntViewType result = ngp_unit_test_utils::create_dualview("result",numResults); - - ngp::DynamicMesh ngpMesh(bulk); - - Kokkos::parallel_for(1, KOKKOS_LAMBDA(const int& i) { - stk::mesh::FastMeshIndex oldMeshIndex = ngpMesh.device_mesh_index(elem); - const ngp::DynamicBucket& oldBucket = ngpMesh.get_bucket(stk::topology::ELEM_RANK, oldMeshIndex.bucket_id); - unsigned oldBucketSize = oldBucket.size(); - - ngpMesh.change_entity_parts(elem, active_ordinal); - - stk::mesh::FastMeshIndex newMeshIndex = ngpMesh.device_mesh_index(elem); - const ngp::DynamicBucket& newBucket = ngpMesh.get_bucket(stk::topology::ELEM_RANK, newMeshIndex.bucket_id); - result.d_view(0) = newBucket.is_member(active_ordinal) ? 1 : 0; - result.d_view(1) = newBucket.size()==1 ? 1 : 0; - result.d_view(2) = newBucket[newMeshIndex.bucket_ord] == elem ? 1 : 0; - result.d_view(3) = oldBucket.size() == oldBucketSize-1 ? 1 : 0; - result.d_view(4) = newBucket.topology() == stk::topology::HEX_8 ? 1 : 0; - result.d_view(5) = oldBucket.topology() == stk::topology::HEX_8 ? 1 : 0; - }); - - result.modify(); - result.sync(); - - EXPECT_EQ(numResults, result.h_view.size()); - for(unsigned i=0; i 1) return; - - setup_empty_mesh(stk::mesh::BulkData::NO_AUTO_AURA); - stk::mesh::Part &active = get_meta().declare_part("active", stk::topology::ELEM_RANK); - std::string meshDesc = - "0,1,HEX_8,1,2,3,4,5,6,7,8\n" - "0,2,HEX_8,1,2,3,4,5,6,7,8\n" - "0,3,SHELL_QUAD_4,5,6,7,8"; - stk::unit_test_util::setup_text_mesh(get_bulk(), meshDesc); - - stk::mesh::Entity elem = get_bulk().get_entity(stk::topology::ELEM_RANK, 1); - test_change_entity_parts(get_bulk(), elem, active.mesh_meta_data_ordinal()); - - elem = get_bulk().get_entity(stk::topology::ELEM_RANK, 2); - test_change_entity_parts(get_bulk(), elem, active.mesh_meta_data_ordinal()); -} - diff --git a/packages/stk/stk_unit_tests/stk_ngp/implNgpMeshMod.cpp b/packages/stk/stk_unit_tests/stk_ngp/implNgpMeshMod.cpp deleted file mode 100644 index 930a48860d7f..000000000000 --- a/packages/stk/stk_unit_tests/stk_ngp/implNgpMeshMod.cpp +++ /dev/null @@ -1,243 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "NgpUnitTestUtils.hpp" - -typedef Kokkos::DualView IntViewType; - -class NgpMeshModImpl : public stk::unit_test_util::MeshFixture -{ -protected: - void initialize_mesh(const std::string& meshDesc) - { - setup_empty_mesh(stk::mesh::BulkData::NO_AUTO_AURA); - stk::unit_test_util::setup_text_mesh(get_bulk(), meshDesc); - } -}; - -void test_bucket_topology(stk::mesh::BulkData& bulk) -{ - ngp::DynamicMesh ngpMesh(bulk); - - unsigned numResults = 6; - IntViewType result = ngp_unit_test_utils::create_dualview("result",numResults); - - stk::mesh::Entity elem1 = bulk.get_entity(stk::topology::ELEM_RANK, 1); - stk::topology hostTopo = bulk.bucket(elem1).topology(); - - Kokkos::parallel_for(1, KOKKOS_LAMBDA(const int& i) { - stk::mesh::FastMeshIndex fmi = ngpMesh.device_mesh_index(elem1); - const ngp::DynamicBucket& bucket = ngpMesh.get_bucket(stk::topology::ELEM_RANK, fmi.bucket_id); - result.d_view(0) = bucket.topology() == hostTopo ? 1 : 0; - result.d_view(1) = bucket.topology() == stk::topology::HEX_8 ? 1 : 0; - result.d_view(2) = bucket.topology().num_nodes() == 8 ? 1 : 0; - result.d_view(3) = bucket.topology().num_sides() == 6 ? 1 : 0; - result.d_view(4) = bucket.topology().side_rank() == stk::topology::FACE_RANK ? 1 : 0; - result.d_view(5) = bucket.topology().side_topology() == stk::topology::QUAD_4 ? 1 : 0; - }); - - result.modify(); - result.sync(); - - EXPECT_EQ(numResults, result.h_view.size()); - - for(unsigned i=0; i("result",numResults); - - stk::mesh::Entity node8 = bulk.get_entity(stk::topology::NODE_RANK, 8); - unsigned hostBucketId = bulk.bucket(node8).bucket_id(); - size_t hostNumPartsForBucket = bulk.bucket(node8).supersets().size(); - int firstPartOrd = bulk.bucket(node8).supersets()[0]->mesh_meta_data_ordinal(); - int lastPartOrd = bulk.bucket(node8).supersets().back()->mesh_meta_data_ordinal(); - - Kokkos::parallel_for(1, KOKKOS_LAMBDA(const int& i) { - stk::mesh::FastMeshIndex fmi = ngpMesh.device_mesh_index(node8); - const ngp::DynamicBucket& bucket = ngpMesh.get_bucket(stk::topology::NODE_RANK, fmi.bucket_id); - result.d_view(0) = bucket.bucket_id()==hostBucketId ? 1 : 0; - result.d_view(1) = bucket.get_num_parts()==hostNumPartsForBucket ? 1 : 0; - stk::mesh::Entity deviceNode8 = bucket[fmi.bucket_ord]; - result.d_view(2) = deviceNode8==node8 ? 1 : 0; - result.d_view(3) = bucket.is_member(firstPartOrd) ? 1 : 0; - result.d_view(4) = bucket.is_member(lastPartOrd) ? 1 : 0; - unsigned numElemBuckets = ngpMesh.num_buckets(stk::topology::ELEM_RANK); - NGP_ThrowRequire(2u == numElemBuckets); - const ngp::DynamicBucket& bucket0 = ngpMesh.get_bucket(stk::topology::ELEM_RANK, 0); - const ngp::UnmanagedPartOrdViewType& parts0 = bucket0.get_parts(); - const ngp::DynamicBucket& bucket1 = ngpMesh.get_bucket(stk::topology::ELEM_RANK, 1); - const ngp::UnmanagedPartOrdViewType& parts1 = bucket1.get_parts(); - unsigned numParts0 = parts0(0); - unsigned numParts1 = parts1(0); - NGP_ThrowRequire(numParts0 == numParts1); - result.d_view(5) = ngp::all_parts_match(parts0, parts1) ? 0 : 1; //expecting false - }); - - result.modify(); - result.sync(); - - EXPECT_EQ(numResults, result.h_view.size()); - - for(unsigned i=0; i("result",numResults); - - stk::mesh::Entity node8 = bulk.get_entity(stk::topology::NODE_RANK, 8); - - Kokkos::parallel_for(1, KOKKOS_LAMBDA(const int& i) { - stk::mesh::FastMeshIndex fmi = ngpMesh.device_mesh_index(node8); - const ngp::DynamicBucket& bucket = ngpMesh.get_bucket(stk::topology::NODE_RANK, fmi.bucket_id); - const ngp::UnmanagedPartOrdViewType& parts = bucket.get_parts(); - int bktIndex = ngpMesh.find_bucket_with_parts(stk::topology::NODE_RANK, parts); - result.d_view(0) = bktIndex == (int)fmi.bucket_id ? 1 : 0; - ngp::UnmanagedPartOrdViewType emptyParts; - result.d_view(1) = ngp::all_parts_match(emptyParts, parts) ? 0 : 1; //expecting false - result.d_view(2) = ngp::all_parts_match(emptyParts, emptyParts) ? 1 : 0; //expecting true - }); - - result.modify(); - result.sync(); - - EXPECT_EQ(numResults, result.h_view.size()); - - for(unsigned i=0; i("result",numResults); - - unsigned biggestPartOrd = bulk.mesh_meta_data().get_parts().back()->mesh_meta_data_ordinal(); - - Kokkos::parallel_for(1, KOKKOS_LAMBDA(const int& i) { - const ngp::DynamicBucket& bucket = ngpMesh.get_bucket(stk::topology::NODE_RANK, 0); - unsigned newPartOrd = biggestPartOrd + 1; - const ngp::UnmanagedPartOrdViewType& oldParts = bucket.get_parts(); - ngp::UnmanagedPartOrdViewType newParts = ngpMesh.get_new_part_ords(newPartOrd, oldParts); - unsigned newNumParts = newParts(0); - unsigned oldNumParts = bucket.get_num_parts(); - result.d_view(0) = newNumParts == oldNumParts+1 ? 1 : 0; - }); - - result.modify(); - result.sync(); - EXPECT_EQ(numResults, result.h_view.size()); - - for(unsigned i=0; i("result",numResults); - - unsigned biggestPartOrd = bulk.mesh_meta_data().get_parts().back()->mesh_meta_data_ordinal(); - - Kokkos::parallel_for(1, KOKKOS_LAMBDA(const int& i) { - unsigned numNodeBuckets = ngpMesh.num_buckets(stk::topology::NODE_RANK); - const ngp::DynamicBucket& bucket = ngpMesh.get_bucket(stk::topology::NODE_RANK, 0); - unsigned newPartOrd = biggestPartOrd + 1; - const ngp::UnmanagedPartOrdViewType& oldParts = bucket.get_parts(); - ngp::UnmanagedPartOrdViewType newParts = ngpMesh.get_new_part_ords(newPartOrd, oldParts); - int newBucketIndex = ngpMesh.add_bucket(stk::topology::NODE_RANK, bucket.topology(), newParts); - int bktIndex = ngpMesh.find_bucket_with_parts(stk::topology::NODE_RANK, newParts); - result.d_view(0) = ((bktIndex == newBucketIndex) && (bktIndex != -1)) ? 1 : 0; - unsigned newNumNodeBuckets = ngpMesh.num_buckets(stk::topology::NODE_RANK); - result.d_view(1) = newNumNodeBuckets == numNodeBuckets+1 ? 1 : 0; - result.d_view(2) = ngpMesh.get_bucket(stk::topology::NODE_RANK, bktIndex).is_member(newPartOrd) ? 1 : 0; - }); - - result.modify(); - result.sync(); - EXPECT_EQ(numResults, result.h_view.size()); - - for(unsigned i=0; i 1) return; - - initialize_mesh("0,1,HEX_8,1,2,3,4,5,6,7,8\n" - "0,2,SHELL_QUAD_4,5,6,7,8"); - - test_bucket_topology(get_bulk()); -} - -TEST_F(NgpMeshModImpl, bucketPartInfo) -{ - if (stk::parallel_machine_size(MPI_COMM_WORLD) > 1) return; - - initialize_mesh("0,1,HEX_8,1,2,3,4,5,6,7,8\n" - "0,2,SHELL_QUAD_4,5,6,7,8"); - - test_bucket_part_info(get_bulk()); -} - -TEST_F(NgpMeshModImpl, findBucketWithParts) -{ - if (stk::parallel_machine_size(MPI_COMM_WORLD) > 1) return; - - initialize_mesh("0,1,HEX_8,1,2,3,4,5,6,7,8\n" - "0,2,SHELL_QUAD_4,5,6,7,8"); - - test_find_bucket_with_parts(get_bulk()); -} - -TEST_F(NgpMeshModImpl, createNewPartOrdView) -{ - if (stk::parallel_machine_size(MPI_COMM_WORLD) > 1) return; - - initialize_mesh("0,1,HEX_8,1,2,3,4,5,6,7,8\n" - "0,2,SHELL_QUAD_4,5,6,7,8"); - - test_create_new_part_ord_view(get_bulk()); -} - -TEST_F(NgpMeshModImpl, addBucketOnDevice) -{ - if (stk::parallel_machine_size(MPI_COMM_WORLD) > 1) return; - - initialize_mesh("0,1,HEX_8,1,2,3,4,5,6,7,8\n" - "0,2,SHELL_QUAD_4,5,6,7,8"); - - test_add_bucket_on_device(get_bulk()); -} - diff --git a/packages/stk/stk_unit_tests/stk_ngp/ngpFieldTest.cpp b/packages/stk/stk_unit_tests/stk_ngp/ngpFieldTest.cpp deleted file mode 100644 index 1ef7deb8b292..000000000000 --- a/packages/stk/stk_unit_tests/stk_ngp/ngpFieldTest.cpp +++ /dev/null @@ -1,140 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -namespace ngp_field_test { - -class NgpFieldFixture : public stk::unit_test_util::MeshFixture {}; - -void modify_field_on_device(ngp::Mesh &mesh, - const ngp::FieldManager& fieldManager, - const unsigned fieldOrdinal, - const int multiplier) -{ - const stk::mesh::BulkData& bulk = fieldManager.get_bulk(); - ngp::Field & ngpField = fieldManager.get_field(fieldOrdinal); - ngpField.sync_to_device(); - - const int component = 0; - ngp::for_each_entity_run(mesh, stk::topology::ELEM_RANK, bulk.mesh_meta_data().locally_owned_part(), KOKKOS_LAMBDA(ngp::Mesh::MeshIndex entity) - { - ngpField.get(entity, component) *= multiplier; - }); - ngpField.modify_on_device(); -} - -void move_data_between_fields_on_host(const ngp::FieldManager& fieldManager, - const stk::mesh::Field& source, - stk::mesh::Field& dest) -{ - const stk::mesh::BucketVector& buckets = fieldManager.get_bulk().buckets(stk::topology::ELEMENT_RANK); - ngp::Field& ngpSource = fieldManager.get_field(source.mesh_meta_data_ordinal()); - ngpSource.sync_to_host(); - - for(size_t iBucket=0; iBucket(stk::mesh::field_data(source, bucket)); - int* destData = static_cast(stk::mesh::field_data(dest, bucket)); - for(size_t iEntity=0; iEntity& ngpDest = fieldManager.get_field(dest.mesh_meta_data_ordinal()); - ngpDest.modify_on_host(); -} - -void test_field_values_on_device(const ngp::Mesh &mesh, - const ngp::FieldManager &fieldManager, - const unsigned field1Ordinal, - const unsigned field2Ordinal, - const int expectedFieldValue) -{ - ngp::Field & ngpField1 = fieldManager.get_field(field1Ordinal); - ngpField1.sync_to_device(); - - ngp::Field & ngpField2 = fieldManager.get_field(field2Ordinal); - ngpField2.sync_to_device(); - - const int component = 0; - stk::mesh::Part& locallyOwned = fieldManager.get_bulk().mesh_meta_data().locally_owned_part(); - ngp::for_each_entity_run(mesh, stk::topology::ELEM_RANK, locallyOwned, KOKKOS_LAMBDA(ngp::Mesh::MeshIndex entity) - { - NGP_ThrowRequire(ngpField1.get(entity, component) == expectedFieldValue); - NGP_ThrowRequire(ngpField2.get(entity, component) == expectedFieldValue); - }); -} - -void test_field_values_on_host(const ngp::FieldManager &fieldManager, - const stk::mesh::Field& field1, - const stk::mesh::Field& field2, - const int expectedFieldValue) -{ - ngp::Field & ngpField1 = fieldManager.get_field(field1.mesh_meta_data_ordinal()); - ngpField1.sync_to_host(); - - ngp::Field & ngpField2 = fieldManager.get_field(field2.mesh_meta_data_ordinal()); - ngpField2.sync_to_host(); - - const stk::mesh::BucketVector& buckets = fieldManager.get_bulk().buckets(stk::topology::ELEMENT_RANK); - for(size_t iBucket=0; iBucket(stk::mesh::field_data(field1, bucket)); - int* field2Data = static_cast(stk::mesh::field_data(field2, bucket)); - for(size_t iEntity=0; iEntity &f1 = get_meta().declare_field>(stk::topology::ELEM_RANK, "f1", numStates); - stk::mesh::put_field_on_mesh(f1, get_meta().universal_part(), &init); - - stk::mesh::Field &f2 = get_meta().declare_field>(stk::topology::ELEM_RANK, "f2", numStates); - stk::mesh::put_field_on_mesh(f2, get_meta().universal_part(), &init); - - setup_mesh("generated:1x1x1", stk::mesh::BulkData::AUTO_AURA); - - ngp::Mesh ngpMesh(get_bulk()); - ngp::FieldManager fieldManager(get_bulk()); - - int multiplier = 2; - modify_field_on_device(ngpMesh, fieldManager, f1.mesh_meta_data_ordinal(), multiplier); - - move_data_between_fields_on_host(fieldManager, f1, f2); - - test_field_values_on_device(ngpMesh, - fieldManager, - f1.mesh_meta_data_ordinal(), - f2.mesh_meta_data_ordinal(), - multiplier); - - test_field_values_on_host(fieldManager, f1, f2, multiplier); -} -} diff --git a/packages/stk/stk_unit_tests/stk_simd/SimdFixture.hpp b/packages/stk/stk_unit_tests/stk_simd/SimdFixture.hpp index feeb793a2e1d..488e259a7590 100644 --- a/packages/stk/stk_unit_tests/stk_simd/SimdFixture.hpp +++ b/packages/stk/stk_unit_tests/stk_simd/SimdFixture.hpp @@ -3,18 +3,18 @@ // DE-NA0003525 with NTESS, the U.S. Government retains certain rights // in this software. // - // Redistribution and use in source and binary forms, with or without - // modification, are permitted provided that the following conditions are - // met: - // - // * Redistributions of source code must retain the above copyright - // notice, this list of conditions and the following disclaimer. - // - // * Redistributions in binary form must reproduce the above - // copyright notice, this list of conditions and the following - // disclaimer in the documentation and/or other materials provided - // with the distribution. - // +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following +// disclaimer in the documentation and/or other materials provided +// with the distribution. +// // * Neither the name of NTESS nor the names of its contributors // may be used to endorse or promote products derived from this // software without specific prior written permission. @@ -307,5 +307,54 @@ class MathFunctionWithBoolAndTwoDoubleArg : public TestSimdMathFunction } } +// +// helper functions. +// +template +typename VECTOR::value_type max_error(VECTOR& out1, VECTOR& out2) +{ + assert(out1.size() == out2.size()); + typename VECTOR::value_type maxerr = 0.0; + for (std::size_t n=0; n < out1.size(); ++n) { + auto err = stk::math::abs(out1[n]-out2[n]); + maxerr = stk::math::max(err, maxerr); + } + return maxerr; +} + +template +typename VECTOR::value_type max_error(VECTOR& out1, VECTOR& out2, VECTOR& out3) +{ + assert(out1.size() == out2.size()); + assert(out1.size() == out3.size()); + typename VECTOR::value_type maxerr = 0.0; + for (std::size_t n=0; n < out1.size(); ++n) { + auto err = stk::math::abs(out1[n]-out2[n]); + maxerr = stk::math::max(err, maxerr); + err = stk::math::abs(out1[n]-out3[n]); + maxerr = stk::math::max(err, maxerr); + } + return maxerr; +} + +template +typename VECTOR::value_type max_error(VECTOR& out1, VECTOR& out2, VECTOR& out3, VECTOR& out4) +{ + assert(out1.size() == out2.size()); + assert(out1.size() == out3.size()); + assert(out1.size() == out4.size()); + typename VECTOR::value_type maxerr = 0.0; + for (std::size_t n=0; n < out1.size(); ++n) { + auto err = stk::math::abs(out1[n]-out2[n]); + maxerr = stk::math::max(err, maxerr); + err = stk::math::abs(out1[n]-out3[n]); + maxerr = stk::math::max(err, maxerr); + err = stk::math::abs(out1[n]-out4[n]); + maxerr = stk::math::max(err, maxerr); + } + return maxerr; +} + + #endif diff --git a/packages/stk/stk_unit_tests/stk_simd/UnitTestSimdInfo.cpp b/packages/stk/stk_unit_tests/stk_simd/UnitTestSimdInfo.cpp new file mode 100644 index 000000000000..92bd5a8b5116 --- /dev/null +++ b/packages/stk/stk_unit_tests/stk_simd/UnitTestSimdInfo.cpp @@ -0,0 +1,71 @@ +// Copyright 2002 - 2008, 2010, 2011 National Technology Engineering +// Solutions of Sandia, LLC (NTESS). Under the terms of Contract +// DE-NA0003525 with NTESS, the U.S. Government retains certain rights +// in this software. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following +// disclaimer in the documentation and/or other materials provided +// with the distribution. +// +// * Neither the name of NTESS nor the names of its contributors +// may be used to endorse or promote products derived from this +// software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +#include "gtest/gtest.h" + +#include "stk_unit_test_utils/PrintType.hpp" + +#ifndef STK_KOKKOS_SIMD +#define STK_KOKKOS_SIMD +#endif + +#include "stk_simd/Simd.hpp" + +TEST( SimdInfo, printWidths ) +{ + std::cout << "stk::simd::nfloats " << stk::simd::nfloats << std::endl; + std::cout << "stk::simd::ndoubles " << stk::simd::ndoubles << std::endl; +} + +TEST( SimdInfo, printTypes ) +{ + std::cout << "Datatype stored by stk::simd::Float is "; + stk::simd::Float f; + stk::unit_test_util::print_type(f._data); + + std::cout << "Datatype stored by stk::simd::Double is "; + stk::simd::Double d; + stk::unit_test_util::print_type(d._data); +} + +using FloatDataNative = SIMD_NAMESPACE::simd; +using DoubleDataNative = SIMD_NAMESPACE::simd; + +TEST( SimdInfo, checkTypes ) +{ + stk::simd::Float f; + EXPECT_TRUE((std::is_same::value)); + + stk::simd::Double d; + EXPECT_TRUE((std::is_same::value)); +} diff --git a/packages/stk/stk_unit_tests/stk_simd/UnitTestSimdInfoDevice.cpp b/packages/stk/stk_unit_tests/stk_simd/UnitTestSimdInfoDevice.cpp new file mode 100644 index 000000000000..7ebfb02e318a --- /dev/null +++ b/packages/stk/stk_unit_tests/stk_simd/UnitTestSimdInfoDevice.cpp @@ -0,0 +1,79 @@ +// Copyright 2002 - 2008, 2010, 2011 National Technology Engineering +// Solutions of Sandia, LLC (NTESS). Under the terms of Contract +// DE-NA0003525 with NTESS, the U.S. Government retains certain rights +// in this software. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following +// disclaimer in the documentation and/or other materials provided +// with the distribution. +// +// * Neither the name of NTESS nor the names of its contributors +// may be used to endorse or promote products derived from this +// software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +#include "gtest/gtest.h" + +#ifndef STK_KOKKOS_SIMD +#define STK_KOKKOS_SIMD +#endif + +#include "Kokkos_Core.hpp" +#include "stk_simd/Simd.hpp" + +int get_float_width_on_device() +{ + int result; + + Kokkos::parallel_reduce(1, KOKKOS_LAMBDA(const int& i, int& width) { + stk::simd::Float f; + width = f._data.size(); + }, result); + + return result; +} + +int get_double_width_on_device() +{ + int result; + + Kokkos::parallel_reduce(1, KOKKOS_LAMBDA(const int& i, int& width) { + stk::simd::Double d; + width = d._data.size(); + }, result); + + return result; +} + +#ifdef KOKKOS_ENABLE_CUDA +TEST( SimdInfoDevice, checkWidths ) +{ + EXPECT_EQ(get_float_width_on_device(), 1); + EXPECT_EQ(get_double_width_on_device(), 1); +} + +TEST( SimdInfoDevice, printWidths ) +{ + std::cout << "width of stk::simd::Float on device " << get_float_width_on_device() << std::endl; + std::cout << "width of stk::simd::Double on device " << get_double_width_on_device() << std::endl; +} +#endif diff --git a/packages/stk/stk_unit_tests/stk_simd/UnitTestSimdInfoScalar.cpp b/packages/stk/stk_unit_tests/stk_simd/UnitTestSimdInfoScalar.cpp new file mode 100644 index 000000000000..3cec3d984d81 --- /dev/null +++ b/packages/stk/stk_unit_tests/stk_simd/UnitTestSimdInfoScalar.cpp @@ -0,0 +1,75 @@ +// Copyright 2002 - 2008, 2010, 2011 National Technology Engineering +// Solutions of Sandia, LLC (NTESS). Under the terms of Contract +// DE-NA0003525 with NTESS, the U.S. Government retains certain rights +// in this software. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following +// disclaimer in the documentation and/or other materials provided +// with the distribution. +// +// * Neither the name of NTESS nor the names of its contributors +// may be used to endorse or promote products derived from this +// software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +#include "gtest/gtest.h" + +#include "stk_unit_test_utils/PrintType.hpp" + +#ifndef STK_KOKKOS_SIMD +#define STK_KOKKOS_SIMD +#endif + +#ifndef USE_STK_SIMD_NONE +#define USE_STK_SIMD_NONE +#endif + +#include "stk_simd/Simd.hpp" + +TEST( SimdInfoScalar, printWidths ) +{ + std::cout << "stk::simd::nfloats " << stk::simd::nfloats << std::endl; + std::cout << "stk::simd::ndoubles " << stk::simd::ndoubles << std::endl; +} + +TEST( SimdInfoScalar, printTypes ) +{ + std::cout << "Datatype stored by stk::simd::Float is "; + stk::simd::Float f; + stk::unit_test_util::print_type(f._data); + + std::cout << "Datatype stored by stk::simd::Double is "; + stk::simd::Double d; + stk::unit_test_util::print_type(d._data); +} + +using FloatDataScalar = SIMD_NAMESPACE::simd; +using DoubleDataScalar = SIMD_NAMESPACE::simd; + +TEST( SimdInfoScalar, checkTypes ) +{ + stk::simd::Float f; + EXPECT_TRUE((std::is_same::value)); + + stk::simd::Double d; + EXPECT_TRUE((std::is_same::value)); +} diff --git a/packages/stk/stk_unit_tests/stk_simd/UnitTestStkMathDouble.cpp b/packages/stk/stk_unit_tests/stk_simd/UnitTestStkMathDouble.cpp index 4ade2862e92e..ac9bb7dc7296 100644 --- a/packages/stk/stk_unit_tests/stk_simd/UnitTestStkMathDouble.cpp +++ b/packages/stk/stk_unit_tests/stk_simd/UnitTestStkMathDouble.cpp @@ -12,12 +12,12 @@ constexpr int d = 2; TEST(StkSimd, StkMathDouble_fmadd) { - EXPECT_EQ( stk::math::fmadd(a,b,c), (a*b)+c ); + EXPECT_DOUBLE_EQ( stk::math::fmadd(a,b,c), (a*b)+c ); } TEST(StkSimd, StkMathDouble_sqrt) { - EXPECT_EQ( stk::math::sqrt(a), std::sqrt(a) ); + EXPECT_DOUBLE_EQ( stk::math::sqrt(a), std::sqrt(a) ); } TEST(StkSimd, StkMathDouble_cbrt) @@ -26,151 +26,151 @@ TEST(StkSimd, StkMathDouble_cbrt) EXPECT_NEAR( stk::math::cbrt(a), std::pow(a,1.0/3.0), epsilon ); // This fails on gcc debug, the above check does pass on gcc debug. // not sure what is different between the two checks..... - //EXPECT_EQ ( stk::math::cbrt(a), std::pow(a,1.0/3.0) ); + //EXPECT_DOUBLE_EQ ( stk::math::cbrt(a), std::pow(a,1.0/3.0) ); } TEST(StkSimd, StkMathDouble_log) { - EXPECT_EQ( stk::math::log(a), std::log(a) ); + EXPECT_DOUBLE_EQ( stk::math::log(a), std::log(a) ); } TEST(StkSimd, StkMathDouble_log10) { - EXPECT_EQ( stk::math::log10(a), std::log10(a) ); + EXPECT_DOUBLE_EQ( stk::math::log10(a), std::log10(a) ); } TEST(StkSimd, StkMathDouble_exp) { - EXPECT_EQ( stk::math::exp(a), std::exp(a) ); + EXPECT_DOUBLE_EQ( stk::math::exp(a), std::exp(a) ); } TEST(StkSimd, StkMathDouble_pow) { - EXPECT_EQ( stk::math::pow(a,d), std::pow(a,d) ); - EXPECT_EQ( stk::math::pow(a,b), std::pow(a,b) ); + EXPECT_DOUBLE_EQ( stk::math::pow(a,d), std::pow(a,d) ); + EXPECT_DOUBLE_EQ( stk::math::pow(a,b), std::pow(a,b) ); } TEST(StkSimd, StkMathDouble_sin) { - EXPECT_EQ( stk::math::sin(a), std::sin(a) ); + EXPECT_DOUBLE_EQ( stk::math::sin(a), std::sin(a) ); } TEST(StkSimd, StkMathDouble_cos) { - EXPECT_EQ( stk::math::cos(a), std::cos(a) ); + EXPECT_DOUBLE_EQ( stk::math::cos(a), std::cos(a) ); } TEST(StkSimd, StkMathDouble_tan) { - EXPECT_EQ( stk::math::tan(a), std::tan(a) ); + EXPECT_DOUBLE_EQ( stk::math::tan(a), std::tan(a) ); } TEST(StkSimd, StkMathDouble_sinh) { - EXPECT_EQ( stk::math::sinh(a), std::sinh(a) ); + EXPECT_DOUBLE_EQ( stk::math::sinh(a), std::sinh(a) ); } TEST(StkSimd, StkMathDouble_cosh) { - EXPECT_EQ( stk::math::cosh(a), std::cosh(a) ); + EXPECT_DOUBLE_EQ( stk::math::cosh(a), std::cosh(a) ); } TEST(StkSimd, StkMathDouble_tanh) { - EXPECT_EQ( stk::math::tanh(a), std::tanh(a) ); + EXPECT_DOUBLE_EQ( stk::math::tanh(a), std::tanh(a) ); } TEST(StkSimd, StkMathDouble_asin) { - EXPECT_EQ( stk::math::asin(f), std::asin(f) ); + EXPECT_DOUBLE_EQ( stk::math::asin(f), std::asin(f) ); } TEST(StkSimd, StkMathDouble_acos) { - EXPECT_EQ( stk::math::acos(f), std::acos(f) ); + EXPECT_DOUBLE_EQ( stk::math::acos(f), std::acos(f) ); } TEST(StkSimd, StkMathDouble_atan) { - EXPECT_EQ( stk::math::atan(f), std::atan(f) ); + EXPECT_DOUBLE_EQ( stk::math::atan(f), std::atan(f) ); } TEST(StkSimd, StkMathDouble_atan2) { - EXPECT_EQ( stk::math::atan2(a,b), std::atan2(a,b) ); + EXPECT_DOUBLE_EQ( stk::math::atan2(a,b), std::atan2(a,b) ); } TEST(StkSimd, StkMathDouble_asinh) { - EXPECT_EQ( stk::math::asinh(f), std::asinh(f) ); + EXPECT_DOUBLE_EQ( stk::math::asinh(f), std::asinh(f) ); } TEST(StkSimd, StkMathDouble_acosh) { - EXPECT_EQ( stk::math::acosh(f+1.0), std::acosh(f+1.0) ); + EXPECT_DOUBLE_EQ( stk::math::acosh(f+1.0), std::acosh(f+1.0) ); } TEST(StkSimd, StkMathDouble_atanh) { - EXPECT_EQ( stk::math::atanh(f), std::atanh(f) ); + EXPECT_DOUBLE_EQ( stk::math::atanh(f), std::atanh(f) ); } TEST(StkSimd, StkMathDouble_erf) { - EXPECT_EQ( stk::math::erf(f), std::erf(f) ); + EXPECT_DOUBLE_EQ( stk::math::erf(f), std::erf(f) ); } TEST(StkSimd, StkMathDouble_multiplysign) { - EXPECT_EQ( stk::math::multiplysign(a,c), a*std::copysign(1.0,c)); + EXPECT_DOUBLE_EQ( stk::math::multiplysign(a,c), a*std::copysign(1.0,c)); } TEST(StkSimd, StkMathDouble_multiplysignNegZero) { - EXPECT_EQ( stk::math::multiplysign(a,-0.0), a*std::copysign(1.0,-0.0)); + EXPECT_DOUBLE_EQ( stk::math::multiplysign(a,-0.0), a*std::copysign(1.0,-0.0)); } TEST(StkSimd, StkMathDouble_multiplysignZero) { - EXPECT_EQ( stk::math::multiplysign(a,0.0), a*std::copysign(1.0,0.0)); + EXPECT_DOUBLE_EQ( stk::math::multiplysign(a,0.0), a*std::copysign(1.0,0.0)); } TEST(StkSimd, StkMathDouble_copysign) { - EXPECT_EQ( stk::math::copysign(a,c), std::copysign(a,c) ); + EXPECT_DOUBLE_EQ( stk::math::copysign(a,c), std::copysign(a,c) ); } TEST(StkSimd, StkMathDouble_copysignNegZero) { - EXPECT_EQ( stk::math::copysign(a,-0.0), std::copysign(a,-0.0) ); + EXPECT_DOUBLE_EQ( stk::math::copysign(a,-0.0), std::copysign(a,-0.0) ); } TEST(StkSimd, StkMathDouble_copysignZero) { - EXPECT_EQ( stk::math::copysign(a,0.0), std::copysign(a,0.0) ); + EXPECT_DOUBLE_EQ( stk::math::copysign(a,0.0), std::copysign(a,0.0) ); } TEST(StkSimd, StkMathDouble_abs) { - EXPECT_EQ( stk::math::abs(c), std::abs(c) ); + EXPECT_DOUBLE_EQ( stk::math::abs(c), std::abs(c) ); } TEST(StkSimd, StkMathDouble_max) { - EXPECT_EQ( stk::math::max(a,c), a > c ? a : c ); + EXPECT_DOUBLE_EQ( stk::math::max(a,c), a > c ? a : c ); } TEST(StkSimd, StkMathDouble_min) { - EXPECT_EQ( stk::math::min(a,c), a < c ? a : c ); + EXPECT_DOUBLE_EQ( stk::math::min(a,c), a < c ? a : c ); } TEST(StkSimd, StkMathDouble_if_then) { - EXPECT_EQ( stk::math::if_then_else(true,a,b), a ); - EXPECT_EQ( stk::math::if_then_else(false,a,b), b ); - EXPECT_EQ( stk::math::if_then_else_zero(true,a), a ); - EXPECT_EQ( stk::math::if_then_else_zero(false,a), 0 ); + EXPECT_DOUBLE_EQ( stk::math::if_then_else(true,a,b), a ); + EXPECT_DOUBLE_EQ( stk::math::if_then_else(false,a,b), b ); + EXPECT_DOUBLE_EQ( stk::math::if_then_else_zero(true,a), a ); + EXPECT_DOUBLE_EQ( stk::math::if_then_else_zero(false,a), 0 ); } TEST(StkSimd, StkMathDouble_isnan) diff --git a/packages/stk/stk_unit_tests/stk_simd/UnitTestStkSimdMathDouble.cpp b/packages/stk/stk_unit_tests/stk_simd/UnitTestStkSimdMathDouble.cpp index 42e65583136c..59d404955509 100644 --- a/packages/stk/stk_unit_tests/stk_simd/UnitTestStkSimdMathDouble.cpp +++ b/packages/stk/stk_unit_tests/stk_simd/UnitTestStkSimdMathDouble.cpp @@ -351,9 +351,7 @@ template int sgn(T val) { TEST(StkSimd, SimdSpecialFunctions) { - const int N = 2000; - double maxerr = 0.0; std::vector x(N); std::vector y(N); @@ -378,15 +376,7 @@ TEST(StkSimd, SimdSpecialFunctions) stk::simd::store(&z1[n],zl); } - maxerr = 0.0; - for (int n=0; n < N; ++n) { - double err = stk::math::abs(z1[n]-z2[n]); - maxerr = stk::math::max(err,maxerr); - err = stk::math::abs(z1[n]-z3[n]); - maxerr = stk::math::max(err,maxerr); - } - - ASSERT_NEAR( maxerr, 0.0, 0.0 ); + ASSERT_NEAR( max_error(z1,z2,z3), 0.0, 0.0); // multiplysign @@ -401,15 +391,7 @@ TEST(StkSimd, SimdSpecialFunctions) stk::simd::store(&z1[n],zl); } - maxerr = 0.0; - for (int n=0; n < N; ++n) { - double err = stk::math::abs(z1[n]-z2[n]); - maxerr = stk::math::max(err,maxerr); - err = stk::math::abs(z1[n]-z3[n]); - maxerr = stk::math::max(err,maxerr); - } - - ASSERT_NEAR( maxerr, 0.0, 0.0 ); + ASSERT_NEAR( max_error(z1, z2, z3), 0.0, 0.0); // copysign @@ -424,15 +406,7 @@ TEST(StkSimd, SimdSpecialFunctions) stk::simd::store(&z1[n],zl); } - maxerr = 0.0; - for (int n=0; n < N; ++n) { - double err = stk::math::abs(z1[n]-z2[n]); - maxerr = stk::math::max(err,maxerr); - err = stk::math::abs(z1[n]-z3[n]); - maxerr = stk::math::max(err,maxerr); - } - - ASSERT_NEAR( maxerr, 0.0, 0.0 ); + ASSERT_NEAR( max_error(z1, z2, z3), 0.0, 0.0 ); // max @@ -447,15 +421,7 @@ TEST(StkSimd, SimdSpecialFunctions) stk::simd::store(&z1[n],zl); } - maxerr = 0.0; - for (int n=0; n < N; ++n) { - double err = stk::math::abs(z1[n]-z2[n]); - maxerr = stk::math::max(err,maxerr); - err = stk::math::abs(z1[n]-z3[n]); - maxerr = stk::math::max(err,maxerr); - } - - ASSERT_NEAR( maxerr, 0.0, 0.0 ); + ASSERT_NEAR( max_error(z1, z2, z3), 0.0, 0.0 ); // min @@ -470,15 +436,7 @@ TEST(StkSimd, SimdSpecialFunctions) stk::simd::store(&z1[n],zl); } - maxerr = 0.0; - for (int n=0; n < N; ++n) { - double err = stk::math::abs(z1[n]-z2[n]); - maxerr = stk::math::max(err,maxerr); - err = stk::math::abs(z1[n]-z3[n]); - maxerr = stk::math::max(err,maxerr); - } - - ASSERT_NEAR( maxerr, 0.0, 0.0 ); + ASSERT_NEAR( max_error(z1,z2,z3), 0.0, 0.0 ); // ifs and buts @@ -494,13 +452,7 @@ TEST(StkSimd, SimdSpecialFunctions) stk::simd::store(&z1[n],zl); } - maxerr = 0.0; - for (int n=0; n < N; ++n) { - double err = stk::math::abs(z1[n]-z2[n]); - maxerr = stk::math::max(err,maxerr); - err = stk::math::abs(z1[n]-z3[n]); - maxerr = stk::math::max(err,maxerr); - } + ASSERT_NEAR( max_error(z1,z2,z3), 0.0, 0.0); for (int n=0; n < N; n+=stk::simd::ndoubles) { for (int i=0; i < stk::simd::ndoubles; ++i) { @@ -514,19 +466,12 @@ TEST(StkSimd, SimdSpecialFunctions) stk::simd::store(&z1[n],zl); } - maxerr = 0.0; - for (int n=0; n < N; ++n) { - double err = stk::math::abs(z1[n]-z2[n]); - maxerr = stk::math::max(err,maxerr); - err = stk::math::abs(z1[n]-z3[n]); - maxerr = stk::math::max(err,maxerr); - } + ASSERT_NEAR( max_error(z1,z2,z3), 0.0, 0.0 ); } - -TEST(StkSimd, SimdAddSubtractMultDivide) +TEST(StkSimd, SimdAddSubtractMultDivide) { - int N = 800000; + int N = 400000; double t0; // timing variable std::vector x(N); @@ -542,37 +487,31 @@ TEST(StkSimd, SimdAddSubtractMultDivide) t0 = -stk::get_time_in_seconds(); for(int i=0; i<10; ++i) { - for (int n=0; n < N; n+=stk::simd::ndoubles) { - const stk::simd::Double a = stk::simd::load(&x[n]); - const stk::simd::Double b = stk::simd::load(&y[n]); - const stk::simd::Double c = ( a+b*(a-b) )/a; - stk::simd::store(&out1[n],c); - } + for (int n=0; n < N; n+=stk::simd::ndoubles) { + const stk::simd::Double a = stk::simd::load(&x[n]); + const stk::simd::Double b = stk::simd::load(&y[n]); + const stk::simd::Double c = ( a+b*(a-b) )/a; + stk::simd::store(&out1[n],c); + } } t0 += stk::get_time_in_seconds(); std::cout << "SIMD ADD,SUB,MUL,DIV took " << t0 << " seconds" << std::endl; t0 = -stk::get_time_in_seconds(); for(int i=0; i<10; ++i) { - for (int n=0; n < N; ++n) { - const double a = x[n]; - const double b = y[n]; - out2[n] = ( a+b*(a-b) )/a; - } + for (int n=0; n < N; ++n) { + const double a = x[n]; + const double b = y[n]; + out2[n] = ( a+b*(a-b) )/a; + } } t0 += stk::get_time_in_seconds(); std::cout << "Real ADD,SUB,MUL,DIV took " << t0 << " seconds" << std::endl; - double maxerr = 0.0; - for (int n=0; n < N; ++n) { - double err = stk::math::abs(out1[n]-out2[n]); - maxerr = stk::math::max(err,maxerr); - } - - ASSERT_NEAR( maxerr, 0.0, 1e-8 ); + ASSERT_NEAR( max_error(out1, out2), 0.0, 1e-8 ); } -TEST(StkSimd, SimdMiscSelfAddSubEtc) +TEST(StkSimd, SimdMiscSelfAddSubEtc) { int N = 10000; @@ -582,8 +521,6 @@ TEST(StkSimd, SimdMiscSelfAddSubEtc) std::vector out1(N); std::vector out2(N); - double maxerr = 0.0; - for (int n=0; n < N; ++n) { x[n] = 21*(rand()-0.5)/RAND_MAX; y[n] = 26*(rand()-0.4)/RAND_MAX; @@ -606,13 +543,7 @@ TEST(StkSimd, SimdMiscSelfAddSubEtc) out2[n] *= -b*a+stk::Traits::TWO/5; } - maxerr = 0.0; - for (int n=0; n < N; ++n) { - double err = stk::math::abs(out1[n]-out2[n]); - maxerr = stk::math::max(err,maxerr); - } - - ASSERT_NEAR( maxerr, 0.0, 1e-9 ); + ASSERT_NEAR( max_error(out1, out2), 0.0, 1e-9 ); for (int n=0; n < N; n+=stk::simd::ndoubles) { const stk::simd::Double a = stk::simd::load(&x[n]); @@ -629,13 +560,7 @@ TEST(StkSimd, SimdMiscSelfAddSubEtc) out2[n] /= -(b*a+5.6*out2[n]); } - maxerr = 0.0; - for (int n=0; n < N; ++n) { - double err = stk::math::abs(out1[n]-out2[n]); - maxerr = stk::math::max(err,maxerr); - } - - ASSERT_NEAR( maxerr, 0.0, 1e-9 ); + ASSERT_NEAR( max_error(out1, out2), 0.0, 1e-9 ); for (int n=0; n < N; n+=stk::simd::ndoubles) { const stk::simd::Double a = stk::simd::load(&x[n]); @@ -653,13 +578,7 @@ TEST(StkSimd, SimdMiscSelfAddSubEtc) out2[n] = c; } - maxerr = 0.0; - for (int n=0; n < N; ++n) { - double err = stk::math::abs(out1[n]-out2[n]); - maxerr = stk::math::max(err,maxerr); - } - - ASSERT_EQ( maxerr, 0.0); + ASSERT_EQ( max_error(out1, out2), 0.0); for (int n=0; n < N; n+=stk::simd::ndoubles) { const stk::simd::Double a = stk::simd::load(&x[n]); @@ -676,13 +595,7 @@ TEST(StkSimd, SimdMiscSelfAddSubEtc) out2[n] -= 5.2+(b/(a-5.4)+3.5/out2[n]); } - maxerr = 0.0; - for (int n=0; n < N; ++n) { - double err = stk::math::abs(out1[n]-out2[n]); - maxerr = stk::math::max(err,maxerr); - } - - ASSERT_NEAR( maxerr, 0.0, 0.0 ); + ASSERT_EQ( max_error(out1, out2), 0.0 ); for (int n=0; n < N; n+=stk::simd::ndoubles) { const stk::simd::Double a = stk::simd::load(&x[n]); @@ -699,14 +612,7 @@ TEST(StkSimd, SimdMiscSelfAddSubEtc) out2[n] = -c + 1.4*a/b; } - maxerr = 0.0; - for (int n=0; n < N; ++n) { - double err = stk::math::abs(out1[n]-out2[n]); - maxerr = stk::math::max(err,maxerr); - } - - ASSERT_NEAR( maxerr, 0.0, 1e-9 ); - + ASSERT_EQ( max_error(out1, out2), 0.0 ); } TEST(StkSimd, Simd_fmadd) @@ -751,14 +657,7 @@ TEST(StkSimd, Simd_fmadd) t0 += stk::get_time_in_seconds(); std::cout << "Real ADD,SUB,MUL,DIV took " << t0 << " seconds" << std::endl; - double maxerr = 0.0; - for (int n=0; n < N; ++n) { - double err = stk::math::abs(out1[n]-out2[n]); - maxerr = stk::math::max(err,maxerr); - } - - ASSERT_NEAR( maxerr, 0.0, 1e-14 ); - + ASSERT_NEAR( max_error(out1, out2), 0.0, 1e-14 ); } TEST(StkSimd, SimdSqrt) @@ -772,7 +671,7 @@ TEST(StkSimd, SimdSqrt) std::vector out2(N); for (int n=0; n < N; ++n) { - x[n] = 21*(rand()+1)/RAND_MAX; + x[n] = 21.0*(rand()+1)/RAND_MAX; } t0 = -stk::get_time_in_seconds(); @@ -795,13 +694,7 @@ TEST(StkSimd, SimdSqrt) t0 += stk::get_time_in_seconds(); std::cout << "Real SQRT took " << t0 << " seconds" << std::endl; - double maxerr = 0.0; - for (int n=0; n < N; ++n) { - double err = stk::math::abs(out1[n]-out2[n]); - maxerr = stk::math::max(err,maxerr); - } - - ASSERT_NEAR( maxerr, 0.0, 0.0 ); + ASSERT_NEAR( max_error(out1, out2), 0.0, 0.0 ); } TEST(StkSimd, SimdLog) @@ -810,11 +703,12 @@ TEST(StkSimd, SimdLog) double t0; // timing variable std::vector x(N); + std::vector out1(N); std::vector out2(N); for (int n=0; n < N; ++n) { - x[n] = 21*(rand()+1.0)/RAND_MAX+1.0; + x[n] = 21.0*(rand()+1.0)/RAND_MAX+1.0; } t0 = -stk::get_time_in_seconds(); @@ -835,14 +729,7 @@ TEST(StkSimd, SimdLog) std::cout << "Real Log took " << t0 << " seconds" << std::endl; const double epsilon = 1.e-14; - double maxerr = 0.0; - for (int n=0; n < N; ++n) { - double err = stk::math::abs(out1[n]-out2[n]); - ASSERT_NEAR( err, 0.0, epsilon) << "n = " << n; - maxerr = stk::math::max(err, maxerr); - } - - ASSERT_NEAR( maxerr, 0.0, epsilon); + ASSERT_NEAR( max_error(out1, out2), 0.0, epsilon ); } TEST(StkSimd, SimdExp) @@ -875,19 +762,12 @@ TEST(StkSimd, SimdExp) t0 += stk::get_time_in_seconds(); std::cout << "Real Exp took " << t0 << " seconds" << std::endl; - double maxerr = 0.0; - for (int n=0; n < N; ++n) { - double err = stk::math::abs(out1[n]-out2[n]); - maxerr = stk::math::max(err,maxerr); - } - - ASSERT_NEAR( maxerr, 0.0, 0.0 ); + ASSERT_NEAR( max_error(out1, out2), 0.0, 0.0 ); } TEST(StkSimd, SimdPowA) { - int N = 2000; - double t0; // timing variable + const int N = 2000; std::vector x(N); std::vector y(N/stk::simd::ndoubles); @@ -896,13 +776,13 @@ TEST(StkSimd, SimdPowA) std::vector out2(N); for (int n=0; n < N; ++n) { - x[n] = 5.4*(rand()/RAND_MAX)+0.002; + x[n] = 5.4*(rand()/RAND_MAX-0.5)+0.002; } for (int n=0; n < N/stk::simd::ndoubles; ++n) { y[n] = 3.2*(rand()/RAND_MAX-0.5)+0.2; } - t0 = -stk::get_time_in_seconds(); + double t0 = -stk::get_time_in_seconds(); for (int n=0; n < N; n+=stk::simd::ndoubles) { const stk::simd::Double a = stk::simd::load(&x[n]); const double b = y[n/stk::simd::ndoubles]; @@ -910,8 +790,8 @@ TEST(StkSimd, SimdPowA) stk::simd::store(&out1[n],c); } t0 += stk::get_time_in_seconds(); - std::cout << "SIMD Exp took " << t0 << " seconds" << std::endl; - + std::cout << "SIMD Pow took " << t0 << " seconds" << std::endl; + t0 = -stk::get_time_in_seconds(); for (int n=0; n < N/stk::simd::ndoubles; ++n) { double exp = y[n]; @@ -921,21 +801,14 @@ TEST(StkSimd, SimdPowA) } } t0 += stk::get_time_in_seconds(); - printf("Real Exp took %g ""seconds", t0); - - double maxerr = 0.0; - for (int n=0; n < N; ++n) { - double err = stk::math::abs(out1[n]-out2[n]); - maxerr = stk::math::max(err,maxerr); - } + std::cout << "Real Exp took " << t0 << " seconds" << std::endl; - ASSERT_NEAR( maxerr, 0.0, 0.0 ); + ASSERT_NEAR( max_error(out1, out2), 0.0, 0.0 ); } TEST(StkSimd, SimdPowB) { - int N = 2000; - double t0; // timing variable + int N = 400000; std::vector x(N); std::vector y(N); @@ -944,13 +817,13 @@ TEST(StkSimd, SimdPowB) std::vector out2(N); for (int n=0; n < N; ++n) { - x[n] = 5.4*(rand()/RAND_MAX)+0.001; + x[n] = 5.4*(rand()/RAND_MAX-0.5)+0.001; } for (int n=0; n < N; ++n) { y[n] = 3.2*(rand()/RAND_MAX-0.5)+0.1; } - t0 = -stk::get_time_in_seconds(); + double t0 = -stk::get_time_in_seconds(); for (int n=0; n < N; n+=stk::simd::ndoubles) { const stk::simd::Double a = stk::simd::load(&x[n]); const stk::simd::Double b = stk::simd::load(&y[n]); @@ -958,7 +831,7 @@ TEST(StkSimd, SimdPowB) stk::simd::store(&out1[n],c); } t0 += stk::get_time_in_seconds(); - std::cout << "SIMD Exp took " << t0 << " seconds" << std::endl; + std::cout << "SIMD Pow took " << t0 << " seconds" << std::endl; t0 = -stk::get_time_in_seconds(); for (int n=0; n < N; ++n) { @@ -967,15 +840,9 @@ TEST(StkSimd, SimdPowB) out2[n] = std::pow(a,b); } t0 += stk::get_time_in_seconds(); - std::cout << "Real Exp took " << t0 << " seconds" << std::endl; - - double maxerr = 0.0; - for (int n=0; n < N; ++n) { - double err = stk::math::abs(out1[n]-out2[n]); - maxerr = stk::math::max(err,maxerr); - } + std::cout << "Real Pow took " << t0 << " seconds" << std::endl; - ASSERT_NEAR( maxerr, 0.0, 0.0 ); + ASSERT_NEAR( max_error(out1, out2), 0.0, 0.0); } TEST(StkSimd, SimdPowC) @@ -1008,21 +875,16 @@ TEST(StkSimd, SimdPowC) t0 += stk::get_time_in_seconds(); std::cout << "Real Exp took " << t0 << " seconds" << std::endl; - double maxerr = 0.0; - for (int n=0; n < N; ++n) { - double err = stk::math::abs(out1[n]-out2[n]); - maxerr = stk::math::max(err,maxerr); - } - - ASSERT_NEAR( maxerr, 0.0, 0.0 ); + ASSERT_NEAR( max_error(out1, out2), 0.0, 0.0); } TEST(StkSimd, SimdCbrt) { - int N = 100000; + int N = 800000; double t0; // timing variable std::vector x(N); + std::vector out1(N); std::vector out2(N); @@ -1046,18 +908,11 @@ TEST(StkSimd, SimdCbrt) t0 += stk::get_time_in_seconds(); std::cout << "Real cbrt took " << t0 << " seconds" << std::endl; - double maxerr = 0.0; - for (int n=0; n < N; ++n) { - double err = stk::math::abs(out1[n]-out2[n]); - maxerr = stk::math::max(err,maxerr); - } - - ASSERT_NEAR( maxerr, 0.0, 2e-15 ); + ASSERT_NEAR( max_error(out1, out2), 0.0, 2e-15); } TEST(StkSimd, SimdTimeLoadStoreDataLayout) { - double t0; const int N = 20000; @@ -1170,32 +1025,12 @@ TEST(StkSimd, SimdTimeLoadStoreDataLayout) } // figure out error - double maxerr = 0.0; - for (int n=0; n < sz*N; ++n) { - double err = stk::math::abs(y[n]-z[n]); - maxerr = stk::math::max(err,maxerr); - } - - //printf("maxerror = %g\n",maxerr); - - ASSERT_NEAR( maxerr, 0.0, 1.0e-16 ); - - // figure out error - maxerr = 0.0; - for (int n=0; n < N; ++n) { - double err = stk::math::abs(y[n]-w[n]); - maxerr = stk::math::max(err,maxerr); - } - - //printf("maxerror = %g\n",maxerr); - - ASSERT_NEAR( maxerr, 0.0, 1.0e-16 ); - + ASSERT_NEAR( max_error(y, z), 0.0, 1.0e-16 ); + ASSERT_NEAR( max_error(y, w), 0.0, 1.0e-16 ); } TEST(StkSimd, SimdTimeLoadStoreInnerProduct) { - double t0; const int N = 20000; @@ -1311,33 +1146,13 @@ TEST(StkSimd, SimdTimeLoadStoreInnerProduct) } // figure out error - double maxerr = 0.0; - for (int n=0; n < N; ++n) { - double err = stk::math::abs(y[n]-z[n]); - maxerr = stk::math::max(err,maxerr); - } - - //printf("maxerror = %g\n",maxerr); - - ASSERT_NEAR( maxerr, 0.0, 1.0e-16 ); - - // figure out error - maxerr = 0.0; - for (int n=0; n < N; ++n) { - double err = stk::math::abs(y[n]-w[n]); - maxerr = stk::math::max(err,maxerr); - } - - //printf("maxerror = %g\n",maxerr); - - ASSERT_NEAR( maxerr, 0.0, 1.0e-16 ); - + ASSERT_NEAR( max_error(y,z), 0.0, 1.0e-16 ); + ASSERT_NEAR( max_error(y,w), 0.0, 1.0e-16 ); } TEST(StkSimd, SimdIfThenBool) { - typedef stk::Traits::bool_type double_bool; typedef stk::Traits::bool_type Doubles_bool; @@ -1350,7 +1165,6 @@ TEST(StkSimd, SimdIfThenBool) const int N = 2000; const double a = 5.1; const double b = -3.2; - double maxerr = 0.0; std::vector x(N); std::vector y(N); @@ -1386,15 +1200,7 @@ TEST(StkSimd, SimdIfThenBool) stk::simd::store(&z1[n],zl); } - maxerr = 0.0; - for (int n=0; n < N; ++n) { - double err = stk::math::abs(z1[n]-z2[n]); - maxerr = stk::math::max(err,maxerr); - err = stk::math::abs(z1[n]-z3[n]); - maxerr = stk::math::max(err,maxerr); - } - - ASSERT_NEAR( maxerr, 0.0, 0.0 ); + ASSERT_NEAR( max_error(z1, z2, z3), 0.0, 0.0 ); // less than equal @@ -1411,15 +1217,7 @@ TEST(StkSimd, SimdIfThenBool) stk::simd::store(&z1[n],zl); } - maxerr = 0.0; - for (int n=0; n < N; ++n) { - double err = stk::math::abs(z1[n]-z2[n]); - maxerr = stk::math::max(err,maxerr); - err = stk::math::abs(z1[n]-z3[n]); - maxerr = stk::math::max(err,maxerr); - } - - ASSERT_NEAR( maxerr, 0.0, 0.0 ); + ASSERT_NEAR( max_error(z1, z2, z3), 0.0, 0.0 ); // equal @@ -1436,16 +1234,7 @@ TEST(StkSimd, SimdIfThenBool) stk::simd::store(&z1[n],zl); } - maxerr = 0.0; - for (int n=0; n < N; ++n) { - double err = stk::math::abs(z1[n]-z2[n]); - maxerr = stk::math::max(err,maxerr); - err = stk::math::abs(z1[n]-z3[n]); - maxerr = stk::math::max(err,maxerr); - } - - ASSERT_NEAR( maxerr, 0.0, 0.0 ); - + ASSERT_NEAR( max_error(z1, z2, z3), 0.0, 0.0 ); // greater than equal @@ -1462,15 +1251,7 @@ TEST(StkSimd, SimdIfThenBool) stk::simd::store(&z1[n],zl); } - maxerr = 0.0; - for (int n=0; n < N; ++n) { - double err = stk::math::abs(z1[n]-z2[n]); - maxerr = stk::math::max(err,maxerr); - err = stk::math::abs(z1[n]-z3[n]); - maxerr = stk::math::max(err,maxerr); - } - - ASSERT_NEAR( maxerr, 0.0, 0.0 ); + ASSERT_NEAR( max_error(z1, z2, z3), 0.0, 0.0 ); // greater than @@ -1487,15 +1268,7 @@ TEST(StkSimd, SimdIfThenBool) stk::simd::store(&z1[n],zl); } - maxerr = 0.0; - for (int n=0; n < N; ++n) { - double err = stk::math::abs(z1[n]-z2[n]); - maxerr = stk::math::max(err,maxerr); - err = stk::math::abs(z1[n]-z3[n]); - maxerr = stk::math::max(err,maxerr); - } - - ASSERT_NEAR( maxerr, 0.0, 0.0 ); + ASSERT_NEAR( max_error(z1, z2, z3), 0.0, 0.0 ); // not equal @@ -1512,15 +1285,7 @@ TEST(StkSimd, SimdIfThenBool) stk::simd::store(&z1[n],zl); } - maxerr = 0.0; - for (int n=0; n < N; ++n) { - double err = stk::math::abs(z1[n]-z2[n]); - maxerr = stk::math::max(err,maxerr); - err = stk::math::abs(z1[n]-z3[n]); - maxerr = stk::math::max(err,maxerr); - } - - ASSERT_NEAR( maxerr, 0.0, 0.0 ); + ASSERT_NEAR( max_error(z1, z2, z3), 0.0, 0.0 ); // if then zero @@ -1537,15 +1302,7 @@ TEST(StkSimd, SimdIfThenBool) stk::simd::store(&z1[n],zl); } - maxerr = 0.0; - for (int n=0; n < N; ++n) { - double err = stk::math::abs(z1[n]-z2[n]); - maxerr = stk::math::max(err,maxerr); - err = stk::math::abs(z1[n]-z3[n]); - maxerr = stk::math::max(err,maxerr); - } - - ASSERT_NEAR( maxerr, 0.0, 0.0 ); + ASSERT_NEAR( max_error(z1, z2, z3), 0.0, 0.0 ); // if ! then @@ -1562,15 +1319,7 @@ TEST(StkSimd, SimdIfThenBool) stk::simd::store(&z1[n],zl); } - maxerr = 0.0; - for (int n=0; n < N; ++n) { - double err = stk::math::abs(z1[n]-z2[n]); - maxerr = stk::math::max(err,maxerr); - err = stk::math::abs(z1[n]-z3[n]); - maxerr = stk::math::max(err,maxerr); - } - - ASSERT_NEAR( maxerr, 0.0, 0.0 ); + ASSERT_NEAR( max_error(z1, z2, z3), 0.0, 0.0 ); // && @@ -1591,15 +1340,7 @@ TEST(StkSimd, SimdIfThenBool) stk::simd::store(&z1[n],zl); } - maxerr = 0.0; - for (int n=0; n < N; ++n) { - double err = stk::math::abs(z1[n]-z2[n]); - maxerr = stk::math::max(err,maxerr); - err = stk::math::abs(z1[n]-z3[n]); - maxerr = stk::math::max(err,maxerr); - } - - ASSERT_NEAR( maxerr, 0.0, 0.0 ); + ASSERT_NEAR( max_error(z1, z2, z3), 0.0, 0.0 ); // || @@ -1622,15 +1363,7 @@ TEST(StkSimd, SimdIfThenBool) stk::simd::store(&z1[n],zl); } - maxerr = 0.0; - for (int n=0; n < N; ++n) { - double err = stk::math::abs(z1[n]-z2[n]); - maxerr = stk::math::max(err,maxerr); - err = stk::math::abs(z1[n]-z3[n]); - maxerr = stk::math::max(err,maxerr); - } - - ASSERT_NEAR( maxerr, 0.0, 0.0 ); + ASSERT_NEAR( max_error(z1, z2, z3), 0.0, 0.0 ); // are_any @@ -1668,7 +1401,6 @@ TEST(StkSimd, SimdIfThenBool) #if defined(STK_SIMD) // these don't make sense for non-simd - for (int n=0; n < N; n+=stk::simd::ndoubles) { bool anyl=false; for (int i=0; i < stk::simd::ndoubles-1; ++i) { @@ -1709,7 +1441,6 @@ TEST(StkSimd, SimdTimeSet1VsConstDoubles) { int N = 1000000; double t0; // timing variable - double maxerr; std::vector x(N); @@ -1755,18 +1486,7 @@ TEST(StkSimd, SimdTimeSet1VsConstDoubles) t0 += stk::get_time_in_seconds(); std::cout << "Non simd took " << t0 << " seconds" << std::endl; - maxerr = 0.0; - for (int n=0; n < N; ++n) { - double err = stk::math::abs(out1[n]-out2[n]); - maxerr = stk::math::max(err,maxerr); - err = stk::math::abs(out1[n]-out3[n]); - maxerr = stk::math::max(err,maxerr); - err = stk::math::abs(out1[n]-out4[n]); - maxerr = stk::math::max(err,maxerr); - } - - ASSERT_NEAR( maxerr, 0.0, 0.0 ); - + ASSERT_NEAR( max_error(out1, out2, out3, out4), 0.0, 0.0 ); } template @@ -1791,7 +1511,6 @@ template static void negate_vec2(REAL_TYPE* const in, REAL_ TEST(StkSimd, NegatingAVector) { - int N = 8000; std::vector x(3*N); @@ -1822,21 +1541,11 @@ TEST(StkSimd, NegatingAVector) stk::simd::store_array<3>(&out3[3*n],b); } - double maxerr = 0.0; - for (int n=0; n < 3*N; ++n) { - double err = stk::math::abs(out1[n]-out2[n]); - maxerr = stk::math::max(err,maxerr); - err = stk::math::abs(out1[n]-out3[n]); - maxerr = stk::math::max(err,maxerr); - } - - ASSERT_NEAR( maxerr, 0.0, 0.0 ); - + ASSERT_NEAR( max_error(out1, out2, out3), 0.0, 0.0 ); } TEST(StkSimd, simd_isnan) { - const int N = stk::simd::ndoubles; std::vector x(N); @@ -1856,9 +1565,8 @@ TEST(StkSimd, simd_isnan) IsNaN = stk::math::isnan(Y); - ASSERT_TRUE( stk::simd::are_any(IsNaN) ); + ASSERT_TRUE( stk::simd::are_any(IsNaN) ); ASSERT_TRUE( !stk::simd::are_all(IsNaN) || (stk::simd::ndoubles==1) ); - } std::vector X_RandomValues(int N = 500000) @@ -1880,10 +1588,8 @@ std::vector Y_RandomValues(std::vector& x) return y; } - TEST(StkSimd, ReduceSum) { - double t0; // timing variable std::vector x = X_RandomValues(); @@ -1927,7 +1633,6 @@ TEST(StkSimd, ReduceSum) //printf("sums = %g %g\n",sum_val, save_sum); EXPECT_NEAR( sum_val-save_sum, 0.0, 1e-12*sum_val ); - } TEST(StkSimd, ReduceMax) @@ -1975,7 +1680,6 @@ TEST(StkSimd, ReduceMax) //printf("sums = %g %g\n",sum_val, save_sum); EXPECT_EQ( max_val, save_max); - } TEST(StkSimd, ReduceMin) @@ -2021,6 +1725,5 @@ TEST(StkSimd, ReduceMin) //printf("sums = %g %g\n",sum_val, save_sum); EXPECT_EQ( min_val, save_min); - } diff --git a/packages/stk/stk_unit_tests/stk_simd/UnitTestStkSimdMathFloat.cpp b/packages/stk/stk_unit_tests/stk_simd/UnitTestStkSimdMathFloat.cpp index bcd535b90547..cfbd6edf7bb6 100644 --- a/packages/stk/stk_unit_tests/stk_simd/UnitTestStkSimdMathFloat.cpp +++ b/packages/stk/stk_unit_tests/stk_simd/UnitTestStkSimdMathFloat.cpp @@ -2,11 +2,9 @@ #include #include #include +#include "SimdFixture.hpp" - -// Math ToolKit unit tests - -TEST(StkSimd, SimdAddSubtractMultDivideFloat) +TEST(StkSimd, SimdAddSubtractMultDivideFloat) { int N = 400000; double t0; // timing variable @@ -23,31 +21,29 @@ TEST(StkSimd, SimdAddSubtractMultDivideFloat) } t0 = -stk::get_time_in_seconds(); - for (int n=0; n < N; n+=stk::simd::nfloats) { - const stk::simd::Float a = stk::simd::load(&x[n]); - const stk::simd::Float b = stk::simd::load(&y[n]); - const stk::simd::Float c = ( b*(a-b) )/a + 1; - stk::simd::store(&out1[n],c); + for(int i=0; i<10; ++i) { + for (int n=0; n < N; n+=stk::simd::nfloats) { + const stk::simd::Float a = stk::simd::load(&x[n]); + const stk::simd::Float b = stk::simd::load(&y[n]); + const stk::simd::Float c = ( b*(a-b) )/a + 1; + stk::simd::store(&out1[n],c); + } } t0 += stk::get_time_in_seconds(); std::cout << "SIMD ADD,SUB,MUL,DIV took " << t0 << " seconds" << std::endl; t0 = -stk::get_time_in_seconds(); - for (int n=0; n < N; ++n) { - const float a = x[n]; - const float b = y[n]; - out2[n] = ( b*(a-b) )/a + 1; + for(int i=0; i<10; ++i) { + for (int n=0; n < N; ++n) { + const float a = x[n]; + const float b = y[n]; + out2[n] = ( b*(a-b) )/a + 1; + } } t0 += stk::get_time_in_seconds(); std::cout << "Real ADD,SUB,MUL,DIV took " << t0 << " seconds" << std::endl; - float maxerr = 0.0; - for (int n=0; n < N; ++n) { - float err = stk::math::abs(out1[n]-out2[n]); - maxerr = stk::math::max(err,maxerr); - } - - ASSERT_EQ( maxerr, 0.0 ); + ASSERT_EQ( max_error(out1, out2), 0.0 ); } TEST(StkSimd, SimdMiscSelfAddSubEtcFloat) @@ -60,8 +56,6 @@ TEST(StkSimd, SimdMiscSelfAddSubEtcFloat) std::vector out1(N); std::vector out2(N); - float maxerr = 0.0; - for (int n=0; n < N; ++n) { x[n] = 21*(rand()-0.5)/RAND_MAX; y[n] = 26*(rand()-0.4)/RAND_MAX; @@ -84,13 +78,7 @@ TEST(StkSimd, SimdMiscSelfAddSubEtcFloat) out2[n] *= -b + a + stk::Traits::TWO/5; } - maxerr = 0.0; - for (int n=0; n < N; ++n) { - float err = stk::math::abs(out1[n]-out2[n]); - maxerr = stk::math::max(err,maxerr); - } - - ASSERT_EQ( maxerr, 0.0 ); + ASSERT_EQ( max_error(out1, out2), 0.0 ); for (int n=0; n < N; n+=stk::simd::nfloats) { const stk::simd::Float a = stk::simd::load(&x[n]); @@ -107,13 +95,7 @@ TEST(StkSimd, SimdMiscSelfAddSubEtcFloat) out2[n] /= -b+a+5.6f*out2[n]; } - maxerr = 0.0; - for (int n=0; n < N; ++n) { - float err = stk::math::abs(out1[n]-out2[n]); - maxerr = stk::math::max(err,maxerr); - } - - ASSERT_EQ( maxerr, 0.0 ); + ASSERT_EQ( max_error(out1, out2), 0.0 ); for (int n=0; n < N; n+=stk::simd::nfloats) { const stk::simd::Float a = stk::simd::load(&x[n]); @@ -131,13 +113,7 @@ TEST(StkSimd, SimdMiscSelfAddSubEtcFloat) out2[n] = c; } - maxerr = 0.0; - for (int n=0; n < N; ++n) { - float err = stk::math::abs(out1[n]-out2[n]); - maxerr = stk::math::max(err,maxerr); - } - - ASSERT_EQ( maxerr, 0.0); + ASSERT_EQ( max_error(out1, out2), 0.0); for (int n=0; n < N; n+=stk::simd::nfloats) { const stk::simd::Float a = stk::simd::load(&x[n]); @@ -154,13 +130,7 @@ TEST(StkSimd, SimdMiscSelfAddSubEtcFloat) out2[n] -= 5.2f+(b/(a-5.4f)+3.5f/out2[n]); } - maxerr = 0.0; - for (int n=0; n < N; ++n) { - float err = stk::math::abs(out1[n]-out2[n]); - maxerr = stk::math::max(err,maxerr); - } - - ASSERT_EQ( maxerr, 0.0 ); + ASSERT_EQ( max_error(out1, out2), 0.0 ); for (int n=0; n < N; n+=stk::simd::nfloats) { const stk::simd::Float a = stk::simd::load(&x[n]); @@ -177,18 +147,11 @@ TEST(StkSimd, SimdMiscSelfAddSubEtcFloat) out2[n] = -c + 1.4f*a/b; } - maxerr = 0.0; - for (int n=0; n < N; ++n) { - float err = stk::math::abs(out1[n]-out2[n]); - maxerr = stk::math::max(err,maxerr); - } - - ASSERT_EQ( maxerr, 0.0 ); + ASSERT_EQ( max_error(out1, out2), 0.0 ); } TEST(StkSimd, Simd_fmaddFloat) { - int N = 400000; double t0; // timing variable @@ -229,19 +192,11 @@ TEST(StkSimd, Simd_fmaddFloat) t0 += stk::get_time_in_seconds(); std::cout << "Real ADD,SUB,MUL,DIV took " << t0 << " seconds" << std::endl; - float maxerr = 0.0; - for (int n=0; n < N; ++n) { - float err = stk::math::abs(out1[n]-out2[n]); - maxerr = stk::math::max(err,maxerr); - } - - ASSERT_NEAR( maxerr, 0.0, 1e-5 ); - + ASSERT_NEAR( max_error(out1, out2), 0.0, 1e-5 ); } TEST(StkSimd, SimdSqrtFloat) { - int N = 400000; double t0; // timing variable @@ -251,7 +206,7 @@ TEST(StkSimd, SimdSqrtFloat) std::vector out2(N); for (int n=0; n < N; ++n) { - x[n] = 21.0f*(rand()+1)/RAND_MAX; + x[n] = 21.0*(rand()+1)/RAND_MAX; } t0 = -stk::get_time_in_seconds(); @@ -271,28 +226,21 @@ TEST(StkSimd, SimdSqrtFloat) t0 += stk::get_time_in_seconds(); std::cout << "Real SQRT took " << t0 << " seconds" << std::endl; - float maxerr = 0.0; - for (int n=0; n < N; ++n) { - float err = stk::math::abs(out1[n]-out2[n]); - maxerr = stk::math::max(err,maxerr); - } - - ASSERT_NEAR( maxerr, 0.0, 0.0 ); + ASSERT_NEAR( max_error(out1, out2), 0.0, 0.0 ); } TEST(StkSimd, SimdLogFloat) { - int N = 400000; double t0; // timing variable std::vector x(N); - + std::vector out1(N); std::vector out2(N); for (int n=0; n < N; ++n) { - x[n] = 21.0f*(rand()+1.0f)/RAND_MAX; + x[n] = 21.0*(rand()+1.0)/RAND_MAX+1.0; } t0 = -stk::get_time_in_seconds(); @@ -312,20 +260,13 @@ TEST(StkSimd, SimdLogFloat) t0 += stk::get_time_in_seconds(); std::cout << "Real Log took " << t0 << " seconds" << std::endl; - float maxerr = 0.0; - for (int n=0; n < N; ++n) { - float err = stk::math::abs(out1[n]-out2[n]); - maxerr = stk::math::max(err,maxerr); - } - - ASSERT_NEAR( maxerr, 0.0, 1.0e-6 ); + const double epsilon = 1.e-6; + ASSERT_NEAR( max_error(out1, out2), 0.0, epsilon ); } TEST(StkSimd, SimdExpFloat) { - int N = 400000; - double t0; // timing variable std::vector x(N); @@ -333,10 +274,10 @@ TEST(StkSimd, SimdExpFloat) std::vector out2(N); for (int n=0; n < N; ++n) { - x[n] = 5.4f*(rand()/RAND_MAX-0.5); + x[n] = 5.4*(rand()/RAND_MAX-0.5); } - t0 = -stk::get_time_in_seconds(); + double t0 = -stk::get_time_in_seconds(); for (int n=0; n < N; n+=stk::simd::nfloats) { const stk::simd::Float a = stk::simd::load(&x[n]); const stk::simd::Float b = stk::math::exp(a); @@ -353,20 +294,12 @@ TEST(StkSimd, SimdExpFloat) t0 += stk::get_time_in_seconds(); std::cout << "Real Exp took " << t0 << " seconds" << std::endl; - float maxerr = 0.0; - for (int n=0; n < N; ++n) { - float err = stk::math::abs(out1[n]-out2[n]); - maxerr = stk::math::max(err,maxerr); - } - - ASSERT_NEAR( maxerr, 0.0, 0.0 ); + ASSERT_NEAR( max_error(out1, out2), 0.0, 0.0 ); } TEST(StkSimd, SimdPowAFloat) { - - int N = 400000; - double t0; // timing variable + const int N = 2000; std::vector x(N); std::vector y(N/stk::simd::nfloats); @@ -375,13 +308,13 @@ TEST(StkSimd, SimdPowAFloat) std::vector out2(N); for (int n=0; n < N; ++n) { - x[n] = 5.4*(rand()/RAND_MAX-0.5); + x[n] = 5.4*(rand()/RAND_MAX-0.5)+0.002; } for (int n=0; n < N/stk::simd::nfloats; ++n) { - y[n] = 3.2*(rand()/RAND_MAX-0.5); + y[n] = 3.2*(rand()/RAND_MAX-0.5)+0.2; } - t0 = -stk::get_time_in_seconds(); + double t0 = -stk::get_time_in_seconds(); for (int n=0; n < N; n+=stk::simd::nfloats) { const stk::simd::Float a = stk::simd::load(&x[n]); const float b = y[n/stk::simd::nfloats]; @@ -389,33 +322,25 @@ TEST(StkSimd, SimdPowAFloat) stk::simd::store(&out1[n],c); } t0 += stk::get_time_in_seconds(); - std::cout << "SIMD Exp took " << t0 << " seconds" << std::endl; - + std::cout << "SIMD Pow took " << t0 << " seconds" << std::endl; + t0 = -stk::get_time_in_seconds(); for (int n=0; n < N/stk::simd::nfloats; ++n) { float exp = y[n]; for (int i=0; i < stk::simd::nfloats; ++i) { const float a = x[stk::simd::nfloats*n+i]; - out2[stk::simd::nfloats*n+i] = std::pow(a,exp); + out2[stk::simd::nfloats*n+i] = stk::math::pow(a,exp); } } t0 += stk::get_time_in_seconds(); std::cout << "Real Exp took " << t0 << " seconds" << std::endl; - float maxerr = 0.0; - for (int n=0; n < N; ++n) { - float err = stk::math::abs(out1[n]-out2[n]); - maxerr = stk::math::max(err,maxerr); - } - - ASSERT_NEAR( maxerr, 0.0, 0.0 ); + ASSERT_NEAR( max_error(out1, out2), 0.0, 0.0 ); } TEST(StkSimd, SimdPowBFloat) { - int N = 400000; - double t0; // timing variable std::vector x(N); std::vector y(N); @@ -424,13 +349,13 @@ TEST(StkSimd, SimdPowBFloat) std::vector out2(N); for (int n=0; n < N; ++n) { - x[n] = 5.4*(rand()/RAND_MAX-0.5); + x[n] = 5.4*(rand()/RAND_MAX-0.5)+0.001; } for (int n=0; n < N; ++n) { - y[n] = 3.2*(rand()/RAND_MAX-0.5); + y[n] = 3.2*(rand()/RAND_MAX-0.5)+0.1; } - t0 = -stk::get_time_in_seconds(); + double t0 = -stk::get_time_in_seconds(); for (int n=0; n < N; n+=stk::simd::nfloats) { const stk::simd::Float a = stk::simd::load(&x[n]); const stk::simd::Float b = stk::simd::load(&y[n]); @@ -438,7 +363,7 @@ TEST(StkSimd, SimdPowBFloat) stk::simd::store(&out1[n],c); } t0 += stk::get_time_in_seconds(); - std::cout << "SIMD Exp took " << t0 << " seconds" << std::endl; + std::cout << "SIMD Pow took " << t0 << " seconds" << std::endl; t0 = -stk::get_time_in_seconds(); for (int n=0; n < N; ++n) { @@ -447,29 +372,53 @@ TEST(StkSimd, SimdPowBFloat) out2[n] = std::pow(a,b); } t0 += stk::get_time_in_seconds(); - std::cout << "Real Exp took " << t0 << " seconds" << std::endl; + std::cout << "Real Pow took " << t0 << " seconds" << std::endl; + + ASSERT_NEAR( max_error(out1, out2), 0.0, 0.0); +} + +TEST(StkSimd, SimdPowCFloat) +{ + int N = 100000; + double t0; // timing variable + + std::vector x(N); + std::vector out1(N); + std::vector out2(N); - float maxerr = 0.0; for (int n=0; n < N; ++n) { - float err = stk::math::abs(out1[n]-out2[n]); - maxerr = stk::math::max(err,maxerr); + x[n] = 1.34*(rand()/RAND_MAX-0.5); } - - ASSERT_NEAR( maxerr, 0.0, 0.0 ); + t0 = -stk::get_time_in_seconds(); + for (int n=0; n < N; n+=stk::simd::nfloats) { + const stk::simd::Float a = stk::simd::load(&x[n]); + const stk::simd::Float c = stk::math::pow(a,3); + stk::simd::store(&out1[n],c); + } + t0 += stk::get_time_in_seconds(); + std::cout << "SIMD Exp took " << t0 << " seconds" << std::endl; + + t0 = -stk::get_time_in_seconds(); + for (int n=0; n < N; ++n) { + const float a = x[n]; + out2[n] = std::pow(a,3); + } + t0 += stk::get_time_in_seconds(); + std::cout << "Real Exp took " << t0 << " seconds" << std::endl; + + ASSERT_NEAR( max_error(out1, out2), 0.0, 0.0); } TEST(StkSimd, SimdCbrtFloat) { - int N = 800000; double t0; // timing variable std::vector x(N); - + std::vector out1(N); std::vector out2(N); - for (int n=0; n < N; ++n) { x[n] = 21*(rand()-0.5)/RAND_MAX; @@ -486,23 +435,16 @@ TEST(StkSimd, SimdCbrtFloat) t0 = -stk::get_time_in_seconds(); for (int n=0; n < N; ++n) { - out2[n] = std::cbrt(x[n]); + out2[n] = stk::math::cbrt(x[n]); } t0 += stk::get_time_in_seconds(); std::cout << "Real cbrt took " << t0 << " seconds" << std::endl; - float maxerr = 0.0; - for (int n=0; n < N; ++n) { - float err = stk::math::abs(out1[n]-out2[n]); - maxerr = stk::math::max(err,maxerr); - } - - ASSERT_NEAR( maxerr, 0.0, 2.5e-7 ); + ASSERT_NEAR( max_error(out1, out2), 0.0, 2.5e-7 ); } TEST(StkSimd, SimdTimeLoadStoreDataLayoutFloat) { - double t0; const int N = 20000; @@ -615,32 +557,12 @@ TEST(StkSimd, SimdTimeLoadStoreDataLayoutFloat) } // figure out error - float maxerr = 0.0; - for (int n=0; n < sz*N; ++n) { - float err = stk::math::abs(y[n]-z[n]); - maxerr = stk::math::max(err,maxerr); - } - - //printf("maxerror = %g\n",maxerr); - - ASSERT_NEAR( maxerr, 0.0, 1.0e-16 ); - - // figure out error - maxerr = 0.0; - for (int n=0; n < N; ++n) { - float err = stk::math::abs(y[n]-w[n]); - maxerr = stk::math::max(err,maxerr); - } - - //printf("maxerror = %g\n",maxerr); - - ASSERT_NEAR( maxerr, 0.0, 1.0e-16 ); - + ASSERT_NEAR( max_error(y, z), 0.0, 1.0e-16 ); + ASSERT_NEAR( max_error(y, w), 0.0, 1.0e-16 ); } TEST(StkSimd, SimdTimeLoadStoreInnerProductFloat) { - double t0; const int N = 20000; @@ -756,33 +678,13 @@ TEST(StkSimd, SimdTimeLoadStoreInnerProductFloat) } // figure out error - float maxerr = 0.0; - for (int n=0; n < N; ++n) { - float err = stk::math::abs(y[n]-z[n]); - maxerr = stk::math::max(err,maxerr); - } - - //printf("maxerror = %g\n",maxerr); - - ASSERT_NEAR( maxerr, 0.0, 1.0e-16 ); - - // figure out error - maxerr = 0.0; - for (int n=0; n < N; ++n) { - float err = stk::math::abs(y[n]-w[n]); - maxerr = stk::math::max(err,maxerr); - } - - //printf("maxerror = %g\n",maxerr); - - ASSERT_NEAR( maxerr, 0.0, 1.0e-16 ); - + ASSERT_NEAR( max_error(y,z), 0.0, 1.0e-16 ); + ASSERT_NEAR( max_error(y,w), 0.0, 1.0e-16 ); } TEST(StkSimd, SimdIfThenBoolFloat) { - typedef stk::Traits::bool_type float_bool; typedef stk::Traits::bool_type Floats_bool; @@ -795,7 +697,6 @@ TEST(StkSimd, SimdIfThenBoolFloat) const int N = 2000; const float a = 5.1; const float b = -3.2; - float maxerr = 0.0; std::vector x(N); std::vector y(N); @@ -831,15 +732,7 @@ TEST(StkSimd, SimdIfThenBoolFloat) stk::simd::store(&z1[n],zl); } - maxerr = 0.0; - for (int n=0; n < N; ++n) { - float err = stk::math::abs(z1[n]-z2[n]); - maxerr = stk::math::max(err,maxerr); - err = stk::math::abs(z1[n]-z3[n]); - maxerr = stk::math::max(err,maxerr); - } - - ASSERT_NEAR( maxerr, 0.0, 0.0 ); + ASSERT_NEAR( max_error(z1, z2, z3), 0.0, 0.0 ); // less than equal @@ -856,15 +749,7 @@ TEST(StkSimd, SimdIfThenBoolFloat) stk::simd::store(&z1[n],zl); } - maxerr = 0.0; - for (int n=0; n < N; ++n) { - float err = stk::math::abs(z1[n]-z2[n]); - maxerr = stk::math::max(err,maxerr); - err = stk::math::abs(z1[n]-z3[n]); - maxerr = stk::math::max(err,maxerr); - } - - ASSERT_NEAR( maxerr, 0.0, 0.0 ); + ASSERT_NEAR( max_error(z1, z2, z3), 0.0, 0.0 ); // equal @@ -881,16 +766,7 @@ TEST(StkSimd, SimdIfThenBoolFloat) stk::simd::store(&z1[n],zl); } - maxerr = 0.0; - for (int n=0; n < N; ++n) { - float err = stk::math::abs(z1[n]-z2[n]); - maxerr = stk::math::max(err,maxerr); - err = stk::math::abs(z1[n]-z3[n]); - maxerr = stk::math::max(err,maxerr); - } - - ASSERT_NEAR( maxerr, 0.0, 0.0 ); - + ASSERT_NEAR( max_error(z1, z2, z3), 0.0, 0.0 ); // greater than equal @@ -907,15 +783,7 @@ TEST(StkSimd, SimdIfThenBoolFloat) stk::simd::store(&z1[n],zl); } - maxerr = 0.0; - for (int n=0; n < N; ++n) { - float err = stk::math::abs(z1[n]-z2[n]); - maxerr = stk::math::max(err,maxerr); - err = stk::math::abs(z1[n]-z3[n]); - maxerr = stk::math::max(err,maxerr); - } - - ASSERT_NEAR( maxerr, 0.0, 0.0 ); + ASSERT_NEAR( max_error(z1, z2, z3), 0.0, 0.0 ); // greater than @@ -932,15 +800,7 @@ TEST(StkSimd, SimdIfThenBoolFloat) stk::simd::store(&z1[n],zl); } - maxerr = 0.0; - for (int n=0; n < N; ++n) { - float err = stk::math::abs(z1[n]-z2[n]); - maxerr = stk::math::max(err,maxerr); - err = stk::math::abs(z1[n]-z3[n]); - maxerr = stk::math::max(err,maxerr); - } - - ASSERT_NEAR( maxerr, 0.0, 0.0 ); + ASSERT_NEAR( max_error(z1, z2, z3), 0.0, 0.0 ); // not equal @@ -957,15 +817,7 @@ TEST(StkSimd, SimdIfThenBoolFloat) stk::simd::store(&z1[n],zl); } - maxerr = 0.0; - for (int n=0; n < N; ++n) { - float err = stk::math::abs(z1[n]-z2[n]); - maxerr = stk::math::max(err,maxerr); - err = stk::math::abs(z1[n]-z3[n]); - maxerr = stk::math::max(err,maxerr); - } - - ASSERT_NEAR( maxerr, 0.0, 0.0 ); + ASSERT_NEAR( max_error(z1, z2, z3), 0.0, 0.0 ); // if then zero @@ -982,15 +834,7 @@ TEST(StkSimd, SimdIfThenBoolFloat) stk::simd::store(&z1[n],zl); } - maxerr = 0.0; - for (int n=0; n < N; ++n) { - float err = stk::math::abs(z1[n]-z2[n]); - maxerr = stk::math::max(err,maxerr); - err = stk::math::abs(z1[n]-z3[n]); - maxerr = stk::math::max(err,maxerr); - } - - ASSERT_NEAR( maxerr, 0.0, 0.0 ); + ASSERT_NEAR( max_error(z1, z2, z3), 0.0, 0.0 ); // if ! then @@ -1007,15 +851,7 @@ TEST(StkSimd, SimdIfThenBoolFloat) stk::simd::store(&z1[n],zl); } - maxerr = 0.0; - for (int n=0; n < N; ++n) { - float err = stk::math::abs(z1[n]-z2[n]); - maxerr = stk::math::max(err,maxerr); - err = stk::math::abs(z1[n]-z3[n]); - maxerr = stk::math::max(err,maxerr); - } - - ASSERT_NEAR( maxerr, 0.0, 0.0 ); + ASSERT_NEAR( max_error(z1, z2, z3), 0.0, 0.0 ); // && @@ -1036,15 +872,7 @@ TEST(StkSimd, SimdIfThenBoolFloat) stk::simd::store(&z1[n],zl); } - maxerr = 0.0; - for (int n=0; n < N; ++n) { - float err = stk::math::abs(z1[n]-z2[n]); - maxerr = stk::math::max(err,maxerr); - err = stk::math::abs(z1[n]-z3[n]); - maxerr = stk::math::max(err,maxerr); - } - - ASSERT_NEAR( maxerr, 0.0, 0.0 ); + ASSERT_NEAR( max_error(z1, z2, z3), 0.0, 0.0 ); // || @@ -1067,15 +895,7 @@ TEST(StkSimd, SimdIfThenBoolFloat) stk::simd::store(&z1[n],zl); } - maxerr = 0.0; - for (int n=0; n < N; ++n) { - float err = stk::math::abs(z1[n]-z2[n]); - maxerr = stk::math::max(err,maxerr); - err = stk::math::abs(z1[n]-z3[n]); - maxerr = stk::math::max(err,maxerr); - } - - ASSERT_NEAR( maxerr, 0.0, 0.0 ); + ASSERT_NEAR( max_error(z1, z2, z3), 0.0, 0.0 ); // any @@ -1113,7 +933,6 @@ TEST(StkSimd, SimdIfThenBoolFloat) #if defined(StkSimd_SIMD) // these don't make sense for non-simd - for (int n=0; n < N; n+=stk::simd::nfloats) { bool anyl=false; for (int i=0; i < stk::simd::nfloats-1; ++i) { @@ -1147,17 +966,11 @@ TEST(StkSimd, SimdIfThenBoolFloat) } #endif - } TEST(StkSimd, SimdSpecialFunctionsFloat) { - - typedef stk::Traits::bool_type float_bool; - typedef stk::Traits::bool_type Floats_bool; - const int N = 2000; - float maxerr = 0.0; std::vector x(N); std::vector y(N); @@ -1182,15 +995,7 @@ TEST(StkSimd, SimdSpecialFunctionsFloat) stk::simd::store(&z1[n],zl); } - maxerr = 0.0; - for (int n=0; n < N; ++n) { - float err = stk::math::abs(z1[n]-z2[n]); - maxerr = stk::math::max(err,maxerr); - err = stk::math::abs(z1[n]-z3[n]); - maxerr = stk::math::max(err,maxerr); - } - - ASSERT_NEAR( maxerr, 0.0, 0.0 ); + ASSERT_NEAR( max_error(z1, z2, z3), 0.0, 0.0 ); // multiplysign @@ -1205,15 +1010,7 @@ TEST(StkSimd, SimdSpecialFunctionsFloat) stk::simd::store(&z1[n],zl); } - maxerr = 0.0; - for (int n=0; n < N; ++n) { - float err = stk::math::abs(z1[n]-z2[n]); - maxerr = stk::math::max(err,maxerr); - err = stk::math::abs(z1[n]-z3[n]); - maxerr = stk::math::max(err,maxerr); - } - - ASSERT_NEAR( maxerr, 0.0, 0.0 ); + ASSERT_NEAR( max_error(z1, z2, z3), 0.0, 0.0 ); // copysign @@ -1228,15 +1025,7 @@ TEST(StkSimd, SimdSpecialFunctionsFloat) stk::simd::store(&z1[n],zl); } - maxerr = 0.0; - for (int n=0; n < N; ++n) { - float err = stk::math::abs(z1[n]-z2[n]); - maxerr = stk::math::max(err,maxerr); - err = stk::math::abs(z1[n]-z3[n]); - maxerr = stk::math::max(err,maxerr); - } - - ASSERT_NEAR( maxerr, 0.0, 0.0 ); + ASSERT_NEAR( max_error(z1, z2, z3), 0.0, 0.0 ); // max @@ -1251,15 +1040,7 @@ TEST(StkSimd, SimdSpecialFunctionsFloat) stk::simd::store(&z1[n],zl); } - maxerr = 0.0; - for (int n=0; n < N; ++n) { - float err = stk::math::abs(z1[n]-z2[n]); - maxerr = stk::math::max(err,maxerr); - err = stk::math::abs(z1[n]-z3[n]); - maxerr = stk::math::max(err,maxerr); - } - - ASSERT_NEAR( maxerr, 0.0, 0.0 ); + ASSERT_NEAR( max_error(z1, z2, z3), 0.0, 0.0 ); // min @@ -1274,24 +1055,13 @@ TEST(StkSimd, SimdSpecialFunctionsFloat) stk::simd::store(&z1[n],zl); } - maxerr = 0.0; - for (int n=0; n < N; ++n) { - float err = stk::math::abs(z1[n]-z2[n]); - maxerr = stk::math::max(err,maxerr); - err = stk::math::abs(z1[n]-z3[n]); - maxerr = stk::math::max(err,maxerr); - } - - ASSERT_NEAR( maxerr, 0.0, 0.0 ); - + ASSERT_NEAR( max_error(z1, z2, z3), 0.0, 0.0 ); } - TEST(StkSimd, SimdTimeSet1VsConstFloats) { int N = 1000000; double t0; // timing variable - float maxerr; std::vector x(N); @@ -1337,22 +1107,11 @@ TEST(StkSimd, SimdTimeSet1VsConstFloats) t0 += stk::get_time_in_seconds(); std::cout << "Non simd took " << t0 << " seconds" << std::endl; - maxerr = 0.0; - for (int n=0; n < N; ++n) { - float err = stk::math::abs(out1[n]-out2[n]); - maxerr = stk::math::max(err,maxerr); - err = stk::math::abs(out1[n]-out3[n]); - maxerr = stk::math::max(err,maxerr); - err = stk::math::abs(out1[n]-out4[n]); - maxerr = stk::math::max(err,maxerr); - } - - ASSERT_NEAR( maxerr, 0.0, 0.0 ); - + ASSERT_NEAR( max_error(out1, out2, out3, out4), 0.0, 0.0 ); } template -void NegateVec(REAL_TYPE * const in, REAL_TYPE * const out) { +void negate_vec(REAL_TYPE * const in, REAL_TYPE * const out) { REAL_TYPE tmp[12]; tmp[9] = -in[0]; tmp[10] = -in[1]; @@ -1363,7 +1122,7 @@ void NegateVec(REAL_TYPE * const in, REAL_TYPE * const out) { out[2] = tmp[11]; } -template static void NegateVec2(REAL_TYPE* const in, REAL_TYPE* const out) { +template static void negate_vec2(REAL_TYPE* const in, REAL_TYPE* const out) { static const REAL_TYPE ZERO(0.0); out[0] = ZERO - in[0]; out[1] = ZERO - in[1]; @@ -1373,7 +1132,6 @@ template static void NegateVec2(REAL_TYPE* const in, REAL_T TEST(StkSimd, NegatingAVectorFloat) { - int N = 8000; std::vector x(3*N); @@ -1387,38 +1145,28 @@ TEST(StkSimd, NegatingAVectorFloat) } for (int n=0; n < N; ++n) { - NegateVec(&x[3*n],&out1[3*n]); + negate_vec(&x[3*n],&out1[3*n]); } stk::simd::Float a[3]; stk::simd::Float b[3]; for (int n=0; n < N; n+=stk::simd::nfloats) { stk::simd::load_array<3>(a,&x[3*n]); - NegateVec(a,b); + negate_vec(a,b); stk::simd::store_array<3>(&out2[3*n],b); } for (int n=0; n < N; n+=stk::simd::nfloats) { stk::simd::load_array<3>(a,&x[3*n]); - NegateVec2(a,b); + negate_vec2(a,b); stk::simd::store_array<3>(&out3[3*n],b); } - float maxerr = 0.0; - for (int n=0; n < 3*N; ++n) { - float err = stk::math::abs(out1[n]-out2[n]); - maxerr = stk::math::max(err,maxerr); - err = stk::math::abs(out1[n]-out3[n]); - maxerr = stk::math::max(err,maxerr); - } - - ASSERT_NEAR( maxerr, 0.0, 0.0 ); - + ASSERT_NEAR( max_error(out1, out2, out3), 0.0, 0.0 ); } TEST(StkSimd, SimdIsnanFloat) { - const int N = stk::simd::nfloats; std::vector x(N); @@ -1438,8 +1186,7 @@ TEST(StkSimd, SimdIsnanFloat) IsNaN = stk::math::isnan(Y); - ASSERT_TRUE( stk::simd::are_any(IsNaN) ); + ASSERT_TRUE( stk::simd::are_any(IsNaN) ); ASSERT_TRUE( !stk::simd::are_all(IsNaN) || (stk::simd::nfloats==1) ); - } diff --git a/packages/stk/stk_unit_tests/stk_simd/UnitTestStkSimdView.cpp b/packages/stk/stk_unit_tests/stk_simd/UnitTestStkSimdView.cpp index 35677a87b413..1c515e392d77 100644 --- a/packages/stk/stk_unit_tests/stk_simd/UnitTestStkSimdView.cpp +++ b/packages/stk/stk_unit_tests/stk_simd/UnitTestStkSimdView.cpp @@ -1,3 +1,5 @@ +#ifndef USE_STK_SIMD_NONE // somehow these tests are broken for scalar SIMD + #include // for AssertHelper, etc #include // for operator<< #include // for basic_ostream::operator<<, etc @@ -311,4 +313,4 @@ TEST_F(StkSimdViewFixture, SimdParallelFor_LayoutLeft) { // * parallel_for: for, reduce ^ // * timing vs. standard view - +#endif diff --git a/packages/stk/stk_unit_tests/stk_simd/UnitTestStkSimdView2d.cpp b/packages/stk/stk_unit_tests/stk_simd/UnitTestStkSimdView2d.cpp index 9c88416f1335..011d46d984ad 100644 --- a/packages/stk/stk_unit_tests/stk_simd/UnitTestStkSimdView2d.cpp +++ b/packages/stk/stk_unit_tests/stk_simd/UnitTestStkSimdView2d.cpp @@ -1,3 +1,5 @@ +#ifndef USE_STK_SIMD_NONE // somehow these tests are broken for scalar SIMD + #include // for AssertHelper, etc #include // for operator<< #include // for basic_ostream::operator<<, etc @@ -294,3 +296,5 @@ TEST_F(StkSimdViewFixture, SimdParallelFor2d_LayoutLeft_PtrPtr) { tester.parallel_reduce_test(64, 1); } #endif + +#endif diff --git a/packages/stk/stk_unit_tests/stk_simd/UnitTestStkSimdView3d.cpp b/packages/stk/stk_unit_tests/stk_simd/UnitTestStkSimdView3d.cpp index 0252c659fdfe..27df52f7faa9 100644 --- a/packages/stk/stk_unit_tests/stk_simd/UnitTestStkSimdView3d.cpp +++ b/packages/stk/stk_unit_tests/stk_simd/UnitTestStkSimdView3d.cpp @@ -1,3 +1,5 @@ +#ifndef USE_STK_SIMD_NONE // somehow these tests are broken for scalar SIMD + #include // for AssertHelper, etc #include // for operator<< #include // for basic_ostream::operator<<, etc @@ -353,3 +355,5 @@ TEST_F(StkSimdViewFixture, SimdParallelFor3d_LayoutLeft_PtrPtrPtr) { tester.parallel_reduce_test(64, 1, 2); } #endif + +#endif diff --git a/packages/stk/stk_unit_tests/stk_tools/block_extractor/UnitTestExtractBlocks.cpp b/packages/stk/stk_unit_tests/stk_tools/block_extractor/UnitTestExtractBlocks.cpp index 7b727ecb35e9..20f35c8532d1 100644 --- a/packages/stk/stk_unit_tests/stk_tools/block_extractor/UnitTestExtractBlocks.cpp +++ b/packages/stk/stk_unit_tests/stk_tools/block_extractor/UnitTestExtractBlocks.cpp @@ -72,6 +72,7 @@ TEST_F(MeshWithTwoBlocks, extractBlock2_onlyHaveBlock2) { stk::mesh::Part &block2 = get_meta().declare_part_with_topology("block_2", stk::topology::HEX_8); setup_mesh("generated:1x1x4", stk::mesh::BulkData::AUTO_AURA); + stk::mesh::Part &block1 = *get_meta().get_part("block_1"); switch_half_mesh_to_part(block2, block1); @@ -86,6 +87,87 @@ TEST_F(MeshWithTwoBlocks, extractBlock2_onlyHaveBlock2) expect_num_elems_in_part(newBulk, 2, block2); } +TEST_F(MeshWithTwoBlocks, getNodesetPartsAndNames) +{ + + setup_mesh("generated:1x1x4|nodeset:xX", stk::mesh::BulkData::AUTO_AURA); + + + std::vector ns_names = stk::tools::find_nodeset_names_from_id(get_bulk(), {2,1}); + + std::vector ns_names_expected = {"nodelist_2","nodelist_1"}; + + ASSERT_EQ(ns_names.size(), ns_names_expected.size() ); + + for(size_t k = 0 ; k < ns_names_expected.size(); ++k) + EXPECT_EQ(ns_names[k], ns_names_expected[k] ); + + std::vector parts; + stk::tools::GetPartsByName( parts,get_bulk(),ns_names); + ASSERT_EQ(static_cast(2), (parts.size()) ); + stk::mesh::Part &ns1 = *get_meta().get_part("nodelist_1"); + EXPECT_EQ(ns1, *(parts[1]) ); + + stk::mesh::Part &ns2 = *get_meta().get_part("nodelist_2"); + EXPECT_EQ(ns2, *(parts[0]) ); + +} + +TEST_F(MeshWithTwoBlocks, getBlockPartsAndNames) +{ + + stk::mesh::Part &block2 = get_meta().declare_part_with_topology("block_2", stk::topology::HEX_8); + setup_mesh("generated:1x1x4|nodeset:xX", stk::mesh::BulkData::AUTO_AURA); + + stk::mesh::Part &block1 = *get_meta().get_part("block_1"); + switch_half_mesh_to_part(block2, block1); + + std::vector blk_names = stk::tools::GetBlockNamesFromIDs(get_bulk(), {1,-1}); + + + std::vector blk_names_expected = {"block_1","block_2"}; + + ASSERT_EQ(blk_names.size(), blk_names_expected.size() ); + + for(size_t k = 0 ; k < blk_names_expected.size(); ++k) + EXPECT_EQ(blk_names[k], blk_names_expected[k] ); + + std::vector parts; + stk::tools::GetPartsByName( parts,get_bulk(),blk_names); + ASSERT_EQ(static_cast(2), (parts.size()) ); + stk::mesh::Part &blk1 = *get_meta().get_part("block_1"); + EXPECT_EQ(blk1, *(parts[0]) ); + + stk::mesh::Part &blk2 = *get_meta().get_part("block_2"); + EXPECT_EQ(blk2, *(parts[1]) ); + +} + +TEST_F(MeshWithTwoBlocks, getOneBlockAndOneNodeset) +{ + + stk::mesh::Part &block2 = get_meta().declare_part_with_topology("block_2", stk::topology::HEX_8); + setup_mesh("generated:1x1x4|nodeset:xX", stk::mesh::BulkData::AUTO_AURA); + + stk::mesh::Part &block1 = *get_meta().get_part("block_1"); + switch_half_mesh_to_part(block2, block1); + + // apparently that block two gets constructed with ID=-1... + std::vector blk_names = stk::tools::GetBlockNamesFromIDs(get_bulk(), {-1}); + std::vector ns_names = stk::tools::find_nodeset_names_from_id(get_bulk(), {1}); + + stk::mesh::Selector theSelector = stk::tools::GetBlockAndNodesetSelector(get_bulk(), ns_names, blk_names); + + std::vector counts; + stk::mesh::comm_mesh_counts(get_bulk(), counts, &theSelector); + size_t expectedNumElem = 2; // two elements in block 2 + size_t expectedNumNode = 16; // 12 nodes associated with 2 elems in block 2, then 4 nodes from nodeset 1 + + EXPECT_EQ(expectedNumElem, counts[stk::topology::ELEM_RANK]); + EXPECT_EQ(expectedNumNode, counts[stk::topology::NODE_RANK]); + +} + class MeshWithOneBlock : public stk::unit_test_util::MeshFixture { diff --git a/packages/stk/stk_unit_tests/stk_tools/block_extractor/UnitTestParseCommandLine.cpp b/packages/stk/stk_unit_tests/stk_tools/block_extractor/UnitTestParseCommandLine.cpp index 49eaa00462b8..4c9d5ab0ce88 100644 --- a/packages/stk/stk_unit_tests/stk_tools/block_extractor/UnitTestParseCommandLine.cpp +++ b/packages/stk/stk_unit_tests/stk_tools/block_extractor/UnitTestParseCommandLine.cpp @@ -37,60 +37,174 @@ namespace { -class CommaSeparatedValues : public ::testing::Test +template +void compare_result(const std::vector & result, const std::vector & expected) { -protected: -}; + ASSERT_EQ(result.size(), expected.size()); + for (size_t i = 0; i < result.size(); ++i) { + EXPECT_EQ(result[i], expected[i]); + } +} + +TEST(SplitString, emptyString) +{ + std::string input = ""; + std::vector separated = stk::tools::split_string(input, ','); + compare_result(separated, {}); +} + +TEST(SplitString, oneInteger) +{ + std::string input = "1"; + std::vector separated = stk::tools::split_string(input, ','); + compare_result(separated, {"1"}); +} + +TEST(SplitString, twoIntegers) +{ + std::string input = "13,2"; + std::vector separated = stk::tools::split_string(input, ','); + compare_result(separated, {"13", "2"}); +} + +TEST(SplitString, twoIntegersDifferentSeparator) +{ + std::string input = "1:4:9"; + std::vector separated = stk::tools::split_string(input, ':'); + compare_result(separated, {"1", "4", "9"}); +} + +TEST(SplitString, tenIntegers) +{ + std::string input = "1,2,3,4,5,6,7,8,9,10"; + std::vector separated = stk::tools::split_string(input, ','); + compare_result(separated, {"1", "2", "3", "4", "5", "6", "7", "8", "9", "10"}); +} + +TEST(SplitString, spacesInString) +{ + std::string input = " 5 , 777 "; + std::vector separated = stk::tools::split_string(input, ','); + compare_result(separated, {"5", "777"}); +} + +TEST(SplitString, integersAndRanges) +{ + std::string input = "1,10:20:2,25"; + std::vector separated = stk::tools::split_string(input, ','); + compare_result(separated, {"1", "10:20:2", "25"}); +} + +TEST(GetIdsFromStrings, empty) +{ + std::vector input = {}; + std::vector result = stk::tools::get_ids_from_strings(input); + compare_result(result, {}); +} + +TEST(GetIdsFromStrings, singleInteger) +{ + std::vector input = {"5"}; + std::vector result = stk::tools::get_ids_from_strings(input); + compare_result(result, {5}); +} + +TEST(GetIdsFromStrings, multipleIntegers) +{ + std::vector input = {"1", "2", "3", "5", "8"}; + std::vector result = stk::tools::get_ids_from_strings(input); + compare_result(result, {1, 2, 3, 5, 8}); +} + +TEST(GetIdsFromStrings, nonInteger) +{ + std::vector input = {"1", "block_2"}; + EXPECT_THROW(stk::tools::get_ids_from_strings(input), std::runtime_error); +} + +TEST(GetIdsFromStrings, singleRangeNonInteger) +{ + std::vector input = {"1:block_5"}; + EXPECT_THROW(stk::tools::get_ids_from_strings(input), std::runtime_error); +} + +TEST(GetIdsFromStrings, singleRangeTooManyFields) +{ + std::vector input = {"1:5:2:2"}; + EXPECT_THROW(stk::tools::get_ids_from_strings(input), std::logic_error); +} + +TEST(GetIdsFromStrings, singleRangeOutOfOrder) +{ + std::vector input = {"5:1"}; + EXPECT_THROW(stk::tools::get_ids_from_strings(input), std::logic_error); +} + +TEST(GetIdsFromStrings, singleRangeZeroLimit) +{ + std::vector input = {"0:5"}; + EXPECT_THROW(stk::tools::get_ids_from_strings(input), std::logic_error); +} + +TEST(GetIdsFromStrings, singleRangeNegativeLimit) +{ + std::vector input = {"1:-5"}; + EXPECT_THROW(stk::tools::get_ids_from_strings(input), std::logic_error); +} + +TEST(GetIdsFromStrings, singleRangeNegativeStride) +{ + std::vector input = {"1:5:-1"}; + EXPECT_THROW(stk::tools::get_ids_from_strings(input), std::logic_error); +} + +TEST(GetIdsFromStrings, singleRangeNoStride) +{ + std::vector input = {"1:5"}; + std::vector result = stk::tools::get_ids_from_strings(input); + compare_result(result, {1, 2, 3, 4, 5}); +} -TEST_F(CommaSeparatedValues, emptyString_emptyList) +TEST(GetIdsFromStrings, singleRangeStride1) { - std::string input = ""; - std::vector separated = stk::tools::get_csv(input); - ASSERT_TRUE(separated.empty()); + std::vector input = {"1:5:1"}; + std::vector result = stk::tools::get_ids_from_strings(input); + compare_result(result, {1, 2, 3, 4, 5}); } -TEST_F(CommaSeparatedValues, oneItem_stringsAreEqual) +TEST(GetIdsFromStrings, singleRangeStride2) { - std::string input = "1"; - std::vector separated = stk::tools::get_csv(input); - ASSERT_EQ(1u, separated.size()); - EXPECT_EQ(input, separated[0]); + std::vector input = {"1:5:2"}; + std::vector result = stk::tools::get_ids_from_strings(input); + compare_result(result, {1, 3, 5}); } -TEST_F(CommaSeparatedValues, twoItems_twoSeparatedStrings) +TEST(GetIdsFromStrings, singleRangeStride3) { - std::string input = "13,2"; - std::vector separated = stk::tools::get_csv(input); - ASSERT_EQ(2u, separated.size()); - EXPECT_EQ("13", separated[0]); - EXPECT_EQ("2", separated[1]); + std::vector input = {"1:5:3"}; + std::vector result = stk::tools::get_ids_from_strings(input); + compare_result(result, {1, 4}); // Not inclusive of range end } -TEST_F(CommaSeparatedValues, tenItems_tenSeparatedStrings) +TEST(GetIdsFromStrings, singleRangeStrideTooBig) { - std::string input = "1,2,3,4,5,6,7,8,9,10"; - std::vector separated = stk::tools::get_csv(input); - ASSERT_EQ(10u, separated.size()); - for(size_t i=0; i<10; i++) - EXPECT_EQ(std::to_string(i+1), separated[i]); + std::vector input = {"1:5:5"}; + std::vector result = stk::tools::get_ids_from_strings(input); + compare_result(result, {1}); // Only first value } -TEST_F(CommaSeparatedValues, spaceInString_stripsSpaces) +TEST(GetIdsFromStrings, mixedIntsAndRanges) { - std::string input = "5, 777"; - std::vector separated = stk::tools::get_csv(input); - ASSERT_EQ(2u, separated.size()); - EXPECT_EQ("5", separated[0]); - EXPECT_EQ("777", separated[1]); + std::vector input = {"1", "10:14:2", "20"}; + std::vector result = stk::tools::get_ids_from_strings(input); + compare_result(result, {1, 10, 12, 14, 20}); } -TEST(VectorOfStrings, gettingBlockNames_addedBlockUnderscore) +TEST(GetIdsFromStrings, multipleRanges) { - std::vector input = {"5", "777"}; - std::vector output = stk::tools::get_block_names_given_ids(input); - ASSERT_EQ(2u, output.size()); - EXPECT_EQ("block_5", output[0]); - EXPECT_EQ("block_777", output[1]); + std::vector input = {"1:5", "10:14:2"}; + std::vector result = stk::tools::get_ids_from_strings(input); + compare_result(result, {1, 2, 3, 4, 5, 10, 12, 14}); } } diff --git a/packages/stk/stk_unit_tests/stk_topology/topology_test_utils.hpp b/packages/stk/stk_unit_tests/stk_topology/topology_test_utils.hpp index 9f6ba44033c9..d9557aefafd6 100644 --- a/packages/stk/stk_unit_tests/stk_topology/topology_test_utils.hpp +++ b/packages/stk/stk_unit_tests/stk_topology/topology_test_utils.hpp @@ -54,10 +54,11 @@ inline void check_side_node_ordinals(stk::topology topology, std::vector> & gold_edge_node_ordinals) { - stk::topology edgeTopo = topology.edge_topology(); - unsigned numEdgeNodes = edgeTopo.num_nodes(); - std::vector edge_node_ordinals(numEdgeNodes); + std::vector edge_node_ordinals; for (unsigned edge = 0; edge < topology.num_edges(); ++edge) { + stk::topology edgeTopo = topology.edge_topology(edge); + unsigned numEdgeNodes = edgeTopo.num_nodes(); + edge_node_ordinals.resize(numEdgeNodes); topology.edge_node_ordinals(edge, edge_node_ordinals.data()); EXPECT_EQ(gold_edge_node_ordinals[edge], edge_node_ordinals); } @@ -171,10 +172,10 @@ template STK_INLINE_FUNCTION void check_edge_node_ordinals_ngp(stk::topology topology, unsigned gold_edge_node_ordinals[][MAX_NODES]) { - stk::topology edgeTopo = topology.edge_topology(); - unsigned numEdgeNodes = edgeTopo.num_nodes(); unsigned edge_node_ordinals[MAX_NODES]; for (unsigned edge = 0; edge < topology.num_edges(); ++edge) { + stk::topology edgeTopo = topology.edge_topology(edge); + unsigned numEdgeNodes = edgeTopo.num_nodes(); topology.edge_node_ordinals(edge, edge_node_ordinals); for (unsigned edge_node = 0; edge_node < numEdgeNodes; ++edge_node) { NGP_EXPECT_EQ(gold_edge_node_ordinals[edge][edge_node], edge_node_ordinals[edge_node]); @@ -275,10 +276,11 @@ inline void check_edge_nodes(stk::topology topology, std::vector edgeNodes(numEdgeNodes); + std::vector edgeNodes; for (unsigned edge = 0; edge < topology.num_edges(); ++edge) { + stk::topology edgeTopo = topology.edge_topology(edge); + unsigned numEdgeNodes = edgeTopo.num_nodes(); + edgeNodes.resize(numEdgeNodes); topology.edge_nodes(allElemNodes.data(), edge, edgeNodes.data()); for (unsigned edgeNodeOrdinal = 0; edgeNodeOrdinal < numEdgeNodes; ++edgeNodeOrdinal) { EXPECT_EQ(gold_edge_node_ordinals[edge][edgeNodeOrdinal] + 100, edgeNodes[edgeNodeOrdinal]); @@ -358,10 +360,10 @@ void check_edge_nodes_ngp(stk::topology topology, unsigned gold_edge_node_ordina allElemNodes[nodeOrdinal] = nodeOrdinal + 100; } - stk::topology edgeTopo = topology.edge_topology(); - unsigned numEdgeNodes = edgeTopo.num_nodes(); unsigned edgeNodes[MAX_NODES]; for (unsigned edge = 0; edge < topology.num_edges(); ++edge) { + stk::topology edgeTopo = topology.edge_topology(edge); + unsigned numEdgeNodes = edgeTopo.num_nodes(); topology.edge_nodes(allElemNodes, edge, edgeNodes); for (unsigned edgeNodeOrdinal = 0; edgeNodeOrdinal < numEdgeNodes; ++edgeNodeOrdinal) { NGP_EXPECT_EQ(gold_edge_node_ordinals[edge][edgeNodeOrdinal] + 100, edgeNodes[edgeNodeOrdinal]); diff --git a/packages/stk/stk_unit_tests/stk_topology/unit_test_quad.cpp b/packages/stk/stk_unit_tests/stk_topology/unit_test_quad.cpp new file mode 100644 index 000000000000..ca430a659745 --- /dev/null +++ b/packages/stk/stk_unit_tests/stk_topology/unit_test_quad.cpp @@ -0,0 +1,514 @@ +// Copyright 2002 - 2008, 2010, 2011 National Technology Engineering +// Solutions of Sandia, LLC (NTESS). Under the terms of Contract +// DE-NA0003525 with NTESS, the U.S. Government retains certain rights +// in this software. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following +// disclaimer in the documentation and/or other materials provided +// with the distribution. +// +// * Neither the name of NTESS nor the names of its contributors +// may be used to endorse or promote products derived from this +// software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// + +#include +#include +#include +#include "topology_test_utils.hpp" + +TEST( stk_topology, quad_4 ) +{ + using stk::topology; + + topology t = topology::QUAD_4; + + EXPECT_TRUE(t.is_valid()); + EXPECT_FALSE(t.has_homogeneous_faces()); + EXPECT_FALSE(t.is_shell()); + + EXPECT_EQ(t.rank(),topology::FACE_RANK); + EXPECT_EQ(t.side_rank(),topology::EDGE_RANK); + EXPECT_EQ(t.num_sides(),4u); + + EXPECT_EQ(t.dimension(),2u); + EXPECT_EQ(t.num_nodes(),4u); + EXPECT_EQ(t.num_vertices(),4u); + EXPECT_EQ(t.num_edges(),4u); + EXPECT_EQ(t.num_faces(),0u); + EXPECT_EQ(t.num_permutations(),8u); + EXPECT_EQ(t.num_positive_permutations(),4u); + + EXPECT_FALSE(t.defined_on_spatial_dimension(1)); + EXPECT_FALSE(t.defined_on_spatial_dimension(2)); + EXPECT_TRUE(t.defined_on_spatial_dimension(3)); + + EXPECT_EQ(t.base(),topology::QUAD_4); + + EXPECT_EQ(t.face_topology(0), stk::topology::INVALID_TOPOLOGY); + + std::vector> gold_edge_node_ordinals = { {0, 1}, + {1, 2}, + {2, 3}, + {3, 0} }; + check_side_node_ordinals(t, gold_edge_node_ordinals); + check_edge_node_ordinals(t, gold_edge_node_ordinals); + check_side_nodes(t, gold_edge_node_ordinals); + check_edge_nodes(t, gold_edge_node_ordinals); + + std::vector> gold_permutation_node_ordinals = { {0, 1, 2, 3}, + {3, 0, 1, 2}, + {2, 3, 0, 1}, + {1, 2, 3, 0}, + {0, 3, 2, 1}, + {3, 2, 1, 0}, + {2, 1, 0, 3}, + {1, 0, 3, 2} }; + check_permutation_node_ordinals(t, gold_permutation_node_ordinals); + check_permutation_nodes(t, gold_permutation_node_ordinals); + + check_equivalent(t, gold_permutation_node_ordinals); + check_lexicographical_smallest_permutation(t, gold_permutation_node_ordinals); +} + +void check_quad_4_on_device() +{ + Kokkos::parallel_for(1, KOKKOS_LAMBDA(const int i) + { + stk::topology t = stk::topology::QUAD_4; + + NGP_EXPECT_TRUE(t.is_valid()); + NGP_EXPECT_FALSE(t.has_homogeneous_faces()); + NGP_EXPECT_FALSE(t.is_shell()); + + NGP_EXPECT_EQ(t.rank(),stk::topology::FACE_RANK); + NGP_EXPECT_EQ(t.side_rank(),stk::topology::EDGE_RANK); + NGP_EXPECT_EQ(t.num_sides(),4u); + + NGP_EXPECT_EQ(t.dimension(),2u); + NGP_EXPECT_EQ(t.num_nodes(),4u); + NGP_EXPECT_EQ(t.num_vertices(),4u); + NGP_EXPECT_EQ(t.num_edges(),4u); + NGP_EXPECT_EQ(t.num_faces(),0u); + NGP_EXPECT_EQ(t.num_permutations(),8u); + NGP_EXPECT_EQ(t.num_positive_permutations(),4u); + + NGP_EXPECT_FALSE(t.defined_on_spatial_dimension(1)); + NGP_EXPECT_FALSE(t.defined_on_spatial_dimension(2)); + NGP_EXPECT_TRUE(t.defined_on_spatial_dimension(3)); + + NGP_EXPECT_EQ(t.base(),stk::topology::QUAD_4); + + NGP_EXPECT_EQ(t.face_topology(0), stk::topology::INVALID_TOPOLOGY); + + unsigned gold_edge_node_ordinals[4][2] = { {0, 1}, + {1, 2}, + {2, 3}, + {3, 0} }; + + check_side_node_ordinals_ngp(t, gold_edge_node_ordinals); + check_edge_node_ordinals_ngp(t, gold_edge_node_ordinals); + check_side_nodes_ngp(t, gold_edge_node_ordinals); + check_edge_nodes_ngp(t, gold_edge_node_ordinals); + + unsigned gold_permutation_node_ordinals[8][4] = { {0, 1, 2, 3}, + {3, 0, 1, 2}, + {2, 3, 0, 1}, + {1, 2, 3, 0}, + {0, 3, 2, 1}, + {3, 2, 1, 0}, + {2, 1, 0, 3}, + {1, 0, 3, 2} }; + + check_permutation_node_ordinals_ngp(t, gold_permutation_node_ordinals); + check_permutation_nodes_ngp(t, gold_permutation_node_ordinals); + + check_equivalent_ngp(t, gold_permutation_node_ordinals); + check_lexicographical_smallest_permutation_ngp(t, gold_permutation_node_ordinals); + }); +} + +NGP_TEST(stk_topology_ngp, quad_4) +{ + check_quad_4_on_device(); +} + +TEST( stk_topology, quad_6 ) +{ + using stk::topology; + + topology t = topology::QUAD_6; + + EXPECT_TRUE(t.is_valid()); + EXPECT_FALSE(t.has_homogeneous_faces()); + EXPECT_FALSE(t.is_shell()); + + EXPECT_EQ(t.rank(),topology::FACE_RANK); + EXPECT_EQ(t.side_rank(),topology::EDGE_RANK); + EXPECT_EQ(t.num_sides(),4u); + + EXPECT_EQ(t.dimension(),2u); + EXPECT_EQ(t.num_nodes(),6u); + EXPECT_EQ(t.num_vertices(),4u); + EXPECT_EQ(t.num_edges(),4u); + EXPECT_EQ(t.num_faces(),0u); + EXPECT_EQ(t.num_permutations(),8u); + EXPECT_EQ(t.num_positive_permutations(),4u); + + EXPECT_FALSE(t.defined_on_spatial_dimension(1)); + EXPECT_FALSE(t.defined_on_spatial_dimension(2)); + EXPECT_TRUE(t.defined_on_spatial_dimension(3)); + + EXPECT_EQ(t.base(),topology::QUAD_4); + + EXPECT_EQ(t.face_topology(0), stk::topology::INVALID_TOPOLOGY); + + std::vector> gold_edge_node_ordinals = { {0, 1, 4}, + {1, 2}, + {2, 3, 5}, + {3, 0} }; + check_side_node_ordinals(t, gold_edge_node_ordinals); + check_edge_node_ordinals(t, gold_edge_node_ordinals); + check_side_nodes(t, gold_edge_node_ordinals); + check_edge_nodes(t, gold_edge_node_ordinals); + + std::vector> gold_permutation_node_ordinals = { {0, 1, 2, 3, 4, 5}, + {3, 0, 1, 2, 4, 5}, + {2, 3, 0, 1, 5, 4}, + {1, 2, 3, 0, 5, 4}, + {0, 3, 2, 1, 5, 4}, + {3, 2, 1, 0, 5, 4}, + {2, 1, 0, 3, 4, 5}, + {1, 0, 3, 2, 4, 5} }; + + std::cout << "Reminder: we still need to enable permutation for QUAD_6" << std::endl; + const bool enabledPermutation = false; + if (enabledPermutation) { + check_permutation_node_ordinals(t, gold_permutation_node_ordinals); + } + check_permutation_nodes(t, gold_permutation_node_ordinals); + + check_equivalent(t, gold_permutation_node_ordinals); + check_lexicographical_smallest_permutation(t, gold_permutation_node_ordinals); +} + +void check_quad_6_on_device() +{ + Kokkos::parallel_for(1, KOKKOS_LAMBDA(const int i) + { + stk::topology t = stk::topology::QUAD_6; + + NGP_EXPECT_TRUE(t.is_valid()); + NGP_EXPECT_FALSE(t.has_homogeneous_faces()); + NGP_EXPECT_FALSE(t.is_shell()); + + NGP_EXPECT_EQ(t.rank(),stk::topology::FACE_RANK); + NGP_EXPECT_EQ(t.side_rank(),stk::topology::EDGE_RANK); + NGP_EXPECT_EQ(t.num_sides(),4u); + + NGP_EXPECT_EQ(t.dimension(),2u); + NGP_EXPECT_EQ(t.num_nodes(),6u); + NGP_EXPECT_EQ(t.num_vertices(),4u); + NGP_EXPECT_EQ(t.num_edges(),4u); + NGP_EXPECT_EQ(t.num_faces(),0u); + NGP_EXPECT_EQ(t.num_permutations(),8u); + NGP_EXPECT_EQ(t.num_positive_permutations(),4u); + + NGP_EXPECT_FALSE(t.defined_on_spatial_dimension(1)); + NGP_EXPECT_FALSE(t.defined_on_spatial_dimension(2)); + NGP_EXPECT_TRUE(t.defined_on_spatial_dimension(3)); + + NGP_EXPECT_EQ(t.base(),stk::topology::QUAD_4); + + NGP_EXPECT_EQ(t.face_topology(0), stk::topology::INVALID_TOPOLOGY); + + unsigned gold_edge_node_ordinals[4][3] = { {0, 1, 4}, + {1, 2, INVALID}, + {2, 3, 5}, + {3, 0, INVALID} }; + + check_side_node_ordinals_ngp(t, gold_edge_node_ordinals); + check_edge_node_ordinals_ngp(t, gold_edge_node_ordinals); + check_side_nodes_ngp(t, gold_edge_node_ordinals); + check_edge_nodes_ngp(t, gold_edge_node_ordinals); + + unsigned gold_permutation_node_ordinals[8][6] = { {0, 1, 2, 3, 4, 5}, + {3, 0, 1, 2, 4, 5}, + {2, 3, 0, 1, 5, 4}, + {1, 2, 3, 0, 5, 4}, + {0, 3, 2, 1, 5, 4}, + {3, 2, 1, 0, 5, 4}, + {2, 1, 0, 3, 4, 5}, + {1, 0, 3, 2, 4, 5} }; + + + printf("Reminder: we still need to enable permutation for QUAD_6\n"); + const bool enabledPermutation = false; + if (enabledPermutation) { + check_permutation_node_ordinals_ngp(t, gold_permutation_node_ordinals); + } + check_permutation_nodes_ngp(t, gold_permutation_node_ordinals); + + check_equivalent_ngp(t, gold_permutation_node_ordinals); + check_lexicographical_smallest_permutation_ngp(t, gold_permutation_node_ordinals); + }); +} + +NGP_TEST(stk_topology_ngp, quad_6) +{ + check_quad_6_on_device(); +} + +TEST( stk_topology, quad_8 ) +{ + using stk::topology; + + topology t = topology::QUAD_8; + + EXPECT_TRUE(t.is_valid()); + EXPECT_FALSE(t.has_homogeneous_faces()); + EXPECT_FALSE(t.is_shell()); + + EXPECT_EQ(t.rank(),topology::FACE_RANK); + EXPECT_EQ(t.side_rank(),topology::EDGE_RANK); + EXPECT_EQ(t.num_sides(),4u); + + EXPECT_EQ(t.dimension(),2u); + EXPECT_EQ(t.num_nodes(),8u); + EXPECT_EQ(t.num_vertices(),4u); + EXPECT_EQ(t.num_edges(),4u); + EXPECT_EQ(t.num_faces(),0u); + EXPECT_EQ(t.num_permutations(),8u); + EXPECT_EQ(t.num_positive_permutations(),4u); + + EXPECT_FALSE(t.defined_on_spatial_dimension(1)); + EXPECT_FALSE(t.defined_on_spatial_dimension(2)); + EXPECT_TRUE(t.defined_on_spatial_dimension(3)); + + EXPECT_EQ(t.base(),topology::QUAD_4); + + EXPECT_EQ(t.face_topology(0), stk::topology::INVALID_TOPOLOGY); + + std::vector> gold_edge_node_ordinals = { {0, 1, 4}, + {1, 2, 5}, + {2, 3, 6}, + {3, 0, 7} }; + check_side_node_ordinals(t, gold_edge_node_ordinals); + check_edge_node_ordinals(t, gold_edge_node_ordinals); + check_side_nodes(t, gold_edge_node_ordinals); + check_edge_nodes(t, gold_edge_node_ordinals); + + std::vector> gold_permutation_node_ordinals = { {0, 1, 2, 3, 4, 5, 6, 7}, + {3, 0, 1, 2, 7, 4, 5, 6}, + {2, 3, 0, 1, 6, 7, 4, 5}, + {1, 2, 3, 0, 5, 6, 7, 4}, + {0, 3, 2, 1, 7, 6, 5, 4}, + {3, 2, 1, 0, 6, 5, 4, 7}, + {2, 1, 0, 3, 5, 4, 7, 6}, + {1, 0, 3, 2, 4, 7, 6, 5} }; + + check_permutation_node_ordinals(t, gold_permutation_node_ordinals); + check_permutation_nodes(t, gold_permutation_node_ordinals); + + check_equivalent(t, gold_permutation_node_ordinals); + check_lexicographical_smallest_permutation(t, gold_permutation_node_ordinals); +} + +void check_quad_8_on_device() +{ + Kokkos::parallel_for(1, KOKKOS_LAMBDA(const int i) + { + stk::topology t = stk::topology::QUAD_8; + + NGP_EXPECT_TRUE(t.is_valid()); + NGP_EXPECT_FALSE(t.has_homogeneous_faces()); + NGP_EXPECT_FALSE(t.is_shell()); + + NGP_EXPECT_EQ(t.rank(),stk::topology::FACE_RANK); + NGP_EXPECT_EQ(t.side_rank(),stk::topology::EDGE_RANK); + NGP_EXPECT_EQ(t.num_sides(),4u); + + NGP_EXPECT_EQ(t.dimension(),2u); + NGP_EXPECT_EQ(t.num_nodes(),8u); + NGP_EXPECT_EQ(t.num_vertices(),4u); + NGP_EXPECT_EQ(t.num_edges(),4u); + NGP_EXPECT_EQ(t.num_faces(),0u); + NGP_EXPECT_EQ(t.num_permutations(),8u); + NGP_EXPECT_EQ(t.num_positive_permutations(),4u); + + NGP_EXPECT_FALSE(t.defined_on_spatial_dimension(1)); + NGP_EXPECT_FALSE(t.defined_on_spatial_dimension(2)); + NGP_EXPECT_TRUE(t.defined_on_spatial_dimension(3)); + + NGP_EXPECT_EQ(t.base(),stk::topology::QUAD_4); + + NGP_EXPECT_EQ(t.face_topology(0), stk::topology::INVALID_TOPOLOGY); + + unsigned gold_edge_node_ordinals[4][3] = { {0, 1, 4}, + {1, 2, 5}, + {2, 3, 6}, + {3, 0, 7} }; + + check_side_node_ordinals_ngp(t, gold_edge_node_ordinals); + check_edge_node_ordinals_ngp(t, gold_edge_node_ordinals); + check_side_nodes_ngp(t, gold_edge_node_ordinals); + check_edge_nodes_ngp(t, gold_edge_node_ordinals); + + unsigned gold_permutation_node_ordinals[8][8] = { {0, 1, 2, 3, 4, 5, 6, 7}, + {3, 0, 1, 2, 7, 4, 5, 6}, + {2, 3, 0, 1, 6, 7, 4, 5}, + {1, 2, 3, 0, 5, 6, 7, 4}, + {0, 3, 2, 1, 7, 6, 5, 4}, + {3, 2, 1, 0, 6, 5, 4, 7}, + {2, 1, 0, 3, 5, 4, 7, 6}, + {1, 0, 3, 2, 4, 7, 6, 5} }; + + check_permutation_node_ordinals_ngp(t, gold_permutation_node_ordinals); + check_permutation_nodes_ngp(t, gold_permutation_node_ordinals); + + check_equivalent_ngp(t, gold_permutation_node_ordinals); + check_lexicographical_smallest_permutation_ngp(t, gold_permutation_node_ordinals); + }); +} + +NGP_TEST(stk_topology_ngp, quad_8) +{ + check_quad_8_on_device(); +} + +TEST( stk_topology, quad_9 ) +{ + using stk::topology; + + topology t = topology::QUAD_9; + + EXPECT_TRUE(t.is_valid()); + EXPECT_FALSE(t.has_homogeneous_faces()); + EXPECT_FALSE(t.is_shell()); + + EXPECT_EQ(t.rank(),topology::FACE_RANK); + EXPECT_EQ(t.side_rank(),topology::EDGE_RANK); + EXPECT_EQ(t.num_sides(),4u); + + EXPECT_EQ(t.dimension(),2u); + EXPECT_EQ(t.num_nodes(),9u); + EXPECT_EQ(t.num_vertices(),4u); + EXPECT_EQ(t.num_edges(),4u); + EXPECT_EQ(t.num_faces(),0u); + EXPECT_EQ(t.num_permutations(),8u); + EXPECT_EQ(t.num_positive_permutations(),4u); + + EXPECT_FALSE(t.defined_on_spatial_dimension(1)); + EXPECT_FALSE(t.defined_on_spatial_dimension(2)); + EXPECT_TRUE(t.defined_on_spatial_dimension(3)); + + EXPECT_EQ(t.base(),topology::QUAD_4); + + EXPECT_EQ(t.face_topology(0), stk::topology::INVALID_TOPOLOGY); + + std::vector> gold_edge_node_ordinals = { {0, 1, 4}, + {1, 2, 5}, + {2, 3, 6}, + {3, 0, 7} }; + check_side_node_ordinals(t, gold_edge_node_ordinals); + check_edge_node_ordinals(t, gold_edge_node_ordinals); + check_side_nodes(t, gold_edge_node_ordinals); + check_edge_nodes(t, gold_edge_node_ordinals); + + std::vector> gold_permutation_node_ordinals = { {0, 1, 2, 3, 4, 5, 6, 7, 8}, + {3, 0, 1, 2, 7, 4, 5, 6, 8}, + {2, 3, 0, 1, 6, 7, 4, 5, 8}, + {1, 2, 3, 0, 5, 6, 7, 4, 8}, + {0, 3, 2, 1, 7, 6, 5, 4, 8}, + {3, 2, 1, 0, 6, 5, 4, 7, 8}, + {2, 1, 0, 3, 5, 4, 7, 6, 8}, + {1, 0, 3, 2, 4, 7, 6, 5, 8} }; + + check_permutation_node_ordinals(t, gold_permutation_node_ordinals); + check_permutation_nodes(t, gold_permutation_node_ordinals); + + check_equivalent(t, gold_permutation_node_ordinals); + check_lexicographical_smallest_permutation(t, gold_permutation_node_ordinals); +} + +void check_quad_9_on_device() +{ + Kokkos::parallel_for(1, KOKKOS_LAMBDA(const int i) + { + stk::topology t = stk::topology::QUAD_9; + + NGP_EXPECT_TRUE(t.is_valid()); + NGP_EXPECT_FALSE(t.has_homogeneous_faces()); + NGP_EXPECT_FALSE(t.is_shell()); + + NGP_EXPECT_EQ(t.rank(),stk::topology::FACE_RANK); + NGP_EXPECT_EQ(t.side_rank(),stk::topology::EDGE_RANK); + NGP_EXPECT_EQ(t.num_sides(),4u); + + NGP_EXPECT_EQ(t.dimension(),2u); + NGP_EXPECT_EQ(t.num_nodes(),9u); + NGP_EXPECT_EQ(t.num_vertices(),4u); + NGP_EXPECT_EQ(t.num_edges(),4u); + NGP_EXPECT_EQ(t.num_faces(),0u); + NGP_EXPECT_EQ(t.num_permutations(),8u); + NGP_EXPECT_EQ(t.num_positive_permutations(),4u); + + NGP_EXPECT_FALSE(t.defined_on_spatial_dimension(1)); + NGP_EXPECT_FALSE(t.defined_on_spatial_dimension(2)); + NGP_EXPECT_TRUE(t.defined_on_spatial_dimension(3)); + + NGP_EXPECT_EQ(t.base(),stk::topology::QUAD_4); + + NGP_EXPECT_EQ(t.face_topology(0), stk::topology::INVALID_TOPOLOGY); + + unsigned gold_edge_node_ordinals[4][3] = { {0, 1, 4}, + {1, 2, 5}, + {2, 3, 6}, + {3, 0, 7} }; + + check_side_node_ordinals_ngp(t, gold_edge_node_ordinals); + check_edge_node_ordinals_ngp(t, gold_edge_node_ordinals); + check_side_nodes_ngp(t, gold_edge_node_ordinals); + check_edge_nodes_ngp(t, gold_edge_node_ordinals); + + unsigned gold_permutation_node_ordinals[8][9] = { {0, 1, 2, 3, 4, 5, 6, 7, 8}, + {3, 0, 1, 2, 7, 4, 5, 6, 8}, + {2, 3, 0, 1, 6, 7, 4, 5, 8}, + {1, 2, 3, 0, 5, 6, 7, 4, 8}, + {0, 3, 2, 1, 7, 6, 5, 4, 8}, + {3, 2, 1, 0, 6, 5, 4, 7, 8}, + {2, 1, 0, 3, 5, 4, 7, 6, 8}, + {1, 0, 3, 2, 4, 7, 6, 5, 8} }; + + check_permutation_node_ordinals_ngp(t, gold_permutation_node_ordinals); + check_permutation_nodes_ngp(t, gold_permutation_node_ordinals); + + check_equivalent_ngp(t, gold_permutation_node_ordinals); + check_lexicographical_smallest_permutation_ngp(t, gold_permutation_node_ordinals); + }); +} + +NGP_TEST(stk_topology_ngp, quad_9) +{ + check_quad_9_on_device(); +} diff --git a/packages/stk/stk_unit_tests/stk_topology/unit_test_validate_topology_data.cpp b/packages/stk/stk_unit_tests/stk_topology/unit_test_validate_topology_data.cpp index f3834796dec2..5ceb9dd017e3 100644 --- a/packages/stk/stk_unit_tests/stk_topology/unit_test_validate_topology_data.cpp +++ b/packages/stk/stk_unit_tests/stk_topology/unit_test_validate_topology_data.cpp @@ -55,7 +55,7 @@ typename std::enable_if<(topology_data::num_edges > 0), bool>::type ch edge_node_ordinals &= (0 == TopologyData::edge_node_ordinals_offsets[0]); for (unsigned edge = 0; edge < TopologyData::num_edges; ++edge) { - stk::topology edgeTopo = stk::topology(Topology).edge_topology(); + stk::topology edgeTopo = stk::topology(Topology).edge_topology(edge); unsigned numEdgeNodes = edgeTopo.num_nodes(); totalEdgeNodeOffset += numEdgeNodes; @@ -171,6 +171,7 @@ TEST( stk_topology, validate_topology) EXPECT_TRUE( validate_topology_data< topology::TRI_4 >() ); EXPECT_TRUE( validate_topology_data< topology::TRI_6 >() ); EXPECT_TRUE( validate_topology_data< topology::QUAD_4 >() ); + EXPECT_TRUE( validate_topology_data< topology::QUAD_6 >() ); EXPECT_TRUE( validate_topology_data< topology::QUAD_8 >() ); EXPECT_TRUE( validate_topology_data< topology::QUAD_9 >() ); EXPECT_TRUE( validate_topology_data< topology::PARTICLE >() ); @@ -202,6 +203,7 @@ TEST( stk_topology, validate_topology) EXPECT_TRUE( validate_topology_data< topology::PYRAMID_13 >() ); EXPECT_TRUE( validate_topology_data< topology::PYRAMID_14 >() ); EXPECT_TRUE( validate_topology_data< topology::WEDGE_6 >() ); + EXPECT_TRUE( validate_topology_data< topology::WEDGE_12 >() ); EXPECT_TRUE( validate_topology_data< topology::WEDGE_15 >() ); EXPECT_TRUE( validate_topology_data< topology::WEDGE_18 >() ); EXPECT_TRUE( validate_topology_data< topology::HEX_8 >() ); @@ -211,6 +213,8 @@ TEST( stk_topology, validate_topology) // check that the permutations define the same sides for (stk::topology topo = stk::topology::BEGIN_TOPOLOGY; topo < stk::topology::END_TOPOLOGY; ++topo) { + if(topo == stk::topology::QUAD_6 || topo == stk::topology::WEDGE_12) { continue; } + if (topo.num_permutations() > 1u && topo.side_rank() > stk::topology::NODE_RANK ) { const unsigned num_permutations = topo.num_permutations(); const unsigned num_sides = topo.num_sides(); @@ -270,8 +274,8 @@ TEST( stk_topology, verify_3D_topology) std::vector goldValues = {stk::topology::TET_4, stk::topology::TET_8, stk::topology::TET_10, stk::topology::TET_11, stk::topology::PYRAMID_5, stk::topology::PYRAMID_13, stk::topology::PYRAMID_14, - stk::topology::WEDGE_6, stk::topology::WEDGE_15, stk::topology::WEDGE_18, - stk::topology::HEX_8, stk::topology::HEX_20, stk::topology::HEX_27}; + stk::topology::WEDGE_6, stk::topology::WEDGE_12, stk::topology::WEDGE_15, + stk::topology::WEDGE_18, stk::topology::HEX_8, stk::topology::HEX_20, stk::topology::HEX_27}; std::vector results; for(stk::topology::topology_t i = stk::topology::BEGIN_TOPOLOGY; i < stk::topology::END_TOPOLOGY; ++i) diff --git a/packages/stk/stk_unit_tests/stk_topology/unit_test_wedge.cpp b/packages/stk/stk_unit_tests/stk_topology/unit_test_wedge.cpp index 90dd42225980..92081c3b7498 100644 --- a/packages/stk/stk_unit_tests/stk_topology/unit_test_wedge.cpp +++ b/packages/stk/stk_unit_tests/stk_topology/unit_test_wedge.cpp @@ -173,6 +173,154 @@ NGP_TEST(stk_topology_ngp, wedge_6) check_wedge_6_on_device(); } +TEST(stk_topology, wedge_12) +{ + stk::topology t = stk::topology::WEDGE_12; + + EXPECT_TRUE(t.is_valid()); + EXPECT_FALSE(t.has_homogeneous_faces()); + EXPECT_FALSE(t.is_shell()); + + EXPECT_EQ(t.rank(),stk::topology::ELEMENT_RANK); + EXPECT_EQ(t.side_rank(),stk::topology::FACE_RANK); + EXPECT_EQ(t.num_sides(),5u); + + EXPECT_EQ(t.num_nodes(),12u); + EXPECT_EQ(t.num_vertices(),6u); + EXPECT_EQ(t.num_edges(),9u); + EXPECT_EQ(t.num_faces(),5u); + + EXPECT_FALSE(t.defined_on_spatial_dimension(1)); + EXPECT_FALSE(t.defined_on_spatial_dimension(2)); + EXPECT_TRUE(t.defined_on_spatial_dimension(3)); + + EXPECT_EQ(t.base(),stk::topology::WEDGE_6); + + EXPECT_EQ(t.face_topology(0), stk::topology::QUAD_6); + EXPECT_EQ(t.face_topology(1), stk::topology::QUAD_6); + EXPECT_EQ(t.face_topology(2), stk::topology::QUAD_6); + EXPECT_EQ(t.face_topology(3), stk::topology::TRI_6); + EXPECT_EQ(t.face_topology(4), stk::topology::TRI_6); + + std::vector> gold_edge_node_ordinals = { {0, 1, 6}, + {1, 2, 7}, + {2, 0, 8}, + {3, 4, 9}, + {4, 5, 10}, + {5, 3, 11}, + {0, 3}, + {1, 4}, + {2, 5} }; + check_edge_node_ordinals(t, gold_edge_node_ordinals); + check_edge_nodes(t, gold_edge_node_ordinals); + + std::vector> gold_face_node_ordinals = { {0, 1, 4, 3, 6, 9}, + {1, 2, 5, 4, 7, 10}, + {0, 3, 5, 2, 8, 11}, + {0, 2, 1, 8, 7, 6}, + {3, 4, 5, 9, 10, 11} }; + + check_side_node_ordinals(t, gold_face_node_ordinals); + check_face_node_ordinals(t, gold_face_node_ordinals); + check_side_nodes(t, gold_face_node_ordinals); + check_face_nodes(t, gold_face_node_ordinals); + + std::vector> gold_permutation_node_ordinals = { + {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11}, + {1, 2, 0, 4, 5, 3, 7, 8, 6, 10, 11, 9}, + {2, 0, 1, 5, 3, 4, 8, 6, 7, 11, 9, 10}, + {3, 5, 4, 0, 2, 1, 9, 11, 10, 8, 7, 6}, + {5, 4, 3, 2, 1, 0, 11, 10, 9, 7, 6, 8}, + {4, 3, 5, 1, 0, 2, 10, 9, 11, 6, 8, 7} + }; + std::cout<<"Reminder: we still need to enable permutation for wedge_12"< EntityProc; + typedef std::pair,EntityProc> BoundingBox; + void bounding_boxes(std::vector& boxes) const + { /* empty to test coarse_search_impl with empty domain */ } +}; + +class TrivialTestDestMesh { +public: + typedef TrivialTestKey Key; + typedef stk::search::IdentProc EntityProc; + typedef std::pair,EntityProc> BoundingBox; + void bounding_boxes(std::vector& boxes) const + { + boxes.clear(); + boxes.push_back(BoundingBox(stk::search::Box(),EntityProc(0,0))); + } +}; + +class TrivialTestInterp { +public: + typedef TrivialTestSrcMesh MeshA; + typedef TrivialTestDestMesh MeshB; + typedef MeshA::EntityProc EntityProcA; + typedef MeshB::EntityProc EntityProcB; + typedef std::pair EntityProcRelation; + typedef std::vector EntityProcRelationVec; +}; + +TEST(GeomXferImpl, coarseSearchImpl_emptyDomain) +{ + TrivialTestInterp::EntityProcRelationVec entProcRelVec; + TrivialTestSrcMesh empty_meshA; + TrivialTestDestMesh meshB; + const double expansionFactor = 1.1; // >1 so coarse_search_impl will try + //to expand boxes to find range entries + EXPECT_NO_THROW(stk::transfer::impl::coarse_search_impl + (entProcRelVec, MPI_COMM_WORLD, &empty_meshA, &meshB, + stk::search::KDTREE, expansionFactor)); + EXPECT_TRUE(entProcRelVec.empty()); +} using EntityKey = uint64_t; @@ -667,8 +721,8 @@ TEST_P(ReducedDependencyGeometricTransferTest, ThreeElemToTwoPointLocalPointIds) test.run(GetParam()); } -//Note, these test segfault with the stk::search::SearchMethod::MORTON_LINEARIZED_BVH -//I'm not sure who uses that search method or it is supposed to be production ready +//Note, these tests segfault with stk::search::SearchMethod::MORTON_LINEARIZED_BVH +//I'm not sure who uses that search method or if it is supposed to be production ready #ifdef INSTANTIATE_TEST_SUITE_P INSTANTIATE_TEST_SUITE_P(GeometricTransferTest, GeometricTransferTest, ::testing::Values(stk::search::SearchMethod::KDTREE)); diff --git a/packages/stk/stk_util/stk_util/command_line/CommandLineParserUtils.cpp b/packages/stk/stk_util/stk_util/command_line/CommandLineParserUtils.cpp index 66ee210f25b6..feee26547791 100644 --- a/packages/stk/stk_util/stk_util/command_line/CommandLineParserUtils.cpp +++ b/packages/stk/stk_util/stk_util/command_line/CommandLineParserUtils.cpp @@ -3,8 +3,10 @@ #include #include #include +#include #include #include +#include #include #include @@ -34,8 +36,7 @@ void parse_command_line(int argc, std::string usage = quickExample + commandLine.get_usage() + longExample; stk::parallel::print_and_exit(usage, comm); } - stk::parallel::require(state == stk::CommandLineParser::ParseComplete, - stk::get_quick_error(execName, quickExample), comm); + ThrowRequireMsg(state == stk::CommandLineParser::ParseComplete, stk::get_quick_error(execName, quickExample)); } namespace parallel { @@ -43,32 +44,11 @@ namespace parallel { void print_and_exit(const std::string &msg, MPI_Comm comm) { if(stk::parallel_machine_rank(comm) == 0) - std::cerr << msg << std::endl; + sierra::Env::outputP0() << msg << std::endl; MPI_Finalize(); std::exit(0); } -void require(bool requirement, const std::string &msg, MPI_Comm comm) -{ - if(!requirement) - print_and_exit(msg, comm); -} - -bool does_file_exist(const std::string& filename) -{ - bool exists = true; - if(!std::ifstream(filename)) - exists = false; - return exists; -} - -void require_file_exists(const std::string& inFile, const std::string& execName, const std::string& quickExample, MPI_Comm comm) -{ - require(does_file_exist(inFile), - "Error: input file does not exist.\n" + stk::get_quick_error(execName, quickExample), - comm); -} - } diff --git a/packages/stk/stk_util/stk_util/command_line/CommandLineParserUtils.hpp b/packages/stk/stk_util/stk_util/command_line/CommandLineParserUtils.hpp index 6a7c016b9b20..9a6bc16946e1 100644 --- a/packages/stk/stk_util/stk_util/command_line/CommandLineParserUtils.hpp +++ b/packages/stk/stk_util/stk_util/command_line/CommandLineParserUtils.hpp @@ -52,9 +52,6 @@ void parse_command_line(int argc, MPI_Comm comm); namespace parallel { void print_and_exit(const std::string &msg, MPI_Comm comm); -void require(bool requirement, const std::string &msg, MPI_Comm comm); -bool does_file_exist(const std::string& filename); -void require_file_exists(const std::string& inFile, const std::string& execName, const std::string& quickExample, MPI_Comm comm); } diff --git a/packages/stk/stk_util/stk_util/diag/Platform.cpp b/packages/stk/stk_util/stk_util/diag/Platform.cpp index 0c02c041c008..caf66916c6e8 100644 --- a/packages/stk/stk_util/stk_util/diag/Platform.cpp +++ b/packages/stk/stk_util/stk_util/diag/Platform.cpp @@ -207,8 +207,8 @@ domainname() std::string domain("."); char buf[255]; - ::getdomainname(buf, sizeof(buf)); - if (::strlen(buf)) { + int errCode = ::getdomainname(buf, sizeof(buf)); + if (!errCode && ::strlen(buf)) { domain += buf; } return domain; diff --git a/packages/stk/stk_util/stk_util/environment/memory_util.cpp b/packages/stk/stk_util/stk_util/environment/memory_util.cpp index be1b03560372..aaf371f2f780 100644 --- a/packages/stk/stk_util/stk_util/environment/memory_util.cpp +++ b/packages/stk/stk_util/stk_util/environment/memory_util.cpp @@ -41,6 +41,11 @@ #include #include +#ifdef __CUDACC__ +#include +#include +#endif + #if defined(__APPLE__) #include #include @@ -107,6 +112,21 @@ size_t get_memory_usage_now() return memory; } +//return GPU memory allocated and free (available) +//values are 0 if __CUDACC__ not defined +void get_gpu_memory_info(size_t& used, size_t& free) +{ + used = 0; + free = 0; +#ifdef __CUDACC__ + size_t total = 0; + cudaError_t err = cudaMemGetInfo(&free, &total); + ThrowRequireMsg(err == cudaSuccess, + "stk::get_gpu_memory_info: cudaMemGetInfo returned error-code: "< &procinfo); diff --git a/packages/stk/stk_util/stk_util/environment/perf_util.hpp b/packages/stk/stk_util/stk_util/environment/perf_util.hpp index 8ea707a4ace7..f2f0649e36f9 100644 --- a/packages/stk/stk_util/stk_util/environment/perf_util.hpp +++ b/packages/stk/stk_util/stk_util/environment/perf_util.hpp @@ -139,6 +139,15 @@ size_t get_max_hwm_across_procs(MPI_Comm comm) return maxHwm; } +inline +size_t get_max_gpu_mem_used_across_procs(MPI_Comm comm) +{ + size_t used = 0, free = 0, globalMaxUsed = 0; + stk::get_gpu_memory_info(used, free); + stk::all_reduce_max(comm, &used, &globalMaxUsed, 1); + return globalMaxUsed; +} + inline double get_max_time_across_procs(double time_on_this_proc, MPI_Comm comm) { diff --git a/packages/stk/stk_util/stk_util/parallel/GenerateParallelConsistentIDs.hpp b/packages/stk/stk_util/stk_util/parallel/GenerateParallelConsistentIDs.hpp index bcd949123987..8ea79c8a68fd 100644 --- a/packages/stk/stk_util/stk_util/parallel/GenerateParallelConsistentIDs.hpp +++ b/packages/stk/stk_util/stk_util/parallel/GenerateParallelConsistentIDs.hpp @@ -36,15 +36,16 @@ #ifndef stk_util_parallel_GenerateParallelConsistentIDs_hpp #define stk_util_parallel_GenerateParallelConsistentIDs_hpp -#include "stk_util/parallel/ParallelVectorConcat.hpp" -#include "stk_util/parallel/Parallel.hpp" +#include "stk_util/parallel/ParallelVectorConcat.hpp" +#include "stk_util/parallel/MPI.hpp" +#include "stk_util/parallel/Parallel.hpp" #include "stk_util/parallel/ParallelIndexGapFinder.hpp" -#include -#include -#include +#include +#include +#include #include // for string -#include -#include "mpi.h" +#include +#include "mpi.h" #include namespace stk { @@ -102,7 +103,7 @@ namespace stk { } } - int mpiResult = MPI_Allreduce(&localMaxId, &globalMaxId, 1, MPI_UNSIGNED_LONG, MPI_MAX, comm); + int mpiResult = MPI_Allreduce(&localMaxId, &globalMaxId, 1, sierra::MPI::Datatype::type(), MPI_MAX, comm); if(mpiResult != MPI_SUCCESS) { throw std::runtime_error("MPI_Allreduce failed"); } @@ -144,7 +145,7 @@ namespace stk { // uint64_t numNewIdsLocal = localOrderArray.size(); uint64_t myFirstNewId; - mpiResult = MPI_Scan(&numNewIdsLocal, &myFirstNewId, 1, MPI_UNSIGNED_LONG, MPI_SUM, comm); + mpiResult = MPI_Scan(&numNewIdsLocal, &myFirstNewId, 1, sierra::MPI::Datatype::type(), MPI_SUM, comm); myFirstNewId -= numNewIdsLocal; std::vector allowedIdsLocal; std::vector allowedIdsGlobal; diff --git a/packages/stk/stk_util/stk_util/parallel/ParallelVectorConcat.hpp b/packages/stk/stk_util/stk_util/parallel/ParallelVectorConcat.hpp index e4fbffdf5658..3fe28f57386c 100644 --- a/packages/stk/stk_util/stk_util/parallel/ParallelVectorConcat.hpp +++ b/packages/stk/stk_util/stk_util/parallel/ParallelVectorConcat.hpp @@ -81,8 +81,8 @@ namespace stk { globalVec.clear(); - unsigned int sizeT = sizeof(T); - unsigned int localSize = sizeT * localVec.size(); + int sizeT = sizeof(T); + int localSize = sizeT * localVec.size(); // // Determine the total number of bytes being sent by each other processor. diff --git a/packages/stk/stk_util/stk_util/unit_test_support/parameterTestUtils.hpp b/packages/stk/stk_util/stk_util/unit_test_support/parameterTestUtils.hpp index 81a3bb0730fc..23b229d76a32 100644 --- a/packages/stk/stk_util/stk_util/unit_test_support/parameterTestUtils.hpp +++ b/packages/stk/stk_util/stk_util/unit_test_support/parameterTestUtils.hpp @@ -34,9 +34,12 @@ #ifndef STK_PARAMETER_TEST_UTILS_H #define STK_PARAMETER_TEST_UTILS_H +#include #include #include +#ifdef STK_HAVE_BOOST + inline void validate_parameters_equal_value(const stk::util::Parameter ¶meter, const stk::util::Parameter &gold_parameter) { @@ -77,4 +80,8 @@ inline void validate_parameters_equal_value(const stk::util::Parameter ¶mete ASSERT_EQ(1,0) << "Invalid type found in validate_parameters_equal_value"; } } -#endif + +#endif //STK_HAVE_BOOST + +#endif //include-guard + diff --git a/packages/stk/stk_util/stk_util/util/ParameterList.cpp b/packages/stk/stk_util/stk_util/util/ParameterList.cpp index ef5855f922bd..5fd03a4e6693 100644 --- a/packages/stk/stk_util/stk_util/util/ParameterList.cpp +++ b/packages/stk/stk_util/stk_util/util/ParameterList.cpp @@ -33,6 +33,9 @@ // #include + +#ifdef STK_HAVE_BOOST + #include // for size_t #include "boost/any.hpp" // for any_cast @@ -159,3 +162,6 @@ namespace stk { } } } + +#endif //STK_HAVE_BOOST + diff --git a/packages/stk/stk_util/stk_util/util/ParameterList.hpp b/packages/stk/stk_util/stk_util/util/ParameterList.hpp index 43b3281cab8b..4cf64e2fbf5a 100644 --- a/packages/stk/stk_util/stk_util/util/ParameterList.hpp +++ b/packages/stk/stk_util/stk_util/util/ParameterList.hpp @@ -35,6 +35,10 @@ #ifndef PARAMETERLIST_H_ #define PARAMETERLIST_H_ +#include + +#ifdef STK_HAVE_BOOST + #include // for int64_t #include // for any, any_cast #include // for operator<<, basic_ostream, etc @@ -187,5 +191,6 @@ namespace stk { } } +#endif //STK_HAVE_BOOST #endif /* PARAMETERLIST_H_ */ diff --git a/packages/stk/stk_util/stk_util/util/StkNgpVector.hpp b/packages/stk/stk_util/stk_util/util/StkNgpVector.hpp index 1be1f8a153e1..41a19c112283 100644 --- a/packages/stk/stk_util/stk_util/util/StkNgpVector.hpp +++ b/packages/stk/stk_util/stk_util/util/StkNgpVector.hpp @@ -63,7 +63,7 @@ class NgpVector NgpVector(size_t s, Datatype init) : NgpVector(get_default_name(), s, init) { } - ~NgpVector() {} + STK_FUNCTION ~NgpVector() {} std::string name() const { return hostVals.label(); } diff --git a/packages/stokhos/src/sacado/kokkos/pce/linalg/Kokkos_CrsMatrix_UQ_PCE.hpp b/packages/stokhos/src/sacado/kokkos/pce/linalg/Kokkos_CrsMatrix_UQ_PCE.hpp index 7e9e76ceb654..1d0acc8d89cb 100644 --- a/packages/stokhos/src/sacado/kokkos/pce/linalg/Kokkos_CrsMatrix_UQ_PCE.hpp +++ b/packages/stokhos/src/sacado/kokkos/pce/linalg/Kokkos_CrsMatrix_UQ_PCE.hpp @@ -1492,6 +1492,30 @@ spmv( Sacado::Value::eval(b) ); } +template +typename std::enable_if< + Kokkos::is_view_uq_pce< Kokkos::View< InputType, InputP... > >::value && + Kokkos::is_view_uq_pce< Kokkos::View< OutputType, OutputP... > >::value + >::type +spmv( + KokkosKernels::Experimental::Controls, + const char mode[], + const AlphaType& a, + const MatrixType& A, + const Kokkos::View< InputType, InputP... >& x, + const BetaType& b, + const Kokkos::View< OutputType, OutputP... >& y, + const RANK_ONE) +{ + spmv(mode, a, A, x, b, y, RANK_ONE()); +} + template +typename std::enable_if< + Kokkos::is_view_uq_pce< Kokkos::View< InputType, InputP... > >::value && + Kokkos::is_view_uq_pce< Kokkos::View< OutputType, OutputP... > >::value + >::type +spmv( + KokkosKernels::Experimental::Controls, + const char mode[], + const AlphaType& a, + const MatrixType& A, + const Kokkos::View< InputType, InputP... >& x, + const BetaType& b, + const Kokkos::View< OutputType, OutputP... >& y, + const RANK_TWO) +{ + spmv(mode, a, A, x, b, y, RANK_TWO()); +} + } #endif /* #ifndef KOKKOS_CRSMATRIX_UQ_PCE_HPP */ diff --git a/packages/stokhos/src/sacado/kokkos/vector/belos/Belos_StatusTest_GenResNorm_MP_Vector.hpp b/packages/stokhos/src/sacado/kokkos/vector/belos/Belos_StatusTest_GenResNorm_MP_Vector.hpp index fb0ba3edb8e3..9a8a9d113db0 100644 --- a/packages/stokhos/src/sacado/kokkos/vector/belos/Belos_StatusTest_GenResNorm_MP_Vector.hpp +++ b/packages/stokhos/src/sacado/kokkos/vector/belos/Belos_StatusTest_GenResNorm_MP_Vector.hpp @@ -164,6 +164,8 @@ class StatusTestGenResNorm, MV, OP> : */ int defineScaleForm( ScaleType TypeOfScaling, NormType TypeOfNorm, MagnitudeType ScaleValue = Teuchos::ScalarTraits::one()); + NormType getResNormType() {return resnormtype_;} + //! Set the value of the tolerance /*! We allow the tolerance to be reset for cases where, in the process of testing the residual, we find that the initial tolerance was too tight or too lax. diff --git a/packages/stokhos/src/sacado/kokkos/vector/linalg/Kokkos_CrsMatrix_MP_Vector.hpp b/packages/stokhos/src/sacado/kokkos/vector/linalg/Kokkos_CrsMatrix_MP_Vector.hpp index 1c18011107bf..151f16ba3b11 100644 --- a/packages/stokhos/src/sacado/kokkos/vector/linalg/Kokkos_CrsMatrix_MP_Vector.hpp +++ b/packages/stokhos/src/sacado/kokkos/vector/linalg/Kokkos_CrsMatrix_MP_Vector.hpp @@ -616,6 +616,30 @@ spmv( } } +template +typename std::enable_if< + Kokkos::is_view_mp_vector< Kokkos::View< InputType, InputP... > >::value && + Kokkos::is_view_mp_vector< Kokkos::View< OutputType, OutputP... > >::value + >::type +spmv( + KokkosKernels::Experimental::Controls, + const char mode[], + const AlphaType& a, + const MatrixType& A, + const Kokkos::View< InputType, InputP... >& x, + const BetaType& b, + const Kokkos::View< OutputType, OutputP... >& y, + const RANK_ONE) +{ + spmv(mode, a, A, x, b, y, RANK_ONE()); +} + template +typename std::enable_if< + Kokkos::is_view_mp_vector< Kokkos::View< InputType, InputP... > >::value && + Kokkos::is_view_mp_vector< Kokkos::View< OutputType, OutputP... > >::value + >::type +spmv( + KokkosKernels::Experimental::Controls, + const char mode[], + const AlphaType& a, + const MatrixType& A, + const Kokkos::View< InputType, InputP... >& x, + const BetaType& b, + const Kokkos::View< OutputType, OutputP... >& y, + const RANK_TWO) +{ + spmv(mode, a, A, x, b, y, RANK_TWO()); +} + } #endif /* #ifndef KOKKOS_CRSMATRIX_MP_VECTOR_HPP */ diff --git a/packages/tempus/doc/Doxyfile b/packages/tempus/doc/Doxyfile index 6c5cfb016434..0800d056ebfb 100644 --- a/packages/tempus/doc/Doxyfile +++ b/packages/tempus/doc/Doxyfile @@ -204,7 +204,7 @@ ALIASES = # "class=itcl::class" will allow you to use the command class in the # itcl::class meaning. -TCL_SUBST = +#TCL_SUBST = # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C # sources only. Doxygen will then generate output that is more tailored for C. @@ -1652,7 +1652,7 @@ EXTERNAL_PAGES = YES # The PERL_PATH should be the absolute path and name of the perl script # interpreter (i.e. the result of `which perl'). -PERL_PATH = /usr/bin/perl +#PERL_PATH = /usr/bin/perl #--------------------------------------------------------------------------- # Configuration options related to the dot tool @@ -1673,7 +1673,7 @@ CLASS_DIAGRAMS = YES # the mscgen tool resides. If left empty the tool is assumed to be found in the # default search path. -MSCGEN_PATH = +#MSCGEN_PATH = # If set to YES, the inheritance and collaboration graphs will hide # inheritance and usage relations if the target is undocumented diff --git a/packages/tempus/src/Tempus_IntegratorAdjointSensitivity_decl.hpp b/packages/tempus/src/Tempus_IntegratorAdjointSensitivity_decl.hpp index 0c2017687e28..bd49970a178a 100644 --- a/packages/tempus/src/Tempus_IntegratorAdjointSensitivity_decl.hpp +++ b/packages/tempus/src/Tempus_IntegratorAdjointSensitivity_decl.hpp @@ -127,6 +127,12 @@ class IntegratorAdjointSensitivity : Teuchos::RCP > DxdotDp0 = Teuchos::null, Teuchos::RCP > DxdotdotDp0 = Teuchos::null); + /// Set the Observer + virtual void setObserver( + Teuchos::RCP > obs = Teuchos::null); + /// Initializes the Integrator after set* function calls + virtual void initialize(); + /// Get current the solution, x virtual Teuchos::RCP > getX() const; /// Get current the time derivative of the solution, xdot diff --git a/packages/tempus/src/Tempus_IntegratorAdjointSensitivity_impl.hpp b/packages/tempus/src/Tempus_IntegratorAdjointSensitivity_impl.hpp index ca40b27eca62..f49ec5308257 100644 --- a/packages/tempus/src/Tempus_IntegratorAdjointSensitivity_impl.hpp +++ b/packages/tempus/src/Tempus_IntegratorAdjointSensitivity_impl.hpp @@ -311,6 +311,24 @@ initializeSolutionHistory(Scalar t0, dxdp_init_ = DxDp0; } +template +void IntegratorAdjointSensitivity:: +setObserver(Teuchos::RCP > obs) +{ + state_integrator_->setObserver(obs); + // Currently not setting observer on adjoint integrator because it isn't + // clear what we want to do with it + //adjoint_integrator_->setObserver(obs); +} + +template +void IntegratorAdjointSensitivity:: +initialize() +{ + state_integrator_->initialize(); + adjoint_integrator_->initialize(); +} + template Teuchos::RCP > IntegratorAdjointSensitivity:: diff --git a/packages/tempus/src/Tempus_RKButcherTableau.hpp b/packages/tempus/src/Tempus_RKButcherTableau.hpp index c8950af3f2d1..30420e6ffcf7 100644 --- a/packages/tempus/src/Tempus_RKButcherTableau.hpp +++ b/packages/tempus/src/Tempus_RKButcherTableau.hpp @@ -146,6 +146,15 @@ class RKButcherTableau : virtual bool isDIRK() const { return isDIRK_; } /** \brief Return true if the RK method has embedded capabilities */ virtual bool isEmbedded() const { return isEmbedded_; } + /** \brief Return true if the RK method is TVD */ + virtual bool isTVD() const { return isTVD_; } + /** \brief Return TVD coefficient of RK method */ + virtual Scalar getTVDCoeff() const { return tvdCoeff_; } + /** \brief set TVD coefficient of RK method */ + virtual void setTVDCoeff(const Scalar a) { tvdCoeff_ = a; } + virtual void setTVD(bool a) { isTVD_ = a; } + virtual void setEmbedded(bool a) { isEmbedded_ = a; } + /* \brief Redefined from Teuchos::Describable */ //@{ @@ -167,10 +176,45 @@ class RKButcherTableau : out << "isImplicit = " << this->isImplicit() << std::endl; out << "isDIRK = " << this->isDIRK() << std::endl; out << "isEmbedded = " << this->isEmbedded() << std::endl; + if (this->isTVD()) + out << "TVD Coeff = " << this->getTVDCoeff() << std::endl; } } //@} + bool operator == (const RKButcherTableau & t) const { + const Scalar relTol = 1.0e-15; + if ( A_->numRows() != t.A_->numRows() || + A_->numCols() != t.A_->numCols() ) { + return false; + } else { + int i, j; + for(i = 0; i < A_->numRows(); i++) { + for(j = 0; j < A_->numCols(); j++) { + if(std::abs((t.A_(i,j) - A_(i,j))/A_(i,j)) > relTol) return false; + } + } + } + + if ( b_->length() != t.b_->length() || + b_->length() != t.c_->length() || + b_->length() != t.bstar_->length() ) { + return false; + } else { + int i; + for(i = 0; i < A_->numRows(); i++) { + if(std::abs((t.b_(i) - b_(i))/b_(i)) > relTol) return false; + if(std::abs((t.c_(i) - c_(i))/c_(i)) > relTol) return false; + if(std::abs((t.bstar_(i) - bstar_(i))/bstar_(i)) > relTol) return false; + } + } + return true; + } + + bool operator != (const RKButcherTableau & t) const { + return !((*this) == t); + } + private: RKButcherTableau(); @@ -207,7 +251,9 @@ class RKButcherTableau : bool isImplicit_; bool isDIRK_; bool isEmbedded_; + bool isTVD_ = false; Teuchos::SerialDenseVector bstar_; + Scalar tvdCoeff_ = 0; }; diff --git a/packages/tempus/src/Tempus_StepperBDF2_decl.hpp b/packages/tempus/src/Tempus_StepperBDF2_decl.hpp index e113cab803cd..dd3f336dc961 100644 --- a/packages/tempus/src/Tempus_StepperBDF2_decl.hpp +++ b/packages/tempus/src/Tempus_StepperBDF2_decl.hpp @@ -43,7 +43,7 @@ namespace Tempus { * - \frac{\tau_n}{\tau_n + \tau_{n-1}} * \left[ \frac{x_{n-1}-x_{n-2}}{\tau_{n-1}}\right], \f$ * - * The First-Step-As-Last (FSAL) principle is not needed BDF2. + * The First-Same-As-Last (FSAL) principle is not needed BDF2. * The default is to set useFSAL=false, however useFSAL=true will also work * but have no affect (i.e., no-op). * diff --git a/packages/tempus/src/Tempus_StepperBDF2_impl.hpp b/packages/tempus/src/Tempus_StepperBDF2_impl.hpp index 2bafe380f490..712a729b1cf7 100644 --- a/packages/tempus/src/Tempus_StepperBDF2_impl.hpp +++ b/packages/tempus/src/Tempus_StepperBDF2_impl.hpp @@ -162,6 +162,8 @@ void StepperBDF2::setInitialConditions( // Check if we need Stepper storage for xDot if (initialState->getXDot() == Teuchos::null) this->setStepperXDot(initialState->getX()->clone_v()); + else + this->setStepperXDot(initialState->getXDot()); StepperImplicit::setInitialConditions(solutionHistory); } @@ -203,7 +205,9 @@ void StepperBDF2::takeStep( RCP > currentState=solutionHistory->getCurrentState(); RCP > x = workingState->getX(); - RCP > xDot = this->getStepperXDot(workingState); + if (workingState->getXDot() != Teuchos::null) + this->setStepperXDot(workingState->getXDot()); + RCP > xDot = this->getStepperXDot(); //get time, dt and dtOld const Scalar time = workingState->getTime(); diff --git a/packages/tempus/src/Tempus_StepperBackwardEulerAppAction.hpp b/packages/tempus/src/Tempus_StepperBackwardEulerAppAction.hpp index 59e3e807d053..11d6f8fce0be 100644 --- a/packages/tempus/src/Tempus_StepperBackwardEulerAppAction.hpp +++ b/packages/tempus/src/Tempus_StepperBackwardEulerAppAction.hpp @@ -11,7 +11,6 @@ #include "Tempus_config.hpp" #include "Tempus_SolutionHistory.hpp" -#include "Tempus_StepperBackwardEuler.hpp" namespace Tempus { diff --git a/packages/tempus/src/Tempus_StepperBackwardEulerModifierDefault.hpp b/packages/tempus/src/Tempus_StepperBackwardEulerModifierDefault.hpp index 8a923ba13090..2d596fdc2e14 100644 --- a/packages/tempus/src/Tempus_StepperBackwardEulerModifierDefault.hpp +++ b/packages/tempus/src/Tempus_StepperBackwardEulerModifierDefault.hpp @@ -10,9 +10,12 @@ #define Tempus_StepperBackwardEulerModifierDefault_hpp #include "Tempus_config.hpp" -#include "Tempus_SolutionHistory.hpp" #include "Tempus_StepperBackwardEulerModifierBase.hpp" +// Applications can uncomment this include in their implementation, +// if they need access to the stepper methods. +//#include "Tempus_StepperBackwardEuler.hpp" + namespace Tempus { @@ -20,6 +23,9 @@ namespace Tempus { * * The default modifier provides no-op functionality for the modifier. * See StepperBackwardEulerModifierBase for details on the algorithm. + * + * Applications can copy this implementation, rename, implement their + * action, and set on the stepper to get app-specific functionality. */ template class StepperBackwardEulerModifierDefault diff --git a/packages/tempus/src/Tempus_StepperBackwardEulerModifierXBase.hpp b/packages/tempus/src/Tempus_StepperBackwardEulerModifierXBase.hpp index 5839e8d54635..4a9d2f93aacd 100644 --- a/packages/tempus/src/Tempus_StepperBackwardEulerModifierXBase.hpp +++ b/packages/tempus/src/Tempus_StepperBackwardEulerModifierXBase.hpp @@ -99,7 +99,10 @@ class StepperBackwardEulerModifierXBase case StepperBackwardEulerAppAction::END_STEP: { modType = XDOT_END_STEP; - x = stepper->getStepperXDot(workingState); + if (workingState->getXDot() != Teuchos::null) + x = workingState->getXDot(); + else + x = stepper->getStepperXDot(); break; } default: diff --git a/packages/tempus/src/Tempus_StepperBackwardEulerModifierXDefault.hpp b/packages/tempus/src/Tempus_StepperBackwardEulerModifierXDefault.hpp index 00584a4e40bc..55a8cbf7d3b5 100644 --- a/packages/tempus/src/Tempus_StepperBackwardEulerModifierXDefault.hpp +++ b/packages/tempus/src/Tempus_StepperBackwardEulerModifierXDefault.hpp @@ -10,7 +10,6 @@ #define Tempus_StepperBackwardEulerModifierX_hpp #include "Tempus_config.hpp" -#include "Tempus_SolutionHistory.hpp" #include "Tempus_StepperBackwardEulerModifierXBase.hpp" @@ -20,6 +19,9 @@ namespace Tempus { * * The default provides no-op functionality for ModifierX. * See StepperBackwardEulerModifierXBase for details on the algorithm. + * + * Applications can copy this implementation, rename, implement their + * action, and set on the stepper to get app-specific functionality. */ template class StepperBackwardEulerModifierXDefault diff --git a/packages/tempus/src/Tempus_StepperBackwardEulerObserverDefault.hpp b/packages/tempus/src/Tempus_StepperBackwardEulerObserverDefault.hpp index 93bc7fc484f3..97cc75f9f8d6 100644 --- a/packages/tempus/src/Tempus_StepperBackwardEulerObserverDefault.hpp +++ b/packages/tempus/src/Tempus_StepperBackwardEulerObserverDefault.hpp @@ -10,9 +10,12 @@ #define Tempus_StepperBackwardEulerObserverDefault_hpp #include "Tempus_config.hpp" -#include "Tempus_SolutionHistory.hpp" #include "Tempus_StepperBackwardEulerObserverBase.hpp" +// Applications can uncomment this include in their implementation, +// if they need access to the stepper methods. +//#include "Tempus_StepperBackwardEuler.hpp" + namespace Tempus { @@ -20,6 +23,9 @@ namespace Tempus { * * The default observer provides no-op functionality for the observer. * See StepperBackwardEulerObserverBase for details on the algorithm. + * + * Applications can copy this implementation, rename, implement their + * action, and set on the stepper to get app-specific functionality. */ template class StepperBackwardEulerObserverDefault diff --git a/packages/tempus/src/Tempus_StepperBackwardEuler_decl.hpp b/packages/tempus/src/Tempus_StepperBackwardEuler_decl.hpp index 4fbc7e86d2c7..c75244bd1f6b 100644 --- a/packages/tempus/src/Tempus_StepperBackwardEuler_decl.hpp +++ b/packages/tempus/src/Tempus_StepperBackwardEuler_decl.hpp @@ -43,7 +43,7 @@ namespace Tempus { * \end{algorithmic} * \f} * - * The First-Step-As-Last (FSAL) principle is not needed with Backward Euler. + * The First-Same-As-Last (FSAL) principle is not needed with Backward Euler. * The default is to set useFSAL=false, however useFSAL=true will also work * but have no affect (i.e., no-op). * diff --git a/packages/tempus/src/Tempus_StepperBackwardEuler_impl.hpp b/packages/tempus/src/Tempus_StepperBackwardEuler_impl.hpp index 017e1eab9802..82c70d29f0c3 100644 --- a/packages/tempus/src/Tempus_StepperBackwardEuler_impl.hpp +++ b/packages/tempus/src/Tempus_StepperBackwardEuler_impl.hpp @@ -200,13 +200,15 @@ void StepperBackwardEuler::setInitialConditions( // Check if we need Stepper storage for xDot if (initialState->getXDot() == Teuchos::null) this->setStepperXDot(initialState->getX()->clone_v()); + else + this->setStepperXDot(initialState->getXDot()); StepperImplicit::setInitialConditions(solutionHistory); if (this->getUseFSAL()) { RCP out = this->getOStream(); Teuchos::OSTab ostab(out,1,"StepperBackwardEuler::setInitialConditions()"); - *out << "\nWarning -- The First-Step-As-Last (FSAL) principle is not " + *out << "\nWarning -- The First-Same-As-Last (FSAL) principle is not " << "needed with Backward Euler. The default is to set useFSAL=false, " << "however useFSAL=true will also work but have no affect " << "(i.e., no-op).\n" << std::endl; @@ -244,8 +246,9 @@ void StepperBackwardEuler::takeStep( RCP > xOld = currentState->getX(); RCP > x = workingState->getX(); - - RCP > xDot = this->getStepperXDot(workingState); + if (workingState->getXDot() != Teuchos::null) + this->setStepperXDot(workingState->getXDot()); + RCP > xDot = this->getStepperXDot(); computePredictor(solutionHistory); if (workingState->getSolutionStatus() == Status::FAILED) diff --git a/packages/tempus/src/Tempus_StepperDIRK_decl.hpp b/packages/tempus/src/Tempus_StepperDIRK_decl.hpp index 588d26638213..0bab35a3da74 100644 --- a/packages/tempus/src/Tempus_StepperDIRK_decl.hpp +++ b/packages/tempus/src/Tempus_StepperDIRK_decl.hpp @@ -11,7 +11,6 @@ #include "Tempus_config.hpp" #include "Tempus_StepperRKBase.hpp" -#include "Tempus_RKButcherTableau.hpp" #include "Tempus_StepperImplicit.hpp" #include "Tempus_WrapperModelEvaluator.hpp" #ifndef TEMPUS_HIDE_DEPRECATED_CODE @@ -70,22 +69,20 @@ namespace Tempus { * \renewcommand{\thealgorithm}{} * \caption{DIRK with the application-action locations indicated.} * \begin{algorithmic}[1] - * \State {\it appAction.execute(solutionHistory, stepper, BEGIN\_STEP)} * \If {``Reset initial guess.''} * \State $X \leftarrow x_{n-1}$ * \Comment{Reset initial guess to last timestep.} * \EndIf + * \State {\it appAction.execute(solutionHistory, stepper, BEGIN\_STEP)} * \For {$i = 0 \ldots s-1$} - * \If { $a_{k,i} = 0 \;\forall k = (i+1,\ldots, s-1)$, $b(i) = 0$, $b^\ast(i) = 0$} - * \State $\dot{X}_i \leftarrow 0$ - * \Comment{Not needed for later calculations.} - * \State {\bf continue} - * \EndIf * \State $\tilde{X} \leftarrow * x_{n-1} +\Delta t \sum_{j=1}^{i-1} a_{ij}\,\dot{X}_{j}$ * \State {\it appAction.execute(solutionHistory, stepper, BEGIN\_STAGE)} - * \If {$a_{ii} = 0$} \Comment{Explicit stage.} - * \If {$i=0$ and ``Use FSAL''} \Comment{Save an evaluation?} + * \If { $a_{k,i} = 0 \;\forall k = (i+1,\ldots, s-1)$, $b(i) = 0$, $b^\ast(i) = 0$} + * \State $\dot{X}_i \leftarrow 0$ + * \Comment{Not needed for later calculations.} + * \ElsIf {$a_{ii} = 0$} \Comment{Explicit stage.} + * \If {$i=0$ and ``Use FSAL'' and (previous step not failed)} * \State $\dot{X}_0 \leftarrow \dot{X}_{s-1}$ * \Comment{Use $\dot{X}_{s-1}$ from $n-1$ time step.} * \Else @@ -118,7 +115,7 @@ namespace Tempus { * \end{algorithmic} * \f} * - * The First-Step-As-Last (FSAL) principle is not needed with DIRK, but + * The First-Same-As-Last (FSAL) principle is not needed with DIRK, but * maybe useful if the first stage is explicit (EDIRK) (e.g., Trapezoidal * Method). The default is to set useFSAL=false. * @@ -165,9 +162,6 @@ class StepperDIRK : virtual public Tempus::StepperImplicit, virtual Teuchos::RCP > getObserver() const { return this->stepperObserver_; } #endif - virtual Teuchos::RCP > getTableau() - { return tableau_; } - /// Initialize after construction and changing input parameters. virtual void initialize(); @@ -187,14 +181,11 @@ class StepperDIRK : virtual public Tempus::StepperImplicit, /// Get a default (initial) StepperState virtual Teuchos::RCP >getDefaultStepperState(); - virtual Scalar getOrder() const{return tableau_->order();} - virtual Scalar getOrderMin() const{return tableau_->orderMin();} - virtual Scalar getOrderMax() const{return tableau_->orderMax();} virtual bool isExplicit() const { - const int numStages = tableau_->numStages(); - Teuchos::SerialDenseMatrix A = tableau_->A(); + const int numStages = this->tableau_->numStages(); + Teuchos::SerialDenseMatrix A = this->tableau_->A(); bool isExplicit = false; for (int i=0; i, /// Return alpha = d(xDot)/dx. virtual Scalar getAlpha(const Scalar dt) const { - const Teuchos::SerialDenseMatrix & A=tableau_->A(); + const Teuchos::SerialDenseMatrix & A=this->tableau_->A(); return Scalar(1.0)/(dt*A(0,0)); // Getting the first diagonal coeff! } /// Return beta = d(x)/dx. @@ -273,8 +264,6 @@ class StepperDIRK : virtual public Tempus::StepperImplicit, virtual void setupTableau() = 0; - Teuchos::RCP > tableau_; - std::vector > > stageXDot_; Teuchos::RCP > xTilde_; diff --git a/packages/tempus/src/Tempus_StepperDIRK_impl.hpp b/packages/tempus/src/Tempus_StepperDIRK_impl.hpp index ea9fc9bbcfd8..81c68b34b59d 100644 --- a/packages/tempus/src/Tempus_StepperDIRK_impl.hpp +++ b/packages/tempus/src/Tempus_StepperDIRK_impl.hpp @@ -160,8 +160,7 @@ template void StepperDIRK::initialize() { // Initialize the stage vectors - const int numStages = tableau_->numStages(); - this->stageX_ = this->wrapperModel_->getNominalValues().get_x()->clone_v(); + const int numStages = this->tableau_->numStages(); stageXDot_.resize(numStages); for (int i=0; iwrapperModel_->get_f_space()); @@ -170,7 +169,7 @@ void StepperDIRK::initialize() xTilde_ = Thyra::createMember(this->wrapperModel_->get_x_space()); assign(xTilde_.ptr(), Teuchos::ScalarTraits::zero()); - if (tableau_->isEmbedded() and this->getUseEmbedded()) { + if (this->tableau_->isEmbedded() and this->getUseEmbedded()) { ee_ = Thyra::createMember(this->wrapperModel_->get_f_space()); abs_u0 = Thyra::createMember(this->wrapperModel_->get_f_space()); abs_u = Thyra::createMember(this->wrapperModel_->get_f_space()); @@ -185,14 +184,7 @@ template void StepperDIRK::setInitialConditions ( const Teuchos::RCP >& solutionHistory) { - using Teuchos::RCP; - - RCP > initialState = solutionHistory->getCurrentState(); - - // Check if we need Stepper storage for xDot - if (initialState->getXDot() == Teuchos::null) - this->setStepperXDot(stageXDot_.back()); - + this->setStepperXDot(stageXDot_.back()); StepperImplicit::setInitialConditions(solutionHistory); } @@ -215,27 +207,28 @@ void StepperDIRK::takeStep( "Try setting in \"Solution History\" \"Storage Type\" = \"Undo\"\n" " or \"Storage Type\" = \"Static\" and \"Storage Limit\" = \"2\"\n"); -#ifndef TEMPUS_HIDE_DEPRECATED_CODE - this->stepperObserver_->observeBeginTakeStep(solutionHistory, *this); -#endif - RCP > thisStepper = Teuchos::rcpFromRef(*this); - this->stepperRKAppAction_->execute(solutionHistory, thisStepper, - StepperRKAppAction::ACTION_LOCATION::BEGIN_STEP); - RCP > currentState=solutionHistory->getCurrentState(); RCP > workingState=solutionHistory->getWorkingState(); const Scalar dt = workingState->getTimeStep(); const Scalar time = currentState->getTime(); - const int numStages = tableau_->numStages(); - Teuchos::SerialDenseMatrix A = tableau_->A(); - Teuchos::SerialDenseVector b = tableau_->b(); - Teuchos::SerialDenseVector c = tableau_->c(); + const int numStages = this->tableau_->numStages(); + Teuchos::SerialDenseMatrix A = this->tableau_->A(); + Teuchos::SerialDenseVector b = this->tableau_->b(); + Teuchos::SerialDenseVector c = this->tableau_->c(); + this->stageX_ = workingState->getX(); // Reset non-zero initial guess. if ( this->getResetInitialGuess() && (!this->getZeroInitialGuess()) ) Thyra::assign(this->stageX_.ptr(), *(currentState->getX())); +#ifndef TEMPUS_HIDE_DEPRECATED_CODE + this->stepperObserver_->observeBeginTakeStep(solutionHistory, *this); +#endif + RCP > thisStepper = Teuchos::rcpFromRef(*this); + this->stepperRKAppAction_->execute(solutionHistory, thisStepper, + StepperRKAppAction::ACTION_LOCATION::BEGIN_STEP); + // Compute stage solutions bool pass = true; Thyra::SolveStatus sStatus; @@ -249,30 +242,29 @@ void StepperDIRK::takeStep( ->observeBeforeImplicitExplicitly(solutionHistory, *this); #endif - // Check if stageXDot_[i] is needed. - bool isNeeded = false; - for (int k=i+1; kisEmbedded() && this->getUseEmbedded() && - tableau_->bstar()(i) != 0.0) - isNeeded = true; - if (isNeeded == false) { - assign(stageXDot_[i].ptr(), Teuchos::ScalarTraits::zero()); - continue; - } - Thyra::assign(xTilde_.ptr(), *(currentState->getX())); for (int j=0; j < i; ++j) { if (A(i,j) != Teuchos::ScalarTraits::zero()) { Thyra::Vp_StV(xTilde_.ptr(), dt*A(i,j), *(stageXDot_[j])); } } + this->setStepperXDot(stageXDot_[i]); this->stepperRKAppAction_->execute(solutionHistory, thisStepper, StepperRKAppAction::ACTION_LOCATION::BEGIN_STAGE); Scalar ts = time + c(i)*dt; - if (A(i,i) == Teuchos::ScalarTraits::zero()) { + + // Check if stageXDot_[i] is needed. + bool isNeeded = false; + for (int k=i+1; ktableau_->isEmbedded() && this->getUseEmbedded() && + this->tableau_->bstar()(i) != 0.0) + isNeeded = true; + if (isNeeded == false) { + assign(stageXDot_[i].ptr(), Teuchos::ScalarTraits::zero()); + } else if (A(i,i) == Teuchos::ScalarTraits::zero()) { // Explicit stage for the ImplicitODE_DAE if (i == 0 && this->getUseFSAL() && workingState->getNConsecutiveFailures() == 0) { @@ -280,6 +272,7 @@ void StepperDIRK::takeStep( RCP > tmp = stageXDot_[0]; stageXDot_[0] = stageXDot_.back(); stageXDot_.back() = tmp; + this->setStepperXDot(stageXDot_[0]); } else { // Calculate explicit stage typedef Thyra::ModelEvaluatorBase MEB; @@ -335,6 +328,8 @@ void StepperDIRK::takeStep( this->stepperRKAppAction_->execute(solutionHistory, thisStepper, StepperRKAppAction::ACTION_LOCATION::END_STAGE); } + // reset the stage number + this->setStageNumber(-1); // Sum for solution: x_n = x_n-1 + Sum{ dt*b(i) * f(i) } Thyra::assign((workingState->getX()).ptr(), *(currentState->getX())); @@ -344,14 +339,14 @@ void StepperDIRK::takeStep( } } - if (tableau_->isEmbedded() and this->getUseEmbedded()) { + if (this->tableau_->isEmbedded() and this->getUseEmbedded()) { const Scalar tolRel = workingState->getTolRel(); const Scalar tolAbs = workingState->getTolAbs(); // just compute the error weight vector // (all that is needed is the error, and not the embedded solution) Teuchos::SerialDenseVector errWght = b ; - errWght -= tableau_->bstar(); + errWght -= this->tableau_->bstar(); // compute local truncation error estimate: | u^{n+1} - \hat{u}^{n+1} | // Sum for solution: ee_n = Sum{ (b(i) - bstar(i)) * dt*f(i) } @@ -390,8 +385,6 @@ void StepperDIRK::takeStep( this->stepperRKAppAction_->execute(solutionHistory, thisStepper, StepperRKAppAction::ACTION_LOCATION::END_STEP); } - // reset the stage number - this->setStageNumber(-1); return; } @@ -422,8 +415,8 @@ void StepperDIRK::describe( StepperImplicit::describe(out, verbLevel); out << "--- StepperDIRK ---\n"; - out << " tableau_ = " << tableau_ << std::endl; - if (tableau_ != Teuchos::null) tableau_->describe(out, verbLevel); + out << " tableau_ = " << this->tableau_ << std::endl; + if (this->tableau_ != Teuchos::null) this->tableau_->describe(out, verbLevel); #ifndef TEMPUS_HIDE_DEPRECATED_CODE out << " stepperObserver_ = " << stepperObserver_ << std::endl; #endif @@ -452,7 +445,7 @@ bool StepperDIRK::isValidSetup(Teuchos::FancyOStream & out) const if ( !Stepper::isValidSetup(out) ) isValidSetup = false; if ( !StepperImplicit::isValidSetup(out) ) isValidSetup = false; - if (tableau_ == Teuchos::null) { + if (this->tableau_ == Teuchos::null) { isValidSetup = false; out << "The tableau is not set!\n"; } diff --git a/packages/tempus/src/Tempus_StepperExplicitRK_decl.hpp b/packages/tempus/src/Tempus_StepperExplicitRK_decl.hpp index 58c5c832290d..2ea5c8685c7b 100644 --- a/packages/tempus/src/Tempus_StepperExplicitRK_decl.hpp +++ b/packages/tempus/src/Tempus_StepperExplicitRK_decl.hpp @@ -12,7 +12,6 @@ #include "Tempus_config.hpp" #include "Tempus_StepperRKBase.hpp" #include "Tempus_StepperExplicit.hpp" -#include "Tempus_RKButcherTableau.hpp" #ifndef TEMPUS_HIDE_DEPRECATED_CODE #include "Tempus_StepperRKObserverComposite.hpp" #endif @@ -59,21 +58,21 @@ namespace Tempus { * \renewcommand{\thealgorithm}{} * \caption{Explicit RK with the application-action locations indicated.} * \begin{algorithmic}[1] - * \State {\it appAction.execute(solutionHistory, stepper, BEGIN\_STEP)} * \State $X \leftarrow x_{n-1}$ \Comment Set initial guess to last timestep. + * \State {\it appAction.execute(solutionHistory, stepper, BEGIN\_STEP)} * \For {$i = 0 \ldots s-1$} - * \State {\it appAction.execute(solutionHistory, stepper, BEGIN\_STAGE)} - * \State {\it appAction.execute(solutionHistory, stepper, BEFORE\_SOLVE)} + * \State $X \leftarrow x_{n-1} + * + \Delta t\,\sum_{j=1}^{i-1} a_{ij}\,\dot{X}_j$ + * \State {\it appAction.execute(solutionHistory, stepper, BEGIN\_STAGE)} + * \State {\it appAction.execute(solutionHistory, stepper, BEFORE\_SOLVE)} + * \State {\it appAction.execute(solutionHistory, stepper, AFTER\_SOLVE)} + * \State {\it appAction.execute(solutionHistory, stepper, BEFORE\_EXPLICIT\_EVAL)} * \If { i==0 and useFSAL and (previous step not failed) } * \State tmp = $\dot{X}_0$ * \State $\dot{X}_0 = \dot{X}_s$ * \State $\dot{X}_s$ = tmp * \State {\bf continue} * \Else - * \State $X \leftarrow x_{n-1} - * + \Delta t\,\sum_{j=1}^{i-1} a_{ij}\,\dot{X}_j$ - * \State {\it appAction.execute(solutionHistory, stepper, AFTER\_SOLVE)} - * \State {\it appAction.execute(solutionHistory, stepper, BEFORE\_EXPLICIT\_EVAL)} * \State $\dot{X}_i \leftarrow \bar{f}(X_i,t_{n-1}+c_i\Delta t)$ * \EndIf * \State {\it appAction.execute(solutionHistory, stepper, END\_STAGE)} @@ -88,8 +87,8 @@ namespace Tempus { * the Bogacki-Shampine 3(2) method. * \f[ * \begin{array}{c|cccc} 0 & 0 & & & \\ - * 1/3 & 1/2 & 0 & & \\ - * 2/3 & 0 & 3/4 & 0 & \\ + * 1/2 & 1/2 & 0 & & \\ + * 3/4 & 0 & 3/4 & 0 & \\ * 1 & 2/9 & 1/3 & 4/9 & 0 \\ \hline * & 2/9 & 1/3 & 4/9 & 0 \\ * & 7/24 & 1/4 & 1/3 & 1/8 \end{array} @@ -111,9 +110,6 @@ class StepperExplicitRK : virtual public Tempus::StepperExplicit, virtual Teuchos::RCP > getObserver() const { return this->stepperObserver_; } #endif - virtual Teuchos::RCP > getTableau() - { return tableau_; } - /// Initialize during construction and after changing input parameters. virtual void initialize(); @@ -127,9 +123,6 @@ class StepperExplicitRK : virtual public Tempus::StepperExplicit, /// Get a default (initial) StepperState virtual Teuchos::RCP > getDefaultStepperState(); - virtual Scalar getOrder() const {return tableau_->order();} - virtual Scalar getOrderMin() const {return tableau_->orderMin();} - virtual Scalar getOrderMax() const {return tableau_->orderMax();} virtual Scalar getInitTimeStep( const Teuchos::RCP >& solutionHistory) const; @@ -191,8 +184,6 @@ class StepperExplicitRK : virtual public Tempus::StepperExplicit, virtual void setupTableau() = 0; - Teuchos::RCP > tableau_; - std::vector > > stageXDot_; #ifndef TEMPUS_HIDE_DEPRECATED_CODE diff --git a/packages/tempus/src/Tempus_StepperExplicitRK_impl.hpp b/packages/tempus/src/Tempus_StepperExplicitRK_impl.hpp index 74294b5d9660..01c847b6cf94 100644 --- a/packages/tempus/src/Tempus_StepperExplicitRK_impl.hpp +++ b/packages/tempus/src/Tempus_StepperExplicitRK_impl.hpp @@ -222,7 +222,7 @@ void StepperExplicitRK::setObserver( template void StepperExplicitRK::initialize() { - TEUCHOS_TEST_FOR_EXCEPTION( tableau_ == Teuchos::null, std::logic_error, + TEUCHOS_TEST_FOR_EXCEPTION( this->tableau_ == Teuchos::null, std::logic_error, "Error - Need to set the tableau, before calling " "StepperExplicitRK::initialize()\n"); @@ -231,14 +231,14 @@ void StepperExplicitRK::initialize() "StepperExplicitRK::initialize()\n"); // Initialize the stage vectors - int numStages = tableau_->numStages(); + int numStages = this->tableau_->numStages(); stageXDot_.resize(numStages); for (int i=0; iappModel_->get_f_space()); assign(stageXDot_[i].ptr(), Teuchos::ScalarTraits::zero()); } - if ( tableau_->isEmbedded() and this->getUseEmbedded() ){ + if ( this->tableau_->isEmbedded() and this->getUseEmbedded() ){ ee_ = Thyra::createMember(this->appModel_->get_f_space()); abs_u0 = Thyra::createMember(this->appModel_->get_f_space()); abs_u = Thyra::createMember(this->appModel_->get_f_space()); @@ -253,14 +253,7 @@ template void StepperExplicitRK::setInitialConditions( const Teuchos::RCP >& solutionHistory) { - using Teuchos::RCP; - - RCP > initialState = solutionHistory->getCurrentState(); - - // Check if we need Stepper storage for xDot - if (initialState->getXDot() == Teuchos::null) - this->setStepperXDot(stageXDot_.back()); - + this->setStepperXDot(stageXDot_.back()); StepperExplicit::setInitialConditions(solutionHistory); } @@ -283,29 +276,37 @@ void StepperExplicitRK::takeStep( "Try setting in \"Solution History\" \"Storage Type\" = \"Undo\"\n" " or \"Storage Type\" = \"Static\" and \"Storage Limit\" = \"2\"\n"); -#ifndef TEMPUS_HIDE_DEPRECATED_CODE - this->stepperObserver_->observeBeginTakeStep(solutionHistory, *this); -#endif - RCP > thisStepper = Teuchos::rcpFromRef(*this); - this->stepperRKAppAction_->execute(solutionHistory, thisStepper, - StepperRKAppAction::ACTION_LOCATION::BEGIN_STEP); - RCP > currentState=solutionHistory->getCurrentState(); RCP > workingState=solutionHistory->getWorkingState(); const Scalar dt = workingState->getTimeStep(); const Scalar time = currentState->getTime(); - const int numStages = tableau_->numStages(); - Teuchos::SerialDenseMatrix A = tableau_->A(); - Teuchos::SerialDenseVector b = tableau_->b(); - Teuchos::SerialDenseVector c = tableau_->c(); + const int numStages = this->tableau_->numStages(); + Teuchos::SerialDenseMatrix A = this->tableau_->A(); + Teuchos::SerialDenseVector b = this->tableau_->b(); + Teuchos::SerialDenseVector c = this->tableau_->c(); this->stageX_ = workingState->getX(); Thyra::assign(this->stageX_.ptr(), *(currentState->getX())); +#ifndef TEMPUS_HIDE_DEPRECATED_CODE + this->stepperObserver_->observeBeginTakeStep(solutionHistory, *this); +#endif + RCP > thisStepper = Teuchos::rcpFromRef(*this); + this->stepperRKAppAction_->execute(solutionHistory, thisStepper, + StepperRKAppAction::ACTION_LOCATION::BEGIN_STEP); + // Compute stage solutions for (int i=0; i < numStages; ++i) { this->setStageNumber(i); + Thyra::assign(this->stageX_.ptr(), *(currentState->getX())); + for (int j=0; j < i; ++j) { + if (A(i,j) != Teuchos::ScalarTraits::zero()) { + Thyra::Vp_StV(this->stageX_.ptr(), dt*A(i,j), *stageXDot_[j]); + } + } + this->setStepperXDot(stageXDot_[i]); + #ifndef TEMPUS_HIDE_DEPRECATED_CODE this->stepperObserver_->observeBeginStage(solutionHistory, *this); @@ -321,34 +322,28 @@ void StepperExplicitRK::takeStep( this->stepperRKAppAction_->execute(solutionHistory, thisStepper, StepperRKAppAction::ACTION_LOCATION::BEFORE_SOLVE); +#ifndef TEMPUS_HIDE_DEPRECATED_CODE + // ???: is it a good idea to leave this (no-op) here? + this->stepperObserver_->observeAfterSolve(solutionHistory, *this); + + this->stepperObserver_->observeBeforeExplicit(solutionHistory, *this); +#endif + this->stepperRKAppAction_->execute(solutionHistory, thisStepper, + StepperRKAppAction::ACTION_LOCATION::AFTER_SOLVE); + this->stepperRKAppAction_->execute(solutionHistory, thisStepper, + StepperRKAppAction::ACTION_LOCATION::BEFORE_EXPLICIT_EVAL); + if ( i == 0 && this->getUseFSAL() && workingState->getNConsecutiveFailures() == 0 ) { RCP > tmp = stageXDot_[0]; stageXDot_[0] = stageXDot_.back(); stageXDot_.back() = tmp; + this->setStepperXDot(stageXDot_[0]); } else { - Thyra::assign(this->stageX_.ptr(), *(currentState->getX())); - for (int j=0; j < i; ++j) { - if (A(i,j) != Teuchos::ScalarTraits::zero()) { - Thyra::Vp_StV(this->stageX_.ptr(), dt*A(i,j), *stageXDot_[j]); - } - } const Scalar ts = time + c(i)*dt; - -#ifndef TEMPUS_HIDE_DEPRECATED_CODE - // ???: is it a good idea to leave this (no-op) here? - this->stepperObserver_->observeAfterSolve(solutionHistory, *this); - - this->stepperObserver_->observeBeforeExplicit(solutionHistory, *this); -#endif - this->stepperRKAppAction_->execute(solutionHistory, thisStepper, - StepperRKAppAction::ACTION_LOCATION::AFTER_SOLVE); - this->stepperRKAppAction_->execute(solutionHistory, thisStepper, - StepperRKAppAction::ACTION_LOCATION::BEFORE_EXPLICIT_EVAL); - auto p = Teuchos::rcp(new ExplicitODEParameters(dt)); // Evaluate xDot = f(x,t). @@ -361,6 +356,8 @@ void StepperExplicitRK::takeStep( this->stepperRKAppAction_->execute(solutionHistory, thisStepper, StepperRKAppAction::ACTION_LOCATION::END_STAGE); } + // reset the stage number + this->setStageNumber(-1); // Sum for solution: x_n = x_n-1 + Sum{ b(i) * dt*f(i) } Thyra::assign((workingState->getX()).ptr(), *(currentState->getX())); @@ -376,7 +373,7 @@ void StepperExplicitRK::takeStep( // can change the step status workingState->setSolutionStatus(Status::PASSED); - if (tableau_->isEmbedded() and this->getUseEmbedded()) { + if (this->tableau_->isEmbedded() and this->getUseEmbedded()) { const Scalar tolRel = workingState->getTolRel(); const Scalar tolAbs = workingState->getTolAbs(); @@ -384,7 +381,7 @@ void StepperExplicitRK::takeStep( // just compute the error weight vector // (all that is needed is the error, and not the embedded solution) Teuchos::SerialDenseVector errWght = b ; - errWght -= tableau_->bstar(); + errWght -= this->tableau_->bstar(); //compute local truncation error estimate: | u^{n+1} - \hat{u}^{n+1} | // Sum for solution: ee_n = Sum{ (b(i) - bstar(i)) * dt*f(i) } @@ -420,8 +417,6 @@ void StepperExplicitRK::takeStep( this->stepperRKAppAction_->execute(solutionHistory, thisStepper, StepperRKAppAction::ACTION_LOCATION::END_STEP); } - // reset the stage number - this->setStageNumber(-1); return; } @@ -452,8 +447,8 @@ void StepperExplicitRK::describe( StepperExplicit::describe(out, verbLevel); out << "--- StepperExplicitRK ---\n"; - if (tableau_ != Teuchos::null) tableau_->describe(out, verbLevel); - out << " tableau_ = " << tableau_ << std::endl; + if (this->tableau_ != Teuchos::null) this->tableau_->describe(out, verbLevel); + out << " tableau_ = " << this->tableau_ << std::endl; #ifndef TEMPUS_HIDE_DEPRECATED_CODE out << " stepperObserver_ = " << stepperObserver_ << std::endl; #endif @@ -481,7 +476,7 @@ bool StepperExplicitRK::isValidSetup(Teuchos::FancyOStream & out) const if ( !Stepper::isValidSetup(out) ) isValidSetup = false; if ( !StepperExplicit::isValidSetup(out) ) isValidSetup = false; - if (tableau_ == Teuchos::null) { + if (this->tableau_ == Teuchos::null) { isValidSetup = false; out << "The tableau is not set!\n"; } diff --git a/packages/tempus/src/Tempus_StepperExplicit_impl.hpp b/packages/tempus/src/Tempus_StepperExplicit_impl.hpp index c9429b34080e..57701ed57516 100644 --- a/packages/tempus/src/Tempus_StepperExplicit_impl.hpp +++ b/packages/tempus/src/Tempus_StepperExplicit_impl.hpp @@ -45,16 +45,18 @@ void StepperExplicit::setInitialConditions( } RCP > initialState = solutionHistory->getCurrentState(); - RCP > x = initialState->getX(); + RCP > x = initialState->getX(); + RCP > xDot = initialState->getXDot(); + if (xDot == Teuchos::null) xDot = this->getStepperXDot(); + inArgs_ = appModel_->getNominalValues(); if (this->getOrderODE() == SECOND_ORDER_ODE) { - RCP > xDot = initialState->getXDot(); - + RCP > initialXDot = initialState->getXDot(); // If initialState has x and xDot set, treat them as the initial conditions. // Otherwise use the x and xDot from getNominalValues() as the ICs. TEUCHOS_TEST_FOR_EXCEPTION( - !((x != Teuchos::null && xDot != Teuchos::null) || + !((x != Teuchos::null && initialXDot != Teuchos::null) || (inArgs_.get_x() != Teuchos::null && inArgs_.get_x_dot() != Teuchos::null)), std::logic_error, "Error - We need to set the initial conditions for x and xDot from\n" @@ -76,7 +78,7 @@ void StepperExplicit::setInitialConditions( } else if (this->getOrderODE() == SECOND_ORDER_ODE) { using Teuchos::rcp_const_cast; - // Use the x and xDot from getNominalValues() as the ICs. + // Use the x and x_dot from getNominalValues() as the ICs. if ( initialState->getX() == Teuchos::null || initialState->getXDot() == Teuchos::null ) { TEUCHOS_TEST_FOR_EXCEPTION( (inArgs_.get_x() == Teuchos::null) || @@ -85,9 +87,9 @@ void StepperExplicit::setInitialConditions( " or getNominalValues()!\n"); x = rcp_const_cast >(inArgs_.get_x()); initialState->setX(x); - RCP > xDot + RCP > x_dot = rcp_const_cast >(inArgs_.get_x_dot()); - initialState->setXDot(xDot); + initialState->setXDot(x_dot); } } @@ -102,8 +104,7 @@ void StepperExplicit::setInitialConditions( << " initialState does not have an xDot.\n" << " Setting a 'Consistent' xDot!\n" << std::endl; auto p = Teuchos::rcp(new ExplicitODEParameters(0.0)); - evaluateExplicitODE(this->getStepperXDot(initialState), x, - initialState->getTime(), p); + evaluateExplicitODE(xDot, x, initialState->getTime(), p); initialState->setIsSynced(true); } } @@ -124,18 +125,18 @@ void StepperExplicit::setInitialConditions( } else if (icConsistency == "Zero") { if (this->getOrderODE() == FIRST_ORDER_ODE) - Thyra::assign(this->getStepperXDot(initialState).ptr(), Scalar(0.0)); + Thyra::assign(xDot.ptr(), Scalar(0.0)); else if (this->getOrderODE() == SECOND_ORDER_ODE) Thyra::assign(this->getStepperXDotDot(initialState).ptr(), Scalar(0.0)); } else if (icConsistency == "App") { if (this->getOrderODE() == FIRST_ORDER_ODE) { - auto xDot = Teuchos::rcp_const_cast >( + auto x_dot = Teuchos::rcp_const_cast >( inArgs_.get_x_dot()); TEUCHOS_TEST_FOR_EXCEPTION(xDot == Teuchos::null, std::logic_error, "Error - setInitialConditions() requested 'App' for IC consistency,\n" " but 'App' returned a null pointer for xDot!\n"); - Thyra::assign(this->getStepperXDot(initialState).ptr(), *xDot); + Thyra::assign(xDot.ptr(), *x_dot); } else if (this->getOrderODE() == SECOND_ORDER_ODE) { auto xDotDot = Teuchos::rcp_const_cast >( @@ -150,8 +151,7 @@ void StepperExplicit::setInitialConditions( if (this->getOrderODE() == FIRST_ORDER_ODE) { // Evaluate xDot = f(x,t). auto p = Teuchos::rcp(new ExplicitODEParameters(0.0)); - evaluateExplicitODE(this->getStepperXDot(initialState), x, - initialState->getTime(), p); + evaluateExplicitODE(xDot, x, initialState->getTime(), p); } else if (this->getOrderODE() == SECOND_ORDER_ODE) { // Evaluate xDotDot = f(x,xDot,t). @@ -174,7 +174,6 @@ void StepperExplicit::setInitialConditions( // Test for consistency. if (this->getICConsistencyCheck()) { if (this->getOrderODE() == FIRST_ORDER_ODE) { - auto xDot = this->getStepperXDot(initialState); auto f = initialState->getX()->clone_v(); auto p = Teuchos::rcp(new ExplicitODEParameters(0.0)); evaluateExplicitODE(f, x, initialState->getTime(), p); diff --git a/packages/tempus/src/Tempus_StepperForwardEulerAppAction.hpp b/packages/tempus/src/Tempus_StepperForwardEulerAppAction.hpp index 4d7d2b2e57db..6ff7fa2ef8ea 100644 --- a/packages/tempus/src/Tempus_StepperForwardEulerAppAction.hpp +++ b/packages/tempus/src/Tempus_StepperForwardEulerAppAction.hpp @@ -11,7 +11,6 @@ #include "Tempus_config.hpp" #include "Tempus_SolutionHistory.hpp" -#include "Tempus_StepperForwardEuler.hpp" namespace Tempus { diff --git a/packages/tempus/src/Tempus_StepperForwardEulerModifierDefault.hpp b/packages/tempus/src/Tempus_StepperForwardEulerModifierDefault.hpp index 0d63ec0b017f..6ef8f226b21d 100644 --- a/packages/tempus/src/Tempus_StepperForwardEulerModifierDefault.hpp +++ b/packages/tempus/src/Tempus_StepperForwardEulerModifierDefault.hpp @@ -10,9 +10,12 @@ #define Tempus_StepperForwardEulerModifierDefault_hpp #include "Tempus_config.hpp" -#include "Tempus_SolutionHistory.hpp" #include "Tempus_StepperForwardEulerModifierBase.hpp" +// Applications can uncomment this include in their implementation, +// if they need access to the stepper methods. +//#include "Tempus_StepperForwardEuler.hpp" + namespace Tempus { @@ -20,6 +23,9 @@ namespace Tempus { * * The default modifier provides no-op functionality for the modifier. * See StepperForwardEulerModifierBase for details on the algorithm. + * + * Applications can copy this implementation, rename, implement their + * action, and set on the stepper to get app-specific functionality. */ template class StepperForwardEulerModifierDefault diff --git a/packages/tempus/src/Tempus_StepperForwardEulerModifierXBase.hpp b/packages/tempus/src/Tempus_StepperForwardEulerModifierXBase.hpp index 116ebec09abe..32a3ef1242af 100644 --- a/packages/tempus/src/Tempus_StepperForwardEulerModifierXBase.hpp +++ b/packages/tempus/src/Tempus_StepperForwardEulerModifierXBase.hpp @@ -93,7 +93,10 @@ class StepperForwardEulerModifierXBase case StepperForwardEulerAppAction::END_STEP: { modType = XDOT_END_STEP; - x = stepper->getStepperXDot(workingState); + if (workingState->getXDot() != Teuchos::null) + x = workingState->getXDot(); + else + x = stepper->getStepperXDot(); break; } default: diff --git a/packages/tempus/src/Tempus_StepperForwardEulerModifierXDefault.hpp b/packages/tempus/src/Tempus_StepperForwardEulerModifierXDefault.hpp index 20d14ddd42d5..0474652a6c78 100644 --- a/packages/tempus/src/Tempus_StepperForwardEulerModifierXDefault.hpp +++ b/packages/tempus/src/Tempus_StepperForwardEulerModifierXDefault.hpp @@ -10,7 +10,6 @@ #define Tempus_StepperForwardEulerModifierX_hpp #include "Tempus_config.hpp" -#include "Tempus_SolutionHistory.hpp" #include "Tempus_StepperForwardEulerModifierXBase.hpp" @@ -20,6 +19,9 @@ namespace Tempus { * * The default provides no-op functionality for ModifierX. * See StepperForwardEulerModifierXBase for details on the algorithm. + * + * Applications can copy this implementation, rename, implement their + * action, and set on the stepper to get app-specific functionality. */ template class StepperForwardEulerModifierXDefault diff --git a/packages/tempus/src/Tempus_StepperForwardEulerObserverDefault.hpp b/packages/tempus/src/Tempus_StepperForwardEulerObserverDefault.hpp index 952ab253837e..3a3fa7aae61f 100644 --- a/packages/tempus/src/Tempus_StepperForwardEulerObserverDefault.hpp +++ b/packages/tempus/src/Tempus_StepperForwardEulerObserverDefault.hpp @@ -10,9 +10,12 @@ #define Tempus_StepperForwardEulerObserverDefault_hpp #include "Tempus_config.hpp" -#include "Tempus_SolutionHistory.hpp" #include "Tempus_StepperForwardEulerObserverBase.hpp" +// Applications can uncomment this include in their implementation, +// if they need access to the stepper methods. +//#include "Tempus_StepperForwardEuler.hpp" + namespace Tempus { @@ -20,6 +23,9 @@ namespace Tempus { * * The default observer provides no-op functionality for the observer. * See StepperForwardEulerObserverBase for details on the algorithm. + * + * Applications can copy this implementation, rename, implement their + * action, and set on the stepper to get app-specific functionality. */ template class StepperForwardEulerObserverDefault diff --git a/packages/tempus/src/Tempus_StepperForwardEuler_decl.hpp b/packages/tempus/src/Tempus_StepperForwardEuler_decl.hpp index 1eda05bb68b8..8a0aeb13a55d 100644 --- a/packages/tempus/src/Tempus_StepperForwardEuler_decl.hpp +++ b/packages/tempus/src/Tempus_StepperForwardEuler_decl.hpp @@ -42,7 +42,7 @@ namespace Tempus { * Note that \f$x_n\f$ and \f$\dot{x}_{n-1}\f$ are not at the same time * level at the end of the time step (i.e., they are not sync'ed). * - * To have them at the same time level, we can use the First-Step-As-Last + * To have them at the same time level, we can use the First-Same-As-Last * (FSAL) principle where the function evaulation from the last time step * can be used as the first function evalulation of the current step. * For the Forward Euler, the FSAL algorithm is @@ -72,7 +72,7 @@ class StepperForwardEuler : virtual public Tempus::StepperExplicit std::string ICConsistency, bool ICConsistencyCheck); #endif - + /// Constructor StepperForwardEuler( const Teuchos::RCP >& appModel, diff --git a/packages/tempus/src/Tempus_StepperForwardEuler_impl.hpp b/packages/tempus/src/Tempus_StepperForwardEuler_impl.hpp index 562135252472..38d2c7f7e709 100644 --- a/packages/tempus/src/Tempus_StepperForwardEuler_impl.hpp +++ b/packages/tempus/src/Tempus_StepperForwardEuler_impl.hpp @@ -101,10 +101,10 @@ void StepperForwardEuler::setAppAction( Teuchos::RCP > appAction) { if (appAction == Teuchos::null) { - // Create default appAction + // Create default appAction stepperFEAppAction_ = Teuchos::rcp(new StepperForwardEulerModifierDefault()); - } + } else { stepperFEAppAction_ = appAction; } @@ -122,6 +122,8 @@ void StepperForwardEuler::setInitialConditions( // Check if we need Stepper storage for xDot if (initialState->getXDot() == Teuchos::null) this->setStepperXDot(initialState->getX()->clone_v()); + else + this->setStepperXDot(initialState->getXDot()); StepperExplicit::setInitialConditions(solutionHistory); } @@ -152,7 +154,9 @@ void StepperForwardEuler::takeStep( RCP > currentState=solutionHistory->getCurrentState(); RCP > workingState=solutionHistory->getWorkingState(); - RCP > xDot = this->getStepperXDot(currentState); + if (currentState->getXDot() != Teuchos::null) + this->setStepperXDot(currentState->getXDot()); + RCP > xDot = this->getStepperXDot(); const Scalar dt = workingState->getTimeStep(); if ( !(this->getUseFSAL()) ) { @@ -181,7 +185,9 @@ void StepperForwardEuler::takeStep( *(currentState->getX()),dt,*(xDot)); - xDot = this->getStepperXDot(workingState); + if (workingState->getXDot() != Teuchos::null) + this->setStepperXDot(workingState->getXDot()); + xDot = this->getStepperXDot(); if (this->getUseFSAL()) { // Get consistent xDot^n. @@ -191,7 +197,7 @@ void StepperForwardEuler::takeStep( #endif stepperFEAppAction_->execute(solutionHistory, thisStepper, StepperForwardEulerAppAction::ACTION_LOCATION::BEFORE_EXPLICIT_EVAL); - + auto p = Teuchos::rcp(new ExplicitODEParameters(dt)); // Evaluate xDot = f(x,t). diff --git a/packages/tempus/src/Tempus_StepperHHTAlpha_decl.hpp b/packages/tempus/src/Tempus_StepperHHTAlpha_decl.hpp index a74b14ba2467..ae81a60b964f 100644 --- a/packages/tempus/src/Tempus_StepperHHTAlpha_decl.hpp +++ b/packages/tempus/src/Tempus_StepperHHTAlpha_decl.hpp @@ -37,7 +37,7 @@ namespace Tempus { * the Newmark Beta stepper, the linear solve for the explicit version of * this scheme has not been optimized (the mass matrix is not lumped). * - * The First-Step-As-Last (FSAL) principle is not used with the + * The First-Same-As-Last (FSAL) principle is not used with the * HHT-Alpha method. */ template diff --git a/packages/tempus/src/Tempus_StepperIMEX_RK_Partition_decl.hpp b/packages/tempus/src/Tempus_StepperIMEX_RK_Partition_decl.hpp index 8a9b1c2e8c44..50569920408a 100644 --- a/packages/tempus/src/Tempus_StepperIMEX_RK_Partition_decl.hpp +++ b/packages/tempus/src/Tempus_StepperIMEX_RK_Partition_decl.hpp @@ -220,8 +220,8 @@ namespace Tempus { * \renewcommand{\thealgorithm}{} * \caption{IMEX RK with the application-action locations indicated.} * \begin{algorithmic}[1] - * \State {\it appAction.execute(solutionHistory, stepper, BEGIN\_STEP)} * \State $Z \leftarrow z_{n-1}$ (Recall $Z_i = \{Y_i,X_i\}^T$) + * \State {\it appAction.execute(solutionHistory, stepper, BEGIN\_STEP)} * \Comment Set initial guess to last timestep. * \For {$i = 0 \ldots s-1$} * \State $Y_i = y_{n-1} -\Delta t \sum_{j=1}^{i-1} \hat{a}_{ij}\;f^y_j$ @@ -263,7 +263,7 @@ namespace Tempus { * * The following table contains the pre-coded IMEX-RK tableaus. * - * + * *
Partitioned IMEX-RK TableausPartitioned IMEX-RK Tableaus
Name Order Implicit Tableau Explicit Tableau *
Partitioned IMEX RK 1st order 1st * \f[ \begin{array}{c|cc} @@ -302,7 +302,7 @@ namespace Tempus { * \end{array} \f] *
* - * The First-Step-As-Last (FSAL) principle is not valid for IMEX RK Partition. + * The First-Same-As-Last (FSAL) principle is not valid for IMEX RK Partition. * The default is to set useFSAL=false, and useFSAL=true will result * in an error. * @@ -356,15 +356,27 @@ class StepperIMEX_RK_Partition : virtual public Tempus::StepperImplicit, /// \name Basic stepper methods //@{ + /// Returns the explicit tableau! + virtual Teuchos::RCP > getTableau() const + { return getExplicitTableau(); } + /// Set both the explicit and implicit tableau from ParameterList virtual void setTableaus(std::string stepperType = "", Teuchos::RCP > explicitTableau = Teuchos::null, Teuchos::RCP > implicitTableau = Teuchos::null); + /// Return explicit tableau. + virtual Teuchos::RCP > getExplicitTableau() const + { return explicitTableau_; } + /// Set the explicit tableau from tableau virtual void setExplicitTableau( Teuchos::RCP > explicitTableau); + /// Return implicit tableau. + virtual Teuchos::RCP > getImplicitTableau() const + { return implicitTableau_; } + /// Set the implicit tableau from tableau virtual void setImplicitTableau( Teuchos::RCP > implicitTableau); @@ -417,7 +429,10 @@ class StepperIMEX_RK_Partition : virtual public Tempus::StepperImplicit, virtual OrderODE getOrderODE() const {return FIRST_ORDER_ODE;} //@} - Teuchos::RCP >& getStageZ() {return stageZ_;}; + /// Return the full stage solution which is Z (the concat of X and Y) for IMEX Partition. + Teuchos::RCP > getStageX() {return stageZ_;} + /// Explicitly return the full stage solution, Z. + Teuchos::RCP > getStageZ() {return stageZ_;}; std::vector > >& getStageF() {return stageF_;}; std::vector > >& getStageGx() {return stageGx_;}; Teuchos::RCP >& getXTilde() {return xTilde_;}; diff --git a/packages/tempus/src/Tempus_StepperIMEX_RK_Partition_impl.hpp b/packages/tempus/src/Tempus_StepperIMEX_RK_Partition_impl.hpp index 91abba4094b8..71083a70efd7 100644 --- a/packages/tempus/src/Tempus_StepperIMEX_RK_Partition_impl.hpp +++ b/packages/tempus/src/Tempus_StepperIMEX_RK_Partition_impl.hpp @@ -150,6 +150,8 @@ void StepperIMEX_RK_Partition::setTableaus( auto expTableau = Teuchos::rcp(new RKButcherTableau( "Explicit Tableau - Partitioned IMEX RK 1st order", A,b,c,order,order,order)); + expTableau->setTVD(true); + expTableau->setTVDCoeff(2.0); this->setExplicitTableau(expTableau); } @@ -157,6 +159,7 @@ void StepperIMEX_RK_Partition::setTableaus( // Implicit Tableau typedef Teuchos::ScalarTraits ST; int NumStages = 2; + const Scalar sspcoef = std::numeric_limits::max(); Teuchos::SerialDenseMatrix A(NumStages,NumStages); Teuchos::SerialDenseVector b(NumStages); Teuchos::SerialDenseVector c(NumStages); @@ -178,6 +181,8 @@ void StepperIMEX_RK_Partition::setTableaus( auto impTableau = Teuchos::rcp(new RKButcherTableau( "Implicit Tableau - Partitioned IMEX RK 1st order", A,b,c,order,order,order)); + impTableau->setTVD(true); + impTableau->setTVDCoeff(sspcoef); this->setImplicitTableau(impTableau); } @@ -490,7 +495,7 @@ void StepperIMEX_RK_Partition::setInitialConditions( " But only 'None' is available for IMEX-RK!\n"); TEUCHOS_TEST_FOR_EXCEPTION( this->getUseFSAL(), std::logic_error, - "Error - The First-Step-As-Last (FSAL) principle is not " + "Error - The First-Same-As-Last (FSAL) principle is not " << "available for IMEX-RK. Set useFSAL=false.\n"); } @@ -586,13 +591,6 @@ void StepperIMEX_RK_Partition::takeStep( "Try setting in \"Solution History\" \"Storage Type\" = \"Undo\"\n" " or \"Storage Type\" = \"Static\" and \"Storage Limit\" = \"2\"\n"); -#ifndef TEMPUS_HIDE_DEPRECATED_CODE - this->stepperObserver_->observeBeginTakeStep(solutionHistory, *this); -#endif - RCP > thisStepper = Teuchos::rcpFromRef(*this); - this->stepperRKAppAction_->execute(solutionHistory, thisStepper, - StepperRKAppAction::ACTION_LOCATION::BEGIN_STEP); - RCP > currentState=solutionHistory->getCurrentState(); RCP > workingState=solutionHistory->getWorkingState(); const Scalar dt = workingState->getTimeStep(); @@ -620,12 +618,16 @@ void StepperIMEX_RK_Partition::takeStep( RCP > stageX = wrapperModelPairIMEX->getIMEXVector(stageZ_); +#ifndef TEMPUS_HIDE_DEPRECATED_CODE + this->stepperObserver_->observeBeginTakeStep(solutionHistory, *this); +#endif + RCP > thisStepper = Teuchos::rcpFromRef(*this); + this->stepperRKAppAction_->execute(solutionHistory, thisStepper, + StepperRKAppAction::ACTION_LOCATION::BEGIN_STEP); + // Compute stage solutions for (int i = 0; i < numStages; ++i) { this->setStageNumber(i); -#ifndef TEMPUS_HIDE_DEPRECATED_CODE - this->stepperObserver_->observeBeginStage(solutionHistory, *this); -#endif Thyra::assign(stageY.ptr(), *(wrapperModelPairIMEX->getExplicitOnlyVector(currentState->getX()))); @@ -644,6 +646,9 @@ void StepperIMEX_RK_Partition::takeStep( Thyra::Vp_StV(xTilde_.ptr(), -dt*A (i,j), *(stageGx_[j])); } +#ifndef TEMPUS_HIDE_DEPRECATED_CODE + this->stepperObserver_->observeBeginStage(solutionHistory, *this); +#endif this->stepperRKAppAction_->execute(solutionHistory, thisStepper, StepperRKAppAction::ACTION_LOCATION::BEGIN_STAGE); diff --git a/packages/tempus/src/Tempus_StepperIMEX_RK_decl.hpp b/packages/tempus/src/Tempus_StepperIMEX_RK_decl.hpp index 2ac4c7c64200..38aeee26d136 100644 --- a/packages/tempus/src/Tempus_StepperIMEX_RK_decl.hpp +++ b/packages/tempus/src/Tempus_StepperIMEX_RK_decl.hpp @@ -156,8 +156,8 @@ namespace Tempus { * \renewcommand{\thealgorithm}{} * \caption{IMEX RK with the application-action locations indicated.} * \begin{algorithmic}[1] - * \State {\it appAction.execute(solutionHistory, stepper, BEGIN\_STEP)} * \State $X \leftarrow x_{n-1}$ \Comment Set initial guess to last timestep. + * \State {\it appAction.execute(solutionHistory, stepper, BEGIN\_STEP)} * \For {$i = 0 \ldots s-1$} * \State $\tilde{X} \leftarrow x_{n-1} - \Delta t\,\sum_{j=1}^{i-1} \left( * \hat{a}_{ij}\, f_j + a_{ij}\, g_j \right)$ @@ -266,7 +266,7 @@ namespace Tempus { * \end{array} \f] * * - * The First-Step-As-Last (FSAL) principle is not valid for IMEX RK. + * The First-Same-As-Last (FSAL) principle is not valid for IMEX RK. * The default is to set useFSAL=false, and useFSAL=true will result * in an error. * @@ -326,15 +326,27 @@ class StepperIMEX_RK : virtual public Tempus::StepperImplicit, /// \name Basic stepper methods //@{ + /// Returns the explicit tableau! + virtual Teuchos::RCP > getTableau() const + { return getExplicitTableau(); } + /// Set both the explicit and implicit tableau from ParameterList virtual void setTableaus( std::string stepperType = "", Teuchos::RCP > explicitTableau = Teuchos::null, Teuchos::RCP > implicitTableau = Teuchos::null); + /// Return explicit tableau. + virtual Teuchos::RCP > getExplicitTableau() const + { return explicitTableau_; } + /// Set the explicit tableau from tableau virtual void setExplicitTableau( Teuchos::RCP > explicitTableau); + /// Return implicit tableau. + virtual Teuchos::RCP > getImplicitTableau() const + { return implicitTableau_; } + /// Set the implicit tableau from tableau virtual void setImplicitTableau( Teuchos::RCP > implicitTableau); diff --git a/packages/tempus/src/Tempus_StepperIMEX_RK_impl.hpp b/packages/tempus/src/Tempus_StepperIMEX_RK_impl.hpp index cd3a4d0c58ec..caa31b8a6774 100644 --- a/packages/tempus/src/Tempus_StepperIMEX_RK_impl.hpp +++ b/packages/tempus/src/Tempus_StepperIMEX_RK_impl.hpp @@ -150,6 +150,8 @@ void StepperIMEX_RK::setTableaus(std::string stepperType, auto expTableau = Teuchos::rcp(new RKButcherTableau( "Explicit Tableau - IMEX RK 1st order", A,b,c,order,order,order)); + expTableau->setTVD(true); + expTableau->setTVDCoeff(2.0); this->setExplicitTableau(expTableau); } @@ -157,6 +159,7 @@ void StepperIMEX_RK::setTableaus(std::string stepperType, // Implicit Tableau typedef Teuchos::ScalarTraits ST; int NumStages = 2; + const Scalar sspcoef = std::numeric_limits::max(); Teuchos::SerialDenseMatrix A(NumStages,NumStages); Teuchos::SerialDenseVector b(NumStages); Teuchos::SerialDenseVector c(NumStages); @@ -178,6 +181,8 @@ void StepperIMEX_RK::setTableaus(std::string stepperType, auto impTableau = Teuchos::rcp(new RKButcherTableau( "Implicit Tableau - IMEX RK 1st order", A,b,c,order,order,order)); + impTableau->setTVD(true); + impTableau->setTVDCoeff(sspcoef); this->setImplicitTableau(impTableau); } @@ -206,10 +211,10 @@ void StepperIMEX_RK::setTableaus(std::string stepperType, // Fill c: c(0) = zero; - auto expTableau = Teuchos::rcp(new RKButcherTableau( - "Explicit Tableau - SSP1_111", - A,b,c,order,order,order)); + "Explicit Tableau - SSP1_111",A,b,c,order,order,order)); + expTableau->setTVD(true); + expTableau->setTVDCoeff(1.0); this->setExplicitTableau(expTableau); } @@ -218,6 +223,7 @@ void StepperIMEX_RK::setTableaus(std::string stepperType, typedef Teuchos::ScalarTraits ST; const int NumStages = 1; const int order = 1; + const Scalar sspcoef = std::numeric_limits::max(); Teuchos::SerialDenseMatrix A(NumStages,NumStages); Teuchos::SerialDenseVector b(NumStages); Teuchos::SerialDenseVector c(NumStages); @@ -235,6 +241,8 @@ void StepperIMEX_RK::setTableaus(std::string stepperType, auto impTableau = Teuchos::rcp(new RKButcherTableau( "Implicit Tableau - SSP1_111", A,b,c,order,order,order)); + impTableau->setTVD(true); + impTableau->setTVDCoeff(sspcoef); this->setImplicitTableau(impTableau); } @@ -574,7 +582,7 @@ void StepperIMEX_RK::setInitialConditions( " But only 'None' is available for IMEX-RK!\n"); TEUCHOS_TEST_FOR_EXCEPTION( this->getUseFSAL(), std::logic_error, - "Error - The First-Step-As-Last (FSAL) principle is not " + "Error - The First-Same-As-Last (FSAL) principle is not " << "available for IMEX-RK. Set useFSAL=false.\n"); } @@ -666,13 +674,6 @@ void StepperIMEX_RK::takeStep( "Try setting in \"Solution History\" \"Storage Type\" = \"Undo\"\n" " or \"Storage Type\" = \"Static\" and \"Storage Limit\" = \"2\"\n"); -#ifndef TEMPUS_HIDE_DEPRECATED_CODE - this->stepperObserver_->observeBeginTakeStep(solutionHistory, *this); -#endif - RCP > thisStepper = Teuchos::rcpFromRef(*this); - this->stepperRKAppAction_->execute(solutionHistory, thisStepper, - StepperRKAppAction::ACTION_LOCATION::BEGIN_STEP); - RCP > currentState=solutionHistory->getCurrentState(); RCP > workingState=solutionHistory->getWorkingState(); const Scalar dt = workingState->getTimeStep(); @@ -690,12 +691,16 @@ void StepperIMEX_RK::takeStep( this->stageX_ = workingState->getX(); Thyra::assign(this->stageX_.ptr(), *(currentState->getX())); +#ifndef TEMPUS_HIDE_DEPRECATED_CODE + this->stepperObserver_->observeBeginTakeStep(solutionHistory, *this); +#endif + RCP > thisStepper = Teuchos::rcpFromRef(*this); + this->stepperRKAppAction_->execute(solutionHistory, thisStepper, + StepperRKAppAction::ACTION_LOCATION::BEGIN_STEP); + // Compute stage solutions for (int i = 0; i < numStages; ++i) { this->setStageNumber(i); -#ifndef TEMPUS_HIDE_DEPRECATED_CODE - this->stepperObserver_->observeBeginStage(solutionHistory, *this); -#endif Thyra::assign(xTilde_.ptr(), *(currentState->getX())); for (int j = 0; j < i; ++j) { if (AHat(i,j) != Teuchos::ScalarTraits::zero()) @@ -704,6 +709,9 @@ void StepperIMEX_RK::takeStep( Thyra::Vp_StV(xTilde_.ptr(), -dt*A (i,j), *(stageG_[j])); } +#ifndef TEMPUS_HIDE_DEPRECATED_CODE + this->stepperObserver_->observeBeginStage(solutionHistory, *this); +#endif this->stepperRKAppAction_->execute(solutionHistory, thisStepper, StepperRKAppAction::ACTION_LOCATION::BEGIN_STAGE); diff --git a/packages/tempus/src/Tempus_StepperImplicit_impl.hpp b/packages/tempus/src/Tempus_StepperImplicit_impl.hpp index 30b32431ff63..c3b1718fa070 100644 --- a/packages/tempus/src/Tempus_StepperImplicit_impl.hpp +++ b/packages/tempus/src/Tempus_StepperImplicit_impl.hpp @@ -45,16 +45,18 @@ void StepperImplicit::setInitialConditions( " to set the initial condition. Number of States = " << numStates); RCP > initialState = solutionHistory->getCurrentState(); - RCP > x = initialState->getX(); + RCP > x = initialState->getX(); + RCP > xDot = initialState->getXDot(); + if (xDot() == Teuchos::null) xDot = this->getStepperXDot(); + auto inArgs = this->wrapperModel_->getNominalValues(); if (this->getOrderODE() == SECOND_ORDER_ODE) { - RCP > xDot = initialState->getXDot(); - + RCP > initialXDot = initialState->getXDot(); // If initialState has x and xDot set, treat them as the initial conditions. // Otherwise use the x and xDot from getNominalValues() as the ICs. TEUCHOS_TEST_FOR_EXCEPTION( - !((x != Teuchos::null && xDot != Teuchos::null) || + !((x != Teuchos::null && initialXDot != Teuchos::null) || (inArgs.get_x() != Teuchos::null && inArgs.get_x_dot() != Teuchos::null)), std::logic_error, "Error - We need to set the initial conditions for x and xDot from\n" @@ -77,7 +79,6 @@ void StepperImplicit::setInitialConditions( else if (this->getOrderODE() == SECOND_ORDER_ODE) { // Use the x and xDot from getNominalValues() as the ICs. using Teuchos::rcp_const_cast; - RCP > xDot = initialState->getXDot(); if ( x == Teuchos::null || xDot == Teuchos::null ) { TEUCHOS_TEST_FOR_EXCEPTION( (inArgs.get_x() == Teuchos::null) || (inArgs.get_x_dot() == Teuchos::null), std::logic_error, @@ -85,8 +86,9 @@ void StepperImplicit::setInitialConditions( " or getNominalValues()!\n"); x = rcp_const_cast >(inArgs.get_x()); initialState->setX(x); - xDot = rcp_const_cast >(inArgs.get_x_dot()); - initialState->setXDot(xDot); + RCP > x_dot = + rcp_const_cast >(inArgs.get_x_dot()); + initialState->setXDot(x_dot); } } @@ -96,7 +98,7 @@ void StepperImplicit::setInitialConditions( if (icConsistency == "None") { if (this->getOrderODE() == FIRST_ORDER_ODE) { if (initialState->getXDot() == Teuchos::null) - Thyra::assign(this->getStepperXDot(initialState).ptr(), Scalar(0.0)); + Thyra::assign(xDot.ptr(), Scalar(0.0)); } else if (this->getOrderODE() == SECOND_ORDER_ODE) { if (initialState->getXDotDot() == Teuchos::null) @@ -105,18 +107,18 @@ void StepperImplicit::setInitialConditions( } else if (icConsistency == "Zero") { if (this->getOrderODE() == FIRST_ORDER_ODE) - Thyra::assign(this->getStepperXDot(initialState).ptr(), Scalar(0.0)); + Thyra::assign(xDot.ptr(), Scalar(0.0)); else if (this->getOrderODE() == SECOND_ORDER_ODE) Thyra::assign(this->getStepperXDotDot(initialState).ptr(), Scalar(0.0)); } else if (icConsistency == "App") { if (this->getOrderODE() == FIRST_ORDER_ODE) { - auto xDot = Teuchos::rcp_const_cast >( + auto x_dot = Teuchos::rcp_const_cast >( inArgs.get_x_dot()); - TEUCHOS_TEST_FOR_EXCEPTION(xDot == Teuchos::null, std::logic_error, + TEUCHOS_TEST_FOR_EXCEPTION(x_dot == Teuchos::null, std::logic_error, "Error - setInitialConditions() requested 'App' for IC consistency,\n" " but 'App' returned a null pointer for xDot!\n"); - Thyra::assign(this->getStepperXDot(initialState).ptr(), *xDot); + Thyra::assign(xDot.ptr(), *x_dot); } else if (this->getOrderODE() == SECOND_ORDER_ODE) { auto xDotDot = Teuchos::rcp_const_cast >( @@ -138,7 +140,6 @@ void StepperImplicit::setInitialConditions( auto p = Teuchos::rcp(new ImplicitODEParameters( timeDer, dt, alpha, beta, SOLVE_FOR_XDOT_CONST_X)); - auto xDot = this->getStepperXDot(initialState); const Thyra::SolveStatus sStatus = this->solveImplicitODE(x, xDot, time, p); @@ -167,7 +168,6 @@ void StepperImplicit::setInitialConditions( // Test for consistency. if (this->getICConsistencyCheck()) { auto f = initialState->getX()->clone_v(); - auto xDot = this->getStepperXDot(initialState); const Scalar time = initialState->getTime(); const Scalar dt = initialState->getTimeStep(); diff --git a/packages/tempus/src/Tempus_StepperLeapfrog_decl.hpp b/packages/tempus/src/Tempus_StepperLeapfrog_decl.hpp index dd8902cff1bd..c2c460826498 100644 --- a/packages/tempus/src/Tempus_StepperLeapfrog_decl.hpp +++ b/packages/tempus/src/Tempus_StepperLeapfrog_decl.hpp @@ -68,7 +68,7 @@ namespace Tempus { * - \f$ \dot{x}_{n+3/2} \leftarrow * \dot{x}_{n+1/2} + \Delta t\, \ddot{x}_{n+1} \f$ * - * The First-Step-As-Last (FSAL) principle is not used with Leapfrog + * The First-Same-As-Last (FSAL) principle is not used with Leapfrog * because of the algorithm's prescribed order of solution update. * The default is to set useFSAL=false, however useFSAL=true will also * work (i.e., no-op), but issue a warning that it will have no affect. diff --git a/packages/tempus/src/Tempus_StepperLeapfrog_impl.hpp b/packages/tempus/src/Tempus_StepperLeapfrog_impl.hpp index c0169d72a61c..346073de3f49 100644 --- a/packages/tempus/src/Tempus_StepperLeapfrog_impl.hpp +++ b/packages/tempus/src/Tempus_StepperLeapfrog_impl.hpp @@ -85,13 +85,15 @@ void StepperLeapfrog::setInitialConditions( // Check if we need Stepper storage for xDotDot if (initialState->getXDotDot() == Teuchos::null) this->setStepperXDotDot(initialState->getX()->clone_v()); + else + this->setStepperXDotDot(initialState->getXDotDot()); StepperExplicit::setInitialConditions(solutionHistory); if (this->getUseFSAL()) { Teuchos::RCP out = this->getOStream(); Teuchos::OSTab ostab(out,1,"StepperLeapfrog::setInitialConditions()"); - *out << "Warning -- The First-Step-As-Last (FSAL) principle is not " + *out << "Warning -- The First-Same-As-Last (FSAL) principle is not " << "used with Leapfrog because of the algorithm's prescribed " << "order of solution update. The default is to set useFSAL=false, " << "however useFSAL=true will also work but have no affect " diff --git a/packages/tempus/src/Tempus_StepperNewmarkExplicitAForm_impl.hpp b/packages/tempus/src/Tempus_StepperNewmarkExplicitAForm_impl.hpp index 67bfd70a4436..e796f0e81766 100644 --- a/packages/tempus/src/Tempus_StepperNewmarkExplicitAForm_impl.hpp +++ b/packages/tempus/src/Tempus_StepperNewmarkExplicitAForm_impl.hpp @@ -153,6 +153,8 @@ void StepperNewmarkExplicitAForm::setInitialConditions( // Check if we need Stepper storage for xDotDot if (initialState->getXDotDot() == Teuchos::null) initialState->setXDotDot(initialState->getX()->clone_v()); + else + this->setStepperXDotDot(initialState->getXDotDot()); // Perform IC Consistency std::string icConsistency = this->getICConsistency(); diff --git a/packages/tempus/src/Tempus_StepperNewmarkImplicitAForm_decl.hpp b/packages/tempus/src/Tempus_StepperNewmarkImplicitAForm_decl.hpp index c98e4ec46772..2fda97a28213 100644 --- a/packages/tempus/src/Tempus_StepperNewmarkImplicitAForm_decl.hpp +++ b/packages/tempus/src/Tempus_StepperNewmarkImplicitAForm_decl.hpp @@ -64,7 +64,7 @@ namespace Tempus { * - \f$\mathbf{d}^n = \mathbf{d}^{\ast} + \beta \Delta t^2 \mathbf{a}^n\f$ * - \f$\mathbf{v}^n = \mathbf{v}^{\ast} + \gamma \Delta t \mathbf{a}^n\f$ * - * The First-Step-As-Last (FSAL) principle is part of the Newmark + * The First-Same-As-Last (FSAL) principle is part of the Newmark * implicit A-Form as the acceleration from the previous time step is * used for the predictors. The default is to set useFSAL=true, * and useFSAL=false will be ignored. diff --git a/packages/tempus/src/Tempus_StepperNewmarkImplicitAForm_impl.hpp b/packages/tempus/src/Tempus_StepperNewmarkImplicitAForm_impl.hpp index 0f45b1965e15..91af94aacd06 100644 --- a/packages/tempus/src/Tempus_StepperNewmarkImplicitAForm_impl.hpp +++ b/packages/tempus/src/Tempus_StepperNewmarkImplicitAForm_impl.hpp @@ -284,6 +284,8 @@ void StepperNewmarkImplicitAForm::setInitialConditions( // Check if we need Stepper storage for xDotDot if (initialState->getXDotDot() == Teuchos::null) initialState->setXDotDot(initialState->getX()->clone_v()); + else + this->setStepperXDotDot(initialState->getXDotDot()); // Perform IC Consistency std::string icConsistency = this->getICConsistency(); @@ -397,7 +399,7 @@ void StepperNewmarkImplicitAForm::setInitialConditions( RCP out = this->getOStream(); Teuchos::OSTab ostab(out,1, "StepperNewmarkImplicitAForm::setInitialConditions()"); - *out << "\nWarning -- The First-Step-As-Last (FSAL) principle is " + *out << "\nWarning -- The First-Same-As-Last (FSAL) principle is " << "part of the Newmark Implicit A-Form. The default is to " << "set useFSAL=true, and useFSAL=false will be ignored." << std::endl; } diff --git a/packages/tempus/src/Tempus_StepperNewmarkImplicitDForm_decl.hpp b/packages/tempus/src/Tempus_StepperNewmarkImplicitDForm_decl.hpp index 3daa3c2f8984..ca8b1cacf837 100644 --- a/packages/tempus/src/Tempus_StepperNewmarkImplicitDForm_decl.hpp +++ b/packages/tempus/src/Tempus_StepperNewmarkImplicitDForm_decl.hpp @@ -33,7 +33,7 @@ namespace Tempus { * Beta scheme can be found * here. * - * The First-Step-As-Last (FSAL) principle is not used with the + * The First-Same-As-Last (FSAL) principle is not used with the * Newmark implicit D-Form method. */ template diff --git a/packages/tempus/src/Tempus_StepperOperatorSplitAppAction.hpp b/packages/tempus/src/Tempus_StepperOperatorSplitAppAction.hpp index 3f8b8be0ca3a..302c64b884ec 100644 --- a/packages/tempus/src/Tempus_StepperOperatorSplitAppAction.hpp +++ b/packages/tempus/src/Tempus_StepperOperatorSplitAppAction.hpp @@ -11,7 +11,7 @@ #include "Tempus_config.hpp" #include "Tempus_SolutionHistory.hpp" -#include "Tempus_StepperOperatorSplit.hpp" + namespace Tempus { @@ -22,15 +22,15 @@ template class StepperOperatorSplit; * * This is a means for application developers to perform tasks * during the time steps, e.g., - * - Compute specific quantities - * - Output information + * - Compute specific quantities + * - Output information * - "Massage" the working solution state * - ... * * Design Considerations * - StepperOperatorSplitAppAction is not stateless! Developers may touch the * solution state! Developers need to be careful not to break the - * restart (checkpoint) capability. + * restart (checkpoint) capability. */ template class StepperOperatorSplitAppAction @@ -38,10 +38,10 @@ class StepperOperatorSplitAppAction public: enum ACTION_LOCATION { - BEGIN_STEP, ///< At the beginning of the step. - BEFORE_STEPPER, ///< Before a stepper evaluation. - AFTER_STEPPER, ///< After a stepper evaluation. - END_STEP ///< At the end of the step. + BEGIN_STEP, ///< At the beginning of the step. + BEFORE_STEPPER, ///< Before a stepper evaluation. + AFTER_STEPPER, ///< After a stepper evaluation. + END_STEP ///< At the end of the step. }; /// Constructor @@ -50,7 +50,7 @@ class StepperOperatorSplitAppAction /// Destructor virtual ~StepperOperatorSplitAppAction(){} - /// Execute application action for OperatorSplit Stepper. + /// Execute application action for OperatorSplit Stepper. virtual void execute( Teuchos::RCP > sh, Teuchos::RCP > stepper, diff --git a/packages/tempus/src/Tempus_StepperOperatorSplitModifierBase.hpp b/packages/tempus/src/Tempus_StepperOperatorSplitModifierBase.hpp index 5f62f66ed2f8..eebe45631d6d 100644 --- a/packages/tempus/src/Tempus_StepperOperatorSplitModifierBase.hpp +++ b/packages/tempus/src/Tempus_StepperOperatorSplitModifierBase.hpp @@ -15,33 +15,33 @@ namespace Tempus { - /** \brief Base modifier for OperatorSplit. - * - * This class provides a means to modify values (e.g., solution variables - * through SolutionHistory, and stepper member data through the Stepper), - * and can be very powerful and easy to make changes to the stepper and - * the solution. - * - * Users deriving from this class can access a lot of data, and it is - * expected that those users know what changes are allowable without - * affecting the Stepper correctness, performance, accuracy and stability. - * Thus the user should be careful when accessing data through classes - * derived from the default modifier (i.e., USER BEWARE!!). - * + /** \brief Base modifier for OperatorSplit. + * + * This class provides a means to modify values (e.g., solution variables + * through SolutionHistory, and stepper member data through the Stepper), + * and can be very powerful and easy to make changes to the stepper and + * the solution. + * + * Users deriving from this class can access a lot of data, and it is + * expected that those users know what changes are allowable without + * affecting the Stepper correctness, performance, accuracy and stability. + * Thus the user should be careful when accessing data through classes + * derived from the default modifier (i.e., USER BEWARE!!). + * */ template class StepperOperatorSplitModifierBase : virtual public Tempus::StepperOperatorSplitAppAction { private: - /* \brief Adaptor execute function - * - * This is an adaptor function to bridge between the AppAction - * interface and the Modifier interface. It is meant to be private - * and non-virtual as deriving from this class should only need to - * implement the modify function. - * - * For the Modifier interface, this adaptor is a "simple pass through". + /* \brief Adaptor execute function + * + * This is an adaptor function to bridge between the AppAction + * interface and the Modifier interface. It is meant to be private + * and non-virtual as deriving from this class should only need to + * implement the modify function. + * + * For the Modifier interface, this adaptor is a "simple pass through". */ void execute( Teuchos::RCP > sh, @@ -49,7 +49,7 @@ class StepperOperatorSplitModifierBase const typename StepperOperatorSplitAppAction::ACTION_LOCATION actLoc) { this->modify(sh, stepper, actLoc); } public: - /// Modify OperatorSplit Stepper. + /// Modify OperatorSplit Stepper. virtual void modify( Teuchos::RCP > /* sh */, Teuchos::RCP > /* stepper */, diff --git a/packages/tempus/src/Tempus_StepperOperatorSplitModifierDefault.hpp b/packages/tempus/src/Tempus_StepperOperatorSplitModifierDefault.hpp index a7b88aa620e8..8d77ab12acae 100644 --- a/packages/tempus/src/Tempus_StepperOperatorSplitModifierDefault.hpp +++ b/packages/tempus/src/Tempus_StepperOperatorSplitModifierDefault.hpp @@ -10,9 +10,12 @@ #define Tempus_StepperOperatorSplitModifierDefault_hpp #include "Tempus_config.hpp" -#include "Tempus_SolutionHistory.hpp" #include "Tempus_StepperOperatorSplitModifierBase.hpp" +// Applications can uncomment this include in their implementation, +// if they need access to the stepper methods. +//#include "Tempus_StepperOperatorSplit.hpp" + namespace Tempus { @@ -20,6 +23,9 @@ namespace Tempus { * * The default modifier provides no-op functionality for the modifier. * See StepperOperatorSplitModifierBase for details on the algorithm. + * + * Applications can copy this implementation, rename, implement their + * action, and set on the stepper to get app-specific functionality. */ template class StepperOperatorSplitModifierDefault diff --git a/packages/tempus/src/Tempus_StepperOperatorSplitModifierXBase.hpp b/packages/tempus/src/Tempus_StepperOperatorSplitModifierXBase.hpp index 3260aa5e49a5..198156ba028b 100644 --- a/packages/tempus/src/Tempus_StepperOperatorSplitModifierXBase.hpp +++ b/packages/tempus/src/Tempus_StepperOperatorSplitModifierXBase.hpp @@ -84,7 +84,10 @@ class StepperOperatorSplitModifierXBase case StepperOperatorSplitAppAction::END_STEP: { modType = XDOT_END_STEP; - x = stepper->getStepperXDot(workingState); + if (workingState->getXDot() != Teuchos::null) + x = workingState->getXDot(); + else + x = stepper->getStepperXDot(); break; } default: diff --git a/packages/tempus/src/Tempus_StepperOperatorSplitModifierXDefault.hpp b/packages/tempus/src/Tempus_StepperOperatorSplitModifierXDefault.hpp new file mode 100644 index 000000000000..f692279b7da7 --- /dev/null +++ b/packages/tempus/src/Tempus_StepperOperatorSplitModifierXDefault.hpp @@ -0,0 +1,67 @@ +// @HEADER +// **************************************************************************** +// Tempus: Copyright (2017) Sandia Corporation +// +// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) +// **************************************************************************** +// @HEADER + +#ifndef Tempus_StepperOperatorSplitModifierXDefault_hpp +#define Tempus_StepperOperatorSplitModifierXDefault_hpp + +#include "Tempus_config.hpp" +#include "Tempus_StepperOperatorSplitModifierXBase.hpp" + +// Applications can uncomment this include in their implementation, +// if they need access to the stepper methods. +//#include "Tempus_StepperOperatorSplit.hpp" + + +namespace Tempus { + +/** \brief Default ModifierX for StepperOperatorSplit. + * + * The default ModifierX provides no-op functionality for ModifierX. + * See StepperOperatorSplitModifierXBase for details on the algorithm. + * + * Applications can copy this implementation, rename, implement their + * action, and set on the stepper to get app-specific functionality. + */ +template +class StepperOperatorSplitModifierXDefault + : virtual public Tempus::StepperOperatorSplitModifierXBase +{ +public: + + /// Constructor + StepperOperatorSplitModifierXDefault(){} + + /// Destructor + virtual ~StepperOperatorSplitModifierXDefault(){} + + /// Modify OperatorSplit Stepper. + virtual void modify( + Teuchos::RCP > /* x */, + const Scalar /* time */, const Scalar /* dt */, + const typename StepperOperatorSplitModifierXBase::MODIFIER_TYPE modType) + { + switch(modType) { + case StepperOperatorSplitModifierXBase::X_BEGIN_STEP: + case StepperOperatorSplitModifierXBase::X_BEFORE_STEPPER: + case StepperOperatorSplitModifierXBase::X_AFTER_STEPPER: + case StepperOperatorSplitModifierXBase::XDOT_END_STEP: + { + // No-op. + break; + } + default: + TEUCHOS_TEST_FOR_EXCEPTION(true, std::logic_error, + "Error - unknown action location.\n"); + } + } + +}; + +} // namespace Tempus + +#endif // Tempus_StepperOperatorSplitModifierXDefault_hpp diff --git a/packages/tempus/src/Tempus_StepperOperatorSplitObserverDefault.hpp b/packages/tempus/src/Tempus_StepperOperatorSplitObserverDefault.hpp index d25367b348d5..7361f3846cfe 100644 --- a/packages/tempus/src/Tempus_StepperOperatorSplitObserverDefault.hpp +++ b/packages/tempus/src/Tempus_StepperOperatorSplitObserverDefault.hpp @@ -10,15 +10,22 @@ #define Tempus_StepperOperatorSplitObserverDefault_hpp #include "Tempus_config.hpp" -#include "Tempus_SolutionHistory.hpp" #include "Tempus_StepperOperatorSplitObserverBase.hpp" +// Applications can uncomment this include in their implementation, +// if they need access to the stepper methods. +//#include "Tempus_StepperOperatorSplit.hpp" + + namespace Tempus { /** \brief Default observer for StepperOperatorSplit. * * The default observer provides no-op functionality for the observer. * See StepperOperatorSplitObserverBase for details on the algorithm. + * + * Applications can copy this implementation, rename, implement their + * action, and set on the stepper to get app-specific functionality. */ template class StepperOperatorSplitObserverDefault diff --git a/packages/tempus/src/Tempus_StepperOperatorSplit_impl.hpp b/packages/tempus/src/Tempus_StepperOperatorSplit_impl.hpp index 90e250d02870..1b812b32f6fc 100644 --- a/packages/tempus/src/Tempus_StepperOperatorSplit_impl.hpp +++ b/packages/tempus/src/Tempus_StepperOperatorSplit_impl.hpp @@ -302,6 +302,15 @@ void StepperOperatorSplit::setInitialConditions( subStepperIter = subStepperList_.begin(); for (; subStepperIter < subStepperList_.end(); subStepperIter++) (*subStepperIter)->setInitialConditions(solutionHistory); + + Teuchos::RCP > initialState = + solutionHistory->getCurrentState(); + + // Check if we need Stepper storage for xDot + this->setStepperXDot(initialState->getXDot()); + if (initialState->getXDot() == Teuchos::null) + this->setStepperXDot(initialState->getX()->clone_v()); + } template @@ -345,9 +354,9 @@ void StepperOperatorSplit::takeStep( typename std::vector > >::iterator subStepperIter = subStepperList_.begin(); for (; subStepperIter < subStepperList_.end() and pass; subStepperIter++) { - int index = subStepperIter - subStepperList_.begin(); #ifndef TEMPUS_HIDE_DEPRECATED_CODE + int index = subStepperIter - subStepperList_.begin(); stepperOSObserver_->observeBeforeStepper(index, solutionHistory, *this); #endif stepperOSAppAction_->execute(solutionHistory, thisStepper, @@ -383,6 +392,7 @@ void StepperOperatorSplit::takeStep( #ifndef TEMPUS_HIDE_DEPRECATED_CODE stepperOSObserver_->observeEndTakeStep(solutionHistory, *this); #endif + stepperOSAppAction_->execute(solutionHistory, thisStepper, StepperOperatorSplitAppAction::ACTION_LOCATION::END_STEP); } diff --git a/packages/tempus/src/Tempus_StepperRKAppAction.hpp b/packages/tempus/src/Tempus_StepperRKAppAction.hpp index 7b4a4b954d81..ea7482a1abe7 100644 --- a/packages/tempus/src/Tempus_StepperRKAppAction.hpp +++ b/packages/tempus/src/Tempus_StepperRKAppAction.hpp @@ -11,7 +11,6 @@ #include "Tempus_config.hpp" #include "Tempus_SolutionHistory.hpp" -#include "Tempus_StepperRKBase.hpp" namespace Tempus { @@ -28,7 +27,7 @@ template class StepperRKBase; * data (i.e., use but not change the data) to change any of it * (USER BEWARE!). * - * The locations of the RK AppActions (ACITON_LOCATION) in takeStep + * The locations of the RK AppActions (ACTION_LOCATION) in takeStep * are documented in each of the RK Algorithm sections: * StepperExplicitRK, StepperDIRK and StepperIMEX_RK. */ diff --git a/packages/tempus/src/Tempus_StepperRKAppActionComposite.hpp b/packages/tempus/src/Tempus_StepperRKAppActionComposite.hpp index d3f81bbfce06..4841faa17e1a 100644 --- a/packages/tempus/src/Tempus_StepperRKAppActionComposite.hpp +++ b/packages/tempus/src/Tempus_StepperRKAppActionComposite.hpp @@ -10,7 +10,6 @@ #define Tempus_StepperRKAppActionComposite_hpp #include "Tempus_StepperRKAppAction.hpp" -#include "Tempus_TimeStepControl.hpp" #include namespace Tempus { @@ -27,15 +26,15 @@ class StepperRKAppActionComposite public: /// Default constructor - StepperRKAppActionComposite(); + StepperRKAppActionComposite() {} /// Destructor - virtual ~StepperRKAppActionComposite(); + virtual ~StepperRKAppActionComposite() {} /// Execute application action for RK Stepper. virtual void execute( Teuchos::RCP > sh, - Teuchos::RCP > stepper, + Teuchos::RCP > stepper, const typename StepperRKAppAction::ACTION_LOCATION actLoc) { for(auto& a : appActions_) @@ -43,13 +42,13 @@ class StepperRKAppActionComposite } // Add AppAction to the AppAction vector. - void addRKAppAction(Teuchos::RCP > appAction); + void addRKAppAction(Teuchos::RCP > appAction) { appActions_.push_back(appAction); } // Clear the AppAction vector. - void clearRKAppActions(); + void clearRKAppActions() { appActions_.clear(); } // Return the size of the AppAction vector. diff --git a/packages/tempus/src/Tempus_StepperRKBase.hpp b/packages/tempus/src/Tempus_StepperRKBase.hpp index 3f15bec1e81a..832c55e714ea 100644 --- a/packages/tempus/src/Tempus_StepperRKBase.hpp +++ b/packages/tempus/src/Tempus_StepperRKBase.hpp @@ -12,6 +12,7 @@ #include "Thyra_VectorBase.hpp" #include "Tempus_Stepper.hpp" +#include "Tempus_RKButcherTableau.hpp" #include "Tempus_StepperRKAppAction.hpp" #include "Tempus_StepperRKModifierDefault.hpp" @@ -30,11 +31,19 @@ class StepperRKBase : virtual public Tempus::Stepper public: - virtual int getStageNumber() const { return stageNumber_; } + virtual Teuchos::RCP > getTableau() const + { return tableau_; } + + virtual Scalar getOrder() const{return getTableau()->order();} + virtual Scalar getOrderMin() const{return getTableau()->orderMin();} + virtual Scalar getOrderMax() const{return getTableau()->orderMax();} + virtual int getNumberOfStages() const {return getTableau()->numStages();} + virtual int getStageNumber() const { return stageNumber_; } virtual void setStageNumber(int s) { stageNumber_ = s; } virtual Teuchos::RCP > getStageX() {return stageX_;} + virtual Teuchos::RCP > getStageX() const {return stageX_;} virtual void setAppAction(Teuchos::RCP > appAction) { @@ -53,7 +62,10 @@ class StepperRKBase : virtual public Tempus::Stepper protected: - int stageNumber_; //< The Runge-Kutta stage number, {0,...,s-1}. + Teuchos::RCP > tableau_; + + /// The current Runge-Kutta stage number, {0,...,s-1}. -1 indicates outside stage loop. + int stageNumber_; Teuchos::RCP > stageX_; Teuchos::RCP > stepperRKAppAction_; diff --git a/packages/tempus/src/Tempus_StepperRKButcherTableau.hpp b/packages/tempus/src/Tempus_StepperRKButcherTableau.hpp index f33e97f7f3ad..8b38f7af0d64 100644 --- a/packages/tempus/src/Tempus_StepperRKButcherTableau.hpp +++ b/packages/tempus/src/Tempus_StepperRKButcherTableau.hpp @@ -107,6 +107,8 @@ class StepperERK_ForwardEuler : this->tableau_ = Teuchos::rcp(new RKButcherTableau( this->getStepperType(),A,b,c,order,order,order)); + this->tableau_->setTVD(true); + this->tableau_->setTVDCoeff(1.0); } }; @@ -801,7 +803,7 @@ class StepperERK_5Stage3rdOrderKandG : this->setStepperType("RK Explicit 5 Stage 3rd order by Kinnmark and Gray"); this->setupTableau(); this->setup(appModel, useFSAL, ICConsistency, - ICConsistencyCheck, useEmbedded, stepperRKAppAction); + ICConsistencyCheck, useEmbedded,stepperRKAppAction); } std::string getDescription() const @@ -1069,6 +1071,7 @@ class StepperERK_3Stage3rdOrderTVD : void setupTableau() { typedef Teuchos::ScalarTraits ST; + using Teuchos::as; const Scalar one = ST::one(); const Scalar zero = ST::zero(); const Scalar onehalf = one/(2*one); @@ -1080,6 +1083,7 @@ class StepperERK_3Stage3rdOrderTVD : Teuchos::SerialDenseMatrix A(NumStages,NumStages); Teuchos::SerialDenseVector b(NumStages); Teuchos::SerialDenseVector c(NumStages); + Teuchos::SerialDenseVector bstar(NumStages); // Fill A: A(0,0) = zero; A(0,1) = zero; A(0,2) = zero; @@ -1092,10 +1096,17 @@ class StepperERK_3Stage3rdOrderTVD : // fill c: c(0) = zero; c(1) = one; c(2) = onehalf; + // Fill bstar: + bstar(0) = as(0.291485418878409); + bstar(1) = as(0.291485418878409); + bstar(2) = as(0.417029162243181); + int order = 3; this->tableau_ = Teuchos::rcp(new RKButcherTableau( - this->getStepperType(),A,b,c,order,order,order)); + this->getStepperType(),A,b,c,order,order,order,bstar)); + this->tableau_->setTVD(true); + this->tableau_->setTVDCoeff(1.0); } }; @@ -1432,6 +1443,8 @@ class StepperERK_Ralston : this->tableau_ = Teuchos::rcp(new RKButcherTableau( this->getStepperType(),A,b,c,order,order,order)); + this->tableau_->setTVD(true); + this->tableau_->setTVDCoeff(0.5); } }; @@ -1448,7 +1461,8 @@ class StepperERK_Ralston : * \;\;\;\;\mbox{ where }\;\;\;\; * \begin{array}{c|cc} 0 & 0 & \\ * 1 & 1 & 0 \\ \hline - * & 1/2 & 1/2 \end{array} + * & 1/2 & 1/2 \\ + * & 3/4 & 1/4 \end{array} * \f] */ template @@ -1502,10 +1516,11 @@ class StepperERK_Trapezoidal : std::ostringstream Description; Description << this->getStepperType() << "\n" << "This Stepper is known as 'RK Explicit Trapezoidal' or 'Heuns Method' or 'SSPERK22'.\n" - << "c = [ 0 1 ]'\n" - << "A = [ 0 ]\n" - << " [ 1 0 ]\n" - << "b = [ 1/2 1/2 ]'"; + << "c = [ 0 1 ]'\n" + << "A = [ 0 ]\n" + << " [ 1 0 ]\n" + << "b = [ 1/2 1/2 ]\n" + << "bstart = [ 3/4 1/4 ]'"; return Description.str(); } @@ -1514,6 +1529,7 @@ class StepperERK_Trapezoidal : void setupTableau() { typedef Teuchos::ScalarTraits ST; + using Teuchos::as; const Scalar one = ST::one(); const Scalar zero = ST::zero(); const Scalar onehalf = one/(2*one); @@ -1522,6 +1538,7 @@ class StepperERK_Trapezoidal : Teuchos::SerialDenseMatrix A(NumStages,NumStages); Teuchos::SerialDenseVector b(NumStages); Teuchos::SerialDenseVector c(NumStages); + Teuchos::SerialDenseVector bstar(NumStages); // Fill A: A(0,0) = zero; A(0,1) = zero; @@ -1533,10 +1550,16 @@ class StepperERK_Trapezoidal : // fill c: c(0) = zero; c(1) = one; + // Fill bstar + bstar(0) = as(3*one/(4*one)); + bstar(1) = as(1*one/(4*one)); + int order = 2; this->tableau_ = Teuchos::rcp(new RKButcherTableau( - this->getStepperType(),A,b,c,order,order,order)); + this->getStepperType(),A,b,c,order,order,order,bstar)); + this->tableau_->setTVD(true); + this->tableau_->setTVDCoeff(1.0); } }; @@ -1618,9 +1641,11 @@ class StepperERK_SSPERK54 : using Teuchos::as; const int NumStages = 5; const int order = 4; + const Scalar sspcoef = 1.5082; Teuchos::SerialDenseMatrix A(NumStages,NumStages); Teuchos::SerialDenseVector b(NumStages); Teuchos::SerialDenseVector c(NumStages); + Teuchos::SerialDenseVector bstar(NumStages); const Scalar zero = ST::zero(); // Fill A: @@ -1655,11 +1680,20 @@ class StepperERK_SSPERK54 : c(0) = zero; c(1) = A(1,0); c(2) = A(2,0) + A(2,1); - c(3) = A(3,0) + A(3,1) + A(3,1); + c(3) = A(3,0) + A(3,1) + A(3,2); c(4) = A(4,0) + A(4,1) + A(4,2) + A(4,3); + // Fill bstar: + bstar(0) = as(0.130649104813131); + bstar(1) = as(0.317716031201302); + bstar(2) = as(0.000000869337261); + bstar(3) = as(0.304581512634772); + bstar(4) = as(0.247052482013534); + this->tableau_ = Teuchos::rcp(new RKButcherTableau( - this->getStepperType(),A,b,c,order,order,order)); + this->getStepperType(),A,b,c,order,order,order,bstar)); + this->tableau_->setTVD(true); + this->tableau_->setTVDCoeff(sspcoef); } }; @@ -1744,7 +1778,7 @@ class StepperERK_General : const int orderMin, const int orderMax, const Teuchos::SerialDenseVector& bstar, - const Teuchos::RCP >& stepperRKAppAction) + const Teuchos::RCP >& stepperRKAppAction=Teuchos::null) { this->setStepperType("General ERK"); this->setTableau(A,b,c,order,orderMin,orderMax,bstar); @@ -1925,6 +1959,7 @@ class StepperDIRK_BackwardEuler : void setupTableau() { typedef Teuchos::ScalarTraits ST; + const Scalar sspcoef = std::numeric_limits::max(); int NumStages = 1; Teuchos::SerialDenseMatrix A(NumStages,NumStages); Teuchos::SerialDenseVector b(NumStages); @@ -1943,6 +1978,8 @@ class StepperDIRK_BackwardEuler : this->tableau_ = Teuchos::rcp(new RKButcherTableau( this->getStepperType(),A,b,c,order,order,order)); + this->tableau_->setTVD(true); + this->tableau_->setTVDCoeff(sspcoef); } }; @@ -2229,6 +2266,7 @@ class StepperSDIRK_3Stage2ndOrder : using Teuchos::as; const int NumStages = 3; const int order = 2; + const Scalar sspcoef = 1.0529; Teuchos::SerialDenseMatrix A(NumStages,NumStages); Teuchos::SerialDenseVector b(NumStages); Teuchos::SerialDenseVector c(NumStages); @@ -2253,6 +2291,8 @@ class StepperSDIRK_3Stage2ndOrder : this->tableau_ = Teuchos::rcp(new RKButcherTableau( this->getStepperType(),A,b,c,order,order,order)); + this->tableau_->setTVD(true); + this->tableau_->setTVDCoeff(sspcoef); } }; @@ -2597,6 +2637,8 @@ class StepperEDIRK_2Stage3rdOrder : this->tableau_ = Teuchos::rcp(new RKButcherTableau( this->getStepperType(),A,b,c,order,order,order)); + this->tableau_->setTVD(true); + this->tableau_->setTVDCoeff(1.5); } }; @@ -2757,6 +2799,8 @@ class StepperDIRK_1StageTheta : this->tableau_ = Teuchos::rcp(new RKButcherTableau( this->getStepperType(),A,b,c,order,1,2)); + this->tableau_->setTVD(true); + this->tableau_->setTVDCoeff(2.0); } private: @@ -2931,6 +2975,8 @@ class StepperEDIRK_2StageTheta : this->tableau_ = Teuchos::rcp(new RKButcherTableau( this->getStepperType(),A,b,c,order,1,2)); + this->tableau_->setTVD(true); + this->tableau_->setTVDCoeff(2.0); } private: @@ -3062,6 +3108,8 @@ class StepperEDIRK_TrapezoidalRule : this->tableau_ = Teuchos::rcp(new RKButcherTableau( this->getStepperType(),A,b,c,order,order,order)); + this->tableau_->setTVD(true); + this->tableau_->setTVDCoeff(2.0); } }; @@ -3198,6 +3246,8 @@ class StepperSDIRK_ImplicitMidpoint : this->tableau_ = Teuchos::rcp(new RKButcherTableau( this->getStepperType(),A,b,c,order,order,order)); + this->tableau_->setTVD(true); + this->tableau_->setTVDCoeff(2.0); } }; @@ -3322,6 +3372,8 @@ class StepperSDIRK_SSPDIRK22 : this->tableau_ = Teuchos::rcp(new RKButcherTableau( this->getStepperType(),A,b,c,order,order,order)); + this->tableau_->setTVD(true); + this->tableau_->setTVDCoeff(4.0); } }; @@ -3450,6 +3502,8 @@ class StepperSDIRK_SSPDIRK32 : this->tableau_ = Teuchos::rcp(new RKButcherTableau( this->getStepperType(),A,b,c,order,order,order)); + this->tableau_->setTVD(true); + this->tableau_->setTVDCoeff(6.0); } }; @@ -3500,6 +3554,7 @@ class StepperSDIRK_SSPDIRK23 : this->setupTableau(); this->setup(appModel, obs, solver, useFSAL, ICConsistency, ICConsistencyCheck, useEmbedded, zeroInitialGuess); + } #endif StepperSDIRK_SSPDIRK23( @@ -3552,6 +3607,7 @@ class StepperSDIRK_SSPDIRK23 : using Teuchos::as; const int NumStages = 2; const int order = 3; + const Scalar sspcoef = 2.7321; Teuchos::SerialDenseMatrix A(NumStages,NumStages); Teuchos::SerialDenseVector b(NumStages); Teuchos::SerialDenseVector c(NumStages); @@ -3575,6 +3631,8 @@ class StepperSDIRK_SSPDIRK23 : this->tableau_ = Teuchos::rcp(new RKButcherTableau( this->getStepperType(),A,b,c,order,order,order)); + this->tableau_->setTVD(true); + this->tableau_->setTVDCoeff(sspcoef); } }; @@ -3680,6 +3738,7 @@ class StepperSDIRK_SSPDIRK33 : using Teuchos::as; const int NumStages = 3; const int order = 3; + const Scalar sspcoef= 4.8284; Teuchos::SerialDenseMatrix A(NumStages,NumStages); Teuchos::SerialDenseVector b(NumStages); Teuchos::SerialDenseVector c(NumStages); @@ -3704,6 +3763,8 @@ class StepperSDIRK_SSPDIRK33 : this->tableau_ = Teuchos::rcp(new RKButcherTableau( this->getStepperType(),A,b,c,order,order,order)); + this->tableau_->setTVD(true); + this->tableau_->setTVDCoeff(sspcoef); } }; @@ -3959,6 +4020,9 @@ class StepperDIRK_2Stage2ndOrderLobattoIIIB : auto emptyBStar = Teuchos::SerialDenseVector(); this->tableau_ = Teuchos::rcp(new RKButcherTableau( this->getStepperType(),A,b,c,order,order,order,emptyBStar,false)); + this->tableau_->setTVD(true); + this->tableau_->setTVDCoeff(2.0); + //TODO: fix this } }; @@ -4055,7 +4119,7 @@ class StepperSDIRK_5Stage4thOrder : << " [ 371/1360 -137/2720 15/544 1/4 ]\n" << " [ 25/24 -49/48 125/16 -85/12 1/4 ]\n" << "b = [ 25/24 -49/48 125/16 -85/12 1/4 ]'"; - //<< "b = [ 59/48 -17/96 225/32 -85/12 0 ]'"; + // << "b = [ 59/48 -17/96 225/32 -85/12 0 ]'"; return Description.str(); } diff --git a/packages/tempus/src/Tempus_StepperRKModifierBase.hpp b/packages/tempus/src/Tempus_StepperRKModifierBase.hpp index e513b4107a10..49f452635e11 100644 --- a/packages/tempus/src/Tempus_StepperRKModifierBase.hpp +++ b/packages/tempus/src/Tempus_StepperRKModifierBase.hpp @@ -28,7 +28,7 @@ namespace Tempus { * expected that those users know what changes are allowable without * affecting the Stepper correctness, performance, accuracy and stability. * Thus the user should be careful when accessing data through classes - * derived from the default modifier (i.e., USER RKWARE!!). + * derived from the default modifier (i.e., USER BEWARE!!). * * Below is the RK algorithm with the locations of the modify calls * italicized. @@ -37,9 +37,9 @@ namespace Tempus { * \renewcommand{\thealgorithm}{} * \caption{Backward Euler with modify calls indicated.} * \begin{algorithmic}[1] - * \State \quad {\it modifier.modify(solutionHistory, stepper, RKGIN\_STEP)} + * \State \quad {\it modifier.modify(solutionHistory, stepper, BEGIN\_STEP)} * \State Compute the predictor (e.g., apply stepper to $x_n$). - * \State \quad {\it modifier.modify(solutionHistory, stepper, RKFORE\_SOLVE)} + * \State \quad {\it modifier.modify(solutionHistory, stepper, BEFORE\_SOLVE)} * \State Solve $\mathcal{F}_n(\dot{x}=(x_n-x_{n-1})/\Delta t_n, x_n, t_n)=0$ for $x_n$ * \State \quad {\it modifier.modify(solutionHistory, stepper, AFTER\_SOLVE)} * \State $\dot{x}_n \leftarrow (x_n-x_{n-1})/\Delta t_n$ diff --git a/packages/tempus/src/Tempus_StepperRKModifierDefault.hpp b/packages/tempus/src/Tempus_StepperRKModifierDefault.hpp index 963236762cef..929b41fe4230 100644 --- a/packages/tempus/src/Tempus_StepperRKModifierDefault.hpp +++ b/packages/tempus/src/Tempus_StepperRKModifierDefault.hpp @@ -10,9 +10,12 @@ #define Tempus_StepperRKModifierDefault_hpp #include "Tempus_config.hpp" -#include "Tempus_SolutionHistory.hpp" #include "Tempus_StepperRKModifierBase.hpp" +// Applications can uncomment this include in their implementation, +// if they need access to the stepper methods. +//#include "Tempus_StepperRKBase.hpp" + namespace Tempus { @@ -20,6 +23,9 @@ namespace Tempus { * * The default modifier provides no-op functionality for the modifier. * See StepperRKModifierBase for details on the algorithm. + * + * Applications can copy this implementation, rename, implement their + * action, and set on the stepper to get app-specific functionality. */ template class StepperRKModifierDefault diff --git a/packages/tempus/src/Tempus_StepperRKModifierXBase.hpp b/packages/tempus/src/Tempus_StepperRKModifierXBase.hpp index 6e3e15aa23a7..95812c1dc10b 100644 --- a/packages/tempus/src/Tempus_StepperRKModifierXBase.hpp +++ b/packages/tempus/src/Tempus_StepperRKModifierXBase.hpp @@ -72,16 +72,20 @@ class StepperRKModifierXBase using Teuchos::RCP; MODIFIER_TYPE modType = X_BEGIN_STEP; + const int stageNumber = stepper->getStageNumber(); + Teuchos::SerialDenseVector c = stepper->getTableau()->c(); + RCP > currentState = sh->getCurrentState(); RCP > workingState = sh->getWorkingState(); - const Scalar time = workingState->getTime(); - const Scalar dt = workingState->getTimeStep(); + const Scalar dt = workingState->getTimeStep(); + Scalar time = currentState->getTime(); + if (stageNumber >= 0) time += c(stageNumber)*dt; RCP > x; switch(actLoc) { case StepperRKAppAction::BEGIN_STEP: { modType = X_BEGIN_STEP; - x = workingState->getX(); + x = currentState->getX(); break; } case StepperRKAppAction::BEGIN_STAGE: @@ -105,19 +109,20 @@ class StepperRKModifierXBase case StepperRKAppAction::BEFORE_EXPLICIT_EVAL: { modType = X_BEFORE_EXPLICIT_EVAL; - x = workingState->getX(); + x = stepper->getStageX(); break; } case StepperRKAppAction::END_STAGE: { - modType = XDOT_END_STAGE; - x = stepper->getStepperXDot(workingState); + modType = X_END_STAGE; + x = stepper->getStageX(); break; } case StepperRKAppAction::END_STEP: { modType = X_END_STEP; x = workingState->getX(); + time = workingState->getTime(); break; } default: @@ -125,7 +130,7 @@ class StepperRKModifierXBase "Error - unknown action location.\n"); } - this->modify(x, time, dt, modType); + this->modify(x, time, dt, stageNumber, modType); } public: @@ -137,7 +142,7 @@ class StepperRKModifierXBase X_BEFORE_SOLVE, ///< Modify \f$x\f$ before the implicit solve. X_AFTER_SOLVE, ///< Modify \f$x\f$ after the implicit solve. X_BEFORE_EXPLICIT_EVAL, ///< Modify \f$x\f$ before the explicit evaluation. - XDOT_END_STAGE, ///< Modify \f$\dot{x}\f$ at the end of the stage. + X_END_STAGE, ///< Modify \f$x\f$ at the end of the stage. X_END_STEP ///< Modify \f$x\f$ at the end of the step. }; @@ -145,6 +150,7 @@ class StepperRKModifierXBase virtual void modify( Teuchos::RCP > /* x */, const Scalar /* time */, const Scalar /* dt */, + const int /* stageNumber */, const MODIFIER_TYPE modType) = 0; }; diff --git a/packages/tempus/src/Tempus_StepperRKModifierXDefault.hpp b/packages/tempus/src/Tempus_StepperRKModifierXDefault.hpp index 3307bf26aed0..b40591b4daff 100644 --- a/packages/tempus/src/Tempus_StepperRKModifierXDefault.hpp +++ b/packages/tempus/src/Tempus_StepperRKModifierXDefault.hpp @@ -10,7 +10,6 @@ #define Tempus_StepperRKModifierX_hpp #include "Tempus_config.hpp" -#include "Tempus_SolutionHistory.hpp" #include "Tempus_StepperRKModifierXBase.hpp" @@ -20,6 +19,9 @@ namespace Tempus { * * The default provides no-op functionality for ModifierX. * See StepperRKModifierXBase for details on the algorithm. + * + * Applications can copy this implementation, rename, implement their + * action, and set on the stepper to get app-specific functionality. */ template class StepperRKModifierXDefault @@ -37,6 +39,7 @@ class StepperRKModifierXDefault virtual void modify( Teuchos::RCP > /* x */, const Scalar /* time */, const Scalar /* dt */, + const int /* stageNumber */, const typename StepperRKModifierXBase::MODIFIER_TYPE modType) { switch(modType) { @@ -45,7 +48,7 @@ class StepperRKModifierXDefault case StepperRKModifierXBase::X_BEFORE_SOLVE: case StepperRKModifierXBase::X_AFTER_SOLVE: case StepperRKModifierXBase::X_BEFORE_EXPLICIT_EVAL: - case StepperRKModifierXBase::XDOT_END_STAGE: + case StepperRKModifierXBase::X_END_STAGE: case StepperRKModifierXBase::X_END_STEP: { // No-op. diff --git a/packages/tempus/src/Tempus_StepperRKObserverDefault.hpp b/packages/tempus/src/Tempus_StepperRKObserverDefault.hpp index 81533461428c..f6aac518e0f3 100644 --- a/packages/tempus/src/Tempus_StepperRKObserverDefault.hpp +++ b/packages/tempus/src/Tempus_StepperRKObserverDefault.hpp @@ -10,9 +10,12 @@ #define Tempus_StepperRKObserverDefault_hpp #include "Tempus_config.hpp" -#include "Tempus_SolutionHistory.hpp" #include "Tempus_StepperRKObserverBase.hpp" +// Applications can uncomment this include in their implementation, +// if they need access to the stepper methods. +//#include "Tempus_StepperRKBase.hpp" + namespace Tempus { @@ -20,6 +23,9 @@ namespace Tempus { * * The default observer provides no-op functionality for the observer. * See StepperRKObserverBase for details on the algorithm. + * + * Applications can copy this implementation, rename, implement their + * action, and set on the stepper to get app-specific functionality. */ template class StepperRKObserverDefault @@ -36,8 +42,8 @@ class StepperRKObserverDefault /// Observe RK Stepper at end of takeStep. virtual void observe( Teuchos::RCP > /* sh */, - Teuchos::RCP > /* stepper */, - const typename StepperRKAppAction::ACTION_LOCATION actLoc) const + Teuchos::RCP > /* stepper */, + const typename StepperRKAppAction::ACTION_LOCATION actLoc) { switch(actLoc) { case StepperRKAppAction::BEGIN_STEP: diff --git a/packages/tempus/src/Tempus_StepperSubcyclingAppAction.hpp b/packages/tempus/src/Tempus_StepperSubcyclingAppAction.hpp index 30a8b4b8afad..49791bb121a0 100644 --- a/packages/tempus/src/Tempus_StepperSubcyclingAppAction.hpp +++ b/packages/tempus/src/Tempus_StepperSubcyclingAppAction.hpp @@ -11,7 +11,6 @@ #include "Tempus_config.hpp" #include "Tempus_SolutionHistory.hpp" -#include "Tempus_StepperSubcycling.hpp" namespace Tempus { diff --git a/packages/tempus/src/Tempus_StepperSubcyclingModifierDefault.hpp b/packages/tempus/src/Tempus_StepperSubcyclingModifierDefault.hpp index 9d3087adf8fd..53eaef8d4280 100644 --- a/packages/tempus/src/Tempus_StepperSubcyclingModifierDefault.hpp +++ b/packages/tempus/src/Tempus_StepperSubcyclingModifierDefault.hpp @@ -10,9 +10,12 @@ #define Tempus_StepperSubcyclingModifierDefault_hpp #include "Tempus_config.hpp" -#include "Tempus_SolutionHistory.hpp" #include "Tempus_StepperSubcyclingModifierBase.hpp" +// Applications can uncomment this include in their implementation, +// if they need access to the stepper methods. +//#include "Tempus_StepperSubcycling.hpp" + namespace Tempus { @@ -20,6 +23,9 @@ namespace Tempus { * * The default modifier provides no-op functionality for the modifier. * See StepperSubcyclingModifierBase for details on the algorithm. + * + * Applications can copy this implementation, rename, implement their + * action, and set on the stepper to get app-specific functionality. */ template class StepperSubcyclingModifierDefault diff --git a/packages/tempus/src/Tempus_StepperSubcyclingModifierXBase.hpp b/packages/tempus/src/Tempus_StepperSubcyclingModifierXBase.hpp index 33b6b720dba5..a0d574843199 100644 --- a/packages/tempus/src/Tempus_StepperSubcyclingModifierXBase.hpp +++ b/packages/tempus/src/Tempus_StepperSubcyclingModifierXBase.hpp @@ -82,7 +82,10 @@ class StepperSubcyclingModifierXBase case StepperSubcyclingAppAction::END_STEP: { modType = XDOT_END_STEP; - x = stepper->getStepperXDot(workingState); + if (workingState->getXDot() != Teuchos::null) + x = workingState->getXDot(); + else + x = stepper->getStepperXDot(); break; } default: diff --git a/packages/tempus/src/Tempus_StepperSubcyclingModifierXDefault.hpp b/packages/tempus/src/Tempus_StepperSubcyclingModifierXDefault.hpp index bc14ef51360e..387cb903e5d9 100644 --- a/packages/tempus/src/Tempus_StepperSubcyclingModifierXDefault.hpp +++ b/packages/tempus/src/Tempus_StepperSubcyclingModifierXDefault.hpp @@ -10,7 +10,6 @@ #define Tempus_StepperSubcyclingModifierX_hpp #include "Tempus_config.hpp" -#include "Tempus_SolutionHistory.hpp" #include "Tempus_StepperSubcyclingModifierXBase.hpp" @@ -20,6 +19,9 @@ namespace Tempus { * * The default provides no-op functionality for ModifierX. * See StepperSubcyclingModifierXBase for details on the algorithm. + * + * Applications can copy this implementation, rename, implement their + * action, and set on the stepper to get app-specific functionality. */ template class StepperSubcyclingModifierXDefault diff --git a/packages/tempus/src/Tempus_StepperSubcyclingObserverDefault.hpp b/packages/tempus/src/Tempus_StepperSubcyclingObserverDefault.hpp index 341de790f33a..75aac078bab3 100644 --- a/packages/tempus/src/Tempus_StepperSubcyclingObserverDefault.hpp +++ b/packages/tempus/src/Tempus_StepperSubcyclingObserverDefault.hpp @@ -10,9 +10,12 @@ #define Tempus_StepperSubcyclingObserverDefault_hpp #include "Tempus_config.hpp" -#include "Tempus_SolutionHistory.hpp" #include "Tempus_StepperSubcyclingObserverBase.hpp" +// Applications can uncomment this include in their implementation, +// if they need access to the stepper methods. +//#include "Tempus_StepperSubcycling.hpp" + namespace Tempus { @@ -20,6 +23,9 @@ namespace Tempus { * * The default observer provides no-op functionality for the observer. * See StepperSubcyclingObserverBase for details on the algorithm. + * + * Applications can copy this implementation, rename, implement their + * action, and set on the stepper to get app-specific functionality. */ template class StepperSubcyclingObserverDefault diff --git a/packages/tempus/src/Tempus_StepperTrapezoidal_decl.hpp b/packages/tempus/src/Tempus_StepperTrapezoidal_decl.hpp index cd50372c0acc..5a19f7d44e83 100644 --- a/packages/tempus/src/Tempus_StepperTrapezoidal_decl.hpp +++ b/packages/tempus/src/Tempus_StepperTrapezoidal_decl.hpp @@ -27,7 +27,7 @@ namespace Tempus { * - Solve \f$\mathcal{F}_n(\dot{x}=(x_n-x_{n-1})/(\Delta t_n/2) - \dot{x}_{n-1}, x_n, t_n)=0\f$ for \f$x_n\f$ * - \f$\dot{x}_n \leftarrow (x_n-x_{n-1})/(\Delta t_n/2) - \dot{x}_{n-1}\f$ * - * The First-Step-As-Last (FSAL) principle is required for the Trapezoidal + * The First-Same-As-Last (FSAL) principle is required for the Trapezoidal * Stepper (i.e., useFSAL=true)! There are at least two ways around this, * but are not implemented. * - Do a solve for xDotOld, xDot_{n-1}, at each time step as for the diff --git a/packages/tempus/src/Tempus_StepperTrapezoidal_impl.hpp b/packages/tempus/src/Tempus_StepperTrapezoidal_impl.hpp index 8d7a1cfd219e..9225c7f73ba5 100644 --- a/packages/tempus/src/Tempus_StepperTrapezoidal_impl.hpp +++ b/packages/tempus/src/Tempus_StepperTrapezoidal_impl.hpp @@ -98,11 +98,13 @@ void StepperTrapezoidal::setInitialConditions ( // Check if we need Stepper storage for xDot if (initialState->getXDot() == Teuchos::null) this->setStepperXDot(initialState->getX()->clone_v()); + else + this->setStepperXDot(initialState->getXDot()); StepperImplicit::setInitialConditions(solutionHistory); TEUCHOS_TEST_FOR_EXCEPTION( !(this->getUseFSAL()), std::logic_error, - "Error - The First-Step-As-Last (FSAL) principle is required\n" + "Error - The First-Same-As-Last (FSAL) principle is required\n" " for the Trapezoidal Stepper (i.e., useFSAL=true)!\n"); // There are at least two ways around this, but are not implemented. // - Do a solve for xDotOld, xDot_{n-1}, at each time step as for the @@ -139,7 +141,9 @@ void StepperTrapezoidal::takeStep( RCP > xOld = currentState->getX(); RCP > xDotOld = currentState->getXDot(); RCP > x = workingState->getX(); - RCP > xDot = workingState->getXDot(); + if (workingState->getXDot() != Teuchos::null) + this->setStepperXDot(workingState->getXDot()); + RCP > xDot = this->getStepperXDot(); const Scalar time = workingState->getTime(); const Scalar dt = workingState->getTimeStep(); diff --git a/packages/tempus/src/Tempus_Stepper_decl.hpp b/packages/tempus/src/Tempus_Stepper_decl.hpp index 303f56452094..fab9070181af 100644 --- a/packages/tempus/src/Tempus_Stepper_decl.hpp +++ b/packages/tempus/src/Tempus_Stepper_decl.hpp @@ -149,13 +149,14 @@ class Stepper virtual OrderODE getOrderODE() const = 0; - /// Get x from SolutionState or Stepper storage. - virtual Teuchos::RCP > getStepperX( - Teuchos::RCP > state); + /// Get Stepper x. + virtual Teuchos::RCP > getStepperX(); - /// Get xDot from SolutionState or Stepper storage. - virtual Teuchos::RCP > getStepperXDot( - Teuchos::RCP > state); + /// Get Stepper xDot. + virtual Teuchos::RCP > getStepperXDot(); + + /// Get Stepper xDotDot. + virtual Teuchos::RCP > getStepperXDotDot(); /// Get xDotDot from SolutionState or Stepper storage. virtual Teuchos::RCP > getStepperXDotDot( @@ -185,10 +186,10 @@ class Stepper private: - std::string stepperType_; //< Name of stepper type - bool useFSAL_ = false; //< Use First-Step-As-Last (FSAL) principle - std::string ICConsistency_ = std::string("None"); //< Type of consistency to apply to ICs. - bool ICConsistencyCheck_ = true; //< Check if the initial condition is consistent + std::string stepperType_; ///< Name of stepper type + bool useFSAL_ = false; ///< Use First-Same-As-Last (FSAL) principle + std::string ICConsistency_ = std::string("None"); ///< Type of consistency to apply to ICs. + bool ICConsistencyCheck_ = true; ///< Check if the initial condition is consistent // RCP to SolutionState memory or Stepper temporary memory (if needed). Teuchos::RCP > stepperX_; @@ -209,7 +210,7 @@ class Stepper virtual void setStepperXDotDot(Teuchos::RCP > xDotDot) { stepperXDotDot_ = xDotDot; } - bool isInitialized_ = false; //< True if stepper's member data is initialized. + bool isInitialized_ = false; ///< True if stepper's member data is initialized. }; @@ -236,7 +237,7 @@ class Stepper outArgs.supports(MEB::OUT_ARG_f); TEUCHOS_TEST_FOR_EXCEPTION( supports == false, std::logic_error, - model->description() << "can not support an explicit ODE with\n" + model->description() << " can not support an explicit ODE with\n" << " IN_ARG_x = " << inArgs.supports(MEB::IN_ARG_x) << "\n" << " OUT_ARG_f = " << outArgs.supports(MEB::OUT_ARG_f) << "\n" << "Explicit ODE requires:\n" diff --git a/packages/tempus/src/Tempus_Stepper_impl.hpp b/packages/tempus/src/Tempus_Stepper_impl.hpp index c8593fe3e92d..a02a2cf23f4e 100644 --- a/packages/tempus/src/Tempus_Stepper_impl.hpp +++ b/packages/tempus/src/Tempus_Stepper_impl.hpp @@ -20,7 +20,7 @@ void getValidParametersBasic( pl->set("Stepper Type", stepperType); pl->set("Use FSAL", false, - "The First-Step-As-Last (FSAL) principle is the situation where the\n" + "The First-Same-As-Last (FSAL) principle is the situation where the\n" "last function evaluation, f(x^{n-1},t^{n-1}) [a.k.a. xDot^{n-1}],\n" "can be used for the first function evaluation, f(x^n,t^n)\n" "[a.k.a. xDot^n]. For RK methods, this applies to the stages.\n" @@ -172,15 +172,10 @@ void Stepper::checkInitialized() } - template Teuchos::RCP > -Stepper::getStepperX(Teuchos::RCP > state) +Stepper::getStepperX() { - if (state->getX() != Teuchos::null) stepperX_ = state->getX(); - // Else use temporary storage stepperX_ which should have been set in - // setInitialConditions(). - TEUCHOS_TEST_FOR_EXCEPTION( stepperX_ == Teuchos::null, std::logic_error, "Error - stepperX_ has not been set in setInitialConditions() or\n" " can not be set from the state!\n"); @@ -190,19 +185,27 @@ Stepper::getStepperX(Teuchos::RCP > state) template Teuchos::RCP > -Stepper::getStepperXDot(Teuchos::RCP > state) +Stepper::getStepperXDot() { - if (state->getXDot() != Teuchos::null) stepperXDot_ = state->getXDot(); - // Else use temporary storage stepperXDot_ which should have been set in - // setInitialConditions(). - TEUCHOS_TEST_FOR_EXCEPTION( stepperXDot_ == Teuchos::null, std::logic_error, - "Error - stepperXDot_ has not set in setInitialConditions() or\n" + "Error - stepperXDot_ has not been set in setInitialConditions() or\n" " can not be set from the state!\n"); return stepperXDot_; } +template +Teuchos::RCP > +Stepper::getStepperXDotDot() +{ + TEUCHOS_TEST_FOR_EXCEPTION( stepperXDotDot_==Teuchos::null, std::logic_error, + "Error - stepperXDotDot_ has not been set in setInitialConditions() or\n" + " can not be set from the state!\n"); + + return stepperXDotDot_; +} + +// Need to deprecate. template Teuchos::RCP > Stepper::getStepperXDotDot(Teuchos::RCP > state) @@ -212,7 +215,7 @@ Stepper::getStepperXDotDot(Teuchos::RCP > state) // setInitialConditions(). TEUCHOS_TEST_FOR_EXCEPTION( stepperXDotDot_==Teuchos::null, std::logic_error, - "Error - stepperXDotDot_ has not set in setInitialConditions() or\n" + "Error - stepperXDotDot_ has not been set in setInitialConditions() or\n" " can not be set from the state!\n"); return stepperXDotDot_; diff --git a/packages/tempus/src/Tempus_WrapperModelEvaluatorPairPartIMEX_Basic_decl.hpp b/packages/tempus/src/Tempus_WrapperModelEvaluatorPairPartIMEX_Basic_decl.hpp index 1732dd416a43..e521c0020abd 100644 --- a/packages/tempus/src/Tempus_WrapperModelEvaluatorPairPartIMEX_Basic_decl.hpp +++ b/packages/tempus/src/Tempus_WrapperModelEvaluatorPairPartIMEX_Basic_decl.hpp @@ -184,8 +184,8 @@ class WrapperModelEvaluatorPairPartIMEX_Basic Thyra::ModelEvaluatorBase::OutArgs wrapperImplicitOutArgs_; int numExplicitOnlyBlocks_; - int parameterIndex_; //< implicit parameter index for explicit-only vector - bool useImplicitModel_; //< if true, use implicitModel_ else explicitModel_ + int parameterIndex_; ///< implicit parameter index for explicit-only vector + bool useImplicitModel_; ///< if true, use implicitModel_ else explicitModel_ }; } // namespace Tempus diff --git a/packages/tempus/test/ExplicitRK/Tempus_ExplicitRKTest.cpp b/packages/tempus/test/ExplicitRK/Tempus_ExplicitRKTest.cpp index 0fc77e50c7ee..0cde2cc098b2 100644 --- a/packages/tempus/test/ExplicitRK/Tempus_ExplicitRKTest.cpp +++ b/packages/tempus/test/ExplicitRK/Tempus_ExplicitRKTest.cpp @@ -250,8 +250,8 @@ TEUCHOS_UNIT_TEST(ExplicitRK, SinCos) RKMethods.push_back("General ERK Embedded"); RKMethods.push_back("SSPERK22"); RKMethods.push_back("SSPERK33"); - //RKMethods.push_back("SSPERK54"); // slope = 3.94129 - RKMethods.push_back("RK2"); // slope = 3.94129 + RKMethods.push_back("SSPERK54"); // slope = 3.94129 + RKMethods.push_back("RK2"); std::vector RKMethodErrors; RKMethodErrors.push_back(8.33251e-07); @@ -271,8 +271,8 @@ TEUCHOS_UNIT_TEST(ExplicitRK, SinCos) RKMethodErrors.push_back(4.16603e-05); RKMethodErrors.push_back(0.00166645); RKMethodErrors.push_back(4.16603e-05); - //RKMethodErrors.push_back(3.85613e-07); // SSPERK54 - RKMethodErrors.push_back(0.00166644); // RK2 + RKMethodErrors.push_back(3.85613e-07); // SSPERK54 + RKMethodErrors.push_back(0.00166644); TEST_ASSERT(RKMethods.size() == RKMethodErrors.size() ); @@ -397,6 +397,7 @@ TEUCHOS_UNIT_TEST(ExplicitRK, SinCos) double order_tol = 0.01; if (RKMethods[m] == "Merson 4(5) Pair") order_tol = 0.04; + if (RKMethods[m] == "SSPERK54") order_tol = 0.06; TEST_FLOATING_EQUALITY( xSlope, order, order_tol ); TEST_FLOATING_EQUALITY( xErrorNorm[0], RKMethodErrors[m], 1.0e-4 ); diff --git a/packages/tempus/test/TestModels/DahlquistTestModel.cpp b/packages/tempus/test/TestModels/DahlquistTestModel.cpp new file mode 100644 index 000000000000..82c817c932cc --- /dev/null +++ b/packages/tempus/test/TestModels/DahlquistTestModel.cpp @@ -0,0 +1,19 @@ +// @HEADER +// **************************************************************************** +// Tempus: Copyright (2017) Sandia Corporation +// +// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) +// **************************************************************************** +// @HEADER + +#include "Tempus_ExplicitTemplateInstantiation.hpp" + +#ifdef HAVE_TEMPUS_EXPLICIT_INSTANTIATION +#include "DahlquistTestModel.hpp" +#include "DahlquistTestModel_impl.hpp" + +namespace Tempus_Test { + TEMPUS_INSTANTIATE_TEMPLATE_CLASS(DahlquistTestModel) +} + +#endif diff --git a/packages/tempus/test/TestModels/DahlquistTestModel_decl.hpp b/packages/tempus/test/TestModels/DahlquistTestModel_decl.hpp new file mode 100644 index 000000000000..89cd44f6e216 --- /dev/null +++ b/packages/tempus/test/TestModels/DahlquistTestModel_decl.hpp @@ -0,0 +1,93 @@ +// @HEADER +// **************************************************************************** +// Tempus: Copyright (2017) Sandia Corporation +// +// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) +// **************************************************************************** +// @HEADER + +#ifndef TEMPUS_TEST_DAHLQUIST_TEST_MODEL_DECL_HPP +#define TEMPUS_TEST_DAHLQUIST_TEST_MODEL_DECL_HPP + +#include "Thyra_ModelEvaluator.hpp" // Interface +#include "Thyra_StateFuncModelEvaluatorBase.hpp" // Implementation + + +namespace Tempus_Test { + +/** \brief The classic Dahlquist Test Problem. + * + * This is the canonical Dahlquist test equation + * \f[ + * \mathbf{\dot{x}} = \lambda \mathbf{x}. + * \f] + * where \f$\lambda \in \mathbf{C}\f$ with the initial condition + * \f$\mathbf{x}(0) = 1\f$. The exact solution is + * \f[ + * \mathbf{x}(t) = \exp{\lambda t}. + * \f] + * When \f$\mathbf{R}(\lambda) < 0\f$, \f$ \mathbf{x} \rightarrow 0\f$ as + * \f$t \rightarrow \infty\f$. Numerical methods that exhibit this + * property are said to be A-stable. + */ + +template +class DahlquistTestModel + : public Thyra::StateFuncModelEvaluatorBase +{ + public: + + // Constructor + DahlquistTestModel(Scalar lambda = Scalar(-1.0)); + + /// Default destructor + ~DahlquistTestModel() = default; + + /// Exact solution + Thyra::ModelEvaluatorBase::InArgs getExactSolution(double t) const; + + /** \name Public functions overridden from ModelEvaluator. */ + //@{ + Teuchos::RCP > get_x_space() const; + Teuchos::RCP > get_f_space() const; + Thyra::ModelEvaluatorBase::InArgs getNominalValues() const; + //Teuchos::RCP > create_W() const; + //Teuchos::RCP > create_W_op() const; + //Teuchos::RCP > get_W_factory() const; + Thyra::ModelEvaluatorBase::InArgs createInArgs() const; + + //Teuchos::RCP > get_p_space(int l) const; + //Teuchos::RCP > get_p_names(int l) const; + //Teuchos::RCP > get_g_space(int j) const; + + //@} + +private: + + /** \name Private functions overridden from ModelEvaluatorDefaultBase. */ + //@{ + Thyra::ModelEvaluatorBase::OutArgs createOutArgsImpl() const; + void evalModelImpl( + const Thyra::ModelEvaluatorBase::InArgs &inArgs_bar, + const Thyra::ModelEvaluatorBase::OutArgs &outArgs_bar + ) const; + //@} + +private: + Scalar lambda_; + mutable bool isInitialized_; + mutable Thyra::ModelEvaluatorBase::InArgs inArgs_; + mutable Thyra::ModelEvaluatorBase::OutArgs outArgs_; + mutable Thyra::ModelEvaluatorBase::InArgs nominalValues_; + Teuchos::RCP > x_space_; + Teuchos::RCP > f_space_; + //Teuchos::RCP > p_space_; + //Teuchos::RCP > g_space_; + //Teuchos::RCP > DxDp_space_; + + Scalar xIC_; ///< Initial condition for x. +}; + + +} // namespace Tempus_Test +#endif // TEMPUS_TEST_DAHLQUIST_TEST_MODEL_DECL_HPP diff --git a/packages/tempus/test/TestModels/DahlquistTestModel_impl.hpp b/packages/tempus/test/TestModels/DahlquistTestModel_impl.hpp new file mode 100644 index 000000000000..926a054ba35d --- /dev/null +++ b/packages/tempus/test/TestModels/DahlquistTestModel_impl.hpp @@ -0,0 +1,172 @@ +// @HEADER +// **************************************************************************** +// Tempus: Copyright (2017) Sandia Corporation +// +// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) +// **************************************************************************** +// @HEADER + +#ifndef TEMPUS_TEST_DAHLQUIST_TEST_MODEL_IMPL_HPP +#define TEMPUS_TEST_DAHLQUIST_TEST_MODEL_IMPL_HPP + +#include "Thyra_DefaultSpmdVectorSpace.hpp" +#include "Thyra_DetachedVectorView.hpp" +//#include "Thyra_DetachedMultiVectorView.hpp" +//#include "Thyra_DefaultSerialDenseLinearOpWithSolveFactory.hpp" +//#include "Thyra_DefaultMultiVectorLinearOpWithSolve.hpp" +//#include "Thyra_DefaultLinearOpSource.hpp" +//#include "Thyra_VectorStdOps.hpp" +//#include "Thyra_MultiVectorStdOps.hpp" +//#include "Thyra_DefaultMultiVectorProductVector.hpp" + +//#include + + +namespace Tempus_Test { + +template +DahlquistTestModel:: +DahlquistTestModel(Scalar lambda) + : lambda_(lambda) +{ + isInitialized_ = false; + int dim = 1; + Scalar xIC_ = Scalar(1.0); + + // Create x_space and f_space + x_space_ = Thyra::defaultSpmdVectorSpace(dim); + f_space_ = Thyra::defaultSpmdVectorSpace(dim); + + using Teuchos::RCP; + typedef Thyra::ModelEvaluatorBase MEB; + { + // Set up prototypical InArgs + MEB::InArgsSetup inArgs; + inArgs.setModelEvalDescription(this->description()); + inArgs.setSupports( MEB::IN_ARG_t ); + inArgs.setSupports( MEB::IN_ARG_x ); + inArgs.setSupports( MEB::IN_ARG_x_dot ); + inArgs_ = inArgs; + } + + { + // Set up prototypical OutArgs + MEB::OutArgsSetup outArgs; + outArgs.setModelEvalDescription(this->description()); + outArgs.setSupports( MEB::OUT_ARG_f ); + outArgs_ = outArgs; + } + + // Set up nominal values (initial conditions) + nominalValues_ = inArgs_; + { + nominalValues_.set_t(Scalar(0.0)); + const RCP > x_ic = createMember(x_space_); + { // scope to delete DetachedVectorView + Thyra::DetachedVectorView x_ic_view( *x_ic ); + x_ic_view[0] = xIC_; + } + nominalValues_.set_x(x_ic); + } + isInitialized_ = true; +} + + +template +Thyra::ModelEvaluatorBase::InArgs +DahlquistTestModel:: +getExactSolution(double t) const +{ + Thyra::ModelEvaluatorBase::InArgs inArgs = inArgs_; + double exact_t = t; + inArgs.set_t(exact_t); + Teuchos::RCP > exact_x = createMember(x_space_); + { // scope to delete DetachedVectorView + Thyra::DetachedVectorView exact_x_view(*exact_x); + exact_x_view[0] = exp(lambda_*exact_t); + } + inArgs.set_x(exact_x); + return inArgs; +} + + +template +Teuchos::RCP > +DahlquistTestModel:: +get_x_space() const +{ + return x_space_; +} + + +template +Teuchos::RCP > +DahlquistTestModel:: +get_f_space() const +{ + return f_space_; +} + + +template +Thyra::ModelEvaluatorBase::InArgs +DahlquistTestModel:: +getNominalValues() const +{ + return nominalValues_; +} + + +template +Thyra::ModelEvaluatorBase::InArgs +DahlquistTestModel:: +createInArgs() const +{ + return inArgs_; +} + + +template +Thyra::ModelEvaluatorBase::OutArgs +DahlquistTestModel:: +createOutArgsImpl() const +{ + return outArgs_; +} + + +template +void +DahlquistTestModel:: +evalModelImpl( + const Thyra::ModelEvaluatorBase::InArgs &inArgs, + const Thyra::ModelEvaluatorBase::OutArgs &outArgs + ) const +{ + using Teuchos::RCP; + using Thyra::VectorBase; + + const RCP > x_in = inArgs.get_x().assert_not_null(); + Thyra::ConstDetachedVectorView x_in_view( *x_in ); + const RCP > f_out = outArgs.get_f(); + + if (inArgs.get_x_dot().is_null()) { + + // Evaluate the Explicit ODE f(x,t) [= 0] + if (!is_null(f_out)) { + Thyra::DetachedVectorView f_out_view( *f_out ); + f_out_view[0] = lambda_*x_in_view[0]; + } else { + TEUCHOS_TEST_FOR_EXCEPTION( true, std::logic_error, + "Error -- Dahlquist Test Model requires f_out!\n"); + } + } else { + TEUCHOS_TEST_FOR_EXCEPTION( true, std::logic_error, + "Error -- Dahlquist Test Model only setup for explicit ODE!\n"); + } + +} + + +} // namespace Tempus_Test +#endif // TEMPUS_TEST_DAHLQUIST_TEST_MODEL_IMPL_HPP diff --git a/packages/tempus/unit_test/CMakeLists.txt b/packages/tempus/unit_test/CMakeLists.txt index 8b62fc57b49c..42ef67912780 100644 --- a/packages/tempus/unit_test/CMakeLists.txt +++ b/packages/tempus/unit_test/CMakeLists.txt @@ -372,3 +372,10 @@ TRIBITS_ADD_EXECUTABLE_AND_TEST( NUM_MPI_PROCS 1 ) +TRIBITS_ADD_EXECUTABLE_AND_TEST( + UnitTest_ERK + SOURCES Tempus_UnitTest_ERK.cpp ${TEUCHOS_STD_UNIT_TEST_MAIN} + TESTONLYLIBS tempus_test_models + NUM_MPI_PROCS 1 + ) + diff --git a/packages/tempus/unit_test/Tempus_UnitTest_BackwardEuler.cpp b/packages/tempus/unit_test/Tempus_UnitTest_BackwardEuler.cpp index e72a7bd43f51..73e2edd6d974 100644 --- a/packages/tempus/unit_test/Tempus_UnitTest_BackwardEuler.cpp +++ b/packages/tempus/unit_test/Tempus_UnitTest_BackwardEuler.cpp @@ -16,9 +16,11 @@ #include "Tempus_StepperFactory.hpp" #include "Tempus_SolutionHistory.hpp" #include "Tempus_StepperBackwardEulerModifierBase.hpp" -#include "Tempus_StepperBackwardEulerObserverBase.hpp" #include "Tempus_StepperBackwardEulerModifierXBase.hpp" +#include "Tempus_StepperBackwardEulerObserverBase.hpp" #include "Tempus_StepperBackwardEulerModifierDefault.hpp" +#include "Tempus_StepperBackwardEulerModifierXDefault.hpp" +#include "Tempus_StepperBackwardEulerObserverDefault.hpp" #include "Tempus_UnitTest_Utils.hpp" #include "../TestModels/SinCosModel.hpp" @@ -55,7 +57,10 @@ TEUCHOS_UNIT_TEST(BackwardEuler, Default_Construction) // Default values for construction. - auto solver = rcp(new Thyra::NOXNonlinearSolver()); + auto modifier = rcp(new Tempus::StepperBackwardEulerModifierDefault()); + auto modifierX = rcp(new Tempus::StepperBackwardEulerModifierXDefault()); + auto observer = rcp(new Tempus::StepperBackwardEulerObserverDefault()); + auto solver = rcp(new Thyra::NOXNonlinearSolver()); solver->setParameterList(Tempus::defaultSolverParameters()); auto predictorStepper = rcp(new Tempus::StepperForwardEuler()); @@ -73,8 +78,9 @@ TEUCHOS_UNIT_TEST(BackwardEuler, Default_Construction) auto obs = rcp(new Tempus::StepperBackwardEulerObserver()); stepper->setObserver(obs); stepper->initialize(); TEUCHOS_TEST_FOR_EXCEPT(!stepper->isInitialized()); #endif - auto modifier = rcp(new Tempus::StepperBackwardEulerModifierDefault()); - stepper->setAppAction(modifier); + stepper->setAppAction(modifier); stepper->initialize(); TEUCHOS_TEST_FOR_EXCEPT(!stepper->isInitialized()); + stepper->setAppAction(modifierX); stepper->initialize(); TEUCHOS_TEST_FOR_EXCEPT(!stepper->isInitialized()); + stepper->setAppAction(observer); stepper->initialize(); TEUCHOS_TEST_FOR_EXCEPT(!stepper->isInitialized()); stepper->setSolver(solver); stepper->initialize(); TEUCHOS_TEST_FOR_EXCEPT(!stepper->isInitialized()); stepper->setPredictor(predictorStepper); stepper->initialize(); TEUCHOS_TEST_FOR_EXCEPT(!stepper->isInitialized()); stepper->setUseFSAL(useFSAL); stepper->initialize(); TEUCHOS_TEST_FOR_EXCEPT(!stepper->isInitialized()); @@ -210,11 +216,11 @@ TEUCHOS_UNIT_TEST(BackwardEuler, AppAction_Modifier) // Testing that values can be set through the Modifier. auto x = solutionHistory->getCurrentState()->getX(); - TEST_FLOATING_EQUALITY(modifier->testCurrentValue, get_ele(*(x), 0), 1.0e-15); + TEST_FLOATING_EQUALITY(modifier->testCurrentValue, get_ele(*(x), 0), 1.0e-14); x = solutionHistory->getWorkingState()->getX(); - TEST_FLOATING_EQUALITY(modifier->testWorkingValue, get_ele(*(x), 0), 1.0e-15); + TEST_FLOATING_EQUALITY(modifier->testWorkingValue, get_ele(*(x), 0), 1.0e-14); auto Dt = solutionHistory->getWorkingState()->getTimeStep(); - TEST_FLOATING_EQUALITY(modifier->testDt, Dt, 1.0e-15); + TEST_FLOATING_EQUALITY(modifier->testDt, Dt, 1.0e-14); TEST_COMPARE(modifier->testType, ==, "Backward Euler - Modifier"); @@ -318,10 +324,10 @@ TEUCHOS_UNIT_TEST(BackwardEuler, AppAction_Observer) // Testing that values can be observed through the observer. auto x = solutionHistory->getCurrentState()->getX(); - TEST_FLOATING_EQUALITY(observer->testCurrentValue, get_ele(*(x), 0), 1.0e-15); + TEST_FLOATING_EQUALITY(observer->testCurrentValue, get_ele(*(x), 0), 1.0e-14); x = solutionHistory->getWorkingState()->getX(); - TEST_FLOATING_EQUALITY(observer->testWorkingValue, get_ele(*(x), 0), 1.0e-15); - TEST_FLOATING_EQUALITY(observer->testDt, dt, 1.0e-15); + TEST_FLOATING_EQUALITY(observer->testWorkingValue, get_ele(*(x), 0), 1.0e-14); + TEST_FLOATING_EQUALITY(observer->testDt, dt, 1.0e-14); TEST_COMPARE(observer->testType, ==, "Backward Euler"); } @@ -422,15 +428,17 @@ TEUCHOS_UNIT_TEST(BackwardEuler, AppAction_ModifierX) // Testing that values can be set through the Modifier. auto x = solutionHistory->getCurrentState()->getX(); - TEST_FLOATING_EQUALITY(modifierX->testX, get_ele(*(x), 0), 1.0e-15); + TEST_FLOATING_EQUALITY(modifierX->testX, get_ele(*(x), 0), 1.0e-14); // Temporary memory for xDot is not guarranteed to exist outside the Stepper. - auto xDot = stepper->getStepperXDot(solutionHistory->getWorkingState()); - TEST_FLOATING_EQUALITY(modifierX->testXDot, get_ele(*(xDot), 0),1.0e-15); + auto xDot = solutionHistory->getWorkingState()->getXDot(); + if (xDot == Teuchos::null) xDot = stepper->getStepperXDot(); + + TEST_FLOATING_EQUALITY(modifierX->testXDot, get_ele(*(xDot), 0),1.0e-14); auto Dt = solutionHistory->getWorkingState()->getTimeStep(); - TEST_FLOATING_EQUALITY(modifierX->testDt, Dt, 1.0e-15); + TEST_FLOATING_EQUALITY(modifierX->testDt, Dt, 1.0e-14); auto time = solutionHistory->getWorkingState()->getTime(); - TEST_FLOATING_EQUALITY(modifierX->testTime, time, 1.0e-15); + TEST_FLOATING_EQUALITY(modifierX->testTime, time, 1.0e-14); } diff --git a/packages/tempus/unit_test/Tempus_UnitTest_DIRK_General.cpp b/packages/tempus/unit_test/Tempus_UnitTest_DIRK_General.cpp index efd6b6d4629c..2440d0a88893 100644 --- a/packages/tempus/unit_test/Tempus_UnitTest_DIRK_General.cpp +++ b/packages/tempus/unit_test/Tempus_UnitTest_DIRK_General.cpp @@ -50,8 +50,10 @@ TEUCHOS_UNIT_TEST(DIRK_General, Default_Construction) // Default values for construction. - auto modifier = rcp(new Tempus::StepperRKModifierDefault()); - auto solver = rcp(new Thyra::NOXNonlinearSolver()); + auto modifier = rcp(new Tempus::StepperRKModifierDefault()); + auto modifierX = rcp(new Tempus::StepperRKModifierXDefault()); + auto observer = rcp(new Tempus::StepperRKObserverDefault()); + auto solver = rcp(new Thyra::NOXNonlinearSolver()); solver->setParameterList(Tempus::defaultSolverParameters()); bool useFSAL = stepper->getUseFSALDefault(); @@ -87,6 +89,8 @@ TEUCHOS_UNIT_TEST(DIRK_General, Default_Construction) stepper->setObserver(obs); stepper->initialize(); TEUCHOS_TEST_FOR_EXCEPT(!stepper->isInitialized()); #endif stepper->setAppAction(modifier); stepper->initialize(); TEUCHOS_TEST_FOR_EXCEPT(!stepper->isInitialized()); + stepper->setAppAction(modifierX); stepper->initialize(); TEUCHOS_TEST_FOR_EXCEPT(!stepper->isInitialized()); + stepper->setAppAction(observer); stepper->initialize(); TEUCHOS_TEST_FOR_EXCEPT(!stepper->isInitialized()); stepper->setSolver(solver); stepper->initialize(); TEUCHOS_TEST_FOR_EXCEPT(!stepper->isInitialized()); stepper->setUseFSAL(useFSAL); stepper->initialize(); TEUCHOS_TEST_FOR_EXCEPT(!stepper->isInitialized()); stepper->setICConsistency(ICConsistency); stepper->initialize(); TEUCHOS_TEST_FOR_EXCEPT(!stepper->isInitialized()); @@ -102,13 +106,13 @@ TEUCHOS_UNIT_TEST(DIRK_General, Default_Construction) stepper = rcp(new Tempus::StepperDIRK_General( model, obs, solver, useFSAL, ICConsistency, ICConsistencyCheck, useEmbedded, zeroInitialGuess, - A, b, c, order, order, order, bstar)); + A, b, c, order, order, order,bstar)); TEUCHOS_TEST_FOR_EXCEPT(!stepper->isInitialized()); #endif stepper = rcp(new Tempus::StepperDIRK_General( model, solver, useFSAL, ICConsistency, ICConsistencyCheck, useEmbedded, zeroInitialGuess, modifier, - A, b, c, order, order, order, bstar)); + A, b, c, order, order, order,bstar)); TEUCHOS_TEST_FOR_EXCEPT(!stepper->isInitialized()); // Test stepper properties. diff --git a/packages/tempus/unit_test/Tempus_UnitTest_ERK.cpp b/packages/tempus/unit_test/Tempus_UnitTest_ERK.cpp new file mode 100644 index 000000000000..66872574f4d9 --- /dev/null +++ b/packages/tempus/unit_test/Tempus_UnitTest_ERK.cpp @@ -0,0 +1,348 @@ +// @HEADER +// **************************************************************************** +// Tempus: Copyright (2017) Sandia Corporation +// +// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) +// **************************************************************************** +// @HEADER + +#include "Teuchos_UnitTestHarness.hpp" + +#include "../TestModels/DahlquistTestModel.hpp" + +#include "Tempus_StepperFactory.hpp" +#include "Tempus_SolutionHistory.hpp" +#include "Tempus_StepperRKModifierBase.hpp" +#include "Tempus_StepperRKModifierXBase.hpp" + + +namespace Tempus_Unit_Test { + +using Teuchos::RCP; +using Teuchos::rcp; +using Teuchos::rcp_const_cast; +using Teuchos::rcp_dynamic_cast; + + +/** \brief Explicit RK Modifier Dahlquist Test using StepperERK_BogackiShampine32. + * + * This is the canonical Dahlquist test equation + * \f[ + * \mathbf{\dot{x}} = \lambda \mathbf{x} = \bar{f}(x,t). + * \f] + * where \f$\lambda = -1\f$ with the initial condition + * \f$\mathbf{x}(0) = 1\f$, and the exact solution is + * \f[ + * \mathbf{x}(t) = \exp{[\lambda t]}. + * \f] + * The general RK method can be written as + * \f{eqnarray*}{ + * X_{i} & = & x_{n-1} + + * \Delta t\,\sum_{j=1}^{i-1} a_{ij}\,\bar{f}(X_{j},t_{n-1}+c_{j}\Delta t)\\ + * x_{n} & = & x_{n-1} + * + \Delta t\,\sum_{i=1}^{s}b_{i}\,\bar{f}(X_{i},t_{n-1}+c_{i}\Delta t) + * \f} + * + * For the RK Bogacki-Shampine tableau, + * \f[ + * \begin{array}{c|cccc} 0 & 0 & & & \\ + * 1/2 & 1/2 & 0 & & \\ + * 3/4 & 0 & 3/4 & 0 & \\ + * 1 & 2/9 & 1/3 & 4/9 & 0 \\ \hline + * & 2/9 & 1/3 & 4/9 & 0 \\ + * & 7/24 & 1/4 & 1/3 & 1/8 \end{array} + * \f] + * the solution for the first time step is (explicitly writing out the stages) + * \f{eqnarray*}{ + * X_1 & = & x_0 \\ + * X_2 & = & x_0 + \Delta t\,(1/2)\,\bar{f}(X_1,t_0+( 0 )\Delta t) \\ + * X_3 & = & x_0 + \Delta t\,(3/4)\,\bar{f}(X_2,t_0+(1/2)\Delta t) \\ + * X_4 & = & x_0 + \Delta t\,(2/9)\,\bar{f}(X_1,t_0+( 0 )\Delta t) + * + \Delta t\,(1/3)\,\bar{f}(X_2,t_0+(1/2)\Delta t) + * + \Delta t\,(4/9)\,\bar{f}(X_3,t_0+(3/4)\Delta t) + * \f} + * and + * \f{eqnarray*}{ + * x_1 & = & x_0 + \Delta t\,(2/9)\,\bar{f}(X_1,t_0+( 0 )\Delta t) + * + \Delta t\,(1/3)\,\bar{f}(X_2,t_0+(1/2)\Delta t) + * + \Delta t\,(4/9)\,\bar{f}(X_3,t_0+(3/4)\Delta t) \\ + * x_1 & = & X_4 + * \f} + * Thus we have + * \f{eqnarray*}{ + * t_0 & = & 0 \\ + * \Delta t & = & 1 \\ + * \mathbf{x}(0) = x_0 & = & 1 \\ + * X_{1} & = & x_0 \\ + * & = & 1 \\ + * \bar{f}(X_1, 0 ) & = & \lambda X_1 = (-1)(1) \\ + * & = & -1 \\ + * X_{2} & = & x_0 + (1/2)\,\bar{f}(X_1, 0 ) = 1 + 1/2(-1) \\ + * & = & 1/2 \\ + * \bar{f}(X_2,1/2) & = & \lambda X_2 = (-1)(1/2) \\ + * & = & -1/2 \\ + * X_3 & = & x_0 + (3/4)\,\bar{f}(X_2,1/2) = 1 + (3/4)(-1/2)\\ + * & = & 5/8 \\ + * \bar{f}(X_3,3/4) & = & \lambda X_3 = (-1)(5/8) \\ + * & = & -5/8 \\ + * X_4 & = & x_0 + (2/9)\,\bar{f}(X_1,0) + * + (1/3)\,\bar{f}(X_2,1/2) + * + (4/9)\,\bar{f}(X_3,3/4) \\ + * & = & 1 + (2/9)(-1) + (1/3)(-1/2) + (4/9)(-5/8) \\ + * & = & 1/3 \\ + * x_1 & = & X_4 = 1/3 + * \f} + */ +class StepperRKModifierBogackiShampineTest + : virtual public Tempus::StepperRKModifierBase +{ +public: + + /// Constructor + StepperRKModifierBogackiShampineTest(Teuchos::FancyOStream &Out, bool &Success) + : out(Out), success(Success) + {} + + /// Destructor + virtual ~StepperRKModifierBogackiShampineTest(){} + + /// Test the modify RK Stepper at the Action Locations. + virtual void modify( + Teuchos::RCP > sh, + Teuchos::RCP > stepper, + const typename Tempus::StepperRKAppAction::ACTION_LOCATION actLoc) + { + const double relTol = 1.0e-14; + auto stageNumber = stepper->getStageNumber(); + Teuchos::SerialDenseVector c = stepper->getTableau()->c(); + + auto currentState = sh->getCurrentState(); + auto workingState = sh->getWorkingState(); + const double dt = workingState->getTimeStep(); + double time = currentState->getTime(); + if (stageNumber >= 0) time += c(stageNumber)*dt; + + auto x = workingState->getX(); + auto xDot = sh->getWorkingState()->getXDot(); + if (xDot == Teuchos::null) xDot = stepper->getStepperXDot(); + + + if (actLoc == StepperRKAppAction::BEGIN_STEP) { + const double x_0 = get_ele(*(x), 0); + const double xDot_0 = get_ele(*(xDot), 0); + TEST_FLOATING_EQUALITY(x_0, 1.0, relTol); // Should be x_0 + TEST_FLOATING_EQUALITY(xDot_0, -1.0, relTol); // Should be xDot_0 + TEST_FLOATING_EQUALITY(time, 0.0, relTol); + TEST_FLOATING_EQUALITY(dt, 1.0, relTol); + TEST_COMPARE(stageNumber, ==, -1); + + } else if (actLoc == StepperRKAppAction::BEGIN_STAGE || + actLoc == StepperRKAppAction::BEFORE_SOLVE || + actLoc == StepperRKAppAction::AFTER_SOLVE || + actLoc == StepperRKAppAction::BEFORE_EXPLICIT_EVAL || + actLoc == StepperRKAppAction::END_STAGE) { + const double X_i = get_ele(*(x), 0); + const double f_i = get_ele(*(xDot), 0); + if (stageNumber == 0) { + TEST_FLOATING_EQUALITY(X_i, 1.0, relTol); // Should be X_1 + TEST_FLOATING_EQUALITY(time, 0.0, relTol); + if (actLoc == StepperRKAppAction::END_STAGE) { + TEST_FLOATING_EQUALITY(f_i, -1.0, relTol); // Should be \bar{f}_1 + } else { + TEST_FLOATING_EQUALITY(f_i, 0.0, relTol); // Not set yet. + } + + } else if (stageNumber == 1) { + TEST_FLOATING_EQUALITY(X_i, 0.5, relTol); // Should be X_2 + TEST_FLOATING_EQUALITY(time, 0.5, relTol); + if (actLoc == StepperRKAppAction::END_STAGE) { + TEST_FLOATING_EQUALITY(f_i, -0.5, relTol); // Should be \bar{f}_2 + } else { + TEST_FLOATING_EQUALITY(f_i, 0.0, relTol); // Not set yet. + } + + } else if (stageNumber == 2) { + TEST_FLOATING_EQUALITY(X_i, 5.0/8.0, relTol); // Should be X_3 + TEST_FLOATING_EQUALITY(time, 0.75, relTol); + if (actLoc == StepperRKAppAction::END_STAGE) { + TEST_FLOATING_EQUALITY(f_i, -5.0/8.0, relTol); // Should be \bar{f}_3 + } else { + TEST_FLOATING_EQUALITY(f_i, 0.0, relTol); // Not set yet. + } + + } else if (stageNumber == 3) { + TEST_FLOATING_EQUALITY(X_i, 1.0/3.0, relTol); // Should be X_4 + TEST_FLOATING_EQUALITY(time, 1.0, relTol); + if (actLoc == StepperRKAppAction::END_STAGE) { + TEST_FLOATING_EQUALITY(f_i, -1.0/3.0, relTol); // Should be \bar{f}_4 + } else { + TEST_FLOATING_EQUALITY(f_i, 0.0, relTol); // Not set yet. + } + + } else { + TEUCHOS_TEST_FOR_EXCEPT( !(-1 < stageNumber && stageNumber < 4)); + } + TEST_FLOATING_EQUALITY(dt, 1.0, relTol); + + } else if (actLoc == StepperRKAppAction::END_STEP) { + const double x_1 = get_ele(*(x), 0); + time = workingState->getTime(); + TEST_FLOATING_EQUALITY(x_1, 1.0/3.0, relTol); // Should be x_1 + TEST_FLOATING_EQUALITY(time, 1.0, relTol); + TEST_FLOATING_EQUALITY(dt, 1.0, relTol); + TEST_COMPARE(stageNumber, ==, -1); + + } else { + TEUCHOS_TEST_FOR_EXCEPTION(true, std::logic_error, + "Error - unknown action location.\n"); + } + } + +private: + + Teuchos::FancyOStream & out; + bool & success; +}; + + +// ************************************************************ +// ************************************************************ +TEUCHOS_UNIT_TEST(ERK, Modifier) +{ + auto stepper = rcp(new Tempus::StepperERK_BogackiShampine32()); + Teuchos::RCP > + model = rcp(new Tempus_Test::DahlquistTestModel()); + auto modifier = rcp(new StepperRKModifierBogackiShampineTest(out, success)); + + stepper->setModel(model); + stepper->setAppAction(modifier); + stepper->setICConsistency("Consistent"); + stepper->setUseFSAL(true); + stepper->initialize(); + + // Create a SolutionHistory. + auto solutionHistory = Tempus::createSolutionHistoryME(model); + + // Take one time step. + stepper->setInitialConditions(solutionHistory); + solutionHistory->initWorkingState(); + double dt = 1.0; + solutionHistory->getWorkingState()->setTimeStep(dt); + solutionHistory->getWorkingState()->setTime(dt); + stepper->takeStep(solutionHistory); // Primary testing occurs in + // modifierX during takeStep(). + // Test stepper properties. + TEUCHOS_ASSERT(stepper->getOrder() == 3); +} + + + + +/** \brief Explicit RK ModifierX Dahlquist Test using StepperERK_BogackiShampine32. + * + * This is similar to StepperRKModifierBogackiShampineTest but is + * specialized for the AppAction::ModifierX interface. See + * StepperRKModifierXBogackiShampineTest for more details. + */ +class StepperRKModifierXBogackiShampineTest + : virtual public Tempus::StepperRKModifierXBase +{ +public: + + /// Constructor + StepperRKModifierXBogackiShampineTest(Teuchos::FancyOStream &Out, bool &Success) + : out(Out), success(Success) + {} + + /// Destructor + virtual ~StepperRKModifierXBogackiShampineTest(){} + + /// Test the modify RK Stepper at the Action Locations. + virtual void modify( + Teuchos::RCP > x, + const double time, const double dt, const int stageNumber, + const typename Tempus::StepperRKModifierXBase::MODIFIER_TYPE modType) + { + const double relTol = 1.0e-14; + if (modType == StepperRKModifierXBase::X_BEGIN_STEP) { + const double x_0 = get_ele(*(x), 0); // Should be x_0 + TEST_FLOATING_EQUALITY(x_0, 1.0, relTol); + TEST_FLOATING_EQUALITY(time, 0.0, relTol); + TEST_FLOATING_EQUALITY(dt, 1.0, relTol); + TEST_COMPARE(stageNumber, ==, -1); + + } else if (modType == StepperRKModifierXBase::X_BEGIN_STAGE || + modType == StepperRKModifierXBase::X_BEFORE_SOLVE || + modType == StepperRKModifierXBase::X_AFTER_SOLVE || + modType == StepperRKModifierXBase::X_BEFORE_EXPLICIT_EVAL || + modType == StepperRKModifierXBase::X_END_STAGE) { + const double X_i = get_ele(*(x), 0); + if (stageNumber == 0) { + TEST_FLOATING_EQUALITY(X_i, 1.0, relTol); // Should be X_1 + TEST_FLOATING_EQUALITY(time, 0.0, relTol); + } else if (stageNumber == 1) { + TEST_FLOATING_EQUALITY(X_i, 0.5, relTol); // Should be X_2 + TEST_FLOATING_EQUALITY(time, 0.5, relTol); + } else if (stageNumber == 2) { + TEST_FLOATING_EQUALITY(X_i, 5.0/8.0, relTol); // Should be X_3 + TEST_FLOATING_EQUALITY(time, 0.75, relTol); + } else if (stageNumber == 3) { + TEST_FLOATING_EQUALITY(X_i, 1.0/3.0, relTol); // Should be X_4 + TEST_FLOATING_EQUALITY(time, 1.0, relTol); + } else { + TEUCHOS_TEST_FOR_EXCEPT( !(-1 < stageNumber && stageNumber < 4)); + } + TEST_FLOATING_EQUALITY(dt, 1.0, relTol); + + } else if (modType == StepperRKModifierXBase::X_END_STEP) { + const double x_1 = get_ele(*(x), 0); + TEST_FLOATING_EQUALITY(x_1, 1.0/3.0, relTol); // Should be x_1 + TEST_FLOATING_EQUALITY(time, 1.0, relTol); + TEST_FLOATING_EQUALITY(dt, 1.0, relTol); + TEST_COMPARE(stageNumber, ==, -1); + + } else { + TEUCHOS_TEST_FOR_EXCEPTION(true, std::logic_error, + "Error - unknown action location.\n"); + } + } + +private: + + Teuchos::FancyOStream & out; + bool & success; +}; + + +// ************************************************************ +// ************************************************************ +TEUCHOS_UNIT_TEST(ERK, ModifierX) +{ + auto stepper = rcp(new Tempus::StepperERK_BogackiShampine32()); + Teuchos::RCP > + model = rcp(new Tempus_Test::DahlquistTestModel()); + auto modifierX = rcp(new StepperRKModifierXBogackiShampineTest(out, success)); + + stepper->setModel(model); + stepper->setAppAction(modifierX); + stepper->setICConsistency("Consistent"); + stepper->setUseFSAL(true); + stepper->initialize(); + + // Create a SolutionHistory. + auto solutionHistory = Tempus::createSolutionHistoryME(model); + + // Take one time step. + stepper->setInitialConditions(solutionHistory); + solutionHistory->initWorkingState(); + double dt = 1.0; + solutionHistory->getWorkingState()->setTimeStep(dt); + solutionHistory->getWorkingState()->setTime(dt); + stepper->takeStep(solutionHistory); // Primary testing occurs in + // modifierX during takeStep(). + // Test stepper properties. + TEUCHOS_ASSERT(stepper->getOrder() == 3); +} + + +} // namespace Tempus_Test diff --git a/packages/tempus/unit_test/Tempus_UnitTest_ERK_ForwardEuler.cpp b/packages/tempus/unit_test/Tempus_UnitTest_ERK_ForwardEuler.cpp index d9495b6c5c3e..8a32bcb80696 100644 --- a/packages/tempus/unit_test/Tempus_UnitTest_ERK_ForwardEuler.cpp +++ b/packages/tempus/unit_test/Tempus_UnitTest_ERK_ForwardEuler.cpp @@ -29,6 +29,10 @@ TEUCHOS_UNIT_TEST(ERK_ForwardEuler, Default_Construction) // Test stepper properties. TEUCHOS_ASSERT(stepper->getOrder() == 1); + const auto rk_fe = stepper->getTableau(); + + TEUCHOS_ASSERT( rk_fe->isTVD() ); + TEUCHOS_ASSERT( rk_fe->getTVDCoeff() == 1 ); } diff --git a/packages/tempus/unit_test/Tempus_UnitTest_ERK_General.cpp b/packages/tempus/unit_test/Tempus_UnitTest_ERK_General.cpp index 5b295ede2c36..59e6bdeedab8 100644 --- a/packages/tempus/unit_test/Tempus_UnitTest_ERK_General.cpp +++ b/packages/tempus/unit_test/Tempus_UnitTest_ERK_General.cpp @@ -34,8 +34,9 @@ TEUCHOS_UNIT_TEST(ERK_General, Default_Construction) TEUCHOS_TEST_FOR_EXCEPT(!stepper->isInitialized()); // Default values for construction. - auto modifier = rcp(new Tempus::StepperRKModifierDefault()); - + auto modifier = rcp(new Tempus::StepperRKModifierDefault()); + auto modifierX = rcp(new Tempus::StepperRKModifierXDefault()); + auto observer = rcp(new Tempus::StepperRKObserverDefault()); bool useFSAL = stepper->getUseFSALDefault(); std::string ICConsistency = stepper->getICConsistencyDefault(); bool ICConsistencyCheck = stepper->getICConsistencyCheckDefault(); @@ -68,6 +69,8 @@ TEUCHOS_UNIT_TEST(ERK_General, Default_Construction) stepper->setObserver(obs); stepper->initialize(); TEUCHOS_TEST_FOR_EXCEPT(!stepper->isInitialized()); #endif stepper->setAppAction(modifier); stepper->initialize(); TEUCHOS_TEST_FOR_EXCEPT(!stepper->isInitialized()); + stepper->setAppAction(modifierX); stepper->initialize(); TEUCHOS_TEST_FOR_EXCEPT(!stepper->isInitialized()); + stepper->setAppAction(observer); stepper->initialize(); TEUCHOS_TEST_FOR_EXCEPT(!stepper->isInitialized()); stepper->setUseFSAL(useFSAL); stepper->initialize(); TEUCHOS_TEST_FOR_EXCEPT(!stepper->isInitialized()); stepper->setICConsistency(ICConsistency); stepper->initialize(); TEUCHOS_TEST_FOR_EXCEPT(!stepper->isInitialized()); stepper->setICConsistencyCheck(ICConsistencyCheck); stepper->initialize(); TEUCHOS_TEST_FOR_EXCEPT(!stepper->isInitialized()); diff --git a/packages/tempus/unit_test/Tempus_UnitTest_ForwardEuler.cpp b/packages/tempus/unit_test/Tempus_UnitTest_ForwardEuler.cpp index 1c49596a1bc0..fbbd279eb2f3 100644 --- a/packages/tempus/unit_test/Tempus_UnitTest_ForwardEuler.cpp +++ b/packages/tempus/unit_test/Tempus_UnitTest_ForwardEuler.cpp @@ -18,9 +18,11 @@ #include "Tempus_StepperRKButcherTableau.hpp" #include "Tempus_StepperForwardEulerModifierBase.hpp" -#include "Tempus_StepperForwardEulerObserverBase.hpp" #include "Tempus_StepperForwardEulerModifierXBase.hpp" +#include "Tempus_StepperForwardEulerObserverBase.hpp" #include "Tempus_StepperForwardEulerModifierDefault.hpp" +#include "Tempus_StepperForwardEulerModifierXDefault.hpp" +#include "Tempus_StepperForwardEulerObserverDefault.hpp" #include "../TestModels/SinCosModel.hpp" #include "../TestModels/VanDerPolModel.hpp" @@ -52,7 +54,10 @@ TEUCHOS_UNIT_TEST(ForwardEuler, Default_Construction) auto model = rcp(new Tempus_Test::SinCosModel()); // Default construction. - auto stepper = rcp(new Tempus::StepperForwardEuler()); + auto modifier = rcp(new Tempus::StepperForwardEulerModifierDefault()); + auto modifierX = rcp(new Tempus::StepperForwardEulerModifierXDefault()); + auto observer = rcp(new Tempus::StepperForwardEulerObserverDefault()); + auto stepper = rcp(new Tempus::StepperForwardEuler()); stepper->setModel(model); stepper->initialize(); TEUCHOS_TEST_FOR_EXCEPT(!stepper->isInitialized()); @@ -66,8 +71,9 @@ TEUCHOS_UNIT_TEST(ForwardEuler, Default_Construction) auto obs = rcp(new Tempus::StepperForwardEulerObserver()); stepper->setObserver(obs); stepper->initialize(); TEUCHOS_TEST_FOR_EXCEPT(!stepper->isInitialized()); #endif - auto modifier = rcp(new Tempus::StepperForwardEulerModifierDefault()); - stepper->setAppAction(modifier); + stepper->setAppAction(modifier); stepper->initialize(); TEUCHOS_TEST_FOR_EXCEPT(!stepper->isInitialized()); + stepper->setAppAction(modifierX); stepper->initialize(); TEUCHOS_TEST_FOR_EXCEPT(!stepper->isInitialized()); + stepper->setAppAction(observer); stepper->initialize(); TEUCHOS_TEST_FOR_EXCEPT(!stepper->isInitialized()); stepper->setUseFSAL(useFSAL); stepper->initialize(); TEUCHOS_TEST_FOR_EXCEPT(!stepper->isInitialized()); stepper->setICConsistency(ICConsistency); stepper->initialize(); TEUCHOS_TEST_FOR_EXCEPT(!stepper->isInitialized()); stepper->setICConsistencyCheck(ICConsistencyCheck); stepper->initialize(); TEUCHOS_TEST_FOR_EXCEPT(!stepper->isInitialized()); @@ -199,11 +205,11 @@ TEUCHOS_UNIT_TEST(ForwardEuler, AppAction_Modifier) TEST_COMPARE(modifier->testEND_STEP, ==, true); auto x = solutionHistory->getCurrentState()->getX(); - TEST_FLOATING_EQUALITY(modifier->testCurrentValue, get_ele(*(x), 0), 1.0e-15); + TEST_FLOATING_EQUALITY(modifier->testCurrentValue, get_ele(*(x), 0), 1.0e-14); x = solutionHistory->getWorkingState()->getX(); - TEST_FLOATING_EQUALITY(modifier->testWorkingValue, get_ele(*(x), 0), 1.0e-15); + TEST_FLOATING_EQUALITY(modifier->testWorkingValue, get_ele(*(x), 0), 1.0e-14); auto Dt = solutionHistory->getWorkingState()->getTimeStep(); - TEST_FLOATING_EQUALITY(modifier->testDt, Dt, 1.0e-15); + TEST_FLOATING_EQUALITY(modifier->testDt, Dt, 1.0e-14); TEST_COMPARE(modifier->testType, ==, "Forward Euler - Modifier"); } @@ -310,10 +316,10 @@ class StepperForwardEulerObserverTest TEST_COMPARE(observer->testEND_STEP, ==, true); auto x = solutionHistory->getCurrentState()->getX(); - TEST_FLOATING_EQUALITY(observer->testCurrentValue, get_ele(*(x), 0), 1.0e-15); + TEST_FLOATING_EQUALITY(observer->testCurrentValue, get_ele(*(x), 0), 1.0e-14); x = solutionHistory->getWorkingState()->getX(); - TEST_FLOATING_EQUALITY(observer->testWorkingValue, get_ele(*(x), 0), 1.0e-15); - TEST_FLOATING_EQUALITY(observer->testDt, dt, 1.0e-15); + TEST_FLOATING_EQUALITY(observer->testWorkingValue, get_ele(*(x), 0), 1.0e-14); + TEST_FLOATING_EQUALITY(observer->testDt, dt, 1.0e-14); TEST_COMPARE(observer->testType, ==, "Forward Euler"); } @@ -417,15 +423,17 @@ class StepperForwardEulerModifierXTest TEST_COMPARE(modifierX->testXDOT_END_STEP, ==, true); auto x = solutionHistory->getCurrentState()->getX(); - TEST_FLOATING_EQUALITY(modifierX->testX, get_ele(*(x), 0), 1.0e-15); - // Temperary memory for xDot is not guarranteed to exist outside the Stepper. - auto xDot = stepper->getStepperXDot(solutionHistory->getWorkingState()); - TEST_FLOATING_EQUALITY(modifierX->testXDot, get_ele(*(xDot), 0),1.0e-15); + TEST_FLOATING_EQUALITY(modifierX->testX, get_ele(*(x), 0), 1.0e-14); + // Temporary memory for xDot is not guarranteed to exist outside the Stepper. + auto xDot = solutionHistory->getWorkingState()->getXDot(); + if (xDot == Teuchos::null) xDot = stepper->getStepperXDot(); + + TEST_FLOATING_EQUALITY(modifierX->testXDot, get_ele(*(xDot), 0),1.0e-14); auto Dt = solutionHistory->getWorkingState()->getTimeStep(); - TEST_FLOATING_EQUALITY(modifierX->testDt, Dt, 1.0e-15); + TEST_FLOATING_EQUALITY(modifierX->testDt, Dt, 1.0e-14); auto time = solutionHistory->getWorkingState()->getTime(); - TEST_FLOATING_EQUALITY(modifierX->testTime, time, 1.0e-15); + TEST_FLOATING_EQUALITY(modifierX->testTime, time, 1.0e-14); } } // namespace Tempus_Test diff --git a/packages/tempus/unit_test/Tempus_UnitTest_IMEX_RK.cpp b/packages/tempus/unit_test/Tempus_UnitTest_IMEX_RK.cpp index 7405b3b60c7c..e419cb42ea66 100644 --- a/packages/tempus/unit_test/Tempus_UnitTest_IMEX_RK.cpp +++ b/packages/tempus/unit_test/Tempus_UnitTest_IMEX_RK.cpp @@ -55,7 +55,9 @@ TEUCHOS_UNIT_TEST(IMEX_RK, Default_Construction) TEUCHOS_TEST_FOR_EXCEPT(!stepper->isInitialized()); // Default values for construction. - auto modifier = rcp(new Tempus::StepperRKModifierDefault()); + auto modifier = rcp(new Tempus::StepperRKModifierDefault()); + auto modifierX = rcp(new Tempus::StepperRKModifierXDefault()); + auto observer = rcp(new Tempus::StepperRKObserverDefault()); auto solver = rcp(new Thyra::NOXNonlinearSolver()); solver->setParameterList(Tempus::defaultSolverParameters()); @@ -77,6 +79,8 @@ TEUCHOS_UNIT_TEST(IMEX_RK, Default_Construction) stepper->setObserver(obs); stepper->initialize(); TEUCHOS_TEST_FOR_EXCEPT(!stepper->isInitialized()); #endif stepper->setAppAction(modifier); stepper->initialize(); TEUCHOS_TEST_FOR_EXCEPT(!stepper->isInitialized()); + stepper->setAppAction(modifierX); stepper->initialize(); TEUCHOS_TEST_FOR_EXCEPT(!stepper->isInitialized()); + stepper->setAppAction(observer); stepper->initialize(); TEUCHOS_TEST_FOR_EXCEPT(!stepper->isInitialized()); stepper->setSolver(solver); stepper->initialize(); TEUCHOS_TEST_FOR_EXCEPT(!stepper->isInitialized()); stepper->setUseFSAL(useFSAL); stepper->initialize(); TEUCHOS_TEST_FOR_EXCEPT(!stepper->isInitialized()); stepper->setICConsistency(ICConsistency); stepper->initialize(); TEUCHOS_TEST_FOR_EXCEPT(!stepper->isInitialized()); @@ -88,6 +92,9 @@ TEUCHOS_UNIT_TEST(IMEX_RK, Default_Construction) stepper->setImplicitTableau(implicitTableau); stepper->initialize(); TEUCHOS_TEST_FOR_EXCEPT(!stepper->isInitialized()); stepper->setOrder(order); stepper->initialize(); TEUCHOS_TEST_FOR_EXCEPT(!stepper->isInitialized()); + TEUCHOS_TEST_FOR_EXCEPT(explicitTableau != stepper->getTableau()); + TEUCHOS_TEST_FOR_EXCEPT(explicitTableau != stepper->getExplicitTableau()); + TEUCHOS_TEST_FOR_EXCEPT(implicitTableau != stepper->getImplicitTableau()); // Full argument list construction. #ifndef TEMPUS_HIDE_DEPRECATED_CODE diff --git a/packages/tempus/unit_test/Tempus_UnitTest_IMEX_RK_Partition.cpp b/packages/tempus/unit_test/Tempus_UnitTest_IMEX_RK_Partition.cpp index 0dedde7bbf5a..f34a509beb46 100644 --- a/packages/tempus/unit_test/Tempus_UnitTest_IMEX_RK_Partition.cpp +++ b/packages/tempus/unit_test/Tempus_UnitTest_IMEX_RK_Partition.cpp @@ -62,7 +62,9 @@ TEUCHOS_UNIT_TEST(IMEX_RK_Partition, Default_Construction) TEUCHOS_TEST_FOR_EXCEPT(!stepper->isInitialized()); // Default values for construction. - auto modifier = rcp(new Tempus::StepperRKModifierDefault()); + auto modifier = rcp(new Tempus::StepperRKModifierDefault()); + auto modifierX = rcp(new Tempus::StepperRKModifierXDefault()); + auto observer = rcp(new Tempus::StepperRKObserverDefault()); auto solver = rcp(new Thyra::NOXNonlinearSolver()); solver->setParameterList(Tempus::defaultSolverParameters()); @@ -84,6 +86,8 @@ TEUCHOS_UNIT_TEST(IMEX_RK_Partition, Default_Construction) stepper->setObserver(obs); stepper->initialize(); TEUCHOS_TEST_FOR_EXCEPT(!stepper->isInitialized()); #endif stepper->setAppAction(modifier); stepper->initialize(); TEUCHOS_TEST_FOR_EXCEPT(!stepper->isInitialized()); + stepper->setAppAction(modifierX); stepper->initialize(); TEUCHOS_TEST_FOR_EXCEPT(!stepper->isInitialized()); + stepper->setAppAction(observer); stepper->initialize(); TEUCHOS_TEST_FOR_EXCEPT(!stepper->isInitialized()); stepper->setSolver(solver); stepper->initialize(); TEUCHOS_TEST_FOR_EXCEPT(!stepper->isInitialized()); stepper->setUseFSAL(useFSAL); stepper->initialize(); TEUCHOS_TEST_FOR_EXCEPT(!stepper->isInitialized()); stepper->setICConsistency(ICConsistency); stepper->initialize(); TEUCHOS_TEST_FOR_EXCEPT(!stepper->isInitialized()); @@ -95,6 +99,9 @@ TEUCHOS_UNIT_TEST(IMEX_RK_Partition, Default_Construction) stepper->setImplicitTableau(implicitTableau); stepper->initialize(); TEUCHOS_TEST_FOR_EXCEPT(!stepper->isInitialized()); stepper->setOrder(order); stepper->initialize(); TEUCHOS_TEST_FOR_EXCEPT(!stepper->isInitialized()); + TEUCHOS_TEST_FOR_EXCEPT(explicitTableau != stepper->getTableau()); + TEUCHOS_TEST_FOR_EXCEPT(explicitTableau != stepper->getExplicitTableau()); + TEUCHOS_TEST_FOR_EXCEPT(implicitTableau != stepper->getImplicitTableau()); // Full argument list construction. #ifndef TEMPUS_HIDE_DEPRECATED_CODE @@ -111,7 +118,7 @@ TEUCHOS_UNIT_TEST(IMEX_RK_Partition, Default_Construction) TEUCHOS_TEST_FOR_EXCEPT(!stepper->isInitialized()); // Test stepper properties. - std::cout << "ordero = " << stepper->getOrder() << std::endl; + //std::cout << "order = " << stepper->getOrder() << std::endl; TEUCHOS_ASSERT(stepper->getOrder() == 2); } diff --git a/packages/tempus/unit_test/Tempus_UnitTest_OperatorSplit.cpp b/packages/tempus/unit_test/Tempus_UnitTest_OperatorSplit.cpp index 096ecf3a95f3..8864b9683576 100644 --- a/packages/tempus/unit_test/Tempus_UnitTest_OperatorSplit.cpp +++ b/packages/tempus/unit_test/Tempus_UnitTest_OperatorSplit.cpp @@ -18,9 +18,11 @@ #include "Tempus_StepperRKButcherTableau.hpp" #include "Tempus_StepperOperatorSplitModifierBase.hpp" -#include "Tempus_StepperOperatorSplitObserverBase.hpp" #include "Tempus_StepperOperatorSplitModifierXBase.hpp" +#include "Tempus_StepperOperatorSplitObserverBase.hpp" #include "Tempus_StepperOperatorSplitModifierDefault.hpp" +#include "Tempus_StepperOperatorSplitModifierXDefault.hpp" +#include "Tempus_StepperOperatorSplitObserverDefault.hpp" #include "Tempus_StepperOperatorSplitObserver.hpp" #include "../TestModels/VanDerPol_IMEX_ExplicitModel.hpp" @@ -64,19 +66,24 @@ TEUCHOS_UNIT_TEST(OperatorSplit, Default_Construction) TEUCHOS_TEST_FOR_EXCEPT(!stepper->isInitialized()); // Default values for construction. -#ifndef TEMPUS_DEPRECATED_CODE +#ifndef TEMPUS_HIDE_DEPRECATED_CODE auto obs = rcp(new Tempus::StepperOperatorSplitObserver()); #endif - - auto modifier = rcp(new Tempus::StepperOperatorSplitModifierDefault()); - stepper->setAppAction(modifier); + auto modifier = rcp(new Tempus::StepperOperatorSplitModifierDefault()); + auto modifierX = rcp(new Tempus::StepperOperatorSplitModifierXDefault()); + auto observer = rcp(new Tempus::StepperOperatorSplitObserverDefault()); bool useFSAL = stepper->getUseFSALDefault(); std::string ICConsistency = stepper->getICConsistencyDefault(); bool ICConsistencyCheck = stepper->getICConsistencyCheckDefault(); int order = 1; // Test the set functions. +#ifndef TEMPUS_HIDE_DEPRECATED_CODE stepper->setObserver(obs); stepper->initialize(); TEUCHOS_TEST_FOR_EXCEPT(!stepper->isInitialized()); +#endif + stepper->setAppAction(modifier); stepper->initialize(); TEUCHOS_TEST_FOR_EXCEPT(!stepper->isInitialized()); + stepper->setAppAction(modifierX); stepper->initialize(); TEUCHOS_TEST_FOR_EXCEPT(!stepper->isInitialized()); + stepper->setAppAction(observer); stepper->initialize(); TEUCHOS_TEST_FOR_EXCEPT(!stepper->isInitialized()); stepper->setUseFSAL(useFSAL); stepper->initialize(); TEUCHOS_TEST_FOR_EXCEPT(!stepper->isInitialized()); stepper->setICConsistency(ICConsistency); stepper->initialize(); TEUCHOS_TEST_FOR_EXCEPT(!stepper->isInitialized()); stepper->setICConsistencyCheck(ICConsistencyCheck); stepper->initialize(); TEUCHOS_TEST_FOR_EXCEPT(!stepper->isInitialized()); @@ -135,24 +142,24 @@ TEUCHOS_UNIT_TEST(OperatorSplit, StepperFactory_Construction) } -// ************************************************************ -// ************************************************************ +// ************************************************************ +// ************************************************************ class StepperOperatorSplitModifierTest : virtual public Tempus::StepperOperatorSplitModifierBase { public: - /// Constructor + /// Constructor StepperOperatorSplitModifierTest() : testBEGIN_STEP(false), testEND_STEP(false), testCurrentValue(-0.99), testWorkingValue(-0.99), testDt(-1.5), testType("") {} - /// Destructor + /// Destructor virtual ~StepperOperatorSplitModifierTest(){} - /// Modify OperatorSplit Stepper at action location. + /// Modify OperatorSplit Stepper at action location. virtual void modify( Teuchos::RCP > sh, Teuchos::RCP > stepper, @@ -207,7 +214,7 @@ TEUCHOS_UNIT_TEST(OperatorSplit, AppAction_Modifier) { auto explicitModel = rcp(new Tempus_Test::VanDerPol_IMEX_ExplicitModel()); auto implicitModel = rcp(new Tempus_Test::VanDerPol_IMEX_ImplicitModel()); - // Default construction. + // Default construction. auto stepper = rcp(new Tempus::StepperOperatorSplit()); auto sf = Teuchos::rcp(new Tempus::StepperFactory()); auto subStepper1 = @@ -220,7 +227,7 @@ TEUCHOS_UNIT_TEST(OperatorSplit, AppAction_Modifier) stepper->addStepper(subStepper2); stepper->initialize(); - // Setup initial condition SolutionState -------------------- + // Setup initial condition SolutionState -------------------- Thyra::ModelEvaluatorBase::InArgs inArgsIC = stepper->getModel()->getNominalValues(); auto icX = rcp_const_cast > (inArgsIC.get_x()); @@ -232,44 +239,44 @@ TEUCHOS_UNIT_TEST(OperatorSplit, AppAction_Modifier) icState->setOrder (stepper->getOrder()); icState->setSolutionStatus(Tempus::Status::PASSED); // ICs are passing. - // Create a SolutionHistory. + // Create a SolutionHistory. auto solutionHistory = rcp(new Tempus::SolutionHistory()); solutionHistory->setName("Forward States"); solutionHistory->setStorageType(Tempus::STORAGE_TYPE_STATIC); solutionHistory->setStorageLimit(2); solutionHistory->addState(icState); - // Take one time step. + // Take one time step. stepper->setInitialConditions(solutionHistory); solutionHistory->initWorkingState(); solutionHistory->getWorkingState()->setTimeStep(-15.0); stepper->takeStep(solutionHistory); - // Testing that each ACTION_LOCATION has been called. + // Testing that each ACTION_LOCATION has been called. TEST_COMPARE(modifier->testBEGIN_STEP, ==, true); TEST_COMPARE(modifier->testBEFORE_STEPPER, ==, true); TEST_COMPARE(modifier->testAFTER_STEPPER, ==, true); TEST_COMPARE(modifier->testEND_STEP, ==, true); - // Testing that values can be set through the Modifier. + // Testing that values can be set through the Modifier. auto x = solutionHistory->getCurrentState()->getX(); - TEST_FLOATING_EQUALITY(modifier->testCurrentValue, get_ele(*(x), 0), 1.0e-15); + TEST_FLOATING_EQUALITY(modifier->testCurrentValue, get_ele(*(x), 0), 1.0e-14); x = solutionHistory->getWorkingState()->getX(); - TEST_FLOATING_EQUALITY(modifier->testWorkingValue, get_ele(*(x), 0), 1.0e-15); + TEST_FLOATING_EQUALITY(modifier->testWorkingValue, get_ele(*(x), 0), 1.0e-14); auto Dt = solutionHistory->getWorkingState()->getTimeStep(); - TEST_FLOATING_EQUALITY(modifier->testDt, Dt, 1.0e-15); + TEST_FLOATING_EQUALITY(modifier->testDt, Dt, 1.0e-14); TEST_COMPARE(modifier->testType, ==, "OperatorSplit - Modifier"); } -// ************************************************************ -// ************************************************************ +// ************************************************************ +// ************************************************************ class StepperOperatorSplitObserverTest : virtual public Tempus::StepperOperatorSplitObserverBase { public: - /// Constructor + /// Constructor StepperOperatorSplitObserverTest() : testBEGIN_STEP(false), testBEFORE_STEPPER(false), testAFTER_STEPPER(false), testEND_STEP(false), @@ -277,10 +284,10 @@ class StepperOperatorSplitObserverTest testDt(-1.5), testType("Operator Split") {} - /// Destructor + /// Destructor virtual ~StepperOperatorSplitObserverTest(){} - /// Observe OperatorSplit Stepper at action location. + /// Observe OperatorSplit Stepper at action location. virtual void observe( Teuchos::RCP > sh, Teuchos::RCP > stepper, @@ -333,7 +340,7 @@ TEUCHOS_UNIT_TEST(OperatorSplit, AppAction_Observer) { auto explicitModel = rcp(new Tempus_Test::VanDerPol_IMEX_ExplicitModel()); auto implicitModel = rcp(new Tempus_Test::VanDerPol_IMEX_ImplicitModel()); - // Default construction. + // Default construction. auto stepper = rcp(new Tempus::StepperOperatorSplit()); auto sf = Teuchos::rcp(new Tempus::StepperFactory()); auto subStepper1 = @@ -346,7 +353,7 @@ TEUCHOS_UNIT_TEST(OperatorSplit, AppAction_Observer) stepper->addStepper(subStepper2); stepper->initialize(); - // Setup initial condition SolutionState -------------------- + // Setup initial condition SolutionState -------------------- Thyra::ModelEvaluatorBase::InArgs inArgsIC = stepper->getModel()->getNominalValues(); auto icX = rcp_const_cast > (inArgsIC.get_x()); @@ -356,45 +363,45 @@ TEUCHOS_UNIT_TEST(OperatorSplit, AppAction_Observer) icState->setIndex (1); icState->setTimeStep(-1.5); icState->setOrder (stepper->getOrder()); - icState->setSolutionStatus(Tempus::Status::PASSED); // ICs are passing. + icState->setSolutionStatus(Tempus::Status::PASSED); // ICs are passing. - // Create a SolutionHistory. + // Create a SolutionHistory. auto solutionHistory = rcp(new Tempus::SolutionHistory()); solutionHistory->setName("Forward States"); solutionHistory->setStorageType(Tempus::STORAGE_TYPE_STATIC); solutionHistory->setStorageLimit(2); solutionHistory->addState(icState); - // Take one time step. + // Take one time step. stepper->setInitialConditions(solutionHistory); solutionHistory->initWorkingState(); solutionHistory->getWorkingState()->setTimeStep(-1.5); stepper->takeStep(solutionHistory); - // Testing that each ACTION_LOCATION has been called. + // Testing that each ACTION_LOCATION has been called. TEST_COMPARE(observer->testBEGIN_STEP, ==, true); TEST_COMPARE(observer->testBEFORE_STEPPER, ==, true); TEST_COMPARE(observer->testAFTER_STEPPER, ==, true); TEST_COMPARE(observer->testEND_STEP, ==, true); - // Testing that values can be observed through the observer. + // Testing that values can be observed through the observer. auto x = solutionHistory->getCurrentState()->getX(); - TEST_FLOATING_EQUALITY(observer->testCurrentValue, get_ele(*(x), 0), 1.0e-15); + TEST_FLOATING_EQUALITY(observer->testCurrentValue, get_ele(*(x), 0), 1.0e-14); x = solutionHistory->getWorkingState()->getX(); - TEST_FLOATING_EQUALITY(observer->testWorkingValue, get_ele(*(x), 0), 1.0e-15); - TEST_FLOATING_EQUALITY(observer->testDt, -1.5, 1.0e-15); + TEST_FLOATING_EQUALITY(observer->testWorkingValue, get_ele(*(x), 0), 1.0e-14); + TEST_FLOATING_EQUALITY(observer->testDt, -1.5, 1.0e-14); TEST_COMPARE(observer->testType, ==, "Operator Split"); } -// ************************************************************ -// ************************************************************ +// ************************************************************ +// ************************************************************ class StepperOperatorSplitModifierXTest : virtual public Tempus::StepperOperatorSplitModifierXBase { public: - /// Constructor + /// Constructor StepperOperatorSplitModifierXTest() : testX_BEGIN_STEP(false), testX_BEFORE_STEPPER(false), testX_AFTER_STEPPER(false), testXDOT_END_STEP(false), @@ -402,10 +409,10 @@ class StepperOperatorSplitModifierXTest testDt(-1.5), testTime(-1.5) {} - /// Destructor + /// Destructor virtual ~StepperOperatorSplitModifierXTest(){} - /// Modify OperatorSplit Stepper at action location. + /// Modify OperatorSplit Stepper at action location. virtual void modify( Teuchos::RCP > x, const double time, const double dt, @@ -456,7 +463,7 @@ TEUCHOS_UNIT_TEST(OperatorSplit, AppAction_ModifierX) { auto explicitModel = rcp(new Tempus_Test::VanDerPol_IMEX_ExplicitModel()); auto implicitModel = rcp(new Tempus_Test::VanDerPol_IMEX_ImplicitModel()); - // Default construction. + // Default construction. auto stepper = rcp(new Tempus::StepperOperatorSplit()); auto sf = Teuchos::rcp(new Tempus::StepperFactory()); auto subStepper1 = @@ -469,7 +476,7 @@ TEUCHOS_UNIT_TEST(OperatorSplit, AppAction_ModifierX) stepper->addStepper(subStepper2); stepper->initialize(); - // Setup initial condition SolutionState -------------------- + // Setup initial condition SolutionState -------------------- Thyra::ModelEvaluatorBase::InArgs inArgsIC = stepper->getModel()->getNominalValues(); auto icX = rcp_const_cast > (inArgsIC.get_x()); @@ -479,38 +486,40 @@ TEUCHOS_UNIT_TEST(OperatorSplit, AppAction_ModifierX) icState->setIndex (1); icState->setTimeStep(-1.5); icState->setOrder (stepper->getOrder()); - icState->setSolutionStatus(Tempus::Status::PASSED); // ICs are passing. + icState->setSolutionStatus(Tempus::Status::PASSED); // ICs are passing. - // Create a SolutionHistory. + // Create a SolutionHistory. auto solutionHistory = rcp(new Tempus::SolutionHistory()); solutionHistory->setName("Forward States"); solutionHistory->setStorageType(Tempus::STORAGE_TYPE_STATIC); solutionHistory->setStorageLimit(2); solutionHistory->addState(icState); - // Take one time step. + // Take one time step. stepper->setInitialConditions(solutionHistory); solutionHistory->initWorkingState(); solutionHistory->getWorkingState()->setTimeStep(-1.5); stepper->takeStep(solutionHistory); - // Testing that each ACTION_LOCATION has been called. + // Testing that each ACTION_LOCATION has been called. TEST_COMPARE(modifierX->testX_BEGIN_STEP, ==, true); TEST_COMPARE(modifierX->testX_BEFORE_STEPPER, ==, true); TEST_COMPARE(modifierX->testX_AFTER_STEPPER, ==, true); TEST_COMPARE(modifierX->testXDOT_END_STEP, ==, true); - // Testing that values can be set through the Modifier. + // Testing that values can be set through the Modifier. auto x = solutionHistory->getCurrentState()->getX(); - TEST_FLOATING_EQUALITY(modifierX->testX, get_ele(*(x), 0), 1.0e-15); - // Temporary memory for xDot is not guarranteed to exist outside the Stepper. - auto xDot = stepper->getStepperXDot(solutionHistory->getWorkingState()); - TEST_FLOATING_EQUALITY(modifierX->testXDot, get_ele(*(xDot), 0),1.0e-15); + TEST_FLOATING_EQUALITY(modifierX->testX, get_ele(*(x), 0), 1.0e-14); + // Temporary memory for xDot is not guarranteed to exist outside the Stepper. + auto xDot = solutionHistory->getWorkingState()->getXDot(); + if (xDot == Teuchos::null) xDot = stepper->getStepperXDot(); + + TEST_FLOATING_EQUALITY(modifierX->testXDot, get_ele(*(xDot), 0),1.0e-14); auto Dt = solutionHistory->getWorkingState()->getTimeStep(); - TEST_FLOATING_EQUALITY(modifierX->testDt, Dt, 1.0e-15); + TEST_FLOATING_EQUALITY(modifierX->testDt, Dt, 1.0e-14); auto time = solutionHistory->getWorkingState()->getTime(); - TEST_FLOATING_EQUALITY(modifierX->testTime, time, 1.0e-15); + TEST_FLOATING_EQUALITY(modifierX->testTime, time, 1.0e-14); } } // namespace Tempus_Test diff --git a/packages/tempus/unit_test/Tempus_UnitTest_Subcycling.cpp b/packages/tempus/unit_test/Tempus_UnitTest_Subcycling.cpp index 62fd734b2e50..b6a70416e3a1 100644 --- a/packages/tempus/unit_test/Tempus_UnitTest_Subcycling.cpp +++ b/packages/tempus/unit_test/Tempus_UnitTest_Subcycling.cpp @@ -14,11 +14,12 @@ #include "Thyra_VectorStdOps.hpp" #include "Tempus_StepperFactory.hpp" -//#include "Tempus_UnitTest_Utils.hpp" #include "Tempus_StepperSubcyclingModifierBase.hpp" -#include "Tempus_StepperSubcyclingObserverBase.hpp" #include "Tempus_StepperSubcyclingModifierXBase.hpp" +#include "Tempus_StepperSubcyclingObserverBase.hpp" #include "Tempus_StepperSubcyclingModifierDefault.hpp" +#include "Tempus_StepperSubcyclingModifierXDefault.hpp" +#include "Tempus_StepperSubcyclingObserverDefault.hpp" #include "../TestModels/SinCosModel.hpp" #include "../TestUtils/Tempus_ConvergenceTestUtils.hpp" @@ -59,6 +60,8 @@ TEUCHOS_UNIT_TEST(Subcycling, Default_Construction) auto obs = rcp(new Tempus::StepperSubcyclingObserver()); #endif auto modifier = rcp(new Tempus::StepperSubcyclingModifierDefault()); + auto modifierX = rcp(new Tempus::StepperSubcyclingModifierXDefault()); + auto observer = rcp(new Tempus::StepperSubcyclingObserverDefault()); auto solver = rcp(new Thyra::NOXNonlinearSolver()); solver->setParameterList(Tempus::defaultSolverParameters()); @@ -72,6 +75,8 @@ TEUCHOS_UNIT_TEST(Subcycling, Default_Construction) stepper->setObserver(obs); stepper->initialize(); TEUCHOS_TEST_FOR_EXCEPT(!stepper->isInitialized()); #endif stepper->setAppAction(modifier); stepper->initialize(); TEUCHOS_TEST_FOR_EXCEPT(!stepper->isInitialized()); + stepper->setAppAction(modifierX); stepper->initialize(); TEUCHOS_TEST_FOR_EXCEPT(!stepper->isInitialized()); + stepper->setAppAction(observer); stepper->initialize(); TEUCHOS_TEST_FOR_EXCEPT(!stepper->isInitialized()); stepper->setUseFSAL(useFSAL); stepper->initialize(); TEUCHOS_TEST_FOR_EXCEPT(!stepper->isInitialized()); stepper->setICConsistency(ICConsistency); stepper->initialize(); TEUCHOS_TEST_FOR_EXCEPT(!stepper->isInitialized()); stepper->setICConsistencyCheck(ICConsistencyCheck); stepper->initialize(); TEUCHOS_TEST_FOR_EXCEPT(!stepper->isInitialized()); @@ -245,11 +250,11 @@ TEUCHOS_UNIT_TEST(Subcycling, AppAction_Modifier) // Testing that values can be set through the Modifier. auto x = solutionHistory->getCurrentState()->getX(); - TEST_FLOATING_EQUALITY(modifier->testCurrentValue, get_ele(*(x), 0), 1.0e-15); + TEST_FLOATING_EQUALITY(modifier->testCurrentValue, get_ele(*(x), 0), 1.0e-14); x = solutionHistory->getWorkingState()->getX(); - TEST_FLOATING_EQUALITY(modifier->testWorkingValue, get_ele(*(x), 0), 1.0e-15); + TEST_FLOATING_EQUALITY(modifier->testWorkingValue, get_ele(*(x), 0), 1.0e-14); auto Dt = solutionHistory->getWorkingState()->getTimeStep(); - TEST_FLOATING_EQUALITY(modifier->testDt, Dt, 1.0e-15); + TEST_FLOATING_EQUALITY(modifier->testDt, Dt, 1.0e-14); TEST_COMPARE(modifier->testType, ==, "Subcycling - Modifier"); } @@ -367,10 +372,10 @@ TEUCHOS_UNIT_TEST(Subcycling, AppAction_Observer) // Testing that values can be observed through the observer. auto x = solutionHistory->getCurrentState()->getX(); - TEST_FLOATING_EQUALITY(observer->testCurrentValue, get_ele(*(x), 0), 1.0e-15); + TEST_FLOATING_EQUALITY(observer->testCurrentValue, get_ele(*(x), 0), 1.0e-14); x = solutionHistory->getWorkingState()->getX(); - TEST_FLOATING_EQUALITY(observer->testWorkingValue, get_ele(*(x), 0), 1.0e-15); - TEST_FLOATING_EQUALITY(observer->testDt, 15.0, 1.0e-15); + TEST_FLOATING_EQUALITY(observer->testWorkingValue, get_ele(*(x), 0), 1.0e-14); + TEST_FLOATING_EQUALITY(observer->testDt, 15.0, 1.0e-14); TEST_COMPARE(observer->testType, ==, "Subcyling"); } @@ -495,15 +500,17 @@ TEUCHOS_UNIT_TEST(Subcycling, AppAction_ModifierX) // Testing that values can be set through the Modifier. auto x = solutionHistory->getCurrentState()->getX(); - TEST_FLOATING_EQUALITY(modifierX->testX, get_ele(*(x), 0), 1.0e-15); + TEST_FLOATING_EQUALITY(modifierX->testX, get_ele(*(x), 0), 1.0e-14); // Temporary memory for xDot is not guarranteed to exist outside the Stepper. - auto xDot = stepper->getStepperXDot(solutionHistory->getWorkingState()); - TEST_FLOATING_EQUALITY(modifierX->testXDot, get_ele(*(xDot), 0),1.0e-15); + auto xDot = solutionHistory->getWorkingState()->getXDot(); + if (xDot == Teuchos::null) xDot = stepper->getStepperXDot(); + + TEST_FLOATING_EQUALITY(modifierX->testXDot, get_ele(*(xDot), 0),1.0e-14); auto Dt = solutionHistory->getWorkingState()->getTimeStep(); - TEST_FLOATING_EQUALITY(modifierX->testDt, Dt, 1.0e-15); + TEST_FLOATING_EQUALITY(modifierX->testDt, Dt, 1.0e-14); auto time = solutionHistory->getWorkingState()->getTime(); - TEST_FLOATING_EQUALITY(modifierX->testTime, time, 1.0e-15); + TEST_FLOATING_EQUALITY(modifierX->testTime, time, 1.0e-14); } } // namespace Tempus_Test diff --git a/packages/tempus/unit_test/Tempus_UnitTest_Utils.hpp b/packages/tempus/unit_test/Tempus_UnitTest_Utils.hpp index 80a5e301ba2c..33303eadcba3 100644 --- a/packages/tempus/unit_test/Tempus_UnitTest_Utils.hpp +++ b/packages/tempus/unit_test/Tempus_UnitTest_Utils.hpp @@ -12,9 +12,12 @@ #include "Tempus_StepperFactory.hpp" #include "Tempus_SolutionHistory.hpp" #include "Tempus_StepperRKModifierBase.hpp" -#include "Tempus_StepperRKObserverBase.hpp" #include "Tempus_StepperRKModifierXBase.hpp" +#include "Tempus_StepperRKObserverBase.hpp" #include "Tempus_StepperRKModifierDefault.hpp" +#include "Tempus_StepperRKModifierXDefault.hpp" +#include "Tempus_StepperRKObserverDefault.hpp" +#include "Tempus_StepperRKAppActionComposite.hpp" #include "../TestModels/SinCosModel.hpp" #include "../TestModels/VanDerPolModel.hpp" @@ -70,8 +73,9 @@ void testExplicitRKAccessorsFullConstruction( TEUCHOS_TEST_FOR_EXCEPT(!stepper->isInitialized()); // Default values for construction. - auto modifier = rcp(new Tempus::StepperRKModifierDefault()); - + auto modifier = rcp(new Tempus::StepperRKModifierDefault()); + auto modifierX = rcp(new Tempus::StepperRKModifierXDefault()); + auto observer = rcp(new Tempus::StepperRKObserverDefault()); bool useFSAL = stepper->getUseFSALDefault(); std::string ICConsistency = stepper->getICConsistencyDefault(); bool ICConsistencyCheck = stepper->getICConsistencyCheckDefault(); @@ -83,6 +87,8 @@ void testExplicitRKAccessorsFullConstruction( stepper->setObserver(obs); stepper->initialize(); TEUCHOS_TEST_FOR_EXCEPT(!stepper->isInitialized()); #endif stepper->setAppAction(modifier); stepper->initialize(); TEUCHOS_TEST_FOR_EXCEPT(!stepper->isInitialized()); + stepper->setAppAction(modifierX); stepper->initialize(); TEUCHOS_TEST_FOR_EXCEPT(!stepper->isInitialized()); + stepper->setAppAction(observer); stepper->initialize(); TEUCHOS_TEST_FOR_EXCEPT(!stepper->isInitialized()); stepper->setUseFSAL(useFSAL); stepper->initialize(); TEUCHOS_TEST_FOR_EXCEPT(!stepper->isInitialized()); stepper->setICConsistency(ICConsistency); stepper->initialize(); TEUCHOS_TEST_FOR_EXCEPT(!stepper->isInitialized()); stepper->setICConsistencyCheck(ICConsistencyCheck); stepper->initialize(); TEUCHOS_TEST_FOR_EXCEPT(!stepper->isInitialized()); @@ -215,8 +221,10 @@ void testDIRKAccessorsFullConstruction( TEUCHOS_TEST_FOR_EXCEPT(!stepper->isInitialized()); // Default values for construction. - auto modifier = rcp(new Tempus::StepperRKModifierDefault()); - auto solver = rcp(new Thyra::NOXNonlinearSolver()); + auto modifier = rcp(new Tempus::StepperRKModifierDefault()); + auto modifierX = rcp(new Tempus::StepperRKModifierXDefault()); + auto observer = rcp(new Tempus::StepperRKObserverDefault()); + auto solver = rcp(new Thyra::NOXNonlinearSolver()); solver->setParameterList(Tempus::defaultSolverParameters()); bool useFSAL = stepper->getUseFSALDefault(); @@ -231,6 +239,8 @@ void testDIRKAccessorsFullConstruction( stepper->setObserver(obs); stepper->initialize(); TEUCHOS_TEST_FOR_EXCEPT(!stepper->isInitialized()); #endif stepper->setAppAction(modifier); stepper->initialize(); TEUCHOS_TEST_FOR_EXCEPT(!stepper->isInitialized()); + stepper->setAppAction(modifierX); stepper->initialize(); TEUCHOS_TEST_FOR_EXCEPT(!stepper->isInitialized()); + stepper->setAppAction(observer); stepper->initialize(); TEUCHOS_TEST_FOR_EXCEPT(!stepper->isInitialized()); stepper->setSolver(solver); stepper->initialize(); TEUCHOS_TEST_FOR_EXCEPT(!stepper->isInitialized()); stepper->setUseFSAL(useFSAL); stepper->initialize(); TEUCHOS_TEST_FOR_EXCEPT(!stepper->isInitialized()); stepper->setICConsistency(ICConsistency); stepper->initialize(); TEUCHOS_TEST_FOR_EXCEPT(!stepper->isInitialized()); @@ -500,6 +510,8 @@ class StepperRKModifierTest testBEGIN_STEP = true; auto x = sh->getCurrentState()->getX(); testCurrentValue = get_ele(*(x), 0); + testType = stepper->getStepperType() + " - Modifier"; + stepper->setStepperType(testType); break; } case StepperRKAppAction::BEGIN_STAGE: @@ -511,18 +523,11 @@ class StepperRKModifierTest { testBEFORE_SOLVE = true; testDt = sh->getWorkingState()->getTimeStep()/10.0; - sh->getWorkingState()->setTimeStep(testDt); break; } case StepperRKAppAction::AFTER_SOLVE: { testAFTER_SOLVE = true; - static bool done_once = false; - if (!done_once) { - testType = stepper->getStepperType() + " - Modifier"; - done_once = true; - } - stepper->setStepperType(testType); break; } case StepperRKAppAction::BEFORE_EXPLICIT_EVAL: @@ -610,13 +615,12 @@ class StepperRKObserverTest { testBEFORE_SOLVE = true; testDt = sh->getWorkingState()->getTimeStep()/10.0; - sh->getWorkingState()->setTimeStep(testDt); break; } case StepperRKAppAction::AFTER_SOLVE: { testAFTER_SOLVE = true; - testType = stepper->getStepperType(); + testType = stepper->getStepperType() + " - Observer"; break; } case StepperRKAppAction::BEFORE_EXPLICIT_EVAL: @@ -671,9 +675,11 @@ class StepperRKModifierXTest testXDOT_END_STAGE(false), testX_END_STEP(false), testX(-0.99), - testXDot(-0.99), + testEndStageX(-0.99), testDt(-1.5), - testTime(-1.5) + testTime(-1.5), + testStageNumber(-1), + testStageX(-0.99) {} /// Destructor @@ -683,6 +689,7 @@ class StepperRKModifierXTest virtual void modify( Teuchos::RCP > x, const double time, const double dt, + const int stageNumber, const typename Tempus::StepperRKModifierXBase::MODIFIER_TYPE modType) { switch(modType) { @@ -706,23 +713,25 @@ class StepperRKModifierXTest case StepperRKModifierXBase::X_AFTER_SOLVE: { testX_AFTER_SOLVE = true; - testTime = time; break; } case StepperRKModifierXBase::X_BEFORE_EXPLICIT_EVAL: { testX_BEFORE_EXPLICIT_EVAL = true; + testStageNumber = stageNumber; + testStageX = get_ele(*(x), 0); // x should be the stage value. break; } - case StepperRKModifierXBase::XDOT_END_STAGE: + case StepperRKModifierXBase::X_END_STAGE: { testXDOT_END_STAGE = true; - testXDot = get_ele(*(x), 0); + testEndStageX = get_ele(*(x), 0); break; } case StepperRKModifierXBase::X_END_STEP: { testX_END_STEP = true; + testTime = time; break; } default: @@ -739,9 +748,11 @@ class StepperRKModifierXTest bool testXDOT_END_STAGE; bool testX_END_STEP; double testX; - double testXDot; + double testEndStageX; double testDt; double testTime; + int testStageNumber; + double testStageX; }; @@ -784,11 +795,11 @@ void testRKAppAction( // Testing that values can be set through the modifier. auto x = solutionHistory->getCurrentState()->getX(); - TEST_FLOATING_EQUALITY(modifier->testCurrentValue,get_ele(*(x), 0),1.0e-15); + TEST_FLOATING_EQUALITY(modifier->testCurrentValue,get_ele(*(x), 0),1.0e-14); x = solutionHistory->getWorkingState()->getX(); - TEST_FLOATING_EQUALITY(modifier->testWorkingValue,get_ele(*(x), 0),1.0e-15); + TEST_FLOATING_EQUALITY(modifier->testWorkingValue,get_ele(*(x), 0),1.0e-14); auto Dt = solutionHistory->getWorkingState()->getTimeStep(); - TEST_FLOATING_EQUALITY(modifier->testDt, Dt, 1.0e-15); + TEST_FLOATING_EQUALITY(modifier->testDt, Dt/10.0, 1.0e-14); TEST_COMPARE(modifier->testType, ==, testType); } @@ -801,7 +812,6 @@ void testRKAppAction( stepper->setStepperType(testTypeOrig); stepper->initialize(); TEUCHOS_TEST_FOR_EXCEPT(!stepper->isInitialized()); - auto testType = testTypeOrig; // Create a SolutionHistory. auto solutionHistory = Tempus::createSolutionHistoryME(model); @@ -824,12 +834,13 @@ void testRKAppAction( // Testing that values can be observed through the observer. auto x = solutionHistory->getCurrentState()->getX(); - TEST_FLOATING_EQUALITY(observer->testCurrentValue,get_ele(*(x), 0),1.0e-15); + TEST_FLOATING_EQUALITY(observer->testCurrentValue,get_ele(*(x), 0),1.0e-14); x = solutionHistory->getWorkingState()->getX(); - TEST_FLOATING_EQUALITY(observer->testWorkingValue,get_ele(*(x), 0),1.0e-15); + TEST_FLOATING_EQUALITY(observer->testWorkingValue,get_ele(*(x), 0),1.0e-14); auto Dt = solutionHistory->getWorkingState()->getTimeStep(); - TEST_FLOATING_EQUALITY(observer->testDt, Dt, 1.0e-15); + TEST_FLOATING_EQUALITY(observer->testDt, Dt/10.0, 1.0e-14); + auto testType = testTypeOrig + " - Observer"; TEST_COMPARE(observer->testType, ==, testType); } @@ -861,17 +872,354 @@ void testRKAppAction( TEST_COMPARE(modifierX->testXDOT_END_STAGE, ==, true); TEST_COMPARE(modifierX->testX_END_STEP, ==, true); + const double relTol = 1.0e-14; // Testing that values can be set through the modifierX. auto x = solutionHistory->getCurrentState()->getX(); - TEST_FLOATING_EQUALITY(modifierX->testX, get_ele(*(x), 0), 1.0e-15); - // Temporary memory for xDot is not guarranteed to exist outside the Stepper - auto xDot = stepper->getStepperXDot(solutionHistory->getWorkingState()); - TEST_FLOATING_EQUALITY(modifierX->testXDot, get_ele(*(xDot), 0),1.0e-15); + TEST_FLOATING_EQUALITY(modifierX->testX, get_ele(*(x), 0), relTol); + auto Dt = solutionHistory->getWorkingState()->getTimeStep(); + TEST_FLOATING_EQUALITY(modifierX->testDt, Dt, relTol); + + auto time = solutionHistory->getWorkingState()->getTime(); + TEST_FLOATING_EQUALITY(modifierX->testTime, time, relTol); + + // Stage Number should be -1 outside stage loop. + TEST_COMPARE(stepper->getStageNumber(), ==, -1); + // The last stage number through X_BEFORE_EXPLICIT_EVAL should be + // the number of stages minus one. + TEST_COMPARE(modifierX->testStageNumber,==,stepper->getNumberOfStages()-1); + + if (rcp_dynamic_cast>(stepper) != Teuchos::null || + rcp_dynamic_cast>(stepper) != Teuchos::null) { + TEST_FLOATING_EQUALITY(modifierX->testStageX, 2.0, relTol); + TEST_FLOATING_EQUALITY(modifierX->testEndStageX, 2.0,relTol); + } else if (stepper->isImplicit()) { + // Stage values are overwritten and not available + // outside takeStep, so direct comparisons are needed. + if (rcp_dynamic_cast>(stepper) != Teuchos::null) { + TEST_FLOATING_EQUALITY(modifierX->testStageX, 0.09900990099009901, relTol); + TEST_FLOATING_EQUALITY(modifierX->testEndStageX, 0.09900990099009901, relTol); + } else if (rcp_dynamic_cast>(stepper) != Teuchos::null) { + TEST_FLOATING_EQUALITY(modifierX->testStageX, 0.09979317463412091, relTol); + TEST_FLOATING_EQUALITY(modifierX->testEndStageX, 0.09979317463412091, relTol); + } else if (rcp_dynamic_cast>(stepper) != Teuchos::null) { + TEST_FLOATING_EQUALITY(modifierX->testStageX, 0.049921670528461, relTol); + TEST_FLOATING_EQUALITY(modifierX->testEndStageX, 0.049921670528461, relTol); + } else if (rcp_dynamic_cast>(stepper) != Teuchos::null) { + TEST_FLOATING_EQUALITY(modifierX->testStageX, 0.02171123447937569, relTol); + TEST_FLOATING_EQUALITY(modifierX->testEndStageX, 0.02171123447937569, relTol); + } else if (rcp_dynamic_cast>(stepper) != Teuchos::null) { + TEST_FLOATING_EQUALITY(modifierX->testStageX, 0.06659267480577136, relTol); + TEST_FLOATING_EQUALITY(modifierX->testEndStageX, 0.06659267480577136, relTol); + } else if (rcp_dynamic_cast>(stepper) != Teuchos::null) { + TEST_FLOATING_EQUALITY(modifierX->testStageX, 0.04987531172069826, relTol); + TEST_FLOATING_EQUALITY(modifierX->testEndStageX, 0.04987531172069826, relTol); + } else if (rcp_dynamic_cast>(stepper) != Teuchos::null) { + TEST_FLOATING_EQUALITY(modifierX->testStageX, 0.09975062344139651, relTol); + TEST_FLOATING_EQUALITY(modifierX->testEndStageX, 0.09975062344139651, relTol); + } else if (rcp_dynamic_cast>(stepper) != Teuchos::null) { + TEST_FLOATING_EQUALITY(modifierX->testStageX, 0.09975062344139651, relTol); + TEST_FLOATING_EQUALITY(modifierX->testEndStageX, 0.09975062344139651, relTol); + } else if (rcp_dynamic_cast>(stepper) != Teuchos::null) { + TEST_FLOATING_EQUALITY(modifierX->testStageX, 0.04987531172069826, relTol); + TEST_FLOATING_EQUALITY(modifierX->testEndStageX, 0.04987531172069826, relTol); + } else if (rcp_dynamic_cast>(stepper) != Teuchos::null) { + TEST_FLOATING_EQUALITY(modifierX->testStageX, 0.0748907323303947, relTol); + TEST_FLOATING_EQUALITY(modifierX->testEndStageX, 0.0748907323303947, relTol); + } else if (rcp_dynamic_cast>(stepper) != Teuchos::null) { + TEST_FLOATING_EQUALITY(modifierX->testStageX, 0.08321767099874625, relTol); + TEST_FLOATING_EQUALITY(modifierX->testEndStageX, 0.08321767099874625, relTol); + } else if (rcp_dynamic_cast>(stepper) != Teuchos::null) { + TEST_FLOATING_EQUALITY(modifierX->testStageX, 0.07878078755122744, relTol); + TEST_FLOATING_EQUALITY(modifierX->testEndStageX, 0.07878078755122744, relTol); + } else if (rcp_dynamic_cast>(stepper) != Teuchos::null) { + TEST_FLOATING_EQUALITY(modifierX->testStageX, 0.08525184184135257, relTol); + TEST_FLOATING_EQUALITY(modifierX->testEndStageX, 0.08525184184135257, relTol); + } else if (rcp_dynamic_cast>(stepper) != Teuchos::null) { + TEST_FLOATING_EQUALITY(modifierX->testStageX, 0.09900990099009901, relTol); + TEST_FLOATING_EQUALITY(modifierX->testEndStageX, 0.09900990099009901, relTol); + } else if (rcp_dynamic_cast>(stepper) != Teuchos::null) { + TEST_FLOATING_EQUALITY(modifierX->testStageX, 0.04987531172069826, relTol); + TEST_FLOATING_EQUALITY(modifierX->testEndStageX, 0.04987531172069826, relTol); + } else if (rcp_dynamic_cast>(stepper) != Teuchos::null) { + TEST_FLOATING_EQUALITY(modifierX->testStageX, 0.09983340822548158, 1.0e-14); + TEST_FLOATING_EQUALITY(modifierX->testEndStageX, 0.09983340822548158, 1.0e-14); + } else if (rcp_dynamic_cast>(stepper) != Teuchos::null) { + TEST_FLOATING_EQUALITY(modifierX->testStageX, -0.009988159068259408, relTol); + TEST_FLOATING_EQUALITY(modifierX->testEndStageX, -0.009988159068259408, relTol); + } else if (rcp_dynamic_cast>(stepper) != Teuchos::null) { + TEST_FLOATING_EQUALITY(modifierX->testStageX, 0.06446224812649308, relTol); + TEST_FLOATING_EQUALITY(modifierX->testEndStageX, 0.06446224812649308, relTol); + } else if (rcp_dynamic_cast>(stepper) != Teuchos::null) { + TEST_FLOATING_EQUALITY(modifierX->testStageX, 0.001960592098813843, relTol); + TEST_FLOATING_EQUALITY(modifierX->testEndStageX, 0.001960592098813843, relTol); + } else if (rcp_dynamic_cast>(stepper) != Teuchos::null) { + TEST_FLOATING_EQUALITY(modifierX->testStageX, 0.09979317463412091, relTol); + TEST_FLOATING_EQUALITY(modifierX->testEndStageX, 0.09979317463412091, relTol); + } else { + TEUCHOS_TEST_FOR_EXCEPTION(true, std::logic_error, + "Error - unknown stepperType = "+stepper->getStepperType()); + } + } else { + // Stage values are overwritten and not available + // outside takeStep, so direct comparisons are needed. + if (rcp_dynamic_cast>(stepper) != Teuchos::null) { + TEST_FLOATING_EQUALITY(modifierX->testStageX, 0.09966666666666668, relTol); + TEST_FLOATING_EQUALITY(modifierX->testEndStageX, 0.09966666666666668, relTol); + } else if (rcp_dynamic_cast>(stepper) != Teuchos::null) { + TEST_FLOATING_EQUALITY(modifierX->testStageX, 0.1, relTol); + TEST_FLOATING_EQUALITY(modifierX->testEndStageX, 0.1, relTol); + } else if (rcp_dynamic_cast>(stepper) != Teuchos::null) { + TEST_FLOATING_EQUALITY(modifierX->testStageX, 0.06666666666666667, relTol); + TEST_FLOATING_EQUALITY(modifierX->testEndStageX, 0.06666666666666667, relTol); + } else if (rcp_dynamic_cast>(stepper) != Teuchos::null) { + TEST_FLOATING_EQUALITY(modifierX->testStageX, 0.05, relTol); + TEST_FLOATING_EQUALITY(modifierX->testEndStageX, 0.05, relTol); + } else if (rcp_dynamic_cast>(stepper) != Teuchos::null) { + TEST_FLOATING_EQUALITY(modifierX->testStageX, 0.0995, relTol); + TEST_FLOATING_EQUALITY(modifierX->testEndStageX, 0.0995, relTol); + } else if (rcp_dynamic_cast>(stepper) != Teuchos::null) { + TEST_FLOATING_EQUALITY(modifierX->testStageX, 0.09975, relTol); + TEST_FLOATING_EQUALITY(modifierX->testEndStageX, 0.09975, relTol); + } else if (rcp_dynamic_cast>(stepper) != Teuchos::null) { + TEST_FLOATING_EQUALITY(modifierX->testStageX, 0.06662222222222222, relTol); + TEST_FLOATING_EQUALITY(modifierX->testEndStageX, 0.06662222222222222, relTol); + } else if (rcp_dynamic_cast>(stepper) != Teuchos::null) { + TEST_FLOATING_EQUALITY(modifierX->testStageX, 0.09983333333333333, relTol); + TEST_FLOATING_EQUALITY(modifierX->testEndStageX, 0.09983333333333333, relTol); + } else if (rcp_dynamic_cast>(stepper) != Teuchos::null) { + TEST_FLOATING_EQUALITY(modifierX->testStageX, 0.0, relTol); + TEST_FLOATING_EQUALITY(modifierX->testEndStageX, 0.0, relTol); + } else if (rcp_dynamic_cast>(stepper) != Teuchos::null) { + TEST_FLOATING_EQUALITY(modifierX->testStageX, 0.09975, relTol); + TEST_FLOATING_EQUALITY(modifierX->testEndStageX, 0.09975, relTol); + } else if (rcp_dynamic_cast>(stepper) != Teuchos::null) { + TEST_FLOATING_EQUALITY(modifierX->testStageX, 0.09983333333333332, relTol); + TEST_FLOATING_EQUALITY(modifierX->testEndStageX, 0.09983333333333332, relTol); + } else if (rcp_dynamic_cast>(stepper) != Teuchos::null) { + TEST_FLOATING_EQUALITY(modifierX->testStageX, 0.05, relTol); + TEST_FLOATING_EQUALITY(modifierX->testEndStageX, 0.05, relTol); + } else if (rcp_dynamic_cast>(stepper) != Teuchos::null) { + TEST_FLOATING_EQUALITY(modifierX->testStageX, 0.1, relTol); + TEST_FLOATING_EQUALITY(modifierX->testEndStageX, 0.1, relTol); + } else { + TEUCHOS_TEST_FOR_EXCEPTION(true, std::logic_error, + "Error - unknown stepperType = "+stepper->getStepperType()); + } + } + } + + + // Test Composite. + { + stepper->setModel(model); + + auto modifier = rcp(new StepperRKModifierTest()); + auto observer = rcp(new StepperRKObserverTest()); + auto modifierX = rcp(new StepperRKModifierXTest()); + auto composite = rcp(new Tempus::StepperRKAppActionComposite()); + + composite->addRKAppAction(modifier); + composite->addRKAppAction(observer); + composite->addRKAppAction(modifierX); + stepper->setAppAction(composite); + + stepper->initialize(); + TEUCHOS_TEST_FOR_EXCEPT(!stepper->isInitialized()); + + // Create a SolutionHistory. + auto solutionHistory = Tempus::createSolutionHistoryME(model); + + // Take one time step. + stepper->setInitialConditions(solutionHistory); + solutionHistory->initWorkingState(); + double dt = 0.1; + solutionHistory->getWorkingState()->setTimeStep(dt); + stepper->takeStep(solutionHistory); + + auto xCS = solutionHistory->getCurrentState()->getX(); + auto xWS = solutionHistory->getWorkingState()->getX(); auto Dt = solutionHistory->getWorkingState()->getTimeStep(); - TEST_FLOATING_EQUALITY(modifierX->testDt, Dt, 1.0e-15); + + // Test Modifier. + // Testing that each ACTION_LOCATION has been called. + TEST_COMPARE(modifier->testBEGIN_STEP, ==, true); + TEST_COMPARE(modifier->testBEGIN_STAGE, ==, true); + TEST_COMPARE(modifier->testBEFORE_SOLVE, ==, true); + TEST_COMPARE(modifier->testAFTER_SOLVE, ==, true); + TEST_COMPARE(modifier->testBEFORE_EXPLICIT_EVAL, ==, true); + TEST_COMPARE(modifier->testEND_STAGE, ==, true); + TEST_COMPARE(modifier->testEND_STEP, ==, true); + + const double relTol = 1.0e-14; + // Testing that values can be set through the modifier. + TEST_FLOATING_EQUALITY(modifier->testCurrentValue, get_ele(*(xCS), 0),relTol); + TEST_FLOATING_EQUALITY(modifier->testWorkingValue, get_ele(*(xWS), 0),relTol); + TEST_FLOATING_EQUALITY(modifier->testDt, Dt/10.0, relTol); + + auto testType = testTypeOrig + " - Modifier"; + TEST_COMPARE(modifier->testType, ==, testType); + + + // Test Observer. + // Testing that each ACTION_LOCATION has been called. + TEST_COMPARE(observer->testBEGIN_STEP, ==, true); + TEST_COMPARE(observer->testBEGIN_STAGE, ==, true); + TEST_COMPARE(observer->testBEFORE_SOLVE, ==, true); + TEST_COMPARE(observer->testAFTER_SOLVE, ==, true); + TEST_COMPARE(observer->testBEFORE_EXPLICIT_EVAL, ==, true); + TEST_COMPARE(observer->testEND_STAGE, ==, true); + TEST_COMPARE(observer->testEND_STEP, ==, true); + + // Testing that values can be observed through the observer. + TEST_FLOATING_EQUALITY(observer->testCurrentValue, get_ele(*(xCS), 0),relTol); + TEST_FLOATING_EQUALITY(observer->testWorkingValue, get_ele(*(xWS), 0),relTol); + TEST_FLOATING_EQUALITY(observer->testDt, Dt/10.0, relTol); + + testType = testType + " - Observer"; + TEST_COMPARE(observer->testType, ==, testType); + + + // Test ModifierX. + // Testing that each ACTION_LOCATION has been called. + TEST_COMPARE(modifierX->testX_BEGIN_STEP, ==, true); + TEST_COMPARE(modifierX->testX_BEGIN_STAGE, ==, true); + TEST_COMPARE(modifierX->testX_BEFORE_SOLVE, ==, true); + TEST_COMPARE(modifierX->testX_AFTER_SOLVE, ==, true); + TEST_COMPARE(modifierX->testX_BEFORE_EXPLICIT_EVAL, ==, true); + TEST_COMPARE(modifierX->testXDOT_END_STAGE, ==, true); + TEST_COMPARE(modifierX->testX_END_STEP, ==, true); + + // Testing that values can be set through the modifierX. + TEST_FLOATING_EQUALITY(modifierX->testX, get_ele(*(xCS), 0), relTol); + TEST_FLOATING_EQUALITY(modifierX->testDt, Dt, relTol); auto time = solutionHistory->getWorkingState()->getTime(); - TEST_FLOATING_EQUALITY(modifierX->testTime, time, 1.0e-15); + TEST_FLOATING_EQUALITY(modifierX->testTime, time, relTol); + + // Stage Number should be -1 outside stage loop. + TEST_COMPARE(stepper->getStageNumber(), ==, -1); + // The last stage number through X_BEFORE_EXPLICIT_EVAL should be + // the number of stages minus one. + TEST_COMPARE(modifierX->testStageNumber,==,stepper->getNumberOfStages()-1); + + if (rcp_dynamic_cast>(stepper) != Teuchos::null || + rcp_dynamic_cast>(stepper) != Teuchos::null) { + TEST_FLOATING_EQUALITY(modifierX->testStageX, 2.0, relTol); + TEST_FLOATING_EQUALITY(modifierX->testEndStageX, 2.0,relTol); + } else if (stepper->isImplicit()) { + // Stage values are overwritten and not available + // outside takeStep, so direct comparisons are needed. + if (rcp_dynamic_cast>(stepper) != Teuchos::null) { + TEST_FLOATING_EQUALITY(modifierX->testStageX, 0.09900990099009901, relTol); + TEST_FLOATING_EQUALITY(modifierX->testEndStageX, 0.09900990099009901, relTol); + } else if (rcp_dynamic_cast>(stepper) != Teuchos::null) { + TEST_FLOATING_EQUALITY(modifierX->testStageX, 0.09979317463412091, relTol); + TEST_FLOATING_EQUALITY(modifierX->testEndStageX, 0.09979317463412091, relTol); + } else if (rcp_dynamic_cast>(stepper) != Teuchos::null) { + TEST_FLOATING_EQUALITY(modifierX->testStageX, 0.049921670528461, relTol); + TEST_FLOATING_EQUALITY(modifierX->testEndStageX, 0.049921670528461, relTol); + } else if (rcp_dynamic_cast>(stepper) != Teuchos::null) { + TEST_FLOATING_EQUALITY(modifierX->testStageX, 0.02171123447937569, relTol); + TEST_FLOATING_EQUALITY(modifierX->testEndStageX, 0.02171123447937569, relTol); + } else if (rcp_dynamic_cast>(stepper) != Teuchos::null) { + TEST_FLOATING_EQUALITY(modifierX->testStageX, 0.06659267480577136, relTol); + TEST_FLOATING_EQUALITY(modifierX->testEndStageX, 0.06659267480577136, relTol); + } else if (rcp_dynamic_cast>(stepper) != Teuchos::null) { + TEST_FLOATING_EQUALITY(modifierX->testStageX, 0.04987531172069826, relTol); + TEST_FLOATING_EQUALITY(modifierX->testEndStageX, 0.04987531172069826, relTol); + } else if (rcp_dynamic_cast>(stepper) != Teuchos::null) { + TEST_FLOATING_EQUALITY(modifierX->testStageX, 0.09975062344139651, relTol); + TEST_FLOATING_EQUALITY(modifierX->testEndStageX, 0.09975062344139651, relTol); + } else if (rcp_dynamic_cast>(stepper) != Teuchos::null) { + TEST_FLOATING_EQUALITY(modifierX->testStageX, 0.09975062344139651, relTol); + TEST_FLOATING_EQUALITY(modifierX->testEndStageX, 0.09975062344139651, relTol); + } else if (rcp_dynamic_cast>(stepper) != Teuchos::null) { + TEST_FLOATING_EQUALITY(modifierX->testStageX, 0.04987531172069826, relTol); + TEST_FLOATING_EQUALITY(modifierX->testEndStageX, 0.04987531172069826, relTol); + } else if (rcp_dynamic_cast>(stepper) != Teuchos::null) { + TEST_FLOATING_EQUALITY(modifierX->testStageX, 0.0748907323303947, relTol); + TEST_FLOATING_EQUALITY(modifierX->testEndStageX, 0.0748907323303947, relTol); + } else if (rcp_dynamic_cast>(stepper) != Teuchos::null) { + TEST_FLOATING_EQUALITY(modifierX->testStageX, 0.08321767099874625, relTol); + TEST_FLOATING_EQUALITY(modifierX->testEndStageX, 0.08321767099874625, relTol); + } else if (rcp_dynamic_cast>(stepper) != Teuchos::null) { + TEST_FLOATING_EQUALITY(modifierX->testStageX, 0.07878078755122744, relTol); + TEST_FLOATING_EQUALITY(modifierX->testEndStageX, 0.07878078755122744, relTol); + } else if (rcp_dynamic_cast>(stepper) != Teuchos::null) { + TEST_FLOATING_EQUALITY(modifierX->testStageX, 0.08525184184135257, relTol); + TEST_FLOATING_EQUALITY(modifierX->testEndStageX, 0.08525184184135257, relTol); + } else if (rcp_dynamic_cast>(stepper) != Teuchos::null) { + TEST_FLOATING_EQUALITY(modifierX->testStageX, 0.09900990099009901, relTol); + TEST_FLOATING_EQUALITY(modifierX->testEndStageX, 0.09900990099009901, relTol); + } else if (rcp_dynamic_cast>(stepper) != Teuchos::null) { + TEST_FLOATING_EQUALITY(modifierX->testStageX, 0.04987531172069826, relTol); + TEST_FLOATING_EQUALITY(modifierX->testEndStageX, 0.04987531172069826, relTol); + } else if (rcp_dynamic_cast>(stepper) != Teuchos::null) { + TEST_FLOATING_EQUALITY(modifierX->testStageX, 0.09983340822548158, relTol); + TEST_FLOATING_EQUALITY(modifierX->testEndStageX, 0.09983340822548158, relTol); + } else if (rcp_dynamic_cast>(stepper) != Teuchos::null) { + TEST_FLOATING_EQUALITY(modifierX->testStageX, -0.009988159068259408, relTol); + TEST_FLOATING_EQUALITY(modifierX->testEndStageX, -0.009988159068259408, relTol); + } else if (rcp_dynamic_cast>(stepper) != Teuchos::null) { + TEST_FLOATING_EQUALITY(modifierX->testStageX, 0.06446224812649308, relTol); + TEST_FLOATING_EQUALITY(modifierX->testEndStageX, 0.06446224812649308, relTol); + } else if (rcp_dynamic_cast>(stepper) != Teuchos::null) { + TEST_FLOATING_EQUALITY(modifierX->testStageX, 0.001960592098813843, relTol); + TEST_FLOATING_EQUALITY(modifierX->testEndStageX, 0.001960592098813843, relTol); + } else if (rcp_dynamic_cast>(stepper) != Teuchos::null) { + TEST_FLOATING_EQUALITY(modifierX->testStageX, 0.09979317463412091, relTol); + TEST_FLOATING_EQUALITY(modifierX->testEndStageX, 0.09979317463412091, relTol); + } else { + TEUCHOS_TEST_FOR_EXCEPTION(true, std::logic_error, + "Error - unknown stepperType = "+stepper->getStepperType()); + } + } else { + // For explicit steppers, stageX is under written and not available + // outside takeStep, so direct comparisons are needed. + if (rcp_dynamic_cast>(stepper) != Teuchos::null) { + TEST_FLOATING_EQUALITY(modifierX->testStageX, 0.09966666666666668, relTol); + TEST_FLOATING_EQUALITY(modifierX->testEndStageX, 0.09966666666666668, relTol); + } else if (rcp_dynamic_cast>(stepper) != Teuchos::null) { + TEST_FLOATING_EQUALITY(modifierX->testStageX, 0.1, relTol); + TEST_FLOATING_EQUALITY(modifierX->testEndStageX, 0.1, relTol); + } else if (rcp_dynamic_cast>(stepper) != Teuchos::null) { + TEST_FLOATING_EQUALITY(modifierX->testStageX, 0.06666666666666667, relTol); + TEST_FLOATING_EQUALITY(modifierX->testEndStageX, 0.06666666666666667, relTol); + } else if (rcp_dynamic_cast>(stepper) != Teuchos::null) { + TEST_FLOATING_EQUALITY(modifierX->testStageX, 0.05, relTol); + TEST_FLOATING_EQUALITY(modifierX->testEndStageX, 0.05, relTol); + } else if (rcp_dynamic_cast>(stepper) != Teuchos::null) { + TEST_FLOATING_EQUALITY(modifierX->testStageX, 0.0995, relTol); + TEST_FLOATING_EQUALITY(modifierX->testEndStageX, 0.0995, relTol); + } else if (rcp_dynamic_cast>(stepper) != Teuchos::null) { + TEST_FLOATING_EQUALITY(modifierX->testStageX, 0.09975, relTol); + TEST_FLOATING_EQUALITY(modifierX->testEndStageX, 0.09975, relTol); + } else if (rcp_dynamic_cast>(stepper) != Teuchos::null) { + TEST_FLOATING_EQUALITY(modifierX->testStageX, 0.06662222222222222, relTol); + TEST_FLOATING_EQUALITY(modifierX->testEndStageX, 0.06662222222222222, relTol); + } else if (rcp_dynamic_cast>(stepper) != Teuchos::null) { + TEST_FLOATING_EQUALITY(modifierX->testStageX, 0.09983333333333333, relTol); + TEST_FLOATING_EQUALITY(modifierX->testEndStageX, 0.09983333333333333, relTol); + } else if (rcp_dynamic_cast>(stepper) != Teuchos::null) { + TEST_FLOATING_EQUALITY(modifierX->testStageX, 0.0, relTol); + TEST_FLOATING_EQUALITY(modifierX->testEndStageX, 0.0, relTol); + } else if (rcp_dynamic_cast>(stepper) != Teuchos::null) { + TEST_FLOATING_EQUALITY(modifierX->testStageX, 0.09975, relTol); + TEST_FLOATING_EQUALITY(modifierX->testEndStageX, 0.09975, relTol); + } else if (rcp_dynamic_cast>(stepper) != Teuchos::null) { + TEST_FLOATING_EQUALITY(modifierX->testStageX, 0.09983333333333332, relTol); + TEST_FLOATING_EQUALITY(modifierX->testEndStageX, 0.09983333333333332, relTol); + } else if (rcp_dynamic_cast>(stepper) != Teuchos::null) { + TEST_FLOATING_EQUALITY(modifierX->testStageX, 0.05, relTol); + TEST_FLOATING_EQUALITY(modifierX->testEndStageX, 0.05, relTol); + } else if (rcp_dynamic_cast>(stepper) != Teuchos::null) { + TEST_FLOATING_EQUALITY(modifierX->testStageX, 0.1, relTol); + TEST_FLOATING_EQUALITY(modifierX->testEndStageX, 0.1, relTol); + } else { + TEUCHOS_TEST_FOR_EXCEPTION(true, std::logic_error, + "Error - unknown stepperType = "+stepper->getStepperType()); + } + } } } diff --git a/packages/teuchos/comm/src/Teuchos_DefaultMpiComm.hpp b/packages/teuchos/comm/src/Teuchos_DefaultMpiComm.hpp index d6a792387889..9add6bbc521b 100644 --- a/packages/teuchos/comm/src/Teuchos_DefaultMpiComm.hpp +++ b/packages/teuchos/comm/src/Teuchos_DefaultMpiComm.hpp @@ -727,6 +727,27 @@ createMpiComm( ); +/** \brief Helper function that creates a dynamically allocated + * MpiComm object or returns Teuchos::null to correctly + * represent a null communicator. + * + * Postconditions: + *
  • [rawMpiComm.get()!=NULL && *rawMpiComm!=MPI_COMM_NULL] + * return.get()!=NULL + *
  • [rawMpiComm.get()==NULL || *rawMpiComm==MPI_COMM_NULL] + * return.get()==NULL + * + * + * \relates MpiComm + */ +template +RCP > +createMpiComm( + const RCP > &rawMpiComm, + const int defaultTag + ); + + /** \brief Helper function that extracts a raw MPI_Comm object out of * a Teuchos::MpiComm wrapper object. * @@ -1807,6 +1828,19 @@ Teuchos::createMpiComm( } +template +Teuchos::RCP > +Teuchos::createMpiComm( + const RCP > &rawMpiComm, + const int defaultTag + ) +{ + if( rawMpiComm.get()!=NULL && *rawMpiComm != MPI_COMM_NULL ) + return rcp(new MpiComm(rawMpiComm, defaultTag)); + return Teuchos::null; +} + + template MPI_Comm Teuchos::getRawMpiComm(const Comm &comm) diff --git a/packages/teuchos/comm/src/Teuchos_StackedTimer.hpp b/packages/teuchos/comm/src/Teuchos_StackedTimer.hpp index 44e040861b81..f9238cc008ae 100644 --- a/packages/teuchos/comm/src/Teuchos_StackedTimer.hpp +++ b/packages/teuchos/comm/src/Teuchos_StackedTimer.hpp @@ -538,7 +538,8 @@ class StackedTimer auto now_time = std::chrono::system_clock::to_time_t(now); auto gmt = gmtime(&now_time); auto timestamp = std::put_time(gmt, "%Y-%m-%d %H:%M:%S"); - *verbose_ostream_ << "STARTING: " << name << " LEVEL: " << top_->level() << " TIMESTAMP: " << timestamp << std::endl; + auto ms = std::chrono::duration_cast(now.time_since_epoch()) % 1000; + *verbose_ostream_ << "STARTING: " << name << " LEVEL: " << top_->level() << " COUNT: " << timer_.numCalls() << " TIMESTAMP: " << timestamp << "." << ms.count() << std::endl; } } #endif @@ -575,7 +576,8 @@ class StackedTimer auto now_time = std::chrono::system_clock::to_time_t(now); auto gmt = gmtime(&now_time); auto timestamp = std::put_time(gmt, "%Y-%m-%d %H:%M:%S"); - *verbose_ostream_ << "STOPPING: " << name << " LEVEL: " << top_->level()+1 << " TIMESTAMP: " << timestamp << std::endl; + auto ms = std::chrono::duration_cast(now.time_since_epoch()) % 1000; + *verbose_ostream_ << "STOPPING: " << name << " LEVEL: " << top_->level()+1 << " COUNT: " << timer_.numCalls() << " TIMESTAMP: " << timestamp << "." << ms.count() << std::endl; } } #endif diff --git a/packages/teuchos/comm/test/Comm/DefaultMpiComm_UnitTests.cpp b/packages/teuchos/comm/test/Comm/DefaultMpiComm_UnitTests.cpp index 9bbac7893805..def0fb21e47c 100644 --- a/packages/teuchos/comm/test/Comm/DefaultMpiComm_UnitTests.cpp +++ b/packages/teuchos/comm/test/Comm/DefaultMpiComm_UnitTests.cpp @@ -188,6 +188,18 @@ TEUCHOS_UNIT_TEST( DefaultMpiComm, getRawMpiComm ) } +TEUCHOS_UNIT_TEST( DefaultMpiComm, getRawMpiCommWithTag ) +{ + ECHO(MPI_Comm rawMpiComm = MPI_COMM_WORLD); + ECHO(const RCP > comm = + Teuchos::createMpiComm(Teuchos::opaqueWrapper(rawMpiComm), 123)); + out << "comm = " << Teuchos::describe(*comm); + ECHO(MPI_Comm rawMpiComm2 = Teuchos::getRawMpiComm(*comm)); + TEST_EQUALITY( rawMpiComm2, rawMpiComm ); + TEST_EQUALITY( comm->getTag(), 123); +} + + #endif // HAVE_TEUCHOS_MPI diff --git a/packages/teuchos/comm/test/Comm/reduce.cpp b/packages/teuchos/comm/test/Comm/reduce.cpp index c05ebc0dc347..eac1975ef830 100644 --- a/packages/teuchos/comm/test/Comm/reduce.cpp +++ b/packages/teuchos/comm/test/Comm/reduce.cpp @@ -53,9 +53,6 @@ bool testReduceSum (bool& success, std::ostream& out, const int root, const Teuchos::Comm& comm) { -#ifdef HAVE_TEUCHOS_MPI - using Teuchos::MpiComm; -#endif // HAVE_TEUCHOS_MPI using Teuchos::reduce; using Teuchos::TypeNameTraits; using std::endl; diff --git a/packages/teuchos/comm/test/Comm/scatter.cpp b/packages/teuchos/comm/test/Comm/scatter.cpp index 0ca961d28463..001009029c4e 100644 --- a/packages/teuchos/comm/test/Comm/scatter.cpp +++ b/packages/teuchos/comm/test/Comm/scatter.cpp @@ -53,9 +53,6 @@ bool testScatter (bool& success, std::ostream& out, const int root, const Teuchos::Comm& comm) { -#ifdef HAVE_TEUCHOS_MPI - using Teuchos::MpiComm; -#endif // HAVE_TEUCHOS_MPI using Teuchos::scatter; using Teuchos::TypeNameTraits; using std::endl; diff --git a/packages/teuchos/parameterlist/src/Teuchos_StandardParameterEntryValidators.cpp b/packages/teuchos/parameterlist/src/Teuchos_StandardParameterEntryValidators.cpp index db9cd18deece..bace79da8379 100644 --- a/packages/teuchos/parameterlist/src/Teuchos_StandardParameterEntryValidators.cpp +++ b/packages/teuchos/parameterlist/src/Teuchos_StandardParameterEntryValidators.cpp @@ -307,7 +307,7 @@ long long AnyNumberParameterEntryValidator::getLongLong( if( acceptedTypes_.allowLongLong() && anyValue.type() == typeid(long long) ) return any_cast(anyValue); if( acceptedTypes_.allowDouble() && anyValue.type() == typeid(double) ) - return as(any_cast(anyValue)); + return as(any_cast(anyValue)); if( acceptedTypes_.allowString() && anyValue.type() == typeid(std::string) ) return convertStringToLongLong(any_cast(anyValue)); throwTypeError(entry,paramName,sublistName); diff --git a/packages/thyra/adapters/tpetra/src/Thyra_TpetraThyraWrappers.cpp b/packages/thyra/adapters/tpetra/src/Thyra_TpetraThyraWrappers.cpp index aef6299e69e1..0a0749e2c27a 100644 --- a/packages/thyra/adapters/tpetra/src/Thyra_TpetraThyraWrappers.cpp +++ b/packages/thyra/adapters/tpetra/src/Thyra_TpetraThyraWrappers.cpp @@ -61,7 +61,7 @@ Thyra::convertTpetraToThyraComm(const RCP > &tpetraComm const RCP > tpetraMpiComm = rcp_dynamic_cast >(tpetraComm); if (nonnull(tpetraMpiComm)) { - return Teuchos::createMpiComm(tpetraMpiComm->getRawMpiComm()); + return Teuchos::createMpiComm(tpetraMpiComm->getRawMpiComm(),tpetraMpiComm->getTag()); } #endif // HAVE_MPI diff --git a/packages/tpetra/core/example/advanced/Benchmarks/CrsMatrixDenseRowUnpack.cpp b/packages/tpetra/core/example/advanced/Benchmarks/CrsMatrixDenseRowUnpack.cpp index 618795fef82f..44e7fd875e98 100644 --- a/packages/tpetra/core/example/advanced/Benchmarks/CrsMatrixDenseRowUnpack.cpp +++ b/packages/tpetra/core/example/advanced/Benchmarks/CrsMatrixDenseRowUnpack.cpp @@ -96,7 +96,11 @@ getTargetRowMapIndices(const LO lclNumRows, TEUCHOS_ASSERT(gblRow < indexBase + gblNumRows); tgtGids[lid] = gblRow; } - return std::move(tgtGids); + // The original return using std::move (commented out below) returns the + // following warning with gcc 9.2.0: + // waring: moving a local object in a return statement prevents copy elision [-Wpessimizing-move] + //return std::move(tgtGids); + return tgtGids; } RCP diff --git a/packages/tpetra/core/example/advanced/Benchmarks/CrsMatrixMatVec.cpp b/packages/tpetra/core/example/advanced/Benchmarks/CrsMatrixMatVec.cpp index 113af682dccf..6721fbdcc664 100644 --- a/packages/tpetra/core/example/advanced/Benchmarks/CrsMatrixMatVec.cpp +++ b/packages/tpetra/core/example/advanced/Benchmarks/CrsMatrixMatVec.cpp @@ -252,15 +252,15 @@ getTpetraCrsMatrix (Teuchos::FancyOStream& out, using Teuchos::rcp; using std::endl; using matrix_type = Tpetra::CrsMatrix<>; - using device_type = matrix_type::device_type; + //using device_type = matrix_type::device_type; using SC = matrix_type::impl_scalar_type; - using KAT = Kokkos::ArithTraits; + //using KAT = Kokkos::ArithTraits; using LO = Tpetra::Map<>::local_ordinal_type; - using host_device_type = Kokkos::View::host_mirror_space; - using host_execution_space = host_device_type::execution_space; + //using host_device_type = Kokkos::View::host_mirror_space; + //using host_execution_space = host_device_type::execution_space; // We're filling on the host, so generate random numbers on the host. - using pool_type = Kokkos::Random_XorShift64_Pool; + //using pool_type = Kokkos::Random_XorShift64_Pool; Teuchos::OSTab tab0 (out); out << "Create CrsMatrix for benchmark" << endl; diff --git a/packages/tpetra/core/ext/TpetraExt_MatrixMatrix_Cuda.hpp b/packages/tpetra/core/ext/TpetraExt_MatrixMatrix_Cuda.hpp index 789b2697dca1..7f38ff3e7fd4 100644 --- a/packages/tpetra/core/ext/TpetraExt_MatrixMatrix_Cuda.hpp +++ b/packages/tpetra/core/ext/TpetraExt_MatrixMatrix_Cuda.hpp @@ -659,7 +659,7 @@ void KernelWrappers2 diagonal(diagLength); diags.get1dCopy(diagonal()); - for(LocalOrdinal i = 0; i < diagLength; ++i) { + for(size_t i = 0; i < diagLength; ++i) { TEUCHOS_TEST_FOR_EXCEPTION(diagonal[i] == Teuchos::ScalarTraits::zero(), std::runtime_error, "Matrix A has a zero/missing diagonal: " << diagonal[i] << std::endl << diff --git a/packages/tpetra/core/ext/TpetraExt_MatrixMatrix_OpenMP.hpp b/packages/tpetra/core/ext/TpetraExt_MatrixMatrix_OpenMP.hpp index 7bda7a003ab7..77a3481e77ee 100644 --- a/packages/tpetra/core/ext/TpetraExt_MatrixMatrix_OpenMP.hpp +++ b/packages/tpetra/core/ext/TpetraExt_MatrixMatrix_OpenMP.hpp @@ -534,7 +534,7 @@ void KernelWrappers2 diagonal(diagLength); diags.get1dCopy(diagonal()); - for(LocalOrdinal i = 0; i < diagLength; ++i) { + for(size_t i = 0; i < diagLength; ++i) { TEUCHOS_TEST_FOR_EXCEPTION(diagonal[i] == Teuchos::ScalarTraits::zero(), std::runtime_error, "Matrix A has a zero/missing diagonal: " << diagonal[i] << std::endl << diff --git a/packages/tpetra/core/ext/TpetraExt_MatrixMatrix_decl.hpp b/packages/tpetra/core/ext/TpetraExt_MatrixMatrix_decl.hpp index e062666fa302..1b302c6a43bf 100644 --- a/packages/tpetra/core/ext/TpetraExt_MatrixMatrix_decl.hpp +++ b/packages/tpetra/core/ext/TpetraExt_MatrixMatrix_decl.hpp @@ -49,6 +49,7 @@ #include "Tpetra_CrsMatrix.hpp" #include "Tpetra_Vector.hpp" #include "TpetraExt_MMHelpers.hpp" +#include "KokkosKernels_Handle.hpp" /*! \file TpetraExt_MatrixMatrix_decl.hpp @@ -556,7 +557,7 @@ struct AddKernels typedef Tpetra::Map map_type; typedef typename Node::device_type device_type; typedef typename device_type::execution_space execution_space; - typedef typename execution_space::memory_space memory_space; + typedef typename device_type::memory_space memory_space; typedef typename crs_matrix_type::impl_scalar_type impl_scalar_type; typedef typename crs_matrix_type::local_matrix_type KCRS; typedef typename KCRS::values_type::non_const_type values_array; @@ -566,6 +567,8 @@ struct AddKernels typedef typename map_type::local_map_type local_map_type; typedef typename Kokkos::View global_col_inds_array; typedef Kokkos::RangePolicy range_type; + typedef KokkosKernels::Experimental::KokkosKernelsHandle KKH; /// \brief Given two matrices in CRS format, return their sum /// \pre A and B must both have column indices sorted within each row diff --git a/packages/tpetra/core/ext/TpetraExt_MatrixMatrix_def.hpp b/packages/tpetra/core/ext/TpetraExt_MatrixMatrix_def.hpp index 36c05bf027cb..bd8106370923 100644 --- a/packages/tpetra/core/ext/TpetraExt_MatrixMatrix_def.hpp +++ b/packages/tpetra/core/ext/TpetraExt_MatrixMatrix_def.hpp @@ -813,10 +813,7 @@ add (const Scalar& alpha, col_inds_array, global_col_inds_array, typename map_type::local_map_type> (localColinds, globalColinds, CcolMap->getLocalMap())); - //TODO: use KokkosKernels batched sort on device as soon as it's available - //But now, have to sort on host (using UVM) - exec_space().fence(); - Tpetra::Import_Util::sortCrsEntries(rowptrs, localColinds, vals); + KokkosKernels::Impl::sort_crs_matrix(rowptrs, localColinds, vals); C.setAllValues(rowptrs, localColinds, vals); C.fillComplete(CDomainMap, CRangeMap, params); if(!doFillComplete) @@ -1684,7 +1681,7 @@ void mult_A_B_newmatrix( // Run through all the hash table lookups once and for all lo_view_t targetMapToOrigRow(Kokkos::ViewAllocateWithoutInitializing("targetMapToOrigRow"),Aview.colMap->getNodeNumElements()); lo_view_t targetMapToImportRow(Kokkos::ViewAllocateWithoutInitializing("targetMapToImportRow"),Aview.colMap->getNodeNumElements()); - Kokkos::fence(); + Kokkos::parallel_for("Tpetra::mult_A_B_newmatrix::construct_tables",range_type(Aview.colMap->getMinLocalIndex(), Aview.colMap->getMaxLocalIndex()+1),KOKKOS_LAMBDA(const LO i) { GO aidx = Acolmap_local.getGlobalElement(i); LO B_LID = Browmap_local.getLocalElement(aidx); @@ -3161,12 +3158,11 @@ addSorted( typename MMdetails::AddKernels::col_inds_array& Ccolinds) { using Teuchos::TimeMonitor; + using AddKern = MMdetails::AddKernels; TEUCHOS_TEST_FOR_EXCEPTION(Arowptrs.extent(0) != Browptrs.extent(0), std::runtime_error, "Can't add matrices with different numbers of rows."); auto nrows = Arowptrs.extent(0) - 1; Crowptrs = row_ptrs_array(Kokkos::ViewAllocateWithoutInitializing("C row ptrs"), nrows + 1); - typedef KokkosKernels::Experimental::KokkosKernelsHandle KKH; - KKH handle; + typename AddKern::KKH handle; handle.create_spadd_handle(true); auto addHandle = handle.get_spadd_handle(); #ifdef HAVE_TPETRA_MMM_TIMINGS @@ -3208,13 +3204,12 @@ addUnsorted( typename MMdetails::AddKernels::col_inds_array& Ccolinds) { using Teuchos::TimeMonitor; + using AddKern = MMdetails::AddKernels; TEUCHOS_TEST_FOR_EXCEPTION(Arowptrs.extent(0) != Browptrs.extent(0), std::runtime_error, "Can't add matrices with different numbers of rows."); auto nrows = Arowptrs.extent(0) - 1; Crowptrs = row_ptrs_array(Kokkos::ViewAllocateWithoutInitializing("C row ptrs"), nrows + 1); typedef MMdetails::AddKernels AddKern; - typedef KokkosKernels::Experimental::KokkosKernelsHandle KKH; - KKH handle; + typename AddKern::KKH handle; handle.create_spadd_handle(false); auto addHandle = handle.get_spadd_handle(); #ifdef HAVE_TPETRA_MMM_TIMINGS @@ -3277,6 +3272,10 @@ convertToGlobalAndAdd( typename MMdetails::AddKernels::global_col_inds_array& Ccolinds) { using Teuchos::TimeMonitor; + //Need to use a different KokkosKernelsHandle type than other versions, + //since the ordinals are now GO + using KKH_GO = KokkosKernels::Experimental::KokkosKernelsHandle; const values_array Avals = A.values; const values_array Bvals = B.values; @@ -3293,9 +3292,7 @@ convertToGlobalAndAdd( Kokkos::parallel_for("Tpetra_MatrixMatrix_convertColIndsA", range_type(0, Acolinds.extent(0)), convertA); ConvertLocalToGlobalFunctor convertB(Bcolinds, BcolindsConverted, BcolMap); Kokkos::parallel_for("Tpetra_MatrixMatrix_convertColIndsB", range_type(0, Bcolinds.extent(0)), convertB); - typedef KokkosKernels::Experimental::KokkosKernelsHandle KKH; - KKH handle; + KKH_GO handle; handle.create_spadd_handle(false); auto addHandle = handle.get_spadd_handle(); #ifdef HAVE_TPETRA_MMM_TIMINGS @@ -3305,7 +3302,7 @@ convertToGlobalAndAdd( auto nrows = Arowptrs.extent(0) - 1; Crowptrs = row_ptrs_array(Kokkos::ViewAllocateWithoutInitializing("C row ptrs"), nrows + 1); KokkosSparse::Experimental::spadd_symbolic - + (&handle, Arowptrs, AcolindsConverted, Browptrs, BcolindsConverted, Crowptrs); Cvals = values_array("C values", addHandle->get_max_result_nnz()); Ccolinds = global_col_inds_array(Kokkos::ViewAllocateWithoutInitializing("C colinds"), addHandle->get_max_result_nnz()); diff --git a/packages/tpetra/core/ext/TpetraExt_TripleMatrixMultiply_def.hpp b/packages/tpetra/core/ext/TpetraExt_TripleMatrixMultiply_def.hpp index 3c21632f6293..7352a058a2e3 100644 --- a/packages/tpetra/core/ext/TpetraExt_TripleMatrixMultiply_def.hpp +++ b/packages/tpetra/core/ext/TpetraExt_TripleMatrixMultiply_def.hpp @@ -757,7 +757,7 @@ namespace Tpetra { // Run through all the hash table lookups once and for all lo_view_t targetMapToOrigRow(Kokkos::ViewAllocateWithoutInitializing("targetMapToOrigRow"),Aview.colMap->getNodeNumElements()); lo_view_t targetMapToImportRow(Kokkos::ViewAllocateWithoutInitializing("targetMapToImportRow"),Aview.colMap->getNodeNumElements()); - Kokkos::fence(); + Kokkos::parallel_for("Tpetra::mult_R_A_P_newmatrix::construct_tables",range_type(Aview.colMap->getMinLocalIndex(), Aview.colMap->getMaxLocalIndex()+1),KOKKOS_LAMBDA(const LO i) { GO aidx = Acolmap_local.getGlobalElement(i); LO P_LID = Prowmap_local.getLocalElement(aidx); diff --git a/packages/tpetra/core/guide/src/alabaster/static/alabaster.css_t b/packages/tpetra/core/guide/src/alabaster/static/alabaster.css_t index 86d452fcdbf5..6520b0d6ff52 100755 --- a/packages/tpetra/core/guide/src/alabaster/static/alabaster.css_t +++ b/packages/tpetra/core/guide/src/alabaster/static/alabaster.css_t @@ -571,14 +571,14 @@ a:hover tt, a:hover code { } /* Make nested-list/multi-paragraph items look better in Releases changelog - * pages. Without this, docutils' magical list fuckery causes inconsistent + * pages. Without this, docutils' list processing causes inconsistent * formatting between different release sub-lists. */ div#changelog > div.section > ul > li > p:only-child { margin-bottom: 0; } -/* Hide fugly table cell borders in ..bibliography:: directive output */ +/* Hide ugly table cell borders in ..bibliography:: directive output */ table.docutils.citation, table.docutils.citation td, table.docutils.citation th { border: none; /* Below needed in some edge cases; if not applied, bottom shadows appear */ diff --git a/packages/tpetra/core/inout/MatrixMarket_Tpetra.hpp b/packages/tpetra/core/inout/MatrixMarket_Tpetra.hpp index 9eead641cc4a..9b08e3a506ca 100644 --- a/packages/tpetra/core/inout/MatrixMarket_Tpetra.hpp +++ b/packages/tpetra/core/inout/MatrixMarket_Tpetra.hpp @@ -1657,7 +1657,7 @@ namespace Tpetra { if (comm->getRank () == 0) { try { in.open (filename.c_str ()); - opened = 1; + opened = in.is_open(); } catch (...) { opened = 0; @@ -1724,7 +1724,7 @@ namespace Tpetra { if (pComm->getRank () == 0) { try { in.open (filename.c_str ()); - opened = 1; + opened = in.is_open(); } catch (...) { opened = 0; @@ -1817,7 +1817,7 @@ namespace Tpetra { if (comm->getRank () == 0) { try { in.open (filename.c_str ()); - opened = 1; + opened = in.is_open(); } catch (...) { opened = 0; @@ -2149,7 +2149,7 @@ namespace Tpetra { if (myRank == 0) { try { in.open (filename.c_str ()); - opened = 1; + opened = in.is_open(); } catch (...) { opened = 0; @@ -3925,10 +3925,25 @@ namespace Tpetra { const bool tolerant=false, const bool debug=false) { + using Teuchos::broadcast; + using Teuchos::outArg; + std::ifstream in; - if (comm->getRank () == 0) { // Only open the file on Proc 0. - in.open (filename.c_str ()); // Destructor closes safely + int opened = 0; + if (comm->getRank() == 0) { + try { + in.open (filename.c_str ()); + opened = in.is_open(); + } + catch (...) { + opened = 0; + } } + broadcast (*comm, 0, outArg (opened)); + TEUCHOS_TEST_FOR_EXCEPTION( + opened == 0, std::runtime_error, + "readDenseFile: Failed to open file \"" << filename << "\" on " + "Process 0."); return readDense (in, comm, map, tolerant, debug); } @@ -3969,10 +3984,25 @@ namespace Tpetra { const bool tolerant=false, const bool debug=false) { + using Teuchos::broadcast; + using Teuchos::outArg; + std::ifstream in; - if (comm->getRank () == 0) { // Only open the file on Proc 0. - in.open (filename.c_str ()); // Destructor closes safely + int opened = 0; + if (comm->getRank() == 0) { + try { + in.open (filename.c_str ()); + opened = in.is_open(); + } + catch (...) { + opened = 0; + } } + broadcast (*comm, 0, outArg (opened)); + TEUCHOS_TEST_FOR_EXCEPTION( + opened == 0, std::runtime_error, + "readVectorFile: Failed to open file \"" << filename << "\" on " + "Process 0."); return readVector (in, comm, map, tolerant, debug); } @@ -5579,7 +5609,7 @@ namespace Tpetra { "Please report this bug to the Tpetra developers."); } } - }; + }; // class Reader /// \class Writer /// \brief Matrix Market file writer for CrsMatrix and MultiVector. diff --git a/packages/tpetra/core/src/Tpetra_Core.cpp b/packages/tpetra/core/src/Tpetra_Core.cpp index 452813214631..e8634ae4a00d 100644 --- a/packages/tpetra/core/src/Tpetra_Core.cpp +++ b/packages/tpetra/core/src/Tpetra_Core.cpp @@ -46,8 +46,10 @@ #include #include +#include "Tpetra_Details_checkLaunchBlocking.hpp" namespace Tpetra { + namespace { // (anonymous) class HideOutputExceptOnProcess0 { @@ -148,7 +150,7 @@ namespace Tpetra { tpetraInitializedKokkos_ = true; } } - + Details::checkOldCudaLaunchBlocking(); const bool kokkosIsInitialized = Kokkos::is_initialized (); TEUCHOS_TEST_FOR_EXCEPTION diff --git a/packages/tpetra/core/src/Tpetra_CrsGraph_decl.hpp b/packages/tpetra/core/src/Tpetra_CrsGraph_decl.hpp index 4f2b162eb369..b9c28ea9fc71 100644 --- a/packages/tpetra/core/src/Tpetra_CrsGraph_decl.hpp +++ b/packages/tpetra/core/src/Tpetra_CrsGraph_decl.hpp @@ -256,7 +256,9 @@ namespace Tpetra { //! The type of the part of the sparse graph on each MPI process. using local_graph_type = Kokkos::StaticCrsGraph; + device_type, + void, + size_t>; //! The Map specialization used by this class. using map_type = ::Tpetra::Map; @@ -1937,7 +1939,6 @@ namespace Tpetra { /// Global constants include: ///
      ///
    • globalNumEntries_
      • - ///
    • globalNumDiags_
      • ///
    • globalMaxNumRowEntries_
      • ///
    /// @@ -1946,17 +1947,7 @@ namespace Tpetra { ///
  • globalNumEntries_
    • ///
  • globalMaxNumRowEntries_
    • /// - /// - /// Only compute the following if the input argument - /// computeLocalTriangularConstants is true: - ///
      - ///
    • globalNumDiags_
      • - ///
    - /// The bool input argument comes from an input ParameterList bool - /// parameter "compute local triangular constants", named - /// analogously to the existing bool parameter "compute global - /// constants". - void computeGlobalConstants (const bool computeLocalTriangularConstants); + void computeGlobalConstants (); protected: /// \brief Compute local constants, if they have not yet been computed. @@ -1968,9 +1959,6 @@ namespace Tpetra { /// /// Local constants include: ///
      - ///
    • lowerTriangular_
      • - ///
    • upperTriangular_
      • - ///
    • nodeNumDiags_
      • ///
    • nodeMaxNumRowEntries_
      • ///
    /// @@ -1979,21 +1967,9 @@ namespace Tpetra { ///
  • nodeMaxNumRowEntries_
    • /// /// - /// Only compute the following if the input argument - /// computeLocalTriangularConstants is true: - ///
      - ///
    • lowerTriangular_
      • - ///
    • upperTriangular_
      • - ///
    • nodeNumDiags_
      • - ///
    - /// The bool input argument comes from an input ParameterList bool - /// parameter "compute local triangular constants", named - /// analogously to the existing bool parameter "compute global - /// constants". - /// /// computeGlobalConstants calls this method, if global constants /// have not yet been computed. - void computeLocalConstants (const bool computeLocalTriangularConstants); + void computeLocalConstants (); /// \brief Get information about the locally owned row with local /// index myRow. @@ -2159,11 +2135,6 @@ namespace Tpetra { //! Local graph; only initialized after first fillComplete() call. local_graph_type lclGraph_; - /// \brief Local number of (populated) diagonal entries. - /// - /// Computed in computeLocalConstants(); only valid when isFillComplete(). - size_t nodeNumDiags_ = Teuchos::OrdinalTraits::invalid(); - /// \brief Local maximum of the number of entries in each row. /// /// Computed in computeLocalConstants; only valid when @@ -2177,13 +2148,6 @@ namespace Tpetra { global_size_t globalNumEntries_ = Teuchos::OrdinalTraits::invalid(); - /// \brief Global number of (populated) diagonal entries. - /// - /// Computed in computeGlobalConstants; only valid when - /// isFillComplete() is true. - global_size_t globalNumDiags_ = - Teuchos::OrdinalTraits::invalid(); - /// \brief Global maximum of the number of entries in each row. /// /// Computed in computeGlobalConstants(); only valid when @@ -2321,10 +2285,6 @@ namespace Tpetra { bool indicesAreGlobal_ = false; bool fillComplete_ = false; - //! Whether the graph is locally lower triangular. - bool lowerTriangular_ = false; - //! Whether the graph is locally upper triangular. - bool upperTriangular_ = false; //! Whether the graph's indices are sorted in each row, on this process. bool indicesAreSorted_ = true; /// \brief Whether the graph's indices are non-redundant (merged) @@ -2361,7 +2321,6 @@ namespace Tpetra { static bool getDebug(); /// \brief Whether to do extra debug checks. - /// /// This comes from Tpetra::Details::Behavior::debug("CrsGraph"). bool debug_ = getDebug(); diff --git a/packages/tpetra/core/src/Tpetra_CrsGraph_def.hpp b/packages/tpetra/core/src/Tpetra_CrsGraph_def.hpp index 8d4da6b7c027..6c5e52ef4e9e 100644 --- a/packages/tpetra/core/src/Tpetra_CrsGraph_def.hpp +++ b/packages/tpetra/core/src/Tpetra_CrsGraph_def.hpp @@ -64,7 +64,6 @@ #include "Tpetra_Import_Util2.hpp" #include "Tpetra_Details_packCrsGraph.hpp" #include "Tpetra_Details_unpackCrsGraphAndCombine.hpp" -#include "Tpetra_Details_determineLocalTriangularStructure.hpp" #include "Tpetra_Details_CrsPadding.hpp" #include "Tpetra_Util.hpp" #include @@ -655,11 +654,9 @@ namespace Tpetra { const bool callComputeGlobalConstants = params.get () == nullptr || params->get ("compute global constants", true); - const bool computeLocalTriangularConstants = params.get () == nullptr || - params->get ("compute local triangular constants", true); if (callComputeGlobalConstants) { - this->computeGlobalConstants (computeLocalTriangularConstants); + this->computeGlobalConstants (); } this->fillComplete_ = true; this->checkInternalState (); @@ -710,11 +707,8 @@ namespace Tpetra { const bool callComputeGlobalConstants = params.get () == nullptr || params->get ("compute global constants", true); - const bool computeLocalTriangularConstants = - params.get () == nullptr || - params->get ("compute local triangular constants", true); if (callComputeGlobalConstants) { - this->computeGlobalConstants (computeLocalTriangularConstants); + this->computeGlobalConstants (); } fillComplete_ = true; checkInternalState (); @@ -2069,7 +2063,6 @@ namespace Tpetra { const auto INV = Teuchos::OrdinalTraits::invalid(); globalNumEntries_ = INV; - globalNumDiags_ = INV; globalMaxNumRowEntries_ = INV; haveGlobalConstants_ = false; } @@ -3378,8 +3371,6 @@ namespace Tpetra { { clearGlobalConstants(); if (params != Teuchos::null) this->setParameterList (params); - lowerTriangular_ = false; - upperTriangular_ = false; // either still sorted/merged or initially sorted/merged indicesAreSorted_ = true; noRedundancies_ = true; @@ -3619,13 +3610,11 @@ namespace Tpetra { const bool callComputeGlobalConstants = params.get () == nullptr || params->get ("compute global constants", true); - const bool computeLocalTriangularConstants = params.get () == nullptr || - params->get ("compute local triangular constants", true); if (callComputeGlobalConstants) { - this->computeGlobalConstants (computeLocalTriangularConstants); + this->computeGlobalConstants (); } else { - this->computeLocalConstants (computeLocalTriangularConstants); + this->computeLocalConstants (); } this->fillComplete_ = true; this->checkInternalState (); @@ -3754,22 +3743,20 @@ namespace Tpetra { const bool callComputeGlobalConstants = params.get () == nullptr || params->get ("compute global constants", true); - const bool computeLocalTriangularConstants = params.get () == nullptr || - params->get ("compute local triangular constants", true); if (callComputeGlobalConstants) { #ifdef HAVE_TPETRA_MMM_TIMINGS MM = Teuchos::null; MM = Teuchos::rcp(new TimeMonitor(*TimeMonitor::getNewTimer(prefix + std::string("ESFC-G-cGC (const)")))); #endif // HAVE_TPETRA_MMM_TIMINGS - this->computeGlobalConstants (computeLocalTriangularConstants); + this->computeGlobalConstants (); } else { #ifdef HAVE_TPETRA_MMM_TIMINGS MM = Teuchos::null; MM = Teuchos::rcp(new TimeMonitor(*TimeMonitor::getNewTimer(prefix + std::string("ESFC-G-cGC (noconst)")))); #endif // HAVE_TPETRA_MMM_TIMINGS - this->computeLocalConstants (computeLocalTriangularConstants); + this->computeLocalConstants (); } fillComplete_ = true; @@ -4327,7 +4314,7 @@ namespace Tpetra { template void CrsGraph:: - computeGlobalConstants (const bool computeLocalTriangularConstants) + computeGlobalConstants () { using ::Tpetra::Details::ProfilingRegion; using Teuchos::ArrayView; @@ -4337,7 +4324,7 @@ namespace Tpetra { ProfilingRegion regionCGC ("Tpetra::CrsGraph::computeGlobalConstants"); - this->computeLocalConstants (computeLocalTriangularConstants); + this->computeLocalConstants (); // Compute global constants from local constants. Processes that // already have local constants still participate in the @@ -4356,29 +4343,11 @@ namespace Tpetra { // good idea to use nonblocking all-reduces (MPI 3), so that we // don't have to wait around for the first one to finish before // starting the second one. - GST lcl[2], gbl[2]; - lcl[0] = static_cast (this->getNodeNumEntries ()); - - // mfh 03 May 2018: nodeNumDiags_ is invalid if - // computeLocalTriangularConstants is false, but there's no - // practical network latency difference between an all-reduce of - // length 1 and an all-reduce of length 2, so it's not worth - // distinguishing between the two. However, we do want to avoid - // integer overflow, so we'll just set the input local sum to - // zero in that case. - lcl[1] = computeLocalTriangularConstants ? - static_cast (this->nodeNumDiags_) : - static_cast (0); - - reduceAll (comm, Teuchos::REDUCE_SUM, 2, lcl, gbl); - this->globalNumEntries_ = gbl[0]; - - // mfh 03 May 2018: If not computing local triangular - // properties, users want this to be invalid, not just zero. - // This will help with debugging. - this->globalNumDiags_ = computeLocalTriangularConstants ? - gbl[1] : - Teuchos::OrdinalTraits::invalid (); + GST lcl, gbl; + lcl = static_cast (this->getNodeNumEntries ()); + + reduceAll (comm, Teuchos::REDUCE_SUM, 1, &lcl, &gbl); + this->globalNumEntries_ = gbl; const GST lclMaxNumRowEnt = static_cast (this->nodeMaxNumRowEntries_); reduceAll (comm, Teuchos::REDUCE_MAX, lclMaxNumRowEnt, @@ -4391,9 +4360,8 @@ namespace Tpetra { template void CrsGraph:: - computeLocalConstants (const bool computeLocalTriangularConstants) + computeLocalConstants () { - using ::Tpetra::Details::determineLocalTriangularStructure; using ::Tpetra::Details::ProfilingRegion; ProfilingRegion regionCLC ("Tpetra::CrsGraph::computeLocalConstants"); @@ -4402,56 +4370,30 @@ namespace Tpetra { } // Reset local properties - this->lowerTriangular_ = false; - this->upperTriangular_ = false; this->nodeMaxNumRowEntries_ = Teuchos::OrdinalTraits::invalid(); - this->nodeNumDiags_ = Teuchos::OrdinalTraits::invalid(); - - if (computeLocalTriangularConstants) { - const bool hasRowAndColumnMaps = - this->rowMap_.get () != nullptr && this->colMap_.get () != nullptr; - if (hasRowAndColumnMaps) { - auto lclRowMap = this->rowMap_->getLocalMap (); - auto lclColMap = this->colMap_->getLocalMap (); - - // Make sure that the GPU can see any updates made on host. - // This code only reads the local graph, so we don't need a - // fence afterwards. - execution_space().fence (); - - // mfh 01 May 2018: See GitHub Issue #2658. - constexpr bool ignoreMapsForTriStruct = true; - auto result = - determineLocalTriangularStructure (this->lclGraph_, lclRowMap, - lclColMap, ignoreMapsForTriStruct); - this->lowerTriangular_ = result.couldBeLowerTriangular; - this->upperTriangular_ = result.couldBeUpperTriangular; - this->nodeMaxNumRowEntries_ = result.maxNumRowEnt; - this->nodeNumDiags_ = result.diagCount; - } - else { - this->nodeMaxNumRowEntries_ = 0; - this->nodeNumDiags_ = 0; - } - } - else { - using LO = local_ordinal_type; - // Make sure that the GPU can see any updates made on host. - // This code only reads the local graph, so we don't need a - // fence afterwards. - execution_space().fence (); - auto ptr = this->lclGraph_.row_map; - const LO lclNumRows = ptr.extent(0) == 0 ? - static_cast (0) : - (static_cast (ptr.extent(0)) - static_cast (1)); + using LO = local_ordinal_type; - const LO lclMaxNumRowEnt = - ::Tpetra::Details::maxDifference ("Tpetra::CrsGraph: nodeMaxNumRowEntries", - ptr, lclNumRows); - this->nodeMaxNumRowEntries_ = static_cast (lclMaxNumRowEnt); - } + // KJ: This one is a bit different from the above. Conservatively thinking, + // we also need the fence here as lclGraph_.row_map is on UVM and it can be + // still updated. In practice, the local graph construction should be done + // before this is called. This routine is computeLocalConstants. If we want + // a better code, we need a flag stating that the local graph is completed + // and safe to use it without fence. + // For now, I recommend to put the fence. Defining the state of local + // object can be improvements in the code. + execution_space().fence (); + + auto ptr = this->lclGraph_.row_map; + const LO lclNumRows = ptr.extent(0) == 0 ? + static_cast (0) : + (static_cast (ptr.extent(0)) - static_cast (1)); + + const LO lclMaxNumRowEnt = + ::Tpetra::Details::maxDifference ("Tpetra::CrsGraph: nodeMaxNumRowEntries", + ptr, lclNumRows); + this->nodeMaxNumRowEntries_ = static_cast (lclMaxNumRowEnt); this->haveLocalConstants_ = true; } @@ -4907,7 +4849,6 @@ namespace Tpetra { if (myImageID == 0) out << this->description() << std::endl; // O(1) globals, minus what was already printed by description() if (isFillComplete() && myImageID == 0) { - out << "Global number of diagonals = " << globalNumDiags_ << std::endl; out << "Global max number of row entries = " << globalMaxNumRowEntries_ << std::endl; } // constituent objects @@ -4933,7 +4874,6 @@ namespace Tpetra { if (myImageID == imageCtr) { out << "Node ID = " << imageCtr << std::endl << "Node number of entries = " << this->getNodeNumEntries () << std::endl - << "Node number of diagonals = " << nodeNumDiags_ << std::endl << "Node max number of entries = " << nodeMaxNumRowEntries_ << std::endl; if (! indicesAreAllocated ()) { out << "Indices are not allocated." << std::endl; @@ -7594,11 +7534,9 @@ namespace Tpetra { std::swap(graph.lclGraph_, this->lclGraph_); - std::swap(graph.nodeNumDiags_, this->nodeNumDiags_); std::swap(graph.nodeMaxNumRowEntries_, this->nodeMaxNumRowEntries_); std::swap(graph.globalNumEntries_, this->globalNumEntries_); - std::swap(graph.globalNumDiags_, this->globalNumDiags_); std::swap(graph.globalMaxNumRowEntries_, this->globalMaxNumRowEntries_); std::swap(graph.numAllocForAllRows_, this->numAllocForAllRows_); @@ -7614,8 +7552,6 @@ namespace Tpetra { std::swap(graph.indicesAreLocal_, this->indicesAreLocal_); std::swap(graph.indicesAreGlobal_, this->indicesAreGlobal_); std::swap(graph.fillComplete_, this->fillComplete_); - std::swap(graph.lowerTriangular_, this->lowerTriangular_); - std::swap(graph.upperTriangular_, this->upperTriangular_); std::swap(graph.indicesAreSorted_, this->indicesAreSorted_); std::swap(graph.noRedundancies_, this->noRedundancies_); std::swap(graph.haveLocalConstants_, this->haveLocalConstants_); @@ -7665,11 +7601,9 @@ namespace Tpetra { output = this->rangeMap_->isSameAs( *(graph.rangeMap_) ) ? output : false; output = this->domainMap_->isSameAs( *(graph.domainMap_) ) ? output : false; - output = this->nodeNumDiags_ == graph.nodeNumDiags_ ? output : false; output = this->nodeMaxNumRowEntries_ == graph.nodeMaxNumRowEntries_ ? output : false; output = this->globalNumEntries_ == graph.globalNumEntries_ ? output : false; - output = this->globalNumDiags_ == graph.globalNumDiags_ ? output : false; output = this->globalMaxNumRowEntries_ == graph.globalMaxNumRowEntries_ ? output : false; output = this->numAllocForAllRows_ == graph.numAllocForAllRows_ ? output : false; @@ -7680,8 +7614,6 @@ namespace Tpetra { output = this->indicesAreLocal_ == graph.indicesAreLocal_ ? output : false; output = this->indicesAreGlobal_ == graph.indicesAreGlobal_ ? output : false; output = this->fillComplete_ == graph.fillComplete_ ? output : false; - output = this->lowerTriangular_ == graph.lowerTriangular_ ? output : false; - output = this->upperTriangular_ == graph.upperTriangular_ ? output : false; output = this->indicesAreSorted_ == graph.indicesAreSorted_ ? output : false; output = this->noRedundancies_ == graph.noRedundancies_ ? output : false; output = this->haveLocalConstants_ == graph.haveLocalConstants_ ? output : false; diff --git a/packages/tpetra/core/src/Tpetra_CrsMatrix_decl.hpp b/packages/tpetra/core/src/Tpetra_CrsMatrix_decl.hpp index bebb20404273..6ed251961f95 100644 --- a/packages/tpetra/core/src/Tpetra_CrsMatrix_decl.hpp +++ b/packages/tpetra/core/src/Tpetra_CrsMatrix_decl.hpp @@ -496,6 +496,12 @@ namespace Tpetra { void, typename local_graph_type::size_type>; + /// \brief The type of the local matrix-vector operator (a wrapper of \c KokkosSparse::CrsMatrix ) + using local_multiply_op_type = + LocalCrsMatrixOperator; + //@} //! @name Constructors and destructor //@{ @@ -2176,6 +2182,12 @@ namespace Tpetra { /// method. local_matrix_type getLocalMatrix () const; + /// \brief The local sparse matrix operator (a wrapper of \c getLocalMatrix() + /// that supports local matrix-vector multiply) + /// + /// \warning It is only valid to call this method if this->isFillComplete(). + std::shared_ptr getLocalMultiplyOperator () const; + /// \brief Number of global elements in the row map of this matrix. /// /// This is not the number of rows in the matrix as a @@ -4356,10 +4368,6 @@ namespace Tpetra { Teuchos::RCP< Graph> myGraph_; //@} - using local_multiply_op_type = - LocalCrsMatrixOperator; //! The local sparse matrix, wrapped in a multiply operator. std::shared_ptr lclMatrix_; diff --git a/packages/tpetra/core/src/Tpetra_CrsMatrix_def.hpp b/packages/tpetra/core/src/Tpetra_CrsMatrix_def.hpp index 80d92a878855..e97b1d59f16c 100644 --- a/packages/tpetra/core/src/Tpetra_CrsMatrix_def.hpp +++ b/packages/tpetra/core/src/Tpetra_CrsMatrix_def.hpp @@ -48,10 +48,10 @@ /// for you). If you only want the declaration of Tpetra::CrsMatrix, /// include "Tpetra_CrsMatrix_decl.hpp". -#include "Tpetra_LocalCrsMatrixOperator.hpp" #include "Tpetra_Import_Util.hpp" #include "Tpetra_Import_Util2.hpp" #include "Tpetra_RowMatrix.hpp" +#include "Tpetra_LocalCrsMatrixOperator.hpp" #include "Tpetra_Details_Behavior.hpp" #include "Tpetra_Details_castAwayConstDualView.hpp" @@ -1042,6 +1042,14 @@ namespace Tpetra { lclMatrix_->getLocalMatrix (); } + template + std::shared_ptr::local_multiply_op_type> + CrsMatrix:: + getLocalMultiplyOperator () const + { + return lclMatrix_; + } + template bool CrsMatrix:: @@ -4077,7 +4085,6 @@ namespace Tpetra { using Teuchos::RCP; using Teuchos::rcp; using Teuchos::rcpFromRef; - using LO = local_ordinal_type; using vec_type = Vector; const char tfecfFuncName[] = "leftScale: "; @@ -4106,17 +4113,7 @@ namespace Tpetra { "either the row Map or the range Map of the CrsMatrix."); } - // Check whether A has a valid local matrix. It might not if it - // was not created with a local matrix, and if fillComplete has - // never been called on it before. A never-initialized (and thus - // invalid) local matrix has zero rows, because it was default - // constructed. - const LO lclNumRows = - static_cast (this->getRowMap ()->getNodeNumElements ()); - const bool validLocalMatrix = lclMatrix_.get () != nullptr && - lclMatrix_->getLocalMatrix ().numRows () == lclNumRows; - - if (validLocalMatrix) { + if (this->isFillComplete()) { using dev_memory_space = typename device_type::memory_space; if (xp->template need_sync ()) { using Teuchos::rcp_const_cast; @@ -4129,19 +4126,10 @@ namespace Tpetra { x_lcl_1d, false, false); } else { - execution_space().fence (); // for UVM's sake - - ArrayRCP vectorVals = xp->getData (0); - ArrayView rowValues = Teuchos::null; - for (LocalOrdinal i = 0; i < lclNumRows; ++i) { - const RowInfo rowinfo = this->staticGraph_->getRowInfo (i); - rowValues = this->getViewNonConst (rowinfo); - const impl_scalar_type scaleValue = static_cast (vectorVals[i]); - for (size_t j = 0; j < rowinfo.numEntries; ++j) { - rowValues[j] *= scaleValue; - } - } - execution_space().fence (); // for UVM's sake + // 6/2020 Disallow leftScale of non-fillComplete matrices #7446 + TEUCHOS_TEST_FOR_EXCEPTION_CLASS_FUNC + (true, std::runtime_error, "CrsMatrix::leftScale requires matrix to be" + " fillComplete"); } } @@ -4157,7 +4145,6 @@ namespace Tpetra { using Teuchos::RCP; using Teuchos::rcp; using Teuchos::rcpFromRef; - using LO = local_ordinal_type; typedef Vector vec_type; const char tfecfFuncName[] = "rightScale: "; @@ -4185,17 +4172,7 @@ namespace Tpetra { "either the domain Map or the column Map of the CrsMatrix."); } - // Check whether A has a valid local matrix. It might not if it - // was not created with a local matrix, and if fillComplete has - // never been called on it before. A never-initialized (and thus - // invalid) local matrix has zero rows, because it was default - // constructed. - const LO lclNumRows = - static_cast (this->getRowMap ()->getNodeNumElements ()); - const bool validLocalMatrix = lclMatrix_.get () != nullptr && - lclMatrix_->getLocalMatrix ().numRows () == lclNumRows; - - if (validLocalMatrix) { + if (this->isFillComplete()) { using dev_memory_space = typename device_type::memory_space; if (xp->template need_sync ()) { using Teuchos::rcp_const_cast; @@ -4208,20 +4185,10 @@ namespace Tpetra { x_lcl_1d, false, false); } else { - execution_space().fence (); // for UVM's sake - - ArrayRCP vectorVals = xp->getData (0); - ArrayView rowValues = null; - for (LO i = 0; i < lclNumRows; ++i) { - const RowInfo rowinfo = this->staticGraph_->getRowInfo (i); - rowValues = this->getViewNonConst (rowinfo); - ArrayView colInds; - this->getCrsGraphRef ().getLocalRowView (i, colInds); - for (size_t j = 0; j < rowinfo.numEntries; ++j) { - rowValues[j] *= static_cast (vectorVals[colInds[j]]); - } - } - execution_space().fence (); // for UVM's sake + // 6/2020 Disallow rightScale of non-fillComplete matrices #7446 + TEUCHOS_TEST_FOR_EXCEPTION_CLASS_FUNC + (true, std::runtime_error, "CrsMatrix::rightScale requires matrix to be" + " fillComplete"); } } @@ -4733,6 +4700,9 @@ namespace Tpetra { os << *prefix << endl; std::cerr << os.str (); } + Details::ProfilingRegion region( + "Tpetra::CrsMatrix::fillCompete", + "fillCompete"); TEUCHOS_TEST_FOR_EXCEPTION_CLASS_FUNC (! this->isFillActive () || this->isFillComplete (), std::runtime_error, @@ -4743,54 +4713,57 @@ namespace Tpetra { // // Read parameters from the input ParameterList. // - - // If true, the caller promises that no process did nonlocal - // changes since the last call to fillComplete. - bool assertNoNonlocalInserts = false; - // If true, makeColMap sorts remote GIDs (within each remote - // process' group). - bool sortGhosts = true; - - if (! params.is_null ()) { - assertNoNonlocalInserts = params->get ("No Nonlocal Changes", - assertNoNonlocalInserts); - if (params->isParameter ("sort column map ghost gids")) { - sortGhosts = params->get ("sort column map ghost gids", sortGhosts); - } - else if (params->isParameter ("Sort column Map ghost GIDs")) { - sortGhosts = params->get ("Sort column Map ghost GIDs", sortGhosts); - } - } - // We also don't need to do global assembly if there is only one - // process in the communicator. - const bool needGlobalAssemble = ! assertNoNonlocalInserts && numProcs > 1; - // This parameter only matters if this matrix owns its graph. - if (! this->myGraph_.is_null ()) { - this->myGraph_->sortGhostsAssociatedWithEachProcessor_ = sortGhosts; - } - - if (! this->getCrsGraphRef ().indicesAreAllocated ()) { - if (this->hasColMap ()) { // use local indices - allocateValues(LocalIndices, GraphNotYetAllocated, verbose); + { + Details::ProfilingRegion region_fc("Tpetra::CrsMatrix::fillCompete", "ParameterList"); + + // If true, the caller promises that no process did nonlocal + // changes since the last call to fillComplete. + bool assertNoNonlocalInserts = false; + // If true, makeColMap sorts remote GIDs (within each remote + // process' group). + bool sortGhosts = true; + + if (! params.is_null ()) { + assertNoNonlocalInserts = params->get ("No Nonlocal Changes", + assertNoNonlocalInserts); + if (params->isParameter ("sort column map ghost gids")) { + sortGhosts = params->get ("sort column map ghost gids", sortGhosts); + } + else if (params->isParameter ("Sort column Map ghost GIDs")) { + sortGhosts = params->get ("Sort column Map ghost GIDs", sortGhosts); + } + } + // We also don't need to do global assembly if there is only one + // process in the communicator. + const bool needGlobalAssemble = ! assertNoNonlocalInserts && numProcs > 1; + // This parameter only matters if this matrix owns its graph. + if (! this->myGraph_.is_null ()) { + this->myGraph_->sortGhostsAssociatedWithEachProcessor_ = sortGhosts; + } + + if (! this->getCrsGraphRef ().indicesAreAllocated ()) { + if (this->hasColMap ()) { // use local indices + allocateValues(LocalIndices, GraphNotYetAllocated, verbose); + } + else { // no column Map, so use global indices + allocateValues(GlobalIndices, GraphNotYetAllocated, verbose); + } + } + // Global assemble, if we need to. This call only costs a single + // all-reduce if we didn't need global assembly after all. + if (needGlobalAssemble) { + this->globalAssemble (); } - else { // no column Map, so use global indices - allocateValues(GlobalIndices, GraphNotYetAllocated, verbose); + else { + TEUCHOS_TEST_FOR_EXCEPTION_CLASS_FUNC + (numProcs == 1 && nonlocals_.size() > 0, + std::runtime_error, "Cannot have nonlocal entries on a serial run. " + "An invalid entry (i.e., with row index not in the row Map) must have " + "been submitted to the CrsMatrix."); } } - // Global assemble, if we need to. This call only costs a single - // all-reduce if we didn't need global assembly after all. - if (needGlobalAssemble) { - this->globalAssemble (); - } - else { - TEUCHOS_TEST_FOR_EXCEPTION_CLASS_FUNC - (numProcs == 1 && nonlocals_.size() > 0, - std::runtime_error, "Cannot have nonlocal entries on a serial run. " - "An invalid entry (i.e., with row index not in the row Map) must have " - "been submitted to the CrsMatrix."); - } - if (this->isStaticGraph ()) { + Details::ProfilingRegion region_isg("Tpetra::CrsMatrix::fillCompete", "isStaticGraph"); // FIXME (mfh 14 Nov 2016) In order to fix #843, I enable the // checks below only in debug mode. It would be nicer to do a // local check, then propagate the error state in a deferred @@ -4840,6 +4813,7 @@ namespace Tpetra { this->fillLocalMatrix (params); } else { + Details::ProfilingRegion region_insg("Tpetra::CrsMatrix::fillCompete", "isNotStaticGraph"); // Set the graph's domain and range Maps. This will clear the // Import if the domain Map has changed (is a different // pointer), and the Export if the range Map has changed (is a @@ -4880,28 +4854,36 @@ namespace Tpetra { const bool callGraphComputeGlobalConstants = params.get () == nullptr || params->get ("compute global constants", true); - const bool computeLocalTriangularConstants = params.get () == nullptr || - params->get ("compute local triangular constants", true); if (callGraphComputeGlobalConstants) { - this->myGraph_->computeGlobalConstants (computeLocalTriangularConstants); + this->myGraph_->computeGlobalConstants (); } else { - this->myGraph_->computeLocalConstants (computeLocalTriangularConstants); + this->myGraph_->computeLocalConstants (); } this->myGraph_->fillComplete_ = true; this->myGraph_->checkInternalState (); } - const bool callComputeGlobalConstants = params.get () == nullptr || - params->get ("compute global constants", true); - if (callComputeGlobalConstants) { - this->computeGlobalConstants (); + { + Details::ProfilingRegion region_ccgc( + "Tpetra::CrsMatrix::fillCompete", "callComputeGlobalConstamnts" + ); + const bool callComputeGlobalConstants = params.get () == nullptr || + params->get ("compute global constants", true); + if (callComputeGlobalConstants) { + this->computeGlobalConstants (); + } } // FIXME (mfh 28 Aug 2014) "Preserve Local Graph" bool parameter no longer used. this->fillComplete_ = true; // Now we're fill complete! - this->checkInternalState (); + { + Details::ProfilingRegion region_cis( + "Tpetra::CrsMatrix::fillCompete", "checkInternalState" + ); + this->checkInternalState (); + } } template @@ -5464,7 +5446,14 @@ namespace Tpetra { std::runtime_error, "X and Y may not alias one another."); } - lclMatrix_->apply (X_lcl, Y_lcl, mode, alpha, beta); + LocalOrdinal nrows = getNodeNumRows(); + LocalOrdinal maxRowImbalance = 0; + if(nrows != 0) + maxRowImbalance = getNodeMaxNumRowEntries() - (getNodeNumEntries() / nrows); + if(size_t(maxRowImbalance) >= Tpetra::Details::Behavior::rowImbalanceThreshold()) + lclMatrix_->applyImbalancedRows (X_lcl, Y_lcl, mode, alpha, beta); + else + lclMatrix_->apply (X_lcl, Y_lcl, mode, alpha, beta); } template @@ -7284,6 +7273,11 @@ namespace Tpetra { typedef GlobalOrdinal GO; typedef impl_scalar_type ST; + Details::ProfilingRegion region_upack_row( + "Tpetra::CrsMatrix::unpackRow", + "Import/Export" + ); + if (numBytes == 0) { // Rows with zero bytes should always have zero entries. if (numEnt != 0) { @@ -7475,6 +7469,7 @@ namespace Tpetra { Distributor& dist) const { // The call to packNew in packAndPrepare catches and handles any exceptions. + Details::ProfilingRegion region_pack_new("Tpetra::CrsMatrix::packNew", "Import/Export"); if (this->isStaticGraph ()) { using ::Tpetra::Details::packCrsMatrixNew; packCrsMatrixNew (*this, exports, numPacketsPerLID, exportLIDs, @@ -7902,6 +7897,10 @@ namespace Tpetra { const CombineMode combineMode, const bool verbose) { + Details::ProfilingRegion region_unpack_and_combine_impl( + "Tpetra::CrsMatrix::unpackAndCombineImpl", + "Import/Export" + ); using std::endl; const char tfecfFuncName[] = "unpackAndCombineImpl"; std::unique_ptr prefix; @@ -8019,6 +8018,11 @@ namespace Tpetra { return; // nothing to do; no need to combine entries } + Details::ProfilingRegion region_unpack_and_combine_impl_non_static( + "Tpetra::CrsMatrix::unpackAndCombineImplNonStatic", + "Import/Export" + ); + // We're unpacking on host. This is read-only host access. if (imports.need_sync_host()) { imports.sync_host (); @@ -9596,7 +9600,7 @@ namespace Tpetra { } Teuchos::ArrayView EPID1 = MyImporter.is_null() ? Teuchos::ArrayView() : MyImporter->getExportPIDs(); - Teuchos::ArrayView ELID1 = MyImporter.is_null() ? Teuchos::ArrayView() : MyImporter->getExportLIDs(); + Teuchos::ArrayView ELID1 = MyImporter.is_null() ? Teuchos::ArrayView() : MyImporter->getExportLIDs(); Teuchos::ArrayView TEPID2 = rowTransfer.getExportPIDs(); // row matrix Teuchos::ArrayView TELID2 = rowTransfer.getExportLIDs(); diff --git a/packages/tpetra/core/src/Tpetra_Details_Behavior.cpp b/packages/tpetra/core/src/Tpetra_Details_Behavior.cpp index a769c7aef494..72f1739b9676 100644 --- a/packages/tpetra/core/src/Tpetra_Details_Behavior.cpp +++ b/packages/tpetra/core/src/Tpetra_Details_Behavior.cpp @@ -48,6 +48,7 @@ #include #include #include "Teuchos_TestForException.hpp" +#include "Teuchos_OrdinalTraits.hpp" #include namespace Tpetra { @@ -56,6 +57,7 @@ namespace Details { namespace BehaviorDetails { std::map > namedVariableMap_; bool verboseDisabled_ = false; +bool timingDisabled_ = false; } namespace { // (anonymous) @@ -188,12 +190,16 @@ namespace { // (anonymous) else { // This could throw invalid_argument or out_of_range. // Go ahead and let it do so. - const long long val = std::stoll(stringToUpper(varVal)); - TEUCHOS_TEST_FOR_EXCEPTION - (val < static_cast(0), std::out_of_range, - prefix << "Environment variable \"" - << environmentVariableName << "\" is supposed to be a size, " - "but it has a negative integer value " << val << "."); + long long val = std::stoll(stringToUpper(varVal)); + if (val < static_cast(0)) { + // If negative - user has requested threshold be lifted + return std::numeric_limits::max(); + } +// TEUCHOS_TEST_FOR_EXCEPTION +// (val < static_cast(0), std::out_of_range, +// prefix << "Environment variable \"" +// << environmentVariableName << "\" is supposed to be a size, " +// "but it has a negative integer value " << val << "."); if (sizeof(long long) > sizeof(size_t)) { // It's hard to test this code, but I want to try writing it // at least, in case we ever have to run on 32-bit machines or @@ -271,6 +277,10 @@ namespace { // (anonymous) return false; } + constexpr bool timingDefault () { + return false; + } + constexpr bool assumeMpiIsCudaAwareDefault () { #ifdef TPETRA_ASSUME_CUDA_AWARE_MPI return true; @@ -279,6 +289,10 @@ namespace { // (anonymous) #endif // TPETRA_ASSUME_CUDA_AWARE_MPI } + constexpr bool hierarchicalUnpackDefault () { + return true; + } + } // namespace (anonymous) bool Behavior::debug () @@ -309,6 +323,21 @@ bool Behavior::verbose () defaultValue); } +bool Behavior::timing () +{ + if (BehaviorDetails::timingDisabled_) return false; + + constexpr char envVarName[] = "TPETRA_TIMING"; + constexpr bool defaultValue = timingDefault (); + + static bool value_ = defaultValue; + static bool initialized_ = false; + return idempotentlyGetEnvironmentVariableAsBool (value_, + initialized_, + envVarName, + defaultValue); +} + bool Behavior::assumeMpiIsCudaAware () { constexpr char envVarName[] = "TPETRA_ASSUME_CUDA_AWARE_MPI"; @@ -347,9 +376,9 @@ size_t Behavior::verbosePrintCountThreshold () (value_, initialized_, envVarName, defaultValue); } -size_t Behavior::longRowMinNumEntries () +size_t Behavior::rowImbalanceThreshold () { - constexpr char envVarName[] = "TPETRA_LONG_ROW_MIN_NUM_ENTRIES"; + constexpr char envVarName[] = "TPETRA_ROW_IMBALANCE_THRESHOLD"; constexpr size_t defaultValue (256); static size_t value_ = defaultValue; @@ -358,7 +387,18 @@ size_t Behavior::longRowMinNumEntries () (value_, initialized_, envVarName, defaultValue); } -size_t Behavior::multivectorKernelLocationThreshold () +bool Behavior::useMergePathMultiVector() +{ + constexpr char envVarName[] = "TPETRA_MULTIVECTOR_USE_MERGE_PATH"; + constexpr bool defaultValue = false; + + static bool value_ = defaultValue; + static bool initialized_ = false; + return idempotentlyGetEnvironmentVariableAsBool + (value_, initialized_, envVarName, defaultValue); +} + + size_t Behavior::multivectorKernelLocationThreshold () { constexpr char envVarName[] = "TPETRA_VECTOR_DEVICE_THRESHOLD"; constexpr size_t defaultValue (10000); @@ -369,7 +409,38 @@ size_t Behavior::multivectorKernelLocationThreshold () (value_, initialized_, envVarName, defaultValue); } -bool Behavior::profilingRegionUseTeuchosTimers () +size_t Behavior::hierarchicalUnpackBatchSize () +{ + constexpr char envVarName[] = "TPETRA_HIERARCHICAL_UNPACK_BATCH_SIZE"; + +#ifdef HAVE_TPETRA_INST_CUDA + constexpr size_t defaultValue (16); +#else + constexpr size_t defaultValue (256); +#endif + + static size_t value_ = defaultValue; + static bool initialized_ = false; + return idempotentlyGetEnvironmentVariableAsSize + (value_, initialized_, envVarName, defaultValue); +} + +size_t Behavior::hierarchicalUnpackTeamSize () +{ + constexpr char envVarName[] = "TPETRA_HIERARCHICAL_UNPACK_TEAM_SIZE"; +#ifdef HAVE_TPETRA_INST_CUDA + const size_t defaultValue (16); +#else + const size_t defaultValue (Teuchos::OrdinalTraits::invalid ()); +#endif + + static size_t value_ = defaultValue; + static bool initialized_ = false; + return idempotentlyGetEnvironmentVariableAsSize + (value_, initialized_, envVarName, defaultValue); +} + +bool Behavior::profilingRegionUseTeuchosTimers () { constexpr char envVarName[] = "TPETRA_USE_TEUCHOS_TIMERS"; constexpr bool defaultValue(false); @@ -380,7 +451,7 @@ bool Behavior::profilingRegionUseTeuchosTimers () (value_, initialized_, envVarName, defaultValue); } -bool Behavior::profilingRegionUseKokkosProfiling () +bool Behavior::profilingRegionUseKokkosProfiling () { constexpr char envVarName[] = "TPETRA_USE_KOKKOS_PROFILING"; constexpr bool defaultValue(false); @@ -426,6 +497,41 @@ void Behavior::disable_verbose_behavior () { BehaviorDetails::verboseDisabled_ = true; } +bool Behavior::timing (const char name[]) +{ + if (BehaviorDetails::timingDisabled_) return false; + + constexpr char envVarName[] = "TPETRA_TIMING"; + constexpr bool defaultValue = false; + + static bool initialized_ = false; + return idempotentlyGetNamedEnvironmentVariableAsBool (name, + initialized_, + envVarName, + defaultValue); +} + +void Behavior::enable_timing() { + BehaviorDetails::timingDisabled_ = false; +} + +void Behavior::disable_timing() { + BehaviorDetails::timingDisabled_ = true; +} + +bool Behavior::hierarchicalUnpack () +{ + constexpr char envVarName[] = "TPETRA_HIERARCHICAL_UNPACK"; + constexpr bool defaultValue = hierarchicalUnpackDefault(); + + static bool value_ = defaultValue; + static bool initialized_ = false; + return idempotentlyGetEnvironmentVariableAsBool (value_, + initialized_, + envVarName, + defaultValue); +} + } // namespace Details } // namespace Tpetra diff --git a/packages/tpetra/core/src/Tpetra_Details_Behavior.hpp b/packages/tpetra/core/src/Tpetra_Details_Behavior.hpp index 1bc24215d64e..78d5fb2ffbb6 100644 --- a/packages/tpetra/core/src/Tpetra_Details_Behavior.hpp +++ b/packages/tpetra/core/src/Tpetra_Details_Behavior.hpp @@ -97,20 +97,22 @@ namespace Details { /// /// TPETRA_DEBUG: flags Tpetra to turn on debug checking. /// TPETRA_VERBOSE: flags Tpetra to turn on debug _output_. +/// TPETRA_TIMING: flags Tpetra to turn on timing code. /// /// These are two different things. For example, TPETRA_DEBUG may do extra MPI /// communication in order to ensure correct error state propagation, but /// TPETRA_DEBUG should never print copious debug output if no errors occurred. /// The idea is that if users get a mysterious error or hang, they can rerun /// with TPETRA_DEBUG set. TPETRA_VERBOSE is for Tpetra developers to use for -/// debugging Tpetra. +/// debugging Tpetra. TPETRA_TIMING is for Tpetra developers to use for timing +/// Tpetra. /// /// The environment variables are understood to be "on" or "off" and recognized -/// if specified in one of two ways. The first is to specify the variable -/// unconditionally ON or OFF. e.g., TPETRA_VERBOSE=ON or TPETRA_VERBOSE=OFF. -/// The default value of TPETRA_VERBOSE is always OFF. The default value for -/// TPETRA_DEBUG is ON if Tpetra is configured with Tpetra_ENABLE_DEBUG, -/// otherwise it is OFF +/// if specified in one of two ways. The first is to specify the variable +/// unconditionally ON or OFF. e.g., TPETRA_[VERBOSE,DEBUG,TIMING]=ON or +/// TPETRA_[VERBOSE,DEBUG,TIMING]=OFF. The default value of TPETRA_VERBOSE and +/// TPETRA_TIMING is always OFF. The default value for TPETRA_DEBUG is ON if +/// Tpetra is configured with Tpetra_ENABLE_DEBUG, otherwise it is OFF. /// /// The second is to specify the variable on a per class/object basis, e.g., /// TPETRA_VERBOSE=CrsGraph,CrsMatrix,Distributor means that verbose output @@ -154,6 +156,24 @@ class Behavior { /// \brief Enable verbose mode, programatically static void enable_verbose_behavior (); + /// \brief Whether Tpetra is in timing mode. + /// + /// "Timing mode" means that Tpetra enables code that instruments internal timing. + static bool timing (); + + /// \brief Whether the given Tpetra object is in timing mode. + /// + /// \param name [in] Name of the Tpetra object. Typically, the object would + /// be a class name, e.g., "CrsGraph" or method, e.g., + /// "CrsGraph::insertLocalIndices". + static bool timing (const char name[]); + + /// \brief Disable timing, programatically + static void disable_timing(); + + /// \brief Enable timing, programatically + static void enable_timing(); + /// \brief Whether to assume that MPI is CUDA aware. /// /// An MPI implementation is "CUDA aware" if it can accept CUDA @@ -182,23 +202,41 @@ class Behavior { /// variable. static size_t verbosePrintCountThreshold (); - /// \brief Minimum number of entries in a "long" sparse graph or - /// matrix row. + /// \brief Threshold for deciding if a local matrix is "imbalanced" in + /// the number of entries per row. The threshold is compared against + /// the difference between maximum row length and average row length. /// - /// If a local row of a sparse graph or matrix has this many or more - /// entries, we consider it "long." Tpetra has the option to treat - /// "long" rows separately from shorter rows in algorithms like + /// The threshold is measured in max number of entries in excess of the + /// average (it is not a proportion between max and average). + /// + /// If the "imbalance" of a local matrix is greater than this threshold, + /// a different algorithm may be used for some operations like /// sparse matrix-vector multiply, packAndPrepare, and /// unpackAndCombine. You may control this at run time via the - /// TPETRA_LONG_ROW_MIN_NUM_ENTRIES environment variable. - /// - /// This is an absolute value, not a relative value. This matters - /// for thread parallelization, because the point is to decide how - /// much parallelism needs to be available in a row in order to - /// treat it differently from other rows. Whether a row has enough - /// entries to treat it as "dense" relative to other rows, is a - /// separate question. - static size_t longRowMinNumEntries (); + /// TPETRA_ROW_IMBALANCE_THRESHOLD environment variable. + static size_t rowImbalanceThreshold (); + + /// \brief Whether to use the cuSPARSE merge path algorithm to perform + /// sparse matrix-multivector products, one vector at a time. Depending on + /// the matrix and the number of vectors in the multivector, this may + /// be better than just applying the default SpMV algorithm to the entire + /// multivector at once. + /// + /// Note: full support for merge path SPMV on multivectors + /// is coming soon. + /// + /// You may control this at run time via the + /// TPETRA_MULTIVECTOR_USE_MERGE_PATH environment variable (default: false) + static bool useMergePathMultiVector(); + + /// \brief Unpack rows of a matrix using hierarchical unpacking + static bool hierarchicalUnpack (); + + /// \brief Size of batch for hierarchical unpacking + static size_t hierarchicalUnpackBatchSize (); + + /// \brief Size of team for hierarchical unpacking + static size_t hierarchicalUnpackTeamSize (); /// \brief the threshold for transitioning from device to host /// diff --git a/packages/tpetra/core/src/Tpetra_Details_FixedHashTable_def.hpp b/packages/tpetra/core/src/Tpetra_Details_FixedHashTable_def.hpp index 5d18d61c1e08..b2eaacb48669 100644 --- a/packages/tpetra/core/src/Tpetra_Details_FixedHashTable_def.hpp +++ b/packages/tpetra/core/src/Tpetra_Details_FixedHashTable_def.hpp @@ -1142,8 +1142,9 @@ init (const keys_type& keys, Kokkos::deep_copy (counts, countsHost); } - // FIXME (mfh 28 Mar 2016) Need a fence here, otherwise SIGSEGV w/ - // CUDA when ptr is filled. + // KJ: This fence is not required for the 2-argument deep_copy which calls + // fence, but will be required if switched to the 3-argumemt deep_copy which + // passes a space. The 3-argument form does not fence. execution_space().fence (); // Kokkos::View fills with zeros by default. @@ -1196,8 +1197,9 @@ init (const keys_type& keys, } } - // FIXME (mfh 28 Mar 2016) Need a fence here, otherwise SIGSEGV w/ - // CUDA when val is filled. + // KJ: computeOffsetsFromCounts calls parallel_scan which does not fence. + // This fence is necessary as we need to make sure that the offset view + // completes before the view is used in the next functor. execution_space().fence (); // Allocate the array of (key,value) pairs. Don't fill it with diff --git a/packages/tpetra/core/src/Tpetra_Details_Profiling.cpp b/packages/tpetra/core/src/Tpetra_Details_Profiling.cpp index 46e9c707dc49..8a3656648bcb 100644 --- a/packages/tpetra/core/src/Tpetra_Details_Profiling.cpp +++ b/packages/tpetra/core/src/Tpetra_Details_Profiling.cpp @@ -51,20 +51,33 @@ namespace Tpetra { namespace Details { ProfilingRegion::ProfilingRegion (const char name[]) { -#if defined(KOKKOS_ENABLE_PROFILING) - if(Behavior::profilingRegionUseKokkosProfiling()) +#if defined(KOKKOS_ENABLE_PROFILING) + if(Behavior::profilingRegionUseKokkosProfiling()) ::Kokkos::Profiling::pushRegion(name); #endif if(Behavior::profilingRegionUseTeuchosTimers()) tm = Teuchos::rcp(new Teuchos::TimeMonitor(*Teuchos::TimeMonitor::getNewTimer(name))); - + +} + +ProfilingRegion::ProfilingRegion (const char name[], const char group[]) { + const bool timeit = Behavior::timing(group); + if (timeit) + { +#if defined(KOKKOS_ENABLE_PROFILING) + if(Behavior::profilingRegionUseKokkosProfiling()) + ::Kokkos::Profiling::pushRegion(name); +#endif + if(Behavior::profilingRegionUseTeuchosTimers()) + tm = Teuchos::rcp(new Teuchos::TimeMonitor(*Teuchos::TimeMonitor::getNewTimer(name))); + } } ProfilingRegion::~ProfilingRegion () { #if defined(KOKKOS_ENABLE_PROFILING) - if(Behavior::profilingRegionUseKokkosProfiling()) + if(Behavior::profilingRegionUseKokkosProfiling()) ::Kokkos::Profiling::popRegion(); -#endif +#endif } } // namespace Details diff --git a/packages/tpetra/core/src/Tpetra_Details_Profiling.hpp b/packages/tpetra/core/src/Tpetra_Details_Profiling.hpp index cef7251d8a08..a2512dd8904e 100644 --- a/packages/tpetra/core/src/Tpetra_Details_Profiling.hpp +++ b/packages/tpetra/core/src/Tpetra_Details_Profiling.hpp @@ -104,6 +104,9 @@ class ProfilingRegion { public: //! Open region to profile; name the region \c name. ProfilingRegion (const char name[]); + //! Open region to profile, if the group name \c group is enabled by the + //! TPETRA_TIMING variable; name the region \c name. + ProfilingRegion (const char name[], const char group[]); //! Close region to profile. ~ProfilingRegion (); diff --git a/packages/tpetra/core/src/Tpetra_Details_checkLaunchBlocking.hpp b/packages/tpetra/core/src/Tpetra_Details_checkLaunchBlocking.hpp new file mode 100644 index 000000000000..e07eb6c94af9 --- /dev/null +++ b/packages/tpetra/core/src/Tpetra_Details_checkLaunchBlocking.hpp @@ -0,0 +1,75 @@ +// @HEADER +// *********************************************************************** +// +// Tpetra: Templated Linear Algebra Services Package +// Copyright (2008) Sandia Corporation +// +// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation, +// the U.S. Government retains certain rights in this software. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// 1. Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// +// 2. Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in the +// documentation and/or other materials provided with the distribution. +// +// 3. Neither the name of the Corporation nor the names of the +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY +// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL SANDIA CORPORATION OR THE +// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +// ************************************************************************ +// @HEADER + +#ifndef TPETRA_DETAILS_CHECKLAUNCHBLOCKING_HPP +#define TPETRA_DETAILS_CHECKLAUNCHBLOCKING_HPP + +#include "TpetraCore_config.h" +#include +#include +#include "Kokkos_Core.hpp" + +namespace Tpetra { +namespace Details { +#ifdef HAVE_TPETRACORE_CUDA + //Verify that for pre-Pascal CUDA architectures, $CUDA_LAUNCH_BLOCKING == 1 + inline void checkOldCudaLaunchBlocking() + { + if(!Kokkos::is_initialized()) + throw std::logic_error("Kokkos must be initialized in order to check CUDA_LAUNCH_BLOCKING setting."); + size_t arch = Kokkos::Cuda::device_arch(); + if(arch < 600) + { + //Compiling for Kepler/Maxwell: require launch blocking. + const char* launchBlockingEnv = std::getenv("CUDA_LAUNCH_BLOCKING"); + if(!launchBlockingEnv || strcmp(launchBlockingEnv, "1")) + { + throw std::runtime_error( + "Tpetra::initialize(): Kokkos was compiled for an older CUDA architecture than Pascal, but\n" + "the environment variable CUDA_LAUNCH_BLOCKING is either unset or is not \"1\".\n" + "It must be set to \"1\" at runtime.\n"); + } + } + } +#else + inline void checkOldCudaLaunchBlocking() {} +#endif +}} + +#endif diff --git a/packages/tpetra/core/src/Tpetra_Details_getGraphDiagOffsets_decl.hpp b/packages/tpetra/core/src/Tpetra_Details_getGraphDiagOffsets_decl.hpp index daa7a4506569..4a93834cf6f5 100644 --- a/packages/tpetra/core/src/Tpetra_Details_getGraphDiagOffsets_decl.hpp +++ b/packages/tpetra/core/src/Tpetra_Details_getGraphDiagOffsets_decl.hpp @@ -85,7 +85,8 @@ class GetGraphDiagOffsets { ::Kokkos::MemoryUnmanaged> diag_offsets_type; typedef ::Kokkos::StaticCrsGraph local_graph_type; + device_type, + void, size_t> local_graph_type; typedef ::Tpetra::Details::LocalMap local_map_type; typedef ::Kokkos::View // std::atexit #include #include @@ -64,6 +65,7 @@ initializeKokkos () args_c[k] = const_cast (args[k].c_str ()); } Kokkos::initialize (narg, narg == 0 ? nullptr : args_c.data ()); + checkOldCudaLaunchBlocking(); std::atexit (Kokkos::finalize_all); } } diff --git a/packages/tpetra/core/src/Tpetra_Details_localDeepCopyRowMatrix_decl.hpp b/packages/tpetra/core/src/Tpetra_Details_localDeepCopyRowMatrix_decl.hpp index 9dd4503dc956..85b3b14f61e3 100644 --- a/packages/tpetra/core/src/Tpetra_Details_localDeepCopyRowMatrix_decl.hpp +++ b/packages/tpetra/core/src/Tpetra_Details_localDeepCopyRowMatrix_decl.hpp @@ -57,7 +57,8 @@ KokkosSparse::CrsMatrix< typename Kokkos::ArithTraits::val_type, LO, typename NT::execution_space, - void> + void, + size_t> localDeepCopyLocallyIndexedRowMatrix (const RowMatrix& A, const char label[]); diff --git a/packages/tpetra/core/src/Tpetra_Details_localDeepCopyRowMatrix_def.hpp b/packages/tpetra/core/src/Tpetra_Details_localDeepCopyRowMatrix_def.hpp index 850ad952250a..0a96a472403f 100644 --- a/packages/tpetra/core/src/Tpetra_Details_localDeepCopyRowMatrix_def.hpp +++ b/packages/tpetra/core/src/Tpetra_Details_localDeepCopyRowMatrix_def.hpp @@ -61,7 +61,8 @@ KokkosSparse::CrsMatrix< typename Kokkos::ArithTraits::val_type, LO, typename NT::execution_space, - void> + void, + size_t> localDeepCopyLocallyIndexedRowMatrix (const RowMatrix& A, const char label[]) @@ -89,7 +90,7 @@ localDeepCopyLocallyIndexedRowMatrix using Kokkos::WithoutInitializing; using IST = typename Kokkos::ArithTraits::val_type; using local_matrix_type = KokkosSparse::CrsMatrix< - IST, LO, typename NT::execution_space, void>; + IST, LO, typename NT::device_type, void, size_t>; using local_graph_type = typename local_matrix_type::staticcrsgraph_type; using inds_type = typename local_graph_type::entries_type; @@ -153,7 +154,7 @@ localDeepCopyLocallyIndexedRowMatrix namespace Details { \ template KokkosSparse::CrsMatrix< \ Kokkos::ArithTraits::val_type, \ - LO, NT::execution_space, void> \ + LO, NT::execution_space, void, size_t> \ localDeepCopyLocallyIndexedRowMatrix \ (const RowMatrix& A, \ const char label[]); \ diff --git a/packages/tpetra/core/src/Tpetra_Details_localRowOffsets_decl.hpp b/packages/tpetra/core/src/Tpetra_Details_localRowOffsets_decl.hpp index b5beb08bd0be..5ef8116ea2ba 100644 --- a/packages/tpetra/core/src/Tpetra_Details_localRowOffsets_decl.hpp +++ b/packages/tpetra/core/src/Tpetra_Details_localRowOffsets_decl.hpp @@ -58,7 +58,7 @@ struct LocalRowOffsetsResult { private: using local_graph_type = typename KokkosSparse::CrsMatrix< - double, int, typename NT::execution_space, void>:: + double, int, typename NT::device_type, void, size_t>:: staticcrsgraph_type; public: using offsets_type = diff --git a/packages/tpetra/core/src/Tpetra_Details_packCrsGraph_def.hpp b/packages/tpetra/core/src/Tpetra_Details_packCrsGraph_def.hpp index 4d6ddf10c732..6ed5c71c2a0e 100644 --- a/packages/tpetra/core/src/Tpetra_Details_packCrsGraph_def.hpp +++ b/packages/tpetra/core/src/Tpetra_Details_packCrsGraph_def.hpp @@ -685,7 +685,6 @@ packCrsGraph using crs_graph_type = CrsGraph; using packet_type = typename crs_graph_type::packet_type; using buffer_device_type = typename crs_graph_type::buffer_device_type; - using execution_space = typename buffer_device_type::execution_space; using exports_view_type = Kokkos::DualView; using local_graph_type = typename crs_graph_type::local_graph_type; using local_map_type = typename Tpetra::Map::local_map_type; @@ -715,12 +714,7 @@ packCrsGraph } if (num_export_lids == 0) { - // FIXME (26 Apr 2016) Fences around (UVM) allocations only - // temporarily needed for #227 debugging. Should be able to - // remove them after that's fixed. - execution_space().fence (); exports = exports_view_type ("exports", 0); - execution_space().fence (); return; } @@ -735,17 +729,12 @@ packCrsGraph // Resize the output pack buffer if needed. if (count > size_t (exports.extent (0))) { - // FIXME (26 Apr 2016) Fences around (UVM) allocations only - // temporarily needed for #227 debugging. Should be able to - // remove them after that's fixed. - execution_space().fence (); exports = exports_view_type ("exports", count); if (debug) { std::ostringstream os; os << "*** exports resized to " << count << std::endl; std::cerr << os.str (); } - execution_space().fence (); } if (debug) { std::ostringstream os; diff --git a/packages/tpetra/core/src/Tpetra_Details_packCrsMatrix_def.hpp b/packages/tpetra/core/src/Tpetra_Details_packCrsMatrix_def.hpp index b5bbb73e182b..d15031230c63 100644 --- a/packages/tpetra/core/src/Tpetra_Details_packCrsMatrix_def.hpp +++ b/packages/tpetra/core/src/Tpetra_Details_packCrsMatrix_def.hpp @@ -49,6 +49,7 @@ #include "Tpetra_Details_getEntryOnHost.hpp" #include "Tpetra_Details_OrdinalTraits.hpp" #include "Tpetra_Details_PackTraits.hpp" +#include "Tpetra_Details_Profiling.hpp" #include "Tpetra_CrsMatrix_decl.hpp" #include #include @@ -733,9 +734,12 @@ packCrsMatrix (const CrsMatrix& sourceMatrix, const bool pack_pids, Distributor& /* dist */) { + ::Tpetra::Details::ProfilingRegion region_pack_crs_matrix( + "Tpetra::Details::PackCrsMatrixImpl::packCrsMatrix", + "Import/Export" + ); using Kokkos::View; typedef BufferDeviceType DT; - typedef typename DT::execution_space execution_space; typedef Kokkos::DualView exports_view_type; const char prefix[] = "Tpetra::Details::PackCrsMatrixImpl::packCrsMatrix: "; constexpr bool debug = false; @@ -796,12 +800,7 @@ packCrsMatrix (const CrsMatrix& sourceMatrix, } if (num_export_lids == 0) { - // FIXME (26 Apr 2016) Fences around (UVM) allocations only - // temporarily needed for #227 debugging. Should be able to - // remove them after that's fixed. - execution_space().fence (); exports = exports_view_type ("exports", 0); - execution_space().fence (); return; } @@ -819,17 +818,12 @@ packCrsMatrix (const CrsMatrix& sourceMatrix, // Resize the output pack buffer if needed. if (count > static_cast (exports.extent (0))) { - // FIXME (26 Apr 2016) Fences around (UVM) allocations only - // temporarily needed for #227 debugging. Should be able to - // remove them after that's fixed. - execution_space().fence (); exports = exports_view_type ("exports", count); if (debug) { std::ostringstream os; os << "*** exports resized to " << count << std::endl; std::cerr << os.str (); } - execution_space().fence (); } if (debug) { std::ostringstream os; @@ -930,15 +924,14 @@ packCrsMatrix (const CrsMatrix& sourceMatrix, template void -packCrsMatrixNew (const CrsMatrix& sourceMatrix, - Kokkos::DualView::buffer_device_type>& exports, - const Kokkos::DualView::buffer_device_type>& numPacketsPerLID, - const Kokkos::DualView::buffer_device_type>& exportLIDs, - size_t& constantNumPackets, - Distributor& distor) +packCrsMatrixNew( + const CrsMatrix& sourceMatrix, + Kokkos::DualView::buffer_device_type>& exports, + const Kokkos::DualView::buffer_device_type>& numPacketsPerLID, + const Kokkos::DualView::buffer_device_type>& exportLIDs, + size_t& constantNumPackets, + Distributor& distor +) { using device_type = typename CrsMatrix::device_type; using buffer_device_type = typename DistObject::buffer_device_type; @@ -957,6 +950,10 @@ packCrsMatrixNew (const CrsMatrix& sourceMatrix, TEUCHOS_ASSERT( ! exportLIDs.need_sync_device () ); auto exportLIDs_d = exportLIDs.view_device (); + ::Tpetra::Details::ProfilingRegion region_pack_crs_matrix_new( + "Tpetra::Details::packCrsMatrixNew", + "Import/Export" + ); PackCrsMatrixImpl::packCrsMatrix ( sourceMatrix, exports, numPacketsPerLID_d, exportLIDs_d, exportPIDs_d, constantNumPackets, pack_pids, distor); diff --git a/packages/tpetra/core/src/Tpetra_Details_reallocDualViewIfNeeded.hpp b/packages/tpetra/core/src/Tpetra_Details_reallocDualViewIfNeeded.hpp index 9c503e7c6f70..6885aafee343 100644 --- a/packages/tpetra/core/src/Tpetra_Details_reallocDualViewIfNeeded.hpp +++ b/packages/tpetra/core/src/Tpetra_Details_reallocDualViewIfNeeded.hpp @@ -100,22 +100,20 @@ reallocDualViewIfNeeded (Kokkos::DualView& dv, } else if (curSize < newSize) { // too small; need to reallocate if (needFenceBeforeRealloc) { - execution_space().fence (); + execution_space().fence (); // keep this fence to respect needFenceBeforeRealloc } dv = dual_view_type (); // free first, in order to save memory // If current size is 0, the DualView's Views likely lack a label. dv = dual_view_type (curSize == 0 ? newLabel : dv.d_view.label (), newSize); - execution_space().fence (); return true; // we did reallocate } else { if (newSize == 0) { // special case: realloc to 0 means always do it if (needFenceBeforeRealloc) { - execution_space().fence (); + execution_space().fence (); // keep this fence to respect needFenceBeforeRealloc } // If current size is 0, the DualView's Views likely lack a label. dv = dual_view_type (curSize == 0 ? newLabel : dv.d_view.label (), 0); - execution_space().fence (); return true; // we did reallocate } // Instead of writing curSize >= tooBigFactor * newSize, express @@ -125,12 +123,11 @@ reallocDualViewIfNeeded (Kokkos::DualView& dv, // The allocation is much too big, so free it and reallocate // to the new, smaller size. if (needFenceBeforeRealloc) { - execution_space().fence (); + execution_space().fence (); // keep this fence to respect needFenceBeforeRealloc } dv = dual_view_type (); // free first, in order to save memory // If current size is 0, the DualView's Views likely lack a label. dv = dual_view_type (curSize == 0 ? newLabel : dv.d_view.label (), newSize); - execution_space().fence (); return true; // we did reallocate } else { diff --git a/packages/tpetra/core/src/Tpetra_Details_residual.hpp b/packages/tpetra/core/src/Tpetra_Details_residual.hpp index d8348d2998ea..fcf90fd96396 100644 --- a/packages/tpetra/core/src/Tpetra_Details_residual.hpp +++ b/packages/tpetra/core/src/Tpetra_Details_residual.hpp @@ -43,6 +43,7 @@ #include "TpetraCore_config.h" #include "Tpetra_CrsMatrix.hpp" +#include "Tpetra_LocalCrsMatrixOperator.hpp" #include "Tpetra_MultiVector.hpp" #include "Teuchos_RCP.hpp" #include "Teuchos_ScalarTraits.hpp" @@ -195,10 +196,10 @@ void localResidual(const CrsMatrix & A, std::runtime_error, "X, Y and R may not alias one another."); } + SC one = Teuchos::ScalarTraits::one(), negone = -one, zero = Teuchos::ScalarTraits::zero(); #ifdef TPETRA_DETAILS_USE_REFERENCE_RESIDUAL // This is currently a "reference implementation" waiting until Kokkos Kernels provides // a residual kernel. - SC one = Teuchos::ScalarTraits::one(), negone = -one, zero = Teuchos::ScalarTraits::zero(); A.localApply(X,R,Teuchos::NO_TRANS, one, zero); R.update(one,B,negone); #else @@ -208,13 +209,28 @@ void localResidual(const CrsMatrix & A, return; } + int64_t numLocalRows = A_lcl.numRows (); + int64_t myNnz = A_lcl.nnz(); + + //Check for imbalanced rows. If the logic for SPMV to use merge path is triggered, + //use it and follow the reference residual code + LO maxRowImbalance = 0; + if(numLocalRows != 0) + maxRowImbalance = A.getNodeMaxNumRowEntries() - (myNnz / numLocalRows); + if(size_t(maxRowImbalance) >= Tpetra::Details::Behavior::rowImbalanceThreshold()) + { + //note: lclOp will be wrapped in shared_ptr + auto lclOp = A.getLocalMultiplyOperator(); + //Call local SPMV, requesting merge path, through A's LocalCrsMatrixOperator + lclOp->applyImbalancedRows (X_lcl, R_lcl, Teuchos::NO_TRANS, one, zero); + R.update(one,B,negone); + return; + } + int team_size = -1; int vector_length = -1; int64_t rows_per_thread = -1; - int64_t numLocalRows = A_lcl.numRows (); - int64_t myNnz = A_lcl.nnz(); - int64_t rows_per_team = residual_launch_parameters(numLocalRows, myNnz, rows_per_thread, team_size, vector_length); int64_t worksets = (B_lcl.extent (0) + rows_per_team - 1) / rows_per_team; diff --git a/packages/tpetra/core/src/Tpetra_Details_unpackCrsMatrixAndCombine_def.hpp b/packages/tpetra/core/src/Tpetra_Details_unpackCrsMatrixAndCombine_def.hpp index ac3e6ed9bcd9..908ca4a10000 100644 --- a/packages/tpetra/core/src/Tpetra_Details_unpackCrsMatrixAndCombine_def.hpp +++ b/packages/tpetra/core/src/Tpetra_Details_unpackCrsMatrixAndCombine_def.hpp @@ -43,6 +43,7 @@ #include "TpetraCore_config.h" #include "Teuchos_Array.hpp" #include "Teuchos_ArrayView.hpp" +#include "Teuchos_OrdinalTraits.hpp" #include "Tpetra_Details_castAwayConstDualView.hpp" #include "Tpetra_Details_computeOffsets.hpp" #include "Tpetra_Details_createMirrorView.hpp" @@ -107,7 +108,7 @@ unpackRow(const typename PackTraits::output_array_type& gids_out, const size_t offset, const size_t /* num_bytes */, const size_t num_ent, - const size_t num_bytes_per_value) + const size_t bytes_per_value) { if (num_ent == 0) { // Empty rows always take zero bytes, to ensure sparsity. @@ -128,7 +129,7 @@ unpackRow(const typename PackTraits::output_array_type& gids_out, size_t (0); const size_t vals_beg = gids_beg + gids_len + pids_len; - const size_t vals_len = num_ent * num_bytes_per_value; + const size_t vals_len = num_ent * bytes_per_value; const char* const num_ent_in = imports + num_ent_beg; const char* const gids_in = imports + gids_beg; @@ -199,12 +200,8 @@ struct UnpackCrsMatrixAndCombineFunctor { typedef Kokkos::View input_buffer_type; typedef Kokkos::View import_lids_type; - typedef Kokkos::View lids_scratch_type; - typedef Kokkos::View gids_scratch_type; - typedef Kokkos::View pids_scratch_type; - typedef Kokkos::View vals_scratch_type; - - typedef Kokkos::pair value_type; + typedef Kokkos::View error_type; + using member_type = typename Kokkos::TeamPolicy::member_type; static_assert (std::is_same::value, "LocalMap::local_ordinal_type and " @@ -215,17 +212,13 @@ struct UnpackCrsMatrixAndCombineFunctor { input_buffer_type imports; num_packets_per_lid_type num_packets_per_lid; import_lids_type import_lids; + Kokkos::View batch_info; offsets_type offsets; Tpetra::CombineMode combine_mode; - size_t max_num_ent; - bool unpack_pids; - size_t num_bytes_per_value; + size_t batch_size; + size_t bytes_per_value; bool atomic; - Kokkos::Experimental::UniqueToken tokens; - lids_scratch_type lids_scratch; - gids_scratch_type gids_scratch; - pids_scratch_type pids_scratch; - vals_scratch_type vals_scratch; + error_type error_code; UnpackCrsMatrixAndCombineFunctor( const local_matrix_type& local_matrix_in, @@ -233,172 +226,190 @@ struct UnpackCrsMatrixAndCombineFunctor { const input_buffer_type& imports_in, const num_packets_per_lid_type& num_packets_per_lid_in, const import_lids_type& import_lids_in, + const Kokkos::View& batch_info_in, const offsets_type& offsets_in, const Tpetra::CombineMode combine_mode_in, - const size_t max_num_ent_in, - const bool unpack_pids_in, - const size_t num_bytes_per_value_in, + const size_t batch_size_in, + const size_t bytes_per_value_in, const bool atomic_in) : local_matrix (local_matrix_in), local_col_map (local_col_map_in), imports (imports_in), num_packets_per_lid (num_packets_per_lid_in), import_lids (import_lids_in), + batch_info (batch_info_in), offsets (offsets_in), combine_mode (combine_mode_in), - max_num_ent (max_num_ent_in), - unpack_pids (unpack_pids_in), - num_bytes_per_value (num_bytes_per_value_in), + batch_size (batch_size_in), + bytes_per_value (bytes_per_value_in), atomic (atomic_in), - tokens (XS()), - lids_scratch (Kokkos::view_alloc("lids_scratch", Kokkos::WithoutInitializing), tokens.size() * max_num_ent), - gids_scratch (Kokkos::view_alloc("gids_scratch", Kokkos::WithoutInitializing), tokens.size() * max_num_ent), - pids_scratch (Kokkos::view_alloc("pids_scratch", Kokkos::WithoutInitializing), tokens.size() * max_num_ent), - vals_scratch (Kokkos::view_alloc("vals_scratch", Kokkos::WithoutInitializing), tokens.size() * max_num_ent) + error_code("error") {} - KOKKOS_INLINE_FUNCTION void init(value_type& dst) const - { - using Tpetra::Details::OrdinalTraits; - dst = Kokkos::make_pair (0, OrdinalTraits::invalid ()); - } - - KOKKOS_INLINE_FUNCTION void - join (volatile value_type& dst, const volatile value_type& src) const - { - // `dst` should reflect the first (least) bad index and - // all other associated error codes and data. Thus, we need only - // check if the `src` object shows an error and if its associated - // bad index is less than `dst`'s bad index. - using Tpetra::Details::OrdinalTraits; - if (src.second != OrdinalTraits::invalid ()) { - // An error in the src; check if - // 1. `dst` shows errors - // 2. If `dst` does show errors, if src's bad index is less than - // *this' bad index - if (dst.second == OrdinalTraits::invalid () || - src.second < dst.second) { - dst = src; - } - } - } - KOKKOS_INLINE_FUNCTION - void operator()(const LO i, value_type& dst) const + void operator()(member_type team_member) const { using Kokkos::View; using Kokkos::subview; using Kokkos::MemoryUnmanaged; - using size_type = typename XS::size_type; - using slice = Kokkos::pair; - typedef View lids_out_type; - typedef View pids_out_type; - typedef View gids_out_type; - typedef View vals_out_type; + const LO batch = team_member.league_rank(); + const LO lid_no = batch_info(batch, 0); + const LO batch_no = batch_info(batch, 1); - const size_t num_bytes = num_packets_per_lid(i); + const size_t num_bytes = num_packets_per_lid(lid_no); // Only unpack data if there is a nonzero number of bytes. - if (num_bytes == 0) { + if (num_bytes == 0) return; - } // there is actually something in the row - const LO import_lid = import_lids[i]; + const LO import_lid = import_lids(lid_no); const size_t buf_size = imports.size(); - const size_t offset = offsets(i); + const size_t offset = offsets(lid_no); // Get the number of entries to expect in the received data for this row. LO num_ent_LO = 0; - const char* const in_buf = imports.data () + offset; - (void) PackTraits::unpackValue (num_ent_LO, in_buf); - const size_t num_ent = static_cast (num_ent_LO); + const char* const in_buf = imports.data() + offset; + (void) PackTraits::unpackValue(num_ent_LO, in_buf); + const size_t num_entries_in_row = static_cast(num_ent_LO); // Count the number of bytes expected to unpack size_t expected_num_bytes = 0; { - expected_num_bytes += PackTraits::packValueCount (LO (0)); - expected_num_bytes += num_ent * PackTraits::packValueCount (GO (0)); - if (unpack_pids) { - expected_num_bytes += num_ent * PackTraits::packValueCount (int (0)); - } - expected_num_bytes += num_ent * PackTraits::packValueCount (ST ()); + expected_num_bytes += PackTraits::packValueCount(LO(0)); + expected_num_bytes += num_entries_in_row * PackTraits::packValueCount(GO(0)); + expected_num_bytes += num_entries_in_row * PackTraits::packValueCount(ST()); } - if (expected_num_bytes > num_bytes) { - dst = Kokkos::make_pair (1, i); // wrong number of bytes + if (expected_num_bytes > num_bytes) + { + printf( + "*** Error: UnpackCrsMatrixAndCombineFunctor: " + "At row %d, the expected number of bytes (%d) != number of unpacked bytes (%d)\n", + (int) lid_no, (int) expected_num_bytes, (int) num_bytes + ); + Kokkos::atomic_compare_exchange_strong(error_code.data(), 0, 21); return; } - if (offset > buf_size || offset + num_bytes > buf_size) { - dst = Kokkos::make_pair (2, i); // out of bounds + if (offset > buf_size || offset + num_bytes > buf_size) + { + printf( + "*** Error: UnpackCrsMatrixAndCombineFunctor: " + "At row %d, the offset (%d) > buffer size (%d)\n", + (int) lid_no, (int) offset, (int) buf_size + ); + Kokkos::atomic_compare_exchange_strong(error_code.data(), 0, 22); return; } - // Get subviews in to the scratch arrays. The token returned from acquire - // is an integer in [0, tokens.size()). It is used to grab a unique (to - // this thread) subview of the scratch arrays. - const size_type token = tokens.acquire(); - const size_t a = static_cast(token) * max_num_ent; - const size_t b = a + num_ent; - lids_out_type lids_out = subview(lids_scratch, slice(a, b)); - gids_out_type gids_out = subview(gids_scratch, slice(a, b)); - pids_out_type pids_out = subview(pids_scratch, slice(a, (unpack_pids ? b : a))); - vals_out_type vals_out = subview(vals_scratch, slice(a, b)); - - // Unpack this row! - int unpack_err = - unpackRow(gids_out, pids_out, vals_out, - imports.data(), offset, num_bytes, - num_ent, num_bytes_per_value); - if (unpack_err != 0) { - dst = Kokkos::make_pair (unpack_err, i); // unpack error - tokens.release (token); - return; + // Determine the number of entries to unpack in this batch + size_t num_entries_in_batch = 0; + if (num_entries_in_row <= batch_size) + num_entries_in_batch = num_entries_in_row; + else if (num_entries_in_row >= (batch_no + 1) * batch_size) + num_entries_in_batch = batch_size; + else + num_entries_in_batch = num_entries_in_row - batch_no * batch_size; + + const size_t bytes_per_lid = PackTraits::packValueCount(LO(0)); + const size_t num_ent_start = offset; + const size_t num_ent_end = num_ent_start + bytes_per_lid; + + const size_t bytes_per_gid = PackTraits::packValueCount(GO(0)); + const size_t gids_start = num_ent_end; + const size_t gids_end = gids_start + num_entries_in_row * bytes_per_gid; + + const size_t vals_start = gids_end; + + const size_t shift = batch_no * batch_size; + const char* const num_ent_in = imports.data() + num_ent_start; + const char* const gids_in = imports.data() + gids_start + shift * bytes_per_gid; + const char* const vals_in = imports.data() + vals_start + shift * bytes_per_value; + + LO num_ent_out; + (void)PackTraits::unpackValue(num_ent_out, num_ent_in); + if (static_cast(num_ent_out) != num_entries_in_row) + { + printf( + "*** Error: UnpackCrsMatrixAndCombineFunctor: " + "At row %d, number of entries (%d) != number of entries unpacked (%d)\n", + (int) lid_no, (int) num_entries_in_row, (int) num_ent_out + ); + Kokkos::atomic_compare_exchange_strong(error_code.data(), 0, 23); } - // Column indices come in as global indices, in case the - // source object's column Map differs from the target object's - // (this's) column Map, and must be converted local index values - for (size_t k = 0; k < num_ent; ++k) { - lids_out(k) = local_col_map.getLocalElement (gids_out(k)); - } + constexpr bool matrix_has_sorted_rows = true; // see #6282 + Kokkos::parallel_for( + Kokkos::TeamThreadRange(team_member, num_entries_in_batch), + KOKKOS_LAMBDA(const LO& j) + { + size_t distance = 0; + + GO gid_out; + distance = j * bytes_per_gid; + (void) PackTraits::unpackValue(gid_out, gids_in + distance); + auto lid_out = local_col_map.getLocalElement(gid_out); + + // Column indices come in as global indices, in case the + // source object's column Map differs from the target object's + // (this's) column Map, and must be converted local index values + + // assume that ST is default constructible + ST val_out; + distance = j * bytes_per_value; + (void) PackTraits::unpackValue(val_out, vals_in + distance); + + if (combine_mode == ADD) { + // NOTE (mfh 20 Nov 2019) Must assume atomic is required, unless + // different threads don't touch the same row (i.e., no + // duplicates in incoming LIDs list). + const bool use_atomic_updates = atomic; + (void)local_matrix.sumIntoValues( + import_lid, + &lid_out, + 1, + &val_out, + matrix_has_sorted_rows, + use_atomic_updates + ); + } else if (combine_mode == REPLACE) { + // NOTE (mfh 20 Nov 2019): It's never correct to use REPLACE + // combine mode with multiple incoming rows that touch the same + // target matrix entries, so we never need atomic updates. + const bool use_atomic_updates = false; + (void)local_matrix.replaceValues( + import_lid, + &lid_out, + 1, + &val_out, + matrix_has_sorted_rows, + use_atomic_updates + ); + } else { + // should never get here + printf( + "*** Error: UnpackCrsMatrixAndCombineFunctor: " + "At row %d, an unknown error occurred during unpack\n", (int) lid_no + ); + Kokkos::atomic_compare_exchange_strong(error_code.data(), 0, 31); + } + } + ); - // Combine the values according to the combine_mode - const LO* const lids_raw = const_cast (lids_out.data ()); - const ST* const vals_raw = const_cast (vals_out.data ()); - LO num_modified = 0; + team_member.team_barrier(); - constexpr bool matrix_has_sorted_rows = true; // see #6282 - if (combine_mode == ADD) { - // NOTE (mfh 20 Nov 2019) Must assume atomic is required, unless - // different threads don't touch the same row (i.e., no - // duplicates in incoming LIDs list). - const bool use_atomic_updates = atomic; - num_modified += - local_matrix.sumIntoValues (import_lid, lids_raw, num_ent, - vals_raw, matrix_has_sorted_rows, - use_atomic_updates); - } - else if (combine_mode == REPLACE) { - // NOTE (mfh 20 Nov 2019): It's never correct to use REPLACE - // combine mode with multiple incoming rows that touch the same - // target matrix entries, so we never need atomic updates. - const bool use_atomic_updates = false; - num_modified += - local_matrix.replaceValues (import_lid, lids_raw, num_ent, - vals_raw, matrix_has_sorted_rows, - use_atomic_updates); - } - else { - dst = Kokkos::make_pair (4, i); // invalid combine mode - tokens.release (token); - return; - } + } - tokens.release (token); + //! Host function for getting the error. + int error() const { + auto error_code_h = Kokkos::create_mirror_view_and_copy( + Kokkos::HostSpace(), error_code + ); + return error_code_h(); } + }; struct MaxNumEntTag {}; @@ -423,8 +434,6 @@ class NumEntriesFunctor { typedef size_t value_type; private: - typedef Kokkos::pair slice; - num_packets_per_lid_type num_packets_per_lid; offsets_type offsets; input_buffer_type imports; @@ -529,6 +538,53 @@ compute_total_num_entries ( return tot_num_ent; } +template +KOKKOS_INLINE_FUNCTION +size_t +unpackRowCount(const char imports[], + const size_t offset, + const size_t num_bytes) +{ + using PT = PackTraits; + + LO num_ent_LO = 0; + if (num_bytes > 0) { + const size_t p_num_bytes = PT::packValueCount(num_ent_LO); + if (p_num_bytes > num_bytes) { + return OrdinalTraits::invalid(); + } + const char* const in_buf = imports + offset; + (void) PT::unpackValue(num_ent_LO, in_buf); + } + return static_cast(num_ent_LO); +} + +/// \brief Compute the index and batch number associated with each batch +/// +/// batch_info(i, 0) is the local index of the ith batch +/// batch_info(i, 1) is the local batch number of the ith batch +template +inline +bool +compute_batch_info( + const View1& batches_per_lid, + View2& batch_info +) +{ + using LO = typename View2::value_type; + size_t batch = 0; + for (size_t i=0; i(i); + batch_info(batch, 1) = batch_no; + batch++; + } + } + return batch == batch_info.extent(0); +} + /// \brief Perform the unpack operation for the matrix /// /// \tparam LocalMatrix the specialization of the KokkosSparse::CrsMatrix @@ -544,18 +600,12 @@ unpackAndCombineIntoCrsMatrix( const Kokkos::View& imports, const Kokkos::View& num_packets_per_lid, const typename PackTraits::input_array_type import_lids, - const Tpetra::CombineMode combine_mode, - const bool unpack_pids) + const Tpetra::CombineMode combine_mode) { using ST = typename LocalMatrix::value_type; using LO = typename LocalMap::local_ordinal_type; using DT = typename LocalMap::device_type; using XS = typename DT::execution_space; - using range_policy = - Kokkos::RangePolicy >; - using unpack_functor_type = - UnpackCrsMatrixAndCombineFunctor; const char prefix[] = "Tpetra::Details::UnpackAndCombineCrsMatrixImpl::" "unpackAndCombineIntoCrsMatrix: "; @@ -599,28 +649,85 @@ unpackAndCombineIntoCrsMatrix( Kokkos::View offsets("offsets", num_import_lids+1); computeOffsetsFromCounts(offsets, num_packets_per_lid); - // Determine the maximum number of entries in any row in the matrix. The - // maximum number of entries is needed to allocate unpack buffers on the - // device. - size_t max_num_ent = compute_maximum_num_entries( - num_packets_per_lid, offsets, imports); + // Determine the sizes of the unpack batches + size_t max_num_ent = compute_maximum_num_entries(num_packets_per_lid, offsets, imports); + const size_t default_batch_size = Tpetra::Details::Behavior::hierarchicalUnpackBatchSize(); + const size_t batch_size = std::min(default_batch_size, max_num_ent); + + // To achieve some balance amongst threads, unpack each row in equal size batches + size_t num_batches = 0; + Kokkos::View batch_info("", num_batches); + Kokkos::View batches_per_lid("", num_import_lids); + // Compute meta data that allows batch unpacking + Kokkos::parallel_reduce( + Kokkos::RangePolicy>(0, num_import_lids), + KOKKOS_LAMBDA(const size_t i, size_t& batches) + { + const size_t num_entries_in_row = unpackRowCount( + imports.data(), offsets(i), num_packets_per_lid(i) + ); + batches_per_lid(i) = + (num_entries_in_row <= batch_size) ? + 1 : + num_entries_in_row / batch_size + (num_entries_in_row % batch_size != 0); + batches += batches_per_lid(i); + }, + num_batches + ); + Kokkos::resize(batch_info, num_batches); + + Kokkos::HostSpace host_space; + auto batches_per_lid_h = Kokkos::create_mirror_view(host_space, batches_per_lid); + Kokkos::deep_copy(batches_per_lid_h, batches_per_lid); + + auto batch_info_h = Kokkos::create_mirror_view(host_space, batch_info); + + (void) compute_batch_info(batches_per_lid_h, batch_info_h); + Kokkos::deep_copy(batch_info, batch_info_h); // FIXME (TJF SEP 2017) // The scalar type is not necessarily default constructible - size_t num_bytes_per_value = PackTraits::packValueCount(ST()); + size_t bytes_per_value = PackTraits::packValueCount(ST()); // Now do the actual unpack! const bool atomic = XS::concurrency() != 1; - unpack_functor_type f(local_matrix, local_map, - imports, num_packets_per_lid, import_lids, offsets, combine_mode, - max_num_ent, unpack_pids, num_bytes_per_value, atomic); - - typename unpack_functor_type::value_type x; - Kokkos::parallel_reduce(range_policy(0, static_cast(num_import_lids)), f, x); - auto x_h = x.to_std_pair(); - TEUCHOS_TEST_FOR_EXCEPTION(x_h.first != 0, std::runtime_error, - prefix << "UnpackCrsMatrixAndCombineFunctor reported error code " - << x_h.first << " for the first bad row " << x_h.second); + using functor = UnpackCrsMatrixAndCombineFunctor; + functor f( + local_matrix, + local_map, + imports, + num_packets_per_lid, + import_lids, + batch_info, + offsets, + combine_mode, + batch_size, + bytes_per_value, + atomic + ); + + using policy = Kokkos::TeamPolicy>; + const size_t team_size = Tpetra::Details::Behavior::hierarchicalUnpackTeamSize(); +#if defined(KOKKOS_ENABLE_CUDA) + constexpr bool is_cuda = std::is_same::value; +#else + constexpr bool is_cuda = false; +#endif + if (!is_cuda || team_size == Teuchos::OrdinalTraits::invalid()) + { + Kokkos::parallel_for(policy(static_cast(num_batches), Kokkos::AUTO), f); + } + else + { + Kokkos::parallel_for(policy(static_cast(num_batches), static_cast(team_size)), f); + } + + auto error_code = f.error(); + TEUCHOS_TEST_FOR_EXCEPTION( + error_code != 0, + std::runtime_error, + prefix << "UnpackCrsMatrixAndCombineFunctor reported error code " << error_code + ); } template @@ -681,27 +788,6 @@ unpackAndCombineWithOwningPIDsCount( return count; } -template -KOKKOS_INLINE_FUNCTION -size_t -unpackRowCount(const char imports[], - const size_t offset, - const size_t num_bytes) -{ - using PT = PackTraits; - - LO num_ent_LO = 0; - if (num_bytes > 0) { - const size_t p_num_bytes = PT::packValueCount(num_ent_LO); - if (p_num_bytes > num_bytes) { - return OrdinalTraits::invalid(); - } - const char* const in_buf = imports + offset; - (void) PT::unpackValue(num_ent_LO, in_buf); - } - return static_cast(num_ent_LO); -} - /// \brief Setup row pointers for remotes template int @@ -868,7 +954,7 @@ unpackAndCombineIntoCrsArrays2( const LocalMatrix& /* local_matrix */, const LocalMap /*& local_col_map*/, const int my_pid, - const size_t num_bytes_per_value) + const size_t bytes_per_value) { using Kokkos::View; using Kokkos::subview; @@ -920,7 +1006,7 @@ unpackAndCombineIntoCrsArrays2( k_error += unpackRow(gids_out, pids_out, vals_out, imports.data(), offset, num_bytes, - num_ent, num_bytes_per_value); + num_ent, bytes_per_value); // Correct target PIDs. for (size_t j = 0; j < static_cast(num_ent); ++j) { @@ -951,7 +1037,7 @@ unpackAndCombineIntoCrsArrays( const size_t tgt_num_rows, const size_t tgt_num_nonzeros, const int my_tgt_pid, - const size_t num_bytes_per_value) + const size_t bytes_per_value) { using Kokkos::View; using Kokkos::subview; @@ -1048,7 +1134,7 @@ unpackAndCombineIntoCrsArrays( int unpack_err = unpackAndCombineIntoCrsArrays2(tgt_colind, tgt_pids, tgt_vals, new_start_row, offsets, import_lids, imports, num_packets_per_lid, - local_matrix, local_col_map, my_pid, num_bytes_per_value); + local_matrix, local_col_map, my_pid, bytes_per_value); TEUCHOS_TEST_FOR_EXCEPTION( unpack_err != 0, std::logic_error, prefix << "unpack loop failed. This " "should never happen. Please report this bug to the Tpetra developers."); @@ -1138,10 +1224,18 @@ unpackCrsMatrixAndCombine( auto local_matrix = sourceMatrix.getLocalMatrix(); auto local_col_map = sourceMatrix.getColMap()->getLocalMap(); + for (int i=0; i A_indices; + Teuchos::ArrayView A_values; + sourceMatrix.getLocalRowView(lclRow, A_indices, A_values); + } // Now do the actual unpack! UnpackAndCombineCrsMatrixImpl::unpackAndCombineIntoCrsMatrix( local_matrix, local_col_map, imports_d, num_packets_per_lid_d, - import_lids_d, combineMode, false); + import_lids_d, combineMode); + } template @@ -1187,13 +1281,12 @@ unpackCrsMatrixAndCombineNew( auto local_col_map = sourceMatrix.getColMap ()->getLocalMap (); typedef decltype (local_col_map) local_map_type; - const bool unpack_pids = false; UnpackAndCombineCrsMatrixImpl::unpackAndCombineIntoCrsMatrix< local_matrix_type, local_map_type, buffer_device_type > (local_matrix, local_col_map, imports_d, num_packets_per_lid_d, - import_lids_d, combineMode, unpack_pids); + import_lids_d, combineMode); } /// \brief Special version of Tpetra::Details::unpackCrsMatrixAndCombine @@ -1453,10 +1546,10 @@ unpackAndCombineIntoCrsArrays ( create_mirror_view_from_raw_host_array(outputDevice, TargetPids.getRawPtr(), TargetPids.size(), true, "tgt_pids"); - size_t num_bytes_per_value = 0; + size_t bytes_per_value = 0; if (PackTraits::compileTimeSize) { // assume that ST is default constructible - num_bytes_per_value = PackTraits::packValueCount(ST()); + bytes_per_value = PackTraits::packValueCount(ST()); } else { // Since the packed data come from the source matrix, we can use the source @@ -1467,18 +1560,18 @@ unpackAndCombineIntoCrsArrays ( // a Scalar value is. Of course, if no processes have any entries, then no // values should be packed (though this does assume that in our packing // scheme, rows with zero entries take zero bytes). - size_t num_bytes_per_value_l = 0; + size_t bytes_per_value_l = 0; if (local_matrix.values.extent(0) > 0) { const ST& val = local_matrix.values(0); - num_bytes_per_value_l = PackTraits::packValueCount(val); + bytes_per_value_l = PackTraits::packValueCount(val); } else { const ST& val = crs_vals_d(0); - num_bytes_per_value_l = PackTraits::packValueCount(val); + bytes_per_value_l = PackTraits::packValueCount(val); } Teuchos::reduceAll(*(sourceMatrix.getComm()), Teuchos::REDUCE_MAX, - num_bytes_per_value_l, - outArg(num_bytes_per_value)); + bytes_per_value_l, + outArg(bytes_per_value)); } #ifdef HAVE_TPETRA_INST_COMPLEX_DOUBLE @@ -1494,7 +1587,7 @@ unpackAndCombineIntoCrsArrays ( num_packets_per_lid_d, permute_to_lids_d, permute_from_lids_d, crs_rowptr_d, crs_colind_d, crs_vals_d, src_pids_d, tgt_pids_d, numSameIDs, TargetNumRows, TargetNumNonzeros, MyTargetPID, - num_bytes_per_value); + bytes_per_value); // Copy outputs back to host typename decltype(crs_rowptr_d)::HostMirror crs_rowptr_h( diff --git a/packages/tpetra/core/src/Tpetra_DistObject_def.hpp b/packages/tpetra/core/src/Tpetra_DistObject_def.hpp index fe5eb2f5e776..679c888773f5 100644 --- a/packages/tpetra/core/src/Tpetra_DistObject_def.hpp +++ b/packages/tpetra/core/src/Tpetra_DistObject_def.hpp @@ -687,8 +687,6 @@ namespace Tpetra { using Kokkos::Compat::getKokkosViewDeepCopy; using Kokkos::Compat::create_const_view; using std::endl; - using DT = device_type; - using DES = typename DT::execution_space; const char funcName[] = "Tpetra::DistObject::doTransferNew"; ProfilingRegion region_dTN(funcName); @@ -963,7 +961,6 @@ namespace Tpetra { else { distor.doPostsAndWaits (numExp_h, 1, numImp_h); } - DES().fence (); // just in case UVM doesn't behave right if (verbose) { std::ostringstream os; @@ -999,7 +996,6 @@ namespace Tpetra { else { distor.doPostsAndWaits (numExp_d, 1, numImp_d); } - DES().fence (); // just in case UVM doesn't behave right if (verbose) { std::ostringstream os; @@ -1079,6 +1075,7 @@ namespace Tpetra { } } else { // pack on device + Kokkos::fence(); // for UVM this->imports_.modify_device (); if (revOp == DoReverse) { distor.doReversePostsAndWaits @@ -1139,6 +1136,7 @@ namespace Tpetra { } } else { // pack on device + Kokkos::fence(); // for UVM this->imports_.modify_device (); if (revOp == DoReverse) { distor.doReversePostsAndWaits diff --git a/packages/tpetra/core/src/Tpetra_FECrsGraph_decl.hpp b/packages/tpetra/core/src/Tpetra_FECrsGraph_decl.hpp index d04b8239a2a0..f1ecc3d12a86 100644 --- a/packages/tpetra/core/src/Tpetra_FECrsGraph_decl.hpp +++ b/packages/tpetra/core/src/Tpetra_FECrsGraph_decl.hpp @@ -73,6 +73,54 @@ namespace Tpetra { /// This class has an interface like that of Epetra_CrsGraph, but /// also allows insertion of data into nonowned rows, much like /// Epetra_FECrsGraph. + /// + /// Note on some versions of the constructors: + /// consturctors appear in two fashions: one that accepts only one (optional) domainMap + /// (let's call it V1) and one that accepts two domainMaps (let's call it V2). + /// In V1, the input domainMap will be used for both owned and owned+shared graphs. + /// In this case, you *should* provide a map that works for the owned graph (since + /// that's the graph you will use in mat-vec and mat-mat produts, which will be checked). + /// The domain map for the owned+shared graph is *usually* only needed to build the colMap + /// of the owned+shared graph. + /// + /// Whether you need V2 or are ok with V1 depends on what your "owned+shared" maps contain. + /// + /// If you partition a mesh by node (N), then your owned+shared maps should contain all the + /// nodes that are in the patch of one of the owned nodes, which is precisely what + /// the colMap of the owned+shared graph should contain. + /// On the other hand, if you partition the mesh by cell (C), then your owned+shared maps + /// should contain all nodes belonging to one of the owned elements. Such map does *NOT* + /// necessarily contain all the GID of all the nodes connected to one of the owned nodes + /// (which is what the colMap should contain). In this case, you are not likely to have + /// a colMap available, and you'll rely on Tpetra to build one for you once the graph + /// is filled. + /// + /// If you do not provide a valid owned+shared colMap, then Tpetra creates one for you, + /// which is used for both the owned+shared and owned graphs. When doing this, Tpetra + /// guarantees that the domain map of the owned+shared graph is "locally fitted" to its + /// colMap (see Tpetra::Map documentation for the meaning of 'locally fitted'). + /// If you use V1, then the domain map is the owned dofs only, which means that the + /// non-owned GIDs will appear in the colMap in an order that is out of your control. + /// + /// Now, if you partition by Cell (C), then you don't have a colMap when you create + /// the graph, but only a owned+shared one. If you use version V1 of the consturctor, + /// the Local ID of the shared dofs in the graph's colMap is likely to NOT be the same + /// as in your owned+shared map, since the colMap creation only guarantees that the input + /// domainMap (which should contian owned dofs only) is going to be locally fitted in the + /// colMap. All other GIDs will appear in an order that you can't control. + /// + /// On the other hand, if you use V2, then you are guaranteed that the owend+shared domain + /// map you provide will be locally fitted to the graph colMap. + /// + /// This difference is important when you do local assembly with a FECrsMatrix: if the Local IDs + /// of the dofs in your owned+shared maps is THE SAME as in the graph's col map, then you can do + /// assembly using local ids. Otherwise, you need to have access to the GIDs of the dofs, + /// extract the colMap from the matrix, and convert GIDs into LIDs ACCORDINGLY TO THE COL MAP. + /// + /// Notice that if your mesh is partitioned by node (N) OR you provide a valid colMap + /// to the graph's constructor, then using V1 is likely ok for you. + /// + /// For more details, see GitHub issue #7455 template & ownedRowMap, @@ -142,9 +190,44 @@ namespace Tpetra { const size_t maxNumEntriesPerRow, const Teuchos::RCP & ownedPlusSharedToOwnedimporter = Teuchos::null, const Teuchos::RCP & domainMap = Teuchos::null, - const Teuchos::RCP & rangeMap = Teuchos::null, + const Teuchos::RCP & ownedRangeMap = Teuchos::null, const Teuchos::RCP& params = Teuchos::null); + /// \brief Constructorfor globally-indexed assembly specifying a single upper bound for the + /// number of entries in all rows on the calling process. + /// + /// \param ownedRowMap [in] Distribution of rows of the owned graph. + /// + /// \param ownedPlusSharedRowMap [in] ownedMap plus the list of shared rows to which off-processor insertion is allowed + /// + /// \param maxNumEntriesPerRow [in] Maximum number of graph + /// entries per row. You cannot exceed this number of + /// entries in any row. + /// + /// \param ownedPlusSharedDomainMap [in] Domain map for the owned+shared graph. If this is null, + /// then ownedPlusSharedRowMap will be used as domain map for the owned+shared graph. + /// + /// \param ownedPlusSharedToOwnedimporter [in] Optional importer between the ownedMap and ownedPlusSharedMap + /// This will be calculated by FECrsGraph if it is not provided + /// + /// \param ownedDomainMap [in] Optional domain map for the owned graph. If this is null, + //// then ownedMap will be used as domain map for the owned graph. + /// + /// \param ownedRangeMap [in] Optional range map for the owned graph. If this is not provided, then ownedMap + /// will be used as range map for the owned graph. + /// + /// \param params [in/out] Optional list of parameters. If not + /// null, any missing parameters will be filled in with their + /// default values. + FECrsGraph (const Teuchos::RCP & ownedRowMap, + const Teuchos::RCP & ownedPlusSharedRowMap, + const size_t maxNumEntriesPerRow, + const Teuchos::RCP & ownedPlusSharedDomainMap, + const Teuchos::RCP & ownedPlusSharedToOwnedimporter = Teuchos::null, + const Teuchos::RCP & ownedDomainMap = Teuchos::null, + const Teuchos::RCP & ownedRangeMap = Teuchos::null, + const Teuchos::RCP& params = Teuchos::null); + /// \brief Constructor for globally-indexed assembly specifying a (possibly different) upper /// bound for the number of entries in each row. /// @@ -159,11 +242,11 @@ namespace Tpetra { /// \param ownedPlusSharedToOwnedimporter [in] Optional importer between the ownedMap and ownedPlusSharedMap /// This will be calculated by FECrsGraph if it is not provided /// - /// \param domainMap [in] Optional domainMap for the owned graph. If this is not provided, then ownedMap - /// will be used for the domainMap in the call to endFill() + /// \param domainMap [in] Optional domain map for both owned and owned+shared graphs. If this is null, + //// then ownedMap will be used as domain map for both graphs. /// - /// \param rangeMap [in] Optional domainMap for the owned graph. If this is not provided, then ownedMap - /// will be used for the domainMap in the call to endFill() + /// \param ownedRangeMap [in] Optional range map for the owned graph. If this is not provided, then ownedMap + /// will be used as range map for the owned graph. /// /// \param params [in/out] Optional list of parameters. If not /// null, any missing parameters will be filled in with their @@ -173,7 +256,42 @@ namespace Tpetra { const Kokkos::DualView& numEntPerRow, const Teuchos::RCP & ownedPlusSharedToOwnedimporter = Teuchos::null, const Teuchos::RCP & domainMap = Teuchos::null, - const Teuchos::RCP & rangeMap = Teuchos::null, + const Teuchos::RCP & ownedRangeMap = Teuchos::null, + const Teuchos::RCP& params = Teuchos::null); + + /// \brief Constructor for globally-indexed assembly specifying a (possibly different) upper + /// bound for the number of entries in each row. + /// + /// \param ownedRowMap [in] Distribution of rows of the owned graph. + /// + /// \param ownedPlusSharedRowMap [in] ownedMap plus the list of shared rows to which off-processor insertion is allowed + /// + /// \param numEntPerRow [in] Maximum number of graph entries to + /// allocate for each row. You cannot exceed the allocated + /// number of entries for any row. + /// + /// \param ownedPlusSharedDomainMap [in] Domain map for the owned+shared graph. If this is null, + /// then ownedPlusSharedRowMap will be used in the call to endFill() + /// + /// \param ownedPlusSharedToOwnedimporter [in] Optional importer between the ownedMap and ownedPlusSharedMap + /// This will be calculated by FECrsGraph if it is not provided + /// + /// \param ownedDomainMap [in] Optional domain map for the owned graph. If this is not provided, + //// then ownedMap will be used as domain map for the owned graph. + /// + /// \param ownedRangeMap [in] Optional range map for the owned graph. If this is not provided, then ownedMap + /// will be used as range map for the owned graph. + /// + /// \param params [in/out] Optional list of parameters. If not + /// null, any missing parameters will be filled in with their + /// default values. + FECrsGraph (const Teuchos::RCP & ownedRowMap, + const Teuchos::RCP & ownedPlusSharedRowMap, + const Kokkos::DualView& numEntPerRow, + const Teuchos::RCP & ownedPlusSharedDomainMap, + const Teuchos::RCP & ownedPlusSharedToOwnedimporter = Teuchos::null, + const Teuchos::RCP & ownedDomainMap = Teuchos::null, + const Teuchos::RCP & ownedRangeMap = Teuchos::null, const Teuchos::RCP& params = Teuchos::null); @@ -193,11 +311,11 @@ namespace Tpetra { /// \param ownedPlusSharedToOwnedimporter [in] Optional importer between the ownedMap and ownedPlusSharedMap /// This will be calculated by FECrsGraph if it is not provided /// - /// \param domainMap [in] Optional domainMap for the owned graph. If this is not provided, then ownedMap - /// will be used for the domainMap in the call to endFill() + /// \param domainMap [in] Optional domain map for the both owned and owned+shared graphs. If this is not provided, + /// then ownedMap will be used as domain map for both graphs. /// - /// \param rangeMap [in] Optional domainMap for the owned graph. If this is not provided, then ownedMap - /// will be used for the domainMap in the call to endFill() + /// \param ownedRangeMap [in] Optional range map for the owned graph. If this is not provided, then ownedMap + /// will be used as range map for the owned graph /// /// \param params [in/out] Optional list of parameters. If not /// null, any missing parameters will be filled in with their @@ -208,7 +326,44 @@ namespace Tpetra { const size_t maxNumEntriesPerRow, const Teuchos::RCP & ownedPlusSharedToOwnedimporter = Teuchos::null, const Teuchos::RCP & domainMap = Teuchos::null, - const Teuchos::RCP & rangeMap = Teuchos::null, + const Teuchos::RCP & ownedRangeMap = Teuchos::null, + const Teuchos::RCP& params = Teuchos::null); + + /// \brief Constructor for locally-indexed assembly specifying a single upper bound for the + /// number of entries in all rows on the calling process. + /// + /// \param ownedRowMap [in] Distribution of rows of the owned graph. + /// + /// \param ownedPlusSharedRowMap [in] ownedMap plus the list of shared rows to which off-processor insertion is allowed + /// + /// \param ownedPlusSharedColMap [in] list of owned and shared columns into which assertion is allowed. + /// + /// \param maxNumEntriesPerRow [in] Maximum number of graph + /// entries per row. You cannot exceed this number of + /// entries in any row. + /// + /// \param ownedPlusSharedDomainMap [in] Domain map for the owned+shared graph. If this is null, then ownedPlusSharedRowMap + /// will be used as domain map for the owned+shared graph. + /// \param ownedPlusSharedToOwnedimporter [in] Optional importer between the ownedMap and ownedPlusSharedMap + /// This will be calculated by FECrsGraph if it is not provided + /// + /// \param ownedDomainMap [in] Optional domain map for the owned graph. If this is not provided, then ownedMap + /// will be used as domain map for the owned graph. + /// + /// \param ownedRangeMap [in] Optional range map for the owned graph. If this is not provided, then ownedMap + /// will be used as range map for the owned graph. + /// + /// \param params [in/out] Optional list of parameters. If not + /// null, any missing parameters will be filled in with their + /// default values. + FECrsGraph(const Teuchos::RCP & ownedRowMap, + const Teuchos::RCP & ownedPlusSharedRowMap, + const Teuchos::RCP & ownedPlusSharedColMap, + const size_t maxNumEntriesPerRow, + const Teuchos::RCP & ownedPlusSharedDomainMap, + const Teuchos::RCP & ownedPlusSharedToOwnedimporter = Teuchos::null, + const Teuchos::RCP & ownedDomainMap = Teuchos::null, + const Teuchos::RCP & ownedRangeMap = Teuchos::null, const Teuchos::RCP& params = Teuchos::null); @@ -226,11 +381,11 @@ namespace Tpetra { /// \param ownedPlusSharedToOwnedimporter [in] Optional importer between the ownedMap and ownedPlusSharedMap /// This will be calculated by FECrsGraph if it is not provided /// - /// \param domainMap [in] Optional domainMap for the owned graph. If this is not provided, then ownedMap - /// will be used for the domainMap in the call to endFill() + /// \param domainMap [in] Optional domain map for both the owned and owned+shared graphs. If this is not provided, + /// then ownedMap will be used as domain map for both graphs. /// - /// \param rangeMap [in] Optional domainMap for the owned graph. If this is not provided, then ownedMap - /// will be used for the domainMap in the call to endFill() + /// \param ownedRangeMap [in] Optional range map for the owned graph. If this is not provided, then ownedMap + /// will be used as range map for the owned graph /// /// \param params [in/out] Optional list of parameters. If not /// null, any missing parameters will be filled in with their @@ -241,7 +396,41 @@ namespace Tpetra { const Kokkos::DualView& numEntPerRow, const Teuchos::RCP & ownedPlusSharedToOwnedimporter = Teuchos::null, const Teuchos::RCP & domainMap = Teuchos::null, - const Teuchos::RCP & rangeMap = Teuchos::null, + const Teuchos::RCP & ownedRangeMap = Teuchos::null, + const Teuchos::RCP& params = Teuchos::null); + + /// \brief Constructor for locally-indexed assembly specifying a (possibly different) upper + /// bound for the number of entries in each row. + /// + /// \param ownedRowMap [in] Distribution of rows of the owned graph. + /// + /// \param ownedPlusSharedRowMap [in] ownedMap plus the list of shared rows to which off-processor insertion is allowed + /// + /// \param numEntPerRow [in] Maximum number of graph entries to + /// allocate for each row. You cannot exceed the allocated + /// number of entries for any row. + /// + /// \param ownedPlusSharedDomainMap [in] Domain map for the owned+shared graph. If this is null, then ownedPlusSharedRowMap + /// \param ownedPlusSharedToOwnedimporter [in] Optional importer between the ownedMap and ownedPlusSharedMap + /// This will be calculated by FECrsGraph if it is not provided + /// + /// \param ownedDomainMap [in] Optional domain map for the owned graph. If this is not provided, then ownedMap + /// will be used as domain map for the owned graph. + /// + /// \param ownedRangeMap [in] Optional range map for the owned graph. If this is not provided, then ownedMap + /// will be used as range map for the owned graph. + /// + /// \param params [in/out] Optional list of parameters. If not + /// null, any missing parameters will be filled in with their + /// default values. + FECrsGraph (const Teuchos::RCP & ownedRowMap, + const Teuchos::RCP & ownedPlusSharedRowMap, + const Teuchos::RCP & ownedPlusSharedColMap, + const Kokkos::DualView& numEntPerRow, + const Teuchos::RCP & ownedPlusSharedDomainMap, + const Teuchos::RCP & ownedPlusSharedToOwnedimporter = Teuchos::null, + const Teuchos::RCP & ownedDomainMap = Teuchos::null, + const Teuchos::RCP & ownedRangeMap = Teuchos::null, const Teuchos::RCP& params = Teuchos::null); //! Copy constructor (forbidden). @@ -302,9 +491,9 @@ namespace Tpetra { /// \pre isFillActive() && ! isFillComplete() /// \post ! isFillActive() && isFillComplete() /// - /// \param domainMap [in] The graph's domain Map. MUST be one to + /// \param ownedDomainMap [in] The graph's domain Map. MUST be one to /// one! - /// \param rangeMap [in] The graph's range Map. MUST be one to + /// \param ownedRangeMap [in] The graph's range Map. MUST be one to /// one! May be, but need not be, the same as the domain Map. /// \param params [in/out] List of parameters controlling this /// method's behavior. See below for valid parameters. @@ -317,11 +506,11 @@ namespace Tpetra { /// /// void - fillComplete (const Teuchos::RCP& domainMap, - const Teuchos::RCP& rangeMap, + fillComplete (const Teuchos::RCP& ownedDomainMap, + const Teuchos::RCP& ownedRangeMap, const Teuchos::RCP& /* params */ = Teuchos::null) { - domainMap_ = domainMap; - rangeMap_ = rangeMap; + ownedDomainMap_ = ownedDomainMap; + ownedRangeMap_ = ownedRangeMap; endFill(); } @@ -376,6 +565,10 @@ namespace Tpetra { // Common core guts of the constructor (the colMap argument is Teuchos::null if we're globally-indexed) void setup(const Teuchos::RCP & ownedRowMap, const Teuchos::RCP & ownedPlusSharedRowMap,const Teuchos::RCP & ownedPlusSharedColMap, const Teuchos::RCP& params); + // Template to avoid long type names...lazy. + // template + // Teuchos::RCP makeOwnedColMap (ViewType ownedGraphIndices); + // Enum for activity enum FEWhichActive { @@ -384,21 +577,20 @@ namespace Tpetra { }; - // This is whichever multivector isn't currently active + // This is whichever graph isn't currently active Teuchos::RCP > inactiveCrsGraph_; + // This is in RCP to make shallow copies of the FECrsGraph work correctly Teuchos::RCP activeCrsGraph_; // The importer between the rowmaps of the two graphs - Teuchos::RCP importer_; - - // The domainMap to use in endFill(), if provided - Teuchos::RCP domainMap_; - - // The rangeMap to use in endFill(), if provided - Teuchos::RCP rangeMap_; + Teuchos::RCP ownedRowsImporter_; + // The domainMap to use in endFill() for the owned graph + Teuchos::RCP ownedDomainMap_; + // The rangeMap to use in endFill() for the owned graph + Teuchos::RCP ownedRangeMap_; }; // class FECrsGraph diff --git a/packages/tpetra/core/src/Tpetra_FECrsGraph_def.hpp b/packages/tpetra/core/src/Tpetra_FECrsGraph_def.hpp index b11182522028..a4e20d051af8 100644 --- a/packages/tpetra/core/src/Tpetra_FECrsGraph_def.hpp +++ b/packages/tpetra/core/src/Tpetra_FECrsGraph_def.hpp @@ -42,11 +42,12 @@ #ifndef TPETRA_FECRSGRAPH_DEF_HPP #define TPETRA_FECRSGRAPH_DEF_HPP -#include #include "Tpetra_CrsGraph.hpp" #include "Tpetra_Details_Behavior.hpp" #include "Tpetra_Details_getEntryOnHost.hpp" +#include +#include namespace Tpetra { @@ -57,38 +58,72 @@ FECrsGraph(const Teuchos::RCP & ownedRowMap, const size_t maxNumEntriesPerRow, const Teuchos::RCP & ownedPlusSharedToOwnedimporter, const Teuchos::RCP & domainMap, - const Teuchos::RCP & rangeMap, - const Teuchos::RCP& params): + const Teuchos::RCP & ownedRangeMap, + const Teuchos::RCP& params): + FECrsGraph(ownedRowMap,ownedPlusSharedRowMap,maxNumEntriesPerRow, + domainMap.is_null() ? ownedRowMap : domainMap, + ownedPlusSharedToOwnedimporter,domainMap,ownedRangeMap,params) +{ + // Nothing else to do here +} + + +template +FECrsGraph:: +FECrsGraph(const Teuchos::RCP & ownedRowMap, + const Teuchos::RCP & ownedPlusSharedRowMap, + const size_t maxNumEntriesPerRow, + const Teuchos::RCP & ownedPlusSharedDomainMap, + const Teuchos::RCP & ownedPlusSharedToOwnedimporter, + const Teuchos::RCP & ownedDomainMap, + const Teuchos::RCP & ownedRangeMap, + const Teuchos::RCP& params): crs_graph_type(ownedPlusSharedRowMap, maxNumEntriesPerRow, StaticProfile, params), - importer_(ownedPlusSharedToOwnedimporter), - domainMap_(domainMap.is_null() ? ownedRowMap : domainMap), - rangeMap_(rangeMap.is_null() ? ownedRowMap : rangeMap) -{ + ownedRowsImporter_(ownedPlusSharedToOwnedimporter), + ownedDomainMap_(ownedDomainMap.is_null() ? ownedRowMap : ownedDomainMap), + ownedRangeMap_(ownedRangeMap.is_null() ? ownedRowMap : ownedRangeMap) +{ + this->domainMap_ = ownedPlusSharedDomainMap.is_null() ? ownedPlusSharedRowMap : ownedPlusSharedDomainMap; Teuchos::RCP dummy; setup(ownedRowMap,ownedPlusSharedRowMap,dummy,params); } +template +FECrsGraph:: +FECrsGraph (const Teuchos::RCP & ownedRowMap, + const Teuchos::RCP & ownedPlusSharedRowMap, + const Kokkos::DualView& numEntPerRow, + const Teuchos::RCP & ownedPlusSharedToOwnedimporter, + const Teuchos::RCP & domainMap, + const Teuchos::RCP & ownedRangeMap, + const Teuchos::RCP& params): + FECrsGraph(ownedRowMap,ownedPlusSharedRowMap,numEntPerRow, + domainMap.is_null() ? ownedRowMap : domainMap, + ownedPlusSharedToOwnedimporter,domainMap,ownedRangeMap,params) +{ + // Nothing else to do here +} template FECrsGraph:: FECrsGraph (const Teuchos::RCP & ownedRowMap, const Teuchos::RCP & ownedPlusSharedRowMap, const Kokkos::DualView& numEntPerRow, + const Teuchos::RCP & ownedPlusSharedDomainMap, const Teuchos::RCP & ownedPlusSharedToOwnedimporter, - const Teuchos::RCP & domainMap, - const Teuchos::RCP & rangeMap, + const Teuchos::RCP & ownedDomainMap, + const Teuchos::RCP & ownedRangeMap, const Teuchos::RCP& params): crs_graph_type( ownedPlusSharedRowMap, numEntPerRow, StaticProfile, params), - importer_(ownedPlusSharedToOwnedimporter), - domainMap_(domainMap.is_null() ? ownedRowMap : domainMap), - rangeMap_(rangeMap.is_null() ? ownedRowMap : rangeMap) - -{ + ownedRowsImporter_(ownedPlusSharedToOwnedimporter), + ownedDomainMap_(ownedDomainMap.is_null() ? ownedRowMap : ownedDomainMap), + ownedRangeMap_(ownedRangeMap.is_null() ? ownedRowMap : ownedRangeMap) +{ + this->domainMap_ = ownedPlusSharedDomainMap.is_null() ? ownedPlusSharedRowMap : ownedPlusSharedDomainMap; Teuchos::RCP dummy; setup(ownedRowMap,ownedPlusSharedRowMap,dummy,params); } - template FECrsGraph:: FECrsGraph(const Teuchos::RCP & ownedRowMap, @@ -97,13 +132,32 @@ FECrsGraph(const Teuchos::RCP & ownedRowMap, const size_t maxNumEntriesPerRow, const Teuchos::RCP & ownedPlusSharedToOwnedimporter, const Teuchos::RCP & domainMap, - const Teuchos::RCP & rangeMap, + const Teuchos::RCP & ownedRangeMap, + const Teuchos::RCP& params): + FECrsGraph(ownedRowMap,ownedPlusSharedRowMap,ownedPlusSharedColMap,maxNumEntriesPerRow, + domainMap.is_null() ? ownedRowMap : domainMap, + ownedPlusSharedToOwnedimporter, domainMap, ownedRangeMap, params) +{ + // Nothing else to do here +} + +template +FECrsGraph:: +FECrsGraph(const Teuchos::RCP & ownedRowMap, + const Teuchos::RCP & ownedPlusSharedRowMap, + const Teuchos::RCP & ownedPlusSharedColMap, + const size_t maxNumEntriesPerRow, + const Teuchos::RCP & ownedPlusSharedDomainMap, + const Teuchos::RCP & ownedPlusSharedToOwnedimporter, + const Teuchos::RCP & ownedDomainMap, + const Teuchos::RCP & ownedRangeMap, const Teuchos::RCP& params): crs_graph_type(ownedPlusSharedRowMap, ownedPlusSharedColMap,maxNumEntriesPerRow, StaticProfile, params), - importer_(ownedPlusSharedToOwnedimporter), - domainMap_(domainMap.is_null() ? ownedRowMap : domainMap), - rangeMap_(rangeMap.is_null() ? ownedRowMap : rangeMap) -{ + ownedRowsImporter_(ownedPlusSharedToOwnedimporter), + ownedDomainMap_(ownedDomainMap.is_null() ? ownedRowMap : ownedDomainMap), + ownedRangeMap_(ownedRangeMap.is_null() ? ownedRowMap : ownedRangeMap) +{ + this->domainMap_ = ownedPlusSharedDomainMap.is_null() ? ownedPlusSharedRowMap : ownedPlusSharedDomainMap; setup(ownedRowMap,ownedPlusSharedRowMap, ownedPlusSharedColMap,params); } @@ -115,20 +169,42 @@ FECrsGraph (const Teuchos::RCP & ownedRowMap, const Kokkos::DualView& numEntPerRow, const Teuchos::RCP & ownedPlusSharedToOwnedimporter, const Teuchos::RCP & domainMap, - const Teuchos::RCP & rangeMap, + const Teuchos::RCP & ownedRangeMap, const Teuchos::RCP& params): - crs_graph_type(ownedPlusSharedRowMap, ownedPlusSharedColMap, numEntPerRow, StaticProfile, params), - importer_(ownedPlusSharedToOwnedimporter), - domainMap_(domainMap.is_null() ? ownedRowMap : domainMap), - rangeMap_(rangeMap.is_null() ? ownedRowMap : rangeMap) + FECrsGraph(ownedRowMap,ownedPlusSharedRowMap,ownedPlusSharedColMap,numEntPerRow, + domainMap.is_null() ? ownedRowMap : domainMap, + ownedPlusSharedToOwnedimporter, domainMap, ownedRangeMap, params) +{ + // Nothing else to do here +} +template +FECrsGraph:: +FECrsGraph (const Teuchos::RCP & ownedRowMap, + const Teuchos::RCP & ownedPlusSharedRowMap, + const Teuchos::RCP & ownedPlusSharedColMap, + const Kokkos::DualView& numEntPerRow, + const Teuchos::RCP & ownedPlusSharedDomainMap, + const Teuchos::RCP & ownedPlusSharedToOwnedimporter, + const Teuchos::RCP & ownedDomainMap, + const Teuchos::RCP & ownedRangeMap, + const Teuchos::RCP& params): + crs_graph_type(ownedPlusSharedRowMap, ownedPlusSharedColMap, numEntPerRow, StaticProfile, params), + ownedRowsImporter_(ownedPlusSharedToOwnedimporter), + ownedDomainMap_(ownedDomainMap.is_null() ? ownedRowMap : ownedDomainMap), + ownedRangeMap_(ownedRangeMap.is_null() ? ownedRowMap : ownedRangeMap) { + this->domainMap_ = ownedPlusSharedDomainMap.is_null() ? ownedPlusSharedRowMap : ownedPlusSharedDomainMap; setup(ownedRowMap,ownedPlusSharedRowMap, ownedPlusSharedColMap,params); } - template -void FECrsGraph::setup(const Teuchos::RCP & ownedRowMap, const Teuchos::RCP & ownedPlusSharedRowMap, const Teuchos::RCP & ownedPlusSharedColMap,const Teuchos::RCP& params) { +void FECrsGraph:: +setup(const Teuchos::RCP & ownedRowMap, + const Teuchos::RCP & ownedPlusSharedRowMap, + const Teuchos::RCP & ownedPlusSharedColMap, + const Teuchos::RCP& params) +{ const char tfecfFuncName[] = "FECrsGraph::setup(): "; TEUCHOS_TEST_FOR_EXCEPTION_CLASS_FUNC(ownedRowMap.is_null (), std::runtime_error, "ownedRowMap is null."); @@ -144,16 +220,16 @@ void FECrsGraph::setup(const Teuchos::RCPisSameAs(*ownedPlusSharedRowMap); if(!maps_are_the_same) { // Make an importer if we need to, check map compatability if we don't - if(importer_.is_null()) { - importer_ = Teuchos::rcp(new import_type(ownedRowMap,ownedPlusSharedRowMap)); + if(ownedRowsImporter_.is_null()) { + ownedRowsImporter_ = Teuchos::rcp(new import_type(ownedRowMap,ownedPlusSharedRowMap)); } else { - TEUCHOS_TEST_FOR_EXCEPTION_CLASS_FUNC(!ownedRowMap->isSameAs(*importer_->getSourceMap()), std::runtime_error, "ownedRowMap does not match importer source map."); - TEUCHOS_TEST_FOR_EXCEPTION_CLASS_FUNC(!ownedPlusSharedRowMap->isSameAs(*importer_->getTargetMap()), std::runtime_error, "ownedPlusSharedRowMap does not match importer target map."); + TEUCHOS_TEST_FOR_EXCEPTION_CLASS_FUNC(!ownedRowMap->isSameAs(*ownedRowsImporter_->getSourceMap()), std::runtime_error, "ownedRowMap does not match importer source map."); + TEUCHOS_TEST_FOR_EXCEPTION_CLASS_FUNC(!ownedPlusSharedRowMap->isSameAs(*ownedRowsImporter_->getTargetMap()), std::runtime_error, "ownedPlusSharedRowMap does not match importer target map."); } // Make sure the ownedPlusSharedRowMap has at least as many entries at the ownedRowMap (due to our superset requriement) - TEUCHOS_TEST_FOR_EXCEPTION_CLASS_FUNC( importer_->getNumSameIDs() != importer_->getSourceMap()->getNodeNumElements(), + TEUCHOS_TEST_FOR_EXCEPTION_CLASS_FUNC( ownedRowsImporter_->getNumSameIDs() != ownedRowsImporter_->getSourceMap()->getNodeNumElements(), std::runtime_error,"ownedRowMap contains entries which are not in the ownedPlusSharedRowMap."); TEUCHOS_TEST_FOR_EXCEPTION_CLASS_FUNC( ownedRowMap->getNodeNumElements() > ownedPlusSharedRowMap->getNodeNumElements(), @@ -166,24 +242,21 @@ void FECrsGraph::setup(const Teuchos::RCP void FECrsGraph::doOwnedPlusSharedToOwned(const CombineMode CM) { const char tfecfFuncName[] = "FECrsGraph::doOwnedPlusSharedToOwned(CombineMode): "; - if(!inactiveCrsGraph_.is_null() && *activeCrsGraph_ == FE_ACTIVE_OWNED_PLUS_SHARED) { - Teuchos::RCP ownedRowMap = inactiveCrsGraph_->getRowMap(); + if(!ownedRowsImporter_.is_null() && *activeCrsGraph_ == FE_ACTIVE_OWNED_PLUS_SHARED) { + Teuchos::RCP ownedRowMap = ownedRowsImporter_->getSourceMap(); // Do a self-export in "restricted mode" - this->doExport(*this,*importer_,CM,true); + this->doExport(*this,*ownedRowsImporter_,CM,true); // Under the "if you own an element, you own at least one of its nodes" assumption, // we can start by making a columnmap for ownedPlusShared @@ -193,7 +266,7 @@ void FECrsGraph::doOwnedPlusSharedToOwned(con } // Now run CrsGraph's fillComplete to get the final importer - crs_graph_type::fillComplete(domainMap_,this->getRowMap()); + crs_graph_type::fillComplete(this->domainMap_,this->getRowMap()); // In debug mode, we check to make sure the "if you own an element, you own at least one of its nodes" const bool debug = ::Tpetra::Details::Behavior::debug (); @@ -222,14 +295,11 @@ void FECrsGraph::doOwnedPlusSharedToOwned(con local_graph_type ownedPlusSharedGraph = this->getLocalGraph(); size_t numOwnedRows = ownedRowMap->getNodeNumElements(); size_t numOwnedNonZeros = Tpetra::Details::getEntryOnHost(ownedPlusSharedGraph.row_map,numOwnedRows); + auto row_ptrs = Kokkos::subview(ownedPlusSharedGraph.row_map,Kokkos::pair(0,numOwnedRows+1)); + auto col_indices = Kokkos::subview(ownedPlusSharedGraph.entries,Kokkos::pair(0,numOwnedNonZeros)); - // Build the inactive guy - // NOTE: We can't use the local_graph_type constructor, because it does not allow us to provide an importer - if(!inactiveCrsGraph_->hasColMap()) inactiveCrsGraph_->replaceColMap(this->getColMap()); - inactiveCrsGraph_->setAllIndices(Kokkos::subview(ownedPlusSharedGraph.row_map,Kokkos::pair(0,numOwnedRows+1)), - Kokkos::subview(ownedPlusSharedGraph.entries,Kokkos::pair(0,numOwnedNonZeros))); - // This will generate an exporter if we need one. - inactiveCrsGraph_->expertStaticFillComplete(domainMap_,rangeMap_,this->getImporter(),Teuchos::null); + inactiveCrsGraph_ = Teuchos::rcp(new crs_graph_type(ownedRowMap,this->getColMap(),row_ptrs,col_indices)); + inactiveCrsGraph_->fillComplete(ownedDomainMap_,ownedRangeMap_); } }//end doOverlapToLocal @@ -279,10 +349,10 @@ void FECrsGraph::endFill() { // Precondition TEUCHOS_TEST_FOR_EXCEPTION_CLASS_FUNC(*activeCrsGraph_ != FE_ACTIVE_OWNED_PLUS_SHARED,std::runtime_error, "must be in owned+shared mode."); - if(inactiveCrsGraph_.is_null()) { + if(ownedRowsImporter_.is_null()) { // The easy case: One graph switchActiveCrsGraph(); - crs_graph_type::fillComplete(domainMap_,rangeMap_); + crs_graph_type::fillComplete(ownedDomainMap_,ownedRangeMap_); } else { // The hard case: Two graphs @@ -308,7 +378,6 @@ void FECrsGraph::beginFill() { } - } // end namespace Tpetra diff --git a/packages/tpetra/core/src/Tpetra_FECrsMatrix_def.hpp b/packages/tpetra/core/src/Tpetra_FECrsMatrix_def.hpp index 47d17499d475..c2c138b29e39 100644 --- a/packages/tpetra/core/src/Tpetra_FECrsMatrix_def.hpp +++ b/packages/tpetra/core/src/Tpetra_FECrsMatrix_def.hpp @@ -91,7 +91,7 @@ template void FECrsMatrix::doOwnedPlusSharedToOwned(const CombineMode CM) { if(!inactiveCrsMatrix_.is_null() && *activeCrsMatrix_ == FE_ACTIVE_OWNED_PLUS_SHARED) { // Do a self-export in "restricted mode" - this->doExport(*this,*feGraph_->importer_,CM,true); + this->doExport(*this,*feGraph_->ownedRowsImporter_,CM,true); inactiveCrsMatrix_->fillComplete(); } crs_matrix_type::fillComplete(); diff --git a/packages/tpetra/core/src/Tpetra_LocalCrsMatrixOperator_decl.hpp b/packages/tpetra/core/src/Tpetra_LocalCrsMatrixOperator_decl.hpp index 08d867f4f3b8..491297dc38ab 100644 --- a/packages/tpetra/core/src/Tpetra_LocalCrsMatrixOperator_decl.hpp +++ b/packages/tpetra/core/src/Tpetra_LocalCrsMatrixOperator_decl.hpp @@ -75,9 +75,19 @@ namespace Tpetra { using local_matrix_type = KokkosSparse::CrsMatrix; + device_type, + void, + size_t>; private: + //The type of a matrix with offset=ordinal, but otherwise the same as local_matrix_type + using local_cusparse_matrix_type = + KokkosSparse::CrsMatrix; using local_graph_type = typename local_matrix_type::StaticCrsGraphType; + using ordinal_view_type = typename local_graph_type::entries_type::non_const_type; public: LocalCrsMatrixOperator (const std::shared_ptr& A); @@ -92,12 +102,28 @@ namespace Tpetra { const mv_scalar_type alpha, const mv_scalar_type beta) const override; + void + applyImbalancedRows ( + Kokkos::View > X, + Kokkos::View > Y, + const Teuchos::ETransp mode, + const mv_scalar_type alpha, + const mv_scalar_type beta) const; + bool hasTransposeApply () const override; const local_matrix_type& getLocalMatrix () const; private: std::shared_ptr A_; + //If the number of entries in A_ can be represented as ordinal, + //make a copy of the rowptrs as ordinal. This allows the use of cuSPARSE spmv. + //If cusparse is not enabled or there would be no benefit from using these, + //they are not allocated/initialized. + ordinal_view_type A_ordinal_rowptrs; + local_cusparse_matrix_type A_cusparse; }; } // namespace Tpetra diff --git a/packages/tpetra/core/src/Tpetra_LocalCrsMatrixOperator_def.hpp b/packages/tpetra/core/src/Tpetra_LocalCrsMatrixOperator_def.hpp index 76f0b1572159..1dbd9b7958b9 100644 --- a/packages/tpetra/core/src/Tpetra_LocalCrsMatrixOperator_def.hpp +++ b/packages/tpetra/core/src/Tpetra_LocalCrsMatrixOperator_def.hpp @@ -41,8 +41,10 @@ #define TPETRA_LOCALCRSMATRIXOPERATOR_DEF_HPP #include "Tpetra_LocalOperator.hpp" +#include "Tpetra_Details_Behavior.hpp" #include "KokkosSparse.hpp" #include "Teuchos_TestForException.hpp" +#include "Teuchos_OrdinalTraits.hpp" namespace Tpetra { @@ -55,6 +57,26 @@ LocalCrsMatrixOperator (const std::shared_ptr& A) TEUCHOS_TEST_FOR_EXCEPTION_CLASS_FUNC (A_.get () == nullptr, std::invalid_argument, "Input matrix A is null."); +#if defined(KOKKOS_ENABLE_CUDA) && defined(KOKKOSKERNELS_ENABLE_TPL_CUSPARSE) + //Only create A_ordinal_rowptrs if: + // - KokkosKernels cuSPARSE support is enabled (otherwise, no benefit) + // - The execution space is CUDA + // - The local matrix offset and ordinal types are different (otherwise, no reason to enable) + // - The number of entries can be represented by the ordinal type. + using kk_offset_t = typename std::remove_const::type; + using kk_ordinal_t = typename std::remove_const::type; + using exec_space = typename Device::execution_space; + if(std::is_same::value && + !std::is_same::value && + A_->nnz() < static_cast(Teuchos::OrdinalTraits::max())) + { + A_ordinal_rowptrs = ordinal_view_type(Kokkos::ViewAllocateWithoutInitializing("A_ordinal_rowptrs"), A_->numRows() + 1); + //This is just like a deep copy, but it implicitly converts each element + KokkosKernels::Impl::copy_view + (A_ordinal_rowptrs.extent(0), A_->graph.row_map, A_ordinal_rowptrs); + A_cusparse = local_cusparse_matrix_type("A(cusparse)", A_->numRows(), A_->numCols(), A_->nnz(), A_->values, A_ordinal_rowptrs, A_->graph.entries); + } +#endif } template @@ -96,7 +118,74 @@ apply (Kokkos::View +void +LocalCrsMatrixOperator:: +applyImbalancedRows ( + Kokkos::View > X, + Kokkos::View > Y, + const Teuchos::ETransp mode, + const mv_scalar_type alpha, + const mv_scalar_type beta) const +{ + const bool conjugate = (mode == Teuchos::CONJ_TRANS); + const bool transpose = (mode != Teuchos::NO_TRANS); + +#ifdef HAVE_TPETRA_DEBUG + const char tfecfFuncName[] = "applyLoadBalanced: "; + + TEUCHOS_TEST_FOR_EXCEPTION_CLASS_FUNC + (X.extent (1) != Y.extent (1), std::runtime_error, + "X.extent(1) = " << X.extent (1) << " != Y.extent(1) = " + << Y.extent (1) << "."); + // If the two pointers are NULL, then they don't alias one + // another, even though they are equal. + TEUCHOS_TEST_FOR_EXCEPTION_CLASS_FUNC + (X.data () == Y.data () && X.data () != nullptr, + std::runtime_error, "X and Y may not alias one another."); +#endif // HAVE_TPETRA_DEBUG + + const auto op = transpose ? + (conjugate ? KokkosSparse::ConjugateTranspose : + KokkosSparse::Transpose) : KokkosSparse::NoTranspose; + //Select the merge path algorithm (used if available, otherwise has no effect) + //TODO BMK: If/when KokkosKernels gets its own SPMV implementation for imbalanced rows, + //call that here or select it using Controls. + //Ideally it supports multivectors from the beginning. + if((Details::Behavior::useMergePathMultiVector() || X.extent(1) == size_t(1)) && A_ordinal_rowptrs.extent(0)) + { + KokkosKernels::Experimental::Controls controls; + controls.setParameter("algorithm", "merge"); + //Apply on one column at a time (must be rank-1) + for(size_t vec = 0; vec < X.extent(1); vec++) + { + KokkosSparse::spmv (controls, op, + alpha, A_cusparse, Kokkos::subview(X, Kokkos::ALL(), vec), + beta, Kokkos::subview(Y, Kokkos::ALL(), vec)); + } + } + else + { + //Just run multivector version of spmv (no controls, and no cusparse support) + KokkosSparse::spmv (op, alpha, *A_, X, beta, Y); + } } template diff --git a/packages/tpetra/core/src/Tpetra_MultiVector_def.hpp b/packages/tpetra/core/src/Tpetra_MultiVector_def.hpp index 9f3d157794a2..28dc406827ea 100644 --- a/packages/tpetra/core/src/Tpetra_MultiVector_def.hpp +++ b/packages/tpetra/core/src/Tpetra_MultiVector_def.hpp @@ -3951,7 +3951,6 @@ namespace Tpetra { // If Case 2 then sum up *this and distribute it to all processes. if (Case2) { - Kokkos::fence(); this->reduce (); } } @@ -4047,6 +4046,7 @@ namespace Tpetra { // NOTE (mfh 17 Mar 2019) If we ever get rid of UVM, then device // and host will be separate allocations. In that case, it may // pay to do the all-reduce from device to host. + Kokkos::fence(); // for UVM getLocalViewDevice is UVM which can be read as host by allReduceView, so we must not read until device is fenced this->modify_device (); auto X_lcl = this->getLocalViewDevice (); allReduceView (X_lcl, X_lcl, *comm); diff --git a/packages/tpetra/core/src/Tpetra_idot.hpp b/packages/tpetra/core/src/Tpetra_idot.hpp index dfabd3daf04b..005853fcf387 100644 --- a/packages/tpetra/core/src/Tpetra_idot.hpp +++ b/packages/tpetra/core/src/Tpetra_idot.hpp @@ -62,6 +62,7 @@ #include "Tpetra_Details_isInterComm.hpp" #include "Tpetra_MultiVector.hpp" #include "Tpetra_Vector.hpp" +#include "Teuchos_CommHelpers.hpp" #include "KokkosBlas1_dot.hpp" #include #include @@ -69,62 +70,29 @@ namespace Tpetra { namespace Details { -/// \brief Compute the local dot product(s), columnwise, of X and Y. -/// -/// \warning This is an implementation detail of Tpetra::idot. -/// Users should never call this function. -/// -/// This implements the following cases: -///
      -///
    • If X and Y have the same number of columns (zero or more), -/// compute the dot products of corresponding columns of X and -/// Y. That is, resultRaw[j] = dot(X(:,j), Y(:,j)).
      • -///
    • If X has one column and Y has more than one column, compute -/// the dot products of X and each column of Y in turn. -/// That is, resultRaw[j] = dot(X(:,0), Y(:,j)).
      • -///
    • If X has more than one column and Y has one column, compute -/// the dot products of each column of X in turn with X. -/// That is, resultRaw[j] = dot(X(:,j), Y(:,0)).
      • -///
    -/// -/// \tparam SC Same as the first template parameter of Tpetra::MultiVector. -/// \tparam LO Same as the second template parameter of Tpetra::MultiVector. -/// \tparam GO Same as the third template parameter of Tpetra::MultiVector. -/// \tparam NT Same as the fourth template parameter of Tpetra::MultiVector. -/// -/// \param resultRaw [out] Raw pointer to output array of dot products. -/// \param X [in] First input MultiVector. -/// \param Y [in] Second input MultiVector. -/// \param resultOnDevice [in] Whether \c resultRaw points to memory -/// accessible from device. If not, it may only be accessed from a -/// host execution space. -template -void -lclDotRaw (typename ::Tpetra::MultiVector::dot_type* const resultRaw, - const ::Tpetra::MultiVector& X, - const ::Tpetra::MultiVector& Y, - const bool resultOnDevice) +/// \brief Compute dot product locally, with the kernel operating on Views in memory_space. +/// Preconditions: +/// - localResult lives in Device::memory_space. +/// - X's underlying view is up-to-date in Device::memory_space. +template +void idotLocal(const ResultView& localResult, + const ::Tpetra::MultiVector& X, + const ::Tpetra::MultiVector& Y) { - using ::Kokkos::Impl::MemorySpaceAccess; - using ::Kokkos::deep_copy; - using ::Kokkos::HostSpace; - using ::Kokkos::subview; - using ::Kokkos::View; - typedef ::Kokkos::pair pair_type; - typedef ::Tpetra::MultiVector MV; - typedef typename MV::dot_type dot_type; - typedef typename MV::device_type device_type; - typedef typename MV::dual_view_type::t_dev::memory_space dev_memory_space; - typedef typename MV::dual_view_type::t_host::memory_space host_memory_space; - typedef View result_dev_view_type; - typedef typename result_dev_view_type::HostMirror result_host_view_type; - + using MV = ::Tpetra::MultiVector; + using dot_type = typename MV::dot_type; + using dual_view_type = typename MV::dual_view_type; + using dev_mem_space = typename dual_view_type::t_dev::memory_space; + using host_mem_space = typename dual_view_type::t_host::memory_space; + //Get the other memory space for MV's DualView, whatever that is (it may be the same in case of UVM) + using other_memory_space = typename std::conditional::value, + host_mem_space, dev_mem_space>::type; + using pair_type = Kokkos::pair; const size_t numRows = X.getLocalLength (); const pair_type rowRange (0, numRows); const size_t X_numVecs = X.getNumVectors (); const size_t Y_numVecs = Y.getNumVectors (); const size_t numVecs = X_numVecs > Y_numVecs ? X_numVecs : Y_numVecs; - // Check compatibility of number of columns; allow special cases of // a multivector dot a single vector, or vice versa. if (X_numVecs != Y_numVecs && @@ -136,180 +104,227 @@ lclDotRaw (typename ::Tpetra::MultiVector::dot_type* const resul << ", but neither is 1."; throw std::invalid_argument (os.str ()); } - - const bool X_latestOnHost = X.template need_sync () && - ! X.template need_sync (); - const bool Y_latestOnHost = Y.template need_sync () && - ! Y.template need_sync (); - // Let X guide whether to execute on device or host. - const bool runOnHost = X_latestOnHost; - // Assume that we have to copy Y to where we need to run. idot() - // takes the input MultiVectors as const, so it can't sync them. We - // just have to copy their data, if needed, to the memory space - // where we want to run. - const bool Y_copyToHost = (X_latestOnHost && ! Y_latestOnHost); - const bool Y_copyToDev = (! X_latestOnHost && Y_latestOnHost); - - result_dev_view_type result; - result_host_view_type result_h; - if (resultOnDevice) { - result = result_dev_view_type (resultRaw, numVecs); - if (runOnHost) { - // create_mirror_view doesn't promise to create a deep copy, so we - // can't rely on this case to avoid an extra buffer if the input - // communicator is an intercomm. - result_h = ::Kokkos::create_mirror_view (result); + //Can the multivector dot kernel be used? + bool useMVDot = X.isConstantStride() && Y.isConstantStride() && X_numVecs == Y_numVecs; + //Does Y need to be copied to the same memory_space as X and localResult? + bool copyY = Y.template need_sync(); + if(useMVDot) + { + //Get local X (we know it doesn't need a sync to memory_space) + auto X_lcl = X.template getLocalView(); + //Get local Y, and make a copy if it needs sync. Y is const so we can't just sync to memory_space. + decltype (X_lcl) Y_lcl; + if (copyY) { + auto Y_lcl_other = Y.template getLocalView(); + typename decltype (Y_lcl)::non_const_type + Y_lcl_nc (Kokkos::ViewAllocateWithoutInitializing("Y_lcl"), Y_lcl_other.extent(0), Y_numVecs); + Kokkos::deep_copy (Y_lcl_nc, Y_lcl_other); + Y_lcl = Y_lcl_nc; } - // If running on device, not host, then we don't use result_h. - } - else { - result_h = result_host_view_type (resultRaw, numVecs); - if (! runOnHost) { // running on device, not host - // We have to do a separate allocation here, since resultRaw is - // not accessible from device. - result = result_dev_view_type ("result", numVecs); + else { // Y already sync'd to dev; just use its dev view + Y_lcl = Y.template getLocalView(); + } + if (numVecs == size_t (1)) { + auto X_lcl_1d = Kokkos::subview (X_lcl, rowRange, 0); + auto Y_lcl_1d = Kokkos::subview (Y_lcl, rowRange, 0); + auto result_0d = Kokkos::subview (localResult, 0); + KokkosBlas::dot (result_0d, X_lcl_1d, Y_lcl_1d); + } + else { + auto X_lcl_2d = Kokkos::subview (X_lcl, rowRange, pair_type (0, X_numVecs)); + auto Y_lcl_2d = Kokkos::subview (Y_lcl, rowRange, pair_type (0, Y_numVecs)); + KokkosBlas::dot (localResult, X_lcl_2d, Y_lcl_2d); } - // If running on host, not device, then we don't use result. } - - const bool X_or_Y_have_nonconstant_stride = - ! X.isConstantStride () || ! Y.isConstantStride (); - if (X_or_Y_have_nonconstant_stride && numVecs > size_t (1)) { - // The "nonconstant stride" case relates to the ability of a - // Tpetra::MultiVector to view multiple, noncontiguous columns of - // another Tpetra::MultiVector. In this case, we can't just get - // the Kokkos::View out of X and Y, since the Kokkos::View has all - // the columns, not just the columns that X or Y view. The - // Kokkos::View of X or Y would view a contiguous subset of - // columns of the latter, "parent" MultiVector, not of the former, - // "child" MultiVector. (Kokkos::View doesn't have a layout to - // cover this case where consecutive entries within a column are - // contiguous, but consecutive entries within a row may have - // varying strides.) Instead, we work one column at a time. - for (size_t j = 0; j < numVecs; ++j) { - // numVecs = max(X_numVecs, Y_numVecs). Allow special case of - // X_numVecs != Y_numVecs && (X_numVecs == 1 || Y_numVecs == 1). - const size_t X_col = (X_numVecs == size_t (1)) ? size_t (0) : j; - const size_t Y_col = (Y_numVecs == size_t (1)) ? size_t (0) : j; - auto X_j = X.getVector (X_col); - auto Y_j = Y.getVector (Y_col); - - if (runOnHost) { - auto X_j_2d_h = X_j->template getLocalView (); - auto X_j_1d_h = subview (X_j_2d_h, rowRange, 0); - decltype (X_j_1d_h) Y_j_1d_h; - - if (Y_copyToHost) { - auto Y_j_2d = Y_j->template getLocalView (); - auto Y_j_1d = subview (Y_j_2d, rowRange, 0); - typename decltype (Y_j_1d_h)::non_const_type - Y_j_1d_h_nc ("Y_j_1d_h", Y_j_1d.extent (0)); - deep_copy (Y_j_1d_h_nc, Y_j_1d); - Y_j_1d_h = Y_j_1d_h_nc; - } - else { // Y already sync'd to host; just use its host view - auto Y_j_2d_h = Y_j->template getLocalView (); - Y_j_1d_h = subview (Y_j_2d_h, rowRange, 0); - } - auto result_h_j = subview (result_h, j); - KokkosBlas::dot (result_h_j, X_j_1d_h, Y_j_1d_h); - } - else { // run on device - auto X_j_2d = X_j->template getLocalView (); - auto X_j_1d = subview (X_j_2d, rowRange, 0); - decltype (X_j_1d) Y_j_1d; - - if (Y_copyToDev) { - auto Y_j_2d_h = Y_j->template getLocalView (); - auto Y_j_1d_h = subview (Y_j_2d_h, rowRange, 0); - typename decltype (Y_j_1d)::non_const_type - Y_j_1d_nc ("Y_j_1d", Y_j_1d_h.extent (0)); - deep_copy (Y_j_1d_nc, Y_j_1d_h); - Y_j_1d = Y_j_1d_nc; - } - else { // Y already sync'd to dev; just use its dev view - auto Y_j_2d = Y_j->template getLocalView (); - Y_j_1d = subview (Y_j_2d, rowRange, 0); + else + { + //Need to compute each dot individually, using 1D subviews of X_lcl and Y_lcl + Kokkos::View YLocalCol_nc; + if(copyY) { + //Need to allocate Ycol, as a place to store each column of Y temporarily + YLocalCol_nc = Kokkos::View( + Kokkos::ViewAllocateWithoutInitializing("YLocalCol_nc"), numRows); + } + for(size_t vec = 0; vec < numVecs; vec++) { + //Get the Vectors for each column of X and Y that will be dotted together. + size_t Xvec = (numVecs == X_numVecs) ? vec : size_t(0); + size_t Yvec = (numVecs == Y_numVecs) ? vec : size_t(0); + auto Xcol = X.getVector(Xvec); + auto Ycol = Y.getVector(Yvec); + auto XLocalCol = Kokkos::subview(Xcol->template getLocalView(), rowRange, 0); + decltype(XLocalCol) YLocalCol; + if(copyY) { + //Get a copy of Y's column if needed. If X has k columns but Y has 1, only copy to YLocalCol_nc once. + if(vec == 0 || Y_numVecs > 1) { + auto YLocalCol_other_space = Kokkos::subview(Ycol->template getLocalView(), rowRange, 0); + Kokkos::deep_copy(YLocalCol_nc, YLocalCol_other_space); } - auto result_j = subview (result, j); - KokkosBlas::dot (result_j, X_j_1d, Y_j_1d); - Kokkos::fence(); - } - } // for each column j of X and Y - } - else { // numVecs == 1 || ! X_or_Y_have_nonconstant_stride - if (runOnHost) { - auto X_lcl_h = X.template getLocalView (); - decltype (X_lcl_h) Y_lcl_h; - - if (Y_copyToHost) { - auto Y_lcl = Y.template getLocalView (); - typename decltype (Y_lcl_h)::non_const_type - Y_lcl_h_nc ("Y_lcl_h", Y_lcl.extent (0), Y_numVecs); - deep_copy (Y_lcl_h_nc, Y_lcl); - Y_lcl_h = Y_lcl_h_nc; - } - else { // Y already sync'd to host; just use its host view - Y_lcl_h = Y.template getLocalView (); - } - - if (numVecs == size_t (1)) { - auto X_lcl_h_1d = subview (X_lcl_h, rowRange, 0); - auto Y_lcl_h_1d = subview (Y_lcl_h, rowRange, 0); - auto result_h_0d = subview (result_h, 0); - KokkosBlas::dot (result_h_0d, X_lcl_h_1d, Y_lcl_h_1d); + YLocalCol = YLocalCol_nc; } else { - auto X_lcl_h_2d = subview (X_lcl_h, rowRange, - pair_type (0, X_numVecs)); - auto Y_lcl_h_2d = subview (Y_lcl_h, rowRange, - pair_type (0, Y_numVecs)); - KokkosBlas::dot (result_h, X_lcl_h_2d, Y_lcl_h_2d); + YLocalCol = Kokkos::subview(Ycol->template getLocalView(), rowRange, 0); } + //Compute the rank-1 dot product, and place the result in an element of localResult + KokkosBlas::dot(Kokkos::subview(localResult, vec), XLocalCol, YLocalCol); } - else { // run on device - auto X_lcl = X.template getLocalView (); - decltype (X_lcl) Y_lcl; - - if (Y_copyToDev) { - auto Y_lcl_h = Y.template getLocalView (); - typename decltype (Y_lcl)::non_const_type - Y_lcl_nc ("Y_lcl", Y_lcl_h.extent (0), Y_numVecs); - deep_copy (Y_lcl_nc, Y_lcl_h); - Y_lcl = Y_lcl_nc; - } - else { // Y already sync'd to dev; just use its dev view - Y_lcl = Y.template getLocalView (); - } - - if (numVecs == size_t (1)) { - auto X_lcl_1d = subview (X_lcl, rowRange, 0); - auto Y_lcl_1d = subview (Y_lcl, rowRange, 0); - auto result_0d = subview (result, 0); - KokkosBlas::dot (result_0d, X_lcl_1d, Y_lcl_1d); - Kokkos::fence(); - } - else { - auto X_lcl_2d = subview (X_lcl, rowRange, - pair_type (0, X_numVecs)); - auto Y_lcl_2d = subview (Y_lcl, rowRange, - pair_type (0, Y_numVecs)); - KokkosBlas::dot (result, X_lcl_2d, Y_lcl_2d); - Kokkos::fence(); - } - } // host or device? - } // multivector with nonconstant stride? + } +} - if (runOnHost && resultOnDevice) { - // Copy result from host to device, where the user wanted it. - deep_copy (result, result_h); +//Fallback version: produces same result, but is synchronous. +//Used only when MPI is not CUDA-aware, and the global result lives on device. +//It's not allowed to use a CudaSpace or CudaUVMSpace view as a target buffer for MPI +//unless CUDA-aware. +template +void blockingDotImpl( + const ResultView& globalResult, + const ::Tpetra::MultiVector& X, + const ::Tpetra::MultiVector& Y, + bool mpiReduceInPlace) +{ + using MV = ::Tpetra::MultiVector; + using dot_type = typename MV::dot_type; + using result_dev_view_type = Kokkos::View; + using result_mirror_view_type = typename result_dev_view_type::HostMirror; + using result_host_view_type = Kokkos::View; + using dev_mem_space = typename result_dev_view_type::memory_space; + using mirror_mem_space = typename result_mirror_view_type::memory_space; + using unmanaged_result_dev_view_type = Kokkos::View>; + using unmanaged_result_host_view_type = Kokkos::View>; + const size_t numVecs = globalResult.extent(0); + //Logic to compute the local dot is no different than when CUDA-aware MPI. + result_host_view_type localHostResult(Kokkos::ViewAllocateWithoutInitializing("HostLocalDotResult"), numVecs); + if(X.template need_sync()) + { + //compute local result on host. + //NOTE: UVM never takes this branch because then dev_mem_space == mirror_mem_space. + //This means that the dot is actually computed on host. + idotLocal(localHostResult, X, Y); + } + else + { + //compute local result on temporary device view, then copy that to host. + result_dev_view_type localDeviceResult(Kokkos::ViewAllocateWithoutInitializing("DeviceLocalDotResult"), numVecs); + idotLocal(localDeviceResult, X, Y); + //NOTE: no fence is required: deep_copy will fence. + Kokkos::deep_copy(localHostResult, localDeviceResult); + } + result_host_view_type globalHostResultOwning; + unmanaged_result_host_view_type globalHostResultNonowning; + if(mpiReduceInPlace) + { + globalHostResultNonowning = unmanaged_result_host_view_type(localHostResult.data(), numVecs); } - else if (! runOnHost && ! resultOnDevice) { - // Copy result from device to host, where the user wanted it. - deep_copy (result_h, result); + else + { + globalHostResultOwning = result_host_view_type(Kokkos::ViewAllocateWithoutInitializing("HostGlobalDotResult"), numVecs); + globalHostResultNonowning = unmanaged_result_host_view_type(globalHostResultOwning.data(), numVecs); } + Teuchos::reduceAll (*X.getMap()->getComm(), Teuchos::REDUCE_SUM, numVecs, localHostResult.data(), globalHostResultNonowning.data()); + Kokkos::deep_copy(globalResult, globalHostResultNonowning); } +/// \brief Internal (common) version of idot, a global dot product +/// that uses a non-blocking MPI reduction. +/// +/// Will always try to minimize the amount of host-device copies. +/// However, if the globalResult is in a CUDA device space (CudaSpace +/// or CudaUVMSpace) and MPI is not CUDA-aware, a synchronous reduction +/// will be used instead to ensure correct execution. +template +std::shared_ptr< ::Tpetra::Details::CommRequest> +idotImpl(const ResultView& globalResult, + const ::Tpetra::MultiVector& X, + const ::Tpetra::MultiVector& Y) +{ + using pair_type = ::Kokkos::pair; + using MV = ::Tpetra::MultiVector; + using dot_type = typename MV::dot_type; + using global_result_memspace = typename ResultView::memory_space; + using result_dev_view_type = Kokkos::View; + using result_mirror_view_type = typename result_dev_view_type::HostMirror; + using result_host_view_type = Kokkos::View; + using dev_mem_space = typename result_dev_view_type::memory_space; + using mirror_mem_space = typename result_mirror_view_type::memory_space; + using unmanaged_result_dev_view_type = Kokkos::View>; + using unmanaged_result_mirror_view_type = Kokkos::View>; + using unmanaged_result_host_view_type = Kokkos::View>; + auto comm = X.getMap()->getComm(); + bool mpiReduceInPlace = !Details::isInterComm(*comm); + //note: numVecs is verified in idotLocal + const size_t numVecs = globalResult.extent(0); + //BMK: If either local or global results live in a CUDA device space but + //MPI is not CUDA-aware, we are forced to perform (synchronous) communication + //using temporary HostSpace view(s). +#ifdef KOKKOS_ENABLE_CUDA + //If globalResult's memory space is a Cuda space, then the user's global result lives on device. + //For this case, there is currently no way to do the asynchronous MPI reduction to a temporary HostSpace + //view, and then deep copy to the original globalResult. + //However, this could also be solved + //(and still be globally asynchronous) by adding a + //deep_copy callback to CommRequest. + if(!Tpetra::Details::Behavior::assumeMpiIsCudaAware() && + (std::is_same::value || + std::is_same::value)) + { + blockingDotImpl(globalResult, X, Y, mpiReduceInPlace); + return Tpetra::Details::Impl::emptyCommRequest(); + } +#endif + bool X_latestOnHost = X.template need_sync(); + bool runOnHost = !std::is_same::value && X_latestOnHost; + //Wherever the kernel runs, allocate a separate local result if either: + // * comm is an "InterComm" (can't do in-place collectives) + // * globalResult is not accessible from the space of X's latest data + const bool allocateLocalResult = !mpiReduceInPlace || + (X_latestOnHost ? + !Kokkos::Impl::MemorySpaceAccess::accessible : + !Kokkos::Impl::MemorySpaceAccess::accessible); + if(runOnHost) { + //Note BMK: cannot get here if the device memory space is CudaUVMSpace, + //because in that case the mirror space of MV's DualView is also CudaUVMSpace. Verified this by printing typeid. + unmanaged_result_host_view_type nonowningLocalResult; + result_host_view_type localResult; + if(allocateLocalResult) { + localResult = result_host_view_type(Kokkos::ViewAllocateWithoutInitializing("localResult"), numVecs); + nonowningLocalResult = unmanaged_result_host_view_type(localResult.data(), numVecs); + } + else + nonowningLocalResult = unmanaged_result_host_view_type(globalResult.data(), numVecs); + idotLocal(nonowningLocalResult, X, Y); + return iallreduce(nonowningLocalResult, globalResult, ::Teuchos::REDUCE_SUM, *comm); + } + else { + //running on device + unmanaged_result_dev_view_type nonowningLocalResult; + result_dev_view_type localResult; + if(allocateLocalResult) { + localResult = result_dev_view_type(Kokkos::ViewAllocateWithoutInitializing("localResult"), numVecs); + nonowningLocalResult = unmanaged_result_dev_view_type(localResult.data(), numVecs); + } + else + nonowningLocalResult = unmanaged_result_dev_view_type(globalResult.data(), numVecs); + idotLocal(nonowningLocalResult, X, Y); + //If MPI not CUDA-aware, must copy local result to HostSpace before iallreduce. + //That view will persistent in the CommRequest, and localResult won't. + bool communicateFromHost = false; +#ifdef KOKKOS_ENABLE_CUDA + communicateFromHost = !Tpetra::Details::Behavior::assumeMpiIsCudaAware(); +#endif + if(communicateFromHost) + { + result_host_view_type hostLocalResult(Kokkos::ViewAllocateWithoutInitializing("hostLocalResult"), numVecs); + //The deep copy fences. + Kokkos::deep_copy(hostLocalResult, nonowningLocalResult); + return iallreduce(hostLocalResult, globalResult, ::Teuchos::REDUCE_SUM, *comm); + } + else + { + //(Only fence in idot) required because the device-space result of idotLocal will be accessed directly by MPI. + typename dev_mem_space::execution_space().fence(); + return iallreduce(nonowningLocalResult, globalResult, ::Teuchos::REDUCE_SUM, *comm); + } + } +} } // namespace Details // @@ -374,141 +389,12 @@ idot (typename ::Tpetra::MultiVector::dot_type* resultRaw, const ::Tpetra::MultiVector& X, const ::Tpetra::MultiVector& Y) { - using ::Kokkos::Impl::MemorySpaceAccess; - using ::Kokkos::HostSpace; - using ::Kokkos::View; - using ::Tpetra::Details::iallreduce; - typedef ::Tpetra::MultiVector MV; - typedef typename MV::dot_type dot_type; - typedef typename MV::device_type device_type; - typedef View result_dev_view_type; - typedef typename result_dev_view_type::HostMirror result_host_view_type; - typedef typename device_type::memory_space dev_memory_space; - - auto map = X.getMap (); - auto comm = map.is_null () ? Teuchos::null : map->getComm (); - if (comm.is_null ()) { // calling process does not participate - return std::shared_ptr< ::Tpetra::Details::CommRequest> (NULL); - } - + using dot_type = typename ::Tpetra::Vector::dot_type; const size_t X_numVecs = X.getNumVectors (); const size_t Y_numVecs = Y.getNumVectors (); const size_t numVecs = (X_numVecs > Y_numVecs) ? X_numVecs : Y_numVecs; - - // Check compatibility of number of columns; allow special cases of - // a multivector dot a single vector, or vice versa. - if (X_numVecs != Y_numVecs && - X_numVecs != size_t (1) && - Y_numVecs != size_t (1)) { - std::ostringstream os; - os << "Tpetra::idot: X.getNumVectors() = " << X_numVecs - << " != Y.getNumVectors() = " << Y_numVecs - << ", but neither is 1."; - throw std::invalid_argument (os.str ()); - } - - // If the input communicator is an intercomm, then the input and - // output buffers of iallreduce may not alias one another, so we - // must allocate a temporary buffer for the local dot product(s). - const bool needCopy = Details::isInterComm (*comm); - - // We know that resultRaw is host memory. Can the device access it? - // If so, lclDotRaw may be able to avoid a copy. - const bool resultOnDevice = - MemorySpaceAccess::accessible; - if (resultOnDevice) { - result_dev_view_type gblResult (resultRaw, numVecs); - result_dev_view_type lclResult = needCopy ? - result_dev_view_type ("lclResult", numVecs) : - gblResult; - Details::lclDotRaw (lclResult.data (), X, Y, resultOnDevice); - return iallreduce (lclResult, gblResult, ::Teuchos::REDUCE_SUM, *comm); - } - else { - result_host_view_type gblResult (resultRaw, numVecs); - result_host_view_type lclResult = needCopy ? - result_host_view_type ("lclResult", numVecs) : - gblResult; - Details::lclDotRaw (lclResult.data (), X, Y, resultOnDevice); - return iallreduce (lclResult, gblResult, ::Teuchos::REDUCE_SUM, *comm); - } -} - -/// \brief Nonblocking dot product, with Tpetra::Vector inputs, and -/// rank-0 (single value) Kokkos::View output. -/// -/// This function computes result() = dot(X,Y). -/// -/// \param result [out] Output; rank-0 Kokkos::View of the return -/// value. It is only valid to read this after calling wait() on -/// the return value. -/// -/// \param X [in] First input Tpetra::Vector. This must have same -/// number of rows (globally, and on each (MPI) process) as Y. -/// -/// \param Y [in] Second input Tpetra::Vector. This must have same -/// number of rows (globally, and on each (MPI) process) as X. -/// -/// \return Pointer to an object representing the nonblocking -/// collective (communication operation). Call wait() on this -/// object to complete the collective. After calling wait(), you -/// may read the result. -/// -/// \tparam SC Same as the first template parameter of Tpetra::Vector. -/// \tparam LO Same as the second template parameter of Tpetra::Vector. -/// \tparam GO Same as the third template parameter of Tpetra::Vector. -/// \tparam NT Same as the fourth template parameter of Tpetra::Vector. -/// -/// In this version of the function, the dot product result goes into -/// a rank-0 ("zero-dimensional") Kokkos::View. Rank-0 Views just -/// view a single value. We prefer that you use the versions of -/// idot() that take a Kokkos::View as their output argument, because -/// this ensures that the output will still exist (not be deallocated -/// or fall out of scope). The versions of idot() that take a raw -/// pointer cannot promise that the memory will continue to exist -/// until the dot product is done. -/// -/// The \c dot_type typedef is the type of a dot product result, for a -/// Tpetra::Vector whose entries have type \c SC (the "Scalar" type). -/// For most \c SC types, dot_type == SC. However, once you -/// start dipping into more interesting Scalar types, such as those -/// found in the Sacado or Stokhos packages, \c dot_type may be a -/// different type. Most users should not have to worry about this, -/// but Tpetra developers may need to worry about this. -template -std::shared_ptr< ::Tpetra::Details::CommRequest> -idot (const Kokkos::View::dot_type, - typename ::Tpetra::Vector::device_type>& result, - const ::Tpetra::Vector& X, - const ::Tpetra::Vector& Y) -{ - using ::Kokkos::Impl::MemorySpaceAccess; - using ::Kokkos::HostSpace; - using ::Kokkos::View; - using ::Tpetra::Details::iallreduce; - typedef ::Tpetra::MultiVector MV; - typedef typename MV::dot_type dot_type; - typedef typename MV::device_type device_type; - typedef View result_view_type; - - auto map = X.getMap (); - auto comm = map.is_null () ? Teuchos::null : map->getComm (); - if (comm.is_null ()) { // calling process does not participate - return std::shared_ptr< ::Tpetra::Details::CommRequest> (NULL); - } - - // If the input communicator is an intercomm, then the input and - // output buffers of iallreduce may not alias one another, so we - // must allocate a temporary buffer for the local dot product. - const bool needCopy = Details::isInterComm (*comm); - - constexpr bool resultOnDevice = true; // 'result' is a device View - result_view_type gblResult = result; - result_view_type lclResult = needCopy ? - result_view_type ("lclResult") : - gblResult; - Details::lclDotRaw (lclResult.data (), X, Y, resultOnDevice); - return iallreduce (lclResult, gblResult, ::Teuchos::REDUCE_SUM, *comm); + Kokkos::View resultView(resultRaw, numVecs); + return Details::idotImpl(resultView, X, Y); } /// \brief Nonblocking dot product, with Tpetra::MultiVector inputs, @@ -580,50 +466,61 @@ idot (const Kokkos::View::dot_typ const ::Tpetra::MultiVector& X, const ::Tpetra::MultiVector& Y) { - using ::Kokkos::Impl::MemorySpaceAccess; - using ::Kokkos::HostSpace; - using ::Kokkos::View; - using ::Tpetra::Details::iallreduce; - typedef ::Tpetra::MultiVector MV; - typedef typename MV::dot_type dot_type; - typedef typename MV::device_type device_type; - typedef View result_view_type; - - auto map = X.getMap (); - auto comm = map.is_null () ? ::Teuchos::null : map->getComm (); - if (comm.is_null ()) { // calling process does not participate - return std::shared_ptr< ::Tpetra::Details::CommRequest> (NULL); - } - - // Check compatibility of number of columns; allow special cases of - // a multivector dot a single vector, or vice versa. It's OK to - // throw without MPI communication, since the number of columns of a - // Tpetra::MultiVector must be the same on all processes of its - // communicator. - const size_t X_numVecs = X.getNumVectors (); - const size_t Y_numVecs = Y.getNumVectors (); - if (X_numVecs != Y_numVecs && - X_numVecs != size_t (1) && - Y_numVecs != size_t (1)) { - std::ostringstream os; - os << "Tpetra::idot: X.getNumVectors() = " << X_numVecs - << " != Y.getNumVectors() = " << Y_numVecs - << ", but neither is 1."; - throw std::invalid_argument (os.str ()); - } - - // If the input communicator is an intercomm, then the input and - // output buffers of iallreduce may not alias one another, so we - // must allocate a temporary buffer for the local dot product(s). - const bool needCopy = Details::isInterComm (*comm); + return Details::idotImpl(result, X, Y); +} - constexpr bool resultOnDevice = true; // 'result' is a device View - result_view_type gblResult = result; - result_view_type lclResult = needCopy ? - result_view_type ("lclResult", result.extent (0)) : - gblResult; - Details::lclDotRaw (lclResult.data (), X, Y, resultOnDevice); - return iallreduce (lclResult, gblResult, ::Teuchos::REDUCE_SUM, *comm); +/// \brief Nonblocking dot product, with Tpetra::Vector inputs, and +/// rank-0 (single value) Kokkos::View output. +/// +/// This function computes result() = dot(X,Y). +/// +/// \param result [out] Output; rank-0 Kokkos::View of the return +/// value. It is only valid to read this after calling wait() on +/// the return value. +/// +/// \param X [in] First input Tpetra::Vector. This must have same +/// number of rows (globally, and on each (MPI) process) as Y. +/// +/// \param Y [in] Second input Tpetra::Vector. This must have same +/// number of rows (globally, and on each (MPI) process) as X. +/// +/// \return Pointer to an object representing the nonblocking +/// collective (communication operation). Call wait() on this +/// object to complete the collective. After calling wait(), you +/// may read the result. +/// +/// \tparam SC Same as the first template parameter of Tpetra::Vector. +/// \tparam LO Same as the second template parameter of Tpetra::Vector. +/// \tparam GO Same as the third template parameter of Tpetra::Vector. +/// \tparam NT Same as the fourth template parameter of Tpetra::Vector. +/// +/// In this version of the function, the dot product result goes into +/// a rank-0 ("zero-dimensional") Kokkos::View. Rank-0 Views just +/// view a single value. We prefer that you use the versions of +/// idot() that take a Kokkos::View as their output argument, because +/// this ensures that the output will still exist (not be deallocated +/// or fall out of scope). The versions of idot() that take a raw +/// pointer cannot promise that the memory will continue to exist +/// until the dot product is done. +/// +/// The \c dot_type typedef is the type of a dot product result, for a +/// Tpetra::Vector whose entries have type \c SC (the "Scalar" type). +/// For most \c SC types, dot_type == SC. However, once you +/// start dipping into more interesting Scalar types, such as those +/// found in the Sacado or Stokhos packages, \c dot_type may be a +/// different type. Most users should not have to worry about this, +/// but Tpetra developers may need to worry about this. +template +std::shared_ptr< ::Tpetra::Details::CommRequest> +idot (const Kokkos::View::dot_type, + typename ::Tpetra::Vector::device_type>& result, + const ::Tpetra::Vector& X, + const ::Tpetra::Vector& Y) +{ + using dot_type = typename ::Tpetra::Vector::dot_type; + using result_device_t = typename ::Tpetra::Vector::device_type; + Kokkos::View> result1D(result.data(), 1); + return Details::idotImpl(result1D, X, Y); } } // namespace Tpetra diff --git a/packages/tpetra/core/src/Tpetra_replaceDiagonalCrsMatrix_def.hpp b/packages/tpetra/core/src/Tpetra_replaceDiagonalCrsMatrix_def.hpp index 0c95dc3ea458..da6c3093df22 100644 --- a/packages/tpetra/core/src/Tpetra_replaceDiagonalCrsMatrix_def.hpp +++ b/packages/tpetra/core/src/Tpetra_replaceDiagonalCrsMatrix_def.hpp @@ -90,7 +90,10 @@ replaceDiagonalCrsMatrix (CrsMatrix& matrix, "Row map of matrix and map of input vector do not match."); } - typename crs_matrix_type::execution_space().fence(); // for UVM's sake + // KJ: This fence is necessary for UVM. Views used in the row map and colmap + // can use UVM and they are accessed in the following routine. So, we need to + // make sure that the values are available for touching in host. + typename crs_matrix_type::execution_space().fence(); if (isFillCompleteOnInput) matrix.resumeFill(); diff --git a/packages/tpetra/core/src/kokkos_refactor/Tpetra_KokkosRefactor_Details_MultiVectorDistObjectKernels.hpp b/packages/tpetra/core/src/kokkos_refactor/Tpetra_KokkosRefactor_Details_MultiVectorDistObjectKernels.hpp index 099946ac3ec0..2631ad54ca26 100644 --- a/packages/tpetra/core/src/kokkos_refactor/Tpetra_KokkosRefactor_Details_MultiVectorDistObjectKernels.hpp +++ b/packages/tpetra/core/src/kokkos_refactor/Tpetra_KokkosRefactor_Details_MultiVectorDistObjectKernels.hpp @@ -148,7 +148,6 @@ outOfBounds (const IntegerType x, const IntegerType exclusiveUpperBound) ("Tpetra::MultiVector pack one col", range_type (0, idx.size ()), PackArraySingleColumn (dst, src, idx, col)); - Kokkos::fence(); } }; @@ -231,7 +230,6 @@ outOfBounds (const IntegerType x, const IntegerType exclusiveUpperBound) range_type (0, idx.size ()), PackArraySingleColumnWithBoundsCheck (dst, src, idx, col), errorCount); - Kokkos::fence(); if (errorCount != 0) { // Go back and find the out-of-bounds entries in the index diff --git a/packages/tpetra/core/test/Behavior/Behavior_Default.cpp b/packages/tpetra/core/test/Behavior/Behavior_Default.cpp index 99cc79406140..a607a67e84db 100644 --- a/packages/tpetra/core/test/Behavior/Behavior_Default.cpp +++ b/packages/tpetra/core/test/Behavior/Behavior_Default.cpp @@ -91,16 +91,4 @@ TEUCHOS_UNIT_TEST(Behavior, verbosePrintCountThreshold) { TEST_ASSERT( val1 >= minVal && val1 <= maxVal ); } -TEUCHOS_UNIT_TEST(Behavior, longRowMinNumEntries) { - // We only require that the default be at least this much. - const size_t minVal (100); - const size_t val0 = - Tpetra::Details::Behavior::longRowMinNumEntries(); - TEST_ASSERT( val0 >= minVal ); - - const size_t val1 = - Tpetra::Details::Behavior::longRowMinNumEntries(); - TEST_ASSERT( val1 >= minVal ); -} - } // namespace (anonymous) diff --git a/packages/tpetra/core/test/Comm/CMakeLists.txt b/packages/tpetra/core/test/Comm/CMakeLists.txt index b5e10e2c54a7..27d3980afab9 100644 --- a/packages/tpetra/core/test/Comm/CMakeLists.txt +++ b/packages/tpetra/core/test/Comm/CMakeLists.txt @@ -27,15 +27,52 @@ TRIBITS_ADD_EXECUTABLE_AND_TEST( COMM serial mpi ) -TRIBITS_ADD_EXECUTABLE_AND_TEST( +TRIBITS_ADD_EXECUTABLE( idot SOURCES idot ${TEUCHOS_STD_UNIT_TEST_MAIN} - NUM_MPI_PROCS 1-4 + COMM serial mpi) + +TRIBITS_ADD_TEST( + idot + NAME idot COMM serial mpi + STANDARD_PASS_OUTPUT + NUM_MPI_PROCS 1 +) + +TRIBITS_ADD_TEST( + idot + NAME idot + COMM mpi + STANDARD_PASS_OUTPUT + NUM_MPI_PROCS 4 +) + +# If we have CUDA, and we have CUDA-aware MPI, also test idot +# with CUDA-aware MPI explicitly turned off at runtime. +# This exercises a different code path in idot. +IF (Tpetra_ENABLE_CUDA AND Tpetra_INST_CUDA AND TPETRA_ASSUME_CUDA_AWARE_MPI) + TRIBITS_ADD_TEST( + idot + NAME idot_no_cuda_aware + COMM serial mpi + STANDARD_PASS_OUTPUT + NUM_MPI_PROCS 1 + ENVIRONMENT TPETRA_ASSUME_CUDA_AWARE_MPI=OFF ) + TRIBITS_ADD_TEST( + idot + NAME idot_no_cuda_aware + COMM mpi + STANDARD_PASS_OUTPUT + NUM_MPI_PROCS 4 + ENVIRONMENT TPETRA_ASSUME_CUDA_AWARE_MPI=OFF + ) +ENDIF () + ASSERT_DEFINED (Tpetra_ENABLE_CUDA) ASSERT_DEFINED (Tpetra_INST_CUDA) diff --git a/packages/tpetra/core/test/Core/CMakeLists.txt b/packages/tpetra/core/test/Core/CMakeLists.txt index 50cec3b2a78d..abf3e43e6fa9 100644 --- a/packages/tpetra/core/test/Core/CMakeLists.txt +++ b/packages/tpetra/core/test/Core/CMakeLists.txt @@ -164,3 +164,13 @@ TRIBITS_ADD_EXECUTABLE_AND_TEST( NUM_MPI_PROCS 1 STANDARD_PASS_OUTPUT ) + +IF(TPETRA_ENABLE_CUDA) + TRIBITS_ADD_EXECUTABLE_AND_TEST( + check_launch_blocking + SOURCES check_launch_blocking.cpp + COMM serial mpi + ENVIRONMENT CUDA_LAUNCH_BLOCKING=0 + STANDARD_PASS_OUTPUT + ) +ENDIF() diff --git a/packages/tpetra/core/test/Core/check_launch_blocking.cpp b/packages/tpetra/core/test/Core/check_launch_blocking.cpp new file mode 100644 index 000000000000..7eb4fedf74cc --- /dev/null +++ b/packages/tpetra/core/test/Core/check_launch_blocking.cpp @@ -0,0 +1,117 @@ +/* +// @HEADER +// *********************************************************************** +// +// Tpetra: Templated Linear Algebra Services Package +// Copyright (2008) Sandia Corporation +// +// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation, +// the U.S. Government retains certain rights in this software. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// 1. Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// +// 2. Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in the +// documentation and/or other materials provided with the distribution. +// +// 3. Neither the name of the Corporation nor the names of the +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY +// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL SANDIA CORPORATION OR THE +// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +// Questions? Contact Michael A. Heroux (maherou@sandia.gov) +// +// ************************************************************************ +// @HEADER +*/ + +#include "Tpetra_Core.hpp" +#include "Kokkos_Core.hpp" +#include + +int main(int argc, char** argv) +{ + bool success = true; + //These architecture macros are defined in KokkosCore_config.h (included by Core) +#if defined(KOKKOS_ARCH_KEPLER) || defined(KOKKOS_ARCH_MAXWELL) + constexpr bool initializeShouldThrow = true; +#else + constexpr bool initializeShouldThrow = false; +#endif + bool threw = false; + try + { + Tpetra::initialize(&argc, &argv); + } + catch(std::exception& e) + { + //Make sure the error's message is the one about launch blocking + //(it mentions CUDA_LAUNCH_BLOCKING verbatim) + //Otherwise it might be an unrelated exception, in which case this test should fail. + if(!strstr(e.what(), "CUDA_LAUNCH_BLOCKING")) + { + std::cerr << "TEST FAILED: Tpetra::initialize() threw unrelated exception.\n"; + success = false; + } + else + { + std::cout << "Tpetra::initialize threw exception because CUDA_LAUNCH_BLOCKING required but not set.\n"; + } + threw = true; + } + if(!threw) + { + //Initialization succeeded, so clean up + Tpetra::finalize(); + } + else + { + //Tpetra wasn't fully initialized, but Kokkos and MPI might have been. + //Finalize those to avoid extra error messages when test terminates. + if(Kokkos::is_initialized()) + { + //Tpetra not fully initialized, but Kokkos was + Kokkos::finalize(); + } +#ifdef HAVE_TPETRACORE_MPI + int mpiInitialized = 0; + MPI_Initialized(&mpiInitialized); + if(mpiInitialized) + { + //Tpetra not fully initialized, but MPI was + MPI_Finalize(); + } +#endif + } + if(threw && !initializeShouldThrow) + { + std::cerr << "TEST FAILED: Tpetra::initialize() threw an exception when it shouldn't have\n"; + std::cerr << "(CUDA arch is >= Pascal, so launch blocking not needed).\n"; + success = false; + } + else if(!threw && initializeShouldThrow) + { + std::cerr << "TEST FAILED: Tpetra::initialize() did not catch CUDA_LAUNCH_BLOCKING being unset.\n"; + success = false; + } + if(success) + std::cout << "End Result: TEST PASSED\n"; + return 0; +} + diff --git a/packages/tpetra/core/test/CrsGraph/CrsGraph_PackUnpack.cpp b/packages/tpetra/core/test/CrsGraph/CrsGraph_PackUnpack.cpp index 52d331374e21..09f14dc46622 100644 --- a/packages/tpetra/core/test/CrsGraph/CrsGraph_PackUnpack.cpp +++ b/packages/tpetra/core/test/CrsGraph/CrsGraph_PackUnpack.cpp @@ -139,8 +139,6 @@ TEUCHOS_UNIT_TEST_TEMPLATE_3_DECL(CrsGraph, PackThenUnpackAndCombine, LO, GO, NT { typedef Tpetra::CrsGraph crs_graph_type; typedef typename crs_graph_type::packet_type packet_type; - typedef typename NT::device_type device_type; - typedef typename device_type::execution_space execution_space; int lclSuccess = 1; // to be revised below int gblSuccess = 0; // output argument @@ -230,6 +228,8 @@ TEUCHOS_UNIT_TEST_TEMPLATE_3_DECL(CrsGraph, PackThenUnpackAndCombine, LO, GO, NT // compare graph values. Thus, we need to do a fence before // comparing graph values, in order to ensure that changes made on // device are visible on host. + using device_type = typename NT::device_type; + using execution_space = typename device_type::execution_space; execution_space().fence (); int lclNumErrors = 0; diff --git a/packages/tpetra/core/test/CrsGraph/CrsGraph_UnitTests0.cpp b/packages/tpetra/core/test/CrsGraph/CrsGraph_UnitTests0.cpp index f2b976e957b3..6d7b46ff0062 100644 --- a/packages/tpetra/core/test/CrsGraph/CrsGraph_UnitTests0.cpp +++ b/packages/tpetra/core/test/CrsGraph/CrsGraph_UnitTests0.cpp @@ -41,26 +41,10 @@ #include "Tpetra_CrsGraph.hpp" #include "Tpetra_Details_Behavior.hpp" -#include "Tpetra_Details_determineLocalTriangularStructure.hpp" #include "Tpetra_TestingUtilities.hpp" namespace { // (anonymous) - template - Tpetra::Details::LocalTriangularStructureResult - getLocalTriangularStructure (const Tpetra::RowGraph& G) - { - using Tpetra::Details::determineLocalTriangularStructure; - using crs_graph_type = Tpetra::CrsGraph; - - const crs_graph_type& G_crs = dynamic_cast (G); - - auto G_lcl = G_crs.getLocalGraph (); - auto lclRowMap = G.getRowMap ()->getLocalMap (); - auto lclColMap = G.getColMap ()->getLocalMap (); - return determineLocalTriangularStructure (G_lcl, lclRowMap, lclColMap, true); - } - using Tpetra::ProfileType; using Tpetra::StaticProfile; using Teuchos::arcp; @@ -249,40 +233,26 @@ namespace { // (anonymous) RCP map = rcp (new map_type (INVALID, numLocal, indexBase, comm)); - // Test (GitHub Issue) #2565 fix, while we're at it. - // - // clts == 0: Don't set "compute local triangular constants" - // clts == 1: Set "compute local triangular constants" to false - // clts == 2: Set "compute local triangular constants" to true - for (int clts : {0, 1, 2}) { - // send in a parameterlist, check the defaults - RCP params = parameterList(); - if (clts == 1) { - params->set ("compute local triangular constants", false); - } - else if (clts == 2) { - params->set ("compute local triangular constants", true); - } - - // create static-profile graph, fill-complete without inserting (and therefore, without allocating) - GRPH graph (map, 3, StaticProfile); - for (GO i = map->getMinGlobalIndex(); i <= map->getMaxGlobalIndex(); ++i) { - graph.insertGlobalIndices (i, tuple (i)); - } - params->set("Optimize Storage",false); - graph.fillComplete(params); - TEST_EQUALITY(graph.getNodeNumEntries(), (size_t)numLocal); - TEST_EQUALITY_CONST(graph.isStorageOptimized(), false); - // - graph.resumeFill(); - for (int i=0; i < numLocal; ++i) graph.removeLocalIndices(i); - params->set("Optimize Storage",true); - graph.fillComplete(params); - TEST_EQUALITY_CONST(params->get("Optimize Storage"), true); - TEST_EQUALITY(graph.getNodeNumEntries(), 0); - TEST_EQUALITY_CONST(graph.getProfileType(), StaticProfile); - TEST_EQUALITY_CONST(graph.isStorageOptimized(), true); + // send in a parameterlist, check the defaults + RCP params = parameterList(); + // create static-profile graph, fill-complete without inserting (and therefore, without allocating) + GRPH graph (map, 3, StaticProfile); + for (GO i = map->getMinGlobalIndex(); i <= map->getMaxGlobalIndex(); ++i) { + graph.insertGlobalIndices (i, tuple (i)); } + params->set("Optimize Storage",false); + graph.fillComplete(params); + TEST_EQUALITY(graph.getNodeNumEntries(), (size_t)numLocal); + TEST_EQUALITY_CONST(graph.isStorageOptimized(), false); + // + graph.resumeFill(); + for (int i=0; i < numLocal; ++i) graph.removeLocalIndices(i); + params->set("Optimize Storage",true); + graph.fillComplete(params); + TEST_EQUALITY_CONST(params->get("Optimize Storage"), true); + TEST_EQUALITY(graph.getNodeNumEntries(), 0); + TEST_EQUALITY_CONST(graph.getProfileType(), StaticProfile); + TEST_EQUALITY_CONST(graph.isStorageOptimized(), true); int lclSuccess = success ? 1 : 0; int gblSuccess = 1; @@ -313,24 +283,23 @@ namespace { // (anonymous) const GO indexBase = 0; RCP map = rcp (new map_type (INVALID, numLocal, indexBase, comm)); - { - Array lids(1); - lids[0] = myRank; - GRAPH diaggraph(map,map,1); - TEST_EQUALITY(diaggraph.hasColMap(), true); - const LO row = 0; - // insert - diaggraph.insertLocalIndices(row, lids()); - TEST_EQUALITY( static_cast (diaggraph.getNumEntriesInLocalRow (row)), - static_cast (lids.size ()) ); - // remove the row - diaggraph.removeLocalIndices(row); - TEST_EQUALITY(diaggraph.getNumEntriesInLocalRow(row), 0) - // now inserting the index again, should make the row-length be 1 again... - diaggraph.insertLocalIndices(row, lids()); - TEST_EQUALITY( static_cast (diaggraph.getNumEntriesInLocalRow (row)), - static_cast (lids.size ()) ); - } + + Array lids(1); + lids[0] = myRank; + GRAPH diaggraph(map,map,1); + TEST_EQUALITY(diaggraph.hasColMap(), true); + const LO row = 0; + // insert + diaggraph.insertLocalIndices(row, lids()); + TEST_EQUALITY( static_cast (diaggraph.getNumEntriesInLocalRow (row)), + static_cast (lids.size ()) ); + // remove the row + diaggraph.removeLocalIndices(row); + TEST_EQUALITY(diaggraph.getNumEntriesInLocalRow(row), 0) + // now inserting the index again, should make the row-length be 1 again... + diaggraph.insertLocalIndices(row, lids()); + TEST_EQUALITY(static_cast (diaggraph.getNumEntriesInLocalRow (row)), + static_cast (lids.size ()) ); int lclSuccess = success ? 1 : 0; int gblSuccess = 1; @@ -385,64 +354,51 @@ namespace { // (anonymous) RCP cmap = rcp (new map_type (INVALID, ginds, 0, comm)); - // Test (GitHub Issue) #2565 fix, while we're at it. - // - // clts == 0: Don't set "compute local triangular constants" - // clts == 1: Set "compute local triangular constants" to false - // clts == 2: Set "compute local triangular constants" to true - for (int clts : {0, 1, 2}) { - RCP params = parameterList(); - if (clts == 1) { - params->set ("compute local triangular constants", false); + RCP params = parameterList(); + for (int T=0; T<4; ++T) { + if ( (T & 1) != 1 ) continue; + ProfileType pftype = StaticProfile; + params->set("Optimize Storage",((T & 2) == 2)); + GRAPH trigraph(rmap,cmap, ginds.size(),pftype); // only allocate as much room as necessary + Array GCopy(4); Array LCopy(4); + ArrayView GView; + ArrayView LView; + size_t numindices; + // at this point, there are no global or local indices, but views and copies should succeed + trigraph.getLocalRowCopy(0,LCopy,numindices); + trigraph.getLocalRowView(0,LView); + trigraph.getGlobalRowCopy(myrowind,GCopy,numindices); + trigraph.getGlobalRowView(myrowind,GView); + // use multiple inserts: this illustrated an overwrite bug for column-map-specified graphs + typedef typename Teuchos::ArrayView::size_type size_type; + for (size_type j=0; j < ginds.size(); ++j) { + trigraph.insertGlobalIndices(myrowind,ginds(j,1)); } - else if (clts == 2) { - params->set ("compute local triangular constants", true); + TEST_EQUALITY( trigraph.getNumEntriesInLocalRow(0), trigraph.getNumAllocatedEntriesInLocalRow(0) ); // test that we only allocated as much room as necessary + // If StaticProfile, then attempt to insert one additional entry + // in my row that is not already in the row, and verify that it + // throws an exception. + if (pftype == StaticProfile) { + TEST_THROW( trigraph.insertGlobalIndices(myrowind,tuple(myrowind+2)), std::runtime_error ); } - - for (int T=0; T<4; ++T) { - if ( (T & 1) != 1 ) continue; - ProfileType pftype = StaticProfile; - params->set("Optimize Storage",((T & 2) == 2)); - GRAPH trigraph(rmap,cmap, ginds.size(),pftype); // only allocate as much room as necessary - Array GCopy(4); Array LCopy(4); - ArrayView GView; - ArrayView LView; - size_t numindices; - // at this point, there are no global or local indices, but views and copies should succeed - trigraph.getLocalRowCopy(0,LCopy,numindices); - trigraph.getLocalRowView(0,LView); - trigraph.getGlobalRowCopy(myrowind,GCopy,numindices); - trigraph.getGlobalRowView(myrowind,GView); - // use multiple inserts: this illustrated an overwrite bug for column-map-specified graphs - typedef typename Teuchos::ArrayView::size_type size_type; - for (size_type j=0; j < ginds.size(); ++j) { - trigraph.insertGlobalIndices(myrowind,ginds(j,1)); - } - TEST_EQUALITY( trigraph.getNumEntriesInLocalRow(0), trigraph.getNumAllocatedEntriesInLocalRow(0) ); // test that we only allocated as much room as necessary - // If StaticProfile, then attempt to insert one additional entry - // in my row that is not already in the row, and verify that it - // throws an exception. - if (pftype == StaticProfile) { - TEST_THROW( trigraph.insertGlobalIndices(myrowind,tuple(myrowind+2)), std::runtime_error ); - } - trigraph.fillComplete(params); - // check that inserting global entries throws (inserting local entries is still allowed) - { - Array zero(0); - TEST_THROW( trigraph.insertGlobalIndices(0,zero()), std::runtime_error ); - } - // check for throws and no-throws/values - TEST_THROW( trigraph.getGlobalRowView(myrowind,GView), std::runtime_error ); - TEST_THROW( trigraph.getLocalRowCopy( 0 ,LCopy(0,1),numindices), std::runtime_error ); - TEST_THROW( trigraph.getGlobalRowCopy(myrowind,GCopy(0,1),numindices), std::runtime_error ); - TEST_NOTHROW( trigraph.getLocalRowView(0,LView) ); - TEST_COMPARE_ARRAYS( LView, linds ); - TEST_NOTHROW( trigraph.getLocalRowCopy(0,LCopy,numindices) ); - TEST_COMPARE_ARRAYS( LCopy(0,numindices), linds ); - TEST_NOTHROW( trigraph.getGlobalRowCopy(myrowind,GCopy,numindices) ); - TEST_COMPARE_ARRAYS( GCopy(0,numindices), ginds ); - STD_TESTS(trigraph); + trigraph.fillComplete(params); + // check that inserting global entries throws (inserting local entries is still allowed) + { + Array zero(0); + TEST_THROW( trigraph.insertGlobalIndices(0,zero()), std::runtime_error ); } + // check for throws and no-throws/values + TEST_THROW( trigraph.getGlobalRowView(myrowind,GView), std::runtime_error ); + TEST_THROW( trigraph.getLocalRowCopy( 0 ,LCopy(0,1),numindices), std::runtime_error ); + TEST_THROW( trigraph.getGlobalRowCopy(myrowind,GCopy(0,1),numindices), std::runtime_error ); + TEST_NOTHROW( trigraph.getLocalRowView(0,LView) ); + TEST_COMPARE_ARRAYS( LView, linds ); + TEST_NOTHROW( trigraph.getLocalRowCopy(0,LCopy,numindices) ); + TEST_COMPARE_ARRAYS( LCopy(0,numindices), linds ); + TEST_NOTHROW( trigraph.getGlobalRowCopy(myrowind,GCopy,numindices) ); + TEST_COMPARE_ARRAYS( GCopy(0,numindices), ginds ); + STD_TESTS(trigraph); + // All procs fail if any node fails int globalSuccess_int = -1; reduceAll( *comm, REDUCE_SUM, success ? 0 : 1, outArg(globalSuccess_int) ); @@ -463,16 +419,16 @@ namespace { // (anonymous) // create a Map, one row per processor const size_t numLocal = 1; RCP map = rcp (new map_type (INVALID, numLocal, 0, comm)); - { - // add too many entries to a static graph - // let node i contribute to row i+1, where node the last node contributes to row 0 - GRAPH diaggraph(map,1,StaticProfile); - GO grow = myRank; - Array colinds(1); - colinds[0] = grow; - TEST_NOTHROW( diaggraph.insertGlobalIndices(grow,colinds()) ); - TEST_THROW( diaggraph.insertGlobalIndices(grow, Teuchos::tuple (grow+1)), std::runtime_error ); - } + + // add too many entries to a static graph + // let node i contribute to row i+1, where node the last node contributes to row 0 + GRAPH diaggraph(map,1,StaticProfile); + GO grow = myRank; + Array colinds(1); + colinds[0] = grow; + TEST_NOTHROW( diaggraph.insertGlobalIndices(grow,colinds()) ); + TEST_THROW( diaggraph.insertGlobalIndices(grow, Teuchos::tuple (grow+1)), std::runtime_error ); + // All procs fail if any node fails int globalSuccess_int = -1; reduceAll( *comm, REDUCE_SUM, success ? 0 : 1, outArg(globalSuccess_int) ); @@ -503,76 +459,33 @@ namespace { // (anonymous) RCP map = rcp (new map_type (INVALID, (myRank == 1 ? 0 : numLocal), 0, comm)); - // Test (GitHub Issue) #2565 fix, while we're at it. - // - // clts == 0: Don't set "compute local triangular constants" - // clts == 1: Set "compute local triangular constants" to false - // clts == 2: Set "compute local triangular constants" to true - // clts == 3: Don't give a ParameterList to fillComplete at all - for (int clts : {0, 1, 2, 3}) { - - if (clts == 0) { - out << "Don't set \"compute local triangular constants\"" << endl; - } - else if (clts == 1) { - out << "Set \"compute local triangular constants to false\"" << endl; - } - else if (clts == 2) { - out << "Set \"compute local triangular constants to true\"" << endl; - } - else if (clts == 3) { - out << "Don't give a ParameterList to fillComplete at all" << endl; - } - Teuchos::OSTab tab1 (out); + Teuchos::OSTab tab1 (out); - RCP test_row; - { - // allocate - RCP test_crs = rcp (new crs_graph_type (map, 1)); - // invalid, because none are allocated yet - TEST_EQUALITY_CONST( test_crs->getNodeAllocationSize(), STINV ); - if (myRank != 1) { - test_crs->insertGlobalIndices (map->getMinGlobalIndex (), - tuple (map->getMinGlobalIndex ())); - } - if (clts == 3) { - test_crs->fillComplete (); - } - else { - RCP params (new ParameterList); - if (clts == 1) { - params->set ("compute local triangular constants", false); - } - else if (clts == 2) { - params->set ("compute local triangular constants", true); - } - test_crs->fillComplete (params); - } - TEST_EQUALITY( test_crs->getNodeAllocationSize(), numLocal ); - test_row = test_crs; - } - RCP cmap = test_row->getColMap(); - TEST_EQUALITY( cmap->getGlobalNumElements(), (size_t)numProcs-1 ); - TEST_EQUALITY( test_row->getGlobalNumRows(), (size_t)numProcs-1 ); - TEST_EQUALITY( test_row->getNodeNumRows(), numLocal ); - TEST_EQUALITY( test_row->getGlobalNumCols(), (size_t)numProcs-1 ); - TEST_EQUALITY( test_row->getNodeNumCols(), numLocal ); - TEST_EQUALITY( test_row->getIndexBase(), 0 ); - - auto lclTri = getLocalTriangularStructure (*test_row); - TEST_ASSERT( lclTri.couldBeLowerTriangular ); - TEST_ASSERT( lclTri.couldBeUpperTriangular ); - TEST_EQUALITY( lclTri.diagCount, static_cast (numLocal) ); - GO gblDiagCount = 0; - reduceAll (*comm, REDUCE_SUM, static_cast (lclTri.diagCount), outArg (gblDiagCount)); - TEST_EQUALITY( gblDiagCount, static_cast (numProcs-1) ); - - TEST_EQUALITY( test_row->getGlobalNumEntries(), (size_t)numProcs-1 ); - TEST_EQUALITY( test_row->getNodeNumEntries(), numLocal ); - TEST_EQUALITY( test_row->getGlobalMaxNumRowEntries(), 1 ); - TEST_EQUALITY( test_row->getNodeMaxNumRowEntries(), numLocal ); - STD_TESTS((*test_row)); + RCP test_row; + // allocate + RCP test_crs = rcp (new crs_graph_type (map, 1)); + // invalid, because none are allocated yet + TEST_EQUALITY_CONST( test_crs->getNodeAllocationSize(), STINV ); + if (myRank != 1) { + test_crs->insertGlobalIndices (map->getMinGlobalIndex (), + tuple (map->getMinGlobalIndex ())); } + test_crs->fillComplete (); + TEST_EQUALITY( test_crs->getNodeAllocationSize(), numLocal ); + test_row = test_crs; + RCP cmap = test_row->getColMap(); + TEST_EQUALITY( cmap->getGlobalNumElements(), (size_t)numProcs-1 ); + TEST_EQUALITY( test_row->getGlobalNumRows(), (size_t)numProcs-1 ); + TEST_EQUALITY( test_row->getNodeNumRows(), numLocal ); + TEST_EQUALITY( test_row->getGlobalNumCols(), (size_t)numProcs-1 ); + TEST_EQUALITY( test_row->getNodeNumCols(), numLocal ); + TEST_EQUALITY( test_row->getIndexBase(), 0 ); + + TEST_EQUALITY( test_row->getGlobalNumEntries(), (size_t)numProcs-1 ); + TEST_EQUALITY( test_row->getNodeNumEntries(), numLocal ); + TEST_EQUALITY( test_row->getGlobalMaxNumRowEntries(), 1 ); + TEST_EQUALITY( test_row->getNodeMaxNumRowEntries(), numLocal ); + STD_TESTS((*test_row)); } // this one is empty on all nodes because of zero allocation size @@ -582,36 +495,16 @@ namespace { // (anonymous) RCP map = rcp (new map_type (INVALID, numLocal, 0, comm)); - // Test (GitHub Issue) #2565 fix, while we're at it. - // - // clts == 0: Don't set "compute local triangular constants" - // clts == 1: Set "compute local triangular constants" to false - // clts == 2: Set "compute local triangular constants" to true - // clts == 3: Don't give a ParameterList to fillComplete at all - for (int clts : {0, 1, 2, 3}) { + { RCP zero; - { - // allocate with no space - RCP zero_crs = rcp (new crs_graph_type (map, 0)); - // invalid, because none are allocated yet - TEST_EQUALITY_CONST( zero_crs->getNodeAllocationSize(), STINV ); - if (clts == 3) { - zero_crs->fillComplete (); - } - else { - RCP params (new ParameterList); - if (clts == 1) { - params->set ("compute local triangular constants", false); - } - else if (clts == 2) { - params->set ("compute local triangular constants", true); - } - zero_crs->fillComplete (params); - } - // zero, because none were allocated. - TEST_EQUALITY_CONST( zero_crs->getNodeAllocationSize(), 0 ); - zero = zero_crs; - } + // allocate with no space + RCP zero_crs = rcp (new crs_graph_type (map, 0)); + // invalid, because none are allocated yet + TEST_EQUALITY_CONST( zero_crs->getNodeAllocationSize(), STINV ); + zero_crs->fillComplete (); + // zero, because none were allocated. + TEST_EQUALITY_CONST( zero_crs->getNodeAllocationSize(), 0 ); + zero = zero_crs; RCP cmap = zero->getColMap(); TEST_EQUALITY( cmap->getGlobalNumElements(), 0 ); TEST_EQUALITY( zero->getGlobalNumRows(), numProcs*numLocal ); @@ -620,14 +513,6 @@ namespace { // (anonymous) TEST_EQUALITY( zero->getNodeNumCols(), 0 ); TEST_EQUALITY( zero->getIndexBase(), 0 ); - auto lclTri = getLocalTriangularStructure (*zero); - TEST_ASSERT( lclTri.couldBeLowerTriangular ); - TEST_ASSERT( lclTri.couldBeUpperTriangular ); - TEST_EQUALITY( lclTri.diagCount, static_cast (0) ); - GO gblDiagCount = 0; - reduceAll (*comm, REDUCE_SUM, static_cast (lclTri.diagCount), outArg (gblDiagCount)); - TEST_EQUALITY( gblDiagCount, static_cast (0) ); - TEST_EQUALITY( zero->getGlobalNumEntries(), 0 ); TEST_EQUALITY( zero->getNodeNumEntries(), 0 ); TEST_EQUALITY( zero->getGlobalMaxNumRowEntries(), 0 ); @@ -641,58 +526,28 @@ namespace { // (anonymous) const size_t numLocal = 0; RCP map = rcp (new map_type (INVALID, numLocal, 0, comm)); - // Test (GitHub Issue) #2565 fix, while we're at it. - // - // clts == 0: Don't set "compute local triangular constants" - // clts == 1: Set "compute local triangular constants" to false - // clts == 2: Set "compute local triangular constants" to true - // clts == 3: Don't give a ParameterList to fillComplete at all - for (int clts : {0, 1, 2, 3}) { - RCP zero; - { - // allocate with no space - RCP zero_crs = rcp (new crs_graph_type (map, 0)); - // invalid, because none are allocated yet - TEST_EQUALITY_CONST( zero_crs->getNodeAllocationSize(), STINV ); - if (clts == 3) { - zero_crs->fillComplete (); - } - else { - RCP params (new ParameterList); - if (clts == 1) { - params->set ("compute local triangular constants", false); - } - else if (clts == 2) { - params->set ("compute local triangular constants", true); - } - zero_crs->fillComplete (params); - } - // zero, because none were allocated. - TEST_EQUALITY_CONST( zero_crs->getNodeAllocationSize(), 0 ); - zero = zero_crs; - } - RCP cmap = zero->getColMap(); - TEST_EQUALITY( cmap->getGlobalNumElements(), 0 ); - TEST_EQUALITY( zero->getGlobalNumRows(), numProcs*numLocal ); - TEST_EQUALITY( zero->getNodeNumRows(), numLocal ); - TEST_EQUALITY( zero->getGlobalNumCols(), numProcs*numLocal ); - TEST_EQUALITY( zero->getNodeNumCols(), 0 ); - TEST_EQUALITY( zero->getIndexBase(), 0 ); - - auto lclTri = getLocalTriangularStructure (*zero); - TEST_ASSERT( lclTri.couldBeLowerTriangular ); - TEST_ASSERT( lclTri.couldBeUpperTriangular ); - TEST_EQUALITY( lclTri.diagCount, static_cast (0) ); - GO gblDiagCount = 0; - reduceAll (*comm, REDUCE_SUM, static_cast (lclTri.diagCount), outArg (gblDiagCount)); - TEST_EQUALITY( gblDiagCount, static_cast (0) ); + RCP zero; + // allocate with no space + RCP zero_crs = rcp (new crs_graph_type (map, 0)); + // invalid, because none are allocated yet + TEST_EQUALITY_CONST( zero_crs->getNodeAllocationSize(), STINV ); + zero_crs->fillComplete (); + // zero, because none were allocated. + TEST_EQUALITY_CONST( zero_crs->getNodeAllocationSize(), 0 ); + zero = zero_crs; + RCP cmap = zero->getColMap(); + TEST_EQUALITY( cmap->getGlobalNumElements(), 0 ); + TEST_EQUALITY( zero->getGlobalNumRows(), numProcs*numLocal ); + TEST_EQUALITY( zero->getNodeNumRows(), numLocal ); + TEST_EQUALITY( zero->getGlobalNumCols(), numProcs*numLocal ); + TEST_EQUALITY( zero->getNodeNumCols(), 0 ); + TEST_EQUALITY( zero->getIndexBase(), 0 ); - TEST_EQUALITY( zero->getGlobalNumEntries(), 0 ); - TEST_EQUALITY( zero->getNodeNumEntries(), 0 ); - TEST_EQUALITY( zero->getGlobalMaxNumRowEntries(), 0 ); - TEST_EQUALITY( zero->getNodeMaxNumRowEntries(), 0 ); - STD_TESTS((*zero)); - } + TEST_EQUALITY( zero->getGlobalNumEntries(), 0 ); + TEST_EQUALITY( zero->getNodeNumEntries(), 0 ); + TEST_EQUALITY( zero->getGlobalMaxNumRowEntries(), 0 ); + TEST_EQUALITY( zero->getNodeMaxNumRowEntries(), 0 ); + STD_TESTS((*zero)); } // All procs fail if any proc fails @@ -717,60 +572,30 @@ namespace { // (anonymous) // create the empty graph RCP > zero; - // Test (GitHub Issue) #2565 fix, while we're at it. - // - // clts == 0: Don't set "compute local triangular constants" - // clts == 1: Set "compute local triangular constants" to false - // clts == 2: Set "compute local triangular constants" to true - // clts == 3: Don't give a ParameterList to fillComplete at all - for (int clts : {0, 1, 2, 3}) { - { - // allocated with space for one entry per row - RCP zero_crs = rcp (new graph_type (map,1)); - TEST_EQUALITY( zero_crs->getNodeAllocationSize(), STINV ); // zero, because none are allocated yet - - if (clts == 3) { - zero_crs->fillComplete (); - } - else { - RCP params (new ParameterList); - if (clts == 1) { - params->set ("compute local triangular constants", false); - } - else if (clts == 2) { - params->set ("compute local triangular constants", true); - } - zero_crs->fillComplete (params); - } - zero = zero_crs; - } - RCP cmap = zero->getColMap(); - TEST_EQUALITY( cmap->getGlobalNumElements(), 0 ); - TEST_EQUALITY( zero->getGlobalNumRows(), numProcs*numLocal ); - TEST_EQUALITY( zero->getNodeNumRows(), numLocal ); - TEST_EQUALITY( zero->getGlobalNumCols(), numProcs*numLocal ); - TEST_EQUALITY( zero->getNodeNumCols(), 0 ); - TEST_EQUALITY( zero->getIndexBase(), 0 ); - - auto lclTri = getLocalTriangularStructure (*zero); - TEST_ASSERT( lclTri.couldBeLowerTriangular ); - TEST_ASSERT( lclTri.couldBeUpperTriangular ); - TEST_EQUALITY( lclTri.diagCount, static_cast (0) ); - GO gblDiagCount = 0; - reduceAll (*comm, REDUCE_SUM, static_cast (lclTri.diagCount), outArg (gblDiagCount)); - TEST_EQUALITY( gblDiagCount, static_cast (0) ); + // allocated with space for one entry per row + RCP zero_crs = rcp (new graph_type (map,1)); + TEST_EQUALITY( zero_crs->getNodeAllocationSize(), STINV ); // zero, because none are allocated yet + + zero_crs->fillComplete (); + zero = zero_crs; + RCP cmap = zero->getColMap(); + TEST_EQUALITY( cmap->getGlobalNumElements(), 0 ); + TEST_EQUALITY( zero->getGlobalNumRows(), numProcs*numLocal ); + TEST_EQUALITY( zero->getNodeNumRows(), numLocal ); + TEST_EQUALITY( zero->getGlobalNumCols(), numProcs*numLocal ); + TEST_EQUALITY( zero->getNodeNumCols(), 0 ); + TEST_EQUALITY( zero->getIndexBase(), 0 ); + + TEST_EQUALITY( zero->getGlobalNumEntries(), 0 ); + TEST_EQUALITY( zero->getNodeNumEntries(), 0 ); + TEST_EQUALITY( zero->getGlobalMaxNumRowEntries(), 0 ); + TEST_EQUALITY( zero->getNodeMaxNumRowEntries(), 0 ); + STD_TESTS((*zero)); - TEST_EQUALITY( zero->getGlobalNumEntries(), 0 ); - TEST_EQUALITY( zero->getNodeNumEntries(), 0 ); - TEST_EQUALITY( zero->getGlobalMaxNumRowEntries(), 0 ); - TEST_EQUALITY( zero->getNodeMaxNumRowEntries(), 0 ); - STD_TESTS((*zero)); - - // All procs fail if any proc fails - int globalSuccess_int = -1; - reduceAll( *comm, REDUCE_SUM, success ? 0 : 1, outArg(globalSuccess_int) ); - TEST_EQUALITY_CONST( globalSuccess_int, 0 ); - } + // All procs fail if any proc fails + int globalSuccess_int = -1; + reduceAll( *comm, REDUCE_SUM, success ? 0 : 1, outArg(globalSuccess_int) ); + TEST_EQUALITY_CONST( globalSuccess_int, 0 ); } TEUCHOS_UNIT_TEST_TEMPLATE_3_DECL( CrsGraph, DottedDiag, LO, GO , Node ) @@ -793,54 +618,35 @@ namespace { // (anonymous) RCP params = parameterList (); params->set("Optimize Storage",((T & 2) == 2)); - // Test (GitHub Issue) #2565 fix, while we're at it. - // - // clts == 0: Don't set "compute local triangular constants" - // clts == 1: Set "compute local triangular constants" to false - // clts == 2: Set "compute local triangular constants" to true - for (int clts : {0, 1, 2}) { - if (clts == 1) { - params->set ("compute local triangular constants", false); - } - else if (clts == 2) { - params->set ("compute local triangular constants", true); - } - // create a diagonal graph, but where only my middle row has an entry - ArrayRCP toalloc = arcpClone( tuple(0,1,0) ); - GRAPH ddgraph(map, toalloc (), pftype); - ddgraph.insertGlobalIndices(mymiddle, tuple(mymiddle)); - // before globalAssemble(), there should be one local entry on middle, none on the others - ArrayView myrow_gbl; - ddgraph.getGlobalRowView(mymiddle-1,myrow_gbl); TEST_EQUALITY( myrow_gbl.size(), 0 ); - ddgraph.getGlobalRowView(mymiddle ,myrow_gbl); TEST_COMPARE_ARRAYS( myrow_gbl, tuple(mymiddle) ); - ddgraph.getGlobalRowView(mymiddle+1,myrow_gbl); TEST_EQUALITY( myrow_gbl.size(), 0 ); - if (pftype == StaticProfile) { // no room for more, on any row - TEST_THROW( ddgraph.insertGlobalIndices(mymiddle-1,tuple(mymiddle+1)), std::runtime_error ); - TEST_THROW( ddgraph.insertGlobalIndices(mymiddle ,tuple(mymiddle+1)), std::runtime_error ); - TEST_THROW( ddgraph.insertGlobalIndices(mymiddle+1,tuple(mymiddle+1)), std::runtime_error ); - } - ddgraph.fillComplete(params); - // after fillComplete(), there should be a single entry on my middle, corresponding to the diagonal, none on the others - ArrayView myrow_lcl; - TEST_EQUALITY_CONST( ddgraph.getNumEntriesInLocalRow(0), 0 ); - TEST_EQUALITY_CONST( ddgraph.getNumEntriesInLocalRow(2), 0 ); - ddgraph.getLocalRowView(1,myrow_lcl); - TEST_EQUALITY_CONST( myrow_lcl.size(), 1 ); - if (myrow_lcl.size() == 1) { - TEST_EQUALITY( ddgraph.getColMap()->getGlobalElement(myrow_lcl[0]), mymiddle ); - } - // also, the row map and column map should be equivalent - TEST_EQUALITY( ddgraph.getGlobalNumCols(), static_cast (3*numProcs) ); - TEST_EQUALITY( ddgraph.getGlobalNumRows(), ddgraph.getGlobalNumCols() ); - - auto lclTri = getLocalTriangularStructure (ddgraph); - TEST_EQUALITY( lclTri.diagCount, static_cast (1) ); - GO gblDiagCount = 0; - reduceAll (*comm, REDUCE_SUM, static_cast (lclTri.diagCount), outArg (gblDiagCount)); - TEST_EQUALITY( gblDiagCount, static_cast (numProcs) ); - - STD_TESTS(ddgraph); + // create a diagonal graph, but where only my middle row has an entry + ArrayRCP toalloc = arcpClone( tuple(0,1,0) ); + GRAPH ddgraph(map, toalloc (), pftype); + ddgraph.insertGlobalIndices(mymiddle, tuple(mymiddle)); + // before globalAssemble(), there should be one local entry on middle, none on the others + ArrayView myrow_gbl; + ddgraph.getGlobalRowView(mymiddle-1,myrow_gbl); TEST_EQUALITY( myrow_gbl.size(), 0 ); + ddgraph.getGlobalRowView(mymiddle ,myrow_gbl); TEST_COMPARE_ARRAYS( myrow_gbl, tuple(mymiddle) ); + ddgraph.getGlobalRowView(mymiddle+1,myrow_gbl); TEST_EQUALITY( myrow_gbl.size(), 0 ); + if (pftype == StaticProfile) { // no room for more, on any row + TEST_THROW( ddgraph.insertGlobalIndices(mymiddle-1,tuple(mymiddle+1)), std::runtime_error ); + TEST_THROW( ddgraph.insertGlobalIndices(mymiddle ,tuple(mymiddle+1)), std::runtime_error ); + TEST_THROW( ddgraph.insertGlobalIndices(mymiddle+1,tuple(mymiddle+1)), std::runtime_error ); + } + ddgraph.fillComplete(params); + // after fillComplete(), there should be a single entry on my middle, corresponding to the diagonal, none on the others + ArrayView myrow_lcl; + TEST_EQUALITY_CONST( ddgraph.getNumEntriesInLocalRow(0), 0 ); + TEST_EQUALITY_CONST( ddgraph.getNumEntriesInLocalRow(2), 0 ); + ddgraph.getLocalRowView(1,myrow_lcl); + TEST_EQUALITY_CONST( myrow_lcl.size(), 1 ); + if (myrow_lcl.size() == 1) { + TEST_EQUALITY( ddgraph.getColMap()->getGlobalElement(myrow_lcl[0]), mymiddle ); } + // also, the row map and column map should be equivalent + TEST_EQUALITY( ddgraph.getGlobalNumCols(), static_cast (3*numProcs) ); + TEST_EQUALITY( ddgraph.getGlobalNumRows(), ddgraph.getGlobalNumCols() ); + + STD_TESTS(ddgraph); } // All procs fail if any node fails int globalSuccess_int = -1; @@ -870,187 +676,151 @@ namespace { // (anonymous) GO myrowind = map->getGlobalElement (0); - // Test (GitHub Issue) #2565 fix, while we're at it. - // - // clts == 0: Don't set "compute local triangular constants" - // clts == 1: Set "compute local triangular constants" to false - // clts == 2: Set "compute local triangular constants" to true - for (int clts : {0, 1, 2}) { - if (clts == 0) { - out << "Don't set \"compute local triangular constants\"" << endl; - } - else if (clts == 1) { - out << "Set \"compute local triangular constants\" to false" << endl; - } - else if (clts == 2) { - out << "Set \"compute local triangular constants\" to true" << endl; - } - Teuchos::OSTab tab1 (out); + Teuchos::OSTab tab1 (out); + + const Tpetra::ProfileType profileTypes[1] = {Tpetra::StaticProfile}; + for (ProfileType pftype : profileTypes) { + Teuchos::OSTab tab2 (out); + for (bool optimizeStorage : {false, true}) { + out << "Optimize Storage: " << (optimizeStorage ? "true" : "false") + << endl; + Teuchos::OSTab tab3 (out); - const Tpetra::ProfileType profileTypes[1] = {Tpetra::StaticProfile}; - for (ProfileType pftype : profileTypes) { - Teuchos::OSTab tab2 (out); - for (bool optimizeStorage : {false, true}) { - out << "Optimize Storage: " << (optimizeStorage ? "true" : "false") - << endl; - Teuchos::OSTab tab3 (out); - - RCP params = parameterList (); - if (clts == 1) { - params->set ("compute local triangular constants", false); + RCP params = parameterList (); + params->set ("Optimize Storage", optimizeStorage); + + // Diagonal graph + { + out << "Diagonal graph test" << endl; + Teuchos::OSTab tab4 (out); + + // create a diagonal graph, where the graph entries are + // contributed by a single off-node contribution, no + // filtering. let node i contribute to row i+1, where node + // the last node contributes to row 0 + GRAPH diaggraph (map, 1, pftype); + GO grow = myRank+1; + if (as (grow) == numProcs) { + grow = 0; } - else if (clts == 2) { - params->set ("compute local triangular constants", true); + diaggraph.insertGlobalIndices (grow, tuple (grow)); + // before globalAssemble(), there should be no local entries if numProcs > 1 + ArrayView myrow_gbl; + diaggraph.getGlobalRowView (myrowind, myrow_gbl); + TEST_EQUALITY( myrow_gbl.size (), (numProcs == 1 ? 1 : 0) ); + diaggraph.globalAssemble (); + // after globalAssemble(), there should be one local entry per + // row, corresponding to the diagonal + diaggraph.getGlobalRowView (myrowind, myrow_gbl); + TEST_COMPARE_ARRAYS( myrow_gbl, tuple (myrowind) ); + + if (pftype == StaticProfile) { // no room for more + out << "Attempt to insert global column index " << (myrowind+1) << " into" + " global row " << myrowind << "; it should throw, because the graph" + " is StaticProfile, has an upper bound of one entry per row, and " + "already has a different column index " << grow << " in this row." + << endl; + TEST_THROW( diaggraph.insertGlobalIndices(myrowind,tuple(myrowind+1)), + std::runtime_error ); } - params->set ("Optimize Storage", optimizeStorage); - - // Diagonal graph - { - out << "Diagonal graph test" << endl; - Teuchos::OSTab tab4 (out); - - // create a diagonal graph, where the graph entries are - // contributed by a single off-node contribution, no - // filtering. let node i contribute to row i+1, where node - // the last node contributes to row 0 - GRAPH diaggraph (map, 1, pftype); - GO grow = myRank+1; - if (as (grow) == numProcs) { - grow = 0; - } - diaggraph.insertGlobalIndices (grow, tuple (grow)); - // before globalAssemble(), there should be no local entries if numProcs > 1 - ArrayView myrow_gbl; - diaggraph.getGlobalRowView (myrowind, myrow_gbl); - TEST_EQUALITY( myrow_gbl.size (), (numProcs == 1 ? 1 : 0) ); - diaggraph.globalAssemble (); - // after globalAssemble(), there should be one local entry per - // row, corresponding to the diagonal - diaggraph.getGlobalRowView (myrowind, myrow_gbl); - TEST_COMPARE_ARRAYS( myrow_gbl, tuple (myrowind) ); - - if (pftype == StaticProfile) { // no room for more - out << "Attempt to insert global column index " << (myrowind+1) << " into" - " global row " << myrowind << "; it should throw, because the graph" - " is StaticProfile, has an upper bound of one entry per row, and " - "already has a different column index " << grow << " in this row." - << endl; - TEST_THROW( diaggraph.insertGlobalIndices(myrowind,tuple(myrowind+1)), - std::runtime_error ); - } - diaggraph.fillComplete (params); + diaggraph.fillComplete (params); - // after fillComplete(), there should be a single entry on my - // row, corresponding to the diagonal - ArrayView myrow_lcl; - diaggraph.getLocalRowView (0, myrow_lcl); - TEST_EQUALITY_CONST( myrow_lcl.size (), 1 ); - if (myrow_lcl.size() == 1) { - TEST_EQUALITY( diaggraph.getColMap ()->getGlobalElement (myrow_lcl[0]), - myrowind ); - } - // also, the row map and column map should be equivalent - TEST_EQUALITY_CONST( diaggraph.getRowMap()->isSameAs(*diaggraph.getColMap()), true ); - - auto lclTri = getLocalTriangularStructure (diaggraph); - TEST_ASSERT( lclTri.couldBeLowerTriangular ); - TEST_ASSERT( lclTri.couldBeUpperTriangular ); - TEST_EQUALITY( lclTri.diagCount, static_cast (1) ); - GO gblDiagCount = 0; - reduceAll (*comm, REDUCE_SUM, static_cast (lclTri.diagCount), outArg (gblDiagCount)); - TEST_EQUALITY( gblDiagCount, static_cast (numProcs) ); - - STD_TESTS(diaggraph); + // after fillComplete(), there should be a single entry on my + // row, corresponding to the diagonal + ArrayView myrow_lcl; + diaggraph.getLocalRowView (0, myrow_lcl); + TEST_EQUALITY_CONST( myrow_lcl.size (), 1 ); + if (myrow_lcl.size() == 1) { + TEST_EQUALITY( diaggraph.getColMap ()->getGlobalElement (myrow_lcl[0]), + myrowind ); } + // also, the row map and column map should be equivalent + TEST_EQUALITY_CONST( diaggraph.getRowMap()->isSameAs(*diaggraph.getColMap()), true ); - // Next-door-neighbor graph - { - out << "Next-door-neighbor graph test" << endl; - Teuchos::OSTab tab4 (out); - - // create a next-door-neighbor graph (tridiagonal plus - // corners), where the graph entries are contributed by single - // off-node contribution, no filtering. let node i add the - // contributions for column i of the graph: (i-1,i), (i,i), - // (i+1,i). allocate only as much space as we need. some - // hacking here to support this test when numProcs == 1 or 2 - GRAPH ngraph(map,3,pftype); - Array grows(3); - grows[0] = (numProcs+myRank-1) % numProcs; // my left neighbor - grows[1] = (numProcs+myRank ) % numProcs; // myself - grows[2] = (numProcs+myRank+1) % numProcs; // my right neighbor - - // Add me to the graph for my neighbors - ngraph.insertGlobalIndices (grows[0], tuple (myRank)); - ngraph.insertGlobalIndices (grows[1], tuple (myRank)); - ngraph.insertGlobalIndices (grows[2], tuple (myRank)); - - // before globalAssemble(), there should be a single local - // entry on parallel runs, three on serial runs - ArrayView myrow_gbl; - ngraph.getGlobalRowView (myrowind, myrow_gbl); - - // after globalAssemble(), storage should be maxed out - out << "Calling globalAssemble()" << endl; - ngraph.globalAssemble(); - TEST_EQUALITY( ngraph.getNumEntriesInLocalRow(0), - ( numProcs == 1 && pftype == StaticProfile ? 1 : - ngraph.getNumAllocatedEntriesInLocalRow(0) )); - out << "Calling fillComplete(params)" << endl; - ngraph.fillComplete (params); - - // after fillComplete(), there should be entries for me and my - // neighbors on my row - ArrayView myrow_lcl; - ngraph.getLocalRowView (0, myrow_lcl); - out << "Returned view of column indices on Proc 0: " - << Teuchos::toString (myrow_lcl) << endl; - - { - // check indices on my row - typename Array::iterator glast; - std::sort (grows.begin (), grows.end ()); - glast = std::unique (grows.begin (), grows.end ()); - size_t numunique = glast - grows.begin (); - // test the test: numunique == min(numProcs,3) - TEST_EQUALITY( numunique, (size_t)min(numProcs,3) ); - TEST_EQUALITY_CONST( (size_t)myrow_lcl.size(), numunique ); - if ((size_t)myrow_lcl.size() == numunique) { - size_t numinds; - Array inds(numunique+1); - TEST_THROW( - ngraph.getGlobalRowCopy (myrowind, inds (0, numunique-1), numinds), - std::runtime_error ); - TEST_NOTHROW( - ngraph.getGlobalRowCopy (myrowind, inds (0, numunique), numinds) ); - TEST_NOTHROW( ngraph.getGlobalRowCopy (myrowind,inds (), numinds) ); - std::sort (inds.begin (), inds.begin () + numinds); - TEST_COMPARE_ARRAYS( inds (0, numinds), grows (0, numunique) ); - - out << "On Proc 0:" << endl; - Teuchos::OSTab tab5 (out); - out << "numinds: " << numinds << endl - << "inds(0,numinds): " << inds (0, numinds) << endl - << "numunique: " << numunique << endl - << "grows(0,numunique): " << grows (0, numunique) << endl; - } - } - TEST_EQUALITY_CONST( ngraph.getRowMap ()->isSameAs (* (ngraph.getColMap ())), - (numProcs == 1 ? true : false) ); + STD_TESTS(diaggraph); + } - auto lclTri = getLocalTriangularStructure (ngraph); - TEST_EQUALITY( lclTri.diagCount, 1 ); - GO gblDiagCount = 0; - reduceAll (*comm, REDUCE_SUM, static_cast (lclTri.diagCount), outArg (gblDiagCount)); - TEST_EQUALITY( gblDiagCount, static_cast (numProcs) ); + // Next-door-neighbor graph + { + out << "Next-door-neighbor graph test" << endl; + Teuchos::OSTab tab4 (out); + + // create a next-door-neighbor graph (tridiagonal plus + // corners), where the graph entries are contributed by single + // off-node contribution, no filtering. let node i add the + // contributions for column i of the graph: (i-1,i), (i,i), + // (i+1,i). allocate only as much space as we need. some + // hacking here to support this test when numProcs == 1 or 2 + GRAPH ngraph(map,3,pftype); + Array grows(3); + grows[0] = (numProcs+myRank-1) % numProcs; // my left neighbor + grows[1] = (numProcs+myRank ) % numProcs; // myself + grows[2] = (numProcs+myRank+1) % numProcs; // my right neighbor + + // Add me to the graph for my neighbors + ngraph.insertGlobalIndices (grows[0], tuple (myRank)); + ngraph.insertGlobalIndices (grows[1], tuple (myRank)); + ngraph.insertGlobalIndices (grows[2], tuple (myRank)); + + // before globalAssemble(), there should be a single local + // entry on parallel runs, three on serial runs + ArrayView myrow_gbl; + ngraph.getGlobalRowView (myrowind, myrow_gbl); + + // after globalAssemble(), storage should be maxed out + out << "Calling globalAssemble()" << endl; + ngraph.globalAssemble(); + TEST_EQUALITY( ngraph.getNumEntriesInLocalRow(0), + ( numProcs == 1 && pftype == StaticProfile ? 1 : + ngraph.getNumAllocatedEntriesInLocalRow(0) )); + out << "Calling fillComplete(params)" << endl; + ngraph.fillComplete (params); + + // after fillComplete(), there should be entries for me and my + // neighbors on my row + ArrayView myrow_lcl; + ngraph.getLocalRowView (0, myrow_lcl); + out << "Returned view of column indices on Proc 0: " + << Teuchos::toString (myrow_lcl) << endl; - out << "Concluding with standard graph tests" << endl; - STD_TESTS(ngraph); + { + // check indices on my row + typename Array::iterator glast; + std::sort (grows.begin (), grows.end ()); + glast = std::unique (grows.begin (), grows.end ()); + size_t numunique = glast - grows.begin (); + // test the test: numunique == min(numProcs,3) + TEST_EQUALITY( numunique, (size_t)min(numProcs,3) ); + TEST_EQUALITY_CONST( (size_t)myrow_lcl.size(), numunique ); + if ((size_t)myrow_lcl.size() == numunique) { + size_t numinds; + Array inds(numunique+1); + TEST_THROW( + ngraph.getGlobalRowCopy (myrowind, inds (0, numunique-1), numinds), + std::runtime_error ); + TEST_NOTHROW( + ngraph.getGlobalRowCopy (myrowind, inds (0, numunique), numinds) ); + TEST_NOTHROW( ngraph.getGlobalRowCopy (myrowind,inds (), numinds) ); + std::sort (inds.begin (), inds.begin () + numinds); + TEST_COMPARE_ARRAYS( inds (0, numinds), grows (0, numunique) ); + + out << "On Proc 0:" << endl; + Teuchos::OSTab tab5 (out); + out << "numinds: " << numinds << endl + << "inds(0,numinds): " << inds (0, numinds) << endl + << "numunique: " << numunique << endl + << "grows(0,numunique): " << grows (0, numunique) << endl; + } } - } // optimizeStorage - } // pftype - } // clts + TEST_EQUALITY_CONST( ngraph.getRowMap ()->isSameAs (* (ngraph.getColMap ())), + (numProcs == 1 ? true : false) ); + + out << "Concluding with standard graph tests" << endl; + STD_TESTS(ngraph); + } + } // optimizeStorage + } // pftype // All procs fail if any node fails int globalSuccess_int = -1; diff --git a/packages/tpetra/core/test/CrsGraph/CrsGraph_UnpackIntoStaticGraph.cpp b/packages/tpetra/core/test/CrsGraph/CrsGraph_UnpackIntoStaticGraph.cpp index e72d7ad42c72..ed27dfdc6b54 100644 --- a/packages/tpetra/core/test/CrsGraph/CrsGraph_UnpackIntoStaticGraph.cpp +++ b/packages/tpetra/core/test/CrsGraph/CrsGraph_UnpackIntoStaticGraph.cpp @@ -89,8 +89,6 @@ TEUCHOS_UNIT_TEST_TEMPLATE_3_DECL(CrsGraph, PackThenUnpackAndCombine, LO, GO, NT using map_type = Tpetra::Map; using graph_type = Tpetra::CrsGraph; using packet_type = typename graph_type::packet_type; - using device_type = typename NT::device_type; - using execution_space = typename device_type::execution_space; // using import_type = Tpetra::Import; auto comm = getDefaultComm(); @@ -201,6 +199,8 @@ TEUCHOS_UNIT_TEST_TEMPLATE_3_DECL(CrsGraph, PackThenUnpackAndCombine, LO, GO, NT // comparing graph values, in order to ensure that changes made on // device are visible on host. A->fillComplete(); + using device_type = typename NT::device_type; + using execution_space = typename device_type::execution_space; execution_space().fence (); auto loc_num_errs = 0; diff --git a/packages/tpetra/core/test/CrsMatrix/CrsMatrix_PackUnpack.cpp b/packages/tpetra/core/test/CrsMatrix/CrsMatrix_PackUnpack.cpp index a9fde1aa4f66..6121f66f01fe 100644 --- a/packages/tpetra/core/test/CrsMatrix/CrsMatrix_PackUnpack.cpp +++ b/packages/tpetra/core/test/CrsMatrix/CrsMatrix_PackUnpack.cpp @@ -208,7 +208,7 @@ TEUCHOS_UNIT_TEST_TEMPLATE_4_DECL(CrsMatrix, PackThenUnpackAndCombine, SC, LO, G out << "Building second matrix" << endl; auto graph = A->getCrsGraph(); RCP B (new crs_matrix_type (graph)); - B->setAllToScalar(SC {}); + B->setAllToScalar(SC{-1.}); B->fillComplete(); out << "Calling unpackCrsMatrixAndCombine with " @@ -273,6 +273,12 @@ TEUCHOS_UNIT_TEST_TEMPLATE_4_DECL(CrsMatrix, PackThenUnpackAndCombine, SC, LO, G << "B[" << i << "]=" << B_values[i] << "!\n"; ++curNumErrors; } + else + { + errStrm << "INFO: Proc " << world_rank << ", row " << lclRow + << ", A[" << i << "]=" << A_values[i] << ", and " + << "B[" << i << "]=" << B_values[i] << "!\n"; + } } lclNumErrors += curNumErrors; } @@ -349,6 +355,9 @@ TEUCHOS_UNIT_TEST_TEMPLATE_4_DECL(CrsMatrix, PackThenUnpackAndCombine, SC, LO, G ArrayView B_indices; ArrayView B_values; B->getLocalRowView(loc_row, B_indices, B_values); +// std::cout << "A_values: " << A_values << "\n"; +// std::cout << "B_values: " << B_values << "\n"; +// std::cout << std::flush; TEST_EQUALITY( A_indices.size (), B_indices.size () ); diff --git a/packages/tpetra/core/test/CrsMatrix/CrsMatrix_UnitTests.cpp b/packages/tpetra/core/test/CrsMatrix/CrsMatrix_UnitTests.cpp index eca455d97b46..d7289c80eab5 100644 --- a/packages/tpetra/core/test/CrsMatrix/CrsMatrix_UnitTests.cpp +++ b/packages/tpetra/core/test/CrsMatrix/CrsMatrix_UnitTests.cpp @@ -45,6 +45,7 @@ #include "Tpetra_CrsMatrix.hpp" #include "Tpetra_MultiVector.hpp" #include "Tpetra_Details_getNumDiags.hpp" +#include "Tpetra_Details_residual.hpp" // TODO: add test where some nodes have zero rows // TODO: add test where non-"zero" graph is used to build matrix; if no values are added to matrix, the operator effect should be zero. This tests that matrix values are initialized properly. @@ -332,6 +333,93 @@ namespace { // (anonymous) } } + TEUCHOS_UNIT_TEST_TEMPLATE_4_DECL( CrsMatrix, ImbalancedRowMatrix, LO, GO, Scalar, Node ) + { + typedef Tpetra::CrsMatrix MAT; + typedef Teuchos::ScalarTraits ST; + typedef Tpetra::MultiVector MV; + typedef Tpetra::Vector V; + typedef typename ST::magnitudeType Mag; + // get a comm + RCP > comm = getDefaultComm(); + // create a Map + const size_t numLocalRows = 10; + // compute the number of entries in the long rows required to trigger the imbalanced row apply + // this isn't quite the minimum but it works: numLocalRows * 5 + Behavior::rowImbalanceThreshold() + const size_t numLocalColumns = 1 + (5 + 1.5 * Tpetra::Details::Behavior::rowImbalanceThreshold()) / (1.0 - 1.0 / numLocalRows); + const size_t numVecs = 2; + const int numRanks = comm->getSize(); + RCP > rowMap = + createContigMapWithNode(numLocalRows * numRanks, numLocalRows, comm); + RCP > colMap = + createContigMapWithNode(numLocalColumns * numRanks, numLocalColumns, comm); + //Create a matrix that is dense in the last row on each proc, but has 5 entries in every other row + Teuchos::Array entriesPerRow(numLocalRows); + for(size_t i = 0; i < numLocalRows - 1; i++) + entriesPerRow[i] = 5; + entriesPerRow[numLocalRows - 1] = numLocalColumns; + MAT imba(rowMap, colMap, entriesPerRow()); + //Insert 1 as value in all entries. + Teuchos::Array vals(numLocalColumns, ST::one()); + Teuchos::Array cols(numLocalColumns); + for(size_t i = 0; i < numLocalColumns; i++) + cols[i] = i; + auto valsView = vals(); + auto colsView = cols(); + for(size_t i = 0; i < numLocalRows - 1; i++) + imba.insertLocalValues(i, colsView.view(0, 5), valsView.view(0, 5)); + imba.insertLocalValues(numLocalRows - 1, colsView, valsView); + imba.fillComplete(colMap, rowMap); + //auto fancy = Teuchos::fancyOStream(Teuchos::rcpFromRef(std::cout)); + //imba.describe(*fancy,Teuchos::VERB_EXTREME); + auto domainMap = imba.getDomainMap(); + //Input vector: elements are all 1s + MV w(domainMap, numVecs, false); + w.putScalar(ST::one()); + //Output vector: zero initially + //note: rowMap is non-overlapping so this is OK + MV v(rowMap, numVecs, true); + //Do the apply. If cuSPARSE is enabled, the merge path algorithm will be used. Otherwise, this tests the fallback. + imba.apply(w, v); + Teuchos::Array vvals(numLocalRows * numVecs); + v.get1dCopy(vvals(), numLocalRows); + //Each output value should be equal to the number of entries in the row. + //These are smallish integers so they should be represented exactly in 32- or 64-bit floating point + for(size_t vec = 0; vec < numVecs; vec++) + { + size_t vecOffset = vec * numLocalRows; + for(size_t i = 0; i < numLocalRows - 1; i++) + { + TEST_EQUALITY(static_cast(5.0) * ST::one(), vvals[vecOffset + i]); + } + TEST_EQUALITY(static_cast(numLocalColumns) * ST::one(), vvals[vecOffset + numLocalRows - 1]); + } + if(numVecs != 1) + { + //Now run again, but on single vectors only (rank-1) + auto wcol = w.getVector(0); + auto vcol = v.getVectorNonConst(0); + vcol->putScalar(ST::zero()); + imba.apply(*wcol, *vcol); + vcol->get1dCopy(vvals(), numLocalRows); + for(size_t i = 0; i < numLocalRows - 1; i++) + { + TEST_EQUALITY(static_cast(5.0) * ST::one(), vvals[i]); + } + TEST_EQUALITY(static_cast(numLocalColumns) * ST::one(), vvals[numLocalRows - 1]); + //Finally, test residual. + V res(rowMap); + //Here, have A*wcol = vcol. This means the residual of A, wcol, and vcol should be 0. + Tpetra::Details::residual(imba, *wcol, *vcol, res); + Teuchos::Array resVals(numLocalRows); + res.get1dCopy(resVals(), numLocalRows); + for(size_t i = 0; i < numLocalRows; i++) + { + TEST_EQUALITY(ST::zero(), resVals[i]); + } + } + } + // // INSTANTIATIONS // @@ -339,6 +427,7 @@ namespace { // (anonymous) #define UNIT_TEST_GROUP( SCALAR, LO, GO, NODE ) \ TEUCHOS_UNIT_TEST_TEMPLATE_4_INSTANT( CrsMatrix, TheEyeOfTruth, LO, GO, SCALAR, NODE ) \ TEUCHOS_UNIT_TEST_TEMPLATE_4_INSTANT( CrsMatrix, ZeroMatrix, LO, GO, SCALAR, NODE ) \ + TEUCHOS_UNIT_TEST_TEMPLATE_4_INSTANT( CrsMatrix, ImbalancedRowMatrix, LO, GO, SCALAR, NODE ) \ TEUCHOS_UNIT_TEST_TEMPLATE_4_INSTANT( CrsMatrix, BadCalls, LO, GO, SCALAR, NODE ) \ TEUCHOS_UNIT_TEST_TEMPLATE_4_INSTANT( CrsMatrix, SimpleEigTest, LO, GO, SCALAR, NODE ) diff --git a/packages/tpetra/core/test/CrsMatrix/Tpetra_Test_CrsMatrix_WithGraph.hpp b/packages/tpetra/core/test/CrsMatrix/Tpetra_Test_CrsMatrix_WithGraph.hpp index c48b1fa1eb27..b991d08604a2 100644 --- a/packages/tpetra/core/test/CrsMatrix/Tpetra_Test_CrsMatrix_WithGraph.hpp +++ b/packages/tpetra/core/test/CrsMatrix/Tpetra_Test_CrsMatrix_WithGraph.hpp @@ -48,31 +48,6 @@ #include "Tpetra_CrsMatrix.hpp" #include "Tpetra_Vector.hpp" #include "Tpetra_Details_getNumDiags.hpp" -#include "Tpetra_Details_determineLocalTriangularStructure.hpp" - -namespace { // (anonymous) - template - Tpetra::Details::LocalTriangularStructureResult - getLocalTriangularStructure (const Tpetra::RowGraph& G) - { - using Tpetra::Details::determineLocalTriangularStructure; - using crs_graph_type = Tpetra::CrsGraph; - - const crs_graph_type& G_crs = dynamic_cast (G); - - auto G_lcl = G_crs.getLocalGraph (); - auto lclRowMap = G.getRowMap ()->getLocalMap (); - auto lclColMap = G.getColMap ()->getLocalMap (); - return determineLocalTriangularStructure (G_lcl, lclRowMap, lclColMap, true); - } - - template - Tpetra::Details::LocalTriangularStructureResult - getLocalTriangularStructure (const Tpetra::CrsMatrix& A) - { - return getLocalTriangularStructure (* (A.getGraph ())); - } -} // namespace (anonymous) // TODO: add test where some nodes have zero rows // TODO: add test where non-"zero" graph is used to build matrix; if no values are added to matrix, the operator effect should be zero. This tests that matrix values are initialized properly. @@ -319,13 +294,6 @@ inline void tupleToArray(Array &arr, const tuple &tup) out << "Call fillComplete on the CrsMatrix" << endl; matrix.fillComplete(); - { - auto lclTri = getLocalTriangularStructure (matrix); - TEST_EQUALITY( lclTri.diagCount, static_cast (numLocal) ); - GO gblDiagCount = 0; - reduceAll (*comm, REDUCE_SUM, static_cast (lclTri.diagCount), outArg (gblDiagCount)); - TEST_EQUALITY( gblDiagCount, static_cast (numImages*numLocal) ); - } TEST_EQUALITY( matrix.getGlobalNumEntries(), 3*numImages*numLocal - 2 ); out << "Check the diagonal entries of the CrsMatrix, using getLocalDiagCopy" << endl; @@ -418,11 +386,6 @@ inline void tupleToArray(Array &arr, const tuple &tup) TEST_EQUALITY_CONST( diaggraph.isFillComplete(), true ); TEST_EQUALITY_CONST( diaggraph.isStorageOptimized(), true ); - { - auto lclTri = getLocalTriangularStructure (diaggraph); - TEST_ASSERT( lclTri.couldBeLowerTriangular ); - TEST_ASSERT( lclTri.couldBeUpperTriangular ); - } // Make sure that if you create a CrsMatrix with an optimized, // fillComplete CrsGraph, that the resulting CrsMatrix is @@ -440,11 +403,6 @@ inline void tupleToArray(Array &arr, const tuple &tup) TEST_EQUALITY_CONST( matrix.isFillComplete(), true ); TEST_EQUALITY_CONST( matrix.isStorageOptimized(), true ); - { - auto lclTri = getLocalTriangularStructure (matrix); - TEST_ASSERT( lclTri.couldBeLowerTriangular ); - TEST_ASSERT( lclTri.couldBeUpperTriangular ); - } // init x to ones(); multiply into y, solve in-situ in y, check result V x(map,false), y(map,false); x.putScalar(SONE); @@ -484,11 +442,6 @@ inline void tupleToArray(Array &arr, const tuple &tup) TEST_EQUALITY_CONST( diaggraph->isFillComplete(), true ); TEST_EQUALITY_CONST( diaggraph->isStorageOptimized(), true ); - { - auto lclTri = getLocalTriangularStructure (*diaggraph); - TEST_ASSERT( lclTri.couldBeLowerTriangular ); - TEST_ASSERT( lclTri.couldBeUpperTriangular ); - } out << "Construct a CrsMatrix with the diagonal CrsGraph" << endl; MAT matrix1(diaggraph); diff --git a/packages/tpetra/core/test/CrsMatrix/UnpackMerge.cpp b/packages/tpetra/core/test/CrsMatrix/UnpackMerge.cpp index d8c8e160c571..7a6ad471bad3 100644 --- a/packages/tpetra/core/test/CrsMatrix/UnpackMerge.cpp +++ b/packages/tpetra/core/test/CrsMatrix/UnpackMerge.cpp @@ -80,7 +80,6 @@ namespace { // (anonymous) using crs_matrix_type = Tpetra::CrsMatrix; using import_type = Tpetra::Import; using map_type = Tpetra::Map; - using STS = Teuchos::ScalarTraits; RCP > comm = getDefaultComm(); const int myRank = comm->getRank(); @@ -225,7 +224,6 @@ namespace { // (anonymous) using crs_matrix_type = Tpetra::CrsMatrix; using import_type = Tpetra::Import; using map_type = Tpetra::Map; - using STS = Teuchos::ScalarTraits; int lclSuccess = 1; int gblSuccess = 0; diff --git a/packages/tpetra/core/test/FECrsGraph/FECrsGraph_UnitTests.cpp b/packages/tpetra/core/test/FECrsGraph/FECrsGraph_UnitTests.cpp index 14f8e08a3f6b..7d9ee16bc0b2 100644 --- a/packages/tpetra/core/test/FECrsGraph/FECrsGraph_UnitTests.cpp +++ b/packages/tpetra/core/test/FECrsGraph/FECrsGraph_UnitTests.cpp @@ -45,6 +45,7 @@ #include "Tpetra_TestingUtilities.hpp" #include "Tpetra_FECrsGraph.hpp" #include "Tpetra_CrsGraph.hpp" +#include "Tpetra_Import.hpp" #include "Tpetra_Assembly_Helpers.hpp" #include "Tpetra_Details_getNumDiags.hpp" @@ -53,6 +54,7 @@ namespace { // (anonymous) using Tpetra::TestingUtilities::getDefaultComm; using Tpetra::createContigMapWithNode; +using Tpetra::createNonContigMapWithNode; using Tpetra::StaticProfile; using Teuchos::RCP; using Teuchos::ArrayRCP; @@ -83,8 +85,8 @@ bool compare_final_graph_structure(Teuchos::FancyOStream &out,Tpetra::CrsGraphisSameAs(*g2.getRangeMap())) {out<<"Compare: RangeMap failed"<isSameAs(*g2.getRowMap())) {out<<"Compare: RowMap failed"<isSameAs(*g2.getColMap())) {out<<"Compare: ColMap failed"<isSameAs(*g2.getDomainMap())) {out<<"Compare: DomainMap failed"<isSameAs(*g2.getColMap())) {out<<"Compare: ColMap failed"< +bool compare_final_graph_structure_relaxed(Teuchos::FancyOStream &out, + const Tpetra::CrsGraph & g1, + const Tpetra::CrsGraph & g2) { + // Make sure we finished filling the two graphs + if (!g1.isFillComplete() || !g2.isFillComplete()) { + out << "Compare: FillComplete failed.\n"; + return false; + } + // Range/domain/row maps *must* be the same + if (!g1.getRangeMap()->isSameAs(*g2.getRangeMap())) { + out<<"Compare: RangeMap failed.\n"; + return false; + } + if (!g1.getRowMap()->isSameAs(*g2.getRowMap())) { + out << "Compare: RowMap failed.\n"; + return false; + } + if (!g1.getDomainMap()->isSameAs(*g2.getDomainMap())) { + out << "Compare: DomainMap failed.\n"; + return false; + } -template + const LO num_my_rows = g1.getNodeNumRows(); + if (num_my_rows!=static_cast(g2.getNodeNumEntries())) { + out << "Compare: number of local rows differ on some MPI rank: " + << num_my_rows << " vs " << g2.getNodeNumRows() << ".\n"; + return false; + } + + auto hasLID = [](const Teuchos::ArrayView& lids, const LO lid) -> bool { + auto it = std::find(lids.begin(),lids.end(),lid); + return it!=lids.end(); + }; + + Teuchos::ArrayView cols1, cols2; + const LO invLO = Teuchos::OrdinalTraits::invalid(); + const auto& colMap1 = *g1.getColMap(); + const auto& colMap2 = *g2.getColMap(); + for (LO irow=0; irowgetGlobalElement(irow); + + // Extract rows + g1.getLocalRowView(irow, cols1); + g2.getLocalRowView(irow, cols2); + + // If different row sizes, then the two graphs are different. + auto numEntries = cols1.size(); + if (numEntries!=cols2.size()) { + out << "Compare: global row " << grow << " has different lengths.\n"; + return false; + } + + // Loop over rows indices + for (decltype(numEntries) j=0; j class GraphPack { public: RCP > uniqueMap; RCP > overlapMap; std::vector > element2node; - // NOTE: This is hardwired for 1D bar elements - typedef Kokkos::View k_element2node_type; + typedef Kokkos::View k_element2node_type; k_element2node_type k_element2node; void print(int rank, std::ostream & out) { @@ -149,7 +232,7 @@ class GraphPack { template -void generate_fem1d_graph(size_t numLocalNodes, RCP > comm , GraphPack & pack) { +void generate_fem1d_graph(size_t numLocalNodes, RCP > comm , GraphPack<2,LO,GO,Node> & pack) { const GST INVALID = Teuchos::OrdinalTraits::invalid(); int rank = comm->getRank(); int numProc = comm->getSize(); @@ -188,6 +271,105 @@ void generate_fem1d_graph(size_t numLocalNodes, RCP > comm , Gra Kokkos::fence(); } +template +void generate_fem2d_q1_graph(size_t numCells1D, RCP > comm , GraphPack<4,LO,GO,Node> & pack) { + + // We assume a NxN Q1 fem grid. Cells are partitioned among ranks. + // Cell/Nodes ids are as follows (assuming N=2): + // + // 0---1---2 + // | 0 | 1 | + // 3---4---5 + // | 2 | 3 | + // 6---7---8 + // + // The order in which we store the ids within a cell is irrelevant (so long as consistent), + // since the local pattern is full anyways. + // + // NOTE: this routine sets overlapMap NOT to be the "col" map. Instead, since we partition + // cells, it contains all nodes belonging to local cells. If all cells are "fully" owned, + // then locally overlapMap=uniqueMap, while the "col" map of the graph will ALWAYS + // have something more (the halo). + + const size_t rank = comm->getRank(); + const size_t numProc = comm->getSize(); + + const size_t numGlobalCells = numCells1D*numCells1D; + const size_t numNodes1D = numCells1D+1; + + size_t numMyCells = numGlobalCells / numProc; + size_t remainder = numGlobalCells % numProc; + size_t myCellStart = numMyCells*rank; + if (rank < remainder) { + ++numMyCells; + myCellStart += rank; + } else { + myCellStart += remainder; + } + + // Add also repeated GIDs, we'll remove duplicates later + Teuchos::Array ovNodes; + pack.element2node.resize(numMyCells); + for (size_t cell=0; cell(ovNodes(),comm); + pack.uniqueMap = createOneToOne(pack.overlapMap); + + // Kokkos version of the element2node array + Kokkos::resize(pack.k_element2node,numMyCells); + auto k_e2n = pack.k_element2node; + Kokkos::parallel_for(Kokkos::RangePolicy(0,numMyCells), + KOKKOS_LAMBDA(const size_t cell) { + auto cellId = myCellStart+cell; + + auto icell = cellId / numCells1D; + auto jcell = cellId % numCells1D; + + auto offset = icell*numNodes1D; + + k_e2n(icell,0) = offset + jcell; + k_e2n(icell,1) = offset + jcell + 1; + k_e2n(icell,2) = offset + jcell + numNodes1D; + k_e2n(icell,3) = offset + jcell + numNodes1D + 1; + }); + Kokkos::fence(); +} + // // UNIT TESTS // @@ -276,7 +458,7 @@ TEUCHOS_UNIT_TEST_TEMPLATE_3_DECL( FECrsGraph, Assemble1D, LO, GO, Node ) const size_t numLocal = 10; // Generate a mesh - GraphPack pack; + GraphPack<2,LO,GO,Node> pack; generate_fem1d_graph(numLocal,comm,pack); //pack.print(comm->getRank(),std::cout); @@ -319,7 +501,7 @@ TEUCHOS_UNIT_TEST_TEMPLATE_3_DECL( FECrsGraph, Assemble1D_LocalIndex, LO, GO, No const size_t numLocal = 10; // Generate a mesh - GraphPack pack; + GraphPack<2,LO,GO,Node> pack; generate_fem1d_graph(numLocal,comm,pack); // pack.print(comm->getRank(),std::cout);fflush(stdout); @@ -351,6 +533,74 @@ TEUCHOS_UNIT_TEST_TEMPLATE_3_DECL( FECrsGraph, Assemble1D_LocalIndex, LO, GO, No TPETRA_GLOBAL_SUCCESS_CHECK(out,comm,success) } +TEUCHOS_UNIT_TEST_TEMPLATE_3_DECL( FECrsGraph, Assemble2D_OPSDomain, LO, GO, Node ) +{ + typedef Tpetra::FECrsGraph FEG; + typedef Tpetra::CrsGraph CG; + + // get a comm + RCP > comm = getDefaultComm(); + + const int numCells1D = 4; + + // Generate a mesh + GraphPack<4,LO,GO,Node> pack; + generate_fem2d_q1_graph(numCells1D,comm,pack); + + // Comparative assembly + + CG g0(pack.overlapMap,9,StaticProfile); + CG g1(pack.uniqueMap,9,StaticProfile); + FEG g2(pack.uniqueMap,pack.overlapMap,9); + FEG g3(pack.uniqueMap,pack.overlapMap,9,pack.overlapMap); + + g2.beginFill(); + g3.beginFill(); + for (const auto& cell_dofs : pack.element2node) { + for (const auto& gid_i : cell_dofs) { + for (const auto& gid_j : cell_dofs) { + g0.insertGlobalIndices(gid_i,1,&gid_j); + g1.insertGlobalIndices(gid_i,1,&gid_j); + g2.insertGlobalIndices(gid_i,1,&gid_j); + g3.insertGlobalIndices(gid_i,1,&gid_j); + } + } + } + g0.fillComplete(); + g1.fillComplete(); + g2.endFill(); + g3.endFill(); + Tpetra::Import import(pack.uniqueMap,pack.overlapMap); + + Teuchos::FancyOStream myout(Teuchos::rcpFromRef(std::cout)); + CG g11(pack.uniqueMap,9,StaticProfile); + g11.doExport(g0,import,Tpetra::INSERT); + g11.fillComplete(pack.uniqueMap,pack.uniqueMap); + success = compare_final_graph_structure(out,g11,g1); + TPETRA_GLOBAL_SUCCESS_CHECK(myout,comm,success) + + success = compare_final_graph_structure(out,g1,g2); + TPETRA_GLOBAL_SUCCESS_CHECK(myout,comm,success) + + // Passing a domain map different from the uniqueMap should cause a rearrangement of + // off-rank indices in the column map. Other than that, the graphs should still coincide. + success = compare_final_graph_structure_relaxed(out,g1,g3); + TPETRA_GLOBAL_SUCCESS_CHECK(myout,comm,success) + + // We can check that g3 is exactly what we would get if g1's col map had been + // built with a overlapMap locally fitted to it. We can recreate that scenario by + // a) use overlapMap as domainMap during fillComplete (this will generate the + // correct colMap), and b) reset domainMap to be the unique map (so that the + // checks in compare_final_graph_structure do not fail b/c of the domain map). + CG g12(pack.uniqueMap,9,StaticProfile); + g12.doExport(g0,import,Tpetra::INSERT); + g12.fillComplete(pack.overlapMap,pack.uniqueMap); + auto importer = g12.getImporter(); + g12.replaceDomainMapAndImporter(pack.uniqueMap,importer); + + success = compare_final_graph_structure(myout,g12,g3); + TPETRA_GLOBAL_SUCCESS_CHECK(myout,comm,success) +} // // INSTANTIATIONS @@ -360,7 +610,8 @@ TEUCHOS_UNIT_TEST_TEMPLATE_3_DECL( FECrsGraph, Assemble1D_LocalIndex, LO, GO, No TEUCHOS_UNIT_TEST_TEMPLATE_3_INSTANT( FECrsGraph, Diagonal, LO, GO, NODE ) \ TEUCHOS_UNIT_TEST_TEMPLATE_3_INSTANT( FECrsGraph, Diagonal_LocalIndex, LO, GO, NODE ) \ TEUCHOS_UNIT_TEST_TEMPLATE_3_INSTANT( FECrsGraph, Assemble1D, LO, GO, NODE ) \ - TEUCHOS_UNIT_TEST_TEMPLATE_3_INSTANT( FECrsGraph, Assemble1D_LocalIndex, LO, GO, NODE ) + TEUCHOS_UNIT_TEST_TEMPLATE_3_INSTANT( FECrsGraph, Assemble1D_LocalIndex, LO, GO, NODE ) \ + TEUCHOS_UNIT_TEST_TEMPLATE_3_INSTANT( FECrsGraph, Assemble2D_OPSDomain, LO, GO, NODE ) TPETRA_ETI_MANGLING_TYPEDEFS() diff --git a/packages/tpetra/core/test/ImportExport/CMakeLists.txt b/packages/tpetra/core/test/ImportExport/CMakeLists.txt index 7294a475846e..875c601f1dce 100644 --- a/packages/tpetra/core/test/ImportExport/CMakeLists.txt +++ b/packages/tpetra/core/test/ImportExport/CMakeLists.txt @@ -49,6 +49,15 @@ TRIBITS_ADD_EXECUTABLE_AND_TEST( STANDARD_PASS_OUTPUT ) +TRIBITS_ADD_EXECUTABLE_AND_TEST( + UnpackLongRows + SOURCES + UnpackLongRows.cpp + COMM mpi + NUM_MPI_PROCS 4 + STANDARD_PASS_OUTPUT +) + IF (${PROJECT_NAME}_ENABLE_Epetra) IF(NOT Trilinos_NO_32BIT_GLOBAL_INDICES AND Tpetra_INST_INT_INT) # Tpetra bug 5430: diff --git a/packages/tpetra/core/test/ImportExport/UnpackLongRows.cpp b/packages/tpetra/core/test/ImportExport/UnpackLongRows.cpp new file mode 100644 index 000000000000..423184a872f2 --- /dev/null +++ b/packages/tpetra/core/test/ImportExport/UnpackLongRows.cpp @@ -0,0 +1,727 @@ +/* +// @HEADER +// *********************************************************************** +// +// Tpetra: Templated Linear Algebra Services Package +// Copyright (2008) Sandia Corporation +// +// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation, +// the U.S. Government retains certain rights in this software. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// 1. Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// +// 2. Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in the +// documentation and/or other materials provided with the distribution. +// +// 3. Neither the name of the Corporation nor the names of the +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY +// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL SANDIA CORPORATION OR THE +// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +// ************************************************************************ +// @HEADER +*/ +#include + +#include "Kokkos_Core.hpp" + +#include "Tpetra_TestingUtilities.hpp" +#include "TpetraCore_ETIHelperMacros.h" + +#include "Tpetra_Map.hpp" +#include "Tpetra_Core.hpp" +#include "Tpetra_CrsMatrix.hpp" +#include "Tpetra_Distributor.hpp" + +#include "Teuchos_CommHelpers.hpp" +#include +#include +#include +#include + +#define INFO(X) std::cout << "==> info [" << comm->getRank() << "/" << comm->getSize() << "]: " << X << std::flush + +namespace { // anonymous + +// Create a crs matrix with a Poisson-like structure and extra dense rows at its +// end. Add column entries to each row so that the matrix remains symmetric. +// +// The final matrix will have the following form +// +// 4 -1 0 -1 0 ... 0 1 ... 1 +// -1 4 -1 0 -1 0 ... 0 1 ... 1 +// 0 -1 4 -1 0 -1 0 ... 0 1 ... 1 +// -1 0 -1 4 -1 0 -1 0 ... 0 1 ... 1 +// . . . . +// . . . . +// . . . . +// 0 ... -1 0 -1 4 -1 0 -1 1 ... 1 +// 0 ... -1 0 -1 4 -1 0 1 ... 1 +// 0 ... -1 0 -1 4 -1 1 ... 1 +// 0 ... -1 0 -1 4 1 ... 1 +// 1 1 ... 1 +// . . . +// . . . +// 1 1 ... 1 +// +// The final matrix is distributed evenly over processors in the communicator, +// but constructed in an arbitrary way such that each rank contributes to an +// overlap region on the rank's boundary and to the dense region. +// +// This test is constructed as such to isolate slow downs in export operations +// experienced by Aria when constructing a linear system that has a Poisson +// structure with additional dense rows. +template +void +generate_graphs( + Teuchos::RCP> const &comm, + Teuchos::RCP& owned, + Teuchos::RCP& shared, + int const rows_per_rank, + int const overlap, + int const dense_rows +) +{ + + using Teuchos::rcp; + using Teuchos::RCP; + using Teuchos::Array; + using map_type = typename graph_type::map_type; + using GO = typename graph_type::global_ordinal_type; + + auto const rank = comm->getRank(); + auto const procs = comm->getSize(); + + using gsize_t = Tpetra::global_size_t; + const gsize_t global_rows = rows_per_rank * procs + dense_rows; + + INFO("GENERATING GRAPHS\n"); + // one-to-one map for entries on my rank + RCP owned_map; + { + Array indices((rank != procs - 1) ? rows_per_rank : rows_per_rank + dense_rows); + GO start = rank * rows_per_rank; + std::iota(indices.begin(), indices.end(), start); + owned_map = rcp(new map_type(global_rows, indices(), 0, comm)); + } + + // overlapping map for shared entries + RCP shared_map; + { + Array indices; + if (rank == 0) + { + indices.resize(overlap + dense_rows); + // overlap in to rank 1 + std::iota(indices.begin(), indices.begin()+overlap, GO(rows_per_rank)); + // dense rows at end of matrix + std::iota(indices.begin()+overlap, indices.end(), GO(procs * rows_per_rank)); + } + else if (rank == procs - 1) + { + indices.resize(overlap); + // overlap in to rank (procs - 1) + std::iota(indices.begin(), indices.end(), GO(rank * rows_per_rank - overlap)); + } + else + { + indices.resize(2 * overlap + dense_rows); + // overlap in to rank (rank - 1) + std::iota(indices.begin(), indices.begin()+overlap, GO(rank * rows_per_rank - overlap)); + // overlap in to rank (rank + 1) + std::iota(indices.begin()+overlap, indices.begin()+2*overlap, GO((rank+1) * rows_per_rank)); + // dense rows at end of matrix + std::iota(indices.begin()+2*overlap, indices.end(), GO(procs * rows_per_rank)); + } + auto invalid = Teuchos::OrdinalTraits::invalid(); + shared_map = rcp(new map_type(invalid, indices(), 0, comm)); + } + + owned = rcp(new graph_type(owned_map, rows_per_rank + dense_rows, Tpetra::StaticProfile)); + shared = rcp(new graph_type(shared_map, rows_per_rank + dense_rows, Tpetra::StaticProfile)); + + { + using Teuchos::tuple; + auto rows_to_fill = GO(rows_per_rank + overlap); + if (rank > 0 && rank < procs - 1) rows_to_fill += overlap; + auto start = (rank == 0) ? GO(0) : GO(rank * rows_per_rank - overlap); + for (GO row=start; row columns; + + if (row == 0) + { + // [4, -1, 0, -1] + auto my_cols = tuple(row, row + 1, row + 3); + columns.assign(my_cols.begin(), my_cols.end()); + } + else if (row == 1 || row == 2) + { + // 1: [-1, 4, -1, 0, -1] + // 2: [0, -1, 4, -1, 0, -1] + auto my_cols = tuple(row - 1, row, row + 1, row + 3); + columns.assign(my_cols.begin(), my_cols.end()); + } + else if ( + gsize_t(row) == global_rows - 3 - dense_rows || + gsize_t(row) == global_rows - 2 - dense_rows + ) + { + // -3: [-1, 0, -1, 4, -1, 0] + // -2: [-1, 0, -1, 4, -1] + auto my_cols = tuple(row - 3, row - 1, row, row + 1); + columns.assign(my_cols.begin(), my_cols.end()); + } + else if (gsize_t(row) == global_rows - 1 - dense_rows) + { + // [-1, 0, -1, 4] + auto my_cols = tuple(row - 3, row - 1, row); + columns.assign(my_cols.begin(), my_cols.end()); + } + else + { + // [-1, 0, -1, 4, -1, 0, -1] + auto my_cols = tuple(row - 3, row - 1, row, row + 1, row + 3); + columns.assign(my_cols.begin(), my_cols.end()); + } + + // Fill in columns at end of row associated with the extra dense rows to + // assure symmetry of the final matrix + for (int i=0; iisNodeGlobalElement(row)) + { + owned->insertGlobalIndices(row, columns()); + } + else if (shared_map->isNodeGlobalElement(row)) + { + shared->insertGlobalIndices(row, columns()); + } + else + { + TEUCHOS_TEST_FOR_EXCEPTION( + true, + std::logic_error, + "Row " << row << " is not owned by anyone!" + ); + } + } + } + + { + for (int i=0; i columns(n); + std::iota(columns.begin(), columns.end(), GO(rank * rows_per_rank)); + if (rank == procs - 1) + { + TEUCHOS_TEST_FOR_EXCEPTION( + !owned_map->isNodeGlobalElement(row), + std::logic_error, + "==> Error [" << rank << "/" << procs << "]: " << + "the global row " << row << " is not in this owned map\n" << + owned_map->getNodeElementList() + ); + owned->insertGlobalIndices(row, columns()); + } + else + { + TEUCHOS_TEST_FOR_EXCEPTION( + !shared_map->isNodeGlobalElement(row), + std::logic_error, + "==> Error [" << rank << "/" << procs << "]: " << + "the global row " << row << " is not in this shared map\n" << + shared_map->getNodeElementList() + ); + shared->insertGlobalIndices(row, columns()); + } + } + } + shared->fillComplete(); + comm->barrier(); + + // We've created a sparse matrix containing owned indices and another + // containing shared. The owned matrix has one-to-one map, while the shared + // matrix is overlapping. Here, export the entries from the shared matrix in + // to the owned matrix. + // + // Since only the target Map is one-to-one, we have to use an Export. + { + using export_type = typename graph_type::export_type; + export_type exporter(shared_map, owned_map); + comm->barrier(); + + owned->doExport(*shared, exporter, Tpetra::ADD); + } + owned->fillComplete(); + + INFO("GENERATING GRAPHS DONE\n"); +} + + +template +Teuchos::RCP +generate_matrix( + Teuchos::RCP> const &comm, + Teuchos::RCP const &g_owned, + Teuchos::RCP const &g_shared, + int const rows_per_rank, + int const overlap, + int const dense_rows +) +{ + + using Teuchos::rcp; + using Teuchos::RCP; + using Teuchos::Time; + using Teuchos::Array; + using Teuchos::TimeMonitor; + using real = typename matrix_type::scalar_type; + using GO = typename matrix_type::global_ordinal_type; + using LO = typename matrix_type::local_ordinal_type; + + auto const rank = comm->getRank(); + auto const procs = comm->getSize(); + + INFO("GENERATING MATRIX\n"); + using gsize_t = Tpetra::global_size_t; + const gsize_t global_rows = rows_per_rank * procs + dense_rows; + + const real mone = static_cast(-1.0); + const real one = static_cast(1.0); + const real four = static_cast(4.0); + + // one-to-one map for entries on my rank + auto owned_map = g_owned->getRowMap(); + auto mtx_owned = rcp(new matrix_type(g_owned)); + + auto shared_map = g_shared->getRowMap(); + auto mtx_shared = rcp(new matrix_type(g_shared)); + INFO("MATRIX CREATED\n"); + + { + INFO("FILLING MATRIX\n"); + RCP